diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml
index 54b9285380..90b376ddea 100644
--- a/com.discord/AndroidManifest.xml
+++ b/com.discord/AndroidManifest.xml
@@ -59,6 +59,12 @@
             </intent-filter>
         </activity>
         <activity android:exported="true" android:label="@string/discord" android:launchMode="standard" android:name="com.discord.app.AppActivity$AppAction" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
+            <intent-filter>
+                <action android:name="com.discord.intent.action.SDK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+                <data android:host="sdk" android:pathPattern="/.*" android:scheme="discord"/>
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
                 <action android:name="android.intent.action.SEND_MULTIPLE"/>
diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index afb3d634f6..f626599b27 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-973.apk
+apkFileName: com.discord-974.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -181,5 +181,5 @@ usesFramework:
   tag: null
 version: 2.4.1-197d46-SNAPSHOT
 versionInfo:
-  versionCode: '973'
-  versionName: 9.7.3
+  versionCode: '974'
+  versionName: 9.7.4
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index b453e8485f..810f43e455 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Thu Oct 17 21:25:11 UTC 2019
-version_name=9.7.3
+#Fri Oct 18 23:40:32 UTC 2019
+version_name=9.7.4
 package_name=com.discord
-build_id=7735a6f9-8f43-485f-baf8-6cd8d3852a66
-version_code=973
+build_id=ba847789-d51c-4ffe-ae92-0a37a0f6bfe3
+version_code=974
 app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 42502e1b5a..d1053cb22e 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-anydpi-v21/drawable_nitro_server_boost.xml b/com.discord/res/drawable-anydpi-v21/drawable_nitro_server_boost.xml
index 71f06dd5ec..b9275349be 100644
--- a/com.discord/res/drawable-anydpi-v21/drawable_nitro_server_boost.xml
+++ b/com.discord/res/drawable-anydpi-v21/drawable_nitro_server_boost.xml
@@ -13,7 +13,7 @@
         <path android:fillColor="#ff3e70dd" android:pathData="M61.899,28.314L53.501,33.162L55.319,36.312L63.717,31.463L61.899,28.314Z" />
         <path android:fillColor="#ff3e70dd" android:pathData="M52.206,11.526L43.808,16.374L45.626,19.523L54.024,14.675L52.206,11.526Z" />
         <path android:fillColor="#ffffd836" android:pathData="M66.485,48.364C67.824,48.364 68.909,47.278 68.909,45.939C68.909,44.6 67.824,43.515 66.485,43.515C65.146,43.515 64.061,44.6 64.061,45.939C64.061,47.278 65.146,48.364 66.485,48.364Z" />
-        <path android:fillColor="#fff47fff" android:pathData="M100.303,70.727L87.091,68.849C78,67.576 71.636,59.03 72.909,50C74.182,40.909 82.727,34.546 91.758,35.818L104.97,37.697C114.061,38.97 120.424,47.515 119.152,56.546C117.879,65.636 109.394,72 100.303,70.727Z" />
+        <path android:fillColor="#ffff73fa" android:pathData="M100.303,70.727L87.091,68.849C78,67.576 71.636,59.03 72.909,50C74.182,40.909 82.727,34.546 91.758,35.818L104.97,37.697C114.061,38.97 120.424,47.515 119.152,56.546C117.879,65.636 109.394,72 100.303,70.727Z" />
         <path android:fillColor="#ff83ddc5" android:pathData="M98.061,38.788C93.697,41.758 86.909,37.212 88,32.061C92.364,29.03 99.151,33.576 98.061,38.788Z" />
         <path android:fillColor="#ff83ddc5" android:pathData="M97.636,38.727C100.97,42.848 108.788,40.364 109.212,35.03C105.818,30.97 98,33.454 97.636,38.727Z" />
         <path android:fillColor="#ffffffff" android:pathData="M99.455,45.091C98.667,44.97 97.939,45.394 97.636,46.121L96.849,48.242L96.667,46C96.606,45.212 96,44.606 95.212,44.485L89.636,43.697C88.788,43.576 87.939,44.121 87.758,44.97L84.667,59.394C84.485,60.364 85.091,61.273 86.061,61.394L89.758,61.939L91.333,62.182L92.242,62.303L96.424,62.909L97.758,63.091L98.909,63.273L103.333,63.879C104.303,64 105.152,63.333 105.212,62.364L106.242,47.636C106.303,46.788 105.697,46 104.788,45.879L99.455,45.091Z" />
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_boosted_badge_12dp.xml b/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_12dp.xml
index b4ab39c519..e4371e08d3 100644
--- a/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_12dp.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_12dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="12.0dip" android:width="12.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff47fff" android:pathData="M12.5,0L4.5,8V16.0001L12.5,24L20.5001,16.0001V8L12.5,0ZM18.5,15.18L12.5,21.18L6.5,15.18V8.82L12.5,2.82L18.5,8.82V15.18Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M8.5001,9.66V14.34L12.5001,18.3401L16.5001,14.34V9.66L12.5001,5.66L8.5001,9.66Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M12.5,0L4.5,8V16.0001L12.5,24L20.5001,16.0001V8L12.5,0ZM18.5,15.18L12.5,21.18L6.5,15.18V8.82L12.5,2.82L18.5,8.82V15.18Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M8.5001,9.66V14.34L12.5001,18.3401L16.5001,14.34V9.66L12.5001,5.66L8.5001,9.66Z" />
 </vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_24dp.xml b/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_24dp.xml
index 6562901407..a3829b0cd8 100644
--- a/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_24dp.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_boosted_badge_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff47fff" android:pathData="M12.5,0L4.5,8V16.0001L12.5,24L20.5001,16.0001V8L12.5,0ZM18.5,15.18L12.5,21.18L6.5,15.18V8.82L12.5,2.82L18.5,8.82V15.18Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M8.5001,9.66V14.34L12.5001,18.3401L16.5001,14.34V9.66L12.5001,5.66L8.5001,9.66Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M12.5,0L4.5,8V16.0001L12.5,24L20.5001,16.0001V8L12.5,0ZM18.5,15.18L12.5,21.18L6.5,15.18V8.82L12.5,2.82L18.5,8.82V15.18Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M8.5001,9.66V14.34L12.5001,18.3401L16.5001,14.34V9.66L12.5001,5.66L8.5001,9.66Z" />
 </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_member_list_boosted_badge_24dp.xml b/com.discord/res/drawable-anydpi-v21/ic_member_list_boosted_badge_24dp.xml
index 9db2a59201..1c719315f9 100644
--- a/com.discord/res/drawable-anydpi-v21/ic_member_list_boosted_badge_24dp.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_member_list_boosted_badge_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff47fff" android:pathData="M8,2L4,6V10L8,14L12,10V6L8,2ZM11,9.59L8,12.59L5,9.59V6.41L8,3.41L11,6.41V9.59Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M6,6.83V9.17L8,11.17L10,9.17V6.83L8,4.83L6,6.83Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M8,2L4,6V10L8,14L12,10V6L8,2ZM11,9.59L8,12.59L5,9.59V6.41L8,3.41L11,6.41V9.59Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M6,6.83V9.17L8,11.17L10,9.17V6.83L8,4.83L6,6.83Z" />
 </vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml b/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml
index 82478a135c..cec56a65b3 100644
--- a/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff47fff" android:pathData="M8.3333,0L3,5.3333V10.6667L8.3333,16L13.6667,10.6667V5.3333L8.3333,0ZM12.3333,10.12L8.3333,14.12L4.3333,10.12V5.88L8.3333,1.88L12.3333,5.88V10.12Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M5.6667,6.44V9.56L8.3333,12.2267L11,9.56V6.44L8.3333,3.7733L5.6667,6.44Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M8.3333,0L3,5.3333V10.6667L8.3333,16L13.6667,10.6667V5.3333L8.3333,0ZM12.3333,10.12L8.3333,14.12L4.3333,10.12V5.88L8.3333,1.88L12.3333,5.88V10.12Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M5.6667,6.44V9.56L8.3333,12.2267L11,9.56V6.44L8.3333,3.7733L5.6667,6.44Z" />
 </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_no_stream_preview.xml b/com.discord/res/drawable-anydpi-v21/img_no_stream_preview.xml
index 9004ecf8a2..a3f92dfe53 100644
--- a/com.discord/res/drawable-anydpi-v21/img_no_stream_preview.xml
+++ b/com.discord/res/drawable-anydpi-v21/img_no_stream_preview.xml
@@ -26,6 +26,6 @@
     <path android:fillColor="#ff202225" android:pathData="M51.966,96.6c0,-1.9 -1.391,-3.7 -3.28,-4 -2.384,-0.4 -4.47,1.5 -4.47,3.8 0,2.1 -0.398,4.3 -1.49,6.1 -0.498,0.9 -0.796,2 -0.796,3.1 0.1,3.2 2.683,5.8 5.763,6 3.478,0.2 6.36,-2.6 6.36,-6.1 0,-1.1 -0.299,-2.1 -0.796,-2.9 -0.795,-1.8 -1.291,-3.9 -1.291,-6z" />
     <path android:fillColor="#ff202225" android:pathData="M45.507,118.9a0.893,0.893 0,0 1,-0.894 -0.9v-11a0.893,0.893 0,1 1,1.788 0v11c-0.1,0.5 -0.497,0.9 -0.894,0.9zM50.773,118.9a0.893,0.893 0,0 1,-0.894 -0.9v-11a0.893,0.893 0,1 1,1.788 0v11c0,0.5 -0.397,0.9 -0.894,0.9zM53.357,104.5c-3.08,0 -5.266,-2.9 -5.366,-3.1 -0.298,-0.4 -0.199,-1.1 0.199,-1.4 0.397,-0.3 1.093,-0.2 1.391,0.2 0,0 1.69,2.3 3.776,2.3 1.192,0 2.384,-0.8 3.477,-2.3 0.298,-0.4 0.994,-0.5 1.391,-0.2 0.398,0.3 0.497,1 0.2,1.4 -1.491,2.1 -3.18,3.1 -5.068,3.1zM294.208,98.5c0.894,-1.7 0.496,-3.9 -1.093,-5 -1.988,-1.4 -4.67,-0.8 -5.763,1.3 -0.994,1.9 -2.385,3.6 -4.173,4.7 -0.895,0.6 -1.59,1.4 -2.087,2.4 -1.391,2.8 -0.397,6.4 2.385,8 2.981,1.8 6.856,0.6 8.445,-2.4 0.497,-0.9 0.696,-2 0.696,-3 0,-2.1 0.596,-4.2 1.59,-6z" />
     <path android:fillColor="#ff202225" android:pathData="M289.239,118.9a0.894,0.894 0,0 1,-0.894 -0.9v-11a0.894,0.894 0,1 1,1.789 0v11c-0.1,0.5 -0.497,0.9 -0.895,0.9zM297.586,104.2h-7.949c-0.596,0 -0.993,-0.4 -0.993,-1s0.397,-1 0.993,-1h7.949c0.596,0 0.994,0.4 0.994,1s-0.497,1 -0.994,1zM285.563,101.5c-0.298,0 -0.596,-0.1 -0.794,-0.4l-4.472,-6c-0.298,-0.4 -0.198,-1.1 0.199,-1.4 0.397,-0.3 1.093,-0.2 1.391,0.2l4.471,6c0.298,0.4 0.199,1.1 -0.198,1.4 -0.199,0.1 -0.398,0.2 -0.597,0.2zM275.627,110.5c-0.298,0 -0.596,-0.1 -0.794,-0.4 -0.299,-0.4 -0.199,-1.1 0.198,-1.4l6.955,-5c0.398,-0.3 1.093,-0.2 1.392,0.2 0.298,0.4 0.198,1.1 -0.199,1.4l-6.955,5c-0.199,0.1 -0.398,0.2 -0.597,0.2z" />
-    <path android:fillColor="#fff47fff" android:pathData="M204.386,36.6h-11.924v12h11.924v-12zM226.245,36.6h-11.923v12h11.923v-12zM248.104,36.6h-11.923v12h11.923v-12zM269.964,36.6h-11.923v12h11.923v-12zM204.386,53.6h-11.924v12h11.924v-12zM226.245,53.6h-11.923v12h11.923v-12zM248.104,53.6h-11.923v12h11.923v-12zM269.964,53.6h-11.923v12h11.923v-12zM204.386,70.6h-11.924v12h11.924v-12zM226.245,70.6h-11.923v12h11.923v-12zM248.104,70.6h-11.923v12h11.923v-12zM269.964,70.6h-11.923v12h11.923v-12z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M204.386,36.6h-11.924v12h11.924v-12zM226.245,36.6h-11.923v12h11.923v-12zM248.104,36.6h-11.923v12h11.923v-12zM269.964,36.6h-11.923v12h11.923v-12zM204.386,53.6h-11.924v12h11.924v-12zM226.245,53.6h-11.923v12h11.923v-12zM248.104,53.6h-11.923v12h11.923v-12zM269.964,53.6h-11.923v12h11.923v-12zM204.386,70.6h-11.924v12h11.924v-12zM226.245,70.6h-11.923v12h11.923v-12zM248.104,70.6h-11.923v12h11.923v-12zM269.964,70.6h-11.923v12h11.923v-12z" />
     <path android:fillColor="#ff3e70dd" android:pathData="M188.422,48.641h3.974v-12h-3.974v12zM210.281,48.641h3.974v-12h-3.974v12zM232.14,48.641h3.975v-12h-3.975v12zM254,48.641h3.974v-12H254v12zM188.422,65.641h3.974v-12h-3.974v12zM210.281,65.641h3.974v-12h-3.974v12zM232.14,65.641h3.975v-12h-3.975v12zM254,65.641h3.974v-12H254v12zM188.422,82.641h3.974v-12h-3.974v12zM210.281,82.641h3.974v-12h-3.974v12zM232.14,82.641h3.975v-12h-3.975v12zM254,82.641h3.974v-12H254v12z" />
 </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
index 08583dbb4e..12d983e5cb 100644
--- a/com.discord/res/drawable-anydpi-v21/img_plus_illo.xml
+++ b/com.discord/res/drawable-anydpi-v21/img_plus_illo.xml
@@ -3,7 +3,7 @@
   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="#ffff73fa" 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" />
diff --git a/com.discord/res/drawable-anydpi-v21/img_wumpus_game_launcher.xml b/com.discord/res/drawable-anydpi-v21/img_wumpus_game_launcher.xml
index a7d5161935..a9ecd97bfc 100644
--- a/com.discord/res/drawable-anydpi-v21/img_wumpus_game_launcher.xml
+++ b/com.discord/res/drawable-anydpi-v21/img_wumpus_game_launcher.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="150.0dip" android:width="160.0dip" android:autoMirrored="true" android:viewportWidth="160.0" android:viewportHeight="150.0"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff47fff" android:pathData="M88.465,42.45V72.682H129.915L141.361,84.095V42.45H88.465Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M88.465,42.45V72.682H129.915L141.361,84.095V42.45H88.465Z" />
     <path android:fillColor="#ffffffff" android:pathData="M130.803,59.823H98.721V63H130.803V59.823Z" />
     <path android:fillColor="#ffffffff" android:pathData="M130.803,52.118H98.721V55.296H130.803V52.118Z" />
     <path android:fillColor="#ff7196ff" android:pathData="M142.496,106.745L153.354,103.582C156.089,102.791 158.072,100.35 158.291,97.514C158.441,95.509 157.716,93.559 156.294,92.141C154.995,90.845 153.244,90.123 151.426,90.123C151.248,90.123 151.07,90.123 150.906,90.136C148.062,90.354 145.614,92.332 144.821,95.059L141.648,105.886C141.552,106.241 141.73,106.473 141.826,106.555C141.908,106.65 142.14,106.841 142.496,106.745Z" />
@@ -31,10 +31,10 @@
     <path android:fillColor="#ff7196ff" android:pathData="M49.887,143.618C47.768,143.686 46.058,144.914 46.058,146.414C46.058,147.914 47.754,149.141 49.887,149.195V149.209H142.673V143.618H49.887Z" />
     <path android:fillColor="#ff7196ff" android:pathData="M59.528,47.455C59.528,31.2 46.304,18.014 30.003,18.014C13.703,18.014 0.479,31.2 0.479,47.455C0.479,61.514 10.366,73.241 23.576,76.173L29.962,84.355L30.003,84.314L30.044,84.355L36.431,76.173C49.641,73.255 59.528,61.514 59.528,47.455Z" />
     <path android:fillColor="#ffffd836" android:pathData="M134.673,31.364L133.388,34.009C133.087,34.623 133.744,35.277 134.359,34.977L137.012,33.695C137.217,33.6 137.45,33.6 137.641,33.695L140.294,34.977C140.909,35.277 141.566,34.623 141.265,34.009L140.007,31.364C139.911,31.159 139.911,30.927 140.007,30.736L141.292,28.091C141.593,27.477 140.937,26.823 140.321,27.123L137.668,28.404C137.463,28.5 137.231,28.5 137.039,28.404L134.386,27.123C133.771,26.823 133.114,27.477 133.415,28.091L134.701,30.736C134.769,30.941 134.769,31.173 134.673,31.364Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M28.267,0C27.706,0 27.255,0.45 27.255,1.009V2.018C27.255,2.577 27.706,3.027 28.267,3.027C28.827,3.027 29.279,2.577 29.279,2.018V1.009C29.265,0.45 28.814,0 28.267,0Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M28.267,8.018C27.706,8.018 27.255,8.468 27.255,9.027V10.036C27.255,10.595 27.706,11.045 28.267,11.045C28.827,11.045 29.279,10.595 29.279,10.036V9.027C29.265,8.468 28.814,8.018 28.267,8.018Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M32.793,4.514H31.781C31.22,4.514 30.769,4.964 30.769,5.523C30.769,6.082 31.22,6.532 31.781,6.532H32.793C33.354,6.532 33.805,6.082 33.805,5.523C33.805,4.964 33.34,4.514 32.793,4.514Z" />
-    <path android:fillColor="#fff47fff" android:pathData="M24.738,4.514H23.726C23.166,4.514 22.715,4.964 22.715,5.523C22.715,6.082 23.166,6.532 23.726,6.532H24.738C25.299,6.532 25.75,6.082 25.75,5.523C25.75,4.964 25.299,4.514 24.738,4.514Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M28.267,0C27.706,0 27.255,0.45 27.255,1.009V2.018C27.255,2.577 27.706,3.027 28.267,3.027C28.827,3.027 29.279,2.577 29.279,2.018V1.009C29.265,0.45 28.814,0 28.267,0Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M28.267,8.018C27.706,8.018 27.255,8.468 27.255,9.027V10.036C27.255,10.595 27.706,11.045 28.267,11.045C28.827,11.045 29.279,10.595 29.279,10.036V9.027C29.265,8.468 28.814,8.018 28.267,8.018Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M32.793,4.514H31.781C31.22,4.514 30.769,4.964 30.769,5.523C30.769,6.082 31.22,6.532 31.781,6.532H32.793C33.354,6.532 33.805,6.082 33.805,5.523C33.805,4.964 33.34,4.514 32.793,4.514Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M24.738,4.514H23.726C23.166,4.514 22.715,4.964 22.715,5.523C22.715,6.082 23.166,6.532 23.726,6.532H24.738C25.299,6.532 25.75,6.082 25.75,5.523C25.75,4.964 25.299,4.514 24.738,4.514Z" />
     <path android:fillColor="#ffd4e4ff" android:pathData="M12.13,81.123H11.966C11.597,81.123 11.296,80.823 11.296,80.454V78.791C11.296,78.423 11.597,78.123 11.966,78.123H12.13C12.499,78.123 12.8,78.423 12.8,78.791V80.454C12.8,80.823 12.499,81.123 12.13,81.123Z" />
     <path android:fillColor="#ffd4e4ff" android:pathData="M12.13,88.636H11.966C11.597,88.636 11.296,88.336 11.296,87.968V86.305C11.296,85.936 11.597,85.636 11.966,85.636H12.13C12.499,85.636 12.8,85.936 12.8,86.305V87.968C12.8,88.336 12.499,88.636 12.13,88.636Z" />
     <path android:fillColor="#ffd4e4ff" android:pathData="M14.304,83.454V83.291C14.304,82.923 14.605,82.623 14.974,82.623H16.643C17.012,82.623 17.313,82.923 17.313,83.291V83.454C17.313,83.823 17.012,84.123 16.643,84.123H14.974C14.619,84.123 14.304,83.823 14.304,83.454Z" />
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-hdpi/drawable_nitro_server_boost.png b/com.discord/res/drawable-hdpi/drawable_nitro_server_boost.png
index ff9c9b5de1..f1c6c7665d 100644
Binary files a/com.discord/res/drawable-hdpi/drawable_nitro_server_boost.png and b/com.discord/res/drawable-hdpi/drawable_nitro_server_boost.png differ
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..fe668842d0 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_boosted_badge_12dp.png b/com.discord/res/drawable-hdpi/ic_boosted_badge_12dp.png
index 9d0d6189a5..e389e0f2a5 100644
Binary files a/com.discord/res/drawable-hdpi/ic_boosted_badge_12dp.png and b/com.discord/res/drawable-hdpi/ic_boosted_badge_12dp.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_boosted_badge_24dp.png b/com.discord/res/drawable-hdpi/ic_boosted_badge_24dp.png
index 1261217556..9be6dbb0e5 100644
Binary files a/com.discord/res/drawable-hdpi/ic_boosted_badge_24dp.png and b/com.discord/res/drawable-hdpi/ic_boosted_badge_24dp.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_member_list_boosted_badge_24dp.png b/com.discord/res/drawable-hdpi/ic_member_list_boosted_badge_24dp.png
index 1243435b0e..189eeb41dd 100644
Binary files a/com.discord/res/drawable-hdpi/ic_member_list_boosted_badge_24dp.png and b/com.discord/res/drawable-hdpi/ic_member_list_boosted_badge_24dp.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_premium_guild_subscription.png b/com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.png
index 8b246759af..d15c09e2b5 100644
Binary files a/com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.png and b/com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.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_no_stream_preview.png b/com.discord/res/drawable-hdpi/img_no_stream_preview.png
index 454f7f59c1..f82ea9aa2b 100644
Binary files a/com.discord/res/drawable-hdpi/img_no_stream_preview.png and b/com.discord/res/drawable-hdpi/img_no_stream_preview.png differ
diff --git a/com.discord/res/drawable-hdpi/img_plus_illo.png b/com.discord/res/drawable-hdpi/img_plus_illo.png
index e5a71283c0..0b6588e470 100644
Binary files a/com.discord/res/drawable-hdpi/img_plus_illo.png and b/com.discord/res/drawable-hdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-hdpi/img_wumpus_game_launcher.png b/com.discord/res/drawable-hdpi/img_wumpus_game_launcher.png
index 33cb7be953..b338699c5f 100644
Binary files a/com.discord/res/drawable-hdpi/img_wumpus_game_launcher.png and b/com.discord/res/drawable-hdpi/img_wumpus_game_launcher.png differ
diff --git a/com.discord/res/drawable-ldpi/drawable_nitro_server_boost.png b/com.discord/res/drawable-ldpi/drawable_nitro_server_boost.png
index d26691a2bf..06e261d01f 100644
Binary files a/com.discord/res/drawable-ldpi/drawable_nitro_server_boost.png and b/com.discord/res/drawable-ldpi/drawable_nitro_server_boost.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_boosted_badge_12dp.png b/com.discord/res/drawable-ldpi/ic_boosted_badge_12dp.png
index ffd94d061c..2326b49fe3 100644
Binary files a/com.discord/res/drawable-ldpi/ic_boosted_badge_12dp.png and b/com.discord/res/drawable-ldpi/ic_boosted_badge_12dp.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_boosted_badge_24dp.png b/com.discord/res/drawable-ldpi/ic_boosted_badge_24dp.png
index 9d0d6189a5..e389e0f2a5 100644
Binary files a/com.discord/res/drawable-ldpi/ic_boosted_badge_24dp.png and b/com.discord/res/drawable-ldpi/ic_boosted_badge_24dp.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_member_list_boosted_badge_24dp.png b/com.discord/res/drawable-ldpi/ic_member_list_boosted_badge_24dp.png
index 9cda8bd3e1..d4ca532a61 100644
Binary files a/com.discord/res/drawable-ldpi/ic_member_list_boosted_badge_24dp.png and b/com.discord/res/drawable-ldpi/ic_member_list_boosted_badge_24dp.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_premium_guild_subscription.png b/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png
index 9c105f653b..4d227faa2f 100644
Binary files a/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png and b/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.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_no_stream_preview.png b/com.discord/res/drawable-ldpi/img_no_stream_preview.png
index 47c66c9197..1ba3e6afcf 100644
Binary files a/com.discord/res/drawable-ldpi/img_no_stream_preview.png and b/com.discord/res/drawable-ldpi/img_no_stream_preview.png differ
diff --git a/com.discord/res/drawable-ldpi/img_plus_illo.png b/com.discord/res/drawable-ldpi/img_plus_illo.png
index 5a38fccccf..42a7d64218 100644
Binary files a/com.discord/res/drawable-ldpi/img_plus_illo.png and b/com.discord/res/drawable-ldpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-ldpi/img_wumpus_game_launcher.png b/com.discord/res/drawable-ldpi/img_wumpus_game_launcher.png
index e326af3f5d..82f86420a8 100644
Binary files a/com.discord/res/drawable-ldpi/img_wumpus_game_launcher.png and b/com.discord/res/drawable-ldpi/img_wumpus_game_launcher.png differ
diff --git a/com.discord/res/drawable-mdpi/drawable_nitro_server_boost.png b/com.discord/res/drawable-mdpi/drawable_nitro_server_boost.png
index 3fb0d16ac1..bf624bad5f 100644
Binary files a/com.discord/res/drawable-mdpi/drawable_nitro_server_boost.png and b/com.discord/res/drawable-mdpi/drawable_nitro_server_boost.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_boosted_badge_12dp.png b/com.discord/res/drawable-mdpi/ic_boosted_badge_12dp.png
index a84ec786e3..b8fa3bf6a5 100644
Binary files a/com.discord/res/drawable-mdpi/ic_boosted_badge_12dp.png and b/com.discord/res/drawable-mdpi/ic_boosted_badge_12dp.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_boosted_badge_24dp.png b/com.discord/res/drawable-mdpi/ic_boosted_badge_24dp.png
index 2851120adf..70982538b1 100644
Binary files a/com.discord/res/drawable-mdpi/ic_boosted_badge_24dp.png and b/com.discord/res/drawable-mdpi/ic_boosted_badge_24dp.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_member_list_boosted_badge_24dp.png b/com.discord/res/drawable-mdpi/ic_member_list_boosted_badge_24dp.png
index 889c8d5318..001d26db55 100644
Binary files a/com.discord/res/drawable-mdpi/ic_member_list_boosted_badge_24dp.png and b/com.discord/res/drawable-mdpi/ic_member_list_boosted_badge_24dp.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_premium_guild_subscription.png b/com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.png
index cabddde490..64dc3d208f 100644
Binary files a/com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.png and b/com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.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_no_stream_preview.png b/com.discord/res/drawable-mdpi/img_no_stream_preview.png
index 626226dd42..8d35d1d388 100644
Binary files a/com.discord/res/drawable-mdpi/img_no_stream_preview.png and b/com.discord/res/drawable-mdpi/img_no_stream_preview.png differ
diff --git a/com.discord/res/drawable-mdpi/img_plus_illo.png b/com.discord/res/drawable-mdpi/img_plus_illo.png
index 696466a640..a7660a165d 100644
Binary files a/com.discord/res/drawable-mdpi/img_plus_illo.png and b/com.discord/res/drawable-mdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-mdpi/img_wumpus_game_launcher.png b/com.discord/res/drawable-mdpi/img_wumpus_game_launcher.png
index 279099be68..6b74b5fd9a 100644
Binary files a/com.discord/res/drawable-mdpi/img_wumpus_game_launcher.png and b/com.discord/res/drawable-mdpi/img_wumpus_game_launcher.png differ
diff --git a/com.discord/res/drawable-xhdpi/drawable_nitro_server_boost.png b/com.discord/res/drawable-xhdpi/drawable_nitro_server_boost.png
index 6888b236fa..6c06f24fbe 100644
Binary files a/com.discord/res/drawable-xhdpi/drawable_nitro_server_boost.png and b/com.discord/res/drawable-xhdpi/drawable_nitro_server_boost.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_boosted_badge_12dp.png b/com.discord/res/drawable-xhdpi/ic_boosted_badge_12dp.png
index 2851120adf..70982538b1 100644
Binary files a/com.discord/res/drawable-xhdpi/ic_boosted_badge_12dp.png and b/com.discord/res/drawable-xhdpi/ic_boosted_badge_12dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_boosted_badge_24dp.png b/com.discord/res/drawable-xhdpi/ic_boosted_badge_24dp.png
index 49f5a2e372..8f2981840a 100644
Binary files a/com.discord/res/drawable-xhdpi/ic_boosted_badge_24dp.png and b/com.discord/res/drawable-xhdpi/ic_boosted_badge_24dp.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_member_list_boosted_badge_24dp.png b/com.discord/res/drawable-xhdpi/ic_member_list_boosted_badge_24dp.png
index 77c240aa00..749ddebcd6 100644
Binary files a/com.discord/res/drawable-xhdpi/ic_member_list_boosted_badge_24dp.png and b/com.discord/res/drawable-xhdpi/ic_member_list_boosted_badge_24dp.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_premium_guild_subscription.png b/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png
index e42eaacf23..82aa4d09fe 100644
Binary files a/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png and b/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.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_no_stream_preview.png b/com.discord/res/drawable-xhdpi/img_no_stream_preview.png
index 371c6f323a..a750f20edf 100644
Binary files a/com.discord/res/drawable-xhdpi/img_no_stream_preview.png and b/com.discord/res/drawable-xhdpi/img_no_stream_preview.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_plus_illo.png b/com.discord/res/drawable-xhdpi/img_plus_illo.png
index af39b1a52b..5478a00a62 100644
Binary files a/com.discord/res/drawable-xhdpi/img_plus_illo.png and b/com.discord/res/drawable-xhdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_wumpus_game_launcher.png b/com.discord/res/drawable-xhdpi/img_wumpus_game_launcher.png
index 92f1346fbd..3641008d1e 100644
Binary files a/com.discord/res/drawable-xhdpi/img_wumpus_game_launcher.png and b/com.discord/res/drawable-xhdpi/img_wumpus_game_launcher.png differ
diff --git a/com.discord/res/drawable-xxhdpi/drawable_nitro_server_boost.png b/com.discord/res/drawable-xxhdpi/drawable_nitro_server_boost.png
index b70c5e681d..deca158ae2 100644
Binary files a/com.discord/res/drawable-xxhdpi/drawable_nitro_server_boost.png and b/com.discord/res/drawable-xxhdpi/drawable_nitro_server_boost.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_boosted_badge_12dp.png b/com.discord/res/drawable-xxhdpi/ic_boosted_badge_12dp.png
index 1261217556..9be6dbb0e5 100644
Binary files a/com.discord/res/drawable-xxhdpi/ic_boosted_badge_12dp.png and b/com.discord/res/drawable-xxhdpi/ic_boosted_badge_12dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_boosted_badge_24dp.png b/com.discord/res/drawable-xxhdpi/ic_boosted_badge_24dp.png
index 0b5f1896ab..ba125bff4c 100644
Binary files a/com.discord/res/drawable-xxhdpi/ic_boosted_badge_24dp.png and b/com.discord/res/drawable-xxhdpi/ic_boosted_badge_24dp.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_member_list_boosted_badge_24dp.png b/com.discord/res/drawable-xxhdpi/ic_member_list_boosted_badge_24dp.png
index 3806d30244..35f140e3ea 100644
Binary files a/com.discord/res/drawable-xxhdpi/ic_member_list_boosted_badge_24dp.png and b/com.discord/res/drawable-xxhdpi/ic_member_list_boosted_badge_24dp.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_premium_guild_subscription.png b/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png
index 9de0ba8fde..87e0f90b2e 100644
Binary files a/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png and b/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.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/img_no_stream_preview.png b/com.discord/res/drawable-xxhdpi/img_no_stream_preview.png
index daad649a16..1433af01af 100644
Binary files a/com.discord/res/drawable-xxhdpi/img_no_stream_preview.png and b/com.discord/res/drawable-xxhdpi/img_no_stream_preview.png differ
diff --git a/com.discord/res/drawable-xxhdpi/img_plus_illo.png b/com.discord/res/drawable-xxhdpi/img_plus_illo.png
index c375738a92..6f96960f0a 100644
Binary files a/com.discord/res/drawable-xxhdpi/img_plus_illo.png and b/com.discord/res/drawable-xxhdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-xxhdpi/img_wumpus_game_launcher.png b/com.discord/res/drawable-xxhdpi/img_wumpus_game_launcher.png
index 22bac4a608..59fdbecaa4 100644
Binary files a/com.discord/res/drawable-xxhdpi/img_wumpus_game_launcher.png and b/com.discord/res/drawable-xxhdpi/img_wumpus_game_launcher.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/drawable_nitro_server_boost.png b/com.discord/res/drawable-xxxhdpi/drawable_nitro_server_boost.png
index 006fbad1e0..17075b0e26 100644
Binary files a/com.discord/res/drawable-xxxhdpi/drawable_nitro_server_boost.png and b/com.discord/res/drawable-xxxhdpi/drawable_nitro_server_boost.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_boosted_badge_12dp.png b/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_12dp.png
index 49f5a2e372..8f2981840a 100644
Binary files a/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_12dp.png and b/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_12dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_24dp.png
index 00a485984e..e328983825 100644
Binary files a/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_24dp.png and b/com.discord/res/drawable-xxxhdpi/ic_boosted_badge_24dp.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_member_list_boosted_badge_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_member_list_boosted_badge_24dp.png
index 34f9f308ee..5355ee8e3f 100644
Binary files a/com.discord/res/drawable-xxxhdpi/ic_member_list_boosted_badge_24dp.png and b/com.discord/res/drawable-xxxhdpi/ic_member_list_boosted_badge_24dp.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_premium_guild_subscription.png b/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png
index 7d60b11f89..113b9e31a3 100644
Binary files a/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png and b/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.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_no_stream_preview.png b/com.discord/res/drawable-xxxhdpi/img_no_stream_preview.png
index b5209e22f9..3e6ac6751d 100644
Binary files a/com.discord/res/drawable-xxxhdpi/img_no_stream_preview.png and b/com.discord/res/drawable-xxxhdpi/img_no_stream_preview.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_plus_illo.png b/com.discord/res/drawable-xxxhdpi/img_plus_illo.png
index d9e0b6caee..982c661509 100644
Binary files a/com.discord/res/drawable-xxxhdpi/img_plus_illo.png and b/com.discord/res/drawable-xxxhdpi/img_plus_illo.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_wumpus_game_launcher.png b/com.discord/res/drawable-xxxhdpi/img_wumpus_game_launcher.png
index 9e58e7ed0a..8bbd85cfbe 100644
Binary files a/com.discord/res/drawable-xxxhdpi/img_wumpus_game_launcher.png and b/com.discord/res/drawable-xxxhdpi/img_wumpus_game_launcher.png differ
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/layout-v17/widget_chat_list_adapter_item_game_invite.xml b/com.discord/res/layout-v17/view_chat_embed_game_invite.xml
similarity index 95%
rename from com.discord/res/layout-v17/widget_chat_list_adapter_item_game_invite.xml
rename to com.discord/res/layout-v17/view_chat_embed_game_invite.xml
index 34d51d8756..44c05a9637 100644
--- a/com.discord/res/layout-v17/widget_chat_list_adapter_item_game_invite.xml
+++ b/com.discord/res/layout-v17/view_chat_embed_game_invite.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Chat.Embed.Container"
+<merge 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/item_game_invite_cover_image" android:background="@drawable/drawable_game_invite_cover_image_background" android:layout_width="128.0dip" android:layout_height="0.0dip" android:scaleType="centerCrop" android:alpha="0.4" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_min="128.0dip" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:overlayImage="@drawable/drawable_game_invite_gradient_overlay" app:roundBottomLeft="false" app:roundTopLeft="false" app:roundedCornerRadius="4.0dip" app:viewAspectRatio="1.0" />
     <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
@@ -7,4 +7,4 @@
     <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView" android:id="@id/item_game_invite_action_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/game_action_button_play" app:backgroundTint="@color/status_green_500" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/item_game_invite_status" app:layout_constraintVertical_bias="1.0" style="@style/Widget.MaterialComponents.Button" />
     <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" app:layout_constraintBottom_toTopOf="@id/item_game_invite_action_btn" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_status" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_status" app:layout_constraintTop_toBottomOf="@id/item_game_invite_status" app:layout_constraintVertical_bias="1.0" app:layout_goneMarginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
     <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" android:textAlignment="viewEnd" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</merge>
\ 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_incoming_share.xml b/com.discord/res/layout-v17/widget_incoming_share.xml
index 5cec147da8..42f60ccfe8 100644
--- a/com.discord/res/layout-v17/widget_incoming_share.xml
+++ b/com.discord/res/layout-v17/widget_incoming_share.xml
@@ -8,6 +8,7 @@
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:paddingTop="@dimen/uikit_spacing_medium" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
             <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/external_share_list" android:background="?container_bg_dark_a60" android:visibility="gone" android:clipToPadding="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
+            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/external_share_activity_action_preview" android:background="?chat_embed_bg" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout" />
             <EditText android:id="@id/external_share_comment" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:hint="@string/add_a_comment_optional" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
             <TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
             <com.discord.app.AppViewFlipper android:id="@id/search_flipper" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
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..2a7affa256
--- /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" android:importantForAccessibility="no" />
+    </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 5800faedff..d92cfe9004 100644
--- a/com.discord/res/layout-v17/widget_stream_rich_presence.xml
+++ b/com.discord/res/layout-v17/widget_stream_rich_presence.xml
@@ -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_sheet.xml b/com.discord/res/layout-v17/widget_user_sheet.xml
index 8666e3de9c..d63a40a5c8 100644
--- a/com.discord/res/layout-v17/widget_user_sheet.xml
+++ b/com.discord/res/layout-v17/widget_user_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:background="?primary_630_bg" 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">
+    <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
         <FrameLayout android:background="?primary_700" android:layout_width="fill_parent" android:layout_height="wrap_content">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_sheet_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" app:user_profile_header_background_color="?primary_700" />
             <ImageView android:layout_gravity="end|center|top" android:id="@id/user_sheet_more_button" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="?ic_more" android:contentDescription="@string/more" style="@style/UiKit.ImageView.Clickable" />
@@ -20,16 +20,24 @@
             <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_ignore_button" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/friend_request_ignore" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Button.Compact.Grey" />
             <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Button.Compact.Green" />
         </LinearLayout>
-        <View android:id="@id/user_sheet_audio_settings_divider" style="@style/UiKit.Divider" />
+        <View android:id="@id/user_sheet_audio_settings_divider" android:visibility="gone" style="@style/UiKit.Divider" />
         <com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView android:id="@id/user_sheet_profile_voice_settings_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <FrameLayout android:id="@id/rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
         <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" />
+            <View android:id="@id/user_sheet_guild_divider" android:visibility="gone" 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" />
             <com.discord.widgets.user.profile.UserProfileAdminView android:id="@id/user_sheet_admin_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         </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_connections_divider" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_connections_header" android:text="@string/connections" style="@style/UiKit.Settings.Item.Header" />
+        <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@id/user_sheet_connections_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/user_sheet_note_divider" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_note_header" android:text="@string/note" style="@style/UiKit.Settings.Item.Header" />
+        <com.google.android.material.textfield.TextInputLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit.Form.Field.EditText.Wrap">
+            <com.discord.app.AppEditText android:id="@id/user_sheet_note_text_field" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/note_placeholder_mobile" android:maxLength="256" style="@style/UiKit.Form.Field.EditText" />
+        </com.google.android.material.textfield.TextInputLayout>
         <View android:id="@id/user_sheet_actions_divider" 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" />
diff --git a/com.discord/res/layout-v21/widget_incoming_share.xml b/com.discord/res/layout-v21/widget_incoming_share.xml
index fe345e6ebb..b9627a7e4f 100644
--- a/com.discord/res/layout-v21/widget_incoming_share.xml
+++ b/com.discord/res/layout-v21/widget_incoming_share.xml
@@ -8,6 +8,7 @@
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:paddingTop="@dimen/uikit_spacing_medium" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
             <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/external_share_list" android:background="?container_bg_dark_a60" android:visibility="gone" android:clipToPadding="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
+            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/external_share_activity_action_preview" android:background="?chat_embed_bg" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:elevation="@dimen/app_elevation" style="@style/UiKit.ViewGroup.ConstraintLayout" />
             <EditText android:id="@id/external_share_comment" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:hint="@string/add_a_comment_optional" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
             <TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
             <com.discord.app.AppViewFlipper android:id="@id/search_flipper" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
diff --git a/com.discord/res/layout-v21/widget_user_sheet.xml b/com.discord/res/layout-v21/widget_user_sheet.xml
index efcd530ac0..ca57195764 100644
--- a/com.discord/res/layout-v21/widget_user_sheet.xml
+++ b/com.discord/res/layout-v21/widget_user_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:background="?primary_630_bg" 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">
+    <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
         <FrameLayout android:background="?primary_700" android:layout_width="fill_parent" android:layout_height="wrap_content" android:elevation="@dimen/uikit_elevation_low">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_sheet_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" app:user_profile_header_background_color="?primary_700" />
             <ImageView android:layout_gravity="end|center|top" android:id="@id/user_sheet_more_button" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="?ic_more" android:contentDescription="@string/more" style="@style/UiKit.ImageView.Clickable" />
@@ -20,16 +20,24 @@
             <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_ignore_button" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/friend_request_ignore" android:layout_weight="1.0" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Button.Compact.Grey" />
             <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Button.Compact.Green" />
         </LinearLayout>
-        <View android:id="@id/user_sheet_audio_settings_divider" style="@style/UiKit.Divider" />
+        <View android:id="@id/user_sheet_audio_settings_divider" android:visibility="gone" style="@style/UiKit.Divider" />
         <com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView android:id="@id/user_sheet_profile_voice_settings_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <FrameLayout android:id="@id/rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
         <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" />
+            <View android:id="@id/user_sheet_guild_divider" android:visibility="gone" 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" />
             <com.discord.widgets.user.profile.UserProfileAdminView android:id="@id/user_sheet_admin_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         </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_connections_divider" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_connections_header" android:text="@string/connections" style="@style/UiKit.Settings.Item.Header" />
+        <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@id/user_sheet_connections_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/user_sheet_note_divider" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_note_header" android:text="@string/note" style="@style/UiKit.Settings.Item.Header" />
+        <com.google.android.material.textfield.TextInputLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit.Form.Field.EditText.Wrap">
+            <com.discord.app.AppEditText android:id="@id/user_sheet_note_text_field" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/note_placeholder_mobile" android:maxLength="256" style="@style/UiKit.Form.Field.EditText" />
+        </com.google.android.material.textfield.TextInputLayout>
         <View android:id="@id/user_sheet_actions_divider" 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" />
diff --git a/com.discord/res/layout/connected_account_actions_dialog.xml b/com.discord/res/layout/connected_account_actions_dialog.xml
new file mode 100644
index 0000000000..2d70d55e77
--- /dev/null
+++ b/com.discord/res/layout/connected_account_actions_dialog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:background="?primary_630" android:minWidth="328.0dip" style="@style/UiKit.Dialog.Container"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView android:id="@id/connected_account_actions_dialog_header" android:background="?primary_700" style="@style/UiKit.ListItem.Icon" />
+    <TextView android:id="@id/connected_account_actions_dialog_open_in_browser" android:visibility="gone" android:text="@string/open_in_browser" style="@style/UiKit.ListItem" />
+    <TextView android:id="@id/connected_account_actions_dialog_copy_username" android:text="@string/copy_username" style="@style/UiKit.ListItem" />
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/icon_list_item_text_view.xml b/com.discord/res/layout/icon_list_item_text_view.xml
new file mode 100644
index 0000000000..678c4db535
--- /dev/null
+++ b/com.discord/res/layout/icon_list_item_text_view.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView style="@style/UiKit.ListItem.Icon" />
\ 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_connections_view.xml b/com.discord/res/layout/user_profile_connections_view.xml
new file mode 100644
index 0000000000..85060d7191
--- /dev/null
+++ b/com.discord/res/layout/user_profile_connections_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView android:id="@id/user_profile_connections_mutual_guilds_item" android:text="@string/mutual_guilds" android:drawableRight="?ic_navigate_next" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
+    <TextView android:id="@id/user_profile_connections_mutual_friends_item" android:text="@string/mutual_friends" android:drawableRight="?ic_navigate_next" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.ListItem.Icon" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/user_profile_connections_view_recycler" style="@style/UiKit.ViewGroup.RecyclerView" />
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_chat_embed_game_invite.xml b/com.discord/res/layout/view_chat_embed_game_invite.xml
new file mode 100644
index 0000000000..74e659f0ce
--- /dev/null
+++ b/com.discord/res/layout/view_chat_embed_game_invite.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge 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/item_game_invite_cover_image" android:background="@drawable/drawable_game_invite_cover_image_background" android:layout_width="128.0dip" android:layout_height="0.0dip" android:scaleType="centerCrop" android:alpha="0.4" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_min="128.0dip" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:overlayImage="@drawable/drawable_game_invite_gradient_overlay" app:roundBottomLeft="false" app:roundTopLeft="false" app:roundedCornerRadius="4.0dip" app:viewAspectRatio="1.0" />
+    <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
+    <TextView android:textSize="18.0sp" android:textColor="?primary_100" android:id="@id/item_game_invite_status" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_header" app:layout_constraintStart_toStartOf="@id/item_game_invite_header" app:layout_constraintTop_toBottomOf="@id/item_game_invite_header" style="@style/UiKit.TextView" />
+    <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView" android:id="@id/item_game_invite_action_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/game_action_button_play" app:backgroundTint="@color/status_green_500" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/item_game_invite_status" app:layout_constraintVertical_bias="1.0" style="@style/Widget.MaterialComponents.Button" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" app:layout_constraintBottom_toTopOf="@id/item_game_invite_action_btn" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_status" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_status" app:layout_constraintTop_toBottomOf="@id/item_game_invite_status" app:layout_constraintVertical_bias="1.0" app:layout_goneMarginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
+    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
+</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..905e918dbf
--- /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="@string/stream_capture_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_loading_button.xml b/com.discord/res/layout/view_loading_button.xml
index 4fd7a7ba26..68c73b0b0d 100644
--- a/com.discord/res/layout/view_loading_button.xml
+++ b/com.discord/res/layout/view_loading_button.xml
@@ -2,5 +2,5 @@
 <merge android:layout_width="wrap_content" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:textColor="@color/primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/loading_button_text" android:textAllCaps="true" app:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-    <ProgressBar android:id="@id/loading_button_progress" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/loading_button_text" app:layout_constraintHeight_max="48.0dip" app:layout_constraintLeft_toLeftOf="@id/loading_button_text" app:layout_constraintRight_toRightOf="@id/loading_button_text" app:layout_constraintTop_toTopOf="@id/loading_button_text" />
+    <ProgressBar android:id="@id/loading_button_progress" android:visibility="invisible" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/loading_button_text" app:layout_constraintHeight_max="48.0dip" app:layout_constraintLeft_toLeftOf="@id/loading_button_text" app:layout_constraintRight_toRightOf="@id/loading_button_text" app:layout_constraintTop_toTopOf="@id/loading_button_text" />
 </merge>
\ No newline at end of file
diff --git a/com.discord/res/layout/view_video_call_participant.xml b/com.discord/res/layout/view_video_call_participant.xml
index 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/widget_chat_list_adapter_item_game_invite.xml b/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml
index 484b622cd9..2d7c7889cd 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.Chat.Embed.Container"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_game_invite_cover_image" android:background="@drawable/drawable_game_invite_cover_image_background" android:layout_width="128.0dip" android:layout_height="0.0dip" android:scaleType="centerCrop" android:alpha="0.4" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_min="128.0dip" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:overlayImage="@drawable/drawable_game_invite_gradient_overlay" app:roundBottomLeft="false" app:roundTopLeft="false" app:roundedCornerRadius="4.0dip" app:viewAspectRatio="1.0" />
-    <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
-    <TextView android:textSize="18.0sp" android:textColor="?primary_100" android:id="@id/item_game_invite_status" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_header" app:layout_constraintStart_toStartOf="@id/item_game_invite_header" app:layout_constraintTop_toBottomOf="@id/item_game_invite_header" style="@style/UiKit.TextView" />
-    <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView" android:id="@id/item_game_invite_action_btn" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/game_action_button_play" app:backgroundTint="@color/status_green_500" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/item_game_invite_status" app:layout_constraintVertical_bias="1.0" style="@style/Widget.MaterialComponents.Button" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" app:layout_constraintBottom_toTopOf="@id/item_game_invite_action_btn" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_status" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_status" app:layout_constraintTop_toBottomOf="@id/item_game_invite_status" app:layout_constraintVertical_bias="1.0" app:layout_goneMarginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+<com.discord.widgets.chat.list.ViewEmbedGameInvite style="@style/UiKit.Chat.Embed.Container" />
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_incoming_share.xml b/com.discord/res/layout/widget_incoming_share.xml
index b3ea1ae9d3..13b733ff1a 100644
--- a/com.discord/res/layout/widget_incoming_share.xml
+++ b/com.discord/res/layout/widget_incoming_share.xml
@@ -8,6 +8,7 @@
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" android:baselineAligned="false" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:paddingTop="@dimen/uikit_spacing_medium" android:text="@string/message_preview" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
             <androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/external_share_list" android:background="?container_bg_dark_a60" android:visibility="gone" android:clipToPadding="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" style="@style/UiKit.ViewGroup.RecyclerView" />
+            <com.discord.widgets.chat.list.ViewEmbedGameInvite android:id="@id/external_share_activity_action_preview" android:background="?chat_embed_bg" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout" />
             <EditText android:id="@id/external_share_comment" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:hint="@string/add_a_comment_optional" android:inputType="textAutoComplete|textAutoCorrect|textCapSentences" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.SingleLine" />
             <TextView android:text="@string/share_to" android:textAllCaps="true" style="@style/UiKit.Search.Header" />
             <com.discord.app.AppViewFlipper android:id="@id/search_flipper" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
diff --git a/com.discord/res/layout/widget_server_boost_confirmation.xml b/com.discord/res/layout/widget_server_boost_confirmation.xml
index cc60e81332..983368f0f7 100644
--- a/com.discord/res/layout/widget_server_boost_confirmation.xml
+++ b/com.discord/res/layout/widget_server_boost_confirmation.xml
@@ -20,7 +20,6 @@
                             </androidx.cardview.widget.CardView>
                         </androidx.constraintlayout.widget.ConstraintLayout>
                     </androidx.cardview.widget.CardView>
-                    <TextView android:id="@id/boost_confirmation_warning" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_cooldown_warning" style="@style/UiKit.TextView" />
                 </LinearLayout>
             </ScrollView>
             <LinearLayout android:id="@id/boost_confirmation_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
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..51c3e558a3
--- /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" android:importantForAccessibility="no" />
+    </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 df08f14bee..ffb62276d8 100644
--- a/com.discord/res/layout/widget_stream_rich_presence.xml
+++ b/com.discord/res/layout/widget_stream_rich_presence.xml
@@ -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_mutual_friends.xml b/com.discord/res/layout/widget_user_mutual_friends.xml
index 3243aaeea1..d6a65751b1 100644
--- a/com.discord/res/layout/widget_user_mutual_friends.xml
+++ b/com.discord/res/layout/widget_user_mutual_friends.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView android:id="@id/user_mutual_friends_recycler_view" style="@style/UiKit.ViewGroup.RecyclerView"
-  xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
+<LinearLayout android:background="?primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.appbar.AppBarLayout android:id="@id/user_mutual_friends_toolbar_layout" android:background="?primary_700" style="@style/AppTheme.AppBarLayout.Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_back" style="@style/AppTheme.Toolbar.Transparent" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/user_mutual_friends_recycler_view" style="@style/UiKit.ViewGroup.RecyclerView" />
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_mutual_guilds.xml b/com.discord/res/layout/widget_user_mutual_guilds.xml
index 92ca1bc4f9..a3d64f8d33 100644
--- a/com.discord/res/layout/widget_user_mutual_guilds.xml
+++ b/com.discord/res/layout/widget_user_mutual_guilds.xml
@@ -1,3 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView android:id="@id/user_mutual_guilds_recycler_view" style="@style/UiKit.ViewGroup.RecyclerView"
-  xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
+<LinearLayout android:background="?primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.appbar.AppBarLayout android:id="@id/user_mutual_guilds_toolbar_layout" android:background="?primary_700" style="@style/AppTheme.AppBarLayout.Flat">
+        <androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_back" style="@style/AppTheme.Toolbar.Transparent" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/user_mutual_guilds_recycler_view" style="@style/UiKit.ViewGroup.RecyclerView" />
+</LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml
index 0f0294da3d..c5dd7da5f3 100644
--- a/com.discord/res/layout/widget_user_sheet.xml
+++ b/com.discord/res/layout/widget_user_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView android:background="?primary_630_bg" 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">
+    <LinearLayout android:focusable="true" android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
         <FrameLayout android:background="?primary_700" android:layout_width="fill_parent" android:layout_height="wrap_content">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_sheet_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" app:user_profile_header_background_color="?primary_700" />
             <ImageView android:layout_gravity="end|center|top" android:id="@id/user_sheet_more_button" android:background="?bg_pressed_highlight" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:src="?ic_more" android:contentDescription="@string/more" style="@style/UiKit.ImageView.Clickable" />
@@ -20,16 +20,24 @@
             <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_ignore_button" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/friend_request_ignore" android:layout_weight="1.0" style="@style/UiKit.Button.Compact.Grey" />
             <com.google.android.material.button.MaterialButton android:id="@id/user_sheet_friend_request_accept_button" android:text="@string/friend_request_accept" android:layout_weight="1.0" style="@style/UiKit.Button.Compact.Green" />
         </LinearLayout>
-        <View android:id="@id/user_sheet_audio_settings_divider" style="@style/UiKit.Divider" />
+        <View android:id="@id/user_sheet_audio_settings_divider" android:visibility="gone" style="@style/UiKit.Divider" />
         <com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView android:id="@id/user_sheet_profile_voice_settings_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/user_sheet_activity_divider" android:visibility="gone" style="@style/UiKit.Divider" />
+        <FrameLayout android:id="@id/rich_presence_container" android:visibility="gone" style="@style/UiKit.ViewGroup" />
         <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" />
+            <View android:id="@id/user_sheet_guild_divider" android:visibility="gone" 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" />
             <com.discord.widgets.user.profile.UserProfileAdminView android:id="@id/user_sheet_admin_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         </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_connections_divider" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_connections_header" android:text="@string/connections" style="@style/UiKit.Settings.Item.Header" />
+        <com.discord.widgets.user.profile.UserProfileConnectionsView android:id="@id/user_sheet_connections_view" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <View android:id="@id/user_sheet_note_divider" style="@style/UiKit.Divider" />
+        <TextView android:id="@id/user_sheet_note_header" android:text="@string/note" style="@style/UiKit.Settings.Item.Header" />
+        <com.google.android.material.textfield.TextInputLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:counterEnabled="true" app:counterMaxLength="256" style="@style/UiKit.Form.Field.EditText.Wrap">
+            <com.discord.app.AppEditText android:id="@id/user_sheet_note_text_field" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/note_placeholder_mobile" android:maxLength="256" style="@style/UiKit.Form.Field.EditText" />
+        </com.google.android.material.textfield.TextInputLayout>
         <View android:id="@id/user_sheet_actions_divider" 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" />
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/raw/emoji_1f3f5.png b/com.discord/res/raw/emoji_1f3f5.png
index d994905a26..0ba33a9051 100644
Binary files a/com.discord/res/raw/emoji_1f3f5.png and b/com.discord/res/raw/emoji_1f3f5.png differ
diff --git a/com.discord/res/raw/emoji_1f5f3.png b/com.discord/res/raw/emoji_1f5f3.png
index 2de745b594..c9cabef7e2 100644
Binary files a/com.discord/res/raw/emoji_1f5f3.png and b/com.discord/res/raw/emoji_1f5f3.png differ
diff --git a/com.discord/res/raw/emoji_1f93e.png b/com.discord/res/raw/emoji_1f93e.png
index 29f68cc574..52d1697eca 100644
Binary files a/com.discord/res/raw/emoji_1f93e.png and b/com.discord/res/raw/emoji_1f93e.png differ
diff --git a/com.discord/res/raw/emoji_1f93e_1f3fb.png b/com.discord/res/raw/emoji_1f93e_1f3fb.png
index f28cf12e6f..ffccf53f4e 100644
Binary files a/com.discord/res/raw/emoji_1f93e_1f3fb.png and b/com.discord/res/raw/emoji_1f93e_1f3fb.png differ
diff --git a/com.discord/res/raw/emoji_1f93e_1f3fc.png b/com.discord/res/raw/emoji_1f93e_1f3fc.png
index d657a29c03..0d8cf3975c 100644
Binary files a/com.discord/res/raw/emoji_1f93e_1f3fc.png and b/com.discord/res/raw/emoji_1f93e_1f3fc.png differ
diff --git a/com.discord/res/raw/emoji_1f93e_1f3fd.png b/com.discord/res/raw/emoji_1f93e_1f3fd.png
index 6c0ced02f7..eecec7ae3d 100644
Binary files a/com.discord/res/raw/emoji_1f93e_1f3fd.png and b/com.discord/res/raw/emoji_1f93e_1f3fd.png differ
diff --git a/com.discord/res/raw/emoji_1f93e_1f3fe.png b/com.discord/res/raw/emoji_1f93e_1f3fe.png
index 6e1a8b4606..9ed75bc553 100644
Binary files a/com.discord/res/raw/emoji_1f93e_1f3fe.png and b/com.discord/res/raw/emoji_1f93e_1f3fe.png differ
diff --git a/com.discord/res/raw/emoji_1f93e_1f3ff.png b/com.discord/res/raw/emoji_1f93e_1f3ff.png
index 0beb7ded01..84d9f329f7 100644
Binary files a/com.discord/res/raw/emoji_1f93e_1f3ff.png and b/com.discord/res/raw/emoji_1f93e_1f3ff.png differ
diff --git a/com.discord/res/values-bg/plurals.xml b/com.discord/res/values-bg/plurals.xml
index 98ba9feeba..220a401089 100644
--- a/com.discord/res/values-bg/plurals.xml
+++ b/com.discord/res/values-bg/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d години</item>
         <item quantity="one">%d година</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d месеца</item>
-        <item quantity="one">%d месец</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d години</item>
-        <item quantity="one">%d година</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">месеца</item>
         <item quantity="one">месец</item>
@@ -466,16 +458,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d общи сървъри</item>
-        <item quantity="zero">0 общи сървъри</item>
-        <item quantity="one">1 общ сървър</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d дни</item>
         <item quantity="one">1 ден</item>
@@ -549,10 +531,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d усилвания</item>
         <item quantity="one">%d усилване</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d усилвания</item>
         <item quantity="one">%d усилване</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d дни</item>
-        <item quantity="one">%d ден</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d усилвания на сървър</item>
         <item quantity="one">%d усилване на сървър</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d месеца</item>
         <item quantity="one">%d месец</item>
     </plurals>
@@ -597,10 +571,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d дни</item>
         <item quantity="one">%d ден</item>
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index 31267d75dd..eb5395a531 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -638,7 +638,6 @@
     <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>
@@ -695,8 +694,6 @@
     <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_source_invalid">Този източник на плащане е невалиден.</string>
     <string name="billing_payment_sources">Методи на плащане</string>
     <string name="billing_payment_table_header_amount">Сума</string>
@@ -714,13 +711,11 @@
     <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>
@@ -742,6 +737,10 @@
     <string name="billing_step_review">Преглед</string>
     <string name="billing_step_select_plan">Избери план</string>
     <string name="billing_subscribe">Абонирай се</string>
+    <string name="billing_switch_plan_change">Промяна на план</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Разбрах!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Супер!</string>
+    <string name="billing_switch_plan_upgrade">Надгради</string>
     <string name="billing_tag_failed">Неуспешни</string>
     <string name="billing_tag_pending">Чакащи</string>
     <string name="billing_tag_refunded">Върнати суми</string>
@@ -1791,11 +1790,8 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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_nitro_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_success_premium_tier_2_monthly">Благодарение на друг щедър човек, сега имаш достъп до подобрени чат бонуси и усилване на сървър за %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2148,9 +2144,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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>
@@ -2167,16 +2161,12 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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_title">Статус на усилване на сървър</string>
     <string name="guild_settings_premium_guild_unlocked">Отключен</string>
+    <string name="guild_settings_premium_upsell_learn_more">Научи повече за Discord Nitro</string>
     <string name="guild_settings_server_banner">Банер за сървър</string>
     <string name="guild_settings_server_invite_background">Фон на покана за сървър</string>
     <string name="guild_settings_splash_info">Това изображение ще се покаже, когато потребителите получат покана за сървъра.</string>
@@ -2186,6 +2176,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
 
 Ако имаш достъп до потребителите на твоя сайт, можеш да добавяш динамично &amp;username= към низа за запитване."</string>
     <string name="guild_settings_widget_enable_widget">Активиране на изпълним модул на сървър</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Данни за покупка</string>
     <string name="guild_verification_text_account_age">Акаунтът ти трябва да бъде поне на %1$s минути, за да можеш да изпращаш съобщения в този сървър.</string>
     <string name="guild_verification_text_member_age">Трябва да си член от поне %1$s минути, за да изпращаш съобщения в този сървър.</string>
     <string name="guild_verification_text_not_claimed">Трябва да регистрираш и потвърдиш своя акаунт, за да можеш да изпращаш съобщения в този сървър.</string>
@@ -2536,10 +2527,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="ios_media_keyboard_take_a_photo">Направи снимка</string>
     <string name="ios_notification_see_full">Натисни, за да видиш цялото съобщение.</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="ios_view_all">Виж всички</string>
     <string name="ip_address_secured">IP адресът е защитен</string>
@@ -2853,7 +2840,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="network_error_unknown">Възникна неизвестна мрежова грешка.</string>
     <string name="network_error_unknown_host">Възникнала е грешка в мрежата. Моля, провери своите DNS настройки и опитай пак.</string>
     <string name="network_offline">Мрежовата връзка е ограничена или не е налична.</string>
-    <string name="nevermind">Няма значение</string>
     <string name="new_dm">Ново директно съобщение</string>
     <string name="new_group_dm">Ново групово DM</string>
     <string name="new_guilds_dm_allowed">Позволи директни съобщения от сървърните членове.</string>
@@ -2976,7 +2962,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="notice_no_input_detected_help_link_text">Помощ!</string>
     <string name="notice_no_input_detected_settings">Изглежда Discord не може да открие входящ сигнал от микрофона ти. Нека оправим това!</string>
     <string name="notice_no_input_detected_settings_link_text">Отиди в Настройки</string>
-    <string name="notice_premium_grandfathered_ended">Достъпът ти до Nitro изтече. Надгради от Nitro Classic до Nitro за супер заредени чат бонуси и усилване на сървър.</string>
     <string name="notice_premium_grandfathered_ending">Остава ти само %1$s с Nitro игри! Абонаментът ти става Nitro Classic на **%2$s**.</string>
     <string name="notice_premium_promo_action">Разгледай</string>
     <string name="notice_premium_promo_message">Подкрепи развитието на Discord и получете забавни бонуси!</string>
@@ -3209,7 +3194,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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_button_premium_gift">Купи подарък</string>
     <string name="payment_modal_one_month">1 месец</string>
     <string name="payment_modal_one_year">1 година</string>
     <string name="payment_modal_per_month">На месец</string>
@@ -3320,9 +3305,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
 Можеш да рестартираш абонамента си по всяко време."</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">"Отказът ще влезе в сила в края на текущия период на таксуване. На **%1$s** ще изгубиш достъп до Nitro, твоят Discord Tag ще бъде рандомизиран, ако си го променил, и твоето усилване на сървър ще бъде премахнато.
-
- Можеш да рестартиращ абонамента си по всяко време."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Отказът ще влезе в сила в края на текущия период на таксуване. На **%1$s** ще изгубиш достъп до Nitro, твоят Discord Tag ще бъде рандомизиран, ако си го променил, и твоето усилване на сървър ще бъде премахнато.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Можеш да рестартиращ абонамента си по всяко време.</string>
     <string name="premium_cancel_confirm_mobile">Откажи Nitro</string>
@@ -3345,7 +3327,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="premium_chat_perks_description_streaming">Стриймвай при източника с Nitro или с чисти до 1080 p, 60 fps с Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Качване на файлове с по-голям размер от %1$s на %2$s с Nitro или %3$s с Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Усили любимия си сървър!</string>
-    <string name="premium_chat_perks_simple_title">Без усложнения – вземи основните чат бонуси без усилване на сървър.</string>
     <string name="premium_chat_perks_streaming_mobile">По-добри Go Live стриймове: Стриймвай при източника с Nitro или с чисти до 1080 p, 60 fps с Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Анимирано забавление</string>
     <string name="premium_chat_perks_title_badge">Представлявай твоята поддръжка</string>
@@ -3384,41 +3365,20 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="premium_grandfathered_yearly">В знак на благодарност, че подкрепяш Discord, имаш достъп до Nitro за две години. Достъпът ти приключва на **%1$s**.</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_description">Вземи специална сървърна роля, достъпна само за усилващи сървъри с Nitro в твоя сървър.</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_description">Усилващите получават блестящ нов бадж на профил, който се променя с тяхната печеливша поредица.</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 усилване до сървър! [Научи повече за усилване на сървъри с Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Надстрой абонамента си, за да изпратиш Nitro усилване до сървър! [Научи повече за усилване на сървъри с 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">В момента не поддържаме надграждане на Nitro за абонаменти чрез Apple. Можеш да прекратиш абонамента си чрез [Управлението на абонаменти на 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>
@@ -3431,44 +3391,32 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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_duration_mobile">%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_0">Няма ниво</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_month_subscription">**%1$s%2$s %3$s** / месец</string>
@@ -3481,7 +3429,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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">Подари на приятелите си [Nitro](onClick), за да получат супер заредени чат бонуси и усилване на сървър.</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>
@@ -3496,7 +3443,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="premium_plan_month_tier_1">Nitro Classic месечно</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">Вземи Nitro!</string>
@@ -3515,26 +3461,10 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <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_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>
@@ -4094,8 +4024,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
     <string name="stop_streaming">Спиране на стриймването</string>
     <string name="stop_watching">Спиране на гледането</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>
diff --git a/com.discord/res/values-cs/plurals.xml b/com.discord/res/values-cs/plurals.xml
index aef8ebbe15..348f877679 100644
--- a/com.discord/res/values-cs/plurals.xml
+++ b/com.discord/res/values-cs/plurals.xml
@@ -342,16 +342,6 @@
         <item quantity="one">%d rok</item>
         <item quantity="few">%d roky</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d měsíců</item>
-        <item quantity="one">%d měsíc</item>
-        <item quantity="few">%d měsíce</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d let</item>
-        <item quantity="one">%d rok</item>
-        <item quantity="few">%d roky</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">měsíců</item>
         <item quantity="one">měsíc</item>
@@ -531,18 +521,6 @@
         <item quantity="other">%d použitích</item>
         <item quantity="one">%d použití</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d společných přátel</item>
-        <item quantity="zero">0 společných přátel</item>
-        <item quantity="one">1 společný přítel</item>
-        <item quantity="few">%d společní přátelé</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d společných serverů</item>
-        <item quantity="zero">0 společných serverů</item>
-        <item quantity="one">1 společný server</item>
-        <item quantity="few">%d společné servery</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dny</item>
         <item quantity="one">1 dnem</item>
@@ -624,10 +602,6 @@
         <item quantity="other">%d měsíců</item>
         <item quantity="one">1 měsíc</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d vylepšení</item>
-        <item quantity="one">%d vylepšení</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d dalších vylepšení</item>
         <item quantity="one">%d další vylepšení</item>
@@ -642,16 +616,11 @@
         <item quantity="other">%d vylepšení</item>
         <item quantity="one">%d vylepšení</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dní</item>
-        <item quantity="one">%d den</item>
-        <item quantity="few">%d dny</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d vylepšení serveru</item>
         <item quantity="one">%d vylepšení serveru</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d měsíců</item>
         <item quantity="one">%d měsíc</item>
         <item quantity="few">%d měsíce</item>
@@ -676,10 +645,6 @@
         <item quantity="other">%d m</item>
         <item quantity="one">%d m</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** vylepšení</item>
-        <item quantity="one">**%d** vylepšení</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d d</item>
         <item quantity="one">%d d</item>
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index 68293a8ef3..4eea266b05 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -618,7 +618,6 @@ Obejít ban může být velice obtížné, pokud v [možnostech správce](onMode
     <string name="billing">Fakturace</string>
     <string name="billing_accept_terms_tooltip">Abys mohl/a pokračovat, odsouhlas podmínky využívání služeb.</string>
     <string name="billing_account_credit">Kredit na účtu</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s měsíce zdarma</string>
     <string name="billing_add_payment_method">Přidat platební metodu</string>
     <string name="billing_address">Fakturační adresa</string>
     <string name="billing_address_address">Adresa</string>
@@ -675,8 +674,6 @@ Obejít ban může být velice obtížné, pokud v [možnostech správce](onMode
     <string name="billing_payment_choose_plan">Vyber si plán</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](%2$s). %1$s je předplatné, které se automaticky prodlužuje. Dáváš Discordu oprávnění, abychom ti prostřednictvím zvolené platební metody okamžitě strhli %3$s a abychom tak činili automaticky každý měsíc, dokud předplatné nezrušíš. Zrušit ho 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](%2$s). %1$s je předplatné, které se automaticky prodlužuje. Dáváš Discordu oprávnění, abychom ti prostřednictvím zvolené platební metody okamžitě strhli %3$s a abychom tak činili automaticky každý rok, dokud předplatné nezrušíš. Zrušit ho můžeš kdykoliv.</string>
     <string name="billing_payment_source_invalid">Tento způsob platby je neplatný.</string>
     <string name="billing_payment_sources">Platební metody</string>
     <string name="billing_payment_table_header_amount">Množství</string>
@@ -694,13 +691,11 @@ Obejít ban může být velice obtížné, pokud v [možnostech správce](onMode
     <string name="billing_price_per_month_current_plan">(AKTUÁLNÍ PLÁN) %1$s za měsíc</string>
     <string name="billing_price_per_month_current_plan_ios">(Aktuální plán) %1$s za měsíc</string>
     <string name="billing_price_per_month_mobile">%1$s/měsíc</string>
-    <string name="billing_price_per_month_upgrade">Vylepšit za %1$s na měsíc</string>
     <string name="billing_price_per_year">%1$s / rok</string>
     <string name="billing_price_per_year_current_plan">(AKTUÁLNÍ PLÁN) %1$s za rok</string>
     <string name="billing_price_per_year_current_plan_ios">(Aktuální plán) %1$s za rok</string>
     <string name="billing_price_per_year_mobile">%1$s/rok</string>
     <string name="billing_price_per_year_months_free">%1$s za rok (2 měsíce zdarma)</string>
-    <string name="billing_price_per_year_upgrade">Vylepšit za %1$s na rok</string>
     <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>
@@ -722,6 +717,10 @@ Obejít ban může být velice obtížné, pokud v [možnostech správce](onMode
     <string name="billing_step_review">Kontrola</string>
     <string name="billing_step_select_plan">Vybrat plán</string>
     <string name="billing_subscribe">Přihlásit se k odběru</string>
+    <string name="billing_switch_plan_change">Změnit plán</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Rozumím!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Paráda!</string>
+    <string name="billing_switch_plan_upgrade">Upgradovat</string>
     <string name="billing_tag_failed">Selhalo</string>
     <string name="billing_tag_pending">Nevyřízeno</string>
     <string name="billing_tag_refunded">Vráceny peníze</string>
@@ -1769,11 +1768,8 @@ Děkujeme, že to tu udržuješ v bezpečí a pořádku."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Díky dalšímu štědrému člověku máš nyní %1$s na %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Díky dalšímu štědrému člověku máš nyní %1$s na %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** máš nyní ve své knihovně.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Díky dalšímu štědrému člověku máš nyní přístup k ještě lepším vylepšením chatu a serveru na dobu %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Díky dalšímu štědrému člověku máš nyní přístup k ještě lepším vylepšením chatu na %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Díky dalšímu štědrému člověku máš nyní přístup k ještě lepším vylepšením chatu na %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Díky dalšímu štědrému člověku máš nyní přístup k ještě lepším vylepšením chatu a serveru na %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Díky dalšímu štědrému člověku máš nyní přístup k ještě lepším vylepšením chatu a serveru na %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Stalo se něco nečekaného a nepodařilo se nám zajistit pytel… máme to zkusit znovu?</string>
     <string name="gift_confirmation_button_confirm">Jasně, že jo! Přidat do knihovny</string>
     <string name="gift_confirmation_button_confirm_mobile">Sem s tím</string>
@@ -2124,9 +2120,7 @@ Ztraceno: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">Další pozice (+%1$s) pro smajlíky serveru (celkem pro %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Limit nahrávání %1$s pro všechny členy</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Výhody vylepšení serveru zahrnují –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Zatím nikdo nepropůjčil tomuto serveru Nitro. Uvidíme, jestli někdo ze členů bude tak laskavý a propůjčí tvému serveru výhody Nitra platné pro celý server.</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Vylepšené servery získají vše výše uvedené a k tomu –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Žádné vylepšení Nitrem</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Výhody pro Úroveň 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Výhody pro Úroveň 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Výhody pro Úroveň 3</string>
@@ -2143,16 +2137,12 @@ Ztraceno: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Vylepšení %1$s. úrovně odemčeno</string>
     <string name="guild_settings_overview_notice">Opatrně! Máš tu neuložené změny!</string>
     <string name="guild_settings_overview_tier_info">Toto je funkce Nitro %1$s. úrovně. [Zkontroluj stav své úrovně](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Členové serveru s aktivním předplatným Nitro mohou pomoct odemknout úrovně propůjčením svého stavu Nitro.
-S každou dosaženou úrovní členové serveru pomohou odemknout výhody pro všechny.
-
-Členové mohou své vylepšení kdykoli odvolat.
-**Při ztrátě úrovně si server zachová výhody po dobu tří dnů. **[Zjistit víc o vylepšení serveru Nitrem.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Už jen %1$s do následující úrovně!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** tento server.</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Stav vylepšení serveru Nitrem</string>
+    <string name="guild_settings_premium_guild_title">Stav vylepšení serveru</string>
     <string name="guild_settings_premium_guild_unlocked">Odemčeno</string>
+    <string name="guild_settings_premium_upsell_learn_more">Zjistit víc o Discord Nitro</string>
     <string name="guild_settings_server_banner">Banner serveru</string>
     <string name="guild_settings_server_invite_background">Pozadí pozvánky na server</string>
     <string name="guild_settings_splash_info">Tento obrázek se zobrazí, když uživatelé dostanou pozvánku na server.</string>
@@ -2162,6 +2152,7 @@ S každou dosaženou úrovní členové serveru pomohou odemknout výhody pro v
 
 Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu dynamicky přidat &amp;username=."</string>
     <string name="guild_settings_widget_enable_widget">Zapnout widget serveru</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Podrobnosti nákupu</string>
     <string name="guild_verification_text_account_age">Tvůj účet musí být starý alespoň %1$s minut abys mohl/a posílat zprávy.</string>
     <string name="guild_verification_text_member_age">Musíš být členem alespoň %1$s minut, abys mohl/a odesílat zprávy na tomto serveru.</string>
     <string name="guild_verification_text_not_claimed">Abys na tomto serveru mohl/a posílat zprávy, musíš svůj účet přihlásit a ověřit.</string>
@@ -2510,10 +2501,6 @@ Chceš se o Discordu dozvědět víc?"</string>
     <string name="ios_media_keyboard_take_a_photo">Vyfotit</string>
     <string name="ios_notification_see_full">Klepnutím zobrazíš celou zprávu.</string>
     <string name="ios_profile_in_voice_call">V hlasovém hovoru</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Společní přátelé</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Společné servery</string>
     <string name="ios_profile_open_voice_channel">Otevřít hlasový kanál</string>
     <string name="ios_view_all">Zobrazit vše</string>
     <string name="ip_address_secured">IP adresa zajištěna</string>
@@ -2827,7 +2814,6 @@ pouze mezi kanály, do kterých mají přístup oba uživatelé."</string>
     <string name="network_error_unknown">Došlo k neznámé chybě sítě.</string>
     <string name="network_error_unknown_host">Došlo k chybě sítě. Zkontroluj nastavení DNS a zkus to znovu.</string>
     <string name="network_offline">Připojení k síti je omezené nebo nedostupné.</string>
-    <string name="nevermind">Nevadí</string>
     <string name="new_dm">Nová přímá zpráva</string>
     <string name="new_group_dm">Nová skupinová přímá zpráva</string>
     <string name="new_guilds_dm_allowed">Povolit přímé zprávy od členů serveru.</string>
@@ -2951,7 +2937,6 @@ připnuté zprávy… zatím."</string>
     <string name="notice_no_input_detected_help_link_text">Pomoc!</string>
     <string name="notice_no_input_detected_settings">Vypadá to, že Discord neregistruje žádný vstup z tvého mikrofonu. Pojďme to opravit!</string>
     <string name="notice_no_input_detected_settings_link_text">Otevřít nastavení</string>
-    <string name="notice_premium_grandfathered_ended">Tvůj přístup do Nitra vypršel. Chceš-li supervylepšení chatu a serveru, přejdi z Nitra Classic na Nitro.</string>
     <string name="notice_premium_grandfathered_ending">Zbývá ti už jenom %1$s z předplatného Nitro! Tvé předplatné klesne na Nitro Classic **%2$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>
@@ -3182,7 +3167,7 @@ Překrytí také nemusí fungovat každému. Pokud máš problémy nebo dotazy,
     <string name="payment_modal_button_change_card">Aktualizovat kreditní kartu</string>
     <string name="payment_modal_button_change_paypal">Aktualizovat účet PayPal</string>
     <string name="payment_modal_button_premium">Získat %1$s</string>
-    <string name="payment_modal_button_premium_gift">Koupit %1$s</string>
+    <string name="payment_modal_button_premium_gift">Koupit dárek</string>
     <string name="payment_modal_one_month">1 měsíc</string>
     <string name="payment_modal_one_year">1 rok</string>
     <string name="payment_modal_per_month">Měsíčně</string>
@@ -3293,9 +3278,6 @@ Překrytí také nemusí fungovat každému. Pokud máš problémy nebo dotazy,
 Své předplatné můžeš kdykoliv obnovit."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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ý.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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í. Dne **%1$s** ti vyprší přístup k Nitru, tvůj Discord tag bude opět náhodný, pokud sis ho změnil/a a zmizí tvá vylepšení serveru.
-
- Své předplatné můžeš kdykoliv obnovit."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Zrušení provedeme na konci stávajícího zúčtovacího období. Dne **%1$s** ti vyprší přístup k Nitru, tvůj Discord tag bude opět náhodný, pokud sis ho změnil/a a zmizí tvá vylepšení serveru.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Své předplatné můžeš kdykoliv obnovit.</string>
     <string name="premium_cancel_confirm_mobile">Zrušit Nitro</string>
@@ -3318,7 +3300,6 @@ Své předplatné můžeš kdykoliv obnovit."</string>
     <string name="premium_chat_perks_description_streaming">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_description_upload_limit">Navýšení velikosti nahrávaných souborů z %1$s na %2$s s Nitro nebo %3$s s Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Vylepši svůj oblíbený server!</string>
-    <string name="premium_chat_perks_simple_title">Nekomplikuj to – pořiď si základní vylepšení chatu bez vylepšení serveru.</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>
@@ -3357,41 +3338,20 @@ Své předplatné můžeš kdykoliv obnovit."</string>
     <string name="premium_grandfathered_yearly">Jako poděkování za podpoření Discordu získáváš na dva roky přístup k Nitru. Tvůj přístup skončí **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Vylepšovač vychladne za: **%1$s d %2$s h %3$s m**</string>
     <string name="premium_guild_features_blurb">Když vylepšíš server svým předplatným Nitro, pomůžeš mu dostat se na další úroveň. Za každou dosaženou úroveň se odemknou vylepšení chatu **pro všechny uživatele na daném serveru!** Tady je pár příkladů sladkých odměn:</string>
-    <string name="premium_guild_features_customize_guild_description">Odemkni přizpůsobení jako například pozadí pozvánek, banner serveru, vlastní adresu URL apod.</string>
     <string name="premium_guild_features_customize_guild_mobile">Přizpůsobení serveru</string>
-    <string name="premium_guild_features_customize_guild_title">Přizpůsobení serveru</string>
     <string name="premium_guild_features_learn_more_button">Zjistit víc o Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Získej vylepšený Discord – stačí ti i jediný malý měsíční poplatek.</string>
     <string name="premium_guild_features_more">A další! Můžeš se mrknout na aktuální úroveň, postup v rámci úrovně a dostupné odměny v rámci serveru.</string>
-    <string name="premium_guild_features_new_role_description">Získej pro svůj server speciální roli, která je dostupná jenom uživatelům vylepšujícím server Nitrem.</string>
-    <string name="premium_guild_features_new_role_mobile">Exkluzivní role pro uživatele vylepšující server Nitrem</string>
-    <string name="premium_guild_features_new_role_title">Exkluzivní nová role</string>
-    <string name="premium_guild_features_show_support_description">Vylepšující uživatelé získají nový blyštivý odznak na profil, který se bude měnit podle jejich rozletu.</string>
     <string name="premium_guild_features_show_support_mobile">Nový odznak na profil, který se v průběhu času mění</string>
-    <string name="premium_guild_features_show_support_title">Ukaž svou podporu</string>
     <string name="premium_guild_features_title">S Nitrem můžeš pomoct vylepšit server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Nahrávání větších souborů pro celou komunitu</string>
-    <string name="premium_guild_features_upload_sizes_title">Možnost nahrávat větší soubory pro všechny</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Zaregistruj se do Nitra a posílej vylepšení Nitrem na server! [Zjistit víc o vylepšování serverů Nitrem.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Upgraduj své předplatné a posílej vylepšení Nitrem na server! [Zjistit víc o vylepšování serverů Nitrem.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Žádná vylepšení Nitrem</string>
     <string name="premium_guild_header_badge_no_tier">Žádná úroveň</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Vylepšení serveru Nitrem</string>
     <string name="premium_guild_perks_modal_base_perks">Výhody vylepšení serveru zahrnují –</string>
-    <string name="premium_guild_perks_modal_blurb">"S každou dosaženou úrovní členové tohoto serveru pomohou odemknout výhody pro všechny. Tyto výhody budou platit pouze na daném serveru.
-
-**Vylepšovači získají: ikonu seznamu členů, nový rozvíjející odznak a roli určenou pouze pro vylepšovače.**
-
-[Zjistit víc o vylepšování serveru Nitrem.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">S každou dosaženou úrovní členové tohoto serveru pomohou odemknout výhody pro všechny. Tyto výhody budou platit pouze na daném serveru.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Vylepšovači získají: ikonu seznamu členů, nový rozvíjející odznak a roli určenou pouze pro vylepšovače.** [Zjistit víc o vylepšování serveru Nitrem.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Pořiď si Nitro a vylepšuj!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Vylepšit tento server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Upgraduj na Nitro a vylepšuj!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Momentálně nepodporujeme upgrady na Nitro pro předplatné prostřednictvím platformy Apple. Svoje předplatné můžeš zrušit přes [Správu předplatného Apple](%1$s), ale toto předplatné zůstane aktivní až do data vypršení jeho platnosti.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic nezahrnuje vylepšení serveru</string>
     <string name="premium_guild_perks_modal_header">Stav vylepšení serveru</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** vylepšení</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Spravuj své vylepšení</string>
     <string name="premium_guild_perks_modal_no_tiers">Zatím žádné dosažené úrovně</string>
@@ -3404,44 +3364,32 @@ Své předplatné můžeš kdykoliv obnovit."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s tento server</string>
     <string name="premium_guild_settings_members_subscribed_needed">Potřebuješ **%1$s** k odemknutí %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Opravdu chceš poslat vylepšení Nitrem serveru:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Vybrat tento server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Vyber tento server. Chvíli potrvá, než se vylepšení projeví.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Pokud vylepšíš tento server, tak potom %1$s nebudeš moct vylepšit žádný jiný server. Když vylepšení odebereš, tento interval se nezkrátí.**</string>
     <string name="premium_guild_subscribe_confirm_header">Vybírej pečlivě!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Prohledat servery</string>
     <string name="premium_guild_subscribe_select_guild_header">Vybrat server</string>
     <string name="premium_guild_subscribe_success_thanks">Děkujeme za vylepšení!</string>
     <string name="premium_guild_subscription_available_count">Máš k dispozici **%1$s**!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Při pokusu o vylepšení došlo k chybě. Zkus to prosím znovu.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Zdá se, že tvůj vylepšovač ještě chladne. Počkej **%1$s a %2$s** a pak to zkus znovu</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Zdá se, že tvůj vylepšovač ještě chladne. Počkej **%1$s a %2$s** a pak to zkus znovu</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Zdá se, že tvůj vylepšovač ještě chladne. Počkej **%1$s** a pak to zkus znovu</string>
     <string name="premium_guild_subscription_no_next_tier">Tento server má pěkně našlápnuto! Pokračuj ve vylepšování!</string>
-    <string name="premium_guild_subscription_notice">Jsou tady vylepšení serveru Nitrem! Sežeň členy své komunity, aby vylepšili tvůj server.</string>
     <string name="premium_guild_subscription_notice_button">Zobrazit úrovně a výhody</string>
-    <string name="premium_guild_subscription_notice_small_guild">Jsou tady vylepšení serveru Nitrem! Sežeň své přátele, aby vylepšili tvůj server.</string>
     <string name="premium_guild_subscription_remove_button">Odebrat vylepšení</string>
     <string name="premium_guild_subscription_remove_error_mobile">Při pokusu o odebrání vylepšení došlo k chybě. Zkus to prosím znovu.</string>
     <string name="premium_guild_subscription_select_server_button">Vybrat server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Využij svou sílu Nitra a vylepši server, ke kterému ses připojil/a! Tím tomuto serveru pomůžeš přejít na vyšší úroveň. Každá získaná úroveň znamená kolektivní odměny pro celý server.
-Po vylepšení serveru pak budeš muset nechat 7 dní svůj vylepšovač vychladnout. To znamená, že po tuto dobu nebudeš moct vylepšit žádný další server – a to ani v případě, že provedené vylepšení odebereš. [Zjistit víc o vylepšování serverů Nitrem.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Využij svou sílu Nitra a vylepši server, ke kterému ses připojil/a! Tím tomuto serveru pomůžeš přejít na vyšší úroveň. Každá získaná úroveň znamená kolektivní odměny pro celý server.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Po vylepšení serveru pak budeš muset nechat 7 dní svůj vylepšovač vychladnout. To znamená, že po tuto dobu nebudeš moct vylepšit žádný další server – a to ani v případě, že provedené vylepšení odebereš. [Zjistit víc o vylepšování serverů Nitrem.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Vylepšení serveru Nitrem</string>
-    <string name="premium_guild_subscription_tooltip">Nitro vylepšení od %1$s</string>
+    <string name="premium_guild_tier_0">Žádná úroveň</string>
     <string name="premium_guild_tier_1">Úroveň 1</string>
     <string name="premium_guild_tier_2">Úroveň 2</string>
     <string name="premium_guild_tier_3">Úroveň 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Opravdu chceš odebrat vylepšení Nitrem serveru:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ano, odebrat vylepšení</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Tento server ztratí postup, pokud své vylepšení odebereš.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Tento server ztratí postup, pokud své vylepšení odebereš. **Tvůj vylepšovač ještě chladne. Vylepšení bude znovu dostupné za %1$s a %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Tento server ztratí postup, pokud své vylepšení odebereš. **Tvůj vylepšovač ještě chladne. Vylepšení bude znovu dostupné za %1$s a %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Tento server ztratí postup, pokud své vylepšení odebereš. **Tvůj vylepšovač ještě chladne. Vylepšení bude znovu dostupné za %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Odebrat vylepšení Nitrem?</string>
     <string name="premium_included">Hry, které jsou součástí Nitra:</string>
     <string name="premium_info_monthly">%1$s (měsíčně) se strhne %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / měsíc</string>
@@ -3453,7 +3401,6 @@ Po vylepšení serveru pak budeš muset nechat 7 dní svůj vylepšovač vychlad
     <string name="premium_payment_confirmation_blurb_iap">Teď si můžeš vyzvednout %1$s pomocí svého předplatného Nitro. Pojď si pro ten nášup!!!</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_button_regular">Oki, to zní dobře</string>
-    <string name="premium_payment_gift_blurb">Daruj svým přátelům [Nitro](onClick), aby si taky mohli užít extra nabušená vylepšení chatu a serveru.</string>
     <string name="premium_payment_gift_blurb_mobile">Daruj někomu Nitro, aby mohl získat přístup k extra nabušeným vylepšením chatu a vylepšování serverů. [Zjistit víc o Nitru.](onClick)</string>
     <string name="premium_payment_gift_subtext">Strhneme ti jednorázový poplatek za zvolené období. Měsíčně ti nebudeme nic účtovat.</string>
     <string name="premium_payment_is_gift">Nakupuješ dárek.</string>
@@ -3468,7 +3415,6 @@ Po vylepšení serveru pak budeš muset nechat 7 dní svůj vylepšovač vychlad
     <string name="premium_plan_month_tier_1">Měsíční Nitro Classic</string>
     <string name="premium_plan_month_tier_2">Měsíční Nitro</string>
     <string name="premium_promo_autocomplete">Upravení smajlíci kdekoliv</string>
-    <string name="premium_promo_description">Vzlétni s Discord Nitro a používej animované a upravené smajlíky na jakémkoliv serveru.</string>
     <string name="premium_promo_title">Chceš mocnější smajlíky?</string>
     <string name="premium_required">Vyžaduje Nitro</string>
     <string name="premium_required_get_nitro">Pořiď si Nitro!</string>
@@ -3487,26 +3433,10 @@ Po vylepšení serveru pak budeš muset nechat 7 dní svůj vylepšovač vychlad
     <string name="premium_tier_2_title">Získej vylepšený Discord za jediný malý měsíční poplatek.</string>
     <string name="premium_trial_button">Začni své zkušební období zdarma</string>
     <string name="premium_upgrade_cancel">Ne</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Přejdi na roční plán a získáš dva měsíce zdarma. A to se vyplatí!
-
-Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za rok. Bude tě to stát **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Přejdi na roční plán a získáš dva měsíce zdarma. A to se vyplatí!
-
-Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za rok. Bude tě to stát **%1$s** teď a **%2$s ročně po skončení aktuální zúčtovacího období.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Upgraduj svůj (měsíční) plán %1$s a získej možnost vylepšovat servery. Tvůj nový plán začne platit okamžitě.
-
-Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za měsíc. Bude tě to stát **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Upgraduj svůj (měsíční) plán %1$s a získej možnost vylepšovat servery. Tvůj nový plán začne platit okamžitě.
-
-Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za měsíc. Bude tě to stát **%2$s** teď a **%3$s měsíčně po skončení aktuální zúčtovacího období.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Upgraduj svůj (měsíční) plán %1$s a získej možnost vylepšovat servery. Tvůj nový plán začne platit okamžitě.
 
 Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za rok. Bude tě to stát **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Upgraduj svůj (měsíční) plán %1$s a získej možnost vylepšovat servery. Tvůj nový plán začne platit okamžitě.
-
-Také poměrně rozdělíme aktuální plán a odečteme ho z ceny za rok. Bude tě to stát **%2$s** teď a **%3$s ročně po skončení aktuální zúčtovacího období.**"</string>
     <string name="premium_upgrade_confirm_button">Upgradovat</string>
-    <string name="premium_upgrade_confirm_button_with_price">Upgradovat teď – %1$s</string>
     <string name="premium_upgrade_confirm_title">Vylepšit na %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Pokud už máš Nitro, nemůžeš se zaregistrovat.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Tvůj aktuální plán.</string>
@@ -4056,8 +3986,6 @@ Určitě to chceš udělat?"</string>
     <string name="stop_streaming">Zastavit streamování</string>
     <string name="stop_watching">Zastavit sledování</string>
     <string name="store_channel">Kanál obchodu</string>
-    <string name="store_payment_legalese_monthly">Čau! Zakoupením %1$s souhlasíš s našimi [podmínkami využívání služeb](%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](%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>
diff --git a/com.discord/res/values-da/plurals.xml b/com.discord/res/values-da/plurals.xml
index 2cc799ca1d..2887b1889e 100644
--- a/com.discord/res/values-da/plurals.xml
+++ b/com.discord/res/values-da/plurals.xml
@@ -291,14 +291,6 @@
         <item quantity="other">%d år</item>
         <item quantity="one">%d år</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d måneder</item>
-        <item quantity="one">%d måned</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d år</item>
-        <item quantity="one">%d år</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">måneder</item>
         <item quantity="one">måned</item>
@@ -455,16 +447,6 @@
         <item quantity="other">%d anvendelser</item>
         <item quantity="one">%d anvendelse</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d Gensidige venner</item>
-        <item quantity="zero">0 Gensidige venner</item>
-        <item quantity="one">1 Gensidige ven</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d Gensidige servere</item>
-        <item quantity="zero">0 Gensidige servere</item>
-        <item quantity="one">1 Gensidige server</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dage</item>
         <item quantity="one">1 dag</item>
@@ -538,10 +520,6 @@
         <item quantity="other">%d måneder</item>
         <item quantity="one">1 måned</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d Boost</item>
-        <item quantity="one">%d Boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d flere boost</item>
         <item quantity="one">%d mere boost</item>
@@ -554,15 +532,11 @@
         <item quantity="other">%d Boost</item>
         <item quantity="one">%d Boost</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dage</item>
-        <item quantity="one">%d dag</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d server boost</item>
         <item quantity="one">%d server boost</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d måneder</item>
         <item quantity="one">%d Måned</item>
     </plurals>
@@ -586,10 +560,6 @@
         <item quantity="other">%d minutter</item>
         <item quantity="one">%d minut</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** boost</item>
-        <item quantity="one">**%d** boost</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d dage</item>
         <item quantity="one">%d dag</item>
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index b6e32a90b7..4a0eb1c6de 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -614,7 +614,6 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing">Fakturering</string>
     <string name="billing_accept_terms_tooltip">Acceptér Servicevilkår for at fortsætte</string>
     <string name="billing_account_credit">Konto kreditering</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s måneder gratis</string>
     <string name="billing_add_payment_method">Tilføj betalingsmetode</string>
     <string name="billing_address">Faktureringsadresse</string>
     <string name="billing_address_address">Adresse</string>
@@ -672,8 +671,6 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing_payment_choose_plan">Vælg en aftale</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 [Servicevilkår](%2$s). %1$s er et automatisk løbende 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 [Servicevilkår](%2$s). %1$s er et automatisk løbende 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_source_invalid">Denne betalingskilde kan ikke anvendes.</string>
     <string name="billing_payment_sources">Betalingsmetoder</string>
     <string name="billing_payment_table_header_amount">Beløb</string>
@@ -691,13 +688,11 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing_price_per_month_current_plan">(NUVÆRENDE AFTALE) %1$s / Måned</string>
     <string name="billing_price_per_month_current_plan_ios">(Nuværende aftale) %1$s / Måned</string>
     <string name="billing_price_per_month_mobile">%1$s / MÅ</string>
-    <string name="billing_price_per_month_upgrade">Opgradér for %1$s / måned</string>
     <string name="billing_price_per_year">%1$s / år</string>
     <string name="billing_price_per_year_current_plan">(NUVÆRENDE AFTALE) %1$s / År</string>
     <string name="billing_price_per_year_current_plan_ios">(Nuværende aftale) %1$s / År</string>
     <string name="billing_price_per_year_mobile">%1$s / ÅR</string>
     <string name="billing_price_per_year_months_free">%1$s /-År-(2 måneder gratis)</string>
-    <string name="billing_price_per_year_upgrade">Upgradér for %1$s / år</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>
@@ -719,6 +714,10 @@ men hvis og når du skal, må du ikke tøve."</string>
     <string name="billing_step_review">Gennemse</string>
     <string name="billing_step_select_plan">Vælg aftale</string>
     <string name="billing_subscribe">Tilmeld dig</string>
+    <string name="billing_switch_plan_change">Skift plan</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Forstået!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Herligt!</string>
+    <string name="billing_switch_plan_upgrade">Opgrader</string>
     <string name="billing_tag_failed">Mislykkedes</string>
     <string name="billing_tag_pending">Afventer</string>
     <string name="billing_tag_refunded">Refunderet</string>
@@ -1760,11 +1759,8 @@ for at kunne observere indgangsfølsomheden."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Takket være et andet generøst menneske, har du nu %1$s i %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Takket være et andet generøst menneske, har du nu %1$s i %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** er blevet tilføjet til dit bibliotek.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Takket være et andet generøst menneske, har du nu adgang til forbedrede Chat-frynsegoder og et server boost til %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Takket være et andet generøst menneske, har du nu adgang til forbedrede Chat-frynsegoder til %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Takket være et andet generøst menneske, har du nu adgang til forbedrede Chat-frynsegoder til %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Takket være et andet generøst menneske, har du nu adgang til forbedrede Chat-frynsegoder og et server boost til %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Takket være et andet generøst menneske, har du nu adgang til forbedrede Chat-frynsegoder og et server boost til %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Noget mærkelig skete, og det lykkedes os ikke at sikre tasken… forsøg igen?</string>
     <string name="gift_confirmation_button_confirm">Ja for pokker! Føj til bibliotek</string>
     <string name="gift_confirmation_button_confirm_mobile">Giv den til mig</string>
@@ -2116,9 +2112,7 @@ Tabt: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s server-emoji felter (til et total på %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s uploadbegrænsning for alle medlemmer</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Boostede serverfrynsegoder inkluderer –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Ingen har foræret Nitro til denne server endnu. Se om nogen medlemmer vil være så venlige at forære din server Nitro frynsegoder som gælder hele serveren!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Boostede server for alt de tidligere har fået, og –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Ingen Nitro-boost</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Niveau 1 frynsegoder</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Niveau 2 frynsegoder</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Niveau 3 frynsegoder</string>
@@ -2135,16 +2129,12 @@ Tabt: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Trancher %1$s frynsegode er låst op</string>
     <string name="guild_settings_overview_notice">Vær forsigtig! Du har ikke-gemte ændringer.</string>
     <string name="guild_settings_overview_tier_info">Dette er en trancher %1$s Nitro egenskab. [Kontroller din trancher status](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Medlemmer af serveren med et aktivt Nitro-abonnement, kan hjælpe med at låse op for niveauer ved at forære deres Nitro status.
-For hvert niveau der er opnået, vil medlemmerne af serveren hjælp med at låse op for frynsegoder til alle.
-
-Medlemmer kan fjerne deres boost når som helst.
-**Serveren vil beholde frynsegoderne i tre dage hvis et niveau er tabt. **[Lær mere omkring Nitro serverboost.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Kun %1$s indtil næste niveau!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** boostet denne server</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro serverboost status</string>
+    <string name="guild_settings_premium_guild_title">Serverboost status</string>
     <string name="guild_settings_premium_guild_unlocked">Låst op</string>
+    <string name="guild_settings_premium_upsell_learn_more">Lær mere om Discord Nitro</string>
     <string name="guild_settings_server_banner">Serverbanner</string>
     <string name="guild_settings_server_invite_background">Serverinvitationsbaggrund</string>
     <string name="guild_settings_splash_info">Dette billede vil blive vist, når brugere får en invitation til serveren.</string>
@@ -2154,6 +2144,7 @@ Medlemmer kan fjerne deres boost når som helst.
 
 Hvis du har adgang til dit websteds brugere, kan du dynamisk tilføje &amp;username= til en spørgestreng."</string>
     <string name="guild_settings_widget_enable_widget">Aktivér server-widget</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Detaljer omkring købet</string>
     <string name="guild_verification_text_account_age">Din konto skal være mindst %1$s minutter gammel for at sende beskeder i denne server.</string>
     <string name="guild_verification_text_member_age">Du skal være medlem i mindst %1$s minutter for at sende beskeder i denne server.</string>
     <string name="guild_verification_text_not_claimed">Du skal kræve og bekræfte din konto, før du kan sende beskeder i denne server.</string>
@@ -2502,10 +2493,6 @@ Vil du vide mere om Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Tag et foto</string>
     <string name="ios_notification_see_full">Tryk for at se den fulde besked.</string>
     <string name="ios_profile_in_voice_call">I et stemmeopkald</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Fælles venner</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Fælles servere</string>
     <string name="ios_profile_open_voice_channel">Åbn talekanal</string>
     <string name="ios_view_all">Se alt</string>
     <string name="ip_address_secured">IP-adresse sikret</string>
@@ -2814,7 +2801,6 @@ kanaler, både de og det medlem, de bevæger, har adgang til."</string>
     <string name="network_error_unknown">Der opstod en ukendt netværksfejl.</string>
     <string name="network_error_unknown_host">Der opstod en netværksfejl. Tjek dine DNS-indstillinger, og prøv igen.</string>
     <string name="network_offline">Netværkstilslutningen er begrænset eller utilgængelig.</string>
-    <string name="nevermind">Glem det</string>
     <string name="new_dm">Ny direkte besked</string>
     <string name="new_group_dm">Ny gruppe DM</string>
     <string name="new_guilds_dm_allowed">Tillad direkte beskeder fra servermedlemmer.</string>
@@ -2938,7 +2924,6 @@ ingen fastgjorte beskeder… endnu."</string>
     <string name="notice_no_input_detected_help_link_text">Hjælp!</string>
     <string name="notice_no_input_detected_settings">Nå, det ser ud til, at Discord ikke registrerer input fra din mikrofon. Lad os ordne det!</string>
     <string name="notice_no_input_detected_settings_link_text">Besøg indstillinger</string>
-    <string name="notice_premium_grandfathered_ended">Din adgang til Nitro er udløbet. Opgradering fra Nitro Classic til Nitro for superstyrede chatfrynsegoder, og et server Boost.</string>
     <string name="notice_premium_grandfathered_ending">Du har kun %1$s tilbage af Nitro! Dit abonnement nedgraderes til Nitro Classic den **%2$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>
@@ -3168,7 +3153,7 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
     <string name="payment_modal_button_change_card">Opdater kreditkort</string>
     <string name="payment_modal_button_change_paypal">Opdater PayPal-konto</string>
     <string name="payment_modal_button_premium">Hent %1$s</string>
-    <string name="payment_modal_button_premium_gift">Køb %1$s</string>
+    <string name="payment_modal_button_premium_gift">Køb gave</string>
     <string name="payment_modal_one_month">1 måned</string>
     <string name="payment_modal_one_year">1 år</string>
     <string name="payment_modal_per_month">Pr. måned</string>
@@ -3278,9 +3263,6 @@ Overlayet virker måske heller ikke for alle. Hvis du har problemer eller spørg
 Du kan tegne abonnement igen når som helst."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Afmelding træder i kraft ved udgangen af din nuværende periode på **%1$s**. Dit Discord-tag vil blive vilkårligt, hvis du har ændret det.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Du kan forny dit abonnement når som helst.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Afbestillingen træder i kraft ved udgangen af din aktuelle faktureringsperiode. Den **%1$s**, mister du adgangen til Nitro, dit Discord-tag vil blive randomiseret, hvis du har ændret det, og din Server Boost fjernes.
-
- Du kan forny dit abonnement når som helst."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Afbestillingen træder i kraft ved udgangen af din aktuelle faktureringsperiode. Den **%1$s**, mister du adgangen til Nitro, dit Discord-tag vil blive randomiseret, hvis du har ændret det, og din Server Boost fjernes.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Du kan forny dit abonnement når som helst.</string>
     <string name="premium_cancel_confirm_mobile">Afmeld Nitro</string>
@@ -3303,7 +3285,6 @@ Du kan tegne abonnement igen når som helst."</string>
     <string name="premium_chat_perks_description_streaming">Stream fra kilden med Nitro eller helt op til 1080p 60fps med Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Større upload af filstørrelser fra %1$s to %2$s med Nitro eller %3$s med Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Boost din yndlingsserver!</string>
-    <string name="premium_chat_perks_simple_title">Hold det enkelt - få basechat-frynsegoder uden Server Boost.</string>
     <string name="premium_chat_perks_streaming_mobile">Bedre Go Live streamer: Stream fra kilden med Nitro eller helt op til 1080p 60fps med Nitro Classic</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>
@@ -3342,41 +3323,20 @@ Du kan tegne abonnement igen når som helst."</string>
     <string name="premium_grandfathered_yearly">Som tak for din støtte til Discord, har du adgang til Nitro i to år. Din adgang slutter den **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boost cooldown: **%1$sd %2$st %3$sm**</string>
     <string name="premium_guild_features_blurb">Ved at booste en server med dit Nitro abonnement, vil du hjælpe serveren til at nærme sig et nyt niveau. For hvert niveau opnået, vil det låse op for chat-frynsegoder **for alle på den server!** Se et par af disse dejlige frynsegoder:</string>
-    <string name="premium_guild_features_customize_guild_description">Lås op for skræddersyninger såsom invitationsbaggrund, serverbanner, vanity-URL, osv.</string>
     <string name="premium_guild_features_customize_guild_mobile">Server-skræddersyninger</string>
-    <string name="premium_guild_features_customize_guild_title">Server-skræddersyninger</string>
     <string name="premium_guild_features_learn_more_button">Lær mere om Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Få en forbedret Discord oplevelse for helt ned til en lav månedlig udgift.</string>
     <string name="premium_guild_features_more">Og mere! Du kan se dit nuværende niveau, niveau-fremskridt og se tilgængelige frynsegoder på serveren.</string>
-    <string name="premium_guild_features_new_role_description">Få en speciel server-rolle som kun er tilgængelig for Nitro serverboostere.</string>
-    <string name="premium_guild_features_new_role_mobile">Eksklusive Nitro serverboost-roller</string>
-    <string name="premium_guild_features_new_role_title">Eksklusiv ny rolle</string>
-    <string name="premium_guild_features_show_support_description">Dem der booster, får et skinnende nyt profilbadge der skifter jævnført deres streak.</string>
     <string name="premium_guild_features_show_support_mobile">Et nyt profilbadge der skifter med tiden</string>
-    <string name="premium_guild_features_show_support_title">Vis din støtte</string>
     <string name="premium_guild_features_title">Med Nitro kan hjælpe med at booste en server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Forøgede filoverførsler for hele fællesskabet</string>
-    <string name="premium_guild_features_upload_sizes_title">Større filoverførsler for alle</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Tilmeld dig til Nitro for at sende et Nitro boost til en server! [Lær mere omkring Nitro serverboost.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Opgrader dit abonnement for at sende et Nitro boost til en server! [Lær mere omkring Nitro serverboost.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Ingen Nitro-boosts</string>
     <string name="premium_guild_header_badge_no_tier">Ingen niveau</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro serverboost</string>
     <string name="premium_guild_perks_modal_base_perks">Boostede serverfrynsegoder inkluderer –</string>
-    <string name="premium_guild_perks_modal_blurb">"For hvert niveau opnået, vil medlemmerne af denne server hjælpe med at låse op for frynsegoder for alle. Disse frynsegoder er kun tilgængelige på denne server.
-
- **Boostere får: Medlemsliste-ikon, et nyt udviklende emblem, og en kun booster-rolle.**
-
- [Lær mere omkring Nitro serverboost.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">For hvert niveau opnået, vil medlemmerne af denne server hjælpe med at låse op for frynsegoder for alle. Disse frynsegoder er kun tilgængelige på denne server.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Boostere får: Medlemsliste-ikon, et nyt udviklende emblem, og en kun booster-rolle.** [Lær mere omkring Nitro serverboost.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Få Nitro for at booste!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boost denne server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Opgrader til Nitro for at booste!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Vi understøtter for tiden ikke opgraderinger til Nitro for abonnementer igennem Apple. Du kan afmelde dit abonnement igennem [Apples Subscription Management](%1$s), men abonnementet vil forblive aktivt indtil udløbsdatoen.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic inkluderer ikke Server boosting</string>
     <string name="premium_guild_perks_modal_header">Serverboost status</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** Boost</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Styr dit boost</string>
     <string name="premium_guild_perks_modal_no_tiers">Ingen niveauer opnået endnu</string>
@@ -3389,44 +3349,32 @@ Du kan tegne abonnement igen når som helst."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s har boostet denne server</string>
     <string name="premium_guild_settings_members_subscribed_needed">Du har brug for **%1$s** for at låse op for %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Er du sikker på, at du vil sende et Nitro boost til:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Vælg denne server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Vælg denne server. Det vil tage et øjeblik før dit boost træder i kraft.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Hvis du booster denne server, vil du ikke kunne booste andre servere i %1$s. At fjerne dit boost, påvirker ikke cooldown perioden.**</string>
     <string name="premium_guild_subscribe_confirm_header">Foretag et klogt valg!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Søg efter servere</string>
     <string name="premium_guild_subscribe_select_guild_header">Vælg en server</string>
     <string name="premium_guild_subscribe_success_thanks">Tak for boostet!</string>
     <string name="premium_guild_subscription_available_count">Du har **%1$s** til rådighed!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Der opstod en fejl ved forsøg på boost. Prøv venligst igen.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Det ser ud som om du er i en cooldown periode. Vent venligst **%1$s and %2$s** før du prøver igen</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Det ser ud som om du er i en cooldown periode. Vent venligst **%1$s og %2$s** før du prøver igen</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Det ser ud som om du er i en cooldown periode. Vent venligst **%1$s** før du forsøger igen</string>
     <string name="premium_guild_subscription_no_next_tier">Denne server er fuldt ud aktiveret! Bliv ved med at booste!</string>
-    <string name="premium_guild_subscription_notice">Nitro serverboost er her! Saml dit fællesskab og boost din server.</string>
     <string name="premium_guild_subscription_notice_button">Se niveauer og frynsegoder</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro serverboost er her! Saml dine venner og boost din server.</string>
     <string name="premium_guild_subscription_remove_button">Fjern boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">Der opstod en fejl ved forsøg på at fjerne boost. Prøv venligst igen.</string>
     <string name="premium_guild_subscription_select_server_button">Vælg en server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Anvend dine Nitro-kræfter til at booste en server, du er tilsluttet! Ved at booste en server, tillader du den at komme nærmere mod niveauer. Hvert niveau giver kollektive frynsegoder til hele serveren.
- Ved at booste en server, aktiveres en 7 dages cooldown periode. Du kan ikke booste en anden server indtil denne cooldown periode er ovre, selv hvis du fjerner dit boost. [Lær mere omkring Nitro serverboost.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Anvend dine Nitro-kræfter til at booste en server, du er tilsluttet! Ved at booste en server, tillader du den at komme nærmere mod niveauer. Hvert niveau giver kollektive frynsegoder til hele serveren.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Ved at booste en server, aktiveres en 7 dages cooldown periode. Du kan ikke booste en anden server indtil denne cooldown periode er ovre, selv hvis du fjerner dit boost. [Lær mere omkring Nitro serverboost.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro serverboost</string>
-    <string name="premium_guild_subscription_tooltip">Nitro boosting siden %1$s</string>
+    <string name="premium_guild_tier_0">Ingen niveau</string>
     <string name="premium_guild_tier_1">Niveau 1</string>
     <string name="premium_guild_tier_2">Niveau 2</string>
     <string name="premium_guild_tier_3">Niveau 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Er du sikker på, at du vil fjerne Nitro boost fra:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ja, fjern boost</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Denne server vil miste fremskridt, hvis du fjerne boost.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Denne server vil miste fremskridt, hvis du fjerne boost. **Dit boost er fortsat i cooldown periode. Den er til rådighed om %1$s og %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Denne server vil miste fremskridt, hvis du fjerne boost. **Dit boost er fortsat i cooldown periode. Den er til rådighed om %1$s og %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Denne server vil miste fremskridt, hvis du fjerne boost. **Dit boost er fortsat i cooldown periode. Den er tilgængelig om %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Vil du fjerne Nitro-boost?</string>
     <string name="premium_included">Inkluderet i Nitro:</string>
     <string name="premium_info_monthly">%1$s (månedligt) indtræffer den %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / måned</string>
@@ -3439,7 +3387,6 @@ Du kan tegne abonnement igen når som helst."</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_button_iap">Hent %1$s</string>
     <string name="premium_payment_confirmation_button_regular">OK, lyder godt</string>
-    <string name="premium_payment_gift_blurb">Giv dine venner gaver [Nitro](onClick) så de får supermagt chatfrynsegoder og en Server Boost.</string>
     <string name="premium_payment_gift_blurb_mobile">Giv Nitro som gave til nogen, for at give dem superdrevne chat-frynsegoder.og server boosting. [Lær mere omkring Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Dette bliver en enkelt betaling for beløbet for den valgte tidsperiode. Du vil ikke blive opkrævet månedligt.</string>
     <string name="premium_payment_is_gift">Du er i gang med at købe en gave.</string>
@@ -3454,7 +3401,6 @@ Du kan tegne abonnement igen når som helst."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic månedligt</string>
     <string name="premium_plan_month_tier_2">Nitro månedligt</string>
     <string name="premium_promo_autocomplete">Brug brugerdefinerede emojier overalt</string>
-    <string name="premium_promo_description">Tag af sted med Discord Nitro for at bruge animerede og brugertilpassede emojier på alle servere.</string>
     <string name="premium_promo_title">Ønsker du opgraderede emoji-beføjelser?</string>
     <string name="premium_required">Nitro påkrævet</string>
     <string name="premium_required_get_nitro">Hent Nitro!</string>
@@ -3473,26 +3419,10 @@ Du kan tegne abonnement igen når som helst."</string>
     <string name="premium_tier_2_title">Få en forbedret Discord oplevelse for en lav månedlig udgift.</string>
     <string name="premium_trial_button">Start din gratis prøvetidsperiode</string>
     <string name="premium_upgrade_cancel">Nix</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Opgradér til årligt og få to måneder gratis. Sikke et tilbud!!!!
-
-Vi opdeler din nuværende plan proportionalt og trækker den fra den årlige pris. Du vil blive opkrævet **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Opgrader til årligt og få to måneder gratis. Sikke et tilbud!!!!
-
-Vi opdeler din nuværende plan proportionalt og trækker den fra den årlige pris. Du vil blive opkrævet **%1$s** nu, og **%2$s/år efter den nuværende periode.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Opgrader din %1$s (månedlige) aftale og få muligheden for at booste servere. Din nye aftale begynder med det samme.
-
- Vi opdeler din nuværende plan proportionalt og trækker den fra den månedlige pris. Du vil blive opkrævet **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Opgrader din %1$s (månedlige) aftale og få muligheden for at booste servere. Din nye aftale begynder med det samme.
-
- Vi opdeler din nuværende plan proportionalt og trækker den fra den månedlige pris. Du vil blive opkrævet **%2$s** nu, og **%3$s/måned efter den nuværende periode.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Opgrader din %1$s (månedlige) aftale og få muligheden for at booste servere. Din nye aftale begynder med det samme.
 
 Vi opdeler din nuværende aftale proportionalt og trækker den fra den årlige pris. Du vil blive opkrævet **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Opgrader din %1$s (månedlige) aftale og få muligheden for at booste servere. Din nye aftale begynder med det samme.
-
-Vi opdeler din nuværende aftale proportionalt og trækker den fra den årlige pris. Du vil blive opkrævet **%2$s** nu, og **%3$s/år efter den nuværende periode.**"</string>
     <string name="premium_upgrade_confirm_button">Opgrader</string>
-    <string name="premium_upgrade_confirm_button_with_price">Opgrader nu - %1$s</string>
     <string name="premium_upgrade_confirm_title">Opgradér til %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Du kan ikke tilmelde dig imens du allerede har Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Din nuværende plan.</string>
@@ -4034,8 +3964,6 @@ Er du sikker på, at du vil gøre dette?"</string>
     <string name="stop_streaming">Stop med at streame</string>
     <string name="stop_watching">Stop med at se</string>
     <string name="store_channel">Store-kanal</string>
-    <string name="store_payment_legalese_monthly">Hej! Ved at købe %1$s accepterer du vores [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 [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>
diff --git a/com.discord/res/values-de/plurals.xml b/com.discord/res/values-de/plurals.xml
index 136da72ba3..5ef5b6ffad 100644
--- a/com.discord/res/values-de/plurals.xml
+++ b/com.discord/res/values-de/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d Jahre</item>
         <item quantity="one">%d Jahr</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d Monate</item>
-        <item quantity="one">%d Monat</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d Jahre</item>
-        <item quantity="one">%d Jahr</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">%d Monate</item>
         <item quantity="one">%d Monat</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d-mal</item>
         <item quantity="one">%d-mal</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d gemeinsame Freunde</item>
-        <item quantity="zero">0 gemeinsame Freunde</item>
-        <item quantity="one">1 gemeinsamer Freund</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d gemeinsame Server</item>
-        <item quantity="zero">0 gemeinsame Server</item>
-        <item quantity="one">1 gemeinsamer Server</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d Tagen</item>
         <item quantity="one">einem Tag</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d Monate</item>
         <item quantity="one">1 Monat</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d Boosts</item>
-        <item quantity="one">%d Boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d weitere Boosts</item>
         <item quantity="one">%d weiteren Boost</item>
@@ -561,15 +539,11 @@
         <item quantity="other">%d Mitglieder</item>
         <item quantity="one">%d Mitglied</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d Tage</item>
-        <item quantity="one">%d Tag</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d Server-Boosts</item>
         <item quantity="one">%d Server-Boost</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d Monate</item>
         <item quantity="one">%d Monat</item>
     </plurals>
@@ -593,10 +567,6 @@
         <item quantity="other">%d Minuten</item>
         <item quantity="one">%d Minute</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** Boosts</item>
-        <item quantity="one">**%d** Boost</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d Tagen</item>
         <item quantity="one">%d Tag</item>
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index 9224785bcf..6251946b1c 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -600,7 +600,6 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing">Zahlungsabwicklung</string>
     <string name="billing_accept_terms_tooltip">Akzeptiere unsere Nutzungsbedingungen, um fortzufahren.</string>
     <string name="billing_account_credit">Accountguthaben</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s Monate kostenlos</string>
     <string name="billing_add_payment_method">Zahlungsart hinzufügen</string>
     <string name="billing_address">Rechnungsadresse</string>
     <string name="billing_address_address">Adresse</string>
@@ -659,8 +658,6 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing_payment_choose_plan">Wähle ein Abo</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](%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](%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_source_invalid">Diese Zahlungsmethode ist ungültig.</string>
     <string name="billing_payment_sources">Zahlungsarten</string>
     <string name="billing_payment_table_header_amount">Betrag</string>
@@ -678,13 +675,11 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing_price_per_month_current_plan">(AKTUELLES ABO) %1$s/Monat</string>
     <string name="billing_price_per_month_current_plan_ios">(Aktuelles Abo) %1$s/Monat</string>
     <string name="billing_price_per_month_mobile">%1$s/Monat</string>
-    <string name="billing_price_per_month_upgrade">Für %1$s/Monat upgraden</string>
     <string name="billing_price_per_year">%1$s/Jahr</string>
     <string name="billing_price_per_year_current_plan">(AKTUELLES ABO) %1$s/Jahr</string>
     <string name="billing_price_per_year_current_plan_ios">(Aktuelles Abo) %1$s/Jahr</string>
     <string name="billing_price_per_year_mobile">%1$s/Jahr</string>
     <string name="billing_price_per_year_months_free">%1$s/Jahr (2 Monate kostenlos)</string>
-    <string name="billing_price_per_year_upgrade">Für %1$s/Jahr upgraden</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>
@@ -706,6 +701,10 @@ aber wenn es sein muss, muss es sein."</string>
     <string name="billing_step_review">Vorschau</string>
     <string name="billing_step_select_plan">Abo auswählen</string>
     <string name="billing_subscribe">Abonnieren</string>
+    <string name="billing_switch_plan_change">Abo ändern</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Alles klar!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Fantastabulös!</string>
+    <string name="billing_switch_plan_upgrade">Upgraden</string>
     <string name="billing_tag_failed">Fehlgeschlagen</string>
     <string name="billing_tag_pending">Ausstehend</string>
     <string name="billing_tag_refunded">Zurückerstattet</string>
@@ -1757,11 +1756,8 @@ um die Mikrofonempfindlichkeit beobachten zu können."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Dank eines anderen großzügigen Menschen gehört dir jetzt %1$s lang %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Dank eines anderen großzügigen Menschen gehört dir jetzt %1$s lang %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** wurde deiner Bibliothek hinzugefügt.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Dank eines anderen großzügigen Menschen hast du jetzt %1$s lang Zugriff auf Chat-Zusatzfunktionen und einen Server-Boost.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Dank eines anderen großzügigen Menschen hast du jetzt %1$s lang Zugriff auf Chat-Zusatzfunktionen.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Dank eines anderen großzügigen Menschen hast du jetzt %1$s lang Zugriff auf Chat-Zusatzfunktionen.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Dank eines anderen großzügigen Menschen hast du jetzt %1$s lang Zugriff auf Chat-Zusatzfunktionen und einen Server-Boost.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Dank eines anderen großzügigen Menschen hast du jetzt %1$s lang Zugriff auf Chat-Zusatzfunktionen und einen Server-Boost.</string>
     <string name="gift_confirmation_body_unknown_error">Da ist irgendwas schiefgelaufen. Wir haben die Geschenkpackung wohl nicht richtig zugemacht … Versuch es noch mal.</string>
     <string name="gift_confirmation_button_confirm">Na klar! In die Bibliothek damit!</string>
     <string name="gift_confirmation_button_confirm_mobile">Her damit</string>
@@ -2111,9 +2107,7 @@ Verloren: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s Plätze für Server-Emojis (also insgesamt %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s Uploadlimit für alle Mitglieder</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Zu den Server-Vorteilen durch einen Boost gehören:</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Niemand hat diesem Server bis jetzt Nitro verliehen. Überprüfe, ob irgendein Mitglied deinem Server Vorteile mit Nitro verleihen könnte!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Geboostete Server erhalten alles Vorangehende und:</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Kein Nitro-Boost</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Vorteile auf Level 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Vorteile auf Level 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Vorteile auf Level 3</string>
@@ -2130,16 +2124,12 @@ Verloren: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Vorteil von Stufe %1$s freigeschaltet</string>
     <string name="guild_settings_overview_notice">Achtung, du hast nicht gespeicherte Änderungen!</string>
     <string name="guild_settings_overview_tier_info">Dies ist ein Feature für Nitro-Stufe %1$s. [Stufenstatus ansehen](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Servermitglieder mit aktivem Nitro-Abonnement können beim Freischalten von weiteren Levels helfen, indem sie ihren Nitro-Status weiterverleihen.
-Mit jedem erreichten Level werden neue Vorteile für alle freigeschaltet.
-
-Mitglieder können ihren Boost jederzeit wieder zurücknehmen.
-**Wenn der Server um ein Level zurückfällt, bleiben die Vorteile noch drei Tage erhalten. **[Erfahre mehr über Server-Boosting mit Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Nur noch %1$s bis zum nächsten Level!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** diesen Server geboostet</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Boost-Status des Nitro-Servers</string>
+    <string name="guild_settings_premium_guild_title">Server-Boost-Status</string>
     <string name="guild_settings_premium_guild_unlocked">Freigeschaltet</string>
+    <string name="guild_settings_premium_upsell_learn_more">Mehr über Discord Nitro erfahren</string>
     <string name="guild_settings_server_banner">Serverbanner</string>
     <string name="guild_settings_server_invite_background">Hintergrund für Servereinladungen</string>
     <string name="guild_settings_splash_info">Dieses Bild wird angezeigt, wenn Nutzer eine Einladung zum Server erhalten.</string>
@@ -2149,6 +2139,7 @@ Mitglieder können ihren Boost jederzeit wieder zurücknehmen.
 
 Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &amp;username= zum Querystring hinzufügen."</string>
     <string name="guild_settings_widget_enable_widget">Serverwidget aktivieren</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Kaufdetails</string>
     <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>
@@ -2493,10 +2484,6 @@ Willst du mehr über Discord erfahren?"</string>
     <string name="ios_media_keyboard_take_a_photo">Ein Foto schießen</string>
     <string name="ios_notification_see_full">Tippe hier, um die ganze Nachricht zu sehen.</string>
     <string name="ios_profile_in_voice_call">In einem Sprachanruf</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Gemeinsame Freunde</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Gemeinsame Server</string>
     <string name="ios_profile_open_voice_channel">Sprachkanal öffnen</string>
     <string name="ios_view_all">Alles anzeigen</string>
     <string name="ip_address_secured">IP-Adresse gesichert</string>
@@ -2806,7 +2793,6 @@ Mitglieder nur zwischen Kanälen verschieben, zu denen sie selbst und das Mitgli
     <string name="network_error_unknown">Ein unbekannter Netzwerkfehler ist aufgetreten.</string>
     <string name="network_error_unknown_host">Ein Netzwerkfehler ist aufgetreten. Bitte überprüfe deine Netzwerkeinstellungen und versuche es erneut.</string>
     <string name="network_offline">Netzwerkverbindung eingeschränkt oder nicht verfügbar.</string>
-    <string name="nevermind">Vergiss es</string>
     <string name="new_dm">Neue Direktnachricht</string>
     <string name="new_group_dm">Neuer Gruppenchat</string>
     <string name="new_guilds_dm_allowed">Direktnachrichten von Servermitgliedern erlauben.</string>
@@ -2929,7 +2915,6 @@ angepinnten Nachrichten."</string>
     <string name="notice_no_input_detected_help_link_text">Hilfe!</string>
     <string name="notice_no_input_detected_settings">Hm, sieht so aus, als würde Discord keine Aufnahme über dein Mikrofon erkennen. Lass uns das wieder in Ordnung bringen!</string>
     <string name="notice_no_input_detected_settings_link_text">Einstellungen aufrufen</string>
-    <string name="notice_premium_grandfathered_ended">Du hast keinen Zugriff mehr auf Nitro. Upgrade dein Abonnement von Nitro Classic auf Nitro, um übermächtige Chat-Zusatzfunktion und einen Server-Boost zu erhalten.</string>
     <string name="notice_premium_grandfathered_ending">Du hast nur noch %1$s Zugriff auf Nitro! Dein Abonnement wird am **%2$s** auf Nitro Classic zurückgestuft.</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>
@@ -3159,7 +3144,7 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
     <string name="payment_modal_button_change_card">Kreditkarte aktualisieren</string>
     <string name="payment_modal_button_change_paypal">PayPal-Konto aktualisieren</string>
     <string name="payment_modal_button_premium">%1$s holen</string>
-    <string name="payment_modal_button_premium_gift">%1$s kaufen</string>
+    <string name="payment_modal_button_premium_gift">Geschenk kaufen</string>
     <string name="payment_modal_one_month">1 Monat</string>
     <string name="payment_modal_one_year">1 Jahr</string>
     <string name="payment_modal_per_month">Pro Monat</string>
@@ -3272,9 +3257,6 @@ Falls du Probleme oder Fragen hast, lies einfach [diesen schicken Hilfeartikel!]
 Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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 Nitro und erhältst einen zufälligen Discord-Tag, falls du ihn geändert hast. Zusätzlich wird dein Server-Boost entfernt.
-
- Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Die Kündigung wird am Ende deines aktuellen Abrechnungszeitraums wirksam. Am **%1$s** verlierst du den Zugriff auf Nitro und erhältst einen zufälligen Discord-Tag, falls du ihn geändert hast. Zusätzlich wird dein Server-Boost entfernt.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Du kannst jederzeit wieder ein Abonnement abschließen.</string>
     <string name="premium_cancel_confirm_mobile">Nitro kündigen</string>
@@ -3297,7 +3279,6 @@ Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_chat_perks_description_streaming">Streame mit Nitro in Originalauflösung oder mit Nitro Classic mit gestochen scharfen 1080p/60fps.</string>
     <string name="premium_chat_perks_description_upload_limit">Lade größere Dateien hoch. Statt %1$s bis zu %2$s mit Nitro oder bis zu %3$s mit Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Booste deinen Lieblingsserver!</string>
-    <string name="premium_chat_perks_simple_title">Bleib unkompliziert – hol dir die grundlegenden Chat-Zusatzfunktionen ohne Server-Boost.</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>
@@ -3336,41 +3317,20 @@ Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_grandfathered_yearly">Als Dankeschön für deine Unterstützung erhältst du zwei Jahre lang Zugriff auf Nitro. Dein Zugriff endet am **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boost-Cooldown: **%1$s Tag(e), %2$s Std. und %3$s Min.**</string>
     <string name="premium_guild_features_blurb">Du kannst einem Server auf dem Weg zum nächsten Level helfen, indem du ihn mit Nitro boostest. Mit jedem Level werden neue Chat-Zusatzfunktionen **für alle auf dem Server** freigeschaltet! Hier ist ein kleiner Vorgeschmack:</string>
-    <string name="premium_guild_features_customize_guild_description">Schalte Anpassungsoptionen wie Einladungshintergrund, Serverbanner, Vanity-URL usw. frei</string>
     <string name="premium_guild_features_customize_guild_mobile">Serveranpassung</string>
-    <string name="premium_guild_features_customize_guild_title">Serveranpassung</string>
     <string name="premium_guild_features_learn_more_button">Mehr über Discord Nitro erfahren</string>
     <string name="premium_guild_features_learn_more_text">Hol gegen eine geringe monatliche Gebühr noch mehr aus Discord raus.</string>
     <string name="premium_guild_features_more">Und noch mehr! Du kannst dir das aktuelle Level, den Levelfortschritt und die verfügbaren Vorteile auf dem jeweiligen Server ansehen.</string>
-    <string name="premium_guild_features_new_role_description">Erhalte eine besondere Serverrolle, die nur für Nitro-Server-Booster auf deinem Server verfügbar ist.</string>
-    <string name="premium_guild_features_new_role_mobile">Exklusive Nitro-Booster-Rollen</string>
-    <string name="premium_guild_features_new_role_title">Exklusive neue Rolle</string>
-    <string name="premium_guild_features_show_support_description">Jeder, der boostet, kriegt ein funkelnagelneues Profilabzeichen, das sich im Laufe der Boost-Serie verändert.</string>
     <string name="premium_guild_features_show_support_mobile">Ein neues Profilabzeichen, das sich mit der Zeit verändert</string>
-    <string name="premium_guild_features_show_support_title">Zeig deine Unterstützung</string>
     <string name="premium_guild_features_title">Mit Nitro kannst du helfen, einen Server zu boosten!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Höhere Uploadlimits für die ganze Community</string>
-    <string name="premium_guild_features_upload_sizes_title">Höheres Uploadlimit für alle</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Abonniere Nitro, um einem Server einen Nitro-Boost zu schicken! [Erfahre mehr über Nitro-Server-Boosting.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Verpass deinem Abo ein Upgrade, um einem Server einen Nitro-Boost zu verleihen! [Erfahre mehr über Nitro-Server-Boosting.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Keine Nitro-Boosts</string>
     <string name="premium_guild_header_badge_no_tier">Kein Level</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro-Server-Boost</string>
     <string name="premium_guild_perks_modal_base_perks">Zu den Server-Vorteilen durch einen Boost gehören:</string>
-    <string name="premium_guild_perks_modal_blurb">"Durch jedes erreichte Level helfen Mitglieder dabei, Vorteile für jeden auf den Server freizuschalten.
-
- **Wer boostet, erhält: ein Mitgliederlisten-Icon, ein sich veränderndes Abzeichen und eine Rolle exklusiv für Booster.**
-
- [Erfahre mehr über Nitro-Server-Boosting.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Durch jedes erreichte Level helfen Mitglieder dabei, Vorteile für jeden auf den Server freizuschalten.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Wer boostet, erhält: ein Mitgliederlisten-Icon, ein sich veränderndes Abzeichen und eine Rolle exklusiv für Booster.** [Erfahre mehr über Nitro-Server-Boosting.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Hol dir Nitro, um zu boosten!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Diesen Server boosten</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Upgrade auf Nitro, um zu boosten!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Aktuell unterstützen wir für Abos über Apple keine Upgrades auf Nitro. Du kannst dein Abo über [die Abonnementverwaltung von Apple](%1$s) kündigen. Allerdings bleibt das Abo bis zum Ablaufdatum aktiv.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Bei Nitro Classic ist Server-Boosting nicht integriert</string>
     <string name="premium_guild_perks_modal_header">Server-Boost-Status</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** Boosts</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Deinen Boost verwalten</string>
     <string name="premium_guild_perks_modal_no_tiers">Bisher kein Level erreicht</string>
@@ -3382,44 +3342,32 @@ Du kannst jederzeit wieder ein Abonnement abschließen."</string>
     <string name="premium_guild_perks_modal_tooltip_gift">Schenk einem Freund Nitro, damit er diesen Server boosten kann!</string>
     <string name="premium_guild_settings_members_subscribed">%1$s haben diesen Server geboostet.</string>
     <string name="premium_guild_settings_members_subscribed_needed">Du brauchst **%1$s**, um %2$s freizuschalten.</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Möchtest du diesen Nitro-Boost wirklich an folgenden Server schicken:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Diesen Server wählen</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Wähle diesen Server. Es wird einen Moment dauern, bis dein Boost aktiv wird.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Wenn du diesen Server boostest, kannst du %1$s lang keinen anderen Server boosten. Durch Zurückziehen deines Boosts wird der Cooldown nicht verringert.**</string>
     <string name="premium_guild_subscribe_confirm_header">Wähle weise!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Server suchen</string>
     <string name="premium_guild_subscribe_select_guild_header">Wähle einen Server</string>
     <string name="premium_guild_subscribe_success_thanks">Danke für den Boost!</string>
     <string name="premium_guild_subscription_available_count">Dir stehen **%1$s** zur Verfügung!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Beim Boosten ist ein Fehler aufgetreten. Bitte versuch es noch einmal.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Sieht aus, als wäre der Cooldown noch nicht vorbei. Bitte warte **%1$s und %2$s**, bevor du es erneut versuchst.</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Sieht aus, als wäre der Cooldown noch nicht vorbei. Bitte warte **%1$s und %2$s**, bevor du es erneut versuchst.</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Sieht aus, als wäre der Cooldown noch nicht vorbei. Bitte warte **%1$s**, bevor du es erneut versuchst.</string>
     <string name="premium_guild_subscription_no_next_tier">Dieser Server läuft auf Höchstleistung! Immer schön weiter boosten!</string>
-    <string name="premium_guild_subscription_notice">Nitro-Server-Boosts sind da! Ruf deine Community dazu auf, deinen Server zu boosten.</string>
     <string name="premium_guild_subscription_notice_button">Level und Vorteile anzeigen</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro-Server-Boosts sind da! Ruf deine Freunde dazu auf, deinen Server zu boosten.</string>
     <string name="premium_guild_subscription_remove_button">Boost entfernen</string>
     <string name="premium_guild_subscription_remove_error_mobile">Beim Zurückziehen des Boosts ist ein Fehler aufgetreten. Bitte versuch es noch einmal.</string>
     <string name="premium_guild_subscription_select_server_button">Server wählen</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Setze deine Nitro-Superkräfte ein, um einen Server, dem du beigetreten bist, zu boosten! Dadurch kommt er dem nächsten Level und neuen Vorteilen für den gesamten Server näher.
-Wenn du einen Server boostest, beginnt ein 7-tägiger Cooldown. Innerhalb dieses Zeitraums kannst du keinen anderen Server boosten, auch wenn du deinen vorherigen Boost zurücknimmst. [Erfahre mehr über Nitro-Server-Boosting.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Setze deine Nitro-Superkräfte ein, um einen Server, dem du beigetreten bist, zu boosten! Dadurch kommt er dem nächsten Level und neuen Vorteilen für den gesamten Server näher.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Wenn du einen Server boostest, beginnt ein 7-tägiger Cooldown. Innerhalb dieses Zeitraums kannst du keinen anderen Server boosten, auch wenn du deinen vorherigen Boost zurücknimmst. [Erfahre mehr über Nitro-Server-Boosting.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro-Server-Boost</string>
-    <string name="premium_guild_subscription_tooltip">Boostet seit %1$s mit Nitro</string>
+    <string name="premium_guild_tier_0">Kein Level</string>
     <string name="premium_guild_tier_1">Level 1</string>
     <string name="premium_guild_tier_2">Level 2</string>
     <string name="premium_guild_tier_3">Level 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Bist du sicher, dass du deinen Nitro-Boost von folgendem Server zurückziehen möchtest:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ja, Boost zurückziehen</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Dieser Server wird Levelfortschritt verlieren, wenn du deinen Boost zurückziehst.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Dieser Server wird Levelfortschritt verlieren, wenn du deinen Boost zurückziehst. **Der Cooldown deines Boosts ist noch nicht abgelaufen. Er wird in %1$s und %2$s wieder verfügbar sein.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Dieser Server wird Levelfortschritt verlieren, wenn du deinen Boost zurückziehst. **Der Cooldown deines Boosts ist noch nicht abgelaufen. Er wird in %1$s und %2$s wieder verfügbar sein.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Dieser Server wird Levelfortschritt verlieren, wenn du deinen Boost zurückziehst. **Der Cooldown deines Boosts ist noch nicht abgelaufen. Er wird in %1$s wieder verfügbar sein.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Nitro-Boost zurückziehen?</string>
     <string name="premium_included">Das gibt dir Nitro:</string>
     <string name="premium_info_monthly">%1$s sind am %2$s fällig (monatlich).</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s**/Monat</string>
@@ -3432,7 +3380,6 @@ Wenn du einen Server boostest, beginnt ein 7-tägiger Cooldown. Innerhalb dieses
     <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_button_iap">Hol dir %1$s</string>
     <string name="premium_payment_confirmation_button_regular">OK, klingt gut</string>
-    <string name="premium_payment_gift_blurb">Schenk deinen Freunden [Nitro](onClick) und verleihe ihren Chatfunktionen Superkräfte! Außerdem erhalten sie damit einen Server-Boost.</string>
     <string name="premium_payment_gift_blurb_mobile">Schenk jemandem Nitro, damit er nicht nur Chatfunktionen mit Superkräften, sondern auch Server-Boosting nutzen kann. [Erfahre mehr über Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Für den Zeitraum ist eine einmalige Zahlung erforderlich. Es entstehen keine monatlichen Kosten für dich.</string>
     <string name="premium_payment_is_gift">Du kaufst ein Geschenk.</string>
@@ -3447,7 +3394,6 @@ Wenn du einen Server boostest, beginnt ein 7-tägiger Cooldown. Innerhalb dieses
     <string name="premium_plan_month_tier_1">Nitro Classic-Monatsabonnement</string>
     <string name="premium_plan_month_tier_2">Nitro-Monatsabonnement</string>
     <string name="premium_promo_autocomplete">Verwende alle Emojis überall</string>
-    <string name="premium_promo_description">Hol dir Discord Nitro, um animierte und Server-Emojis überall nutzen zu können.</string>
     <string name="premium_promo_title">Du willst deinen Emojis ein Upgrade verpassen?</string>
     <string name="premium_required">Dafür brauchst du Nitro</string>
     <string name="premium_required_get_nitro">Hol dir Nitro!</string>
@@ -3466,26 +3412,10 @@ Wenn du einen Server boostest, beginnt ein 7-tägiger Cooldown. Innerhalb dieses
     <string name="premium_tier_2_title">Hol gegen eine geringe monatliche Gebühr noch mehr aus Discord raus.</string>
     <string name="premium_trial_button">Beginne deine kostenlose Testphase</string>
     <string name="premium_upgrade_cancel">Nö</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Wenn du jetzt auf das Jahresabo upgradest, bekommst du zwei Monate gratis. Das ist ein Angebot, das du nicht ablehnen kannst!
-
-Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Jahrespreis ab. Insgesamt zahlst du **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Wenn du jetzt auf das Jahresabo upgradest, bekommst du zwei Monate gratis. Das ist ein Angebot, das du nicht ablehnen kannst!
-
-Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Jahrespreis ab. Du zahlst **%1$s** sofort und nach dem derzeitigen Abrechnungszeitraum **%2$s/Jahr.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Verpass deinem %1$s-Monatsabo ein Upgrade und erhalte die Möglichkeit, Server zu boosten. Dein neues Abo beginnt sofort.
-
-Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Monatspreis ab. Insgesamt zahlst du **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Verpass deinem %1$s-Monatsabo ein Upgrade und erhalte die Möglichkeit, Server zu boosten. Dein neues Abo beginnt sofort.
-
-Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Monatspreis ab. Du zahlst **%2$s** sofort und nach dem derzeitigen Abrechnungszeitraum **%3$s/Monat.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Verpass deinem %1$s-Monatsabo ein Upgrade und erhalte die Möglichkeit, Server zu boosten. Dein neues Abo beginnt sofort.
 
 Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Jahrespreis ab. Insgesamt zahlst du **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Verpass deinem %1$s-Monatsabo ein Upgrade und erhalte die Möglichkeit, Server zu boosten. Dein neues Abo beginnt sofort.
-
-Wir ziehen dir die Kosten deines aktuellen Abos anteilig vom Jahrespreis ab. Du zahlst **%2$s** sofort und nach dem derzeitigen Abrechnungszeitraum **%3$s/Jahr.**"</string>
     <string name="premium_upgrade_confirm_button">Upgraden</string>
-    <string name="premium_upgrade_confirm_button_with_price">Jetzt upgraden – %1$s</string>
     <string name="premium_upgrade_confirm_title">Auf %1$s upgraden</string>
     <string name="premium_upgrade_disabled_already_premium">Du kannst das nicht abonnieren, wenn du schon Nitro hast.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Dein aktuelles Abo</string>
@@ -4040,8 +3970,6 @@ Bist du sicher, dass du das tun möchtest?"</string>
     <string name="stop_streaming">Streaming beenden</string>
     <string name="stop_watching">Zuschauen beenden</string>
     <string name="store_channel">Store-Kanal</string>
-    <string name="store_payment_legalese_monthly">Hey! Wenn du ein %1$s abschließt, stimmst du automatisch unseren [Nutzungsbedingungen](%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](%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>
diff --git a/com.discord/res/values-el/plurals.xml b/com.discord/res/values-el/plurals.xml
index 015f311bbb..93e3b6613d 100644
--- a/com.discord/res/values-el/plurals.xml
+++ b/com.discord/res/values-el/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d χρόνια</item>
         <item quantity="one">%d χρόνο</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d μήνες</item>
-        <item quantity="one">%d μήνα</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d χρόνια</item>
-        <item quantity="one">%d χρόνο</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">μήνες</item>
         <item quantity="one">μήνας</item>
@@ -466,16 +458,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d Κοινοί Διακομιστές</item>
-        <item quantity="zero">0 Κοινοί Διακομιστές</item>
-        <item quantity="one">1 Κοινός Διακομιστής</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d ημέρες</item>
         <item quantity="one">1 ημέρα</item>
@@ -549,10 +531,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d επιπλέον Ενισχύσεις</item>
         <item quantity="one">%d επιπλέον Ενίσχυση</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d Ενισχύσεις</item>
         <item quantity="one">%d Ενίσχυση</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d μέρες</item>
-        <item quantity="one">%d μέρα</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d Ενισχύσεις Διακομιστή</item>
         <item quantity="one">%d Ενίσχυση Διακομιστή</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d Μήνες</item>
         <item quantity="one">%d Μήνας</item>
     </plurals>
@@ -597,10 +571,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <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 a107a734f9..26bd555a03 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -633,7 +633,6 @@
     <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>
@@ -692,8 +691,6 @@
     <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_source_invalid">Αυτή η πηγή πληρωμής δεν είναι έγκυρη.</string>
     <string name="billing_payment_sources">Μέθοδοι Πληρωμής</string>
     <string name="billing_payment_table_header_amount">Ποσό</string>
@@ -711,13 +708,11 @@
     <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>
@@ -739,6 +734,10 @@
     <string name="billing_step_review">Επισκόπηση</string>
     <string name="billing_step_select_plan">Επιλογή συνδρομής</string>
     <string name="billing_subscribe">Κάνε εγγραφή</string>
+    <string name="billing_switch_plan_change">Αλλαγή Προγράμματος</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Το ’πιασα!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Τι καλά!</string>
+    <string name="billing_switch_plan_upgrade">Αναβάθμιση</string>
     <string name="billing_tag_failed">Απέτυχε</string>
     <string name="billing_tag_pending">Εκκρεμεί</string>
     <string name="billing_tag_refunded">Επιστράφηκε</string>
@@ -1786,11 +1785,8 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <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_nitro_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_success_premium_tier_2_monthly">Χάρη σε έναν γενναιόδωρο άνθρωπο, έχεις πλέον πρόσβαση σε ενισχυμένα προνόμια γραπτής συνομιλίας και έναν Ενισχυτή Διακομιστή για %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2143,9 +2139,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s θέσεις για Emoji διακομιστή (για το σύνολο των %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>
@@ -2162,16 +2156,12 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <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_title">Κατάσταση ενίσχυσης διακομιστή</string>
     <string name="guild_settings_premium_guild_unlocked">Ξεκλειδώθηκε</string>
+    <string name="guild_settings_premium_upsell_learn_more">Μάθετε Περισσότερα σχετικά με το Discord Nitro</string>
     <string name="guild_settings_server_banner">Πανό διακομιστή</string>
     <string name="guild_settings_server_invite_background">Φόντο πρόσκλησης διακομιστή</string>
     <string name="guild_settings_splash_info">Αυτή η εικόνα θα δείχνει πότε οι χρήστες λαμβάνουν μια πρόσκληση στο διακομιστή.</string>
@@ -2181,6 +2171,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
 
 Αν έχεις πρόσβαση στα μέλη της σελίδας σου, τότε μπορείς να προσθέσεις χειροκίνητα τον όρο &amp;username= στη διεύθυνση URL."</string>
     <string name="guild_settings_widget_enable_widget">Ενεργοποίηση widget διακομιστή</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Στοιχεία Αγοράς</string>
     <string name="guild_verification_text_account_age">Ο λογαριασμός σου πρέπει να έχει δημιουργηθεί πριν τουλάχιστον %1$s λεπτά για να μπορείς να στείλεις μηνύματα σε αυτόν τον διακομιστή.</string>
     <string name="guild_verification_text_member_age">Πρέπει να είσαι μέλος για τουλάχιστον %1$s λεπτά για να μπορείς να στείλεις μηνύματα σε αυτόν τον διακομιστή.</string>
     <string name="guild_verification_text_not_claimed">Πρέπει να κατοχυρώσεις και να επαληθεύσεις τον λογαριασμό σου, πριν να στείλεις μηνύματα σε αυτόν το διακομιστή.</string>
@@ -2528,10 +2519,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="ios_media_keyboard_take_a_photo">Βγάλε μια φωτογραφία</string>
     <string name="ios_notification_see_full">Πατήστε για να δείτε όλο το μήνυμα.</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="ios_view_all">Προβολή όλων</string>
     <string name="ip_address_secured">Η διεύθυνση IP ασφαλίστηκε</string>
@@ -2845,7 +2832,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="network_error_unknown">Παρουσιάστηκε άγνωστο σφάλμα δικτύου.</string>
     <string name="network_error_unknown_host">Παρουσιάστηκε ένα σφάλμα δικτύου. Έλεγξε τις ρυθμίσεις DNS σου και προσπάθησε ξανά.</string>
     <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>
@@ -2969,7 +2955,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="notice_no_input_detected_help_link_text">Βοήθεια!</string>
     <string name="notice_no_input_detected_settings">Φαίνεται πως το Discord δεν εντοπίζει κανέναν ήχο από το μικρόφωνό σας. Ας το φτιάξουμε!</string>
     <string name="notice_no_input_detected_settings_link_text">Πηγαίνετε στις Ρυθμίσεις</string>
-    <string name="notice_premium_grandfathered_ended">Η πρόσβασή σου στο Nitro έληξε. Αναβάθμισε το Nitro Classic σε Nitro για υπερενισχυμένα προνόμια γραπτής συνομιλίας και μια Ενίσχυση Διακομιστή.</string>
     <string name="notice_premium_grandfathered_ending">Σου απομένει μόνο %1$s για το Nitro! Η συνδρομή σου θα υποβαθμιστεί σε Nitro Classic στις **%2$s**.</string>
     <string name="notice_premium_promo_action">Τσεκάρέ το</string>
     <string name="notice_premium_promo_message">Στήριξε την ανάπτυξη του Discord και κέρδισε διασκεδαστικά προνόμια!</string>
@@ -3202,7 +3187,7 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <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_button_premium_gift">Αγορά δώρου</string>
     <string name="payment_modal_one_month">1 μήνας</string>
     <string name="payment_modal_one_year">1 χρόνος</string>
     <string name="payment_modal_per_month">Το μήνα</string>
@@ -3313,9 +3298,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
 Μπορείς να ξεκινήσεις ξανά τη συνδρομή σου όποτε θέλεις."</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">"Η ακύρωση θα τεθεί σε ισχύ στο τέλος της τρέχουσας περιόδου χρέωσης. Στις **%1$s**, θα χάσεις την πρόσβασή σου στο Nitro, το Discord Tag σου θα γίνει τυχαίο αν το έχεις αλλάξει και η Ενίσχυση Διακομιστή θα αφαιρεθεί.
-
- Μπορείς να ανανεώσεις τη συνδρομή σου ανά πάσα στιγμή."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Η ακύρωση θα τεθεί σε ισχύ στο τέλος της τρέχουσας περιόδου χρέωσης. Στις **%1$s**, θα χάσεις την πρόσβασή σου στο Nitro, το Discord Tag σου θα γίνει τυχαίο αν το έχεις αλλάξει και η Ενίσχυση Διακομιστή θα αφαιρεθεί.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Μπορείτε να επανεκκινήσετε τη συνδρομή σας οποιαδήποτε στιγμή.</string>
     <string name="premium_cancel_confirm_mobile">Ακύρωση Nitro</string>
@@ -3338,7 +3320,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_chat_perks_description_streaming">Κάντε ζωντανές μεταδόσεις στις βασικές ρυθμίσεις ποιότητας με Nitro ή έως και τα λαχταριστά 1080p 60fps με Κλασικό Nitro.</string>
     <string name="premium_chat_perks_description_upload_limit">Μεγαλύτερο μέγεθος αρχείου που μπορείς να ανεβάσεις από %1$s έως %2$s με το Nitro ή %3$s με το Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Ενισχύστε τον αγαπημένο σας διακομιστή!</string>
-    <string name="premium_chat_perks_simple_title">"Κάν' το απλά! Απόκτησε τα βασικά προνόμια συνομιλίας χωρίς Ενισχυτή Διακομιστή."</string>
     <string name="premium_chat_perks_streaming_mobile">Καλύτερες Go Live ζωντανές μεταδόσεις: Κάντε ζωντανές μεταδόσεις στις βασικές ρυθμίσεις ποιότητας με Nitro ή έως και τα λαχταριστά 1080p 60fps με Κλασικό Nitro</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Εικονογραφημένη διασκέδαση</string>
     <string name="premium_chat_perks_title_badge">Δήλωσε την Υποστήριξή Σου</string>
@@ -3377,41 +3358,20 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_grandfathered_yearly">Για να σε ευχαριστήσουμε που στηρίζεις το Discord, σου δίνουμε πρόσβαση στο Nitro για δύο χρόνια. Η πρόσβασή σου λήγει στις **%1$s**.</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">Ξεκλειδώστε προσαρμογές, όπως φόντο πρόσκλησης, πανό για διακομιστή, vanity 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_description">Απόκτησε έναν ειδικό ρόλο διακομιστή, που είναι διαθέσιμος μόνο στους Ενισχυτές Διακομιστή Nitro.</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_description">Οι ενισχυτές λαμβάνουν ένα λαμπερό, νέο έμβλημα προφίλ που αλλάζει με το σερί τους.</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 Ενίσχυση σε έναν διακομιστή! [Μάθετε περισσότερα για τη Nitro Ενίσχυση Διακομιστή.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Αναβαθμίστε την εγγραφή σας για να στείλετε μια Nitro Ενίσχυση σε έναν διακομιστή! [Μάθετε περισσότερα για τη 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">Προς το παρόν δεν υποστηρίζουμε αναβαθμίσεις σε Nitro για συνδρομές μέσω της Apple. Μπορείτε να ακυρώσετε τη συνδρομή σας μέσα από την [Διαχείριση Συνδρομών της Apple](%1$s), αλλά η συνδρομή θα παραμείνει ενεργή έως την ημερομηνία λήξης της.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Το Κλασικό Nitro δεν περιλαμβάνει Ενίσχυση Διακομιστή</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>
@@ -3424,44 +3384,32 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <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_duration_mobile">%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">Δείτε τα Επίπεδα &amp; τα Προνόμια</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_0">Κανένα Επίπεδο</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_month_subscription">**%1$s%2$s %3$s** / μήνα</string>
@@ -3474,7 +3422,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <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">Κάνε δώρο στους φίλους σου το [Nitro](onClick) για να αποκτήσουν υπερενισχυμένα προνόμια συνομιλίας και Ενίσχυση Διακομιστή.</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>
@@ -3489,7 +3436,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <string name="premium_plan_month_tier_1">Μηνιαίο Nitro Classic</string>
     <string name="premium_plan_month_tier_2">Nitro Μηνιαία</string>
     <string name="premium_promo_autocomplete">Χρησιμοποίησε προσαρμοσμένα emojis οπουδήποτε</string>
-    <string name="premium_promo_description">Απογειώσου με το Discord Nitro για να χρησιμοποιείς κινούμενα και προσαρμοσμένα emoji σε οποιονδήποτε διακομιστή.</string>
     <string name="premium_promo_title">Θέλεις αναβαθμισμένες δυνάμεις emoji;</string>
     <string name="premium_required">Απαιτείται Nitro</string>
     <string name="premium_required_get_nitro">Απόκτησε το Nitro!</string>
@@ -3508,26 +3454,10 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
     <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_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>
@@ -4089,8 +4019,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω
     <string name="stop_streaming">Διακοπή ζωντανής μετάδοσης</string>
     <string name="stop_watching">Διακοπή παρακολούθησης</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>
diff --git a/com.discord/res/values-es-rES/plurals.xml b/com.discord/res/values-es-rES/plurals.xml
index f5076e2715..a7b1354e5a 100644
--- a/com.discord/res/values-es-rES/plurals.xml
+++ b/com.discord/res/values-es-rES/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d años</item>
         <item quantity="one">%d año</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d meses</item>
-        <item quantity="one">%d mes</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d años</item>
-        <item quantity="one">%d año</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">meses</item>
         <item quantity="one">mes</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d veces</item>
         <item quantity="one">%d vez</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d amigos en común</item>
-        <item quantity="zero">0 amigos en común</item>
-        <item quantity="one">1 amigo en común</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d servidores en común</item>
-        <item quantity="zero">0 servidores en común</item>
-        <item quantity="one">1 servidor en común</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d días</item>
         <item quantity="one">1 día</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d meses</item>
         <item quantity="one">1 mes</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d mejoras</item>
-        <item quantity="one">%d mejora</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d mejoras más</item>
         <item quantity="one">%d mejora más</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d mejoras</item>
         <item quantity="one">%d mejora</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d días</item>
-        <item quantity="one">%d día</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d mejoras del servidor</item>
         <item quantity="one">%d mejora del servidor</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d meses</item>
         <item quantity="one">%d mes</item>
     </plurals>
@@ -597,10 +571,6 @@
         <item quantity="other">%d minutos</item>
         <item quantity="one">%d minuto</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** mejoras</item>
-        <item quantity="one">**%d** mejora</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d días</item>
         <item quantity="one">%d día</item>
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index 3be20e0a20..6550f7a29b 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -593,7 +593,6 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="billing">Facturación</string>
     <string name="billing_accept_terms_tooltip">Acepta las Condiciones del Servicio para continuar</string>
     <string name="billing_account_credit">Crédito de cuenta</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s meses gratis</string>
     <string name="billing_add_payment_method">Añadir método de pago</string>
     <string name="billing_address">Dirección de facturación</string>
     <string name="billing_address_address">Dirección</string>
@@ -651,8 +650,6 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="billing_payment_choose_plan">Elige un plan</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](%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](%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_source_invalid">El método de pago no es válido.</string>
     <string name="billing_payment_sources">Métodos de pago</string>
     <string name="billing_payment_table_header_amount">Importe</string>
@@ -670,13 +667,11 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="billing_price_per_month_current_plan">(PLAN ACTUAL) %1$s / mes</string>
     <string name="billing_price_per_month_current_plan_ios">(Plan actual) %1$s / mes</string>
     <string name="billing_price_per_month_mobile">%1$s / MES</string>
-    <string name="billing_price_per_month_upgrade">Mejorar por %1$s / mes</string>
     <string name="billing_price_per_year">%1$s / año</string>
     <string name="billing_price_per_year_current_plan">(PLAN ACTUAL) %1$s / año</string>
     <string name="billing_price_per_year_current_plan_ios">(Plan actual) %1$s / año</string>
     <string name="billing_price_per_year_mobile">%1$s / AÑO</string>
     <string name="billing_price_per_year_months_free">%1$s / año (2 meses gratis)</string>
-    <string name="billing_price_per_year_upgrade">Mejorar por %1$s / año</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>
@@ -698,6 +693,10 @@ pero si crees que debes hacerlo, ¡no te lo pienses dos veces!"</string>
     <string name="billing_step_review">Revisión</string>
     <string name="billing_step_select_plan">Seleccionar plan</string>
     <string name="billing_subscribe">Suscribirse</string>
+    <string name="billing_switch_plan_change">Cambiar plan</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">¡Entendido!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">¡Genial!</string>
+    <string name="billing_switch_plan_upgrade">Mejorar</string>
     <string name="billing_tag_failed">Fallido</string>
     <string name="billing_tag_pending">Pendiente</string>
     <string name="billing_tag_refunded">Reembolsado</string>
@@ -1737,11 +1736,8 @@ para poder observar la sensibilidad de entrada."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Gracias a otro humano generoso, ahora tienes %1$s durante %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Gracias a otro humano generoso, ahora tienes %1$s durante %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** se ha añadido a tu biblioteca.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Gracias a otro humano generoso, ahora tienes acceso a las ventajas de chat mejoradas y a una mejora del servidor durante %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Gracias a otro humano generoso, ahora tienes acceso a las ventaja de chat mejoradas durante %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Gracias a otro humano generoso, ahora tienes acceso a las ventaja de chat mejoradas durante %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Gracias a otro humano generoso, ahora tienes acceso a las ventajas de chat mejoradas y a una mejora del servidor durante %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Gracias a otro humano generoso, ahora tienes acceso a las ventajas de chat mejoradas y a una mejora del servidor durante %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Ha pasado algo raro y no hemos podido completar la operación… ¿Quieres volver a intentarlo?</string>
     <string name="gift_confirmation_button_confirm">¡Toma ya! Añadir a la biblioteca</string>
     <string name="gift_confirmation_button_confirm_mobile">Dámelo</string>
@@ -2094,9 +2090,7 @@ Perdidos: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s ranuras de emojis del servidor (para un total de %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s de límite de subida para todos los miembros</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Las ventajas del servidor mejorado incluyen —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Nadie le ha concedido Nitro a este servidor aún. ¡Comprueba si a alguno de los miembros le gustaría bendecir tu servidor para tener ventajas de Nitro en todo el servidor!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Los servidores mejorados obtienen todo lo anterior y —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Sin mejora de Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Ventajas de nivel 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Ventajas de nivel 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Ventajas de nivel 3</string>
@@ -2113,16 +2107,12 @@ Perdidos: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Ventaja de nivel %1$s desbloqueada</string>
     <string name="guild_settings_overview_notice">¡Cuidado! ¡Tienes cambios sin guardar!</string>
     <string name="guild_settings_overview_tier_info">Esta es una característica de Nitro de nivel %1$s. [Comprueba tu nivel actual](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Los miembros del servidor con una suscripción de Nitro activa pueden ayudar a desbloquear niveles otorgando su estado de Nitro.
-Por cada nivel conseguido, los miembros del servidor te ayudarán a desbloquear ventajas para todos.
-
-Los miembros pueden revocar su mejora en cualquier momento.
-**El servidor conservará las ventajas durante tres días si se pierde un nivel. **[Más información sobre la mejora del servidor de Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">¡Solo %1$s para el siguiente nivel!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** mejorado este servidor</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Estado de mejora del servidor de Nitro</string>
+    <string name="guild_settings_premium_guild_title">Estado de mejora del servidor</string>
     <string name="guild_settings_premium_guild_unlocked">Desbloqueado</string>
+    <string name="guild_settings_premium_upsell_learn_more">Más información sobre Discord Nitro</string>
     <string name="guild_settings_server_banner">Cartel del servidor</string>
     <string name="guild_settings_server_invite_background">Fondo de invitación al servidor</string>
     <string name="guild_settings_splash_info">Se mostrará esta imagen cuando los usuarios reciban una invitación al servidor.</string>
@@ -2132,6 +2122,7 @@ Los miembros pueden revocar su mejora en cualquier momento.
 
 Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicamente &amp;username= a la cadena de consulta."</string>
     <string name="guild_settings_widget_enable_widget">Habilitar widget del servidor</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Detalles de compra</string>
     <string name="guild_verification_text_account_age">Tu cuenta debe tener al menos %1$s minutos de antigüedad para poder enviar mensajes en este servidor.</string>
     <string name="guild_verification_text_member_age">Debes ser miembro durante al menos %1$s minutos para enviar mensajes en este servidor.</string>
     <string name="guild_verification_text_not_claimed">Debes confirmar y verificar tu cuenta antes de poder enviar mensajes en este servidor.</string>
@@ -2481,10 +2472,6 @@ Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicament
     <string name="ios_media_keyboard_take_a_photo">Tomar una foto</string>
     <string name="ios_notification_see_full">Toca para ver el mensaje completo.</string>
     <string name="ios_profile_in_voice_call">En una llamada de voz</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Amigos en común</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Servidores en común</string>
     <string name="ios_profile_open_voice_channel">Abrir canal de voz</string>
     <string name="ios_view_all">Ver todo</string>
     <string name="ip_address_secured">Dirección IP asegurada</string>
@@ -2801,7 +2788,6 @@ entre canales a los que dicho miembro y el miembro con este permiso tienen acces
     <string name="network_error_unknown">Se ha producido un error de red desconocido.</string>
     <string name="network_error_unknown_host">Se ha producido un error de red. Revisa tus ajustes de DNS y vuelve a intentarlo.</string>
     <string name="network_offline">Conectividad de red limitada o no disponible.</string>
-    <string name="nevermind">Olvídalo</string>
     <string name="new_dm">Nuevo mensaje directo</string>
     <string name="new_group_dm">Nuevo grupo de MD</string>
     <string name="new_guilds_dm_allowed">Permitir mensajes directos de miembros del servidor.</string>
@@ -2924,7 +2910,6 @@ ningún mensaje fijado… aún."</string>
     <string name="notice_no_input_detected_help_link_text">¡Ayuda!</string>
     <string name="notice_no_input_detected_settings">Bueno, parece que Discord no detecta ningún sonido con tu micrófono. ¡Vamos a arreglarlo!</string>
     <string name="notice_no_input_detected_settings_link_text">Ajustes de visita</string>
-    <string name="notice_premium_grandfathered_ended">Tu acceso a Nitro ha expirado. Mejora Nitro Classic a Nitro para tener ventajas de chat superpoderosas y una mejora de servidor.</string>
     <string name="notice_premium_grandfathered_ending">¡Solo te queda(n) %1$s de Nitro! Tu suscripción se degradará a Nitro Classic el **%2$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>
@@ -3156,7 +3141,7 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
     <string name="payment_modal_button_change_card">Actualizar tarjeta de crédito</string>
     <string name="payment_modal_button_change_paypal">Actualizar cuenta de PayPal</string>
     <string name="payment_modal_button_premium">Consigue %1$s</string>
-    <string name="payment_modal_button_premium_gift">Comprar %1$s</string>
+    <string name="payment_modal_button_premium_gift">Comprar regalo</string>
     <string name="payment_modal_one_month">1 mes</string>
     <string name="payment_modal_one_year">1 año</string>
     <string name="payment_modal_per_month">Al mes</string>
@@ -3267,9 +3252,6 @@ Además, puede que el overlay no funcione para todos. Si tienes problemas o preg
 Puedes reanudar tu suscripción en cualquier momento."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">La cancelación surtirá efecto al final de tu periodo de facturación actual, el **%1$s**. Tu Discord Tag pasará a ser aleatoria si la habías cambiado.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Puedes reanudar tu suscripción en cualquier momento.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"La cancelación surtirá efecto al final de tu periodo de facturación actual. El **%1$s** dejarás de tener acceso a Nitro, tu Discord Tag pasará a ser aleatoria si la habías cambiado y se eliminará tu mejora del servidor.
-
-Puedes reanudar tu suscripción en cualquier momento."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">La cancelación surtirá efecto al final de tu periodo de facturación actual. El **%1$s** dejarás de tener acceso a Nitro, tu Discord Tag pasará a ser aleatoria si la habías cambiado y se eliminará tu mejora del servidor.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Puedes reanudar tu suscripción en cualquier momento.</string>
     <string name="premium_cancel_confirm_mobile">Cancelar Nitro</string>
@@ -3292,7 +3274,6 @@ Puedes reanudar tu suscripción en cualquier momento."</string>
     <string name="premium_chat_perks_description_streaming">Transmite en calidad original con Nitro o hasta un nítido 1080p 60fps con Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Mayor límite de subida de %1$s a %2$s con Nitro o a %3$s con Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">¡Mejora tu servidor favorito!</string>
-    <string name="premium_chat_perks_simple_title">Sin complicaciones. Consigue las ventajas de chat básicas sin una mejora del servidor.</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>
@@ -3331,41 +3312,20 @@ Puedes reanudar tu suscripción en cualquier momento."</string>
     <string name="premium_grandfathered_yearly">Para agradecerte tu apoyo a Discord, tendrás acceso a Nitro durante dos años. Tu acceso termina el **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Tiempo de recuperación de mejora: **%1$s d %2$s h %3$s m**</string>
     <string name="premium_guild_features_blurb">Mejorar un servidor con tu suscripción Nitro ayudará a que suba de nivel. ¡Por cada nivel conseguido, se desbloquearán ventajas de chat **para todos en ese servidor!** Echa un vistazo a algunas de estas ventajas:</string>
-    <string name="premium_guild_features_customize_guild_description">Desbloquea personalizaciones como un fondo de invitación, un cartel de servidor, URLs personalizadas, etc.</string>
     <string name="premium_guild_features_customize_guild_mobile">Personalizaciones del servidor</string>
-    <string name="premium_guild_features_customize_guild_title">Personalizaciones del servidor</string>
     <string name="premium_guild_features_learn_more_button">Más información sobre Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Consigue una experiencia mejorada en Discord empezando por una pequeña cuota mensual.</string>
     <string name="premium_guild_features_more">¡Y más! Puedes consultar el nivel actual, la progresión de nivel y las ventajas disponibles en un servidor.</string>
-    <string name="premium_guild_features_new_role_description">Consigue un rol de servidor especial, solo disponible para los usuarios que mejoren el servidor con Nitro en tu servidor.</string>
-    <string name="premium_guild_features_new_role_mobile">Roles exclusivos si mejoras el servidor con Nitro</string>
-    <string name="premium_guild_features_new_role_title">Nuevo rol exclusivo</string>
-    <string name="premium_guild_features_show_support_description">Los usuarios que mejoran reciben una nueva insignia de perfil que cambia con su racha.</string>
     <string name="premium_guild_features_show_support_mobile">Una nueva insignia de perfil que cambia con el tiempo</string>
-    <string name="premium_guild_features_show_support_title">Muestra tu apoyo</string>
     <string name="premium_guild_features_title">Con Nitro, ¡puedes ayudar a mejorar un servidor!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Aumenta el límite de subida de toda la comunidad</string>
-    <string name="premium_guild_features_upload_sizes_title">Mayor límite de subida para todos</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">¡Suscríbete a Nitro para enviar una mejora de Nitro a un servidor! [Más información sobre la mejora del servidor de Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">¡Mejora tu suscripción para enviar una mejora de Nitro a un servidor! [Más información sobre la mejora del servidor de Nitro.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Sin mejoras de Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Sin nivel</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Mejora del servidor de Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">Las ventajas del servidor mejorado incluyen —</string>
-    <string name="premium_guild_perks_modal_blurb">"Por cada nivel conseguido, los miembros del servidor te ayudarán a desbloquear ventajas para todos. Estas ventajas solo tienen efecto en el servidor.
-
-**Los usuarios que mejoran consiguen: un icono de lista de miembros, una nueva insignia que evoluciona y un rol exclusivo.**
-
-[Más información sobre la mejora del servidor de Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Por cada nivel conseguido, los miembros del servidor te ayudarán a desbloquear ventajas para todos. Estas ventajas solo tienen efecto en el servidor.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Los usuarios que mejoran consiguen: un icono de lista de miembros, una nueva insignia que evoluciona y un rol exclusivo.**[Más información sobre la mejora del servidor de Nitro.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">¡Consigue Nitro para mejorar!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Mejora este servidor</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">¡Actualiza a Nitro para mejorar!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Actualmente las actualizaciones a Nitro no están disponibles para suscripciones hechas a través de Apple. Puedes cancelar tu suscripción en [Gestión de suscripción de Apple](%1$s), pero la suscripción estará activa hasta la fecha en la que expire.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic no incluye mejora del servidor</string>
     <string name="premium_guild_perks_modal_header">Estado de mejora del servidor</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** mejoras</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Gestiona tu mejora</string>
     <string name="premium_guild_perks_modal_no_tiers">Aún no se han conseguido niveles</string>
@@ -3378,44 +3338,32 @@ Puedes reanudar tu suscripción en cualquier momento."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s mejorado este servidor</string>
     <string name="premium_guild_settings_members_subscribed_needed">Necesitas **%1$s** para desbloquear %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Confirma que quieres enviar una mejora de Nitro a:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Selecciona este servidor</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Selecciona este servidor. Tu mejora tardará un momento en surtir efecto.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Si mejoras este servidor, no podrás mejorar otro servidor durante %1$s. Eliminar tu mejora no afectará al tiempo de recuperación.**</string>
     <string name="premium_guild_subscribe_confirm_header">¡Elige bien!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Buscar servidores</string>
     <string name="premium_guild_subscribe_select_guild_header">Seleccionar un servidor</string>
     <string name="premium_guild_subscribe_success_thanks">¡Gracias por la mejora!</string>
     <string name="premium_guild_subscription_available_count">¡Tienes **%1$s** disponible(s)!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Ha habido un error al intentar mejorar. Vuelve a intentarlo.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Parece que no se ha acabado tu tiempo de recuperación. Espera **%1$s y %2$s** antes de intentarlo de nuevo.</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Parece que no se ha acabado tu tiempo de recuperación. Espera **%1$s y %2$s** antes de intentarlo de nuevo.</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Parece que no se ha acabado tu tiempo de recuperación. Espera **%1$s** antes de intentarlo de nuevo.</string>
     <string name="premium_guild_subscription_no_next_tier">¡Este servidor está totalmente potenciado! ¡Sigue mejorando!</string>
-    <string name="premium_guild_subscription_notice">¡Ya están aquí las mejoras del servidor de Nitro! Reúne a tu comunidad para que mejore tu servidor.</string>
     <string name="premium_guild_subscription_notice_button">Ver niveles y ventajas</string>
-    <string name="premium_guild_subscription_notice_small_guild">¡Ya están aquí las mejoras del servidor de Nitro! Reúne a tus amigos para que mejoren tu servidor.</string>
     <string name="premium_guild_subscription_remove_button">Eliminar mejora</string>
     <string name="premium_guild_subscription_remove_error_mobile">Ha habido un error al intentar eliminar la mejora. Vuelve a intentarlo.</string>
     <string name="premium_guild_subscription_select_server_button">Seleccionar un servidor</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"¡Usa tus poderes de Nitro para mejorar algún servidor al que te hayas unido! Mejorar un servidor le permite progresar hacia un nivel. Cada nivel otorga recompensas colectivas para todo el servidor.
-Mejorar un servidor activa un tiempo de recuperación de 7 días. No podrás mejorar otro servidor hasta que finalice este tiempo de recuperación, incluso si eliminas tu mejora. [Más información sobre la mejora del servidor de Nitro.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">¡Usa tus poderes de Nitro para mejorar algún servidor al que te hayas unido! Mejorar un servidor le permite progresar hacia un nivel. Cada nivel otorga recompensas colectivas para todo el servidor.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Mejorar un servidor activa un tiempo de recuperación de 7 días. No podrás mejorar otro servidor hasta que finalice este tiempo de recuperación, incluso si eliminas tu mejora. [Más información sobre la mejora del servidor de Nitro.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Mejora del servidor de Nitro</string>
-    <string name="premium_guild_subscription_tooltip">Mejorando con Nitro desde %1$s</string>
+    <string name="premium_guild_tier_0">Sin nivel</string>
     <string name="premium_guild_tier_1">Nivel 1</string>
     <string name="premium_guild_tier_2">Nivel 2</string>
     <string name="premium_guild_tier_3">Nivel 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Confirma que quieres eliminar tu mejora de Nitro de:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Sí, eliminar mejora</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Este servidor perderá progreso si eliminas tu mejora.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Este servidor perderá progreso si eliminas tu mejora. **Tu mejora aún está en tiempo de recuperación. Estará disponible en %1$s y %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Este servidor perderá progreso si eliminas tu mejora. **Tu mejora aún está en tiempo de recuperación. Estará disponible en %1$s y %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Este servidor perderá progreso si eliminas tu mejora. **Tu mejora aún está en tiempo de recuperación. Estará disponible en %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">¿Eliminar mejora de Nitro?</string>
     <string name="premium_included">Incluido con Nitro:</string>
     <string name="premium_info_monthly">%1$s (mensual) se carga el %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / mes</string>
@@ -3428,7 +3376,6 @@ Mejorar un servidor activa un tiempo de recuperación de 7 días. No podrás mej
     <string name="premium_payment_confirmation_blurb_regular">Ahora tienes el poder de las ventajas mejoradas de chat. ¡¡¡Deja de leer y corre a chatear!!!</string>
     <string name="premium_payment_confirmation_button_iap">Consigue %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Vale, suena bien</string>
-    <string name="premium_payment_gift_blurb">Regala [Nitro](onClick) a tus amigos para que puedan obtener ventajas de chat increíbles y una mejora del servidor.</string>
     <string name="premium_payment_gift_blurb_mobile">Regala Nitro a alguien para darle acceso a ventajas de chat increíbles y a la mejora del servidor. [Más información sobre Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Será un pago único para el intervalo de tiempo elegido. No pagarás de forma mensual.</string>
     <string name="premium_payment_is_gift">Vas a comprar un regalo.</string>
@@ -3443,7 +3390,6 @@ Mejorar un servidor activa un tiempo de recuperación de 7 días. No podrás mej
     <string name="premium_plan_month_tier_1">Nitro Classic mensual</string>
     <string name="premium_plan_month_tier_2">Nitro mensual</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>
     <string name="premium_promo_title">¿Quieres poderes de emojis mejorados?</string>
     <string name="premium_required">Nitro obligatoria</string>
     <string name="premium_required_get_nitro">¡Consigue Nitro!</string>
@@ -3462,26 +3408,10 @@ Mejorar un servidor activa un tiempo de recuperación de 7 días. No podrás mej
     <string name="premium_tier_2_title">Consigue una experiencia mejorada en Discord por una pequeña cuota mensual.</string>
     <string name="premium_trial_button">Empieza la prueba gratis</string>
     <string name="premium_upgrade_cancel">Nop</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Mejora al plan anual y obtén dos meses gratis. ¡¡Vaya ganga!!
-
-Calcularemos la parte proporcional a tu plan actual y la restaremos al precio anual. El precio final será de **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Mejora al plan anual y obtén dos meses gratis. ¡¡Vaya ganga!!
-
-Calcularemos la parte proporcional a tu plan actual y la restaremos al precio anual. El precio será de **%1$s** ahora y **%2$s al año después del periodo de facturación actual.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Actualiza tu plan %1$s (mensual) y disfruta de poder mejorar servidores. Tu nuevo plan comenzará de inmediato.
-
-Calcularemos la parte proporcional a tu plan actual y la restaremos al precio mensual. El precio final será de **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Actualiza tu plan %1$s (mensual) y disfruta de poder mejorar servidores. Tu nuevo plan comenzará de inmediato.
-
- Calcularemos la parte proporcional a tu plan actual y la restaremos al precio mensual. El precio será de **%2$s** ahora y **%3$s al mes después del periodo de facturación actual.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Actualiza tu plan %1$s (mensual) y disfruta de poder mejorar servidores. Tu nuevo plan comenzará de inmediato.
 
 Calcularemos la parte proporcional a tu plan actual y la restaremos al precio anual. El precio final será de **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Actualiza tu plan %1$s (mensual) y disfruta de poder mejorar servidores. Tu nuevo plan comenzará de inmediato.
-
-Calcularemos la parte proporcional a tu plan actual y la restaremos al precio anual. El precio será de **%2$s** ahora y **%3$s al año después del periodo de facturación actual.**"</string>
     <string name="premium_upgrade_confirm_button">Mejorar</string>
-    <string name="premium_upgrade_confirm_button_with_price">Mejorar ya - %1$s</string>
     <string name="premium_upgrade_confirm_title">Mejorar a %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">No puedes suscribirte si aún tienes Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Tu plan actual.</string>
@@ -4038,8 +3968,6 @@ los podrá escuchar cualquiera que tenga abierto el canal."</string>
     <string name="stop_streaming">Dejar de transmitir</string>
     <string name="stop_watching">Dejar de ver</string>
     <string name="store_channel">Canal de tienda</string>
-    <string name="store_payment_legalese_monthly">¡Ey! Al comprar %1$s, aceptas nuestras [Condiciones del Servicio](%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](%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>
diff --git a/com.discord/res/values-fi/plurals.xml b/com.discord/res/values-fi/plurals.xml
index 032d05bc74..a895784760 100644
--- a/com.discord/res/values-fi/plurals.xml
+++ b/com.discord/res/values-fi/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d vuotta</item>
         <item quantity="one">%d vuoden</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d kuukautta</item>
-        <item quantity="one">%d kuukauden</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d vuotta</item>
-        <item quantity="one">%d vuoden</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">kuukautta</item>
         <item quantity="one">kuukausi</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d käyttökerran</item>
         <item quantity="one">%d käyttökerran</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d yhteistä kaveria</item>
-        <item quantity="zero">0 yhteistä kaveria</item>
-        <item quantity="one">1 yhteinen kaveri</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d yhteistä palvelinta</item>
-        <item quantity="zero">0 yhteistä palvelinta</item>
-        <item quantity="one">1 yhteinen palvelin</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d päivää</item>
         <item quantity="one">1 päivä</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d kuukauden</item>
         <item quantity="one">1 kuukauden</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d nostatusta</item>
-        <item quantity="one">%d nostatus</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d nostatusta lisää</item>
         <item quantity="one">%d nostatuksen lisää</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d nostatusta</item>
         <item quantity="one">%d nostatus</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d päivän</item>
-        <item quantity="one">%d päivän</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d palvelimen nostatusta</item>
         <item quantity="one">%d palvelimen nostatus</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d kuukautta</item>
         <item quantity="one">%d kuukausi</item>
     </plurals>
@@ -597,10 +571,6 @@
         <item quantity="other">%d minuuttia</item>
         <item quantity="one">%d minuutti</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** nostatusta</item>
-        <item quantity="one">**%d** nostatus</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d päivän</item>
         <item quantity="one">%d päivän</item>
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index 96ab03febe..93776da933 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -631,7 +631,6 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing">Laskutus</string>
     <string name="billing_accept_terms_tooltip">Jatka hyväksymällä palveluehdot</string>
     <string name="billing_account_credit">Tiliveloitus</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s kuukautta ilmaiseksi</string>
     <string name="billing_add_payment_method">Lisää maksutapa</string>
     <string name="billing_address">Laskutusosoite</string>
     <string name="billing_address_address">Osoite</string>
@@ -687,8 +686,6 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing_payment_choose_plan">Valitse tilaus</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 [palveluehtomme](%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 [palveluehtomme](%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_source_invalid">Tämä maksutapa ei ole kelvollinen.</string>
     <string name="billing_payment_sources">Maksutavat</string>
     <string name="billing_payment_table_header_amount">Summa</string>
@@ -706,13 +703,11 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing_price_per_month_current_plan">(NYKYINEN TILAUS) %1$s / kuukausi</string>
     <string name="billing_price_per_month_current_plan_ios">(Nykyinen tilaus) %1$s / kuukausi</string>
     <string name="billing_price_per_month_mobile">%1$s / KK</string>
-    <string name="billing_price_per_month_upgrade">Päivitä hintaan %1$s / kuukausi</string>
     <string name="billing_price_per_year">%1$s / vuosi</string>
     <string name="billing_price_per_year_current_plan">(NYKYINEN TILAUS) %1$s / vuosi</string>
     <string name="billing_price_per_year_current_plan_ios">(Nykyinen tilaus) %1$s / vuosi</string>
     <string name="billing_price_per_year_mobile">%1$s / VSI</string>
     <string name="billing_price_per_year_months_free">%1$s / vuosi (2 kuukautta ilmaiseksi)</string>
-    <string name="billing_price_per_year_upgrade">Päivitä ja maksa vain %1$s / vuosi</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>
@@ -734,6 +729,10 @@ Mutta jos ja kun annat, älä epäröi!"</string>
     <string name="billing_step_review">Tarkistus</string>
     <string name="billing_step_select_plan">Valitse tilaus</string>
     <string name="billing_subscribe">Tilaa</string>
+    <string name="billing_switch_plan_change">Vaihda tilausta</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Asia ymmärretty!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Siistiä!</string>
+    <string name="billing_switch_plan_upgrade">Päivitä</string>
     <string name="billing_tag_failed">Epäonnistui</string>
     <string name="billing_tag_pending">Odottaa</string>
     <string name="billing_tag_refunded">Hyvitetty</string>
@@ -1793,11 +1792,8 @@ Kiitos, että pidät asiat putipuhtaina."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Kiitos toisen anteliaan ihmisen sinulla on nyt %1$s käytössäsi %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Kiitos toisen anteliaan ihmisen sinulla on nyt %1$s käytössäsi %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** on lisätty kirjastoosi.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Kiitos toisen anteliaan ihmisen sinulla on nyt laajennetut keskusteluedut ja palvelimen nostatus käytössäsi %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Kiitos toisen anteliaan ihmisen sinulla on nyt laajennetut keskusteluedut käytössäsi %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Kiitos toisen anteliaan ihmisen sinulla on nyt laajennetut keskusteluedut käytössäsi %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Kiitos toisen anteliaan ihmisen sinulla on nyt laajennetut keskusteluedut ja palvelimen nostatus käytössäsi %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Kiitos toisen anteliaan ihmisen sinulla on nyt laajennetut keskusteluedut ja palvelimen nostatus käytössäsi %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Jotain vinkeää tapahtui emmekä saaneet pakettia haltuumme… Yritetäänkö uudelleen?</string>
     <string name="gift_confirmation_button_confirm">Ilman muuta! Lisää kirjastoon</string>
     <string name="gift_confirmation_button_confirm_mobile">Anna tänne</string>
@@ -2151,9 +2147,7 @@ Menetetty: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s palvelimen emoji-paikkaa (yhteensä %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Latausrajaksi %1$s kaikille jäsenille</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Palvelimen nostatusetuina –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Kukaan ei ole vielä käyttänyt Nitro-voimiaan tällä palvelimella. Selvitä, olisiko joku jäsen valmis auttamaan palvelintasi Nitro-eduilla!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Nostatetut palvelimet saavat edellisen tason edut ja –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Ei Nitro-nostatusta</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Tason 1 edut</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Tason 2 edut</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Tason 3 edut</string>
@@ -2170,16 +2164,12 @@ Menetetty: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Tason %1$s etu avattu</string>
     <string name="guild_settings_overview_notice">Nyt varoen! Sinulla on tallentamattomia muutoksia!</string>
     <string name="guild_settings_overview_tier_info">Tämä on tason %1$s Nitro-ominaisuus. [Tarkista oma tasotilanteesi](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Palvelimen jäsenet, joilla on aktiivinen Nitro-tilaus, voivat auttaa tasojen avaamisessa Nitro-voimiaan käyttämällä.
-Kukin saavutettu taso auttaa palvelimen jäseniä avaamaan etuja kaikille.
-
-Jäsenet voivat peruuttaa nostatuksen milloin tahansa.
-**Palvelimen edut säilyvät kolmen päivän ajan, jos sen taso putoaa. **[Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Tarvitset vain %1$s seuraavalle tasolle!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** on nostattanut tätä palvelinta</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Palvelimen Nitro-nostatustila</string>
+    <string name="guild_settings_premium_guild_title">Palvelimen nostatustila</string>
     <string name="guild_settings_premium_guild_unlocked">Avattu</string>
+    <string name="guild_settings_premium_upsell_learn_more">Lue lisää Discord Nitrosta</string>
     <string name="guild_settings_server_banner">Palvelimen banneri</string>
     <string name="guild_settings_server_invite_background">Palvelimen kutsun taustakuva</string>
     <string name="guild_settings_splash_info">Tämä kuva näytetään palvelimelle kutsuttaville käyttäjille.</string>
@@ -2189,6 +2179,7 @@ Jäsenet voivat peruuttaa nostatuksen milloin tahansa.
 
 Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &amp;username= -merkkijonon koodiisi."</string>
     <string name="guild_settings_widget_enable_widget">Ota palvelimen pienoisohjelma käyttöön</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Ostoksen tiedot</string>
     <string name="guild_verification_text_account_age">Käyttäjätilisi on oltava vähintään %1$s minuuttia vanha, jotta voit lähettää viestejä tällä palvelimella.</string>
     <string name="guild_verification_text_member_age">Sinun on oltava ollut jäsen vähintään %1$s minuuttia, minuuttia vanha, jotta voit lähettää viestejä tällä palvelimella.</string>
     <string name="guild_verification_text_not_claimed">Sinun pitää rekisteröidä ja vahvistaa tilisi, jotta voit lähettää viestejä tällä palvelimella.</string>
@@ -2541,10 +2532,6 @@ Haluatko lisätietoja Discordista?"</string>
     <string name="ios_media_keyboard_take_a_photo">Ota valokuva</string>
     <string name="ios_notification_see_full">Katso koko viesti napauttamalla.</string>
     <string name="ios_profile_in_voice_call">Puhelu käynnissä</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Yhteiset kaverit</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Yhteiset palvelimet</string>
     <string name="ios_profile_open_voice_channel">Avaa puhekanava</string>
     <string name="ios_view_all">Näytä kaikki</string>
     <string name="ip_address_secured">IP-osoite suojattu</string>
@@ -2857,7 +2844,6 @@ ainoastaan sellaisten kanavien välillä, joihin sekä hänellä että siirrett
     <string name="network_error_unknown">On ilmennyt tuntematon verkkovirhe.</string>
     <string name="network_error_unknown_host">On ilmennyt verkkovirhe. Tarkista DNS-asetuksesi ja yritä uudelleen.</string>
     <string name="network_offline">Verkkoyhteys on rajoitettu tai ei saatavilla.</string>
-    <string name="nevermind">Unohda koko juttu</string>
     <string name="new_dm">Uusi yksityisviesti</string>
     <string name="new_group_dm">Uusi ryhmäkeskustelu</string>
     <string name="new_guilds_dm_allowed">Salli yksityisviestit palvelimen jäseniltä.</string>
@@ -2981,7 +2967,6 @@ kiinnitettyjä viestejä… vielä."</string>
     <string name="notice_no_input_detected_help_link_text">Apua!</string>
     <string name="notice_no_input_detected_settings">Discord ei näemmä havaitse mitään syötettä mikrofonistasi. Korjataan asia!</string>
     <string name="notice_no_input_detected_settings_link_text">Siirry asetuksiin</string>
-    <string name="notice_premium_grandfathered_ended">Nitro-käyttöoikeutesi on päättynyt. Päivitä Nitro Classic -tilauksesta Nitro-tilaukseen, niin saat supermahtavat keskusteluedut ja palvelimen nostatuksen.</string>
     <string name="notice_premium_grandfathered_ending">Nitro on tarjolla sinulle enää %1$s ajan! Tilauksesi laskee Nitro Classic -tasolle **%2$s**.</string>
     <string name="notice_premium_promo_action">Tutustu</string>
     <string name="notice_premium_promo_message">Tue Discordin kehitystä ja saa mukavia lisäetuja!</string>
@@ -3214,7 +3199,7 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
     <string name="payment_modal_button_change_card">Päivitä luottokortti</string>
     <string name="payment_modal_button_change_paypal">Päivitä PayPal-tili</string>
     <string name="payment_modal_button_premium">Hanki %1$s</string>
-    <string name="payment_modal_button_premium_gift">Osta %1$s</string>
+    <string name="payment_modal_button_premium_gift">Osta lahja</string>
     <string name="payment_modal_one_month">1 kuukausi</string>
     <string name="payment_modal_one_year">1 vuosi</string>
     <string name="payment_modal_per_month">Kuukausimaksu</string>
@@ -3325,9 +3310,6 @@ jos sinulla on ongelmia tai kysymyksiä!"</string>
 Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Peruutus tulee voimaan kuluvan laskutuskauden lopussa **%1$s**. DiscordTagisi vaihtuu satunnaisesti, jos olet muuttanut sitä.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Voit käynnistää tilauksen uudelleen milloin tahansa.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Peruutus tulee voimaan kuluvan laskutuskauden lopussa. **%1$s** menetät Nitron käyttöoikeuden, DiscordTagisi vaihtuu satunnaisesti, jos olet muuttanut sitä, ja palvelimen nostatuksesi poistetaan.
-
- Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Peruutus tulee voimaan kuluvan laskutuskauden lopussa. **%1$s** menetät Nitron käyttöoikeuden, DiscordTagisi vaihtuu satunnaisesti, jos olet muuttanut sitä, ja palvelimen nostatuksesi poistetaan.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Voit käynnistää tilauksen uudelleen milloin tahansa.</string>
     <string name="premium_cancel_confirm_mobile">Peru Nitro</string>
@@ -3350,7 +3332,6 @@ Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <string name="premium_chat_perks_description_streaming">Striimaa lähdetarkkuudella Nitrolla tai terävällä jopa 1080p-tarkkuudella ja 60 fps:n nopeudella Nitro Classicilla.</string>
     <string name="premium_chat_perks_description_upload_limit">Ladattavien tiedostojen kokorajoituksen (%1$s) nosto. Raja on Nitro-tilauksella %2$s ja Nitro Classic -tilauksella %3$s.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Nostata suosikkipalvelintasi!</string>
-    <string name="premium_chat_perks_simple_title">Pidä homma yksinkertaisena – saat perusedut keskusteluihin ilman palvelimen nostatusta.</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>
@@ -3389,41 +3370,20 @@ Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <string name="premium_grandfathered_yearly">Kiitokseksi tuestasi Discordille saat käyttöoikeuden Nitroon kahdeksi vuodeksi. Käyttöoikeutesi päättyy **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Nostatuksen odotusaika: **%1$s p %2$s t %3$s min**</string>
     <string name="premium_guild_features_blurb">Nostattamalla palvelinta Nitro-tilauksella autat palvelinta nousemaan korkeammille tasoille. Jokainen saavutettu taso avaa keskusteluetuja **kaikille palvelimen jäsenille!** Tässä on esimerkkejä näistä mahtavista eduista:</string>
-    <string name="premium_guild_features_customize_guild_description">Avaa kutsujen taustakuvan, palvelimen bannerin ja personoidun osoitteen kaltaisia mukautuksia.</string>
     <string name="premium_guild_features_customize_guild_mobile">Palvelinmukautukset</string>
-    <string name="premium_guild_features_customize_guild_title">Palvelinmukautukset</string>
     <string name="premium_guild_features_learn_more_button">Lue lisää Discord Nitrosta</string>
     <string name="premium_guild_features_learn_more_text">Hanki tehostettu Discord-käyttökokemus – tarjolla edullinen kuukausihinta.</string>
     <string name="premium_guild_features_more">Ja paljon muuta! Voit tarkastaa palvelimen nykyisen tason, tasonousun tilanteen ja käytettävissä olevat edut.</string>
-    <string name="premium_guild_features_new_role_description">Hanki palvelimellesi erikoisrooli, jonka saavat vain palvelimen Nitro-nostattajat.</string>
-    <string name="premium_guild_features_new_role_mobile">Eksklusiiviset palvelimen Nitro-nostattajan roolit</string>
-    <string name="premium_guild_features_new_role_title">Eksklusiivinen uusi rooli</string>
-    <string name="premium_guild_features_show_support_description">Nostattajat saavat uuden kiiltävän profiilimerkin, joka muuttuu nostatusputken kasvaessa.</string>
     <string name="premium_guild_features_show_support_mobile">Uusi ajan kuluessa muuttuva profiilimerkki</string>
-    <string name="premium_guild_features_show_support_title">Osoita tukesi</string>
     <string name="premium_guild_features_title">Nitron avulla voit nostattaa palvelinta!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Suuremmat latauskoot koko yhteisölle</string>
-    <string name="premium_guild_features_upload_sizes_title">Suuremmat latauskoot kaikille</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Tilaa Nitro, niin voit antaa palvelimelle Nitro-nostatuksen! [Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Päivitä tilauksesi, niin voit antaa palvelimelle Nitro-nostatuksen! [Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Ei Nitro-nostatuksia</string>
     <string name="premium_guild_header_badge_no_tier">Ei tasoa</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Palvelimen Nitro-nostatus</string>
     <string name="premium_guild_perks_modal_base_perks">Palvelimen nostatusetuina –</string>
-    <string name="premium_guild_perks_modal_blurb">"Kukin saavutettu uusi taso auttaa palvelimen jäseniä avaamaan uusia etuja kaikille. Nämä edut toimivat vain palvelimella.
-
- **Nostattajien edut: jäsenluettelon kuvake, uusi kehittyvä merkki ja vain nostattajille annettava rooli.**
-
- [Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Kukin saavutettu uusi taso auttaa palvelimen jäseniä avaamaan uusia etuja kaikille. Nämä edut toimivat vain palvelimella.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Nostattajien edut: jäsenluettelon kuvake, uusi kehittyvä merkki ja vain nostattajille annettava rooli.** [Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Hanki Nitro, niin voit käyttää nostatusta!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Nostata tätä palvelinta</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Päivitä Nitro-tilaukseen, niin voit käyttää nostatusta!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Emme tällä hetkellä tue Nitron päivittämistä Applen kautta tehtyihin tilauksiin. Voit peruuttaa tilauksesi [Applen tilaustenhallinnan](%1$s) kautta, mutta tilaus pysyy voimassa vanhenemispäiväänsä asti.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic ei sisällä palvelimen nostatusta</string>
     <string name="premium_guild_perks_modal_header">Palvelimen nostatustila</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** nostatusta</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Oman nostatuksen hallinta</string>
     <string name="premium_guild_perks_modal_no_tiers">Tasoja ei ole saavutettu vielä</string>
@@ -3436,44 +3396,32 @@ Voit käynnistää tilauksen uudelleen milloin tahansa."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s on nostattanut tätä palvelinta</string>
     <string name="premium_guild_settings_members_subscribed_needed">Tarvitset **%1$s**, niin %2$s on avattavissa</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Haluatko varmasti lähettää Nitro-nostatuksen tälle palvelimelle:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Valitse tämä palvelin</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Valitse tämä palvelin. Nostatuksen voimaantulo kestää hetken.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Palvelimen nostattaminen estää muiden palvelimien nostattamisen %1$s ajaksi. Tämä odotusaika ei lyhene, vaikka poistaisit nostatuksen.**</string>
     <string name="premium_guild_subscribe_confirm_header">Valitse viisaasti!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Etsi palvelimia</string>
     <string name="premium_guild_subscribe_select_guild_header">Valitse palvelin</string>
     <string name="premium_guild_subscribe_success_thanks">Kiitos nostatuksesta!</string>
     <string name="premium_guild_subscription_available_count">Sinulla on **%1$s** käytettävissä!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Kun yritimme ottaa nostatusta käyttöön, ilmeni virhe. Yritä uudelleen.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Sinulla on odotusaika käynnissä. Odota **%1$s ja %2$s** ja kokeile sitten uudelleen</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Sinulla on odotusaika käynnissä. Odota **%1$s ja %2$s** ja kokeile sitten uudelleen</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Sinulla on odotusaika käynnissä. Odota **%1$s** ja kokeile sitten uudelleen</string>
     <string name="premium_guild_subscription_no_next_tier">Tällä palvelimella on täydet edut! Jatka nostatusta!</string>
-    <string name="premium_guild_subscription_notice">Palvelimen Nitro-nostatus on täällä! Kokoa yhteisö kokoon nostamaan palvelintasi.</string>
     <string name="premium_guild_subscription_notice_button">Näytä tasot ja edut</string>
-    <string name="premium_guild_subscription_notice_small_guild">Palvelimen Nitro-nostatus on täällä! Kokoa kaverisi kokoon nostamaan palvelintasi.</string>
     <string name="premium_guild_subscription_remove_button">Poista nostatus</string>
     <string name="premium_guild_subscription_remove_error_mobile">Kun yritimme poistaa nostatusta, ilmeni virhe. Yritä uudelleen.</string>
     <string name="premium_guild_subscription_select_server_button">Valitse palvelin</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Voit nostattaa Nitro-voimillasi palvelinta, jolle olet liittynyt! Kun nostatat palvelinta, sen taso nousee. Uusilla tasoilla kaikki palvelimen käyttäjät saavat yhteisiä etuja.
-Palvelimen nostattaminen käynnistää seitsemän päivän odotusajan. Voit nostattaa toista palvelinta vasta tämän odotusajan jälkeen, vaikka poistaisit nostatuksesi aiemmalta palvelimelta. [Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Voit nostattaa Nitro-voimillasi palvelinta, jolle olet liittynyt! Kun nostatat palvelinta, sen taso nousee. Uusilla tasoilla kaikki palvelimen käyttäjät saavat yhteisiä etuja.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Palvelimen nostattaminen käynnistää seitsemän päivän odotusajan. Voit nostattaa toista palvelinta vasta tämän odotusajan jälkeen, vaikka poistaisit nostatuksesi aiemmalta palvelimelta. [Lue lisää palvelimen Nitro-nostatuksesta.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Palvelimen Nitro-nostatus</string>
-    <string name="premium_guild_subscription_tooltip">Nitro-nostattaja %1$s alkaen</string>
+    <string name="premium_guild_tier_0">Ei tasoa</string>
     <string name="premium_guild_tier_1">Taso 1</string>
     <string name="premium_guild_tier_2">Taso 2</string>
     <string name="premium_guild_tier_3">Taso 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Haluatko varmasti poistaa Nitro-nostatuksesi tältä palvelimelta:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Kyllä, poista nostatus</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Palvelin menettää tasonousuedistyksensä, jos poistat nostatuksesi.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Palvelin menettää tasonousuedistyksensä, jos poistat nostatuksesi. **Nostatuksesi odotusaika on yhä käynnissä. Voit tehdä uuden nostatuksen %1$s ja %2$s kuluttua.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Palvelin menettää tasonousuedistyksensä, jos poistat nostatuksesi. **Nostatuksesi odotusaika on yhä käynnissä. Voit tehdä uuden nostatuksen %1$s ja %2$s kuluttua.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Palvelin menettää tasonousuedistyksensä, jos poistat nostatuksesi. **Nostatuksesi odotusaika on yhä käynnissä. Voit tehdä uuden nostatuksen %1$s kuluttua.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Poistetaanko Nitro-nostatus?</string>
     <string name="premium_included">Nitroon sisältyvät:</string>
     <string name="premium_info_monthly">%1$s veloitetaan (kuukausittain) %2$s.</string>
     <string name="premium_month_subscription">**%1$s %2$s (%3$s)** / kk</string>
@@ -3486,7 +3434,6 @@ Palvelimen nostattaminen käynnistää seitsemän päivän odotusajan. Voit nost
     <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_button_iap">Hanki %1$s</string>
     <string name="premium_payment_confirmation_button_regular">OK, kuulostaa hyvältä</string>
-    <string name="premium_payment_gift_blurb">Anna kavereillesi lahjaksi [Nitro](onClick), niin he saavat supermahtavat keskusteluedut ja palvelimen nostatuksen.</string>
     <string name="premium_payment_gift_blurb_mobile">Anna kaverilliseksi lahjaksi Nitro, niin hän saa supermahtavat keskusteluedut ja palvelimen nostatuksen. [Lue lisää Nitrosta.](onClick)</string>
     <string name="premium_payment_gift_subtext">Tämä on valitsemasi suuruinen kertaveloitus. Sinua ei laskuteta kuukausittain.</string>
     <string name="premium_payment_is_gift">Olet ostamassa lahjaa.</string>
@@ -3501,7 +3448,6 @@ Palvelimen nostattaminen käynnistää seitsemän päivän odotusajan. Voit nost
     <string name="premium_plan_month_tier_1">Nitro Classicin kuukausitilaus</string>
     <string name="premium_plan_month_tier_2">Nitron kuukausitilaus</string>
     <string name="premium_promo_autocomplete">Käytä mukautettuja emojeja kaikkialla</string>
-    <string name="premium_promo_description">Nouse Discord Nitron kyytiin, niin saat käyttöösi animoidut ja mukautetut emojit kaikilla palvelimilla.</string>
     <string name="premium_promo_title">Haluatko paremmat emojitoiminnot?</string>
     <string name="premium_required">Nitro vaaditaan</string>
     <string name="premium_required_get_nitro">Hanki Nitro!</string>
@@ -3520,26 +3466,10 @@ Palvelimen nostattaminen käynnistää seitsemän päivän odotusajan. Voit nost
     <string name="premium_tier_2_title">Hanki tehostettu Discord-käyttökokemus edulliseen kuukausihintaan.</string>
     <string name="premium_trial_button">Aloita ilmainen kokeilu</string>
     <string name="premium_upgrade_cancel">Ei kiitos</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Päivitä tilaukseksesi vuositilaukseksi, niin saat kaksi kuukautta ilmaiseksi. Aivan mahtava tarjous!
-
-Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne vuosimaksusta. Sinulta veloitetaan **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Päivitä tilaukseksesi vuositilaukseksi, niin saat kaksi kuukautta ilmaiseksi. Aivan mahtava tarjous!
-
-Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne vuosimaksusta. Sinulta veloitetaan nyt **%1$s** ja nykyisen laskutuskauden päätyttyä **%2$s vuodessa.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Päivitä nykyistä tilaustasi (%1$s, kuukausittainen), niin saat palvelimien nostatuksen käyttöösi. Uusi tilauksesi alkaa välittömästi.
-
- Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne kuukausimaksusta. Sinulta veloitetaan **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Päivitä nykyistä tilaustasi (%1$s, kuukausittainen), niin saat palvelimien nostatuksen käyttöösi. Uusi tilauksesi alkaa välittömästi.
-
- Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne kuukausimaksusta. Sinulta veloitetaan nyt **%2$s** ja nykyisen laskutuskauden päätyttyä **%3$s kuukaudessa.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Päivitä nykyistä tilaustasi (%1$s, kuukausittainen), niin saat palvelimien nostatuksen käyttöösi. Uusi tilauksesi alkaa välittömästi.
 
 Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne vuosimaksusta. Sinulta veloitetaan **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Päivitä nykyistä tilaustasi (%1$s, kuukausittainen), niin saat palvelimien nostatuksen käyttöösi. Uusi tilauksesi alkaa välittömästi.
-
-Huomioimme myös nykyisen tilauksesi maksut ja vähennämme ne vuosimaksusta. Sinulta veloitetaan nyt **%2$s** ja nykyisen laskutuskauden päätyttyä **%3$s vuodessa.**"</string>
     <string name="premium_upgrade_confirm_button">Päivitä</string>
-    <string name="premium_upgrade_confirm_button_with_price">Päivitä nyt – %1$s</string>
     <string name="premium_upgrade_confirm_title">Päivitä tilaukseksi %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Et voi tehdä tilausta, kun sinulla on jo Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Nykyinen tilauksesi.</string>
@@ -4101,8 +4031,6 @@ Haluatko varmasti tehdä tämän?"</string>
     <string name="stop_streaming">Lopeta striimaus</string>
     <string name="stop_watching">Lopeta katselu</string>
     <string name="store_channel">Kauppakanava</string>
-    <string name="store_payment_legalese_monthly">Hei! Ostamalla tilauksen %1$s hyväksyt [palveluehtomme](%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 [palveluehtomme](%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>
diff --git a/com.discord/res/values-fr/plurals.xml b/com.discord/res/values-fr/plurals.xml
index 6a3d37c551..aa8bf73dad 100644
--- a/com.discord/res/values-fr/plurals.xml
+++ b/com.discord/res/values-fr/plurals.xml
@@ -314,14 +314,6 @@
         <item quantity="other">%d ans</item>
         <item quantity="one">%d an</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d mois</item>
-        <item quantity="one">%d mois</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d ans</item>
-        <item quantity="one">%d an</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">mois</item>
         <item quantity="one">mois</item>
@@ -478,16 +470,6 @@
         <item quantity="other">%d utilisations</item>
         <item quantity="one">%d utilisation</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d amis en commun</item>
-        <item quantity="zero">0 ami en commun</item>
-        <item quantity="one">1 ami en commun</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d serveurs en commun</item>
-        <item quantity="zero">0 serveur en commun</item>
-        <item quantity="one">1 serveur en commun</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d jours</item>
         <item quantity="one">1 jour</item>
@@ -561,10 +543,6 @@
         <item quantity="other">%d mois</item>
         <item quantity="one">1 mois</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d boosts</item>
-        <item quantity="one">%d boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d boosts supplémentaires</item>
         <item quantity="one">%d boost supplémentaire</item>
@@ -577,15 +555,11 @@
         <item quantity="other">%d boosts</item>
         <item quantity="one">%d boost</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d jours</item>
-        <item quantity="one">%d jour</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d boosts de serveur</item>
         <item quantity="one">%d boost de serveur</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d mois</item>
         <item quantity="one">%d mois</item>
     </plurals>
@@ -609,10 +583,6 @@
         <item quantity="other">%d minutes</item>
         <item quantity="one">%d minute</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** boosts</item>
-        <item quantity="one">**%d** boost</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d jours</item>
         <item quantity="one">%d jour</item>
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index 0c41978278..d708d59306 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -626,7 +626,6 @@ mais si ça devait s'avérer nécessaire, tu ne dois pas hésiter une seule seco
     <string name="billing">Facturation</string>
     <string name="billing_accept_terms_tooltip">"Accepte les conditions d'utilisation pour continuer"</string>
     <string name="billing_account_credit">Crédit du compte</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s** : %2$s mois gratuits</string>
     <string name="billing_add_payment_method">Ajouter un mode de paiement</string>
     <string name="billing_address">Adresse de facturation</string>
     <string name="billing_address_address">Adresse</string>
@@ -682,8 +681,6 @@ mais si ça devait s'avérer nécessaire, tu ne dois pas hésiter une seule seco
     <string name="billing_payment_choose_plan">Choisir un abonnement</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](%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 le résilier à tout moment."</string>
-    <string name="billing_payment_premium_legalese_yearly">"En achetant un abonnement %1$s, tu acceptes nos [Conditions d'Utilisation](%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 le résilier à tout moment."</string>
     <string name="billing_payment_source_invalid">Cette source de paiement est invalide.</string>
     <string name="billing_payment_sources">Modes de paiement</string>
     <string name="billing_payment_table_header_amount">Montant</string>
@@ -701,13 +698,11 @@ mais si ça devait s'avérer nécessaire, tu ne dois pas hésiter une seule seco
     <string name="billing_price_per_month_current_plan">(ABONNEMENT ACTUEL) %1$s/mois</string>
     <string name="billing_price_per_month_current_plan_ios">(Abonnement actuel) %1$s/mois</string>
     <string name="billing_price_per_month_mobile">%1$s/MO</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_current_plan">(ABONNEMENT ACTUEL) %1$s/an</string>
     <string name="billing_price_per_year_current_plan_ios">(Abonnement actuel) %1$s/an</string>
     <string name="billing_price_per_year_mobile">%1$s/AN</string>
     <string name="billing_price_per_year_months_free">%1$s/an (2 mois gratuits)</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>
@@ -729,6 +724,10 @@ mais si ça devait s'avérer nécessaire, tu ne dois pas hésiter une seule seco
     <string name="billing_step_review">Révision</string>
     <string name="billing_step_select_plan">"Sélectionner l'abonnement"</string>
     <string name="billing_subscribe">"S'abonner"</string>
+    <string name="billing_switch_plan_change">"Changer d'abonnement"</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Compris !</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Stylé !</string>
+    <string name="billing_switch_plan_upgrade">Passer au niveau supérieur</string>
     <string name="billing_tag_failed">Échec</string>
     <string name="billing_tag_pending">En attente</string>
     <string name="billing_tag_refunded">Remboursé</string>
@@ -1789,11 +1788,8 @@ pour lui permettre de le détecter."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">"Grâce à la générosité d'un autre humain, %1$s est maintenant en ta possession pendant %2$s."</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">"Grâce à la générosité d'un autre humain, %1$s est maintenant en ta possession pendant %2$s."</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** a été ajouté dans ta bibliothèque.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">"Grâce à la générosité d'un autre humain, tu peux maintenant profiter d'avantages de discussion améliorés et d'un boost de serveur pendant %1$s."</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">"Grâce à la générosité d'un autre humain, tu peux maintenant profiter d'avantages de discussion améliorés pendant %1$s."</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">"Grâce à la générosité d'un autre humain, tu peux maintenant profiter d'avantages de discussion améliorés pendant %1$s."</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">"Grâce à la générosité d'un autre humain, tu peux maintenant profiter d'avantages de discussion améliorés et d'un boost de serveur pendant %1$s."</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">"Grâce à la générosité d'un autre humain, tu peux maintenant profiter d'avantages de discussion améliorés et d'un boost de serveur pendant %1$s."</string>
     <string name="gift_confirmation_body_unknown_error">"Il s'est passé quelque chose d'un peu étrange, et nous n'avons pas réussi à obtenir ce que tu souhaitais… on réessaie ?"</string>
     <string name="gift_confirmation_button_confirm">Ajouter à la bibliothèque ! Wouhou !</string>
     <string name="gift_confirmation_button_confirm_mobile">Donne-moi ça</string>
@@ -2144,9 +2140,7 @@ Perdus : %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">"+ %1$s emplacements d'émoji du serveur (pour un total de %2$s)"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Limite de téléchargement pour tous les membres : %1$s</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Les avantages de serveur boosté incluent —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">"Personne n'a encore conféré son abonnement Nitro à ce serveur. Voyons si des membres accepteraient gentiment de lui accorder leur bénédiction pour que tout ton serveur puisse profiter les chouettes avantages Nitro !"</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Les serveurs boostés obtiennent tous les avantages précédents, et —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Pas de boost Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Avantages de niveau 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Avantages de niveau 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Avantages de niveau 3</string>
@@ -2163,16 +2157,12 @@ Perdus : %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Avantage niveau %1$s déverrouillé</string>
     <string name="guild_settings_overview_notice">Attention ! Il reste des modifications non enregistrées !</string>
     <string name="guild_settings_overview_tier_info">Ceci est une fonctionnalité Nitro niveau %1$s. [Vérifie ton niveau](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Les membres ayant un abonnement Nitro actif peuvent aider à débloquer les niveaux du serveur en lui conférant leur statut Nitro.
-Pour chaque niveau atteint, les membres du serveur aideront à débloquer des avantages pour tout le monde.
-
-Néanmoins, ils peuvent retirer leur boost à tout moment.
-**Le serveur conservera ses avantages pendant trois jours s'il perd un niveau. **[En savoir plus sur le boost de serveur Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Plus que %1$s avant le prochain niveau !</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** boosté ce serveur</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">État des boosts de serveur Nitro</string>
+    <string name="guild_settings_premium_guild_title">État des boosts de serveur</string>
     <string name="guild_settings_premium_guild_unlocked">Déverrouillé</string>
+    <string name="guild_settings_premium_upsell_learn_more">En savoir plus sur Discord Nitro</string>
     <string name="guild_settings_server_banner">Bannière du serveur</string>
     <string name="guild_settings_server_invite_background">"Arrière-plan d'invitation de serveur"</string>
     <string name="guild_settings_splash_info">"Cette image s'affichera lorsque les utilisateurs recevront une invitation au serveur."</string>
@@ -2182,6 +2172,7 @@ Néanmoins, ils peuvent retirer leur boost à tout moment.
 
 Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la balise &amp;username= dans la chaîne de requête."</string>
     <string name="guild_settings_widget_enable_widget">Activer le widget du serveur</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">"Détails de l'achat"</string>
     <string name="guild_verification_text_account_age">"Ton compte doit être âgé d'au moins %1$s minutes afin de pouvoir envoyer des messages sur ce serveur."</string>
     <string name="guild_verification_text_member_age">Tu dois être membre depuis au moins %1$s minutes afin de pouvoir envoyer des messages sur ce serveur.</string>
     <string name="guild_verification_text_not_claimed">Tu dois enregistrer et vérifier ton compte avant de pouvoir envoyer des messages sur ce serveur.</string>
@@ -2529,10 +2520,6 @@ Tu veux en savoir plus sur Discord ?"</string>
     <string name="ios_media_keyboard_take_a_photo">Prendre une photo</string>
     <string name="ios_notification_see_full">"Touche pour voir l'intégralité du message."</string>
     <string name="ios_profile_in_voice_call">En appel vocal</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Amis en commun</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Serveurs en commun</string>
     <string name="ios_profile_open_voice_channel">Ouvrir un salon vocal</string>
     <string name="ios_view_all">Afficher tout</string>
     <string name="ip_address_secured">Adresse IP sécurisée</string>
@@ -2842,7 +2829,6 @@ en commençant leur message par @everyone ou @here."</string>
     <string name="network_error_unknown">"Une erreur réseau de nature inconnue s'est produite."</string>
     <string name="network_error_unknown_host">"Une erreur réseau s'est produite. Vérifie tes paramètres DNS puis réessaie, s'il te plaît."</string>
     <string name="network_offline">Connexion limitée ou indisponible.</string>
-    <string name="nevermind">Tout compte fait, non.</string>
     <string name="new_dm">Nouveau message privé</string>
     <string name="new_group_dm">Nouveau groupe privé</string>
     <string name="new_guilds_dm_allowed">Autoriser les messages privés en provenance des membres du serveur.</string>
@@ -2965,7 +2951,6 @@ de message épinglé… pour l'instant."</string>
     <string name="notice_no_input_detected_help_link_text">"À l'aide !"</string>
     <string name="notice_no_input_detected_settings">Eh bien, on dirait que Discord ne détecte aucun son provenant de ton micro. Réglons ça !</string>
     <string name="notice_no_input_detected_settings_link_text">Consulter les paramètres</string>
-    <string name="notice_premium_grandfathered_ended">Ton accès à Nitro a expiré. Passe de Nitro Classic à Nitro pour accéder à des avantages de discussion géniaux et un boost de serveur.</string>
     <string name="notice_premium_grandfathered_ending">Il te reste %1$s de Nitro ! Ton abonnement passe à Nitro Classic le **%2$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>
@@ -3195,7 +3180,7 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
     <string name="payment_modal_button_change_card">Mettre à jour la carte bancaire</string>
     <string name="payment_modal_button_change_paypal">Mettre à jour le compte PayPal</string>
     <string name="payment_modal_button_premium">Obtenir %1$s</string>
-    <string name="payment_modal_button_premium_gift">Acheter %1$s</string>
+    <string name="payment_modal_button_premium_gift">Acheter un cadeau</string>
     <string name="payment_modal_one_month">1 mois</string>
     <string name="payment_modal_one_year">1 an</string>
     <string name="payment_modal_per_month">Par mois</string>
@@ -3305,9 +3290,6 @@ Il se peut aussi que l'overlay ne soit pas compatible pour tout le monde. Si tu
 Tu peux te réabonner à tout moment."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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é."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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 à Nitro, ton Discord Tag sera régénéré aléatoirement si tu l'as changé, et ton boost de serveur sera supprimé.
-
- Tu peux te réabonner à tout moment."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">"La résiliation prendra effet à la fin de ta période de facturation actuelle. Le **%1$s**, tu perdras l'accès à Nitro, ton Discord Tag sera régénéré aléatoirement si tu l'as changé, et ton boost de serveur sera supprimé."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Tu peux te réabonner à tout moment.</string>
     <string name="premium_cancel_confirm_mobile">"Résilier l'abonnement Nitro"</string>
@@ -3330,7 +3312,6 @@ Tu peux te réabonner à tout moment."</string>
     <string name="premium_chat_perks_description_streaming">"Streame à la source avec Nitro, ou profite d'un mirifique 1080 p 60 fps avec Nitro Classic."</string>
     <string name="premium_chat_perks_description_upload_limit">"Une taille d'envoi de fichiers améliorée de %1$s à %2$s avec Nitro ou %3$s avec Nitro Classic."</string>
     <string name="premium_chat_perks_premium_guild_subscription">Booste ton serveur favori !</string>
-    <string name="premium_chat_perks_simple_title">Reste simple : obtiens les avantages de discussion sans un boost de serveur.</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>
@@ -3369,41 +3350,20 @@ Tu peux te réabonner à tout moment."</string>
     <string name="premium_grandfathered_yearly">"Pour te remercier de soutenir Discord, on t'offre l'accès à Nitro pendant 2 ans. Ton accès prend fin le **%1$s**."</string>
     <string name="premium_guild_cooldown_available_countdown">Temps de récupération des boosts : **%1$s j %2$s h %3$s m**</string>
     <string name="premium_guild_features_blurb">"Booster un serveur avec ton abonnement Nitro te permettra de l'aider dans sa progression vers le niveau supérieur. À chaque niveau atteint, des avantages de discussion seront déverrouillés **pour tous les utilisateurs du serveur !** Voici quelques-uns des merveilleux avantages qui t'attendent :"</string>
-    <string name="premium_guild_features_customize_guild_description">Déverrouille des moyens de personnaliser ton serveur tels que les arrière-plans des invitations, la bannière, une URL personnalisée, etc.</string>
     <string name="premium_guild_features_customize_guild_mobile">Personnalisation du serveur</string>
-    <string name="premium_guild_features_customize_guild_title">Personnalisation du serveur</string>
     <string name="premium_guild_features_learn_more_button">En savoir plus sur Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">"Profite d'une expérience améliorée sur Discord en commençant par un abonnement à un coût mensuel intéressant."</string>
     <string name="premium_guild_features_more">"Et ce n'est pas tout ! Tu peux vérifier le niveau actuel, la progression du niveau et les avantages disponibles dans le serveur."</string>
-    <string name="premium_guild_features_new_role_description">Obtiens un rôle spécial réservé aux boosters de serveur Nitro sur ton serveur.</string>
-    <string name="premium_guild_features_new_role_mobile">Rôles exclusifs réservés aux boosters de serveur Nitro</string>
-    <string name="premium_guild_features_new_role_title">Nouveau rôle exclusif</string>
-    <string name="premium_guild_features_show_support_description">"Les boosters reçoivent un nouveau badge de profil qui brille de mille feux et évolue tant qu'ils continuent à booster."</string>
     <string name="premium_guild_features_show_support_mobile">Un nouveau badge de profil qui change au fil du temps</string>
-    <string name="premium_guild_features_show_support_title">Montre à tout le monde le soutien que tu apportes</string>
     <string name="premium_guild_features_title">Nitro te permet de booster un serveur !</string>
     <string name="premium_guild_features_upload_sizes_mobile">"Des tailles d'upload augmentées pour toute la communauté"</string>
-    <string name="premium_guild_features_upload_sizes_title">"Des tailles d'upload plus importantes pour tous"</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Souscris à un abonnement Nitro pour envoyer un boost Nitro à un serveur ! [En savoir plus sur le boost de serveur Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Fais passer ton abonnement au niveau supérieur pour envoyer un boost Nitro à un serveur ! [En savoir plus sur le boost de serveur Nitro.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Pas de boost Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Pas de niveau</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Boosts de serveur Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">Les avantages de serveur boosté incluent —</string>
-    <string name="premium_guild_perks_modal_blurb">"Pour chaque niveau atteint, les membres du serveur aideront à débloquer des avantages pour tout le monde. Ces avantages ne prennent effet que dans le serveur.
-
- **Les boosters obtiennent : une icône de la liste des membres, un nouveau badge évolutif et un rôle réservé aux boosters.**
-
- [En savoir plus sur le boost de serveur Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Pour chaque niveau atteint, les membres du serveur aideront à débloquer des avantages pour tout le monde. Ces avantages ne prennent effet que dans le serveur.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Les boosters obtiennent : une icône de la liste des membres, un nouveau badge évolutif, et un rôle réservé aux boosters.** [En savoir plus sur le boost de serveur Nitro.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Passe à Nitro pour offrir des boosts !</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Booster ce serveur</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Passer au niveau supérieur avec Nitro pour offrir des boosts !</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">"Pour le moment, nous ne permettons pas encore de passer à Nitro pour les abonnements Apple. Tu peux résilier ton abonnement grâce à l'outil de [gestion des abonnements Apple](%1$s). Cependant, l'abonnement restera actif jusqu'à sa date d'expiration."</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">"Nitro Classic n'inclut pas le boost de serveur"</string>
     <string name="premium_guild_perks_modal_header">État des boosts de serveur</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** boosts</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Gérer ton boost</string>
     <string name="premium_guild_perks_modal_no_tiers">Aucun niveau atteint pour le moment</string>
@@ -3416,44 +3376,32 @@ Tu peux te réabonner à tout moment."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s boosté ce serveur</string>
     <string name="premium_guild_settings_members_subscribed_needed">Tu as besoin de **%1$s** pour déverrouiller le %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Veux-tu vraiment envoyer un boost Nitro à :</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Sélectionner ce serveur</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Sélectionne ce serveur. Cela demandera un peu de temps avant que ton boost ne prenne effet.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">"**Booster ce serveur t'empêchera d'en booster un autre pendant %1$s. Retirer ton boost n'affectera pas ce temps de récupération.**"</string>
     <string name="premium_guild_subscribe_confirm_header">Choisis judicieusement !</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Rechercher des serveurs</string>
     <string name="premium_guild_subscribe_select_guild_header">Sélectionner un serveur</string>
     <string name="premium_guild_subscribe_success_thanks">"Merci d'avoir offert un boost !"</string>
     <string name="premium_guild_subscription_available_count">Tu disposes de **%1$s** !</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">"Une erreur s'est produite lorsque tu as tenté d'offrir ton boost. Essaie à nouveau."</string>
     <string name="premium_guild_subscription_error_rate_limit_days">"On dirait bien que tu as un temps de récupération. Merci d'attendre encore **%1$s et %2$s** avant d'essayer à nouveau"</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">"On dirait bien que tu as un temps de récupération. Merci d'attendre encore **%1$s et %2$s** avant d'essayer à nouveau"</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">"On dirait bien que tu as un temps de récupération. Merci d'attendre encore **%1$s** avant d'essayer à nouveau"</string>
     <string name="premium_guild_subscription_no_next_tier">"Ce serveur a été boosté au max ! Continue d'utiliser tes pouvoirs de boosts !"</string>
-    <string name="premium_guild_subscription_notice">Les boosts de serveur Nitro sont là ! Rassemble ta communauté pour booster ton serveur.</string>
     <string name="premium_guild_subscription_notice_button">Voir les niveaux et les avantages</string>
-    <string name="premium_guild_subscription_notice_small_guild">Les boosts de serveur Nitro sont là ! Rassemble tes amis pour booster ton serveur.</string>
     <string name="premium_guild_subscription_remove_button">Retirer un boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">"Une erreur s'est produite lorsque tu as tenté de supprimer ton boost. Essaie à nouveau."</string>
     <string name="premium_guild_subscription_select_server_button">Sélectionner un serveur</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Utilise les pouvoirs que te confère Nitro pour booster un serveur dont tu fais partie ! Cela lui permettra de progresser et de passer aux niveaux supérieurs. Chaque niveau donne des avantages collectifs pour tout le serveur.
- Booster un serveur déclenche un temps de récupération de 7 jours. Ainsi, tu ne pourras plus booster un autre serveur tant que ce temps de récupération ne sera pas achevé, même si tu retires ton boost. [En savoir plus sur le boost de serveur Nitro.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Utilise les pouvoirs que te confère Nitro pour booster un serveur dont tu fais partie ! Cela lui permettra de progresser et de passer aux niveaux supérieurs. Chaque niveau donne des avantages collectifs pour tout le serveur.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Booster un serveur déclenche un temps de récupération de 7 jours. Ainsi, tu ne pourras plus booster un autre serveur tant que ce temps de récupération ne sera pas achevé, même si tu retires ton boost. [En savoir plus sur le boost de serveur Nitro.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Boosts de serveur Nitro</string>
-    <string name="premium_guild_subscription_tooltip">A accès aux boosts Nitro depuis %1$s</string>
+    <string name="premium_guild_tier_0">Pas de niveau</string>
     <string name="premium_guild_tier_1">Niveau 1</string>
     <string name="premium_guild_tier_2">Niveau 2</string>
     <string name="premium_guild_tier_3">Niveau 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Veux-tu vraiment supprimer ton boost Nitro de :</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Oui, je souhaite retirer mon boost</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Ce serveur perdra une part de sa progression si tu retires ton boost.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Ce serveur perdra une part de sa progression si tu retires ton boost. **Ton boost a toujours un temps de récupération. Il sera de nouveau disponible dans %1$s et %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Ce serveur perdra une part de sa progression si tu retires ton boost. **Ton boost a toujours un temps de récupération. Il sera de nouveau disponible dans %1$s et %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Ce serveur perdra une part de sa progression si tu retires ton boost. **Ton boost a toujours un temps de récupération. Il sera de nouveau disponible dans %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Retirer le boost Nitro ?</string>
     <string name="premium_included">Inclus avec Nitro :</string>
     <string name="premium_info_monthly">%1$s (par mois) débités le %2$s.</string>
     <string name="premium_month_subscription">**%1$s %2$s %3$s**/mois</string>
@@ -3466,7 +3414,6 @@ Tu peux te réabonner à tout moment."</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_button_iap">Obtiens %1$s !</string>
     <string name="premium_payment_confirmation_button_regular">Ok, pourquoi pas</string>
-    <string name="premium_payment_gift_blurb">"Offre un abonnement [Nitro](onClick) à tes amis. Ils pourront profiter de la superpuissance des avantages de discussion et d'un boost de serveur."</string>
     <string name="premium_payment_gift_blurb_mobile">"Offre un abonnement Nitro à quelqu'un pour lui permettre de profiter de la superpuissance des avantages de discussion et des boosts de serveur. [En savoir plus sur l'abonnement Nitro.](onClick)"</string>
     <string name="premium_payment_gift_subtext">"Ce paiement s'effectuera en une seule fois pour la durée choisie. Tu ne seras pas facturé(e) au mois."</string>
     <string name="premium_payment_is_gift">"Tu es en train d'acheter un cadeau."</string>
@@ -3481,7 +3428,6 @@ Tu peux te réabonner à tout moment."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mensuel</string>
     <string name="premium_plan_month_tier_2">Nitro mensuel</string>
     <string name="premium_promo_autocomplete">Utilise les émojis personnalisés partout</string>
-    <string name="premium_promo_description">"Passe à Discord Nitro afin d'utiliser des émojis animés et personnalisés sur n'importe quel serveur."</string>
     <string name="premium_promo_title">Tu souhaites maîtriser tous les pouvoirs émojis ?</string>
     <string name="premium_required">Nitro requis</string>
     <string name="premium_required_get_nitro">Obtiens Nitro !</string>
@@ -3500,26 +3446,10 @@ Tu peux te réabonner à tout moment."</string>
     <string name="premium_tier_2_title">"Profite d'une expérience améliorée sur Discord pour un coût mensuel intéressant."</string>
     <string name="premium_trial_button">Commence ton essai gratuit</string>
     <string name="premium_upgrade_cancel">Non</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Passe à l'abonnement annuel et profite de 2 mois gratuits. La bonne affaire !!
-
-Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduirons sa valeur du prix annuel. Tu seras facturé(e) **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Passe à l'abonnement annuel et profite de 2 mois gratuits. La bonne affaire !!
-
-Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduirons sa valeur du prix annuel. Tu seras immédiatement facturé(e) **%1$s**, puis **%2$s/an après la période de facturation actuelle.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Fais passer ton abonnement (mensuel) %1$s au niveau supérieur et obtiens le pouvoir de booster des serveurs. Ton nouvel abonnement commencera immédiatement.
-
-Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduirons sa valeur du prix mensuel. Tu seras facturé(e) **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Fais passer ton abonnement (mensuel) %1$s au niveau supérieur et obtiens le pouvoir de booster des serveurs. Ton nouvel abonnement commencera immédiatement.
-
-Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduirons sa valeur du prix mensuel. Tu seras immédiatement facturé(e) **%2$s**, puis **%3$s/mois après la période de facturation actuelle.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Fais passer ton abonnement (mensuel) %1$s au niveau supérieur et obtiens le pouvoir de booster des serveurs. Ton nouvel abonnement commencera immédiatement.
 
 Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduirons sa valeur du prix annuel. Tu seras facturé(e) **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Fais passer ton abonnement (mensuel) %1$s au niveau supérieur et obtiens le pouvoir de booster des serveurs. Ton nouvel abonnement commencera immédiatement.
-
-Nous ajusterons aussi le coût en fonction de ton abonnement en cours et déduirons sa valeur du prix annuel. Tu seras immédiatement facturé(e) **%2$s**, puis **%3$s/an après la période de facturation actuelle.**"</string>
     <string name="premium_upgrade_confirm_button">Passer au niveau supérieur</string>
-    <string name="premium_upgrade_confirm_button_with_price">Passe immédiatement au niveau supérieur - %1$s</string>
     <string name="premium_upgrade_confirm_title">Passer au niveau supérieur avec %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">"Tu ne peux pas t'abonner puisque tu possèdes déjà un abonnement Nitro."</string>
     <string name="premium_upgrade_disabled_current_tooltip">Ton abonnement actuel.</string>
@@ -4071,8 +4001,6 @@ Tu es sûr(e) de vouloir faire ça ?"</string>
     <string name="stop_streaming">Arrêter de streamer</string>
     <string name="stop_watching">Arrêter de regarder</string>
     <string name="store_channel">Salon de boutique</string>
-    <string name="store_payment_legalese_monthly">"Hey ! En achetant %1$s, tu acceptes nos [Conditions d'Utilisation](%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](%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>
diff --git a/com.discord/res/values-hr/plurals.xml b/com.discord/res/values-hr/plurals.xml
index 19384c3838..e23485fdfb 100644
--- a/com.discord/res/values-hr/plurals.xml
+++ b/com.discord/res/values-hr/plurals.xml
@@ -337,16 +337,6 @@
         <item quantity="one">%d godine</item>
         <item quantity="few">%d godine</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d mjeseci</item>
-        <item quantity="one">%d mjesec</item>
-        <item quantity="few">%d mjeseca</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d godina</item>
-        <item quantity="one">%d godine</item>
-        <item quantity="few">%d godine</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">mjeseci</item>
         <item quantity="one">mjesec</item>
@@ -523,18 +513,6 @@
         <item quantity="other">%d upotreba</item>
         <item quantity="one">%d upotrebe</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d zajedničkih prijatelja</item>
-        <item quantity="zero">0 zajedničkih prijatelja</item>
-        <item quantity="one">1 zajednički prijatelj</item>
-        <item quantity="few">%d zajednička prijatelja</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d zajedničkih servera</item>
-        <item quantity="zero">0 zajedničkih servera</item>
-        <item quantity="one">1 zajednički server</item>
-        <item quantity="few">%d zajednička servera</item>
-    </plurals>
     <plurals name="live_viewers_viewers">
         <item quantity="other">gledatelja</item>
         <item quantity="one">gledatelj</item>
@@ -608,11 +586,6 @@
         <item quantity="other">%d mjeseci</item>
         <item quantity="one">mjesec dana</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d Boostova</item>
-        <item quantity="one">/%d Boost</item>
-        <item quantity="few">%d Boosta</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d dodatna boosta</item>
         <item quantity="one">%d dodatni boost</item>
@@ -626,16 +599,12 @@
         <item quantity="one">%d Boost</item>
         <item quantity="few">%d Boostova</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dana</item>
-        <item quantity="one">%d dan</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d boostova servera</item>
         <item quantity="one">%d boost servera</item>
         <item quantity="few">%d boosta servera</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d mjeseci</item>
         <item quantity="one">%d mjesec</item>
         <item quantity="few">%d mjeseca</item>
@@ -664,11 +633,6 @@
         <item quantity="one">%d minutu</item>
         <item quantity="few">%d minute</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** boostova</item>
-        <item quantity="one">**%d** boost</item>
-        <item quantity="few">**%d** boosta</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d dana</item>
         <item quantity="one">%d dan</item>
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index 71ddb37fa2..e352d16336 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -600,7 +600,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing">Obračun</string>
     <string name="billing_accept_terms_tooltip">Da bi nastavio, prihvati uvjete pružanja usluge</string>
     <string name="billing_account_credit">Stanje kredita</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s mjeseci besplatno</string>
     <string name="billing_add_payment_method">Dodaj Način Plaćanja</string>
     <string name="billing_address">Adresa za Ispostavu Računa</string>
     <string name="billing_address_address">Adresa</string>
@@ -657,8 +656,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing_payment_choose_plan">Odaberi model pretplate</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](%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 svako doba.</string>
-    <string name="billing_payment_premium_legalese_yearly">Kupnjom pretplate %1$s, izražavaš pristanak na naše [Uvjete Pružanja Usluge](%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 svako doba.</string>
     <string name="billing_payment_source_invalid">Ovaj izvor sredstava je nevažeći.</string>
     <string name="billing_payment_sources">Načini Plaćanja</string>
     <string name="billing_payment_table_header_amount">Iznos</string>
@@ -676,13 +673,11 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing_price_per_month_current_plan">(SADAŠNJI MODEL PRETPLATE) %1$s/mjesec</string>
     <string name="billing_price_per_month_current_plan_ios">(Sadašnji model pretplate) %1$s/mjesec</string>
     <string name="billing_price_per_month_mobile">%1$s / MJ</string>
-    <string name="billing_price_per_month_upgrade">Nadogradi za %1$s mjesečno</string>
     <string name="billing_price_per_year">%1$s godišnje</string>
     <string name="billing_price_per_year_current_plan">(SADAŠNJI MODEL PRETPLATE) %1$s/godina</string>
     <string name="billing_price_per_year_current_plan_ios">(Sadašnji model pretplate) %1$s/godina</string>
     <string name="billing_price_per_year_mobile">%1$s / GOD</string>
     <string name="billing_price_per_year_months_free">%1$s/godišnje (dva mjeseca besplatno)</string>
-    <string name="billing_price_per_year_upgrade">Nadogradi za svega %1$s godišnje</string>
     <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>
@@ -704,6 +699,10 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
     <string name="billing_step_review">Pregled</string>
     <string name="billing_step_select_plan">Odaberi model pretplate</string>
     <string name="billing_subscribe">Pretplati se</string>
+    <string name="billing_switch_plan_change">Promijeni plan</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Kužim!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Slatko!</string>
+    <string name="billing_switch_plan_upgrade">Nadogradi</string>
     <string name="billing_tag_failed">Neuspješno</string>
     <string name="billing_tag_pending">U tijeku</string>
     <string name="billing_tag_refunded">Novac vraćen</string>
@@ -1723,11 +1722,8 @@ Hvala ti što čuvaš stvari."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Zahvaljujući nekom širokogrudom biću, od sada imaš %1$s u trajanju od %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Zahvaljujući nekom širokogrudom biću, od sada imaš %1$s u trajanju od %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">Stavka **%1$s** je dodana u tvoju biblioteku.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Zahvaljujući nekom širokogrudom biću, od sada imaš pojačane chat pogodnosti i Server Boost u trajanju od %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Zahvaljujući nekom širokogrudom biću, od sada imaš pojačane chat pogodnosti u trajanju od %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Zahvaljujući nekom širokogrudom biću, od sada imaš pojačane chat pogodnosti u trajanju od %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Zahvaljujući nekom širokogrudom biću, od sada imaš pojačane chat pogodnosti i Server Boost u trajanju od %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Zahvaljujući nekom širokogrudom biću, od sada imaš pojačane chat pogodnosti i Server Boost u trajanju od %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Dogodilo se nešto čudno, vrlo čudno, tako da nismo uspjeli doći do vreće s darovima… hoćemo li pokušati ponovo?</string>
     <string name="gift_confirmation_button_confirm">Nega šta! Dodaj to u biblioteku</string>
     <string name="gift_confirmation_button_confirm_mobile">Dajmi</string>
@@ -2076,9 +2072,7 @@ izgubljeno: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s server emoji slotova (pa će ukupno biti %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Ograničenje prijenosa za sve članove je %1$s</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Posebne pogodnosti za boostani server sadrže –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Za sada nitko nije uložio svoj Nitro za ovaj server. Raspitaj se uokolo i vidi postoje li kakvi članovi koji će biti tako dobri pa cijeli server obradovati Nitro posebnim pogodnostima.</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Boostani server dobija sve već rečeno, pa još –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Nema Nitro boosta</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Posebne pogodnosti razine 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Posebne pogodnosti razine 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Posebne pogodnosti razine 3</string>
@@ -2095,16 +2089,12 @@ izgubljeno: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Otključana je posebna pogodnost razine %1$s</string>
     <string name="guild_settings_overview_notice">Oprez! Imaš nespremljenih promjena!</string>
     <string name="guild_settings_overview_tier_info">Ovo je Nitro značajka razine %1$s. [Provjeri svoj status](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Oni članovi servera koji imaju aktivnu pretplatu na Nitro mogu pomoći otključavanju razina tako što će uložiti svoj Nitro status.
-Na svakoj novoj otključanoj razini, članovi servera će pomoći otključati posebne pogodnosti za sve.
-
-Članovi mogu povući svoj boost u svako doba.
-**Ako razina bude izgubljena, server će zadržati posebne pogodnosti tri dana. **[Saznaj više o Nitro boostu za servere.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Još samo %1$s do sljedeće razine!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** su ovaj server</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Status Nitro boosta za server</string>
+    <string name="guild_settings_premium_guild_title">Status boostanja servera</string>
     <string name="guild_settings_premium_guild_unlocked">Otključano</string>
+    <string name="guild_settings_premium_upsell_learn_more">Saznaj više o pretplati na Discord Nitro</string>
     <string name="guild_settings_server_banner">Banner servera</string>
     <string name="guild_settings_server_invite_background">Pozadina pozivnice za server</string>
     <string name="guild_settings_splash_info">Ova će se slika prikazati kada korisnici dobiju pozivnicu za server.</string>
@@ -2114,6 +2104,7 @@ Na svakoj novoj otključanoj razini, članovi servera će pomoći otključati po
 
 Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati &amp;username= nizu upita."</string>
     <string name="guild_settings_widget_enable_widget">Omogući server widget</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Podaci o kupnji</string>
     <string name="guild_verification_text_account_age">Tvoj račun mora postojati barem %1$s minuta kako bi mogao/la slati poruke na ovom serveru.</string>
     <string name="guild_verification_text_member_age">Moraš biti član barem %1$s minuta kako bi mogao/la slati poruke na ovom serveru.</string>
     <string name="guild_verification_text_not_claimed">Moraš preuzeti i potvrditi svoj račun ukoliko želiš slati poruke u ovom serveru.</string>
@@ -2461,10 +2452,6 @@ Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati
     <string name="ios_media_keyboard_take_a_photo">Snimi fotografiju</string>
     <string name="ios_notification_see_full">Dodirni da bi vidio cijelu poruku.</string>
     <string name="ios_profile_in_voice_call">U glasovnom pozivu</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Zajednički prijatelji</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Zajednički serveri</string>
     <string name="ios_profile_open_voice_channel">Otvori glasovni kanal</string>
     <string name="ios_view_all">Prikaži sve</string>
     <string name="ip_address_secured">IP adresa osigurana</string>
@@ -2777,7 +2764,6 @@ onih kanala gdje oba člana imaju pristup."</string>
     <string name="network_error_unknown">Došlo je do nepoznate pogreške na mreži.</string>
     <string name="network_error_unknown_host">Došlo je do pogreške na mreži. Molimo provjeri svoje DNS postavke i pokušaj ponovno.</string>
     <string name="network_offline">Mrežna povezanost ograničena ili nedostupna.</string>
-    <string name="nevermind">Nema veze</string>
     <string name="new_dm">Nova izravna poruka</string>
     <string name="new_group_dm">Nova grupna izravna poruka</string>
     <string name="new_guilds_dm_allowed">Omogući izravne poruke od strane korisnika servera.</string>
@@ -2901,7 +2887,6 @@ prikvačenu poruku… zasad."</string>
     <string name="notice_no_input_detected_help_link_text">Pomoć!</string>
     <string name="notice_no_input_detected_settings">Hm, izgleda da Discord ne čuje glas iz tvog mikrofona. Popravimo to!</string>
     <string name="notice_no_input_detected_settings_link_text">Postavke posjeta</string>
-    <string name="notice_premium_grandfathered_ended">Istekao ti je pristup za Nitro. Nadogradi s Nitro Classic na Nitro i imaš super prejake posebne pogodnosti za chat i Server Boost.</string>
     <string name="notice_premium_grandfathered_ending">Nitro imaš još samo %1$s! Pristup će ti pasti na razinu Nitro Classic dana **%2$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>
@@ -3134,7 +3119,7 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
     <string name="payment_modal_button_change_card">Ažuriraj kreditnu karticu</string>
     <string name="payment_modal_button_change_paypal">Ažuriraj PayPal račun</string>
     <string name="payment_modal_button_premium">Uzmi si %1$s</string>
-    <string name="payment_modal_button_premium_gift">Kupi %1$s</string>
+    <string name="payment_modal_button_premium_gift">Kupi dar</string>
     <string name="payment_modal_one_month">1 mjesec</string>
     <string name="payment_modal_one_year">1 godina</string>
     <string name="payment_modal_per_month">Mjesečno</string>
@@ -3245,9 +3230,6 @@ Također, overlay možda neće raditi svakome. Ako imaš problema ili pitanja, p
 Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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 u Nitro, tvoj Discord Tag će biti nasumično odabran ako si ga mijenjao, a tvoj Server Boost će biti uklonjen.
-
-Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Otkazivanje će stupiti na snagu na kraju tekućeg razdoblja naplate. Dana **%1$s** izgubit ćeš pristup u Nitro, tvoj Discord Tag će biti nasumično odabran ako si ga mijenjao, a tvoj Server Boost će biti uklonjen.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Svoju pretplatu možeš obnoviti kada god ti srce želi.</string>
     <string name="premium_cancel_confirm_mobile">Otkaži Nitro</string>
@@ -3270,7 +3252,6 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_chat_perks_description_streaming">Streaming na izvoru uz Nitro ili čak do sjajnih 1080p na 60fps uz Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Povećan limit veličine datoteke za prijenos s %1$s na %2$s ako imaš Nitro ili %3$s ako imaš Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Boostaj svoj omiljeni server!</string>
-    <string name="premium_chat_perks_simple_title">Neka bude jednostavno – možeš dobiti osnovne chat pogodnosti bez Server Boosta.</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>
@@ -3308,41 +3289,20 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_grandfathered_yearly">U ime zahvale što podržavaš Discord, imaš pristup u Nitro dvije godine. Pristup imaš do **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boost rashlađivanje: **%1$sd %2$sh %3$sm**</string>
     <string name="premium_guild_features_blurb">Boostanje servera preko tvoje Nitro pretplate će mu pomoći da se podigne na neku višu razinu. Kad god dosegne neku novu razinu, to će osloboditi chat pogodnosti **za sve na tom serveru!** Baci pogled na neke od tih slatkih chat pogodnosti:</string>
-    <string name="premium_guild_features_customize_guild_description">Oslobodi prilagođavanja kao što su pozadinska slika pozivnice, banner servera, personalizirani URL itd.</string>
     <string name="premium_guild_features_customize_guild_mobile">Prilagođavanja servera</string>
-    <string name="premium_guild_features_customize_guild_title">Prilagođavanja servera</string>
     <string name="premium_guild_features_learn_more_button">Saznaj više o pretplati na Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Nabavi si pojačano Discord iskustvo već i za sasvim skroman mjesečni iznos.</string>
     <string name="premium_guild_features_more">A ima toga još! Možeš doznati koja ti je sadašnja razina, kako se razine mijenjaju i koje su posebne pogodnosti raspoložive unutar servera.</string>
-    <string name="premium_guild_features_new_role_description">Možeš dobiti specijalnu ulogu na serveru koja je dostupna samo Nitro Server Boosterima na tvojem serveru.</string>
-    <string name="premium_guild_features_new_role_mobile">Ekskluzivne Nitro Server Booster uloge</string>
-    <string name="premium_guild_features_new_role_title">Ekskluzivne nove uloge</string>
-    <string name="premium_guild_features_show_support_description">Boosteri dobivaju novi i sjajan badge za profil koji se mijenja s njihovim napretkom.</string>
     <string name="premium_guild_features_show_support_mobile">Novi badge za profil koji se vremenom mijenja</string>
-    <string name="premium_guild_features_show_support_title">Pokaži svima svoju podršku</string>
     <string name="premium_guild_features_title">Kad imaš Nitro, možeš pomoći i boostati neki server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Povećane veličine za prijenos za cijelu zajednicu</string>
-    <string name="premium_guild_features_upload_sizes_title">Masivnije mogućnosti prenošenja datoteka za sve</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Pretplati se na Nitro kako bi serveru poslao Nitro Boost! [Saznaj više o Nitro Server Boostingu.] (%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Nadogradi pretplatu kako bi serveru poslao Nitro Boost! [Saznaj više o Nitro Server Boostingu.] (%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Nema nijednog Nitro Boosta</string>
     <string name="premium_guild_header_badge_no_tier">Nema nijedne razine</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro server boost</string>
     <string name="premium_guild_perks_modal_base_perks">Posebne pogodnosti za boostani server sadrže –</string>
-    <string name="premium_guild_perks_modal_blurb">"Članovi ovog servera pomoći će otključavanju pogodnosti za sve za svaku postignutu razinu. Te pogodnosti vrijede samo unutar servera.
-
- **Boosteri dobiju: Ikonu Popis članova, novi badge koji se mijenja i ulogu koja vrijedi samo za Boostere.**
-
- [Saznaj više o Nitro Server Boostingu.] (%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Članovi ovog servera pomoći će otključavanju pogodnosti za sve za svaku postignutu razinu. Te pogodnosti vrijede samo unutar servera.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Boosteri dobiju: Ikonu Popis članova, novi badge koji se mijenja i ulogu koja vrijedi samo za Boostere.** [Saznaj više o Nitro Server Boostingu.] (%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Nabaviš Nitro – imaš i Boost!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boostaj ovaj server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Nadogradi na Nitro i onda imaš i Boost!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Trenutno ne podržavamo nadogradnju na Nitro za pretplate putem Applea. Možeš otkazati pretplatu putem [Appleovog upravljanja pretplatama] (%1$s), ali pretplata će ostati aktivna dok ne istekne.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic ne uključuje Boostanje servera</string>
     <string name="premium_guild_perks_modal_header">Status boostanja servera</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** Boostova</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Upravljaj svojim Boostovima</string>
     <string name="premium_guild_perks_modal_no_tiers">Za sada nije postignuta nijedna razina</string>
@@ -3355,44 +3315,32 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s ovaj server</string>
     <string name="premium_guild_settings_members_subscribed_needed">Treba ti **%1$s** da bi otključao %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Sigurno želiš poslati Nitro Boost primatelju:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Odaberi ovaj server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Odaberi ovaj server. Tvoj boost neće imati učinka baš istog trena.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Ako boostaš ovaj server, onda pazi – nećeš moći boostati neki drugi server %1$s. Ako i povučeš svoj boost, taj period rashlađivanja svejedno mora proći.**</string>
     <string name="premium_guild_subscribe_confirm_header">Donesi mudru odluku!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Pretraži servere</string>
     <string name="premium_guild_subscribe_select_guild_header">Odaberi server</string>
     <string name="premium_guild_subscribe_success_thanks">Hvala ti za boost!</string>
     <string name="premium_guild_subscription_available_count">Imaš još **%1$s** na raspolaganju!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Došlo je do greške kad si pokušao dati svoj boost. Pokušaj ponovno.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Izgleda da si u periodu rashlađivanja. Pliz pričekaj **%1$s i %2$s** prije novog pokušaja</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Izgleda da si u periodu rashlađivanja. Pliz pričekaj **%1$s i %2$s** prije novog pokušaja</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Izgleda da si u periodu rashlađivanja. Pliz pričekaj **%1$s** prije novog pokušaja</string>
     <string name="premium_guild_subscription_no_next_tier">Ovaj server ima pun pogon! Nastavi davati boostove!</string>
-    <string name="premium_guild_subscription_notice">Nitro server boostovi su stigli! Okupi i animiraj svoju zajednicu i daj boostove svojem serveru.</string>
     <string name="premium_guild_subscription_notice_button">Pogledaj koje su razine i pogodnosti</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro server boostovi su stigli! Okupi i animiraj svoje prijatelje i daj boostove svojem serveru.</string>
     <string name="premium_guild_subscription_remove_button">Ukloni boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">Došlo je do greške kad si pokušao povući svoj boost. Pokušaj ponovno.</string>
     <string name="premium_guild_subscription_select_server_button">Odaberi server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Upotrijebi svoje Nitro sposobnosti i boostaj server kojem si se pridružio! Ako daš boost serveru, to će ga pogurati na višu razinu. Svaka viša razina daje kolektivne pogodnosti za cijeli server.
- Kad server dobije boost, počinje 7-dnevno rashlađivanje. Ne možeš dati boost drugom serveru sve dok rashlađivanje ne dođe do svojeg kraja, čak i ako svoj boost uzmeš natrag. [Saznaj više kako radi Nitro server boost.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Upotrijebi svoje Nitro sposobnosti i boostaj server kojem si se pridružio! Ako daš boost serveru, to će ga pogurati na višu razinu. Svaka viša razina daje kolektivne pogodnosti za cijeli server.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Kad server dobije boost, počinje 7-dnevno rashlađivanje. Ne možeš dati boost drugom serveru sve dok rashlađivanje ne dođe do svojeg kraja, čak i ako svoj boost uzmeš natrag. [Saznaj više kako radi Nitro server boost.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro server boost</string>
-    <string name="premium_guild_subscription_tooltip">Nitro boosting od %1$s</string>
+    <string name="premium_guild_tier_0">Nema nijedne razine</string>
     <string name="premium_guild_tier_1">Razina 1</string>
     <string name="premium_guild_tier_2">Razina 2</string>
     <string name="premium_guild_tier_3">Razina 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Hoćemo li zbilja povući Nitro Boost serveru:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Da, povuci boost</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Ovaj server će izgubiti napredak ako ukloniš svoj boost.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Ovaj server će izgubiti napredak ako ukloniš svoj boost. **Boost ti je još uvijek na rashlađivanju. Imat ćeš ga ponovo za %1$s i %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Ovaj server će izgubiti napredak ako ukloniš svoj boost. **Boost ti je još uvijek na rashlađivanju. Imat ćeš ga ponovo za %1$s i %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Ovaj server će izgubiti napredak ako ukloniš svoj boost. **Boost ti je još na rashlađivanju. Imat ćeš ga ponovo za %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Povući Nitro boost?</string>
     <string name="premium_included">U Nitro je uključeno:</string>
     <string name="premium_info_monthly">%1$s i to na dan %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** mjesečno</string>
@@ -3405,7 +3353,6 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</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_button_iap">Uzmi si %1$s</string>
     <string name="premium_payment_confirmation_button_regular">K, zvuči dobro</string>
-    <string name="premium_payment_gift_blurb">Pokloni svojim prijateljima [Nitro](onClick) kako bi dobili pogodnosti za chat i Server Boost.</string>
     <string name="premium_payment_gift_blurb_mobile">Pokloni nekome Nitro kako bi omogućio pristup supermoćnim chat pogodnostima i Server Boostingu. [Saznaj više o Nitru.](onClick)</string>
     <string name="premium_payment_gift_subtext">Ovo će biti jednokratna naplata za razdoblje koje je odabrano. Neće ti biti obračunato mjesečno.</string>
     <string name="premium_payment_is_gift">Kupuješ poklon.</string>
@@ -3420,7 +3367,6 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mjesečno</string>
     <string name="premium_plan_month_tier_2">Nitro mjesečno</string>
     <string name="premium_promo_autocomplete">Svugdje koristi prilagođene emojie</string>
-    <string name="premium_promo_description">Poleti uz Discord Nitro i koristi animirane i prilagođene emojie na bilo kojem serveru.</string>
     <string name="premium_promo_title">Želiš nadograđene emoji moći?</string>
     <string name="premium_required">Obavezan je Nitro</string>
     <string name="premium_required_get_nitro">Uzmi Nitro!</string>
@@ -3439,26 +3385,10 @@ Svoju pretplatu možeš obnoviti kada god ti srce želi."</string>
     <string name="premium_tier_2_title">Nabavi si pojačano Discord iskustvo za jedan skroman mjesečni iznos.</string>
     <string name="premium_trial_button">Počni svoje besplatno probno razdoblje</string>
     <string name="premium_upgrade_cancel">Ne</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Nadogradi na godišnju pretplatu i dobit ćeš dva besplatna mjeseca. Nije li to guba!!!!
-
-Također ćemo izračunati koliko proporcionalno otpada na tvoj sadašnji plan pretplate i odbiti taj iznos od cijene za cijelu godinu. Bit će ti naplaćeno **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Nadogradi na godišnju pretplatu i dobit ćeš dva besplatna mjeseca. Nije li to guba!!!!
-
-Također ćemo izračunati koliko proporcionalno otpada na tvoj sadašnji plan pretplate i odbiti taj iznos od cijene za cijelu godinu. Bit će ti naplaćen iznos od **%1$s** sada, a **%2$s/godišnje nakon što istekne tekuće obračunsko razdoblje."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Nadogradi svoj %1$s (mjesečni) plan i ostvari mogućnost boostanja servera. Tvoj novi plan počinje odmah.
-
- Obračunat ćemo ono što ti je ostalo od tvog sadašnjeg plana i to ćemo odbiti od mjesečne naknade. Platit ćeš **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Nadogradi svoj %1$s (mjesečni) plan i ostvari mogućnost boostanja servera. Tvoj novi plan počinje odmah.
-
- Obračunat ćemo ono što ti je ostalo od tvog sadašnjeg plana i to ćemo odbiti od mjesečne naknade. Platit ćeš iznos od **%2$s** odmah, a **%3$s/mjesečno nakon što istekne tekuće obračunsko razdoblje.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Nadogradi svoj %1$s (mjesečni) plan i ostvari mogućnost boostanja servera. Tvoj novi plan počinje odmah.
 
 Obračunat ćemo ono što ti je ostalo od tvog sadašnjeg plana i to ćemo odbiti od godišnje naknade. Platit ćeš **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Nadogradi svoj %1$s (mjesečni) plan i ostvari mogućnost boostanja servera. Tvoj novi plan počinje odmah.
-
-Obračunat ćemo ono što ti je ostalo od tvog sadašnjeg plana i to ćemo odbiti od godišnje naknade. Platit ćeš iznos od **%2$s** odmah, a **%3$s/godišnje nakon što istekne tekuće obračunsko razdoblje.**"</string>
     <string name="premium_upgrade_confirm_button">Nadogradi</string>
-    <string name="premium_upgrade_confirm_button_with_price">Nadogradi sada – %1$s</string>
     <string name="premium_upgrade_confirm_title">Nadogradi na %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Ne možeš se pretplatiti dok još uvijek imaš Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Tvoj sadašnji plan pretplate.</string>
@@ -4004,8 +3934,6 @@ Odaberi koji zaslon želiš podijeliti."</string>
     <string name="stop_streaming">Zaustavi streaming</string>
     <string name="stop_watching">Prestani gledanje</string>
     <string name="store_channel">Prodajni kanal</string>
-    <string name="store_payment_legalese_monthly">Hej! Kupiš li %1$s, prihvaćaš naše [Uvjete Pružanja Usluge](%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](%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>
diff --git a/com.discord/res/values-hu/plurals.xml b/com.discord/res/values-hu/plurals.xml
index 9886717568..c77d3e74da 100644
--- a/com.discord/res/values-hu/plurals.xml
+++ b/com.discord/res/values-hu/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d évig</item>
         <item quantity="one">%d évig</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d hónapig</item>
-        <item quantity="one">%d hónapig</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d évig</item>
-        <item quantity="one">%d évig</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">hónap</item>
         <item quantity="one">hónap</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d használat</item>
         <item quantity="one">%d használat</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d közös barát</item>
-        <item quantity="zero">0 közös barát</item>
-        <item quantity="one">1 közös barát</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d közös szerver</item>
-        <item quantity="zero">0 közös szerver</item>
-        <item quantity="one">1 közös szerver</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d napja</item>
         <item quantity="one">1 napja</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d hónap</item>
         <item quantity="one">1 hónap</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d gyorsítás</item>
-        <item quantity="one">%d gyorsítás</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d több gyorsításra</item>
         <item quantity="one">%d több gyorsításra</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d gyorsítás</item>
         <item quantity="one">%d gyorsítás</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d napra</item>
-        <item quantity="one">%d napra</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d szervergyorsítás</item>
         <item quantity="one">%d szervergyorsítás</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d hónap</item>
         <item quantity="one">%d hónap</item>
     </plurals>
@@ -597,10 +571,6 @@
         <item quantity="other">%d percet</item>
         <item quantity="one">%d percet</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** gyorsítás</item>
-        <item quantity="one">**%d** gyorsítás</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d nap</item>
         <item quantity="one">%d nap</item>
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 1e6048b230..ee8c21fd0c 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -625,7 +625,6 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing">Számlázás</string>
     <string name="billing_accept_terms_tooltip">Fogadd el az általános szerződési feltételeket a folytatáshoz</string>
     <string name="billing_account_credit">Fiókhitel</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s hónap ingyen</string>
     <string name="billing_add_payment_method">Fizetési mód hozzáadása</string>
     <string name="billing_address">Számlázási cím</string>
     <string name="billing_address_address">Cím</string>
@@ -682,8 +681,6 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing_payment_choose_plan">Válassz egy előfizetést</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: [Szolgáltatá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: [Szolgáltatá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_source_invalid">Ez a fizetési forrás érvénytelen.</string>
     <string name="billing_payment_sources">Fizetési módok</string>
     <string name="billing_payment_table_header_amount">Összeg</string>
@@ -701,13 +698,11 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing_price_per_month_current_plan">(JELENLEGI ELŐFIZETÉSED) %1$s / hónap</string>
     <string name="billing_price_per_month_current_plan_ios">(Jelenlegi előfizetésed) %1$s / hónap</string>
     <string name="billing_price_per_month_mobile">%1$s / HÓ</string>
-    <string name="billing_price_per_month_upgrade">Frissítés: %1$s / hónap</string>
     <string name="billing_price_per_year">%1$s / év</string>
     <string name="billing_price_per_year_current_plan">(JELENLEGI ELŐFIZETÉSED) %1$s / év</string>
     <string name="billing_price_per_year_current_plan_ios">(Jelenlegi előfizetésed) %1$s / év</string>
     <string name="billing_price_per_year_mobile">%1$s / ÉV</string>
     <string name="billing_price_per_year_months_free">%1$s / év (2 hónap ingyen)</string>
-    <string name="billing_price_per_year_upgrade">Frissítés a következőre: %1$s / év</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>
@@ -729,6 +724,10 @@ de amennyiben majd szükséges lesz, ne töprengj sokat rajta."</string>
     <string name="billing_step_review">Áttekintés</string>
     <string name="billing_step_select_plan">Előfizetés kiválasztása</string>
     <string name="billing_subscribe">Iratkozz fel</string>
+    <string name="billing_switch_plan_change">Díjcsomag módosítása</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Oks!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Édes!</string>
+    <string name="billing_switch_plan_upgrade">Frissítés</string>
     <string name="billing_tag_failed">Sikertelen</string>
     <string name="billing_tag_pending">Függőben lévő</string>
     <string name="billing_tag_refunded">Visszatérítve</string>
@@ -1779,11 +1778,8 @@ Köszönjük, hogy fenntartjátok a rendet."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Egy másik nagylelkű embernek köszönhetően %1$s újra van %2$s-d.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Egy másik nagylelkű embernek köszönhetően %1$s újra van %2$s-d.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** hozzá lett adva a könyvtárhoz.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Egy másik nagylelkű embernek köszönhetően %1$s időtartamig hozzáférésed van a továbbfejlesztett csevegési jutalmakhoz és a szervergyorsításhoz.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Egy másik nagylelkű embernek köszönhetően %1$s újra hozzáférésed van a továbbfejlesztett csevegési jutalmakhoz.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Egy másik nagylelkű embernek köszönhetően %1$s újra hozzáférésed van a továbbfejlesztett csevegési jutalmakhoz.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Egy másik nagylelkű embernek köszönhetően %1$s hozzáférésed van a továbbfejlesztett csevegési jutalmakhoz és a szervergyorsításhoz.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Egy másik nagylelkű embernek köszönhetően %1$s hozzáférésed van a továbbfejlesztett csevegési jutalmakhoz és a szervergyorsításhoz.</string>
     <string name="gift_confirmation_body_unknown_error">Valami furcsaság történt, és nem sikerült biztosítani a táskát …próbáld újra?</string>
     <string name="gift_confirmation_button_confirm">Hé igen! Hozzáadás a könyvtárhoz</string>
     <string name="gift_confirmation_button_confirm_mobile">Kérem</string>
@@ -2136,9 +2132,7 @@ Elvesztett: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s szerver emotikon hely (összesen %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s feltöltési korlát minden tag számára</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Gyorsított szerver jutalmak része –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Még senki nem ruházta át a Nitro-t erre a szerverre. Nézd meg, hátha valamelyik tag kedvesen megáldja a szervered az egész szerverre kiterjedő Nitro-jutalmakért!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">A gyorsított szerverek megkapnak minden korábbit, és –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Nincs Nitro-gyorsítás</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">1. szintű jutalmak</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">2. szintű jutalmak</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">3. szintű jutalmak</string>
@@ -2155,16 +2149,12 @@ Elvesztett: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">%1$s szintű jutalom kioldva</string>
     <string name="guild_settings_overview_notice">Óvatosan! Nem mentett változások vannak!</string>
     <string name="guild_settings_overview_tier_info">Ez egy %1$s szintű Nitro funkció. [Ellenőrizd a szintállapotod](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Az aktív Nitro-előfizetéssel rendelkező szervertagok segíthetnek feloldani a szinteket a Nitro állapotuk átruházásával.
-A szerver tagjai minden elért szinthez mindenki számára segítenek feloldani a jutalmakat.
-
-A tagok bármikor visszavonhatják a gyorsításukat.
-**A szerver három napon át megőrzi a csoportokat, ha egy szint elvész. **[Tudj meg többet a Nitro-szervergyorsításról.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Csak %1$s a következő szintig!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** gyorsította ezt a szervert</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro-szervergyorsítás állapota</string>
+    <string name="guild_settings_premium_guild_title">Szervergyorsítás állapota</string>
     <string name="guild_settings_premium_guild_unlocked">Kioldva</string>
+    <string name="guild_settings_premium_upsell_learn_more">Tudj meg többet a Discord Nitróról</string>
     <string name="guild_settings_server_banner">Szerverbanner</string>
     <string name="guild_settings_server_invite_background">Szerver meghívó háttér</string>
     <string name="guild_settings_splash_info">Ez a kép akkor jelenik meg, amikor a felhasználók meghívást kapnak a szerverre.</string>
@@ -2174,6 +2164,7 @@ A tagok bármikor visszavonhatják a gyorsításukat.
 
 Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &amp;username= részletet a querystring-hez."</string>
     <string name="guild_settings_widget_enable_widget">Szerver widget engedélyezése</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">A vásárlás részletei</string>
     <string name="guild_verification_text_account_age">A felhasználói fiókodnak minimum %1$s perce már élnie kell, hogy üzenetet tudj küldeni ezen a szerveren.</string>
     <string name="guild_verification_text_member_age">Minimum %1$s perce tagnak kell lenned, hogy üzenetet tudj küldeni ezen a szerveren.</string>
     <string name="guild_verification_text_not_claimed">Le kell foglalnod és hitelesítened kell a fiókodat, hogy üzenetet tudj küldeni ezen a szerveren.</string>
@@ -2523,10 +2514,6 @@ Szeretnél többet megtudni a Discordról?"</string>
     <string name="ios_media_keyboard_take_a_photo">Fotó készítése</string>
     <string name="ios_notification_see_full">Koppints ide a teljes üzenet megtekintéséhez.</string>
     <string name="ios_profile_in_voice_call">Hanghívásban</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Közös barátok</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Közös szerverek</string>
     <string name="ios_profile_open_voice_channel">Hangcsatorna megnyitása</string>
     <string name="ios_view_all">Minden megtekintése</string>
     <string name="ip_address_secured">IP-cím biztosítva</string>
@@ -2843,7 +2830,6 @@ ha az @everyone vagy @here előtagot használják."</string>
     <string name="network_error_unknown">Ismeretlen csatlakozási hiba történt.</string>
     <string name="network_error_unknown_host">Hálózati hiba történt. Ellenőrizd a DNS-beállításokat, és próbáld újra később.</string>
     <string name="network_offline">Hálózatod limitált vagy nem elérhető.</string>
-    <string name="nevermind">Felejtsük el</string>
     <string name="new_dm">Új közvetlen üzenet</string>
     <string name="new_group_dm">Új csoportos közvetlen üzenet</string>
     <string name="new_guilds_dm_allowed">Közvetlen üzenetek engedélyezése a szerver tagjaitól.</string>
@@ -2967,7 +2953,6 @@ kitűzött üzenete… egyelőre."</string>
     <string name="notice_no_input_detected_help_link_text">Segítség!</string>
     <string name="notice_no_input_detected_settings">Nos, úgy tűnik, hogy a Discord nem érzékel semmit abból, amit mondasz. Javítsuk meg!</string>
     <string name="notice_no_input_detected_settings_link_text">Látogatási beállítások</string>
-    <string name="notice_premium_grandfathered_ended">A hozzáférésed a Nitróhoz lejárt. Frissíts a Nitro Classic-ról a Nitróra a szuper erejű csevegési jutalmak és a szervergyorsítás eléréséhez.</string>
     <string name="notice_premium_grandfathered_ending">Csak %1$s maradt a Nitróval! A hozzáférésed visszavált Nitro Classic-ra ekkor: **%2$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>
@@ -3201,7 +3186,7 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
     <string name="payment_modal_button_change_card">Bankkártya frissítése</string>
     <string name="payment_modal_button_change_paypal">PayPal-fiók frissítése</string>
     <string name="payment_modal_button_premium">%1$s megszerzése</string>
-    <string name="payment_modal_button_premium_gift">%1$s vásárlás</string>
+    <string name="payment_modal_button_premium_gift">Vásárold meg az ajándékot</string>
     <string name="payment_modal_one_month">1 hónap</string>
     <string name="payment_modal_one_year">1 év</string>
     <string name="payment_modal_per_month">Havonta</string>
@@ -3312,9 +3297,6 @@ A játékbeli felület nem biztos, hogy mindenkinek működik. Ha problémád ak
 Az előfizetést bármikor újraindíthatod."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">A lemondás a jelenlegi számlázási időszak végén lép érvénybe: **%1$s**. A Discord Tag véletlenszerűen lesz kiválasztva, ha korábban módosítottad azt.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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. **%1$s** dátummal elveszted a hozzáférést a Nitróhoz, a Discord Tag véletlenszerűen lesz kiválasztva, ha korábban módosítottad azt, valamint a szervergyorsítás eltávolításra kerül.
-
- Előfizetésedet bármikor újraindíthatod."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">A lemondás a jelenlegi számlázási időszak végén lép érvénybe. **%1$s** dátummal elveszted a hozzáférést a Nitróhoz, a Discord Tag véletlenszerűen lesz kiválasztva, ha korábban módosítottad azt, valamint a szervergyorsítás eltávolításra kerül.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Az előfizetést bármikor újraindíthatod.</string>
     <string name="premium_cancel_confirm_mobile">Nitro lemondása</string>
@@ -3337,7 +3319,6 @@ Az előfizetést bármikor újraindíthatod."</string>
     <string name="premium_chat_perks_description_streaming">Élő közvetítés Nitro vagy legfeljebb egy crisp 1080p 60fps forrással a Nitro Classic-kal.</string>
     <string name="premium_chat_perks_description_upload_limit">Nagyobb fájlfeltöltési méret: %1$s – %2$s (Nitro esetén) vagy %3$s (Nitro Classic esetén).</string>
     <string name="premium_chat_perks_premium_guild_subscription">Gyorsítsd fel a kedvenc szervered!</string>
-    <string name="premium_chat_perks_simple_title">Intézd egyszerűen – szerezd meg az alap csevegési jutalmakat a szervergyorsítás nélkül.</string>
     <string name="premium_chat_perks_streaming_mobile">Inkább válts élő közvetítésekre: Go Live közvetítés Nitro vagy legfeljebb egy crisp 1080p 60fps forrással a Nitro Classic-kal</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>
@@ -3376,41 +3357,20 @@ Az előfizetést bármikor újraindíthatod."</string>
     <string name="premium_grandfathered_yearly">Szeretnénk megköszönni a Discord támogatását, ezért kétéves hozzáférést kapsz a Nitróhoz. A hozzáférésed lejárata: **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Gyorsítás lehűtés: **%1$sn %2$só %3$sp**</string>
     <string name="premium_guild_features_blurb">Egy szerver gyorsítása a Nitro előfizetéssel segít egy új szintre emelni. Minden elért szintnél csevegésjutalmakat nyit meg **mindenki számára, aki a szerveren van!** Nézz meg néhányat ezekből az édes jutalmakból:</string>
-    <string name="premium_guild_features_customize_guild_description">Old ki a testreszabásokat, mint a meghívó hátteret, szerver bannert, kreatív URL-címet stb.</string>
     <string name="premium_guild_features_customize_guild_mobile">Szerver testreszabások</string>
-    <string name="premium_guild_features_customize_guild_title">Szerver testreszabások</string>
     <string name="premium_guild_features_learn_more_button">Tudj meg többet a Discord Nitróról</string>
     <string name="premium_guild_features_learn_more_text">Szerezz egy továbbfejlesztett Discord-élményt alacsony havi költséggel.</string>
     <string name="premium_guild_features_more">És több! Ellenőrizheted az aktuális szintet, a szint haladását és a szerveren belül rendelkezésre álló jutalmakat.</string>
-    <string name="premium_guild_features_new_role_description">Szerezz be egy speciális szerver szerepkört, mely csak a Nitro szervergyorsítók számára érhető el a szervereden.</string>
-    <string name="premium_guild_features_new_role_mobile">Exkluzív Nitro-szervergyorsító rangok</string>
-    <string name="premium_guild_features_new_role_title">Exkluzív új jogosultság</string>
-    <string name="premium_guild_features_show_support_description">A gyorsítók kapnak egy fényes, új profiljelvényt, amely a csíkokkal változik.</string>
     <string name="premium_guild_features_show_support_mobile">Egy új profiljelvény, mely idővel változik</string>
-    <string name="premium_guild_features_show_support_title">Mutasd meg a támogatásodat</string>
     <string name="premium_guild_features_title">A Nitróval segíthetsz egy szerver gyorsításában!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Megnövelt közösségi szintű feltöltési méretek</string>
-    <string name="premium_guild_features_upload_sizes_title">Nagyobb feltöltési méret mindenkinek</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Fizess elő a Nitróra, hogy egy Nitro-gyorsítást küldj egy szerverre! [Tudj meg többet a Nitro-szervergyorsításról.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Frissítsd az előfizetésed, hogy egy Nitro-gyorsítást küldj egy szerverre! [Tudj meg többet a Nitro-szervergyorsításról.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Nincs Nitro-gyorsítás</string>
     <string name="premium_guild_header_badge_no_tier">Nincs szint</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro-szervergyorsítás</string>
     <string name="premium_guild_perks_modal_base_perks">Gyorsított szerver jutalmak része –</string>
-    <string name="premium_guild_perks_modal_blurb">"Az összes elért szintnél ezen szerver tagjai segíteni fognak kioldani a jutalmakat mindenki számára. Ezek a jutalmak csak a szerveren belül hatásosak.
-
- **Gyorsítók kapnak: Taglista ikont, új fejlődő jelvényt és egy csak gyorsítóknak járó rangot.**
-
- [Tudj meg többet a Nitro-szervergyorsításról.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Az összes elért szintnél ezen szerver tagjai segíteni fognak kioldani a jutalmakat mindenki számára. Ezek a jutalmak csak a szerveren belül hatásosak.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Gyorsítók kapnak: Taglista ikont, új fejlődő jelvényt és egy csak gyorsítóknak járó rangot.** [Tudj meg többet a Nitro-szervergyorsításról.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Válts Nitróra a gyorsításhoz!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Gyorsítsd fel ezt a szervert</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Válts Nitróra a gyorsításhoz!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Jelenleg nem támogatjuk a Nitro frissítéseit az Apple előfizetésein keresztül. Visszavonhatod az előfizetést az [Apple előfizetéskezelés](%1$s) segítségével, de az előfizetés a lejáratáig aktív marad.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">A Nitro Classic nem tartalmazza a Szervergyorsítást</string>
     <string name="premium_guild_perks_modal_header">Szervergyorsítás állapota</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** gyorsítás</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Kezeld a gyorsításod</string>
     <string name="premium_guild_perks_modal_no_tiers">Még nincs elérve szint</string>
@@ -3423,44 +3383,32 @@ Az előfizetést bármikor újraindíthatod."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s gyorsította ezt a szervert</string>
     <string name="premium_guild_settings_members_subscribed_needed">**%1$s** van szükséged %2$s kioldásához</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Biztos, hogy el akarsz küldeni egy Nitro-gyorsítást a következőnek:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Válaszd ki ezt a szervert</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Válaszd ki ezt a szervert. Eltart egy pillanatig, amíg a gyorsítás érvénybe lép.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Ezen szerver gyorsítása elkerüli egy másik szerver gyorsítását %1$s. A gyorsítás eltávolítása nincs hatással a lehűtésre.**</string>
     <string name="premium_guild_subscribe_confirm_header">Válassz bölcsen!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Szerverek keresése</string>
     <string name="premium_guild_subscribe_select_guild_header">Válassz szervert</string>
     <string name="premium_guild_subscribe_success_thanks">Köszönjük a gyorsítást!</string>
     <string name="premium_guild_subscription_available_count">**%1$s** áll rendelkezésedre!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Hiba történt a gyorsítás során. Próbáld újra.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Úgy tűnik, hogy lehűtésben vagy. Újbóli próbálkozás előtt várj **%1$s és %2$s**</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Úgy tűnik, hogy lehűtésben vagy. Újbóli próbálkozás előtt várj **%1$s és %2$s**</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Úgy tűnik, hogy lehűtésben vagy. Újbóli próbálkozás előtt várj **%1$s**</string>
     <string name="premium_guild_subscription_no_next_tier">Ez a szerver teljesen felgyorsított! Folytasd a gyorsítást!</string>
-    <string name="premium_guild_subscription_notice">A Nitro-szervergyorsítás itt van! Gyűjtsd össze a közösséged a szerver gyorsításához.</string>
     <string name="premium_guild_subscription_notice_button">Szintek és jutalmak megtekintése</string>
-    <string name="premium_guild_subscription_notice_small_guild">A Nitro-szervergyorsítás itt van! Gyűjtsd össze a barátaidat a szerver gyorsításához.</string>
     <string name="premium_guild_subscription_remove_button">Gyorsítás törlése</string>
     <string name="premium_guild_subscription_remove_error_mobile">Hiba történt a gyorsítás eltávolításának során. Próbáld újra.</string>
     <string name="premium_guild_subscription_select_server_button">Válassz szervert</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Használd Nitro-képességeidet egy szerver gyorsításához, amelyhez csatlakoztál! A szerver gyorsítása lehetővé teszi a szintek felé haladást. Mindegyik szint együttes előnyöket ad a teljes szerver számára.
- Egy szerver gyorsítása aktivál egy 7 napos lehűtést. Lehet, hogy nem kell gyorsítanod egy másik szervert, amíg ez a lehűtés nem fejeződik be, még akkor sem, ha eltávolítod a gyorsítást. [Tudj meg többet a Nitro-szervergyorsításról.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Használd Nitro-képességeidet egy szerver gyorsításához, amelyhez csatlakoztál! A szerver gyorsítása lehetővé teszi a szintek felé haladást. Mindegyik szint együttes előnyöket ad a teljes szerver számára.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Egy szerver gyorsítása aktivál egy 7 napos lehűtést. Lehet, hogy nem kell gyorsítanod egy másik szervert, amíg ez a lehűtés nem fejeződik be, még akkor sem, ha eltávolítod a gyorsítást. [Tudj meg többet a Nitro-szervergyorsításról.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro-szervergyorsítás</string>
-    <string name="premium_guild_subscription_tooltip">Nitro-gyorsítás azóta: %1$s</string>
+    <string name="premium_guild_tier_0">Nincs szint</string>
     <string name="premium_guild_tier_1">1. szint</string>
     <string name="premium_guild_tier_2">2. szint</string>
     <string name="premium_guild_tier_3">3. szint</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Biztosan eltávolítod a Nitro-gyorsításod a következőről:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Igen, eltávolítod a gyorsítást</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Ez a szerver elveszíti a folyamatot, ha eltávolítod a gyorsításod.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Ez a szerver elveszíti a folyamatot, ha eltávolítod a gyorsításod. **A gyorsításod lehűtés alatt van. %1$s és %2$s múlva lesz elérhető.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Ez a szerver elveszíti a folyamatot, ha eltávolítod a gyorsításod. **A gyorsításod lehűtés alatt van. %1$s és %2$s múlva lesz elérhető.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Ez a szerver elveszíti az előrehaladást, ha eltávolítod a gyorsításod. **A gyorsításod lehűtés alatt van. %1$s múlva lesz elérhető.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Eltávolítod a Nitro-gyorsítást?</string>
     <string name="premium_included">Megtalálható a Nitróban:</string>
     <string name="premium_info_monthly">%1$s (havi) ekkor: %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / hónap</string>
@@ -3473,7 +3421,6 @@ Az előfizetést bármikor újraindíthatod."</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_button_iap">%1$s megszerzése!</string>
     <string name="premium_payment_confirmation_button_regular">K, jól hangzik</string>
-    <string name="premium_payment_gift_blurb">Ajándékozd meg a barátaidat [Nitróval](onClick), hogy szupererős csevegési jutalmakat és szervergyorsítást kapjanak.</string>
     <string name="premium_payment_gift_blurb_mobile">Ajándékozz valakinek Nitro-t, hogy hozzáférjen a szupererős csevegésjutalmakhoz és a szervergyorsításhoz. [Tudj meg többet a Nitroról.](onClick)</string>
     <string name="premium_payment_gift_subtext">Ez egyszeri díj lesz a kiválasztott időtartamért. Havonta nem kerül számlázásra.</string>
     <string name="premium_payment_is_gift">Egy ajándékot vásárolsz.</string>
@@ -3488,7 +3435,6 @@ Az előfizetést bármikor újraindíthatod."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic havi</string>
     <string name="premium_plan_month_tier_2">Nitro havi</string>
     <string name="premium_promo_autocomplete">Bárhol használhatsz egyedi emotikonokat</string>
-    <string name="premium_promo_description">Kapj szárnyra a Discord Nitróval, használj animált és egyedi emotikonokat minden szerveren!</string>
     <string name="premium_promo_title">Prémium emotikonokat szeretnél?</string>
     <string name="premium_required">Nitro szükséges</string>
     <string name="premium_required_get_nitro">Nitro letöltése!</string>
@@ -3508,26 +3454,10 @@ Az előfizetést bármikor újraindíthatod."</string>
     <string name="premium_title">Discord Nitró</string>
     <string name="premium_trial_button">Indítsd el az ingyenes próbaidőszakod</string>
     <string name="premium_upgrade_cancel">Nem</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Válts éves előfizetésre, és kapsz két ingyen hónapot. Micsoda üzlet!!! 
-
-A jelenlegi előfizetésed arányosítjuk, és levonjuk az éves díjból. Számládat a következővel fogjuk terhelni: **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Válts éves előfizetésre, és kapsz két ingyen hónapot. Micsoda üzlet!!! 
-
-A jelenlegi előfizetésedet arányosítjuk, és levonjuk az éves díjból. A számládat most ennyivel fogjuk terhelni **%1$s**, és **%2$s/év az aktuális számlázási időszak után.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Váltsd jobbra a(z) %1$s (havi) előfizetésed, és szerezd meg a szervergyorsítás képességét. Az új előfizetés azonnal kezdődik.
-
-A jelenlegi előfizetésedet arányosítjuk, és levonjuk a havi díjból. Számládat ennyivel fogjuk terhelni: **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Váltsd jobbra a(z) %1$s (havi) előfizetésed, és szerezd meg a szervergyorsítás képességét. Az új előfizetés azonnal kezdődik.
-
-A jelenlegi előfizetésedet arányosítjuk, és levonjuk a havi díjból. A számládat most ennyivel fogjuk terhelni **%2$s**, és **%3$s/hónap az aktuális számlázási időszak után.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Váltsd jobbra a(z) %1$s (havi) előfizetésed, és szerezd meg a szervergyorsítás képességét. Az új előfizetés azonnal kezdődik.
 
 A jelenlegi előfizetésedet arányosítjuk, és levonjuk az éves díjból. Számládat ennyivel fogjuk terhelni: **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Váltsd jobbra a(z) %1$s (havi) előfizetésed, és szerezd meg a szervergyorsítás képességét. Az új előfizetés azonnal kezdődik.
-
-A jelenlegi előfizetésedet arányosítjuk, és levonjuk az éves díjból. A számládat most ennyivel fogjuk terhelni **%2$s**, és **%3$s/év az aktuális számlázási időszak után.**"</string>
     <string name="premium_upgrade_confirm_button">Frissítés</string>
-    <string name="premium_upgrade_confirm_button_with_price">Váltás most - %1$s</string>
     <string name="premium_upgrade_confirm_title">Frissítés a következőre: %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Nem tudsz feliratkozni, ha már van Nitród.</string>
     <string name="premium_upgrade_disabled_current_tooltip">A jelenlegi előfizetésed.</string>
@@ -4085,8 +4015,6 @@ Biztos vagy ebben?"</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_channel">Csatorna tárolása</string>
-    <string name="store_payment_legalese_monthly">Üdv! A(z) %1$s megvásárlásával elfogadod a következőt: [Á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: [Á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>
diff --git a/com.discord/res/values-it/plurals.xml b/com.discord/res/values-it/plurals.xml
index 678f37a2f2..8c1c28633a 100644
--- a/com.discord/res/values-it/plurals.xml
+++ b/com.discord/res/values-it/plurals.xml
@@ -290,14 +290,6 @@
         <item quantity="other">%d anni</item>
         <item quantity="one">%d anno</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d mesi</item>
-        <item quantity="one">%d mese</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d anni</item>
-        <item quantity="one">%d anno</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">mesi</item>
         <item quantity="one">mese</item>
@@ -454,16 +446,6 @@
         <item quantity="other">%d usi</item>
         <item quantity="one">%d uso</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d Amici in comune</item>
-        <item quantity="zero">0 Amici in comune</item>
-        <item quantity="one">1 Amico in comune</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d server in comune</item>
-        <item quantity="zero">0 Server in comune</item>
-        <item quantity="one">1 Server in comune</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d giorni</item>
         <item quantity="one">1 giorno</item>
@@ -537,10 +519,6 @@
         <item quantity="other">%d mesi</item>
         <item quantity="one">1 mese</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d Potenziamenti</item>
-        <item quantity="one">%d Potenziamento</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d potenziamenti ni più</item>
         <item quantity="one">%d potenziamento in più</item>
@@ -553,15 +531,11 @@
         <item quantity="other">%d potenziamenti</item>
         <item quantity="one">%d potenziamento</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d giorni</item>
-        <item quantity="one">%d giorno</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d potenziamenti Server</item>
         <item quantity="one">%d potenziamento Server</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d mesi</item>
         <item quantity="one">%d mese</item>
     </plurals>
@@ -585,10 +559,6 @@
         <item quantity="other">%d minuti</item>
         <item quantity="one">%d minuto</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** potenziamenti</item>
-        <item quantity="one">**%d** potenziamento</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d giorni</item>
         <item quantity="one">%d giorno</item>
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index 2a258c3c98..4543342c7c 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -613,7 +613,6 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="billing">Fatturazione</string>
     <string name="billing_accept_terms_tooltip">Accetta i Termini di Servizio per continuare</string>
     <string name="billing_account_credit">Credito account</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s mesi gratis</string>
     <string name="billing_add_payment_method">Aggiungi metodo di pagamento</string>
     <string name="billing_address">Indirizzo di fatturazione</string>
     <string name="billing_address_address">Indirizzo</string>
@@ -671,8 +670,6 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="billing_payment_choose_plan">Scegli un piano</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, accetti i nostri [Termini di Servizio del Negozio](%2$s). %1$s è un abbonamento a rinnovo automatico. Autorizzi Discord ad addebitare immediatamente il metodo di pagamento fornito di %3$s 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, accetti i nostri [Termini di Servizio del Negozio](%2$s). %1$s è un abbonamento a rinnovo automatico. Autorizzi Discord ad addebitare immediatamente il metodo di pagamento fornito di %3$s 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_source_invalid">Questa fonte di pagamento non è valida.</string>
     <string name="billing_payment_sources">Metodi di pagamento</string>
     <string name="billing_payment_table_header_amount">Importo</string>
@@ -690,13 +687,11 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="billing_price_per_month_current_plan">(PIANO ATTUALE) %1$s / Mese</string>
     <string name="billing_price_per_month_current_plan_ios">(Piano attuale) %1$s / Mese</string>
     <string name="billing_price_per_month_mobile">%1$s / mese</string>
-    <string name="billing_price_per_month_upgrade">"Fai l'upgrade a %1$s / Mese"</string>
     <string name="billing_price_per_year">%1$s / Anno</string>
     <string name="billing_price_per_year_current_plan">(PIANO ATTUALE) %1$s / Anno</string>
     <string name="billing_price_per_year_current_plan_ios">(Piano attuale) %1$s / Anno</string>
     <string name="billing_price_per_year_mobile">%1$s / anno</string>
     <string name="billing_price_per_year_months_free">%1$s / Anno (2 mesi gratuiti)</string>
-    <string name="billing_price_per_year_upgrade">"Fai l'upgrade a %1$s / Anno"</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>
@@ -718,6 +713,9 @@ Ma se e quando vorrai, non esitare!"</string>
     <string name="billing_step_review">Anteprima</string>
     <string name="billing_step_select_plan">Seleziona piano</string>
     <string name="billing_subscribe">Abbonati</string>
+    <string name="billing_switch_plan_change">Cambia piano</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Capito!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Tosto!</string>
     <string name="billing_tag_failed">Non riuscito</string>
     <string name="billing_tag_pending">In attesa</string>
     <string name="billing_tag_refunded">Rimborsato</string>
@@ -1769,11 +1767,8 @@ per poter verificare la sensibilità dell'ingresso."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">"Grazie a un'altra persona generosa, ora possiedi %1$s per %2$s."</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">"Grazie a un'altra persona generosa, ora possiedi %1$s per %2$s."</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** è stato appena aggiunto alla tua libreria.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">"Grazie a un'altra persona generosa, hai ora accesso a benefici della chat migliorati e a un potenziamento del server per %1$s."</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">"Grazie a un'altra persona generosa, hai ora accesso a benefici della chat migliorati per %1$s."</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">"Grazie a un'altra persona generosa, hai ora accesso a benefici della chat migliorati per %1$s."</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">"Grazie a un'altra persona generosa, hai ora accesso a benefici della chat migliorati e a un potenziamento del server per %1$s."</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">"Grazie a un'altra persona generosa, hai ora accesso a benefici della chat migliorati e a un potenziamento del server per %1$s."</string>
     <string name="gift_confirmation_body_unknown_error">"È successo qualcosa di strano e non siamo riusciti a completare l'operazione… vuoi riprovare?"</string>
     <string name="gift_confirmation_button_confirm">Sì, non stai sognando! Aggiungilo alla libreria</string>
     <string name="gift_confirmation_button_confirm_mobile">Dammi</string>
@@ -2124,9 +2119,7 @@ Persi: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s slot per le emoji del server (per un totale di %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s di limite di caricamento per tutti i membri</string>
     <string name="guild_settings_guild_premium_perks_base_perks">I benefici del server potenziato includono:</string>
-    <string name="guild_settings_guild_premium_perks_description_none">"Nessuno ha ancora conferito il proprio stato Nitro a questo server. Dai un'occhiata in giro per vedere se ci sia qualche membro così gentile da aiutare il tuo server per fargli ottenere innumerevoli benefici Nitro!"</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">I server potenziati ereditano tutte le caratteristiche precedenti, più:</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Nessun Potenziamento Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Benefici livello 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Benefici livello 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Benefici livello 3</string>
@@ -2143,16 +2136,12 @@ Persi: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Beneficio livello %1$s sbloccato</string>
     <string name="guild_settings_overview_notice">Attenzione! Ci sono delle modifiche non salvate!</string>
     <string name="guild_settings_overview_tier_info">Questo è una funzionalità di livello %1$s di Nitro. [Controlla il tuo livello attuale](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"I Membri del server dotati di un abbonamento Nitro attivo possono contribuire a sbloccare nuovi livelli, conferendo il loro stato Nitro.
-Ad ogni nuovo livello raggiunto, i membri del server contribuiranno a sbloccare benefici per tutti.
-
-I membri possono revocare il loro potenziamento in qualsiasi momento
-**Qualora dovesse scendere di livello, il server conserverà i benefici per tre giorni. **[Scopri di più su come potenziare un server Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Hai bisogno di ancora %1$s per raggiungere il prossimo livello!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** potenziato questo server</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Stato potenziamento del server Nitro</string>
+    <string name="guild_settings_premium_guild_title">Stato potenziamento del server</string>
     <string name="guild_settings_premium_guild_unlocked">Sbloccato</string>
+    <string name="guild_settings_premium_upsell_learn_more">Scopri di più su Discord Nitro</string>
     <string name="guild_settings_server_banner">Banner del server</string>
     <string name="guild_settings_server_invite_background">Sfondo degli inviti del server</string>
     <string name="guild_settings_splash_info">"Quest'immagine ti mostrerà quando gli utenti ricevono un invito al server."</string>
@@ -2162,6 +2151,7 @@ I membri possono revocare il loro potenziamento in qualsiasi momento
 
 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_subscription_purchase_modal_purchase_details_header">Dettagli acquisto</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>
     <string name="guild_verification_text_not_claimed">Devi creare un account e verificarlo per inviare messaggi in questo server.</string>
@@ -2508,10 +2498,6 @@ Vuoi saperne di più su Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Scatta una foto</string>
     <string name="ios_notification_see_full">"Tocca per visualizzare l'intero messaggio."</string>
     <string name="ios_profile_in_voice_call">In una chiamata vocale</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Amici in comune</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Server in comune</string>
     <string name="ios_profile_open_voice_channel">Apri canale vocale</string>
     <string name="ios_view_all">Mostra tutto</string>
     <string name="ip_address_secured">Indirizzo IP protetto</string>
@@ -2827,7 +2813,6 @@ tra canali ai quali sia loro che l'utente da spostare hanno accesso."</string>
     <string name="network_error_unknown">Si è verificato un errore di rete sconosciuto.</string>
     <string name="network_error_unknown_host">Si è verificato un errore di rete. Controlla le tue impostazioni del DNS e riprova.</string>
     <string name="network_offline">Connettività di rete limitata o non disponibile.</string>
-    <string name="nevermind">Lascia perdere</string>
     <string name="new_dm">Nuovo messaggio diretto</string>
     <string name="new_group_dm">Nuova chat di gruppo</string>
     <string name="new_guilds_dm_allowed">Permetti ai membri del server di inviarti messaggi diretti.</string>
@@ -2951,7 +2936,6 @@ attaccati… per ora."</string>
     <string name="notice_no_input_detected_help_link_text">Assistenza!</string>
     <string name="notice_no_input_detected_settings">Beh, sembra che Discordi non rilevi alcun suono dal tuo microfono. Diamogli una raddrizzata!</string>
     <string name="notice_no_input_detected_settings_link_text">Impostazioni visite</string>
-    <string name="notice_premium_grandfathered_ended">"Il tuo accesso a Nitro è scaduto. Effettua l'upgrade da Nitro Classic a Nitro per ottenere benefici della chat aumentati e un potenziamento del server."</string>
     <string name="notice_premium_grandfathered_ending">Hai a disposizione solo %1$s di Nitro! Il tuo abbonamento scenderà a Nitro Classic il **%2$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>
@@ -3184,7 +3168,7 @@ Inoltre, l'overlay potrebbe non funzionare per tutti. Per problemi o domande, da
     <string name="payment_modal_button_change_card">Aggiorna carta di credito</string>
     <string name="payment_modal_button_change_paypal">Aggiorna Account PayPal</string>
     <string name="payment_modal_button_premium">Ottieni %1$s</string>
-    <string name="payment_modal_button_premium_gift">Acquista %1$s</string>
+    <string name="payment_modal_button_premium_gift">Acquista regalo</string>
     <string name="payment_modal_one_month">1 mese</string>
     <string name="payment_modal_one_year">1 anno</string>
     <string name="payment_modal_per_month">Al mese</string>
@@ -3296,9 +3280,6 @@ Inoltre, l'overlay potrebbe non funzionare per tutti. Per problemi o domande, da
 Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">"Potrai rinnovare l'abbonamento in qualsiasi momento."</string>
-    <string name="premium_cancel_confirm_body_tier_2">"La cancellazione sarà effettiva al termine del tuo attuale periodo di fatturazione. Il giorno **%1$s**, perderai l'accesso a Nitro e il tuo Discord Tag sarà randomizzato se l'hai cambiato, mentre il tuo potenziamento del server sarà rimosso.
-
- Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">"La cancellazione sarà effettiva al termine di questo periodo di fatturazione. Dal **%1$s** perderai l'accesso a Nitro e il tuo Discord Tag sarà randomizzato se l'hai cambiato, mentre il tuo potenziamento del server sarà rimosso."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">"Potrai rinnovare l'abbonamento in qualsiasi momento."</string>
     <string name="premium_cancel_confirm_mobile">Cancella Nitro</string>
@@ -3321,7 +3302,6 @@ Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_chat_perks_description_streaming">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_description_upload_limit">Caricamento di file più grandi a partire da %1$s fino a %2$s con Nitro o %3$s con Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Potenzia il tuo server preferito!</string>
-    <string name="premium_chat_perks_simple_title">Premia la semplicità: ottieni i benefici della chat di base senza alcun potenziamento del server.</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>
@@ -3360,41 +3340,20 @@ Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_grandfathered_yearly">"Per ringraziarti del tuo sostegno a Discord, avrai accesso a Nitro per due anni. L'offerta terminerà il giorno **%1$s**."</string>
     <string name="premium_guild_cooldown_available_countdown">Cooldown potenziamento: **%1$sg %2$sh %3$sm**</string>
     <string name="premium_guild_features_blurb">"Potenziare un server con la tua iscrizione a Nitro, gli farà raggiungere nuovi livelli. Ad ogni livello raggiunto, sbloccherà benefici della chat **per chiunque si trovi in quel server!** Dai un'occhiata ad alcuni di questi mirabili benefici:"</string>
-    <string name="premium_guild_features_customize_guild_description">"Sblocca aspetti personalizzati: sfondo dell'invito, banner del server, vanity URL ecc."</string>
     <string name="premium_guild_features_customize_guild_mobile">Personalizzazione del server</string>
-    <string name="premium_guild_features_customize_guild_title">Personalizzazione del server</string>
     <string name="premium_guild_features_learn_more_button">Scopri di più su Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">"Ottieni un'esperienza Discord migliorata a un conveniente prezzo mensile di partenza."</string>
     <string name="premium_guild_features_more">E non finisce qui! Puoi controllare il livello attuale, progressi del livello e benefici disponibili nel server.</string>
-    <string name="premium_guild_features_new_role_description">Ottieni un ruolo server speciale disponibile solo per i sostenitori Nitro server nel tuo server.</string>
-    <string name="premium_guild_features_new_role_mobile">Ruoli esclusivi sostenitori Nitro server</string>
-    <string name="premium_guild_features_new_role_title">Nuovo ruolo esclusivo</string>
-    <string name="premium_guild_features_show_support_description">I sostenitori ottengono un nuovo fiammeggiante badge del profilo che cambia in base al contributo che danno.</string>
     <string name="premium_guild_features_show_support_mobile">Un nuovo badge del profilo che cambia nel tempo</string>
-    <string name="premium_guild_features_show_support_title">Mostra il tuo sostegno</string>
     <string name="premium_guild_features_title">Con Nitro, puoi aiutare a potenziare un server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Dimensioni di caricamento aumentate per tutta la community</string>
-    <string name="premium_guild_features_upload_sizes_title">Dimensioni di caricamento maggiori per tutti</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Abbonati a Nitro per inviare un Potenziamento Nitro a un server! [Scopri di più sul potenziamento server Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Aggiorna il tuo abbonamento per inviare un Potenziamento Nitro a un server! [Scopri di più sul potenziamento server Nitro.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Nessun Potenziamento Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Nessun livello</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Potenziamento server Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">I benefici del server potenziato includono:</string>
-    <string name="premium_guild_perks_modal_blurb">"Ad ogni livello raggiunto, i membri di questo server contribuiranno a sbloccare benefici per tutti. Questi benefici saranno attivi solo all'interno del server.
-
- **I sostenitori otterranno varie ricompense: un'icona Lista dei membri, un badge in continua evoluzione, e un ruolo unico da sostenitore.**
-
- [Scopri di più sul Potenziamento del server Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">"Ad ogni livello raggiunto, i membri di questo server contribuiranno a sbloccare benefici per tutti. Questi benefici saranno attivi solo all'interno del server."</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">"**I sostenitori otterranno varie ricompense: un'icona Lista dei membri, un badge in continua evoluzione, e un ruolo unico da sostenitore.** [Scopri di più sul Potenziamento del server Nitro.](%1$s)"</string>
     <string name="premium_guild_perks_modal_button_get_premium">Ottieni Nitro per effettuare potenziamenti!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Potenzia questo server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">"Fai l'upgrade a Nitro per effettuare potenziamenti!"</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">"Al momento non supportiamo l'upgrade a Nitro per abbonamenti con Apple. Puoi cancellare il tuo abbonamento con [Gestione abbonamento apple](%1$s), ma l'abbonamento rimarrà attivo fino alla sua data di scadenza."</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Il potenziamento dei server non è incluso in Nitro Classic</string>
     <string name="premium_guild_perks_modal_header">Stato potenziamento del server</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** Potenziamenti</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Gestisci il tuo potenziamento</string>
     <string name="premium_guild_perks_modal_no_tiers">Nessun livello ancora raggiunto</string>
@@ -3407,44 +3366,32 @@ Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s hanno potenziato questo server</string>
     <string name="premium_guild_settings_members_subscribed_needed">Hai bisogno di **%1$s** per sbloccare %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Sei sicuro di voler inviare un Potenziamento Nitro a:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Seleziona questo server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">"Seleziona questo server. Ci vorrà un po' di tempo per far attivare il tuo potenziamento."</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Potenziare questo server ti impedirà di potenziare un altro server per %1$s. Rimuovere il tuo potenziamento non influirà sul periodo di ricarica.**</string>
     <string name="premium_guild_subscribe_confirm_header">Scegli bene!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Cerca server</string>
     <string name="premium_guild_subscribe_select_guild_header">Seleziona un server</string>
     <string name="premium_guild_subscribe_success_thanks">Grazie per il potenziamento!</string>
     <string name="premium_guild_subscription_available_count">Hai **%1$s** a disposizione!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Si è verificato un errore nel tentativo di effettuare un potenziamento. Riprova.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Ti trovi ancora nel periodo di ricarica, vero? Devi Aspettare ancora **%1$s e %2$s** prima di riprovare</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Ti trovi ancora nel periodo di ricarica, vero? Devi Aspettare ancora **%1$s e %2$s** prima di riprovare</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Ti trovi ancora nel periodo di ricarica. Devi aspettare **%1$s** prima di riprovare</string>
     <string name="premium_guild_subscription_no_next_tier">Il livello di questo server è più di 9.000! Continua a potenziarlo!</string>
-    <string name="premium_guild_subscription_notice">I potenziamenti Server Nitro sono arrivati! Raduna la tua community per potenziare il tuo server.</string>
     <string name="premium_guild_subscription_notice_button">Visualizza livelli e benefici</string>
-    <string name="premium_guild_subscription_notice_small_guild">I potenziamenti Server Nitro sono arrivati! Raduna i tuoi amici per potenziare il tuo server.</string>
     <string name="premium_guild_subscription_remove_button">Rimuovi potenziamento</string>
     <string name="premium_guild_subscription_remove_error_mobile">Si è verificato un errore nel tentativo di rimuovere il potenziamento. Riprova.</string>
     <string name="premium_guild_subscription_select_server_button">Seleziona un server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Usa i tuoi poteri Nitro per potenziare un server a cui ti sei unito! Potenziare un server lo farà scalare tra i vari livelli. Ogni livello concede benefici collettivi per l'intero server.
- Potenziare un server, innescherà un periodo di ricarica di 7 giorni. Durante questo lasso di tempo, non potrai potenziare un altro server; ciò ti sarà impossibile anche se dovessi rimuovere il tuo potenziamento. [Scopri di più sul potenziamento server Nitro](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">"Usa i tuoi poteri Nitro per potenziare il server a cui ti sei unito! Potenziare un server lo farà scalare tra i vari livelli. Ogni livello concede benefici collettivi per l'intero server."</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Potenziare un server innescherà un periodo di ricarica di 7 giorni. Durante questo lasso di tempo non potrai potenziare un altro server; ciò ti sarà impossibile anche se dovessi rimuovere il tuo potenziamento. [Scopri di più sul potenziamento server Nitro](%1$s)</string>
-    <string name="premium_guild_subscription_title">Potenziamento server Nitro</string>
-    <string name="premium_guild_subscription_tooltip">Potenziamento Nitro effettuato il %1$s</string>
+    <string name="premium_guild_tier_0">Nessun livello</string>
     <string name="premium_guild_tier_1">Livello 1</string>
     <string name="premium_guild_tier_2">Livello 2</string>
     <string name="premium_guild_tier_3">Livello 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Sei sicuro di voler rimuovere il tuo Potenziamento Nitro da:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Sì, rimuovi potenziamento</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Questo server perderà i progressi compiuti se rimuovi il tuo potenziamento.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Questo server perderà i progressi compiuti se rimuovi il tuo potenziamento. **Ti trovi nel periodo di ricarica, potrai effettuare di nuovo potenziamenti tra %1$s e %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Questo server perderà progressi se rimuovi il tuo potenziamento. **Ti trovi nel periodo di ricarica, potrai effettuare di nuovo potenziamenti tra %1$s e %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Questo server perderà progressi se rimuovi il tuo potenziamento. **Ti trovi nel periodo di ricarica, potrai effettuare di nuovo potenziamenti tra %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Vuoi rimuovere il Potenziamento Nitro?</string>
     <string name="premium_included">Incluso con Nitro:</string>
     <string name="premium_info_monthly">%1$s (mensile) avverrà il giorno %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Mese</string>
@@ -3457,7 +3404,6 @@ Potrai rinnovare l'abbonamento in qualunque momento."</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_button_iap">Ottieni %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Ok, va bene</string>
-    <string name="premium_payment_gift_blurb">Regala [Nitro](onClick) ai tuoi amici per fargli ottenere benefici della chat superpotenti e un potenziamento del server.</string>
     <string name="premium_payment_gift_blurb_mobile">Regala Nitro a qualcuno per dagli accesso a benefici della chat esagerati e al potenziamento dei server. [Scopri di più su Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Il costo ti verrà addebitato solo una volta per il periodo di tempo da te scelto. Pertanto non sarai addebitato mensilmente.</string>
     <string name="premium_payment_is_gift">Stai comprando un regalo.</string>
@@ -3472,7 +3418,6 @@ Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mensile</string>
     <string name="premium_plan_month_tier_2">Nitro mensile</string>
     <string name="premium_promo_autocomplete">Usa le emoji personalizzate 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 delle tue emoji?"</string>
     <string name="premium_required">Nitro necessario</string>
     <string name="premium_required_get_nitro">Prendi Nitro!</string>
@@ -3491,25 +3436,9 @@ Potrai rinnovare l'abbonamento in qualunque momento."</string>
     <string name="premium_tier_2_title">"Ottieni un'esperienza Discord migliorata a un prezzo mensile contenuto."</string>
     <string name="premium_trial_button">Inizia il tuo periodo di prova</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!!!
-
-Ripartiremo il tuo piano corrente e sarà detratto dal costo annuale. Ti saranno addebitati **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Fai l'upgrade all'abbonamento annuale e risparmia: due mesi sono gratis. Che affare!!!
-
-Ripartiremo il tuo piano corrente e sarà detratto dal costo annuale. Ti saranno addebitati **%1$s** ora, e **%2$s/anno dopo il periodo di fatturazione.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Migliora il tuo %1$s piano (mensile) e ottieni la possibilità di potenziare i tuoi server. Il tuo nuovo piano partirà immediatamente.
-
- Ripartiremo il tuo piano attuale e lo dedurremo dal costo mensile. L'addebito sarà di **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Migliora il tuo %1$s piano (mensile) e ottieni la possibilità di potenziare i tuoi server. Il tuo nuovo piano partirà immediatamente.
-
- Ripartiremo il tuo piano attuale e lo dedurremo dal costo mensile. Il tuo addebito sarà ora di **%2$s**, e di **%3$s/mese dopo il periodo di fatturazione attuale.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Migliora il tuo %1$s piano (mensile) e ottieni la possibilità di potenziare i tuoi server. Il tuo nuovo piano partirà immediatamente.
 
 Ripartiremo il tuo piano attuale e lo dedurremo dal costo annuale. L'addebito sarà di **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Migliora il tuo %1$s piano (mensile) e ottieni la possibilità di potenziare i tuoi server. Il tuo nuovo piano partirà immediatamente.
-
-Ripartiremo il tuo piano attuale e lo dedurremo dal costo annuale. Il tuo addebito sarà ora di **%2$s**, e di **%3$s/anno dopo il periodo di fatturazione attuale.**"</string>
-    <string name="premium_upgrade_confirm_button_with_price">"Fai l'upgrade ora per - %1$s"</string>
     <string name="premium_upgrade_confirm_title">"Fai l'upgrade a %1$s"</string>
     <string name="premium_upgrade_disabled_already_premium">Non puoi iscriverti se possiedi già Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Il tuo piano attuale.</string>
@@ -4065,8 +3994,6 @@ Procedere?"</string>
     <string name="stop_streaming">Interrompi lo streaming</string>
     <string name="stop_watching">Smetti di guardare</string>
     <string name="store_channel">Canale negozio</string>
-    <string name="store_payment_legalese_monthly">"Ehi! Acquistando %1$s, dichiari di aver letto e accettato i nostri [Termini di Servizio](%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](%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>
diff --git a/com.discord/res/values-ja/plurals.xml b/com.discord/res/values-ja/plurals.xml
index 3d7b0a35d2..0dbd2879fb 100644
--- a/com.discord/res/values-ja/plurals.xml
+++ b/com.discord/res/values-ja/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d 年</item>
         <item quantity="one">%d 年</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d 月</item>
-        <item quantity="one">%d 月</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d 年</item>
-        <item quantity="one">%d 年</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">月</item>
         <item quantity="one">月</item>
@@ -466,16 +458,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d 個の共通サーバー</item>
-        <item quantity="zero">0 個の共通サーバー</item>
-        <item quantity="one">1 個の共通サーバー</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d日</item>
         <item quantity="one">1日</item>
@@ -550,10 +532,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d さらにブースト</item>
         <item quantity="one">%d さらにブースト</item>
@@ -566,15 +544,11 @@
         <item quantity="other">%d ブースト</item>
         <item quantity="one">%d ブースト</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d 日</item>
-        <item quantity="one">%d 日</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d 個のサーバーブースト</item>
         <item quantity="one">%d 個のサーバーブースト</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d 月</item>
         <item quantity="one">%d 月</item>
     </plurals>
@@ -598,10 +572,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <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 05ad9b7740..e957cdc2e0 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -635,7 +635,6 @@
     <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>
@@ -693,8 +692,6 @@
     <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_source_invalid">このお支払い源は無効です。</string>
     <string name="billing_payment_sources">お支払い方法</string>
     <string name="billing_payment_table_header_amount">金額</string>
@@ -712,13 +709,11 @@
     <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>
@@ -740,6 +735,10 @@
     <string name="billing_step_review">確認</string>
     <string name="billing_step_select_plan">プランを選択してください</string>
     <string name="billing_subscribe">登録</string>
+    <string name="billing_switch_plan_change">プランを変更する</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">分かった！</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">素敵！</string>
+    <string name="billing_switch_plan_upgrade">アップグレード</string>
     <string name="billing_tag_failed">失敗</string>
     <string name="billing_tag_pending">保留中</string>
     <string name="billing_tag_refunded">返金済み</string>
@@ -1801,11 +1800,8 @@
     <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_nitro_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_success_premium_tier_2_monthly">別の寛大な人のおかげで、 %1$sの間、強化されたチャット特典およびサーバーブーストにアクセスできるようになりました。</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2159,9 +2155,7 @@
     <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>
@@ -2178,16 +2172,12 @@
     <string name="guild_settings_overview_boost_unlocked">Tier %1$s 特典はロック解除されています</string>
     <string name="guild_settings_overview_notice">注意！保存していない変更があります！</string>
     <string name="guild_settings_overview_tier_info">これがTier%1$sNitroの特長です。[tier 状態を確認する](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"アクティブなNitro購読者であるサーバーのメンバーは、Nitroステータスを付与することでレベルのロック解除を支援できます。
-各レベルに到達するごとに、サーバーのメンバーは全員の特典をロック解除できます。
-
-メンバーはいつでもブーストを取り消すことができます。
-**レベルが失われた場合、サーバーは特典を3日間保持します。**[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_title">サーバーのブースト状態</string>
     <string name="guild_settings_premium_guild_unlocked">ロック解除されています</string>
+    <string name="guild_settings_premium_upsell_learn_more">Discord Nitroの詳細</string>
     <string name="guild_settings_server_banner">サーバーバナー</string>
     <string name="guild_settings_server_invite_background">サーバー招待の背景</string>
     <string name="guild_settings_splash_info">ユーザーがサーバーへの招待を受けると、この画像が表示されます。</string>
@@ -2197,6 +2187,7 @@
 
 あなたのサイトを閲覧することができるユーザーにアクセスできる場合、&amp;username=の形でクエリを渡すことで、動的にメンバーを追加することができます。"</string>
     <string name="guild_settings_widget_enable_widget">サーバーウィジェットを有効化</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">購入の詳細</string>
     <string name="guild_verification_text_account_age">このサーバーでは、%1$s分以上前に作成されたアカウントのみメッセージを送信できます。</string>
     <string name="guild_verification_text_member_age">このサーバーでは、参加してから%1$s分以上経過したメンバーのみメッセージを送信できます。</string>
     <string name="guild_verification_text_not_claimed">このサーバーでメッセージを送信するにはこのアカウントを確認する必要があります。</string>
@@ -2547,10 +2538,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="ios_media_keyboard_take_a_photo">写真を撮る</string>
     <string name="ios_notification_see_full">タップしてメッセージ全文を読みます。</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="ios_view_all">全て表示</string>
     <string name="ip_address_secured">IPアドレスは保護されています</string>
@@ -2869,7 +2856,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="network_error_unknown">不明なネットワークエラーが発生しました。</string>
     <string name="network_error_unknown_host">ネットワーク エラーが発生しました。DNS設定を確認してやり直してください。</string>
     <string name="network_offline">ネットワーク接続が制限を受けているか利用できません。</string>
-    <string name="nevermind">やめる</string>
     <string name="new_dm">新規ダイレクトメッセージ</string>
     <string name="new_group_dm">新規グループDM</string>
     <string name="new_guilds_dm_allowed">サーバーにいるメンバーからのダイレクトメッセージを許可する。</string>
@@ -2993,7 +2979,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="notice_no_input_detected_help_link_text">助けて！</string>
     <string name="notice_no_input_detected_settings">Discordでお使いのマイクの入力を検出していないようです。修正しましょう。</string>
     <string name="notice_no_input_detected_settings_link_text">設定を見る</string>
-    <string name="notice_premium_grandfathered_ended">Nitroへのアクセスは期限切れになっています。Nitro ClassicからNitroにアップグレードすると、非常に強化されたチャット特典とサーバーブーストを取得できます。</string>
     <string name="notice_premium_grandfathered_ending">Nitroの残り時間：%1$s。**%2$s**にNitro Classicサブスクリプションにダウングレードします。</string>
     <string name="notice_premium_promo_action">お試しください</string>
     <string name="notice_premium_promo_message">Discordの開発をサポートし、楽しい特典を手に入れよう！</string>
@@ -3227,7 +3212,7 @@ 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_button_premium_gift">%1$sを購入</string>
+    <string name="payment_modal_button_premium_gift">ギフトを購入</string>
     <string name="payment_modal_one_month">1月</string>
     <string name="payment_modal_one_year">1年</string>
     <string name="payment_modal_per_month">月額</string>
@@ -3339,9 +3324,6 @@ Discordについて詳しい情報が必要ですか？"</string>
 いつでもサブスクリプションを再開できます。"</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">"キャンセルは、お客さまの現在の請求期間終了時に有効になります。**%1$s**に、Nitroへのアクセスを失い、Discord Tagをご変更されている場合はタグがランダムになり、サーバーブーストが削除されます。
-
-いつでもサブスクリプションを再開できます。"</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">キャンセルは、お客さまの現在の請求期間終了時に有効になります。**%1$s**に、Nitroへのアクセスを失い、Discord Tagをご変更されている場合はタグがランダムになり、サーバーブーストが削除されます。</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">いつでも購読を再開できます。</string>
     <string name="premium_cancel_confirm_mobile">Nitroをキャンセルする</string>
@@ -3364,7 +3346,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="premium_chat_perks_description_streaming">Nitroのソースの配信を利用できます。Nitro Classic購読者は鮮明な最高1080p/60fpsを利用できます。</string>
     <string name="premium_chat_perks_description_upload_limit">アップロードファイルサイズはNitroでは%1$sから%2$sまで、Nitro Classicでは%3$sです。</string>
     <string name="premium_chat_perks_premium_guild_subscription">お気に入りのサーバーをブーストしましょう！</string>
-    <string name="premium_chat_perks_simple_title">シンプルに、サーバーブーストなしで基本的なチャット特典を得ましょう。</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>
@@ -3403,41 +3384,20 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="premium_grandfathered_yearly">Discordをサポートいただき、ありがとうございます。2年間、Nitroにアクセスできます。アクセス権の終了日は**%1$s**です。</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_description">サーバー内でNitroサーバーブースターだけが入手できる特別なサーバーロールを取得する。</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_description">ブースターにより、変わり続ける輝く新しいプロフィールバッジが取得できます。</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購読してください！ [Nitroサーバーブーストの詳細](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Nitroブーストをサーバーに送信するには、購読をアップグレードしてください！ [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>
@@ -3450,44 +3410,32 @@ Discordについて詳しい情報が必要ですか？"</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_duration_mobile">%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">%1$sからNitroブースト中</string>
+    <string name="premium_guild_tier_0">レベルなし</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_month_subscription">月額 **%1$s%2$s %3$s**</string>
@@ -3500,7 +3448,6 @@ Discordについて詳しい情報が必要ですか？"</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">友だちに[Nitro](onClick)を贈り、超強力なチャット特典とサーバーブーストを手に入れましょう。</string>
     <string name="premium_payment_gift_blurb_mobile">誰かにNitroを贈り、超強力なチャット特典とサーバーブーストへのアクセスを許可しましょう。 [Nitroの詳細](onClick)</string>
     <string name="premium_payment_gift_subtext">これは、選択した時間に対する1回限りの料金になります。毎月請求されるものではありません。</string>
     <string name="premium_payment_is_gift">ギフトを購入しています。</string>
@@ -3515,7 +3462,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="premium_plan_month_tier_1">月間Nitro Classic</string>
     <string name="premium_plan_month_tier_2">月間Nitro</string>
     <string name="premium_promo_autocomplete">カスタム絵文字をどこでも使用可能</string>
-    <string name="premium_promo_description">Discord Nitroを始めて、アニメ&amp;カスタム絵文字をお好きなサーバーで使用しましょう。</string>
     <string name="premium_promo_title">更新された絵文字パワーはいかがですか？</string>
     <string name="premium_required">Nitroが必要です</string>
     <string name="premium_required_get_nitro">Nitroを入手しましょう！</string>
@@ -3534,26 +3480,10 @@ Discordについて詳しい情報が必要ですか？"</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">"年額制にアップグレードすると2カ月無料になります。
-
-お得です！現行のプランの割合が年間価格から差し引かれます。請求額は**%1$s**です。"</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"年額制にアップグレードすると2カ月無料になります。お得です！
-
-現行のプランを計算し、年間価格から差し引かれます。請求価格は**%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_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>
@@ -4112,8 +4042,6 @@ Discordについて詳しい情報が必要ですか？"</string>
     <string name="stop_streaming">配信を中止</string>
     <string name="stop_watching">視聴を中止</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">Go Live</string>
     <string name="stream_bad_spectator">現在、視聴中の配信は動画あるいは音声の品質を落としています。ネットワークの状態が原因かもしれません。</string>
     <string name="stream_bad_streamer">現在、映像あるいは音声の品質を落として配信しています。ネットワークの状態によるものかもしれません。</string>
diff --git a/com.discord/res/values-ko/plurals.xml b/com.discord/res/values-ko/plurals.xml
index 608e6dd218..15d407994b 100644
--- a/com.discord/res/values-ko/plurals.xml
+++ b/com.discord/res/values-ko/plurals.xml
@@ -310,14 +310,6 @@
         <item quantity="other">%d년</item>
         <item quantity="one">%d년</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d개월</item>
-        <item quantity="one">%d개월</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d년</item>
-        <item quantity="one">%d년</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">개월</item>
         <item quantity="one">개월</item>
@@ -478,16 +470,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">같이 있는 서버 %d개</item>
-        <item quantity="zero">같이 있는 서버 0개</item>
-        <item quantity="one">같이 있는 서버 1개</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d일</item>
         <item quantity="one">1일</item>
@@ -569,10 +551,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d번 더</item>
         <item quantity="one">%d번 더</item>
@@ -585,15 +563,11 @@
         <item quantity="other">%d 부스트</item>
         <item quantity="one">%d 부스트</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d일</item>
-        <item quantity="one">%d일</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d번</item>
         <item quantity="one">%d번</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d개월</item>
         <item quantity="one">%d개월</item>
     </plurals>
@@ -617,10 +591,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d일</item>
         <item quantity="one">%d일</item>
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index f93c7b1670..aa7b1f37bb 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -640,7 +640,6 @@
     <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>
@@ -696,8 +695,6 @@
     <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_source_invalid">이 결제 수단은 유효하지 않아요.</string>
     <string name="billing_payment_sources">결제 방식</string>
     <string name="billing_payment_table_header_amount">금액</string>
@@ -715,13 +712,11 @@
     <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>
@@ -743,6 +738,10 @@
     <string name="billing_step_review">검토하기</string>
     <string name="billing_step_select_plan">플랜 선택하기</string>
     <string name="billing_subscribe">구독하기</string>
+    <string name="billing_switch_plan_change">플랜 변경하기</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">알겠어요!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">좋아요!</string>
+    <string name="billing_switch_plan_upgrade">업그레이드</string>
     <string name="billing_tag_failed">실패함</string>
     <string name="billing_tag_pending">대기 중</string>
     <string name="billing_tag_refunded">환불됨</string>
@@ -1802,11 +1801,8 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <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_nitro_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_success_premium_tier_2_monthly">마음씨 좋으신 분 덕분에 %1$s 동안 향상된 채팅 특전과 서버 부스트를 이용할 수 있어요.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2161,9 +2157,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <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>
@@ -2180,16 +2174,12 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
     <string name="guild_settings_overview_boost_unlocked">티어 %1$s 특전 잠금 해제됨</string>
     <string name="guild_settings_overview_notice">조심하세요! 저장하지 않은 변경 사항이 있어요!</string>
     <string name="guild_settings_overview_tier_info">이건 티어 %1$s Nitro 기능이에요. [티어 상태 확인하기](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Nitro 구독이 있는 서버의 멤버가 Nitro 상태를 수여하면 레벨을 잠금 해제하도록 도울 수 있어요.
-레벨이 오를 때마다 서버의 멤버가 모두가 사용할 수 있도록 특전을 잠금 해제할 수 있어요.
-
-멤버는 언제든지 부스트를 취소할 수 있어요.
-**레벨이 내려가도 3일 동안 특전을 이용할 수 있어요. **[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_title">서버 부스트 상태</string>
     <string name="guild_settings_premium_guild_unlocked">잠금 해제됨</string>
+    <string name="guild_settings_premium_upsell_learn_more">Discord Nitro 자세히 알아보기</string>
     <string name="guild_settings_server_banner">서버 배너</string>
     <string name="guild_settings_server_invite_background">서버 초대 배경</string>
     <string name="guild_settings_splash_info">서버 초대장에 표시되는 이미지예요.</string>
@@ -2199,6 +2189,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
 
 사이트 사용자에 대한 액세스 권한이 있다면 쿼리스트링에 &amp;username=을 동적으로 추가할 수 있어요."</string>
     <string name="guild_settings_widget_enable_widget">서버 widget 활성화</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">구매 상세 내역</string>
     <string name="guild_verification_text_account_age">계정 생성 후 최소 %1$s분이 지나야 이 서버에 메시지를 보낼 수 있어요.</string>
     <string name="guild_verification_text_member_age">이 서버의 멤버가 된 후 %1$s분이 지나야 메시지를 보낼 수 있어요.</string>
     <string name="guild_verification_text_not_claimed">이 서버에 메시지를 보내려면 계정을 확인 및 인증해야 해요.</string>
@@ -2547,10 +2538,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="ios_media_keyboard_take_a_photo">사진 찍기</string>
     <string name="ios_notification_see_full">메시지 전체를 보려면 탭하세요.</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="ios_view_all">모두 보기</string>
     <string name="ip_address_secured">IP 주소 보호 중</string>
@@ -2871,7 +2858,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="network_error_unknown">알 수 없는 네트워크 오류가 발생했어요.</string>
     <string name="network_error_unknown_host">네트워크 오류가 발생했어요. DNS 설정을 확인하고 다시 시도해 주세요.</string>
     <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>
@@ -2996,7 +2982,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="notice_no_input_detected_help_link_text">도와줘요!</string>
     <string name="notice_no_input_detected_settings">Discord가 마이크 입력을 감지하지 못했어요. 해결해 보자고요!</string>
     <string name="notice_no_input_detected_settings_link_text">설정 보기</string>
-    <string name="notice_premium_grandfathered_ended">Nitro 이용권이 만료되었어요. Nitro Classic에서 Nitro로 업그레이드하여 슈퍼 파워 채팅 특전과 서버 부스트를 받아보세요.</string>
     <string name="notice_premium_grandfathered_ending">Nitro가 %1$s 남았어요! **%2$s**부터 구독 플랜이 Nitro Classic으로 낮아질 거예요.</string>
     <string name="notice_premium_promo_action">한번 사용해봐요!</string>
     <string name="notice_premium_promo_message">Discord의 개발을 지원하고 재미있는 특전을 받아보세요!</string>
@@ -3230,7 +3215,7 @@ 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_button_premium_gift">%1$s 구입하기</string>
+    <string name="payment_modal_button_premium_gift">선물 구입하기</string>
     <string name="payment_modal_one_month">1달</string>
     <string name="payment_modal_one_year">1년</string>
     <string name="payment_modal_per_month">매월</string>
@@ -3342,9 +3327,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
 구독은 언제든 재시작할 수 있어요."</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">"취소는 현재 청구 기간 최종일에 실행돼요. **%1$s**부터 Nitro를 이용할 수 없고, Discord Tag를 변경했다면 태그는 무작위로 정해지고, 서버 부스트도 사라져요.
-
-구독은 언제든 재시작할 수 있어요."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">취소는 현재 청구 기간 최종일에 실행돼요. **%1$s**부터 Nitro를 이용할 수 없고, Discord Tag를 변경했다면 태그는 무작위로 정해지고, 서버 부스트도 사라져요.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">구독은 언제든 재시작할 수 있어요.</string>
     <string name="premium_cancel_confirm_mobile">Nitro 취소하기</string>
@@ -3368,7 +3350,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_chat_perks_description_streaming">Nitro는 소스 품질, Nitro Classic은 최대 1080p 60FPS로 방송할 수 있어요.</string>
     <string name="premium_chat_perks_description_upload_limit">업로드 가능한 파일 사이즈가 %1$s에서 Nitro는%2$s, Nitro Classic은 %3$s로 커져요.</string>
     <string name="premium_chat_perks_premium_guild_subscription">좋아하는 서버를 부스트하세요!</string>
-    <string name="premium_chat_perks_simple_title">서버 부스트 없이 심플한 기본 채팅 특전을 받을 수 있어요.</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>
@@ -3407,41 +3388,20 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_grandfathered_yearly">Discord에 아낌없는 애정을 보여주신 것에 감사드리는 의미로, 2년 Nitro 이용권을 드려요. 이 이용권은 **%1$s**에 만료돼요.</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_description">내 서버의 Nitro 서버 부스터만 이용할 수 있는 특별한 서버 역할을 받으세요.</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_description">부스터는 부스트 횟수에 따라 변하는 근사한 프로필 배지를 받을 수 있어요.</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 부스트하세요! [Nitro 서버 부스팅에 대해 자세히 알아보세요.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">서버를 Nitro 부스트하려면 구독을 업그레이드하세요! [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>
@@ -3454,44 +3414,32 @@ Discord에 대해 더 알고 싶으신가요?"</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_duration_mobile">%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_0">레벨 없음</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_month_subscription">매월 **%1$s%2$s %3$s**</string>
@@ -3504,7 +3452,6 @@ Discord에 대해 더 알고 싶으신가요?"</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">친구에게 [Nitro](onClick)를 선물하여 슈퍼 파워 채팅 특전과 서버 부스트를 이용할 수 있도록 해주세요.</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>
@@ -3519,7 +3466,6 @@ Discord에 대해 더 알고 싶으신가요?"</string>
     <string name="premium_plan_month_tier_1">Nitro Classic 월정액</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">Nitro 설치하기!</string>
@@ -3538,26 +3484,10 @@ Discord에 대해 더 알고 싶으신가요?"</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">"연간 플랜으로 업그레이드하고 2개월 무료 혜택을 받으세요. 초특가 핫딜!!!
-
-이번 달 구독을 연간 구독에 포함시켜 연간 비용에서 그만큼 절감돼요. 총 청구 금액은 **%1$s**이에요."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"연간 플랜으로 업그레이드하고 2개월 무료 혜택을 받으세요. 초특가 핫딜!!!
-
-이번 달 구독을 연간 구독에 포함해 연간 비용에서 그만큼 절감돼요. 지금 청구 금액은 **%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_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>
@@ -4120,8 +4050,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
     <string name="stop_streaming">방송 중지</string>
     <string name="stop_watching">그만 보기</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 구독은 반복 구독 상품이에요. 즉, 오늘 구독료를 청구하고 1년 뒤에 사용자가 구독을 취소하지 않았다면 다시 구독료를 청구하는 방식이에요. 구독은 사용자 설정 화면에서 언제든지 취소할 수 있어요.</string>
     <string name="stream">Go Live</string>
     <string name="stream_bad_spectator">시청 중인 방송의 영상 또는 오디오 품질이 낮아요. 네트워크 상태 문제일 수 있어요.</string>
     <string name="stream_bad_streamer">방송 중인 영상 또는 오디오 품질이 낮아요. 네트워크 상태 문제일 수 있어요.</string>
diff --git a/com.discord/res/values-lt/plurals.xml b/com.discord/res/values-lt/plurals.xml
index fc87e3a343..69b0ad45db 100644
--- a/com.discord/res/values-lt/plurals.xml
+++ b/com.discord/res/values-lt/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d m.</item>
         <item quantity="one">%d m.</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d mėn</item>
-        <item quantity="one">%d mėnesį</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d m</item>
-        <item quantity="one">%d metus</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">mėn.</item>
         <item quantity="one">mėn.</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d naudojimų</item>
         <item quantity="one">%d naudojimo</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d bendri (-ų) draugai (-ų)</item>
-        <item quantity="zero">0 bendrų draugų</item>
-        <item quantity="one">1 bendras draugas</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d bendri (-ų) serveriai (-ių)</item>
-        <item quantity="zero">0 bendrų serverių</item>
-        <item quantity="one">1 bendras serveris</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dienas(-ų)</item>
         <item quantity="one">1 dieną</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d mėnesių</item>
         <item quantity="one">1 mėnesiui</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d stiprinimus</item>
-        <item quantity="one">%d stiprinimą</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d stiprinimų</item>
         <item quantity="one">%d stiprinimo</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d stiprinimai (-ų)</item>
         <item quantity="one">%d stiprinimas</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d d.</item>
-        <item quantity="one">%d d.</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d Yra serverio stiprinimų</item>
         <item quantity="one">%d serverio stiprinimą</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d mėn.</item>
         <item quantity="one">%d mėn.</item>
     </plurals>
@@ -597,10 +571,6 @@
         <item quantity="other">%d min.</item>
         <item quantity="one">%d min.</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** stiprinimai (-ų)</item>
-        <item quantity="one">**%d** stiprinimas</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d d.</item>
         <item quantity="one">%d d.</item>
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index cd9733b290..a8931738a0 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -627,7 +627,6 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing">Atsiskaitymas</string>
     <string name="billing_accept_terms_tooltip">Norėdamas tęsti, sutik su paslaugų teikimo sąlygomis</string>
     <string name="billing_account_credit">Sąskaitos kreditas</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s mėn. nemokamai</string>
     <string name="billing_add_payment_method">Pridėti Mokėjimo Būdą</string>
     <string name="billing_address">Atsiskaitymo Adresas</string>
     <string name="billing_address_address">Adresas</string>
@@ -684,8 +683,6 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing_payment_choose_plan">Pasirinkti planą</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ų [Paslaugų teikimo sąlygos](%2$s). %1$s yra automatiškai atkuriama prenumerata. Suteiki leidimą Discord nedelsiant pritaikyti mokėjimo metodą, nurodytą %3$s, ir kas mėnesį toliau automatiškai tai daryti, kol atšauksi. Atšaukti gali bet kada.</string>
-    <string name="billing_payment_premium_legalese_yearly">Įsigydamas %1$s prenumeratą, sutinki su mūsų [Paslaugų teikimo sąlygos](%2$s). %1$s yra automatiškai atkuriama prenumerata. Suteiki leidimą Discord nedelsiant pritaikyti mokėjimo metodą, nurodytą %3$s, ir kasmet toliau automatiškai tai daryti, kol atšauksi. Atšaukti gali bet kada.</string>
     <string name="billing_payment_source_invalid">Šis mokėjimo šaltinis negalioja.</string>
     <string name="billing_payment_sources">Mokėjimo Būdai</string>
     <string name="billing_payment_table_header_amount">Suma</string>
@@ -703,13 +700,11 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing_price_per_month_current_plan">(DABARTINIS PLANAS) %1$s/mėn.</string>
     <string name="billing_price_per_month_current_plan_ios">(Dabartinis planas) %1$s/mėn.</string>
     <string name="billing_price_per_month_mobile">%1$s/mėn.</string>
-    <string name="billing_price_per_month_upgrade">Naujovinti %1$s / Mėnuo</string>
     <string name="billing_price_per_year">%1$s / Metams</string>
     <string name="billing_price_per_year_current_plan">(DABARTINIS PLANAS) %1$s/m.</string>
     <string name="billing_price_per_year_current_plan_ios">(Dabartinis planas) %1$s/m.</string>
     <string name="billing_price_per_year_mobile">%1$s/m.</string>
     <string name="billing_price_per_year_months_free">%1$s / metams (2 mėnesiai nemokamai)</string>
-    <string name="billing_price_per_year_upgrade">Naujovink %1$s / Metai</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>
@@ -731,6 +726,10 @@ bet jei turi tai padaryti, nedvejok!"</string>
     <string name="billing_step_review">Peržiūra</string>
     <string name="billing_step_select_plan">Pasirinkti planą</string>
     <string name="billing_subscribe">Prenumeruoti</string>
+    <string name="billing_switch_plan_change">Keisti Planą</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Supratau!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Puiku!</string>
+    <string name="billing_switch_plan_upgrade">Pagerinti</string>
     <string name="billing_tag_failed">Nepavyko</string>
     <string name="billing_tag_pending">Laukiama</string>
     <string name="billing_tag_refunded">Lėšų grąžinimas</string>
@@ -1783,11 +1782,8 @@ programėlei Discord, norėdamas keisti įvesties jautrumą."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Dėl kito dosnaus žmogaus dabar turi %1$s %2$s</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Dėl kito dosnaus žmogaus dabar turi %1$s %2$s</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** buvo pridėta į tavo biblioteką.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Dėl dosnaus žmogaus dabar turi prieigą prie patobulintų pokalbių pranašumų ir serverio stiprinimo, kuris galios %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Dėl dosnaus žmogaus dabar turi prieigą prie patobulintų pokalbių pranašumų %1$s</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Dėl dosnaus žmogaus dabar turi prieigą prie patobulintų pokalbių pranašumų %1$s</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Dėl dosnaus žmogaus dabar turi prieigą prie patobulintų pokalbių pranašumų ir serverio stiprinimo, kuris galios %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Dėl dosnaus žmogaus dabar turi prieigą prie patobulintų pokalbių pranašumų ir serverio stiprinimo, kuris galios %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Kažkas nutiko, todėl mums nepavyko išsaugoti krepšelio…bandyti dar kartą?</string>
     <string name="gift_confirmation_button_confirm">O taip! Pridėti į biblioteką</string>
     <string name="gift_confirmation_button_confirm_mobile">Duok man</string>
@@ -2140,9 +2136,7 @@ Pasitraukė: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s serverio emoji vietos (iš viso %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s įkėlimo riba visiems nariams</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Stiprinamo serverio pranašumai –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Niekas dar nepadovanojo Nitro šiam serveriui. Sužinok, ar kokie nors nariai maloniai prisidėtų prie serverio, kad būtų galima gauti visame serveryje veikiančių Nitro pranašumų!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Stiprinami serveriai gauna visus ankstesnius ir –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Nitro stiprinimo nėra</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">1 lygio pranašumai</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">2 lygio pranašumai</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">3 lygio pranašumai</string>
@@ -2159,16 +2153,12 @@ Pasitraukė: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Atrakintas lygio %1$s pranašumas</string>
     <string name="guild_settings_overview_notice">Atsargiai! turi neišsaugotų pakeitimų!</string>
     <string name="guild_settings_overview_tier_info">Tai yra pakopinė %1$s Nitro funkcija. [Peržiūrėk savo lygio būseną](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Serverio nariai, turintys aktyvią Nitro prenumeratą, gali padėti atrakinti lygius dovanodami savo Nitro būseną.
-Naudodami kiekvieną pasiektą lygį, serverio nariai padės atrakinti pranašumus visiems.
-
-Nariai gali bet kada atšaukti savo stiprinimą.
-**Praradus lygį, pranašumus serveris išsaugos tris dienas. **[Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Iki kito lygio tereikia %1$s!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** stiprino šį serverį</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro serverio stiprinimo būsena</string>
+    <string name="guild_settings_premium_guild_title">Serverio stiprinimo būsena</string>
     <string name="guild_settings_premium_guild_unlocked">Atrakinta</string>
+    <string name="guild_settings_premium_upsell_learn_more">Sužinoti daugiau apie Discord Nitro</string>
     <string name="guild_settings_server_banner">Serverio reklamjuostė</string>
     <string name="guild_settings_server_invite_background">Serverio pakvietimo fonas</string>
     <string name="guild_settings_splash_info">Šis vaizdas bus rodomas naudotojams gavus pakvietimą į serverį.</string>
@@ -2178,6 +2168,7 @@ Nariai gali bet kada atšaukti savo stiprinimą.
 
 Jei turi priėjimą prie savo svetainės naudotojų, gali dinamiškai pridėti &amp;username= prie užklausos."</string>
     <string name="guild_settings_widget_enable_widget">Įgalinti Serverio Valdiklį</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Pirkimo informacija</string>
     <string name="guild_verification_text_account_age">Tavo paskyra turi būti bent %1$s minučių senumo, norint siųsti pranešimus šiame serveryje.</string>
     <string name="guild_verification_text_member_age">Tu turi būti nariu bent %1$s minučių, kad galėtum siųsti žinutes šiame serveryje.</string>
     <string name="guild_verification_text_not_claimed">Tu turi patvirtinti savo paskyrą prieš siųsdamas žinutes šiame serveryje.</string>
@@ -2526,10 +2517,6 @@ Nori daugiau sužinoti apie Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Fotografuoti</string>
     <string name="ios_notification_see_full">Paliesk, kad galėtum perskaityti visą pranešimą.</string>
     <string name="ios_profile_in_voice_call">Balso skambutyje</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Bendri draugai</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Bendri Serveriai</string>
     <string name="ios_profile_open_voice_channel">Atidaryti balso kanalą</string>
     <string name="ios_view_all">Peržiūrėti viską</string>
     <string name="ip_address_secured">IP Adresas Apsaugotas</string>
@@ -2847,7 +2834,6 @@ kanalus, kur jie abu, t. y. perkeliantis ir perkeliamas narys, turi prieigą."</
     <string name="network_error_unknown">Įvyko nežinoma tinklo klaida.</string>
     <string name="network_error_unknown_host">Įvyko tinklo klaida. Patikrink savo ryšį ir bandyk dar kartą.</string>
     <string name="network_offline">Tinklo ryšys ribotas arba nepasiekiamas.</string>
-    <string name="nevermind">Nesvarbu</string>
     <string name="new_dm">Nauja AŽ</string>
     <string name="new_group_dm">Nauja grupinė AŽ</string>
     <string name="new_guilds_dm_allowed">Leisti gauti asmenines žinutes iš serverio narių.</string>
@@ -2972,7 +2958,6 @@ jokių prisegtų žinučių… Kol kas."</string>
     <string name="notice_no_input_detected_help_link_text">Padėkite!</string>
     <string name="notice_no_input_detected_settings">Panašu, kad Discord programa negali aptikti tavo mikrofono. Pabandykime tai sutvarkyti!</string>
     <string name="notice_no_input_detected_settings_link_text">Apsilankymo nustatymai</string>
-    <string name="notice_premium_grandfathered_ended">Tavo prieiga prie Nitro baigė galioti. Atnaujink Nitro Classic į Nitro, kad gautum ypatingų pokalbių pranašumų ir sustiprintum serverį.</string>
     <string name="notice_premium_grandfathered_ending">Tau liko tik %1$s Nitro prenumeratos! **%2$s** turima prenumerata bus pakeista į Nitro Classic prenumeratą.</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>
@@ -3206,7 +3191,7 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
     <string name="payment_modal_button_change_card">Atnaujinti kredito kortelę</string>
     <string name="payment_modal_button_change_paypal">Atnaujink PayPal paskyrą</string>
     <string name="payment_modal_button_premium">Gauti %1$s</string>
-    <string name="payment_modal_button_premium_gift">Pirkti %1$s</string>
+    <string name="payment_modal_button_premium_gift">Pirkti dovaną</string>
     <string name="payment_modal_one_month">1 mėnuo</string>
     <string name="payment_modal_one_year">1 metai</string>
     <string name="payment_modal_per_month">Per mėnesį</string>
@@ -3315,9 +3300,6 @@ Be to, perdanga gali neveikti visiems. Jei turite problemų ar klausimų patikri
 Savo prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Atšaukimas įsigalios tavo dabartinio atsiskaitymo laikotarpio pabaigoje **%1$s**. Tavo žymė Discord Tag bus sumaišyta, jei ją pakeitei.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Atnaujinti prenumeratą gali bet kuriuo metu.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Atšaukimas įsigalios tavo dabartinio atsiskaitymo laikotarpio pabaigoje. **%1$s** neteksi prieigos prie Nitro, žymė Discord Tag bus paskirta atsitiktine tvarka, jei ją pakeitei, o serverio stiprinimas bus panaikintas.
-
- Prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Atšaukimas įsigalios tavo dabartinio atsiskaitymo laikotarpio pabaigoje. **%1$s** neteksi prieigos prie Nitro, žymė Discord Tag bus paskirta atsitiktine tvarka, jei ją pakeitei, o serverio stiprinimas bus panaikintas.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Atnaujinti prenumeratą gali bet kuriuo metu.</string>
     <string name="premium_cancel_confirm_mobile">Atšaukti Nitro</string>
@@ -3340,7 +3322,6 @@ Savo prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_chat_perks_description_streaming">Transliuok šaltinio kokybe naudodamas Nitro arba mėgaukis iki 1080p 60 kps kokybe naudodamas Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Pasirinkus Nitro, leidžiamo įkelti failo dydis padidinamas nuo %1$s iki %2$s, o pasirinkus Nitro Classic – iki %3$s.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Sustiprink mėgstamiausią serverį!</string>
-    <string name="premium_chat_perks_simple_title">Daryk viską paprastai – gauk pagrindinius pokalbių pranašumus nestiprindamas serverio.</string>
     <string name="premium_chat_perks_streaming_mobile">Geresnės Go Live transliacijos: transliuok šaltinio kokybe naudodamas Nitro arba mėgaukis iki 1080p 60 kps kokybe naudodamas Nitro Classic.</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>
@@ -3379,41 +3360,20 @@ Savo prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_grandfathered_yearly">Norėdami padėkoti už paramą Discord, dvejiems metams suteikiame prieigą prie Nitro. Tavo prieiga baigsis **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Stiprinimo atvėsimas: **%1$sd. %2$sval. %3$smin.**</string>
     <string name="premium_guild_features_blurb">Stiprinant serverį naudojant Nitro prenumeratą bus galima pereiti į naują lygį. Kaskart pasiekus naują lygį bus atrakinti nauji pokalbių pranašumai, **skirti kiekvienam tame serveryje!** Sužinok kelis iš tų puikių pranašumų:</string>
-    <string name="premium_guild_features_customize_guild_description">Atrakink pritaikymus, tokius kaip pakvietimo fonas, serverio reklamjuostė, unikalus adresas ir pan.</string>
     <string name="premium_guild_features_customize_guild_mobile">Serverio pritaikymai</string>
-    <string name="premium_guild_features_customize_guild_title">Serverio pritaikymai</string>
     <string name="premium_guild_features_learn_more_button">Sužinoti daugiau apie Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Mėgaukis patobulinta Discord patirtimi, kurios kaina prasideda nuo vieno nedidelio mėnesinio mokesčio.</string>
     <string name="premium_guild_features_more">Ir daugiau! Gali peržiūrėti dabartinį lygį, lygio pažangą ir galimus pranašumus serveryje.</string>
-    <string name="premium_guild_features_new_role_description">Gauk specialų serverio vaidmenį, kuris prieinamas tik Nitro serverio stiprintojams tavo serveryje.</string>
-    <string name="premium_guild_features_new_role_mobile">Išskirtiniai Nitro serverio stiprintojų vaidmenys</string>
-    <string name="premium_guild_features_new_role_title">Išskirtinis naujas vaidmuo</string>
-    <string name="premium_guild_features_show_support_description">Stiprintojai gauna naują žvilgantį profilio ženklelį, kuris keičiasi sulig jų pasiekimais.</string>
     <string name="premium_guild_features_show_support_mobile">Naujas profilio ženklelis, kuris keičiasi bėgant laikui</string>
-    <string name="premium_guild_features_show_support_title">Parodyk savo palaikymą</string>
     <string name="premium_guild_features_title">Naudodamas Nitro gali padėti stiprinti serverį!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Galimybė įkelti didesnius failus visai bendruomenei</string>
-    <string name="premium_guild_features_upload_sizes_title">Visi gali įkelti didesnius failus</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Užsiprenumeruok Nitro, kad į serverį nusiųstum Nitro stiprinimą! [Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Naujovink prenumeratą, kad į serverį nusiųstum Nitro stiprinimą! [Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Nitro stiprinimų nėra</string>
     <string name="premium_guild_header_badge_no_tier">Lygio nėra</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro serverio stiprinimas</string>
     <string name="premium_guild_perks_modal_base_perks">Stiprinamo serverio pranašumai –</string>
-    <string name="premium_guild_perks_modal_blurb">"Kaskart pasiekę naują lygį, šio serverio nariai padės atrakinti pranašumų visiems. Tie pranašumai galioja tik serveryje.
-
- **Stiprintojai gauna: narių sąrašo piktogramą, naują vystymosi ženkliuką ir tik stiprintojams skirtą vaidmenį.**
-
- [Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Kaskart pasiekę naują lygį, šio serverio nariai padės atrakinti pranašumų visiems. Tie pranašumai galioja tik serveryje.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Stiprintojai gauna: narių sąrašo piktogramą, naują vystymosi ženkliuką ir tik stiprintojams skirtą vaidmenį.** [Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Gauk Nitro, kad galėtum stiprinti!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Stiprinti šį serverį</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Naujovink į Nitro, kad galėtum stiprinti!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Šiuo metu per Apple gautoms prenumeratoms nepalaikome naujovinimų į Nitro. Prenumeratą gali atšaukti per [Apple prenumeratos valdymą](%1$s), tačiau prenumerata galios iki jos galiojimo pabaigos datos.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic nėra serverio stiprinimo galimybės</string>
     <string name="premium_guild_perks_modal_header">Serverio stiprinimo būsena</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** stiprinimų</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Tvarkykite stiprinimą</string>
     <string name="premium_guild_perks_modal_no_tiers">Dar nepasiekta jokių lygių</string>
@@ -3426,44 +3386,32 @@ Savo prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s sustiprino šį serverį</string>
     <string name="premium_guild_settings_members_subscribed_needed">Tau reikia dar **%1$s**, kad būtų atrakinta %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Ar tikrai nori nusiųsti Nitro stiprinimą:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Pasirinkti šį serverį</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Pasirink šį serverį. Reikės šiek tiek palaukti, kol stiprinimas įsigalios.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Stiprindamas šį serverį negalėsi stiprinti kito serverio %1$s Stiprinimo pašalinimas neturės poveikio atvėsimui.**</string>
     <string name="premium_guild_subscribe_confirm_header">Rinkis išmintingai!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Ieškoti serverių</string>
     <string name="premium_guild_subscribe_select_guild_header">Pasirinkti serverį</string>
     <string name="premium_guild_subscribe_success_thanks">Ačiū už stiprinimą!</string>
     <string name="premium_guild_subscription_available_count">Turi **%1$s**!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Bandant stiprinti įvyko klaida. Pabandyk dar kartą.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Atrodo, kad dabar įjungtas atvėsimas. Prieš bandydamas dar kartą palauk **%1$s ir %2$s**</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Atrodo, kad dabar įjungtas atvėsimas. Prieš bandydamas dar kartą palauk **%1$s ir %2$s**</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Atrodo, kad dabar įjungtas atvėsimas. Prieš bandydamas dar kartą palauk **%1$s**</string>
     <string name="premium_guild_subscription_no_next_tier">Šis serveris visiškai maitinamas! Stiprink toliau!</string>
-    <string name="premium_guild_subscription_notice">Nitro serverio stiprinimai yra čia! Sutelk savo bendruomenę serveriui stiprinti.</string>
     <string name="premium_guild_subscription_notice_button">Peržiūrėti lygius ir pranašumus</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro serverio stiprinimai yra čia! Sutelk savo draugus serveriui stiprinti.</string>
     <string name="premium_guild_subscription_remove_button">Pašalinti stiprinimą</string>
     <string name="premium_guild_subscription_remove_error_mobile">Bandant pašalinti stiprinimą įvyko klaida. Pabandyk dar kartą.</string>
     <string name="premium_guild_subscription_select_server_button">Pasirinkti serverį</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Naudok Nitro galias ir sustiprink serverį, prie kurio prisijungei! Serverio stiprinimas leidžia jam judėti per lygius. Kiekvienas lygis suteikia bendrų privalumų visam serveriui.
- Serverio stiprinimas aktyvina 7 dienų atvėsimą. Negali stiprinti kito serverio, kol nesibaigė atvėsimo laikotarpis, nors ir pašalinai stiprinimą. [Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Naudok Nitro galias ir sustiprink serverį, prie kurio prisijungei! Serverio stiprinimas leidžia jam judėti per lygius. Kiekvienas lygis suteikia bendrų privalumų visam serveriui.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Serverio stiprinimas aktyvina 7 dienų atvėsimą. Negali stiprinti kito serverio, kol nesibaigė atvėsimo laikotarpis, nors ir pašalinai stiprinimą. [Sužinok daugiau apie Nitro serverio stiprinimą.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro serverio stiprinimas</string>
-    <string name="premium_guild_subscription_tooltip">Nitro stiprinimas nuo %1$s</string>
+    <string name="premium_guild_tier_0">Lygio nėra</string>
     <string name="premium_guild_tier_1">1 lygis</string>
     <string name="premium_guild_tier_2">2 lygis</string>
     <string name="premium_guild_tier_3">3 lygis</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Ar tikrai nori pašalinti Nitro stiprinimą iš:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Taip, pašalinti stiprinimą</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Pašalinus stiprinimą, šis serveris praras pažangą.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Pašalinus stiprinimą, šis serveris praras pažangą. **Stiprinimui vis dar nustatytas atvėsimas. Jis bus prieinamas po %1$s ir %2$s**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Pašalinus stiprinimą, šis serveris praras pažangą. **Stiprinimui vis dar nustatytas atvėsimas. Jis bus prieinamas po %1$s ir %2$s**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Pašalinus stiprinimą, šis serveris praras pažangą. **Stiprinimui vis dar nustatytas atvėsimas. Jis bus prieinamas %1$s**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Pašalinti Nitro stiprinimą?</string>
     <string name="premium_included">Įtraukta į Nitro:</string>
     <string name="premium_info_monthly">%1$s (mėnesio) rodoma %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s ** / mėnesiui</string>
@@ -3476,7 +3424,6 @@ Savo prenumeratą gali bet kada atnaujinti."</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_button_iap">Gauti %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Gerai, skamba puikiai</string>
-    <string name="premium_payment_gift_blurb">Padovanok draugams [Nitro](onClick), kad jie gautų ypatingų pokalbių pranašumų ir serverio stiprinimą.</string>
     <string name="premium_payment_gift_blurb_mobile">Padovanok kam nors Nitro, kad suteiktum prieigą prie ypatingų funkcijų suteikiančių pokalbių pranašumų ir galimybę stiprinti serverį. [Sužinok daugiau apie Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Bus taikomas vienkartinis mokestis už pasirinktą laiką. Nereikės mokėti kas mėnesį.</string>
     <string name="premium_payment_is_gift">Perki dovaną.</string>
@@ -3491,7 +3438,6 @@ Savo prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic mėnesinė prenumerata</string>
     <string name="premium_plan_month_tier_2">Nitro Mėnesio Prenumerata</string>
     <string name="premium_promo_autocomplete">Naudok unikalius jaustukus visur</string>
-    <string name="premium_promo_description">Pakilk nuo žemes su Discord Nitro ir naudok animuotus bei unikalius jaustukus visuose serveriuose.</string>
     <string name="premium_promo_title">Nori daugiau jaustukų galių?</string>
     <string name="premium_required">Reikalinga Nitro</string>
     <string name="premium_required_get_nitro">Gauk Nitro!</string>
@@ -3510,26 +3456,10 @@ Savo prenumeratą gali bet kada atnaujinti."</string>
     <string name="premium_tier_2_title">Mėgaukis geresne Discord patirtimi už vieną mažą mėnesinį mokestį.</string>
     <string name="premium_trial_button">Pradėk nemokamą bandomąjį laikotarpį</string>
     <string name="premium_upgrade_cancel">Ne</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Naujovink iki metinės prenumeratos ir gauk tris mėnesius nemokamai! Puikus sandoris!!!
-
-Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš metinės kainos. Tu sumokėsi **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Naujovink į metinį planą ir gauk du mėnesius nemokamai. Koks pasiūlymas!!!
-
-Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš metinės kainos. Dabar tu sumokėsi **%1$s** ir mokėsi **%2$s per metus pasibaigus dabartiniam atsiskaitymo laikotarpiui.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Naujovink savo%1$s (mėnesinį) planą ir gauk galimybę stiprinti serverius. Tavo naujasis planas ims galioti iš karto.
-
- Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš mėnesinės kainos. Tu sumokėsi **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Naujovink savo%1$s (mėnesinį) planą ir gauk galimybę stiprinti serverius. Tavo naujasis planas ims galioti iš karto.
-
- Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš mėnesinės kainos. Dabar tu sumokėsi **%2$s** ir mokėsi **%3$s per mėnesį pasibaigus dabartiniam atsiskaitymo laikotarpiui.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Naujovink savo%1$s (mėnesinį) planą ir gauk galimybę stiprinti serverius. Tavo naujasis planas ims galioti iš karto.
 
 Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš metinės kainos. Tu sumokėsi **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Naujovink savo%1$s (mėnesinį) planą ir gauk galimybę stiprinti serverius. Tavo naujasis planas ims galioti iš karto.
-
-Apskaičiuosime mokestį už tavo dabartinį planą ir atimsime jį iš metinės kainos. Dabar tu sumokėsi **%2$s** ir mokėsi **%3$s per metus pasibaigus dabartiniam atsiskaitymo laikotarpiui.**"</string>
     <string name="premium_upgrade_confirm_button">Pagerinti</string>
-    <string name="premium_upgrade_confirm_button_with_price">Naujovinti dabar – %1$s</string>
     <string name="premium_upgrade_confirm_title">Naujovinti į %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Negali užsiprenumeruoti, kai jau turi Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Dabartinis tavo planas.</string>
@@ -4090,8 +4020,6 @@ Ar tikrai nori tęsti?"</string>
     <string name="stop_streaming">Nebetransliuoti</string>
     <string name="stop_watching">Nebestebėti</string>
     <string name="store_channel">Parduotuvės kanalas</string>
-    <string name="store_payment_legalese_monthly">Sveikas! Įsigydamas %1$s, sutinki su mū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ų [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>
diff --git a/com.discord/res/values-nl/plurals.xml b/com.discord/res/values-nl/plurals.xml
index fda89bdff1..90b3101c00 100644
--- a/com.discord/res/values-nl/plurals.xml
+++ b/com.discord/res/values-nl/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%djaar</item>
         <item quantity="one">%d jaar</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d maanden</item>
-        <item quantity="one">%d maand</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d jaar</item>
-        <item quantity="one">%d jaar</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">maanden</item>
         <item quantity="one">maand</item>
@@ -458,16 +450,6 @@
         <item quantity="other">%d gebruiken</item>
         <item quantity="one">%d gebruik</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d gemeenschappelijke vrienden</item>
-        <item quantity="zero">0 gemeenschappelijke vrienden</item>
-        <item quantity="one">1 gemeenschappelijke vriend</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d gemeenschappelijke servers</item>
-        <item quantity="zero">0 gemeenschappelijke servers</item>
-        <item quantity="one">1 gemeenschappelijke server</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dagen</item>
         <item quantity="one">1 dag</item>
@@ -541,10 +523,6 @@
         <item quantity="other">%d maanden</item>
         <item quantity="one">1 maand</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d boosts</item>
-        <item quantity="one">%d boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d boosts</item>
         <item quantity="one">%d boost</item>
@@ -557,15 +535,11 @@
         <item quantity="other">%d boosts</item>
         <item quantity="one">%d boost</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dagen</item>
-        <item quantity="one">%d dag</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d serverboosts</item>
         <item quantity="one">%d serverboost</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d maanden</item>
         <item quantity="one">%d maand</item>
     </plurals>
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index 8a2944f4a2..2e1d6b2c06 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -601,7 +601,6 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="billing">Facturatie</string>
     <string name="billing_accept_terms_tooltip">Accepteer onze servicevoorwaarden om verder te gaan</string>
     <string name="billing_account_credit">Accounttegoed</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s maanden gratis</string>
     <string name="billing_add_payment_method">Voeg een betalingsmethode toe</string>
     <string name="billing_address">Factuuradres</string>
     <string name="billing_address_address">Adres</string>
@@ -654,8 +653,6 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="billing_payment_choose_plan">Kies een plan</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 [Servicevoorwaarden]%2$s. %1$s is een automatisch herhalend abonnement. Je geeft Discord toestemming om gelijk het aangerekende bedrag van %3$s via de gekozen betalingsmethode in rekening te brengen 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 [Servicevoorwaarden]%2$s. %1$s is een automatisch herhalend abonnement. Je geeft Discord toestemming om gelijk het aangerekende bedrag van %3$s via de gekozen betalingsmethode in rekening te brengen en dit jaarlijks automatisch te blijven doen totdat je opzegt. Je kan op elk moment opzeggen.</string>
     <string name="billing_payment_source_invalid">Deze betalingsbron is ongeldig.</string>
     <string name="billing_payment_sources">Betalingsmethoden</string>
     <string name="billing_payment_table_header_amount">Bedrag</string>
@@ -673,13 +670,11 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="billing_price_per_month_current_plan">(HUIDIGE PLAN) %1$s / maand</string>
     <string name="billing_price_per_month_current_plan_ios">(Huidige plan) %1$s / maand</string>
     <string name="billing_price_per_month_mobile">%1$s / MND</string>
-    <string name="billing_price_per_month_upgrade">Upgrade voor %1$s / Maand</string>
     <string name="billing_price_per_year">%1$s / jaar</string>
     <string name="billing_price_per_year_current_plan">(HUIDIGE PLAN) %1$s / jaar</string>
     <string name="billing_price_per_year_current_plan_ios">(Huidige plan) %1$s / jaar</string>
     <string name="billing_price_per_year_mobile">%1$s / JAAR</string>
     <string name="billing_price_per_year_months_free">%1$s / jaar (2 maanden gratis)</string>
-    <string name="billing_price_per_year_upgrade">Upgrade voor %1$s / Jaar</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>
@@ -701,6 +696,10 @@ maar als en wanneer het moet, moet je niet aarzelen!"</string>
     <string name="billing_step_review">Overzicht</string>
     <string name="billing_step_select_plan">Selecteer je plan</string>
     <string name="billing_subscribe">Inschrijven</string>
+    <string name="billing_switch_plan_change">Plan aanpassen</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Begrepen!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Cool!</string>
+    <string name="billing_switch_plan_upgrade">Upgraden</string>
     <string name="billing_tag_failed">Mislukt</string>
     <string name="billing_tag_pending">In afwachting</string>
     <string name="billing_tag_refunded">Terugbetaald</string>
@@ -1746,11 +1745,8 @@ Bedankt dat je de dingen veilig en gezond houdt."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Dankzij een gulle andere persoon heb je nu toegang tot %1$s gedurende %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Dankzij een gulle andere persoon heb je nu toegang tot %1$s gedurende %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** is toegevoegd aan je bibliotheek.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Dankzij een gulle andere persoon heb je nu toegang tot verbeterde chatvoordelen en een serverboost gedurende %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Dankzij een gulle andere persoon heb je nu toegang tot verbeterde chatvoordelen gedurende %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Dankzij een gulle andere persoon heb je nu toegang tot verbeterde chatvoordelen gedurende %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Dankzij een gulle andere persoon heb je nu toegang tot verbeterde chatvoordelen en een serverboost gedurende %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Dankzij een gulle andere persoon heb je nu toegang tot verbeterde chatvoordelen en een serverboost gedurende %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Er is iets vreemds gebeurd en het is ons niet gelukt… probeer het opnieuw.</string>
     <string name="gift_confirmation_button_confirm">Yes! Toevoegen aan de bibliotheek</string>
     <string name="gift_confirmation_button_confirm_mobile">Geef maar hier</string>
@@ -2101,9 +2097,7 @@ Verloren: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s server-emojivakjes (voor een totaal van %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s uploadlimiet voor alle leden</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Gebooste servervoordelen zijn onder andere —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Er heeft nog niemand Nitro aan deze server verleend. Kijk of er leden zijn die je server willen versterken voor serverbrede Nitro-voordelen!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Gebooste servers krijgen al het voorgaande, plus —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Geen Nitro-boost</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Voordelen niveau 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Voordelen niveau 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Voordelen niveau 3</string>
@@ -2120,16 +2114,12 @@ Verloren: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Niveau %1$s-voordeel ontgrendeld</string>
     <string name="guild_settings_overview_notice">Pas op - je hebt niet-opgeslagen wijzigingen!</string>
     <string name="guild_settings_overview_tier_info">Dit is een Nitro-functie van niveau %1$s. [Controleer je niveau](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Serverleden met een actief Nitro-abonnement kunnen helpen niveaus te ontgrendelen door hun Nitro-status te verlenen.
-Voor elk behaald niveau helpen leden voordelen voor iedereen te ontgrendelen.
-
-Leden kunnen hun boost op elk moment intrekken.
-**De server behoudt de voordelen gedurende drie dagen als een niveau verloren gaat. **[Ontdek meer over Nitro-serverboosting.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Nog maar %1$s tot het volgende niveau!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** deze server geboost</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Status Nitro-serverboost</string>
+    <string name="guild_settings_premium_guild_title">Serverbooststatus</string>
     <string name="guild_settings_premium_guild_unlocked">Ontgrendeld</string>
+    <string name="guild_settings_premium_upsell_learn_more">Meer informatie over Discord Nitro</string>
     <string name="guild_settings_server_banner">Serverbanner</string>
     <string name="guild_settings_server_invite_background">Achtergrond serveruitnodiging</string>
     <string name="guild_settings_splash_info">Deze afbeelding wordt getoond als gebruikers een uitnodiging voor de server ontvangen.</string>
@@ -2139,6 +2129,7 @@ Leden kunnen hun boost op elk moment intrekken.
 
 Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &amp;username= aan de querystring toevoegen."</string>
     <string name="guild_settings_widget_enable_widget">Widget server inschakelen</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Aankoop-details</string>
     <string name="guild_verification_text_account_age">Je account moet minstens %1$s minuten oud zijn om berichten te sturen in deze server.</string>
     <string name="guild_verification_text_member_age">Je moet minstens %1$s minuten lid zijn om berichten te sturen in deze server.</string>
     <string name="guild_verification_text_not_claimed">Je moet je account claimen en verifiëren voordat je berichten op deze server kunt verzenden.</string>
@@ -2479,10 +2470,6 @@ Wil je meer weten over Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Een foto maken</string>
     <string name="ios_notification_see_full">Tik om het volledige bericht te zien.</string>
     <string name="ios_profile_in_voice_call">In een spraakoproep</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Gemeenschappelijke vrienden</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Gemeenschappelijke servers</string>
     <string name="ios_profile_open_voice_channel">Spraakkanaal openen</string>
     <string name="ios_view_all">Alles bekijken</string>
     <string name="ip_address_secured">IP-adres veilig gesteld</string>
@@ -2792,7 +2779,6 @@ kanalen verplaatsen, waartoe zowel zij als het lid die ze verplaatsen toegang to
     <string name="network_error_unknown">Er is een onbekende netwerkfout opgetreden.</string>
     <string name="network_error_unknown_host">Er is een netwerkfout opgetreden. Controleer je DNS-instellingen en probeer het opnieuw.</string>
     <string name="network_offline">Netwerkverbinding beperkt of niet beschikbaar.</string>
-    <string name="nevermind">Laat maar</string>
     <string name="new_dm">Nieuw direct bericht</string>
     <string name="new_group_dm">Nieuwe groeps-DM</string>
     <string name="new_guilds_dm_allowed">Directe berichten van serverleden toestaan.</string>
@@ -2914,7 +2900,6 @@ vastgepinde berichten, althans nog niet."</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_no_input_detected_settings">Nou, het lijkt erop dat Discord geen enkele input van je microfoon detecteert. Laten we dat oplossen!</string>
     <string name="notice_no_input_detected_settings_link_text">Naar Instellingen</string>
-    <string name="notice_premium_grandfathered_ended">Je toegang tot Nitro is verlopen. Upgrade van Nitro Classic naar Nitro voor ongekende chatvoordelen en een serverboost.</string>
     <string name="notice_premium_grandfathered_ending">Je hebt nog maar %1$s Nitro over! Je abonnement wordt op **%2$s** omgezet in Nitro Classic.</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>
@@ -3144,7 +3129,7 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
     <string name="payment_modal_button_change_card">Update creditcard</string>
     <string name="payment_modal_button_change_paypal">Update PayPal-account</string>
     <string name="payment_modal_button_premium">Koop %1$s</string>
-    <string name="payment_modal_button_premium_gift">Koop %1$s</string>
+    <string name="payment_modal_button_premium_gift">Cadeau kopen</string>
     <string name="payment_modal_one_month">1 maand</string>
     <string name="payment_modal_one_year">1 jaar</string>
     <string name="payment_modal_per_month">Per maand</string>
@@ -3253,9 +3238,6 @@ Ook kan de overlay niet voor iedereen werken. Als je problemen of vragen hebt, r
 Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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 had aangepast.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Je kunt 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 toegang tot Nitro verlopen, zal je Discord Tag willekeurig worden verdeeld als je deze hebt gewijzigd en zal je serverboost worden verwijderd.
-
- Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Je annulering zal van kracht gaan op het einde van je huidige facturatieperiode. Op **%1$s** zal je toegang tot Nitro verlopen, zal je Discord Tag willekeurig worden verdeeld als je deze hebt gewijzigd en zal je serverboost worden verwijderd.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Je kunt op elk moment een nieuw abonnement starten.</string>
     <string name="premium_cancel_confirm_mobile">Nitro annuleren</string>
@@ -3278,7 +3260,6 @@ Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_chat_perks_description_streaming">Stream vanaf de bron met Nitro of kies voor haarscherp 1080p 60fps met Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Grotere bestandsgrootte van uploads van %1$s naar %2$s met Nitro of %3$s met Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Boost je favoriete server!</string>
-    <string name="premium_chat_perks_simple_title">Hou het eenvoudig - krijg de standaard chatvoordelen zonder serverboost.</string>
     <string name="premium_chat_perks_streaming_mobile">Betere Go Live-streams: Stream vanaf de bron met Nitro of kies voor haarscherp 1080p 60fps met Nitro Classic</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>
@@ -3317,41 +3298,20 @@ Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_grandfathered_yearly">Om je te bedanken voor het ondersteunen van Discord krijg je gedurende twee jaar toegang tot Nitro. Je toegang eindigt op **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boost-cooldown: **%1$sd %2$su %3$sm**</string>
     <string name="premium_guild_features_blurb">Boost je server met een Nitro-abonnement om een nieuw niveau te bereiken. Voor elk behaald level worden chatvoordelen ontgrendeld **voor iedereen in die server!** Bekijk nog meer van die fijne voordelen:</string>
-    <string name="premium_guild_features_customize_guild_description">Ontgrendel aanpassingen zoals uitnodigingsachtergrond, serverbanner, persoonlijke link etc.</string>
     <string name="premium_guild_features_customize_guild_mobile">Serveraanpassingen</string>
-    <string name="premium_guild_features_customize_guild_title">Serveraanpassingen</string>
     <string name="premium_guild_features_learn_more_button">Meer informatie over Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Krijg een verbeterde Discord-ervaring vanaf een laag maandelijks bedrag.</string>
     <string name="premium_guild_features_more">En meer! Je kunt het huidige niveau, de niveauvoortgang en beschikbare voordelen binnen een server bekijken.</string>
-    <string name="premium_guild_features_new_role_description">Krijg een speciale serverrol, alleen beschikbaar voor Nitro-serverboosters in je server.</string>
-    <string name="premium_guild_features_new_role_mobile">Exclusieve Nitro-serverboostrollen</string>
-    <string name="premium_guild_features_new_role_title">Exclusieve nieuwe rol</string>
-    <string name="premium_guild_features_show_support_description">Boosters krijgen een glimmende, nieuwe profielbadge die verandert naarmate ze een langere reeks hebben.</string>
     <string name="premium_guild_features_show_support_mobile">Een nieuwe profielbadge die met de tijd verandert</string>
-    <string name="premium_guild_features_show_support_title">Laat je steun zien</string>
     <string name="premium_guild_features_title">Met Nitro kun je een server boosten!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Verhoogde uploadgroottes voor de hele community</string>
-    <string name="premium_guild_features_upload_sizes_title">Grotere uploadgroottes voor iedereen</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Abonneer je op Nitro om een Nitro-boost naar een server te sturen! [Meer informatie over Nitro-serverboosting.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Upgrade je abonnement om een Nitro-boost naar een server te sturen! [Meer informatie over Nitro-serverboosting.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Geen Nitro-boosts</string>
     <string name="premium_guild_header_badge_no_tier">Geen niveau</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro-serverboost</string>
     <string name="premium_guild_perks_modal_base_perks">Gebooste servervoordelen zijn onder andere —</string>
-    <string name="premium_guild_perks_modal_blurb">"Voor elk behaald niveau helpen leden van deze server voordelen voor iedereen te ontgrendelen. Deze voordelen zijn alleen van toepassing binnen de server.
-
- **Boosters krijgen: ledenlijsticoon, nieuwe evoluerende badge en een speciale rol alleen voor boosters.**
-
- [Meer informatie over Nitro-serverboosting.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Voor elk behaald niveau helpen leden van deze server voordelen voor iedereen te ontgrendelen. Deze voordelen zijn alleen van toepassing binnen de server.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Boosters krijgen: ledenlijsticoon, nieuwe evoluerende badge en een speciale rol alleen voor boosters.** [Meer informatie over Nitro-serverboosting.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Neem Nitro om te boosten!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boost deze server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Upgrade naar Nitro om te boosten!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Momenteel ondersteunen we geen upgrades naar Nitro voor abonnementen via Apple. Je kunt je abonnement opzeggen via [abonnementsbeheer van Apple](%1$s), maar het abonnement blijft dan nog actief tot de vervaldatum.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic bevat geen serverboosting</string>
     <string name="premium_guild_perks_modal_header">Serverbooststatus</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** boosts</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Je boost beheren</string>
     <string name="premium_guild_perks_modal_no_tiers">Nog geen niveaus behaald</string>
@@ -3364,43 +3324,32 @@ Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s deze server geboost</string>
     <string name="premium_guild_settings_members_subscribed_needed">Je hebt nog **%1$s** nodig om %2$s te ontgrendelen</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Weet je zeker dat je een Nitro-boost wilt sturen naar:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Selecteer deze server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Selecteer deze server. Het duurt even voordat je boost ingaat.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Als je deze server boost, kun je gedurende %1$s geen andere server boosten. Het verwijderen van je boost heeft geen effect op de cooldown.**</string>
     <string name="premium_guild_subscribe_confirm_header">Kies verstandig!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Servers zoeken</string>
     <string name="premium_guild_subscribe_select_guild_header">Selecteer een server</string>
     <string name="premium_guild_subscribe_success_thanks">Bedankt voor de boost!</string>
     <string name="premium_guild_subscription_available_count">Je hebt nog **%1$s**!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Er is een fout opgetreden bij het boosten. Probeer het opnieuw.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Zo te zien zit je in een cooldown. Wacht nog **%1$s en %2$s** voordat je het opnieuw probeert</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Zo te zien zit je in een cooldown. Wacht nog **%1$s en %2$s** voordat je het opnieuw probeert</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Zo te zien zit je in een cooldown. Wacht nog **%1$s** voordat je het opnieuw probeert</string>
     <string name="premium_guild_subscription_no_next_tier">De server draait op volle kracht. Blijf boosten!</string>
-    <string name="premium_guild_subscription_notice">Nitro-serverboosts zijn beschikbaar! Roep je community op om je server te boosten.</string>
     <string name="premium_guild_subscription_notice_button">Niveaus &amp; voordelen bekijken</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro-serverboosts zijn beschikbaar! Roep je vrienden op om je server te boosten.</string>
     <string name="premium_guild_subscription_remove_button">Boost verwijderen</string>
     <string name="premium_guild_subscription_remove_error_mobile">Er is een fout opgetreden bij het verwijderen van de boost. Probeer het opnieuw.</string>
     <string name="premium_guild_subscription_select_server_button">Selecteer een server</string>
-    <string name="premium_guild_subscription_subtitle">"Gebruik je Nitro-krachten om een server waar je lid van bent te boosten! Een server boosten zorgt dat die server hogere niveaus kan bereiken. Elk niveau geeft de hele server collectieve voordelen.
- Het boosten van een server activeert een cooldown van 7 dagen. In die tijd kun je geen andere server boosten, zelfs niet als je de boost verwijdert. [Kom meer te weten over Nitro-serverboosting.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Gebruik je Nitro-krachten om een server waar je lid van bent te boosten! Een server boosten zorgt dat die server hogere niveaus kan bereiken. Elk niveau geeft de hele server collectieve voordelen.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Het boosten van een server activeert een cooldown van 7 dagen. In die tijd kun je geen andere server boosten, zelfs niet als je de boost verwijdert. [Kom meer te weten over Nitro-serverboosting.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro-serverboost</string>
-    <string name="premium_guild_subscription_tooltip">Nitro-boost sinds %1$s</string>
+    <string name="premium_guild_tier_0">Geen niveau</string>
     <string name="premium_guild_tier_1">Niveau 1</string>
     <string name="premium_guild_tier_2">Niveau 2</string>
     <string name="premium_guild_tier_3">Niveau 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Weet je zeker dat je de Nitro-boost wilt verwijderen van:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ja, boost verwijderen</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Deze server verliest voortgang als je jouw boost verwijdert.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Deze server verliest voortgang als je jouw boost verwijdert. **Je boost zit nog in de cooldown. Hij is beschikbaar over %1$s en %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Deze server verliest voortgang als je jouw boost verwijdert. **Je boost zit nog in de cooldown. Hij is beschikbaar over %1$s en %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Deze server verliest voortgang als je jouw boost verwijdert. **Je boost zit nog in de cooldown. Hij is beschikbaar over %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Nitro-boost verwijderen?</string>
     <string name="premium_included">Inclusief met Nitro:</string>
     <string name="premium_info_monthly">%1$s wordt (maandelijks) verrekend op %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Maand</string>
@@ -3412,7 +3361,6 @@ Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_payment_confirmation_blurb_iap">Je kunt nu %1$s claimen met je Nitro-abonnement. Laten we deze binnenhalen!</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_button_regular">Oké, klinkt goed</string>
-    <string name="premium_payment_gift_blurb">Geef je vrienden [Nitro](onClick) cadeau zodat ze fantastische chatvoordelen en een serverboost krijgen.</string>
     <string name="premium_payment_gift_blurb_mobile">Geef iemand Nitro cadeau om toegang te geven tot fantastische chatvoordelen en serverboosting. [Meer informatie over Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Dit is een eenmalige betaling voor de gekozen periode. Je betaalt niet maandelijks.</string>
     <string name="premium_payment_is_gift">Je koopt een cadeau.</string>
@@ -3427,7 +3375,6 @@ Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic maandelijks</string>
     <string name="premium_plan_month_tier_2">Nitro maandelijks</string>
     <string name="premium_promo_autocomplete">"Gebruik overal aangepaste emoji's"</string>
-    <string name="premium_promo_description">Stijg op met Discord Nitro om geanimeerde en aangepaste emoji te gebruiken in elke server.</string>
     <string name="premium_promo_title">Wil je emoji-krachten upgraden?</string>
     <string name="premium_required">Nitro vereist</string>
     <string name="premium_required_get_nitro">Verkrijg Nitro!</string>
@@ -3446,26 +3393,10 @@ Je kan op elk moment een nieuw abonnement starten."</string>
     <string name="premium_tier_2_title">Krijg een verbeterde Discord-ervaring voor een laag maandelijks bedrag.</string>
     <string name="premium_trial_button">Start je gratis proefperiode</string>
     <string name="premium_upgrade_cancel">Neuh</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Upgrade naar jaarlijks en krijg twee maanden gratis. Wat een deal!!!
-
-We zullen ook je huidige plan verrekenen en aftrekken van de jaarlijkse prijs. Je zult **%1$s** worden aangerekend."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Upgrade naar jaarlijks en krijg twee maanden gratis. Wat een deal!!!
-
-We zullen ook je huidige plan verrekenen en aftrekken van de jaarlijkse prijs. Je zult nu **%1$s** worden aangerekend en **%2$s/jaar na de huidige facturatieperiode.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Upgrade je %1$s (maandelijkse) plan en krijg de mogelijkheid om servers te boosten. Je nieuwe plan gaat onmiddellijk van start.
-
- We zullen je huidige plan verrekenen en aftrekken van de maandelijkse prijs. Je zult **%2$s** worden aangerekend."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Upgrade je %1$s (maandelijkse) plan en krijg de mogelijkheid om servers te boosten. Je nieuwe plan gaat onmiddellijk van start.
-
- We zullen je huidige plan verrekenen en aftrekken van de maandelijkse prijs. Je zult nu **%2$s** worden aangerekend en **%3$s/maand na de huidige facturatieperiode.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Upgrade je %1$s (maandelijkse) plan en krijg de mogelijkheid om servers te boosten. Je nieuwe plan gaat onmiddellijk van start.
 
 We zullen je huidige plan verrekenen en aftrekken van de jaarlijkse prijs. Je zult **%2$s** worden aangerekend."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Upgrade je %1$s (maandelijkse) plan en krijg de mogelijkheid om servers te boosten. Je nieuwe plan gaat onmiddellijk van start.
-
-We zullen je huidige plan verrekenen en aftrekken van de jaarlijkse prijs. Je zult nu **%2$s** worden aangerekend en **%3$s/jaar na de huidige facturatieperiode.**"</string>
     <string name="premium_upgrade_confirm_button">Upgraden</string>
-    <string name="premium_upgrade_confirm_button_with_price">Nu upgraden - %1$s</string>
     <string name="premium_upgrade_confirm_title">Upgrade naar %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Je kunt je niet abonneren terwijl je Nitro al hebt.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Je huidige plan.</string>
@@ -4008,8 +3939,6 @@ Weet je zeker dat je dit wilt doen?"</string>
     <string name="stop_streaming">Streamen stoppen</string>
     <string name="stop_watching">Bekijken stoppen</string>
     <string name="store_channel">Store-kanaal</string>
-    <string name="store_payment_legalese_monthly">Hoi! Door %1$s aan te kopen ga je akkoord met onze [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 [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>
diff --git a/com.discord/res/values-no/plurals.xml b/com.discord/res/values-no/plurals.xml
index 09c71fb4d2..14691625bc 100644
--- a/com.discord/res/values-no/plurals.xml
+++ b/com.discord/res/values-no/plurals.xml
@@ -291,14 +291,6 @@
         <item quantity="other">%d år</item>
         <item quantity="one">%d år</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d måneder</item>
-        <item quantity="one">%d måned</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d år</item>
-        <item quantity="one">%d år</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">måneder</item>
         <item quantity="one">måned</item>
@@ -455,16 +447,6 @@
         <item quantity="other">%d benyttelser</item>
         <item quantity="one">%d benyttelse</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d felles venner</item>
-        <item quantity="zero">0 felles venner</item>
-        <item quantity="one">1 felles venn</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d felles servere</item>
-        <item quantity="zero">0 felles servere</item>
-        <item quantity="one">1 felles server</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dager</item>
         <item quantity="one">1 dag</item>
@@ -538,10 +520,6 @@
         <item quantity="other">%d måneder</item>
         <item quantity="one">1 måned</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d booster</item>
-        <item quantity="one">%d boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d booster til</item>
         <item quantity="one">%d boost til</item>
@@ -554,15 +532,11 @@
         <item quantity="other">%d booster</item>
         <item quantity="one">%d boost</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dager</item>
-        <item quantity="one">%d dag</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d Server Boost</item>
         <item quantity="one">%d Server Boost</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d Måneder</item>
         <item quantity="one">%d Måned</item>
     </plurals>
@@ -586,10 +560,6 @@
         <item quantity="other">%d minutter</item>
         <item quantity="one">%d minutt</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** booster</item>
-        <item quantity="one">**%d** boost</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d dager</item>
         <item quantity="one">%d dag</item>
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index 4571909957..1ef124448c 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -578,7 +578,6 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing">Fakturering</string>
     <string name="billing_accept_terms_tooltip">Godta vilkårene for bruk for å fortsette</string>
     <string name="billing_account_credit">Kontokreditt</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s måneder gratis</string>
     <string name="billing_add_payment_method">Legg til betalingsmåte</string>
     <string name="billing_address">Faktureringsadresse</string>
     <string name="billing_address_address">Adresse</string>
@@ -635,8 +634,6 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing_payment_choose_plan">Velg et abonnement</string>
     <string name="billing_payment_history">Transaksjonshistorikk</string>
     <string name="billing_payment_premium">Ditt abonnement</string>
-    <string name="billing_payment_premium_legalese_monthly">Ved å kjøpe et %1$s-abonnement, godtar du [vilkårene for bruk](%2$s). %1$s er et abonnement som fornyes automatisk. 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 det når som helst.</string>
-    <string name="billing_payment_premium_legalese_yearly">Ved å kjøpe et %1$s-abonnement, godtar du [vilkårene for bruk](%2$s). %1$s er et abonnement som fornyes automatisk. 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 det når som helst.</string>
     <string name="billing_payment_source_invalid">Betalingskilden er ugyldig.</string>
     <string name="billing_payment_sources">Betalingsmåter</string>
     <string name="billing_payment_table_header_amount">Beløp</string>
@@ -654,13 +651,11 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing_price_per_month_current_plan">(NÅVÆRENDE ABONNEMENT) %1$s / måned</string>
     <string name="billing_price_per_month_current_plan_ios">(Nåværende abonnement) %1$s / måned</string>
     <string name="billing_price_per_month_mobile">%1$s / MND</string>
-    <string name="billing_price_per_month_upgrade">Oppgrader for %1$s/ måned</string>
     <string name="billing_price_per_year">%1$s / år</string>
     <string name="billing_price_per_year_current_plan">(NÅVÆRENDE ABONNEMENT) %1$s / år</string>
     <string name="billing_price_per_year_current_plan_ios">(Nåværende abonnement) %1$s / år</string>
     <string name="billing_price_per_year_mobile">%1$s / ÅR</string>
     <string name="billing_price_per_year_months_free">%1$s / år (2 måneder gratis)</string>
-    <string name="billing_price_per_year_upgrade">Oppgrader for %1$s / år</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>
@@ -682,6 +677,10 @@ men ikke nøl hvis og når du må gjøre det!"</string>
     <string name="billing_step_review">Gjennomgang</string>
     <string name="billing_step_select_plan">Velg abonnement</string>
     <string name="billing_subscribe">Abonner</string>
+    <string name="billing_switch_plan_change">Endre abonnement</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Forstått!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Kult!</string>
+    <string name="billing_switch_plan_upgrade">Oppgrader</string>
     <string name="billing_tag_failed">Mislykket</string>
     <string name="billing_tag_pending">Venter</string>
     <string name="billing_tag_refunded">Tilbakebetalt</string>
@@ -1706,11 +1705,8 @@ for å kunne observere inndatafølsomheten."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Takket være et annet sjenerøst menneske, har du nå %1$s i %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Takket være et annet sjenerøst menneske, har du nå %1$s i %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** har blitt lagt til i biblioteket ditt.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Takket være et annet sjenerøst menneske, har du nå tilgang til forbedrede chatfordeler og en Server Boosting for %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Takket være et annet sjenerøst menneske, har du nå tilgang til forbedrede chatfordeler i %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Takket være et annet sjenerøst menneske, har du nå tilgang til forbedrede chatfordeler i %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Takket være et annet sjenerøst menneske, har du nå tilgang til forbedrede chatfordeler og en Server Boosting i %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Takket være et annet sjenerøst menneske, har du nå tilgang til forbedrede chatfordeler og en Server Boosting i %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Noe funky skjedde, og vi klarte ikke å sikre posen … vil du prøve igjen?</string>
     <string name="gift_confirmation_button_confirm">Visst søren! Legg til i biblioteket</string>
     <string name="gift_confirmation_button_confirm_mobile">Gi meg</string>
@@ -2061,9 +2057,7 @@ Mistet: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s plasser for server-emojier (for totalt %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s opplastingsgrense for alle medlemmer</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Boostede serverfordeler inkluderer –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Ingen har gitt Nitro til denne serveren ennå. Se om noen medlemmer er villige til å gi serveren din Nitro-fordeler for alle på serveren!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Boostede servere får alt tidligere, og –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Ingen Nitro Boost</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Fordeler på nivå 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Fordeler på nivå 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Fordeler på nivå 3</string>
@@ -2080,16 +2074,12 @@ Mistet: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Fordelen for nivå %1$s er låst opp</string>
     <string name="guild_settings_overview_notice">Forsiktig! Du har ulagrede endringer!</string>
     <string name="guild_settings_overview_tier_info">Dette er en nivå Nitro-funksjon på nivå %1$s. [Sjekk nivå-statusen din](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Medlemmer av denne serveren med et aktivt Nitro-abonnement kan hjelpe til med å låse opp nivåer ved å gi Nitro-statusen sin.
-For hvert oppnådde nivå kommer medlemmer av serveren til å hjelpe til med å låse opp fordeler for alle.
-
-Medlemmer kan trekke tilbake boosten sin når som helst.
-**Serveren beholder fordelene i tre dager hvis et nivå går tapt. **[Les mer om Nitro Server Boosting.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Bare %1$s til det neste nivået!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** fått fart på denne serveren</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro Server Boost-status</string>
+    <string name="guild_settings_premium_guild_title">Server Boost-status</string>
     <string name="guild_settings_premium_guild_unlocked">Låst opp</string>
+    <string name="guild_settings_premium_upsell_learn_more">Les mer om Discord Nitro</string>
     <string name="guild_settings_server_banner">Serverbanner</string>
     <string name="guild_settings_server_invite_background">Bakgrunn for serverinvitasjon</string>
     <string name="guild_settings_splash_info">Dette bildet vises når brukerne mottar en invitasjon til serveren.</string>
@@ -2099,6 +2089,7 @@ Medlemmer kan trekke tilbake boosten sin når som helst.
 
 Hvis du har tilgang til brukerne på nettsiden din, kan du dynamisk legge til &amp;username= i spørrestrengen."</string>
     <string name="guild_settings_widget_enable_widget">Aktiver servermodul</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Kjøpsdetaljer</string>
     <string name="guild_verification_text_account_age">Brukeren din må være minst %1$s minutter gammel for å kunne sende meldinger i denne serveren.</string>
     <string name="guild_verification_text_member_age">Du må ha vært medlem i minst %1$s minutter for å kunne sende meldinger i denne serveren.</string>
     <string name="guild_verification_text_not_claimed">Du må opprette og verifisere kontoen din før du kan sende meldinger i denne serveren.</string>
@@ -2445,10 +2436,6 @@ Har du lyst til å vite mer om Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Ta et bilde</string>
     <string name="ios_notification_see_full">Trykk for å se hele meldingen.</string>
     <string name="ios_profile_in_voice_call">I et taleanrop</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Felles venner</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Felles servere</string>
     <string name="ios_profile_open_voice_channel">Åpen talekanal</string>
     <string name="ios_view_all">Vis alle</string>
     <string name="ip_address_secured">IP-adressen er sikret</string>
@@ -2761,7 +2748,6 @@ kanaler hvor både de og medlemmene de flytter, har tilgang."</string>
     <string name="network_error_unknown">En ukjent nettverksfeil har oppstått.</string>
     <string name="network_error_unknown_host">En nettverksfeil har oppstått. Sjekk DNS-innstillingene og prøv igjen.</string>
     <string name="network_offline">Nettverkstilkoblingen begrenset eller utilgjengelig.</string>
-    <string name="nevermind">Glem det</string>
     <string name="new_dm">Ny direktemelding</string>
     <string name="new_group_dm">Ny gruppe-DM</string>
     <string name="new_guilds_dm_allowed">Tillat direktemeldinger fra servermedlemmer.</string>
@@ -2886,7 +2872,6 @@ ingen festede meldinger … enda."</string>
     <string name="notice_no_input_detected_help_link_text">Hjelp!</string>
     <string name="notice_no_input_detected_settings">Vel, det ser ut til at Discord ikke oppdager noen inndata fra mikrofonen din. La oss fikse det!</string>
     <string name="notice_no_input_detected_settings_link_text">Gå til innstillingene</string>
-    <string name="notice_premium_grandfathered_ended">Tilgangen din til Nitro er utløpt. Oppgrader fra Nitro Classic til Nitro for superkraftige chatfordeler og Server Boosting.</string>
     <string name="notice_premium_grandfathered_ending">Du har bare %1$s igjen med Nitro! Abonnementet ditt nedgraderes til Nitro Classic **%2$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>
@@ -3120,7 +3105,7 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
     <string name="payment_modal_button_change_card">Oppdater kredittkort</string>
     <string name="payment_modal_button_change_paypal">Oppdater PayPal-konto</string>
     <string name="payment_modal_button_premium">Få %1$s</string>
-    <string name="payment_modal_button_premium_gift">Kjøp %1$s</string>
+    <string name="payment_modal_button_premium_gift">Kjøp gave</string>
     <string name="payment_modal_one_month">1 måned</string>
     <string name="payment_modal_one_year">1 år</string>
     <string name="payment_modal_per_month">Per måned</string>
@@ -3230,9 +3215,6 @@ I tillegg fungerer ikke overlegget for alle. Hvis du har problemer eller spørsm
 Du kan når som helst starte abonnementet på nytt."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Avbestillingen trer i kraft fra slutten av den nåværende faktureringsperioden **.%1$s** Discord-taggen din blir randomisert hvis du har endret den.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Du kan starte abonnementet ditt på nytt når som helst.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Kansellering trer i kraft ved slutten av den gjeldende faktureringsperioden. **%1$s** mister du tilgang til Nitro, Discord-taggen din blir randomisert hvis du har endret den og Server Boosting din blir fjernet.
-
- Du kan starte abonnementet ditt på nytt når som helst."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Kansellering trer i kraft ved slutten av den gjeldende faktureringsperioden. **%1$s** mister du tilgang til Nitro, Discord-taggen din blir randomisert hvis du har endret den og Server Boostingen din blir fjernet.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Du kan starte abonnementet ditt på nytt når som helst.</string>
     <string name="premium_cancel_confirm_mobile">Avslutt Nitro</string>
@@ -3255,7 +3237,6 @@ Du kan når som helst starte abonnementet på nytt."</string>
     <string name="premium_chat_perks_description_streaming">Strøm ved kilden med Nitro eller opptil skarpe 1080p 60 fps med Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Større filstørrelse for opplasting fra %1$s til %2$s med Nitro eller %3$s med Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Boost favorittserveren din!</string>
-    <string name="premium_chat_perks_simple_title">Hold det enkelt – få grunnleggende chatfordeler uten Server boosting.</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>
@@ -3293,40 +3274,20 @@ Du kan når som helst starte abonnementet på nytt."</string>
     <string name="premium_grandfathered_yearly">Som takk for at du har støttet Discord, får du tilgang til Nitro i to år. Tilgangen din utløper **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boost-nedkjøling: **%1$sd %2$st %3$sm**</string>
     <string name="premium_guild_features_blurb">Å booste en server med Nitro-abonnementet ditt hjelper den med å gå videre mot et nytt nivå. For hvert oppnådde nivå, låser det opp chatfordeler **for alle på den serveren!** Sjekk noen av disse digge fordelene:</string>
-    <string name="premium_guild_features_customize_guild_description">Lås opp tilpasninger som bakgrunn for invitasjon, serverbanner, pen URL-adresse, osv.</string>
     <string name="premium_guild_features_customize_guild_mobile">Servertilpasning</string>
-    <string name="premium_guild_features_customize_guild_title">Servertilpasning</string>
     <string name="premium_guild_features_learn_more_button">Les mer om Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Få en forbedret Discord-opplevelse til en lav månedlig kostnad.</string>
     <string name="premium_guild_features_more">Og mye mer! Du kan sjekke nåværende nivå, nivåprogresjon og tilgjengelige fordeler på en server.</string>
-    <string name="premium_guild_features_new_role_description">Få en spesiell serverrolle som bare er tilgjengelig for Nitro Server Boostere i serveren din.</string>
-    <string name="premium_guild_features_new_role_mobile">Eksklusive Nitro Server Booster-roller</string>
-    <string name="premium_guild_features_new_role_title">Eksklusiv, ny rolle</string>
-    <string name="premium_guild_features_show_support_description">Boostere får et skinnende, nytt profilmerke som endres med rekken deres.</string>
     <string name="premium_guild_features_show_support_mobile">Et nytt profilmerke som endrer seg over tid</string>
-    <string name="premium_guild_features_show_support_title">Vis frem støtten din</string>
     <string name="premium_guild_features_title">Med Nitro kan du hjelpe til å booste en server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Økte opplastingsstørrelser for hele fellesskapet</string>
-    <string name="premium_guild_features_upload_sizes_title">Større opplastingsstørrelse for alle</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Abonner på Nitro for å sende en Nitro Boost til en server! [Les mer om Nitro Server Boosting.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Oppgrader abonnementet ditt for å sende en Nitro Boost til en server! [Les mer om Nitro Server Boosting.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Ingen Nitro Boost</string>
     <string name="premium_guild_header_badge_no_tier">Ingen nivå</string>
     <string name="premium_guild_perks_modal_base_perks">Boostede serverfordeler inkluderer –</string>
-    <string name="premium_guild_perks_modal_blurb">"For hvert oppnådde nivå, kommer medlemmer av serveren til å hjelpe til med å låse opp fordeler for alle. Disse fordelene gjelder bare på serveren.
-
- **Boosters get: Medlemslisteikon, nytt utviklingsmerke og en rolle bare for boostere.**
-
- [Les mer om Nitro Server Boosting.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">For hvert oppnådde nivå, kommer medlemmer av serveren til å hjelpe til med å låse opp fordeler for alle. Disse fordelene gjelder bare på serveren.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Boostere får: Medlemslisteikon, nytt utviklingsmerke og en rolle bare for boostere.** [Les mer om Nitro Server Boosting.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Få Nitro for å booste!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boost denne serveren</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Oppgrader til Nitro for å booste!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Vi støtter foreløpig ikke oppgraderinger til Nitro for abonnement gjennom Apple. Du kan kansellere abonnementet ditt gjennom [Apples abonnementsstyring](%1$s), men abonnementet forblir aktivt til utløpsdatoen.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic inkluderer ikke Server Boosting</string>
     <string name="premium_guild_perks_modal_header">Server Boost-status</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** Boost</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Administrer boosten din</string>
     <string name="premium_guild_perks_modal_no_tiers">Ingen nivåer er oppnådd ennå</string>
@@ -3339,43 +3300,32 @@ Du kan når som helst starte abonnementet på nytt."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s har fått fart på denne serveren</string>
     <string name="premium_guild_settings_members_subscribed_needed">Du trenger **%1$s** for å låse opp %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Er du sikker på at du vil sende en Nitro Boost til:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Velg denne serveren</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Velg denne serveren. Det tar et øyeblikk før boosten din trer i kraft.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Å booste denne serveren forhindrer deg i å booste en annen server i %1$s. Å fjerne boosten din påvirker ikke nedkjølingen.**</string>
     <string name="premium_guild_subscribe_confirm_header">Velg smart!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Søk etter servere</string>
     <string name="premium_guild_subscribe_select_guild_header">Velg en server</string>
     <string name="premium_guild_subscribe_success_thanks">Takk for boosten!</string>
     <string name="premium_guild_subscription_available_count">Du har **%1$s** tilgjengelig!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Det oppstod en feil under forsøket på å booste. Prøv igjen.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Det ser ut til at du er under nedkjøling. Vent **%1$s og %2$s** før du prøver på nytt</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Det ser ut til at du er under nedkjøling. Vent **%1$s og %2$s** før du prøver på nytt</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Det ser ut til at du er under nedkjøling. Vent **%1$s** før du prøver på nytt</string>
     <string name="premium_guild_subscription_no_next_tier">Denne serveren er fullstendig styrket! Fortsett å booste!</string>
-    <string name="premium_guild_subscription_notice">Nitro Server Boost er her! Samle fellesskapet for å booste serveren din.</string>
     <string name="premium_guild_subscription_notice_button">Se nivåer og fordeler</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro Server Boost er her! Samle vennene dine for å booste serveren din.</string>
     <string name="premium_guild_subscription_remove_button">Fjern boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">Det oppstod en feil under forsøket på å fjerne boosten. Prøv igjen.</string>
     <string name="premium_guild_subscription_select_server_button">Velg en server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Bruk Nitro-kreftene dine til å booste en server du har blitt med! Ved å booste en server kan den gå videre mot nivåer. Hvert nivå gir felles fordeler for hele serveren.
- Å booste en server aktiverer en 7-dagers nedkjøling. Du kan ikke booste en annen server før denne nedkjølingen er ferdig, selv om du fjerner boosten. [Les mer om Nitro Server Boosting.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Bruk Nitro-kreftene dine til å booste en server du har blitt med! Ved å booste en server kan den gå videre mot nivåer. Hvert nivå gir felles fordeler for hele serveren.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Å booste en server aktiverer en 7-dagers nedkjøling. Du kan ikke booste en annen server før denne nedkjølingen er ferdig, selv om du fjerner boosten. [Les mer om Nitro Server Boosting.](%1$s)</string>
-    <string name="premium_guild_subscription_tooltip">Nitro-boosting siden %1$s</string>
+    <string name="premium_guild_tier_0">Ingen nivå</string>
     <string name="premium_guild_tier_1">Nivå 1</string>
     <string name="premium_guild_tier_2">Nivå 2</string>
     <string name="premium_guild_tier_3">Nivå 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Er du sikker på at du vil fjerne Nitro Boost fra:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ja, fjern boost</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Denne serveren mister fremgangen hvis du fjerner boosten.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Denne serveren mister fremgangen hvis du fjerner boosten. **Boosten din er fremdeles under nedkjøling. Den blir tilgjengelig om %1$s og %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Denne serveren mister fremgangen hvis du fjerner boosten. **Boosten din er fremdeles under nedkjøling. Den blir tilgjengelig om %1$s og %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Denne serveren mister fremgangen hvis du fjerner boosten. **Boosten din er fremdeles under nedkjøling. Den blir tilgjengelig om %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Fjerne Nitro Boost?</string>
     <string name="premium_included">Inkludert i Nitro:</string>
     <string name="premium_info_monthly">%1$s (månedlig) trekkes den %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / måned</string>
@@ -3388,7 +3338,6 @@ Du kan når som helst starte abonnementet på nytt."</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_button_iap">Få %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Ok, høres bra ut</string>
-    <string name="premium_payment_gift_blurb">Gi [Nitro](onClick) i gave til vennene dine slik at de får superkraftige chatfordeler og en Server Boosting.</string>
     <string name="premium_payment_gift_blurb_mobile">Gi noen Nitro i gave for å gi tilgang til supereffektive chatfordeler og Server Boosting. [Les mer om Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Dette blir en engangsavgift for den valgte tidsperioden. Du blir ikke fakturert månedlig.</string>
     <string name="premium_payment_is_gift">Du kjøper en gave.</string>
@@ -3403,7 +3352,6 @@ Du kan når som helst starte abonnementet på nytt."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic månedlig</string>
     <string name="premium_plan_month_tier_2">Nitro månedlig</string>
     <string name="premium_promo_autocomplete">Bruk egendefinerte emojier overalt</string>
-    <string name="premium_promo_description">Ta av med Discord Nitro for å bruke animerte og egendefinerte emojier i enhver server.</string>
     <string name="premium_promo_title">Har du lyst på oppgraderte emojikrefter?</string>
     <string name="premium_required">Nitro kreves</string>
     <string name="premium_required_get_nitro">Skaff deg Nitro!</string>
@@ -3422,26 +3370,10 @@ Du kan når som helst starte abonnementet på nytt."</string>
     <string name="premium_tier_2_title">Få en forbedret Discord-opplevelse for en lav månedlig kostnad.</string>
     <string name="premium_trial_button">Start den gratis prøveperioden din</string>
     <string name="premium_upgrade_cancel">Niks</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Oppgrader til årlig og få to måneder gratis. For en deal!!!
-
-Vi fordeler ditt nåværende abonnement proporsjonalt og trekker det fra årsprisen. Du vil bli belastet **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Oppgrader til årlig og få to måneder gratis. For en deal!!!
-
-Vi fordeler det nåværende abonnementet ditt proporsjonalt og trekker det fra årsprisen. Du blir belastet **%1$s** nå, og **%2$s/år etter den nåværende faktureringsperioden.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Oppgrader (måneds)abonnementet ditt på %1$s og få muligheten til å booste servere. Det nye abonnementet starter umiddelbart.
-
- Vi fordeler det nåværende abonnementet ditt proporsjonalt og trekker det fra månedsprisen. Du blir belastet **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Oppgrader (måneds)abonnementet ditt på %1$s og få muligheten til å booste servere. Det nye abonnementet starter umiddelbart.
-
- Vi fordeler det nåværende abonnementet ditt proporsjonalt og trekker det fra månedsprisen. Du blir belastet **%2$s** nå, og **%3$s/måned etter den nåværende faktureringsperioden.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Oppgrader (måneds)abonnementet ditt på %1$s og få muligheten til å booste servere. Det nye abonnementet starter umiddelbart.
 
 Vi fordeler ditt nåværende abonnement proporsjonalt og trekker det fra årsprisen. Du blir belastet **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Oppgrader (måneds)abonnementet ditt på %1$s og få muligheten til å booste servere. Det nye abonnementet starter umiddelbart.
-
-Vi fordeler ditt nåværende abonnement proporsjonalt og trekker det fra årsprisen. Du blir belastet **%2$s** nå, og **%3$s/år etter den nåværende faktureringsperioden.**"</string>
     <string name="premium_upgrade_confirm_button">Oppgrader</string>
-    <string name="premium_upgrade_confirm_button_with_price">Oppgrader nå – %1$s</string>
     <string name="premium_upgrade_confirm_title">Oppgrader til %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Du kan ikke abonnere når du allerede har Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Ditt nåværende abonnement.</string>
@@ -3989,8 +3921,6 @@ Er du sikker på at du vil gjøre dette?"</string>
     <string name="stop_streaming">Slutt å strømme</string>
     <string name="stop_watching">Slutt å se på</string>
     <string name="store_channel">Butikkanal</string>
-    <string name="store_payment_legalese_monthly">Hei! Når du kjøper %1$s, godtar du våre [Vilkår for Bruk](%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](%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>
diff --git a/com.discord/res/values-pl/plurals.xml b/com.discord/res/values-pl/plurals.xml
index 7243e1a374..8727004f7c 100644
--- a/com.discord/res/values-pl/plurals.xml
+++ b/com.discord/res/values-pl/plurals.xml
@@ -331,16 +331,6 @@
         <item quantity="one">%d rok</item>
         <item quantity="few">%d lata</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d miesięcy</item>
-        <item quantity="one">%d miesiąc</item>
-        <item quantity="few">%d miesiące</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d lat</item>
-        <item quantity="one">%d rok</item>
-        <item quantity="few">%d lata</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">%d miesięcy</item>
         <item quantity="one">%d miesiąc</item>
@@ -515,17 +505,6 @@
         <item quantity="other">%d użyciach</item>
         <item quantity="one">%d użyciu</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d wspólnych znajomych</item>
-        <item quantity="zero">0 wspólnych znajomych</item>
-        <item quantity="one">1 wspólny znajomy</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d wspólnych serwerów</item>
-        <item quantity="zero">0 wspólnych serwerów</item>
-        <item quantity="one">1 wspólny serwer</item>
-        <item quantity="few">%d wspólne serwery</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dni</item>
         <item quantity="one">1 dzień</item>
@@ -603,11 +582,6 @@
         <item quantity="other">%d miesiące/miesięcy</item>
         <item quantity="one">1 miesiąc</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d ulepszeń</item>
-        <item quantity="one">%d ulepszenie</item>
-        <item quantity="few">%d ulepszenia</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d ulepszeń więcej</item>
         <item quantity="one">%d ulepszenie więcej</item>
@@ -622,16 +596,12 @@
         <item quantity="one">%d Ulepszenie</item>
         <item quantity="few">%d Ulepszenia</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dni</item>
-        <item quantity="one">%d dzień</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d ulepszeń serwera</item>
         <item quantity="one">%d ulepszenie serwera</item>
         <item quantity="few">%d ulepszenia</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d miesięcy</item>
         <item quantity="one">%d miesiąc</item>
         <item quantity="few">%d miesiące</item>
@@ -660,11 +630,6 @@
         <item quantity="one">%d minutę</item>
         <item quantity="few">%d minuty</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** ulepszeń</item>
-        <item quantity="one">**%d** ulepszenie</item>
-        <item quantity="few">**%d** ulepszenia</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d dni</item>
         <item quantity="one">%d dzień</item>
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index 38b7944162..4cf7d1b97d 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -627,7 +627,6 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing">Dane do faktury</string>
     <string name="billing_accept_terms_tooltip">Zaakceptuj Warunki Korzystania z Usługi, aby kontynuować</string>
     <string name="billing_account_credit">Saldo konta</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s miesiące(-ęcy) za darmo</string>
     <string name="billing_add_payment_method">Dodaj metodę płatności</string>
     <string name="billing_address">Adres rozliczeniowy</string>
     <string name="billing_address_address">Adres</string>
@@ -685,8 +684,6 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_payment_choose_plan">Wybierz plan</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](%2$s). %1$s jest subskrypcją odnawianą automatycznie. 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](%2$s). %1$s jest subskrypcją odnawianą automatycznie. 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 rok, dopóki nie anulujesz swojej subskrypcji. Możesz ją anulować w każdej chwili.</string>
     <string name="billing_payment_source_invalid">Źródło płatności jest nieprawidłowe.</string>
     <string name="billing_payment_sources">Metody płatności</string>
     <string name="billing_payment_table_header_amount">Ilość</string>
@@ -704,13 +701,11 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_price_per_month_current_plan">(OBECNY PLAN) %1$s / miesiąc</string>
     <string name="billing_price_per_month_current_plan_ios">(Obecny plan) %1$s / miesiąc</string>
     <string name="billing_price_per_month_mobile">%1$s / MIESIĄC</string>
-    <string name="billing_price_per_month_upgrade">Przedłuż za %1$s / miesiąc</string>
     <string name="billing_price_per_year">%1$s / rok</string>
     <string name="billing_price_per_year_current_plan">(OBECNY PLAN) %1$s / rok</string>
     <string name="billing_price_per_year_current_plan_ios">(Obecny plan) %1$s / rok</string>
     <string name="billing_price_per_year_mobile">%1$s / ROK</string>
     <string name="billing_price_per_year_months_free">%1$s / rok (2 miesiące za darmo)</string>
-    <string name="billing_price_per_year_upgrade">Przedłuż za %1$s / rok</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>
@@ -732,6 +727,10 @@ ale jeżeli zajdzie taka potrzeba, to nie wahaj się!"</string>
     <string name="billing_step_review">Sprawdzanie</string>
     <string name="billing_step_select_plan">Wybierz plan</string>
     <string name="billing_subscribe">Subskrybuj</string>
+    <string name="billing_switch_plan_change">Zmień plan</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Zrozumiano!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Cudnie!</string>
+    <string name="billing_switch_plan_upgrade">Przedłuż</string>
     <string name="billing_tag_failed">Nieudane</string>
     <string name="billing_tag_pending">Oczekujące</string>
     <string name="billing_tag_refunded">Zwrócono</string>
@@ -1780,11 +1779,8 @@ aby móc obserwować czułość wejściową."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Dzięki szczodrości pewnej osoby możesz teraz korzystać z %1$s przez %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Dzięki szczodrości pewnej osoby możesz teraz korzystać z %1$s przez %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">Dodano **%1$s** do Twojej biblioteki.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Dzięki szczodrości pewnej osoby możesz teraz korzystać z większej liczby urozmaiceń czatu i ulepszania serwerów przez %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Dzięki szczodrości pewnej osoby możesz teraz korzystać z większej liczby urozmaiceń czatu przez %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Dzięki szczodrości pewnej osoby możesz teraz korzystać z większej liczby urozmaiceń czatu przez %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Dzięki szczodrości pewnej osoby możesz teraz korzystać z większej liczby urozmaiceń czatu i ulepszania serwerów przez %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Dzięki szczodrości pewnej osoby możesz teraz korzystać z większej liczby urozmaiceń czatu i ulepszania serwerów przez %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Stało się coś dziwnego i torba z prezentem nam się otworzyła… Spróbuj ponownie?</string>
     <string name="gift_confirmation_button_confirm">Ekstra! Dodaj do biblioteki</string>
     <string name="gift_confirmation_button_confirm_mobile">Daj</string>
@@ -2136,9 +2132,7 @@ Utracono: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s sloty(-ów) na emoji na serwerze (razem: %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">limit przesyłania dla wszystkich członków: %1$s</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Korzyści dla ulepszonych serwerów obejmują —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Nikt jeszcze nie użył statusu Nitro na tym serwerze. Sprawdź, czy ktoś z członków chciałby pobłogosławić ten serwer, by uzyskać korzyści Nitro dla całego serwera!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Ulepszone serwery otrzymują wszystko poprzednie oraz —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Brak ulepszenia Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Korzyści dla poziomu 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Korzyści dla poziomu 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Korzyści dla poziomu 3</string>
@@ -2155,16 +2149,12 @@ Utracono: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Odblokowano korzyść poziomu %1$s</string>
     <string name="guild_settings_overview_notice">Uważaj! Masz niezapisane zmiany!</string>
     <string name="guild_settings_overview_tier_info">To jest opcja Nitro poziomu %1$s [Sprawdź status swojego poziomu](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Członkowie serwera z aktywną subskrypcją Nitro mogą pomóc odblokować poziomy, używając swojego statusu Nitro.
-Za każdy osiągnięty poziom członkowie serwera pomagają odblokować korzyści dla wszystkich.
-
-Członkowie mogą cofnąć swoje ulepszenie w dowolnym momencie
-**Jeśli poziom zostanie utracony, serwer zachowa korzyści przez trzy dni. **[Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Brakuje tylko %1$s do następnego poziomu!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** ten serwer</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Status ulepszeń serwera Nitro</string>
+    <string name="guild_settings_premium_guild_title">Status ulepszeń serwera</string>
     <string name="guild_settings_premium_guild_unlocked">Odblokowane</string>
+    <string name="guild_settings_premium_upsell_learn_more">Dowiedz się więcej o Discord Nitro</string>
     <string name="guild_settings_server_banner">Baner serwera</string>
     <string name="guild_settings_server_invite_background">Tło ekranu zapraszania na serwer</string>
     <string name="guild_settings_splash_info">Ten obraz wyświetli się, gdy użytkownicy otrzymają zaproszenie na serwer.</string>
@@ -2174,6 +2164,7 @@ Członkowie mogą cofnąć swoje ulepszenie w dowolnym momencie
 
 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 widget serwera</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Szczegóły zakupu</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 zająć i zweryfikować swoje konto, aby wysyłać wiadomości na tym serwerze.</string>
@@ -2525,10 +2516,6 @@ Czy chcesz dowiedzieć się więcej o Discordzie?"</string>
     <string name="ios_media_keyboard_take_a_photo">Zrób zdjęcie</string>
     <string name="ios_notification_see_full">Dotknij, by zobaczyć pełną wiadomość.</string>
     <string name="ios_profile_in_voice_call">W połączeniu głosowym</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Wspólni znajomi</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Wspólne serwery</string>
     <string name="ios_profile_open_voice_channel">Otwórz kanał głosowy</string>
     <string name="ios_view_all">Wyświetl wszystkie</string>
     <string name="ip_address_secured">Adres IP zabezpieczony</string>
@@ -2843,7 +2830,6 @@ kanałów, do których mają dostęp przenoszeni oraz przenoszący."</string>
     <string name="network_error_unknown">Wystąpił nieznany błąd sieci.</string>
     <string name="network_error_unknown_host">Wystąpił błąd sieci. Sprawdź ustawienia DNS i spróbuj ponownie.</string>
     <string name="network_offline">Połączenie z Internetem ograniczone lub niedostępne.</string>
-    <string name="nevermind">Nieważne</string>
     <string name="new_dm">Nowa wiadomość prywatna</string>
     <string name="new_group_dm">Nowa prywatna rozmowa grupowa</string>
     <string name="new_guilds_dm_allowed">Zezwalaj na wiadomości prywatne od członków serwerów.</string>
@@ -2968,7 +2954,6 @@ przypiętych wiadomości… jeszcze."</string>
     <string name="notice_no_input_detected_help_link_text">Pomocy!</string>
     <string name="notice_no_input_detected_settings">Cóż, wygląda na to, że Discord nie wykrywa żadnego sygnału z Twojego mikrofonu. Naprawmy to!</string>
     <string name="notice_no_input_detected_settings_link_text">Przejdź do Ustawień</string>
-    <string name="notice_premium_grandfathered_ended">Twój dostęp do Nitro wygasł. Przejdź z Nitro Classic na Nitro, aby uzyskać dostęp do takich supermocy, jak urozmaicenia czatu i ulepszenia serwerów.</string>
     <string name="notice_premium_grandfathered_ending">Twoje Nitro kończy się za %1$s! Twoja subskrypcja obniży się do Nitro Classic w dniu **%2$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>
@@ -3202,7 +3187,7 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
     <string name="payment_modal_button_change_card">Zaktualizuj kartę kredytową</string>
     <string name="payment_modal_button_change_paypal">Zaktualizuj konto PayPal</string>
     <string name="payment_modal_button_premium">Zdobądź %1$s</string>
-    <string name="payment_modal_button_premium_gift">Kup %1$s</string>
+    <string name="payment_modal_button_premium_gift">Kup prezent</string>
     <string name="payment_modal_one_month">1 miesiąc</string>
     <string name="payment_modal_one_year">1 rok</string>
     <string name="payment_modal_per_month">Miesięcznie</string>
@@ -3312,9 +3297,6 @@ Nakładka również może nie zadziałać u wszystkich. Jeśli masz problemy lub
 Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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**. Stracisz dostęp do Nitro, Twój tag Discorda zostanie wybrany losowo, jeżeli został przez Ciebie zmieniony, a Twoje ulepszenie serwera zostanie usunięte.
-
- Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Subskrypcja zostanie anulowana pod koniec Twojego obecnego okresu rozliczeniowego w dniu **%1$s**. Stracisz dostęp do Nitro, Twój tag Discorda zostanie wybrany losowo, jeżeli został przez Ciebie zmieniony, a Twoje ulepszenie serwera zostanie usunięte.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Możesz odnowić swoją subskrypcję w każdej chwili.</string>
     <string name="premium_cancel_confirm_mobile">Anuluj Nitro</string>
@@ -3337,7 +3319,6 @@ Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_chat_perks_description_streaming">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_description_upload_limit">Maksymalną wielkość przesyłanych plików można zwiększyć z %1$s do %2$s dzięki Nitro lub do %3$s dzięki Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Ulepsz swój ulubiony serwer!</string>
-    <string name="premium_chat_perks_simple_title">Bez udziwnień – dostajesz podstawowe urozmaicenia czatu bez ulepszeń serwerów.</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>
@@ -3376,41 +3357,20 @@ Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_grandfathered_yearly">W ramach podziękowań za to, że wspierasz Discorda, przyznajemy Ci dostęp do Nitro na dwa lata. Ten dostęp kończy się w dniu **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Czas odnowienia ulepszeń: **%1$sd %2$sgodz. %3$smin**</string>
     <string name="premium_guild_features_blurb">Ulepszenie serwera z subskrypcją Nitro pomoże mu wejść na wyższy poziom. Każdy osiągnięty poziom oznacza odblokowanie urozmaiceń czatu **dla wszystkich na tym serwerze!** Sprawdź niektóre z tych świetnych korzyści:</string>
-    <string name="premium_guild_features_customize_guild_description">Odblokuj personalizację, na przykład: tło zaproszenia, baner serwera, unikalny adres URL itp.</string>
     <string name="premium_guild_features_customize_guild_mobile">Personalizacja serwera</string>
-    <string name="premium_guild_features_customize_guild_title">Personalizacja serwera</string>
     <string name="premium_guild_features_learn_more_button">Dowiedz się więcej o Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Zdobądź lepsze możliwości na Discordzie już za niewielką miesięczną opłatę.</string>
     <string name="premium_guild_features_more">I nie tylko! Możesz sprawdzić obecny poziom, postępy w zdobywaniu poziomów i dostępne korzyści na serwerze.</string>
-    <string name="premium_guild_features_new_role_description">Zdobądź specjalną nową rolę na serwerze, która jest dostępna tylko dla ulepszających serwer Nitro na Twoim serwerze.</string>
-    <string name="premium_guild_features_new_role_mobile">Ekskluzywne role ulepszających serwer Nitro</string>
-    <string name="premium_guild_features_new_role_title">Ekskluzywna nowa rola</string>
-    <string name="premium_guild_features_show_support_description">Ulepszający otrzymują nowe, błyszczące odznaki profilowe, które zmieniają się wraz z ich ciągiem ulepszania.</string>
     <string name="premium_guild_features_show_support_mobile">Nowa odznaka profilowa zmienia się w czasie</string>
-    <string name="premium_guild_features_show_support_title">Pokaż swoje wsparcie</string>
     <string name="premium_guild_features_title">Mając Nitro, możesz pomóc ulepszać serwery!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Zwiększone rozmiary przesyłanych plików dla całej społeczności</string>
-    <string name="premium_guild_features_upload_sizes_title">Większe rozmiary przesyłanych plików dla wszystkich</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Subskrybuj Nitro, by wysłać serwerowi ulepszenie Nitro! [Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Przedłuż swoją subskrypcję, by wysłać serwerowi ulepszenie Nitro! [Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Brak ulepszeń Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Brak poziomu</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Ulepszenie serwera Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">Korzyści dla ulepszonych serwerów obejmują —</string>
-    <string name="premium_guild_perks_modal_blurb">"Z każdym osiągniętym poziomem członkowie tego serwera pomagają odblokowywać korzyści dla wszystkich. Te korzyści działają tylko na tym serwerze.
-
-**Ulepszający otrzymują ikonę na liście członków, nową, zmieniającą się odznakę i rolę dostępną tylko dla ulepszających.**
-
-[Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Z każdym osiągniętym poziomem członkowie tego serwera pomagają odblokowywać korzyści dla wszystkich. Te korzyści działają tylko na tym serwerze.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Ulepszający otrzymują ikonę na liście członków, nową, zmieniającą się odznakę i rolę dostępną tylko dla ulepszających.** [Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Zdobądź Nitro, by ulepszać!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Ulepsz ten serwer</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Przejdź na Nitro, by ulepszać!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Aktualnie nie wspieramy podnoszenia subskrypcji do Nitro za pośrednictwem Apple. Możesz anulować swoją subskrypcję w [Zarządzaniu subskrypcjami Apple](%1$s), ale subskrypcja pozostanie aktywna do dnia jej wygaśnięcia.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic nie obejmuje ulepszania serwerów</string>
     <string name="premium_guild_perks_modal_header">Status ulepszeń serwera</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** Ulepszeń</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Zarządzaj swoim ulepszeniem</string>
     <string name="premium_guild_perks_modal_no_tiers">Brak osiągniętych poziomów</string>
@@ -3423,44 +3383,32 @@ Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s ulepszył(-o) ten serwer</string>
     <string name="premium_guild_settings_members_subscribed_needed">Potrzebujesz o **%1$s** by odblokować %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Czy na pewno chcesz wysłać ulepszenie Nitro do:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Wybierz ten serwer</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Wybierz ten serwer. Ulepszenie pojawi się za jakiś czas.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Jeśli ulepszysz ten serwer, nie będziesz móc ulepszyć innego serwera przez %1$s. Usunięcie ulepszenia nie wpływa na czas odnowienia.**</string>
     <string name="premium_guild_subscribe_confirm_header">Wybierz mądrze!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Przeszukaj serwery</string>
     <string name="premium_guild_subscribe_select_guild_header">Wybierz serwer</string>
     <string name="premium_guild_subscribe_success_thanks">Dzięki za ulepszenie!</string>
     <string name="premium_guild_subscription_available_count">Masz do dyspozycji **%1$s**!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Pojawił się błąd podczas próby ulepszenia. Spróbuj ponownie.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Wygląda na to, że trwa czas odnowienia. Zaczekaj **%1$s i %2$s** i spróbuj ponownie</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Wygląda na to, że trwa czas odnowienia. Zaczekaj **%1$s i %2$s** i spróbuj ponownie</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Wygląda na to, że trwa czas odnowienia. Zaczekaj **%1$s** i spróbuj ponownie</string>
     <string name="premium_guild_subscription_no_next_tier">Ten serwer ma pełną moc! Ulepszaj dalej!</string>
-    <string name="premium_guild_subscription_notice">Ulepszenia serwera Nitro są tutaj! Zmotywuj swoją społeczność do ulepszania Twojego serwera.</string>
     <string name="premium_guild_subscription_notice_button">Przejrzyj poziomy i korzyści</string>
-    <string name="premium_guild_subscription_notice_small_guild">Ulepszenia serwera Nitro są tutaj! Zmotywuj swoich znajomych do ulepszania Twojego serwera.</string>
     <string name="premium_guild_subscription_remove_button">Usuń ulepszenie</string>
     <string name="premium_guild_subscription_remove_error_mobile">Pojawił się błąd podczas próby usunięcia ulepszenia. Spróbuj ponownie.</string>
     <string name="premium_guild_subscription_select_server_button">Wybierz serwer</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Wykorzystaj swoje moce Nitro, by ulepszyć serwer, do którego właśnie dołączono! Ulepszenie serwera pozwala mu czynić postępy ku wyższym poziomom. Każdy poziom oferuje zbiorowe korzyści dla całego serwera.
- Ulepszenie serwera aktywuje siedmiodniowy czas odnowienia. Nie możesz ulepszać innych serwerów, póki nie upłynie czas odnowienia, nawet jeśli usuniesz ulepszenie. [Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Wykorzystaj swoje moce Nitro, by ulepszyć serwer, do którego właśnie dołączono! Ulepszenie serwera pozwala mu czynić postępy ku wyższym poziomom. Każdy poziom oferuje zbiorowe korzyści dla całego serwera.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Ulepszenie serwera aktywuje siedmiodniowy czas odnowienia. Nie możesz ulepszać innych serwerów, póki nie upłynie czas odnowienia, nawet jeśli usuniesz ulepszenie. [Dowiedz się więcej o ulepszeniach serwera Nitro.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Ulepszenie serwera Nitro</string>
-    <string name="premium_guild_subscription_tooltip">Ulepszanie Nitro od %1$s</string>
+    <string name="premium_guild_tier_0">Brak poziomu</string>
     <string name="premium_guild_tier_1">Poziom 1</string>
     <string name="premium_guild_tier_2">Poziom 2</string>
     <string name="premium_guild_tier_3">Poziom 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Czy na pewno chcesz usunąć ulepszenie Nitro z:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Tak, usuń ulepszenie</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Ten serwer straci postępy, jeśli usuniesz ulepszenie.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Ten serwer straci postępy, jeśli usuniesz ulepszenie. **Trwa czas odnowienia Twojego ulepszenia. Będzie znowu dostępne za %1$s i %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Ten serwer straci postępy, jeśli usuniesz ulepszenie. **Trwa czas odnowienia Twojego ulepszenia. Będzie znowu dostępne za %1$s i %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Ten serwer straci postępy, jeśli usuniesz ulepszenie. **Trwa czas odnowienia Twojego ulepszenia. Będzie znowu dostępne za %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Usuń ulepszenie Nitro?</string>
     <string name="premium_included">Nitro obejmuje:</string>
     <string name="premium_info_monthly">Opłata %1$s (miesięczna) pobierana jest w dniu %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** miesięcznie</string>
@@ -3473,7 +3421,6 @@ Możesz odnowić swoją subskrypcję w każdej chwili."</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_button_iap">Zdobądź %1$s</string>
     <string name="premium_payment_confirmation_button_regular">OK, brzmi w porzo</string>
-    <string name="premium_payment_gift_blurb">Podaruj znajomym [Nitro](onClick), by mogli korzystać z takich supermocy, jak urozmaicenia czatu i ulepszanie serwerów.</string>
     <string name="premium_payment_gift_blurb_mobile">Podaruj komuś Nitro, by dać mu dostęp do świetnych urozmaiceń czatu i ulepszania serwerów. [Dowiedz się więcej o Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">To jednorazowa opłata za wybrany okres czasu. Opłata nie będzie pobierana co miesiąc.</string>
     <string name="premium_payment_is_gift">Kupujesz prezent.</string>
@@ -3488,7 +3435,6 @@ Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_plan_month_tier_1">Miesięczna subskrypcja Nitro Classic</string>
     <string name="premium_plan_month_tier_2">Miesięczna subskrypcja Nitro</string>
     <string name="premium_promo_autocomplete">Używaj własnych emoji w każdym miejscu</string>
-    <string name="premium_promo_description">Wystartuj z Discord Nitro, aby używać animowanych i własnych emoji na każdym serwerze.</string>
     <string name="premium_promo_title">Chcesz poznać moc ulepszonych emoji?</string>
     <string name="premium_required">Wymagane Nitro</string>
     <string name="premium_required_get_nitro">Pobierz Nitro!</string>
@@ -3507,26 +3453,10 @@ Możesz odnowić swoją subskrypcję w każdej chwili."</string>
     <string name="premium_tier_2_title">Zdobądź lepsze możliwości na Discordzie za niewielką miesięczną opłatę.</string>
     <string name="premium_trial_button">Rozpocznij darmowy okres próbny</string>
     <string name="premium_upgrade_cancel">Nie</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Przedłuż subskrypcję na roczną i zdobądź dwa miesiące za darmo. Ale deal!
-
-Odliczymy koszt obecnego planu od ceny rocznej. Pobrane zostanie **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Przedłuż subskrypcję na roczną i zdobądź dwa miesiące za darmo. Ale deal!
-
-Odliczymy koszt obecnego planu od ceny rocznej. Teraz pobrane zostanie **%1$s**, a następnie **%2$s miesięcznie po upływie obecnego okresu rozliczeniowego.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Przejdź na plan %1$s (miesięczny) i zdobądź możliwość ulepszania serwerów. Twój nowy plan zacznie obowiązywać natychmiast.
-
- Odliczymy koszt bieżącego planu od ceny miesięcznej. Pobrane zostanie **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Przejdź na plan %1$s (miesięczny) i zdobądź możliwość ulepszania serwerów. Twój nowy plan zacznie obowiązywać natychmiast.
-
- Odliczymy koszt bieżącego planu od ceny miesięcznej. Teraz pobrane zostanie **%2$s**, a następnie **%3$s miesięcznie po upływie obecnego okresu rozliczeniowego.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Przejdź na plan %1$s (miesięczny) i zdobądź możliwość ulepszania serwerów. Twój nowy plan zacznie obowiązywać natychmiast.
 
 Odliczymy koszt bieżącego planu od ceny rocznej. Pobrane zostanie **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Przejdź na plan %1$s (miesięczny) i zdobądź możliwość ulepszania serwerów. Twój nowy plan zacznie obowiązywać natychmiast.
-
-Odliczymy koszt bieżącego planu od ceny rocznej. Teraz pobrane zostanie **%2$s**, a następnie **%3$s rocznie po upływie obecnego okresu rozliczeniowego.**"</string>
     <string name="premium_upgrade_confirm_button">Przedłuż</string>
-    <string name="premium_upgrade_confirm_button_with_price">Przedłuż teraz – %1$s</string>
     <string name="premium_upgrade_confirm_title">Przedłuż na %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Nie możesz subskrybować, gdy masz już Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Twój bieżący plan.</string>
@@ -4087,8 +4017,6 @@ Czy na pewno chcesz to zrobić?"</string>
     <string name="stop_streaming">Zakończ streamowanie</string>
     <string name="stop_watching">Zakończ oglądanie</string>
     <string name="store_channel">Kanał sklepu</string>
-    <string name="store_payment_legalese_monthly">Hej! Kupując %1$s, akceptujesz nasze [Warunki Korzystania z Usługi](%2$s). %1$s jest subskrypcją odnawianą automatycznie, 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](%2$s). %1$s jest subskrypcją odnawianą automatycznie, 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>
diff --git a/com.discord/res/values-pt-rBR/plurals.xml b/com.discord/res/values-pt-rBR/plurals.xml
index 9c8c6feebc..87c1c5aeb7 100644
--- a/com.discord/res/values-pt-rBR/plurals.xml
+++ b/com.discord/res/values-pt-rBR/plurals.xml
@@ -286,14 +286,6 @@
         <item quantity="other">%d anos</item>
         <item quantity="one">%d ano</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d meses</item>
-        <item quantity="one">%d mês</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d anos</item>
-        <item quantity="one">%d ano</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">meses</item>
         <item quantity="one">mês</item>
@@ -450,16 +442,6 @@
         <item quantity="other">%d usos</item>
         <item quantity="one">%d uso</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d amigos mútuos</item>
-        <item quantity="zero">0 amigos mútuos</item>
-        <item quantity="one">1 amigo mútuo</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d amigos mútuos</item>
-        <item quantity="zero">0 servidores mútuos</item>
-        <item quantity="one">1 servidor mútuo</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dias</item>
         <item quantity="one">1 dia</item>
@@ -533,10 +515,6 @@
         <item quantity="other">%d meses</item>
         <item quantity="one">1 mês</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d impulsos</item>
-        <item quantity="one">%d impulso</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d impulsos</item>
         <item quantity="one">%d impulso</item>
@@ -549,15 +527,11 @@
         <item quantity="other">%d impulsos</item>
         <item quantity="one">%d impulso</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dias</item>
-        <item quantity="one">%d dia</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d impulsos de servidor disponíveis</item>
         <item quantity="one">%d impulso de servidor disponível</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d meses</item>
         <item quantity="one">%d mês</item>
     </plurals>
@@ -581,10 +555,6 @@
         <item quantity="other">%d minutos</item>
         <item quantity="one">%d minuto</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** impulsos</item>
-        <item quantity="one">**%d** impulso</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d dias</item>
         <item quantity="one">%d dia</item>
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index c9d4ec024a..aed0831d59 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -622,7 +622,6 @@ mas se e quando precisar, não hesite!"</string>
     <string name="billing">Cobrança</string>
     <string name="billing_accept_terms_tooltip">Aceite os termos de serviço para continuar</string>
     <string name="billing_account_credit">Crédito da conta</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s meses de graça</string>
     <string name="billing_add_payment_method">Adicionar método de pagamento</string>
     <string name="billing_address">Endereço de cobrança</string>
     <string name="billing_address_address">Endereço</string>
@@ -680,8 +679,6 @@ mas se e quando precisar, não hesite!"</string>
     <string name="billing_payment_choose_plan">Escolha um plano</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 nossos [Termos de Serviço](%2$s). %1$s é uma assinatura automática. 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 nossos [Termos de Serviço](%2$s). %1$s é uma assinatura automática. 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_source_invalid">Este método de pagamento é inválido.</string>
     <string name="billing_payment_sources">Métodos de Pagamento</string>
     <string name="billing_payment_table_header_amount">Total</string>
@@ -699,13 +696,11 @@ mas se e quando precisar, não hesite!"</string>
     <string name="billing_price_per_month_current_plan">(PLANO ATUAL) %1$s / mês</string>
     <string name="billing_price_per_month_current_plan_ios">(Plano atual) %1$s / mês</string>
     <string name="billing_price_per_month_mobile">%1$s / MÊS</string>
-    <string name="billing_price_per_month_upgrade">Adquira por %1$s /mês</string>
     <string name="billing_price_per_year">%1$s / Ano</string>
     <string name="billing_price_per_year_current_plan">(PLANO ATUAL) %1$s / ano</string>
     <string name="billing_price_per_year_current_plan_ios">(Plano atual) %1$s / ano</string>
     <string name="billing_price_per_year_mobile">%1$s / ANO</string>
     <string name="billing_price_per_year_months_free">%1$s / Ano (2 meses grátis)</string>
-    <string name="billing_price_per_year_upgrade">Adquira por %1$s /ano</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>
@@ -727,6 +722,10 @@ mas se e quando precisar, não hesite!"</string>
     <string name="billing_step_review">Revisar</string>
     <string name="billing_step_select_plan">Selecionar plano</string>
     <string name="billing_subscribe">Inscrever-se</string>
+    <string name="billing_switch_plan_change">Alterar plano</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Entendi!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Maravilha!</string>
+    <string name="billing_switch_plan_upgrade">Melhorar</string>
     <string name="billing_tag_failed">Malsucedida</string>
     <string name="billing_tag_pending">Pendente</string>
     <string name="billing_tag_refunded">Reembolsada</string>
@@ -1781,11 +1780,8 @@ para poder observar a sensibilidade."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Graças a outro ser humano generoso, agora você tem %1$s durante %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Graças a outro ser humano generoso, agora você tem %1$s durante %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** foi adicionado à sua biblioteca.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Graças a outro ser humano generoso, agora você tem acesso a vantagens de bate-papo aprimoradas e um impulso de servidor durante %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Graças a outro ser humano generoso, agora você tem acesso a vantagens de bate-papo aprimoradas durante %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Graças a outro ser humano generoso, agora você tem acesso a vantagens de bate-papo aprimoradas durante %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Graças a outro ser humano generoso, agora você tem acesso a vantagens de bate-papo aprimoradas e um impulso de servidor durante %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Graças a outro ser humano generoso, agora você tem acesso a vantagens de bate-papo aprimoradas e um impulso de servidor durante %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Aconteceu algo esquisito e não conseguimos pegar a bolsa… Tentar novamente?</string>
     <string name="gift_confirmation_button_confirm">Com certeza! Adicionar à biblioteca</string>
     <string name="gift_confirmation_button_confirm_mobile">Dá pra mim</string>
@@ -2139,9 +2135,7 @@ Perdeu: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s espaços de emoji do servidor (para um total de %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s de limite de envio para todos os membros</string>
     <string name="guild_settings_guild_premium_perks_base_perks">As vantagens do servidor impulsionado incluem —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Ninguém concedeu Nitro a esse servidor ainda. Veja se algum membro gentilmente abençoaria seu servidor para obter Vantagens Nitro para todo o servidor!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Servidores impulsionados têm tudo de bom, e —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Nenhum impulso Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Vantagens de Nível 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Vantagens de Nível 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Vantagens de Nível 3</string>
@@ -2158,16 +2152,12 @@ Perdeu: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Vantagem do Nível %1$s desbloqueada</string>
     <string name="guild_settings_overview_notice">Cuidado! Você tem alterações que não foram salvas!</string>
     <string name="guild_settings_overview_tier_info">Esse é um recurso do Nitro Nível %1$s. [Verifique o estado do seu nível](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Os membros do servidor com uma assinatura Nitro ativa podem contribuir com o desbloqueio de níveis concedendo seu status Nitro.
-Para cada nível alcançado, os membros do servidor ajudarão a desbloquear benefícios para todos.
-
-Os membros podem revogar seu impulso a qualquer momento.
-**O servidor manterá as vantagens por três dias se um nível for perdido. **[Saiba mais sobre o impulsionamento de servidores Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Só mais %1$s até o próximo nível!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** impulsionaram esse servidor</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Estado do impulso de servidor Nitro</string>
+    <string name="guild_settings_premium_guild_title">Estado do impulsionamento do servidor</string>
     <string name="guild_settings_premium_guild_unlocked">Desbloqueado</string>
+    <string name="guild_settings_premium_upsell_learn_more">Saiba mais sobre o Discord Nitro</string>
     <string name="guild_settings_server_banner">Faixa do servidor</string>
     <string name="guild_settings_server_invite_background">Plano de fundo do convite do servidor</string>
     <string name="guild_settings_splash_info">Essa imagem será exibida quando os usuários receberem um convite para o servidor.</string>
@@ -2177,6 +2167,7 @@ Os membros podem revogar seu impulso a qualquer momento.
 
 Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente &amp;username= aos parâmetros do URL."</string>
     <string name="guild_settings_widget_enable_widget">Ativar o widget do servidor</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Detalhes da compra</string>
     <string name="guild_verification_text_account_age">Sua conta precisa ter sido criada há pelo menos %1$s minutos para enviar mensagens neste servidor.</string>
     <string name="guild_verification_text_member_age">Você precisa ser um membro há pelo menos %1$s minutos para enviar mensagens neste servidor.</string>
     <string name="guild_verification_text_not_claimed">Você precisa criar e verificar sua conta antes de poder enviar mensagens neste servidor.</string>
@@ -2525,10 +2516,6 @@ Quer saber mais sobre o Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Tire uma foto</string>
     <string name="ios_notification_see_full">Toque para ver a mensagem completa.</string>
     <string name="ios_profile_in_voice_call">Em uma chamada de voz</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Amigos em comum</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Servidores em comum</string>
     <string name="ios_profile_open_voice_channel">Abrir canal de voz</string>
     <string name="ios_view_all">Ver tudo</string>
     <string name="ip_address_secured">Endereço IP protegido</string>
@@ -2844,7 +2831,6 @@ entre canais que ambos tenham acesso."</string>
     <string name="network_error_unknown">Ocorreu um erro de rede desconhecido.</string>
     <string name="network_error_unknown_host">Ocorreu um erro de rede. Verifique suas configurações de DNS e tente novamente.</string>
     <string name="network_offline">Conectividade de rede limitada ou indisponível.</string>
-    <string name="nevermind">Deixa pra lá</string>
     <string name="new_dm">Nova mensagem direta</string>
     <string name="new_group_dm">Novo grupo privado</string>
     <string name="new_guilds_dm_allowed">Permitir mensagens diretas de membros do servidor.</string>
@@ -2968,7 +2954,6 @@ mensagens fixadas… ainda."</string>
     <string name="notice_no_input_detected_help_link_text">Me ajuda!</string>
     <string name="notice_no_input_detected_settings">Bem, parece que o Discord não está detectando nenhuma entrada do seu microfone. Vamos consertar isso!</string>
     <string name="notice_no_input_detected_settings_link_text">Visitar configurações</string>
-    <string name="notice_premium_grandfathered_ended">Seu acesso ao Nitro expirou. Mude do Nitro Classic para o Nitro para ter supervantagens de bate-papo e um impulso de servidor.</string>
     <string name="notice_premium_grandfathered_ending">Você só tem mais %1$s de Nitro! Sua assinatura será rebaixada para Nitro Classic em **%2$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>
@@ -3202,7 +3187,7 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
     <string name="payment_modal_button_change_card">Atualizar cartão de crédito</string>
     <string name="payment_modal_button_change_paypal">Atualizar a conta do PayPal</string>
     <string name="payment_modal_button_premium">Obter %1$s</string>
-    <string name="payment_modal_button_premium_gift">Comprar %1$s</string>
+    <string name="payment_modal_button_premium_gift">Comprar presente</string>
     <string name="payment_modal_one_month">1 mês</string>
     <string name="payment_modal_one_year">1 ano</string>
     <string name="payment_modal_per_month">Por mês</string>
@@ -3313,9 +3298,6 @@ Além disso, a sobreposição pode não funcionar para todos. Se estiver com pro
 Você pode voltar a assinar a qualquer momento."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">O cancelamento ocorrerá no fim do período pago atual, **%1$s**. Sua Discord Tag será randomizada, caso você a tenha mudado.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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á acesso ao Nitro, sua Discord Tag será randomizada, caso você a tenha mudado, e seu impulso de servidor será removido.
-
-Você pode voltar a assinar a qualquer momento."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">O cancelamento ocorrerá no fim do período pago atual. Em **%1$s**, você perderá o acesso ao Nitro, sua Discord Tag será randomizada, caso você a tenha mudado, e seu impulso de servidor será removido.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Você pode voltar a assinar a qualquer momento.</string>
     <string name="premium_cancel_confirm_mobile">Cancelar o Nitro</string>
@@ -3338,7 +3320,6 @@ Você pode voltar a assinar a qualquer momento."</string>
     <string name="premium_chat_perks_description_streaming">Transmita na qualidade fonte com o Nitro ou em até lindos 1080p a 60fps com o Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Mais espaço de envio de arquivos, de %1$s para %2$s com o Nitro ou %3$s com o Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Impulsione seu servidor favorito!</string>
-    <string name="premium_chat_perks_simple_title">Seja humildão ou humildona, receba as vantagens de bate-papo sem poder impulsionar servidores.</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>
@@ -3377,41 +3358,20 @@ Você pode voltar a assinar a qualquer momento."</string>
     <string name="premium_grandfathered_yearly">Como agradecimento por apoiar o Discord, você ganhou acesso ao Nitro por 2 anos. Seu acesso termina em **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Intervalo do impulsionamento: **%1$sd %2$sh %3$sm**</string>
     <string name="premium_guild_features_blurb">Impulsionar um servidor com sua assinatura Nitro o ajudará a progredir para um novo nível. Para cada nível alcançado, ele desbloqueará vantagens de bate-papo **para todos os membros do servidor!** Confira algumas dessas vantagens incríveis:</string>
-    <string name="premium_guild_features_customize_guild_description">Desbloqueie personalizações, como plano de fundo de convites, faixa do servidor, URL personalizado, etc.</string>
     <string name="premium_guild_features_customize_guild_mobile">Personalizações de servidor</string>
-    <string name="premium_guild_features_customize_guild_title">Personalizações de servidor</string>
     <string name="premium_guild_features_learn_more_button">Saiba mais sobre o Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Obtenha uma experiência aprimorada do Discord começando com um baixo custo mensal.</string>
     <string name="premium_guild_features_more">E mais! Você pode verificar o nível atual, a progressão do nível e as vantagens disponíveis em um servidor.</string>
-    <string name="premium_guild_features_new_role_description">Obtenha um cargo de servidor especial disponível apenas para os impulsionadores de servidores Nitro do seu servidor.</string>
-    <string name="premium_guild_features_new_role_mobile">Cargos exclusivos de impulsionadores de servidores Nitro</string>
-    <string name="premium_guild_features_new_role_title">Novo cargo exclusivo</string>
-    <string name="premium_guild_features_show_support_description">Os impulsionadores recebem um emblema de perfil novinho em folha que se altera de acordo com a sequência atingida.</string>
     <string name="premium_guild_features_show_support_mobile">Um novo emblema de perfil que se altera com o tempo</string>
-    <string name="premium_guild_features_show_support_title">Mostre seu apoio</string>
     <string name="premium_guild_features_title">Com o Nitro, você pode ajudar a impulsionar um servidor!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Tamanhos de envio aumentados em toda a comunidade</string>
-    <string name="premium_guild_features_upload_sizes_title">Tamanhos de envio maiores para todos</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Assine o Nitro para enviar impulsos Nitro a um servidor! [Saiba mais sobre o impulsionamento de servidor Nitro.] (%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Atualize sua assinatura para enviar um Impulso Nitro para um servidor! [Saiba mais sobre o impulsionamento de servidor Nitro.] (%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Nenhum impulso Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Nenhum nível</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Impulso de servidor Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">As vantagens do servidor impulsionado incluem —</string>
-    <string name="premium_guild_perks_modal_blurb">"Para cada nível alcançado, os membros desse servidor ajudarão a desbloquear vantagens para todos. Essas vantagens são válidas apenas dentro do servidor.
-
- **Os impulsionadores recebem: ícone da lista de membros, um novo emblema que evolui e um cargo exclusivo para impulsionadores.**
-
- [Saiba mais sobre o impulsionamento de servidor Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Para cada nível alcançado, os membros desse servidor ajudarão a desbloquear vantagens para todos. Essas vantagens são válidas apenas dentro do servidor.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Os impulsionadores recebem: ícone da lista de membros, um novo emblema que evolui e um cargo exclusivo para impulsionadores.** [Saiba mais sobre o impulsionamento de servidor Nitro.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Obtenha o Nitro para impulsionar!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Impulsionar esse servidor</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Aprimore para o Nitro para impulsionar!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">No momento, não oferecemos suporte para aprimoramentos de assinaturas Nitro pela Apple. Você pode cancelar sua assinatura pelo [Gerenciamento de assinaturas da Apple](%1$s), mas a assinatura permanecerá ativa até a data de vencimento.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">O Nitro Classic não inclui o impulso de servidores</string>
     <string name="premium_guild_perks_modal_header">Estado do impulsionamento do servidor</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** impulsos</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Gerenciar seu impulso</string>
     <string name="premium_guild_perks_modal_no_tiers">Nenhum nível alcançado ainda</string>
@@ -3424,44 +3384,32 @@ Você pode voltar a assinar a qualquer momento."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s esse servidor</string>
     <string name="premium_guild_settings_members_subscribed_needed">Você precisa de mais **%1$s** para desbloquear %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Deseja mesmo enviar um Impulso Nitro para:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Selecionar esse servidor</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Selecione esse servidor. Vai demorar um pouquinho para o seu impulso entrar em vigor.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Impulsionar esse servidor impedirá que você impulsione outro servidor durante %1$s. A remoção do impulso não afeta o intervalo.**</string>
     <string name="premium_guild_subscribe_confirm_header">Escolha sabiamente!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Buscar servidores</string>
     <string name="premium_guild_subscribe_select_guild_header">Selecione um servidor</string>
     <string name="premium_guild_subscribe_success_thanks">Obrigado pelo impulso!</string>
     <string name="premium_guild_subscription_available_count">Você tem **%1$s**!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Ocorreu um erro ao tentar impulsionar. Tente novamente.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Parece que você está no intervalo. Aguarde **%1$s e %2$s** antes de tentar novamente</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Parece que você está no intervalo. Aguarde **%1$s e %2$s** antes de tentar novamente</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Parece que você está no intervalo. Aguarde **%1$s** antes de tentar novamente</string>
     <string name="premium_guild_subscription_no_next_tier">Esse servidor está com força total! Continue impulsionando!</string>
-    <string name="premium_guild_subscription_notice">Os impulsos de servidor Nitro chegaram! Reúna sua comunidade para impulsionar seu servidor.</string>
     <string name="premium_guild_subscription_notice_button">Veja os níveis e as vantagens</string>
-    <string name="premium_guild_subscription_notice_small_guild">Os impulsos de servidor Nitro chegaram! Reúna seus amigos para impulsionar seu servidor.</string>
     <string name="premium_guild_subscription_remove_button">Remover impulso</string>
     <string name="premium_guild_subscription_remove_error_mobile">Ocorreu um erro ao tentar remover o impulso. Tente novamente.</string>
     <string name="premium_guild_subscription_select_server_button">Selecione um servidor</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Use seus poderes Nitro para impulsionar um servidor do qual você faz parte! Impulsionar um servidor permite que ele progrida aos próximos níveis. Cada nível concede vantagens coletivas para todo o servidor.
-Impulsionar um servidor ativa um intervalo de 7 dias. Você não pode impulsionar outro servidor até que esse intervalo termine, mesmo se você remover o seu impulso. [Saiba mais sobre o impulsionamento de servidor Nitro.] (%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Use seus poderes Nitro para impulsionar um servidor do qual você faz parte! Impulsionar um servidor permite que ele progrida aos próximos níveis. Cada nível concede vantagens coletivas para todo o servidor.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Impulsionar um servidor ativa uma reativação de 7 dias. Você não pode impulsionar outro servidor até que esse intervalo termine, mesmo se você remover o seu impulso. [Saiba mais sobre o impulsionamento de servidores Nitro.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Impulso de servidor Nitro</string>
-    <string name="premium_guild_subscription_tooltip">Usando o impulso Nitro desde %1$s</string>
+    <string name="premium_guild_tier_0">Nenhum nível</string>
     <string name="premium_guild_tier_1">Nível 1</string>
     <string name="premium_guild_tier_2">Nível 2</string>
     <string name="premium_guild_tier_3">Nível 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Tem certeza que quer remover esse impulso Nitro de:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Sim, remover impulso</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Esse servidor perderá progresso se você remover seu impulso.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Esse servidor perderá progresso se você remover seu impulso. **Seu impulso ainda tem um intervalo. Ele ficará disponível em %1$s e %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Esse servidor perderá progresso se você remover seu impulso. **Seu impulso ainda tem um intervalo. Ele ficará disponível em %1$s e %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Esse servidor perderá progresso se você remover seu impulso. **Seu impulso ainda tem um intervalo. Ele ficará disponível em %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Remover impulso Nitro?</string>
     <string name="premium_included">Inclusos no Nitro:</string>
     <string name="premium_info_monthly">%1$s (mensal) cobrados em %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Mês</string>
@@ -3474,7 +3422,6 @@ Impulsionar um servidor ativa um intervalo de 7 dias. Você não pode impulsiona
     <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_button_iap">Obter %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Valeu, falou</string>
-    <string name="premium_payment_gift_blurb">Dê o [Nitro](onClick) de presente para seus amigos para que eles possam obter supervantagens de bate-papo e um impulso de servidor.</string>
     <string name="premium_payment_gift_blurb_mobile">Dê o Nitro de presente a alguém para que ele (ou ela) tenha acesso a vantagens de bate-papo superpoderosas e ao impulso de servidor. [Saiba mais sobre o Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Essa será uma cobrança única pela quantidade de tempo escolhida. Você não será cobrado mensalmente.</string>
     <string name="premium_payment_is_gift">Você está comprando um presente.</string>
@@ -3489,7 +3436,6 @@ Impulsionar um servidor ativa um intervalo de 7 dias. Você não pode impulsiona
     <string name="premium_plan_month_tier_1">Nitro Classic Mensal</string>
     <string name="premium_plan_month_tier_2">Nitro Mensal</string>
     <string name="premium_promo_autocomplete">Use emojis personalizados em qualquer lugar</string>
-    <string name="premium_promo_description">Obtenha o Discord Nitro para poder usar emojis animados e personalizados em qualquer servidor.</string>
     <string name="premium_promo_title">Quer melhorar o poder dos emojis?</string>
     <string name="premium_required">Nitro Necessário</string>
     <string name="premium_required_get_nitro">Obtenha o Nitro!</string>
@@ -3508,26 +3454,10 @@ Impulsionar um servidor ativa um intervalo de 7 dias. Você não pode impulsiona
     <string name="premium_tier_2_title">Obtenha uma experiência aprimorada do Discord por um módico custo mensal.</string>
     <string name="premium_trial_button">Inicie sua avaliação gratuita</string>
     <string name="premium_upgrade_cancel">Melhor não</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Melhore seu plano para o anual e ganhe 2 meses grátis. Que pechincha!
-
-Vamos contabilizar seu plano atual e descontar o valor dele do valor anual. A cobrança será de **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Melhore seu plano para o anual e ganhe 2 meses grátis. Que pechincha!
-
-Vamos contabilizar seu plano atual e descontar o valor dele do valor anual. A cobrança será de **%1$s** agora, e **%2$s/ano após o primeiro período pago.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Aprimore seu plano %1$s (mensal) para ter a habilidade de impulsionar servidores. Seu novo plano começará imediatamente.
-
-Vamos contabilizar seu plano atual e descontar o valor dele do preço mensal. A cobrança será de **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Aprimore seu plano %1$s (mensal) para ter a habilidade de impulsionar servidores. Seu novo plano começará imediatamente.
-
-Vamos contabilizar seu plano atual e descontar o valor dele do preço manual. A cobrança será de **%2$s** agora, e **%3$s/mês após o primeiro período pago.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Aprimore seu plano %1$s (mensal) para ter a habilidade de impulsionar servidores. Seu novo plano começará imediatamente.
 
 Vamos contabilizar seu plano atual e descontar o valor dele do preço anual. A cobrança será de **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Aprimore seu plano %1$s (mensal) para ter a habilidade de impulsionar servidores. Seu novo plano começará imediatamente.
-
-Vamos contabilizar seu plano atual e descontar o valor dele do preço anual. A cobrança será de **%2$s** agora, e **%3$s/ano após o primeiro período pago.**"</string>
     <string name="premium_upgrade_confirm_button">Melhorar</string>
-    <string name="premium_upgrade_confirm_button_with_price">Aprimore agora - %1$s</string>
     <string name="premium_upgrade_confirm_title">Adquirir o %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Você não pode se inscrever enquanto já possui o Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Seu plano atual.</string>
@@ -4087,8 +4017,6 @@ Deseja mesmo fazer isso?"</string>
     <string name="stop_streaming">Parar de transmitir</string>
     <string name="stop_watching">Parar de assistir</string>
     <string name="store_channel">Canal de loja</string>
-    <string name="store_payment_legalese_monthly">Oi! Ao comprar o %1$s, você concorda com nossos [Termos de Serviço](%2$s). O %1$s é uma assinatura automática, 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 nossos [Termos de Serviço](%2$s). O %1$s é uma assinatura automática, o que significa que te cobraremos hoje e continuaremos a cobrar anualmente 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>
diff --git a/com.discord/res/values-ro/plurals.xml b/com.discord/res/values-ro/plurals.xml
index 33e4194475..7592e475d2 100644
--- a/com.discord/res/values-ro/plurals.xml
+++ b/com.discord/res/values-ro/plurals.xml
@@ -290,14 +290,6 @@
         <item quantity="other">%d ani</item>
         <item quantity="one">%d an</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d luni</item>
-        <item quantity="one">%d lună</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d ani</item>
-        <item quantity="one">%d an</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">luni</item>
         <item quantity="one">lună</item>
@@ -454,16 +446,6 @@
         <item quantity="other">%d utilizări</item>
         <item quantity="one">%d utilizare</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d prieteni comuni</item>
-        <item quantity="zero">0 prieteni comuni</item>
-        <item quantity="one">1 prieten comun</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d servere comune</item>
-        <item quantity="zero">0 servere comune</item>
-        <item quantity="one">1 server comun</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d zile</item>
         <item quantity="one">1 zi</item>
@@ -537,10 +519,6 @@
         <item quantity="other">%d luni</item>
         <item quantity="one">1 lună</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d boost-uri</item>
-        <item quantity="one">%d boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d boost-uri</item>
         <item quantity="one">%d boost</item>
@@ -553,15 +531,11 @@
         <item quantity="other">%d boost-uri</item>
         <item quantity="one">%d boost</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d zile</item>
-        <item quantity="one">%d zi</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d boost-uri pentru server</item>
         <item quantity="one">%d boost pentru server</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d luni</item>
         <item quantity="one">lună</item>
     </plurals>
@@ -585,10 +559,6 @@
         <item quantity="other">%d minute</item>
         <item quantity="one">%d minut</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** boost-uri</item>
-        <item quantity="one">**%d** boost</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d zile</item>
         <item quantity="one">%d zi</item>
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index 84bf28394d..1a8e17bc87 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -607,7 +607,6 @@ Ocolirea interzicerilor poate fi făcută foarte dificilă prin activarea verifi
     <string name="billing">Facturare</string>
     <string name="billing_accept_terms_tooltip">Acceptă condițiile de prestare a serviciilor pentru a continua</string>
     <string name="billing_account_credit">Credit cont</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s luni gratuite</string>
     <string name="billing_add_payment_method">Adaugă metodă de plată</string>
     <string name="billing_address">Adresă de facturare</string>
     <string name="billing_address_address">Adresă</string>
@@ -664,8 +663,6 @@ Ocolirea interzicerilor poate fi făcută foarte dificilă prin activarea verifi
     <string name="billing_payment_choose_plan">Alege un plan</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](%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](%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_source_invalid">Această sursă de plată este nevalidă.</string>
     <string name="billing_payment_sources">Metode de plată</string>
     <string name="billing_payment_table_header_amount">Suma</string>
@@ -683,13 +680,11 @@ Ocolirea interzicerilor poate fi făcută foarte dificilă prin activarea verifi
     <string name="billing_price_per_month_current_plan">(PLANUL ACTUAL) %1$s / lună</string>
     <string name="billing_price_per_month_current_plan_ios">(Planul actual) %1$s / lună</string>
     <string name="billing_price_per_month_mobile">%1$s / LUNĂ</string>
-    <string name="billing_price_per_month_upgrade">Fă upgrade la prețul de %1$s / lună</string>
     <string name="billing_price_per_year">%1$s / an</string>
     <string name="billing_price_per_year_current_plan">(PLANUL ACTUAL) %1$s / an</string>
     <string name="billing_price_per_year_current_plan_ios">(Planul actual) %1$s / an</string>
     <string name="billing_price_per_year_mobile">%1$s / AN</string>
     <string name="billing_price_per_year_months_free">%1$s / an (2 luni gratuite)</string>
-    <string name="billing_price_per_year_upgrade">Fă upgrade la prețul de %1$s / an</string>
     <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>
@@ -711,6 +706,10 @@ Ocolirea interzicerilor poate fi făcută foarte dificilă prin activarea verifi
     <string name="billing_step_review">Revizuiește</string>
     <string name="billing_step_select_plan">Selectează planul</string>
     <string name="billing_subscribe">Abonează-te</string>
+    <string name="billing_switch_plan_change">Schimbă planul</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Am înțeles!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Ce drăguț!</string>
+    <string name="billing_switch_plan_upgrade">Fă upgrade</string>
     <string name="billing_tag_failed">Eșuat</string>
     <string name="billing_tag_pending">În așteptare</string>
     <string name="billing_tag_refunded">Restituit</string>
@@ -1754,11 +1753,8 @@ pentru a putea observa sensibilitatea de intrare."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Mulțumită unei alte ființe umane generoase, acum ai %1$s pentru %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Mulțumită unei alte ființe umane generoase, acum ai %1$s pentru %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** a fost adăugat la biblioteca ta.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Mulțumită unei ființe deosebit de generoase, acum ai acces la avantaje sporite în chat și la un boost pentru server timp de %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Mulțumită unei alte ființe umane generoase, acum ai acces la un serviciu de chat cu avantaje sporite pentru %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Mulțumită unei alte ființe umane generoase, acum ai acces la un serviciu de chat cu avantaje sporite pentru %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Mulțumită unei ființe deosebit de generoase, acum ai acces la avantaje sporite în chat și la un boost pentru server timp de %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Mulțumită unei ființe deosebit de generoase, acum ai acces la avantaje sporite în chat și la un boost pentru server timp de%1$s.</string>
     <string name="gift_confirmation_body_unknown_error">S-a întâmplat ceva ciudat și nu am reușit să legăm panglica… vrei să încerci din nou?</string>
     <string name="gift_confirmation_button_confirm">Cum să nu! Adaugă la Bibliotecă</string>
     <string name="gift_confirmation_button_confirm_mobile">Dă-mi-l</string>
@@ -2111,9 +2107,7 @@ Pierduți: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s locuri pentru emoji de server (pentru un total de %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Limită de încărcare pentru toți membrii: %1$s</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Printre avantajele unui server stimulat se numără —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Deocamdată, nimeni nu i-a conferit Nitro acestui server. Vezi dacă vreun membru are de gând să-l binecuvânteze cu mărinimie, oferindu-i avantaje Nitro accesibile pentru toți!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Serverele stimulate obțin toate avantajele anterioare, plus —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Fără boost Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Avantaje nivel 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Avantaje nivel 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Avantaje nivel 3</string>
@@ -2130,16 +2124,12 @@ Pierduți: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Avantaj nivel %1$s deblocat</string>
     <string name="guild_settings_overview_notice">Atenție! Ai schimbări nesalvate!</string>
     <string name="guild_settings_overview_tier_info">Aceasta este o caracteristică Nitro de nivelul %1$s. [Verifică-ți starea de nivel](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Membrii server-ului cu un abonament la Nitro activ pot ajuta la deblocarea nivelurilor conferindu-i acestuia statusul lor Nitro.
-Pentru fiecare nivel atins, membrii server-ului vor contribui la deblocarea unor avantaje pentru toată lumea.
-
-Membrii își pot revoca boost-ul în orice moment.
-**În cazul în care un nivel este pierdut, server-ul își va păstra avantajele obținute timp de trei zile. **[Află mai multe despre Stimulare server cu Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Mai trebuie doar %1$s până la următorul nivel!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** stimulat acest server</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Status boost server cu Nitro</string>
+    <string name="guild_settings_premium_guild_title">Status boost server</string>
     <string name="guild_settings_premium_guild_unlocked">Deblocat</string>
+    <string name="guild_settings_premium_upsell_learn_more">Învață mai multe despre Discord Nitro</string>
     <string name="guild_settings_server_banner">Banner server</string>
     <string name="guild_settings_server_invite_background">Fundalul invitației pe server</string>
     <string name="guild_settings_splash_info">Această imagine este afișată atunci când utilizatorii primesc o invitație pe server.</string>
@@ -2149,6 +2139,7 @@ Membrii își pot revoca boost-ul în orice moment.
 
 Dacă ai acces la utilizatorii site-ului tău, atunci poți adăuga în mod dinamic &amp;username= la querystring."</string>
     <string name="guild_settings_widget_enable_widget">Activează widget-ul server-ului</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Detalii achiziție</string>
     <string name="guild_verification_text_account_age">Contul tău trebuie să fie vechi de cel puțin %1$s minute pentru a trimite mesaje pe acest server.</string>
     <string name="guild_verification_text_member_age">Trebuie să fii membru de cel puțin %1$s minute pentru a trimite mesaje pe acest server.</string>
     <string name="guild_verification_text_not_claimed">Trebuie să-ți revendici și verifici contul înainte de a putea trimite mesaje pe acest server.</string>
@@ -2499,10 +2490,6 @@ Vrei să știi mai multe despre Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Fă o poză</string>
     <string name="ios_notification_see_full">Atinge pentru a vedea mesajul complet.</string>
     <string name="ios_profile_in_voice_call">Într-un apel vocal</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Prieteni comuni</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Servere comune</string>
     <string name="ios_profile_open_voice_channel">Deschide canal de voce</string>
     <string name="ios_view_all">Vezi toate</string>
     <string name="ip_address_secured">Adresă IP securizată</string>
@@ -2818,7 +2805,6 @@ canalele la care atât ei cât și membrii mutați au acces."</string>
     <string name="network_error_unknown">A apărut o eroare necunoscută de rețea.</string>
     <string name="network_error_unknown_host">A apărut o eroare de rețea. Te rugăm să-ți verifici setările DNS și să încerci din nou.</string>
     <string name="network_offline">Conexiune la rețea limitată sau indisponibilă.</string>
-    <string name="nevermind">Nu mai contează</string>
     <string name="new_dm">Mesaj direct nou</string>
     <string name="new_group_dm">Grup de mesaje directe nou</string>
     <string name="new_guilds_dm_allowed">Permite mesaje directe de la membrii server-ului.</string>
@@ -2942,7 +2928,6 @@ niciun mesaj fixat.. încă."</string>
     <string name="notice_no_input_detected_help_link_text">Ajutor!</string>
     <string name="notice_no_input_detected_settings">Ei bine, se pare că Discord nu detectează niciun sunet de la microfonul tău. Hai să reparăm asta!</string>
     <string name="notice_no_input_detected_settings_link_text">Vizitează setările</string>
-    <string name="notice_premium_grandfathered_ended">Accesul tău la Nitro a expirat. Fă upgrade de la Nitro Classic la Nitro pentru a primi super-avantaje în chat și un boost pentru server.</string>
     <string name="notice_premium_grandfathered_ending">Mai ai doar %1$s de Nitro! Abonamentul tău trece la Nitro Classic pe **%2$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>
@@ -3175,7 +3160,7 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
     <string name="payment_modal_button_change_card">Actualizează card de credit</string>
     <string name="payment_modal_button_change_paypal">Actualizează cont PayPal</string>
     <string name="payment_modal_button_premium">Obține %1$s</string>
-    <string name="payment_modal_button_premium_gift">Cumpără %1$s</string>
+    <string name="payment_modal_button_premium_gift">Cumpără cadou</string>
     <string name="payment_modal_one_month">1 lună</string>
     <string name="payment_modal_one_year">1 an</string>
     <string name="payment_modal_per_month">Pe lună</string>
@@ -3286,9 +3271,6 @@ De asemenea, overlay-ul s-ar putea să nu funcționeze pentru toată lumea. Dac
 Te poți reabona oricând."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Anularea va intra în vigoare la sfârșitul perioadei curente de facturare pe **%1$s**. Dacă l-ai schimbat, Discord Tag-ul tău va fi randomizat.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">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** îți vei pierde accesul la Nitro, Discord Tag-ul tău va fi ales aleatoriu dacă l-ai schimbat, iar boost-ul pentru server-ul tău va fi eliminat.
-
- Te poți reabona în orice moment."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Anularea va intra în vigoare la sfârșitul perioadei curente de facturare. Pe **%1$s** îți vei pierde accesul la Nitro, Discord Tag-ul tău va fi ales aleatoriu dacă l-ai schimbat, iar boost-ul pentru server-ul tău va fi eliminat.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Te poți reabona oricând.</string>
     <string name="premium_cancel_confirm_mobile">Anulează Nitro</string>
@@ -3311,7 +3293,6 @@ Te poți reabona oricând."</string>
     <string name="premium_chat_perks_description_streaming">Fă streaming la sursă cu Nitro sau obține o imagine clară la 1080p 60fps cu Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Limitele pentru încărcarea fișierelor cresc de la %1$s la %2$s cu Nitro sau la %3$s cu Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Stimulează-ți server-ul preferat!</string>
-    <string name="premium_chat_perks_simple_title">Nu complica lucrurile - obține avantajele de bază pentru chat fără boost-ul pentru server.</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>
@@ -3350,41 +3331,20 @@ Te poți reabona oricând."</string>
     <string name="premium_grandfathered_yearly">În semn de mulțumire că ai susținut Discord, ai acces la Nitro timp de doi ani. Accesul tău expiră pe **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Perioadă de așteptare boost: **%1$szile %2$sore %3$sminute**</string>
     <string name="premium_guild_features_blurb">Stimularea unui server folosind abonamentul Nitro va contribui la trecerea acestuia la un nou nivel. Cu fiecare nivel atins, vor fi deblocate noi avantaje pentru chat **pentru toți membrii server-ului!** Verifică câteva dintre aceste avantaje super tari:</string>
-    <string name="premium_guild_features_customize_guild_description">Deblochează personalizări cum ar fi fundalul pentru invitația pe server, banner-ul server-ului, URL-ul personalizat etc.</string>
     <string name="premium_guild_features_customize_guild_mobile">Personalizări server</string>
-    <string name="premium_guild_features_customize_guild_title">Personalizări server</string>
     <string name="premium_guild_features_learn_more_button">Învață mai multe despre Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Beneficiază de o experienţă Discord mai bună începând de la un cost lunar redus.</string>
     <string name="premium_guild_features_more">Mai mult decât atât - poți verifica nivelul curent, progresul în cadrul acestuia și avantajele disponibile pe server.</string>
-    <string name="premium_guild_features_new_role_description">Obține un rol special pe server, disponibil doar pentru boosterii de servere cu Nitro de pe server-ul tău.</string>
-    <string name="premium_guild_features_new_role_mobile">Roluri exclusive pentru booster-ii de servere cu Nitro</string>
-    <string name="premium_guild_features_new_role_title">Rol nou exclusiv</string>
-    <string name="premium_guild_features_show_support_description">Boosterii primesc o insignă de profil nou-nouță, care se schimbă în funcție de șirul lor de victorii.</string>
     <string name="premium_guild_features_show_support_mobile">O insignă de profil care se schimbă în timp</string>
-    <string name="premium_guild_features_show_support_title">Pune-ți în evidență sprijinul</string>
     <string name="premium_guild_features_title">Cu Nitro poți contribui la stimularea unui server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Limite de încărcare mai mari pentru toți membrii comunității</string>
-    <string name="premium_guild_features_upload_sizes_title">Limite de încărcare mai mari pentru toți</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Abonează-te la Nitro pentru a trimite un boost Nitro unui server [Află mai multe despre Stimulare server cu Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Fă upgrade la abonamentul tău Nitro pentru a trimite un boost Nitro unui server! [Află mai multe despre Stimulare server cu Nitro.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Fără boost-uri Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Niciun nivel</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Boost pentru server cu Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">Printre avantajele unui server stimulat se numără —</string>
-    <string name="premium_guild_perks_modal_blurb">"Pentru fiecare nivel atins, membrii acestui server vor ajuta la deblocarea avantajelor pentru toată lumea. Aceste avantaje au un efect doar în cadrul serverului.
-
- **Booster-ii primesc: pictogramă Listă membri, o nouă insignă în evoluție și un rol rezervat exclusiv pentru booster-i.**
-
- [Află mai multe despre Stimulare server cu Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Pentru fiecare nivel atins, membrii acestui server vor ajuta la deblocarea avantajelor pentru toată lumea. Aceste avantaje au un efect doar în cadrul serverului.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Booster-ii primesc: pictogramă Listă membri, o nouă insignă în evoluție și un rol rezervat exclusiv pentru booster-i.** [Află mai multe despre Stimulare server cu Nitro.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Obține Nitro pentru a stimula!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Stimulează acest server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Fă upgrade la Nitro pentru a stimula!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">În prezent, nu suntem compatibili cu upgrade-urile la Nitro pentru abonamente obținute prin Apple. Îți poți anula abonamentul prin [Gestionarea abonamentelor Apple](%1$s), însă acesta va rămâne activ până la data expirării.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic nu include funcția Stimulare server</string>
     <string name="premium_guild_perks_modal_header">Status boost server</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** boost-uri</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Gestionează boost-ul tău</string>
     <string name="premium_guild_perks_modal_no_tiers">Încă nu au fost atinse niveluri</string>
@@ -3397,44 +3357,32 @@ Te poți reabona oricând."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s au stimulat acest server</string>
     <string name="premium_guild_settings_members_subscribed_needed">Încă mai ai nevoie de **%1$s** pentru a debloca %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Ești sigur că vrei să trimiți un boost Nitro către:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Alege acest server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Alege acest server. Boost-ul tău își va face efectul în doar o clipă.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Stimularea acestui server nu-ți va permite să stimulezi un alt server pentru %1$s. Retragerea boost-ului nu va afecta perioada de așteptare.**</string>
     <string name="premium_guild_subscribe_confirm_header">Alege cu înțelepciune!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Caută servere</string>
     <string name="premium_guild_subscribe_select_guild_header">Alege un server</string>
     <string name="premium_guild_subscribe_success_thanks">Îți mulțumim pentru boost!</string>
     <string name="premium_guild_subscription_available_count">Ai **%1$s** disponibil(e)!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">A apărut o eroare în timpul încercării de a stimula. Te rugăm să încerci din nou.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Se pare că ești într-o perioadă de așteptare. Te rugăm să aștepți **%1$s și %2$s** înainte de a încerca din nou</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Se pare că ești într-o perioadă de așteptare. Te rugăm să aștepți **%1$s și %2$s** înainte de a încerca din nou</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Se pare că ești într-o perioadă de așteptare. Te rugăm să aștepți **%1$s** înainte de a încerca din nou</string>
     <string name="premium_guild_subscription_no_next_tier">Server-ul lucrează la intensitate maximă! Continuă să stimulezi!</string>
-    <string name="premium_guild_subscription_notice">Boost-urile pentru server oferite de Nitro sunt aici! Adună-ți membrii comunității pentru a vă stimula server-ul.</string>
     <string name="premium_guild_subscription_notice_button">Vezi niveluri și avantaje</string>
-    <string name="premium_guild_subscription_notice_small_guild">Boost-urile pentru server oferite de Nitro sunt aici! Adună-ți prietenii pentru a vă stimula server-ul.</string>
     <string name="premium_guild_subscription_remove_button">Elimină boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">S-a produs o eroare atunci când ai încercat să retragi boost-ul. Încearcă din nou.</string>
     <string name="premium_guild_subscription_select_server_button">Alege un server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Folosește-ți puterile Nitro pentru a stimula un server căruia te-ai alăturat. Opțiunea de stimulare permite unui server să treacă la niveluri noi. Fiecare nivel oferă avantaje colective pentru întregul server.
- Stimularea unui server activează o perioadă de așteptare de 7 zile. Nu vei putea stimula un alt server până la sfârșitul perioadei de așteptare, chiar și în cazul în care îți retragi boost-ul. [Află mai multe despre Stimulare server cu Nitro.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Folosește-ți puterile Nitro pentru a stimula un server căruia te-ai alăturat. Opțiunea de stimulare permite unui server să treacă la niveluri noi. Fiecare nivel oferă avantaje colective pentru întregul server.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Stimularea unui server activează o perioadă de așteptare de 7 zile. Nu vei putea stimula un alt server până la sfârșitul perioadei de așteptare, chiar și în cazul în care îți retragi boost-ul. [Află mai multe despre Stimulare server cu Nitro.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Boost pentru server cu Nitro</string>
-    <string name="premium_guild_subscription_tooltip">Stimulare cu Nitro începând cu %1$s</string>
+    <string name="premium_guild_tier_0">Niciun nivel</string>
     <string name="premium_guild_tier_1">Nivel 1</string>
     <string name="premium_guild_tier_2">Nivel 2</string>
     <string name="premium_guild_tier_3">Nivel 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Ești sigur că dorești să-ți retragi boost-ul Nitro de pe:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Da, retrage boost-ul</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Acest server își va pierde progresul dacă îți retragi boost-ul.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Acest server își va pierde progresul dacă îți retragi boost-ul. **Boost-ul tău este încă într-o perioadă de așteptare și va fi disponibil în %1$s și %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Acest server își va pierde progresul dacă îți retragi boost-ul. **Boost-ul tău este încă într-o perioadă de așteptare și va fi disponibil în %1$s și %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Acest server își va pierde progresul dacă îți retragi boost-ul. **Boost-ul tău este încă într-o perioadă de așteptare și va fi disponibil în %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Dorești să retragi boost-ul Nitro?</string>
     <string name="premium_included">Incluse în Nitro:</string>
     <string name="premium_info_monthly">%1$s (lunar) apare pe %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s ** / lună</string>
@@ -3447,7 +3395,6 @@ Te poți reabona oricând."</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_button_iap">Obține %1$s</string>
     <string name="premium_payment_confirmation_button_regular">OK, sună bine</string>
-    <string name="premium_payment_gift_blurb">Dăruiește-le [Nitro](onClick) prietenilor tăi, ca să aibă parte de super-avantaje în chat și de un boost pentru server.</string>
     <string name="premium_payment_gift_blurb_mobile">Dăruiește-i cuiva Nitro pentru a-i oferi acces la avantaje cu super-putere și la opțiunea Stimulare server. [Află mai multe despre Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Aceasta este o plată unică, valabilă pentru perioada de timp aleasă. Nu vei fi facturat lunar.</string>
     <string name="premium_payment_is_gift">Cumperi un cadou.</string>
@@ -3462,7 +3409,6 @@ Te poți reabona oricând."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic lunar</string>
     <string name="premium_plan_month_tier_2">Nitro lunar</string>
     <string name="premium_promo_autocomplete">Folosește oriunde emoji-uri personalizate</string>
-    <string name="premium_promo_description">Treci la Discord Nitro pentru a folosi emoji-uri personalizate pe orice server.</string>
     <string name="premium_promo_title">Vrei să dai puteri speciale emoji-urilor?</string>
     <string name="premium_required">Este necesar Nitro</string>
     <string name="premium_required_get_nitro">Obține Nitro!</string>
@@ -3482,26 +3428,10 @@ Te poți reabona oricând."</string>
     <string name="premium_tier_2_title">Beneficiază de o experienţă Discord mai bună la un cost lunar redus.</string>
     <string name="premium_trial_button">Începe perioada gratuită de probă</string>
     <string name="premium_upgrade_cancel">Nup</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Treci la abonamentul anual și vei beneficia de două luni gratuite. Super afacere!!!
-
-Îți vom aplica un tarif fracționar pentru planul tău anual și îl vom deduce din prețul anual. Vei plăti **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Treci la abonamentul anual și vei beneficia de două luni gratuite. Super afacere!!!
-
-Îți vom aplica un tarif fracționar pentru planul tău anual și îl vom deduce din prețul anual. Vei plăti **%1$s** acum și **%2$s/an la sfârșitul perioadei curente de facturare.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Fă upgrade la planul tău (lunar) %1$s și obține capacitatea de a stimula servere. Noul tău plan va începe imediat.
-
- Îți vom aplica un tarif fracționar pentru planul în curs și îl vom deduce din prețul lunar. Vei plăti **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Fă upgrade la planul tău (lunar) %1$s și obține capacitatea de a stimula servere. Noul tău plan va începe imediat.
-
- Îți vom aplica un tarif fracționar pentru planul în curs și îl vom deduce din prețul lunar. Vei plăti **%2$s** acum și **%3$s/lună la sfârșitul perioadei curente de facturare.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Fă upgrade la planul tău (lunar) %1$s și obține capacitatea de a stimula servere. Noul tău plan va începe imediat.
 
 Îți vom aplica un tarif fracționar pentru planul în curs și îl vom deduce din prețul anual. Vei plăti **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Fă upgrade la planul tău (lunar) %1$s și obține capacitatea de a stimula servere. Noul tău plan va începe imediat.
-
-Îți vom aplica un tarif fracționar pentru planul în curs și îl vom deduce din prețul anual. Vei plăti **%2$s** acum și **%3$s/an la sfârșitul perioadei curente de facturare.**"</string>
     <string name="premium_upgrade_confirm_button">Fă upgrade</string>
-    <string name="premium_upgrade_confirm_button_with_price">Fă upgrade acum - %1$s</string>
     <string name="premium_upgrade_confirm_title">Treci la %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Nu te poți abona atunci când ai deja Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Planul tău actual.</string>
@@ -4058,8 +3988,6 @@ Ești sigur că vrei să continui?"</string>
     <string name="stop_streaming">Încheie streaming-ul</string>
     <string name="stop_watching">Nu mai urmări</string>
     <string name="store_channel">Canal Magazin</string>
-    <string name="store_payment_legalese_monthly">Salutare! Prin achiziționarea %1$s, ești de acord cu [Condițiile de Prestare a Serviciilor](%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](%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>
diff --git a/com.discord/res/values-ru/plurals.xml b/com.discord/res/values-ru/plurals.xml
index a81f07be65..547e33ce94 100644
--- a/com.discord/res/values-ru/plurals.xml
+++ b/com.discord/res/values-ru/plurals.xml
@@ -322,16 +322,6 @@
         <item quantity="one">%d год</item>
         <item quantity="few">%d года</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_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_2_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>
@@ -506,18 +496,6 @@
         <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>
@@ -604,11 +582,6 @@
         <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>
@@ -624,17 +597,12 @@
         <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">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d месяцев</item>
         <item quantity="one">%d месяц</item>
         <item quantity="few">%d месяца</item>
@@ -660,11 +628,6 @@
         <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>
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index 23aecb43d5..3a8128c685 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -640,7 +640,6 @@
     <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>
@@ -700,8 +699,6 @@
     <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_source_invalid">Выбранный источник оплаты недействителен.</string>
     <string name="billing_payment_sources">Способы Оплаты</string>
     <string name="billing_payment_table_header_amount">Сумма</string>
@@ -719,13 +716,11 @@
     <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>
@@ -747,6 +742,10 @@
     <string name="billing_step_review">Просмотреть</string>
     <string name="billing_step_select_plan">Выберите подписку</string>
     <string name="billing_subscribe">Подписаться</string>
+    <string name="billing_switch_plan_change">Изменить подписку</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Ясно!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">О, круто!</string>
+    <string name="billing_switch_plan_upgrade">Оформить</string>
     <string name="billing_tag_failed">Сбой</string>
     <string name="billing_tag_pending">Ожидание</string>
     <string name="billing_tag_refunded">Возврат</string>
@@ -1815,11 +1814,8 @@
     <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_nitro_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_success_premium_tier_2_monthly">Благодаря чьей-то щедрости вы получили доступ к прикольным бонусам для чата и усилению сервера на %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2173,9 +2169,7 @@
     <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>
@@ -2192,16 +2186,12 @@
     <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_title">Состояние усиления сервера</string>
     <string name="guild_settings_premium_guild_unlocked">Открыто</string>
+    <string name="guild_settings_premium_upsell_learn_more">Узнать больше про подписку Discord Nitro</string>
     <string name="guild_settings_server_banner">Баннер сервера</string>
     <string name="guild_settings_server_invite_background">Фон приглашения на сервер</string>
     <string name="guild_settings_splash_info">Это изображение пользователи видят, когда получают приглашение на сервер.</string>
@@ -2211,6 +2201,7 @@
 
 Если у вас есть доступ к пользователям сайта, то вы также можете добавить &amp;username= к строке запроса."</string>
     <string name="guild_settings_widget_enable_widget">Включить виджет сервера</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Реквизиты покупки</string>
     <string name="guild_verification_text_account_age">Ваша учётная запись должна быть создана как минимум %1$s минут назад, чтобы отправлять сообщения на этом сервере.</string>
     <string name="guild_verification_text_member_age">Чтобы писать сообщения на этом сервере, вы должны быть его участником хотя бы %1$s минут.</string>
     <string name="guild_verification_text_not_claimed">Вы должны зарегистрировать и подтвердить вашу учётную запись, чтобы отправлять сообщения на этом сервере.</string>
@@ -2559,10 +2550,6 @@
     <string name="ios_media_keyboard_take_a_photo">Сделать фото</string>
     <string name="ios_notification_see_full">Коснитесь для просмотра полного сообщения.</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="ios_view_all">Посмотреть все</string>
     <string name="ip_address_secured">IP-адрес защищён</string>
@@ -2880,7 +2867,6 @@
     <string name="network_error_unknown">Произошла неизвестная сетевая ошибка.</string>
     <string name="network_error_unknown_host">Произошла сетевая ошибка. Пожалуйста, проверьте настройки DNS и повторите попытку.</string>
     <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>
@@ -3005,7 +2991,6 @@
     <string name="notice_no_input_detected_help_link_text">Помогите!</string>
     <string name="notice_no_input_detected_settings">Кажется, Discord не может обнаружить сигнал вашего микрофона. Давайте это исправим!</string>
     <string name="notice_no_input_detected_settings_link_text">Откройте настройки</string>
-    <string name="notice_premium_grandfathered_ended">Истёк срок действия вашей подписки Nitro. Смените подписку с Nitro Classic на Nitro, чтобы получить доступ к крутым бонусам для чата и усилению сервера.</string>
     <string name="notice_premium_grandfathered_ending">Ваша подписка Nitro истекает через %1$s Она будет понижена до Nitro Classic **%2$s**.</string>
     <string name="notice_premium_promo_action">Попробовать</string>
     <string name="notice_premium_promo_message">Поддержите разработку Discord и получите клёвые бонусы!</string>
@@ -3239,7 +3224,7 @@
     <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_button_premium_gift">Купить подарок</string>
     <string name="payment_modal_one_month">1 месяц</string>
     <string name="payment_modal_one_year">1 год</string>
     <string name="payment_modal_per_month">В месяц</string>
@@ -3352,9 +3337,6 @@
 Вы можете возобновить подписку в любое время."</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">"Отмена подписки произойдёт в конце текущего расчётного периода. **%1$s** вы потеряете доступ к Nitro, ваш Discord Tag будет вновь изменён на случайный (если вы его, конечно, меняли), а ваше усиление сервера будет удалено.
-
- Вы можете возобновить подписку в любое время."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Отмена подписки произойдёт в конце текущего расчётного периода. **%1$s** вы потеряете доступ к Nitro, ваш Discord Tag будет вновь изменён на случайный (если вы его, конечно, меняли), а ваше усиление сервера будет удалено.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Вы можете возобновить подписку в любое время.</string>
     <string name="premium_cancel_confirm_mobile">Отменить Nitro</string>
@@ -3377,7 +3359,6 @@
     <string name="premium_chat_perks_description_streaming">Nitro Classic даёт возможность стримить в формате до 1080p на 60 кадрах в секунду.</string>
     <string name="premium_chat_perks_description_upload_limit">Отправляйте файлы размером от %1$s до %2$s с Nitro или %3$s с Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Усильте любимый сервер!</string>
-    <string name="premium_chat_perks_simple_title">Ничего лишнего — только базовые бонусы для чата без усиления сервера.</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>
@@ -3416,41 +3397,20 @@
     <string name="premium_grandfathered_yearly">В знак благодарности за поддержку Discord мы предоставляем вам доступ к подписке Nitro на два года. Предложение заканчивается **%1$s**.</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_description">Получите новую роль на своём сервере, доступную только усилителям серверов на Nitro.</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_description">Усилители серверов получают новенький значок в профиле, который меняется по мере поддержания усиления.</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>
@@ -3463,44 +3423,32 @@
     <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_duration_mobile">%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_0">Нет уровня</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_month_subscription">**%1$s%2$s %3$s** / месяц</string>
@@ -3513,7 +3461,6 @@
     <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">Подарите друзьям [Nitro](onClick) с крутыми бонусами для чата и усилением сервера.</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>
@@ -3528,7 +3475,6 @@
     <string name="premium_plan_month_tier_1">Nitro Classic на месяц</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">Подписаться на Nitro!</string>
@@ -3547,26 +3493,10 @@
     <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_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>
@@ -4129,8 +4059,6 @@
     <string name="stop_streaming">Прекратить стрим</string>
     <string name="stop_watching">Прекратить просмотр</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>
diff --git a/com.discord/res/values-sv-rSE/plurals.xml b/com.discord/res/values-sv-rSE/plurals.xml
index 554be8f4e2..425b0d9f46 100644
--- a/com.discord/res/values-sv-rSE/plurals.xml
+++ b/com.discord/res/values-sv-rSE/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d år</item>
         <item quantity="one">%d år</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d månader</item>
-        <item quantity="one">%d månad</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d år</item>
-        <item quantity="one">%d år</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">månader</item>
         <item quantity="one">månad</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d användningar</item>
         <item quantity="one">%d användning</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d gemensamma vänner</item>
-        <item quantity="zero">0 gemensamma vänner</item>
-        <item quantity="one">1 gemensam vän</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d gemensamma servrar</item>
-        <item quantity="zero">0 gemensamma servrar</item>
-        <item quantity="one">1 gemensam server</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d dagar</item>
         <item quantity="one">1 dag</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d månader</item>
         <item quantity="one">1 månad</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d boostar</item>
-        <item quantity="one">%d boost</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d boostar till</item>
         <item quantity="one">%d boost till</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d boostar</item>
         <item quantity="one">%d boost</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d dagar</item>
-        <item quantity="one">%d dag</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d serverboostar</item>
         <item quantity="one">%d serverboost</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d månader</item>
         <item quantity="one">%d månad</item>
     </plurals>
@@ -597,10 +571,6 @@
         <item quantity="other">%d minuter</item>
         <item quantity="one">%d minut</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** boostar</item>
-        <item quantity="one">**%d** boost</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d dagar</item>
         <item quantity="one">%d dag</item>
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index c116363180..44cdbf48ed 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -581,7 +581,6 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing">Fakturering</string>
     <string name="billing_accept_terms_tooltip">Godkänn Användarvillkoren för att kunna fortsätta</string>
     <string name="billing_account_credit">Kontokredit</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s månader gratis</string>
     <string name="billing_add_payment_method">Lägg till betalningsmetod</string>
     <string name="billing_address">Faktureringsadress</string>
     <string name="billing_address_address">Adress</string>
@@ -638,8 +637,6 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing_payment_choose_plan">Välj en plan</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 våra [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 våra [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 år tills du säger upp prenumerationen. Du kan när som helst avbryta prenumerationen.</string>
     <string name="billing_payment_source_invalid">Betalningsmetoden är ogiltig.</string>
     <string name="billing_payment_sources">Betalningsmetoder</string>
     <string name="billing_payment_table_header_amount">Summa</string>
@@ -657,13 +654,11 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing_price_per_month_current_plan">(NUVARANDE PLAN) %1$s/månad</string>
     <string name="billing_price_per_month_current_plan_ios">(Nuvarande plan) %1$s/månad</string>
     <string name="billing_price_per_month_mobile">%1$s/MÅN</string>
-    <string name="billing_price_per_month_upgrade">Uppgradera för %1$s/månad</string>
     <string name="billing_price_per_year">%1$s/år</string>
     <string name="billing_price_per_year_current_plan">(NUVARANDE PLAN) %1$s/år</string>
     <string name="billing_price_per_year_current_plan_ios">(Nuvarande plan) %1$s/år</string>
     <string name="billing_price_per_year_mobile">%1$s/ÅR</string>
     <string name="billing_price_per_year_months_free">%1$s/år (2 månader gratis)</string>
-    <string name="billing_price_per_year_upgrade">Uppgradera för %1$s/år</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>
@@ -685,6 +680,10 @@ men om och när du måste, så tveka inte!"</string>
     <string name="billing_step_review">Granska</string>
     <string name="billing_step_select_plan">Välj plan</string>
     <string name="billing_subscribe">Prenumerera</string>
+    <string name="billing_switch_plan_change">Byt prenumeration</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Jag förstår!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Snyggt!</string>
+    <string name="billing_switch_plan_upgrade">Uppgradera</string>
     <string name="billing_tag_failed">Misslyckades</string>
     <string name="billing_tag_pending">Väntande</string>
     <string name="billing_tag_refunded">Återbetalat</string>
@@ -1721,11 +1720,8 @@ för att kunna se ingångskänsligheten."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Tack vare en annan generös människa har du nu %1$s i %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Tack vare en annan generös människa har du nu %1$s i %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** finns nu i ditt bibliotek.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Tack vare en annan generös människa har du nu tillgång till förbättrade chattförmåner och en serverboost i %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Tack vare en annan generös människa har du nu tillgång till förbättrade chattförmåner i %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Tack vare en annan generös människa har du nu tillgång till förbättrade chattförmåner i %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Tack vare en annan generös människa har du nu tillgång till förbättrade chattförmåner och en serverboost i %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Tack vare en annan generös människa har du nu tillgång till förbättrade chattförmåner och en serverboost i %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Något skumt hände och vi kunde inte leverera grejerna … pröva igen?</string>
     <string name="gift_confirmation_button_confirm">Jajamen! Lägg till i bibliotek</string>
     <string name="gift_confirmation_button_confirm_mobile">Hit med det</string>
@@ -2078,9 +2074,7 @@ Förlorade: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s server-emojiplatser (sammanlagt %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s uppladdningsgräns för alla medlemmar</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Boostade serverförmåner inkluderar –</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Det finns ingen som har skänkt Nitro till den här servern än. Se om de finns några snälla medlemmar som kan välsigna din server med Nitro-förmåner för hela servern!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Boostade servrar får allt föregående och –</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Ingen Nitro-boost</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Nivå 1-förmåner</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Nivå 2-förmåner</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Nivå 3-förmåner</string>
@@ -2097,16 +2091,12 @@ Förlorade: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Förmån i klass %1$s upplåst</string>
     <string name="guild_settings_overview_notice">Försiktigt! Du har osparade ändringar!</string>
     <string name="guild_settings_overview_tier_info">Det här är en Nitro-funktion i klass %1$s. [Kontrollera din klass-status](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Servermedlemmar med en aktiv Nitro-prenumeration kan hjälpa till att låsa upp nivåer med sin Nitro-status.
-För varje nivå som nås hjälper serverns medlemmar till att låsa upp förmåner åt alla.
-
-Medlemmarna kan återkalla sin boost när som helst.
-**Servern behåller förmånerna i tre dagar om en nivå går förlorad. **[Läs mer om Nitro-serverboost.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Endast %1$s för att nå nästa nivå!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** boostat den här servern</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro-serverbooststatus</string>
+    <string name="guild_settings_premium_guild_title">Serverbooststatus</string>
     <string name="guild_settings_premium_guild_unlocked">Upplåst</string>
+    <string name="guild_settings_premium_upsell_learn_more">Läs mer om Discord Nitro</string>
     <string name="guild_settings_server_banner">Serverbanner</string>
     <string name="guild_settings_server_invite_background">Serverns inbjudningsbakgrund</string>
     <string name="guild_settings_splash_info">Den här bilden visas när användare får en inbjudning till servern.</string>
@@ -2116,6 +2106,7 @@ Medlemmarna kan återkalla sin boost när som helst.
 
 Om du har tillgång till din webbplats användare kan du dynamiskt lägga till &amp;username= i query-strängen."</string>
     <string name="guild_settings_widget_enable_widget">Aktivera server-widget</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Inköpsinformation</string>
     <string name="guild_verification_text_account_age">Ditt konto måste vara minst %1$s minuter gammalt för att kunna skicka meddelanden på den här servern.</string>
     <string name="guild_verification_text_member_age">Du måste vara medlem i minst %1$s minuter för att skicka meddelanden på den här servern.</string>
     <string name="guild_verification_text_not_claimed">Du måste registrera och verifiera ditt konto innan du kan skicka meddelanden på den här servern.</string>
@@ -2464,10 +2455,6 @@ Vill du veta mer om Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Ta ett foto</string>
     <string name="ios_notification_see_full">Tryck för att se hela meddelandet.</string>
     <string name="ios_profile_in_voice_call">I ett röstsamtal</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Gemensamma vänner</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Gemensamma servrar</string>
     <string name="ios_profile_open_voice_channel">Öppna röstkanal</string>
     <string name="ios_view_all">Visa allt</string>
     <string name="ip_address_secured">IP-adress säkrad</string>
@@ -2781,7 +2768,6 @@ kanaler både de och medlemmen de flyttar har tillgång till."</string>
     <string name="network_error_unknown">Ett okänt nätverksfel har inträffat.</string>
     <string name="network_error_unknown_host">Ett nätverksfel har inträffat. Kontrollera dina DNS-inställningar och försök igen.</string>
     <string name="network_offline">Nätverksanslutningen är begränsad eller otillgänglig.</string>
-    <string name="nevermind">Avbryt</string>
     <string name="new_dm">Nytt direktmeddelande</string>
     <string name="new_group_dm">Ny direktmeddelandegrupp</string>
     <string name="new_guilds_dm_allowed">Tillåt direktmeddelanden från servermedlemmar.</string>
@@ -2905,7 +2891,6 @@ fästa meddelanden … ännu."</string>
     <string name="notice_no_input_detected_help_link_text">Hjälp!</string>
     <string name="notice_no_input_detected_settings">Okej, det verkar som Discord inte känner av inmatningen från din mikrofon. Det får vi fixa!</string>
     <string name="notice_no_input_detected_settings_link_text">Besök inställningar</string>
-    <string name="notice_premium_grandfathered_ended">Ditt tillträde till Nitro har upphört. Uppgradera från Nitro Classic till Nitro för chattförmåner med superkrafter och en serverboost.</string>
     <string name="notice_premium_grandfathered_ending">Du har endast %1$s av Nitro kvar! Din prenumeration nedgraderas till Nitro Classic den **%2$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>
@@ -3137,7 +3122,7 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
     <string name="payment_modal_button_change_card">Uppdatera kreditkort</string>
     <string name="payment_modal_button_change_paypal">Uppdatera PayPal-konto</string>
     <string name="payment_modal_button_premium">Skaffa %1$s</string>
-    <string name="payment_modal_button_premium_gift">Köp %1$s</string>
+    <string name="payment_modal_button_premium_gift">Köp gåva</string>
     <string name="payment_modal_one_month">1 månad</string>
     <string name="payment_modal_one_year">1 år</string>
     <string name="payment_modal_per_month">Per månad</string>
@@ -3248,9 +3233,6 @@ Dessutom fungerar kanske inte overlayen för alla. Om du har problem eller fråg
 Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_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.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Du kan förnya din prenumeration när som helst.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Uppsägningen kommer att träda i kraft i samband med att din aktuella faktureringsperiod avslutas. Den **%1$s** har du inte längre tillgång till Nitro, din Discord-tagg återställs om du har ändrat den och din serverboost tas bort.
-
- Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Uppsägningen kommer att träda i kraft i samband med att din aktuella faktureringsperiod avslutas. Den **%1$s** har du inte längre tillgång till Nitro, din Discord-tagg återställs om du har ändrat den och din serverboost tas bort.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Du kan förnya din prenumeration när som helst.</string>
     <string name="premium_cancel_confirm_mobile">Säg upp Nitro</string>
@@ -3273,7 +3255,6 @@ Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_chat_perks_description_streaming">Streama från källan med Nitro eller upp till skarpa 1080p 60fps med Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Större uppladdningsstorlek från %1$s till %2$s med Nitro eller %3$s med Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Boosta din favoritserver!</string>
-    <string name="premium_chat_perks_simple_title">Gör det enkelt för dig – skaffa dig de fundamentala chattförmånerna utan en serverboost.</string>
     <string name="premium_chat_perks_streaming_mobile">Bättre Go Live-streamar: Streama från källan med Nitro eller upp till skarpa 1080p 60fps med Nitro Classic</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>
@@ -3312,41 +3293,20 @@ Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_grandfathered_yearly">Som tack för ditt stöd till Discord får du tillgång till Nitro i två år. Din åtkomst går ut **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Boostnedkylning: **%1$sd %2$sh %3$sm**</string>
     <string name="premium_guild_features_blurb">Boostar du en server med din Nitro-prenumeration hjälper du den att stiga i nivå. Varje nivå låser upp chattförmåner **för alla på den servern!** Kolla in några av de här sköna förmånerna:</string>
-    <string name="premium_guild_features_customize_guild_description">Lås upp specialanpassningar som inbjudningsbakgrund, serverbanner, personlig URL, etc.</string>
     <string name="premium_guild_features_customize_guild_mobile">Serveranpassningar</string>
-    <string name="premium_guild_features_customize_guild_title">Serveranpassningar</string>
     <string name="premium_guild_features_learn_more_button">Läs mer om Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Starta med en låg månadskostnad och få en förbättrad Discord-upplevelse.</string>
     <string name="premium_guild_features_more">Och inte bara det! Du kan kolla in nuvarande nivå, nivåframsteg och förmånerna som finns på servern.</string>
-    <string name="premium_guild_features_new_role_description">Få en speciell serverroll som endast finns tillgänglig för Nitro-serverboostare i din server.</string>
-    <string name="premium_guild_features_new_role_mobile">Exklusiva Nitro-serverboostroller</string>
-    <string name="premium_guild_features_new_role_title">Exklusiv ny roll</string>
-    <string name="premium_guild_features_show_support_description">Boostare får ett skinande, nytt profilmärke som förändras med deras insatser.</string>
     <string name="premium_guild_features_show_support_mobile">Ett nytt profilmärke som förändras med tiden</string>
-    <string name="premium_guild_features_show_support_title">Visa att du är stolt över ditt stöd</string>
     <string name="premium_guild_features_title">Med Nitro kan du hjälpa till att boosta en server!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Större uppladdningsstorlekar för hela communityn</string>
-    <string name="premium_guild_features_upload_sizes_title">Större uppladdningsstorlekar för alla</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Prenumerera på Nitro för att skicka en Nitro-boost till en server! [Läs mer om Nitro-serverboost.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Uppgradera din prenumeration för att skicka en Nitro-boost till en server! [Läs mer om Nitro-serverboost.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Inga Nitro-boostar</string>
     <string name="premium_guild_header_badge_no_tier">Ingen nivå</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro-serverboost</string>
     <string name="premium_guild_perks_modal_base_perks">Boostade serverförmåner inkluderar –</string>
-    <string name="premium_guild_perks_modal_blurb">"För varje nivå som nås kommer den här serverns medlemmar att hjälpa till att låsa upp förmåner för alla. Dessa förmåner gäller endast i servern.
-
- **Boostare får: Ikon för medlemslista, nytt utvecklingsbart märke och en exklusiv booster-roll.**
-
- [Läs mer om Nitro-serverboost.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">För varje nivå som nås kommer den här serverns medlemmar att hjälpa till att låsa upp förmåner för alla. Dessa förmåner gäller endast i servern.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Boostare får: Ikon för medlemslista, nytt utvecklingsbart märke och en exklusiv booster-roll.** [Läs mer om Nitro-serverboosting.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Skaffa Nitro för att boosta!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boosta denna server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Uppgradera till Nitro för att boosta!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Vi stöder för närvarande inte uppgraderingar till Nitro för prenumerationer genom Apple. Du kan avbryta din prenumeration via [Apples prenumerationshantering](%1$s), men prenumerationen fortsätter att vara aktiv till dess utgångsdatum.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic inkluderar inte serverboost</string>
     <string name="premium_guild_perks_modal_header">Serverbooststatus</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** boostar</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Hantera din boost</string>
     <string name="premium_guild_perks_modal_no_tiers">Inga nivåer nådda än</string>
@@ -3359,44 +3319,32 @@ Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s har boostat den här servern</string>
     <string name="premium_guild_settings_members_subscribed_needed">Du behöver **%1$s** för att låsa upp %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Är du säker på att du vill skicka en Nitro-boost till:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Välj denna server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Välj denna server. Det tar en stund innan din boost sätter igång.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Boostar du den här servern kan du inte boosta någon annan server under %1$s oavsett om du tar bort din boost.**</string>
     <string name="premium_guild_subscribe_confirm_header">Välj klokt!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Sök servrar</string>
     <string name="premium_guild_subscribe_select_guild_header">Välj en server</string>
     <string name="premium_guild_subscribe_success_thanks">Tack för boosten!</string>
     <string name="premium_guild_subscription_available_count">Du har **%1$s** att använda!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Ett fel uppstod under boosten. Försök igen.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Det ser ut som du är på nedkylning. Vänta i **%1$s och %2$s** innan du prövar igen</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Det ser ut som du är på nedkylning. Vänta i **%1$s och %2$s** innan du prövar igen</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Det ser ut som du är på nedkylning. Vänta i **%1$s** innan du prövar igen</string>
     <string name="premium_guild_subscription_no_next_tier">Denna server är fulltankad! Fortsätt boosta!</string>
-    <string name="premium_guild_subscription_notice">Nitro-serverboostar är här! Samla ihop ditt community för att boosta din server.</string>
     <string name="premium_guild_subscription_notice_button">Se nivåer och förmåner</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro-serverboostar är här! Samla ihop dina vänner för att boosta din server.</string>
     <string name="premium_guild_subscription_remove_button">Ta bort boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">Ett fel uppstod när boosten skulle tas bort. Försök igen.</string>
     <string name="premium_guild_subscription_select_server_button">Välj en server</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Använd dina Nitro-krafter för att boosta en server du har gått med i! Boostar du en server hjälper du den att stiga i nivå. Varje nivå ger kollektiva förmåner för hela servern.
- När du boostar en server aktiveras en 7-dagars nedkylning. Du kan inte boosta några fler servrar förrän nedkylningsperioden är slut även om du tar bort din boost. [Läs mer om Nitro-serverboost.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Använd dina Nitro-krafter för att boosta en server du har gått med i! Boostar du en server hjälper du den att stiga i nivå. Varje nivå ger kollektiva förmåner för hela servern.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">När du boostar en server aktiveras en 7-dagars nedkylning. Du kan inte boosta fler servrar förrän nedkylningsperioden är slut även om du tar bort din boost. [Läs mer om Nitro-serverboost.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro-serverboost</string>
-    <string name="premium_guild_subscription_tooltip">Nitro-boostar sedan %1$s</string>
+    <string name="premium_guild_tier_0">Ingen nivå</string>
     <string name="premium_guild_tier_1">Nivå 1</string>
     <string name="premium_guild_tier_2">Nivå 2</string>
     <string name="premium_guild_tier_3">Nivå 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Är du säker på att du vill ta bort den här Nitro-boosten från:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Ja, ta bort boost</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Den här serverns framsteg kommer att bromsas om du tar bort din boost.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Den här serverns framsteg kommer att bromsas om du tar bort din boost. **Den kommer att vara tillgänglig i %1$s och %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Den här serverns framsteg kommer att bromsas om du tar bort din boost. **Den kommer att vara tillgänglig i %1$s och %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Den här serverns framsteg kommer att bromsas om du tar bort din boost. **Den kommer att vara tillgänglig i %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Ta bort Nitro-boost?</string>
     <string name="premium_included">Inkluderat i Nitro:</string>
     <string name="premium_info_monthly">%1$s (per månad) dras %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / månad</string>
@@ -3409,7 +3357,6 @@ Du kan börja prenumerera igen när du vill."</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_button_iap">Skaffa %1$s</string>
     <string name="premium_payment_confirmation_button_regular">Okej, det låter bra</string>
-    <string name="premium_payment_gift_blurb">Ge dina vänner [Nitro](onClick) i gåva så att de kan använda sina superkraft-chattförmåner och få en serverboost.</string>
     <string name="premium_payment_gift_blurb_mobile">Ge någon Nitro i gåva för tillgång till superkraft-chattförmåner och serverboost. [Läs mer om Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Detta blir en engångsavgift för tiden som valts. Du kommer inte att debiteras varje månad.</string>
     <string name="premium_payment_is_gift">Du håller på att köpa en gåva.</string>
@@ -3424,7 +3371,6 @@ Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic per månad</string>
     <string name="premium_plan_month_tier_2">Nitro per månad</string>
     <string name="premium_promo_autocomplete">Använd anpassade emojier överallt</string>
-    <string name="premium_promo_description">Kör igång med Discord Nitro för att använda animerade och egna emojier på alla servrar.</string>
     <string name="premium_promo_title">Vill du ha uppgraderade emojikrafter?</string>
     <string name="premium_required">Nitro krävs</string>
     <string name="premium_required_get_nitro">Skaffa Nitro!</string>
@@ -3444,26 +3390,10 @@ Du kan börja prenumerera igen när du vill."</string>
     <string name="premium_tier_2_title">Få en förbättrad Discord-upplevelse för en låg månadskostnad.</string>
     <string name="premium_trial_button">Starta din gratis prövoperiod</string>
     <string name="premium_upgrade_cancel">Näpp</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Uppgradera till en årsprenumeration och få två månader på köpet. Vilken deal!
-
-Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt från årskostnaden. Du kommer att debiteras **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Uppgradera till en årsprenumeration och få två månader på köpet. Vilken deal!
-
-Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt från årskostnaden. Du kommer att debiteras **%1$s** nu och **%2$s/år efter den aktuella faktureringsperioden.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Uppgradera din %1$s-prenumeration (per månad) och få förmåga att boosta servrar. Din nya prenumeration börjar gälla omedelbart.
-
- Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt från månadskostnaden. Du kommer att debiteras **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Uppgradera din %1$s-prenumeration (per månad) och få förmåga att boosta servrar. Din nya prenumeration börjar gälla omedelbart.
-
- Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt från månadskostnaden. Du kommer att debiteras **%2$s** nu och **%3$s/månad efter den aktuella faktureringsperioden.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Uppgradera din %1$s-prenumeration (per månad) och få förmåga att boosta servrar. Din nya prenumeration börjar gälla omedelbart.
 
 Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt från årskostnaden. Du kommer att debiteras **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Uppgradera din %1$s-prenumeration (per månad) och få förmåga att boosta servrar. Din nya prenumeration börjar gälla omedelbart.
-
-Vi kommer att beakta din nuvarande prenumeration och dra av den proportionerligt från årskostnaden. Du kommer att debiteras **%2$s** nu och **%3$s/år efter den aktuella faktureringsperioden.**"</string>
     <string name="premium_upgrade_confirm_button">Uppgradera</string>
-    <string name="premium_upgrade_confirm_button_with_price">Uppgradera nu – %1$s</string>
     <string name="premium_upgrade_confirm_title">Uppgradera till %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Du kan inte prenumerera när du redan har Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Din nuvarande prenumeration.</string>
@@ -4015,8 +3945,6 @@ Dessa meddelanden kan höras av alla som har fokus på kanalen."</string>
     <string name="stop_streaming">Sluta streama</string>
     <string name="stop_watching">Sluta titta</string>
     <string name="store_channel">Butikskanal</string>
-    <string name="store_payment_legalese_monthly">Hej! Genom att köpa %1$s godkänner du våra [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 våra [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>
diff --git a/com.discord/res/values-th/plurals.xml b/com.discord/res/values-th/plurals.xml
index df8ed8433a..a664e36e4f 100644
--- a/com.discord/res/values-th/plurals.xml
+++ b/com.discord/res/values-th/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d ปี</item>
         <item quantity="one">%d ปี</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d เดือน</item>
-        <item quantity="one">%d เดือน</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d ปี</item>
-        <item quantity="one">%d ปี</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">เดือน</item>
         <item quantity="one">เดือน</item>
@@ -466,16 +458,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d เซิร์ฟเวอร์ร่วมกัน</item>
-        <item quantity="zero">0 เซิร์ฟเวอร์ร่วมกัน</item>
-        <item quantity="one">1 เซิร์ฟเวอร์ร่วมกัน</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d days</item>
         <item quantity="one">1 day</item>
@@ -549,10 +531,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d บูสต์มากขึ้น</item>
         <item quantity="one">%d บูสต์มากขึ้น</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d บูสต์</item>
         <item quantity="one">%d บูสต์</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d วัน</item>
-        <item quantity="one">%d วัน</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d การบูสต์เซิร์ฟเวอร์</item>
         <item quantity="one">%d การบูสต์เซิร์ฟเวอร์</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d เดือน</item>
         <item quantity="one">%d เดือน</item>
     </plurals>
@@ -597,10 +571,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d วัน</item>
         <item quantity="one">%d วัน</item>
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index e715cdb0e6..c0bd0a1d4b 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -633,7 +633,6 @@
     <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>
@@ -691,8 +690,6 @@
     <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_source_invalid">แหล่งการชำระเงินนี้ไม่ถูกต้อง</string>
     <string name="billing_payment_sources">วิธีการชำระเงิน</string>
     <string name="billing_payment_table_header_amount">จำนวนเงิน</string>
@@ -710,13 +707,11 @@
     <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>
@@ -738,6 +733,10 @@
     <string name="billing_step_review">ตรวจทาน</string>
     <string name="billing_step_select_plan">เลือกแผน</string>
     <string name="billing_subscribe">สมัครสมาชิก</string>
+    <string name="billing_switch_plan_change">เปลี่ยนการใช้งาน</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">เข้าใจแล้ว</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">ยอดไปเลย</string>
+    <string name="billing_switch_plan_upgrade">อัปเกรด</string>
     <string name="billing_tag_failed">ล้มเหลว</string>
     <string name="billing_tag_pending">กำลังรอ</string>
     <string name="billing_tag_refunded">คืนเงินแล้ว</string>
@@ -1364,7 +1363,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="focus_participant">โฟกัสบุคคลนี้</string>
     <string name="follow">ติดตาม</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>
@@ -1791,11 +1789,8 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <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_nitro_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_success_premium_tier_2_monthly">ด้วยความโอบอ้อมอารีของคนบางคน ทำให้คุณได้รับสิทธิ์การเข้าถึงสิทธิประโยชน์ในการแชทเพิ่มเติมและการบูสต์เซิร์ฟเวอร์เป็นเวลา %1$s</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2149,9 +2144,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <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>
@@ -2168,16 +2161,12 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="guild_settings_overview_boost_unlocked">ระดับ %1$s สิทธิประโยชน์ถูกปลดล็อก</string>
     <string name="guild_settings_overview_notice">ระวัง คุณมีการเปลี่ยนแปลงที่ไม่ได้บันทึก</string>
     <string name="guild_settings_overview_tier_info">นี่เป็นระดับของ %1$s การแนะนำ Nitro [ตรวจสอบสถานะระดับของคุณ](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"สมาชิกของเซิร์ฟเวอร์ที่มีการสมัครสมาชิก Nitro อยู่ สามารถช่วยปลดล็อกระดับด้วยการมอบสถานะ Nitro 
-ให้แต่ละระดับที่ได้ สมาชิกของเซิร์ฟเวอร์จะช่วยปลดล็อกสิทธิประโยชน์สำหรับ@everyone
-
-สมาชิกสามารถยกเลิกบูสต์ของพวกเขาได้ตลอดเวลา
-**เซิร์ฟเวอร์จะรักษาสิทธิประโยชน์ไว้สามวันหากเสียระดับไป **[เรียนรู้เพิ่มเติมเกี่ยวกับการบูสต์เซิร์ฟเวอร์ 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_title">สถานะการบูสต์เซิร์ฟเวอร์</string>
     <string name="guild_settings_premium_guild_unlocked">ปลดล็อก</string>
+    <string name="guild_settings_premium_upsell_learn_more">เรียนรู้ Discord Nitro ให้มากขึ้น</string>
     <string name="guild_settings_server_banner">ป้ายแบนเนอร์ของเซิร์ฟเวอร์</string>
     <string name="guild_settings_server_invite_background">ภาพพื้นหลังคำเชิญของเซิร์ฟเวอร์</string>
     <string name="guild_settings_splash_info">ภาพนี้จะแสดงเมื่อผู้ใช้รับคำเชิญเข้าสู่เซิร์ฟเวอร์</string>
@@ -2187,6 +2176,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
 
 หากคุณมีสิทธิ์เข้าถึงผู้ใช้เว็บไซต์ของคุณได้ คุณสามารถเพิ่ม &amp;username= ใน querystring ได้โดยตรง"</string>
     <string name="guild_settings_widget_enable_widget">เปิดใช้งาน widget ของเซิร์ฟเวอร์</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">รายละเอียดการซื้อ</string>
     <string name="guild_verification_text_account_age">บัญชีของคุณต้องมีอายุอย่างน้อย %1$s นาทีก่อนส่งข้อความในเซิร์ฟเวอร์นี้</string>
     <string name="guild_verification_text_member_age">คุณต้องเป็นสมาชิกอย่างน้อย %1$s นาทีก่อนส่งข้อความในเซิร์ฟเวอร์นี้</string>
     <string name="guild_verification_text_not_claimed">คุณจะต้อง แสดงตน และ ยืนยัน แอคเคาร์ของคุณก่อนที่จะส่งข้อความได้ใน Server นี้</string>
@@ -2536,10 +2526,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="ios_media_keyboard_take_a_photo">ถ่ายรูป</string>
     <string name="ios_notification_see_full">กดเพื่อดูข้อความทั้งหมด</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="ios_view_all">ดูทั้งหมด</string>
     <string name="ip_address_secured">IP Address เข้ารหัสแล้ว</string>
@@ -2857,7 +2843,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="network_error_unknown">มีข้อผิดพลาดทางเครือข่ายที่ไม่รู้จักเกิดขึ้น</string>
     <string name="network_error_unknown_host">มีข้อผิดพลาดทางเครือข่ายเกิดขึ้น กรุณาตรวจสอบการตั้งค่า DNS แล้วลองอีกครั้ง</string>
     <string name="network_offline">การเชื่อมต่อถูกจำกัดหรือไม่สามารถเชื่อมต่อได้</string>
-    <string name="nevermind">ไม่เป็นไร</string>
     <string name="new_dm">ข้อความใหม่</string>
     <string name="new_group_dm">กลุ่ม DM ใหม่</string>
     <string name="new_guilds_dm_allowed">อนุญาตข้อความโดยตรงจากสมาชิกเซิร์ฟเวอร์</string>
@@ -2982,7 +2967,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="notice_no_input_detected_help_link_text">ช่วยเหลือ!</string>
     <string name="notice_no_input_detected_settings">อืม ดูเหมือนว่า Discord จะไม่ได้ยินเสียงจากไมค์ของคุณ เราซ่อมมันด้วยกันเถอะ!</string>
     <string name="notice_no_input_detected_settings_link_text">การตั้งค่าการเยี่ยมชม</string>
-    <string name="notice_premium_grandfathered_ended">การเข้าถึง Nitro ของคุณหมดอายุแล้ว อัปเกรดจาก Nitro Classic เป็น Nitro เพื่อรับสิทธิพิเศษในการแชทและการบูสต์เซิร์ฟเวอร์</string>
     <string name="notice_premium_grandfathered_ending">Nitro ของคุณเหลือเวลาเพียง %1$s เท่านั้น การบอกรับเป็นสมาชิกของคุณจะถูกลดระดับลงเป็น Nitro Classic ในวันที่ **%2$s**</string>
     <string name="notice_premium_promo_action">ลองดูสิ</string>
     <string name="notice_premium_promo_message">สนับสนุนการพัฒนาของ Discord และรับความสามารถพิเศษสนุกๆ!</string>
@@ -3216,7 +3200,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <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_button_premium_gift">ซื้อของขวัญ</string>
     <string name="payment_modal_one_month">1 เดือน</string>
     <string name="payment_modal_one_year">1 ปี</string>
     <string name="payment_modal_per_month">ต่อเดือน</string>
@@ -3326,9 +3310,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
 คุณสามารถกลับมาสมัครเป็นสมาชิกใหม่ได้ทุกเมื่อ"</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">"การยกเลิกมีผลเมื่อสิ้นสุดระยะเวลาการเรียกเก็บเงินปัจจุบันในวันที่ ใน **%1$s** คุณจะสูญเสียสิทธิ์การเข้าถึง Nitro และแท็ก Discord ของคุณจะถูกสุ่มหากคุณเปลี่ยนมัน และการบูสต์เซิร์ฟเวอร์ของคุณจะถูกลบออก
-
- คุณสามารถเริ่มต้นการสมัครสมาชิกของคุณได้ตลอดเวลา"</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">การยกเลิกมีผลเมื่อสิ้นสุดระยะเวลาการเรียกเก็บเงินปัจจุบันในวันที่ ใน **%1$s** คุณจะสูญเสียสิทธิ์การเข้าถึง Nitro และแท็ก Discord ของคุณจะถูกสุ่มหากคุณเปลี่ยนมัน และการบูสต์เซิร์ฟเวอร์ของคุณจะถูกลบออก</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">คุณสามารถเริ่มต้นการสมัครสมาชิกของคุณได้ตลอดเวลา</string>
     <string name="premium_cancel_confirm_mobile">ยกเลิก Nitro</string>
@@ -3351,7 +3332,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="premium_chat_perks_description_streaming">สตรีมที่แหล่งที่มาโดยใช้ Nitro หรือความละเอียดสูงสุด 1080p 60fps ด้วย Nitro Classic</string>
     <string name="premium_chat_perks_description_upload_limit">เพิ่มขนาดไฟล์อัปโหลดให้ใหญ่ขึ้นจาก %1$s เป็น %2$s ด้วย Nitro หรือเป็น %3$s ด้วย Nitro Classic</string>
     <string name="premium_chat_perks_premium_guild_subscription">บูสต์เซิร์ฟเวอร์ที่คุณชอบที่สุด</string>
-    <string name="premium_chat_perks_simple_title">ง่ายนิดเดียว - รับสิทธิพิเศษการแชทพื้นฐานโดยไม่ต้องใช้การบูสต์เซิร์ฟเวอร์</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>
@@ -3390,41 +3370,20 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="premium_grandfathered_yearly">เพื่อแทนคำขอบคุณที่ให้การสนับสนุน Discord เราขอมอบสิทธิ์การเข้าถึง Nitro ให้คุณเป็นเวลาสองปี การเข้าถึงของคุณจะสิ้นสุดเมื่อวันที่ **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">คูลดาวน์จากการบูสต์: **%1$sวัน %2$sชั่วโมง %3$sนาที**</string>
     <string name="premium_guild_features_blurb">การบูสต์เซิร์ฟเวอร์ด้วยการสมัครสมาชิก Nitro จะช่วยให้เข้าสู่ระดับใหม่ สำหรับทุกระดับที่ได้รับ จะปลดล็อกสิทธิประโยชน์การแชท **ของ @everyone ในเซิร์ฟเวอร์นั้น!** ตรวจสอบสิทธิประโยชน์เหล่านี้สักเล็กน้อย:</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_description">รับตำแหน่งเซิร์ฟเวอร์พิเศษที่มีให้เฉพาะเมื่อทำการบูสต์เซิร์ฟเวอร์ Nitro ในเซิร์ฟเวอร์ของคุณ</string>
-    <string name="premium_guild_features_new_role_mobile">\@role การบูสต์เซิร์ฟเวอร์ Nitro เฉพาะ</string>
-    <string name="premium_guild_features_new_role_title">ตำแหน่งใหม่เฉพาะตัว</string>
-    <string name="premium_guild_features_show_support_description">บูสเตอร์จะเปล่งประกาย ป้ายโปรไฟล์ใหม่จะเปลี่ยนตามการบูสต์ที่ต่อเนื่อง</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 สู่เซิร์ฟเวอร์! [เรียนรู้เพิ่มเติมเกี่ยวกับการบูสต์เซิร์ฟเวอร์ Nitro](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">อัพเกรดการสมัครสมาชิกของคุณเพื่อส่งบูสต์ Nitro สู่เซิร์ฟเวอร์! [เรียนรู้เพิ่มเติมเกี่ยวกับการบูสต์เซิร์ฟเวอร์ 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">"แต่ละระดับที่ได้รับ สมาชิกของเซิร์ฟเวอร์จะช่วยปลดล็อกสิทธิประโยชน์สำหรับ@everyone สิทธิประโยชน์เหล่านี้จะส่งผลเฉพาะในเซิร์ฟเวอร์เท่านั้น
-
- **บูสเตอร์ได้รับ: ไอค่อนรายชื่อสมาชิก ป้ายแบบใหม่ และตำแหน่งเฉพาะสำหรับบูสเตอร์**
-
- [เรียนรู้เพิ่มเติมเกี่ยวกับการบูสต์เซิร์ฟเวอร์ Nitro](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">แต่ละระดับที่ได้รับ สมาชิกของเซิร์ฟเวอร์จะช่วยปลดล็อกสิทธิประโยชน์สำหรับ@everyone สิทธิประโยชน์เหล่านี้จะส่งผลเฉพาะในเซิร์ฟเวอร์เท่านั้น</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">ขณะนี้เรายังไม่สนับสนุนการอัพเกรดเป็น Nitro สำหรับการสมัครสมาชิกผ่าน Apple คุณสามารถยกเลิกการสมัครสมาชิกผ่าน [การจัดการการสมัครสมาชิกของ 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>
@@ -3437,44 +3396,32 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <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_duration_mobile">%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 อยู่ @here! แข่งขันในชุมชนของคุณเพื่อบูสต์เซิร์ฟเวอร์ของคุณ</string>
     <string name="premium_guild_subscription_notice_button">ดูระดับและสิทธิประโยชน์</string>
-    <string name="premium_guild_subscription_notice_small_guild">การบูสต์เซิร์ฟเวอร์ Nitro อยู่ @here! แข่งขันกับเพื่อนของคุณเพื่อบูสต์เซิร์ฟเวอร์ของคุณ</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_0">ไม่มีระดับ</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_month_subscription">**%1$s%2$s %3$s** / เดือน</string>
@@ -3486,7 +3433,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <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_regular">เค ดีมาก ๆ</string>
-    <string name="premium_payment_gift_blurb">ให้ [Nitro](onClick) เป็นของขวัญสำหรับเพื่อนของคุณ เพื่อให้พวกเขาได้รับสิทธิพิเศษในการแชท และบูสต์เซิร์ฟเวอร์</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>
@@ -3501,7 +3447,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="premium_plan_month_tier_1">Nitro Classic รายเดือน</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">จะเอา Nitro!</string>
@@ -3520,26 +3465,10 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <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_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>
@@ -4100,8 +4029,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
     <string name="stop_streaming">หยุดถ่ายทอดสด</string>
     <string name="stop_watching">หยุดดู</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>
diff --git a/com.discord/res/values-tr/plurals.xml b/com.discord/res/values-tr/plurals.xml
index 71753b0f23..73725394f2 100644
--- a/com.discord/res/values-tr/plurals.xml
+++ b/com.discord/res/values-tr/plurals.xml
@@ -294,14 +294,6 @@
         <item quantity="other">%d yıl</item>
         <item quantity="one">%d yıl</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d ay</item>
-        <item quantity="one">%d ay</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d yıl</item>
-        <item quantity="one">%d yıl</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">ay</item>
         <item quantity="one">ay</item>
@@ -458,16 +450,6 @@
         <item quantity="other">%d kullanım</item>
         <item quantity="one">%d kullanım</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d Ortak Arkadaş</item>
-        <item quantity="zero">0 Ortak Arkadaş</item>
-        <item quantity="one">1 Ortak Arkadaş</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d Ortak Sunucu</item>
-        <item quantity="zero">0 Ortak Sunucu</item>
-        <item quantity="one">1 Ortak Sunucu</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d gün</item>
         <item quantity="one">1 gün</item>
@@ -541,10 +523,6 @@
         <item quantity="other">%d aylık</item>
         <item quantity="one">1 aylık</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d Takviye</item>
-        <item quantity="one">%d Takviye</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d Takviye</item>
         <item quantity="one">%d Takviye</item>
@@ -557,15 +535,11 @@
         <item quantity="other">%d Takviye</item>
         <item quantity="one">%d Takviye</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d gün</item>
-        <item quantity="one">%d gün</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d Sunucu Takviyen</item>
         <item quantity="one">%d Sunucu Takviyen</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d Ay</item>
         <item quantity="one">%d Ay</item>
     </plurals>
@@ -589,10 +563,6 @@
         <item quantity="other">%d dakika</item>
         <item quantity="one">%d dakika</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** takviye</item>
-        <item quantity="one">**%d** takviye</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d gün</item>
         <item quantity="one">%d gün</item>
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index f3540b6f4b..d8e10a268b 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -626,7 +626,6 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing">Faturalandırma</string>
     <string name="billing_accept_terms_tooltip">Devam etmek için hizmet koşullarını kabul et</string>
     <string name="billing_account_credit">Hesap Kredisi</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s ay ücretsiz</string>
     <string name="billing_add_payment_method">Ödeme Yöntemi Ekle</string>
     <string name="billing_address">Fatura Adresi</string>
     <string name="billing_address_address">Adres</string>
@@ -683,8 +682,6 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing_payment_choose_plan">Bir plan seç</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 [Hizmet Koşullarımızı](%2$s) kabul etmiş olursun. %1$s otomatik olarak yenilenen bir aboneliktir. Aboneliğini iptal edene kadar Discord'a belirlediğin ödeme yöntemi ile %3$s tutarını 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 [Hizmet Koşullarımızı](%2$s) kabul etmiş olursun. %1$s otomatik olarak yenilenen bir aboneliktir. Aboneliğini iptal edene kadar Discord'a belirlediğin ödeme yöntemi ile %3$s tutarını 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_source_invalid">Bu ödeme kaynağı geçersiz.</string>
     <string name="billing_payment_sources">Ödeme Yöntemleri</string>
     <string name="billing_payment_table_header_amount">Miktar</string>
@@ -702,13 +699,11 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing_price_per_month_current_plan">(MEVCUT PLAN) %1$s / Ay</string>
     <string name="billing_price_per_month_current_plan_ios">(Mevcut Plan) %1$s / Ay</string>
     <string name="billing_price_per_month_mobile">%1$s / AY</string>
-    <string name="billing_price_per_month_upgrade">Aylık %1$s karşılığında yükselt</string>
     <string name="billing_price_per_year">%1$s / Yıl</string>
     <string name="billing_price_per_year_current_plan">(MEVCUT PLAN) %1$s / Yıl</string>
     <string name="billing_price_per_year_current_plan_ios">(Mevcut Plan) %1$s / Yıl</string>
     <string name="billing_price_per_year_mobile">%1$s / YIL</string>
     <string name="billing_price_per_year_months_free">%1$s / Yıl (2 Ay Ücretsiz)</string>
-    <string name="billing_price_per_year_upgrade">Yıllık %1$s karşılığında yükselt</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>
@@ -730,6 +725,10 @@ ama eğer yaparsan ve yapmak zorundaysan, tereddüt etme."</string>
     <string name="billing_step_review">İncele</string>
     <string name="billing_step_select_plan">Plan seç</string>
     <string name="billing_subscribe">Abone Ol</string>
+    <string name="billing_switch_plan_change">Planı Değiştir</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Anladım!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Süper!</string>
+    <string name="billing_switch_plan_upgrade">Yükselt</string>
     <string name="billing_tag_failed">Başarısız</string>
     <string name="billing_tag_pending">Bekleyen</string>
     <string name="billing_tag_refunded">İade Edildi</string>
@@ -1776,11 +1775,8 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Cömert bir insan sayesinde artık %1$s boyunca %2$s sahibi olacaksın.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Cömert bir insan sayesinde artık %1$s boyunca %2$s sahibi olacaksın.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** kitaplığına eklendi.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">"Cömert bir insan sayesinde artık %1$s boyunca geliştirilmiş sohbet avantajlarına ve bir Sunucu Takviyesi'ne sahipsin."</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Cömert bir insan sayesinde artık %1$s boyunca geliştirilmiş sohbet avantajlarına sahipsin.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Cömert bir insan sayesinde artık %1$s boyunca geliştirilmiş sohbet avantajlarına sahipsin.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">"Cömert bir insan sayesinde artık %1$s boyunca geliştirilmiş sohbet avantajlarına ve bir Sunucu Takviyesi'ne sahipsin."</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">"Cömert bir insan sayesinde artık %1$s boyunca geliştirilmiş sohbet avantajlarına ve bir Sunucu Takviyesi'ne sahipsin."</string>
     <string name="gift_confirmation_body_unknown_error">Tuhaf bir şey oldu ve torbayı sağlama alamadık… Tekrar dene?</string>
     <string name="gift_confirmation_button_confirm">Tabii ki! Kitaplığa ekle</string>
     <string name="gift_confirmation_button_confirm_mobile">Alayım</string>
@@ -2131,9 +2127,7 @@ Kaybedilen: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s sunucu emojisi yeri (toplamda %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Tüm üyeler için %1$s yükleme sınırı</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Takviye yapılan sunucu avantajlarından bazıları —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Henüz kimse bu sunucuya Nitro vermedi. Sunucu genelinde etkili Nitro Avantajları için sunucuya destek olacak iyi kalpli üyeler ara!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Takviye yapılan sunucular önceki her şeye sahip olurlar ve ayrıca —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Nitro Takviyesi yok</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">1. Seviye Avantajları</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">2. Seviye Avantajları</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">3. Seviye Avantajları</string>
@@ -2150,16 +2144,12 @@ Kaybedilen: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">%1$s kademe avantajı açıldı</string>
     <string name="guild_settings_overview_notice">Dikkat et! Kaydetmediğin değişiklikler var!</string>
     <string name="guild_settings_overview_tier_info">Bu bir %1$s Kademesi Nitro Özelliğidir. [Kademe durumunu kontrol et](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Bir aktif Nitro aboneliği bulunan sunucusunun üyeleri kendi Nitro durumlarını vererek seviyelerin açılmasına yardım edebilirler.
-Sunucunun üyeleri, ulaşılan her seviye için avantajların tüm üyeler için açılmasına yardım edecekler.
-
-Üyeler yaptıkları takviyeyi istedikleri zaman geri çekebilirler.
-**Bir seviye kaybedilirse, sunucu üç gün boyunca avantajları koruyacaktır. **[Nitro Sunucu Takviyesi hakkında daha fazla bilgi edin.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Sonraki seviye için sadece %1$s daha kaldı!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** bu sunucuya takviye yaptı</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro Sunucu Takviyesi Durumu</string>
+    <string name="guild_settings_premium_guild_title">Sunucu Takviyesi Durumu</string>
     <string name="guild_settings_premium_guild_unlocked">Açıldı</string>
+    <string name="guild_settings_premium_upsell_learn_more">Discord Nitro hakkında daha fazla bilgi al</string>
     <string name="guild_settings_server_banner">Sunucu Afişi</string>
     <string name="guild_settings_server_invite_background">Sunucu Daveti Arka Planı</string>
     <string name="guild_settings_splash_info">Kullanıcılar bir sunucu daveti aldıklarında bu görsel görüntülenecek.</string>
@@ -2169,6 +2159,7 @@ Sunucunun üyeleri, ulaşılan her seviye için avantajların tüm üyeler için
 
 Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &amp;kullanıcı adı= ekleyebilirsin."</string>
     <string name="guild_settings_widget_enable_widget">"Sunucu Widget'ını Etkinleştir"</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Satın Alma Detayları</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 doğrulamalısın.</string>
@@ -2519,10 +2510,6 @@ Discord hakkında daha fazlasını öğrenmek ister misin?"</string>
     <string name="ios_media_keyboard_take_a_photo">Bir Fotoğraf çek</string>
     <string name="ios_notification_see_full">Mesajın tamamını görmek için dokun.</string>
     <string name="ios_profile_in_voice_call">Bir sesli aramada</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Ortak Arkadaşlar</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Ortak Sunucular</string>
     <string name="ios_profile_open_voice_channel">Ses Kanalı Aç</string>
     <string name="ios_view_all">Tümünü göster</string>
     <string name="ip_address_secured">IP Adresi Güvenli</string>
@@ -2840,7 +2827,6 @@ kanallara taşınabilir."</string>
     <string name="network_error_unknown">Bilinmeyen bir ağ hatası meydana geldi.</string>
     <string name="network_error_unknown_host">Bir ağ hatası oluştu. Lütfen DNS ayarlarını kontrol et ve tekrar dene.</string>
     <string name="network_offline">Ağ bağlantısı sınırlı veya kullanılamıyor.</string>
-    <string name="nevermind">Boşver</string>
     <string name="new_dm">Yeni Direkt Mesaj</string>
     <string name="new_group_dm">"Yeni Grup DM'si"</string>
     <string name="new_guilds_dm_allowed">Sunucu üyelerinden gelen direkt mesajlara izin ver.</string>
@@ -2965,7 +2951,6 @@ hiçbir sabitlenmiş mesajı yok… henüz."</string>
     <string name="notice_no_input_detected_help_link_text">Yardım!</string>
     <string name="notice_no_input_detected_settings">Görünen o ki, Discord mikrofonundan ses alamıyor. Hadi bunu düzeltelim!</string>
     <string name="notice_no_input_detected_settings_link_text">"Ayarlar'a git"</string>
-    <string name="notice_premium_grandfathered_ended">"Nitro erişiminin süresi doldu. Süper güçlendirilmiş sohbet avantajlarına ve bir Sunucu Takviyesi'ne sahip olmak için Nitro Classic üyeliğini Nitro'ya yükselt."</string>
     <string name="notice_premium_grandfathered_ending">Sadece %1$s Nitro erişimin kaldı! Aboneliğin **%2$s** tarihinde Nitro Classic seviyesine inecek.</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>
@@ -3198,7 +3183,7 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="payment_modal_button_change_card">Kredi Kartını Güncelle</string>
     <string name="payment_modal_button_change_paypal">PayPal Hesabını Güncelle</string>
     <string name="payment_modal_button_premium">%1$s al</string>
-    <string name="payment_modal_button_premium_gift">%1$s satın al</string>
+    <string name="payment_modal_button_premium_gift">Hediye satın al</string>
     <string name="payment_modal_one_month">1 ay</string>
     <string name="payment_modal_one_year">1 yıl</string>
     <string name="payment_modal_per_month">Aylık</string>
@@ -3308,9 +3293,6 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
 Üyeliğini istediğin zaman tekrar başlatabilirsin."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Abonelik iptali güncel fatura döneminin sonunda, yani **%1$s** tarihinde devreye girecek. Bunu değiştirirsen Discord Etiketi rastgele hale getirilecek.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Aboneliğ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, Nitro erişimini kaybedeceksin ve eğer değiştirdiysen, Discord Etiketin rastgele belirlenecek ve Sunucu Takviyen kaldırılacak.
-
- Aboneliğini istediğin zaman yeniden başlatabilirsin."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Abonelik iptali güncel fatura döneminin sonunda devreye girecek. **%1$s** tarihinde, Nitro erişimini kaybedeceksin ve eğer değiştirdiysen, Discord Etiketin rastgele belirlenecek ve Sunucu Takviyen kaldırılacak.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Aboneliğini istediğin zaman tekrar başlatabilirsin.</string>
     <string name="premium_cancel_confirm_mobile">"Nitro'yu İptal Et"</string>
@@ -3333,7 +3315,6 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="premium_chat_perks_description_streaming">"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_description_upload_limit">Nitro ile %1$s ile %2$s arasında ve Nitro Classic ile %3$s daha büyük dosya yükleme boyutu.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Favori sunucuna takviye yap!</string>
-    <string name="premium_chat_perks_simple_title">İşleri basit tut ve bir Sunucu Takviyesi olmadan temel sohbet avantajlarına sahip ol.</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>
@@ -3372,41 +3353,20 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="premium_grandfathered_yearly">"Discord'a verdiğin destek için teşekkür etmek amacıyla sana iki yıl boyunca Nitro erişimi verdik. Erişim süren **%1$s** tarihinde bitecek."</string>
     <string name="premium_guild_cooldown_available_countdown">Takviye Bekleme Süresi: **%1$sg %2$ss %3$sdk**</string>
     <string name="premium_guild_features_blurb">Bir sunucuya Nitro aboneliği ile takviye yapmak onun yeni bir seviyeye çıkmasına yardımcı olacaktır. Ulaşılan her seviye ile sunucudaki herkes için sohbet avantajları ** açar!** Bu güzel avantajlardan birkaçına göz at:</string>
-    <string name="premium_guild_features_customize_guild_description">Davet arka planı, sunucu afişi, özel URL vb. gibi özelleştirmeleri aç.</string>
     <string name="premium_guild_features_customize_guild_mobile">Sunucu Özelleştirmeleri</string>
-    <string name="premium_guild_features_customize_guild_title">Sunucu Özelleştirmeleri</string>
     <string name="premium_guild_features_learn_more_button">Discord Nitro hakkında daha fazla bilgi al</string>
     <string name="premium_guild_features_learn_more_text">Düşük bir aylık maliyetle başlayan geliştirilmiş bir Discord deneyimi yaşa.</string>
     <string name="premium_guild_features_more">Ve daha fazlası! Mevcut seviyeyi, seviyedeki ilerlemeni ve bir sunucuda var olan avantajları kontrol et.</string>
-    <string name="premium_guild_features_new_role_description">Sadece sunucundaki Nitro Sunucu Takviyesi Sahipleri tarafından kullanılabilen özel bir sunucu rolü kazan.</string>
-    <string name="premium_guild_features_new_role_mobile">Özel Nitro Sunucu Takviyesi Sahibi rolleri</string>
-    <string name="premium_guild_features_new_role_title">Özel Yeni Rol</string>
-    <string name="premium_guild_features_show_support_description">Takviye sahipleri, zaman içinde değişen parlak, yeni bir profil rozeti alırlar.</string>
     <string name="premium_guild_features_show_support_mobile">Zaman içinde değişen yeni bir profil rozeti</string>
-    <string name="premium_guild_features_show_support_title">Desteğini Göster</string>
     <string name="premium_guild_features_title">Nitro ile bir sunucuya takviye yapmaya yardım edebilirsin!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Topluluk genelinde daha yüksek yükleme boyutları</string>
-    <string name="premium_guild_features_upload_sizes_title">Her Şey için Daha Büyük Yükleme Boyutları</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">"Bir sunucuya bir Nitro Takviyesi göndermek için Nitro'ya abone ol! [Nitro Sunucu Takviyesi hakkında daha fazla bilgi al.](%1$s)"</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Bir sunucuya bir Nitro Takviyesi göndermek için aboneliğini yükselt! [Nitro Sunucu Takviyesi hakkında daha fazla bilgi al.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Nitro Takviyesi yok</string>
     <string name="premium_guild_header_badge_no_tier">Seviye yok</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro Sunucu Takviyesi</string>
     <string name="premium_guild_perks_modal_base_perks">Takviye yapılan sunucu avantajlarından bazıları —</string>
-    <string name="premium_guild_perks_modal_blurb">"Ulaşılan her yeni seviye ile bu sunucunun üyeleri herkes için avantajları açmaya yardımcı olacaklar. Bu avantajlar sadece sunucu içinde geçerlidir.
-
- **Takviye sahiplerinin alacakları: Üye Listesi simgesi, yeni değişen rozet ve Takviye yapana özel bir rol.**
-
- [Nitro Sunucu Takviyesi hakkında daha fazla bilgi al.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Ulaşılan her yeni seviye ile bu sunucunun üyeleri herkes için avantajları açmaya yardımcı olacaklar. Bu avantajlar sadece sunucu içinde geçerlidir.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Takviye sahiplerinin alacakları: Üye Listesi simgesi, yeni değişen rozet ve Takviye yapana özel bir rol.** [Nitro Sunucu Takviyesi hakkında daha fazla bilgi al.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Takviye yapmak için Nitro al!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Bu Sunucuya takviye yap</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">"Takviye yapmak için Nitro'ya yükselt!"</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">"Şu anda Apple aracılığıyla Nitro abonelikleri yükseltmelerini desteklemiyoruz. Aboneliğini [Apple'ın Abonelik Yönetimi](%1$s) aracılığıyla iptal edebilirsin, ama abonelik süresi dolana kadar aktif kalacaktır."</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">"Nitro Classic'te Sunucu Takviyesi bulunmuyor"</string>
     <string name="premium_guild_perks_modal_header">Sunucu Takviyesi Durumu</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** Takviye</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Takviyeni yönet</string>
     <string name="premium_guild_perks_modal_no_tiers">Henüz hiçbir Seviyeye ulaşılmadı</string>
@@ -3419,44 +3379,32 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="premium_guild_settings_members_subscribed">%1$s bu sunucuya takviye yaptı</string>
     <string name="premium_guild_settings_members_subscribed_needed">%1$s kademesini açmak için **%2$s** daha gerekiyor</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Buraya bir Nitro Takviyesi göndermek istediğine emin misin:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Bu Sunucuyu seç</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Bu Sunucuyu seç. Takviyenin devreye girmesi biraz zaman alacak.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Bu sunucuya takviye yaptığında %1$s boyunca başka bir sunucuya takviye yapamayacaksın. Takviyeyi kaldırmak bekleme süresini sonlandırmaz.**</string>
     <string name="premium_guild_subscribe_confirm_header">Seçimini iyi yap!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Sunucuları ara</string>
     <string name="premium_guild_subscribe_select_guild_header">Bir Sunucu seç</string>
     <string name="premium_guild_subscribe_success_thanks">Takviye için teşekkürler!</string>
     <string name="premium_guild_subscription_available_count">Kullanılabilir **%1$s** var!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Takviye yapmaya çalışırken bir hata oluştu. Lütfen tekrar dene.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Görünüşe göre bekleme süresindesin. Tekrar denemeden önce lütfen **%1$s ve %2$s** bekle</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Görünüşe göre bekleme süresindesin. Tekrar denemeden önce lütfen **%1$s ve %2$s** bekle</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Görünüşe göre bekleme süresindesin. Tekrar denemeden önce lütfen **%1$s** bekle</string>
     <string name="premium_guild_subscription_no_next_tier">Bu sunucu tamamen güçlendirilmiş durumda! Takviye yapmaya devam et!</string>
-    <string name="premium_guild_subscription_notice">Nitro Sunucu Takviyeleri geldi! Sunucuna takviye yapmak için topluluğunu bir araya getir.</string>
     <string name="premium_guild_subscription_notice_button">Seviyelere ve Avantajlara bak</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro Sunucu Takviyeleri geldi! Sunucuna takviye yapmak için arkadaşlarını bir araya getir.</string>
     <string name="premium_guild_subscription_remove_button">Takviyeyi kaldır</string>
     <string name="premium_guild_subscription_remove_error_mobile">Takviyeyi kaldırmaya çalışırken bir hata oluştu. Lütfen tekrar dene.</string>
     <string name="premium_guild_subscription_select_server_button">Bir Sunucu seç</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Nitro güçlerini kullanarak, katıldığın bir sunucuya takviye yap! Bir Sunucuya takviye yapmak onun sonraki seviyelere doğru yükselmesini sağlar. Her seviye tüm sunucu için ortak avantajlar verir.
- Bir sunucuya takviye yapmak 7 günlük bir bekleme süresini başlatır. Yaptığın takviyeyi kaldırsan bile başka bir sunucuya takviye yapmak için bu sürenin sona ermesi gerekir. [Nitro Sunucu Takviyesi hakkında daha fazla bilgi al.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Nitro güçlerini kullanarak, katıldığın bir sunucuya takviye yap! Bir Sunucuya takviye yapmak onun sonraki seviyelere doğru yükselmesini sağlar. Her seviye tüm sunucu için ortak avantajlar verir.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Bir sunucuya takviye yapmak 7 günlük bir bekleme süresini başlatır. Yaptığın takviyeyi kaldırsan bile başka bir sunucuya takviye yapmak için bu sürenin sona ermesi gerekir. [Nitro Sunucu Takviyesi hakkında daha fazla bilgi al.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro Sunucu Takviyesi</string>
-    <string name="premium_guild_subscription_tooltip">%1$s tarihinden beri Nitro takviyesi yapıyor</string>
+    <string name="premium_guild_tier_0">Seviye yok</string>
     <string name="premium_guild_tier_1">1. Seviye</string>
     <string name="premium_guild_tier_2">2. Seviye</string>
     <string name="premium_guild_tier_3">3. Seviye</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">"Nitro Takviyesi'ni buradan kaldırmak istediğine emin misin:"</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Evet, Takviyeyi kaldır</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Takviyeni kaldırırsan bu sunucu ilerleme kaybedecek.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Takviyeni kaldırırsan bu sunucu ilerleme kaybedecek. **Takviyen hala bekleme süresinde. %1$s ve %2$s içinde kullanılabilir olacak.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Takviyeni kaldırırsan bu sunucu ilerleme kaybedecek. **Takviyen hala bekleme süresinde. %1$s ve %2$s içinde kullanılabilir olacak.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Takviyeni kaldırırsan bu sunucu ilerleme kaybedecek. **Takviyen hala bekleme süresinde. %1$s içinde kullanılabilir olacak.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Nitro Takviyesi kaldırılsın mı?</string>
     <string name="premium_included">"Nitro'da bulunanlar:"</string>
     <string name="premium_info_monthly">%1$s (aylık) %2$s tarihinde faturalandırılacak.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Ay</string>
@@ -3469,7 +3417,6 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <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_button_iap">%1$s al!</string>
     <string name="premium_payment_confirmation_button_regular">Tamam, iyi fikir</string>
-    <string name="premium_payment_gift_blurb">Arkadaşlarına [Nitro](onClick) hediye ederek onların süper güçlendirilmiş sohbet avantajlarına ve bir Sunucu Takviyesine sahip olmalarını sağla.</string>
     <string name="premium_payment_gift_blurb_mobile">Birine Nitro Classic hediye ederek onun süper güçlendirilmiş sohbet avantajlarına sahip olmasını ve Sunucu Takviyesi yapmasını sağla. [Nitro hakkında daha fazla bilgi al.](onClick)</string>
     <string name="premium_payment_gift_subtext">Bu, seçilen süre için sadece tek seferlik bir ücretlendirme olacak. Aylık olarak fatura kesilmeyecek.</string>
     <string name="premium_payment_is_gift">Bir hediye satın alıyorsun.</string>
@@ -3484,7 +3431,6 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="premium_plan_month_tier_1">Aylık Nitro Classic</string>
     <string name="premium_plan_month_tier_2">Aylık Nitro</string>
     <string name="premium_promo_autocomplete">Her yerde özel emojiler kullan</string>
-    <string name="premium_promo_description">"Herhangi bir sunucuda hareketli ve özel emojiler kullanmak için Discord Nitro'yla kalkışa geç."</string>
     <string name="premium_promo_title">Güçlendirilmiş emoji gücü ister misin?</string>
     <string name="premium_required">Nitro Gerekiyor</string>
     <string name="premium_required_get_nitro">Nitro al!</string>
@@ -3503,26 +3449,10 @@ Ayrıca, arayüz herkes için çalışmayabilir. Eğer herhangi bir sorunun var
     <string name="premium_tier_2_title">Düşük bir aylık maliyetle geliştirilmiş bir Discord deneyimi yaşa.</string>
     <string name="premium_trial_button">Ücretsiz deneme sürümünü başlat</string>
     <string name="premium_upgrade_cancel">Hayır</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Yıllık plana yükselt ve iki ay ücretsiz kazan. Teklife gel!!!
-
-Mevcut planını tekrar paylaştıracak ve yıllık fiyattan düşeceğiz. **%1$s** ücretlendirileceksin."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Yıllık plana yükselt ve iki ay ücretsiz kazan. Teklife gel!!!
-
-Mevcut planını tekrar paylaştıracak ve yıllık fiyattan düşeceğiz. Şimdi **%1$s** ve mevcut faturalandırma dönemi sona erince yıllık **%2$s ücretlendirileceksin.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"%1$s (aylık) planını yükselt ve sunuculara takviye yapma imkanı kazan. Yeni planın anında başlayacak.
-
- Mevcut planını tekrar paylaştıracak ve aylık fiyattan düşeceğiz. **%2$s** ücretlendirileceksin."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"%1$s (aylık) planını yükselt ve sunuculara takviye yapma imkanı kazan. Yeni planın anında başlayacak.
-
-Mevcut planını tekrar paylaştıracak ve aylık fiyattan düşeceğiz. Şimdi **%2$s** ve mevcut faturalandırma dönemi sona erince aylık **%3$s ücretlendirileceksin.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"%1$s (aylık) planını yükselt ve sunuculara takviye yapma imkanı kazan. Yeni planın anında başlayacak.
 
 Mevcut planını tekrar paylaştıracak ve yıllık fiyattan düşeceğiz. **%2$s** ücretlendirileceksin."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"%1$s (aylık) planını yükselt ve sunuculara takviye yapma imkanı kazan. Yeni planın anında başlayacak.
-
-Mevcut planını tekrar paylaştıracak ve yıllık fiyattan düşeceğiz. Şimdi **%2$s** ve mevcut faturalandırma dönemi sona erince yıllık **%3$s ücretlendirileceksin.**"</string>
     <string name="premium_upgrade_confirm_button">Yükselt</string>
-    <string name="premium_upgrade_confirm_button_with_price">Hemen yükselt - %1$s</string>
     <string name="premium_upgrade_confirm_title">%1$s Planına Yükselt</string>
     <string name="premium_upgrade_disabled_already_premium">Zaten Nitro sahibiyken abone olamazsın.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Mevcut planın.</string>
@@ -4082,8 +4012,6 @@ Bunu yapmak istediğinden emin misin?"</string>
     <string name="stop_streaming">Yayını Durdur</string>
     <string name="stop_watching">İzlemeyi Bırak</string>
     <string name="store_channel">Mağaza Kanalı</string>
-    <string name="store_payment_legalese_monthly">Hey! %1$s satın alarak [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 [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>
diff --git a/com.discord/res/values-uk/plurals.xml b/com.discord/res/values-uk/plurals.xml
index 82c28077c3..c6cb61d0e6 100644
--- a/com.discord/res/values-uk/plurals.xml
+++ b/com.discord/res/values-uk/plurals.xml
@@ -341,14 +341,6 @@
         <item quantity="one">%d рік</item>
         <item quantity="few">%d роки</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d міс.</item>
-        <item quantity="one">%d місяць</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d р.</item>
-        <item quantity="one">%d рік</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">%d місяців</item>
         <item quantity="one">місяць</item>
@@ -523,18 +515,6 @@
         <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>
@@ -615,11 +595,6 @@
         <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>
@@ -635,17 +610,12 @@
         <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">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d місяців</item>
         <item quantity="one">%d місяць</item>
         <item quantity="few">%dмісяці</item>
@@ -672,11 +642,6 @@
         <item quantity="other">хв.</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">днів</item>
         <item quantity="one">%d день</item>
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index fef6e2768b..04ab325ec7 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -640,7 +640,6 @@
     <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>
@@ -697,8 +696,6 @@
     <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_source_invalid">Цей спосіб оплати недійсний.</string>
     <string name="billing_payment_sources">Способи оплати</string>
     <string name="billing_payment_table_header_amount">Сума</string>
@@ -716,13 +713,11 @@
     <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>
@@ -744,6 +739,10 @@
     <string name="billing_step_review">Переглянути</string>
     <string name="billing_step_select_plan">Вибрати план передплати</string>
     <string name="billing_subscribe">Підписатися</string>
+    <string name="billing_switch_plan_change">Змінити підписку</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Зрозуміло!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Чудово!</string>
+    <string name="billing_switch_plan_upgrade">Покращити</string>
     <string name="billing_tag_failed">Помилка</string>
     <string name="billing_tag_pending">Очікується</string>
     <string name="billing_tag_refunded">Компенсовано</string>
@@ -1803,11 +1802,8 @@ AFK. Це не впливає на браузери."</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_nitro_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_success_premium_tier_2_monthly">Завдяки одній щедрій людській істоті у тебе тепер є доступ до покращених переваг чату та прискорення сервера на %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2160,9 +2156,7 @@ AFK. Це не впливає на браузери."</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>
@@ -2179,16 +2173,12 @@ AFK. Це не впливає на браузери."</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_title">Стан прискорення сервера</string>
     <string name="guild_settings_premium_guild_unlocked">Розблоковано</string>
+    <string name="guild_settings_premium_upsell_learn_more">Дізнатися більше про Discord Nitro</string>
     <string name="guild_settings_server_banner">Банер сервера</string>
     <string name="guild_settings_server_invite_background">Тло запрошення до сервера</string>
     <string name="guild_settings_splash_info">Це зображення відображається, коли користувачі отримують запрошення на сервер.</string>
@@ -2198,6 +2188,7 @@ AFK. Це не впливає на браузери."</string>
 
 Якщо в тебе є доступ до користувачів свого сайту, то ти також можеш динамічно додати &amp;username= до запиту."</string>
     <string name="guild_settings_widget_enable_widget">Увімкнути віджет серверу</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Опис покупки</string>
     <string name="guild_verification_text_account_age">Твій акаунт повинен бути створений мінімум %1$s хвилин тому, щоб надсилати повідомлення на цьому сервері.</string>
     <string name="guild_verification_text_member_age">Ти повинен бути учасником мінімум %1$s хвилин, щоб надсилати повідомлення на цьому сервері.</string>
     <string name="guild_verification_text_not_claimed">Ти повинен використати та перевірити свій акаунт, перш ніж зможеш надсилати повідомлення на цьому сервері.</string>
@@ -2548,10 +2539,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="ios_media_keyboard_take_a_photo">Зробити знімок</string>
     <string name="ios_notification_see_full">Натисніть, щоб переглянути повне повідомлення.</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="ios_view_all">Дивитися все</string>
     <string name="ip_address_secured">IP-адреса захищена</string>
@@ -2869,7 +2856,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="network_error_unknown">Сталася невідома помилка мережі.</string>
     <string name="network_error_unknown_host">Сталася помилка мережі. Будь ласка, перевір налаштування DNS та спробуй ще раз.</string>
     <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>
@@ -2994,7 +2980,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="notice_no_input_detected_help_link_text">Допоможіть!</string>
     <string name="notice_no_input_detected_settings">Так, здається, Discord не розпізнає вхідні сигнали з твого мікрофона. Давай виправимо це!</string>
     <string name="notice_no_input_detected_settings_link_text">Налаштування візиту</string>
-    <string name="notice_premium_grandfathered_ended">Термін дії твого доступу до Nitro сплив. Перейди з Nitro Classic на Nitro, щоб отримати неймовірні переваги чату та прискорення сервера.</string>
     <string name="notice_premium_grandfathered_ending">Ти маєш лише %1$s, щоб грати в ігри Nitro! Твоя передплата зміниться на Nitro Classic **%2$s**.</string>
     <string name="notice_premium_promo_action">Дізнайся про це</string>
     <string name="notice_premium_promo_message">Підтримай розробку Discord та отримай круті бонуси!</string>
@@ -3227,7 +3212,7 @@ AFK. Це не впливає на браузери."</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_button_premium_gift">Купити подарунок</string>
     <string name="payment_modal_one_month">1 місяць</string>
     <string name="payment_modal_one_year">1 рік</string>
     <string name="payment_modal_per_month">За місяць</string>
@@ -3342,9 +3327,6 @@ AFK. Це не впливає на браузери."</string>
 Ти можеш заново розпочати свою передплату в будь-який час."</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">Скасування вступить в дію наприкінці поточного періоду оплати **%1$s**. Якщо ти змінив тег Discord, тобі буде надано випадковий тег.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Ти можеш заново запустити передплату в будь-який момент.</string>
-    <string name="premium_cancel_confirm_body_tier_2">"Скасування вступить в дію наприкінці поточного періоду оплати. **%1$s** ти втратиш доступ до Nitro. Якщо ти змінив тег Discord, тобі буде надано випадковий тег, і твоє прискорення сервера буде видалено.
-
-Ти можеш поновити свою передплату в будь-який час."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">Скасування вступить в дію наприкінці поточного періоду оплати. **%1$s** ти втратиш доступ до Nitro. Якщо ти змінив тег Discord, тобі буде надано випадковий тег, і твоє прискорення сервера буде видалено.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Ти можеш заново запустити передплату в будь-який момент.</string>
     <string name="premium_cancel_confirm_mobile">Скасувати Nitro</string>
@@ -3367,7 +3349,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_chat_perks_description_streaming">Транслюй зі швидкістю джерела з Nitro або з якістю до 1080 п 60 кадрів/с з Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Розмір файлів для завантаження збільшений з %1$s до %2$s з Nitro або до %3$s з Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Прискор свій улюблений сервер!</string>
-    <string name="premium_chat_perks_simple_title">Не треба ускладнювати — отримай базові переваги чату без прискорення сервера.</string>
     <string name="premium_chat_perks_streaming_mobile">Кращі трансляції Go Live: транслюй зі швидкістю джерела з Nitro або з якістю до 1080 п 60 кадрів/с з Nitro Classic</string>
     <string name="premium_chat_perks_title_animated_avatar_and_emoji">Анімовані розваги</string>
     <string name="premium_chat_perks_title_badge">Продемонструй усім свою підтримку</string>
@@ -3406,41 +3387,20 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_grandfathered_yearly">В якості подяки за підтримку Discord надаємо тобі доступ до Nitro на два роки. Твій доступ закінчується **%1$s**.</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_description">Отримай особливу роль на сервері, доступну тільки для прискорювачів серверів Nitro на твоєму сервері.</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_description">Прискорювачі отримають блискучий новий бейдж для профілю, який змінюється з їхнім внеском.</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! [Дізнатися більше про прискорення сервера Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Покращи свою передплату, щоб надіслати на сервер прискорення Nitro! [Дізнатися більше про прискорення сервера 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">Наразі ми не підтримуємо перехід на Nitro для користувачів, що оформили передплату через Apple. Ти можеш скасувати свою передплату за допомогою [Керування передплатами 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>
@@ -3453,44 +3413,32 @@ AFK. Це не впливає на браузери."</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_duration_mobile">%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_0">Немає рівня</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_month_subscription">**%1$s%2$s %3$s** / Місяць</string>
@@ -3502,7 +3450,6 @@ AFK. Це не впливає на браузери."</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_regular">Добре звучить</string>
-    <string name="premium_payment_gift_blurb">Подаруй своїм друзям [Nitro](onClick), щоб вони отримали найпотужніші переваги чату та прискорення сервера.</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>
@@ -3517,7 +3464,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_plan_month_tier_1">Щомісячна передплата Nitro Classic</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">Отримати Nitro!</string>
@@ -3537,26 +3483,10 @@ AFK. Це не впливає на браузери."</string>
     <string name="premium_title">Discord Nitro</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_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>
@@ -4119,8 +4049,6 @@ AFK. Це не впливає на браузери."</string>
     <string name="stop_streaming">Припинити трансляцію</string>
     <string name="stop_watching">Припинити перегляд</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>
diff --git a/com.discord/res/values-vi/plurals.xml b/com.discord/res/values-vi/plurals.xml
index 4a4abbe6e7..15ed48a188 100644
--- a/com.discord/res/values-vi/plurals.xml
+++ b/com.discord/res/values-vi/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d năm</item>
         <item quantity="one">%d năm</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d tháng</item>
-        <item quantity="one">%d tháng</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d năm</item>
-        <item quantity="one">%d năm</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">tháng</item>
         <item quantity="one">tháng</item>
@@ -466,16 +458,6 @@
         <item quantity="other">%d lần sử dụng</item>
         <item quantity="one">%d lần sử dụng</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d Bạn Chung</item>
-        <item quantity="zero">0 Bạn Chung</item>
-        <item quantity="one">1 Bạn Chung</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d Máy Chủ Chung</item>
-        <item quantity="zero">0 Máy Chủ Chung</item>
-        <item quantity="one">1 Máy Chủ Chung</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d ngày</item>
         <item quantity="one">1 ngày</item>
@@ -549,10 +531,6 @@
         <item quantity="other">%d tháng</item>
         <item quantity="one">1 tháng</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
-        <item quantity="other">%d Tăng Cường</item>
-        <item quantity="one">%d Tăng Cường</item>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d lần Tăng Cường nữa</item>
         <item quantity="one">%d lần Tăng Cường nữa</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d Tăng Cường</item>
         <item quantity="one">%d Tăng Cường</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d ngày</item>
-        <item quantity="one">%d ngày</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d Tăng Cường Máy Chủ</item>
         <item quantity="one">%d Tăng Cường Máy Chủ</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d Tháng</item>
         <item quantity="one">%d Tháng</item>
     </plurals>
@@ -597,10 +571,6 @@
         <item quantity="other">%d phút</item>
         <item quantity="one">%d phút</item>
     </plurals>
-    <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** tăng cường</item>
-        <item quantity="one">**%d** tăng cường</item>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d ngày</item>
         <item quantity="one">%d ngày</item>
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index 211a2db494..1ed89226e1 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -629,7 +629,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">Thanh toán</string>
     <string name="billing_accept_terms_tooltip">Chấp nhận các điều khoản dịch vụ để tiếp tục</string>
     <string name="billing_account_credit">Tín Dụng Tài Khoản</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s tháng miễn phí</string>
     <string name="billing_add_payment_method">Thêm phương thức thanh toán</string>
     <string name="billing_address">Địa chỉ thanh toán</string>
     <string name="billing_address_address">Địa chỉ</string>
@@ -683,8 +682,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_choose_plan">Chọn một gói</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">Đăng ký %1$s đồng nghĩa với việc bạn đã đồng ý với [Điều Khoản Dịch Vụ](%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">Đăng ký %1$s đồng nghĩa với việc bạn đã đồng ý với [Điều Khoản Dịch Vụ](%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_source_invalid">Nguồn thanh toán này là hợp lệ.</string>
     <string name="billing_payment_sources">Phương thức thanh toán</string>
     <string name="billing_payment_table_header_amount">Số tiền</string>
@@ -702,13 +699,11 @@ nhưng nếu và khi bắt buộc phải làm như vậy, đừng do dự!"</str
     <string name="billing_price_per_month_current_plan">(GÓI ĐANG DÙNG) %1$s / Tháng</string>
     <string name="billing_price_per_month_current_plan_ios">(Gói Đang Dùng) %1$s / Tháng</string>
     <string name="billing_price_per_month_mobile">%1$s / THÁNG</string>
-    <string name="billing_price_per_month_upgrade">Nâng cấp với giá %1$s/tháng</string>
     <string name="billing_price_per_year">%1$s /năm</string>
     <string name="billing_price_per_year_current_plan">(GÓI ĐANG DÙNG) %1$s / Năm</string>
     <string name="billing_price_per_year_current_plan_ios">(Gói Đang Dùng) %1$s / Năm</string>
     <string name="billing_price_per_year_mobile">%1$s / NĂM</string>
     <string name="billing_price_per_year_months_free">%1$s/năm (2 Tháng Miễn Phí)</string>
-    <string name="billing_price_per_year_upgrade">Nâng cấp với giá %1$s/năm</string>
     <string name="billing_purchase_details_header">Chi tiết giao dịch</string>
     <string name="billing_refund_header">Giao dịch của bạn có vấn đề?</string>
     <string name="billing_refund_play_time_never_played">Chưa bao giờ chơi</string>
@@ -730,6 +725,10 @@ nhưng nếu và khi bắt buộc phải làm như vậy, đừng do dự!"</str
     <string name="billing_step_review">Xem lại</string>
     <string name="billing_step_select_plan">Chọn Gói Cước</string>
     <string name="billing_subscribe">Đăng ký</string>
+    <string name="billing_switch_plan_change">Thay đổi kế hoạch</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Hiểu rồi!</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Tuyệt!</string>
+    <string name="billing_switch_plan_upgrade">Nâng cấp</string>
     <string name="billing_tag_failed">Thất bại</string>
     <string name="billing_tag_pending">Đang chờ xử lý</string>
     <string name="billing_tag_refunded">Được hoàn lại</string>
@@ -1774,11 +1773,8 @@ Cảm ơn bạn đã giữ mọi thứ an toàn và yên bình."</string>
     <string name="gift_confirmation_body_success_generic_subscription_monthly">Nhờ có các thành viên hào phóng khác, bạn giờ đây đã có %1$s trong %2$s.</string>
     <string name="gift_confirmation_body_success_generic_subscription_yearly">Nhờ có các thành viên hào phóng khác, bạn giờ đây đã có %1$s trong %2$s.</string>
     <string name="gift_confirmation_body_success_mobile">**%1$s** đã được thêm vào thư viện của bạn.</string>
-    <string name="gift_confirmation_body_success_nitro_mobile">Nhờ có một người hào phóng khác, bạn giờ đây đã có thể dùng các đặc quyền trò chuyện nâng cao và một lần Nâng Cấp Máy Chủ trong %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_monthly">Nhờ có các thành viên hào phóng khác, bạn giờ đây đã có thể dùng các đặc quyền trò chuyện nâng cao trong %1$s.</string>
     <string name="gift_confirmation_body_success_premium_tier_1_yearly">Nhờ có các thành viên hào phóng khác, bạn giờ đây đã có thể dùng các đặc quyền trò chuyện nâng cao trong %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_monthly">Nhờ có một người hào phóng khác, bạn giờ đây đã có thể dùng các đặc quyền trò chuyện nâng cao và một lần Nâng Cấp Máy Chủ trong %1$s.</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_yearly">Nhờ có một người hào phóng khác, bạn giờ đây đã có thể dùng các đặc quyền trò chuyện nâng cao và một lần Nâng Cấp Máy Chủ trong %1$s.</string>
     <string name="gift_confirmation_body_unknown_error">Có gì đó rất sội động đã diễn ra và chúng tôi đã giữ được cái túi… Muốn thử lại chứ?</string>
     <string name="gift_confirmation_button_confirm">Bá Cháy! Thêm vào Thư viện thôi</string>
     <string name="gift_confirmation_button_confirm_mobile">Đưa cho tôi</string>
@@ -2131,9 +2127,7 @@ Mất đi: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s ô emoji máy chủ (tổng cộng là %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">Giới hạn tải lên %1$s cho tất cả các thành viên</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Đặc quyền máy chủ được tăng cường bao gồm —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">Chưa có ai tặng Nitro cho máy chủ này cả. Hãy để xem có thành viên nào trao Đặc Quyền Nitro cho toàn máy chủ của bạn hay không!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Máy chủ được tăng cường sẽ được nhận tất cả các quyền lợi như lần trước, và —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">Không Có Tăng Cường Nitro</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Đặc Quyền Cấp 1</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Đặc Quyền Cấp 2</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Đặc Quyền Cấp 3</string>
@@ -2150,16 +2144,12 @@ Mất đi: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Đã mở khóa đặc quyền bậc %1$s</string>
     <string name="guild_settings_overview_notice">Hãy Cẩn thận! Bạn chưa lưu các thay đổi!</string>
     <string name="guild_settings_overview_tier_info">Đây là Tính Năng Nitro Bậc %1$s. [Kiểm tra trạng thái bậc](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Thành viên của máy chủ có đăng ký Nitro còn hiệu lực có thể mở khóa các cấp bậc bằng cách tặng trạng thái Nitro của họ.
-Với mỗi cấp bậc đạt được, các thành viên của máy chủ sẽ giúp mở khóa các đặc quyền cho tất cả mọi người.
-
-Thành viên có thể thu hồi tăng cường của họ bất kỳ lúc nào.
-**Máy chủ vẫn sẽ các đặc quyền trong vòng ba ngày cho đến khi bị tuột một cấp bậc. **[Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)"</string>
     <string name="guild_settings_premium_guild_close_hint">Chỉ %1$s để đạt cấp tiếp theo!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** tăng cường máy chủ này</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Trạng Thái Tăng Cường Máy Chủ Nitro</string>
+    <string name="guild_settings_premium_guild_title">Trạng Thái Tăng Cường Máy Chủ</string>
     <string name="guild_settings_premium_guild_unlocked">Đã mở khóa</string>
+    <string name="guild_settings_premium_upsell_learn_more">Tìm hiểu thêm về Discord Nitro</string>
     <string name="guild_settings_server_banner">Biểu Ngữ Máy Chủ</string>
     <string name="guild_settings_server_invite_background">Ảnh Nền Lời Mời Vào Máy Chủ</string>
     <string name="guild_settings_splash_info">Hình ảnh sẽ hiển thị khi người dùng nhận được lời mời đến máy chủ.</string>
@@ -2169,6 +2159,7 @@ Thành viên có thể thu hồi tăng cường của họ bất kỳ lúc nào.
 
 Nếu bạn có quyền truy cập vào người dùng của trang thì bạn có thể linh động trong việc thêm &amp;tên người dùng= vào chuỗi yêu cầu."</string>
     <string name="guild_settings_widget_enable_widget">Bật Công Cụ Máy Chủ</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Chi tiết giao dịch</string>
     <string name="guild_verification_text_account_age">Tài khoản của bạn phải tồn tại ít nhất %1$s phút để được gửi tin nhắn.</string>
     <string name="guild_verification_text_member_age">Bạn phải là thành viên trong ít nhất %1$s phút để gửi tin nhắn.</string>
     <string name="guild_verification_text_not_claimed">Bạn phải xác nhận quyền sở hữu và xác minh tài khoản trước khi có thể gửi tin nhắn trong máy chủ.</string>
@@ -2513,10 +2504,6 @@ Bạn có muốn biết thêm về Discord không?"</string>
     <string name="ios_media_keyboard_take_a_photo">Chụp Ảnh</string>
     <string name="ios_notification_see_full">Nhấn để xem tin nhắn đầy đủ.</string>
     <string name="ios_profile_in_voice_call">Đang trong cuộc gọi thoại</string>
-    <string name="ios_profile_mutual_friends">%1$s</string>
-    <string name="ios_profile_mutual_friends_placeholder">Bạn Chung</string>
-    <string name="ios_profile_mutual_guilds">%1$s</string>
-    <string name="ios_profile_mutual_guilds_placeholder">Máy Chủ Chung</string>
     <string name="ios_profile_open_voice_channel">Mở Kênh Thoại</string>
     <string name="ios_view_all">Xem tất cả</string>
     <string name="ip_address_secured">Địa Chỉ IP Đã Được Bảo Mật</string>
@@ -2834,7 +2821,6 @@ qua lại giữa các kênh mà cả hai có quyền truy cập."</string>
     <string name="network_error_unknown">Đã có lỗi mạng không xác định xảy ra.</string>
     <string name="network_error_unknown_host">Đã có lỗi mạng xảy ra. Vui lòng kiểm tra cài đặt DNS và thử lại.</string>
     <string name="network_offline">Kết nối mạng bị giới hạn hoặc không khả dụng.</string>
-    <string name="nevermind">Không có gì</string>
     <string name="new_dm">Tin Nhắn Trực Tiếp Mới</string>
     <string name="new_group_dm">Nhóm DM Mới</string>
     <string name="new_guilds_dm_allowed">Cho phép tin nhắn trực tiếp từ các thành viên máy chủ.</string>
@@ -2957,7 +2943,6 @@ tin nhắn nào được ghim."</string>
     <string name="notice_no_input_detected_help_link_text">Cứu với!</string>
     <string name="notice_no_input_detected_settings">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 tìm hiểu nguyên nhân nào!</string>
     <string name="notice_no_input_detected_settings_link_text">Cài Đặt Ghé Thăm</string>
-    <string name="notice_premium_grandfathered_ended">Quyền truy cập vào Nitro của bạn đã không còn. Hãy nâng cấp Nitro Classic lên Nitro để nhận được các đặc quyền trò chuyện siêu hạng và một lần Nâng Cấp Máy Chủ.</string>
     <string name="notice_premium_grandfathered_ending">Đăng ký Nitro của bạn chỉ còn %1$s! Đăng ký của bạn sẽ bị hạ cấp xuống Nitro Classic vào ngày **%2$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>
@@ -3190,7 +3175,7 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
     <string name="payment_modal_button_change_card">Cập Nhật Thẻ Tín Dụng</string>
     <string name="payment_modal_button_change_paypal">Cập nhật Tài khoản PayPal</string>
     <string name="payment_modal_button_premium">Nhận %1$s</string>
-    <string name="payment_modal_button_premium_gift">Mua %1$s</string>
+    <string name="payment_modal_button_premium_gift">Mua Quà</string>
     <string name="payment_modal_one_month">1 tháng</string>
     <string name="payment_modal_one_year">1 năm</string>
     <string name="payment_modal_per_month">Mỗi Tháng</string>
@@ -3300,9 +3285,6 @@ Và overlay chưa chắc sẽ hiệu quả đối với tất cả mọi ngườ
 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_1_mobile_part_1">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 ngày **%1$s**. Discord Tag của bạn sẽ được chọn ngẫu nhiên nếu bạn đã thay đổi nó rồi.</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">Bạn có thể đăng ký lại 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. Đến ngày **%1$s**, bạn sẽ mất quyền truy cập vào Nitro, Discord Tag sẽ bị đổi ngẫu nhiên nếu đã được bạn đổi, và Nâng Cấp Máy Chủ cũng sẽ bị xóa.
-
- Bạn có thể khởi động lại gói đăng ký của mình bất cứ lúc nào."</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">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. Đến ngày **%1$s**, bạn sẽ mất quyền truy cập vào Nitro, Discord Tag sẽ bị đổi ngẫu nhiên nếu đã được bạn đổi, và Nâng Cấp Máy Chủ cũng sẽ bị xóa.</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">Bạn có thể đăng ký lại bất kỳ lúc nào.</string>
     <string name="premium_cancel_confirm_mobile">Hủy Nitro</string>
@@ -3325,7 +3307,6 @@ Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</string>
     <string name="premium_chat_perks_description_streaming">Stream chất lượng gốc với Nitro hoặc chất lượng sắc nét lên đến 1080p 60fps với Nitro Classic.</string>
     <string name="premium_chat_perks_description_upload_limit">Kích cỡ tệp tải lên lớn hơn từ %1$s đến %2$s với Nitro hoặc %3$s với Nitro Classic.</string>
     <string name="premium_chat_perks_premium_guild_subscription">Tăng cường máy chủ yêu thích của bạn!</string>
-    <string name="premium_chat_perks_simple_title">Hãy đơn giản hóa – nhận các đặc quyền trò chuyện cơ bản mà không cần Nâng Cấp Máy Chủ.</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>
@@ -3364,41 +3345,20 @@ Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</string>
     <string name="premium_grandfathered_yearly">Để cảm ơn bạn vì đã ủng hộ Discord, bạn có được quyền truy cập Nitro trong 2 năm. Quyền truy cập của bạn kết thúc vào ngày **%1$s**.</string>
     <string name="premium_guild_cooldown_available_countdown">Thời Gian Hồi Tăng Cường: **%1$sngày %2$sgiờ %3$sphút**</string>
     <string name="premium_guild_features_blurb">Việc tăng cường một máy chủ khi đang đăng ký Nitro sẽ giúp đưa quy trình lên một tầm cao mới. Với mỗi cấp bậc đạt được, thì các đặc quyền trò chuyện sẽ được mở khóa **cho tất cả mọi người trong máy chủ đó!** Hãy cùng xem qua một vài đặc quyền hấp dẫn đó nào:</string>
-    <string name="premium_guild_features_customize_guild_description">Mở khóa các tùy chỉnh như hình nền lời mời vào, biểu ngữ máy chủ, URL ảo, v.v.</string>
     <string name="premium_guild_features_customize_guild_mobile">Tùy Chỉnh Máy Chủ</string>
-    <string name="premium_guild_features_customize_guild_title">Tùy Chỉnh Máy Chủ</string>
     <string name="premium_guild_features_learn_more_button">Tìm hiểu thêm về Discord Nitro</string>
     <string name="premium_guild_features_learn_more_text">Trải nghiệm Discord nâng cao với gói cước rẻ hàng tháng.</string>
     <string name="premium_guild_features_more">Và hơn thế nữa! Bạn có thể xem cấp bậc hiện tại, quá trình thăng cấp và các đặc quyền khả dụng trong máy chủ.</string>
-    <string name="premium_guild_features_new_role_description">Nhận một vai trò máy chủ đặc biệt cho Người Nâng Cấp Máy Chủ Nitro trên máy chủ của bạn.</string>
-    <string name="premium_guild_features_new_role_mobile">Vai trò Tăng Cường Viên Máy Chủ Nitro Độc Quyền</string>
-    <string name="premium_guild_features_new_role_title">Vai Trò Mới Độc Quyền</string>
-    <string name="premium_guild_features_show_support_description">Người nâng cấp sẽ nhận được một huy hiệu hồ sơ mới lung linh thay đổi tùy theo số lượt nâng cấp.</string>
     <string name="premium_guild_features_show_support_mobile">Một huy hiệu hồ sơ mới thay đổi theo thời gian</string>
-    <string name="premium_guild_features_show_support_title">Khoe Thành Quả Hỗ Trợ</string>
     <string name="premium_guild_features_title">Với Nitro, bạn có thể giúp Tăng Cường máy chủ mà mình muốn!</string>
     <string name="premium_guild_features_upload_sizes_mobile">Tăng giới hạn tải lên cho toàn bộ cộng đồng</string>
-    <string name="premium_guild_features_upload_sizes_title">Kích Thước Tải Lên Lớn Hơn Cho Tất Cả</string>
-    <string name="premium_guild_features_upsell_banner_subscribe">Đăng ký Nitro để gửi Tăng Cường Nitro cho một máy chủ! [Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">Nâng cấp đăng ký của bạn để gửi Tăng Cường Nitro cho một máy chủ! [Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">Không Có Tăng Cường Nitro</string>
     <string name="premium_guild_header_badge_no_tier">Không Có Cấp</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Tăng Cường Máy Chủ Nitro</string>
     <string name="premium_guild_perks_modal_base_perks">Đặc quyền máy chủ được tăng cường bao gồm —</string>
-    <string name="premium_guild_perks_modal_blurb">"Với mỗi cấp bậc đạt được, thì những thành viên trong máy chủ sẽ giúp mở khóa các đặc quyền cho tất cả mọi người. Các đặc quyền này chỉ có hiệu lực trong phạm vi máy chủ.
-
- **Các Tăng Cường Viên nhận được: Biểu tượng Danh Sách Thành Viên, huy hiệu thăng cấp mới và một vai trò dành riêng cho Tăng Cường Viên.**
-
- [Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)"</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">Với mỗi cấp bậc đạt được, thì những thành viên trong máy chủ sẽ giúp mở khóa các đặc quyền cho tất cả mọi người. Các đặc quyền này chỉ có hiệu lực trong phạm vi máy chủ.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Các Tăng Cường Viên nhận được: Biểu tượng Danh Sách Thành Viên, huy hiệu thăng cấp mới và một vai trò dành riêng cho Tăng Cường Viên.** [Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)</string>
     <string name="premium_guild_perks_modal_button_get_premium">Đăng ký Nitro để Tăng Cường nào!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Tăng Cường Máy Chủ này</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Nâng cấp lên Nitro để Tăng Cường!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">Hiện tại chúng tôi không hỗ trợ nâng cấp Nitro cho người dùng đăng ký thông qua Apple. Bạn có thể hủy đăng ký qua [Trình Quản Lý Đăng Ký của Apple](%1$s) và đăng ký vẫn sẽ có hiệu lực cho đến hết kỳ hạn.</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic không có Nâng Cấp Máy Chủ</string>
     <string name="premium_guild_perks_modal_header">Trạng Thái Tăng Cường Máy Chủ</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** lần Tăng Cường</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Quản lý Tăng Cường</string>
     <string name="premium_guild_perks_modal_no_tiers">Chưa đạt được Cấp Bậc nào</string>
@@ -3411,44 +3371,32 @@ Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</string>
     <string name="premium_guild_settings_members_subscribed">%1$s đã tăng cường cho máy chủ này</string>
     <string name="premium_guild_settings_members_subscribed_needed">Bạn cần **%1$s** để mở khóa %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Bạn có chắc là muốn gửi Tăng Cường Nitrot đến:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Chọn Máy Chủ này</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Chọn máy chủ này. Sẽ hơi mất thời gian một chút để Tăng Cường có hiệu lực.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Việc Tăng Cường máy chủ này sẽ khiến bạn không thể Tăng Cường các máy chủ khác trong vòng %1$s. Thu hồi Tăng Cường lại cũng không làm thay đổi thời gian hồi.**</string>
     <string name="premium_guild_subscribe_confirm_header">Hãy chọn một cách sáng suốt!</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Tìm kiếm máy chủ</string>
     <string name="premium_guild_subscribe_select_guild_header">Chọn một Máy Chủ</string>
     <string name="premium_guild_subscribe_success_thanks">Cảm ơn vì đã hỗ trợ!</string>
     <string name="premium_guild_subscription_available_count">Bạn hiện sẵn có **%1$s**!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">Có lỗi xảy ra trong quá trình thực hiện tăng cường. Vui lòng thử lại.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">Có vẻ như bạn đang trong thời gian hồi. Vui lòng chờ trong **%1$s và %2$s** trước khi thử lại lần nữa</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">Có vẻ như bạn đang trong thời gian hồi. Vui lòng chờ trong **%1$s và %2$s** trước khi thử lại lần nữa</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">Có vẻ như bạn đang trong thời gian hồi. Vui lòng chờ trong **%1$s** trước khi thử lại lần nữa</string>
     <string name="premium_guild_subscription_no_next_tier">Máy chủ này đã được tối đa sức mạnh rồi! Tiếp tục tăng cường đi nào!</string>
-    <string name="premium_guild_subscription_notice">Tăng Cường Máy Chủ Nitro đây rồi! Kêu gọi cộng đồng của bạn tăng cường máy chủ của mình đi chứ!</string>
     <string name="premium_guild_subscription_notice_button">Xem Cấp Bậc &amp; Đặc Quyền</string>
-    <string name="premium_guild_subscription_notice_small_guild">Tăng Cường Máy Chủ Nitro đây rồi! Kêu gọi bạn bè tăng cường máy chủ của mình đi chứ!</string>
     <string name="premium_guild_subscription_remove_button">Gỡ Tăng Cường</string>
     <string name="premium_guild_subscription_remove_error_mobile">Có lỗi xảy ra trong quá trình thu hồi tăng cường. Vui lòng thử lại.</string>
     <string name="premium_guild_subscription_select_server_button">Chọn một Máy Chủ</string>
-    <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Hãy dùng sức mạnh Nitro để tăng cường một máy chủ mà bạn đã tham gia! Việc tăng cường cho phép máy chủ đó phát triển thanh cấp bậc. Mỗi bậc giúp mang lại các đặc quyền có chọn lọc cho toàn bộ máy chủ.
- Thời gian hồi cho một lần tăng cường máy chủ là 7 ngày. Bạn sẽ không thể tăng cường máy chủ nào khác cho đến khi thời gian hồi hết, ngay cả trong trường hợp bạn thu hồi lại tăng cường. [Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">Hãy dùng sức mạnh Nitro để tăng cường một máy chủ mà bạn đã tham gia! Việc tăng cường cho phép máy chủ đó phát triển thanh cấp bậc. Mỗi bậc giúp mang lại các đặc quyền có chọn lọc cho toàn bộ máy chủ.</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Thời gian hồi cho một lần tăng cường máy chủ là 7 ngày. Bạn sẽ không thể tăng cường máy chủ nào khác cho đến khi thời gian hồi hết, ngay cả trong trường hợp bạn thu hồi lại tăng cường. [Tìm hiểu thêm về Nâng Cấp Máy Chủ Nitro.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Tăng Cường Máy Chủ Nitro</string>
-    <string name="premium_guild_subscription_tooltip">Đã dùng tăng cường Nitro từ %1$s</string>
+    <string name="premium_guild_tier_0">Không Có Cấp</string>
     <string name="premium_guild_tier_1">Cấp 1</string>
     <string name="premium_guild_tier_2">Cấp 2</string>
     <string name="premium_guild_tier_3">Cấp 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Bạn có chắc là muốn gỡ bỏ Tăng Cường Nitro từ:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Đồng ý, Gỡ Bỏ Tăng Cường</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">Máy chủ này sẽ mất tiến độ nếu bạn gỡ bỏ tăng cường.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">Máy chủ này sẽ mất tiến độ nếu bạn gỡ bỏ tăng cường. **Tăng Cường của bạn vẫn đang trong thời gian hồi. Nó sẽ có lại sau %1$s và %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">Máy chủ này sẽ mất tiến độ nếu bạn gỡ bỏ tăng cường. **Tăng Cường của bạn vẫn đang trong thời gian hồi. Nó sẽ có lại sau %1$s và %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">Máy chủ này sẽ mất tiến độ nếu bạn gỡ bỏ tăng cường. **Tăng Cường của bạn vẫn đang trong thời gian chờ. Nó sẽ có lại sau %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Gỡ Bỏ Tăng Cường Nitro?</string>
     <string name="premium_included">Được bao gồm trong Nitro:</string>
     <string name="premium_info_monthly">%1$s (hàng tháng) diễn ra vào %2$s.</string>
     <string name="premium_month_subscription">**%1$s%2$s %3$s** / Tháng</string>
@@ -3461,7 +3409,6 @@ Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</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_button_iap">Nhận %1$s</string>
     <string name="premium_payment_confirmation_button_regular">K, Nghe hay phết</string>
-    <string name="premium_payment_gift_blurb">Hãy tặng [Nitro](onClick) cho bạn bè để họ nhận được những đặc quyền trò chuyện siêu hạng và một lần Nâng Cấp Máy Chủ.</string>
     <string name="premium_payment_gift_blurb_mobile">Tặng ai đó Nitro để họ nhận được những đặc quyền trò chuyện siêu ngầu và khả năng Nâng Cấp Máy Chủ. [Tìm hiểu thêm về Nitro.](onClick)</string>
     <string name="premium_payment_gift_subtext">Đây sẽ là dạng thanh toán một lần tùy theo số lượng mà bạn chọn. Chúng tôi sẽ không thu tiền theo tháng.</string>
     <string name="premium_payment_is_gift">Bạn đang mua một món quà.</string>
@@ -3476,7 +3423,6 @@ Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</string>
     <string name="premium_plan_month_tier_1">Nitro Classic Hàng Tháng</string>
     <string name="premium_plan_month_tier_2">Nitro hàng tháng</string>
     <string name="premium_promo_autocomplete">Sử dụng emoji tùy chọn tại bất cứ đâu</string>
-    <string name="premium_promo_description">Nâng cấp lên Discord Nitro để sử dụng các emoji hoạt hình và tùy chỉnh cho bất kỳ máy chủ nào.</string>
     <string name="premium_promo_title">Bạn muốn nâng cấp tính năng cho các emoji không?</string>
     <string name="premium_required">Yêu cầu phải có Nitro</string>
     <string name="premium_required_get_nitro">Lấy Nitro!</string>
@@ -3495,26 +3441,10 @@ Bạn có thể đăng ký lại thuê bao vào bất kỳ lúc nào."</string>
     <string name="premium_tier_2_title">Trải nghiệm Discord nâng cao với gói cước rẻ hàng tháng.</string>
     <string name="premium_trial_button">Bắt Đầu Dùng Thử Miễn Phí</string>
     <string name="premium_upgrade_cancel">Không</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year">"Nâng cấp lên gói hàng năm và nhận hai tháng sử dụng miễn phí. Thật là một đề nghị hấp dẫn!!!
-
-Chúng tôi sẽ phân bổ kế hoạch hiện tại của bạn và khấu trừ từ mức giá hàng năm. Bạn sẽ phải trả **%1$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"Nâng cấp lên gói hàng năm và nhận hai tháng sử dụng miễn phí. Thật là một đề nghị hấp dẫn!!!
-
-Chúng tôi sẽ chia tỷ lệ gói hiện tại và khấu trừ theo mức giá hàng năm. Bạn sẽ phải trả **%1$s** ngay lúc này, và **%2$s/năm sau thời hạn thanh toán hiện tại.**"</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Nâng cấp gói cước %1$s (hàng tháng) và nhận khả năng tăng cường máy chủ. Gói cước mới của bạn sẽ có hiệu lực ngay tức thì.
-
- Chúng tôi sẽ chia tỷ lệ gói hiện tại và khấu trừ theo mức giá hàng năm. Bạn sẽ phải trả **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Nâng cấp gói cước %1$s (hàng tháng) và nhận khả năng tăng cường máy chủ. Gói cước mới của bạn sẽ có hiệu lực ngay tức thì.
-
- Chúng tôi sẽ chia tỷ lệ gói hiện tại và khấu trừ theo mức giá hàng năm. Bạn sẽ phải trả **%2$s** ngay lúc này, và **%3$s/tháng sau thời hạn thanh toán hiện tại.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Nâng cấp gói cước %1$s (hàng tháng) và nhận khả năng tăng cường máy chủ. Gói cước mới của bạn sẽ có hiệu lực ngay tức thì.
 
 Chúng tôi sẽ chia tỷ lệ gói hiện tại và khấu trừ theo mức giá hàng năm. Bạn sẽ phải trả **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Nâng cấp gói cước %1$s (hàng tháng) và nhận khả năng tăng cường máy chủ. Gói cước mới của bạn sẽ có hiệu lực ngay tức thì.
-
-Chúng tôi sẽ chia tỷ lệ gói hiện tại và khấu trừ theo mức giá hàng năm. Bạn sẽ phải trả **%2$s** ngay lúc này, và **%3$s/năm sau thời hạn thanh toán hiện tại.**"</string>
     <string name="premium_upgrade_confirm_button">Nâng cấp</string>
-    <string name="premium_upgrade_confirm_button_with_price">Nâng cấp ngay - %1$s</string>
     <string name="premium_upgrade_confirm_title">Nâng cấp lên %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">Bạn không thể đăng ký khi đã đang dùng Nitro rồi.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Kế hoạch hiện tại của bạn.</string>
@@ -4066,8 +3996,6 @@ Bạn có chắc muốn thực hiện không?"</string>
     <string name="stop_streaming">Ngừng Stream</string>
     <string name="stop_watching">Ngừng Xem</string>
     <string name="store_channel">Kênh Cửa Hàng</string>
-    <string name="store_payment_legalese_monthly">Này! Khi mua %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à dịch vụ đăng ký định kỳ, có nghĩa là chúng tôi sẽ tính phí ngay hôm nay và đều đặn hàng tháng cho đến khi bạn hủy thuê bao. Bạn có thể hủy đăng ký bất cứ lúc nào trong màn hình Cài Đặt Người Dùng.</string>
-    <string name="store_payment_legalese_yearly">Này! Khi mua %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à dịch vụ đăng ký định kỳ, có nghĩa là chúng tôi sẽ tính phí hôm nay và đều đặn hàng năm cho đến khi bạn hủy thuê bao. Bạn có thể hủy thuê bao bất cứ lúc nào trong màn hình Cài Đặt Người Dùng.</string>
     <string name="stream">Chơi Trực Tiếp</string>
     <string name="stream_bad_spectator">Chất lượng video hoặc âm thanh kênh stream mà bạn đang xem đã bị giảm. Có thể do tình trạng mạng.</string>
     <string name="stream_bad_streamer">Chất lượng video hoặc âm thanh kênh stream hiện tại của bạn đã bị giảm. Có thể do tình trạng mạng.</string>
diff --git a/com.discord/res/values-zh-rCN/plurals.xml b/com.discord/res/values-zh-rCN/plurals.xml
index e0469c91e2..3672b9f5d9 100644
--- a/com.discord/res/values-zh-rCN/plurals.xml
+++ b/com.discord/res/values-zh-rCN/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d 年</item>
         <item quantity="one">%d 年</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d 个月</item>
-        <item quantity="one">%d 个月</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d 年</item>
-        <item quantity="one">%d 年</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">个月</item>
         <item quantity="one">个月</item>
@@ -466,16 +458,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d 个共同服务器</item>
-        <item quantity="zero">0 个共同服务器</item>
-        <item quantity="one">1 个共同服务器</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d 天</item>
         <item quantity="one">1天</item>
@@ -549,10 +531,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d 个助力</item>
         <item quantity="one">%d 个助力</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d 个助力</item>
         <item quantity="one">%d 个助力</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d 天</item>
-        <item quantity="one">%d 天</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d 个服务器助力</item>
         <item quantity="one">%d 个服务器助力</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d 个月</item>
         <item quantity="one">%d 个月</item>
     </plurals>
@@ -597,10 +571,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d 天</item>
         <item quantity="one">%d 天</item>
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index 4404f96025..985ad20a5a 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -641,7 +641,6 @@
     <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>
@@ -699,8 +698,6 @@
     <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_source_invalid">该付款来源无效。</string>
     <string name="billing_payment_sources">付款方式</string>
     <string name="billing_payment_table_header_amount">金额</string>
@@ -718,13 +715,11 @@
     <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>
@@ -746,6 +741,10 @@
     <string name="billing_step_review">审阅</string>
     <string name="billing_step_select_plan">选择方案</string>
     <string name="billing_subscribe">订阅</string>
+    <string name="billing_switch_plan_change">更改方案</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">收到！</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">太棒了！</string>
+    <string name="billing_switch_plan_upgrade">升级</string>
     <string name="billing_tag_failed">失败</string>
     <string name="billing_tag_pending">待定</string>
     <string name="billing_tag_refunded">已退款</string>
@@ -1798,11 +1797,8 @@
     <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_nitro_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_success_premium_tier_2_monthly">感谢另一位慷慨的人类，您现在可以享用增强聊天特权和一份服务器助力啦。有效期持续 %1$s。</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2156,9 +2152,7 @@
     <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>
@@ -2175,16 +2169,12 @@
     <string name="guild_settings_overview_boost_unlocked">等级 %1$s 特权已解锁</string>
     <string name="guild_settings_overview_notice">注意！您尚未保存更改！</string>
     <string name="guild_settings_overview_tier_info">这是等级 %1$s Nitro 功能。[查看您的等级状态](%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_title">服务器助力状态</string>
     <string name="guild_settings_premium_guild_unlocked">已解锁</string>
+    <string name="guild_settings_premium_upsell_learn_more">了解 Discord Nitro 详情</string>
     <string name="guild_settings_server_banner">服务器横幅</string>
     <string name="guild_settings_server_invite_background">服务器邀请背景</string>
     <string name="guild_settings_splash_info">用户收到服务器邀请时就会看到此图片。</string>
@@ -2194,6 +2184,7 @@
 
 如果您拥有网站的用户权限的话，您还可以添加 &amp;username= 至查询字符串中。"</string>
     <string name="guild_settings_widget_enable_widget">开启服务器小工具</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">购买细节</string>
     <string name="guild_verification_text_account_age">您的账号需要已注册至少 %1$s 分钟才能在此服务器发送信息。</string>
     <string name="guild_verification_text_member_age">您必须在加入此服务器后至少等待 %1$s 分钟后才可以发送消息。</string>
     <string name="guild_verification_text_not_claimed">您必须申明并验证您的账号之后才可以在此服务器中发送消息。</string>
@@ -2544,10 +2535,6 @@
     <string name="ios_media_keyboard_take_a_photo">拍摄照片</string>
     <string name="ios_notification_see_full">点击查看完整消息。</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="ios_view_all">查看所有</string>
     <string name="ip_address_secured">IP地址保护</string>
@@ -2864,7 +2851,6 @@
     <string name="network_error_unknown">发生了未知的网络错误。</string>
     <string name="network_error_unknown_host">发生了网络错误。请检查您的 DNS 设置并再次尝试连接。</string>
     <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>
@@ -2988,7 +2974,6 @@
     <string name="notice_no_input_detected_help_link_text">求帮助！</string>
     <string name="notice_no_input_detected_settings">嗯，看起来Discord无法检测到您的麦克风，让我们解决这个问题吧！</string>
     <string name="notice_no_input_detected_settings_link_text">访问设置</string>
-    <string name="notice_premium_grandfathered_ended">您的Nitro访问权限已过期。升级Nitro Classic为 Nitro，获得超能聊天特权和一份服务器助力。</string>
     <string name="notice_premium_grandfathered_ending">您的Nitro时间仅剩 %1$s了！您的订阅将于**%2$s**降级至Nitro Classic。</string>
     <string name="notice_premium_promo_action">查看</string>
     <string name="notice_premium_promo_message">支持 Discord 的发展并从中得到快乐！</string>
@@ -3222,7 +3207,7 @@
     <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_button_premium_gift">购买礼物</string>
     <string name="payment_modal_one_month">1 个月</string>
     <string name="payment_modal_one_year">1 年</string>
     <string name="payment_modal_per_month">每月</string>
@@ -3335,9 +3320,6 @@
 您可以随时重新订阅。"</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_1">取消将会在当前付费周期结束时即 **%1$s** 时生效。如果已经更改，Discord 标签将会被随机化。</string>
     <string name="premium_cancel_confirm_body_tier_1_mobile_part_2">您可以随时重启订阅。</string>
-    <string name="premium_cancel_confirm_body_tier_2">"取消将会在当前付费周期结束时生效。您将于**%1$s**失去Nitro访问权。如果已经更改，您的Discord标签将会被打乱，服务器助力也会被移除。
-
-您可以随时重新订阅。"</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">取消将会在当前付费周期结束时生效。您将于**%1$s**失去Nitro访问权。如果已经更改，您的Discord标签将会被打乱，服务器助力也会被移除。</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">您可以随时重启订阅。</string>
     <string name="premium_cancel_confirm_mobile">取消订阅 Nitro</string>
@@ -3360,7 +3342,6 @@
     <string name="premium_chat_perks_description_streaming">使用 Nitro 进行源直播，或用 Nitro Classic 进行最高 1080p 60fps 的超悦目直播。</string>
     <string name="premium_chat_perks_description_upload_limit">订阅Nitro，上传文件尺寸可从%1$s升级至%2$s，订阅Nitro Classic可升级至%3$s。</string>
     <string name="premium_chat_perks_premium_guild_subscription">为您最爱的服务器助力！</string>
-    <string name="premium_chat_perks_simple_title">简单生活 - 不要服务器助力，只要基础聊天特权。</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>
@@ -3399,41 +3380,20 @@
     <string name="premium_grandfathered_yearly">作为对您一直支持Discord的感谢，您可以在两年的时间里访问Nitro。您的访问截止日期为 **%1$s**。</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">解锁自定义选项，例如邀请背景图片、服务器横幅和个性化网址等。</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_description">在您的服务器中获得Nitro服务器助力者专属的特殊服务器角色。</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_description">助力者可获得一个崭新的闪亮个人资料徽章，徽章会随着助力者的持续助力情况变化。</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 助力！[了解 Nitro 服务器助力的详情。](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">升级订阅方案，向服务器发送 Nitro 助力！[了解 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>
@@ -3446,44 +3406,32 @@
     <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_duration_mobile">%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_0">无等级</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_month_subscription">**%1$s%2$s %3$s**/ 月</string>
@@ -3496,7 +3444,6 @@
     <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">给您的好友赠送[Nitro](onClick)，让他们拥有超能聊天特权和服务器助力。</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>
@@ -3511,7 +3458,6 @@
     <string name="premium_plan_month_tier_1">Nitro Classic 包月</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">获得 Nitro！</string>
@@ -3530,26 +3476,10 @@
     <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_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>
@@ -4110,8 +4040,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**.
     <string name="stop_streaming">停止直播</string>
     <string name="stop_watching">停止观看</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>
diff --git a/com.discord/res/values-zh-rTW/plurals.xml b/com.discord/res/values-zh-rTW/plurals.xml
index 8706f2b94e..97d67a79a0 100644
--- a/com.discord/res/values-zh-rTW/plurals.xml
+++ b/com.discord/res/values-zh-rTW/plurals.xml
@@ -302,14 +302,6 @@
         <item quantity="other">%d 年</item>
         <item quantity="one">%d 年</item>
     </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount">
-        <item quantity="other">%d 個月</item>
-        <item quantity="one">%d 個月</item>
-    </plurals>
-    <plurals name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount">
-        <item quantity="other">%d 年</item>
-        <item quantity="one">%d 年</item>
-    </plurals>
     <plurals name="gift_confirmation_nitro_time_frame_months_time">
         <item quantity="other">%d 個月</item>
         <item quantity="one">%d 個月</item>
@@ -466,16 +458,6 @@
         <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>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d 個伺服器</item>
-        <item quantity="zero">0 個伺服器</item>
-        <item quantity="one">1 個伺服器</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d 天</item>
         <item quantity="one">1 天</item>
@@ -549,10 +531,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
         <item quantity="other">%d 次加成</item>
         <item quantity="one">%d 次加成</item>
@@ -565,15 +543,11 @@
         <item quantity="other">%d 次加成</item>
         <item quantity="one">%d 次加成</item>
     </plurals>
-    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
-        <item quantity="other">%d 天</item>
-        <item quantity="one">%d 天</item>
-    </plurals>
     <plurals name="premium_guild_subscription_available_count_num">
         <item quantity="other">%d 次伺服器加成</item>
         <item quantity="one">%d 次伺服器加成</item>
     </plurals>
-    <plurals name="premium_guild_subscription_duration_months">
+    <plurals name="premium_guild_subscription_duration_mobile_months">
         <item quantity="other">%d 個月</item>
         <item quantity="one">%d 個月</item>
     </plurals>
@@ -597,10 +571,6 @@
         <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>
-    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d 天</item>
         <item quantity="one">%d 天</item>
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index f453a6e9da..346f390844 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -639,7 +639,6 @@
     <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>
@@ -698,8 +697,6 @@
     <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_source_invalid">這個付款方式無效。</string>
     <string name="billing_payment_sources">付款方式</string>
     <string name="billing_payment_table_header_amount">金額</string>
@@ -717,13 +714,11 @@
     <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>
@@ -745,6 +740,10 @@
     <string name="billing_step_review">檢查</string>
     <string name="billing_step_select_plan">選擇方案</string>
     <string name="billing_subscribe">訂閱</string>
+    <string name="billing_switch_plan_change">變更方案</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">知道了！</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">太棒了！</string>
+    <string name="billing_switch_plan_upgrade">升級</string>
     <string name="billing_tag_failed">失敗</string>
     <string name="billing_tag_pending">等待中</string>
     <string name="billing_tag_refunded">已退款</string>
@@ -1800,11 +1799,8 @@
     <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_nitro_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_success_premium_tier_2_monthly">多虧某位慷慨人士，您現在可以使用增強的聊天福利和伺服器加成 %1$s了。</string>
-    <string name="gift_confirmation_body_success_premium_tier_2_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>
@@ -2159,9 +2155,7 @@
     <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>
@@ -2178,16 +2172,12 @@
     <string name="guild_settings_overview_boost_unlocked">層級 %1$s 的福利已解鎖</string>
     <string name="guild_settings_overview_notice">小心！您有變更尚未儲存！</string>
     <string name="guild_settings_overview_tier_info">這是層級 %1$s 的 Nitro 功能。[確認您的層級狀態](%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_title">伺服器加成狀態</string>
     <string name="guild_settings_premium_guild_unlocked">已解鎖</string>
+    <string name="guild_settings_premium_upsell_learn_more">進一步了解 Discord Nitro</string>
     <string name="guild_settings_server_banner">伺服器橫幅</string>
     <string name="guild_settings_server_invite_background">伺服器邀請背景</string>
     <string name="guild_settings_splash_info">使用者收到加入伺服器的邀請時，將顯示此圖片。</string>
@@ -2197,6 +2187,7 @@
 
 如果您擁有存取個人網站的權限，您便可以變動增加 &amp;username= 到查詢字串中。"</string>
     <string name="guild_settings_widget_enable_widget">啟用伺服器小工具</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">購物資訊</string>
     <string name="guild_verification_text_account_age">您的帳號必須是至少在 %1$s 分鐘之久才能於此伺服器傳送訊息。</string>
     <string name="guild_verification_text_member_age">您必須成為成員至少 %1$s 分鐘之久才能於此伺服器傳送訊息。</string>
     <string name="guild_verification_text_not_claimed">您必須認領並驗證您的帳號然後才能在此伺服器傳送訊息。</string>
@@ -2545,10 +2536,6 @@
     <string name="ios_media_keyboard_take_a_photo">拍照</string>
     <string name="ios_notification_see_full">點選即可查看完整訊息。</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="ios_view_all">檢視全部</string>
     <string name="ip_address_secured">固定 IP 位址</string>
@@ -2866,7 +2853,6 @@
     <string name="network_error_unknown">發生了未知的網路錯誤。</string>
     <string name="network_error_unknown_host">發生了網路錯誤。 請檢查您的 DNS 設定，然後再試一次。</string>
     <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>
@@ -2990,7 +2976,6 @@
     <string name="notice_no_input_detected_help_link_text">說明！</string>
     <string name="notice_no_input_detected_settings">好的，Discord 未從您的麥克風偵測到訊號輸入。一起來修復這問題吧！</string>
     <string name="notice_no_input_detected_settings_link_text">前往設定</string>
-    <string name="notice_premium_grandfathered_ended">您的 Nitro 存取權限已到期。從 Nitro Classic 升級成 Nitro，取得超級聊天福利和伺服器加成吧。</string>
     <string name="notice_premium_grandfathered_ending">你只剩下 %1$s 可以使用 Nitro！你的訂閱將於 **%2$s** 降級至 Nitro Classic。</string>
     <string name="notice_premium_promo_action">快去看看</string>
     <string name="notice_premium_promo_message">支援 Discord 的發展，可獲有趣福利！</string>
@@ -3224,7 +3209,7 @@
     <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_button_premium_gift">購買禮物</string>
     <string name="payment_modal_one_month">1 個月</string>
     <string name="payment_modal_one_year">1 年</string>
     <string name="payment_modal_per_month">每個月</string>
@@ -3334,9 +3319,6 @@
 您可於任何時候重啟您的訂閱。"</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">"取消將於您當前的付款期間結束時生效。您會在 **%1$s** 失去對 Nitro 的存取權限，更改過的 Discord Tag 將由亂數取代，且您的伺服器加成也會移除。
-
-您隨時都能重啟訂閱。"</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_1">取消將於您當前的付款期間結束時生效。您會在 **%1$s** 失去對 Nitro 的存取權限，更改過的 Discord Tag 將由亂數取代，且您的伺服器加成也會移除。</string>
     <string name="premium_cancel_confirm_body_tier_2_mobile_part_2">您可於任何時候重啟您的訂閱。</string>
     <string name="premium_cancel_confirm_mobile">取消 Nitro</string>
@@ -3359,7 +3341,6 @@
     <string name="premium_chat_perks_description_streaming">使用 Nitro 以原畫質進行直播，或透過 Nitro Classic 傳輸高達 1080p 60fps 的畫質。</string>
     <string name="premium_chat_perks_description_upload_limit">只要擁有 Nitro，上傳的檔案大小就能從 %1$s 增加到 %2$s，擁有 Nitro Classic 則可增加為 %3$s。</string>
     <string name="premium_chat_perks_premium_guild_subscription">加成您最愛的伺服器！</string>
-    <string name="premium_chat_perks_simple_title">簡單就好 - 擁有基本的聊天福利，不含伺服器加成。</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>
@@ -3398,41 +3379,20 @@
     <string name="premium_grandfathered_yearly">為了感謝您對 Discord 的支持，您可在兩年的期間內存取 Nitro。存取權限將於 **%1$s** 結束。</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">解鎖自訂功能，例如邀請背景、伺服器橫幅、個性化網址等等。</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_description">獲得特殊的伺服器身分組，僅限您伺服器中的 Nitro 伺服器加成者。</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_description">加成者可以獲得閃亮的全新個人檔案徽章，徽章會隨著他們的紀錄而改變。</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 加成！[進一步了解 Discord 伺服器加成。](%1$s)</string>
-    <string name="premium_guild_features_upsell_banner_upgrade">升級您的訂閱，就能為伺服器傳送 Nitro 加成！[進一步了解 Discord 伺服器加成。](%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>
@@ -3445,44 +3405,32 @@
     <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_duration_mobile">%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">自 %1$s 開始 Nitro 加成</string>
+    <string name="premium_guild_tier_0">沒有等級</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_month_subscription">**%1$s%2$s %3$s** / 月</string>
@@ -3495,7 +3443,6 @@
     <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">將 [Nitro](onClick) 作為禮物送給您的朋友，讓他們可以獲得超級聊天福利和伺服器加成。</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>
@@ -3510,7 +3457,6 @@
     <string name="premium_plan_month_tier_1">每月訂閱 Nitro Classic</string>
     <string name="premium_plan_month_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>
     <string name="premium_required_get_nitro">取得 Nitro！</string>
@@ -3529,26 +3475,10 @@
     <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_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>
@@ -4111,8 +4041,6 @@
     <string name="stop_streaming">停止直播</string>
     <string name="stop_watching">停止觀看</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>
diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml
index bf65583563..653ca85857 100644
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@@ -895,6 +895,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" />
diff --git a/com.discord/res/values/colors.xml b/com.discord/res/values/colors.xml
index c27f427862..43d940bd01 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>
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 0f3c8d1f21..e03e3b5dc1 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -116,6 +116,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" />
@@ -211,7 +212,6 @@
     <item type="id" name="boost_confirmation_level_info" />
     <item type="id" name="boost_confirmation_lottie" />
     <item type="id" name="boost_confirmation_select" />
-    <item type="id" name="boost_confirmation_warning" />
     <item type="id" name="boost_info_container" />
     <item type="id" name="boost_info_text" />
     <item type="id" name="boost_remove_confirmation_avatar" />
@@ -512,6 +512,9 @@
     <item type="id" name="color_picker_done" />
     <item type="id" name="color_picker_gridview" />
     <item type="id" name="color_picker_reset" />
+    <item type="id" name="connected_account_actions_dialog_copy_username" />
+    <item type="id" name="connected_account_actions_dialog_header" />
+    <item type="id" name="connected_account_actions_dialog_open_in_browser" />
     <item type="id" name="connected_account_disconnect" />
     <item type="id" name="connected_account_display_activity_switch" />
     <item type="id" name="connected_account_display_switch" />
@@ -674,6 +677,7 @@
     <item type="id" name="error_divider" />
     <item type="id" name="expand_activities_button" />
     <item type="id" name="expanded_menu" />
+    <item type="id" name="external_share_activity_action_preview" />
     <item type="id" name="external_share_comment" />
     <item type="id" name="external_share_list" />
     <item type="id" name="external_share_search" />
@@ -746,6 +750,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" />
@@ -1069,6 +1077,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" />
@@ -1162,6 +1172,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" />
@@ -1293,6 +1304,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" />
@@ -1705,6 +1726,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" />
@@ -1725,6 +1752,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" />
@@ -1830,7 +1866,9 @@
     <item type="id" name="user_mentions_filter_this_server" />
     <item type="id" name="user_mentions_list" />
     <item type="id" name="user_mutual_friends_recycler_view" />
+    <item type="id" name="user_mutual_friends_toolbar_layout" />
     <item type="id" name="user_mutual_guilds_recycler_view" />
+    <item type="id" name="user_mutual_guilds_toolbar_layout" />
     <item type="id" name="user_phone_add_anchor" />
     <item type="id" name="user_phone_add_country_code" />
     <item type="id" name="user_phone_add_next" />
@@ -1859,6 +1897,9 @@
     <item type="id" name="user_profile_admin_server_move" />
     <item type="id" name="user_profile_admin_server_mute" />
     <item type="id" name="user_profile_avatar_presence" />
+    <item type="id" name="user_profile_connections_mutual_friends_item" />
+    <item type="id" name="user_profile_connections_mutual_guilds_item" />
+    <item type="id" name="user_profile_connections_view_recycler" />
     <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" />
@@ -1883,6 +1924,9 @@
     <item type="id" name="user_sheet_audio_settings_divider" />
     <item type="id" name="user_sheet_badge_image" />
     <item type="id" name="user_sheet_call_action_button" />
+    <item type="id" name="user_sheet_connections_divider" />
+    <item type="id" name="user_sheet_connections_header" />
+    <item type="id" name="user_sheet_connections_view" />
     <item type="id" name="user_sheet_copy_id" />
     <item type="id" name="user_sheet_developer_divider" />
     <item type="id" name="user_sheet_developer_header" />
@@ -1898,6 +1942,9 @@
     <item type="id" name="user_sheet_message_action_button" />
     <item type="id" name="user_sheet_more_button" />
     <item type="id" name="user_sheet_muted" />
+    <item type="id" name="user_sheet_note_divider" />
+    <item type="id" name="user_sheet_note_header" />
+    <item type="id" name="user_sheet_note_text_field" />
     <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" />
@@ -1966,6 +2013,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" />
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 6d5c479f16..f916af0ea7 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -88,6 +88,10 @@
         <item quantity="other">%d people</item>
         <item quantity="one">1 person</item>
     </plurals>
+    <plurals name="attach_payment_source_optional_with_entitlements_warning_months">
+        <item quantity="other">%d months</item>
+        <item quantity="one">%d month</item>
+    </plurals>
     <plurals name="bans_header_bans">
         <item quantity="other">%d Bans</item>
         <item quantity="zero">No Bans</item>
@@ -455,6 +459,10 @@
         <item quantity="other">%d Boosts</item>
         <item quantity="one">%d Boost</item>
     </plurals>
+    <plurals name="guild_subscription_purchase_modal_activated_description_with_boost_count_guildSubscriptionQuantity">
+        <item quantity="other">%d times</item>
+        <item quantity="one">%d time</item>
+    </plurals>
     <plurals name="instant_invite_guild_members_total_count">
         <item quantity="other">%d Members</item>
         <item quantity="one">1 Member</item>
@@ -491,16 +499,6 @@
         <item quantity="other">%d uses</item>
         <item quantity="one">%d use</item>
     </plurals>
-    <plurals name="ios_profile_mutual_friends_count">
-        <item quantity="other">%d Mutual Friends</item>
-        <item quantity="zero">0 Mutual Friends</item>
-        <item quantity="one">1 Mutual Friend</item>
-    </plurals>
-    <plurals name="ios_profile_mutual_guilds_count">
-        <item quantity="other">%d Mutual Servers</item>
-        <item quantity="zero">0 Mutual Servers</item>
-        <item quantity="one">1 Mutual Server</item>
-    </plurals>
     <plurals name="last_seen_days">
         <item quantity="other">%d days</item>
         <item quantity="one">1 day</item>
@@ -585,12 +583,25 @@
         <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_chat_perks_description_premium_guild_numFreeGuildSubscriptions">
+        <item quantity="other">%d boosts</item>
+        <item quantity="one">%d boost</item>
+    </plurals>
     <plurals name="premium_code_redemption_confirmation_blurb_numMonths">
         <item quantity="other">%d months</item>
         <item quantity="one">1 month</item>
     </plurals>
-    <plurals name="premium_guild_perks_modal_header_boost_count_subscriptions">
+    <plurals name="premium_guild_num_guild_subscriptions_num">
+        <item quantity="other">Server Boosts</item>
+        <item quantity="one">Server Boost</item>
+    </plurals>
+    <plurals name="premium_guild_perks_modal_button_subscribe_status_numSubscriptions">
+        <item quantity="other">%d times</item>
+        <item quantity="one">%d time</item>
+    </plurals>
+    <plurals name="premium_guild_perks_modal_header_subscription_count_subscriptions">
         <item quantity="other">%d Boosts</item>
+        <item quantity="zero">No Boosts</item>
         <item quantity="one">%d Boost</item>
     </plurals>
     <plurals name="premium_guild_settings_members_subscribed_needed_number">
@@ -613,6 +624,22 @@
         <item quantity="other">%d Server Boosts</item>
         <item quantity="one">%d Server Boost</item>
     </plurals>
+    <plurals name="premium_guild_subscription_available_numSubscriptions">
+        <item quantity="other">%d Boosts</item>
+        <item quantity="one">%d Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_cancel_invoice_subscription_cancelled_subscriptionCount">
+        <item quantity="other">Server Boosts</item>
+        <item quantity="one">Server Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_cancel_invoice_subscriptions_subscriptionCount">
+        <item quantity="other">Server Boosts</item>
+        <item quantity="one">Server Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_duration_mobile_months">
+        <item quantity="other">%d Months</item>
+        <item quantity="one">%d Month</item>
+    </plurals>
     <plurals name="premium_guild_subscription_duration_months">
         <item quantity="other">%d Months</item>
         <item quantity="one">%d Month</item>
@@ -637,9 +664,17 @@
         <item quantity="other">%d minutes</item>
         <item quantity="one">%d minute</item>
     </plurals>
+    <plurals name="premium_guild_subscription_guild_subsription_subtitle_numSubscriptions">
+        <item quantity="other">%d times</item>
+        <item quantity="one">%d time</item>
+    </plurals>
     <plurals name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount">
-        <item quantity="other">**%d** boosts</item>
-        <item quantity="one">**%d** boost</item>
+        <item quantity="other">%d Boosts</item>
+        <item quantity="one">%d Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscriptions_renewal_info_quantity">
+        <item quantity="other">Server Boosts</item>
+        <item quantity="one">Server Boost</item>
     </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days">
         <item quantity="other">%d days</item>
@@ -753,12 +788,22 @@
         <item quantity="other">minutes</item>
         <item quantity="one">minute</item>
     </plurals>
+    <plurals name="user_profile_mutual_friends_count">
+        <item quantity="other">%d Mutual Friends</item>
+        <item quantity="zero">0 Mutual Friends</item>
+        <item quantity="one">1 Mutual Friend</item>
+    </plurals>
+    <plurals name="user_profile_mutual_guilds_count">
+        <item quantity="other">%d Mutual Servers</item>
+        <item quantity="zero">0 Mutual Servers</item>
+        <item quantity="one">1 Mutual Server</item>
+    </plurals>
     <plurals name="voice_call_member_list_title_count">
         <item quantity="other">%d People</item>
         <item quantity="one">%d Person</item>
     </plurals>
-    <item type="plurals" name="APKTOOL_DUMMY_70">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_72">false</item>
     <item type="plurals" name="APKTOOL_DUMMY_85">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_b0">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_b1">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_b9">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_ba">false</item>
 </resources>
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 9b8f350e96..7c7f58c309 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -671,427 +671,428 @@
     <public type="attr" name="layout_scrollFlags" id="0x7f040252" />
     <public type="attr" name="layout_scrollInterpolator" id="0x7f040253" />
     <public type="attr" name="layout_wrapBefore" id="0x7f040254" />
-    <public type="attr" name="lb_progress_color" id="0x7f040255" />
-    <public type="attr" name="lb_text" id="0x7f040256" />
-    <public type="attr" name="lb_text_color" id="0x7f040257" />
-    <public type="attr" name="liftOnScroll" id="0x7f040258" />
-    <public type="attr" name="lineHeight" id="0x7f040259" />
-    <public type="attr" name="lineSpacing" id="0x7f04025a" />
-    <public type="attr" name="listChoiceBackgroundIndicator" id="0x7f04025b" />
-    <public type="attr" name="listDividerAlertDialog" id="0x7f04025c" />
-    <public type="attr" name="listItemLayout" id="0x7f04025d" />
-    <public type="attr" name="listLayout" id="0x7f04025e" />
-    <public type="attr" name="listMenuViewStyle" id="0x7f04025f" />
-    <public type="attr" name="listPopupWindowStyle" id="0x7f040260" />
-    <public type="attr" name="listPreferredItemHeight" id="0x7f040261" />
-    <public type="attr" name="listPreferredItemHeightLarge" id="0x7f040262" />
-    <public type="attr" name="listPreferredItemHeightSmall" id="0x7f040263" />
-    <public type="attr" name="listPreferredItemPaddingLeft" id="0x7f040264" />
-    <public type="attr" name="listPreferredItemPaddingRight" id="0x7f040265" />
-    <public type="attr" name="logo" id="0x7f040266" />
-    <public type="attr" name="logoDescription" id="0x7f040267" />
-    <public type="attr" name="lottie_autoPlay" id="0x7f040268" />
-    <public type="attr" name="lottie_colorFilter" id="0x7f040269" />
-    <public type="attr" name="lottie_enableMergePathsForKitKatAndAbove" id="0x7f04026a" />
-    <public type="attr" name="lottie_fileName" id="0x7f04026b" />
-    <public type="attr" name="lottie_imageAssetsFolder" id="0x7f04026c" />
-    <public type="attr" name="lottie_loop" id="0x7f04026d" />
-    <public type="attr" name="lottie_progress" id="0x7f04026e" />
-    <public type="attr" name="lottie_rawRes" id="0x7f04026f" />
-    <public type="attr" name="lottie_renderMode" id="0x7f040270" />
-    <public type="attr" name="lottie_repeatCount" id="0x7f040271" />
-    <public type="attr" name="lottie_repeatMode" id="0x7f040272" />
-    <public type="attr" name="lottie_scale" id="0x7f040273" />
-    <public type="attr" name="lottie_speed" id="0x7f040274" />
-    <public type="attr" name="lottie_url" id="0x7f040275" />
-    <public type="attr" name="manage_reactions_emoji_selection_indicator" id="0x7f040276" />
-    <public type="attr" name="materialButtonStyle" id="0x7f040277" />
-    <public type="attr" name="materialCardViewStyle" id="0x7f040278" />
-    <public type="attr" name="maxActionInlineWidth" id="0x7f040279" />
-    <public type="attr" name="maxButtonHeight" id="0x7f04027a" />
-    <public type="attr" name="maxImageSize" id="0x7f04027b" />
-    <public type="attr" name="max_height" id="0x7f04027c" />
-    <public type="attr" name="measureWithLargestChild" id="0x7f04027d" />
-    <public type="attr" name="menu" id="0x7f04027e" />
-    <public type="attr" name="multiChoiceItemLayout" id="0x7f04027f" />
-    <public type="attr" name="navigationContentDescription" id="0x7f040280" />
-    <public type="attr" name="navigationIcon" id="0x7f040281" />
-    <public type="attr" name="navigationMode" id="0x7f040282" />
-    <public type="attr" name="navigationViewStyle" id="0x7f040283" />
-    <public type="attr" name="notice_popup_bg" id="0x7f040284" />
-    <public type="attr" name="notice_theme_positive_red" id="0x7f040285" />
-    <public type="attr" name="numericModifiers" id="0x7f040286" />
-    <public type="attr" name="overlapAnchor" id="0x7f040287" />
-    <public type="attr" name="overlayImage" id="0x7f040288" />
-    <public type="attr" name="overlay_guild_mentions" id="0x7f040289" />
-    <public type="attr" name="overlay_guild_mentions_primary_630" id="0x7f04028a" />
-    <public type="attr" name="paddingBottomNoButtons" id="0x7f04028b" />
-    <public type="attr" name="paddingEnd" id="0x7f04028c" />
-    <public type="attr" name="paddingStart" id="0x7f04028d" />
-    <public type="attr" name="paddingTopNoTitle" id="0x7f04028e" />
-    <public type="attr" name="panelBackground" id="0x7f04028f" />
-    <public type="attr" name="panelMenuListTheme" id="0x7f040290" />
-    <public type="attr" name="panelMenuListWidth" id="0x7f040291" />
-    <public type="attr" name="passwordToggleContentDescription" id="0x7f040292" />
-    <public type="attr" name="passwordToggleDrawable" id="0x7f040293" />
-    <public type="attr" name="passwordToggleEnabled" id="0x7f040294" />
-    <public type="attr" name="passwordToggleTint" id="0x7f040295" />
-    <public type="attr" name="passwordToggleTintMode" id="0x7f040296" />
-    <public type="attr" name="placeholderImage" id="0x7f040297" />
-    <public type="attr" name="placeholderImageScaleType" id="0x7f040298" />
-    <public type="attr" name="popupMenuStyle" id="0x7f040299" />
-    <public type="attr" name="popupTheme" id="0x7f04029a" />
-    <public type="attr" name="popupWindowStyle" id="0x7f04029b" />
-    <public type="attr" name="preserveIconSpacing" id="0x7f04029c" />
-    <public type="attr" name="pressedStateOverlayImage" id="0x7f04029d" />
-    <public type="attr" name="pressedTranslationZ" id="0x7f04029e" />
-    <public type="attr" name="previewBackground" id="0x7f04029f" />
-    <public type="attr" name="primary_000" id="0x7f0402a0" />
-    <public type="attr" name="primary_100" id="0x7f0402a1" />
-    <public type="attr" name="primary_100_alpha_30" id="0x7f0402a2" />
-    <public type="attr" name="primary_100_alpha_60" id="0x7f0402a3" />
-    <public type="attr" name="primary_100_bg" id="0x7f0402a4" />
-    <public type="attr" name="primary_200" id="0x7f0402a5" />
-    <public type="attr" name="primary_200_bg" id="0x7f0402a6" />
-    <public type="attr" name="primary_300" id="0x7f0402a7" />
-    <public type="attr" name="primary_300_alpha_30" id="0x7f0402a8" />
-    <public type="attr" name="primary_300_bg" id="0x7f0402a9" />
-    <public type="attr" name="primary_400" id="0x7f0402aa" />
-    <public type="attr" name="primary_400_alpha_30" id="0x7f0402ab" />
-    <public type="attr" name="primary_400_bg" id="0x7f0402ac" />
-    <public type="attr" name="primary_500" id="0x7f0402ad" />
-    <public type="attr" name="primary_500_alpha_60" id="0x7f0402ae" />
-    <public type="attr" name="primary_500_bg" id="0x7f0402af" />
-    <public type="attr" name="primary_500_button_outline" id="0x7f0402b0" />
-    <public type="attr" name="primary_500_circle" id="0x7f0402b1" />
-    <public type="attr" name="primary_560" id="0x7f0402b2" />
-    <public type="attr" name="primary_600" id="0x7f0402b3" />
-    <public type="attr" name="primary_600_bg" id="0x7f0402b4" />
-    <public type="attr" name="primary_630" id="0x7f0402b5" />
-    <public type="attr" name="primary_630_bg" id="0x7f0402b6" />
-    <public type="attr" name="primary_630_bg_bottom_corners" id="0x7f0402b7" />
-    <public type="attr" name="primary_630_circle" id="0x7f0402b8" />
-    <public type="attr" name="primary_660" id="0x7f0402b9" />
-    <public type="attr" name="primary_660_bg_outline" id="0x7f0402ba" />
-    <public type="attr" name="primary_700" id="0x7f0402bb" />
-    <public type="attr" name="primary_700_alpha_60" id="0x7f0402bc" />
-    <public type="attr" name="primary_700_bg" id="0x7f0402bd" />
-    <public type="attr" name="primary_700_circle" id="0x7f0402be" />
-    <public type="attr" name="primary_700_top_corners" id="0x7f0402bf" />
-    <public type="attr" name="primary_800" id="0x7f0402c0" />
-    <public type="attr" name="primary_800_bg" id="0x7f0402c1" />
-    <public type="attr" name="primary_800_circle" id="0x7f0402c2" />
-    <public type="attr" name="primary_900" id="0x7f0402c3" />
-    <public type="attr" name="primary_900_bg" id="0x7f0402c4" />
-    <public type="attr" name="progressBarAutoRotateInterval" id="0x7f0402c5" />
-    <public type="attr" name="progressBarImage" id="0x7f0402c6" />
-    <public type="attr" name="progressBarImageScaleType" id="0x7f0402c7" />
-    <public type="attr" name="progressBarPadding" id="0x7f0402c8" />
-    <public type="attr" name="progressBarStyle" id="0x7f0402c9" />
-    <public type="attr" name="progress_gradient" id="0x7f0402ca" />
-    <public type="attr" name="ptrn_shapes" id="0x7f0402cb" />
-    <public type="attr" name="queryBackground" id="0x7f0402cc" />
-    <public type="attr" name="queryHint" id="0x7f0402cd" />
-    <public type="attr" name="radioButtonStyle" id="0x7f0402ce" />
-    <public type="attr" name="radio_btn_bg" id="0x7f0402cf" />
-    <public type="attr" name="radio_btn_text_color" id="0x7f0402d0" />
-    <public type="attr" name="ratingBarStyle" id="0x7f0402d1" />
-    <public type="attr" name="ratingBarStyleIndicator" id="0x7f0402d2" />
-    <public type="attr" name="ratingBarStyleSmall" id="0x7f0402d3" />
-    <public type="attr" name="retryImage" id="0x7f0402d4" />
-    <public type="attr" name="retryImageScaleType" id="0x7f0402d5" />
-    <public type="attr" name="reverseLayout" id="0x7f0402d6" />
-    <public type="attr" name="rippleColor" id="0x7f0402d7" />
-    <public type="attr" name="roundAsCircle" id="0x7f0402d8" />
-    <public type="attr" name="roundBottomEnd" id="0x7f0402d9" />
-    <public type="attr" name="roundBottomLeft" id="0x7f0402da" />
-    <public type="attr" name="roundBottomRight" id="0x7f0402db" />
-    <public type="attr" name="roundBottomStart" id="0x7f0402dc" />
-    <public type="attr" name="roundTopEnd" id="0x7f0402dd" />
-    <public type="attr" name="roundTopLeft" id="0x7f0402de" />
-    <public type="attr" name="roundTopRight" id="0x7f0402df" />
-    <public type="attr" name="roundTopStart" id="0x7f0402e0" />
-    <public type="attr" name="roundWithOverlayColor" id="0x7f0402e1" />
-    <public type="attr" name="roundedCornerRadius" id="0x7f0402e2" />
-    <public type="attr" name="roundingBorderColor" id="0x7f0402e3" />
-    <public type="attr" name="roundingBorderPadding" id="0x7f0402e4" />
-    <public type="attr" name="roundingBorderWidth" id="0x7f0402e5" />
-    <public type="attr" name="sb_barBackgroundColor" id="0x7f0402e6" />
-    <public type="attr" name="sb_barColor" id="0x7f0402e7" />
-    <public type="attr" name="sb_barControlColor" id="0x7f0402e8" />
-    <public type="attr" name="sb_barControlRadius" id="0x7f0402e9" />
-    <public type="attr" name="sb_barControlShadowColor" id="0x7f0402ea" />
-    <public type="attr" name="sb_barControlShadowRadius" id="0x7f0402eb" />
-    <public type="attr" name="sb_barHeight" id="0x7f0402ec" />
-    <public type="attr" name="sb_barInterval" id="0x7f0402ed" />
-    <public type="attr" name="sb_barOverlayColor" id="0x7f0402ee" />
-    <public type="attr" name="sb_barOverlayValue" id="0x7f0402ef" />
-    <public type="attr" name="sb_barTouchEnabled" id="0x7f0402f0" />
-    <public type="attr" name="sb_barValue" id="0x7f0402f1" />
-    <public type="attr" name="sb_barValueMax" id="0x7f0402f2" />
-    <public type="attr" name="sb_barValueMin" id="0x7f0402f3" />
-    <public type="attr" name="scopeUris" id="0x7f0402f4" />
-    <public type="attr" name="scrimAnimationDuration" id="0x7f0402f5" />
-    <public type="attr" name="scrimBackground" id="0x7f0402f6" />
-    <public type="attr" name="scrimVisibleHeightTrigger" id="0x7f0402f7" />
-    <public type="attr" name="searchHintIcon" id="0x7f0402f8" />
-    <public type="attr" name="searchIcon" id="0x7f0402f9" />
-    <public type="attr" name="searchViewStyle" id="0x7f0402fa" />
-    <public type="attr" name="search_action_bar_bg" id="0x7f0402fb" />
-    <public type="attr" name="seekBarStyle" id="0x7f0402fc" />
-    <public type="attr" name="selectableItemBackground" id="0x7f0402fd" />
-    <public type="attr" name="selectableItemBackgroundBorderless" id="0x7f0402fe" />
-    <public type="attr" name="settings_text_color" id="0x7f0402ff" />
-    <public type="attr" name="showAsAction" id="0x7f040300" />
-    <public type="attr" name="showDivider" id="0x7f040301" />
-    <public type="attr" name="showDividerHorizontal" id="0x7f040302" />
-    <public type="attr" name="showDividerVertical" id="0x7f040303" />
-    <public type="attr" name="showDividers" id="0x7f040304" />
-    <public type="attr" name="showMotionSpec" id="0x7f040305" />
-    <public type="attr" name="showText" id="0x7f040306" />
-    <public type="attr" name="showTitle" id="0x7f040307" />
-    <public type="attr" name="singleChoiceItemLayout" id="0x7f040308" />
-    <public type="attr" name="singleLine" id="0x7f040309" />
-    <public type="attr" name="singleSelection" id="0x7f04030a" />
-    <public type="attr" name="snackbarButtonStyle" id="0x7f04030b" />
-    <public type="attr" name="snackbarStyle" id="0x7f04030c" />
-    <public type="attr" name="spanCount" id="0x7f04030d" />
-    <public type="attr" name="spinBars" id="0x7f04030e" />
-    <public type="attr" name="spinnerDropDownItemStyle" id="0x7f04030f" />
-    <public type="attr" name="spinnerStyle" id="0x7f040310" />
-    <public type="attr" name="splitTrack" id="0x7f040311" />
-    <public type="attr" name="srcCompat" id="0x7f040312" />
-    <public type="attr" name="stackFromEnd" id="0x7f040313" />
-    <public type="attr" name="state_above_anchor" id="0x7f040314" />
-    <public type="attr" name="state_collapsed" id="0x7f040315" />
-    <public type="attr" name="state_collapsible" id="0x7f040316" />
-    <public type="attr" name="state_liftable" id="0x7f040317" />
-    <public type="attr" name="state_lifted" id="0x7f040318" />
-    <public type="attr" name="statusBarBackground" id="0x7f040319" />
-    <public type="attr" name="statusBarScrim" id="0x7f04031a" />
-    <public type="attr" name="status_white_outline" id="0x7f04031b" />
-    <public type="attr" name="stream_preview_bg" id="0x7f04031c" />
-    <public type="attr" name="stream_preview_placeholder_color" id="0x7f04031d" />
-    <public type="attr" name="strokeColor" id="0x7f04031e" />
-    <public type="attr" name="strokeWidth" id="0x7f04031f" />
-    <public type="attr" name="subMenuArrow" id="0x7f040320" />
-    <public type="attr" name="submitBackground" id="0x7f040321" />
-    <public type="attr" name="subtitle" id="0x7f040322" />
-    <public type="attr" name="subtitleTextAppearance" id="0x7f040323" />
-    <public type="attr" name="subtitleTextColor" id="0x7f040324" />
-    <public type="attr" name="subtitleTextStyle" id="0x7f040325" />
-    <public type="attr" name="suggestionRowLayout" id="0x7f040326" />
-    <public type="attr" name="switchMinWidth" id="0x7f040327" />
-    <public type="attr" name="switchPadding" id="0x7f040328" />
-    <public type="attr" name="switchStyle" id="0x7f040329" />
-    <public type="attr" name="switchTextAppearance" id="0x7f04032a" />
-    <public type="attr" name="tabBackground" id="0x7f04032b" />
-    <public type="attr" name="tabContentStart" id="0x7f04032c" />
-    <public type="attr" name="tabGravity" id="0x7f04032d" />
-    <public type="attr" name="tabIconTint" id="0x7f04032e" />
-    <public type="attr" name="tabIconTintMode" id="0x7f04032f" />
-    <public type="attr" name="tabIndicator" id="0x7f040330" />
-    <public type="attr" name="tabIndicatorAnimationDuration" id="0x7f040331" />
-    <public type="attr" name="tabIndicatorColor" id="0x7f040332" />
-    <public type="attr" name="tabIndicatorFullWidth" id="0x7f040333" />
-    <public type="attr" name="tabIndicatorGravity" id="0x7f040334" />
-    <public type="attr" name="tabIndicatorHeight" id="0x7f040335" />
-    <public type="attr" name="tabInlineLabel" id="0x7f040336" />
-    <public type="attr" name="tabMaxWidth" id="0x7f040337" />
-    <public type="attr" name="tabMinWidth" id="0x7f040338" />
-    <public type="attr" name="tabMode" id="0x7f040339" />
-    <public type="attr" name="tabPadding" id="0x7f04033a" />
-    <public type="attr" name="tabPaddingBottom" id="0x7f04033b" />
-    <public type="attr" name="tabPaddingEnd" id="0x7f04033c" />
-    <public type="attr" name="tabPaddingStart" id="0x7f04033d" />
-    <public type="attr" name="tabPaddingTop" id="0x7f04033e" />
-    <public type="attr" name="tabRippleColor" id="0x7f04033f" />
-    <public type="attr" name="tabSelectedTextColor" id="0x7f040340" />
-    <public type="attr" name="tabStyle" id="0x7f040341" />
-    <public type="attr" name="tabTextAppearance" id="0x7f040342" />
-    <public type="attr" name="tabTextColor" id="0x7f040343" />
-    <public type="attr" name="tabUnboundedRipple" id="0x7f040344" />
-    <public type="attr" name="tcs_subtext" id="0x7f040345" />
-    <public type="attr" name="ternaryCheckboxDisabledColor" id="0x7f040346" />
-    <public type="attr" name="text" id="0x7f040347" />
-    <public type="attr" name="textAllCaps" id="0x7f040348" />
-    <public type="attr" name="textAppearanceBody1" id="0x7f040349" />
-    <public type="attr" name="textAppearanceBody2" id="0x7f04034a" />
-    <public type="attr" name="textAppearanceButton" id="0x7f04034b" />
-    <public type="attr" name="textAppearanceCaption" id="0x7f04034c" />
-    <public type="attr" name="textAppearanceHeadline1" id="0x7f04034d" />
-    <public type="attr" name="textAppearanceHeadline2" id="0x7f04034e" />
-    <public type="attr" name="textAppearanceHeadline3" id="0x7f04034f" />
-    <public type="attr" name="textAppearanceHeadline4" id="0x7f040350" />
-    <public type="attr" name="textAppearanceHeadline5" id="0x7f040351" />
-    <public type="attr" name="textAppearanceHeadline6" id="0x7f040352" />
-    <public type="attr" name="textAppearanceLargePopupMenu" id="0x7f040353" />
-    <public type="attr" name="textAppearanceListItem" id="0x7f040354" />
-    <public type="attr" name="textAppearanceListItemSecondary" id="0x7f040355" />
-    <public type="attr" name="textAppearanceListItemSmall" id="0x7f040356" />
-    <public type="attr" name="textAppearanceOverline" id="0x7f040357" />
-    <public type="attr" name="textAppearancePopupMenuHeader" id="0x7f040358" />
-    <public type="attr" name="textAppearanceSearchResultSubtitle" id="0x7f040359" />
-    <public type="attr" name="textAppearanceSearchResultTitle" id="0x7f04035a" />
-    <public type="attr" name="textAppearanceSmallPopupMenu" id="0x7f04035b" />
-    <public type="attr" name="textAppearanceSubtitle1" id="0x7f04035c" />
-    <public type="attr" name="textAppearanceSubtitle2" id="0x7f04035d" />
-    <public type="attr" name="textColorAlertDialogListItem" id="0x7f04035e" />
-    <public type="attr" name="textColorSearchUrl" id="0x7f04035f" />
-    <public type="attr" name="textEndPadding" id="0x7f040360" />
-    <public type="attr" name="textInputStyle" id="0x7f040361" />
-    <public type="attr" name="textStartPadding" id="0x7f040362" />
-    <public type="attr" name="text_color" id="0x7f040363" />
-    <public type="attr" name="theme" id="0x7f040364" />
-    <public type="attr" name="theme_backspace_icon" id="0x7f040365" />
-    <public type="attr" name="theme_chat_block_quote_divider" id="0x7f040366" />
-    <public type="attr" name="theme_chat_blocked_bg" id="0x7f040367" />
-    <public type="attr" name="theme_chat_blocked_text" id="0x7f040368" />
-    <public type="attr" name="theme_chat_code" id="0x7f040369" />
-    <public type="attr" name="theme_chat_codeblock_border" id="0x7f04036a" />
-    <public type="attr" name="theme_chat_divider" id="0x7f04036b" />
-    <public type="attr" name="theme_chat_divider_embed" id="0x7f04036c" />
-    <public type="attr" name="theme_chat_empty_mentions_arm" id="0x7f04036d" />
-    <public type="attr" name="theme_chat_empty_mentions_hand" id="0x7f04036e" />
-    <public type="attr" name="theme_chat_empty_pins" id="0x7f04036f" />
-    <public type="attr" name="theme_chat_header_members" id="0x7f040370" />
-    <public type="attr" name="theme_chat_input" id="0x7f040371" />
-    <public type="attr" name="theme_chat_input_button_tint_colors" id="0x7f040372" />
-    <public type="attr" name="theme_chat_input_content_tab_bg" id="0x7f040373" />
-    <public type="attr" name="theme_chat_input_divider" id="0x7f040374" />
-    <public type="attr" name="theme_chat_input_edit" id="0x7f040375" />
-    <public type="attr" name="theme_chat_input_photo_selection_icon" id="0x7f040376" />
-    <public type="attr" name="theme_chat_input_text" id="0x7f040377" />
-    <public type="attr" name="theme_chat_input_text_placeholder" id="0x7f040378" />
-    <public type="attr" name="theme_chat_loading_spinner_color" id="0x7f040379" />
-    <public type="attr" name="theme_chat_mentioned_me" id="0x7f04037a" />
-    <public type="attr" name="theme_chat_name" id="0x7f04037b" />
-    <public type="attr" name="theme_chat_reaction_background" id="0x7f04037c" />
-    <public type="attr" name="theme_chat_reaction_text_color" id="0x7f04037d" />
-    <public type="attr" name="theme_chat_spoiler_bg" id="0x7f04037e" />
-    <public type="attr" name="theme_chat_spoiler_bg_visible" id="0x7f04037f" />
-    <public type="attr" name="theme_chat_spoiler_inapp_bg" id="0x7f040380" />
-    <public type="attr" name="theme_chat_text" id="0x7f040381" />
-    <public type="attr" name="theme_chat_timestamp" id="0x7f040382" />
-    <public type="attr" name="theme_emoji_icon_activity" id="0x7f040383" />
-    <public type="attr" name="theme_emoji_icon_custom" id="0x7f040384" />
-    <public type="attr" name="theme_emoji_icon_flags" id="0x7f040385" />
-    <public type="attr" name="theme_emoji_icon_food" id="0x7f040386" />
-    <public type="attr" name="theme_emoji_icon_nature" id="0x7f040387" />
-    <public type="attr" name="theme_emoji_icon_objects" id="0x7f040388" />
-    <public type="attr" name="theme_emoji_icon_people" id="0x7f040389" />
-    <public type="attr" name="theme_emoji_icon_recent" id="0x7f04038a" />
-    <public type="attr" name="theme_emoji_icon_symbols" id="0x7f04038b" />
-    <public type="attr" name="theme_emoji_icon_travel" id="0x7f04038c" />
-    <public type="attr" name="theme_emoji_placeholder" id="0x7f04038d" />
-    <public type="attr" name="theme_emoji_settings_empty" id="0x7f04038e" />
-    <public type="attr" name="theme_friends_add_icon" id="0x7f04038f" />
-    <public type="attr" name="theme_friends_divider" id="0x7f040390" />
-    <public type="attr" name="theme_friends_new_group_icon" id="0x7f040391" />
-    <public type="attr" name="theme_friends_no_block" id="0x7f040392" />
-    <public type="attr" name="theme_friends_no_friends" id="0x7f040393" />
-    <public type="attr" name="theme_friends_no_online" id="0x7f040394" />
-    <public type="attr" name="theme_friends_no_request" id="0x7f040395" />
-    <public type="attr" name="theme_friends_no_suggestions" id="0x7f040396" />
-    <public type="attr" name="theme_friends_pending_tab_text_color" id="0x7f040397" />
-    <public type="attr" name="theme_friends_profile_icon" id="0x7f040398" />
-    <public type="attr" name="theme_friends_tab_mentions" id="0x7f040399" />
-    <public type="attr" name="theme_group_members_icon" id="0x7f04039a" />
-    <public type="attr" name="theme_group_start_call_icon" id="0x7f04039b" />
-    <public type="attr" name="theme_group_start_video_icon" id="0x7f04039c" />
-    <public type="attr" name="theme_name" id="0x7f04039d" />
-    <public type="attr" name="theme_overlay_mentions_oval" id="0x7f04039e" />
-    <public type="attr" name="theme_search_back_arrow" id="0x7f04039f" />
-    <public type="attr" name="theme_search_broken_results" id="0x7f0403a0" />
-    <public type="attr" name="theme_search_clear_icon" id="0x7f0403a1" />
-    <public type="attr" name="theme_search_empty_asset" id="0x7f0403a2" />
-    <public type="attr" name="theme_search_empty_asset_alternate" id="0x7f0403a3" />
-    <public type="attr" name="theme_search_indexing_animation" id="0x7f0403a4" />
-    <public type="attr" name="theme_search_menu_icon" id="0x7f0403a5" />
-    <public type="attr" name="theme_search_suggestion_header_text_color" id="0x7f0403a6" />
-    <public type="attr" name="theme_search_suggestion_icon_attachment" id="0x7f0403a7" />
-    <public type="attr" name="theme_search_suggestion_icon_channel" id="0x7f0403a8" />
-    <public type="attr" name="theme_search_suggestion_icon_clear_history" id="0x7f0403a9" />
-    <public type="attr" name="theme_search_suggestion_icon_embed" id="0x7f0403aa" />
-    <public type="attr" name="theme_search_suggestion_icon_history" id="0x7f0403ab" />
-    <public type="attr" name="theme_search_suggestion_icon_image" id="0x7f0403ac" />
-    <public type="attr" name="theme_search_suggestion_icon_link" id="0x7f0403ad" />
-    <public type="attr" name="theme_search_suggestion_icon_mentions" id="0x7f0403ae" />
-    <public type="attr" name="theme_search_suggestion_icon_people" id="0x7f0403af" />
-    <public type="attr" name="theme_search_suggestion_icon_sound" id="0x7f0403b0" />
-    <public type="attr" name="theme_search_suggestion_icon_video" id="0x7f0403b1" />
-    <public type="attr" name="theme_search_suggestion_text_color_primary" id="0x7f0403b2" />
-    <public type="attr" name="theme_search_suggestion_text_color_secondary" id="0x7f0403b3" />
-    <public type="attr" name="theme_status_indicator_color" id="0x7f0403b4" />
-    <public type="attr" name="thickness" id="0x7f0403b5" />
-    <public type="attr" name="thumbTextPadding" id="0x7f0403b6" />
-    <public type="attr" name="thumbTint" id="0x7f0403b7" />
-    <public type="attr" name="thumbTintMode" id="0x7f0403b8" />
-    <public type="attr" name="tickMark" id="0x7f0403b9" />
-    <public type="attr" name="tickMarkTint" id="0x7f0403ba" />
-    <public type="attr" name="tickMarkTintMode" id="0x7f0403bb" />
-    <public type="attr" name="tint" id="0x7f0403bc" />
-    <public type="attr" name="tintMode" id="0x7f0403bd" />
-    <public type="attr" name="title" id="0x7f0403be" />
-    <public type="attr" name="titleEnabled" id="0x7f0403bf" />
-    <public type="attr" name="titleMargin" id="0x7f0403c0" />
-    <public type="attr" name="titleMarginBottom" id="0x7f0403c1" />
-    <public type="attr" name="titleMarginEnd" id="0x7f0403c2" />
-    <public type="attr" name="titleMarginStart" id="0x7f0403c3" />
-    <public type="attr" name="titleMarginTop" id="0x7f0403c4" />
-    <public type="attr" name="titleMargins" id="0x7f0403c5" />
-    <public type="attr" name="titleTextAppearance" id="0x7f0403c6" />
-    <public type="attr" name="titleTextColor" id="0x7f0403c7" />
-    <public type="attr" name="titleTextStyle" id="0x7f0403c8" />
-    <public type="attr" name="toolbarId" id="0x7f0403c9" />
-    <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f0403ca" />
-    <public type="attr" name="toolbarStyle" id="0x7f0403cb" />
-    <public type="attr" name="tooltipForegroundColor" id="0x7f0403cc" />
-    <public type="attr" name="tooltipFrameBackground" id="0x7f0403cd" />
-    <public type="attr" name="tooltipText" id="0x7f0403ce" />
-    <public type="attr" name="track" id="0x7f0403cf" />
-    <public type="attr" name="trackTint" id="0x7f0403d0" />
-    <public type="attr" name="trackTintMode" id="0x7f0403d1" />
-    <public type="attr" name="ttcIndex" id="0x7f0403d2" />
-    <public type="attr" name="tv_markdown_enabled" id="0x7f0403d3" />
-    <public type="attr" name="tv_plural" id="0x7f0403d4" />
-    <public type="attr" name="tv_plural_quantity" id="0x7f0403d5" />
-    <public type="attr" name="ucrop_artv_ratio_title" id="0x7f0403d6" />
-    <public type="attr" name="ucrop_artv_ratio_x" id="0x7f0403d7" />
-    <public type="attr" name="ucrop_artv_ratio_y" id="0x7f0403d8" />
-    <public type="attr" name="ucrop_aspect_ratio_x" id="0x7f0403d9" />
-    <public type="attr" name="ucrop_aspect_ratio_y" id="0x7f0403da" />
-    <public type="attr" name="ucrop_circle_dimmed_layer" id="0x7f0403db" />
-    <public type="attr" name="ucrop_dimmed_color" id="0x7f0403dc" />
-    <public type="attr" name="ucrop_frame_color" id="0x7f0403dd" />
-    <public type="attr" name="ucrop_frame_stroke_size" id="0x7f0403de" />
-    <public type="attr" name="ucrop_grid_color" id="0x7f0403df" />
-    <public type="attr" name="ucrop_grid_column_count" id="0x7f0403e0" />
-    <public type="attr" name="ucrop_grid_row_count" id="0x7f0403e1" />
-    <public type="attr" name="ucrop_grid_stroke_size" id="0x7f0403e2" />
-    <public type="attr" name="ucrop_show_frame" id="0x7f0403e3" />
-    <public type="attr" name="ucrop_show_grid" id="0x7f0403e4" />
-    <public type="attr" name="ucrop_show_oval_crop_frame" id="0x7f0403e5" />
-    <public type="attr" name="useCompatPadding" id="0x7f0403e6" />
-    <public type="attr" name="user_avatar_background_color" id="0x7f0403e7" />
-    <public type="attr" name="user_avatar_size" id="0x7f0403e8" />
-    <public type="attr" name="user_profile_header_background_color" id="0x7f0403e9" />
-    <public type="attr" name="vcpv_is_overlay" id="0x7f0403ea" />
-    <public type="attr" name="vcpv_match_video_orientation" id="0x7f0403eb" />
-    <public type="attr" name="viewAspectRatio" id="0x7f0403ec" />
-    <public type="attr" name="viewInflaterClass" id="0x7f0403ed" />
-    <public type="attr" name="voiceIcon" id="0x7f0403ee" />
-    <public type="attr" name="vuv_avatar_size" id="0x7f0403ef" />
-    <public type="attr" name="windowActionBar" id="0x7f0403f0" />
-    <public type="attr" name="windowActionBarOverlay" id="0x7f0403f1" />
-    <public type="attr" name="windowActionModeOverlay" id="0x7f0403f2" />
-    <public type="attr" name="windowFixedHeightMajor" id="0x7f0403f3" />
-    <public type="attr" name="windowFixedHeightMinor" id="0x7f0403f4" />
-    <public type="attr" name="windowFixedWidthMajor" id="0x7f0403f5" />
-    <public type="attr" name="windowFixedWidthMinor" id="0x7f0403f6" />
-    <public type="attr" name="windowMinWidthMajor" id="0x7f0403f7" />
-    <public type="attr" name="windowMinWidthMinor" id="0x7f0403f8" />
-    <public type="attr" name="windowNoTitle" id="0x7f0403f9" />
+    <public type="attr" name="lb_disabled_alpha" id="0x7f040255" />
+    <public type="attr" name="lb_progress_color" id="0x7f040256" />
+    <public type="attr" name="lb_text" id="0x7f040257" />
+    <public type="attr" name="lb_text_color" id="0x7f040258" />
+    <public type="attr" name="liftOnScroll" id="0x7f040259" />
+    <public type="attr" name="lineHeight" id="0x7f04025a" />
+    <public type="attr" name="lineSpacing" id="0x7f04025b" />
+    <public type="attr" name="listChoiceBackgroundIndicator" id="0x7f04025c" />
+    <public type="attr" name="listDividerAlertDialog" id="0x7f04025d" />
+    <public type="attr" name="listItemLayout" id="0x7f04025e" />
+    <public type="attr" name="listLayout" id="0x7f04025f" />
+    <public type="attr" name="listMenuViewStyle" id="0x7f040260" />
+    <public type="attr" name="listPopupWindowStyle" id="0x7f040261" />
+    <public type="attr" name="listPreferredItemHeight" id="0x7f040262" />
+    <public type="attr" name="listPreferredItemHeightLarge" id="0x7f040263" />
+    <public type="attr" name="listPreferredItemHeightSmall" id="0x7f040264" />
+    <public type="attr" name="listPreferredItemPaddingLeft" id="0x7f040265" />
+    <public type="attr" name="listPreferredItemPaddingRight" id="0x7f040266" />
+    <public type="attr" name="logo" id="0x7f040267" />
+    <public type="attr" name="logoDescription" id="0x7f040268" />
+    <public type="attr" name="lottie_autoPlay" id="0x7f040269" />
+    <public type="attr" name="lottie_colorFilter" id="0x7f04026a" />
+    <public type="attr" name="lottie_enableMergePathsForKitKatAndAbove" id="0x7f04026b" />
+    <public type="attr" name="lottie_fileName" id="0x7f04026c" />
+    <public type="attr" name="lottie_imageAssetsFolder" id="0x7f04026d" />
+    <public type="attr" name="lottie_loop" id="0x7f04026e" />
+    <public type="attr" name="lottie_progress" id="0x7f04026f" />
+    <public type="attr" name="lottie_rawRes" id="0x7f040270" />
+    <public type="attr" name="lottie_renderMode" id="0x7f040271" />
+    <public type="attr" name="lottie_repeatCount" id="0x7f040272" />
+    <public type="attr" name="lottie_repeatMode" id="0x7f040273" />
+    <public type="attr" name="lottie_scale" id="0x7f040274" />
+    <public type="attr" name="lottie_speed" id="0x7f040275" />
+    <public type="attr" name="lottie_url" id="0x7f040276" />
+    <public type="attr" name="manage_reactions_emoji_selection_indicator" id="0x7f040277" />
+    <public type="attr" name="materialButtonStyle" id="0x7f040278" />
+    <public type="attr" name="materialCardViewStyle" id="0x7f040279" />
+    <public type="attr" name="maxActionInlineWidth" id="0x7f04027a" />
+    <public type="attr" name="maxButtonHeight" id="0x7f04027b" />
+    <public type="attr" name="maxImageSize" id="0x7f04027c" />
+    <public type="attr" name="max_height" id="0x7f04027d" />
+    <public type="attr" name="measureWithLargestChild" id="0x7f04027e" />
+    <public type="attr" name="menu" id="0x7f04027f" />
+    <public type="attr" name="multiChoiceItemLayout" id="0x7f040280" />
+    <public type="attr" name="navigationContentDescription" id="0x7f040281" />
+    <public type="attr" name="navigationIcon" id="0x7f040282" />
+    <public type="attr" name="navigationMode" id="0x7f040283" />
+    <public type="attr" name="navigationViewStyle" id="0x7f040284" />
+    <public type="attr" name="notice_popup_bg" id="0x7f040285" />
+    <public type="attr" name="notice_theme_positive_red" id="0x7f040286" />
+    <public type="attr" name="numericModifiers" id="0x7f040287" />
+    <public type="attr" name="overlapAnchor" id="0x7f040288" />
+    <public type="attr" name="overlayImage" id="0x7f040289" />
+    <public type="attr" name="overlay_guild_mentions" id="0x7f04028a" />
+    <public type="attr" name="overlay_guild_mentions_primary_630" id="0x7f04028b" />
+    <public type="attr" name="paddingBottomNoButtons" id="0x7f04028c" />
+    <public type="attr" name="paddingEnd" id="0x7f04028d" />
+    <public type="attr" name="paddingStart" id="0x7f04028e" />
+    <public type="attr" name="paddingTopNoTitle" id="0x7f04028f" />
+    <public type="attr" name="panelBackground" id="0x7f040290" />
+    <public type="attr" name="panelMenuListTheme" id="0x7f040291" />
+    <public type="attr" name="panelMenuListWidth" id="0x7f040292" />
+    <public type="attr" name="passwordToggleContentDescription" id="0x7f040293" />
+    <public type="attr" name="passwordToggleDrawable" id="0x7f040294" />
+    <public type="attr" name="passwordToggleEnabled" id="0x7f040295" />
+    <public type="attr" name="passwordToggleTint" id="0x7f040296" />
+    <public type="attr" name="passwordToggleTintMode" id="0x7f040297" />
+    <public type="attr" name="placeholderImage" id="0x7f040298" />
+    <public type="attr" name="placeholderImageScaleType" id="0x7f040299" />
+    <public type="attr" name="popupMenuStyle" id="0x7f04029a" />
+    <public type="attr" name="popupTheme" id="0x7f04029b" />
+    <public type="attr" name="popupWindowStyle" id="0x7f04029c" />
+    <public type="attr" name="preserveIconSpacing" id="0x7f04029d" />
+    <public type="attr" name="pressedStateOverlayImage" id="0x7f04029e" />
+    <public type="attr" name="pressedTranslationZ" id="0x7f04029f" />
+    <public type="attr" name="previewBackground" id="0x7f0402a0" />
+    <public type="attr" name="primary_000" id="0x7f0402a1" />
+    <public type="attr" name="primary_100" id="0x7f0402a2" />
+    <public type="attr" name="primary_100_alpha_30" id="0x7f0402a3" />
+    <public type="attr" name="primary_100_alpha_60" id="0x7f0402a4" />
+    <public type="attr" name="primary_100_bg" id="0x7f0402a5" />
+    <public type="attr" name="primary_200" id="0x7f0402a6" />
+    <public type="attr" name="primary_200_bg" id="0x7f0402a7" />
+    <public type="attr" name="primary_300" id="0x7f0402a8" />
+    <public type="attr" name="primary_300_alpha_30" id="0x7f0402a9" />
+    <public type="attr" name="primary_300_bg" id="0x7f0402aa" />
+    <public type="attr" name="primary_400" id="0x7f0402ab" />
+    <public type="attr" name="primary_400_alpha_30" id="0x7f0402ac" />
+    <public type="attr" name="primary_400_bg" id="0x7f0402ad" />
+    <public type="attr" name="primary_500" id="0x7f0402ae" />
+    <public type="attr" name="primary_500_alpha_60" id="0x7f0402af" />
+    <public type="attr" name="primary_500_bg" id="0x7f0402b0" />
+    <public type="attr" name="primary_500_button_outline" id="0x7f0402b1" />
+    <public type="attr" name="primary_500_circle" id="0x7f0402b2" />
+    <public type="attr" name="primary_560" id="0x7f0402b3" />
+    <public type="attr" name="primary_600" id="0x7f0402b4" />
+    <public type="attr" name="primary_600_bg" id="0x7f0402b5" />
+    <public type="attr" name="primary_630" id="0x7f0402b6" />
+    <public type="attr" name="primary_630_bg" id="0x7f0402b7" />
+    <public type="attr" name="primary_630_bg_bottom_corners" id="0x7f0402b8" />
+    <public type="attr" name="primary_630_circle" id="0x7f0402b9" />
+    <public type="attr" name="primary_660" id="0x7f0402ba" />
+    <public type="attr" name="primary_660_bg_outline" id="0x7f0402bb" />
+    <public type="attr" name="primary_700" id="0x7f0402bc" />
+    <public type="attr" name="primary_700_alpha_60" id="0x7f0402bd" />
+    <public type="attr" name="primary_700_bg" id="0x7f0402be" />
+    <public type="attr" name="primary_700_circle" id="0x7f0402bf" />
+    <public type="attr" name="primary_700_top_corners" id="0x7f0402c0" />
+    <public type="attr" name="primary_800" id="0x7f0402c1" />
+    <public type="attr" name="primary_800_bg" id="0x7f0402c2" />
+    <public type="attr" name="primary_800_circle" id="0x7f0402c3" />
+    <public type="attr" name="primary_900" id="0x7f0402c4" />
+    <public type="attr" name="primary_900_bg" id="0x7f0402c5" />
+    <public type="attr" name="progressBarAutoRotateInterval" id="0x7f0402c6" />
+    <public type="attr" name="progressBarImage" id="0x7f0402c7" />
+    <public type="attr" name="progressBarImageScaleType" id="0x7f0402c8" />
+    <public type="attr" name="progressBarPadding" id="0x7f0402c9" />
+    <public type="attr" name="progressBarStyle" id="0x7f0402ca" />
+    <public type="attr" name="progress_gradient" id="0x7f0402cb" />
+    <public type="attr" name="ptrn_shapes" id="0x7f0402cc" />
+    <public type="attr" name="queryBackground" id="0x7f0402cd" />
+    <public type="attr" name="queryHint" id="0x7f0402ce" />
+    <public type="attr" name="radioButtonStyle" id="0x7f0402cf" />
+    <public type="attr" name="radio_btn_bg" id="0x7f0402d0" />
+    <public type="attr" name="radio_btn_text_color" id="0x7f0402d1" />
+    <public type="attr" name="ratingBarStyle" id="0x7f0402d2" />
+    <public type="attr" name="ratingBarStyleIndicator" id="0x7f0402d3" />
+    <public type="attr" name="ratingBarStyleSmall" id="0x7f0402d4" />
+    <public type="attr" name="retryImage" id="0x7f0402d5" />
+    <public type="attr" name="retryImageScaleType" id="0x7f0402d6" />
+    <public type="attr" name="reverseLayout" id="0x7f0402d7" />
+    <public type="attr" name="rippleColor" id="0x7f0402d8" />
+    <public type="attr" name="roundAsCircle" id="0x7f0402d9" />
+    <public type="attr" name="roundBottomEnd" id="0x7f0402da" />
+    <public type="attr" name="roundBottomLeft" id="0x7f0402db" />
+    <public type="attr" name="roundBottomRight" id="0x7f0402dc" />
+    <public type="attr" name="roundBottomStart" id="0x7f0402dd" />
+    <public type="attr" name="roundTopEnd" id="0x7f0402de" />
+    <public type="attr" name="roundTopLeft" id="0x7f0402df" />
+    <public type="attr" name="roundTopRight" id="0x7f0402e0" />
+    <public type="attr" name="roundTopStart" id="0x7f0402e1" />
+    <public type="attr" name="roundWithOverlayColor" id="0x7f0402e2" />
+    <public type="attr" name="roundedCornerRadius" id="0x7f0402e3" />
+    <public type="attr" name="roundingBorderColor" id="0x7f0402e4" />
+    <public type="attr" name="roundingBorderPadding" id="0x7f0402e5" />
+    <public type="attr" name="roundingBorderWidth" id="0x7f0402e6" />
+    <public type="attr" name="sb_barBackgroundColor" id="0x7f0402e7" />
+    <public type="attr" name="sb_barColor" id="0x7f0402e8" />
+    <public type="attr" name="sb_barControlColor" id="0x7f0402e9" />
+    <public type="attr" name="sb_barControlRadius" id="0x7f0402ea" />
+    <public type="attr" name="sb_barControlShadowColor" id="0x7f0402eb" />
+    <public type="attr" name="sb_barControlShadowRadius" id="0x7f0402ec" />
+    <public type="attr" name="sb_barHeight" id="0x7f0402ed" />
+    <public type="attr" name="sb_barInterval" id="0x7f0402ee" />
+    <public type="attr" name="sb_barOverlayColor" id="0x7f0402ef" />
+    <public type="attr" name="sb_barOverlayValue" id="0x7f0402f0" />
+    <public type="attr" name="sb_barTouchEnabled" id="0x7f0402f1" />
+    <public type="attr" name="sb_barValue" id="0x7f0402f2" />
+    <public type="attr" name="sb_barValueMax" id="0x7f0402f3" />
+    <public type="attr" name="sb_barValueMin" id="0x7f0402f4" />
+    <public type="attr" name="scopeUris" id="0x7f0402f5" />
+    <public type="attr" name="scrimAnimationDuration" id="0x7f0402f6" />
+    <public type="attr" name="scrimBackground" id="0x7f0402f7" />
+    <public type="attr" name="scrimVisibleHeightTrigger" id="0x7f0402f8" />
+    <public type="attr" name="searchHintIcon" id="0x7f0402f9" />
+    <public type="attr" name="searchIcon" id="0x7f0402fa" />
+    <public type="attr" name="searchViewStyle" id="0x7f0402fb" />
+    <public type="attr" name="search_action_bar_bg" id="0x7f0402fc" />
+    <public type="attr" name="seekBarStyle" id="0x7f0402fd" />
+    <public type="attr" name="selectableItemBackground" id="0x7f0402fe" />
+    <public type="attr" name="selectableItemBackgroundBorderless" id="0x7f0402ff" />
+    <public type="attr" name="settings_text_color" id="0x7f040300" />
+    <public type="attr" name="showAsAction" id="0x7f040301" />
+    <public type="attr" name="showDivider" id="0x7f040302" />
+    <public type="attr" name="showDividerHorizontal" id="0x7f040303" />
+    <public type="attr" name="showDividerVertical" id="0x7f040304" />
+    <public type="attr" name="showDividers" id="0x7f040305" />
+    <public type="attr" name="showMotionSpec" id="0x7f040306" />
+    <public type="attr" name="showText" id="0x7f040307" />
+    <public type="attr" name="showTitle" id="0x7f040308" />
+    <public type="attr" name="singleChoiceItemLayout" id="0x7f040309" />
+    <public type="attr" name="singleLine" id="0x7f04030a" />
+    <public type="attr" name="singleSelection" id="0x7f04030b" />
+    <public type="attr" name="snackbarButtonStyle" id="0x7f04030c" />
+    <public type="attr" name="snackbarStyle" id="0x7f04030d" />
+    <public type="attr" name="spanCount" id="0x7f04030e" />
+    <public type="attr" name="spinBars" id="0x7f04030f" />
+    <public type="attr" name="spinnerDropDownItemStyle" id="0x7f040310" />
+    <public type="attr" name="spinnerStyle" id="0x7f040311" />
+    <public type="attr" name="splitTrack" id="0x7f040312" />
+    <public type="attr" name="srcCompat" id="0x7f040313" />
+    <public type="attr" name="stackFromEnd" id="0x7f040314" />
+    <public type="attr" name="state_above_anchor" id="0x7f040315" />
+    <public type="attr" name="state_collapsed" id="0x7f040316" />
+    <public type="attr" name="state_collapsible" id="0x7f040317" />
+    <public type="attr" name="state_liftable" id="0x7f040318" />
+    <public type="attr" name="state_lifted" id="0x7f040319" />
+    <public type="attr" name="statusBarBackground" id="0x7f04031a" />
+    <public type="attr" name="statusBarScrim" id="0x7f04031b" />
+    <public type="attr" name="status_white_outline" id="0x7f04031c" />
+    <public type="attr" name="stream_preview_bg" id="0x7f04031d" />
+    <public type="attr" name="stream_preview_placeholder_color" id="0x7f04031e" />
+    <public type="attr" name="strokeColor" id="0x7f04031f" />
+    <public type="attr" name="strokeWidth" id="0x7f040320" />
+    <public type="attr" name="subMenuArrow" id="0x7f040321" />
+    <public type="attr" name="submitBackground" id="0x7f040322" />
+    <public type="attr" name="subtitle" id="0x7f040323" />
+    <public type="attr" name="subtitleTextAppearance" id="0x7f040324" />
+    <public type="attr" name="subtitleTextColor" id="0x7f040325" />
+    <public type="attr" name="subtitleTextStyle" id="0x7f040326" />
+    <public type="attr" name="suggestionRowLayout" id="0x7f040327" />
+    <public type="attr" name="switchMinWidth" id="0x7f040328" />
+    <public type="attr" name="switchPadding" id="0x7f040329" />
+    <public type="attr" name="switchStyle" id="0x7f04032a" />
+    <public type="attr" name="switchTextAppearance" id="0x7f04032b" />
+    <public type="attr" name="tabBackground" id="0x7f04032c" />
+    <public type="attr" name="tabContentStart" id="0x7f04032d" />
+    <public type="attr" name="tabGravity" id="0x7f04032e" />
+    <public type="attr" name="tabIconTint" id="0x7f04032f" />
+    <public type="attr" name="tabIconTintMode" id="0x7f040330" />
+    <public type="attr" name="tabIndicator" id="0x7f040331" />
+    <public type="attr" name="tabIndicatorAnimationDuration" id="0x7f040332" />
+    <public type="attr" name="tabIndicatorColor" id="0x7f040333" />
+    <public type="attr" name="tabIndicatorFullWidth" id="0x7f040334" />
+    <public type="attr" name="tabIndicatorGravity" id="0x7f040335" />
+    <public type="attr" name="tabIndicatorHeight" id="0x7f040336" />
+    <public type="attr" name="tabInlineLabel" id="0x7f040337" />
+    <public type="attr" name="tabMaxWidth" id="0x7f040338" />
+    <public type="attr" name="tabMinWidth" id="0x7f040339" />
+    <public type="attr" name="tabMode" id="0x7f04033a" />
+    <public type="attr" name="tabPadding" id="0x7f04033b" />
+    <public type="attr" name="tabPaddingBottom" id="0x7f04033c" />
+    <public type="attr" name="tabPaddingEnd" id="0x7f04033d" />
+    <public type="attr" name="tabPaddingStart" id="0x7f04033e" />
+    <public type="attr" name="tabPaddingTop" id="0x7f04033f" />
+    <public type="attr" name="tabRippleColor" id="0x7f040340" />
+    <public type="attr" name="tabSelectedTextColor" id="0x7f040341" />
+    <public type="attr" name="tabStyle" id="0x7f040342" />
+    <public type="attr" name="tabTextAppearance" id="0x7f040343" />
+    <public type="attr" name="tabTextColor" id="0x7f040344" />
+    <public type="attr" name="tabUnboundedRipple" id="0x7f040345" />
+    <public type="attr" name="tcs_subtext" id="0x7f040346" />
+    <public type="attr" name="ternaryCheckboxDisabledColor" id="0x7f040347" />
+    <public type="attr" name="text" id="0x7f040348" />
+    <public type="attr" name="textAllCaps" id="0x7f040349" />
+    <public type="attr" name="textAppearanceBody1" id="0x7f04034a" />
+    <public type="attr" name="textAppearanceBody2" id="0x7f04034b" />
+    <public type="attr" name="textAppearanceButton" id="0x7f04034c" />
+    <public type="attr" name="textAppearanceCaption" id="0x7f04034d" />
+    <public type="attr" name="textAppearanceHeadline1" id="0x7f04034e" />
+    <public type="attr" name="textAppearanceHeadline2" id="0x7f04034f" />
+    <public type="attr" name="textAppearanceHeadline3" id="0x7f040350" />
+    <public type="attr" name="textAppearanceHeadline4" id="0x7f040351" />
+    <public type="attr" name="textAppearanceHeadline5" id="0x7f040352" />
+    <public type="attr" name="textAppearanceHeadline6" id="0x7f040353" />
+    <public type="attr" name="textAppearanceLargePopupMenu" id="0x7f040354" />
+    <public type="attr" name="textAppearanceListItem" id="0x7f040355" />
+    <public type="attr" name="textAppearanceListItemSecondary" id="0x7f040356" />
+    <public type="attr" name="textAppearanceListItemSmall" id="0x7f040357" />
+    <public type="attr" name="textAppearanceOverline" id="0x7f040358" />
+    <public type="attr" name="textAppearancePopupMenuHeader" id="0x7f040359" />
+    <public type="attr" name="textAppearanceSearchResultSubtitle" id="0x7f04035a" />
+    <public type="attr" name="textAppearanceSearchResultTitle" id="0x7f04035b" />
+    <public type="attr" name="textAppearanceSmallPopupMenu" id="0x7f04035c" />
+    <public type="attr" name="textAppearanceSubtitle1" id="0x7f04035d" />
+    <public type="attr" name="textAppearanceSubtitle2" id="0x7f04035e" />
+    <public type="attr" name="textColorAlertDialogListItem" id="0x7f04035f" />
+    <public type="attr" name="textColorSearchUrl" id="0x7f040360" />
+    <public type="attr" name="textEndPadding" id="0x7f040361" />
+    <public type="attr" name="textInputStyle" id="0x7f040362" />
+    <public type="attr" name="textStartPadding" id="0x7f040363" />
+    <public type="attr" name="text_color" id="0x7f040364" />
+    <public type="attr" name="theme" id="0x7f040365" />
+    <public type="attr" name="theme_backspace_icon" id="0x7f040366" />
+    <public type="attr" name="theme_chat_block_quote_divider" id="0x7f040367" />
+    <public type="attr" name="theme_chat_blocked_bg" id="0x7f040368" />
+    <public type="attr" name="theme_chat_blocked_text" id="0x7f040369" />
+    <public type="attr" name="theme_chat_code" id="0x7f04036a" />
+    <public type="attr" name="theme_chat_codeblock_border" id="0x7f04036b" />
+    <public type="attr" name="theme_chat_divider" id="0x7f04036c" />
+    <public type="attr" name="theme_chat_divider_embed" id="0x7f04036d" />
+    <public type="attr" name="theme_chat_empty_mentions_arm" id="0x7f04036e" />
+    <public type="attr" name="theme_chat_empty_mentions_hand" id="0x7f04036f" />
+    <public type="attr" name="theme_chat_empty_pins" id="0x7f040370" />
+    <public type="attr" name="theme_chat_header_members" id="0x7f040371" />
+    <public type="attr" name="theme_chat_input" id="0x7f040372" />
+    <public type="attr" name="theme_chat_input_button_tint_colors" id="0x7f040373" />
+    <public type="attr" name="theme_chat_input_content_tab_bg" id="0x7f040374" />
+    <public type="attr" name="theme_chat_input_divider" id="0x7f040375" />
+    <public type="attr" name="theme_chat_input_edit" id="0x7f040376" />
+    <public type="attr" name="theme_chat_input_photo_selection_icon" id="0x7f040377" />
+    <public type="attr" name="theme_chat_input_text" id="0x7f040378" />
+    <public type="attr" name="theme_chat_input_text_placeholder" id="0x7f040379" />
+    <public type="attr" name="theme_chat_loading_spinner_color" id="0x7f04037a" />
+    <public type="attr" name="theme_chat_mentioned_me" id="0x7f04037b" />
+    <public type="attr" name="theme_chat_name" id="0x7f04037c" />
+    <public type="attr" name="theme_chat_reaction_background" id="0x7f04037d" />
+    <public type="attr" name="theme_chat_reaction_text_color" id="0x7f04037e" />
+    <public type="attr" name="theme_chat_spoiler_bg" id="0x7f04037f" />
+    <public type="attr" name="theme_chat_spoiler_bg_visible" id="0x7f040380" />
+    <public type="attr" name="theme_chat_spoiler_inapp_bg" id="0x7f040381" />
+    <public type="attr" name="theme_chat_text" id="0x7f040382" />
+    <public type="attr" name="theme_chat_timestamp" id="0x7f040383" />
+    <public type="attr" name="theme_emoji_icon_activity" id="0x7f040384" />
+    <public type="attr" name="theme_emoji_icon_custom" id="0x7f040385" />
+    <public type="attr" name="theme_emoji_icon_flags" id="0x7f040386" />
+    <public type="attr" name="theme_emoji_icon_food" id="0x7f040387" />
+    <public type="attr" name="theme_emoji_icon_nature" id="0x7f040388" />
+    <public type="attr" name="theme_emoji_icon_objects" id="0x7f040389" />
+    <public type="attr" name="theme_emoji_icon_people" id="0x7f04038a" />
+    <public type="attr" name="theme_emoji_icon_recent" id="0x7f04038b" />
+    <public type="attr" name="theme_emoji_icon_symbols" id="0x7f04038c" />
+    <public type="attr" name="theme_emoji_icon_travel" id="0x7f04038d" />
+    <public type="attr" name="theme_emoji_placeholder" id="0x7f04038e" />
+    <public type="attr" name="theme_emoji_settings_empty" id="0x7f04038f" />
+    <public type="attr" name="theme_friends_add_icon" id="0x7f040390" />
+    <public type="attr" name="theme_friends_divider" id="0x7f040391" />
+    <public type="attr" name="theme_friends_new_group_icon" id="0x7f040392" />
+    <public type="attr" name="theme_friends_no_block" id="0x7f040393" />
+    <public type="attr" name="theme_friends_no_friends" id="0x7f040394" />
+    <public type="attr" name="theme_friends_no_online" id="0x7f040395" />
+    <public type="attr" name="theme_friends_no_request" id="0x7f040396" />
+    <public type="attr" name="theme_friends_no_suggestions" id="0x7f040397" />
+    <public type="attr" name="theme_friends_pending_tab_text_color" id="0x7f040398" />
+    <public type="attr" name="theme_friends_profile_icon" id="0x7f040399" />
+    <public type="attr" name="theme_friends_tab_mentions" id="0x7f04039a" />
+    <public type="attr" name="theme_group_members_icon" id="0x7f04039b" />
+    <public type="attr" name="theme_group_start_call_icon" id="0x7f04039c" />
+    <public type="attr" name="theme_group_start_video_icon" id="0x7f04039d" />
+    <public type="attr" name="theme_name" id="0x7f04039e" />
+    <public type="attr" name="theme_overlay_mentions_oval" id="0x7f04039f" />
+    <public type="attr" name="theme_search_back_arrow" id="0x7f0403a0" />
+    <public type="attr" name="theme_search_broken_results" id="0x7f0403a1" />
+    <public type="attr" name="theme_search_clear_icon" id="0x7f0403a2" />
+    <public type="attr" name="theme_search_empty_asset" id="0x7f0403a3" />
+    <public type="attr" name="theme_search_empty_asset_alternate" id="0x7f0403a4" />
+    <public type="attr" name="theme_search_indexing_animation" id="0x7f0403a5" />
+    <public type="attr" name="theme_search_menu_icon" id="0x7f0403a6" />
+    <public type="attr" name="theme_search_suggestion_header_text_color" id="0x7f0403a7" />
+    <public type="attr" name="theme_search_suggestion_icon_attachment" id="0x7f0403a8" />
+    <public type="attr" name="theme_search_suggestion_icon_channel" id="0x7f0403a9" />
+    <public type="attr" name="theme_search_suggestion_icon_clear_history" id="0x7f0403aa" />
+    <public type="attr" name="theme_search_suggestion_icon_embed" id="0x7f0403ab" />
+    <public type="attr" name="theme_search_suggestion_icon_history" id="0x7f0403ac" />
+    <public type="attr" name="theme_search_suggestion_icon_image" id="0x7f0403ad" />
+    <public type="attr" name="theme_search_suggestion_icon_link" id="0x7f0403ae" />
+    <public type="attr" name="theme_search_suggestion_icon_mentions" id="0x7f0403af" />
+    <public type="attr" name="theme_search_suggestion_icon_people" id="0x7f0403b0" />
+    <public type="attr" name="theme_search_suggestion_icon_sound" id="0x7f0403b1" />
+    <public type="attr" name="theme_search_suggestion_icon_video" id="0x7f0403b2" />
+    <public type="attr" name="theme_search_suggestion_text_color_primary" id="0x7f0403b3" />
+    <public type="attr" name="theme_search_suggestion_text_color_secondary" id="0x7f0403b4" />
+    <public type="attr" name="theme_status_indicator_color" id="0x7f0403b5" />
+    <public type="attr" name="thickness" id="0x7f0403b6" />
+    <public type="attr" name="thumbTextPadding" id="0x7f0403b7" />
+    <public type="attr" name="thumbTint" id="0x7f0403b8" />
+    <public type="attr" name="thumbTintMode" id="0x7f0403b9" />
+    <public type="attr" name="tickMark" id="0x7f0403ba" />
+    <public type="attr" name="tickMarkTint" id="0x7f0403bb" />
+    <public type="attr" name="tickMarkTintMode" id="0x7f0403bc" />
+    <public type="attr" name="tint" id="0x7f0403bd" />
+    <public type="attr" name="tintMode" id="0x7f0403be" />
+    <public type="attr" name="title" id="0x7f0403bf" />
+    <public type="attr" name="titleEnabled" id="0x7f0403c0" />
+    <public type="attr" name="titleMargin" id="0x7f0403c1" />
+    <public type="attr" name="titleMarginBottom" id="0x7f0403c2" />
+    <public type="attr" name="titleMarginEnd" id="0x7f0403c3" />
+    <public type="attr" name="titleMarginStart" id="0x7f0403c4" />
+    <public type="attr" name="titleMarginTop" id="0x7f0403c5" />
+    <public type="attr" name="titleMargins" id="0x7f0403c6" />
+    <public type="attr" name="titleTextAppearance" id="0x7f0403c7" />
+    <public type="attr" name="titleTextColor" id="0x7f0403c8" />
+    <public type="attr" name="titleTextStyle" id="0x7f0403c9" />
+    <public type="attr" name="toolbarId" id="0x7f0403ca" />
+    <public type="attr" name="toolbarNavigationButtonStyle" id="0x7f0403cb" />
+    <public type="attr" name="toolbarStyle" id="0x7f0403cc" />
+    <public type="attr" name="tooltipForegroundColor" id="0x7f0403cd" />
+    <public type="attr" name="tooltipFrameBackground" id="0x7f0403ce" />
+    <public type="attr" name="tooltipText" id="0x7f0403cf" />
+    <public type="attr" name="track" id="0x7f0403d0" />
+    <public type="attr" name="trackTint" id="0x7f0403d1" />
+    <public type="attr" name="trackTintMode" id="0x7f0403d2" />
+    <public type="attr" name="ttcIndex" id="0x7f0403d3" />
+    <public type="attr" name="tv_markdown_enabled" id="0x7f0403d4" />
+    <public type="attr" name="tv_plural" id="0x7f0403d5" />
+    <public type="attr" name="tv_plural_quantity" id="0x7f0403d6" />
+    <public type="attr" name="ucrop_artv_ratio_title" id="0x7f0403d7" />
+    <public type="attr" name="ucrop_artv_ratio_x" id="0x7f0403d8" />
+    <public type="attr" name="ucrop_artv_ratio_y" id="0x7f0403d9" />
+    <public type="attr" name="ucrop_aspect_ratio_x" id="0x7f0403da" />
+    <public type="attr" name="ucrop_aspect_ratio_y" id="0x7f0403db" />
+    <public type="attr" name="ucrop_circle_dimmed_layer" id="0x7f0403dc" />
+    <public type="attr" name="ucrop_dimmed_color" id="0x7f0403dd" />
+    <public type="attr" name="ucrop_frame_color" id="0x7f0403de" />
+    <public type="attr" name="ucrop_frame_stroke_size" id="0x7f0403df" />
+    <public type="attr" name="ucrop_grid_color" id="0x7f0403e0" />
+    <public type="attr" name="ucrop_grid_column_count" id="0x7f0403e1" />
+    <public type="attr" name="ucrop_grid_row_count" id="0x7f0403e2" />
+    <public type="attr" name="ucrop_grid_stroke_size" id="0x7f0403e3" />
+    <public type="attr" name="ucrop_show_frame" id="0x7f0403e4" />
+    <public type="attr" name="ucrop_show_grid" id="0x7f0403e5" />
+    <public type="attr" name="ucrop_show_oval_crop_frame" id="0x7f0403e6" />
+    <public type="attr" name="useCompatPadding" id="0x7f0403e7" />
+    <public type="attr" name="user_avatar_background_color" id="0x7f0403e8" />
+    <public type="attr" name="user_avatar_size" id="0x7f0403e9" />
+    <public type="attr" name="user_profile_header_background_color" id="0x7f0403ea" />
+    <public type="attr" name="vcpv_is_overlay" id="0x7f0403eb" />
+    <public type="attr" name="vcpv_match_video_orientation" id="0x7f0403ec" />
+    <public type="attr" name="viewAspectRatio" id="0x7f0403ed" />
+    <public type="attr" name="viewInflaterClass" id="0x7f0403ee" />
+    <public type="attr" name="voiceIcon" id="0x7f0403ef" />
+    <public type="attr" name="vuv_avatar_size" id="0x7f0403f0" />
+    <public type="attr" name="windowActionBar" id="0x7f0403f1" />
+    <public type="attr" name="windowActionBarOverlay" id="0x7f0403f2" />
+    <public type="attr" name="windowActionModeOverlay" id="0x7f0403f3" />
+    <public type="attr" name="windowFixedHeightMajor" id="0x7f0403f4" />
+    <public type="attr" name="windowFixedHeightMinor" id="0x7f0403f5" />
+    <public type="attr" name="windowFixedWidthMajor" id="0x7f0403f6" />
+    <public type="attr" name="windowFixedWidthMinor" id="0x7f0403f7" />
+    <public type="attr" name="windowMinWidthMajor" id="0x7f0403f8" />
+    <public type="attr" name="windowMinWidthMinor" id="0x7f0403f9" />
+    <public type="attr" name="windowNoTitle" id="0x7f0403fa" />
     <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" />
@@ -1138,312 +1139,313 @@
     <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="color_clicked_darker" id="0x7f06004c" />
-    <public type="color" name="color_clicked_lighter" id="0x7f06004d" />
-    <public type="color" name="common_google_signin_btn_text_dark" id="0x7f06004e" />
-    <public type="color" name="common_google_signin_btn_text_dark_default" id="0x7f06004f" />
-    <public type="color" name="common_google_signin_btn_text_dark_disabled" id="0x7f060050" />
-    <public type="color" name="common_google_signin_btn_text_dark_focused" id="0x7f060051" />
-    <public type="color" name="common_google_signin_btn_text_dark_pressed" id="0x7f060052" />
-    <public type="color" name="common_google_signin_btn_text_light" id="0x7f060053" />
-    <public type="color" name="common_google_signin_btn_text_light_default" id="0x7f060054" />
-    <public type="color" name="common_google_signin_btn_text_light_disabled" id="0x7f060055" />
-    <public type="color" name="common_google_signin_btn_text_light_focused" id="0x7f060056" />
-    <public type="color" name="common_google_signin_btn_text_light_pressed" id="0x7f060057" />
-    <public type="color" name="common_google_signin_btn_tint" id="0x7f060058" />
-    <public type="color" name="dark_grey_2" id="0x7f060059" />
-    <public type="color" name="dark_grey_2_alpha_10" id="0x7f06005a" />
-    <public type="color" name="design_bottom_navigation_shadow_color" id="0x7f06005b" />
-    <public type="color" name="design_default_color_primary" id="0x7f06005c" />
-    <public type="color" name="design_default_color_primary_dark" id="0x7f06005d" />
-    <public type="color" name="design_error" id="0x7f06005e" />
-    <public type="color" name="design_fab_shadow_end_color" id="0x7f06005f" />
-    <public type="color" name="design_fab_shadow_mid_color" id="0x7f060060" />
-    <public type="color" name="design_fab_shadow_start_color" id="0x7f060061" />
-    <public type="color" name="design_fab_stroke_end_inner_color" id="0x7f060062" />
-    <public type="color" name="design_fab_stroke_end_outer_color" id="0x7f060063" />
-    <public type="color" name="design_fab_stroke_top_inner_color" id="0x7f060064" />
-    <public type="color" name="design_fab_stroke_top_outer_color" id="0x7f060065" />
-    <public type="color" name="design_snackbar_background_color" id="0x7f060066" />
-    <public type="color" name="design_tint_password_toggle" id="0x7f060067" />
-    <public type="color" name="dim_foreground_disabled_material_dark" id="0x7f060068" />
-    <public type="color" name="dim_foreground_disabled_material_light" id="0x7f060069" />
-    <public type="color" name="dim_foreground_material_dark" id="0x7f06006a" />
-    <public type="color" name="dim_foreground_material_light" id="0x7f06006b" />
-    <public type="color" name="error_color_material_dark" id="0x7f06006c" />
-    <public type="color" name="error_color_material_light" id="0x7f06006d" />
-    <public type="color" name="facebook" id="0x7f06006e" />
-    <public type="color" name="flexInputIconColor" id="0x7f06006f" />
-    <public type="color" name="flexInputIconColorActivated" id="0x7f060070" />
-    <public type="color" name="flexInputIconColorDisabled" id="0x7f060071" />
-    <public type="color" name="foreground_material_dark" id="0x7f060072" />
-    <public type="color" name="foreground_material_light" id="0x7f060073" />
-    <public type="color" name="google" id="0x7f060074" />
-    <public type="color" name="grey_1" id="0x7f060075" />
-    <public type="color" name="grey_1_alpha_60" id="0x7f060076" />
-    <public type="color" name="grey_2" id="0x7f060077" />
-    <public type="color" name="grey_3" id="0x7f060078" />
-    <public type="color" name="grey_3_alpha_30" id="0x7f060079" />
-    <public type="color" name="grey_4" id="0x7f06007a" />
-    <public type="color" name="grey_6" id="0x7f06007b" />
-    <public type="color" name="grey_6_alpha_05" id="0x7f06007c" />
-    <public type="color" name="grey_6_alpha_30" id="0x7f06007d" />
-    <public type="color" name="grey_account" id="0x7f06007e" />
-    <public type="color" name="grey_channels" id="0x7f06007f" />
-    <public type="color" name="grey_guilds" id="0x7f060080" />
-    <public type="color" name="grey_unread" id="0x7f060081" />
-    <public type="color" name="highlighted_text_material_dark" id="0x7f060082" />
-    <public type="color" name="highlighted_text_material_light" id="0x7f060083" />
-    <public type="color" name="hypesquad_house1" id="0x7f060084" />
-    <public type="color" name="hypesquad_house2" id="0x7f060085" />
-    <public type="color" name="hypesquad_house3" id="0x7f060086" />
-    <public type="color" name="league_of_legends" id="0x7f060087" />
-    <public type="color" name="link_100" id="0x7f060088" />
-    <public type="color" name="link_200" id="0x7f060089" />
-    <public type="color" name="link_300" id="0x7f06008a" />
-    <public type="color" name="link_400" id="0x7f06008b" />
-    <public type="color" name="link_500" id="0x7f06008c" />
-    <public type="color" name="link_600" id="0x7f06008d" />
-    <public type="color" name="link_700" id="0x7f06008e" />
-    <public type="color" name="link_800" id="0x7f06008f" />
-    <public type="color" name="link_900" id="0x7f060090" />
-    <public type="color" name="material_blue_grey_800" id="0x7f060091" />
-    <public type="color" name="material_blue_grey_900" id="0x7f060092" />
-    <public type="color" name="material_blue_grey_950" id="0x7f060093" />
-    <public type="color" name="material_deep_teal_200" id="0x7f060094" />
-    <public type="color" name="material_deep_teal_500" id="0x7f060095" />
-    <public type="color" name="material_grey_100" id="0x7f060096" />
-    <public type="color" name="material_grey_300" id="0x7f060097" />
-    <public type="color" name="material_grey_50" id="0x7f060098" />
-    <public type="color" name="material_grey_600" id="0x7f060099" />
-    <public type="color" name="material_grey_800" id="0x7f06009a" />
-    <public type="color" name="material_grey_850" id="0x7f06009b" />
-    <public type="color" name="material_grey_900" id="0x7f06009c" />
-    <public type="color" name="mtrl_bottom_nav_colored_item_tint" id="0x7f06009d" />
-    <public type="color" name="mtrl_bottom_nav_item_tint" id="0x7f06009e" />
-    <public type="color" name="mtrl_btn_bg_color_disabled" id="0x7f06009f" />
-    <public type="color" name="mtrl_btn_bg_color_selector" id="0x7f0600a0" />
-    <public type="color" name="mtrl_btn_ripple_color" id="0x7f0600a1" />
-    <public type="color" name="mtrl_btn_stroke_color_selector" id="0x7f0600a2" />
-    <public type="color" name="mtrl_btn_text_btn_ripple_color" id="0x7f0600a3" />
-    <public type="color" name="mtrl_btn_text_color_disabled" id="0x7f0600a4" />
-    <public type="color" name="mtrl_btn_text_color_selector" id="0x7f0600a5" />
-    <public type="color" name="mtrl_btn_transparent_bg_color" id="0x7f0600a6" />
-    <public type="color" name="mtrl_chip_background_color" id="0x7f0600a7" />
-    <public type="color" name="mtrl_chip_close_icon_tint" id="0x7f0600a8" />
-    <public type="color" name="mtrl_chip_ripple_color" id="0x7f0600a9" />
-    <public type="color" name="mtrl_chip_text_color" id="0x7f0600aa" />
-    <public type="color" name="mtrl_fab_ripple_color" id="0x7f0600ab" />
-    <public type="color" name="mtrl_scrim_color" id="0x7f0600ac" />
-    <public type="color" name="mtrl_tabs_colored_ripple_color" id="0x7f0600ad" />
-    <public type="color" name="mtrl_tabs_icon_color_selector" id="0x7f0600ae" />
-    <public type="color" name="mtrl_tabs_icon_color_selector_colored" id="0x7f0600af" />
-    <public type="color" name="mtrl_tabs_legacy_text_color_selector" id="0x7f0600b0" />
-    <public type="color" name="mtrl_tabs_ripple_color" id="0x7f0600b1" />
-    <public type="color" name="mtrl_text_btn_text_color_selector" id="0x7f0600b2" />
-    <public type="color" name="mtrl_textinput_default_box_stroke_color" id="0x7f0600b3" />
-    <public type="color" name="mtrl_textinput_disabled_color" id="0x7f0600b4" />
-    <public type="color" name="mtrl_textinput_filled_box_default_background_color" id="0x7f0600b5" />
-    <public type="color" name="mtrl_textinput_hovered_box_stroke_color" id="0x7f0600b6" />
-    <public type="color" name="notification_action_color_filter" id="0x7f0600b7" />
-    <public type="color" name="notification_icon_bg_color" id="0x7f0600b8" />
-    <public type="color" name="placeholder" id="0x7f0600b9" />
-    <public type="color" name="primary_100" id="0x7f0600ba" />
-    <public type="color" name="primary_100_alpha_30" id="0x7f0600bb" />
-    <public type="color" name="primary_100_alpha_60" id="0x7f0600bc" />
-    <public type="color" name="primary_100_alpha_80" id="0x7f0600bd" />
-    <public type="color" name="primary_100_alpha_90" id="0x7f0600be" />
-    <public type="color" name="primary_200" id="0x7f0600bf" />
-    <public type="color" name="primary_200_alpha_30" id="0x7f0600c0" />
-    <public type="color" name="primary_200_alpha_60" id="0x7f0600c1" />
-    <public type="color" name="primary_300" id="0x7f0600c2" />
-    <public type="color" name="primary_300_alpha_30" id="0x7f0600c3" />
-    <public type="color" name="primary_300_alpha_60" id="0x7f0600c4" />
-    <public type="color" name="primary_400" id="0x7f0600c5" />
-    <public type="color" name="primary_400_alpha_30" id="0x7f0600c6" />
-    <public type="color" name="primary_400_alpha_60" id="0x7f0600c7" />
-    <public type="color" name="primary_500" id="0x7f0600c8" />
-    <public type="color" name="primary_500_alpha_30" id="0x7f0600c9" />
-    <public type="color" name="primary_500_alpha_60" id="0x7f0600ca" />
-    <public type="color" name="primary_560" id="0x7f0600cb" />
-    <public type="color" name="primary_600" id="0x7f0600cc" />
-    <public type="color" name="primary_600_alpha_60" id="0x7f0600cd" />
-    <public type="color" name="primary_630" id="0x7f0600ce" />
-    <public type="color" name="primary_630_alpha_60" id="0x7f0600cf" />
-    <public type="color" name="primary_630_alpha_90" id="0x7f0600d0" />
-    <public type="color" name="primary_660" id="0x7f0600d1" />
-    <public type="color" name="primary_700" id="0x7f0600d2" />
-    <public type="color" name="primary_700_alpha_60" id="0x7f0600d3" />
-    <public type="color" name="primary_800" id="0x7f0600d4" />
-    <public type="color" name="primary_800_alpha_60" id="0x7f0600d5" />
-    <public type="color" name="primary_800_alpha_90" id="0x7f0600d6" />
-    <public type="color" name="primary_900" id="0x7f0600d7" />
-    <public type="color" name="primary_900_alpha_30" id="0x7f0600d8" />
-    <public type="color" name="primary_900_alpha_60" id="0x7f0600d9" />
-    <public type="color" name="primary_dark_material_dark" id="0x7f0600da" />
-    <public type="color" name="primary_dark_material_light" id="0x7f0600db" />
-    <public type="color" name="primary_light_100" id="0x7f0600dc" />
-    <public type="color" name="primary_light_130" id="0x7f0600dd" />
-    <public type="color" name="primary_light_160" id="0x7f0600de" />
-    <public type="color" name="primary_light_200" id="0x7f0600df" />
-    <public type="color" name="primary_light_230" id="0x7f0600e0" />
-    <public type="color" name="primary_light_260" id="0x7f0600e1" />
-    <public type="color" name="primary_light_300" id="0x7f0600e2" />
-    <public type="color" name="primary_light_330" id="0x7f0600e3" />
-    <public type="color" name="primary_light_360" id="0x7f0600e4" />
-    <public type="color" name="primary_light_400" id="0x7f0600e5" />
-    <public type="color" name="primary_light_500" id="0x7f0600e6" />
-    <public type="color" name="primary_light_600" id="0x7f0600e7" />
-    <public type="color" name="primary_light_700" id="0x7f0600e8" />
-    <public type="color" name="primary_light_800" id="0x7f0600e9" />
-    <public type="color" name="primary_light_900" id="0x7f0600ea" />
-    <public type="color" name="primary_material_dark" id="0x7f0600eb" />
-    <public type="color" name="primary_material_light" id="0x7f0600ec" />
-    <public type="color" name="primary_text_default_material_dark" id="0x7f0600ed" />
-    <public type="color" name="primary_text_default_material_light" id="0x7f0600ee" />
-    <public type="color" name="primary_text_disabled_material_dark" id="0x7f0600ef" />
-    <public type="color" name="primary_text_disabled_material_light" id="0x7f0600f0" />
-    <public type="color" name="purple_brand" id="0x7f0600f1" />
-    <public type="color" name="purple_brand_alpha_10" id="0x7f0600f2" />
-    <public type="color" name="purple_brand_dark" id="0x7f0600f3" />
-    <public type="color" name="purple_brand_hint" id="0x7f0600f4" />
-    <public type="color" name="purple_brand_notification" id="0x7f0600f5" />
-    <public type="color" name="reaction_background_me_dark" id="0x7f0600f6" />
-    <public type="color" name="reaction_background_me_light" id="0x7f0600f7" />
-    <public type="color" name="reddit" 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="placeholder" id="0x7f0600ba" />
+    <public type="color" name="primary_100" id="0x7f0600bb" />
+    <public type="color" name="primary_100_alpha_30" id="0x7f0600bc" />
+    <public type="color" name="primary_100_alpha_60" id="0x7f0600bd" />
+    <public type="color" name="primary_100_alpha_80" id="0x7f0600be" />
+    <public type="color" name="primary_100_alpha_90" id="0x7f0600bf" />
+    <public type="color" name="primary_200" id="0x7f0600c0" />
+    <public type="color" name="primary_200_alpha_30" id="0x7f0600c1" />
+    <public type="color" name="primary_200_alpha_60" id="0x7f0600c2" />
+    <public type="color" name="primary_300" id="0x7f0600c3" />
+    <public type="color" name="primary_300_alpha_30" id="0x7f0600c4" />
+    <public type="color" name="primary_300_alpha_60" id="0x7f0600c5" />
+    <public type="color" name="primary_400" id="0x7f0600c6" />
+    <public type="color" name="primary_400_alpha_30" id="0x7f0600c7" />
+    <public type="color" name="primary_400_alpha_60" id="0x7f0600c8" />
+    <public type="color" name="primary_500" id="0x7f0600c9" />
+    <public type="color" name="primary_500_alpha_30" id="0x7f0600ca" />
+    <public type="color" name="primary_500_alpha_60" id="0x7f0600cb" />
+    <public type="color" name="primary_560" id="0x7f0600cc" />
+    <public type="color" name="primary_600" id="0x7f0600cd" />
+    <public type="color" name="primary_600_alpha_60" id="0x7f0600ce" />
+    <public type="color" name="primary_630" id="0x7f0600cf" />
+    <public type="color" name="primary_630_alpha_60" id="0x7f0600d0" />
+    <public type="color" name="primary_630_alpha_90" id="0x7f0600d1" />
+    <public type="color" name="primary_660" id="0x7f0600d2" />
+    <public type="color" name="primary_700" id="0x7f0600d3" />
+    <public type="color" name="primary_700_alpha_60" id="0x7f0600d4" />
+    <public type="color" name="primary_800" id="0x7f0600d5" />
+    <public type="color" name="primary_800_alpha_60" id="0x7f0600d6" />
+    <public type="color" name="primary_800_alpha_90" id="0x7f0600d7" />
+    <public type="color" name="primary_900" id="0x7f0600d8" />
+    <public type="color" name="primary_900_alpha_30" id="0x7f0600d9" />
+    <public type="color" name="primary_900_alpha_60" id="0x7f0600da" />
+    <public type="color" name="primary_dark_material_dark" id="0x7f0600db" />
+    <public type="color" name="primary_dark_material_light" id="0x7f0600dc" />
+    <public type="color" name="primary_light_100" id="0x7f0600dd" />
+    <public type="color" name="primary_light_130" id="0x7f0600de" />
+    <public type="color" name="primary_light_160" id="0x7f0600df" />
+    <public type="color" name="primary_light_200" id="0x7f0600e0" />
+    <public type="color" name="primary_light_230" id="0x7f0600e1" />
+    <public type="color" name="primary_light_260" id="0x7f0600e2" />
+    <public type="color" name="primary_light_300" id="0x7f0600e3" />
+    <public type="color" name="primary_light_330" id="0x7f0600e4" />
+    <public type="color" name="primary_light_360" id="0x7f0600e5" />
+    <public type="color" name="primary_light_400" id="0x7f0600e6" />
+    <public type="color" name="primary_light_500" id="0x7f0600e7" />
+    <public type="color" name="primary_light_600" id="0x7f0600e8" />
+    <public type="color" name="primary_light_700" id="0x7f0600e9" />
+    <public type="color" name="primary_light_800" id="0x7f0600ea" />
+    <public type="color" name="primary_light_900" id="0x7f0600eb" />
+    <public type="color" name="primary_material_dark" id="0x7f0600ec" />
+    <public type="color" name="primary_material_light" id="0x7f0600ed" />
+    <public type="color" name="primary_text_default_material_dark" id="0x7f0600ee" />
+    <public type="color" name="primary_text_default_material_light" id="0x7f0600ef" />
+    <public type="color" name="primary_text_disabled_material_dark" id="0x7f0600f0" />
+    <public type="color" name="primary_text_disabled_material_light" id="0x7f0600f1" />
+    <public type="color" name="purple_brand" id="0x7f0600f2" />
+    <public type="color" name="purple_brand_alpha_10" id="0x7f0600f3" />
+    <public type="color" name="purple_brand_dark" id="0x7f0600f4" />
+    <public type="color" name="purple_brand_hint" id="0x7f0600f5" />
+    <public type="color" name="purple_brand_notification" id="0x7f0600f6" />
+    <public type="color" name="reaction_background_me_dark" id="0x7f0600f7" />
+    <public type="color" name="reaction_background_me_light" id="0x7f0600f8" />
+    <public type="color" name="reddit" id="0x7f0600f9" />
+    <public type="color" name="ripple_material_dark" id="0x7f0600fa" />
+    <public type="color" name="ripple_material_light" id="0x7f0600fb" />
+    <public type="color" name="secondary_text_default_material_dark" id="0x7f0600fc" />
+    <public type="color" name="secondary_text_default_material_light" id="0x7f0600fd" />
+    <public type="color" name="secondary_text_disabled_material_dark" id="0x7f0600fe" />
+    <public type="color" name="secondary_text_disabled_material_light" id="0x7f0600ff" />
+    <public type="color" name="skype" id="0x7f060100" />
+    <public type="color" name="spotify" id="0x7f060101" />
+    <public type="color" name="status_green_100" id="0x7f060102" />
+    <public type="color" name="status_green_200" id="0x7f060103" />
+    <public type="color" name="status_green_300" id="0x7f060104" />
+    <public type="color" name="status_green_400" id="0x7f060105" />
+    <public type="color" name="status_green_500" id="0x7f060106" />
+    <public type="color" name="status_green_500_alpha_60" id="0x7f060107" />
+    <public type="color" name="status_green_500_dark" id="0x7f060108" />
+    <public type="color" name="status_green_600" id="0x7f060109" />
+    <public type="color" name="status_green_700" id="0x7f06010a" />
+    <public type="color" name="status_green_800" id="0x7f06010b" />
+    <public type="color" name="status_green_900" id="0x7f06010c" />
+    <public type="color" name="status_grey_100" id="0x7f06010d" />
+    <public type="color" name="status_grey_200" id="0x7f06010e" />
+    <public type="color" name="status_grey_300" id="0x7f06010f" />
+    <public type="color" name="status_grey_400" id="0x7f060110" />
+    <public type="color" name="status_grey_500" id="0x7f060111" />
+    <public type="color" name="status_grey_600" id="0x7f060112" />
+    <public type="color" name="status_grey_700" id="0x7f060113" />
+    <public type="color" name="status_grey_800" id="0x7f060114" />
+    <public type="color" name="status_grey_900" id="0x7f060115" />
+    <public type="color" name="status_grey_alpha_50" id="0x7f060116" />
+    <public type="color" name="status_orange_500" id="0x7f060117" />
+    <public type="color" name="status_red_100" id="0x7f060118" />
+    <public type="color" name="status_red_200" id="0x7f060119" />
+    <public type="color" name="status_red_300" id="0x7f06011a" />
+    <public type="color" name="status_red_400" id="0x7f06011b" />
+    <public type="color" name="status_red_500" id="0x7f06011c" />
+    <public type="color" name="status_red_500_alpha_60" id="0x7f06011d" />
+    <public type="color" name="status_red_500_dark" id="0x7f06011e" />
+    <public type="color" name="status_red_600" id="0x7f06011f" />
+    <public type="color" name="status_red_700" id="0x7f060120" />
+    <public type="color" name="status_red_800" id="0x7f060121" />
+    <public type="color" name="status_red_900" id="0x7f060122" />
+    <public type="color" name="status_yellow_100" id="0x7f060123" />
+    <public type="color" name="status_yellow_200" id="0x7f060124" />
+    <public type="color" name="status_yellow_300" id="0x7f060125" />
+    <public type="color" name="status_yellow_400" id="0x7f060126" />
+    <public type="color" name="status_yellow_500" id="0x7f060127" />
+    <public type="color" name="status_yellow_500_alpha_60" id="0x7f060128" />
+    <public type="color" name="status_yellow_600" id="0x7f060129" />
+    <public type="color" name="status_yellow_700" id="0x7f06012a" />
+    <public type="color" name="status_yellow_800" id="0x7f06012b" />
+    <public type="color" name="status_yellow_900" id="0x7f06012c" />
+    <public type="color" name="steam" id="0x7f06012d" />
+    <public type="color" name="switch_thumb_disabled_material_dark" id="0x7f06012e" />
+    <public type="color" name="switch_thumb_disabled_material_light" id="0x7f06012f" />
+    <public type="color" name="switch_thumb_material_dark" id="0x7f060130" />
+    <public type="color" name="switch_thumb_material_light" id="0x7f060131" />
+    <public type="color" name="switch_thumb_normal_material_dark" id="0x7f060132" />
+    <public type="color" name="switch_thumb_normal_material_light" id="0x7f060133" />
+    <public type="color" name="tab_color_selector" id="0x7f060134" />
+    <public type="color" name="tooltip_background_dark" id="0x7f060135" />
+    <public type="color" name="tooltip_background_light" id="0x7f060136" />
+    <public type="color" name="transparent" id="0x7f060137" />
+    <public type="color" name="twitch" id="0x7f060138" />
+    <public type="color" name="twitter" id="0x7f060139" />
+    <public type="color" name="ucrop_color_crop_background" id="0x7f06013a" />
+    <public type="color" name="ucrop_color_default_crop_frame" id="0x7f06013b" />
+    <public type="color" name="ucrop_color_default_crop_grid" id="0x7f06013c" />
+    <public type="color" name="ucrop_color_default_dimmed" id="0x7f06013d" />
+    <public type="color" name="ucrop_color_default_logo" id="0x7f06013e" />
+    <public type="color" name="ucrop_color_progress_wheel_line" id="0x7f06013f" />
+    <public type="color" name="ucrop_color_statusbar" id="0x7f060140" />
+    <public type="color" name="ucrop_color_toolbar" id="0x7f060141" />
+    <public type="color" name="ucrop_color_toolbar_widget" id="0x7f060142" />
+    <public type="color" name="ucrop_color_widget" id="0x7f060143" />
+    <public type="color" name="ucrop_color_widget_active" id="0x7f060144" />
+    <public type="color" name="ucrop_color_widget_background" id="0x7f060145" />
+    <public type="color" name="ucrop_color_widget_text" id="0x7f060146" />
+    <public type="color" name="ucrop_scale_text_view_selector" id="0x7f060147" />
+    <public type="color" name="uikit_settings_item_text_color_dark" id="0x7f060148" />
+    <public type="color" name="uikit_settings_item_text_color_light" id="0x7f060149" />
+    <public type="color" name="white" id="0x7f06014a" />
+    <public type="color" name="white_1" id="0x7f06014b" />
+    <public type="color" name="white_2" id="0x7f06014c" />
+    <public type="color" name="white_3" id="0x7f06014d" />
+    <public type="color" name="white_3_alpha_25" id="0x7f06014e" />
+    <public type="color" name="white_5" id="0x7f06014f" />
+    <public type="color" name="white_6" id="0x7f060150" />
+    <public type="color" name="white_alpha_05" id="0x7f060151" />
+    <public type="color" name="white_alpha_10" id="0x7f060152" />
+    <public type="color" name="white_alpha_20" id="0x7f060153" />
+    <public type="color" name="white_alpha_30" id="0x7f060154" />
+    <public type="color" name="white_alpha_40" id="0x7f060155" />
+    <public type="color" name="white_alpha_70" id="0x7f060156" />
+    <public type="color" name="white_alpha_80" id="0x7f060157" />
+    <public type="color" name="xbox" id="0x7f060158" />
+    <public type="color" name="youtube" id="0x7f060159" />
     <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" />
@@ -1800,1164 +1802,1178 @@
     <public type="dimen" name="uikit_textsize_xxlarge" id="0x7f070160" />
     <public type="dimen" name="uikit_typing_indicator_height" id="0x7f070161" />
     <public type="dimen" name="vertical_safe_margin" id="0x7f070162" />
-    <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="0x7f080078" />
-    <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="bg_pressed_highlight_brighten" id="0x7f080097" />
-    <public type="drawable" name="bg_pressed_highlight_darken" id="0x7f080098" />
-    <public type="drawable" name="bubble_state_selector" id="0x7f080099" />
-    <public type="drawable" name="button_brand_500" id="0x7f08009a" />
-    <public type="drawable" name="button_green" id="0x7f08009b" />
-    <public type="drawable" name="button_red" id="0x7f08009c" />
-    <public type="drawable" name="button_status_green_500" id="0x7f08009d" />
-    <public type="drawable" name="button_text_color_primary_100" id="0x7f08009e" />
-    <public type="drawable" name="chat_typing_background_dark" id="0x7f08009f" />
-    <public type="drawable" name="chat_typing_background_light" id="0x7f0800a0" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark" id="0x7f0800a2" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_focused" id="0x7f0800a3" />
-    <public type="drawable" name="common_google_signin_btn_icon_dark_normal" id="0x7f0800a4" />
-    <public type="drawable" name="common_google_signin_btn_icon_disabled" id="0x7f0800a6" />
-    <public type="drawable" name="common_google_signin_btn_icon_light" id="0x7f0800a7" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_focused" id="0x7f0800a8" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal" id="0x7f0800a9" />
-    <public type="drawable" name="common_google_signin_btn_text_dark" id="0x7f0800ab" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_focused" id="0x7f0800ac" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal" id="0x7f0800ad" />
-    <public type="drawable" name="common_google_signin_btn_text_disabled" id="0x7f0800af" />
-    <public type="drawable" name="common_google_signin_btn_text_light" id="0x7f0800b0" />
-    <public type="drawable" name="common_google_signin_btn_text_light_focused" id="0x7f0800b1" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal" id="0x7f0800b2" />
-    <public type="drawable" name="design_bottom_navigation_item_background" id="0x7f0800b4" />
-    <public type="drawable" name="design_fab_background" id="0x7f0800b5" />
-    <public type="drawable" name="design_password_eye" id="0x7f0800b8" />
-    <public type="drawable" name="design_snackbar_background" id="0x7f0800b9" />
-    <public type="drawable" name="drawable_asset_pattern_shapes_dark" id="0x7f0800bc" />
-    <public type="drawable" name="drawable_asset_pattern_shapes_light" id="0x7f0800bd" />
-    <public type="drawable" name="drawable_auth_splash" id="0x7f0800be" />
-    <public type="drawable" name="drawable_bg_boost_gradient" id="0x7f0800bf" />
-    <public type="drawable" name="drawable_bg_boost_gradient_top_corners" id="0x7f0800c0" />
-    <public type="drawable" name="drawable_bg_card_grey" id="0x7f0800c1" />
-    <public type="drawable" name="drawable_bg_card_primary_700" id="0x7f0800c2" />
-    <public type="drawable" name="drawable_bg_card_white" id="0x7f0800c3" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_dark" id="0x7f0800c4" />
-    <public type="drawable" name="drawable_bg_chat_embed_gift_image_light" id="0x7f0800c5" />
-    <public type="drawable" name="drawable_bg_dashed" id="0x7f0800c6" />
-    <public type="drawable" name="drawable_bg_dialog_popup" id="0x7f0800c7" />
-    <public type="drawable" name="drawable_bg_highlight" id="0x7f0800c8" />
-    <public type="drawable" name="drawable_bg_item_filter" id="0x7f0800c9" />
-    <public type="drawable" name="drawable_bg_loading" id="0x7f0800ca" />
-    <public type="drawable" name="drawable_bg_mentions_arm_dark" id="0x7f0800cb" />
-    <public type="drawable" name="drawable_bg_mentions_arm_light" id="0x7f0800cc" />
-    <public type="drawable" name="drawable_bg_nitro_classic_gradient_top_corners" id="0x7f0800cd" />
-    <public type="drawable" name="drawable_bg_outline_dark" id="0x7f0800ce" />
-    <public type="drawable" name="drawable_bg_payment_invalid_indicator" id="0x7f0800cf" />
-    <public type="drawable" name="drawable_bg_payment_premium_indicator" id="0x7f0800d0" />
-    <public type="drawable" name="drawable_bg_pill_outline" id="0x7f0800d1" />
-    <public type="drawable" name="drawable_bg_primary_700_top_corners" id="0x7f0800d2" />
-    <public type="drawable" name="drawable_bg_primary_light_200_top_corners" id="0x7f0800d3" />
-    <public type="drawable" name="drawable_bg_radio_button_dark" id="0x7f0800d4" />
-    <public type="drawable" name="drawable_bg_radio_button_light" id="0x7f0800d5" />
-    <public type="drawable" name="drawable_bg_reaction_dark" id="0x7f0800d6" />
-    <public type="drawable" name="drawable_bg_reaction_light" id="0x7f0800d7" />
-    <public type="drawable" name="drawable_bg_searchbar_light" id="0x7f0800d8" />
-    <public type="drawable" name="drawable_bg_settings_header" id="0x7f0800d9" />
-    <public type="drawable" name="drawable_bg_settings_item" id="0x7f0800da" />
-    <public type="drawable" name="drawable_bg_settings_item_white" id="0x7f0800db" />
-    <public type="drawable" name="drawable_bg_stream_preview" id="0x7f0800dc" />
-    <public type="drawable" name="drawable_bg_ternary_neutral" id="0x7f0800dd" />
-    <public type="drawable" name="drawable_bg_ternary_off" id="0x7f0800de" />
-    <public type="drawable" name="drawable_bg_ternary_on" id="0x7f0800df" />
-    <public type="drawable" name="drawable_bg_video_action_bar" id="0x7f0800e0" />
-    <public type="drawable" name="drawable_bg_voice_status_indicator" id="0x7f0800e1" />
-    <public type="drawable" name="drawable_bg_voice_user_overlay" id="0x7f0800e2" />
-    <public type="drawable" name="drawable_boost_progress_bar_dark" id="0x7f0800e3" />
-    <public type="drawable" name="drawable_boost_progress_bar_light" id="0x7f0800e4" />
-    <public type="drawable" name="drawable_boost_progress_ring" id="0x7f0800e5" />
-    <public type="drawable" name="drawable_bottom_up_primary_600_gradient" id="0x7f0800e9" />
-    <public type="drawable" name="drawable_bottom_up_primary_630_gradient" id="0x7f0800ea" />
-    <public type="drawable" name="drawable_bottom_up_white_gradient" id="0x7f0800eb" />
-    <public type="drawable" name="drawable_button_green" id="0x7f0800ec" />
-    <public type="drawable" name="drawable_button_green_disabled" id="0x7f0800ed" />
-    <public type="drawable" name="drawable_button_green_neutral" id="0x7f0800ee" />
-    <public type="drawable" name="drawable_button_green_pressed" id="0x7f0800ef" />
-    <public type="drawable" name="drawable_button_grey" id="0x7f0800f0" />
-    <public type="drawable" name="drawable_button_grey_disabled" id="0x7f0800f1" />
-    <public type="drawable" name="drawable_button_purple" id="0x7f0800f2" />
-    <public type="drawable" name="drawable_button_purple_neutral" id="0x7f0800f3" />
-    <public type="drawable" name="drawable_button_purple_pressed" id="0x7f0800f4" />
-    <public type="drawable" name="drawable_button_red" id="0x7f0800f5" />
-    <public type="drawable" name="drawable_button_red_neutral" id="0x7f0800f6" />
-    <public type="drawable" name="drawable_button_red_pressed" id="0x7f0800f7" />
-    <public type="drawable" name="drawable_button_theme_grey_channels" id="0x7f0800f8" />
-    <public type="drawable" name="drawable_button_transparent_dark" id="0x7f0800f9" />
-    <public type="drawable" name="drawable_button_transparent_dark_neutral" id="0x7f0800fa" />
-    <public type="drawable" name="drawable_button_transparent_dark_pressed" id="0x7f0800fb" />
-    <public type="drawable" name="drawable_button_white" id="0x7f0800fc" />
-    <public type="drawable" name="drawable_button_white_neutral" id="0x7f0800fd" />
-    <public type="drawable" name="drawable_button_white_pressed" id="0x7f0800fe" />
-    <public type="drawable" name="drawable_chat_embed_dark_background" id="0x7f0800ff" />
-    <public type="drawable" name="drawable_chat_embed_light_background" id="0x7f080100" />
-    <public type="drawable" name="drawable_chip_background" id="0x7f080101" />
-    <public type="drawable" name="drawable_chip_circle" id="0x7f080102" />
-    <public type="drawable" name="drawable_circle_boost_gradient" id="0x7f080104" />
-    <public type="drawable" name="drawable_circle_green" id="0x7f080105" />
-    <public type="drawable" name="drawable_circle_grey_channels" id="0x7f080106" />
-    <public type="drawable" name="drawable_circle_primary_700" id="0x7f080107" />
-    <public type="drawable" name="drawable_circle_primary_900_alpha_60" id="0x7f080108" />
-    <public type="drawable" name="drawable_circle_purple_brand" id="0x7f080109" />
-    <public type="drawable" name="drawable_circle_purple_brand_guild" id="0x7f08010a" />
-    <public type="drawable" name="drawable_circle_red" id="0x7f08010b" />
-    <public type="drawable" name="drawable_circle_speaking" id="0x7f08010c" />
-    <public type="drawable" name="drawable_circle_transparent" id="0x7f08010d" />
-    <public type="drawable" name="drawable_circle_white_1" id="0x7f08010e" />
-    <public type="drawable" name="drawable_circle_white_12dp" id="0x7f08010f" />
-    <public type="drawable" name="drawable_circle_white_5" id="0x7f080110" />
-    <public type="drawable" name="drawable_empty_text_placeholder_dark" id="0x7f080112" />
-    <public type="drawable" name="drawable_file_selection_indicator_btn" id="0x7f080113" />
-    <public type="drawable" name="drawable_fill_black_alpha_20" id="0x7f080114" />
-    <public type="drawable" name="drawable_fill_purple" id="0x7f080115" />
-    <public type="drawable" name="drawable_friends_pending_dark" id="0x7f080116" />
-    <public type="drawable" name="drawable_friends_pending_dark_selected" id="0x7f080117" />
-    <public type="drawable" name="drawable_friends_pending_dark_unselected" id="0x7f080118" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_dark" id="0x7f080119" />
-    <public type="drawable" name="drawable_friends_pending_invites_selector_light" id="0x7f08011a" />
-    <public type="drawable" name="drawable_friends_pending_light" id="0x7f08011b" />
-    <public type="drawable" name="drawable_friends_pending_light_selected" id="0x7f08011c" />
-    <public type="drawable" name="drawable_friends_pending_light_unselected" id="0x7f08011d" />
-    <public type="drawable" name="drawable_game_invite_cover_image_background" id="0x7f08011e" />
-    <public type="drawable" name="drawable_game_invite_gradient_overlay" id="0x7f08011f" />
-    <public type="drawable" name="drawable_gem_boost_background_dark" id="0x7f080120" />
-    <public type="drawable" name="drawable_gem_boost_background_light" id="0x7f080121" />
-    <public type="drawable" name="drawable_gem_tier_3" id="0x7f080122" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_dark" id="0x7f080123" />
-    <public type="drawable" name="drawable_gift_embed_gradient_overlay_light" id="0x7f080124" />
-    <public type="drawable" name="drawable_grey_user_icon" id="0x7f080125" />
-    <public type="drawable" name="drawable_ic_ternary_neutral" id="0x7f08012a" />
-    <public type="drawable" name="drawable_ic_ternary_off" id="0x7f08012b" />
-    <public type="drawable" name="drawable_ic_ternary_on" id="0x7f08012c" />
-    <public type="drawable" name="drawable_open_folder" id="0x7f08012f" />
-    <public type="drawable" name="drawable_overlay_category" id="0x7f080130" />
-    <public type="drawable" name="drawable_overlay_category_pressed" id="0x7f080131" />
-    <public type="drawable" name="drawable_overlay_channel_pressed" id="0x7f080132" />
-    <public type="drawable" name="drawable_overlay_channels" id="0x7f080133" />
-    <public type="drawable" name="drawable_overlay_channels_active" id="0x7f080134" />
-    <public type="drawable" name="drawable_overlay_channels_selected" id="0x7f080135" />
-    <public type="drawable" name="drawable_overlay_guild_mentions" id="0x7f080136" />
-    <public type="drawable" name="drawable_overlay_image_rect" id="0x7f080137" />
-    <public type="drawable" name="drawable_overlay_image_square" id="0x7f080138" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_dark" id="0x7f080139" />
-    <public type="drawable" name="drawable_overlay_mentions_oval_light" id="0x7f08013a" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_100" id="0x7f08013b" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_600" id="0x7f08013c" />
-    <public type="drawable" name="drawable_overlay_mentions_primary_630" id="0x7f08013d" />
-    <public type="drawable" name="drawable_overlay_red_upload" id="0x7f08013e" />
-    <public type="drawable" name="drawable_overlay_search" id="0x7f08013f" />
-    <public type="drawable" name="drawable_overlay_status_bar" id="0x7f080140" />
-    <public type="drawable" name="drawable_progress_gradient_dark" id="0x7f080141" />
-    <public type="drawable" name="drawable_progress_gradient_light" id="0x7f080142" />
-    <public type="drawable" name="drawable_progress_green" id="0x7f080143" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_dark" id="0x7f080144" />
-    <public type="drawable" name="drawable_ptrn_auth_bg_light" id="0x7f080145" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_dark" id="0x7f080146" />
-    <public type="drawable" name="drawable_ptrn_auth_gradient_light" id="0x7f080147" />
-    <public type="drawable" name="drawable_reaction_text_color_dark" id="0x7f080148" />
-    <public type="drawable" name="drawable_reaction_text_color_light" id="0x7f080149" />
-    <public type="drawable" name="drawable_rect_guild_selected" id="0x7f08014a" />
-    <public type="drawable" name="drawable_rect_guild_selected_horiz" id="0x7f08014b" />
-    <public type="drawable" name="drawable_rect_rounded_dark" id="0x7f08014c" />
-    <public type="drawable" name="drawable_rect_rounded_dark_a60" id="0x7f08014d" />
-    <public type="drawable" name="drawable_rect_rounded_primary_100_a60" id="0x7f08014e" />
-    <public type="drawable" name="drawable_rect_rounded_red_500" id="0x7f08014f" />
-    <public type="drawable" name="drawable_rect_rounded_white" id="0x7f080150" />
-    <public type="drawable" name="drawable_settings_progress" id="0x7f080151" />
-    <public type="drawable" name="drawable_spotify_button_disabled" id="0x7f080152" />
-    <public type="drawable" name="drawable_spotify_button_enabled" id="0x7f080153" />
-    <public type="drawable" name="drawable_squircle_brand_500" id="0x7f080154" />
-    <public type="drawable" name="drawable_squircle_primary_600" id="0x7f080155" />
-    <public type="drawable" name="drawable_squircle_transparent" id="0x7f080156" />
-    <public type="drawable" name="drawable_squircle_white_alpha_20" id="0x7f080157" />
-    <public type="drawable" name="drawable_text_color_radio_button_dark" id="0x7f080158" />
-    <public type="drawable" name="drawable_text_color_radio_button_light" id="0x7f080159" />
-    <public type="drawable" name="drawable_thumb_grey" id="0x7f08015a" />
-    <public type="drawable" name="drawable_thumb_white" id="0x7f08015b" />
-    <public type="drawable" name="drawable_uikit_brand_500_button" id="0x7f08015c" />
-    <public type="drawable" name="drawable_uikit_brand_500_button_pressed" id="0x7f08015d" />
-    <public type="drawable" name="drawable_uikit_brand_500_disabled" id="0x7f08015e" />
-    <public type="drawable" name="drawable_uikit_circle_grey_200" id="0x7f08015f" />
-    <public type="drawable" name="drawable_uikit_green_button" id="0x7f080160" />
-    <public type="drawable" name="drawable_uikit_green_button_disabled" id="0x7f080161" />
-    <public type="drawable" name="drawable_uikit_green_button_pressed" id="0x7f080162" />
-    <public type="drawable" name="drawable_uikit_primary_100_bg_dark" id="0x7f080163" />
-    <public type="drawable" name="drawable_uikit_primary_100_button_outline" id="0x7f080164" />
-    <public type="drawable" name="drawable_uikit_primary_100_circle" id="0x7f080165" />
-    <public type="drawable" name="drawable_uikit_primary_200_bg_dark" id="0x7f080166" />
-    <public type="drawable" name="drawable_uikit_primary_300_bg_dark" id="0x7f080167" />
-    <public type="drawable" name="drawable_uikit_primary_400_bg_dark" id="0x7f080168" />
-    <public type="drawable" name="drawable_uikit_primary_500_bg_dark" id="0x7f080169" />
-    <public type="drawable" name="drawable_uikit_primary_500_button_outline" id="0x7f08016a" />
-    <public type="drawable" name="drawable_uikit_primary_500_circle" id="0x7f08016b" />
-    <public type="drawable" name="drawable_uikit_primary_600_bg_dark" id="0x7f08016c" />
-    <public type="drawable" name="drawable_uikit_primary_600_circle" id="0x7f08016d" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark" id="0x7f08016e" />
-    <public type="drawable" name="drawable_uikit_primary_630_bg_dark_bottom_corners" id="0x7f08016f" />
-    <public type="drawable" name="drawable_uikit_primary_630_circle" id="0x7f080170" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_green_outline" id="0x7f080171" />
-    <public type="drawable" name="drawable_uikit_primary_660_bg_outline" id="0x7f080172" />
-    <public type="drawable" name="drawable_uikit_primary_700_bg_dark" id="0x7f080173" />
-    <public type="drawable" name="drawable_uikit_primary_700_circle" id="0x7f080174" />
-    <public type="drawable" name="drawable_uikit_primary_800_bg_dark" id="0x7f080175" />
-    <public type="drawable" name="drawable_uikit_primary_800_circle" id="0x7f080176" />
-    <public type="drawable" name="drawable_uikit_primary_900_bg_dark" id="0x7f080177" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_bottom_corners" id="0x7f080178" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_green_outline" id="0x7f080179" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_bg_outline" id="0x7f08017a" />
-    <public type="drawable" name="drawable_uikit_primary_light_100_circle" id="0x7f08017b" />
-    <public type="drawable" name="drawable_uikit_primary_light_200_circle" id="0x7f08017c" />
-    <public type="drawable" name="drawable_uikit_primary_white_bg" id="0x7f08017d" />
-    <public type="drawable" name="drawable_uikit_red_button" id="0x7f08017e" />
-    <public type="drawable" name="drawable_uikit_red_button_disabled" id="0x7f08017f" />
-    <public type="drawable" name="drawable_uikit_red_button_pressed" id="0x7f080180" />
-    <public type="drawable" name="drawable_uikit_status_brand_button_outline" id="0x7f080181" />
-    <public type="drawable" name="drawable_uikit_status_green_500_a60" id="0x7f080182" />
-    <public type="drawable" name="drawable_uikit_status_green_500_button" id="0x7f080183" />
-    <public type="drawable" name="drawable_uikit_status_green_600_button" id="0x7f080184" />
-    <public type="drawable" name="drawable_uikit_status_green_button_outline" id="0x7f080185" />
-    <public type="drawable" name="drawable_uikit_status_primary_300_button_outline" id="0x7f080186" />
-    <public type="drawable" name="drawable_uikit_status_red_button_outline" id="0x7f080187" />
-    <public type="drawable" name="drawable_uikit_white_circle" id="0x7f080188" />
-    <public type="drawable" name="drawable_voice_indicator_not_speaking" id="0x7f080189" />
-    <public type="drawable" name="drawable_voice_indicator_speaking" id="0x7f08018a" />
-    <public type="drawable" name="drawable_voice_user_background_muted" id="0x7f08018b" />
-    <public type="drawable" name="drawable_voice_user_background_speaking" id="0x7f08018c" />
-    <public type="drawable" name="drawable_welcome_card_background" id="0x7f08018d" />
-    <public type="drawable" name="drawable_welcome_card_image_background" id="0x7f08018e" />
-    <public type="drawable" name="file_item_selection_indicator_btn" id="0x7f0801af" />
-    <public type="drawable" name="guild_use_cases_chat_bubble_32dp" id="0x7f0801b2" />
-    <public type="drawable" name="guild_use_cases_club_32dp" id="0x7f0801b3" />
-    <public type="drawable" name="guild_use_cases_gaming_32dp" id="0x7f0801b4" />
-    <public type="drawable" name="guild_use_cases_join_friend_32dp" id="0x7f0801b5" />
-    <public type="drawable" name="guild_use_cases_voice_chat_32dp" id="0x7f0801b6" />
-    <public type="drawable" name="ic_check_white_24dp" id="0x7f080230" />
-    <public type="drawable" name="ic_emoji_activity_dark" id="0x7f080259" />
-    <public type="drawable" name="ic_emoji_activity_light" id="0x7f08025a" />
-    <public type="drawable" name="ic_emoji_custom_dark" id="0x7f08025b" />
-    <public type="drawable" name="ic_emoji_custom_light" id="0x7f08025c" />
-    <public type="drawable" name="ic_emoji_flags_dark" id="0x7f08025d" />
-    <public type="drawable" name="ic_emoji_flags_light" id="0x7f08025e" />
-    <public type="drawable" name="ic_emoji_food_dark" id="0x7f08025f" />
-    <public type="drawable" name="ic_emoji_food_light" id="0x7f080260" />
-    <public type="drawable" name="ic_emoji_nature_dark" id="0x7f080261" />
-    <public type="drawable" name="ic_emoji_nature_light" id="0x7f080262" />
-    <public type="drawable" name="ic_emoji_objects_dark" id="0x7f080263" />
-    <public type="drawable" name="ic_emoji_objects_light" id="0x7f080264" />
-    <public type="drawable" name="ic_emoji_people_dark" id="0x7f080265" />
-    <public type="drawable" name="ic_emoji_people_light" id="0x7f080266" />
-    <public type="drawable" name="ic_emoji_recent_dark" id="0x7f080269" />
-    <public type="drawable" name="ic_emoji_recent_light" id="0x7f08026a" />
-    <public type="drawable" name="ic_emoji_symbols_dark" id="0x7f08026b" />
-    <public type="drawable" name="ic_emoji_symbols_light" id="0x7f08026c" />
-    <public type="drawable" name="ic_emoji_travel_dark" id="0x7f08026d" />
-    <public type="drawable" name="ic_emoji_travel_light" id="0x7f08026e" />
-    <public type="drawable" name="ic_headset_grey" id="0x7f0802b1" />
-    <public type="drawable" name="ic_headset_white" id="0x7f0802b5" />
-    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7f0802fc" />
-    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7f0802fd" />
-    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7f0802fe" />
-    <public type="drawable" name="ic_mute_state_grey" id="0x7f0802ff" />
-    <public type="drawable" name="ic_mute_state_white" id="0x7f080300" />
-    <public type="drawable" name="ic_speaker_grey" id="0x7f080378" />
-    <public type="drawable" name="ic_speaker_white" id="0x7f080379" />
-    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f08037e" />
-    <public type="drawable" name="ic_status_online_16dp" id="0x7f08037f" />
-    <public type="drawable" name="ic_take_photo" id="0x7f080387" />
-    <public type="drawable" name="ic_trash_outline" id="0x7f08039a" />
-    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f080427" />
-    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f080428" />
-    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f08043c" />
-    <public type="drawable" name="mtrl_snackbar_background" id="0x7f080461" />
-    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f080462" />
-    <public type="drawable" name="navigation_empty_icon" id="0x7f080463" />
-    <public type="drawable" name="notification_bg" id="0x7f080465" />
-    <public type="drawable" name="notification_bg_low" id="0x7f080466" />
-    <public type="drawable" name="notification_icon_background" id="0x7f08046b" />
-    <public type="drawable" name="notification_template_icon_bg" id="0x7f08046c" />
-    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f08046d" />
-    <public type="drawable" name="notification_tile_bg" id="0x7f08046e" />
-    <public type="drawable" name="reactions_divider" id="0x7f080470" />
-    <public type="drawable" name="rich_presence_spotify_play_button" id="0x7f080471" />
-    <public type="drawable" name="tab_dot_selector" id="0x7f080474" />
-    <public type="drawable" name="tab_indicator_default" id="0x7f080475" />
-    <public type="drawable" name="tab_indicator_selected" id="0x7f080476" />
-    <public type="drawable" name="tooltip_frame_dark" id="0x7f080477" />
-    <public type="drawable" name="tooltip_frame_light" id="0x7f080478" />
-    <public type="drawable" name="trash_bg" id="0x7f080479" />
-    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080482" />
-    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080483" />
-    <public type="drawable" name="ucrop_vector_loader" id="0x7f080484" />
-    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080485" />
+    <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="guild_use_cases_chat_bubble_32dp" id="0x7f0801bd" />
+    <public type="drawable" name="guild_use_cases_club_32dp" id="0x7f0801be" />
+    <public type="drawable" name="guild_use_cases_gaming_32dp" id="0x7f0801bf" />
+    <public type="drawable" name="guild_use_cases_join_friend_32dp" id="0x7f0801c0" />
+    <public type="drawable" name="guild_use_cases_voice_chat_32dp" id="0x7f0801c1" />
+    <public type="drawable" name="ic_check_white_24dp" id="0x7f08023b" />
+    <public type="drawable" name="ic_emoji_activity_dark" id="0x7f080265" />
+    <public type="drawable" name="ic_emoji_activity_light" id="0x7f080266" />
+    <public type="drawable" name="ic_emoji_custom_dark" id="0x7f080267" />
+    <public type="drawable" name="ic_emoji_custom_light" id="0x7f080268" />
+    <public type="drawable" name="ic_emoji_flags_dark" id="0x7f080269" />
+    <public type="drawable" name="ic_emoji_flags_light" id="0x7f08026a" />
+    <public type="drawable" name="ic_emoji_food_dark" id="0x7f08026b" />
+    <public type="drawable" name="ic_emoji_food_light" id="0x7f08026c" />
+    <public type="drawable" name="ic_emoji_nature_dark" id="0x7f08026d" />
+    <public type="drawable" name="ic_emoji_nature_light" id="0x7f08026e" />
+    <public type="drawable" name="ic_emoji_objects_dark" id="0x7f08026f" />
+    <public type="drawable" name="ic_emoji_objects_light" id="0x7f080270" />
+    <public type="drawable" name="ic_emoji_people_dark" id="0x7f080271" />
+    <public type="drawable" name="ic_emoji_people_light" id="0x7f080272" />
+    <public type="drawable" name="ic_emoji_recent_dark" id="0x7f080275" />
+    <public type="drawable" name="ic_emoji_recent_light" id="0x7f080276" />
+    <public type="drawable" name="ic_emoji_symbols_dark" id="0x7f080277" />
+    <public type="drawable" name="ic_emoji_symbols_light" id="0x7f080278" />
+    <public type="drawable" name="ic_emoji_travel_dark" id="0x7f080279" />
+    <public type="drawable" name="ic_emoji_travel_light" id="0x7f08027a" />
+    <public type="drawable" name="ic_headset_grey" id="0x7f0802bd" />
+    <public type="drawable" name="ic_headset_white" id="0x7f0802c1" />
+    <public type="drawable" name="ic_mtrl_chip_checked_black" id="0x7f080308" />
+    <public type="drawable" name="ic_mtrl_chip_checked_circle" id="0x7f080309" />
+    <public type="drawable" name="ic_mtrl_chip_close_circle" id="0x7f08030a" />
+    <public type="drawable" name="ic_mute_state_grey" id="0x7f08030b" />
+    <public type="drawable" name="ic_mute_state_white" id="0x7f08030c" />
+    <public type="drawable" name="ic_speaker_grey" id="0x7f080384" />
+    <public type="drawable" name="ic_speaker_white" id="0x7f080385" />
+    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f08038a" />
+    <public type="drawable" name="ic_status_online_16dp" id="0x7f08038b" />
+    <public type="drawable" name="ic_take_photo" id="0x7f080394" />
+    <public type="drawable" name="ic_trash_outline" id="0x7f0803a7" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f080435" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f080436" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f08044a" />
+    <public type="drawable" name="mtrl_snackbar_background" id="0x7f08046f" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f080470" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7f080471" />
+    <public type="drawable" name="notification_bg" id="0x7f080473" />
+    <public type="drawable" name="notification_bg_low" id="0x7f080474" />
+    <public type="drawable" name="notification_icon_background" id="0x7f080479" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7f08047a" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f08047b" />
+    <public type="drawable" name="notification_tile_bg" id="0x7f08047c" />
+    <public type="drawable" name="reactions_divider" id="0x7f08047e" />
+    <public type="drawable" name="rich_presence_spotify_play_button" id="0x7f08047f" />
+    <public type="drawable" name="tab_dot_selector" id="0x7f080482" />
+    <public type="drawable" name="tab_indicator_default" id="0x7f080483" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7f080484" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7f080485" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7f080486" />
+    <public type="drawable" name="trash_bg" id="0x7f080487" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080490" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080491" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7f080492" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080493" />
     <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="0x7f080464" />
-    <public type="drawable" name="ripple_brighten" id="0x7f080472" />
-    <public type="drawable" name="ripple_darken" id="0x7f080473" />
-    <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="0x7f0800ba" />
-    <public type="drawable" name="drawable_application_news_loading_light" id="0x7f0800bb" />
-    <public type="drawable" name="drawable_boost_remove" id="0x7f0800e6" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_dark" id="0x7f0800e7" />
-    <public type="drawable" name="drawable_boosted_guild_tier_0_light" id="0x7f0800e8" />
-    <public type="drawable" name="drawable_chip_delete" id="0x7f080103" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_dark" id="0x7f080126" />
-    <public type="drawable" name="drawable_ic_game_icon_placeholder_light" id="0x7f080127" />
-    <public type="drawable" name="drawable_ic_nitro" id="0x7f080128" />
-    <public type="drawable" name="drawable_ic_nitro_classic" id="0x7f080129" />
-    <public type="drawable" name="drawable_icon_sync_integration" id="0x7f08012d" />
-    <public type="drawable" name="drawable_nitro_server_boost" id="0x7f08012e" />
-    <public type="drawable" name="ic_account_bnet" id="0x7f0801b7" />
-    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7f0801b8" />
-    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7f0801b9" />
-    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7f0801ba" />
-    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7f0801bb" />
-    <public type="drawable" name="ic_account_facebook" id="0x7f0801bc" />
-    <public type="drawable" name="ic_account_google" id="0x7f0801bd" />
-    <public type="drawable" name="ic_account_lol" id="0x7f0801be" />
-    <public type="drawable" name="ic_account_microsoft" id="0x7f0801bf" />
-    <public type="drawable" name="ic_account_obs" id="0x7f0801c0" />
-    <public type="drawable" name="ic_account_patreon" id="0x7f0801c1" />
-    <public type="drawable" name="ic_account_reddit" id="0x7f0801c2" />
-    <public type="drawable" name="ic_account_skype" id="0x7f0801c3" />
-    <public type="drawable" name="ic_account_spotify" id="0x7f0801c4" />
-    <public type="drawable" name="ic_account_steam" id="0x7f0801c5" />
-    <public type="drawable" name="ic_account_twitch" id="0x7f0801c6" />
-    <public type="drawable" name="ic_account_twitter" id="0x7f0801c7" />
-    <public type="drawable" name="ic_account_xbox" id="0x7f0801c8" />
-    <public type="drawable" name="ic_account_xsplit" id="0x7f0801c9" />
-    <public type="drawable" name="ic_account_youtube" id="0x7f0801ca" />
-    <public type="drawable" name="ic_add_24dp" id="0x7f0801cb" />
-    <public type="drawable" name="ic_add_a_photo_24dp" id="0x7f0801cc" />
-    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7f0801cd" />
-    <public type="drawable" name="ic_add_circle_outline_white_24dp" id="0x7f0801ce" />
-    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7f0801cf" />
-    <public type="drawable" name="ic_add_grey_24dp" id="0x7f0801d0" />
-    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7f0801d1" />
-    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7f0801d2" />
-    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7f0801d3" />
-    <public type="drawable" name="ic_alert_circle_grey_14dp" id="0x7f0801d6" />
-    <public type="drawable" name="ic_alert_circle_yellow_14dp" id="0x7f0801d7" />
-    <public type="drawable" name="ic_arrow_back_24dp" id="0x7f0801d8" />
-    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7f0801d9" />
-    <public type="drawable" name="ic_arrow_back_grey_24dp" id="0x7f0801da" />
-    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7f0801db" />
-    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7f0801dc" />
-    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7f0801dd" />
-    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7f0801de" />
-    <public type="drawable" name="ic_attach_file_24dp" id="0x7f0801df" />
-    <public type="drawable" name="ic_attachment_grey_24dp" id="0x7f0801e0" />
-    <public type="drawable" name="ic_attachment_white_24dp" id="0x7f0801e1" />
-    <public type="drawable" name="ic_audio_24dp" id="0x7f0801e2" />
-    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7f0801e3" />
-    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7f0801e4" />
-    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7f0801e5" />
-    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7f0801e6" />
-    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7f0801e7" />
-    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7f0801e8" />
-    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7f0801e9" />
-    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7f0801ea" />
-    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7f0801eb" />
-    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7f0801ec" />
-    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7f0801ed" />
-    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7f0801ee" />
-    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7f0801ef" />
-    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7f0801f0" />
-    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7f0801f1" />
-    <public type="drawable" name="ic_audit_logs_dark_a60_24dp" id="0x7f0801f2" />
-    <public type="drawable" name="ic_audit_logs_light_a60_24dp" id="0x7f0801f3" />
-    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7f0801f4" />
-    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7f0801f5" />
-    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7f0801f6" />
-    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7f0801f7" />
-    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7f0801f8" />
-    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7f0801f9" />
-    <public type="drawable" name="ic_authed_apps_grey_a60_24dp" id="0x7f0801fa" />
-    <public type="drawable" name="ic_authed_apps_white_a60_24dp" id="0x7f0801fb" />
-    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7f0801fc" />
-    <public type="drawable" name="ic_backspace_white_24dp" id="0x7f0801fd" />
-    <public type="drawable" name="ic_ban_red_24dp" id="0x7f0801fe" />
-    <public type="drawable" name="ic_bans_dark_a60_24dp" id="0x7f0801ff" />
-    <public type="drawable" name="ic_bans_light_a60_24dp" id="0x7f080200" />
-    <public type="drawable" name="ic_behavior_dark_a60_24dp" id="0x7f080201" />
-    <public type="drawable" name="ic_behavior_light_a60_24dp" id="0x7f080202" />
-    <public type="drawable" name="ic_billing_dark_a60_20dp" id="0x7f080203" />
-    <public type="drawable" name="ic_billing_light_a60_20dp" id="0x7f080204" />
-    <public type="drawable" name="ic_bnet_white_24dp" id="0x7f080205" />
-    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7f080206" />
-    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7f080207" />
-    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7f080208" />
-    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7f080209" />
-    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7f08020a" />
-    <public type="drawable" name="ic_call_audio_stop_grey_24dp" id="0x7f08020b" />
-    <public type="drawable" name="ic_call_audio_stop_white_24dp" id="0x7f08020c" />
-    <public type="drawable" name="ic_call_end_red_24dp" id="0x7f08020d" />
-    <public type="drawable" name="ic_call_green_24dp" id="0x7f08020f" />
-    <public type="drawable" name="ic_call_grey_24dp" id="0x7f080210" />
-    <public type="drawable" name="ic_call_missed_grey_24dp" id="0x7f080211" />
-    <public type="drawable" name="ic_call_white_24dp" id="0x7f080212" />
-    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7f080213" />
-    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7f080214" />
-    <public type="drawable" name="ic_category_16dp" id="0x7f080215" />
-    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7f080216" />
-    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7f080217" />
-    <public type="drawable" name="ic_channel_lock_16dp" id="0x7f080218" />
-    <public type="drawable" name="ic_channel_text" id="0x7f08021a" />
-    <public type="drawable" name="ic_channel_text_16dp" id="0x7f08021b" />
-    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7f08021c" />
-    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7f08021d" />
-    <public type="drawable" name="ic_channel_text_locked" id="0x7f08021e" />
-    <public type="drawable" name="ic_channel_text_muted" id="0x7f08021f" />
-    <public type="drawable" name="ic_channel_text_nsfw" id="0x7f080220" />
-    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7f080221" />
-    <public type="drawable" name="ic_channel_voice" id="0x7f080222" />
-    <public type="drawable" name="ic_channel_voice_16dp" id="0x7f080223" />
-    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7f080224" />
-    <public type="drawable" name="ic_channel_voice_locked" id="0x7f080225" />
-    <public type="drawable" name="ic_channels_dark_a60_24dp" id="0x7f080226" />
-    <public type="drawable" name="ic_channels_light_a60_24dp" id="0x7f080227" />
-    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7f080228" />
-    <public type="drawable" name="ic_chat_bubble_white_24dp" id="0x7f080229" />
-    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7f08022a" />
-    <public type="drawable" name="ic_check_brand_24dp" id="0x7f08022b" />
-    <public type="drawable" name="ic_check_circle_24dp" id="0x7f08022c" />
-    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7f08022d" />
-    <public type="drawable" name="ic_check_green_24dp" id="0x7f08022e" />
-    <public type="drawable" name="ic_check_grey_24dp" id="0x7f08022f" />
-    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7f080231" />
-    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7f080232" />
-    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7f080233" />
-    <public type="drawable" name="ic_chevron_right_dark_grey_12dp" id="0x7f080234" />
-    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7f080235" />
-    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7f080236" />
-    <public type="drawable" name="ic_clear_24dp" id="0x7f080237" />
-    <public type="drawable" name="ic_clear_all_grey_24dp" id="0x7f080238" />
-    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7f080239" />
-    <public type="drawable" name="ic_clear_grey_24dp" id="0x7f08023a" />
-    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7f08023b" />
-    <public type="drawable" name="ic_clear_white_24dp" id="0x7f08023c" />
-    <public type="drawable" name="ic_close_24dp" id="0x7f08023d" />
-    <public type="drawable" name="ic_close_grey_24dp" id="0x7f08023e" />
-    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7f08023f" />
-    <public type="drawable" name="ic_close_white_24dp" id="0x7f080241" />
-    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7f080242" />
-    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7f080243" />
-    <public type="drawable" name="ic_creditcard_amex" id="0x7f080244" />
-    <public type="drawable" name="ic_creditcard_discover" id="0x7f080245" />
-    <public type="drawable" name="ic_creditcard_generic" id="0x7f080246" />
-    <public type="drawable" name="ic_creditcard_mastercard" id="0x7f080247" />
-    <public type="drawable" name="ic_creditcard_paypal" id="0x7f080248" />
-    <public type="drawable" name="ic_creditcard_visa" id="0x7f080249" />
-    <public type="drawable" name="ic_crown_24dp" id="0x7f08024a" />
-    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7f08024b" />
-    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7f08024c" />
-    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7f08024d" />
-    <public type="drawable" name="ic_delete_white_24dp" id="0x7f08024e" />
-    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7f08024f" />
-    <public type="drawable" name="ic_done_activated_24dp" id="0x7f080250" />
-    <public type="drawable" name="ic_done_green_24dp" id="0x7f080251" />
-    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7f080252" />
-    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7f080253" />
-    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7f080255" />
-    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7f080256" />
-    <public type="drawable" name="ic_embed_grey_24dp" id="0x7f080257" />
-    <public type="drawable" name="ic_embed_white_24dp" id="0x7f080258" />
-    <public type="drawable" name="ic_emoji_placeholder_primary_100" id="0x7f080267" />
-    <public type="drawable" name="ic_emoji_placeholder_primary_500" id="0x7f080268" />
-    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7f08026f" />
-    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7f080270" />
-    <public type="drawable" name="ic_exit_to_app_red_24dp" id="0x7f080271" />
-    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7f080272" />
-    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7f080273" />
-    <public type="drawable" name="ic_facebook_white_18dp" id="0x7f080274" />
-    <public type="drawable" name="ic_facebook_white_24dp" id="0x7f080275" />
-    <public type="drawable" name="ic_file_24dp" id="0x7f080276" />
-    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7f08027d" />
-    <public type="drawable" name="ic_file_download_white_24dp" id="0x7f08027e" />
-    <public type="drawable" name="ic_file_large_code" id="0x7f08027f" />
-    <public type="drawable" name="ic_file_large_document" id="0x7f080280" />
-    <public type="drawable" name="ic_file_large_video" id="0x7f080281" />
-    <public type="drawable" name="ic_file_upload_24dp" id="0x7f080285" />
-    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7f080288" />
-    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7f080289" />
-    <public type="drawable" name="ic_flash_auto_24dp" id="0x7f08028a" />
-    <public type="drawable" name="ic_flash_off_24dp" id="0x7f08028b" />
-    <public type="drawable" name="ic_flash_on_24dp" id="0x7f08028c" />
-    <public type="drawable" name="ic_game_controller_white_16dp" id="0x7f08028d" />
-    <public type="drawable" name="ic_games_dark_a60_24dp" id="0x7f08028e" />
-    <public type="drawable" name="ic_games_light_a60_24dp" id="0x7f08028f" />
-    <public type="drawable" name="ic_gem_tier_1" id="0x7f080290" />
-    <public type="drawable" name="ic_gem_tier_2" id="0x7f080291" />
-    <public type="drawable" name="ic_gem_tier_3" id="0x7f080292" />
-    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7f080293" />
-    <public type="drawable" name="ic_gif_24dp" id="0x7f080294" />
-    <public type="drawable" name="ic_gift_dark_a60_24dp" id="0x7f080295" />
-    <public type="drawable" name="ic_gift_light_a60_24dp" id="0x7f080296" />
-    <public type="drawable" name="ic_google_auth_logo" id="0x7f080297" />
-    <public type="drawable" name="ic_google_white_24dp" id="0x7f080298" />
-    <public type="drawable" name="ic_group_add_grey_24dp" id="0x7f080299" />
-    <public type="drawable" name="ic_group_add_white_24dp" id="0x7f08029a" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7f08029e" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7f08029f" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7f0802a0" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7f0802a1" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7f0802a2" />
-    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7f0802a3" />
-    <public type="drawable" name="ic_guild_folder" id="0x7f0802a4" />
-    <public type="drawable" name="ic_guild_nitro_24dp" id="0x7f0802a5" />
-    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7f0802a6" />
-    <public type="drawable" name="ic_guild_nitro_progress" id="0x7f0802a7" />
-    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7f0802a8" />
-    <public type="drawable" name="ic_header_members_add_grey_24dp" id="0x7f0802a9" />
-    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7f0802aa" />
-    <public type="drawable" name="ic_headset_24dp" id="0x7f0802ab" />
-    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7f0802ac" />
-    <public type="drawable" name="ic_headset_deafened_grey_red_24dp" id="0x7f0802ad" />
-    <public type="drawable" name="ic_headset_deafened_red_24dp" id="0x7f0802ae" />
-    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7f0802af" />
-    <public type="drawable" name="ic_headset_deafened_white_red_24dp" id="0x7f0802b0" />
-    <public type="drawable" name="ic_headset_grey_24dp" id="0x7f0802b2" />
-    <public type="drawable" name="ic_headset_grey_a30_24dp" id="0x7f0802b3" />
-    <public type="drawable" name="ic_headset_red_24dp" id="0x7f0802b4" />
-    <public type="drawable" name="ic_headset_white_18dp" id="0x7f0802b6" />
-    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7f0802b7" />
-    <public type="drawable" name="ic_headset_white_24dp" id="0x7f0802b8" />
-    <public type="drawable" name="ic_headset_white_a30_24dp" id="0x7f0802b9" />
-    <public type="drawable" name="ic_help_dark_a60_24dp" id="0x7f0802ba" />
-    <public type="drawable" name="ic_help_light_a60_24dp" id="0x7f0802bb" />
-    <public type="drawable" name="ic_help_outline_white_24dp" id="0x7f0802bc" />
-    <public type="drawable" name="ic_history_grey_24dp" id="0x7f0802bd" />
-    <public type="drawable" name="ic_history_white_24dp" id="0x7f0802be" />
-    <public type="drawable" name="ic_human_greeting_24dp" id="0x7f0802bf" />
-    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7f0802c0" />
-    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7f0802c2" />
-    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7f0802c4" />
-    <public type="drawable" name="ic_image_24dp" id="0x7f0802c6" />
-    <public type="drawable" name="ic_image_library_24dp" id="0x7f0802c7" />
-    <public type="drawable" name="ic_info_dark_a60_24dp" id="0x7f0802ca" />
-    <public type="drawable" name="ic_info_light_a60_24dp" id="0x7f0802cb" />
-    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7f0802cc" />
-    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7f0802cd" />
-    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7f0802ce" />
-    <public type="drawable" name="ic_insert_emoticon_24dp" id="0x7f0802cf" />
-    <public type="drawable" name="ic_instagram_white_18dp" id="0x7f0802d0" />
-    <public type="drawable" name="ic_integrations_dark_a60_24dp" id="0x7f0802d1" />
-    <public type="drawable" name="ic_integrations_light_a60_24dp" id="0x7f0802d2" />
-    <public type="drawable" name="ic_invites_dark_a60_24dp" id="0x7f0802d3" />
-    <public type="drawable" name="ic_invites_light_a60_24dp" id="0x7f0802d4" />
-    <public type="drawable" name="ic_keyboard_24dp" id="0x7f0802d5" />
-    <public type="drawable" name="ic_launch_24dp" id="0x7f0802d6" />
-    <public type="drawable" name="ic_link_dark_a60_24dp" id="0x7f0802d7" />
-    <public type="drawable" name="ic_link_light_a60_24dp" id="0x7f0802d8" />
-    <public type="drawable" name="ic_link_white_24dp" id="0x7f0802d9" />
-    <public type="drawable" name="ic_live_stream_white_24dp" id="0x7f0802da" />
-    <public type="drawable" name="ic_locale_dark_a60_24dp" id="0x7f0802db" />
-    <public type="drawable" name="ic_locale_light_a60_24dp" id="0x7f0802dc" />
-    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7f0802dd" />
-    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7f0802de" />
-    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7f0802df" />
-    <public type="drawable" name="ic_lol_white_24dp" id="0x7f0802e0" />
-    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7f0802e1" />
-    <public type="drawable" name="ic_members_dark_a60_24dp" id="0x7f0802e2" />
-    <public type="drawable" name="ic_members_dark_grey_24dp" id="0x7f0802e3" />
-    <public type="drawable" name="ic_members_grey_24dp" id="0x7f0802e4" />
-    <public type="drawable" name="ic_members_light_a60_24dp" id="0x7f0802e5" />
-    <public type="drawable" name="ic_members_white_24dp" id="0x7f0802e6" />
-    <public type="drawable" name="ic_mentions_grey_24dp" id="0x7f0802e7" />
-    <public type="drawable" name="ic_mentions_white_24dp" id="0x7f0802e8" />
-    <public type="drawable" name="ic_mentions_white_a60_24dp" id="0x7f0802e9" />
-    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7f0802ea" />
-    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7f0802eb" />
-    <public type="drawable" name="ic_message_white_18dp" id="0x7f0802ec" />
-    <public type="drawable" name="ic_mic_grey_24dp" id="0x7f0802ed" />
-    <public type="drawable" name="ic_mic_grey_a30_24dp" id="0x7f0802ee" />
-    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7f0802ef" />
-    <public type="drawable" name="ic_mic_muted_grey_red_24dp" id="0x7f0802f0" />
-    <public type="drawable" name="ic_mic_muted_red_24dp" id="0x7f0802f1" />
-    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7f0802f2" />
-    <public type="drawable" name="ic_mic_muted_white_red_24dp" id="0x7f0802f3" />
-    <public type="drawable" name="ic_mic_red_24dp" id="0x7f0802f4" />
-    <public type="drawable" name="ic_mic_white_18dp" id="0x7f0802f5" />
-    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7f0802f6" />
-    <public type="drawable" name="ic_mic_white_24dp" id="0x7f0802f7" />
-    <public type="drawable" name="ic_mic_white_a30_24dp" id="0x7f0802f8" />
-    <public type="drawable" name="ic_more_primary100_24dp" id="0x7f0802f9" />
-    <public type="drawable" name="ic_more_primary900_24dp" id="0x7f0802fa" />
-    <public type="drawable" name="ic_movie_24dp" id="0x7f0802fb" />
-    <public type="drawable" name="ic_my_account_dark_a60_24dp" id="0x7f080301" />
-    <public type="drawable" name="ic_my_account_light_a60_24dp" id="0x7f080302" />
-    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7f080303" />
-    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7f080304" />
-    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7f080305" />
-    <public type="drawable" name="ic_nitro_badge_white" id="0x7f080306" />
-    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7f080307" />
-    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7f080308" />
-    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7f080309" />
-    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7f08030a" />
-    <public type="drawable" name="ic_nitro_rep" id="0x7f08030b" />
-    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7f08030c" />
-    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7f08030d" />
-    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7f080312" />
-    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7f080313" />
-    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7f080314" />
-    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7f080315" />
-    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7f080316" />
-    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7f080317" />
-    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7f080318" />
-    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7f080319" />
-    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7f08031a" />
-    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7f08031b" />
-    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7f08031c" />
-    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7f08031d" />
-    <public type="drawable" name="ic_overlay_grey_24dp" id="0x7f08031f" />
-    <public type="drawable" name="ic_overlay_white_24dp" id="0x7f080320" />
-    <public type="drawable" name="ic_overview_dark_a60_24dp" id="0x7f080321" />
-    <public type="drawable" name="ic_overview_light_a60_24dp" id="0x7f080322" />
-    <public type="drawable" name="ic_partnered_badge" id="0x7f080323" />
-    <public type="drawable" name="ic_partnered_badge_banner" id="0x7f080324" />
-    <public type="drawable" name="ic_people_grey_24dp" id="0x7f080325" />
-    <public type="drawable" name="ic_people_white_24dp" id="0x7f080326" />
-    <public type="drawable" name="ic_perk_lock" id="0x7f080327" />
-    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7f080328" />
-    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7f080329" />
-    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7f08032a" />
-    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7f08032b" />
-    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7f08032c" />
-    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7f08032d" />
-    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7f08032e" />
-    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7f08032f" />
-    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7f080330" />
-    <public type="drawable" name="ic_person_add_white_24dp" id="0x7f080331" />
-    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7f080332" />
-    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7f080333" />
-    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7f080334" />
-    <public type="drawable" name="ic_phonelink_grey_a60_24dp" id="0x7f080335" />
-    <public type="drawable" name="ic_phonelink_white_a60_24dp" id="0x7f080336" />
-    <public type="drawable" name="ic_photo_grey_24dp" id="0x7f080337" />
-    <public type="drawable" name="ic_photo_white_24dp" id="0x7f080338" />
-    <public type="drawable" name="ic_pins_dark_a60_24dp" id="0x7f080339" />
-    <public type="drawable" name="ic_pins_light_a60_24dp" id="0x7f08033a" />
-    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7f08033b" />
-    <public type="drawable" name="ic_play_arrow_white_24dp" id="0x7f08033c" />
-    <public type="drawable" name="ic_play_circle_outline_grey_24dp" id="0x7f08033d" />
-    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7f08033e" />
-    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7f08033f" />
-    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7f080340" />
-    <public type="drawable" name="ic_popup_settings_grey_a60_24dp" id="0x7f080341" />
-    <public type="drawable" name="ic_popup_settings_white_a60_24dp" id="0x7f080342" />
-    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7f080343" />
-    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7f080344" />
-    <public type="drawable" name="ic_profile_badge_bughunter_32dp" id="0x7f080345" />
-    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7f080346" />
-    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f080347" />
-    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f080348" />
-    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7f080349" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7f08034a" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7f08034b" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7f08034c" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7f08034d" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7f08034e" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7f08034f" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7f080350" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7f080351" />
-    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7f080352" />
-    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7f080353" />
-    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7f080354" />
-    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7f080355" />
-    <public type="drawable" name="ic_reddit_white_24dp" id="0x7f080356" />
-    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7f080357" />
-    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7f080358" />
-    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7f080359" />
-    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7f08035a" />
-    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7f08035b" />
-    <public type="drawable" name="ic_role_24dp" id="0x7f08035c" />
-    <public type="drawable" name="ic_roles_dark_a60_24dp" id="0x7f08035e" />
-    <public type="drawable" name="ic_roles_light_a60_24dp" id="0x7f08035f" />
-    <public type="drawable" name="ic_search_grey_24dp" id="0x7f080361" />
-    <public type="drawable" name="ic_search_items_white_a60_24dp" id="0x7f080362" />
-    <public type="drawable" name="ic_search_white_24dp" id="0x7f080363" />
-    <public type="drawable" name="ic_security_dark_a60_24dp" id="0x7f080364" />
-    <public type="drawable" name="ic_security_light_a60_24dp" id="0x7f080365" />
-    <public type="drawable" name="ic_send_24dp" id="0x7f080366" />
-    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f080367" />
-    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f080369" />
-    <public type="drawable" name="ic_settings_boost_dark_a60_24dp" id="0x7f08036a" />
-    <public type="drawable" name="ic_settings_boost_light_a60_24dp" id="0x7f08036b" />
-    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f08036c" />
-    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f08036d" />
-    <public type="drawable" name="ic_share_grey_24dp" id="0x7f08036e" />
-    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f08036f" />
-    <public type="drawable" name="ic_share_white_24dp" id="0x7f080370" />
-    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f080371" />
-    <public type="drawable" name="ic_skype_white_24dp" id="0x7f080373" />
-    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f080374" />
-    <public type="drawable" name="ic_smile_24dp" id="0x7f080375" />
-    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f080376" />
-    <public type="drawable" name="ic_sort_white_24dp" id="0x7f080377" />
-    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f08037a" />
-    <public type="drawable" name="ic_star_24dp" id="0x7f08037b" />
-    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f08037c" />
-    <public type="drawable" name="ic_status_idle_16dp" id="0x7f08037d" />
-    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f080380" />
-    <public type="drawable" name="ic_steam" id="0x7f080381" />
-    <public type="drawable" name="ic_steam_white_24dp" id="0x7f080382" />
-    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f080383" />
-    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f080384" />
-    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080385" />
-    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080386" />
-    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f08038f" />
-    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f080390" />
-    <public type="drawable" name="ic_text_image_dark_a60_24dp" id="0x7f080391" />
-    <public type="drawable" name="ic_text_image_light_a60_24dp" id="0x7f080392" />
-    <public type="drawable" name="ic_theme_dark_a60_24dp" id="0x7f080393" />
-    <public type="drawable" name="ic_theme_light_a60_24dp" id="0x7f080394" />
-    <public type="drawable" name="ic_timer_dark" id="0x7f080395" />
-    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080396" />
-    <public type="drawable" name="ic_timer_light" id="0x7f080397" />
-    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080398" />
-    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080399" />
-    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f08039b" />
-    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f08039c" />
-    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f08039d" />
-    <public type="drawable" name="ic_unban_grey" id="0x7f08039f" />
-    <public type="drawable" name="ic_unread_white_9dp" id="0x7f0803a0" />
-    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f0803a1" />
-    <public type="drawable" name="ic_upload_24dp" id="0x7f0803a2" />
-    <public type="drawable" name="ic_upload_image_34dp" id="0x7f0803a3" />
-    <public type="drawable" name="ic_upload_image_40dp" id="0x7f0803a4" />
-    <public type="drawable" name="ic_uploads_file_dark" id="0x7f0803a5" />
-    <public type="drawable" name="ic_uploads_file_light" id="0x7f0803a6" />
-    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f0803a7" />
-    <public type="drawable" name="ic_uploads_generic_light" id="0x7f0803a8" />
-    <public type="drawable" name="ic_uploads_image_dark" id="0x7f0803a9" />
-    <public type="drawable" name="ic_uploads_image_light" id="0x7f0803aa" />
-    <public type="drawable" name="ic_uploads_video_dark" id="0x7f0803ab" />
-    <public type="drawable" name="ic_uploads_video_light" id="0x7f0803ac" />
-    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f0803ad" />
-    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f0803ae" />
-    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f0803af" />
-    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f0803b0" />
-    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f0803b1" />
-    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f0803b2" />
-    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f0803b3" />
-    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f0803b4" />
-    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f0803b5" />
-    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f0803b6" />
-    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f0803b7" />
-    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f0803b8" />
-    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f0803b9" />
-    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f0803ba" />
-    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f0803bb" />
-    <public type="drawable" name="ic_verified_badge" id="0x7f0803bc" />
-    <public type="drawable" name="ic_verified_badge_banner" id="0x7f0803bd" />
-    <public type="drawable" name="ic_videocam_dark_grey_24dp" id="0x7f0803be" />
-    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f0803bf" />
-    <public type="drawable" name="ic_videocam_off_grey_24dp" id="0x7f0803c0" />
-    <public type="drawable" name="ic_videocam_off_white_24dp" id="0x7f0803c1" />
-    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f0803c2" />
-    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f0803c3" />
-    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f0803c4" />
-    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f0803c5" />
-    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f0803c6" />
-    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f0803c7" />
-    <public type="drawable" name="ic_voice_quality_average" id="0x7f0803c8" />
-    <public type="drawable" name="ic_voice_quality_bad" id="0x7f0803c9" />
-    <public type="drawable" name="ic_voice_quality_fine" id="0x7f0803ca" />
-    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f0803cb" />
-    <public type="drawable" name="ic_voice_settings_dark_a60_24dp" id="0x7f0803cc" />
-    <public type="drawable" name="ic_voice_settings_light_a60_24dp" id="0x7f0803cd" />
-    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f0803ce" />
-    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f0803cf" />
-    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f0803d0" />
-    <public type="drawable" name="ic_volume_up_dark_grey_a30_24dp" id="0x7f0803d1" />
-    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f0803d2" />
-    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f0803d3" />
-    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f0803d4" />
-    <public type="drawable" name="ic_volume_up_white_a30_24dp" id="0x7f0803d5" />
-    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f0803d6" />
-    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f0803d7" />
-    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f0803d8" />
-    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f080403" />
-    <public type="drawable" name="img_addfriends_empty_light" id="0x7f080404" />
-    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f080405" />
-    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f080406" />
-    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f080407" />
-    <public type="drawable" name="img_auth_logo_x_samsung" id="0x7f08040f" />
-    <public type="drawable" name="img_avatar_upsell" id="0x7f080410" />
-    <public type="drawable" name="img_baddies_dark_theme" id="0x7f080411" />
-    <public type="drawable" name="img_baddies_light_theme" id="0x7f080412" />
-    <public type="drawable" name="img_badge_upsell" id="0x7f080413" />
-    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f080414" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f080415" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f080416" />
-    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f080417" />
-    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f080418" />
-    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f080419" />
-    <public type="drawable" name="img_empty_friends_none_light" id="0x7f08041a" />
-    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f08041b" />
-    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f08041c" />
-    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f08041d" />
-    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f08041e" />
-    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f080420" />
-    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f080421" />
-    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f080422" />
-    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f080423" />
-    <public type="drawable" name="img_forced_update_dark" id="0x7f080424" />
-    <public type="drawable" name="img_forced_update_light" id="0x7f080425" />
-    <public type="drawable" name="img_global_emoji_upsell" id="0x7f08042b" />
-    <public type="drawable" name="img_guild_use_cases" id="0x7f08042c" />
-    <public type="drawable" name="img_item_shop_dark" id="0x7f08042d" />
-    <public type="drawable" name="img_logo_discord_nitro" id="0x7f08042f" />
-    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f080430" />
-    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f080431" />
-    <public type="drawable" name="img_logo_nitro" id="0x7f080432" />
-    <public type="drawable" name="img_logo_nitro_classic" id="0x7f080433" />
-    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f080434" />
-    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f080435" />
-    <public type="drawable" name="img_logo_square" id="0x7f080436" />
-    <public type="drawable" name="img_mfa_dark" id="0x7f080437" />
-    <public type="drawable" name="img_mfa_light" id="0x7f080438" />
-    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f080439" />
-    <public type="drawable" name="img_new_tos_light_theme" id="0x7f08043a" />
-    <public type="drawable" name="img_nitro_broken_wheel" id="0x7f08043b" />
-    <public type="drawable" name="img_nitro_pattern" id="0x7f08043d" />
-    <public type="drawable" name="img_no_gifts" id="0x7f080440" />
-    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f080441" />
-    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f080442" />
-    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f080443" />
-    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f080444" />
-    <public type="drawable" name="img_no_stream_preview" id="0x7f080445" />
-    <public type="drawable" name="img_no_text_channels_dark" id="0x7f080446" />
-    <public type="drawable" name="img_no_text_channels_light" id="0x7f080447" />
-    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f080448" />
-    <public type="drawable" name="img_nsfw_light_theme" id="0x7f080449" />
-    <public type="drawable" name="img_plus_illo" id="0x7f08044c" />
-    <public type="drawable" name="img_poop_dark" id="0x7f08044d" />
-    <public type="drawable" name="img_poop_light" id="0x7f08044e" />
-    <public type="drawable" name="img_quick_switcher_empty" id="0x7f08044f" />
-    <public type="drawable" name="img_server_nitro_status" id="0x7f080450" />
-    <public type="drawable" name="img_tag_upsell" id="0x7f080451" />
-    <public type="drawable" name="img_upload_upsell" id="0x7f080452" />
-    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f080453" />
-    <public type="drawable" name="img_verify_email_light_theme" id="0x7f080454" />
-    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f080455" />
-    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f080456" />
-    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f08045a" />
-    <public type="drawable" name="img_wumpus_ball_light" id="0x7f08045b" />
-    <public type="drawable" name="img_wumpus_game_launcher" id="0x7f08045c" />
-    <public type="drawable" name="img_wumpus_jetpack" id="0x7f08045d" />
-    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f08045e" />
-    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f08045f" />
-    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f080460" />
-    <public type="drawable" name="ucrop_ic_angle" id="0x7f08047a" />
-    <public type="drawable" name="ucrop_ic_crop" id="0x7f08047b" />
-    <public type="drawable" name="ucrop_ic_cross" id="0x7f08047c" />
-    <public type="drawable" name="ucrop_ic_done" id="0x7f08047d" />
-    <public type="drawable" name="ucrop_ic_next" id="0x7f08047e" />
-    <public type="drawable" name="ucrop_ic_reset" id="0x7f08047f" />
-    <public type="drawable" name="ucrop_ic_rotate" id="0x7f080480" />
-    <public type="drawable" name="ucrop_ic_scale" id="0x7f080481" />
-    <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="0x7f0800a5" />
-    <public type="drawable" name="common_google_signin_btn_icon_light_normal_background" id="0x7f0800aa" />
-    <public type="drawable" name="common_google_signin_btn_text_dark_normal_background" id="0x7f0800ae" />
-    <public type="drawable" name="common_google_signin_btn_text_light_normal_background" id="0x7f0800b3" />
-    <public type="drawable" name="design_ic_visibility" id="0x7f0800b6" />
-    <public type="drawable" name="design_ic_visibility_off" id="0x7f0800b7" />
-    <public type="drawable" name="googleg_disabled_color_18" id="0x7f0801b0" />
-    <public type="drawable" name="googleg_standard_color_18" id="0x7f0801b1" />
-    <public type="drawable" name="ic_add_white_24dp" id="0x7f0801d5" />
-    <public type="drawable" name="notification_bg_low_normal" id="0x7f080467" />
-    <public type="drawable" name="notification_bg_low_pressed" id="0x7f080468" />
-    <public type="drawable" name="notification_bg_normal" id="0x7f080469" />
-    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f08046a" />
-    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f08046f" />
-    <public type="drawable" name="asset_security" id="0x7f080087" />
-    <public type="drawable" name="common_full_open_on_phone" id="0x7f0800a1" />
-    <public type="drawable" name="ic_role_lock" id="0x7f08035d" />
-    <public type="drawable" name="img_wump_trash_dark" id="0x7f080459" />
-    <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_default_avatar_80dp" id="0x7f080071" />
-    <public type="drawable" name="asset_empty_no_bans" id="0x7f080076" />
-    <public type="drawable" name="asset_empty_no_invites" id="0x7f080077" />
-    <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="0x7f08018f" />
-    <public type="drawable" name="emoji_activity_dark" id="0x7f080190" />
-    <public type="drawable" name="emoji_activity_light" id="0x7f080191" />
-    <public type="drawable" name="emoji_custom_color" id="0x7f080192" />
-    <public type="drawable" name="emoji_custom_dark" id="0x7f080193" />
-    <public type="drawable" name="emoji_custom_light" id="0x7f080194" />
-    <public type="drawable" name="emoji_flags_color" id="0x7f080195" />
-    <public type="drawable" name="emoji_flags_dark" id="0x7f080196" />
-    <public type="drawable" name="emoji_flags_light" id="0x7f080197" />
-    <public type="drawable" name="emoji_food_color" id="0x7f080198" />
-    <public type="drawable" name="emoji_food_dark" id="0x7f080199" />
-    <public type="drawable" name="emoji_food_light" id="0x7f08019a" />
-    <public type="drawable" name="emoji_nature_color" id="0x7f08019b" />
-    <public type="drawable" name="emoji_nature_dark" id="0x7f08019c" />
-    <public type="drawable" name="emoji_nature_light" id="0x7f08019d" />
-    <public type="drawable" name="emoji_object_color" id="0x7f08019e" />
-    <public type="drawable" name="emoji_object_dark" id="0x7f08019f" />
-    <public type="drawable" name="emoji_object_light" id="0x7f0801a0" />
-    <public type="drawable" name="emoji_people_color" id="0x7f0801a1" />
-    <public type="drawable" name="emoji_people_dark" id="0x7f0801a2" />
-    <public type="drawable" name="emoji_people_light" id="0x7f0801a3" />
-    <public type="drawable" name="emoji_recent_color" id="0x7f0801a4" />
-    <public type="drawable" name="emoji_recent_dark" id="0x7f0801a5" />
-    <public type="drawable" name="emoji_recent_light" id="0x7f0801a6" />
-    <public type="drawable" name="emoji_symbol_color" id="0x7f0801a7" />
-    <public type="drawable" name="emoji_symbol_dark" id="0x7f0801a8" />
-    <public type="drawable" name="emoji_symbol_light" id="0x7f0801a9" />
-    <public type="drawable" name="emoji_travel_color" id="0x7f0801aa" />
-    <public type="drawable" name="emoji_travel_dark" id="0x7f0801ab" />
-    <public type="drawable" name="emoji_travel_light" id="0x7f0801ac" />
-    <public type="drawable" name="empty_pins_dark" id="0x7f0801ad" />
-    <public type="drawable" name="empty_pins_light" id="0x7f0801ae" />
-    <public type="drawable" name="ic_channel_pinned_message" id="0x7f080219" />
-    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7f080254" />
-    <public type="drawable" name="ic_file_acrobat" id="0x7f080277" />
-    <public type="drawable" name="ic_file_ae" id="0x7f080278" />
-    <public type="drawable" name="ic_file_ai" id="0x7f080279" />
-    <public type="drawable" name="ic_file_archive" id="0x7f08027a" />
-    <public type="drawable" name="ic_file_code" id="0x7f08027b" />
-    <public type="drawable" name="ic_file_document" id="0x7f08027c" />
-    <public type="drawable" name="ic_file_sketch" id="0x7f080282" />
-    <public type="drawable" name="ic_file_spreadsheet" id="0x7f080283" />
-    <public type="drawable" name="ic_file_unknown" id="0x7f080284" />
-    <public type="drawable" name="ic_file_video" id="0x7f080286" />
-    <public type="drawable" name="ic_file_webcode" id="0x7f080287" />
-    <public type="drawable" name="ic_group_edit" id="0x7f08029b" />
-    <public type="drawable" name="ic_group_join" id="0x7f08029c" />
-    <public type="drawable" name="ic_group_leave" id="0x7f08029d" />
-    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f0802c8" />
-    <public type="drawable" name="ic_img_selected_light_theme" id="0x7f0802c9" />
-    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f080388" />
-    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f080389" />
-    <public type="drawable" name="ic_ternary_off_checked" id="0x7f08038a" />
-    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f08038b" />
-    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f08038c" />
-    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08038d" />
-    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08038e" />
-    <public type="drawable" name="img_empty_no_connections" id="0x7f08041f" />
-    <public type="drawable" name="img_nitro_splash_dark" id="0x7f08043e" />
-    <public type="drawable" name="img_nitro_splash_light" id="0x7f08043f" />
-    <public type="drawable" name="img_permission_prime" id="0x7f08044b" />
-    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f080457" />
-    <public type="drawable" name="img_voice_no_connections_light" id="0x7f080458" />
-    <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="0x7f080079" />
-    <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="0x7f080111" />
-    <public type="drawable" name="ic_add_server_46dp" id="0x7f0801d4" />
-    <public type="drawable" name="ic_call_end_white_24dp" id="0x7f08020e" />
-    <public type="drawable" name="ic_close_white_18dp" id="0x7f080240" />
-    <public type="drawable" name="ic_notification_24dp" id="0x7f08030e" />
-    <public type="drawable" name="ic_notification_call_24dp" id="0x7f08030f" />
-    <public type="drawable" name="ic_notification_friends_24dp" id="0x7f080310" />
-    <public type="drawable" name="ic_notification_message_24dp" id="0x7f080311" />
-    <public type="drawable" name="ic_search" id="0x7f080360" />
-    <public type="drawable" name="ic_send_white_24dp" id="0x7f080368" />
-    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f080372" />
-    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f08039e" />
-    <public type="drawable" name="icon_flag_au" id="0x7f0803db" />
-    <public type="drawable" name="icon_flag_bg" id="0x7f0803dc" />
-    <public type="drawable" name="icon_flag_cs" id="0x7f0803dd" />
-    <public type="drawable" name="icon_flag_da" id="0x7f0803de" />
-    <public type="drawable" name="icon_flag_de" id="0x7f0803df" />
-    <public type="drawable" name="icon_flag_el" id="0x7f0803e0" />
-    <public type="drawable" name="icon_flag_en_gb" id="0x7f0803e1" />
-    <public type="drawable" name="icon_flag_en_us" id="0x7f0803e2" />
-    <public type="drawable" name="icon_flag_es_es" id="0x7f0803e3" />
-    <public type="drawable" name="icon_flag_eu" id="0x7f0803e4" />
-    <public type="drawable" name="icon_flag_fi" id="0x7f0803e5" />
-    <public type="drawable" name="icon_flag_fr" id="0x7f0803e6" />
-    <public type="drawable" name="icon_flag_gb" id="0x7f0803e7" />
-    <public type="drawable" name="icon_flag_hk" id="0x7f0803e8" />
-    <public type="drawable" name="icon_flag_hr" id="0x7f0803e9" />
-    <public type="drawable" name="icon_flag_hu" id="0x7f0803ea" />
-    <public type="drawable" name="icon_flag_it" id="0x7f0803eb" />
-    <public type="drawable" name="icon_flag_ja" id="0x7f0803ec" />
-    <public type="drawable" name="icon_flag_ko" id="0x7f0803ed" />
-    <public type="drawable" name="icon_flag_lt" id="0x7f0803ee" />
-    <public type="drawable" name="icon_flag_nl" id="0x7f0803ef" />
-    <public type="drawable" name="icon_flag_no" id="0x7f0803f0" />
-    <public type="drawable" name="icon_flag_pl" id="0x7f0803f1" />
-    <public type="drawable" name="icon_flag_pt_br" id="0x7f0803f2" />
-    <public type="drawable" name="icon_flag_ro" id="0x7f0803f3" />
-    <public type="drawable" name="icon_flag_ru" id="0x7f0803f4" />
-    <public type="drawable" name="icon_flag_sg" id="0x7f0803f5" />
-    <public type="drawable" name="icon_flag_sv_se" id="0x7f0803f6" />
-    <public type="drawable" name="icon_flag_th" id="0x7f0803f7" />
-    <public type="drawable" name="icon_flag_tr" id="0x7f0803f8" />
-    <public type="drawable" name="icon_flag_uk" id="0x7f0803f9" />
-    <public type="drawable" name="icon_flag_unknown" id="0x7f0803fa" />
-    <public type="drawable" name="icon_flag_vi" id="0x7f0803fb" />
-    <public type="drawable" name="icon_flag_zh_cn" id="0x7f0803fc" />
-    <public type="drawable" name="icon_flag_zh_tw" id="0x7f0803fd" />
-    <public type="drawable" name="img_auth_bg_dark" id="0x7f08040a" />
-    <public type="drawable" name="img_auth_bg_light" id="0x7f08040b" />
-    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f080429" />
-    <public type="drawable" name="img_gifting_pattern_light" id="0x7f08042a" />
-    <public type="drawable" name="img_loading_clyde" id="0x7f08042e" />
-    <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7f080072" />
-    <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7f080073" />
-    <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7f080074" />
-    <public type="drawable" name="asset_empty_mentions_hand_light" id="0x7f080075" />
-    <public type="drawable" name="asset_image_loading" id="0x7f08007a" />
-    <public type="drawable" name="asset_image_loading_spinner" id="0x7f08007b" />
-    <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="0x7f0802c1" />
-    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f0802c3" />
-    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f0802c5" />
-    <public type="drawable" name="ic_overflow_grey" id="0x7f08031e" />
-    <public type="drawable" name="icon_carrot" id="0x7f0803d9" />
-    <public type="drawable" name="icon_deafened_small" id="0x7f0803da" />
-    <public type="drawable" name="icon_friends_list" id="0x7f0803fe" />
-    <public type="drawable" name="icon_menu_copy" id="0x7f0803ff" />
-    <public type="drawable" name="icon_more" id="0x7f080400" />
-    <public type="drawable" name="icon_muted_small" id="0x7f080401" />
-    <public type="drawable" name="icon_save" id="0x7f080402" />
-    <public type="drawable" name="img_auth_bg_bl" id="0x7f080408" />
-    <public type="drawable" name="img_auth_bg_br" id="0x7f080409" />
-    <public type="drawable" name="img_auth_bg_tr" id="0x7f08040c" />
-    <public type="drawable" name="img_auth_logo" id="0x7f08040d" />
-    <public type="drawable" name="img_auth_logo_small" id="0x7f08040e" />
-    <public type="drawable" name="img_game_presence_nux" id="0x7f080426" />
-    <public type="drawable" name="img_overlay_nux" id="0x7f08044a" />
+    <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="0x7f080472" />
+    <public type="drawable" name="ripple_brighten" id="0x7f080480" />
+    <public type="drawable" name="ripple_darken" id="0x7f080481" />
+    <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="0x7f0801c2" />
+    <public type="drawable" name="ic_account_circle_grey_24dp" id="0x7f0801c3" />
+    <public type="drawable" name="ic_account_circle_light_grey_24dp" id="0x7f0801c4" />
+    <public type="drawable" name="ic_account_circle_white_24dp" id="0x7f0801c5" />
+    <public type="drawable" name="ic_account_circle_white_a60_24dp" id="0x7f0801c6" />
+    <public type="drawable" name="ic_account_facebook" id="0x7f0801c7" />
+    <public type="drawable" name="ic_account_google" id="0x7f0801c8" />
+    <public type="drawable" name="ic_account_lol" id="0x7f0801c9" />
+    <public type="drawable" name="ic_account_microsoft" id="0x7f0801ca" />
+    <public type="drawable" name="ic_account_obs" id="0x7f0801cb" />
+    <public type="drawable" name="ic_account_patreon" id="0x7f0801cc" />
+    <public type="drawable" name="ic_account_reddit" id="0x7f0801cd" />
+    <public type="drawable" name="ic_account_skype" id="0x7f0801ce" />
+    <public type="drawable" name="ic_account_spotify" id="0x7f0801cf" />
+    <public type="drawable" name="ic_account_steam" id="0x7f0801d0" />
+    <public type="drawable" name="ic_account_twitch" id="0x7f0801d1" />
+    <public type="drawable" name="ic_account_twitter" id="0x7f0801d2" />
+    <public type="drawable" name="ic_account_xbox" id="0x7f0801d3" />
+    <public type="drawable" name="ic_account_xsplit" id="0x7f0801d4" />
+    <public type="drawable" name="ic_account_youtube" id="0x7f0801d5" />
+    <public type="drawable" name="ic_add_24dp" id="0x7f0801d6" />
+    <public type="drawable" name="ic_add_a_photo_24dp" id="0x7f0801d7" />
+    <public type="drawable" name="ic_add_circle_outline_grey_a60_24dp" id="0x7f0801d8" />
+    <public type="drawable" name="ic_add_circle_outline_white_24dp" id="0x7f0801d9" />
+    <public type="drawable" name="ic_add_circle_outline_white_a60_24dp" id="0x7f0801da" />
+    <public type="drawable" name="ic_add_grey_24dp" id="0x7f0801db" />
+    <public type="drawable" name="ic_add_reaction_grey_16dp" id="0x7f0801dc" />
+    <public type="drawable" name="ic_add_reaction_grey_a60_24dp" id="0x7f0801dd" />
+    <public type="drawable" name="ic_add_reaction_white_a60_24dp" id="0x7f0801de" />
+    <public type="drawable" name="ic_alert_circle_grey_14dp" id="0x7f0801e1" />
+    <public type="drawable" name="ic_alert_circle_yellow_14dp" id="0x7f0801e2" />
+    <public type="drawable" name="ic_arrow_back_24dp" id="0x7f0801e3" />
+    <public type="drawable" name="ic_arrow_back_dark_grey_24dp" id="0x7f0801e4" />
+    <public type="drawable" name="ic_arrow_back_grey_24dp" id="0x7f0801e5" />
+    <public type="drawable" name="ic_arrow_back_white_24dp" id="0x7f0801e6" />
+    <public type="drawable" name="ic_arrow_downward_white_16dp" id="0x7f0801e7" />
+    <public type="drawable" name="ic_arrow_drop_down_white_18dp" id="0x7f0801e8" />
+    <public type="drawable" name="ic_arrow_upward_white_16dp" id="0x7f0801e9" />
+    <public type="drawable" name="ic_attach_file_24dp" id="0x7f0801ea" />
+    <public type="drawable" name="ic_attachment_grey_24dp" id="0x7f0801eb" />
+    <public type="drawable" name="ic_attachment_white_24dp" id="0x7f0801ec" />
+    <public type="drawable" name="ic_audio_24dp" id="0x7f0801ed" />
+    <public type="drawable" name="ic_audit_all_grey_24dp" id="0x7f0801ee" />
+    <public type="drawable" name="ic_audit_all_white_24dp" id="0x7f0801ef" />
+    <public type="drawable" name="ic_audit_audit_create_24dp" id="0x7f0801f0" />
+    <public type="drawable" name="ic_audit_audit_delete_24dp" id="0x7f0801f1" />
+    <public type="drawable" name="ic_audit_audit_update_24dp" id="0x7f0801f2" />
+    <public type="drawable" name="ic_audit_channels_grey_24dp" id="0x7f0801f3" />
+    <public type="drawable" name="ic_audit_channels_white_24dp" id="0x7f0801f4" />
+    <public type="drawable" name="ic_audit_chat_grey_24dp" id="0x7f0801f5" />
+    <public type="drawable" name="ic_audit_chat_white_24dp" id="0x7f0801f6" />
+    <public type="drawable" name="ic_audit_emoji_grey_24dp" id="0x7f0801f7" />
+    <public type="drawable" name="ic_audit_emoji_white_24dp" id="0x7f0801f8" />
+    <public type="drawable" name="ic_audit_guild_grey_24dp" id="0x7f0801f9" />
+    <public type="drawable" name="ic_audit_guild_white_24dp" id="0x7f0801fa" />
+    <public type="drawable" name="ic_audit_invites_grey_24dp" id="0x7f0801fb" />
+    <public type="drawable" name="ic_audit_invites_white_24dp" id="0x7f0801fc" />
+    <public type="drawable" name="ic_audit_logs_dark_a60_24dp" id="0x7f0801fd" />
+    <public type="drawable" name="ic_audit_logs_light_a60_24dp" id="0x7f0801fe" />
+    <public type="drawable" name="ic_audit_members_grey_24dp" id="0x7f0801ff" />
+    <public type="drawable" name="ic_audit_members_white_24dp" id="0x7f080200" />
+    <public type="drawable" name="ic_audit_roles_grey_24dp" id="0x7f080201" />
+    <public type="drawable" name="ic_audit_roles_white_24dp" id="0x7f080202" />
+    <public type="drawable" name="ic_audit_webhook_grey_24dp" id="0x7f080203" />
+    <public type="drawable" name="ic_audit_webhook_white_24dp" id="0x7f080204" />
+    <public type="drawable" name="ic_authed_apps_grey_a60_24dp" id="0x7f080205" />
+    <public type="drawable" name="ic_authed_apps_white_a60_24dp" id="0x7f080206" />
+    <public type="drawable" name="ic_backspace_grey_24dp" id="0x7f080207" />
+    <public type="drawable" name="ic_backspace_white_24dp" id="0x7f080208" />
+    <public type="drawable" name="ic_ban_red_24dp" id="0x7f080209" />
+    <public type="drawable" name="ic_bans_dark_a60_24dp" id="0x7f08020a" />
+    <public type="drawable" name="ic_bans_light_a60_24dp" id="0x7f08020b" />
+    <public type="drawable" name="ic_behavior_dark_a60_24dp" id="0x7f08020c" />
+    <public type="drawable" name="ic_behavior_light_a60_24dp" id="0x7f08020d" />
+    <public type="drawable" name="ic_billing_dark_a60_20dp" id="0x7f08020e" />
+    <public type="drawable" name="ic_billing_light_a60_20dp" id="0x7f08020f" />
+    <public type="drawable" name="ic_bnet_white_24dp" id="0x7f080210" />
+    <public type="drawable" name="ic_boosted_badge_12dp" id="0x7f080211" />
+    <public type="drawable" name="ic_boosted_badge_24dp" id="0x7f080212" />
+    <public type="drawable" name="ic_boosted_guild_tier_1" id="0x7f080213" />
+    <public type="drawable" name="ic_boosted_guild_tier_2" id="0x7f080214" />
+    <public type="drawable" name="ic_boosted_guild_tier_3" id="0x7f080215" />
+    <public type="drawable" name="ic_call_audio_stop_grey_24dp" id="0x7f080216" />
+    <public type="drawable" name="ic_call_audio_stop_white_24dp" id="0x7f080217" />
+    <public type="drawable" name="ic_call_end_red_24dp" id="0x7f080218" />
+    <public type="drawable" name="ic_call_green_24dp" id="0x7f08021a" />
+    <public type="drawable" name="ic_call_grey_24dp" id="0x7f08021b" />
+    <public type="drawable" name="ic_call_missed_grey_24dp" id="0x7f08021c" />
+    <public type="drawable" name="ic_call_white_24dp" id="0x7f08021d" />
+    <public type="drawable" name="ic_camera_front_white_24dp" id="0x7f08021e" />
+    <public type="drawable" name="ic_camera_rear_white_24dp" id="0x7f08021f" />
+    <public type="drawable" name="ic_category_16dp" id="0x7f080220" />
+    <public type="drawable" name="ic_category_grey_a60_24dp" id="0x7f080221" />
+    <public type="drawable" name="ic_category_white_a60_24dp" id="0x7f080222" />
+    <public type="drawable" name="ic_channel_lock_16dp" id="0x7f080223" />
+    <public type="drawable" name="ic_channel_text" id="0x7f080225" />
+    <public type="drawable" name="ic_channel_text_16dp" id="0x7f080226" />
+    <public type="drawable" name="ic_channel_text_grey_18dp" id="0x7f080227" />
+    <public type="drawable" name="ic_channel_text_grey_a60_24dp" id="0x7f080228" />
+    <public type="drawable" name="ic_channel_text_locked" id="0x7f080229" />
+    <public type="drawable" name="ic_channel_text_muted" id="0x7f08022a" />
+    <public type="drawable" name="ic_channel_text_nsfw" id="0x7f08022b" />
+    <public type="drawable" name="ic_channel_text_white_a60_24dp" id="0x7f08022c" />
+    <public type="drawable" name="ic_channel_voice" id="0x7f08022d" />
+    <public type="drawable" name="ic_channel_voice_16dp" id="0x7f08022e" />
+    <public type="drawable" name="ic_channel_voice_grey_18dp" id="0x7f08022f" />
+    <public type="drawable" name="ic_channel_voice_locked" id="0x7f080230" />
+    <public type="drawable" name="ic_channels_dark_a60_24dp" id="0x7f080231" />
+    <public type="drawable" name="ic_channels_light_a60_24dp" id="0x7f080232" />
+    <public type="drawable" name="ic_chat_bubble_light_grey_24dp" id="0x7f080233" />
+    <public type="drawable" name="ic_chat_bubble_white_24dp" id="0x7f080234" />
+    <public type="drawable" name="ic_chat_bubble_white_a60_24dp" id="0x7f080235" />
+    <public type="drawable" name="ic_check_brand_24dp" id="0x7f080236" />
+    <public type="drawable" name="ic_check_circle_24dp" id="0x7f080237" />
+    <public type="drawable" name="ic_check_circle_green_24dp" id="0x7f080238" />
+    <public type="drawable" name="ic_check_green_24dp" id="0x7f080239" />
+    <public type="drawable" name="ic_check_grey_24dp" id="0x7f08023a" />
+    <public type="drawable" name="ic_chevron_down_dark_grey_12dp" id="0x7f08023c" />
+    <public type="drawable" name="ic_chevron_down_grey_12dp" id="0x7f08023d" />
+    <public type="drawable" name="ic_chevron_down_primary_300_12dp" id="0x7f08023e" />
+    <public type="drawable" name="ic_chevron_down_white_12dp" id="0x7f08023f" />
+    <public type="drawable" name="ic_chevron_right_dark_grey_12dp" id="0x7f080240" />
+    <public type="drawable" name="ic_chevron_right_grey_12dp" id="0x7f080241" />
+    <public type="drawable" name="ic_chevron_right_primary_300_12dp" id="0x7f080242" />
+    <public type="drawable" name="ic_clear_24dp" id="0x7f080243" />
+    <public type="drawable" name="ic_clear_all_grey_24dp" id="0x7f080244" />
+    <public type="drawable" name="ic_clear_all_white_24dp" id="0x7f080245" />
+    <public type="drawable" name="ic_clear_grey_24dp" id="0x7f080246" />
+    <public type="drawable" name="ic_clear_primary_300_24dp" id="0x7f080247" />
+    <public type="drawable" name="ic_clear_white_24dp" id="0x7f080248" />
+    <public type="drawable" name="ic_close_24dp" id="0x7f080249" />
+    <public type="drawable" name="ic_close_grey_24dp" id="0x7f08024a" />
+    <public type="drawable" name="ic_close_primary_200_24dp" id="0x7f08024b" />
+    <public type="drawable" name="ic_close_white_24dp" id="0x7f08024d" />
+    <public type="drawable" name="ic_content_copy_grey_a60_24dp" id="0x7f08024e" />
+    <public type="drawable" name="ic_content_copy_white_a60_24dp" id="0x7f08024f" />
+    <public type="drawable" name="ic_creditcard_amex" id="0x7f080250" />
+    <public type="drawable" name="ic_creditcard_discover" id="0x7f080251" />
+    <public type="drawable" name="ic_creditcard_generic" id="0x7f080252" />
+    <public type="drawable" name="ic_creditcard_mastercard" id="0x7f080253" />
+    <public type="drawable" name="ic_creditcard_paypal" id="0x7f080254" />
+    <public type="drawable" name="ic_creditcard_visa" id="0x7f080255" />
+    <public type="drawable" name="ic_crown_24dp" id="0x7f080256" />
+    <public type="drawable" name="ic_delete_grey_a60_24dp" id="0x7f080257" />
+    <public type="drawable" name="ic_delete_sweep_primary_100_a60_24dp" id="0x7f080258" />
+    <public type="drawable" name="ic_delete_sweep_primary_500_a60_24dp" id="0x7f080259" />
+    <public type="drawable" name="ic_delete_white_24dp" id="0x7f08025a" />
+    <public type="drawable" name="ic_delete_white_a60_24dp" id="0x7f08025b" />
+    <public type="drawable" name="ic_done_activated_24dp" id="0x7f08025c" />
+    <public type="drawable" name="ic_done_green_24dp" id="0x7f08025d" />
+    <public type="drawable" name="ic_drag_handle_grey_a60_24dp" id="0x7f08025e" />
+    <public type="drawable" name="ic_drag_handle_white_a60_24dp" id="0x7f08025f" />
+    <public type="drawable" name="ic_edit_grey_a60_24dp" id="0x7f080261" />
+    <public type="drawable" name="ic_edit_white_a60_24dp" id="0x7f080262" />
+    <public type="drawable" name="ic_embed_grey_24dp" id="0x7f080263" />
+    <public type="drawable" name="ic_embed_white_24dp" id="0x7f080264" />
+    <public type="drawable" name="ic_emoji_placeholder_primary_100" id="0x7f080273" />
+    <public type="drawable" name="ic_emoji_placeholder_primary_500" id="0x7f080274" />
+    <public type="drawable" name="ic_exit_to_app_dark_24dp" id="0x7f08027b" />
+    <public type="drawable" name="ic_exit_to_app_light_24dp" id="0x7f08027c" />
+    <public type="drawable" name="ic_exit_to_app_red_24dp" id="0x7f08027d" />
+    <public type="drawable" name="ic_expand_less_grey_24dp" id="0x7f08027e" />
+    <public type="drawable" name="ic_expand_less_white_24dp" id="0x7f08027f" />
+    <public type="drawable" name="ic_facebook_white_18dp" id="0x7f080280" />
+    <public type="drawable" name="ic_facebook_white_24dp" id="0x7f080281" />
+    <public type="drawable" name="ic_file_24dp" id="0x7f080282" />
+    <public type="drawable" name="ic_file_download_grey_24dp" id="0x7f080289" />
+    <public type="drawable" name="ic_file_download_white_24dp" id="0x7f08028a" />
+    <public type="drawable" name="ic_file_large_code" id="0x7f08028b" />
+    <public type="drawable" name="ic_file_large_document" id="0x7f08028c" />
+    <public type="drawable" name="ic_file_large_video" id="0x7f08028d" />
+    <public type="drawable" name="ic_file_upload_24dp" id="0x7f080291" />
+    <public type="drawable" name="ic_filter_list_grey_24dp" id="0x7f080294" />
+    <public type="drawable" name="ic_filter_list_white_24dp" id="0x7f080295" />
+    <public type="drawable" name="ic_flash_auto_24dp" id="0x7f080296" />
+    <public type="drawable" name="ic_flash_off_24dp" id="0x7f080297" />
+    <public type="drawable" name="ic_flash_on_24dp" id="0x7f080298" />
+    <public type="drawable" name="ic_game_controller_white_16dp" id="0x7f080299" />
+    <public type="drawable" name="ic_games_dark_a60_24dp" id="0x7f08029a" />
+    <public type="drawable" name="ic_games_light_a60_24dp" id="0x7f08029b" />
+    <public type="drawable" name="ic_gem_tier_1" id="0x7f08029c" />
+    <public type="drawable" name="ic_gem_tier_2" id="0x7f08029d" />
+    <public type="drawable" name="ic_gem_tier_3" id="0x7f08029e" />
+    <public type="drawable" name="ic_gem_tier_3_boosted" id="0x7f08029f" />
+    <public type="drawable" name="ic_gif_24dp" id="0x7f0802a0" />
+    <public type="drawable" name="ic_gift_dark_a60_24dp" id="0x7f0802a1" />
+    <public type="drawable" name="ic_gift_light_a60_24dp" id="0x7f0802a2" />
+    <public type="drawable" name="ic_google_auth_logo" id="0x7f0802a3" />
+    <public type="drawable" name="ic_google_white_24dp" id="0x7f0802a4" />
+    <public type="drawable" name="ic_group_add_grey_24dp" id="0x7f0802a5" />
+    <public type="drawable" name="ic_group_add_white_24dp" id="0x7f0802a6" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1" id="0x7f0802aa" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_1_banner" id="0x7f0802ab" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2" id="0x7f0802ac" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_2_banner" id="0x7f0802ad" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3" id="0x7f0802ae" />
+    <public type="drawable" name="ic_guild_badge_premium_tier_3_banner" id="0x7f0802af" />
+    <public type="drawable" name="ic_guild_folder" id="0x7f0802b0" />
+    <public type="drawable" name="ic_guild_nitro_24dp" id="0x7f0802b1" />
+    <public type="drawable" name="ic_guild_nitro_perk_stream_24dp" id="0x7f0802b2" />
+    <public type="drawable" name="ic_guild_nitro_progress" id="0x7f0802b3" />
+    <public type="drawable" name="ic_guild_nitro_progress_banner" id="0x7f0802b4" />
+    <public type="drawable" name="ic_header_members_add_grey_24dp" id="0x7f0802b5" />
+    <public type="drawable" name="ic_header_members_add_white_24dp" id="0x7f0802b6" />
+    <public type="drawable" name="ic_headset_24dp" id="0x7f0802b7" />
+    <public type="drawable" name="ic_headset_deafened_grey_24dp" id="0x7f0802b8" />
+    <public type="drawable" name="ic_headset_deafened_grey_red_24dp" id="0x7f0802b9" />
+    <public type="drawable" name="ic_headset_deafened_red_24dp" id="0x7f0802ba" />
+    <public type="drawable" name="ic_headset_deafened_white_24dp" id="0x7f0802bb" />
+    <public type="drawable" name="ic_headset_deafened_white_red_24dp" id="0x7f0802bc" />
+    <public type="drawable" name="ic_headset_grey_24dp" id="0x7f0802be" />
+    <public type="drawable" name="ic_headset_grey_a30_24dp" id="0x7f0802bf" />
+    <public type="drawable" name="ic_headset_red_24dp" id="0x7f0802c0" />
+    <public type="drawable" name="ic_headset_white_18dp" id="0x7f0802c2" />
+    <public type="drawable" name="ic_headset_white_18dp_deafened" id="0x7f0802c3" />
+    <public type="drawable" name="ic_headset_white_24dp" id="0x7f0802c4" />
+    <public type="drawable" name="ic_headset_white_a30_24dp" id="0x7f0802c5" />
+    <public type="drawable" name="ic_help_dark_a60_24dp" id="0x7f0802c6" />
+    <public type="drawable" name="ic_help_light_a60_24dp" id="0x7f0802c7" />
+    <public type="drawable" name="ic_help_outline_white_24dp" id="0x7f0802c8" />
+    <public type="drawable" name="ic_history_grey_24dp" id="0x7f0802c9" />
+    <public type="drawable" name="ic_history_white_24dp" id="0x7f0802ca" />
+    <public type="drawable" name="ic_human_greeting_24dp" id="0x7f0802cb" />
+    <public type="drawable" name="ic_hypesquad_house1_32dp" id="0x7f0802cc" />
+    <public type="drawable" name="ic_hypesquad_house2_32dp" id="0x7f0802ce" />
+    <public type="drawable" name="ic_hypesquad_house3_32dp" id="0x7f0802d0" />
+    <public type="drawable" name="ic_image_24dp" id="0x7f0802d2" />
+    <public type="drawable" name="ic_image_library_24dp" id="0x7f0802d3" />
+    <public type="drawable" name="ic_info_dark_a60_24dp" id="0x7f0802d6" />
+    <public type="drawable" name="ic_info_light_a60_24dp" id="0x7f0802d7" />
+    <public type="drawable" name="ic_info_outline_white_24dp" id="0x7f0802d8" />
+    <public type="drawable" name="ic_insert_drive_file_grey_a60_24dp" id="0x7f0802d9" />
+    <public type="drawable" name="ic_insert_drive_file_white_a60_24dp" id="0x7f0802da" />
+    <public type="drawable" name="ic_insert_emoticon_24dp" id="0x7f0802db" />
+    <public type="drawable" name="ic_instagram_white_18dp" id="0x7f0802dc" />
+    <public type="drawable" name="ic_integrations_dark_a60_24dp" id="0x7f0802dd" />
+    <public type="drawable" name="ic_integrations_light_a60_24dp" id="0x7f0802de" />
+    <public type="drawable" name="ic_invites_dark_a60_24dp" id="0x7f0802df" />
+    <public type="drawable" name="ic_invites_light_a60_24dp" id="0x7f0802e0" />
+    <public type="drawable" name="ic_keyboard_24dp" id="0x7f0802e1" />
+    <public type="drawable" name="ic_launch_24dp" id="0x7f0802e2" />
+    <public type="drawable" name="ic_link_dark_a60_24dp" id="0x7f0802e3" />
+    <public type="drawable" name="ic_link_light_a60_24dp" id="0x7f0802e4" />
+    <public type="drawable" name="ic_link_white_24dp" id="0x7f0802e5" />
+    <public type="drawable" name="ic_live_stream_white_24dp" id="0x7f0802e6" />
+    <public type="drawable" name="ic_locale_dark_a60_24dp" id="0x7f0802e7" />
+    <public type="drawable" name="ic_locale_light_a60_24dp" id="0x7f0802e8" />
+    <public type="drawable" name="ic_lock_dark_a60_24dp" id="0x7f0802e9" />
+    <public type="drawable" name="ic_lock_light_a60_24dp" id="0x7f0802ea" />
+    <public type="drawable" name="ic_lock_white_a60_16dp" id="0x7f0802eb" />
+    <public type="drawable" name="ic_lol_white_24dp" id="0x7f0802ec" />
+    <public type="drawable" name="ic_member_list_boosted_badge_24dp" id="0x7f0802ed" />
+    <public type="drawable" name="ic_members_dark_a60_24dp" id="0x7f0802ee" />
+    <public type="drawable" name="ic_members_dark_grey_24dp" id="0x7f0802ef" />
+    <public type="drawable" name="ic_members_grey_24dp" id="0x7f0802f0" />
+    <public type="drawable" name="ic_members_light_a60_24dp" id="0x7f0802f1" />
+    <public type="drawable" name="ic_members_white_24dp" id="0x7f0802f2" />
+    <public type="drawable" name="ic_mentions_grey_24dp" id="0x7f0802f3" />
+    <public type="drawable" name="ic_mentions_white_24dp" id="0x7f0802f4" />
+    <public type="drawable" name="ic_mentions_white_a60_24dp" id="0x7f0802f5" />
+    <public type="drawable" name="ic_menu_private_grey_a60_24dp" id="0x7f0802f6" />
+    <public type="drawable" name="ic_menu_private_white_a60_24dp" id="0x7f0802f7" />
+    <public type="drawable" name="ic_message_white_18dp" id="0x7f0802f8" />
+    <public type="drawable" name="ic_mic_grey_24dp" id="0x7f0802f9" />
+    <public type="drawable" name="ic_mic_grey_a30_24dp" id="0x7f0802fa" />
+    <public type="drawable" name="ic_mic_muted_grey_24dp" id="0x7f0802fb" />
+    <public type="drawable" name="ic_mic_muted_grey_red_24dp" id="0x7f0802fc" />
+    <public type="drawable" name="ic_mic_muted_red_24dp" id="0x7f0802fd" />
+    <public type="drawable" name="ic_mic_muted_white_24dp" id="0x7f0802fe" />
+    <public type="drawable" name="ic_mic_muted_white_red_24dp" id="0x7f0802ff" />
+    <public type="drawable" name="ic_mic_red_24dp" id="0x7f080300" />
+    <public type="drawable" name="ic_mic_white_18dp" id="0x7f080301" />
+    <public type="drawable" name="ic_mic_white_18dp_muted" id="0x7f080302" />
+    <public type="drawable" name="ic_mic_white_24dp" id="0x7f080303" />
+    <public type="drawable" name="ic_mic_white_a30_24dp" id="0x7f080304" />
+    <public type="drawable" name="ic_more_primary100_24dp" id="0x7f080305" />
+    <public type="drawable" name="ic_more_primary900_24dp" id="0x7f080306" />
+    <public type="drawable" name="ic_movie_24dp" id="0x7f080307" />
+    <public type="drawable" name="ic_my_account_dark_a60_24dp" id="0x7f08030d" />
+    <public type="drawable" name="ic_my_account_light_a60_24dp" id="0x7f08030e" />
+    <public type="drawable" name="ic_navigate_next_grey_a60_24dp" id="0x7f08030f" />
+    <public type="drawable" name="ic_navigate_next_white_a60_24dp" id="0x7f080310" />
+    <public type="drawable" name="ic_nitro_badge_nitro_gradient_16dp" id="0x7f080311" />
+    <public type="drawable" name="ic_nitro_badge_white" id="0x7f080312" />
+    <public type="drawable" name="ic_nitro_gifs_24dp" id="0x7f080313" />
+    <public type="drawable" name="ic_nitro_globalemojis_24dp" id="0x7f080314" />
+    <public type="drawable" name="ic_nitro_highquality_24dp" id="0x7f080315" />
+    <public type="drawable" name="ic_nitro_perk_stream_24dp" id="0x7f080316" />
+    <public type="drawable" name="ic_nitro_rep" id="0x7f080317" />
+    <public type="drawable" name="ic_nitro_rep_24dp" id="0x7f080318" />
+    <public type="drawable" name="ic_nitro_tag_24dp" id="0x7f080319" />
+    <public type="drawable" name="ic_notifications_grey_a60_24dp" id="0x7f08031e" />
+    <public type="drawable" name="ic_notifications_off_grey_a60_24dp" id="0x7f08031f" />
+    <public type="drawable" name="ic_notifications_off_white_a60_24dp" id="0x7f080320" />
+    <public type="drawable" name="ic_notifications_settings_grey_a60_24dp" id="0x7f080321" />
+    <public type="drawable" name="ic_notifications_settings_white_a60_24dp" id="0x7f080322" />
+    <public type="drawable" name="ic_notifications_white_a60_24dp" id="0x7f080323" />
+    <public type="drawable" name="ic_open_in_browser_grey_24dp" id="0x7f080324" />
+    <public type="drawable" name="ic_open_in_browser_white_24dp" id="0x7f080325" />
+    <public type="drawable" name="ic_open_in_new_grey_24dp" id="0x7f080326" />
+    <public type="drawable" name="ic_open_in_new_grey_a60_24dp" id="0x7f080327" />
+    <public type="drawable" name="ic_open_in_new_white_24dp" id="0x7f080328" />
+    <public type="drawable" name="ic_open_in_new_white_a60_24dp" id="0x7f080329" />
+    <public type="drawable" name="ic_overlay_grey_24dp" id="0x7f08032b" />
+    <public type="drawable" name="ic_overlay_white_24dp" id="0x7f08032c" />
+    <public type="drawable" name="ic_overview_dark_a60_24dp" id="0x7f08032d" />
+    <public type="drawable" name="ic_overview_light_a60_24dp" id="0x7f08032e" />
+    <public type="drawable" name="ic_partnered_badge" id="0x7f08032f" />
+    <public type="drawable" name="ic_partnered_badge_banner" id="0x7f080330" />
+    <public type="drawable" name="ic_people_grey_24dp" id="0x7f080331" />
+    <public type="drawable" name="ic_people_white_24dp" id="0x7f080332" />
+    <public type="drawable" name="ic_perk_lock" id="0x7f080333" />
+    <public type="drawable" name="ic_perk_tier_1_boosted" id="0x7f080334" />
+    <public type="drawable" name="ic_perk_tier_1_unboosted" id="0x7f080335" />
+    <public type="drawable" name="ic_perk_tier_2_boosted" id="0x7f080336" />
+    <public type="drawable" name="ic_perk_tier_2_unboosted" id="0x7f080337" />
+    <public type="drawable" name="ic_perk_tier_3_boosted" id="0x7f080338" />
+    <public type="drawable" name="ic_perk_tier_3_unboosted" id="0x7f080339" />
+    <public type="drawable" name="ic_person_add_grey_a60_24dp" id="0x7f08033a" />
+    <public type="drawable" name="ic_person_add_new_primary_500_24dp" id="0x7f08033b" />
+    <public type="drawable" name="ic_person_add_new_white_24dp" id="0x7f08033c" />
+    <public type="drawable" name="ic_person_add_white_24dp" id="0x7f08033d" />
+    <public type="drawable" name="ic_person_add_white_a60_24dp" id="0x7f08033e" />
+    <public type="drawable" name="ic_person_grey_a60_24dp" id="0x7f08033f" />
+    <public type="drawable" name="ic_person_white_a60_24dp" id="0x7f080340" />
+    <public type="drawable" name="ic_phonelink_grey_a60_24dp" id="0x7f080341" />
+    <public type="drawable" name="ic_phonelink_white_a60_24dp" id="0x7f080342" />
+    <public type="drawable" name="ic_photo_grey_24dp" id="0x7f080343" />
+    <public type="drawable" name="ic_photo_white_24dp" id="0x7f080344" />
+    <public type="drawable" name="ic_pins_dark_a60_24dp" id="0x7f080345" />
+    <public type="drawable" name="ic_pins_light_a60_24dp" id="0x7f080346" />
+    <public type="drawable" name="ic_play_arrow_grey_24dp" id="0x7f080347" />
+    <public type="drawable" name="ic_play_arrow_white_24dp" id="0x7f080348" />
+    <public type="drawable" name="ic_play_circle_outline_grey_24dp" id="0x7f080349" />
+    <public type="drawable" name="ic_play_circle_outline_white_24dp" id="0x7f08034a" />
+    <public type="drawable" name="ic_plus_dark_a60_24dp" id="0x7f08034b" />
+    <public type="drawable" name="ic_plus_light_a60_24dp" id="0x7f08034c" />
+    <public type="drawable" name="ic_popup_settings_grey_a60_24dp" id="0x7f08034d" />
+    <public type="drawable" name="ic_popup_settings_white_a60_24dp" id="0x7f08034e" />
+    <public type="drawable" name="ic_privacy_dark_a60_24dp" id="0x7f08034f" />
+    <public type="drawable" name="ic_privacy_light_a60_24dp" id="0x7f080350" />
+    <public type="drawable" name="ic_profile_badge_bughunter_32dp" id="0x7f080351" />
+    <public type="drawable" name="ic_profile_badge_hypesquad_32dp" id="0x7f080352" />
+    <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f080353" />
+    <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f080354" />
+    <public type="drawable" name="ic_profile_badge_premium_early_supporter_32dp" id="0x7f080355" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl1_32dp" id="0x7f080356" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl2_32dp" id="0x7f080357" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl3_32dp" id="0x7f080358" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl4_32dp" id="0x7f080359" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl5_32dp" id="0x7f08035a" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl6_32dp" id="0x7f08035b" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl7_32dp" id="0x7f08035c" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl8_32dp" id="0x7f08035d" />
+    <public type="drawable" name="ic_profile_badge_premium_guild_subscription_lvl9_32dp" id="0x7f08035e" />
+    <public type="drawable" name="ic_profile_badge_staff_32dp" id="0x7f08035f" />
+    <public type="drawable" name="ic_reactions_grey_a60_24dp" id="0x7f080360" />
+    <public type="drawable" name="ic_reactions_white_a60_24dp" id="0x7f080361" />
+    <public type="drawable" name="ic_reddit_white_24dp" id="0x7f080362" />
+    <public type="drawable" name="ic_refresh_grey_a60_24dp" id="0x7f080363" />
+    <public type="drawable" name="ic_refresh_white_a60_24dp" id="0x7f080364" />
+    <public type="drawable" name="ic_remove_circle_outline_red_24dp" id="0x7f080365" />
+    <public type="drawable" name="ic_remove_friend_red_24dp" id="0x7f080366" />
+    <public type="drawable" name="ic_rich_presence_grey_16dp" id="0x7f080367" />
+    <public type="drawable" name="ic_role_24dp" id="0x7f080368" />
+    <public type="drawable" name="ic_roles_dark_a60_24dp" id="0x7f08036a" />
+    <public type="drawable" name="ic_roles_light_a60_24dp" id="0x7f08036b" />
+    <public type="drawable" name="ic_search_grey_24dp" id="0x7f08036d" />
+    <public type="drawable" name="ic_search_items_white_a60_24dp" id="0x7f08036e" />
+    <public type="drawable" name="ic_search_white_24dp" id="0x7f08036f" />
+    <public type="drawable" name="ic_security_dark_a60_24dp" id="0x7f080370" />
+    <public type="drawable" name="ic_security_light_a60_24dp" id="0x7f080371" />
+    <public type="drawable" name="ic_send_24dp" id="0x7f080372" />
+    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f080373" />
+    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f080375" />
+    <public type="drawable" name="ic_settings_boost_dark_a60_24dp" id="0x7f080376" />
+    <public type="drawable" name="ic_settings_boost_light_a60_24dp" id="0x7f080377" />
+    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f080378" />
+    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f080379" />
+    <public type="drawable" name="ic_share_grey_24dp" id="0x7f08037a" />
+    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f08037b" />
+    <public type="drawable" name="ic_share_white_24dp" id="0x7f08037c" />
+    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f08037d" />
+    <public type="drawable" name="ic_skype_white_24dp" id="0x7f08037f" />
+    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f080380" />
+    <public type="drawable" name="ic_smile_24dp" id="0x7f080381" />
+    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f080382" />
+    <public type="drawable" name="ic_sort_white_24dp" id="0x7f080383" />
+    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f080386" />
+    <public type="drawable" name="ic_star_24dp" id="0x7f080387" />
+    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f080388" />
+    <public type="drawable" name="ic_status_idle_16dp" id="0x7f080389" />
+    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f08038c" />
+    <public type="drawable" name="ic_steam" id="0x7f08038d" />
+    <public type="drawable" name="ic_steam_white_24dp" id="0x7f08038e" />
+    <public type="drawable" name="ic_stop_stream_v2" id="0x7f08038f" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f080390" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f080391" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080392" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080393" />
+    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f08039c" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f08039d" />
+    <public type="drawable" name="ic_text_image_dark_a60_24dp" id="0x7f08039e" />
+    <public type="drawable" name="ic_text_image_light_a60_24dp" id="0x7f08039f" />
+    <public type="drawable" name="ic_theme_dark_a60_24dp" id="0x7f0803a0" />
+    <public type="drawable" name="ic_theme_light_a60_24dp" id="0x7f0803a1" />
+    <public type="drawable" name="ic_timer_dark" id="0x7f0803a2" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f0803a3" />
+    <public type="drawable" name="ic_timer_light" id="0x7f0803a4" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f0803a5" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f0803a6" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f0803a8" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f0803a9" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f0803aa" />
+    <public type="drawable" name="ic_unban_grey" id="0x7f0803ac" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7f0803ad" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f0803ae" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7f0803af" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7f0803b0" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7f0803b1" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7f0803b2" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7f0803b3" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f0803b4" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7f0803b5" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7f0803b6" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7f0803b7" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7f0803b8" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7f0803b9" />
+    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f0803ba" />
+    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f0803bb" />
+    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f0803bc" />
+    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f0803bd" />
+    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f0803be" />
+    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f0803bf" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f0803c0" />
+    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f0803c1" />
+    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f0803c2" />
+    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f0803c3" />
+    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f0803c4" />
+    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f0803c5" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f0803c6" />
+    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f0803c7" />
+    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f0803c8" />
+    <public type="drawable" name="ic_verified_badge" id="0x7f0803c9" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7f0803ca" />
+    <public type="drawable" name="ic_videocam_dark_grey_24dp" id="0x7f0803cb" />
+    <public type="drawable" name="ic_videocam_grey_24dp" id="0x7f0803cc" />
+    <public type="drawable" name="ic_videocam_off_grey_24dp" id="0x7f0803cd" />
+    <public type="drawable" name="ic_videocam_off_white_24dp" id="0x7f0803ce" />
+    <public type="drawable" name="ic_videocam_white_24dp" id="0x7f0803cf" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f0803d0" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f0803d1" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f0803d2" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f0803d3" />
+    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f0803d4" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7f0803d5" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7f0803d6" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7f0803d7" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f0803d8" />
+    <public type="drawable" name="ic_voice_settings_dark_a60_24dp" id="0x7f0803d9" />
+    <public type="drawable" name="ic_voice_settings_light_a60_24dp" id="0x7f0803da" />
+    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f0803db" />
+    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f0803dc" />
+    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f0803dd" />
+    <public type="drawable" name="ic_volume_up_dark_grey_a30_24dp" id="0x7f0803de" />
+    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f0803df" />
+    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f0803e0" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f0803e1" />
+    <public type="drawable" name="ic_volume_up_white_a30_24dp" id="0x7f0803e2" />
+    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f0803e3" />
+    <public type="drawable" name="ic_warning_icon_24dp" id="0x7f0803e4" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f0803e5" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f0803e6" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f080411" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7f080412" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f080413" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f080414" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f080415" />
+    <public type="drawable" name="img_auth_logo_x_samsung" id="0x7f08041d" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7f08041e" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7f08041f" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7f080420" />
+    <public type="drawable" name="img_badge_upsell" id="0x7f080421" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f080422" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f080423" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f080424" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f080425" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f080426" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f080427" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7f080428" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f080429" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f08042a" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f08042b" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f08042c" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f08042e" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f08042f" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f080430" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f080431" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7f080432" />
+    <public type="drawable" name="img_forced_update_light" id="0x7f080433" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7f080439" />
+    <public type="drawable" name="img_guild_use_cases" id="0x7f08043a" />
+    <public type="drawable" name="img_item_shop_dark" id="0x7f08043b" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7f08043d" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f08043e" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f08043f" />
+    <public type="drawable" name="img_logo_nitro" id="0x7f080440" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7f080441" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f080442" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f080443" />
+    <public type="drawable" name="img_logo_square" id="0x7f080444" />
+    <public type="drawable" name="img_mfa_dark" id="0x7f080445" />
+    <public type="drawable" name="img_mfa_light" id="0x7f080446" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f080447" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7f080448" />
+    <public type="drawable" name="img_nitro_broken_wheel" id="0x7f080449" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7f08044b" />
+    <public type="drawable" name="img_no_gifts" id="0x7f08044e" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f08044f" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f080450" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f080451" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f080452" />
+    <public type="drawable" name="img_no_stream_preview" id="0x7f080453" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7f080454" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7f080455" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f080456" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7f080457" />
+    <public type="drawable" name="img_plus_illo" id="0x7f08045a" />
+    <public type="drawable" name="img_poop_dark" id="0x7f08045b" />
+    <public type="drawable" name="img_poop_light" id="0x7f08045c" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7f08045d" />
+    <public type="drawable" name="img_server_nitro_status" id="0x7f08045e" />
+    <public type="drawable" name="img_tag_upsell" id="0x7f08045f" />
+    <public type="drawable" name="img_upload_upsell" id="0x7f080460" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f080461" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7f080462" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f080463" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f080464" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f080468" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7f080469" />
+    <public type="drawable" name="img_wumpus_game_launcher" id="0x7f08046a" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7f08046b" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f08046c" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f08046d" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f08046e" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7f080488" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7f080489" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7f08048a" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7f08048b" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7f08048c" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7f08048d" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7f08048e" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7f08048f" />
+    <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="0x7f0801e0" />
+    <public type="drawable" name="notification_bg_low_normal" id="0x7f080475" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7f080476" />
+    <public type="drawable" name="notification_bg_normal" id="0x7f080477" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080478" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f08047d" />
+    <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="0x7f080369" />
+    <public type="drawable" name="img_wump_trash_dark" id="0x7f080467" />
+    <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="0x7f080224" />
+    <public type="drawable" name="ic_dropdown_white_18dp" id="0x7f080260" />
+    <public type="drawable" name="ic_file_acrobat" id="0x7f080283" />
+    <public type="drawable" name="ic_file_ae" id="0x7f080284" />
+    <public type="drawable" name="ic_file_ai" id="0x7f080285" />
+    <public type="drawable" name="ic_file_archive" id="0x7f080286" />
+    <public type="drawable" name="ic_file_code" id="0x7f080287" />
+    <public type="drawable" name="ic_file_document" id="0x7f080288" />
+    <public type="drawable" name="ic_file_sketch" id="0x7f08028e" />
+    <public type="drawable" name="ic_file_spreadsheet" id="0x7f08028f" />
+    <public type="drawable" name="ic_file_unknown" id="0x7f080290" />
+    <public type="drawable" name="ic_file_video" id="0x7f080292" />
+    <public type="drawable" name="ic_file_webcode" id="0x7f080293" />
+    <public type="drawable" name="ic_group_edit" id="0x7f0802a7" />
+    <public type="drawable" name="ic_group_join" id="0x7f0802a8" />
+    <public type="drawable" name="ic_group_leave" id="0x7f0802a9" />
+    <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f0802d4" />
+    <public type="drawable" name="ic_img_selected_light_theme" id="0x7f0802d5" />
+    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f080395" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f080396" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7f080397" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f080398" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f080399" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08039a" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08039b" />
+    <public type="drawable" name="img_empty_no_connections" id="0x7f08042d" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7f08044c" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7f08044d" />
+    <public type="drawable" name="img_permission_prime" id="0x7f080459" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f080465" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7f080466" />
+    <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="0x7f0801df" />
+    <public type="drawable" name="ic_call_end_white_24dp" id="0x7f080219" />
+    <public type="drawable" name="ic_close_white_18dp" id="0x7f08024c" />
+    <public type="drawable" name="ic_notification_24dp" id="0x7f08031a" />
+    <public type="drawable" name="ic_notification_call_24dp" id="0x7f08031b" />
+    <public type="drawable" name="ic_notification_friends_24dp" id="0x7f08031c" />
+    <public type="drawable" name="ic_notification_message_24dp" id="0x7f08031d" />
+    <public type="drawable" name="ic_search" id="0x7f08036c" />
+    <public type="drawable" name="ic_send_white_24dp" id="0x7f080374" />
+    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f08037e" />
+    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f0803ab" />
+    <public type="drawable" name="icon_flag_au" id="0x7f0803e9" />
+    <public type="drawable" name="icon_flag_bg" id="0x7f0803ea" />
+    <public type="drawable" name="icon_flag_cs" id="0x7f0803eb" />
+    <public type="drawable" name="icon_flag_da" id="0x7f0803ec" />
+    <public type="drawable" name="icon_flag_de" id="0x7f0803ed" />
+    <public type="drawable" name="icon_flag_el" id="0x7f0803ee" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7f0803ef" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7f0803f0" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7f0803f1" />
+    <public type="drawable" name="icon_flag_eu" id="0x7f0803f2" />
+    <public type="drawable" name="icon_flag_fi" id="0x7f0803f3" />
+    <public type="drawable" name="icon_flag_fr" id="0x7f0803f4" />
+    <public type="drawable" name="icon_flag_gb" id="0x7f0803f5" />
+    <public type="drawable" name="icon_flag_hk" id="0x7f0803f6" />
+    <public type="drawable" name="icon_flag_hr" id="0x7f0803f7" />
+    <public type="drawable" name="icon_flag_hu" id="0x7f0803f8" />
+    <public type="drawable" name="icon_flag_it" id="0x7f0803f9" />
+    <public type="drawable" name="icon_flag_ja" id="0x7f0803fa" />
+    <public type="drawable" name="icon_flag_ko" id="0x7f0803fb" />
+    <public type="drawable" name="icon_flag_lt" id="0x7f0803fc" />
+    <public type="drawable" name="icon_flag_nl" id="0x7f0803fd" />
+    <public type="drawable" name="icon_flag_no" id="0x7f0803fe" />
+    <public type="drawable" name="icon_flag_pl" id="0x7f0803ff" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7f080400" />
+    <public type="drawable" name="icon_flag_ro" id="0x7f080401" />
+    <public type="drawable" name="icon_flag_ru" id="0x7f080402" />
+    <public type="drawable" name="icon_flag_sg" id="0x7f080403" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7f080404" />
+    <public type="drawable" name="icon_flag_th" id="0x7f080405" />
+    <public type="drawable" name="icon_flag_tr" id="0x7f080406" />
+    <public type="drawable" name="icon_flag_uk" id="0x7f080407" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7f080408" />
+    <public type="drawable" name="icon_flag_vi" id="0x7f080409" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7f08040a" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7f08040b" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7f080418" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7f080419" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f080437" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7f080438" />
+    <public type="drawable" name="img_loading_clyde" id="0x7f08043c" />
+    <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="0x7f0802cd" />
+    <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f0802cf" />
+    <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f0802d1" />
+    <public type="drawable" name="ic_overflow_grey" id="0x7f08032a" />
+    <public type="drawable" name="icon_carrot" id="0x7f0803e7" />
+    <public type="drawable" name="icon_deafened_small" id="0x7f0803e8" />
+    <public type="drawable" name="icon_friends_list" id="0x7f08040c" />
+    <public type="drawable" name="icon_menu_copy" id="0x7f08040d" />
+    <public type="drawable" name="icon_more" id="0x7f08040e" />
+    <public type="drawable" name="icon_muted_small" id="0x7f08040f" />
+    <public type="drawable" name="icon_save" id="0x7f080410" />
+    <public type="drawable" name="img_auth_bg_bl" id="0x7f080416" />
+    <public type="drawable" name="img_auth_bg_br" id="0x7f080417" />
+    <public type="drawable" name="img_auth_bg_tr" id="0x7f08041a" />
+    <public type="drawable" name="img_auth_logo" id="0x7f08041b" />
+    <public type="drawable" name="img_auth_logo_small" id="0x7f08041c" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7f080434" />
+    <public type="drawable" name="img_overlay_nux" id="0x7f080458" />
     <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" />
@@ -3089,111 +3105,111 @@
     <public type="id" name="application_news_loading" id="0x7f0a007c" />
     <public type="id" name="application_news_splash" id="0x7f0a007d" />
     <public type="id" name="application_news_title" id="0x7f0a007e" />
-    <public type="id" name="async" id="0x7f0a007f" />
-    <public type="id" name="attachment_clear_btn" id="0x7f0a0080" />
-    <public type="id" name="attachment_preview_container" id="0x7f0a0081" />
-    <public type="id" name="attachment_preview_list" id="0x7f0a0082" />
-    <public type="id" name="audio" 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="application_stream_view" 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="audio" 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_info_container" id="0x7f0a00e8" />
     <public type="id" name="boost_info_text" id="0x7f0a00e9" />
     <public type="id" name="boost_remove_confirmation_avatar" id="0x7f0a00ea" />
@@ -3508,1595 +3524,1643 @@
     <public type="id" name="color_picker_reset" id="0x7f0a021f" />
     <public type="id" name="column" id="0x7f0a0220" />
     <public type="id" name="column_reverse" id="0x7f0a0221" />
-    <public type="id" name="connected_account_disconnect" id="0x7f0a0222" />
-    <public type="id" name="connected_account_display_activity_switch" id="0x7f0a0223" />
-    <public type="id" name="connected_account_display_switch" id="0x7f0a0224" />
-    <public type="id" name="connected_account_divider" id="0x7f0a0225" />
-    <public type="id" name="connected_account_extra_info" id="0x7f0a0226" />
-    <public type="id" name="connected_account_img" id="0x7f0a0227" />
-    <public type="id" name="connected_account_link_img" id="0x7f0a0228" />
-    <public type="id" name="connected_account_name" id="0x7f0a0229" />
-    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a022a" />
-    <public type="id" name="connected_list_header" id="0x7f0a022b" />
-    <public type="id" name="connections_empty" id="0x7f0a022c" />
-    <public type="id" name="connections_recycler" id="0x7f0a022d" />
-    <public type="id" name="connections_xbox_digits" id="0x7f0a022e" />
-    <public type="id" name="connections_xbox_login" id="0x7f0a022f" />
-    <public type="id" name="container" id="0x7f0a0230" />
-    <public type="id" name="content" id="0x7f0a0231" />
-    <public type="id" name="contentPanel" id="0x7f0a0232" />
-    <public type="id" name="content_iv" id="0x7f0a0233" />
-    <public type="id" name="content_pager" id="0x7f0a0234" />
-    <public type="id" name="content_tabs" id="0x7f0a0235" />
-    <public type="id" name="continuous" 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="credit_header" id="0x7f0a0245" />
-    <public type="id" name="credit_icon" id="0x7f0a0246" />
-    <public type="id" name="credit_info" id="0x7f0a0247" />
-    <public type="id" name="credit_info_container" id="0x7f0a0248" />
-    <public type="id" name="credit_nitro" id="0x7f0a0249" />
-    <public type="id" name="credit_nitro_classic" id="0x7f0a024a" />
-    <public type="id" name="credit_nitro_divider" id="0x7f0a024b" />
-    <public type="id" name="credit_time" id="0x7f0a024c" />
-    <public type="id" name="current_bitrate_display" id="0x7f0a024d" />
-    <public type="id" name="current_user_limit_display" id="0x7f0a024e" />
-    <public type="id" name="custom" id="0x7f0a024f" />
-    <public type="id" name="customPanel" id="0x7f0a0250" />
-    <public type="id" name="dark" id="0x7f0a0251" />
-    <public type="id" name="debugging_item_log_message" id="0x7f0a0252" />
-    <public type="id" name="debugging_logs" id="0x7f0a0253" />
-    <public type="id" name="decor_content_parent" id="0x7f0a0254" />
-    <public type="id" name="default_activity_button" id="0x7f0a0255" />
-    <public type="id" name="design_bottom_sheet" id="0x7f0a0256" />
-    <public type="id" name="design_menu_item_action_area" id="0x7f0a0257" />
-    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a0258" />
-    <public type="id" name="design_menu_item_text" id="0x7f0a0259" />
-    <public type="id" name="design_navigation_view" id="0x7f0a025a" />
-    <public type="id" name="dialog_button" id="0x7f0a025b" />
-    <public type="id" name="dialog_cancel" id="0x7f0a025c" />
-    <public type="id" name="dialog_card" id="0x7f0a025d" />
-    <public type="id" name="dialog_chat_action_header" id="0x7f0a025e" />
-    <public type="id" name="dialog_chat_actions_add_reaction" id="0x7f0a025f" />
-    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a0260" />
-    <public type="id" name="dialog_chat_actions_avatar" id="0x7f0a0261" />
-    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a0262" />
-    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a0263" />
-    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a0264" />
-    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a0265" />
-    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a0266" />
-    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a0267" />
-    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a0268" />
-    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a0269" />
-    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a026a" />
-    <public type="id" name="dialog_chat_actions_share" id="0x7f0a026b" />
-    <public type="id" name="dialog_chat_actions_subtitle" id="0x7f0a026c" />
-    <public type="id" name="dialog_chat_actions_title" id="0x7f0a026d" />
-    <public type="id" name="dialog_delete" id="0x7f0a026e" />
-    <public type="id" name="dialog_save" id="0x7f0a026f" />
-    <public type="id" name="dialog_selections" id="0x7f0a0270" />
-    <public type="id" name="dialog_title" id="0x7f0a0271" />
-    <public type="id" name="dialog_url_actions_copy" id="0x7f0a0272" />
-    <public type="id" name="dialog_url_actions_open" id="0x7f0a0273" />
-    <public type="id" name="dialog_url_actions_share" id="0x7f0a0274" />
-    <public type="id" name="dialog_url_actions_url" id="0x7f0a0275" />
-    <public type="id" name="dimensions" id="0x7f0a0276" />
-    <public type="id" name="dimmer_view" id="0x7f0a0277" />
-    <public type="id" name="direct" id="0x7f0a0278" />
-    <public type="id" name="disableHome" id="0x7f0a0279" />
-    <public type="id" name="disable_delete_body" id="0x7f0a027a" />
-    <public type="id" name="disable_delete_cancel" id="0x7f0a027b" />
-    <public type="id" name="disable_delete_code" id="0x7f0a027c" />
-    <public type="id" name="disable_delete_code_wrap" id="0x7f0a027d" />
-    <public type="id" name="disable_delete_confirm" id="0x7f0a027e" />
-    <public type="id" name="disable_delete_header" id="0x7f0a027f" />
-    <public type="id" name="disable_delete_password" id="0x7f0a0280" />
-    <public type="id" name="disable_delete_password_wrap" id="0x7f0a0281" />
-    <public type="id" name="disconnect_btn" id="0x7f0a0282" />
-    <public type="id" name="edit_account_discriminator" id="0x7f0a0283" />
-    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a0284" />
-    <public type="id" name="edit_account_email" id="0x7f0a0285" />
-    <public type="id" name="edit_account_email_wrap" id="0x7f0a0286" />
-    <public type="id" name="edit_account_password" id="0x7f0a0287" />
-    <public type="id" name="edit_account_password_wrap" id="0x7f0a0288" />
-    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a0289" />
-    <public type="id" name="edit_account_username" id="0x7f0a028a" />
-    <public type="id" name="edit_account_username_wrap" id="0x7f0a028b" />
-    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a028c" />
-    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a028d" />
-    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a028e" />
-    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a028f" />
-    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a0290" />
-    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a0291" />
-    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a0292" />
-    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a0293" />
-    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a0294" />
-    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a0295" />
-    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a0296" />
-    <public type="id" name="edit_integration_icon" id="0x7f0a0297" />
-    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a0298" />
-    <public type="id" name="edit_integration_name" id="0x7f0a0299" />
-    <public type="id" name="edit_integration_name_container" id="0x7f0a029a" />
-    <public type="id" name="edit_integration_owner_name" id="0x7f0a029b" />
-    <public type="id" name="edit_integration_save" id="0x7f0a029c" />
-    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a029d" />
-    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a029e" />
-    <public type="id" name="edit_integration_sync_container" id="0x7f0a029f" />
-    <public type="id" name="edit_integration_synced_role" id="0x7f0a02a0" />
-    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a02a1" />
-    <public type="id" name="edit_member_administrative_container" id="0x7f0a02a2" />
-    <public type="id" name="edit_member_ban_button" id="0x7f0a02a3" />
-    <public type="id" name="edit_member_kick_button" id="0x7f0a02a4" />
-    <public type="id" name="edit_member_nickname" id="0x7f0a02a5" />
-    <public type="id" name="edit_member_nickname_lock" id="0x7f0a02a6" />
-    <public type="id" name="edit_member_roles_container" id="0x7f0a02a7" />
-    <public type="id" name="edit_member_roles_recycler" id="0x7f0a02a8" />
-    <public type="id" name="edit_member_save" id="0x7f0a02a9" />
-    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a02aa" />
-    <public type="id" name="edit_query" id="0x7f0a02ab" />
-    <public type="id" name="edit_role_name" id="0x7f0a02ac" />
-    <public type="id" name="edit_role_save" id="0x7f0a02ad" />
-    <public type="id" name="embed_guideline" id="0x7f0a02ae" />
-    <public type="id" name="embed_guideline_right" id="0x7f0a02af" />
-    <public type="id" name="embed_image_container" id="0x7f0a02b0" />
-    <public type="id" name="emoji_btn" id="0x7f0a02b1" />
-    <public type="id" name="emoji_container" id="0x7f0a02b2" />
-    <public type="id" name="emoji_item_draweeview" id="0x7f0a02b3" />
-    <public type="id" name="emoji_iv" id="0x7f0a02b4" />
-    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a02b5" />
-    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a02b6" />
-    <public type="id" name="emoji_picker_search_icon" id="0x7f0a02b7" />
-    <public type="id" name="emoji_picker_tab_layout" id="0x7f0a02b8" />
-    <public type="id" name="emoji_search_bar" id="0x7f0a02b9" />
-    <public type="id" name="empty_results" id="0x7f0a02ba" />
-    <public type="id" name="enable_button" id="0x7f0a02bb" />
-    <public type="id" name="enable_mfa_key_code" id="0x7f0a02bc" />
-    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a02bd" />
-    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a02be" />
-    <public type="id" name="enable_mfa_stepsview" id="0x7f0a02bf" />
-    <public type="id" name="enable_sms_backup_body" id="0x7f0a02c0" />
-    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a02c1" />
-    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a02c2" />
-    <public type="id" name="enable_sms_backup_header" id="0x7f0a02c3" />
-    <public type="id" name="enable_sms_backup_password" id="0x7f0a02c4" />
-    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a02c5" />
-    <public type="id" name="end" id="0x7f0a02c6" />
-    <public type="id" name="enterAlways" id="0x7f0a02c7" />
-    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a02c8" />
-    <public type="id" name="error_divider" id="0x7f0a02c9" />
-    <public type="id" name="exitUntilCollapsed" id="0x7f0a02ca" />
-    <public type="id" name="expand_activities_button" id="0x7f0a02cb" />
-    <public type="id" name="expanded_menu" id="0x7f0a02cc" />
-    <public type="id" name="external_share_comment" id="0x7f0a02cd" />
-    <public type="id" name="external_share_list" id="0x7f0a02ce" />
-    <public type="id" name="external_share_search" id="0x7f0a02cf" />
-    <public type="id" name="external_share_search_results" id="0x7f0a02d0" />
-    <public type="id" name="fab_menu_add_category" id="0x7f0a02d1" />
-    <public type="id" name="fab_menu_add_text" id="0x7f0a02d2" />
-    <public type="id" name="fab_menu_add_voice" id="0x7f0a02d3" />
-    <public type="id" name="fab_menu_main" id="0x7f0a02d4" />
-    <public type="id" name="fab_menu_main_fab" id="0x7f0a02d5" />
-    <public type="id" name="fab_menu_table" id="0x7f0a02d6" />
-    <public type="id" name="fatal_crash_app_version" id="0x7f0a02d7" />
-    <public type="id" name="fatal_crash_details" id="0x7f0a02d8" />
-    <public type="id" name="fatal_crash_device" id="0x7f0a02d9" />
-    <public type="id" name="fatal_crash_os_version" id="0x7f0a02da" />
-    <public type="id" name="fatal_crash_source" id="0x7f0a02db" />
-    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a02dc" />
-    <public type="id" name="fatal_crash_time" id="0x7f0a02dd" />
-    <public type="id" name="file_name_tv" id="0x7f0a02de" />
-    <public type="id" name="file_subtitle_tv" id="0x7f0a02df" />
-    <public type="id" name="fill" id="0x7f0a02e0" />
-    <public type="id" name="fill_horizontal" id="0x7f0a02e1" />
-    <public type="id" name="fill_vertical" id="0x7f0a02e2" />
-    <public type="id" name="filled" id="0x7f0a02e3" />
-    <public type="id" name="fitBottomStart" id="0x7f0a02e4" />
-    <public type="id" name="fitCenter" id="0x7f0a02e5" />
-    <public type="id" name="fitEnd" id="0x7f0a02e6" />
-    <public type="id" name="fitStart" id="0x7f0a02e7" />
-    <public type="id" name="fitXY" id="0x7f0a02e8" />
-    <public type="id" name="fixed" id="0x7f0a02e9" />
-    <public type="id" name="flex_end" id="0x7f0a02ea" />
-    <public type="id" name="flex_start" id="0x7f0a02eb" />
-    <public type="id" name="focusCrop" id="0x7f0a02ec" />
-    <public type="id" name="folder_view_folder_image" id="0x7f0a02ed" />
-    <public type="id" name="forever" id="0x7f0a02ee" />
-    <public type="id" name="friend_container" id="0x7f0a02ef" />
-    <public type="id" name="friends_add_container" id="0x7f0a02f0" />
-    <public type="id" name="friends_add_header" id="0x7f0a02f1" />
-    <public type="id" name="friends_add_nearby" id="0x7f0a02f2" />
-    <public type="id" name="friends_add_send" id="0x7f0a02f3" />
-    <public type="id" name="friends_add_text_edit" id="0x7f0a02f4" />
-    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a02f5" />
-    <public type="id" name="friends_list_item_avatar" id="0x7f0a02f6" />
-    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a02f7" />
-    <public type="id" name="friends_list_item_empty" id="0x7f0a02f8" />
-    <public type="id" name="friends_list_item_empty_invite" id="0x7f0a02f9" />
-    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a02fa" />
-    <public type="id" name="friends_list_item_empty_no_friends" id="0x7f0a02fb" />
-    <public type="id" name="friends_list_item_empty_no_online" id="0x7f0a02fc" />
-    <public type="id" name="friends_list_item_empty_no_request" id="0x7f0a02fd" />
-    <public type="id" name="friends_list_item_empty_no_suggestions" id="0x7f0a02fe" />
-    <public type="id" name="friends_list_item_game" id="0x7f0a02ff" />
-    <public type="id" name="friends_list_item_mutual_1" id="0x7f0a0300" />
-    <public type="id" name="friends_list_item_mutual_1_icon" id="0x7f0a0301" />
-    <public type="id" name="friends_list_item_mutual_1_text" id="0x7f0a0302" />
-    <public type="id" name="friends_list_item_mutual_2" id="0x7f0a0303" />
-    <public type="id" name="friends_list_item_mutual_2_icon" id="0x7f0a0304" />
-    <public type="id" name="friends_list_item_mutual_2_text" id="0x7f0a0305" />
-    <public type="id" name="friends_list_item_mutual_3" id="0x7f0a0306" />
-    <public type="id" name="friends_list_item_mutual_3_icon" id="0x7f0a0307" />
-    <public type="id" name="friends_list_item_mutual_3_text" id="0x7f0a0308" />
-    <public type="id" name="friends_list_item_mutual_4" id="0x7f0a0309" />
-    <public type="id" name="friends_list_item_mutual_4_icon" id="0x7f0a030a" />
-    <public type="id" name="friends_list_item_mutual_4_text" id="0x7f0a030b" />
-    <public type="id" name="friends_list_item_mutual_wrap" id="0x7f0a030c" />
-    <public type="id" name="friends_list_item_name" id="0x7f0a030d" />
-    <public type="id" name="friends_list_item_presence" id="0x7f0a030e" />
-    <public type="id" name="friends_list_item_text" id="0x7f0a030f" />
-    <public type="id" name="friends_list_recycler" id="0x7f0a0310" />
-    <public type="id" name="front" id="0x7f0a0311" />
-    <public type="id" name="ghost_view" id="0x7f0a0312" />
-    <public type="id" name="gift_entitlement_code" id="0x7f0a0313" />
-    <public type="id" name="gift_entitlement_code_container" id="0x7f0a0314" />
-    <public type="id" name="gift_entitlement_container" id="0x7f0a0315" />
-    <public type="id" name="gift_entitlement_copy" id="0x7f0a0316" />
-    <public type="id" name="gift_entitlement_divider" id="0x7f0a0317" />
-    <public type="id" name="gift_entitlement_flipper" id="0x7f0a0318" />
-    <public type="id" name="gift_entitlement_generate" id="0x7f0a0319" />
-    <public type="id" name="gift_entitlement_revoke" id="0x7f0a031a" />
-    <public type="id" name="gift_sku_arrow" id="0x7f0a031b" />
-    <public type="id" name="gift_sku_copies" id="0x7f0a031c" />
-    <public type="id" name="gift_sku_icon" id="0x7f0a031d" />
-    <public type="id" name="gift_sku_name" id="0x7f0a031e" />
-    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a031f" />
-    <public type="id" name="global_search_guild_list" id="0x7f0a0320" />
-    <public type="id" name="global_search_join_guild_btn" id="0x7f0a0321" />
-    <public type="id" name="global_search_recycler" id="0x7f0a0322" />
-    <public type="id" name="global_search_view_flipper" id="0x7f0a0323" />
-    <public type="id" name="gone" id="0x7f0a0324" />
-    <public type="id" name="group_divider" id="0x7f0a0325" />
-    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a0326" />
-    <public type="id" name="group_invite_friends_chips" id="0x7f0a0327" />
-    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a0328" />
-    <public type="id" name="group_invite_friends_recycler" id="0x7f0a0329" />
-    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a032a" />
-    <public type="id" name="group_invite_friends_text_to" id="0x7f0a032b" />
-    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a032c" />
-    <public type="id" name="groups" id="0x7f0a032d" />
-    <public type="id" name="guideline" id="0x7f0a032e" />
-    <public type="id" name="guild_actions_add_create" id="0x7f0a032f" />
-    <public type="id" name="guild_actions_add_create_desc" id="0x7f0a0330" />
-    <public type="id" name="guild_actions_add_join" id="0x7f0a0331" />
-    <public type="id" name="guild_actions_add_join_desc" id="0x7f0a0332" />
-    <public type="id" name="guild_actions_manage_channels_divider" id="0x7f0a0333" />
-    <public type="id" name="guild_actions_overview_boost" id="0x7f0a0334" />
-    <public type="id" name="guild_actions_overview_change_nickname" id="0x7f0a0335" />
-    <public type="id" name="guild_actions_overview_copy_id" id="0x7f0a0336" />
-    <public type="id" name="guild_actions_overview_create_category" id="0x7f0a0337" />
-    <public type="id" name="guild_actions_overview_create_channel" id="0x7f0a0338" />
-    <public type="id" name="guild_actions_overview_header_icon_iv" id="0x7f0a0339" />
-    <public type="id" name="guild_actions_overview_header_icon_tv" id="0x7f0a033a" />
-    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a033b" />
-    <public type="id" name="guild_actions_overview_leave" id="0x7f0a033c" />
-    <public type="id" name="guild_actions_overview_mark_as_read" id="0x7f0a033d" />
-    <public type="id" name="guild_actions_overview_notifications" id="0x7f0a033e" />
-    <public type="id" name="guild_actions_overview_privacy_cs" id="0x7f0a033f" />
-    <public type="id" name="guild_actions_overview_settings" id="0x7f0a0340" />
-    <public type="id" name="guild_actions_overview_show_hide_muted_channels" id="0x7f0a0341" />
-    <public type="id" name="guild_call_controls" id="0x7f0a0342" />
-    <public type="id" name="guild_call_participant_list" id="0x7f0a0343" />
-    <public type="id" name="guild_call_view_flipper" id="0x7f0a0344" />
-    <public type="id" name="guild_create_guidelines" id="0x7f0a0345" />
-    <public type="id" name="guild_create_icon" id="0x7f0a0346" />
-    <public type="id" name="guild_create_icon_placeholder" id="0x7f0a0347" />
-    <public type="id" name="guild_create_icon_wrap" id="0x7f0a0348" />
-    <public type="id" name="guild_create_name" id="0x7f0a0349" />
-    <public type="id" name="guild_create_regions" id="0x7f0a034a" />
-    <public type="id" name="guild_invite_accept" id="0x7f0a034b" />
-    <public type="id" name="guild_invite_actions" id="0x7f0a034c" />
-    <public type="id" name="guild_invite_cancel" id="0x7f0a034d" />
-    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a034e" />
-    <public type="id" name="guild_invite_empty_results" id="0x7f0a034f" />
-    <public type="id" name="guild_invite_empty_suggestions_container" id="0x7f0a0350" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7f0a0351" />
-    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7f0a0352" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7f0a0353" />
-    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7f0a0354" />
-    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a0355" />
-    <public type="id" name="guild_invite_friends_subtitle" id="0x7f0a0356" />
-    <public type="id" name="guild_invite_friends_title" id="0x7f0a0357" />
-    <public type="id" name="guild_invite_generate_link" id="0x7f0a0358" />
-    <public type="id" name="guild_invite_info" id="0x7f0a0359" />
-    <public type="id" name="guild_invite_link" id="0x7f0a035a" />
-    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a035b" />
-    <public type="id" name="guild_invite_never_expire" id="0x7f0a035c" />
-    <public type="id" name="guild_invite_settings_edit" id="0x7f0a035d" />
-    <public type="id" name="guild_invite_share_btn" id="0x7f0a035e" />
-    <public type="id" name="guild_invite_splash" id="0x7f0a035f" />
-    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0360" />
-    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a0361" />
-    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a0362" />
-    <public type="id" name="guild_join_action_btn" id="0x7f0a0363" />
-    <public type="id" name="guild_join_content" id="0x7f0a0364" />
-    <public type="id" name="guild_join_invite" id="0x7f0a0365" />
-    <public type="id" name="guild_list" id="0x7f0a0366" />
-    <public type="id" name="guild_list_add_hint" id="0x7f0a0367" />
-    <public type="id" name="guild_list_unreads_stub" id="0x7f0a0368" />
-    <public type="id" name="guild_notifications_add_override" id="0x7f0a0369" />
-    <public type="id" name="guild_notifications_channel_list" id="0x7f0a036a" />
-    <public type="id" name="guild_notifications_override_list" id="0x7f0a036b" />
-    <public type="id" name="guild_search_item_avatar" id="0x7f0a036c" />
-    <public type="id" name="guild_search_item_name" id="0x7f0a036d" />
-    <public type="id" name="guild_search_recycler" id="0x7f0a036e" />
-    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a036f" />
-    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a0370" />
-    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0371" />
-    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a0372" />
-    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a0373" />
-    <public type="id" name="guild_view_1" id="0x7f0a0374" />
-    <public type="id" name="guild_view_2" id="0x7f0a0375" />
-    <public type="id" name="guild_view_3" id="0x7f0a0376" />
-    <public type="id" name="guild_view_4" id="0x7f0a0377" />
-    <public type="id" name="guild_view_image" id="0x7f0a0378" />
-    <public type="id" name="guild_view_text" id="0x7f0a0379" />
-    <public type="id" name="guild_views" id="0x7f0a037a" />
-    <public type="id" name="guilds_item_avatar" id="0x7f0a037b" />
-    <public type="id" name="guilds_item_avatar_text" id="0x7f0a037c" />
-    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a037d" />
-    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a037e" />
-    <public type="id" name="guilds_item_dm_count" id="0x7f0a037f" />
-    <public type="id" name="guilds_item_folder" id="0x7f0a0380" />
-    <public type="id" name="guilds_item_folder_container" id="0x7f0a0381" />
-    <public type="id" name="guilds_item_guild_new_avatar" id="0x7f0a0382" />
-    <public type="id" name="guilds_item_highlight" id="0x7f0a0383" />
-    <public type="id" name="guilds_item_mentions" id="0x7f0a0384" />
-    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a0385" />
-    <public type="id" name="guilds_item_profile_selected" id="0x7f0a0386" />
-    <public type="id" name="guilds_item_selected" id="0x7f0a0387" />
-    <public type="id" name="guilds_item_unread" id="0x7f0a0388" />
-    <public type="id" name="guilds_item_voice" id="0x7f0a0389" />
-    <public type="id" name="hardware" id="0x7f0a038a" />
-    <public type="id" name="header_item_text" id="0x7f0a038b" />
-    <public type="id" name="home" id="0x7f0a038c" />
-    <public type="id" name="homeAsUp" id="0x7f0a038d" />
-    <public type="id" name="icon" id="0x7f0a038e" />
-    <public type="id" name="icon_group" id="0x7f0a038f" />
-    <public type="id" name="icon_only" id="0x7f0a0390" />
-    <public type="id" name="ifRoom" id="0x7f0a0391" />
-    <public type="id" name="image" id="0x7f0a0392" />
-    <public type="id" name="image_bottom_guideline" id="0x7f0a0393" />
-    <public type="id" name="image_view_crop" id="0x7f0a0394" />
-    <public type="id" name="image_view_logo" id="0x7f0a0395" />
-    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a0396" />
-    <public type="id" name="image_view_state_rotate" id="0x7f0a0397" />
-    <public type="id" name="image_view_state_scale" id="0x7f0a0398" />
-    <public type="id" name="incoming_call_accept_button" id="0x7f0a0399" />
-    <public type="id" name="incoming_call_accept_container" id="0x7f0a039a" />
-    <public type="id" name="incoming_call_accept_text" id="0x7f0a039b" />
-    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a039c" />
-    <public type="id" name="incoming_call_decline_button" id="0x7f0a039d" />
-    <public type="id" name="incoming_call_decline_container" id="0x7f0a039e" />
-    <public type="id" name="incoming_call_status_container" id="0x7f0a039f" />
-    <public type="id" name="incoming_call_status_primary" id="0x7f0a03a0" />
-    <public type="id" name="incoming_call_status_secondary" id="0x7f0a03a1" />
-    <public type="id" name="incoming_call_top_guideline" id="0x7f0a03a2" />
-    <public type="id" name="incoming_call_users_recycler" id="0x7f0a03a3" />
-    <public type="id" name="info" id="0x7f0a03a4" />
-    <public type="id" name="integration_header_container" id="0x7f0a03a5" />
-    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a03a6" />
-    <public type="id" name="integration_icon" id="0x7f0a03a7" />
-    <public type="id" name="integration_name" id="0x7f0a03a8" />
-    <public type="id" name="integration_name_container" id="0x7f0a03a9" />
-    <public type="id" name="integration_owner_name" id="0x7f0a03aa" />
-    <public type="id" name="integration_settings_icon" id="0x7f0a03ab" />
-    <public type="id" name="integration_sync_switch" id="0x7f0a03ac" />
-    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a03ad" />
-    <public type="id" name="integrations_empty_body" id="0x7f0a03ae" />
-    <public type="id" name="integrations_empty_header" id="0x7f0a03af" />
-    <public type="id" name="integrations_recycler" id="0x7f0a03b0" />
-    <public type="id" name="integrations_view_flipper" id="0x7f0a03b1" />
-    <public type="id" name="invisible" id="0x7f0a03b2" />
-    <public type="id" name="invite_actions_copy" id="0x7f0a03b3" />
-    <public type="id" name="invite_actions_revoke" id="0x7f0a03b4" />
-    <public type="id" name="invite_actions_share" id="0x7f0a03b5" />
-    <public type="id" name="invite_actions_title" id="0x7f0a03b6" />
-    <public type="id" name="invite_avatar" id="0x7f0a03b7" />
-    <public type="id" name="invite_avatar_small" id="0x7f0a03b8" />
-    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a03b9" />
-    <public type="id" name="invite_avatar_wrap" id="0x7f0a03ba" />
-    <public type="id" name="invite_channel" id="0x7f0a03bb" />
-    <public type="id" name="invite_code" id="0x7f0a03bc" />
-    <public type="id" name="invite_container" id="0x7f0a03bd" />
-    <public type="id" name="invite_divider" id="0x7f0a03be" />
-    <public type="id" name="invite_expiration_container" id="0x7f0a03bf" />
-    <public type="id" name="invite_expiration_time" id="0x7f0a03c0" />
-    <public type="id" name="invite_expired_image" id="0x7f0a03c1" />
-    <public type="id" name="invite_expires_label" id="0x7f0a03c2" />
-    <public type="id" name="invite_list_item_avatar" id="0x7f0a03c3" />
-    <public type="id" name="invite_members_online" id="0x7f0a03c4" />
-    <public type="id" name="invite_members_online_wrap" id="0x7f0a03c5" />
-    <public type="id" name="invite_members_total" id="0x7f0a03c6" />
-    <public type="id" name="invite_members_total_wrap" id="0x7f0a03c7" />
-    <public type="id" name="invite_members_wrap" id="0x7f0a03c8" />
-    <public type="id" name="invite_message" id="0x7f0a03c9" />
-    <public type="id" name="invite_name_container" id="0x7f0a03ca" />
-    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a03cb" />
-    <public type="id" name="invite_settings_icon" id="0x7f0a03cc" />
-    <public type="id" name="invite_title" id="0x7f0a03cd" />
-    <public type="id" name="invite_user_name" id="0x7f0a03ce" />
-    <public type="id" name="invite_uses" id="0x7f0a03cf" />
-    <public type="id" name="invite_uses_label" id="0x7f0a03d0" />
-    <public type="id" name="italic" id="0x7f0a03d1" />
-    <public type="id" name="item_backup_code_tv" id="0x7f0a03d2" />
-    <public type="id" name="item_check_indicator" id="0x7f0a03d3" />
-    <public type="id" name="item_description_tv" id="0x7f0a03d4" />
-    <public type="id" name="item_game_invite_action_btn" id="0x7f0a03d5" />
-    <public type="id" name="item_game_invite_application_name" id="0x7f0a03d6" />
-    <public type="id" name="item_game_invite_cover_image" id="0x7f0a03d7" />
-    <public type="id" name="item_game_invite_header" id="0x7f0a03d8" />
-    <public type="id" name="item_game_invite_recycler" id="0x7f0a03d9" />
-    <public type="id" name="item_game_invite_status" id="0x7f0a03da" />
-    <public type="id" name="item_gift_accept_button" id="0x7f0a03db" />
-    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a03dc" />
-    <public type="id" name="item_gift_details" id="0x7f0a03dd" />
-    <public type="id" name="item_gift_expires" id="0x7f0a03de" />
-    <public type="id" name="item_gift_header" id="0x7f0a03df" />
-    <public type="id" name="item_gift_image" id="0x7f0a03e0" />
-    <public type="id" name="item_gift_image_background" id="0x7f0a03e1" />
-    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a03e2" />
-    <public type="id" name="item_gift_name" id="0x7f0a03e3" />
-    <public type="id" name="item_gift_subtext" id="0x7f0a03e4" />
-    <public type="id" name="item_gift_verify_button" id="0x7f0a03e5" />
-    <public type="id" name="item_group_tv" id="0x7f0a03e6" />
-    <public type="id" name="item_guild_welcome_header" id="0x7f0a03e7" />
-    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a03e8" />
-    <public type="id" name="item_header" id="0x7f0a03e9" />
-    <public type="id" name="item_header_tv" id="0x7f0a03ea" />
-    <public type="id" name="item_icon_iv" id="0x7f0a03eb" />
-    <public type="id" name="item_invite_btn" id="0x7f0a03ec" />
-    <public type="id" name="item_invite_header" id="0x7f0a03ed" />
-    <public type="id" name="item_invite_image" id="0x7f0a03ee" />
-    <public type="id" name="item_invite_image_text" id="0x7f0a03ef" />
-    <public type="id" name="item_invite_join_button" id="0x7f0a03f0" />
-    <public type="id" name="item_invite_joined_button" id="0x7f0a03f1" />
-    <public type="id" name="item_invite_loading_button" id="0x7f0a03f2" />
-    <public type="id" name="item_invite_member_container" id="0x7f0a03f3" />
-    <public type="id" name="item_invite_mention_button" id="0x7f0a03f4" />
-    <public type="id" name="item_invite_name" id="0x7f0a03f5" />
-    <public type="id" name="item_invite_online_dot" id="0x7f0a03f6" />
-    <public type="id" name="item_invite_online_text" id="0x7f0a03f7" />
-    <public type="id" name="item_invite_total_member_dot" id="0x7f0a03f8" />
-    <public type="id" name="item_invite_total_member_text" id="0x7f0a03f9" />
-    <public type="id" name="item_listen_together_album_image" id="0x7f0a03fa" />
-    <public type="id" name="item_listen_together_artist" id="0x7f0a03fb" />
-    <public type="id" name="item_listen_together_container" id="0x7f0a03fc" />
-    <public type="id" name="item_listen_together_header" id="0x7f0a03fd" />
-    <public type="id" name="item_listen_together_join" id="0x7f0a03fe" />
-    <public type="id" name="item_listen_together_recycler" id="0x7f0a03ff" />
-    <public type="id" name="item_listen_together_session_ended" id="0x7f0a0400" />
-    <public type="id" name="item_listen_together_track" id="0x7f0a0401" />
-    <public type="id" name="item_mentions_tv" id="0x7f0a0402" />
-    <public type="id" name="item_name_tv" id="0x7f0a0403" />
-    <public type="id" name="item_sent" id="0x7f0a0404" />
-    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a0405" />
-    <public type="id" name="item_unread" id="0x7f0a0406" />
-    <public type="id" name="kick_user_body" id="0x7f0a0407" />
-    <public type="id" name="kick_user_cancel" id="0x7f0a0408" />
-    <public type="id" name="kick_user_confirm" id="0x7f0a0409" />
-    <public type="id" name="kick_user_reason" id="0x7f0a040a" />
-    <public type="id" name="kick_user_title" id="0x7f0a040b" />
-    <public type="id" name="labeled" id="0x7f0a040c" />
-    <public type="id" name="largeLabel" id="0x7f0a040d" />
-    <public type="id" name="launch_btn" id="0x7f0a040e" />
-    <public type="id" name="launch_camera_btn" id="0x7f0a040f" />
-    <public type="id" name="layout_aspect_ratio" id="0x7f0a0410" />
-    <public type="id" name="layout_rotate_wheel" id="0x7f0a0411" />
-    <public type="id" name="layout_scale_wheel" id="0x7f0a0412" />
-    <public type="id" name="left" id="0x7f0a0413" />
-    <public type="id" name="light" id="0x7f0a0414" />
-    <public type="id" name="line1" id="0x7f0a0415" />
-    <public type="id" name="line3" id="0x7f0a0416" />
-    <public type="id" name="list" id="0x7f0a0417" />
-    <public type="id" name="listMode" id="0x7f0a0418" />
-    <public type="id" name="list_item" id="0x7f0a0419" />
-    <public type="id" name="loading_button_progress" id="0x7f0a041a" />
-    <public type="id" name="loading_button_text" id="0x7f0a041b" />
-    <public type="id" name="location" id="0x7f0a041c" />
-    <public type="id" name="lottie_layer_name" id="0x7f0a041d" />
-    <public type="id" name="main_drawer" id="0x7f0a041e" />
-    <public type="id" name="main_input_container" id="0x7f0a041f" />
-    <public type="id" name="main_panel_center" id="0x7f0a0420" />
-    <public type="id" name="main_panel_center_channel_less" id="0x7f0a0421" />
-    <public type="id" name="main_panel_center_channel_less_body" id="0x7f0a0422" />
-    <public type="id" name="main_panel_center_channel_less_title" id="0x7f0a0423" />
-    <public type="id" name="main_panel_center_nsfw" id="0x7f0a0424" />
-    <public type="id" name="main_panel_center_nsfw_anchor_wrap" id="0x7f0a0425" />
-    <public type="id" name="main_panel_center_nsfw_confirm" id="0x7f0a0426" />
-    <public type="id" name="main_panel_center_nsfw_deny" id="0x7f0a0427" />
-    <public type="id" name="main_panel_left" id="0x7f0a0428" />
-    <public type="id" name="main_panel_loading" id="0x7f0a0429" />
-    <public type="id" name="main_panel_right" id="0x7f0a042a" />
-    <public type="id" name="main_toolbar_unread_count" id="0x7f0a042b" />
-    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a042c" />
-    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a042d" />
-    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a042e" />
-    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a042f" />
-    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a0430" />
-    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a0431" />
-    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a0432" />
-    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a0433" />
-    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a0434" />
-    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a0435" />
-    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a0436" />
-    <public type="id" name="masked" id="0x7f0a0437" />
-    <public type="id" name="media_image" id="0x7f0a0438" />
-    <public type="id" name="media_video" id="0x7f0a0439" />
-    <public type="id" name="member_list_item_avatar" id="0x7f0a043a" />
-    <public type="id" name="member_list_item_container" id="0x7f0a043b" />
-    <public type="id" name="member_list_item_lock" id="0x7f0a043c" />
-    <public type="id" name="member_list_item_name" id="0x7f0a043d" />
-    <public type="id" name="member_list_item_overflow" id="0x7f0a043e" />
-    <public type="id" name="member_list_item_roles_recycler" id="0x7f0a043f" />
-    <public type="id" name="menu_add_connections" id="0x7f0a0440" />
-    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a0441" />
-    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a0442" />
-    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a0443" />
-    <public type="id" name="menu_auth_mfa_info" id="0x7f0a0444" />
-    <public type="id" name="menu_channel_notification_settings" id="0x7f0a0445" />
-    <public type="id" name="menu_channel_settings" id="0x7f0a0446" />
-    <public type="id" name="menu_channel_settings_delete" id="0x7f0a0447" />
-    <public type="id" name="menu_channel_settings_reset" id="0x7f0a0448" />
-    <public type="id" name="menu_chat_add_friend" id="0x7f0a0449" />
-    <public type="id" name="menu_chat_dms_close" id="0x7f0a044a" />
-    <public type="id" name="menu_chat_dms_view_profile" id="0x7f0a044b" />
-    <public type="id" name="menu_chat_group_add" id="0x7f0a044c" />
-    <public type="id" name="menu_chat_group_settings" id="0x7f0a044d" />
-    <public type="id" name="menu_chat_pins" id="0x7f0a044e" />
-    <public type="id" name="menu_chat_search" id="0x7f0a044f" />
-    <public type="id" name="menu_chat_side_panel" id="0x7f0a0450" />
-    <public type="id" name="menu_chat_start_call" id="0x7f0a0451" />
-    <public type="id" name="menu_chat_start_group" id="0x7f0a0452" />
-    <public type="id" name="menu_chat_start_video_call" id="0x7f0a0453" />
-    <public type="id" name="menu_chat_stop_call" id="0x7f0a0454" />
-    <public type="id" name="menu_copy_id" id="0x7f0a0455" />
-    <public type="id" name="menu_crop" id="0x7f0a0456" />
-    <public type="id" name="menu_debugging_filter" id="0x7f0a0457" />
-    <public type="id" name="menu_debugging_share" id="0x7f0a0458" />
-    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a0459" />
-    <public type="id" name="menu_edit_role_delete" id="0x7f0a045a" />
-    <public type="id" name="menu_filter" id="0x7f0a045b" />
-    <public type="id" name="menu_guild_call_channel_settings" id="0x7f0a045c" />
-    <public type="id" name="menu_guild_call_overlay_launcher" id="0x7f0a045d" />
-    <public type="id" name="menu_guild_call_voice_settings" id="0x7f0a045e" />
-    <public type="id" name="menu_guild_create" id="0x7f0a045f" />
-    <public type="id" name="menu_guild_join" id="0x7f0a0460" />
-    <public type="id" name="menu_leave_group" id="0x7f0a0461" />
-    <public type="id" name="menu_loader" id="0x7f0a0462" />
-    <public type="id" name="menu_media_browser" id="0x7f0a0463" />
-    <public type="id" name="menu_media_download" id="0x7f0a0464" />
-    <public type="id" name="menu_media_share" id="0x7f0a0465" />
-    <public type="id" name="menu_private_call_group_settings" id="0x7f0a0466" />
-    <public type="id" name="menu_private_call_participants" id="0x7f0a0467" />
-    <public type="id" name="menu_private_call_select_camera" id="0x7f0a0468" />
-    <public type="id" name="menu_private_call_toggle_speaker_mode" id="0x7f0a0469" />
-    <public type="id" name="menu_private_call_user_settings" id="0x7f0a046a" />
-    <public type="id" name="menu_private_call_voice_settings" id="0x7f0a046b" />
-    <public type="id" name="menu_send" id="0x7f0a046c" />
-    <public type="id" name="menu_server_settings_delete" id="0x7f0a046d" />
-    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a046e" />
-    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a046f" />
-    <public type="id" name="menu_settings_debugging" id="0x7f0a0470" />
-    <public type="id" name="menu_settings_log_out" id="0x7f0a0471" />
-    <public type="id" name="menu_sort_channel" id="0x7f0a0472" />
-    <public type="id" name="menu_sort_done" id="0x7f0a0473" />
-    <public type="id" name="menu_user_mentions_filter" id="0x7f0a0474" />
-    <public type="id" name="menu_user_profile_block" id="0x7f0a0475" />
-    <public type="id" name="menu_user_profile_cancel" id="0x7f0a0476" />
-    <public type="id" name="menu_user_profile_ignore" id="0x7f0a0477" />
-    <public type="id" name="menu_user_profile_message" id="0x7f0a0478" />
-    <public type="id" name="menu_user_profile_remove_friend" id="0x7f0a0479" />
-    <public type="id" name="menu_user_profile_unblock" id="0x7f0a047a" />
-    <public type="id" name="message" id="0x7f0a047b" />
-    <public type="id" name="mfa_description_text" id="0x7f0a047c" />
-    <public type="id" name="mfa_download_body" id="0x7f0a047d" />
-    <public type="id" name="mfa_success_enable_sms" id="0x7f0a047e" />
-    <public type="id" name="middle" id="0x7f0a047f" />
-    <public type="id" name="mini" id="0x7f0a0480" />
-    <public type="id" name="mtrl_child_content_container" id="0x7f0a0481" />
-    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a0482" />
-    <public type="id" name="multiply" id="0x7f0a0483" />
-    <public type="id" name="mute_toggle" id="0x7f0a0484" />
-    <public type="id" name="navigation_header_container" id="0x7f0a0485" />
-    <public type="id" name="navigation_indicator" id="0x7f0a0486" />
-    <public type="id" name="nearby_friends_button_flipper" id="0x7f0a0487" />
-    <public type="id" name="nearby_friends_disable" id="0x7f0a0488" />
-    <public type="id" name="nearby_friends_enable" id="0x7f0a0489" />
-    <public type="id" name="nearby_friends_error" id="0x7f0a048a" />
-    <public type="id" name="nearby_friends_flipper" id="0x7f0a048b" />
-    <public type="id" name="nearby_friends_learn_more" id="0x7f0a048c" />
-    <public type="id" name="nearby_friends_recycler" id="0x7f0a048d" />
-    <public type="id" name="nearby_friends_searching" id="0x7f0a048e" />
-    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a048f" />
-    <public type="id" name="never" id="0x7f0a0490" />
-    <public type="id" name="news_item_view" id="0x7f0a0491" />
-    <public type="id" name="no_bans_body" id="0x7f0a0492" />
-    <public type="id" name="no_invites_body" id="0x7f0a0493" />
-    <public type="id" name="no_invites_header" id="0x7f0a0494" />
-    <public type="id" name="no_logs_body" id="0x7f0a0495" />
-    <public type="id" name="no_logs_title" id="0x7f0a0496" />
-    <public type="id" name="no_results_text" id="0x7f0a0497" />
-    <public type="id" name="none" id="0x7f0a0498" />
-    <public type="id" name="normal" id="0x7f0a0499" />
-    <public type="id" name="notice_body_container" id="0x7f0a049a" />
-    <public type="id" name="notice_body_text" id="0x7f0a049b" />
-    <public type="id" name="notice_cancel" id="0x7f0a049c" />
-    <public type="id" name="notice_crop" id="0x7f0a049d" />
-    <public type="id" name="notice_header" id="0x7f0a049e" />
-    <public type="id" name="notice_header_container" id="0x7f0a049f" />
-    <public type="id" name="notice_image" id="0x7f0a04a0" />
-    <public type="id" name="notice_ok" id="0x7f0a04a1" />
-    <public type="id" name="notice_upload" id="0x7f0a04a2" />
-    <public type="id" name="notification_background" id="0x7f0a04a3" />
-    <public type="id" name="notification_main_column" id="0x7f0a04a4" />
-    <public type="id" name="notification_main_column_container" id="0x7f0a04a5" />
-    <public type="id" name="nowrap" id="0x7f0a04a6" />
-    <public type="id" name="nux_guild_use_cases_dismiss" id="0x7f0a04a7" />
-    <public type="id" name="nux_guild_use_cases_item_chat_with_friends" id="0x7f0a04a8" />
-    <public type="id" name="nux_guild_use_cases_item_club" id="0x7f0a04a9" />
-    <public type="id" name="nux_guild_use_cases_item_gaming" id="0x7f0a04aa" />
-    <public type="id" name="nux_guild_use_cases_item_join_a_friend" id="0x7f0a04ab" />
-    <public type="id" name="nux_guild_use_cases_item_voice_chat" id="0x7f0a04ac" />
-    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a04ad" />
-    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a04ae" />
-    <public type="id" name="oauth_application_description_tv" id="0x7f0a04af" />
-    <public type="id" name="oauth_application_icon_iv" id="0x7f0a04b0" />
-    <public type="id" name="oauth_application_name_tv" id="0x7f0a04b1" />
-    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a04b2" />
-    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a04b3" />
-    <public type="id" name="oauth_authorize_application_name" id="0x7f0a04b4" />
-    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a04b5" />
-    <public type="id" name="oauth_authorize_content" id="0x7f0a04b6" />
-    <public type="id" name="oauth_authorize_deny" id="0x7f0a04b7" />
-    <public type="id" name="oauth_authorize_grant" id="0x7f0a04b8" />
-    <public type="id" name="oauth_authorize_loading" id="0x7f0a04b9" />
-    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a04ba" />
-    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a04bb" />
-    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a04bc" />
-    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a04bd" />
-    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a04be" />
-    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a04bf" />
-    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a04c0" />
-    <public type="id" name="oauth_token_permission_detailed_desc" id="0x7f0a04c1" />
-    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a04c2" />
-    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a04c3" />
-    <public type="id" name="off" id="0x7f0a04c4" />
-    <public type="id" name="off_disabled_overlay" id="0x7f0a04c5" />
-    <public type="id" name="on" id="0x7f0a04c6" />
-    <public type="id" name="outline" id="0x7f0a04c7" />
-    <public type="id" name="overlay_bubble_iv" id="0x7f0a04c8" />
-    <public type="id" name="overlay_channel_name" id="0x7f0a04c9" />
-    <public type="id" name="overlay_guild_name" id="0x7f0a04ca" />
-    <public type="id" name="overlay_header" id="0x7f0a04cb" />
-    <public type="id" name="overlay_invite_link" id="0x7f0a04cc" />
-    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a04cd" />
-    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a04ce" />
-    <public type="id" name="overlay_members_rv" id="0x7f0a04cf" />
-    <public type="id" name="overlay_menu" id="0x7f0a04d0" />
-    <public type="id" name="overlay_network_icon" id="0x7f0a04d1" />
-    <public type="id" name="overlay_open_app" id="0x7f0a04d2" />
-    <public type="id" name="overlay_switch_channels" id="0x7f0a04d3" />
-    <public type="id" name="packed" id="0x7f0a04d4" />
-    <public type="id" name="page_tabs" id="0x7f0a04d5" />
-    <public type="id" name="parallax" id="0x7f0a04d6" />
-    <public type="id" name="parent" id="0x7f0a04d7" />
-    <public type="id" name="parentPanel" id="0x7f0a04d8" />
-    <public type="id" name="parent_matrix" id="0x7f0a04d9" />
-    <public type="id" name="participant_bg_avatar" id="0x7f0a04da" />
-    <public type="id" name="participant_bg_letterbox" id="0x7f0a04db" />
-    <public type="id" name="participant_content_container" id="0x7f0a04dc" />
-    <public type="id" name="participant_video_loading_indicator" id="0x7f0a04dd" />
-    <public type="id" name="participant_voice_status_indicator" id="0x7f0a04de" />
-    <public type="id" name="participant_voice_user_view" id="0x7f0a04df" />
-    <public type="id" name="payment_info_address_1_textinputlayout" id="0x7f0a04e0" />
-    <public type="id" name="payment_info_address_2_textinputlayout" id="0x7f0a04e1" />
-    <public type="id" name="payment_info_cancel" id="0x7f0a04e2" />
-    <public type="id" name="payment_info_city_edittext" id="0x7f0a04e3" />
-    <public type="id" name="payment_info_city_textinputlayout" id="0x7f0a04e4" />
-    <public type="id" name="payment_info_delete" id="0x7f0a04e5" />
-    <public type="id" name="payment_info_make_default_checkbox" id="0x7f0a04e6" />
-    <public type="id" name="payment_info_name_address_1_edittext" id="0x7f0a04e7" />
-    <public type="id" name="payment_info_name_address_2_edittext" id="0x7f0a04e8" />
-    <public type="id" name="payment_info_name_edittext" id="0x7f0a04e9" />
-    <public type="id" name="payment_info_name_textinputlayout" id="0x7f0a04ea" />
-    <public type="id" name="payment_info_save" id="0x7f0a04eb" />
-    <public type="id" name="payment_info_zip_edittext" id="0x7f0a04ec" />
-    <public type="id" name="payment_info_zip_textinputlayout" id="0x7f0a04ed" />
-    <public type="id" name="payment_method_edit" id="0x7f0a04ee" />
-    <public type="id" name="payment_method_header" id="0x7f0a04ef" />
-    <public type="id" name="payment_method_summary" id="0x7f0a04f0" />
-    <public type="id" name="payment_methods_empty_add" id="0x7f0a04f1" />
-    <public type="id" name="payment_methods_empty_image" id="0x7f0a04f2" />
-    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a04f3" />
-    <public type="id" name="payment_methods_empty_title" id="0x7f0a04f4" />
-    <public type="id" name="payment_methods_loading" id="0x7f0a04f5" />
-    <public type="id" name="payment_methods_recycler" id="0x7f0a04f6" />
-    <public type="id" name="payment_methods_retry" id="0x7f0a04f7" />
-    <public type="id" name="payment_methods_view_flipper" id="0x7f0a04f8" />
-    <public type="id" name="payment_source_edit_address1" id="0x7f0a04f9" />
-    <public type="id" name="payment_source_edit_address2" id="0x7f0a04fa" />
-    <public type="id" name="payment_source_edit_city" id="0x7f0a04fb" />
-    <public type="id" name="payment_source_edit_country" id="0x7f0a04fc" />
-    <public type="id" name="payment_source_edit_default" id="0x7f0a04fd" />
-    <public type="id" name="payment_source_edit_error" id="0x7f0a04fe" />
-    <public type="id" name="payment_source_edit_help" id="0x7f0a04ff" />
-    <public type="id" name="payment_source_edit_name" id="0x7f0a0500" />
-    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a0501" />
-    <public type="id" name="payment_source_edit_state" id="0x7f0a0502" />
-    <public type="id" name="payment_source_summary" id="0x7f0a0503" />
-    <public type="id" name="payment_source_view_icon" id="0x7f0a0504" />
-    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a0505" />
-    <public type="id" name="payment_source_view_invalid" id="0x7f0a0506" />
-    <public type="id" name="payment_source_view_premium" id="0x7f0a0507" />
-    <public type="id" name="payment_source_view_subtext" id="0x7f0a0508" />
-    <public type="id" name="payment_source_view_title" id="0x7f0a0509" />
-    <public type="id" name="percent" id="0x7f0a050a" />
-    <public type="id" name="perk_view_content_list_item" id="0x7f0a050b" />
-    <public type="id" name="perks_level_contents_header" id="0x7f0a050c" />
-    <public type="id" name="perks_level_contents_recycler" id="0x7f0a050d" />
-    <public type="id" name="perks_level_header" id="0x7f0a050e" />
-    <public type="id" name="perks_level_header_boosts" id="0x7f0a050f" />
-    <public type="id" name="perks_level_header_text" id="0x7f0a0510" />
-    <public type="id" name="perks_level_header_unlocked" id="0x7f0a0511" />
-    <public type="id" name="perm_req_text" id="0x7f0a0512" />
-    <public type="id" name="permissions_container" id="0x7f0a0513" />
-    <public type="id" name="permissions_req_btn" id="0x7f0a0514" />
-    <public type="id" name="pin" id="0x7f0a0515" />
-    <public type="id" name="platform_identities_list" id="0x7f0a0516" />
-    <public type="id" name="popup_attachment" id="0x7f0a0517" />
-    <public type="id" name="popup_body" id="0x7f0a0518" />
-    <public type="id" name="popup_close_btn" id="0x7f0a0519" />
-    <public type="id" name="popup_countdown_progress" id="0x7f0a051a" />
-    <public type="id" name="popup_icon" id="0x7f0a051b" />
-    <public type="id" name="popup_subtitle" id="0x7f0a051c" />
-    <public type="id" name="popup_title" id="0x7f0a051d" />
-    <public type="id" name="premium_perks_upload_text" id="0x7f0a051e" />
-    <public type="id" name="premium_settings_active_subscription" id="0x7f0a051f" />
-    <public type="id" name="premium_settings_credit_container" id="0x7f0a0520" />
-    <public type="id" name="premium_settings_grandfathered" id="0x7f0a0521" />
-    <public type="id" name="premium_settings_legalese" id="0x7f0a0522" />
-    <public type="id" name="premium_settings_nitro" id="0x7f0a0523" />
-    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a0524" />
-    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a0525" />
-    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a0526" />
-    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a0527" />
-    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a0528" />
-    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a0529" />
-    <public type="id" name="premium_settings_premium_gift" id="0x7f0a052a" />
-    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a052b" />
-    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a052c" />
-    <public type="id" name="premium_settings_retry" id="0x7f0a052d" />
-    <public type="id" name="premium_settings_scrollview" id="0x7f0a052e" />
-    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a052f" />
-    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a0530" />
-    <public type="id" name="premium_settings_view_flipper" id="0x7f0a0531" />
-    <public type="id" name="premium_upsell_body" id="0x7f0a0532" />
-    <public type="id" name="premium_upsell_close" id="0x7f0a0533" />
-    <public type="id" name="premium_upsell_dots" id="0x7f0a0534" />
-    <public type="id" name="premium_upsell_header" id="0x7f0a0535" />
-    <public type="id" name="premium_upsell_img" id="0x7f0a0536" />
-    <public type="id" name="premium_upsell_learn_more" id="0x7f0a0537" />
-    <public type="id" name="premium_upsell_viewpager" id="0x7f0a0538" />
-    <public type="id" name="private_call_connect" id="0x7f0a0539" />
-    <public type="id" name="private_call_controls_disconnect" id="0x7f0a053a" />
-    <public type="id" name="private_call_controls_mute" id="0x7f0a053b" />
-    <public type="id" name="private_call_controls_video" id="0x7f0a053c" />
-    <public type="id" name="private_call_participant_list" id="0x7f0a053d" />
-    <public type="id" name="private_call_pip_participant" id="0x7f0a053e" />
-    <public type="id" name="private_call_push_to_talk" id="0x7f0a053f" />
-    <public type="id" name="private_call_status_container" id="0x7f0a0540" />
-    <public type="id" name="private_call_status_primary" id="0x7f0a0541" />
-    <public type="id" name="private_call_status_secondary" id="0x7f0a0542" />
-    <public type="id" name="private_call_top_guideline" id="0x7f0a0543" />
-    <public type="id" name="private_call_video_streams" id="0x7f0a0544" />
-    <public type="id" name="private_call_voice_status_group" id="0x7f0a0545" />
-    <public type="id" name="profile_strip_avatar" id="0x7f0a0546" />
-    <public type="id" name="profile_strip_avatar_image" id="0x7f0a0547" />
-    <public type="id" name="profile_strip_discriminator" id="0x7f0a0548" />
-    <public type="id" name="profile_strip_mentions" id="0x7f0a0549" />
-    <public type="id" name="profile_strip_name" id="0x7f0a054a" />
-    <public type="id" name="profile_strip_search" id="0x7f0a054b" />
-    <public type="id" name="profile_strip_settings" id="0x7f0a054c" />
-    <public type="id" name="profile_strip_status" id="0x7f0a054d" />
-    <public type="id" name="progress_bar" id="0x7f0a054e" />
-    <public type="id" name="progress_cancel_centered" id="0x7f0a054f" />
-    <public type="id" name="progress_cancel_top" id="0x7f0a0550" />
-    <public type="id" name="progress_circular" id="0x7f0a0551" />
-    <public type="id" name="progress_file_image" id="0x7f0a0552" />
-    <public type="id" name="progress_horizontal" id="0x7f0a0553" />
-    <public type="id" name="progress_subtext" id="0x7f0a0554" />
-    <public type="id" name="progress_text" id="0x7f0a0555" />
-    <public type="id" name="prune_user_cancel" id="0x7f0a0556" />
-    <public type="id" name="prune_user_header" id="0x7f0a0557" />
-    <public type="id" name="prune_user_prune" id="0x7f0a0558" />
-    <public type="id" name="prune_users_estimate_text" id="0x7f0a0559" />
-    <public type="id" name="prune_users_history_1_radio" id="0x7f0a055a" />
-    <public type="id" name="prune_users_history_2_radio" id="0x7f0a055b" />
-    <public type="id" name="prune_users_history_3_radio" id="0x7f0a055c" />
-    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a055d" />
-    <public type="id" name="radio" id="0x7f0a055e" />
-    <public type="id" name="reaction_counter_text_1" id="0x7f0a055f" />
-    <public type="id" name="reaction_counter_text_2" id="0x7f0a0560" />
-    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a0561" />
-    <public type="id" name="reaction_emoji_text" id="0x7f0a0562" />
-    <public type="id" name="reaction_quick_add" id="0x7f0a0563" />
-    <public type="id" name="restart" id="0x7f0a0564" />
-    <public type="id" name="result_count" id="0x7f0a0565" />
-    <public type="id" name="results_rv" id="0x7f0a0566" />
-    <public type="id" name="reverse" id="0x7f0a0567" />
-    <public type="id" name="rich_presence_container" id="0x7f0a0568" />
-    <public type="id" name="rich_presence_container_data" id="0x7f0a0569" />
-    <public type="id" name="rich_presence_details" id="0x7f0a056a" />
-    <public type="id" name="rich_presence_header" id="0x7f0a056b" />
-    <public type="id" name="rich_presence_image_large" id="0x7f0a056c" />
-    <public type="id" name="rich_presence_image_small" id="0x7f0a056d" />
-    <public type="id" name="rich_presence_music_duration" id="0x7f0a056e" />
-    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a056f" />
-    <public type="id" name="rich_presence_play_button" id="0x7f0a0570" />
-    <public type="id" name="rich_presence_play_button_text" id="0x7f0a0571" />
-    <public type="id" name="rich_presence_state" id="0x7f0a0572" />
-    <public type="id" name="rich_presence_superbar" id="0x7f0a0573" />
-    <public type="id" name="rich_presence_time" id="0x7f0a0574" />
-    <public type="id" name="rich_presence_title" id="0x7f0a0575" />
-    <public type="id" name="rich_presence_watch_button" id="0x7f0a0576" />
-    <public type="id" name="right" id="0x7f0a0577" />
-    <public type="id" name="right_icon" id="0x7f0a0578" />
-    <public type="id" name="right_side" id="0x7f0a0579" />
-    <public type="id" name="role_item_checked_setting" id="0x7f0a057a" />
-    <public type="id" name="role_settings_add_reactions" id="0x7f0a057b" />
-    <public type="id" name="role_settings_administrator" id="0x7f0a057c" />
-    <public type="id" name="role_settings_attach_files" id="0x7f0a057d" />
-    <public type="id" name="role_settings_ban_members" id="0x7f0a057e" />
-    <public type="id" name="role_settings_change_nickname" id="0x7f0a057f" />
-    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a0580" />
-    <public type="id" name="role_settings_color_selector_container" id="0x7f0a0581" />
-    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a0582" />
-    <public type="id" name="role_settings_current_color_display" id="0x7f0a0583" />
-    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a0584" />
-    <public type="id" name="role_settings_embed_links" id="0x7f0a0585" />
-    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a0586" />
-    <public type="id" name="role_settings_kick_members" id="0x7f0a0587" />
-    <public type="id" name="role_settings_manage_channels" id="0x7f0a0588" />
-    <public type="id" name="role_settings_manage_emojis" id="0x7f0a0589" />
-    <public type="id" name="role_settings_manage_messages" id="0x7f0a058a" />
-    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a058b" />
-    <public type="id" name="role_settings_manage_roles" id="0x7f0a058c" />
-    <public type="id" name="role_settings_manage_server" id="0x7f0a058d" />
-    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a058e" />
-    <public type="id" name="role_settings_mention_everyone" id="0x7f0a058f" />
-    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a0590" />
-    <public type="id" name="role_settings_overview_scroll" id="0x7f0a0591" />
-    <public type="id" name="role_settings_read_message_history" id="0x7f0a0592" />
-    <public type="id" name="role_settings_read_messages" id="0x7f0a0593" />
-    <public type="id" name="role_settings_send_messages" id="0x7f0a0594" />
-    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a0595" />
-    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a0596" />
-    <public type="id" name="role_settings_view_audit_log" id="0x7f0a0597" />
-    <public type="id" name="role_settings_voice_connect" id="0x7f0a0598" />
-    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a0599" />
-    <public type="id" name="role_settings_voice_move_members" id="0x7f0a059a" />
-    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a059b" />
-    <public type="id" name="role_settings_voice_speak" id="0x7f0a059c" />
-    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a059d" />
-    <public type="id" name="role_spinner_item_textview" id="0x7f0a059e" />
-    <public type="id" name="roles_list_add_role_fab" id="0x7f0a059f" />
-    <public type="id" name="rotate_scroll_wheel" id="0x7f0a05a0" />
-    <public type="id" name="row" id="0x7f0a05a1" />
-    <public type="id" name="row_reverse" id="0x7f0a05a2" />
-    <public type="id" name="save_image_matrix" id="0x7f0a05a3" />
-    <public type="id" name="save_non_transition_alpha" id="0x7f0a05a4" />
-    <public type="id" name="save_scale_type" id="0x7f0a05a5" />
-    <public type="id" name="scale_scroll_wheel" id="0x7f0a05a6" />
-    <public type="id" name="screen" id="0x7f0a05a7" />
-    <public type="id" name="scroll" id="0x7f0a05a8" />
-    <public type="id" name="scrollIndicatorDown" id="0x7f0a05a9" />
-    <public type="id" name="scrollIndicatorUp" id="0x7f0a05aa" />
-    <public type="id" name="scrollView" id="0x7f0a05ab" />
-    <public type="id" name="scroll_view" id="0x7f0a05ac" />
-    <public type="id" name="scrollable" id="0x7f0a05ad" />
-    <public type="id" name="search_back" id="0x7f0a05ae" />
-    <public type="id" name="search_badge" id="0x7f0a05af" />
-    <public type="id" name="search_bar" id="0x7f0a05b0" />
-    <public type="id" name="search_button" id="0x7f0a05b1" />
-    <public type="id" name="search_clear" id="0x7f0a05b2" />
-    <public type="id" name="search_close_btn" id="0x7f0a05b3" />
-    <public type="id" name="search_edit_frame" id="0x7f0a05b4" />
-    <public type="id" name="search_filter" id="0x7f0a05b5" />
-    <public type="id" name="search_flipper" id="0x7f0a05b6" />
-    <public type="id" name="search_go_btn" id="0x7f0a05b7" />
-    <public type="id" name="search_input" id="0x7f0a05b8" />
-    <public type="id" name="search_mag_icon" id="0x7f0a05b9" />
-    <public type="id" name="search_plate" id="0x7f0a05ba" />
-    <public type="id" name="search_results_list" id="0x7f0a05bb" />
-    <public type="id" name="search_send_query_fab" id="0x7f0a05bc" />
-    <public type="id" name="search_src_text" id="0x7f0a05bd" />
-    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a05be" />
-    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a05bf" />
-    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a05c0" />
-    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a05c1" />
-    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a05c2" />
-    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a05c3" />
-    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a05c4" />
-    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a05c5" />
-    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a05c6" />
-    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a05c7" />
-    <public type="id" name="search_suggestions_recycler" id="0x7f0a05c8" />
-    <public type="id" name="search_voice_btn" id="0x7f0a05c9" />
-    <public type="id" name="select_dialog_listview" id="0x7f0a05ca" />
-    <public type="id" name="selected" id="0x7f0a05cb" />
-    <public type="id" name="selected_checkmark" id="0x7f0a05cc" />
-    <public type="id" name="selection_indicator" id="0x7f0a05cd" />
-    <public type="id" name="send_btn" id="0x7f0a05ce" />
-    <public type="id" name="server_boost_status_empty_text" id="0x7f0a05cf" />
-    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a05d0" />
-    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a05d1" />
-    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a05d2" />
-    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a05d3" />
-    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a05d4" />
-    <public type="id" name="server_notifications_mute_check" id="0x7f0a05d5" />
-    <public type="id" name="server_notifications_push_switch" id="0x7f0a05d6" />
-    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a05d7" />
-    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a05d8" />
-    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a05d9" />
-    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a05da" />
-    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a05db" />
-    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a05dc" />
-    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a05dd" />
-    <public type="id" name="server_settings_bans_option" id="0x7f0a05de" />
-    <public type="id" name="server_settings_bans_recycler" id="0x7f0a05df" />
-    <public type="id" name="server_settings_bans_search" id="0x7f0a05e0" />
-    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a05e1" />
-    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a05e2" />
-    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a05e3" />
-    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a05e4" />
-    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a05e5" />
-    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a05e6" />
-    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a05e7" />
-    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a05e8" />
-    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a05e9" />
-    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a05ea" />
-    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a05eb" />
-    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a05ec" />
-    <public type="id" name="server_settings_delete_server_header" id="0x7f0a05ed" />
-    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a05ee" />
-    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a05ef" />
-    <public type="id" name="server_settings_delete_server_text" id="0x7f0a05f0" />
-    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a05f1" />
-    <public type="id" name="server_settings_emojis_container" id="0x7f0a05f2" />
-    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a05f3" />
-    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a05f4" />
-    <public type="id" name="server_settings_emojis_name" id="0x7f0a05f5" />
-    <public type="id" name="server_settings_emojis_option" id="0x7f0a05f6" />
-    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a05f7" />
-    <public type="id" name="server_settings_emojis_username" id="0x7f0a05f8" />
-    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a05f9" />
-    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a05fa" />
-    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a05fb" />
-    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a05fc" />
-    <public type="id" name="server_settings_members_header_container" id="0x7f0a05fd" />
-    <public type="id" name="server_settings_members_name_search" id="0x7f0a05fe" />
-    <public type="id" name="server_settings_members_option" id="0x7f0a05ff" />
-    <public type="id" name="server_settings_members_recycler" id="0x7f0a0600" />
-    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a0601" />
-    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a0602" />
-    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a0603" />
-    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a0604" />
-    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a0605" />
-    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a0606" />
-    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a0607" />
-    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a0608" />
-    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a0609" />
-    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a060a" />
-    <public type="id" name="server_settings_option_audit_log" id="0x7f0a060b" />
-    <public type="id" name="server_settings_option_channels" id="0x7f0a060c" />
-    <public type="id" name="server_settings_option_integrations" id="0x7f0a060d" />
-    <public type="id" name="server_settings_option_moderation" id="0x7f0a060e" />
-    <public type="id" name="server_settings_option_overview" id="0x7f0a060f" />
-    <public type="id" name="server_settings_option_security" id="0x7f0a0610" />
-    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a0611" />
-    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a0612" />
-    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a0613" />
-    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0614" />
-    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a0615" />
-    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a0616" />
-    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a0617" />
-    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a0618" />
-    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a0619" />
-    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a061a" />
-    <public type="id" name="server_settings_overview_icon" id="0x7f0a061b" />
-    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a061c" />
-    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a061d" />
-    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a061e" />
-    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a061f" />
-    <public type="id" name="server_settings_overview_name" id="0x7f0a0620" />
-    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a0621" />
-    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a0622" />
-    <public type="id" name="server_settings_overview_region" id="0x7f0a0623" />
-    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0624" />
-    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a0625" />
-    <public type="id" name="server_settings_overview_region_list" id="0x7f0a0626" />
-    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a0627" />
-    <public type="id" name="server_settings_overview_save" id="0x7f0a0628" />
-    <public type="id" name="server_settings_overview_scroll" id="0x7f0a0629" />
-    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a062a" />
-    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a062b" />
-    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a062c" />
-    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a062d" />
-    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a062e" />
-    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a062f" />
-    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a0630" />
-    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a0631" />
-    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a0632" />
-    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a0633" />
-    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0634" />
-    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a0635" />
-    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a0636" />
-    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a0637" />
-    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a0638" />
-    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a0639" />
-    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a063a" />
-    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a063b" />
-    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a063c" />
-    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a063d" />
-    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a063e" />
-    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a063f" />
-    <public type="id" name="server_settings_role_item_name" id="0x7f0a0640" />
-    <public type="id" name="server_settings_roles_option" id="0x7f0a0641" />
-    <public type="id" name="server_settings_roles_recycler" id="0x7f0a0642" />
-    <public type="id" name="server_settings_section_general_settings" id="0x7f0a0643" />
-    <public type="id" name="server_settings_section_user_management" id="0x7f0a0644" />
-    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a0645" />
-    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a0646" />
-    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a0647" />
-    <public type="id" name="server_settings_security_label" id="0x7f0a0648" />
-    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a0649" />
-    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a064a" />
-    <public type="id" name="server_settings_server_icon" id="0x7f0a064b" />
-    <public type="id" name="server_settings_server_icon_text" id="0x7f0a064c" />
-    <public type="id" name="server_settings_server_name" id="0x7f0a064d" />
-    <public type="id" name="server_settings_vanity_input" id="0x7f0a064e" />
-    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a064f" />
-    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a0650" />
-    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a0651" />
-    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a0652" />
-    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a0653" />
-    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a0654" />
-    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a0655" />
-    <public type="id" name="setting_button" id="0x7f0a0656" />
-    <public type="id" name="setting_container" id="0x7f0a0657" />
-    <public type="id" name="setting_disabled_overlay" id="0x7f0a0658" />
-    <public type="id" name="setting_label" id="0x7f0a0659" />
-    <public type="id" name="setting_subtext" id="0x7f0a065a" />
-    <public type="id" name="settings_account" id="0x7f0a065b" />
-    <public type="id" name="settings_account_avatar" id="0x7f0a065c" />
-    <public type="id" name="settings_account_avatar_container" id="0x7f0a065d" />
-    <public type="id" name="settings_account_avatar_edit" id="0x7f0a065e" />
-    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a065f" />
-    <public type="id" name="settings_account_change_password" id="0x7f0a0660" />
-    <public type="id" name="settings_account_edit" id="0x7f0a0661" />
-    <public type="id" name="settings_account_email" id="0x7f0a0662" />
-    <public type="id" name="settings_account_mfa_container" id="0x7f0a0663" />
-    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0664" />
-    <public type="id" name="settings_account_mfa_enable" id="0x7f0a0665" />
-    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a0666" />
-    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a0667" />
-    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a0668" />
-    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a0669" />
-    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a066a" />
-    <public type="id" name="settings_account_private_data_delete" id="0x7f0a066b" />
-    <public type="id" name="settings_account_private_data_disable" id="0x7f0a066c" />
-    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a066d" />
-    <public type="id" name="settings_account_remove_avatar" id="0x7f0a066e" />
-    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a066f" />
-    <public type="id" name="settings_account_save" id="0x7f0a0670" />
-    <public type="id" name="settings_account_scroll" id="0x7f0a0671" />
-    <public type="id" name="settings_account_sms_backup" id="0x7f0a0672" />
-    <public type="id" name="settings_account_sms_phone" id="0x7f0a0673" />
-    <public type="id" name="settings_account_tag" id="0x7f0a0674" />
-    <public type="id" name="settings_account_verification" id="0x7f0a0675" />
-    <public type="id" name="settings_account_verification_resend" id="0x7f0a0676" />
-    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a0677" />
-    <public type="id" name="settings_acknowledgements" id="0x7f0a0678" />
-    <public type="id" name="settings_app_info" id="0x7f0a0679" />
-    <public type="id" name="settings_appearance" id="0x7f0a067a" />
-    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a067b" />
-    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a067c" />
-    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a067d" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a067e" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a067f" />
-    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a0680" />
-    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a0681" />
-    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a0682" />
-    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a0683" />
-    <public type="id" name="settings_appearance_theme_pure_evil_radio" id="0x7f0a0684" />
-    <public type="id" name="settings_authorized_apps" id="0x7f0a0685" />
-    <public type="id" name="settings_backup_codes_generate" id="0x7f0a0686" />
-    <public type="id" name="settings_backup_codes_info" id="0x7f0a0687" />
-    <public type="id" name="settings_backup_codes_rv" id="0x7f0a0688" />
-    <public type="id" name="settings_behavior" id="0x7f0a0689" />
-    <public type="id" name="settings_behavior_back_button_toggle" id="0x7f0a068a" />
-    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a068b" />
-    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a068c" />
-    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a068d" />
-    <public type="id" name="settings_billing" id="0x7f0a068e" />
-    <public type="id" name="settings_billing_view_pager" id="0x7f0a068f" />
-    <public type="id" name="settings_bitrate_help" id="0x7f0a0690" />
-    <public type="id" name="settings_boost_flipper" id="0x7f0a0691" />
-    <public type="id" name="settings_boost_no_sub_banner" id="0x7f0a0692" />
-    <public type="id" name="settings_boost_no_sub_learn_more" id="0x7f0a0693" />
-    <public type="id" name="settings_boost_no_sub_learn_more_text" id="0x7f0a0694" />
-    <public type="id" name="settings_boost_no_sub_logo" id="0x7f0a0695" />
-    <public type="id" name="settings_boost_recycler" id="0x7f0a0696" />
-    <public type="id" name="settings_boost_retry" id="0x7f0a0697" />
-    <public type="id" name="settings_boost_subtext" id="0x7f0a0698" />
-    <public type="id" name="settings_changelog" id="0x7f0a0699" />
-    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a069a" />
-    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a069b" />
-    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a069c" />
-    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a069d" />
-    <public type="id" name="settings_channel_list_item_name" id="0x7f0a069e" />
-    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a069f" />
-    <public type="id" name="settings_connections" id="0x7f0a06a0" />
-    <public type="id" name="settings_developer_options" id="0x7f0a06a1" />
-    <public type="id" name="settings_developer_options_divider" id="0x7f0a06a2" />
-    <public type="id" name="settings_developer_options_header" id="0x7f0a06a3" />
-    <public type="id" name="settings_game_activity" id="0x7f0a06a4" />
-    <public type="id" name="settings_games_detection_section" id="0x7f0a06a5" />
-    <public type="id" name="settings_games_playing_container" id="0x7f0a06a6" />
-    <public type="id" name="settings_games_playing_icon" id="0x7f0a06a7" />
-    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a06a8" />
-    <public type="id" name="settings_games_playing_title" id="0x7f0a06a9" />
-    <public type="id" name="settings_games_status_cs" id="0x7f0a06aa" />
-    <public type="id" name="settings_games_track_cs" id="0x7f0a06ab" />
-    <public type="id" name="settings_gifting_flipper" id="0x7f0a06ac" />
-    <public type="id" name="settings_gifting_gift_code_input" id="0x7f0a06ad" />
-    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a06ae" />
-    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a06af" />
-    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a06b0" />
-    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a06b1" />
-    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a06b2" />
-    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a06b3" />
-    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a06b4" />
-    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a06b5" />
-    <public type="id" name="settings_gifting_retry" id="0x7f0a06b6" />
-    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a06b7" />
-    <public type="id" name="settings_group_icon" id="0x7f0a06b8" />
-    <public type="id" name="settings_group_icon_label" id="0x7f0a06b9" />
-    <public type="id" name="settings_group_icon_remove" id="0x7f0a06ba" />
-    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a06bb" />
-    <public type="id" name="settings_language" id="0x7f0a06bc" />
-    <public type="id" name="settings_language_current" id="0x7f0a06bd" />
-    <public type="id" name="settings_language_current_flag" id="0x7f0a06be" />
-    <public type="id" name="settings_language_current_text" id="0x7f0a06bf" />
-    <public type="id" name="settings_language_select_item_name" id="0x7f0a06c0" />
-    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a06c1" />
-    <public type="id" name="settings_language_select_list" id="0x7f0a06c2" />
-    <public type="id" name="settings_language_sync_check" id="0x7f0a06c3" />
-    <public type="id" name="settings_nitro" id="0x7f0a06c4" />
-    <public type="id" name="settings_nitro_boosting" id="0x7f0a06c5" />
-    <public type="id" name="settings_nitro_gifting" id="0x7f0a06c6" />
-    <public type="id" name="settings_nitro_settings" id="0x7f0a06c7" />
-    <public type="id" name="settings_notification_os" id="0x7f0a06c8" />
-    <public type="id" name="settings_notification_os_label" id="0x7f0a06c9" />
-    <public type="id" name="settings_notification_switch" id="0x7f0a06ca" />
-    <public type="id" name="settings_notifications" id="0x7f0a06cb" />
-    <public type="id" name="settings_notifications_blink" id="0x7f0a06cc" />
-    <public type="id" name="settings_notifications_enabled" id="0x7f0a06cd" />
-    <public type="id" name="settings_notifications_mute_all" id="0x7f0a06ce" />
-    <public type="id" name="settings_notifications_vibrations" id="0x7f0a06cf" />
-    <public type="id" name="settings_notifications_wake_lock" id="0x7f0a06d0" />
-    <public type="id" name="settings_notifications_wrap" id="0x7f0a06d1" />
-    <public type="id" name="settings_privacy" id="0x7f0a06d2" />
-    <public type="id" name="settings_privacy_basic_service" id="0x7f0a06d3" />
-    <public type="id" name="settings_privacy_controls" id="0x7f0a06d4" />
-    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a06d5" />
-    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a06d6" />
-    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a06d7" />
-    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a06d8" />
-    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a06d9" />
-    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a06da" />
-    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a06db" />
-    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a06dc" />
-    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a06dd" />
-    <public type="id" name="settings_privacy_personalization" id="0x7f0a06de" />
-    <public type="id" name="settings_privacy_request_data" id="0x7f0a06df" />
-    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a06e0" />
-    <public type="id" name="settings_privacy_statistics" id="0x7f0a06e1" />
-    <public type="id" name="settings_support" id="0x7f0a06e2" />
-    <public type="id" name="settings_text_images" id="0x7f0a06e3" />
-    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a06e4" />
-    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a06e5" />
-    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a06e6" />
-    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a06e7" />
-    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a06e8" />
-    <public type="id" name="settings_user_limit_help" id="0x7f0a06e9" />
-    <public type="id" name="settings_voice" id="0x7f0a06ea" />
-    <public type="id" name="settings_voice_audio_mode_call" id="0x7f0a06eb" />
-    <public type="id" name="settings_voice_audio_mode_communication" id="0x7f0a06ec" />
-    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a06ed" />
-    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a06ee" />
-    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a06ef" />
-    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a06f0" />
-    <public type="id" name="settings_voice_input_mode_radio_1" id="0x7f0a06f1" />
-    <public type="id" name="settings_voice_input_mode_radio_2" id="0x7f0a06f2" />
-    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a06f3" />
-    <public type="id" name="settings_voice_opensles_default" id="0x7f0a06f4" />
-    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a06f5" />
-    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a06f6" />
-    <public type="id" name="settings_voice_output_volume" id="0x7f0a06f7" />
-    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a06f8" />
-    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a06f9" />
-    <public type="id" name="settings_voice_overlay_wrap" id="0x7f0a06fa" />
-    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a06fb" />
-    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a06fc" />
-    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a06fd" />
-    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a06fe" />
-    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a06ff" />
-    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a0700" />
-    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a0701" />
-    <public type="id" name="settings_voice_use_speaker_toggle" id="0x7f0a0702" />
-    <public type="id" name="settings_voice_video_container" id="0x7f0a0703" />
-    <public type="id" name="shortcut" id="0x7f0a0704" />
-    <public type="id" name="showCustom" id="0x7f0a0705" />
-    <public type="id" name="showHome" id="0x7f0a0706" />
-    <public type="id" name="showTitle" id="0x7f0a0707" />
-    <public type="id" name="smallLabel" id="0x7f0a0708" />
-    <public type="id" name="snackbar_action" id="0x7f0a0709" />
-    <public type="id" name="snackbar_text" id="0x7f0a070a" />
-    <public type="id" name="snap" id="0x7f0a070b" />
-    <public type="id" name="snapMargins" id="0x7f0a070c" />
-    <public type="id" name="software" id="0x7f0a070d" />
-    <public type="id" name="space_around" id="0x7f0a070e" />
-    <public type="id" name="space_between" id="0x7f0a070f" />
-    <public type="id" name="spacer" id="0x7f0a0710" />
-    <public type="id" name="split_action_bar" id="0x7f0a0711" />
-    <public type="id" name="spread" id="0x7f0a0712" />
-    <public type="id" name="spread_inside" id="0x7f0a0713" />
-    <public type="id" name="src_atop" id="0x7f0a0714" />
-    <public type="id" name="src_in" id="0x7f0a0715" />
-    <public type="id" name="src_over" id="0x7f0a0716" />
-    <public type="id" name="src_toggle" id="0x7f0a0717" />
-    <public type="id" name="standard" id="0x7f0a0718" />
-    <public type="id" name="start" id="0x7f0a0719" />
-    <public type="id" name="state_aspect_ratio" id="0x7f0a071a" />
-    <public type="id" name="state_rotate" id="0x7f0a071b" />
-    <public type="id" name="state_scale" id="0x7f0a071c" />
-    <public type="id" name="status_connectivity" id="0x7f0a071d" />
-    <public type="id" name="status_connectivity_icon" id="0x7f0a071e" />
-    <public type="id" name="status_connectivity_limited" id="0x7f0a071f" />
-    <public type="id" name="status_connectivity_spinner" id="0x7f0a0720" />
-    <public type="id" name="status_connectivity_text" id="0x7f0a0721" />
-    <public type="id" name="status_unread_messages" id="0x7f0a0722" />
-    <public type="id" name="status_unread_messages_mark" id="0x7f0a0723" />
-    <public type="id" name="status_unread_messages_text" id="0x7f0a0724" />
-    <public type="id" name="status_wrap" id="0x7f0a0725" />
-    <public type="id" name="steps_button_container" id="0x7f0a0726" />
-    <public type="id" name="steps_cancel" id="0x7f0a0727" />
-    <public type="id" name="steps_close" id="0x7f0a0728" />
-    <public type="id" name="steps_done" id="0x7f0a0729" />
-    <public type="id" name="steps_next" id="0x7f0a072a" />
-    <public type="id" name="steps_viewpager" id="0x7f0a072b" />
-    <public type="id" name="storage" id="0x7f0a072c" />
-    <public type="id" name="stream_preview_image" id="0x7f0a072d" />
-    <public type="id" name="stream_preview_placeholder" id="0x7f0a072e" />
-    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a072f" />
-    <public type="id" name="stretch" id="0x7f0a0730" />
-    <public type="id" name="submenuarrow" id="0x7f0a0731" />
-    <public type="id" name="submit_area" id="0x7f0a0732" />
-    <public type="id" name="suggestion_example_answer" id="0x7f0a0733" />
-    <public type="id" name="suggestion_example_container" id="0x7f0a0734" />
-    <public type="id" name="suggestion_example_filter" id="0x7f0a0735" />
-    <public type="id" name="suggestion_example_icon" id="0x7f0a0736" />
-    <public type="id" name="suggestion_item_header" id="0x7f0a0737" />
-    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a0738" />
-    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a0739" />
-    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a073a" />
-    <public type="id" name="swipeRefreshLayout" id="0x7f0a073b" />
-    <public type="id" name="switchview" id="0x7f0a073c" />
-    <public type="id" name="tabMode" id="0x7f0a073d" />
-    <public type="id" name="tag_accessibility_actions" id="0x7f0a073e" />
-    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a073f" />
-    <public type="id" name="tag_accessibility_heading" id="0x7f0a0740" />
-    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a0741" />
-    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a0742" />
-    <public type="id" name="tag_transition_group" id="0x7f0a0743" />
-    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a0744" />
-    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a0745" />
-    <public type="id" name="take_photo_btn" id="0x7f0a0746" />
-    <public type="id" name="ternary_check_neutral" id="0x7f0a0747" />
-    <public type="id" name="ternary_check_off" id="0x7f0a0748" />
-    <public type="id" name="ternary_check_on" id="0x7f0a0749" />
-    <public type="id" name="test" id="0x7f0a074a" />
-    <public type="id" name="text" id="0x7f0a074b" />
-    <public type="id" name="text2" id="0x7f0a074c" />
-    <public type="id" name="textSpacerNoButtons" id="0x7f0a074d" />
-    <public type="id" name="textSpacerNoTitle" id="0x7f0a074e" />
-    <public type="id" name="textStart" id="0x7f0a074f" />
-    <public type="id" name="text_input" id="0x7f0a0750" />
-    <public type="id" name="text_input_password_toggle" id="0x7f0a0751" />
-    <public type="id" name="text_view_rotate" id="0x7f0a0752" />
-    <public type="id" name="text_view_scale" id="0x7f0a0753" />
-    <public type="id" name="textinput_counter" id="0x7f0a0754" />
-    <public type="id" name="textinput_error" id="0x7f0a0755" />
-    <public type="id" name="textinput_helper_text" id="0x7f0a0756" />
-    <public type="id" name="thumb_iv" id="0x7f0a0757" />
-    <public type="id" name="tile" id="0x7f0a0758" />
-    <public type="id" name="time" id="0x7f0a0759" />
-    <public type="id" name="title" id="0x7f0a075a" />
-    <public type="id" name="titleDividerNoCustom" id="0x7f0a075b" />
-    <public type="id" name="title_template" id="0x7f0a075c" />
-    <public type="id" name="toolbar" id="0x7f0a075d" />
-    <public type="id" name="toolbar_presence" id="0x7f0a075e" />
-    <public type="id" name="toolbar_title" id="0x7f0a075f" />
-    <public type="id" name="toolbar_title_subtext" id="0x7f0a0760" />
-    <public type="id" name="top" id="0x7f0a0761" />
-    <public type="id" name="topPanel" id="0x7f0a0762" />
-    <public type="id" name="torch" id="0x7f0a0763" />
-    <public type="id" name="touch_outside" id="0x7f0a0764" />
-    <public type="id" name="transition_current_scene" id="0x7f0a0765" />
-    <public type="id" name="transition_layout_save" id="0x7f0a0766" />
-    <public type="id" name="transition_position" id="0x7f0a0767" />
-    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a0768" />
-    <public type="id" name="transition_transform" id="0x7f0a0769" />
-    <public type="id" name="trash_wrap_icon" id="0x7f0a076a" />
-    <public type="id" name="trash_wrap_target_container" id="0x7f0a076b" />
-    <public type="id" name="trash_wrap_target_zone" id="0x7f0a076c" />
-    <public type="id" name="type_iv" id="0x7f0a076d" />
-    <public type="id" name="ucrop" id="0x7f0a076e" />
-    <public type="id" name="ucrop_frame" id="0x7f0a076f" />
-    <public type="id" name="ucrop_photobox" id="0x7f0a0770" />
-    <public type="id" name="uikit_chat_guideline" id="0x7f0a0771" />
-    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a0772" />
-    <public type="id" name="unhandled_uri_display" id="0x7f0a0773" />
-    <public type="id" name="unhandled_uri_okay" id="0x7f0a0774" />
-    <public type="id" name="uniform" id="0x7f0a0775" />
-    <public type="id" name="unlabeled" id="0x7f0a0776" />
-    <public type="id" name="unread_wrap" id="0x7f0a0777" />
-    <public type="id" name="up" id="0x7f0a0778" />
-    <public type="id" name="upgrade_premium_body" id="0x7f0a0779" />
-    <public type="id" name="upgrade_premium_cancel" id="0x7f0a077a" />
-    <public type="id" name="upgrade_premium_confirm" id="0x7f0a077b" />
-    <public type="id" name="upgrade_premium_error" id="0x7f0a077c" />
-    <public type="id" name="upgrade_premium_header" id="0x7f0a077d" />
-    <public type="id" name="upload_progress_1" id="0x7f0a077e" />
-    <public type="id" name="upload_progress_2" id="0x7f0a077f" />
-    <public type="id" name="upload_progress_3" id="0x7f0a0780" />
-    <public type="id" name="useLogo" id="0x7f0a0781" />
-    <public type="id" name="user_actions_dialog_avatar" id="0x7f0a0782" />
-    <public type="id" name="user_actions_dialog_block_item" id="0x7f0a0783" />
-    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7f0a0784" />
-    <public type="id" name="user_actions_dialog_unblock_item" id="0x7f0a0785" />
-    <public type="id" name="user_actions_dialog_user_name" id="0x7f0a0786" />
-    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a0787" />
-    <public type="id" name="user_avatar_presence_container" id="0x7f0a0788" />
-    <public type="id" name="user_avatar_presence_indicator" id="0x7f0a0789" />
-    <public type="id" name="user_avatar_presence_padding_image" id="0x7f0a078a" />
-    <public type="id" name="user_captcha_help" id="0x7f0a078b" />
-    <public type="id" name="user_captcha_verify_button" id="0x7f0a078c" />
-    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a078d" />
-    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a078e" />
-    <public type="id" name="user_info_activity_divider" id="0x7f0a078f" />
-    <public type="id" name="user_info_identities_divider" id="0x7f0a0790" />
-    <public type="id" name="user_info_identities_header" id="0x7f0a0791" />
-    <public type="id" name="user_info_notes" id="0x7f0a0792" />
-    <public type="id" name="user_info_rich_presence_container" id="0x7f0a0793" />
-    <public type="id" name="user_limit_seekbar" id="0x7f0a0794" />
-    <public type="id" name="user_list_item_avatar" id="0x7f0a0795" />
-    <public type="id" name="user_list_item_name" id="0x7f0a0796" />
-    <public type="id" name="user_list_item_name_secondary" id="0x7f0a0797" />
-    <public type="id" name="user_list_item_presence" id="0x7f0a0798" />
-    <public type="id" name="user_list_item_presence_wrapper" id="0x7f0a0799" />
-    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a079a" />
-    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a079b" />
-    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a079c" />
-    <public type="id" name="user_mentions_list" id="0x7f0a079d" />
-    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a079e" />
-    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a079f" />
-    <public type="id" name="user_phone_add_anchor" id="0x7f0a07a0" />
-    <public type="id" name="user_phone_add_country_code" id="0x7f0a07a1" />
-    <public type="id" name="user_phone_add_next" id="0x7f0a07a2" />
-    <public type="id" name="user_phone_add_number" id="0x7f0a07a3" />
-    <public type="id" name="user_phone_add_wrap" id="0x7f0a07a4" />
-    <public type="id" name="user_phone_digit_verification" id="0x7f0a07a5" />
-    <public type="id" name="user_phone_verify_wrap" id="0x7f0a07a6" />
-    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a07a7" />
-    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a07a8" />
-    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a07a9" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a07aa" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a07ab" />
-    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a07ac" />
-    <public type="id" name="user_profile_adapter_item_friend_presence" id="0x7f0a07ad" />
-    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a07ae" />
-    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a07af" />
-    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a07b0" />
-    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a07b1" />
-    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a07b2" />
-    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a07b3" />
-    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a07b4" />
-    <public type="id" name="user_profile_admin_ban" id="0x7f0a07b5" />
-    <public type="id" name="user_profile_admin_edit_member" id="0x7f0a07b6" />
-    <public type="id" name="user_profile_admin_kick" id="0x7f0a07b7" />
-    <public type="id" name="user_profile_admin_server_deafen" id="0x7f0a07b8" />
-    <public type="id" name="user_profile_admin_server_move" id="0x7f0a07b9" />
-    <public type="id" name="user_profile_admin_server_mute" id="0x7f0a07ba" />
-    <public type="id" name="user_profile_avatar_presence" id="0x7f0a07bb" />
-    <public type="id" name="user_profile_friend_request" id="0x7f0a07bc" />
-    <public type="id" name="user_profile_friend_request_accept_btn" id="0x7f0a07bd" />
-    <public type="id" name="user_profile_friend_request_ignore_btn" id="0x7f0a07be" />
-    <public type="id" name="user_profile_friend_request_incoming_container" id="0x7f0a07bf" />
-    <public type="id" name="user_profile_friend_request_sent_btn" id="0x7f0a07c0" />
-    <public type="id" name="user_profile_header_badges_recycler" id="0x7f0a07c1" />
-    <public type="id" name="user_profile_header_custom_status" id="0x7f0a07c2" />
-    <public type="id" name="user_profile_header_name_wrap" id="0x7f0a07c3" />
-    <public type="id" name="user_profile_header_primary_name" id="0x7f0a07c4" />
-    <public type="id" name="user_profile_header_secondary_name" id="0x7f0a07c5" />
-    <public type="id" name="user_profile_header_view" id="0x7f0a07c6" />
-    <public type="id" name="user_profile_send_message_fab" id="0x7f0a07c7" />
-    <public type="id" name="user_profile_view_pager" id="0x7f0a07c8" />
-    <public type="id" name="user_selected_checkbox" id="0x7f0a07c9" />
-    <public type="id" name="user_settings_mfa_enable_input_digits" id="0x7f0a07ca" />
-    <public type="id" name="user_settings_profile_header_view" id="0x7f0a07cb" />
-    <public type="id" name="user_sheet_actions_divider" id="0x7f0a07cc" />
-    <public type="id" name="user_sheet_actions_header" id="0x7f0a07cd" />
-    <public type="id" name="user_sheet_activity_divider" id="0x7f0a07ce" />
-    <public type="id" name="user_sheet_add_friend_action_button" id="0x7f0a07cf" />
-    <public type="id" name="user_sheet_admin_view" id="0x7f0a07d0" />
-    <public type="id" name="user_sheet_audio_settings_divider" id="0x7f0a07d1" />
-    <public type="id" name="user_sheet_badge_image" id="0x7f0a07d2" />
-    <public type="id" name="user_sheet_call_action_button" id="0x7f0a07d3" />
-    <public type="id" name="user_sheet_copy_id" id="0x7f0a07d4" />
-    <public type="id" name="user_sheet_developer_divider" id="0x7f0a07d5" />
-    <public type="id" name="user_sheet_developer_header" id="0x7f0a07d6" />
-    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7f0a07d7" />
-    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7f0a07d8" />
-    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7f0a07d9" />
-    <public type="id" name="user_sheet_guild_container" id="0x7f0a07da" />
-    <public type="id" name="user_sheet_guild_divider" id="0x7f0a07db" />
-    <public type="id" name="user_sheet_guild_header" id="0x7f0a07dc" />
-    <public type="id" name="user_sheet_header" id="0x7f0a07dd" />
-    <public type="id" name="user_sheet_incoming_friend_request_divider" id="0x7f0a07de" />
-    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7f0a07df" />
-    <public type="id" name="user_sheet_message_action_button" id="0x7f0a07e0" />
-    <public type="id" name="user_sheet_more_button" id="0x7f0a07e1" />
-    <public type="id" name="user_sheet_muted" id="0x7f0a07e2" />
-    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7f0a07e3" />
-    <public type="id" name="user_sheet_profile" id="0x7f0a07e4" />
-    <public type="id" name="user_sheet_profile_actions_container" id="0x7f0a07e5" />
-    <public type="id" name="user_sheet_profile_actions_divider" id="0x7f0a07e6" />
-    <public type="id" name="user_sheet_profile_header_view" id="0x7f0a07e7" />
-    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7f0a07e8" />
-    <public type="id" name="user_sheet_roles_recycler" id="0x7f0a07e9" />
-    <public type="id" name="user_sheet_video_action_button" id="0x7f0a07ea" />
-    <public type="id" name="user_sheet_volume" id="0x7f0a07eb" />
-    <public type="id" name="user_status_presence_dot" id="0x7f0a07ec" />
-    <public type="id" name="user_status_presence_subtitle" id="0x7f0a07ed" />
-    <public type="id" name="user_status_presence_title" id="0x7f0a07ee" />
-    <public type="id" name="user_status_update_dnd" id="0x7f0a07ef" />
-    <public type="id" name="user_status_update_idle" id="0x7f0a07f0" />
-    <public type="id" name="user_status_update_invisible" id="0x7f0a07f1" />
-    <public type="id" name="user_status_update_online" id="0x7f0a07f2" />
-    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a07f3" />
-    <public type="id" name="verify_digit_1" id="0x7f0a07f4" />
-    <public type="id" name="verify_digit_2" id="0x7f0a07f5" />
-    <public type="id" name="verify_digit_3" id="0x7f0a07f6" />
-    <public type="id" name="verify_digit_4" id="0x7f0a07f7" />
-    <public type="id" name="verify_digit_5" id="0x7f0a07f8" />
-    <public type="id" name="verify_digit_6" id="0x7f0a07f9" />
-    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a07fa" />
-    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a07fb" />
-    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a07fc" />
-    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a07fd" />
-    <public type="id" name="view_input" id="0x7f0a07fe" />
-    <public type="id" name="view_offset_helper" id="0x7f0a07ff" />
-    <public type="id" name="view_overlay" id="0x7f0a0800" />
-    <public type="id" name="view_pager" id="0x7f0a0801" />
-    <public type="id" name="visible" id="0x7f0a0802" />
-    <public type="id" name="voice" id="0x7f0a0803" />
-    <public type="id" name="voice_actions_connect" id="0x7f0a0804" />
-    <public type="id" name="voice_actions_copy_id" id="0x7f0a0805" />
-    <public type="id" name="voice_actions_disconnect" id="0x7f0a0806" />
-    <public type="id" name="voice_actions_header" id="0x7f0a0807" />
-    <public type="id" name="voice_actions_icon" id="0x7f0a0808" />
-    <public type="id" name="voice_actions_settings" id="0x7f0a0809" />
-    <public type="id" name="voice_actions_settings_divider" id="0x7f0a080a" />
-    <public type="id" name="voice_actions_user_count" id="0x7f0a080b" />
-    <public type="id" name="voice_actions_users_recyclerview" id="0x7f0a080c" />
-    <public type="id" name="voice_connected_container" id="0x7f0a080d" />
-    <public type="id" name="voice_connected_description" id="0x7f0a080e" />
-    <public type="id" name="voice_connected_ptt" id="0x7f0a080f" />
-    <public type="id" name="voice_connected_quality" id="0x7f0a0810" />
-    <public type="id" name="voice_connected_status_container" id="0x7f0a0811" />
-    <public type="id" name="voice_connected_text" id="0x7f0a0812" />
-    <public type="id" name="voice_divider" id="0x7f0a0813" />
-    <public type="id" name="voice_expand" id="0x7f0a0814" />
-    <public type="id" name="voice_fullscreen_controls_connect" id="0x7f0a0815" />
-    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a0816" />
-    <public type="id" name="voice_fullscreen_controls_deafen_state" id="0x7f0a0817" />
-    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a0818" />
-    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a0819" />
-    <public type="id" name="voice_fullscreen_controls_num_users_connected" id="0x7f0a081a" />
-    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a081b" />
-    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a081c" />
-    <public type="id" name="voice_info_connecting" id="0x7f0a081d" />
-    <public type="id" name="voice_info_overlay" id="0x7f0a081e" />
-    <public type="id" name="voice_info_talking_users" id="0x7f0a081f" />
-    <public type="id" name="voice_info_wrap" id="0x7f0a0820" />
-    <public type="id" name="voice_list_item_user" id="0x7f0a0821" />
-    <public type="id" name="voice_ongoing_container" id="0x7f0a0822" />
-    <public type="id" name="voice_ongoing_user_count_label" id="0x7f0a0823" />
-    <public type="id" name="voice_user_avatar" id="0x7f0a0824" />
-    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a0825" />
-    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a0826" />
-    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a0827" />
-    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a0828" />
-    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a0829" />
-    <public type="id" name="voice_user_name_display" id="0x7f0a082a" />
-    <public type="id" name="web_view" id="0x7f0a082b" />
-    <public type="id" name="welcome_card_invite_friends" id="0x7f0a082c" />
-    <public type="id" name="welcome_card_upload_icon" id="0x7f0a082d" />
-    <public type="id" name="wide" id="0x7f0a082e" />
-    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a082f" />
-    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a0830" />
-    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a0831" />
-    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a0832" />
-    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a0833" />
-    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a0834" />
-    <public type="id" name="widget_channel_search_item" id="0x7f0a0835" />
-    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a0836" />
-    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a0837" />
-    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a0838" />
-    <public type="id" name="widget_channel_topic" id="0x7f0a0839" />
-    <public type="id" name="widget_channels" id="0x7f0a083a" />
-    <public type="id" name="widget_chat_detached" id="0x7f0a083b" />
-    <public type="id" name="widget_chat_input" id="0x7f0a083c" />
-    <public type="id" name="widget_chat_list" id="0x7f0a083d" />
-    <public type="id" name="widget_chat_typing" id="0x7f0a083e" />
-    <public type="id" name="widget_chat_voice" id="0x7f0a083f" />
-    <public type="id" name="widget_collapsed_user_count" id="0x7f0a0840" />
-    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a0841" />
-    <public type="id" name="widget_connected_list" id="0x7f0a0842" />
-    <public type="id" name="widget_friends_list" id="0x7f0a0843" />
-    <public type="id" name="widget_guilds" id="0x7f0a0844" />
-    <public type="id" name="widget_profile_strip" id="0x7f0a0845" />
-    <public type="id" name="widget_search_results" id="0x7f0a0846" />
-    <public type="id" name="widget_search_suggestions" id="0x7f0a0847" />
-    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a0848" />
-    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a0849" />
-    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a084a" />
-    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a084b" />
-    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a084c" />
-    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a084d" />
-    <public type="id" name="widget_status" id="0x7f0a084e" />
-    <public type="id" name="withText" id="0x7f0a084f" />
-    <public type="id" name="wrap" id="0x7f0a0850" />
-    <public type="id" name="wrap_content" id="0x7f0a0851" />
-    <public type="id" name="wrap_reverse" id="0x7f0a0852" />
-    <public type="id" name="wrapper_controls" id="0x7f0a0853" />
-    <public type="id" name="wrapper_reset_rotate" id="0x7f0a0854" />
-    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a0855" />
-    <public type="id" name="wrapper_states" id="0x7f0a0856" />
+    <public type="id" name="connected_account_actions_dialog_copy_username" id="0x7f0a0222" />
+    <public type="id" name="connected_account_actions_dialog_header" id="0x7f0a0223" />
+    <public type="id" name="connected_account_actions_dialog_open_in_browser" id="0x7f0a0224" />
+    <public type="id" name="connected_account_disconnect" id="0x7f0a0225" />
+    <public type="id" name="connected_account_display_activity_switch" id="0x7f0a0226" />
+    <public type="id" name="connected_account_display_switch" id="0x7f0a0227" />
+    <public type="id" name="connected_account_divider" id="0x7f0a0228" />
+    <public type="id" name="connected_account_extra_info" id="0x7f0a0229" />
+    <public type="id" name="connected_account_img" id="0x7f0a022a" />
+    <public type="id" name="connected_account_link_img" id="0x7f0a022b" />
+    <public type="id" name="connected_account_name" id="0x7f0a022c" />
+    <public type="id" name="connected_account_sync_friends_switch" id="0x7f0a022d" />
+    <public type="id" name="connected_list_header" id="0x7f0a022e" />
+    <public type="id" name="connections_empty" id="0x7f0a022f" />
+    <public type="id" name="connections_recycler" id="0x7f0a0230" />
+    <public type="id" name="connections_xbox_digits" id="0x7f0a0231" />
+    <public type="id" name="connections_xbox_login" id="0x7f0a0232" />
+    <public type="id" name="container" id="0x7f0a0233" />
+    <public type="id" name="content" id="0x7f0a0234" />
+    <public type="id" name="contentPanel" id="0x7f0a0235" />
+    <public type="id" name="content_iv" id="0x7f0a0236" />
+    <public type="id" name="content_pager" id="0x7f0a0237" />
+    <public type="id" name="content_tabs" id="0x7f0a0238" />
+    <public type="id" name="continuous" id="0x7f0a0239" />
+    <public type="id" name="coordinator" id="0x7f0a023a" />
+    <public type="id" name="create_channel_name" id="0x7f0a023b" />
+    <public type="id" name="create_channel_name_layout" id="0x7f0a023c" />
+    <public type="id" name="create_channel_private_container" id="0x7f0a023d" />
+    <public type="id" name="create_channel_private_info" id="0x7f0a023e" />
+    <public type="id" name="create_channel_private_switch" id="0x7f0a023f" />
+    <public type="id" name="create_channel_private_title" id="0x7f0a0240" />
+    <public type="id" name="create_channel_role_access_recycler" id="0x7f0a0241" />
+    <public type="id" name="create_channel_role_header" id="0x7f0a0242" />
+    <public type="id" name="create_channel_text_container" id="0x7f0a0243" />
+    <public type="id" name="create_channel_text_radio" id="0x7f0a0244" />
+    <public type="id" name="create_channel_type_container" id="0x7f0a0245" />
+    <public type="id" name="create_channel_voice_container" id="0x7f0a0246" />
+    <public type="id" name="create_channel_voice_radio" id="0x7f0a0247" />
+    <public type="id" name="credit_header" id="0x7f0a0248" />
+    <public type="id" name="credit_icon" id="0x7f0a0249" />
+    <public type="id" name="credit_info" id="0x7f0a024a" />
+    <public type="id" name="credit_info_container" id="0x7f0a024b" />
+    <public type="id" name="credit_nitro" id="0x7f0a024c" />
+    <public type="id" name="credit_nitro_classic" id="0x7f0a024d" />
+    <public type="id" name="credit_nitro_divider" id="0x7f0a024e" />
+    <public type="id" name="credit_time" id="0x7f0a024f" />
+    <public type="id" name="current_bitrate_display" id="0x7f0a0250" />
+    <public type="id" name="current_user_limit_display" id="0x7f0a0251" />
+    <public type="id" name="custom" id="0x7f0a0252" />
+    <public type="id" name="customPanel" id="0x7f0a0253" />
+    <public type="id" name="dark" id="0x7f0a0254" />
+    <public type="id" name="debugging_item_log_message" id="0x7f0a0255" />
+    <public type="id" name="debugging_logs" id="0x7f0a0256" />
+    <public type="id" name="decor_content_parent" id="0x7f0a0257" />
+    <public type="id" name="default_activity_button" id="0x7f0a0258" />
+    <public type="id" name="design_bottom_sheet" id="0x7f0a0259" />
+    <public type="id" name="design_menu_item_action_area" id="0x7f0a025a" />
+    <public type="id" name="design_menu_item_action_area_stub" id="0x7f0a025b" />
+    <public type="id" name="design_menu_item_text" id="0x7f0a025c" />
+    <public type="id" name="design_navigation_view" id="0x7f0a025d" />
+    <public type="id" name="dialog_button" id="0x7f0a025e" />
+    <public type="id" name="dialog_cancel" id="0x7f0a025f" />
+    <public type="id" name="dialog_card" id="0x7f0a0260" />
+    <public type="id" name="dialog_chat_action_header" id="0x7f0a0261" />
+    <public type="id" name="dialog_chat_actions_add_reaction" id="0x7f0a0262" />
+    <public type="id" name="dialog_chat_actions_add_reaction_emojis_list" id="0x7f0a0263" />
+    <public type="id" name="dialog_chat_actions_avatar" id="0x7f0a0264" />
+    <public type="id" name="dialog_chat_actions_copy" id="0x7f0a0265" />
+    <public type="id" name="dialog_chat_actions_copy_id" id="0x7f0a0266" />
+    <public type="id" name="dialog_chat_actions_delete" id="0x7f0a0267" />
+    <public type="id" name="dialog_chat_actions_edit" id="0x7f0a0268" />
+    <public type="id" name="dialog_chat_actions_manage_reactions" id="0x7f0a0269" />
+    <public type="id" name="dialog_chat_actions_pin" id="0x7f0a026a" />
+    <public type="id" name="dialog_chat_actions_profile" id="0x7f0a026b" />
+    <public type="id" name="dialog_chat_actions_remove_all_reactions" id="0x7f0a026c" />
+    <public type="id" name="dialog_chat_actions_resend" id="0x7f0a026d" />
+    <public type="id" name="dialog_chat_actions_share" id="0x7f0a026e" />
+    <public type="id" name="dialog_chat_actions_subtitle" id="0x7f0a026f" />
+    <public type="id" name="dialog_chat_actions_title" id="0x7f0a0270" />
+    <public type="id" name="dialog_delete" id="0x7f0a0271" />
+    <public type="id" name="dialog_save" id="0x7f0a0272" />
+    <public type="id" name="dialog_selections" id="0x7f0a0273" />
+    <public type="id" name="dialog_title" id="0x7f0a0274" />
+    <public type="id" name="dialog_url_actions_copy" id="0x7f0a0275" />
+    <public type="id" name="dialog_url_actions_open" id="0x7f0a0276" />
+    <public type="id" name="dialog_url_actions_share" id="0x7f0a0277" />
+    <public type="id" name="dialog_url_actions_url" id="0x7f0a0278" />
+    <public type="id" name="dimensions" id="0x7f0a0279" />
+    <public type="id" name="dimmer_view" id="0x7f0a027a" />
+    <public type="id" name="direct" id="0x7f0a027b" />
+    <public type="id" name="disableHome" id="0x7f0a027c" />
+    <public type="id" name="disable_delete_body" id="0x7f0a027d" />
+    <public type="id" name="disable_delete_cancel" id="0x7f0a027e" />
+    <public type="id" name="disable_delete_code" id="0x7f0a027f" />
+    <public type="id" name="disable_delete_code_wrap" id="0x7f0a0280" />
+    <public type="id" name="disable_delete_confirm" id="0x7f0a0281" />
+    <public type="id" name="disable_delete_header" id="0x7f0a0282" />
+    <public type="id" name="disable_delete_password" id="0x7f0a0283" />
+    <public type="id" name="disable_delete_password_wrap" id="0x7f0a0284" />
+    <public type="id" name="disconnect_btn" id="0x7f0a0285" />
+    <public type="id" name="edit_account_discriminator" id="0x7f0a0286" />
+    <public type="id" name="edit_account_discriminator_wrap" id="0x7f0a0287" />
+    <public type="id" name="edit_account_email" id="0x7f0a0288" />
+    <public type="id" name="edit_account_email_wrap" id="0x7f0a0289" />
+    <public type="id" name="edit_account_password" id="0x7f0a028a" />
+    <public type="id" name="edit_account_password_wrap" id="0x7f0a028b" />
+    <public type="id" name="edit_account_tag_layout_container" id="0x7f0a028c" />
+    <public type="id" name="edit_account_username" id="0x7f0a028d" />
+    <public type="id" name="edit_account_username_wrap" id="0x7f0a028e" />
+    <public type="id" name="edit_integration_custom_emotes_container" id="0x7f0a028f" />
+    <public type="id" name="edit_integration_custom_emotes_toggle" id="0x7f0a0290" />
+    <public type="id" name="edit_integration_expire_radio_kick_user" id="0x7f0a0291" />
+    <public type="id" name="edit_integration_expire_radio_remove_role" id="0x7f0a0292" />
+    <public type="id" name="edit_integration_expired_sub_container" id="0x7f0a0293" />
+    <public type="id" name="edit_integration_grace_period_container" id="0x7f0a0294" />
+    <public type="id" name="edit_integration_grace_period_radio_14_days" id="0x7f0a0295" />
+    <public type="id" name="edit_integration_grace_period_radio_1_day" id="0x7f0a0296" />
+    <public type="id" name="edit_integration_grace_period_radio_30_days" id="0x7f0a0297" />
+    <public type="id" name="edit_integration_grace_period_radio_3_days" id="0x7f0a0298" />
+    <public type="id" name="edit_integration_grace_period_radio_7_days" id="0x7f0a0299" />
+    <public type="id" name="edit_integration_icon" id="0x7f0a029a" />
+    <public type="id" name="edit_integration_last_sync_time" id="0x7f0a029b" />
+    <public type="id" name="edit_integration_name" id="0x7f0a029c" />
+    <public type="id" name="edit_integration_name_container" id="0x7f0a029d" />
+    <public type="id" name="edit_integration_owner_name" id="0x7f0a029e" />
+    <public type="id" name="edit_integration_save" id="0x7f0a029f" />
+    <public type="id" name="edit_integration_settings_scroll" id="0x7f0a02a0" />
+    <public type="id" name="edit_integration_subscriber_count" id="0x7f0a02a1" />
+    <public type="id" name="edit_integration_sync_container" id="0x7f0a02a2" />
+    <public type="id" name="edit_integration_synced_role" id="0x7f0a02a3" />
+    <public type="id" name="edit_integration_synced_role_container" id="0x7f0a02a4" />
+    <public type="id" name="edit_member_administrative_container" id="0x7f0a02a5" />
+    <public type="id" name="edit_member_ban_button" id="0x7f0a02a6" />
+    <public type="id" name="edit_member_kick_button" id="0x7f0a02a7" />
+    <public type="id" name="edit_member_nickname" id="0x7f0a02a8" />
+    <public type="id" name="edit_member_nickname_lock" id="0x7f0a02a9" />
+    <public type="id" name="edit_member_roles_container" id="0x7f0a02aa" />
+    <public type="id" name="edit_member_roles_recycler" id="0x7f0a02ab" />
+    <public type="id" name="edit_member_save" id="0x7f0a02ac" />
+    <public type="id" name="edit_member_transfer_ownership_button" id="0x7f0a02ad" />
+    <public type="id" name="edit_query" id="0x7f0a02ae" />
+    <public type="id" name="edit_role_name" id="0x7f0a02af" />
+    <public type="id" name="edit_role_save" id="0x7f0a02b0" />
+    <public type="id" name="embed_guideline" id="0x7f0a02b1" />
+    <public type="id" name="embed_guideline_right" id="0x7f0a02b2" />
+    <public type="id" name="embed_image_container" id="0x7f0a02b3" />
+    <public type="id" name="emoji_btn" id="0x7f0a02b4" />
+    <public type="id" name="emoji_container" id="0x7f0a02b5" />
+    <public type="id" name="emoji_item_draweeview" id="0x7f0a02b6" />
+    <public type="id" name="emoji_iv" id="0x7f0a02b7" />
+    <public type="id" name="emoji_picker_backspace_icon" id="0x7f0a02b8" />
+    <public type="id" name="emoji_picker_bottom_bar" id="0x7f0a02b9" />
+    <public type="id" name="emoji_picker_search_icon" id="0x7f0a02ba" />
+    <public type="id" name="emoji_picker_tab_layout" id="0x7f0a02bb" />
+    <public type="id" name="emoji_search_bar" id="0x7f0a02bc" />
+    <public type="id" name="empty_results" id="0x7f0a02bd" />
+    <public type="id" name="enable_button" id="0x7f0a02be" />
+    <public type="id" name="enable_mfa_key_code" id="0x7f0a02bf" />
+    <public type="id" name="enable_mfa_key_launch_authy" id="0x7f0a02c0" />
+    <public type="id" name="enable_mfa_key_launch_google_auth" id="0x7f0a02c1" />
+    <public type="id" name="enable_mfa_stepsview" id="0x7f0a02c2" />
+    <public type="id" name="enable_sms_backup_body" id="0x7f0a02c3" />
+    <public type="id" name="enable_sms_backup_cancel" id="0x7f0a02c4" />
+    <public type="id" name="enable_sms_backup_confirm" id="0x7f0a02c5" />
+    <public type="id" name="enable_sms_backup_header" id="0x7f0a02c6" />
+    <public type="id" name="enable_sms_backup_password" id="0x7f0a02c7" />
+    <public type="id" name="enable_sms_backup_password_wrap" id="0x7f0a02c8" />
+    <public type="id" name="end" id="0x7f0a02c9" />
+    <public type="id" name="enterAlways" id="0x7f0a02ca" />
+    <public type="id" name="enterAlwaysCollapsed" id="0x7f0a02cb" />
+    <public type="id" name="error_divider" id="0x7f0a02cc" />
+    <public type="id" name="exitUntilCollapsed" id="0x7f0a02cd" />
+    <public type="id" name="expand_activities_button" id="0x7f0a02ce" />
+    <public type="id" name="expanded_menu" id="0x7f0a02cf" />
+    <public type="id" name="external_share_activity_action_preview" id="0x7f0a02d0" />
+    <public type="id" name="external_share_comment" id="0x7f0a02d1" />
+    <public type="id" name="external_share_list" id="0x7f0a02d2" />
+    <public type="id" name="external_share_search" id="0x7f0a02d3" />
+    <public type="id" name="external_share_search_results" id="0x7f0a02d4" />
+    <public type="id" name="fab_menu_add_category" id="0x7f0a02d5" />
+    <public type="id" name="fab_menu_add_text" id="0x7f0a02d6" />
+    <public type="id" name="fab_menu_add_voice" id="0x7f0a02d7" />
+    <public type="id" name="fab_menu_main" id="0x7f0a02d8" />
+    <public type="id" name="fab_menu_main_fab" id="0x7f0a02d9" />
+    <public type="id" name="fab_menu_table" id="0x7f0a02da" />
+    <public type="id" name="fatal_crash_app_version" id="0x7f0a02db" />
+    <public type="id" name="fatal_crash_details" id="0x7f0a02dc" />
+    <public type="id" name="fatal_crash_device" id="0x7f0a02dd" />
+    <public type="id" name="fatal_crash_os_version" id="0x7f0a02de" />
+    <public type="id" name="fatal_crash_source" id="0x7f0a02df" />
+    <public type="id" name="fatal_crash_testers_invite" id="0x7f0a02e0" />
+    <public type="id" name="fatal_crash_time" id="0x7f0a02e1" />
+    <public type="id" name="file_name_tv" id="0x7f0a02e2" />
+    <public type="id" name="file_subtitle_tv" id="0x7f0a02e3" />
+    <public type="id" name="fill" id="0x7f0a02e4" />
+    <public type="id" name="fill_horizontal" id="0x7f0a02e5" />
+    <public type="id" name="fill_vertical" id="0x7f0a02e6" />
+    <public type="id" name="filled" id="0x7f0a02e7" />
+    <public type="id" name="fitBottomStart" id="0x7f0a02e8" />
+    <public type="id" name="fitCenter" id="0x7f0a02e9" />
+    <public type="id" name="fitEnd" id="0x7f0a02ea" />
+    <public type="id" name="fitStart" id="0x7f0a02eb" />
+    <public type="id" name="fitXY" id="0x7f0a02ec" />
+    <public type="id" name="fixed" id="0x7f0a02ed" />
+    <public type="id" name="flex_end" id="0x7f0a02ee" />
+    <public type="id" name="flex_start" id="0x7f0a02ef" />
+    <public type="id" name="focusCrop" id="0x7f0a02f0" />
+    <public type="id" name="folder_view_folder_image" id="0x7f0a02f1" />
+    <public type="id" name="forever" id="0x7f0a02f2" />
+    <public type="id" name="friend_container" id="0x7f0a02f3" />
+    <public type="id" name="friends_add_container" id="0x7f0a02f4" />
+    <public type="id" name="friends_add_header" id="0x7f0a02f5" />
+    <public type="id" name="friends_add_nearby" id="0x7f0a02f6" />
+    <public type="id" name="friends_add_send" id="0x7f0a02f7" />
+    <public type="id" name="friends_add_text_edit" id="0x7f0a02f8" />
+    <public type="id" name="friends_add_text_edit_wrap" id="0x7f0a02f9" />
+    <public type="id" name="friends_list_item_avatar" id="0x7f0a02fa" />
+    <public type="id" name="friends_list_item_avatar_wrap" id="0x7f0a02fb" />
+    <public type="id" name="friends_list_item_empty" id="0x7f0a02fc" />
+    <public type="id" name="friends_list_item_empty_invite" id="0x7f0a02fd" />
+    <public type="id" name="friends_list_item_empty_no_blocked" id="0x7f0a02fe" />
+    <public type="id" name="friends_list_item_empty_no_friends" id="0x7f0a02ff" />
+    <public type="id" name="friends_list_item_empty_no_online" id="0x7f0a0300" />
+    <public type="id" name="friends_list_item_empty_no_request" id="0x7f0a0301" />
+    <public type="id" name="friends_list_item_empty_no_suggestions" id="0x7f0a0302" />
+    <public type="id" name="friends_list_item_game" id="0x7f0a0303" />
+    <public type="id" name="friends_list_item_mutual_1" id="0x7f0a0304" />
+    <public type="id" name="friends_list_item_mutual_1_icon" id="0x7f0a0305" />
+    <public type="id" name="friends_list_item_mutual_1_text" id="0x7f0a0306" />
+    <public type="id" name="friends_list_item_mutual_2" id="0x7f0a0307" />
+    <public type="id" name="friends_list_item_mutual_2_icon" id="0x7f0a0308" />
+    <public type="id" name="friends_list_item_mutual_2_text" id="0x7f0a0309" />
+    <public type="id" name="friends_list_item_mutual_3" id="0x7f0a030a" />
+    <public type="id" name="friends_list_item_mutual_3_icon" id="0x7f0a030b" />
+    <public type="id" name="friends_list_item_mutual_3_text" id="0x7f0a030c" />
+    <public type="id" name="friends_list_item_mutual_4" id="0x7f0a030d" />
+    <public type="id" name="friends_list_item_mutual_4_icon" id="0x7f0a030e" />
+    <public type="id" name="friends_list_item_mutual_4_text" id="0x7f0a030f" />
+    <public type="id" name="friends_list_item_mutual_wrap" id="0x7f0a0310" />
+    <public type="id" name="friends_list_item_name" id="0x7f0a0311" />
+    <public type="id" name="friends_list_item_presence" id="0x7f0a0312" />
+    <public type="id" name="friends_list_item_text" id="0x7f0a0313" />
+    <public type="id" name="friends_list_recycler" id="0x7f0a0314" />
+    <public type="id" name="front" id="0x7f0a0315" />
+    <public type="id" name="ghost_view" id="0x7f0a0316" />
+    <public type="id" name="gift_entitlement_code" id="0x7f0a0317" />
+    <public type="id" name="gift_entitlement_code_container" id="0x7f0a0318" />
+    <public type="id" name="gift_entitlement_container" id="0x7f0a0319" />
+    <public type="id" name="gift_entitlement_copy" id="0x7f0a031a" />
+    <public type="id" name="gift_entitlement_divider" id="0x7f0a031b" />
+    <public type="id" name="gift_entitlement_flipper" id="0x7f0a031c" />
+    <public type="id" name="gift_entitlement_generate" id="0x7f0a031d" />
+    <public type="id" name="gift_entitlement_revoke" id="0x7f0a031e" />
+    <public type="id" name="gift_sku_arrow" id="0x7f0a031f" />
+    <public type="id" name="gift_sku_copies" id="0x7f0a0320" />
+    <public type="id" name="gift_sku_icon" id="0x7f0a0321" />
+    <public type="id" name="gift_sku_name" id="0x7f0a0322" />
+    <public type="id" name="global_search_add_a_friend_btn" id="0x7f0a0323" />
+    <public type="id" name="global_search_guild_list" id="0x7f0a0324" />
+    <public type="id" name="global_search_join_guild_btn" id="0x7f0a0325" />
+    <public type="id" name="global_search_recycler" id="0x7f0a0326" />
+    <public type="id" name="global_search_view_flipper" id="0x7f0a0327" />
+    <public type="id" name="golive_stream_ended" id="0x7f0a0328" />
+    <public type="id" name="golive_stream_loading_indicator" id="0x7f0a0329" />
+    <public type="id" name="golive_stream_paused" id="0x7f0a032a" />
+    <public type="id" name="golive_stream_video_renderer" id="0x7f0a032b" />
+    <public type="id" name="gone" id="0x7f0a032c" />
+    <public type="id" name="group_divider" id="0x7f0a032d" />
+    <public type="id" name="group_dm_settings_scroll_view" id="0x7f0a032e" />
+    <public type="id" name="group_invite_friends_chips" id="0x7f0a032f" />
+    <public type="id" name="group_invite_friends_recipients_container" id="0x7f0a0330" />
+    <public type="id" name="group_invite_friends_recycler" id="0x7f0a0331" />
+    <public type="id" name="group_invite_friends_save_fab" id="0x7f0a0332" />
+    <public type="id" name="group_invite_friends_text_to" id="0x7f0a0333" />
+    <public type="id" name="group_invite_friends_view_flipper" id="0x7f0a0334" />
+    <public type="id" name="groups" id="0x7f0a0335" />
+    <public type="id" name="guideline" id="0x7f0a0336" />
+    <public type="id" name="guild_actions_add_create" id="0x7f0a0337" />
+    <public type="id" name="guild_actions_add_create_desc" id="0x7f0a0338" />
+    <public type="id" name="guild_actions_add_join" id="0x7f0a0339" />
+    <public type="id" name="guild_actions_add_join_desc" id="0x7f0a033a" />
+    <public type="id" name="guild_actions_manage_channels_divider" id="0x7f0a033b" />
+    <public type="id" name="guild_actions_overview_boost" id="0x7f0a033c" />
+    <public type="id" name="guild_actions_overview_change_nickname" id="0x7f0a033d" />
+    <public type="id" name="guild_actions_overview_copy_id" id="0x7f0a033e" />
+    <public type="id" name="guild_actions_overview_create_category" id="0x7f0a033f" />
+    <public type="id" name="guild_actions_overview_create_channel" id="0x7f0a0340" />
+    <public type="id" name="guild_actions_overview_header_icon_iv" id="0x7f0a0341" />
+    <public type="id" name="guild_actions_overview_header_icon_tv" id="0x7f0a0342" />
+    <public type="id" name="guild_actions_overview_header_tv" id="0x7f0a0343" />
+    <public type="id" name="guild_actions_overview_leave" id="0x7f0a0344" />
+    <public type="id" name="guild_actions_overview_mark_as_read" id="0x7f0a0345" />
+    <public type="id" name="guild_actions_overview_notifications" id="0x7f0a0346" />
+    <public type="id" name="guild_actions_overview_privacy_cs" id="0x7f0a0347" />
+    <public type="id" name="guild_actions_overview_settings" id="0x7f0a0348" />
+    <public type="id" name="guild_actions_overview_show_hide_muted_channels" id="0x7f0a0349" />
+    <public type="id" name="guild_call_controls" id="0x7f0a034a" />
+    <public type="id" name="guild_call_participant_list" id="0x7f0a034b" />
+    <public type="id" name="guild_call_view_flipper" id="0x7f0a034c" />
+    <public type="id" name="guild_create_guidelines" id="0x7f0a034d" />
+    <public type="id" name="guild_create_icon" id="0x7f0a034e" />
+    <public type="id" name="guild_create_icon_placeholder" id="0x7f0a034f" />
+    <public type="id" name="guild_create_icon_wrap" id="0x7f0a0350" />
+    <public type="id" name="guild_create_name" id="0x7f0a0351" />
+    <public type="id" name="guild_create_regions" id="0x7f0a0352" />
+    <public type="id" name="guild_invite_accept" id="0x7f0a0353" />
+    <public type="id" name="guild_invite_actions" id="0x7f0a0354" />
+    <public type="id" name="guild_invite_cancel" id="0x7f0a0355" />
+    <public type="id" name="guild_invite_channel_spinner" id="0x7f0a0356" />
+    <public type="id" name="guild_invite_empty_results" id="0x7f0a0357" />
+    <public type="id" name="guild_invite_empty_suggestions_container" id="0x7f0a0358" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_link" id="0x7f0a0359" />
+    <public type="id" name="guild_invite_empty_suggestions_invite_share_btn" id="0x7f0a035a" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_edit" id="0x7f0a035b" />
+    <public type="id" name="guild_invite_empty_suggestions_settings_invite_link_subtext" id="0x7f0a035c" />
+    <public type="id" name="guild_invite_expires_after_radiogroup" id="0x7f0a035d" />
+    <public type="id" name="guild_invite_friends_subtitle" id="0x7f0a035e" />
+    <public type="id" name="guild_invite_friends_title" id="0x7f0a035f" />
+    <public type="id" name="guild_invite_generate_link" id="0x7f0a0360" />
+    <public type="id" name="guild_invite_info" id="0x7f0a0361" />
+    <public type="id" name="guild_invite_link" id="0x7f0a0362" />
+    <public type="id" name="guild_invite_max_uses_radiogroup" id="0x7f0a0363" />
+    <public type="id" name="guild_invite_never_expire" id="0x7f0a0364" />
+    <public type="id" name="guild_invite_settings_edit" id="0x7f0a0365" />
+    <public type="id" name="guild_invite_share_btn" id="0x7f0a0366" />
+    <public type="id" name="guild_invite_splash" id="0x7f0a0367" />
+    <public type="id" name="guild_invite_suggestion_list" id="0x7f0a0368" />
+    <public type="id" name="guild_invite_suggestions_flipper" id="0x7f0a0369" />
+    <public type="id" name="guild_invite_temporary_membership" id="0x7f0a036a" />
+    <public type="id" name="guild_join_action_btn" id="0x7f0a036b" />
+    <public type="id" name="guild_join_content" id="0x7f0a036c" />
+    <public type="id" name="guild_join_invite" id="0x7f0a036d" />
+    <public type="id" name="guild_list" id="0x7f0a036e" />
+    <public type="id" name="guild_list_add_hint" id="0x7f0a036f" />
+    <public type="id" name="guild_list_unreads_stub" id="0x7f0a0370" />
+    <public type="id" name="guild_notifications_add_override" id="0x7f0a0371" />
+    <public type="id" name="guild_notifications_channel_list" id="0x7f0a0372" />
+    <public type="id" name="guild_notifications_override_list" id="0x7f0a0373" />
+    <public type="id" name="guild_search_item_avatar" id="0x7f0a0374" />
+    <public type="id" name="guild_search_item_name" id="0x7f0a0375" />
+    <public type="id" name="guild_search_recycler" id="0x7f0a0376" />
+    <public type="id" name="guild_transfer_ownership_acknowledge_check" id="0x7f0a0377" />
+    <public type="id" name="guild_transfer_ownership_cancel" id="0x7f0a0378" />
+    <public type="id" name="guild_transfer_ownership_confirm" id="0x7f0a0379" />
+    <public type="id" name="guild_transfer_ownership_mfa_code" id="0x7f0a037a" />
+    <public type="id" name="guild_transfer_ownership_mfa_wrap" id="0x7f0a037b" />
+    <public type="id" name="guild_view_1" id="0x7f0a037c" />
+    <public type="id" name="guild_view_2" id="0x7f0a037d" />
+    <public type="id" name="guild_view_3" id="0x7f0a037e" />
+    <public type="id" name="guild_view_4" id="0x7f0a037f" />
+    <public type="id" name="guild_view_image" id="0x7f0a0380" />
+    <public type="id" name="guild_view_text" id="0x7f0a0381" />
+    <public type="id" name="guild_views" id="0x7f0a0382" />
+    <public type="id" name="guilds_item_avatar" id="0x7f0a0383" />
+    <public type="id" name="guilds_item_avatar_text" id="0x7f0a0384" />
+    <public type="id" name="guilds_item_avatar_wrap" id="0x7f0a0385" />
+    <public type="id" name="guilds_item_dm_avatar" id="0x7f0a0386" />
+    <public type="id" name="guilds_item_dm_count" id="0x7f0a0387" />
+    <public type="id" name="guilds_item_folder" id="0x7f0a0388" />
+    <public type="id" name="guilds_item_folder_container" id="0x7f0a0389" />
+    <public type="id" name="guilds_item_guild_new_avatar" id="0x7f0a038a" />
+    <public type="id" name="guilds_item_highlight" id="0x7f0a038b" />
+    <public type="id" name="guilds_item_mentions" id="0x7f0a038c" />
+    <public type="id" name="guilds_item_profile_avatar" id="0x7f0a038d" />
+    <public type="id" name="guilds_item_profile_selected" id="0x7f0a038e" />
+    <public type="id" name="guilds_item_selected" id="0x7f0a038f" />
+    <public type="id" name="guilds_item_unread" id="0x7f0a0390" />
+    <public type="id" name="guilds_item_voice" id="0x7f0a0391" />
+    <public type="id" name="hardware" id="0x7f0a0392" />
+    <public type="id" name="header_item_text" id="0x7f0a0393" />
+    <public type="id" name="home" id="0x7f0a0394" />
+    <public type="id" name="homeAsUp" id="0x7f0a0395" />
+    <public type="id" name="icon" id="0x7f0a0396" />
+    <public type="id" name="icon_group" id="0x7f0a0397" />
+    <public type="id" name="icon_only" id="0x7f0a0398" />
+    <public type="id" name="ifRoom" id="0x7f0a0399" />
+    <public type="id" name="image" id="0x7f0a039a" />
+    <public type="id" name="image_bottom_guideline" id="0x7f0a039b" />
+    <public type="id" name="image_view_crop" id="0x7f0a039c" />
+    <public type="id" name="image_view_logo" id="0x7f0a039d" />
+    <public type="id" name="image_view_state_aspect_ratio" id="0x7f0a039e" />
+    <public type="id" name="image_view_state_rotate" id="0x7f0a039f" />
+    <public type="id" name="image_view_state_scale" id="0x7f0a03a0" />
+    <public type="id" name="incoming_call_accept_button" id="0x7f0a03a1" />
+    <public type="id" name="incoming_call_accept_container" id="0x7f0a03a2" />
+    <public type="id" name="incoming_call_accept_text" id="0x7f0a03a3" />
+    <public type="id" name="incoming_call_connect_voice_only" id="0x7f0a03a4" />
+    <public type="id" name="incoming_call_decline_button" id="0x7f0a03a5" />
+    <public type="id" name="incoming_call_decline_container" id="0x7f0a03a6" />
+    <public type="id" name="incoming_call_status_container" id="0x7f0a03a7" />
+    <public type="id" name="incoming_call_status_primary" id="0x7f0a03a8" />
+    <public type="id" name="incoming_call_status_secondary" id="0x7f0a03a9" />
+    <public type="id" name="incoming_call_top_guideline" id="0x7f0a03aa" />
+    <public type="id" name="incoming_call_users_recycler" id="0x7f0a03ab" />
+    <public type="id" name="info" id="0x7f0a03ac" />
+    <public type="id" name="integration_header_container" id="0x7f0a03ad" />
+    <public type="id" name="integration_header_disabled_overlay" id="0x7f0a03ae" />
+    <public type="id" name="integration_icon" id="0x7f0a03af" />
+    <public type="id" name="integration_name" id="0x7f0a03b0" />
+    <public type="id" name="integration_name_container" id="0x7f0a03b1" />
+    <public type="id" name="integration_owner_name" id="0x7f0a03b2" />
+    <public type="id" name="integration_settings_icon" id="0x7f0a03b3" />
+    <public type="id" name="integration_sync_switch" id="0x7f0a03b4" />
+    <public type="id" name="integration_syncing_progress_bar" id="0x7f0a03b5" />
+    <public type="id" name="integrations_empty_body" id="0x7f0a03b6" />
+    <public type="id" name="integrations_empty_header" id="0x7f0a03b7" />
+    <public type="id" name="integrations_recycler" id="0x7f0a03b8" />
+    <public type="id" name="integrations_view_flipper" id="0x7f0a03b9" />
+    <public type="id" name="invisible" id="0x7f0a03ba" />
+    <public type="id" name="invite_actions_copy" id="0x7f0a03bb" />
+    <public type="id" name="invite_actions_revoke" id="0x7f0a03bc" />
+    <public type="id" name="invite_actions_share" id="0x7f0a03bd" />
+    <public type="id" name="invite_actions_title" id="0x7f0a03be" />
+    <public type="id" name="invite_avatar" id="0x7f0a03bf" />
+    <public type="id" name="invite_avatar_small" id="0x7f0a03c0" />
+    <public type="id" name="invite_avatar_small_wrap" id="0x7f0a03c1" />
+    <public type="id" name="invite_avatar_wrap" id="0x7f0a03c2" />
+    <public type="id" name="invite_channel" id="0x7f0a03c3" />
+    <public type="id" name="invite_code" id="0x7f0a03c4" />
+    <public type="id" name="invite_container" id="0x7f0a03c5" />
+    <public type="id" name="invite_divider" id="0x7f0a03c6" />
+    <public type="id" name="invite_expiration_container" id="0x7f0a03c7" />
+    <public type="id" name="invite_expiration_time" id="0x7f0a03c8" />
+    <public type="id" name="invite_expired_image" id="0x7f0a03c9" />
+    <public type="id" name="invite_expires_label" id="0x7f0a03ca" />
+    <public type="id" name="invite_list_item_avatar" id="0x7f0a03cb" />
+    <public type="id" name="invite_members_online" id="0x7f0a03cc" />
+    <public type="id" name="invite_members_online_wrap" id="0x7f0a03cd" />
+    <public type="id" name="invite_members_total" id="0x7f0a03ce" />
+    <public type="id" name="invite_members_total_wrap" id="0x7f0a03cf" />
+    <public type="id" name="invite_members_wrap" id="0x7f0a03d0" />
+    <public type="id" name="invite_message" id="0x7f0a03d1" />
+    <public type="id" name="invite_name_container" id="0x7f0a03d2" />
+    <public type="id" name="invite_settings_bottom_sheet" id="0x7f0a03d3" />
+    <public type="id" name="invite_settings_icon" id="0x7f0a03d4" />
+    <public type="id" name="invite_title" id="0x7f0a03d5" />
+    <public type="id" name="invite_user_name" id="0x7f0a03d6" />
+    <public type="id" name="invite_uses" id="0x7f0a03d7" />
+    <public type="id" name="invite_uses_label" id="0x7f0a03d8" />
+    <public type="id" name="italic" id="0x7f0a03d9" />
+    <public type="id" name="item_backup_code_tv" id="0x7f0a03da" />
+    <public type="id" name="item_check_indicator" id="0x7f0a03db" />
+    <public type="id" name="item_description_tv" id="0x7f0a03dc" />
+    <public type="id" name="item_game_invite_action_btn" id="0x7f0a03dd" />
+    <public type="id" name="item_game_invite_application_name" id="0x7f0a03de" />
+    <public type="id" name="item_game_invite_cover_image" id="0x7f0a03df" />
+    <public type="id" name="item_game_invite_header" id="0x7f0a03e0" />
+    <public type="id" name="item_game_invite_recycler" id="0x7f0a03e1" />
+    <public type="id" name="item_game_invite_status" id="0x7f0a03e2" />
+    <public type="id" name="item_gift_accept_button" id="0x7f0a03e3" />
+    <public type="id" name="item_gift_cannot_claim_button" id="0x7f0a03e4" />
+    <public type="id" name="item_gift_details" id="0x7f0a03e5" />
+    <public type="id" name="item_gift_expires" id="0x7f0a03e6" />
+    <public type="id" name="item_gift_header" id="0x7f0a03e7" />
+    <public type="id" name="item_gift_image" id="0x7f0a03e8" />
+    <public type="id" name="item_gift_image_background" id="0x7f0a03e9" />
+    <public type="id" name="item_gift_loading_button_placeholder" id="0x7f0a03ea" />
+    <public type="id" name="item_gift_name" id="0x7f0a03eb" />
+    <public type="id" name="item_gift_subtext" id="0x7f0a03ec" />
+    <public type="id" name="item_gift_verify_button" id="0x7f0a03ed" />
+    <public type="id" name="item_group_tv" id="0x7f0a03ee" />
+    <public type="id" name="item_guild_welcome_header" id="0x7f0a03ef" />
+    <public type="id" name="item_guild_welcome_subheader" id="0x7f0a03f0" />
+    <public type="id" name="item_header" id="0x7f0a03f1" />
+    <public type="id" name="item_header_tv" id="0x7f0a03f2" />
+    <public type="id" name="item_icon_iv" id="0x7f0a03f3" />
+    <public type="id" name="item_invite_btn" id="0x7f0a03f4" />
+    <public type="id" name="item_invite_header" id="0x7f0a03f5" />
+    <public type="id" name="item_invite_image" id="0x7f0a03f6" />
+    <public type="id" name="item_invite_image_text" id="0x7f0a03f7" />
+    <public type="id" name="item_invite_join_button" id="0x7f0a03f8" />
+    <public type="id" name="item_invite_joined_button" id="0x7f0a03f9" />
+    <public type="id" name="item_invite_loading_button" id="0x7f0a03fa" />
+    <public type="id" name="item_invite_member_container" id="0x7f0a03fb" />
+    <public type="id" name="item_invite_mention_button" id="0x7f0a03fc" />
+    <public type="id" name="item_invite_name" id="0x7f0a03fd" />
+    <public type="id" name="item_invite_online_dot" id="0x7f0a03fe" />
+    <public type="id" name="item_invite_online_text" id="0x7f0a03ff" />
+    <public type="id" name="item_invite_total_member_dot" id="0x7f0a0400" />
+    <public type="id" name="item_invite_total_member_text" id="0x7f0a0401" />
+    <public type="id" name="item_listen_together_album_image" id="0x7f0a0402" />
+    <public type="id" name="item_listen_together_artist" id="0x7f0a0403" />
+    <public type="id" name="item_listen_together_container" id="0x7f0a0404" />
+    <public type="id" name="item_listen_together_header" id="0x7f0a0405" />
+    <public type="id" name="item_listen_together_join" id="0x7f0a0406" />
+    <public type="id" name="item_listen_together_recycler" id="0x7f0a0407" />
+    <public type="id" name="item_listen_together_session_ended" id="0x7f0a0408" />
+    <public type="id" name="item_listen_together_track" id="0x7f0a0409" />
+    <public type="id" name="item_mentions_tv" id="0x7f0a040a" />
+    <public type="id" name="item_name_tv" id="0x7f0a040b" />
+    <public type="id" name="item_sent" id="0x7f0a040c" />
+    <public type="id" name="item_touch_helper_previous_elevation" id="0x7f0a040d" />
+    <public type="id" name="item_unread" id="0x7f0a040e" />
+    <public type="id" name="kick_user_body" id="0x7f0a040f" />
+    <public type="id" name="kick_user_cancel" id="0x7f0a0410" />
+    <public type="id" name="kick_user_confirm" id="0x7f0a0411" />
+    <public type="id" name="kick_user_reason" id="0x7f0a0412" />
+    <public type="id" name="kick_user_title" id="0x7f0a0413" />
+    <public type="id" name="labeled" id="0x7f0a0414" />
+    <public type="id" name="largeLabel" id="0x7f0a0415" />
+    <public type="id" name="launch_btn" id="0x7f0a0416" />
+    <public type="id" name="launch_camera_btn" id="0x7f0a0417" />
+    <public type="id" name="layout_aspect_ratio" id="0x7f0a0418" />
+    <public type="id" name="layout_rotate_wheel" id="0x7f0a0419" />
+    <public type="id" name="layout_scale_wheel" id="0x7f0a041a" />
+    <public type="id" name="left" id="0x7f0a041b" />
+    <public type="id" name="light" id="0x7f0a041c" />
+    <public type="id" name="line1" id="0x7f0a041d" />
+    <public type="id" name="line3" id="0x7f0a041e" />
+    <public type="id" name="list" id="0x7f0a041f" />
+    <public type="id" name="listMode" id="0x7f0a0420" />
+    <public type="id" name="list_item" id="0x7f0a0421" />
+    <public type="id" name="loading_button_progress" id="0x7f0a0422" />
+    <public type="id" name="loading_button_text" id="0x7f0a0423" />
+    <public type="id" name="location" id="0x7f0a0424" />
+    <public type="id" name="lottie_layer_name" id="0x7f0a0425" />
+    <public type="id" name="main_drawer" id="0x7f0a0426" />
+    <public type="id" name="main_input_container" id="0x7f0a0427" />
+    <public type="id" name="main_panel_center" id="0x7f0a0428" />
+    <public type="id" name="main_panel_center_channel_less" id="0x7f0a0429" />
+    <public type="id" name="main_panel_center_channel_less_body" id="0x7f0a042a" />
+    <public type="id" name="main_panel_center_channel_less_title" id="0x7f0a042b" />
+    <public type="id" name="main_panel_center_nsfw" id="0x7f0a042c" />
+    <public type="id" name="main_panel_center_nsfw_anchor_wrap" id="0x7f0a042d" />
+    <public type="id" name="main_panel_center_nsfw_confirm" id="0x7f0a042e" />
+    <public type="id" name="main_panel_center_nsfw_deny" id="0x7f0a042f" />
+    <public type="id" name="main_panel_left" id="0x7f0a0430" />
+    <public type="id" name="main_panel_loading" id="0x7f0a0431" />
+    <public type="id" name="main_panel_right" id="0x7f0a0432" />
+    <public type="id" name="main_toolbar_unread_count" id="0x7f0a0433" />
+    <public type="id" name="manage_reactions_emoji_container" id="0x7f0a0434" />
+    <public type="id" name="manage_reactions_emoji_counter" id="0x7f0a0435" />
+    <public type="id" name="manage_reactions_emoji_emoji_textview" id="0x7f0a0436" />
+    <public type="id" name="manage_reactions_emoji_selected_indicator" id="0x7f0a0437" />
+    <public type="id" name="manage_reactions_emojis_recycler" id="0x7f0a0438" />
+    <public type="id" name="manage_reactions_result_error_img" id="0x7f0a0439" />
+    <public type="id" name="manage_reactions_result_error_text" id="0x7f0a043a" />
+    <public type="id" name="manage_reactions_result_remove_reaction" id="0x7f0a043b" />
+    <public type="id" name="manage_reactions_result_user_avatar" id="0x7f0a043c" />
+    <public type="id" name="manage_reactions_result_user_name" id="0x7f0a043d" />
+    <public type="id" name="manage_reactions_results_recycler" id="0x7f0a043e" />
+    <public type="id" name="masked" id="0x7f0a043f" />
+    <public type="id" name="media_image" id="0x7f0a0440" />
+    <public type="id" name="media_video" id="0x7f0a0441" />
+    <public type="id" name="member_list_item_avatar" id="0x7f0a0442" />
+    <public type="id" name="member_list_item_container" id="0x7f0a0443" />
+    <public type="id" name="member_list_item_lock" id="0x7f0a0444" />
+    <public type="id" name="member_list_item_name" id="0x7f0a0445" />
+    <public type="id" name="member_list_item_overflow" id="0x7f0a0446" />
+    <public type="id" name="member_list_item_roles_recycler" id="0x7f0a0447" />
+    <public type="id" name="menu_add_connections" id="0x7f0a0448" />
+    <public type="id" name="menu_audit_log_sort_actions" id="0x7f0a0449" />
+    <public type="id" name="menu_audit_log_sort_users" id="0x7f0a044a" />
+    <public type="id" name="menu_auth_mfa_backup_codes" id="0x7f0a044b" />
+    <public type="id" name="menu_auth_mfa_info" id="0x7f0a044c" />
+    <public type="id" name="menu_channel_notification_settings" id="0x7f0a044d" />
+    <public type="id" name="menu_channel_settings" id="0x7f0a044e" />
+    <public type="id" name="menu_channel_settings_delete" id="0x7f0a044f" />
+    <public type="id" name="menu_channel_settings_reset" id="0x7f0a0450" />
+    <public type="id" name="menu_chat_add_friend" id="0x7f0a0451" />
+    <public type="id" name="menu_chat_dms_close" id="0x7f0a0452" />
+    <public type="id" name="menu_chat_dms_view_profile" id="0x7f0a0453" />
+    <public type="id" name="menu_chat_group_add" id="0x7f0a0454" />
+    <public type="id" name="menu_chat_group_settings" id="0x7f0a0455" />
+    <public type="id" name="menu_chat_pins" id="0x7f0a0456" />
+    <public type="id" name="menu_chat_search" id="0x7f0a0457" />
+    <public type="id" name="menu_chat_side_panel" id="0x7f0a0458" />
+    <public type="id" name="menu_chat_start_call" id="0x7f0a0459" />
+    <public type="id" name="menu_chat_start_group" id="0x7f0a045a" />
+    <public type="id" name="menu_chat_start_video_call" id="0x7f0a045b" />
+    <public type="id" name="menu_chat_stop_call" id="0x7f0a045c" />
+    <public type="id" name="menu_copy_id" id="0x7f0a045d" />
+    <public type="id" name="menu_crop" id="0x7f0a045e" />
+    <public type="id" name="menu_debugging_filter" id="0x7f0a045f" />
+    <public type="id" name="menu_debugging_share" id="0x7f0a0460" />
+    <public type="id" name="menu_edit_overwrite_delete" id="0x7f0a0461" />
+    <public type="id" name="menu_edit_role_delete" id="0x7f0a0462" />
+    <public type="id" name="menu_filter" id="0x7f0a0463" />
+    <public type="id" name="menu_guild_call_channel_settings" id="0x7f0a0464" />
+    <public type="id" name="menu_guild_call_overlay_launcher" id="0x7f0a0465" />
+    <public type="id" name="menu_guild_call_voice_settings" id="0x7f0a0466" />
+    <public type="id" name="menu_guild_create" id="0x7f0a0467" />
+    <public type="id" name="menu_guild_join" id="0x7f0a0468" />
+    <public type="id" name="menu_leave_group" id="0x7f0a0469" />
+    <public type="id" name="menu_loader" id="0x7f0a046a" />
+    <public type="id" name="menu_media_browser" id="0x7f0a046b" />
+    <public type="id" name="menu_media_download" id="0x7f0a046c" />
+    <public type="id" name="menu_media_share" id="0x7f0a046d" />
+    <public type="id" name="menu_private_call_group_settings" id="0x7f0a046e" />
+    <public type="id" name="menu_private_call_participants" id="0x7f0a046f" />
+    <public type="id" name="menu_private_call_select_camera" id="0x7f0a0470" />
+    <public type="id" name="menu_private_call_toggle_speaker_mode" id="0x7f0a0471" />
+    <public type="id" name="menu_private_call_user_settings" id="0x7f0a0472" />
+    <public type="id" name="menu_private_call_voice_settings" id="0x7f0a0473" />
+    <public type="id" name="menu_send" id="0x7f0a0474" />
+    <public type="id" name="menu_server_settings_delete" id="0x7f0a0475" />
+    <public type="id" name="menu_server_settings_emoji_delete" id="0x7f0a0476" />
+    <public type="id" name="menu_server_settings_members_prune" id="0x7f0a0477" />
+    <public type="id" name="menu_settings_debugging" id="0x7f0a0478" />
+    <public type="id" name="menu_settings_log_out" id="0x7f0a0479" />
+    <public type="id" name="menu_sort_channel" id="0x7f0a047a" />
+    <public type="id" name="menu_sort_done" id="0x7f0a047b" />
+    <public type="id" name="menu_spectate_report_problem" id="0x7f0a047c" />
+    <public type="id" name="menu_spectate_spectators" id="0x7f0a047d" />
+    <public type="id" name="menu_user_mentions_filter" id="0x7f0a047e" />
+    <public type="id" name="menu_user_profile_block" id="0x7f0a047f" />
+    <public type="id" name="menu_user_profile_cancel" id="0x7f0a0480" />
+    <public type="id" name="menu_user_profile_ignore" id="0x7f0a0481" />
+    <public type="id" name="menu_user_profile_message" id="0x7f0a0482" />
+    <public type="id" name="menu_user_profile_remove_friend" id="0x7f0a0483" />
+    <public type="id" name="menu_user_profile_unblock" id="0x7f0a0484" />
+    <public type="id" name="message" id="0x7f0a0485" />
+    <public type="id" name="mfa_description_text" id="0x7f0a0486" />
+    <public type="id" name="mfa_download_body" id="0x7f0a0487" />
+    <public type="id" name="mfa_success_enable_sms" id="0x7f0a0488" />
+    <public type="id" name="middle" id="0x7f0a0489" />
+    <public type="id" name="mini" id="0x7f0a048a" />
+    <public type="id" name="mtrl_child_content_container" id="0x7f0a048b" />
+    <public type="id" name="mtrl_internal_children_alpha_tag" id="0x7f0a048c" />
+    <public type="id" name="multiply" id="0x7f0a048d" />
+    <public type="id" name="mute_toggle" id="0x7f0a048e" />
+    <public type="id" name="navigation_header_container" id="0x7f0a048f" />
+    <public type="id" name="navigation_indicator" id="0x7f0a0490" />
+    <public type="id" name="nearby_friends_button_flipper" id="0x7f0a0491" />
+    <public type="id" name="nearby_friends_disable" id="0x7f0a0492" />
+    <public type="id" name="nearby_friends_enable" id="0x7f0a0493" />
+    <public type="id" name="nearby_friends_error" id="0x7f0a0494" />
+    <public type="id" name="nearby_friends_flipper" id="0x7f0a0495" />
+    <public type="id" name="nearby_friends_learn_more" id="0x7f0a0496" />
+    <public type="id" name="nearby_friends_recycler" id="0x7f0a0497" />
+    <public type="id" name="nearby_friends_searching" id="0x7f0a0498" />
+    <public type="id" name="nearby_friends_searching_lottie" id="0x7f0a0499" />
+    <public type="id" name="never" id="0x7f0a049a" />
+    <public type="id" name="news_item_view" id="0x7f0a049b" />
+    <public type="id" name="no_bans_body" id="0x7f0a049c" />
+    <public type="id" name="no_invites_body" id="0x7f0a049d" />
+    <public type="id" name="no_invites_header" id="0x7f0a049e" />
+    <public type="id" name="no_logs_body" id="0x7f0a049f" />
+    <public type="id" name="no_logs_title" id="0x7f0a04a0" />
+    <public type="id" name="no_results_text" id="0x7f0a04a1" />
+    <public type="id" name="none" id="0x7f0a04a2" />
+    <public type="id" name="normal" id="0x7f0a04a3" />
+    <public type="id" name="notice_body_container" id="0x7f0a04a4" />
+    <public type="id" name="notice_body_text" id="0x7f0a04a5" />
+    <public type="id" name="notice_cancel" id="0x7f0a04a6" />
+    <public type="id" name="notice_crop" id="0x7f0a04a7" />
+    <public type="id" name="notice_header" id="0x7f0a04a8" />
+    <public type="id" name="notice_header_container" id="0x7f0a04a9" />
+    <public type="id" name="notice_image" id="0x7f0a04aa" />
+    <public type="id" name="notice_ok" id="0x7f0a04ab" />
+    <public type="id" name="notice_upload" id="0x7f0a04ac" />
+    <public type="id" name="notification_background" id="0x7f0a04ad" />
+    <public type="id" name="notification_main_column" id="0x7f0a04ae" />
+    <public type="id" name="notification_main_column_container" id="0x7f0a04af" />
+    <public type="id" name="nowrap" id="0x7f0a04b0" />
+    <public type="id" name="nux_guild_use_cases_dismiss" id="0x7f0a04b1" />
+    <public type="id" name="nux_guild_use_cases_item_chat_with_friends" id="0x7f0a04b2" />
+    <public type="id" name="nux_guild_use_cases_item_club" id="0x7f0a04b3" />
+    <public type="id" name="nux_guild_use_cases_item_gaming" id="0x7f0a04b4" />
+    <public type="id" name="nux_guild_use_cases_item_join_a_friend" id="0x7f0a04b5" />
+    <public type="id" name="nux_guild_use_cases_item_voice_chat" id="0x7f0a04b6" />
+    <public type="id" name="oauth_application_deauthorize_btn" id="0x7f0a04b7" />
+    <public type="id" name="oauth_application_description_label_tv" id="0x7f0a04b8" />
+    <public type="id" name="oauth_application_description_tv" id="0x7f0a04b9" />
+    <public type="id" name="oauth_application_icon_iv" id="0x7f0a04ba" />
+    <public type="id" name="oauth_application_name_tv" id="0x7f0a04bb" />
+    <public type="id" name="oauth_application_permissions_rv" id="0x7f0a04bc" />
+    <public type="id" name="oauth_authorize_application_icon" id="0x7f0a04bd" />
+    <public type="id" name="oauth_authorize_application_name" id="0x7f0a04be" />
+    <public type="id" name="oauth_authorize_connect_label" id="0x7f0a04bf" />
+    <public type="id" name="oauth_authorize_content" id="0x7f0a04c0" />
+    <public type="id" name="oauth_authorize_deny" id="0x7f0a04c1" />
+    <public type="id" name="oauth_authorize_grant" id="0x7f0a04c2" />
+    <public type="id" name="oauth_authorize_loading" id="0x7f0a04c3" />
+    <public type="id" name="oauth_authorize_loading_cancel" id="0x7f0a04c4" />
+    <public type="id" name="oauth_authorize_not_supported" id="0x7f0a04c5" />
+    <public type="id" name="oauth_authorize_permissions_label_tv" id="0x7f0a04c6" />
+    <public type="id" name="oauth_authorize_permissions_list" id="0x7f0a04c7" />
+    <public type="id" name="oauth_authorize_security_notice" id="0x7f0a04c8" />
+    <public type="id" name="oauth_authorize_unsupported_browser" id="0x7f0a04c9" />
+    <public type="id" name="oauth_authorize_unsupported_cancel" id="0x7f0a04ca" />
+    <public type="id" name="oauth_token_permission_detailed_desc" id="0x7f0a04cb" />
+    <public type="id" name="oauth_token_permission_detailed_icon" id="0x7f0a04cc" />
+    <public type="id" name="oauth_token_permission_detailed_name" id="0x7f0a04cd" />
+    <public type="id" name="off" id="0x7f0a04ce" />
+    <public type="id" name="off_disabled_overlay" id="0x7f0a04cf" />
+    <public type="id" name="on" id="0x7f0a04d0" />
+    <public type="id" name="outline" id="0x7f0a04d1" />
+    <public type="id" name="overlay_bubble_iv" id="0x7f0a04d2" />
+    <public type="id" name="overlay_channel_name" id="0x7f0a04d3" />
+    <public type="id" name="overlay_guild_name" id="0x7f0a04d4" />
+    <public type="id" name="overlay_header" id="0x7f0a04d5" />
+    <public type="id" name="overlay_invite_link" id="0x7f0a04d6" />
+    <public type="id" name="overlay_linked_anchor_view" id="0x7f0a04d7" />
+    <public type="id" name="overlay_members_overflow_tv" id="0x7f0a04d8" />
+    <public type="id" name="overlay_members_rv" id="0x7f0a04d9" />
+    <public type="id" name="overlay_menu" id="0x7f0a04da" />
+    <public type="id" name="overlay_network_icon" id="0x7f0a04db" />
+    <public type="id" name="overlay_open_app" id="0x7f0a04dc" />
+    <public type="id" name="overlay_switch_channels" id="0x7f0a04dd" />
+    <public type="id" name="packed" id="0x7f0a04de" />
+    <public type="id" name="page_tabs" id="0x7f0a04df" />
+    <public type="id" name="parallax" id="0x7f0a04e0" />
+    <public type="id" name="parent" id="0x7f0a04e1" />
+    <public type="id" name="parentPanel" id="0x7f0a04e2" />
+    <public type="id" name="parent_matrix" id="0x7f0a04e3" />
+    <public type="id" name="participant_bg_avatar" id="0x7f0a04e4" />
+    <public type="id" name="participant_bg_letterbox" id="0x7f0a04e5" />
+    <public type="id" name="participant_content_container" id="0x7f0a04e6" />
+    <public type="id" name="participant_video_loading_indicator" id="0x7f0a04e7" />
+    <public type="id" name="participant_video_stream_renderer" id="0x7f0a04e8" />
+    <public type="id" name="participant_voice_status_indicator" id="0x7f0a04e9" />
+    <public type="id" name="participant_voice_user_view" id="0x7f0a04ea" />
+    <public type="id" name="payment_info_address_1_textinputlayout" id="0x7f0a04eb" />
+    <public type="id" name="payment_info_address_2_textinputlayout" id="0x7f0a04ec" />
+    <public type="id" name="payment_info_cancel" id="0x7f0a04ed" />
+    <public type="id" name="payment_info_city_edittext" id="0x7f0a04ee" />
+    <public type="id" name="payment_info_city_textinputlayout" id="0x7f0a04ef" />
+    <public type="id" name="payment_info_delete" id="0x7f0a04f0" />
+    <public type="id" name="payment_info_make_default_checkbox" id="0x7f0a04f1" />
+    <public type="id" name="payment_info_name_address_1_edittext" id="0x7f0a04f2" />
+    <public type="id" name="payment_info_name_address_2_edittext" id="0x7f0a04f3" />
+    <public type="id" name="payment_info_name_edittext" id="0x7f0a04f4" />
+    <public type="id" name="payment_info_name_textinputlayout" id="0x7f0a04f5" />
+    <public type="id" name="payment_info_save" id="0x7f0a04f6" />
+    <public type="id" name="payment_info_zip_edittext" id="0x7f0a04f7" />
+    <public type="id" name="payment_info_zip_textinputlayout" id="0x7f0a04f8" />
+    <public type="id" name="payment_method_edit" id="0x7f0a04f9" />
+    <public type="id" name="payment_method_header" id="0x7f0a04fa" />
+    <public type="id" name="payment_method_summary" id="0x7f0a04fb" />
+    <public type="id" name="payment_methods_empty_add" id="0x7f0a04fc" />
+    <public type="id" name="payment_methods_empty_image" id="0x7f0a04fd" />
+    <public type="id" name="payment_methods_empty_subtext" id="0x7f0a04fe" />
+    <public type="id" name="payment_methods_empty_title" id="0x7f0a04ff" />
+    <public type="id" name="payment_methods_loading" id="0x7f0a0500" />
+    <public type="id" name="payment_methods_recycler" id="0x7f0a0501" />
+    <public type="id" name="payment_methods_retry" id="0x7f0a0502" />
+    <public type="id" name="payment_methods_view_flipper" id="0x7f0a0503" />
+    <public type="id" name="payment_source_edit_address1" id="0x7f0a0504" />
+    <public type="id" name="payment_source_edit_address2" id="0x7f0a0505" />
+    <public type="id" name="payment_source_edit_city" id="0x7f0a0506" />
+    <public type="id" name="payment_source_edit_country" id="0x7f0a0507" />
+    <public type="id" name="payment_source_edit_default" id="0x7f0a0508" />
+    <public type="id" name="payment_source_edit_error" id="0x7f0a0509" />
+    <public type="id" name="payment_source_edit_help" id="0x7f0a050a" />
+    <public type="id" name="payment_source_edit_name" id="0x7f0a050b" />
+    <public type="id" name="payment_source_edit_postal_code" id="0x7f0a050c" />
+    <public type="id" name="payment_source_edit_state" id="0x7f0a050d" />
+    <public type="id" name="payment_source_summary" id="0x7f0a050e" />
+    <public type="id" name="payment_source_view_icon" id="0x7f0a050f" />
+    <public type="id" name="payment_source_view_icon_wrapper" id="0x7f0a0510" />
+    <public type="id" name="payment_source_view_invalid" id="0x7f0a0511" />
+    <public type="id" name="payment_source_view_premium" id="0x7f0a0512" />
+    <public type="id" name="payment_source_view_subtext" id="0x7f0a0513" />
+    <public type="id" name="payment_source_view_title" id="0x7f0a0514" />
+    <public type="id" name="percent" id="0x7f0a0515" />
+    <public type="id" name="perk_view_content_list_item" id="0x7f0a0516" />
+    <public type="id" name="perks_level_contents_header" id="0x7f0a0517" />
+    <public type="id" name="perks_level_contents_recycler" id="0x7f0a0518" />
+    <public type="id" name="perks_level_header" id="0x7f0a0519" />
+    <public type="id" name="perks_level_header_boosts" id="0x7f0a051a" />
+    <public type="id" name="perks_level_header_text" id="0x7f0a051b" />
+    <public type="id" name="perks_level_header_unlocked" id="0x7f0a051c" />
+    <public type="id" name="perm_req_text" id="0x7f0a051d" />
+    <public type="id" name="permissions_container" id="0x7f0a051e" />
+    <public type="id" name="permissions_req_btn" id="0x7f0a051f" />
+    <public type="id" name="pin" id="0x7f0a0520" />
+    <public type="id" name="platform_identities_list" id="0x7f0a0521" />
+    <public type="id" name="popup_attachment" id="0x7f0a0522" />
+    <public type="id" name="popup_body" id="0x7f0a0523" />
+    <public type="id" name="popup_close_btn" id="0x7f0a0524" />
+    <public type="id" name="popup_countdown_progress" id="0x7f0a0525" />
+    <public type="id" name="popup_icon" id="0x7f0a0526" />
+    <public type="id" name="popup_subtitle" id="0x7f0a0527" />
+    <public type="id" name="popup_title" id="0x7f0a0528" />
+    <public type="id" name="premium_perks_upload_text" id="0x7f0a0529" />
+    <public type="id" name="premium_settings_active_subscription" id="0x7f0a052a" />
+    <public type="id" name="premium_settings_credit_container" id="0x7f0a052b" />
+    <public type="id" name="premium_settings_grandfathered" id="0x7f0a052c" />
+    <public type="id" name="premium_settings_legalese" id="0x7f0a052d" />
+    <public type="id" name="premium_settings_nitro" id="0x7f0a052e" />
+    <public type="id" name="premium_settings_nitro_classic" id="0x7f0a052f" />
+    <public type="id" name="premium_settings_nitro_classic_wumpus" id="0x7f0a0530" />
+    <public type="id" name="premium_settings_nitro_wumpus" id="0x7f0a0531" />
+    <public type="id" name="premium_settings_premium_classic_gift" id="0x7f0a0532" />
+    <public type="id" name="premium_settings_premium_classic_monthly" id="0x7f0a0533" />
+    <public type="id" name="premium_settings_premium_classic_yearly" id="0x7f0a0534" />
+    <public type="id" name="premium_settings_premium_gift" id="0x7f0a0535" />
+    <public type="id" name="premium_settings_premium_monthly" id="0x7f0a0536" />
+    <public type="id" name="premium_settings_premium_yearly" id="0x7f0a0537" />
+    <public type="id" name="premium_settings_retry" id="0x7f0a0538" />
+    <public type="id" name="premium_settings_scrollview" id="0x7f0a0539" />
+    <public type="id" name="premium_settings_tier_1_container" id="0x7f0a053a" />
+    <public type="id" name="premium_settings_tier_2_container" id="0x7f0a053b" />
+    <public type="id" name="premium_settings_view_flipper" id="0x7f0a053c" />
+    <public type="id" name="premium_upsell_body" id="0x7f0a053d" />
+    <public type="id" name="premium_upsell_close" id="0x7f0a053e" />
+    <public type="id" name="premium_upsell_dots" id="0x7f0a053f" />
+    <public type="id" name="premium_upsell_header" id="0x7f0a0540" />
+    <public type="id" name="premium_upsell_img" id="0x7f0a0541" />
+    <public type="id" name="premium_upsell_learn_more" id="0x7f0a0542" />
+    <public type="id" name="premium_upsell_viewpager" id="0x7f0a0543" />
+    <public type="id" name="private_call_connect" id="0x7f0a0544" />
+    <public type="id" name="private_call_controls_disconnect" id="0x7f0a0545" />
+    <public type="id" name="private_call_controls_mute" id="0x7f0a0546" />
+    <public type="id" name="private_call_controls_video" id="0x7f0a0547" />
+    <public type="id" name="private_call_participant_list" id="0x7f0a0548" />
+    <public type="id" name="private_call_pip_participant" id="0x7f0a0549" />
+    <public type="id" name="private_call_push_to_talk" id="0x7f0a054a" />
+    <public type="id" name="private_call_status_container" id="0x7f0a054b" />
+    <public type="id" name="private_call_status_primary" id="0x7f0a054c" />
+    <public type="id" name="private_call_status_secondary" id="0x7f0a054d" />
+    <public type="id" name="private_call_top_guideline" id="0x7f0a054e" />
+    <public type="id" name="private_call_video_streams" id="0x7f0a054f" />
+    <public type="id" name="private_call_voice_status_group" id="0x7f0a0550" />
+    <public type="id" name="profile_strip_avatar" id="0x7f0a0551" />
+    <public type="id" name="profile_strip_avatar_image" id="0x7f0a0552" />
+    <public type="id" name="profile_strip_discriminator" id="0x7f0a0553" />
+    <public type="id" name="profile_strip_mentions" id="0x7f0a0554" />
+    <public type="id" name="profile_strip_name" id="0x7f0a0555" />
+    <public type="id" name="profile_strip_search" id="0x7f0a0556" />
+    <public type="id" name="profile_strip_settings" id="0x7f0a0557" />
+    <public type="id" name="profile_strip_status" id="0x7f0a0558" />
+    <public type="id" name="progress_bar" id="0x7f0a0559" />
+    <public type="id" name="progress_cancel_centered" id="0x7f0a055a" />
+    <public type="id" name="progress_cancel_top" id="0x7f0a055b" />
+    <public type="id" name="progress_circular" id="0x7f0a055c" />
+    <public type="id" name="progress_file_image" id="0x7f0a055d" />
+    <public type="id" name="progress_horizontal" id="0x7f0a055e" />
+    <public type="id" name="progress_subtext" id="0x7f0a055f" />
+    <public type="id" name="progress_text" id="0x7f0a0560" />
+    <public type="id" name="prune_user_cancel" id="0x7f0a0561" />
+    <public type="id" name="prune_user_header" id="0x7f0a0562" />
+    <public type="id" name="prune_user_prune" id="0x7f0a0563" />
+    <public type="id" name="prune_users_estimate_text" id="0x7f0a0564" />
+    <public type="id" name="prune_users_history_1_radio" id="0x7f0a0565" />
+    <public type="id" name="prune_users_history_2_radio" id="0x7f0a0566" />
+    <public type="id" name="prune_users_history_3_radio" id="0x7f0a0567" />
+    <public type="id" name="prune_users_loading_progressbar" id="0x7f0a0568" />
+    <public type="id" name="radio" id="0x7f0a0569" />
+    <public type="id" name="reaction_counter_text_1" id="0x7f0a056a" />
+    <public type="id" name="reaction_counter_text_2" id="0x7f0a056b" />
+    <public type="id" name="reaction_counter_text_switcher" id="0x7f0a056c" />
+    <public type="id" name="reaction_emoji_text" id="0x7f0a056d" />
+    <public type="id" name="reaction_quick_add" id="0x7f0a056e" />
+    <public type="id" name="report_error_audio_absent" id="0x7f0a056f" />
+    <public type="id" name="report_error_audio_poor" id="0x7f0a0570" />
+    <public type="id" name="report_error_blurry" id="0x7f0a0571" />
+    <public type="id" name="report_error_lagging" id="0x7f0a0572" />
+    <public type="id" name="report_error_out_of_sync" id="0x7f0a0573" />
+    <public type="id" name="report_error_radio_group" id="0x7f0a0574" />
+    <public type="id" name="report_error_stream_black" id="0x7f0a0575" />
+    <public type="id" name="report_problem_cancel" id="0x7f0a0576" />
+    <public type="id" name="report_problem_header" id="0x7f0a0577" />
+    <public type="id" name="report_problem_submit" id="0x7f0a0578" />
+    <public type="id" name="restart" id="0x7f0a0579" />
+    <public type="id" name="result_count" id="0x7f0a057a" />
+    <public type="id" name="results_rv" id="0x7f0a057b" />
+    <public type="id" name="reverse" id="0x7f0a057c" />
+    <public type="id" name="rich_presence_container" id="0x7f0a057d" />
+    <public type="id" name="rich_presence_container_data" id="0x7f0a057e" />
+    <public type="id" name="rich_presence_details" id="0x7f0a057f" />
+    <public type="id" name="rich_presence_header" id="0x7f0a0580" />
+    <public type="id" name="rich_presence_image_large" id="0x7f0a0581" />
+    <public type="id" name="rich_presence_image_small" id="0x7f0a0582" />
+    <public type="id" name="rich_presence_music_duration" id="0x7f0a0583" />
+    <public type="id" name="rich_presence_music_elapsed" id="0x7f0a0584" />
+    <public type="id" name="rich_presence_play_button" id="0x7f0a0585" />
+    <public type="id" name="rich_presence_play_button_text" id="0x7f0a0586" />
+    <public type="id" name="rich_presence_state" id="0x7f0a0587" />
+    <public type="id" name="rich_presence_superbar" id="0x7f0a0588" />
+    <public type="id" name="rich_presence_time" id="0x7f0a0589" />
+    <public type="id" name="rich_presence_title" id="0x7f0a058a" />
+    <public type="id" name="rich_presence_watch_button" id="0x7f0a058b" />
+    <public type="id" name="right" id="0x7f0a058c" />
+    <public type="id" name="right_icon" id="0x7f0a058d" />
+    <public type="id" name="right_side" id="0x7f0a058e" />
+    <public type="id" name="role_item_checked_setting" id="0x7f0a058f" />
+    <public type="id" name="role_settings_add_reactions" id="0x7f0a0590" />
+    <public type="id" name="role_settings_administrator" id="0x7f0a0591" />
+    <public type="id" name="role_settings_attach_files" id="0x7f0a0592" />
+    <public type="id" name="role_settings_ban_members" id="0x7f0a0593" />
+    <public type="id" name="role_settings_change_nickname" id="0x7f0a0594" />
+    <public type="id" name="role_settings_color_disabled_overlay" id="0x7f0a0595" />
+    <public type="id" name="role_settings_color_selector_container" id="0x7f0a0596" />
+    <public type="id" name="role_settings_create_instant_invite" id="0x7f0a0597" />
+    <public type="id" name="role_settings_current_color_display" id="0x7f0a0598" />
+    <public type="id" name="role_settings_edit_name_disabled_overlay" id="0x7f0a0599" />
+    <public type="id" name="role_settings_embed_links" id="0x7f0a059a" />
+    <public type="id" name="role_settings_hoist_checkedsetting" id="0x7f0a059b" />
+    <public type="id" name="role_settings_kick_members" id="0x7f0a059c" />
+    <public type="id" name="role_settings_manage_channels" id="0x7f0a059d" />
+    <public type="id" name="role_settings_manage_emojis" id="0x7f0a059e" />
+    <public type="id" name="role_settings_manage_messages" id="0x7f0a059f" />
+    <public type="id" name="role_settings_manage_nicknames" id="0x7f0a05a0" />
+    <public type="id" name="role_settings_manage_roles" id="0x7f0a05a1" />
+    <public type="id" name="role_settings_manage_server" id="0x7f0a05a2" />
+    <public type="id" name="role_settings_manage_webhooks" id="0x7f0a05a3" />
+    <public type="id" name="role_settings_mention_everyone" id="0x7f0a05a4" />
+    <public type="id" name="role_settings_mentionable_checkedsetting" id="0x7f0a05a5" />
+    <public type="id" name="role_settings_overview_scroll" id="0x7f0a05a6" />
+    <public type="id" name="role_settings_read_message_history" id="0x7f0a05a7" />
+    <public type="id" name="role_settings_read_messages" id="0x7f0a05a8" />
+    <public type="id" name="role_settings_send_messages" id="0x7f0a05a9" />
+    <public type="id" name="role_settings_send_tts_messages" id="0x7f0a05aa" />
+    <public type="id" name="role_settings_use_external_emojis" id="0x7f0a05ab" />
+    <public type="id" name="role_settings_view_audit_log" id="0x7f0a05ac" />
+    <public type="id" name="role_settings_voice_connect" id="0x7f0a05ad" />
+    <public type="id" name="role_settings_voice_deafen_members" id="0x7f0a05ae" />
+    <public type="id" name="role_settings_voice_move_members" id="0x7f0a05af" />
+    <public type="id" name="role_settings_voice_mute_members" id="0x7f0a05b0" />
+    <public type="id" name="role_settings_voice_speak" id="0x7f0a05b1" />
+    <public type="id" name="role_settings_voice_use_voice_activity" id="0x7f0a05b2" />
+    <public type="id" name="role_spinner_item_textview" id="0x7f0a05b3" />
+    <public type="id" name="roles_list_add_role_fab" id="0x7f0a05b4" />
+    <public type="id" name="rotate_scroll_wheel" id="0x7f0a05b5" />
+    <public type="id" name="row" id="0x7f0a05b6" />
+    <public type="id" name="row_reverse" id="0x7f0a05b7" />
+    <public type="id" name="save_image_matrix" id="0x7f0a05b8" />
+    <public type="id" name="save_non_transition_alpha" id="0x7f0a05b9" />
+    <public type="id" name="save_scale_type" id="0x7f0a05ba" />
+    <public type="id" name="scale_scroll_wheel" id="0x7f0a05bb" />
+    <public type="id" name="screen" id="0x7f0a05bc" />
+    <public type="id" name="scroll" id="0x7f0a05bd" />
+    <public type="id" name="scrollIndicatorDown" id="0x7f0a05be" />
+    <public type="id" name="scrollIndicatorUp" id="0x7f0a05bf" />
+    <public type="id" name="scrollView" id="0x7f0a05c0" />
+    <public type="id" name="scroll_view" id="0x7f0a05c1" />
+    <public type="id" name="scrollable" id="0x7f0a05c2" />
+    <public type="id" name="search_back" id="0x7f0a05c3" />
+    <public type="id" name="search_badge" id="0x7f0a05c4" />
+    <public type="id" name="search_bar" id="0x7f0a05c5" />
+    <public type="id" name="search_button" id="0x7f0a05c6" />
+    <public type="id" name="search_clear" id="0x7f0a05c7" />
+    <public type="id" name="search_close_btn" id="0x7f0a05c8" />
+    <public type="id" name="search_edit_frame" id="0x7f0a05c9" />
+    <public type="id" name="search_filter" id="0x7f0a05ca" />
+    <public type="id" name="search_flipper" id="0x7f0a05cb" />
+    <public type="id" name="search_go_btn" id="0x7f0a05cc" />
+    <public type="id" name="search_input" id="0x7f0a05cd" />
+    <public type="id" name="search_mag_icon" id="0x7f0a05ce" />
+    <public type="id" name="search_plate" id="0x7f0a05cf" />
+    <public type="id" name="search_results_list" id="0x7f0a05d0" />
+    <public type="id" name="search_send_query_fab" id="0x7f0a05d1" />
+    <public type="id" name="search_src_text" id="0x7f0a05d2" />
+    <public type="id" name="search_suggestion_item_channel_container" id="0x7f0a05d3" />
+    <public type="id" name="search_suggestion_item_has_container" id="0x7f0a05d4" />
+    <public type="id" name="search_suggestion_item_recent_query_container" id="0x7f0a05d5" />
+    <public type="id" name="search_suggestion_item_user_container" id="0x7f0a05d6" />
+    <public type="id" name="search_suggestions_item_channel_icon" id="0x7f0a05d7" />
+    <public type="id" name="search_suggestions_item_channel_text" id="0x7f0a05d8" />
+    <public type="id" name="search_suggestions_item_has_icon" id="0x7f0a05d9" />
+    <public type="id" name="search_suggestions_item_has_text" id="0x7f0a05da" />
+    <public type="id" name="search_suggestions_item_recent_query_icon" id="0x7f0a05db" />
+    <public type="id" name="search_suggestions_item_recent_query_text" id="0x7f0a05dc" />
+    <public type="id" name="search_suggestions_recycler" id="0x7f0a05dd" />
+    <public type="id" name="search_voice_btn" id="0x7f0a05de" />
+    <public type="id" name="select_dialog_listview" id="0x7f0a05df" />
+    <public type="id" name="selected" id="0x7f0a05e0" />
+    <public type="id" name="selected_checkmark" id="0x7f0a05e1" />
+    <public type="id" name="selection_indicator" id="0x7f0a05e2" />
+    <public type="id" name="send_btn" id="0x7f0a05e3" />
+    <public type="id" name="server_boost_status_empty_text" id="0x7f0a05e4" />
+    <public type="id" name="server_notifications_everyone_switch" id="0x7f0a05e5" />
+    <public type="id" name="server_notifications_frequency_0_radio" id="0x7f0a05e6" />
+    <public type="id" name="server_notifications_frequency_1_radio" id="0x7f0a05e7" />
+    <public type="id" name="server_notifications_frequency_2_radio" id="0x7f0a05e8" />
+    <public type="id" name="server_notifications_frequency_wrap" id="0x7f0a05e9" />
+    <public type="id" name="server_notifications_mute_check" id="0x7f0a05ea" />
+    <public type="id" name="server_notifications_push_switch" id="0x7f0a05eb" />
+    <public type="id" name="server_settings_audit_logs_action_filter" id="0x7f0a05ec" />
+    <public type="id" name="server_settings_audit_logs_action_filter_container" id="0x7f0a05ed" />
+    <public type="id" name="server_settings_audit_logs_recycler" id="0x7f0a05ee" />
+    <public type="id" name="server_settings_audit_logs_user_filter" id="0x7f0a05ef" />
+    <public type="id" name="server_settings_audit_logs_user_filter_container" id="0x7f0a05f0" />
+    <public type="id" name="server_settings_audit_logs_view_flipper" id="0x7f0a05f1" />
+    <public type="id" name="server_settings_audit_logs_view_results_flipper" id="0x7f0a05f2" />
+    <public type="id" name="server_settings_bans_option" id="0x7f0a05f3" />
+    <public type="id" name="server_settings_bans_recycler" id="0x7f0a05f4" />
+    <public type="id" name="server_settings_bans_search" id="0x7f0a05f5" />
+    <public type="id" name="server_settings_bans_view_flipper" id="0x7f0a05f6" />
+    <public type="id" name="server_settings_channels_create_channel" id="0x7f0a05f7" />
+    <public type="id" name="server_settings_channels_sort_actions_category" id="0x7f0a05f8" />
+    <public type="id" name="server_settings_channels_sort_actions_text" id="0x7f0a05f9" />
+    <public type="id" name="server_settings_channels_sort_actions_voice" id="0x7f0a05fa" />
+    <public type="id" name="server_settings_channels_text_recycler" id="0x7f0a05fb" />
+    <public type="id" name="server_settings_confirm_disable_integration_body" id="0x7f0a05fc" />
+    <public type="id" name="server_settings_confirm_disable_integration_cancel" id="0x7f0a05fd" />
+    <public type="id" name="server_settings_confirm_disable_integration_confirm" id="0x7f0a05fe" />
+    <public type="id" name="server_settings_confirm_disable_integration_header" id="0x7f0a05ff" />
+    <public type="id" name="server_settings_delete_server_cancel" id="0x7f0a0600" />
+    <public type="id" name="server_settings_delete_server_confirm" id="0x7f0a0601" />
+    <public type="id" name="server_settings_delete_server_header" id="0x7f0a0602" />
+    <public type="id" name="server_settings_delete_server_mfa_code" id="0x7f0a0603" />
+    <public type="id" name="server_settings_delete_server_mfa_wrap" id="0x7f0a0604" />
+    <public type="id" name="server_settings_delete_server_text" id="0x7f0a0605" />
+    <public type="id" name="server_settings_emojis_avatar" id="0x7f0a0606" />
+    <public type="id" name="server_settings_emojis_container" id="0x7f0a0607" />
+    <public type="id" name="server_settings_emojis_edit_alias" id="0x7f0a0608" />
+    <public type="id" name="server_settings_emojis_edit_alias_save" id="0x7f0a0609" />
+    <public type="id" name="server_settings_emojis_name" id="0x7f0a060a" />
+    <public type="id" name="server_settings_emojis_option" id="0x7f0a060b" />
+    <public type="id" name="server_settings_emojis_overflow" id="0x7f0a060c" />
+    <public type="id" name="server_settings_emojis_username" id="0x7f0a060d" />
+    <public type="id" name="server_settings_emojis_username_avatar" id="0x7f0a060e" />
+    <public type="id" name="server_settings_instant_invites_option" id="0x7f0a060f" />
+    <public type="id" name="server_settings_instant_invites_recycler" id="0x7f0a0610" />
+    <public type="id" name="server_settings_instant_invites_view_flipper" id="0x7f0a0611" />
+    <public type="id" name="server_settings_members_header_container" id="0x7f0a0612" />
+    <public type="id" name="server_settings_members_name_search" id="0x7f0a0613" />
+    <public type="id" name="server_settings_members_option" id="0x7f0a0614" />
+    <public type="id" name="server_settings_members_recycler" id="0x7f0a0615" />
+    <public type="id" name="server_settings_members_roles_spinner" id="0x7f0a0616" />
+    <public type="id" name="server_settings_members_view_flipper" id="0x7f0a0617" />
+    <public type="id" name="server_settings_moderation_explicit_1" id="0x7f0a0618" />
+    <public type="id" name="server_settings_moderation_explicit_2" id="0x7f0a0619" />
+    <public type="id" name="server_settings_moderation_explicit_3" id="0x7f0a061a" />
+    <public type="id" name="server_settings_moderation_verification_1" id="0x7f0a061b" />
+    <public type="id" name="server_settings_moderation_verification_2" id="0x7f0a061c" />
+    <public type="id" name="server_settings_moderation_verification_3" id="0x7f0a061d" />
+    <public type="id" name="server_settings_moderation_verification_4" id="0x7f0a061e" />
+    <public type="id" name="server_settings_moderation_verification_5" id="0x7f0a061f" />
+    <public type="id" name="server_settings_option_audit_log" id="0x7f0a0620" />
+    <public type="id" name="server_settings_option_channels" id="0x7f0a0621" />
+    <public type="id" name="server_settings_option_integrations" id="0x7f0a0622" />
+    <public type="id" name="server_settings_option_moderation" id="0x7f0a0623" />
+    <public type="id" name="server_settings_option_overview" id="0x7f0a0624" />
+    <public type="id" name="server_settings_option_security" id="0x7f0a0625" />
+    <public type="id" name="server_settings_option_vanity_url" id="0x7f0a0626" />
+    <public type="id" name="server_settings_overview_afk_channel" id="0x7f0a0627" />
+    <public type="id" name="server_settings_overview_afk_channel_wrap" id="0x7f0a0628" />
+    <public type="id" name="server_settings_overview_afk_timeout" id="0x7f0a0629" />
+    <public type="id" name="server_settings_overview_afk_timeout_01" id="0x7f0a062a" />
+    <public type="id" name="server_settings_overview_afk_timeout_05" id="0x7f0a062b" />
+    <public type="id" name="server_settings_overview_afk_timeout_15" id="0x7f0a062c" />
+    <public type="id" name="server_settings_overview_afk_timeout_30" id="0x7f0a062d" />
+    <public type="id" name="server_settings_overview_afk_timeout_60" id="0x7f0a062e" />
+    <public type="id" name="server_settings_overview_afk_timeout_wrap" id="0x7f0a062f" />
+    <public type="id" name="server_settings_overview_icon" id="0x7f0a0630" />
+    <public type="id" name="server_settings_overview_icon_label" id="0x7f0a0631" />
+    <public type="id" name="server_settings_overview_icon_name_container" id="0x7f0a0632" />
+    <public type="id" name="server_settings_overview_icon_remove" id="0x7f0a0633" />
+    <public type="id" name="server_settings_overview_icon_text" id="0x7f0a0634" />
+    <public type="id" name="server_settings_overview_name" id="0x7f0a0635" />
+    <public type="id" name="server_settings_overview_notification_all" id="0x7f0a0636" />
+    <public type="id" name="server_settings_overview_notification_only_mentions" id="0x7f0a0637" />
+    <public type="id" name="server_settings_overview_region" id="0x7f0a0638" />
+    <public type="id" name="server_settings_overview_region_flag" id="0x7f0a0639" />
+    <public type="id" name="server_settings_overview_region_item_name" id="0x7f0a063a" />
+    <public type="id" name="server_settings_overview_region_list" id="0x7f0a063b" />
+    <public type="id" name="server_settings_overview_region_wrap" id="0x7f0a063c" />
+    <public type="id" name="server_settings_overview_save" id="0x7f0a063d" />
+    <public type="id" name="server_settings_overview_scroll" id="0x7f0a063e" />
+    <public type="id" name="server_settings_overview_system_channel" id="0x7f0a063f" />
+    <public type="id" name="server_settings_overview_system_channel_boost" id="0x7f0a0640" />
+    <public type="id" name="server_settings_overview_system_channel_join" id="0x7f0a0641" />
+    <public type="id" name="server_settings_overview_system_channel_wrap" id="0x7f0a0642" />
+    <public type="id" name="server_settings_overview_upload_banner" id="0x7f0a0643" />
+    <public type="id" name="server_settings_overview_upload_banner_container" id="0x7f0a0644" />
+    <public type="id" name="server_settings_overview_upload_banner_fab" id="0x7f0a0645" />
+    <public type="id" name="server_settings_overview_upload_banner_learn_more" id="0x7f0a0646" />
+    <public type="id" name="server_settings_overview_upload_banner_nitro_tier" id="0x7f0a0647" />
+    <public type="id" name="server_settings_overview_upload_banner_remove" id="0x7f0a0648" />
+    <public type="id" name="server_settings_overview_upload_banner_unlock" id="0x7f0a0649" />
+    <public type="id" name="server_settings_overview_upload_splash" id="0x7f0a064a" />
+    <public type="id" name="server_settings_overview_upload_splash_container" id="0x7f0a064b" />
+    <public type="id" name="server_settings_overview_upload_splash_fab" id="0x7f0a064c" />
+    <public type="id" name="server_settings_overview_upload_splash_learn_more" id="0x7f0a064d" />
+    <public type="id" name="server_settings_overview_upload_splash_nitro_tier" id="0x7f0a064e" />
+    <public type="id" name="server_settings_overview_upload_splash_remove" id="0x7f0a064f" />
+    <public type="id" name="server_settings_overview_upload_splash_unlock" id="0x7f0a0650" />
+    <public type="id" name="server_settings_role_item_bottom_divider" id="0x7f0a0651" />
+    <public type="id" name="server_settings_role_item_divider_targeted" id="0x7f0a0652" />
+    <public type="id" name="server_settings_role_item_drag_overlay" id="0x7f0a0653" />
+    <public type="id" name="server_settings_role_item_lock_indicator" id="0x7f0a0654" />
+    <public type="id" name="server_settings_role_item_name" id="0x7f0a0655" />
+    <public type="id" name="server_settings_roles_option" id="0x7f0a0656" />
+    <public type="id" name="server_settings_roles_recycler" id="0x7f0a0657" />
+    <public type="id" name="server_settings_section_general_settings" id="0x7f0a0658" />
+    <public type="id" name="server_settings_section_user_management" id="0x7f0a0659" />
+    <public type="id" name="server_settings_section_user_management_divider" id="0x7f0a065a" />
+    <public type="id" name="server_settings_security_dialog_cancel" id="0x7f0a065b" />
+    <public type="id" name="server_settings_security_dialog_confirm" id="0x7f0a065c" />
+    <public type="id" name="server_settings_security_label" id="0x7f0a065d" />
+    <public type="id" name="server_settings_security_server_mfa_code" id="0x7f0a065e" />
+    <public type="id" name="server_settings_security_toggle_mfa_button" id="0x7f0a065f" />
+    <public type="id" name="server_settings_server_icon" id="0x7f0a0660" />
+    <public type="id" name="server_settings_server_icon_text" id="0x7f0a0661" />
+    <public type="id" name="server_settings_server_name" id="0x7f0a0662" />
+    <public type="id" name="server_settings_vanity_input" id="0x7f0a0663" />
+    <public type="id" name="server_settings_vanity_url_current_url" id="0x7f0a0664" />
+    <public type="id" name="server_settings_vanity_url_error_text" id="0x7f0a0665" />
+    <public type="id" name="server_settings_vanity_url_input_container" id="0x7f0a0666" />
+    <public type="id" name="server_settings_vanity_url_loading_indicator" id="0x7f0a0667" />
+    <public type="id" name="server_settings_vanity_url_prefix" id="0x7f0a0668" />
+    <public type="id" name="server_settings_vanity_url_remove" id="0x7f0a0669" />
+    <public type="id" name="server_settings_vanity_url_save" id="0x7f0a066a" />
+    <public type="id" name="setting_button" id="0x7f0a066b" />
+    <public type="id" name="setting_container" id="0x7f0a066c" />
+    <public type="id" name="setting_disabled_overlay" id="0x7f0a066d" />
+    <public type="id" name="setting_label" id="0x7f0a066e" />
+    <public type="id" name="setting_subtext" id="0x7f0a066f" />
+    <public type="id" name="settings_account" id="0x7f0a0670" />
+    <public type="id" name="settings_account_avatar" id="0x7f0a0671" />
+    <public type="id" name="settings_account_avatar_container" id="0x7f0a0672" />
+    <public type="id" name="settings_account_avatar_edit" id="0x7f0a0673" />
+    <public type="id" name="settings_account_avatar_wrap" id="0x7f0a0674" />
+    <public type="id" name="settings_account_change_password" id="0x7f0a0675" />
+    <public type="id" name="settings_account_edit" id="0x7f0a0676" />
+    <public type="id" name="settings_account_email" id="0x7f0a0677" />
+    <public type="id" name="settings_account_mfa_container" id="0x7f0a0678" />
+    <public type="id" name="settings_account_mfa_disabled_container" id="0x7f0a0679" />
+    <public type="id" name="settings_account_mfa_enable" id="0x7f0a067a" />
+    <public type="id" name="settings_account_mfa_enabled_container" id="0x7f0a067b" />
+    <public type="id" name="settings_account_mfa_enabled_header" id="0x7f0a067c" />
+    <public type="id" name="settings_account_mfa_flipper" id="0x7f0a067d" />
+    <public type="id" name="settings_account_mfa_lottie" id="0x7f0a067e" />
+    <public type="id" name="settings_account_mfa_sales_pitch" id="0x7f0a067f" />
+    <public type="id" name="settings_account_private_data_delete" id="0x7f0a0680" />
+    <public type="id" name="settings_account_private_data_disable" id="0x7f0a0681" />
+    <public type="id" name="settings_account_private_data_wrap" id="0x7f0a0682" />
+    <public type="id" name="settings_account_remove_avatar" id="0x7f0a0683" />
+    <public type="id" name="settings_account_remove_two_fa" id="0x7f0a0684" />
+    <public type="id" name="settings_account_save" id="0x7f0a0685" />
+    <public type="id" name="settings_account_scroll" id="0x7f0a0686" />
+    <public type="id" name="settings_account_sms_backup" id="0x7f0a0687" />
+    <public type="id" name="settings_account_sms_phone" id="0x7f0a0688" />
+    <public type="id" name="settings_account_tag" id="0x7f0a0689" />
+    <public type="id" name="settings_account_verification" id="0x7f0a068a" />
+    <public type="id" name="settings_account_verification_resend" id="0x7f0a068b" />
+    <public type="id" name="settings_account_view_backup_codes" id="0x7f0a068c" />
+    <public type="id" name="settings_acknowledgements" id="0x7f0a068d" />
+    <public type="id" name="settings_app_info" id="0x7f0a068e" />
+    <public type="id" name="settings_appearance" id="0x7f0a068f" />
+    <public type="id" name="settings_appearance_font_scale_platform" id="0x7f0a0690" />
+    <public type="id" name="settings_appearance_font_scaling_container" id="0x7f0a0691" />
+    <public type="id" name="settings_appearance_font_scaling_reset" id="0x7f0a0692" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar" id="0x7f0a0693" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_left" id="0x7f0a0694" />
+    <public type="id" name="settings_appearance_font_scaling_seekbar_text_right" id="0x7f0a0695" />
+    <public type="id" name="settings_appearance_sync_switch" id="0x7f0a0696" />
+    <public type="id" name="settings_appearance_theme_dark_radio" id="0x7f0a0697" />
+    <public type="id" name="settings_appearance_theme_light_radio" id="0x7f0a0698" />
+    <public type="id" name="settings_appearance_theme_pure_evil_radio" id="0x7f0a0699" />
+    <public type="id" name="settings_authorized_apps" id="0x7f0a069a" />
+    <public type="id" name="settings_backup_codes_generate" id="0x7f0a069b" />
+    <public type="id" name="settings_backup_codes_info" id="0x7f0a069c" />
+    <public type="id" name="settings_backup_codes_rv" id="0x7f0a069d" />
+    <public type="id" name="settings_behavior" id="0x7f0a069e" />
+    <public type="id" name="settings_behavior_back_button_toggle" id="0x7f0a069f" />
+    <public type="id" name="settings_behavior_browser_switch" id="0x7f0a06a0" />
+    <public type="id" name="settings_behavior_dev_mode_switch" id="0x7f0a06a1" />
+    <public type="id" name="settings_behavior_shift_send_toggle" id="0x7f0a06a2" />
+    <public type="id" name="settings_billing" id="0x7f0a06a3" />
+    <public type="id" name="settings_billing_view_pager" id="0x7f0a06a4" />
+    <public type="id" name="settings_bitrate_help" id="0x7f0a06a5" />
+    <public type="id" name="settings_boost_flipper" id="0x7f0a06a6" />
+    <public type="id" name="settings_boost_no_sub_banner" id="0x7f0a06a7" />
+    <public type="id" name="settings_boost_no_sub_learn_more" id="0x7f0a06a8" />
+    <public type="id" name="settings_boost_no_sub_learn_more_text" id="0x7f0a06a9" />
+    <public type="id" name="settings_boost_no_sub_logo" id="0x7f0a06aa" />
+    <public type="id" name="settings_boost_recycler" id="0x7f0a06ab" />
+    <public type="id" name="settings_boost_retry" id="0x7f0a06ac" />
+    <public type="id" name="settings_boost_subtext" id="0x7f0a06ad" />
+    <public type="id" name="settings_changelog" id="0x7f0a06ae" />
+    <public type="id" name="settings_channel_list_category_item_drag" id="0x7f0a06af" />
+    <public type="id" name="settings_channel_list_category_item_text" id="0x7f0a06b0" />
+    <public type="id" name="settings_channel_list_item_drag" id="0x7f0a06b1" />
+    <public type="id" name="settings_channel_list_item_hash" id="0x7f0a06b2" />
+    <public type="id" name="settings_channel_list_item_name" id="0x7f0a06b3" />
+    <public type="id" name="settings_channel_list_item_selected_overlay" id="0x7f0a06b4" />
+    <public type="id" name="settings_connections" id="0x7f0a06b5" />
+    <public type="id" name="settings_developer_options" id="0x7f0a06b6" />
+    <public type="id" name="settings_developer_options_divider" id="0x7f0a06b7" />
+    <public type="id" name="settings_developer_options_header" id="0x7f0a06b8" />
+    <public type="id" name="settings_game_activity" id="0x7f0a06b9" />
+    <public type="id" name="settings_games_detection_section" id="0x7f0a06ba" />
+    <public type="id" name="settings_games_playing_container" id="0x7f0a06bb" />
+    <public type="id" name="settings_games_playing_icon" id="0x7f0a06bc" />
+    <public type="id" name="settings_games_playing_subtitle" id="0x7f0a06bd" />
+    <public type="id" name="settings_games_playing_title" id="0x7f0a06be" />
+    <public type="id" name="settings_games_status_cs" id="0x7f0a06bf" />
+    <public type="id" name="settings_games_track_cs" id="0x7f0a06c0" />
+    <public type="id" name="settings_gifting_flipper" id="0x7f0a06c1" />
+    <public type="id" name="settings_gifting_gift_code_input" id="0x7f0a06c2" />
+    <public type="id" name="settings_gifting_gift_code_input_progress" id="0x7f0a06c3" />
+    <public type="id" name="settings_gifting_gift_code_input_wrap" id="0x7f0a06c4" />
+    <public type="id" name="settings_gifting_nitro_classic_learn_more" id="0x7f0a06c5" />
+    <public type="id" name="settings_gifting_nitro_classic_monthly" id="0x7f0a06c6" />
+    <public type="id" name="settings_gifting_nitro_classic_yearly" id="0x7f0a06c7" />
+    <public type="id" name="settings_gifting_nitro_learn_more" id="0x7f0a06c8" />
+    <public type="id" name="settings_gifting_nitro_monthly" id="0x7f0a06c9" />
+    <public type="id" name="settings_gifting_nitro_yearly" id="0x7f0a06ca" />
+    <public type="id" name="settings_gifting_retry" id="0x7f0a06cb" />
+    <public type="id" name="settings_giftting_inventory_recycler" id="0x7f0a06cc" />
+    <public type="id" name="settings_group_icon" id="0x7f0a06cd" />
+    <public type="id" name="settings_group_icon_label" id="0x7f0a06ce" />
+    <public type="id" name="settings_group_icon_remove" id="0x7f0a06cf" />
+    <public type="id" name="settings_inapp_notifs_switch" id="0x7f0a06d0" />
+    <public type="id" name="settings_language" id="0x7f0a06d1" />
+    <public type="id" name="settings_language_current" id="0x7f0a06d2" />
+    <public type="id" name="settings_language_current_flag" id="0x7f0a06d3" />
+    <public type="id" name="settings_language_current_text" id="0x7f0a06d4" />
+    <public type="id" name="settings_language_select_item_name" id="0x7f0a06d5" />
+    <public type="id" name="settings_language_select_item_name_localized" id="0x7f0a06d6" />
+    <public type="id" name="settings_language_select_list" id="0x7f0a06d7" />
+    <public type="id" name="settings_language_sync_check" id="0x7f0a06d8" />
+    <public type="id" name="settings_nitro" id="0x7f0a06d9" />
+    <public type="id" name="settings_nitro_boosting" id="0x7f0a06da" />
+    <public type="id" name="settings_nitro_gifting" id="0x7f0a06db" />
+    <public type="id" name="settings_nitro_settings" id="0x7f0a06dc" />
+    <public type="id" name="settings_notification_os" id="0x7f0a06dd" />
+    <public type="id" name="settings_notification_os_label" id="0x7f0a06de" />
+    <public type="id" name="settings_notification_switch" id="0x7f0a06df" />
+    <public type="id" name="settings_notifications" id="0x7f0a06e0" />
+    <public type="id" name="settings_notifications_blink" id="0x7f0a06e1" />
+    <public type="id" name="settings_notifications_enabled" id="0x7f0a06e2" />
+    <public type="id" name="settings_notifications_mute_all" id="0x7f0a06e3" />
+    <public type="id" name="settings_notifications_vibrations" id="0x7f0a06e4" />
+    <public type="id" name="settings_notifications_wake_lock" id="0x7f0a06e5" />
+    <public type="id" name="settings_notifications_wrap" id="0x7f0a06e6" />
+    <public type="id" name="settings_privacy" id="0x7f0a06e7" />
+    <public type="id" name="settings_privacy_basic_service" id="0x7f0a06e8" />
+    <public type="id" name="settings_privacy_controls" id="0x7f0a06e9" />
+    <public type="id" name="settings_privacy_default_restricted_guilds" id="0x7f0a06ea" />
+    <public type="id" name="settings_privacy_defaults_existing_no" id="0x7f0a06eb" />
+    <public type="id" name="settings_privacy_defaults_existing_yes" id="0x7f0a06ec" />
+    <public type="id" name="settings_privacy_explicit_0" id="0x7f0a06ed" />
+    <public type="id" name="settings_privacy_explicit_1" id="0x7f0a06ee" />
+    <public type="id" name="settings_privacy_explicit_2" id="0x7f0a06ef" />
+    <public type="id" name="settings_privacy_friend_source_0" id="0x7f0a06f0" />
+    <public type="id" name="settings_privacy_friend_source_1" id="0x7f0a06f1" />
+    <public type="id" name="settings_privacy_friend_source_2" id="0x7f0a06f2" />
+    <public type="id" name="settings_privacy_personalization" id="0x7f0a06f3" />
+    <public type="id" name="settings_privacy_request_data" id="0x7f0a06f4" />
+    <public type="id" name="settings_privacy_request_data_link" id="0x7f0a06f5" />
+    <public type="id" name="settings_privacy_statistics" id="0x7f0a06f6" />
+    <public type="id" name="settings_support" id="0x7f0a06f7" />
+    <public type="id" name="settings_text_images" id="0x7f0a06f8" />
+    <public type="id" name="settings_text_images_allow_animate_emoji_switch" id="0x7f0a06f9" />
+    <public type="id" name="settings_text_images_attachments_toggle" id="0x7f0a06fa" />
+    <public type="id" name="settings_text_images_embeds_toggle" id="0x7f0a06fb" />
+    <public type="id" name="settings_text_images_links_toggle" id="0x7f0a06fc" />
+    <public type="id" name="settings_text_images_sync_toggle" id="0x7f0a06fd" />
+    <public type="id" name="settings_user_limit_help" id="0x7f0a06fe" />
+    <public type="id" name="settings_voice" id="0x7f0a06ff" />
+    <public type="id" name="settings_voice_audio_mode_call" id="0x7f0a0700" />
+    <public type="id" name="settings_voice_audio_mode_communication" id="0x7f0a0701" />
+    <public type="id" name="settings_voice_auto_vad_toggle" id="0x7f0a0702" />
+    <public type="id" name="settings_voice_echo_cancellation_toggle" id="0x7f0a0703" />
+    <public type="id" name="settings_voice_enable_hardware_scaling_toggle" id="0x7f0a0704" />
+    <public type="id" name="settings_voice_gain_control_toggle" id="0x7f0a0705" />
+    <public type="id" name="settings_voice_input_mode_radio_1" id="0x7f0a0706" />
+    <public type="id" name="settings_voice_input_mode_radio_2" id="0x7f0a0707" />
+    <public type="id" name="settings_voice_noise_suppression_toggle" id="0x7f0a0708" />
+    <public type="id" name="settings_voice_opensles_default" id="0x7f0a0709" />
+    <public type="id" name="settings_voice_opensles_force_disabled" id="0x7f0a070a" />
+    <public type="id" name="settings_voice_opensles_force_enabled" id="0x7f0a070b" />
+    <public type="id" name="settings_voice_output_volume" id="0x7f0a070c" />
+    <public type="id" name="settings_voice_output_volume_wrap" id="0x7f0a070d" />
+    <public type="id" name="settings_voice_overlay_toggle" id="0x7f0a070e" />
+    <public type="id" name="settings_voice_overlay_wrap" id="0x7f0a070f" />
+    <public type="id" name="settings_voice_sensitivity_automatic" id="0x7f0a0710" />
+    <public type="id" name="settings_voice_sensitivity_header" id="0x7f0a0711" />
+    <public type="id" name="settings_voice_sensitivity_label" id="0x7f0a0712" />
+    <public type="id" name="settings_voice_sensitivity_manual" id="0x7f0a0713" />
+    <public type="id" name="settings_voice_sensitivity_test_button" id="0x7f0a0714" />
+    <public type="id" name="settings_voice_sensitivity_testing_container" id="0x7f0a0715" />
+    <public type="id" name="settings_voice_sensitivity_wrap" id="0x7f0a0716" />
+    <public type="id" name="settings_voice_use_speaker_toggle" id="0x7f0a0717" />
+    <public type="id" name="settings_voice_video_container" id="0x7f0a0718" />
+    <public type="id" name="shortcut" id="0x7f0a0719" />
+    <public type="id" name="showCustom" id="0x7f0a071a" />
+    <public type="id" name="showHome" id="0x7f0a071b" />
+    <public type="id" name="showTitle" id="0x7f0a071c" />
+    <public type="id" name="smallLabel" id="0x7f0a071d" />
+    <public type="id" name="snackbar_action" id="0x7f0a071e" />
+    <public type="id" name="snackbar_text" id="0x7f0a071f" />
+    <public type="id" name="snap" id="0x7f0a0720" />
+    <public type="id" name="snapMargins" id="0x7f0a0721" />
+    <public type="id" name="software" id="0x7f0a0722" />
+    <public type="id" name="space_around" id="0x7f0a0723" />
+    <public type="id" name="space_between" id="0x7f0a0724" />
+    <public type="id" name="spacer" id="0x7f0a0725" />
+    <public type="id" name="spectate_controls" id="0x7f0a0726" />
+    <public type="id" name="spectate_controls_disconnect_stream" id="0x7f0a0727" />
+    <public type="id" name="spectate_controls_disconnect_voice" id="0x7f0a0728" />
+    <public type="id" name="spectate_controls_mute" id="0x7f0a0729" />
+    <public type="id" name="spectate_push_to_talk" id="0x7f0a072a" />
+    <public type="id" name="spectators_list" id="0x7f0a072b" />
+    <public type="id" name="split_action_bar" id="0x7f0a072c" />
+    <public type="id" name="spread" id="0x7f0a072d" />
+    <public type="id" name="spread_inside" id="0x7f0a072e" />
+    <public type="id" name="src_atop" id="0x7f0a072f" />
+    <public type="id" name="src_in" id="0x7f0a0730" />
+    <public type="id" name="src_over" id="0x7f0a0731" />
+    <public type="id" name="src_toggle" id="0x7f0a0732" />
+    <public type="id" name="standard" id="0x7f0a0733" />
+    <public type="id" name="start" id="0x7f0a0734" />
+    <public type="id" name="state_aspect_ratio" id="0x7f0a0735" />
+    <public type="id" name="state_rotate" id="0x7f0a0736" />
+    <public type="id" name="state_scale" id="0x7f0a0737" />
+    <public type="id" name="status_connectivity" id="0x7f0a0738" />
+    <public type="id" name="status_connectivity_icon" id="0x7f0a0739" />
+    <public type="id" name="status_connectivity_limited" id="0x7f0a073a" />
+    <public type="id" name="status_connectivity_spinner" id="0x7f0a073b" />
+    <public type="id" name="status_connectivity_text" id="0x7f0a073c" />
+    <public type="id" name="status_unread_messages" id="0x7f0a073d" />
+    <public type="id" name="status_unread_messages_mark" id="0x7f0a073e" />
+    <public type="id" name="status_unread_messages_text" id="0x7f0a073f" />
+    <public type="id" name="status_wrap" id="0x7f0a0740" />
+    <public type="id" name="steps_button_container" id="0x7f0a0741" />
+    <public type="id" name="steps_cancel" id="0x7f0a0742" />
+    <public type="id" name="steps_close" id="0x7f0a0743" />
+    <public type="id" name="steps_done" id="0x7f0a0744" />
+    <public type="id" name="steps_next" id="0x7f0a0745" />
+    <public type="id" name="steps_viewpager" id="0x7f0a0746" />
+    <public type="id" name="storage" id="0x7f0a0747" />
+    <public type="id" name="stream_feedback_cancel" id="0x7f0a0748" />
+    <public type="id" name="stream_feedback_happy" id="0x7f0a0749" />
+    <public type="id" name="stream_feedback_neutral" id="0x7f0a074a" />
+    <public type="id" name="stream_feedback_reason_header" id="0x7f0a074b" />
+    <public type="id" name="stream_feedback_reason_spinner" id="0x7f0a074c" />
+    <public type="id" name="stream_feedback_sad" id="0x7f0a074d" />
+    <public type="id" name="stream_feedback_spinner_text" id="0x7f0a074e" />
+    <public type="id" name="stream_feedback_submit" id="0x7f0a074f" />
+    <public type="id" name="stream_full_confirm" id="0x7f0a0750" />
+    <public type="id" name="stream_preview_image" id="0x7f0a0751" />
+    <public type="id" name="stream_preview_placeholder" id="0x7f0a0752" />
+    <public type="id" name="stream_preview_placeholder_caption" id="0x7f0a0753" />
+    <public type="id" name="stretch" id="0x7f0a0754" />
+    <public type="id" name="submenuarrow" id="0x7f0a0755" />
+    <public type="id" name="submit_area" id="0x7f0a0756" />
+    <public type="id" name="suggestion_example_answer" id="0x7f0a0757" />
+    <public type="id" name="suggestion_example_container" id="0x7f0a0758" />
+    <public type="id" name="suggestion_example_filter" id="0x7f0a0759" />
+    <public type="id" name="suggestion_example_icon" id="0x7f0a075a" />
+    <public type="id" name="suggestion_item_header" id="0x7f0a075b" />
+    <public type="id" name="suggestion_item_header_history_clear_icon" id="0x7f0a075c" />
+    <public type="id" name="suggestion_item_header_history_divider" id="0x7f0a075d" />
+    <public type="id" name="suggestion_item_header_history_text" id="0x7f0a075e" />
+    <public type="id" name="swipeRefreshLayout" id="0x7f0a075f" />
+    <public type="id" name="switchview" id="0x7f0a0760" />
+    <public type="id" name="tabMode" id="0x7f0a0761" />
+    <public type="id" name="tag_accessibility_actions" id="0x7f0a0762" />
+    <public type="id" name="tag_accessibility_clickable_spans" id="0x7f0a0763" />
+    <public type="id" name="tag_accessibility_heading" id="0x7f0a0764" />
+    <public type="id" name="tag_accessibility_pane_title" id="0x7f0a0765" />
+    <public type="id" name="tag_screen_reader_focusable" id="0x7f0a0766" />
+    <public type="id" name="tag_transition_group" id="0x7f0a0767" />
+    <public type="id" name="tag_unhandled_key_event_manager" id="0x7f0a0768" />
+    <public type="id" name="tag_unhandled_key_listeners" id="0x7f0a0769" />
+    <public type="id" name="take_photo_btn" id="0x7f0a076a" />
+    <public type="id" name="ternary_check_neutral" id="0x7f0a076b" />
+    <public type="id" name="ternary_check_off" id="0x7f0a076c" />
+    <public type="id" name="ternary_check_on" id="0x7f0a076d" />
+    <public type="id" name="test" id="0x7f0a076e" />
+    <public type="id" name="text" id="0x7f0a076f" />
+    <public type="id" name="text2" id="0x7f0a0770" />
+    <public type="id" name="textSpacerNoButtons" id="0x7f0a0771" />
+    <public type="id" name="textSpacerNoTitle" id="0x7f0a0772" />
+    <public type="id" name="textStart" id="0x7f0a0773" />
+    <public type="id" name="text_input" id="0x7f0a0774" />
+    <public type="id" name="text_input_password_toggle" id="0x7f0a0775" />
+    <public type="id" name="text_view_rotate" id="0x7f0a0776" />
+    <public type="id" name="text_view_scale" id="0x7f0a0777" />
+    <public type="id" name="textinput_counter" id="0x7f0a0778" />
+    <public type="id" name="textinput_error" id="0x7f0a0779" />
+    <public type="id" name="textinput_helper_text" id="0x7f0a077a" />
+    <public type="id" name="thumb_iv" id="0x7f0a077b" />
+    <public type="id" name="tile" id="0x7f0a077c" />
+    <public type="id" name="time" id="0x7f0a077d" />
+    <public type="id" name="title" id="0x7f0a077e" />
+    <public type="id" name="titleDividerNoCustom" id="0x7f0a077f" />
+    <public type="id" name="title_template" id="0x7f0a0780" />
+    <public type="id" name="toolbar" id="0x7f0a0781" />
+    <public type="id" name="toolbar_presence" id="0x7f0a0782" />
+    <public type="id" name="toolbar_title" id="0x7f0a0783" />
+    <public type="id" name="toolbar_title_subtext" id="0x7f0a0784" />
+    <public type="id" name="top" id="0x7f0a0785" />
+    <public type="id" name="topPanel" id="0x7f0a0786" />
+    <public type="id" name="torch" id="0x7f0a0787" />
+    <public type="id" name="touch_outside" id="0x7f0a0788" />
+    <public type="id" name="transition_current_scene" id="0x7f0a0789" />
+    <public type="id" name="transition_layout_save" id="0x7f0a078a" />
+    <public type="id" name="transition_position" id="0x7f0a078b" />
+    <public type="id" name="transition_scene_layoutid_cache" id="0x7f0a078c" />
+    <public type="id" name="transition_transform" id="0x7f0a078d" />
+    <public type="id" name="trash_wrap_icon" id="0x7f0a078e" />
+    <public type="id" name="trash_wrap_target_container" id="0x7f0a078f" />
+    <public type="id" name="trash_wrap_target_zone" id="0x7f0a0790" />
+    <public type="id" name="type_iv" id="0x7f0a0791" />
+    <public type="id" name="ucrop" id="0x7f0a0792" />
+    <public type="id" name="ucrop_frame" id="0x7f0a0793" />
+    <public type="id" name="ucrop_photobox" id="0x7f0a0794" />
+    <public type="id" name="uikit_chat_guideline" id="0x7f0a0795" />
+    <public type="id" name="uikit_sheet_header_guideline" id="0x7f0a0796" />
+    <public type="id" name="unhandled_uri_display" id="0x7f0a0797" />
+    <public type="id" name="unhandled_uri_okay" id="0x7f0a0798" />
+    <public type="id" name="uniform" id="0x7f0a0799" />
+    <public type="id" name="unlabeled" id="0x7f0a079a" />
+    <public type="id" name="unread_wrap" id="0x7f0a079b" />
+    <public type="id" name="up" id="0x7f0a079c" />
+    <public type="id" name="upgrade_premium_body" id="0x7f0a079d" />
+    <public type="id" name="upgrade_premium_cancel" id="0x7f0a079e" />
+    <public type="id" name="upgrade_premium_confirm" id="0x7f0a079f" />
+    <public type="id" name="upgrade_premium_error" id="0x7f0a07a0" />
+    <public type="id" name="upgrade_premium_header" id="0x7f0a07a1" />
+    <public type="id" name="upload_progress_1" id="0x7f0a07a2" />
+    <public type="id" name="upload_progress_2" id="0x7f0a07a3" />
+    <public type="id" name="upload_progress_3" id="0x7f0a07a4" />
+    <public type="id" name="useLogo" id="0x7f0a07a5" />
+    <public type="id" name="user_actions_dialog_avatar" id="0x7f0a07a6" />
+    <public type="id" name="user_actions_dialog_block_item" id="0x7f0a07a7" />
+    <public type="id" name="user_actions_dialog_remove_friend_item" id="0x7f0a07a8" />
+    <public type="id" name="user_actions_dialog_unblock_item" id="0x7f0a07a9" />
+    <public type="id" name="user_actions_dialog_user_name" id="0x7f0a07aa" />
+    <public type="id" name="user_avatar_presence_avatar" id="0x7f0a07ab" />
+    <public type="id" name="user_avatar_presence_container" id="0x7f0a07ac" />
+    <public type="id" name="user_avatar_presence_indicator" id="0x7f0a07ad" />
+    <public type="id" name="user_avatar_presence_padding_image" id="0x7f0a07ae" />
+    <public type="id" name="user_captcha_help" id="0x7f0a07af" />
+    <public type="id" name="user_captcha_verify_button" id="0x7f0a07b0" />
+    <public type="id" name="user_captcha_verify_button_anchor" id="0x7f0a07b1" />
+    <public type="id" name="user_captcha_verify_button_cancel" id="0x7f0a07b2" />
+    <public type="id" name="user_info_activity_divider" id="0x7f0a07b3" />
+    <public type="id" name="user_info_identities_divider" id="0x7f0a07b4" />
+    <public type="id" name="user_info_identities_header" id="0x7f0a07b5" />
+    <public type="id" name="user_info_notes" id="0x7f0a07b6" />
+    <public type="id" name="user_info_rich_presence_container" id="0x7f0a07b7" />
+    <public type="id" name="user_limit_seekbar" id="0x7f0a07b8" />
+    <public type="id" name="user_list_item_avatar" id="0x7f0a07b9" />
+    <public type="id" name="user_list_item_name" id="0x7f0a07ba" />
+    <public type="id" name="user_list_item_name_secondary" id="0x7f0a07bb" />
+    <public type="id" name="user_list_item_presence" id="0x7f0a07bc" />
+    <public type="id" name="user_list_item_presence_wrapper" id="0x7f0a07bd" />
+    <public type="id" name="user_mentions_filter_include_everyone" id="0x7f0a07be" />
+    <public type="id" name="user_mentions_filter_include_roles" id="0x7f0a07bf" />
+    <public type="id" name="user_mentions_filter_this_server" id="0x7f0a07c0" />
+    <public type="id" name="user_mentions_list" id="0x7f0a07c1" />
+    <public type="id" name="user_mutual_friends_recycler_view" id="0x7f0a07c2" />
+    <public type="id" name="user_mutual_friends_toolbar_layout" id="0x7f0a07c3" />
+    <public type="id" name="user_mutual_guilds_recycler_view" id="0x7f0a07c4" />
+    <public type="id" name="user_mutual_guilds_toolbar_layout" id="0x7f0a07c5" />
+    <public type="id" name="user_phone_add_anchor" id="0x7f0a07c6" />
+    <public type="id" name="user_phone_add_country_code" id="0x7f0a07c7" />
+    <public type="id" name="user_phone_add_next" id="0x7f0a07c8" />
+    <public type="id" name="user_phone_add_number" id="0x7f0a07c9" />
+    <public type="id" name="user_phone_add_wrap" id="0x7f0a07ca" />
+    <public type="id" name="user_phone_digit_verification" id="0x7f0a07cb" />
+    <public type="id" name="user_phone_verify_wrap" id="0x7f0a07cc" />
+    <public type="id" name="user_profile_adapter_item_empty" id="0x7f0a07cd" />
+    <public type="id" name="user_profile_adapter_item_empty_text" id="0x7f0a07ce" />
+    <public type="id" name="user_profile_adapter_item_friend_avatar" id="0x7f0a07cf" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual" id="0x7f0a07d0" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_image" id="0x7f0a07d1" />
+    <public type="id" name="user_profile_adapter_item_friend_mutual_text" id="0x7f0a07d2" />
+    <public type="id" name="user_profile_adapter_item_friend_presence" id="0x7f0a07d3" />
+    <public type="id" name="user_profile_adapter_item_friend_user_game" id="0x7f0a07d4" />
+    <public type="id" name="user_profile_adapter_item_friend_user_name" id="0x7f0a07d5" />
+    <public type="id" name="user_profile_adapter_item_server_image" id="0x7f0a07d6" />
+    <public type="id" name="user_profile_adapter_item_server_name" id="0x7f0a07d7" />
+    <public type="id" name="user_profile_adapter_item_server_nick" id="0x7f0a07d8" />
+    <public type="id" name="user_profile_adapter_item_server_text" id="0x7f0a07d9" />
+    <public type="id" name="user_profile_adapter_item_server_wrap" id="0x7f0a07da" />
+    <public type="id" name="user_profile_admin_ban" id="0x7f0a07db" />
+    <public type="id" name="user_profile_admin_edit_member" id="0x7f0a07dc" />
+    <public type="id" name="user_profile_admin_kick" id="0x7f0a07dd" />
+    <public type="id" name="user_profile_admin_server_deafen" id="0x7f0a07de" />
+    <public type="id" name="user_profile_admin_server_move" id="0x7f0a07df" />
+    <public type="id" name="user_profile_admin_server_mute" id="0x7f0a07e0" />
+    <public type="id" name="user_profile_avatar_presence" id="0x7f0a07e1" />
+    <public type="id" name="user_profile_connections_mutual_friends_item" id="0x7f0a07e2" />
+    <public type="id" name="user_profile_connections_mutual_guilds_item" id="0x7f0a07e3" />
+    <public type="id" name="user_profile_connections_view_recycler" id="0x7f0a07e4" />
+    <public type="id" name="user_profile_friend_request" id="0x7f0a07e5" />
+    <public type="id" name="user_profile_friend_request_accept_btn" id="0x7f0a07e6" />
+    <public type="id" name="user_profile_friend_request_ignore_btn" id="0x7f0a07e7" />
+    <public type="id" name="user_profile_friend_request_incoming_container" id="0x7f0a07e8" />
+    <public type="id" name="user_profile_friend_request_sent_btn" id="0x7f0a07e9" />
+    <public type="id" name="user_profile_header_badges_recycler" id="0x7f0a07ea" />
+    <public type="id" name="user_profile_header_custom_status" id="0x7f0a07eb" />
+    <public type="id" name="user_profile_header_name_wrap" id="0x7f0a07ec" />
+    <public type="id" name="user_profile_header_primary_name" id="0x7f0a07ed" />
+    <public type="id" name="user_profile_header_secondary_name" id="0x7f0a07ee" />
+    <public type="id" name="user_profile_header_view" id="0x7f0a07ef" />
+    <public type="id" name="user_profile_send_message_fab" id="0x7f0a07f0" />
+    <public type="id" name="user_profile_view_pager" id="0x7f0a07f1" />
+    <public type="id" name="user_selected_checkbox" id="0x7f0a07f2" />
+    <public type="id" name="user_settings_mfa_enable_input_digits" id="0x7f0a07f3" />
+    <public type="id" name="user_settings_profile_header_view" id="0x7f0a07f4" />
+    <public type="id" name="user_sheet_actions_divider" id="0x7f0a07f5" />
+    <public type="id" name="user_sheet_actions_header" id="0x7f0a07f6" />
+    <public type="id" name="user_sheet_activity_divider" id="0x7f0a07f7" />
+    <public type="id" name="user_sheet_add_friend_action_button" id="0x7f0a07f8" />
+    <public type="id" name="user_sheet_admin_view" id="0x7f0a07f9" />
+    <public type="id" name="user_sheet_audio_settings_divider" id="0x7f0a07fa" />
+    <public type="id" name="user_sheet_badge_image" id="0x7f0a07fb" />
+    <public type="id" name="user_sheet_call_action_button" id="0x7f0a07fc" />
+    <public type="id" name="user_sheet_connections_divider" id="0x7f0a07fd" />
+    <public type="id" name="user_sheet_connections_header" id="0x7f0a07fe" />
+    <public type="id" name="user_sheet_connections_view" id="0x7f0a07ff" />
+    <public type="id" name="user_sheet_copy_id" id="0x7f0a0800" />
+    <public type="id" name="user_sheet_developer_divider" id="0x7f0a0801" />
+    <public type="id" name="user_sheet_developer_header" id="0x7f0a0802" />
+    <public type="id" name="user_sheet_friend_request_accept_button" id="0x7f0a0803" />
+    <public type="id" name="user_sheet_friend_request_ignore_button" id="0x7f0a0804" />
+    <public type="id" name="user_sheet_friend_request_incoming_container" id="0x7f0a0805" />
+    <public type="id" name="user_sheet_guild_container" id="0x7f0a0806" />
+    <public type="id" name="user_sheet_guild_divider" id="0x7f0a0807" />
+    <public type="id" name="user_sheet_guild_header" id="0x7f0a0808" />
+    <public type="id" name="user_sheet_header" id="0x7f0a0809" />
+    <public type="id" name="user_sheet_incoming_friend_request_divider" id="0x7f0a080a" />
+    <public type="id" name="user_sheet_incoming_friend_request_header" id="0x7f0a080b" />
+    <public type="id" name="user_sheet_message_action_button" id="0x7f0a080c" />
+    <public type="id" name="user_sheet_more_button" id="0x7f0a080d" />
+    <public type="id" name="user_sheet_muted" id="0x7f0a080e" />
+    <public type="id" name="user_sheet_note_divider" id="0x7f0a080f" />
+    <public type="id" name="user_sheet_note_header" id="0x7f0a0810" />
+    <public type="id" name="user_sheet_note_text_field" id="0x7f0a0811" />
+    <public type="id" name="user_sheet_pending_friend_request_action_button" id="0x7f0a0812" />
+    <public type="id" name="user_sheet_profile" id="0x7f0a0813" />
+    <public type="id" name="user_sheet_profile_actions_container" id="0x7f0a0814" />
+    <public type="id" name="user_sheet_profile_actions_divider" id="0x7f0a0815" />
+    <public type="id" name="user_sheet_profile_header_view" id="0x7f0a0816" />
+    <public type="id" name="user_sheet_profile_voice_settings_view" id="0x7f0a0817" />
+    <public type="id" name="user_sheet_roles_recycler" id="0x7f0a0818" />
+    <public type="id" name="user_sheet_video_action_button" id="0x7f0a0819" />
+    <public type="id" name="user_sheet_volume" id="0x7f0a081a" />
+    <public type="id" name="user_status_presence_dot" id="0x7f0a081b" />
+    <public type="id" name="user_status_presence_subtitle" id="0x7f0a081c" />
+    <public type="id" name="user_status_presence_title" id="0x7f0a081d" />
+    <public type="id" name="user_status_update_dnd" id="0x7f0a081e" />
+    <public type="id" name="user_status_update_idle" id="0x7f0a081f" />
+    <public type="id" name="user_status_update_invisible" id="0x7f0a0820" />
+    <public type="id" name="user_status_update_online" id="0x7f0a0821" />
+    <public type="id" name="username_placeholder_end_guideline" id="0x7f0a0822" />
+    <public type="id" name="verify_digit_1" id="0x7f0a0823" />
+    <public type="id" name="verify_digit_2" id="0x7f0a0824" />
+    <public type="id" name="verify_digit_3" id="0x7f0a0825" />
+    <public type="id" name="verify_digit_4" id="0x7f0a0826" />
+    <public type="id" name="verify_digit_5" id="0x7f0a0827" />
+    <public type="id" name="verify_digit_6" id="0x7f0a0828" />
+    <public type="id" name="view_dialog_confirmation_cancel" id="0x7f0a0829" />
+    <public type="id" name="view_dialog_confirmation_confirm" id="0x7f0a082a" />
+    <public type="id" name="view_dialog_confirmation_header" id="0x7f0a082b" />
+    <public type="id" name="view_dialog_confirmation_text" id="0x7f0a082c" />
+    <public type="id" name="view_input" id="0x7f0a082d" />
+    <public type="id" name="view_offset_helper" id="0x7f0a082e" />
+    <public type="id" name="view_overlay" id="0x7f0a082f" />
+    <public type="id" name="view_pager" id="0x7f0a0830" />
+    <public type="id" name="visible" id="0x7f0a0831" />
+    <public type="id" name="voice" id="0x7f0a0832" />
+    <public type="id" name="voice_actions_connect" id="0x7f0a0833" />
+    <public type="id" name="voice_actions_copy_id" id="0x7f0a0834" />
+    <public type="id" name="voice_actions_disconnect" id="0x7f0a0835" />
+    <public type="id" name="voice_actions_header" id="0x7f0a0836" />
+    <public type="id" name="voice_actions_icon" id="0x7f0a0837" />
+    <public type="id" name="voice_actions_settings" id="0x7f0a0838" />
+    <public type="id" name="voice_actions_settings_divider" id="0x7f0a0839" />
+    <public type="id" name="voice_actions_user_count" id="0x7f0a083a" />
+    <public type="id" name="voice_actions_users_recyclerview" id="0x7f0a083b" />
+    <public type="id" name="voice_connected_container" id="0x7f0a083c" />
+    <public type="id" name="voice_connected_description" id="0x7f0a083d" />
+    <public type="id" name="voice_connected_ptt" id="0x7f0a083e" />
+    <public type="id" name="voice_connected_quality" id="0x7f0a083f" />
+    <public type="id" name="voice_connected_status_container" id="0x7f0a0840" />
+    <public type="id" name="voice_connected_text" id="0x7f0a0841" />
+    <public type="id" name="voice_divider" id="0x7f0a0842" />
+    <public type="id" name="voice_expand" id="0x7f0a0843" />
+    <public type="id" name="voice_fullscreen_controls_connect" id="0x7f0a0844" />
+    <public type="id" name="voice_fullscreen_controls_controls_wrap" id="0x7f0a0845" />
+    <public type="id" name="voice_fullscreen_controls_deafen_state" id="0x7f0a0846" />
+    <public type="id" name="voice_fullscreen_controls_disconnect" id="0x7f0a0847" />
+    <public type="id" name="voice_fullscreen_controls_mute_state" id="0x7f0a0848" />
+    <public type="id" name="voice_fullscreen_controls_num_users_connected" id="0x7f0a0849" />
+    <public type="id" name="voice_fullscreen_controls_ptt" id="0x7f0a084a" />
+    <public type="id" name="voice_fullscreen_controls_speaker" id="0x7f0a084b" />
+    <public type="id" name="voice_info_connecting" id="0x7f0a084c" />
+    <public type="id" name="voice_info_overlay" id="0x7f0a084d" />
+    <public type="id" name="voice_info_talking_users" id="0x7f0a084e" />
+    <public type="id" name="voice_info_wrap" id="0x7f0a084f" />
+    <public type="id" name="voice_list_item_user" id="0x7f0a0850" />
+    <public type="id" name="voice_ongoing_container" id="0x7f0a0851" />
+    <public type="id" name="voice_ongoing_user_count_label" id="0x7f0a0852" />
+    <public type="id" name="voice_user_avatar" id="0x7f0a0853" />
+    <public type="id" name="voice_user_list_item_deafen_indicator" id="0x7f0a0854" />
+    <public type="id" name="voice_user_list_item_header_label" id="0x7f0a0855" />
+    <public type="id" name="voice_user_list_item_live_indicator" id="0x7f0a0856" />
+    <public type="id" name="voice_user_list_item_mute_indicator" id="0x7f0a0857" />
+    <public type="id" name="voice_user_list_item_user_avatar" id="0x7f0a0858" />
+    <public type="id" name="voice_user_list_item_user_name" id="0x7f0a0859" />
+    <public type="id" name="voice_user_name_display" id="0x7f0a085a" />
+    <public type="id" name="web_view" id="0x7f0a085b" />
+    <public type="id" name="welcome_card_invite_friends" id="0x7f0a085c" />
+    <public type="id" name="welcome_card_upload_icon" id="0x7f0a085d" />
+    <public type="id" name="wide" id="0x7f0a085e" />
+    <public type="id" name="widget_add_friend_user_list_item" id="0x7f0a085f" />
+    <public type="id" name="widget_auth_mfa_backup_codes_cancel" id="0x7f0a0860" />
+    <public type="id" name="widget_auth_mfa_backup_codes_edittext" id="0x7f0a0861" />
+    <public type="id" name="widget_auth_mfa_backup_codes_send" id="0x7f0a0862" />
+    <public type="id" name="widget_auth_mfa_info_okay" id="0x7f0a0863" />
+    <public type="id" name="widget_auth_mfa_info_text" id="0x7f0a0864" />
+    <public type="id" name="widget_channel_search_item" id="0x7f0a0865" />
+    <public type="id" name="widget_channel_search_item_remove" id="0x7f0a0866" />
+    <public type="id" name="widget_channel_settings_permissions_overview_members_recycler" id="0x7f0a0867" />
+    <public type="id" name="widget_channel_settings_permissions_overview_roles_recycler" id="0x7f0a0868" />
+    <public type="id" name="widget_channel_topic" id="0x7f0a0869" />
+    <public type="id" name="widget_channels" id="0x7f0a086a" />
+    <public type="id" name="widget_chat_detached" id="0x7f0a086b" />
+    <public type="id" name="widget_chat_input" id="0x7f0a086c" />
+    <public type="id" name="widget_chat_list" id="0x7f0a086d" />
+    <public type="id" name="widget_chat_typing" id="0x7f0a086e" />
+    <public type="id" name="widget_chat_voice" id="0x7f0a086f" />
+    <public type="id" name="widget_collapsed_user_count" id="0x7f0a0870" />
+    <public type="id" name="widget_collapsed_user_imageview" id="0x7f0a0871" />
+    <public type="id" name="widget_connected_list" id="0x7f0a0872" />
+    <public type="id" name="widget_friends_list" id="0x7f0a0873" />
+    <public type="id" name="widget_guilds" id="0x7f0a0874" />
+    <public type="id" name="widget_profile_strip" id="0x7f0a0875" />
+    <public type="id" name="widget_search_results" id="0x7f0a0876" />
+    <public type="id" name="widget_search_suggestions" id="0x7f0a0877" />
+    <public type="id" name="widget_server_settings_channels_container" id="0x7f0a0878" />
+    <public type="id" name="widget_server_settings_emojis_recycler" id="0x7f0a0879" />
+    <public type="id" name="widget_server_settings_emojis_section" id="0x7f0a087a" />
+    <public type="id" name="widget_server_settings_emojis_upload" id="0x7f0a087b" />
+    <public type="id" name="widget_server_settings_emojis_upload_description" id="0x7f0a087c" />
+    <public type="id" name="widget_server_settings_emojis_view_flipper" id="0x7f0a087d" />
+    <public type="id" name="widget_status" id="0x7f0a087e" />
+    <public type="id" name="withText" id="0x7f0a087f" />
+    <public type="id" name="wrap" id="0x7f0a0880" />
+    <public type="id" name="wrap_content" id="0x7f0a0881" />
+    <public type="id" name="wrap_reverse" id="0x7f0a0882" />
+    <public type="id" name="wrapper_controls" id="0x7f0a0883" />
+    <public type="id" name="wrapper_reset_rotate" id="0x7f0a0884" />
+    <public type="id" name="wrapper_rotate_by_angle" id="0x7f0a0885" />
+    <public type="id" name="wrapper_states" id="0x7f0a0886" />
     <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" />
@@ -5155,445 +5219,457 @@
     <public type="layout" name="call_user_item" id="0x7f0d001f" />
     <public type="layout" name="color_item" id="0x7f0d0020" />
     <public type="layout" name="color_picker_dialog" id="0x7f0d0021" />
-    <public type="layout" name="custom_dialog" id="0x7f0d0022" />
-    <public type="layout" name="design_bottom_navigation_item" id="0x7f0d0023" />
-    <public type="layout" name="design_bottom_sheet_dialog" id="0x7f0d0024" />
-    <public type="layout" name="design_layout_snackbar" id="0x7f0d0025" />
-    <public type="layout" name="design_layout_snackbar_include" id="0x7f0d0026" />
-    <public type="layout" name="design_layout_tab_icon" id="0x7f0d0027" />
-    <public type="layout" name="design_layout_tab_text" id="0x7f0d0028" />
-    <public type="layout" name="design_menu_item_action_area" id="0x7f0d0029" />
-    <public type="layout" name="design_navigation_item" id="0x7f0d002a" />
-    <public type="layout" name="design_navigation_item_header" id="0x7f0d002b" />
-    <public type="layout" name="design_navigation_item_separator" id="0x7f0d002c" />
-    <public type="layout" name="design_navigation_item_subheader" id="0x7f0d002d" />
-    <public type="layout" name="design_navigation_menu" id="0x7f0d002e" />
-    <public type="layout" name="design_navigation_menu_item" id="0x7f0d002f" />
-    <public type="layout" name="design_text_input_password_icon" id="0x7f0d0030" />
-    <public type="layout" name="dialog_add_content_pager_with_fab" id="0x7f0d0031" />
-    <public type="layout" name="dialog_simple_selector" id="0x7f0d0032" />
-    <public type="layout" name="dialog_simple_selector_item" id="0x7f0d0033" />
-    <public type="layout" name="emoji_picker_emoji_item" id="0x7f0d0034" />
-    <public type="layout" name="emoji_picker_header_item" id="0x7f0d0035" />
-    <public type="layout" name="flex_input_widget" id="0x7f0d0036" />
-    <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="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_template_custom_big" id="0x7f0d0045" />
-    <public type="layout" name="notification_template_icon_group" id="0x7f0d0046" />
-    <public type="layout" name="notification_template_part_chronometer" id="0x7f0d0047" />
-    <public type="layout" name="notification_template_part_time" id="0x7f0d0048" />
-    <public type="layout" name="oauth_token_permission_detailed_list_item" id="0x7f0d0049" />
-    <public type="layout" name="oauth_token_permission_list_item" id="0x7f0d004a" />
-    <public type="layout" name="overlay_bubble_menu" id="0x7f0d004b" />
-    <public type="layout" name="overlay_menu_voice_members_item" id="0x7f0d004c" />
-    <public type="layout" name="overlay_voice_bubble" id="0x7f0d004d" />
-    <public type="layout" name="overlay_voice_channel_selector" id="0x7f0d004e" />
-    <public type="layout" name="payment_method_list_add_item" id="0x7f0d004f" />
-    <public type="layout" name="payment_method_list_header" id="0x7f0d0050" />
-    <public type="layout" name="payment_method_list_item" id="0x7f0d0051" />
-    <public type="layout" name="payment_source_view" id="0x7f0d0052" />
-    <public type="layout" name="premium_upsell_dialog" id="0x7f0d0053" />
-    <public type="layout" name="reaction_quick_add" id="0x7f0d0054" />
-    <public type="layout" name="reaction_view" id="0x7f0d0055" />
-    <public type="layout" name="select_dialog_item_material" id="0x7f0d0056" />
-    <public type="layout" name="select_dialog_multichoice_material" id="0x7f0d0057" />
-    <public type="layout" name="select_dialog_singlechoice_material" id="0x7f0d0058" />
-    <public type="layout" name="server_settings_members_role_spinner_item" id="0x7f0d0059" />
-    <public type="layout" name="server_settings_members_role_spinner_item_open" id="0x7f0d005a" />
-    <public type="layout" name="settings_channel_list_category_item" id="0x7f0d005b" />
-    <public type="layout" name="settings_channel_list_item" id="0x7f0d005c" />
-    <public type="layout" name="simple_member_list_item" id="0x7f0d005d" />
-    <public type="layout" name="simple_role_list_item" id="0x7f0d005e" />
-    <public type="layout" name="support_simple_spinner_dropdown_item" id="0x7f0d005f" />
-    <public type="layout" name="trash_wrap" id="0x7f0d0060" />
-    <public type="layout" name="ucrop_activity_photobox" id="0x7f0d0061" />
-    <public type="layout" name="ucrop_aspect_ratio" id="0x7f0d0062" />
-    <public type="layout" name="ucrop_controls" id="0x7f0d0063" />
-    <public type="layout" name="ucrop_fragment_photobox" id="0x7f0d0064" />
-    <public type="layout" name="ucrop_layout_rotate_wheel" id="0x7f0d0065" />
-    <public type="layout" name="ucrop_layout_scale_wheel" id="0x7f0d0066" />
-    <public type="layout" name="ucrop_view" id="0x7f0d0067" />
-    <public type="layout" name="user_actions_dialog" id="0x7f0d0068" />
-    <public type="layout" name="user_profile_admin_view" id="0x7f0d0069" />
-    <public type="layout" name="user_profile_header_badge" id="0x7f0d006a" />
-    <public type="layout" name="user_profile_header_view" id="0x7f0d006b" />
-    <public type="layout" name="user_profile_voice_settings_view" id="0x7f0d006c" />
-    <public type="layout" name="view_account_credit" id="0x7f0d006d" />
-    <public type="layout" name="view_active_subscription" id="0x7f0d006e" />
-    <public type="layout" name="view_add_override_item" id="0x7f0d006f" />
-    <public type="layout" name="view_application_news" id="0x7f0d0070" />
-    <public type="layout" name="view_attachment_preview_item" id="0x7f0d0071" />
-    <public type="layout" name="view_boost_progress_bar" id="0x7f0d0072" />
-    <public type="layout" name="view_boost_status_no_boosts" id="0x7f0d0073" />
-    <public type="layout" name="view_boost_user_settings_perks" id="0x7f0d0074" />
-    <public type="layout" name="view_boxed_button" id="0x7f0d0075" />
-    <public type="layout" name="view_camera_permissions" id="0x7f0d0076" />
-    <public type="layout" name="view_category_override_item" id="0x7f0d0077" />
-    <public type="layout" name="view_channel_override_item" id="0x7f0d0078" />
-    <public type="layout" name="view_chat_action_item" id="0x7f0d0079" />
-    <public type="layout" name="view_chat_list_actions_emoji_item" id="0x7f0d007a" />
-    <public type="layout" name="view_checkable_role_list_item" id="0x7f0d007b" />
-    <public type="layout" name="view_checkable_role_list_item_themed" id="0x7f0d007c" />
-    <public type="layout" name="view_chip" id="0x7f0d007d" />
-    <public type="layout" name="view_chip_default" id="0x7f0d007e" />
-    <public type="layout" name="view_dialog_confirmation" id="0x7f0d007f" />
-    <public type="layout" name="view_digit_verification" id="0x7f0d0080" />
-    <public type="layout" name="view_edit_payment_info" id="0x7f0d0081" />
-    <public type="layout" name="view_emoji_item" id="0x7f0d0082" />
-    <public type="layout" name="view_file_item" id="0x7f0d0083" />
-    <public type="layout" name="view_gift_entitlement_list_item" id="0x7f0d0084" />
-    <public type="layout" name="view_gift_sku_list_item" id="0x7f0d0085" />
-    <public type="layout" name="view_global_search_item" id="0x7f0d0086" />
-    <public type="layout" name="view_grid_image" id="0x7f0d0087" />
-    <public type="layout" name="view_guild" id="0x7f0d0088" />
-    <public type="layout" name="view_guild_invite_bottom_sheet" id="0x7f0d0089" />
-    <public type="layout" name="view_image" id="0x7f0d008a" />
-    <public type="layout" name="view_input_modal" id="0x7f0d008b" />
-    <public type="layout" name="view_invite_settings_channel_spinner_item" id="0x7f0d008c" />
-    <public type="layout" name="view_invite_settngs_channel_spinner_item_open" id="0x7f0d008d" />
-    <public type="layout" name="view_loading_button" id="0x7f0d008e" />
-    <public type="layout" name="view_nitro_boost_perks" id="0x7f0d008f" />
-    <public type="layout" name="view_nitro_boost_perks_list_item" id="0x7f0d0090" />
-    <public type="layout" name="view_no_gifts_list_item" id="0x7f0d0091" />
-    <public type="layout" name="view_overlay_menu" id="0x7f0d0092" />
-    <public type="layout" name="view_overlay_menu_content" id="0x7f0d0093" />
-    <public type="layout" name="view_premium_settings_perks" id="0x7f0d0094" />
-    <public type="layout" name="view_premium_settings_tier_1" id="0x7f0d0095" />
-    <public type="layout" name="view_premium_settings_tier_2" id="0x7f0d0096" />
-    <public type="layout" name="view_radio_button" id="0x7f0d0097" />
-    <public type="layout" name="view_review_request_modal_image" id="0x7f0d0098" />
-    <public type="layout" name="view_role_item_text" id="0x7f0d0099" />
-    <public type="layout" name="view_server_folder" id="0x7f0d009a" />
-    <public type="layout" name="view_server_settings_icon_name" id="0x7f0d009b" />
-    <public type="layout" name="view_server_settings_notifications" id="0x7f0d009c" />
-    <public type="layout" name="view_server_settings_region" id="0x7f0d009d" />
-    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7f0d009e" />
-    <public type="layout" name="view_server_settings_upload_banner" id="0x7f0d009f" />
-    <public type="layout" name="view_server_settings_upload_splash" id="0x7f0d00a0" />
-    <public type="layout" name="view_setting_check" id="0x7f0d00a1" />
-    <public type="layout" name="view_setting_radio" id="0x7f0d00a2" />
-    <public type="layout" name="view_setting_switch" id="0x7f0d00a3" />
-    <public type="layout" name="view_settings_boost_available_listitem" id="0x7f0d00a4" />
-    <public type="layout" name="view_settings_boost_info_listitem" id="0x7f0d00a5" />
-    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7f0d00a6" />
-    <public type="layout" name="view_settings_gifting_nitro" id="0x7f0d00a7" />
-    <public type="layout" name="view_settings_gifting_nitro_classic" id="0x7f0d00a8" />
-    <public type="layout" name="view_steps" id="0x7f0d00a9" />
-    <public type="layout" name="view_ternary_checkbox" id="0x7f0d00aa" />
-    <public type="layout" name="view_toolbar_title" id="0x7f0d00ab" />
-    <public type="layout" name="view_upload_progress" id="0x7f0d00ac" />
-    <public type="layout" name="view_user_avatar_presence" id="0x7f0d00ad" />
-    <public type="layout" name="view_user_list_item" id="0x7f0d00ae" />
-    <public type="layout" name="view_user_status_presence" id="0x7f0d00af" />
-    <public type="layout" name="view_video_call_participant" id="0x7f0d00b0" />
-    <public type="layout" name="view_voice_user" id="0x7f0d00b1" />
-    <public type="layout" name="voice_controls_view" id="0x7f0d00b2" />
-    <public type="layout" name="voice_user_list_item_divider" id="0x7f0d00b3" />
-    <public type="layout" name="voice_user_list_item_header" id="0x7f0d00b4" />
-    <public type="layout" name="voice_user_list_item_user" id="0x7f0d00b5" />
-    <public type="layout" name="widget_accept_gift_dialog" id="0x7f0d00b6" />
-    <public type="layout" name="widget_add_friend_user_list_item" id="0x7f0d00b7" />
-    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7f0d00b8" />
-    <public type="layout" name="widget_auth_captcha" id="0x7f0d00b9" />
-    <public type="layout" name="widget_auth_header" id="0x7f0d00ba" />
-    <public type="layout" name="widget_auth_invite_info" id="0x7f0d00bb" />
-    <public type="layout" name="widget_auth_landing" id="0x7f0d00bc" />
-    <public type="layout" name="widget_auth_landing_samsung" id="0x7f0d00bd" />
-    <public type="layout" name="widget_auth_login" id="0x7f0d00be" />
-    <public type="layout" name="widget_auth_mfa" id="0x7f0d00bf" />
-    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7f0d00c0" />
-    <public type="layout" name="widget_auth_mfa_info" id="0x7f0d00c1" />
-    <public type="layout" name="widget_auth_register" id="0x7f0d00c2" />
-    <public type="layout" name="widget_auth_undelete_account" id="0x7f0d00c3" />
-    <public type="layout" name="widget_ban_user" id="0x7f0d00c4" />
-    <public type="layout" name="widget_cancel_premium_dialog" id="0x7f0d00c5" />
-    <public type="layout" name="widget_change_log" id="0x7f0d00c6" />
-    <public type="layout" name="widget_channel_group_dm_settings" id="0x7f0d00c7" />
-    <public type="layout" name="widget_channel_members_list" id="0x7f0d00c8" />
-    <public type="layout" name="widget_channel_members_list_item_header" id="0x7f0d00c9" />
-    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7f0d00ca" />
-    <public type="layout" name="widget_channel_members_list_item_user" id="0x7f0d00cb" />
-    <public type="layout" name="widget_channel_notification_settings" id="0x7f0d00cc" />
-    <public type="layout" name="widget_channel_pinned_messages" id="0x7f0d00cd" />
-    <public type="layout" name="widget_channel_search_item" id="0x7f0d00ce" />
-    <public type="layout" name="widget_channel_search_item_header" id="0x7f0d00cf" />
-    <public type="layout" name="widget_channel_selector" id="0x7f0d00d0" />
-    <public type="layout" name="widget_channel_selector_item" id="0x7f0d00d1" />
-    <public type="layout" name="widget_channel_settings_delete" id="0x7f0d00d2" />
-    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7f0d00d3" />
-    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7f0d00d4" />
-    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7f0d00d5" />
-    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7f0d00d6" />
-    <public type="layout" name="widget_channel_topic" id="0x7f0d00d7" />
-    <public type="layout" name="widget_channels_list" id="0x7f0d00d8" />
-    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7f0d00d9" />
-    <public type="layout" name="widget_channels_list_actions_leave_server" id="0x7f0d00da" />
-    <public type="layout" name="widget_channels_list_item_category" id="0x7f0d00db" />
-    <public type="layout" name="widget_channels_list_item_channel" id="0x7f0d00dc" />
-    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7f0d00dd" />
-    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7f0d00de" />
-    <public type="layout" name="widget_channels_list_item_friends" id="0x7f0d00df" />
-    <public type="layout" name="widget_channels_list_item_header" id="0x7f0d00e0" />
-    <public type="layout" name="widget_channels_list_item_invite" id="0x7f0d00e1" />
-    <public type="layout" name="widget_channels_list_item_mfa" id="0x7f0d00e2" />
-    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7f0d00e3" />
-    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7f0d00e4" />
-    <public type="layout" name="widget_channels_list_unreads" id="0x7f0d00e5" />
-    <public type="layout" name="widget_chat_detached" id="0x7f0d00e6" />
-    <public type="layout" name="widget_chat_input" id="0x7f0d00e7" />
-    <public type="layout" name="widget_chat_input_edit_text" id="0x7f0d00e8" />
-    <public type="layout" name="widget_chat_input_emoji_picker" id="0x7f0d00e9" />
-    <public type="layout" name="widget_chat_input_item" id="0x7f0d00ea" />
-    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7f0d00eb" />
-    <public type="layout" name="widget_chat_input_upload_too_large" id="0x7f0d00ec" />
-    <public type="layout" name="widget_chat_input_verification" id="0x7f0d00ed" />
-    <public type="layout" name="widget_chat_list" id="0x7f0d00ee" />
-    <public type="layout" name="widget_chat_list_actions" id="0x7f0d00ef" />
-    <public type="layout" name="widget_chat_list_adapter_item_application_news" id="0x7f0d00f0" />
-    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7f0d00f1" />
-    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7f0d00f2" />
-    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7f0d00f3" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7f0d00f4" />
-    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7f0d00f5" />
-    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7f0d00f6" />
-    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7f0d00f7" />
-    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7f0d00f8" />
-    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7f0d00f9" />
-    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7f0d00fa" />
-    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7f0d00fb" />
-    <public type="layout" name="widget_chat_list_adapter_item_listen_together" id="0x7f0d00fc" />
-    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7f0d00fd" />
-    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7f0d00fe" />
-    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7f0d00ff" />
-    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7f0d0100" />
-    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7f0d0101" />
-    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7f0d0102" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7f0d0103" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7f0d0104" />
-    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7f0d0105" />
-    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7f0d0106" />
-    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7f0d0107" />
-    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7f0d0108" />
-    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7f0d0109" />
-    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7f0d010a" />
-    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7f0d010b" />
-    <public type="layout" name="widget_chat_list_tab_badged" id="0x7f0d010c" />
-    <public type="layout" name="widget_chat_typing_users" id="0x7f0d010d" />
-    <public type="layout" name="widget_chat_voice_list_item_user" id="0x7f0d010e" />
-    <public type="layout" name="widget_client_outdated" id="0x7f0d010f" />
-    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7f0d0110" />
-    <public type="layout" name="widget_connections_add_xbox" id="0x7f0d0111" />
-    <public type="layout" name="widget_create_channel" id="0x7f0d0112" />
-    <public type="layout" name="widget_debugging" id="0x7f0d0113" />
-    <public type="layout" name="widget_debugging_adapter_item" id="0x7f0d0114" />
-    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7f0d0115" />
-    <public type="layout" name="widget_edit_role" id="0x7f0d0116" />
-    <public type="layout" name="widget_enable_mfa_steps" id="0x7f0d0117" />
-    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7f0d0118" />
-    <public type="layout" name="widget_fatal_crash" id="0x7f0d0119" />
-    <public type="layout" name="widget_friends_add" id="0x7f0d011a" />
-    <public type="layout" name="widget_friends_list" id="0x7f0d011b" />
-    <public type="layout" name="widget_friends_list_adapter_item" id="0x7f0d011c" />
-    <public type="layout" name="widget_friends_list_adapter_item_empty" id="0x7f0d011d" />
-    <public type="layout" name="widget_friends_nearby" id="0x7f0d011e" />
-    <public type="layout" name="widget_global_search" id="0x7f0d011f" />
-    <public type="layout" name="widget_global_search_item_divider" id="0x7f0d0120" />
-    <public type="layout" name="widget_global_search_item_dm" id="0x7f0d0121" />
-    <public type="layout" name="widget_global_search_item_guild" id="0x7f0d0122" />
-    <public type="layout" name="widget_group_invite_friends" id="0x7f0d0123" />
-    <public type="layout" name="widget_group_invite_friends_item" id="0x7f0d0124" />
-    <public type="layout" name="widget_guild_actions_add" id="0x7f0d0125" />
-    <public type="layout" name="widget_guild_actions_sheet" id="0x7f0d0126" />
-    <public type="layout" name="widget_guild_call" id="0x7f0d0127" />
-    <public type="layout" name="widget_guild_create" id="0x7f0d0128" />
-    <public type="layout" name="widget_guild_create_region" id="0x7f0d0129" />
-    <public type="layout" name="widget_guild_invite" id="0x7f0d012a" />
-    <public type="layout" name="widget_guild_invite_info" id="0x7f0d012b" />
-    <public type="layout" name="widget_guild_invite_share" id="0x7f0d012c" />
-    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7f0d012d" />
-    <public type="layout" name="widget_guild_invite_share_item" id="0x7f0d012e" />
-    <public type="layout" name="widget_guild_join" id="0x7f0d012f" />
-    <public type="layout" name="widget_guild_join_invite_examples" id="0x7f0d0130" />
-    <public type="layout" name="widget_guild_search" id="0x7f0d0131" />
-    <public type="layout" name="widget_guild_search_list_item" id="0x7f0d0132" />
-    <public type="layout" name="widget_guild_transfer_ownership" id="0x7f0d0133" />
-    <public type="layout" name="widget_guilds_list" id="0x7f0d0134" />
-    <public type="layout" name="widget_guilds_list_item_divider" id="0x7f0d0135" />
-    <public type="layout" name="widget_guilds_list_item_dm" id="0x7f0d0136" />
-    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7f0d0137" />
-    <public type="layout" name="widget_guilds_list_item_folder" id="0x7f0d0138" />
-    <public type="layout" name="widget_guilds_list_item_guild" id="0x7f0d0139" />
-    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7f0d013a" />
-    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7f0d013b" />
-    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7f0d013c" />
-    <public type="layout" name="widget_guilds_list_item_profile" id="0x7f0d013d" />
-    <public type="layout" name="widget_incoming_share" id="0x7f0d013e" />
-    <public type="layout" name="widget_kick_user" id="0x7f0d013f" />
-    <public type="layout" name="widget_main" id="0x7f0d0140" />
-    <public type="layout" name="widget_main_panel_center" id="0x7f0d0141" />
-    <public type="layout" name="widget_main_panel_center_channel_less" id="0x7f0d0142" />
-    <public type="layout" name="widget_main_panel_center_content" id="0x7f0d0143" />
-    <public type="layout" name="widget_main_panel_center_content_unread" id="0x7f0d0144" />
-    <public type="layout" name="widget_main_panel_center_nsfw" id="0x7f0d0145" />
-    <public type="layout" name="widget_main_panel_left" id="0x7f0d0146" />
-    <public type="layout" name="widget_main_panel_loading" id="0x7f0d0147" />
-    <public type="layout" name="widget_main_panel_right" id="0x7f0d0148" />
-    <public type="layout" name="widget_manage_reactions" id="0x7f0d0149" />
-    <public type="layout" name="widget_manage_reactions_emoji" id="0x7f0d014a" />
-    <public type="layout" name="widget_manage_reactions_result_error" id="0x7f0d014b" />
-    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7f0d014c" />
-    <public type="layout" name="widget_manage_reactions_result_user" id="0x7f0d014d" />
-    <public type="layout" name="widget_media" id="0x7f0d014e" />
-    <public type="layout" name="widget_music_rich_presence" id="0x7f0d014f" />
-    <public type="layout" name="widget_notice_dialog" id="0x7f0d0150" />
-    <public type="layout" name="widget_notice_nux_overlay" id="0x7f0d0151" />
-    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7f0d0152" />
-    <public type="layout" name="widget_notice_popup" id="0x7f0d0153" />
-    <public type="layout" name="widget_notice_popup_channel" id="0x7f0d0154" />
-    <public type="layout" name="widget_nux_guild_use_cases" id="0x7f0d0155" />
-    <public type="layout" name="widget_nux_post_registration" id="0x7f0d0156" />
-    <public type="layout" name="widget_oauth_authorize" id="0x7f0d0157" />
-    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7f0d0158" />
-    <public type="layout" name="widget_platform_rich_prescence" id="0x7f0d0159" />
-    <public type="layout" name="widget_premium_upsell" id="0x7f0d015a" />
-    <public type="layout" name="widget_private_call" id="0x7f0d015b" />
-    <public type="layout" name="widget_private_call_controls_view" id="0x7f0d015c" />
-    <public type="layout" name="widget_prune_users" id="0x7f0d015d" />
-    <public type="layout" name="widget_search" id="0x7f0d015e" />
-    <public type="layout" name="widget_search_results" id="0x7f0d015f" />
-    <public type="layout" name="widget_search_suggestion_item_header" id="0x7f0d0160" />
-    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7f0d0161" />
-    <public type="layout" name="widget_search_suggestions" id="0x7f0d0162" />
-    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7f0d0163" />
-    <public type="layout" name="widget_search_suggestions_item_has" id="0x7f0d0164" />
-    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7f0d0165" />
-    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7f0d0166" />
-    <public type="layout" name="widget_search_suggestions_item_user" id="0x7f0d0167" />
-    <public type="layout" name="widget_server_boost_confirmation" id="0x7f0d0168" />
-    <public type="layout" name="widget_server_boost_status" id="0x7f0d0169" />
-    <public type="layout" name="widget_server_delete_dialog" id="0x7f0d016a" />
-    <public type="layout" name="widget_server_notification_override_selector" id="0x7f0d016b" />
-    <public type="layout" name="widget_server_notifications" id="0x7f0d016c" />
-    <public type="layout" name="widget_server_remove_boost_confirmation" id="0x7f0d016d" />
-    <public type="layout" name="widget_server_settings" id="0x7f0d016e" />
-    <public type="layout" name="widget_server_settings_audit_log" id="0x7f0d016f" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7f0d0170" />
-    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7f0d0171" />
-    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7f0d0172" />
-    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7f0d0173" />
-    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7f0d0174" />
-    <public type="layout" name="widget_server_settings_bans" id="0x7f0d0175" />
-    <public type="layout" name="widget_server_settings_channels" id="0x7f0d0176" />
-    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7f0d0177" />
-    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7f0d0178" />
-    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7f0d0179" />
-    <public type="layout" name="widget_server_settings_edit_integration" id="0x7f0d017a" />
-    <public type="layout" name="widget_server_settings_edit_member" id="0x7f0d017b" />
-    <public type="layout" name="widget_server_settings_edit_role_color_picker" id="0x7f0d017c" />
-    <public type="layout" name="widget_server_settings_emojis" id="0x7f0d017d" />
-    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7f0d017e" />
-    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7f0d017f" />
-    <public type="layout" name="widget_server_settings_emojis_header" id="0x7f0d0180" />
-    <public type="layout" name="widget_server_settings_emojis_item" id="0x7f0d0181" />
-    <public type="layout" name="widget_server_settings_emojis_section" id="0x7f0d0182" />
-    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7f0d0183" />
-    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7f0d0184" />
-    <public type="layout" name="widget_server_settings_instant_invites" id="0x7f0d0185" />
-    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7f0d0186" />
-    <public type="layout" name="widget_server_settings_integrations" id="0x7f0d0187" />
-    <public type="layout" name="widget_server_settings_member_list_item" id="0x7f0d0188" />
-    <public type="layout" name="widget_server_settings_members" id="0x7f0d0189" />
-    <public type="layout" name="widget_server_settings_moderation" id="0x7f0d018a" />
-    <public type="layout" name="widget_server_settings_overview" id="0x7f0d018b" />
-    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7f0d018c" />
-    <public type="layout" name="widget_server_settings_overview_region" id="0x7f0d018d" />
-    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7f0d018e" />
-    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7f0d018f" />
-    <public type="layout" name="widget_server_settings_role_item" id="0x7f0d0190" />
-    <public type="layout" name="widget_server_settings_roles_list" id="0x7f0d0191" />
-    <public type="layout" name="widget_server_settings_security" id="0x7f0d0192" />
-    <public type="layout" name="widget_server_settings_security_dialog" id="0x7f0d0193" />
-    <public type="layout" name="widget_server_settings_vanity_url" id="0x7f0d0194" />
-    <public type="layout" name="widget_settings" id="0x7f0d0195" />
-    <public type="layout" name="widget_settings_account" id="0x7f0d0196" />
-    <public type="layout" name="widget_settings_account_backup_codes" id="0x7f0d0197" />
-    <public type="layout" name="widget_settings_account_change_password" id="0x7f0d0198" />
-    <public type="layout" name="widget_settings_account_edit" id="0x7f0d0199" />
-    <public type="layout" name="widget_settings_appearance" id="0x7f0d019a" />
-    <public type="layout" name="widget_settings_authorized_apps" id="0x7f0d019b" />
-    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7f0d019c" />
-    <public type="layout" name="widget_settings_behavior" id="0x7f0d019d" />
-    <public type="layout" name="widget_settings_billing" id="0x7f0d019e" />
-    <public type="layout" name="widget_settings_boost" id="0x7f0d019f" />
-    <public type="layout" name="widget_settings_connections" id="0x7f0d01a0" />
-    <public type="layout" name="widget_settings_connections_add" id="0x7f0d01a1" />
-    <public type="layout" name="widget_settings_developer" id="0x7f0d01a2" />
-    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7f0d01a3" />
-    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7f0d01a4" />
-    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7f0d01a5" />
-    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7f0d01a6" />
-    <public type="layout" name="widget_settings_games" id="0x7f0d01a7" />
-    <public type="layout" name="widget_settings_gifting" id="0x7f0d01a8" />
-    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7f0d01a9" />
-    <public type="layout" name="widget_settings_item_backup_code" id="0x7f0d01aa" />
-    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7f0d01ab" />
-    <public type="layout" name="widget_settings_item_connected_account" id="0x7f0d01ac" />
-    <public type="layout" name="widget_settings_language" id="0x7f0d01ad" />
-    <public type="layout" name="widget_settings_language_select" id="0x7f0d01ae" />
-    <public type="layout" name="widget_settings_language_select_item" id="0x7f0d01af" />
-    <public type="layout" name="widget_settings_media" id="0x7f0d01b0" />
-    <public type="layout" name="widget_settings_notification_os" id="0x7f0d01b1" />
-    <public type="layout" name="widget_settings_notifications" id="0x7f0d01b2" />
-    <public type="layout" name="widget_settings_payment_methods" id="0x7f0d01b3" />
-    <public type="layout" name="widget_settings_premium" id="0x7f0d01b4" />
-    <public type="layout" name="widget_settings_privacy" id="0x7f0d01b5" />
-    <public type="layout" name="widget_settings_privacy_defaults" id="0x7f0d01b6" />
-    <public type="layout" name="widget_settings_voice" id="0x7f0d01b7" />
-    <public type="layout" name="widget_status" id="0x7f0d01b8" />
-    <public type="layout" name="widget_stream_rich_presence" id="0x7f0d01b9" />
-    <public type="layout" name="widget_text_channel_settings" id="0x7f0d01ba" />
-    <public type="layout" name="widget_tos_accept" id="0x7f0d01bb" />
-    <public type="layout" name="widget_upgrade_premium_dialog" id="0x7f0d01bc" />
-    <public type="layout" name="widget_url_actions" id="0x7f0d01bd" />
-    <public type="layout" name="widget_usage_settings_dialog" id="0x7f0d01be" />
-    <public type="layout" name="widget_user_account_verify" id="0x7f0d01bf" />
-    <public type="layout" name="widget_user_captcha_verify" id="0x7f0d01c0" />
-    <public type="layout" name="widget_user_email_update" id="0x7f0d01c1" />
-    <public type="layout" name="widget_user_email_verify" id="0x7f0d01c2" />
-    <public type="layout" name="widget_user_info" id="0x7f0d01c3" />
-    <public type="layout" name="widget_user_info_adapter_item_connected_account" id="0x7f0d01c4" />
-    <public type="layout" name="widget_user_mentions" id="0x7f0d01c5" />
-    <public type="layout" name="widget_user_mentions_filter" id="0x7f0d01c6" />
-    <public type="layout" name="widget_user_mutual_friends" id="0x7f0d01c7" />
-    <public type="layout" name="widget_user_mutual_guilds" id="0x7f0d01c8" />
-    <public type="layout" name="widget_user_phone_add" id="0x7f0d01c9" />
-    <public type="layout" name="widget_user_phone_verify" id="0x7f0d01ca" />
-    <public type="layout" name="widget_user_profile" id="0x7f0d01cb" />
-    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7f0d01cc" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7f0d01cd" />
-    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7f0d01ce" />
-    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7f0d01cf" />
-    <public type="layout" name="widget_user_profile_strip" id="0x7f0d01d0" />
-    <public type="layout" name="widget_user_rich_presence" id="0x7f0d01d1" />
-    <public type="layout" name="widget_user_sheet" id="0x7f0d01d2" />
-    <public type="layout" name="widget_user_status_update" id="0x7f0d01d3" />
-    <public type="layout" name="widget_voice_actions" id="0x7f0d01d4" />
-    <public type="layout" name="widget_voice_call_incoming" id="0x7f0d01d5" />
-    <public type="layout" name="widget_voice_call_inline" id="0x7f0d01d6" />
-    <public type="layout" name="widget_voice_channel_settings" id="0x7f0d01d7" />
-    <public type="layout" name="widget_web_view" id="0x7f0d01d8" />
+    <public type="layout" name="connected_account_actions_dialog" id="0x7f0d0022" />
+    <public type="layout" name="custom_dialog" id="0x7f0d0023" />
+    <public type="layout" name="design_bottom_navigation_item" id="0x7f0d0024" />
+    <public type="layout" name="design_bottom_sheet_dialog" id="0x7f0d0025" />
+    <public type="layout" name="design_layout_snackbar" id="0x7f0d0026" />
+    <public type="layout" name="design_layout_snackbar_include" id="0x7f0d0027" />
+    <public type="layout" name="design_layout_tab_icon" id="0x7f0d0028" />
+    <public type="layout" name="design_layout_tab_text" id="0x7f0d0029" />
+    <public type="layout" name="design_menu_item_action_area" id="0x7f0d002a" />
+    <public type="layout" name="design_navigation_item" id="0x7f0d002b" />
+    <public type="layout" name="design_navigation_item_header" id="0x7f0d002c" />
+    <public type="layout" name="design_navigation_item_separator" id="0x7f0d002d" />
+    <public type="layout" name="design_navigation_item_subheader" id="0x7f0d002e" />
+    <public type="layout" name="design_navigation_menu" id="0x7f0d002f" />
+    <public type="layout" name="design_navigation_menu_item" id="0x7f0d0030" />
+    <public type="layout" name="design_text_input_password_icon" id="0x7f0d0031" />
+    <public type="layout" name="dialog_add_content_pager_with_fab" id="0x7f0d0032" />
+    <public type="layout" name="dialog_simple_selector" id="0x7f0d0033" />
+    <public type="layout" name="dialog_simple_selector_item" id="0x7f0d0034" />
+    <public type="layout" name="emoji_picker_emoji_item" id="0x7f0d0035" />
+    <public type="layout" name="emoji_picker_header_item" id="0x7f0d0036" />
+    <public type="layout" name="flex_input_widget" id="0x7f0d0037" />
+    <public type="layout" name="fragment_camera" id="0x7f0d0038" />
+    <public type="layout" name="fragment_paged_grid" id="0x7f0d0039" />
+    <public type="layout" name="fragment_recycler_view" id="0x7f0d003a" />
+    <public type="layout" name="icon_list_item_text_view" id="0x7f0d003b" />
+    <public type="layout" name="image_upload_dialog" id="0x7f0d003c" />
+    <public type="layout" name="integration_sync_settings" id="0x7f0d003d" />
+    <public type="layout" name="item_permission_storage" id="0x7f0d003e" />
+    <public type="layout" name="layout_account_credits_list" id="0x7f0d003f" />
+    <public type="layout" name="layout_search" id="0x7f0d0040" />
+    <public type="layout" name="layout_search_actionbar" id="0x7f0d0041" />
+    <public type="layout" name="layout_unhandled_uri" id="0x7f0d0042" />
+    <public type="layout" name="mtrl_layout_snackbar" id="0x7f0d0043" />
+    <public type="layout" name="mtrl_layout_snackbar_include" id="0x7f0d0044" />
+    <public type="layout" name="notification_action" id="0x7f0d0045" />
+    <public type="layout" name="notification_action_tombstone" id="0x7f0d0046" />
+    <public type="layout" name="notification_template_custom_big" id="0x7f0d0047" />
+    <public type="layout" name="notification_template_icon_group" id="0x7f0d0048" />
+    <public type="layout" name="notification_template_part_chronometer" id="0x7f0d0049" />
+    <public type="layout" name="notification_template_part_time" id="0x7f0d004a" />
+    <public type="layout" name="oauth_token_permission_detailed_list_item" id="0x7f0d004b" />
+    <public type="layout" name="oauth_token_permission_list_item" id="0x7f0d004c" />
+    <public type="layout" name="overlay_bubble_menu" id="0x7f0d004d" />
+    <public type="layout" name="overlay_menu_voice_members_item" id="0x7f0d004e" />
+    <public type="layout" name="overlay_voice_bubble" id="0x7f0d004f" />
+    <public type="layout" name="overlay_voice_channel_selector" id="0x7f0d0050" />
+    <public type="layout" name="payment_method_list_add_item" id="0x7f0d0051" />
+    <public type="layout" name="payment_method_list_header" id="0x7f0d0052" />
+    <public type="layout" name="payment_method_list_item" id="0x7f0d0053" />
+    <public type="layout" name="payment_source_view" id="0x7f0d0054" />
+    <public type="layout" name="premium_upsell_dialog" id="0x7f0d0055" />
+    <public type="layout" name="reaction_quick_add" id="0x7f0d0056" />
+    <public type="layout" name="reaction_view" id="0x7f0d0057" />
+    <public type="layout" name="select_dialog_item_material" id="0x7f0d0058" />
+    <public type="layout" name="select_dialog_multichoice_material" id="0x7f0d0059" />
+    <public type="layout" name="select_dialog_singlechoice_material" id="0x7f0d005a" />
+    <public type="layout" name="server_settings_members_role_spinner_item" id="0x7f0d005b" />
+    <public type="layout" name="server_settings_members_role_spinner_item_open" id="0x7f0d005c" />
+    <public type="layout" name="settings_channel_list_category_item" id="0x7f0d005d" />
+    <public type="layout" name="settings_channel_list_item" id="0x7f0d005e" />
+    <public type="layout" name="simple_member_list_item" id="0x7f0d005f" />
+    <public type="layout" name="simple_role_list_item" id="0x7f0d0060" />
+    <public type="layout" name="stream_feedback_spinner_item" id="0x7f0d0061" />
+    <public type="layout" name="support_simple_spinner_dropdown_item" id="0x7f0d0062" />
+    <public type="layout" name="trash_wrap" id="0x7f0d0063" />
+    <public type="layout" name="ucrop_activity_photobox" id="0x7f0d0064" />
+    <public type="layout" name="ucrop_aspect_ratio" id="0x7f0d0065" />
+    <public type="layout" name="ucrop_controls" id="0x7f0d0066" />
+    <public type="layout" name="ucrop_fragment_photobox" id="0x7f0d0067" />
+    <public type="layout" name="ucrop_layout_rotate_wheel" id="0x7f0d0068" />
+    <public type="layout" name="ucrop_layout_scale_wheel" id="0x7f0d0069" />
+    <public type="layout" name="ucrop_view" id="0x7f0d006a" />
+    <public type="layout" name="user_actions_dialog" id="0x7f0d006b" />
+    <public type="layout" name="user_profile_admin_view" id="0x7f0d006c" />
+    <public type="layout" name="user_profile_connections_view" id="0x7f0d006d" />
+    <public type="layout" name="user_profile_header_badge" id="0x7f0d006e" />
+    <public type="layout" name="user_profile_header_view" id="0x7f0d006f" />
+    <public type="layout" name="user_profile_voice_settings_view" id="0x7f0d0070" />
+    <public type="layout" name="view_account_credit" id="0x7f0d0071" />
+    <public type="layout" name="view_active_subscription" id="0x7f0d0072" />
+    <public type="layout" name="view_add_override_item" id="0x7f0d0073" />
+    <public type="layout" name="view_application_news" id="0x7f0d0074" />
+    <public type="layout" name="view_attachment_preview_item" id="0x7f0d0075" />
+    <public type="layout" name="view_boost_progress_bar" id="0x7f0d0076" />
+    <public type="layout" name="view_boost_status_no_boosts" id="0x7f0d0077" />
+    <public type="layout" name="view_boost_user_settings_perks" id="0x7f0d0078" />
+    <public type="layout" name="view_boxed_button" id="0x7f0d0079" />
+    <public type="layout" name="view_camera_permissions" id="0x7f0d007a" />
+    <public type="layout" name="view_category_override_item" id="0x7f0d007b" />
+    <public type="layout" name="view_channel_override_item" id="0x7f0d007c" />
+    <public type="layout" name="view_chat_action_item" id="0x7f0d007d" />
+    <public type="layout" name="view_chat_embed_game_invite" id="0x7f0d007e" />
+    <public type="layout" name="view_chat_list_actions_emoji_item" id="0x7f0d007f" />
+    <public type="layout" name="view_checkable_role_list_item" id="0x7f0d0080" />
+    <public type="layout" name="view_checkable_role_list_item_themed" id="0x7f0d0081" />
+    <public type="layout" name="view_chip" id="0x7f0d0082" />
+    <public type="layout" name="view_chip_default" id="0x7f0d0083" />
+    <public type="layout" name="view_dialog_confirmation" id="0x7f0d0084" />
+    <public type="layout" name="view_digit_verification" id="0x7f0d0085" />
+    <public type="layout" name="view_edit_payment_info" id="0x7f0d0086" />
+    <public type="layout" name="view_emoji_item" id="0x7f0d0087" />
+    <public type="layout" name="view_file_item" id="0x7f0d0088" />
+    <public type="layout" name="view_gift_entitlement_list_item" id="0x7f0d0089" />
+    <public type="layout" name="view_gift_sku_list_item" id="0x7f0d008a" />
+    <public type="layout" name="view_global_search_item" id="0x7f0d008b" />
+    <public type="layout" name="view_golive_stream" id="0x7f0d008c" />
+    <public type="layout" name="view_grid_image" id="0x7f0d008d" />
+    <public type="layout" name="view_guild" id="0x7f0d008e" />
+    <public type="layout" name="view_guild_invite_bottom_sheet" id="0x7f0d008f" />
+    <public type="layout" name="view_image" id="0x7f0d0090" />
+    <public type="layout" name="view_input_modal" id="0x7f0d0091" />
+    <public type="layout" name="view_invite_settings_channel_spinner_item" id="0x7f0d0092" />
+    <public type="layout" name="view_invite_settngs_channel_spinner_item_open" id="0x7f0d0093" />
+    <public type="layout" name="view_loading_button" id="0x7f0d0094" />
+    <public type="layout" name="view_nitro_boost_perks" id="0x7f0d0095" />
+    <public type="layout" name="view_nitro_boost_perks_list_item" id="0x7f0d0096" />
+    <public type="layout" name="view_no_gifts_list_item" id="0x7f0d0097" />
+    <public type="layout" name="view_overlay_menu" id="0x7f0d0098" />
+    <public type="layout" name="view_overlay_menu_content" id="0x7f0d0099" />
+    <public type="layout" name="view_premium_settings_perks" id="0x7f0d009a" />
+    <public type="layout" name="view_premium_settings_tier_1" id="0x7f0d009b" />
+    <public type="layout" name="view_premium_settings_tier_2" id="0x7f0d009c" />
+    <public type="layout" name="view_radio_button" id="0x7f0d009d" />
+    <public type="layout" name="view_review_request_modal_image" id="0x7f0d009e" />
+    <public type="layout" name="view_role_item_text" id="0x7f0d009f" />
+    <public type="layout" name="view_server_folder" id="0x7f0d00a0" />
+    <public type="layout" name="view_server_settings_icon_name" id="0x7f0d00a1" />
+    <public type="layout" name="view_server_settings_notifications" id="0x7f0d00a2" />
+    <public type="layout" name="view_server_settings_region" id="0x7f0d00a3" />
+    <public type="layout" name="view_server_settings_system_channel_wrap" id="0x7f0d00a4" />
+    <public type="layout" name="view_server_settings_upload_banner" id="0x7f0d00a5" />
+    <public type="layout" name="view_server_settings_upload_splash" id="0x7f0d00a6" />
+    <public type="layout" name="view_setting_check" id="0x7f0d00a7" />
+    <public type="layout" name="view_setting_radio" id="0x7f0d00a8" />
+    <public type="layout" name="view_setting_switch" id="0x7f0d00a9" />
+    <public type="layout" name="view_settings_boost_available_listitem" id="0x7f0d00aa" />
+    <public type="layout" name="view_settings_boost_info_listitem" id="0x7f0d00ab" />
+    <public type="layout" name="view_settings_boosted_guild_listitem" id="0x7f0d00ac" />
+    <public type="layout" name="view_settings_gifting_nitro" id="0x7f0d00ad" />
+    <public type="layout" name="view_settings_gifting_nitro_classic" id="0x7f0d00ae" />
+    <public type="layout" name="view_steps" id="0x7f0d00af" />
+    <public type="layout" name="view_ternary_checkbox" id="0x7f0d00b0" />
+    <public type="layout" name="view_toolbar_title" id="0x7f0d00b1" />
+    <public type="layout" name="view_upload_progress" id="0x7f0d00b2" />
+    <public type="layout" name="view_user_avatar_presence" id="0x7f0d00b3" />
+    <public type="layout" name="view_user_list_item" id="0x7f0d00b4" />
+    <public type="layout" name="view_user_status_presence" id="0x7f0d00b5" />
+    <public type="layout" name="view_video_call_participant" id="0x7f0d00b6" />
+    <public type="layout" name="view_voice_user" id="0x7f0d00b7" />
+    <public type="layout" name="voice_controls_view" id="0x7f0d00b8" />
+    <public type="layout" name="voice_user_list_item_divider" id="0x7f0d00b9" />
+    <public type="layout" name="voice_user_list_item_header" id="0x7f0d00ba" />
+    <public type="layout" name="voice_user_list_item_user" id="0x7f0d00bb" />
+    <public type="layout" name="widget_accept_gift_dialog" id="0x7f0d00bc" />
+    <public type="layout" name="widget_add_friend_user_list_item" id="0x7f0d00bd" />
+    <public type="layout" name="widget_audit_log_filter_sheet" id="0x7f0d00be" />
+    <public type="layout" name="widget_auth_captcha" id="0x7f0d00bf" />
+    <public type="layout" name="widget_auth_header" id="0x7f0d00c0" />
+    <public type="layout" name="widget_auth_invite_info" id="0x7f0d00c1" />
+    <public type="layout" name="widget_auth_landing" id="0x7f0d00c2" />
+    <public type="layout" name="widget_auth_landing_samsung" id="0x7f0d00c3" />
+    <public type="layout" name="widget_auth_login" id="0x7f0d00c4" />
+    <public type="layout" name="widget_auth_mfa" id="0x7f0d00c5" />
+    <public type="layout" name="widget_auth_mfa_backup_codes" id="0x7f0d00c6" />
+    <public type="layout" name="widget_auth_mfa_info" id="0x7f0d00c7" />
+    <public type="layout" name="widget_auth_register" id="0x7f0d00c8" />
+    <public type="layout" name="widget_auth_undelete_account" id="0x7f0d00c9" />
+    <public type="layout" name="widget_ban_user" id="0x7f0d00ca" />
+    <public type="layout" name="widget_cancel_premium_dialog" id="0x7f0d00cb" />
+    <public type="layout" name="widget_change_log" id="0x7f0d00cc" />
+    <public type="layout" name="widget_channel_group_dm_settings" id="0x7f0d00cd" />
+    <public type="layout" name="widget_channel_members_list" id="0x7f0d00ce" />
+    <public type="layout" name="widget_channel_members_list_item_header" id="0x7f0d00cf" />
+    <public type="layout" name="widget_channel_members_list_item_loading" id="0x7f0d00d0" />
+    <public type="layout" name="widget_channel_members_list_item_user" id="0x7f0d00d1" />
+    <public type="layout" name="widget_channel_notification_settings" id="0x7f0d00d2" />
+    <public type="layout" name="widget_channel_pinned_messages" id="0x7f0d00d3" />
+    <public type="layout" name="widget_channel_search_item" id="0x7f0d00d4" />
+    <public type="layout" name="widget_channel_search_item_header" id="0x7f0d00d5" />
+    <public type="layout" name="widget_channel_selector" id="0x7f0d00d6" />
+    <public type="layout" name="widget_channel_selector_item" id="0x7f0d00d7" />
+    <public type="layout" name="widget_channel_settings_delete" id="0x7f0d00d8" />
+    <public type="layout" name="widget_channel_settings_edit_permissions" id="0x7f0d00d9" />
+    <public type="layout" name="widget_channel_settings_permissions_add_member" id="0x7f0d00da" />
+    <public type="layout" name="widget_channel_settings_permissions_add_role" id="0x7f0d00db" />
+    <public type="layout" name="widget_channel_settings_permissions_overview" id="0x7f0d00dc" />
+    <public type="layout" name="widget_channel_topic" id="0x7f0d00dd" />
+    <public type="layout" name="widget_channels_list" id="0x7f0d00de" />
+    <public type="layout" name="widget_channels_list_actions_change_nickname" id="0x7f0d00df" />
+    <public type="layout" name="widget_channels_list_actions_leave_server" id="0x7f0d00e0" />
+    <public type="layout" name="widget_channels_list_item_category" id="0x7f0d00e1" />
+    <public type="layout" name="widget_channels_list_item_channel" id="0x7f0d00e2" />
+    <public type="layout" name="widget_channels_list_item_channel_private" id="0x7f0d00e3" />
+    <public type="layout" name="widget_channels_list_item_channel_voice" id="0x7f0d00e4" />
+    <public type="layout" name="widget_channels_list_item_friends" id="0x7f0d00e5" />
+    <public type="layout" name="widget_channels_list_item_header" id="0x7f0d00e6" />
+    <public type="layout" name="widget_channels_list_item_invite" id="0x7f0d00e7" />
+    <public type="layout" name="widget_channels_list_item_mfa" id="0x7f0d00e8" />
+    <public type="layout" name="widget_channels_list_item_text_actions" id="0x7f0d00e9" />
+    <public type="layout" name="widget_channels_list_item_voice_user" id="0x7f0d00ea" />
+    <public type="layout" name="widget_channels_list_unreads" id="0x7f0d00eb" />
+    <public type="layout" name="widget_chat_detached" id="0x7f0d00ec" />
+    <public type="layout" name="widget_chat_input" id="0x7f0d00ed" />
+    <public type="layout" name="widget_chat_input_edit_text" id="0x7f0d00ee" />
+    <public type="layout" name="widget_chat_input_emoji_picker" id="0x7f0d00ef" />
+    <public type="layout" name="widget_chat_input_item" id="0x7f0d00f0" />
+    <public type="layout" name="widget_chat_input_perm_req_files" id="0x7f0d00f1" />
+    <public type="layout" name="widget_chat_input_upload_too_large" id="0x7f0d00f2" />
+    <public type="layout" name="widget_chat_input_verification" id="0x7f0d00f3" />
+    <public type="layout" name="widget_chat_list" id="0x7f0d00f4" />
+    <public type="layout" name="widget_chat_list_actions" id="0x7f0d00f5" />
+    <public type="layout" name="widget_chat_list_adapter_item_application_news" id="0x7f0d00f6" />
+    <public type="layout" name="widget_chat_list_adapter_item_attachment" id="0x7f0d00f7" />
+    <public type="layout" name="widget_chat_list_adapter_item_blocked" id="0x7f0d00f8" />
+    <public type="layout" name="widget_chat_list_adapter_item_divider" id="0x7f0d00f9" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed" id="0x7f0d00fa" />
+    <public type="layout" name="widget_chat_list_adapter_item_embed_field" id="0x7f0d00fb" />
+    <public type="layout" name="widget_chat_list_adapter_item_empty_pins" id="0x7f0d00fc" />
+    <public type="layout" name="widget_chat_list_adapter_item_failed" id="0x7f0d00fd" />
+    <public type="layout" name="widget_chat_list_adapter_item_game_invite" id="0x7f0d00fe" />
+    <public type="layout" name="widget_chat_list_adapter_item_gift" id="0x7f0d00ff" />
+    <public type="layout" name="widget_chat_list_adapter_item_guild_welcome" id="0x7f0d0100" />
+    <public type="layout" name="widget_chat_list_adapter_item_invite" id="0x7f0d0101" />
+    <public type="layout" name="widget_chat_list_adapter_item_listen_together" id="0x7f0d0102" />
+    <public type="layout" name="widget_chat_list_adapter_item_loading" id="0x7f0d0103" />
+    <public type="layout" name="widget_chat_list_adapter_item_mention_footer" id="0x7f0d0104" />
+    <public type="layout" name="widget_chat_list_adapter_item_message_header" id="0x7f0d0105" />
+    <public type="layout" name="widget_chat_list_adapter_item_minimal" id="0x7f0d0106" />
+    <public type="layout" name="widget_chat_list_adapter_item_reactions" id="0x7f0d0107" />
+    <public type="layout" name="widget_chat_list_adapter_item_result_count" id="0x7f0d0108" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_empty" id="0x7f0d0109" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_error" id="0x7f0d010a" />
+    <public type="layout" name="widget_chat_list_adapter_item_search_indexing" id="0x7f0d010b" />
+    <public type="layout" name="widget_chat_list_adapter_item_spacer" id="0x7f0d010c" />
+    <public type="layout" name="widget_chat_list_adapter_item_start" id="0x7f0d010d" />
+    <public type="layout" name="widget_chat_list_adapter_item_system" id="0x7f0d010e" />
+    <public type="layout" name="widget_chat_list_adapter_item_text" id="0x7f0d010f" />
+    <public type="layout" name="widget_chat_list_adapter_item_text_divider" id="0x7f0d0110" />
+    <public type="layout" name="widget_chat_list_adapter_item_upload_progress" id="0x7f0d0111" />
+    <public type="layout" name="widget_chat_list_tab_badged" id="0x7f0d0112" />
+    <public type="layout" name="widget_chat_typing_users" id="0x7f0d0113" />
+    <public type="layout" name="widget_chat_voice_list_item_user" id="0x7f0d0114" />
+    <public type="layout" name="widget_client_outdated" id="0x7f0d0115" />
+    <public type="layout" name="widget_collapsed_voice_user_list_item" id="0x7f0d0116" />
+    <public type="layout" name="widget_connections_add_xbox" id="0x7f0d0117" />
+    <public type="layout" name="widget_create_channel" id="0x7f0d0118" />
+    <public type="layout" name="widget_debugging" id="0x7f0d0119" />
+    <public type="layout" name="widget_debugging_adapter_item" id="0x7f0d011a" />
+    <public type="layout" name="widget_disable_delete_account_dialog" id="0x7f0d011b" />
+    <public type="layout" name="widget_edit_role" id="0x7f0d011c" />
+    <public type="layout" name="widget_enable_mfa_steps" id="0x7f0d011d" />
+    <public type="layout" name="widget_enable_sms_backup_dialog" id="0x7f0d011e" />
+    <public type="layout" name="widget_fatal_crash" id="0x7f0d011f" />
+    <public type="layout" name="widget_friends_add" id="0x7f0d0120" />
+    <public type="layout" name="widget_friends_list" id="0x7f0d0121" />
+    <public type="layout" name="widget_friends_list_adapter_item" id="0x7f0d0122" />
+    <public type="layout" name="widget_friends_list_adapter_item_empty" id="0x7f0d0123" />
+    <public type="layout" name="widget_friends_nearby" id="0x7f0d0124" />
+    <public type="layout" name="widget_global_search" id="0x7f0d0125" />
+    <public type="layout" name="widget_global_search_item_divider" id="0x7f0d0126" />
+    <public type="layout" name="widget_global_search_item_dm" id="0x7f0d0127" />
+    <public type="layout" name="widget_global_search_item_guild" id="0x7f0d0128" />
+    <public type="layout" name="widget_group_invite_friends" id="0x7f0d0129" />
+    <public type="layout" name="widget_group_invite_friends_item" id="0x7f0d012a" />
+    <public type="layout" name="widget_guild_actions_add" id="0x7f0d012b" />
+    <public type="layout" name="widget_guild_actions_sheet" id="0x7f0d012c" />
+    <public type="layout" name="widget_guild_call" id="0x7f0d012d" />
+    <public type="layout" name="widget_guild_create" id="0x7f0d012e" />
+    <public type="layout" name="widget_guild_create_region" id="0x7f0d012f" />
+    <public type="layout" name="widget_guild_invite" id="0x7f0d0130" />
+    <public type="layout" name="widget_guild_invite_info" id="0x7f0d0131" />
+    <public type="layout" name="widget_guild_invite_share" id="0x7f0d0132" />
+    <public type="layout" name="widget_guild_invite_share_empty_suggestions" id="0x7f0d0133" />
+    <public type="layout" name="widget_guild_invite_share_item" id="0x7f0d0134" />
+    <public type="layout" name="widget_guild_join" id="0x7f0d0135" />
+    <public type="layout" name="widget_guild_join_invite_examples" id="0x7f0d0136" />
+    <public type="layout" name="widget_guild_search" id="0x7f0d0137" />
+    <public type="layout" name="widget_guild_search_list_item" id="0x7f0d0138" />
+    <public type="layout" name="widget_guild_transfer_ownership" id="0x7f0d0139" />
+    <public type="layout" name="widget_guilds_list" id="0x7f0d013a" />
+    <public type="layout" name="widget_guilds_list_item_divider" id="0x7f0d013b" />
+    <public type="layout" name="widget_guilds_list_item_dm" id="0x7f0d013c" />
+    <public type="layout" name="widget_guilds_list_item_dm_vertical" id="0x7f0d013d" />
+    <public type="layout" name="widget_guilds_list_item_folder" id="0x7f0d013e" />
+    <public type="layout" name="widget_guilds_list_item_guild" id="0x7f0d013f" />
+    <public type="layout" name="widget_guilds_list_item_guild_new" id="0x7f0d0140" />
+    <public type="layout" name="widget_guilds_list_item_guild_unavailable" id="0x7f0d0141" />
+    <public type="layout" name="widget_guilds_list_item_guild_vertical" id="0x7f0d0142" />
+    <public type="layout" name="widget_guilds_list_item_profile" id="0x7f0d0143" />
+    <public type="layout" name="widget_incoming_share" id="0x7f0d0144" />
+    <public type="layout" name="widget_kick_user" id="0x7f0d0145" />
+    <public type="layout" name="widget_main" id="0x7f0d0146" />
+    <public type="layout" name="widget_main_panel_center" id="0x7f0d0147" />
+    <public type="layout" name="widget_main_panel_center_channel_less" id="0x7f0d0148" />
+    <public type="layout" name="widget_main_panel_center_content" id="0x7f0d0149" />
+    <public type="layout" name="widget_main_panel_center_content_unread" id="0x7f0d014a" />
+    <public type="layout" name="widget_main_panel_center_nsfw" id="0x7f0d014b" />
+    <public type="layout" name="widget_main_panel_left" id="0x7f0d014c" />
+    <public type="layout" name="widget_main_panel_loading" id="0x7f0d014d" />
+    <public type="layout" name="widget_main_panel_right" id="0x7f0d014e" />
+    <public type="layout" name="widget_manage_reactions" id="0x7f0d014f" />
+    <public type="layout" name="widget_manage_reactions_emoji" id="0x7f0d0150" />
+    <public type="layout" name="widget_manage_reactions_result_error" id="0x7f0d0151" />
+    <public type="layout" name="widget_manage_reactions_result_loading" id="0x7f0d0152" />
+    <public type="layout" name="widget_manage_reactions_result_user" id="0x7f0d0153" />
+    <public type="layout" name="widget_media" id="0x7f0d0154" />
+    <public type="layout" name="widget_music_rich_presence" id="0x7f0d0155" />
+    <public type="layout" name="widget_notice_dialog" id="0x7f0d0156" />
+    <public type="layout" name="widget_notice_nux_overlay" id="0x7f0d0157" />
+    <public type="layout" name="widget_notice_nux_samsung_link" id="0x7f0d0158" />
+    <public type="layout" name="widget_notice_popup" id="0x7f0d0159" />
+    <public type="layout" name="widget_notice_popup_channel" id="0x7f0d015a" />
+    <public type="layout" name="widget_nux_guild_use_cases" id="0x7f0d015b" />
+    <public type="layout" name="widget_nux_post_registration" id="0x7f0d015c" />
+    <public type="layout" name="widget_oauth_authorize" id="0x7f0d015d" />
+    <public type="layout" name="widget_payment_source_edit_dialog" id="0x7f0d015e" />
+    <public type="layout" name="widget_platform_rich_prescence" id="0x7f0d015f" />
+    <public type="layout" name="widget_premium_upsell" id="0x7f0d0160" />
+    <public type="layout" name="widget_private_call" id="0x7f0d0161" />
+    <public type="layout" name="widget_private_call_controls_view" id="0x7f0d0162" />
+    <public type="layout" name="widget_prune_users" id="0x7f0d0163" />
+    <public type="layout" name="widget_search" id="0x7f0d0164" />
+    <public type="layout" name="widget_search_results" id="0x7f0d0165" />
+    <public type="layout" name="widget_search_suggestion_item_header" id="0x7f0d0166" />
+    <public type="layout" name="widget_search_suggestion_item_header_history" id="0x7f0d0167" />
+    <public type="layout" name="widget_search_suggestions" id="0x7f0d0168" />
+    <public type="layout" name="widget_search_suggestions_item_channel" id="0x7f0d0169" />
+    <public type="layout" name="widget_search_suggestions_item_has" id="0x7f0d016a" />
+    <public type="layout" name="widget_search_suggestions_item_recent_query" id="0x7f0d016b" />
+    <public type="layout" name="widget_search_suggestions_item_suggestion" id="0x7f0d016c" />
+    <public type="layout" name="widget_search_suggestions_item_user" id="0x7f0d016d" />
+    <public type="layout" name="widget_server_boost_confirmation" id="0x7f0d016e" />
+    <public type="layout" name="widget_server_boost_status" id="0x7f0d016f" />
+    <public type="layout" name="widget_server_delete_dialog" id="0x7f0d0170" />
+    <public type="layout" name="widget_server_notification_override_selector" id="0x7f0d0171" />
+    <public type="layout" name="widget_server_notifications" id="0x7f0d0172" />
+    <public type="layout" name="widget_server_remove_boost_confirmation" id="0x7f0d0173" />
+    <public type="layout" name="widget_server_settings" id="0x7f0d0174" />
+    <public type="layout" name="widget_server_settings_audit_log" id="0x7f0d0175" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_action_listitem" id="0x7f0d0176" />
+    <public type="layout" name="widget_server_settings_audit_log_filter_user_listitem" id="0x7f0d0177" />
+    <public type="layout" name="widget_server_settings_audit_log_listitem" id="0x7f0d0178" />
+    <public type="layout" name="widget_server_settings_audit_log_loading_listitem" id="0x7f0d0179" />
+    <public type="layout" name="widget_server_settings_ban_list_item" id="0x7f0d017a" />
+    <public type="layout" name="widget_server_settings_bans" id="0x7f0d017b" />
+    <public type="layout" name="widget_server_settings_channels" id="0x7f0d017c" />
+    <public type="layout" name="widget_server_settings_channels_sort_actions" id="0x7f0d017d" />
+    <public type="layout" name="widget_server_settings_channels_sort_fab_menu" id="0x7f0d017e" />
+    <public type="layout" name="widget_server_settings_confirm_disable_integration" id="0x7f0d017f" />
+    <public type="layout" name="widget_server_settings_edit_integration" id="0x7f0d0180" />
+    <public type="layout" name="widget_server_settings_edit_member" id="0x7f0d0181" />
+    <public type="layout" name="widget_server_settings_edit_role_color_picker" id="0x7f0d0182" />
+    <public type="layout" name="widget_server_settings_emojis" id="0x7f0d0183" />
+    <public type="layout" name="widget_server_settings_emojis_edit" id="0x7f0d0184" />
+    <public type="layout" name="widget_server_settings_emojis_empty" id="0x7f0d0185" />
+    <public type="layout" name="widget_server_settings_emojis_header" id="0x7f0d0186" />
+    <public type="layout" name="widget_server_settings_emojis_item" id="0x7f0d0187" />
+    <public type="layout" name="widget_server_settings_emojis_section" id="0x7f0d0188" />
+    <public type="layout" name="widget_server_settings_instant_invite_actions" id="0x7f0d0189" />
+    <public type="layout" name="widget_server_settings_instant_invite_list_item" id="0x7f0d018a" />
+    <public type="layout" name="widget_server_settings_instant_invites" id="0x7f0d018b" />
+    <public type="layout" name="widget_server_settings_integration_list_item" id="0x7f0d018c" />
+    <public type="layout" name="widget_server_settings_integrations" id="0x7f0d018d" />
+    <public type="layout" name="widget_server_settings_member_list_item" id="0x7f0d018e" />
+    <public type="layout" name="widget_server_settings_members" id="0x7f0d018f" />
+    <public type="layout" name="widget_server_settings_moderation" id="0x7f0d0190" />
+    <public type="layout" name="widget_server_settings_overview" id="0x7f0d0191" />
+    <public type="layout" name="widget_server_settings_overview_afk_timeout" id="0x7f0d0192" />
+    <public type="layout" name="widget_server_settings_overview_region" id="0x7f0d0193" />
+    <public type="layout" name="widget_server_settings_overview_region_item" id="0x7f0d0194" />
+    <public type="layout" name="widget_server_settings_overview_section_afk_channel" id="0x7f0d0195" />
+    <public type="layout" name="widget_server_settings_role_item" id="0x7f0d0196" />
+    <public type="layout" name="widget_server_settings_roles_list" id="0x7f0d0197" />
+    <public type="layout" name="widget_server_settings_security" id="0x7f0d0198" />
+    <public type="layout" name="widget_server_settings_security_dialog" id="0x7f0d0199" />
+    <public type="layout" name="widget_server_settings_vanity_url" id="0x7f0d019a" />
+    <public type="layout" name="widget_settings" id="0x7f0d019b" />
+    <public type="layout" name="widget_settings_account" id="0x7f0d019c" />
+    <public type="layout" name="widget_settings_account_backup_codes" id="0x7f0d019d" />
+    <public type="layout" name="widget_settings_account_change_password" id="0x7f0d019e" />
+    <public type="layout" name="widget_settings_account_edit" id="0x7f0d019f" />
+    <public type="layout" name="widget_settings_appearance" id="0x7f0d01a0" />
+    <public type="layout" name="widget_settings_authorized_apps" id="0x7f0d01a1" />
+    <public type="layout" name="widget_settings_authorized_apps_list_item" id="0x7f0d01a2" />
+    <public type="layout" name="widget_settings_behavior" id="0x7f0d01a3" />
+    <public type="layout" name="widget_settings_billing" id="0x7f0d01a4" />
+    <public type="layout" name="widget_settings_boost" id="0x7f0d01a5" />
+    <public type="layout" name="widget_settings_connections" id="0x7f0d01a6" />
+    <public type="layout" name="widget_settings_connections_add" id="0x7f0d01a7" />
+    <public type="layout" name="widget_settings_developer" id="0x7f0d01a8" />
+    <public type="layout" name="widget_settings_enable_mfa_download" id="0x7f0d01a9" />
+    <public type="layout" name="widget_settings_enable_mfa_input" id="0x7f0d01aa" />
+    <public type="layout" name="widget_settings_enable_mfa_key" id="0x7f0d01ab" />
+    <public type="layout" name="widget_settings_enable_mfa_success" id="0x7f0d01ac" />
+    <public type="layout" name="widget_settings_games" id="0x7f0d01ad" />
+    <public type="layout" name="widget_settings_gifting" id="0x7f0d01ae" />
+    <public type="layout" name="widget_settings_item_add_connected_account" id="0x7f0d01af" />
+    <public type="layout" name="widget_settings_item_backup_code" id="0x7f0d01b0" />
+    <public type="layout" name="widget_settings_item_backup_code_header" id="0x7f0d01b1" />
+    <public type="layout" name="widget_settings_item_connected_account" id="0x7f0d01b2" />
+    <public type="layout" name="widget_settings_language" id="0x7f0d01b3" />
+    <public type="layout" name="widget_settings_language_select" id="0x7f0d01b4" />
+    <public type="layout" name="widget_settings_language_select_item" id="0x7f0d01b5" />
+    <public type="layout" name="widget_settings_media" id="0x7f0d01b6" />
+    <public type="layout" name="widget_settings_notification_os" id="0x7f0d01b7" />
+    <public type="layout" name="widget_settings_notifications" id="0x7f0d01b8" />
+    <public type="layout" name="widget_settings_payment_methods" id="0x7f0d01b9" />
+    <public type="layout" name="widget_settings_premium" id="0x7f0d01ba" />
+    <public type="layout" name="widget_settings_privacy" id="0x7f0d01bb" />
+    <public type="layout" name="widget_settings_privacy_defaults" id="0x7f0d01bc" />
+    <public type="layout" name="widget_settings_voice" id="0x7f0d01bd" />
+    <public type="layout" name="widget_spectate" id="0x7f0d01be" />
+    <public type="layout" name="widget_spectate_controls" id="0x7f0d01bf" />
+    <public type="layout" name="widget_spectate_report_problem" id="0x7f0d01c0" />
+    <public type="layout" name="widget_spectate_stream_full" id="0x7f0d01c1" />
+    <public type="layout" name="widget_spectators" id="0x7f0d01c2" />
+    <public type="layout" name="widget_status" id="0x7f0d01c3" />
+    <public type="layout" name="widget_stream_feedback_dialog" id="0x7f0d01c4" />
+    <public type="layout" name="widget_stream_rich_presence" id="0x7f0d01c5" />
+    <public type="layout" name="widget_text_channel_settings" id="0x7f0d01c6" />
+    <public type="layout" name="widget_tos_accept" id="0x7f0d01c7" />
+    <public type="layout" name="widget_upgrade_premium_dialog" id="0x7f0d01c8" />
+    <public type="layout" name="widget_url_actions" id="0x7f0d01c9" />
+    <public type="layout" name="widget_usage_settings_dialog" id="0x7f0d01ca" />
+    <public type="layout" name="widget_user_account_verify" id="0x7f0d01cb" />
+    <public type="layout" name="widget_user_captcha_verify" id="0x7f0d01cc" />
+    <public type="layout" name="widget_user_email_update" id="0x7f0d01cd" />
+    <public type="layout" name="widget_user_email_verify" id="0x7f0d01ce" />
+    <public type="layout" name="widget_user_info" id="0x7f0d01cf" />
+    <public type="layout" name="widget_user_info_adapter_item_connected_account" id="0x7f0d01d0" />
+    <public type="layout" name="widget_user_mentions" id="0x7f0d01d1" />
+    <public type="layout" name="widget_user_mentions_filter" id="0x7f0d01d2" />
+    <public type="layout" name="widget_user_mutual_friends" id="0x7f0d01d3" />
+    <public type="layout" name="widget_user_mutual_guilds" id="0x7f0d01d4" />
+    <public type="layout" name="widget_user_phone_add" id="0x7f0d01d5" />
+    <public type="layout" name="widget_user_phone_verify" id="0x7f0d01d6" />
+    <public type="layout" name="widget_user_profile" id="0x7f0d01d7" />
+    <public type="layout" name="widget_user_profile_adapter_item_empty" id="0x7f0d01d8" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend" id="0x7f0d01d9" />
+    <public type="layout" name="widget_user_profile_adapter_item_friend_mutual_server" id="0x7f0d01da" />
+    <public type="layout" name="widget_user_profile_adapter_item_server" id="0x7f0d01db" />
+    <public type="layout" name="widget_user_profile_strip" id="0x7f0d01dc" />
+    <public type="layout" name="widget_user_rich_presence" id="0x7f0d01dd" />
+    <public type="layout" name="widget_user_sheet" id="0x7f0d01de" />
+    <public type="layout" name="widget_user_status_update" id="0x7f0d01df" />
+    <public type="layout" name="widget_voice_actions" id="0x7f0d01e0" />
+    <public type="layout" name="widget_voice_call_incoming" id="0x7f0d01e1" />
+    <public type="layout" name="widget_voice_call_inline" id="0x7f0d01e2" />
+    <public type="layout" name="widget_voice_channel_settings" id="0x7f0d01e3" />
+    <public type="layout" name="widget_web_view" id="0x7f0d01e4" />
     <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" />
@@ -5618,15 +5694,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" />
@@ -5659,107 +5736,107 @@
     <public type="plurals" name="application_store_recommendation_ever_played_other_count" id="0x7f100013" />
     <public type="plurals" name="application_store_recommendation_now_playing_other_count" id="0x7f100014" />
     <public type="plurals" name="application_store_recommendation_recently_played_other_count" id="0x7f100015" />
-    <public type="plurals" name="bans_header_bans" id="0x7f100016" />
-    <public type="plurals" name="billing_refund_purchase_date_daysSincePurchase" id="0x7f100017" />
-    <public type="plurals" name="blocked_messages_count" id="0x7f100018" />
-    <public type="plurals" name="channel_slowmode_cooldown_seconds" id="0x7f100019" />
-    <public type="plurals" name="channel_slowmode_desc_hours_hours" id="0x7f10001a" />
-    <public type="plurals" name="channel_slowmode_desc_hours_minutes" id="0x7f10001b" />
-    <public type="plurals" name="channel_slowmode_desc_hours_seconds" id="0x7f10001c" />
-    <public type="plurals" name="channel_slowmode_desc_minutes_minutes" id="0x7f10001d" />
-    <public type="plurals" name="channel_slowmode_desc_minutes_seconds" id="0x7f10001e" />
-    <public type="plurals" name="channel_slowmode_desc_seconds" id="0x7f10001f" />
-    <public type="plurals" name="custom_status_clear_in_hours_hours" id="0x7f100020" />
-    <public type="plurals" name="custom_status_clear_in_minutes_minutes" id="0x7f100021" />
-    <public type="plurals" name="custom_status_hours_hours" id="0x7f100022" />
-    <public type="plurals" name="custom_status_minutes_minutes" id="0x7f100023" />
-    <public type="plurals" name="duration_days_days" id="0x7f100024" />
-    <public type="plurals" name="duration_hours_hours" id="0x7f100025" />
-    <public type="plurals" name="duration_hours_short_hours" id="0x7f100026" />
-    <public type="plurals" name="duration_mins_mins" id="0x7f100027" />
-    <public type="plurals" name="duration_minutes_minutes" id="0x7f100028" />
-    <public type="plurals" name="duration_minutes_short_minutes" id="0x7f100029" />
-    <public type="plurals" name="duration_seconds_seconds" id="0x7f10002a" />
-    <public type="plurals" name="duration_seconds_short_seconds" id="0x7f10002b" />
-    <public type="plurals" name="emoji_slots_available_count" id="0x7f10002c" />
-    <public type="plurals" name="form_help_last_seen_days" id="0x7f10002d" />
-    <public type="plurals" name="form_help_last_seen_members" id="0x7f10002e" />
-    <public type="plurals" name="game_feed_user_played_days_ago_time" id="0x7f10002f" />
-    <public type="plurals" name="game_feed_user_played_hours_ago_time" id="0x7f100030" />
-    <public type="plurals" name="game_feed_user_played_minutes_ago_time" id="0x7f100031" />
-    <public type="plurals" name="game_feed_user_played_months_ago_time" id="0x7f100032" />
-    <public type="plurals" name="game_feed_user_played_weeks_ago_time" id="0x7f100033" />
-    <public type="plurals" name="game_feed_user_played_years_ago_time" id="0x7f100034" />
-    <public type="plurals" name="game_feed_user_playing_for_days_time" id="0x7f100035" />
-    <public type="plurals" name="game_feed_user_playing_for_hours_time" id="0x7f100036" />
-    <public type="plurals" name="game_feed_user_playing_for_minutes_time" id="0x7f100037" />
-    <public type="plurals" name="game_library_last_played_days_time" id="0x7f100038" />
-    <public type="plurals" name="game_library_last_played_hours_time" id="0x7f100039" />
-    <public type="plurals" name="game_library_last_played_minutes_time" id="0x7f10003a" />
-    <public type="plurals" name="game_library_last_played_months_time" id="0x7f10003b" />
-    <public type="plurals" name="game_library_last_played_weeks_time" id="0x7f10003c" />
-    <public type="plurals" name="game_library_last_played_years_time" id="0x7f10003d" />
-    <public type="plurals" name="game_library_time_played_hours_time" id="0x7f10003e" />
-    <public type="plurals" name="game_library_time_played_minutes_time" id="0x7f10003f" />
-    <public type="plurals" name="game_library_time_played_seconds_time" id="0x7f100040" />
-    <public type="plurals" name="game_library_updates_installing_hours_timeRemaining" id="0x7f100041" />
-    <public type="plurals" name="game_library_updates_installing_minutes_timeRemaining" id="0x7f100042" />
-    <public type="plurals" name="game_library_updates_installing_seconds_timeRemaining" id="0x7f100043" />
-    <public type="plurals" name="game_library_updates_updating_updating_hours_timeRemaining" id="0x7f100044" />
-    <public type="plurals" name="game_library_updates_updating_updating_minutes_timeRemaining" id="0x7f100045" />
-    <public type="plurals" name="game_library_updates_updating_updating_seconds_timeRemaining" id="0x7f100046" />
-    <public type="plurals" name="gift_code_auth_gifted_subscription_monthly_intervalCount" id="0x7f100047" />
-    <public type="plurals" name="gift_code_auth_gifted_subscription_yearly_intervalCount" id="0x7f100048" />
-    <public type="plurals" name="gift_confirmation_body_subscription_monthly_confirm_intervalCount" id="0x7f100049" />
-    <public type="plurals" name="gift_confirmation_body_subscription_yearly_confirm_intervalCount" id="0x7f10004a" />
-    <public type="plurals" name="gift_confirmation_body_success_generic_subscription_monthly_intervalCount" id="0x7f10004b" />
-    <public type="plurals" name="gift_confirmation_body_success_generic_subscription_yearly_intervalCount" id="0x7f10004c" />
-    <public type="plurals" name="gift_confirmation_body_success_premium_tier_1_monthly_intervalCount" id="0x7f10004d" />
-    <public type="plurals" name="gift_confirmation_body_success_premium_tier_1_yearly_intervalCount" id="0x7f10004e" />
-    <public type="plurals" name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount" id="0x7f10004f" />
-    <public type="plurals" name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount" id="0x7f100050" />
-    <public type="plurals" name="gift_confirmation_nitro_time_frame_months_time" id="0x7f100051" />
-    <public type="plurals" name="gift_confirmation_nitro_time_frame_years_time" id="0x7f100052" />
-    <public type="plurals" name="gift_embed_body_subscription_default_months_intervalCount" id="0x7f100053" />
-    <public type="plurals" name="gift_embed_body_subscription_default_years_intervalCount" id="0x7f100054" />
-    <public type="plurals" name="gift_embed_body_subscription_no_user_default_months_intervalCount" id="0x7f100055" />
-    <public type="plurals" name="gift_embed_body_subscription_no_user_default_years_intervalCount" id="0x7f100056" />
-    <public type="plurals" name="gift_embed_expiration_hours" id="0x7f100057" />
-    <public type="plurals" name="gift_inventory_copies_copies" id="0x7f100058" />
-    <public type="plurals" name="gift_inventory_expires_in_hours" id="0x7f100059" />
-    <public type="plurals" name="gift_inventory_expires_in_mobile_hours" id="0x7f10005a" />
-    <public type="plurals" name="gift_inventory_subscription_months_intervalCount" id="0x7f10005b" />
-    <public type="plurals" name="gift_inventory_subscription_years_intervalCount" id="0x7f10005c" />
-    <public type="plurals" name="group_dm_add_members_number" id="0x7f10005d" />
-    <public type="plurals" name="group_dm_invite_remaining_number" id="0x7f10005e" />
-    <public type="plurals" name="group_dm_invite_unselect_users_number" id="0x7f10005f" />
-    <public type="plurals" name="guild_discovery_header_search_results_count" id="0x7f100060" />
-    <public type="plurals" name="guild_settings_audit_log_channel_permission_overrides_denied_count" id="0x7f100061" />
-    <public type="plurals" name="guild_settings_audit_log_channel_permission_overrides_granted_count" id="0x7f100062" />
-    <public type="plurals" name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue" id="0x7f100063" />
-    <public type="plurals" name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue" id="0x7f100064" />
-    <public type="plurals" name="guild_settings_audit_log_member_prune_count" id="0x7f100065" />
-    <public type="plurals" name="guild_settings_audit_log_member_prune_delete_days_newValue" id="0x7f100066" />
-    <public type="plurals" name="guild_settings_audit_log_member_roles_add_count" id="0x7f100067" />
-    <public type="plurals" name="guild_settings_audit_log_member_roles_remove_count" id="0x7f100068" />
-    <public type="plurals" name="guild_settings_audit_log_message_delete_count" id="0x7f100069" />
-    <public type="plurals" name="guild_settings_audit_log_role_permissions_denied_count" id="0x7f10006a" />
-    <public type="plurals" name="guild_settings_audit_log_role_permissions_granted_count" id="0x7f10006b" />
-    <public type="plurals" name="guild_settings_overview_boost_unlock_boosts" id="0x7f10006c" />
-    <public type="plurals" name="guild_settings_premium_guild_close_hint_numLeft" id="0x7f10006d" />
-    <public type="plurals" name="guild_settings_premium_guild_count_subscribers_count" id="0x7f10006e" />
-    <public type="plurals" name="guild_settings_premium_guild_tier_requirement_required" id="0x7f10006f" />
-    <public type="plurals" name="instant_invite_guild_members_total_count" id="0x7f100071" />
-    <public type="plurals" name="invite_embed_num_open_slots_android_count" id="0x7f100072" />
-    <public type="plurals" name="invite_embed_num_open_slots_number" id="0x7f100073" />
-    <public type="plurals" name="invite_expires_days_or_uses_numUses" id="0x7f100074" />
-    <public type="plurals" name="invite_expires_hours_numHours" id="0x7f100075" />
-    <public type="plurals" name="invite_expires_hours_or_uses_numHours" id="0x7f100076" />
-    <public type="plurals" name="invite_expires_hours_or_uses_numUses" id="0x7f100077" />
-    <public type="plurals" name="invite_expires_minutes_or_uses_numUses" id="0x7f100078" />
-    <public type="plurals" name="invite_expires_uses_numUses" id="0x7f100079" />
-    <public type="plurals" name="ios_profile_mutual_friends_count" id="0x7f10007a" />
-    <public type="plurals" name="ios_profile_mutual_guilds_count" id="0x7f10007b" />
+    <public type="plurals" name="attach_payment_source_optional_with_entitlements_warning_months" id="0x7f100016" />
+    <public type="plurals" name="bans_header_bans" id="0x7f100017" />
+    <public type="plurals" name="billing_refund_purchase_date_daysSincePurchase" id="0x7f100018" />
+    <public type="plurals" name="blocked_messages_count" id="0x7f100019" />
+    <public type="plurals" name="channel_slowmode_cooldown_seconds" id="0x7f10001a" />
+    <public type="plurals" name="channel_slowmode_desc_hours_hours" id="0x7f10001b" />
+    <public type="plurals" name="channel_slowmode_desc_hours_minutes" id="0x7f10001c" />
+    <public type="plurals" name="channel_slowmode_desc_hours_seconds" id="0x7f10001d" />
+    <public type="plurals" name="channel_slowmode_desc_minutes_minutes" id="0x7f10001e" />
+    <public type="plurals" name="channel_slowmode_desc_minutes_seconds" id="0x7f10001f" />
+    <public type="plurals" name="channel_slowmode_desc_seconds" id="0x7f100020" />
+    <public type="plurals" name="custom_status_clear_in_hours_hours" id="0x7f100021" />
+    <public type="plurals" name="custom_status_clear_in_minutes_minutes" id="0x7f100022" />
+    <public type="plurals" name="custom_status_hours_hours" id="0x7f100023" />
+    <public type="plurals" name="custom_status_minutes_minutes" id="0x7f100024" />
+    <public type="plurals" name="duration_days_days" id="0x7f100025" />
+    <public type="plurals" name="duration_hours_hours" id="0x7f100026" />
+    <public type="plurals" name="duration_hours_short_hours" id="0x7f100027" />
+    <public type="plurals" name="duration_mins_mins" id="0x7f100028" />
+    <public type="plurals" name="duration_minutes_minutes" id="0x7f100029" />
+    <public type="plurals" name="duration_minutes_short_minutes" id="0x7f10002a" />
+    <public type="plurals" name="duration_seconds_seconds" id="0x7f10002b" />
+    <public type="plurals" name="duration_seconds_short_seconds" id="0x7f10002c" />
+    <public type="plurals" name="emoji_slots_available_count" id="0x7f10002d" />
+    <public type="plurals" name="form_help_last_seen_days" id="0x7f10002e" />
+    <public type="plurals" name="form_help_last_seen_members" id="0x7f10002f" />
+    <public type="plurals" name="game_feed_user_played_days_ago_time" id="0x7f100030" />
+    <public type="plurals" name="game_feed_user_played_hours_ago_time" id="0x7f100031" />
+    <public type="plurals" name="game_feed_user_played_minutes_ago_time" id="0x7f100032" />
+    <public type="plurals" name="game_feed_user_played_months_ago_time" id="0x7f100033" />
+    <public type="plurals" name="game_feed_user_played_weeks_ago_time" id="0x7f100034" />
+    <public type="plurals" name="game_feed_user_played_years_ago_time" id="0x7f100035" />
+    <public type="plurals" name="game_feed_user_playing_for_days_time" id="0x7f100036" />
+    <public type="plurals" name="game_feed_user_playing_for_hours_time" id="0x7f100037" />
+    <public type="plurals" name="game_feed_user_playing_for_minutes_time" id="0x7f100038" />
+    <public type="plurals" name="game_library_last_played_days_time" id="0x7f100039" />
+    <public type="plurals" name="game_library_last_played_hours_time" id="0x7f10003a" />
+    <public type="plurals" name="game_library_last_played_minutes_time" id="0x7f10003b" />
+    <public type="plurals" name="game_library_last_played_months_time" id="0x7f10003c" />
+    <public type="plurals" name="game_library_last_played_weeks_time" id="0x7f10003d" />
+    <public type="plurals" name="game_library_last_played_years_time" id="0x7f10003e" />
+    <public type="plurals" name="game_library_time_played_hours_time" id="0x7f10003f" />
+    <public type="plurals" name="game_library_time_played_minutes_time" id="0x7f100040" />
+    <public type="plurals" name="game_library_time_played_seconds_time" id="0x7f100041" />
+    <public type="plurals" name="game_library_updates_installing_hours_timeRemaining" id="0x7f100042" />
+    <public type="plurals" name="game_library_updates_installing_minutes_timeRemaining" id="0x7f100043" />
+    <public type="plurals" name="game_library_updates_installing_seconds_timeRemaining" id="0x7f100044" />
+    <public type="plurals" name="game_library_updates_updating_updating_hours_timeRemaining" id="0x7f100045" />
+    <public type="plurals" name="game_library_updates_updating_updating_minutes_timeRemaining" id="0x7f100046" />
+    <public type="plurals" name="game_library_updates_updating_updating_seconds_timeRemaining" id="0x7f100047" />
+    <public type="plurals" name="gift_code_auth_gifted_subscription_monthly_intervalCount" id="0x7f100048" />
+    <public type="plurals" name="gift_code_auth_gifted_subscription_yearly_intervalCount" id="0x7f100049" />
+    <public type="plurals" name="gift_confirmation_body_subscription_monthly_confirm_intervalCount" id="0x7f10004a" />
+    <public type="plurals" name="gift_confirmation_body_subscription_yearly_confirm_intervalCount" id="0x7f10004b" />
+    <public type="plurals" name="gift_confirmation_body_success_generic_subscription_monthly_intervalCount" id="0x7f10004c" />
+    <public type="plurals" name="gift_confirmation_body_success_generic_subscription_yearly_intervalCount" id="0x7f10004d" />
+    <public type="plurals" name="gift_confirmation_body_success_premium_tier_1_monthly_intervalCount" id="0x7f10004e" />
+    <public type="plurals" name="gift_confirmation_body_success_premium_tier_1_yearly_intervalCount" id="0x7f10004f" />
+    <public type="plurals" name="gift_confirmation_body_success_premium_tier_2_monthly_intervalCount" id="0x7f100050" />
+    <public type="plurals" name="gift_confirmation_body_success_premium_tier_2_yearly_intervalCount" id="0x7f100051" />
+    <public type="plurals" name="gift_confirmation_nitro_time_frame_months_time" id="0x7f100052" />
+    <public type="plurals" name="gift_confirmation_nitro_time_frame_years_time" id="0x7f100053" />
+    <public type="plurals" name="gift_embed_body_subscription_default_months_intervalCount" id="0x7f100054" />
+    <public type="plurals" name="gift_embed_body_subscription_default_years_intervalCount" id="0x7f100055" />
+    <public type="plurals" name="gift_embed_body_subscription_no_user_default_months_intervalCount" id="0x7f100056" />
+    <public type="plurals" name="gift_embed_body_subscription_no_user_default_years_intervalCount" id="0x7f100057" />
+    <public type="plurals" name="gift_embed_expiration_hours" id="0x7f100058" />
+    <public type="plurals" name="gift_inventory_copies_copies" id="0x7f100059" />
+    <public type="plurals" name="gift_inventory_expires_in_hours" id="0x7f10005a" />
+    <public type="plurals" name="gift_inventory_expires_in_mobile_hours" id="0x7f10005b" />
+    <public type="plurals" name="gift_inventory_subscription_months_intervalCount" id="0x7f10005c" />
+    <public type="plurals" name="gift_inventory_subscription_years_intervalCount" id="0x7f10005d" />
+    <public type="plurals" name="group_dm_add_members_number" id="0x7f10005e" />
+    <public type="plurals" name="group_dm_invite_remaining_number" id="0x7f10005f" />
+    <public type="plurals" name="group_dm_invite_unselect_users_number" id="0x7f100060" />
+    <public type="plurals" name="guild_discovery_header_search_results_count" id="0x7f100061" />
+    <public type="plurals" name="guild_settings_audit_log_channel_permission_overrides_denied_count" id="0x7f100062" />
+    <public type="plurals" name="guild_settings_audit_log_channel_permission_overrides_granted_count" id="0x7f100063" />
+    <public type="plurals" name="guild_settings_audit_log_channel_rate_limit_per_user_change_newValue" id="0x7f100064" />
+    <public type="plurals" name="guild_settings_audit_log_channel_rate_limit_per_user_create_newValue" id="0x7f100065" />
+    <public type="plurals" name="guild_settings_audit_log_member_prune_count" id="0x7f100066" />
+    <public type="plurals" name="guild_settings_audit_log_member_prune_delete_days_newValue" id="0x7f100067" />
+    <public type="plurals" name="guild_settings_audit_log_member_roles_add_count" id="0x7f100068" />
+    <public type="plurals" name="guild_settings_audit_log_member_roles_remove_count" id="0x7f100069" />
+    <public type="plurals" name="guild_settings_audit_log_message_delete_count" id="0x7f10006a" />
+    <public type="plurals" name="guild_settings_audit_log_role_permissions_denied_count" id="0x7f10006b" />
+    <public type="plurals" name="guild_settings_audit_log_role_permissions_granted_count" id="0x7f10006c" />
+    <public type="plurals" name="guild_settings_overview_boost_unlock_boosts" id="0x7f10006d" />
+    <public type="plurals" name="guild_settings_premium_guild_close_hint_numLeft" id="0x7f10006e" />
+    <public type="plurals" name="guild_settings_premium_guild_count_subscribers_count" id="0x7f10006f" />
+    <public type="plurals" name="guild_settings_premium_guild_tier_requirement_required" id="0x7f100070" />
+    <public type="plurals" name="guild_subscription_purchase_modal_activated_description_with_boost_count_guildSubscriptionQuantity" id="0x7f100071" />
+    <public type="plurals" name="instant_invite_guild_members_total_count" id="0x7f100073" />
+    <public type="plurals" name="invite_embed_num_open_slots_android_count" id="0x7f100074" />
+    <public type="plurals" name="invite_embed_num_open_slots_number" id="0x7f100075" />
+    <public type="plurals" name="invite_expires_days_or_uses_numUses" id="0x7f100076" />
+    <public type="plurals" name="invite_expires_hours_numHours" id="0x7f100077" />
+    <public type="plurals" name="invite_expires_hours_or_uses_numHours" id="0x7f100078" />
+    <public type="plurals" name="invite_expires_hours_or_uses_numUses" id="0x7f100079" />
+    <public type="plurals" name="invite_expires_minutes_or_uses_numUses" id="0x7f10007a" />
+    <public type="plurals" name="invite_expires_uses_numUses" id="0x7f10007b" />
     <public type="plurals" name="last_seen_days" id="0x7f10007c" />
     <public type="plurals" name="lfg_listing_age_hours_time" id="0x7f10007d" />
     <public type="plurals" name="lfg_listing_age_minutes_time" id="0x7f10007e" />
@@ -5780,54 +5857,65 @@
     <public type="plurals" name="only_you_can_see_and_delete_these_count" id="0x7f10008e" />
     <public type="plurals" name="partial_outage_a11y_count" id="0x7f10008f" />
     <public type="plurals" name="partial_outage_count" id="0x7f100090" />
-    <public type="plurals" name="premium_code_redemption_confirmation_blurb_numMonths" id="0x7f100091" />
-    <public type="plurals" name="premium_guild_perks_modal_header_boost_count_subscriptions" id="0x7f100092" />
-    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f100093" />
-    <public type="plurals" name="premium_guild_settings_members_subscribed_number" id="0x7f100094" />
-    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f100095" />
-    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f100096" />
-    <public type="plurals" name="premium_guild_subscription_available_count_num" id="0x7f100097" />
-    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f100098" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f100099" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f10009a" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f10009b" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f10009c" />
-    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f10009d" />
-    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f10009e" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f10009f" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f1000a0" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f1000a1" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f1000a2" />
-    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000a3" />
-    <public type="plurals" name="premium_payment_plan_label_monthly_intervalCount" id="0x7f1000a4" />
-    <public type="plurals" name="premium_payment_plan_label_yearly_intervalCount" id="0x7f1000a5" />
-    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7f1000a6" />
-    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7f1000a7" />
-    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7f1000a8" />
-    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7f1000a9" />
-    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7f1000aa" />
-    <public type="plurals" name="reaction_tooltip_n_n" id="0x7f1000ab" />
-    <public type="plurals" name="roles_list_numRoles" id="0x7f1000ac" />
-    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7f1000ad" />
-    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7f1000ae" />
-    <public type="plurals" name="search_still_indexing_hint_count" id="0x7f1000af" />
-    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7f1000b2" />
-    <public type="plurals" name="total_results_count" id="0x7f1000b3" />
-    <public type="plurals" name="uploading_files_count" id="0x7f1000b4" />
-    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7f1000b5" />
-    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7f1000b6" />
-    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7f1000b7" />
-    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7f1000b8" />
-    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7f1000b9" />
-    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7f1000ba" />
-    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7f1000bb" />
-    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7f1000bc" />
-    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7f1000bd" />
-    <public type="plurals" name="voice_call_member_list_title_count" id="0x7f1000be" />
-    <public type="plurals" name="APKTOOL_DUMMY_70" id="0x7f100070" />
+    <public type="plurals" name="premium_chat_perks_description_premium_guild_numFreeGuildSubscriptions" id="0x7f100091" />
+    <public type="plurals" name="premium_code_redemption_confirmation_blurb_numMonths" id="0x7f100092" />
+    <public type="plurals" name="premium_guild_num_guild_subscriptions_num" id="0x7f100093" />
+    <public type="plurals" name="premium_guild_perks_modal_button_subscribe_status_numSubscriptions" id="0x7f100094" />
+    <public type="plurals" name="premium_guild_perks_modal_header_subscription_count_subscriptions" id="0x7f100095" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_needed_number" id="0x7f100096" />
+    <public type="plurals" name="premium_guild_settings_members_subscribed_number" id="0x7f100097" />
+    <public type="plurals" name="premium_guild_settings_x_of_y_subscriptions_numRequired" id="0x7f100098" />
+    <public type="plurals" name="premium_guild_subscribe_confirm_cooldown_warning_days" id="0x7f100099" />
+    <public type="plurals" name="premium_guild_subscription_available_count_num" id="0x7f10009a" />
+    <public type="plurals" name="premium_guild_subscription_available_numSubscriptions" id="0x7f10009b" />
+    <public type="plurals" name="premium_guild_subscription_cancel_invoice_subscription_cancelled_subscriptionCount" id="0x7f10009c" />
+    <public type="plurals" name="premium_guild_subscription_cancel_invoice_subscriptions_subscriptionCount" id="0x7f10009d" />
+    <public type="plurals" name="premium_guild_subscription_duration_mobile_months" id="0x7f10009e" />
+    <public type="plurals" name="premium_guild_subscription_duration_months" id="0x7f10009f" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_days" id="0x7f1000a0" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_days_hours" id="0x7f1000a1" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_hours" id="0x7f1000a2" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_hours_minutes" id="0x7f1000a3" />
+    <public type="plurals" name="premium_guild_subscription_error_rate_limit_minutes_minutes" id="0x7f1000a4" />
+    <public type="plurals" name="premium_guild_subscription_guild_subsription_subtitle_numSubscriptions" id="0x7f1000a5" />
+    <public type="plurals" name="premium_guild_subscription_subscriber_count_tooltip_subscriberCount" id="0x7f1000a6" />
+    <public type="plurals" name="premium_guild_subscriptions_renewal_info_quantity" id="0x7f1000a7" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_days" id="0x7f1000a8" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_days_hours" id="0x7f1000a9" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_hours" id="0x7f1000aa" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours_minutes" id="0x7f1000ab" />
+    <public type="plurals" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes_minutes" id="0x7f1000ac" />
+    <public type="plurals" name="premium_payment_plan_label_monthly_intervalCount" id="0x7f1000ad" />
+    <public type="plurals" name="premium_payment_plan_label_yearly_intervalCount" id="0x7f1000ae" />
+    <public type="plurals" name="premium_subscription_credit_count_months_count" id="0x7f1000af" />
+    <public type="plurals" name="publish_followed_news_fail_body_retryAfter" id="0x7f1000b0" />
+    <public type="plurals" name="reaction_tooltip_1_n_n" id="0x7f1000b1" />
+    <public type="plurals" name="reaction_tooltip_2_n_n" id="0x7f1000b2" />
+    <public type="plurals" name="reaction_tooltip_3_n_n" id="0x7f1000b3" />
+    <public type="plurals" name="reaction_tooltip_n_n" id="0x7f1000b4" />
+    <public type="plurals" name="roles_list_numRoles" id="0x7f1000b5" />
+    <public type="plurals" name="search_hide_blocked_messages_count" id="0x7f1000b6" />
+    <public type="plurals" name="search_num_results_blocked_not_shown_count" id="0x7f1000b7" />
+    <public type="plurals" name="search_still_indexing_hint_count" id="0x7f1000b8" />
+    <public type="plurals" name="spotify_listen_along_title_host_count" id="0x7f1000bb" />
+    <public type="plurals" name="total_results_count" id="0x7f1000bc" />
+    <public type="plurals" name="uploading_files_count" id="0x7f1000bd" />
+    <public type="plurals" name="user_activity_timestamp_end_hours" id="0x7f1000be" />
+    <public type="plurals" name="user_activity_timestamp_end_minutes" id="0x7f1000bf" />
+    <public type="plurals" name="user_activity_timestamp_end_seconds" id="0x7f1000c0" />
+    <public type="plurals" name="user_activity_timestamp_start_hours" id="0x7f1000c1" />
+    <public type="plurals" name="user_activity_timestamp_start_minutes" id="0x7f1000c2" />
+    <public type="plurals" name="user_activity_timestamp_start_seconds" id="0x7f1000c3" />
+    <public type="plurals" name="user_activity_user_playing_for_days_time" id="0x7f1000c4" />
+    <public type="plurals" name="user_activity_user_playing_for_hours_time" id="0x7f1000c5" />
+    <public type="plurals" name="user_activity_user_playing_for_minutes_time" id="0x7f1000c6" />
+    <public type="plurals" name="user_profile_mutual_friends_count" id="0x7f1000c7" />
+    <public type="plurals" name="user_profile_mutual_guilds_count" id="0x7f1000c8" />
+    <public type="plurals" name="voice_call_member_list_title_count" id="0x7f1000c9" />
+    <public type="plurals" name="APKTOOL_DUMMY_72" id="0x7f100072" />
     <public type="plurals" name="APKTOOL_DUMMY_85" id="0x7f100085" />
-    <public type="plurals" name="APKTOOL_DUMMY_b0" id="0x7f1000b0" />
-    <public type="plurals" name="APKTOOL_DUMMY_b1" id="0x7f1000b1" />
+    <public type="plurals" name="APKTOOL_DUMMY_b9" id="0x7f1000b9" />
+    <public type="plurals" name="APKTOOL_DUMMY_ba" id="0x7f1000ba" />
     <public type="raw" name="call_ringing" id="0x7f110000" />
     <public type="raw" name="emoji_1f004" id="0x7f110001" />
     <public type="raw" name="emoji_1f0cf" id="0x7f110002" />
@@ -8280,4442 +8368,4583 @@
     <public type="string" name="applications_and_connections" id="0x7f12026a" />
     <public type="string" name="applications_and_connections_body" id="0x7f12026b" />
     <public type="string" name="attach_files" id="0x7f12026c" />
-    <public type="string" name="attach_payment_source_prompt_option" id="0x7f12026d" />
-    <public type="string" name="attachment_camera" id="0x7f12026e" />
-    <public type="string" name="attachment_compressing" id="0x7f12026f" />
-    <public type="string" name="attachment_filename_unknown" id="0x7f120270" />
-    <public type="string" name="attachment_files" id="0x7f120271" />
-    <public type="string" name="attachment_load_failed" id="0x7f120272" />
-    <public type="string" name="attachment_photos" id="0x7f120273" />
-    <public type="string" name="attachment_processing" id="0x7f120274" />
-    <public type="string" name="attachments_keyboard" id="0x7f120275" />
-    <public type="string" name="attenuate_while_speaking_others" id="0x7f120276" />
-    <public type="string" name="attenuate_while_speaking_self" id="0x7f120277" />
-    <public type="string" name="audio_hint_body" id="0x7f120278" />
-    <public type="string" name="audio_hint_title" id="0x7f120279" />
-    <public type="string" name="auth_banned_invite_body" id="0x7f12027a" />
-    <public type="string" name="auth_browser_handoff_detecting_description" id="0x7f12027b" />
-    <public type="string" name="auth_disable_email_notifications_failure_body" id="0x7f12027c" />
-    <public type="string" name="auth_disable_email_notifications_failure_header" id="0x7f12027d" />
-    <public type="string" name="auth_disable_email_notifications_success_body" id="0x7f12027e" />
-    <public type="string" name="auth_disable_email_notifications_success_header" id="0x7f12027f" />
-    <public type="string" name="auth_expired_suggestion" id="0x7f120280" />
-    <public type="string" name="auth_invalid_invite_body" id="0x7f120281" />
-    <public type="string" name="auth_invalid_invite_tip" id="0x7f120282" />
-    <public type="string" name="auth_invalid_invite_title" id="0x7f120283" />
-    <public type="string" name="auth_ip_auth_succeeded_suggestion" id="0x7f120284" />
-    <public type="string" name="auth_login_body" id="0x7f120285" />
-    <public type="string" name="auth_message_invited_by" id="0x7f120286" />
-    <public type="string" name="auth_message_invited_to_stream" id="0x7f120287" />
-    <public type="string" name="auth_username_tooltip" id="0x7f120288" />
-    <public type="string" name="auth_verfication_expired_suggestion" id="0x7f120289" />
-    <public type="string" name="authorization" id="0x7f12028a" />
-    <public type="string" name="authorization_expired" id="0x7f12028b" />
-    <public type="string" name="authorization_expired_suggestion" id="0x7f12028c" />
-    <public type="string" name="authorize" id="0x7f12028d" />
-    <public type="string" name="authorized" id="0x7f12028e" />
-    <public type="string" name="authorized_apps" id="0x7f12028f" />
-    <public type="string" name="authorizing" id="0x7f120290" />
-    <public type="string" name="auto_toggle_streamer_mode_description" id="0x7f120291" />
-    <public type="string" name="auto_toggle_streamer_mode_label" id="0x7f120292" />
-    <public type="string" name="autocomplete_no_results_body" id="0x7f120293" />
-    <public type="string" name="autocomplete_no_results_header" id="0x7f120294" />
-    <public type="string" name="automatic_gain_control" id="0x7f120295" />
-    <public type="string" name="avatar_convert_failure_mobile" id="0x7f120296" />
-    <public type="string" name="avatar_size_option_large" id="0x7f120297" />
-    <public type="string" name="avatar_size_option_small" id="0x7f120298" />
-    <public type="string" name="back" id="0x7f120299" />
-    <public type="string" name="back_button_behavior_label_mobile" id="0x7f12029a" />
-    <public type="string" name="back_button_behavior_mobile" id="0x7f12029b" />
-    <public type="string" name="backspace" id="0x7f12029c" />
-    <public type="string" name="backup_codes_dash" id="0x7f12029d" />
-    <public type="string" name="ban" id="0x7f12029e" />
-    <public type="string" name="ban_confirm_title" id="0x7f12029f" />
-    <public type="string" name="ban_members" id="0x7f1202a0" />
-    <public type="string" name="ban_members_description" id="0x7f1202a1" />
-    <public type="string" name="ban_reason" id="0x7f1202a2" />
-    <public type="string" name="ban_user_body" id="0x7f1202a3" />
-    <public type="string" name="ban_user_confirmed" id="0x7f1202a4" />
-    <public type="string" name="ban_user_error_generic" id="0x7f1202a5" />
-    <public type="string" name="ban_user_title" id="0x7f1202a6" />
-    <public type="string" name="bans" id="0x7f1202a7" />
-    <public type="string" name="bans_header" id="0x7f1202a8" />
-    <public type="string" name="bans_hint" id="0x7f1202a9" />
-    <public type="string" name="bans_no_results" id="0x7f1202aa" />
-    <public type="string" name="bans_no_users_banned" id="0x7f1202ab" />
-    <public type="string" name="bans_search_placeholder" id="0x7f1202ac" />
-    <public type="string" name="beep_boop" id="0x7f1202ad" />
-    <public type="string" name="beginning_channel" id="0x7f1202ae" />
-    <public type="string" name="beginning_channel_no_history" id="0x7f1202af" />
-    <public type="string" name="beginning_chat" id="0x7f1202b0" />
-    <public type="string" name="beginning_chat_dm_mobile" id="0x7f1202b1" />
-    <public type="string" name="beginning_dm" id="0x7f1202b2" />
-    <public type="string" name="beginning_group_dm" id="0x7f1202b3" />
-    <public type="string" name="beginning_group_dm_managed" id="0x7f1202b4" />
-    <public type="string" name="beta" id="0x7f1202b5" />
-    <public type="string" name="bg" id="0x7f1202b6" />
-    <public type="string" name="billing" id="0x7f1202b7" />
-    <public type="string" name="billing_accept_terms_tooltip" id="0x7f1202b8" />
-    <public type="string" name="billing_account_credit" id="0x7f1202b9" />
-    <public type="string" name="billing_account_credit_plan_months_free" id="0x7f1202ba" />
-    <public type="string" name="billing_add_payment_method" id="0x7f1202bb" />
-    <public type="string" name="billing_address" id="0x7f1202bc" />
-    <public type="string" name="billing_address_address" id="0x7f1202bd" />
-    <public type="string" name="billing_address_address2" id="0x7f1202be" />
-    <public type="string" name="billing_address_address2_placeholder" id="0x7f1202bf" />
-    <public type="string" name="billing_address_address_error_required" id="0x7f1202c0" />
-    <public type="string" name="billing_address_address_placeholder" id="0x7f1202c1" />
-    <public type="string" name="billing_address_city" id="0x7f1202c2" />
-    <public type="string" name="billing_address_city_error_required" id="0x7f1202c3" />
-    <public type="string" name="billing_address_city_placeholder" id="0x7f1202c4" />
-    <public type="string" name="billing_address_country" id="0x7f1202c5" />
-    <public type="string" name="billing_address_country_error_required" id="0x7f1202c6" />
-    <public type="string" name="billing_address_name" id="0x7f1202c7" />
-    <public type="string" name="billing_address_name_error_required" id="0x7f1202c8" />
-    <public type="string" name="billing_address_postal_code" id="0x7f1202c9" />
-    <public type="string" name="billing_address_postal_code_canada_placeholder" id="0x7f1202ca" />
-    <public type="string" name="billing_address_postal_code_error_required" id="0x7f1202cb" />
-    <public type="string" name="billing_address_province" id="0x7f1202cc" />
-    <public type="string" name="billing_address_province_error_required" id="0x7f1202cd" />
-    <public type="string" name="billing_address_region" id="0x7f1202ce" />
-    <public type="string" name="billing_address_state" id="0x7f1202cf" />
-    <public type="string" name="billing_address_state_error_required" id="0x7f1202d0" />
-    <public type="string" name="billing_address_zip_code" id="0x7f1202d1" />
-    <public type="string" name="billing_address_zip_code_error_length" id="0x7f1202d2" />
-    <public type="string" name="billing_address_zip_code_error_required" id="0x7f1202d3" />
-    <public type="string" name="billing_address_zip_code_invalid" id="0x7f1202d4" />
-    <public type="string" name="billing_address_zip_code_placeholder" id="0x7f1202d5" />
-    <public type="string" name="billing_apple_description" id="0x7f1202d6" />
-    <public type="string" name="billing_apple_header" id="0x7f1202d7" />
-    <public type="string" name="billing_application_consumable_refund_text_unable" id="0x7f1202d8" />
-    <public type="string" name="billing_application_refund_text" id="0x7f1202d9" />
-    <public type="string" name="billing_application_refund_text_unable" id="0x7f1202da" />
-    <public type="string" name="billing_change_payment_source" id="0x7f1202db" />
-    <public type="string" name="billing_code_redemption_redirect" id="0x7f1202dc" />
-    <public type="string" name="billing_error_add_payment_source_streamer_mode" id="0x7f1202dd" />
-    <public type="string" name="billing_error_gateway" id="0x7f1202de" />
-    <public type="string" name="billing_error_rate_limit" id="0x7f1202df" />
-    <public type="string" name="billing_error_section_address" id="0x7f1202e0" />
-    <public type="string" name="billing_error_section_card" id="0x7f1202e1" />
-    <public type="string" name="billing_gift_copied" id="0x7f1202e2" />
-    <public type="string" name="billing_gift_link" id="0x7f1202e3" />
-    <public type="string" name="billing_gift_purchase_tooltip" id="0x7f1202e4" />
-    <public type="string" name="billing_gift_refund_text" id="0x7f1202e5" />
-    <public type="string" name="billing_gift_refund_text_unable" id="0x7f1202e6" />
-    <public type="string" name="billing_history" id="0x7f1202e7" />
-    <public type="string" name="billing_is_gift_purchase" id="0x7f1202e8" />
-    <public type="string" name="billing_legal_mumbo_jumbo" id="0x7f1202e9" />
-    <public type="string" name="billing_legal_mumbo_jumbo_label" id="0x7f1202ea" />
-    <public type="string" name="billing_manage_billing" id="0x7f1202eb" />
-    <public type="string" name="billing_manage_subscription" id="0x7f1202ec" />
-    <public type="string" name="billing_managed_by_apple" id="0x7f1202ed" />
-    <public type="string" name="billing_no_payment_method" id="0x7f1202ee" />
-    <public type="string" name="billing_no_payment_method_description" id="0x7f1202ef" />
-    <public type="string" name="billing_pay_for_it_with" id="0x7f1202f0" />
-    <public type="string" name="billing_payment_breakdown_taxes" id="0x7f1202f1" />
-    <public type="string" name="billing_payment_breakdown_total" id="0x7f1202f2" />
-    <public type="string" name="billing_payment_choose_gift" id="0x7f1202f3" />
-    <public type="string" name="billing_payment_choose_plan" id="0x7f1202f4" />
-    <public type="string" name="billing_payment_history" id="0x7f1202f5" />
-    <public type="string" name="billing_payment_premium" id="0x7f1202f6" />
-    <public type="string" name="billing_payment_premium_legalese_monthly" id="0x7f1202f7" />
-    <public type="string" name="billing_payment_premium_legalese_yearly" id="0x7f1202f8" />
-    <public type="string" name="billing_payment_source_invalid" id="0x7f1202f9" />
-    <public type="string" name="billing_payment_sources" id="0x7f1202fa" />
-    <public type="string" name="billing_payment_table_header_amount" id="0x7f1202fb" />
-    <public type="string" name="billing_payment_table_header_date" id="0x7f1202fc" />
-    <public type="string" name="billing_payment_table_header_description" id="0x7f1202fd" />
-    <public type="string" name="billing_premium_gift_friend" id="0x7f1202fe" />
-    <public type="string" name="billing_premium_gift_month" id="0x7f1202ff" />
-    <public type="string" name="billing_premium_gift_month_mobile" id="0x7f120300" />
-    <public type="string" name="billing_premium_gift_year" id="0x7f120301" />
-    <public type="string" name="billing_premium_gift_year_mobile" id="0x7f120302" />
-    <public type="string" name="billing_premium_refund_text" id="0x7f120303" />
-    <public type="string" name="billing_premium_refund_text_unable" id="0x7f120304" />
-    <public type="string" name="billing_preorder_refund_text" id="0x7f120305" />
-    <public type="string" name="billing_price_per_month" id="0x7f120306" />
-    <public type="string" name="billing_price_per_month_current_plan" id="0x7f120307" />
-    <public type="string" name="billing_price_per_month_current_plan_ios" id="0x7f120308" />
-    <public type="string" name="billing_price_per_month_mobile" id="0x7f120309" />
-    <public type="string" name="billing_price_per_month_upgrade" id="0x7f12030a" />
-    <public type="string" name="billing_price_per_year" id="0x7f12030b" />
-    <public type="string" name="billing_price_per_year_current_plan" id="0x7f12030c" />
-    <public type="string" name="billing_price_per_year_current_plan_ios" id="0x7f12030d" />
-    <public type="string" name="billing_price_per_year_mobile" id="0x7f12030e" />
-    <public type="string" name="billing_price_per_year_months_free" id="0x7f12030f" />
-    <public type="string" name="billing_price_per_year_upgrade" id="0x7f120310" />
-    <public type="string" name="billing_purchase_details_header" id="0x7f120311" />
-    <public type="string" name="billing_refund_header" id="0x7f120312" />
-    <public type="string" name="billing_refund_play_time_never_played" id="0x7f120313" />
-    <public type="string" name="billing_refund_play_time_subheader" id="0x7f120314" />
-    <public type="string" name="billing_refund_purchase_date" id="0x7f120315" />
-    <public type="string" name="billing_refund_purchase_date_subheader" id="0x7f120316" />
-    <public type="string" name="billing_refund_release_date_subheader" id="0x7f120317" />
-    <public type="string" name="billing_refund_report_a_problem" id="0x7f120318" />
-    <public type="string" name="billing_refund_request_button" id="0x7f120319" />
-    <public type="string" name="billing_sales_tax_added" id="0x7f12031a" />
-    <public type="string" name="billing_sales_tax_included" id="0x7f12031b" />
-    <public type="string" name="billing_secure_tooltip" id="0x7f12031c" />
-    <public type="string" name="billing_step_address" id="0x7f12031d" />
-    <public type="string" name="billing_step_awaiting_authentication" id="0x7f12031e" />
-    <public type="string" name="billing_step_credit_card_information" id="0x7f12031f" />
-    <public type="string" name="billing_step_payment_info" id="0x7f120320" />
-    <public type="string" name="billing_step_payment_type" id="0x7f120321" />
-    <public type="string" name="billing_step_paypal" id="0x7f120322" />
-    <public type="string" name="billing_step_review" id="0x7f120323" />
-    <public type="string" name="billing_step_select_plan" id="0x7f120324" />
-    <public type="string" name="billing_subscribe" id="0x7f120325" />
-    <public type="string" name="billing_tag_failed" id="0x7f120326" />
-    <public type="string" name="billing_tag_pending" id="0x7f120327" />
-    <public type="string" name="billing_tag_refunded" id="0x7f120328" />
-    <public type="string" name="billing_tag_reversed" id="0x7f120329" />
-    <public type="string" name="billing_third_party_eula_label" id="0x7f12032a" />
-    <public type="string" name="block" id="0x7f12032b" />
-    <public type="string" name="blocked" id="0x7f12032c" />
-    <public type="string" name="blocked_messages" id="0x7f12032d" />
-    <public type="string" name="blue" id="0x7f12032e" />
-    <public type="string" name="bot_call_idle_disconnect" id="0x7f12032f" />
-    <public type="string" name="bot_dm_explicit_content" id="0x7f120330" />
-    <public type="string" name="bot_dm_rate_limited" id="0x7f120331" />
-    <public type="string" name="bot_dm_send_failed" id="0x7f120332" />
-    <public type="string" name="bot_dm_send_message_temporarily_disabled" id="0x7f120333" />
-    <public type="string" name="bot_gdm_explicit_content" id="0x7f120334" />
-    <public type="string" name="bot_guild_explicit_content" id="0x7f120335" />
-    <public type="string" name="bot_requires_email_verification" id="0x7f120336" />
-    <public type="string" name="bot_tag" id="0x7f120337" />
-    <public type="string" name="bot_tag_bot" id="0x7f120338" />
-    <public type="string" name="bot_tag_server" id="0x7f120339" />
-    <public type="string" name="bot_video_disabled" id="0x7f12033a" />
-    <public type="string" name="bots" id="0x7f12033b" />
-    <public type="string" name="bots_settings_add" id="0x7f12033c" />
-    <public type="string" name="bots_settings_description" id="0x7f12033d" />
-    <public type="string" name="bots_settings_learn_more" id="0x7f12033e" />
-    <public type="string" name="bots_settings_remove" id="0x7f12033f" />
-    <public type="string" name="bottom_sheet_behavior" id="0x7f120340" />
-    <public type="string" name="brown" id="0x7f120341" />
-    <public type="string" name="browser_app" id="0x7f120342" />
-    <public type="string" name="browser_chrome" id="0x7f120343" />
-    <public type="string" name="browser_firefox" id="0x7f120344" />
-    <public type="string" name="browser_handoff_authenticating_description" id="0x7f120345" />
-    <public type="string" name="browser_handoff_authenticating_title" id="0x7f120346" />
-    <public type="string" name="browser_handoff_detecting_description" id="0x7f120347" />
-    <public type="string" name="browser_handoff_detecting_title" id="0x7f120348" />
-    <public type="string" name="browser_handoff_done_description" id="0x7f120349" />
-    <public type="string" name="browser_handoff_done_safe_to_close" id="0x7f12034a" />
-    <public type="string" name="browser_handoff_done_title" id="0x7f12034b" />
-    <public type="string" name="browser_handoff_failed_title" id="0x7f12034c" />
-    <public type="string" name="browser_handoff_success_action" id="0x7f12034d" />
-    <public type="string" name="browser_handoff_success_body" id="0x7f12034e" />
-    <public type="string" name="browser_handoff_success_cancel" id="0x7f12034f" />
-    <public type="string" name="browser_handoff_success_title" id="0x7f120350" />
-    <public type="string" name="browser_input_device_warning" id="0x7f120351" />
-    <public type="string" name="browser_not_supported" id="0x7f120352" />
-    <public type="string" name="browser_notifications_enabled_body" id="0x7f120353" />
-    <public type="string" name="browser_opera" id="0x7f120354" />
-    <public type="string" name="browser_output_device_warning" id="0x7f120355" />
-    <public type="string" name="bug_hunter_badge_tooltip" id="0x7f120356" />
-    <public type="string" name="build_override" id="0x7f120357" />
-    <public type="string" name="build_override_apply" id="0x7f120358" />
-    <public type="string" name="build_override_clear" id="0x7f120359" />
-    <public type="string" name="build_override_expired" id="0x7f12035a" />
-    <public type="string" name="build_override_for" id="0x7f12035b" />
-    <public type="string" name="build_override_id" id="0x7f12035c" />
-    <public type="string" name="build_override_incompatible_client" id="0x7f12035d" />
-    <public type="string" name="build_override_invalid" id="0x7f12035e" />
-    <public type="string" name="build_override_invalid_user" id="0x7f12035f" />
-    <public type="string" name="build_override_isnt_available" id="0x7f120360" />
-    <public type="string" name="build_override_link_copied" id="0x7f120361" />
-    <public type="string" name="build_override_link_copy" id="0x7f120362" />
-    <public type="string" name="bundle_ready_body" id="0x7f120363" />
-    <public type="string" name="bundle_ready_later" id="0x7f120364" />
-    <public type="string" name="bundle_ready_restart" id="0x7f120365" />
-    <public type="string" name="bundle_ready_title" id="0x7f120366" />
-    <public type="string" name="burgundy" id="0x7f120367" />
-    <public type="string" name="cache_cleared" id="0x7f120368" />
-    <public type="string" name="call" id="0x7f120369" />
-    <public type="string" name="call_invite_not_friends" id="0x7f12036a" />
-    <public type="string" name="call_options" id="0x7f12036b" />
-    <public type="string" name="call_unavailable" id="0x7f12036c" />
-    <public type="string" name="call_user" id="0x7f12036d" />
-    <public type="string" name="camera_enable_access" id="0x7f12036e" />
-    <public type="string" name="camera_intent_result_error" id="0x7f12036f" />
-    <public type="string" name="camera_no_access" id="0x7f120370" />
-    <public type="string" name="camera_no_device" id="0x7f120371" />
-    <public type="string" name="camera_not_enabled" id="0x7f120372" />
-    <public type="string" name="camera_off" id="0x7f120373" />
-    <public type="string" name="camera_on" id="0x7f120374" />
-    <public type="string" name="camera_permission_denied_msg" id="0x7f120375" />
-    <public type="string" name="camera_roll" id="0x7f120376" />
-    <public type="string" name="camera_switch" id="0x7f120377" />
-    <public type="string" name="camera_switched" id="0x7f120378" />
-    <public type="string" name="camera_unavailable" id="0x7f120379" />
-    <public type="string" name="camera_unknown_error" id="0x7f12037a" />
-    <public type="string" name="cancel" id="0x7f12037b" />
-    <public type="string" name="cannot_deny_missing_permission" id="0x7f12037c" />
-    <public type="string" name="cannot_deny_self_simple" id="0x7f12037d" />
-    <public type="string" name="cannot_deny_singular_permission" id="0x7f12037e" />
-    <public type="string" name="cannot_manage_higher_rank" id="0x7f12037f" />
-    <public type="string" name="cannot_manage_is_owner" id="0x7f120380" />
-    <public type="string" name="cannot_manage_same_rank" id="0x7f120381" />
-    <public type="string" name="captcha" id="0x7f120382" />
-    <public type="string" name="captcha_failed" id="0x7f120383" />
-    <public type="string" name="captcha_failed_play_services" id="0x7f120384" />
-    <public type="string" name="captcha_failed_unsupported" id="0x7f120385" />
-    <public type="string" name="captcha_issues" id="0x7f120386" />
-    <public type="string" name="captcha_open_browser" id="0x7f120387" />
-    <public type="string" name="captcha_problems" id="0x7f120388" />
-    <public type="string" name="captcha_problems_info" id="0x7f120389" />
-    <public type="string" name="categories" id="0x7f12038a" />
-    <public type="string" name="category" id="0x7f12038b" />
-    <public type="string" name="category_has_been_deleted" id="0x7f12038c" />
-    <public type="string" name="category_name" id="0x7f12038d" />
-    <public type="string" name="category_settings" id="0x7f12038e" />
-    <public type="string" name="category_settings_have_been_updated" id="0x7f12038f" />
-    <public type="string" name="certified" id="0x7f120390" />
-    <public type="string" name="certified_device_recommendation_audio_input_and_output_body" id="0x7f120391" />
-    <public type="string" name="certified_device_recommendation_audio_input_body" id="0x7f120392" />
-    <public type="string" name="certified_device_recommendation_audio_output_body" id="0x7f120393" />
-    <public type="string" name="certified_device_recommendation_cancel" id="0x7f120394" />
-    <public type="string" name="certified_device_recommendation_confirm" id="0x7f120395" />
-    <public type="string" name="certified_device_recommendation_title" id="0x7f120396" />
-    <public type="string" name="certified_device_recommendation_video_input_body" id="0x7f120397" />
-    <public type="string" name="change" id="0x7f120398" />
-    <public type="string" name="change_avatar" id="0x7f120399" />
-    <public type="string" name="change_banner" id="0x7f12039a" />
-    <public type="string" name="change_category" id="0x7f12039b" />
-    <public type="string" name="change_email" id="0x7f12039c" />
-    <public type="string" name="change_email_short" id="0x7f12039d" />
-    <public type="string" name="change_icon" id="0x7f12039e" />
-    <public type="string" name="change_log" id="0x7f12039f" />
-    <public type="string" name="change_log_md_body" id="0x7f1203a0" />
-    <public type="string" name="change_log_md_date" id="0x7f1203a1" />
-    <public type="string" name="change_log_md_revision" id="0x7f1203a3" />
-    <public type="string" name="change_log_md_video" id="0x7f1203a4" />
-    <public type="string" name="change_nickname" id="0x7f1203a5" />
-    <public type="string" name="change_nickname_description" id="0x7f1203a6" />
-    <public type="string" name="change_nickname_warning" id="0x7f1203a7" />
-    <public type="string" name="change_password" id="0x7f1203a8" />
-    <public type="string" name="change_password_link" id="0x7f1203a9" />
-    <public type="string" name="change_phone_number" id="0x7f1203aa" />
-    <public type="string" name="change_plan" id="0x7f1203ab" />
-    <public type="string" name="change_splash" id="0x7f1203ac" />
-    <public type="string" name="change_url" id="0x7f1203ad" />
-    <public type="string" name="change_vanity_url" id="0x7f1203ae" />
-    <public type="string" name="change_vanity_url_error" id="0x7f1203af" />
-    <public type="string" name="channel" id="0x7f1203b0" />
-    <public type="string" name="channel_has_been_deleted" id="0x7f1203b1" />
-    <public type="string" name="channel_locked" id="0x7f1203b2" />
-    <public type="string" name="channel_locked_short" id="0x7f1203b3" />
-    <public type="string" name="channel_locked_to_category" id="0x7f1203b4" />
-    <public type="string" name="channel_members" id="0x7f1203b5" />
-    <public type="string" name="channel_mute_role_description" id="0x7f1203b6" />
-    <public type="string" name="channel_mute_tooltip" id="0x7f1203b7" />
-    <public type="string" name="channel_name_required" id="0x7f1203b8" />
-    <public type="string" name="channel_or_category" id="0x7f1203b9" />
-    <public type="string" name="channel_order_updated" id="0x7f1203ba" />
-    <public type="string" name="channel_permissions" id="0x7f1203bb" />
-    <public type="string" name="channel_select" id="0x7f1203bc" />
-    <public type="string" name="channel_settings" id="0x7f1203bd" />
-    <public type="string" name="channel_settings_have_been_updated" id="0x7f1203be" />
-    <public type="string" name="channel_slowmode_cooldown" id="0x7f1203bf" />
-    <public type="string" name="channel_slowmode_desc" id="0x7f1203c0" />
-    <public type="string" name="channel_slowmode_desc_hours" id="0x7f1203c1" />
-    <public type="string" name="channel_slowmode_desc_immune" id="0x7f1203c2" />
-    <public type="string" name="channel_slowmode_desc_minutes" id="0x7f1203c3" />
-    <public type="string" name="channel_slowmode_desc_short" id="0x7f1203c4" />
-    <public type="string" name="channel_topic_empty" id="0x7f1203c5" />
-    <public type="string" name="channel_type" id="0x7f1203c6" />
-    <public type="string" name="channel_unmute_tooltip" id="0x7f1203c7" />
-    <public type="string" name="channels" id="0x7f1203c8" />
-    <public type="string" name="channels_unavailable_body" id="0x7f1203c9" />
-    <public type="string" name="channels_unavailable_title" id="0x7f1203ca" />
-    <public type="string" name="character_counter_content_description" id="0x7f1203cb" />
-    <public type="string" name="character_counter_pattern" id="0x7f1203cc" />
-    <public type="string" name="chat" id="0x7f1203cd" />
-    <public type="string" name="chat_attach_invite_to_listen" id="0x7f1203ce" />
-    <public type="string" name="chat_attach_invite_to_play_game" id="0x7f1203cf" />
-    <public type="string" name="chat_attach_invite_to_spectate_game" id="0x7f1203d0" />
-    <public type="string" name="chat_attach_invite_to_watch" id="0x7f1203d1" />
-    <public type="string" name="chat_attach_upload_a_file" id="0x7f1203d2" />
-    <public type="string" name="chat_attach_upload_or_invite" id="0x7f1203d3" />
-    <public type="string" name="chat_behavior" id="0x7f1203d4" />
-    <public type="string" name="chatters_description" id="0x7f1203d5" />
-    <public type="string" name="checking_for_updates" id="0x7f1203d6" />
-    <public type="string" name="choose" id="0x7f1203d7" />
-    <public type="string" name="choose_an_application" id="0x7f1203d8" />
-    <public type="string" name="claim_account" id="0x7f1203d9" />
-    <public type="string" name="claim_account_body" id="0x7f1203da" />
-    <public type="string" name="claim_account_email_to" id="0x7f1203db" />
-    <public type="string" name="claim_account_get_app" id="0x7f1203dc" />
-    <public type="string" name="claim_account_promote_app" id="0x7f1203dd" />
-    <public type="string" name="claim_account_required_body" id="0x7f1203de" />
-    <public type="string" name="claim_account_required_email_to" id="0x7f1203df" />
-    <public type="string" name="clear_attachments" id="0x7f1203e0" />
-    <public type="string" name="clear_cache" id="0x7f1203e1" />
-    <public type="string" name="clone_channel" id="0x7f1203e2" />
-    <public type="string" name="clone_channel_help" id="0x7f1203e3" />
-    <public type="string" name="close" id="0x7f1203e4" />
-    <public type="string" name="close_action_sheet" id="0x7f1203e5" />
-    <public type="string" name="close_dm" id="0x7f1203e6" />
-    <public type="string" name="close_drawer" id="0x7f1203e7" />
-    <public type="string" name="close_stream" id="0x7f1203e8" />
-    <public type="string" name="close_window" id="0x7f1203e9" />
-    <public type="string" name="cloud_sync_icon_tooltip_done" id="0x7f1203ea" />
-    <public type="string" name="cloud_sync_icon_tooltip_planning" id="0x7f1203eb" />
-    <public type="string" name="cloud_sync_icon_tooltip_preparing" id="0x7f1203ec" />
-    <public type="string" name="cloud_sync_icon_tooltip_pulling" id="0x7f1203ed" />
-    <public type="string" name="cloud_sync_icon_tooltip_pushing" id="0x7f1203ee" />
-    <public type="string" name="cloud_sync_icon_tooltip_supported" id="0x7f1203ef" />
-    <public type="string" name="cloud_sync_modal_conflict_choice_download" id="0x7f1203f0" />
-    <public type="string" name="cloud_sync_modal_conflict_choice_upload" id="0x7f1203f1" />
-    <public type="string" name="cloud_sync_modal_conflict_description" id="0x7f1203f2" />
-    <public type="string" name="cloud_sync_modal_conflict_header" id="0x7f1203f3" />
-    <public type="string" name="cloud_sync_modal_conflict_last_modified" id="0x7f1203f4" />
-    <public type="string" name="cloud_sync_modal_error_description" id="0x7f1203f5" />
-    <public type="string" name="cloud_sync_modal_error_header" id="0x7f1203f6" />
-    <public type="string" name="cloud_sync_modal_or" id="0x7f1203f7" />
-    <public type="string" name="collapse_category" id="0x7f1203f8" />
-    <public type="string" name="com.crashlytics.android.build_id" id="0x7f1203f9" />
-    <public type="string" name="coming_soon" id="0x7f1203fa" />
-    <public type="string" name="coming_soon_notifications" id="0x7f1203fb" />
-    <public type="string" name="coming_soon_title" id="0x7f1203fc" />
-    <public type="string" name="command_giphy_description" id="0x7f1203fd" />
-    <public type="string" name="command_me_description" id="0x7f1203fe" />
-    <public type="string" name="command_nick_description" id="0x7f1203ff" />
-    <public type="string" name="command_nick_failure" id="0x7f120400" />
-    <public type="string" name="command_nick_failure_permission" id="0x7f120401" />
-    <public type="string" name="command_nick_reset" id="0x7f120402" />
-    <public type="string" name="command_nick_success" id="0x7f120403" />
-    <public type="string" name="command_shrug_description" id="0x7f120404" />
-    <public type="string" name="command_spoiler_description" id="0x7f120405" />
-    <public type="string" name="command_tableflip_description" id="0x7f120406" />
-    <public type="string" name="command_tableunflip_description" id="0x7f120407" />
-    <public type="string" name="command_tts_description" id="0x7f120408" />
-    <public type="string" name="commands" id="0x7f120409" />
-    <public type="string" name="commands_matching" id="0x7f12040a" />
-    <public type="string" name="common_google_play_services_enable_button" id="0x7f12040b" />
-    <public type="string" name="common_google_play_services_enable_text" id="0x7f12040c" />
-    <public type="string" name="common_google_play_services_enable_title" id="0x7f12040d" />
-    <public type="string" name="common_google_play_services_install_button" id="0x7f12040e" />
-    <public type="string" name="common_google_play_services_install_text" id="0x7f12040f" />
-    <public type="string" name="common_google_play_services_install_title" id="0x7f120410" />
-    <public type="string" name="common_google_play_services_notification_channel_name" id="0x7f120411" />
-    <public type="string" name="common_google_play_services_notification_ticker" id="0x7f120412" />
-    <public type="string" name="common_google_play_services_unknown_issue" id="0x7f120413" />
-    <public type="string" name="common_google_play_services_unsupported_text" id="0x7f120414" />
-    <public type="string" name="common_google_play_services_update_button" id="0x7f120415" />
-    <public type="string" name="common_google_play_services_update_text" id="0x7f120416" />
-    <public type="string" name="common_google_play_services_update_title" id="0x7f120417" />
-    <public type="string" name="common_google_play_services_updating_text" id="0x7f120418" />
-    <public type="string" name="common_google_play_services_wear_update_text" id="0x7f120419" />
-    <public type="string" name="common_open_on_phone" id="0x7f12041a" />
-    <public type="string" name="common_signin_button_text" id="0x7f12041b" />
-    <public type="string" name="common_signin_button_text_long" id="0x7f12041c" />
-    <public type="string" name="communicators" id="0x7f12041d" />
-    <public type="string" name="compact_mode" id="0x7f12041e" />
-    <public type="string" name="completed" id="0x7f12041f" />
-    <public type="string" name="configure" id="0x7f120420" />
-    <public type="string" name="confirm" id="0x7f120421" />
-    <public type="string" name="confirm_channel_drag_title" id="0x7f120422" />
-    <public type="string" name="confirm_disable_silence_body" id="0x7f120423" />
-    <public type="string" name="confirm_disable_silence_dont_show" id="0x7f120424" />
-    <public type="string" name="confirm_disable_silence_title" id="0x7f120425" />
-    <public type="string" name="confirm_user_block_body" id="0x7f120426" />
-    <public type="string" name="confirm_user_block_title" id="0x7f120427" />
-    <public type="string" name="connect" id="0x7f120428" />
-    <public type="string" name="connect_account_description" id="0x7f120429" />
-    <public type="string" name="connect_account_title" id="0x7f12042a" />
-    <public type="string" name="connect_to_video" id="0x7f12042b" />
-    <public type="string" name="connect_to_voice" id="0x7f12042c" />
-    <public type="string" name="connect_voice_only" id="0x7f12042d" />
-    <public type="string" name="connect_with_discord" id="0x7f12042e" />
-    <public type="string" name="connected_account_revoked" id="0x7f12042f" />
-    <public type="string" name="connected_account_verify_failure" id="0x7f120430" />
-    <public type="string" name="connected_account_verify_success" id="0x7f120431" />
-    <public type="string" name="connected_account_verifying" id="0x7f120432" />
-    <public type="string" name="connected_accounts" id="0x7f120433" />
-    <public type="string" name="connected_accounts_none" id="0x7f120434" />
-    <public type="string" name="connected_accounts_none_title" id="0x7f120435" />
-    <public type="string" name="connected_device_detected_cancel_button" id="0x7f120436" />
-    <public type="string" name="connected_device_detected_confirm_button" id="0x7f120437" />
-    <public type="string" name="connected_device_detected_input_and_output_body" id="0x7f120438" />
-    <public type="string" name="connected_device_detected_input_body" id="0x7f120439" />
-    <public type="string" name="connected_device_detected_option_input" id="0x7f12043a" />
-    <public type="string" name="connected_device_detected_option_input_and_output" id="0x7f12043b" />
-    <public type="string" name="connected_device_detected_option_output" id="0x7f12043c" />
-    <public type="string" name="connected_device_detected_output_body" id="0x7f12043d" />
-    <public type="string" name="connected_device_detected_title" id="0x7f12043e" />
-    <public type="string" name="connected_on_another_client" id="0x7f12043f" />
-    <public type="string" name="connecting" id="0x7f120440" />
-    <public type="string" name="connecting_problems_cta" id="0x7f120441" />
-    <public type="string" name="connection_enter_code" id="0x7f120442" />
-    <public type="string" name="connection_invalid_pin" id="0x7f120443" />
-    <public type="string" name="connection_login_with" id="0x7f120444" />
-    <public type="string" name="connection_problems_body" id="0x7f120445" />
-    <public type="string" name="connection_status_authenticating" id="0x7f120446" />
-    <public type="string" name="connection_status_awaiting_endpoint" id="0x7f120447" />
-    <public type="string" name="connection_status_connected" id="0x7f120448" />
-    <public type="string" name="connection_status_connecting" id="0x7f120449" />
-    <public type="string" name="connection_status_disconnected" id="0x7f12044a" />
-    <public type="string" name="connection_status_ice_checking" id="0x7f12044b" />
-    <public type="string" name="connection_status_no_route" id="0x7f12044c" />
-    <public type="string" name="connection_status_rtc_connecting" id="0x7f12044d" />
-    <public type="string" name="connection_status_rtc_disconnected" id="0x7f12044e" />
-    <public type="string" name="connection_status_stream_connected" id="0x7f12044f" />
-    <public type="string" name="connection_status_video_connected" id="0x7f120450" />
-    <public type="string" name="connection_status_voice_connected" id="0x7f120451" />
-    <public type="string" name="connection_verified" id="0x7f120452" />
-    <public type="string" name="connections" id="0x7f120453" />
-    <public type="string" name="content_matching" id="0x7f120454" />
-    <public type="string" name="context_menu_hint" id="0x7f120455" />
-    <public type="string" name="continue_to_webapp" id="0x7f120456" />
-    <public type="string" name="control_volume" id="0x7f120457" />
-    <public type="string" name="convert_emoticons" id="0x7f120458" />
-    <public type="string" name="convert_emoticons_help" id="0x7f120459" />
-    <public type="string" name="copied" id="0x7f12045a" />
-    <public type="string" name="copied_text" id="0x7f12045b" />
-    <public type="string" name="copy" id="0x7f12045c" />
-    <public type="string" name="copy_channel_topic" id="0x7f12045d" />
-    <public type="string" name="copy_code" id="0x7f12045e" />
-    <public type="string" name="copy_id" id="0x7f12045f" />
-    <public type="string" name="copy_image_url" id="0x7f120460" />
-    <public type="string" name="copy_link" id="0x7f120461" />
-    <public type="string" name="copy_message_link" id="0x7f120462" />
-    <public type="string" name="copy_owner_id" id="0x7f120463" />
-    <public type="string" name="copy_text" id="0x7f120464" />
-    <public type="string" name="copy_username" id="0x7f120465" />
-    <public type="string" name="country_codes" id="0x7f120466" />
-    <public type="string" name="country_no_results" id="0x7f120467" />
-    <public type="string" name="cozy_mode" id="0x7f120468" />
-    <public type="string" name="crash_app_version" id="0x7f120469" />
-    <public type="string" name="crash_bummer_man" id="0x7f12046a" />
-    <public type="string" name="crash_details" id="0x7f12046b" />
-    <public type="string" name="crash_device" id="0x7f12046c" />
-    <public type="string" name="crash_device_version" id="0x7f12046d" />
-    <public type="string" name="crash_disclaimer" id="0x7f12046e" />
-    <public type="string" name="crash_source" id="0x7f12046f" />
-    <public type="string" name="crash_testers_invite" id="0x7f120470" />
-    <public type="string" name="crash_timestamp" id="0x7f120471" />
-    <public type="string" name="crash_unexpected" id="0x7f120472" />
-    <public type="string" name="create" id="0x7f120473" />
-    <public type="string" name="create_category" id="0x7f120474" />
-    <public type="string" name="create_channel" id="0x7f120475" />
-    <public type="string" name="create_friend_dm" id="0x7f120476" />
-    <public type="string" name="create_group_dm" id="0x7f120477" />
-    <public type="string" name="create_instant_invite" id="0x7f120478" />
-    <public type="string" name="create_lfg_listings_channel" id="0x7f120479" />
-    <public type="string" name="create_link" id="0x7f12047a" />
-    <public type="string" name="create_listings" id="0x7f12047b" />
-    <public type="string" name="create_news_channel" id="0x7f12047c" />
-    <public type="string" name="create_or_join_modal_header" id="0x7f12047d" />
-    <public type="string" name="create_server_button_body" id="0x7f12047e" />
-    <public type="string" name="create_server_button_cta" id="0x7f12047f" />
-    <public type="string" name="create_server_button_cta_mobile" id="0x7f120480" />
-    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7f120481" />
-    <public type="string" name="create_server_description" id="0x7f120482" />
-    <public type="string" name="create_server_description_mobile" id="0x7f120483" />
-    <public type="string" name="create_server_guidelines" id="0x7f120484" />
-    <public type="string" name="create_server_title" id="0x7f120485" />
-    <public type="string" name="create_store_channel" id="0x7f120486" />
-    <public type="string" name="create_store_channel_application" id="0x7f120487" />
-    <public type="string" name="create_store_channel_beta_note" id="0x7f120488" />
-    <public type="string" name="create_store_channel_beta_title" id="0x7f120489" />
-    <public type="string" name="create_store_channel_branch" id="0x7f12048a" />
-    <public type="string" name="create_store_channel_no_branches" id="0x7f12048b" />
-    <public type="string" name="create_store_channel_no_skus" id="0x7f12048c" />
-    <public type="string" name="create_store_channel_no_skus_error" id="0x7f12048d" />
-    <public type="string" name="create_store_channel_select_application" id="0x7f12048e" />
-    <public type="string" name="create_store_channel_select_branch" id="0x7f12048f" />
-    <public type="string" name="create_store_channel_select_sku" id="0x7f120490" />
-    <public type="string" name="create_store_channel_sku" id="0x7f120491" />
-    <public type="string" name="create_text_channel" id="0x7f120492" />
-    <public type="string" name="create_voice_channel" id="0x7f120493" />
-    <public type="string" name="credit_card_cvc" id="0x7f120494" />
-    <public type="string" name="credit_card_error_expiration" id="0x7f120495" />
-    <public type="string" name="credit_card_error_number" id="0x7f120496" />
-    <public type="string" name="credit_card_error_required" id="0x7f120497" />
-    <public type="string" name="credit_card_error_security_code" id="0x7f120498" />
-    <public type="string" name="credit_card_error_zip_code" id="0x7f120499" />
-    <public type="string" name="credit_card_expiration_date" id="0x7f12049a" />
-    <public type="string" name="credit_card_expiration_date_placeholder" id="0x7f12049b" />
-    <public type="string" name="credit_card_name" id="0x7f12049c" />
-    <public type="string" name="credit_card_name_on_card" id="0x7f12049d" />
-    <public type="string" name="credit_card_number" id="0x7f12049e" />
-    <public type="string" name="credit_card_security_code" id="0x7f12049f" />
-    <public type="string" name="crop" id="0x7f1204a0" />
-    <public type="string" name="cs" id="0x7f1204a1" />
-    <public type="string" name="current_vs_prior_week" id="0x7f1204a2" />
-    <public type="string" name="currently_controlling" id="0x7f1204a3" />
-    <public type="string" name="custom_color" id="0x7f1204a4" />
-    <public type="string" name="custom_status" id="0x7f1204a5" />
-    <public type="string" name="custom_status_clear_after" id="0x7f1204a6" />
-    <public type="string" name="custom_status_clear_custom_status" id="0x7f1204a7" />
-    <public type="string" name="custom_status_clear_in_hours" id="0x7f1204a8" />
-    <public type="string" name="custom_status_clear_in_minutes" id="0x7f1204a9" />
-    <public type="string" name="custom_status_clear_tomorrow" id="0x7f1204aa" />
-    <public type="string" name="custom_status_dont_clear" id="0x7f1204ab" />
-    <public type="string" name="custom_status_edit_custom_status" id="0x7f1204ac" />
-    <public type="string" name="custom_status_edit_custom_status_placeholder" id="0x7f1204ad" />
-    <public type="string" name="custom_status_hotspot" id="0x7f1204ae" />
-    <public type="string" name="custom_status_hours" id="0x7f1204af" />
-    <public type="string" name="custom_status_minutes" id="0x7f1204b0" />
-    <public type="string" name="custom_status_modal_body" id="0x7f1204b1" />
-    <public type="string" name="custom_status_modal_placeholder" id="0x7f1204b2" />
-    <public type="string" name="custom_status_set_custom_status" id="0x7f1204b3" />
-    <public type="string" name="custom_status_today" id="0x7f1204b4" />
-    <public type="string" name="custom_tabs_mobile_body" id="0x7f1204b5" />
-    <public type="string" name="custom_tabs_mobile_header" id="0x7f1204b6" />
-    <public type="string" name="cut" id="0x7f1204b7" />
-    <public type="string" name="da" id="0x7f1204b8" />
-    <public type="string" name="dark_blue" id="0x7f1204b9" />
-    <public type="string" name="dark_grey" id="0x7f1204ba" />
-    <public type="string" name="dark_purple" id="0x7f1204bb" />
-    <public type="string" name="dark_teal" id="0x7f1204bc" />
-    <public type="string" name="data_download_requested_status_note" id="0x7f1204bd" />
-    <public type="string" name="data_privacy_controls" id="0x7f1204be" />
-    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7f1204bf" />
-    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7f1204c0" />
-    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7f1204c1" />
-    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7f1204c2" />
-    <public type="string" name="data_privacy_controls_personalization_title" id="0x7f1204c3" />
-    <public type="string" name="data_privacy_controls_request_data_download" id="0x7f1204c4" />
-    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7f1204c5" />
-    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7f1204c6" />
-    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7f1204c7" />
-    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7f1204c8" />
-    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7f1204c9" />
-    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7f1204ca" />
-    <public type="string" name="data_privacy_controls_request_data_modal_success_title" id="0x7f1204cb" />
-    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7f1204cc" />
-    <public type="string" name="data_privacy_controls_request_data_note" id="0x7f1204cd" />
-    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7f1204ce" />
-    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7f1204cf" />
-    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7f1204d0" />
-    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7f1204d1" />
-    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7f1204d2" />
-    <public type="string" name="data_privacy_rate_limit_title" id="0x7f1204d3" />
-    <public type="string" name="data_privacy_update_consents_failed" id="0x7f1204d4" />
-    <public type="string" name="date" id="0x7f1204d5" />
-    <public type="string" name="de" id="0x7f1204d6" />
-    <public type="string" name="deafen" id="0x7f1204d7" />
-    <public type="string" name="deafen_members" id="0x7f1204d8" />
-    <public type="string" name="deauthorize" id="0x7f1204d9" />
-    <public type="string" name="deauthorize_app" id="0x7f1204da" />
-    <public type="string" name="deb" id="0x7f1204db" />
-    <public type="string" name="debug" id="0x7f1204dc" />
-    <public type="string" name="decline" id="0x7f1204dd" />
-    <public type="string" name="default_app_description" id="0x7f1204de" />
-    <public type="string" name="default_failure_to_perform_action_message" id="0x7f1204df" />
-    <public type="string" name="default_input_placeholder" id="0x7f1204e0" />
-    <public type="string" name="default_web_client_id" id="0x7f1204e1" />
-    <public type="string" name="delete" id="0x7f1204e2" />
-    <public type="string" name="delete_account" id="0x7f1204e3" />
-    <public type="string" name="delete_account_body" id="0x7f1204e4" />
-    <public type="string" name="delete_account_error" id="0x7f1204e5" />
-    <public type="string" name="delete_account_transfer_ownership" id="0x7f1204e6" />
-    <public type="string" name="delete_account_transfer_ownership_body" id="0x7f1204e7" />
-    <public type="string" name="delete_app" id="0x7f1204e8" />
-    <public type="string" name="delete_app_confirm_msg" id="0x7f1204e9" />
-    <public type="string" name="delete_category" id="0x7f1204ea" />
-    <public type="string" name="delete_channel" id="0x7f1204eb" />
-    <public type="string" name="delete_channel_body" id="0x7f1204ec" />
-    <public type="string" name="delete_followed_news_body" id="0x7f1204ed" />
-    <public type="string" name="delete_message" id="0x7f1204ee" />
-    <public type="string" name="delete_message_body" id="0x7f1204ef" />
-    <public type="string" name="delete_message_context_menu_hint" id="0x7f1204f0" />
-    <public type="string" name="delete_message_history_option_24hr" id="0x7f1204f1" />
-    <public type="string" name="delete_message_history_option_7d" id="0x7f1204f2" />
-    <public type="string" name="delete_message_history_option_none" id="0x7f1204f3" />
-    <public type="string" name="delete_message_report" id="0x7f1204f4" />
-    <public type="string" name="delete_message_title" id="0x7f1204f5" />
-    <public type="string" name="delete_role" id="0x7f1204f6" />
-    <public type="string" name="delete_role_mobile" id="0x7f1204f7" />
-    <public type="string" name="delete_server" id="0x7f1204f8" />
-    <public type="string" name="delete_server_body" id="0x7f1204f9" />
-    <public type="string" name="delete_server_enter_name" id="0x7f1204fa" />
-    <public type="string" name="delete_server_incorrect_name" id="0x7f1204fb" />
-    <public type="string" name="delete_server_title" id="0x7f1204fc" />
-    <public type="string" name="description" id="0x7f1204fd" />
-    <public type="string" name="desktop_app" id="0x7f1204fe" />
-    <public type="string" name="desktop_icon_badge" id="0x7f1204ff" />
-    <public type="string" name="desktop_notifications_enable" id="0x7f120500" />
-    <public type="string" name="desktop_notifications_enable_body" id="0x7f120501" />
-    <public type="string" name="detect_platform_accounts" id="0x7f120502" />
-    <public type="string" name="developer_application_test_mode" id="0x7f120503" />
-    <public type="string" name="developer_application_test_mode_activate" id="0x7f120504" />
-    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7f120505" />
-    <public type="string" name="developer_application_test_mode_clear" id="0x7f120506" />
-    <public type="string" name="developer_application_test_mode_invalid" id="0x7f120507" />
-    <public type="string" name="developer_application_test_mode_modal_body" id="0x7f120508" />
-    <public type="string" name="developer_application_test_mode_modal_header" id="0x7f120509" />
-    <public type="string" name="developer_application_test_mode_note" id="0x7f12050a" />
-    <public type="string" name="developer_application_test_mode_placeholder" id="0x7f12050b" />
-    <public type="string" name="developer_mode" id="0x7f12050c" />
-    <public type="string" name="developer_mode_help_text" id="0x7f12050d" />
-    <public type="string" name="developer_options" id="0x7f12050e" />
-    <public type="string" name="developer_portal_cta" id="0x7f12050f" />
-    <public type="string" name="device_no_permission" id="0x7f120510" />
-    <public type="string" name="device_settings" id="0x7f120511" />
-    <public type="string" name="direct_message" id="0x7f120512" />
-    <public type="string" name="direct_messages" id="0x7f120513" />
-    <public type="string" name="disable" id="0x7f120514" />
-    <public type="string" name="disable_account" id="0x7f120515" />
-    <public type="string" name="disable_account_body" id="0x7f120516" />
-    <public type="string" name="disable_email_notifications" id="0x7f120517" />
-    <public type="string" name="disable_email_notifications_body" id="0x7f120518" />
-    <public type="string" name="disable_email_notifications_failed" id="0x7f120519" />
-    <public type="string" name="disable_email_notifications_failed_suggestion" id="0x7f12051a" />
-    <public type="string" name="disable_integration_title" id="0x7f12051b" />
-    <public type="string" name="disable_integration_twitch_body" id="0x7f12051c" />
-    <public type="string" name="disable_integration_youtube_body" id="0x7f12051d" />
-    <public type="string" name="disable_notifications_description" id="0x7f12051e" />
-    <public type="string" name="disable_notifications_label" id="0x7f12051f" />
-    <public type="string" name="disable_sounds_description" id="0x7f120520" />
-    <public type="string" name="disable_sounds_label" id="0x7f120521" />
-    <public type="string" name="disabling_email_notifications" id="0x7f120522" />
-    <public type="string" name="discard_changes" id="0x7f120523" />
-    <public type="string" name="discard_changes_description" id="0x7f120524" />
-    <public type="string" name="disconnect" id="0x7f120525" />
-    <public type="string" name="disconnect_account" id="0x7f120526" />
-    <public type="string" name="disconnect_account_body" id="0x7f120527" />
-    <public type="string" name="disconnect_account_title" id="0x7f120528" />
-    <public type="string" name="disconnect_from_voice" id="0x7f120529" />
-    <public type="string" name="discord" id="0x7f12052a" />
-    <public type="string" name="discord_desc_long" id="0x7f12052b" />
-    <public type="string" name="discord_desc_short" id="0x7f12052c" />
-    <public type="string" name="discord_gg" id="0x7f12052d" />
-    <public type="string" name="discord_rich_presence" id="0x7f12052e" />
-    <public type="string" name="discover" id="0x7f12052f" />
-    <public type="string" name="discover_communities" id="0x7f120530" />
-    <public type="string" name="discover_friend_servers" id="0x7f120531" />
-    <public type="string" name="discover_recommended" id="0x7f120532" />
-    <public type="string" name="discovery" id="0x7f120533" />
-    <public type="string" name="dismiss" id="0x7f120534" />
-    <public type="string" name="dispatch_error_modal_body" id="0x7f120535" />
-    <public type="string" name="dispatch_error_modal_description" id="0x7f120536" />
-    <public type="string" name="dispatch_error_modal_error_label" id="0x7f120537" />
-    <public type="string" name="dispatch_error_modal_header" id="0x7f120538" />
-    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7f120539" />
-    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7f12053a" />
-    <public type="string" name="display" id="0x7f12053b" />
-    <public type="string" name="display_activity" id="0x7f12053c" />
-    <public type="string" name="display_on_profile" id="0x7f12053d" />
-    <public type="string" name="display_option_always" id="0x7f12053e" />
-    <public type="string" name="display_option_never" id="0x7f12053f" />
-    <public type="string" name="display_option_only_while_speaking" id="0x7f120540" />
-    <public type="string" name="display_silence_warning" id="0x7f120541" />
-    <public type="string" name="dm" id="0x7f120542" />
-    <public type="string" name="dm_search_instruction" id="0x7f120543" />
-    <public type="string" name="dm_search_placeholder" id="0x7f120544" />
-    <public type="string" name="dm_settings" id="0x7f120545" />
-    <public type="string" name="dm_verification_text_blocked" id="0x7f120546" />
-    <public type="string" name="done" id="0x7f120547" />
-    <public type="string" name="dont_show_again" id="0x7f120548" />
-    <public type="string" name="download" id="0x7f120549" />
-    <public type="string" name="download_app" id="0x7f12054a" />
-    <public type="string" name="download_apps" id="0x7f12054b" />
-    <public type="string" name="download_desktop_ptb_footer" id="0x7f12054c" />
-    <public type="string" name="download_desktop_stable_footer" id="0x7f12054d" />
-    <public type="string" name="download_desktop_title" id="0x7f12054e" />
-    <public type="string" name="download_failed" id="0x7f12054f" />
-    <public type="string" name="download_file_complete" id="0x7f120550" />
-    <public type="string" name="download_mobile_apps_description" id="0x7f120551" />
-    <public type="string" name="download_mobile_apps_description_with_username" id="0x7f120552" />
-    <public type="string" name="download_mobile_apps_title" id="0x7f120553" />
-    <public type="string" name="download_mobile_modal_apps_header" id="0x7f120554" />
-    <public type="string" name="download_mobile_title" id="0x7f120555" />
-    <public type="string" name="duration_days" id="0x7f120556" />
-    <public type="string" name="duration_hours" id="0x7f120557" />
-    <public type="string" name="duration_hours_short" id="0x7f120558" />
-    <public type="string" name="duration_mins" id="0x7f120559" />
-    <public type="string" name="duration_minutes" id="0x7f12055a" />
-    <public type="string" name="duration_minutes_short" id="0x7f12055b" />
-    <public type="string" name="duration_seconds" id="0x7f12055c" />
-    <public type="string" name="duration_seconds_short" id="0x7f12055d" />
-    <public type="string" name="early_supporter_tooltip" id="0x7f12055e" />
-    <public type="string" name="echo_cancellation" id="0x7f12055f" />
-    <public type="string" name="edit" id="0x7f120560" />
-    <public type="string" name="edit_category" id="0x7f120561" />
-    <public type="string" name="edit_channel" id="0x7f120562" />
-    <public type="string" name="edit_followed_news_body" id="0x7f120563" />
-    <public type="string" name="edit_message" id="0x7f120564" />
-    <public type="string" name="edit_note" id="0x7f120565" />
-    <public type="string" name="edit_overview" id="0x7f120566" />
-    <public type="string" name="edit_roles" id="0x7f120567" />
-    <public type="string" name="edit_textarea_help" id="0x7f120568" />
-    <public type="string" name="edit_user" id="0x7f120569" />
-    <public type="string" name="edit_voice_channel_no_permission" id="0x7f12056a" />
-    <public type="string" name="editing_message" id="0x7f12056b" />
-    <public type="string" name="editing_with_attachment_error" id="0x7f12056c" />
-    <public type="string" name="el" id="0x7f12056d" />
-    <public type="string" name="elevated_permissions_sound_body" id="0x7f12056e" />
-    <public type="string" name="elevated_permissions_sound_no_sound_button" id="0x7f12056f" />
-    <public type="string" name="elevated_permissions_sound_request_access_button" id="0x7f120570" />
-    <public type="string" name="elevated_permissions_sound_title" id="0x7f120571" />
-    <public type="string" name="email" id="0x7f120572" />
-    <public type="string" name="email_invalid" id="0x7f120573" />
-    <public type="string" name="email_required" id="0x7f120574" />
-    <public type="string" name="email_verification_instructions_body" id="0x7f120575" />
-    <public type="string" name="email_verification_instructions_header" id="0x7f120576" />
-    <public type="string" name="embed_links" id="0x7f120577" />
-    <public type="string" name="emoji" id="0x7f120578" />
-    <public type="string" name="emoji_category_activity" id="0x7f120579" />
-    <public type="string" name="emoji_category_custom" id="0x7f12057a" />
-    <public type="string" name="emoji_category_flags" id="0x7f12057b" />
-    <public type="string" name="emoji_category_food" id="0x7f12057c" />
-    <public type="string" name="emoji_category_nature" id="0x7f12057d" />
-    <public type="string" name="emoji_category_objects" id="0x7f12057e" />
-    <public type="string" name="emoji_category_people" id="0x7f12057f" />
-    <public type="string" name="emoji_category_recent" id="0x7f120580" />
-    <public type="string" name="emoji_category_symbols" id="0x7f120581" />
-    <public type="string" name="emoji_category_travel" id="0x7f120582" />
-    <public type="string" name="emoji_disabled_premium_tier_lost" id="0x7f120583" />
-    <public type="string" name="emoji_keyboard_toggle" id="0x7f120584" />
-    <public type="string" name="emoji_matching" id="0x7f120585" />
-    <public type="string" name="emoji_name" id="0x7f120586" />
-    <public type="string" name="emoji_section" id="0x7f120587" />
-    <public type="string" name="emoji_slots_available" id="0x7f120588" />
-    <public type="string" name="emoji_too_big" id="0x7f120589" />
-    <public type="string" name="en_gb" id="0x7f12058a" />
-    <public type="string" name="en_us" id="0x7f12058b" />
-    <public type="string" name="enable" id="0x7f12058c" />
-    <public type="string" name="enable_ingame_overlay" id="0x7f12058d" />
-    <public type="string" name="enable_privacy_access" id="0x7f12058e" />
-    <public type="string" name="enable_streamer_mode_description" id="0x7f12058f" />
-    <public type="string" name="enable_streamer_mode_label" id="0x7f120590" />
-    <public type="string" name="enable_twitch_emoji_sync" id="0x7f120591" />
-    <public type="string" name="engagement_ratio" id="0x7f120592" />
-    <public type="string" name="enter_email_body" id="0x7f120593" />
-    <public type="string" name="enter_phone_description" id="0x7f120594" />
-    <public type="string" name="enter_phone_title" id="0x7f120595" />
-    <public type="string" name="enter_vanity_url" id="0x7f120596" />
-    <public type="string" name="errors_action_to_take" id="0x7f120597" />
-    <public type="string" name="errors_activity_feed_crash" id="0x7f120598" />
-    <public type="string" name="errors_reload" id="0x7f120599" />
-    <public type="string" name="errors_restart_app" id="0x7f12059a" />
-    <public type="string" name="errors_store_crash" id="0x7f12059b" />
-    <public type="string" name="errors_unexpected_crash" id="0x7f12059c" />
-    <public type="string" name="es_es" id="0x7f12059d" />
-    <public type="string" name="everyone_popout_body" id="0x7f12059e" />
-    <public type="string" name="everyone_popout_enter" id="0x7f12059f" />
-    <public type="string" name="everyone_popout_esc" id="0x7f1205a0" />
-    <public type="string" name="everyone_popout_footer" id="0x7f1205a1" />
-    <public type="string" name="everyone_popout_send_now" id="0x7f1205a2" />
-    <public type="string" name="exit_full_screen" id="0x7f1205a3" />
-    <public type="string" name="experiment_mobile_only_user_button_cancel" id="0x7f1205a4" />
-    <public type="string" name="experiment_mobile_only_user_button_go" id="0x7f1205a5" />
-    <public type="string" name="experiment_mobile_only_user_email_confirmation" id="0x7f1205a6" />
-    <public type="string" name="experiment_mobile_only_user_header" id="0x7f1205a7" />
-    <public type="string" name="experiment_mobile_only_user_text1" id="0x7f1205a8" />
-    <public type="string" name="experiment_mobile_only_user_text2" id="0x7f1205a9" />
-    <public type="string" name="experimental_encoders" id="0x7f1205aa" />
-    <public type="string" name="expire_after" id="0x7f1205ab" />
-    <public type="string" name="expires_in" id="0x7f1205ac" />
-    <public type="string" name="explicit_content_filter_disabled" id="0x7f1205ad" />
-    <public type="string" name="explicit_content_filter_disabled_description" id="0x7f1205ae" />
-    <public type="string" name="explicit_content_filter_high" id="0x7f1205af" />
-    <public type="string" name="explicit_content_filter_high_description" id="0x7f1205b0" />
-    <public type="string" name="explicit_content_filter_medium" id="0x7f1205b1" />
-    <public type="string" name="explicit_content_filter_medium_description" id="0x7f1205b2" />
-    <public type="string" name="fab_transformation_scrim_behavior" id="0x7f1205b3" />
-    <public type="string" name="fab_transformation_sheet_behavior" id="0x7f1205b4" />
-    <public type="string" name="facebook" id="0x7f1205b5" />
-    <public type="string" name="failed" id="0x7f1205b6" />
-    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7f1205b7" />
-    <public type="string" name="fi" id="0x7f1205b8" />
-    <public type="string" name="file_rate_kb" id="0x7f1205b9" />
-    <public type="string" name="file_rate_mb" id="0x7f1205ba" />
-    <public type="string" name="file_size_gb" id="0x7f1205bb" />
-    <public type="string" name="file_size_mb" id="0x7f1205bc" />
-    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7f1205bd" />
-    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7f1205be" />
-    <public type="string" name="file_upload_limit_standard" id="0x7f1205bf" />
-    <public type="string" name="files_permission_reason_msg" id="0x7f1205c0" />
-    <public type="string" name="filter" id="0x7f1205c1" />
-    <public type="string" name="filter_mentions" id="0x7f1205c2" />
-    <public type="string" name="filter_options" id="0x7f1205c3" />
-    <public type="string" name="firebase_database_url" id="0x7f1205c4" />
-    <public type="string" name="flash_auto" id="0x7f1205c5" />
-    <public type="string" name="flash_off" id="0x7f1205c6" />
-    <public type="string" name="flash_on" id="0x7f1205c7" />
-    <public type="string" name="focus_participant" id="0x7f1205c8" />
-    <public type="string" name="follow" id="0x7f1205c9" />
-    <public type="string" name="follow_modal_body" id="0x7f1205ca" />
-    <public type="string" name="follow_modal_fail" id="0x7f1205cb" />
-    <public type="string" name="follow_modal_header" id="0x7f1205cc" />
-    <public type="string" name="follow_modal_hint" id="0x7f1205cd" />
-    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1205ce" />
-    <public type="string" name="follow_modal_title" id="0x7f1205cf" />
-    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1205d0" />
-    <public type="string" name="follow_modal_warning" id="0x7f1205d1" />
-    <public type="string" name="follow_news_chat_input_message" id="0x7f1205d2" />
-    <public type="string" name="follow_news_chat_input_subtitle" id="0x7f1205d3" />
-    <public type="string" name="follow_success_modal_body" id="0x7f1205d4" />
-    <public type="string" name="follow_success_modal_header_01" id="0x7f1205d5" />
-    <public type="string" name="follow_success_modal_header_02" id="0x7f1205d6" />
-    <public type="string" name="follow_success_modal_header_03" id="0x7f1205d7" />
-    <public type="string" name="follow_success_modal_header_04" id="0x7f1205d8" />
-    <public type="string" name="follow_success_modal_header_05" id="0x7f1205d9" />
-    <public type="string" name="follow_success_modal_header_06" id="0x7f1205da" />
-    <public type="string" name="follow_success_modal_header_07" id="0x7f1205db" />
-    <public type="string" name="follow_success_modal_header_08" id="0x7f1205dc" />
-    <public type="string" name="follow_success_modal_header_09" id="0x7f1205dd" />
-    <public type="string" name="follow_success_modal_header_10" id="0x7f1205de" />
-    <public type="string" name="follower_analytics" id="0x7f1205df" />
-    <public type="string" name="follower_analytics_header" id="0x7f1205e0" />
-    <public type="string" name="force_sync" id="0x7f1205e1" />
-    <public type="string" name="forgot_password" id="0x7f1205e2" />
-    <public type="string" name="forgot_password_body" id="0x7f1205e3" />
-    <public type="string" name="form_checkbox_debug_logging" id="0x7f1205e4" />
-    <public type="string" name="form_checkbox_qos" id="0x7f1205e5" />
-    <public type="string" name="form_description_audio_mode_android_call" id="0x7f1205e6" />
-    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f1205e7" />
-    <public type="string" name="form_description_push_afk_timeout" id="0x7f1205e8" />
-    <public type="string" name="form_description_tts" id="0x7f1205e9" />
-    <public type="string" name="form_error_generic" id="0x7f1205ea" />
-    <public type="string" name="form_help_afk_channel" id="0x7f1205eb" />
-    <public type="string" name="form_help_attenuation" id="0x7f1205ec" />
-    <public type="string" name="form_help_automatic_vad" id="0x7f1205ed" />
-    <public type="string" name="form_help_bitrate" id="0x7f1205ee" />
-    <public type="string" name="form_help_certified_voice_processing" id="0x7f1205ef" />
-    <public type="string" name="form_help_channel_permissions" id="0x7f1205f0" />
-    <public type="string" name="form_help_custom_code" id="0x7f1205f1" />
-    <public type="string" name="form_help_debug_logging" id="0x7f1205f2" />
-    <public type="string" name="form_help_default_notification_settings" id="0x7f1205f3" />
-    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f1205f4" />
-    <public type="string" name="form_help_enable_discoverable" id="0x7f1205f5" />
-    <public type="string" name="form_help_enable_featurable" id="0x7f1205f6" />
-    <public type="string" name="form_help_explicit_content_filter" id="0x7f1205f7" />
-    <public type="string" name="form_help_instant_invite_channel" id="0x7f1205f8" />
-    <public type="string" name="form_help_last_seen" id="0x7f1205f9" />
-    <public type="string" name="form_help_legacy_subsystem" id="0x7f1205fa" />
-    <public type="string" name="form_help_news" id="0x7f1205fb" />
-    <public type="string" name="form_help_nsfw" id="0x7f1205fc" />
-    <public type="string" name="form_help_open_h264" id="0x7f1205fd" />
-    <public type="string" name="form_help_premade_widget" id="0x7f1205fe" />
-    <public type="string" name="form_help_qos" id="0x7f1205ff" />
-    <public type="string" name="form_help_server_banner" id="0x7f120600" />
-    <public type="string" name="form_help_server_description" id="0x7f120601" />
-    <public type="string" name="form_help_server_language" id="0x7f120602" />
-    <public type="string" name="form_help_slowmode" id="0x7f120603" />
-    <public type="string" name="form_help_system_channel" id="0x7f120604" />
-    <public type="string" name="form_help_system_channel_join_messages" id="0x7f120605" />
-    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f120606" />
-    <public type="string" name="form_help_temporary" id="0x7f120607" />
-    <public type="string" name="form_help_user_limit" id="0x7f120608" />
-    <public type="string" name="form_help_verification_level" id="0x7f120609" />
-    <public type="string" name="form_label_afk_channel" id="0x7f12060a" />
-    <public type="string" name="form_label_afk_timeout" id="0x7f12060b" />
-    <public type="string" name="form_label_all" id="0x7f12060c" />
-    <public type="string" name="form_label_all_messages" id="0x7f12060d" />
-    <public type="string" name="form_label_android_opensl" id="0x7f12060e" />
-    <public type="string" name="form_label_android_opensl_default" id="0x7f12060f" />
-    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f120610" />
-    <public type="string" name="form_label_android_opensl_desc" id="0x7f120611" />
-    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f120612" />
-    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f120613" />
-    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f120614" />
-    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f120615" />
-    <public type="string" name="form_label_attenuation" id="0x7f120616" />
-    <public type="string" name="form_label_audio_mode_android" id="0x7f120617" />
-    <public type="string" name="form_label_audio_mode_android_call" id="0x7f120618" />
-    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f120619" />
-    <public type="string" name="form_label_automatic_vad" id="0x7f12061a" />
-    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f12061b" />
-    <public type="string" name="form_label_avatar_size" id="0x7f12061c" />
-    <public type="string" name="form_label_bitrate" id="0x7f12061d" />
-    <public type="string" name="form_label_category_permissions" id="0x7f12061e" />
-    <public type="string" name="form_label_channel_name" id="0x7f12061f" />
-    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f120620" />
-    <public type="string" name="form_label_channel_permissions" id="0x7f120621" />
-    <public type="string" name="form_label_channel_topic" id="0x7f120622" />
-    <public type="string" name="form_label_channel_voice_permissions" id="0x7f120623" />
-    <public type="string" name="form_label_current_password" id="0x7f120624" />
-    <public type="string" name="form_label_custom_code" id="0x7f120625" />
-    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f120626" />
-    <public type="string" name="form_label_debug_logs" id="0x7f120627" />
-    <public type="string" name="form_label_default_notification_settings" id="0x7f120628" />
-    <public type="string" name="form_label_delete_message_history" id="0x7f120629" />
-    <public type="string" name="form_label_desktop_notifications" id="0x7f12062a" />
-    <public type="string" name="form_label_desktop_only" id="0x7f12062b" />
-    <public type="string" name="form_label_disabled_for_everyone" id="0x7f12062c" />
-    <public type="string" name="form_label_discovery_settings" id="0x7f12062d" />
-    <public type="string" name="form_label_display_names" id="0x7f12062e" />
-    <public type="string" name="form_label_display_users" id="0x7f12062f" />
-    <public type="string" name="form_label_email" id="0x7f120630" />
-    <public type="string" name="form_label_enable_widget" id="0x7f120631" />
-    <public type="string" name="form_label_expire_grace_period" id="0x7f120632" />
-    <public type="string" name="form_label_explicit_content_filter" id="0x7f120633" />
-    <public type="string" name="form_label_hoist_description" id="0x7f120634" />
-    <public type="string" name="form_label_input" id="0x7f120635" />
-    <public type="string" name="form_label_input_device" id="0x7f120636" />
-    <public type="string" name="form_label_input_mode" id="0x7f120637" />
-    <public type="string" name="form_label_input_sensitivty" id="0x7f120638" />
-    <public type="string" name="form_label_input_volume" id="0x7f120639" />
-    <public type="string" name="form_label_instant_invite" id="0x7f12063a" />
-    <public type="string" name="form_label_instant_invite_channel" id="0x7f12063b" />
-    <public type="string" name="form_label_json_api" id="0x7f12063c" />
-    <public type="string" name="form_label_last_seen" id="0x7f12063d" />
-    <public type="string" name="form_label_local_mute" id="0x7f12063e" />
-    <public type="string" name="form_label_max_age" id="0x7f12063f" />
-    <public type="string" name="form_label_max_uses" id="0x7f120640" />
-    <public type="string" name="form_label_member_add" id="0x7f120641" />
-    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120642" />
-    <public type="string" name="form_label_mentionable" id="0x7f120643" />
-    <public type="string" name="form_label_mentions" id="0x7f120644" />
-    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7f120645" />
-    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7f120646" />
-    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7f120647" />
-    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f120648" />
-    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f120649" />
-    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f12064a" />
-    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f12064b" />
-    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f12064c" />
-    <public type="string" name="form_label_mobile_notifications_label" id="0x7f12064d" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f12064e" />
-    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f12064f" />
-    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f120650" />
-    <public type="string" name="form_label_mobile_notifications_sound_message" id="0x7f120651" />
-    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7f120652" />
-    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f120653" />
-    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f120654" />
-    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f120655" />
-    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7f120656" />
-    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f120657" />
-    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f120658" />
-    <public type="string" name="form_label_mobile_push_notifications" id="0x7f120659" />
-    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f12065a" />
-    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f12065b" />
-    <public type="string" name="form_label_mute_server" id="0x7f12065c" />
-    <public type="string" name="form_label_mute_server_description" id="0x7f12065d" />
-    <public type="string" name="form_label_muted" id="0x7f12065e" />
-    <public type="string" name="form_label_new_password" id="0x7f12065f" />
-    <public type="string" name="form_label_new_user" id="0x7f120660" />
-    <public type="string" name="form_label_news_channel" id="0x7f120661" />
-    <public type="string" name="form_label_nothing" id="0x7f120662" />
-    <public type="string" name="form_label_notification_frequency" id="0x7f120663" />
-    <public type="string" name="form_label_notification_position" id="0x7f120664" />
-    <public type="string" name="form_label_nsfw" id="0x7f120665" />
-    <public type="string" name="form_label_nsfw_channel" id="0x7f120666" />
-    <public type="string" name="form_label_off" id="0x7f120667" />
-    <public type="string" name="form_label_only_mentions" id="0x7f120668" />
-    <public type="string" name="form_label_output" id="0x7f120669" />
-    <public type="string" name="form_label_output_device" id="0x7f12066a" />
-    <public type="string" name="form_label_output_volume" id="0x7f12066b" />
-    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f12066c" />
-    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f12066d" />
-    <public type="string" name="form_label_password" id="0x7f12066e" />
-    <public type="string" name="form_label_phone_number" id="0x7f12066f" />
-    <public type="string" name="form_label_premade_widget" id="0x7f120670" />
-    <public type="string" name="form_label_push_afk_timeout" id="0x7f120671" />
-    <public type="string" name="form_label_qos" id="0x7f120672" />
-    <public type="string" name="form_label_reason_ban" id="0x7f120673" />
-    <public type="string" name="form_label_reason_kick" id="0x7f120674" />
-    <public type="string" name="form_label_report_reason" id="0x7f120675" />
-    <public type="string" name="form_label_role_add" id="0x7f120676" />
-    <public type="string" name="form_label_role_color" id="0x7f120677" />
-    <public type="string" name="form_label_role_enter_name" id="0x7f120678" />
-    <public type="string" name="form_label_role_name" id="0x7f120679" />
-    <public type="string" name="form_label_role_settings" id="0x7f12067a" />
-    <public type="string" name="form_label_roles_pro_tip" id="0x7f12067b" />
-    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f12067c" />
-    <public type="string" name="form_label_select_channel" id="0x7f12067d" />
-    <public type="string" name="form_label_send_to" id="0x7f12067e" />
-    <public type="string" name="form_label_sensitivty" id="0x7f12067f" />
-    <public type="string" name="form_label_server_banner" id="0x7f120680" />
-    <public type="string" name="form_label_server_description" id="0x7f120681" />
-    <public type="string" name="form_label_server_id" id="0x7f120682" />
-    <public type="string" name="form_label_server_language" id="0x7f120683" />
-    <public type="string" name="form_label_server_name" id="0x7f120684" />
-    <public type="string" name="form_label_server_notification_settings" id="0x7f120685" />
-    <public type="string" name="form_label_server_region" id="0x7f120686" />
-    <public type="string" name="form_label_server_settings" id="0x7f120687" />
-    <public type="string" name="form_label_shortcut" id="0x7f120688" />
-    <public type="string" name="form_label_slowmode" id="0x7f120689" />
-    <public type="string" name="form_label_slowmode_cooldown" id="0x7f12068a" />
-    <public type="string" name="form_label_slowmode_off" id="0x7f12068b" />
-    <public type="string" name="form_label_stream_volume" id="0x7f12068c" />
-    <public type="string" name="form_label_sub_expire_behavior" id="0x7f12068d" />
-    <public type="string" name="form_label_subsystem" id="0x7f12068e" />
-    <public type="string" name="form_label_suppress_everyone" id="0x7f12068f" />
-    <public type="string" name="form_label_synced_members" id="0x7f120690" />
-    <public type="string" name="form_label_synced_role" id="0x7f120691" />
-    <public type="string" name="form_label_synced_subs" id="0x7f120692" />
-    <public type="string" name="form_label_system_channel" id="0x7f120693" />
-    <public type="string" name="form_label_system_channel_settings" id="0x7f120694" />
-    <public type="string" name="form_label_temporary" id="0x7f120695" />
-    <public type="string" name="form_label_test_microphone" id="0x7f120696" />
-    <public type="string" name="form_label_tts" id="0x7f120697" />
-    <public type="string" name="form_label_tts_notifications" id="0x7f120698" />
-    <public type="string" name="form_label_user_limit" id="0x7f120699" />
-    <public type="string" name="form_label_username" id="0x7f12069a" />
-    <public type="string" name="form_label_username_mobile" id="0x7f12069b" />
-    <public type="string" name="form_label_verification_level" id="0x7f12069c" />
-    <public type="string" name="form_label_video_device" id="0x7f12069d" />
-    <public type="string" name="form_label_video_preview" id="0x7f12069e" />
-    <public type="string" name="form_label_voice_diagnostics" id="0x7f12069f" />
-    <public type="string" name="form_label_voice_processing" id="0x7f1206a0" />
-    <public type="string" name="form_label_volume" id="0x7f1206a1" />
-    <public type="string" name="form_missing_required_fields" id="0x7f1206a2" />
-    <public type="string" name="form_placeholder_reason" id="0x7f1206a3" />
-    <public type="string" name="form_placeholder_server_name" id="0x7f1206a4" />
-    <public type="string" name="form_placeholder_username" id="0x7f1206a5" />
-    <public type="string" name="form_report_help_text" id="0x7f1206a6" />
-    <public type="string" name="form_warning_input_sensitivty" id="0x7f1206a7" />
-    <public type="string" name="form_warning_video_preview" id="0x7f1206a8" />
-    <public type="string" name="fr" id="0x7f1206a9" />
-    <public type="string" name="friend_has_been_deleted" id="0x7f1206aa" />
-    <public type="string" name="friend_permitted_source" id="0x7f1206ab" />
-    <public type="string" name="friend_permitted_source_all" id="0x7f1206ac" />
-    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f1206ad" />
-    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f1206ae" />
-    <public type="string" name="friend_request_accept" id="0x7f1206af" />
-    <public type="string" name="friend_request_cancel" id="0x7f1206b0" />
-    <public type="string" name="friend_request_cancelled" id="0x7f1206b1" />
-    <public type="string" name="friend_request_ignore" id="0x7f1206b2" />
-    <public type="string" name="friend_request_ignored" id="0x7f1206b3" />
-    <public type="string" name="friend_request_rate_limited_body" id="0x7f1206b4" />
-    <public type="string" name="friend_request_rate_limited_button" id="0x7f1206b5" />
-    <public type="string" name="friend_request_rate_limited_header" id="0x7f1206b6" />
-    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f1206b7" />
-    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f1206b8" />
-    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f1206b9" />
-    <public type="string" name="friend_request_sent" id="0x7f1206ba" />
-    <public type="string" name="friends" id="0x7f1206bb" />
-    <public type="string" name="friends_column_name" id="0x7f1206bc" />
-    <public type="string" name="friends_column_status" id="0x7f1206bd" />
-    <public type="string" name="friends_empty_state_all" id="0x7f1206be" />
-    <public type="string" name="friends_empty_state_all_body" id="0x7f1206bf" />
-    <public type="string" name="friends_empty_state_all_cta" id="0x7f1206c0" />
-    <public type="string" name="friends_empty_state_all_header" id="0x7f1206c1" />
-    <public type="string" name="friends_empty_state_blocked" id="0x7f1206c2" />
-    <public type="string" name="friends_empty_state_copy" id="0x7f1206c3" />
-    <public type="string" name="friends_empty_state_online" id="0x7f1206c4" />
-    <public type="string" name="friends_empty_state_pending" id="0x7f1206c5" />
-    <public type="string" name="friends_offline_header" id="0x7f1206c6" />
-    <public type="string" name="friends_online" id="0x7f1206c7" />
-    <public type="string" name="friends_online_header" id="0x7f1206c8" />
-    <public type="string" name="friends_pending_request_expand" id="0x7f1206c9" />
-    <public type="string" name="friends_pending_request_expand_collapse" id="0x7f1206ca" />
-    <public type="string" name="friends_pending_request_header" id="0x7f1206cb" />
-    <public type="string" name="friends_request_status_incoming" id="0x7f1206cc" />
-    <public type="string" name="friends_request_status_outgoing" id="0x7f1206cd" />
-    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7f1206ce" />
-    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7f1206cf" />
-    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7f1206d0" />
-    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7f1206d1" />
-    <public type="string" name="friends_section_add_friend" id="0x7f1206d2" />
-    <public type="string" name="friends_section_all" id="0x7f1206d3" />
-    <public type="string" name="friends_section_online" id="0x7f1206d4" />
-    <public type="string" name="friends_section_pending" id="0x7f1206d5" />
-    <public type="string" name="friends_share" id="0x7f1206d6" />
-    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7f1206d7" />
-    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7f1206d8" />
-    <public type="string" name="friends_share_tabbar_title" id="0x7f1206d9" />
-    <public type="string" name="full" id="0x7f1206da" />
-    <public type="string" name="full_screen" id="0x7f1206db" />
-    <public type="string" name="game_action_button_add_to_library" id="0x7f1206dc" />
-    <public type="string" name="game_action_button_cannot_install" id="0x7f1206dd" />
-    <public type="string" name="game_action_button_downloading" id="0x7f1206de" />
-    <public type="string" name="game_action_button_game_not_detected" id="0x7f1206df" />
-    <public type="string" name="game_action_button_install" id="0x7f1206e0" />
-    <public type="string" name="game_action_button_locate" id="0x7f1206e1" />
-    <public type="string" name="game_action_button_login_to_buy" id="0x7f1206e2" />
-    <public type="string" name="game_action_button_now_playing" id="0x7f1206e3" />
-    <public type="string" name="game_action_button_paused" id="0x7f1206e4" />
-    <public type="string" name="game_action_button_play" id="0x7f1206e5" />
-    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f1206e6" />
-    <public type="string" name="game_action_button_preorder_wait" id="0x7f1206e7" />
-    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f1206e8" />
-    <public type="string" name="game_action_button_queue" id="0x7f1206e9" />
-    <public type="string" name="game_action_button_queued" id="0x7f1206ea" />
-    <public type="string" name="game_action_button_restricted_in_region" id="0x7f1206eb" />
-    <public type="string" name="game_action_button_unavailable" id="0x7f1206ec" />
-    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f1206ed" />
-    <public type="string" name="game_action_button_unavailable_tooltip_plural" id="0x7f1206ee" />
-    <public type="string" name="game_action_button_uninstalling_1" id="0x7f1206ef" />
-    <public type="string" name="game_action_button_uninstalling_10" id="0x7f1206f0" />
-    <public type="string" name="game_action_button_uninstalling_2" id="0x7f1206f1" />
-    <public type="string" name="game_action_button_uninstalling_3" id="0x7f1206f2" />
-    <public type="string" name="game_action_button_uninstalling_4" id="0x7f1206f3" />
-    <public type="string" name="game_action_button_uninstalling_5" id="0x7f1206f4" />
-    <public type="string" name="game_action_button_uninstalling_6" id="0x7f1206f5" />
-    <public type="string" name="game_action_button_uninstalling_7" id="0x7f1206f6" />
-    <public type="string" name="game_action_button_uninstalling_8" id="0x7f1206f7" />
-    <public type="string" name="game_action_button_uninstalling_9" id="0x7f1206f8" />
-    <public type="string" name="game_action_button_update" id="0x7f1206f9" />
-    <public type="string" name="game_action_button_view_in_store" id="0x7f1206fa" />
-    <public type="string" name="game_activity" id="0x7f1206fb" />
-    <public type="string" name="game_activity_notifications" id="0x7f1206fc" />
-    <public type="string" name="game_detected" id="0x7f1206fd" />
-    <public type="string" name="game_detection_foreground_android" id="0x7f1206fe" />
-    <public type="string" name="game_detection_foreground_info_android" id="0x7f1206ff" />
-    <public type="string" name="game_detection_modal_info_android" id="0x7f120700" />
-    <public type="string" name="game_detection_open_settings" id="0x7f120701" />
-    <public type="string" name="game_detection_service" id="0x7f120702" />
-    <public type="string" name="game_feed_activity_action_play" id="0x7f120703" />
-    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f120704" />
-    <public type="string" name="game_feed_activity_recently_played" id="0x7f120705" />
-    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f120706" />
-    <public type="string" name="game_feed_current_header_title" id="0x7f120707" />
-    <public type="string" name="game_feed_settings_visibility" id="0x7f120708" />
-    <public type="string" name="game_feed_unknown_player" id="0x7f120709" />
-    <public type="string" name="game_feed_user_played_days_ago" id="0x7f12070a" />
-    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f12070b" />
-    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f12070c" />
-    <public type="string" name="game_feed_user_played_months_ago" id="0x7f12070d" />
-    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f12070e" />
-    <public type="string" name="game_feed_user_played_years_ago" id="0x7f12070f" />
-    <public type="string" name="game_feed_user_playing_for_days" id="0x7f120710" />
-    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f120711" />
-    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f120712" />
-    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f120713" />
-    <public type="string" name="game_feed_user_playing_just_started" id="0x7f120714" />
-    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f120715" />
-    <public type="string" name="game_library" id="0x7f120716" />
-    <public type="string" name="game_library_last_played_days" id="0x7f120717" />
-    <public type="string" name="game_library_last_played_hours" id="0x7f120718" />
-    <public type="string" name="game_library_last_played_just_now" id="0x7f120719" />
-    <public type="string" name="game_library_last_played_minutes" id="0x7f12071a" />
-    <public type="string" name="game_library_last_played_months" id="0x7f12071b" />
-    <public type="string" name="game_library_last_played_none" id="0x7f12071c" />
-    <public type="string" name="game_library_last_played_playing_now" id="0x7f12071d" />
-    <public type="string" name="game_library_last_played_weeks" id="0x7f12071e" />
-    <public type="string" name="game_library_last_played_years" id="0x7f12071f" />
-    <public type="string" name="game_library_list_header_last_played" id="0x7f120720" />
-    <public type="string" name="game_library_list_header_name" id="0x7f120721" />
-    <public type="string" name="game_library_list_header_platform" id="0x7f120722" />
-    <public type="string" name="game_library_new" id="0x7f120723" />
-    <public type="string" name="game_library_not_applicable" id="0x7f120724" />
-    <public type="string" name="game_library_notification_game_installed_body" id="0x7f120725" />
-    <public type="string" name="game_library_notification_game_installed_title" id="0x7f120726" />
-    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f120727" />
-    <public type="string" name="game_library_private_tooltip" id="0x7f120728" />
-    <public type="string" name="game_library_time_played_hours" id="0x7f120729" />
-    <public type="string" name="game_library_time_played_minutes" id="0x7f12072a" />
-    <public type="string" name="game_library_time_played_none" id="0x7f12072b" />
-    <public type="string" name="game_library_time_played_seconds" id="0x7f12072c" />
-    <public type="string" name="game_library_updates_action_move_up" id="0x7f12072d" />
-    <public type="string" name="game_library_updates_action_pause" id="0x7f12072e" />
-    <public type="string" name="game_library_updates_action_remove" id="0x7f12072f" />
-    <public type="string" name="game_library_updates_action_resume" id="0x7f120730" />
-    <public type="string" name="game_library_updates_header_disk" id="0x7f120731" />
-    <public type="string" name="game_library_updates_header_network" id="0x7f120732" />
-    <public type="string" name="game_library_updates_installing" id="0x7f120733" />
-    <public type="string" name="game_library_updates_installing_hours" id="0x7f120734" />
-    <public type="string" name="game_library_updates_installing_minutes" id="0x7f120735" />
-    <public type="string" name="game_library_updates_installing_seconds" id="0x7f120736" />
-    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f120737" />
-    <public type="string" name="game_library_updates_progress_downloading_text_installing" id="0x7f120738" />
-    <public type="string" name="game_library_updates_progress_downloading_text_patching" id="0x7f120739" />
-    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f12073a" />
-    <public type="string" name="game_library_updates_progress_finished" id="0x7f12073b" />
-    <public type="string" name="game_library_updates_progress_paused" id="0x7f12073c" />
-    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f12073d" />
-    <public type="string" name="game_library_updates_progress_pausing" id="0x7f12073e" />
-    <public type="string" name="game_library_updates_progress_planning" id="0x7f12073f" />
-    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f120740" />
-    <public type="string" name="game_library_updates_progress_queued" id="0x7f120741" />
-    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f120742" />
-    <public type="string" name="game_library_updates_progress_repairing" id="0x7f120743" />
-    <public type="string" name="game_library_updates_progress_verifying" id="0x7f120744" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f120745" />
-    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f120746" />
-    <public type="string" name="game_library_updates_updating" id="0x7f120747" />
-    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f120748" />
-    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f120749" />
-    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f12074a" />
-    <public type="string" name="game_popout_follow" id="0x7f12074b" />
-    <public type="string" name="game_popout_go_to_server" id="0x7f12074c" />
-    <public type="string" name="game_popout_nitro_upsell" id="0x7f12074d" />
-    <public type="string" name="game_popout_no_recent_players" id="0x7f12074e" />
-    <public type="string" name="game_popout_online_in_server" id="0x7f12074f" />
-    <public type="string" name="game_popout_unfollow" id="0x7f120750" />
-    <public type="string" name="game_popout_view_server" id="0x7f120751" />
-    <public type="string" name="games" id="0x7f120752" />
-    <public type="string" name="gcm_defaultSenderId" id="0x7f120753" />
-    <public type="string" name="general_permissions" id="0x7f120754" />
-    <public type="string" name="generate_a_new_link" id="0x7f120755" />
-    <public type="string" name="get_started" id="0x7f120756" />
-    <public type="string" name="gif" id="0x7f120757" />
-    <public type="string" name="gif_auto_play_label" id="0x7f120758" />
-    <public type="string" name="gif_auto_play_label_mobile" id="0x7f120759" />
-    <public type="string" name="gif_button_label" id="0x7f12075a" />
-    <public type="string" name="gif_picker_back_to_top" id="0x7f12075b" />
-    <public type="string" name="gif_picker_favorites" id="0x7f12075c" />
-    <public type="string" name="gif_picker_related_search" id="0x7f12075d" />
-    <public type="string" name="gif_picker_result_type_recent" id="0x7f12075e" />
-    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f12075f" />
-    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f120760" />
-    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f120761" />
-    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f120762" />
-    <public type="string" name="gift_code_auth_accept" id="0x7f120763" />
-    <public type="string" name="gift_code_auth_accepting" id="0x7f120764" />
-    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f120765" />
-    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f120766" />
-    <public type="string" name="gift_code_auth_fetching_user" id="0x7f120767" />
-    <public type="string" name="gift_code_auth_gifted" id="0x7f120768" />
-    <public type="string" name="gift_code_auth_gifted_by" id="0x7f120769" />
-    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f12076a" />
-    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f12076b" />
-    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f12076c" />
-    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f12076d" />
-    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f12076e" />
-    <public type="string" name="gift_code_auth_invalid_body" id="0x7f12076f" />
-    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f120770" />
-    <public type="string" name="gift_code_auth_invalid_title" id="0x7f120771" />
-    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f120772" />
-    <public type="string" name="gift_code_auth_resolving" id="0x7f120773" />
-    <public type="string" name="gift_code_auth_verification_sent" id="0x7f120774" />
-    <public type="string" name="gift_code_auth_verification_title" id="0x7f120775" />
-    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7f120776" />
-    <public type="string" name="gift_code_hint" id="0x7f120777" />
-    <public type="string" name="gift_confirmation_body_claimed" id="0x7f120778" />
-    <public type="string" name="gift_confirmation_body_confirm" id="0x7f120779" />
-    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f12077a" />
-    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f12077b" />
-    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f12077c" />
-    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f12077d" />
-    <public type="string" name="gift_confirmation_body_invalid" id="0x7f12077e" />
-    <public type="string" name="gift_confirmation_body_owned" id="0x7f12077f" />
-    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f120780" />
-    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f120781" />
-    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f120782" />
-    <public type="string" name="gift_confirmation_body_success" id="0x7f120783" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f120784" />
-    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f120785" />
-    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f120786" />
-    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7f120787" />
-    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7f120788" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f120789" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f12078a" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f12078b" />
-    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f12078c" />
-    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f12078d" />
-    <public type="string" name="gift_confirmation_button_confirm" id="0x7f12078e" />
-    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f12078f" />
-    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f120790" />
-    <public type="string" name="gift_confirmation_button_fail" id="0x7f120791" />
-    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f120792" />
-    <public type="string" name="gift_confirmation_button_noice" id="0x7f120793" />
-    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f120794" />
-    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f120795" />
-    <public type="string" name="gift_confirmation_header_confirm" id="0x7f120796" />
-    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f120797" />
-    <public type="string" name="gift_confirmation_header_fail" id="0x7f120798" />
-    <public type="string" name="gift_confirmation_header_success" id="0x7f120799" />
-    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f12079a" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f12079b" />
-    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f12079c" />
-    <public type="string" name="gift_embed_body_claimed_other" id="0x7f12079d" />
-    <public type="string" name="gift_embed_body_claimed_self" id="0x7f12079e" />
-    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f12079f" />
-    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f1207a0" />
-    <public type="string" name="gift_embed_body_default" id="0x7f1207a1" />
-    <public type="string" name="gift_embed_body_giveaway" id="0x7f1207a2" />
-    <public type="string" name="gift_embed_body_no_user_default" id="0x7f1207a3" />
-    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f1207a4" />
-    <public type="string" name="gift_embed_body_owned" id="0x7f1207a5" />
-    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f1207a6" />
-    <public type="string" name="gift_embed_body_requires_verification" id="0x7f1207a7" />
-    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f1207a8" />
-    <public type="string" name="gift_embed_body_self" id="0x7f1207a9" />
-    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f1207aa" />
-    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f1207ab" />
-    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f1207ac" />
-    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f1207ad" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f1207ae" />
-    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f1207af" />
-    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f1207b0" />
-    <public type="string" name="gift_embed_button_accept" id="0x7f1207b1" />
-    <public type="string" name="gift_embed_button_cant_accept" id="0x7f1207b2" />
-    <public type="string" name="gift_embed_button_claimed" id="0x7f1207b3" />
-    <public type="string" name="gift_embed_button_claiming" id="0x7f1207b4" />
-    <public type="string" name="gift_embed_button_owned" id="0x7f1207b5" />
-    <public type="string" name="gift_embed_copies_left" id="0x7f1207b6" />
-    <public type="string" name="gift_embed_expiration" id="0x7f1207b7" />
-    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f1207b8" />
-    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f1207b9" />
-    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f1207ba" />
-    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f1207bb" />
-    <public type="string" name="gift_embed_invalid" id="0x7f1207bc" />
-    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f1207bd" />
-    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f1207be" />
-    <public type="string" name="gift_embed_invalid_title_other" id="0x7f1207bf" />
-    <public type="string" name="gift_embed_invalid_title_self" id="0x7f1207c0" />
-    <public type="string" name="gift_embed_resolving" id="0x7f1207c1" />
-    <public type="string" name="gift_embed_subscriptions_left" id="0x7f1207c2" />
-    <public type="string" name="gift_embed_title" id="0x7f1207c3" />
-    <public type="string" name="gift_embed_title_self" id="0x7f1207c4" />
-    <public type="string" name="gift_embed_title_subscription" id="0x7f1207c5" />
-    <public type="string" name="gift_embed_title_subscription_self" id="0x7f1207c6" />
-    <public type="string" name="gift_embed_unknown_user" id="0x7f1207c7" />
-    <public type="string" name="gift_inventory" id="0x7f1207c8" />
-    <public type="string" name="gift_inventory_copies" id="0x7f1207c9" />
-    <public type="string" name="gift_inventory_expires_in" id="0x7f1207ca" />
-    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f1207cb" />
-    <public type="string" name="gift_inventory_generate_help" id="0x7f1207cc" />
-    <public type="string" name="gift_inventory_generate_link" id="0x7f1207cd" />
-    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f1207ce" />
-    <public type="string" name="gift_inventory_hidden" id="0x7f1207cf" />
-    <public type="string" name="gift_inventory_no_gifts" id="0x7f1207d0" />
-    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f1207d1" />
-    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f1207d2" />
-    <public type="string" name="gift_inventory_redeem_codes" id="0x7f1207d3" />
-    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f1207d4" />
-    <public type="string" name="gift_inventory_subscription_months" id="0x7f1207d5" />
-    <public type="string" name="gift_inventory_subscription_years" id="0x7f1207d6" />
-    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f1207d7" />
-    <public type="string" name="go_live_hey" id="0x7f1207d8" />
-    <public type="string" name="go_live_listen" id="0x7f1207d9" />
-    <public type="string" name="go_live_look" id="0x7f1207da" />
-    <public type="string" name="go_live_modal_application_form_title" id="0x7f1207db" />
-    <public type="string" name="go_live_modal_cta" id="0x7f1207dc" />
-    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f1207dd" />
-    <public type="string" name="go_live_modal_description" id="0x7f1207de" />
-    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f1207df" />
-    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f1207e0" />
-    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f1207e1" />
-    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f1207e2" />
-    <public type="string" name="go_live_modal_select_channel_placeholder" id="0x7f1207e3" />
-    <public type="string" name="go_live_modal_title" id="0x7f1207e4" />
-    <public type="string" name="go_live_video_drivers_outdated" id="0x7f1207e5" />
-    <public type="string" name="go_live_viewers_action_sheet_not_spectating" id="0x7f1207e6" />
-    <public type="string" name="go_live_viewers_action_sheet_spectating" id="0x7f1207e7" />
-    <public type="string" name="go_live_viewers_action_sheet_streaming" id="0x7f1207e8" />
-    <public type="string" name="go_to_developer_portal" id="0x7f1207e9" />
-    <public type="string" name="google_api_key" id="0x7f1207ea" />
-    <public type="string" name="google_app_id" id="0x7f1207eb" />
-    <public type="string" name="google_crash_reporting_api_key" id="0x7f1207ec" />
-    <public type="string" name="google_play" id="0x7f1207ed" />
-    <public type="string" name="google_storage_bucket" id="0x7f1207ee" />
-    <public type="string" name="grant_temporary_membership" id="0x7f1207ef" />
-    <public type="string" name="green" id="0x7f1207f0" />
-    <public type="string" name="grey" id="0x7f1207f1" />
-    <public type="string" name="group" id="0x7f1207f2" />
-    <public type="string" name="group_dm" id="0x7f1207f3" />
-    <public type="string" name="group_dm_add_friends" id="0x7f1207f4" />
-    <public type="string" name="group_dm_add_members" id="0x7f1207f5" />
-    <public type="string" name="group_dm_header" id="0x7f1207f6" />
-    <public type="string" name="group_dm_invite_empty" id="0x7f1207f7" />
-    <public type="string" name="group_dm_invite_full_main" id="0x7f1207f8" />
-    <public type="string" name="group_dm_invite_full_sub" id="0x7f1207f9" />
-    <public type="string" name="group_dm_invite_full_sub2" id="0x7f1207fa" />
-    <public type="string" name="group_dm_invite_link_create" id="0x7f1207fb" />
-    <public type="string" name="group_dm_invite_link_example" id="0x7f1207fc" />
-    <public type="string" name="group_dm_invite_link_title" id="0x7f1207fd" />
-    <public type="string" name="group_dm_invite_no_friends" id="0x7f1207fe" />
-    <public type="string" name="group_dm_invite_not_friends" id="0x7f1207ff" />
-    <public type="string" name="group_dm_invite_remaining" id="0x7f120800" />
-    <public type="string" name="group_dm_invite_successful_mobile" id="0x7f120801" />
-    <public type="string" name="group_dm_invite_to" id="0x7f120802" />
-    <public type="string" name="group_dm_invite_unselect_users" id="0x7f120803" />
-    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f120804" />
-    <public type="string" name="group_dm_invite_with_name" id="0x7f120805" />
-    <public type="string" name="group_dm_search_placeholder" id="0x7f120806" />
-    <public type="string" name="group_dm_settings" id="0x7f120807" />
-    <public type="string" name="group_name" id="0x7f120808" />
-    <public type="string" name="group_owner" id="0x7f120809" />
-    <public type="string" name="groups" id="0x7f12080a" />
-    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f12080b" />
-    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f12080c" />
-    <public type="string" name="guild_analytics_guild_header_tooltip" id="0x7f12080d" />
-    <public type="string" name="guild_discovery_header_e3_games" id="0x7f12080e" />
-    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f12080f" />
-    <public type="string" name="guild_discovery_header_popular_servers" id="0x7f120810" />
-    <public type="string" name="guild_discovery_header_search_results" id="0x7f120811" />
-    <public type="string" name="guild_discovery_header_trending_games" id="0x7f120812" />
-    <public type="string" name="guild_discovery_search_empty_description" id="0x7f120813" />
-    <public type="string" name="guild_discovery_search_empty_title" id="0x7f120814" />
-    <public type="string" name="guild_discovery_search_header" id="0x7f120815" />
-    <public type="string" name="guild_discovery_search_label" id="0x7f120816" />
-    <public type="string" name="guild_discovery_search_placeholder" id="0x7f120817" />
-    <public type="string" name="guild_discovery_search_press_enter" id="0x7f120818" />
-    <public type="string" name="guild_discovery_tooltip" id="0x7f120819" />
-    <public type="string" name="guild_discovery_trending_game_description" id="0x7f12081a" />
-    <public type="string" name="guild_discovery_view_button" id="0x7f12081b" />
-    <public type="string" name="guild_folder_color" id="0x7f12081c" />
-    <public type="string" name="guild_folder_name" id="0x7f12081d" />
-    <public type="string" name="guild_header_hotspot_tooltip" id="0x7f12081e" />
-    <public type="string" name="guild_join_intent_chat" id="0x7f12081f" />
-    <public type="string" name="guild_join_intent_chat_friends" id="0x7f120820" />
-    <public type="string" name="guild_join_intent_game_help" id="0x7f120821" />
-    <public type="string" name="guild_join_intent_lfg" id="0x7f120822" />
-    <public type="string" name="guild_join_intent_news" id="0x7f120823" />
-    <public type="string" name="guild_join_intent_skip" id="0x7f120824" />
-    <public type="string" name="guild_join_welcome_to_server" id="0x7f120825" />
-    <public type="string" name="guild_join_what_are_you_looking_to_do" id="0x7f120826" />
-    <public type="string" name="guild_members_header" id="0x7f120827" />
-    <public type="string" name="guild_members_search_no_result" id="0x7f120828" />
-    <public type="string" name="guild_message_notifications_only_mentions" id="0x7f120829" />
-    <public type="string" name="guild_muted_help_text" id="0x7f12082a" />
-    <public type="string" name="guild_owner" id="0x7f12082b" />
-    <public type="string" name="guild_partnered" id="0x7f12082c" />
-    <public type="string" name="guild_popout_emoji_remaining" id="0x7f12082d" />
-    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f12082e" />
-    <public type="string" name="guild_popout_unavailable_header" id="0x7f12082f" />
-    <public type="string" name="guild_popout_view_server_button" id="0x7f120830" />
-    <public type="string" name="guild_premium" id="0x7f120831" />
-    <public type="string" name="guild_security_req_mfa_body" id="0x7f120832" />
-    <public type="string" name="guild_security_req_mfa_enable" id="0x7f120833" />
-    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f120834" />
-    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f120835" />
-    <public type="string" name="guild_security_req_mfa_label" id="0x7f120836" />
-    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f120837" />
-    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f120838" />
-    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f120839" />
-    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f12083a" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f12083b" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f12083c" />
-    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f12083d" />
-    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f12083e" />
-    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f12083f" />
-    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f120840" />
-    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f120841" />
-    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f120842" />
-    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f120843" />
-    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f120844" />
-    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f120845" />
-    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f120846" />
-    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f120847" />
-    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f120848" />
-    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f120849" />
-    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f12084a" />
-    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f12084b" />
-    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f12084c" />
-    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f12084d" />
-    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f12084e" />
-    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f12084f" />
-    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f120850" />
-    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f120851" />
-    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f120852" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f120853" />
-    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f120854" />
-    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f120855" />
-    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f120856" />
-    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f120857" />
-    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f120858" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f120859" />
-    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f12085a" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f12085b" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f12085c" />
-    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f12085d" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_create" id="0x7f12085e" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f12085f" />
-    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f120860" />
-    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f120861" />
-    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f120862" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f120863" />
-    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f120864" />
-    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f120865" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f120866" />
-    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f120867" />
-    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f120868" />
-    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f120869" />
-    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f12086a" />
-    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f12086b" />
-    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f12086c" />
-    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f12086d" />
-    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f12086e" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f12086f" />
-    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f120870" />
-    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f120871" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f120872" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f120873" />
-    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f120874" />
-    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f120875" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f120876" />
-    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f120877" />
-    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f120878" />
-    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f120879" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f12087a" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f12087b" />
-    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f12087c" />
-    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f12087d" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f12087e" />
-    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f12087f" />
-    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f120880" />
-    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f120881" />
-    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7f120882" />
-    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f120883" />
-    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f120884" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f120885" />
-    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f120886" />
-    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f120887" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f120888" />
-    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f120889" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f12088a" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f12088b" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f12088c" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f12088d" />
-    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f12088e" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f12088f" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f120890" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f120891" />
-    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f120892" />
-    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f120893" />
-    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f120894" />
-    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f120895" />
-    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f120896" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f120897" />
-    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f120898" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f120899" />
-    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f12089a" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f12089b" />
-    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f12089c" />
-    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f12089d" />
-    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f12089e" />
-    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f12089f" />
-    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f1208a0" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f1208a1" />
-    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f1208a2" />
-    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f1208a3" />
-    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f1208a4" />
-    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f1208a5" />
-    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f1208a6" />
-    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f1208a7" />
-    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f1208a8" />
-    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f1208a9" />
-    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f1208aa" />
-    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f1208ab" />
-    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f1208ac" />
-    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f1208ad" />
-    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f1208ae" />
-    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f1208af" />
-    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f1208b0" />
-    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f1208b1" />
-    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f1208b2" />
-    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f1208b3" />
-    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f1208b4" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f1208b5" />
-    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f1208b6" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f1208b7" />
-    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f1208b8" />
-    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f1208b9" />
-    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f1208ba" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f1208bb" />
-    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f1208bc" />
-    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f1208bd" />
-    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f1208be" />
-    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f1208bf" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f1208c0" />
-    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f1208c1" />
-    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f1208c2" />
-    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f1208c3" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f1208c4" />
-    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f1208c5" />
-    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f1208c6" />
-    <public type="string" name="guild_settings_banner_recommend" id="0x7f1208c7" />
-    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f1208c8" />
-    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f1208c9" />
-    <public type="string" name="guild_settings_emoji_alias" id="0x7f1208ca" />
-    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f1208cb" />
-    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f1208cc" />
-    <public type="string" name="guild_settings_enable_discoverable" id="0x7f1208cd" />
-    <public type="string" name="guild_settings_enable_featurable" id="0x7f1208ce" />
-    <public type="string" name="guild_settings_featurable_disabled_tooltip" id="0x7f1208cf" />
-    <public type="string" name="guild_settings_filter_action" id="0x7f1208d0" />
-    <public type="string" name="guild_settings_filter_all" id="0x7f1208d1" />
-    <public type="string" name="guild_settings_filter_all_actions" id="0x7f1208d2" />
-    <public type="string" name="guild_settings_filter_all_users" id="0x7f1208d3" />
-    <public type="string" name="guild_settings_filter_user" id="0x7f1208d4" />
-    <public type="string" name="guild_settings_filtered_action" id="0x7f1208d5" />
-    <public type="string" name="guild_settings_filtered_user" id="0x7f1208d6" />
-    <public type="string" name="guild_settings_follower_analytics" id="0x7f1208d7" />
-    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f1208d8" />
-    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f1208d9" />
-    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f1208da" />
-    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f1208db" />
-    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f1208dc" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f1208dd" />
-    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f1208de" />
-    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f1208df" />
-    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f1208e0" />
-    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f1208e1" />
-    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f1208e2" />
-    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f1208e3" />
-    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f1208e4" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f1208e5" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f1208e6" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f1208e7" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f1208e8" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f1208e9" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f1208ea" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f1208eb" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f1208ec" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f1208ed" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f1208ee" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f1208ef" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f1208f0" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f1208f1" />
-    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f1208f2" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f1208f3" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f1208f4" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f1208f5" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f1208f6" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f1208f7" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f1208f8" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f1208f9" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f1208fa" />
-    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f1208fb" />
-    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f1208fc" />
-    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f1208fd" />
-    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f1208fe" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f1208ff" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f120900" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f120901" />
-    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f120902" />
-    <public type="string" name="guild_settings_icon_recommend" id="0x7f120903" />
-    <public type="string" name="guild_settings_label_audit_log" id="0x7f120904" />
-    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f120905" />
-    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f120906" />
-    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f120907" />
-    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f120908" />
-    <public type="string" name="guild_settings_members_all_members" id="0x7f120909" />
-    <public type="string" name="guild_settings_members_display_role" id="0x7f12090a" />
-    <public type="string" name="guild_settings_members_server_members" id="0x7f12090b" />
-    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f12090c" />
-    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f12090d" />
-    <public type="string" name="guild_settings_overview_notice" id="0x7f12090e" />
-    <public type="string" name="guild_settings_overview_tier_info" id="0x7f12090f" />
-    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f120910" />
-    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f120911" />
-    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f120912" />
-    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f120913" />
-    <public type="string" name="guild_settings_premium_guild_title" id="0x7f120914" />
-    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f120915" />
-    <public type="string" name="guild_settings_server_banner" id="0x7f120916" />
-    <public type="string" name="guild_settings_server_invite_background" id="0x7f120917" />
-    <public type="string" name="guild_settings_splash_info" id="0x7f120918" />
-    <public type="string" name="guild_settings_splash_recommend" id="0x7f120919" />
-    <public type="string" name="guild_settings_title_server_widget" id="0x7f12091a" />
-    <public type="string" name="guild_settings_widget_embed_help" id="0x7f12091b" />
-    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f12091c" />
-    <public type="string" name="guild_unavailable_body" id="0x7f12091d" />
-    <public type="string" name="guild_unavailable_body_alt" id="0x7f12091e" />
-    <public type="string" name="guild_unavailable_header" id="0x7f12091f" />
-    <public type="string" name="guild_unavailable_title" id="0x7f120920" />
-    <public type="string" name="guild_unavailable_title_alt" id="0x7f120921" />
-    <public type="string" name="guild_verification_text_account_age" id="0x7f120922" />
-    <public type="string" name="guild_verification_text_member_age" id="0x7f120923" />
-    <public type="string" name="guild_verification_text_not_claimed" id="0x7f120924" />
-    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f120925" />
-    <public type="string" name="guild_verification_text_not_verified" id="0x7f120926" />
-    <public type="string" name="guild_verified" id="0x7f120927" />
-    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f120928" />
-    <public type="string" name="guild_voice_channel_empty_header_mobile" id="0x7f120929" />
-    <public type="string" name="hardware_acceleration" id="0x7f12092a" />
-    <public type="string" name="hardware_acceleration_help_text" id="0x7f12092b" />
-    <public type="string" name="help" id="0x7f12092c" />
-    <public type="string" name="help_desk" id="0x7f12092d" />
-    <public type="string" name="help_missing_manage_roles_permission" id="0x7f12092e" />
-    <public type="string" name="help_missing_permission" id="0x7f12092f" />
-    <public type="string" name="help_role_locked" id="0x7f120930" />
-    <public type="string" name="help_role_locked_mine" id="0x7f120931" />
-    <public type="string" name="help_singular_permission" id="0x7f120932" />
-    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f120933" />
-    <public type="string" name="hide_instant_invites_description" id="0x7f120934" />
-    <public type="string" name="hide_instant_invites_label" id="0x7f120935" />
-    <public type="string" name="hide_muted" id="0x7f120936" />
-    <public type="string" name="hide_muted_channels" id="0x7f120937" />
-    <public type="string" name="hide_personal_information_description" id="0x7f120938" />
-    <public type="string" name="hide_personal_information_label" id="0x7f120939" />
-    <public type="string" name="hold_up" id="0x7f12093a" />
-    <public type="string" name="home" id="0x7f12093b" />
-    <public type="string" name="how_to_invite_others" id="0x7f12093c" />
-    <public type="string" name="hr" id="0x7f12093d" />
-    <public type="string" name="hu" id="0x7f12093e" />
-    <public type="string" name="hypesquad_attendee_cta" id="0x7f12093f" />
-    <public type="string" name="hypesquad_badge_tooltip" id="0x7f120940" />
-    <public type="string" name="hypesquad_description_house_1" id="0x7f120941" />
-    <public type="string" name="hypesquad_description_house_2" id="0x7f120942" />
-    <public type="string" name="hypesquad_description_house_3" id="0x7f120943" />
-    <public type="string" name="hypesquad_error_body" id="0x7f120944" />
-    <public type="string" name="hypesquad_error_heading" id="0x7f120945" />
-    <public type="string" name="hypesquad_heading" id="0x7f120946" />
-    <public type="string" name="hypesquad_heading_existing_member" id="0x7f120947" />
-    <public type="string" name="hypesquad_house_1" id="0x7f120948" />
-    <public type="string" name="hypesquad_house_2" id="0x7f120949" />
-    <public type="string" name="hypesquad_house_3" id="0x7f12094a" />
-    <public type="string" name="hypesquad_join" id="0x7f12094b" />
-    <public type="string" name="hypesquad_leave_action" id="0x7f12094c" />
-    <public type="string" name="hypesquad_leave_error" id="0x7f12094d" />
-    <public type="string" name="hypesquad_leave_prompt" id="0x7f12094e" />
-    <public type="string" name="hypesquad_membership_heading" id="0x7f12094f" />
-    <public type="string" name="hypesquad_newsletter_warning" id="0x7f120950" />
-    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f120951" />
-    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120952" />
-    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120953" />
-    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120954" />
-    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f120955" />
-    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f120956" />
-    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f120957" />
-    <public type="string" name="hypesquad_perks_heading" id="0x7f120958" />
-    <public type="string" name="hypesquad_question_0_prompt" id="0x7f120959" />
-    <public type="string" name="hypesquad_question_0_response_a" id="0x7f12095a" />
-    <public type="string" name="hypesquad_question_0_response_b" id="0x7f12095b" />
-    <public type="string" name="hypesquad_question_0_response_c" id="0x7f12095c" />
-    <public type="string" name="hypesquad_question_0_response_d" id="0x7f12095d" />
-    <public type="string" name="hypesquad_question_10_prompt" id="0x7f12095e" />
-    <public type="string" name="hypesquad_question_10_response_a" id="0x7f12095f" />
-    <public type="string" name="hypesquad_question_10_response_b" id="0x7f120960" />
-    <public type="string" name="hypesquad_question_10_response_c" id="0x7f120961" />
-    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120962" />
-    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120963" />
-    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120964" />
-    <public type="string" name="hypesquad_question_11_response_b" id="0x7f120965" />
-    <public type="string" name="hypesquad_question_11_response_c" id="0x7f120966" />
-    <public type="string" name="hypesquad_question_11_response_d" id="0x7f120967" />
-    <public type="string" name="hypesquad_question_12_prompt" id="0x7f120968" />
-    <public type="string" name="hypesquad_question_12_response_a" id="0x7f120969" />
-    <public type="string" name="hypesquad_question_12_response_b" id="0x7f12096a" />
-    <public type="string" name="hypesquad_question_12_response_c" id="0x7f12096b" />
-    <public type="string" name="hypesquad_question_12_response_d" id="0x7f12096c" />
-    <public type="string" name="hypesquad_question_13_prompt" id="0x7f12096d" />
-    <public type="string" name="hypesquad_question_13_response_a" id="0x7f12096e" />
-    <public type="string" name="hypesquad_question_13_response_b" id="0x7f12096f" />
-    <public type="string" name="hypesquad_question_13_response_c" id="0x7f120970" />
-    <public type="string" name="hypesquad_question_13_response_d" id="0x7f120971" />
-    <public type="string" name="hypesquad_question_14_prompt" id="0x7f120972" />
-    <public type="string" name="hypesquad_question_14_response_a" id="0x7f120973" />
-    <public type="string" name="hypesquad_question_14_response_b" id="0x7f120974" />
-    <public type="string" name="hypesquad_question_14_response_c" id="0x7f120975" />
-    <public type="string" name="hypesquad_question_14_response_d" id="0x7f120976" />
-    <public type="string" name="hypesquad_question_1_prompt" id="0x7f120977" />
-    <public type="string" name="hypesquad_question_1_response_a" id="0x7f120978" />
-    <public type="string" name="hypesquad_question_1_response_b" id="0x7f120979" />
-    <public type="string" name="hypesquad_question_1_response_c" id="0x7f12097a" />
-    <public type="string" name="hypesquad_question_1_response_d" id="0x7f12097b" />
-    <public type="string" name="hypesquad_question_2_prompt" id="0x7f12097c" />
-    <public type="string" name="hypesquad_question_2_response_a" id="0x7f12097d" />
-    <public type="string" name="hypesquad_question_2_response_b" id="0x7f12097e" />
-    <public type="string" name="hypesquad_question_2_response_c" id="0x7f12097f" />
-    <public type="string" name="hypesquad_question_2_response_d" id="0x7f120980" />
-    <public type="string" name="hypesquad_question_3_prompt" id="0x7f120981" />
-    <public type="string" name="hypesquad_question_3_response_a" id="0x7f120982" />
-    <public type="string" name="hypesquad_question_3_response_b" id="0x7f120983" />
-    <public type="string" name="hypesquad_question_3_response_c" id="0x7f120984" />
-    <public type="string" name="hypesquad_question_3_response_d" id="0x7f120985" />
-    <public type="string" name="hypesquad_question_4_prompt" id="0x7f120986" />
-    <public type="string" name="hypesquad_question_4_response_a" id="0x7f120987" />
-    <public type="string" name="hypesquad_question_4_response_b" id="0x7f120988" />
-    <public type="string" name="hypesquad_question_4_response_c" id="0x7f120989" />
-    <public type="string" name="hypesquad_question_4_response_d" id="0x7f12098a" />
-    <public type="string" name="hypesquad_question_5_prompt" id="0x7f12098b" />
-    <public type="string" name="hypesquad_question_5_response_a" id="0x7f12098c" />
-    <public type="string" name="hypesquad_question_5_response_b" id="0x7f12098d" />
-    <public type="string" name="hypesquad_question_5_response_c" id="0x7f12098e" />
-    <public type="string" name="hypesquad_question_5_response_d" id="0x7f12098f" />
-    <public type="string" name="hypesquad_question_6_prompt" id="0x7f120990" />
-    <public type="string" name="hypesquad_question_6_response_a" id="0x7f120991" />
-    <public type="string" name="hypesquad_question_6_response_b" id="0x7f120992" />
-    <public type="string" name="hypesquad_question_6_response_c" id="0x7f120993" />
-    <public type="string" name="hypesquad_question_6_response_d" id="0x7f120994" />
-    <public type="string" name="hypesquad_question_7_prompt" id="0x7f120995" />
-    <public type="string" name="hypesquad_question_7_response_a" id="0x7f120996" />
-    <public type="string" name="hypesquad_question_7_response_b" id="0x7f120997" />
-    <public type="string" name="hypesquad_question_7_response_c" id="0x7f120998" />
-    <public type="string" name="hypesquad_question_7_response_d" id="0x7f120999" />
-    <public type="string" name="hypesquad_question_8_prompt" id="0x7f12099a" />
-    <public type="string" name="hypesquad_question_8_response_a" id="0x7f12099b" />
-    <public type="string" name="hypesquad_question_8_response_b" id="0x7f12099c" />
-    <public type="string" name="hypesquad_question_8_response_c" id="0x7f12099d" />
-    <public type="string" name="hypesquad_question_8_response_d" id="0x7f12099e" />
-    <public type="string" name="hypesquad_question_9_prompt" id="0x7f12099f" />
-    <public type="string" name="hypesquad_question_9_response_a" id="0x7f1209a0" />
-    <public type="string" name="hypesquad_question_9_response_b" id="0x7f1209a1" />
-    <public type="string" name="hypesquad_question_9_response_c" id="0x7f1209a2" />
-    <public type="string" name="hypesquad_question_9_response_d" id="0x7f1209a3" />
-    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f1209a4" />
-    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f1209a5" />
-    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f1209a6" />
-    <public type="string" name="hypesquad_quiz_cancel" id="0x7f1209a7" />
-    <public type="string" name="hypesquad_quiz_close" id="0x7f1209a8" />
-    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f1209a9" />
-    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f1209aa" />
-    <public type="string" name="hypesquad_quiz_next_question" id="0x7f1209ab" />
-    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f1209ac" />
-    <public type="string" name="hypesquad_quiz_retry" id="0x7f1209ad" />
-    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f1209ae" />
-    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f1209af" />
-    <public type="string" name="hypesquad_quiz_title" id="0x7f1209b0" />
-    <public type="string" name="hypesquad_ready_to_rep" id="0x7f1209b1" />
-    <public type="string" name="hypesquad_subheading" id="0x7f1209b2" />
-    <public type="string" name="hypesquad_switch_houses_action" id="0x7f1209b3" />
-    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f1209b4" />
-    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f1209b5" />
-    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f1209b6" />
-    <public type="string" name="hypesquad_your_house" id="0x7f1209b7" />
-    <public type="string" name="i18n_locale_loading_error" id="0x7f1209b8" />
-    <public type="string" name="image" id="0x7f1209b9" />
-    <public type="string" name="images" id="0x7f1209ba" />
-    <public type="string" name="img_alt_attachment_file_type" id="0x7f1209bb" />
-    <public type="string" name="img_alt_emoji" id="0x7f1209bc" />
-    <public type="string" name="img_alt_icon" id="0x7f1209bd" />
-    <public type="string" name="img_alt_logo" id="0x7f1209be" />
-    <public type="string" name="img_alt_navigate_to" id="0x7f1209bf" />
-    <public type="string" name="in_a_voice_channel" id="0x7f1209c0" />
-    <public type="string" name="in_category" id="0x7f1209c1" />
-    <public type="string" name="in_game_voice_settings" id="0x7f1209c2" />
-    <public type="string" name="in_the_call" id="0x7f1209c3" />
-    <public type="string" name="in_the_voice_channel" id="0x7f1209c4" />
-    <public type="string" name="incoming_call" id="0x7f1209c5" />
-    <public type="string" name="incoming_call_dm" id="0x7f1209c6" />
-    <public type="string" name="incoming_call_ellipsis" id="0x7f1209c7" />
-    <public type="string" name="incoming_call_gdm" id="0x7f1209c8" />
-    <public type="string" name="incoming_friend_request" id="0x7f1209c9" />
-    <public type="string" name="incoming_video_call" id="0x7f1209ca" />
-    <public type="string" name="incoming_video_call_ellipsis" id="0x7f1209cb" />
-    <public type="string" name="incompatible_browser" id="0x7f1209cc" />
-    <public type="string" name="inivte_modal_no_thanks" id="0x7f1209cd" />
-    <public type="string" name="inline_attachment_media" id="0x7f1209ce" />
-    <public type="string" name="inline_attachment_media_help" id="0x7f1209cf" />
-    <public type="string" name="inline_embed_media" id="0x7f1209d0" />
-    <public type="string" name="inline_media_label" id="0x7f1209d1" />
-    <public type="string" name="input_mode_ptt" id="0x7f1209d2" />
-    <public type="string" name="input_mode_ptt_limited" id="0x7f1209d3" />
-    <public type="string" name="input_mode_ptt_release_delay" id="0x7f1209d4" />
-    <public type="string" name="input_mode_vad" id="0x7f1209d5" />
-    <public type="string" name="instagram" id="0x7f1209d6" />
-    <public type="string" name="install_location_main" id="0x7f1209d7" />
-    <public type="string" name="instant_invite" id="0x7f1209d8" />
-    <public type="string" name="instant_invite_accept" id="0x7f1209d9" />
-    <public type="string" name="instant_invite_accepted" id="0x7f1209da" />
-    <public type="string" name="instant_invite_accepting" id="0x7f1209db" />
-    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f1209dc" />
-    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f1209dd" />
-    <public type="string" name="instant_invite_banned" id="0x7f1209de" />
-    <public type="string" name="instant_invite_banned_info" id="0x7f1209df" />
-    <public type="string" name="instant_invite_code" id="0x7f1209e0" />
-    <public type="string" name="instant_invite_expired" id="0x7f1209e1" />
-    <public type="string" name="instant_invite_expires" id="0x7f1209e2" />
-    <public type="string" name="instant_invite_failed_to_generate" id="0x7f1209e3" />
-    <public type="string" name="instant_invite_friends" id="0x7f1209e4" />
-    <public type="string" name="instant_invite_friends_description" id="0x7f1209e5" />
-    <public type="string" name="instant_invite_generate" id="0x7f1209e6" />
-    <public type="string" name="instant_invite_generated_by_widget" id="0x7f1209e7" />
-    <public type="string" name="instant_invite_guild_by_user" id="0x7f1209e8" />
-    <public type="string" name="instant_invite_guild_members_online" id="0x7f1209e9" />
-    <public type="string" name="instant_invite_guild_members_total" id="0x7f1209ea" />
-    <public type="string" name="instant_invite_hidden" id="0x7f1209eb" />
-    <public type="string" name="instant_invite_invalid_channel" id="0x7f1209ec" />
-    <public type="string" name="instant_invite_invite_code" id="0x7f1209ed" />
-    <public type="string" name="instant_invite_inviter" id="0x7f1209ee" />
-    <public type="string" name="instant_invite_join" id="0x7f1209ef" />
-    <public type="string" name="instant_invite_link_share_text" id="0x7f1209f0" />
-    <public type="string" name="instant_invite_looks_like" id="0x7f1209f1" />
-    <public type="string" name="instant_invite_not_allowed" id="0x7f1209f2" />
-    <public type="string" name="instant_invite_popout" id="0x7f1209f3" />
-    <public type="string" name="instant_invite_regenerate" id="0x7f1209f4" />
-    <public type="string" name="instant_invite_resolved_body" id="0x7f1209f5" />
-    <public type="string" name="instant_invite_resolved_title" id="0x7f1209f6" />
-    <public type="string" name="instant_invite_resolving" id="0x7f1209f7" />
-    <public type="string" name="instant_invite_uses" id="0x7f1209f8" />
-    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f1209f9" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f1209fa" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f1209fb" />
-    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f1209fc" />
-    <public type="string" name="instant_invites" id="0x7f1209fd" />
-    <public type="string" name="integration_settings" id="0x7f1209fe" />
-    <public type="string" name="integrations" id="0x7f1209ff" />
-    <public type="string" name="integrations_header" id="0x7f120a00" />
-    <public type="string" name="integrations_pro_tip" id="0x7f120a01" />
-    <public type="string" name="interaction_required_body" id="0x7f120a02" />
-    <public type="string" name="interaction_required_title" id="0x7f120a03" />
-    <public type="string" name="internal_server_error" id="0x7f120a04" />
-    <public type="string" name="invalid_animated_emoji_body" id="0x7f120a05" />
-    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f120a06" />
-    <public type="string" name="invalid_external_emoji_body" id="0x7f120a07" />
-    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f120a08" />
-    <public type="string" name="invalid_invite_link_error" id="0x7f120a09" />
-    <public type="string" name="invalid_request_format" id="0x7f120a0a" />
-    <public type="string" name="invalid_text_channel" id="0x7f120a0b" />
-    <public type="string" name="invalid_voice_channel" id="0x7f120a0c" />
-    <public type="string" name="invite_banner_does_not_expire" id="0x7f120a0d" />
-    <public type="string" name="invite_banner_invite_to_server" id="0x7f120a0e" />
-    <public type="string" name="invite_banner_share_invite_link_for_access" id="0x7f120a0f" />
-    <public type="string" name="invite_button_accepted" id="0x7f120a10" />
-    <public type="string" name="invite_button_accepting" id="0x7f120a11" />
-    <public type="string" name="invite_button_expired" id="0x7f120a12" />
-    <public type="string" name="invite_button_expired_owner" id="0x7f120a13" />
-    <public type="string" name="invite_button_invalid" id="0x7f120a14" />
-    <public type="string" name="invite_button_invalid_owner" id="0x7f120a15" />
-    <public type="string" name="invite_button_join" id="0x7f120a16" />
-    <public type="string" name="invite_button_resolving" id="0x7f120a17" />
-    <public type="string" name="invite_button_stream_ended" id="0x7f120a18" />
-    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f120a19" />
-    <public type="string" name="invite_button_stream_watching" id="0x7f120a1a" />
-    <public type="string" name="invite_button_streamer" id="0x7f120a1b" />
-    <public type="string" name="invite_button_streaming" id="0x7f120a1c" />
-    <public type="string" name="invite_button_streaming_subtext" id="0x7f120a1d" />
-    <public type="string" name="invite_button_title_invited" id="0x7f120a1e" />
-    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f120a1f" />
-    <public type="string" name="invite_button_title_invited_invalid" id="0x7f120a20" />
-    <public type="string" name="invite_button_title_invited_lfg_gdm" id="0x7f120a21" />
-    <public type="string" name="invite_button_title_invited_stream" id="0x7f120a22" />
-    <public type="string" name="invite_button_title_inviter" id="0x7f120a23" />
-    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f120a24" />
-    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f120a25" />
-    <public type="string" name="invite_button_title_inviter_lfg_gdm" id="0x7f120a26" />
-    <public type="string" name="invite_button_title_inviter_stream" id="0x7f120a27" />
-    <public type="string" name="invite_button_title_streaming" id="0x7f120a28" />
-    <public type="string" name="invite_copied" id="0x7f120a29" />
-    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f120a2a" />
-    <public type="string" name="invite_edit_link" id="0x7f120a2b" />
-    <public type="string" name="invite_embed_full_group" id="0x7f120a2c" />
-    <public type="string" name="invite_embed_full_group_spectate" id="0x7f120a2d" />
-    <public type="string" name="invite_embed_game_has_ended" id="0x7f120a2e" />
-    <public type="string" name="invite_embed_game_invite" id="0x7f120a2f" />
-    <public type="string" name="invite_embed_game_not_detected" id="0x7f120a30" />
-    <public type="string" name="invite_embed_in_group" id="0x7f120a31" />
-    <public type="string" name="invite_embed_invite_to_join" id="0x7f120a32" />
-    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f120a33" />
-    <public type="string" name="invite_embed_invite_to_listen" id="0x7f120a34" />
-    <public type="string" name="invite_embed_invite_to_spectate" id="0x7f120a35" />
-    <public type="string" name="invite_embed_invite_to_watch" id="0x7f120a36" />
-    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f120a37" />
-    <public type="string" name="invite_embed_joined" id="0x7f120a38" />
-    <public type="string" name="invite_embed_listen_has_ended" id="0x7f120a39" />
-    <public type="string" name="invite_embed_listening_invite" id="0x7f120a3a" />
-    <public type="string" name="invite_embed_num_open_slots" id="0x7f120a3b" />
-    <public type="string" name="invite_embed_num_open_slots_android" id="0x7f120a3c" />
-    <public type="string" name="invite_embed_send_invite" id="0x7f120a3d" />
-    <public type="string" name="invite_embed_spectate" id="0x7f120a3e" />
-    <public type="string" name="invite_embed_spectate_via_desktop_app" id="0x7f120a3f" />
-    <public type="string" name="invite_embed_watch_has_ended" id="0x7f120a40" />
-    <public type="string" name="invite_expired_subtext_mobile" id="0x7f120a41" />
-    <public type="string" name="invite_expires_days" id="0x7f120a42" />
-    <public type="string" name="invite_expires_days_or_uses" id="0x7f120a43" />
-    <public type="string" name="invite_expires_hours" id="0x7f120a44" />
-    <public type="string" name="invite_expires_hours_or_uses" id="0x7f120a45" />
-    <public type="string" name="invite_expires_minutes" id="0x7f120a46" />
-    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f120a47" />
-    <public type="string" name="invite_expires_never" id="0x7f120a48" />
-    <public type="string" name="invite_expires_uses" id="0x7f120a49" />
-    <public type="string" name="invite_footer_link_header" id="0x7f120a4a" />
-    <public type="string" name="invite_friend_modal_invite" id="0x7f120a4b" />
-    <public type="string" name="invite_friend_modal_loading" id="0x7f120a4c" />
-    <public type="string" name="invite_friend_modal_no_results" id="0x7f120a4d" />
-    <public type="string" name="invite_friend_modal_retry" id="0x7f120a4e" />
-    <public type="string" name="invite_friend_modal_sent" id="0x7f120a4f" />
-    <public type="string" name="invite_friend_modal_subtitle" id="0x7f120a50" />
-    <public type="string" name="invite_friend_modal_title" id="0x7f120a51" />
-    <public type="string" name="invite_friends" id="0x7f120a52" />
-    <public type="string" name="invite_invalid_cta" id="0x7f120a53" />
-    <public type="string" name="invite_invalid_error" id="0x7f120a54" />
-    <public type="string" name="invite_link_copied" id="0x7f120a55" />
-    <public type="string" name="invite_link_example_full" id="0x7f120a56" />
-    <public type="string" name="invite_link_example_simple" id="0x7f120a57" />
-    <public type="string" name="invite_link_example_verified" id="0x7f120a58" />
-    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120a59" />
-    <public type="string" name="invite_links_never_expires" id="0x7f120a5a" />
-    <public type="string" name="invite_members" id="0x7f120a5b" />
-    <public type="string" name="invite_modal_button" id="0x7f120a5c" />
-    <public type="string" name="invite_modal_error_default" id="0x7f120a5d" />
-    <public type="string" name="invite_modal_error_title" id="0x7f120a5e" />
-    <public type="string" name="invite_modal_open_button" id="0x7f120a5f" />
-    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120a60" />
-    <public type="string" name="invite_no_channels" id="0x7f120a61" />
-    <public type="string" name="invite_no_thanks" id="0x7f120a62" />
-    <public type="string" name="invite_notice_message" id="0x7f120a63" />
-    <public type="string" name="invite_notice_message_part_2" id="0x7f120a64" />
-    <public type="string" name="invite_people" id="0x7f120a65" />
-    <public type="string" name="invite_private_call_heads_up" id="0x7f120a66" />
-    <public type="string" name="invite_search_for_friends" id="0x7f120a67" />
-    <public type="string" name="invite_sent" id="0x7f120a68" />
-    <public type="string" name="invite_settings_expired_description" id="0x7f120a69" />
-    <public type="string" name="invite_settings_title" id="0x7f120a6a" />
-    <public type="string" name="invite_share_default" id="0x7f120a6b" />
-    <public type="string" name="invite_share_link_own_server" id="0x7f120a6c" />
-    <public type="string" name="invite_share_link_to_stream" id="0x7f120a6d" />
-    <public type="string" name="invite_stream_footer_link_header" id="0x7f120a6e" />
-    <public type="string" name="invite_stream_header" id="0x7f120a6f" />
-    <public type="string" name="invite_to_server" id="0x7f120a70" />
-    <public type="string" name="invite_to_server_name" id="0x7f120a71" />
-    <public type="string" name="invite_to_server_name_experiment" id="0x7f120a72" />
-    <public type="string" name="invite_url" id="0x7f120a73" />
-    <public type="string" name="invite_voice_empty_mobile" id="0x7f120a74" />
-    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120a75" />
-    <public type="string" name="invite_your_friends_voice_call_mobile" id="0x7f120a76" />
-    <public type="string" name="invites" id="0x7f120a77" />
-    <public type="string" name="ios_camera" id="0x7f120a78" />
-    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120a79" />
-    <public type="string" name="ios_iap_itunes_error" id="0x7f120a7a" />
-    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120a7b" />
-    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120a7c" />
-    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120a7d" />
-    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120a7e" />
-    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120a7f" />
-    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120a80" />
-    <public type="string" name="ios_iap_testflight_error" id="0x7f120a81" />
-    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120a82" />
-    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120a83" />
-    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120a84" />
-    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120a85" />
-    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120a86" />
-    <public type="string" name="ios_media_keyboard_take_a_photo" id="0x7f120a87" />
-    <public type="string" name="ios_notification_see_full" id="0x7f120a88" />
-    <public type="string" name="ios_profile_in_voice_call" id="0x7f120a89" />
-    <public type="string" name="ios_profile_mutual_friends" id="0x7f120a8a" />
-    <public type="string" name="ios_profile_mutual_friends_placeholder" id="0x7f120a8b" />
-    <public type="string" name="ios_profile_mutual_guilds" id="0x7f120a8c" />
-    <public type="string" name="ios_profile_mutual_guilds_placeholder" id="0x7f120a8d" />
-    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120a8e" />
-    <public type="string" name="ios_view_all" id="0x7f120a8f" />
-    <public type="string" name="ip_address_secured" id="0x7f120a90" />
-    <public type="string" name="ip_authorization_succeeded" id="0x7f120a91" />
-    <public type="string" name="ip_authorization_succeeded_suggestion" id="0x7f120a92" />
-    <public type="string" name="it" id="0x7f120a93" />
-    <public type="string" name="ja" id="0x7f120a94" />
-    <public type="string" name="join" id="0x7f120a95" />
-    <public type="string" name="join_afk_channel_body" id="0x7f120a96" />
-    <public type="string" name="join_call" id="0x7f120a97" />
-    <public type="string" name="join_server" id="0x7f120a98" />
-    <public type="string" name="join_server_button_body" id="0x7f120a99" />
-    <public type="string" name="join_server_button_cta" id="0x7f120a9a" />
-    <public type="string" name="join_server_button_cta_mobile" id="0x7f120a9b" />
-    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120a9c" />
-    <public type="string" name="join_server_button_cta_named" id="0x7f120a9d" />
-    <public type="string" name="join_server_description" id="0x7f120a9e" />
-    <public type="string" name="join_server_description_mobile" id="0x7f120a9f" />
-    <public type="string" name="join_server_title" id="0x7f120aa0" />
-    <public type="string" name="join_stream" id="0x7f120aa1" />
-    <public type="string" name="join_video_call" id="0x7f120aa2" />
-    <public type="string" name="join_voice" id="0x7f120aa3" />
-    <public type="string" name="join_voice_call" id="0x7f120aa4" />
-    <public type="string" name="join_voice_channel" id="0x7f120aa5" />
-    <public type="string" name="join_voice_channel_cta" id="0x7f120aa6" />
-    <public type="string" name="joined_server" id="0x7f120aa7" />
-    <public type="string" name="joining_server" id="0x7f120aa8" />
-    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7f120aa9" />
-    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7f120aaa" />
-    <public type="string" name="joining_will_end_current_call_title" id="0x7f120aab" />
-    <public type="string" name="jump" id="0x7f120aac" />
-    <public type="string" name="jump_to_channel" id="0x7f120aad" />
-    <public type="string" name="jump_to_chat" id="0x7f120aae" />
-    <public type="string" name="jump_to_last_unread_message" id="0x7f120aaf" />
-    <public type="string" name="jump_to_present" id="0x7f120ab0" />
-    <public type="string" name="keep_permissions" id="0x7f120ab1" />
-    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120ab2" />
-    <public type="string" name="keybind_conflict" id="0x7f120ab3" />
-    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120ab4" />
-    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120ab5" />
-    <public type="string" name="keybind_description_modal_call_start" id="0x7f120ab6" />
-    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120ab7" />
-    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120ab8" />
-    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120ab9" />
-    <public type="string" name="keybind_description_modal_find_conversation" id="0x7f120aba" />
-    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120abb" />
-    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120abc" />
-    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120abd" />
-    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120abe" />
-    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120abf" />
-    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120ac0" />
-    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120ac1" />
-    <public type="string" name="keybind_description_modal_return_to_audio_channel" id="0x7f120ac2" />
-    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120ac3" />
-    <public type="string" name="keybind_description_modal_search" id="0x7f120ac4" />
-    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120ac5" />
-    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120ac6" />
-    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120ac7" />
-    <public type="string" name="keybind_description_modal_title" id="0x7f120ac8" />
-    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120ac9" />
-    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120aca" />
-    <public type="string" name="keybind_description_modal_toggle_hotkeys" id="0x7f120acb" />
-    <public type="string" name="keybind_description_modal_toggle_mentions" id="0x7f120acc" />
-    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120acd" />
-    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120ace" />
-    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120acf" />
-    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120ad0" />
-    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120ad1" />
-    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120ad2" />
-    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120ad3" />
-    <public type="string" name="keybind_description_push_to_mute" id="0x7f120ad4" />
-    <public type="string" name="keybind_description_push_to_talk" id="0x7f120ad5" />
-    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120ad6" />
-    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120ad7" />
-    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7f120ad8" />
-    <public type="string" name="keybind_description_toggle_mute" id="0x7f120ad9" />
-    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120ada" />
-    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120adb" />
-    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120adc" />
-    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120add" />
-    <public type="string" name="keybind_description_unassigned" id="0x7f120ade" />
-    <public type="string" name="keybind_push_to_mute" id="0x7f120adf" />
-    <public type="string" name="keybind_push_to_talk" id="0x7f120ae0" />
-    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120ae1" />
-    <public type="string" name="keybind_toggle_deafen" id="0x7f120ae2" />
-    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7f120ae3" />
-    <public type="string" name="keybind_toggle_mute" id="0x7f120ae4" />
-    <public type="string" name="keybind_toggle_overlay" id="0x7f120ae5" />
-    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120ae6" />
-    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120ae7" />
-    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120ae8" />
-    <public type="string" name="keybind_unassigned" id="0x7f120ae9" />
-    <public type="string" name="keybinds" id="0x7f120aea" />
-    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120aeb" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120aec" />
-    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120aed" />
-    <public type="string" name="kick" id="0x7f120aee" />
-    <public type="string" name="kick_from_server" id="0x7f120aef" />
-    <public type="string" name="kick_members" id="0x7f120af0" />
-    <public type="string" name="kick_members_description" id="0x7f120af1" />
-    <public type="string" name="kick_user_body" id="0x7f120af2" />
-    <public type="string" name="kick_user_confirmed" id="0x7f120af3" />
-    <public type="string" name="kick_user_error_generic" id="0x7f120af4" />
-    <public type="string" name="kick_user_title" id="0x7f120af5" />
-    <public type="string" name="ko" id="0x7f120af6" />
-    <public type="string" name="label_with_online_status" id="0x7f120af7" />
-    <public type="string" name="language" id="0x7f120af8" />
-    <public type="string" name="language_not_found" id="0x7f120af9" />
-    <public type="string" name="language_select" id="0x7f120afa" />
-    <public type="string" name="language_updated" id="0x7f120afb" />
-    <public type="string" name="languages" id="0x7f120afc" />
-    <public type="string" name="last_seen" id="0x7f120afd" />
-    <public type="string" name="last_selected_voice_channel_body" id="0x7f120afe" />
-    <public type="string" name="last_selected_voice_channel_no" id="0x7f120aff" />
-    <public type="string" name="last_selected_voice_channel_title" id="0x7f120b00" />
-    <public type="string" name="last_selected_voice_channel_yes" id="0x7f120b01" />
-    <public type="string" name="last_sync" id="0x7f120b02" />
-    <public type="string" name="launch_app" id="0x7f120b03" />
-    <public type="string" name="learn_more" id="0x7f120b04" />
-    <public type="string" name="leave_call" id="0x7f120b05" />
-    <public type="string" name="leave_group_dm" id="0x7f120b06" />
-    <public type="string" name="leave_group_dm_body" id="0x7f120b07" />
-    <public type="string" name="leave_group_dm_managed_body" id="0x7f120b08" />
-    <public type="string" name="leave_group_dm_managed_title" id="0x7f120b09" />
-    <public type="string" name="leave_group_dm_title" id="0x7f120b0a" />
-    <public type="string" name="leave_server" id="0x7f120b0b" />
-    <public type="string" name="leave_server_body" id="0x7f120b0c" />
-    <public type="string" name="leave_server_body_mobile" id="0x7f120b0d" />
-    <public type="string" name="leave_server_title" id="0x7f120b0e" />
-    <public type="string" name="lfg_active_groups" id="0x7f120b0f" />
-    <public type="string" name="lfg_bump_button" id="0x7f120b10" />
-    <public type="string" name="lfg_bump_cooldown" id="0x7f120b11" />
-    <public type="string" name="lfg_channel_unavailable" id="0x7f120b12" />
-    <public type="string" name="lfg_create_a_group" id="0x7f120b13" />
-    <public type="string" name="lfg_create_button" id="0x7f120b14" />
-    <public type="string" name="lfg_create_placeholder" id="0x7f120b15" />
-    <public type="string" name="lfg_delete_modal_content" id="0x7f120b16" />
-    <public type="string" name="lfg_delete_modal_title" id="0x7f120b17" />
-    <public type="string" name="lfg_delisted_explanation_completed" id="0x7f120b18" />
-    <public type="string" name="lfg_delisted_explanation_expired" id="0x7f120b19" />
-    <public type="string" name="lfg_delisted_explanation_inactive" id="0x7f120b1a" />
-    <public type="string" name="lfg_delisted_explanation_unknown" id="0x7f120b1b" />
-    <public type="string" name="lfg_edit_modal_cta" id="0x7f120b1c" />
-    <public type="string" name="lfg_edit_modal_description_label" id="0x7f120b1d" />
-    <public type="string" name="lfg_edit_modal_group_size_label" id="0x7f120b1e" />
-    <public type="string" name="lfg_edit_modal_title" id="0x7f120b1f" />
-    <public type="string" name="lfg_empty_state_note" id="0x7f120b20" />
-    <public type="string" name="lfg_empty_state_note_2" id="0x7f120b21" />
-    <public type="string" name="lfg_empty_state_title" id="0x7f120b22" />
-    <public type="string" name="lfg_expired_banner" id="0x7f120b23" />
-    <public type="string" name="lfg_group_description_required" id="0x7f120b24" />
-    <public type="string" name="lfg_group_full" id="0x7f120b25" />
-    <public type="string" name="lfg_groups_looking" id="0x7f120b26" />
-    <public type="string" name="lfg_groups_looking_with_total" id="0x7f120b27" />
-    <public type="string" name="lfg_join_button" id="0x7f120b28" />
-    <public type="string" name="lfg_leave_button" id="0x7f120b29" />
-    <public type="string" name="lfg_listing_age_hours" id="0x7f120b2a" />
-    <public type="string" name="lfg_listing_age_minutes" id="0x7f120b2b" />
-    <public type="string" name="lfg_listing_age_seconds" id="0x7f120b2c" />
-    <public type="string" name="lfg_listings_channel" id="0x7f120b2d" />
-    <public type="string" name="lfg_manage_group" id="0x7f120b2e" />
-    <public type="string" name="lfg_num_players" id="0x7f120b2f" />
-    <public type="string" name="lfg_relist_button" id="0x7f120b30" />
-    <public type="string" name="lfg_relist_your_group" id="0x7f120b31" />
-    <public type="string" name="lfg_relisted" id="0x7f120b32" />
-    <public type="string" name="lfg_relisted_in_channel" id="0x7f120b33" />
-    <public type="string" name="lfg_save_button" id="0x7f120b34" />
-    <public type="string" name="lfg_save_modal_empty_text" id="0x7f120b35" />
-    <public type="string" name="lfg_save_modal_subtitle" id="0x7f120b36" />
-    <public type="string" name="lfg_save_modal_title" id="0x7f120b37" />
-    <public type="string" name="lfg_sidebar_description" id="0x7f120b38" />
-    <public type="string" name="lfg_sidebar_size" id="0x7f120b39" />
-    <public type="string" name="lfg_sidebar_size_number" id="0x7f120b3a" />
-    <public type="string" name="lfg_sidebar_status" id="0x7f120b3b" />
-    <public type="string" name="lfg_sidebar_status_expired" id="0x7f120b3c" />
-    <public type="string" name="lfg_sidebar_status_expired_tooltip" id="0x7f120b3d" />
-    <public type="string" name="lfg_something_went_wrong" id="0x7f120b3e" />
-    <public type="string" name="lfg_spots_available" id="0x7f120b3f" />
-    <public type="string" name="lfg_unknown_member_tooltip" id="0x7f120b40" />
-    <public type="string" name="lfg_view_button" id="0x7f120b41" />
-    <public type="string" name="lfg_your_active_group" id="0x7f120b42" />
-    <public type="string" name="lfg_your_group" id="0x7f120b43" />
-    <public type="string" name="library" id="0x7f120b44" />
-    <public type="string" name="light_blue" id="0x7f120b45" />
-    <public type="string" name="light_green" id="0x7f120b46" />
-    <public type="string" name="light_grey" id="0x7f120b47" />
-    <public type="string" name="link_account" id="0x7f120b48" />
-    <public type="string" name="link_copied" id="0x7f120b49" />
-    <public type="string" name="link_settings" id="0x7f120b4a" />
-    <public type="string" name="link_your_discord_account" id="0x7f120b4b" />
-    <public type="string" name="link_your_xbox_account_1" id="0x7f120b4c" />
-    <public type="string" name="link_your_xbox_account_2" id="0x7f120b4d" />
-    <public type="string" name="linux" id="0x7f120b4e" />
-    <public type="string" name="listen_on_spotify" id="0x7f120b4f" />
-    <public type="string" name="listening_to" id="0x7f120b50" />
-    <public type="string" name="listings_permissions" id="0x7f120b51" />
-    <public type="string" name="live" id="0x7f120b52" />
-    <public type="string" name="live_beta_description" id="0x7f120b53" />
-    <public type="string" name="live_on_twitch" id="0x7f120b54" />
-    <public type="string" name="live_viewers" id="0x7f120b55" />
-    <public type="string" name="load_image_error" id="0x7f120b56" />
-    <public type="string" name="load_more_messages" id="0x7f120b57" />
-    <public type="string" name="load_reactions_error" id="0x7f120b58" />
-    <public type="string" name="loading" id="0x7f120b59" />
-    <public type="string" name="loading_divider" id="0x7f120b5a" />
-    <public type="string" name="loading_your_pin" id="0x7f120b5b" />
-    <public type="string" name="lobby" id="0x7f120b5c" />
-    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120b5d" />
-    <public type="string" name="locale" id="0x7f120b5e" />
-    <public type="string" name="login" id="0x7f120b5f" />
-    <public type="string" name="login_body" id="0x7f120b60" />
-    <public type="string" name="login_title" id="0x7f120b61" />
-    <public type="string" name="logout" id="0x7f120b62" />
-    <public type="string" name="lt" id="0x7f120b63" />
-    <public type="string" name="lurker_mode_chat_input_back_button" id="0x7f120b64" />
-    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120b65" />
-    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120b66" />
-    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120b67" />
-    <public type="string" name="lurker_mode_view_guild" id="0x7f120b68" />
-    <public type="string" name="lurkers_description" id="0x7f120b69" />
-    <public type="string" name="macos" id="0x7f120b6a" />
-    <public type="string" name="magenta" id="0x7f120b6b" />
-    <public type="string" name="manage_channel" id="0x7f120b6c" />
-    <public type="string" name="manage_channel_description" id="0x7f120b6d" />
-    <public type="string" name="manage_channels" id="0x7f120b6e" />
-    <public type="string" name="manage_channels_description" id="0x7f120b6f" />
-    <public type="string" name="manage_emojis" id="0x7f120b70" />
-    <public type="string" name="manage_listings" id="0x7f120b71" />
-    <public type="string" name="manage_listings_description" id="0x7f120b72" />
-    <public type="string" name="manage_messages" id="0x7f120b73" />
-    <public type="string" name="manage_messages_description" id="0x7f120b74" />
-    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7f120b75" />
-    <public type="string" name="manage_nicknames" id="0x7f120b76" />
-    <public type="string" name="manage_nicknames_description" id="0x7f120b77" />
-    <public type="string" name="manage_permissions" id="0x7f120b78" />
-    <public type="string" name="manage_permissions_description" id="0x7f120b79" />
-    <public type="string" name="manage_roles" id="0x7f120b7a" />
-    <public type="string" name="manage_roles_description" id="0x7f120b7b" />
-    <public type="string" name="manage_server" id="0x7f120b7c" />
-    <public type="string" name="manage_server_description" id="0x7f120b7d" />
-    <public type="string" name="manage_user" id="0x7f120b7e" />
-    <public type="string" name="manage_user_shorthand" id="0x7f120b7f" />
-    <public type="string" name="manage_webhooks" id="0x7f120b80" />
-    <public type="string" name="manage_webhooks_description" id="0x7f120b81" />
-    <public type="string" name="managed_role_explaination" id="0x7f120b82" />
-    <public type="string" name="mark_as_read" id="0x7f120b83" />
-    <public type="string" name="masked_link_body" id="0x7f120b84" />
-    <public type="string" name="masked_link_cancel" id="0x7f120b85" />
-    <public type="string" name="masked_link_confirm" id="0x7f120b86" />
-    <public type="string" name="masked_link_trust_this_domain" id="0x7f120b87" />
-    <public type="string" name="mature_listing_accept" id="0x7f120b88" />
-    <public type="string" name="mature_listing_decline" id="0x7f120b89" />
-    <public type="string" name="mature_listing_description" id="0x7f120b8a" />
-    <public type="string" name="mature_listing_title" id="0x7f120b8b" />
-    <public type="string" name="max_age_never" id="0x7f120b8c" />
-    <public type="string" name="max_age_never_description_mobile" id="0x7f120b8d" />
-    <public type="string" name="max_number_of_uses" id="0x7f120b8e" />
-    <public type="string" name="max_uses" id="0x7f120b8f" />
-    <public type="string" name="max_uses_description_mobile" id="0x7f120b90" />
-    <public type="string" name="max_uses_description_unlimited_uses" id="0x7f120b91" />
-    <public type="string" name="me" id="0x7f120b92" />
-    <public type="string" name="media_hint_body" id="0x7f120b93" />
-    <public type="string" name="media_hint_title" id="0x7f120b94" />
-    <public type="string" name="member" id="0x7f120b95" />
-    <public type="string" name="member_list" id="0x7f120b96" />
-    <public type="string" name="member_list_hidden" id="0x7f120b97" />
-    <public type="string" name="member_list_server_owner_help" id="0x7f120b98" />
-    <public type="string" name="members" id="0x7f120b99" />
-    <public type="string" name="members_header" id="0x7f120b9a" />
-    <public type="string" name="members_matching" id="0x7f120b9b" />
-    <public type="string" name="members_search_placeholder" id="0x7f120b9c" />
-    <public type="string" name="mention" id="0x7f120b9d" />
-    <public type="string" name="mention_everyone" id="0x7f120b9e" />
-    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120b9f" />
-    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120ba0" />
-    <public type="string" name="mention_everyone_description" id="0x7f120ba1" />
-    <public type="string" name="mention_here_autocomplete_description" id="0x7f120ba2" />
-    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120ba3" />
-    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120ba4" />
-    <public type="string" name="mention_users_with_role" id="0x7f120ba5" />
-    <public type="string" name="mentions" id="0x7f120ba6" />
-    <public type="string" name="mentions_count" id="0x7f120ba7" />
-    <public type="string" name="message_display_mode_label" id="0x7f120ba8" />
-    <public type="string" name="message_edited" id="0x7f120ba9" />
-    <public type="string" name="message_options" id="0x7f120baa" />
-    <public type="string" name="message_pinned" id="0x7f120bab" />
-    <public type="string" name="message_preview" id="0x7f120bac" />
-    <public type="string" name="message_rate_limited_body" id="0x7f120bad" />
-    <public type="string" name="message_rate_limited_button" id="0x7f120bae" />
-    <public type="string" name="message_rate_limited_header" id="0x7f120baf" />
-    <public type="string" name="message_too_long_body" id="0x7f120bb0" />
-    <public type="string" name="message_too_long_header" id="0x7f120bb1" />
-    <public type="string" name="message_tts" id="0x7f120bb2" />
-    <public type="string" name="message_tts_deleted_role" id="0x7f120bb3" />
-    <public type="string" name="message_unpinned" id="0x7f120bb4" />
-    <public type="string" name="message_warning_mention_everyone_body" id="0x7f120bb5" />
-    <public type="string" name="message_warning_mention_everyone_title" id="0x7f120bb6" />
-    <public type="string" name="messages" id="0x7f120bb7" />
-    <public type="string" name="mfa_sms_add_phone" id="0x7f120bb8" />
-    <public type="string" name="mfa_sms_already_enabled" id="0x7f120bb9" />
-    <public type="string" name="mfa_sms_auth" id="0x7f120bba" />
-    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120bbb" />
-    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120bbc" />
-    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120bbd" />
-    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120bbe" />
-    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120bbf" />
-    <public type="string" name="mfa_sms_enable" id="0x7f120bc0" />
-    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120bc1" />
-    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120bc2" />
-    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120bc3" />
-    <public type="string" name="mfa_sms_receive_code" id="0x7f120bc4" />
-    <public type="string" name="mfa_sms_remove" id="0x7f120bc5" />
-    <public type="string" name="mfa_sms_resend" id="0x7f120bc6" />
-    <public type="string" name="microphone_permission_error" id="0x7f120bc7" />
-    <public type="string" name="minimum_size" id="0x7f120bc8" />
-    <public type="string" name="missed_an_update" id="0x7f120bc9" />
-    <public type="string" name="missing_entitlement_modal_body" id="0x7f120bca" />
-    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120bcb" />
-    <public type="string" name="missing_entitlement_modal_header" id="0x7f120bcc" />
-    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120bcd" />
-    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120bce" />
-    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120bcf" />
-    <public type="string" name="moderation" id="0x7f120bd0" />
-    <public type="string" name="modify_followed_news_header" id="0x7f120bd1" />
-    <public type="string" name="more" id="0x7f120bd2" />
-    <public type="string" name="move_from_category_to" id="0x7f120bd3" />
-    <public type="string" name="move_members" id="0x7f120bd4" />
-    <public type="string" name="move_members_description" id="0x7f120bd5" />
-    <public type="string" name="move_to" id="0x7f120bd6" />
-    <public type="string" name="move_to_success" id="0x7f120bd7" />
-    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120bd8" />
-    <public type="string" name="mute" id="0x7f120bd9" />
-    <public type="string" name="mute_category" id="0x7f120bda" />
-    <public type="string" name="mute_channel" id="0x7f120bdb" />
-    <public type="string" name="mute_channel_old" id="0x7f120bdc" />
-    <public type="string" name="mute_during_work" id="0x7f120bdd" />
-    <public type="string" name="mute_for_an_hour" id="0x7f120bde" />
-    <public type="string" name="mute_group_dm" id="0x7f120bdf" />
-    <public type="string" name="mute_members" id="0x7f120be0" />
-    <public type="string" name="mutual_friends" id="0x7f120be1" />
-    <public type="string" name="mutual_guilds" id="0x7f120be2" />
-    <public type="string" name="n_days" id="0x7f120be3" />
-    <public type="string" name="nearby_scan" id="0x7f120be4" />
-    <public type="string" name="need_account" id="0x7f120be5" />
-    <public type="string" name="network_error_bad_request" id="0x7f120be6" />
-    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120be7" />
-    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120be8" />
-    <public type="string" name="network_error_connection" id="0x7f120be9" />
-    <public type="string" name="network_error_forbidden" id="0x7f120bea" />
-    <public type="string" name="network_error_request_too_large" id="0x7f120beb" />
-    <public type="string" name="network_error_rest_request" id="0x7f120bec" />
-    <public type="string" name="network_error_ssl" id="0x7f120bed" />
-    <public type="string" name="network_error_unauthorized" id="0x7f120bee" />
-    <public type="string" name="network_error_unknown" id="0x7f120bef" />
-    <public type="string" name="network_error_unknown_host" id="0x7f120bf0" />
-    <public type="string" name="network_offline" id="0x7f120bf1" />
-    <public type="string" name="nevermind" id="0x7f120bf2" />
-    <public type="string" name="new_dm" id="0x7f120bf3" />
-    <public type="string" name="new_group_dm" id="0x7f120bf4" />
-    <public type="string" name="new_guilds_dm_allowed" id="0x7f120bf5" />
-    <public type="string" name="new_mentions" id="0x7f120bf6" />
-    <public type="string" name="new_messages" id="0x7f120bf7" />
-    <public type="string" name="new_messages_divider" id="0x7f120bf8" />
-    <public type="string" name="new_messages_estimated" id="0x7f120bf9" />
-    <public type="string" name="new_messages_estimated_with_date" id="0x7f120bfa" />
-    <public type="string" name="new_messages_with_date" id="0x7f120bfb" />
-    <public type="string" name="new_override" id="0x7f120bfc" />
-    <public type="string" name="new_permission" id="0x7f120bfd" />
-    <public type="string" name="new_terms_ack" id="0x7f120bfe" />
-    <public type="string" name="new_terms_continue" id="0x7f120bff" />
-    <public type="string" name="new_terms_description" id="0x7f120c00" />
-    <public type="string" name="new_terms_title" id="0x7f120c01" />
-    <public type="string" name="new_unreads" id="0x7f120c02" />
-    <public type="string" name="news_channel" id="0x7f120c03" />
-    <public type="string" name="news_channel_edit_news" id="0x7f120c04" />
-    <public type="string" name="news_channel_publish" id="0x7f120c05" />
-    <public type="string" name="news_channel_publish_bump" id="0x7f120c06" />
-    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7f120c07" />
-    <public type="string" name="news_channel_publish_news" id="0x7f120c08" />
-    <public type="string" name="news_channel_published" id="0x7f120c09" />
-    <public type="string" name="next" id="0x7f120c0a" />
-    <public type="string" name="nickname" id="0x7f120c0b" />
-    <public type="string" name="nickname_changed" id="0x7f120c0c" />
-    <public type="string" name="nickname_cleared" id="0x7f120c0d" />
-    <public type="string" name="nl" id="0x7f120c0e" />
-    <public type="string" name="no" id="0x7f120c0f" />
-    <public type="string" name="no_afk_channel" id="0x7f120c10" />
-    <public type="string" name="no_authorized_apps" id="0x7f120c11" />
-    <public type="string" name="no_authorized_apps_note" id="0x7f120c12" />
-    <public type="string" name="no_ban_reason" id="0x7f120c13" />
-    <public type="string" name="no_bans" id="0x7f120c14" />
-    <public type="string" name="no_camera_access" id="0x7f120c15" />
-    <public type="string" name="no_category" id="0x7f120c16" />
-    <public type="string" name="no_channel_description" id="0x7f120c17" />
-    <public type="string" name="no_emoji" id="0x7f120c18" />
-    <public type="string" name="no_emoji_body" id="0x7f120c19" />
-    <public type="string" name="no_emoji_search_results" id="0x7f120c1a" />
-    <public type="string" name="no_emoji_title" id="0x7f120c1b" />
-    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120c1c" />
-    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120c1d" />
-    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120c1e" />
-    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120c1f" />
-    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120c20" />
-    <public type="string" name="no_gif_search_results" id="0x7f120c21" />
-    <public type="string" name="no_input_devices" id="0x7f120c22" />
-    <public type="string" name="no_input_devices_detected" id="0x7f120c23" />
-    <public type="string" name="no_instant_invite" id="0x7f120c24" />
-    <public type="string" name="no_integrations" id="0x7f120c25" />
-    <public type="string" name="no_integrations_body" id="0x7f120c26" />
-    <public type="string" name="no_integrations_label" id="0x7f120c27" />
-    <public type="string" name="no_invites_body" id="0x7f120c28" />
-    <public type="string" name="no_invites_caption" id="0x7f120c29" />
-    <public type="string" name="no_invites_label" id="0x7f120c2a" />
-    <public type="string" name="no_mail_account_description" id="0x7f120c2b" />
-    <public type="string" name="no_mail_account_title" id="0x7f120c2c" />
-    <public type="string" name="no_mic_body" id="0x7f120c2d" />
-    <public type="string" name="no_mic_title" id="0x7f120c2e" />
-    <public type="string" name="no_mutual_friends" id="0x7f120c2f" />
-    <public type="string" name="no_mutual_guilds" id="0x7f120c30" />
-    <public type="string" name="no_output_devices" id="0x7f120c31" />
-    <public type="string" name="no_photo_in_camera_roll" id="0x7f120c32" />
-    <public type="string" name="no_photos_access" id="0x7f120c33" />
-    <public type="string" name="no_pins_in_channel" id="0x7f120c34" />
-    <public type="string" name="no_pins_in_dm" id="0x7f120c35" />
-    <public type="string" name="no_private_channels_description" id="0x7f120c36" />
-    <public type="string" name="no_private_channels_title" id="0x7f120c37" />
-    <public type="string" name="no_reactions_body" id="0x7f120c38" />
-    <public type="string" name="no_reactions_header" id="0x7f120c39" />
-    <public type="string" name="no_recent_mentions" id="0x7f120c3a" />
-    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120c3b" />
-    <public type="string" name="no_system_channel" id="0x7f120c3c" />
-    <public type="string" name="no_text" id="0x7f120c3d" />
-    <public type="string" name="no_thanks" id="0x7f120c3e" />
-    <public type="string" name="no_user_limit" id="0x7f120c3f" />
-    <public type="string" name="no_video_devices" id="0x7f120c40" />
-    <public type="string" name="noise_cancellation" id="0x7f120c41" />
-    <public type="string" name="noise_reduction_none" id="0x7f120c42" />
-    <public type="string" name="noise_suppression" id="0x7f120c43" />
-    <public type="string" name="none" id="0x7f120c44" />
-    <public type="string" name="not_available" id="0x7f120c45" />
-    <public type="string" name="not_enough_guild_members" id="0x7f120c46" />
-    <public type="string" name="not_in_the_call" id="0x7f120c47" />
-    <public type="string" name="not_in_the_voice_channel" id="0x7f120c48" />
-    <public type="string" name="note" id="0x7f120c49" />
-    <public type="string" name="note_placeholder" id="0x7f120c4a" />
-    <public type="string" name="note_placeholder_mobile" id="0x7f120c4b" />
-    <public type="string" name="notice_application_test_mode" id="0x7f120c4c" />
-    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120c4d" />
-    <public type="string" name="notice_connect_spotify" id="0x7f120c4e" />
-    <public type="string" name="notice_connection_conflict" id="0x7f120c4f" />
-    <public type="string" name="notice_corrupt_installation" id="0x7f120c50" />
-    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120c51" />
-    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120c52" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120c53" />
-    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120c54" />
-    <public type="string" name="notice_dispatch_api_error" id="0x7f120c55" />
-    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120c56" />
-    <public type="string" name="notice_dispatch_error" id="0x7f120c57" />
-    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120c58" />
-    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120c59" />
-    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120c5a" />
-    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120c5b" />
-    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120c5c" />
-    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120c5d" />
-    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120c5e" />
-    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120c5f" />
-    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120c60" />
-    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120c61" />
-    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120c62" />
-    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120c63" />
-    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120c64" />
-    <public type="string" name="notice_hardware_mute" id="0x7f120c65" />
-    <public type="string" name="notice_mfa_sms_backup" id="0x7f120c66" />
-    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f120c67" />
-    <public type="string" name="notice_native_apps" id="0x7f120c68" />
-    <public type="string" name="notice_no_input_detected" id="0x7f120c69" />
-    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f120c6a" />
-    <public type="string" name="notice_no_input_detected_settings" id="0x7f120c6b" />
-    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f120c6c" />
-    <public type="string" name="notice_premium_grandfathered_ended" id="0x7f120c6d" />
-    <public type="string" name="notice_premium_grandfathered_ending" id="0x7f120c6e" />
-    <public type="string" name="notice_premium_promo_action" id="0x7f120c6f" />
-    <public type="string" name="notice_premium_promo_message" id="0x7f120c70" />
-    <public type="string" name="notice_scheduled_maintenance" id="0x7f120c71" />
-    <public type="string" name="notice_spotify_auto_paused" id="0x7f120c72" />
-    <public type="string" name="notice_streamer_mode_text" id="0x7f120c73" />
-    <public type="string" name="notice_survey_body" id="0x7f120c74" />
-    <public type="string" name="notice_survey_button" id="0x7f120c75" />
-    <public type="string" name="notice_survey_prompt" id="0x7f120c76" />
-    <public type="string" name="notice_unclaimed_account" id="0x7f120c77" />
-    <public type="string" name="notice_unverified_account" id="0x7f120c78" />
-    <public type="string" name="notice_video_unsupported_browser" id="0x7f120c79" />
-    <public type="string" name="notice_whats_this" id="0x7f120c7a" />
-    <public type="string" name="notification_accepted_friend_request" id="0x7f120c7b" />
-    <public type="string" name="notification_body_attachment" id="0x7f120c7c" />
-    <public type="string" name="notification_body_start_game" id="0x7f120c7d" />
-    <public type="string" name="notification_dismiss" id="0x7f120c7e" />
-    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f120c7f" />
-    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f120c80" />
-    <public type="string" name="notification_message_create_dm_activity_spectate" id="0x7f120c81" />
-    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f120c82" />
-    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f120c83" />
-    <public type="string" name="notification_message_create_group_dm_activity_spectate" id="0x7f120c84" />
-    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f120c85" />
-    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f120c86" />
-    <public type="string" name="notification_message_create_guild_activity_spectate" id="0x7f120c87" />
-    <public type="string" name="notification_overrides" id="0x7f120c88" />
-    <public type="string" name="notification_pending_friend_request" id="0x7f120c89" />
-    <public type="string" name="notification_reply" id="0x7f120c8a" />
-    <public type="string" name="notification_reply_failed" id="0x7f120c8b" />
-    <public type="string" name="notification_reply_success" id="0x7f120c8c" />
-    <public type="string" name="notification_settings" id="0x7f120c8d" />
-    <public type="string" name="notification_title_discord" id="0x7f120c8e" />
-    <public type="string" name="notification_title_start_game" id="0x7f120c8f" />
-    <public type="string" name="notification_voice_status_body" id="0x7f120c90" />
-    <public type="string" name="notification_voice_status_body_no_status" id="0x7f120c91" />
-    <public type="string" name="notification_voice_status_title" id="0x7f120c92" />
-    <public type="string" name="notifications" id="0x7f120c93" />
-    <public type="string" name="notifications_nuf_body" id="0x7f120c94" />
-    <public type="string" name="notifications_nuf_cta" id="0x7f120c95" />
-    <public type="string" name="notifications_nuf_title" id="0x7f120c96" />
-    <public type="string" name="nsfw_accept" id="0x7f120c97" />
-    <public type="string" name="nsfw_decline" id="0x7f120c98" />
-    <public type="string" name="nsfw_description" id="0x7f120c99" />
-    <public type="string" name="nsfw_note" id="0x7f120c9a" />
-    <public type="string" name="nsfw_title" id="0x7f120c9b" />
-    <public type="string" name="nuf_body" id="0x7f120c9c" />
-    <public type="string" name="nuf_body_mobile" id="0x7f120c9d" />
-    <public type="string" name="nuf_chat_with_friends" id="0x7f120c9e" />
-    <public type="string" name="nuf_claim_account_body_1" id="0x7f120c9f" />
-    <public type="string" name="nuf_claim_account_body_2" id="0x7f120ca0" />
-    <public type="string" name="nuf_claim_account_button" id="0x7f120ca1" />
-    <public type="string" name="nuf_claim_account_generic_error" id="0x7f120ca2" />
-    <public type="string" name="nuf_claim_account_title" id="0x7f120ca3" />
-    <public type="string" name="nuf_club_or_interest_group" id="0x7f120ca4" />
-    <public type="string" name="nuf_create_server_body" id="0x7f120ca5" />
-    <public type="string" name="nuf_create_server_button" id="0x7f120ca6" />
-    <public type="string" name="nuf_create_server_error" id="0x7f120ca7" />
-    <public type="string" name="nuf_create_server_note" id="0x7f120ca8" />
-    <public type="string" name="nuf_create_server_title" id="0x7f120ca9" />
-    <public type="string" name="nuf_download_app_body" id="0x7f120caa" />
-    <public type="string" name="nuf_download_app_button_platform" id="0x7f120cab" />
-    <public type="string" name="nuf_download_app_button_type" id="0x7f120cac" />
-    <public type="string" name="nuf_download_app_intro" id="0x7f120cad" />
-    <public type="string" name="nuf_download_app_title" id="0x7f120cae" />
-    <public type="string" name="nuf_gaming_community" id="0x7f120caf" />
-    <public type="string" name="nuf_get_started" id="0x7f120cb0" />
-    <public type="string" name="nuf_join_a_friend" id="0x7f120cb1" />
-    <public type="string" name="nuf_join_server_body_1" id="0x7f120cb2" />
-    <public type="string" name="nuf_join_server_body_2" id="0x7f120cb3" />
-    <public type="string" name="nuf_join_server_button" id="0x7f120cb4" />
-    <public type="string" name="nuf_join_server_input_label" id="0x7f120cb5" />
-    <public type="string" name="nuf_join_server_input_note" id="0x7f120cb6" />
-    <public type="string" name="nuf_join_server_title_1" id="0x7f120cb7" />
-    <public type="string" name="nuf_join_server_title_2" id="0x7f120cb8" />
-    <public type="string" name="nuf_just_look_around" id="0x7f120cb9" />
-    <public type="string" name="nuf_title" id="0x7f120cba" />
-    <public type="string" name="nuf_title_mobile" id="0x7f120cbb" />
-    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7f120cbc" />
-    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f120cbd" />
-    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f120cbe" />
-    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f120cbf" />
-    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f120cc0" />
-    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f120cc1" />
-    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f120cc2" />
-    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f120cc3" />
-    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f120cc4" />
-    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f120cc5" />
-    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f120cc6" />
-    <public type="string" name="nuf_what_do_you_want" id="0x7f120cc7" />
-    <public type="string" name="num_channels" id="0x7f120cc8" />
-    <public type="string" name="num_members" id="0x7f120cc9" />
-    <public type="string" name="num_subscribers" id="0x7f120cca" />
-    <public type="string" name="num_users" id="0x7f120ccb" />
-    <public type="string" name="nux_overlay_description" id="0x7f120ccc" />
-    <public type="string" name="nux_overlay_enable" id="0x7f120ccd" />
-    <public type="string" name="nux_overlay_title" id="0x7f120cce" />
-    <public type="string" name="nux_post_reg_join_server_description" id="0x7f120ccf" />
-    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f120cd0" />
-    <public type="string" name="nux_post_reg_join_server_title" id="0x7f120cd1" />
-    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7f120cd2" />
-    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7f120cd3" />
-    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7f120cd4" />
-    <public type="string" name="oauth2_authorize_error" id="0x7f120cd5" />
-    <public type="string" name="oauth2_connect_to_discord" id="0x7f120cd6" />
-    <public type="string" name="oauth2_insecure_notice" id="0x7f120cd7" />
-    <public type="string" name="oauth2_insecure_read_notice" id="0x7f120cd8" />
-    <public type="string" name="oauth2_label" id="0x7f120cd9" />
-    <public type="string" name="oauth2_message_cta" id="0x7f120cda" />
-    <public type="string" name="oauth2_message_unknown_error" id="0x7f120cdb" />
-    <public type="string" name="oauth2_request_invalid_scope" id="0x7f120cdc" />
-    <public type="string" name="oauth2_request_missing_param" id="0x7f120cdd" />
-    <public type="string" name="oauth2_secure_notice" id="0x7f120cde" />
-    <public type="string" name="oauth2_security_notice" id="0x7f120cdf" />
-    <public type="string" name="oauth2_title" id="0x7f120ce0" />
-    <public type="string" name="okay" id="0x7f120ce1" />
-    <public type="string" name="one_user_typing" id="0x7f120ce2" />
-    <public type="string" name="ongoing_call" id="0x7f120ce3" />
-    <public type="string" name="ongoing_call_connected_users" id="0x7f120ce4" />
-    <public type="string" name="ongoing_call_voice_quality_low" id="0x7f120ce5" />
-    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7f120ce6" />
-    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f120ce7" />
-    <public type="string" name="open" id="0x7f120ce8" />
-    <public type="string" name="open_app" id="0x7f120ce9" />
-    <public type="string" name="open_in_browser" id="0x7f120cea" />
-    <public type="string" name="open_in_theater" id="0x7f120ceb" />
-    <public type="string" name="open_link" id="0x7f120cec" />
-    <public type="string" name="open_original_image" id="0x7f120ced" />
-    <public type="string" name="options" id="0x7f120cee" />
-    <public type="string" name="orange" id="0x7f120cef" />
-    <public type="string" name="other_options" id="0x7f120cf0" />
-    <public type="string" name="other_reactions" id="0x7f120cf1" />
-    <public type="string" name="others_online" id="0x7f120cf2" />
-    <public type="string" name="out_of_date_action" id="0x7f120cf3" />
-    <public type="string" name="out_of_date_description" id="0x7f120cf4" />
-    <public type="string" name="out_of_date_title" id="0x7f120cf5" />
-    <public type="string" name="outgoing_friend_request" id="0x7f120cf6" />
-    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f120cf7" />
-    <public type="string" name="overlay" id="0x7f120cf8" />
-    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f120cf9" />
-    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f120cfa" />
-    <public type="string" name="overlay_click_to_unlock" id="0x7f120cfb" />
-    <public type="string" name="overlay_crashed_title" id="0x7f120cfc" />
-    <public type="string" name="overlay_explanation" id="0x7f120cfd" />
-    <public type="string" name="overlay_friend_calling" id="0x7f120cfe" />
-    <public type="string" name="overlay_in_game_preview_header" id="0x7f120cff" />
-    <public type="string" name="overlay_launch_open_tip" id="0x7f120d00" />
-    <public type="string" name="overlay_launch_title" id="0x7f120d01" />
-    <public type="string" name="overlay_link_alert_body" id="0x7f120d02" />
-    <public type="string" name="overlay_link_alert_secondary" id="0x7f120d03" />
-    <public type="string" name="overlay_link_alert_title" id="0x7f120d04" />
-    <public type="string" name="overlay_menu_get_invite" id="0x7f120d05" />
-    <public type="string" name="overlay_menu_open_discord" id="0x7f120d06" />
-    <public type="string" name="overlay_menu_switch_channels" id="0x7f120d07" />
-    <public type="string" name="overlay_mobile_required" id="0x7f120d08" />
-    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f120d09" />
-    <public type="string" name="overlay_mobile_toggle_label" id="0x7f120d0a" />
-    <public type="string" name="overlay_mobile_unauthed" id="0x7f120d0b" />
-    <public type="string" name="overlay_news_go_live_body" id="0x7f120d0c" />
-    <public type="string" name="overlay_news_go_live_cta" id="0x7f120d0d" />
-    <public type="string" name="overlay_news_text_pinning_body" id="0x7f120d0e" />
-    <public type="string" name="overlay_news_text_pinning_tip" id="0x7f120d0f" />
-    <public type="string" name="overlay_news_text_pinning_title" id="0x7f120d10" />
-    <public type="string" name="overlay_no_results" id="0x7f120d11" />
-    <public type="string" name="overlay_notification_incoming_call" id="0x7f120d12" />
-    <public type="string" name="overlay_notification_settings_disabled" id="0x7f120d13" />
-    <public type="string" name="overlay_notification_settings_position" id="0x7f120d14" />
-    <public type="string" name="overlay_notifications_bottom_left" id="0x7f120d15" />
-    <public type="string" name="overlay_notifications_bottom_right" id="0x7f120d16" />
-    <public type="string" name="overlay_notifications_disabled" id="0x7f120d17" />
-    <public type="string" name="overlay_notifications_settings" id="0x7f120d18" />
-    <public type="string" name="overlay_notifications_top_left" id="0x7f120d19" />
-    <public type="string" name="overlay_notifications_top_right" id="0x7f120d1a" />
-    <public type="string" name="overlay_pin_label_tutorial" id="0x7f120d1b" />
-    <public type="string" name="overlay_reload" id="0x7f120d1c" />
-    <public type="string" name="overlay_reset_default_layout" id="0x7f120d1d" />
-    <public type="string" name="overlay_settings" id="0x7f120d1e" />
-    <public type="string" name="overlay_settings_general_tab" id="0x7f120d1f" />
-    <public type="string" name="overlay_settings_title" id="0x7f120d20" />
-    <public type="string" name="overlay_settings_voice_tab" id="0x7f120d21" />
-    <public type="string" name="overlay_text_notification_tip" id="0x7f120d22" />
-    <public type="string" name="overlay_text_notification_tip_unlocked" id="0x7f120d23" />
-    <public type="string" name="overlay_too_small" id="0x7f120d24" />
-    <public type="string" name="overlay_unlock_to_answer" id="0x7f120d25" />
-    <public type="string" name="overlay_unlock_to_join" id="0x7f120d26" />
-    <public type="string" name="overlay_user_chat_hotkey" id="0x7f120d27" />
-    <public type="string" name="overlay_voice_channels_empty_state" id="0x7f120d28" />
-    <public type="string" name="overlay_widget_hide_in_game" id="0x7f120d29" />
-    <public type="string" name="overlay_widget_show_in_game" id="0x7f120d2a" />
-    <public type="string" name="overview" id="0x7f120d2b" />
-    <public type="string" name="overwrite_autocomplete_label" id="0x7f120d2c" />
-    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f120d2d" />
-    <public type="string" name="overwrite_no_role_to_add" id="0x7f120d2e" />
-    <public type="string" name="pagination_next" id="0x7f120d2f" />
-    <public type="string" name="pagination_page_label" id="0x7f120d30" />
-    <public type="string" name="pagination_page_of" id="0x7f120d31" />
-    <public type="string" name="pagination_previous" id="0x7f120d32" />
-    <public type="string" name="paginator_of_pages" id="0x7f120d33" />
-    <public type="string" name="partial_outage" id="0x7f120d34" />
-    <public type="string" name="partial_outage_a11y" id="0x7f120d35" />
-    <public type="string" name="participators" id="0x7f120d36" />
-    <public type="string" name="participators_compared_to_communicators" id="0x7f120d37" />
-    <public type="string" name="partner_badge_tooltip" id="0x7f120d38" />
-    <public type="string" name="party_full" id="0x7f120d39" />
-    <public type="string" name="party_join" id="0x7f120d3a" />
-    <public type="string" name="party_joined" id="0x7f120d3b" />
-    <public type="string" name="party_locked" id="0x7f120d3c" />
-    <public type="string" name="password_length_error" id="0x7f120d3d" />
-    <public type="string" name="password_manager" id="0x7f120d3e" />
-    <public type="string" name="password_manager_info_android" id="0x7f120d3f" />
-    <public type="string" name="password_manager_open_settings" id="0x7f120d40" />
-    <public type="string" name="password_manager_open_settings_error" id="0x7f120d41" />
-    <public type="string" name="password_manager_use" id="0x7f120d42" />
-    <public type="string" name="password_required" id="0x7f120d43" />
-    <public type="string" name="password_toggle_content_description" id="0x7f120d44" />
-    <public type="string" name="paste" id="0x7f120d45" />
-    <public type="string" name="paste_and_send" id="0x7f120d46" />
-    <public type="string" name="path_password_eye" id="0x7f120d47" />
-    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f120d48" />
-    <public type="string" name="path_password_eye_mask_visible" id="0x7f120d49" />
-    <public type="string" name="path_password_strike_through" id="0x7f120d4a" />
-    <public type="string" name="pause" id="0x7f120d4b" />
-    <public type="string" name="payment_authentication_modal_button" id="0x7f120d4c" />
-    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7f120d4d" />
-    <public type="string" name="payment_authentication_modal_canceled" id="0x7f120d4e" />
-    <public type="string" name="payment_authentication_modal_fail" id="0x7f120d4f" />
-    <public type="string" name="payment_authentication_modal_start" id="0x7f120d50" />
-    <public type="string" name="payment_authentication_modal_success" id="0x7f120d51" />
-    <public type="string" name="payment_authentication_modal_title" id="0x7f120d52" />
-    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7f120d53" />
-    <public type="string" name="payment_authentication_modal_title_fail" id="0x7f120d54" />
-    <public type="string" name="payment_authentication_modal_title_success" id="0x7f120d55" />
-    <public type="string" name="payment_modal_button_change_card" id="0x7f120d56" />
-    <public type="string" name="payment_modal_button_change_paypal" id="0x7f120d57" />
-    <public type="string" name="payment_modal_button_premium" id="0x7f120d58" />
-    <public type="string" name="payment_modal_button_premium_gift" id="0x7f120d59" />
-    <public type="string" name="payment_modal_one_month" id="0x7f120d5a" />
-    <public type="string" name="payment_modal_one_year" id="0x7f120d5b" />
-    <public type="string" name="payment_modal_per_month" id="0x7f120d5c" />
-    <public type="string" name="payment_modal_per_year" id="0x7f120d5d" />
-    <public type="string" name="payment_modal_subtitle" id="0x7f120d5e" />
-    <public type="string" name="payment_modal_title_change_card" id="0x7f120d5f" />
-    <public type="string" name="payment_modal_title_change_paypal" id="0x7f120d60" />
-    <public type="string" name="payment_modal_title_new_monthly" id="0x7f120d61" />
-    <public type="string" name="payment_modal_title_new_yearly" id="0x7f120d62" />
-    <public type="string" name="payment_price_change_body" id="0x7f120d63" />
-    <public type="string" name="payment_price_change_title" id="0x7f120d64" />
-    <public type="string" name="payment_source_billing_address" id="0x7f120d65" />
-    <public type="string" name="payment_source_card_ending" id="0x7f120d66" />
-    <public type="string" name="payment_source_card_ending_in" id="0x7f120d67" />
-    <public type="string" name="payment_source_card_expires" id="0x7f120d68" />
-    <public type="string" name="payment_source_card_number" id="0x7f120d69" />
-    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f120d6a" />
-    <public type="string" name="payment_source_credit_card" id="0x7f120d6b" />
-    <public type="string" name="payment_source_delete" id="0x7f120d6c" />
-    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f120d6d" />
-    <public type="string" name="payment_source_deleted" id="0x7f120d6e" />
-    <public type="string" name="payment_source_edit_help_card" id="0x7f120d6f" />
-    <public type="string" name="payment_source_edit_help_paypal" id="0x7f120d70" />
-    <public type="string" name="payment_source_edit_saved" id="0x7f120d71" />
-    <public type="string" name="payment_source_edit_select_state" id="0x7f120d72" />
-    <public type="string" name="payment_source_edit_title" id="0x7f120d73" />
-    <public type="string" name="payment_source_expiration_date" id="0x7f120d74" />
-    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f120d75" />
-    <public type="string" name="payment_source_information" id="0x7f120d76" />
-    <public type="string" name="payment_source_invalid" id="0x7f120d77" />
-    <public type="string" name="payment_source_invalid_help" id="0x7f120d78" />
-    <public type="string" name="payment_source_make_default" id="0x7f120d79" />
-    <public type="string" name="payment_source_name" id="0x7f120d7a" />
-    <public type="string" name="payment_source_name_error_required" id="0x7f120d7b" />
-    <public type="string" name="payment_source_name_placeholder" id="0x7f120d7c" />
-    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f120d7d" />
-    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f120d7e" />
-    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f120d7f" />
-    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f120d80" />
-    <public type="string" name="payment_source_payment_request_info_title" id="0x7f120d81" />
-    <public type="string" name="payment_source_payment_request_label" id="0x7f120d82" />
-    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f120d83" />
-    <public type="string" name="payment_source_paypal" id="0x7f120d84" />
-    <public type="string" name="payment_source_paypal_account" id="0x7f120d85" />
-    <public type="string" name="payment_source_paypal_details" id="0x7f120d86" />
-    <public type="string" name="payment_source_paypal_loading" id="0x7f120d87" />
-    <public type="string" name="payment_source_paypal_reopen" id="0x7f120d88" />
-    <public type="string" name="payment_source_security_code" id="0x7f120d89" />
-    <public type="string" name="payment_source_title" id="0x7f120d8a" />
-    <public type="string" name="payment_source_type" id="0x7f120d8b" />
-    <public type="string" name="payment_source_type_select" id="0x7f120d8c" />
-    <public type="string" name="payment_sources_add" id="0x7f120d8d" />
-    <public type="string" name="payment_steps_go_back" id="0x7f120d8e" />
-    <public type="string" name="payment_waiting_for_authentication" id="0x7f120d8f" />
-    <public type="string" name="paypal_account_verifying" id="0x7f120d90" />
-    <public type="string" name="paypal_callback_error" id="0x7f120d91" />
-    <public type="string" name="paypal_callback_success" id="0x7f120d92" />
-    <public type="string" name="pending" id="0x7f120d93" />
-    <public type="string" name="percentage_since_last_week" id="0x7f120d94" />
-    <public type="string" name="permission_camera_access_denied" id="0x7f120d95" />
-    <public type="string" name="permission_helpdesk" id="0x7f120d96" />
-    <public type="string" name="permission_media_denied" id="0x7f120d97" />
-    <public type="string" name="permission_media_download_denied" id="0x7f120d98" />
-    <public type="string" name="permission_microphone_denied" id="0x7f120d99" />
-    <public type="string" name="permission_override_allow" id="0x7f120d9a" />
-    <public type="string" name="permission_override_deny" id="0x7f120d9b" />
-    <public type="string" name="permission_override_passthrough" id="0x7f120d9c" />
-    <public type="string" name="permission_overrides" id="0x7f120d9d" />
-    <public type="string" name="permissions" id="0x7f120d9e" />
-    <public type="string" name="permissions_unsynced" id="0x7f120d9f" />
-    <public type="string" name="permit_usage_android" id="0x7f120da0" />
-    <public type="string" name="personalization_disable_modal_body" id="0x7f120da1" />
-    <public type="string" name="personalization_disable_modal_cancel" id="0x7f120da2" />
-    <public type="string" name="personalization_disable_modal_confirm" id="0x7f120da3" />
-    <public type="string" name="personalization_disable_modal_title" id="0x7f120da4" />
-    <public type="string" name="phone" id="0x7f120da5" />
-    <public type="string" name="pick_a_color" id="0x7f120da6" />
-    <public type="string" name="pin" id="0x7f120da7" />
-    <public type="string" name="pin_confirm" id="0x7f120da8" />
-    <public type="string" name="pin_message" id="0x7f120da9" />
-    <public type="string" name="pin_message_body" id="0x7f120daa" />
-    <public type="string" name="pin_message_body_mobile" id="0x7f120dab" />
-    <public type="string" name="pin_message_body_private_channel" id="0x7f120dac" />
-    <public type="string" name="pin_message_title" id="0x7f120dad" />
-    <public type="string" name="pin_message_too_many_body" id="0x7f120dae" />
-    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f120daf" />
-    <public type="string" name="pin_message_too_many_title" id="0x7f120db0" />
-    <public type="string" name="pinned_messages" id="0x7f120db1" />
-    <public type="string" name="pinned_messages_pro_tip" id="0x7f120db2" />
-    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f120db3" />
-    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f120db4" />
-    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f120db5" />
-    <public type="string" name="pins_disabled_nsfw" id="0x7f120db6" />
-    <public type="string" name="pl" id="0x7f120db7" />
-    <public type="string" name="platform_android" id="0x7f120db8" />
-    <public type="string" name="platform_android_version" id="0x7f120db9" />
-    <public type="string" name="platform_ios" id="0x7f120dba" />
-    <public type="string" name="platform_ios_version" id="0x7f120dbb" />
-    <public type="string" name="platform_linux" id="0x7f120dbc" />
-    <public type="string" name="platform_macos" id="0x7f120dbd" />
-    <public type="string" name="platform_windows" id="0x7f120dbe" />
-    <public type="string" name="play" id="0x7f120dbf" />
-    <public type="string" name="play_full_video" id="0x7f120dc0" />
-    <public type="string" name="play_stream" id="0x7f120dc1" />
-    <public type="string" name="playing_game" id="0x7f120dc2" />
-    <public type="string" name="popout_player" id="0x7f120dc3" />
-    <public type="string" name="popout_player_opened" id="0x7f120dc4" />
-    <public type="string" name="popout_remove_from_top" id="0x7f120dc5" />
-    <public type="string" name="popout_return" id="0x7f120dc6" />
-    <public type="string" name="popout_stay_on_top" id="0x7f120dc7" />
-    <public type="string" name="post_code" id="0x7f120dc8" />
-    <public type="string" name="premium" id="0x7f120dc9" />
-    <public type="string" name="premium_activated" id="0x7f120dca" />
-    <public type="string" name="premium_alert_error_title" id="0x7f120dcb" />
-    <public type="string" name="premium_badge_tooltip" id="0x7f120dcc" />
-    <public type="string" name="premium_cancel_cancel" id="0x7f120dcd" />
-    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f120dce" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f120dcf" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f120dd0" />
-    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f120dd1" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f120dd2" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f120dd3" />
-    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f120dd4" />
-    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f120dd5" />
-    <public type="string" name="premium_cancel_confirm_new" id="0x7f120dd6" />
-    <public type="string" name="premium_cancel_confirm_title" id="0x7f120dd7" />
-    <public type="string" name="premium_cancel_failed_body" id="0x7f120dd8" />
-    <public type="string" name="premium_canceled" id="0x7f120dd9" />
-    <public type="string" name="premium_cant_upgrade_confirm" id="0x7f120dda" />
-    <public type="string" name="premium_change_discriminator_length_error" id="0x7f120ddb" />
-    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f120ddc" />
-    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f120ddd" />
-    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f120dde" />
-    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f120ddf" />
-    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f120de0" />
-    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f120de1" />
-    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f120de2" />
-    <public type="string" name="premium_chat_perks_description_animated_avatar_and_emoji" id="0x7f120de3" />
-    <public type="string" name="premium_chat_perks_description_badge" id="0x7f120de4" />
-    <public type="string" name="premium_chat_perks_description_custom_emoji" id="0x7f120de5" />
-    <public type="string" name="premium_chat_perks_description_discriminator" id="0x7f120de6" />
-    <public type="string" name="premium_chat_perks_description_screenshare" id="0x7f120de7" />
-    <public type="string" name="premium_chat_perks_description_streaming" id="0x7f120de8" />
-    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f120de9" />
-    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f120dea" />
-    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f120deb" />
-    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f120dec" />
-    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f120ded" />
-    <public type="string" name="premium_chat_perks_simple_title" id="0x7f120dee" />
-    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f120def" />
-    <public type="string" name="premium_chat_perks_title_animated_avatar_and_emoji" id="0x7f120df0" />
-    <public type="string" name="premium_chat_perks_title_badge" id="0x7f120df1" />
-    <public type="string" name="premium_chat_perks_title_custom_emoji" id="0x7f120df2" />
-    <public type="string" name="premium_chat_perks_title_discriminator" id="0x7f120df3" />
-    <public type="string" name="premium_chat_perks_title_screenshare" id="0x7f120df4" />
-    <public type="string" name="premium_chat_perks_title_streaming" id="0x7f120df5" />
-    <public type="string" name="premium_chat_perks_title_upload_limit" id="0x7f120df6" />
-    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f120df7" />
-    <public type="string" name="premium_code_active_until" id="0x7f120df8" />
-    <public type="string" name="premium_code_redemption_confirmation_blurb" id="0x7f120df9" />
-    <public type="string" name="premium_code_redemption_confirmation_button" id="0x7f120dfa" />
-    <public type="string" name="premium_expiring_body_boosting" id="0x7f120dfb" />
-    <public type="string" name="premium_expiring_body_control" id="0x7f120dfc" />
-    <public type="string" name="premium_expiring_body_custom_tag" id="0x7f120dfd" />
-    <public type="string" name="premium_expiring_body_emoji" id="0x7f120dfe" />
-    <public type="string" name="premium_expiring_body_generic" id="0x7f120dff" />
-    <public type="string" name="premium_expiring_callout" id="0x7f120e00" />
-    <public type="string" name="premium_expiring_go_to_settings" id="0x7f120e01" />
-    <public type="string" name="premium_expiring_title" id="0x7f120e02" />
-    <public type="string" name="premium_features_chat_perks" id="0x7f120e03" />
-    <public type="string" name="premium_features_chat_perks_header" id="0x7f120e04" />
-    <public type="string" name="premium_features_enhanced_chat_perks" id="0x7f120e05" />
-    <public type="string" name="premium_features_premium_guild_subscriptions" id="0x7f120e06" />
-    <public type="string" name="premium_game" id="0x7f120e07" />
-    <public type="string" name="premium_gift_button_label" id="0x7f120e08" />
-    <public type="string" name="premium_gift_button_tooltip" id="0x7f120e09" />
-    <public type="string" name="premium_gift_send" id="0x7f120e0a" />
-    <public type="string" name="premium_gift_share_link_ios" id="0x7f120e0b" />
-    <public type="string" name="premium_gifting_title" id="0x7f120e0c" />
-    <public type="string" name="premium_gifting_title_mobile" id="0x7f120e0d" />
-    <public type="string" name="premium_grandfathered_monthly" id="0x7f120e0e" />
-    <public type="string" name="premium_grandfathered_warning" id="0x7f120e0f" />
-    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f120e10" />
-    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f120e11" />
-    <public type="string" name="premium_grandfathered_warning_title" id="0x7f120e12" />
-    <public type="string" name="premium_grandfathered_yearly" id="0x7f120e13" />
-    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f120e14" />
-    <public type="string" name="premium_guild_features_blurb" id="0x7f120e15" />
-    <public type="string" name="premium_guild_features_customize_guild_description" id="0x7f120e16" />
-    <public type="string" name="premium_guild_features_customize_guild_mobile" id="0x7f120e17" />
-    <public type="string" name="premium_guild_features_customize_guild_title" id="0x7f120e18" />
-    <public type="string" name="premium_guild_features_learn_more_button" id="0x7f120e19" />
-    <public type="string" name="premium_guild_features_learn_more_text" id="0x7f120e1a" />
-    <public type="string" name="premium_guild_features_more" id="0x7f120e1b" />
-    <public type="string" name="premium_guild_features_new_role_description" id="0x7f120e1c" />
-    <public type="string" name="premium_guild_features_new_role_mobile" id="0x7f120e1d" />
-    <public type="string" name="premium_guild_features_new_role_title" id="0x7f120e1e" />
-    <public type="string" name="premium_guild_features_show_support_description" id="0x7f120e1f" />
-    <public type="string" name="premium_guild_features_show_support_mobile" id="0x7f120e20" />
-    <public type="string" name="premium_guild_features_show_support_title" id="0x7f120e21" />
-    <public type="string" name="premium_guild_features_title" id="0x7f120e22" />
-    <public type="string" name="premium_guild_features_upload_sizes_description" id="0x7f120e23" />
-    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f120e24" />
-    <public type="string" name="premium_guild_features_upload_sizes_title" id="0x7f120e25" />
-    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f120e26" />
-    <public type="string" name="premium_guild_features_upsell_banner_upgrade" id="0x7f120e27" />
-    <public type="string" name="premium_guild_header_badge_no_subscribers" id="0x7f120e28" />
-    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f120e29" />
-    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f120e2a" />
-    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f120e2b" />
-    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f120e2c" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile_1" id="0x7f120e2d" />
-    <public type="string" name="premium_guild_perks_modal_blurb_mobile_2" id="0x7f120e2e" />
-    <public type="string" name="premium_guild_perks_modal_button_get_premium" id="0x7f120e2f" />
-    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f120e30" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium" id="0x7f120e31" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f120e32" />
-    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip" id="0x7f120e33" />
-    <public type="string" name="premium_guild_perks_modal_header" id="0x7f120e34" />
-    <public type="string" name="premium_guild_perks_modal_header_boost_count" id="0x7f120e35" />
-    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f120e36" />
-    <public type="string" name="premium_guild_perks_modal_manage_your_subscription" id="0x7f120e37" />
-    <public type="string" name="premium_guild_perks_modal_no_tiers" id="0x7f120e38" />
-    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f120e39" />
-    <public type="string" name="premium_guild_perks_modal_tier_zero_surpassed" id="0x7f120e3a" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_already_subscribed_this_server" id="0x7f120e3b" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_already_used_subscription" id="0x7f120e3c" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_cooldown" id="0x7f120e3d" />
-    <public type="string" name="premium_guild_perks_modal_tooltip_gift" id="0x7f120e3e" />
-    <public type="string" name="premium_guild_settings_members_subscribed" id="0x7f120e3f" />
-    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f120e40" />
-    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f120e41" />
-    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f120e42" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f120e43" />
-    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f120e44" />
-    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f120e45" />
-    <public type="string" name="premium_guild_subscribe_confirm_header" id="0x7f120e46" />
-    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f120e47" />
-    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f120e48" />
-    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f120e49" />
-    <public type="string" name="premium_guild_subscription_available_count" id="0x7f120e4a" />
-    <public type="string" name="premium_guild_subscription_duration" id="0x7f120e4b" />
-    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f120e4c" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f120e4d" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f120e4e" />
-    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f120e4f" />
-    <public type="string" name="premium_guild_subscription_no_next_tier" id="0x7f120e50" />
-    <public type="string" name="premium_guild_subscription_notice" id="0x7f120e51" />
-    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f120e52" />
-    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f120e53" />
-    <public type="string" name="premium_guild_subscription_remove_button" id="0x7f120e54" />
-    <public type="string" name="premium_guild_subscription_remove_error_mobile" id="0x7f120e55" />
-    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f120e56" />
-    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f120e57" />
-    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f120e58" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f120e59" />
-    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f120e5a" />
-    <public type="string" name="premium_guild_subscription_title" id="0x7f120e5b" />
-    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f120e5c" />
-    <public type="string" name="premium_guild_tier_1" id="0x7f120e5d" />
-    <public type="string" name="premium_guild_tier_2" id="0x7f120e5e" />
-    <public type="string" name="premium_guild_tier_3" id="0x7f120e5f" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f120e60" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f120e61" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f120e62" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f120e63" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f120e64" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f120e65" />
-    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f120e66" />
-    <public type="string" name="premium_included" id="0x7f120e67" />
-    <public type="string" name="premium_info_monthly" id="0x7f120e68" />
-    <public type="string" name="premium_info_yearly" id="0x7f120e69" />
-    <public type="string" name="premium_month_subscription" id="0x7f120e6a" />
-    <public type="string" name="premium_not_claimed" id="0x7f120e6b" />
-    <public type="string" name="premium_not_claimed_body" id="0x7f120e6c" />
-    <public type="string" name="premium_not_verified" id="0x7f120e6d" />
-    <public type="string" name="premium_not_verified_body" id="0x7f120e6e" />
-    <public type="string" name="premium_past_due" id="0x7f120e6f" />
-    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f120e70" />
-    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f120e71" />
-    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f120e72" />
-    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f120e73" />
-    <public type="string" name="premium_payment_gift_blurb" id="0x7f120e74" />
-    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f120e75" />
-    <public type="string" name="premium_payment_gift_subtext" id="0x7f120e76" />
-    <public type="string" name="premium_payment_is_gift" id="0x7f120e77" />
-    <public type="string" name="premium_payment_plan_label_monthly" id="0x7f120e78" />
-    <public type="string" name="premium_payment_plan_label_yearly" id="0x7f120e79" />
-    <public type="string" name="premium_payment_select" id="0x7f120e7a" />
-    <public type="string" name="premium_payment_start_trial" id="0x7f120e7b" />
-    <public type="string" name="premium_payment_trial_blurb" id="0x7f120e7c" />
-    <public type="string" name="premium_payment_trial_note" id="0x7f120e7d" />
-    <public type="string" name="premium_payment_trial_two_weeks_free" id="0x7f120e7e" />
-    <public type="string" name="premium_plan_month" id="0x7f120e7f" />
-    <public type="string" name="premium_plan_month_tier_1" id="0x7f120e80" />
-    <public type="string" name="premium_plan_month_tier_2" id="0x7f120e81" />
-    <public type="string" name="premium_plan_year" id="0x7f120e82" />
-    <public type="string" name="premium_plan_year_tier_1" id="0x7f120e83" />
-    <public type="string" name="premium_plan_year_tier_2" id="0x7f120e84" />
-    <public type="string" name="premium_promo_autocomplete" id="0x7f120e85" />
-    <public type="string" name="premium_promo_description" id="0x7f120e86" />
-    <public type="string" name="premium_promo_title" id="0x7f120e87" />
-    <public type="string" name="premium_required" id="0x7f120e88" />
-    <public type="string" name="premium_required_get_nitro" id="0x7f120e89" />
-    <public type="string" name="premium_restore_subscription_ios" id="0x7f120e8a" />
-    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f120e8b" />
-    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f120e8c" />
-    <public type="string" name="premium_settings" id="0x7f120e8d" />
-    <public type="string" name="premium_settings_get" id="0x7f120e8e" />
-    <public type="string" name="premium_settings_manage" id="0x7f120e8f" />
-    <public type="string" name="premium_subscription_credit" id="0x7f120e90" />
-    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7f120e91" />
-    <public type="string" name="premium_subscription_credit_applied_on" id="0x7f120e92" />
-    <public type="string" name="premium_subscription_credit_count_months" id="0x7f120e93" />
-    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f120e94" />
-    <public type="string" name="premium_subscription_policy_ios" id="0x7f120e95" />
-    <public type="string" name="premium_subscription_required_body" id="0x7f120e96" />
-    <public type="string" name="premium_subtitle" id="0x7f120e97" />
-    <public type="string" name="premium_tier_1" id="0x7f120e98" />
-    <public type="string" name="premium_tier_2" id="0x7f120e99" />
-    <public type="string" name="premium_tier_2_subtitle" id="0x7f120e9a" />
-    <public type="string" name="premium_tier_2_title" id="0x7f120e9b" />
-    <public type="string" name="premium_title" id="0x7f120e9c" />
-    <public type="string" name="premium_trial_button" id="0x7f120e9d" />
-    <public type="string" name="premium_upgrade_cancel" id="0x7f120e9e" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year" id="0x7f120e9f" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year_verbose" id="0x7f120ea0" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month" id="0x7f120ea1" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose" id="0x7f120ea2" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year" id="0x7f120ea3" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose" id="0x7f120ea4" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year" id="0x7f120ea5" />
-    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year_verbose" id="0x7f120ea6" />
-    <public type="string" name="premium_upgrade_confirm_button" id="0x7f120ea7" />
-    <public type="string" name="premium_upgrade_confirm_button_with_price" id="0x7f120ea8" />
-    <public type="string" name="premium_upgrade_confirm_title" id="0x7f120ea9" />
-    <public type="string" name="premium_upgrade_disabled_already_premium" id="0x7f120eaa" />
-    <public type="string" name="premium_upgrade_disabled_current_tooltip" id="0x7f120eab" />
-    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f120eac" />
-    <public type="string" name="premium_upgrade_disabled_lower_tier_tooltip" id="0x7f120ead" />
-    <public type="string" name="premium_upgrade_disabled_title_mobile" id="0x7f120eae" />
-    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f120eaf" />
-    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f120eb0" />
-    <public type="string" name="premium_upgrade_done_button_tier_1" id="0x7f120eb1" />
-    <public type="string" name="premium_upgrade_failed_body" id="0x7f120eb2" />
-    <public type="string" name="premium_upgrade_required_body" id="0x7f120eb3" />
-    <public type="string" name="premium_upload_promo" id="0x7f120eb4" />
-    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f120eb5" />
-    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f120eb6" />
-    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f120eb7" />
-    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f120eb8" />
-    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f120eb9" />
-    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f120eba" />
-    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f120ebb" />
-    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f120ebc" />
-    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f120ebd" />
-    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f120ebe" />
-    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f120ebf" />
-    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f120ec0" />
-    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f120ec1" />
-    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f120ec2" />
-    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f120ec3" />
-    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f120ec4" />
-    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f120ec5" />
-    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f120ec6" />
-    <public type="string" name="premium_year_free_months" id="0x7f120ec7" />
-    <public type="string" name="premium_year_subscription" id="0x7f120ec8" />
-    <public type="string" name="preorder_sku_name" id="0x7f120ec9" />
-    <public type="string" name="preview_chat" id="0x7f120eca" />
-    <public type="string" name="priority_speaker" id="0x7f120ecb" />
-    <public type="string" name="priority_speaker_description" id="0x7f120ecc" />
-    <public type="string" name="priority_speaker_description_app" id="0x7f120ecd" />
-    <public type="string" name="privacy_and_safety" id="0x7f120ece" />
-    <public type="string" name="privacy_policy" id="0x7f120ecf" />
-    <public type="string" name="privacy_policy_url" id="0x7f120ed0" />
-    <public type="string" name="privacy_settings" id="0x7f120ed1" />
-    <public type="string" name="private_category" id="0x7f120ed2" />
-    <public type="string" name="private_category_note" id="0x7f120ed3" />
-    <public type="string" name="private_channel" id="0x7f120ed4" />
-    <public type="string" name="private_channel_note" id="0x7f120ed5" />
-    <public type="string" name="profile" id="0x7f120ed6" />
-    <public type="string" name="project_id" id="0x7f120ed7" />
-    <public type="string" name="prune" id="0x7f120ed8" />
-    <public type="string" name="prune_members" id="0x7f120ed9" />
-    <public type="string" name="pt_br" id="0x7f120eda" />
-    <public type="string" name="ptt_limited_body" id="0x7f120edb" />
-    <public type="string" name="ptt_limited_title" id="0x7f120edc" />
-    <public type="string" name="ptt_limited_warning" id="0x7f120edd" />
-    <public type="string" name="ptt_permission_body" id="0x7f120ede" />
-    <public type="string" name="ptt_permission_title" id="0x7f120edf" />
-    <public type="string" name="public_guild_survey_modal_body" id="0x7f120ee0" />
-    <public type="string" name="public_guild_survey_modal_header" id="0x7f120ee1" />
-    <public type="string" name="publish_followed_news_body" id="0x7f120ee2" />
-    <public type="string" name="publish_followed_news_body_reach" id="0x7f120ee3" />
-    <public type="string" name="publish_followed_news_body_settings" id="0x7f120ee4" />
-    <public type="string" name="publish_followed_news_body_stats" id="0x7f120ee5" />
-    <public type="string" name="publish_followed_news_fail_body" id="0x7f120ee6" />
-    <public type="string" name="publish_followed_news_fail_title" id="0x7f120ee7" />
-    <public type="string" name="publish_followed_news_generic_body" id="0x7f120ee8" />
-    <public type="string" name="purple" id="0x7f120ee9" />
-    <public type="string" name="quality_indicator" id="0x7f120eea" />
-    <public type="string" name="quick_dm_blocked" id="0x7f120eeb" />
-    <public type="string" name="quick_dm_user" id="0x7f120eec" />
-    <public type="string" name="quick_launcher_empty_text" id="0x7f120eed" />
-    <public type="string" name="quick_launcher_empty_text_v2" id="0x7f120eee" />
-    <public type="string" name="quick_launcher_header" id="0x7f120eef" />
-    <public type="string" name="quick_switcher" id="0x7f120ef0" />
-    <public type="string" name="quickswitcher_drafts" id="0x7f120ef1" />
-    <public type="string" name="quickswitcher_empty_cta" id="0x7f120ef2" />
-    <public type="string" name="quickswitcher_empty_text" id="0x7f120ef3" />
-    <public type="string" name="quickswitcher_last_channel" id="0x7f120ef4" />
-    <public type="string" name="quickswitcher_mentions" id="0x7f120ef5" />
-    <public type="string" name="quickswitcher_notice" id="0x7f120ef6" />
-    <public type="string" name="quickswitcher_placeholder" id="0x7f120ef7" />
-    <public type="string" name="quickswitcher_querymode_applications" id="0x7f120ef8" />
-    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f120ef9" />
-    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f120efa" />
-    <public type="string" name="quickswitcher_querymode_users" id="0x7f120efb" />
-    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7f120efc" />
-    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f120efd" />
-    <public type="string" name="quickswitcher_tip_nav" id="0x7f120efe" />
-    <public type="string" name="quickswitcher_tip_select" id="0x7f120eff" />
-    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f120f00" />
-    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f120f01" />
-    <public type="string" name="quickswitcher_unread_channels" id="0x7f120f02" />
-    <public type="string" name="quote_attribution" id="0x7f120f03" />
-    <public type="string" name="quote_attribution_facebook" id="0x7f120f04" />
-    <public type="string" name="quote_attribution_instagram" id="0x7f120f05" />
-    <public type="string" name="rate_limited" id="0x7f120f06" />
-    <public type="string" name="rate_limited_retry_after" id="0x7f120f07" />
-    <public type="string" name="rating_request_body_android" id="0x7f120f08" />
-    <public type="string" name="rating_request_title" id="0x7f120f09" />
-    <public type="string" name="reaction_tooltip_1" id="0x7f120f0a" />
-    <public type="string" name="reaction_tooltip_1_n" id="0x7f120f0b" />
-    <public type="string" name="reaction_tooltip_2" id="0x7f120f0c" />
-    <public type="string" name="reaction_tooltip_2_n" id="0x7f120f0d" />
-    <public type="string" name="reaction_tooltip_3" id="0x7f120f0e" />
-    <public type="string" name="reaction_tooltip_3_n" id="0x7f120f0f" />
-    <public type="string" name="reaction_tooltip_n" id="0x7f120f10" />
-    <public type="string" name="reactions" id="0x7f120f11" />
-    <public type="string" name="reactions_matching" id="0x7f120f12" />
-    <public type="string" name="read_message_history" id="0x7f120f13" />
-    <public type="string" name="read_messages" id="0x7f120f14" />
-    <public type="string" name="read_messages_view_channels" id="0x7f120f15" />
-    <public type="string" name="read_only_channel" id="0x7f120f16" />
-    <public type="string" name="ready" id="0x7f120f17" />
-    <public type="string" name="recent_mentions" id="0x7f120f18" />
-    <public type="string" name="recent_mentions_direct_only" id="0x7f120f19" />
-    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f120f1a" />
-    <public type="string" name="recent_mentions_filter_everyone" id="0x7f120f1b" />
-    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f120f1c" />
-    <public type="string" name="recent_mentions_filter_label" id="0x7f120f1d" />
-    <public type="string" name="recent_mentions_filter_roles" id="0x7f120f1e" />
-    <public type="string" name="recent_mentions_pro_tip" id="0x7f120f1f" />
-    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f120f20" />
-    <public type="string" name="reconnect" id="0x7f120f21" />
-    <public type="string" name="reconnecting" id="0x7f120f22" />
-    <public type="string" name="refund" id="0x7f120f23" />
-    <public type="string" name="region" id="0x7f120f24" />
-    <public type="string" name="region_select_footer" id="0x7f120f25" />
-    <public type="string" name="region_select_header" id="0x7f120f26" />
-    <public type="string" name="register" id="0x7f120f27" />
-    <public type="string" name="register_account" id="0x7f120f28" />
-    <public type="string" name="register_body" id="0x7f120f29" />
-    <public type="string" name="register_title" id="0x7f120f2a" />
-    <public type="string" name="remaining_participants" id="0x7f120f2b" />
-    <public type="string" name="remove" id="0x7f120f2c" />
-    <public type="string" name="remove_all_reactions" id="0x7f120f2d" />
-    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f120f2e" />
-    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f120f2f" />
-    <public type="string" name="remove_friend" id="0x7f120f30" />
-    <public type="string" name="remove_friend_body" id="0x7f120f31" />
-    <public type="string" name="remove_friend_title" id="0x7f120f32" />
-    <public type="string" name="remove_from_group" id="0x7f120f33" />
-    <public type="string" name="remove_icon" id="0x7f120f34" />
-    <public type="string" name="remove_keybind" id="0x7f120f35" />
-    <public type="string" name="remove_reaction" id="0x7f120f36" />
-    <public type="string" name="remove_role_or_user" id="0x7f120f37" />
-    <public type="string" name="remove_synced_role" id="0x7f120f38" />
-    <public type="string" name="remove_vanity_url" id="0x7f120f39" />
-    <public type="string" name="render_embeds" id="0x7f120f3a" />
-    <public type="string" name="render_embeds_label" id="0x7f120f3b" />
-    <public type="string" name="render_reactions" id="0x7f120f3c" />
-    <public type="string" name="report" id="0x7f120f3d" />
-    <public type="string" name="report_message" id="0x7f120f3e" />
-    <public type="string" name="report_server" id="0x7f120f3f" />
-    <public type="string" name="report_title" id="0x7f120f40" />
-    <public type="string" name="report_user" id="0x7f120f41" />
-    <public type="string" name="reported" id="0x7f120f42" />
-    <public type="string" name="request_permission_msg" id="0x7f120f43" />
-    <public type="string" name="resend" id="0x7f120f44" />
-    <public type="string" name="resend_code" id="0x7f120f45" />
-    <public type="string" name="resend_email" id="0x7f120f46" />
-    <public type="string" name="resend_message" id="0x7f120f47" />
-    <public type="string" name="resend_verification_email" id="0x7f120f48" />
-    <public type="string" name="reset" id="0x7f120f49" />
-    <public type="string" name="reset_nickname" id="0x7f120f4a" />
-    <public type="string" name="reset_notification_override" id="0x7f120f4b" />
-    <public type="string" name="reset_notification_settings" id="0x7f120f4c" />
-    <public type="string" name="reset_password_title" id="0x7f120f4d" />
-    <public type="string" name="reset_to_default" id="0x7f120f4e" />
-    <public type="string" name="reset_voice_settings" id="0x7f120f4f" />
-    <public type="string" name="reset_voice_settings_body" id="0x7f120f50" />
-    <public type="string" name="resubscribe" id="0x7f120f51" />
-    <public type="string" name="retry" id="0x7f120f52" />
-    <public type="string" name="return_to_login" id="0x7f120f53" />
-    <public type="string" name="reversed" id="0x7f120f54" />
-    <public type="string" name="revoke" id="0x7f120f55" />
-    <public type="string" name="revoke_ban" id="0x7f120f56" />
-    <public type="string" name="ring" id="0x7f120f57" />
-    <public type="string" name="ro" id="0x7f120f58" />
-    <public type="string" name="role_order_updated" id="0x7f120f59" />
-    <public type="string" name="roles" id="0x7f120f5a" />
-    <public type="string" name="roles_list" id="0x7f120f5b" />
-    <public type="string" name="rtc_connection" id="0x7f120f5c" />
-    <public type="string" name="rtc_connection_info" id="0x7f120f5d" />
-    <public type="string" name="rtc_connection_state_authenticating" id="0x7f120f5e" />
-    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f120f5f" />
-    <public type="string" name="rtc_connection_state_connecting" id="0x7f120f60" />
-    <public type="string" name="rtc_connection_state_disconnected" id="0x7f120f61" />
-    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f120f62" />
-    <public type="string" name="rtc_connection_state_no_route" id="0x7f120f63" />
-    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f120f64" />
-    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f120f65" />
-    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f120f66" />
-    <public type="string" name="rtc_debug_context" id="0x7f120f67" />
-    <public type="string" name="rtc_debug_open" id="0x7f120f68" />
-    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f120f69" />
-    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f120f6a" />
-    <public type="string" name="rtc_debug_screenshare" id="0x7f120f6b" />
-    <public type="string" name="rtc_debug_transport" id="0x7f120f6c" />
-    <public type="string" name="rtc_debug_users" id="0x7f120f6d" />
-    <public type="string" name="ru" id="0x7f120f6e" />
-    <public type="string" name="salmon" id="0x7f120f6f" />
-    <public type="string" name="sample_channel_message" id="0x7f120f70" />
-    <public type="string" name="sample_channel_name" id="0x7f120f71" />
-    <public type="string" name="sample_channel_name_short" id="0x7f120f72" />
-    <public type="string" name="sample_channel_search_filter" id="0x7f120f73" />
-    <public type="string" name="sample_confirmation" id="0x7f120f74" />
-    <public type="string" name="sample_connected_account" id="0x7f120f75" />
-    <public type="string" name="sample_discrim" id="0x7f120f76" />
-    <public type="string" name="sample_email" id="0x7f120f77" />
-    <public type="string" name="sample_empty_string" id="0x7f120f78" />
-    <public type="string" name="sample_language" id="0x7f120f79" />
-    <public type="string" name="sample_number_9" id="0x7f120f7a" />
-    <public type="string" name="sample_number_99" id="0x7f120f7b" />
-    <public type="string" name="sample_number_999" id="0x7f120f7c" />
-    <public type="string" name="sample_number_9999" id="0x7f120f7d" />
-    <public type="string" name="sample_number_bandwidth" id="0x7f120f7e" />
-    <public type="string" name="sample_number_ratio" id="0x7f120f7f" />
-    <public type="string" name="sample_online_members" id="0x7f120f80" />
-    <public type="string" name="sample_server_name" id="0x7f120f81" />
-    <public type="string" name="sample_server_name_short" id="0x7f120f82" />
-    <public type="string" name="sample_server_role_name" id="0x7f120f83" />
-    <public type="string" name="sample_time_duration_minutes" id="0x7f120f84" />
-    <public type="string" name="sample_time_duration_seconds" id="0x7f120f85" />
-    <public type="string" name="sample_time_pm" id="0x7f120f86" />
-    <public type="string" name="sample_time_stamp" id="0x7f120f87" />
-    <public type="string" name="sample_total_members" id="0x7f120f88" />
-    <public type="string" name="sample_user_generated_link" id="0x7f120f89" />
-    <public type="string" name="sample_user_name" id="0x7f120f8a" />
-    <public type="string" name="sample_user_name_discrim" id="0x7f120f8b" />
-    <public type="string" name="sample_user_nick" id="0x7f120f8c" />
-    <public type="string" name="sample_user_presence" id="0x7f120f8d" />
-    <public type="string" name="sample_user_presence_details" id="0x7f120f8e" />
-    <public type="string" name="samsung_welcome_screen" id="0x7f120f8f" />
-    <public type="string" name="save" id="0x7f120f90" />
-    <public type="string" name="save_changes" id="0x7f120f91" />
-    <public type="string" name="save_media" id="0x7f120f92" />
-    <public type="string" name="save_media_failure_help_mobile" id="0x7f120f93" />
-    <public type="string" name="save_media_failure_mobile" id="0x7f120f94" />
-    <public type="string" name="save_media_success_mobile" id="0x7f120f95" />
-    <public type="string" name="save_new_url" id="0x7f120f96" />
-    <public type="string" name="saved_settings" id="0x7f120f97" />
-    <public type="string" name="scope_activities_read" id="0x7f120f98" />
-    <public type="string" name="scope_activities_read_description" id="0x7f120f99" />
-    <public type="string" name="scope_activities_write" id="0x7f120f9a" />
-    <public type="string" name="scope_activities_write_description" id="0x7f120f9b" />
-    <public type="string" name="scope_applications_builds_read" id="0x7f120f9c" />
-    <public type="string" name="scope_applications_builds_read_description" id="0x7f120f9d" />
-    <public type="string" name="scope_applications_builds_upload" id="0x7f120f9e" />
-    <public type="string" name="scope_applications_builds_upload_description" id="0x7f120f9f" />
-    <public type="string" name="scope_applications_entitlements" id="0x7f120fa0" />
-    <public type="string" name="scope_applications_entitlements_description" id="0x7f120fa1" />
-    <public type="string" name="scope_applications_store_update" id="0x7f120fa2" />
-    <public type="string" name="scope_applications_store_update_description" id="0x7f120fa3" />
-    <public type="string" name="scope_bot" id="0x7f120fa4" />
-    <public type="string" name="scope_bot_description" id="0x7f120fa5" />
-    <public type="string" name="scope_bot_permissions" id="0x7f120fa6" />
-    <public type="string" name="scope_bot_permissions_description" id="0x7f120fa7" />
-    <public type="string" name="scope_bot_server_placeholder" id="0x7f120fa8" />
-    <public type="string" name="scope_bot_server_placeholder_no_guilds" id="0x7f120fa9" />
-    <public type="string" name="scope_bot_server_selected_label" id="0x7f120faa" />
-    <public type="string" name="scope_connections" id="0x7f120fab" />
-    <public type="string" name="scope_connections_empty" id="0x7f120fac" />
-    <public type="string" name="scope_email" id="0x7f120fad" />
-    <public type="string" name="scope_email_empty" id="0x7f120fae" />
-    <public type="string" name="scope_gdm_join" id="0x7f120faf" />
-    <public type="string" name="scope_gdm_join_description" id="0x7f120fb0" />
-    <public type="string" name="scope_guilds" id="0x7f120fb1" />
-    <public type="string" name="scope_guilds_empty" id="0x7f120fb2" />
-    <public type="string" name="scope_guilds_join" id="0x7f120fb3" />
-    <public type="string" name="scope_guilds_join_description" id="0x7f120fb4" />
-    <public type="string" name="scope_guilds_list_overflow" id="0x7f120fb5" />
-    <public type="string" name="scope_identify" id="0x7f120fb6" />
-    <public type="string" name="scope_messages_read" id="0x7f120fb7" />
-    <public type="string" name="scope_messages_read_description" id="0x7f120fb8" />
-    <public type="string" name="scope_relationships_read" id="0x7f120fb9" />
-    <public type="string" name="scope_relationships_read_description" id="0x7f120fba" />
-    <public type="string" name="scope_rpc" id="0x7f120fbb" />
-    <public type="string" name="scope_rpc_api" id="0x7f120fbc" />
-    <public type="string" name="scope_rpc_api_description" id="0x7f120fbd" />
-    <public type="string" name="scope_rpc_description" id="0x7f120fbe" />
-    <public type="string" name="scope_rpc_notifications_read" id="0x7f120fbf" />
-    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f120fc0" />
-    <public type="string" name="scope_unsupported_on_android" id="0x7f120fc1" />
-    <public type="string" name="scope_unsupported_on_android_description" id="0x7f120fc2" />
-    <public type="string" name="scope_webhook_incoming" id="0x7f120fc3" />
-    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f120fc4" />
-    <public type="string" name="scope_webhook_incoming_description" id="0x7f120fc5" />
-    <public type="string" name="screen_share_on" id="0x7f120fc6" />
-    <public type="string" name="screen_share_options" id="0x7f120fc7" />
-    <public type="string" name="screenshare_change_windows" id="0x7f120fc8" />
-    <public type="string" name="screenshare_description" id="0x7f120fc9" />
-    <public type="string" name="screenshare_extension_body" id="0x7f120fca" />
-    <public type="string" name="screenshare_extension_title" id="0x7f120fcb" />
-    <public type="string" name="screenshare_frame_rate" id="0x7f120fcc" />
-    <public type="string" name="screenshare_relaunch" id="0x7f120fcd" />
-    <public type="string" name="screenshare_relaunch_body" id="0x7f120fce" />
-    <public type="string" name="screenshare_screen" id="0x7f120fcf" />
-    <public type="string" name="screenshare_share_screen_or_window" id="0x7f120fd0" />
-    <public type="string" name="screenshare_sound_toggle_label" id="0x7f120fd1" />
-    <public type="string" name="screenshare_source" id="0x7f120fd2" />
-    <public type="string" name="screenshare_stop" id="0x7f120fd3" />
-    <public type="string" name="screenshare_stream_game" id="0x7f120fd4" />
-    <public type="string" name="screenshare_stream_quality" id="0x7f120fd5" />
-    <public type="string" name="screenshare_unavailable" id="0x7f120fd6" />
-    <public type="string" name="screenshare_unavailable_download_app" id="0x7f120fd7" />
-    <public type="string" name="screenshare_window" id="0x7f120fd8" />
-    <public type="string" name="search" id="0x7f120fd9" />
-    <public type="string" name="search_actions" id="0x7f120fda" />
-    <public type="string" name="search_answer_date" id="0x7f120fdb" />
-    <public type="string" name="search_answer_file_name" id="0x7f120fdc" />
-    <public type="string" name="search_answer_file_type" id="0x7f120fdd" />
-    <public type="string" name="search_answer_from" id="0x7f120fde" />
-    <public type="string" name="search_answer_has" id="0x7f120fdf" />
-    <public type="string" name="search_answer_has_attachment" id="0x7f120fe0" />
-    <public type="string" name="search_answer_has_embed" id="0x7f120fe1" />
-    <public type="string" name="search_answer_has_image" id="0x7f120fe2" />
-    <public type="string" name="search_answer_has_link" id="0x7f120fe3" />
-    <public type="string" name="search_answer_has_sound" id="0x7f120fe4" />
-    <public type="string" name="search_answer_has_video" id="0x7f120fe5" />
-    <public type="string" name="search_answer_in" id="0x7f120fe6" />
-    <public type="string" name="search_answer_link_from" id="0x7f120fe7" />
-    <public type="string" name="search_answer_mentions" id="0x7f120fe8" />
-    <public type="string" name="search_channels" id="0x7f120fe9" />
-    <public type="string" name="search_channels_no_result" id="0x7f120fea" />
-    <public type="string" name="search_clear" id="0x7f120feb" />
-    <public type="string" name="search_clear_history" id="0x7f120fec" />
-    <public type="string" name="search_country" id="0x7f120fed" />
-    <public type="string" name="search_date_picker_hint" id="0x7f120fee" />
-    <public type="string" name="search_dm_still_indexing" id="0x7f120fef" />
-    <public type="string" name="search_dm_with" id="0x7f120ff0" />
-    <public type="string" name="search_error" id="0x7f120ff1" />
-    <public type="string" name="search_filter_after" id="0x7f120ff2" />
-    <public type="string" name="search_filter_before" id="0x7f120ff3" />
-    <public type="string" name="search_filter_during" id="0x7f120ff4" />
-    <public type="string" name="search_filter_file_name" id="0x7f120ff5" />
-    <public type="string" name="search_filter_file_type" id="0x7f120ff6" />
-    <public type="string" name="search_filter_from" id="0x7f120ff7" />
-    <public type="string" name="search_filter_has" id="0x7f120ff8" />
-    <public type="string" name="search_filter_in" id="0x7f120ff9" />
-    <public type="string" name="search_filter_link_from" id="0x7f120ffa" />
-    <public type="string" name="search_filter_mentions" id="0x7f120ffb" />
-    <public type="string" name="search_filter_on" id="0x7f120ffc" />
-    <public type="string" name="search_for_emoji" id="0x7f120ffd" />
-    <public type="string" name="search_for_empty" id="0x7f120ffe" />
-    <public type="string" name="search_for_value" id="0x7f120fff" />
-    <public type="string" name="search_from_suggestions" id="0x7f121000" />
-    <public type="string" name="search_giphy" id="0x7f121001" />
-    <public type="string" name="search_group_header_channels" id="0x7f121002" />
-    <public type="string" name="search_group_header_dates" id="0x7f121003" />
-    <public type="string" name="search_group_header_file_name" id="0x7f121004" />
-    <public type="string" name="search_group_header_file_type" id="0x7f121005" />
-    <public type="string" name="search_group_header_from" id="0x7f121006" />
-    <public type="string" name="search_group_header_has" id="0x7f121007" />
-    <public type="string" name="search_group_header_history" id="0x7f121008" />
-    <public type="string" name="search_group_header_link_from" id="0x7f121009" />
-    <public type="string" name="search_group_header_mentions" id="0x7f12100a" />
-    <public type="string" name="search_group_header_search_options" id="0x7f12100b" />
-    <public type="string" name="search_guild_still_indexing" id="0x7f12100c" />
-    <public type="string" name="search_hide_blocked_messages" id="0x7f12100d" />
-    <public type="string" name="search_in" id="0x7f12100e" />
-    <public type="string" name="search_members" id="0x7f12100f" />
-    <public type="string" name="search_members_no_result" id="0x7f121010" />
-    <public type="string" name="search_menu_title" id="0x7f121011" />
-    <public type="string" name="search_no_results" id="0x7f121012" />
-    <public type="string" name="search_no_results_alt" id="0x7f121013" />
-    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f121014" />
-    <public type="string" name="search_pick_date" id="0x7f121015" />
-    <public type="string" name="search_recent" id="0x7f121016" />
-    <public type="string" name="search_relevant" id="0x7f121017" />
-    <public type="string" name="search_roles" id="0x7f121018" />
-    <public type="string" name="search_roles_no_result" id="0x7f121019" />
-    <public type="string" name="search_shortcut_month" id="0x7f12101a" />
-    <public type="string" name="search_shortcut_today" id="0x7f12101b" />
-    <public type="string" name="search_shortcut_week" id="0x7f12101c" />
-    <public type="string" name="search_shortcut_year" id="0x7f12101d" />
-    <public type="string" name="search_shortcut_yesterday" id="0x7f12101e" />
-    <public type="string" name="search_still_indexing_hint" id="0x7f12101f" />
-    <public type="string" name="search_tenor" id="0x7f121020" />
-    <public type="string" name="search_with_google" id="0x7f121021" />
-    <public type="string" name="searching" id="0x7f121022" />
-    <public type="string" name="security" id="0x7f121023" />
-    <public type="string" name="select" id="0x7f121024" />
-    <public type="string" name="select_channel_or_category" id="0x7f121025" />
-    <public type="string" name="select_color" id="0x7f121026" />
-    <public type="string" name="select_emoji" id="0x7f121027" />
-    <public type="string" name="select_picture" id="0x7f121028" />
-    <public type="string" name="select_picture_upload" id="0x7f121029" />
-    <public type="string" name="select_sort_mode" id="0x7f12102a" />
-    <public type="string" name="selection_shrink_scale" id="0x7f12102b" />
-    <public type="string" name="self_deafened" id="0x7f12102c" />
-    <public type="string" name="self_deny_permission_body" id="0x7f12102d" />
-    <public type="string" name="self_deny_permission_title" id="0x7f12102e" />
-    <public type="string" name="self_muted" id="0x7f12102f" />
-    <public type="string" name="self_xss_header" id="0x7f121030" />
-    <public type="string" name="self_xss_line_1" id="0x7f121031" />
-    <public type="string" name="self_xss_line_2" id="0x7f121032" />
-    <public type="string" name="self_xss_line_3" id="0x7f121033" />
-    <public type="string" name="self_xss_line_4" id="0x7f121034" />
-    <public type="string" name="send" id="0x7f121035" />
-    <public type="string" name="send_contents" id="0x7f121036" />
-    <public type="string" name="send_dm" id="0x7f121037" />
-    <public type="string" name="send_message" id="0x7f121038" />
-    <public type="string" name="send_message_failure" id="0x7f121039" />
-    <public type="string" name="send_messages" id="0x7f12103a" />
-    <public type="string" name="send_messages_description" id="0x7f12103b" />
-    <public type="string" name="send_tts_messages" id="0x7f12103c" />
-    <public type="string" name="send_tts_messages_description" id="0x7f12103d" />
-    <public type="string" name="server_acronym" id="0x7f12103e" />
-    <public type="string" name="server_analytics_description" id="0x7f12103f" />
-    <public type="string" name="server_deafen" id="0x7f121040" />
-    <public type="string" name="server_deafened" id="0x7f121041" />
-    <public type="string" name="server_desciption_empty" id="0x7f121042" />
-    <public type="string" name="server_emoji" id="0x7f121043" />
-    <public type="string" name="server_folder_mark_as_read" id="0x7f121044" />
-    <public type="string" name="server_folder_mute" id="0x7f121045" />
-    <public type="string" name="server_folder_placeholder" id="0x7f121046" />
-    <public type="string" name="server_folder_settings" id="0x7f121047" />
-    <public type="string" name="server_icon" id="0x7f121048" />
-    <public type="string" name="server_insights" id="0x7f121049" />
-    <public type="string" name="server_insights_error_message" id="0x7f12104a" />
-    <public type="string" name="server_mute" id="0x7f12104b" />
-    <public type="string" name="server_mute_dms" id="0x7f12104c" />
-    <public type="string" name="server_muted" id="0x7f12104d" />
-    <public type="string" name="server_name_required" id="0x7f12104e" />
-    <public type="string" name="server_notification" id="0x7f12104f" />
-    <public type="string" name="server_options" id="0x7f121050" />
-    <public type="string" name="server_overview" id="0x7f121051" />
-    <public type="string" name="server_ratio_healthy_hook" id="0x7f121052" />
-    <public type="string" name="server_region_unavailable" id="0x7f121053" />
-    <public type="string" name="server_settings" id="0x7f121054" />
-    <public type="string" name="server_settings_updated" id="0x7f121055" />
-    <public type="string" name="server_sort" id="0x7f121056" />
-    <public type="string" name="server_status" id="0x7f121057" />
-    <public type="string" name="server_undeafen" id="0x7f121058" />
-    <public type="string" name="server_unmute" id="0x7f121059" />
-    <public type="string" name="server_voice_mute" id="0x7f12105a" />
-    <public type="string" name="server_voice_unmute" id="0x7f12105b" />
-    <public type="string" name="servers" id="0x7f12105c" />
-    <public type="string" name="servers_management_title" id="0x7f12105d" />
-    <public type="string" name="service_connections_disconnect" id="0x7f12105e" />
-    <public type="string" name="set_debug_logging" id="0x7f12105f" />
-    <public type="string" name="set_debug_logging_body" id="0x7f121060" />
-    <public type="string" name="set_invite_link_never_expire" id="0x7f121061" />
-    <public type="string" name="set_status" id="0x7f121062" />
-    <public type="string" name="settings" id="0x7f121063" />
-    <public type="string" name="settings_advanced" id="0x7f121064" />
-    <public type="string" name="settings_basic" id="0x7f121065" />
-    <public type="string" name="settings_games_add" id="0x7f121066" />
-    <public type="string" name="settings_games_add_game" id="0x7f121067" />
-    <public type="string" name="settings_games_add_new_game" id="0x7f121068" />
-    <public type="string" name="settings_games_added_games_label" id="0x7f121069" />
-    <public type="string" name="settings_games_enable_overlay_label" id="0x7f12106a" />
-    <public type="string" name="settings_games_game_to_add" id="0x7f12106b" />
-    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f12106c" />
-    <public type="string" name="settings_games_import_explanation" id="0x7f12106d" />
-    <public type="string" name="settings_games_import_label" id="0x7f12106e" />
-    <public type="string" name="settings_games_last_played" id="0x7f12106f" />
-    <public type="string" name="settings_games_no_game_detected" id="0x7f121070" />
-    <public type="string" name="settings_games_no_games_header" id="0x7f121071" />
-    <public type="string" name="settings_games_not_playing" id="0x7f121072" />
-    <public type="string" name="settings_games_not_seeing_game" id="0x7f121073" />
-    <public type="string" name="settings_games_now_playing_label" id="0x7f121074" />
-    <public type="string" name="settings_games_now_playing_state" id="0x7f121075" />
-    <public type="string" name="settings_games_overlay" id="0x7f121076" />
-    <public type="string" name="settings_games_overlay_off" id="0x7f121077" />
-    <public type="string" name="settings_games_overlay_on" id="0x7f121078" />
-    <public type="string" name="settings_games_overlay_warning" id="0x7f121079" />
-    <public type="string" name="settings_games_remove_icon" id="0x7f12107a" />
-    <public type="string" name="settings_games_restore_to_library" id="0x7f12107b" />
-    <public type="string" name="settings_games_toggle_overlay" id="0x7f12107c" />
-    <public type="string" name="settings_games_verified_icon" id="0x7f12107d" />
-    <public type="string" name="settings_invite_tip" id="0x7f12107e" />
-    <public type="string" name="settings_invite_tip_without_create" id="0x7f12107f" />
-    <public type="string" name="settings_notice_message" id="0x7f121080" />
-    <public type="string" name="settings_permissions_delete_body" id="0x7f121081" />
-    <public type="string" name="settings_permissions_delete_title" id="0x7f121082" />
-    <public type="string" name="settings_permissions_title" id="0x7f121083" />
-    <public type="string" name="settings_roles_delete_body" id="0x7f121084" />
-    <public type="string" name="settings_roles_delete_title" id="0x7f121085" />
-    <public type="string" name="settings_roles_helpdesk_link" id="0x7f121086" />
-    <public type="string" name="settings_sync" id="0x7f121087" />
-    <public type="string" name="settings_webhooks_empty_body" id="0x7f121088" />
-    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7f121089" />
-    <public type="string" name="settings_webhooks_empty_title" id="0x7f12108a" />
-    <public type="string" name="settings_webhooks_intro" id="0x7f12108b" />
-    <public type="string" name="setup" id="0x7f12108c" />
-    <public type="string" name="setup_vanity_url" id="0x7f12108d" />
-    <public type="string" name="several_users_typing" id="0x7f12108e" />
-    <public type="string" name="share" id="0x7f12108f" />
-    <public type="string" name="share_invite_link_for_access" id="0x7f121090" />
-    <public type="string" name="share_invite_link_for_access_experiment" id="0x7f121091" />
-    <public type="string" name="share_invite_mobile" id="0x7f121092" />
-    <public type="string" name="share_link" id="0x7f121093" />
-    <public type="string" name="share_to" id="0x7f121094" />
-    <public type="string" name="shortcut_recorder_button" id="0x7f121095" />
-    <public type="string" name="shortcut_recorder_button_edit" id="0x7f121096" />
-    <public type="string" name="shortcut_recorder_button_recording" id="0x7f121097" />
-    <public type="string" name="shortcut_recorder_help" id="0x7f121098" />
-    <public type="string" name="shortcut_recorder_no_bind" id="0x7f121099" />
-    <public type="string" name="show_current_game" id="0x7f12109a" />
-    <public type="string" name="show_current_game_desc" id="0x7f12109b" />
-    <public type="string" name="show_muted" id="0x7f12109c" />
-    <public type="string" name="show_muted_channels" id="0x7f12109d" />
-    <public type="string" name="show_spoiler_always" id="0x7f12109e" />
-    <public type="string" name="show_spoiler_content" id="0x7f12109f" />
-    <public type="string" name="show_spoiler_content_help" id="0x7f1210a0" />
-    <public type="string" name="show_spoiler_on_click" id="0x7f1210a1" />
-    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f1210a2" />
-    <public type="string" name="skip" id="0x7f1210a3" />
-    <public type="string" name="skip_all_tips" id="0x7f1210a4" />
-    <public type="string" name="sky_blue" id="0x7f1210a5" />
-    <public type="string" name="sort" id="0x7f1210a6" />
-    <public type="string" name="sorting" id="0x7f1210a7" />
-    <public type="string" name="sorting_channels" id="0x7f1210a8" />
-    <public type="string" name="sound_deafen" id="0x7f1210a9" />
-    <public type="string" name="sound_incoming_ring" id="0x7f1210aa" />
-    <public type="string" name="sound_message" id="0x7f1210ab" />
-    <public type="string" name="sound_mute" id="0x7f1210ac" />
-    <public type="string" name="sound_outgoing_ring" id="0x7f1210ad" />
-    <public type="string" name="sound_ptt_activate" id="0x7f1210ae" />
-    <public type="string" name="sound_ptt_deactivate" id="0x7f1210af" />
-    <public type="string" name="sound_stream_started" id="0x7f1210b0" />
-    <public type="string" name="sound_stream_stopped" id="0x7f1210b1" />
-    <public type="string" name="sound_undeafen" id="0x7f1210b2" />
-    <public type="string" name="sound_unmute" id="0x7f1210b3" />
-    <public type="string" name="sound_user_join" id="0x7f1210b4" />
-    <public type="string" name="sound_user_leave" id="0x7f1210b5" />
-    <public type="string" name="sound_user_moved" id="0x7f1210b6" />
-    <public type="string" name="sound_viewer_join" id="0x7f1210b7" />
-    <public type="string" name="sound_viewer_leave" id="0x7f1210b8" />
-    <public type="string" name="sound_voice_disconnected" id="0x7f1210b9" />
-    <public type="string" name="sounds" id="0x7f1210ba" />
-    <public type="string" name="source_message_deleted" id="0x7f1210bb" />
-    <public type="string" name="speak" id="0x7f1210bc" />
-    <public type="string" name="spectators" id="0x7f1210bd" />
-    <public type="string" name="spectators_header" id="0x7f1210be" />
-    <public type="string" name="spellcheck" id="0x7f1210bf" />
-    <public type="string" name="spoiler" id="0x7f1210c0" />
-    <public type="string" name="spoiler_hide" id="0x7f1210c1" />
-    <public type="string" name="spoiler_mark_selected" id="0x7f1210c2" />
-    <public type="string" name="spoiler_reveal" id="0x7f1210c3" />
-    <public type="string" name="spotify_app_download" id="0x7f1210c4" />
-    <public type="string" name="spotify_app_not_found" id="0x7f1210c5" />
-    <public type="string" name="spotify_app_not_opened" id="0x7f1210c6" />
-    <public type="string" name="spotify_connection_info_android" id="0x7f1210c7" />
-    <public type="string" name="spotify_listen_along_host" id="0x7f1210c8" />
-    <public type="string" name="spotify_listen_along_info" id="0x7f1210c9" />
-    <public type="string" name="spotify_listen_along_listener" id="0x7f1210ca" />
-    <public type="string" name="spotify_listen_along_listeners" id="0x7f1210cb" />
-    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f1210cc" />
-    <public type="string" name="spotify_listen_along_modal_title" id="0x7f1210cd" />
-    <public type="string" name="spotify_listen_along_song_by_artist" id="0x7f1210ce" />
-    <public type="string" name="spotify_listen_along_stop" id="0x7f1210cf" />
-    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f1210d0" />
-    <public type="string" name="spotify_listen_along_title_host" id="0x7f1210d1" />
-    <public type="string" name="spotify_listen_along_title_listener" id="0x7f1210d2" />
-    <public type="string" name="spotify_premium_upgrade_body" id="0x7f1210d3" />
-    <public type="string" name="spotify_premium_upgrade_button" id="0x7f1210d4" />
-    <public type="string" name="spotify_premium_upgrade_header" id="0x7f1210d5" />
-    <public type="string" name="staff_badge_tooltip" id="0x7f1210d6" />
-    <public type="string" name="start" id="0x7f1210d7" />
-    <public type="string" name="start_audio_call" id="0x7f1210d8" />
-    <public type="string" name="start_call" id="0x7f1210d9" />
-    <public type="string" name="start_dm_label" id="0x7f1210da" />
-    <public type="string" name="start_dm_placeholder" id="0x7f1210db" />
-    <public type="string" name="start_video_call" id="0x7f1210dc" />
-    <public type="string" name="start_voice_call" id="0x7f1210dd" />
-    <public type="string" name="status_bar_notification_info_overflow" id="0x7f1210de" />
-    <public type="string" name="status_dnd" id="0x7f1210df" />
-    <public type="string" name="status_dnd_help" id="0x7f1210e0" />
-    <public type="string" name="status_idle" id="0x7f1210e1" />
-    <public type="string" name="status_invisible" id="0x7f1210e2" />
-    <public type="string" name="status_invisible_helper" id="0x7f1210e3" />
-    <public type="string" name="status_offline" id="0x7f1210e4" />
-    <public type="string" name="status_online" id="0x7f1210e5" />
-    <public type="string" name="status_online_mobile" id="0x7f1210e6" />
-    <public type="string" name="status_page_url" id="0x7f1210e7" />
-    <public type="string" name="status_streaming" id="0x7f1210e8" />
-    <public type="string" name="status_unknown" id="0x7f1210e9" />
-    <public type="string" name="step_number" id="0x7f1210ea" />
-    <public type="string" name="still_indexing" id="0x7f1210eb" />
-    <public type="string" name="stop_ringing" id="0x7f1210ec" />
-    <public type="string" name="stop_streaming" id="0x7f1210ed" />
-    <public type="string" name="stop_watching" id="0x7f1210ee" />
-    <public type="string" name="storage_permission_denied_msg" id="0x7f1210ef" />
-    <public type="string" name="store_channel" id="0x7f1210f0" />
-    <public type="string" name="store_payment_legalese_monthly" id="0x7f1210f1" />
-    <public type="string" name="store_payment_legalese_yearly" id="0x7f1210f2" />
-    <public type="string" name="stream" id="0x7f1210f3" />
-    <public type="string" name="stream_bad_spectator" id="0x7f1210f4" />
-    <public type="string" name="stream_bad_streamer" id="0x7f1210f5" />
-    <public type="string" name="stream_capture_paused" id="0x7f1210f6" />
-    <public type="string" name="stream_capture_paused_details" id="0x7f1210f7" />
-    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f1210f8" />
-    <public type="string" name="stream_channel_description" id="0x7f1210f9" />
-    <public type="string" name="stream_description" id="0x7f1210fa" />
-    <public type="string" name="stream_ended" id="0x7f1210fb" />
-    <public type="string" name="stream_ended_button" id="0x7f1210fc" />
-    <public type="string" name="stream_ended_no_spectators" id="0x7f1210fd" />
-    <public type="string" name="stream_failed_description" id="0x7f1210fe" />
-    <public type="string" name="stream_failed_title" id="0x7f1210ff" />
-    <public type="string" name="stream_full_modal_body" id="0x7f121100" />
-    <public type="string" name="stream_full_modal_header" id="0x7f121101" />
-    <public type="string" name="stream_issue_modal_header" id="0x7f121102" />
-    <public type="string" name="stream_network_quality_error" id="0x7f121103" />
-    <public type="string" name="stream_no_preview" id="0x7f121104" />
-    <public type="string" name="stream_playing" id="0x7f121105" />
-    <public type="string" name="stream_preview_loading" id="0x7f121106" />
-    <public type="string" name="stream_preview_paused" id="0x7f121107" />
-    <public type="string" name="stream_preview_paused_subtext" id="0x7f121108" />
-    <public type="string" name="stream_quality_unlock" id="0x7f121109" />
-    <public type="string" name="stream_reconnecting_error" id="0x7f12110a" />
-    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f12110b" />
-    <public type="string" name="stream_report_a_problem" id="0x7f12110c" />
-    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f12110d" />
-    <public type="string" name="stream_report_audio_missing" id="0x7f12110e" />
-    <public type="string" name="stream_report_audio_poor" id="0x7f12110f" />
-    <public type="string" name="stream_report_black" id="0x7f121110" />
-    <public type="string" name="stream_report_blurry" id="0x7f121111" />
-    <public type="string" name="stream_report_ended_audio_missing" id="0x7f121112" />
-    <public type="string" name="stream_report_ended_audio_poor" id="0x7f121113" />
-    <public type="string" name="stream_report_ended_black" id="0x7f121114" />
-    <public type="string" name="stream_report_ended_blurry" id="0x7f121115" />
-    <public type="string" name="stream_report_ended_lagging" id="0x7f121116" />
-    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f121117" />
-    <public type="string" name="stream_report_game_issue" id="0x7f121118" />
-    <public type="string" name="stream_report_label" id="0x7f121119" />
-    <public type="string" name="stream_report_lagging" id="0x7f12111a" />
-    <public type="string" name="stream_report_no_issue" id="0x7f12111b" />
-    <public type="string" name="stream_report_out_of_sync" id="0x7f12111c" />
-    <public type="string" name="stream_report_placeholder" id="0x7f12111d" />
-    <public type="string" name="stream_report_problem" id="0x7f12111e" />
-    <public type="string" name="stream_report_problem_body" id="0x7f12111f" />
-    <public type="string" name="stream_report_problem_header_mobile" id="0x7f121120" />
-    <public type="string" name="stream_report_problem_mobile" id="0x7f121121" />
-    <public type="string" name="stream_report_rating_body" id="0x7f121122" />
-    <public type="string" name="stream_report_rating_body_streamer" id="0x7f121123" />
-    <public type="string" name="stream_report_submit" id="0x7f121124" />
-    <public type="string" name="stream_reported" id="0x7f121125" />
-    <public type="string" name="stream_reported_body" id="0x7f121126" />
-    <public type="string" name="stream_soundshare_failed" id="0x7f121127" />
-    <public type="string" name="streamer_mode" id="0x7f121128" />
-    <public type="string" name="streamer_mode_enabled" id="0x7f121129" />
-    <public type="string" name="streamer_playing" id="0x7f12112a" />
-    <public type="string" name="streamer_settings_title" id="0x7f12112b" />
-    <public type="string" name="streaming" id="0x7f12112c" />
-    <public type="string" name="streaming_a_game" id="0x7f12112d" />
-    <public type="string" name="stripe_unable_to_load" id="0x7f12112e" />
-    <public type="string" name="sub_enabled_servers" id="0x7f12112f" />
-    <public type="string" name="subscriber_information" id="0x7f121130" />
-    <public type="string" name="suggestions" id="0x7f121131" />
-    <public type="string" name="support" id="0x7f121132" />
-    <public type="string" name="suppress_all_embeds" id="0x7f121133" />
-    <public type="string" name="suppressed" id="0x7f121134" />
-    <public type="string" name="suppressed_afk_body" id="0x7f121135" />
-    <public type="string" name="suppressed_afk_title" id="0x7f121136" />
-    <public type="string" name="suppressed_permission_body" id="0x7f121137" />
-    <public type="string" name="sv_se" id="0x7f121138" />
-    <public type="string" name="switch_audio_output" id="0x7f121139" />
-    <public type="string" name="switch_hardware_acceleration" id="0x7f12113a" />
-    <public type="string" name="switch_hardware_acceleration_body" id="0x7f12113b" />
-    <public type="string" name="switch_subsystem" id="0x7f12113c" />
-    <public type="string" name="switch_subsystem_body" id="0x7f12113d" />
-    <public type="string" name="switch_to_compact_mode" id="0x7f12113e" />
-    <public type="string" name="switch_to_cozy_mode" id="0x7f12113f" />
-    <public type="string" name="switch_to_dark_theme" id="0x7f121140" />
-    <public type="string" name="switch_to_light_theme" id="0x7f121141" />
-    <public type="string" name="switch_to_push_to_talk" id="0x7f121142" />
-    <public type="string" name="switch_to_voice_activity" id="0x7f121143" />
-    <public type="string" name="sync" id="0x7f121144" />
-    <public type="string" name="sync_across_clients_appearance_help" id="0x7f121145" />
-    <public type="string" name="sync_across_clients_text" id="0x7f121146" />
-    <public type="string" name="sync_across_clients_text_help" id="0x7f121147" />
-    <public type="string" name="sync_friends" id="0x7f121148" />
-    <public type="string" name="sync_now" id="0x7f121149" />
-    <public type="string" name="sync_permissions" id="0x7f12114a" />
-    <public type="string" name="sync_permissions_explanation" id="0x7f12114b" />
-    <public type="string" name="sync_revoked" id="0x7f12114c" />
-    <public type="string" name="sync_this_account" id="0x7f12114d" />
-    <public type="string" name="sync_with" id="0x7f12114e" />
-    <public type="string" name="system_keyboard" id="0x7f12114f" />
-    <public type="string" name="system_message_call_missed" id="0x7f121150" />
-    <public type="string" name="system_message_call_started" id="0x7f121151" />
-    <public type="string" name="system_message_channel_follow_add" id="0x7f121152" />
-    <public type="string" name="system_message_channel_follow_add_ios" id="0x7f121153" />
-    <public type="string" name="system_message_channel_icon_change" id="0x7f121154" />
-    <public type="string" name="system_message_channel_name_change" id="0x7f121155" />
-    <public type="string" name="system_message_guild_bot_join" id="0x7f121156" />
-    <public type="string" name="system_message_guild_member_join" id="0x7f121157" />
-    <public type="string" name="system_message_guild_member_join_01" id="0x7f121158" />
-    <public type="string" name="system_message_guild_member_join_02" id="0x7f121159" />
-    <public type="string" name="system_message_guild_member_join_03" id="0x7f12115a" />
-    <public type="string" name="system_message_guild_member_join_04" id="0x7f12115b" />
-    <public type="string" name="system_message_guild_member_join_05" id="0x7f12115c" />
-    <public type="string" name="system_message_guild_member_join_06" id="0x7f12115d" />
-    <public type="string" name="system_message_guild_member_join_07" id="0x7f12115e" />
-    <public type="string" name="system_message_guild_member_join_08" id="0x7f12115f" />
-    <public type="string" name="system_message_guild_member_join_09" id="0x7f121160" />
-    <public type="string" name="system_message_guild_member_join_10" id="0x7f121161" />
-    <public type="string" name="system_message_guild_member_join_11" id="0x7f121162" />
-    <public type="string" name="system_message_guild_member_join_12" id="0x7f121163" />
-    <public type="string" name="system_message_guild_member_join_13" id="0x7f121164" />
-    <public type="string" name="system_message_guild_member_join_14" id="0x7f121165" />
-    <public type="string" name="system_message_guild_member_join_15" id="0x7f121166" />
-    <public type="string" name="system_message_guild_member_join_16" id="0x7f121167" />
-    <public type="string" name="system_message_guild_member_join_17" id="0x7f121168" />
-    <public type="string" name="system_message_guild_member_join_18" id="0x7f121169" />
-    <public type="string" name="system_message_guild_member_join_19" id="0x7f12116a" />
-    <public type="string" name="system_message_guild_member_join_20" id="0x7f12116b" />
-    <public type="string" name="system_message_guild_member_join_21" id="0x7f12116c" />
-    <public type="string" name="system_message_guild_member_join_22" id="0x7f12116d" />
-    <public type="string" name="system_message_guild_member_join_23" id="0x7f12116e" />
-    <public type="string" name="system_message_guild_member_join_24" id="0x7f12116f" />
-    <public type="string" name="system_message_guild_member_join_25" id="0x7f121170" />
-    <public type="string" name="system_message_guild_member_join_26" id="0x7f121171" />
-    <public type="string" name="system_message_guild_member_join_27" id="0x7f121172" />
-    <public type="string" name="system_message_guild_member_join_28" id="0x7f121173" />
-    <public type="string" name="system_message_guild_member_join_29" id="0x7f121174" />
-    <public type="string" name="system_message_guild_member_join_30" id="0x7f121175" />
-    <public type="string" name="system_message_guild_member_join_31" id="0x7f121176" />
-    <public type="string" name="system_message_guild_member_join_32" id="0x7f121177" />
-    <public type="string" name="system_message_guild_member_join_33" id="0x7f121178" />
-    <public type="string" name="system_message_guild_member_join_34" id="0x7f121179" />
-    <public type="string" name="system_message_guild_member_join_35" id="0x7f12117a" />
-    <public type="string" name="system_message_guild_member_join_36" id="0x7f12117b" />
-    <public type="string" name="system_message_guild_member_join_37" id="0x7f12117c" />
-    <public type="string" name="system_message_guild_member_join_38" id="0x7f12117d" />
-    <public type="string" name="system_message_guild_member_subscribed" id="0x7f12117e" />
-    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f12117f" />
-    <public type="string" name="system_message_join_call" id="0x7f121180" />
-    <public type="string" name="system_message_pinned_message" id="0x7f121181" />
-    <public type="string" name="system_message_pinned_message_mobile" id="0x7f121182" />
-    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f121183" />
-    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f121184" />
-    <public type="string" name="system_message_recipient_add" id="0x7f121185" />
-    <public type="string" name="system_message_recipient_remove" id="0x7f121186" />
-    <public type="string" name="system_message_recipient_remove_self" id="0x7f121187" />
-    <public type="string" name="system_permission_grant" id="0x7f121188" />
-    <public type="string" name="system_permission_request_camera" id="0x7f121189" />
-    <public type="string" name="system_permission_request_files" id="0x7f12118a" />
-    <public type="string" name="tab_bar" id="0x7f12118b" />
-    <public type="string" name="take_photo_or_video" id="0x7f12118c" />
-    <public type="string" name="tan" id="0x7f12118d" />
-    <public type="string" name="tap_add_nickname" id="0x7f12118e" />
-    <public type="string" name="tar_gz" id="0x7f12118f" />
-    <public type="string" name="teal" id="0x7f121190" />
-    <public type="string" name="temporary_membership_explanation" id="0x7f121191" />
-    <public type="string" name="terms_of_service" id="0x7f121192" />
-    <public type="string" name="terms_of_service_url" id="0x7f121193" />
-    <public type="string" name="terms_privacy" id="0x7f121194" />
-    <public type="string" name="terms_privacy_opt_in" id="0x7f121195" />
-    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f121196" />
-    <public type="string" name="terracotta" id="0x7f121197" />
-    <public type="string" name="test_video" id="0x7f121198" />
-    <public type="string" name="text" id="0x7f121199" />
-    <public type="string" name="text_and_images" id="0x7f12119a" />
-    <public type="string" name="text_channel" id="0x7f12119b" />
-    <public type="string" name="text_channels" id="0x7f12119c" />
-    <public type="string" name="text_channels_matching" id="0x7f12119d" />
-    <public type="string" name="text_permissions" id="0x7f12119e" />
-    <public type="string" name="textarea_placeholder" id="0x7f12119f" />
-    <public type="string" name="th" id="0x7f1211a0" />
-    <public type="string" name="theme" id="0x7f1211a1" />
-    <public type="string" name="theme_dark" id="0x7f1211a2" />
-    <public type="string" name="theme_light" id="0x7f1211a3" />
-    <public type="string" name="theme_pure_evil_title" id="0x7f1211a4" />
-    <public type="string" name="theme_pure_evil_updated" id="0x7f1211a5" />
-    <public type="string" name="theme_updated" id="0x7f1211a6" />
-    <public type="string" name="this_server" id="0x7f1211a7" />
-    <public type="string" name="this_server_named" id="0x7f1211a8" />
-    <public type="string" name="three_users_typing" id="0x7f1211a9" />
-    <public type="string" name="timeout_error" id="0x7f1211aa" />
-    <public type="string" name="tip_create_first_server_body3" id="0x7f1211ab" />
-    <public type="string" name="tip_create_first_server_title3" id="0x7f1211ac" />
-    <public type="string" name="tip_create_more_servers_body3" id="0x7f1211ad" />
-    <public type="string" name="tip_create_more_servers_title3" id="0x7f1211ae" />
-    <public type="string" name="tip_direct_messages_body3" id="0x7f1211af" />
-    <public type="string" name="tip_direct_messages_title3" id="0x7f1211b0" />
-    <public type="string" name="tip_friends_list_body3" id="0x7f1211b1" />
-    <public type="string" name="tip_friends_list_title3" id="0x7f1211b2" />
-    <public type="string" name="tip_instant_invite_body3" id="0x7f1211b3" />
-    <public type="string" name="tip_instant_invite_title3" id="0x7f1211b4" />
-    <public type="string" name="tip_organize_by_topic_body3" id="0x7f1211b5" />
-    <public type="string" name="tip_organize_by_topic_title3" id="0x7f1211b6" />
-    <public type="string" name="tip_server_settings_body3" id="0x7f1211b7" />
-    <public type="string" name="tip_server_settings_title3" id="0x7f1211b8" />
-    <public type="string" name="tip_voice_conversations_body3" id="0x7f1211b9" />
-    <public type="string" name="tip_voice_conversations_title3" id="0x7f1211ba" />
-    <public type="string" name="tip_whos_online_body3" id="0x7f1211bb" />
-    <public type="string" name="tip_whos_online_title3" id="0x7f1211bc" />
-    <public type="string" name="tip_writing_messages_body3" id="0x7f1211bd" />
-    <public type="string" name="tip_writing_messages_title3" id="0x7f1211be" />
-    <public type="string" name="title" id="0x7f1211bf" />
-    <public type="string" name="toast_add_friend" id="0x7f1211c0" />
-    <public type="string" name="toast_image_saved" id="0x7f1211c1" />
-    <public type="string" name="toast_message_copied" id="0x7f1211c2" />
-    <public type="string" name="toast_message_id_copied" id="0x7f1211c3" />
-    <public type="string" name="toast_username_saved" id="0x7f1211c4" />
-    <public type="string" name="toggle_camera" id="0x7f1211c5" />
-    <public type="string" name="toggle_deafen" id="0x7f1211c6" />
-    <public type="string" name="toggle_drawer" id="0x7f1211c7" />
-    <public type="string" name="toggle_emoji_keyboard" id="0x7f1211c8" />
-    <public type="string" name="toggle_microphone" id="0x7f1211c9" />
-    <public type="string" name="toggle_mute" id="0x7f1211ca" />
-    <public type="string" name="too_many_animated_emoji" id="0x7f1211cb" />
-    <public type="string" name="too_many_emoji" id="0x7f1211cc" />
-    <public type="string" name="too_many_reactions_alert_body" id="0x7f1211cd" />
-    <public type="string" name="too_many_reactions_alert_header" id="0x7f1211ce" />
-    <public type="string" name="total_members" id="0x7f1211cf" />
-    <public type="string" name="total_results" id="0x7f1211d0" />
-    <public type="string" name="tr" id="0x7f1211d1" />
-    <public type="string" name="transfer" id="0x7f1211d2" />
-    <public type="string" name="transfer_ownership" id="0x7f1211d3" />
-    <public type="string" name="transfer_ownership_acknowledge" id="0x7f1211d4" />
-    <public type="string" name="transfer_ownership_to_user" id="0x7f1211d5" />
-    <public type="string" name="trending_arrow_down" id="0x7f1211d6" />
-    <public type="string" name="trending_arrow_up" id="0x7f1211d7" />
-    <public type="string" name="try_again" id="0x7f1211d8" />
-    <public type="string" name="tts_alls" id="0x7f1211d9" />
-    <public type="string" name="tts_current" id="0x7f1211da" />
-    <public type="string" name="tts_never" id="0x7f1211db" />
-    <public type="string" name="tutorial_close" id="0x7f1211dc" />
-    <public type="string" name="tweet_us" id="0x7f1211dd" />
-    <public type="string" name="twitter" id="0x7f1211de" />
-    <public type="string" name="twitter_page_url" id="0x7f1211df" />
-    <public type="string" name="two_fa" id="0x7f1211e0" />
-    <public type="string" name="two_fa_activate" id="0x7f1211e1" />
-    <public type="string" name="two_fa_app_name_authy" id="0x7f1211e2" />
-    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f1211e3" />
-    <public type="string" name="two_fa_auth_code" id="0x7f1211e4" />
-    <public type="string" name="two_fa_backup_code_enter" id="0x7f1211e5" />
-    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f1211e6" />
-    <public type="string" name="two_fa_backup_code_hint" id="0x7f1211e7" />
-    <public type="string" name="two_fa_backup_code_used" id="0x7f1211e8" />
-    <public type="string" name="two_fa_backup_codes_body" id="0x7f1211e9" />
-    <public type="string" name="two_fa_backup_codes_label" id="0x7f1211ea" />
-    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f1211eb" />
-    <public type="string" name="two_fa_change_account" id="0x7f1211ec" />
-    <public type="string" name="two_fa_code" id="0x7f1211ed" />
-    <public type="string" name="two_fa_disable" id="0x7f1211ee" />
-    <public type="string" name="two_fa_discord_backup_codes" id="0x7f1211ef" />
-    <public type="string" name="two_fa_download_app_body" id="0x7f1211f0" />
-    <public type="string" name="two_fa_download_app_label" id="0x7f1211f1" />
-    <public type="string" name="two_fa_download_codes" id="0x7f1211f2" />
-    <public type="string" name="two_fa_enable" id="0x7f1211f3" />
-    <public type="string" name="two_fa_enable_subheader" id="0x7f1211f4" />
-    <public type="string" name="two_fa_enabled" id="0x7f1211f5" />
-    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f1211f6" />
-    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f1211f7" />
-    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f1211f8" />
-    <public type="string" name="two_fa_enter_token_body" id="0x7f1211f9" />
-    <public type="string" name="two_fa_enter_token_label" id="0x7f1211fa" />
-    <public type="string" name="two_fa_generate_codes" id="0x7f1211fb" />
-    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f1211fc" />
-    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f1211fd" />
-    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f1211fe" />
-    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7f1211ff" />
-    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7f121200" />
-    <public type="string" name="two_fa_ios_delete" id="0x7f121201" />
-    <public type="string" name="two_fa_key" id="0x7f121202" />
-    <public type="string" name="two_fa_login_body" id="0x7f121203" />
-    <public type="string" name="two_fa_login_footer" id="0x7f121204" />
-    <public type="string" name="two_fa_login_label" id="0x7f121205" />
-    <public type="string" name="two_fa_modal_setup_header_mobile" id="0x7f121206" />
-    <public type="string" name="two_fa_not_verified" id="0x7f121207" />
-    <public type="string" name="two_fa_qr_body" id="0x7f121208" />
-    <public type="string" name="two_fa_qr_label" id="0x7f121209" />
-    <public type="string" name="two_fa_remove" id="0x7f12120a" />
-    <public type="string" name="two_fa_sales_pitch" id="0x7f12120b" />
-    <public type="string" name="two_fa_success_body" id="0x7f12120c" />
-    <public type="string" name="two_fa_success_body_mobile" id="0x7f12120d" />
-    <public type="string" name="two_fa_success_header" id="0x7f12120e" />
-    <public type="string" name="two_fa_token_required" id="0x7f12120f" />
-    <public type="string" name="two_fa_use_desktop_app" id="0x7f121210" />
-    <public type="string" name="two_fa_view_backup_codes" id="0x7f121211" />
-    <public type="string" name="two_fa_view_codes" id="0x7f121212" />
-    <public type="string" name="two_users_typing" id="0x7f121213" />
-    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f121214" />
-    <public type="string" name="ucrop_label_edit_photo" id="0x7f121215" />
-    <public type="string" name="ucrop_label_original" id="0x7f121216" />
-    <public type="string" name="ucrop_menu_crop" id="0x7f121217" />
-    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f121218" />
-    <public type="string" name="uk" id="0x7f121219" />
-    <public type="string" name="unable_to_join_channel_full" id="0x7f12121a" />
-    <public type="string" name="unable_to_join_voice_unsupported_mobile" id="0x7f12121b" />
-    <public type="string" name="unable_to_open_media_chooser" id="0x7f12121c" />
-    <public type="string" name="unban" id="0x7f12121d" />
-    <public type="string" name="unban_user_body" id="0x7f12121e" />
-    <public type="string" name="unban_user_title" id="0x7f12121f" />
-    <public type="string" name="unblock" id="0x7f121220" />
-    <public type="string" name="unblock_to_jump_body" id="0x7f121221" />
-    <public type="string" name="unblock_to_jump_title" id="0x7f121222" />
-    <public type="string" name="uncategorized" id="0x7f121223" />
-    <public type="string" name="unclaimed_account_body" id="0x7f121224" />
-    <public type="string" name="unclaimed_account_title" id="0x7f121225" />
-    <public type="string" name="undeafen" id="0x7f121226" />
-    <public type="string" name="unfocus_participant" id="0x7f121227" />
-    <public type="string" name="unhandled_link_body" id="0x7f121228" />
-    <public type="string" name="unhandled_link_title" id="0x7f121229" />
-    <public type="string" name="unified_open_install" id="0x7f12122a" />
-    <public type="string" name="unknown_game" id="0x7f12122b" />
-    <public type="string" name="unknown_region" id="0x7f12122c" />
-    <public type="string" name="unknown_server" id="0x7f12122d" />
-    <public type="string" name="unknown_user" id="0x7f12122e" />
-    <public type="string" name="unmute" id="0x7f12122f" />
-    <public type="string" name="unmute_category" id="0x7f121230" />
-    <public type="string" name="unnamed" id="0x7f121231" />
-    <public type="string" name="unpin" id="0x7f121232" />
-    <public type="string" name="unpin_confirm" id="0x7f121233" />
-    <public type="string" name="unpin_message" id="0x7f121234" />
-    <public type="string" name="unpin_message_body" id="0x7f121235" />
-    <public type="string" name="unpin_message_context_menu_hint" id="0x7f121236" />
-    <public type="string" name="unpin_message_failed_body" id="0x7f121237" />
-    <public type="string" name="unpin_message_failed_title" id="0x7f121238" />
-    <public type="string" name="unpin_message_title" id="0x7f121239" />
-    <public type="string" name="unread_channels" id="0x7f12123a" />
-    <public type="string" name="unreads_count" id="0x7f12123b" />
-    <public type="string" name="unsupported_browser" id="0x7f12123c" />
-    <public type="string" name="unsupported_browser_body" id="0x7f12123d" />
-    <public type="string" name="unsupported_browser_details" id="0x7f12123e" />
-    <public type="string" name="unsupported_browser_title" id="0x7f12123f" />
-    <public type="string" name="unverified_account_body" id="0x7f121240" />
-    <public type="string" name="unverified_account_title" id="0x7f121241" />
-    <public type="string" name="update_available" id="0x7f121242" />
-    <public type="string" name="update_downloaded" id="0x7f121243" />
-    <public type="string" name="update_manually" id="0x7f121244" />
-    <public type="string" name="upgrade_plan" id="0x7f121245" />
-    <public type="string" name="upgrade_yearly" id="0x7f121246" />
-    <public type="string" name="upload" id="0x7f121247" />
-    <public type="string" name="upload_a_media_file" id="0x7f121248" />
-    <public type="string" name="upload_area_cancel_all" id="0x7f121249" />
-    <public type="string" name="upload_area_help" id="0x7f12124a" />
-    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f12124b" />
-    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f12124c" />
-    <public type="string" name="upload_area_leave_a_comment" id="0x7f12124d" />
-    <public type="string" name="upload_area_optional" id="0x7f12124e" />
-    <public type="string" name="upload_area_title" id="0x7f12124f" />
-    <public type="string" name="upload_area_title_no_confirmation" id="0x7f121250" />
-    <public type="string" name="upload_area_too_large_help" id="0x7f121251" />
-    <public type="string" name="upload_area_too_large_title" id="0x7f121252" />
-    <public type="string" name="upload_area_upload_failed_help" id="0x7f121253" />
-    <public type="string" name="upload_area_upload_failed_title" id="0x7f121254" />
-    <public type="string" name="upload_background" id="0x7f121255" />
-    <public type="string" name="upload_debug_log_failure" id="0x7f121256" />
-    <public type="string" name="upload_debug_log_failure_header" id="0x7f121257" />
-    <public type="string" name="upload_debug_log_progress" id="0x7f121258" />
-    <public type="string" name="upload_debug_log_progress_header" id="0x7f121259" />
-    <public type="string" name="upload_debug_log_success" id="0x7f12125a" />
-    <public type="string" name="upload_debug_log_success_header" id="0x7f12125b" />
-    <public type="string" name="upload_emoji" id="0x7f12125c" />
-    <public type="string" name="upload_image" id="0x7f12125d" />
-    <public type="string" name="upload_image_body" id="0x7f12125e" />
-    <public type="string" name="upload_load_file_failed" id="0x7f12125f" />
-    <public type="string" name="upload_open_file_failed" id="0x7f121260" />
-    <public type="string" name="upload_process_file_failed" id="0x7f121261" />
-    <public type="string" name="upload_queued" id="0x7f121262" />
-    <public type="string" name="upload_uploads_too_large_help" id="0x7f121263" />
-    <public type="string" name="upload_uploads_too_large_title" id="0x7f121264" />
-    <public type="string" name="uploaded_by" id="0x7f121265" />
-    <public type="string" name="uploading_files" id="0x7f121266" />
-    <public type="string" name="usage_access" id="0x7f121267" />
-    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f121268" />
-    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f121269" />
-    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f12126a" />
-    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f12126b" />
-    <public type="string" name="use_external_emojis" id="0x7f12126c" />
-    <public type="string" name="use_external_emojis_description" id="0x7f12126d" />
-    <public type="string" name="use_speaker" id="0x7f12126e" />
-    <public type="string" name="use_vad" id="0x7f12126f" />
-    <public type="string" name="use_vad_description" id="0x7f121270" />
-    <public type="string" name="user_activity_accept_invite" id="0x7f121271" />
-    <public type="string" name="user_activity_action_ask_to_join" id="0x7f121272" />
-    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f121273" />
-    <public type="string" name="user_activity_action_download_app" id="0x7f121274" />
-    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f121275" />
-    <public type="string" name="user_activity_action_notify_me" id="0x7f121276" />
-    <public type="string" name="user_activity_action_spectate" id="0x7f121277" />
-    <public type="string" name="user_activity_action_spectate_user" id="0x7f121278" />
-    <public type="string" name="user_activity_already_playing" id="0x7f121279" />
-    <public type="string" name="user_activity_already_syncing" id="0x7f12127a" />
-    <public type="string" name="user_activity_cannot_join_self" id="0x7f12127b" />
-    <public type="string" name="user_activity_cannot_play_self" id="0x7f12127c" />
-    <public type="string" name="user_activity_cannot_spectate_self" id="0x7f12127d" />
-    <public type="string" name="user_activity_cannot_sync_self" id="0x7f12127e" />
-    <public type="string" name="user_activity_chat_invite_education" id="0x7f12127f" />
-    <public type="string" name="user_activity_connect_platform" id="0x7f121280" />
-    <public type="string" name="user_activity_error_desktop_action" id="0x7f121281" />
-    <public type="string" name="user_activity_error_desktop_body" id="0x7f121282" />
-    <public type="string" name="user_activity_error_desktop_title" id="0x7f121283" />
-    <public type="string" name="user_activity_error_friends_action" id="0x7f121284" />
-    <public type="string" name="user_activity_error_friends_body" id="0x7f121285" />
-    <public type="string" name="user_activity_error_friends_title" id="0x7f121286" />
-    <public type="string" name="user_activity_header_listening" id="0x7f121287" />
-    <public type="string" name="user_activity_header_live_on_platform" id="0x7f121288" />
-    <public type="string" name="user_activity_header_playing" id="0x7f121289" />
-    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f12128a" />
-    <public type="string" name="user_activity_header_streaming_to_server" id="0x7f12128b" />
-    <public type="string" name="user_activity_header_watching" id="0x7f12128c" />
-    <public type="string" name="user_activity_invite_request_expired" id="0x7f12128d" />
-    <public type="string" name="user_activity_invite_request_received" id="0x7f12128e" />
-    <public type="string" name="user_activity_invite_request_requested" id="0x7f12128f" />
-    <public type="string" name="user_activity_invite_request_sent" id="0x7f121290" />
-    <public type="string" name="user_activity_invite_request_waiting" id="0x7f121291" />
-    <public type="string" name="user_activity_invite_to_join" id="0x7f121292" />
-    <public type="string" name="user_activity_listen_along" id="0x7f121293" />
-    <public type="string" name="user_activity_listen_along_description" id="0x7f121294" />
-    <public type="string" name="user_activity_listening_album" id="0x7f121295" />
-    <public type="string" name="user_activity_listening_artists" id="0x7f121296" />
-    <public type="string" name="user_activity_never_mind" id="0x7f121297" />
-    <public type="string" name="user_activity_not_detected" id="0x7f121298" />
-    <public type="string" name="user_activity_play_on_platform" id="0x7f121299" />
-    <public type="string" name="user_activity_respond_nope" id="0x7f12129a" />
-    <public type="string" name="user_activity_respond_yeah" id="0x7f12129b" />
-    <public type="string" name="user_activity_state_size" id="0x7f12129c" />
-    <public type="string" name="user_activity_timestamp_end" id="0x7f12129d" />
-    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f12129e" />
-    <public type="string" name="user_activity_timestamp_start" id="0x7f12129f" />
-    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f1212a0" />
-    <public type="string" name="user_activity_user_playing_for_days" id="0x7f1212a1" />
-    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f1212a2" />
-    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f1212a3" />
-    <public type="string" name="user_activity_voice_channel" id="0x7f1212a4" />
-    <public type="string" name="user_activity_watch_along" id="0x7f1212a5" />
-    <public type="string" name="user_dm_settings" id="0x7f1212a6" />
-    <public type="string" name="user_dm_settings_help" id="0x7f1212a7" />
-    <public type="string" name="user_dm_settings_question" id="0x7f1212a8" />
-    <public type="string" name="user_explicit_content_filter" id="0x7f1212a9" />
-    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f1212aa" />
-    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f1212ab" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f1212ac" />
-    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f1212ad" />
-    <public type="string" name="user_explicit_content_filter_help" id="0x7f1212ae" />
-    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f1212af" />
-    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f1212b0" />
-    <public type="string" name="user_has_been_blocked" id="0x7f1212b1" />
-    <public type="string" name="user_has_been_unblocked" id="0x7f1212b2" />
-    <public type="string" name="user_info" id="0x7f1212b3" />
-    <public type="string" name="user_management" id="0x7f1212b4" />
-    <public type="string" name="user_popout_message" id="0x7f1212b5" />
-    <public type="string" name="user_popout_settings" id="0x7f1212b6" />
-    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f1212b7" />
-    <public type="string" name="user_profile_add_friend" id="0x7f1212b8" />
-    <public type="string" name="user_profile_audio" id="0x7f1212b9" />
-    <public type="string" name="user_profile_failure_to_open_message" id="0x7f1212ba" />
-    <public type="string" name="user_profile_guild_name_content_description" id="0x7f1212bb" />
-    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7f1212bc" />
-    <public type="string" name="user_profile_message" id="0x7f1212bd" />
-    <public type="string" name="user_profile_pending" id="0x7f1212be" />
-    <public type="string" name="user_profile_video" id="0x7f1212bf" />
-    <public type="string" name="user_profile_volume" id="0x7f1212c0" />
-    <public type="string" name="user_settings" id="0x7f1212c1" />
-    <public type="string" name="user_settings_account_management" id="0x7f1212c2" />
-    <public type="string" name="user_settings_activity_feed" id="0x7f1212c3" />
-    <public type="string" name="user_settings_af_applications_empty_body" id="0x7f1212c4" />
-    <public type="string" name="user_settings_af_applications_empty_title" id="0x7f1212c5" />
-    <public type="string" name="user_settings_af_blocked_users" id="0x7f1212c6" />
-    <public type="string" name="user_settings_af_blocked_users_description" id="0x7f1212c7" />
-    <public type="string" name="user_settings_af_following_applications" id="0x7f1212c8" />
-    <public type="string" name="user_settings_af_following_applications_description" id="0x7f1212c9" />
-    <public type="string" name="user_settings_af_hidden_empty" id="0x7f1212ca" />
-    <public type="string" name="user_settings_af_search_cta" id="0x7f1212cb" />
-    <public type="string" name="user_settings_af_search_placeholder" id="0x7f1212cc" />
-    <public type="string" name="user_settings_af_unblock" id="0x7f1212cd" />
-    <public type="string" name="user_settings_af_unfollow" id="0x7f1212ce" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7f1212cf" />
-    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7f1212d0" />
-    <public type="string" name="user_settings_appearance_colors" id="0x7f1212d1" />
-    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7f1212d2" />
-    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7f1212d3" />
-    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7f1212d4" />
-    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7f1212d5" />
-    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7f1212d6" />
-    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7f1212d7" />
-    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7f1212d8" />
-    <public type="string" name="user_settings_apperannce_disable_games_tab" id="0x7f1212d9" />
-    <public type="string" name="user_settings_apperannce_disable_games_tab_note" id="0x7f1212da" />
-    <public type="string" name="user_settings_available_codes" id="0x7f1212db" />
-    <public type="string" name="user_settings_blocked_users" id="0x7f1212dc" />
-    <public type="string" name="user_settings_blocked_users_empty" id="0x7f1212dd" />
-    <public type="string" name="user_settings_blocked_users_header" id="0x7f1212de" />
-    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7f1212df" />
-    <public type="string" name="user_settings_close_button" id="0x7f1212e0" />
-    <public type="string" name="user_settings_confirm_logout" id="0x7f1212e1" />
-    <public type="string" name="user_settings_edit_account" id="0x7f1212e2" />
-    <public type="string" name="user_settings_edit_account_password_label" id="0x7f1212e3" />
-    <public type="string" name="user_settings_edit_account_tag" id="0x7f1212e4" />
-    <public type="string" name="user_settings_enter_password_view_codes" id="0x7f1212e5" />
-    <public type="string" name="user_settings_game_activity" id="0x7f1212e6" />
-    <public type="string" name="user_settings_game_library" id="0x7f1212e7" />
-    <public type="string" name="user_settings_games_install_location" id="0x7f1212e8" />
-    <public type="string" name="user_settings_games_install_location_add" id="0x7f1212e9" />
-    <public type="string" name="user_settings_games_install_location_make_default" id="0x7f1212ea" />
-    <public type="string" name="user_settings_games_install_location_name" id="0x7f1212eb" />
-    <public type="string" name="user_settings_games_install_location_remove" id="0x7f1212ec" />
-    <public type="string" name="user_settings_games_install_location_space" id="0x7f1212ed" />
-    <public type="string" name="user_settings_games_install_locations" id="0x7f1212ee" />
-    <public type="string" name="user_settings_games_remove_location_body" id="0x7f1212ef" />
-    <public type="string" name="user_settings_games_shortcuts" id="0x7f1212f0" />
-    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7f1212f1" />
-    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7f1212f2" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7f1212f3" />
-    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7f1212f4" />
-    <public type="string" name="user_settings_hypesquad" id="0x7f1212f5" />
-    <public type="string" name="user_settings_keybinds_action" id="0x7f1212f6" />
-    <public type="string" name="user_settings_keybinds_keybind" id="0x7f1212f7" />
-    <public type="string" name="user_settings_linux_settings" id="0x7f1212f8" />
-    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7f1212f9" />
-    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7f1212fa" />
-    <public type="string" name="user_settings_mfa_enabled" id="0x7f1212fb" />
-    <public type="string" name="user_settings_mfa_removed" id="0x7f1212fc" />
-    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7f1212fd" />
-    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7f1212fe" />
-    <public type="string" name="user_settings_my_account" id="0x7f1212ff" />
-    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f121300" />
-    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f121301" />
-    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f121302" />
-    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f121303" />
-    <public type="string" name="user_settings_open_on_startup_body" id="0x7f121304" />
-    <public type="string" name="user_settings_open_on_startup_label" id="0x7f121305" />
-    <public type="string" name="user_settings_privacy_terms" id="0x7f121306" />
-    <public type="string" name="user_settings_restart_app_mobile" id="0x7f121307" />
-    <public type="string" name="user_settings_save" id="0x7f121308" />
-    <public type="string" name="user_settings_start_minimized_body" id="0x7f121309" />
-    <public type="string" name="user_settings_start_minimized_label" id="0x7f12130a" />
-    <public type="string" name="user_settings_startup_behavior" id="0x7f12130b" />
-    <public type="string" name="user_settings_streamer_notice_body" id="0x7f12130c" />
-    <public type="string" name="user_settings_streamer_notice_title" id="0x7f12130d" />
-    <public type="string" name="user_settings_unverified_account_body" id="0x7f12130e" />
-    <public type="string" name="user_settings_used_backup_codes" id="0x7f12130f" />
-    <public type="string" name="user_settings_voice_add_multiple" id="0x7f121310" />
-    <public type="string" name="user_settings_voice_codec_description" id="0x7f121311" />
-    <public type="string" name="user_settings_voice_codec_title" id="0x7f121312" />
-    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f121313" />
-    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f121314" />
-    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f121315" />
-    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f121316" />
-    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f121317" />
-    <public type="string" name="user_settings_voice_mic_test_voice_channel_warning" id="0x7f121318" />
-    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f121319" />
-    <public type="string" name="user_settings_voice_open_h264" id="0x7f12131a" />
-    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f12131b" />
-    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f12131c" />
-    <public type="string" name="user_settings_windows_settings" id="0x7f12131d" />
-    <public type="string" name="user_settings_with_build_override" id="0x7f12131e" />
-    <public type="string" name="user_volume" id="0x7f12131f" />
-    <public type="string" name="username" id="0x7f121320" />
-    <public type="string" name="username_live" id="0x7f121321" />
-    <public type="string" name="username_required" id="0x7f121322" />
-    <public type="string" name="users" id="0x7f121323" />
-    <public type="string" name="vad_permission_body" id="0x7f121324" />
-    <public type="string" name="vad_permission_small" id="0x7f121325" />
-    <public type="string" name="vad_permission_title" id="0x7f121326" />
-    <public type="string" name="vanity_url" id="0x7f121327" />
-    <public type="string" name="vanity_url_help" id="0x7f121328" />
-    <public type="string" name="vanity_url_help_conflict" id="0x7f121329" />
-    <public type="string" name="vanity_url_help_extended" id="0x7f12132a" />
-    <public type="string" name="vanity_url_help_extended_link" id="0x7f12132b" />
-    <public type="string" name="vanity_url_hint_mobile" id="0x7f12132c" />
-    <public type="string" name="verfication_expired" id="0x7f12132d" />
-    <public type="string" name="verfication_expired_suggestion" id="0x7f12132e" />
-    <public type="string" name="verification_body" id="0x7f12132f" />
-    <public type="string" name="verification_body_alt" id="0x7f121330" />
-    <public type="string" name="verification_email_body" id="0x7f121331" />
-    <public type="string" name="verification_email_error_body" id="0x7f121332" />
-    <public type="string" name="verification_email_error_title" id="0x7f121333" />
-    <public type="string" name="verification_email_title" id="0x7f121334" />
-    <public type="string" name="verification_footer" id="0x7f121335" />
-    <public type="string" name="verification_footer_logout" id="0x7f121336" />
-    <public type="string" name="verification_footer_support" id="0x7f121337" />
-    <public type="string" name="verification_level_high_criteria" id="0x7f121338" />
-    <public type="string" name="verification_level_low" id="0x7f121339" />
-    <public type="string" name="verification_level_low_criteria" id="0x7f12133a" />
-    <public type="string" name="verification_level_medium" id="0x7f12133b" />
-    <public type="string" name="verification_level_medium_criteria" id="0x7f12133c" />
-    <public type="string" name="verification_level_none" id="0x7f12133d" />
-    <public type="string" name="verification_level_none_criteria" id="0x7f12133e" />
-    <public type="string" name="verification_level_very_high_criteria" id="0x7f12133f" />
-    <public type="string" name="verification_open_discord" id="0x7f121340" />
-    <public type="string" name="verification_phone_description" id="0x7f121341" />
-    <public type="string" name="verification_phone_title" id="0x7f121342" />
-    <public type="string" name="verification_title" id="0x7f121343" />
-    <public type="string" name="verification_verified" id="0x7f121344" />
-    <public type="string" name="verification_verifying" id="0x7f121345" />
-    <public type="string" name="verify" id="0x7f121346" />
-    <public type="string" name="verify_account" id="0x7f121347" />
-    <public type="string" name="verify_by" id="0x7f121348" />
-    <public type="string" name="verify_by_email" id="0x7f121349" />
-    <public type="string" name="verify_by_email_formatted" id="0x7f12134a" />
-    <public type="string" name="verify_by_phone" id="0x7f12134b" />
-    <public type="string" name="verify_by_phone_formatted" id="0x7f12134c" />
-    <public type="string" name="verify_by_recaptcha" id="0x7f12134d" />
-    <public type="string" name="verify_by_recaptcha_description" id="0x7f12134e" />
-    <public type="string" name="verify_email_body" id="0x7f12134f" />
-    <public type="string" name="verify_email_body_resent" id="0x7f121350" />
-    <public type="string" name="verify_phone" id="0x7f121351" />
-    <public type="string" name="verifying" id="0x7f121352" />
-    <public type="string" name="very_out_of_date_description" id="0x7f121353" />
-    <public type="string" name="vi" id="0x7f121354" />
-    <public type="string" name="video" id="0x7f121355" />
-    <public type="string" name="video_call" id="0x7f121356" />
-    <public type="string" name="video_connect" id="0x7f121357" />
-    <public type="string" name="video_poor_connection_body" id="0x7f121358" />
-    <public type="string" name="video_poor_connection_title" id="0x7f121359" />
-    <public type="string" name="video_preview" id="0x7f12135a" />
-    <public type="string" name="video_settings" id="0x7f12135b" />
-    <public type="string" name="video_unavailable" id="0x7f12135c" />
-    <public type="string" name="video_unsupported_browser_body" id="0x7f12135d" />
-    <public type="string" name="video_unsupported_browser_title" id="0x7f12135e" />
-    <public type="string" name="view_and_join_listings" id="0x7f12135f" />
-    <public type="string" name="view_audit_log" id="0x7f121360" />
-    <public type="string" name="view_audit_log_description" id="0x7f121361" />
-    <public type="string" name="view_channel" id="0x7f121362" />
-    <public type="string" name="view_embed" id="0x7f121363" />
-    <public type="string" name="view_guild_analytics" id="0x7f121364" />
-    <public type="string" name="view_guild_analytics_description" id="0x7f121365" />
-    <public type="string" name="view_profile" id="0x7f121366" />
-    <public type="string" name="view_spectators" id="0x7f121367" />
-    <public type="string" name="view_surrounding_messages" id="0x7f121368" />
-    <public type="string" name="voice" id="0x7f121369" />
-    <public type="string" name="voice_and_video" id="0x7f12136a" />
-    <public type="string" name="voice_call" id="0x7f12136b" />
-    <public type="string" name="voice_call_member_list_title" id="0x7f12136c" />
-    <public type="string" name="voice_channel" id="0x7f12136d" />
-    <public type="string" name="voice_channel_empty" id="0x7f12136e" />
-    <public type="string" name="voice_channel_hide_names" id="0x7f12136f" />
-    <public type="string" name="voice_channel_locked" id="0x7f121370" />
-    <public type="string" name="voice_channel_show_names" id="0x7f121371" />
-    <public type="string" name="voice_channels" id="0x7f121372" />
-    <public type="string" name="voice_connect" id="0x7f121373" />
-    <public type="string" name="voice_disconnect_body" id="0x7f121374" />
-    <public type="string" name="voice_disconnect_title" id="0x7f121375" />
-    <public type="string" name="voice_only" id="0x7f121376" />
-    <public type="string" name="voice_permissions" id="0x7f121377" />
-    <public type="string" name="voice_settings" id="0x7f121378" />
-    <public type="string" name="voice_status_connecting" id="0x7f121379" />
-    <public type="string" name="voice_status_not_connected" id="0x7f12137a" />
-    <public type="string" name="voice_status_not_connected_mobile" id="0x7f12137b" />
-    <public type="string" name="voice_status_ringing" id="0x7f12137c" />
-    <public type="string" name="voice_unavailable" id="0x7f12137d" />
-    <public type="string" name="watch" id="0x7f12137e" />
-    <public type="string" name="watch_stream" id="0x7f12137f" />
-    <public type="string" name="watch_stream_in_app" id="0x7f121380" />
-    <public type="string" name="watch_stream_streaming" id="0x7f121381" />
-    <public type="string" name="watch_stream_tip" id="0x7f121382" />
-    <public type="string" name="watch_stream_watching" id="0x7f121383" />
-    <public type="string" name="watch_user_stream" id="0x7f121384" />
-    <public type="string" name="watching" id="0x7f121385" />
-    <public type="string" name="web_browser" id="0x7f121386" />
-    <public type="string" name="web_browser_chrome" id="0x7f121387" />
-    <public type="string" name="web_browser_in_app" id="0x7f121388" />
-    <public type="string" name="web_browser_safari" id="0x7f121389" />
-    <public type="string" name="webhook_cancel" id="0x7f12138a" />
-    <public type="string" name="webhook_create" id="0x7f12138b" />
-    <public type="string" name="webhook_created_on" id="0x7f12138c" />
-    <public type="string" name="webhook_delete" id="0x7f12138d" />
-    <public type="string" name="webhook_delete_body" id="0x7f12138e" />
-    <public type="string" name="webhook_delete_title" id="0x7f12138f" />
-    <public type="string" name="webhook_edit" id="0x7f121390" />
-    <public type="string" name="webhook_error_creating_webhook" id="0x7f121391" />
-    <public type="string" name="webhook_error_deleting_webhook" id="0x7f121392" />
-    <public type="string" name="webhook_error_internal_server_error" id="0x7f121393" />
-    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f121394" />
-    <public type="string" name="webhook_error_saving_webhook" id="0x7f121395" />
-    <public type="string" name="webhook_form_channel" id="0x7f121396" />
-    <public type="string" name="webhook_form_name" id="0x7f121397" />
-    <public type="string" name="webhook_form_url" id="0x7f121398" />
-    <public type="string" name="webhook_form_webhook_url_help" id="0x7f121399" />
-    <public type="string" name="webhook_modal_icon_description" id="0x7f12139a" />
-    <public type="string" name="webhook_modal_icon_title" id="0x7f12139b" />
-    <public type="string" name="webhook_modal_title" id="0x7f12139c" />
-    <public type="string" name="webhook_save" id="0x7f12139d" />
-    <public type="string" name="webhooks" id="0x7f12139e" />
-    <public type="string" name="welcome_message_desktop_apps" id="0x7f12139f" />
-    <public type="string" name="welcome_message_instant_invite" id="0x7f1213a0" />
-    <public type="string" name="welcome_message_mobile_apps" id="0x7f1213a1" />
-    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f1213a2" />
-    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f1213a3" />
-    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f1213a4" />
-    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f1213a5" />
-    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f1213a6" />
-    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f1213a7" />
-    <public type="string" name="welcome_message_owner_title" id="0x7f1213a8" />
-    <public type="string" name="welcome_message_support" id="0x7f1213a9" />
-    <public type="string" name="welcome_message_title" id="0x7f1213aa" />
-    <public type="string" name="welcome_message_tutorial" id="0x7f1213ab" />
-    <public type="string" name="whats_new" id="0x7f1213ac" />
-    <public type="string" name="whats_new_date" id="0x7f1213ad" />
-    <public type="string" name="whitelist_failed" id="0x7f1213ae" />
-    <public type="string" name="whitelisted" id="0x7f1213af" />
-    <public type="string" name="whitelisting" id="0x7f1213b0" />
-    <public type="string" name="widget" id="0x7f1213b1" />
-    <public type="string" name="windows" id="0x7f1213b2" />
-    <public type="string" name="wumpus" id="0x7f1213b3" />
-    <public type="string" name="xbox_authorization_title" id="0x7f1213b4" />
-    <public type="string" name="xbox_link" id="0x7f1213b5" />
-    <public type="string" name="xbox_pin_step1" id="0x7f1213b6" />
-    <public type="string" name="xbox_pin_step2" id="0x7f1213b7" />
-    <public type="string" name="xbox_pin_step3" id="0x7f1213b8" />
-    <public type="string" name="yellow" id="0x7f1213b9" />
-    <public type="string" name="yes_text" id="0x7f1213ba" />
-    <public type="string" name="your_discord_tag" id="0x7f1213bb" />
-    <public type="string" name="your_pin_expires" id="0x7f1213bc" />
-    <public type="string" name="your_pin_is_expired" id="0x7f1213bd" />
-    <public type="string" name="youre_viewing_older_messages" id="0x7f1213be" />
-    <public type="string" name="zh_cn" id="0x7f1213bf" />
-    <public type="string" name="zh_tw" id="0x7f1213c0" />
-    <public type="string" name="APKTOOL_DUMMY_3a2" id="0x7f1203a2" />
+    <public type="string" name="attach_payment_source_optional_with_entitlements_warning" id="0x7f12026d" />
+    <public type="string" name="attach_payment_source_prompt_option" id="0x7f12026e" />
+    <public type="string" name="attach_payment_source_prompt_option_optional" id="0x7f12026f" />
+    <public type="string" name="attachment_camera" id="0x7f120270" />
+    <public type="string" name="attachment_compressing" id="0x7f120271" />
+    <public type="string" name="attachment_filename_unknown" id="0x7f120272" />
+    <public type="string" name="attachment_files" id="0x7f120273" />
+    <public type="string" name="attachment_load_failed" id="0x7f120274" />
+    <public type="string" name="attachment_photos" id="0x7f120275" />
+    <public type="string" name="attachment_processing" id="0x7f120276" />
+    <public type="string" name="attachments_keyboard" id="0x7f120277" />
+    <public type="string" name="attenuate_while_speaking_others" id="0x7f120278" />
+    <public type="string" name="attenuate_while_speaking_self" id="0x7f120279" />
+    <public type="string" name="audio_hint_body" id="0x7f12027a" />
+    <public type="string" name="audio_hint_title" id="0x7f12027b" />
+    <public type="string" name="auth_banned_invite_body" id="0x7f12027c" />
+    <public type="string" name="auth_browser_handoff_detecting_description" id="0x7f12027d" />
+    <public type="string" name="auth_disable_email_notifications_failure_body" id="0x7f12027e" />
+    <public type="string" name="auth_disable_email_notifications_failure_header" id="0x7f12027f" />
+    <public type="string" name="auth_disable_email_notifications_success_body" id="0x7f120280" />
+    <public type="string" name="auth_disable_email_notifications_success_header" id="0x7f120281" />
+    <public type="string" name="auth_expired_suggestion" id="0x7f120282" />
+    <public type="string" name="auth_invalid_invite_body" id="0x7f120283" />
+    <public type="string" name="auth_invalid_invite_tip" id="0x7f120284" />
+    <public type="string" name="auth_invalid_invite_title" id="0x7f120285" />
+    <public type="string" name="auth_ip_auth_succeeded_suggestion" id="0x7f120286" />
+    <public type="string" name="auth_login_body" id="0x7f120287" />
+    <public type="string" name="auth_message_invited_by" id="0x7f120288" />
+    <public type="string" name="auth_message_invited_to_stream" id="0x7f120289" />
+    <public type="string" name="auth_username_tooltip" id="0x7f12028a" />
+    <public type="string" name="auth_verfication_expired_suggestion" id="0x7f12028b" />
+    <public type="string" name="authorization" id="0x7f12028c" />
+    <public type="string" name="authorization_expired" id="0x7f12028d" />
+    <public type="string" name="authorization_expired_suggestion" id="0x7f12028e" />
+    <public type="string" name="authorize" id="0x7f12028f" />
+    <public type="string" name="authorized" id="0x7f120290" />
+    <public type="string" name="authorized_apps" id="0x7f120291" />
+    <public type="string" name="authorizing" id="0x7f120292" />
+    <public type="string" name="auto_toggle_streamer_mode_description" id="0x7f120293" />
+    <public type="string" name="auto_toggle_streamer_mode_label" id="0x7f120294" />
+    <public type="string" name="autocomplete_no_results_body" id="0x7f120295" />
+    <public type="string" name="autocomplete_no_results_header" id="0x7f120296" />
+    <public type="string" name="automatic_gain_control" id="0x7f120297" />
+    <public type="string" name="avatar_convert_failure_mobile" id="0x7f120298" />
+    <public type="string" name="avatar_size_option_large" id="0x7f120299" />
+    <public type="string" name="avatar_size_option_small" id="0x7f12029a" />
+    <public type="string" name="back" id="0x7f12029b" />
+    <public type="string" name="back_button_behavior_label_mobile" id="0x7f12029c" />
+    <public type="string" name="back_button_behavior_mobile" id="0x7f12029d" />
+    <public type="string" name="backspace" id="0x7f12029e" />
+    <public type="string" name="backup_codes_dash" id="0x7f12029f" />
+    <public type="string" name="ban" id="0x7f1202a0" />
+    <public type="string" name="ban_confirm_title" id="0x7f1202a1" />
+    <public type="string" name="ban_members" id="0x7f1202a2" />
+    <public type="string" name="ban_members_description" id="0x7f1202a3" />
+    <public type="string" name="ban_reason" id="0x7f1202a4" />
+    <public type="string" name="ban_user_body" id="0x7f1202a5" />
+    <public type="string" name="ban_user_confirmed" id="0x7f1202a6" />
+    <public type="string" name="ban_user_error_generic" id="0x7f1202a7" />
+    <public type="string" name="ban_user_title" id="0x7f1202a8" />
+    <public type="string" name="bans" id="0x7f1202a9" />
+    <public type="string" name="bans_header" id="0x7f1202aa" />
+    <public type="string" name="bans_hint" id="0x7f1202ab" />
+    <public type="string" name="bans_no_results" id="0x7f1202ac" />
+    <public type="string" name="bans_no_users_banned" id="0x7f1202ad" />
+    <public type="string" name="bans_search_placeholder" id="0x7f1202ae" />
+    <public type="string" name="beep_boop" id="0x7f1202af" />
+    <public type="string" name="beginning_channel" id="0x7f1202b0" />
+    <public type="string" name="beginning_channel_no_history" id="0x7f1202b1" />
+    <public type="string" name="beginning_chat" id="0x7f1202b2" />
+    <public type="string" name="beginning_chat_dm_mobile" id="0x7f1202b3" />
+    <public type="string" name="beginning_dm" id="0x7f1202b4" />
+    <public type="string" name="beginning_group_dm" id="0x7f1202b5" />
+    <public type="string" name="beginning_group_dm_managed" id="0x7f1202b6" />
+    <public type="string" name="beta" id="0x7f1202b7" />
+    <public type="string" name="bg" id="0x7f1202b8" />
+    <public type="string" name="billing" id="0x7f1202b9" />
+    <public type="string" name="billing_accept_terms_tooltip" id="0x7f1202ba" />
+    <public type="string" name="billing_account_credit" id="0x7f1202bb" />
+    <public type="string" name="billing_add_payment_method" id="0x7f1202bc" />
+    <public type="string" name="billing_address" id="0x7f1202bd" />
+    <public type="string" name="billing_address_address" id="0x7f1202be" />
+    <public type="string" name="billing_address_address2" id="0x7f1202bf" />
+    <public type="string" name="billing_address_address2_placeholder" id="0x7f1202c0" />
+    <public type="string" name="billing_address_address_error_required" id="0x7f1202c1" />
+    <public type="string" name="billing_address_address_placeholder" id="0x7f1202c2" />
+    <public type="string" name="billing_address_city" id="0x7f1202c3" />
+    <public type="string" name="billing_address_city_error_required" id="0x7f1202c4" />
+    <public type="string" name="billing_address_city_placeholder" id="0x7f1202c5" />
+    <public type="string" name="billing_address_country" id="0x7f1202c6" />
+    <public type="string" name="billing_address_country_error_required" id="0x7f1202c7" />
+    <public type="string" name="billing_address_name" id="0x7f1202c8" />
+    <public type="string" name="billing_address_name_error_required" id="0x7f1202c9" />
+    <public type="string" name="billing_address_postal_code" id="0x7f1202ca" />
+    <public type="string" name="billing_address_postal_code_canada_placeholder" id="0x7f1202cb" />
+    <public type="string" name="billing_address_postal_code_error_required" id="0x7f1202cc" />
+    <public type="string" name="billing_address_province" id="0x7f1202cd" />
+    <public type="string" name="billing_address_province_error_required" id="0x7f1202ce" />
+    <public type="string" name="billing_address_region" id="0x7f1202cf" />
+    <public type="string" name="billing_address_state" id="0x7f1202d0" />
+    <public type="string" name="billing_address_state_error_required" id="0x7f1202d1" />
+    <public type="string" name="billing_address_zip_code" id="0x7f1202d2" />
+    <public type="string" name="billing_address_zip_code_error_length" id="0x7f1202d3" />
+    <public type="string" name="billing_address_zip_code_error_required" id="0x7f1202d4" />
+    <public type="string" name="billing_address_zip_code_invalid" id="0x7f1202d5" />
+    <public type="string" name="billing_address_zip_code_placeholder" id="0x7f1202d6" />
+    <public type="string" name="billing_apple_description" id="0x7f1202d7" />
+    <public type="string" name="billing_apple_header" id="0x7f1202d8" />
+    <public type="string" name="billing_application_consumable_refund_text_unable" id="0x7f1202d9" />
+    <public type="string" name="billing_application_refund_text" id="0x7f1202da" />
+    <public type="string" name="billing_application_refund_text_unable" id="0x7f1202db" />
+    <public type="string" name="billing_applies_to_all_subscriptions" id="0x7f1202dc" />
+    <public type="string" name="billing_change_payment_source" id="0x7f1202dd" />
+    <public type="string" name="billing_code_redemption_redirect" id="0x7f1202de" />
+    <public type="string" name="billing_error_add_payment_source_streamer_mode" id="0x7f1202df" />
+    <public type="string" name="billing_error_gateway" id="0x7f1202e0" />
+    <public type="string" name="billing_error_generic" id="0x7f1202e1" />
+    <public type="string" name="billing_error_rate_limit" id="0x7f1202e2" />
+    <public type="string" name="billing_error_section_address" id="0x7f1202e3" />
+    <public type="string" name="billing_error_section_card" id="0x7f1202e4" />
+    <public type="string" name="billing_gift_copied" id="0x7f1202e5" />
+    <public type="string" name="billing_gift_link" id="0x7f1202e6" />
+    <public type="string" name="billing_gift_purchase_tooltip" id="0x7f1202e7" />
+    <public type="string" name="billing_gift_refund_text" id="0x7f1202e8" />
+    <public type="string" name="billing_gift_refund_text_unable" id="0x7f1202e9" />
+    <public type="string" name="billing_history" id="0x7f1202ea" />
+    <public type="string" name="billing_invoice_gift_plan" id="0x7f1202eb" />
+    <public type="string" name="billing_invoice_subscription_credit_applied" id="0x7f1202ec" />
+    <public type="string" name="billing_is_gift_purchase" id="0x7f1202ed" />
+    <public type="string" name="billing_legal_mumbo_jumbo" id="0x7f1202ee" />
+    <public type="string" name="billing_legal_mumbo_jumbo_label" id="0x7f1202ef" />
+    <public type="string" name="billing_manage_billing" id="0x7f1202f0" />
+    <public type="string" name="billing_manage_subscription" id="0x7f1202f1" />
+    <public type="string" name="billing_managed_by_apple" id="0x7f1202f2" />
+    <public type="string" name="billing_no_payment_method" id="0x7f1202f3" />
+    <public type="string" name="billing_no_payment_method_description" id="0x7f1202f4" />
+    <public type="string" name="billing_pay_for_it_with" id="0x7f1202f5" />
+    <public type="string" name="billing_payment_breakdown_taxes" id="0x7f1202f6" />
+    <public type="string" name="billing_payment_breakdown_total" id="0x7f1202f7" />
+    <public type="string" name="billing_payment_choose_gift" id="0x7f1202f8" />
+    <public type="string" name="billing_payment_choose_plan" id="0x7f1202f9" />
+    <public type="string" name="billing_payment_history" id="0x7f1202fa" />
+    <public type="string" name="billing_payment_premium" id="0x7f1202fb" />
+    <public type="string" name="billing_payment_premium_legalese_monthly" id="0x7f1202fc" />
+    <public type="string" name="billing_payment_premium_legalese_yearly" id="0x7f1202fd" />
+    <public type="string" name="billing_payment_source_invalid" id="0x7f1202fe" />
+    <public type="string" name="billing_payment_sources" id="0x7f1202ff" />
+    <public type="string" name="billing_payment_table_header_amount" id="0x7f120300" />
+    <public type="string" name="billing_payment_table_header_date" id="0x7f120301" />
+    <public type="string" name="billing_payment_table_header_description" id="0x7f120302" />
+    <public type="string" name="billing_premium_gift_friend" id="0x7f120303" />
+    <public type="string" name="billing_premium_gift_month" id="0x7f120304" />
+    <public type="string" name="billing_premium_gift_month_mobile" id="0x7f120305" />
+    <public type="string" name="billing_premium_gift_year" id="0x7f120306" />
+    <public type="string" name="billing_premium_gift_year_mobile" id="0x7f120307" />
+    <public type="string" name="billing_premium_refund_text" id="0x7f120308" />
+    <public type="string" name="billing_premium_refund_text_unable" id="0x7f120309" />
+    <public type="string" name="billing_preorder_refund_text" id="0x7f12030a" />
+    <public type="string" name="billing_price_per_month" id="0x7f12030b" />
+    <public type="string" name="billing_price_per_month_bold" id="0x7f12030c" />
+    <public type="string" name="billing_price_per_month_current_plan" id="0x7f12030d" />
+    <public type="string" name="billing_price_per_month_current_plan_ios" id="0x7f12030e" />
+    <public type="string" name="billing_price_per_month_each" id="0x7f12030f" />
+    <public type="string" name="billing_price_per_month_mobile" id="0x7f120310" />
+    <public type="string" name="billing_price_per_year" id="0x7f120311" />
+    <public type="string" name="billing_price_per_year_bold" id="0x7f120312" />
+    <public type="string" name="billing_price_per_year_current_plan" id="0x7f120313" />
+    <public type="string" name="billing_price_per_year_current_plan_ios" id="0x7f120314" />
+    <public type="string" name="billing_price_per_year_each" id="0x7f120315" />
+    <public type="string" name="billing_price_per_year_mobile" id="0x7f120316" />
+    <public type="string" name="billing_price_per_year_months_free" id="0x7f120317" />
+    <public type="string" name="billing_purchase_details_header" id="0x7f120318" />
+    <public type="string" name="billing_refund_header" id="0x7f120319" />
+    <public type="string" name="billing_refund_play_time_never_played" id="0x7f12031a" />
+    <public type="string" name="billing_refund_play_time_subheader" id="0x7f12031b" />
+    <public type="string" name="billing_refund_purchase_date" id="0x7f12031c" />
+    <public type="string" name="billing_refund_purchase_date_subheader" id="0x7f12031d" />
+    <public type="string" name="billing_refund_release_date_subheader" id="0x7f12031e" />
+    <public type="string" name="billing_refund_report_a_problem" id="0x7f12031f" />
+    <public type="string" name="billing_refund_request_button" id="0x7f120320" />
+    <public type="string" name="billing_sales_tax_added" id="0x7f120321" />
+    <public type="string" name="billing_sales_tax_included" id="0x7f120322" />
+    <public type="string" name="billing_secure_tooltip" id="0x7f120323" />
+    <public type="string" name="billing_select_payment_source_tooltip" id="0x7f120324" />
+    <public type="string" name="billing_step_address" id="0x7f120325" />
+    <public type="string" name="billing_step_awaiting_authentication" id="0x7f120326" />
+    <public type="string" name="billing_step_credit_card_information" id="0x7f120327" />
+    <public type="string" name="billing_step_payment" id="0x7f120328" />
+    <public type="string" name="billing_step_payment_info" id="0x7f120329" />
+    <public type="string" name="billing_step_payment_type" id="0x7f12032a" />
+    <public type="string" name="billing_step_paypal" id="0x7f12032b" />
+    <public type="string" name="billing_step_review" id="0x7f12032c" />
+    <public type="string" name="billing_step_select_plan" id="0x7f12032d" />
+    <public type="string" name="billing_subscribe" id="0x7f12032e" />
+    <public type="string" name="billing_switch_plan_account_credit" id="0x7f12032f" />
+    <public type="string" name="billing_switch_plan_change" id="0x7f120330" />
+    <public type="string" name="billing_switch_plan_change_date" id="0x7f120331" />
+    <public type="string" name="billing_switch_plan_choose_one" id="0x7f120332" />
+    <public type="string" name="billing_switch_plan_confirm_downgrade_button" id="0x7f120333" />
+    <public type="string" name="billing_switch_plan_confirm_tier_1" id="0x7f120334" />
+    <public type="string" name="billing_switch_plan_confirm_tier_1_year_to_month" id="0x7f120335" />
+    <public type="string" name="billing_switch_plan_confirm_tier_2" id="0x7f120336" />
+    <public type="string" name="billing_switch_plan_confirm_tier_2_to_tier_1" id="0x7f120337" />
+    <public type="string" name="billing_switch_plan_confirm_tier_2_year_to_month" id="0x7f120338" />
+    <public type="string" name="billing_switch_plan_confirm_upgrade_button" id="0x7f120339" />
+    <public type="string" name="billing_switch_plan_confirm_upgrade_tier_1_year" id="0x7f12033a" />
+    <public type="string" name="billing_switch_plan_confirm_upgrade_tier_2_month" id="0x7f12033b" />
+    <public type="string" name="billing_switch_plan_confirm_upgrade_tier_2_year" id="0x7f12033c" />
+    <public type="string" name="billing_switch_plan_current_plan" id="0x7f12033d" />
+    <public type="string" name="billing_switch_plan_downgrade_body_month" id="0x7f12033e" />
+    <public type="string" name="billing_switch_plan_downgrade_body_tier_1" id="0x7f12033f" />
+    <public type="string" name="billing_switch_plan_prorate_adjustment" id="0x7f120340" />
+    <public type="string" name="billing_switch_plan_subscription_cost" id="0x7f120341" />
+    <public type="string" name="billing_switch_plan_tier_1_description" id="0x7f120342" />
+    <public type="string" name="billing_switch_plan_tier_2_description" id="0x7f120343" />
+    <public type="string" name="billing_switch_plan_todays_charges" id="0x7f120344" />
+    <public type="string" name="billing_switch_plan_total_tax_included" id="0x7f120345" />
+    <public type="string" name="billing_switch_plan_upgrade" id="0x7f120346" />
+    <public type="string" name="billing_switch_plan_upgrade_body_tier_1_year" id="0x7f120347" />
+    <public type="string" name="billing_switch_plan_upgrade_body_tier_2" id="0x7f120348" />
+    <public type="string" name="billing_switch_plan_upgrade_body_tier_2_year" id="0x7f120349" />
+    <public type="string" name="billing_switch_plan_yearly_free_months" id="0x7f12034a" />
+    <public type="string" name="billing_tag_failed" id="0x7f12034b" />
+    <public type="string" name="billing_tag_pending" id="0x7f12034c" />
+    <public type="string" name="billing_tag_refunded" id="0x7f12034d" />
+    <public type="string" name="billing_tag_reversed" id="0x7f12034e" />
+    <public type="string" name="billing_third_party_eula_label" id="0x7f12034f" />
+    <public type="string" name="block" id="0x7f120350" />
+    <public type="string" name="blocked" id="0x7f120351" />
+    <public type="string" name="blocked_messages" id="0x7f120352" />
+    <public type="string" name="blue" id="0x7f120353" />
+    <public type="string" name="bot_call_idle_disconnect" id="0x7f120354" />
+    <public type="string" name="bot_dm_explicit_content" id="0x7f120355" />
+    <public type="string" name="bot_dm_rate_limited" id="0x7f120356" />
+    <public type="string" name="bot_dm_send_failed" id="0x7f120357" />
+    <public type="string" name="bot_dm_send_message_temporarily_disabled" id="0x7f120358" />
+    <public type="string" name="bot_gdm_explicit_content" id="0x7f120359" />
+    <public type="string" name="bot_guild_explicit_content" id="0x7f12035a" />
+    <public type="string" name="bot_requires_email_verification" id="0x7f12035b" />
+    <public type="string" name="bot_tag" id="0x7f12035c" />
+    <public type="string" name="bot_tag_bot" id="0x7f12035d" />
+    <public type="string" name="bot_tag_server" id="0x7f12035e" />
+    <public type="string" name="bot_video_disabled" id="0x7f12035f" />
+    <public type="string" name="bots" id="0x7f120360" />
+    <public type="string" name="bots_settings_add" id="0x7f120361" />
+    <public type="string" name="bots_settings_description" id="0x7f120362" />
+    <public type="string" name="bots_settings_learn_more" id="0x7f120363" />
+    <public type="string" name="bots_settings_remove" id="0x7f120364" />
+    <public type="string" name="bottom_sheet_behavior" id="0x7f120365" />
+    <public type="string" name="brown" id="0x7f120366" />
+    <public type="string" name="browser_app" id="0x7f120367" />
+    <public type="string" name="browser_chrome" id="0x7f120368" />
+    <public type="string" name="browser_firefox" id="0x7f120369" />
+    <public type="string" name="browser_handoff_authenticating_description" id="0x7f12036a" />
+    <public type="string" name="browser_handoff_authenticating_title" id="0x7f12036b" />
+    <public type="string" name="browser_handoff_detecting_description" id="0x7f12036c" />
+    <public type="string" name="browser_handoff_detecting_title" id="0x7f12036d" />
+    <public type="string" name="browser_handoff_done_description" id="0x7f12036e" />
+    <public type="string" name="browser_handoff_done_safe_to_close" id="0x7f12036f" />
+    <public type="string" name="browser_handoff_done_title" id="0x7f120370" />
+    <public type="string" name="browser_handoff_failed_title" id="0x7f120371" />
+    <public type="string" name="browser_handoff_success_action" id="0x7f120372" />
+    <public type="string" name="browser_handoff_success_body" id="0x7f120373" />
+    <public type="string" name="browser_handoff_success_cancel" id="0x7f120374" />
+    <public type="string" name="browser_handoff_success_title" id="0x7f120375" />
+    <public type="string" name="browser_input_device_warning" id="0x7f120376" />
+    <public type="string" name="browser_not_supported" id="0x7f120377" />
+    <public type="string" name="browser_notifications_enabled_body" id="0x7f120378" />
+    <public type="string" name="browser_opera" id="0x7f120379" />
+    <public type="string" name="browser_output_device_warning" id="0x7f12037a" />
+    <public type="string" name="bug_hunter_badge_tooltip" id="0x7f12037b" />
+    <public type="string" name="build_override" id="0x7f12037c" />
+    <public type="string" name="build_override_apply" id="0x7f12037d" />
+    <public type="string" name="build_override_clear" id="0x7f12037e" />
+    <public type="string" name="build_override_expired" id="0x7f12037f" />
+    <public type="string" name="build_override_for" id="0x7f120380" />
+    <public type="string" name="build_override_id" id="0x7f120381" />
+    <public type="string" name="build_override_incompatible_client" id="0x7f120382" />
+    <public type="string" name="build_override_invalid" id="0x7f120383" />
+    <public type="string" name="build_override_invalid_user" id="0x7f120384" />
+    <public type="string" name="build_override_isnt_available" id="0x7f120385" />
+    <public type="string" name="build_override_link_copied" id="0x7f120386" />
+    <public type="string" name="build_override_link_copy" id="0x7f120387" />
+    <public type="string" name="bundle_ready_body" id="0x7f120388" />
+    <public type="string" name="bundle_ready_later" id="0x7f120389" />
+    <public type="string" name="bundle_ready_restart" id="0x7f12038a" />
+    <public type="string" name="bundle_ready_title" id="0x7f12038b" />
+    <public type="string" name="burgundy" id="0x7f12038c" />
+    <public type="string" name="cache_cleared" id="0x7f12038d" />
+    <public type="string" name="call" id="0x7f12038e" />
+    <public type="string" name="call_invite_not_friends" id="0x7f12038f" />
+    <public type="string" name="call_options" id="0x7f120390" />
+    <public type="string" name="call_unavailable" id="0x7f120391" />
+    <public type="string" name="call_user" id="0x7f120392" />
+    <public type="string" name="camera_enable_access" id="0x7f120393" />
+    <public type="string" name="camera_intent_result_error" id="0x7f120394" />
+    <public type="string" name="camera_no_access" id="0x7f120395" />
+    <public type="string" name="camera_no_device" id="0x7f120396" />
+    <public type="string" name="camera_not_enabled" id="0x7f120397" />
+    <public type="string" name="camera_off" id="0x7f120398" />
+    <public type="string" name="camera_on" id="0x7f120399" />
+    <public type="string" name="camera_permission_denied_msg" id="0x7f12039a" />
+    <public type="string" name="camera_roll" id="0x7f12039b" />
+    <public type="string" name="camera_switch" id="0x7f12039c" />
+    <public type="string" name="camera_switched" id="0x7f12039d" />
+    <public type="string" name="camera_unavailable" id="0x7f12039e" />
+    <public type="string" name="camera_unknown_error" id="0x7f12039f" />
+    <public type="string" name="cancel" id="0x7f1203a0" />
+    <public type="string" name="cannot_deny_missing_permission" id="0x7f1203a1" />
+    <public type="string" name="cannot_deny_self_simple" id="0x7f1203a2" />
+    <public type="string" name="cannot_deny_singular_permission" id="0x7f1203a3" />
+    <public type="string" name="cannot_manage_higher_rank" id="0x7f1203a4" />
+    <public type="string" name="cannot_manage_is_owner" id="0x7f1203a5" />
+    <public type="string" name="cannot_manage_same_rank" id="0x7f1203a6" />
+    <public type="string" name="captcha" id="0x7f1203a7" />
+    <public type="string" name="captcha_failed" id="0x7f1203a8" />
+    <public type="string" name="captcha_failed_play_services" id="0x7f1203a9" />
+    <public type="string" name="captcha_failed_unsupported" id="0x7f1203aa" />
+    <public type="string" name="captcha_issues" id="0x7f1203ab" />
+    <public type="string" name="captcha_open_browser" id="0x7f1203ac" />
+    <public type="string" name="captcha_problems" id="0x7f1203ad" />
+    <public type="string" name="captcha_problems_info" id="0x7f1203ae" />
+    <public type="string" name="categories" id="0x7f1203af" />
+    <public type="string" name="category" id="0x7f1203b0" />
+    <public type="string" name="category_has_been_deleted" id="0x7f1203b1" />
+    <public type="string" name="category_name" id="0x7f1203b2" />
+    <public type="string" name="category_settings" id="0x7f1203b3" />
+    <public type="string" name="category_settings_have_been_updated" id="0x7f1203b4" />
+    <public type="string" name="certified" id="0x7f1203b5" />
+    <public type="string" name="certified_device_recommendation_audio_input_and_output_body" id="0x7f1203b6" />
+    <public type="string" name="certified_device_recommendation_audio_input_body" id="0x7f1203b7" />
+    <public type="string" name="certified_device_recommendation_audio_output_body" id="0x7f1203b8" />
+    <public type="string" name="certified_device_recommendation_cancel" id="0x7f1203b9" />
+    <public type="string" name="certified_device_recommendation_confirm" id="0x7f1203ba" />
+    <public type="string" name="certified_device_recommendation_title" id="0x7f1203bb" />
+    <public type="string" name="certified_device_recommendation_video_input_body" id="0x7f1203bc" />
+    <public type="string" name="change" id="0x7f1203bd" />
+    <public type="string" name="change_avatar" id="0x7f1203be" />
+    <public type="string" name="change_banner" id="0x7f1203bf" />
+    <public type="string" name="change_category" id="0x7f1203c0" />
+    <public type="string" name="change_email" id="0x7f1203c1" />
+    <public type="string" name="change_email_short" id="0x7f1203c2" />
+    <public type="string" name="change_icon" id="0x7f1203c3" />
+    <public type="string" name="change_log" id="0x7f1203c4" />
+    <public type="string" name="change_log_md_body" id="0x7f1203c5" />
+    <public type="string" name="change_log_md_date" id="0x7f1203c6" />
+    <public type="string" name="change_log_md_revision" id="0x7f1203c8" />
+    <public type="string" name="change_log_md_video" id="0x7f1203c9" />
+    <public type="string" name="change_nickname" id="0x7f1203ca" />
+    <public type="string" name="change_nickname_description" id="0x7f1203cb" />
+    <public type="string" name="change_nickname_warning" id="0x7f1203cc" />
+    <public type="string" name="change_password" id="0x7f1203cd" />
+    <public type="string" name="change_password_link" id="0x7f1203ce" />
+    <public type="string" name="change_phone_number" id="0x7f1203cf" />
+    <public type="string" name="change_plan" id="0x7f1203d0" />
+    <public type="string" name="change_splash" id="0x7f1203d1" />
+    <public type="string" name="change_url" id="0x7f1203d2" />
+    <public type="string" name="change_vanity_url" id="0x7f1203d3" />
+    <public type="string" name="change_vanity_url_error" id="0x7f1203d4" />
+    <public type="string" name="channel" id="0x7f1203d5" />
+    <public type="string" name="channel_has_been_deleted" id="0x7f1203d6" />
+    <public type="string" name="channel_locked" id="0x7f1203d7" />
+    <public type="string" name="channel_locked_short" id="0x7f1203d8" />
+    <public type="string" name="channel_locked_to_category" id="0x7f1203d9" />
+    <public type="string" name="channel_members" id="0x7f1203da" />
+    <public type="string" name="channel_mute_role_description" id="0x7f1203db" />
+    <public type="string" name="channel_mute_tooltip" id="0x7f1203dc" />
+    <public type="string" name="channel_name_required" id="0x7f1203dd" />
+    <public type="string" name="channel_or_category" id="0x7f1203de" />
+    <public type="string" name="channel_order_updated" id="0x7f1203df" />
+    <public type="string" name="channel_permissions" id="0x7f1203e0" />
+    <public type="string" name="channel_select" id="0x7f1203e1" />
+    <public type="string" name="channel_settings" id="0x7f1203e2" />
+    <public type="string" name="channel_settings_have_been_updated" id="0x7f1203e3" />
+    <public type="string" name="channel_slowmode_cooldown" id="0x7f1203e4" />
+    <public type="string" name="channel_slowmode_desc" id="0x7f1203e5" />
+    <public type="string" name="channel_slowmode_desc_hours" id="0x7f1203e6" />
+    <public type="string" name="channel_slowmode_desc_immune" id="0x7f1203e7" />
+    <public type="string" name="channel_slowmode_desc_minutes" id="0x7f1203e8" />
+    <public type="string" name="channel_slowmode_desc_short" id="0x7f1203e9" />
+    <public type="string" name="channel_topic_empty" id="0x7f1203ea" />
+    <public type="string" name="channel_type" id="0x7f1203eb" />
+    <public type="string" name="channel_unmute_tooltip" id="0x7f1203ec" />
+    <public type="string" name="channels" id="0x7f1203ed" />
+    <public type="string" name="channels_unavailable_body" id="0x7f1203ee" />
+    <public type="string" name="channels_unavailable_title" id="0x7f1203ef" />
+    <public type="string" name="character_counter_content_description" id="0x7f1203f0" />
+    <public type="string" name="character_counter_pattern" id="0x7f1203f1" />
+    <public type="string" name="chat" id="0x7f1203f2" />
+    <public type="string" name="chat_attach_invite_to_listen" id="0x7f1203f3" />
+    <public type="string" name="chat_attach_invite_to_play_game" id="0x7f1203f4" />
+    <public type="string" name="chat_attach_invite_to_spectate_game" id="0x7f1203f5" />
+    <public type="string" name="chat_attach_invite_to_watch" id="0x7f1203f6" />
+    <public type="string" name="chat_attach_upload_a_file" id="0x7f1203f7" />
+    <public type="string" name="chat_attach_upload_or_invite" id="0x7f1203f8" />
+    <public type="string" name="chat_behavior" id="0x7f1203f9" />
+    <public type="string" name="chatters_description" id="0x7f1203fa" />
+    <public type="string" name="checking_for_updates" id="0x7f1203fb" />
+    <public type="string" name="choose" id="0x7f1203fc" />
+    <public type="string" name="choose_an_application" id="0x7f1203fd" />
+    <public type="string" name="claim_account" id="0x7f1203fe" />
+    <public type="string" name="claim_account_body" id="0x7f1203ff" />
+    <public type="string" name="claim_account_email_to" id="0x7f120400" />
+    <public type="string" name="claim_account_get_app" id="0x7f120401" />
+    <public type="string" name="claim_account_promote_app" id="0x7f120402" />
+    <public type="string" name="claim_account_required_body" id="0x7f120403" />
+    <public type="string" name="claim_account_required_email_to" id="0x7f120404" />
+    <public type="string" name="clear_attachments" id="0x7f120405" />
+    <public type="string" name="clear_cache" id="0x7f120406" />
+    <public type="string" name="clone_channel" id="0x7f120407" />
+    <public type="string" name="clone_channel_help" id="0x7f120408" />
+    <public type="string" name="close" id="0x7f120409" />
+    <public type="string" name="close_action_sheet" id="0x7f12040a" />
+    <public type="string" name="close_dm" id="0x7f12040b" />
+    <public type="string" name="close_drawer" id="0x7f12040c" />
+    <public type="string" name="close_stream" id="0x7f12040d" />
+    <public type="string" name="close_window" id="0x7f12040e" />
+    <public type="string" name="cloud_sync_icon_tooltip_done" id="0x7f12040f" />
+    <public type="string" name="cloud_sync_icon_tooltip_planning" id="0x7f120410" />
+    <public type="string" name="cloud_sync_icon_tooltip_preparing" id="0x7f120411" />
+    <public type="string" name="cloud_sync_icon_tooltip_pulling" id="0x7f120412" />
+    <public type="string" name="cloud_sync_icon_tooltip_pushing" id="0x7f120413" />
+    <public type="string" name="cloud_sync_icon_tooltip_supported" id="0x7f120414" />
+    <public type="string" name="cloud_sync_modal_conflict_choice_download" id="0x7f120415" />
+    <public type="string" name="cloud_sync_modal_conflict_choice_upload" id="0x7f120416" />
+    <public type="string" name="cloud_sync_modal_conflict_description" id="0x7f120417" />
+    <public type="string" name="cloud_sync_modal_conflict_header" id="0x7f120418" />
+    <public type="string" name="cloud_sync_modal_conflict_last_modified" id="0x7f120419" />
+    <public type="string" name="cloud_sync_modal_error_description" id="0x7f12041a" />
+    <public type="string" name="cloud_sync_modal_error_header" id="0x7f12041b" />
+    <public type="string" name="cloud_sync_modal_or" id="0x7f12041c" />
+    <public type="string" name="collapse_category" id="0x7f12041d" />
+    <public type="string" name="com.crashlytics.android.build_id" id="0x7f12041e" />
+    <public type="string" name="coming_soon" id="0x7f12041f" />
+    <public type="string" name="coming_soon_notifications" id="0x7f120420" />
+    <public type="string" name="coming_soon_title" id="0x7f120421" />
+    <public type="string" name="command_giphy_description" id="0x7f120422" />
+    <public type="string" name="command_me_description" id="0x7f120423" />
+    <public type="string" name="command_nick_description" id="0x7f120424" />
+    <public type="string" name="command_nick_failure" id="0x7f120425" />
+    <public type="string" name="command_nick_failure_permission" id="0x7f120426" />
+    <public type="string" name="command_nick_reset" id="0x7f120427" />
+    <public type="string" name="command_nick_success" id="0x7f120428" />
+    <public type="string" name="command_shrug_description" id="0x7f120429" />
+    <public type="string" name="command_spoiler_description" id="0x7f12042a" />
+    <public type="string" name="command_tableflip_description" id="0x7f12042b" />
+    <public type="string" name="command_tableunflip_description" id="0x7f12042c" />
+    <public type="string" name="command_tts_description" id="0x7f12042d" />
+    <public type="string" name="commands" id="0x7f12042e" />
+    <public type="string" name="commands_matching" id="0x7f12042f" />
+    <public type="string" name="common_google_play_services_enable_button" id="0x7f120430" />
+    <public type="string" name="common_google_play_services_enable_text" id="0x7f120431" />
+    <public type="string" name="common_google_play_services_enable_title" id="0x7f120432" />
+    <public type="string" name="common_google_play_services_install_button" id="0x7f120433" />
+    <public type="string" name="common_google_play_services_install_text" id="0x7f120434" />
+    <public type="string" name="common_google_play_services_install_title" id="0x7f120435" />
+    <public type="string" name="common_google_play_services_notification_channel_name" id="0x7f120436" />
+    <public type="string" name="common_google_play_services_notification_ticker" id="0x7f120437" />
+    <public type="string" name="common_google_play_services_unknown_issue" id="0x7f120438" />
+    <public type="string" name="common_google_play_services_unsupported_text" id="0x7f120439" />
+    <public type="string" name="common_google_play_services_update_button" id="0x7f12043a" />
+    <public type="string" name="common_google_play_services_update_text" id="0x7f12043b" />
+    <public type="string" name="common_google_play_services_update_title" id="0x7f12043c" />
+    <public type="string" name="common_google_play_services_updating_text" id="0x7f12043d" />
+    <public type="string" name="common_google_play_services_wear_update_text" id="0x7f12043e" />
+    <public type="string" name="common_open_on_phone" id="0x7f12043f" />
+    <public type="string" name="common_signin_button_text" id="0x7f120440" />
+    <public type="string" name="common_signin_button_text_long" id="0x7f120441" />
+    <public type="string" name="communicators" id="0x7f120442" />
+    <public type="string" name="compact_mode" id="0x7f120443" />
+    <public type="string" name="completed" id="0x7f120444" />
+    <public type="string" name="configure" id="0x7f120445" />
+    <public type="string" name="confirm" id="0x7f120446" />
+    <public type="string" name="confirm_channel_drag_title" id="0x7f120447" />
+    <public type="string" name="confirm_disable_silence_body" id="0x7f120448" />
+    <public type="string" name="confirm_disable_silence_dont_show" id="0x7f120449" />
+    <public type="string" name="confirm_disable_silence_title" id="0x7f12044a" />
+    <public type="string" name="confirm_user_block_body" id="0x7f12044b" />
+    <public type="string" name="confirm_user_block_title" id="0x7f12044c" />
+    <public type="string" name="connect" id="0x7f12044d" />
+    <public type="string" name="connect_account_description" id="0x7f12044e" />
+    <public type="string" name="connect_account_title" id="0x7f12044f" />
+    <public type="string" name="connect_to_video" id="0x7f120450" />
+    <public type="string" name="connect_to_voice" id="0x7f120451" />
+    <public type="string" name="connect_voice_only" id="0x7f120452" />
+    <public type="string" name="connect_with_discord" id="0x7f120453" />
+    <public type="string" name="connected_account_revoked" id="0x7f120454" />
+    <public type="string" name="connected_account_verify_failure" id="0x7f120455" />
+    <public type="string" name="connected_account_verify_success" id="0x7f120456" />
+    <public type="string" name="connected_account_verifying" id="0x7f120457" />
+    <public type="string" name="connected_accounts" id="0x7f120458" />
+    <public type="string" name="connected_accounts_none" id="0x7f120459" />
+    <public type="string" name="connected_accounts_none_title" id="0x7f12045a" />
+    <public type="string" name="connected_device_detected_cancel_button" id="0x7f12045b" />
+    <public type="string" name="connected_device_detected_confirm_button" id="0x7f12045c" />
+    <public type="string" name="connected_device_detected_input_and_output_body" id="0x7f12045d" />
+    <public type="string" name="connected_device_detected_input_body" id="0x7f12045e" />
+    <public type="string" name="connected_device_detected_option_input" id="0x7f12045f" />
+    <public type="string" name="connected_device_detected_option_input_and_output" id="0x7f120460" />
+    <public type="string" name="connected_device_detected_option_output" id="0x7f120461" />
+    <public type="string" name="connected_device_detected_output_body" id="0x7f120462" />
+    <public type="string" name="connected_device_detected_title" id="0x7f120463" />
+    <public type="string" name="connected_on_another_client" id="0x7f120464" />
+    <public type="string" name="connecting" id="0x7f120465" />
+    <public type="string" name="connecting_problems_cta" id="0x7f120466" />
+    <public type="string" name="connection_enter_code" id="0x7f120467" />
+    <public type="string" name="connection_invalid_pin" id="0x7f120468" />
+    <public type="string" name="connection_login_with" id="0x7f120469" />
+    <public type="string" name="connection_problems_body" id="0x7f12046a" />
+    <public type="string" name="connection_status_authenticating" id="0x7f12046b" />
+    <public type="string" name="connection_status_awaiting_endpoint" id="0x7f12046c" />
+    <public type="string" name="connection_status_connected" id="0x7f12046d" />
+    <public type="string" name="connection_status_connecting" id="0x7f12046e" />
+    <public type="string" name="connection_status_disconnected" id="0x7f12046f" />
+    <public type="string" name="connection_status_ice_checking" id="0x7f120470" />
+    <public type="string" name="connection_status_no_route" id="0x7f120471" />
+    <public type="string" name="connection_status_rtc_connecting" id="0x7f120472" />
+    <public type="string" name="connection_status_rtc_disconnected" id="0x7f120473" />
+    <public type="string" name="connection_status_stream_connected" id="0x7f120474" />
+    <public type="string" name="connection_status_video_connected" id="0x7f120475" />
+    <public type="string" name="connection_status_voice_connected" id="0x7f120476" />
+    <public type="string" name="connection_verified" id="0x7f120477" />
+    <public type="string" name="connections" id="0x7f120478" />
+    <public type="string" name="content_matching" id="0x7f120479" />
+    <public type="string" name="context_menu_hint" id="0x7f12047a" />
+    <public type="string" name="continue_to_webapp" id="0x7f12047b" />
+    <public type="string" name="control_volume" id="0x7f12047c" />
+    <public type="string" name="convert_emoticons" id="0x7f12047d" />
+    <public type="string" name="convert_emoticons_help" id="0x7f12047e" />
+    <public type="string" name="copied" id="0x7f12047f" />
+    <public type="string" name="copied_text" id="0x7f120480" />
+    <public type="string" name="copy" id="0x7f120481" />
+    <public type="string" name="copy_channel_topic" id="0x7f120482" />
+    <public type="string" name="copy_code" id="0x7f120483" />
+    <public type="string" name="copy_id" id="0x7f120484" />
+    <public type="string" name="copy_image_url" id="0x7f120485" />
+    <public type="string" name="copy_link" id="0x7f120486" />
+    <public type="string" name="copy_message_link" id="0x7f120487" />
+    <public type="string" name="copy_owner_id" id="0x7f120488" />
+    <public type="string" name="copy_text" id="0x7f120489" />
+    <public type="string" name="copy_username" id="0x7f12048a" />
+    <public type="string" name="country_codes" id="0x7f12048b" />
+    <public type="string" name="country_no_results" id="0x7f12048c" />
+    <public type="string" name="cozy_mode" id="0x7f12048d" />
+    <public type="string" name="crash_app_version" id="0x7f12048e" />
+    <public type="string" name="crash_bummer_man" id="0x7f12048f" />
+    <public type="string" name="crash_details" id="0x7f120490" />
+    <public type="string" name="crash_device" id="0x7f120491" />
+    <public type="string" name="crash_device_version" id="0x7f120492" />
+    <public type="string" name="crash_disclaimer" id="0x7f120493" />
+    <public type="string" name="crash_source" id="0x7f120494" />
+    <public type="string" name="crash_testers_invite" id="0x7f120495" />
+    <public type="string" name="crash_timestamp" id="0x7f120496" />
+    <public type="string" name="crash_unexpected" id="0x7f120497" />
+    <public type="string" name="create" id="0x7f120498" />
+    <public type="string" name="create_category" id="0x7f120499" />
+    <public type="string" name="create_channel" id="0x7f12049a" />
+    <public type="string" name="create_friend_dm" id="0x7f12049b" />
+    <public type="string" name="create_group_dm" id="0x7f12049c" />
+    <public type="string" name="create_instant_invite" id="0x7f12049d" />
+    <public type="string" name="create_lfg_listings_channel" id="0x7f12049e" />
+    <public type="string" name="create_link" id="0x7f12049f" />
+    <public type="string" name="create_listings" id="0x7f1204a0" />
+    <public type="string" name="create_news_channel" id="0x7f1204a1" />
+    <public type="string" name="create_or_join_modal_header" id="0x7f1204a2" />
+    <public type="string" name="create_server_button_body" id="0x7f1204a3" />
+    <public type="string" name="create_server_button_cta" id="0x7f1204a4" />
+    <public type="string" name="create_server_button_cta_mobile" id="0x7f1204a5" />
+    <public type="string" name="create_server_button_cta_mobile_desc" id="0x7f1204a6" />
+    <public type="string" name="create_server_description" id="0x7f1204a7" />
+    <public type="string" name="create_server_description_mobile" id="0x7f1204a8" />
+    <public type="string" name="create_server_guidelines" id="0x7f1204a9" />
+    <public type="string" name="create_server_title" id="0x7f1204aa" />
+    <public type="string" name="create_store_channel" id="0x7f1204ab" />
+    <public type="string" name="create_store_channel_application" id="0x7f1204ac" />
+    <public type="string" name="create_store_channel_beta_note" id="0x7f1204ad" />
+    <public type="string" name="create_store_channel_beta_title" id="0x7f1204ae" />
+    <public type="string" name="create_store_channel_branch" id="0x7f1204af" />
+    <public type="string" name="create_store_channel_no_branches" id="0x7f1204b0" />
+    <public type="string" name="create_store_channel_no_skus" id="0x7f1204b1" />
+    <public type="string" name="create_store_channel_no_skus_error" id="0x7f1204b2" />
+    <public type="string" name="create_store_channel_select_application" id="0x7f1204b3" />
+    <public type="string" name="create_store_channel_select_branch" id="0x7f1204b4" />
+    <public type="string" name="create_store_channel_select_sku" id="0x7f1204b5" />
+    <public type="string" name="create_store_channel_sku" id="0x7f1204b6" />
+    <public type="string" name="create_text_channel" id="0x7f1204b7" />
+    <public type="string" name="create_voice_channel" id="0x7f1204b8" />
+    <public type="string" name="credit_card_cvc" id="0x7f1204b9" />
+    <public type="string" name="credit_card_error_expiration" id="0x7f1204ba" />
+    <public type="string" name="credit_card_error_number" id="0x7f1204bb" />
+    <public type="string" name="credit_card_error_required" id="0x7f1204bc" />
+    <public type="string" name="credit_card_error_security_code" id="0x7f1204bd" />
+    <public type="string" name="credit_card_error_zip_code" id="0x7f1204be" />
+    <public type="string" name="credit_card_expiration_date" id="0x7f1204bf" />
+    <public type="string" name="credit_card_expiration_date_placeholder" id="0x7f1204c0" />
+    <public type="string" name="credit_card_name" id="0x7f1204c1" />
+    <public type="string" name="credit_card_name_on_card" id="0x7f1204c2" />
+    <public type="string" name="credit_card_number" id="0x7f1204c3" />
+    <public type="string" name="credit_card_security_code" id="0x7f1204c4" />
+    <public type="string" name="crop" id="0x7f1204c5" />
+    <public type="string" name="cs" id="0x7f1204c6" />
+    <public type="string" name="current_vs_prior_week" id="0x7f1204c7" />
+    <public type="string" name="currently_controlling" id="0x7f1204c8" />
+    <public type="string" name="custom_color" id="0x7f1204c9" />
+    <public type="string" name="custom_status" id="0x7f1204ca" />
+    <public type="string" name="custom_status_clear_after" id="0x7f1204cb" />
+    <public type="string" name="custom_status_clear_custom_status" id="0x7f1204cc" />
+    <public type="string" name="custom_status_clear_in_hours" id="0x7f1204cd" />
+    <public type="string" name="custom_status_clear_in_minutes" id="0x7f1204ce" />
+    <public type="string" name="custom_status_clear_tomorrow" id="0x7f1204cf" />
+    <public type="string" name="custom_status_dont_clear" id="0x7f1204d0" />
+    <public type="string" name="custom_status_edit_custom_status" id="0x7f1204d1" />
+    <public type="string" name="custom_status_edit_custom_status_placeholder" id="0x7f1204d2" />
+    <public type="string" name="custom_status_hotspot" id="0x7f1204d3" />
+    <public type="string" name="custom_status_hours" id="0x7f1204d4" />
+    <public type="string" name="custom_status_minutes" id="0x7f1204d5" />
+    <public type="string" name="custom_status_modal_body" id="0x7f1204d6" />
+    <public type="string" name="custom_status_modal_placeholder" id="0x7f1204d7" />
+    <public type="string" name="custom_status_set_custom_status" id="0x7f1204d8" />
+    <public type="string" name="custom_status_today" id="0x7f1204d9" />
+    <public type="string" name="custom_tabs_mobile_body" id="0x7f1204da" />
+    <public type="string" name="custom_tabs_mobile_header" id="0x7f1204db" />
+    <public type="string" name="cut" id="0x7f1204dc" />
+    <public type="string" name="da" id="0x7f1204dd" />
+    <public type="string" name="dark_blue" id="0x7f1204de" />
+    <public type="string" name="dark_grey" id="0x7f1204df" />
+    <public type="string" name="dark_purple" id="0x7f1204e0" />
+    <public type="string" name="dark_teal" id="0x7f1204e1" />
+    <public type="string" name="data_download_requested_status_note" id="0x7f1204e2" />
+    <public type="string" name="data_privacy_controls" id="0x7f1204e3" />
+    <public type="string" name="data_privacy_controls_basic_service_note" id="0x7f1204e4" />
+    <public type="string" name="data_privacy_controls_basic_service_title" id="0x7f1204e5" />
+    <public type="string" name="data_privacy_controls_personal_data_title" id="0x7f1204e6" />
+    <public type="string" name="data_privacy_controls_personalization_note_learn_more" id="0x7f1204e7" />
+    <public type="string" name="data_privacy_controls_personalization_title" id="0x7f1204e8" />
+    <public type="string" name="data_privacy_controls_request_data_download" id="0x7f1204e9" />
+    <public type="string" name="data_privacy_controls_request_data_failure_body" id="0x7f1204ea" />
+    <public type="string" name="data_privacy_controls_request_data_failure_title" id="0x7f1204eb" />
+    <public type="string" name="data_privacy_controls_request_data_modal_cancel" id="0x7f1204ec" />
+    <public type="string" name="data_privacy_controls_request_data_modal_confirm" id="0x7f1204ed" />
+    <public type="string" name="data_privacy_controls_request_data_modal_note" id="0x7f1204ee" />
+    <public type="string" name="data_privacy_controls_request_data_modal_success" id="0x7f1204ef" />
+    <public type="string" name="data_privacy_controls_request_data_modal_success_title" id="0x7f1204f0" />
+    <public type="string" name="data_privacy_controls_request_data_modal_title" id="0x7f1204f1" />
+    <public type="string" name="data_privacy_controls_request_data_note" id="0x7f1204f2" />
+    <public type="string" name="data_privacy_controls_request_data_success_body" id="0x7f1204f3" />
+    <public type="string" name="data_privacy_controls_request_data_success_title" id="0x7f1204f4" />
+    <public type="string" name="data_privacy_controls_request_data_tooltip" id="0x7f1204f5" />
+    <public type="string" name="data_privacy_controls_usage_statistics_note" id="0x7f1204f6" />
+    <public type="string" name="data_privacy_controls_usage_statistics_title" id="0x7f1204f7" />
+    <public type="string" name="data_privacy_rate_limit_title" id="0x7f1204f8" />
+    <public type="string" name="data_privacy_update_consents_failed" id="0x7f1204f9" />
+    <public type="string" name="date" id="0x7f1204fa" />
+    <public type="string" name="de" id="0x7f1204fb" />
+    <public type="string" name="deafen" id="0x7f1204fc" />
+    <public type="string" name="deafen_members" id="0x7f1204fd" />
+    <public type="string" name="deauthorize" id="0x7f1204fe" />
+    <public type="string" name="deauthorize_app" id="0x7f1204ff" />
+    <public type="string" name="deb" id="0x7f120500" />
+    <public type="string" name="debug" id="0x7f120501" />
+    <public type="string" name="decline" id="0x7f120502" />
+    <public type="string" name="default_app_description" id="0x7f120503" />
+    <public type="string" name="default_failure_to_perform_action_message" id="0x7f120504" />
+    <public type="string" name="default_input_placeholder" id="0x7f120505" />
+    <public type="string" name="default_web_client_id" id="0x7f120506" />
+    <public type="string" name="delete" id="0x7f120507" />
+    <public type="string" name="delete_account" id="0x7f120508" />
+    <public type="string" name="delete_account_body" id="0x7f120509" />
+    <public type="string" name="delete_account_error" id="0x7f12050a" />
+    <public type="string" name="delete_account_transfer_ownership" id="0x7f12050b" />
+    <public type="string" name="delete_account_transfer_ownership_body" id="0x7f12050c" />
+    <public type="string" name="delete_app" id="0x7f12050d" />
+    <public type="string" name="delete_app_confirm_msg" id="0x7f12050e" />
+    <public type="string" name="delete_category" id="0x7f12050f" />
+    <public type="string" name="delete_channel" id="0x7f120510" />
+    <public type="string" name="delete_channel_body" id="0x7f120511" />
+    <public type="string" name="delete_followed_news_body" id="0x7f120512" />
+    <public type="string" name="delete_message" id="0x7f120513" />
+    <public type="string" name="delete_message_body" id="0x7f120514" />
+    <public type="string" name="delete_message_context_menu_hint" id="0x7f120515" />
+    <public type="string" name="delete_message_history_option_24hr" id="0x7f120516" />
+    <public type="string" name="delete_message_history_option_7d" id="0x7f120517" />
+    <public type="string" name="delete_message_history_option_none" id="0x7f120518" />
+    <public type="string" name="delete_message_report" id="0x7f120519" />
+    <public type="string" name="delete_message_title" id="0x7f12051a" />
+    <public type="string" name="delete_role" id="0x7f12051b" />
+    <public type="string" name="delete_role_mobile" id="0x7f12051c" />
+    <public type="string" name="delete_server" id="0x7f12051d" />
+    <public type="string" name="delete_server_body" id="0x7f12051e" />
+    <public type="string" name="delete_server_enter_name" id="0x7f12051f" />
+    <public type="string" name="delete_server_incorrect_name" id="0x7f120520" />
+    <public type="string" name="delete_server_title" id="0x7f120521" />
+    <public type="string" name="description" id="0x7f120522" />
+    <public type="string" name="desktop_app" id="0x7f120523" />
+    <public type="string" name="desktop_icon_badge" id="0x7f120524" />
+    <public type="string" name="desktop_notifications_enable" id="0x7f120525" />
+    <public type="string" name="desktop_notifications_enable_body" id="0x7f120526" />
+    <public type="string" name="detect_platform_accounts" id="0x7f120527" />
+    <public type="string" name="developer_application_test_mode" id="0x7f120528" />
+    <public type="string" name="developer_application_test_mode_activate" id="0x7f120529" />
+    <public type="string" name="developer_application_test_mode_authorization_error" id="0x7f12052a" />
+    <public type="string" name="developer_application_test_mode_clear" id="0x7f12052b" />
+    <public type="string" name="developer_application_test_mode_invalid" id="0x7f12052c" />
+    <public type="string" name="developer_application_test_mode_modal_body" id="0x7f12052d" />
+    <public type="string" name="developer_application_test_mode_modal_header" id="0x7f12052e" />
+    <public type="string" name="developer_application_test_mode_note" id="0x7f12052f" />
+    <public type="string" name="developer_application_test_mode_placeholder" id="0x7f120530" />
+    <public type="string" name="developer_mode" id="0x7f120531" />
+    <public type="string" name="developer_mode_help_text" id="0x7f120532" />
+    <public type="string" name="developer_options" id="0x7f120533" />
+    <public type="string" name="developer_portal_cta" id="0x7f120534" />
+    <public type="string" name="device_no_permission" id="0x7f120535" />
+    <public type="string" name="device_settings" id="0x7f120536" />
+    <public type="string" name="direct_message" id="0x7f120537" />
+    <public type="string" name="direct_messages" id="0x7f120538" />
+    <public type="string" name="disable" id="0x7f120539" />
+    <public type="string" name="disable_account" id="0x7f12053a" />
+    <public type="string" name="disable_account_body" id="0x7f12053b" />
+    <public type="string" name="disable_email_notifications" id="0x7f12053c" />
+    <public type="string" name="disable_email_notifications_body" id="0x7f12053d" />
+    <public type="string" name="disable_email_notifications_failed" id="0x7f12053e" />
+    <public type="string" name="disable_email_notifications_failed_suggestion" id="0x7f12053f" />
+    <public type="string" name="disable_integration_title" id="0x7f120540" />
+    <public type="string" name="disable_integration_twitch_body" id="0x7f120541" />
+    <public type="string" name="disable_integration_youtube_body" id="0x7f120542" />
+    <public type="string" name="disable_notifications_description" id="0x7f120543" />
+    <public type="string" name="disable_notifications_label" id="0x7f120544" />
+    <public type="string" name="disable_sounds_description" id="0x7f120545" />
+    <public type="string" name="disable_sounds_label" id="0x7f120546" />
+    <public type="string" name="disabling_email_notifications" id="0x7f120547" />
+    <public type="string" name="discard_changes" id="0x7f120548" />
+    <public type="string" name="discard_changes_description" id="0x7f120549" />
+    <public type="string" name="disconnect" id="0x7f12054a" />
+    <public type="string" name="disconnect_account" id="0x7f12054b" />
+    <public type="string" name="disconnect_account_body" id="0x7f12054c" />
+    <public type="string" name="disconnect_account_title" id="0x7f12054d" />
+    <public type="string" name="disconnect_from_voice" id="0x7f12054e" />
+    <public type="string" name="discord" id="0x7f12054f" />
+    <public type="string" name="discord_desc_long" id="0x7f120550" />
+    <public type="string" name="discord_desc_short" id="0x7f120551" />
+    <public type="string" name="discord_gg" id="0x7f120552" />
+    <public type="string" name="discord_rich_presence" id="0x7f120553" />
+    <public type="string" name="discover" id="0x7f120554" />
+    <public type="string" name="discover_communities" id="0x7f120555" />
+    <public type="string" name="discover_friend_servers" id="0x7f120556" />
+    <public type="string" name="discover_recommended" id="0x7f120557" />
+    <public type="string" name="discovery" id="0x7f120558" />
+    <public type="string" name="dismiss" id="0x7f120559" />
+    <public type="string" name="dispatch_error_modal_body" id="0x7f12055a" />
+    <public type="string" name="dispatch_error_modal_description" id="0x7f12055b" />
+    <public type="string" name="dispatch_error_modal_error_label" id="0x7f12055c" />
+    <public type="string" name="dispatch_error_modal_header" id="0x7f12055d" />
+    <public type="string" name="dispatch_error_modal_open_ticket" id="0x7f12055e" />
+    <public type="string" name="dispatch_game_launch_failed_launch_target_not_found" id="0x7f12055f" />
+    <public type="string" name="display" id="0x7f120560" />
+    <public type="string" name="display_activity" id="0x7f120561" />
+    <public type="string" name="display_on_profile" id="0x7f120562" />
+    <public type="string" name="display_option_always" id="0x7f120563" />
+    <public type="string" name="display_option_never" id="0x7f120564" />
+    <public type="string" name="display_option_only_while_speaking" id="0x7f120565" />
+    <public type="string" name="display_silence_warning" id="0x7f120566" />
+    <public type="string" name="dm" id="0x7f120567" />
+    <public type="string" name="dm_search_instruction" id="0x7f120568" />
+    <public type="string" name="dm_search_placeholder" id="0x7f120569" />
+    <public type="string" name="dm_settings" id="0x7f12056a" />
+    <public type="string" name="dm_verification_text_blocked" id="0x7f12056b" />
+    <public type="string" name="done" id="0x7f12056c" />
+    <public type="string" name="dont_show_again" id="0x7f12056d" />
+    <public type="string" name="download" id="0x7f12056e" />
+    <public type="string" name="download_app" id="0x7f12056f" />
+    <public type="string" name="download_apps" id="0x7f120570" />
+    <public type="string" name="download_desktop_ptb_footer" id="0x7f120571" />
+    <public type="string" name="download_desktop_stable_footer" id="0x7f120572" />
+    <public type="string" name="download_desktop_title" id="0x7f120573" />
+    <public type="string" name="download_failed" id="0x7f120574" />
+    <public type="string" name="download_file_complete" id="0x7f120575" />
+    <public type="string" name="download_mobile_apps_description" id="0x7f120576" />
+    <public type="string" name="download_mobile_apps_description_with_username" id="0x7f120577" />
+    <public type="string" name="download_mobile_apps_title" id="0x7f120578" />
+    <public type="string" name="download_mobile_modal_apps_header" id="0x7f120579" />
+    <public type="string" name="download_mobile_title" id="0x7f12057a" />
+    <public type="string" name="duration_days" id="0x7f12057b" />
+    <public type="string" name="duration_hours" id="0x7f12057c" />
+    <public type="string" name="duration_hours_short" id="0x7f12057d" />
+    <public type="string" name="duration_mins" id="0x7f12057e" />
+    <public type="string" name="duration_minutes" id="0x7f12057f" />
+    <public type="string" name="duration_minutes_short" id="0x7f120580" />
+    <public type="string" name="duration_seconds" id="0x7f120581" />
+    <public type="string" name="duration_seconds_short" id="0x7f120582" />
+    <public type="string" name="early_supporter_tooltip" id="0x7f120583" />
+    <public type="string" name="echo_cancellation" id="0x7f120584" />
+    <public type="string" name="edit" id="0x7f120585" />
+    <public type="string" name="edit_category" id="0x7f120586" />
+    <public type="string" name="edit_channel" id="0x7f120587" />
+    <public type="string" name="edit_followed_news_body" id="0x7f120588" />
+    <public type="string" name="edit_message" id="0x7f120589" />
+    <public type="string" name="edit_note" id="0x7f12058a" />
+    <public type="string" name="edit_overview" id="0x7f12058b" />
+    <public type="string" name="edit_roles" id="0x7f12058c" />
+    <public type="string" name="edit_textarea_help" id="0x7f12058d" />
+    <public type="string" name="edit_user" id="0x7f12058e" />
+    <public type="string" name="edit_voice_channel_no_permission" id="0x7f12058f" />
+    <public type="string" name="editing_message" id="0x7f120590" />
+    <public type="string" name="editing_with_attachment_error" id="0x7f120591" />
+    <public type="string" name="el" id="0x7f120592" />
+    <public type="string" name="elevated_permissions_sound_body" id="0x7f120593" />
+    <public type="string" name="elevated_permissions_sound_no_sound_button" id="0x7f120594" />
+    <public type="string" name="elevated_permissions_sound_request_access_button" id="0x7f120595" />
+    <public type="string" name="elevated_permissions_sound_title" id="0x7f120596" />
+    <public type="string" name="email" id="0x7f120597" />
+    <public type="string" name="email_invalid" id="0x7f120598" />
+    <public type="string" name="email_required" id="0x7f120599" />
+    <public type="string" name="email_verification_instructions_body" id="0x7f12059a" />
+    <public type="string" name="email_verification_instructions_header" id="0x7f12059b" />
+    <public type="string" name="embed_links" id="0x7f12059c" />
+    <public type="string" name="emoji" id="0x7f12059d" />
+    <public type="string" name="emoji_category_activity" id="0x7f12059e" />
+    <public type="string" name="emoji_category_custom" id="0x7f12059f" />
+    <public type="string" name="emoji_category_flags" id="0x7f1205a0" />
+    <public type="string" name="emoji_category_food" id="0x7f1205a1" />
+    <public type="string" name="emoji_category_nature" id="0x7f1205a2" />
+    <public type="string" name="emoji_category_objects" id="0x7f1205a3" />
+    <public type="string" name="emoji_category_people" id="0x7f1205a4" />
+    <public type="string" name="emoji_category_recent" id="0x7f1205a5" />
+    <public type="string" name="emoji_category_symbols" id="0x7f1205a6" />
+    <public type="string" name="emoji_category_travel" id="0x7f1205a7" />
+    <public type="string" name="emoji_disabled_premium_tier_lost" id="0x7f1205a8" />
+    <public type="string" name="emoji_keyboard_toggle" id="0x7f1205a9" />
+    <public type="string" name="emoji_matching" id="0x7f1205aa" />
+    <public type="string" name="emoji_name" id="0x7f1205ab" />
+    <public type="string" name="emoji_section" id="0x7f1205ac" />
+    <public type="string" name="emoji_slots_available" id="0x7f1205ad" />
+    <public type="string" name="emoji_too_big" id="0x7f1205ae" />
+    <public type="string" name="en_gb" id="0x7f1205af" />
+    <public type="string" name="en_us" id="0x7f1205b0" />
+    <public type="string" name="enable" id="0x7f1205b1" />
+    <public type="string" name="enable_ingame_overlay" id="0x7f1205b2" />
+    <public type="string" name="enable_privacy_access" id="0x7f1205b3" />
+    <public type="string" name="enable_streamer_mode_description" id="0x7f1205b4" />
+    <public type="string" name="enable_streamer_mode_label" id="0x7f1205b5" />
+    <public type="string" name="enable_twitch_emoji_sync" id="0x7f1205b6" />
+    <public type="string" name="engagement_ratio" id="0x7f1205b7" />
+    <public type="string" name="enter_email_body" id="0x7f1205b8" />
+    <public type="string" name="enter_phone_description" id="0x7f1205b9" />
+    <public type="string" name="enter_phone_title" id="0x7f1205ba" />
+    <public type="string" name="enter_vanity_url" id="0x7f1205bb" />
+    <public type="string" name="errors_action_to_take" id="0x7f1205bc" />
+    <public type="string" name="errors_activity_feed_crash" id="0x7f1205bd" />
+    <public type="string" name="errors_reload" id="0x7f1205be" />
+    <public type="string" name="errors_restart_app" id="0x7f1205bf" />
+    <public type="string" name="errors_store_crash" id="0x7f1205c0" />
+    <public type="string" name="errors_unexpected_crash" id="0x7f1205c1" />
+    <public type="string" name="es_es" id="0x7f1205c2" />
+    <public type="string" name="everyone_popout_body" id="0x7f1205c3" />
+    <public type="string" name="everyone_popout_enter" id="0x7f1205c4" />
+    <public type="string" name="everyone_popout_esc" id="0x7f1205c5" />
+    <public type="string" name="everyone_popout_footer" id="0x7f1205c6" />
+    <public type="string" name="everyone_popout_send_now" id="0x7f1205c7" />
+    <public type="string" name="exit_full_screen" id="0x7f1205c8" />
+    <public type="string" name="experiment_mobile_only_user_button_cancel" id="0x7f1205c9" />
+    <public type="string" name="experiment_mobile_only_user_button_go" id="0x7f1205ca" />
+    <public type="string" name="experiment_mobile_only_user_email_confirmation" id="0x7f1205cb" />
+    <public type="string" name="experiment_mobile_only_user_header" id="0x7f1205cc" />
+    <public type="string" name="experiment_mobile_only_user_text1" id="0x7f1205cd" />
+    <public type="string" name="experiment_mobile_only_user_text2" id="0x7f1205ce" />
+    <public type="string" name="experimental_encoders" id="0x7f1205cf" />
+    <public type="string" name="expire_after" id="0x7f1205d0" />
+    <public type="string" name="expires_in" id="0x7f1205d1" />
+    <public type="string" name="explicit_content_filter_disabled" id="0x7f1205d2" />
+    <public type="string" name="explicit_content_filter_disabled_description" id="0x7f1205d3" />
+    <public type="string" name="explicit_content_filter_high" id="0x7f1205d4" />
+    <public type="string" name="explicit_content_filter_high_description" id="0x7f1205d5" />
+    <public type="string" name="explicit_content_filter_medium" id="0x7f1205d6" />
+    <public type="string" name="explicit_content_filter_medium_description" id="0x7f1205d7" />
+    <public type="string" name="fab_transformation_scrim_behavior" id="0x7f1205d8" />
+    <public type="string" name="fab_transformation_sheet_behavior" id="0x7f1205d9" />
+    <public type="string" name="facebook" id="0x7f1205da" />
+    <public type="string" name="failed" id="0x7f1205db" />
+    <public type="string" name="fcm_fallback_notification_channel_label" id="0x7f1205dc" />
+    <public type="string" name="fi" id="0x7f1205dd" />
+    <public type="string" name="file_rate_kb" id="0x7f1205de" />
+    <public type="string" name="file_rate_mb" id="0x7f1205df" />
+    <public type="string" name="file_size_gb" id="0x7f1205e0" />
+    <public type="string" name="file_size_mb" id="0x7f1205e1" />
+    <public type="string" name="file_upload_limit_premium_tier_1" id="0x7f1205e2" />
+    <public type="string" name="file_upload_limit_premium_tier_2" id="0x7f1205e3" />
+    <public type="string" name="file_upload_limit_standard" id="0x7f1205e4" />
+    <public type="string" name="files_permission_reason_msg" id="0x7f1205e5" />
+    <public type="string" name="filter" id="0x7f1205e6" />
+    <public type="string" name="filter_mentions" id="0x7f1205e7" />
+    <public type="string" name="filter_options" id="0x7f1205e8" />
+    <public type="string" name="firebase_database_url" id="0x7f1205e9" />
+    <public type="string" name="flash_auto" id="0x7f1205ea" />
+    <public type="string" name="flash_off" id="0x7f1205eb" />
+    <public type="string" name="flash_on" id="0x7f1205ec" />
+    <public type="string" name="focus_participant" id="0x7f1205ed" />
+    <public type="string" name="follow" id="0x7f1205ee" />
+    <public type="string" name="follow_modal_body" id="0x7f1205ef" />
+    <public type="string" name="follow_modal_fail" id="0x7f1205f0" />
+    <public type="string" name="follow_modal_hint" id="0x7f1205f1" />
+    <public type="string" name="follow_modal_hint_no_perms" id="0x7f1205f2" />
+    <public type="string" name="follow_modal_title" id="0x7f1205f3" />
+    <public type="string" name="follow_modal_too_many_webhooks" id="0x7f1205f4" />
+    <public type="string" name="follow_modal_warning" id="0x7f1205f5" />
+    <public type="string" name="follow_news_chat_input_message" id="0x7f1205f6" />
+    <public type="string" name="follow_news_chat_input_subtitle" id="0x7f1205f7" />
+    <public type="string" name="follow_success_modal_body" id="0x7f1205f8" />
+    <public type="string" name="follow_success_modal_header_01" id="0x7f1205f9" />
+    <public type="string" name="follow_success_modal_header_02" id="0x7f1205fa" />
+    <public type="string" name="follow_success_modal_header_03" id="0x7f1205fb" />
+    <public type="string" name="follow_success_modal_header_04" id="0x7f1205fc" />
+    <public type="string" name="follow_success_modal_header_05" id="0x7f1205fd" />
+    <public type="string" name="follow_success_modal_header_06" id="0x7f1205fe" />
+    <public type="string" name="follow_success_modal_header_07" id="0x7f1205ff" />
+    <public type="string" name="follow_success_modal_header_08" id="0x7f120600" />
+    <public type="string" name="follow_success_modal_header_09" id="0x7f120601" />
+    <public type="string" name="follow_success_modal_header_10" id="0x7f120602" />
+    <public type="string" name="follower_analytics" id="0x7f120603" />
+    <public type="string" name="follower_analytics_header" id="0x7f120604" />
+    <public type="string" name="force_sync" id="0x7f120605" />
+    <public type="string" name="forgot_password" id="0x7f120606" />
+    <public type="string" name="forgot_password_body" id="0x7f120607" />
+    <public type="string" name="form_checkbox_debug_logging" id="0x7f120608" />
+    <public type="string" name="form_checkbox_qos" id="0x7f120609" />
+    <public type="string" name="form_description_audio_mode_android_call" id="0x7f12060a" />
+    <public type="string" name="form_description_audio_mode_android_communication" id="0x7f12060b" />
+    <public type="string" name="form_description_push_afk_timeout" id="0x7f12060c" />
+    <public type="string" name="form_description_tts" id="0x7f12060d" />
+    <public type="string" name="form_error_generic" id="0x7f12060e" />
+    <public type="string" name="form_help_afk_channel" id="0x7f12060f" />
+    <public type="string" name="form_help_attenuation" id="0x7f120610" />
+    <public type="string" name="form_help_automatic_vad" id="0x7f120611" />
+    <public type="string" name="form_help_bitrate" id="0x7f120612" />
+    <public type="string" name="form_help_certified_voice_processing" id="0x7f120613" />
+    <public type="string" name="form_help_channel_permissions" id="0x7f120614" />
+    <public type="string" name="form_help_custom_code" id="0x7f120615" />
+    <public type="string" name="form_help_debug_logging" id="0x7f120616" />
+    <public type="string" name="form_help_default_notification_settings" id="0x7f120617" />
+    <public type="string" name="form_help_default_notification_settings_mobile" id="0x7f120618" />
+    <public type="string" name="form_help_enable_discoverable" id="0x7f120619" />
+    <public type="string" name="form_help_enable_featurable" id="0x7f12061a" />
+    <public type="string" name="form_help_explicit_content_filter" id="0x7f12061b" />
+    <public type="string" name="form_help_instant_invite_channel" id="0x7f12061c" />
+    <public type="string" name="form_help_last_seen" id="0x7f12061d" />
+    <public type="string" name="form_help_legacy_subsystem" id="0x7f12061e" />
+    <public type="string" name="form_help_news" id="0x7f12061f" />
+    <public type="string" name="form_help_nsfw" id="0x7f120620" />
+    <public type="string" name="form_help_open_h264" id="0x7f120621" />
+    <public type="string" name="form_help_premade_widget" id="0x7f120622" />
+    <public type="string" name="form_help_qos" id="0x7f120623" />
+    <public type="string" name="form_help_server_banner" id="0x7f120624" />
+    <public type="string" name="form_help_server_description" id="0x7f120625" />
+    <public type="string" name="form_help_server_language" id="0x7f120626" />
+    <public type="string" name="form_help_slowmode" id="0x7f120627" />
+    <public type="string" name="form_help_system_channel" id="0x7f120628" />
+    <public type="string" name="form_help_system_channel_join_messages" id="0x7f120629" />
+    <public type="string" name="form_help_system_channel_premium_subscription_messages" id="0x7f12062a" />
+    <public type="string" name="form_help_temporary" id="0x7f12062b" />
+    <public type="string" name="form_help_user_limit" id="0x7f12062c" />
+    <public type="string" name="form_help_verification_level" id="0x7f12062d" />
+    <public type="string" name="form_label_afk_channel" id="0x7f12062e" />
+    <public type="string" name="form_label_afk_timeout" id="0x7f12062f" />
+    <public type="string" name="form_label_all" id="0x7f120630" />
+    <public type="string" name="form_label_all_messages" id="0x7f120631" />
+    <public type="string" name="form_label_android_opensl" id="0x7f120632" />
+    <public type="string" name="form_label_android_opensl_default" id="0x7f120633" />
+    <public type="string" name="form_label_android_opensl_default_desc" id="0x7f120634" />
+    <public type="string" name="form_label_android_opensl_desc" id="0x7f120635" />
+    <public type="string" name="form_label_android_opensl_force_disabled" id="0x7f120636" />
+    <public type="string" name="form_label_android_opensl_force_disabled_desc" id="0x7f120637" />
+    <public type="string" name="form_label_android_opensl_force_enabled" id="0x7f120638" />
+    <public type="string" name="form_label_android_opensl_force_enabled_desc" id="0x7f120639" />
+    <public type="string" name="form_label_attenuation" id="0x7f12063a" />
+    <public type="string" name="form_label_audio_mode_android" id="0x7f12063b" />
+    <public type="string" name="form_label_audio_mode_android_call" id="0x7f12063c" />
+    <public type="string" name="form_label_audio_mode_android_communication" id="0x7f12063d" />
+    <public type="string" name="form_label_automatic_vad" id="0x7f12063e" />
+    <public type="string" name="form_label_automatic_vad_mobile" id="0x7f12063f" />
+    <public type="string" name="form_label_avatar_size" id="0x7f120640" />
+    <public type="string" name="form_label_bitrate" id="0x7f120641" />
+    <public type="string" name="form_label_category_permissions" id="0x7f120642" />
+    <public type="string" name="form_label_channel_name" id="0x7f120643" />
+    <public type="string" name="form_label_channel_notifcation_settings" id="0x7f120644" />
+    <public type="string" name="form_label_channel_permissions" id="0x7f120645" />
+    <public type="string" name="form_label_channel_topic" id="0x7f120646" />
+    <public type="string" name="form_label_channel_voice_permissions" id="0x7f120647" />
+    <public type="string" name="form_label_current_password" id="0x7f120648" />
+    <public type="string" name="form_label_custom_code" id="0x7f120649" />
+    <public type="string" name="form_label_custom_twitch_emoticon" id="0x7f12064a" />
+    <public type="string" name="form_label_debug_logs" id="0x7f12064b" />
+    <public type="string" name="form_label_default_notification_settings" id="0x7f12064c" />
+    <public type="string" name="form_label_delete_message_history" id="0x7f12064d" />
+    <public type="string" name="form_label_desktop_notifications" id="0x7f12064e" />
+    <public type="string" name="form_label_desktop_only" id="0x7f12064f" />
+    <public type="string" name="form_label_disabled_for_everyone" id="0x7f120650" />
+    <public type="string" name="form_label_discovery_settings" id="0x7f120651" />
+    <public type="string" name="form_label_display_names" id="0x7f120652" />
+    <public type="string" name="form_label_display_users" id="0x7f120653" />
+    <public type="string" name="form_label_email" id="0x7f120654" />
+    <public type="string" name="form_label_enable_widget" id="0x7f120655" />
+    <public type="string" name="form_label_expire_grace_period" id="0x7f120656" />
+    <public type="string" name="form_label_explicit_content_filter" id="0x7f120657" />
+    <public type="string" name="form_label_hoist_description" id="0x7f120658" />
+    <public type="string" name="form_label_input" id="0x7f120659" />
+    <public type="string" name="form_label_input_device" id="0x7f12065a" />
+    <public type="string" name="form_label_input_mode" id="0x7f12065b" />
+    <public type="string" name="form_label_input_sensitivty" id="0x7f12065c" />
+    <public type="string" name="form_label_input_volume" id="0x7f12065d" />
+    <public type="string" name="form_label_instant_invite" id="0x7f12065e" />
+    <public type="string" name="form_label_instant_invite_channel" id="0x7f12065f" />
+    <public type="string" name="form_label_json_api" id="0x7f120660" />
+    <public type="string" name="form_label_last_seen" id="0x7f120661" />
+    <public type="string" name="form_label_local_mute" id="0x7f120662" />
+    <public type="string" name="form_label_max_age" id="0x7f120663" />
+    <public type="string" name="form_label_max_uses" id="0x7f120664" />
+    <public type="string" name="form_label_member_add" id="0x7f120665" />
+    <public type="string" name="form_label_membership_expire_behavior" id="0x7f120666" />
+    <public type="string" name="form_label_mentionable" id="0x7f120667" />
+    <public type="string" name="form_label_mentions" id="0x7f120668" />
+    <public type="string" name="form_label_mobile_channel_override_guild_message_notification" id="0x7f120669" />
+    <public type="string" name="form_label_mobile_channel_override_guild_muted" id="0x7f12066a" />
+    <public type="string" name="form_label_mobile_channel_override_mute" id="0x7f12066b" />
+    <public type="string" name="form_label_mobile_notifications_behavior" id="0x7f12066c" />
+    <public type="string" name="form_label_mobile_notifications_blink" id="0x7f12066d" />
+    <public type="string" name="form_label_mobile_notifications_call_desc" id="0x7f12066e" />
+    <public type="string" name="form_label_mobile_notifications_inapp_desc" id="0x7f12066f" />
+    <public type="string" name="form_label_mobile_notifications_inapp_label" id="0x7f120670" />
+    <public type="string" name="form_label_mobile_notifications_label" id="0x7f120671" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump" id="0x7f120672" />
+    <public type="string" name="form_label_mobile_notifications_os_control_jump_help" id="0x7f120673" />
+    <public type="string" name="form_label_mobile_notifications_sound_disable" id="0x7f120674" />
+    <public type="string" name="form_label_mobile_notifications_sound_message" id="0x7f120675" />
+    <public type="string" name="form_label_mobile_notifications_stream_desc" id="0x7f120676" />
+    <public type="string" name="form_label_mobile_notifications_system_desc" id="0x7f120677" />
+    <public type="string" name="form_label_mobile_notifications_system_hint" id="0x7f120678" />
+    <public type="string" name="form_label_mobile_notifications_system_label" id="0x7f120679" />
+    <public type="string" name="form_label_mobile_notifications_user_label" id="0x7f12067a" />
+    <public type="string" name="form_label_mobile_notifications_vibrations" id="0x7f12067b" />
+    <public type="string" name="form_label_mobile_notifications_wake_device" id="0x7f12067c" />
+    <public type="string" name="form_label_mobile_push_notifications" id="0x7f12067d" />
+    <public type="string" name="form_label_mobile_user_notifications_hint" id="0x7f12067e" />
+    <public type="string" name="form_label_mobile_user_notifications_label" id="0x7f12067f" />
+    <public type="string" name="form_label_mute_server" id="0x7f120680" />
+    <public type="string" name="form_label_mute_server_description" id="0x7f120681" />
+    <public type="string" name="form_label_muted" id="0x7f120682" />
+    <public type="string" name="form_label_new_password" id="0x7f120683" />
+    <public type="string" name="form_label_new_user" id="0x7f120684" />
+    <public type="string" name="form_label_news_channel" id="0x7f120685" />
+    <public type="string" name="form_label_nothing" id="0x7f120686" />
+    <public type="string" name="form_label_notification_frequency" id="0x7f120687" />
+    <public type="string" name="form_label_notification_position" id="0x7f120688" />
+    <public type="string" name="form_label_nsfw" id="0x7f120689" />
+    <public type="string" name="form_label_nsfw_channel" id="0x7f12068a" />
+    <public type="string" name="form_label_off" id="0x7f12068b" />
+    <public type="string" name="form_label_only_mentions" id="0x7f12068c" />
+    <public type="string" name="form_label_output" id="0x7f12068d" />
+    <public type="string" name="form_label_output_device" id="0x7f12068e" />
+    <public type="string" name="form_label_output_volume" id="0x7f12068f" />
+    <public type="string" name="form_label_overlay_chat_opacity" id="0x7f120690" />
+    <public type="string" name="form_label_overlay_text_chat_notifications" id="0x7f120691" />
+    <public type="string" name="form_label_password" id="0x7f120692" />
+    <public type="string" name="form_label_phone_number" id="0x7f120693" />
+    <public type="string" name="form_label_premade_widget" id="0x7f120694" />
+    <public type="string" name="form_label_push_afk_timeout" id="0x7f120695" />
+    <public type="string" name="form_label_qos" id="0x7f120696" />
+    <public type="string" name="form_label_reason_ban" id="0x7f120697" />
+    <public type="string" name="form_label_reason_kick" id="0x7f120698" />
+    <public type="string" name="form_label_report_reason" id="0x7f120699" />
+    <public type="string" name="form_label_role_add" id="0x7f12069a" />
+    <public type="string" name="form_label_role_color" id="0x7f12069b" />
+    <public type="string" name="form_label_role_enter_name" id="0x7f12069c" />
+    <public type="string" name="form_label_role_name" id="0x7f12069d" />
+    <public type="string" name="form_label_role_settings" id="0x7f12069e" />
+    <public type="string" name="form_label_roles_pro_tip" id="0x7f12069f" />
+    <public type="string" name="form_label_roles_pro_tip_description" id="0x7f1206a0" />
+    <public type="string" name="form_label_select_channel" id="0x7f1206a1" />
+    <public type="string" name="form_label_send_to" id="0x7f1206a2" />
+    <public type="string" name="form_label_sensitivty" id="0x7f1206a3" />
+    <public type="string" name="form_label_server_banner" id="0x7f1206a4" />
+    <public type="string" name="form_label_server_description" id="0x7f1206a5" />
+    <public type="string" name="form_label_server_id" id="0x7f1206a6" />
+    <public type="string" name="form_label_server_language" id="0x7f1206a7" />
+    <public type="string" name="form_label_server_name" id="0x7f1206a8" />
+    <public type="string" name="form_label_server_notification_settings" id="0x7f1206a9" />
+    <public type="string" name="form_label_server_region" id="0x7f1206aa" />
+    <public type="string" name="form_label_server_settings" id="0x7f1206ab" />
+    <public type="string" name="form_label_shortcut" id="0x7f1206ac" />
+    <public type="string" name="form_label_slowmode" id="0x7f1206ad" />
+    <public type="string" name="form_label_slowmode_cooldown" id="0x7f1206ae" />
+    <public type="string" name="form_label_slowmode_off" id="0x7f1206af" />
+    <public type="string" name="form_label_stream_volume" id="0x7f1206b0" />
+    <public type="string" name="form_label_sub_expire_behavior" id="0x7f1206b1" />
+    <public type="string" name="form_label_subsystem" id="0x7f1206b2" />
+    <public type="string" name="form_label_suppress_everyone" id="0x7f1206b3" />
+    <public type="string" name="form_label_synced_members" id="0x7f1206b4" />
+    <public type="string" name="form_label_synced_role" id="0x7f1206b5" />
+    <public type="string" name="form_label_synced_subs" id="0x7f1206b6" />
+    <public type="string" name="form_label_system_channel" id="0x7f1206b7" />
+    <public type="string" name="form_label_system_channel_settings" id="0x7f1206b8" />
+    <public type="string" name="form_label_temporary" id="0x7f1206b9" />
+    <public type="string" name="form_label_test_microphone" id="0x7f1206ba" />
+    <public type="string" name="form_label_tts" id="0x7f1206bb" />
+    <public type="string" name="form_label_tts_notifications" id="0x7f1206bc" />
+    <public type="string" name="form_label_user_limit" id="0x7f1206bd" />
+    <public type="string" name="form_label_username" id="0x7f1206be" />
+    <public type="string" name="form_label_username_mobile" id="0x7f1206bf" />
+    <public type="string" name="form_label_verification_level" id="0x7f1206c0" />
+    <public type="string" name="form_label_video_device" id="0x7f1206c1" />
+    <public type="string" name="form_label_video_preview" id="0x7f1206c2" />
+    <public type="string" name="form_label_voice_diagnostics" id="0x7f1206c3" />
+    <public type="string" name="form_label_voice_processing" id="0x7f1206c4" />
+    <public type="string" name="form_label_volume" id="0x7f1206c5" />
+    <public type="string" name="form_missing_required_fields" id="0x7f1206c6" />
+    <public type="string" name="form_placeholder_reason" id="0x7f1206c7" />
+    <public type="string" name="form_placeholder_server_name" id="0x7f1206c8" />
+    <public type="string" name="form_placeholder_username" id="0x7f1206c9" />
+    <public type="string" name="form_report_help_text" id="0x7f1206ca" />
+    <public type="string" name="form_warning_input_sensitivty" id="0x7f1206cb" />
+    <public type="string" name="form_warning_video_preview" id="0x7f1206cc" />
+    <public type="string" name="fr" id="0x7f1206cd" />
+    <public type="string" name="friend_has_been_deleted" id="0x7f1206ce" />
+    <public type="string" name="friend_permitted_source" id="0x7f1206cf" />
+    <public type="string" name="friend_permitted_source_all" id="0x7f1206d0" />
+    <public type="string" name="friend_permitted_source_mutual_friends" id="0x7f1206d1" />
+    <public type="string" name="friend_permitted_source_mutual_guilds" id="0x7f1206d2" />
+    <public type="string" name="friend_request_accept" id="0x7f1206d3" />
+    <public type="string" name="friend_request_cancel" id="0x7f1206d4" />
+    <public type="string" name="friend_request_cancelled" id="0x7f1206d5" />
+    <public type="string" name="friend_request_ignore" id="0x7f1206d6" />
+    <public type="string" name="friend_request_ignored" id="0x7f1206d7" />
+    <public type="string" name="friend_request_rate_limited_body" id="0x7f1206d8" />
+    <public type="string" name="friend_request_rate_limited_button" id="0x7f1206d9" />
+    <public type="string" name="friend_request_rate_limited_header" id="0x7f1206da" />
+    <public type="string" name="friend_request_requires_email_validation_body" id="0x7f1206db" />
+    <public type="string" name="friend_request_requires_email_validation_button" id="0x7f1206dc" />
+    <public type="string" name="friend_request_requires_email_validation_header" id="0x7f1206dd" />
+    <public type="string" name="friend_request_sent" id="0x7f1206de" />
+    <public type="string" name="friends" id="0x7f1206df" />
+    <public type="string" name="friends_column_name" id="0x7f1206e0" />
+    <public type="string" name="friends_column_status" id="0x7f1206e1" />
+    <public type="string" name="friends_empty_state_all" id="0x7f1206e2" />
+    <public type="string" name="friends_empty_state_all_body" id="0x7f1206e3" />
+    <public type="string" name="friends_empty_state_all_cta" id="0x7f1206e4" />
+    <public type="string" name="friends_empty_state_all_header" id="0x7f1206e5" />
+    <public type="string" name="friends_empty_state_blocked" id="0x7f1206e6" />
+    <public type="string" name="friends_empty_state_copy" id="0x7f1206e7" />
+    <public type="string" name="friends_empty_state_online" id="0x7f1206e8" />
+    <public type="string" name="friends_empty_state_pending" id="0x7f1206e9" />
+    <public type="string" name="friends_offline_header" id="0x7f1206ea" />
+    <public type="string" name="friends_online" id="0x7f1206eb" />
+    <public type="string" name="friends_online_header" id="0x7f1206ec" />
+    <public type="string" name="friends_pending_request_expand" id="0x7f1206ed" />
+    <public type="string" name="friends_pending_request_expand_collapse" id="0x7f1206ee" />
+    <public type="string" name="friends_pending_request_header" id="0x7f1206ef" />
+    <public type="string" name="friends_request_status_incoming" id="0x7f1206f0" />
+    <public type="string" name="friends_request_status_outgoing" id="0x7f1206f1" />
+    <public type="string" name="friends_row_action_button_accessibility_label_accept" id="0x7f1206f2" />
+    <public type="string" name="friends_row_action_button_accessibility_label_call" id="0x7f1206f3" />
+    <public type="string" name="friends_row_action_button_accessibility_label_decline" id="0x7f1206f4" />
+    <public type="string" name="friends_row_action_button_accessibility_label_message" id="0x7f1206f5" />
+    <public type="string" name="friends_section_add_friend" id="0x7f1206f6" />
+    <public type="string" name="friends_section_all" id="0x7f1206f7" />
+    <public type="string" name="friends_section_online" id="0x7f1206f8" />
+    <public type="string" name="friends_section_pending" id="0x7f1206f9" />
+    <public type="string" name="friends_share" id="0x7f1206fa" />
+    <public type="string" name="friends_share_sheet_scanning_text_bottom" id="0x7f1206fb" />
+    <public type="string" name="friends_share_sheet_scanning_text_top" id="0x7f1206fc" />
+    <public type="string" name="friends_share_tabbar_title" id="0x7f1206fd" />
+    <public type="string" name="full" id="0x7f1206fe" />
+    <public type="string" name="full_screen" id="0x7f1206ff" />
+    <public type="string" name="game_action_button_add_to_library" id="0x7f120700" />
+    <public type="string" name="game_action_button_cannot_install" id="0x7f120701" />
+    <public type="string" name="game_action_button_downloading" id="0x7f120702" />
+    <public type="string" name="game_action_button_game_not_detected" id="0x7f120703" />
+    <public type="string" name="game_action_button_install" id="0x7f120704" />
+    <public type="string" name="game_action_button_locate" id="0x7f120705" />
+    <public type="string" name="game_action_button_login_to_buy" id="0x7f120706" />
+    <public type="string" name="game_action_button_now_playing" id="0x7f120707" />
+    <public type="string" name="game_action_button_paused" id="0x7f120708" />
+    <public type="string" name="game_action_button_play" id="0x7f120709" />
+    <public type="string" name="game_action_button_play_disabled_desktop_app" id="0x7f12070a" />
+    <public type="string" name="game_action_button_preorder_wait" id="0x7f12070b" />
+    <public type="string" name="game_action_button_preorder_wait_tooltip" id="0x7f12070c" />
+    <public type="string" name="game_action_button_queue" id="0x7f12070d" />
+    <public type="string" name="game_action_button_queued" id="0x7f12070e" />
+    <public type="string" name="game_action_button_restricted_in_region" id="0x7f12070f" />
+    <public type="string" name="game_action_button_unavailable" id="0x7f120710" />
+    <public type="string" name="game_action_button_unavailable_tooltip" id="0x7f120711" />
+    <public type="string" name="game_action_button_unavailable_tooltip_plural" id="0x7f120712" />
+    <public type="string" name="game_action_button_uninstalling_1" id="0x7f120713" />
+    <public type="string" name="game_action_button_uninstalling_10" id="0x7f120714" />
+    <public type="string" name="game_action_button_uninstalling_2" id="0x7f120715" />
+    <public type="string" name="game_action_button_uninstalling_3" id="0x7f120716" />
+    <public type="string" name="game_action_button_uninstalling_4" id="0x7f120717" />
+    <public type="string" name="game_action_button_uninstalling_5" id="0x7f120718" />
+    <public type="string" name="game_action_button_uninstalling_6" id="0x7f120719" />
+    <public type="string" name="game_action_button_uninstalling_7" id="0x7f12071a" />
+    <public type="string" name="game_action_button_uninstalling_8" id="0x7f12071b" />
+    <public type="string" name="game_action_button_uninstalling_9" id="0x7f12071c" />
+    <public type="string" name="game_action_button_update" id="0x7f12071d" />
+    <public type="string" name="game_action_button_view_in_store" id="0x7f12071e" />
+    <public type="string" name="game_activity" id="0x7f12071f" />
+    <public type="string" name="game_activity_notifications" id="0x7f120720" />
+    <public type="string" name="game_detected" id="0x7f120721" />
+    <public type="string" name="game_detection_foreground_android" id="0x7f120722" />
+    <public type="string" name="game_detection_foreground_info_android" id="0x7f120723" />
+    <public type="string" name="game_detection_modal_info_android" id="0x7f120724" />
+    <public type="string" name="game_detection_open_settings" id="0x7f120725" />
+    <public type="string" name="game_detection_service" id="0x7f120726" />
+    <public type="string" name="game_feed_activity_action_play" id="0x7f120727" />
+    <public type="string" name="game_feed_activity_playing_xbox" id="0x7f120728" />
+    <public type="string" name="game_feed_activity_recently_played" id="0x7f120729" />
+    <public type="string" name="game_feed_activity_streaming_twitch" id="0x7f12072a" />
+    <public type="string" name="game_feed_current_header_title" id="0x7f12072b" />
+    <public type="string" name="game_feed_settings_visibility" id="0x7f12072c" />
+    <public type="string" name="game_feed_unknown_player" id="0x7f12072d" />
+    <public type="string" name="game_feed_user_played_days_ago" id="0x7f12072e" />
+    <public type="string" name="game_feed_user_played_hours_ago" id="0x7f12072f" />
+    <public type="string" name="game_feed_user_played_minutes_ago" id="0x7f120730" />
+    <public type="string" name="game_feed_user_played_months_ago" id="0x7f120731" />
+    <public type="string" name="game_feed_user_played_weeks_ago" id="0x7f120732" />
+    <public type="string" name="game_feed_user_played_years_ago" id="0x7f120733" />
+    <public type="string" name="game_feed_user_playing_for_days" id="0x7f120734" />
+    <public type="string" name="game_feed_user_playing_for_hours" id="0x7f120735" />
+    <public type="string" name="game_feed_user_playing_for_minutes" id="0x7f120736" />
+    <public type="string" name="game_feed_user_playing_just_ended" id="0x7f120737" />
+    <public type="string" name="game_feed_user_playing_just_started" id="0x7f120738" />
+    <public type="string" name="game_launch_failed_launch_target_not_found" id="0x7f120739" />
+    <public type="string" name="game_library" id="0x7f12073a" />
+    <public type="string" name="game_library_last_played_days" id="0x7f12073b" />
+    <public type="string" name="game_library_last_played_hours" id="0x7f12073c" />
+    <public type="string" name="game_library_last_played_just_now" id="0x7f12073d" />
+    <public type="string" name="game_library_last_played_minutes" id="0x7f12073e" />
+    <public type="string" name="game_library_last_played_months" id="0x7f12073f" />
+    <public type="string" name="game_library_last_played_none" id="0x7f120740" />
+    <public type="string" name="game_library_last_played_playing_now" id="0x7f120741" />
+    <public type="string" name="game_library_last_played_weeks" id="0x7f120742" />
+    <public type="string" name="game_library_last_played_years" id="0x7f120743" />
+    <public type="string" name="game_library_list_header_last_played" id="0x7f120744" />
+    <public type="string" name="game_library_list_header_name" id="0x7f120745" />
+    <public type="string" name="game_library_list_header_platform" id="0x7f120746" />
+    <public type="string" name="game_library_new" id="0x7f120747" />
+    <public type="string" name="game_library_not_applicable" id="0x7f120748" />
+    <public type="string" name="game_library_notification_game_installed_body" id="0x7f120749" />
+    <public type="string" name="game_library_notification_game_installed_title" id="0x7f12074a" />
+    <public type="string" name="game_library_overlay_disabled_tooltip" id="0x7f12074b" />
+    <public type="string" name="game_library_private_tooltip" id="0x7f12074c" />
+    <public type="string" name="game_library_time_played_hours" id="0x7f12074d" />
+    <public type="string" name="game_library_time_played_minutes" id="0x7f12074e" />
+    <public type="string" name="game_library_time_played_none" id="0x7f12074f" />
+    <public type="string" name="game_library_time_played_seconds" id="0x7f120750" />
+    <public type="string" name="game_library_updates_action_move_up" id="0x7f120751" />
+    <public type="string" name="game_library_updates_action_pause" id="0x7f120752" />
+    <public type="string" name="game_library_updates_action_remove" id="0x7f120753" />
+    <public type="string" name="game_library_updates_action_resume" id="0x7f120754" />
+    <public type="string" name="game_library_updates_header_disk" id="0x7f120755" />
+    <public type="string" name="game_library_updates_header_network" id="0x7f120756" />
+    <public type="string" name="game_library_updates_installing" id="0x7f120757" />
+    <public type="string" name="game_library_updates_installing_hours" id="0x7f120758" />
+    <public type="string" name="game_library_updates_installing_minutes" id="0x7f120759" />
+    <public type="string" name="game_library_updates_installing_seconds" id="0x7f12075a" />
+    <public type="string" name="game_library_updates_progress_allocating_disk" id="0x7f12075b" />
+    <public type="string" name="game_library_updates_progress_downloading_text_installing" id="0x7f12075c" />
+    <public type="string" name="game_library_updates_progress_downloading_text_patching" id="0x7f12075d" />
+    <public type="string" name="game_library_updates_progress_finalizing" id="0x7f12075e" />
+    <public type="string" name="game_library_updates_progress_finished" id="0x7f12075f" />
+    <public type="string" name="game_library_updates_progress_paused" id="0x7f120760" />
+    <public type="string" name="game_library_updates_progress_paused_no_transition" id="0x7f120761" />
+    <public type="string" name="game_library_updates_progress_pausing" id="0x7f120762" />
+    <public type="string" name="game_library_updates_progress_planning" id="0x7f120763" />
+    <public type="string" name="game_library_updates_progress_post_install_scripts" id="0x7f120764" />
+    <public type="string" name="game_library_updates_progress_queued" id="0x7f120765" />
+    <public type="string" name="game_library_updates_progress_queued_no_transition" id="0x7f120766" />
+    <public type="string" name="game_library_updates_progress_repairing" id="0x7f120767" />
+    <public type="string" name="game_library_updates_progress_verifying" id="0x7f120768" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another" id="0x7f120769" />
+    <public type="string" name="game_library_updates_progress_waiting_for_another_no_transition" id="0x7f12076a" />
+    <public type="string" name="game_library_updates_updating" id="0x7f12076b" />
+    <public type="string" name="game_library_updates_updating_updating_hours" id="0x7f12076c" />
+    <public type="string" name="game_library_updates_updating_updating_minutes" id="0x7f12076d" />
+    <public type="string" name="game_library_updates_updating_updating_seconds" id="0x7f12076e" />
+    <public type="string" name="game_popout_follow" id="0x7f12076f" />
+    <public type="string" name="game_popout_go_to_server" id="0x7f120770" />
+    <public type="string" name="game_popout_nitro_upsell" id="0x7f120771" />
+    <public type="string" name="game_popout_no_recent_players" id="0x7f120772" />
+    <public type="string" name="game_popout_online_in_server" id="0x7f120773" />
+    <public type="string" name="game_popout_unfollow" id="0x7f120774" />
+    <public type="string" name="game_popout_view_server" id="0x7f120775" />
+    <public type="string" name="games" id="0x7f120776" />
+    <public type="string" name="gcm_defaultSenderId" id="0x7f120777" />
+    <public type="string" name="general_permissions" id="0x7f120778" />
+    <public type="string" name="generate_a_new_link" id="0x7f120779" />
+    <public type="string" name="get_started" id="0x7f12077a" />
+    <public type="string" name="gif" id="0x7f12077b" />
+    <public type="string" name="gif_auto_play_label" id="0x7f12077c" />
+    <public type="string" name="gif_auto_play_label_mobile" id="0x7f12077d" />
+    <public type="string" name="gif_button_label" id="0x7f12077e" />
+    <public type="string" name="gif_picker_back_to_top" id="0x7f12077f" />
+    <public type="string" name="gif_picker_favorites" id="0x7f120780" />
+    <public type="string" name="gif_picker_related_search" id="0x7f120781" />
+    <public type="string" name="gif_picker_result_type_recent" id="0x7f120782" />
+    <public type="string" name="gif_picker_result_type_trending_gifs" id="0x7f120783" />
+    <public type="string" name="gif_tooltip_add_to_favorites" id="0x7f120784" />
+    <public type="string" name="gif_tooltip_favorited_picker_button" id="0x7f120785" />
+    <public type="string" name="gif_tooltip_remove_from_favorites" id="0x7f120786" />
+    <public type="string" name="gift_code_auth_accept" id="0x7f120787" />
+    <public type="string" name="gift_code_auth_accepting" id="0x7f120788" />
+    <public type="string" name="gift_code_auth_check_verification_again" id="0x7f120789" />
+    <public type="string" name="gift_code_auth_continue_in_browser" id="0x7f12078a" />
+    <public type="string" name="gift_code_auth_fetching_user" id="0x7f12078b" />
+    <public type="string" name="gift_code_auth_gifted" id="0x7f12078c" />
+    <public type="string" name="gift_code_auth_gifted_by" id="0x7f12078d" />
+    <public type="string" name="gift_code_auth_gifted_subscription_monthly" id="0x7f12078e" />
+    <public type="string" name="gift_code_auth_gifted_subscription_yearly" id="0x7f12078f" />
+    <public type="string" name="gift_code_auth_help_text_claimed" id="0x7f120790" />
+    <public type="string" name="gift_code_auth_help_text_owned" id="0x7f120791" />
+    <public type="string" name="gift_code_auth_help_text_verification_required" id="0x7f120792" />
+    <public type="string" name="gift_code_auth_invalid_body" id="0x7f120793" />
+    <public type="string" name="gift_code_auth_invalid_tip" id="0x7f120794" />
+    <public type="string" name="gift_code_auth_invalid_title" id="0x7f120795" />
+    <public type="string" name="gift_code_auth_logged_in_as" id="0x7f120796" />
+    <public type="string" name="gift_code_auth_resolving" id="0x7f120797" />
+    <public type="string" name="gift_code_auth_verification_sent" id="0x7f120798" />
+    <public type="string" name="gift_code_auth_verification_title" id="0x7f120799" />
+    <public type="string" name="gift_code_cannot_accept_body_ios" id="0x7f12079a" />
+    <public type="string" name="gift_code_hint" id="0x7f12079b" />
+    <public type="string" name="gift_confirmation_body_claimed" id="0x7f12079c" />
+    <public type="string" name="gift_confirmation_body_confirm" id="0x7f12079d" />
+    <public type="string" name="gift_confirmation_body_confirm_nitro" id="0x7f12079e" />
+    <public type="string" name="gift_confirmation_body_error_invoice_open" id="0x7f12079f" />
+    <public type="string" name="gift_confirmation_body_error_nitro_upgrade_downgrade" id="0x7f1207a0" />
+    <public type="string" name="gift_confirmation_body_error_subscription_managed" id="0x7f1207a1" />
+    <public type="string" name="gift_confirmation_body_invalid" id="0x7f1207a2" />
+    <public type="string" name="gift_confirmation_body_owned" id="0x7f1207a3" />
+    <public type="string" name="gift_confirmation_body_self_gift_no_payment" id="0x7f1207a4" />
+    <public type="string" name="gift_confirmation_body_subscription_monthly_confirm" id="0x7f1207a5" />
+    <public type="string" name="gift_confirmation_body_subscription_yearly_confirm" id="0x7f1207a6" />
+    <public type="string" name="gift_confirmation_body_success" id="0x7f1207a7" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_monthly" id="0x7f1207a8" />
+    <public type="string" name="gift_confirmation_body_success_generic_subscription_yearly" id="0x7f1207a9" />
+    <public type="string" name="gift_confirmation_body_success_mobile" id="0x7f1207aa" />
+    <public type="string" name="gift_confirmation_body_success_nitro_classic_mobile" id="0x7f1207ab" />
+    <public type="string" name="gift_confirmation_body_success_nitro_mobile" id="0x7f1207ac" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_monthly" id="0x7f1207ad" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_1_yearly" id="0x7f1207ae" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_monthly" id="0x7f1207af" />
+    <public type="string" name="gift_confirmation_body_success_premium_tier_2_yearly" id="0x7f1207b0" />
+    <public type="string" name="gift_confirmation_body_unknown_error" id="0x7f1207b1" />
+    <public type="string" name="gift_confirmation_button_confirm" id="0x7f1207b2" />
+    <public type="string" name="gift_confirmation_button_confirm_mobile" id="0x7f1207b3" />
+    <public type="string" name="gift_confirmation_button_confirm_subscription" id="0x7f1207b4" />
+    <public type="string" name="gift_confirmation_button_fail" id="0x7f1207b5" />
+    <public type="string" name="gift_confirmation_button_go_to_library" id="0x7f1207b6" />
+    <public type="string" name="gift_confirmation_button_noice" id="0x7f1207b7" />
+    <public type="string" name="gift_confirmation_button_subscription_success" id="0x7f1207b8" />
+    <public type="string" name="gift_confirmation_button_success_mobile" id="0x7f1207b9" />
+    <public type="string" name="gift_confirmation_header_confirm" id="0x7f1207ba" />
+    <public type="string" name="gift_confirmation_header_confirm_nitro" id="0x7f1207bb" />
+    <public type="string" name="gift_confirmation_header_fail" id="0x7f1207bc" />
+    <public type="string" name="gift_confirmation_header_success" id="0x7f1207bd" />
+    <public type="string" name="gift_confirmation_header_success_nitro" id="0x7f1207be" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_months" id="0x7f1207bf" />
+    <public type="string" name="gift_confirmation_nitro_time_frame_years" id="0x7f1207c0" />
+    <public type="string" name="gift_embed_body_claimed_other" id="0x7f1207c1" />
+    <public type="string" name="gift_embed_body_claimed_self" id="0x7f1207c2" />
+    <public type="string" name="gift_embed_body_claimed_self_mobile" id="0x7f1207c3" />
+    <public type="string" name="gift_embed_body_claimed_self_subscription" id="0x7f1207c4" />
+    <public type="string" name="gift_embed_body_default" id="0x7f1207c5" />
+    <public type="string" name="gift_embed_body_giveaway" id="0x7f1207c6" />
+    <public type="string" name="gift_embed_body_no_user_default" id="0x7f1207c7" />
+    <public type="string" name="gift_embed_body_no_user_giveaway" id="0x7f1207c8" />
+    <public type="string" name="gift_embed_body_owned" id="0x7f1207c9" />
+    <public type="string" name="gift_embed_body_owned_mobile" id="0x7f1207ca" />
+    <public type="string" name="gift_embed_body_requires_verification" id="0x7f1207cb" />
+    <public type="string" name="gift_embed_body_requires_verification_mobile" id="0x7f1207cc" />
+    <public type="string" name="gift_embed_body_self" id="0x7f1207cd" />
+    <public type="string" name="gift_embed_body_subscription_default_months" id="0x7f1207ce" />
+    <public type="string" name="gift_embed_body_subscription_default_years" id="0x7f1207cf" />
+    <public type="string" name="gift_embed_body_subscription_giveaway" id="0x7f1207d0" />
+    <public type="string" name="gift_embed_body_subscription_mismatch" id="0x7f1207d1" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_months" id="0x7f1207d2" />
+    <public type="string" name="gift_embed_body_subscription_no_user_default_years" id="0x7f1207d3" />
+    <public type="string" name="gift_embed_body_subscription_no_user_giveaway" id="0x7f1207d4" />
+    <public type="string" name="gift_embed_button_accept" id="0x7f1207d5" />
+    <public type="string" name="gift_embed_button_cant_accept" id="0x7f1207d6" />
+    <public type="string" name="gift_embed_button_claimed" id="0x7f1207d7" />
+    <public type="string" name="gift_embed_button_claiming" id="0x7f1207d8" />
+    <public type="string" name="gift_embed_button_owned" id="0x7f1207d9" />
+    <public type="string" name="gift_embed_copies_left" id="0x7f1207da" />
+    <public type="string" name="gift_embed_expiration" id="0x7f1207db" />
+    <public type="string" name="gift_embed_header_owner_invalid" id="0x7f1207dc" />
+    <public type="string" name="gift_embed_header_receiver_invalid" id="0x7f1207dd" />
+    <public type="string" name="gift_embed_info_owner_invalid" id="0x7f1207de" />
+    <public type="string" name="gift_embed_info_receiver_invalid" id="0x7f1207df" />
+    <public type="string" name="gift_embed_invalid" id="0x7f1207e0" />
+    <public type="string" name="gift_embed_invalid_tagline_other" id="0x7f1207e1" />
+    <public type="string" name="gift_embed_invalid_tagline_self" id="0x7f1207e2" />
+    <public type="string" name="gift_embed_invalid_title_other" id="0x7f1207e3" />
+    <public type="string" name="gift_embed_invalid_title_self" id="0x7f1207e4" />
+    <public type="string" name="gift_embed_resolving" id="0x7f1207e5" />
+    <public type="string" name="gift_embed_subscriptions_left" id="0x7f1207e6" />
+    <public type="string" name="gift_embed_title" id="0x7f1207e7" />
+    <public type="string" name="gift_embed_title_self" id="0x7f1207e8" />
+    <public type="string" name="gift_embed_title_subscription" id="0x7f1207e9" />
+    <public type="string" name="gift_embed_title_subscription_self" id="0x7f1207ea" />
+    <public type="string" name="gift_embed_unknown_user" id="0x7f1207eb" />
+    <public type="string" name="gift_inventory" id="0x7f1207ec" />
+    <public type="string" name="gift_inventory_copies" id="0x7f1207ed" />
+    <public type="string" name="gift_inventory_expires_in" id="0x7f1207ee" />
+    <public type="string" name="gift_inventory_expires_in_mobile" id="0x7f1207ef" />
+    <public type="string" name="gift_inventory_generate_help" id="0x7f1207f0" />
+    <public type="string" name="gift_inventory_generate_link" id="0x7f1207f1" />
+    <public type="string" name="gift_inventory_generate_link_ios" id="0x7f1207f2" />
+    <public type="string" name="gift_inventory_hidden" id="0x7f1207f3" />
+    <public type="string" name="gift_inventory_no_gifts" id="0x7f1207f4" />
+    <public type="string" name="gift_inventory_no_gifts_subtext" id="0x7f1207f5" />
+    <public type="string" name="gift_inventory_no_gifts_subtext_mobile" id="0x7f1207f6" />
+    <public type="string" name="gift_inventory_redeem_codes" id="0x7f1207f7" />
+    <public type="string" name="gift_inventory_select_nitro_gift" id="0x7f1207f8" />
+    <public type="string" name="gift_inventory_subscription_months" id="0x7f1207f9" />
+    <public type="string" name="gift_inventory_subscription_years" id="0x7f1207fa" />
+    <public type="string" name="go_live_hardware_acceleration_unavailable" id="0x7f1207fb" />
+    <public type="string" name="go_live_hey" id="0x7f1207fc" />
+    <public type="string" name="go_live_listen" id="0x7f1207fd" />
+    <public type="string" name="go_live_look" id="0x7f1207fe" />
+    <public type="string" name="go_live_modal_application_form_title" id="0x7f1207ff" />
+    <public type="string" name="go_live_modal_cta" id="0x7f120800" />
+    <public type="string" name="go_live_modal_current_channel_form_title" id="0x7f120801" />
+    <public type="string" name="go_live_modal_description" id="0x7f120802" />
+    <public type="string" name="go_live_modal_overflow_four_or_more_users" id="0x7f120803" />
+    <public type="string" name="go_live_modal_overflow_three_users" id="0x7f120804" />
+    <public type="string" name="go_live_modal_overflow_two_users" id="0x7f120805" />
+    <public type="string" name="go_live_modal_select_channel_form_title" id="0x7f120806" />
+    <public type="string" name="go_live_modal_select_channel_placeholder" id="0x7f120807" />
+    <public type="string" name="go_live_modal_title" id="0x7f120808" />
+    <public type="string" name="go_live_video_drivers_outdated" id="0x7f120809" />
+    <public type="string" name="go_live_viewers_action_sheet_not_spectating" id="0x7f12080a" />
+    <public type="string" name="go_live_viewers_action_sheet_spectating" id="0x7f12080b" />
+    <public type="string" name="go_live_viewers_action_sheet_streaming" id="0x7f12080c" />
+    <public type="string" name="go_to_developer_portal" id="0x7f12080d" />
+    <public type="string" name="google_api_key" id="0x7f12080e" />
+    <public type="string" name="google_app_id" id="0x7f12080f" />
+    <public type="string" name="google_crash_reporting_api_key" id="0x7f120810" />
+    <public type="string" name="google_play" id="0x7f120811" />
+    <public type="string" name="google_storage_bucket" id="0x7f120812" />
+    <public type="string" name="grant_temporary_membership" id="0x7f120813" />
+    <public type="string" name="green" id="0x7f120814" />
+    <public type="string" name="grey" id="0x7f120815" />
+    <public type="string" name="group" id="0x7f120816" />
+    <public type="string" name="group_dm" id="0x7f120817" />
+    <public type="string" name="group_dm_add_friends" id="0x7f120818" />
+    <public type="string" name="group_dm_add_members" id="0x7f120819" />
+    <public type="string" name="group_dm_header" id="0x7f12081a" />
+    <public type="string" name="group_dm_invite_empty" id="0x7f12081b" />
+    <public type="string" name="group_dm_invite_full_main" id="0x7f12081c" />
+    <public type="string" name="group_dm_invite_full_sub" id="0x7f12081d" />
+    <public type="string" name="group_dm_invite_full_sub2" id="0x7f12081e" />
+    <public type="string" name="group_dm_invite_link_create" id="0x7f12081f" />
+    <public type="string" name="group_dm_invite_link_example" id="0x7f120820" />
+    <public type="string" name="group_dm_invite_link_title" id="0x7f120821" />
+    <public type="string" name="group_dm_invite_no_friends" id="0x7f120822" />
+    <public type="string" name="group_dm_invite_not_friends" id="0x7f120823" />
+    <public type="string" name="group_dm_invite_remaining" id="0x7f120824" />
+    <public type="string" name="group_dm_invite_successful_mobile" id="0x7f120825" />
+    <public type="string" name="group_dm_invite_to" id="0x7f120826" />
+    <public type="string" name="group_dm_invite_unselect_users" id="0x7f120827" />
+    <public type="string" name="group_dm_invite_will_fill_mobile" id="0x7f120828" />
+    <public type="string" name="group_dm_invite_with_name" id="0x7f120829" />
+    <public type="string" name="group_dm_search_placeholder" id="0x7f12082a" />
+    <public type="string" name="group_dm_settings" id="0x7f12082b" />
+    <public type="string" name="group_name" id="0x7f12082c" />
+    <public type="string" name="group_owner" id="0x7f12082d" />
+    <public type="string" name="groups" id="0x7f12082e" />
+    <public type="string" name="guest_lurker_mode_chat_input_body" id="0x7f12082f" />
+    <public type="string" name="guest_lurker_mode_chat_input_header" id="0x7f120830" />
+    <public type="string" name="guild_analytics_guild_header_tooltip" id="0x7f120831" />
+    <public type="string" name="guild_discovery_header_e3_games" id="0x7f120832" />
+    <public type="string" name="guild_discovery_header_games_you_play" id="0x7f120833" />
+    <public type="string" name="guild_discovery_header_popular_servers" id="0x7f120834" />
+    <public type="string" name="guild_discovery_header_search_results" id="0x7f120835" />
+    <public type="string" name="guild_discovery_header_trending_games" id="0x7f120836" />
+    <public type="string" name="guild_discovery_search_empty_description" id="0x7f120837" />
+    <public type="string" name="guild_discovery_search_empty_title" id="0x7f120838" />
+    <public type="string" name="guild_discovery_search_header" id="0x7f120839" />
+    <public type="string" name="guild_discovery_search_label" id="0x7f12083a" />
+    <public type="string" name="guild_discovery_search_placeholder" id="0x7f12083b" />
+    <public type="string" name="guild_discovery_search_press_enter" id="0x7f12083c" />
+    <public type="string" name="guild_discovery_tooltip" id="0x7f12083d" />
+    <public type="string" name="guild_discovery_trending_game_description" id="0x7f12083e" />
+    <public type="string" name="guild_discovery_view_button" id="0x7f12083f" />
+    <public type="string" name="guild_folder_color" id="0x7f120840" />
+    <public type="string" name="guild_folder_name" id="0x7f120841" />
+    <public type="string" name="guild_header_hotspot_tooltip" id="0x7f120842" />
+    <public type="string" name="guild_join_intent_chat" id="0x7f120843" />
+    <public type="string" name="guild_join_intent_chat_friends" id="0x7f120844" />
+    <public type="string" name="guild_join_intent_game_help" id="0x7f120845" />
+    <public type="string" name="guild_join_intent_lfg" id="0x7f120846" />
+    <public type="string" name="guild_join_intent_news" id="0x7f120847" />
+    <public type="string" name="guild_join_intent_skip" id="0x7f120848" />
+    <public type="string" name="guild_join_welcome_to_server" id="0x7f120849" />
+    <public type="string" name="guild_join_what_are_you_looking_to_do" id="0x7f12084a" />
+    <public type="string" name="guild_members_header" id="0x7f12084b" />
+    <public type="string" name="guild_members_search_no_result" id="0x7f12084c" />
+    <public type="string" name="guild_message_notifications_only_mentions" id="0x7f12084d" />
+    <public type="string" name="guild_muted_help_text" id="0x7f12084e" />
+    <public type="string" name="guild_owner" id="0x7f12084f" />
+    <public type="string" name="guild_partnered" id="0x7f120850" />
+    <public type="string" name="guild_popout_emoji_remaining" id="0x7f120851" />
+    <public type="string" name="guild_popout_unavailable_flavor" id="0x7f120852" />
+    <public type="string" name="guild_popout_unavailable_header" id="0x7f120853" />
+    <public type="string" name="guild_popout_view_server_button" id="0x7f120854" />
+    <public type="string" name="guild_premium" id="0x7f120855" />
+    <public type="string" name="guild_security_req_mfa_body" id="0x7f120856" />
+    <public type="string" name="guild_security_req_mfa_enable" id="0x7f120857" />
+    <public type="string" name="guild_security_req_mfa_guild_disable" id="0x7f120858" />
+    <public type="string" name="guild_security_req_mfa_guild_enable" id="0x7f120859" />
+    <public type="string" name="guild_security_req_mfa_label" id="0x7f12085a" />
+    <public type="string" name="guild_security_req_mfa_turn_off" id="0x7f12085b" />
+    <public type="string" name="guild_security_req_mfa_turn_on" id="0x7f12085c" />
+    <public type="string" name="guild_settings_action_filter_channel_create" id="0x7f12085d" />
+    <public type="string" name="guild_settings_action_filter_channel_delete" id="0x7f12085e" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_create" id="0x7f12085f" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_delete" id="0x7f120860" />
+    <public type="string" name="guild_settings_action_filter_channel_overwrite_update" id="0x7f120861" />
+    <public type="string" name="guild_settings_action_filter_channel_update" id="0x7f120862" />
+    <public type="string" name="guild_settings_action_filter_emoji_create" id="0x7f120863" />
+    <public type="string" name="guild_settings_action_filter_emoji_delete" id="0x7f120864" />
+    <public type="string" name="guild_settings_action_filter_emoji_update" id="0x7f120865" />
+    <public type="string" name="guild_settings_action_filter_guild_update" id="0x7f120866" />
+    <public type="string" name="guild_settings_action_filter_invite_create" id="0x7f120867" />
+    <public type="string" name="guild_settings_action_filter_invite_delete" id="0x7f120868" />
+    <public type="string" name="guild_settings_action_filter_invite_update" id="0x7f120869" />
+    <public type="string" name="guild_settings_action_filter_member_ban_add" id="0x7f12086a" />
+    <public type="string" name="guild_settings_action_filter_member_ban_remove" id="0x7f12086b" />
+    <public type="string" name="guild_settings_action_filter_member_kick" id="0x7f12086c" />
+    <public type="string" name="guild_settings_action_filter_member_prune" id="0x7f12086d" />
+    <public type="string" name="guild_settings_action_filter_member_role_update" id="0x7f12086e" />
+    <public type="string" name="guild_settings_action_filter_member_update" id="0x7f12086f" />
+    <public type="string" name="guild_settings_action_filter_message_delete" id="0x7f120870" />
+    <public type="string" name="guild_settings_action_filter_role_create" id="0x7f120871" />
+    <public type="string" name="guild_settings_action_filter_role_delete" id="0x7f120872" />
+    <public type="string" name="guild_settings_action_filter_role_update" id="0x7f120873" />
+    <public type="string" name="guild_settings_action_filter_webhook_create" id="0x7f120874" />
+    <public type="string" name="guild_settings_action_filter_webhook_delete" id="0x7f120875" />
+    <public type="string" name="guild_settings_action_filter_webhook_update" id="0x7f120876" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_change" id="0x7f120877" />
+    <public type="string" name="guild_settings_audit_log_channel_bitrate_create" id="0x7f120878" />
+    <public type="string" name="guild_settings_audit_log_channel_category_create" id="0x7f120879" />
+    <public type="string" name="guild_settings_audit_log_channel_delete" id="0x7f12087a" />
+    <public type="string" name="guild_settings_audit_log_channel_name_change" id="0x7f12087b" />
+    <public type="string" name="guild_settings_audit_log_channel_name_create" id="0x7f12087c" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_disabled" id="0x7f12087d" />
+    <public type="string" name="guild_settings_audit_log_channel_nsfw_enabled" id="0x7f12087e" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_create" id="0x7f12087f" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_delete" id="0x7f120880" />
+    <public type="string" name="guild_settings_audit_log_channel_overwrite_update" id="0x7f120881" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_create" id="0x7f120882" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_denied" id="0x7f120883" />
+    <public type="string" name="guild_settings_audit_log_channel_permission_overrides_granted" id="0x7f120884" />
+    <public type="string" name="guild_settings_audit_log_channel_position_change" id="0x7f120885" />
+    <public type="string" name="guild_settings_audit_log_channel_position_create" id="0x7f120886" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_change" id="0x7f120887" />
+    <public type="string" name="guild_settings_audit_log_channel_rate_limit_per_user_create" id="0x7f120888" />
+    <public type="string" name="guild_settings_audit_log_channel_text_create" id="0x7f120889" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_change" id="0x7f12088a" />
+    <public type="string" name="guild_settings_audit_log_channel_topic_create" id="0x7f12088b" />
+    <public type="string" name="guild_settings_audit_log_channel_type_change" id="0x7f12088c" />
+    <public type="string" name="guild_settings_audit_log_channel_type_create" id="0x7f12088d" />
+    <public type="string" name="guild_settings_audit_log_channel_update" id="0x7f12088e" />
+    <public type="string" name="guild_settings_audit_log_channel_voice_create" id="0x7f12088f" />
+    <public type="string" name="guild_settings_audit_log_common_reason" id="0x7f120890" />
+    <public type="string" name="guild_settings_audit_log_emoji_create" id="0x7f120891" />
+    <public type="string" name="guild_settings_audit_log_emoji_delete" id="0x7f120892" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_change" id="0x7f120893" />
+    <public type="string" name="guild_settings_audit_log_emoji_name_create" id="0x7f120894" />
+    <public type="string" name="guild_settings_audit_log_emoji_update" id="0x7f120895" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_change" id="0x7f120896" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_channel_id_clear" id="0x7f120897" />
+    <public type="string" name="guild_settings_audit_log_guild_afk_timeout_change" id="0x7f120898" />
+    <public type="string" name="guild_settings_audit_log_guild_banner_hash_change" id="0x7f120899" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_all_messages" id="0x7f12089a" />
+    <public type="string" name="guild_settings_audit_log_guild_default_message_notifications_change_only_mentions" id="0x7f12089b" />
+    <public type="string" name="guild_settings_audit_log_guild_description_change" id="0x7f12089c" />
+    <public type="string" name="guild_settings_audit_log_guild_description_clear" id="0x7f12089d" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_all_members" id="0x7f12089e" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_disable" id="0x7f12089f" />
+    <public type="string" name="guild_settings_audit_log_guild_explicit_content_filter_members_without_roles" id="0x7f1208a0" />
+    <public type="string" name="guild_settings_audit_log_guild_icon_hash_change" id="0x7f1208a1" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_disabled" id="0x7f1208a2" />
+    <public type="string" name="guild_settings_audit_log_guild_mfa_level_enabled" id="0x7f1208a3" />
+    <public type="string" name="guild_settings_audit_log_guild_name_change" id="0x7f1208a4" />
+    <public type="string" name="guild_settings_audit_log_guild_owner_id_change" id="0x7f1208a5" />
+    <public type="string" name="guild_settings_audit_log_guild_preferred_locale_change" id="0x7f1208a6" />
+    <public type="string" name="guild_settings_audit_log_guild_region_change" id="0x7f1208a7" />
+    <public type="string" name="guild_settings_audit_log_guild_splash_hash_change" id="0x7f1208a8" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_change" id="0x7f1208a9" />
+    <public type="string" name="guild_settings_audit_log_guild_system_channel_id_disable" id="0x7f1208aa" />
+    <public type="string" name="guild_settings_audit_log_guild_update" id="0x7f1208ab" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_change" id="0x7f1208ac" />
+    <public type="string" name="guild_settings_audit_log_guild_vanity_url_code_delete" id="0x7f1208ad" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_high" id="0x7f1208ae" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_low" id="0x7f1208af" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_medium" id="0x7f1208b0" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_none" id="0x7f1208b1" />
+    <public type="string" name="guild_settings_audit_log_guild_verification_level_change_very_high" id="0x7f1208b2" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_change" id="0x7f1208b3" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_channel_id_delete" id="0x7f1208b4" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_disabled" id="0x7f1208b5" />
+    <public type="string" name="guild_settings_audit_log_guild_widget_enabled" id="0x7f1208b6" />
+    <public type="string" name="guild_settings_audit_log_invite_channel_create" id="0x7f1208b7" />
+    <public type="string" name="guild_settings_audit_log_invite_code_create" id="0x7f1208b8" />
+    <public type="string" name="guild_settings_audit_log_invite_create" id="0x7f1208b9" />
+    <public type="string" name="guild_settings_audit_log_invite_delete" id="0x7f1208ba" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create" id="0x7f1208bb" />
+    <public type="string" name="guild_settings_audit_log_invite_max_age_create_infinite" id="0x7f1208bc" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create" id="0x7f1208bd" />
+    <public type="string" name="guild_settings_audit_log_invite_max_uses_create_infinite" id="0x7f1208be" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_off" id="0x7f1208bf" />
+    <public type="string" name="guild_settings_audit_log_invite_temporary_on" id="0x7f1208c0" />
+    <public type="string" name="guild_settings_audit_log_invite_update" id="0x7f1208c1" />
+    <public type="string" name="guild_settings_audit_log_load_more" id="0x7f1208c2" />
+    <public type="string" name="guild_settings_audit_log_member_ban_add" id="0x7f1208c3" />
+    <public type="string" name="guild_settings_audit_log_member_ban_remove" id="0x7f1208c4" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_off" id="0x7f1208c5" />
+    <public type="string" name="guild_settings_audit_log_member_deaf_on" id="0x7f1208c6" />
+    <public type="string" name="guild_settings_audit_log_member_kick" id="0x7f1208c7" />
+    <public type="string" name="guild_settings_audit_log_member_mute_off" id="0x7f1208c8" />
+    <public type="string" name="guild_settings_audit_log_member_mute_on" id="0x7f1208c9" />
+    <public type="string" name="guild_settings_audit_log_member_nick_change" id="0x7f1208ca" />
+    <public type="string" name="guild_settings_audit_log_member_nick_create" id="0x7f1208cb" />
+    <public type="string" name="guild_settings_audit_log_member_nick_delete" id="0x7f1208cc" />
+    <public type="string" name="guild_settings_audit_log_member_prune" id="0x7f1208cd" />
+    <public type="string" name="guild_settings_audit_log_member_prune_delete_days" id="0x7f1208ce" />
+    <public type="string" name="guild_settings_audit_log_member_role_update" id="0x7f1208cf" />
+    <public type="string" name="guild_settings_audit_log_member_roles_add" id="0x7f1208d0" />
+    <public type="string" name="guild_settings_audit_log_member_roles_remove" id="0x7f1208d1" />
+    <public type="string" name="guild_settings_audit_log_member_update" id="0x7f1208d2" />
+    <public type="string" name="guild_settings_audit_log_message_delete" id="0x7f1208d3" />
+    <public type="string" name="guild_settings_audit_log_role_color" id="0x7f1208d4" />
+    <public type="string" name="guild_settings_audit_log_role_color_ios" id="0x7f1208d5" />
+    <public type="string" name="guild_settings_audit_log_role_color_none" id="0x7f1208d6" />
+    <public type="string" name="guild_settings_audit_log_role_create" id="0x7f1208d7" />
+    <public type="string" name="guild_settings_audit_log_role_delete" id="0x7f1208d8" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_off" id="0x7f1208d9" />
+    <public type="string" name="guild_settings_audit_log_role_hoist_on" id="0x7f1208da" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_off" id="0x7f1208db" />
+    <public type="string" name="guild_settings_audit_log_role_mentionable_on" id="0x7f1208dc" />
+    <public type="string" name="guild_settings_audit_log_role_name_change" id="0x7f1208dd" />
+    <public type="string" name="guild_settings_audit_log_role_name_create" id="0x7f1208de" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_denied" id="0x7f1208df" />
+    <public type="string" name="guild_settings_audit_log_role_permissions_granted" id="0x7f1208e0" />
+    <public type="string" name="guild_settings_audit_log_role_update" id="0x7f1208e1" />
+    <public type="string" name="guild_settings_audit_log_time_at_android" id="0x7f1208e2" />
+    <public type="string" name="guild_settings_audit_log_webhook_avatar" id="0x7f1208e3" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_change" id="0x7f1208e4" />
+    <public type="string" name="guild_settings_audit_log_webhook_channel_create" id="0x7f1208e5" />
+    <public type="string" name="guild_settings_audit_log_webhook_create" id="0x7f1208e6" />
+    <public type="string" name="guild_settings_audit_log_webhook_delete" id="0x7f1208e7" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_change" id="0x7f1208e8" />
+    <public type="string" name="guild_settings_audit_log_webhook_name_create" id="0x7f1208e9" />
+    <public type="string" name="guild_settings_audit_log_webhook_update" id="0x7f1208ea" />
+    <public type="string" name="guild_settings_banner_recommend" id="0x7f1208eb" />
+    <public type="string" name="guild_settings_default_notification_settings_intro" id="0x7f1208ec" />
+    <public type="string" name="guild_settings_default_notification_settings_protip" id="0x7f1208ed" />
+    <public type="string" name="guild_settings_emoji_alias" id="0x7f1208ee" />
+    <public type="string" name="guild_settings_emoji_alias_placeholder" id="0x7f1208ef" />
+    <public type="string" name="guild_settings_emoji_upload_to_server_message" id="0x7f1208f0" />
+    <public type="string" name="guild_settings_enable_discoverable" id="0x7f1208f1" />
+    <public type="string" name="guild_settings_enable_featurable" id="0x7f1208f2" />
+    <public type="string" name="guild_settings_featurable_disabled_tooltip" id="0x7f1208f3" />
+    <public type="string" name="guild_settings_filter_action" id="0x7f1208f4" />
+    <public type="string" name="guild_settings_filter_all" id="0x7f1208f5" />
+    <public type="string" name="guild_settings_filter_all_actions" id="0x7f1208f6" />
+    <public type="string" name="guild_settings_filter_all_users" id="0x7f1208f7" />
+    <public type="string" name="guild_settings_filter_user" id="0x7f1208f8" />
+    <public type="string" name="guild_settings_filtered_action" id="0x7f1208f9" />
+    <public type="string" name="guild_settings_filtered_user" id="0x7f1208fa" />
+    <public type="string" name="guild_settings_follower_analytics" id="0x7f1208fb" />
+    <public type="string" name="guild_settings_follower_analytics_description" id="0x7f1208fc" />
+    <public type="string" name="guild_settings_follower_analytics_empty_body" id="0x7f1208fd" />
+    <public type="string" name="guild_settings_follower_analytics_empty_header" id="0x7f1208fe" />
+    <public type="string" name="guild_settings_follower_analytics_last_updated" id="0x7f1208ff" />
+    <public type="string" name="guild_settings_follower_analytics_message_deleted" id="0x7f120900" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain" id="0x7f120901" />
+    <public type="string" name="guild_settings_follower_analytics_net_gain_tooltip" id="0x7f120902" />
+    <public type="string" name="guild_settings_follower_analytics_net_servers" id="0x7f120903" />
+    <public type="string" name="guild_settings_follower_analytics_post" id="0x7f120904" />
+    <public type="string" name="guild_settings_follower_analytics_reach" id="0x7f120905" />
+    <public type="string" name="guild_settings_follower_analytics_reach_tooltip" id="0x7f120906" />
+    <public type="string" name="guild_settings_follower_analytics_servers_following" id="0x7f120907" />
+    <public type="string" name="guild_settings_follower_analytics_tooltip" id="0x7f120908" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_animated_guild_icon" id="0x7f120909" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_audio_quality" id="0x7f12090a" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_emoji" id="0x7f12090b" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_splash" id="0x7f12090c" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_1_streaming" id="0x7f12090d" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_audio_quality" id="0x7f12090e" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_banner" id="0x7f12090f" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_emoji" id="0x7f120910" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_streaming" id="0x7f120911" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_2_upload_limit" id="0x7f120912" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_audio_quality" id="0x7f120913" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_emoji" id="0x7f120914" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_upload_limit" id="0x7f120915" />
+    <public type="string" name="guild_settings_guild_premium_perk_description_tier_3_vanity_url" id="0x7f120916" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_animated_guild_icon" id="0x7f120917" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_splash" id="0x7f120918" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_1_streaming" id="0x7f120919" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_banner" id="0x7f12091a" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_2_streaming" id="0x7f12091b" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_3_vanity_url" id="0x7f12091c" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_audio_quality" id="0x7f12091d" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_emoji" id="0x7f12091e" />
+    <public type="string" name="guild_settings_guild_premium_perk_title_tier_any_upload_limit" id="0x7f12091f" />
+    <public type="string" name="guild_settings_guild_premium_perks_base_perks" id="0x7f120920" />
+    <public type="string" name="guild_settings_guild_premium_perks_description_none" id="0x7f120921" />
+    <public type="string" name="guild_settings_guild_premium_perks_previous_perks" id="0x7f120922" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_none" id="0x7f120923" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_1" id="0x7f120924" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_2" id="0x7f120925" />
+    <public type="string" name="guild_settings_guild_premium_perks_title_tier_3" id="0x7f120926" />
+    <public type="string" name="guild_settings_icon_recommend" id="0x7f120927" />
+    <public type="string" name="guild_settings_label_audit_log" id="0x7f120928" />
+    <public type="string" name="guild_settings_label_audit_log_empty_body" id="0x7f120929" />
+    <public type="string" name="guild_settings_label_audit_log_empty_title" id="0x7f12092a" />
+    <public type="string" name="guild_settings_label_audit_log_error_body" id="0x7f12092b" />
+    <public type="string" name="guild_settings_label_audit_log_error_title" id="0x7f12092c" />
+    <public type="string" name="guild_settings_members_all_members" id="0x7f12092d" />
+    <public type="string" name="guild_settings_members_display_role" id="0x7f12092e" />
+    <public type="string" name="guild_settings_members_server_members" id="0x7f12092f" />
+    <public type="string" name="guild_settings_overview_boost_unlock" id="0x7f120930" />
+    <public type="string" name="guild_settings_overview_boost_unlocked" id="0x7f120931" />
+    <public type="string" name="guild_settings_overview_notice" id="0x7f120932" />
+    <public type="string" name="guild_settings_overview_tier_info" id="0x7f120933" />
+    <public type="string" name="guild_settings_premium_guild_blurb" id="0x7f120934" />
+    <public type="string" name="guild_settings_premium_guild_close_hint" id="0x7f120935" />
+    <public type="string" name="guild_settings_premium_guild_count_subscribers" id="0x7f120936" />
+    <public type="string" name="guild_settings_premium_guild_tier_requirement" id="0x7f120937" />
+    <public type="string" name="guild_settings_premium_guild_title" id="0x7f120938" />
+    <public type="string" name="guild_settings_premium_guild_unlocked" id="0x7f120939" />
+    <public type="string" name="guild_settings_premium_upsell_body" id="0x7f12093a" />
+    <public type="string" name="guild_settings_premium_upsell_heading" id="0x7f12093b" />
+    <public type="string" name="guild_settings_premium_upsell_learn_more" id="0x7f12093c" />
+    <public type="string" name="guild_settings_server_banner" id="0x7f12093d" />
+    <public type="string" name="guild_settings_server_invite_background" id="0x7f12093e" />
+    <public type="string" name="guild_settings_splash_info" id="0x7f12093f" />
+    <public type="string" name="guild_settings_splash_recommend" id="0x7f120940" />
+    <public type="string" name="guild_settings_title_server_widget" id="0x7f120941" />
+    <public type="string" name="guild_settings_widget_embed_help" id="0x7f120942" />
+    <public type="string" name="guild_settings_widget_enable_widget" id="0x7f120943" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_close_button" id="0x7f120944" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description" id="0x7f120945" />
+    <public type="string" name="guild_subscription_purchase_modal_activated_description_with_boost_count" id="0x7f120946" />
+    <public type="string" name="guild_subscription_purchase_modal_billing_description" id="0x7f120947" />
+    <public type="string" name="guild_subscription_purchase_modal_counter" id="0x7f120948" />
+    <public type="string" name="guild_subscription_purchase_modal_invoice_prorated_label" id="0x7f120949" />
+    <public type="string" name="guild_subscription_purchase_modal_invoice_row_content" id="0x7f12094a" />
+    <public type="string" name="guild_subscription_purchase_modal_invoice_total_row_label" id="0x7f12094b" />
+    <public type="string" name="guild_subscription_purchase_modal_open" id="0x7f12094c" />
+    <public type="string" name="guild_subscription_purchase_modal_payment_source_tooltip" id="0x7f12094d" />
+    <public type="string" name="guild_subscription_purchase_modal_purchase_details_header" id="0x7f12094e" />
+    <public type="string" name="guild_subscription_purchase_modal_step_select_description" id="0x7f12094f" />
+    <public type="string" name="guild_subscription_purchase_modal_submit" id="0x7f120950" />
+    <public type="string" name="guild_subscription_purchase_modal_subtotal" id="0x7f120951" />
+    <public type="string" name="guild_unavailable_body" id="0x7f120952" />
+    <public type="string" name="guild_unavailable_body_alt" id="0x7f120953" />
+    <public type="string" name="guild_unavailable_header" id="0x7f120954" />
+    <public type="string" name="guild_unavailable_title" id="0x7f120955" />
+    <public type="string" name="guild_unavailable_title_alt" id="0x7f120956" />
+    <public type="string" name="guild_verification_text_account_age" id="0x7f120957" />
+    <public type="string" name="guild_verification_text_member_age" id="0x7f120958" />
+    <public type="string" name="guild_verification_text_not_claimed" id="0x7f120959" />
+    <public type="string" name="guild_verification_text_not_phone_verified" id="0x7f12095a" />
+    <public type="string" name="guild_verification_text_not_verified" id="0x7f12095b" />
+    <public type="string" name="guild_verified" id="0x7f12095c" />
+    <public type="string" name="guild_voice_channel_empty_body_mobile" id="0x7f12095d" />
+    <public type="string" name="guild_voice_channel_empty_header_mobile" id="0x7f12095e" />
+    <public type="string" name="hardware_acceleration" id="0x7f12095f" />
+    <public type="string" name="hardware_acceleration_help_text" id="0x7f120960" />
+    <public type="string" name="help" id="0x7f120961" />
+    <public type="string" name="help_desk" id="0x7f120962" />
+    <public type="string" name="help_missing_manage_roles_permission" id="0x7f120963" />
+    <public type="string" name="help_missing_permission" id="0x7f120964" />
+    <public type="string" name="help_role_locked" id="0x7f120965" />
+    <public type="string" name="help_role_locked_mine" id="0x7f120966" />
+    <public type="string" name="help_singular_permission" id="0x7f120967" />
+    <public type="string" name="hide_bottom_view_on_scroll_behavior" id="0x7f120968" />
+    <public type="string" name="hide_instant_invites_description" id="0x7f120969" />
+    <public type="string" name="hide_instant_invites_label" id="0x7f12096a" />
+    <public type="string" name="hide_muted" id="0x7f12096b" />
+    <public type="string" name="hide_muted_channels" id="0x7f12096c" />
+    <public type="string" name="hide_personal_information_description" id="0x7f12096d" />
+    <public type="string" name="hide_personal_information_label" id="0x7f12096e" />
+    <public type="string" name="hold_up" id="0x7f12096f" />
+    <public type="string" name="home" id="0x7f120970" />
+    <public type="string" name="how_to_invite_others" id="0x7f120971" />
+    <public type="string" name="hr" id="0x7f120972" />
+    <public type="string" name="hu" id="0x7f120973" />
+    <public type="string" name="hypesquad_attendee_cta" id="0x7f120974" />
+    <public type="string" name="hypesquad_badge_tooltip" id="0x7f120975" />
+    <public type="string" name="hypesquad_description_house_1" id="0x7f120976" />
+    <public type="string" name="hypesquad_description_house_2" id="0x7f120977" />
+    <public type="string" name="hypesquad_description_house_3" id="0x7f120978" />
+    <public type="string" name="hypesquad_error_body" id="0x7f120979" />
+    <public type="string" name="hypesquad_error_heading" id="0x7f12097a" />
+    <public type="string" name="hypesquad_heading" id="0x7f12097b" />
+    <public type="string" name="hypesquad_heading_existing_member" id="0x7f12097c" />
+    <public type="string" name="hypesquad_house_1" id="0x7f12097d" />
+    <public type="string" name="hypesquad_house_2" id="0x7f12097e" />
+    <public type="string" name="hypesquad_house_3" id="0x7f12097f" />
+    <public type="string" name="hypesquad_join" id="0x7f120980" />
+    <public type="string" name="hypesquad_leave_action" id="0x7f120981" />
+    <public type="string" name="hypesquad_leave_error" id="0x7f120982" />
+    <public type="string" name="hypesquad_leave_prompt" id="0x7f120983" />
+    <public type="string" name="hypesquad_membership_heading" id="0x7f120984" />
+    <public type="string" name="hypesquad_newsletter_warning" id="0x7f120985" />
+    <public type="string" name="hypesquad_online_badge_tooltip" id="0x7f120986" />
+    <public type="string" name="hypesquad_perk_description_newsletter" id="0x7f120987" />
+    <public type="string" name="hypesquad_perk_description_profile_badge" id="0x7f120988" />
+    <public type="string" name="hypesquad_perk_description_squad_challenges" id="0x7f120989" />
+    <public type="string" name="hypesquad_perk_title_newsletter" id="0x7f12098a" />
+    <public type="string" name="hypesquad_perk_title_profile_badge" id="0x7f12098b" />
+    <public type="string" name="hypesquad_perk_title_squad_challenges" id="0x7f12098c" />
+    <public type="string" name="hypesquad_perks_heading" id="0x7f12098d" />
+    <public type="string" name="hypesquad_question_0_prompt" id="0x7f12098e" />
+    <public type="string" name="hypesquad_question_0_response_a" id="0x7f12098f" />
+    <public type="string" name="hypesquad_question_0_response_b" id="0x7f120990" />
+    <public type="string" name="hypesquad_question_0_response_c" id="0x7f120991" />
+    <public type="string" name="hypesquad_question_0_response_d" id="0x7f120992" />
+    <public type="string" name="hypesquad_question_10_prompt" id="0x7f120993" />
+    <public type="string" name="hypesquad_question_10_response_a" id="0x7f120994" />
+    <public type="string" name="hypesquad_question_10_response_b" id="0x7f120995" />
+    <public type="string" name="hypesquad_question_10_response_c" id="0x7f120996" />
+    <public type="string" name="hypesquad_question_10_response_d" id="0x7f120997" />
+    <public type="string" name="hypesquad_question_11_prompt" id="0x7f120998" />
+    <public type="string" name="hypesquad_question_11_response_a" id="0x7f120999" />
+    <public type="string" name="hypesquad_question_11_response_b" id="0x7f12099a" />
+    <public type="string" name="hypesquad_question_11_response_c" id="0x7f12099b" />
+    <public type="string" name="hypesquad_question_11_response_d" id="0x7f12099c" />
+    <public type="string" name="hypesquad_question_12_prompt" id="0x7f12099d" />
+    <public type="string" name="hypesquad_question_12_response_a" id="0x7f12099e" />
+    <public type="string" name="hypesquad_question_12_response_b" id="0x7f12099f" />
+    <public type="string" name="hypesquad_question_12_response_c" id="0x7f1209a0" />
+    <public type="string" name="hypesquad_question_12_response_d" id="0x7f1209a1" />
+    <public type="string" name="hypesquad_question_13_prompt" id="0x7f1209a2" />
+    <public type="string" name="hypesquad_question_13_response_a" id="0x7f1209a3" />
+    <public type="string" name="hypesquad_question_13_response_b" id="0x7f1209a4" />
+    <public type="string" name="hypesquad_question_13_response_c" id="0x7f1209a5" />
+    <public type="string" name="hypesquad_question_13_response_d" id="0x7f1209a6" />
+    <public type="string" name="hypesquad_question_14_prompt" id="0x7f1209a7" />
+    <public type="string" name="hypesquad_question_14_response_a" id="0x7f1209a8" />
+    <public type="string" name="hypesquad_question_14_response_b" id="0x7f1209a9" />
+    <public type="string" name="hypesquad_question_14_response_c" id="0x7f1209aa" />
+    <public type="string" name="hypesquad_question_14_response_d" id="0x7f1209ab" />
+    <public type="string" name="hypesquad_question_1_prompt" id="0x7f1209ac" />
+    <public type="string" name="hypesquad_question_1_response_a" id="0x7f1209ad" />
+    <public type="string" name="hypesquad_question_1_response_b" id="0x7f1209ae" />
+    <public type="string" name="hypesquad_question_1_response_c" id="0x7f1209af" />
+    <public type="string" name="hypesquad_question_1_response_d" id="0x7f1209b0" />
+    <public type="string" name="hypesquad_question_2_prompt" id="0x7f1209b1" />
+    <public type="string" name="hypesquad_question_2_response_a" id="0x7f1209b2" />
+    <public type="string" name="hypesquad_question_2_response_b" id="0x7f1209b3" />
+    <public type="string" name="hypesquad_question_2_response_c" id="0x7f1209b4" />
+    <public type="string" name="hypesquad_question_2_response_d" id="0x7f1209b5" />
+    <public type="string" name="hypesquad_question_3_prompt" id="0x7f1209b6" />
+    <public type="string" name="hypesquad_question_3_response_a" id="0x7f1209b7" />
+    <public type="string" name="hypesquad_question_3_response_b" id="0x7f1209b8" />
+    <public type="string" name="hypesquad_question_3_response_c" id="0x7f1209b9" />
+    <public type="string" name="hypesquad_question_3_response_d" id="0x7f1209ba" />
+    <public type="string" name="hypesquad_question_4_prompt" id="0x7f1209bb" />
+    <public type="string" name="hypesquad_question_4_response_a" id="0x7f1209bc" />
+    <public type="string" name="hypesquad_question_4_response_b" id="0x7f1209bd" />
+    <public type="string" name="hypesquad_question_4_response_c" id="0x7f1209be" />
+    <public type="string" name="hypesquad_question_4_response_d" id="0x7f1209bf" />
+    <public type="string" name="hypesquad_question_5_prompt" id="0x7f1209c0" />
+    <public type="string" name="hypesquad_question_5_response_a" id="0x7f1209c1" />
+    <public type="string" name="hypesquad_question_5_response_b" id="0x7f1209c2" />
+    <public type="string" name="hypesquad_question_5_response_c" id="0x7f1209c3" />
+    <public type="string" name="hypesquad_question_5_response_d" id="0x7f1209c4" />
+    <public type="string" name="hypesquad_question_6_prompt" id="0x7f1209c5" />
+    <public type="string" name="hypesquad_question_6_response_a" id="0x7f1209c6" />
+    <public type="string" name="hypesquad_question_6_response_b" id="0x7f1209c7" />
+    <public type="string" name="hypesquad_question_6_response_c" id="0x7f1209c8" />
+    <public type="string" name="hypesquad_question_6_response_d" id="0x7f1209c9" />
+    <public type="string" name="hypesquad_question_7_prompt" id="0x7f1209ca" />
+    <public type="string" name="hypesquad_question_7_response_a" id="0x7f1209cb" />
+    <public type="string" name="hypesquad_question_7_response_b" id="0x7f1209cc" />
+    <public type="string" name="hypesquad_question_7_response_c" id="0x7f1209cd" />
+    <public type="string" name="hypesquad_question_7_response_d" id="0x7f1209ce" />
+    <public type="string" name="hypesquad_question_8_prompt" id="0x7f1209cf" />
+    <public type="string" name="hypesquad_question_8_response_a" id="0x7f1209d0" />
+    <public type="string" name="hypesquad_question_8_response_b" id="0x7f1209d1" />
+    <public type="string" name="hypesquad_question_8_response_c" id="0x7f1209d2" />
+    <public type="string" name="hypesquad_question_8_response_d" id="0x7f1209d3" />
+    <public type="string" name="hypesquad_question_9_prompt" id="0x7f1209d4" />
+    <public type="string" name="hypesquad_question_9_response_a" id="0x7f1209d5" />
+    <public type="string" name="hypesquad_question_9_response_b" id="0x7f1209d6" />
+    <public type="string" name="hypesquad_question_9_response_c" id="0x7f1209d7" />
+    <public type="string" name="hypesquad_question_9_response_d" id="0x7f1209d8" />
+    <public type="string" name="hypesquad_quiz_body_house_1" id="0x7f1209d9" />
+    <public type="string" name="hypesquad_quiz_body_house_2" id="0x7f1209da" />
+    <public type="string" name="hypesquad_quiz_body_house_3" id="0x7f1209db" />
+    <public type="string" name="hypesquad_quiz_cancel" id="0x7f1209dc" />
+    <public type="string" name="hypesquad_quiz_close" id="0x7f1209dd" />
+    <public type="string" name="hypesquad_quiz_completed_modal_title" id="0x7f1209de" />
+    <public type="string" name="hypesquad_quiz_error_modal_title" id="0x7f1209df" />
+    <public type="string" name="hypesquad_quiz_next_question" id="0x7f1209e0" />
+    <public type="string" name="hypesquad_quiz_ongoing_modal_title" id="0x7f1209e1" />
+    <public type="string" name="hypesquad_quiz_retry" id="0x7f1209e2" />
+    <public type="string" name="hypesquad_quiz_select_answer" id="0x7f1209e3" />
+    <public type="string" name="hypesquad_quiz_show_my_house" id="0x7f1209e4" />
+    <public type="string" name="hypesquad_quiz_title" id="0x7f1209e5" />
+    <public type="string" name="hypesquad_ready_to_rep" id="0x7f1209e6" />
+    <public type="string" name="hypesquad_subheading" id="0x7f1209e7" />
+    <public type="string" name="hypesquad_switch_houses_action" id="0x7f1209e8" />
+    <public type="string" name="hypesquad_switch_houses_prompt" id="0x7f1209e9" />
+    <public type="string" name="hypesquad_unclaimed_account_notice" id="0x7f1209ea" />
+    <public type="string" name="hypesquad_unverified_email_notice" id="0x7f1209eb" />
+    <public type="string" name="hypesquad_your_house" id="0x7f1209ec" />
+    <public type="string" name="i18n_locale_loading_error" id="0x7f1209ed" />
+    <public type="string" name="image" id="0x7f1209ee" />
+    <public type="string" name="images" id="0x7f1209ef" />
+    <public type="string" name="img_alt_attachment_file_type" id="0x7f1209f0" />
+    <public type="string" name="img_alt_emoji" id="0x7f1209f1" />
+    <public type="string" name="img_alt_icon" id="0x7f1209f2" />
+    <public type="string" name="img_alt_logo" id="0x7f1209f3" />
+    <public type="string" name="img_alt_navigate_to" id="0x7f1209f4" />
+    <public type="string" name="in_a_voice_channel" id="0x7f1209f5" />
+    <public type="string" name="in_category" id="0x7f1209f6" />
+    <public type="string" name="in_game_voice_settings" id="0x7f1209f7" />
+    <public type="string" name="in_the_call" id="0x7f1209f8" />
+    <public type="string" name="in_the_voice_channel" id="0x7f1209f9" />
+    <public type="string" name="incoming_call" id="0x7f1209fa" />
+    <public type="string" name="incoming_call_dm" id="0x7f1209fb" />
+    <public type="string" name="incoming_call_ellipsis" id="0x7f1209fc" />
+    <public type="string" name="incoming_call_gdm" id="0x7f1209fd" />
+    <public type="string" name="incoming_friend_request" id="0x7f1209fe" />
+    <public type="string" name="incoming_video_call" id="0x7f1209ff" />
+    <public type="string" name="incoming_video_call_ellipsis" id="0x7f120a00" />
+    <public type="string" name="incompatible_browser" id="0x7f120a01" />
+    <public type="string" name="inivte_modal_no_thanks" id="0x7f120a02" />
+    <public type="string" name="inline_attachment_media" id="0x7f120a03" />
+    <public type="string" name="inline_attachment_media_help" id="0x7f120a04" />
+    <public type="string" name="inline_embed_media" id="0x7f120a05" />
+    <public type="string" name="inline_media_label" id="0x7f120a06" />
+    <public type="string" name="input_mode_ptt" id="0x7f120a07" />
+    <public type="string" name="input_mode_ptt_limited" id="0x7f120a08" />
+    <public type="string" name="input_mode_ptt_release_delay" id="0x7f120a09" />
+    <public type="string" name="input_mode_vad" id="0x7f120a0a" />
+    <public type="string" name="instagram" id="0x7f120a0b" />
+    <public type="string" name="install_location_main" id="0x7f120a0c" />
+    <public type="string" name="instant_invite" id="0x7f120a0d" />
+    <public type="string" name="instant_invite_accept" id="0x7f120a0e" />
+    <public type="string" name="instant_invite_accepted" id="0x7f120a0f" />
+    <public type="string" name="instant_invite_accepting" id="0x7f120a10" />
+    <public type="string" name="instant_invite_ask_for_new_invite" id="0x7f120a11" />
+    <public type="string" name="instant_invite_ask_user_for_new_invite" id="0x7f120a12" />
+    <public type="string" name="instant_invite_banned" id="0x7f120a13" />
+    <public type="string" name="instant_invite_banned_info" id="0x7f120a14" />
+    <public type="string" name="instant_invite_code" id="0x7f120a15" />
+    <public type="string" name="instant_invite_expired" id="0x7f120a16" />
+    <public type="string" name="instant_invite_expires" id="0x7f120a17" />
+    <public type="string" name="instant_invite_failed_to_generate" id="0x7f120a18" />
+    <public type="string" name="instant_invite_friends" id="0x7f120a19" />
+    <public type="string" name="instant_invite_friends_description" id="0x7f120a1a" />
+    <public type="string" name="instant_invite_generate" id="0x7f120a1b" />
+    <public type="string" name="instant_invite_generated_by_widget" id="0x7f120a1c" />
+    <public type="string" name="instant_invite_guild_by_user" id="0x7f120a1d" />
+    <public type="string" name="instant_invite_guild_members_online" id="0x7f120a1e" />
+    <public type="string" name="instant_invite_guild_members_total" id="0x7f120a1f" />
+    <public type="string" name="instant_invite_hidden" id="0x7f120a20" />
+    <public type="string" name="instant_invite_invalid_channel" id="0x7f120a21" />
+    <public type="string" name="instant_invite_invite_code" id="0x7f120a22" />
+    <public type="string" name="instant_invite_inviter" id="0x7f120a23" />
+    <public type="string" name="instant_invite_join" id="0x7f120a24" />
+    <public type="string" name="instant_invite_link_share_text" id="0x7f120a25" />
+    <public type="string" name="instant_invite_looks_like" id="0x7f120a26" />
+    <public type="string" name="instant_invite_not_allowed" id="0x7f120a27" />
+    <public type="string" name="instant_invite_popout" id="0x7f120a28" />
+    <public type="string" name="instant_invite_regenerate" id="0x7f120a29" />
+    <public type="string" name="instant_invite_resolved_body" id="0x7f120a2a" />
+    <public type="string" name="instant_invite_resolved_title" id="0x7f120a2b" />
+    <public type="string" name="instant_invite_resolving" id="0x7f120a2c" />
+    <public type="string" name="instant_invite_uses" id="0x7f120a2d" />
+    <public type="string" name="instant_invite_you_are_already_a_member_of" id="0x7f120a2e" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join" id="0x7f120a2f" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_by_user" id="0x7f120a30" />
+    <public type="string" name="instant_invite_you_have_been_invited_to_join_group_dm" id="0x7f120a31" />
+    <public type="string" name="instant_invites" id="0x7f120a32" />
+    <public type="string" name="integration_settings" id="0x7f120a33" />
+    <public type="string" name="integrations" id="0x7f120a34" />
+    <public type="string" name="integrations_header" id="0x7f120a35" />
+    <public type="string" name="integrations_pro_tip" id="0x7f120a36" />
+    <public type="string" name="interaction_required_body" id="0x7f120a37" />
+    <public type="string" name="interaction_required_title" id="0x7f120a38" />
+    <public type="string" name="internal_server_error" id="0x7f120a39" />
+    <public type="string" name="invalid_animated_emoji_body" id="0x7f120a3a" />
+    <public type="string" name="invalid_animated_emoji_body_upgrade" id="0x7f120a3b" />
+    <public type="string" name="invalid_external_emoji_body" id="0x7f120a3c" />
+    <public type="string" name="invalid_external_emoji_body_upgrade" id="0x7f120a3d" />
+    <public type="string" name="invalid_invite_link_error" id="0x7f120a3e" />
+    <public type="string" name="invalid_request_format" id="0x7f120a3f" />
+    <public type="string" name="invalid_text_channel" id="0x7f120a40" />
+    <public type="string" name="invalid_voice_channel" id="0x7f120a41" />
+    <public type="string" name="invite_banner_does_not_expire" id="0x7f120a42" />
+    <public type="string" name="invite_banner_invite_to_server" id="0x7f120a43" />
+    <public type="string" name="invite_banner_share_invite_link_for_access" id="0x7f120a44" />
+    <public type="string" name="invite_button_accepted" id="0x7f120a45" />
+    <public type="string" name="invite_button_accepting" id="0x7f120a46" />
+    <public type="string" name="invite_button_expired" id="0x7f120a47" />
+    <public type="string" name="invite_button_expired_owner" id="0x7f120a48" />
+    <public type="string" name="invite_button_invalid" id="0x7f120a49" />
+    <public type="string" name="invite_button_invalid_owner" id="0x7f120a4a" />
+    <public type="string" name="invite_button_join" id="0x7f120a4b" />
+    <public type="string" name="invite_button_resolving" id="0x7f120a4c" />
+    <public type="string" name="invite_button_stream_ended" id="0x7f120a4d" />
+    <public type="string" name="invite_button_stream_ended_streamer" id="0x7f120a4e" />
+    <public type="string" name="invite_button_stream_watching" id="0x7f120a4f" />
+    <public type="string" name="invite_button_streamer" id="0x7f120a50" />
+    <public type="string" name="invite_button_streaming" id="0x7f120a51" />
+    <public type="string" name="invite_button_streaming_subtext" id="0x7f120a52" />
+    <public type="string" name="invite_button_title_invited" id="0x7f120a53" />
+    <public type="string" name="invite_button_title_invited_group_dm" id="0x7f120a54" />
+    <public type="string" name="invite_button_title_invited_invalid" id="0x7f120a55" />
+    <public type="string" name="invite_button_title_invited_lfg_gdm" id="0x7f120a56" />
+    <public type="string" name="invite_button_title_invited_stream" id="0x7f120a57" />
+    <public type="string" name="invite_button_title_inviter" id="0x7f120a58" />
+    <public type="string" name="invite_button_title_inviter_group_dm" id="0x7f120a59" />
+    <public type="string" name="invite_button_title_inviter_invalid" id="0x7f120a5a" />
+    <public type="string" name="invite_button_title_inviter_lfg_gdm" id="0x7f120a5b" />
+    <public type="string" name="invite_button_title_inviter_stream" id="0x7f120a5c" />
+    <public type="string" name="invite_button_title_streaming" id="0x7f120a5d" />
+    <public type="string" name="invite_copied" id="0x7f120a5e" />
+    <public type="string" name="invite_copy_share_link_header_mobile" id="0x7f120a5f" />
+    <public type="string" name="invite_edit_link" id="0x7f120a60" />
+    <public type="string" name="invite_embed_full_group" id="0x7f120a61" />
+    <public type="string" name="invite_embed_full_group_spectate" id="0x7f120a62" />
+    <public type="string" name="invite_embed_game_has_ended" id="0x7f120a63" />
+    <public type="string" name="invite_embed_game_invite" id="0x7f120a64" />
+    <public type="string" name="invite_embed_game_not_detected" id="0x7f120a65" />
+    <public type="string" name="invite_embed_in_group" id="0x7f120a66" />
+    <public type="string" name="invite_embed_invite_to_join" id="0x7f120a67" />
+    <public type="string" name="invite_embed_invite_to_join_group" id="0x7f120a68" />
+    <public type="string" name="invite_embed_invite_to_listen" id="0x7f120a69" />
+    <public type="string" name="invite_embed_invite_to_spectate" id="0x7f120a6a" />
+    <public type="string" name="invite_embed_invite_to_watch" id="0x7f120a6b" />
+    <public type="string" name="invite_embed_join_via_desktop_app" id="0x7f120a6c" />
+    <public type="string" name="invite_embed_joined" id="0x7f120a6d" />
+    <public type="string" name="invite_embed_listen_has_ended" id="0x7f120a6e" />
+    <public type="string" name="invite_embed_listening_invite" id="0x7f120a6f" />
+    <public type="string" name="invite_embed_num_open_slots" id="0x7f120a70" />
+    <public type="string" name="invite_embed_num_open_slots_android" id="0x7f120a71" />
+    <public type="string" name="invite_embed_send_invite" id="0x7f120a72" />
+    <public type="string" name="invite_embed_spectate" id="0x7f120a73" />
+    <public type="string" name="invite_embed_spectate_via_desktop_app" id="0x7f120a74" />
+    <public type="string" name="invite_embed_watch_has_ended" id="0x7f120a75" />
+    <public type="string" name="invite_expired_subtext_mobile" id="0x7f120a76" />
+    <public type="string" name="invite_expires_days" id="0x7f120a77" />
+    <public type="string" name="invite_expires_days_or_uses" id="0x7f120a78" />
+    <public type="string" name="invite_expires_hours" id="0x7f120a79" />
+    <public type="string" name="invite_expires_hours_or_uses" id="0x7f120a7a" />
+    <public type="string" name="invite_expires_minutes" id="0x7f120a7b" />
+    <public type="string" name="invite_expires_minutes_or_uses" id="0x7f120a7c" />
+    <public type="string" name="invite_expires_never" id="0x7f120a7d" />
+    <public type="string" name="invite_expires_uses" id="0x7f120a7e" />
+    <public type="string" name="invite_footer_link_header" id="0x7f120a7f" />
+    <public type="string" name="invite_friend_modal_invite" id="0x7f120a80" />
+    <public type="string" name="invite_friend_modal_loading" id="0x7f120a81" />
+    <public type="string" name="invite_friend_modal_no_results" id="0x7f120a82" />
+    <public type="string" name="invite_friend_modal_retry" id="0x7f120a83" />
+    <public type="string" name="invite_friend_modal_sent" id="0x7f120a84" />
+    <public type="string" name="invite_friend_modal_subtitle" id="0x7f120a85" />
+    <public type="string" name="invite_friend_modal_title" id="0x7f120a86" />
+    <public type="string" name="invite_friends" id="0x7f120a87" />
+    <public type="string" name="invite_invalid_cta" id="0x7f120a88" />
+    <public type="string" name="invite_invalid_error" id="0x7f120a89" />
+    <public type="string" name="invite_link_copied" id="0x7f120a8a" />
+    <public type="string" name="invite_link_example_full" id="0x7f120a8b" />
+    <public type="string" name="invite_link_example_simple" id="0x7f120a8c" />
+    <public type="string" name="invite_link_example_verified" id="0x7f120a8d" />
+    <public type="string" name="invite_links_expire_after_1_day" id="0x7f120a8e" />
+    <public type="string" name="invite_links_never_expires" id="0x7f120a8f" />
+    <public type="string" name="invite_members" id="0x7f120a90" />
+    <public type="string" name="invite_modal_button" id="0x7f120a91" />
+    <public type="string" name="invite_modal_error_default" id="0x7f120a92" />
+    <public type="string" name="invite_modal_error_title" id="0x7f120a93" />
+    <public type="string" name="invite_modal_open_button" id="0x7f120a94" />
+    <public type="string" name="invite_never_expires_subtext_mobile" id="0x7f120a95" />
+    <public type="string" name="invite_no_channels" id="0x7f120a96" />
+    <public type="string" name="invite_no_thanks" id="0x7f120a97" />
+    <public type="string" name="invite_notice_message" id="0x7f120a98" />
+    <public type="string" name="invite_notice_message_part_2" id="0x7f120a99" />
+    <public type="string" name="invite_people" id="0x7f120a9a" />
+    <public type="string" name="invite_private_call_heads_up" id="0x7f120a9b" />
+    <public type="string" name="invite_search_for_friends" id="0x7f120a9c" />
+    <public type="string" name="invite_sent" id="0x7f120a9d" />
+    <public type="string" name="invite_settings_expired_description" id="0x7f120a9e" />
+    <public type="string" name="invite_settings_title" id="0x7f120a9f" />
+    <public type="string" name="invite_share_default" id="0x7f120aa0" />
+    <public type="string" name="invite_share_link_own_server" id="0x7f120aa1" />
+    <public type="string" name="invite_share_link_to_stream" id="0x7f120aa2" />
+    <public type="string" name="invite_stream_footer_link_header" id="0x7f120aa3" />
+    <public type="string" name="invite_stream_header" id="0x7f120aa4" />
+    <public type="string" name="invite_to_server" id="0x7f120aa5" />
+    <public type="string" name="invite_to_server_name" id="0x7f120aa6" />
+    <public type="string" name="invite_to_server_name_experiment" id="0x7f120aa7" />
+    <public type="string" name="invite_url" id="0x7f120aa8" />
+    <public type="string" name="invite_voice_empty_mobile" id="0x7f120aa9" />
+    <public type="string" name="invite_your_friends_header_mobile" id="0x7f120aaa" />
+    <public type="string" name="invite_your_friends_voice_call_mobile" id="0x7f120aab" />
+    <public type="string" name="invites" id="0x7f120aac" />
+    <public type="string" name="ios_camera" id="0x7f120aad" />
+    <public type="string" name="ios_iap_generic_billing_error" id="0x7f120aae" />
+    <public type="string" name="ios_iap_itunes_error" id="0x7f120aaf" />
+    <public type="string" name="ios_iap_manage_subscription_button" id="0x7f120ab0" />
+    <public type="string" name="ios_iap_manage_subscription_desktop" id="0x7f120ab1" />
+    <public type="string" name="ios_iap_restore_subscription_error" id="0x7f120ab2" />
+    <public type="string" name="ios_iap_restore_subscription_none_description" id="0x7f120ab3" />
+    <public type="string" name="ios_iap_restore_subscription_none_title" id="0x7f120ab4" />
+    <public type="string" name="ios_iap_restore_subscription_success" id="0x7f120ab5" />
+    <public type="string" name="ios_iap_testflight_error" id="0x7f120ab6" />
+    <public type="string" name="ios_media_keyboard_browse_photo" id="0x7f120ab7" />
+    <public type="string" name="ios_media_keyboard_enable_in_settings" id="0x7f120ab8" />
+    <public type="string" name="ios_media_keyboard_more_photos" id="0x7f120ab9" />
+    <public type="string" name="ios_media_keyboard_no_permission" id="0x7f120aba" />
+    <public type="string" name="ios_media_keyboard_no_photos" id="0x7f120abb" />
+    <public type="string" name="ios_media_keyboard_take_a_photo" id="0x7f120abc" />
+    <public type="string" name="ios_notification_see_full" id="0x7f120abd" />
+    <public type="string" name="ios_profile_in_voice_call" id="0x7f120abe" />
+    <public type="string" name="ios_profile_open_voice_channel" id="0x7f120abf" />
+    <public type="string" name="ios_view_all" id="0x7f120ac0" />
+    <public type="string" name="ip_address_secured" id="0x7f120ac1" />
+    <public type="string" name="ip_authorization_succeeded" id="0x7f120ac2" />
+    <public type="string" name="ip_authorization_succeeded_suggestion" id="0x7f120ac3" />
+    <public type="string" name="it" id="0x7f120ac4" />
+    <public type="string" name="ja" id="0x7f120ac5" />
+    <public type="string" name="join" id="0x7f120ac6" />
+    <public type="string" name="join_afk_channel_body" id="0x7f120ac7" />
+    <public type="string" name="join_call" id="0x7f120ac8" />
+    <public type="string" name="join_server" id="0x7f120ac9" />
+    <public type="string" name="join_server_button_body" id="0x7f120aca" />
+    <public type="string" name="join_server_button_cta" id="0x7f120acb" />
+    <public type="string" name="join_server_button_cta_mobile" id="0x7f120acc" />
+    <public type="string" name="join_server_button_cta_mobile_desc" id="0x7f120acd" />
+    <public type="string" name="join_server_button_cta_named" id="0x7f120ace" />
+    <public type="string" name="join_server_description" id="0x7f120acf" />
+    <public type="string" name="join_server_description_mobile" id="0x7f120ad0" />
+    <public type="string" name="join_server_title" id="0x7f120ad1" />
+    <public type="string" name="join_stream" id="0x7f120ad2" />
+    <public type="string" name="join_video_call" id="0x7f120ad3" />
+    <public type="string" name="join_voice" id="0x7f120ad4" />
+    <public type="string" name="join_voice_call" id="0x7f120ad5" />
+    <public type="string" name="join_voice_channel" id="0x7f120ad6" />
+    <public type="string" name="join_voice_channel_cta" id="0x7f120ad7" />
+    <public type="string" name="joined_server" id="0x7f120ad8" />
+    <public type="string" name="joining_server" id="0x7f120ad9" />
+    <public type="string" name="joining_voice_call_will_end_current_call_body" id="0x7f120ada" />
+    <public type="string" name="joining_voice_channel_will_end_current_call_body" id="0x7f120adb" />
+    <public type="string" name="joining_will_end_current_call_title" id="0x7f120adc" />
+    <public type="string" name="jump" id="0x7f120add" />
+    <public type="string" name="jump_to_channel" id="0x7f120ade" />
+    <public type="string" name="jump_to_chat" id="0x7f120adf" />
+    <public type="string" name="jump_to_last_unread_message" id="0x7f120ae0" />
+    <public type="string" name="jump_to_present" id="0x7f120ae1" />
+    <public type="string" name="keep_permissions" id="0x7f120ae2" />
+    <public type="string" name="keybind_activate_overlay_chat" id="0x7f120ae3" />
+    <public type="string" name="keybind_conflict" id="0x7f120ae4" />
+    <public type="string" name="keybind_description_modal_call_accept" id="0x7f120ae5" />
+    <public type="string" name="keybind_description_modal_call_decline" id="0x7f120ae6" />
+    <public type="string" name="keybind_description_modal_call_start" id="0x7f120ae7" />
+    <public type="string" name="keybind_description_modal_create_dm_group" id="0x7f120ae8" />
+    <public type="string" name="keybind_description_modal_create_guild" id="0x7f120ae9" />
+    <public type="string" name="keybind_description_modal_easter_egg" id="0x7f120aea" />
+    <public type="string" name="keybind_description_modal_find_conversation" id="0x7f120aeb" />
+    <public type="string" name="keybind_description_modal_focus_text_area" id="0x7f120aec" />
+    <public type="string" name="keybind_description_modal_jump_to_first_unread" id="0x7f120aed" />
+    <public type="string" name="keybind_description_modal_mark_channel_read" id="0x7f120aee" />
+    <public type="string" name="keybind_description_modal_mark_server_read" id="0x7f120aef" />
+    <public type="string" name="keybind_description_modal_navigate_channels" id="0x7f120af0" />
+    <public type="string" name="keybind_description_modal_navigate_servers" id="0x7f120af1" />
+    <public type="string" name="keybind_description_modal_quickswitcher" id="0x7f120af2" />
+    <public type="string" name="keybind_description_modal_return_to_audio_channel" id="0x7f120af3" />
+    <public type="string" name="keybind_description_modal_scroll_chat" id="0x7f120af4" />
+    <public type="string" name="keybind_description_modal_search" id="0x7f120af5" />
+    <public type="string" name="keybind_description_modal_search_emojis" id="0x7f120af6" />
+    <public type="string" name="keybind_description_modal_search_gifs" id="0x7f120af7" />
+    <public type="string" name="keybind_description_modal_subtitle" id="0x7f120af8" />
+    <public type="string" name="keybind_description_modal_title" id="0x7f120af9" />
+    <public type="string" name="keybind_description_modal_toggle_deafen" id="0x7f120afa" />
+    <public type="string" name="keybind_description_modal_toggle_help" id="0x7f120afb" />
+    <public type="string" name="keybind_description_modal_toggle_hotkeys" id="0x7f120afc" />
+    <public type="string" name="keybind_description_modal_toggle_mentions" id="0x7f120afd" />
+    <public type="string" name="keybind_description_modal_toggle_mute" id="0x7f120afe" />
+    <public type="string" name="keybind_description_modal_toggle_pins" id="0x7f120aff" />
+    <public type="string" name="keybind_description_modal_toggle_previous_guild" id="0x7f120b00" />
+    <public type="string" name="keybind_description_modal_toggle_users" id="0x7f120b01" />
+    <public type="string" name="keybind_description_modal_unread_channels" id="0x7f120b02" />
+    <public type="string" name="keybind_description_modal_unread_mention_channels" id="0x7f120b03" />
+    <public type="string" name="keybind_description_modal_upload_file" id="0x7f120b04" />
+    <public type="string" name="keybind_description_push_to_mute" id="0x7f120b05" />
+    <public type="string" name="keybind_description_push_to_talk" id="0x7f120b06" />
+    <public type="string" name="keybind_description_push_to_talk_priority" id="0x7f120b07" />
+    <public type="string" name="keybind_description_toggle_deafen" id="0x7f120b08" />
+    <public type="string" name="keybind_description_toggle_go_live_streaming" id="0x7f120b09" />
+    <public type="string" name="keybind_description_toggle_mute" id="0x7f120b0a" />
+    <public type="string" name="keybind_description_toggle_overlay" id="0x7f120b0b" />
+    <public type="string" name="keybind_description_toggle_overlay_input_lock" id="0x7f120b0c" />
+    <public type="string" name="keybind_description_toggle_streamer_mode" id="0x7f120b0d" />
+    <public type="string" name="keybind_description_toggle_voice_mode" id="0x7f120b0e" />
+    <public type="string" name="keybind_description_unassigned" id="0x7f120b0f" />
+    <public type="string" name="keybind_push_to_mute" id="0x7f120b10" />
+    <public type="string" name="keybind_push_to_talk" id="0x7f120b11" />
+    <public type="string" name="keybind_push_to_talk_priority" id="0x7f120b12" />
+    <public type="string" name="keybind_toggle_deafen" id="0x7f120b13" />
+    <public type="string" name="keybind_toggle_go_live_streaming" id="0x7f120b14" />
+    <public type="string" name="keybind_toggle_mute" id="0x7f120b15" />
+    <public type="string" name="keybind_toggle_overlay" id="0x7f120b16" />
+    <public type="string" name="keybind_toggle_overlay_input_lock" id="0x7f120b17" />
+    <public type="string" name="keybind_toggle_stream_mode" id="0x7f120b18" />
+    <public type="string" name="keybind_toggle_voice_mode" id="0x7f120b19" />
+    <public type="string" name="keybind_unassigned" id="0x7f120b1a" />
+    <public type="string" name="keybinds" id="0x7f120b1b" />
+    <public type="string" name="keyboard_behavior_mobile_header" id="0x7f120b1c" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send" id="0x7f120b1d" />
+    <public type="string" name="keyboard_behavior_mobile_shift_enter_to_send_hint" id="0x7f120b1e" />
+    <public type="string" name="kick" id="0x7f120b1f" />
+    <public type="string" name="kick_from_server" id="0x7f120b20" />
+    <public type="string" name="kick_members" id="0x7f120b21" />
+    <public type="string" name="kick_members_description" id="0x7f120b22" />
+    <public type="string" name="kick_user_body" id="0x7f120b23" />
+    <public type="string" name="kick_user_confirmed" id="0x7f120b24" />
+    <public type="string" name="kick_user_error_generic" id="0x7f120b25" />
+    <public type="string" name="kick_user_title" id="0x7f120b26" />
+    <public type="string" name="ko" id="0x7f120b27" />
+    <public type="string" name="label_with_online_status" id="0x7f120b28" />
+    <public type="string" name="language" id="0x7f120b29" />
+    <public type="string" name="language_not_found" id="0x7f120b2a" />
+    <public type="string" name="language_select" id="0x7f120b2b" />
+    <public type="string" name="language_updated" id="0x7f120b2c" />
+    <public type="string" name="languages" id="0x7f120b2d" />
+    <public type="string" name="last_seen" id="0x7f120b2e" />
+    <public type="string" name="last_selected_voice_channel_body" id="0x7f120b2f" />
+    <public type="string" name="last_selected_voice_channel_no" id="0x7f120b30" />
+    <public type="string" name="last_selected_voice_channel_title" id="0x7f120b31" />
+    <public type="string" name="last_selected_voice_channel_yes" id="0x7f120b32" />
+    <public type="string" name="last_sync" id="0x7f120b33" />
+    <public type="string" name="launch_app" id="0x7f120b34" />
+    <public type="string" name="learn_more" id="0x7f120b35" />
+    <public type="string" name="leave_call" id="0x7f120b36" />
+    <public type="string" name="leave_group_dm" id="0x7f120b37" />
+    <public type="string" name="leave_group_dm_body" id="0x7f120b38" />
+    <public type="string" name="leave_group_dm_managed_body" id="0x7f120b39" />
+    <public type="string" name="leave_group_dm_managed_title" id="0x7f120b3a" />
+    <public type="string" name="leave_group_dm_title" id="0x7f120b3b" />
+    <public type="string" name="leave_server" id="0x7f120b3c" />
+    <public type="string" name="leave_server_body" id="0x7f120b3d" />
+    <public type="string" name="leave_server_body_mobile" id="0x7f120b3e" />
+    <public type="string" name="leave_server_title" id="0x7f120b3f" />
+    <public type="string" name="lfg_active_groups" id="0x7f120b40" />
+    <public type="string" name="lfg_bump_button" id="0x7f120b41" />
+    <public type="string" name="lfg_bump_cooldown" id="0x7f120b42" />
+    <public type="string" name="lfg_channel_unavailable" id="0x7f120b43" />
+    <public type="string" name="lfg_create_a_group" id="0x7f120b44" />
+    <public type="string" name="lfg_create_button" id="0x7f120b45" />
+    <public type="string" name="lfg_create_placeholder" id="0x7f120b46" />
+    <public type="string" name="lfg_delete_modal_content" id="0x7f120b47" />
+    <public type="string" name="lfg_delete_modal_title" id="0x7f120b48" />
+    <public type="string" name="lfg_delisted_explanation_completed" id="0x7f120b49" />
+    <public type="string" name="lfg_delisted_explanation_expired" id="0x7f120b4a" />
+    <public type="string" name="lfg_delisted_explanation_inactive" id="0x7f120b4b" />
+    <public type="string" name="lfg_delisted_explanation_unknown" id="0x7f120b4c" />
+    <public type="string" name="lfg_edit_modal_cta" id="0x7f120b4d" />
+    <public type="string" name="lfg_edit_modal_description_label" id="0x7f120b4e" />
+    <public type="string" name="lfg_edit_modal_group_size_label" id="0x7f120b4f" />
+    <public type="string" name="lfg_edit_modal_title" id="0x7f120b50" />
+    <public type="string" name="lfg_empty_state_note" id="0x7f120b51" />
+    <public type="string" name="lfg_empty_state_note_2" id="0x7f120b52" />
+    <public type="string" name="lfg_empty_state_title" id="0x7f120b53" />
+    <public type="string" name="lfg_expired_banner" id="0x7f120b54" />
+    <public type="string" name="lfg_group_description_required" id="0x7f120b55" />
+    <public type="string" name="lfg_group_full" id="0x7f120b56" />
+    <public type="string" name="lfg_groups_looking" id="0x7f120b57" />
+    <public type="string" name="lfg_groups_looking_with_total" id="0x7f120b58" />
+    <public type="string" name="lfg_join_button" id="0x7f120b59" />
+    <public type="string" name="lfg_leave_button" id="0x7f120b5a" />
+    <public type="string" name="lfg_listing_age_hours" id="0x7f120b5b" />
+    <public type="string" name="lfg_listing_age_minutes" id="0x7f120b5c" />
+    <public type="string" name="lfg_listing_age_seconds" id="0x7f120b5d" />
+    <public type="string" name="lfg_listings_channel" id="0x7f120b5e" />
+    <public type="string" name="lfg_manage_group" id="0x7f120b5f" />
+    <public type="string" name="lfg_num_players" id="0x7f120b60" />
+    <public type="string" name="lfg_relist_button" id="0x7f120b61" />
+    <public type="string" name="lfg_relist_your_group" id="0x7f120b62" />
+    <public type="string" name="lfg_relisted" id="0x7f120b63" />
+    <public type="string" name="lfg_relisted_in_channel" id="0x7f120b64" />
+    <public type="string" name="lfg_save_button" id="0x7f120b65" />
+    <public type="string" name="lfg_save_modal_empty_text" id="0x7f120b66" />
+    <public type="string" name="lfg_save_modal_subtitle" id="0x7f120b67" />
+    <public type="string" name="lfg_save_modal_title" id="0x7f120b68" />
+    <public type="string" name="lfg_sidebar_description" id="0x7f120b69" />
+    <public type="string" name="lfg_sidebar_size" id="0x7f120b6a" />
+    <public type="string" name="lfg_sidebar_size_number" id="0x7f120b6b" />
+    <public type="string" name="lfg_sidebar_status" id="0x7f120b6c" />
+    <public type="string" name="lfg_sidebar_status_expired" id="0x7f120b6d" />
+    <public type="string" name="lfg_sidebar_status_expired_tooltip" id="0x7f120b6e" />
+    <public type="string" name="lfg_something_went_wrong" id="0x7f120b6f" />
+    <public type="string" name="lfg_spots_available" id="0x7f120b70" />
+    <public type="string" name="lfg_unknown_member_tooltip" id="0x7f120b71" />
+    <public type="string" name="lfg_view_button" id="0x7f120b72" />
+    <public type="string" name="lfg_your_active_group" id="0x7f120b73" />
+    <public type="string" name="lfg_your_group" id="0x7f120b74" />
+    <public type="string" name="library" id="0x7f120b75" />
+    <public type="string" name="light_blue" id="0x7f120b76" />
+    <public type="string" name="light_green" id="0x7f120b77" />
+    <public type="string" name="light_grey" id="0x7f120b78" />
+    <public type="string" name="link_account" id="0x7f120b79" />
+    <public type="string" name="link_copied" id="0x7f120b7a" />
+    <public type="string" name="link_settings" id="0x7f120b7b" />
+    <public type="string" name="link_your_discord_account" id="0x7f120b7c" />
+    <public type="string" name="link_your_xbox_account_1" id="0x7f120b7d" />
+    <public type="string" name="link_your_xbox_account_2" id="0x7f120b7e" />
+    <public type="string" name="linux" id="0x7f120b7f" />
+    <public type="string" name="listen_on_spotify" id="0x7f120b80" />
+    <public type="string" name="listening_to" id="0x7f120b81" />
+    <public type="string" name="listings_permissions" id="0x7f120b82" />
+    <public type="string" name="live" id="0x7f120b83" />
+    <public type="string" name="live_beta_description" id="0x7f120b84" />
+    <public type="string" name="live_on_twitch" id="0x7f120b85" />
+    <public type="string" name="live_viewers" id="0x7f120b86" />
+    <public type="string" name="load_image_error" id="0x7f120b87" />
+    <public type="string" name="load_more_messages" id="0x7f120b88" />
+    <public type="string" name="load_reactions_error" id="0x7f120b89" />
+    <public type="string" name="loading" id="0x7f120b8a" />
+    <public type="string" name="loading_divider" id="0x7f120b8b" />
+    <public type="string" name="loading_your_pin" id="0x7f120b8c" />
+    <public type="string" name="lobby" id="0x7f120b8d" />
+    <public type="string" name="local_push_notification_guild_verification_body" id="0x7f120b8e" />
+    <public type="string" name="locale" id="0x7f120b8f" />
+    <public type="string" name="login" id="0x7f120b90" />
+    <public type="string" name="login_body" id="0x7f120b91" />
+    <public type="string" name="login_title" id="0x7f120b92" />
+    <public type="string" name="logout" id="0x7f120b93" />
+    <public type="string" name="lt" id="0x7f120b94" />
+    <public type="string" name="lurker_mode_chat_input_back_button" id="0x7f120b95" />
+    <public type="string" name="lurker_mode_chat_input_button" id="0x7f120b96" />
+    <public type="string" name="lurker_mode_chat_input_message" id="0x7f120b97" />
+    <public type="string" name="lurker_mode_chat_input_message_ios" id="0x7f120b98" />
+    <public type="string" name="lurker_mode_view_guild" id="0x7f120b99" />
+    <public type="string" name="lurkers_description" id="0x7f120b9a" />
+    <public type="string" name="macos" id="0x7f120b9b" />
+    <public type="string" name="magenta" id="0x7f120b9c" />
+    <public type="string" name="manage_channel" id="0x7f120b9d" />
+    <public type="string" name="manage_channel_description" id="0x7f120b9e" />
+    <public type="string" name="manage_channels" id="0x7f120b9f" />
+    <public type="string" name="manage_channels_description" id="0x7f120ba0" />
+    <public type="string" name="manage_emojis" id="0x7f120ba1" />
+    <public type="string" name="manage_listings" id="0x7f120ba2" />
+    <public type="string" name="manage_listings_description" id="0x7f120ba3" />
+    <public type="string" name="manage_messages" id="0x7f120ba4" />
+    <public type="string" name="manage_messages_description" id="0x7f120ba5" />
+    <public type="string" name="manage_messages_description_in_announcement_channel" id="0x7f120ba6" />
+    <public type="string" name="manage_nicknames" id="0x7f120ba7" />
+    <public type="string" name="manage_nicknames_description" id="0x7f120ba8" />
+    <public type="string" name="manage_permissions" id="0x7f120ba9" />
+    <public type="string" name="manage_permissions_description" id="0x7f120baa" />
+    <public type="string" name="manage_roles" id="0x7f120bab" />
+    <public type="string" name="manage_roles_description" id="0x7f120bac" />
+    <public type="string" name="manage_server" id="0x7f120bad" />
+    <public type="string" name="manage_server_description" id="0x7f120bae" />
+    <public type="string" name="manage_user" id="0x7f120baf" />
+    <public type="string" name="manage_user_shorthand" id="0x7f120bb0" />
+    <public type="string" name="manage_webhooks" id="0x7f120bb1" />
+    <public type="string" name="manage_webhooks_description" id="0x7f120bb2" />
+    <public type="string" name="managed_role_explaination" id="0x7f120bb3" />
+    <public type="string" name="mark_as_read" id="0x7f120bb4" />
+    <public type="string" name="masked_link_body" id="0x7f120bb5" />
+    <public type="string" name="masked_link_cancel" id="0x7f120bb6" />
+    <public type="string" name="masked_link_confirm" id="0x7f120bb7" />
+    <public type="string" name="masked_link_trust_this_domain" id="0x7f120bb8" />
+    <public type="string" name="mature_listing_accept" id="0x7f120bb9" />
+    <public type="string" name="mature_listing_decline" id="0x7f120bba" />
+    <public type="string" name="mature_listing_description" id="0x7f120bbb" />
+    <public type="string" name="mature_listing_title" id="0x7f120bbc" />
+    <public type="string" name="max_age_never" id="0x7f120bbd" />
+    <public type="string" name="max_age_never_description_mobile" id="0x7f120bbe" />
+    <public type="string" name="max_number_of_uses" id="0x7f120bbf" />
+    <public type="string" name="max_uses" id="0x7f120bc0" />
+    <public type="string" name="max_uses_description_mobile" id="0x7f120bc1" />
+    <public type="string" name="max_uses_description_unlimited_uses" id="0x7f120bc2" />
+    <public type="string" name="me" id="0x7f120bc3" />
+    <public type="string" name="media_hint_body" id="0x7f120bc4" />
+    <public type="string" name="media_hint_title" id="0x7f120bc5" />
+    <public type="string" name="member" id="0x7f120bc6" />
+    <public type="string" name="member_list" id="0x7f120bc7" />
+    <public type="string" name="member_list_hidden" id="0x7f120bc8" />
+    <public type="string" name="member_list_server_owner_help" id="0x7f120bc9" />
+    <public type="string" name="members" id="0x7f120bca" />
+    <public type="string" name="members_header" id="0x7f120bcb" />
+    <public type="string" name="members_matching" id="0x7f120bcc" />
+    <public type="string" name="members_search_placeholder" id="0x7f120bcd" />
+    <public type="string" name="mention" id="0x7f120bce" />
+    <public type="string" name="mention_everyone" id="0x7f120bcf" />
+    <public type="string" name="mention_everyone_autocomplete_description" id="0x7f120bd0" />
+    <public type="string" name="mention_everyone_autocomplete_description_mobile" id="0x7f120bd1" />
+    <public type="string" name="mention_everyone_description" id="0x7f120bd2" />
+    <public type="string" name="mention_here_autocomplete_description" id="0x7f120bd3" />
+    <public type="string" name="mention_here_autocomplete_description_mobile" id="0x7f120bd4" />
+    <public type="string" name="mention_role_autocomplete_description_mobile" id="0x7f120bd5" />
+    <public type="string" name="mention_users_with_role" id="0x7f120bd6" />
+    <public type="string" name="mentions" id="0x7f120bd7" />
+    <public type="string" name="mentions_count" id="0x7f120bd8" />
+    <public type="string" name="message_display_mode_label" id="0x7f120bd9" />
+    <public type="string" name="message_edited" id="0x7f120bda" />
+    <public type="string" name="message_options" id="0x7f120bdb" />
+    <public type="string" name="message_pinned" id="0x7f120bdc" />
+    <public type="string" name="message_preview" id="0x7f120bdd" />
+    <public type="string" name="message_rate_limited_body" id="0x7f120bde" />
+    <public type="string" name="message_rate_limited_button" id="0x7f120bdf" />
+    <public type="string" name="message_rate_limited_header" id="0x7f120be0" />
+    <public type="string" name="message_too_long_body" id="0x7f120be1" />
+    <public type="string" name="message_too_long_header" id="0x7f120be2" />
+    <public type="string" name="message_tts" id="0x7f120be3" />
+    <public type="string" name="message_tts_deleted_role" id="0x7f120be4" />
+    <public type="string" name="message_unpinned" id="0x7f120be5" />
+    <public type="string" name="message_warning_mention_everyone_body" id="0x7f120be6" />
+    <public type="string" name="message_warning_mention_everyone_title" id="0x7f120be7" />
+    <public type="string" name="messages" id="0x7f120be8" />
+    <public type="string" name="mfa_sms_add_phone" id="0x7f120be9" />
+    <public type="string" name="mfa_sms_already_enabled" id="0x7f120bea" />
+    <public type="string" name="mfa_sms_auth" id="0x7f120beb" />
+    <public type="string" name="mfa_sms_auth_current_phone" id="0x7f120bec" />
+    <public type="string" name="mfa_sms_auth_sales_pitch" id="0x7f120bed" />
+    <public type="string" name="mfa_sms_confirm_remove_action" id="0x7f120bee" />
+    <public type="string" name="mfa_sms_confirm_remove_body" id="0x7f120bef" />
+    <public type="string" name="mfa_sms_disabled_partner" id="0x7f120bf0" />
+    <public type="string" name="mfa_sms_enable" id="0x7f120bf1" />
+    <public type="string" name="mfa_sms_enable_subheader" id="0x7f120bf2" />
+    <public type="string" name="mfa_sms_phone_number_hide" id="0x7f120bf3" />
+    <public type="string" name="mfa_sms_phone_number_reveal" id="0x7f120bf4" />
+    <public type="string" name="mfa_sms_receive_code" id="0x7f120bf5" />
+    <public type="string" name="mfa_sms_remove" id="0x7f120bf6" />
+    <public type="string" name="mfa_sms_resend" id="0x7f120bf7" />
+    <public type="string" name="microphone_permission_error" id="0x7f120bf8" />
+    <public type="string" name="minimum_size" id="0x7f120bf9" />
+    <public type="string" name="missed_an_update" id="0x7f120bfa" />
+    <public type="string" name="missing_entitlement_modal_body" id="0x7f120bfb" />
+    <public type="string" name="missing_entitlement_modal_body_unknown_application" id="0x7f120bfc" />
+    <public type="string" name="missing_entitlement_modal_header" id="0x7f120bfd" />
+    <public type="string" name="missing_entitlement_modal_header_unknown_application" id="0x7f120bfe" />
+    <public type="string" name="mobile_enable_hardware_scaling" id="0x7f120bff" />
+    <public type="string" name="mobile_enable_hardware_scaling_desc" id="0x7f120c00" />
+    <public type="string" name="moderation" id="0x7f120c01" />
+    <public type="string" name="modify_followed_news_header" id="0x7f120c02" />
+    <public type="string" name="monthly" id="0x7f120c03" />
+    <public type="string" name="more" id="0x7f120c04" />
+    <public type="string" name="move_from_category_to" id="0x7f120c05" />
+    <public type="string" name="move_members" id="0x7f120c06" />
+    <public type="string" name="move_members_description" id="0x7f120c07" />
+    <public type="string" name="move_to" id="0x7f120c08" />
+    <public type="string" name="move_to_success" id="0x7f120c09" />
+    <public type="string" name="mtrl_chip_close_icon_content_description" id="0x7f120c0a" />
+    <public type="string" name="mute" id="0x7f120c0b" />
+    <public type="string" name="mute_category" id="0x7f120c0c" />
+    <public type="string" name="mute_channel" id="0x7f120c0d" />
+    <public type="string" name="mute_channel_old" id="0x7f120c0e" />
+    <public type="string" name="mute_during_work" id="0x7f120c0f" />
+    <public type="string" name="mute_for_an_hour" id="0x7f120c10" />
+    <public type="string" name="mute_group_dm" id="0x7f120c11" />
+    <public type="string" name="mute_members" id="0x7f120c12" />
+    <public type="string" name="mutual_friends" id="0x7f120c13" />
+    <public type="string" name="mutual_guilds" id="0x7f120c14" />
+    <public type="string" name="n_days" id="0x7f120c15" />
+    <public type="string" name="nearby_scan" id="0x7f120c16" />
+    <public type="string" name="need_account" id="0x7f120c17" />
+    <public type="string" name="network_error_bad_request" id="0x7f120c18" />
+    <public type="string" name="network_error_cloudflare_intermittent" id="0x7f120c19" />
+    <public type="string" name="network_error_cloudflare_unauthorized" id="0x7f120c1a" />
+    <public type="string" name="network_error_connection" id="0x7f120c1b" />
+    <public type="string" name="network_error_forbidden" id="0x7f120c1c" />
+    <public type="string" name="network_error_request_too_large" id="0x7f120c1d" />
+    <public type="string" name="network_error_rest_request" id="0x7f120c1e" />
+    <public type="string" name="network_error_ssl" id="0x7f120c1f" />
+    <public type="string" name="network_error_unauthorized" id="0x7f120c20" />
+    <public type="string" name="network_error_unknown" id="0x7f120c21" />
+    <public type="string" name="network_error_unknown_host" id="0x7f120c22" />
+    <public type="string" name="network_offline" id="0x7f120c23" />
+    <public type="string" name="nevermind" id="0x7f120c24" />
+    <public type="string" name="new_dm" id="0x7f120c25" />
+    <public type="string" name="new_group_dm" id="0x7f120c26" />
+    <public type="string" name="new_guilds_dm_allowed" id="0x7f120c27" />
+    <public type="string" name="new_mentions" id="0x7f120c28" />
+    <public type="string" name="new_messages" id="0x7f120c29" />
+    <public type="string" name="new_messages_divider" id="0x7f120c2a" />
+    <public type="string" name="new_messages_estimated" id="0x7f120c2b" />
+    <public type="string" name="new_messages_estimated_with_date" id="0x7f120c2c" />
+    <public type="string" name="new_messages_with_date" id="0x7f120c2d" />
+    <public type="string" name="new_override" id="0x7f120c2e" />
+    <public type="string" name="new_permission" id="0x7f120c2f" />
+    <public type="string" name="new_terms_ack" id="0x7f120c30" />
+    <public type="string" name="new_terms_continue" id="0x7f120c31" />
+    <public type="string" name="new_terms_description" id="0x7f120c32" />
+    <public type="string" name="new_terms_title" id="0x7f120c33" />
+    <public type="string" name="new_unreads" id="0x7f120c34" />
+    <public type="string" name="news_channel" id="0x7f120c35" />
+    <public type="string" name="news_channel_edit_news" id="0x7f120c36" />
+    <public type="string" name="news_channel_publish" id="0x7f120c37" />
+    <public type="string" name="news_channel_publish_bump" id="0x7f120c38" />
+    <public type="string" name="news_channel_publish_bump_hide_permanently" id="0x7f120c39" />
+    <public type="string" name="news_channel_publish_news" id="0x7f120c3a" />
+    <public type="string" name="news_channel_published" id="0x7f120c3b" />
+    <public type="string" name="next" id="0x7f120c3c" />
+    <public type="string" name="nickname" id="0x7f120c3d" />
+    <public type="string" name="nickname_changed" id="0x7f120c3e" />
+    <public type="string" name="nickname_cleared" id="0x7f120c3f" />
+    <public type="string" name="nl" id="0x7f120c40" />
+    <public type="string" name="no" id="0x7f120c41" />
+    <public type="string" name="no_afk_channel" id="0x7f120c42" />
+    <public type="string" name="no_authorized_apps" id="0x7f120c43" />
+    <public type="string" name="no_authorized_apps_note" id="0x7f120c44" />
+    <public type="string" name="no_ban_reason" id="0x7f120c45" />
+    <public type="string" name="no_bans" id="0x7f120c46" />
+    <public type="string" name="no_camera_access" id="0x7f120c47" />
+    <public type="string" name="no_category" id="0x7f120c48" />
+    <public type="string" name="no_channel_description" id="0x7f120c49" />
+    <public type="string" name="no_emoji" id="0x7f120c4a" />
+    <public type="string" name="no_emoji_body" id="0x7f120c4b" />
+    <public type="string" name="no_emoji_search_results" id="0x7f120c4c" />
+    <public type="string" name="no_emoji_title" id="0x7f120c4d" />
+    <public type="string" name="no_gif_favorites_flavor_favorite_please" id="0x7f120c4e" />
+    <public type="string" name="no_gif_favorites_flavor_still_here" id="0x7f120c4f" />
+    <public type="string" name="no_gif_favorites_go_favorite" id="0x7f120c50" />
+    <public type="string" name="no_gif_favorites_how_to_favorite" id="0x7f120c51" />
+    <public type="string" name="no_gif_favorites_where_to_favorite" id="0x7f120c52" />
+    <public type="string" name="no_gif_search_results" id="0x7f120c53" />
+    <public type="string" name="no_input_devices" id="0x7f120c54" />
+    <public type="string" name="no_input_devices_detected" id="0x7f120c55" />
+    <public type="string" name="no_instant_invite" id="0x7f120c56" />
+    <public type="string" name="no_integrations" id="0x7f120c57" />
+    <public type="string" name="no_integrations_body" id="0x7f120c58" />
+    <public type="string" name="no_integrations_label" id="0x7f120c59" />
+    <public type="string" name="no_invites_body" id="0x7f120c5a" />
+    <public type="string" name="no_invites_caption" id="0x7f120c5b" />
+    <public type="string" name="no_invites_label" id="0x7f120c5c" />
+    <public type="string" name="no_mail_account_description" id="0x7f120c5d" />
+    <public type="string" name="no_mail_account_title" id="0x7f120c5e" />
+    <public type="string" name="no_mic_body" id="0x7f120c5f" />
+    <public type="string" name="no_mic_title" id="0x7f120c60" />
+    <public type="string" name="no_mutual_friends" id="0x7f120c61" />
+    <public type="string" name="no_mutual_guilds" id="0x7f120c62" />
+    <public type="string" name="no_output_devices" id="0x7f120c63" />
+    <public type="string" name="no_photo_in_camera_roll" id="0x7f120c64" />
+    <public type="string" name="no_photos_access" id="0x7f120c65" />
+    <public type="string" name="no_pins_in_channel" id="0x7f120c66" />
+    <public type="string" name="no_pins_in_dm" id="0x7f120c67" />
+    <public type="string" name="no_private_channels_description" id="0x7f120c68" />
+    <public type="string" name="no_private_channels_title" id="0x7f120c69" />
+    <public type="string" name="no_reactions_body" id="0x7f120c6a" />
+    <public type="string" name="no_reactions_header" id="0x7f120c6b" />
+    <public type="string" name="no_recent_mentions" id="0x7f120c6c" />
+    <public type="string" name="no_send_messages_permission_placeholder" id="0x7f120c6d" />
+    <public type="string" name="no_system_channel" id="0x7f120c6e" />
+    <public type="string" name="no_text" id="0x7f120c6f" />
+    <public type="string" name="no_thanks" id="0x7f120c70" />
+    <public type="string" name="no_user_limit" id="0x7f120c71" />
+    <public type="string" name="no_video_devices" id="0x7f120c72" />
+    <public type="string" name="noise_cancellation" id="0x7f120c73" />
+    <public type="string" name="noise_reduction_none" id="0x7f120c74" />
+    <public type="string" name="noise_suppression" id="0x7f120c75" />
+    <public type="string" name="none" id="0x7f120c76" />
+    <public type="string" name="not_available" id="0x7f120c77" />
+    <public type="string" name="not_enough_guild_members" id="0x7f120c78" />
+    <public type="string" name="not_in_the_call" id="0x7f120c79" />
+    <public type="string" name="not_in_the_voice_channel" id="0x7f120c7a" />
+    <public type="string" name="note" id="0x7f120c7b" />
+    <public type="string" name="note_placeholder" id="0x7f120c7c" />
+    <public type="string" name="note_placeholder_mobile" id="0x7f120c7d" />
+    <public type="string" name="notice_application_test_mode" id="0x7f120c7e" />
+    <public type="string" name="notice_application_test_mode_go_to_listing" id="0x7f120c7f" />
+    <public type="string" name="notice_connect_spotify" id="0x7f120c80" />
+    <public type="string" name="notice_connection_conflict" id="0x7f120c81" />
+    <public type="string" name="notice_corrupt_installation" id="0x7f120c82" />
+    <public type="string" name="notice_corrupt_installation_help_link_text" id="0x7f120c83" />
+    <public type="string" name="notice_detected_off_platform_no_premium_perk_message" id="0x7f120c84" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_button" id="0x7f120c85" />
+    <public type="string" name="notice_detected_off_platform_premium_perk_message" id="0x7f120c86" />
+    <public type="string" name="notice_dispatch_api_error" id="0x7f120c87" />
+    <public type="string" name="notice_dispatch_application_lock_failed" id="0x7f120c88" />
+    <public type="string" name="notice_dispatch_error" id="0x7f120c89" />
+    <public type="string" name="notice_dispatch_error_disk_full" id="0x7f120c8a" />
+    <public type="string" name="notice_dispatch_error_disk_low" id="0x7f120c8b" />
+    <public type="string" name="notice_dispatch_error_file_name_too_long" id="0x7f120c8c" />
+    <public type="string" name="notice_dispatch_error_invalid_drive" id="0x7f120c8d" />
+    <public type="string" name="notice_dispatch_error_io_permission_denied" id="0x7f120c8e" />
+    <public type="string" name="notice_dispatch_error_no_manifests" id="0x7f120c8f" />
+    <public type="string" name="notice_dispatch_error_not_entitled" id="0x7f120c90" />
+    <public type="string" name="notice_dispatch_error_post_install_cancelled" id="0x7f120c91" />
+    <public type="string" name="notice_dispatch_error_post_install_failed" id="0x7f120c92" />
+    <public type="string" name="notice_dispatch_error_unwritable" id="0x7f120c93" />
+    <public type="string" name="notice_dispatch_error_with_code" id="0x7f120c94" />
+    <public type="string" name="notice_dispatch_install_script_progress" id="0x7f120c95" />
+    <public type="string" name="notice_dispatch_install_script_progress_with_name" id="0x7f120c96" />
+    <public type="string" name="notice_hardware_mute" id="0x7f120c97" />
+    <public type="string" name="notice_mfa_sms_backup" id="0x7f120c98" />
+    <public type="string" name="notice_mfa_sms_backup_button" id="0x7f120c99" />
+    <public type="string" name="notice_native_apps" id="0x7f120c9a" />
+    <public type="string" name="notice_no_input_detected" id="0x7f120c9b" />
+    <public type="string" name="notice_no_input_detected_help_link_text" id="0x7f120c9c" />
+    <public type="string" name="notice_no_input_detected_settings" id="0x7f120c9d" />
+    <public type="string" name="notice_no_input_detected_settings_link_text" id="0x7f120c9e" />
+    <public type="string" name="notice_premium_grandfathered_ended" id="0x7f120c9f" />
+    <public type="string" name="notice_premium_grandfathered_ending" id="0x7f120ca0" />
+    <public type="string" name="notice_premium_promo_action" id="0x7f120ca1" />
+    <public type="string" name="notice_premium_promo_message" id="0x7f120ca2" />
+    <public type="string" name="notice_scheduled_maintenance" id="0x7f120ca3" />
+    <public type="string" name="notice_spotify_auto_paused" id="0x7f120ca4" />
+    <public type="string" name="notice_streamer_mode_text" id="0x7f120ca5" />
+    <public type="string" name="notice_survey_body" id="0x7f120ca6" />
+    <public type="string" name="notice_survey_button" id="0x7f120ca7" />
+    <public type="string" name="notice_survey_prompt" id="0x7f120ca8" />
+    <public type="string" name="notice_unclaimed_account" id="0x7f120ca9" />
+    <public type="string" name="notice_unverified_account" id="0x7f120caa" />
+    <public type="string" name="notice_video_unsupported_browser" id="0x7f120cab" />
+    <public type="string" name="notice_whats_this" id="0x7f120cac" />
+    <public type="string" name="notification_accepted_friend_request" id="0x7f120cad" />
+    <public type="string" name="notification_body_attachment" id="0x7f120cae" />
+    <public type="string" name="notification_body_start_game" id="0x7f120caf" />
+    <public type="string" name="notification_dismiss" id="0x7f120cb0" />
+    <public type="string" name="notification_message_create_dm_activity_join" id="0x7f120cb1" />
+    <public type="string" name="notification_message_create_dm_activity_listen" id="0x7f120cb2" />
+    <public type="string" name="notification_message_create_dm_activity_spectate" id="0x7f120cb3" />
+    <public type="string" name="notification_message_create_group_dm_activity_join" id="0x7f120cb4" />
+    <public type="string" name="notification_message_create_group_dm_activity_listen" id="0x7f120cb5" />
+    <public type="string" name="notification_message_create_group_dm_activity_spectate" id="0x7f120cb6" />
+    <public type="string" name="notification_message_create_guild_activity_join" id="0x7f120cb7" />
+    <public type="string" name="notification_message_create_guild_activity_listen" id="0x7f120cb8" />
+    <public type="string" name="notification_message_create_guild_activity_spectate" id="0x7f120cb9" />
+    <public type="string" name="notification_overrides" id="0x7f120cba" />
+    <public type="string" name="notification_pending_friend_request" id="0x7f120cbb" />
+    <public type="string" name="notification_reply" id="0x7f120cbc" />
+    <public type="string" name="notification_reply_failed" id="0x7f120cbd" />
+    <public type="string" name="notification_reply_success" id="0x7f120cbe" />
+    <public type="string" name="notification_settings" id="0x7f120cbf" />
+    <public type="string" name="notification_title_discord" id="0x7f120cc0" />
+    <public type="string" name="notification_title_start_game" id="0x7f120cc1" />
+    <public type="string" name="notification_voice_status_body" id="0x7f120cc2" />
+    <public type="string" name="notification_voice_status_body_no_status" id="0x7f120cc3" />
+    <public type="string" name="notification_voice_status_title" id="0x7f120cc4" />
+    <public type="string" name="notifications" id="0x7f120cc5" />
+    <public type="string" name="notifications_nuf_body" id="0x7f120cc6" />
+    <public type="string" name="notifications_nuf_cta" id="0x7f120cc7" />
+    <public type="string" name="notifications_nuf_title" id="0x7f120cc8" />
+    <public type="string" name="nsfw_accept" id="0x7f120cc9" />
+    <public type="string" name="nsfw_decline" id="0x7f120cca" />
+    <public type="string" name="nsfw_description" id="0x7f120ccb" />
+    <public type="string" name="nsfw_note" id="0x7f120ccc" />
+    <public type="string" name="nsfw_title" id="0x7f120ccd" />
+    <public type="string" name="nuf_body" id="0x7f120cce" />
+    <public type="string" name="nuf_body_mobile" id="0x7f120ccf" />
+    <public type="string" name="nuf_chat_with_friends" id="0x7f120cd0" />
+    <public type="string" name="nuf_claim_account_body_1" id="0x7f120cd1" />
+    <public type="string" name="nuf_claim_account_body_2" id="0x7f120cd2" />
+    <public type="string" name="nuf_claim_account_button" id="0x7f120cd3" />
+    <public type="string" name="nuf_claim_account_generic_error" id="0x7f120cd4" />
+    <public type="string" name="nuf_claim_account_title" id="0x7f120cd5" />
+    <public type="string" name="nuf_club_or_interest_group" id="0x7f120cd6" />
+    <public type="string" name="nuf_create_server_body" id="0x7f120cd7" />
+    <public type="string" name="nuf_create_server_button" id="0x7f120cd8" />
+    <public type="string" name="nuf_create_server_error" id="0x7f120cd9" />
+    <public type="string" name="nuf_create_server_note" id="0x7f120cda" />
+    <public type="string" name="nuf_create_server_title" id="0x7f120cdb" />
+    <public type="string" name="nuf_download_app_body" id="0x7f120cdc" />
+    <public type="string" name="nuf_download_app_button_platform" id="0x7f120cdd" />
+    <public type="string" name="nuf_download_app_button_type" id="0x7f120cde" />
+    <public type="string" name="nuf_download_app_intro" id="0x7f120cdf" />
+    <public type="string" name="nuf_download_app_title" id="0x7f120ce0" />
+    <public type="string" name="nuf_gaming_community" id="0x7f120ce1" />
+    <public type="string" name="nuf_get_started" id="0x7f120ce2" />
+    <public type="string" name="nuf_join_a_friend" id="0x7f120ce3" />
+    <public type="string" name="nuf_join_server_body_1" id="0x7f120ce4" />
+    <public type="string" name="nuf_join_server_body_2" id="0x7f120ce5" />
+    <public type="string" name="nuf_join_server_button" id="0x7f120ce6" />
+    <public type="string" name="nuf_join_server_input_label" id="0x7f120ce7" />
+    <public type="string" name="nuf_join_server_input_note" id="0x7f120ce8" />
+    <public type="string" name="nuf_join_server_title_1" id="0x7f120ce9" />
+    <public type="string" name="nuf_join_server_title_2" id="0x7f120cea" />
+    <public type="string" name="nuf_just_look_around" id="0x7f120ceb" />
+    <public type="string" name="nuf_title" id="0x7f120cec" />
+    <public type="string" name="nuf_title_mobile" id="0x7f120ced" />
+    <public type="string" name="nuf_voice_chat_while_gaming" id="0x7f120cee" />
+    <public type="string" name="nuf_welcome_carousel_1_body_mobile" id="0x7f120cef" />
+    <public type="string" name="nuf_welcome_carousel_1_title_mobile" id="0x7f120cf0" />
+    <public type="string" name="nuf_welcome_carousel_2_body_mobile" id="0x7f120cf1" />
+    <public type="string" name="nuf_welcome_carousel_2_title_mobile" id="0x7f120cf2" />
+    <public type="string" name="nuf_welcome_carousel_3_body_mobile" id="0x7f120cf3" />
+    <public type="string" name="nuf_welcome_carousel_3_title_mobile" id="0x7f120cf4" />
+    <public type="string" name="nuf_welcome_carousel_4_body_mobile" id="0x7f120cf5" />
+    <public type="string" name="nuf_welcome_carousel_4_title_mobile" id="0x7f120cf6" />
+    <public type="string" name="nuf_welcome_carousel_5_body_mobile" id="0x7f120cf7" />
+    <public type="string" name="nuf_welcome_carousel_5_title_mobile" id="0x7f120cf8" />
+    <public type="string" name="nuf_what_do_you_want" id="0x7f120cf9" />
+    <public type="string" name="num_channels" id="0x7f120cfa" />
+    <public type="string" name="num_members" id="0x7f120cfb" />
+    <public type="string" name="num_subscribers" id="0x7f120cfc" />
+    <public type="string" name="num_users" id="0x7f120cfd" />
+    <public type="string" name="nux_overlay_description" id="0x7f120cfe" />
+    <public type="string" name="nux_overlay_enable" id="0x7f120cff" />
+    <public type="string" name="nux_overlay_title" id="0x7f120d00" />
+    <public type="string" name="nux_post_reg_join_server_description" id="0x7f120d01" />
+    <public type="string" name="nux_post_reg_join_server_skip" id="0x7f120d02" />
+    <public type="string" name="nux_post_reg_join_server_title" id="0x7f120d03" />
+    <public type="string" name="nux_samsung_game_presence_link_description" id="0x7f120d04" />
+    <public type="string" name="nux_samsung_game_presence_link_enable" id="0x7f120d05" />
+    <public type="string" name="nux_samsung_game_presence_link_title" id="0x7f120d06" />
+    <public type="string" name="oauth2_authorize_error" id="0x7f120d07" />
+    <public type="string" name="oauth2_connect_to_discord" id="0x7f120d08" />
+    <public type="string" name="oauth2_insecure_notice" id="0x7f120d09" />
+    <public type="string" name="oauth2_insecure_read_notice" id="0x7f120d0a" />
+    <public type="string" name="oauth2_label" id="0x7f120d0b" />
+    <public type="string" name="oauth2_message_cta" id="0x7f120d0c" />
+    <public type="string" name="oauth2_message_unknown_error" id="0x7f120d0d" />
+    <public type="string" name="oauth2_request_invalid_scope" id="0x7f120d0e" />
+    <public type="string" name="oauth2_request_missing_param" id="0x7f120d0f" />
+    <public type="string" name="oauth2_secure_notice" id="0x7f120d10" />
+    <public type="string" name="oauth2_security_notice" id="0x7f120d11" />
+    <public type="string" name="oauth2_title" id="0x7f120d12" />
+    <public type="string" name="okay" id="0x7f120d13" />
+    <public type="string" name="one_user_typing" id="0x7f120d14" />
+    <public type="string" name="ongoing_call" id="0x7f120d15" />
+    <public type="string" name="ongoing_call_connected_users" id="0x7f120d16" />
+    <public type="string" name="ongoing_call_voice_quality_low" id="0x7f120d17" />
+    <public type="string" name="ongoing_call_you_are_all_alone" id="0x7f120d18" />
+    <public type="string" name="only_you_can_see_and_delete_these" id="0x7f120d19" />
+    <public type="string" name="open" id="0x7f120d1a" />
+    <public type="string" name="open_app" id="0x7f120d1b" />
+    <public type="string" name="open_in_browser" id="0x7f120d1c" />
+    <public type="string" name="open_in_theater" id="0x7f120d1d" />
+    <public type="string" name="open_link" id="0x7f120d1e" />
+    <public type="string" name="open_original_image" id="0x7f120d1f" />
+    <public type="string" name="options" id="0x7f120d20" />
+    <public type="string" name="orange" id="0x7f120d21" />
+    <public type="string" name="other_options" id="0x7f120d22" />
+    <public type="string" name="other_reactions" id="0x7f120d23" />
+    <public type="string" name="others_online" id="0x7f120d24" />
+    <public type="string" name="out_of_date_action" id="0x7f120d25" />
+    <public type="string" name="out_of_date_description" id="0x7f120d26" />
+    <public type="string" name="out_of_date_title" id="0x7f120d27" />
+    <public type="string" name="outgoing_friend_request" id="0x7f120d28" />
+    <public type="string" name="outgoing_friend_request_delete_msg" id="0x7f120d29" />
+    <public type="string" name="overlay" id="0x7f120d2a" />
+    <public type="string" name="overlay_channel_chat_hotkey" id="0x7f120d2b" />
+    <public type="string" name="overlay_click_to_jump_to_channel" id="0x7f120d2c" />
+    <public type="string" name="overlay_click_to_unlock" id="0x7f120d2d" />
+    <public type="string" name="overlay_crashed_title" id="0x7f120d2e" />
+    <public type="string" name="overlay_explanation" id="0x7f120d2f" />
+    <public type="string" name="overlay_friend_calling" id="0x7f120d30" />
+    <public type="string" name="overlay_in_game_preview_header" id="0x7f120d31" />
+    <public type="string" name="overlay_launch_open_tip" id="0x7f120d32" />
+    <public type="string" name="overlay_launch_title" id="0x7f120d33" />
+    <public type="string" name="overlay_link_alert_body" id="0x7f120d34" />
+    <public type="string" name="overlay_link_alert_secondary" id="0x7f120d35" />
+    <public type="string" name="overlay_link_alert_title" id="0x7f120d36" />
+    <public type="string" name="overlay_menu_get_invite" id="0x7f120d37" />
+    <public type="string" name="overlay_menu_open_discord" id="0x7f120d38" />
+    <public type="string" name="overlay_menu_switch_channels" id="0x7f120d39" />
+    <public type="string" name="overlay_mobile_required" id="0x7f120d3a" />
+    <public type="string" name="overlay_mobile_toggle_desc" id="0x7f120d3b" />
+    <public type="string" name="overlay_mobile_toggle_label" id="0x7f120d3c" />
+    <public type="string" name="overlay_mobile_unauthed" id="0x7f120d3d" />
+    <public type="string" name="overlay_news_go_live_body" id="0x7f120d3e" />
+    <public type="string" name="overlay_news_go_live_cta" id="0x7f120d3f" />
+    <public type="string" name="overlay_news_text_pinning_body" id="0x7f120d40" />
+    <public type="string" name="overlay_news_text_pinning_tip" id="0x7f120d41" />
+    <public type="string" name="overlay_news_text_pinning_title" id="0x7f120d42" />
+    <public type="string" name="overlay_no_results" id="0x7f120d43" />
+    <public type="string" name="overlay_notification_incoming_call" id="0x7f120d44" />
+    <public type="string" name="overlay_notification_settings_disabled" id="0x7f120d45" />
+    <public type="string" name="overlay_notification_settings_position" id="0x7f120d46" />
+    <public type="string" name="overlay_notifications_bottom_left" id="0x7f120d47" />
+    <public type="string" name="overlay_notifications_bottom_right" id="0x7f120d48" />
+    <public type="string" name="overlay_notifications_disabled" id="0x7f120d49" />
+    <public type="string" name="overlay_notifications_settings" id="0x7f120d4a" />
+    <public type="string" name="overlay_notifications_top_left" id="0x7f120d4b" />
+    <public type="string" name="overlay_notifications_top_right" id="0x7f120d4c" />
+    <public type="string" name="overlay_pin_label_tutorial" id="0x7f120d4d" />
+    <public type="string" name="overlay_reload" id="0x7f120d4e" />
+    <public type="string" name="overlay_reset_default_layout" id="0x7f120d4f" />
+    <public type="string" name="overlay_settings" id="0x7f120d50" />
+    <public type="string" name="overlay_settings_general_tab" id="0x7f120d51" />
+    <public type="string" name="overlay_settings_title" id="0x7f120d52" />
+    <public type="string" name="overlay_settings_voice_tab" id="0x7f120d53" />
+    <public type="string" name="overlay_text_notification_tip" id="0x7f120d54" />
+    <public type="string" name="overlay_text_notification_tip_unlocked" id="0x7f120d55" />
+    <public type="string" name="overlay_too_small" id="0x7f120d56" />
+    <public type="string" name="overlay_unlock_to_answer" id="0x7f120d57" />
+    <public type="string" name="overlay_unlock_to_join" id="0x7f120d58" />
+    <public type="string" name="overlay_user_chat_hotkey" id="0x7f120d59" />
+    <public type="string" name="overlay_voice_channels_empty_state" id="0x7f120d5a" />
+    <public type="string" name="overlay_widget_hide_in_game" id="0x7f120d5b" />
+    <public type="string" name="overlay_widget_show_in_game" id="0x7f120d5c" />
+    <public type="string" name="overview" id="0x7f120d5d" />
+    <public type="string" name="overwrite_autocomplete_label" id="0x7f120d5e" />
+    <public type="string" name="overwrite_autocomplete_placeholder" id="0x7f120d5f" />
+    <public type="string" name="overwrite_no_role_to_add" id="0x7f120d60" />
+    <public type="string" name="pagination_next" id="0x7f120d61" />
+    <public type="string" name="pagination_page_label" id="0x7f120d62" />
+    <public type="string" name="pagination_page_of" id="0x7f120d63" />
+    <public type="string" name="pagination_previous" id="0x7f120d64" />
+    <public type="string" name="paginator_current_page" id="0x7f120d65" />
+    <public type="string" name="paginator_of_pages" id="0x7f120d66" />
+    <public type="string" name="partial_outage" id="0x7f120d67" />
+    <public type="string" name="partial_outage_a11y" id="0x7f120d68" />
+    <public type="string" name="participators" id="0x7f120d69" />
+    <public type="string" name="participators_compared_to_communicators" id="0x7f120d6a" />
+    <public type="string" name="partner_badge_tooltip" id="0x7f120d6b" />
+    <public type="string" name="party_full" id="0x7f120d6c" />
+    <public type="string" name="party_join" id="0x7f120d6d" />
+    <public type="string" name="party_joined" id="0x7f120d6e" />
+    <public type="string" name="party_locked" id="0x7f120d6f" />
+    <public type="string" name="password_length_error" id="0x7f120d70" />
+    <public type="string" name="password_manager" id="0x7f120d71" />
+    <public type="string" name="password_manager_info_android" id="0x7f120d72" />
+    <public type="string" name="password_manager_open_settings" id="0x7f120d73" />
+    <public type="string" name="password_manager_open_settings_error" id="0x7f120d74" />
+    <public type="string" name="password_manager_use" id="0x7f120d75" />
+    <public type="string" name="password_required" id="0x7f120d76" />
+    <public type="string" name="password_toggle_content_description" id="0x7f120d77" />
+    <public type="string" name="paste" id="0x7f120d78" />
+    <public type="string" name="paste_and_send" id="0x7f120d79" />
+    <public type="string" name="path_password_eye" id="0x7f120d7a" />
+    <public type="string" name="path_password_eye_mask_strike_through" id="0x7f120d7b" />
+    <public type="string" name="path_password_eye_mask_visible" id="0x7f120d7c" />
+    <public type="string" name="path_password_strike_through" id="0x7f120d7d" />
+    <public type="string" name="pause" id="0x7f120d7e" />
+    <public type="string" name="payment_authentication_modal_button" id="0x7f120d7f" />
+    <public type="string" name="payment_authentication_modal_button_cancel_payment" id="0x7f120d80" />
+    <public type="string" name="payment_authentication_modal_canceled" id="0x7f120d81" />
+    <public type="string" name="payment_authentication_modal_fail" id="0x7f120d82" />
+    <public type="string" name="payment_authentication_modal_start" id="0x7f120d83" />
+    <public type="string" name="payment_authentication_modal_success" id="0x7f120d84" />
+    <public type="string" name="payment_authentication_modal_title" id="0x7f120d85" />
+    <public type="string" name="payment_authentication_modal_title_canceled" id="0x7f120d86" />
+    <public type="string" name="payment_authentication_modal_title_fail" id="0x7f120d87" />
+    <public type="string" name="payment_authentication_modal_title_success" id="0x7f120d88" />
+    <public type="string" name="payment_modal_button_change_card" id="0x7f120d89" />
+    <public type="string" name="payment_modal_button_change_paypal" id="0x7f120d8a" />
+    <public type="string" name="payment_modal_button_premium" id="0x7f120d8b" />
+    <public type="string" name="payment_modal_button_premium_gift" id="0x7f120d8c" />
+    <public type="string" name="payment_modal_one_month" id="0x7f120d8d" />
+    <public type="string" name="payment_modal_one_year" id="0x7f120d8e" />
+    <public type="string" name="payment_modal_per_month" id="0x7f120d8f" />
+    <public type="string" name="payment_modal_per_year" id="0x7f120d90" />
+    <public type="string" name="payment_modal_subtitle" id="0x7f120d91" />
+    <public type="string" name="payment_modal_subtitle_premium_gift" id="0x7f120d92" />
+    <public type="string" name="payment_modal_title_change_card" id="0x7f120d93" />
+    <public type="string" name="payment_modal_title_change_paypal" id="0x7f120d94" />
+    <public type="string" name="payment_modal_title_new_monthly" id="0x7f120d95" />
+    <public type="string" name="payment_modal_title_new_yearly" id="0x7f120d96" />
+    <public type="string" name="payment_price_change_body" id="0x7f120d97" />
+    <public type="string" name="payment_price_change_title" id="0x7f120d98" />
+    <public type="string" name="payment_source_billing_address" id="0x7f120d99" />
+    <public type="string" name="payment_source_card_ending" id="0x7f120d9a" />
+    <public type="string" name="payment_source_card_ending_in" id="0x7f120d9b" />
+    <public type="string" name="payment_source_card_expires" id="0x7f120d9c" />
+    <public type="string" name="payment_source_card_number" id="0x7f120d9d" />
+    <public type="string" name="payment_source_confirm_paypal_details" id="0x7f120d9e" />
+    <public type="string" name="payment_source_credit_card" id="0x7f120d9f" />
+    <public type="string" name="payment_source_delete" id="0x7f120da0" />
+    <public type="string" name="payment_source_delete_disabled_tooltip" id="0x7f120da1" />
+    <public type="string" name="payment_source_deleted" id="0x7f120da2" />
+    <public type="string" name="payment_source_edit_help_card" id="0x7f120da3" />
+    <public type="string" name="payment_source_edit_help_paypal" id="0x7f120da4" />
+    <public type="string" name="payment_source_edit_saved" id="0x7f120da5" />
+    <public type="string" name="payment_source_edit_select_state" id="0x7f120da6" />
+    <public type="string" name="payment_source_edit_title" id="0x7f120da7" />
+    <public type="string" name="payment_source_expiration_date" id="0x7f120da8" />
+    <public type="string" name="payment_source_expiration_date_placeholder" id="0x7f120da9" />
+    <public type="string" name="payment_source_information" id="0x7f120daa" />
+    <public type="string" name="payment_source_invalid" id="0x7f120dab" />
+    <public type="string" name="payment_source_invalid_help" id="0x7f120dac" />
+    <public type="string" name="payment_source_make_default" id="0x7f120dad" />
+    <public type="string" name="payment_source_name" id="0x7f120dae" />
+    <public type="string" name="payment_source_name_error_required" id="0x7f120daf" />
+    <public type="string" name="payment_source_name_placeholder" id="0x7f120db0" />
+    <public type="string" name="payment_source_payment_request_button_generic" id="0x7f120db1" />
+    <public type="string" name="payment_source_payment_request_button_gpay" id="0x7f120db2" />
+    <public type="string" name="payment_source_payment_request_info_creating" id="0x7f120db3" />
+    <public type="string" name="payment_source_payment_request_info_loading" id="0x7f120db4" />
+    <public type="string" name="payment_source_payment_request_info_title" id="0x7f120db5" />
+    <public type="string" name="payment_source_payment_request_label" id="0x7f120db6" />
+    <public type="string" name="payment_source_payment_request_unsupported" id="0x7f120db7" />
+    <public type="string" name="payment_source_paypal" id="0x7f120db8" />
+    <public type="string" name="payment_source_paypal_account" id="0x7f120db9" />
+    <public type="string" name="payment_source_paypal_details" id="0x7f120dba" />
+    <public type="string" name="payment_source_paypal_loading" id="0x7f120dbb" />
+    <public type="string" name="payment_source_paypal_reopen" id="0x7f120dbc" />
+    <public type="string" name="payment_source_security_code" id="0x7f120dbd" />
+    <public type="string" name="payment_source_subscription" id="0x7f120dbe" />
+    <public type="string" name="payment_source_title" id="0x7f120dbf" />
+    <public type="string" name="payment_source_type" id="0x7f120dc0" />
+    <public type="string" name="payment_source_type_select" id="0x7f120dc1" />
+    <public type="string" name="payment_sources_add" id="0x7f120dc2" />
+    <public type="string" name="payment_steps_go_back" id="0x7f120dc3" />
+    <public type="string" name="payment_waiting_for_authentication" id="0x7f120dc4" />
+    <public type="string" name="paypal_account_verifying" id="0x7f120dc5" />
+    <public type="string" name="paypal_callback_error" id="0x7f120dc6" />
+    <public type="string" name="paypal_callback_success" id="0x7f120dc7" />
+    <public type="string" name="pending" id="0x7f120dc8" />
+    <public type="string" name="percentage_since_last_week" id="0x7f120dc9" />
+    <public type="string" name="permission_camera_access_denied" id="0x7f120dca" />
+    <public type="string" name="permission_helpdesk" id="0x7f120dcb" />
+    <public type="string" name="permission_media_denied" id="0x7f120dcc" />
+    <public type="string" name="permission_media_download_denied" id="0x7f120dcd" />
+    <public type="string" name="permission_microphone_denied" id="0x7f120dce" />
+    <public type="string" name="permission_override_allow" id="0x7f120dcf" />
+    <public type="string" name="permission_override_deny" id="0x7f120dd0" />
+    <public type="string" name="permission_override_passthrough" id="0x7f120dd1" />
+    <public type="string" name="permission_overrides" id="0x7f120dd2" />
+    <public type="string" name="permissions" id="0x7f120dd3" />
+    <public type="string" name="permissions_unsynced" id="0x7f120dd4" />
+    <public type="string" name="permit_usage_android" id="0x7f120dd5" />
+    <public type="string" name="personalization_disable_modal_body" id="0x7f120dd6" />
+    <public type="string" name="personalization_disable_modal_cancel" id="0x7f120dd7" />
+    <public type="string" name="personalization_disable_modal_confirm" id="0x7f120dd8" />
+    <public type="string" name="personalization_disable_modal_title" id="0x7f120dd9" />
+    <public type="string" name="phone" id="0x7f120dda" />
+    <public type="string" name="pick_a_color" id="0x7f120ddb" />
+    <public type="string" name="pin" id="0x7f120ddc" />
+    <public type="string" name="pin_confirm" id="0x7f120ddd" />
+    <public type="string" name="pin_message" id="0x7f120dde" />
+    <public type="string" name="pin_message_body" id="0x7f120ddf" />
+    <public type="string" name="pin_message_body_mobile" id="0x7f120de0" />
+    <public type="string" name="pin_message_body_private_channel" id="0x7f120de1" />
+    <public type="string" name="pin_message_title" id="0x7f120de2" />
+    <public type="string" name="pin_message_too_many_body" id="0x7f120de3" />
+    <public type="string" name="pin_message_too_many_body_private_channel" id="0x7f120de4" />
+    <public type="string" name="pin_message_too_many_title" id="0x7f120de5" />
+    <public type="string" name="pinned_messages" id="0x7f120de6" />
+    <public type="string" name="pinned_messages_pro_tip" id="0x7f120de7" />
+    <public type="string" name="pinned_messages_pro_tip_body_channel" id="0x7f120de8" />
+    <public type="string" name="pinned_messages_pro_tip_body_dm" id="0x7f120de9" />
+    <public type="string" name="pinned_messages_pro_tip_body_group_dm" id="0x7f120dea" />
+    <public type="string" name="pins_disabled_nsfw" id="0x7f120deb" />
+    <public type="string" name="pl" id="0x7f120dec" />
+    <public type="string" name="platform_android" id="0x7f120ded" />
+    <public type="string" name="platform_android_version" id="0x7f120dee" />
+    <public type="string" name="platform_ios" id="0x7f120def" />
+    <public type="string" name="platform_ios_version" id="0x7f120df0" />
+    <public type="string" name="platform_linux" id="0x7f120df1" />
+    <public type="string" name="platform_macos" id="0x7f120df2" />
+    <public type="string" name="platform_windows" id="0x7f120df3" />
+    <public type="string" name="play" id="0x7f120df4" />
+    <public type="string" name="play_full_video" id="0x7f120df5" />
+    <public type="string" name="play_stream" id="0x7f120df6" />
+    <public type="string" name="playing_game" id="0x7f120df7" />
+    <public type="string" name="popout_player" id="0x7f120df8" />
+    <public type="string" name="popout_player_opened" id="0x7f120df9" />
+    <public type="string" name="popout_remove_from_top" id="0x7f120dfa" />
+    <public type="string" name="popout_return" id="0x7f120dfb" />
+    <public type="string" name="popout_stay_on_top" id="0x7f120dfc" />
+    <public type="string" name="post_code" id="0x7f120dfd" />
+    <public type="string" name="premium" id="0x7f120dfe" />
+    <public type="string" name="premium_activated" id="0x7f120dff" />
+    <public type="string" name="premium_alert_error_title" id="0x7f120e00" />
+    <public type="string" name="premium_badge_tooltip" id="0x7f120e01" />
+    <public type="string" name="premium_cancel_cancel" id="0x7f120e02" />
+    <public type="string" name="premium_cancel_cancel_mobile" id="0x7f120e03" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1" id="0x7f120e04" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_1" id="0x7f120e05" />
+    <public type="string" name="premium_cancel_confirm_body_tier_1_mobile_part_2" id="0x7f120e06" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2" id="0x7f120e07" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_1" id="0x7f120e08" />
+    <public type="string" name="premium_cancel_confirm_body_tier_2_mobile_part_2" id="0x7f120e09" />
+    <public type="string" name="premium_cancel_confirm_mobile" id="0x7f120e0a" />
+    <public type="string" name="premium_cancel_confirm_new" id="0x7f120e0b" />
+    <public type="string" name="premium_cancel_confirm_title" id="0x7f120e0c" />
+    <public type="string" name="premium_cancel_failed_body" id="0x7f120e0d" />
+    <public type="string" name="premium_canceled" id="0x7f120e0e" />
+    <public type="string" name="premium_cant_upgrade_confirm" id="0x7f120e0f" />
+    <public type="string" name="premium_change_discriminator_length_error" id="0x7f120e10" />
+    <public type="string" name="premium_change_discriminator_modal_body" id="0x7f120e11" />
+    <public type="string" name="premium_change_discriminator_modal_confirm" id="0x7f120e12" />
+    <public type="string" name="premium_change_discriminator_modal_header" id="0x7f120e13" />
+    <public type="string" name="premium_change_discriminator_tooltip" id="0x7f120e14" />
+    <public type="string" name="premium_change_discriminator_zero_error" id="0x7f120e15" />
+    <public type="string" name="premium_chat_perks_animated_avatar_and_emoji_mobile" id="0x7f120e16" />
+    <public type="string" name="premium_chat_perks_custom_emoji_mobile" id="0x7f120e17" />
+    <public type="string" name="premium_chat_perks_description_animated_avatar_and_emoji" id="0x7f120e18" />
+    <public type="string" name="premium_chat_perks_description_badge" id="0x7f120e19" />
+    <public type="string" name="premium_chat_perks_description_custom_emoji" id="0x7f120e1a" />
+    <public type="string" name="premium_chat_perks_description_discriminator" id="0x7f120e1b" />
+    <public type="string" name="premium_chat_perks_description_premium_guild" id="0x7f120e1c" />
+    <public type="string" name="premium_chat_perks_description_screenshare" id="0x7f120e1d" />
+    <public type="string" name="premium_chat_perks_description_streaming" id="0x7f120e1e" />
+    <public type="string" name="premium_chat_perks_description_upload_limit" id="0x7f120e1f" />
+    <public type="string" name="premium_chat_perks_discriminator_mobile" id="0x7f120e20" />
+    <public type="string" name="premium_chat_perks_premium_guild_subscription" id="0x7f120e21" />
+    <public type="string" name="premium_chat_perks_rep_mobile" id="0x7f120e22" />
+    <public type="string" name="premium_chat_perks_screenshare_mobile" id="0x7f120e23" />
+    <public type="string" name="premium_chat_perks_simple_title" id="0x7f120e24" />
+    <public type="string" name="premium_chat_perks_streaming_mobile" id="0x7f120e25" />
+    <public type="string" name="premium_chat_perks_title_animated_avatar_and_emoji" id="0x7f120e26" />
+    <public type="string" name="premium_chat_perks_title_badge" id="0x7f120e27" />
+    <public type="string" name="premium_chat_perks_title_custom_emoji" id="0x7f120e28" />
+    <public type="string" name="premium_chat_perks_title_discriminator" id="0x7f120e29" />
+    <public type="string" name="premium_chat_perks_title_premium_guild" id="0x7f120e2a" />
+    <public type="string" name="premium_chat_perks_title_screenshare" id="0x7f120e2b" />
+    <public type="string" name="premium_chat_perks_title_streaming" id="0x7f120e2c" />
+    <public type="string" name="premium_chat_perks_title_upload_limit" id="0x7f120e2d" />
+    <public type="string" name="premium_classic_payment_gift_blurb_mobile" id="0x7f120e2e" />
+    <public type="string" name="premium_code_active_until" id="0x7f120e2f" />
+    <public type="string" name="premium_code_redemption_confirmation_blurb" id="0x7f120e30" />
+    <public type="string" name="premium_code_redemption_confirmation_button" id="0x7f120e31" />
+    <public type="string" name="premium_expiring_body_boosting" id="0x7f120e32" />
+    <public type="string" name="premium_expiring_body_control" id="0x7f120e33" />
+    <public type="string" name="premium_expiring_body_custom_tag" id="0x7f120e34" />
+    <public type="string" name="premium_expiring_body_emoji" id="0x7f120e35" />
+    <public type="string" name="premium_expiring_body_generic" id="0x7f120e36" />
+    <public type="string" name="premium_expiring_callout" id="0x7f120e37" />
+    <public type="string" name="premium_expiring_go_to_settings" id="0x7f120e38" />
+    <public type="string" name="premium_expiring_title" id="0x7f120e39" />
+    <public type="string" name="premium_features_chat_perks" id="0x7f120e3a" />
+    <public type="string" name="premium_features_chat_perks_header" id="0x7f120e3b" />
+    <public type="string" name="premium_features_enhanced_chat_perks" id="0x7f120e3c" />
+    <public type="string" name="premium_features_premium_guild_subscriptions" id="0x7f120e3d" />
+    <public type="string" name="premium_game" id="0x7f120e3e" />
+    <public type="string" name="premium_gift_button_label" id="0x7f120e3f" />
+    <public type="string" name="premium_gift_button_tooltip" id="0x7f120e40" />
+    <public type="string" name="premium_gift_send" id="0x7f120e41" />
+    <public type="string" name="premium_gift_share_link_ios" id="0x7f120e42" />
+    <public type="string" name="premium_gifting_title" id="0x7f120e43" />
+    <public type="string" name="premium_gifting_title_mobile" id="0x7f120e44" />
+    <public type="string" name="premium_grandfathered_monthly" id="0x7f120e45" />
+    <public type="string" name="premium_grandfathered_warning" id="0x7f120e46" />
+    <public type="string" name="premium_grandfathered_warning_confirm" id="0x7f120e47" />
+    <public type="string" name="premium_grandfathered_warning_mobile" id="0x7f120e48" />
+    <public type="string" name="premium_grandfathered_warning_title" id="0x7f120e49" />
+    <public type="string" name="premium_grandfathered_yearly" id="0x7f120e4a" />
+    <public type="string" name="premium_guild_cooldown_available_countdown" id="0x7f120e4b" />
+    <public type="string" name="premium_guild_features_blurb" id="0x7f120e4c" />
+    <public type="string" name="premium_guild_features_customize_guild_mobile" id="0x7f120e4d" />
+    <public type="string" name="premium_guild_features_learn_more_button" id="0x7f120e4e" />
+    <public type="string" name="premium_guild_features_learn_more_text" id="0x7f120e4f" />
+    <public type="string" name="premium_guild_features_more" id="0x7f120e50" />
+    <public type="string" name="premium_guild_features_new_role_mobile" id="0x7f120e51" />
+    <public type="string" name="premium_guild_features_show_support_mobile" id="0x7f120e52" />
+    <public type="string" name="premium_guild_features_title" id="0x7f120e53" />
+    <public type="string" name="premium_guild_features_upload_sizes_mobile" id="0x7f120e54" />
+    <public type="string" name="premium_guild_features_upsell_banner_subscribe" id="0x7f120e55" />
+    <public type="string" name="premium_guild_features_upsell_banner_upgrade" id="0x7f120e56" />
+    <public type="string" name="premium_guild_guild_feature_audio_quality" id="0x7f120e57" />
+    <public type="string" name="premium_guild_guild_feature_emoji" id="0x7f120e58" />
+    <public type="string" name="premium_guild_guild_feature_upload_size" id="0x7f120e59" />
+    <public type="string" name="premium_guild_guild_features_header" id="0x7f120e5a" />
+    <public type="string" name="premium_guild_header_badge_no_subscribers" id="0x7f120e5b" />
+    <public type="string" name="premium_guild_header_badge_no_tier" id="0x7f120e5c" />
+    <public type="string" name="premium_guild_header_dropdown_nitro_server_subscribe" id="0x7f120e5d" />
+    <public type="string" name="premium_guild_num_guild_subscriptions" id="0x7f120e5e" />
+    <public type="string" name="premium_guild_perks_modal_base_perks" id="0x7f120e5f" />
+    <public type="string" name="premium_guild_perks_modal_blurb" id="0x7f120e60" />
+    <public type="string" name="premium_guild_perks_modal_blurb_mobile" id="0x7f120e61" />
+    <public type="string" name="premium_guild_perks_modal_button_get_premium" id="0x7f120e62" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_prompt" id="0x7f120e63" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_status" id="0x7f120e64" />
+    <public type="string" name="premium_guild_perks_modal_button_subscribe_this_server" id="0x7f120e65" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium" id="0x7f120e66" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error" id="0x7f120e67" />
+    <public type="string" name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip" id="0x7f120e68" />
+    <public type="string" name="premium_guild_perks_modal_header" id="0x7f120e69" />
+    <public type="string" name="premium_guild_perks_modal_header_subscription_count" id="0x7f120e6a" />
+    <public type="string" name="premium_guild_perks_modal_learn_more" id="0x7f120e6b" />
+    <public type="string" name="premium_guild_perks_modal_level_subscriber_count_tooltip" id="0x7f120e6c" />
+    <public type="string" name="premium_guild_perks_modal_manage_mobile" id="0x7f120e6d" />
+    <public type="string" name="premium_guild_perks_modal_manage_your_subscription" id="0x7f120e6e" />
+    <public type="string" name="premium_guild_perks_modal_manage_your_subscriptions" id="0x7f120e6f" />
+    <public type="string" name="premium_guild_perks_modal_no_tiers" id="0x7f120e70" />
+    <public type="string" name="premium_guild_perks_modal_previous_perks" id="0x7f120e71" />
+    <public type="string" name="premium_guild_perks_modal_subscriber_perks_header" id="0x7f120e72" />
+    <public type="string" name="premium_guild_perks_modal_subscription_description" id="0x7f120e73" />
+    <public type="string" name="premium_guild_perks_modal_tier_zero_surpassed" id="0x7f120e74" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_already_subscribed_this_server" id="0x7f120e75" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_already_used_subscription" id="0x7f120e76" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_cooldown" id="0x7f120e77" />
+    <public type="string" name="premium_guild_perks_modal_tooltip_gift" id="0x7f120e78" />
+    <public type="string" name="premium_guild_plan_month" id="0x7f120e79" />
+    <public type="string" name="premium_guild_plan_year" id="0x7f120e7a" />
+    <public type="string" name="premium_guild_settings_members_subscribed" id="0x7f120e7b" />
+    <public type="string" name="premium_guild_settings_members_subscribed_needed" id="0x7f120e7c" />
+    <public type="string" name="premium_guild_settings_x_of_y_subscriptions" id="0x7f120e7d" />
+    <public type="string" name="premium_guild_subscribe_confirm_blurb" id="0x7f120e7e" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation" id="0x7f120e7f" />
+    <public type="string" name="premium_guild_subscribe_confirm_confirmation_label" id="0x7f120e80" />
+    <public type="string" name="premium_guild_subscribe_confirm_cooldown_warning" id="0x7f120e81" />
+    <public type="string" name="premium_guild_subscribe_confirm_header" id="0x7f120e82" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_blurb" id="0x7f120e83" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_from_guild" id="0x7f120e84" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_header" id="0x7f120e85" />
+    <public type="string" name="premium_guild_subscribe_confirm_transfer_to_guild" id="0x7f120e86" />
+    <public type="string" name="premium_guild_subscribe_search_guild_placeholder" id="0x7f120e87" />
+    <public type="string" name="premium_guild_subscribe_select_guild_header" id="0x7f120e88" />
+    <public type="string" name="premium_guild_subscribe_select_guild_transfer_header" id="0x7f120e89" />
+    <public type="string" name="premium_guild_subscribe_success_thanks" id="0x7f120e8a" />
+    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation" id="0x7f120e8b" />
+    <public type="string" name="premium_guild_subscribe_transfer_confirm_confirmation_label" id="0x7f120e8c" />
+    <public type="string" name="premium_guild_subscriber_feature_member_badge" id="0x7f120e8d" />
+    <public type="string" name="premium_guild_subscriber_feature_profile_badge" id="0x7f120e8e" />
+    <public type="string" name="premium_guild_subscriber_feature_role" id="0x7f120e8f" />
+    <public type="string" name="premium_guild_subscription_active_title" id="0x7f120e90" />
+    <public type="string" name="premium_guild_subscription_available" id="0x7f120e91" />
+    <public type="string" name="premium_guild_subscription_available_count" id="0x7f120e92" />
+    <public type="string" name="premium_guild_subscription_cancel_body_guild" id="0x7f120e93" />
+    <public type="string" name="premium_guild_subscription_cancel_body_inventory" id="0x7f120e94" />
+    <public type="string" name="premium_guild_subscription_cancel_button" id="0x7f120e95" />
+    <public type="string" name="premium_guild_subscription_cancel_button_disabled_tooltip" id="0x7f120e96" />
+    <public type="string" name="premium_guild_subscription_cancel_invoice_header" id="0x7f120e97" />
+    <public type="string" name="premium_guild_subscription_cancel_invoice_subscription_cancelled" id="0x7f120e98" />
+    <public type="string" name="premium_guild_subscription_cancel_invoice_subscriptions" id="0x7f120e99" />
+    <public type="string" name="premium_guild_subscription_cancel_invoice_total_label" id="0x7f120e9a" />
+    <public type="string" name="premium_guild_subscription_cancel_preview" id="0x7f120e9b" />
+    <public type="string" name="premium_guild_subscription_cancel_title_guild" id="0x7f120e9c" />
+    <public type="string" name="premium_guild_subscription_cancel_title_inventory" id="0x7f120e9d" />
+    <public type="string" name="premium_guild_subscription_confirm_body" id="0x7f120e9e" />
+    <public type="string" name="premium_guild_subscription_confirm_title" id="0x7f120e9f" />
+    <public type="string" name="premium_guild_subscription_creation_date" id="0x7f120ea0" />
+    <public type="string" name="premium_guild_subscription_duration" id="0x7f120ea1" />
+    <public type="string" name="premium_guild_subscription_duration_mobile" id="0x7f120ea2" />
+    <public type="string" name="premium_guild_subscription_error_mobile" id="0x7f120ea3" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_days" id="0x7f120ea4" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_hours" id="0x7f120ea5" />
+    <public type="string" name="premium_guild_subscription_error_rate_limit_minutes" id="0x7f120ea6" />
+    <public type="string" name="premium_guild_subscription_guild_subsription_subtitle" id="0x7f120ea7" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_button" id="0x7f120ea8" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_description" id="0x7f120ea9" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_confirm_title" id="0x7f120eaa" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_description" id="0x7f120eab" />
+    <public type="string" name="premium_guild_subscription_inventory_uncancel_title" id="0x7f120eac" />
+    <public type="string" name="premium_guild_subscription_marketing_blurb" id="0x7f120ead" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_blurb" id="0x7f120eae" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_blurb" id="0x7f120eaf" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_text" id="0x7f120eb0" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_empty_description_title" id="0x7f120eb1" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_header" id="0x7f120eb2" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_header_premium_tier_1" id="0x7f120eb3" />
+    <public type="string" name="premium_guild_subscription_marketing_guilds_header_premium_tier_2" id="0x7f120eb4" />
+    <public type="string" name="premium_guild_subscription_marketing_header" id="0x7f120eb5" />
+    <public type="string" name="premium_guild_subscription_no_next_tier" id="0x7f120eb6" />
+    <public type="string" name="premium_guild_subscription_notice" id="0x7f120eb7" />
+    <public type="string" name="premium_guild_subscription_notice_button" id="0x7f120eb8" />
+    <public type="string" name="premium_guild_subscription_notice_small_guild" id="0x7f120eb9" />
+    <public type="string" name="premium_guild_subscription_num_subscriptions" id="0x7f120eba" />
+    <public type="string" name="premium_guild_subscription_pending_cancellation" id="0x7f120ebb" />
+    <public type="string" name="premium_guild_subscription_purchase_button" id="0x7f120ebc" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_plan" id="0x7f120ebd" />
+    <public type="string" name="premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription" id="0x7f120ebe" />
+    <public type="string" name="premium_guild_subscription_purchase_description" id="0x7f120ebf" />
+    <public type="string" name="premium_guild_subscription_remove_button" id="0x7f120ec0" />
+    <public type="string" name="premium_guild_subscription_remove_error_mobile" id="0x7f120ec1" />
+    <public type="string" name="premium_guild_subscription_select_server_button" id="0x7f120ec2" />
+    <public type="string" name="premium_guild_subscription_slot_cancel_button" id="0x7f120ec3" />
+    <public type="string" name="premium_guild_subscription_slot_uncancel_button" id="0x7f120ec4" />
+    <public type="string" name="premium_guild_subscription_subscribe" id="0x7f120ec5" />
+    <public type="string" name="premium_guild_subscription_subscriber_count_tooltip" id="0x7f120ec6" />
+    <public type="string" name="premium_guild_subscription_subtitle" id="0x7f120ec7" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_1" id="0x7f120ec8" />
+    <public type="string" name="premium_guild_subscription_subtitle_mobile_2" id="0x7f120ec9" />
+    <public type="string" name="premium_guild_subscription_title" id="0x7f120eca" />
+    <public type="string" name="premium_guild_subscription_tooltip" id="0x7f120ecb" />
+    <public type="string" name="premium_guild_subscription_transfer_button" id="0x7f120ecc" />
+    <public type="string" name="premium_guild_subscription_transfer_button_disabled_tooltip" id="0x7f120ecd" />
+    <public type="string" name="premium_guild_subscription_unused_slot_description" id="0x7f120ece" />
+    <public type="string" name="premium_guild_subscriptions_renewal_info" id="0x7f120ecf" />
+    <public type="string" name="premium_guild_tier_0" id="0x7f120ed0" />
+    <public type="string" name="premium_guild_tier_1" id="0x7f120ed1" />
+    <public type="string" name="premium_guild_tier_2" id="0x7f120ed2" />
+    <public type="string" name="premium_guild_tier_3" id="0x7f120ed3" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_blurb" id="0x7f120ed4" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_confirmation" id="0x7f120ed5" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning" id="0x7f120ed6" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_days" id="0x7f120ed7" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_hours" id="0x7f120ed8" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes" id="0x7f120ed9" />
+    <public type="string" name="premium_guild_unsubscribe_confirm_header" id="0x7f120eda" />
+    <public type="string" name="premium_guild_user_feature_member_badge" id="0x7f120edb" />
+    <public type="string" name="premium_guild_user_feature_profile_badge" id="0x7f120edc" />
+    <public type="string" name="premium_guild_user_feature_role" id="0x7f120edd" />
+    <public type="string" name="premium_guild_user_features_header" id="0x7f120ede" />
+    <public type="string" name="premium_included" id="0x7f120edf" />
+    <public type="string" name="premium_info_monthly" id="0x7f120ee0" />
+    <public type="string" name="premium_info_yearly" id="0x7f120ee1" />
+    <public type="string" name="premium_month_subscription" id="0x7f120ee2" />
+    <public type="string" name="premium_not_claimed" id="0x7f120ee3" />
+    <public type="string" name="premium_not_claimed_body" id="0x7f120ee4" />
+    <public type="string" name="premium_not_verified" id="0x7f120ee5" />
+    <public type="string" name="premium_not_verified_body" id="0x7f120ee6" />
+    <public type="string" name="premium_past_due" id="0x7f120ee7" />
+    <public type="string" name="premium_payment_confirmation_blurb_iap" id="0x7f120ee8" />
+    <public type="string" name="premium_payment_confirmation_blurb_regular" id="0x7f120ee9" />
+    <public type="string" name="premium_payment_confirmation_button_iap" id="0x7f120eea" />
+    <public type="string" name="premium_payment_confirmation_button_regular" id="0x7f120eeb" />
+    <public type="string" name="premium_payment_gift_blurb" id="0x7f120eec" />
+    <public type="string" name="premium_payment_gift_blurb_mobile" id="0x7f120eed" />
+    <public type="string" name="premium_payment_gift_subtext" id="0x7f120eee" />
+    <public type="string" name="premium_payment_is_gift" id="0x7f120eef" />
+    <public type="string" name="premium_payment_plan_label_monthly" id="0x7f120ef0" />
+    <public type="string" name="premium_payment_plan_label_yearly" id="0x7f120ef1" />
+    <public type="string" name="premium_payment_select" id="0x7f120ef2" />
+    <public type="string" name="premium_payment_start_trial" id="0x7f120ef3" />
+    <public type="string" name="premium_payment_trial_blurb" id="0x7f120ef4" />
+    <public type="string" name="premium_payment_trial_note" id="0x7f120ef5" />
+    <public type="string" name="premium_payment_trial_two_weeks_free" id="0x7f120ef6" />
+    <public type="string" name="premium_pending_plan_change_cancel_body" id="0x7f120ef7" />
+    <public type="string" name="premium_pending_plan_change_cancel_button" id="0x7f120ef8" />
+    <public type="string" name="premium_pending_plan_change_cancel_header" id="0x7f120ef9" />
+    <public type="string" name="premium_pending_plan_change_notice" id="0x7f120efa" />
+    <public type="string" name="premium_plan_month" id="0x7f120efb" />
+    <public type="string" name="premium_plan_month_tier_1" id="0x7f120efc" />
+    <public type="string" name="premium_plan_month_tier_2" id="0x7f120efd" />
+    <public type="string" name="premium_plan_year" id="0x7f120efe" />
+    <public type="string" name="premium_plan_year_tier_1" id="0x7f120eff" />
+    <public type="string" name="premium_plan_year_tier_2" id="0x7f120f00" />
+    <public type="string" name="premium_promo_autocomplete" id="0x7f120f01" />
+    <public type="string" name="premium_promo_description" id="0x7f120f02" />
+    <public type="string" name="premium_promo_title" id="0x7f120f03" />
+    <public type="string" name="premium_required" id="0x7f120f04" />
+    <public type="string" name="premium_required_get_nitro" id="0x7f120f05" />
+    <public type="string" name="premium_restore_subscription_ios" id="0x7f120f06" />
+    <public type="string" name="premium_retention_emoji_picker_description" id="0x7f120f07" />
+    <public type="string" name="premium_retention_emoji_picker_update_payment_information" id="0x7f120f08" />
+    <public type="string" name="premium_settings" id="0x7f120f09" />
+    <public type="string" name="premium_settings_billing_info" id="0x7f120f0a" />
+    <public type="string" name="premium_settings_cancelled_info" id="0x7f120f0b" />
+    <public type="string" name="premium_settings_get" id="0x7f120f0c" />
+    <public type="string" name="premium_settings_manage" id="0x7f120f0d" />
+    <public type="string" name="premium_settings_past_due_info" id="0x7f120f0e" />
+    <public type="string" name="premium_settings_renewal_info" id="0x7f120f0f" />
+    <public type="string" name="premium_subscription_credit" id="0x7f120f10" />
+    <public type="string" name="premium_subscription_credit_applied_mismatched_plan" id="0x7f120f11" />
+    <public type="string" name="premium_subscription_credit_applied_on" id="0x7f120f12" />
+    <public type="string" name="premium_subscription_credit_count_months" id="0x7f120f13" />
+    <public type="string" name="premium_subscription_policy_hint_ios" id="0x7f120f14" />
+    <public type="string" name="premium_subscription_policy_ios" id="0x7f120f15" />
+    <public type="string" name="premium_subscription_required_body" id="0x7f120f16" />
+    <public type="string" name="premium_subtitle" id="0x7f120f17" />
+    <public type="string" name="premium_switch_plan_disabled_pending_mutation_plan" id="0x7f120f18" />
+    <public type="string" name="premium_switch_plan_disabled_pending_mutation_premium_guild_subscription" id="0x7f120f19" />
+    <public type="string" name="premium_switch_plans" id="0x7f120f1a" />
+    <public type="string" name="premium_switch_review_header" id="0x7f120f1b" />
+    <public type="string" name="premium_tier_1" id="0x7f120f1c" />
+    <public type="string" name="premium_tier_2" id="0x7f120f1d" />
+    <public type="string" name="premium_tier_2_subtitle" id="0x7f120f1e" />
+    <public type="string" name="premium_tier_2_title" id="0x7f120f1f" />
+    <public type="string" name="premium_title" id="0x7f120f20" />
+    <public type="string" name="premium_trial_button" id="0x7f120f21" />
+    <public type="string" name="premium_upgrade_cancel" id="0x7f120f22" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_month_year" id="0x7f120f23" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month" id="0x7f120f24" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year" id="0x7f120f25" />
+    <public type="string" name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year" id="0x7f120f26" />
+    <public type="string" name="premium_upgrade_confirm_button" id="0x7f120f27" />
+    <public type="string" name="premium_upgrade_confirm_title" id="0x7f120f28" />
+    <public type="string" name="premium_upgrade_disabled_already_premium" id="0x7f120f29" />
+    <public type="string" name="premium_upgrade_disabled_current_tooltip" id="0x7f120f2a" />
+    <public type="string" name="premium_upgrade_disabled_in_trial" id="0x7f120f2b" />
+    <public type="string" name="premium_upgrade_disabled_lower_tier_tooltip" id="0x7f120f2c" />
+    <public type="string" name="premium_upgrade_disabled_title_mobile" id="0x7f120f2d" />
+    <public type="string" name="premium_upgrade_done_body_tier_1" id="0x7f120f2e" />
+    <public type="string" name="premium_upgrade_done_body_tier_2_guild_subscribe" id="0x7f120f2f" />
+    <public type="string" name="premium_upgrade_done_button_tier_1" id="0x7f120f30" />
+    <public type="string" name="premium_upgrade_failed_body" id="0x7f120f31" />
+    <public type="string" name="premium_upgrade_required_body" id="0x7f120f32" />
+    <public type="string" name="premium_upload_promo" id="0x7f120f33" />
+    <public type="string" name="premium_upsell_animated_avatar_active_mobile" id="0x7f120f34" />
+    <public type="string" name="premium_upsell_animated_avatar_description_mobile" id="0x7f120f35" />
+    <public type="string" name="premium_upsell_animated_avatar_passive_mobile" id="0x7f120f36" />
+    <public type="string" name="premium_upsell_animated_emojis_active_mobile" id="0x7f120f37" />
+    <public type="string" name="premium_upsell_animated_emojis_description_mobile" id="0x7f120f38" />
+    <public type="string" name="premium_upsell_animated_emojis_passive_mobile" id="0x7f120f39" />
+    <public type="string" name="premium_upsell_badge_active_mobile" id="0x7f120f3a" />
+    <public type="string" name="premium_upsell_badge_description_mobile" id="0x7f120f3b" />
+    <public type="string" name="premium_upsell_badge_passive_mobile" id="0x7f120f3c" />
+    <public type="string" name="premium_upsell_emoji_active_mobile" id="0x7f120f3d" />
+    <public type="string" name="premium_upsell_emoji_description_mobile" id="0x7f120f3e" />
+    <public type="string" name="premium_upsell_emoji_passive_mobile" id="0x7f120f3f" />
+    <public type="string" name="premium_upsell_feature_free_guild_subscription" id="0x7f120f40" />
+    <public type="string" name="premium_upsell_feature_pretext" id="0x7f120f41" />
+    <public type="string" name="premium_upsell_feature_stream" id="0x7f120f42" />
+    <public type="string" name="premium_upsell_feature_upload" id="0x7f120f43" />
+    <public type="string" name="premium_upsell_none_tier_feature_free_guild_subscription" id="0x7f120f44" />
+    <public type="string" name="premium_upsell_none_tier_feature_pretext" id="0x7f120f45" />
+    <public type="string" name="premium_upsell_tag_active_mobile" id="0x7f120f46" />
+    <public type="string" name="premium_upsell_tag_description_mobile" id="0x7f120f47" />
+    <public type="string" name="premium_upsell_tag_passive_mobile" id="0x7f120f48" />
+    <public type="string" name="premium_upsell_title" id="0x7f120f49" />
+    <public type="string" name="premium_upsell_upgrade" id="0x7f120f4a" />
+    <public type="string" name="premium_upsell_upload_active_mobile" id="0x7f120f4b" />
+    <public type="string" name="premium_upsell_upload_description_mobile" id="0x7f120f4c" />
+    <public type="string" name="premium_upsell_upload_passive_mobile" id="0x7f120f4d" />
+    <public type="string" name="premium_year_free_months" id="0x7f120f4e" />
+    <public type="string" name="premium_year_subscription" id="0x7f120f4f" />
+    <public type="string" name="preorder_sku_name" id="0x7f120f50" />
+    <public type="string" name="preview_chat" id="0x7f120f51" />
+    <public type="string" name="priority_speaker" id="0x7f120f52" />
+    <public type="string" name="priority_speaker_description" id="0x7f120f53" />
+    <public type="string" name="priority_speaker_description_app" id="0x7f120f54" />
+    <public type="string" name="privacy_and_safety" id="0x7f120f55" />
+    <public type="string" name="privacy_policy" id="0x7f120f56" />
+    <public type="string" name="privacy_policy_url" id="0x7f120f57" />
+    <public type="string" name="privacy_settings" id="0x7f120f58" />
+    <public type="string" name="private_category" id="0x7f120f59" />
+    <public type="string" name="private_category_note" id="0x7f120f5a" />
+    <public type="string" name="private_channel" id="0x7f120f5b" />
+    <public type="string" name="private_channel_note" id="0x7f120f5c" />
+    <public type="string" name="profile" id="0x7f120f5d" />
+    <public type="string" name="project_id" id="0x7f120f5e" />
+    <public type="string" name="prune" id="0x7f120f5f" />
+    <public type="string" name="prune_members" id="0x7f120f60" />
+    <public type="string" name="pt_br" id="0x7f120f61" />
+    <public type="string" name="ptt_limited_body" id="0x7f120f62" />
+    <public type="string" name="ptt_limited_title" id="0x7f120f63" />
+    <public type="string" name="ptt_limited_warning" id="0x7f120f64" />
+    <public type="string" name="ptt_permission_body" id="0x7f120f65" />
+    <public type="string" name="ptt_permission_title" id="0x7f120f66" />
+    <public type="string" name="public_guild_survey_modal_body" id="0x7f120f67" />
+    <public type="string" name="public_guild_survey_modal_header" id="0x7f120f68" />
+    <public type="string" name="publish_followed_news_body" id="0x7f120f69" />
+    <public type="string" name="publish_followed_news_body_reach" id="0x7f120f6a" />
+    <public type="string" name="publish_followed_news_body_settings" id="0x7f120f6b" />
+    <public type="string" name="publish_followed_news_body_stats" id="0x7f120f6c" />
+    <public type="string" name="publish_followed_news_fail_body" id="0x7f120f6d" />
+    <public type="string" name="publish_followed_news_fail_title" id="0x7f120f6e" />
+    <public type="string" name="publish_followed_news_generic_body" id="0x7f120f6f" />
+    <public type="string" name="purple" id="0x7f120f70" />
+    <public type="string" name="quality_indicator" id="0x7f120f71" />
+    <public type="string" name="quick_dm_blocked" id="0x7f120f72" />
+    <public type="string" name="quick_dm_user" id="0x7f120f73" />
+    <public type="string" name="quick_launcher_empty_text" id="0x7f120f74" />
+    <public type="string" name="quick_launcher_empty_text_v2" id="0x7f120f75" />
+    <public type="string" name="quick_launcher_header" id="0x7f120f76" />
+    <public type="string" name="quick_switcher" id="0x7f120f77" />
+    <public type="string" name="quickswitcher_drafts" id="0x7f120f78" />
+    <public type="string" name="quickswitcher_empty_cta" id="0x7f120f79" />
+    <public type="string" name="quickswitcher_empty_text" id="0x7f120f7a" />
+    <public type="string" name="quickswitcher_last_channel" id="0x7f120f7b" />
+    <public type="string" name="quickswitcher_mentions" id="0x7f120f7c" />
+    <public type="string" name="quickswitcher_notice" id="0x7f120f7d" />
+    <public type="string" name="quickswitcher_placeholder" id="0x7f120f7e" />
+    <public type="string" name="quickswitcher_querymode_applications" id="0x7f120f7f" />
+    <public type="string" name="quickswitcher_querymode_guilds" id="0x7f120f80" />
+    <public type="string" name="quickswitcher_querymode_text_channels" id="0x7f120f81" />
+    <public type="string" name="quickswitcher_querymode_users" id="0x7f120f82" />
+    <public type="string" name="quickswitcher_querymode_users_in_guild" id="0x7f120f83" />
+    <public type="string" name="quickswitcher_querymode_voice_channels" id="0x7f120f84" />
+    <public type="string" name="quickswitcher_tip_nav" id="0x7f120f85" />
+    <public type="string" name="quickswitcher_tip_select" id="0x7f120f86" />
+    <public type="string" name="quickswitcher_tutorial_message_search" id="0x7f120f87" />
+    <public type="string" name="quickswitcher_tutorial_message_select" id="0x7f120f88" />
+    <public type="string" name="quickswitcher_unread_channels" id="0x7f120f89" />
+    <public type="string" name="quote_attribution" id="0x7f120f8a" />
+    <public type="string" name="quote_attribution_facebook" id="0x7f120f8b" />
+    <public type="string" name="quote_attribution_instagram" id="0x7f120f8c" />
+    <public type="string" name="rate_limited" id="0x7f120f8d" />
+    <public type="string" name="rate_limited_retry_after" id="0x7f120f8e" />
+    <public type="string" name="rating_request_body_android" id="0x7f120f8f" />
+    <public type="string" name="rating_request_title" id="0x7f120f90" />
+    <public type="string" name="reaction_tooltip_1" id="0x7f120f91" />
+    <public type="string" name="reaction_tooltip_1_n" id="0x7f120f92" />
+    <public type="string" name="reaction_tooltip_2" id="0x7f120f93" />
+    <public type="string" name="reaction_tooltip_2_n" id="0x7f120f94" />
+    <public type="string" name="reaction_tooltip_3" id="0x7f120f95" />
+    <public type="string" name="reaction_tooltip_3_n" id="0x7f120f96" />
+    <public type="string" name="reaction_tooltip_n" id="0x7f120f97" />
+    <public type="string" name="reactions" id="0x7f120f98" />
+    <public type="string" name="reactions_matching" id="0x7f120f99" />
+    <public type="string" name="read_message_history" id="0x7f120f9a" />
+    <public type="string" name="read_messages" id="0x7f120f9b" />
+    <public type="string" name="read_messages_view_channels" id="0x7f120f9c" />
+    <public type="string" name="read_only_channel" id="0x7f120f9d" />
+    <public type="string" name="ready" id="0x7f120f9e" />
+    <public type="string" name="recent_mentions" id="0x7f120f9f" />
+    <public type="string" name="recent_mentions_direct_only" id="0x7f120fa0" />
+    <public type="string" name="recent_mentions_everyone_and_direct" id="0x7f120fa1" />
+    <public type="string" name="recent_mentions_filter_everyone" id="0x7f120fa2" />
+    <public type="string" name="recent_mentions_filter_explain_everything" id="0x7f120fa3" />
+    <public type="string" name="recent_mentions_filter_label" id="0x7f120fa4" />
+    <public type="string" name="recent_mentions_filter_roles" id="0x7f120fa5" />
+    <public type="string" name="recent_mentions_pro_tip" id="0x7f120fa6" />
+    <public type="string" name="recent_mentions_roles_and_direct" id="0x7f120fa7" />
+    <public type="string" name="reconnect" id="0x7f120fa8" />
+    <public type="string" name="reconnecting" id="0x7f120fa9" />
+    <public type="string" name="refund" id="0x7f120faa" />
+    <public type="string" name="region" id="0x7f120fab" />
+    <public type="string" name="region_select_footer" id="0x7f120fac" />
+    <public type="string" name="region_select_header" id="0x7f120fad" />
+    <public type="string" name="register" id="0x7f120fae" />
+    <public type="string" name="register_account" id="0x7f120faf" />
+    <public type="string" name="register_body" id="0x7f120fb0" />
+    <public type="string" name="register_title" id="0x7f120fb1" />
+    <public type="string" name="remaining_participants" id="0x7f120fb2" />
+    <public type="string" name="remove" id="0x7f120fb3" />
+    <public type="string" name="remove_all_reactions" id="0x7f120fb4" />
+    <public type="string" name="remove_all_reactions_confirm_body" id="0x7f120fb5" />
+    <public type="string" name="remove_all_reactions_confirm_title" id="0x7f120fb6" />
+    <public type="string" name="remove_friend" id="0x7f120fb7" />
+    <public type="string" name="remove_friend_body" id="0x7f120fb8" />
+    <public type="string" name="remove_friend_title" id="0x7f120fb9" />
+    <public type="string" name="remove_from_group" id="0x7f120fba" />
+    <public type="string" name="remove_icon" id="0x7f120fbb" />
+    <public type="string" name="remove_keybind" id="0x7f120fbc" />
+    <public type="string" name="remove_reaction" id="0x7f120fbd" />
+    <public type="string" name="remove_role_or_user" id="0x7f120fbe" />
+    <public type="string" name="remove_synced_role" id="0x7f120fbf" />
+    <public type="string" name="remove_vanity_url" id="0x7f120fc0" />
+    <public type="string" name="render_embeds" id="0x7f120fc1" />
+    <public type="string" name="render_embeds_label" id="0x7f120fc2" />
+    <public type="string" name="render_reactions" id="0x7f120fc3" />
+    <public type="string" name="report" id="0x7f120fc4" />
+    <public type="string" name="report_message" id="0x7f120fc5" />
+    <public type="string" name="report_server" id="0x7f120fc6" />
+    <public type="string" name="report_title" id="0x7f120fc7" />
+    <public type="string" name="report_user" id="0x7f120fc8" />
+    <public type="string" name="reported" id="0x7f120fc9" />
+    <public type="string" name="request_permission_msg" id="0x7f120fca" />
+    <public type="string" name="resend" id="0x7f120fcb" />
+    <public type="string" name="resend_code" id="0x7f120fcc" />
+    <public type="string" name="resend_email" id="0x7f120fcd" />
+    <public type="string" name="resend_message" id="0x7f120fce" />
+    <public type="string" name="resend_verification_email" id="0x7f120fcf" />
+    <public type="string" name="reset" id="0x7f120fd0" />
+    <public type="string" name="reset_nickname" id="0x7f120fd1" />
+    <public type="string" name="reset_notification_override" id="0x7f120fd2" />
+    <public type="string" name="reset_notification_settings" id="0x7f120fd3" />
+    <public type="string" name="reset_password_title" id="0x7f120fd4" />
+    <public type="string" name="reset_to_default" id="0x7f120fd5" />
+    <public type="string" name="reset_voice_settings" id="0x7f120fd6" />
+    <public type="string" name="reset_voice_settings_body" id="0x7f120fd7" />
+    <public type="string" name="resubscribe" id="0x7f120fd8" />
+    <public type="string" name="retry" id="0x7f120fd9" />
+    <public type="string" name="return_to_login" id="0x7f120fda" />
+    <public type="string" name="reversed" id="0x7f120fdb" />
+    <public type="string" name="revoke" id="0x7f120fdc" />
+    <public type="string" name="revoke_ban" id="0x7f120fdd" />
+    <public type="string" name="ring" id="0x7f120fde" />
+    <public type="string" name="ro" id="0x7f120fdf" />
+    <public type="string" name="role_order_updated" id="0x7f120fe0" />
+    <public type="string" name="roles" id="0x7f120fe1" />
+    <public type="string" name="roles_list" id="0x7f120fe2" />
+    <public type="string" name="rtc_connection" id="0x7f120fe3" />
+    <public type="string" name="rtc_connection_info" id="0x7f120fe4" />
+    <public type="string" name="rtc_connection_state_authenticating" id="0x7f120fe5" />
+    <public type="string" name="rtc_connection_state_awaiting_endpoint" id="0x7f120fe6" />
+    <public type="string" name="rtc_connection_state_connecting" id="0x7f120fe7" />
+    <public type="string" name="rtc_connection_state_disconnected" id="0x7f120fe8" />
+    <public type="string" name="rtc_connection_state_ice_checking" id="0x7f120fe9" />
+    <public type="string" name="rtc_connection_state_no_route" id="0x7f120fea" />
+    <public type="string" name="rtc_connection_state_rtc_connected" id="0x7f120feb" />
+    <public type="string" name="rtc_connection_state_rtc_connected_loss_rate" id="0x7f120fec" />
+    <public type="string" name="rtc_connection_state_rtc_connecting" id="0x7f120fed" />
+    <public type="string" name="rtc_debug_context" id="0x7f120fee" />
+    <public type="string" name="rtc_debug_open" id="0x7f120fef" />
+    <public type="string" name="rtc_debug_rtp_inbound" id="0x7f120ff0" />
+    <public type="string" name="rtc_debug_rtp_outbound" id="0x7f120ff1" />
+    <public type="string" name="rtc_debug_screenshare" id="0x7f120ff2" />
+    <public type="string" name="rtc_debug_transport" id="0x7f120ff3" />
+    <public type="string" name="rtc_debug_users" id="0x7f120ff4" />
+    <public type="string" name="ru" id="0x7f120ff5" />
+    <public type="string" name="salmon" id="0x7f120ff6" />
+    <public type="string" name="sample_channel_message" id="0x7f120ff7" />
+    <public type="string" name="sample_channel_name" id="0x7f120ff8" />
+    <public type="string" name="sample_channel_name_short" id="0x7f120ff9" />
+    <public type="string" name="sample_channel_search_filter" id="0x7f120ffa" />
+    <public type="string" name="sample_confirmation" id="0x7f120ffb" />
+    <public type="string" name="sample_connected_account" id="0x7f120ffc" />
+    <public type="string" name="sample_discrim" id="0x7f120ffd" />
+    <public type="string" name="sample_email" id="0x7f120ffe" />
+    <public type="string" name="sample_empty_string" id="0x7f120fff" />
+    <public type="string" name="sample_language" id="0x7f121000" />
+    <public type="string" name="sample_number_9" id="0x7f121001" />
+    <public type="string" name="sample_number_99" id="0x7f121002" />
+    <public type="string" name="sample_number_999" id="0x7f121003" />
+    <public type="string" name="sample_number_9999" id="0x7f121004" />
+    <public type="string" name="sample_number_bandwidth" id="0x7f121005" />
+    <public type="string" name="sample_number_ratio" id="0x7f121006" />
+    <public type="string" name="sample_online_members" id="0x7f121007" />
+    <public type="string" name="sample_server_name" id="0x7f121008" />
+    <public type="string" name="sample_server_name_short" id="0x7f121009" />
+    <public type="string" name="sample_server_role_name" id="0x7f12100a" />
+    <public type="string" name="sample_time_duration_minutes" id="0x7f12100b" />
+    <public type="string" name="sample_time_duration_seconds" id="0x7f12100c" />
+    <public type="string" name="sample_time_pm" id="0x7f12100d" />
+    <public type="string" name="sample_time_stamp" id="0x7f12100e" />
+    <public type="string" name="sample_total_members" id="0x7f12100f" />
+    <public type="string" name="sample_user_generated_link" id="0x7f121010" />
+    <public type="string" name="sample_user_name" id="0x7f121011" />
+    <public type="string" name="sample_user_name_discrim" id="0x7f121012" />
+    <public type="string" name="sample_user_nick" id="0x7f121013" />
+    <public type="string" name="sample_user_presence" id="0x7f121014" />
+    <public type="string" name="sample_user_presence_details" id="0x7f121015" />
+    <public type="string" name="samsung_welcome_screen" id="0x7f121016" />
+    <public type="string" name="save" id="0x7f121017" />
+    <public type="string" name="save_changes" id="0x7f121018" />
+    <public type="string" name="save_media" id="0x7f121019" />
+    <public type="string" name="save_media_failure_help_mobile" id="0x7f12101a" />
+    <public type="string" name="save_media_failure_mobile" id="0x7f12101b" />
+    <public type="string" name="save_media_success_mobile" id="0x7f12101c" />
+    <public type="string" name="save_new_url" id="0x7f12101d" />
+    <public type="string" name="saved_settings" id="0x7f12101e" />
+    <public type="string" name="scope_activities_read" id="0x7f12101f" />
+    <public type="string" name="scope_activities_read_description" id="0x7f121020" />
+    <public type="string" name="scope_activities_write" id="0x7f121021" />
+    <public type="string" name="scope_activities_write_description" id="0x7f121022" />
+    <public type="string" name="scope_applications_builds_read" id="0x7f121023" />
+    <public type="string" name="scope_applications_builds_read_description" id="0x7f121024" />
+    <public type="string" name="scope_applications_builds_upload" id="0x7f121025" />
+    <public type="string" name="scope_applications_builds_upload_description" id="0x7f121026" />
+    <public type="string" name="scope_applications_entitlements" id="0x7f121027" />
+    <public type="string" name="scope_applications_entitlements_description" id="0x7f121028" />
+    <public type="string" name="scope_applications_store_update" id="0x7f121029" />
+    <public type="string" name="scope_applications_store_update_description" id="0x7f12102a" />
+    <public type="string" name="scope_bot" id="0x7f12102b" />
+    <public type="string" name="scope_bot_description" id="0x7f12102c" />
+    <public type="string" name="scope_bot_permissions" id="0x7f12102d" />
+    <public type="string" name="scope_bot_permissions_description" id="0x7f12102e" />
+    <public type="string" name="scope_bot_server_placeholder" id="0x7f12102f" />
+    <public type="string" name="scope_bot_server_placeholder_no_guilds" id="0x7f121030" />
+    <public type="string" name="scope_bot_server_selected_label" id="0x7f121031" />
+    <public type="string" name="scope_connections" id="0x7f121032" />
+    <public type="string" name="scope_connections_empty" id="0x7f121033" />
+    <public type="string" name="scope_email" id="0x7f121034" />
+    <public type="string" name="scope_email_empty" id="0x7f121035" />
+    <public type="string" name="scope_gdm_join" id="0x7f121036" />
+    <public type="string" name="scope_gdm_join_description" id="0x7f121037" />
+    <public type="string" name="scope_guilds" id="0x7f121038" />
+    <public type="string" name="scope_guilds_empty" id="0x7f121039" />
+    <public type="string" name="scope_guilds_join" id="0x7f12103a" />
+    <public type="string" name="scope_guilds_join_description" id="0x7f12103b" />
+    <public type="string" name="scope_guilds_list_overflow" id="0x7f12103c" />
+    <public type="string" name="scope_identify" id="0x7f12103d" />
+    <public type="string" name="scope_messages_read" id="0x7f12103e" />
+    <public type="string" name="scope_messages_read_description" id="0x7f12103f" />
+    <public type="string" name="scope_relationships_read" id="0x7f121040" />
+    <public type="string" name="scope_relationships_read_description" id="0x7f121041" />
+    <public type="string" name="scope_rpc" id="0x7f121042" />
+    <public type="string" name="scope_rpc_api" id="0x7f121043" />
+    <public type="string" name="scope_rpc_api_description" id="0x7f121044" />
+    <public type="string" name="scope_rpc_description" id="0x7f121045" />
+    <public type="string" name="scope_rpc_notifications_read" id="0x7f121046" />
+    <public type="string" name="scope_rpc_notifications_read_description" id="0x7f121047" />
+    <public type="string" name="scope_unsupported_on_android" id="0x7f121048" />
+    <public type="string" name="scope_unsupported_on_android_description" id="0x7f121049" />
+    <public type="string" name="scope_webhook_incoming" id="0x7f12104a" />
+    <public type="string" name="scope_webhook_incoming_channel_placeholder" id="0x7f12104b" />
+    <public type="string" name="scope_webhook_incoming_description" id="0x7f12104c" />
+    <public type="string" name="screen_share_on" id="0x7f12104d" />
+    <public type="string" name="screen_share_options" id="0x7f12104e" />
+    <public type="string" name="screenshare_change_windows" id="0x7f12104f" />
+    <public type="string" name="screenshare_description" id="0x7f121050" />
+    <public type="string" name="screenshare_extension_body" id="0x7f121051" />
+    <public type="string" name="screenshare_extension_title" id="0x7f121052" />
+    <public type="string" name="screenshare_frame_rate" id="0x7f121053" />
+    <public type="string" name="screenshare_relaunch" id="0x7f121054" />
+    <public type="string" name="screenshare_relaunch_body" id="0x7f121055" />
+    <public type="string" name="screenshare_screen" id="0x7f121056" />
+    <public type="string" name="screenshare_share_screen_or_window" id="0x7f121057" />
+    <public type="string" name="screenshare_sound_toggle_label" id="0x7f121058" />
+    <public type="string" name="screenshare_source" id="0x7f121059" />
+    <public type="string" name="screenshare_stop" id="0x7f12105a" />
+    <public type="string" name="screenshare_stream_game" id="0x7f12105b" />
+    <public type="string" name="screenshare_stream_quality" id="0x7f12105c" />
+    <public type="string" name="screenshare_unavailable" id="0x7f12105d" />
+    <public type="string" name="screenshare_unavailable_download_app" id="0x7f12105e" />
+    <public type="string" name="screenshare_window" id="0x7f12105f" />
+    <public type="string" name="search" id="0x7f121060" />
+    <public type="string" name="search_actions" id="0x7f121061" />
+    <public type="string" name="search_answer_date" id="0x7f121062" />
+    <public type="string" name="search_answer_file_name" id="0x7f121063" />
+    <public type="string" name="search_answer_file_type" id="0x7f121064" />
+    <public type="string" name="search_answer_from" id="0x7f121065" />
+    <public type="string" name="search_answer_has" id="0x7f121066" />
+    <public type="string" name="search_answer_has_attachment" id="0x7f121067" />
+    <public type="string" name="search_answer_has_embed" id="0x7f121068" />
+    <public type="string" name="search_answer_has_image" id="0x7f121069" />
+    <public type="string" name="search_answer_has_link" id="0x7f12106a" />
+    <public type="string" name="search_answer_has_sound" id="0x7f12106b" />
+    <public type="string" name="search_answer_has_video" id="0x7f12106c" />
+    <public type="string" name="search_answer_in" id="0x7f12106d" />
+    <public type="string" name="search_answer_link_from" id="0x7f12106e" />
+    <public type="string" name="search_answer_mentions" id="0x7f12106f" />
+    <public type="string" name="search_channels" id="0x7f121070" />
+    <public type="string" name="search_channels_no_result" id="0x7f121071" />
+    <public type="string" name="search_clear" id="0x7f121072" />
+    <public type="string" name="search_clear_history" id="0x7f121073" />
+    <public type="string" name="search_country" id="0x7f121074" />
+    <public type="string" name="search_date_picker_hint" id="0x7f121075" />
+    <public type="string" name="search_dm_still_indexing" id="0x7f121076" />
+    <public type="string" name="search_dm_with" id="0x7f121077" />
+    <public type="string" name="search_error" id="0x7f121078" />
+    <public type="string" name="search_filter_after" id="0x7f121079" />
+    <public type="string" name="search_filter_before" id="0x7f12107a" />
+    <public type="string" name="search_filter_during" id="0x7f12107b" />
+    <public type="string" name="search_filter_file_name" id="0x7f12107c" />
+    <public type="string" name="search_filter_file_type" id="0x7f12107d" />
+    <public type="string" name="search_filter_from" id="0x7f12107e" />
+    <public type="string" name="search_filter_has" id="0x7f12107f" />
+    <public type="string" name="search_filter_in" id="0x7f121080" />
+    <public type="string" name="search_filter_link_from" id="0x7f121081" />
+    <public type="string" name="search_filter_mentions" id="0x7f121082" />
+    <public type="string" name="search_filter_on" id="0x7f121083" />
+    <public type="string" name="search_for_emoji" id="0x7f121084" />
+    <public type="string" name="search_for_empty" id="0x7f121085" />
+    <public type="string" name="search_for_value" id="0x7f121086" />
+    <public type="string" name="search_from_suggestions" id="0x7f121087" />
+    <public type="string" name="search_giphy" id="0x7f121088" />
+    <public type="string" name="search_group_header_channels" id="0x7f121089" />
+    <public type="string" name="search_group_header_dates" id="0x7f12108a" />
+    <public type="string" name="search_group_header_file_name" id="0x7f12108b" />
+    <public type="string" name="search_group_header_file_type" id="0x7f12108c" />
+    <public type="string" name="search_group_header_from" id="0x7f12108d" />
+    <public type="string" name="search_group_header_has" id="0x7f12108e" />
+    <public type="string" name="search_group_header_history" id="0x7f12108f" />
+    <public type="string" name="search_group_header_link_from" id="0x7f121090" />
+    <public type="string" name="search_group_header_mentions" id="0x7f121091" />
+    <public type="string" name="search_group_header_search_options" id="0x7f121092" />
+    <public type="string" name="search_guild_still_indexing" id="0x7f121093" />
+    <public type="string" name="search_hide_blocked_messages" id="0x7f121094" />
+    <public type="string" name="search_in" id="0x7f121095" />
+    <public type="string" name="search_members" id="0x7f121096" />
+    <public type="string" name="search_members_no_result" id="0x7f121097" />
+    <public type="string" name="search_menu_title" id="0x7f121098" />
+    <public type="string" name="search_no_results" id="0x7f121099" />
+    <public type="string" name="search_no_results_alt" id="0x7f12109a" />
+    <public type="string" name="search_num_results_blocked_not_shown" id="0x7f12109b" />
+    <public type="string" name="search_pick_date" id="0x7f12109c" />
+    <public type="string" name="search_recent" id="0x7f12109d" />
+    <public type="string" name="search_relevant" id="0x7f12109e" />
+    <public type="string" name="search_roles" id="0x7f12109f" />
+    <public type="string" name="search_roles_no_result" id="0x7f1210a0" />
+    <public type="string" name="search_shortcut_month" id="0x7f1210a1" />
+    <public type="string" name="search_shortcut_today" id="0x7f1210a2" />
+    <public type="string" name="search_shortcut_week" id="0x7f1210a3" />
+    <public type="string" name="search_shortcut_year" id="0x7f1210a4" />
+    <public type="string" name="search_shortcut_yesterday" id="0x7f1210a5" />
+    <public type="string" name="search_still_indexing_hint" id="0x7f1210a6" />
+    <public type="string" name="search_tenor" id="0x7f1210a7" />
+    <public type="string" name="search_with_google" id="0x7f1210a8" />
+    <public type="string" name="searching" id="0x7f1210a9" />
+    <public type="string" name="security" id="0x7f1210aa" />
+    <public type="string" name="select" id="0x7f1210ab" />
+    <public type="string" name="select_channel_or_category" id="0x7f1210ac" />
+    <public type="string" name="select_color" id="0x7f1210ad" />
+    <public type="string" name="select_emoji" id="0x7f1210ae" />
+    <public type="string" name="select_picture" id="0x7f1210af" />
+    <public type="string" name="select_picture_upload" id="0x7f1210b0" />
+    <public type="string" name="select_sort_mode" id="0x7f1210b1" />
+    <public type="string" name="selection_shrink_scale" id="0x7f1210b2" />
+    <public type="string" name="self_deafened" id="0x7f1210b3" />
+    <public type="string" name="self_deny_permission_body" id="0x7f1210b4" />
+    <public type="string" name="self_deny_permission_title" id="0x7f1210b5" />
+    <public type="string" name="self_muted" id="0x7f1210b6" />
+    <public type="string" name="self_xss_header" id="0x7f1210b7" />
+    <public type="string" name="self_xss_line_1" id="0x7f1210b8" />
+    <public type="string" name="self_xss_line_2" id="0x7f1210b9" />
+    <public type="string" name="self_xss_line_3" id="0x7f1210ba" />
+    <public type="string" name="self_xss_line_4" id="0x7f1210bb" />
+    <public type="string" name="send" id="0x7f1210bc" />
+    <public type="string" name="send_contents" id="0x7f1210bd" />
+    <public type="string" name="send_dm" id="0x7f1210be" />
+    <public type="string" name="send_message" id="0x7f1210bf" />
+    <public type="string" name="send_message_failure" id="0x7f1210c0" />
+    <public type="string" name="send_messages" id="0x7f1210c1" />
+    <public type="string" name="send_messages_description" id="0x7f1210c2" />
+    <public type="string" name="send_tts_messages" id="0x7f1210c3" />
+    <public type="string" name="send_tts_messages_description" id="0x7f1210c4" />
+    <public type="string" name="server_acronym" id="0x7f1210c5" />
+    <public type="string" name="server_analytics_description" id="0x7f1210c6" />
+    <public type="string" name="server_deafen" id="0x7f1210c7" />
+    <public type="string" name="server_deafened" id="0x7f1210c8" />
+    <public type="string" name="server_desciption_empty" id="0x7f1210c9" />
+    <public type="string" name="server_emoji" id="0x7f1210ca" />
+    <public type="string" name="server_folder_mark_as_read" id="0x7f1210cb" />
+    <public type="string" name="server_folder_mute" id="0x7f1210cc" />
+    <public type="string" name="server_folder_placeholder" id="0x7f1210cd" />
+    <public type="string" name="server_folder_settings" id="0x7f1210ce" />
+    <public type="string" name="server_icon" id="0x7f1210cf" />
+    <public type="string" name="server_insights" id="0x7f1210d0" />
+    <public type="string" name="server_insights_error_message" id="0x7f1210d1" />
+    <public type="string" name="server_mute" id="0x7f1210d2" />
+    <public type="string" name="server_mute_dms" id="0x7f1210d3" />
+    <public type="string" name="server_muted" id="0x7f1210d4" />
+    <public type="string" name="server_name_required" id="0x7f1210d5" />
+    <public type="string" name="server_notification" id="0x7f1210d6" />
+    <public type="string" name="server_options" id="0x7f1210d7" />
+    <public type="string" name="server_overview" id="0x7f1210d8" />
+    <public type="string" name="server_ratio_healthy_hook" id="0x7f1210d9" />
+    <public type="string" name="server_region_unavailable" id="0x7f1210da" />
+    <public type="string" name="server_settings" id="0x7f1210db" />
+    <public type="string" name="server_settings_updated" id="0x7f1210dc" />
+    <public type="string" name="server_sort" id="0x7f1210dd" />
+    <public type="string" name="server_status" id="0x7f1210de" />
+    <public type="string" name="server_undeafen" id="0x7f1210df" />
+    <public type="string" name="server_unmute" id="0x7f1210e0" />
+    <public type="string" name="server_voice_mute" id="0x7f1210e1" />
+    <public type="string" name="server_voice_unmute" id="0x7f1210e2" />
+    <public type="string" name="servers" id="0x7f1210e3" />
+    <public type="string" name="servers_management_title" id="0x7f1210e4" />
+    <public type="string" name="service_connections_disconnect" id="0x7f1210e5" />
+    <public type="string" name="set_debug_logging" id="0x7f1210e6" />
+    <public type="string" name="set_debug_logging_body" id="0x7f1210e7" />
+    <public type="string" name="set_invite_link_never_expire" id="0x7f1210e8" />
+    <public type="string" name="set_status" id="0x7f1210e9" />
+    <public type="string" name="settings" id="0x7f1210ea" />
+    <public type="string" name="settings_advanced" id="0x7f1210eb" />
+    <public type="string" name="settings_basic" id="0x7f1210ec" />
+    <public type="string" name="settings_games_add" id="0x7f1210ed" />
+    <public type="string" name="settings_games_add_game" id="0x7f1210ee" />
+    <public type="string" name="settings_games_add_new_game" id="0x7f1210ef" />
+    <public type="string" name="settings_games_added_games_label" id="0x7f1210f0" />
+    <public type="string" name="settings_games_enable_overlay_label" id="0x7f1210f1" />
+    <public type="string" name="settings_games_game_to_add" id="0x7f1210f2" />
+    <public type="string" name="settings_games_hidden_library_applications_label" id="0x7f1210f3" />
+    <public type="string" name="settings_games_import_explanation" id="0x7f1210f4" />
+    <public type="string" name="settings_games_import_label" id="0x7f1210f5" />
+    <public type="string" name="settings_games_last_played" id="0x7f1210f6" />
+    <public type="string" name="settings_games_no_game_detected" id="0x7f1210f7" />
+    <public type="string" name="settings_games_no_games_header" id="0x7f1210f8" />
+    <public type="string" name="settings_games_not_playing" id="0x7f1210f9" />
+    <public type="string" name="settings_games_not_seeing_game" id="0x7f1210fa" />
+    <public type="string" name="settings_games_now_playing_label" id="0x7f1210fb" />
+    <public type="string" name="settings_games_now_playing_state" id="0x7f1210fc" />
+    <public type="string" name="settings_games_overlay" id="0x7f1210fd" />
+    <public type="string" name="settings_games_overlay_off" id="0x7f1210fe" />
+    <public type="string" name="settings_games_overlay_on" id="0x7f1210ff" />
+    <public type="string" name="settings_games_overlay_warning" id="0x7f121100" />
+    <public type="string" name="settings_games_remove_icon" id="0x7f121101" />
+    <public type="string" name="settings_games_restore_to_library" id="0x7f121102" />
+    <public type="string" name="settings_games_toggle_overlay" id="0x7f121103" />
+    <public type="string" name="settings_games_verified_icon" id="0x7f121104" />
+    <public type="string" name="settings_invite_tip" id="0x7f121105" />
+    <public type="string" name="settings_invite_tip_without_create" id="0x7f121106" />
+    <public type="string" name="settings_notice_message" id="0x7f121107" />
+    <public type="string" name="settings_permissions_delete_body" id="0x7f121108" />
+    <public type="string" name="settings_permissions_delete_title" id="0x7f121109" />
+    <public type="string" name="settings_permissions_title" id="0x7f12110a" />
+    <public type="string" name="settings_roles_delete_body" id="0x7f12110b" />
+    <public type="string" name="settings_roles_delete_title" id="0x7f12110c" />
+    <public type="string" name="settings_roles_helpdesk_link" id="0x7f12110d" />
+    <public type="string" name="settings_sync" id="0x7f12110e" />
+    <public type="string" name="settings_webhooks_empty_body" id="0x7f12110f" />
+    <public type="string" name="settings_webhooks_empty_body_ios" id="0x7f121110" />
+    <public type="string" name="settings_webhooks_empty_title" id="0x7f121111" />
+    <public type="string" name="settings_webhooks_intro" id="0x7f121112" />
+    <public type="string" name="setup" id="0x7f121113" />
+    <public type="string" name="setup_vanity_url" id="0x7f121114" />
+    <public type="string" name="several_users_typing" id="0x7f121115" />
+    <public type="string" name="share" id="0x7f121116" />
+    <public type="string" name="share_invite_link_for_access" id="0x7f121117" />
+    <public type="string" name="share_invite_link_for_access_experiment" id="0x7f121118" />
+    <public type="string" name="share_invite_mobile" id="0x7f121119" />
+    <public type="string" name="share_link" id="0x7f12111a" />
+    <public type="string" name="share_to" id="0x7f12111b" />
+    <public type="string" name="shortcut_recorder_button" id="0x7f12111c" />
+    <public type="string" name="shortcut_recorder_button_edit" id="0x7f12111d" />
+    <public type="string" name="shortcut_recorder_button_recording" id="0x7f12111e" />
+    <public type="string" name="shortcut_recorder_help" id="0x7f12111f" />
+    <public type="string" name="shortcut_recorder_no_bind" id="0x7f121120" />
+    <public type="string" name="show_current_game" id="0x7f121121" />
+    <public type="string" name="show_current_game_desc" id="0x7f121122" />
+    <public type="string" name="show_muted" id="0x7f121123" />
+    <public type="string" name="show_muted_channels" id="0x7f121124" />
+    <public type="string" name="show_spoiler_always" id="0x7f121125" />
+    <public type="string" name="show_spoiler_content" id="0x7f121126" />
+    <public type="string" name="show_spoiler_content_help" id="0x7f121127" />
+    <public type="string" name="show_spoiler_on_click" id="0x7f121128" />
+    <public type="string" name="show_spoiler_on_servers_i_mod" id="0x7f121129" />
+    <public type="string" name="skip" id="0x7f12112a" />
+    <public type="string" name="skip_all_tips" id="0x7f12112b" />
+    <public type="string" name="sky_blue" id="0x7f12112c" />
+    <public type="string" name="sort" id="0x7f12112d" />
+    <public type="string" name="sorting" id="0x7f12112e" />
+    <public type="string" name="sorting_channels" id="0x7f12112f" />
+    <public type="string" name="sound_deafen" id="0x7f121130" />
+    <public type="string" name="sound_incoming_ring" id="0x7f121131" />
+    <public type="string" name="sound_message" id="0x7f121132" />
+    <public type="string" name="sound_mute" id="0x7f121133" />
+    <public type="string" name="sound_outgoing_ring" id="0x7f121134" />
+    <public type="string" name="sound_ptt_activate" id="0x7f121135" />
+    <public type="string" name="sound_ptt_deactivate" id="0x7f121136" />
+    <public type="string" name="sound_stream_started" id="0x7f121137" />
+    <public type="string" name="sound_stream_stopped" id="0x7f121138" />
+    <public type="string" name="sound_undeafen" id="0x7f121139" />
+    <public type="string" name="sound_unmute" id="0x7f12113a" />
+    <public type="string" name="sound_user_join" id="0x7f12113b" />
+    <public type="string" name="sound_user_leave" id="0x7f12113c" />
+    <public type="string" name="sound_user_moved" id="0x7f12113d" />
+    <public type="string" name="sound_viewer_join" id="0x7f12113e" />
+    <public type="string" name="sound_viewer_leave" id="0x7f12113f" />
+    <public type="string" name="sound_voice_disconnected" id="0x7f121140" />
+    <public type="string" name="sounds" id="0x7f121141" />
+    <public type="string" name="source_message_deleted" id="0x7f121142" />
+    <public type="string" name="speak" id="0x7f121143" />
+    <public type="string" name="spectators" id="0x7f121144" />
+    <public type="string" name="spectators_header" id="0x7f121145" />
+    <public type="string" name="spellcheck" id="0x7f121146" />
+    <public type="string" name="spoiler" id="0x7f121147" />
+    <public type="string" name="spoiler_hide" id="0x7f121148" />
+    <public type="string" name="spoiler_mark_selected" id="0x7f121149" />
+    <public type="string" name="spoiler_reveal" id="0x7f12114a" />
+    <public type="string" name="spotify_app_download" id="0x7f12114b" />
+    <public type="string" name="spotify_app_not_found" id="0x7f12114c" />
+    <public type="string" name="spotify_app_not_opened" id="0x7f12114d" />
+    <public type="string" name="spotify_connection_info_android" id="0x7f12114e" />
+    <public type="string" name="spotify_listen_along_host" id="0x7f12114f" />
+    <public type="string" name="spotify_listen_along_info" id="0x7f121150" />
+    <public type="string" name="spotify_listen_along_listener" id="0x7f121151" />
+    <public type="string" name="spotify_listen_along_listeners" id="0x7f121152" />
+    <public type="string" name="spotify_listen_along_listening_along_count" id="0x7f121153" />
+    <public type="string" name="spotify_listen_along_modal_title" id="0x7f121154" />
+    <public type="string" name="spotify_listen_along_song_by_artist" id="0x7f121155" />
+    <public type="string" name="spotify_listen_along_stop" id="0x7f121156" />
+    <public type="string" name="spotify_listen_along_subtitle_listener" id="0x7f121157" />
+    <public type="string" name="spotify_listen_along_title_host" id="0x7f121158" />
+    <public type="string" name="spotify_listen_along_title_listener" id="0x7f121159" />
+    <public type="string" name="spotify_premium_upgrade_body" id="0x7f12115a" />
+    <public type="string" name="spotify_premium_upgrade_button" id="0x7f12115b" />
+    <public type="string" name="spotify_premium_upgrade_header" id="0x7f12115c" />
+    <public type="string" name="staff_badge_tooltip" id="0x7f12115d" />
+    <public type="string" name="start" id="0x7f12115e" />
+    <public type="string" name="start_audio_call" id="0x7f12115f" />
+    <public type="string" name="start_call" id="0x7f121160" />
+    <public type="string" name="start_dm_label" id="0x7f121161" />
+    <public type="string" name="start_dm_placeholder" id="0x7f121162" />
+    <public type="string" name="start_video_call" id="0x7f121163" />
+    <public type="string" name="start_voice_call" id="0x7f121164" />
+    <public type="string" name="status_bar_notification_info_overflow" id="0x7f121165" />
+    <public type="string" name="status_dnd" id="0x7f121166" />
+    <public type="string" name="status_dnd_help" id="0x7f121167" />
+    <public type="string" name="status_idle" id="0x7f121168" />
+    <public type="string" name="status_invisible" id="0x7f121169" />
+    <public type="string" name="status_invisible_helper" id="0x7f12116a" />
+    <public type="string" name="status_offline" id="0x7f12116b" />
+    <public type="string" name="status_online" id="0x7f12116c" />
+    <public type="string" name="status_online_mobile" id="0x7f12116d" />
+    <public type="string" name="status_page_url" id="0x7f12116e" />
+    <public type="string" name="status_streaming" id="0x7f12116f" />
+    <public type="string" name="status_unknown" id="0x7f121170" />
+    <public type="string" name="step_number" id="0x7f121171" />
+    <public type="string" name="still_indexing" id="0x7f121172" />
+    <public type="string" name="stop_ringing" id="0x7f121173" />
+    <public type="string" name="stop_streaming" id="0x7f121174" />
+    <public type="string" name="stop_watching" id="0x7f121175" />
+    <public type="string" name="storage_permission_denied_msg" id="0x7f121176" />
+    <public type="string" name="store_channel" id="0x7f121177" />
+    <public type="string" name="stream" id="0x7f121178" />
+    <public type="string" name="stream_bad_spectator" id="0x7f121179" />
+    <public type="string" name="stream_bad_streamer" id="0x7f12117a" />
+    <public type="string" name="stream_capture_paused" id="0x7f12117b" />
+    <public type="string" name="stream_capture_paused_details" id="0x7f12117c" />
+    <public type="string" name="stream_capture_paused_details_viewer" id="0x7f12117d" />
+    <public type="string" name="stream_channel_description" id="0x7f12117e" />
+    <public type="string" name="stream_description" id="0x7f12117f" />
+    <public type="string" name="stream_ended" id="0x7f121180" />
+    <public type="string" name="stream_ended_button" id="0x7f121181" />
+    <public type="string" name="stream_ended_no_spectators" id="0x7f121182" />
+    <public type="string" name="stream_failed_description" id="0x7f121183" />
+    <public type="string" name="stream_failed_title" id="0x7f121184" />
+    <public type="string" name="stream_full_modal_body" id="0x7f121185" />
+    <public type="string" name="stream_full_modal_header" id="0x7f121186" />
+    <public type="string" name="stream_issue_modal_header" id="0x7f121187" />
+    <public type="string" name="stream_network_quality_error" id="0x7f121188" />
+    <public type="string" name="stream_no_preview" id="0x7f121189" />
+    <public type="string" name="stream_playing" id="0x7f12118a" />
+    <public type="string" name="stream_preview_loading" id="0x7f12118b" />
+    <public type="string" name="stream_preview_paused" id="0x7f12118c" />
+    <public type="string" name="stream_preview_paused_subtext" id="0x7f12118d" />
+    <public type="string" name="stream_quality_unlock" id="0x7f12118e" />
+    <public type="string" name="stream_reconnecting_error" id="0x7f12118f" />
+    <public type="string" name="stream_reconnecting_error_subtext" id="0x7f121190" />
+    <public type="string" name="stream_report_a_problem" id="0x7f121191" />
+    <public type="string" name="stream_report_a_problem_post_stream" id="0x7f121192" />
+    <public type="string" name="stream_report_audio_missing" id="0x7f121193" />
+    <public type="string" name="stream_report_audio_poor" id="0x7f121194" />
+    <public type="string" name="stream_report_black" id="0x7f121195" />
+    <public type="string" name="stream_report_blurry" id="0x7f121196" />
+    <public type="string" name="stream_report_ended_audio_missing" id="0x7f121197" />
+    <public type="string" name="stream_report_ended_audio_poor" id="0x7f121198" />
+    <public type="string" name="stream_report_ended_black" id="0x7f121199" />
+    <public type="string" name="stream_report_ended_blurry" id="0x7f12119a" />
+    <public type="string" name="stream_report_ended_lagging" id="0x7f12119b" />
+    <public type="string" name="stream_report_ended_out_of_sync" id="0x7f12119c" />
+    <public type="string" name="stream_report_game_issue" id="0x7f12119d" />
+    <public type="string" name="stream_report_label" id="0x7f12119e" />
+    <public type="string" name="stream_report_lagging" id="0x7f12119f" />
+    <public type="string" name="stream_report_no_issue" id="0x7f1211a0" />
+    <public type="string" name="stream_report_out_of_sync" id="0x7f1211a1" />
+    <public type="string" name="stream_report_placeholder" id="0x7f1211a2" />
+    <public type="string" name="stream_report_problem" id="0x7f1211a3" />
+    <public type="string" name="stream_report_problem_body" id="0x7f1211a4" />
+    <public type="string" name="stream_report_problem_header_mobile" id="0x7f1211a5" />
+    <public type="string" name="stream_report_problem_mobile" id="0x7f1211a6" />
+    <public type="string" name="stream_report_rating_body" id="0x7f1211a7" />
+    <public type="string" name="stream_report_rating_body_streamer" id="0x7f1211a8" />
+    <public type="string" name="stream_report_submit" id="0x7f1211a9" />
+    <public type="string" name="stream_reported" id="0x7f1211aa" />
+    <public type="string" name="stream_reported_body" id="0x7f1211ab" />
+    <public type="string" name="stream_soundshare_failed" id="0x7f1211ac" />
+    <public type="string" name="streamer_mode" id="0x7f1211ad" />
+    <public type="string" name="streamer_mode_enabled" id="0x7f1211ae" />
+    <public type="string" name="streamer_playing" id="0x7f1211af" />
+    <public type="string" name="streamer_settings_title" id="0x7f1211b0" />
+    <public type="string" name="streaming" id="0x7f1211b1" />
+    <public type="string" name="streaming_a_game" id="0x7f1211b2" />
+    <public type="string" name="stripe_unable_to_load" id="0x7f1211b3" />
+    <public type="string" name="sub_enabled_servers" id="0x7f1211b4" />
+    <public type="string" name="subscriber_information" id="0x7f1211b5" />
+    <public type="string" name="subscription_payment_legalese_monthly" id="0x7f1211b6" />
+    <public type="string" name="subscription_payment_legalese_yearly" id="0x7f1211b7" />
+    <public type="string" name="subscriptions_title" id="0x7f1211b8" />
+    <public type="string" name="suggestions" id="0x7f1211b9" />
+    <public type="string" name="support" id="0x7f1211ba" />
+    <public type="string" name="suppress_all_embeds" id="0x7f1211bb" />
+    <public type="string" name="suppressed" id="0x7f1211bc" />
+    <public type="string" name="suppressed_afk_body" id="0x7f1211bd" />
+    <public type="string" name="suppressed_afk_title" id="0x7f1211be" />
+    <public type="string" name="suppressed_permission_body" id="0x7f1211bf" />
+    <public type="string" name="sv_se" id="0x7f1211c0" />
+    <public type="string" name="switch_audio_output" id="0x7f1211c1" />
+    <public type="string" name="switch_hardware_acceleration" id="0x7f1211c2" />
+    <public type="string" name="switch_hardware_acceleration_body" id="0x7f1211c3" />
+    <public type="string" name="switch_subsystem" id="0x7f1211c4" />
+    <public type="string" name="switch_subsystem_body" id="0x7f1211c5" />
+    <public type="string" name="switch_to_compact_mode" id="0x7f1211c6" />
+    <public type="string" name="switch_to_cozy_mode" id="0x7f1211c7" />
+    <public type="string" name="switch_to_dark_theme" id="0x7f1211c8" />
+    <public type="string" name="switch_to_light_theme" id="0x7f1211c9" />
+    <public type="string" name="switch_to_push_to_talk" id="0x7f1211ca" />
+    <public type="string" name="switch_to_voice_activity" id="0x7f1211cb" />
+    <public type="string" name="sync" id="0x7f1211cc" />
+    <public type="string" name="sync_across_clients_appearance_help" id="0x7f1211cd" />
+    <public type="string" name="sync_across_clients_text" id="0x7f1211ce" />
+    <public type="string" name="sync_across_clients_text_help" id="0x7f1211cf" />
+    <public type="string" name="sync_friends" id="0x7f1211d0" />
+    <public type="string" name="sync_now" id="0x7f1211d1" />
+    <public type="string" name="sync_permissions" id="0x7f1211d2" />
+    <public type="string" name="sync_permissions_explanation" id="0x7f1211d3" />
+    <public type="string" name="sync_revoked" id="0x7f1211d4" />
+    <public type="string" name="sync_this_account" id="0x7f1211d5" />
+    <public type="string" name="sync_with" id="0x7f1211d6" />
+    <public type="string" name="system_keyboard" id="0x7f1211d7" />
+    <public type="string" name="system_message_call_missed" id="0x7f1211d8" />
+    <public type="string" name="system_message_call_started" id="0x7f1211d9" />
+    <public type="string" name="system_message_channel_follow_add" id="0x7f1211da" />
+    <public type="string" name="system_message_channel_follow_add_ios" id="0x7f1211db" />
+    <public type="string" name="system_message_channel_icon_change" id="0x7f1211dc" />
+    <public type="string" name="system_message_channel_name_change" id="0x7f1211dd" />
+    <public type="string" name="system_message_guild_bot_join" id="0x7f1211de" />
+    <public type="string" name="system_message_guild_member_join" id="0x7f1211df" />
+    <public type="string" name="system_message_guild_member_join_01" id="0x7f1211e0" />
+    <public type="string" name="system_message_guild_member_join_02" id="0x7f1211e1" />
+    <public type="string" name="system_message_guild_member_join_03" id="0x7f1211e2" />
+    <public type="string" name="system_message_guild_member_join_04" id="0x7f1211e3" />
+    <public type="string" name="system_message_guild_member_join_05" id="0x7f1211e4" />
+    <public type="string" name="system_message_guild_member_join_06" id="0x7f1211e5" />
+    <public type="string" name="system_message_guild_member_join_07" id="0x7f1211e6" />
+    <public type="string" name="system_message_guild_member_join_08" id="0x7f1211e7" />
+    <public type="string" name="system_message_guild_member_join_09" id="0x7f1211e8" />
+    <public type="string" name="system_message_guild_member_join_10" id="0x7f1211e9" />
+    <public type="string" name="system_message_guild_member_join_11" id="0x7f1211ea" />
+    <public type="string" name="system_message_guild_member_join_12" id="0x7f1211eb" />
+    <public type="string" name="system_message_guild_member_join_13" id="0x7f1211ec" />
+    <public type="string" name="system_message_guild_member_join_14" id="0x7f1211ed" />
+    <public type="string" name="system_message_guild_member_join_15" id="0x7f1211ee" />
+    <public type="string" name="system_message_guild_member_join_16" id="0x7f1211ef" />
+    <public type="string" name="system_message_guild_member_join_17" id="0x7f1211f0" />
+    <public type="string" name="system_message_guild_member_join_18" id="0x7f1211f1" />
+    <public type="string" name="system_message_guild_member_join_19" id="0x7f1211f2" />
+    <public type="string" name="system_message_guild_member_join_20" id="0x7f1211f3" />
+    <public type="string" name="system_message_guild_member_join_21" id="0x7f1211f4" />
+    <public type="string" name="system_message_guild_member_join_22" id="0x7f1211f5" />
+    <public type="string" name="system_message_guild_member_join_23" id="0x7f1211f6" />
+    <public type="string" name="system_message_guild_member_join_24" id="0x7f1211f7" />
+    <public type="string" name="system_message_guild_member_join_25" id="0x7f1211f8" />
+    <public type="string" name="system_message_guild_member_join_26" id="0x7f1211f9" />
+    <public type="string" name="system_message_guild_member_join_27" id="0x7f1211fa" />
+    <public type="string" name="system_message_guild_member_join_28" id="0x7f1211fb" />
+    <public type="string" name="system_message_guild_member_join_29" id="0x7f1211fc" />
+    <public type="string" name="system_message_guild_member_join_30" id="0x7f1211fd" />
+    <public type="string" name="system_message_guild_member_join_31" id="0x7f1211fe" />
+    <public type="string" name="system_message_guild_member_join_32" id="0x7f1211ff" />
+    <public type="string" name="system_message_guild_member_join_33" id="0x7f121200" />
+    <public type="string" name="system_message_guild_member_join_34" id="0x7f121201" />
+    <public type="string" name="system_message_guild_member_join_35" id="0x7f121202" />
+    <public type="string" name="system_message_guild_member_join_36" id="0x7f121203" />
+    <public type="string" name="system_message_guild_member_join_37" id="0x7f121204" />
+    <public type="string" name="system_message_guild_member_join_38" id="0x7f121205" />
+    <public type="string" name="system_message_guild_member_subscribed" id="0x7f121206" />
+    <public type="string" name="system_message_guild_member_subscribed_achieved_tier" id="0x7f121207" />
+    <public type="string" name="system_message_join_call" id="0x7f121208" />
+    <public type="string" name="system_message_pinned_message" id="0x7f121209" />
+    <public type="string" name="system_message_pinned_message_mobile" id="0x7f12120a" />
+    <public type="string" name="system_message_pinned_message_no_cta" id="0x7f12120b" />
+    <public type="string" name="system_message_pinned_message_no_cta_formatted" id="0x7f12120c" />
+    <public type="string" name="system_message_recipient_add" id="0x7f12120d" />
+    <public type="string" name="system_message_recipient_remove" id="0x7f12120e" />
+    <public type="string" name="system_message_recipient_remove_self" id="0x7f12120f" />
+    <public type="string" name="system_permission_grant" id="0x7f121210" />
+    <public type="string" name="system_permission_request_camera" id="0x7f121211" />
+    <public type="string" name="system_permission_request_files" id="0x7f121212" />
+    <public type="string" name="tab_bar" id="0x7f121213" />
+    <public type="string" name="take_photo_or_video" id="0x7f121214" />
+    <public type="string" name="tan" id="0x7f121215" />
+    <public type="string" name="tap_add_nickname" id="0x7f121216" />
+    <public type="string" name="tar_gz" id="0x7f121217" />
+    <public type="string" name="teal" id="0x7f121218" />
+    <public type="string" name="temporary_membership_explanation" id="0x7f121219" />
+    <public type="string" name="terms_of_service" id="0x7f12121a" />
+    <public type="string" name="terms_of_service_url" id="0x7f12121b" />
+    <public type="string" name="terms_privacy" id="0x7f12121c" />
+    <public type="string" name="terms_privacy_opt_in" id="0x7f12121d" />
+    <public type="string" name="terms_privacy_opt_in_tooltip" id="0x7f12121e" />
+    <public type="string" name="terracotta" id="0x7f12121f" />
+    <public type="string" name="test_video" id="0x7f121220" />
+    <public type="string" name="text" id="0x7f121221" />
+    <public type="string" name="text_and_images" id="0x7f121222" />
+    <public type="string" name="text_channel" id="0x7f121223" />
+    <public type="string" name="text_channels" id="0x7f121224" />
+    <public type="string" name="text_channels_matching" id="0x7f121225" />
+    <public type="string" name="text_permissions" id="0x7f121226" />
+    <public type="string" name="textarea_placeholder" id="0x7f121227" />
+    <public type="string" name="th" id="0x7f121228" />
+    <public type="string" name="theme" id="0x7f121229" />
+    <public type="string" name="theme_dark" id="0x7f12122a" />
+    <public type="string" name="theme_light" id="0x7f12122b" />
+    <public type="string" name="theme_pure_evil_title" id="0x7f12122c" />
+    <public type="string" name="theme_pure_evil_updated" id="0x7f12122d" />
+    <public type="string" name="theme_updated" id="0x7f12122e" />
+    <public type="string" name="this_server" id="0x7f12122f" />
+    <public type="string" name="this_server_named" id="0x7f121230" />
+    <public type="string" name="three_users_typing" id="0x7f121231" />
+    <public type="string" name="timeout_error" id="0x7f121232" />
+    <public type="string" name="tip_create_first_server_body3" id="0x7f121233" />
+    <public type="string" name="tip_create_first_server_title3" id="0x7f121234" />
+    <public type="string" name="tip_create_more_servers_body3" id="0x7f121235" />
+    <public type="string" name="tip_create_more_servers_title3" id="0x7f121236" />
+    <public type="string" name="tip_direct_messages_body3" id="0x7f121237" />
+    <public type="string" name="tip_direct_messages_title3" id="0x7f121238" />
+    <public type="string" name="tip_friends_list_body3" id="0x7f121239" />
+    <public type="string" name="tip_friends_list_title3" id="0x7f12123a" />
+    <public type="string" name="tip_instant_invite_body3" id="0x7f12123b" />
+    <public type="string" name="tip_instant_invite_title3" id="0x7f12123c" />
+    <public type="string" name="tip_organize_by_topic_body3" id="0x7f12123d" />
+    <public type="string" name="tip_organize_by_topic_title3" id="0x7f12123e" />
+    <public type="string" name="tip_server_settings_body3" id="0x7f12123f" />
+    <public type="string" name="tip_server_settings_title3" id="0x7f121240" />
+    <public type="string" name="tip_voice_conversations_body3" id="0x7f121241" />
+    <public type="string" name="tip_voice_conversations_title3" id="0x7f121242" />
+    <public type="string" name="tip_whos_online_body3" id="0x7f121243" />
+    <public type="string" name="tip_whos_online_title3" id="0x7f121244" />
+    <public type="string" name="tip_writing_messages_body3" id="0x7f121245" />
+    <public type="string" name="tip_writing_messages_title3" id="0x7f121246" />
+    <public type="string" name="title" id="0x7f121247" />
+    <public type="string" name="toast_add_friend" id="0x7f121248" />
+    <public type="string" name="toast_image_saved" id="0x7f121249" />
+    <public type="string" name="toast_message_copied" id="0x7f12124a" />
+    <public type="string" name="toast_message_id_copied" id="0x7f12124b" />
+    <public type="string" name="toast_username_saved" id="0x7f12124c" />
+    <public type="string" name="toggle_camera" id="0x7f12124d" />
+    <public type="string" name="toggle_deafen" id="0x7f12124e" />
+    <public type="string" name="toggle_drawer" id="0x7f12124f" />
+    <public type="string" name="toggle_emoji_keyboard" id="0x7f121250" />
+    <public type="string" name="toggle_microphone" id="0x7f121251" />
+    <public type="string" name="toggle_mute" id="0x7f121252" />
+    <public type="string" name="too_many_animated_emoji" id="0x7f121253" />
+    <public type="string" name="too_many_emoji" id="0x7f121254" />
+    <public type="string" name="too_many_reactions_alert_body" id="0x7f121255" />
+    <public type="string" name="too_many_reactions_alert_header" id="0x7f121256" />
+    <public type="string" name="total_members" id="0x7f121257" />
+    <public type="string" name="total_results" id="0x7f121258" />
+    <public type="string" name="tr" id="0x7f121259" />
+    <public type="string" name="transfer" id="0x7f12125a" />
+    <public type="string" name="transfer_ownership" id="0x7f12125b" />
+    <public type="string" name="transfer_ownership_acknowledge" id="0x7f12125c" />
+    <public type="string" name="transfer_ownership_to_user" id="0x7f12125d" />
+    <public type="string" name="trending_arrow_down" id="0x7f12125e" />
+    <public type="string" name="trending_arrow_up" id="0x7f12125f" />
+    <public type="string" name="try_again" id="0x7f121260" />
+    <public type="string" name="tts_alls" id="0x7f121261" />
+    <public type="string" name="tts_current" id="0x7f121262" />
+    <public type="string" name="tts_never" id="0x7f121263" />
+    <public type="string" name="tutorial_close" id="0x7f121264" />
+    <public type="string" name="tweet_us" id="0x7f121265" />
+    <public type="string" name="twitter" id="0x7f121266" />
+    <public type="string" name="twitter_page_url" id="0x7f121267" />
+    <public type="string" name="two_fa" id="0x7f121268" />
+    <public type="string" name="two_fa_activate" id="0x7f121269" />
+    <public type="string" name="two_fa_app_name_authy" id="0x7f12126a" />
+    <public type="string" name="two_fa_app_name_google_authenticator" id="0x7f12126b" />
+    <public type="string" name="two_fa_auth_code" id="0x7f12126c" />
+    <public type="string" name="two_fa_backup_code_enter" id="0x7f12126d" />
+    <public type="string" name="two_fa_backup_code_enter_wrong" id="0x7f12126e" />
+    <public type="string" name="two_fa_backup_code_hint" id="0x7f12126f" />
+    <public type="string" name="two_fa_backup_code_used" id="0x7f121270" />
+    <public type="string" name="two_fa_backup_codes_body" id="0x7f121271" />
+    <public type="string" name="two_fa_backup_codes_label" id="0x7f121272" />
+    <public type="string" name="two_fa_backup_codes_sales_pitch" id="0x7f121273" />
+    <public type="string" name="two_fa_change_account" id="0x7f121274" />
+    <public type="string" name="two_fa_code" id="0x7f121275" />
+    <public type="string" name="two_fa_disable" id="0x7f121276" />
+    <public type="string" name="two_fa_discord_backup_codes" id="0x7f121277" />
+    <public type="string" name="two_fa_download_app_body" id="0x7f121278" />
+    <public type="string" name="two_fa_download_app_label" id="0x7f121279" />
+    <public type="string" name="two_fa_download_codes" id="0x7f12127a" />
+    <public type="string" name="two_fa_enable" id="0x7f12127b" />
+    <public type="string" name="two_fa_enable_subheader" id="0x7f12127c" />
+    <public type="string" name="two_fa_enabled" id="0x7f12127d" />
+    <public type="string" name="two_fa_enter_sms_token_label" id="0x7f12127e" />
+    <public type="string" name="two_fa_enter_sms_token_sending" id="0x7f12127f" />
+    <public type="string" name="two_fa_enter_sms_token_sent" id="0x7f121280" />
+    <public type="string" name="two_fa_enter_token_body" id="0x7f121281" />
+    <public type="string" name="two_fa_enter_token_label" id="0x7f121282" />
+    <public type="string" name="two_fa_generate_codes" id="0x7f121283" />
+    <public type="string" name="two_fa_generate_codes_confirm_text" id="0x7f121284" />
+    <public type="string" name="two_fa_guild_mfa_warning" id="0x7f121285" />
+    <public type="string" name="two_fa_guild_mfa_warning_ios" id="0x7f121286" />
+    <public type="string" name="two_fa_guild_mfa_warning_message" id="0x7f121287" />
+    <public type="string" name="two_fa_guild_mfa_warning_resolve_button" id="0x7f121288" />
+    <public type="string" name="two_fa_ios_delete" id="0x7f121289" />
+    <public type="string" name="two_fa_key" id="0x7f12128a" />
+    <public type="string" name="two_fa_login_body" id="0x7f12128b" />
+    <public type="string" name="two_fa_login_footer" id="0x7f12128c" />
+    <public type="string" name="two_fa_login_label" id="0x7f12128d" />
+    <public type="string" name="two_fa_modal_setup_header_mobile" id="0x7f12128e" />
+    <public type="string" name="two_fa_not_verified" id="0x7f12128f" />
+    <public type="string" name="two_fa_qr_body" id="0x7f121290" />
+    <public type="string" name="two_fa_qr_label" id="0x7f121291" />
+    <public type="string" name="two_fa_remove" id="0x7f121292" />
+    <public type="string" name="two_fa_sales_pitch" id="0x7f121293" />
+    <public type="string" name="two_fa_success_body" id="0x7f121294" />
+    <public type="string" name="two_fa_success_body_mobile" id="0x7f121295" />
+    <public type="string" name="two_fa_success_header" id="0x7f121296" />
+    <public type="string" name="two_fa_token_required" id="0x7f121297" />
+    <public type="string" name="two_fa_use_desktop_app" id="0x7f121298" />
+    <public type="string" name="two_fa_view_backup_codes" id="0x7f121299" />
+    <public type="string" name="two_fa_view_codes" id="0x7f12129a" />
+    <public type="string" name="two_users_typing" id="0x7f12129b" />
+    <public type="string" name="ucrop_error_input_data_is_absent" id="0x7f12129c" />
+    <public type="string" name="ucrop_label_edit_photo" id="0x7f12129d" />
+    <public type="string" name="ucrop_label_original" id="0x7f12129e" />
+    <public type="string" name="ucrop_menu_crop" id="0x7f12129f" />
+    <public type="string" name="ucrop_mutate_exception_hint" id="0x7f1212a0" />
+    <public type="string" name="uk" id="0x7f1212a1" />
+    <public type="string" name="unable_to_join_channel_full" id="0x7f1212a2" />
+    <public type="string" name="unable_to_join_voice_unsupported_mobile" id="0x7f1212a3" />
+    <public type="string" name="unable_to_open_media_chooser" id="0x7f1212a4" />
+    <public type="string" name="unban" id="0x7f1212a5" />
+    <public type="string" name="unban_user_body" id="0x7f1212a6" />
+    <public type="string" name="unban_user_title" id="0x7f1212a7" />
+    <public type="string" name="unblock" id="0x7f1212a8" />
+    <public type="string" name="unblock_to_jump_body" id="0x7f1212a9" />
+    <public type="string" name="unblock_to_jump_title" id="0x7f1212aa" />
+    <public type="string" name="uncategorized" id="0x7f1212ab" />
+    <public type="string" name="unclaimed_account_body" id="0x7f1212ac" />
+    <public type="string" name="unclaimed_account_title" id="0x7f1212ad" />
+    <public type="string" name="undeafen" id="0x7f1212ae" />
+    <public type="string" name="unfocus_participant" id="0x7f1212af" />
+    <public type="string" name="unhandled_link_body" id="0x7f1212b0" />
+    <public type="string" name="unhandled_link_title" id="0x7f1212b1" />
+    <public type="string" name="unified_open_install" id="0x7f1212b2" />
+    <public type="string" name="unknown_game" id="0x7f1212b3" />
+    <public type="string" name="unknown_region" id="0x7f1212b4" />
+    <public type="string" name="unknown_server" id="0x7f1212b5" />
+    <public type="string" name="unknown_user" id="0x7f1212b6" />
+    <public type="string" name="unmute" id="0x7f1212b7" />
+    <public type="string" name="unmute_category" id="0x7f1212b8" />
+    <public type="string" name="unnamed" id="0x7f1212b9" />
+    <public type="string" name="unpin" id="0x7f1212ba" />
+    <public type="string" name="unpin_confirm" id="0x7f1212bb" />
+    <public type="string" name="unpin_message" id="0x7f1212bc" />
+    <public type="string" name="unpin_message_body" id="0x7f1212bd" />
+    <public type="string" name="unpin_message_context_menu_hint" id="0x7f1212be" />
+    <public type="string" name="unpin_message_failed_body" id="0x7f1212bf" />
+    <public type="string" name="unpin_message_failed_title" id="0x7f1212c0" />
+    <public type="string" name="unpin_message_title" id="0x7f1212c1" />
+    <public type="string" name="unread_channels" id="0x7f1212c2" />
+    <public type="string" name="unreads_count" id="0x7f1212c3" />
+    <public type="string" name="unsupported_browser" id="0x7f1212c4" />
+    <public type="string" name="unsupported_browser_body" id="0x7f1212c5" />
+    <public type="string" name="unsupported_browser_details" id="0x7f1212c6" />
+    <public type="string" name="unsupported_browser_title" id="0x7f1212c7" />
+    <public type="string" name="unverified_account_body" id="0x7f1212c8" />
+    <public type="string" name="unverified_account_title" id="0x7f1212c9" />
+    <public type="string" name="update_available" id="0x7f1212ca" />
+    <public type="string" name="update_downloaded" id="0x7f1212cb" />
+    <public type="string" name="update_manually" id="0x7f1212cc" />
+    <public type="string" name="upgrade_plan" id="0x7f1212cd" />
+    <public type="string" name="upgrade_yearly" id="0x7f1212ce" />
+    <public type="string" name="upload" id="0x7f1212cf" />
+    <public type="string" name="upload_a_media_file" id="0x7f1212d0" />
+    <public type="string" name="upload_area_cancel_all" id="0x7f1212d1" />
+    <public type="string" name="upload_area_help" id="0x7f1212d2" />
+    <public type="string" name="upload_area_invalid_file_type_help" id="0x7f1212d3" />
+    <public type="string" name="upload_area_invalid_file_type_title" id="0x7f1212d4" />
+    <public type="string" name="upload_area_leave_a_comment" id="0x7f1212d5" />
+    <public type="string" name="upload_area_optional" id="0x7f1212d6" />
+    <public type="string" name="upload_area_title" id="0x7f1212d7" />
+    <public type="string" name="upload_area_title_no_confirmation" id="0x7f1212d8" />
+    <public type="string" name="upload_area_too_large_help" id="0x7f1212d9" />
+    <public type="string" name="upload_area_too_large_title" id="0x7f1212da" />
+    <public type="string" name="upload_area_upload_failed_help" id="0x7f1212db" />
+    <public type="string" name="upload_area_upload_failed_title" id="0x7f1212dc" />
+    <public type="string" name="upload_background" id="0x7f1212dd" />
+    <public type="string" name="upload_debug_log_failure" id="0x7f1212de" />
+    <public type="string" name="upload_debug_log_failure_header" id="0x7f1212df" />
+    <public type="string" name="upload_debug_log_progress" id="0x7f1212e0" />
+    <public type="string" name="upload_debug_log_progress_header" id="0x7f1212e1" />
+    <public type="string" name="upload_debug_log_success" id="0x7f1212e2" />
+    <public type="string" name="upload_debug_log_success_header" id="0x7f1212e3" />
+    <public type="string" name="upload_emoji" id="0x7f1212e4" />
+    <public type="string" name="upload_image" id="0x7f1212e5" />
+    <public type="string" name="upload_image_body" id="0x7f1212e6" />
+    <public type="string" name="upload_load_file_failed" id="0x7f1212e7" />
+    <public type="string" name="upload_open_file_failed" id="0x7f1212e8" />
+    <public type="string" name="upload_process_file_failed" id="0x7f1212e9" />
+    <public type="string" name="upload_queued" id="0x7f1212ea" />
+    <public type="string" name="upload_uploads_too_large_help" id="0x7f1212eb" />
+    <public type="string" name="upload_uploads_too_large_title" id="0x7f1212ec" />
+    <public type="string" name="uploaded_by" id="0x7f1212ed" />
+    <public type="string" name="uploading_files" id="0x7f1212ee" />
+    <public type="string" name="usage_access" id="0x7f1212ef" />
+    <public type="string" name="usage_statistics_disable_modal_body" id="0x7f1212f0" />
+    <public type="string" name="usage_statistics_disable_modal_cancel" id="0x7f1212f1" />
+    <public type="string" name="usage_statistics_disable_modal_confirm" id="0x7f1212f2" />
+    <public type="string" name="usage_statistics_disable_modal_title" id="0x7f1212f3" />
+    <public type="string" name="use_external_emojis" id="0x7f1212f4" />
+    <public type="string" name="use_external_emojis_description" id="0x7f1212f5" />
+    <public type="string" name="use_speaker" id="0x7f1212f6" />
+    <public type="string" name="use_vad" id="0x7f1212f7" />
+    <public type="string" name="use_vad_description" id="0x7f1212f8" />
+    <public type="string" name="user_activity_accept_invite" id="0x7f1212f9" />
+    <public type="string" name="user_activity_action_ask_to_join" id="0x7f1212fa" />
+    <public type="string" name="user_activity_action_ask_to_join_user" id="0x7f1212fb" />
+    <public type="string" name="user_activity_action_download_app" id="0x7f1212fc" />
+    <public type="string" name="user_activity_action_failed_to_launch" id="0x7f1212fd" />
+    <public type="string" name="user_activity_action_notify_me" id="0x7f1212fe" />
+    <public type="string" name="user_activity_action_spectate" id="0x7f1212ff" />
+    <public type="string" name="user_activity_action_spectate_user" id="0x7f121300" />
+    <public type="string" name="user_activity_already_playing" id="0x7f121301" />
+    <public type="string" name="user_activity_already_syncing" id="0x7f121302" />
+    <public type="string" name="user_activity_cannot_join_self" id="0x7f121303" />
+    <public type="string" name="user_activity_cannot_play_self" id="0x7f121304" />
+    <public type="string" name="user_activity_cannot_spectate_self" id="0x7f121305" />
+    <public type="string" name="user_activity_cannot_sync_self" id="0x7f121306" />
+    <public type="string" name="user_activity_chat_invite_education" id="0x7f121307" />
+    <public type="string" name="user_activity_connect_platform" id="0x7f121308" />
+    <public type="string" name="user_activity_error_desktop_action" id="0x7f121309" />
+    <public type="string" name="user_activity_error_desktop_body" id="0x7f12130a" />
+    <public type="string" name="user_activity_error_desktop_title" id="0x7f12130b" />
+    <public type="string" name="user_activity_error_friends_action" id="0x7f12130c" />
+    <public type="string" name="user_activity_error_friends_body" id="0x7f12130d" />
+    <public type="string" name="user_activity_error_friends_title" id="0x7f12130e" />
+    <public type="string" name="user_activity_header_listening" id="0x7f12130f" />
+    <public type="string" name="user_activity_header_live_on_platform" id="0x7f121310" />
+    <public type="string" name="user_activity_header_playing" id="0x7f121311" />
+    <public type="string" name="user_activity_header_playing_on_platform" id="0x7f121312" />
+    <public type="string" name="user_activity_header_streaming_to_server" id="0x7f121313" />
+    <public type="string" name="user_activity_header_watching" id="0x7f121314" />
+    <public type="string" name="user_activity_invite_request_expired" id="0x7f121315" />
+    <public type="string" name="user_activity_invite_request_received" id="0x7f121316" />
+    <public type="string" name="user_activity_invite_request_requested" id="0x7f121317" />
+    <public type="string" name="user_activity_invite_request_sent" id="0x7f121318" />
+    <public type="string" name="user_activity_invite_request_waiting" id="0x7f121319" />
+    <public type="string" name="user_activity_invite_to_join" id="0x7f12131a" />
+    <public type="string" name="user_activity_listen_along" id="0x7f12131b" />
+    <public type="string" name="user_activity_listen_along_description" id="0x7f12131c" />
+    <public type="string" name="user_activity_listening_album" id="0x7f12131d" />
+    <public type="string" name="user_activity_listening_artists" id="0x7f12131e" />
+    <public type="string" name="user_activity_never_mind" id="0x7f12131f" />
+    <public type="string" name="user_activity_not_detected" id="0x7f121320" />
+    <public type="string" name="user_activity_play_on_platform" id="0x7f121321" />
+    <public type="string" name="user_activity_respond_nope" id="0x7f121322" />
+    <public type="string" name="user_activity_respond_yeah" id="0x7f121323" />
+    <public type="string" name="user_activity_state_size" id="0x7f121324" />
+    <public type="string" name="user_activity_timestamp_end" id="0x7f121325" />
+    <public type="string" name="user_activity_timestamp_end_simple" id="0x7f121326" />
+    <public type="string" name="user_activity_timestamp_start" id="0x7f121327" />
+    <public type="string" name="user_activity_timestamp_start_simple" id="0x7f121328" />
+    <public type="string" name="user_activity_user_playing_for_days" id="0x7f121329" />
+    <public type="string" name="user_activity_user_playing_for_hours" id="0x7f12132a" />
+    <public type="string" name="user_activity_user_playing_for_minutes" id="0x7f12132b" />
+    <public type="string" name="user_activity_voice_channel" id="0x7f12132c" />
+    <public type="string" name="user_activity_watch_along" id="0x7f12132d" />
+    <public type="string" name="user_dm_settings" id="0x7f12132e" />
+    <public type="string" name="user_dm_settings_help" id="0x7f12132f" />
+    <public type="string" name="user_dm_settings_question" id="0x7f121330" />
+    <public type="string" name="user_explicit_content_filter" id="0x7f121331" />
+    <public type="string" name="user_explicit_content_filter_disabled" id="0x7f121332" />
+    <public type="string" name="user_explicit_content_filter_disabled_help" id="0x7f121333" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends" id="0x7f121334" />
+    <public type="string" name="user_explicit_content_filter_friends_and_non_friends_help" id="0x7f121335" />
+    <public type="string" name="user_explicit_content_filter_help" id="0x7f121336" />
+    <public type="string" name="user_explicit_content_filter_non_friends" id="0x7f121337" />
+    <public type="string" name="user_explicit_content_filter_non_friends_help" id="0x7f121338" />
+    <public type="string" name="user_has_been_blocked" id="0x7f121339" />
+    <public type="string" name="user_has_been_unblocked" id="0x7f12133a" />
+    <public type="string" name="user_info" id="0x7f12133b" />
+    <public type="string" name="user_management" id="0x7f12133c" />
+    <public type="string" name="user_popout_message" id="0x7f12133d" />
+    <public type="string" name="user_popout_settings" id="0x7f12133e" />
+    <public type="string" name="user_popout_wumpus_tooltip" id="0x7f12133f" />
+    <public type="string" name="user_profile_add_friend" id="0x7f121340" />
+    <public type="string" name="user_profile_audio" id="0x7f121341" />
+    <public type="string" name="user_profile_failure_to_open_message" id="0x7f121342" />
+    <public type="string" name="user_profile_guild_name_content_description" id="0x7f121343" />
+    <public type="string" name="user_profile_incoming_friend_request_dialog_body" id="0x7f121344" />
+    <public type="string" name="user_profile_message" id="0x7f121345" />
+    <public type="string" name="user_profile_mutual_friends" id="0x7f121346" />
+    <public type="string" name="user_profile_mutual_friends_placeholder" id="0x7f121347" />
+    <public type="string" name="user_profile_mutual_guilds" id="0x7f121348" />
+    <public type="string" name="user_profile_mutual_guilds_placeholder" id="0x7f121349" />
+    <public type="string" name="user_profile_pending" id="0x7f12134a" />
+    <public type="string" name="user_profile_video" id="0x7f12134b" />
+    <public type="string" name="user_profile_volume" id="0x7f12134c" />
+    <public type="string" name="user_settings" id="0x7f12134d" />
+    <public type="string" name="user_settings_account_management" id="0x7f12134e" />
+    <public type="string" name="user_settings_activity_feed" id="0x7f12134f" />
+    <public type="string" name="user_settings_af_applications_empty_body" id="0x7f121350" />
+    <public type="string" name="user_settings_af_applications_empty_title" id="0x7f121351" />
+    <public type="string" name="user_settings_af_blocked_users" id="0x7f121352" />
+    <public type="string" name="user_settings_af_blocked_users_description" id="0x7f121353" />
+    <public type="string" name="user_settings_af_following_applications" id="0x7f121354" />
+    <public type="string" name="user_settings_af_following_applications_description" id="0x7f121355" />
+    <public type="string" name="user_settings_af_hidden_empty" id="0x7f121356" />
+    <public type="string" name="user_settings_af_search_cta" id="0x7f121357" />
+    <public type="string" name="user_settings_af_search_placeholder" id="0x7f121358" />
+    <public type="string" name="user_settings_af_unblock" id="0x7f121359" />
+    <public type="string" name="user_settings_af_unfollow" id="0x7f12135a" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_description" id="0x7f12135b" />
+    <public type="string" name="user_settings_appearance_colorblind_mode_title" id="0x7f12135c" />
+    <public type="string" name="user_settings_appearance_colors" id="0x7f12135d" />
+    <public type="string" name="user_settings_appearance_preview_message_1" id="0x7f12135e" />
+    <public type="string" name="user_settings_appearance_preview_message_2_dark" id="0x7f12135f" />
+    <public type="string" name="user_settings_appearance_preview_message_2_light" id="0x7f121360" />
+    <public type="string" name="user_settings_appearance_preview_message_3" id="0x7f121361" />
+    <public type="string" name="user_settings_appearance_preview_message_4" id="0x7f121362" />
+    <public type="string" name="user_settings_appearance_preview_message_5" id="0x7f121363" />
+    <public type="string" name="user_settings_appearance_zoom_tip" id="0x7f121364" />
+    <public type="string" name="user_settings_apperannce_disable_games_tab" id="0x7f121365" />
+    <public type="string" name="user_settings_apperannce_disable_games_tab_note" id="0x7f121366" />
+    <public type="string" name="user_settings_available_codes" id="0x7f121367" />
+    <public type="string" name="user_settings_blocked_users" id="0x7f121368" />
+    <public type="string" name="user_settings_blocked_users_empty" id="0x7f121369" />
+    <public type="string" name="user_settings_blocked_users_header" id="0x7f12136a" />
+    <public type="string" name="user_settings_blocked_users_unblockbutton" id="0x7f12136b" />
+    <public type="string" name="user_settings_close_button" id="0x7f12136c" />
+    <public type="string" name="user_settings_confirm_logout" id="0x7f12136d" />
+    <public type="string" name="user_settings_edit_account" id="0x7f12136e" />
+    <public type="string" name="user_settings_edit_account_password_label" id="0x7f12136f" />
+    <public type="string" name="user_settings_edit_account_tag" id="0x7f121370" />
+    <public type="string" name="user_settings_enter_password_view_codes" id="0x7f121371" />
+    <public type="string" name="user_settings_game_activity" id="0x7f121372" />
+    <public type="string" name="user_settings_game_library" id="0x7f121373" />
+    <public type="string" name="user_settings_games_install_location" id="0x7f121374" />
+    <public type="string" name="user_settings_games_install_location_add" id="0x7f121375" />
+    <public type="string" name="user_settings_games_install_location_make_default" id="0x7f121376" />
+    <public type="string" name="user_settings_games_install_location_name" id="0x7f121377" />
+    <public type="string" name="user_settings_games_install_location_remove" id="0x7f121378" />
+    <public type="string" name="user_settings_games_install_location_space" id="0x7f121379" />
+    <public type="string" name="user_settings_games_install_locations" id="0x7f12137a" />
+    <public type="string" name="user_settings_games_remove_location_body" id="0x7f12137b" />
+    <public type="string" name="user_settings_games_shortcuts" id="0x7f12137c" />
+    <public type="string" name="user_settings_games_shortcuts_desktop" id="0x7f12137d" />
+    <public type="string" name="user_settings_games_shortcuts_desktop_note" id="0x7f12137e" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu" id="0x7f12137f" />
+    <public type="string" name="user_settings_games_shortcuts_start_menu_note" id="0x7f121380" />
+    <public type="string" name="user_settings_hypesquad" id="0x7f121381" />
+    <public type="string" name="user_settings_keybinds_action" id="0x7f121382" />
+    <public type="string" name="user_settings_keybinds_keybind" id="0x7f121383" />
+    <public type="string" name="user_settings_linux_settings" id="0x7f121384" />
+    <public type="string" name="user_settings_mfa_enable_code_body" id="0x7f121385" />
+    <public type="string" name="user_settings_mfa_enable_code_label" id="0x7f121386" />
+    <public type="string" name="user_settings_mfa_enabled" id="0x7f121387" />
+    <public type="string" name="user_settings_mfa_removed" id="0x7f121388" />
+    <public type="string" name="user_settings_minimize_to_tray_body" id="0x7f121389" />
+    <public type="string" name="user_settings_minimize_to_tray_label" id="0x7f12138a" />
+    <public type="string" name="user_settings_my_account" id="0x7f12138b" />
+    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f12138c" />
+    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f12138d" />
+    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f12138e" />
+    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f12138f" />
+    <public type="string" name="user_settings_open_on_startup_body" id="0x7f121390" />
+    <public type="string" name="user_settings_open_on_startup_label" id="0x7f121391" />
+    <public type="string" name="user_settings_privacy_terms" id="0x7f121392" />
+    <public type="string" name="user_settings_restart_app_mobile" id="0x7f121393" />
+    <public type="string" name="user_settings_save" id="0x7f121394" />
+    <public type="string" name="user_settings_start_minimized_body" id="0x7f121395" />
+    <public type="string" name="user_settings_start_minimized_label" id="0x7f121396" />
+    <public type="string" name="user_settings_startup_behavior" id="0x7f121397" />
+    <public type="string" name="user_settings_streamer_notice_body" id="0x7f121398" />
+    <public type="string" name="user_settings_streamer_notice_title" id="0x7f121399" />
+    <public type="string" name="user_settings_unverified_account_body" id="0x7f12139a" />
+    <public type="string" name="user_settings_used_backup_codes" id="0x7f12139b" />
+    <public type="string" name="user_settings_voice_add_multiple" id="0x7f12139c" />
+    <public type="string" name="user_settings_voice_codec_description" id="0x7f12139d" />
+    <public type="string" name="user_settings_voice_codec_title" id="0x7f12139e" />
+    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f12139f" />
+    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f1213a0" />
+    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f1213a1" />
+    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f1213a2" />
+    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f1213a3" />
+    <public type="string" name="user_settings_voice_mic_test_voice_channel_warning" id="0x7f1213a4" />
+    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f1213a5" />
+    <public type="string" name="user_settings_voice_open_h264" id="0x7f1213a6" />
+    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f1213a7" />
+    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f1213a8" />
+    <public type="string" name="user_settings_windows_settings" id="0x7f1213a9" />
+    <public type="string" name="user_settings_with_build_override" id="0x7f1213aa" />
+    <public type="string" name="user_volume" id="0x7f1213ab" />
+    <public type="string" name="username" id="0x7f1213ac" />
+    <public type="string" name="username_live" id="0x7f1213ad" />
+    <public type="string" name="username_required" id="0x7f1213ae" />
+    <public type="string" name="users" id="0x7f1213af" />
+    <public type="string" name="vad_permission_body" id="0x7f1213b0" />
+    <public type="string" name="vad_permission_small" id="0x7f1213b1" />
+    <public type="string" name="vad_permission_title" id="0x7f1213b2" />
+    <public type="string" name="vanity_url" id="0x7f1213b3" />
+    <public type="string" name="vanity_url_help" id="0x7f1213b4" />
+    <public type="string" name="vanity_url_help_conflict" id="0x7f1213b5" />
+    <public type="string" name="vanity_url_help_extended" id="0x7f1213b6" />
+    <public type="string" name="vanity_url_help_extended_link" id="0x7f1213b7" />
+    <public type="string" name="vanity_url_hint_mobile" id="0x7f1213b8" />
+    <public type="string" name="verfication_expired" id="0x7f1213b9" />
+    <public type="string" name="verfication_expired_suggestion" id="0x7f1213ba" />
+    <public type="string" name="verification_body" id="0x7f1213bb" />
+    <public type="string" name="verification_body_alt" id="0x7f1213bc" />
+    <public type="string" name="verification_email_body" id="0x7f1213bd" />
+    <public type="string" name="verification_email_error_body" id="0x7f1213be" />
+    <public type="string" name="verification_email_error_title" id="0x7f1213bf" />
+    <public type="string" name="verification_email_title" id="0x7f1213c0" />
+    <public type="string" name="verification_footer" id="0x7f1213c1" />
+    <public type="string" name="verification_footer_logout" id="0x7f1213c2" />
+    <public type="string" name="verification_footer_support" id="0x7f1213c3" />
+    <public type="string" name="verification_level_high_criteria" id="0x7f1213c4" />
+    <public type="string" name="verification_level_low" id="0x7f1213c5" />
+    <public type="string" name="verification_level_low_criteria" id="0x7f1213c6" />
+    <public type="string" name="verification_level_medium" id="0x7f1213c7" />
+    <public type="string" name="verification_level_medium_criteria" id="0x7f1213c8" />
+    <public type="string" name="verification_level_none" id="0x7f1213c9" />
+    <public type="string" name="verification_level_none_criteria" id="0x7f1213ca" />
+    <public type="string" name="verification_level_very_high_criteria" id="0x7f1213cb" />
+    <public type="string" name="verification_open_discord" id="0x7f1213cc" />
+    <public type="string" name="verification_phone_description" id="0x7f1213cd" />
+    <public type="string" name="verification_phone_title" id="0x7f1213ce" />
+    <public type="string" name="verification_title" id="0x7f1213cf" />
+    <public type="string" name="verification_verified" id="0x7f1213d0" />
+    <public type="string" name="verification_verifying" id="0x7f1213d1" />
+    <public type="string" name="verify" id="0x7f1213d2" />
+    <public type="string" name="verify_account" id="0x7f1213d3" />
+    <public type="string" name="verify_by" id="0x7f1213d4" />
+    <public type="string" name="verify_by_email" id="0x7f1213d5" />
+    <public type="string" name="verify_by_email_formatted" id="0x7f1213d6" />
+    <public type="string" name="verify_by_phone" id="0x7f1213d7" />
+    <public type="string" name="verify_by_phone_formatted" id="0x7f1213d8" />
+    <public type="string" name="verify_by_recaptcha" id="0x7f1213d9" />
+    <public type="string" name="verify_by_recaptcha_description" id="0x7f1213da" />
+    <public type="string" name="verify_email_body" id="0x7f1213db" />
+    <public type="string" name="verify_email_body_resent" id="0x7f1213dc" />
+    <public type="string" name="verify_phone" id="0x7f1213dd" />
+    <public type="string" name="verifying" id="0x7f1213de" />
+    <public type="string" name="very_out_of_date_description" id="0x7f1213df" />
+    <public type="string" name="vi" id="0x7f1213e0" />
+    <public type="string" name="video" id="0x7f1213e1" />
+    <public type="string" name="video_call" id="0x7f1213e2" />
+    <public type="string" name="video_connect" id="0x7f1213e3" />
+    <public type="string" name="video_poor_connection_body" id="0x7f1213e4" />
+    <public type="string" name="video_poor_connection_title" id="0x7f1213e5" />
+    <public type="string" name="video_preview" id="0x7f1213e6" />
+    <public type="string" name="video_settings" id="0x7f1213e7" />
+    <public type="string" name="video_unavailable" id="0x7f1213e8" />
+    <public type="string" name="video_unsupported_browser_body" id="0x7f1213e9" />
+    <public type="string" name="video_unsupported_browser_title" id="0x7f1213ea" />
+    <public type="string" name="view_and_join_listings" id="0x7f1213eb" />
+    <public type="string" name="view_audit_log" id="0x7f1213ec" />
+    <public type="string" name="view_audit_log_description" id="0x7f1213ed" />
+    <public type="string" name="view_channel" id="0x7f1213ee" />
+    <public type="string" name="view_embed" id="0x7f1213ef" />
+    <public type="string" name="view_guild_analytics" id="0x7f1213f0" />
+    <public type="string" name="view_guild_analytics_description" id="0x7f1213f1" />
+    <public type="string" name="view_profile" id="0x7f1213f2" />
+    <public type="string" name="view_spectators" id="0x7f1213f3" />
+    <public type="string" name="view_surrounding_messages" id="0x7f1213f4" />
+    <public type="string" name="voice" id="0x7f1213f5" />
+    <public type="string" name="voice_and_video" id="0x7f1213f6" />
+    <public type="string" name="voice_call" id="0x7f1213f7" />
+    <public type="string" name="voice_call_member_list_title" id="0x7f1213f8" />
+    <public type="string" name="voice_channel" id="0x7f1213f9" />
+    <public type="string" name="voice_channel_empty" id="0x7f1213fa" />
+    <public type="string" name="voice_channel_hide_names" id="0x7f1213fb" />
+    <public type="string" name="voice_channel_locked" id="0x7f1213fc" />
+    <public type="string" name="voice_channel_show_names" id="0x7f1213fd" />
+    <public type="string" name="voice_channels" id="0x7f1213fe" />
+    <public type="string" name="voice_connect" id="0x7f1213ff" />
+    <public type="string" name="voice_disconnect_body" id="0x7f121400" />
+    <public type="string" name="voice_disconnect_title" id="0x7f121401" />
+    <public type="string" name="voice_only" id="0x7f121402" />
+    <public type="string" name="voice_permissions" id="0x7f121403" />
+    <public type="string" name="voice_settings" id="0x7f121404" />
+    <public type="string" name="voice_status_connecting" id="0x7f121405" />
+    <public type="string" name="voice_status_not_connected" id="0x7f121406" />
+    <public type="string" name="voice_status_not_connected_mobile" id="0x7f121407" />
+    <public type="string" name="voice_status_ringing" id="0x7f121408" />
+    <public type="string" name="voice_unavailable" id="0x7f121409" />
+    <public type="string" name="watch" id="0x7f12140a" />
+    <public type="string" name="watch_stream" id="0x7f12140b" />
+    <public type="string" name="watch_stream_in_app" id="0x7f12140c" />
+    <public type="string" name="watch_stream_streaming" id="0x7f12140d" />
+    <public type="string" name="watch_stream_tip" id="0x7f12140e" />
+    <public type="string" name="watch_stream_watching" id="0x7f12140f" />
+    <public type="string" name="watch_user_stream" id="0x7f121410" />
+    <public type="string" name="watching" id="0x7f121411" />
+    <public type="string" name="web_browser" id="0x7f121412" />
+    <public type="string" name="web_browser_chrome" id="0x7f121413" />
+    <public type="string" name="web_browser_in_app" id="0x7f121414" />
+    <public type="string" name="web_browser_safari" id="0x7f121415" />
+    <public type="string" name="webhook_cancel" id="0x7f121416" />
+    <public type="string" name="webhook_create" id="0x7f121417" />
+    <public type="string" name="webhook_created_on" id="0x7f121418" />
+    <public type="string" name="webhook_delete" id="0x7f121419" />
+    <public type="string" name="webhook_delete_body" id="0x7f12141a" />
+    <public type="string" name="webhook_delete_title" id="0x7f12141b" />
+    <public type="string" name="webhook_edit" id="0x7f12141c" />
+    <public type="string" name="webhook_error_creating_webhook" id="0x7f12141d" />
+    <public type="string" name="webhook_error_deleting_webhook" id="0x7f12141e" />
+    <public type="string" name="webhook_error_internal_server_error" id="0x7f12141f" />
+    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f121420" />
+    <public type="string" name="webhook_error_saving_webhook" id="0x7f121421" />
+    <public type="string" name="webhook_form_channel" id="0x7f121422" />
+    <public type="string" name="webhook_form_name" id="0x7f121423" />
+    <public type="string" name="webhook_form_url" id="0x7f121424" />
+    <public type="string" name="webhook_form_webhook_url_help" id="0x7f121425" />
+    <public type="string" name="webhook_modal_icon_description" id="0x7f121426" />
+    <public type="string" name="webhook_modal_icon_title" id="0x7f121427" />
+    <public type="string" name="webhook_modal_title" id="0x7f121428" />
+    <public type="string" name="webhook_save" id="0x7f121429" />
+    <public type="string" name="webhooks" id="0x7f12142a" />
+    <public type="string" name="welcome_message_desktop_apps" id="0x7f12142b" />
+    <public type="string" name="welcome_message_instant_invite" id="0x7f12142c" />
+    <public type="string" name="welcome_message_mobile_apps" id="0x7f12142d" />
+    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f12142e" />
+    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f12142f" />
+    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f121430" />
+    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f121431" />
+    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f121432" />
+    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f121433" />
+    <public type="string" name="welcome_message_owner_title" id="0x7f121434" />
+    <public type="string" name="welcome_message_support" id="0x7f121435" />
+    <public type="string" name="welcome_message_title" id="0x7f121436" />
+    <public type="string" name="welcome_message_tutorial" id="0x7f121437" />
+    <public type="string" name="whats_new" id="0x7f121438" />
+    <public type="string" name="whats_new_date" id="0x7f121439" />
+    <public type="string" name="whitelist_failed" id="0x7f12143a" />
+    <public type="string" name="whitelisted" id="0x7f12143b" />
+    <public type="string" name="whitelisting" id="0x7f12143c" />
+    <public type="string" name="widget" id="0x7f12143d" />
+    <public type="string" name="windows" id="0x7f12143e" />
+    <public type="string" name="wumpus" id="0x7f12143f" />
+    <public type="string" name="xbox_authorization_title" id="0x7f121440" />
+    <public type="string" name="xbox_link" id="0x7f121441" />
+    <public type="string" name="xbox_pin_step1" id="0x7f121442" />
+    <public type="string" name="xbox_pin_step2" id="0x7f121443" />
+    <public type="string" name="xbox_pin_step3" id="0x7f121444" />
+    <public type="string" name="yearly" id="0x7f121445" />
+    <public type="string" name="yellow" id="0x7f121446" />
+    <public type="string" name="yes_text" id="0x7f121447" />
+    <public type="string" name="your_discord_tag" id="0x7f121448" />
+    <public type="string" name="your_pin_expires" id="0x7f121449" />
+    <public type="string" name="your_pin_is_expired" id="0x7f12144a" />
+    <public type="string" name="youre_viewing_older_messages" id="0x7f12144b" />
+    <public type="string" name="zh_cn" id="0x7f12144c" />
+    <public type="string" name="zh_tw" id="0x7f12144d" />
+    <public type="string" name="APKTOOL_DUMMY_3c7" id="0x7f1203c7" />
     <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" />
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index b2fd268f48..be8eeaa087 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -621,7 +621,9 @@
     <string name="applications_and_connections">Applications and Connections</string>
     <string name="applications_and_connections_body">"Here's all the apps that are doing super cool things to make your Discord experience super cooler. If it gets too chilly, you can remove them at anytime."</string>
     <string name="attach_files">Attach Files</string>
+    <string name="attach_payment_source_optional_with_entitlements_warning">You have **%1$s of credit**. A payment source is required to avoid interruptions after your credit has been used.</string>
     <string name="attach_payment_source_prompt_option">Attach a payment method to continue</string>
+    <string name="attach_payment_source_prompt_option_optional">Attach a payment method (Optional)</string>
     <string name="attachment_camera">Camera</string>
     <string name="attachment_compressing">Compressing files…</string>
     <string name="attachment_filename_unknown">unknown</string>
@@ -698,7 +700,6 @@
     <string name="billing">Billing</string>
     <string name="billing_accept_terms_tooltip">Accept the terms of service to continue</string>
     <string name="billing_account_credit">Account Credit</string>
-    <string name="billing_account_credit_plan_months_free">**%1$s**: %2$s months free</string>
     <string name="billing_add_payment_method">Add Payment Method</string>
     <string name="billing_address">Billing Address</string>
     <string name="billing_address_address">Address</string>
@@ -731,10 +732,12 @@
     <string name="billing_application_consumable_refund_text_unable">In-game content cannot be refunded. If there is an issue with your purchase, [please contact our support.](%1$s)</string>
     <string name="billing_application_refund_text">A refund can be requested if this purchase was made in the last %1$s days and the game has been played for less than %2$s hours. [Our friendly help desk will help you get your coins back.](%3$s)</string>
     <string name="billing_application_refund_text_unable">"We're sorry, this purchase is not eligible for refunds. A refund can be requested if this purchase was made in the last %1$s days and the game has been played for less than %2$s hours."</string>
+    <string name="billing_applies_to_all_subscriptions">*Applies to all subscriptions</string>
     <string name="billing_change_payment_source">Change Payment Method</string>
     <string name="billing_code_redemption_redirect">"Psst! Looking to redeem a Discord key? We've moved it to [your inventory](onClick)."</string>
     <string name="billing_error_add_payment_source_streamer_mode">You cannot add new payment sources while in Streamer Mode.</string>
     <string name="billing_error_gateway">Something went wrong while processing your payment, please try again!</string>
+    <string name="billing_error_generic">Something went wrong while processing your request, please try again!</string>
     <string name="billing_error_rate_limit">"You've attempted too many purchases too quickly. Please wait a bit and try again!"</string>
     <string name="billing_error_section_address">Uh oh! Looks like there is an issue with this address. Please fix the fields and try again!</string>
     <string name="billing_error_section_card">Uh oh! Looks like there is an issue with this card. Please fix the fields and try again!</string>
@@ -744,6 +747,8 @@
     <string name="billing_gift_refund_text">A refund can be requested if this purchase was made in the last %1$s days and the gift has not been redeemed. [Our friendly help desk will help you get your coins back.](%2$s)</string>
     <string name="billing_gift_refund_text_unable">"We're sorry, this purchase is not eligible for refunds. A refund can be requested if this purchase was made in the last %1$s days and the gift has not been redeemed."</string>
     <string name="billing_history">Billing History</string>
+    <string name="billing_invoice_gift_plan">Gift %1$s</string>
+    <string name="billing_invoice_subscription_credit_applied">Subscription Credit applied!</string>
     <string name="billing_is_gift_purchase">Is this a gift?</string>
     <string name="billing_legal_mumbo_jumbo">Legal Mumbo Jumbo</string>
     <string name="billing_legal_mumbo_jumbo_label">I agree to the [Discord Terms of Service](%1$s)</string>
@@ -759,8 +764,8 @@
     <string name="billing_payment_choose_plan">Choose a plan</string>
     <string name="billing_payment_history">Transaction History</string>
     <string name="billing_payment_premium">Your Subscription</string>
-    <string name="billing_payment_premium_legalese_monthly">By purchasing a %1$s subscription, you agree to our [Terms of Service](%2$s). %1$s is an auto-recurring subscription. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically monthly until you cancel. You may cancel anytime.</string>
-    <string name="billing_payment_premium_legalese_yearly">By purchasing a %1$s subscription, you agree to our [Terms of Service](%2$s). %1$s is an auto-recurring subscription. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically yearly until you cancel. You may cancel anytime.</string>
+    <string name="billing_payment_premium_legalese_monthly">By purchasing a Discord subscription, you agree to our [Terms of Service](%1$s) and [Privacy Policy](%2$s). Nitro and Server Boost are auto-recurring subscriptions. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically monthly until you cancel. You may cancel anytime.</string>
+    <string name="billing_payment_premium_legalese_yearly">By purchasing a Discord subscription, you agree to our [Terms of Service](%1$s) and [Privacy Policy](%2$s). Nitro and Server Boost are auto-recurring subscriptions. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically yearly until you cancel. You may cancel anytime.</string>
     <string name="billing_payment_source_invalid">This payment source is invalid.</string>
     <string name="billing_payment_sources">Payment Methods</string>
     <string name="billing_payment_table_header_amount">Amount</string>
@@ -775,16 +780,18 @@
     <string name="billing_premium_refund_text_unable">"We're sorry, this purchase is not eligible for refunds. A refund can be requested if this purchase was made in the last %1$s days."</string>
     <string name="billing_preorder_refund_text">"A refund can be requested at any time before the game's release for preorders. [Our friendly help desk will help you get your coins back.](%1$s)"</string>
     <string name="billing_price_per_month">%1$s / Month</string>
+    <string name="billing_price_per_month_bold">**%1$s** / Month</string>
     <string name="billing_price_per_month_current_plan">(CURRENT PLAN) %1$s / Month</string>
     <string name="billing_price_per_month_current_plan_ios">(Current Plan) %1$s / Month</string>
+    <string name="billing_price_per_month_each">%1$s / Month each</string>
     <string name="billing_price_per_month_mobile">%1$s / MO</string>
-    <string name="billing_price_per_month_upgrade">Upgrade for %1$s / Month</string>
     <string name="billing_price_per_year">%1$s / Year</string>
+    <string name="billing_price_per_year_bold">**%1$s** / Year</string>
     <string name="billing_price_per_year_current_plan">(CURRENT PLAN) %1$s / Year</string>
     <string name="billing_price_per_year_current_plan_ios">(Current Plan) %1$s / Year</string>
+    <string name="billing_price_per_year_each">%1$s / Year each</string>
     <string name="billing_price_per_year_mobile">%1$s / YR</string>
     <string name="billing_price_per_year_months_free">%1$s / Year (2 Months Free)</string>
-    <string name="billing_price_per_year_upgrade">Upgrade for %1$s / Year</string>
     <string name="billing_purchase_details_header">Purchase Details</string>
     <string name="billing_refund_header">Issues with your purchase?</string>
     <string name="billing_refund_play_time_never_played">Never played</string>
@@ -797,15 +804,45 @@
     <string name="billing_sales_tax_added">%1$s in sales tax has been added due to your billing address.</string>
     <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_select_payment_source_tooltip">Select a payment source to continue</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">Payment</string>
     <string name="billing_step_payment_info">Payment Information</string>
     <string name="billing_step_payment_type">Payment Type</string>
     <string name="billing_step_paypal">PayPal Information</string>
     <string name="billing_step_review">Review</string>
     <string name="billing_step_select_plan">Select Plan</string>
     <string name="billing_subscribe">Subscribe</string>
+    <string name="billing_switch_plan_account_credit">Any eligible account credit will be applied prior to your subscription renewal date, %1$s.</string>
+    <string name="billing_switch_plan_change">Change Plan</string>
+    <string name="billing_switch_plan_change_date">Your subscription will change starting on **%1$s**.</string>
+    <string name="billing_switch_plan_choose_one">Choose one:</string>
+    <string name="billing_switch_plan_confirm_downgrade_button">Got it!</string>
+    <string name="billing_switch_plan_confirm_tier_1">You now have sweet perks. Enjoy friend!</string>
+    <string name="billing_switch_plan_confirm_tier_1_year_to_month">You lose two free months but keep all your sweet perks.</string>
+    <string name="billing_switch_plan_confirm_tier_2">You now have superpowered perks and Server Boosts. Enjoy friend!</string>
+    <string name="billing_switch_plan_confirm_tier_2_to_tier_1">You lose your Server Boost but keep some sweet perks. You can switch back plans at any time.</string>
+    <string name="billing_switch_plan_confirm_tier_2_year_to_month">You lose two free months but keep all superpowered perks and your Server Boosts. You can switch back to a yearly plan at any time.</string>
+    <string name="billing_switch_plan_confirm_upgrade_button">Sweet!</string>
+    <string name="billing_switch_plan_confirm_upgrade_tier_1_year">You now have sweet perks all year round. Enjoy friend!</string>
+    <string name="billing_switch_plan_confirm_upgrade_tier_2_month">You now have superpowered perks and Server Boosts. Enjoy friend!</string>
+    <string name="billing_switch_plan_confirm_upgrade_tier_2_year">You now have superpowered perks and Server Boosts all year round. Enjoy friend!</string>
+    <string name="billing_switch_plan_current_plan">Current Plan</string>
+    <string name="billing_switch_plan_downgrade_body_month">Once you switch from the yearly plan to monthly, you keep all the same perks but you lose the 2 month free discount.</string>
+    <string name="billing_switch_plan_downgrade_body_tier_1">Once you switch from Nitro to Nitro Classic, you lose the included Server Boosts and some superpowered perks.</string>
+    <string name="billing_switch_plan_prorate_adjustment">Prorated Adjustment</string>
+    <string name="billing_switch_plan_subscription_cost">Subscription Cost</string>
+    <string name="billing_switch_plan_tier_1_description">Enhance your Discord experience with sweet perks.</string>
+    <string name="billing_switch_plan_tier_2_description">Get access to superpowered perks and Server Boosts.</string>
+    <string name="billing_switch_plan_todays_charges">"Today's Charges"</string>
+    <string name="billing_switch_plan_total_tax_included">**Total** (Tax Included)</string>
+    <string name="billing_switch_plan_upgrade">Upgrade</string>
+    <string name="billing_switch_plan_upgrade_body_tier_1_year">Save some cash and switch to a yearly plan. Enjoy sweet perks all year round.</string>
+    <string name="billing_switch_plan_upgrade_body_tier_2">Get Nitro to gain access to superpowered perks and Server Boosts.</string>
+    <string name="billing_switch_plan_upgrade_body_tier_2_year">Switch to a yearly plan and save some cash. Enjoy superpowered perks and Server Boosts all year round.</string>
+    <string name="billing_switch_plan_yearly_free_months">2 months free!</string>
     <string name="billing_tag_failed">Failed</string>
     <string name="billing_tag_pending">Pending</string>
     <string name="billing_tag_refunded">Refunded</string>
@@ -1022,7 +1059,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">7735a6f9-8f43-485f-baf8-6cd8d3852a66</string>
+    <string name="com.crashlytics.android.build_id">ba847789-d51c-4ffe-ae92-0a37a0f6bfe3</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>
@@ -1489,7 +1526,6 @@ Icon"</string>
     <string name="follow">Follow</string>
     <string name="follow_modal_body">Select where you want these updates to go. You can remove this at any time in Server Settings > Webhooks.</string>
     <string name="follow_modal_fail">Failed to follow the channel, please try again.</string>
-    <string name="follow_modal_header">Add %1$s #%2$s updates to your server!</string>
     <string name="follow_modal_hint">Only servers and channels you have webhook permissions in are shown.</string>
     <string name="follow_modal_hint_no_perms">"Uh oh, you don't have webhook permissions in any server you're in. Ask your server admin to give you the permission or ask them to come follow themselves!"</string>
     <string name="follow_modal_title">"Add this channel's updates to your server!"</string>
@@ -1936,11 +1972,11 @@ Icon"</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_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_nitro_mobile">Thanks to another generous human, you now have access to enhanced chat perks and Server Boosts 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 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_success_premium_tier_2_monthly">Thanks to another generous human, you now have access to enhanced chat perks and Server Boosts 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 Server Boosts 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>
@@ -2310,9 +2346,9 @@ Lost: %2$s"</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_emoji">+%1$s server emoji slots (for a total of %2$s)</string>
     <string name="guild_settings_guild_premium_perk_title_tier_any_upload_limit">%1$s upload limit for all members</string>
     <string name="guild_settings_guild_premium_perks_base_perks">Boosted server perks include —</string>
-    <string name="guild_settings_guild_premium_perks_description_none">No one has bestowed Nitro to this server yet. See if any members would kindly bless your server for server-wide Nitro Perks!</string>
+    <string name="guild_settings_guild_premium_perks_description_none">No one has bestowed Boosts to this server yet. See if any members would kindly bless your server for server-wide Boost Perks!</string>
     <string name="guild_settings_guild_premium_perks_previous_perks">Boosted servers get everything previous, and —</string>
-    <string name="guild_settings_guild_premium_perks_title_none">No Nitro Boost</string>
+    <string name="guild_settings_guild_premium_perks_title_none">No Server Boost</string>
     <string name="guild_settings_guild_premium_perks_title_tier_1">Level 1 Perks</string>
     <string name="guild_settings_guild_premium_perks_title_tier_2">Level 2 Perks</string>
     <string name="guild_settings_guild_premium_perks_title_tier_3">Level 3 Perks</string>
@@ -2329,14 +2365,17 @@ Lost: %2$s"</string>
     <string name="guild_settings_overview_boost_unlocked">Tier %1$s perk unlocked</string>
     <string name="guild_settings_overview_notice">Careful! You have unsaved changes!</string>
     <string name="guild_settings_overview_tier_info">This is a Tier %1$s Nitro Feature. [Check your tier status](%2$s)</string>
-    <string name="guild_settings_premium_guild_blurb">"Members of the server with an active Nitro subscription can help unlock levels by bestowing their Nitro status. For each level achieved, members of the server will help unlock perks for everyone.
-
-Members can revoke their boost at any time. **The server will keep perks for three days if a level is lost. **[Learn more about Nitro Server Boosting.](%1$s)"</string>
+    <string name="guild_settings_premium_guild_blurb">Members of your server can help unlock levels by bestowing Boosts. For every level achieved, your server will help unlock perks for everyone. Members can revoke their boost at any time. **Your server will keep perks for three days if a level is lost**. [Learn more about Server Boosting](%1$s).</string>
     <string name="guild_settings_premium_guild_close_hint">Only %1$s until the next level!</string>
     <string name="guild_settings_premium_guild_count_subscribers">**%1$s** boosted this server</string>
     <string name="guild_settings_premium_guild_tier_requirement">%1$s</string>
-    <string name="guild_settings_premium_guild_title">Nitro Server Boost Status</string>
+    <string name="guild_settings_premium_guild_title">Server Boost Status</string>
     <string name="guild_settings_premium_guild_unlocked">Unlocked</string>
+    <string name="guild_settings_premium_upsell_body">"As a thank you from us, Nitro &amp; Nitro Classic members get **%1$s off** Server Boosts—**%2$s/Month or %3$s/Year**.
+
+Additionally, Nitro members get **%4$s free Server Boosts** with their subscription."</string>
+    <string name="guild_settings_premium_upsell_heading">Looking for a better deal?</string>
+    <string name="guild_settings_premium_upsell_learn_more">Learn more about Discord Nitro</string>
     <string name="guild_settings_server_banner">Server Banner</string>
     <string name="guild_settings_server_invite_background">Server Invite Background</string>
     <string name="guild_settings_splash_info">This image will display when users receive an invite to the server.</string>
@@ -2344,6 +2383,24 @@ 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_subscription_purchase_modal_activated_close_button">Nice!</string>
+    <string name="guild_subscription_purchase_modal_activated_description">"Thanks for the boost!
+
+You've succesfully Boosted the server."</string>
+    <string name="guild_subscription_purchase_modal_activated_description_with_boost_count">"Thanks for the boost!
+
+You've succesfully Boosted the server **%1$s**."</string>
+    <string name="guild_subscription_purchase_modal_billing_description">You will be charged %1$s now, and %2$s at the end of the billing period.</string>
+    <string name="guild_subscription_purchase_modal_counter">Server Boost(s)</string>
+    <string name="guild_subscription_purchase_modal_invoice_prorated_label">Pro-rated adjustment</string>
+    <string name="guild_subscription_purchase_modal_invoice_row_content">%1$sx %2$s</string>
+    <string name="guild_subscription_purchase_modal_invoice_total_row_label">"Today's Total"</string>
+    <string name="guild_subscription_purchase_modal_open">Get Boosts now</string>
+    <string name="guild_subscription_purchase_modal_payment_source_tooltip">"We'll use the payment method you selected for your subscription"</string>
+    <string name="guild_subscription_purchase_modal_purchase_details_header">Purchase Details</string>
+    <string name="guild_subscription_purchase_modal_step_select_description">"Want more Server Boosts? We'll attach it to your monthly Nitro subscription, prorate your Boost subscription, and deduct it from the monthly price."</string>
+    <string name="guild_subscription_purchase_modal_submit">Get Boosts now</string>
+    <string name="guild_subscription_purchase_modal_subtotal">Subtotal</string>
     <string name="guild_unavailable_body">Please bear with us as we try to fix this issue!</string>
     <string name="guild_unavailable_body_alt">Please check back in a bit as we make more space.</string>
     <string name="guild_unavailable_header">Unavailable</string>
@@ -2710,10 +2767,6 @@ Want to know more about Discord?"</string>
     <string name="ios_media_keyboard_take_a_photo">Take a Photo</string>
     <string name="ios_notification_see_full">Tap to see full message.</string>
     <string name="ios_profile_in_voice_call">In a voice call</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_view_all">View all</string>
     <string name="ip_address_secured">IP Address Secured</string>
@@ -3038,6 +3091,7 @@ Want to know more about Discord?"</string>
     <string name="mobile_enable_hardware_scaling_desc">Experimental feature that may improve performance in video calls. Beware, may cause jank.</string>
     <string name="moderation">Moderation</string>
     <string name="modify_followed_news_header">Are you sure?</string>
+    <string name="monthly">Monthly</string>
     <string name="more">More</string>
     <string name="move_from_category_to">Move from %1$s to</string>
     <string name="move_members">Move Members</string>
@@ -3070,7 +3124,7 @@ Want to know more about Discord?"</string>
     <string name="network_error_unknown">An unknown network error has occurred.</string>
     <string name="network_error_unknown_host">A network error has occurred. Please check your DNS settings and try again.</string>
     <string name="network_offline">Network connectivity limited or unavailable.</string>
-    <string name="nevermind">Nevermind</string>
+    <string name="nevermind">Never Mind</string>
     <string name="new_dm">New Direct Message</string>
     <string name="new_group_dm">New Group DM</string>
     <string name="new_guilds_dm_allowed">Allow direct messages from server members.</string>
@@ -3193,7 +3247,7 @@ 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_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_ended">Your access to Nitro has expired. Upgrade from Nitro Classic to Nitro for superpowered chat perks and Server Boosts.</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>
@@ -3392,6 +3446,7 @@ Want to know more about Discord?"</string>
     <string name="pagination_page_label">Page %1$s</string>
     <string name="pagination_page_of">Page %1$s of %2$s</string>
     <string name="pagination_previous">Previous</string>
+    <string name="paginator_current_page">Page %1$s</string>
     <string name="paginator_of_pages">Page %1$s of %2$s</string>
     <string name="partial_outage">%1$s</string>
     <string name="partial_outage_a11y">"%1$s Discord's Twitter should have more information."</string>
@@ -3430,12 +3485,13 @@ Want to know more about Discord?"</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>
-    <string name="payment_modal_button_premium_gift">Buy %1$s</string>
+    <string name="payment_modal_button_premium_gift">Buy Gift</string>
     <string name="payment_modal_one_month">1 month</string>
     <string name="payment_modal_one_year">1 year</string>
     <string name="payment_modal_per_month">Per month</string>
     <string name="payment_modal_per_year">Per year</string>
     <string name="payment_modal_subtitle">Discord Nitro Subscription</string>
+    <string name="payment_modal_subtitle_premium_gift">Buy a Gift</string>
     <string name="payment_modal_title_change_card">Change Credit Card</string>
     <string name="payment_modal_title_change_paypal">Change PayPal Account</string>
     <string name="payment_modal_title_new_monthly">%1$s%2$s %3$s per Month</string>
@@ -3479,6 +3535,7 @@ Want to know more about Discord?"</string>
     <string name="payment_source_paypal_loading">Contacting PayPal…</string>
     <string name="payment_source_paypal_reopen">Re-open Window</string>
     <string name="payment_source_security_code">CVC</string>
+    <string name="payment_source_subscription">Subscription</string>
     <string name="payment_source_title">Payment Method</string>
     <string name="payment_source_type">Payment Type</string>
     <string name="payment_source_type_select">Select Payment Type</string>
@@ -3551,7 +3608,7 @@ Want to know more about Discord?"</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 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">"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 included Server Boosts 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>
@@ -3572,6 +3629,7 @@ Want to know more about Discord?"</string>
     <string name="premium_chat_perks_description_badge">Display how long you’ve supported Discord with a special profile badge.</string>
     <string name="premium_chat_perks_description_custom_emoji">Get a global passport to use your custom emojis anywhere.</string>
     <string name="premium_chat_perks_description_discriminator">Choose your tag while you’re subscribed.</string>
+    <string name="premium_chat_perks_description_premium_guild">Get %1$s with Nitro and %2$s%% off buying boosts with Nitro and Nitro Classic.</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">Larger upload file size from %1$s to %2$s with Nitro or %3$s with Nitro Classic.</string>
@@ -3579,12 +3637,13 @@ Want to know more about Discord?"</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">Keep it simple - get the base chat perks without a Server Boost.</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_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>
     <string name="premium_chat_perks_title_custom_emoji">Global Custom Emojis</string>
     <string name="premium_chat_perks_title_discriminator">Custom Discord Tag</string>
+    <string name="premium_chat_perks_title_premium_guild">Get Boosted</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>
@@ -3621,87 +3680,152 @@ To keep your sub, go to Settings and update your payment."</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>
     <string name="premium_guild_features_customize_guild_mobile">Server Customizations</string>
-    <string name="premium_guild_features_customize_guild_title">Server Customizations</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 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_new_role_mobile">Exclusive Server Booster roles</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_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>
-    <string name="premium_guild_features_upsell_banner_upgrade">Upgrade your subscription to send a Nitro Boost to a server! [Learn more about Nitro Server Boosting.](%1$s)</string>
-    <string name="premium_guild_header_badge_no_subscribers">No Nitro Boosts</string>
+    <string name="premium_guild_features_upsell_banner_subscribe">Subscribe to Nitro to send a Server Boost to a server! [Learn more about Server Boosting.](%1$s)</string>
+    <string name="premium_guild_features_upsell_banner_upgrade">Upgrade your subscription to send a Server Boost to a server! [Learn more about Server Boosting.](%1$s)</string>
+    <string name="premium_guild_guild_feature_audio_quality">Boosted servers get better audio quality for voice channels</string>
+    <string name="premium_guild_guild_feature_emoji">An increase of emoji slots at every server level gained</string>
+    <string name="premium_guild_guild_feature_upload_size">Bigger upload sizes for all the members in that server. And more!</string>
+    <string name="premium_guild_guild_features_header">Boosted servers can get:</string>
+    <string name="premium_guild_header_badge_no_subscribers">No Server Boosts</string>
     <string name="premium_guild_header_badge_no_tier">No Level</string>
-    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Nitro Server Boost</string>
+    <string name="premium_guild_header_dropdown_nitro_server_subscribe">Server Boost</string>
+    <string name="premium_guild_num_guild_subscriptions">**%1$s** x %1$s</string>
     <string name="premium_guild_perks_modal_base_perks">Boosted server perks include —</string>
-    <string name="premium_guild_perks_modal_blurb">For each level achieved, members of this server will help unlock perks for everyone. These perks are only in effect within the server. **Boosters get: Member List icon, new evolving badge, and a Booster-only role.** [Learn more about Nitro Server Boosting.](%1$s)</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_1">For each level achieved, members of this server will help unlock perks for everyone. These perks are only in effect within the server.</string>
-    <string name="premium_guild_perks_modal_blurb_mobile_2">**Boosters get: Member List icon, new evolving badge, and a Booster-only role.** [Learn more about Nitro Server Boosting.](%1$s)</string>
+    <string name="premium_guild_perks_modal_blurb">For each level achieved, members of this server will help unlock perks for everyone. These perks are only in effect within the server. [Learn more about Server Boosting.](%1$s)</string>
+    <string name="premium_guild_perks_modal_blurb_mobile">"For each level achieved, you'll help unlock perks for everyone in this server. These perks are only in effect within the server. [Learn more about Server Boosting.](%1$s)"</string>
     <string name="premium_guild_perks_modal_button_get_premium">Get Nitro to Boost!</string>
-    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boost this Server</string>
+    <string name="premium_guild_perks_modal_button_subscribe_prompt">Boost the server to help unlock perks.</string>
+    <string name="premium_guild_perks_modal_button_subscribe_status">"You've Boosted this server **%1$s**."</string>
+    <string name="premium_guild_perks_modal_button_subscribe_this_server">Boost this server</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium">Upgrade to Nitro to Boost!</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_ios_error">"We don't currently support upgrades to Nitro for subscriptions through Apple. You can cancel your subscription through [Apple's Subscription Management](%1$s), but the subscription will remain active until its expiration date."</string>
     <string name="premium_guild_perks_modal_button_upgrade_to_premium_tooltip">Nitro Classic does not include Server Boosting</string>
     <string name="premium_guild_perks_modal_header">Server Boost Status</string>
-    <string name="premium_guild_perks_modal_header_boost_count">%1$s</string>
+    <string name="premium_guild_perks_modal_header_subscription_count">%1$s</string>
+    <string name="premium_guild_perks_modal_learn_more">[Learn more](onLearnMore) about Discord Nitro</string>
     <string name="premium_guild_perks_modal_level_subscriber_count_tooltip">**%1$s/%2$s** Boosts</string>
+    <string name="premium_guild_perks_modal_manage_mobile">Manage your Server Boosts in [User Settings](onUserSettingsTap).</string>
     <string name="premium_guild_perks_modal_manage_your_subscription">Manage your Boost</string>
+    <string name="premium_guild_perks_modal_manage_your_subscriptions">Manage Boosts</string>
     <string name="premium_guild_perks_modal_no_tiers">No Levels achieved yet</string>
     <string name="premium_guild_perks_modal_previous_perks">Boosted servers get everything previous, and —</string>
+    <string name="premium_guild_perks_modal_subscriber_perks_header">Get cool rewards for becoming a Booster!</string>
+    <string name="premium_guild_perks_modal_subscription_description">Boost a server to help it achieve higher levels!</string>
     <string name="premium_guild_perks_modal_tier_zero_surpassed">This server started here. Now, It has become great.</string>
     <string name="premium_guild_perks_modal_tooltip_already_subscribed_this_server">You have already boosted this server!</string>
     <string name="premium_guild_perks_modal_tooltip_already_used_subscription">You have already used your boost for another server</string>
     <string name="premium_guild_perks_modal_tooltip_cooldown">Your Boost is on cooldown</string>
     <string name="premium_guild_perks_modal_tooltip_gift">Gift Nitro to a friend to help Boost this server!</string>
+    <string name="premium_guild_plan_month">Server Boost Monthly</string>
+    <string name="premium_guild_plan_year">Server Boost Yearly</string>
     <string name="premium_guild_settings_members_subscribed">%1$s have boosted this server</string>
     <string name="premium_guild_settings_members_subscribed_needed">You need **%1$s** to unlock %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
-    <string name="premium_guild_subscribe_confirm_blurb">Are you sure you want to send a Nitro Boost to:</string>
+    <string name="premium_guild_subscribe_confirm_blurb">Are you sure you want to Boost this server?</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Select this Server</string>
     <string name="premium_guild_subscribe_confirm_confirmation_label">Select this server. It will take a moment for your boost to take effect.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Boosting this server will prevent you from Boosting another server for %1$s. Removing your Boost does not affect the cooldown.**</string>
+    <string name="premium_guild_subscribe_confirm_cooldown_warning">**Boosting this server will prevent you from transferring this Boost to another server for %1$s. Removing your Boost does not affect the cooldown.**</string>
     <string name="premium_guild_subscribe_confirm_header">Choose Wisely!</string>
+    <string name="premium_guild_subscribe_confirm_transfer_blurb">Are you sure you want to transfer this Server Boost? The current server will lose progress if you transfer this Server Boost.</string>
+    <string name="premium_guild_subscribe_confirm_transfer_from_guild">Current server</string>
+    <string name="premium_guild_subscribe_confirm_transfer_header">Transfer Server Boost?</string>
+    <string name="premium_guild_subscribe_confirm_transfer_to_guild">Move boost to</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Search servers</string>
     <string name="premium_guild_subscribe_select_guild_header">Select a Server</string>
+    <string name="premium_guild_subscribe_select_guild_transfer_header">Select a server to transfer to</string>
     <string name="premium_guild_subscribe_success_thanks">Thanks for the Boost!</string>
+    <string name="premium_guild_subscribe_transfer_confirm_confirmation">Yes, Transfer Boost</string>
+    <string name="premium_guild_subscribe_transfer_confirm_confirmation_label">Transfer Boost to this server. It will take a moment for your boost to take effect.</string>
+    <string name="premium_guild_subscriber_feature_member_badge">Show off with an exclusive Member List icon</string>
+    <string name="premium_guild_subscriber_feature_profile_badge">New profile badge that evolves with your streak</string>
+    <string name="premium_guild_subscriber_feature_role">Gain a role exclusive to Boosters</string>
+    <string name="premium_guild_subscription_active_title">Active Server Boosts</string>
+    <string name="premium_guild_subscription_available">%1$s Available</string>
     <string name="premium_guild_subscription_available_count">You have **%1$s** available!</string>
-    <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_cancel_body_guild">Are you sure you want to cancel this Server Boost? We’ll smash this gem to pieces. It will be removed from associated servers and cancelled from your subscription at the end of your billing period: **%1$s**.</string>
+    <string name="premium_guild_subscription_cancel_body_inventory">Are you sure you want to cancel a Server Boost from your Inventory? We’ll smash this gem to pieces. It will be removed from associated servers and cancelled from your subscription at the end of your billing period: **%1$s**.</string>
+    <string name="premium_guild_subscription_cancel_button">Yes, Cancel Boost</string>
+    <string name="premium_guild_subscription_cancel_button_disabled_tooltip">This Boost is included with your Nitro subscription</string>
+    <string name="premium_guild_subscription_cancel_invoice_header">Subscription Details</string>
+    <string name="premium_guild_subscription_cancel_invoice_subscription_cancelled">**%1$s** %2$s Cancelled</string>
+    <string name="premium_guild_subscription_cancel_invoice_subscriptions">**%1$s** %2$s</string>
+    <string name="premium_guild_subscription_cancel_invoice_total_label">New Bill Total</string>
+    <string name="premium_guild_subscription_cancel_preview">This Server Boost subscription will be cancelled at the end of your Nitro or Nitro Classic billing period, **%1$s**. The changes to your subscription is reflected below:</string>
+    <string name="premium_guild_subscription_cancel_title_guild">Cancel Server Boost From A Server</string>
+    <string name="premium_guild_subscription_cancel_title_inventory">Cancel Server Boost From Inventory</string>
+    <string name="premium_guild_subscription_confirm_body">"Alright, we're ready to smash this Boost gem for you. This Boost is scheduled to be cancelled on: **%1$s**. **You can still use this Boost until it gets demolished!**"</string>
+    <string name="premium_guild_subscription_confirm_title">Boost Cancelled!</string>
+    <string name="premium_guild_subscription_creation_date">%1$s</string>
+    <string name="premium_guild_subscription_duration">Boosting since %1$s (%2$s)</string>
+    <string name="premium_guild_subscription_duration_mobile">%1$s</string>
     <string name="premium_guild_subscription_error_mobile">There was an error trying to boost. Please try again.</string>
     <string name="premium_guild_subscription_error_rate_limit_days">"Looks like you're on cooldown. Please wait **%1$s and %2$s** before trying again"</string>
     <string name="premium_guild_subscription_error_rate_limit_hours">"Looks like you're on cooldown. Please wait **%1$s and %2$s** before trying again"</string>
     <string name="premium_guild_subscription_error_rate_limit_minutes">"Looks like you're on cooldown. Please wait **%1$s** before trying again"</string>
+    <string name="premium_guild_subscription_guild_subsription_subtitle">You Boosted %1$s</string>
+    <string name="premium_guild_subscription_inventory_uncancel_button">Yes, uncancel now</string>
+    <string name="premium_guild_subscription_inventory_uncancel_confirm_description">This Server Boost is saved from cancellation! Keep on Boosting!</string>
+    <string name="premium_guild_subscription_inventory_uncancel_confirm_title">Boosts Saved!</string>
+    <string name="premium_guild_subscription_inventory_uncancel_description">Would you like to uncancel this Server Boost?</string>
+    <string name="premium_guild_subscription_inventory_uncancel_title">Uncancel Boost Subscription</string>
+    <string name="premium_guild_subscription_marketing_blurb">Boosting will help progress a server to a new level. For every level achieved, it’ll unlock chat perks for everyone in that server! [Learn more about Server Boosting in our FAQ.](%1$s)</string>
+    <string name="premium_guild_subscription_marketing_guilds_blurb">You can Boost a joined server, check the current level progress, and view level perks within the server itself. Get started with any of the first 4 of your joined servers:</string>
+    <string name="premium_guild_subscription_marketing_guilds_empty_blurb">You can Boost a joined server, check the current level progress, and view level perks within the server itself.</string>
+    <string name="premium_guild_subscription_marketing_guilds_empty_description_text">"Come back after you've found some cool people to Boost with."</string>
+    <string name="premium_guild_subscription_marketing_guilds_empty_description_title">"Looks like you haven't joined a server yet."</string>
+    <string name="premium_guild_subscription_marketing_guilds_header">**Ready to Boost a Server?** Server Boosts start at **%1$s/Month or %2$s/Year**.</string>
+    <string name="premium_guild_subscription_marketing_guilds_header_premium_tier_1">**Ready to Boost a Server?** Server Boosts start at **%1$s/Month or %2$s/Year** for Nitro and Nitro Classic members (like you).</string>
+    <string name="premium_guild_subscription_marketing_guilds_header_premium_tier_2">**Ready to Boost a Server?** Server Boosts start at **%1$s/Month or %2$s/Year** for Nitro members (like you). And get **2 free Boosts** to start with.</string>
+    <string name="premium_guild_subscription_marketing_header">Anyone can help your favorite server level up &amp; unlock customizations, and collective perks</string>
     <string name="premium_guild_subscription_no_next_tier">This server is fully powered! Keep boosting!</string>
-    <string name="premium_guild_subscription_notice">Nitro Server Boosts are here! Rally your community to boost your server.</string>
+    <string name="premium_guild_subscription_notice">Server Boosts are here! Rally your community to boost your server.</string>
     <string name="premium_guild_subscription_notice_button">See Levels &amp; Perks</string>
-    <string name="premium_guild_subscription_notice_small_guild">Nitro Server Boosts are here! Rally your friends to boost your server.</string>
+    <string name="premium_guild_subscription_notice_small_guild">Server Boosts are here! Rally your friends to boost your server.</string>
+    <string name="premium_guild_subscription_num_subscriptions">%1$s other %2$s}</string>
+    <string name="premium_guild_subscription_pending_cancellation">Pending Cancellation: **%1$s**</string>
+    <string name="premium_guild_subscription_purchase_button">Get more Boosts</string>
+    <string name="premium_guild_subscription_purchase_button_disabled_pending_mutation_plan">You have to cancel your pending plan change before buying boosts.</string>
+    <string name="premium_guild_subscription_purchase_button_disabled_pending_mutation_premium_guild_subscription">You have a pending boost cancellation. You have to uncancel it before buying boosts.</string>
+    <string name="premium_guild_subscription_purchase_description">Get as many Boosts as your heart desires! With a Nitro or Nitro Classic subscription, you can purchase additional Boosts to support your favorite server.</string>
     <string name="premium_guild_subscription_remove_button">Remove Boost</string>
     <string name="premium_guild_subscription_remove_error_mobile">There was an error trying to remove the boost. Please try again.</string>
     <string name="premium_guild_subscription_select_server_button">Select a Server</string>
+    <string name="premium_guild_subscription_slot_cancel_button">Cancel Boost Subscription</string>
+    <string name="premium_guild_subscription_slot_uncancel_button">Uncancel Boost Subscription</string>
+    <string name="premium_guild_subscription_subscribe">Boost a server</string>
     <string name="premium_guild_subscription_subscriber_count_tooltip">%1$s</string>
-    <string name="premium_guild_subscription_subtitle">"Use your Nitro powers to boost a server you've joined! Boosting a server allows it to progress towards levels. Each level gives collective perks for the entire server. Boosting a server activates a 7-day cooldown. You may not boost another server until this cooldown is finished even if you remove your boost. [Learn more about Nitro Server Boosting.](%1$s)"</string>
-    <string name="premium_guild_subscription_subtitle_mobile_1">"Use your Nitro powers to boost a Server you've joined! Boosting a Server allows it to progress towards levels. Each Level gives collective perks for the entire server."</string>
-    <string name="premium_guild_subscription_subtitle_mobile_2">Boosting a server activates a 7-day cooldown. You may not boost another server until this cooldown is finished even if you remove your boost. [Learn more about Nitro Server Boosting.](%1$s)</string>
-    <string name="premium_guild_subscription_title">Nitro Server Boost</string>
-    <string name="premium_guild_subscription_tooltip">Nitro boosting since %1$s</string>
+    <string name="premium_guild_subscription_subtitle">"Use your Nitro powers to boost a server you've joined! Boosting a server allows it to progress towards levels. Each level gives collective perks for the entire server. Boosting a server activates a 7-day cooldown. You may not boost another server until this cooldown is finished even if you remove your boost. [Learn more about Server Boosting.](%1$s)"</string>
+    <string name="premium_guild_subscription_subtitle_mobile_1">Boosting allows a server to progress towards levels. Each level unlocks perks for the entire server.</string>
+    <string name="premium_guild_subscription_subtitle_mobile_2">Boosting a server activates a 7-day cooldown. You may not use this Boost on another server until this cooldown is finished. [Learn more about Server Boosting.](%1$s)</string>
+    <string name="premium_guild_subscription_title">Server Boost</string>
+    <string name="premium_guild_subscription_tooltip">Server boosting since %1$s</string>
+    <string name="premium_guild_subscription_transfer_button">Transfer Boost</string>
+    <string name="premium_guild_subscription_transfer_button_disabled_tooltip">This Boost is on cooldown</string>
+    <string name="premium_guild_subscription_unused_slot_description">Unused Boost</string>
+    <string name="premium_guild_subscriptions_renewal_info">**%1$sx** %1$s - %2$s</string>
+    <string name="premium_guild_tier_0">No Level</string>
     <string name="premium_guild_tier_1">Level 1</string>
     <string name="premium_guild_tier_2">Level 2</string>
     <string name="premium_guild_tier_3">Level 3</string>
-    <string name="premium_guild_unsubscribe_confirm_blurb">Are you sure you want to remove your Nitro Boost from:</string>
+    <string name="premium_guild_unsubscribe_confirm_blurb">Are you sure you want to remove your Boost from:</string>
     <string name="premium_guild_unsubscribe_confirm_confirmation">Yes, Remove Boost</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning">This server will lose progress if you remove your boost.</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_days">This server will lose progress if you remove your boost. **Your Boost is still on cooldown. It will be available in %1$s and %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_hours">This server will lose progress if you remove your boost. **Your Boost is still on cooldown. It will be available in %1$s and %2$s.**</string>
     <string name="premium_guild_unsubscribe_confirm_cooldown_warning_minutes">This server will lose progress if you remove your boost. **Your Boost is still on cooldown. It will be available in %1$s.**</string>
-    <string name="premium_guild_unsubscribe_confirm_header">Remove Nitro Boost?</string>
+    <string name="premium_guild_unsubscribe_confirm_header">Remove Server Boost?</string>
+    <string name="premium_guild_user_feature_member_badge">A member list icon next to their name</string>
+    <string name="premium_guild_user_feature_profile_badge">A shiny, new profile badge that changes over time</string>
+    <string name="premium_guild_user_feature_role">An exclusive new role only for Boosters in that server</string>
+    <string name="premium_guild_user_features_header">Boosters receive:</string>
     <string name="premium_included">Included in Nitro:</string>
     <string name="premium_info_monthly">%1$s (monthly) occurs on %2$s.</string>
     <string name="premium_info_yearly">%1$s (yearly) occurs on %2$s.</string>
@@ -3715,7 +3839,7 @@ To keep your sub, go to Settings and update your payment."</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_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 get superpower chat perks and a Server Boost.</string>
+    <string name="premium_payment_gift_blurb">Gift your friends [Nitro](onClick) so they get superpower chat perks and Server Boosts.</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>
@@ -3726,6 +3850,10 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_payment_trial_blurb">Take advantage of all the Nitro perks for free until %1$s. No commitments, cancel anytime.</string>
     <string name="premium_payment_trial_note">You will be billed on %1$s.</string>
     <string name="premium_payment_trial_two_weeks_free">Get 2 weeks free</string>
+    <string name="premium_pending_plan_change_cancel_body">You have chosen to cancel the change from **%1$s** to **%2$s**. If you cancel this plan change, your **%1$s** at **%3$s** will continue.</string>
+    <string name="premium_pending_plan_change_cancel_button">Cancel Plan Change</string>
+    <string name="premium_pending_plan_change_cancel_header">Cancel Subscription Plan Change</string>
+    <string name="premium_pending_plan_change_notice">Your plan change is pending. **%1$s** will start on **%2$s**.</string>
     <string name="premium_plan_month">Nitro Monthly</string>
     <string name="premium_plan_month_tier_1">Nitro Classic Monthly</string>
     <string name="premium_plan_month_tier_2">Nitro Monthly</string>
@@ -3741,8 +3869,12 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_retention_emoji_picker_description">Careful! Your %1$s perks, including global and animated emoji, expire soon on **%2$s**.</string>
     <string name="premium_retention_emoji_picker_update_payment_information">Update your payment information.</string>
     <string name="premium_settings">Nitro Settings</string>
+    <string name="premium_settings_billing_info">Billing Information</string>
+    <string name="premium_settings_cancelled_info">Your **%1$s** subscription will end on **%2$s**.</string>
     <string name="premium_settings_get">Get Nitro</string>
     <string name="premium_settings_manage">Manage Nitro</string>
+    <string name="premium_settings_past_due_info">Your **%1$s** subscription is past due. Please update your payment info or your subscription will end on **%2$s**.</string>
+    <string name="premium_settings_renewal_info">"Your subscriptions will automatically renew on **%1$s** and you'll be charged **%2$s**."</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>
@@ -3751,6 +3883,10 @@ To keep your sub, go to Settings and update your payment."</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_switch_plan_disabled_pending_mutation_plan">You have to cancel your pending plan change before choosing another plan.</string>
+    <string name="premium_switch_plan_disabled_pending_mutation_premium_guild_subscription">You have a pending boost cancellation. You have to uncancel it before switching plans.</string>
+    <string name="premium_switch_plans">Switch Plans</string>
+    <string name="premium_switch_review_header">Switch to %1$s</string>
     <string name="premium_tier_1">Nitro Classic</string>
     <string name="premium_tier_2">Nitro</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>
@@ -3759,15 +3895,10 @@ To keep your sub, go to Settings and update your payment."</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>
-    <string name="premium_upgrade_confirm_body_detailed_month_year_verbose">"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** now, and **%2$s/year after the current billing period.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month">"Upgrade your %1$s (monthly) plan and get the ability to boost servers. Your new plan will start immediately. We'll prorate your current plan and deduct it from the monthly price. You will be charged **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_month_verbose">"Upgrade your %1$s (monthly) plan and get the ability to boost servers. Your new plan will start immediately. We'll prorate your current plan and deduct it from the monthly price. You will be charged **%2$s** now, and **%3$s/month after the current billing period.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year">"Upgrade your %1$s (monthly) plan and get the ability to boost servers. Your new plan will start immediately. We'll prorate your current plan and deduct it from the yearly price. You will be charged **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_month_tier_2_year_verbose">"Upgrade your %1$s (monthly) plan and get the ability to boost servers. Your new plan will start immediately. We'll prorate your current plan and deduct it from the yearly price. You will be charged **%2$s** now, and **%3$s/year after the current billing period.**"</string>
     <string name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year">"Upgrade your %1$s (yearly) plan and get the ability to boost servers. Your new plan will start immediately. We'll prorate your current plan and deduct it from the yearly price. You will be charged **%2$s**."</string>
-    <string name="premium_upgrade_confirm_body_detailed_tier_1_year_tier_2_year_verbose">"Upgrade your %1$s (yearly) plan and get the ability to boost servers. Your new plan will start immediately. We'll prorate your current plan and deduct it from the yearly price. You will be charged **%2$s** now, and **%3$s/year after the current billing period.**"</string>
     <string name="premium_upgrade_confirm_button">Upgrade</string>
-    <string name="premium_upgrade_confirm_button_with_price">Upgrade now - %1$s</string>
     <string name="premium_upgrade_confirm_title">Upgrade to %1$s</string>
     <string name="premium_upgrade_disabled_already_premium">You cannot subscribe while you already have Nitro.</string>
     <string name="premium_upgrade_disabled_current_tooltip">Your current plan.</string>
@@ -3792,9 +3923,17 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_upsell_emoji_active_mobile">You can’t use this emoji right now</string>
     <string name="premium_upsell_emoji_description_mobile">Lift off with **Discord Nitro** to use animated and custom emojis on any server.</string>
     <string name="premium_upsell_emoji_passive_mobile">Get upgraded emoji power!</string>
+    <string name="premium_upsell_feature_free_guild_subscription">Get a free server boost to support your favorite server and get a fancy badge</string>
+    <string name="premium_upsell_feature_pretext">Get all the same perks as Nitro Classic plus extras like:</string>
+    <string name="premium_upsell_feature_stream">Stream at source when streaming with Go Live</string>
+    <string name="premium_upsell_feature_upload">"Upload file size increase from your Nitro Classic's 50MB to 100MB"</string>
+    <string name="premium_upsell_none_tier_feature_free_guild_subscription">Get 2 free Boosts to support your favorite server and get a fancy badge</string>
+    <string name="premium_upsell_none_tier_feature_pretext">Subscribing to Nitro means Boosting at a better price:</string>
     <string name="premium_upsell_tag_active_mobile">Trying to change your tag?</string>
     <string name="premium_upsell_tag_description_mobile">Subscribe to **Discord Nitro** to choose your own custom Discord tag.</string>
     <string name="premium_upsell_tag_passive_mobile">Want to get your own custom tag?</string>
+    <string name="premium_upsell_title">How about upgrading to Nitro?</string>
+    <string name="premium_upsell_upgrade">Upgrade to Nitro</string>
     <string name="premium_upsell_upload_active_mobile">Your files are too powerful!</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>
@@ -4356,8 +4495,6 @@ Server Insights is an experimental feature and is subject to change or removal i
     <string name="stop_watching">Stop Watching</string>
     <string name="storage_permission_denied_msg">Storage permissions required</string>
     <string name="store_channel">Store Channel</string>
-    <string name="store_payment_legalese_monthly">"Hey! By purchasing %1$s, you agree to our [Terms of Service](%2$s). %1$s is a recurring subscription, which means that we'll charge you today and continue to charge you monthly until you cancel your subscription. You may cancel anytime on your User Settings screen."</string>
-    <string name="store_payment_legalese_yearly">"Hey! By purchasing %1$s, you agree to our [Terms of Service](%2$s). %1$s is a recurring subscription, which means that we'll charge you today and continue to charge you yearly until you cancel your subscription. You may cancel anytime on your User Settings screen."</string>
     <string name="stream">Go Live</string>
     <string name="stream_bad_spectator">"The stream you're viewing currently has reduced video or audio quality. This may be due to network conditions."</string>
     <string name="stream_bad_streamer">Your stream currently has reduced video or audio quality. This may be due to network conditions.</string>
@@ -4420,6 +4557,9 @@ Server Insights is an experimental feature and is subject to change or removal i
     <string name="stripe_unable_to_load">Unfortunately our payment processor is unable to load right now. Please try again later</string>
     <string name="sub_enabled_servers">Sub Enabled Servers</string>
     <string name="subscriber_information">Subscriber Information</string>
+    <string name="subscription_payment_legalese_monthly">"Hey! What you're purchasing is a recurring subscription, which means we'll charge you today and continue to charge you montly until you cancel the subscription. You can cancel anytime from your Settings page, though!"</string>
+    <string name="subscription_payment_legalese_yearly">"Hey! What you're purchasing is a recurring subscription, which means we'll charge you today and continue to charge you yearly until you cancel the subscription. You can cancel anytime from your Settings page, though!"</string>
+    <string name="subscriptions_title">Subscriptions</string>
     <string name="suggestions">Suggestions</string>
     <string name="support">Support</string>
     <string name="suppress_all_embeds">Remove all embeds</string>
@@ -4817,6 +4957,10 @@ Server Insights is an experimental feature and is subject to change or removal i
     <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_mutual_friends">%1$s</string>
+    <string name="user_profile_mutual_friends_placeholder">Mutual Friends</string>
+    <string name="user_profile_mutual_guilds">%1$s</string>
+    <string name="user_profile_mutual_guilds_placeholder">Mutual Servers</string>
     <string name="user_profile_pending">Pending</string>
     <string name="user_profile_video">Video</string>
     <string name="user_profile_volume">Volume</string>
@@ -5070,6 +5214,7 @@ Server Insights is an experimental feature and is subject to change or removal i
     <string name="xbox_pin_step1">Open the Discord app on your phone</string>
     <string name="xbox_pin_step2">Go to Settings > Connections > Add</string>
     <string name="xbox_pin_step3">Click on Xbox and enter the PIN above</string>
+    <string name="yearly">Yearly</string>
     <string name="yellow">Yellow</string>
     <string name="yes_text">Yes</string>
     <string name="your_discord_tag">Your Discord Tag</string>
@@ -5078,5 +5223,5 @@ Server Insights is an experimental feature and is subject to change or removal i
     <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_3a2">false</item>
+    <item type="string" name="APKTOOL_DUMMY_3c7">false</item>
 </resources>
diff --git a/com.discord/smali/androidx/activity/R$attr.smali b/com.discord/smali/androidx/activity/R$attr.smali
index 8ee5996a08..36a7deebc3 100644
--- a/com.discord/smali/androidx/activity/R$attr.smali
+++ b/com.discord/smali/androidx/activity/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$color.smali b/com.discord/smali/androidx/activity/R$color.smali
index 774f39759f..336d5313f9 100644
--- a/com.discord/smali/androidx/activity/R$color.smali
+++ b/com.discord/smali/androidx/activity/R$color.smali
@@ -15,13 +15,13 @@
 
 
 # static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index a338e62f22..11e21c5c92 100644
--- a/com.discord/smali/androidx/activity/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index b1f30f5ca1..ed6c375de5 100644
--- a/com.discord/smali/androidx/activity/R$id.smali
+++ b/com.discord/smali/androidx/activity/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$layout.smali b/com.discord/smali/androidx/activity/R$layout.smali
index 025b12e2cb..33230d8418 100644
--- a/com.discord/smali/androidx/activity/R$layout.smali
+++ b/com.discord/smali/androidx/activity/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index 6d95a0db20..effe4b8fe6 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/activity/R$styleable.smali b/com.discord/smali/androidx/activity/R$styleable.smali
index 50772567a5..749d4a0168 100644
--- a/com.discord/smali/androidx/activity/R$styleable.smali
+++ b/com.discord/smali/androidx/activity/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali
index a5f3d53b6c..285a336762 100644
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@@ -315,249 +315,249 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final lineHeight:I = 0x7f040259
+.field public static final lineHeight:I = 0x7f04025a
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
 
-.field public static final listDividerAlertDialog:I = 0x7f04025c
+.field public static final listDividerAlertDialog:I = 0x7f04025d
 
-.field public static final listItemLayout:I = 0x7f04025d
+.field public static final listItemLayout:I = 0x7f04025e
 
-.field public static final listLayout:I = 0x7f04025e
+.field public static final listLayout:I = 0x7f04025f
 
-.field public static final listMenuViewStyle:I = 0x7f04025f
+.field public static final listMenuViewStyle:I = 0x7f040260
 
-.field public static final listPopupWindowStyle:I = 0x7f040260
+.field public static final listPopupWindowStyle:I = 0x7f040261
 
-.field public static final listPreferredItemHeight:I = 0x7f040261
+.field public static final listPreferredItemHeight:I = 0x7f040262
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040262
+.field public static final listPreferredItemHeightLarge:I = 0x7f040263
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040263
+.field public static final listPreferredItemHeightSmall:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040265
+.field public static final listPreferredItemPaddingRight:I = 0x7f040266
 
-.field public static final logo:I = 0x7f040266
+.field public static final logo:I = 0x7f040267
 
-.field public static final logoDescription:I = 0x7f040267
+.field public static final logoDescription:I = 0x7f040268
 
-.field public static final maxButtonHeight:I = 0x7f04027a
+.field public static final maxButtonHeight:I = 0x7f04027b
 
-.field public static final measureWithLargestChild:I = 0x7f04027d
+.field public static final measureWithLargestChild:I = 0x7f04027e
 
-.field public static final multiChoiceItemLayout:I = 0x7f04027f
+.field public static final multiChoiceItemLayout:I = 0x7f040280
 
-.field public static final navigationContentDescription:I = 0x7f040280
+.field public static final navigationContentDescription:I = 0x7f040281
 
-.field public static final navigationIcon:I = 0x7f040281
+.field public static final navigationIcon:I = 0x7f040282
 
-.field public static final navigationMode:I = 0x7f040282
+.field public static final navigationMode:I = 0x7f040283
 
-.field public static final numericModifiers:I = 0x7f040286
+.field public static final numericModifiers:I = 0x7f040287
 
-.field public static final overlapAnchor:I = 0x7f040287
+.field public static final overlapAnchor:I = 0x7f040288
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028b
+.field public static final paddingBottomNoButtons:I = 0x7f04028c
 
-.field public static final paddingEnd:I = 0x7f04028c
+.field public static final paddingEnd:I = 0x7f04028d
 
-.field public static final paddingStart:I = 0x7f04028d
+.field public static final paddingStart:I = 0x7f04028e
 
-.field public static final paddingTopNoTitle:I = 0x7f04028e
+.field public static final paddingTopNoTitle:I = 0x7f04028f
 
-.field public static final panelBackground:I = 0x7f04028f
+.field public static final panelBackground:I = 0x7f040290
 
-.field public static final panelMenuListTheme:I = 0x7f040290
+.field public static final panelMenuListTheme:I = 0x7f040291
 
-.field public static final panelMenuListWidth:I = 0x7f040291
+.field public static final panelMenuListWidth:I = 0x7f040292
 
-.field public static final popupMenuStyle:I = 0x7f040299
+.field public static final popupMenuStyle:I = 0x7f04029a
 
-.field public static final popupTheme:I = 0x7f04029a
+.field public static final popupTheme:I = 0x7f04029b
 
-.field public static final popupWindowStyle:I = 0x7f04029b
+.field public static final popupWindowStyle:I = 0x7f04029c
 
-.field public static final preserveIconSpacing:I = 0x7f04029c
+.field public static final preserveIconSpacing:I = 0x7f04029d
 
-.field public static final progressBarPadding:I = 0x7f0402c8
+.field public static final progressBarPadding:I = 0x7f0402c9
 
-.field public static final progressBarStyle:I = 0x7f0402c9
+.field public static final progressBarStyle:I = 0x7f0402ca
 
-.field public static final queryBackground:I = 0x7f0402cc
+.field public static final queryBackground:I = 0x7f0402cd
 
-.field public static final queryHint:I = 0x7f0402cd
+.field public static final queryHint:I = 0x7f0402ce
 
-.field public static final radioButtonStyle:I = 0x7f0402ce
+.field public static final radioButtonStyle:I = 0x7f0402cf
 
-.field public static final ratingBarStyle:I = 0x7f0402d1
+.field public static final ratingBarStyle:I = 0x7f0402d2
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d3
+.field public static final ratingBarStyleSmall:I = 0x7f0402d4
 
-.field public static final searchHintIcon:I = 0x7f0402f8
+.field public static final searchHintIcon:I = 0x7f0402f9
 
-.field public static final searchIcon:I = 0x7f0402f9
+.field public static final searchIcon:I = 0x7f0402fa
 
-.field public static final searchViewStyle:I = 0x7f0402fa
+.field public static final searchViewStyle:I = 0x7f0402fb
 
-.field public static final seekBarStyle:I = 0x7f0402fc
+.field public static final seekBarStyle:I = 0x7f0402fd
 
-.field public static final selectableItemBackground:I = 0x7f0402fd
+.field public static final selectableItemBackground:I = 0x7f0402fe
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
 
-.field public static final showAsAction:I = 0x7f040300
+.field public static final showAsAction:I = 0x7f040301
 
-.field public static final showDividers:I = 0x7f040304
+.field public static final showDividers:I = 0x7f040305
 
-.field public static final showText:I = 0x7f040306
+.field public static final showText:I = 0x7f040307
 
-.field public static final showTitle:I = 0x7f040307
+.field public static final showTitle:I = 0x7f040308
 
-.field public static final singleChoiceItemLayout:I = 0x7f040308
+.field public static final singleChoiceItemLayout:I = 0x7f040309
 
-.field public static final spinBars:I = 0x7f04030e
+.field public static final spinBars:I = 0x7f04030f
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
+.field public static final spinnerDropDownItemStyle:I = 0x7f040310
 
-.field public static final spinnerStyle:I = 0x7f040310
+.field public static final spinnerStyle:I = 0x7f040311
 
-.field public static final splitTrack:I = 0x7f040311
+.field public static final splitTrack:I = 0x7f040312
 
-.field public static final srcCompat:I = 0x7f040312
+.field public static final srcCompat:I = 0x7f040313
 
-.field public static final state_above_anchor:I = 0x7f040314
+.field public static final state_above_anchor:I = 0x7f040315
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final subMenuArrow:I = 0x7f040320
+.field public static final subMenuArrow:I = 0x7f040321
 
-.field public static final submitBackground:I = 0x7f040321
+.field public static final submitBackground:I = 0x7f040322
 
-.field public static final subtitle:I = 0x7f040322
+.field public static final subtitle:I = 0x7f040323
 
-.field public static final subtitleTextAppearance:I = 0x7f040323
+.field public static final subtitleTextAppearance:I = 0x7f040324
 
-.field public static final subtitleTextColor:I = 0x7f040324
+.field public static final subtitleTextColor:I = 0x7f040325
 
-.field public static final subtitleTextStyle:I = 0x7f040325
+.field public static final subtitleTextStyle:I = 0x7f040326
 
-.field public static final suggestionRowLayout:I = 0x7f040326
+.field public static final suggestionRowLayout:I = 0x7f040327
 
-.field public static final switchMinWidth:I = 0x7f040327
+.field public static final switchMinWidth:I = 0x7f040328
 
-.field public static final switchPadding:I = 0x7f040328
+.field public static final switchPadding:I = 0x7f040329
 
-.field public static final switchStyle:I = 0x7f040329
+.field public static final switchStyle:I = 0x7f04032a
 
-.field public static final switchTextAppearance:I = 0x7f04032a
+.field public static final switchTextAppearance:I = 0x7f04032b
 
-.field public static final textAllCaps:I = 0x7f040348
+.field public static final textAllCaps:I = 0x7f040349
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
 
-.field public static final textAppearanceListItem:I = 0x7f040354
+.field public static final textAppearanceListItem:I = 0x7f040355
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040355
+.field public static final textAppearanceListItemSecondary:I = 0x7f040356
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040356
+.field public static final textAppearanceListItemSmall:I = 0x7f040357
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035e
+.field public static final textColorAlertDialogListItem:I = 0x7f04035f
 
-.field public static final textColorSearchUrl:I = 0x7f04035f
+.field public static final textColorSearchUrl:I = 0x7f040360
 
-.field public static final theme:I = 0x7f040364
+.field public static final theme:I = 0x7f040365
 
-.field public static final thickness:I = 0x7f0403b5
+.field public static final thickness:I = 0x7f0403b6
 
-.field public static final thumbTextPadding:I = 0x7f0403b6
+.field public static final thumbTextPadding:I = 0x7f0403b7
 
-.field public static final thumbTint:I = 0x7f0403b7
+.field public static final thumbTint:I = 0x7f0403b8
 
-.field public static final thumbTintMode:I = 0x7f0403b8
+.field public static final thumbTintMode:I = 0x7f0403b9
 
-.field public static final tickMark:I = 0x7f0403b9
+.field public static final tickMark:I = 0x7f0403ba
 
-.field public static final tickMarkTint:I = 0x7f0403ba
+.field public static final tickMarkTint:I = 0x7f0403bb
 
-.field public static final tickMarkTintMode:I = 0x7f0403bb
+.field public static final tickMarkTintMode:I = 0x7f0403bc
 
-.field public static final tint:I = 0x7f0403bc
+.field public static final tint:I = 0x7f0403bd
 
-.field public static final tintMode:I = 0x7f0403bd
+.field public static final tintMode:I = 0x7f0403be
 
-.field public static final title:I = 0x7f0403be
+.field public static final title:I = 0x7f0403bf
 
-.field public static final titleMargin:I = 0x7f0403c0
+.field public static final titleMargin:I = 0x7f0403c1
 
-.field public static final titleMarginBottom:I = 0x7f0403c1
+.field public static final titleMarginBottom:I = 0x7f0403c2
 
-.field public static final titleMarginEnd:I = 0x7f0403c2
+.field public static final titleMarginEnd:I = 0x7f0403c3
 
-.field public static final titleMarginStart:I = 0x7f0403c3
+.field public static final titleMarginStart:I = 0x7f0403c4
 
-.field public static final titleMarginTop:I = 0x7f0403c4
+.field public static final titleMarginTop:I = 0x7f0403c5
 
-.field public static final titleMargins:I = 0x7f0403c5
+.field public static final titleMargins:I = 0x7f0403c6
 
-.field public static final titleTextAppearance:I = 0x7f0403c6
+.field public static final titleTextAppearance:I = 0x7f0403c7
 
-.field public static final titleTextColor:I = 0x7f0403c7
+.field public static final titleTextColor:I = 0x7f0403c8
 
-.field public static final titleTextStyle:I = 0x7f0403c8
+.field public static final titleTextStyle:I = 0x7f0403c9
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403ca
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
-.field public static final toolbarStyle:I = 0x7f0403cb
+.field public static final toolbarStyle:I = 0x7f0403cc
 
-.field public static final tooltipForegroundColor:I = 0x7f0403cc
+.field public static final tooltipForegroundColor:I = 0x7f0403cd
 
-.field public static final tooltipFrameBackground:I = 0x7f0403cd
+.field public static final tooltipFrameBackground:I = 0x7f0403ce
 
-.field public static final tooltipText:I = 0x7f0403ce
+.field public static final tooltipText:I = 0x7f0403cf
 
-.field public static final track:I = 0x7f0403cf
+.field public static final track:I = 0x7f0403d0
 
-.field public static final trackTint:I = 0x7f0403d0
+.field public static final trackTint:I = 0x7f0403d1
 
-.field public static final trackTintMode:I = 0x7f0403d1
+.field public static final trackTintMode:I = 0x7f0403d2
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
-.field public static final viewInflaterClass:I = 0x7f0403ed
+.field public static final viewInflaterClass:I = 0x7f0403ee
 
-.field public static final voiceIcon:I = 0x7f0403ee
+.field public static final voiceIcon:I = 0x7f0403ef
 
-.field public static final windowActionBar:I = 0x7f0403f0
+.field public static final windowActionBar:I = 0x7f0403f1
 
-.field public static final windowActionBarOverlay:I = 0x7f0403f1
+.field public static final windowActionBarOverlay:I = 0x7f0403f2
 
-.field public static final windowActionModeOverlay:I = 0x7f0403f2
+.field public static final windowActionModeOverlay:I = 0x7f0403f3
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403f3
+.field public static final windowFixedHeightMajor:I = 0x7f0403f4
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403f4
+.field public static final windowFixedHeightMinor:I = 0x7f0403f5
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403f5
+.field public static final windowFixedWidthMajor:I = 0x7f0403f6
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403f6
+.field public static final windowFixedWidthMinor:I = 0x7f0403f7
 
-.field public static final windowMinWidthMajor:I = 0x7f0403f7
+.field public static final windowMinWidthMajor:I = 0x7f0403f8
 
-.field public static final windowMinWidthMinor:I = 0x7f0403f8
+.field public static final windowMinWidthMinor:I = 0x7f0403f9
 
-.field public static final windowNoTitle:I = 0x7f0403f9
+.field public static final windowNoTitle:I = 0x7f0403fa
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$color.smali b/com.discord/smali/androidx/appcompat/R$color.smali
index 948287ae37..c3ca8ea036 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 = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006c
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006d
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index 0245ef0ea2..5effaf77d3 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index 57f158171b..cc045ed6ca 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -57,9 +57,9 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -69,161 +69,161 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$layout.smali b/com.discord/smali/androidx/appcompat/R$layout.smali
index 2fa780d508..061707435a 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index 834660334c..d74594bba2 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 = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali
index a132ebb0fa..2ee5f888bc 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, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -1272,15 +1272,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -1289,8 +1289,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -1304,11 +1304,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -1338,17 +1338,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_9
@@ -1373,8 +1373,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_b
@@ -1450,47 +1450,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -1500,6 +1499,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_c
@@ -1519,7 +1519,7 @@
     :array_e
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_f
@@ -1541,8 +1541,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_11
@@ -1566,7 +1566,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_13
@@ -1600,8 +1600,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_16
@@ -1650,9 +1650,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_1a
@@ -1664,21 +1664,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_1b
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_1d
@@ -1693,13 +1693,13 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_1e
@@ -1708,7 +1708,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_1f
@@ -1726,17 +1726,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_21
@@ -1753,7 +1753,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_22
@@ -1769,17 +1769,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1787,15 +1786,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_23
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 ef38260c77..bb04664afb 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
index 494195c1de..8af752bce6 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 0cd1f56786..9e7d4e8ca9 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index fec4a41c6f..d7b4a9c7da 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
index 3517315b29..e7a5bfa95b 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index a0b290f100..c80e9cb1df 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
index 3bffa00554..b2ef5a44f0 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 d6895829af..54e67525c4 100644
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@@ -53,9 +53,9 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$color.smali b/com.discord/smali/androidx/browser/R$color.smali
index a42507f112..38a7d23f61 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index c3da2970e2..df1408a4ea 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index c096f2ca87..07db866bbb 100644
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@@ -25,9 +25,9 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -43,57 +43,57 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$layout.smali b/com.discord/smali/androidx/browser/R$layout.smali
index 525a6286ad..fae5183f82 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 64cdb5c389..ee5942d875 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali
index daa415db12..833f26587f 100644
--- a/com.discord/smali/androidx/browser/R$styleable.smali
+++ b/com.discord/smali/androidx/browser/R$styleable.smali
@@ -184,7 +184,7 @@
     :array_1
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_2
@@ -219,7 +219,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_5
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/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index 6cf074f133..7409354147 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -17,31 +17,31 @@
 # static fields
 .field public static final bottom:I = 0x7f0a0105
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final gone:I = 0x7f0a0324
+.field public static final gone:I = 0x7f0a032c
 
-.field public static final invisible:I = 0x7f0a03b2
+.field public static final invisible:I = 0x7f0a03ba
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final packed:I = 0x7f0a04d4
+.field public static final packed:I = 0x7f0a04de
 
-.field public static final parent:I = 0x7f0a04d7
+.field public static final parent:I = 0x7f0a04e1
 
-.field public static final percent:I = 0x7f0a050a
+.field public static final percent:I = 0x7f0a0515
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final spread:I = 0x7f0a0712
+.field public static final spread:I = 0x7f0a072d
 
-.field public static final spread_inside:I = 0x7f0a0713
+.field public static final spread_inside:I = 0x7f0a072e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final wrap:I = 0x7f0a0850
+.field public static final wrap:I = 0x7f0a0880
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
index 2a5c85fe1c..d03c9ec62f 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
@@ -53,9 +53,9 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$color.smali b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
index 1378ebdda7..8dde021331 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 09a260f12f..15e0a9ea4b 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 99bfc508fd..fb2ad253e2 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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 chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
index fda0f8ff5a..0ac2399364 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index 1ea07b5c6a..060534fa61 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
index 2319ea6f12..8c7db40f43 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
@@ -184,7 +184,7 @@
     :array_1
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_2
@@ -219,7 +219,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 bf5f6ca5da..1b5f6dbc42 100644
--- a/com.discord/smali/androidx/core/R$attr.smali
+++ b/com.discord/smali/androidx/core/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$color.smali b/com.discord/smali/androidx/core/R$color.smali
index c7669e5ea3..7f1bef044d 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index b9db7e83e2..5fd0caa176 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index 010ba6f7f2..ccc26758d9 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$layout.smali b/com.discord/smali/androidx/core/R$layout.smali
index e04fe85217..44dfa8faca 100644
--- a/com.discord/smali/androidx/core/R$layout.smali
+++ b/com.discord/smali/androidx/core/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index f28ca09032..01621d2640 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$styleable.smali b/com.discord/smali/androidx/core/R$styleable.smali
index e1791b47a0..0e162fd0db 100644
--- a/com.discord/smali/androidx/core/R$styleable.smali
+++ b/com.discord/smali/androidx/core/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 d69c12daea..8385c32bb2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7a93779347..114b97c39e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6247abc4b1..188a58f0b3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 efad5cdcb9..6853acf2d6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9301bb1d28..6e70392785 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 93fe57a469..8fa5c09c79 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/ktx/R$attr.smali b/com.discord/smali/androidx/core/ktx/R$attr.smali
index 82a299e557..2f74bdeeb2 100644
--- a/com.discord/smali/androidx/core/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/core/ktx/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # 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 fbf28358ac..cd4b019859 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # 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 5f23e506b8..14fc48ebf9 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # 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 0eeef03b06..c438c322fa 100644
--- a/com.discord/smali/androidx/core/ktx/R$id.smali
+++ b/com.discord/smali/androidx/core/ktx/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # 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 7297852a9d..0c9071f1c7 100644
--- a/com.discord/smali/androidx/core/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/core/ktx/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # 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 b95945f4aa..713b3c0dfa 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 1e667f532d..043d9aa2cb 100644
--- a/com.discord/smali/androidx/core/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
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 5f61212705..83daa913b0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2adfb35438..333559bb73 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 295aa7371c..72515d5d1f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c71d9a3280..dd792a1608 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 18b2242531..77bd473950 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/util/AtomicFileKt.smali b/com.discord/smali/androidx/core/util/AtomicFileKt.smali
index cef72ccd36..6dd59d8569 100644
--- a/com.discord/smali/androidx/core/util/AtomicFileKt.smali
+++ b/com.discord/smali/androidx/core/util/AtomicFileKt.smali
@@ -55,7 +55,7 @@
 
     if-eqz p2, :cond_0
 
-    sget-object p1, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sget-object p1, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     :cond_0
     invoke-static {p0, p1}, Landroidx/core/util/AtomicFileKt;->readText(Landroid/util/AtomicFile;Ljava/nio/charset/Charset;)Ljava/lang/String;
@@ -193,7 +193,7 @@
 
     if-eqz p3, :cond_0
 
-    sget-object p2, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sget-object p2, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     :cond_0
     invoke-static {p0, p1, p2}, Landroidx/core/util/AtomicFileKt;->writeText(Landroid/util/AtomicFile;Ljava/lang/String;Ljava/nio/charset/Charset;)V
diff --git a/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali b/com.discord/smali/androidx/core/util/LruCacheKt$lruCache$3.smali
index 7eadd975e1..590a912eee 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
index 41d21fc728..d900cbd612 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$1.smali
@@ -84,7 +84,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroidx/core/widget/TextViewKt$addTextChangedListener$1;->invoke(Ljava/lang/CharSequence;III)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
index c739b8b669..1b1e71f230 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$2.smali
@@ -84,7 +84,7 @@
 
     invoke-virtual {p0, p1, p2, p3, p4}, Landroidx/core/widget/TextViewKt$addTextChangedListener$2;->invoke(Ljava/lang/CharSequence;III)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
index 568964db15..898f69f733 100644
--- a/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
+++ b/com.discord/smali/androidx/core/widget/TextViewKt$addTextChangedListener$3.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Landroidx/core/widget/TextViewKt$addTextChangedListener$3;->invoke(Landroid/text/Editable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/customview/R$attr.smali b/com.discord/smali/androidx/customview/R$attr.smali
index 87c729e2d7..c7ee944be8 100644
--- a/com.discord/smali/androidx/customview/R$attr.smali
+++ b/com.discord/smali/androidx/customview/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$color.smali b/com.discord/smali/androidx/customview/R$color.smali
index 8ed604bc51..d460c1f268 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 2273ef2587..7a83a65383 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index e0692e1f93..2b08742e00 100644
--- a/com.discord/smali/androidx/customview/R$id.smali
+++ b/com.discord/smali/androidx/customview/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$layout.smali b/com.discord/smali/androidx/customview/R$layout.smali
index 5adca7efbc..105da98ca3 100644
--- a/com.discord/smali/androidx/customview/R$layout.smali
+++ b/com.discord/smali/androidx/customview/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index f7d38ed5f0..12062164db 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$styleable.smali b/com.discord/smali/androidx/customview/R$styleable.smali
index f90baad35f..8c6b8aea15 100644
--- a/com.discord/smali/androidx/customview/R$styleable.smali
+++ b/com.discord/smali/androidx/customview/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/drawerlayout/R$attr.smali b/com.discord/smali/androidx/drawerlayout/R$attr.smali
index faf5b4704b..b3adf9a821 100644
--- a/com.discord/smali/androidx/drawerlayout/R$attr.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$attr.smali
@@ -41,7 +41,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$color.smali b/com.discord/smali/androidx/drawerlayout/R$color.smali
index 0acf96ef17..4f473c981b 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index fc05c4882f..bc95aa461a 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index cf190464e3..6ee56f2ade 100644
--- a/com.discord/smali/androidx/drawerlayout/R$id.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$layout.smali b/com.discord/smali/androidx/drawerlayout/R$layout.smali
index 6305a60359..a4ea32c220 100644
--- a/com.discord/smali/androidx/drawerlayout/R$layout.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index 31d8ff8b36..cb9e6b87df 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$styleable.smali b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
index c80714ff97..e549b080e9 100644
--- a/com.discord/smali/androidx/drawerlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
@@ -182,7 +182,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/dynamicanimation/R$attr.smali b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
index af59e2354c..f38d53eda5 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$attr.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$color.smali b/com.discord/smali/androidx/dynamicanimation/R$color.smali
index eb8e8b4bbd..0e03438eb3 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index fbe741ee3a..fb98e8584f 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index ba089102ac..057d22fa2b 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$layout.smali b/com.discord/smali/androidx/dynamicanimation/R$layout.smali
index f8b895d75f..595858b6d6 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$layout.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index eb5e64cea4..b6d7e75578 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
index 72461a5ac4..09ae5ba570 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 a4f5b81e39..9899d58d3e 100644
--- a/com.discord/smali/androidx/fragment/R$attr.smali
+++ b/com.discord/smali/androidx/fragment/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$color.smali b/com.discord/smali/androidx/fragment/R$color.smali
index 374fea0ea5..0afeae4139 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 2ba0e3cb6e..86ae190474 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index 03cbd6502b..2dfb894c65 100644
--- a/com.discord/smali/androidx/fragment/R$id.smali
+++ b/com.discord/smali/androidx/fragment/R$id.smali
@@ -91,63 +91,63 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$layout.smali b/com.discord/smali/androidx/fragment/R$layout.smali
index 5c4726b218..4cf93a16f2 100644
--- a/com.discord/smali/androidx/fragment/R$layout.smali
+++ b/com.discord/smali/androidx/fragment/R$layout.smali
@@ -15,19 +15,19 @@
 
 
 # static fields
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 73f2dcd7b4..9fb3c262e7 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$styleable.smali b/com.discord/smali/androidx/fragment/R$styleable.smali
index 851c374394..88fcd55718 100644
--- a/com.discord/smali/androidx/fragment/R$styleable.smali
+++ b/com.discord/smali/androidx/fragment/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
index 18d8b704ea..b56925fde3 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
@@ -53,9 +53,9 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # 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 16f7a7edf0..3356f42c60 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # 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 2aee23db73..20149986bf 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # 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 c63b1308fc..8eb2bd065b 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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 chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
 
 # 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 ab149832bc..7da8b8e071 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # 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 be09cfd315..7fb240e3f4 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 524c9c8e09..7d1027cfc8 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
@@ -184,7 +184,7 @@
     :array_1
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_2
@@ -219,7 +219,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 14f13a1932..1151e95d6d 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # 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 c0f1e86fc1..eb2da11d43 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # 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 ddfb28516f..24e2b9200e 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # 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 ef5b73d323..be25b13571 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # 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 e08164e18b..ebb09b8ba4 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # 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 ddd5fbc270..b4d718576b 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 9e5c5f0167..4c25ba7ac1 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
index d60b8a82fe..8fabc8eb41 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
@@ -53,9 +53,9 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # 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 61fc8b367f..cc4d8228f5 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # 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 8e8aaa230d..6234358e6f 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # 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 5eb95c4f9c..ffc256c3e1 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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 chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
 
 # 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 cba3f856bf..76eece9485 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # 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 795c9a20b5..ce47f1d6f1 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 677b646552..1d41e752e1 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
@@ -184,7 +184,7 @@
     :array_1
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_2
@@ -219,7 +219,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 fd11cb47f7..916a6708a5 100644
--- a/com.discord/smali/androidx/loader/R$attr.smali
+++ b/com.discord/smali/androidx/loader/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$color.smali b/com.discord/smali/androidx/loader/R$color.smali
index 2fad83c3e0..0e7392eca5 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index a662ef496b..e37ed42a4f 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index 2ac2c3783e..ae12015ad9 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$layout.smali b/com.discord/smali/androidx/loader/R$layout.smali
index 491b08c183..c344b1cab3 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index fa2e89e43e..fd17058421 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$styleable.smali b/com.discord/smali/androidx/loader/R$styleable.smali
index ae1ca01b8c..ae43dc9dc2 100644
--- a/com.discord/smali/androidx/loader/R$styleable.smali
+++ b/com.discord/smali/androidx/loader/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 5be261700c..4b52e49c3f 100644
--- a/com.discord/smali/androidx/recyclerview/R$attr.smali
+++ b/com.discord/smali/androidx/recyclerview/R$attr.smali
@@ -65,15 +65,15 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final reverseLayout:I = 0x7f0402d6
+.field public static final reverseLayout:I = 0x7f0402d7
 
-.field public static final spanCount:I = 0x7f04030d
+.field public static final spanCount:I = 0x7f04030e
 
-.field public static final stackFromEnd:I = 0x7f040313
+.field public static final stackFromEnd:I = 0x7f040314
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$color.smali b/com.discord/smali/androidx/recyclerview/R$color.smali
index a3cf0aea8c..4d787fe4ad 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 0ec8c444e7..c9ac59dc42 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index 88a52961a8..d413496588 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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 chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0405
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$layout.smali b/com.discord/smali/androidx/recyclerview/R$layout.smali
index aea2937470..3fcf10e2e1 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index f7973a028b..7946f999f1 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali
index 61dfd5b302..646d3fd486 100644
--- a/com.discord/smali/androidx/recyclerview/R$styleable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$styleable.smali
@@ -218,7 +218,7 @@
     :array_1
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_2
@@ -253,7 +253,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_5
@@ -288,9 +288,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .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 ef9edca95d..308609b106 100644
--- a/com.discord/smali/androidx/room/R$attr.smali
+++ b/com.discord/smali/androidx/room/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$color.smali b/com.discord/smali/androidx/room/R$color.smali
index f72cc1a61f..49febdfa64 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index f5b4ef361a..adbb381081 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$id.smali b/com.discord/smali/androidx/room/R$id.smali
index 420694ad90..f7bef689b0 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$layout.smali b/com.discord/smali/androidx/room/R$layout.smali
index 6ad1ce6ad6..e512ea0f6d 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index 942ef7555d..c961e86945 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$styleable.smali b/com.discord/smali/androidx/room/R$styleable.smali
index 955d4c7e56..5f8bec3990 100644
--- a/com.discord/smali/androidx/room/R$styleable.smali
+++ b/com.discord/smali/androidx/room/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 fffad2dfc4..b38091274a 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$color.smali b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
index 65c18e2a8c..e8aee617e4 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 2eaf656365..feeb406efd 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index d7b9128499..343824c6ba 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
index dc58a8593f..9e95a05736 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index 94155a8baf..a89d5e3d46 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
index 3528320596..869f5d7195 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 767f09e3ea..4931faab85 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
index b7a9e8ba72..78f4be5ead 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 10c00d5dab..0f1e8b2ff7 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index b1237f5904..1b4836d0f5 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
index 28ca0a384d..3aff7c090f 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 9b3bbe58ce..5e6755a209 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
index 346f5ee1a1..89ac54cc36 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 1dec68b0f6..57eb12ac20 100644
--- a/com.discord/smali/androidx/transition/R$attr.smali
+++ b/com.discord/smali/androidx/transition/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$color.smali b/com.discord/smali/androidx/transition/R$color.smali
index a480e1c78b..f300601435 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index f2c6c303b9..c4b4a9401c 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index a9a2f822c1..41c05b6127 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final ghost_view:I = 0x7f0a0312
+.field public static final ghost_view:I = 0x7f0a0316
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final parent_matrix:I = 0x7f0a04d9
+.field public static final parent_matrix:I = 0x7f0a04e3
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final save_image_matrix:I = 0x7f0a05a3
+.field public static final save_image_matrix:I = 0x7f0a05b8
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05a4
+.field public static final save_non_transition_alpha:I = 0x7f0a05b9
 
-.field public static final save_scale_type:I = 0x7f0a05a5
+.field public static final save_scale_type:I = 0x7f0a05ba
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final transition_current_scene:I = 0x7f0a0765
+.field public static final transition_current_scene:I = 0x7f0a0789
 
-.field public static final transition_layout_save:I = 0x7f0a0766
+.field public static final transition_layout_save:I = 0x7f0a078a
 
-.field public static final transition_position:I = 0x7f0a0767
+.field public static final transition_position:I = 0x7f0a078b
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0768
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
 
-.field public static final transition_transform:I = 0x7f0a0769
+.field public static final transition_transform:I = 0x7f0a078d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$layout.smali b/com.discord/smali/androidx/transition/R$layout.smali
index 7268f6c618..e9f0a37306 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 5da3863ba5..d3b19629bb 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$styleable.smali b/com.discord/smali/androidx/transition/R$styleable.smali
index efaca74500..619d595708 100644
--- a/com.discord/smali/androidx/transition/R$styleable.smali
+++ b/com.discord/smali/androidx/transition/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 4cb7a09acb..05502fcf0b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali
@@ -53,9 +53,9 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$color.smali b/com.discord/smali/androidx/vectordrawable/R$color.smali
index 132c364527..212f601d3f 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 824ed73458..343d924b22 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index 907b4c4c4d..4bea355eac 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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 chronometer:I = 0x7f0a0215
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$layout.smali b/com.discord/smali/androidx/vectordrawable/R$layout.smali
index ef67ecc8ab..f230baa753 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index adf82c2d68..1b8bf5c7c0 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
index 27ef8a9c67..ac24152aa1 100644
--- a/com.discord/smali/androidx/vectordrawable/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
@@ -184,7 +184,7 @@
     :array_1
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_2
@@ -219,7 +219,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 2bb404f004..980406ebfe 100644
--- a/com.discord/smali/androidx/viewpager/R$attr.smali
+++ b/com.discord/smali/androidx/viewpager/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$color.smali b/com.discord/smali/androidx/viewpager/R$color.smali
index aa174b891e..4ac72b7939 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 0aaf93c713..45f631e3b8 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index 320e6f8459..98ef9fb1b5 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 = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$layout.smali b/com.discord/smali/androidx/viewpager/R$layout.smali
index fc73ed7a17..292f94a3d6 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 21848c50c9..58b561ade7 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$styleable.smali b/com.discord/smali/androidx/viewpager/R$styleable.smali
index af55fdfb18..6f4feb5a45 100644
--- a/com.discord/smali/androidx/viewpager/R$styleable.smali
+++ b/com.discord/smali/androidx/viewpager/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .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 528843083d..b8da2d0bee 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$startWork$1.smali
@@ -107,7 +107,7 @@
 
     check-cast p1, Landroidx/work/CoroutineWorker$startWork$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Landroidx/work/CoroutineWorker$startWork$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -198,7 +198,7 @@
     invoke-virtual {v0, p1}, Landroidx/work/impl/utils/futures/SettableFuture;->setException(Ljava/lang/Throwable;)Z
 
     :goto_2
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/androidx/work/CoroutineWorker.smali b/com.discord/smali/androidx/work/CoroutineWorker.smali
index 627a872e1e..d3da99aba0 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker.smali
@@ -77,7 +77,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/as;->DC()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object p1
 
@@ -182,7 +182,7 @@
 
     new-instance v1, Lkotlinx/coroutines/internal/f;
 
-    sget-object v2, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v2, Lkotlinx/coroutines/Job;->bkC: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 e7466407ef..dfc7ec5eda 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;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali b/com.discord/smali/androidx/work/ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
index 88787d9d1c..6e984de09a 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;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
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 d60869cbc9..861e656b79 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;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali b/com.discord/smali/androidx/work/OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$2.smali
index 23ec331b13..3821bd1e14 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;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -91,7 +91,7 @@
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali/androidx/work/R$attr.smali b/com.discord/smali/androidx/work/R$attr.smali
index 190915221f..5cd2ca0f15 100644
--- a/com.discord/smali/androidx/work/R$attr.smali
+++ b/com.discord/smali/androidx/work/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$color.smali b/com.discord/smali/androidx/work/R$color.smali
index b7944980ff..684d354b2a 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index 06bc1fb6cb..f4b16dbe18 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index 172fc6d1c9..18a3ebc78a 100644
--- a/com.discord/smali/androidx/work/R$id.smali
+++ b/com.discord/smali/androidx/work/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$layout.smali b/com.discord/smali/androidx/work/R$layout.smali
index f58a307d6e..693cd5d944 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index 698edcb6f2..fed7ebb1ab 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$styleable.smali b/com.discord/smali/androidx/work/R$styleable.smali
index a1a1f75d7b..64c9f274e3 100644
--- a/com.discord/smali/androidx/work/R$styleable.smali
+++ b/com.discord/smali/androidx/work/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/androidx/work/ktx/R$attr.smali b/com.discord/smali/androidx/work/ktx/R$attr.smali
index 5e819af75f..512a2d78b9 100644
--- a/com.discord/smali/androidx/work/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/work/ktx/R$attr.smali
@@ -37,7 +37,7 @@
 
 .field public static final fontWeight:I = 0x7f04014e
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
 
 # 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 ad6ab1fb2c..a37a80a3ca 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 = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.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 = 0x7f0600fb
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
 
 # 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 0212d6b76d..39fa31354b 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
 
 # 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 cd1241778f..9b111c9d24 100644
--- a/com.discord/smali/androidx/work/ktx/R$id.smali
+++ b/com.discord/smali/androidx/work/ktx/R$id.smali
@@ -25,51 +25,51 @@
 
 .field public static final actions:I = 0x7f0a0042
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
 
 # 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 48754a6242..3f795dbc5a 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
 
 # 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 faa41b7f7b..d9d2525167 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 = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 38dcfb8587..b3c04bd49c 100644
--- a/com.discord/smali/androidx/work/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$styleable.smali
@@ -168,7 +168,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_3
diff --git a/com.discord/smali/b/a$a.smali b/com.discord/smali/b/a$a.smali
index 661a10a9ff..d90d0344e6 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 bDU:Lb/a$a;
+.field static final bEe:Lb/a$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$a;-><init>()V
 
-    sput-object v0, Lb/a$a;->bDU:Lb/a$a;
+    sput-object v0, Lb/a$a;->bEe: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 a8817c5173..d7776e44c6 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 bDV:Lb/a$b;
+.field static final bEf:Lb/a$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$b;-><init>()V
 
-    sput-object v0, Lb/a$b;->bDV:Lb/a$b;
+    sput-object v0, Lb/a$b;->bEf: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 d1e54a6f19..fa247cfd23 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 bDW:Lb/a$c;
+.field static final bEg:Lb/a$c;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$c;-><init>()V
 
-    sput-object v0, Lb/a$c;->bDW:Lb/a$c;
+    sput-object v0, Lb/a$c;->bEg: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 6beeb0019a..48fb9426d9 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 bDX:Lb/a$d;
+.field static final bEh:Lb/a$d;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$d;-><init>()V
 
-    sput-object v0, Lb/a$d;->bDX:Lb/a$d;
+    sput-object v0, Lb/a$d;->bEh: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 86c85119c1..f8d7ab8d1f 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 bDY:Lb/a$e;
+.field static final bEi:Lb/a$e;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0}, Lb/a$e;-><init>()V
 
-    sput-object v0, Lb/a$e;->bDY:Lb/a$e;
+    sput-object v0, Lb/a$e;->bEi:Lb/a$e;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/a.smali b/com.discord/smali/b/a.smali
index 8c700a5a7a..1342841bac 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;->bDW:Lb/a$c;
+    sget-object p1, Lb/a$c;->bEg:Lb/a$c;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lb/a$a;->bDU:Lb/a$a;
+    sget-object p1, Lb/a$a;->bEe:Lb/a$a;
 
     return-object p1
 
@@ -67,7 +67,7 @@
 
     if-ne p1, p2, :cond_2
 
-    sget-object p1, Lb/a$e;->bDY:Lb/a$e;
+    sget-object p1, Lb/a$e;->bEi:Lb/a$e;
 
     return-object p1
 
@@ -103,7 +103,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lb/a$b;->bDV:Lb/a$b;
+    sget-object p1, Lb/a$b;->bEf: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 0211e89aa4..82b0262913 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 bFn:Z
+.field private bFx: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;->bFn:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->bFx: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;->bFn:Z
+    iget-boolean v0, p0, Lb/a/a/a$a;->bFx: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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     return-void
 .end method
@@ -109,9 +109,9 @@
 
     check-cast p1, Lb/m;
 
-    iget-object v0, p1, Lb/m;->bEH:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bER:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response;->zd()Z
+    invoke-virtual {v0}, Lokhttp3/Response;->zg()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;->bEI:Ljava/lang/Object;
+    iget-object p1, p1, Lb/m;->bES: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;->bFn:Z
+    iput-boolean v0, p0, Lb/a/a/a$a;->bFx: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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()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 96ebfed8b8..3148b2b71b 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 bFm:Lrx/Observable$a;
+.field private final bFw: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;->bFm:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/a;->bFw:Lrx/Observable$a;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/a;->bFm:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/a;->bFw: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 86516e97a9..0facde3a11 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     return-void
 
     :catch_1
-    invoke-static {}, Lrx/c/f;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     return-void
 
     :catch_2
-    invoke-static {}, Lrx/c/f;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     goto :goto_0
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()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 0e8157d6cb..51f960366b 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 bFp:Lb/a/a/b;
+.field final synthetic bFA:Lb/a/a/c;
 
-.field final synthetic bFq:Lb/a/a/c;
+.field final synthetic bFz:Lb/a/a/b;
 
 
 # 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;->bFq:Lb/a/a/c;
+    iput-object p1, p0, Lb/a/a/c$1;->bFA:Lb/a/a/c;
 
-    iput-object p2, p0, Lb/a/a/c$1;->bFp:Lb/a/a/b;
+    iput-object p2, p0, Lb/a/a/c$1;->bFz: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;->bFp:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->bFz: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;->bFp:Lb/a/a/b;
+    iget-object v0, p0, Lb/a/a/c$1;->bFz: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 f7274bc45b..1300aeb674 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 bFo:Lb/b;
+.field private final bFy: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;->bFo:Lb/b;
+    iput-object p1, p0, Lb/a/a/c;->bFy:Lb/b;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/c;->bFo:Lb/b;
+    iget-object v0, p0, Lb/a/a/c;->bFy:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Io()Lb/b;
+    invoke-interface {v0}, Lb/b;->Ir()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 1881c34fcf..f9094d9cb8 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 bFo:Lb/b;
+.field private final bFy: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;->bFo:Lb/b;
+    iput-object p1, p0, Lb/a/a/d;->bFy:Lb/b;
 
     return-void
 .end method
@@ -56,9 +56,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/d;->bFo:Lb/b;
+    iget-object v0, p0, Lb/a/a/d;->bFy:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->Io()Lb/b;
+    invoke-interface {v0}, Lb/b;->Ir()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;->In()Lb/m;
+    invoke-interface {v0}, Lb/b;->Iq()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 86af607126..93a6f64e1b 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/b;
 
     return-void
 
     :catch_0
-    invoke-static {}, Lrx/c/f;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()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 18ef34bdb8..6efb8bcf2b 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 bFm:Lrx/Observable$a;
+.field private final bFw: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;->bFm:Lrx/Observable$a;
+    iput-object p1, p0, Lb/a/a/g;->bFw:Lrx/Observable$a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lb/a/a/g;->bFm:Lrx/Observable$a;
+    iget-object v0, p0, Lb/a/a/g;->bFw: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 234508df35..df465ca9d9 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 bFe:Ljava/lang/reflect/Type;
+.field private final bFB:Z
 
-.field private final bFr:Z
+.field private final bFC:Z
 
-.field private final bFs:Z
+.field private final bFD:Z
 
-.field private final bFt:Z
+.field private final bFE:Z
 
-.field private final bFu:Z
+.field private final bFF:Z
 
-.field private final bFv:Z
+.field private final bFo:Ljava/lang/reflect/Type;
 
 .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;->bFe:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/a/a/h;->bFo:Ljava/lang/reflect/Type;
 
     iput-object p2, p0, Lb/a/a/h;->scheduler:Lrx/Scheduler;
 
-    iput-boolean p3, p0, Lb/a/a/h;->bFr:Z
+    iput-boolean p3, p0, Lb/a/a/h;->bFB:Z
 
-    iput-boolean p4, p0, Lb/a/a/h;->bFs:Z
+    iput-boolean p4, p0, Lb/a/a/h;->bFC:Z
 
-    iput-boolean p5, p0, Lb/a/a/h;->bFt:Z
+    iput-boolean p5, p0, Lb/a/a/h;->bFD:Z
 
-    iput-boolean p6, p0, Lb/a/a/h;->bFu:Z
+    iput-boolean p6, p0, Lb/a/a/h;->bFE:Z
 
-    iput-boolean p7, p0, Lb/a/a/h;->bFv:Z
+    iput-boolean p7, p0, Lb/a/a/h;->bFF:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ip()Ljava/lang/reflect/Type;
+.method public final Is()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/a/a/h;->bFe:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/a/a/h;->bFo:Ljava/lang/reflect/Type;
 
     return-object v0
 .end method
@@ -88,7 +88,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lb/a/a/h;->bFr:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bFB: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;->bFs:Z
+    iget-boolean p1, p0, Lb/a/a/h;->bFC:Z
 
     if-eqz p1, :cond_1
 
@@ -115,7 +115,7 @@
     goto :goto_1
 
     :cond_1
-    iget-boolean p1, p0, Lb/a/a/h;->bFt:Z
+    iget-boolean p1, p0, Lb/a/a/h;->bFD:Z
 
     if-eqz p1, :cond_2
 
@@ -142,18 +142,18 @@
     move-result-object p1
 
     :cond_3
-    iget-boolean v0, p0, Lb/a/a/h;->bFu:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bFE:Z
 
     if-eqz v0, :cond_4
 
-    invoke-virtual {p1}, Lrx/Observable;->IO()Lrx/f;
+    invoke-virtual {p1}, Lrx/Observable;->IR()Lrx/f;
 
     move-result-object p1
 
     return-object p1
 
     :cond_4
-    iget-boolean v0, p0, Lb/a/a/h;->bFv:Z
+    iget-boolean v0, p0, Lb/a/a/h;->bFF: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 325801f039..3cf75b9e23 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 bFr:Z
+.field private final bFB: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;->bFr:Z
+    iput-boolean v0, p0, Lb/a/a/i;->bFB:Z
 
     return-void
 .end method
 
-.method public static IC()Lb/a/a/i;
+.method public static IF()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;->bFr:Z
+    iget-boolean v3, p0, Lb/a/a/i;->bFB: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;->bFr:Z
+    iget-boolean v7, p0, Lb/a/a/i;->bFB:Z
 
     const/4 v11, 0x0
 
diff --git a/com.discord/smali/b/b.smali b/com.discord/smali/b/b.smali
index 3a80d352e9..e88ce1b14f 100644
--- a/com.discord/smali/b/b.smali
+++ b/com.discord/smali/b/b.smali
@@ -19,7 +19,7 @@
 
 
 # virtual methods
-.method public abstract In()Lb/m;
+.method public abstract Iq()Lb/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -35,7 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Io()Lb/b;
+.method public abstract Ir()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 51a41e356d..676f09e8f3 100644
--- a/com.discord/smali/b/b/a/b.smali
+++ b/com.discord/smali/b/b/a/b.smali
@@ -22,13 +22,13 @@
 
 
 # static fields
-.field private static final bFw:Lokhttp3/MediaType;
+.field private static final bFG:Lokhttp3/MediaType;
 
-.field private static final tx:Ljava/nio/charset/Charset;
+.field private static final tw:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final bFx:Lcom/google/gson/TypeAdapter;
+.field private final bFH:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -50,7 +50,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/b/a/b;->bFw:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/a/b;->bFG:Lokhttp3/MediaType;
 
     const-string v0, "UTF-8"
 
@@ -58,7 +58,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/b/a/b;->tx:Ljava/nio/charset/Charset;
+    sput-object v0, Lb/b/a/b;->tw:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -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;->bFx:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/b;->bFH:Lcom/google/gson/TypeAdapter;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     invoke-direct {v2, v0}, Lokio/c$1;-><init>(Lokio/c;)V
 
-    sget-object v3, Lb/b/a/b;->tx:Ljava/nio/charset/Charset;
+    sget-object v3, Lb/b/a/b;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v1, v2, v3}, Ljava/io/OutputStreamWriter;-><init>(Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V
 
@@ -113,15 +113,15 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/b/a/b;->bFx:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lb/b/a/b;->bFH: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;->bFw:Lokhttp3/MediaType;
+    sget-object p1, Lb/b/a/b;->bFG:Lokhttp3/MediaType;
 
-    invoke-virtual {v0}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Gs()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 3e88556fd1..693ad27242 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 bFx:Lcom/google/gson/TypeAdapter;
+.field private final bFH: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;->bFx:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lb/b/a/c;->bFH: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;->bsz:Ljava/io/Reader;
+    iget-object v1, p1, Lokhttp3/x;->bsJ:Ljava/io/Reader;
 
     if-eqz v1, :cond_0
 
@@ -81,17 +81,17 @@
     :cond_0
     new-instance v1, Lokhttp3/x$a;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {p1}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lokhttp3/x;->FP()Ljava/nio/charset/Charset;
+    invoke-virtual {p1}, Lokhttp3/x;->FS()Ljava/nio/charset/Charset;
 
     move-result-object v3
 
     invoke-direct {v1, v2, v3}, Lokhttp3/x$a;-><init>(Lokio/d;Ljava/nio/charset/Charset;)V
 
-    iput-object v1, p1, Lokhttp3/x;->bsz:Ljava/io/Reader;
+    iput-object v1, p1, Lokhttp3/x;->bsJ: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;->bFx:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lb/b/a/c;->bFH: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 07bc7580d9..47e43869df 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 bFw:Lokhttp3/MediaType;
+.field private static final bFG:Lokhttp3/MediaType;
 
-.field static final bFy:Lb/b/b/a;
+.field static final bFI:Lb/b/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/b/b/a<",
@@ -43,7 +43,7 @@
 
     invoke-direct {v0}, Lb/b/b/a;-><init>()V
 
-    sput-object v0, Lb/b/b/a;->bFy:Lb/b/b/a;
+    sput-object v0, Lb/b/b/a;->bFI:Lb/b/b/a;
 
     const-string v0, "text/plain; charset=UTF-8"
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/b/b/a;->bFw:Lokhttp3/MediaType;
+    sput-object v0, Lb/b/b/a;->bFG:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/b/b/a;->bFw:Lokhttp3/MediaType;
+    sget-object v0, Lb/b/b/a;->bFG: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 c27dcdbc76..a7f66d9ba6 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 bFz:Lb/b/b/b$a;
+.field static final bFJ: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;->bFz:Lb/b/b/b$a;
+    sput-object v0, Lb/b/b/b$a;->bFJ:Lb/b/b/b$a;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 9832583b41..86838472a0 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 bFA:Lb/b/b/b$b;
+.field static final bFK: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;->bFA:Lb/b/b/b$b;
+    sput-object v0, Lb/b/b/b$b;->bFK:Lb/b/b/b$b;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 caef2f5438..ae01f2663d 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 bFB:Lb/b/b/b$c;
+.field static final bFL: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;->bFB:Lb/b/b/b$c;
+    sput-object v0, Lb/b/b/b$c;->bFL:Lb/b/b/b$c;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 2e05f7a72f..5cb6d74646 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 bFC:Lb/b/b/b$d;
+.field static final bFM: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;->bFC:Lb/b/b/b$d;
+    sput-object v0, Lb/b/b/b$d;->bFM:Lb/b/b/b$d;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 386d35719c..3eda24cbb5 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 bFD:Lb/b/b/b$e;
+.field static final bFN: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;->bFD:Lb/b/b/b$e;
+    sput-object v0, Lb/b/b/b$e;->bFN:Lb/b/b/b$e;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 55a369a745..08e31ac37d 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 bFE:Lb/b/b/b$f;
+.field static final bFO: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;->bFE:Lb/b/b/b$f;
+    sput-object v0, Lb/b/b/b$f;->bFO:Lb/b/b/b$f;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 866a0b0caa..42db6d6a7c 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 bFF:Lb/b/b/b$g;
+.field static final bFP: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;->bFF:Lb/b/b/b$g;
+    sput-object v0, Lb/b/b/b$g;->bFP:Lb/b/b/b$g;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 9727a414f2..86dd87c81f 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 bFG:Lb/b/b/b$h;
+.field static final bFQ: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;->bFG:Lb/b/b/b$h;
+    sput-object v0, Lb/b/b/b$h;->bFQ:Lb/b/b/b$h;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 dbb7e99866..58c0a5e766 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 bFH:Lb/b/b/b$i;
+.field static final bFR: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;->bFH:Lb/b/b/b$i;
+    sput-object v0, Lb/b/b/b$i;->bFR:Lb/b/b/b$i;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     check-cast p1, Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/x;->FR()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 98d2cfcca9..3cbc301f85 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 ID()Lb/b/b/c;
+.method public static IG()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;->bFH:Lb/b/b/b$i;
+    sget-object p1, Lb/b/b/b$i;->bFR:Lb/b/b/b$i;
 
     return-object p1
 
@@ -142,49 +142,49 @@
 
     :cond_9
     :goto_0
-    sget-object p1, Lb/b/b/b$h;->bFG:Lb/b/b/b$h;
+    sget-object p1, Lb/b/b/b$h;->bFQ:Lb/b/b/b$h;
 
     return-object p1
 
     :cond_a
     :goto_1
-    sget-object p1, Lb/b/b/b$g;->bFF:Lb/b/b/b$g;
+    sget-object p1, Lb/b/b/b$g;->bFP:Lb/b/b/b$g;
 
     return-object p1
 
     :cond_b
     :goto_2
-    sget-object p1, Lb/b/b/b$f;->bFE:Lb/b/b/b$f;
+    sget-object p1, Lb/b/b/b$f;->bFO:Lb/b/b/b$f;
 
     return-object p1
 
     :cond_c
     :goto_3
-    sget-object p1, Lb/b/b/b$e;->bFD:Lb/b/b/b$e;
+    sget-object p1, Lb/b/b/b$e;->bFN:Lb/b/b/b$e;
 
     return-object p1
 
     :cond_d
     :goto_4
-    sget-object p1, Lb/b/b/b$d;->bFC:Lb/b/b/b$d;
+    sget-object p1, Lb/b/b/b$d;->bFM:Lb/b/b/b$d;
 
     return-object p1
 
     :cond_e
     :goto_5
-    sget-object p1, Lb/b/b/b$c;->bFB:Lb/b/b/b$c;
+    sget-object p1, Lb/b/b/b$c;->bFL:Lb/b/b/b$c;
 
     return-object p1
 
     :cond_f
     :goto_6
-    sget-object p1, Lb/b/b/b$b;->bFA:Lb/b/b/b$b;
+    sget-object p1, Lb/b/b/b$b;->bFK:Lb/b/b/b$b;
 
     return-object p1
 
     :cond_10
     :goto_7
-    sget-object p1, Lb/b/b/b$a;->bFz:Lb/b/b/b$a;
+    sget-object p1, Lb/b/b/b$a;->bFJ: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;->bFy:Lb/b/b/a;
+    sget-object p1, Lb/b/b/a;->bFI: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 23918f1a52..e6a4b60326 100644
--- a/com.discord/smali/b/c.smali
+++ b/com.discord/smali/b/c.smali
@@ -23,7 +23,7 @@
 
 
 # virtual methods
-.method public abstract Ip()Ljava/lang/reflect/Type;
+.method public abstract Is()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 7299d21418..a153a6adeb 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;
-        IE = false
+        IH = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract IE()Z
+.method public abstract IH()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 f835fe5f18..48ba17e091 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;
-        IE = false
+        IH = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IE()Z
+.method public abstract IH()Z
 .end method
diff --git a/com.discord/smali/b/c/h.smali b/com.discord/smali/b/c/h.smali
index e07276a306..902e50111c 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;
-        IF = ""
-        IG = false
+        II = ""
+        IJ = false
     .end subannotation
 .end annotation
 
@@ -29,11 +29,11 @@
 
 
 # virtual methods
-.method public abstract FH()Ljava/lang/String;
+.method public abstract FK()Ljava/lang/String;
 .end method
 
-.method public abstract IF()Ljava/lang/String;
+.method public abstract II()Ljava/lang/String;
 .end method
 
-.method public abstract IG()Z
+.method public abstract IJ()Z
 .end method
diff --git a/com.discord/smali/b/c/q.smali b/com.discord/smali/b/c/q.smali
index b39ac110d8..544450f787 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;
-        IH = "binary"
+        IK = "binary"
         value = ""
     .end subannotation
 .end annotation
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract IH()Ljava/lang/String;
+.method public abstract IK()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 09dc1f9975..7cf0099603 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;
-        IH = "binary"
+        IK = "binary"
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IH()Ljava/lang/String;
+.method public abstract IK()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/b/c/s.smali b/com.discord/smali/b/c/s.smali
index 7edb5cb9f3..8fa0aeec49 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;
-        IE = false
+        IH = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract IE()Z
+.method public abstract IH()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 5aa76145d9..a6030ecd7f 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;
-        IE = false
+        IH = false
     .end subannotation
 .end annotation
 
@@ -28,7 +28,7 @@
 
 
 # virtual methods
-.method public abstract IE()Z
+.method public abstract IH()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 a2855a10d1..83cfe70a67 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;
-        IE = false
+        IH = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IE()Z
+.method public abstract IH()Z
 .end method
diff --git a/com.discord/smali/b/c/v.smali b/com.discord/smali/b/c/v.smali
index 99ca09f952..7727c4f71a 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;
-        IE = false
+        IH = false
     .end subannotation
 .end annotation
 
@@ -28,5 +28,5 @@
 
 
 # virtual methods
-.method public abstract IE()Z
+.method public abstract IH()Z
 .end method
diff --git a/com.discord/smali/b/f$1.smali b/com.discord/smali/b/f$1.smali
index 6531676cb2..51c01496ba 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 bEa:Ljava/lang/reflect/Type;
+.field final synthetic bEk:Ljava/lang/reflect/Type;
 
-.field final synthetic bEb:Lb/f;
+.field final synthetic bEl:Lb/f;
 
 
 # direct methods
 .method constructor <init>(Lb/f;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/f$1;->bEb:Lb/f;
+    iput-object p1, p0, Lb/f$1;->bEl:Lb/f;
 
-    iput-object p2, p0, Lb/f$1;->bEa:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/f$1;->bEk:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,10 +48,10 @@
 
 
 # virtual methods
-.method public final Ip()Ljava/lang/reflect/Type;
+.method public final Is()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/f$1;->bEa:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/f$1;->bEk: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 55483a2b70..05f505aea4 100644
--- a/com.discord/smali/b/f.smali
+++ b/com.discord/smali/b/f.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final bDZ:Lb/c$a;
+.field static final bEj:Lb/c$a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lb/f;-><init>()V
 
-    sput-object v0, Lb/f;->bDZ:Lb/c$a;
+    sput-object v0, Lb/f;->bEj: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 d795093c1f..93f2d91196 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 bEa:Ljava/lang/reflect/Type;
+.field final synthetic bEk:Ljava/lang/reflect/Type;
 
-.field final synthetic bEd:Lb/g;
+.field final synthetic bEn:Lb/g;
 
 
 # direct methods
 .method constructor <init>(Lb/g;Ljava/lang/reflect/Type;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$1;->bEd:Lb/g;
+    iput-object p1, p0, Lb/g$1;->bEn:Lb/g;
 
-    iput-object p2, p0, Lb/g$1;->bEa:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lb/g$1;->bEk:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,10 +48,10 @@
 
 
 # virtual methods
-.method public final Ip()Ljava/lang/reflect/Type;
+.method public final Is()Ljava/lang/reflect/Type;
     .locals 1
 
-    iget-object v0, p0, Lb/g$1;->bEa:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lb/g$1;->bEk: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;->bEd:Lb/g;
+    iget-object v1, p0, Lb/g$1;->bEn:Lb/g;
 
-    iget-object v1, v1, Lb/g;->bEc:Ljava/util/concurrent/Executor;
+    iget-object v1, v1, Lb/g;->bEm: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 86b22c453f..5928f07351 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 bEh:Lb/m;
+.field final synthetic bEr:Lb/m;
 
-.field final synthetic bEi:Lb/g$a$1;
+.field final synthetic bEs: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;->bEi:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$1;->bEs:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$1;->bEh:Lb/m;
+    iput-object p2, p0, Lb/g$a$1$1;->bEr: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;->bEi:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bEs:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEg:Lb/g$a;
+    iget-object v0, v0, Lb/g$a$1;->bEq:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bEe:Lb/b;
+    iget-object v0, v0, Lb/g$a;->bEo: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;->bEi:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bEs:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEf:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bEp: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;->bEi:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$1;->bEs:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEf:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bEp:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$1;->bEh:Lb/m;
+    iget-object v1, p0, Lb/g$a$1$1;->bEr: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 928f8880e3..7b46a1c35e 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 bEi:Lb/g$a$1;
+.field final synthetic bEs:Lb/g$a$1;
 
-.field final synthetic bEj:Ljava/lang/Throwable;
+.field final synthetic bEt: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;->bEi:Lb/g$a$1;
+    iput-object p1, p0, Lb/g$a$1$2;->bEs:Lb/g$a$1;
 
-    iput-object p2, p0, Lb/g$a$1$2;->bEj:Ljava/lang/Throwable;
+    iput-object p2, p0, Lb/g$a$1$2;->bEt: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;->bEi:Lb/g$a$1;
+    iget-object v0, p0, Lb/g$a$1$2;->bEs:Lb/g$a$1;
 
-    iget-object v0, v0, Lb/g$a$1;->bEf:Lb/d;
+    iget-object v0, v0, Lb/g$a$1;->bEp:Lb/d;
 
-    iget-object v1, p0, Lb/g$a$1$2;->bEj:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/g$a$1$2;->bEt: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 684bd0abf1..0814470c51 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 bEf:Lb/d;
+.field final synthetic bEp:Lb/d;
 
-.field final synthetic bEg:Lb/g$a;
+.field final synthetic bEq:Lb/g$a;
 
 
 # direct methods
 .method constructor <init>(Lb/g$a;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/g$a$1;->bEg:Lb/g$a;
+    iput-object p1, p0, Lb/g$a$1;->bEq:Lb/g$a;
 
-    iput-object p2, p0, Lb/g$a$1;->bEf:Lb/d;
+    iput-object p2, p0, Lb/g$a$1;->bEp:Lb/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,9 +56,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a$1;->bEg:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->bEq:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bEc:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->bEm: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;->bEg:Lb/g$a;
+    iget-object v0, p0, Lb/g$a$1;->bEq:Lb/g$a;
 
-    iget-object v0, v0, Lb/g$a;->bEc:Ljava/util/concurrent/Executor;
+    iget-object v0, v0, Lb/g$a;->bEm: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 5e0ef1f2b8..eb71f1b635 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 bEc:Ljava/util/concurrent/Executor;
+.field final bEm:Ljava/util/concurrent/Executor;
 
-.field final bEe:Lb/b;
+.field final bEo: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;->bEc:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g$a;->bEm:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lb/g$a;->bEe:Lb/b;
+    iput-object p2, p0, Lb/g$a;->bEo:Lb/b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final In()Lb/m;
+.method public final Iq()Lb/m;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -80,16 +80,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/g$a;->bEe:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEo:Lb/b;
 
-    invoke-interface {v0}, Lb/b;->In()Lb/m;
+    invoke-interface {v0}, Lb/b;->Iq()Lb/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Io()Lb/b;
+.method public final Ir()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;->bEc:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lb/g$a;->bEm:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lb/g$a;->bEe:Lb/b;
+    iget-object v2, p0, Lb/g$a;->bEo:Lb/b;
 
-    invoke-interface {v2}, Lb/b;->Io()Lb/b;
+    invoke-interface {v2}, Lb/b;->Ir()Lb/b;
 
     move-result-object v2
 
@@ -128,7 +128,7 @@
 
     invoke-static {p1, v0}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lb/g$a;->bEe:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEo: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;->bEe:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEo:Lb/b;
 
     invoke-interface {v0}, Lb/b;->cancel()V
 
@@ -157,7 +157,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lb/g$a;->Io()Lb/b;
+    invoke-virtual {p0}, Lb/g$a;->Ir()Lb/b;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-object v0, p0, Lb/g$a;->bEe:Lb/b;
+    iget-object v0, p0, Lb/g$a;->bEo: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 dd5a6e3215..61013ca94f 100644
--- a/com.discord/smali/b/g.smali
+++ b/com.discord/smali/b/g.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field final bEc:Ljava/util/concurrent/Executor;
+.field final bEm:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {p0}, Lb/c$a;-><init>()V
 
-    iput-object p1, p0, Lb/g;->bEc:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lb/g;->bEm: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 b2ac10fc65..0f2956efa7 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;->bEH:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->bER: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;->bEH:Lokhttp3/Response;
+    iget-object v1, p1, Lb/m;->bER: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;->bEH:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bER:Lokhttp3/Response;
 
     iget v0, v0, Lokhttp3/Response;->code:I
 
     iput v0, p0, Lb/h;->code:I
 
-    iget-object v0, p1, Lb/m;->bEH:Lokhttp3/Response;
+    iget-object v0, p1, Lb/m;->bER:Lokhttp3/Response;
 
     iget-object v0, v0, Lokhttp3/Response;->message:Ljava/lang/String;
 
@@ -80,7 +80,7 @@
 
 
 # virtual methods
-.method public final CD()I
+.method public final CG()I
     .locals 1
 
     iget v0, p0, Lb/h;->code:I
@@ -88,7 +88,7 @@
     return v0
 .end method
 
-.method public final Iq()Lb/m;
+.method public final It()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 a7b9a9f210..e0a85591c6 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 bEf:Lb/d;
+.field final synthetic bEp:Lb/d;
 
-.field final synthetic bEo:Lb/i;
+.field final synthetic bEy:Lb/i;
 
 
 # direct methods
 .method constructor <init>(Lb/i;Lb/d;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$1;->bEo:Lb/i;
+    iput-object p1, p0, Lb/i$1;->bEy:Lb/i;
 
-    iput-object p2, p0, Lb/i$1;->bEf:Lb/d;
+    iput-object p2, p0, Lb/i$1;->bEp: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;->bEf:Lb/d;
+    iget-object v0, p0, Lb/i$1;->bEp: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;->bEo:Lb/i;
+    iget-object p1, p0, Lb/i$1;->bEy: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;->bEf:Lb/d;
+    iget-object p2, p0, Lb/i$1;->bEp: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;->bEf:Lb/d;
+    iget-object p2, p0, Lb/i$1;->bEp: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 3623035a49..9ca1bdaeed 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;->FN()Lokio/d;
+    value = Lb/i$a;->FQ()Lokio/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bEr:Lb/i$a;
+.field final synthetic bEB:Lb/i$a;
 
 
 # direct methods
 .method constructor <init>(Lb/i$a;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lb/i$a$1;->bEr:Lb/i$a;
+    iput-object p1, p0, Lb/i$a$1;->bEB: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;->bEr:Lb/i$a;
+    iget-object p2, p0, Lb/i$a$1;->bEB:Lb/i$a;
 
-    iput-object p1, p2, Lb/i$a;->bEq:Ljava/io/IOException;
+    iput-object p1, p2, Lb/i$a;->bEA: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 ba44ed11a5..a0f472aca1 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 bEp:Lokhttp3/x;
+.field bEA:Ljava/io/IOException;
 
-.field bEq:Ljava/io/IOException;
+.field private final bEz:Lokhttp3/x;
 
 
 # direct methods
@@ -26,21 +26,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lb/i$a;->bEp:Lokhttp3/x;
+    iput-object p1, p0, Lb/i$a;->bEz:Lokhttp3/x;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FN()Lokio/d;
+.method public final FQ()Lokio/d;
     .locals 2
 
     new-instance v0, Lb/i$a$1;
 
-    iget-object v1, p0, Lb/i$a;->bEp:Lokhttp3/x;
+    iget-object v1, p0, Lb/i$a;->bEz:Lokhttp3/x;
 
-    invoke-virtual {v1}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {v1}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v1
 
@@ -56,7 +56,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lb/i$a;->bEp:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bEz: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;->bEp:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bEz: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;->bEp:Lokhttp3/x;
+    iget-object v0, p0, Lb/i$a;->bEz: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 ba4bb812d0..bcfff195f5 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 bru:Lokhttp3/MediaType;
+.field private final brE: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;->bru:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/i$b;->brE:Lokhttp3/MediaType;
 
     iput-wide p2, p0, Lb/i$b;->contentLength:J
 
@@ -35,7 +35,7 @@
 
 
 # virtual methods
-.method public final FN()Lokio/d;
+.method public final FQ()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;->bru:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/i$b;->brE:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/i.smali b/com.discord/smali/b/i.smali
index 013920db67..20ca70c814 100644
--- a/com.discord/smali/b/i.smali
+++ b/com.discord/smali/b/i.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field private final bEk:Lb/o;
+.field private final bEu:Lb/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/o<",
@@ -36,24 +36,24 @@
     .end annotation
 .end field
 
-.field private final bEl:[Ljava/lang/Object;
+.field private final bEv:[Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEm:Lokhttp3/e;
+.field private bEw:Lokhttp3/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEn:Ljava/lang/Throwable;
+.field private bEx:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bsd:Z
+.field private bsn:Z
 
-.field private volatile bul:Z
+.field private volatile buv:Z
 
 
 # direct methods
@@ -75,14 +75,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/i;->bEk:Lb/o;
+    iput-object p1, p0, Lb/i;->bEu:Lb/o;
 
-    iput-object p2, p0, Lb/i;->bEl:[Ljava/lang/Object;
+    iput-object p2, p0, Lb/i;->bEv:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private Ir()Lb/i;
+.method private Iu()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;->bEk:Lb/o;
+    iget-object v1, p0, Lb/i;->bEu:Lb/o;
 
-    iget-object v2, p0, Lb/i;->bEl:[Ljava/lang/Object;
+    iget-object v2, p0, Lb/i;->bEv:[Ljava/lang/Object;
 
     invoke-direct {v0, v1, v2}, Lb/i;-><init>(Lb/o;[Ljava/lang/Object;)V
 
     return-object v0
 .end method
 
-.method private Is()Lokhttp3/e;
+.method private Iv()Lokhttp3/e;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -111,17 +111,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/i;->bEk:Lb/o;
+    iget-object v0, p0, Lb/i;->bEu:Lb/o;
 
-    iget-object v1, p0, Lb/i;->bEl:[Ljava/lang/Object;
+    iget-object v1, p0, Lb/i;->bEv:[Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Lb/o;->e([Ljava/lang/Object;)Lokhttp3/w;
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/i;->bEk:Lb/o;
+    iget-object v1, p0, Lb/i;->bEu:Lb/o;
 
-    iget-object v1, v1, Lb/o;->bEL:Lokhttp3/e$a;
+    iget-object v1, v1, Lb/o;->bEV:Lokhttp3/e$a;
 
     invoke-interface {v1, v0}, Lokhttp3/e$a;->a(Lokhttp3/w;)Lokhttp3/e;
 
@@ -143,7 +143,7 @@
 
 
 # virtual methods
-.method public final In()Lb/m;
+.method public final Iq()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;->bsd:Z
+    iget-boolean v0, p0, Lb/i;->bsn:Z
 
     if-nez v0, :cond_4
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->bsd:Z
+    iput-boolean v0, p0, Lb/i;->bsn:Z
 
-    iget-object v0, p0, Lb/i;->bEn:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->bEn:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
 
     instance-of v0, v0, Ljava/io/IOException;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lb/i;->bEn:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/io/IOException;
 
     throw v0
 
     :cond_0
-    iget-object v0, p0, Lb/i;->bEn:Ljava/lang/Throwable;
+    iget-object v0, p0, Lb/i;->bEx:Ljava/lang/Throwable;
 
     check-cast v0, Ljava/lang/RuntimeException;
 
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lb/i;->bEm:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEw: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;->Is()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->Iv()Lokhttp3/e;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/i;->bEm:Lokhttp3/e;
+    iput-object v0, p0, Lb/i;->bEw: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;->bEn:Ljava/lang/Throwable;
+    iput-object v0, p0, Lb/i;->bEx: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;->bul:Z
+    iget-boolean v1, p0, Lb/i;->buv:Z
 
     if-eqz v1, :cond_3
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
     :cond_3
-    invoke-interface {v0}, Lokhttp3/e;->Fa()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/e;->Fd()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -270,10 +270,10 @@
     throw v0
 .end method
 
-.method public final synthetic Io()Lb/b;
+.method public final synthetic Ir()Lb/b;
     .locals 1
 
-    invoke-direct {p0}, Lb/i;->Ir()Lb/i;
+    invoke-direct {p0}, Lb/i;->Iu()Lb/i;
 
     move-result-object v0
 
@@ -297,17 +297,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lb/i;->bsd:Z
+    iget-boolean v0, p0, Lb/i;->bsn:Z
 
     if-nez v0, :cond_3
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->bsd:Z
+    iput-boolean v0, p0, Lb/i;->bsn:Z
 
-    iget-object v0, p0, Lb/i;->bEm:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
 
-    iget-object v1, p0, Lb/i;->bEn:Ljava/lang/Throwable;
+    iget-object v1, p0, Lb/i;->bEx: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;->Is()Lokhttp3/e;
+    invoke-direct {p0}, Lb/i;->Iv()Lokhttp3/e;
 
     move-result-object v2
 
-    iput-object v2, p0, Lb/i;->bEm:Lokhttp3/e;
+    iput-object v2, p0, Lb/i;->bEw: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;->bEn:Ljava/lang/Throwable;
+    iput-object v1, p0, Lb/i;->bEx:Ljava/lang/Throwable;
 
     :cond_0
     :goto_0
@@ -347,7 +347,7 @@
     return-void
 
     :cond_1
-    iget-boolean v1, p0, Lb/i;->bul:Z
+    iget-boolean v1, p0, Lb/i;->buv:Z
 
     if-eqz v1, :cond_2
 
@@ -387,12 +387,12 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lb/i;->bul:Z
+    iput-boolean v0, p0, Lb/i;->buv:Z
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bEm:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
 
     monitor-exit p0
     :try_end_0
@@ -424,7 +424,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lb/i;->Ir()Lb/i;
+    invoke-direct {p0}, Lb/i;->Iu()Lb/i;
 
     move-result-object v0
 
@@ -449,9 +449,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->FO()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;->bst:Lokhttp3/x;
+    iput-object v1, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->FP()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;->bEk:Lb/o;
+    iget-object v0, p0, Lb/i;->bEu:Lb/o;
 
-    iget-object v0, v0, Lb/o;->bEV:Lb/e;
+    iget-object v0, v0, Lb/o;->bFf:Lb/e;
 
     invoke-interface {v0, v1}, Lb/e;->bo(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -521,11 +521,11 @@
     :catch_0
     move-exception p1
 
-    iget-object v0, v1, Lb/i$a;->bEq:Ljava/io/IOException;
+    iget-object v0, v1, Lb/i$a;->bEA:Ljava/io/IOException;
 
     if-eqz v0, :cond_2
 
-    iget-object p1, v1, Lb/i$a;->bEq:Ljava/io/IOException;
+    iget-object p1, v1, Lb/i$a;->bEA:Ljava/io/IOException;
 
     throw p1
 
@@ -572,7 +572,7 @@
 .method public final isCanceled()Z
     .locals 2
 
-    iget-boolean v0, p0, Lb/i;->bul:Z
+    iget-boolean v0, p0, Lb/i;->buv:Z
 
     const/4 v1, 0x1
 
@@ -584,11 +584,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lb/i;->bEm:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEw:Lokhttp3/e;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lb/i;->bEm:Lokhttp3/e;
+    iget-object v0, p0, Lb/i;->bEw: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 6d85501a7c..f4419f9119 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;->It()Lb/j;
+    value = Lb/j;->Iw()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bEs:Lb/j;
+.field final synthetic bEC:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$1;->bEs:Lb/j;
+    iput-object p1, p0, Lb/j$1;->bEC:Lb/j;
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lb/j$1;->bEs:Lb/j;
+    iget-object v1, p0, Lb/j$1;->bEC: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 1395170c78..3f942b908c 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;->Iu()Lb/j;
+    value = Lb/j;->Ix()Lb/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -23,14 +23,14 @@
 
 
 # instance fields
-.field final synthetic bEs:Lb/j;
+.field final synthetic bEC:Lb/j;
 
 
 # direct methods
 .method constructor <init>(Lb/j;)V
     .locals 0
 
-    iput-object p1, p0, Lb/j$2;->bEs:Lb/j;
+    iput-object p1, p0, Lb/j$2;->bEC: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;->bEs:Lb/j;
+    iget-object v2, p0, Lb/j$2;->bEC: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 02635a2f94..a31dc691f2 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 bEt:Lb/e;
+.field private final bED: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;->bEt:Lb/e;
+    iput-object p1, p0, Lb/j$a;->bED: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;->bEt:Lb/e;
+    iget-object v0, p0, Lb/j$a;->bED:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->bo(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;->bry:Lokhttp3/RequestBody;
+    iput-object v0, p1, Lb/l;->brI:Lokhttp3/RequestBody;
 
     return-void
 
diff --git a/com.discord/smali/b/j$b.smali b/com.discord/smali/b/j$b.smali
index 6bff4ccad9..3c2ce3ea5e 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 bEu:Lb/e;
+.field private final bEE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bEv:Z
+.field private final bEF: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;->bEu:Lb/e;
+    iput-object p2, p0, Lb/j$b;->bEE:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$b;->bEv:Z
+    iput-boolean p3, p0, Lb/j$b;->bEF:Z
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$b;->bEu:Lb/e;
+    iget-object v0, p0, Lb/j$b;->bEE:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->bo(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;->bEv:Z
+    iget-boolean v1, p0, Lb/j$b;->bEF:Z
 
     invoke-virtual {p1, v0, p2, v1}, Lb/l;->d(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 3008477c04..8791aa85ea 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 bEu:Lb/e;
+.field private final bEE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final bEv:Z
+.field private final bEF:Z
 
 
 # direct methods
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$c;->bEu:Lb/e;
+    iput-object p1, p0, Lb/j$c;->bEE:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$c;->bEv:Z
+    iput-boolean p2, p0, Lb/j$c;->bEF:Z
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lb/j$c;->bEu:Lb/e;
+    iget-object v3, p0, Lb/j$c;->bEE:Lb/e;
 
     invoke-interface {v3, v0}, Lb/e;->bo(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -128,7 +128,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-boolean v0, p0, Lb/j$c;->bEv:Z
+    iget-boolean v0, p0, Lb/j$c;->bEF:Z
 
     invoke-virtual {p1, v1, v3, v0}, Lb/l;->d(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;->bEu:Lb/e;
+    iget-object v0, p0, Lb/j$c;->bEE: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 fc0bb7a412..08aa071429 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 bEu:Lb/e;
+.field private final bEE: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;->bEu:Lb/e;
+    iput-object p2, p0, Lb/j$d;->bEE:Lb/e;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$d;->bEu:Lb/e;
+    iget-object v0, p0, Lb/j$d;->bEE:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->bo(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 a2ebfd311a..c08800b4cb 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 bEu:Lb/e;
+.field private final bEE: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;->bEu:Lb/e;
+    iput-object p1, p0, Lb/j$e;->bEE:Lb/e;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v2, p0, Lb/j$e;->bEu:Lb/e;
+    iget-object v2, p0, Lb/j$e;->bEE:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->bo(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 9522ffdd5d..0c7b37b495 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 bEt:Lb/e;
+.field private final bED:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final brx:Lokhttp3/Headers;
+.field private final brH:Lokhttp3/Headers;
 
 
 # direct methods
@@ -55,9 +55,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$f;->brx:Lokhttp3/Headers;
+    iput-object p1, p0, Lb/j$f;->brH:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lb/j$f;->bEt:Lb/e;
+    iput-object p2, p0, Lb/j$f;->bED:Lb/e;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lb/j$f;->bEt:Lb/e;
+    iget-object v0, p0, Lb/j$f;->bED:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->bo(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;->brx:Lokhttp3/Headers;
+    iget-object p2, p0, Lb/j$f;->brH: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 825ba15688..c6a2c10c1a 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 bEu:Lb/e;
+.field private final bEE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final bEw:Ljava/lang/String;
+.field private final bEG:Ljava/lang/String;
 
 
 # direct methods
@@ -58,9 +58,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$g;->bEu:Lb/e;
+    iput-object p1, p0, Lb/j$g;->bEE:Lb/e;
 
-    iput-object p2, p0, Lb/j$g;->bEw:Ljava/lang/String;
+    iput-object p2, p0, Lb/j$g;->bEG:Ljava/lang/String;
 
     return-void
 .end method
@@ -156,7 +156,7 @@
 
     const/4 v1, 0x3
 
-    iget-object v3, p0, Lb/j$g;->bEw:Ljava/lang/String;
+    iget-object v3, p0, Lb/j$g;->bEG:Ljava/lang/String;
 
     aput-object v3, v2, v1
 
@@ -164,7 +164,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lb/j$g;->bEu:Lb/e;
+    iget-object v2, p0, Lb/j$g;->bEE:Lb/e;
 
     invoke-interface {v2, v0}, Lb/e;->bo(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 552e51c978..3537b43076 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 bEu:Lb/e;
+.field private final bEE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bEv:Z
+.field private final bEF: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;->bEu:Lb/e;
+    iput-object p2, p0, Lb/j$h;->bEE:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$h;->bEv:Z
+    iput-boolean p3, p0, Lb/j$h;->bEF: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;->bEu:Lb/e;
+    iget-object v1, p0, Lb/j$h;->bEE:Lb/e;
 
     invoke-interface {v1, p2}, Lb/e;->bo(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -108,13 +108,13 @@
 
     check-cast p2, Ljava/lang/String;
 
-    iget-boolean v1, p0, Lb/j$h;->bEv:Z
+    iget-boolean v1, p0, Lb/j$h;->bEF:Z
 
-    iget-object v2, p1, Lb/l;->bEB:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->bEL:Ljava/lang/String;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p1, Lb/l;->bEB:Ljava/lang/String;
+    iget-object v2, p1, Lb/l;->bEL:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -140,7 +140,7 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lb/l;->bEB:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->bEL:Ljava/lang/String;
 
     return-void
 
diff --git a/com.discord/smali/b/j$i.smali b/com.discord/smali/b/j$i.smali
index 46746ccf99..dc9b217790 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 bEu:Lb/e;
+.field private final bEE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bEv:Z
+.field private final bEF: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;->bEu:Lb/e;
+    iput-object p2, p0, Lb/j$i;->bEE:Lb/e;
 
-    iput-boolean p3, p0, Lb/j$i;->bEv:Z
+    iput-boolean p3, p0, Lb/j$i;->bEF:Z
 
     return-void
 .end method
@@ -101,7 +101,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$i;->bEu:Lb/e;
+    iget-object v0, p0, Lb/j$i;->bEE:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->bo(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;->bEv:Z
+    iget-boolean v1, p0, Lb/j$i;->bEF:Z
 
     invoke-virtual {p1, v0, p2, v1}, Lb/l;->c(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 11008752ee..43a92d6a68 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 bEu:Lb/e;
+.field private final bEE:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final bEv:Z
+.field private final bEF:Z
 
 
 # direct methods
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Lb/j;-><init>()V
 
-    iput-object p1, p0, Lb/j$j;->bEu:Lb/e;
+    iput-object p1, p0, Lb/j$j;->bEE:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$j;->bEv:Z
+    iput-boolean p2, p0, Lb/j$j;->bEF:Z
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lb/j$j;->bEu:Lb/e;
+    iget-object v3, p0, Lb/j$j;->bEE:Lb/e;
 
     invoke-interface {v3, v0}, Lb/e;->bo(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -128,7 +128,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-boolean v0, p0, Lb/j$j;->bEv:Z
+    iget-boolean v0, p0, Lb/j$j;->bEF:Z
 
     invoke-virtual {p1, v1, v3, v0}, Lb/l;->c(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;->bEu:Lb/e;
+    iget-object v0, p0, Lb/j$j;->bEE: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 9cd192f28b..1b2e8afa77 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 bEv:Z
+.field private final bEF:Z
 
-.field private final bEx:Lb/e;
+.field private final bEH: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;->bEx:Lb/e;
+    iput-object p1, p0, Lb/j$k;->bEH:Lb/e;
 
-    iput-boolean p2, p0, Lb/j$k;->bEv:Z
+    iput-boolean p2, p0, Lb/j$k;->bEF:Z
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lb/j$k;->bEx:Lb/e;
+    iget-object v0, p0, Lb/j$k;->bEH:Lb/e;
 
     invoke-interface {v0, p2}, Lb/e;->bo(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -98,7 +98,7 @@
 
     const/4 v0, 0x0
 
-    iget-boolean v1, p0, Lb/j$k;->bEv:Z
+    iget-boolean v1, p0, Lb/j$k;->bEF:Z
 
     invoke-virtual {p1, p2, v0, v1}, Lb/l;->c(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 62b1291e05..9396247b2e 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 bEy:Lb/j$l;
+.field static final bEI:Lb/j$l;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     invoke-direct {v0}, Lb/j$l;-><init>()V
 
-    sput-object v0, Lb/j$l;->bEy:Lb/j$l;
+    sput-object v0, Lb/j$l;->bEI:Lb/j$l;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p1, Lb/l;->bEF:Lokhttp3/MultipartBody$a;
+    iget-object p1, p1, Lb/l;->bEP: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 01c814da76..4ac1d7bcd3 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;->bEB:Ljava/lang/String;
+    iput-object p2, p1, Lb/l;->bEL:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/b/j.smali b/com.discord/smali/b/j.smali
index 8cecde106b..d539bed99f 100644
--- a/com.discord/smali/b/j.smali
+++ b/com.discord/smali/b/j.smali
@@ -43,7 +43,7 @@
 
 
 # virtual methods
-.method final It()Lb/j;
+.method final Iw()Lb/j;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -61,7 +61,7 @@
     return-object v0
 .end method
 
-.method final Iu()Lb/j;
+.method final Ix()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 be60e244a5..8ca1391b7d 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 Ix()Ljava/util/concurrent/Executor;
+.method public final IA()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 3a847d86c0..20c54e4824 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 bEz:Lb/k;
+.field private static final bEJ:Lb/k;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->Iw()Lb/k;
+    invoke-static {}, Lb/k;->Iz()Lb/k;
 
     move-result-object v0
 
-    sput-object v0, Lb/k;->bEz:Lb/k;
+    sput-object v0, Lb/k;->bEJ:Lb/k;
 
     return-void
 .end method
@@ -37,15 +37,15 @@
     return-void
 .end method
 
-.method static Iv()Lb/k;
+.method static Iy()Lb/k;
     .locals 1
 
-    sget-object v0, Lb/k;->bEz:Lb/k;
+    sget-object v0, Lb/k;->bEJ:Lb/k;
 
     return-object v0
 .end method
 
-.method private static Iw()Lb/k;
+.method private static Iz()Lb/k;
     .locals 1
 
     :try_start_0
@@ -90,7 +90,7 @@
 
 
 # virtual methods
-.method Ix()Ljava/util/concurrent/Executor;
+.method IA()Ljava/util/concurrent/Executor;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -160,7 +160,7 @@
     return-object v0
 
     :cond_0
-    sget-object p1, Lb/f;->bDZ:Lb/c$a;
+    sget-object p1, Lb/f;->bEj: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 82e9a71894..2958e10229 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 bru:Lokhttp3/MediaType;
+.field private final brE: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;->bru:Lokhttp3/MediaType;
+    iput-object p2, p0, Lb/l$a;->brE: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;->bru:Lokhttp3/MediaType;
+    iget-object v0, p0, Lb/l$a;->brE:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/b/l.smali b/com.discord/smali/b/l.smali
index 84442b4e82..b39bd512a2 100644
--- a/com.discord/smali/b/l.smali
+++ b/com.discord/smali/b/l.smali
@@ -12,47 +12,47 @@
 
 
 # static fields
-.field private static final bqU:[C
+.field private static final bre:[C
 
 
 # instance fields
-.field private final bEA:Lokhttp3/s;
+.field private final bEK:Lokhttp3/s;
 
-.field bEB:Ljava/lang/String;
+.field bEL:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEC:Lokhttp3/s$a;
+.field private bEM:Lokhttp3/s$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bED:Lokhttp3/w$a;
+.field private final bEN:Lokhttp3/w$a;
 
-.field private final bEE:Z
+.field private final bEO:Z
 
-.field bEF:Lokhttp3/MultipartBody$a;
+.field bEP:Lokhttp3/MultipartBody$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bEG:Lokhttp3/q$a;
+.field private bEQ:Lokhttp3/q$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private bru:Lokhttp3/MediaType;
+.field private brE:Lokhttp3/MediaType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bry:Lokhttp3/RequestBody;
+.field brI:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bsg:Ljava/lang/String;
+.field private final bsq:Ljava/lang/String;
 
 
 # direct methods
@@ -65,7 +65,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lb/l;->bqU:[C
+    sput-object v0, Lb/l;->bre:[C
 
     return-void
 
@@ -107,25 +107,25 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bsg:Ljava/lang/String;
+    iput-object p1, p0, Lb/l;->bsq:Ljava/lang/String;
 
-    iput-object p2, p0, Lb/l;->bEA:Lokhttp3/s;
+    iput-object p2, p0, Lb/l;->bEK:Lokhttp3/s;
 
-    iput-object p3, p0, Lb/l;->bEB:Ljava/lang/String;
+    iput-object p3, p0, Lb/l;->bEL:Ljava/lang/String;
 
     new-instance p1, Lokhttp3/w$a;
 
     invoke-direct {p1}, Lokhttp3/w$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bED:Lokhttp3/w$a;
+    iput-object p1, p0, Lb/l;->bEN:Lokhttp3/w$a;
 
-    iput-object p5, p0, Lb/l;->bru:Lokhttp3/MediaType;
+    iput-object p5, p0, Lb/l;->brE:Lokhttp3/MediaType;
 
-    iput-boolean p6, p0, Lb/l;->bEE:Z
+    iput-boolean p6, p0, Lb/l;->bEO:Z
 
     if-eqz p4, :cond_0
 
-    iget-object p1, p0, Lb/l;->bED:Lokhttp3/w$a;
+    iget-object p1, p0, Lb/l;->bEN: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;->bEG:Lokhttp3/q$a;
+    iput-object p1, p0, Lb/l;->bEQ:Lokhttp3/q$a;
 
     return-void
 
@@ -147,11 +147,11 @@
 
     invoke-direct {p1}, Lokhttp3/MultipartBody$a;-><init>()V
 
-    iput-object p1, p0, Lb/l;->bEF:Lokhttp3/MultipartBody$a;
+    iput-object p1, p0, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
 
-    iget-object p1, p0, Lb/l;->bEF:Lokhttp3/MultipartBody$a;
+    iget-object p1, p0, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
 
-    sget-object p2, Lokhttp3/MultipartBody;->bro:Lokhttp3/MediaType;
+    sget-object p2, Lokhttp3/MultipartBody;->bry:Lokhttp3/MediaType;
 
     if-eqz p2, :cond_3
 
@@ -165,7 +165,7 @@
 
     if-eqz p3, :cond_2
 
-    iput-object p2, p1, Lokhttp3/MultipartBody$a;->brw:Lokhttp3/MediaType;
+    iput-object p2, p1, Lokhttp3/MultipartBody$a;->brG:Lokhttp3/MediaType;
 
     goto :goto_0
 
@@ -328,7 +328,7 @@
     invoke-virtual {v1, v10}, Lokio/c;->dt(I)Lokio/c;
 
     :goto_4
-    invoke-virtual {v1}, Lokio/c;->Hf()Z
+    invoke-virtual {v1}, Lokio/c;->Hi()Z
 
     move-result v11
 
@@ -342,7 +342,7 @@
 
     invoke-virtual {v3, v9}, Lokio/c;->du(I)Lokio/c;
 
-    sget-object v12, Lb/l;->bqU:[C
+    sget-object v12, Lb/l;->bre:[C
 
     shr-int/lit8 v13, v11, 0x4
 
@@ -352,7 +352,7 @@
 
     invoke-virtual {v3, v12}, Lokio/c;->du(I)Lokio/c;
 
-    sget-object v12, Lb/l;->bqU:[C
+    sget-object v12, Lb/l;->bre:[C
 
     and-int/lit8 v11, v11, 0xf
 
@@ -373,7 +373,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v3}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object p0
 
@@ -383,23 +383,23 @@
 
 
 # virtual methods
-.method final FK()Lokhttp3/w;
+.method final FN()Lokhttp3/w;
     .locals 5
 
-    iget-object v0, p0, Lb/l;->bEC:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->bEM:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Ft()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lb/l;->bEA:Lokhttp3/s;
+    iget-object v0, p0, Lb/l;->bEK:Lokhttp3/s;
 
-    iget-object v1, p0, Lb/l;->bEB:Ljava/lang/String;
+    iget-object v1, p0, Lb/l;->bEL:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lokhttp3/s;->dF(Ljava/lang/String;)Lokhttp3/s;
 
@@ -408,11 +408,11 @@
     if-eqz v0, :cond_7
 
     :goto_0
-    iget-object v1, p0, Lb/l;->bry:Lokhttp3/RequestBody;
+    iget-object v1, p0, Lb/l;->brI:Lokhttp3/RequestBody;
 
     if-nez v1, :cond_4
 
-    iget-object v2, p0, Lb/l;->bEG:Lokhttp3/q$a;
+    iget-object v2, p0, Lb/l;->bEQ: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;->bqM:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/q$a;->bqW: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;->bEF:Lokhttp3/MultipartBody$a;
+    iget-object v2, p0, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v2, Lokhttp3/MultipartBody$a;->brv:Ljava/util/List;
+    iget-object v1, v2, Lokhttp3/MultipartBody$a;->brF: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;->brs:Lokio/ByteString;
+    iget-object v3, v2, Lokhttp3/MultipartBody$a;->brC:Lokio/ByteString;
 
-    iget-object v4, v2, Lokhttp3/MultipartBody$a;->brw:Lokhttp3/MediaType;
+    iget-object v4, v2, Lokhttp3/MultipartBody$a;->brG:Lokhttp3/MediaType;
 
-    iget-object v2, v2, Lokhttp3/MultipartBody$a;->brv:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/MultipartBody$a;->brF: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;->bEE:Z
+    iget-boolean v2, p0, Lb/l;->bEO:Z
 
     if-eqz v2, :cond_4
 
@@ -477,7 +477,7 @@
 
     :cond_4
     :goto_1
-    iget-object v2, p0, Lb/l;->bru:Lokhttp3/MediaType;
+    iget-object v2, p0, Lb/l;->brE:Lokhttp3/MediaType;
 
     if-eqz v2, :cond_6
 
@@ -492,7 +492,7 @@
     goto :goto_2
 
     :cond_5
-    iget-object v3, p0, Lb/l;->bED:Lokhttp3/w$a;
+    iget-object v3, p0, Lb/l;->bEN:Lokhttp3/w$a;
 
     invoke-virtual {v2}, Lokhttp3/MediaType;->toString()Ljava/lang/String;
 
@@ -504,19 +504,19 @@
 
     :cond_6
     :goto_2
-    iget-object v2, p0, Lb/l;->bED:Lokhttp3/w$a;
+    iget-object v2, p0, Lb/l;->bEN:Lokhttp3/w$a;
 
     invoke-virtual {v2, v0}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
     move-result-object v0
 
-    iget-object v2, p0, Lb/l;->bsg:Ljava/lang/String;
+    iget-object v2, p0, Lb/l;->bsq:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v1}, Lokhttp3/w$a;->a(Ljava/lang/String;Lokhttp3/RequestBody;)Lokhttp3/w$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FN()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;->bEA:Lokhttp3/s;
+    iget-object v2, p0, Lb/l;->bEK: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;->bEB:Ljava/lang/String;
+    iget-object v2, p0, Lb/l;->bEL:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -569,7 +569,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lb/l;->bru:Lokhttp3/MediaType;
+    iput-object p1, p0, Lb/l;->brE:Lokhttp3/MediaType;
 
     return-void
 
@@ -591,7 +591,7 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lb/l;->bED:Lokhttp3/w$a;
+    iget-object v0, p0, Lb/l;->bEN:Lokhttp3/w$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/w$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
@@ -605,25 +605,25 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lb/l;->bEB:Ljava/lang/String;
+    iget-object v0, p0, Lb/l;->bEL:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lb/l;->bEA:Lokhttp3/s;
+    iget-object v1, p0, Lb/l;->bEK:Lokhttp3/s;
 
     invoke-virtual {v1, v0}, Lokhttp3/s;->dG(Ljava/lang/String;)Lokhttp3/s$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lb/l;->bEC:Lokhttp3/s$a;
+    iput-object v0, p0, Lb/l;->bEM:Lokhttp3/s$a;
 
-    iget-object v0, p0, Lb/l;->bEC:Lokhttp3/s$a;
+    iget-object v0, p0, Lb/l;->bEM:Lokhttp3/s$a;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lb/l;->bEB:Ljava/lang/String;
+    iput-object v0, p0, Lb/l;->bEL:Ljava/lang/String;
 
     goto :goto_0
 
@@ -636,7 +636,7 @@
 
     invoke-direct {p2, p3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object p3, p0, Lb/l;->bEA:Lokhttp3/s;
+    iget-object p3, p0, Lb/l;->bEK:Lokhttp3/s;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -644,7 +644,7 @@
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object p3, p0, Lb/l;->bEB:Ljava/lang/String;
+    iget-object p3, p0, Lb/l;->bEL:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -660,14 +660,14 @@
     :goto_0
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lb/l;->bEC:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->bEM:Lokhttp3/s$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/s$a;->an(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/s$a;
 
     return-void
 
     :cond_2
-    iget-object p3, p0, Lb/l;->bEC:Lokhttp3/s$a;
+    iget-object p3, p0, Lb/l;->bEM:Lokhttp3/s$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/s$a;->am(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/s$a;
 
@@ -677,7 +677,7 @@
 .method final c(Lokhttp3/Headers;Lokhttp3/RequestBody;)V
     .locals 1
 
-    iget-object v0, p0, Lb/l;->bEF:Lokhttp3/MultipartBody$a;
+    iget-object v0, p0, Lb/l;->bEP:Lokhttp3/MultipartBody$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/MultipartBody$a;->a(Lokhttp3/Headers;Lokhttp3/RequestBody;)Lokhttp3/MultipartBody$a;
 
@@ -689,14 +689,14 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p3, p0, Lb/l;->bEG:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->bEQ:Lokhttp3/q$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/q$a;->ah(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/q$a;
 
     return-void
 
     :cond_0
-    iget-object p3, p0, Lb/l;->bEG:Lokhttp3/q$a;
+    iget-object p3, p0, Lb/l;->bEQ:Lokhttp3/q$a;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/q$a;->ag(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 160610c4bb..a51df7ebd1 100644
--- a/com.discord/smali/b/m.smali
+++ b/com.discord/smali/b/m.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final bEH:Lokhttp3/Response;
+.field public final bER:Lokhttp3/Response;
 
-.field public final bEI:Ljava/lang/Object;
+.field public final bES:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final bEJ:Lokhttp3/x;
+.field public final bET: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;->bEH:Lokhttp3/Response;
+    iput-object p1, p0, Lb/m;->bER:Lokhttp3/Response;
 
-    iput-object p2, p0, Lb/m;->bEI:Ljava/lang/Object;
+    iput-object p2, p0, Lb/m;->bES:Ljava/lang/Object;
 
-    iput-object p3, p0, Lb/m;->bEJ:Lokhttp3/x;
+    iput-object p3, p0, Lb/m;->bET:Lokhttp3/x;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     invoke-static {p1, v0}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->zd()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->zg()Z
 
     move-result v0
 
@@ -135,7 +135,7 @@
 
     invoke-static {p1, v0}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/Response;->zd()Z
+    invoke-virtual {p1}, Lokhttp3/Response;->zg()Z
 
     move-result v0
 
@@ -161,10 +161,10 @@
 
 
 # virtual methods
-.method public final Iy()Lokhttp3/Response;
+.method public final IB()Lokhttp3/Response;
     .locals 1
 
-    iget-object v0, p0, Lb/m;->bEH:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->bER: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;->bEH:Lokhttp3/Response;
+    iget-object v0, p0, Lb/m;->bER: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 fa2be0dca2..f70a7a96ad 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 bEP:Lb/k;
+.field private final bEZ:Lb/k;
 
-.field final synthetic bEQ:Ljava/lang/Class;
+.field final synthetic bFa:Ljava/lang/Class;
 
-.field final synthetic bER:Lb/n;
+.field final synthetic bFb:Lb/n;
 
 
 # direct methods
 .method constructor <init>(Lb/n;Ljava/lang/Class;)V
     .locals 0
 
-    iput-object p1, p0, Lb/n$1;->bER:Lb/n;
+    iput-object p1, p0, Lb/n$1;->bFb:Lb/n;
 
-    iput-object p2, p0, Lb/n$1;->bEQ:Ljava/lang/Class;
+    iput-object p2, p0, Lb/n$1;->bFa:Ljava/lang/Class;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lb/k;->Iv()Lb/k;
+    invoke-static {}, Lb/k;->Iy()Lb/k;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/n$1;->bEP:Lb/k;
+    iput-object p1, p0, Lb/n$1;->bEZ:Lb/k;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lb/n$1;->bEP:Lb/k;
+    iget-object v0, p0, Lb/n$1;->bEZ: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;->bEP:Lb/k;
+    iget-object v0, p0, Lb/n$1;->bEZ:Lb/k;
 
-    iget-object v1, p0, Lb/n$1;->bEQ:Ljava/lang/Class;
+    iget-object v1, p0, Lb/n$1;->bFa: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;->bER:Lb/n;
+    iget-object p1, p0, Lb/n$1;->bFb: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;->bEU:Lb/c;
+    iget-object p1, p1, Lb/o;->bFe: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 c2743c2117..16695887c3 100644
--- a/com.discord/smali/b/n$a.smali
+++ b/com.discord/smali/b/n$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field private bEA:Lokhttp3/s;
+.field private bEK:Lokhttp3/s;
 
-.field private bEL:Lokhttp3/e$a;
+.field private bEV:Lokhttp3/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final bEM:Ljava/util/List;
+.field private final bEW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final bEN:Ljava/util/List;
+.field private final bEX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,11 +42,11 @@
     .end annotation
 .end field
 
-.field private bEO:Z
+.field private bEY:Z
 
-.field private final bEP:Lb/k;
+.field private final bEZ:Lb/k;
 
-.field private bEc:Ljava/util/concurrent/Executor;
+.field private bEm:Ljava/util/concurrent/Executor;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -56,7 +56,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lb/k;->Iv()Lb/k;
+    invoke-static {}, Lb/k;->Iy()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;->bEM:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->bEW:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lb/n$a;->bEN:Ljava/util/List;
+    iput-object v0, p0, Lb/n$a;->bEX:Ljava/util/List;
 
-    iput-object p1, p0, Lb/n$a;->bEP:Lb/k;
+    iput-object p1, p0, Lb/n$a;->bEZ:Lb/k;
 
-    iget-object p1, p0, Lb/n$a;->bEM:Ljava/util/List;
+    iget-object p1, p0, Lb/n$a;->bEW:Ljava/util/List;
 
     new-instance v0, Lb/a;
 
@@ -97,14 +97,14 @@
 
 
 # virtual methods
-.method public final Iz()Lb/n;
+.method public final IC()Lb/n;
     .locals 8
 
-    iget-object v0, p0, Lb/n$a;->bEA:Lokhttp3/s;
+    iget-object v0, p0, Lb/n$a;->bEK:Lokhttp3/s;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lb/n$a;->bEL:Lokhttp3/e$a;
+    iget-object v0, p0, Lb/n$a;->bEV: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;->bEc:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lb/n$a;->bEm:Ljava/util/concurrent/Executor;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lb/n$a;->bEP:Lb/k;
+    iget-object v0, p0, Lb/n$a;->bEZ:Lb/k;
 
-    invoke-virtual {v0}, Lb/k;->Ix()Ljava/util/concurrent/Executor;
+    invoke-virtual {v0}, Lb/k;->IA()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;->bEN:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bEX:Ljava/util/List;
 
     invoke-direct {v5, v0}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v0, p0, Lb/n$a;->bEP:Lb/k;
+    iget-object v0, p0, Lb/n$a;->bEZ:Lb/k;
 
     invoke-virtual {v0, v6}, Lb/k;->b(Ljava/util/concurrent/Executor;)Lb/c$a;
 
@@ -144,15 +144,15 @@
 
     new-instance v4, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lb/n$a;->bEM:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bEW: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;->bEA:Lokhttp3/s;
+    iget-object v3, p0, Lb/n$a;->bEK:Lokhttp3/s;
 
-    iget-boolean v7, p0, Lb/n$a;->bEO:Z
+    iget-boolean v7, p0, Lb/n$a;->bEY: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;->bEN:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bEX: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;->bEM:Ljava/util/List;
+    iget-object v0, p0, Lb/n$a;->bEW:Ljava/util/List;
 
     const-string v1, "factory == null"
 
@@ -221,7 +221,7 @@
 
     check-cast p1, Lokhttp3/e$a;
 
-    iput-object p1, p0, Lb/n$a;->bEL:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n$a;->bEV:Lokhttp3/e$a;
 
     return-object p0
 .end method
@@ -241,7 +241,7 @@
 
     invoke-static {v1, v0}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p1, v1, Lokhttp3/s;->bqX:Ljava/util/List;
+    iget-object p1, v1, Lokhttp3/s;->brh: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;->bEA:Lokhttp3/s;
+    iput-object v1, p0, Lb/n$a;->bEK:Lokhttp3/s;
 
     return-object p0
 
diff --git a/com.discord/smali/b/n.smali b/com.discord/smali/b/n.smali
index f1dead6bd4..2b71a3c894 100644
--- a/com.discord/smali/b/n.smali
+++ b/com.discord/smali/b/n.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field final bEA:Lokhttp3/s;
+.field final bEK:Lokhttp3/s;
 
-.field private final bEK:Ljava/util/Map;
+.field private final bEU:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field final bEL:Lokhttp3/e$a;
+.field final bEV:Lokhttp3/e$a;
 
-.field final bEM:Ljava/util/List;
+.field final bEW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final bEN:Ljava/util/List;
+.field final bEX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,9 +47,9 @@
     .end annotation
 .end field
 
-.field final bEO:Z
+.field final bEY:Z
 
-.field final bEc:Ljava/util/concurrent/Executor;
+.field final bEm:Ljava/util/concurrent/Executor;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -84,27 +84,27 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lb/n;->bEK:Ljava/util/Map;
+    iput-object v0, p0, Lb/n;->bEU:Ljava/util/Map;
 
-    iput-object p1, p0, Lb/n;->bEL:Lokhttp3/e$a;
+    iput-object p1, p0, Lb/n;->bEV:Lokhttp3/e$a;
 
-    iput-object p2, p0, Lb/n;->bEA:Lokhttp3/s;
+    iput-object p2, p0, Lb/n;->bEK: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;->bEM:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->bEW: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;->bEN:Ljava/util/List;
+    iput-object p1, p0, Lb/n;->bEX:Ljava/util/List;
 
-    iput-object p5, p0, Lb/n;->bEc:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lb/n;->bEm:Ljava/util/concurrent/Executor;
 
-    iput-boolean p6, p0, Lb/n;->bEO:Z
+    iput-boolean p6, p0, Lb/n;->bEY:Z
 
     return-void
 .end method
@@ -125,13 +125,13 @@
 
     invoke-static {p1}, Lb/p;->X(Ljava/lang/Class;)V
 
-    iget-boolean v0, p0, Lb/n;->bEO:Z
+    iget-boolean v0, p0, Lb/n;->bEY:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lb/k;->Iv()Lb/k;
+    invoke-static {}, Lb/k;->Iy()Lb/k;
 
     move-result-object v0
 
@@ -215,7 +215,7 @@
 
     invoke-static {p3, p2}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p2, p0, Lb/n;->bEM:Ljava/util/List;
+    iget-object p2, p0, Lb/n;->bEW:Ljava/util/List;
 
     const/4 p3, 0x0
 
@@ -225,7 +225,7 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget-object p3, p0, Lb/n;->bEM:Ljava/util/List;
+    iget-object p3, p0, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object v1, p0, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->bEW: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;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object p1, p0, Lb/n;->bEM:Ljava/util/List;
+    iget-object p1, p0, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object v0, p0, Lb/n;->bEW: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;->bDX:Lb/a$d;
+    sget-object p1, Lb/a$d;->bEh:Lb/a$d;
 
     return-object p1
 .end method
@@ -390,7 +390,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/n;->bEK:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->bEU: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;->bEK:Ljava/util/Map;
+    iget-object v0, p0, Lb/n;->bEU:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lb/n;->bEK:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->bEU: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;->IA()Lb/c;
+    invoke-virtual {v1}, Lb/o$a;->ID()Lb/c;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bEU:Lb/c;
+    iput-object v2, v1, Lb/o$a;->bFe:Lb/c;
 
-    iget-object v2, v1, Lb/o$a;->bEU:Lb/c;
+    iget-object v2, v1, Lb/o$a;->bFe:Lb/c;
 
-    invoke-interface {v2}, Lb/c;->Ip()Ljava/lang/reflect/Type;
+    invoke-interface {v2}, Lb/c;->Is()Ljava/lang/reflect/Type;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bFe:Ljava/lang/reflect/Type;
+    iput-object v2, v1, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
 
-    iget-object v2, v1, Lb/o$a;->bFe:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bFo: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;->bFe:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
 
     const-class v3, Lokhttp3/Response;
 
     if-eq v2, v3, :cond_20
 
-    invoke-virtual {v1}, Lb/o$a;->IB()Lb/e;
+    invoke-virtual {v1}, Lb/o$a;->IE()Lb/e;
 
     move-result-object v2
 
-    iput-object v2, v1, Lb/o$a;->bEV:Lb/e;
+    iput-object v2, v1, Lb/o$a;->bFf:Lb/e;
 
-    iget-object v2, v1, Lb/o$a;->bFb:[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->bFl:[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;->bFe:Ljava/lang/reflect/Type;
+    iget-object v8, v1, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
 
     invoke-virtual {v7, v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -617,15 +617,15 @@
 
     check-cast v8, Lb/c/h;
 
-    invoke-interface {v8}, Lb/c/h;->FH()Ljava/lang/String;
+    invoke-interface {v8}, Lb/c/h;->FK()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-interface {v8}, Lb/c/h;->IF()Ljava/lang/String;
+    invoke-interface {v8}, Lb/c/h;->II()Ljava/lang/String;
 
     move-result-object v9
 
-    invoke-interface {v8}, Lb/c/h;->IG()Z
+    invoke-interface {v8}, Lb/c/h;->IJ()Z
 
     move-result v8
 
@@ -652,7 +652,7 @@
 
     move-result-object v7
 
-    iput-object v7, v1, Lb/o$a;->brx:Lokhttp3/Headers;
+    iput-object v7, v1, Lb/o$a;->brH:Lokhttp3/Headers;
 
     goto :goto_1
 
@@ -672,11 +672,11 @@
 
     if-eqz v9, :cond_d
 
-    iget-boolean v8, v1, Lb/o$a;->bEX:Z
+    iget-boolean v8, v1, Lb/o$a;->bFh:Z
 
     if-nez v8, :cond_c
 
-    iput-boolean v7, v1, Lb/o$a;->bEY:Z
+    iput-boolean v7, v1, Lb/o$a;->bFi:Z
 
     goto :goto_1
 
@@ -696,11 +696,11 @@
 
     if-eqz v8, :cond_f
 
-    iget-boolean v8, v1, Lb/o$a;->bEY:Z
+    iget-boolean v8, v1, Lb/o$a;->bFi:Z
 
     if-nez v8, :cond_e
 
-    iput-boolean v7, v1, Lb/o$a;->bEX:Z
+    iput-boolean v7, v1, Lb/o$a;->bFh:Z
 
     goto :goto_1
 
@@ -722,19 +722,19 @@
     goto/16 :goto_0
 
     :cond_10
-    iget-object v2, v1, Lb/o$a;->bEW:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->bFg:Ljava/lang/String;
 
     if-eqz v2, :cond_1f
 
-    iget-boolean v2, v1, Lb/o$a;->bEE:Z
+    iget-boolean v2, v1, Lb/o$a;->bEO:Z
 
     if-nez v2, :cond_13
 
-    iget-boolean v2, v1, Lb/o$a;->bEY:Z
+    iget-boolean v2, v1, Lb/o$a;->bFi:Z
 
     if-nez v2, :cond_12
 
-    iget-boolean v2, v1, Lb/o$a;->bEX:Z
+    iget-boolean v2, v1, Lb/o$a;->bFh:Z
 
     if-nez v2, :cond_11
 
@@ -764,20 +764,20 @@
 
     :cond_13
     :goto_2
-    iget-object v2, v1, Lb/o$a;->bFc:[[Ljava/lang/annotation/Annotation;
+    iget-object v2, v1, Lb/o$a;->bFm:[[Ljava/lang/annotation/Annotation;
 
     array-length v2, v2
 
     new-array v3, v2, [Lb/j;
 
-    iput-object v3, v1, Lb/o$a;->bEZ:[Lb/j;
+    iput-object v3, v1, Lb/o$a;->bFj:[Lb/j;
 
     const/4 v3, 0x0
 
     :goto_3
     if-ge v3, v2, :cond_16
 
-    iget-object v6, v1, Lb/o$a;->bFd:[Ljava/lang/reflect/Type;
+    iget-object v6, v1, Lb/o$a;->bFn:[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;->bFc:[[Ljava/lang/annotation/Annotation;
+    iget-object v8, v1, Lb/o$a;->bFm:[[Ljava/lang/annotation/Annotation;
 
     aget-object v8, v8, v3
 
     if-eqz v8, :cond_14
 
-    iget-object v9, v1, Lb/o$a;->bEZ:[Lb/j;
+    iget-object v9, v1, Lb/o$a;->bFj:[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;->bEB:Ljava/lang/String;
+    iget-object v2, v1, Lb/o$a;->bEL:Ljava/lang/String;
 
     if-nez v2, :cond_18
 
-    iget-boolean v2, v1, Lb/o$a;->bFk:Z
+    iget-boolean v2, v1, Lb/o$a;->bFu:Z
 
     if-eqz v2, :cond_17
 
@@ -845,7 +845,7 @@
 
     new-array v2, v7, [Ljava/lang/Object;
 
-    iget-object v3, v1, Lb/o$a;->bEW:Ljava/lang/String;
+    iget-object v3, v1, Lb/o$a;->bFg:Ljava/lang/String;
 
     aput-object v3, v2, v5
 
@@ -857,20 +857,20 @@
 
     :cond_18
     :goto_4
-    iget-boolean v2, v1, Lb/o$a;->bEX:Z
-
-    if-nez v2, :cond_1a
-
-    iget-boolean v2, v1, Lb/o$a;->bEY:Z
-
-    if-nez v2, :cond_1a
-
-    iget-boolean v2, v1, Lb/o$a;->bEE:Z
-
-    if-nez v2, :cond_1a
-
     iget-boolean v2, v1, Lb/o$a;->bFh:Z
 
+    if-nez v2, :cond_1a
+
+    iget-boolean v2, v1, Lb/o$a;->bFi:Z
+
+    if-nez v2, :cond_1a
+
+    iget-boolean v2, v1, Lb/o$a;->bEO:Z
+
+    if-nez v2, :cond_1a
+
+    iget-boolean v2, v1, Lb/o$a;->bFr:Z
+
     if-nez v2, :cond_19
 
     goto :goto_5
@@ -888,11 +888,11 @@
 
     :cond_1a
     :goto_5
-    iget-boolean v2, v1, Lb/o$a;->bEX:Z
+    iget-boolean v2, v1, Lb/o$a;->bFh:Z
 
     if-eqz v2, :cond_1c
 
-    iget-boolean v2, v1, Lb/o$a;->bFf:Z
+    iget-boolean v2, v1, Lb/o$a;->bFp:Z
 
     if-eqz v2, :cond_1b
 
@@ -911,11 +911,11 @@
 
     :cond_1c
     :goto_6
-    iget-boolean v2, v1, Lb/o$a;->bEY:Z
+    iget-boolean v2, v1, Lb/o$a;->bFi:Z
 
     if-eqz v2, :cond_1e
 
-    iget-boolean v2, v1, Lb/o$a;->bFg:Z
+    iget-boolean v2, v1, Lb/o$a;->bFq: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;->bEK:Ljava/util/Map;
+    iget-object v1, p0, Lb/n;->bEU: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;->bFe:Ljava/lang/reflect/Type;
+    iget-object v2, v1, Lb/o$a;->bFo: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 ff060e5a4e..51702a133c 100644
--- a/com.discord/smali/b/o$a.smali
+++ b/com.discord/smali/b/o$a.smali
@@ -26,11 +26,11 @@
 
 
 # instance fields
-.field bEB:Ljava/lang/String;
+.field bEL:Ljava/lang/String;
 
-.field bEE:Z
+.field bEO:Z
 
-.field bEU:Lb/c;
+.field bFe:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field bEV:Lb/e;
+.field bFf:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -49,13 +49,13 @@
     .end annotation
 .end field
 
-.field bEW:Ljava/lang/String;
+.field bFg:Ljava/lang/String;
 
-.field bEX:Z
+.field bFh:Z
 
-.field bEY:Z
+.field bFi:Z
 
-.field bEZ:[Lb/j;
+.field bFj:[Lb/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -65,29 +65,29 @@
     .end annotation
 .end field
 
-.field final bFa:Lb/n;
+.field final bFk:Lb/n;
 
-.field final bFb:[Ljava/lang/annotation/Annotation;
+.field final bFl:[Ljava/lang/annotation/Annotation;
 
-.field final bFc:[[Ljava/lang/annotation/Annotation;
+.field final bFm:[[Ljava/lang/annotation/Annotation;
 
-.field final bFd:[Ljava/lang/reflect/Type;
+.field final bFn:[Ljava/lang/reflect/Type;
 
-.field bFe:Ljava/lang/reflect/Type;
+.field bFo:Ljava/lang/reflect/Type;
 
-.field bFf:Z
+.field bFp:Z
 
-.field bFg:Z
+.field bFq:Z
 
-.field bFh:Z
+.field bFr:Z
 
-.field bFi:Z
+.field bFs:Z
 
-.field bFj:Z
+.field bFt:Z
 
-.field bFk:Z
+.field bFu:Z
 
-.field bFl:Ljava/util/Set;
+.field bFv:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -97,11 +97,11 @@
     .end annotation
 .end field
 
-.field final bhi:Ljava/lang/reflect/Method;
+.field final bhs:Ljava/lang/reflect/Method;
 
-.field bru:Lokhttp3/MediaType;
+.field brE:Lokhttp3/MediaType;
 
-.field brx:Lokhttp3/Headers;
+.field brH:Lokhttp3/Headers;
 
 
 # direct methods
@@ -110,27 +110,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iput-object p1, p0, Lb/o$a;->bFk:Lb/n;
 
-    iput-object p2, p0, Lb/o$a;->bhi:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lb/o$a;->bhs: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;->bFb:[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->bFl:[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;->bFd:[Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lb/o$a;->bFn:[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;->bFc:[[Ljava/lang/annotation/Annotation;
+    iput-object p1, p0, Lb/o$a;->bFm:[[Ljava/lang/annotation/Annotation;
 
     return-void
 .end method
@@ -160,23 +160,23 @@
 
     if-eqz v0, :cond_6
 
-    iget-boolean p3, p0, Lb/o$a;->bFk:Z
+    iget-boolean p3, p0, Lb/o$a;->bFu:Z
 
     if-nez p3, :cond_5
 
-    iget-boolean p3, p0, Lb/o$a;->bFi:Z
+    iget-boolean p3, p0, Lb/o$a;->bFs:Z
 
     if-nez p3, :cond_4
 
-    iget-boolean p3, p0, Lb/o$a;->bFj:Z
+    iget-boolean p3, p0, Lb/o$a;->bFt:Z
 
     if-nez p3, :cond_3
 
-    iget-object p3, p0, Lb/o$a;->bEB:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bEL:Ljava/lang/String;
 
     if-nez p3, :cond_2
 
-    iput-boolean v2, p0, Lb/o$a;->bFk:Z
+    iput-boolean v2, p0, Lb/o$a;->bFu: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;->bEW:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bFg:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -282,19 +282,19 @@
 
     if-eqz v0, :cond_c
 
-    iget-boolean v0, p0, Lb/o$a;->bFj:Z
+    iget-boolean v0, p0, Lb/o$a;->bFt:Z
 
     if-nez v0, :cond_b
 
-    iget-boolean v0, p0, Lb/o$a;->bFk:Z
+    iget-boolean v0, p0, Lb/o$a;->bFu:Z
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lb/o$a;->bEB:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->bEL:Ljava/lang/String;
 
     if-eqz v0, :cond_9
 
-    iput-boolean v2, p0, Lb/o$a;->bFi:Z
+    iput-boolean v2, p0, Lb/o$a;->bFs:Z
 
     check-cast p4, Lb/c/s;
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lb/o;->bET:Ljava/util/regex/Pattern;
+    sget-object v1, Lb/o;->bFd: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;->bFl:Ljava/util/Set;
+    iget-object v1, p0, Lb/o$a;->bFv: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;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk: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;->IE()Z
+    invoke-interface {p4}, Lb/c/s;->IH()Z
 
     move-result p3
 
@@ -341,7 +341,7 @@
     :cond_7
     new-array p2, v4, [Ljava/lang/Object;
 
-    iget-object p3, p0, Lb/o$a;->bEB:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bEL: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;->bES:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->bFc: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;->bEW:Ljava/lang/String;
+    iget-object p3, p0, Lb/o$a;->bFg:Ljava/lang/String;
 
     aput-object p3, p2, v3
 
@@ -426,7 +426,7 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/t;->IE()Z
+    invoke-interface {p4}, Lb/c/t;->IH()Z
 
     move-result p4
 
@@ -434,7 +434,7 @@
 
     move-result-object v4
 
-    iput-boolean v2, p0, Lb/o$a;->bFj:Z
+    iput-boolean v2, p0, Lb/o$a;->bFt:Z
 
     const-class v2, Ljava/lang/Iterable;
 
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->It()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Iw()Lb/j;
 
     move-result-object p1
 
@@ -518,7 +518,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->Iu()Lb/j;
+    invoke-virtual {p2}, Lb/j$i;->Ix()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_f
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk: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;->IE()Z
+    invoke-interface {p4}, Lb/c/v;->IH()Z
 
     move-result p4
 
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    iput-boolean v2, p0, Lb/o$a;->bFj:Z
+    iput-boolean v2, p0, Lb/o$a;->bFt:Z
 
     const-class v2, Ljava/lang/Iterable;
 
@@ -582,7 +582,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->It()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Iw()Lb/j;
 
     move-result-object p1
 
@@ -646,7 +646,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->Iu()Lb/j;
+    invoke-virtual {p2}, Lb/j$k;->Ix()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_13
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk: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;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->IE()Z
+    invoke-interface {p4}, Lb/c/u;->IH()Z
 
     move-result p3
 
@@ -808,7 +808,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->It()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Iw()Lb/j;
 
     move-result-object p1
 
@@ -872,7 +872,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->Iu()Lb/j;
+    invoke-virtual {p2}, Lb/j$d;->Ix()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_1b
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk: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;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->bEX:Z
+    iget-boolean v0, p0, Lb/o$a;->bFh:Z
 
     if-eqz v0, :cond_24
 
@@ -1008,11 +1008,11 @@
 
     move-result-object v0
 
-    invoke-interface {p4}, Lb/c/c;->IE()Z
+    invoke-interface {p4}, Lb/c/c;->IH()Z
 
     move-result p4
 
-    iput-boolean v2, p0, Lb/o$a;->bFf:Z
+    iput-boolean v2, p0, Lb/o$a;->bFp: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;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->It()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Iw()Lb/j;
 
     move-result-object p1
 
@@ -1100,7 +1100,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->Iu()Lb/j;
+    invoke-virtual {p2}, Lb/j$b;->Ix()Lb/j;
 
     move-result-object p1
 
     return-object p1
 
     :cond_23
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk: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;->bEX:Z
+    iget-boolean v0, p0, Lb/o$a;->bFh:Z
 
     if-eqz v0, :cond_29
 
@@ -1185,19 +1185,19 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p2, p0, Lb/o$a;->bFk: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;->bFf:Z
+    iput-boolean v2, p0, Lb/o$a;->bFp:Z
 
     new-instance p2, Lb/j$c;
 
     check-cast p4, Lb/c/d;
 
-    invoke-interface {p4}, Lb/c/d;->IE()Z
+    invoke-interface {p4}, Lb/c/d;->IH()Z
 
     move-result p3
 
@@ -1260,13 +1260,13 @@
 
     if-eqz v0, :cond_39
 
-    iget-boolean v0, p0, Lb/o$a;->bEY:Z
+    iget-boolean v0, p0, Lb/o$a;->bFi:Z
 
     if-eqz v0, :cond_38
 
     check-cast p4, Lb/c/q;
 
-    iput-boolean v2, p0, Lb/o$a;->bFg:Z
+    iput-boolean v2, p0, Lb/o$a;->bFq: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;->bEy:Lb/j$l;
+    sget-object p1, Lb/j$l;->bEI:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->It()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Iw()Lb/j;
 
     move-result-object p1
 
@@ -1383,9 +1383,9 @@
 
     if-eqz p2, :cond_2e
 
-    sget-object p1, Lb/j$l;->bEy:Lb/j$l;
+    sget-object p1, Lb/j$l;->bEI:Lb/j$l;
 
-    invoke-virtual {p1}, Lb/j$l;->Iu()Lb/j;
+    invoke-virtual {p1}, Lb/j$l;->Ix()Lb/j;
 
     move-result-object p1
 
@@ -1409,7 +1409,7 @@
 
     if-eqz p2, :cond_30
 
-    sget-object p1, Lb/j$l;->bEy:Lb/j$l;
+    sget-object p1, Lb/j$l;->bEI:Lb/j$l;
 
     return-object p1
 
@@ -1455,7 +1455,7 @@
 
     const/4 v0, 0x3
 
-    invoke-interface {p4}, Lb/c/q;->IH()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/q;->IK()Ljava/lang/String;
 
     move-result-object p4
 
@@ -1497,9 +1497,9 @@
 
     if-nez v0, :cond_32
 
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFb:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFl:[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;->It()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Iw()Lb/j;
 
     move-result-object p1
 
@@ -1580,9 +1580,9 @@
 
     if-nez v0, :cond_35
 
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFb:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFl:[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;->Iu()Lb/j;
+    invoke-virtual {p2}, Lb/j$f;->Ix()Lb/j;
 
     move-result-object p1
 
@@ -1616,9 +1616,9 @@
 
     if-nez v0, :cond_37
 
-    iget-object p1, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFb:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFl:[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;->bEY:Z
+    iget-boolean v0, p0, Lb/o$a;->bFi:Z
 
     if-eqz v0, :cond_3e
 
-    iput-boolean v2, p0, Lb/o$a;->bFg:Z
+    iput-boolean v2, p0, Lb/o$a;->bFq: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;->bFa:Lb/n;
+    iget-object p1, p0, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFb:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFl:[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;->IH()Ljava/lang/String;
+    invoke-interface {p4}, Lb/c/r;->IK()Ljava/lang/String;
 
     move-result-object p3
 
@@ -1795,22 +1795,22 @@
 
     if-eqz p4, :cond_42
 
-    iget-boolean p4, p0, Lb/o$a;->bEX:Z
-
-    if-nez p4, :cond_41
-
-    iget-boolean p4, p0, Lb/o$a;->bEY:Z
-
-    if-nez p4, :cond_41
-
     iget-boolean p4, p0, Lb/o$a;->bFh:Z
 
+    if-nez p4, :cond_41
+
+    iget-boolean p4, p0, Lb/o$a;->bFi:Z
+
+    if-nez p4, :cond_41
+
+    iget-boolean p4, p0, Lb/o$a;->bFr:Z
+
     if-nez p4, :cond_40
 
     :try_start_0
-    iget-object p4, p0, Lb/o$a;->bFa:Lb/n;
+    iget-object p4, p0, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, p0, Lb/o$a;->bFb:[Ljava/lang/annotation/Annotation;
+    iget-object v0, p0, Lb/o$a;->bFl:[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;->bFh:Z
+    iput-boolean v2, p0, Lb/o$a;->bFr:Z
 
     new-instance p2, Lb/j$a;
 
@@ -1893,7 +1893,7 @@
 
 
 # virtual methods
-.method final IA()Lb/c;
+.method final ID()Lb/c;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1903,7 +1903,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->bhi:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->bhs: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;->bhi:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lb/o$a;->bhs: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;->bFa:Lb/n;
+    iget-object v5, p0, Lb/o$a;->bFk:Lb/n;
 
     const-string v6, "returnType == null"
 
@@ -1942,7 +1942,7 @@
 
     invoke-static {v1, v6}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v1, v5, Lb/n;->bEN:Ljava/util/List;
+    iget-object v1, v5, Lb/n;->bEX: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;->bEN:Ljava/util/List;
+    iget-object v2, v5, Lb/n;->bEX: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;->bEN:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->bEX: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;->bEN:Ljava/util/List;
+    iget-object v6, v5, Lb/n;->bEX: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;->bEN:Ljava/util/List;
+    iget-object v7, v5, Lb/n;->bEX: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 IB()Lb/e;
+.method final IE()Lb/e;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2104,7 +2104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lb/o$a;->bhi:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lb/o$a;->bhs: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;->bFa:Lb/n;
+    iget-object v2, p0, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v3, p0, Lb/o$a;->bFe:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->bFo:Ljava/lang/reflect/Type;
 
     const-string v4, "type == null"
 
@@ -2125,7 +2125,7 @@
 
     invoke-static {v0, v4}, Lb/p;->g(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v4, v2, Lb/n;->bEM:Ljava/util/List;
+    iget-object v4, v2, Lb/n;->bEW:Ljava/util/List;
 
     const/4 v5, 0x0
 
@@ -2135,7 +2135,7 @@
 
     add-int/2addr v4, v1
 
-    iget-object v5, v2, Lb/n;->bEM:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object v7, v2, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object v3, v2, Lb/n;->bEW: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;->bEM:Ljava/util/List;
+    iget-object v5, v2, Lb/n;->bEW: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;->bFe:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lb/o$a;->bFo: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;->bhi:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->bhs: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;->bhi:Ljava/lang/reflect/Method;
+    iget-object p2, p0, Lb/o$a;->bhs:Ljava/lang/reflect/Method;
 
     invoke-virtual {p2}, Ljava/lang/reflect/Method;->getName()Ljava/lang/String;
 
@@ -2428,7 +2428,7 @@
 .method final e(Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 4
 
-    iget-object v0, p0, Lb/o$a;->bEW:Ljava/lang/String;
+    iget-object v0, p0, Lb/o$a;->bFg:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -2438,9 +2438,9 @@
 
     if-nez v0, :cond_3
 
-    iput-object p1, p0, Lb/o$a;->bEW:Ljava/lang/String;
+    iput-object p1, p0, Lb/o$a;->bFg:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lb/o$a;->bEE:Z
+    iput-boolean p3, p0, Lb/o$a;->bEO:Z
 
     invoke-virtual {p2}, Ljava/lang/String;->isEmpty()Z
 
@@ -2475,7 +2475,7 @@
 
     move-result-object p1
 
-    sget-object p3, Lb/o;->bES:Ljava/util/regex/Pattern;
+    sget-object p3, Lb/o;->bFc: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;->bEB:Ljava/lang/String;
+    iput-object p2, p0, Lb/o$a;->bEL:Ljava/lang/String;
 
     invoke-static {p2}, Lb/o;->eG(Ljava/lang/String;)Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lb/o$a;->bFl:Ljava/util/Set;
+    iput-object p1, p0, Lb/o$a;->bFv:Ljava/util/Set;
 
     return-void
 
@@ -2602,7 +2602,7 @@
 
     if-eqz v5, :cond_0
 
-    iput-object v5, p0, Lb/o$a;->bru:Lokhttp3/MediaType;
+    iput-object v5, p0, Lb/o$a;->brE:Lokhttp3/MediaType;
 
     goto :goto_1
 
@@ -2641,7 +2641,7 @@
     throw p1
 
     :cond_3
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object p1
 
diff --git a/com.discord/smali/b/o.smali b/com.discord/smali/b/o.smali
index 6fb16cbaf1..2f7ce49f86 100644
--- a/com.discord/smali/b/o.smali
+++ b/com.discord/smali/b/o.smali
@@ -23,21 +23,21 @@
 
 
 # static fields
-.field static final bES:Ljava/util/regex/Pattern;
+.field static final bFc:Ljava/util/regex/Pattern;
 
-.field static final bET:Ljava/util/regex/Pattern;
+.field static final bFd:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bEA:Lokhttp3/s;
+.field private final bEK:Lokhttp3/s;
 
-.field private final bEB:Ljava/lang/String;
+.field private final bEL:Ljava/lang/String;
 
-.field private final bEE:Z
+.field private final bEO:Z
 
-.field final bEL:Lokhttp3/e$a;
+.field final bEV:Lokhttp3/e$a;
 
-.field final bEU:Lb/c;
+.field final bFe:Lb/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/c<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field final bEV:Lb/e;
+.field final bFf:Lb/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lb/e<",
@@ -56,13 +56,13 @@
     .end annotation
 .end field
 
-.field private final bEW:Ljava/lang/String;
+.field private final bFg:Ljava/lang/String;
 
-.field private final bEX:Z
+.field private final bFh:Z
 
-.field private final bEY:Z
+.field private final bFi:Z
 
-.field private final bEZ:[Lb/j;
+.field private final bFj:[Lb/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -72,9 +72,9 @@
     .end annotation
 .end field
 
-.field private final bru:Lokhttp3/MediaType;
+.field private final brE:Lokhttp3/MediaType;
 
-.field private final brx:Lokhttp3/Headers;
+.field private final brH:Lokhttp3/Headers;
 
 
 # direct methods
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lb/o;->bES:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->bFc: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;->bET:Ljava/util/regex/Pattern;
+    sput-object v0, Lb/o;->bFd: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;->bFa:Lb/n;
+    iget-object v0, p1, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, v0, Lb/n;->bEL:Lokhttp3/e$a;
+    iget-object v0, v0, Lb/n;->bEV:Lokhttp3/e$a;
 
-    iput-object v0, p0, Lb/o;->bEL:Lokhttp3/e$a;
+    iput-object v0, p0, Lb/o;->bEV:Lokhttp3/e$a;
 
-    iget-object v0, p1, Lb/o$a;->bEU:Lb/c;
+    iget-object v0, p1, Lb/o$a;->bFe:Lb/c;
 
-    iput-object v0, p0, Lb/o;->bEU:Lb/c;
+    iput-object v0, p0, Lb/o;->bFe:Lb/c;
 
-    iget-object v0, p1, Lb/o$a;->bFa:Lb/n;
+    iget-object v0, p1, Lb/o$a;->bFk:Lb/n;
 
-    iget-object v0, v0, Lb/n;->bEA:Lokhttp3/s;
+    iget-object v0, v0, Lb/n;->bEK:Lokhttp3/s;
 
-    iput-object v0, p0, Lb/o;->bEA:Lokhttp3/s;
+    iput-object v0, p0, Lb/o;->bEK:Lokhttp3/s;
 
-    iget-object v0, p1, Lb/o$a;->bEV:Lb/e;
+    iget-object v0, p1, Lb/o$a;->bFf:Lb/e;
 
-    iput-object v0, p0, Lb/o;->bEV:Lb/e;
+    iput-object v0, p0, Lb/o;->bFf:Lb/e;
 
-    iget-object v0, p1, Lb/o$a;->bEW:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->bFg:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->bEW:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->bFg:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->bEB:Ljava/lang/String;
+    iget-object v0, p1, Lb/o$a;->bEL:Ljava/lang/String;
 
-    iput-object v0, p0, Lb/o;->bEB:Ljava/lang/String;
+    iput-object v0, p0, Lb/o;->bEL:Ljava/lang/String;
 
-    iget-object v0, p1, Lb/o$a;->brx:Lokhttp3/Headers;
+    iget-object v0, p1, Lb/o$a;->brH:Lokhttp3/Headers;
 
-    iput-object v0, p0, Lb/o;->brx:Lokhttp3/Headers;
+    iput-object v0, p0, Lb/o;->brH:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lb/o$a;->bru:Lokhttp3/MediaType;
+    iget-object v0, p1, Lb/o$a;->brE:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lb/o;->bru:Lokhttp3/MediaType;
+    iput-object v0, p0, Lb/o;->brE:Lokhttp3/MediaType;
 
-    iget-boolean v0, p1, Lb/o$a;->bEE:Z
+    iget-boolean v0, p1, Lb/o$a;->bEO:Z
 
-    iput-boolean v0, p0, Lb/o;->bEE:Z
+    iput-boolean v0, p0, Lb/o;->bEO:Z
 
-    iget-boolean v0, p1, Lb/o$a;->bEX:Z
+    iget-boolean v0, p1, Lb/o$a;->bFh:Z
 
-    iput-boolean v0, p0, Lb/o;->bEX:Z
+    iput-boolean v0, p0, Lb/o;->bFh:Z
 
-    iget-boolean v0, p1, Lb/o$a;->bEY:Z
+    iget-boolean v0, p1, Lb/o$a;->bFi:Z
 
-    iput-boolean v0, p0, Lb/o;->bEY:Z
+    iput-boolean v0, p0, Lb/o;->bFi:Z
 
-    iget-object p1, p1, Lb/o$a;->bEZ:[Lb/j;
+    iget-object p1, p1, Lb/o$a;->bFj:[Lb/j;
 
-    iput-object p1, p0, Lb/o;->bEZ:[Lb/j;
+    iput-object p1, p0, Lb/o;->bFj:[Lb/j;
 
     return-void
 .end method
@@ -265,7 +265,7 @@
         }
     .end annotation
 
-    sget-object v0, Lb/o;->bES:Ljava/util/regex/Pattern;
+    sget-object v0, Lb/o;->bFc:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -312,27 +312,27 @@
 
     new-instance v9, Lb/l;
 
-    iget-object v1, p0, Lb/o;->bEW:Ljava/lang/String;
+    iget-object v1, p0, Lb/o;->bFg:Ljava/lang/String;
 
-    iget-object v2, p0, Lb/o;->bEA:Lokhttp3/s;
+    iget-object v2, p0, Lb/o;->bEK:Lokhttp3/s;
 
-    iget-object v3, p0, Lb/o;->bEB:Ljava/lang/String;
+    iget-object v3, p0, Lb/o;->bEL:Ljava/lang/String;
 
-    iget-object v4, p0, Lb/o;->brx:Lokhttp3/Headers;
+    iget-object v4, p0, Lb/o;->brH:Lokhttp3/Headers;
 
-    iget-object v5, p0, Lb/o;->bru:Lokhttp3/MediaType;
+    iget-object v5, p0, Lb/o;->brE:Lokhttp3/MediaType;
 
-    iget-boolean v6, p0, Lb/o;->bEE:Z
+    iget-boolean v6, p0, Lb/o;->bEO:Z
 
-    iget-boolean v7, p0, Lb/o;->bEX:Z
+    iget-boolean v7, p0, Lb/o;->bFh:Z
 
-    iget-boolean v8, p0, Lb/o;->bEY:Z
+    iget-boolean v8, p0, Lb/o;->bFi: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;->bEZ:[Lb/j;
+    iget-object v0, p0, Lb/o;->bFj:[Lb/j;
 
     const/4 v1, 0x0
 
@@ -364,7 +364,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v9}, Lb/l;->FK()Lokhttp3/w;
+    invoke-virtual {v9}, Lb/l;->FN()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 a494ba530f..a4bf24266c 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;->aTr:[Ljava/lang/reflect/Type;
+    sget-object v0, Lb/p;->aTA:[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 23b6bf0a97..77281850da 100644
--- a/com.discord/smali/b/p.smali
+++ b/com.discord/smali/b/p.smali
@@ -14,7 +14,7 @@
 
 
 # static fields
-.field static final aTr:[Ljava/lang/reflect/Type;
+.field static final aTA:[Ljava/lang/reflect/Type;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     new-array v0, v0, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lb/p;->aTr:[Ljava/lang/reflect/Type;
+    sput-object v0, Lb/p;->aTA:[Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -581,7 +581,7 @@
 
     aput-object p0, p2, v1
 
-    sget-object p0, Lb/p;->aTr:[Ljava/lang/reflect/Type;
+    sget-object p0, Lb/p;->aTA:[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;->FN()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->FQ()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 85c0fe7244..c0e6438a1a 100644
--- a/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
+++ b/com.discord/smali/co/discord/media_engine/VideoStreamRenderer$Muxer.smali
@@ -123,7 +123,7 @@
 
     invoke-interface {p1, p3, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -202,14 +202,14 @@
     invoke-interface {p1, p3}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 07b0cc49f5..dc3e3841ca 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;->bgo:Lkotlin/Unit;
+    sget-object v7, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     move v11, v6
 
@@ -924,7 +924,7 @@
     goto/16 :goto_8
 
     :cond_b
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy: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 d7232dce94..3fca56f01c 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
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static aXT:Lcom/a/a/a/a;
+.field public static aYc:Lcom/a/a/a/a;
 
 
 # instance fields
@@ -97,13 +97,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -211,13 +211,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -317,13 +317,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -423,13 +423,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -529,13 +529,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -635,13 +635,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -741,13 +741,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
@@ -847,13 +847,13 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lcom/a/a/a/a$a;->Bk()Lcom/a/a/a/a;
+    invoke-static {}, Lcom/a/a/a/a$a;->Bn()Lcom/a/a/a/a;
 
     move-result-object v2
 
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 7ea12ae126..918b4650ff 100644
--- a/com.discord/smali/com/a/a/a/a$a.smali
+++ b/com.discord/smali/com/a/a/a/a$a.smali
@@ -36,10 +36,10 @@
     return-void
 .end method
 
-.method public static Bk()Lcom/a/a/a/a;
+.method public static Bn()Lcom/a/a/a/a;
     .locals 1
 
-    sget-object v0, Lcom/a/a/a/a$a$a;->aXT:Lcom/a/a/a/a;
+    sget-object v0, Lcom/a/a/a/a$a$a;->aYc:Lcom/a/a/a/a;
 
     return-object v0
 .end method
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 16b0eb26b0..98cc67ba63 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
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static aXU:Lcom/a/a/a/b;
+.field public static aYd:Lcom/a/a/a/b;
 
 
 # instance fields
@@ -91,13 +91,13 @@
 
     if-nez v2, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
     if-eqz v2, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -190,13 +190,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -305,13 +305,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -412,13 +412,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -519,13 +519,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -610,13 +610,13 @@
 
     if-nez v2, :cond_0
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
     if-eqz v2, :cond_0
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -714,13 +714,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -821,13 +821,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -928,13 +928,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
@@ -1035,13 +1035,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v4
 
     if-eqz v4, :cond_1
 
-    invoke-static {}, Lcom/a/a/a/b$a;->Bl()Lcom/a/a/a/b;
+    invoke-static {}, Lcom/a/a/a/b$a;->Bo()Lcom/a/a/a/b;
 
     move-result-object v2
 
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 c82d1df0fd..46ff8ec24c 100644
--- a/com.discord/smali/com/a/a/a/b$a.smali
+++ b/com.discord/smali/com/a/a/a/b$a.smali
@@ -24,10 +24,10 @@
 
 
 # direct methods
-.method public static Bl()Lcom/a/a/a/b;
+.method public static Bo()Lcom/a/a/a/b;
     .locals 1
 
-    sget-object v0, Lcom/a/a/a/b$a$a;->aXU:Lcom/a/a/a/b;
+    sget-object v0, Lcom/a/a/a/b$a$a;->aYd:Lcom/a/a/a/b;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/adjust/sdk/a$16.smali b/com.discord/smali/com/adjust/sdk/a$16.smali
index 8aed83313d..e10afbecdf 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;->ay:Lcom/adjust/sdk/u;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/u;->do:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/u;->dn: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 a25df5c807..c6517a223a 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;->ay:Lcom/adjust/sdk/u;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/u;->do:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/u;->dn: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 5bfb2d6af1..7c63b89aca 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;->aA:Lcom/adjust/sdk/av;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/av;->do:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/av;->dn: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 81eac8bc01..a8a12fa913 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;->aA:Lcom/adjust/sdk/av;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/av;->do:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/av;->dn: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 741d18f058..5c3f06be8f 100644
--- a/com.discord/smali/com/adjust/sdk/a.smali
+++ b/com.discord/smali/com/adjust/sdk/a.smali
@@ -790,7 +790,7 @@
     :cond_4
     iget-object v0, p0, Lcom/adjust/sdk/a;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cd:Ljava/lang/String;
 
     if-nez v0, :cond_5
 
@@ -804,6 +804,12 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/a;->an:Lcom/adjust/sdk/t;
 
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cg:Ljava/lang/String;
+
+    if-nez v0, :cond_6
+
+    iget-object v0, p0, Lcom/adjust/sdk/a;->an:Lcom/adjust/sdk/t;
+
     iget-object v0, v0, Lcom/adjust/sdk/t;->ch:Ljava/lang/String;
 
     if-nez v0, :cond_6
@@ -814,12 +820,6 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/adjust/sdk/a;->an:Lcom/adjust/sdk/t;
-
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cj:Ljava/lang/String;
-
-    if-nez v0, :cond_6
-
     iget-object v0, p0, Lcom/adjust/sdk/a;->ai:Lcom/adjust/sdk/x;
 
     new-array v1, v9, [Ljava/lang/Object;
@@ -1201,9 +1201,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;->da:Ljava/lang/String;
+    iput-object p5, v0, Lcom/adjust/sdk/am;->cZ:Ljava/lang/String;
 
-    iput-wide p1, v0, Lcom/adjust/sdk/am;->dd:J
+    iput-wide p1, v0, Lcom/adjust/sdk/am;->dc:J
 
     iput-wide p3, v0, Lcom/adjust/sdk/am;->installBeginTimeInSeconds:J
 
@@ -1291,7 +1291,7 @@
     invoke-direct {p0, v0}, Lcom/adjust/sdk/a;->a(Landroid/os/Handler;)V
 
     :cond_0
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->do:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->dn:Z
 
     if-eqz v1, :cond_1
 
@@ -1306,7 +1306,7 @@
     invoke-virtual {v1}, Lcom/adjust/sdk/aw;->aw()V
 
     :cond_1
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->do:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->dn:Z
 
     const/4 v2, 0x0
 
@@ -1335,7 +1335,7 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v1, p1, Lcom/adjust/sdk/av;->do:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/av;->dn:Z
 
     if-nez v1, :cond_3
 
@@ -1530,7 +1530,7 @@
 
     move-result-object v4
 
-    iget-object v5, v2, Lcom/adjust/sdk/am;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v5, v2, Lcom/adjust/sdk/am;->cV:Lcom/adjust/sdk/am$a;
 
     iget v5, v5, Lcom/adjust/sdk/am$a;->eventCount:I
 
@@ -1703,7 +1703,7 @@
     invoke-direct {p0, v0}, Lcom/adjust/sdk/a;->a(Landroid/os/Handler;)V
 
     :cond_0
-    iget-object p1, p1, Lcom/adjust/sdk/p;->bR:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/adjust/sdk/p;->bQ:Landroid/net/Uri;
 
     if-eqz p1, :cond_2
 
@@ -1792,7 +1792,7 @@
 
     invoke-direct {v0, v1}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
 
-    iget-boolean v1, p1, Lcom/adjust/sdk/u;->do:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/u;->dn:Z
 
     const/4 v2, 0x0
 
@@ -1821,7 +1821,7 @@
     return-void
 
     :cond_0
-    iget-boolean v1, p1, Lcom/adjust/sdk/u;->do:Z
+    iget-boolean v1, p1, Lcom/adjust/sdk/u;->dn:Z
 
     if-nez v1, :cond_1
 
@@ -2414,13 +2414,13 @@
 
     long-to-double v4, v4
 
-    sget-object v8, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object v8, Lcom/adjust/sdk/az;->dz: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;->dA:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
 
     invoke-virtual {v1, v4, v5}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -2448,7 +2448,7 @@
     move-wide v2, v4
 
     :goto_1
-    sget-object v4, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object v4, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
 
     invoke-virtual {v4, v0, v1}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -2676,7 +2676,7 @@
 
     iget-object p0, p0, Lcom/adjust/sdk/a;->aj:Lcom/adjust/sdk/ax;
 
-    iget-boolean v0, p0, Lcom/adjust/sdk/ax;->dx:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ax;->dw:Z
 
     const/4 v1, 0x1
 
@@ -2711,7 +2711,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;->dt:Lcom/adjust/sdk/s;
+    iget-object v0, p0, Lcom/adjust/sdk/ax;->ds:Lcom/adjust/sdk/s;
 
     new-instance v4, Lcom/adjust/sdk/ax$1;
 
@@ -2719,19 +2719,19 @@
 
     iget-wide v5, p0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iget-wide v7, p0, Lcom/adjust/sdk/ax;->dw:J
+    iget-wide v7, p0, Lcom/adjust/sdk/ax;->dv:J
 
     sget-object v9, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget-object v3, v0, Lcom/adjust/sdk/s;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v3, v0, Lcom/adjust/sdk/s;->bX: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;->du:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v0, p0, Lcom/adjust/sdk/ax;->dt:Ljava/util/concurrent/ScheduledFuture;
 
-    iput-boolean v2, p0, Lcom/adjust/sdk/ax;->dx:Z
+    iput-boolean v2, p0, Lcom/adjust/sdk/ax;->dw:Z
 
     :cond_1
     return-void
@@ -3123,7 +3123,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/a;->aj:Lcom/adjust/sdk/ax;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/ax;->dx:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/ax;->dw:Z
 
     const/4 v2, 0x1
 
@@ -3146,7 +3146,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/adjust/sdk/ax;->du:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, v0, Lcom/adjust/sdk/ax;->dt:Ljava/util/concurrent/ScheduledFuture;
 
     sget-object v4, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -3156,11 +3156,11 @@
 
     iput-wide v4, v0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iget-object v1, v0, Lcom/adjust/sdk/ax;->du:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, v0, Lcom/adjust/sdk/ax;->dt:Ljava/util/concurrent/ScheduledFuture;
 
     invoke-interface {v1, v3}, Ljava/util/concurrent/ScheduledFuture;->cancel(Z)Z
 
-    sget-object v1, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
 
     iget-wide v4, v0, Lcom/adjust/sdk/ax;->initialDelay:J
 
@@ -3192,7 +3192,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;->dx:Z
+    iput-boolean v2, v0, Lcom/adjust/sdk/ax;->dw:Z
 
     return-void
 .end method
@@ -3288,7 +3288,7 @@
 
     check-cast p1, Lcom/adjust/sdk/at;
 
-    iget-boolean v0, p1, Lcom/adjust/sdk/at;->ds:Z
+    iget-boolean v0, p1, Lcom/adjust/sdk/at;->dr: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 2d00530221..4e5888925b 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 cJ:Lcom/adjust/sdk/ac;
+.field final synthetic cI: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;->cJ:Lcom/adjust/sdk/ac;
+    iput-object p1, p0, Lcom/adjust/sdk/ac$1;->cI: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;->cJ:Lcom/adjust/sdk/ac;
+    iget-object v0, p0, Lcom/adjust/sdk/ac$1;->cI:Lcom/adjust/sdk/ac;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ac;->ae()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ac.smali b/com.discord/smali/com/adjust/sdk/ac.smali
index 3032279a8e..4aea75b15f 100644
--- a/com.discord/smali/com/adjust/sdk/ac.smali
+++ b/com.discord/smali/com/adjust/sdk/ac.smali
@@ -19,15 +19,15 @@
     .end annotation
 .end field
 
-.field private cE:I
+.field private cD:I
 
-.field private cF:Z
+.field private cE:Z
+
+.field private cF:Ljava/lang/Object;
 
 .field private cG:Ljava/lang/Object;
 
-.field private cH:Ljava/lang/Object;
-
-.field private cI:Lcom/adjust/sdk/ay;
+.field private cH:Lcom/adjust/sdk/ay;
 
 .field private context:Landroid/content/Context;
 
@@ -42,7 +42,7 @@
 
     const/16 v0, 0xbb8
 
-    iput v0, p0, Lcom/adjust/sdk/ac;->cE:I
+    iput v0, p0, Lcom/adjust/sdk/ac;->cD:I
 
     invoke-static {}, Lcom/adjust/sdk/j;->Q()Lcom/adjust/sdk/x;
 
@@ -56,11 +56,11 @@
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/adjust/sdk/ac;->cH:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/ac;->cF:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/ac;->cE: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;->cI:Lcom/adjust/sdk/ay;
+    iput-object p1, p0, Lcom/adjust/sdk/ac;->cH:Lcom/adjust/sdk/ay;
 
     new-instance p1, Ljava/lang/ref/WeakReference;
 
@@ -247,14 +247,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;->cH:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/adjust/sdk/ac;->cG: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;->cF:Z
+    iput-boolean v3, p0, Lcom/adjust/sdk/ac;->cE:Z
 
     monitor-exit p1
 
@@ -313,7 +313,7 @@
 .method private a(Ljava/lang/Class;Ljava/lang/Object;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -413,7 +413,7 @@
 .method private ag()Ljava/lang/Object;
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -462,12 +462,12 @@
 .method private ah()V
     .locals 7
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cF:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cE:Z
 
     const/4 v2, 0x0
 
@@ -515,7 +515,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cI:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Lcom/adjust/sdk/ay;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ay;->ay()J
 
@@ -544,9 +544,9 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cI:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Lcom/adjust/sdk/ay;
 
-    iget v1, p0, Lcom/adjust/sdk/ac;->cE:I
+    iget v1, p0, Lcom/adjust/sdk/ac;->cD:I
 
     int-to-long v1, v1
 
@@ -568,7 +568,7 @@
 .method private ai()V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -610,7 +610,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;->cG:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
 
     return-void
 .end method
@@ -846,12 +846,12 @@
 
     invoke-direct {p0}, Lcom/adjust/sdk/ac;->ai()V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ac;->cH:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cF:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ac;->cE:Z
 
     if-eqz v1, :cond_0
 
@@ -880,7 +880,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/ac;->cG:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/adjust/sdk/ac;->cF:Ljava/lang/Object;
 
     invoke-direct {p0}, Lcom/adjust/sdk/ac;->af()Ljava/lang/Class;
 
diff --git a/com.discord/smali/com/adjust/sdk/ad.smali b/com.discord/smali/com/adjust/sdk/ad.smali
index b85ffdb8e5..a7595f0f0e 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 cJ:Lcom/adjust/sdk/ad;
+
 .field public static final enum cK:Lcom/adjust/sdk/ad;
 
 .field public static final enum cL:Lcom/adjust/sdk/ad;
@@ -26,9 +28,7 @@
 
 .field public static final enum cP:Lcom/adjust/sdk/ad;
 
-.field public static final enum cQ:Lcom/adjust/sdk/ad;
-
-.field private static final synthetic cR:[Lcom/adjust/sdk/ad;
+.field private static final synthetic cQ:[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;->cK:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cJ: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;->cL:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cK: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;->cM:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cL: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;->cN:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cM: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;->cO:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cN: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;->cP:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cO: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;->cQ:Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cP:Lcom/adjust/sdk/ad;
 
     new-array v0, v8, [Lcom/adjust/sdk/ad;
 
-    sget-object v8, Lcom/adjust/sdk/ad;->cK:Lcom/adjust/sdk/ad;
+    sget-object v8, Lcom/adjust/sdk/ad;->cJ:Lcom/adjust/sdk/ad;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cL:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cK:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cM:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cL:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cN:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cM:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cO:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cN:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cP:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cO:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/adjust/sdk/ad;->cQ:Lcom/adjust/sdk/ad;
+    sget-object v1, Lcom/adjust/sdk/ad;->cP:Lcom/adjust/sdk/ad;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/adjust/sdk/ad;->cR:[Lcom/adjust/sdk/ad;
+    sput-object v0, Lcom/adjust/sdk/ad;->cQ:[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;->cR:[Lcom/adjust/sdk/ad;
+    sget-object v0, Lcom/adjust/sdk/ad;->cQ:[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 773b933d28..6a83aae8af 100644
--- a/com.discord/smali/com/adjust/sdk/ae.smali
+++ b/com.discord/smali/com/adjust/sdk/ae.smali
@@ -7,16 +7,16 @@
 
 
 # static fields
-.field private static cV:Ljava/lang/String; = "Error formating log message: %s, with params: %s"
+.field private static cU:Ljava/lang/String; = "Error formating log message: %s, with params: %s"
 
 
 # instance fields
-.field private cS:Lcom/adjust/sdk/ad;
+.field private cR:Lcom/adjust/sdk/ad;
+
+.field private cS:Z
 
 .field private cT:Z
 
-.field private cU:Z
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -32,13 +32,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->cU:Z
-
     iput-boolean v0, p0, Lcom/adjust/sdk/ae;->cT:Z
 
-    sget-object v0, Lcom/adjust/sdk/ad;->cM:Lcom/adjust/sdk/ad;
+    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->cS:Z
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
+    sget-object v0, Lcom/adjust/sdk/ad;->cL:Lcom/adjust/sdk/ad;
+
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT: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;->cT:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/ae;->cS:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iput-object p1, p0, Lcom/adjust/sdk/ae;->cR:Lcom/adjust/sdk/ad;
 
-    iput-boolean p2, p0, Lcom/adjust/sdk/ae;->cU:Z
+    iput-boolean p2, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     return-void
 .end method
@@ -69,14 +69,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR: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;->cV:Ljava/lang/String;
+    sget-object v3, Lcom/adjust/sdk/ae;->cU: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;->cT:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ae;->cS:Z
 
     return-void
 .end method
@@ -141,14 +141,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR: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;->cV:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cU:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -205,14 +205,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR: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;->cV:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cU:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -269,14 +269,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR: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;->cV:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cU:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -333,7 +333,7 @@
 
     const-string v0, "Adjust"
 
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR: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;->cV:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cU:Ljava/lang/String;
 
     const/4 v3, 0x2
 
@@ -390,14 +390,14 @@
 
     const-string v0, "Adjust"
 
-    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cU:Z
+    iget-boolean v1, p0, Lcom/adjust/sdk/ae;->cT:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/ae;->cS:Lcom/adjust/sdk/ad;
+    iget-object v1, p0, Lcom/adjust/sdk/ae;->cR: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;->cV:Ljava/lang/String;
+    sget-object v2, Lcom/adjust/sdk/ae;->cU: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 c1afd79356..6288b4fabe 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 de:Lcom/adjust/sdk/am;
+.field final synthetic dd: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;->de:Lcom/adjust/sdk/am;
+    iput-object p1, p0, Lcom/adjust/sdk/am$a;->dd: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 94aecca87d..d96e8a1704 100644
--- a/com.discord/smali/com/adjust/sdk/am.smali
+++ b/com.discord/smali/com/adjust/sdk/am.smali
@@ -24,11 +24,11 @@
 
 .field as:Lcom/adjust/sdk/au;
 
-.field cW:Lcom/adjust/sdk/am$a;
+.field cV:Lcom/adjust/sdk/am$a;
 
-.field private cX:J
+.field private cW:J
 
-.field cY:Ljava/util/Map;
+.field cX:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,6 +39,8 @@
     .end annotation
 .end field
 
+.field cY:Ljava/lang/String;
+
 .field cZ:Ljava/lang/String;
 
 .field clickTimeInMilliseconds:J
@@ -47,9 +49,7 @@
 
 .field db:Ljava/lang/String;
 
-.field dc:Ljava/lang/String;
-
-.field dd:J
+.field dc: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;->dd:J
+    iput-wide v0, p0, Lcom/adjust/sdk/am;->dc: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;->cW:Lcom/adjust/sdk/am$a;
+    iput-object p1, p0, Lcom/adjust/sdk/am;->cV:Lcom/adjust/sdk/am$a;
 
     iput-object p4, p0, Lcom/adjust/sdk/am;->as:Lcom/adjust/sdk/au;
 
-    iput-wide p5, p0, Lcom/adjust/sdk/am;->cX:J
+    iput-wide p5, p0, Lcom/adjust/sdk/am;->cW:J
 
     return-void
 .end method
@@ -113,7 +113,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ck:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cj:Ljava/lang/String;
 
     const-string v1, "fb_id"
 
@@ -129,7 +129,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cl:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ck:Ljava/lang/String;
 
     const-string v1, "app_version"
 
@@ -137,7 +137,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cm:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cl:Ljava/lang/String;
 
     const-string v1, "device_type"
 
@@ -145,7 +145,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cn:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cm:Ljava/lang/String;
 
     const-string v1, "device_name"
 
@@ -153,7 +153,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->co:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cn:Ljava/lang/String;
 
     const-string v1, "device_manufacturer"
 
@@ -161,7 +161,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cp:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->co:Ljava/lang/String;
 
     const-string v1, "os_name"
 
@@ -169,7 +169,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cp:Ljava/lang/String;
 
     const-string v1, "os_version"
 
@@ -177,7 +177,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cr:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cq:Ljava/lang/String;
 
     const-string v1, "api_level"
 
@@ -201,7 +201,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cs:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cr:Ljava/lang/String;
 
     const-string v1, "screen_size"
 
@@ -209,7 +209,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ct:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cs:Ljava/lang/String;
 
     const-string v1, "screen_format"
 
@@ -217,7 +217,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cu:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ct:Ljava/lang/String;
 
     const-string v1, "screen_density"
 
@@ -225,7 +225,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cv:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cu:Ljava/lang/String;
 
     const-string v1, "display_width"
 
@@ -233,7 +233,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cw:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cv:Ljava/lang/String;
 
     const-string v1, "display_height"
 
@@ -241,7 +241,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cx:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cw:Ljava/lang/String;
 
     const-string v1, "hardware_name"
 
@@ -249,7 +249,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cy:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cx:Ljava/lang/String;
 
     const-string v1, "cpu_type"
 
@@ -257,7 +257,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cz:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cy:Ljava/lang/String;
 
     const-string v1, "os_build"
 
@@ -265,7 +265,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cA:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cz:Ljava/lang/String;
 
     const-string v1, "vm_isa"
 
@@ -476,7 +476,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/adjust/sdk/az;->dB:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dA: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;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cf:Ljava/lang/Boolean;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ce:Ljava/lang/Boolean;
 
     const-string v1, "tracking_enabled"
 
@@ -618,7 +618,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cd:Ljava/lang/String;
 
     const-string v1, "gps_adid"
 
@@ -626,13 +626,13 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cd:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ch:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cg:Ljava/lang/String;
 
     const-string v1, "mac_sha1"
 
@@ -640,7 +640,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->ci:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ch:Ljava/lang/String;
 
     const-string v1, "mac_md5"
 
@@ -648,7 +648,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cj:Ljava/lang/String;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->ci: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;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cV: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;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cV: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;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cV: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;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cV: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;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cV: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;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v0, p0, Lcom/adjust/sdk/am;->cV:Lcom/adjust/sdk/am$a;
 
     iget-wide v0, v0, Lcom/adjust/sdk/am$a;->timeSpent:J
 
@@ -979,7 +979,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/adjust/sdk/am;->cW:Lcom/adjust/sdk/am$a;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cV:Lcom/adjust/sdk/am$a;
 
     iget-wide v1, v1, Lcom/adjust/sdk/am$a;->lastInterval:J
 
@@ -997,7 +997,7 @@
 
     iget-object v1, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v1, v1, Lcom/adjust/sdk/t;->cB:Ljava/lang/String;
+    iget-object v1, v1, Lcom/adjust/sdk/t;->cA:Ljava/lang/String;
 
     const-string v2, "installed_at"
 
@@ -1005,7 +1005,7 @@
 
     iget-object v1, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v1, v1, Lcom/adjust/sdk/t;->cC:Ljava/lang/String;
+    iget-object v1, v1, Lcom/adjust/sdk/t;->cB:Ljava/lang/String;
 
     const-string v2, "updated_at"
 
@@ -1045,7 +1045,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/adjust/sdk/am;->cX:J
+    iget-wide v0, p0, Lcom/adjust/sdk/am;->cW:J
 
     const-string v2, "created_at"
 
@@ -1190,7 +1190,7 @@
 
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cD:Ljava/util/Map;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cC:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
@@ -1199,7 +1199,7 @@
     :cond_0
     iget-object v0, p0, Lcom/adjust/sdk/am;->an:Lcom/adjust/sdk/t;
 
-    iget-object v0, v0, Lcom/adjust/sdk/t;->cD:Ljava/util/Map;
+    iget-object v0, v0, Lcom/adjust/sdk/t;->cC:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1361,37 +1361,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;->cZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cY: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;->cY:Ljava/util/Map;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cX: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;->da:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->cZ: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;->db:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->da: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;->dc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/adjust/sdk/am;->db: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;->dd:J
+    iget-wide v1, p0, Lcom/adjust/sdk/am;->dc:J
 
     invoke-static {v0, p1, v1, v2}, Lcom/adjust/sdk/am;->c(Ljava/util/Map;Ljava/lang/String;J)V
 
@@ -1421,7 +1421,7 @@
 
     iput-wide v1, p1, Lcom/adjust/sdk/c;->clickTimeInMilliseconds:J
 
-    iget-wide v1, p0, Lcom/adjust/sdk/am;->dd:J
+    iget-wide v1, p0, Lcom/adjust/sdk/am;->dc: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 2efa5d35e7..3a7c8000bd 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;->cY:Ljava/util/Map;
+    iput-object v7, v10, Lcom/adjust/sdk/am;->cX:Ljava/util/Map;
 
     iput-object v8, v10, Lcom/adjust/sdk/am;->ap:Lcom/adjust/sdk/AdjustAttribution;
 
-    iput-object v9, v10, Lcom/adjust/sdk/am;->cZ:Ljava/lang/String;
+    iput-object v9, v10, Lcom/adjust/sdk/am;->cY: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;->da:Ljava/lang/String;
+    iput-object v1, p3, Lcom/adjust/sdk/am;->cZ:Ljava/lang/String;
 
     iput-wide p1, p3, Lcom/adjust/sdk/am;->clickTimeInMilliseconds:J
 
-    iput-object p0, p3, Lcom/adjust/sdk/am;->db:Ljava/lang/String;
+    iput-object p0, p3, Lcom/adjust/sdk/am;->da: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 d2f3c8021e..cb9b00594c 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 di:Lcom/adjust/sdk/ao;
+.field final synthetic dh: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;->di:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$1;->dh: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$1;->dh: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;->dg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v2, v1, Lcom/adjust/sdk/ao;->df: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;->df:Ljava/util/List;
+    iput-object v4, v1, Lcom/adjust/sdk/ao;->de: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;->df:Ljava/util/List;
+    iput-object v0, v1, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
 
     :goto_0
-    iget-object v0, v1, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
+    iget-object v0, v1, Lcom/adjust/sdk/ao;->de: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;->df:Ljava/util/List;
+    iget-object v1, v1, Lcom/adjust/sdk/ao;->de: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;->df:Ljava/util/List;
+    iput-object v0, v1, Lcom/adjust/sdk/ao;->de: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 e682b91a04..b52f96c07a 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 di:Lcom/adjust/sdk/ao;
+.field final synthetic dh:Lcom/adjust/sdk/ao;
 
-.field final synthetic dj:Lcom/adjust/sdk/c;
+.field final synthetic di: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;->di:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$2;->dh:Lcom/adjust/sdk/ao;
 
-    iput-object p2, p0, Lcom/adjust/sdk/ao$2;->dj:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/ao$2;->di: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$2;->dh:Lcom/adjust/sdk/ao;
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$2;->dj:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$2;->di:Lcom/adjust/sdk/c;
 
-    iget-object v2, v0, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
+    iget-object v2, v0, Lcom/adjust/sdk/ao;->de: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;->df:Ljava/util/List;
+    iget-object v4, v0, Lcom/adjust/sdk/ao;->de: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 5531e02f09..d66967cb8a 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 di:Lcom/adjust/sdk/ao;
+.field final synthetic dh: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;->di:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$3;->dh: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$3;->dh:Lcom/adjust/sdk/ao;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ao;->am()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$4.smali b/com.discord/smali/com/adjust/sdk/ao$4.smali
index 4259b1d9be..3efaf4fc06 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 di:Lcom/adjust/sdk/ao;
+.field final synthetic dh: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;->di:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$4;->dh: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$4;->dh:Lcom/adjust/sdk/ao;
 
-    iget-object v1, v0, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -47,7 +47,7 @@
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ao;->an()V
 
-    iget-object v1, v0, Lcom/adjust/sdk/ao;->dg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lcom/adjust/sdk/ao;->df: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 a9f2a90c01..1b50f38b92 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 di:Lcom/adjust/sdk/ao;
+.field final synthetic dh: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;->di:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$5;->dh: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->dh:Lcom/adjust/sdk/ao;
 
     iget-object v0, v0, Lcom/adjust/sdk/ao;->ai: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->dh:Lcom/adjust/sdk/ao;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ao;->dg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/adjust/sdk/ao;->df: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$5;->dh:Lcom/adjust/sdk/ao;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/ao;->ac()V
 
diff --git a/com.discord/smali/com/adjust/sdk/ao$6.smali b/com.discord/smali/com/adjust/sdk/ao$6.smali
index cc12c9e13a..d8b4289d53 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 di:Lcom/adjust/sdk/ao;
+.field final synthetic dh:Lcom/adjust/sdk/ao;
 
-.field final synthetic dk:Lcom/adjust/sdk/au;
+.field final synthetic dj: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;->di:Lcom/adjust/sdk/ao;
+    iput-object p1, p0, Lcom/adjust/sdk/ao$6;->dh:Lcom/adjust/sdk/ao;
 
-    iput-object p2, p0, Lcom/adjust/sdk/ao$6;->dk:Lcom/adjust/sdk/au;
+    iput-object p2, p0, Lcom/adjust/sdk/ao$6;->dj: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;->di:Lcom/adjust/sdk/ao;
+    iget-object v0, p0, Lcom/adjust/sdk/ao$6;->dh:Lcom/adjust/sdk/ao;
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao$6;->dk:Lcom/adjust/sdk/au;
+    iget-object v1, p0, Lcom/adjust/sdk/ao$6;->dj: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;->df:Ljava/util/List;
+    iget-object v2, v0, Lcom/adjust/sdk/ao;->de: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 04616d7fe3..a397436eef 100644
--- a/com.discord/smali/com/adjust/sdk/ao.smali
+++ b/com.discord/smali/com/adjust/sdk/ao.smali
@@ -23,11 +23,9 @@
     .end annotation
 .end field
 
-.field private bP:Z
-
 .field context:Landroid/content/Context;
 
-.field df:Ljava/util/List;
+.field de:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,9 +35,11 @@
     .end annotation
 .end field
 
-.field dg:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field df:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private dh:Lcom/adjust/sdk/q;
+.field private dg: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;->dh:Lcom/adjust/sdk/q;
+    iput-object v0, p0, Lcom/adjust/sdk/ao;->dg:Lcom/adjust/sdk/q;
 
     invoke-virtual {p0, p1, p2, p3}, Lcom/adjust/sdk/ao;->b(Lcom/adjust/sdk/v;Landroid/content/Context;Z)V
 
@@ -90,7 +90,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->bP:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->paused:Z
 
     return-void
 .end method
@@ -130,7 +130,7 @@
 
     move-result p2
 
-    iget-object v1, p0, Lcom/adjust/sdk/ao;->dh:Lcom/adjust/sdk/q;
+    iget-object v1, p0, Lcom/adjust/sdk/ao;->dg:Lcom/adjust/sdk/q;
 
     invoke-static {p2, v1}, Lcom/adjust/sdk/az;->a(ILcom/adjust/sdk/q;)J
 
@@ -144,7 +144,7 @@
 
     div-double/2addr v3, v5
 
-    sget-object v5, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object v5, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
 
     invoke-virtual {v5, v3, v4}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -250,7 +250,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->bP:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/ao;->paused:Z
 
     return-void
 .end method
@@ -272,7 +272,7 @@
 .method final am()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->de: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;->bP: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;->dg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->df: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;->df:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->de: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;->bA:Lcom/adjust/sdk/z;
 
-    iget-object v3, p0, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
+    iget-object v3, p0, Lcom/adjust/sdk/ao;->de:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->size()I
 
@@ -347,7 +347,7 @@
 .method final an()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ao;->df:Ljava/util/List;
+    iget-object v0, p0, Lcom/adjust/sdk/ao;->de: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;->df:Ljava/util/List;
+    iget-object v2, p0, Lcom/adjust/sdk/ao;->de: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;->bP: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 8540db2ffc..33c3173951 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;->bX:Ljava/util/List;
+    sget-object v1, Lcom/adjust/sdk/r;->bW: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;->bX:Ljava/util/List;
+    sget-object v1, Lcom/adjust/sdk/r;->bW: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 2cd42bc107..016d2774e1 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 dj:Lcom/adjust/sdk/c;
+.field final synthetic di:Lcom/adjust/sdk/c;
 
-.field final synthetic dm:I
+.field final synthetic dl:I
 
-.field final synthetic dn:Lcom/adjust/sdk/aq;
+.field final synthetic dm: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;->dn:Lcom/adjust/sdk/aq;
+    iput-object p1, p0, Lcom/adjust/sdk/aq$1;->dm:Lcom/adjust/sdk/aq;
 
-    iput-object p2, p0, Lcom/adjust/sdk/aq$1;->dj:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/aq$1;->di:Lcom/adjust/sdk/c;
 
-    iput p3, p0, Lcom/adjust/sdk/aq$1;->dm:I
+    iput p3, p0, Lcom/adjust/sdk/aq$1;->dl: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;->dn:Lcom/adjust/sdk/aq;
+    iget-object v0, p0, Lcom/adjust/sdk/aq$1;->dm:Lcom/adjust/sdk/aq;
 
-    iget-object v1, p0, Lcom/adjust/sdk/aq$1;->dj:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/aq$1;->di:Lcom/adjust/sdk/c;
 
-    iget v2, p0, Lcom/adjust/sdk/aq$1;->dm:I
+    iget v2, p0, Lcom/adjust/sdk/aq$1;->dl: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 a1c9909894..accbb26c3f 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 ai:Lcom/adjust/sdk/x;
 
-.field private dl:Ljava/lang/ref/WeakReference;
+.field private dk: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;->dl:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/adjust/sdk/aq;->dk: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;->dl:Ljava/lang/ref/WeakReference;
+    iget-object p2, p0, Lcom/adjust/sdk/aq;->dk: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;->dl:Ljava/lang/ref/WeakReference;
+    iget-object p2, p0, Lcom/adjust/sdk/aq;->dk: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;->dl:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/adjust/sdk/aq;->dk: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 0743ac141a..7e455dbcef 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 bz:Lorg/json/JSONObject;
 
-.field public do:Z
+.field public dn: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 b9dcd36610..06e0e49300 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 dp:Lcom/adjust/sdk/c;
+.field final synthetic do:Lcom/adjust/sdk/c;
 
-.field final synthetic dq:Lcom/adjust/sdk/as;
+.field final synthetic dp: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;->dq:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/as;
 
-    iput-object p2, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/as$1;->do: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/as;
 
-    iget-object v0, v0, Lcom/adjust/sdk/as;->df:Ljava/util/List;
+    iget-object v0, v0, Lcom/adjust/sdk/as;->de:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/as$1;->do: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/as;
 
     iget-object v0, v0, Lcom/adjust/sdk/as;->ai:Lcom/adjust/sdk/x;
 
@@ -57,9 +57,9 @@
 
     new-array v2, v1, [Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/adjust/sdk/as$1;->dq:Lcom/adjust/sdk/as;
+    iget-object v3, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/as;
 
-    iget-object v3, v3, Lcom/adjust/sdk/as;->df:Ljava/util/List;
+    iget-object v3, v3, Lcom/adjust/sdk/as;->de: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/as;
 
     iget-object v0, v0, Lcom/adjust/sdk/as;->ai:Lcom/adjust/sdk/x;
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/c;
+    iget-object v2, p0, Lcom/adjust/sdk/as$1;->do:Lcom/adjust/sdk/c;
 
     invoke-virtual {v2}, Lcom/adjust/sdk/c;->N()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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$1;->dp:Lcom/adjust/sdk/as;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/as;->as()V
 
diff --git a/com.discord/smali/com/adjust/sdk/as$2.smali b/com.discord/smali/com/adjust/sdk/as$2.smali
index f4aaad0534..c759038aaf 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 dq:Lcom/adjust/sdk/as;
+.field final synthetic dp: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;->dq:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$2;->dp: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, v1, Lcom/adjust/sdk/as$2;->dp:Lcom/adjust/sdk/as;
 
     iget-object v0, v0, Lcom/adjust/sdk/as;->bM:Ljava/lang/ref/WeakReference;
 
@@ -125,7 +125,7 @@
 
     move-result-object v7
 
-    iget-object v8, v1, Lcom/adjust/sdk/as$2;->dq:Lcom/adjust/sdk/as;
+    iget-object v8, v1, Lcom/adjust/sdk/as$2;->dp: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v2, v1, Lcom/adjust/sdk/as$2;->dp:Lcom/adjust/sdk/as;
 
     iget-object v2, v2, Lcom/adjust/sdk/as;->ai: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 16b6b55395..e00724e45b 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 dq:Lcom/adjust/sdk/as;
+.field final synthetic dp: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;->dq:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$3;->dp: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$3;->dp:Lcom/adjust/sdk/as;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/as;->bP:Z
+    iget-boolean v1, v0, Lcom/adjust/sdk/as;->paused:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/adjust/sdk/as;->df:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->de: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;->df:Ljava/util/List;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->de:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -74,7 +74,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/adjust/sdk/as;->dh:Lcom/adjust/sdk/q;
+    iget-object v1, v0, Lcom/adjust/sdk/as;->dg: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;->dA:Ljava/text/DecimalFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dz: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 c3a0ec6d7f..b948652620 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 dq:Lcom/adjust/sdk/as;
+.field final synthetic dp:Lcom/adjust/sdk/as;
 
-.field final synthetic dr:Lcom/adjust/sdk/c;
+.field final synthetic dq: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;->dq:Lcom/adjust/sdk/as;
+    iput-object p1, p0, Lcom/adjust/sdk/as$4;->dp:Lcom/adjust/sdk/as;
 
-    iput-object p2, p0, Lcom/adjust/sdk/as$4;->dr:Lcom/adjust/sdk/c;
+    iput-object p2, p0, Lcom/adjust/sdk/as$4;->dq: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$4;->dp:Lcom/adjust/sdk/as;
 
-    iget-object v1, p0, Lcom/adjust/sdk/as$4;->dr:Lcom/adjust/sdk/c;
+    iget-object v1, p0, Lcom/adjust/sdk/as$4;->dq: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;->dq:Lcom/adjust/sdk/as;
+    iget-object v0, p0, Lcom/adjust/sdk/as$4;->dp:Lcom/adjust/sdk/as;
 
     invoke-virtual {v0}, Lcom/adjust/sdk/as;->as()V
 
diff --git a/com.discord/smali/com/adjust/sdk/as.smali b/com.discord/smali/com/adjust/sdk/as.smali
index 7bd40edadf..10fcb45438 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 bP:Z
-
-.field df:Ljava/util/List;
+.field de:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +31,9 @@
     .end annotation
 .end field
 
-.field dh:Lcom/adjust/sdk/q;
+.field dg: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;->dh:Lcom/adjust/sdk/q;
+    iput-object p1, p0, Lcom/adjust/sdk/as;->dg: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;->df:Ljava/util/List;
+    iget-object v11, p0, Lcom/adjust/sdk/as;->de: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;->ds:Z
+    iput-boolean v3, v10, Lcom/adjust/sdk/at;->dr: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;->bP: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;->bP:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/as;->paused:Z
 
     invoke-virtual {p0}, Lcom/adjust/sdk/as;->as()V
 
@@ -439,13 +439,13 @@
 
     xor-int/lit8 p2, p2, 0x1
 
-    iput-boolean p2, p0, Lcom/adjust/sdk/as;->bP: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;->df:Ljava/util/List;
+    iput-object p2, p0, Lcom/adjust/sdk/as;->de: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 b33bf16096..c014ee2d57 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 ds:Z
+.field dr: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 d540453a27..586f59c649 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 dy:Lcom/adjust/sdk/ax;
+.field final synthetic dx: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;->dy:Lcom/adjust/sdk/ax;
+    iput-object p1, p0, Lcom/adjust/sdk/ax$1;->dx: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;->dy:Lcom/adjust/sdk/ax;
+    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->dx:Lcom/adjust/sdk/ax;
 
     iget-object v0, v0, Lcom/adjust/sdk/ax;->ai:Lcom/adjust/sdk/x;
 
@@ -45,7 +45,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/ax$1;->dy:Lcom/adjust/sdk/ax;
+    iget-object v2, p0, Lcom/adjust/sdk/ax$1;->dx: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;->dy:Lcom/adjust/sdk/ax;
+    iget-object v0, p0, Lcom/adjust/sdk/ax$1;->dx:Lcom/adjust/sdk/ax;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ax;->dv:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/adjust/sdk/ax;->du: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 af5702b953..1b03f1a0b4 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 ai:Lcom/adjust/sdk/x;
 
-.field dt:Lcom/adjust/sdk/s;
+.field ds:Lcom/adjust/sdk/s;
 
-.field du:Ljava/util/concurrent/ScheduledFuture;
+.field dt:Ljava/util/concurrent/ScheduledFuture;
 
-.field dv:Ljava/lang/Runnable;
+.field du:Ljava/lang/Runnable;
 
-.field dw:J
+.field dv:J
 
-.field dx:Z
+.field dw: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;->dt:Lcom/adjust/sdk/s;
+    iput-object v0, p0, Lcom/adjust/sdk/ax;->ds:Lcom/adjust/sdk/s;
 
     iput-object p6, p0, Lcom/adjust/sdk/ax;->name:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/adjust/sdk/ax;->dv:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/adjust/sdk/ax;->du:Ljava/lang/Runnable;
 
     iput-wide p2, p0, Lcom/adjust/sdk/ax;->initialDelay:J
 
-    iput-wide p4, p0, Lcom/adjust/sdk/ax;->dw:J
+    iput-wide p4, p0, Lcom/adjust/sdk/ax;->dv:J
 
-    iput-boolean v1, p0, Lcom/adjust/sdk/ax;->dx:Z
+    iput-boolean v1, p0, Lcom/adjust/sdk/ax;->dw:Z
 
     invoke-static {}, Lcom/adjust/sdk/j;->Q()Lcom/adjust/sdk/x;
 
@@ -51,7 +51,7 @@
 
     iput-object p1, p0, Lcom/adjust/sdk/ax;->ai:Lcom/adjust/sdk/x;
 
-    sget-object p1, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object p1, Lcom/adjust/sdk/az;->dz:Ljava/text/DecimalFormat;
 
     long-to-double p4, p4
 
@@ -65,7 +65,7 @@
 
     move-result-object p1
 
-    sget-object p4, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object p4, Lcom/adjust/sdk/az;->dz: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 82acaa9ef0..1c4264d8bd 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 dz:Lcom/adjust/sdk/ay;
+.field final synthetic dy: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;->dz:Lcom/adjust/sdk/ay;
+    iput-object p1, p0, Lcom/adjust/sdk/ay$1;->dy: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;->dz:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dy:Lcom/adjust/sdk/ay;
 
     iget-object v0, v0, Lcom/adjust/sdk/ay;->ai:Lcom/adjust/sdk/x;
 
@@ -45,7 +45,7 @@
 
     new-array v1, v1, [Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/adjust/sdk/ay$1;->dz:Lcom/adjust/sdk/ay;
+    iget-object v2, p0, Lcom/adjust/sdk/ay$1;->dy: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;->dz:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dy:Lcom/adjust/sdk/ay;
 
-    iget-object v0, v0, Lcom/adjust/sdk/ay;->dv:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/adjust/sdk/ay;->du:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dz:Lcom/adjust/sdk/ay;
+    iget-object v0, p0, Lcom/adjust/sdk/ay$1;->dy:Lcom/adjust/sdk/ay;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/adjust/sdk/ay;->du:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v1, v0, Lcom/adjust/sdk/ay;->dt: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 81c7a076e8..245a27d6a8 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 ai:Lcom/adjust/sdk/x;
 
-.field private dt:Lcom/adjust/sdk/s;
+.field private ds:Lcom/adjust/sdk/s;
 
-.field du:Ljava/util/concurrent/ScheduledFuture;
+.field dt:Ljava/util/concurrent/ScheduledFuture;
 
-.field dv:Ljava/lang/Runnable;
+.field du: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;->dt:Lcom/adjust/sdk/s;
+    iput-object v0, p0, Lcom/adjust/sdk/ay;->ds:Lcom/adjust/sdk/s;
 
-    iput-object p1, p0, Lcom/adjust/sdk/ay;->dv:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/adjust/sdk/ay;->du:Ljava/lang/Runnable;
 
     invoke-static {}, Lcom/adjust/sdk/j;->Q()Lcom/adjust/sdk/x;
 
@@ -47,7 +47,7 @@
 .method public final ay()J
     .locals 2
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay;->du:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->dt:Ljava/util/concurrent/ScheduledFuture;
 
     if-nez v0, :cond_0
 
@@ -68,7 +68,7 @@
 .method final az()V
     .locals 4
 
-    iget-object v0, p0, Lcom/adjust/sdk/ay;->du:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->dt: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;->du:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v0, p0, Lcom/adjust/sdk/ay;->dt:Ljava/util/concurrent/ScheduledFuture;
 
     iget-object v0, p0, Lcom/adjust/sdk/ay;->ai:Lcom/adjust/sdk/x;
 
@@ -103,7 +103,7 @@
 
     invoke-virtual {p0}, Lcom/adjust/sdk/ay;->az()V
 
-    sget-object v0, Lcom/adjust/sdk/az;->dA:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dz: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;->dt:Lcom/adjust/sdk/s;
+    iget-object v0, p0, Lcom/adjust/sdk/ay;->ds: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;->du:Ljava/util/concurrent/ScheduledFuture;
+    iput-object p1, p0, Lcom/adjust/sdk/ay;->dt: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 c47598d6b2..8686de5cda 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 dC:Lcom/adjust/sdk/ah;
+.field final synthetic dB: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;->dC:Lcom/adjust/sdk/ah;
+    iput-object p1, p0, Lcom/adjust/sdk/az$2;->dB:Lcom/adjust/sdk/ah;
 
     invoke-direct {p0}, Landroid/os/AsyncTask;-><init>()V
 
@@ -82,7 +82,7 @@
 
     invoke-static {}, Lcom/adjust/sdk/j;->Q()Lcom/adjust/sdk/x;
 
-    iget-object v0, p0, Lcom/adjust/sdk/az$2;->dC:Lcom/adjust/sdk/ah;
+    iget-object v0, p0, Lcom/adjust/sdk/az$2;->dB: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 5f860712a1..7899b1c3ce 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 dA:Ljava/text/DecimalFormat;
+.field public static final dA:Ljava/text/SimpleDateFormat;
 
-.field public static final dB:Ljava/text/SimpleDateFormat;
+.field public static final dz:Ljava/text/DecimalFormat;
 
 
 # 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;->dA:Ljava/text/DecimalFormat;
+    sput-object v0, Lcom/adjust/sdk/az;->dz: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;->dB:Ljava/text/SimpleDateFormat;
+    sput-object v0, Lcom/adjust/sdk/az;->dA: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 a02f0a91d1..6411272d2a 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;->dB:Ljava/text/SimpleDateFormat;
+    sget-object v1, Lcom/adjust/sdk/az;->dA: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;->do:Z
+    iput-boolean v3, p1, Lcom/adjust/sdk/ar;->dn:Z
 
     goto :goto_3
 
@@ -597,7 +597,7 @@
 
     move-result-wide v5
 
-    sget-object p0, Lcom/adjust/sdk/az;->dB:Ljava/text/SimpleDateFormat;
+    sget-object p0, Lcom/adjust/sdk/az;->dA: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 f74ce24c66..ef798cb901 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;->ai:Lcom/adjust/sdk/x;
 
-    sget-object v0, Lcom/adjust/sdk/ad;->cM:Lcom/adjust/sdk/ad;
+    sget-object v0, Lcom/adjust/sdk/ad;->cL:Lcom/adjust/sdk/ad;
 
     iget-object v1, p0, Lcom/adjust/sdk/f;->ai: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 2ca0fc6524..c0cd21ae7d 100644
--- a/com.discord/smali/com/adjust/sdk/j.smali
+++ b/com.discord/smali/com/adjust/sdk/j.smali
@@ -134,7 +134,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/adjust/sdk/q;->bT:Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->bS:Lcom/adjust/sdk/q;
 
     :cond_0
     return-object v0
@@ -147,7 +147,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/adjust/sdk/q;->bS:Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->bR: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 2ee8ae594d..ec1b1ccbe4 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 bQ:Lcom/adjust/sdk/o;
+.field final synthetic bP: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;->bQ:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$1;->bP: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;->bQ:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$1;->bP:Lcom/adjust/sdk/o;
 
     iget-object v1, v0, Lcom/adjust/sdk/o;->af: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 48384de356..f9e3b0ebe2 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 bQ:Lcom/adjust/sdk/o;
+.field final synthetic bP: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;->bQ:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$2;->bP: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;->bQ:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$2;->bP: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 64b7f3c89a..8a508fc1a0 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 aA:Lcom/adjust/sdk/av;
 
-.field final synthetic bQ:Lcom/adjust/sdk/o;
+.field final synthetic bP: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;->bQ:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$3;->bP:Lcom/adjust/sdk/o;
 
     iput-object p2, p0, Lcom/adjust/sdk/o$3;->aA:Lcom/adjust/sdk/av;
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$3;->bQ:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$3;->bP:Lcom/adjust/sdk/o;
 
     iget-object v0, v0, Lcom/adjust/sdk/o;->bM:Ljava/lang/ref/WeakReference;
 
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/o$3;->bQ:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$3;->bP:Lcom/adjust/sdk/o;
 
     iget-object v2, p0, Lcom/adjust/sdk/o$3;->aA: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 806970a17e..7dc07cf73e 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 az:Lcom/adjust/sdk/at;
 
-.field final synthetic bQ:Lcom/adjust/sdk/o;
+.field final synthetic bP: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;->bQ:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$4;->bP:Lcom/adjust/sdk/o;
 
     iput-object p2, p0, Lcom/adjust/sdk/o$4;->az:Lcom/adjust/sdk/at;
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$4;->bQ:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$4;->bP:Lcom/adjust/sdk/o;
 
     iget-object v0, v0, Lcom/adjust/sdk/o;->bM:Ljava/lang/ref/WeakReference;
 
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/o$4;->bQ:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$4;->bP:Lcom/adjust/sdk/o;
 
     iget-object v2, p0, Lcom/adjust/sdk/o$4;->az: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 8f46cdae20..a1cd67e89f 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 aB:Lcom/adjust/sdk/p;
 
-.field final synthetic bQ:Lcom/adjust/sdk/o;
+.field final synthetic bP: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;->bQ:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$5;->bP:Lcom/adjust/sdk/o;
 
     iput-object p2, p0, Lcom/adjust/sdk/o$5;->aB:Lcom/adjust/sdk/p;
 
@@ -41,7 +41,7 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/adjust/sdk/o$5;->bQ:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$5;->bP:Lcom/adjust/sdk/o;
 
     iget-object v0, v0, Lcom/adjust/sdk/o;->bM:Ljava/lang/ref/WeakReference;
 
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/adjust/sdk/o$5;->bQ:Lcom/adjust/sdk/o;
+    iget-object v1, p0, Lcom/adjust/sdk/o$5;->bP:Lcom/adjust/sdk/o;
 
     iget-object v2, p0, Lcom/adjust/sdk/o$5;->aB:Lcom/adjust/sdk/p;
 
@@ -90,7 +90,7 @@
 
     move-result-object v1
 
-    iput-object v1, v2, Lcom/adjust/sdk/p;->bR:Landroid/net/Uri;
+    iput-object v1, v2, Lcom/adjust/sdk/p;->bQ: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 4b067d6fc5..db9f05f539 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 bQ:Lcom/adjust/sdk/o;
+.field final synthetic bP: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;->bQ:Lcom/adjust/sdk/o;
+    iput-object p1, p0, Lcom/adjust/sdk/o$6;->bP: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;->bQ:Lcom/adjust/sdk/o;
+    iget-object v0, p0, Lcom/adjust/sdk/o$6;->bP:Lcom/adjust/sdk/o;
 
-    iget-boolean v1, v0, Lcom/adjust/sdk/o;->bP: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 b6729797c9..39706c734b 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 bO:Lcom/adjust/sdk/ay;
 
-.field bP:Z
+.field paused:Z
 
 
 # direct methods
@@ -88,7 +88,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/o;->bP: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;->bP: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;->bP: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;->dA:Ljava/text/DecimalFormat;
+    sget-object v2, Lcom/adjust/sdk/az;->dz: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 7d04cd1f66..2adc7f814b 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 bR:Landroid/net/Uri;
+.field public bQ: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 3c16666860..490577a5f0 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 bR:Lcom/adjust/sdk/q;
+
 .field public static final enum bS:Lcom/adjust/sdk/q;
 
 .field public static final enum bT:Lcom/adjust/sdk/q;
 
 .field public static final enum bU:Lcom/adjust/sdk/q;
 
-.field public static final enum bV:Lcom/adjust/sdk/q;
-
-.field private static final synthetic bW:[Lcom/adjust/sdk/q;
+.field private static final synthetic bV:[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;->bS:Lcom/adjust/sdk/q;
+    sput-object v10, Lcom/adjust/sdk/q;->bR: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;->bT:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bS: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;->bU:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bT: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;->bV:Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bU:Lcom/adjust/sdk/q;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [Lcom/adjust/sdk/q;
 
-    sget-object v1, Lcom/adjust/sdk/q;->bS:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bR:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->bT:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bS:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->bU:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bT:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/adjust/sdk/q;->bV:Lcom/adjust/sdk/q;
+    sget-object v1, Lcom/adjust/sdk/q;->bU:Lcom/adjust/sdk/q;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/adjust/sdk/q;->bW:[Lcom/adjust/sdk/q;
+    sput-object v0, Lcom/adjust/sdk/q;->bV:[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;->bW:[Lcom/adjust/sdk/q;
+    sget-object v0, Lcom/adjust/sdk/q;->bV:[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 88235cf1c9..fd47146489 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 bX:Ljava/util/List;
+.field public static final bW: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;->bX:Ljava/util/List;
+    sput-object v0, Lcom/adjust/sdk/r;->bW: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 ac5a695ea7..13b4fb0d9a 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 cc:Lcom/adjust/sdk/s$1;
+.field final synthetic cb: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;->cc:Lcom/adjust/sdk/s$1;
+    iput-object p1, p0, Lcom/adjust/sdk/s$1$1;->cb: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 70a85b4c4c..d83f7cf74c 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 ca:Ljava/lang/String;
+.field final synthetic bZ:Ljava/lang/String;
 
-.field final synthetic cb:Lcom/adjust/sdk/s;
+.field final synthetic ca: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;->cb:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$1;->ca:Lcom/adjust/sdk/s;
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$1;->ca:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/s$1;->bZ: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;->cb:Lcom/adjust/sdk/s;
+    iget-object v2, p0, Lcom/adjust/sdk/s$1;->ca: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;->ca:Ljava/lang/String;
+    iget-object v2, p0, Lcom/adjust/sdk/s$1;->bZ: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 0916ebbdc2..6fc5b7cfd3 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 ca:Ljava/lang/String;
+.field final synthetic bZ:Ljava/lang/String;
 
-.field final synthetic cb:Lcom/adjust/sdk/s;
+.field final synthetic ca: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;->cb:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$2;->ca:Lcom/adjust/sdk/s;
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$2;->ca:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/s$2;->bZ: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;->ca:Ljava/lang/String;
+    iget-object p1, p0, Lcom/adjust/sdk/s$2;->bZ: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 bfca99049d..0de84a3650 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 cb:Lcom/adjust/sdk/s;
+.field final synthetic ca:Lcom/adjust/sdk/s;
 
-.field private cd:Ljava/lang/Runnable;
+.field private cc: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;->cb:Lcom/adjust/sdk/s;
+    iput-object p1, p0, Lcom/adjust/sdk/s$a;->ca:Lcom/adjust/sdk/s;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/adjust/sdk/s$a;->cd:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/adjust/sdk/s$a;->cc: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;->cd:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/adjust/sdk/s$a;->cc: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 2e2f8f3278..e390437d74 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 bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+.field bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
-.field private final bZ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bY: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;->bZ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/adjust/sdk/s;->bY: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;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iput-object v0, p0, Lcom/adjust/sdk/s;->bX:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/adjust/sdk/s;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object p1, p0, Lcom/adjust/sdk/s;->bX: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;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object p1, p0, Lcom/adjust/sdk/s;->bX: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;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v0, p0, Lcom/adjust/sdk/s;->bX: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;->bY:Ljava/util/concurrent/ScheduledThreadPoolExecutor;
+    iget-object v0, p0, Lcom/adjust/sdk/s;->bX: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 38d178fca6..1f5223a9e8 100644
--- a/com.discord/smali/com/adjust/sdk/t.smali
+++ b/com.discord/smali/com/adjust/sdk/t.smali
@@ -8,9 +8,7 @@
 
 .field cB:Ljava/lang/String;
 
-.field cC:Ljava/lang/String;
-
-.field cD:Ljava/util/Map;
+.field cC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -21,11 +19,13 @@
     .end annotation
 .end field
 
-.field ce:Ljava/lang/String;
+.field cd:Ljava/lang/String;
 
-.field cf:Ljava/lang/Boolean;
+.field ce:Ljava/lang/Boolean;
 
-.field private cg:Z
+.field private cf:Z
+
+.field cg:Ljava/lang/String;
 
 .field ch:Ljava/lang/String;
 
@@ -82,7 +82,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/adjust/sdk/t;->cg:Z
+    iput-boolean v0, p0, Lcom/adjust/sdk/t;->cf: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;->cl:Ljava/lang/String;
+    iput-object v4, p0, Lcom/adjust/sdk/t;->ck:Ljava/lang/String;
 
     and-int/lit8 v4, v1, 0xf
 
@@ -151,23 +151,23 @@
     const-string v10, "phone"
 
     :goto_0
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cm:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cl:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cn:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cm:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->co:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cn:Ljava/lang/String;
 
     const-string v10, "android"
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cp:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->co:Ljava/lang/String;
 
     sget-object v10, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
-    iput-object v10, p0, Lcom/adjust/sdk/t;->cq:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cp: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;->cr:Ljava/lang/String;
+    iput-object v10, p0, Lcom/adjust/sdk/t;->cq: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;->cs:Ljava/lang/String;
+    iput-object v4, p0, Lcom/adjust/sdk/t;->cr: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;->ct:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->cs: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;->cu:Ljava/lang/String;
+    iput-object v9, p0, Lcom/adjust/sdk/t;->ct: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;->cv:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->cu: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;->cw:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->cv: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;->ck:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cj: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;->cD:Ljava/util/Map;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cC:Ljava/util/Map;
 
     sget-object p2, Landroid/os/Build;->DISPLAY:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->cx:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cw: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;->cy:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cx:Ljava/lang/String;
 
     sget-object p2, Landroid/os/Build;->ID:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->cz:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cy:Ljava/lang/String;
 
     invoke-static {}, Lcom/adjust/sdk/az;->ap()Ljava/lang/String;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/adjust/sdk/t;->cA:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cz: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;->cB:Ljava/lang/String;
+    iput-object p2, p0, Lcom/adjust/sdk/t;->cA: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;->cC:Ljava/lang/String;
+    iput-object p1, p0, Lcom/adjust/sdk/t;->cB:Ljava/lang/String;
 
     return-void
 .end method
@@ -510,7 +510,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/adjust/sdk/az;->dB:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dA:Ljava/text/SimpleDateFormat;
 
     new-instance v1, Ljava/util/Date;
 
@@ -550,7 +550,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/adjust/sdk/az;->dB:Ljava/text/SimpleDateFormat;
+    sget-object v0, Lcom/adjust/sdk/az;->dA: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;->cf:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->ce: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;->ce:Ljava/lang/String;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->cd:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/adjust/sdk/t;->ce:Ljava/lang/String;
+    iget-object v0, p0, Lcom/adjust/sdk/t;->cd:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/adjust/sdk/t;->cg:Z
+    iget-boolean v0, p0, Lcom/adjust/sdk/t;->cf:Z
 
     if-nez v0, :cond_1
 
@@ -668,23 +668,23 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/adjust/sdk/t;->ch:Ljava/lang/String;
+    iput-object v1, p0, Lcom/adjust/sdk/t;->cg:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/adjust/sdk/t;->f(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/adjust/sdk/t;->ci:Ljava/lang/String;
+    iput-object v0, p0, Lcom/adjust/sdk/t;->ch: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;->cj:Ljava/lang/String;
+    iput-object p1, p0, Lcom/adjust/sdk/t;->ci:Ljava/lang/String;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/adjust/sdk/t;->cg:Z
+    iput-boolean p1, p0, Lcom/adjust/sdk/t;->cf: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 3f2067204c..c02a6b53da 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 dU:Lcom/airbnb/lottie/LottieAnimationView;
+.field final synthetic dT: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;->dU:Lcom/airbnb/lottie/LottieAnimationView;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->dT: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;->dU:Lcom/airbnb/lottie/LottieAnimationView;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$1;->dT: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 9a8d955565..8d4b8408f9 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 dU:Lcom/airbnb/lottie/LottieAnimationView;
+.field final synthetic dT: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;->dU:Lcom/airbnb/lottie/LottieAnimationView;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView$2;->dT: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 1d36557073..54872e9d12 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 dV:[I
+.field static final synthetic dU:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
+    sput-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fG: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;->dV:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fI:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fH: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;->dV:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fF: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 ff3cc77166..a4aa8a4760 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 dL:Ljava/lang/String;
+.field dK:Ljava/lang/String;
 
-.field dM:I
+.field dL:I
 
-.field dW:F
+.field dV:F
 
-.field dX:Ljava/lang/String;
+.field dW:Ljava/lang/String;
 
 .field isAnimating:Z
 
@@ -64,13 +64,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dK:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:F
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dV: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;->dX:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW: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;->dL:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dK:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:F
+    iget p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dV: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;->dX:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW: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 ea61b767c0..42780a9724 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final dI:Lcom/airbnb/lottie/h;
+.field private final dH:Lcom/airbnb/lottie/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/h<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final dJ:Lcom/airbnb/lottie/h;
+.field private final dI:Lcom/airbnb/lottie/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/h<",
@@ -36,21 +36,21 @@
     .end annotation
 .end field
 
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private dL:Ljava/lang/String;
+.field private dK:Ljava/lang/String;
 
-.field private dM:I
+.field private dL:I
+
+.field private dM:Z
 
 .field private dN:Z
 
 .field private dO:Z
 
-.field private dP:Z
+.field private dP:Lcom/airbnb/lottie/n;
 
-.field private dQ:Lcom/airbnb/lottie/n;
-
-.field private dR:Ljava/util/Set;
+.field private dQ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field private dS:Lcom/airbnb/lottie/l;
+.field private dR:Lcom/airbnb/lottie/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/l<",
@@ -70,7 +70,7 @@
     .end annotation
 .end field
 
-.field private dT:Lcom/airbnb/lottie/d;
+.field private dS:Lcom/airbnb/lottie/d;
 
 
 # direct methods
@@ -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;->dI:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dH: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;->dJ:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
+
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
+    sget-object p1, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;->dR:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ: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;->dI:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dH: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;->dJ:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
+
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
+    sget-object p1, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;->dR:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ: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;->dI:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dH: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;->dJ:Lcom/airbnb/lottie/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     const/4 p1, 0x0
 
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
+
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
+    sget-object p1, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
-
-    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;->dR:Ljava/util/Set;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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 aD()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR:Lcom/airbnb/lottie/l;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI:Lcom/airbnb/lottie/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dH: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;->dS:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR:Lcom/airbnb/lottie/l;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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 aG()V
     .locals 5
 
-    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dV:[I
+    sget-object v0, Lcom/airbnb/lottie/LottieAnimationView$3;->dU:[I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ:Lcom/airbnb/lottie/n;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/d;
 
     const/4 v3, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, v0, Lcom/airbnb/lottie/d;->el:Z
+    iget-boolean v0, v0, Lcom/airbnb/lottie/d;->ek:Z
 
     if-eqz v0, :cond_1
 
@@ -317,11 +317,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz v0, :cond_2
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->em:I
+    iget v0, v0, Lcom/airbnb/lottie/d;->el:I
 
     const/4 v4, 0x4
 
@@ -353,7 +353,7 @@
 .method private f(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, p1}, Lcom/airbnb/lottie/f;->f(Z)V
 
@@ -470,9 +470,9 @@
 
     if-eqz v0, :cond_5
 
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
+    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
-    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
+    iput-boolean v2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
     :cond_5
     sget v0, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_loop:I
@@ -485,7 +485,7 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0, v3}, Lcom/airbnb/lottie/f;->setRepeatCount(I)V
 
@@ -601,7 +601,7 @@
 
     invoke-direct {v6, v0}, Lcom/airbnb/lottie/g/c;-><init>(Ljava/lang/Object;)V
 
-    sget-object v0, Lcom/airbnb/lottie/j;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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
 
@@ -614,7 +614,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     sget v5, Lcom/airbnb/lottie/R$a;->LottieAnimationView_lottie_scale:I
 
@@ -627,7 +627,7 @@
     :cond_b
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->getContext()Landroid/content/Context;
 
@@ -668,27 +668,27 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dT:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aL()V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aD()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI:Lcom/airbnb/lottie/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dH: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;->dJ:Lcom/airbnb/lottie/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dI: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;->dS:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dR: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aE()V
 
@@ -715,7 +715,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
 
     return-void
 .end method
@@ -725,13 +725,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
-
     iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
     iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
+
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aF()V
 
@@ -759,7 +759,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
+    sget-object p1, Lcom/airbnb/lottie/n;->fG: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->mi: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dW: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->dY:Lcom/airbnb/lottie/m;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->dX: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->bE()F
 
@@ -886,9 +886,9 @@
 .method public getRepeatCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->mg:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->mf:F
 
     return v0
 .end method
@@ -940,7 +940,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dP:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
 
     if-eqz v0, :cond_1
 
@@ -972,7 +972,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dO: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dN:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dO:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN: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;->dL:Ljava/lang/String;
+    iget-object v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dK:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dM:I
+    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:I
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
+    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL: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;->dW:F
+    iget v0, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dV:F
 
     invoke-virtual {p0, v0}, Lcom/airbnb/lottie/LottieAnimationView;->setProgress(F)V
 
@@ -1089,11 +1089,11 @@
     invoke-virtual {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aE()V
 
     :cond_3
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dX:Ljava/lang/String;
+    iget-object v1, p1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/airbnb/lottie/f;->dX:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/f;->dW: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;->dL:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:Ljava/lang/String;
+    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dK:Ljava/lang/String;
 
-    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
+    iget v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
 
-    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dM:I
+    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dL:I
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->bE()F
 
     move-result v0
 
-    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:F
+    iput v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dV:F
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dX:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dW:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dX:Ljava/lang/String;
+    iput-object v0, v1, Lcom/airbnb/lottie/LottieAnimationView$SavedState;->dW:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dN:Z
+    iget-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
 
     if-eqz p1, :cond_3
 
@@ -1202,7 +1202,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f;->aM()V
 
@@ -1211,19 +1211,19 @@
     goto :goto_0
 
     :cond_1
-    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
 
     :goto_0
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->et: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;->aF()V
 
-    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dN:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:Z
 
     :cond_3
     return-void
@@ -1242,11 +1242,11 @@
 .method public setAnimation(I)V
     .locals 1
 
-    iput p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
+    iput p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK: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;->dL:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Ljava/lang/String;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dM:I
+    iput v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dL: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dT:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dR:Ljava/util/Set;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dQ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/a;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/a;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/b/a;->hD:Lcom/airbnb/lottie/a;
+    iput-object p1, v0, Lcom/airbnb/lottie/b/a;->hC: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/b/b;->hH:Lcom/airbnb/lottie/b;
+    iput-object p1, v0, Lcom/airbnb/lottie/b/b;->hG: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->dX:Ljava/lang/String;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->dW: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-boolean p1, v0, Lcom/airbnb/lottie/f;->eF:Z
+    iput-boolean p1, v0, Lcom/airbnb/lottie/f;->eE:Z
 
-    iget-object v1, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dS: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dQ:Lcom/airbnb/lottie/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dP:Lcom/airbnb/lottie/n;
 
     invoke-direct {p0}, Lcom/airbnb/lottie/LottieAnimationView;->aG()V
 
@@ -1621,7 +1621,7 @@
 .method public setRepeatCount(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
-    iput p1, v0, Lcom/airbnb/lottie/f/e;->mg:F
+    iput p1, v0, Lcom/airbnb/lottie/f/e;->mf: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/LottieAnimationView;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p1, v0, Lcom/airbnb/lottie/f;->eC:Lcom/airbnb/lottie/p;
+    iput-object p1, v0, Lcom/airbnb/lottie/f;->eB: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 a4b672d8e7..3184e8abaa 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, 0x7f040314
+    const v7, 0x7f040315
 
     aput v7, v5, v3
 
@@ -1310,15 +1310,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -1327,8 +1327,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -1342,11 +1342,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -1376,17 +1376,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_9
@@ -1411,8 +1411,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_b
@@ -1488,47 +1488,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -1538,6 +1537,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_c
@@ -1557,7 +1557,7 @@
     :array_e
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_f
@@ -1579,8 +1579,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_11
@@ -1604,7 +1604,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_13
@@ -1638,8 +1638,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_16
@@ -1658,7 +1658,6 @@
 
     :array_18
     .array-data 4
-        0x7f040268
         0x7f040269
         0x7f04026a
         0x7f04026b
@@ -1672,6 +1671,7 @@
         0x7f040273
         0x7f040274
         0x7f040275
+        0x7f040276
     .end array-data
 
     :array_19
@@ -1706,9 +1706,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_1b
@@ -1720,21 +1720,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_1c
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_1d
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_1e
@@ -1749,13 +1749,13 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_1f
@@ -1764,7 +1764,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_20
@@ -1782,17 +1782,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_22
@@ -1809,7 +1809,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_23
@@ -1825,17 +1825,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1843,15 +1842,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_24
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 bf6773ef9c..00fe5d76d4 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 fW:Ljava/util/List;
+.field final fV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final fX:Lcom/airbnb/lottie/a/a/s;
+.field final fW: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;->fW:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a$a;->fV:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a$a;->fX:Lcom/airbnb/lottie/a/a/s;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a$a;->fW: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 54a8371e9c..07c3ec55a9 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/a.smali
@@ -17,15 +17,15 @@
 
 
 # instance fields
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fM:Landroid/graphics/PathMeasure;
+.field private final fL:Landroid/graphics/PathMeasure;
 
-.field private final fN:Landroid/graphics/Path;
+.field private final fM:Landroid/graphics/Path;
 
-.field protected final fO:Lcom/airbnb/lottie/c/c/a;
+.field protected final fN:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fP:Ljava/util/List;
+.field private final fO:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field private final fQ:[F
+.field private final fP:[F
 
-.field private final fR:Lcom/airbnb/lottie/a/b/a;
+.field private final fQ:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field private final fS:Lcom/airbnb/lottie/a/b/a;
+.field private final fR:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private final fT:Ljava/util/List;
+.field private final fS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field private final fU:Lcom/airbnb/lottie/a/b/a;
+.field private final fT: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 private fV:Lcom/airbnb/lottie/a/b/a;
+.field private fU:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -127,7 +127,7 @@
 
     invoke-direct {v0}, Landroid/graphics/PathMeasure;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fM:Landroid/graphics/PathMeasure;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fL: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;->fN:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fP:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fO:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fN: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fR:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p7}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fR:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fQ: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fT:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fP:[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;->fT:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fQ: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;->fT:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fT:Ljava/util/List;
+    iget-object p4, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fQ: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;->fT:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fX:Lcom/airbnb/lottie/a/a/s;
+    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fW:Ljava/util/List;
+    iget-object v1, p2, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fW:Ljava/util/List;
+    iget-object v3, p2, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fM:Landroid/graphics/PathMeasure;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->fL: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;->fM:Landroid/graphics/PathMeasure;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->fL: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;->fM:Landroid/graphics/PathMeasure;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fL: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;->fM:Landroid/graphics/PathMeasure;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fL: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;->fX:Lcom/airbnb/lottie/a/a/s;
+    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->fW:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/a/s;->gM:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/a/s;->gL: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;->fX:Lcom/airbnb/lottie/a/a/s;
+    iget-object v4, p2, Lcom/airbnb/lottie/a/a/a$a;->fW:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v4, Lcom/airbnb/lottie/a/a/s;->gJ: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;->fX:Lcom/airbnb/lottie/a/a/s;
+    iget-object v6, p2, Lcom/airbnb/lottie/a/a/a$a;->fW:Lcom/airbnb/lottie/a/a/s;
 
-    iget-object v6, v6, Lcom/airbnb/lottie/a/a/s;->gL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v6, v6, Lcom/airbnb/lottie/a/a/s;->gK: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;->fW:Ljava/util/List;
+    iget-object v2, p2, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fN:Landroid/graphics/Path;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fM:Landroid/graphics/Path;
 
-    iget-object v9, p2, Lcom/airbnb/lottie/a/a/a$a;->fW:Ljava/util/List;
+    iget-object v9, p2, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fN:Landroid/graphics/Path;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fM:Landroid/graphics/PathMeasure;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fL:Landroid/graphics/PathMeasure;
 
-    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fN:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fM:Landroid/graphics/PathMeasure;
+    iget-object v8, p0, Lcom/airbnb/lottie/a/a/a;->fL: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;->fN:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fN:Landroid/graphics/Path;
+    iget-object v10, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fN:Landroid/graphics/Path;
+    iget-object v9, p0, Lcom/airbnb/lottie/a/a/a;->fM: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/a;->fQ: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;->fT:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fT:Ljava/util/List;
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
 
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/a;->fT:Ljava/util/List;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fQ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
 
     aget v6, v5, v4
 
@@ -817,7 +817,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
 
     aget v6, v5, v4
 
@@ -831,7 +831,7 @@
 
     :cond_4
     :goto_1
-    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fQ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
 
     aget v6, v5, v4
 
@@ -844,7 +844,7 @@
     goto :goto_0
 
     :cond_5
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fU:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fT: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;->fQ:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/a;->fP:[F
 
     invoke-direct {v4, v5, v1}, Landroid/graphics/DashPathEffect;-><init>([FF)V
 
@@ -875,7 +875,7 @@
     invoke-static {p3}, Lcom/airbnb/lottie/c;->r(Ljava/lang/String;)F
 
     :goto_3
-    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fP:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->fP:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->fX:Lcom/airbnb/lottie/a/a/s;
+    iget-object v1, p3, Lcom/airbnb/lottie/a/a/a$a;->fW: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;->fW:Ljava/util/List;
+    iget-object v2, p3, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fW:Ljava/util/List;
+    iget-object v5, p3, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fP:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->fP:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->fW:Ljava/util/List;
+    iget-object v4, v2, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fW:Ljava/util/List;
+    iget-object v5, v2, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fR:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fQ: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;->eX:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fS: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;->fi:Ljava/lang/Float;
-
-    if-ne p1, v0, :cond_1
-
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fR: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;->fh:Ljava/lang/Float;
+
+    if-ne p1, v0, :cond_1
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fQ: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;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fU:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/a;->fU: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;->gJ:I
+    iget v4, v3, Lcom/airbnb/lottie/a/a/s;->gI:I
 
-    sget v5, Lcom/airbnb/lottie/c/b/q$a;->jO:I
+    sget v5, Lcom/airbnb/lottie/c/b/q$a;->jN: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;->gJ:I
+    iget v5, v3, Lcom/airbnb/lottie/a/a/s;->gI:I
 
-    sget v6, Lcom/airbnb/lottie/c/b/q$a;->jO:I
+    sget v6, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     if-ne v5, v6, :cond_4
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fP:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->fO: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;->fW:Ljava/util/List;
+    iget-object v3, v1, Lcom/airbnb/lottie/a/a/a$a;->fV: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;->fP:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/a;->fO:Ljava/util/List;
 
     invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -1354,7 +1354,7 @@
 .method public final aQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/a;->dJ: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 a236912a4a..30ce15c5cf 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 fY:Ljava/util/List;
+.field private fX: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;->fY:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/b;->fX: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;->fY:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->fX: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;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/b;->fX: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;->fY:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/b;->fX: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 031f567d59..34e114d614 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 dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fY:Ljava/util/List;
+.field private final fX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -22,9 +22,9 @@
     .end annotation
 .end field
 
-.field private final fZ:Z
+.field private final fY:Z
 
-.field private ga:Ljava/util/List;
+.field private fZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private gb:Lcom/airbnb/lottie/a/b/o;
+.field private ga: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;->fZ:Z
+    iget-boolean v4, p3, Lcom/airbnb/lottie/c/b/n;->fY: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/a/a/d;->fZ:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/a/a/d;->fY:Z
 
-    iput-object p5, p0, Lcom/airbnb/lottie/a/a/d;->fY:Ljava/util/List;
+    iput-object p5, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/d;->ga:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->fZ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->fY: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->ga:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hr: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->ga:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p2, Lcom/airbnb/lottie/a/b/o;->hr: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;->fY:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->fY:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->ga: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;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX:Ljava/util/List;
 
     const/4 v2, 0x0
 
@@ -690,7 +690,7 @@
 .method public final aQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->dJ: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;->ga:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fZ: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;->ga:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fZ:Ljava/util/List;
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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;->ga:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/d;->fZ: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;->ga:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fZ:Ljava/util/List;
 
     return-object v0
 .end method
@@ -761,7 +761,7 @@
 .method final aS()Landroid/graphics/Matrix;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->ga:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz v0, :cond_0
 
@@ -788,7 +788,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->gb:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->ga:Lcom/airbnb/lottie/a/b/o;
 
     if-eqz v0, :cond_0
 
@@ -805,7 +805,7 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->fZ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/d;->fY:Z
 
     if-eqz v0, :cond_1
 
@@ -814,7 +814,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fY:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/d;->fX:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -825,7 +825,7 @@
     :goto_0
     if-ltz v0, :cond_3
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fY:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/d;->fX: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 197e0c9d6a..053749c18a 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 dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
+
+.field private final gb: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 gc:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -22,22 +33,11 @@
     .end annotation
 .end field
 
-.field private final gd: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 gd:Lcom/airbnb/lottie/c/b/a;
 
-.field private final ge:Lcom/airbnb/lottie/c/b/a;
+.field private ge:Lcom/airbnb/lottie/a/a/b;
 
-.field private gf:Lcom/airbnb/lottie/a/a/b;
-
-.field private gg:Z
+.field private gf: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;->gf:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/f;->ge: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iD:Lcom/airbnb/lottie/c/a/f;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iC:Lcom/airbnb/lottie/c/a/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gc:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gb:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iv:Lcom/airbnb/lottie/c/a/m;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/a;->iu:Lcom/airbnb/lottie/c/a/m;
 
     invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gc:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/c/b/a;
+    iput-object p3, p0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/c/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gb: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;->gc: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;->gd: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gb: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;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gc: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;->fa:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->eZ:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gb: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;->fd:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->fc:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/f;->gc: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;->gJ:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gI:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/f;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/f;->ge: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;->gg:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/f;->gf:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/f;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -237,7 +237,7 @@
 
     move-object/from16 v0, p0
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/f;->gg:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/f;->gf:Z
 
     if-eqz v1, :cond_0
 
@@ -250,22 +250,22 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/c/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/c/b/a;
 
-    iget-boolean v1, v1, Lcom/airbnb/lottie/c/b/a;->fZ:Z
+    iget-boolean v1, v1, Lcom/airbnb/lottie/c/b/a;->fY:Z
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_1
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->gg:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->gf: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gb:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -293,9 +293,9 @@
 
     invoke-virtual {v5}, Landroid/graphics/Path;->reset()V
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/a/f;->ge:Lcom/airbnb/lottie/c/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/c/b/a;
 
-    iget-boolean v5, v5, Lcom/airbnb/lottie/c/b/a;->iE:Z
+    iget-boolean v5, v5, Lcom/airbnb/lottie/c/b/a;->iD:Z
 
     const/4 v13, 0x0
 
@@ -461,7 +461,7 @@
     invoke-virtual/range {v14 .. v20}, Landroid/graphics/Path;->cubicTo(FFFFFF)V
 
     :goto_0
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gc:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -481,13 +481,13 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->close()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/f;->ge: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;->gg:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/f;->gf: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 8d74f05245..2dc11ab31b 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/g.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/g.smali
@@ -9,11 +9,11 @@
 
 
 # instance fields
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fO:Lcom/airbnb/lottie/c/c/a;
+.field private final fN:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fS:Lcom/airbnb/lottie/a/b/a;
+.field private final fR:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private fV:Lcom/airbnb/lottie/a/b/a;
+.field private fU:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final fW:Ljava/util/List;
+.field private final fV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final fZ:Z
+.field private final fY:Z
 
-.field private final gh:Lcom/airbnb/lottie/a/b/a;
+.field private final gg:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -89,25 +89,25 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->fW:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/g;->fV:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fO:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fN: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;->fZ:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/m;->fY:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->fZ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->fY:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->io:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->im:Lcom/airbnb/lottie/c/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->ix: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;->iI:Landroid/graphics/Path$FillType;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/m;->iH: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;->io:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->im:Lcom/airbnb/lottie/c/a/a;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/a;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gg: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gg: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;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/m;->ix:Lcom/airbnb/lottie/c/a/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/d;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fR:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fR: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fR: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fR: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;->fZ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/g;->fY: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->gg: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->fR: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/a/a/g;->fU: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;->fW:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fW:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fW:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->fW:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/g;->fV: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;->eU:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eT:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->gg: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;->eX:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fR: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;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fU:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fU: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/g;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/g;->fU: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;->fW:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/g;->fV:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -499,7 +499,7 @@
 .method public final aQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/g;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/g;->dJ: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 76ceff0a0e..4345d778e8 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/h.smali
@@ -9,11 +9,11 @@
 
 
 # instance fields
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fO:Lcom/airbnb/lottie/c/c/a;
+.field private final fN:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fS:Lcom/airbnb/lottie/a/b/a;
+.field private final fR:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private fV:Lcom/airbnb/lottie/a/b/a;
+.field private fU:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final fW:Ljava/util/List;
+.field private final fV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final fZ:Z
+.field private final fY:Z
 
-.field private final gh:Lcom/airbnb/lottie/a/b/a;
+.field private final gg:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field private final gi:Landroidx/collection/LongSparseArray;
+.field private final gh:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -68,7 +68,7 @@
     .end annotation
 .end field
 
-.field private final gj:Landroidx/collection/LongSparseArray;
+.field private final gi:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -78,11 +78,22 @@
     .end annotation
 .end field
 
-.field private final gk:Landroid/graphics/Matrix;
+.field private final gj:Landroid/graphics/Matrix;
 
-.field private final gl:Landroid/graphics/RectF;
+.field private final gk:Landroid/graphics/RectF;
 
-.field private final gm:I
+.field private final gl:I
+
+.field private final gm: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 gn:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -95,20 +106,9 @@
     .end annotation
 .end field
 
-.field private final go: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 go:Lcom/airbnb/lottie/a/b/p;
 
-.field private gp:Lcom/airbnb/lottie/a/b/p;
-
-.field private final gq:I
+.field private final gp:I
 
 .field private final name:Ljava/lang/String;
 
@@ -127,19 +127,19 @@
 
     invoke-direct {v0}, Landroidx/collection/LongSparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gi:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gh: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;->gj:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gi: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;->gk:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gj: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;->gl:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gk: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;->fW:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/h;->fV:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fO:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fN: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;->fZ:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/d;->fY:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/h;->fZ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/h;->fY:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->dJ:Lcom/airbnb/lottie/f;
 
-    iget v0, p3, Lcom/airbnb/lottie/c/b/d;->iH:I
+    iget v0, p3, Lcom/airbnb/lottie/c/b/d;->iG:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/h;->gm:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/h;->gl: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;->iI:Landroid/graphics/Path$FillType;
+    iget-object v1, p3, Lcom/airbnb/lottie/c/b/d;->iH: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aH()F
 
@@ -201,37 +201,53 @@
 
     float-to-int p1, p1
 
-    iput p1, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
+    iput p1, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->iJ:Lcom/airbnb/lottie/c/a/c;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->iI:Lcom/airbnb/lottie/c/a/c;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/c;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gg: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gg: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;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/d;->ix:Lcom/airbnb/lottie/c/a/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/d;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fS:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fR:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fR: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fR: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;->iJ:Lcom/airbnb/lottie/c/a/f;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gm:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gm: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;->gm: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;->iL:Lcom/airbnb/lottie/c/a/f;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->go: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;->go: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;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz v0, :cond_1
 
@@ -339,11 +339,11 @@
 .method private aU()I
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->gm:Lcom/airbnb/lottie/a/b/a;
 
-    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v1, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
+    iget v1, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
 
     int-to-float v1, v1
 
@@ -353,11 +353,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->gn:Lcom/airbnb/lottie/a/b/a;
 
-    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v2, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
+    iget v2, p0, Lcom/airbnb/lottie/a/a/h;->gp:I
 
     int-to-float v2, v2
 
@@ -367,11 +367,11 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v3, p0, Lcom/airbnb/lottie/a/a/h;->gq:I
+    iget v3, p0, Lcom/airbnb/lottie/a/a/h;->gp: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;->fZ:Z
+    iget-boolean v2, v0, Lcom/airbnb/lottie/a/a/h;->fY: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;->fW:Ljava/util/List;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->fV: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;->fW:Ljava/util/List;
+    iget-object v6, v0, Lcom/airbnb/lottie/a/a/h;->fV: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;->gl:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/a/h;->gk: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;->gm:I
+    iget v3, v0, Lcom/airbnb/lottie/a/a/h;->gl:I
 
-    sget v4, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v4, Lcom/airbnb/lottie/c/b/f;->iT:I
 
     if-ne v3, v4, :cond_3
 
@@ -482,7 +482,7 @@
 
     move-result v3
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gh: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->gm: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;->go:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gn: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->gg: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;->iG:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iF:[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;->iF:[F
+    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->iE:[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;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->gh: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;->gj:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gi: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/h;->gm: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;->go:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gn: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/h;->gg: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;->iG:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iF:[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;->iF:[F
+    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->iE:[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;->gj:Landroidx/collection/LongSparseArray;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gi: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;->gk:Landroid/graphics/Matrix;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->gj: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;->gk:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->gj: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/h;->fU: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;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/h;->fR: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;->fW:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->fV: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;->fW:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/h;->fV: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;->eX:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fS:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fR: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;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fU:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fU: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fU: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;->fw:[Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv:[Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_5
 
     if-nez p2, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz p1, :cond_3
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->fN: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;->gp:Lcom/airbnb/lottie/a/b/p;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/a/h;->go: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;->gp:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/h;->go:Lcom/airbnb/lottie/a/b/p;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->go: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/h;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/h;->go: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;->fW:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/h;->fV:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -970,7 +970,7 @@
 .method public final aQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/h;->dJ: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 e6f11e4611..e7ba314ec7 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 fZ:Z
+.field private final fY:Z
 
-.field private final gh:Lcom/airbnb/lottie/a/b/a;
+.field private final gg: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 gi:Landroidx/collection/LongSparseArray;
+.field private final gh:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final gj:Landroidx/collection/LongSparseArray;
+.field private final gi:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -37,9 +37,20 @@
     .end annotation
 .end field
 
-.field private final gl:Landroid/graphics/RectF;
+.field private final gk:Landroid/graphics/RectF;
 
-.field private final gm:I
+.field private final gl:I
+
+.field private final gm: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 gn:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -52,20 +63,9 @@
     .end annotation
 .end field
 
-.field private final go: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 go:Lcom/airbnb/lottie/a/b/p;
 
-.field private gp:Lcom/airbnb/lottie/a/b/p;
-
-.field private final gq:I
+.field private final gp: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;->iP:Lcom/airbnb/lottie/c/b/p$a;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$a;->bo()Landroid/graphics/Paint$Cap;
 
     move-result-object v4
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->iQ:Lcom/airbnb/lottie/c/b/p$b;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/e;->iP:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$b;->bp()Landroid/graphics/Paint$Join;
 
     move-result-object v5
 
-    iget v6, p3, Lcom/airbnb/lottie/c/b/e;->iR:F
+    iget v6, p3, Lcom/airbnb/lottie/c/b/e;->iQ:F
 
-    iget-object v7, p3, Lcom/airbnb/lottie/c/b/e;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object v7, p3, Lcom/airbnb/lottie/c/b/e;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v8, p3, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/a/b;
+    iget-object v8, p3, Lcom/airbnb/lottie/c/b/e;->iN:Lcom/airbnb/lottie/c/a/b;
 
-    iget-object v9, p3, Lcom/airbnb/lottie/c/b/e;->iS:Ljava/util/List;
+    iget-object v9, p3, Lcom/airbnb/lottie/c/b/e;->iR:Ljava/util/List;
 
-    iget-object v10, p3, Lcom/airbnb/lottie/c/b/e;->iT:Lcom/airbnb/lottie/c/a/b;
+    iget-object v10, p3, Lcom/airbnb/lottie/c/b/e;->iS: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;->gi:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gh: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;->gj:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gi: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;->gl:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gk: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;->iH:I
+    iget v0, p3, Lcom/airbnb/lottie/c/b/e;->iG:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/i;->gm:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/i;->gl:I
 
-    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/e;->fZ:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/e;->fY:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/i;->fZ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/i;->fY:Z
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aH()F
 
@@ -146,21 +146,37 @@
 
     float-to-int p1, p1
 
-    iput p1, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
+    iput p1, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->iJ:Lcom/airbnb/lottie/c/a/c;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/e;->iI:Lcom/airbnb/lottie/c/a/c;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/c;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gg: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gg: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;->iJ:Lcom/airbnb/lottie/c/a/f;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gm:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gm: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;->gm: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;->iL:Lcom/airbnb/lottie/c/a/f;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->go: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;->go: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;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz v0, :cond_1
 
@@ -268,11 +268,11 @@
 .method private aU()I
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/i;->gm:Lcom/airbnb/lottie/a/b/a;
 
-    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v0, v0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v1, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
+    iget v1, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
 
     int-to-float v1, v1
 
@@ -282,11 +282,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/i;->gn:Lcom/airbnb/lottie/a/b/a;
 
-    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v1, v1, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v2, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
+    iget v2, p0, Lcom/airbnb/lottie/a/a/i;->gp:I
 
     int-to-float v2, v2
 
@@ -296,11 +296,11 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/i;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/i;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v2, v2, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v3, p0, Lcom/airbnb/lottie/a/a/i;->gq:I
+    iget v3, p0, Lcom/airbnb/lottie/a/a/i;->gp: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;->fZ:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/i;->fY:Z
 
     if-eqz v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gm:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/i;->gl:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->iT:I
 
     const/high16 v4, 0x40000000    # 2.0f
 
@@ -371,7 +371,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gh: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gm: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;->go:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gn: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gg: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;->iG:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iF:[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;->iF:[F
+    iget-object v15, v7, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gl:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->top:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gl:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gl:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v9, v9, Landroid/graphics/RectF;->top:F
 
-    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gi:Landroidx/collection/LongSparseArray;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gh: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;->gj:Landroidx/collection/LongSparseArray;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gi: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;->gn:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gm: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;->go:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/i;->gn: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gg: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;->iG:[I
+    iget-object v8, v7, Lcom/airbnb/lottie/c/b/c;->iF:[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;->iF:[F
+    iget-object v14, v7, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
-    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->left:F
 
-    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gl:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->top:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gl:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v8, v8, Landroid/graphics/RectF;->left:F
 
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gl:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/i;->gk:Landroid/graphics/RectF;
 
     iget v9, v9, Landroid/graphics/RectF;->top:F
 
-    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gl:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/a/a/i;->gk: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;->gj:Landroidx/collection/LongSparseArray;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/i;->gi: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;->fw:[Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->fv:[Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_2
 
     if-nez p2, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/p;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->go: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;->gp:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->go: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;->gp:Lcom/airbnb/lottie/a/b/p;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/i;->go:Lcom/airbnb/lottie/a/b/p;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->go: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/i;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->gp:Lcom/airbnb/lottie/a/b/p;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/i;->go: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 c1645e522d..fc3160bd18 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 gu:[I
+.field static final synthetic gt:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[I
+    sput-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jf:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->je: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;->gu:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jg:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jf: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;->gu:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jh:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jg: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;->gu:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->ji:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jh: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;->gu:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jj:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->ji: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 c0649bf6e4..4502209c8d 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 ga:Ljava/util/List;
+.field private final fZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,11 +18,11 @@
     .end annotation
 .end field
 
+.field private final gq:Landroid/graphics/Path;
+
 .field private final gr:Landroid/graphics/Path;
 
-.field private final gs:Landroid/graphics/Path;
-
-.field private final gt:Lcom/airbnb/lottie/c/b/h;
+.field private final gs: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;->gr:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gq: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;->gs:Landroid/graphics/Path;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gr: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;->ga:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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;->gt:Lcom/airbnb/lottie/c/b/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/l;->gs: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;->gs:Landroid/graphics/Path;
-
-    invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
-
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gr:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ga:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gq:Landroid/graphics/Path;
+
+    invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
+
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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;->ga:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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;->gs:Landroid/graphics/Path;
+    iget-object v5, p0, Lcom/airbnb/lottie/a/a/l;->gr: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;->gs:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->gr:Landroid/graphics/Path;
 
     invoke-interface {v1}, Lcom/airbnb/lottie/a/a/m;->aT()Landroid/graphics/Path;
 
@@ -171,7 +171,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->ga:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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;->gr:Landroid/graphics/Path;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/l;->gq: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;->gr:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gq:Landroid/graphics/Path;
 
     invoke-interface {v0}, Lcom/airbnb/lottie/a/a/m;->aT()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;->gr:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gq:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->gs:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->gr: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;->ga:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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;->ga:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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;->ga:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->fZ:Ljava/util/List;
 
     check-cast v0, Lcom/airbnb/lottie/a/a/m;
 
@@ -351,9 +351,9 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gt:Lcom/airbnb/lottie/c/b/h;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/l;->gs:Lcom/airbnb/lottie/c/b/h;
 
-    iget-boolean v0, v0, Lcom/airbnb/lottie/c/b/h;->fZ:Z
+    iget-boolean v0, v0, Lcom/airbnb/lottie/c/b/h;->fY:Z
 
     if-eqz v0, :cond_0
 
@@ -362,11 +362,11 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gu:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/l$1;->gt:[I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gt:Lcom/airbnb/lottie/c/b/h;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->gs:Lcom/airbnb/lottie/c/b/h;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/b/h;->je:Lcom/airbnb/lottie/c/b/h$a;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/h;->jd:Lcom/airbnb/lottie/c/b/h$a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/b/h$a;->ordinal()I
 
@@ -428,7 +428,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->ga:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/l;->fZ:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -438,7 +438,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;->ga:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/l;->fZ: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 8a4186f027..2d32cc7daa 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 gC:[I
+.field static final synthetic gB:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/a/a/n$1;->gC:[I
+    sput-object v0, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gC:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jq:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jp: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;->gC:[I
+    sget-object v0, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jr:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jq: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 2cadd25ecd..a5f386e575 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/n.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/n.smali
@@ -9,9 +9,9 @@
 
 
 # instance fields
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fZ:Z
+.field private final fY:Z
 
 .field private final gA:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -24,18 +24,7 @@
     .end annotation
 .end field
 
-.field private final gB: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 gd:Lcom/airbnb/lottie/a/b/a;
+.field private final gc:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -46,11 +35,22 @@
     .end annotation
 .end field
 
-.field private gf:Lcom/airbnb/lottie/a/a/b;
+.field private ge:Lcom/airbnb/lottie/a/a/b;
 
-.field private gg:Z
+.field private gf:Z
 
-.field private final gv:Lcom/airbnb/lottie/c/b/i$a;
+.field private final gu:Lcom/airbnb/lottie/c/b/i$a;
+
+.field private final gv: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 gw:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -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;->gf:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/n;->ge:Lcom/airbnb/lottie/a/a/b;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->dJ: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;->gv:Lcom/airbnb/lottie/c/b/i$a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->gu:Lcom/airbnb/lottie/c/b/i$a;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/c/b/i$a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gu:Lcom/airbnb/lottie/c/b/i$a;
 
-    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/i;->fZ:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/i;->fY:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/n;->fZ:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/n;->fY:Z
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jl:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jk:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->iu:Lcom/airbnb/lottie/c/a/m;
+
+    invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gc:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->iw:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
@@ -141,44 +157,6 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gw:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->iv:Lcom/airbnb/lottie/c/a/m;
-
-    invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gd:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->ix:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jn:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jp:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gB:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/c/b/i$a;
-
-    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->jq:Lcom/airbnb/lottie/c/b/i$a;
-
-    if-ne p1, v0, :cond_0
-
     iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jm:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
@@ -195,42 +173,50 @@
 
     iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gA:Lcom/airbnb/lottie/a/b/a;
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gu:Lcom/airbnb/lottie/c/b/i$a;
+
+    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->jp:Lcom/airbnb/lottie/c/b/i$a;
+
+    if-ne p1, v0, :cond_0
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jl:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/i;->jn:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gz: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;->gy:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gA:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
 
     :goto_0
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gv: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;->gc: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;->gw: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;->gd: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;->gx: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;->gz: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;->gB: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;->gv:Lcom/airbnb/lottie/c/b/i$a;
-
-    sget-object p3, Lcom/airbnb/lottie/c/b/i$a;->jq:Lcom/airbnb/lottie/c/b/i$a;
-
-    if-ne p1, p3, :cond_1
-
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gy: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;->gu:Lcom/airbnb/lottie/c/b/i$a;
+
+    sget-object p3, Lcom/airbnb/lottie/c/b/i$a;->jp:Lcom/airbnb/lottie/c/b/i$a;
+
+    if-ne p1, p3, :cond_1
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gx: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;->gz: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;->gv: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;->gc: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;->gw: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;->gd: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;->gx: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;->gz: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;->gB: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;->gv:Lcom/airbnb/lottie/c/b/i$a;
-
-    sget-object p2, Lcom/airbnb/lottie/c/b/i$a;->jq:Lcom/airbnb/lottie/c/b/i$a;
-
-    if-ne p1, p2, :cond_2
-
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gy: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;->gu:Lcom/airbnb/lottie/c/b/i$a;
+
+    sget-object p2, Lcom/airbnb/lottie/c/b/i$a;->jp:Lcom/airbnb/lottie/c/b/i$a;
+
+    if-ne p1, p2, :cond_2
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gx: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;->gz: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;->fm:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fl:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_0
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gv: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;->fm:Ljava/lang/Float;
+
+    if-ne p1, v0, :cond_1
+
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gw: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;->fn:Ljava/lang/Float;
-
-    if-ne p1, v0, :cond_1
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gx: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;->fd:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->fc:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gc: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;->fo:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fn:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gy:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gx: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;->fp:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fo:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gy: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;->fq:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fp:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gA:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->gz: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;->fr:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fq:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_6
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gB:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/n;->gA: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;->gJ:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gI:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/n;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/n;->ge: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;->gg:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/n;->gf:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/n;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -469,7 +469,7 @@
 
     move-object/from16 v0, p0
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->gg:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->gf:Z
 
     if-eqz v1, :cond_0
 
@@ -482,22 +482,22 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->fZ:Z
+    iget-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->fY:Z
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_1
 
-    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/n;->gg:Z
+    iput-boolean v2, v0, Lcom/airbnb/lottie/a/a/n;->gf: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;->gC:[I
+    sget-object v1, Lcom/airbnb/lottie/a/a/n$1;->gB:[I
 
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/c/b/i$a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gu:Lcom/airbnb/lottie/c/b/i$a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/c/b/i$a;->ordinal()I
 
@@ -524,7 +524,7 @@
     goto/16 :goto_11
 
     :cond_2
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -544,7 +544,7 @@
 
     double-to-int v1, v14
 
-    iget-object v14, v0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
+    iget-object v14, v0, Lcom/airbnb/lottie/a/a/n;->gw:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v14, :cond_3
 
@@ -578,7 +578,7 @@
 
     double-to-float v1, v3
 
-    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gB:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v0, Lcom/airbnb/lottie/a/a/n;->gA:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -592,7 +592,7 @@
 
     div-float/2addr v3, v10
 
-    iget-object v4, v0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/a/a/n;->gy:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -800,7 +800,7 @@
     goto/16 :goto_1
 
     :cond_5
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gc:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -823,7 +823,7 @@
     goto/16 :goto_11
 
     :cond_6
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gv:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -835,7 +835,7 @@
 
     move-result v1
 
-    iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->gw:Lcom/airbnb/lottie/a/b/a;
 
     if-nez v2, :cond_7
 
@@ -898,7 +898,7 @@
     add-double/2addr v5, v11
 
     :cond_8
-    iget-object v9, v0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
+    iget-object v9, v0, Lcom/airbnb/lottie/a/a/n;->gy:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v9}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -910,7 +910,7 @@
 
     move-result v9
 
-    iget-object v11, v0, Lcom/airbnb/lottie/a/a/n;->gy:Lcom/airbnb/lottie/a/b/a;
+    iget-object v11, v0, Lcom/airbnb/lottie/a/a/n;->gx:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v11}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -922,7 +922,7 @@
 
     move-result v11
 
-    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->gA:Lcom/airbnb/lottie/a/b/a;
+    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->gz:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v12, :cond_9
 
@@ -944,7 +944,7 @@
     const/4 v13, 0x0
 
     :goto_4
-    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->gB:Lcom/airbnb/lottie/a/b/a;
+    iget-object v12, v0, Lcom/airbnb/lottie/a/a/n;->gA:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v12, :cond_a
 
@@ -1431,7 +1431,7 @@
     goto/16 :goto_7
 
     :cond_16
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gc:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -1456,7 +1456,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->close()V
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/a/n;->ge:Lcom/airbnb/lottie/a/a/b;
 
     iget-object v2, v0, Lcom/airbnb/lottie/a/a/n;->path:Landroid/graphics/Path;
 
@@ -1464,7 +1464,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->gg:Z
+    iput-boolean v1, v0, Lcom/airbnb/lottie/a/a/n;->gf: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 94d4699af2..67c0cc2b41 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/o.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/o.smali
@@ -9,11 +9,11 @@
 
 
 # instance fields
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fZ:Z
+.field private final fY:Z
 
-.field private final gD:Lcom/airbnb/lottie/a/b/a;
+.field private final gC:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -24,6 +24,17 @@
     .end annotation
 .end field
 
+.field private final gb: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 gc:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -35,20 +46,9 @@
     .end annotation
 .end field
 
-.field private final gd: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 ge:Lcom/airbnb/lottie/a/a/b;
 
-.field private gf:Lcom/airbnb/lottie/a/a/b;
-
-.field private gg:Z
+.field private gf:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -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;->gf:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/o;->ge: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;->fZ:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/j;->fY:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fZ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fY:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iv:Lcom/airbnb/lottie/c/a/m;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iu:Lcom/airbnb/lottie/c/a/m;
 
     invoke-interface {p1}, Lcom/airbnb/lottie/c/a/m;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gd:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gc:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iD:Lcom/airbnb/lottie/c/a/f;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->iC:Lcom/airbnb/lottie/c/a/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/f;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gc:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gb:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->jt:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/j;->js:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gD:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gd: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;->gC:Lcom/airbnb/lottie/a/b/a;
 
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gc: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;->gD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gb: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;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gC: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;->gc: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;->gD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gb: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;->gC: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;->fb:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->fa:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_0
 
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gb: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;->fc:Landroid/graphics/PointF;
+
+    if-ne p1, v0, :cond_1
+
     iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gc: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;->fd:Landroid/graphics/PointF;
-
-    if-ne p1, v0, :cond_1
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gd: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;->fc:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fb:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gD:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/o;->gC: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;->gJ:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gI:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/o;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/o;->ge: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;->gg:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->gf:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -283,7 +283,7 @@
 .method public final aT()Landroid/graphics/Path;
     .locals 15
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->gg:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->gf:Z
 
     if-eqz v0, :cond_0
 
@@ -296,20 +296,20 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fZ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/o;->fY:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->gg:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->gf: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;->gc:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->gb:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -327,7 +327,7 @@
 
     div-float/2addr v0, v3
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/a/o;->gD:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/o;->gC:Lcom/airbnb/lottie/a/b/a;
 
     const/4 v5, 0x0
 
@@ -356,7 +356,7 @@
     move v4, v6
 
     :cond_3
-    iget-object v6, p0, Lcom/airbnb/lottie/a/a/o;->gd:Lcom/airbnb/lottie/a/b/a;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/o;->gc:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v6}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -594,13 +594,13 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->close()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/o;->ge: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;->gg:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/o;->gf: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 5d898295e0..be089ec1ba 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 dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fO:Lcom/airbnb/lottie/c/c/a;
+.field private final fN:Lcom/airbnb/lottie/c/c/a;
 
-.field private final fZ:Z
+.field private final fY:Z
+
+.field private final gD: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 gE:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -28,20 +39,9 @@
     .end annotation
 .end field
 
-.field private final gF: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 gF:Lcom/airbnb/lottie/a/b/o;
 
-.field private final gG:Lcom/airbnb/lottie/a/b/o;
-
-.field private gH:Lcom/airbnb/lottie/a/a/d;
+.field private gG: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;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/p;->fO:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/p;->fN: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;->fZ:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/k;->fY:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/p;->fZ:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/p;->fY:Z
+
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->jt:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gD:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gD: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;->gD: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;->ju: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;->jv:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gF:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->gF: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;->jw:Lcom/airbnb/lottie/c/a/l;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/k;->jv:Lcom/airbnb/lottie/c/a/l;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/l;->bm()Lcom/airbnb/lottie/a/b/o;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gG:Lcom/airbnb/lottie/a/b/o;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->gE:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gD: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;->gF:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->gE: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/o;->hu: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, v4, Lcom/airbnb/lottie/a/b/o;->hv: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gF: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;->fk:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fj:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gE:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gD: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;->fl:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fk:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gF:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gE: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gG: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/a/p;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-boolean v5, p0, Lcom/airbnb/lottie/a/a/p;->fZ:Z
+    iget-boolean v5, p0, Lcom/airbnb/lottie/a/a/p;->fY: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/p;->gG:Lcom/airbnb/lottie/a/a/d;
 
     return-void
 .end method
@@ -421,7 +421,7 @@
 .method public final aQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -431,7 +431,7 @@
 .method public final aT()Landroid/graphics/Path;
     .locals 6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/p;->gG:Lcom/airbnb/lottie/a/a/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/a/a/d;->aT()Landroid/graphics/Path;
 
@@ -441,7 +441,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Path;->reset()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->gE:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/p;->gD:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -453,7 +453,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->gF:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/p;->gE:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -474,7 +474,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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/a/p;->gF: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 5562cd7916..1aa4d43570 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/q.smali
@@ -8,11 +8,11 @@
 
 
 # instance fields
-.field private final dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final fZ:Z
+.field private final fY:Z
 
-.field private final gI:Lcom/airbnb/lottie/a/b/a;
+.field private final gH:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -23,9 +23,9 @@
     .end annotation
 .end field
 
-.field private gf:Lcom/airbnb/lottie/a/a/b;
+.field private ge:Lcom/airbnb/lottie/a/a/b;
 
-.field private gg:Z
+.field private gf:Z
 
 .field private final name:Ljava/lang/String;
 
@@ -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;->gf:Lcom/airbnb/lottie/a/a/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/q;->ge: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;->fZ:Z
+    iget-boolean v0, p3, Lcom/airbnb/lottie/c/b/o;->fY:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fZ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fY:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/o;->jA:Lcom/airbnb/lottie/c/a/h;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/o;->jz:Lcom/airbnb/lottie/c/a/h;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/h;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gI:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gH:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gI:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gH: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;->gI:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/q;->gH: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;->gJ:I
+    iget v1, v0, Lcom/airbnb/lottie/a/a/s;->gI:I
 
-    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v2, Lcom/airbnb/lottie/c/b/q$a;->jM:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/a/q;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/q;->ge: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;->gg:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->gf:Z
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -154,7 +154,7 @@
 .method public final aT()Landroid/graphics/Path;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->gg:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->gf:Z
 
     if-eqz v0, :cond_0
 
@@ -167,13 +167,13 @@
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fZ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/q;->fY:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_1
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->gg:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->gf:Z
 
     iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->path:Landroid/graphics/Path;
 
@@ -182,7 +182,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;->gI:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/a/q;->gH:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/a/b/a;->getValue()Ljava/lang/Object;
 
@@ -198,13 +198,13 @@
 
     invoke-virtual {v0, v2}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->gf:Lcom/airbnb/lottie/a/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/q;->ge: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;->gg:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/a/a/q;->gf: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 995a36148d..16052cc825 100644
--- a/com.discord/smali/com/airbnb/lottie/a/a/r.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/a/r.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final fO:Lcom/airbnb/lottie/c/c/a;
+.field private final fN:Lcom/airbnb/lottie/c/c/a;
 
-.field private fV:Lcom/airbnb/lottie/a/b/a;
+.field private fU:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -17,9 +17,9 @@
     .end annotation
 .end field
 
-.field private final fZ:Z
+.field private final fY:Z
 
-.field private final gh:Lcom/airbnb/lottie/a/b/a;
+.field private final gg:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -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;->iP:Lcom/airbnb/lottie/c/b/p$a;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/b/p$a;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$a;->bo()Landroid/graphics/Paint$Cap;
 
     move-result-object v4
 
-    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->iQ:Lcom/airbnb/lottie/c/b/p$b;
+    iget-object v0, p3, Lcom/airbnb/lottie/c/b/p;->iP:Lcom/airbnb/lottie/c/b/p$b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/b/p$b;->bp()Landroid/graphics/Paint$Join;
 
     move-result-object v5
 
-    iget v6, p3, Lcom/airbnb/lottie/c/b/p;->iR:F
+    iget v6, p3, Lcom/airbnb/lottie/c/b/p;->iQ:F
 
-    iget-object v7, p3, Lcom/airbnb/lottie/c/b/p;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object v7, p3, Lcom/airbnb/lottie/c/b/p;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v8, p3, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/a/b;
+    iget-object v8, p3, Lcom/airbnb/lottie/c/b/p;->iN:Lcom/airbnb/lottie/c/a/b;
 
-    iget-object v9, p3, Lcom/airbnb/lottie/c/b/p;->iS:Ljava/util/List;
+    iget-object v9, p3, Lcom/airbnb/lottie/c/b/p;->iR:Ljava/util/List;
 
-    iget-object v10, p3, Lcom/airbnb/lottie/c/b/p;->jv:Lcom/airbnb/lottie/c/a/b;
+    iget-object v10, p3, Lcom/airbnb/lottie/c/b/p;->ju: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/r;->fN: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;->fZ:Z
+    iget-boolean p1, p3, Lcom/airbnb/lottie/c/b/p;->fY:Z
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/r;->fZ:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/a/a/r;->fY:Z
 
-    iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->io:Lcom/airbnb/lottie/c/a/a;
+    iget-object p1, p3, Lcom/airbnb/lottie/c/b/p;->im:Lcom/airbnb/lottie/c/a/a;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/a;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gg:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gg: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gg: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;->fZ:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/a/r;->fY: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->gg: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/a/r;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/a/r;->fU: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;->eV:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->gg: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;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fU:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fU: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;->fO:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/r;->fN:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/a/r;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/r;->gg: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 0b2efec511..e666610c8f 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 fZ:Z
+.field public final fY:Z
 
-.field final gJ:I
+.field final gI:I
+
+.field public final gJ: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 gK:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
@@ -34,17 +45,6 @@
     .end annotation
 .end field
 
-.field public final gM: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;->fZ:Z
+    iget-boolean v0, p2, Lcom/airbnb/lottie/c/b/q;->fY:Z
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/s;->fZ:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/a/s;->fY:Z
 
-    iget v0, p2, Lcom/airbnb/lottie/c/b/q;->gJ:I
+    iget v0, p2, Lcom/airbnb/lottie/c/b/q;->gI:I
 
-    iput v0, p0, Lcom/airbnb/lottie/a/a/s;->gJ:I
+    iput v0, p0, Lcom/airbnb/lottie/a/a/s;->gI:I
+
+    iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->jK:Lcom/airbnb/lottie/c/a/b;
+
+    invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->gJ:Lcom/airbnb/lottie/a/b/a;
 
     iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->jL:Lcom/airbnb/lottie/c/a/b;
 
@@ -90,21 +98,17 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p2, Lcom/airbnb/lottie/c/b/q;->jM:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/airbnb/lottie/a/a/s;->gL:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p2, p2, Lcom/airbnb/lottie/c/b/q;->jv:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/b/q;->ju:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/a/s;->gM:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/a/s;->gL:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p2, p0, Lcom/airbnb/lottie/a/a/s;->gJ: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;->gK: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;->gM:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/a/s;->gJ: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;->gK: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;->gM: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 2f0e0bebe6..6bde2ceb8b 100644
--- a/com.discord/smali/com/airbnb/lottie/a/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/a/b/a.smali
@@ -23,11 +23,11 @@
 
 
 # instance fields
-.field public dW:F
+.field public dV:F
 
-.field public gN:Z
+.field public gM:Z
 
-.field private final gO:Ljava/util/List;
+.field private final gN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field protected gP:Lcom/airbnb/lottie/g/c;
+.field protected gO:Lcom/airbnb/lottie/g/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/g/c<",
@@ -47,6 +47,15 @@
     .end annotation
 .end field
 
+.field private gP:Lcom/airbnb/lottie/g/a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/g/a<",
+            "TK;>;"
+        }
+    .end annotation
+.end field
+
 .field private gQ:Lcom/airbnb/lottie/g/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -56,18 +65,9 @@
     .end annotation
 .end field
 
-.field private gR:Lcom/airbnb/lottie/g/a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/g/a<",
-            "TK;>;"
-        }
-    .end annotation
-.end field
+.field private gR:F
 
-.field private gS:F
-
-.field private gT:Ljava/lang/Object;
+.field private gS:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TA;"
@@ -75,9 +75,9 @@
     .end annotation
 .end field
 
-.field private gU:F
+.field private gT:F
 
-.field private gV:F
+.field private gU:F
 
 .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;->gN:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->gM:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gS:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gR:F
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/a;->gT:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/a;->gS:Ljava/lang/Object;
+
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:F
 
     iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
 
-    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gV:F
-
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gO:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gN:Ljava/util/List;
 
     return-void
 .end method
@@ -141,7 +141,7 @@
 .method private aZ()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gT: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;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN: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;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN: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;->gU:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:F
 
     return v0
 .end method
@@ -207,20 +207,20 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/airbnb/lottie/g/c;->mI:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, v0, Lcom/airbnb/lottie/g/c;->mH:Lcom/airbnb/lottie/a/b/a;
 
     :cond_0
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/a;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz p1, :cond_1
 
-    iput-object p0, p1, Lcom/airbnb/lottie/g/c;->mI:Lcom/airbnb/lottie/a/b/a;
+    iput-object p0, p1, Lcom/airbnb/lottie/g/c;->mH:Lcom/airbnb/lottie/a/b/a;
 
     :cond_1
     return-void
@@ -268,11 +268,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/a;
 
     if-eqz v0, :cond_0
 
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     invoke-virtual {v0, v1}, Lcom/airbnb/lottie/g/a;->f(F)Z
 
@@ -280,12 +280,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/a;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -299,7 +299,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/g/a;->bI()F
 
@@ -309,7 +309,7 @@
 
     if-gez v1, :cond_1
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/a;->gN:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -320,7 +320,7 @@
     :goto_0
     if-ltz v1, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -328,7 +328,7 @@
 
     check-cast v0, Lcom/airbnb/lottie/g/a;
 
-    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     invoke-virtual {v0, v2}, Lcom/airbnb/lottie/g/a;->f(F)Z
 
@@ -341,7 +341,7 @@
     goto :goto_0
 
     :cond_1
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/a;
 
     return-object v0
 .end method
@@ -349,7 +349,7 @@
 .method final aX()F
     .locals 3
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->gN:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/a/b/a;->gM:Z
 
     const/4 v1, 0x0
 
@@ -371,7 +371,7 @@
     return v1
 
     :cond_1
-    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/g/a;->bI()F
 
@@ -412,7 +412,7 @@
     return v0
 
     :cond_0
-    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/a;->aX()F
 
@@ -438,7 +438,7 @@
 .method ba()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gV:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU: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;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN: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;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN: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;->gV:F
+    iput v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gV:F
+    iget v0, p0, Lcom/airbnb/lottie/a/b/a;->gU:F
 
     return v0
 .end method
@@ -502,34 +502,34 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gO:Lcom/airbnb/lottie/g/c;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gR:Lcom/airbnb/lottie/g/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
 
     if-ne v0, v2, :cond_0
 
-    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->gS:F
+    iget v2, p0, Lcom/airbnb/lottie/a/b/a;->gR:F
 
     cmpl-float v2, v2, v1
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gT:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gS:Ljava/lang/Object;
 
     return-object v0
 
     :cond_0
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gR:Lcom/airbnb/lottie/g/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gQ:Lcom/airbnb/lottie/g/a;
 
-    iput v1, p0, Lcom/airbnb/lottie/a/b/a;->gS:F
+    iput v1, p0, Lcom/airbnb/lottie/a/b/a;->gR: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;->gT:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gS: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;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/a;->gN: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;->dW:F
+    iget v1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     cmpl-float v1, p1, v1
 
@@ -590,7 +590,7 @@
     return-void
 
     :cond_3
-    iput p1, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iput p1, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/a;->aW()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 ac02af4ce1..e89ecf481e 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;->ms:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr: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;->mt:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms: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;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/b;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/b;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/b;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget v4, p1, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v4, p1, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mu: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;->dW:F
+    iget v10, p0, Lcom/airbnb/lottie/a/b/a;->dV: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 67f5709dc8..53eb2ecf64 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;->mr:Ljava/lang/Object;
+
+    if-eqz v0, :cond_3
+
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/c;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/c;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/c;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/c;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
     move-result v3
 
-    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/c;->aX()F
 
     move-result v7
 
-    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     move v6, p2
 
@@ -91,7 +91,7 @@
     return p1
 
     :cond_0
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->mw:F
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->mv:F
 
     const v1, -0x358c9d09
 
@@ -99,7 +99,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Float;
 
@@ -107,18 +107,18 @@
 
     move-result v0
 
-    iput v0, p1, Lcom/airbnb/lottie/g/a;->mw:F
+    iput v0, p1, Lcom/airbnb/lottie/g/a;->mv:F
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->mw:F
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->mv:F
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->mx:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->mw:F
 
     cmpl-float v1, v2, v1
 
     if-nez v1, :cond_2
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Float;
 
@@ -126,10 +126,10 @@
 
     move-result v1
 
-    iput v1, p1, Lcom/airbnb/lottie/g/a;->mx:F
+    iput v1, p1, Lcom/airbnb/lottie/g/a;->mw:F
 
     :cond_2
-    iget p1, p1, Lcom/airbnb/lottie/g/a;->mx:F
+    iget p1, p1, Lcom/airbnb/lottie/g/a;->mw: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 01301a05dc..24610b78f0 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 gW:Lcom/airbnb/lottie/c/b/c;
+.field private final gV: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;->ms:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mr: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;->iG:[I
+    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->iF:[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;->gW:Lcom/airbnb/lottie/c/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/d;->gV: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;->gW:Lcom/airbnb/lottie/c/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/d;->gV:Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     check-cast v1, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b/c;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     array-length v2, v2
 
-    iget-object v3, p1, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v3, p1, Lcom/airbnb/lottie/c/b/c;->iF:[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;->iG:[I
+    iget-object v3, v1, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     array-length v3, v3
 
     if-ge v2, v3, :cond_0
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[F
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iF:[F
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
     aget v4, v4, v2
 
-    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iF:[F
+    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
     aget v5, v5, v2
 
@@ -117,13 +117,13 @@
 
     aput v4, v3, v2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     aget v4, v4, v2
 
-    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v5, p1, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     aget v5, v5, v2
 
@@ -138,7 +138,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/d;->gW:Lcom/airbnb/lottie/c/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/d;->gV: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;->iG:[I
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/c;->iF:[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;->iG:[I
+    iget-object p1, p1, Lcom/airbnb/lottie/c/b/c;->iF:[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 43266a2798..aae6a72248 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;->mr:Ljava/lang/Object;
+
+    if-eqz v0, :cond_3
+
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/e;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/e;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/e;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/e;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
     invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
 
     move-result v3
 
-    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v5, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/e;->aX()F
 
     move-result v7
 
-    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     move v6, p2
 
@@ -91,13 +91,13 @@
     return p1
 
     :cond_0
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->my:I
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->mx:I
 
     const v1, 0x2ec8fb09
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -105,16 +105,16 @@
 
     move-result v0
 
-    iput v0, p1, Lcom/airbnb/lottie/g/a;->my:I
+    iput v0, p1, Lcom/airbnb/lottie/g/a;->mx:I
 
     :cond_1
-    iget v0, p1, Lcom/airbnb/lottie/g/a;->my:I
+    iget v0, p1, Lcom/airbnb/lottie/g/a;->mx:I
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->mz:I
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->my:I
 
     if-ne v2, v1, :cond_2
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -122,10 +122,10 @@
 
     move-result v1
 
-    iput v1, p1, Lcom/airbnb/lottie/g/a;->mz:I
+    iput v1, p1, Lcom/airbnb/lottie/g/a;->my:I
 
     :cond_2
-    iget p1, p1, Lcom/airbnb/lottie/g/a;->mz:I
+    iget p1, p1, Lcom/airbnb/lottie/g/a;->my: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 62c8821dd4..d699b90a99 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 gX:Ljava/util/List;
+.field public final gW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public final gY:Ljava/util/List;
+.field public final gX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public final gZ:Ljava/util/List;
+.field public final gY: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;->gZ:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/g;->gY: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;->gW:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -65,16 +75,6 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/b/g;->gX: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;->gY: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;->gX:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/g;->gW: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;->iY:Lcom/airbnb/lottie/c/a/h;
+    iget-object v2, v2, Lcom/airbnb/lottie/c/b/g;->iX:Lcom/airbnb/lottie/c/a/h;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/c/a/h;->bi()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;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/b/g;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/a/d;->bi()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 c1c09bd48e..aa780be2d9 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 ha:Lcom/airbnb/lottie/g/a;
+.field private final gZ: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;->ms:Ljava/lang/Object;
+    iget-object v2, p2, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
-    iget-object v3, p2, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v3, p2, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iget-object v4, p2, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
+    iget-object v4, p2, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
 
-    iget v5, p2, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v5, p2, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget-object v6, p2, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object v6, p2, Lcom/airbnb/lottie/g/a;->mu: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;->ha:Lcom/airbnb/lottie/g/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/h;->gZ:Lcom/airbnb/lottie/g/a;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/h;->bd()V
 
@@ -68,25 +68,25 @@
 .method public final bd()V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->mt:Ljava/lang/Object;
-
-    if-eqz v0, :cond_0
-
     iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->mt:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ms: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;->mt:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->ms: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;->mt:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
     if-eqz v1, :cond_1
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
 
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->mt:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
     check-cast v1, Landroid/graphics/PointF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->ha:Lcom/airbnb/lottie/g/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/h;->gZ:Lcom/airbnb/lottie/g/a;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
+    iget-object v2, v2, Lcom/airbnb/lottie/g/a;->mC:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/a/b/h;->ha:Lcom/airbnb/lottie/g/a;
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/h;->gZ:Lcom/airbnb/lottie/g/a;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
+    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->mD: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 7a0a6cd929..2673ff22cb 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 hb:Landroid/graphics/PointF;
+.field private final ha:Landroid/graphics/PointF;
 
-.field private final hc:[F
+.field private final hb:[F
 
-.field private hd:Lcom/airbnb/lottie/a/b/h;
+.field private hc:Lcom/airbnb/lottie/a/b/h;
 
-.field private he:Landroid/graphics/PathMeasure;
+.field private hd: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;->hb:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->ha:Landroid/graphics/PointF;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hc:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hb:[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;->he:Landroid/graphics/PathMeasure;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hd: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;->ms:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     check-cast p1, Landroid/graphics/PointF;
 
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz p1, :cond_1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/a/b/i;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/i;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget v3, v0, Lcom/airbnb/lottie/a/b/h;->ei:F
+    iget v3, v0, Lcom/airbnb/lottie/a/b/h;->eh:F
 
-    iget-object p1, v0, Lcom/airbnb/lottie/a/b/h;->mv:Ljava/lang/Float;
+    iget-object p1, v0, Lcom/airbnb/lottie/a/b/h;->mu:Ljava/lang/Float;
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
     move-result v4
 
-    iget-object v5, v0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
+    iget-object v5, v0, Lcom/airbnb/lottie/a/b/h;->mr:Ljava/lang/Object;
 
-    iget-object v6, v0, Lcom/airbnb/lottie/a/b/h;->mt:Ljava/lang/Object;
+    iget-object v6, v0, Lcom/airbnb/lottie/a/b/h;->ms:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/a/b/i;->aX()F
 
     move-result v7
 
-    iget v9, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v9, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     move v8, p2
 
@@ -117,20 +117,20 @@
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hd:Lcom/airbnb/lottie/a/b/h;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hc: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;->he:Landroid/graphics/PathMeasure;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hd: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;->hd:Lcom/airbnb/lottie/a/b/h;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/i;->hc:Lcom/airbnb/lottie/a/b/h;
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->he:Landroid/graphics/PathMeasure;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->hd: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;->hc:[F
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/i;->hb:[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;->hb:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->ha:Landroid/graphics/PointF;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->hc:[F
+    iget-object p2, p0, Lcom/airbnb/lottie/a/b/i;->hb:[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;->hb:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/i;->ha: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 5c523fb5ce..3313626f51 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 hb:Landroid/graphics/PointF;
+.field private final ha: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;->hb:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/j;->ha: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;->ms:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+
     check-cast v0, Landroid/graphics/PointF;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     move-object v9, v1
 
     check-cast v9, Landroid/graphics/PointF;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/j;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mu: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;->dW:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     move-object v4, v0
 
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->hb:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->ha: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;->hb:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/j;->ha: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 5e5e715b08..cf3c3b00ce 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 hf:Lcom/airbnb/lottie/g/d;
+.field private final he: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;->hf:Lcom/airbnb/lottie/g/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/k;->he: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;->ms:Ljava/lang/Object;
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     iget-object v0, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
+    if-eqz v0, :cond_1
+
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
+
     check-cast v0, Lcom/airbnb/lottie/g/d;
 
-    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v1, p1, Lcom/airbnb/lottie/g/a;->ms: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;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->gO:Lcom/airbnb/lottie/g/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/k;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget v2, p1, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v2, p1, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mu: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;->dW:F
+    iget v8, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
     move-object v4, v0
 
@@ -101,7 +101,7 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->hf:Lcom/airbnb/lottie/g/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->he: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;->hf:Lcom/airbnb/lottie/g/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/k;->he: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 0b63e95e58..1ae48cb21a 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 hg:Lcom/airbnb/lottie/c/b/l;
+.field private final hf:Lcom/airbnb/lottie/c/b/l;
 
-.field private final hh:Landroid/graphics/Path;
+.field private final hg: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;->hg:Lcom/airbnb/lottie/c/b/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hf: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;->hh:Landroid/graphics/Path;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hg: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;->ms:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     check-cast v0, Lcom/airbnb/lottie/c/b/l;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     check-cast p1, Lcom/airbnb/lottie/c/b/l;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/a/b/l;->hg:Lcom/airbnb/lottie/c/b/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/l;->hf:Lcom/airbnb/lottie/c/b/l;
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jy:Landroid/graphics/PointF;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jy:Landroid/graphics/PointF;
+    iput-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
 
     :cond_0
     iget-boolean v2, v0, Lcom/airbnb/lottie/c/b/l;->w:Z
@@ -100,13 +100,13 @@
     :goto_1
     iput-boolean v2, v1, Lcom/airbnb/lottie/c/b/l;->w:Z
 
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->size()I
 
@@ -147,13 +147,13 @@
     invoke-static {v2}, Lcom/airbnb/lottie/f/d;->w(Ljava/lang/String;)V
 
     :cond_3
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
     move-result v2
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jw:Ljava/util/List;
 
-    iget-object v6, v1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v6, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jy:Landroid/graphics/PointF;
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
 
-    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jy:Landroid/graphics/PointF;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jy:Landroid/graphics/PointF;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx: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;->jy:Landroid/graphics/PointF;
+    iput-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
 
     :cond_6
-    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jy:Landroid/graphics/PointF;
+    iget-object v4, v1, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
 
     invoke-virtual {v4, v5, v2}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v4, p1, Lcom/airbnb/lottie/c/b/l;->jw: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;->hJ:Landroid/graphics/PointF;
+    iget-object v5, v3, Lcom/airbnb/lottie/c/a;->hI:Landroid/graphics/PointF;
 
-    iget-object v6, v3, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iget-object v6, v3, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
+    iget-object v3, v3, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    iget-object v7, v4, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
+    iget-object v7, v4, Lcom/airbnb/lottie/c/a;->hI:Landroid/graphics/PointF;
 
-    iget-object v8, v4, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iget-object v8, v4, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
+    iget-object v4, v4, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    iget-object v9, v1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v9, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->hJ:Landroid/graphics/PointF;
+    iget-object v7, v9, Lcom/airbnb/lottie/c/a;->hI:Landroid/graphics/PointF;
 
     invoke-virtual {v7, v10, v5}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->hK:Landroid/graphics/PointF;
+    iget-object v5, v5, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
     invoke-virtual {v5, v7, v6}, Landroid/graphics/PointF;->set(FF)V
 
-    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iget-object v5, v1, Lcom/airbnb/lottie/c/b/l;->jw: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;->hL:Landroid/graphics/PointF;
+    iget-object v4, v5, Lcom/airbnb/lottie/c/a;->hK: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;->hg:Lcom/airbnb/lottie/c/b/l;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hf:Lcom/airbnb/lottie/c/b/l;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/a/b/l;->hh:Landroid/graphics/Path;
+    iget-object p2, p0, Lcom/airbnb/lottie/a/b/l;->hg: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;->hh:Landroid/graphics/Path;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/l;->hg: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 58c675a4cb..f893976c90 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 hb:Landroid/graphics/PointF;
+.field private final ha:Landroid/graphics/PointF;
 
-.field private final hi:Lcom/airbnb/lottie/a/b/a;
+.field private final hh: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 hj:Lcom/airbnb/lottie/a/b/a;
+.field private final hi: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;->hb:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/m;->ha:Landroid/graphics/PointF;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/m;->hi:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/m;->hh:Lcom/airbnb/lottie/a/b/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/a/b/m;->hj:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/m;->hi:Lcom/airbnb/lottie/a/b/a;
 
-    iget p1, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget p1, p0, Lcom/airbnb/lottie/a/b/a;->dV: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;->hb:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->ha: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;->hb:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->ha: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;->hh: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;->hi: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;->hj:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/m;->ha: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;->hb:Landroid/graphics/PointF;
-
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->hi:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/m;->hh: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;->hj:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/m;->hi: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 415fdd2ce8..3d9f4ed726 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;->ms:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/airbnb/lottie/g/a;->mr: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 8fd7ea432c..3b920fcf83 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 hj:Landroid/graphics/Matrix;
+
 .field private final hk:Landroid/graphics/Matrix;
 
 .field private final hl:Landroid/graphics/Matrix;
 
-.field private final hm:Landroid/graphics/Matrix;
+.field private final hm:[F
 
-.field private final hn:[F
+.field public hn: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 ho: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 hs: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 hs:Lcom/airbnb/lottie/a/b/c;
 
 .field public ht:Lcom/airbnb/lottie/a/b/c;
 
-.field public hu:Lcom/airbnb/lottie/a/b/c;
-
-.field public hv:Lcom/airbnb/lottie/a/b/a;
+.field public hu: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 hw:Lcom/airbnb/lottie/a/b/a;
+.field public hv: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;->iu:Lcom/airbnb/lottie/c/a/e;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->is: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;->iu:Lcom/airbnb/lottie/c/a/e;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->is:Lcom/airbnb/lottie/c/a/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/e;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ho:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hn:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iv:Lcom/airbnb/lottie/c/a/m;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iu: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;->iv:Lcom/airbnb/lottie/c/a/m;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iu:Lcom/airbnb/lottie/c/a/m;
 
     invoke-interface {v0}, Lcom/airbnb/lottie/c/a/m;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_1
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hp:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ho:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iw:Lcom/airbnb/lottie/c/a/g;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iv: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;->iw:Lcom/airbnb/lottie/c/a/g;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iv:Lcom/airbnb/lottie/c/a/g;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/g;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_2
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hq:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hp:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iw: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;->ix:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iw:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
     :goto_3
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hq:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iz:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy: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;->iz:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bi()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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/c;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->hj: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;->hk:Landroid/graphics/Matrix;
 
     new-instance v0, Landroid/graphics/Matrix;
@@ -218,31 +224,25 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hl: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;->hm:Landroid/graphics/Matrix;
-
     const/16 v0, 0x9
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hm:[F
 
     goto :goto_5
 
     :cond_5
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hj:Landroid/graphics/Matrix;
+
     iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hk:Landroid/graphics/Matrix;
 
     iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hl:Landroid/graphics/Matrix;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hm:Landroid/graphics/Matrix;
-
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hm:[F
 
     :goto_5
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iA:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iz: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;->iA:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iz:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bi()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;->hu:Lcom/airbnb/lottie/a/b/c;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/d;
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/d;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/d;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
 
     :cond_7
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iA:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iA:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/a;
 
     goto :goto_7
 
     :cond_8
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/a;
 
     :goto_7
-    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iC:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz v0, :cond_9
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/a/l;->iC:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
 
     return-void
 
     :cond_9
-    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
+    iput-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hv: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;->hn:[F
+    iget-object v1, p0, Lcom/airbnb/lottie/a/b/o;->hm:[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;->hp:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ho: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;->hq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hq: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;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/a/b/o;->hn: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;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hr: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;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hu: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;->hw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hv: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;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hn: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;->hp:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ho: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;->hq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hq: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ht: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;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hr: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;->hu: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;->hw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hn: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->hu: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;->eY:Landroid/graphics/PointF;
+    sget-object v0, Lcom/airbnb/lottie/j;->eX:Landroid/graphics/PointF;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hn: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;->hn: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;->eY:Landroid/graphics/PointF;
+
+    if-ne p1, v0, :cond_3
+
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ho: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;->ho: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;->eZ:Landroid/graphics/PointF;
-
-    if-ne p1, v0, :cond_3
-
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hp: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;->fe:Lcom/airbnb/lottie/g/d;
+    sget-object v0, Lcom/airbnb/lottie/j;->fd:Lcom/airbnb/lottie/g/d;
 
     if-ne p1, v0, :cond_5
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hq:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hq:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->ff:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fe:Ljava/lang/Float;
 
     const/4 v1, 0x0
 
     if-ne p1, v0, :cond_7
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hq: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hq: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;->eW:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
 
     const/16 v2, 0x64
 
     if-ne p1, v0, :cond_9
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hr: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;->hs:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hr: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;->fs:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fr:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_b
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hu: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;->hv:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hu: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;->ft:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fs:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_d
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hv: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;->hw:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hv: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;->fg:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->ff:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_f
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/c;
 
     :cond_e
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->fh:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fg:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_11
 
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ht: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;->hu:Lcom/airbnb/lottie/a/b/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
 
     :cond_10
-    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/a/b/o;->ht: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;->hp:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ho: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hq: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hs: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;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->ht: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;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->ht: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {v4}, Lcom/airbnb/lottie/a/b/c;->bc()F
 
@@ -1043,7 +1043,7 @@
 
     invoke-direct {p0}, Lcom/airbnb/lottie/a/b/o;->be()V
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->hm:[F
 
     const/4 v6, 0x0
 
@@ -1067,13 +1067,13 @@
 
     aput v2, v5, v11
 
-    iget-object v12, p0, Lcom/airbnb/lottie/a/b/o;->hk:Landroid/graphics/Matrix;
+    iget-object v12, p0, Lcom/airbnb/lottie/a/b/o;->hj:Landroid/graphics/Matrix;
 
     invoke-virtual {v12, v5}, Landroid/graphics/Matrix;->setValues([F)V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/a/b/o;->be()V
 
-    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
+    iget-object v5, p0, Lcom/airbnb/lottie/a/b/o;->hm:[F
 
     aput v2, v5, v6
 
@@ -1083,13 +1083,13 @@
 
     aput v2, v5, v11
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hl:Landroid/graphics/Matrix;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hk:Landroid/graphics/Matrix;
 
     invoke-virtual {v4, v5}, Landroid/graphics/Matrix;->setValues([F)V
 
     invoke-direct {p0}, Lcom/airbnb/lottie/a/b/o;->be()V
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hn:[F
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/o;->hm:[F
 
     aput v0, v4, v6
 
@@ -1101,30 +1101,30 @@
 
     aput v2, v4, v11
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hm:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hl:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v4}, Landroid/graphics/Matrix;->setValues([F)V
 
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hk:Landroid/graphics/Matrix;
+
+    iget-object v3, p0, Lcom/airbnb/lottie/a/b/o;->hj: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;->hl:Landroid/graphics/Matrix;
 
     iget-object v3, p0, Lcom/airbnb/lottie/a/b/o;->hk: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;->hm: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;->hl: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;->hm: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;->hq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hp: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;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/o;->hn: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 1e4631a8ef..33f0f371fb 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 hx:Lcom/airbnb/lottie/g/b;
+.field private final hw: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 hy:Ljava/lang/Object;
+.field private final hx: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;->hx:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/a/b/p;->hw: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;->hy:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/airbnb/lottie/a/b/p;->hx:Ljava/lang/Object;
 
     return-void
 .end method
@@ -105,7 +105,7 @@
 .method public final aV()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->gO: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;->gP:Lcom/airbnb/lottie/g/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/a/b/p;->gO:Lcom/airbnb/lottie/g/c;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/a/b/p;->hy:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/airbnb/lottie/a/b/p;->hx:Ljava/lang/Object;
 
-    iget v5, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v5, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v6, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v6, p0, Lcom/airbnb/lottie/a/b/a;->dV:F
 
-    iget v7, p0, Lcom/airbnb/lottie/a/b/a;->dW:F
+    iget v7, p0, Lcom/airbnb/lottie/a/b/a;->dV: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 d49396d0a2..27147829ac 100644
--- a/com.discord/smali/com/airbnb/lottie/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/b/a.smali
@@ -5,6 +5,33 @@
 
 # instance fields
 .field public final hA:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Landroid/graphics/Typeface;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final hB:Landroid/content/res/AssetManager;
+
+.field public hC:Lcom/airbnb/lottie/a;
+
+.field public hD:Ljava/lang/String;
+
+.field public final hy:Lcom/airbnb/lottie/c/i;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/c/i<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final hz:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -17,33 +44,6 @@
     .end annotation
 .end field
 
-.field public final hB:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Landroid/graphics/Typeface;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final hC:Landroid/content/res/AssetManager;
-
-.field public hD:Lcom/airbnb/lottie/a;
-
-.field public hE:Ljava/lang/String;
-
-.field public final hz:Lcom/airbnb/lottie/c/i;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/c/i<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method public constructor <init>(Landroid/graphics/drawable/Drawable$Callback;Lcom/airbnb/lottie/a;)V
@@ -55,7 +55,13 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/c/i;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hz:Lcom/airbnb/lottie/c/i;
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hy: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;->hz:Ljava/util/Map;
 
     new-instance v0, Ljava/util/HashMap;
 
@@ -63,17 +69,11 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hA: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;->hB:Ljava/util/Map;
-
     const-string v0, ".ttf"
 
-    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hE:Ljava/lang/String;
+    iput-object v0, p0, Lcom/airbnb/lottie/b/a;->hD:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/b/a;->hD:Lcom/airbnb/lottie/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/a;->hC: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;->hC:Landroid/content/res/AssetManager;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->hB:Landroid/content/res/AssetManager;
 
     return-void
 
@@ -100,7 +100,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->hC:Landroid/content/res/AssetManager;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/a;->hB: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 90fcec5858..e9d65cbe78 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 hF:Ljava/lang/Object;
+.field private static final hE:Ljava/lang/Object;
 
 
 # instance fields
 .field public final context:Landroid/content/Context;
 
-.field private hG:Ljava/lang/String;
+.field private hF:Ljava/lang/String;
 
-.field public hH:Lcom/airbnb/lottie/b;
+.field public hG:Lcom/airbnb/lottie/b;
 
-.field private final hI:Ljava/util/Map;
+.field private final hH: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;->hF:Ljava/lang/Object;
+    sput-object v0, Lcom/airbnb/lottie/b/b;->hE: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;->hG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->hF: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;->hG:Ljava/lang/String;
+    iget-object p2, p0, Lcom/airbnb/lottie/b/b;->hF: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;->hG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->hF: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;->hG:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/b/b;->hF: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;->hI:Ljava/util/Map;
+    iput-object p1, p0, Lcom/airbnb/lottie/b/b;->hH: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;->hI:Ljava/util/Map;
+    iput-object p4, p0, Lcom/airbnb/lottie/b/b;->hH:Ljava/util/Map;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/b/b;->hH:Lcom/airbnb/lottie/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/b/b;->hG: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;->hF:Ljava/lang/Object;
+    sget-object v0, Lcom/airbnb/lottie/b/b;->hE:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->hI:Ljava/util/Map;
+    iget-object v1, p0, Lcom/airbnb/lottie/b/b;->hH: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;->eT:Landroid/graphics/Bitmap;
+    iput-object p2, p1, Lcom/airbnb/lottie/g;->eS:Landroid/graphics/Bitmap;
 
     monitor-exit v0
 
@@ -170,7 +170,7 @@
 .method public final x(Ljava/lang/String;)Landroid/graphics/Bitmap;
     .locals 7
 
-    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->hI:Ljava/util/Map;
+    iget-object v0, p0, Lcom/airbnb/lottie/b/b;->hH: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;->eT:Landroid/graphics/Bitmap;
+    iget-object v2, v0, Lcom/airbnb/lottie/g;->eS:Landroid/graphics/Bitmap;
 
     if-eqz v2, :cond_1
 
     return-object v2
 
     :cond_1
-    iget-object v2, p0, Lcom/airbnb/lottie/b/b;->hH:Lcom/airbnb/lottie/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/b/b;->hG: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;->eR:Ljava/lang/String;
+    iget-object v2, v0, Lcom/airbnb/lottie/g;->eQ: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;->hG:Ljava/lang/String;
+    iget-object v4, p0, Lcom/airbnb/lottie/b/b;->hF: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;->hG:Ljava/lang/String;
+    iget-object v6, p0, Lcom/airbnb/lottie/b/b;->hF: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 8e3962bee7..93bc6ea25f 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 dD:Z = false
+.field private static dC:Z = false
 
-.field private static dE:[Ljava/lang/String;
+.field private static dD:[Ljava/lang/String;
 
-.field private static dF:[J
+.field private static dE:[J
+
+.field private static dF:I
 
 .field private static dG:I
 
-.field private static dH: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;->dD:Z
+    sget-boolean v0, Lcom/airbnb/lottie/c;->dC:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget v0, Lcom/airbnb/lottie/c;->dG:I
+    sget v0, Lcom/airbnb/lottie/c;->dF:I
 
     const/16 v1, 0x14
 
     if-ne v0, v1, :cond_1
 
-    sget p0, Lcom/airbnb/lottie/c;->dH:I
+    sget p0, Lcom/airbnb/lottie/c;->dG:I
 
     add-int/lit8 p0, p0, 0x1
 
-    sput p0, Lcom/airbnb/lottie/c;->dH:I
+    sput p0, Lcom/airbnb/lottie/c;->dG:I
 
     return-void
 
     :cond_1
-    sget-object v1, Lcom/airbnb/lottie/c;->dE:[Ljava/lang/String;
+    sget-object v1, Lcom/airbnb/lottie/c;->dD:[Ljava/lang/String;
 
     aput-object p0, v1, v0
 
-    sget-object v1, Lcom/airbnb/lottie/c;->dF:[J
+    sget-object v1, Lcom/airbnb/lottie/c;->dE:[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;->dG:I
+    sget p0, Lcom/airbnb/lottie/c;->dF:I
 
     add-int/lit8 p0, p0, 0x1
 
-    sput p0, Lcom/airbnb/lottie/c;->dG:I
+    sput p0, Lcom/airbnb/lottie/c;->dF:I
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 .method public static r(Ljava/lang/String;)F
     .locals 4
 
-    sget v0, Lcom/airbnb/lottie/c;->dH:I
+    sget v0, Lcom/airbnb/lottie/c;->dG:I
 
     const/4 v1, 0x0
 
@@ -83,31 +83,31 @@
 
     add-int/lit8 v0, v0, -0x1
 
-    sput v0, Lcom/airbnb/lottie/c;->dH:I
+    sput v0, Lcom/airbnb/lottie/c;->dG:I
 
     return v1
 
     :cond_0
-    sget-boolean v0, Lcom/airbnb/lottie/c;->dD:Z
+    sget-boolean v0, Lcom/airbnb/lottie/c;->dC:Z
 
     if-nez v0, :cond_1
 
     return v1
 
     :cond_1
-    sget v0, Lcom/airbnb/lottie/c;->dG:I
+    sget v0, Lcom/airbnb/lottie/c;->dF:I
 
     add-int/lit8 v0, v0, -0x1
 
-    sput v0, Lcom/airbnb/lottie/c;->dG:I
+    sput v0, Lcom/airbnb/lottie/c;->dF:I
 
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/c;->dE:[Ljava/lang/String;
+    sget-object v0, Lcom/airbnb/lottie/c;->dD:[Ljava/lang/String;
 
-    sget v1, Lcom/airbnb/lottie/c;->dG:I
+    sget v1, Lcom/airbnb/lottie/c;->dF:I
 
     aget-object v0, v0, v1
 
@@ -123,9 +123,9 @@
 
     move-result-wide v0
 
-    sget-object p0, Lcom/airbnb/lottie/c;->dF:[J
+    sget-object p0, Lcom/airbnb/lottie/c;->dE:[J
 
-    sget v2, Lcom/airbnb/lottie/c;->dG:I
+    sget v2, Lcom/airbnb/lottie/c;->dF: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;->dE:[Ljava/lang/String;
+    sget-object p0, Lcom/airbnb/lottie/c;->dD:[Ljava/lang/String;
 
-    sget v2, Lcom/airbnb/lottie/c;->dG:I
+    sget v2, Lcom/airbnb/lottie/c;->dF: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 c54bf674be..c3561d33cb 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 hI:Landroid/graphics/PointF;
+
 .field public final hJ:Landroid/graphics/PointF;
 
 .field public final hK:Landroid/graphics/PointF;
 
-.field public final hL: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;->hI: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;->hJ:Landroid/graphics/PointF;
 
     new-instance v0, Landroid/graphics/PointF;
@@ -29,12 +35,6 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/c/a;->hK: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;->hL: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;->hJ:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a;->hI:Landroid/graphics/PointF;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a;->hK: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 9fbe40b601..bcb74d9bd5 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/a;->gN: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 d36566e11d..b1bbb7558b 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/b;->gN: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 19790cd7d9..81e3b19efa 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/c;->gN: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 f39c90889b..91d4abf474 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/d;->gN: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 f8585d3602..cc4417417c 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 gO:Ljava/util/List;
+.field private final gN: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;->gO:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gN: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;->gO:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/e;->gN:Ljava/util/List;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gN: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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->gN: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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/e;->gN:Ljava/util/List;
 
     invoke-direct {v0, v1}, Lcom/airbnb/lottie/a/b/i;-><init>(Ljava/util/List;)V
 
@@ -126,7 +126,7 @@
 .method public final bj()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gN:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -138,7 +138,7 @@
 
     if-ne v0, v2, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gN:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -170,7 +170,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/e;->gN:Ljava/util/List;
 
     return-object v0
 .end method
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 1665572f4c..37cb5d0753 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/f;->gN: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 30f419bcb8..fc80da4776 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/g;->gN: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 ca56188fa3..f8c24acbc3 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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/h;->gN: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 57ac42e8d2..3a15fe5c40 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 il:Lcom/airbnb/lottie/c/a/b;
+.field private final ik:Lcom/airbnb/lottie/c/a/b;
 
-.field private final im:Lcom/airbnb/lottie/c/a/b;
+.field private final il: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;->il:Lcom/airbnb/lottie/c/a/b;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/i;->ik:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/i;->im:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/i;->il: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;->il:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/i;->ik:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/a/i;->im:Lcom/airbnb/lottie/c/a/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/a/i;->il:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
@@ -73,7 +73,7 @@
 .method public final bj()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->il:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->ik:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bj()Z
 
@@ -81,7 +81,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->im:Lcom/airbnb/lottie/c/a/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/i;->il:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/c/a/b;->bj()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 f0cff621f7..f5f979af28 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/j.smali
@@ -69,7 +69,7 @@
 
     new-instance v0, Lcom/airbnb/lottie/a/b/n;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/j;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/j;->gN: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 c7f7a0a396..2dfcbca9c1 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 im:Lcom/airbnb/lottie/c/a/a;
+
 .field public final io:Lcom/airbnb/lottie/c/a/a;
 
-.field public final iq:Lcom/airbnb/lottie/c/a/a;
+.field public final iq:Lcom/airbnb/lottie/c/a/b;
 
 .field public final ir:Lcom/airbnb/lottie/c/a/b;
 
-.field public final is: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;->io:Lcom/airbnb/lottie/c/a/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/k;->im:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/k;->iq:Lcom/airbnb/lottie/c/a/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/k;->io:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a/k;->iq:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/a/k;->is:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/a/k;->ir: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 f39fc85cad..d35336dc1f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/a/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/a/l.smali
@@ -11,11 +11,9 @@
 
 .field public final iB:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iC:Lcom/airbnb/lottie/c/a/b;
+.field public final is:Lcom/airbnb/lottie/c/a/e;
 
-.field public final iu:Lcom/airbnb/lottie/c/a/e;
-
-.field public final iv:Lcom/airbnb/lottie/c/a/m;
+.field public final iu:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -26,11 +24,13 @@
     .end annotation
 .end field
 
-.field public final iw:Lcom/airbnb/lottie/c/a/g;
+.field public final iv:Lcom/airbnb/lottie/c/a/g;
 
-.field public final ix:Lcom/airbnb/lottie/c/a/b;
+.field public final iw:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iy:Lcom/airbnb/lottie/c/a/d;
+.field public final ix:Lcom/airbnb/lottie/c/a/d;
+
+.field public final iy:Lcom/airbnb/lottie/c/a/b;
 
 .field public final iz:Lcom/airbnb/lottie/c/a/b;
 
@@ -87,23 +87,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/a/l;->iu:Lcom/airbnb/lottie/c/a/e;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/l;->is:Lcom/airbnb/lottie/c/a/e;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/a/l;->iv:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/a/l;->iu:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/a/l;->iw:Lcom/airbnb/lottie/c/a/g;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/a/l;->iv:Lcom/airbnb/lottie/c/a/g;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/a/l;->iw:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/a/l;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/a/l;->iA:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/a/l;->iC:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/a/l;->iB:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/a/l;->iz:Lcom/airbnb/lottie/c/a/b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/a/l;->iy:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/a/l;->iA:Lcom/airbnb/lottie/c/a/b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/a/l;->iz: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 d0865d0ff2..1ca84d844e 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 gO:Ljava/util/List;
+.field final gN: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;->gO:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/a/n;->gN:Ljava/util/List;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 .method public bj()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gN:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -88,7 +88,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gN:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -98,7 +98,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gN:Ljava/util/List;
 
     invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -133,7 +133,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gO:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/a/n;->gN:Ljava/util/List;
 
     return-object v0
 .end method
@@ -145,7 +145,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->gN: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;->gO:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/a/n;->gN: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 9f4062a2df..6ba6fe6ee7 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 hU:I = 0x1
+.field public static final hT:I = 0x1
 
-.field public static final hV:I = 0x2
+.field public static final hU:I = 0x2
 
-.field public static final hW:I = 0x3
+.field public static final hV:I = 0x3
 
-.field private static final synthetic hX:[I
+.field private static final synthetic hW:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->hU:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->hT:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->hV:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->hU:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b$a;->hW:I
+    sget v1, Lcom/airbnb/lottie/c/b$a;->hV:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b$a;->hX:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b$a;->hW:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 .method public static bf()[I
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b$a;->hX:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b$a;->hW:[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 00fdf26ff7..09bd8ae30d 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b.smali
@@ -14,21 +14,21 @@
 # instance fields
 .field public final color:I
 
-.field public final hM:Ljava/lang/String;
+.field public final hL:Ljava/lang/String;
 
-.field public final hN:D
+.field public final hM:D
+
+.field public final hN:I
 
 .field public final hO:I
 
-.field public final hP:I
+.field public final hP:D
 
 .field public final hQ:D
 
 .field public final hR:D
 
-.field public final hS:D
-
-.field public final hT:Z
+.field public final hS:Z
 
 .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;->hM:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b;->hL:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/airbnb/lottie/c/b;->hN:D
+    iput-wide p3, p0, Lcom/airbnb/lottie/c/b;->hM:D
 
-    iput p5, p0, Lcom/airbnb/lottie/c/b;->hO:I
+    iput p5, p0, Lcom/airbnb/lottie/c/b;->hN:I
 
-    iput p6, p0, Lcom/airbnb/lottie/c/b;->hP:I
+    iput p6, p0, Lcom/airbnb/lottie/c/b;->hO:I
 
-    iput-wide p7, p0, Lcom/airbnb/lottie/c/b;->hQ:D
+    iput-wide p7, p0, Lcom/airbnb/lottie/c/b;->hP:D
 
-    iput-wide p9, p0, Lcom/airbnb/lottie/c/b;->hR:D
+    iput-wide p9, p0, Lcom/airbnb/lottie/c/b;->hQ: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;->hS:D
+    iput-wide p13, p0, Lcom/airbnb/lottie/c/b;->hR:D
 
-    iput-boolean p15, p0, Lcom/airbnb/lottie/c/b;->hT:Z
+    iput-boolean p15, p0, Lcom/airbnb/lottie/c/b;->hS:Z
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/b;->hM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b;->hL: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;->hN:D
+    iget-wide v2, p0, Lcom/airbnb/lottie/c/b;->hM: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;->hO:I
+    iget v1, p0, Lcom/airbnb/lottie/c/b;->hN: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;->hP:I
+    iget v1, p0, Lcom/airbnb/lottie/c/b;->hO:I
 
     add-int/2addr v0, v1
 
-    iget-wide v1, p0, Lcom/airbnb/lottie/c/b;->hQ:D
+    iget-wide v1, p0, Lcom/airbnb/lottie/c/b;->hP: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 7ea504e7fe..383369d65e 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/a.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final iD:Lcom/airbnb/lottie/c/a/f;
+.field public final iC:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iE:Z
+.field public final iD:Z
 
-.field public final iv:Lcom/airbnb/lottie/c/a/m;
+.field public final iu:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -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;->iv:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/a;->iu:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/a;->iD:Lcom/airbnb/lottie/c/a/f;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/a;->iC:Lcom/airbnb/lottie/c/a/f;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/a;->iE:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/a;->iD:Z
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/a;->fZ:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/a;->fY: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 3649ed2ee2..88890b5181 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 iF:[F
+.field public final iE:[F
 
-.field public final iG:[I
+.field public final iF:[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;->iF:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/c;->iF:[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 f26fa68004..d39bc1c941 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/d.smali
@@ -7,23 +7,23 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final iH:I
+.field public final iG:I
 
-.field public final iI:Landroid/graphics/Path$FillType;
+.field public final iH:Landroid/graphics/Path$FillType;
 
-.field public final iJ:Lcom/airbnb/lottie/c/a/c;
+.field public final iI:Lcom/airbnb/lottie/c/a/c;
+
+.field public final iJ:Lcom/airbnb/lottie/c/a/f;
 
 .field public final iK:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iL:Lcom/airbnb/lottie/c/a/f;
+.field private final iL:Lcom/airbnb/lottie/c/a/b;
 
 .field private final iM:Lcom/airbnb/lottie/c/a/b;
 
-.field private final iN:Lcom/airbnb/lottie/c/a/b;
-
-.field public final iy:Lcom/airbnb/lottie/c/a/d;
+.field public final ix:Lcom/airbnb/lottie/c/a/d;
 
 .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;->iH:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/d;->iG:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/d;->iI:Landroid/graphics/Path$FillType;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/d;->iH:Landroid/graphics/Path$FillType;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/d;->iJ:Lcom/airbnb/lottie/c/a/c;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/d;->iI:Lcom/airbnb/lottie/c/a/c;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/d;->iy:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/d;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/d;->iK:Lcom/airbnb/lottie/c/a/f;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/d;->iJ:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/d;->iL:Lcom/airbnb/lottie/c/a/f;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/d;->iK: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;->iL:Lcom/airbnb/lottie/c/a/b;
+
     iput-object p1, p0, Lcom/airbnb/lottie/c/b/d;->iM:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/b/d;->iN:Lcom/airbnb/lottie/c/a/b;
-
-    iput-boolean p8, p0, Lcom/airbnb/lottie/c/b/d;->fZ:Z
+    iput-boolean p8, p0, Lcom/airbnb/lottie/c/b/d;->fY: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 57888ad428..e720fd4ac9 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/e.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/e.smali
@@ -7,25 +7,25 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final iH:I
+.field public final iG:I
 
-.field public final iJ:Lcom/airbnb/lottie/c/a/c;
+.field public final iI:Lcom/airbnb/lottie/c/a/c;
+
+.field public final iJ:Lcom/airbnb/lottie/c/a/f;
 
 .field public final iK:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iL:Lcom/airbnb/lottie/c/a/f;
+.field public final iN:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iO:Lcom/airbnb/lottie/c/a/b;
+.field public final iO:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public final iP:Lcom/airbnb/lottie/c/b/p$a;
+.field public final iP:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public final iQ:Lcom/airbnb/lottie/c/b/p$b;
+.field public final iQ:F
 
-.field public final iR:F
-
-.field public final iS:Ljava/util/List;
+.field public final iR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,9 +35,9 @@
     .end annotation
 .end field
 
-.field public final iT:Lcom/airbnb/lottie/c/a/b;
+.field public final iS:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iy:Lcom/airbnb/lottie/c/a/d;
+.field public final ix:Lcom/airbnb/lottie/c/a/d;
 
 .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;->iH:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/e;->iG:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/e;->iJ:Lcom/airbnb/lottie/c/a/c;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/e;->iI:Lcom/airbnb/lottie/c/a/c;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/e;->iy:Lcom/airbnb/lottie/c/a/d;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/e;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/e;->iK:Lcom/airbnb/lottie/c/a/f;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/e;->iJ:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/e;->iL:Lcom/airbnb/lottie/c/a/f;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/e;->iK:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/e;->iN:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/e;->iP:Lcom/airbnb/lottie/c/b/p$a;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/e;->iO:Lcom/airbnb/lottie/c/b/p$a;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/b/e;->iQ:Lcom/airbnb/lottie/c/b/p$b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/b/e;->iP:Lcom/airbnb/lottie/c/b/p$b;
 
-    iput p10, p0, Lcom/airbnb/lottie/c/b/e;->iR:F
+    iput p10, p0, Lcom/airbnb/lottie/c/b/e;->iQ:F
 
-    iput-object p11, p0, Lcom/airbnb/lottie/c/b/e;->iS:Ljava/util/List;
+    iput-object p11, p0, Lcom/airbnb/lottie/c/b/e;->iR:Ljava/util/List;
 
-    iput-object p12, p0, Lcom/airbnb/lottie/c/b/e;->iT:Lcom/airbnb/lottie/c/a/b;
+    iput-object p12, p0, Lcom/airbnb/lottie/c/b/e;->iS:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p13, p0, Lcom/airbnb/lottie/c/b/e;->fZ:Z
+    iput-boolean p13, p0, Lcom/airbnb/lottie/c/b/e;->fY: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 3ec657bee8..0b13c8bcf8 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 iU:I = 0x1
+.field public static final iT:I = 0x1
 
-.field public static final iV:I = 0x2
+.field public static final iU:I = 0x2
 
-.field private static final synthetic iW:[I
+.field private static final synthetic iV:[I
 
 
 # direct methods
@@ -29,19 +29,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v1, Lcom/airbnb/lottie/c/b/f;->iT:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/f;->iV:I
+    sget v1, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/f;->iW:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/f;->iV:[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 ca2daaa775..52b994a73e 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 ja:I = 0x1
+.field public static final iZ:I = 0x1
 
-.field public static final jb:I = 0x2
+.field public static final ja:I = 0x2
 
-.field public static final jc:I = 0x3
+.field public static final jb:I = 0x3
 
-.field private static final synthetic jd:[I
+.field private static final synthetic jc:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->ja:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->iZ:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->jb:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->ja:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/g$a;->jc:I
+    sget v1, Lcom/airbnb/lottie/c/b/g$a;->jb:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/g$a;->jd:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/g$a;->jc:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 .method public static bn()[I
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/g$a;->jd:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/g$a;->jc:[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 c68c658d99..39aee3a91b 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 iX:I
+.field public final iW:I
 
-.field public final iY:Lcom/airbnb/lottie/c/a/h;
+.field public final iX:Lcom/airbnb/lottie/c/a/h;
 
-.field public final iZ:Z
+.field public final iY:Z
 
-.field public final iy:Lcom/airbnb/lottie/c/a/d;
+.field public final ix: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;->iX:I
+    iput p1, p0, Lcom/airbnb/lottie/c/b/g;->iW:I
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/b/g;->iY:Lcom/airbnb/lottie/c/a/h;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/g;->iX:Lcom/airbnb/lottie/c/a/h;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/g;->iy:Lcom/airbnb/lottie/c/a/d;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/g;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/g;->iZ:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/g;->iY: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 a92127bcd0..d8ecfd7031 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 je:Lcom/airbnb/lottie/c/b/h$a;
+
 .field public static final enum jf:Lcom/airbnb/lottie/c/b/h$a;
 
 .field public static final enum jg:Lcom/airbnb/lottie/c/b/h$a;
@@ -31,9 +33,7 @@
 
 .field public static final enum ji:Lcom/airbnb/lottie/c/b/h$a;
 
-.field public static final enum jj:Lcom/airbnb/lottie/c/b/h$a;
-
-.field private static final synthetic jk:[Lcom/airbnb/lottie/c/b/h$a;
+.field private static final synthetic jj:[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;->jf:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->je: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;->jg:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->jf: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;->jh:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->jg: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;->ji:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->jh: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;->jj:Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->ji: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;->jf:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v6, Lcom/airbnb/lottie/c/b/h$a;->je:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jg:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jf:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jh:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jg:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->ji:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jh:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->jj:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/h$a;->ji:Lcom/airbnb/lottie/c/b/h$a;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->jk:[Lcom/airbnb/lottie/c/b/h$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/h$a;->jj:[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;->jf:Lcom/airbnb/lottie/c/b/h$a;
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->je:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jj:Lcom/airbnb/lottie/c/b/h$a;
-
-    return-object p0
-
-    :cond_1
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->ji:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
-    :cond_2
+    :cond_1
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jh:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
-    :cond_3
+    :cond_2
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jg:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
 
-    :cond_4
+    :cond_3
     sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->jf:Lcom/airbnb/lottie/c/b/h$a;
 
     return-object p0
+
+    :cond_4
+    sget-object p0, Lcom/airbnb/lottie/c/b/h$a;->je: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;->jk:[Lcom/airbnb/lottie/c/b/h$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/h$a;->jj:[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 376dd504c5..f34df4094a 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 fZ:Z
+.field public final fY:Z
 
-.field public final je:Lcom/airbnb/lottie/c/b/h$a;
+.field public final jd: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;->je:Lcom/airbnb/lottie/c/b/h$a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/h;->jd:Lcom/airbnb/lottie/c/b/h$a;
 
-    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/h;->fZ:Z
+    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/h;->fY: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;->eD:Z
+    iget-boolean p1, p1, Lcom/airbnb/lottie/f;->eC: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;->je:Lcom/airbnb/lottie/c/b/h$a;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/h;->jd: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 227328ce58..c8abe133d0 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 jp:Lcom/airbnb/lottie/c/b/i$a;
+
 .field public static final enum jq:Lcom/airbnb/lottie/c/b/i$a;
 
-.field public static final enum jr:Lcom/airbnb/lottie/c/b/i$a;
-
-.field private static final synthetic js:[Lcom/airbnb/lottie/c/b/i$a;
+.field private static final synthetic jr:[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;->jq:Lcom/airbnb/lottie/c/b/i$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->jp: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;->jr:Lcom/airbnb/lottie/c/b/i$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->jq: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;->jq:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v3, Lcom/airbnb/lottie/c/b/i$a;->jp:Lcom/airbnb/lottie/c/b/i$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jr:Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/i$a;->jq:Lcom/airbnb/lottie/c/b/i$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->js:[Lcom/airbnb/lottie/c/b/i$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/i$a;->jr:[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;->js:[Lcom/airbnb/lottie/c/b/i$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/i$a;->jr:[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 1bcb744794..50ced67feb 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/i.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/i.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final gv:Lcom/airbnb/lottie/c/b/i$a;
+.field public final gu:Lcom/airbnb/lottie/c/b/i$a;
 
-.field public final iv:Lcom/airbnb/lottie/c/a/m;
+.field public final iu:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -30,7 +30,9 @@
     .end annotation
 .end field
 
-.field public final ix:Lcom/airbnb/lottie/c/a/b;
+.field public final iw:Lcom/airbnb/lottie/c/a/b;
+
+.field public final jk:Lcom/airbnb/lottie/c/a/b;
 
 .field public final jl:Lcom/airbnb/lottie/c/a/b;
 
@@ -40,8 +42,6 @@
 
 .field public final jo:Lcom/airbnb/lottie/c/a/b;
 
-.field public final jp: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;->gv:Lcom/airbnb/lottie/c/b/i$a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/i;->gu:Lcom/airbnb/lottie/c/b/i$a;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/i;->jl:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/i;->jk:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/i;->iv:Lcom/airbnb/lottie/c/a/m;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/i;->iu:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/i;->ix:Lcom/airbnb/lottie/c/a/b;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/i;->iw:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/i;->jm:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/i;->jl:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/i;->jn:Lcom/airbnb/lottie/c/a/b;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/i;->jm:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/i;->jo:Lcom/airbnb/lottie/c/a/b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/i;->jn:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p9, p0, Lcom/airbnb/lottie/c/b/i;->jp:Lcom/airbnb/lottie/c/a/b;
+    iput-object p9, p0, Lcom/airbnb/lottie/c/b/i;->jo:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/i;->fZ:Z
+    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/i;->fY: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 293e2ce437..0908bc9e7f 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/j.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/j.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final iD:Lcom/airbnb/lottie/c/a/f;
+.field public final iC:Lcom/airbnb/lottie/c/a/f;
 
-.field public final iv:Lcom/airbnb/lottie/c/a/m;
+.field public final iu:Lcom/airbnb/lottie/c/a/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/c/a/m<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field public final jt:Lcom/airbnb/lottie/c/a/b;
+.field public final js:Lcom/airbnb/lottie/c/a/b;
 
 .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;->iv:Lcom/airbnb/lottie/c/a/m;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/j;->iu:Lcom/airbnb/lottie/c/a/m;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/j;->iD:Lcom/airbnb/lottie/c/a/f;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/j;->iC:Lcom/airbnb/lottie/c/a/f;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/j;->jt:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/j;->js:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/j;->fZ:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/j;->fY: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;->iv:Lcom/airbnb/lottie/c/a/m;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->iu: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;->iD:Lcom/airbnb/lottie/c/a/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/j;->iC: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 4682759941..817d997b69 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 fZ:Z
+.field public final fY:Z
+
+.field public final jt:Lcom/airbnb/lottie/c/a/b;
 
 .field public final ju:Lcom/airbnb/lottie/c/a/b;
 
-.field public final jv:Lcom/airbnb/lottie/c/a/b;
-
-.field public final jw:Lcom/airbnb/lottie/c/a/l;
+.field public final jv: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;->ju:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/k;->jt:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/k;->jv:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/k;->ju:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/k;->jw:Lcom/airbnb/lottie/c/a/l;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/k;->jv:Lcom/airbnb/lottie/c/a/l;
 
-    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/k;->fZ:Z
+    iput-boolean p5, p0, Lcom/airbnb/lottie/c/b/k;->fY: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 874806c648..039f87d9c2 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/l.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final jx:Ljava/util/List;
+.field public final jw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public jy:Landroid/graphics/PointF;
+.field public jx:Landroid/graphics/PointF;
 
 .field public w:Z
 
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/b/l;->jx:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/b/l;->jw: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;->jy:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->jx:Landroid/graphics/PointF;
 
     iput-boolean p2, p0, Lcom/airbnb/lottie/c/b/l;->w: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;->jx:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->jw: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 f3f4ca23f1..69f8dfb29d 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 fZ:Z
+.field public final fY:Z
 
-.field public final iI:Landroid/graphics/Path$FillType;
+.field public final iH:Landroid/graphics/Path$FillType;
 
-.field public final io:Lcom/airbnb/lottie/c/a/a;
+.field public final im:Lcom/airbnb/lottie/c/a/a;
 
-.field public final iy:Lcom/airbnb/lottie/c/a/d;
+.field public final ix:Lcom/airbnb/lottie/c/a/d;
 
-.field private final jz:Z
+.field private final jy: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;->jz:Z
+    iput-boolean p2, p0, Lcom/airbnb/lottie/c/b/m;->jy:Z
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/m;->iI:Landroid/graphics/Path$FillType;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/m;->iH:Landroid/graphics/Path$FillType;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/m;->io:Lcom/airbnb/lottie/c/a/a;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/m;->im:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/m;->iy:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/m;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/m;->fZ:Z
+    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/m;->fY: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;->jz:Z
+    iget-boolean v1, p0, Lcom/airbnb/lottie/c/b/m;->jy: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 0432cc2d3d..317a3e0b81 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 fZ:Z
+.field public final fY: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;->fZ:Z
+    iput-boolean p3, p0, Lcom/airbnb/lottie/c/b/n;->fY: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 1514f2b084..7bd6c44dda 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 fZ:Z
+.field public final fY:Z
 
 .field private final index:I
 
-.field public final jA:Lcom/airbnb/lottie/c/a/h;
+.field public final jz: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;->jA:Lcom/airbnb/lottie/c/a/h;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/o;->jz:Lcom/airbnb/lottie/c/a/h;
 
-    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/o;->fZ:Z
+    iput-boolean p4, p0, Lcom/airbnb/lottie/c/b/o;->fY: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 a86590ae25..1ae2b6ccde 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 jB:[I
+.field static final synthetic jA:[I
 
-.field static final synthetic jC:[I
+.field static final synthetic jB:[I
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
-    sget-object v2, Lcom/airbnb/lottie/c/b/p$b;->jJ:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v2, Lcom/airbnb/lottie/c/b/p$b;->jI: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;->jC:[I
+    sget-object v2, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$b;->jH:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$b;->jG: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;->jC:[I
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->jI:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->jH: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;->jB:[I
+    sput-object v3, Lcom/airbnb/lottie/c/b/p$1;->jA:[I
 
     :try_start_3
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$1;->jA:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->jD:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->jC: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;->jB:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jA:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/b/p$a;->jE:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v3, Lcom/airbnb/lottie/c/b/p$a;->jD: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;->jB:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jA:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jF:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jE: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 c28c206608..56aee7a3ac 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 jC:Lcom/airbnb/lottie/c/b/p$a;
+
 .field public static final enum jD:Lcom/airbnb/lottie/c/b/p$a;
 
 .field public static final enum jE:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public static final enum jF:Lcom/airbnb/lottie/c/b/p$a;
-
-.field private static final synthetic jG:[Lcom/airbnb/lottie/c/b/p$a;
+.field private static final synthetic jF:[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;->jD:Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->jC: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;->jE:Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->jD: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;->jF:Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->jE: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;->jD:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$a;->jC:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jE:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jD:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jF:Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$a;->jE:Lcom/airbnb/lottie/c/b/p$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->jG:[Lcom/airbnb/lottie/c/b/p$a;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$a;->jF:[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;->jG:[Lcom/airbnb/lottie/c/b/p$a;
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$a;->jF:[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 bo()Landroid/graphics/Paint$Cap;
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jA:[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 c4862c0a5b..0faaad750d 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 jG:Lcom/airbnb/lottie/c/b/p$b;
+
 .field public static final enum jH:Lcom/airbnb/lottie/c/b/p$b;
 
 .field public static final enum jI:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public static final enum jJ:Lcom/airbnb/lottie/c/b/p$b;
-
-.field private static final synthetic jK:[Lcom/airbnb/lottie/c/b/p$b;
+.field private static final synthetic jJ:[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;->jH:Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->jG: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;->jI:Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->jH: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;->jJ:Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->jI: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;->jH:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v4, Lcom/airbnb/lottie/c/b/p$b;->jG:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->jI:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->jH:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->jJ:Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v1, Lcom/airbnb/lottie/c/b/p$b;->jI:Lcom/airbnb/lottie/c/b/p$b;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->jK:[Lcom/airbnb/lottie/c/b/p$b;
+    sput-object v0, Lcom/airbnb/lottie/c/b/p$b;->jJ:[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;->jK:[Lcom/airbnb/lottie/c/b/p$b;
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$b;->jJ:[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 bp()Landroid/graphics/Paint$Join;
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jC:[I
+    sget-object v0, Lcom/airbnb/lottie/c/b/p$1;->jB:[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 1d4c22425e..7b8b0f8fcd 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/p.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/p.smali
@@ -16,17 +16,17 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final iO:Lcom/airbnb/lottie/c/a/b;
+.field public final iN:Lcom/airbnb/lottie/c/a/b;
 
-.field public final iP:Lcom/airbnb/lottie/c/b/p$a;
+.field public final iO:Lcom/airbnb/lottie/c/b/p$a;
 
-.field public final iQ:Lcom/airbnb/lottie/c/b/p$b;
+.field public final iP:Lcom/airbnb/lottie/c/b/p$b;
 
-.field public final iR:F
+.field public final iQ:F
 
-.field public final iS:Ljava/util/List;
+.field public final iR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,11 +36,11 @@
     .end annotation
 .end field
 
-.field public final io:Lcom/airbnb/lottie/c/a/a;
+.field public final im:Lcom/airbnb/lottie/c/a/a;
 
-.field public final iy:Lcom/airbnb/lottie/c/a/d;
+.field public final ix:Lcom/airbnb/lottie/c/a/d;
 
-.field public final jv:Lcom/airbnb/lottie/c/a/b;
+.field public final ju: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;->jv:Lcom/airbnb/lottie/c/a/b;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/b/p;->ju:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/p;->iS:Ljava/util/List;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/p;->iR:Ljava/util/List;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/p;->io:Lcom/airbnb/lottie/c/a/a;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/p;->im:Lcom/airbnb/lottie/c/a/a;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/p;->iy:Lcom/airbnb/lottie/c/a/d;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/p;->ix:Lcom/airbnb/lottie/c/a/d;
 
-    iput-object p6, p0, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/a/b;
+    iput-object p6, p0, Lcom/airbnb/lottie/c/b/p;->iN:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/b/p;->iP:Lcom/airbnb/lottie/c/b/p$a;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/b/p;->iO:Lcom/airbnb/lottie/c/b/p$a;
 
-    iput-object p8, p0, Lcom/airbnb/lottie/c/b/p;->iQ:Lcom/airbnb/lottie/c/b/p$b;
+    iput-object p8, p0, Lcom/airbnb/lottie/c/b/p;->iP:Lcom/airbnb/lottie/c/b/p$b;
 
-    iput p9, p0, Lcom/airbnb/lottie/c/b/p;->iR:F
+    iput p9, p0, Lcom/airbnb/lottie/c/b/p;->iQ:F
 
-    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/p;->fZ:Z
+    iput-boolean p10, p0, Lcom/airbnb/lottie/c/b/p;->fY: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 18bd20ca18..c91ccb772c 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 jN:I = 0x1
+.field public static final jM:I = 0x1
 
-.field public static final jO:I = 0x2
+.field public static final jN:I = 0x2
 
-.field private static final synthetic jP:[I
+.field private static final synthetic jO:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jM:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jO:I
+    sget v1, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/b/q$a;->jP:[I
+    sput-object v0, Lcom/airbnb/lottie/c/b/q$a;->jO:[I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jO:I
+    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jN:I
 
     return p0
 
@@ -88,7 +88,7 @@
     throw v0
 
     :cond_1
-    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jN:I
+    sget p0, Lcom/airbnb/lottie/c/b/q$a;->jM: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 1600fd458c..65aacc1b19 100644
--- a/com.discord/smali/com/airbnb/lottie/c/b/q.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/b/q.smali
@@ -15,15 +15,15 @@
 
 
 # instance fields
-.field public final fZ:Z
+.field public final fY:Z
 
-.field public final gJ:I
+.field public final gI:I
+
+.field public final jK:Lcom/airbnb/lottie/c/a/b;
 
 .field public final jL:Lcom/airbnb/lottie/c/a/b;
 
-.field public final jM:Lcom/airbnb/lottie/c/a/b;
-
-.field public final jv:Lcom/airbnb/lottie/c/a/b;
+.field public final ju: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;->gJ:I
+    iput p2, p0, Lcom/airbnb/lottie/c/b/q;->gI:I
 
-    iput-object p3, p0, Lcom/airbnb/lottie/c/b/q;->jL:Lcom/airbnb/lottie/c/a/b;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/b/q;->jK:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/c/b/q;->jM:Lcom/airbnb/lottie/c/a/b;
+    iput-object p4, p0, Lcom/airbnb/lottie/c/b/q;->jL:Lcom/airbnb/lottie/c/a/b;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/c/b/q;->jv:Lcom/airbnb/lottie/c/a/b;
+    iput-object p5, p0, Lcom/airbnb/lottie/c/b/q;->ju:Lcom/airbnb/lottie/c/a/b;
 
-    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/q;->fZ:Z
+    iput-boolean p6, p0, Lcom/airbnb/lottie/c/b/q;->fY: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;->jL:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->jK: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;->jM:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->jL: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;->jv:Lcom/airbnb/lottie/c/a/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/q;->ju: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 f1a7305ba9..490bbab45e 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
+.field public final hX:Ljava/lang/String;
+
 .field public final hY:Ljava/lang/String;
 
-.field public final hZ:Ljava/lang/String;
-
-.field private final ia:F
+.field private final hZ:F
 
 .field public final name:Ljava/lang/String;
 
@@ -19,13 +19,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c;->hX: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;->hZ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
 
-    iput p4, p0, Lcom/airbnb/lottie/c/c;->ia:F
+    iput p4, p0, Lcom/airbnb/lottie/c/c;->hZ:F
 
     return-void
 .end method
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 3ded52543b..4f084c7595 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 kh:Lcom/airbnb/lottie/a/b/c;
+.field final synthetic kg:Lcom/airbnb/lottie/a/b/c;
 
-.field final synthetic ki:Lcom/airbnb/lottie/c/c/a;
+.field final synthetic kh: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;->ki:Lcom/airbnb/lottie/c/c/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a$1;->kh:Lcom/airbnb/lottie/c/c/a;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a$1;->kh:Lcom/airbnb/lottie/a/b/c;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a$1;->kg:Lcom/airbnb/lottie/a/b/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aQ()V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a$1;->ki:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a$1;->kh:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a$1;->kh:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a$1;->kg:Lcom/airbnb/lottie/a/b/c;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/a/b/c;->bc()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 e2d2fc64d9..ff604bd5e5 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 kj:[I
+.field static final synthetic ki:[I
 
-.field static final synthetic kk:[I
+.field static final synthetic kj:[I
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/a$2;->kk:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b/g$a;->jb:I
+    sget v2, Lcom/airbnb/lottie/c/b/g$a;->ja: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;->kk:[I
+    sget-object v2, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    sget v3, Lcom/airbnb/lottie/c/b/g$a;->jc:I
+    sget v3, Lcom/airbnb/lottie/c/b/g$a;->jb: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;->kk:[I
+    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    sget v4, Lcom/airbnb/lottie/c/b/g$a;->ja:I
+    sget v4, Lcom/airbnb/lottie/c/b/g$a;->iZ: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;->kj:[I
+    sput-object v3, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
     :try_start_3
-    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
+    sget-object v3, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v4, Lcom/airbnb/lottie/c/c/d$a;->kJ:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v4, Lcom/airbnb/lottie/c/c/d$a;->kI: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;->kj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kF:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kE: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;->kj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kG:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kF: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;->kj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kH:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kG: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;->kj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kI:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kH: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;->kj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kK:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kJ: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;->kj:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kL:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kK: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 5b048ddcef..61307a889d 100644
--- a/com.discord/smali/com/airbnb/lottie/c/c/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/c/a.smali
@@ -9,9 +9,11 @@
 
 
 # instance fields
-.field final dK:Lcom/airbnb/lottie/f;
+.field final dJ:Lcom/airbnb/lottie/f;
 
-.field final gG:Lcom/airbnb/lottie/a/b/o;
+.field final gF:Lcom/airbnb/lottie/a/b/o;
+
+.field private final jP:Landroid/graphics/Paint;
 
 .field private final jQ:Landroid/graphics/Paint;
 
@@ -21,27 +23,25 @@
 
 .field private final jT:Landroid/graphics/Paint;
 
-.field private final jU:Landroid/graphics/Paint;
+.field private final jU:Landroid/graphics/RectF;
 
 .field private final jV:Landroid/graphics/RectF;
 
 .field private final jW:Landroid/graphics/RectF;
 
-.field private final jX:Landroid/graphics/RectF;
+.field private final jX:Ljava/lang/String;
 
-.field private final jY:Ljava/lang/String;
+.field final jY:Landroid/graphics/Matrix;
 
-.field final jZ:Landroid/graphics/Matrix;
+.field final jZ:Lcom/airbnb/lottie/c/c/d;
 
-.field final ka:Lcom/airbnb/lottie/c/c/d;
+.field private ka:Lcom/airbnb/lottie/a/b/g;
 
-.field private kb:Lcom/airbnb/lottie/a/b/g;
+.field private kb:Lcom/airbnb/lottie/c/c/a;
 
 .field private kc:Lcom/airbnb/lottie/c/c/a;
 
-.field private kd:Lcom/airbnb/lottie/c/c/a;
-
-.field private ke:Ljava/util/List;
+.field private kd:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field private final kf:Ljava/util/List;
+.field private final ke:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -61,7 +61,7 @@
     .end annotation
 .end field
 
-.field private kg:Z
+.field private kf:Z
 
 .field private final matrix:Landroid/graphics/Matrix;
 
@@ -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;->jQ:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jR:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jS:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jT:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jU:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jT: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;->jU: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;->jV:Landroid/graphics/RectF;
 
     new-instance v0, Landroid/graphics/RectF;
@@ -146,35 +152,29 @@
 
     iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jX: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;->jZ:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jY: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;->kf:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
 
-    iput-boolean v1, p0, Lcom/airbnb/lottie/c/c/a;->kg:Z
+    iput-boolean v1, p0, Lcom/airbnb/lottie/c/c/a;->kf:Z
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dJ:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jZ: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;->kq:Ljava/lang/String;
+    iget-object v0, p2, Lcom/airbnb/lottie/c/c/d;->kp: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;->jY:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jX:Ljava/lang/String;
 
-    iget p1, p2, Lcom/airbnb/lottie/c/c/d;->kE:I
+    iget p1, p2, Lcom/airbnb/lottie/c/c/d;->kD:I
 
-    sget v0, Lcom/airbnb/lottie/c/c/d$b;->kP:I
+    sget v0, Lcom/airbnb/lottie/c/c/d$b;->kO:I
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jT:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jT:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jS: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;->jw:Lcom/airbnb/lottie/c/a/l;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->jv:Lcom/airbnb/lottie/c/a/l;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/l;->bm()Lcom/airbnb/lottie/a/b/o;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->gF: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;->gZ:Ljava/util/List;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->gY:Ljava/util/List;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->gZ:Ljava/util/List;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->gY: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;->gZ:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->gY: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->gW: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/b/g;->gX: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/c/d;->kD:Ljava/util/List;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/c/d;->kC: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kD:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kC: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;->gN:Z
+    iput-boolean v1, p1, Lcom/airbnb/lottie/a/b/a;->gM: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;->jU:Landroid/graphics/Paint;
+    iget-object v8, p0, Lcom/airbnb/lottie/c/c/a;->jT: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->dY:Lcom/airbnb/lottie/m;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->dX:Lcom/airbnb/lottie/m;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/airbnb/lottie/m;->a(Ljava/lang/String;F)V
 
@@ -458,7 +458,7 @@
 .method private bq()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz v0, :cond_0
 
@@ -475,11 +475,11 @@
 .method private br()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object v0, v0, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -500,14 +500,14 @@
 .method private bs()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kd:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kd:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kc: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;->ke:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kd: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;->ke:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kd:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kd:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
 
     :goto_0
     if-eqz v0, :cond_2
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/a;->kd: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;->kd:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->kc: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;->jY:Ljava/lang/String;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->jX: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;->kg:Z
+    iget-boolean v3, v0, Lcom/airbnb/lottie/c/c/a;->kf:Z
 
     if-eqz v3, :cond_15
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-boolean v3, v3, Lcom/airbnb/lottie/c/c/d;->fZ:Z
+    iget-boolean v3, v3, Lcom/airbnb/lottie/c/c/d;->fY: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;->ke:Ljava/util/List;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->kd: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;->ke:Ljava/util/List;
+    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->kd: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v7, v7, Lcom/airbnb/lottie/c/c/a;->gF: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;->r(Ljava/lang/String;)F
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hr: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/a;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v3, v3, Lcom/airbnb/lottie/a/b/o;->hr: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->gF: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;->r(Ljava/lang/String;)F
 
-    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jY:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jX:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/airbnb/lottie/c;->r(Ljava/lang/String;)F
 
@@ -740,25 +740,25 @@
 
     if-eqz v8, :cond_4
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v8, v8, Lcom/airbnb/lottie/c/c/d;->kE:I
+    iget v8, v8, Lcom/airbnb/lottie/c/c/d;->kD:I
 
-    sget v11, Lcom/airbnb/lottie/c/c/d$b;->kP:I
+    sget v11, Lcom/airbnb/lottie/c/c/d$b;->kO:I
 
     if-eq v8, v11, :cond_4
 
-    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jV: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;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
 
-    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jW:Landroid/graphics/RectF;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jV: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;->jW:Landroid/graphics/RectF;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jV: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->gF: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;->jV:Landroid/graphics/RectF;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jU: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v11, v11, Lcom/airbnb/lottie/a/b/g;->gZ:Ljava/util/List;
+    iget-object v11, v11, Lcom/airbnb/lottie/a/b/g;->gY: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v15, v15, Lcom/airbnb/lottie/a/b/g;->gZ:Ljava/util/List;
+    iget-object v15, v15, Lcom/airbnb/lottie/a/b/g;->gY: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->gW: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;->kk:[I
+    sget-object v9, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    iget v10, v15, Lcom/airbnb/lottie/c/b/g;->iX:I
+    iget v10, v15, Lcom/airbnb/lottie/c/b/g;->iW: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;->iZ:Z
+    iget-boolean v9, v15, Lcom/airbnb/lottie/c/b/g;->iY: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;->jX:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jU:Landroid/graphics/RectF;
 
-    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->jX:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jU:Landroid/graphics/RectF;
 
     iget v10, v9, Landroid/graphics/RectF;->left:F
 
-    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jX:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jU:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->top:F
 
-    iget-object v12, v0, Lcom/airbnb/lottie/c/c/a;->jX:Landroid/graphics/RectF;
+    iget-object v12, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jU:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->right:F
 
-    iget-object v13, v0, Lcom/airbnb/lottie/c/c/a;->jX:Landroid/graphics/RectF;
+    iget-object v13, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v15, v0, Lcom/airbnb/lottie/c/c/a;->jU:Landroid/graphics/RectF;
 
     iget v15, v15, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->jX:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->jW: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;->jV:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/a;->jU: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;->jQ:Landroid/graphics/Paint;
+    iget-object v7, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jR:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gZ:Ljava/util/List;
+    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gY: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gZ:Ljava/util/List;
+    iget-object v8, v8, Lcom/airbnb/lottie/a/b/g;->gY: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v9, v9, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object v9, v9, Lcom/airbnb/lottie/a/b/g;->gW: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->gY:Ljava/util/List;
+    iget-object v10, v10, Lcom/airbnb/lottie/a/b/g;->gX: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;->kk:[I
+    sget-object v11, Lcom/airbnb/lottie/c/c/a$2;->kj:[I
 
-    iget v12, v8, Lcom/airbnb/lottie/c/b/g;->iX:I
+    iget v12, v8, Lcom/airbnb/lottie/c/b/g;->iW: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;->iZ:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->iY: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;->jQ:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jQ:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jQ:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jS:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jQ:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jQ:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->iZ:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->iY: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;->jR:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jQ:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jS:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jS:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jR:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jQ: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;->jQ:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jQ:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->iZ:Z
+    iget-boolean v8, v8, Lcom/airbnb/lottie/c/b/g;->iY: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;->jS:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jQ:Landroid/graphics/Paint;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/a;->jP: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;->jS:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jS:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jS:Landroid/graphics/Paint;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/a;->jR: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;->jT:Landroid/graphics/Paint;
+    iget-object v8, v0, Lcom/airbnb/lottie/c/c/a;->jS: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;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/a;->kb: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;->r(Ljava/lang/String;)F
 
     :cond_14
-    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jY:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jX:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/airbnb/lottie/c;->r(Ljava/lang/String;)F
 
@@ -1516,7 +1516,7 @@
 
     :cond_15
     :goto_9
-    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jY:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/c/a;->jX:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/airbnb/lottie/c;->r(Ljava/lang/String;)F
 
@@ -1534,13 +1534,13 @@
 
     invoke-direct {p0}, Lcom/airbnb/lottie/c/c/a;->bs()V
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jY: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;->ke:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kd: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;->jZ:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jY:Landroid/graphics/Matrix;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/a;->kd: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object p3, p3, Lcom/airbnb/lottie/c/c/a;->gF: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;->kd:Lcom/airbnb/lottie/c/c/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->jY:Landroid/graphics/Matrix;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/c/a;->gF: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;->jZ:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->jY:Landroid/graphics/Matrix;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/a;->gF: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;->kf:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
 
     invoke-virtual {p4, v0}, Lcom/airbnb/lottie/c/e;->y(Ljava/lang/String;)Lcom/airbnb/lottie/c/e;
 
     move-result-object p4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->gF: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 aQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->dK:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->dJ: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;->kf:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
@@ -1786,7 +1786,7 @@
 .method final b(Lcom/airbnb/lottie/c/c/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
 
     return-void
 .end method
@@ -1812,7 +1812,7 @@
 .method final c(Lcom/airbnb/lottie/c/c/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kd:Lcom/airbnb/lottie/c/c/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
 
     return-void
 .end method
@@ -1820,13 +1820,13 @@
 .method final g(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/c/c/a;->kg:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/c/c/a;->kf:Z
 
     if-eq p1, v0, :cond_0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/c/c/a;->kg:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/c/c/a;->kf:Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/a;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f;->invalidateSelf()V
 
@@ -1837,9 +1837,9 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1847,90 +1847,90 @@
 .method setProgress(F)V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hr: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;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hu: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;->hw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hv:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hw:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hv: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;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hn:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ho:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hn: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;->hp:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ho:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hp:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ho: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;->hq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hp:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_5
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hq:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hp: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;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hq:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hr:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hq: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;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v1, :cond_7
 
-    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->hs: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;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/a/b/o;->ht:Lcom/airbnb/lottie/a/b/c;
 
     if-eqz v1, :cond_8
 
-    iget-object v0, v0, Lcom/airbnb/lottie/a/b/o;->hu:Lcom/airbnb/lottie/a/b/c;
+    iget-object v0, v0, Lcom/airbnb/lottie/a/b/o;->ht: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;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
     const/4 v1, 0x0
 
@@ -1939,9 +1939,9 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -1949,9 +1949,9 @@
 
     if-ge v0, v2, :cond_9
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/a/b/g;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/a/b/g;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gX:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/a/b/g;->gW:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1966,9 +1966,9 @@
     goto :goto_0
 
     :cond_9
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
 
     const/4 v2, 0x0
 
@@ -1976,22 +1976,22 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
 
     div-float/2addr p1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
 
     if-eqz v0, :cond_b
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kc:Lcom/airbnb/lottie/c/c/a;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/a;->kb:Lcom/airbnb/lottie/c/c/a;
 
     mul-float v0, v0, p1
 
@@ -1999,7 +1999,7 @@
 
     :cond_b
     :goto_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -2007,7 +2007,7 @@
 
     if-ge v1, v0, :cond_c
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->kf:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/a;->ke: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/c/b$1.smali b/com.discord/smali/com/airbnb/lottie/c/c/b$1.smali
index 642a8f42d7..019d64d733 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 kn:[I
+.field static final synthetic km:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/b$1;->kn:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/b$1;->km:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->kn:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->km:[I
 
-    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kO:I
+    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kN: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;->kn:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/b$1;->km:[I
 
-    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kP:I
+    sget v2, Lcom/airbnb/lottie/c/c/d$b;->kO: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 04dc5b0a24..90d21e4d92 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 eg:Ljava/util/List;
+.field private final ef:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private kl:Lcom/airbnb/lottie/a/b/a;
+.field private kk: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 km:Landroid/graphics/RectF;
+.field private final kl: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;->eg:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->km:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kl:Landroid/graphics/RectF;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kC:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->kB: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;->kl:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/b;->kk:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->kl:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->kk: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;->kl:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->kk: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;->kl:Lcom/airbnb/lottie/a/b/a;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kk:Lcom/airbnb/lottie/a/b/a;
 
     :goto_0
     new-instance p2, Landroidx/collection/LongSparseArray;
 
-    iget-object v1, p4, Lcom/airbnb/lottie/d;->eg:Ljava/util/List;
+    iget-object v1, p4, Lcom/airbnb/lottie/d;->ef: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;->kj:[I
+    sget-object v6, Lcom/airbnb/lottie/c/c/a$2;->ki:[I
 
-    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->ks:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->kr: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;->ks:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->kr: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;->kt:Ljava/lang/String;
+    iget-object v7, v5, Lcom/airbnb/lottie/c/c/d;->ks:Ljava/lang/String;
 
-    iget-object v8, p4, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
+    iget-object v8, p4, Lcom/airbnb/lottie/d;->dZ:Ljava/util/Map;
 
     invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -208,9 +208,9 @@
     :goto_2
     if-eqz v6, :cond_3
 
-    iget-object v7, v6, Lcom/airbnb/lottie/c/c/a;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v7, v6, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-wide v7, v7, Lcom/airbnb/lottie/c/c/d;->kr:J
+    iget-wide v7, v7, Lcom/airbnb/lottie/c/c/d;->kq:J
 
     invoke-virtual {p2, v7, v8, v6}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -223,13 +223,13 @@
     goto :goto_3
 
     :cond_1
-    iget-object v7, p0, Lcom/airbnb/lottie/c/c/b;->eg:Ljava/util/List;
+    iget-object v7, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->kn:[I
+    sget-object v4, Lcom/airbnb/lottie/c/c/b$1;->km:[I
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kE:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kD: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object p3, p1, Lcom/airbnb/lottie/c/c/a;->jZ:Lcom/airbnb/lottie/c/c/d;
 
     iget-wide p3, p3, Lcom/airbnb/lottie/c/c/d;->parentId:J
 
@@ -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;->eg:Ljava/util/List;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->eg:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->jZ:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->jY: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;->fu:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->ft: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;->kl:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->kk: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;->kl:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/b;->kk:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->kl:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->kk: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;->km:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->kl:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v2, v2, Lcom/airbnb/lottie/c/c/d;->ky:I
+    iget v2, v2, Lcom/airbnb/lottie/c/c/d;->kx:I
 
     int-to-float v2, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->kz:I
+    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->ky: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;->km:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->eg:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->km:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->km:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->kl: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;->eg:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->eg:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->eg:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->kl:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kk:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->dK:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/b;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object p1, p1, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/d;->aH()F
 
     move-result p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kl:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->kk: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
 
     const/4 v1, 0x0
 
@@ -583,18 +583,18 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
 
     div-float/2addr p1, v0
 
     :cond_1
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v1, v0, Lcom/airbnb/lottie/c/c/d;->ei:F
+    iget v1, v0, Lcom/airbnb/lottie/c/c/d;->eh:F
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->dS:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aI()F
 
@@ -604,7 +604,7 @@
 
     sub-float/2addr p1, v1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->eg:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/b;->ef: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;->eg:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/b;->ef: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 489b703e68..8046e56ec0 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 fV:Lcom/airbnb/lottie/a/b/a;
+.field private fU: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 ko:Landroid/graphics/Rect;
+.field private final kn:Landroid/graphics/Rect;
 
-.field private final kp:Landroid/graphics/Rect;
+.field private final ko: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;->ko:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->kn: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;->kp:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->ko: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/c;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->kt:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/c/c/d;->ks:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->dK:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/c;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v1, v0}, Lcom/airbnb/lottie/f;->u(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;->jZ:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->jY: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;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/c;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->fU: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;->ko:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->kn: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;->kp:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->ko: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;->ko:Landroid/graphics/Rect;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/c;->kn:Landroid/graphics/Rect;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->kp:Landroid/graphics/Rect;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/c;->ko: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 5aa8d85458..0d2a30ca7d 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 kE:Lcom/airbnb/lottie/c/c/d$a;
+
 .field public static final enum kF:Lcom/airbnb/lottie/c/c/d$a;
 
 .field public static final enum kG:Lcom/airbnb/lottie/c/c/d$a;
@@ -35,9 +37,7 @@
 
 .field public static final enum kK:Lcom/airbnb/lottie/c/c/d$a;
 
-.field public static final enum kL:Lcom/airbnb/lottie/c/c/d$a;
-
-.field private static final synthetic kM:[Lcom/airbnb/lottie/c/c/d$a;
+.field private static final synthetic kL:[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;->kF:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kE: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;->kG:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kF: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;->kH:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kG: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;->kI:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kH: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;->kJ:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kI: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;->kK:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kJ: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;->kL:Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kK: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;->kF:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v8, Lcom/airbnb/lottie/c/c/d$a;->kE:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kG:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kF:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kH:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kG:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kI:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kH:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kJ:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kI:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kK:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kJ:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kL:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v1, Lcom/airbnb/lottie/c/c/d$a;->kK:Lcom/airbnb/lottie/c/c/d$a;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kM:[Lcom/airbnb/lottie/c/c/d$a;
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$a;->kL:[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;->kM:[Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v0, Lcom/airbnb/lottie/c/c/d$a;->kL:[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 9e931ac58f..19d45c57d2 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 kN:I = 0x1
+.field public static final kM:I = 0x1
 
-.field public static final kO:I = 0x2
+.field public static final kN:I = 0x2
 
-.field public static final kP:I = 0x3
+.field public static final kO:I = 0x3
 
-.field public static final kQ:I = 0x4
+.field public static final kP:I = 0x4
 
-.field private static final synthetic kR:[I
+.field private static final synthetic kQ:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kN:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kM:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kO:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kN:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kP:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kO:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kQ:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kP:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/d$b;->kR:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/d$b;->kQ:[I
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 .method public static bt()[I
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/c/d$b;->kR:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/d$b;->kQ:[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 fdd9ba78de..8ed63ca7cc 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 dT:Lcom/airbnb/lottie/d;
+.field final dS:Lcom/airbnb/lottie/d;
 
-.field final ei:F
+.field final eh:F
 
-.field final fZ:Z
+.field final fY:Z
 
-.field final gZ:Ljava/util/List;
+.field final gY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field final ib:Ljava/util/List;
+.field final ia:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,15 +39,13 @@
     .end annotation
 .end field
 
-.field final jw:Lcom/airbnb/lottie/c/a/l;
+.field final jv:Lcom/airbnb/lottie/c/a/l;
 
-.field final kA:Lcom/airbnb/lottie/c/a/j;
+.field final kA:Lcom/airbnb/lottie/c/a/k;
 
-.field final kB:Lcom/airbnb/lottie/c/a/k;
+.field final kB:Lcom/airbnb/lottie/c/a/b;
 
-.field final kC:Lcom/airbnb/lottie/c/a/b;
-
-.field final kD:Ljava/util/List;
+.field final kC:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -58,27 +56,29 @@
     .end annotation
 .end field
 
-.field final kE:I
+.field final kD:I
 
-.field final kq:Ljava/lang/String;
+.field final kp:Ljava/lang/String;
 
-.field public final kr:J
+.field public final kq:J
 
-.field public final ks:Lcom/airbnb/lottie/c/c/d$a;
+.field public final kr:Lcom/airbnb/lottie/c/c/d$a;
 
-.field final kt:Ljava/lang/String;
+.field final ks:Ljava/lang/String;
+
+.field final kt:I
 
 .field final ku:I
 
 .field final kv:I
 
-.field final kw:I
+.field final kw:F
 
-.field final kx:F
+.field final kx:I
 
 .field final ky:I
 
-.field final kz:I
+.field final kz:Lcom/airbnb/lottie/c/a/j;
 
 .field final parentId:J
 
@@ -120,23 +120,23 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ib:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ia:Ljava/util/List;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->dT:Lcom/airbnb/lottie/d;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->dS:Lcom/airbnb/lottie/d;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kq:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kp:Ljava/lang/String;
 
     move-wide v1, p4
 
-    iput-wide v1, v0, Lcom/airbnb/lottie/c/c/d;->kr:J
+    iput-wide v1, v0, Lcom/airbnb/lottie/c/c/d;->kq:J
 
     move-object v1, p6
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ks:Lcom/airbnb/lottie/c/c/d$a;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kr: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;->kt:Ljava/lang/String;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->ks:Ljava/lang/String;
 
     move-object v1, p10
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->gZ:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->gY:Ljava/util/List;
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->jw:Lcom/airbnb/lottie/c/a/l;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->jv:Lcom/airbnb/lottie/c/a/l;
 
     move v1, p12
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kt:I
 
     move/from16 v1, p13
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kv:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     move/from16 v1, p14
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kw:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kv:I
 
     move/from16 v1, p15
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kx:F
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kw:F
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ei:F
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->eh:F
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ky:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kx:I
 
     move/from16 v1, p18
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kz:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->ky:I
 
     move-object/from16 v1, p19
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kA:Lcom/airbnb/lottie/c/a/j;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kz:Lcom/airbnb/lottie/c/a/j;
 
     move-object/from16 v1, p20
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kB:Lcom/airbnb/lottie/c/a/k;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kA:Lcom/airbnb/lottie/c/a/k;
 
     move-object/from16 v1, p21
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kD:Ljava/util/List;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kC:Ljava/util/List;
 
     move/from16 v1, p22
 
-    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kE:I
+    iput v1, v0, Lcom/airbnb/lottie/c/c/d;->kD:I
 
     move-object/from16 v1, p23
 
-    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kC:Lcom/airbnb/lottie/c/a/b;
+    iput-object v1, v0, Lcom/airbnb/lottie/c/c/d;->kB:Lcom/airbnb/lottie/c/a/b;
 
     move/from16 v1, p24
 
-    iput-boolean v1, v0, Lcom/airbnb/lottie/c/c/d;->fZ:Z
+    iput-boolean v1, v0, Lcom/airbnb/lottie/c/c/d;->fY: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;->kq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/d;->kp: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->dS: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;->kq:Ljava/lang/String;
+    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->kp: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->dS: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;->kq:Ljava/lang/String;
+    iget-object v3, v2, Lcom/airbnb/lottie/c/c/d;->kp: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/d;->dS: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;->gZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->gY: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;->gZ:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->gY: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;->ku:I
+    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->kt:I
 
     if-eqz v2, :cond_3
 
-    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->kv:I
+    iget v2, p0, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     if-eqz v2, :cond_3
 
@@ -340,7 +340,7 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->kt: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;->kv:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->ku: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;->kw:I
+    iget v5, p0, Lcom/airbnb/lottie/c/c/d;->kv: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;->ib:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->ia: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;->ib:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/d;->ia: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 205788cd38..d6f1048e55 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 gH:Lcom/airbnb/lottie/a/a/d;
+.field private final gG: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;->ib:Ljava/util/List;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c/d;->ia: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/f;->gG:Lcom/airbnb/lottie/a/a/d;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/f;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/f;->gG: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/f;->gG:Lcom/airbnb/lottie/a/a/d;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->jZ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->jY: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->gG: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;->gH:Lcom/airbnb/lottie/a/a/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/f;->gG: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 3b7c37c348..93efdf78c0 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 fV:Lcom/airbnb/lottie/a/b/a;
+.field private fU: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 kS:[F
+.field private final jZ:Lcom/airbnb/lottie/c/c/d;
 
-.field private final ka:Lcom/airbnb/lottie/c/c/d;
+.field private final kR:[F
 
 .field private final paint:Landroid/graphics/Paint;
 
@@ -48,7 +48,7 @@
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     new-instance p1, Landroid/graphics/Path;
 
@@ -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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/g;->jZ: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;->kw:I
+    iget p2, p2, Lcom/airbnb/lottie/c/c/d;->kv: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget p3, p3, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget p3, p3, Lcom/airbnb/lottie/c/c/d;->kt:I
 
     int-to-float p3, p3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kv:I
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->ku: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;->jZ:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->jY: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;->fv:Landroid/graphics/ColorFilter;
+    sget-object v0, Lcom/airbnb/lottie/j;->fu: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->fU: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/g;->fU: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;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kw:I
+    iget v0, v0, Lcom/airbnb/lottie/c/c/d;->kv: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hr: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/a/b/o;->hr: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;->fV:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/g;->fU:Lcom/airbnb/lottie/a/b/a;
 
     if-eqz v0, :cond_2
 
@@ -241,7 +241,7 @@
     :cond_2
     if-lez p3, :cond_3
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     const/4 v0, 0x0
 
@@ -253,9 +253,9 @@
 
     aput v1, p3, v2
 
-    iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget v3, v3, Lcom/airbnb/lottie/c/c/d;->kt:I
 
     int-to-float v3, v3
 
@@ -263,15 +263,15 @@
 
     aput v3, p3, v4
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     const/4 v3, 0x3
 
     aput v1, p3, v3
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->ku:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kt:I
 
     int-to-float v5, v5
 
@@ -279,11 +279,11 @@
 
     aput v5, p3, v6
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
-    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->kv:I
+    iget v5, v5, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     int-to-float v5, v5
 
@@ -291,15 +291,15 @@
 
     aput v5, p3, v7
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     const/4 v5, 0x6
 
     aput v1, p3, v5
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->ka:Lcom/airbnb/lottie/c/c/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/g;->jZ:Lcom/airbnb/lottie/c/c/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/c/c/d;->kv:I
+    iget v1, v1, Lcom/airbnb/lottie/c/c/d;->ku:I
 
     int-to-float v1, v1
 
@@ -307,7 +307,7 @@
 
     aput v1, p3, v8
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     invoke-virtual {p2, p3}, Landroid/graphics/Matrix;->mapPoints([F)V
 
@@ -317,7 +317,7 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     aget v1, p3, v0
 
@@ -327,7 +327,7 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     aget v1, p3, v4
 
@@ -337,7 +337,7 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     aget v1, p3, v6
 
@@ -347,7 +347,7 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     aget v1, p3, v5
 
@@ -357,7 +357,7 @@
 
     iget-object p2, p0, Lcom/airbnb/lottie/c/c/g;->path:Landroid/graphics/Path;
 
-    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kS:[F
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/g;->kR:[F
 
     aget v0, p3, v0
 
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 5c66dbc1ba..a28a31eaa8 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 la:Lcom/airbnb/lottie/c/c/h;
+.field final synthetic kZ: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;->la:Lcom/airbnb/lottie/c/c/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$1;->kZ: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 8cba16ddbf..e65507d43c 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 la:Lcom/airbnb/lottie/c/c/h;
+.field final synthetic kZ: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;->la:Lcom/airbnb/lottie/c/c/h;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h$2;->kZ: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 91a608e63b..6c3db96256 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 lb:[I
+.field static final synthetic la:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
+    sput-object v0, Lcom/airbnb/lottie/c/c/h$3;->la:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->la:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->hU:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->hT: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;->lb:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->la:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->hV:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->hU: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;->lb:[I
+    sget-object v1, Lcom/airbnb/lottie/c/c/h$3;->la:[I
 
-    sget v2, Lcom/airbnb/lottie/c/b$a;->hW:I
+    sget v2, Lcom/airbnb/lottie/c/b$a;->hV: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 d263ed52cd..8d808cdc69 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 dK:Lcom/airbnb/lottie/f;
+.field private final dJ:Lcom/airbnb/lottie/f;
 
-.field private final dT:Lcom/airbnb/lottie/d;
+.field private final dS:Lcom/airbnb/lottie/d;
 
 .field private final fillPaint:Landroid/graphics/Paint;
 
-.field private gh:Lcom/airbnb/lottie/a/b/a;
+.field private gg:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -21,9 +21,9 @@
     .end annotation
 .end field
 
-.field private final kT:Ljava/lang/StringBuilder;
+.field private final kS:Ljava/lang/StringBuilder;
 
-.field private final kU:Ljava/util/Map;
+.field private final kT:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final kV:Landroidx/collection/LongSparseArray;
+.field private final kU:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private final kW:Lcom/airbnb/lottie/a/b/n;
+.field private final kV:Lcom/airbnb/lottie/a/b/n;
 
-.field private kX:Lcom/airbnb/lottie/a/b/a;
+.field private kW:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/airbnb/lottie/a/b/a<",
@@ -58,6 +58,17 @@
     .end annotation
 .end field
 
+.field private kX: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 kY:Lcom/airbnb/lottie/a/b/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -69,17 +80,6 @@
     .end annotation
 .end field
 
-.field private kZ: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 rectF:Landroid/graphics/RectF;
@@ -99,7 +99,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(I)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kT:Ljava/lang/StringBuilder;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kS: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;->kU:Ljava/util/Map;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kT: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;->kV:Landroidx/collection/LongSparseArray;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kU:Landroidx/collection/LongSparseArray;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dK:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->dT:Lcom/airbnb/lottie/d;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->dS:Lcom/airbnb/lottie/d;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dT:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kA:Lcom/airbnb/lottie/c/a/j;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kz:Lcom/airbnb/lottie/c/a/j;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/j;->bl()Lcom/airbnb/lottie/a/b/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kW:Lcom/airbnb/lottie/a/b/n;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kV:Lcom/airbnb/lottie/a/b/n;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kW:Lcom/airbnb/lottie/a/b/n;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kV: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;->kW:Lcom/airbnb/lottie/a/b/n;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kV: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;->kB:Lcom/airbnb/lottie/c/a/k;
+    iget-object p1, p2, Lcom/airbnb/lottie/c/c/d;->kA:Lcom/airbnb/lottie/c/a/k;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->io:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->im:Lcom/airbnb/lottie/c/a/a;
 
     if-eqz p2, :cond_0
 
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->im:Lcom/airbnb/lottie/c/a/a;
+
+    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/a;->bi()Lcom/airbnb/lottie/a/b/a;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->gg:Lcom/airbnb/lottie/a/b/a;
+
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->gg: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;->gg: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;->io:Lcom/airbnb/lottie/c/a/a;
+
+    if-eqz p2, :cond_1
+
     iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->io:Lcom/airbnb/lottie/c/a/a;
 
     invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/a;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->gh:Lcom/airbnb/lottie/a/b/a;
+    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kW:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kW: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kW: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;->iq:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->iq: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;->iq:Lcom/airbnb/lottie/c/a/a;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->iq:Lcom/airbnb/lottie/c/a/b;
 
-    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/a;->bi()Lcom/airbnb/lottie/a/b/a;
+    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/b;->bi()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;->ir:Lcom/airbnb/lottie/c/a/b;
-
-    if-eqz p2, :cond_2
-
-    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
-
-    invoke-virtual {p2}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
-
-    move-result-object p2
-
-    iput-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kY:Lcom/airbnb/lottie/a/b/a;
-
-    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->kY: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;->kY: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;->is:Lcom/airbnb/lottie/c/a/b;
+    iget-object p2, p1, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/a/k;->is:Lcom/airbnb/lottie/c/a/b;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/a/k;->ir:Lcom/airbnb/lottie/c/a/b;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/c/a/b;->bi()Lcom/airbnb/lottie/a/b/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kZ:Lcom/airbnb/lottie/a/b/a;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kY:Lcom/airbnb/lottie/a/b/a;
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kZ:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kY: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;->kZ:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kY:Lcom/airbnb/lottie/a/b/a;
 
     invoke-virtual {p0, p1}, Lcom/airbnb/lottie/c/c/h;->a(Lcom/airbnb/lottie/a/b/a;)V
 
@@ -297,7 +297,7 @@
 .method private static a(ILandroid/graphics/Canvas;F)V
     .locals 2
 
-    sget-object v0, Lcom/airbnb/lottie/c/c/h$3;->lb:[I
+    sget-object v0, Lcom/airbnb/lottie/c/c/h$3;->la:[I
 
     const/4 v1, 0x1
 
@@ -385,11 +385,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->dK:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v2, p2, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
+    iget-object v2, p2, Lcom/airbnb/lottie/c/c;->hX:Ljava/lang/String;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/c/c;->hZ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
 
     invoke-virtual {v1}, Lcom/airbnb/lottie/f;->getCallback()Landroid/graphics/drawable/Drawable$Callback;
 
@@ -404,7 +404,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, v1, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
+    iget-object v3, v1, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
 
     if-nez v3, :cond_1
 
@@ -414,29 +414,29 @@
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/a;
+    iget-object v6, v1, Lcom/airbnb/lottie/f;->eA: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;->eA:Lcom/airbnb/lottie/b/a;
+    iput-object v3, v1, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b/a;
 
     :cond_1
-    iget-object v1, v1, Lcom/airbnb/lottie/f;->eA:Lcom/airbnb/lottie/b/a;
+    iget-object v1, v1, Lcom/airbnb/lottie/f;->ez: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;->hz:Lcom/airbnb/lottie/c/i;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hy: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;->hA:Ljava/util/Map;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hz:Ljava/util/Map;
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hz:Lcom/airbnb/lottie/c/i;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hy:Lcom/airbnb/lottie/c/i;
 
     invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -449,7 +449,7 @@
     goto :goto_4
 
     :cond_2
-    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hB:Ljava/util/Map;
+    iget-object v4, v1, Lcom/airbnb/lottie/b/a;->hA:Ljava/util/Map;
 
     invoke-interface {v4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -470,7 +470,7 @@
 
     invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hE:Ljava/lang/String;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hD:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -478,13 +478,13 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hC:Landroid/content/res/AssetManager;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hB: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;->hB:Ljava/util/Map;
+    iget-object v5, v1, Lcom/airbnb/lottie/b/a;->hA:Ljava/util/Map;
 
     invoke-interface {v5, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -543,9 +543,9 @@
     move-object v4, p2
 
     :goto_3
-    iget-object p2, v1, Lcom/airbnb/lottie/b/a;->hA:Ljava/util/Map;
+    iget-object p2, v1, Lcom/airbnb/lottie/b/a;->hz:Ljava/util/Map;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/b/a;->hz:Lcom/airbnb/lottie/c/i;
+    iget-object v1, v1, Lcom/airbnb/lottie/b/a;->hy:Lcom/airbnb/lottie/c/i;
 
     invoke-interface {p2, v1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -558,17 +558,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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/f;->eC:Lcom/airbnb/lottie/p;
+    iget-object v1, v1, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/p;
 
     if-eqz v1, :cond_b
 
-    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fL:Z
+    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fK:Z
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v1, Lcom/airbnb/lottie/p;->fK:Ljava/util/Map;
+    iget-object v2, v1, Lcom/airbnb/lottie/p;->fJ:Ljava/util/Map;
 
     invoke-interface {v2, p2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -576,7 +576,7 @@
 
     if-eqz v2, :cond_a
 
-    iget-object v1, v1, Lcom/airbnb/lottie/p;->fK:Ljava/util/Map;
+    iget-object v1, v1, Lcom/airbnb/lottie/p;->fJ:Ljava/util/Map;
 
     invoke-interface {v1, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -587,11 +587,11 @@
     goto :goto_5
 
     :cond_a
-    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fL:Z
+    iget-boolean v2, v1, Lcom/airbnb/lottie/p;->fK:Z
 
     if-eqz v2, :cond_b
 
-    iget-object v1, v1, Lcom/airbnb/lottie/p;->fK:Ljava/util/Map;
+    iget-object v1, v1, Lcom/airbnb/lottie/p;->fJ:Ljava/util/Map;
 
     invoke-interface {v1, p2, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -603,7 +603,7 @@
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/c/h;->fillPaint:Landroid/graphics/Paint;
 
-    iget-wide v4, p1, Lcom/airbnb/lottie/c/b;->hN:D
+    iget-wide v4, p1, Lcom/airbnb/lottie/c/b;->hM:D
 
     invoke-static {}, Lcom/airbnb/lottie/f/h;->bH()F
 
@@ -639,7 +639,7 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setTextSize(F)V
 
-    iget-wide v1, p1, Lcom/airbnb/lottie/c/b;->hQ:D
+    iget-wide v1, p1, Lcom/airbnb/lottie/c/b;->hP:D
 
     double-to-float v1, v1
 
@@ -672,7 +672,7 @@
 
     move-result v5
 
-    iget v6, p1, Lcom/airbnb/lottie/c/b;->hO:I
+    iget v6, p1, Lcom/airbnb/lottie/c/b;->hN:I
 
     invoke-static {v6, p4, v5}, Lcom/airbnb/lottie/c/c/h;->a(ILandroid/graphics/Canvas;F)V
 
@@ -866,7 +866,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->kV:Landroidx/collection/LongSparseArray;
+    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->kU:Landroidx/collection/LongSparseArray;
 
     int-to-long v6, v2
 
@@ -876,7 +876,7 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kV:Landroidx/collection/LongSparseArray;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kU:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v2, v6, v7}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -887,7 +887,7 @@
     goto :goto_5
 
     :cond_3
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kT:Ljava/lang/StringBuilder;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kS:Ljava/lang/StringBuilder;
 
     invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->setLength(I)V
 
@@ -900,7 +900,7 @@
 
     move-result v4
 
-    iget-object v8, p0, Lcom/airbnb/lottie/c/c/h;->kT:Ljava/lang/StringBuilder;
+    iget-object v8, p0, Lcom/airbnb/lottie/c/c/h;->kS:Ljava/lang/StringBuilder;
 
     invoke-virtual {v8, v4}, Ljava/lang/StringBuilder;->appendCodePoint(I)Ljava/lang/StringBuilder;
 
@@ -913,13 +913,13 @@
     goto :goto_4
 
     :cond_4
-    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kT:Ljava/lang/StringBuilder;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/c/h;->kS: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;->kV:Landroidx/collection/LongSparseArray;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/c/h;->kU:Landroidx/collection/LongSparseArray;
 
     invoke-virtual {v3, v6, v7, v2}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -930,7 +930,7 @@
 
     add-int/2addr v1, v3
 
-    iget-boolean v3, p2, Lcom/airbnb/lottie/c/b;->hT:Z
+    iget-boolean v3, p2, Lcom/airbnb/lottie/c/b;->hS:Z
 
     if-eqz v3, :cond_5
 
@@ -960,7 +960,7 @@
 
     move-result v2
 
-    iget v3, p2, Lcom/airbnb/lottie/c/b;->hP:I
+    iget v3, p2, Lcom/airbnb/lottie/c/b;->hO:I
 
     int-to-float v3, v3
 
@@ -968,7 +968,7 @@
 
     div-float/2addr v3, v4
 
-    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->kZ:Lcom/airbnb/lottie/a/b/a;
+    iget-object v4, p0, Lcom/airbnb/lottie/c/c/h;->kY: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object p2, p0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object p2, p2, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object p2, p2, Lcom/airbnb/lottie/d;->eg: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object p3, p0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object p3, p3, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object p3, p3, Lcom/airbnb/lottie/d;->eg: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;->eU:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eT:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->gg: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;->eV:Ljava/lang/Integer;
+    sget-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
 
     if-ne p1, v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kX:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kW: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;->fi:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fh:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kY:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/c/h;->kX: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;->fj:Ljava/lang/Float;
+    sget-object v0, Lcom/airbnb/lottie/j;->fi:Ljava/lang/Float;
 
     if-ne p1, v0, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kZ:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/c/h;->kY: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v3}, Lcom/airbnb/lottie/f;->aN()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;->kW:Lcom/airbnb/lottie/a/b/n;
+    iget-object v3, v0, Lcom/airbnb/lottie/c/c/h;->kV: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v4, v0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/d;->ec:Ljava/util/Map;
+    iget-object v4, v4, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
 
-    iget-object v5, v3, Lcom/airbnb/lottie/c/b;->hM:Ljava/lang/String;
+    iget-object v5, v3, Lcom/airbnb/lottie/c/b;->hL: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;->gh:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->gg: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;->kX:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->kW: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hr: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;->gG:Lcom/airbnb/lottie/a/b/o;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->gF:Lcom/airbnb/lottie/a/b/o;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hs:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v5, Lcom/airbnb/lottie/a/b/o;->hr: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;->kY:Lcom/airbnb/lottie/a/b/a;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->kX: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;->hS:D
+    iget-wide v7, v3, Lcom/airbnb/lottie/c/b;->hR:D
 
     invoke-static {}, Lcom/airbnb/lottie/f/h;->bH()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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v5, v0, Lcom/airbnb/lottie/c/c/h;->dJ:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v5}, Lcom/airbnb/lottie/f;->aN()Z
 
@@ -1303,7 +1303,7 @@
 
     if-eqz v5, :cond_f
 
-    iget-wide v5, v3, Lcom/airbnb/lottie/c/b;->hN:D
+    iget-wide v5, v3, Lcom/airbnb/lottie/c/b;->hM: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;->hQ:D
+    iget-wide v8, v3, Lcom/airbnb/lottie/c/b;->hP:D
 
     double-to-float v8, v8
 
@@ -1361,19 +1361,19 @@
 
     move-result v10
 
-    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hY:Ljava/lang/String;
+    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hX:Ljava/lang/String;
 
     move-object/from16 v16, v7
 
-    iget-object v7, v4, Lcom/airbnb/lottie/c/c;->hZ:Ljava/lang/String;
+    iget-object v7, v4, Lcom/airbnb/lottie/c/c;->hY: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v10, v0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v10, v10, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/SparseArrayCompat;
+    iget-object v10, v10, Lcom/airbnb/lottie/d;->ed: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;->ie:D
+    iget-wide v10, v7, Lcom/airbnb/lottie/c/d;->ic: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;->hO:I
+    iget v7, v3, Lcom/airbnb/lottie/c/b;->hN: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;->hY:Ljava/lang/String;
+    iget-object v11, v4, Lcom/airbnb/lottie/c/c;->hX:Ljava/lang/String;
 
-    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hZ:Ljava/lang/String;
+    iget-object v13, v4, Lcom/airbnb/lottie/c/c;->hY: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v11, v11, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/SparseArrayCompat;
+    iget-object v11, v11, Lcom/airbnb/lottie/d;->ed: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;->kU:Ljava/util/Map;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->kT: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;->kU:Ljava/util/Map;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->kT: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;->ib:Ljava/util/List;
+    iget-object v11, v8, Lcom/airbnb/lottie/c/d;->ia: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;->dK:Lcom/airbnb/lottie/f;
+    iget-object v12, v0, Lcom/airbnb/lottie/c/c/h;->dJ: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;->kU:Ljava/util/Map;
+    iget-object v9, v0, Lcom/airbnb/lottie/c/c/h;->kT: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;->hR:D
+    iget-wide v13, v3, Lcom/airbnb/lottie/c/b;->hQ: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;->hT:Z
+    iget-boolean v12, v3, Lcom/airbnb/lottie/c/b;->hS:Z
 
     if-eqz v12, :cond_a
 
@@ -1689,7 +1689,7 @@
     goto :goto_a
 
     :cond_b
-    iget-wide v8, v8, Lcom/airbnb/lottie/c/d;->ie:D
+    iget-wide v8, v8, Lcom/airbnb/lottie/c/d;->ic:D
 
     double-to-float v8, v8
 
@@ -1703,7 +1703,7 @@
 
     mul-float v8, v8, v6
 
-    iget v9, v3, Lcom/airbnb/lottie/c/b;->hP:I
+    iget v9, v3, Lcom/airbnb/lottie/c/b;->hO: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;->kZ:Lcom/airbnb/lottie/a/b/a;
+    iget-object v11, v0, Lcom/airbnb/lottie/c/c/h;->kY: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 9d373fe93c..bd13b6bb0b 100644
--- a/com.discord/smali/com/airbnb/lottie/c/d.smali
+++ b/com.discord/smali/com/airbnb/lottie/c/d.smali
@@ -6,11 +6,11 @@
 # instance fields
 .field private final fontFamily:Ljava/lang/String;
 
-.field private final hN:D
+.field private final hM:D
 
-.field private final hZ:Ljava/lang/String;
+.field private final hY:Ljava/lang/String;
 
-.field public final ib:Ljava/util/List;
+.field public final ia:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field private final ic:C
+.field private final ib:C
 
-.field public final ie:D
+.field public final ic:D
 
 
 # direct methods
@@ -42,15 +42,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/d;->ib:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/d;->ia:Ljava/util/List;
 
-    iput-char p2, p0, Lcom/airbnb/lottie/c/d;->ic:C
+    iput-char p2, p0, Lcom/airbnb/lottie/c/d;->ib:C
 
-    iput-wide p3, p0, Lcom/airbnb/lottie/c/d;->hN:D
+    iput-wide p3, p0, Lcom/airbnb/lottie/c/d;->hM:D
 
-    iput-wide p5, p0, Lcom/airbnb/lottie/c/d;->ie:D
+    iput-wide p5, p0, Lcom/airbnb/lottie/c/d;->ic:D
 
-    iput-object p7, p0, Lcom/airbnb/lottie/c/d;->hZ:Ljava/lang/String;
+    iput-object p7, p0, Lcom/airbnb/lottie/c/d;->hY: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;->ic:C
+    iget-char v0, p0, Lcom/airbnb/lottie/c/d;->ib:C
 
     iget-object v1, p0, Lcom/airbnb/lottie/c/d;->fontFamily:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/c/d;->hZ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/airbnb/lottie/c/d;->hY: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 66f62283ce..e50c25a539 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 if:Ljava/util/List;
+.field private final ie:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public ig:Lcom/airbnb/lottie/c/f;
+.field public if: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;->if:Ljava/util/List;
+    iget-object v1, p1, Lcom/airbnb/lottie/c/e;->ie:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/c/e;->if:Ljava/util/List;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/e;->ie:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->ig:Lcom/airbnb/lottie/c/f;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->if:Lcom/airbnb/lottie/c/f;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->ig:Lcom/airbnb/lottie/c/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->if: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;->if:Ljava/util/List;
+    iput-object p1, p0, Lcom/airbnb/lottie/c/e;->ie:Ljava/util/List;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 .method private bg()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->ig:Lcom/airbnb/lottie/c/f;
+    iput-object p1, v0, Lcom/airbnb/lottie/c/e;->if: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v3, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object p1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->if:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->ie: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;->ig:Lcom/airbnb/lottie/c/f;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/e;->if: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;->if:Ljava/util/List;
+    iget-object v1, v0, Lcom/airbnb/lottie/c/e;->ie: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 cfb3ecdb50..15228fb959 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 ih:Lcom/airbnb/lottie/c/g;
+.field private static final ig:Lcom/airbnb/lottie/c/g;
 
 
 # instance fields
-.field private final ii:Landroidx/collection/LruCache;
+.field private final ih: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;->ih:Lcom/airbnb/lottie/c/g;
+    sput-object v0, Lcom/airbnb/lottie/c/g;->ig: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;->ii:Landroidx/collection/LruCache;
+    iput-object v0, p0, Lcom/airbnb/lottie/c/g;->ih:Landroidx/collection/LruCache;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 .method public static bh()Lcom/airbnb/lottie/c/g;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/c/g;->ih:Lcom/airbnb/lottie/c/g;
+    sget-object v0, Lcom/airbnb/lottie/c/g;->ig: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;->ii:Landroidx/collection/LruCache;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->ih: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;->ii:Landroidx/collection/LruCache;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/g;->ih: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 2e0b2c2943..d86485f6f4 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 ij:Ljava/lang/String; = "\r"
+.field public static ii:Ljava/lang/String; = "\r"
 
 
 # instance fields
-.field public final ei:F
+.field public final eh:F
 
-.field public final ik:F
+.field public final ij: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;->ik:F
+    iput p3, p0, Lcom/airbnb/lottie/c/h;->ij:F
 
-    iput p2, p0, Lcom/airbnb/lottie/c/h;->ei:F
+    iput p2, p0, Lcom/airbnb/lottie/c/h;->eh: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 efbefc843e..c1671c214b 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 dY:Lcom/airbnb/lottie/m;
+.field public final dX:Lcom/airbnb/lottie/m;
 
-.field private final dZ:Ljava/util/HashSet;
+.field private final dY:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public ea:Ljava/util/Map;
+.field public dZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field public eb:Ljava/util/Map;
+.field public ea:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field public ec:Ljava/util/Map;
+.field public eb:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field public ed:Ljava/util/List;
+.field public ec:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field public ee:Landroidx/collection/SparseArrayCompat;
+.field public ed:Landroidx/collection/SparseArrayCompat;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SparseArrayCompat<",
@@ -70,7 +70,7 @@
     .end annotation
 .end field
 
-.field public ef:Landroidx/collection/LongSparseArray;
+.field public ee:Landroidx/collection/LongSparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/LongSparseArray<",
@@ -80,7 +80,7 @@
     .end annotation
 .end field
 
-.field public eg:Ljava/util/List;
+.field public ef:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -90,17 +90,17 @@
     .end annotation
 .end field
 
-.field public eh:Landroid/graphics/Rect;
+.field public eg:Landroid/graphics/Rect;
+
+.field public eh:F
 
 .field public ei:F
 
 .field public ej:F
 
-.field public ek:F
+.field public ek:Z
 
-.field public el:Z
-
-.field em:I
+.field el:I
 
 
 # direct methods
@@ -113,17 +113,17 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/m;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/d;->dY:Lcom/airbnb/lottie/m;
+    iput-object v0, p0, Lcom/airbnb/lottie/d;->dX: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;->dZ:Ljava/util/HashSet;
+    iput-object v0, p0, Lcom/airbnb/lottie/d;->dY:Ljava/util/HashSet;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/airbnb/lottie/d;->em:I
+    iput v0, p0, Lcom/airbnb/lottie/d;->el:I
 
     return-void
 .end method
@@ -137,7 +137,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/airbnb/lottie/d;->ek:F
+    iget v1, p0, Lcom/airbnb/lottie/d;->ej:F
 
     div-float/2addr v0, v1
 
@@ -155,9 +155,9 @@
 .method public final aI()F
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/d;->ej:F
+    iget v0, p0, Lcom/airbnb/lottie/d;->ei:F
 
-    iget v1, p0, Lcom/airbnb/lottie/d;->ei:F
+    iget v1, p0, Lcom/airbnb/lottie/d;->eh:F
 
     sub-float/2addr v0, v1
 
@@ -167,11 +167,11 @@
 .method public final b(I)V
     .locals 1
 
-    iget v0, p0, Lcom/airbnb/lottie/d;->em:I
+    iget v0, p0, Lcom/airbnb/lottie/d;->el:I
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/airbnb/lottie/d;->em:I
+    iput v0, p0, Lcom/airbnb/lottie/d;->el:I
 
     return-void
 .end method
@@ -179,7 +179,7 @@
 .method public final g(J)Lcom/airbnb/lottie/c/c/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->ef:Landroidx/collection/LongSparseArray;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->ee: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;->w(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->dZ:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->dY:Ljava/util/HashSet;
 
     invoke-virtual {v0, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
@@ -205,7 +205,7 @@
 .method public final setPerformanceTrackingEnabled(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->dY:Lcom/airbnb/lottie/m;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->dX:Lcom/airbnb/lottie/m;
 
     iput-boolean p1, v0, Lcom/airbnb/lottie/m;->enabled:Z
 
@@ -215,7 +215,7 @@
 .method public final t(Ljava/lang/String;)Lcom/airbnb/lottie/c/h;
     .locals 6
 
-    iget-object v0, p0, Lcom/airbnb/lottie/d;->ed:Ljava/util/List;
+    iget-object v0, p0, Lcom/airbnb/lottie/d;->ec:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -224,7 +224,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/airbnb/lottie/d;->ed:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/d;->ec:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->size()I
 
@@ -232,7 +232,7 @@
 
     if-ge v1, v2, :cond_3
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d;->ed:Ljava/util/List;
+    iget-object v2, p0, Lcom/airbnb/lottie/d;->ec:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -255,7 +255,7 @@
     :cond_0
     iget-object v3, v2, Lcom/airbnb/lottie/c/h;->name:Ljava/lang/String;
 
-    sget-object v5, Lcom/airbnb/lottie/c/h;->ij:Ljava/lang/String;
+    sget-object v5, Lcom/airbnb/lottie/c/h;->ii:Ljava/lang/String;
 
     invoke-virtual {v3, v5}, Ljava/lang/String;->endsWith(Ljava/lang/String;)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;->eg:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/d;->ef: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 8113c3af4a..ca37496578 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 lb:Lcom/airbnb/lottie/d/a;
+
 .field public static final enum lc:Lcom/airbnb/lottie/d/a;
 
-.field public static final enum ld:Lcom/airbnb/lottie/d/a;
-
-.field private static final synthetic le:[Lcom/airbnb/lottie/d/a;
+.field private static final synthetic ld:[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;->lc:Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->lb: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;->ld:Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->lc: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;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v3, Lcom/airbnb/lottie/d/a;->lb:Lcom/airbnb/lottie/d/a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->ld:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/airbnb/lottie/d/a;->le:[Lcom/airbnb/lottie/d/a;
+    sput-object v0, Lcom/airbnb/lottie/d/a;->ld:[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;->le:[Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->ld:[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 20caa2e72d..50b04a7aba 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 lf:Landroid/content/Context;
+.field final le: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;->lf:Landroid/content/Context;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/b;->le: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;->lf:Landroid/content/Context;
+    iget-object v1, p0, Lcom/airbnb/lottie/d/b;->le: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;->lf:Landroid/content/Context;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->le: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;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v4, Lcom/airbnb/lottie/d/a;->lb: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;->lf:Landroid/content/Context;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/b;->le: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;->ld:Lcom/airbnb/lottie/d/a;
+    sget-object v4, Lcom/airbnb/lottie/d/a;->lc: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;->ld:Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
 
     goto :goto_1
 
     :cond_3
-    sget-object v0, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v0, Lcom/airbnb/lottie/d/a;->lb: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 65f6f16b11..0501cc863c 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 lf:Landroid/content/Context;
+.field private final le:Landroid/content/Context;
 
-.field public final lg:Lcom/airbnb/lottie/d/b;
+.field public final lf: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;->lf:Landroid/content/Context;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->le: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;->lf:Landroid/content/Context;
+    iget-object v0, p0, Lcom/airbnb/lottie/d/c;->le: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;->lg:Lcom/airbnb/lottie/d/b;
+    iput-object p1, p0, Lcom/airbnb/lottie/d/c;->lf:Lcom/airbnb/lottie/d/b;
 
     return-void
 .end method
@@ -248,9 +248,9 @@
 
     invoke-static {v1}, Lcom/airbnb/lottie/f/d;->v(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->lb:Lcom/airbnb/lottie/d/a;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lg:Lcom/airbnb/lottie/d/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lf: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;->v(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/airbnb/lottie/d/a;->ld:Lcom/airbnb/lottie/d/a;
+    sget-object v1, Lcom/airbnb/lottie/d/a;->lc:Lcom/airbnb/lottie/d/a;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lg:Lcom/airbnb/lottie/d/b;
+    iget-object v2, p0, Lcom/airbnb/lottie/d/c;->lf: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;->lg:Lcom/airbnb/lottie/d/b;
+    iget-object v3, p0, Lcom/airbnb/lottie/d/c;->lf: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;->lf:Landroid/content/Context;
+    iget-object v3, v3, Lcom/airbnb/lottie/d/b;->le: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 b6d00c20e1..65917a4ee5 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 eo:Ljava/lang/String;
+.field final synthetic en: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;->eo:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$1;->en: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;->eo:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$1;->en: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;->lg:Lcom/airbnb/lottie/d/b;
+    iget-object v0, v2, Lcom/airbnb/lottie/d/c;->lf:Lcom/airbnb/lottie/d/b;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/d/b;->bv()Landroidx/core/util/Pair;
 
@@ -80,7 +80,7 @@
 
     check-cast v0, Ljava/io/InputStream;
 
-    sget-object v3, Lcom/airbnb/lottie/d/a;->ld:Lcom/airbnb/lottie/d/a;
+    sget-object v3, Lcom/airbnb/lottie/d/a;->lc: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 111d219ca1..b120229918 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 ep:Ljava/lang/String;
+.field final synthetic eo:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$2;->ep:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$2;->eo: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;->ep:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->eo: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;->ep:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$2;->eo: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;->ep:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$2;->eo: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 c87f4ffbf5..3fbba1b4bf 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 ep:Ljava/lang/String;
+.field final synthetic eo:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e$3;->ep:Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$3;->eo: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;->ep:Ljava/lang/String;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$3;->eo: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 759da436d7..7ad0b6a334 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 eq:Ljava/lang/String;
+.field final synthetic ep: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;->eq:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$4;->ep: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;->eq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$4;->ep: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 e9be354b7e..c92b092089 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 er:I
+.field final synthetic eq: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;->er:I
+    iput p2, p0, Lcom/airbnb/lottie/e$5;->eq: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;->er:I
+    iget v1, p0, Lcom/airbnb/lottie/e$5;->eq: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 f880fd701d..5d47eaa330 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 ep:Ljava/lang/String;
+.field final synthetic eo:Ljava/lang/String;
 
-.field final synthetic es:Lcom/airbnb/lottie/e/a/c;
+.field final synthetic er: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;->es:Lcom/airbnb/lottie/e/a/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$6;->er:Lcom/airbnb/lottie/e/a/c;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e$6;->ep:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/e$6;->eo: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;->es:Lcom/airbnb/lottie/e/a/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e$6;->er:Lcom/airbnb/lottie/e/a/c;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e$6;->ep:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$6;->eo: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 2565f60e7b..2f75833508 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 et:Lcom/airbnb/lottie/d;
+.field final synthetic es: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;->et:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/e$7;->es: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;->et:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e$7;->es: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 b6fb41ee4d..78928497b9 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 en:Ljava/util/Map;
+.field private static final em: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;->en:Ljava/util/Map;
+    sput-object v0, Lcom/airbnb/lottie/e;->em: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;->eb:Ljava/util/Map;
+    iget-object p0, p0, Lcom/airbnb/lottie/d;->ea: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;->eR:Ljava/lang/String;
+    iget-object v1, v0, Lcom/airbnb/lottie/g;->eQ: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;->en:Ljava/util/Map;
+    sget-object v0, Lcom/airbnb/lottie/e;->em: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;->en:Ljava/util/Map;
+    sget-object p1, Lcom/airbnb/lottie/e;->em: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;->en:Ljava/util/Map;
+    sget-object p1, Lcom/airbnb/lottie/e;->em: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 aJ()Ljava/util/Map;
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/e;->en:Ljava/util/Map;
+    sget-object v0, Lcom/airbnb/lottie/e;->em:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -660,12 +660,12 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/airbnb/lottie/g;->eT:Landroid/graphics/Bitmap;
+    iput-object v0, v1, Lcom/airbnb/lottie/g;->eS:Landroid/graphics/Bitmap;
 
     goto :goto_2
 
     :cond_6
-    iget-object p0, v3, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
+    iget-object p0, v3, Lcom/airbnb/lottie/d;->ea: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;->eT:Landroid/graphics/Bitmap;
+    iget-object v1, v1, Lcom/airbnb/lottie/g;->eS: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;->eR:Ljava/lang/String;
+    iget-object v0, v0, Lcom/airbnb/lottie/g;->eQ: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 f31328d690..2bd2cc3e70 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/a;->lg: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lK: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;->lB:Lcom/airbnb/lottie/e/w;
+    sget-object v3, Lcom/airbnb/lottie/e/w;->lA: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;->lM:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->lL:Lcom/airbnb/lottie/e/a/c$b;
 
     if-eq v5, v6, :cond_5
 
-    sget-object v5, Lcom/airbnb/lottie/e/a;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/a;->lg: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;->lO:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->lN: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;->lO:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v6, Lcom/airbnb/lottie/e/a/c$b;->lN: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 e7cd063165..873fea0502 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,9 +15,9 @@
 
 
 # instance fields
-.field final lH:[Ljava/lang/String;
+.field final lG:[Ljava/lang/String;
 
-.field final lI:Lokio/k;
+.field final lH:Lokio/k;
 
 
 # direct methods
@@ -26,9 +26,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e/a/c$a;->lH:[Ljava/lang/String;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/c$a;->lG:[Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/e/a/c$a;->lI:Lokio/k;
+    iput-object p2, p0, Lcom/airbnb/lottie/e/a/c$a;->lH:Lokio/k;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    invoke-virtual {v1}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Gs()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 2e66f49211..4ce2ef3c44 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
@@ -23,6 +23,8 @@
 
 
 # static fields
+.field public static final enum lI:Lcom/airbnb/lottie/e/a/c$b;
+
 .field public static final enum lJ:Lcom/airbnb/lottie/e/a/c$b;
 
 .field public static final enum lK:Lcom/airbnb/lottie/e/a/c$b;
@@ -41,9 +43,7 @@
 
 .field public static final enum lR:Lcom/airbnb/lottie/e/a/c$b;
 
-.field public static final enum lS:Lcom/airbnb/lottie/e/a/c$b;
-
-.field private static final synthetic lT:[Lcom/airbnb/lottie/e/a/c$b;
+.field private static final synthetic lS:[Lcom/airbnb/lottie/e/a/c$b;
 
 
 # direct methods
@@ -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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lK:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lJ: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;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lK: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;->lM:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lL: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;->lN:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lM: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;->lO:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lN: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;->lP:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lO: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;->lQ:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lP: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;->lR:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lQ: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;->lS:Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lR: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v11, Lcom/airbnb/lottie/e/a/c$b;->lI:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v11, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lK:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lJ:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lK:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lM:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lL:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lN:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lM:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lO:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lN:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lP:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lO:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lQ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lP:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lR:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lQ:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lS:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lR:Lcom/airbnb/lottie/e/a/c$b;
 
     aput-object v1, v0, v10
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lT:[Lcom/airbnb/lottie/e/a/c$b;
+    sput-object v0, Lcom/airbnb/lottie/e/a/c$b;->lS:[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;->lT:[Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lS:[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 1d34095e85..45b5ca6eb6 100644
--- a/com.discord/smali/com/airbnb/lottie/e/a/c.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/a/c.smali
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field lF:[I
+.field lE:[I
 
-.field lG:Z
+.field lF:Z
 
 .field lenient:Z
 
@@ -133,7 +133,7 @@
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lF:[I
+    iput-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lE:[I
 
     new-array v1, v0, [Ljava/lang/String;
 
@@ -337,7 +337,7 @@
 
     iget v0, p0, Lcom/airbnb/lottie/e/a/c;->stackSize:I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lF:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lE:[I
 
     iget-object v2, p0, Lcom/airbnb/lottie/e/a/c;->pathNames:[Ljava/lang/String;
 
@@ -355,7 +355,7 @@
 
     iget v0, p0, Lcom/airbnb/lottie/e/a/c;->stackSize:I
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lF:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/c;->lE:[I
 
     array-length v2, v1
 
@@ -373,7 +373,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lF:[I
+    iput-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lE:[I
 
     iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->pathNames:[Ljava/lang/String;
 
@@ -428,7 +428,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lF:[I
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/c;->lE:[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 bb22861f19..8b2782ccdd 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 lT:Lokio/ByteString;
+
 .field private static final lU:Lokio/ByteString;
 
 .field private static final lV:Lokio/ByteString;
@@ -12,13 +14,11 @@
 
 .field private static final lX:Lokio/ByteString;
 
-.field private static final lY:Lokio/ByteString;
-
 
 # instance fields
-.field private final lZ:Lokio/d;
+.field private final lY:Lokio/d;
 
-.field private final ma:Lokio/c;
+.field private final lZ:Lokio/c;
 
 .field private peeked:I
 
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lT:Lokio/ByteString;
 
     const-string v0, "\"\\"
 
@@ -47,7 +47,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lV:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
 
     const-string v0, "{}[]:, \n\t\r\u000c/\\;#="
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lW:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lV:Lokio/ByteString;
 
     const-string v0, "\n\r"
 
@@ -63,7 +63,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lX:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lW:Lokio/ByteString;
 
     const-string v0, "*/"
 
@@ -71,7 +71,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/ByteString;
+    sput-object v0, Lcom/airbnb/lottie/e/a/e;->lX: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;->lZ:Lokio/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
 
-    invoke-interface {p1}, Lokio/d;->Hd()Lokio/c;
+    invoke-interface {p1}, Lokio/d;->Hg()Lokio/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iput-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     const/4 p1, 0x6
 
@@ -114,7 +114,7 @@
 .method private a(Ljava/lang/String;Lcom/airbnb/lottie/e/a/c$a;)I
     .locals 4
 
-    iget-object v0, p2, Lcom/airbnb/lottie/e/a/c$a;->lH:[Ljava/lang/String;
+    iget-object v0, p2, Lcom/airbnb/lottie/e/a/c$a;->lG:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -125,7 +125,7 @@
     :goto_0
     if-ge v2, v0, :cond_1
 
-    iget-object v3, p2, Lcom/airbnb/lottie/e/a/c$a;->lH:[Ljava/lang/String;
+    iget-object v3, p2, Lcom/airbnb/lottie/e/a/c$a;->lG:[Ljava/lang/String;
 
     aget-object v3, v3, v2
 
@@ -169,7 +169,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v3, v1, v2}, Lokio/c;->av(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;->ma:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v3, v1, v2}, Lokio/c;->ax(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;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {p1, v1, v2}, Lokio/c;->ax(J)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
     return-object p1
 
     :cond_2
-    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {p1, v1, v2}, Lokio/c;->ax(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;->ma:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->av(J)B
 
@@ -301,7 +301,7 @@
 
     if-ne v2, v3, :cond_0
 
-    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object p1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     add-long/2addr v0, v4
 
@@ -344,9 +344,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lX: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;->ma:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     if-eqz v2, :cond_1
 
-    sget-object v4, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/ByteString;
+    sget-object v4, Lcom/airbnb/lottie/e/a/e;->lX: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;->lF:[I
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lE:[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;->lF:[I
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->lE:[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;->ma:Lokio/c;
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lF:[I
+    iget-object v15, v0, Lcom/airbnb/lottie/e/a/e;->lE:[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;->ma:Lokio/c;
+    iget-object v14, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v6, v4, v5}, Lokio/c;->av(J)B
 
@@ -560,7 +560,7 @@
 
     if-ne v6, v14, :cond_a
 
-    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lF:[I
+    iget-object v6, v0, Lcom/airbnb/lottie/e/a/e;->lE:[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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v1, v4, v5}, Lokio/c;->av(J)B
 
@@ -691,7 +691,7 @@
     throw v1
 
     :cond_e
-    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lF:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/e/a/e;->lE:[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;->ma:Lokio/c;
+    iget-object v5, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v1}, Lokio/c;->readByte()B
 
-    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lW:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lV: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->ax(J)Ljava/lang/String;
 
@@ -1194,9 +1194,9 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1211,7 +1211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v11, v0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, v0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     int-to-long v2, v5
 
@@ -1712,7 +1712,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v6, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->ma:Lokio/c;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v1, v3, v4}, Lokio/c;->ax(J)Ljava/lang/String;
 
@@ -1908,7 +1908,7 @@
     throw v0
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v0, v3, v4}, Lokio/c;->aB(J)V
 
@@ -1989,15 +1989,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lX:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lW: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     const-wide/16 v3, -0x1
 
@@ -2028,15 +2028,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lW:Lokio/ByteString;
+    sget-object v1, Lcom/airbnb/lottie/e/a/e;->lV: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY:Lokio/d;
 
-    iget-object v3, p1, Lcom/airbnb/lottie/e/a/c$a;->lI:Lokio/k;
+    iget-object v3, p1, Lcom/airbnb/lottie/e/a/c$a;->lH:Lokio/k;
 
     invoke-interface {v0, v3}, Lokio/d;->a(Lokio/k;)I
 
@@ -2118,7 +2118,7 @@
 
     add-int/lit8 v2, v2, -0x1
 
-    iget-object p1, p1, Lcom/airbnb/lottie/e/a/c$a;->lH:[Ljava/lang/String;
+    iget-object p1, p1, Lcom/airbnb/lottie/e/a/c$a;->lG:[Ljava/lang/String;
 
     aget-object p1, p1, v0
 
@@ -2329,55 +2329,55 @@
     throw v0
 
     :pswitch_0
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lS:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_1
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lP:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_2
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lN:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_3
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lO:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_4
     sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lR:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
-    :pswitch_5
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lQ:Lcom/airbnb/lottie/e/a/c$b;
+    :pswitch_1
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lO:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
-    :pswitch_6
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lK:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_7
-    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lJ:Lcom/airbnb/lottie/e/a/c$b;
-
-    return-object v0
-
-    :pswitch_8
+    :pswitch_2
     sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lM:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
-    :pswitch_9
+    :pswitch_3
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lN:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_4
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lQ:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_5
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lP:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_6
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_7
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lI:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
+    :pswitch_8
     sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lL:Lcom/airbnb/lottie/e/a/c$b;
 
     return-object v0
 
+    :pswitch_9
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lK:Lcom/airbnb/lottie/e/a/c$b;
+
+    return-object v0
+
     nop
 
     :pswitch_data_0
@@ -2411,7 +2411,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->lG:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->lF:Z
 
     if-nez v0, :cond_5
 
@@ -2437,7 +2437,7 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lV:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
 
     invoke-direct {p0, v0}, Lcom/airbnb/lottie/e/a/e;->b(Lokio/ByteString;)V
 
@@ -2448,7 +2448,7 @@
 
     if-ne v0, v1, :cond_3
 
-    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lT: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;->lF:[I
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lE:[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;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ:Lokio/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lY: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;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lV:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lT: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;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lV:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lT: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;->lV:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lT: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;->lV:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lU: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;->lU:Lokio/ByteString;
+    sget-object v0, Lcom/airbnb/lottie/e/a/e;->lT: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;->ma:Lokio/c;
+    iget-object v0, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lG:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/e/a/e;->lF: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;->ma:Lokio/c;
+    iget-object v2, p0, Lcom/airbnb/lottie/e/a/e;->lZ: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;->lU:Lokio/ByteString;
+    sget-object v2, Lcom/airbnb/lottie/e/a/e;->lT: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;->lV:Lokio/ByteString;
+    sget-object v2, Lcom/airbnb/lottie/e/a/e;->lU: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;->lZ:Lokio/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/e/a/e;->lY: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 61f2671529..2f856edbef 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/aa;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/aa;->lg: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 eaab29ea4c..c25b5784ed 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 lD:Lcom/airbnb/lottie/e/ab;
+.field public static final lC: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;->lD:Lcom/airbnb/lottie/e/ab;
+    sput-object v0, Lcom/airbnb/lottie/e/ab;->lC: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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 8c63d470ec..15f359b78e 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 public static final lE:Lcom/airbnb/lottie/e/ac;
+.field public static final lD:Lcom/airbnb/lottie/e/ac;
 
-.field private static final lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/airbnb/lottie/e/ac;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/e/ac;->lE:Lcom/airbnb/lottie/e/ac;
+    sput-object v0, Lcom/airbnb/lottie/e/ac;->lD: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ac;->lg: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/ac;->lg: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;->lK:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v5, Lcom/airbnb/lottie/e/a/c$b;->lJ: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 de28f26580..c1038a91f5 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ad;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/ad;->lg: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 de21e8946b..38e955d64f 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ae;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/ae;->lg: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 94bdbe3465..0ed9e3e56c 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/af;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v4, Lcom/airbnb/lottie/e/af;->lg: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 a52014ad46..b97b71ccd0 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final lr:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lq: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ag;->lg: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;->lr:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ag;->lq: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v14, Lcom/airbnb/lottie/e/ag;->lg: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;->lr:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/ag;->lq: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;->el:Z
+    iput-boolean v14, v1, Lcom/airbnb/lottie/d;->ek: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 bd239e1532..0d307d5730 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/ah;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/ah;->lg: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 e0419dd4aa..f0d12d9d09 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 li:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lh:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static lj:Lcom/airbnb/lottie/e/a/c$a;
+.field private static li: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;->li:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v1, Lcom/airbnb/lottie/e/b;->lh: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;->lj:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/b;->li: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;->li:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/b;->lh: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;->lj:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/b;->li: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 846cea1f3f..95b5bad0f2 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static lk:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lj: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/c;->lg: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;->lk:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/c;->lj: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;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lK: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/c;->lg: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;->ej:F
+    iget v1, v8, Lcom/airbnb/lottie/d;->ei: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;->ms:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     if-nez v1, :cond_3
 
@@ -306,7 +306,7 @@
 
     const/4 v6, 0x0
 
-    iget v1, v8, Lcom/airbnb/lottie/d;->ej:F
+    iget v1, v8, Lcom/airbnb/lottie/d;->ei: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;->lD:Lcom/airbnb/lottie/e/ab;
+    sget-object v2, Lcom/airbnb/lottie/e/ab;->lC: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;->lk:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/c;->lj: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;->ms:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mr: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;->ms:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mr: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;->ms:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mr: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;->ms:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mr: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;->ms:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mr: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;->ms:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/airbnb/lottie/g/a;->mr: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 9b52bba0ef..3ed5e111cb 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;->ln:Lcom/airbnb/lottie/e/i;
+    sget-object v1, Lcom/airbnb/lottie/e/i;->lm: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;->ls:Lcom/airbnb/lottie/e/o;
+    sget-object v1, Lcom/airbnb/lottie/e/o;->lr: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;->lC:Lcom/airbnb/lottie/e/x;
+    sget-object v2, Lcom/airbnb/lottie/e/x;->lB: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;->lE:Lcom/airbnb/lottie/e/ac;
+    sget-object v2, Lcom/airbnb/lottie/e/ac;->lD: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;->ll:Lcom/airbnb/lottie/e/f;
+    sget-object v1, Lcom/airbnb/lottie/e/f;->lk: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 d303c37375..81cf7ce91a 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/e;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object p2, Lcom/airbnb/lottie/e/e;->lg: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 cab6ba13eb..93538e1e38 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 ll:Lcom/airbnb/lottie/e/f;
+.field public static final lk: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;->ll:Lcom/airbnb/lottie/e/f;
+    sput-object v0, Lcom/airbnb/lottie/e/f;->lk: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v0, Lcom/airbnb/lottie/e/a/c$b;->lI: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 ec4cc75217..2421795706 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/g;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/g;->lg: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 d5df1c20cc..c3c3334369 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field public static final lm:Lcom/airbnb/lottie/e/h;
+.field public static final ll: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;->lm:Lcom/airbnb/lottie/e/h;
+    sput-object v0, Lcom/airbnb/lottie/e/h;->ll: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/h;->lg: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;->hW:I
+    sget v0, Lcom/airbnb/lottie/c/b$a;->hV: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/h;->lg: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;->hW:I
+    sget v3, Lcom/airbnb/lottie/c/b$a;->hV:I
 
     sub-int/2addr v3, v1
 
@@ -262,7 +262,7 @@
 
     :cond_1
     :goto_1
-    sget v11, Lcom/airbnb/lottie/c/b$a;->hW:I
+    sget v11, Lcom/airbnb/lottie/c/b$a;->hV: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 d78b7b59bd..23226a0a04 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 ln:Lcom/airbnb/lottie/e/i;
+.field public static final lm: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;->ln:Lcom/airbnb/lottie/e/i;
+    sput-object v0, Lcom/airbnb/lottie/e/i;->lm: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 47cc622cdd..f61dc06c6f 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final lo:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final ln: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/j;->lg: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;->lo:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/j;->ln: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/j;->lg: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;->lo:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/j;->ln: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 31c9fae057..d5055fdf17 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/k;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v4, Lcom/airbnb/lottie/e/k;->lg: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 953ba41b9b..d0de173102 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 lp:I
+.field private lo:I
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
+    iput p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     move-object/from16 v2, p2
 
-    iget v3, v1, Lcom/airbnb/lottie/e/l;->lp:I
+    iget v3, v1, Lcom/airbnb/lottie/e/l;->lo: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;->iG:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     array-length v2, v2
 
     if-ge v7, v2, :cond_5
 
-    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v2, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     aget v2, v2, v7
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[F
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iE:[F
 
     aget v3, v3, v7
 
@@ -214,7 +214,7 @@
 
     move-result v2
 
-    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iG:[I
+    iget-object v3, v0, Lcom/airbnb/lottie/c/b/c;->iF:[I
 
     aput v2, v3, v7
 
@@ -244,7 +244,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lp:I
+    iget p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
 
     const/4 v0, -0x1
 
@@ -304,10 +304,10 @@
 
     div-int/lit8 p1, p1, 0x4
 
-    iput p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
+    iput p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
 
     :cond_4
-    iget p1, p0, Lcom/airbnb/lottie/e/l;->lp:I
+    iget p1, p0, Lcom/airbnb/lottie/e/l;->lo:I
 
     new-array v0, p1, [F
 
@@ -318,7 +318,7 @@
     const/4 v4, 0x0
 
     :goto_2
-    iget v5, p0, Lcom/airbnb/lottie/e/l;->lp:I
+    iget v5, p0, Lcom/airbnb/lottie/e/l;->lo: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 4242cbed9f..7c68d52f42 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final lq:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lp: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/m;->lg: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;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/m;->lp: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/m;->lg: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;->iU:I
+    sget v0, Lcom/airbnb/lottie/c/b/f;->iT:I
 
     goto :goto_2
 
     :cond_1
-    sget v0, Lcom/airbnb/lottie/c/b/f;->iV:I
+    sget v0, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     :goto_2
     move v5, v0
@@ -221,7 +221,7 @@
 
     if-eqz v2, :cond_4
 
-    sget-object v2, Lcom/airbnb/lottie/e/m;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/m;->lp: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 1f0f5130f6..355c79d326 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg:Lcom/airbnb/lottie/e/a/c$a;
+
+.field private static final lp:Lcom/airbnb/lottie/e/a/c$a;
 
 .field private static final lq:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final lr: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->lg: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;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->lp: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;->lr:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/n;->lq: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/n;->lg: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;->lr:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/n;->lq: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;->el:Z
+    iput-boolean v2, v1, Lcom/airbnb/lottie/d;->ek:Z
 
     move-object/from16 v3, v18
 
@@ -428,12 +428,12 @@
 
     if-ne v3, v2, :cond_8
 
-    sget v2, Lcom/airbnb/lottie/c/b/f;->iU:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->iT:I
 
     goto :goto_7
 
     :cond_8
-    sget v2, Lcom/airbnb/lottie/c/b/f;->iV:I
+    sget v2, Lcom/airbnb/lottie/c/b/f;->iU:I
 
     :goto_7
     move v5, v2
@@ -459,7 +459,7 @@
 
     if-eqz v3, :cond_b
 
-    sget-object v3, Lcom/airbnb/lottie/e/n;->lq:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/n;->lp: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 20fec43e6a..a35007ce0d 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 ls:Lcom/airbnb/lottie/e/o;
+.field public static final lr: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;->ls:Lcom/airbnb/lottie/e/o;
+    sput-object v0, Lcom/airbnb/lottie/e/o;->lr: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 95dca0c46e..4d885b3458 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 lu:[I
+.field static final synthetic lt:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[I
+    sput-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
 
     :try_start_0
-    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lu:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lP:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lO: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;->lu:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lu:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
 
-    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lK: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 7b76ce691a..d3e5f2fb82 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 lt:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final ls: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;->lt:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/p;->ls: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lu:[I
+    sget-object v1, Lcom/airbnb/lottie/e/p$1;->lt:[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;->lu:[I
+    sget-object v0, Lcom/airbnb/lottie/e/p$1;->lt:[I
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/e/a/c;->by()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;->lK:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v3, Lcom/airbnb/lottie/e/a/c$b;->lJ: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;->lt:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/p;->ls: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 9dbc7d3a0e..835a9d0500 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field static lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static lv:Landroidx/collection/SparseArrayCompat;
+.field private static lu: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/q;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v10, Lcom/airbnb/lottie/e/q;->lg: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;->mD:Landroid/graphics/PointF;
+    iput-object v14, v0, Lcom/airbnb/lottie/g/a;->mC:Landroid/graphics/PointF;
 
-    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
+    iput-object v15, v0, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
 
     return-object v0
 
@@ -460,7 +460,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->lv:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->lu: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;->lv:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->lu: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;->lv:Landroidx/collection/SparseArrayCompat;
+    sput-object v1, Lcom/airbnb/lottie/e/q;->lu:Landroidx/collection/SparseArrayCompat;
 
     :cond_0
-    sget-object v1, Lcom/airbnb/lottie/e/q;->lv:Landroidx/collection/SparseArrayCompat;
+    sget-object v1, Lcom/airbnb/lottie/e/q;->lu: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 6372686a48..972fa3b219 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/r;->lg: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;->lO:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lN: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/r;->lg: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lP:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v2, Lcom/airbnb/lottie/e/a/c$b;->lO: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;->ei:F
+    iget v4, v3, Lcom/airbnb/lottie/g/a;->eh: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;->mv:Ljava/lang/Float;
+    iput-object v4, v2, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
-    iget-object v4, v2, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v4, v2, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
     if-nez v4, :cond_0
 
-    iget-object v4, v3, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v4, v3, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     if-eqz v4, :cond_0
 
-    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
-    iput-object v3, v2, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iput-object v3, v2, Lcom/airbnb/lottie/g/a;->ms: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;->ms:Ljava/lang/Object;
+    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iget-object v1, v0, Lcom/airbnb/lottie/g/a;->ms: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 e2814249a6..abe1d6f3a3 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
+
+.field private static final lv:Lcom/airbnb/lottie/e/a/c$a;
 
 .field private static final lw:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final lx: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->lg: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;->lw:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->lv: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;->lx:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/s;->lw: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;->eh:Landroid/graphics/Rect;
+    iget-object v3, v0, Lcom/airbnb/lottie/d;->eg: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;->kF:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v6, Lcom/airbnb/lottie/c/c/d$a;->kE: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;->kN:I
+    sget v22, Lcom/airbnb/lottie/c/c/d$b;->kM:I
 
     const-string v3, "__container"
 
@@ -278,7 +278,7 @@
 
     move-object/from16 v7, p1
 
-    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kN:I
+    sget v1, Lcom/airbnb/lottie/c/c/d$b;->kM:I
 
     new-instance v10, Ljava/util/ArrayList;
 
@@ -361,7 +361,7 @@
 
     if-eqz v5, :cond_c
 
-    sget-object v5, Lcom/airbnb/lottie/e/s;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/s;->lg: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;->lx:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v6, Lcom/airbnb/lottie/e/s;->lw: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;->lw:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v5, Lcom/airbnb/lottie/e/s;->lv: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;->lm:Lcom/airbnb/lottie/e/h;
+    sget-object v3, Lcom/airbnb/lottie/e/h;->ll: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;->kL:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v5, Lcom/airbnb/lottie/c/c/d$a;->kK: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;->kL:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v16, Lcom/airbnb/lottie/c/c/d$a;->kK: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;->ej:F
+    iget v0, v7, Lcom/airbnb/lottie/d;->ei: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 05b2e9636b..054649d819 100644
--- a/com.discord/smali/com/airbnb/lottie/e/t.smali
+++ b/com.discord/smali/com/airbnb/lottie/e/t.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final lA:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg:Lcom/airbnb/lottie/e/a/c$a;
 
-.field private static final lh:Lcom/airbnb/lottie/e/a/c$a;
+.field static lx:Lcom/airbnb/lottie/e/a/c$a;
 
-.field static ly:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final ly:Lcom/airbnb/lottie/e/a/c$a;
 
 .field private static final lz:Lcom/airbnb/lottie/e/a/c$a;
 
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/e/t;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->lg: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;->ly:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->lx: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;->lz:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->ly: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;->lA:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/t;->lz: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;->ks:Lcom/airbnb/lottie/c/c/d$a;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/c/d;->kr:Lcom/airbnb/lottie/c/c/d$a;
 
-    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kH:Lcom/airbnb/lottie/c/c/d$a;
+    sget-object v3, Lcom/airbnb/lottie/c/c/d$a;->kG: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;->kr:J
+    iget-wide v2, v1, Lcom/airbnb/lottie/c/c/d;->kq: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;->ly:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v2, Lcom/airbnb/lottie/e/t;->lx: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;->kr:J
+    iget-wide v3, v2, Lcom/airbnb/lottie/c/c/d;->kq: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;->lA:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/t;->lz: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;->lz:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/t;->ly: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v11, Lcom/airbnb/lottie/e/t;->lg: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;->eh:Landroid/graphics/Rect;
+    iput-object v7, v9, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
 
-    iput v13, v9, Lcom/airbnb/lottie/d;->ei:F
+    iput v13, v9, Lcom/airbnb/lottie/d;->eh:F
 
-    iput v14, v9, Lcom/airbnb/lottie/d;->ej:F
+    iput v14, v9, Lcom/airbnb/lottie/d;->ei:F
 
-    iput v15, v9, Lcom/airbnb/lottie/d;->ek:F
+    iput v15, v9, Lcom/airbnb/lottie/d;->ej:F
 
-    iput-object v3, v9, Lcom/airbnb/lottie/d;->eg:Ljava/util/List;
+    iput-object v3, v9, Lcom/airbnb/lottie/d;->ef:Ljava/util/List;
 
-    iput-object v2, v9, Lcom/airbnb/lottie/d;->ef:Landroidx/collection/LongSparseArray;
+    iput-object v2, v9, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/LongSparseArray;
 
-    iput-object v4, v9, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
+    iput-object v4, v9, Lcom/airbnb/lottie/d;->dZ:Ljava/util/Map;
 
-    iput-object v5, v9, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
+    iput-object v5, v9, Lcom/airbnb/lottie/d;->ea:Ljava/util/Map;
 
-    iput-object v8, v9, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/SparseArrayCompat;
+    iput-object v8, v9, Lcom/airbnb/lottie/d;->ed:Landroidx/collection/SparseArrayCompat;
 
-    iput-object v0, v9, Lcom/airbnb/lottie/d;->ec:Ljava/util/Map;
+    iput-object v0, v9, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
 
     move-object/from16 v0, v18
 
-    iput-object v0, v9, Lcom/airbnb/lottie/d;->ed:Ljava/util/List;
+    iput-object v0, v9, Lcom/airbnb/lottie/d;->ec: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 e66e0d834d..670722c95e 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;->w(Ljava/lang/String;)V
 
-    sget v0, Lcom/airbnb/lottie/c/b/g$a;->ja:I
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->iZ:I
 
     goto/16 :goto_0
 
@@ -252,20 +252,20 @@
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/d;->s(Ljava/lang/String;)V
 
-    sget v0, Lcom/airbnb/lottie/c/b/g$a;->jc:I
-
-    goto/16 :goto_0
-
-    :cond_e
     sget v0, Lcom/airbnb/lottie/c/b/g$a;->jb:I
 
     goto/16 :goto_0
 
-    :cond_f
+    :cond_e
     sget v0, Lcom/airbnb/lottie/c/b/g$a;->ja:I
 
     goto/16 :goto_0
 
+    :cond_f
+    sget v0, Lcom/airbnb/lottie/c/b/g$a;->iZ: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 f65eac0e62..6e1397b306 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/v;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v3, Lcom/airbnb/lottie/e/v;->lg: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 f3d42e2e0b..8997d513ac 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 lB:Lcom/airbnb/lottie/e/w;
+.field public static final lA: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;->lB:Lcom/airbnb/lottie/e/w;
+    sput-object v0, Lcom/airbnb/lottie/e/w;->lA: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 a5b26b2774..10bc561091 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 lC:Lcom/airbnb/lottie/e/x;
+.field public static final lB: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;->lC:Lcom/airbnb/lottie/e/x;
+    sput-object v0, Lcom/airbnb/lottie/e/x;->lB: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;->lJ:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lI: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;->lL:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lK: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;->lP:Lcom/airbnb/lottie/e/a/c$b;
+    sget-object v1, Lcom/airbnb/lottie/e/a/c$b;->lO: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 b9239c9188..4bc9a4ef15 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static final lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/y;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v1, Lcom/airbnb/lottie/e/y;->lg: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 9bdcaf18d0..7dfe8feed9 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 lh:Lcom/airbnb/lottie/e/a/c$a;
+.field private static lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sput-object v0, Lcom/airbnb/lottie/e/z;->lg: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;->lh:Lcom/airbnb/lottie/e/a/c$a;
+    sget-object v0, Lcom/airbnb/lottie/e/z;->lg: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 eb66b69b60..569b195d57 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$1;->eF: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;->eG:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->eF: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;->eG:Lcom/airbnb/lottie/f;
+    iget-object p1, p0, Lcom/airbnb/lottie/f$1;->eF: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;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$1;->eF: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 a48a85aa52..c8163470e9 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eP:F
+.field final synthetic eO:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$10;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$10;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$10;->eP:F
+    iput p2, p0, Lcom/airbnb/lottie/f$10;->eO:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$10;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$10;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$10;->eP:F
+    iget v1, p0, Lcom/airbnb/lottie/f$10;->eO: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 c303baa47e..7b36ce83d0 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eJ:I
+.field final synthetic eI:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$11;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$11;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$11;->eJ:I
+    iput p2, p0, Lcom/airbnb/lottie/f$11;->eI:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$11;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$11;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$11;->eJ:I
+    iget v1, p0, Lcom/airbnb/lottie/f$11;->eI: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 8268ce8a8b..12256c0c74 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eQ:F
+.field final synthetic eP:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$12;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$12;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$12;->eQ:F
+    iput p2, p0, Lcom/airbnb/lottie/f$12;->eP:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$12;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$12;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$12;->eQ:F
+    iget v1, p0, Lcom/airbnb/lottie/f$12;->eP: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 a62402949b..d2890de547 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eH:Ljava/lang/String;
+.field final synthetic eG: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$13;->eF:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$13;->eH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$13;->eG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$13;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$13;->eF:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$13;->eH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$13;->eG: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 a8c41a96e5..906c5521c7 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eH:Ljava/lang/String;
+.field final synthetic eG: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$14;->eF:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$14;->eH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$14;->eG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$14;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$14;->eF:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$14;->eH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$14;->eG: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 8912311ddc..250f466901 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eH:Ljava/lang/String;
+.field final synthetic eG: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$2;->eF:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$2;->eH:Ljava/lang/String;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$2;->eG:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$2;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$2;->eF:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$2;->eH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$2;->eG: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 75baa3b69a..c25e22605f 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
+
+.field final synthetic eH:I
 
 .field final synthetic eI:I
 
-.field final synthetic eJ:I
-
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;II)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$3;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$3;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$3;->eI:I
+    iput p2, p0, Lcom/airbnb/lottie/f$3;->eH:I
 
-    iput p3, p0, Lcom/airbnb/lottie/f$3;->eJ:I
+    iput p3, p0, Lcom/airbnb/lottie/f$3;->eI:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,11 +45,11 @@
 .method public final aP()V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$3;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$3;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$3;->eI:I
+    iget v1, p0, Lcom/airbnb/lottie/f$3;->eH:I
 
-    iget v2, p0, Lcom/airbnb/lottie/f$3;->eJ:I
+    iget v2, p0, Lcom/airbnb/lottie/f$3;->eI: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 301e2339fb..b9173f025a 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eK:I
+.field final synthetic eJ:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$4;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$4;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$4;->eK:I
+    iput p2, p0, Lcom/airbnb/lottie/f$4;->eJ:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$4;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$4;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$4;->eK:I
+    iget v1, p0, Lcom/airbnb/lottie/f$4;->eJ: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 03cc651ad7..fd0149e36e 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eL:F
+.field final synthetic eK:F
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;F)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$5;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$5;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$5;->eL:F
+    iput p2, p0, Lcom/airbnb/lottie/f$5;->eK:F
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$5;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$5;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$5;->eL:F
+    iget v1, p0, Lcom/airbnb/lottie/f$5;->eK: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 310fb78161..23f0f8fe4c 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eM:Lcom/airbnb/lottie/c/e;
+.field final synthetic eL:Lcom/airbnb/lottie/c/e;
 
-.field final synthetic eN:Ljava/lang/Object;
+.field final synthetic eM:Ljava/lang/Object;
 
-.field final synthetic eO:Lcom/airbnb/lottie/g/c;
+.field final synthetic eN: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$6;->eF:Lcom/airbnb/lottie/f;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/f$6;->eM:Lcom/airbnb/lottie/c/e;
+    iput-object p2, p0, Lcom/airbnb/lottie/f$6;->eL:Lcom/airbnb/lottie/c/e;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/f$6;->eN:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/airbnb/lottie/f$6;->eM:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/f$6;->eO:Lcom/airbnb/lottie/g/c;
+    iput-object p4, p0, Lcom/airbnb/lottie/f$6;->eN:Lcom/airbnb/lottie/g/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,13 +49,13 @@
 .method public final aP()V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$6;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$6;->eF:Lcom/airbnb/lottie/f;
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f$6;->eM:Lcom/airbnb/lottie/c/e;
+    iget-object v1, p0, Lcom/airbnb/lottie/f$6;->eL:Lcom/airbnb/lottie/c/e;
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f$6;->eN:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/airbnb/lottie/f$6;->eM:Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f$6;->eO:Lcom/airbnb/lottie/g/c;
+    iget-object v3, p0, Lcom/airbnb/lottie/f$6;->eN: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 e18ea55b49..f09a87c173 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$7;->eF:Lcom/airbnb/lottie/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final aP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$7;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$7;->eF:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aE()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$8.smali b/com.discord/smali/com/airbnb/lottie/f$8.smali
index c5650b380b..fb0911b6de 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF: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;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$8;->eF:Lcom/airbnb/lottie/f;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final aP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$8;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$8;->eF:Lcom/airbnb/lottie/f;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f;->aM()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f$9.smali b/com.discord/smali/com/airbnb/lottie/f$9.smali
index 0ed31d9d55..14c510d898 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 eG:Lcom/airbnb/lottie/f;
+.field final synthetic eF:Lcom/airbnb/lottie/f;
 
-.field final synthetic eI:I
+.field final synthetic eH:I
 
 
 # direct methods
 .method constructor <init>(Lcom/airbnb/lottie/f;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f$9;->eG:Lcom/airbnb/lottie/f;
+    iput-object p1, p0, Lcom/airbnb/lottie/f$9;->eF:Lcom/airbnb/lottie/f;
 
-    iput p2, p0, Lcom/airbnb/lottie/f$9;->eI:I
+    iput p2, p0, Lcom/airbnb/lottie/f$9;->eH:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,9 +41,9 @@
 .method public final aP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f$9;->eG:Lcom/airbnb/lottie/f;
+    iget-object v0, p0, Lcom/airbnb/lottie/f$9;->eF:Lcom/airbnb/lottie/f;
 
-    iget v1, p0, Lcom/airbnb/lottie/f$9;->eI:I
+    iget v1, p0, Lcom/airbnb/lottie/f$9;->eH: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 992da171b9..55d7ef5734 100644
--- a/com.discord/smali/com/airbnb/lottie/f.smali
+++ b/com.discord/smali/com/airbnb/lottie/f.smali
@@ -22,27 +22,25 @@
 # instance fields
 .field private alpha:I
 
-.field public dT:Lcom/airbnb/lottie/d;
+.field public dS:Lcom/airbnb/lottie/d;
 
-.field dX:Ljava/lang/String;
+.field dW:Ljava/lang/String;
 
-.field public eA:Lcom/airbnb/lottie/b/a;
+.field public eA:Lcom/airbnb/lottie/a;
 
-.field public eB:Lcom/airbnb/lottie/a;
+.field public eB:Lcom/airbnb/lottie/p;
 
-.field public eC:Lcom/airbnb/lottie/p;
+.field public eC:Z
 
-.field public eD:Z
+.field private eD:Lcom/airbnb/lottie/c/c/b;
 
-.field private eE:Lcom/airbnb/lottie/c/c/b;
+.field eE:Z
 
-.field eF:Z
+.field final et:Lcom/airbnb/lottie/f/e;
 
-.field final eu:Lcom/airbnb/lottie/f/e;
+.field private eu:Z
 
-.field private ev:Z
-
-.field private final ew:Ljava/util/Set;
+.field private final ev:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -52,7 +50,7 @@
     .end annotation
 .end field
 
-.field final ex:Ljava/util/ArrayList;
+.field final ew:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -62,9 +60,11 @@
     .end annotation
 .end field
 
-.field ey:Lcom/airbnb/lottie/b/b;
+.field ex:Lcom/airbnb/lottie/b/b;
 
-.field ez:Lcom/airbnb/lottie/b;
+.field ey:Lcom/airbnb/lottie/b;
+
+.field public ez:Lcom/airbnb/lottie/b/a;
 
 .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;->eu:Lcom/airbnb/lottie/f/e;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->ev:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f;->eu:Z
 
     new-instance v0, Ljava/util/HashSet;
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ev: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;->ex:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object p0, p0, Lcom/airbnb/lottie/f;->eD: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;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eD: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;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->eD: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->eg:Ljava/util/List;
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->ef:Ljava/util/List;
 
-    iget-object v3, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dS: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;->eE:Lcom/airbnb/lottie/c/c/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
 
     return-void
 .end method
@@ -226,7 +226,7 @@
 .method private aO()V
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS: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;->eh:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->eg: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v2, v2, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v2, v2, Lcom/airbnb/lottie/d;->eg: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object p0, p0, Lcom/airbnb/lottie/f;->et: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     int-to-float p1, p1
 
@@ -325,11 +325,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ig:Lcom/airbnb/lottie/c/f;
+    iget-object v0, p1, Lcom/airbnb/lottie/c/e;->if: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;->ig:Lcom/airbnb/lottie/c/f;
+    iget-object p1, p1, Lcom/airbnb/lottie/c/e;->if: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;->ig:Lcom/airbnb/lottie/c/f;
+    iget-object v3, v3, Lcom/airbnb/lottie/c/e;->if: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;->fu:Ljava/lang/Float;
+    sget-object p1, Lcom/airbnb/lottie/j;->ft:Ljava/lang/Float;
 
     if-ne p2, p1, :cond_4
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object p1, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {p1}, Lcom/airbnb/lottie/f/e;->bE()F
 
@@ -418,7 +418,7 @@
 .method public final a(Lcom/airbnb/lottie/d;)Z
     .locals 5
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     const/4 v1, 0x0
 
@@ -431,13 +431,13 @@
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f;->aL()V
 
-    iput-object p1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f;->aK()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
-    iget-object v2, v0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v2, v0, Lcom/airbnb/lottie/f/e;->dS: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;->dT:Lcom/airbnb/lottie/d;
+    iput-object p1, v0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz v1, :cond_2
 
-    iget v1, v0, Lcom/airbnb/lottie/f/e;->mk:F
+    iget v1, v0, Lcom/airbnb/lottie/f/e;->mj:F
 
-    iget v2, p1, Lcom/airbnb/lottie/d;->ei:F
+    iget v2, p1, Lcom/airbnb/lottie/d;->eh: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;->ml:F
+    iget v2, v0, Lcom/airbnb/lottie/f/e;->mk:F
 
-    iget v4, p1, Lcom/airbnb/lottie/d;->ej:F
+    iget v4, p1, Lcom/airbnb/lottie/d;->ei: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;->ei:F
+    iget v1, p1, Lcom/airbnb/lottie/d;->eh:F
 
     float-to-int v1, v1
 
     int-to-float v1, v1
 
-    iget v2, p1, Lcom/airbnb/lottie/d;->ej:F
+    iget v2, p1, Lcom/airbnb/lottie/d;->ei: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;->mj:F
+    iget v1, v0, Lcom/airbnb/lottie/f/e;->mi:F
 
     const/4 v2, 0x0
 
-    iput v2, v0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v2, v0, Lcom/airbnb/lottie/f/e;->mi: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->ex:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->ew: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;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eF:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eE:Z
 
     invoke-virtual {p1, v0}, Lcom/airbnb/lottie/d;->setPerformanceTrackingEnabled(Z)V
 
@@ -562,11 +562,11 @@
 .method public final aE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ev:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eu:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aE()V
 
     :cond_2
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->ev:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eu:Z
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
-    iget v0, v0, Lcom/airbnb/lottie/f/e;->mg:F
+    iget v0, v0, Lcom/airbnb/lottie/f/e;->mf:F
 
     const/4 v1, 0x0
 
@@ -609,7 +609,7 @@
 
     if-gez v0, :cond_3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->getMaxFrame()F
 
@@ -636,11 +636,11 @@
 .method public final aF()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aF()V
 
@@ -650,7 +650,7 @@
 .method public final aL()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->dT:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aL()V
 
@@ -683,11 +683,11 @@
 .method public final aM()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->aM()V
 
@@ -708,13 +708,13 @@
 .method public final aN()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eC:Lcom/airbnb/lottie/p;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->eB:Lcom/airbnb/lottie/p;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->ee:Landroidx/collection/SparseArrayCompat;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->ed: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;->ev:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->eu: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;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->eD: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v3, v3, Lcom/airbnb/lottie/d;->eg: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v4, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v4, v4, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v4, v4, Lcom/airbnb/lottie/d;->eg: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v3, v3, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v3, v3, Lcom/airbnb/lottie/d;->eg: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v6, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v6, v6, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v6, v6, Lcom/airbnb/lottie/d;->eg: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;->eE:Lcom/airbnb/lottie/c/c/b;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->eD:Lcom/airbnb/lottie/c/c/b;
 
     iget-object v2, p0, Lcom/airbnb/lottie/f;->matrix:Landroid/graphics/Matrix;
 
@@ -906,7 +906,7 @@
 .method public final f(Z)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eD:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f;->eC:Z
 
     if-ne v0, p1, :cond_0
 
@@ -926,9 +926,9 @@
     return-void
 
     :cond_1
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->eD:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f;->eC:Z
 
-    iget-object p1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz p1, :cond_2
 
@@ -949,7 +949,7 @@
 .method public getIntrinsicHeight()I
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -958,7 +958,7 @@
     return v0
 
     :cond_0
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
@@ -978,7 +978,7 @@
 .method public getIntrinsicWidth()I
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -987,7 +987,7 @@
     return v0
 
     :cond_0
-    iget-object v0, v0, Lcom/airbnb/lottie/d;->eh:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/airbnb/lottie/d;->eg:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -1058,7 +1058,7 @@
 .method public isRunning()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et:Lcom/airbnb/lottie/f/e;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/f/e;->isRunning()Z
 
@@ -1107,11 +1107,11 @@
 .method public final setFrame(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ei:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->eh:F
 
-    iget v0, v0, Lcom/airbnb/lottie/c/h;->ik:F
+    iget v0, v0, Lcom/airbnb/lottie/c/h;->ij: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->ej:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ei: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ei:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->eh:F
 
     float-to-int p1, p1
 
-    iget v0, v0, Lcom/airbnb/lottie/c/h;->ik:F
+    iget v0, v0, Lcom/airbnb/lottie/c/h;->ij: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ei:F
+    iget p1, v0, Lcom/airbnb/lottie/c/h;->eh: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->ej:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ei: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew: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;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
 
-    iget-object v1, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget v1, v1, Lcom/airbnb/lottie/d;->ej:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ei: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;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->ex:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ew:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->eu:Lcom/airbnb/lottie/f/e;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->et: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;->ey:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->ey:Lcom/airbnb/lottie/b/b;
+    iput-object v1, p0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
 
     :cond_5
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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;->dX:Ljava/lang/String;
+    iget-object v3, p0, Lcom/airbnb/lottie/f;->dW:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/airbnb/lottie/f;->ez:Lcom/airbnb/lottie/b;
+    iget-object v4, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b;
 
-    iget-object v5, p0, Lcom/airbnb/lottie/f;->dT:Lcom/airbnb/lottie/d;
+    iget-object v5, p0, Lcom/airbnb/lottie/f;->dS:Lcom/airbnb/lottie/d;
 
-    iget-object v5, v5, Lcom/airbnb/lottie/d;->eb:Ljava/util/Map;
+    iget-object v5, v5, Lcom/airbnb/lottie/d;->ea: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;->ey:Lcom/airbnb/lottie/b/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/f;->ex:Lcom/airbnb/lottie/b/b;
 
     :cond_6
-    iget-object v0, p0, Lcom/airbnb/lottie/f;->ey:Lcom/airbnb/lottie/b/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/f;->ex: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 8f04ff0b6f..789a8949cf 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 mb:Ljava/util/Set;
+.field private final ma:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private final mc:Ljava/util/Set;
+.field private final mb: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;->mb:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->ma: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;->mc:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/a;->mb: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;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb: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;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->ma:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -71,7 +71,7 @@
 .method final bB()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -101,7 +101,7 @@
 .method final bC()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -131,7 +131,7 @@
 .method final bD()V
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->ma:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -173,7 +173,7 @@
 .method final h(Z)V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -214,7 +214,7 @@
 .method public final i(Z)V
     .locals 4
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -255,7 +255,7 @@
 .method public removeAllListeners()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
@@ -265,7 +265,7 @@
 .method public removeAllUpdateListeners()V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->ma:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
@@ -275,7 +275,7 @@
 .method public removeListener(Landroid/animation/Animator$AnimatorListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mc:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -285,7 +285,7 @@
 .method public removeUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->mb:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/a;->ma: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 6328fb4725..259358a14b 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 md:Ljava/util/Set;
+.field private static final mc: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;->md:Ljava/util/Set;
+    sput-object v0, Lcom/airbnb/lottie/f/c;->mc: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;->md:Ljava/util/Set;
+    sget-object v0, Lcom/airbnb/lottie/f/c;->mc: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;->md:Ljava/util/Set;
+    sget-object p2, Lcom/airbnb/lottie/f/c;->mc: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 ee1056a361..8add665f55 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 mf:Lcom/airbnb/lottie/i;
+.field private static md: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;->mf:Lcom/airbnb/lottie/i;
+    sput-object v0, Lcom/airbnb/lottie/f/d;->md: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;->mf:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->md: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 v(Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/f/d;->mf:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->md:Lcom/airbnb/lottie/i;
 
     invoke-interface {v0, p0}, Lcom/airbnb/lottie/i;->v(Ljava/lang/String;)V
 
@@ -43,7 +43,7 @@
 .method public static w(Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/airbnb/lottie/f/d;->mf:Lcom/airbnb/lottie/i;
+    sget-object v0, Lcom/airbnb/lottie/f/d;->md:Lcom/airbnb/lottie/i;
 
     invoke-interface {v0, p0}, Lcom/airbnb/lottie/i;->w(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 6207cb7deb..17c9c6e12a 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 dT:Lcom/airbnb/lottie/d;
+.field public dS:Lcom/airbnb/lottie/d;
 
-.field public mg:F
+.field public mf:F
 
-.field private mh:Z
+.field private mg:Z
 
-.field private mi:J
+.field private mh:J
+
+.field public mi:F
 
 .field public mj:F
 
 .field public mk:F
 
-.field public ml: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;->mg:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mh:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mg:Z
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iput-wide v1, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     iput v0, p0, Lcom/airbnb/lottie/f/e;->repeatCount:I
 
     const/high16 v1, -0x31000000
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     const/high16 v1, 0x4f000000
 
-    iput v1, p0, Lcom/airbnb/lottie/f/e;->ml:F
+    iput v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->running:Z
 
@@ -66,11 +66,11 @@
 .method private bF()V
     .locals 1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
 
     neg-float v0, v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
 
     return-void
 .end method
@@ -107,7 +107,7 @@
 
     if-gtz v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS: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;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
 
     :goto_0
-    iget-object v1, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v1, p0, Lcom/airbnb/lottie/f/e;->dS: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;->ej:F
+    iget v1, v1, Lcom/airbnb/lottie/d;->ei: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;->mk:F
+    iput v2, p0, Lcom/airbnb/lottie/f/e;->mj: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;->ml:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-static {v0, p1, p2}, Lcom/airbnb/lottie/f/g;->clamp(FFF)F
 
@@ -226,7 +226,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     const/4 v0, 0x0
 
@@ -252,15 +252,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iput-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     const/high16 v0, -0x31000000
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     const/high16 v0, 0x4f000000
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->ml:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     return-void
 .end method
@@ -276,7 +276,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bG()Z
 
@@ -284,7 +284,7 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -298,7 +298,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     return-void
 
@@ -309,7 +309,7 @@
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMaxFrame()F
 
@@ -323,7 +323,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     :cond_1
     return-void
@@ -332,7 +332,7 @@
 .method public final bE()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -341,19 +341,19 @@
     return v0
 
     :cond_0
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
 
     sub-float/2addr v1, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->ej:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
 
-    iget-object v2, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
-    iget v2, v2, Lcom/airbnb/lottie/d;->ei:F
+    iget v2, v2, Lcom/airbnb/lottie/d;->eh:F
 
     sub-float/2addr v0, v2
 
@@ -365,7 +365,7 @@
 .method public bG()Z
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
 
     const/4 v1, 0x0
 
@@ -400,7 +400,7 @@
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f/e;->postFrameCallback()V
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz v0, :cond_a
 
@@ -413,7 +413,7 @@
     goto/16 :goto_6
 
     :cond_0
-    iget-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iget-wide v0, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     const-wide/16 v2, 0x0
 
@@ -427,7 +427,7 @@
     sub-long v2, p1, v0
 
     :goto_0
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_2
 
@@ -438,11 +438,11 @@
     :cond_2
     const v1, 0x4e6e6b28    # 1.0E9f
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->ek:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->ej:F
 
     div-float/2addr v1, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mg:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mf:F
 
     invoke-static {v0}, Ljava/lang/Math;->abs(F)F
 
@@ -455,7 +455,7 @@
 
     div-float/2addr v1, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bG()Z
 
@@ -468,9 +468,9 @@
     :cond_3
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -488,7 +488,7 @@
 
     xor-int/2addr v0, v1
 
-    iget v2, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v2, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -502,9 +502,9 @@
 
     move-result v2
 
-    iput v2, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v2, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
-    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bD()V
 
@@ -528,7 +528,7 @@
 
     if-lt v0, v3, :cond_5
 
-    iget p1, p0, Lcom/airbnb/lottie/f/e;->mg:F
+    iget p1, p0, Lcom/airbnb/lottie/f/e;->mf:F
 
     const/4 p2, 0x0
 
@@ -548,7 +548,7 @@
     move-result p1
 
     :goto_2
-    iput p1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput p1, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0, v1}, Lcom/airbnb/lottie/f/e;->j(Z)V
 
@@ -575,11 +575,11 @@
 
     if-ne v0, v2, :cond_6
 
-    iget-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mh:Z
+    iget-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mg:Z
 
     xor-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mh:Z
+    iput-boolean v0, p0, Lcom/airbnb/lottie/f/e;->mg:Z
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f/e;->bF()V
 
@@ -604,26 +604,26 @@
     move-result v0
 
     :goto_3
-    iput v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     :goto_4
-    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iput-wide p1, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     :cond_8
     :goto_5
-    iget-object p1, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object p1, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-eqz p1, :cond_a
 
-    iget p1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget p1, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
-    iget p2, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iget p2, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     cmpg-float p2, p1, p2
 
     if-ltz p2, :cond_9
 
-    iget p2, p0, Lcom/airbnb/lottie/f/e;->ml:F
+    iget p2, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     cmpl-float p1, p1, p2
 
@@ -640,7 +640,7 @@
 
     const/4 v0, 0x0
 
-    iget v3, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iget v3, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     invoke-static {v3}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -648,7 +648,7 @@
 
     aput-object v3, p2, v0
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->ml:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -656,7 +656,7 @@
 
     aput-object v0, p2, v1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-static {v0}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
 
@@ -682,7 +682,7 @@
 .method public final e(F)V
     .locals 1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
 
     invoke-virtual {p0, v0, p1}, Lcom/airbnb/lottie/f/e;->a(FF)V
 
@@ -692,7 +692,7 @@
 .method public final getAnimatedFraction()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -711,7 +711,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v1, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     sub-float/2addr v0, v1
 
@@ -731,7 +731,7 @@
     return v0
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->getMinFrame()F
 
@@ -767,7 +767,7 @@
 .method public final getDuration()J
     .locals 2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -788,35 +788,7 @@
 .method public final getMaxFrame()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dT: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;->ml:F
-
-    const/high16 v2, 0x4f000000
-
-    cmpl-float v2, v1, v2
-
-    if-nez v2, :cond_1
-
-    iget v0, v0, Lcom/airbnb/lottie/d;->ej: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;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS:Lcom/airbnb/lottie/d;
 
     if-nez v0, :cond_0
 
@@ -827,7 +799,7 @@
     :cond_0
     iget v1, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
-    const/high16 v2, -0x31000000
+    const/high16 v2, 0x4f000000
 
     cmpl-float v2, v1, v2
 
@@ -841,6 +813,34 @@
     return v1
 .end method
 
+.method public final getMinFrame()F
+    .locals 3
+
+    iget-object v0, p0, Lcom/airbnb/lottie/f/e;->dS: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;->mj:F
+
+    const/high16 v2, -0x31000000
+
+    cmpl-float v2, v1, v2
+
+    if-nez v2, :cond_1
+
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
+
+    return v0
+
+    :cond_1
+    return v1
+.end method
+
 .method public final isRunning()Z
     .locals 1
 
@@ -871,7 +871,7 @@
 .method public final setFrame(I)V
     .locals 2
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     int-to-float p1, p1
 
@@ -894,11 +894,11 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/airbnb/lottie/f/e;->mj:F
+    iput p1, p0, Lcom/airbnb/lottie/f/e;->mi:F
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mi:J
+    iput-wide v0, p0, Lcom/airbnb/lottie/f/e;->mh:J
 
     invoke-virtual {p0}, Lcom/airbnb/lottie/f/e;->bD()V
 
@@ -910,7 +910,7 @@
 
     int-to-float p1, p1
 
-    iget v0, p0, Lcom/airbnb/lottie/f/e;->ml:F
+    iget v0, p0, Lcom/airbnb/lottie/f/e;->mk:F
 
     float-to-int v0, v0
 
@@ -930,13 +930,13 @@
 
     if-eq p1, v0, :cond_0
 
-    iget-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mh:Z
+    iget-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mg:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mh:Z
+    iput-boolean p1, p0, Lcom/airbnb/lottie/f/e;->mg:Z
 
     invoke-direct {p0}, Lcom/airbnb/lottie/f/e;->bF()V
 
diff --git a/com.discord/smali/com/airbnb/lottie/f/f.smali b/com.discord/smali/com/airbnb/lottie/f/f.smali
index 0d204327f5..64c1ee28e4 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 mm:F
+.field public ml:F
 
-.field public mn:I
+.field public mm: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 9e262516b0..030d02326a 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 mo:Landroid/graphics/PointF;
+.field private static mn: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;->mo:Landroid/graphics/PointF;
+    sput-object v0, Lcom/airbnb/lottie/f/g;->mn: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;->jy:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/airbnb/lottie/c/b/l;->jx: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;->mo:Landroid/graphics/PointF;
+    sget-object v1, Lcom/airbnb/lottie/f/g;->mn: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;->jx:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->jw: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;->jx:Ljava/util/List;
+    iget-object v1, p0, Lcom/airbnb/lottie/c/b/l;->jw: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;->hJ:Landroid/graphics/PointF;
+    iget-object v2, v1, Lcom/airbnb/lottie/c/a;->hI:Landroid/graphics/PointF;
 
-    iget-object v3, v1, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
+    iget-object v3, v1, Lcom/airbnb/lottie/c/a;->hJ:Landroid/graphics/PointF;
 
-    iget-object v1, v1, Lcom/airbnb/lottie/c/a;->hL:Landroid/graphics/PointF;
+    iget-object v1, v1, Lcom/airbnb/lottie/c/a;->hK:Landroid/graphics/PointF;
 
-    sget-object v4, Lcom/airbnb/lottie/f/g;->mo:Landroid/graphics/PointF;
+    sget-object v4, Lcom/airbnb/lottie/f/g;->mn: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;->mo:Landroid/graphics/PointF;
+    sget-object v2, Lcom/airbnb/lottie/f/g;->mn: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 cb7b133cc7..3287e14ae0 100644
--- a/com.discord/smali/com/airbnb/lottie/f/h.smali
+++ b/com.discord/smali/com/airbnb/lottie/f/h.smali
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field private static final he:Landroid/graphics/PathMeasure;
+.field private static final hd:Landroid/graphics/PathMeasure;
 
-.field private static final hh:Landroid/graphics/Path;
+.field private static final hg:Landroid/graphics/Path;
 
-.field private static final kS:[F
+.field private static final kR:[F
 
-.field private static final mp:Landroid/graphics/Path;
+.field private static final mo:Landroid/graphics/Path;
 
-.field private static final mq:F
+.field private static final mp:F
 
-.field private static mr:F
+.field private static mq:F
 
 
 # direct methods
@@ -25,25 +25,25 @@
 
     invoke-direct {v0}, Landroid/graphics/PathMeasure;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->hd: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;->hh:Landroid/graphics/Path;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->hg: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;->mp:Landroid/graphics/Path;
+    sput-object v0, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [F
 
-    sput-object v0, Lcom/airbnb/lottie/f/h;->kS:[F
+    sput-object v0, Lcom/airbnb/lottie/f/h;->kR:[F
 
     const-wide/high16 v0, 0x4000000000000000L    # 2.0
 
@@ -53,11 +53,11 @@
 
     double-to-float v0, v0
 
-    sput v0, Lcom/airbnb/lottie/f/h;->mq:F
+    sput v0, Lcom/airbnb/lottie/f/h;->mp:F
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    sput v0, Lcom/airbnb/lottie/f/h;->mr:F
+    sput v0, Lcom/airbnb/lottie/f/h;->mq:F
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 .method public static a(Landroid/graphics/Matrix;)F
     .locals 6
 
-    sget-object v0, Lcom/airbnb/lottie/f/h;->kS:[F
+    sget-object v0, Lcom/airbnb/lottie/f/h;->kR:[F
 
     const/4 v1, 0x0
 
@@ -77,7 +77,7 @@
 
     aput v1, v0, v3
 
-    sget v1, Lcom/airbnb/lottie/f/h;->mq:F
+    sget v1, Lcom/airbnb/lottie/f/h;->mp:F
 
     const/4 v4, 0x2
 
@@ -89,7 +89,7 @@
 
     invoke-virtual {p0, v0}, Landroid/graphics/Matrix;->mapPoints([F)V
 
-    sget-object p0, Lcom/airbnb/lottie/f/h;->kS:[F
+    sget-object p0, Lcom/airbnb/lottie/f/h;->kR:[F
 
     aget v0, p0, v4
 
@@ -304,13 +304,13 @@
 
     invoke-static {v0}, Lcom/airbnb/lottie/c;->beginSection(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
+    sget-object v1, Lcom/airbnb/lottie/f/h;->hd: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;->he:Landroid/graphics/PathMeasure;
+    sget-object v1, Lcom/airbnb/lottie/f/h;->hd: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;->hh:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->hg:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
 
-    sget-object p3, Lcom/airbnb/lottie/f/h;->hh:Landroid/graphics/Path;
+    sget-object p3, Lcom/airbnb/lottie/f/h;->hg:Landroid/graphics/Path;
 
     const/4 v4, 0x1
 
@@ -451,21 +451,21 @@
 
     if-lez p2, :cond_7
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
 
     invoke-virtual {p2}, Landroid/graphics/Path;->reset()V
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
 
     rem-float/2addr p1, v1
 
-    sget-object p3, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
+    sget-object p3, Lcom/airbnb/lottie/f/h;->mo: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;->hh:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hg:Landroid/graphics/Path;
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mo: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;->mp:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->mo:Landroid/graphics/Path;
 
     invoke-virtual {p1}, Landroid/graphics/Path;->reset()V
 
-    sget-object p1, Lcom/airbnb/lottie/f/h;->he:Landroid/graphics/PathMeasure;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hd:Landroid/graphics/PathMeasure;
 
     add-float/2addr v2, v1
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mo: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;->hh:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hg:Landroid/graphics/Path;
 
-    sget-object p2, Lcom/airbnb/lottie/f/h;->mp:Landroid/graphics/Path;
+    sget-object p2, Lcom/airbnb/lottie/f/h;->mo: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;->hh:Landroid/graphics/Path;
+    sget-object p1, Lcom/airbnb/lottie/f/h;->hg: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;->fZ:Z
+    iget-boolean v0, p1, Lcom/airbnb/lottie/a/a/s;->fY:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/airbnb/lottie/a/a/s;->gK:Lcom/airbnb/lottie/a/b/a;
+    iget-object v0, p1, Lcom/airbnb/lottie/a/a/s;->gJ: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;->gL:Lcom/airbnb/lottie/a/b/a;
+    iget-object v1, p1, Lcom/airbnb/lottie/a/a/s;->gK: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;->gM:Lcom/airbnb/lottie/a/b/a;
+    iget-object p1, p1, Lcom/airbnb/lottie/a/a/s;->gL:Lcom/airbnb/lottie/a/b/a;
 
     check-cast p1, Lcom/airbnb/lottie/a/b/c;
 
@@ -604,7 +604,7 @@
 .method public static b(Landroid/graphics/Matrix;)Z
     .locals 6
 
-    sget-object v0, Lcom/airbnb/lottie/f/h;->kS:[F
+    sget-object v0, Lcom/airbnb/lottie/f/h;->kR:[F
 
     const/4 v1, 0x0
 
@@ -630,7 +630,7 @@
 
     invoke-virtual {p0, v0}, Landroid/graphics/Matrix;->mapPoints([F)V
 
-    sget-object p0, Lcom/airbnb/lottie/f/h;->kS:[F
+    sget-object p0, Lcom/airbnb/lottie/f/h;->kR:[F
 
     aget v0, p0, v2
 
@@ -661,7 +661,7 @@
 .method public static bH()F
     .locals 2
 
-    sget v0, Lcom/airbnb/lottie/f/h;->mr:F
+    sget v0, Lcom/airbnb/lottie/f/h;->mq: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;->mr:F
+    sput v0, Lcom/airbnb/lottie/f/h;->mq:F
 
     :cond_0
-    sget v0, Lcom/airbnb/lottie/f/h;->mr:F
+    sget v0, Lcom/airbnb/lottie/f/h;->mq: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 dc5a875adc..569f5d194a 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 public final eR:Ljava/lang/String;
+.field public final eQ:Ljava/lang/String;
 
-.field private final eS:Ljava/lang/String;
+.field private final eR:Ljava/lang/String;
 
-.field public eT:Landroid/graphics/Bitmap;
+.field public eS:Landroid/graphics/Bitmap;
 
 .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;->eR:Ljava/lang/String;
+    iput-object p4, p0, Lcom/airbnb/lottie/g;->eQ:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/airbnb/lottie/g;->eS:Ljava/lang/String;
+    iput-object p5, p0, Lcom/airbnb/lottie/g;->eR: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 4a934d4847..4be6fd6987 100644
--- a/com.discord/smali/com/airbnb/lottie/g/a.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/a.smali
@@ -15,19 +15,17 @@
 
 
 # instance fields
-.field private final dT:Lcom/airbnb/lottie/d;
+.field private final dS:Lcom/airbnb/lottie/d;
 
-.field public final ei:F
+.field public final eh:F
 
 .field private mB:F
 
-.field private mC:F
+.field public mC:Landroid/graphics/PointF;
 
 .field public mD:Landroid/graphics/PointF;
 
-.field public mE:Landroid/graphics/PointF;
-
-.field public final ms:Ljava/lang/Object;
+.field public final mr:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -35,7 +33,7 @@
     .end annotation
 .end field
 
-.field public mt:Ljava/lang/Object;
+.field public ms:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -43,17 +41,19 @@
     .end annotation
 .end field
 
-.field public final mu:Landroid/view/animation/Interpolator;
+.field public final mt:Landroid/view/animation/Interpolator;
 
-.field public mv:Ljava/lang/Float;
+.field public mu:Ljava/lang/Float;
+
+.field public mv:F
 
 .field public mw:F
 
-.field public mx:F
+.field public mx:I
 
 .field public my:I
 
-.field public mz:I
+.field private mz:F
 
 
 # direct methods
@@ -75,39 +75,39 @@
 
     const v0, -0x358c9d09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mw:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mv:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mw:F
 
     const v0, 0x2ec8fb09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->my:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:I
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->my:I
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mC:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     const/4 v0, 0x0
 
+    iput-object v0, p0, Lcom/airbnb/lottie/g/a;->mC:Landroid/graphics/PointF;
+
     iput-object v0, p0, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
 
-    iput-object v0, p0, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
+    iput-object p2, p0, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
 
-    iput-object p4, p0, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
+    iput p5, p0, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iput p5, p0, Lcom/airbnb/lottie/g/a;->ei:F
-
-    iput-object p6, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iput-object p6, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
     return-void
 .end method
@@ -124,37 +124,37 @@
 
     const v0, -0x358c9d09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mw:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mv:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mw:F
 
     const v0, 0x2ec8fb09
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->my:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mx:I
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:I
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->my:I
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mz:F
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mC:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     const/4 v1, 0x0
 
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mC:Landroid/graphics/PointF;
+
     iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mD:Landroid/graphics/PointF;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mE:Landroid/graphics/PointF;
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mr:Ljava/lang/Object;
 
     iput-object p1, p0, Lcom/airbnb/lottie/g/a;->ms:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mt:Ljava/lang/Object;
+    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mt:Landroid/view/animation/Interpolator;
 
-    iput-object v1, p0, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
-
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->ei:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->eh:F
 
     const p1, 0x7f7fffff    # Float.MAX_VALUE
 
@@ -162,7 +162,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
     return-void
 .end method
@@ -172,7 +172,7 @@
 .method public final bI()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dS: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;->mB:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->mz:F
 
     const/4 v2, 0x1
 
@@ -189,13 +189,13 @@
 
     if-nez v1, :cond_1
 
-    iget v1, p0, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->eh:F
 
-    iget v0, v0, Lcom/airbnb/lottie/d;->ei:F
+    iget v0, v0, Lcom/airbnb/lottie/d;->eh:F
 
     sub-float/2addr v1, v0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v0}, Lcom/airbnb/lottie/d;->aI()F
 
@@ -203,10 +203,10 @@
 
     div-float/2addr v1, v0
 
-    iput v1, p0, Lcom/airbnb/lottie/g/a;->mB:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->mz:F
 
     :cond_1
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->mz:F
 
     return v0
 .end method
@@ -214,7 +214,7 @@
 .method public final ba()F
     .locals 3
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->dS: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;->mC:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     const/4 v2, 0x1
 
@@ -231,11 +231,11 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
     if-nez v0, :cond_1
 
-    iput v1, p0, Lcom/airbnb/lottie/g/a;->mC:F
+    iput v1, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     goto :goto_0
 
@@ -244,17 +244,17 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mv:Ljava/lang/Float;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mu:Ljava/lang/Float;
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
     move-result v1
 
-    iget v2, p0, Lcom/airbnb/lottie/g/a;->ei:F
+    iget v2, p0, Lcom/airbnb/lottie/g/a;->eh:F
 
     sub-float/2addr v1, v2
 
-    iget-object v2, p0, Lcom/airbnb/lottie/g/a;->dT:Lcom/airbnb/lottie/d;
+    iget-object v2, p0, Lcom/airbnb/lottie/g/a;->dS:Lcom/airbnb/lottie/d;
 
     invoke-virtual {v2}, Lcom/airbnb/lottie/d;->aI()F
 
@@ -264,11 +264,11 @@
 
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/airbnb/lottie/g/a;->mC:F
+    iput v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     :cond_2
     :goto_0
-    iget v0, p0, Lcom/airbnb/lottie/g/a;->mC:F
+    iget v0, p0, Lcom/airbnb/lottie/g/a;->mB:F
 
     return v0
 .end method
@@ -276,7 +276,7 @@
 .method public final bj()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mu:Landroid/view/animation/Interpolator;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/a;->mt: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;->ms:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mr: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;->mt:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->ms: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;->ei:F
+    iget v1, p0, Lcom/airbnb/lottie/g/a;->eh: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;->mv:Ljava/lang/Float;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mu: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;->mu:Landroid/view/animation/Interpolator;
+    iget-object v1, p0, Lcom/airbnb/lottie/g/a;->mt: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 409f098713..85ce0a7a1e 100644
--- a/com.discord/smali/com/airbnb/lottie/g/b.smali
+++ b/com.discord/smali/com/airbnb/lottie/g/b.smali
@@ -15,17 +15,17 @@
 
 
 # instance fields
+.field eh:F
+
 .field ei:F
 
-.field ej:F
+.field mE:F
 
 .field mF:F
 
 .field mG:F
 
-.field mH:F
-
-.field ms:Ljava/lang/Object;
+.field mr:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field mt:Ljava/lang/Object;
+.field ms:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
diff --git a/com.discord/smali/com/airbnb/lottie/g/c.smali b/com.discord/smali/com/airbnb/lottie/g/c.smali
index aa376a8365..55a5674a36 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 hx:Lcom/airbnb/lottie/g/b;
+.field private final hw: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 mI:Lcom/airbnb/lottie/a/b/a;
+.field public mH: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;->hx:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->hw: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;->hx:Lcom/airbnb/lottie/g/b;
+    iput-object v0, p0, Lcom/airbnb/lottie/g/c;->hw:Lcom/airbnb/lottie/g/b;
 
     const/4 v0, 0x0
 
@@ -96,21 +96,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/airbnb/lottie/g/c;->hx:Lcom/airbnb/lottie/g/b;
+    iget-object v0, p0, Lcom/airbnb/lottie/g/c;->hw:Lcom/airbnb/lottie/g/b;
 
-    iput p1, v0, Lcom/airbnb/lottie/g/b;->ei:F
+    iput p1, v0, Lcom/airbnb/lottie/g/b;->eh:F
 
-    iput p2, v0, Lcom/airbnb/lottie/g/b;->ej:F
+    iput p2, v0, Lcom/airbnb/lottie/g/b;->ei:F
 
-    iput-object p3, v0, Lcom/airbnb/lottie/g/b;->ms:Ljava/lang/Object;
+    iput-object p3, v0, Lcom/airbnb/lottie/g/b;->mr:Ljava/lang/Object;
 
-    iput-object p4, v0, Lcom/airbnb/lottie/g/b;->mt:Ljava/lang/Object;
+    iput-object p4, v0, Lcom/airbnb/lottie/g/b;->ms:Ljava/lang/Object;
 
-    iput p5, v0, Lcom/airbnb/lottie/g/b;->mF:F
+    iput p5, v0, Lcom/airbnb/lottie/g/b;->mE:F
 
-    iput p6, v0, Lcom/airbnb/lottie/g/b;->mG:F
+    iput p6, v0, Lcom/airbnb/lottie/g/b;->mF:F
 
-    iput p7, v0, Lcom/airbnb/lottie/g/b;->mH:F
+    iput p7, v0, Lcom/airbnb/lottie/g/b;->mG: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 61ec0935ce..5fe9d269f4 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 eT:Ljava/lang/Integer;
+
 .field public static final eU:Ljava/lang/Integer;
 
 .field public static final eV:Ljava/lang/Integer;
 
 .field public static final eW:Ljava/lang/Integer;
 
-.field public static final eX:Ljava/lang/Integer;
+.field public static final eX:Landroid/graphics/PointF;
 
 .field public static final eY:Landroid/graphics/PointF;
 
@@ -18,13 +20,13 @@
 
 .field public static final fa:Landroid/graphics/PointF;
 
-.field public static final fb:Landroid/graphics/PointF;
+.field public static final fb:Ljava/lang/Float;
 
-.field public static final fc:Ljava/lang/Float;
+.field public static final fc:Landroid/graphics/PointF;
 
-.field public static final fd:Landroid/graphics/PointF;
+.field public static final fd:Lcom/airbnb/lottie/g/d;
 
-.field public static final fe:Lcom/airbnb/lottie/g/d;
+.field public static final fe:Ljava/lang/Float;
 
 .field public static final ff:Ljava/lang/Float;
 
@@ -56,11 +58,9 @@
 
 .field public static final ft:Ljava/lang/Float;
 
-.field public static final fu:Ljava/lang/Float;
+.field public static final fu:Landroid/graphics/ColorFilter;
 
-.field public static final fv:Landroid/graphics/ColorFilter;
-
-.field public static final fw:[Ljava/lang/Integer;
+.field public static final fv:[Ljava/lang/Integer;
 
 
 # direct methods
@@ -73,7 +73,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eT:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eU:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eV:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -97,7 +97,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->eX:Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->eW:Ljava/lang/Integer;
+
+    new-instance v0, Landroid/graphics/PointF;
+
+    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
+
+    sput-object v0, Lcom/airbnb/lottie/j;->eX:Landroid/graphics/PointF;
 
     new-instance v0, Landroid/graphics/PointF;
 
@@ -117,31 +123,25 @@
 
     sput-object v0, Lcom/airbnb/lottie/j;->fa:Landroid/graphics/PointF;
 
-    new-instance v0, Landroid/graphics/PointF;
-
-    invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
-
-    sput-object v0, Lcom/airbnb/lottie/j;->fb: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;->fc:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fb:Ljava/lang/Float;
 
     new-instance v1, Landroid/graphics/PointF;
 
     invoke-direct {v1}, Landroid/graphics/PointF;-><init>()V
 
-    sput-object v1, Lcom/airbnb/lottie/j;->fd:Landroid/graphics/PointF;
+    sput-object v1, Lcom/airbnb/lottie/j;->fc: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;->fe:Lcom/airbnb/lottie/g/d;
+    sput-object v1, Lcom/airbnb/lottie/j;->fd: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;->ff:Ljava/lang/Float;
+    sput-object v1, Lcom/airbnb/lottie/j;->fe:Ljava/lang/Float;
+
+    sput-object v0, Lcom/airbnb/lottie/j;->ff:Ljava/lang/Float;
 
     sput-object v0, Lcom/airbnb/lottie/j;->fg:Ljava/lang/Float;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fh: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;->fi:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fh:Ljava/lang/Float;
 
     const/high16 v0, 0x40400000    # 3.0f
 
@@ -169,7 +169,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fj:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fi:Ljava/lang/Float;
 
     const/high16 v0, 0x40800000    # 4.0f
 
@@ -177,7 +177,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fk:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fj:Ljava/lang/Float;
 
     const/high16 v0, 0x40a00000    # 5.0f
 
@@ -185,7 +185,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fl:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fk:Ljava/lang/Float;
 
     const/high16 v0, 0x40c00000    # 6.0f
 
@@ -193,7 +193,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fm:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fl:Ljava/lang/Float;
 
     const/high16 v0, 0x40e00000    # 7.0f
 
@@ -201,7 +201,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fn:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fm:Ljava/lang/Float;
 
     const/high16 v0, 0x41000000    # 8.0f
 
@@ -209,7 +209,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fo:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fn:Ljava/lang/Float;
 
     const/high16 v0, 0x41100000    # 9.0f
 
@@ -217,7 +217,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fp:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fo:Ljava/lang/Float;
 
     const/high16 v0, 0x41200000    # 10.0f
 
@@ -225,7 +225,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fq:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fp:Ljava/lang/Float;
 
     const/high16 v0, 0x41300000    # 11.0f
 
@@ -233,7 +233,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fr:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fq:Ljava/lang/Float;
 
     const/high16 v0, 0x41400000    # 12.0f
 
@@ -241,9 +241,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fs:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fr:Ljava/lang/Float;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->ft:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->fs:Ljava/lang/Float;
 
     const/high16 v0, 0x41500000    # 13.0f
 
@@ -251,19 +251,19 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fu:Ljava/lang/Float;
+    sput-object v0, Lcom/airbnb/lottie/j;->ft:Ljava/lang/Float;
 
     new-instance v0, Landroid/graphics/ColorFilter;
 
     invoke-direct {v0}, Landroid/graphics/ColorFilter;-><init>()V
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fv:Landroid/graphics/ColorFilter;
+    sput-object v0, Lcom/airbnb/lottie/j;->fu:Landroid/graphics/ColorFilter;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/Integer;
 
-    sput-object v0, Lcom/airbnb/lottie/j;->fw:[Ljava/lang/Integer;
+    sput-object v0, Lcom/airbnb/lottie/j;->fv:[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 b8b1efb36c..d76819bd88 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 fB:Lcom/airbnb/lottie/l;
+.field final synthetic fA: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;->fB:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/l$1;->fA: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;->fB:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->fA: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;->fB:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$1;->fA: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;->fB:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->fA: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;->fB:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$1;->fA: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 4cea929f3b..e870db735d 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 fB:Lcom/airbnb/lottie/l;
+.field final synthetic fA:Lcom/airbnb/lottie/l;
 
 
 # direct methods
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l$a;->fB:Lcom/airbnb/lottie/l;
+    iput-object p1, p0, Lcom/airbnb/lottie/l$a;->fA: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;->fB:Lcom/airbnb/lottie/l;
+    iget-object v0, p0, Lcom/airbnb/lottie/l$a;->fA: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;->fB:Lcom/airbnb/lottie/l;
+    iget-object v1, p0, Lcom/airbnb/lottie/l$a;->fA: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 e3c64b650f..ea3f9f03ac 100644
--- a/com.discord/smali/com/airbnb/lottie/l.smali
+++ b/com.discord/smali/com/airbnb/lottie/l.smali
@@ -21,20 +21,11 @@
 
 
 # static fields
-.field public static fx:Ljava/util/concurrent/Executor;
+.field public static fw:Ljava/util/concurrent/Executor;
 
 
 # instance fields
-.field private volatile fA:Lcom/airbnb/lottie/k;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/airbnb/lottie/k<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final fy:Ljava/util/Set;
+.field private final fx:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -44,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final fz:Ljava/util/Set;
+.field private final fy:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -55,6 +46,15 @@
     .end annotation
 .end field
 
+.field private volatile fz:Lcom/airbnb/lottie/k;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/airbnb/lottie/k<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
 .field private final handler:Landroid/os/Handler;
 
 
@@ -66,7 +66,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/airbnb/lottie/l;->fx:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/airbnb/lottie/l;->fw: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;->fy:Ljava/util/Set;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->fx: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;->fz:Ljava/util/Set;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->fy: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;->fA:Lcom/airbnb/lottie/k;
+    iput-object p2, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
 
-    sget-object p2, Lcom/airbnb/lottie/l;->fx:Ljava/util/concurrent/Executor;
+    sget-object p2, Lcom/airbnb/lottie/l;->fw: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;->fA:Lcom/airbnb/lottie/k;
+    iget-object p0, p0, Lcom/airbnb/lottie/l;->fz: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;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
+    iput-object p1, p0, Lcom/airbnb/lottie/l;->fz: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;->fz:Ljava/util/Set;
+    iget-object v1, p0, Lcom/airbnb/lottie/l;->fy: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;->fy:Ljava/util/Set;
+    iget-object v1, p0, Lcom/airbnb/lottie/l;->fx: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;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz: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;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->value:Ljava/lang/Object;
 
     invoke-interface {p1, v0}, Lcom/airbnb/lottie/h;->h(Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fx: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;->fy:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fx: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;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz: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;->fA:Lcom/airbnb/lottie/k;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Lcom/airbnb/lottie/k;
 
     iget-object v0, v0, Lcom/airbnb/lottie/k;->exception:Ljava/lang/Throwable;
 
     invoke-interface {p1, v0}, Lcom/airbnb/lottie/h;->h(Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/l;->fz:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fy: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;->fz:Ljava/util/Set;
+    iget-object v0, p0, Lcom/airbnb/lottie/l;->fy: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 2f40510816..81b7523cbf 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 fF:Lcom/airbnb/lottie/m;
+.field final synthetic fE: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;->fF:Lcom/airbnb/lottie/m;
+    iput-object p1, p0, Lcom/airbnb/lottie/m$1;->fE: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 2b3be5be63..fb96389bf1 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 fC:Ljava/util/Set;
+.field private final fB:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final fD:Ljava/util/Map;
+.field private final fC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final fE:Ljava/util/Comparator;
+.field private final fD: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;->fC:Ljava/util/Set;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->fB: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;->fD:Ljava/util/Map;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->fC: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;->fE:Ljava/util/Comparator;
+    iput-object v0, p0, Lcom/airbnb/lottie/m;->fD:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/airbnb/lottie/m;->fD:Ljava/util/Map;
+    iget-object v0, p0, Lcom/airbnb/lottie/m;->fC: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;->fD:Ljava/util/Map;
+    iget-object v1, p0, Lcom/airbnb/lottie/m;->fC: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;->mm:F
+    iget v1, v0, Lcom/airbnb/lottie/f/f;->ml:F
 
     add-float/2addr v1, p2
 
-    iput v1, v0, Lcom/airbnb/lottie/f/f;->mm:F
+    iput v1, v0, Lcom/airbnb/lottie/f/f;->ml:F
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
 
     add-int/lit8 p2, p2, 0x1
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
 
     const v1, 0x7fffffff
 
     if-ne p2, v1, :cond_2
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:F
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->ml:F
 
     const/high16 v1, 0x40000000    # 2.0f
 
     div-float/2addr p2, v1
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->mm:F
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->ml:F
 
-    iget p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
+    iget p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
 
     div-int/lit8 p2, p2, 0x2
 
-    iput p2, v0, Lcom/airbnb/lottie/f/f;->mn:I
+    iput p2, v0, Lcom/airbnb/lottie/f/f;->mm:I
 
     :cond_2
     const-string p2, "__container"
@@ -143,7 +143,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/airbnb/lottie/m;->fC:Ljava/util/Set;
+    iget-object p1, p0, Lcom/airbnb/lottie/m;->fB: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 29dfe41c25..703bd1abe9 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 fF:Lcom/airbnb/lottie/n;
+
 .field public static final enum fG:Lcom/airbnb/lottie/n;
 
 .field public static final enum fH:Lcom/airbnb/lottie/n;
 
-.field public static final enum fI:Lcom/airbnb/lottie/n;
-
-.field private static final synthetic fJ:[Lcom/airbnb/lottie/n;
+.field private static final synthetic fI:[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;->fG:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fF: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;->fH:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fG: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;->fI:Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/airbnb/lottie/n;
 
-    sget-object v4, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
+    sget-object v4, Lcom/airbnb/lottie/n;->fF:Lcom/airbnb/lottie/n;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fG:Lcom/airbnb/lottie/n;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/airbnb/lottie/n;->fI:Lcom/airbnb/lottie/n;
+    sget-object v1, Lcom/airbnb/lottie/n;->fH:Lcom/airbnb/lottie/n;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/airbnb/lottie/n;->fJ:[Lcom/airbnb/lottie/n;
+    sput-object v0, Lcom/airbnb/lottie/n;->fI:[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;->fJ:[Lcom/airbnb/lottie/n;
+    sget-object v0, Lcom/airbnb/lottie/n;->fI:[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 657d860891..fe6506f745 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 fK:Ljava/util/Map;
+.field public final fJ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,4 +15,4 @@
     .end annotation
 .end field
 
-.field public fL:Z
+.field public fK:Z
diff --git a/com.discord/smali/com/angarron/colorpicker/R$a.smali b/com.discord/smali/com/angarron/colorpicker/R$a.smali
index c6dc374438..954b91d5ca 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$a.smali
@@ -51,7 +51,7 @@
 
 .field public static final always:I = 0x7f0a0073
 
-.field public static final beginning:I = 0x7f0a00c9
+.field public static final beginning:I = 0x7f0a00ca
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -65,143 +65,143 @@
 
 .field public static final color_picker_gridview:I = 0x7f0a021e
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final disableHome:I = 0x7f0a0279
+.field public static final disableHome:I = 0x7f0a027c
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final homeAsUp:I = 0x7f0a038d
+.field public static final homeAsUp:I = 0x7f0a0395
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final ifRoom:I = 0x7f0a0391
+.field public static final ifRoom:I = 0x7f0a0399
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final middle:I = 0x7f0a047f
+.field public static final middle:I = 0x7f0a0489
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final never:I = 0x7f0a0490
+.field public static final never:I = 0x7f0a049a
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final selected_checkmark:I = 0x7f0a05cc
+.field public static final selected_checkmark:I = 0x7f0a05e1
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final showCustom:I = 0x7f0a0705
+.field public static final showCustom:I = 0x7f0a071a
 
-.field public static final showHome:I = 0x7f0a0706
+.field public static final showHome:I = 0x7f0a071b
 
-.field public static final showTitle:I = 0x7f0a0707
+.field public static final showTitle:I = 0x7f0a071c
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final useLogo:I = 0x7f0a0781
+.field public static final useLogo:I = 0x7f0a07a5
 
-.field public static final withText:I = 0x7f0a084f
+.field public static final withText:I = 0x7f0a087f
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
 
 # 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 4f1a5bccc3..f24e0dc0d8 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$b.smali
@@ -69,17 +69,17 @@
 
 .field public static final color_picker_dialog:I = 0x7f0d0021
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
 
 # 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 d78e6cc61f..156bbc9f4f 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 mM:Lcom/angarron/colorpicker/a;
+.field final synthetic mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a$1;->mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a$1;->mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$1;->mL: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 46232c784e..a3d33fa3da 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 mM:Lcom/angarron/colorpicker/a;
+.field final synthetic mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a$2;->mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a$2;->mL: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;->mM:Lcom/angarron/colorpicker/a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a$2;->mL: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 89d84b49ca..ce6db00bf5 100644
--- a/com.discord/smali/com/angarron/colorpicker/a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/a.smali
@@ -17,13 +17,13 @@
 # instance fields
 .field private mColor:I
 
+.field private mI:Landroid/widget/ImageView;
+
 .field private mIsSelected:Z
 
-.field private mJ:Landroid/widget/ImageView;
+.field private mJ:I
 
-.field private mK:I
-
-.field private mL:Lcom/angarron/colorpicker/a$a;
+.field private mK:Lcom/angarron/colorpicker/a$a;
 
 
 # direct methods
@@ -34,7 +34,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/angarron/colorpicker/a;->mK:I
+    iput p1, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mJ:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mI: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;->mJ:Landroid/widget/ImageView;
+    iget-object p0, p0, Lcom/angarron/colorpicker/a;->mI: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;->mK:I
+    iget v1, p0, Lcom/angarron/colorpicker/a;->mJ: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;->mJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setAlpha(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI: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;->mL:Lcom/angarron/colorpicker/a$a;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mK: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;->mJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mJ:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mI: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;->mJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI: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;->mJ:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/angarron/colorpicker/a;->mI: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;->mJ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/angarron/colorpicker/a;->mI: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;->mL:Lcom/angarron/colorpicker/a$a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/a;->mK: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;->mK:I
+    iput p1, p0, Lcom/angarron/colorpicker/a;->mJ:I
 
     invoke-direct {p0}, Lcom/angarron/colorpicker/a;->bJ()V
 
diff --git a/com.discord/smali/com/angarron/colorpicker/b$a.smali b/com.discord/smali/com/angarron/colorpicker/b$a.smali
index 4afe5a350e..4ca0c4364e 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 mQ:[I
+.field public mP:[I
 
-.field public mR:I
+.field public mQ:I
 
-.field public mT:F
+.field public mS:F
 
 
 # direct methods
@@ -36,11 +36,11 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mT:F
+    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mS:F
 
     const/4 v0, -0x2
 
-    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mR:I
+    iput v0, p0, Lcom/angarron/colorpicker/b$a;->mQ: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;->mQ:[I
+    iput-object p1, p0, Lcom/angarron/colorpicker/b$a;->mP:[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 b564a4144c..03b5f303d8 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 mN:F = 30.0f
+.field private static mM:F = 30.0f
 
-.field private static mO:[I
+.field private static mN:[I
 
 
 # instance fields
@@ -25,13 +25,13 @@
 
 .field public listener:Lcom/angarron/colorpicker/OnColorSelectedListener;
 
-.field public final mP:F
+.field public final mO:F
 
-.field private final mQ:[I
+.field private final mP:[I
 
-.field private mR:I
+.field private mQ:I
 
-.field private mS:Lcom/angarron/colorpicker/a;
+.field private mR:Lcom/angarron/colorpicker/a;
 
 
 # direct methods
@@ -44,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/angarron/colorpicker/b;->mO:[I
+    sput-object v0, Lcom/angarron/colorpicker/b;->mN:[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;->mQ:[I
+    iput-object p2, p0, Lcom/angarron/colorpicker/b;->mP:[I
 
-    iput p3, p0, Lcom/angarron/colorpicker/b;->mR:I
+    iput p3, p0, Lcom/angarron/colorpicker/b;->mQ:I
 
-    iput p4, p0, Lcom/angarron/colorpicker/b;->mP:F
+    iput p4, p0, Lcom/angarron/colorpicker/b;->mO:F
 
     return-void
 .end method
@@ -122,7 +122,7 @@
 .method static synthetic bM()F
     .locals 1
 
-    sget v0, Lcom/angarron/colorpicker/b;->mN:F
+    sget v0, Lcom/angarron/colorpicker/b;->mM:F
 
     return v0
 .end method
@@ -130,7 +130,7 @@
 .method static synthetic bN()[I
     .locals 1
 
-    sget-object v0, Lcom/angarron/colorpicker/b;->mO:[I
+    sget-object v0, Lcom/angarron/colorpicker/b;->mN:[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;->mS:Lcom/angarron/colorpicker/a;
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->mR: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;->mS:Lcom/angarron/colorpicker/a;
+    iput-object p1, p0, Lcom/angarron/colorpicker/b;->mR:Lcom/angarron/colorpicker/a;
 
     invoke-virtual {p1}, Lcom/angarron/colorpicker/a;->getColor()I
 
     move-result p1
 
-    iput p1, p0, Lcom/angarron/colorpicker/b;->mR:I
+    iput p1, p0, Lcom/angarron/colorpicker/b;->mQ: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;->mR:I
+    iget v0, p0, Lcom/angarron/colorpicker/b;->mQ: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;->mQ:[I
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->mP:[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;->mQ:[I
+    iget-object v0, p0, Lcom/angarron/colorpicker/b;->mP:[I
 
     aget p1, v0, p1
 
@@ -230,11 +230,11 @@
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/angarron/colorpicker/b;->mQ:[I
+    iget-object p2, p0, Lcom/angarron/colorpicker/b;->mP:[I
 
     aget p2, p2, p1
 
-    iget p3, p0, Lcom/angarron/colorpicker/b;->mR:I
+    iget p3, p0, Lcom/angarron/colorpicker/b;->mQ: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;->mQ:[I
+    iget-object v1, p0, Lcom/angarron/colorpicker/b;->mP:[I
 
     aget p1, v1, p1
 
@@ -258,10 +258,10 @@
 
     if-eqz p2, :cond_1
 
-    iput-object p3, p0, Lcom/angarron/colorpicker/b;->mS:Lcom/angarron/colorpicker/a;
+    iput-object p3, p0, Lcom/angarron/colorpicker/b;->mR:Lcom/angarron/colorpicker/a;
 
     :cond_1
-    iget p1, p0, Lcom/angarron/colorpicker/b;->mP:F
+    iget p1, p0, Lcom/angarron/colorpicker/b;->mO:F
 
     invoke-virtual {p0, p1}, Lcom/angarron/colorpicker/b;->g(F)I
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$1$1.smali b/com.discord/smali/com/camerakit/CameraKitView$1$1.smali
index 1c81d4f565..bc90676587 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$1$1.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$1$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic nq:Lcom/camerakit/CameraKitView$1;
+.field final synthetic np:Lcom/camerakit/CameraKitView$1;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$1;->nq:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$1;->np:Lcom/camerakit/CameraKitView$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$1;->nq:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$1;->np:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->a(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$b;
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$1$2.smali b/com.discord/smali/com/camerakit/CameraKitView$1$2.smali
index 566dd9d472..ef28093109 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$1$2.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$1$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic nq:Lcom/camerakit/CameraKitView$1;
+.field final synthetic np:Lcom/camerakit/CameraKitView$1;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$2;->nq:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$2;->np:Lcom/camerakit/CameraKitView$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$2;->nq:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$2;->np:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->a(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$b;
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$1$3.smali b/com.discord/smali/com/camerakit/CameraKitView$1$3.smali
index 685b3bdc1f..fb7f6271c9 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$1$3.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$1$3.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic nq:Lcom/camerakit/CameraKitView$1;
+.field final synthetic np:Lcom/camerakit/CameraKitView$1;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$3;->nq:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$3;->np:Lcom/camerakit/CameraKitView$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$3;->nq:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$3;->np:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->b(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$g;
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$1$4.smali b/com.discord/smali/com/camerakit/CameraKitView$1$4.smali
index 1285e90b04..1c8d40ae18 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$1$4.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$1$4.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic nq:Lcom/camerakit/CameraKitView$1;
+.field final synthetic np:Lcom/camerakit/CameraKitView$1;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$4;->nq:Lcom/camerakit/CameraKitView$1;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1$4;->np:Lcom/camerakit/CameraKitView$1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,9 +37,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$4;->nq:Lcom/camerakit/CameraKitView$1;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1$4;->np:Lcom/camerakit/CameraKitView$1;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->b(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$g;
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$1.smali b/com.discord/smali/com/camerakit/CameraKitView$1.smali
index 0c111f7363..7b60ae44b4 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$1.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic np:Lcom/camerakit/CameraKitView;
+.field final synthetic no:Lcom/camerakit/CameraKitView;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final bO()V
     .locals 2
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->a(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$b;
 
@@ -45,7 +45,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     new-instance v1, Lcom/camerakit/CameraKitView$1$1;
 
@@ -60,7 +60,7 @@
 .method public final bP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->b(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$g;
 
@@ -68,7 +68,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     new-instance v1, Lcom/camerakit/CameraKitView$1$3;
 
@@ -83,7 +83,7 @@
 .method public final bQ()V
     .locals 2
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->b(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$g;
 
@@ -91,7 +91,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     new-instance v1, Lcom/camerakit/CameraKitView$1$4;
 
@@ -106,7 +106,7 @@
 .method public final onCameraClosed()V
     .locals 2
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     invoke-static {v0}, Lcom/camerakit/CameraKitView;->a(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$b;
 
@@ -114,7 +114,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$1;->no:Lcom/camerakit/CameraKitView;
 
     new-instance v1, Lcom/camerakit/CameraKitView$1$2;
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$2$1.smali b/com.discord/smali/com/camerakit/CameraKitView$2$1.smali
index d6540282f5..b94345606f 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$2$1.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$2$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic nt:[B
+.field final synthetic nr:[B
 
-.field final synthetic nu:Lcom/camerakit/CameraKitView$2;
+.field final synthetic nt:Lcom/camerakit/CameraKitView$2;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView$2;[B)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$2$1;->nu:Lcom/camerakit/CameraKitView$2;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$2$1;->nt:Lcom/camerakit/CameraKitView$2;
 
-    iput-object p2, p0, Lcom/camerakit/CameraKitView$2$1;->nt:[B
+    iput-object p2, p0, Lcom/camerakit/CameraKitView$2$1;->nr:[B
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,15 +41,15 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$2$1;->nu:Lcom/camerakit/CameraKitView$2;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$2$1;->nt:Lcom/camerakit/CameraKitView$2;
 
-    iget-object v0, v0, Lcom/camerakit/CameraKitView$2;->nr:Lcom/camerakit/CameraKitView$e;
+    iget-object v0, v0, Lcom/camerakit/CameraKitView$2;->nq:Lcom/camerakit/CameraKitView$e;
 
-    iget-object v1, p0, Lcom/camerakit/CameraKitView$2$1;->nu:Lcom/camerakit/CameraKitView$2;
+    iget-object v1, p0, Lcom/camerakit/CameraKitView$2$1;->nt:Lcom/camerakit/CameraKitView$2;
 
-    iget-object v1, v1, Lcom/camerakit/CameraKitView$2;->np:Lcom/camerakit/CameraKitView;
+    iget-object v1, v1, Lcom/camerakit/CameraKitView$2;->no:Lcom/camerakit/CameraKitView;
 
-    iget-object v2, p0, Lcom/camerakit/CameraKitView$2$1;->nt:[B
+    iget-object v2, p0, Lcom/camerakit/CameraKitView$2$1;->nr:[B
 
     invoke-interface {v0, v1, v2}, Lcom/camerakit/CameraKitView$e;->a(Lcom/camerakit/CameraKitView;[B)V
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$2.smali b/com.discord/smali/com/camerakit/CameraKitView$2.smali
index f7788791ab..c7fe58d6ee 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$2.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic np:Lcom/camerakit/CameraKitView;
+.field final synthetic no:Lcom/camerakit/CameraKitView;
 
-.field final synthetic nr:Lcom/camerakit/CameraKitView$e;
+.field final synthetic nq:Lcom/camerakit/CameraKitView$e;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/CameraKitView;Lcom/camerakit/CameraKitView$e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView$2;->np:Lcom/camerakit/CameraKitView;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView$2;->no:Lcom/camerakit/CameraKitView;
 
-    iput-object p2, p0, Lcom/camerakit/CameraKitView$2;->nr:Lcom/camerakit/CameraKitView$e;
+    iput-object p2, p0, Lcom/camerakit/CameraKitView$2;->nq:Lcom/camerakit/CameraKitView$e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final a([B)V
     .locals 2
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView$2;->np:Lcom/camerakit/CameraKitView;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView$2;->no:Lcom/camerakit/CameraKitView;
 
     new-instance v1, Lcom/camerakit/CameraKitView$2$1;
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView$3.smali b/com.discord/smali/com/camerakit/CameraKitView$3.smali
index 47f8494e0a..71fb465800 100644
--- a/com.discord/smali/com/camerakit/CameraKitView$3.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView$3.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic nv:[I
+.field static final synthetic nu:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
+    sput-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
 
     :try_start_0
-    sget-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
+    sget-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
 
-    sget-object v1, Lcom/camerakit/a$c;->ob:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
 
     invoke-virtual {v1}, Lcom/camerakit/a$c;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
+    sget-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
 
-    sget-object v1, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->nY:Lcom/camerakit/a$c;
 
     invoke-virtual {v1}, Lcom/camerakit/a$c;->ordinal()I
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/camerakit/CameraKitView$3;->nv:[I
+    sget-object v0, Lcom/camerakit/CameraKitView$3;->nu:[I
 
-    sget-object v1, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
 
     invoke-virtual {v1}, Lcom/camerakit/a$c;->ordinal()I
 
diff --git a/com.discord/smali/com/camerakit/CameraKitView.smali b/com.discord/smali/com/camerakit/CameraKitView.smali
index d90e023eac..0589f2081e 100644
--- a/com.discord/smali/com/camerakit/CameraKitView.smali
+++ b/com.discord/smali/com/camerakit/CameraKitView.smali
@@ -19,45 +19,45 @@
 
 
 # static fields
-.field private static nm:Lcom/camerakit/b/a;
+.field private static nl:Lcom/camerakit/b/a;
 
-.field private static nn:Lcom/camerakit/b/b;
+.field private static nm:Lcom/camerakit/b/b;
 
 
 # instance fields
-.field private mU:Z
+.field private mT:Z
 
-.field private mV:F
+.field private mU:F
+
+.field private mV:I
 
 .field private mW:I
 
 .field private mZ:I
 
-.field private na:I
+.field private na:F
 
-.field private nb:F
+.field private nb:I
 
 .field private nc:I
 
 .field private nd:I
 
-.field private ne:I
+.field private ne:F
 
-.field private nf:F
+.field private nf:I
 
-.field private ng:I
+.field private ng:Lcom/camerakit/CameraKitView$d;
 
-.field private nh:Lcom/camerakit/CameraKitView$d;
+.field private nh:Lcom/camerakit/CameraKitView$b;
 
-.field private ni:Lcom/camerakit/CameraKitView$b;
+.field private ni:Lcom/camerakit/CameraKitView$g;
 
-.field private nj:Lcom/camerakit/CameraKitView$g;
+.field private nj:Lcom/camerakit/CameraKitView$ErrorListener;
 
-.field private nk:Lcom/camerakit/CameraKitView$ErrorListener;
+.field private nk:Lcom/camerakit/CameraKitView$f;
 
-.field private nl:Lcom/camerakit/CameraKitView$f;
-
-.field private no:Lcom/camerakit/a;
+.field private nn:Lcom/camerakit/a;
 
 
 # direct methods
@@ -96,7 +96,7 @@
 .method static synthetic a(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$b;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$b;
+    iget-object p0, p0, Lcom/camerakit/CameraKitView;->nh:Lcom/camerakit/CameraKitView$b;
 
     return-object p0
 .end method
@@ -118,7 +118,7 @@
 
     move-result p2
 
-    iput-boolean p2, p0, Lcom/camerakit/CameraKitView;->mU:Z
+    iput-boolean p2, p0, Lcom/camerakit/CameraKitView;->mT:Z
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_aspectRatio:I
 
@@ -128,7 +128,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->mV:F
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mU:F
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_facing:I
 
@@ -136,17 +136,17 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->mW:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mV:I
 
-    sget-object p2, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/a;
+    sget-object p2, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/b/a;
 
-    sget-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     const/4 v2, 0x1
 
     if-ne p2, v1, :cond_0
 
-    iput v2, p0, Lcom/camerakit/CameraKitView;->mW:I
+    iput v2, p0, Lcom/camerakit/CameraKitView;->mV:I
 
     :cond_0
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_flash:I
@@ -155,15 +155,15 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->mZ:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mW:I
 
-    sget-object p2, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/b/b;
+    sget-object p2, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
 
-    sget-object v0, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     if-ne p2, v0, :cond_1
 
-    iput v2, p0, Lcom/camerakit/CameraKitView;->mZ:I
+    iput v2, p0, Lcom/camerakit/CameraKitView;->mW:I
 
     :cond_1
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_focus:I
@@ -172,7 +172,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->na:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_zoomFactor:I
 
@@ -182,7 +182,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->nb:F
+    iput p2, p0, Lcom/camerakit/CameraKitView;->na:F
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_permissions:I
 
@@ -190,7 +190,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_imageMegaPixels:I
 
@@ -200,7 +200,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->nf:F
+    iput p2, p0, Lcom/camerakit/CameraKitView;->ne:F
 
     sget p2, Lcom/camerakit/R$a;->CameraKitView_camera_imageJpegQuality:I
 
@@ -210,7 +210,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/camerakit/CameraKitView;->ng:I
+    iput p2, p0, Lcom/camerakit/CameraKitView;->nf:I
 
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
@@ -222,13 +222,13 @@
 
     invoke-direct {p1, p2}, Lcom/camerakit/a;-><init>(Landroid/content/Context;)V
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {p0, p1}, Lcom/camerakit/CameraKitView;->addView(Landroid/view/View;)V
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     new-instance p2, Lcom/camerakit/CameraKitView$1;
 
@@ -242,7 +242,7 @@
 .method static synthetic b(Lcom/camerakit/CameraKitView;)Lcom/camerakit/CameraKitView$g;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/CameraKitView;->nj:Lcom/camerakit/CameraKitView$g;
+    iget-object p0, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$g;
 
     return-object p0
 .end method
@@ -271,7 +271,7 @@
     return-object v0
 
     :cond_0
-    iget v1, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     or-int/lit8 v2, v1, 0x1
 
@@ -294,7 +294,7 @@
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    iget v1, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     or-int/lit8 v2, v1, 0x2
 
@@ -315,7 +315,7 @@
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_2
-    iget v1, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     or-int/lit8 v2, v1, 0x4
 
@@ -336,7 +336,7 @@
     invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     :cond_3
-    iget v1, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iget v1, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     or-int/lit8 v2, v1, 0x8
 
@@ -365,7 +365,7 @@
 .method public final a(Lcom/camerakit/CameraKitView$e;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     new-instance v1, Lcom/camerakit/CameraKitView$2;
 
@@ -375,11 +375,11 @@
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object p1, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v2, v0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext;
 
@@ -401,7 +401,7 @@
 .method public getAdjustViewBounds()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mU:Z
+    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mT:Z
 
     return v0
 .end method
@@ -409,7 +409,7 @@
 .method public getAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mV:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mU:F
 
     return v0
 .end method
@@ -417,7 +417,7 @@
 .method public getCameraListener()Lcom/camerakit/CameraKitView$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$b;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nh:Lcom/camerakit/CameraKitView$b;
 
     return-object v0
 .end method
@@ -425,7 +425,7 @@
 .method public getErrorListener()Lcom/camerakit/CameraKitView$ErrorListener;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nk:Lcom/camerakit/CameraKitView$ErrorListener;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nj:Lcom/camerakit/CameraKitView$ErrorListener;
 
     return-object v0
 .end method
@@ -433,7 +433,7 @@
 .method public getFacing()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mW:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mV:I
 
     return v0
 .end method
@@ -441,7 +441,7 @@
 .method public getFlash()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mZ:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mW:I
 
     return v0
 .end method
@@ -449,7 +449,7 @@
 .method public getFocus()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->na:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
     return v0
 .end method
@@ -457,7 +457,7 @@
 .method public getGestureListener()Lcom/camerakit/CameraKitView$d;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nh:Lcom/camerakit/CameraKitView$d;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->ng:Lcom/camerakit/CameraKitView$d;
 
     return-object v0
 .end method
@@ -465,7 +465,7 @@
 .method public getImageMegaPixels()F
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nf:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->ne:F
 
     return v0
 .end method
@@ -473,7 +473,7 @@
 .method public getPermissions()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     return v0
 .end method
@@ -481,7 +481,7 @@
 .method public getPhotoResolution()Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {v0}, Lcom/camerakit/a;->getPhotoSize()Lcom/camerakit/b/c;
 
@@ -498,7 +498,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {v0}, Lcom/camerakit/a;->getPhotoSize()Lcom/camerakit/b/c;
 
@@ -510,7 +510,7 @@
 .method public getPreviewEffect()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nd:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nc:I
 
     return v0
 .end method
@@ -518,7 +518,7 @@
 .method public getPreviewListener()Lcom/camerakit/CameraKitView$g;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nj:Lcom/camerakit/CameraKitView$g;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$g;
 
     return-object v0
 .end method
@@ -526,7 +526,7 @@
 .method public getPreviewResolution()Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {v0}, Lcom/camerakit/a;->getPreviewSize()Lcom/camerakit/b/c;
 
@@ -543,7 +543,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {v0}, Lcom/camerakit/a;->getPreviewSize()Lcom/camerakit/b/c;
 
@@ -555,7 +555,7 @@
 .method public getSensorPreset()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nc:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->nb:I
 
     return v0
 .end method
@@ -563,7 +563,7 @@
 .method public getZoomFactor()F
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nb:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->na:F
 
     return v0
 .end method
@@ -571,7 +571,7 @@
 .method protected onMeasure(II)V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mU:Z
+    iget-boolean v0, p0, Lcom/camerakit/CameraKitView;->mT:Z
 
     if-eqz v0, :cond_5
 
@@ -614,7 +614,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/camerakit/CameraKitView;->mV:F
+    iget v1, p0, Lcom/camerakit/CameraKitView;->mU:F
 
     cmpl-float v2, v1, v3
 
@@ -633,7 +633,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     if-eqz v1, :cond_5
 
@@ -647,7 +647,7 @@
 
     if-lez v1, :cond_5
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {p1}, Lcom/camerakit/a;->getSurfaceSize()Lcom/camerakit/b/c;
 
@@ -684,7 +684,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/camerakit/CameraKitView;->mV:F
+    iget v1, p0, Lcom/camerakit/CameraKitView;->mU:F
 
     cmpl-float v2, v1, v3
 
@@ -703,7 +703,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object v1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     if-eqz v1, :cond_5
 
@@ -717,7 +717,7 @@
 
     if-lez v1, :cond_5
 
-    iget-object p2, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object p2, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {p2}, Lcom/camerakit/a;->getSurfaceSize()Lcom/camerakit/b/c;
 
@@ -762,13 +762,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
-    sget-object v1, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v1, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v1, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v2, v0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext;
 
@@ -799,7 +799,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {v0}, Lcom/camerakit/a;->bT()V
 
@@ -937,11 +937,11 @@
     return-void
 
     :cond_7
-    iget v0, p0, Lcom/camerakit/CameraKitView;->mZ:I
+    iget v0, p0, Lcom/camerakit/CameraKitView;->mW:I
 
     invoke-virtual {p0, v0}, Lcom/camerakit/CameraKitView;->setFlash(I)V
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nf:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->ne:F
 
     invoke-virtual {p0, v0}, Lcom/camerakit/CameraKitView;->setImageMegaPixels(F)V
 
@@ -951,29 +951,29 @@
 
     if-nez v0, :cond_8
 
-    sget-object v0, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     goto :goto_2
 
     :cond_8
-    sget-object v0, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     :goto_2
-    sput-object v0, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/a;
+    sput-object v0, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/b/a;
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
-    sget-object v1, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/b/a;
 
     const-string v2, "facing"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v2, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v2, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v4, v0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
+    iget-object v4, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
 
     check-cast v4, Lkotlin/coroutines/CoroutineContext;
 
@@ -1002,13 +1002,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
-    sget-object v1, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v1, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v1, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v2, v0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext;
 
@@ -1030,7 +1030,7 @@
 .method public setAdjustViewBounds(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/camerakit/CameraKitView;->mU:Z
+    iput-boolean p1, p0, Lcom/camerakit/CameraKitView;->mT:Z
 
     return-void
 .end method
@@ -1038,7 +1038,7 @@
 .method public setAspectRatio(F)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->mV:F
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mU:F
 
     return-void
 .end method
@@ -1046,7 +1046,7 @@
 .method public setCameraListener(Lcom/camerakit/CameraKitView$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$b;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nh:Lcom/camerakit/CameraKitView$b;
 
     return-void
 .end method
@@ -1054,7 +1054,7 @@
 .method public setErrorListener(Lcom/camerakit/CameraKitView$ErrorListener;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nk:Lcom/camerakit/CameraKitView$ErrorListener;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nj:Lcom/camerakit/CameraKitView$ErrorListener;
 
     return-void
 .end method
@@ -1062,11 +1062,11 @@
 .method public setFacing(I)V
     .locals 1
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->mW:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mV:I
 
-    sget-object p1, Lcom/camerakit/CameraKitView$3;->nv:[I
+    sget-object p1, Lcom/camerakit/CameraKitView$3;->nu:[I
 
-    iget-object v0, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object v0, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
     invoke-virtual {v0}, Lcom/camerakit/a;->getLifecycleState()Lcom/camerakit/a$c;
 
@@ -1113,7 +1113,7 @@
 .method public setFlash(I)V
     .locals 1
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->mZ:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mW:I
 
     if-eqz p1, :cond_3
 
@@ -1151,23 +1151,23 @@
     throw p1
 
     :cond_2
-    sget-object p1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
-    sput-object p1, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/b/b;
+    sput-object p1, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
 
     goto :goto_0
 
     :cond_3
-    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object p1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
-    sput-object p1, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/b/b;
+    sput-object p1, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
     :try_end_0
     .catch Lcom/camerakit/CameraKitView$a; {:try_start_0 .. :try_end_0} :catch_0
 
     :goto_0
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
-    sget-object v0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/CameraKitView;->nm:Lcom/camerakit/b/b;
 
     invoke-virtual {p1, v0}, Lcom/camerakit/a;->setFlash(Lcom/camerakit/b/b;)V
 
@@ -1190,7 +1190,7 @@
 .method public setFocus(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->na:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->mZ:I
 
     return-void
 .end method
@@ -1204,7 +1204,7 @@
 .method public setGestureListener(Lcom/camerakit/CameraKitView$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nh:Lcom/camerakit/CameraKitView$d;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->ng:Lcom/camerakit/CameraKitView$d;
 
     return-void
 .end method
@@ -1212,11 +1212,11 @@
 .method public setImageMegaPixels(F)V
     .locals 1
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->nf:F
+    iput p1, p0, Lcom/camerakit/CameraKitView;->ne:F
 
-    iget-object p1, p0, Lcom/camerakit/CameraKitView;->no:Lcom/camerakit/a;
+    iget-object p1, p0, Lcom/camerakit/CameraKitView;->nn:Lcom/camerakit/a;
 
-    iget v0, p0, Lcom/camerakit/CameraKitView;->nf:F
+    iget v0, p0, Lcom/camerakit/CameraKitView;->ne:F
 
     invoke-virtual {p1, v0}, Lcom/camerakit/a;->setImageMegaPixels(F)V
 
@@ -1226,7 +1226,7 @@
 .method public setPermissions(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->ne:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nd:I
 
     return-void
 .end method
@@ -1234,7 +1234,7 @@
 .method public setPermissionsListener(Lcom/camerakit/CameraKitView$f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nl:Lcom/camerakit/CameraKitView$f;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nk:Lcom/camerakit/CameraKitView$f;
 
     return-void
 .end method
@@ -1242,7 +1242,7 @@
 .method public setPreviewEffect(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->nd:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nc:I
 
     return-void
 .end method
@@ -1250,7 +1250,7 @@
 .method public setPreviewListener(Lcom/camerakit/CameraKitView$g;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/CameraKitView;->nj:Lcom/camerakit/CameraKitView$g;
+    iput-object p1, p0, Lcom/camerakit/CameraKitView;->ni:Lcom/camerakit/CameraKitView$g;
 
     return-void
 .end method
@@ -1258,7 +1258,7 @@
 .method public setSensorPreset(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->nc:I
+    iput p1, p0, Lcom/camerakit/CameraKitView;->nb:I
 
     return-void
 .end method
@@ -1266,7 +1266,7 @@
 .method public setZoomFactor(F)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/CameraKitView;->nb:F
+    iput p1, p0, Lcom/camerakit/CameraKitView;->na:F
 
     return-void
 .end method
diff --git a/com.discord/smali/com/camerakit/a$1.smali b/com.discord/smali/com/camerakit/a$1.smali
index c6a6edccdf..691c04c2a3 100644
--- a/com.discord/smali/com/camerakit/a$1.smali
+++ b/com.discord/smali/com/camerakit/a$1.smali
@@ -52,7 +52,7 @@
 
     iget-object p1, p0, Lcom/camerakit/a$1;->this$0:Lcom/camerakit/a;
 
-    sget-object v0, Lcom/camerakit/a$f;->oe:Lcom/camerakit/a$f;
+    sget-object v0, Lcom/camerakit/a$f;->od:Lcom/camerakit/a$f;
 
     invoke-virtual {p1, v0}, Lcom/camerakit/a;->setSurfaceState(Lcom/camerakit/a$f;)V
 
@@ -62,7 +62,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
+    sget-object v0, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
 
     if-ne p1, v0, :cond_0
 
diff --git a/com.discord/smali/com/camerakit/a$a.smali b/com.discord/smali/com/camerakit/a$a.smali
index 60cade1176..28778d0d18 100644
--- a/com.discord/smali/com/camerakit/a$a.smali
+++ b/com.discord/smali/com/camerakit/a$a.smali
@@ -23,6 +23,8 @@
 
 
 # static fields
+.field public static final enum nP:Lcom/camerakit/a$a;
+
 .field public static final enum nQ:Lcom/camerakit/a$a;
 
 .field public static final enum nR:Lcom/camerakit/a$a;
@@ -37,9 +39,7 @@
 
 .field public static final enum nW:Lcom/camerakit/a$a;
 
-.field public static final enum nX:Lcom/camerakit/a$a;
-
-.field private static final synthetic nY:[Lcom/camerakit/a$a;
+.field private static final synthetic nX:[Lcom/camerakit/a$a;
 
 
 # direct methods
@@ -58,7 +58,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nQ:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nP:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -70,7 +70,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nQ:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -82,7 +82,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nS:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -94,7 +94,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nT:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nS:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -106,7 +106,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nU:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nT:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -118,7 +118,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nV:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nU:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -130,7 +130,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nV:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
@@ -142,11 +142,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$a;->nX:Lcom/camerakit/a$a;
+    sput-object v1, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/a$a;->nY:[Lcom/camerakit/a$a;
+    sput-object v0, Lcom/camerakit/a$a;->nX:[Lcom/camerakit/a$a;
 
     return-void
 .end method
@@ -181,7 +181,7 @@
 .method public static values()[Lcom/camerakit/a$a;
     .locals 1
 
-    sget-object v0, Lcom/camerakit/a$a;->nY:[Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nX:[Lcom/camerakit/a$a;
 
     invoke-virtual {v0}, [Lcom/camerakit/a$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/camerakit/a$c.smali b/com.discord/smali/com/camerakit/a$c.smali
index c50f16ee54..82a59660c9 100644
--- a/com.discord/smali/com/camerakit/a$c.smali
+++ b/com.discord/smali/com/camerakit/a$c.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
+.field public static final enum nY:Lcom/camerakit/a$c;
+
 .field public static final enum nZ:Lcom/camerakit/a$c;
 
 .field public static final enum oa:Lcom/camerakit/a$c;
 
 .field public static final enum ob:Lcom/camerakit/a$c;
 
-.field public static final enum oc:Lcom/camerakit/a$c;
-
-.field private static final synthetic od:[Lcom/camerakit/a$c;
+.field private static final synthetic oc:[Lcom/camerakit/a$c;
 
 
 # direct methods
@@ -50,7 +50,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->nY:Lcom/camerakit/a$c;
 
     aput-object v1, v0, v2
 
@@ -62,7 +62,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
 
     aput-object v1, v0, v2
 
@@ -74,7 +74,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$c;->ob:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
 
     aput-object v1, v0, v2
 
@@ -86,11 +86,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$c;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$c;->oc:Lcom/camerakit/a$c;
+    sput-object v1, Lcom/camerakit/a$c;->ob:Lcom/camerakit/a$c;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/a$c;->od:[Lcom/camerakit/a$c;
+    sput-object v0, Lcom/camerakit/a$c;->oc:[Lcom/camerakit/a$c;
 
     return-void
 .end method
@@ -125,7 +125,7 @@
 .method public static values()[Lcom/camerakit/a$c;
     .locals 1
 
-    sget-object v0, Lcom/camerakit/a$c;->od:[Lcom/camerakit/a$c;
+    sget-object v0, Lcom/camerakit/a$c;->oc:[Lcom/camerakit/a$c;
 
     invoke-virtual {v0}, [Lcom/camerakit/a$c;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/camerakit/a$f.smali b/com.discord/smali/com/camerakit/a$f.smali
index 75e0a37bd8..320e21490d 100644
--- a/com.discord/smali/com/camerakit/a$f.smali
+++ b/com.discord/smali/com/camerakit/a$f.smali
@@ -23,11 +23,11 @@
 
 
 # static fields
+.field public static final enum od:Lcom/camerakit/a$f;
+
 .field public static final enum oe:Lcom/camerakit/a$f;
 
-.field public static final enum of:Lcom/camerakit/a$f;
-
-.field private static final synthetic og:[Lcom/camerakit/a$f;
+.field private static final synthetic of:[Lcom/camerakit/a$f;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$f;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$f;->oe:Lcom/camerakit/a$f;
+    sput-object v1, Lcom/camerakit/a$f;->od:Lcom/camerakit/a$f;
 
     aput-object v1, v0, v2
 
@@ -58,11 +58,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/a$f;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/a$f;->of:Lcom/camerakit/a$f;
+    sput-object v1, Lcom/camerakit/a$f;->oe:Lcom/camerakit/a$f;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/a$f;->og:[Lcom/camerakit/a$f;
+    sput-object v0, Lcom/camerakit/a$f;->of:[Lcom/camerakit/a$f;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 .method public static values()[Lcom/camerakit/a$f;
     .locals 1
 
-    sget-object v0, Lcom/camerakit/a$f;->og:[Lcom/camerakit/a$f;
+    sget-object v0, Lcom/camerakit/a$f;->of:[Lcom/camerakit/a$f;
 
     invoke-virtual {v0}, [Lcom/camerakit/a$f;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/camerakit/a$g$1$1$1.smali b/com.discord/smali/com/camerakit/a$g$1$1$1.smali
index e0acac203d..af3363a20a 100644
--- a/com.discord/smali/com/camerakit/a$g$1$1$1.smali
+++ b/com.discord/smali/com/camerakit/a$g$1$1$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic oh:Lcom/camerakit/a$g$1$1;
+.field final synthetic og:Lcom/camerakit/a$g$1$1;
 
-.field final synthetic oi:[B
+.field final synthetic oh:[B
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/a$g$1$1;[B)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a$g$1$1$1;->oh:Lcom/camerakit/a$g$1$1;
+    iput-object p1, p0, Lcom/camerakit/a$g$1$1$1;->og:Lcom/camerakit/a$g$1$1;
 
-    iput-object p2, p0, Lcom/camerakit/a$g$1$1$1;->oi:[B
+    iput-object p2, p0, Lcom/camerakit/a$g$1$1$1;->oh:[B
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,11 +43,11 @@
 
     new-instance v0, Lcom/jpegkit/Jpeg;
 
-    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->oi:[B
+    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->oh:[B
 
     invoke-direct {v0, v1}, Lcom/jpegkit/Jpeg;-><init>([B)V
 
-    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->oh:Lcom/camerakit/a$g$1$1;
+    iget-object v1, p0, Lcom/camerakit/a$g$1$1$1;->og:Lcom/camerakit/a$g$1$1;
 
     iget-object v1, v1, Lcom/camerakit/a$g$1$1;->this$0:Lcom/camerakit/a$g$1;
 
@@ -61,7 +61,7 @@
 
     invoke-virtual {v0, v1}, Lcom/jpegkit/Jpeg;->cH(I)V
 
-    invoke-virtual {v0}, Lcom/jpegkit/Jpeg;->AT()[B
+    invoke-virtual {v0}, Lcom/jpegkit/Jpeg;->AW()[B
 
     move-result-object v1
 
@@ -71,7 +71,7 @@
 
     invoke-virtual {v0}, Lcom/jpegkit/Jpeg;->release()V
 
-    iget-object v0, p0, Lcom/camerakit/a$g$1$1$1;->oh:Lcom/camerakit/a$g$1$1;
+    iget-object v0, p0, Lcom/camerakit/a$g$1$1$1;->og:Lcom/camerakit/a$g$1$1;
 
     iget-object v0, v0, Lcom/camerakit/a$g$1$1;->this$0:Lcom/camerakit/a$g$1;
 
diff --git a/com.discord/smali/com/camerakit/a$g$1$1.smali b/com.discord/smali/com/camerakit/a$g$1$1.smali
index a5fef8cbb6..1e7693f8ed 100644
--- a/com.discord/smali/com/camerakit/a$g$1$1.smali
+++ b/com.discord/smali/com/camerakit/a$g$1$1.smali
@@ -77,7 +77,7 @@
 
     invoke-virtual {v0, v1}, Lcom/camerakit/a/e;->post(Ljava/lang/Runnable;)Z
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/camerakit/a$g$1.smali b/com.discord/smali/com/camerakit/a$g$1.smali
index 03e7bbacee..d367f131e4 100644
--- a/com.discord/smali/com/camerakit/a$g$1.smali
+++ b/com.discord/smali/com/camerakit/a$g$1.smali
@@ -105,7 +105,7 @@
 
     check-cast p1, Lcom/camerakit/a$g$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$g$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 
     invoke-interface {p1, v0}, Lcom/camerakit/a/b;->a(Lkotlin/jvm/functions/Function1;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$g.smali b/com.discord/smali/com/camerakit/a$g.smali
index 1dee51314c..315596b553 100644
--- a/com.discord/smali/com/camerakit/a$g.smali
+++ b/com.discord/smali/com/camerakit/a$g.smali
@@ -111,7 +111,7 @@
 
     check-cast p1, Lcom/camerakit/a$g;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$g;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -145,7 +145,7 @@
 
     invoke-static {v0, p1, v1}, Lkotlinx/coroutines/f;->a(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$h$1.smali b/com.discord/smali/com/camerakit/a$h$1.smali
index 2d2e0624ce..c26304665a 100644
--- a/com.discord/smali/com/camerakit/a$h$1.smali
+++ b/com.discord/smali/com/camerakit/a$h$1.smali
@@ -106,7 +106,7 @@
 
     check-cast p1, Lcom/camerakit/a$h$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$h$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 
     iget-object p1, p1, Lcom/camerakit/a$h;->this$0:Lcom/camerakit/a;
 
-    sget-object v1, Lcom/camerakit/a$c;->ob:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
 
     invoke-virtual {p1, v1}, Lcom/camerakit/a;->setLifecycleState(Lcom/camerakit/a$c;)V
 
@@ -183,7 +183,7 @@
 
     check-cast v2, Lkotlin/coroutines/Continuation;
 
-    sget-object v3, Lcom/camerakit/a$a;->nU:Lcom/camerakit/a$a;
+    sget-object v3, Lcom/camerakit/a$a;->nT:Lcom/camerakit/a$a;
 
     invoke-virtual {p1, v3}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
@@ -193,9 +193,9 @@
 
     invoke-interface {p1}, Lcom/camerakit/a/b;->bU()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
-    sget-object v3, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v3, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -222,7 +222,7 @@
 
     :cond_4
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$h.smali b/com.discord/smali/com/camerakit/a$h.smali
index dca64688a6..5dfaebec7f 100644
--- a/com.discord/smali/com/camerakit/a$h.smali
+++ b/com.discord/smali/com/camerakit/a$h.smali
@@ -105,7 +105,7 @@
 
     check-cast p1, Lcom/camerakit/a$h;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$h;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -139,7 +139,7 @@
 
     invoke-static {v0, p1, v1}, Lkotlinx/coroutines/f;->a(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$i$1.smali b/com.discord/smali/com/camerakit/a$i$1.smali
index 49392a33d9..943dda32ad 100644
--- a/com.discord/smali/com/camerakit/a$i$1.smali
+++ b/com.discord/smali/com/camerakit/a$i$1.smali
@@ -106,7 +106,7 @@
 
     check-cast p1, Lcom/camerakit/a$i$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$i$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -168,7 +168,7 @@
 
     iget-object v1, v1, Lcom/camerakit/a$i;->this$0:Lcom/camerakit/a;
 
-    sget-object v3, Lcom/camerakit/a$c;->oa:Lcom/camerakit/a$c;
+    sget-object v3, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
 
     invoke-virtual {v1, v3}, Lcom/camerakit/a;->setLifecycleState(Lcom/camerakit/a$c;)V
 
@@ -193,15 +193,15 @@
 
     invoke-static {v1, v5}, Lcom/camerakit/a;->a(Lcom/camerakit/a;Lkotlin/coroutines/Continuation;)V
 
-    iget-object v6, v1, Lcom/camerakit/a;->nI:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iget-object v6, v1, Lcom/camerakit/a;->nH:Lcom/camerakit/preview/CameraSurfaceTexture;
 
-    iget-object v7, v1, Lcom/camerakit/a;->nJ:Lcom/camerakit/a/c;
+    iget-object v7, v1, Lcom/camerakit/a;->nI:Lcom/camerakit/a/c;
 
     if-eqz v6, :cond_12
 
     if-eqz v7, :cond_12
 
-    sget-object v5, Lcom/camerakit/a$a;->nS:Lcom/camerakit/a$a;
+    sget-object v5, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
 
     invoke-virtual {v1, v5}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
@@ -335,11 +335,11 @@
 
     move-result v5
 
-    iget-object v8, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
+    iget-object v8, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
 
     invoke-static {v8, v9}, Landroid/opengl/Matrix;->setIdentityM([FI)V
 
-    iget-object v10, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
+    iget-object v10, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
 
     const/4 v11, 0x0
 
@@ -414,7 +414,7 @@
 
     invoke-static {v8, v10}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v10, v5, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iget-object v10, v5, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     check-cast v10, [Ljava/lang/Comparable;
     :try_end_1
@@ -429,7 +429,7 @@
 
     invoke-static {v10}, Lkotlin/a/g;->sort([Ljava/lang/Object;)V
 
-    iget-object v10, v5, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iget-object v10, v5, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     invoke-static {v10}, Lkotlin/a/g;->last([Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -439,7 +439,7 @@
 
     const v12, 0x7fffffff
 
-    iget-object v5, v5, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iget-object v5, v5, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     array-length v13, v5
 
@@ -542,11 +542,11 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iput-object v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     const/4 v4, 0x1
 
-    iput-boolean v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:Z
+    iput-boolean v4, v6, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Z
 
     new-instance v4, Lcom/camerakit/c/a;
 
@@ -566,7 +566,7 @@
 
     float-to-int v5, v5
 
-    iget-object v7, v4, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iget-object v7, v4, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     check-cast v7, [Ljava/lang/Comparable;
 
@@ -576,7 +576,7 @@
 
     invoke-static {v7}, Lkotlin/a/g;->sort([Ljava/lang/Object;)V
 
-    iget-object v7, v4, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iget-object v7, v4, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     invoke-static {v7}, Lkotlin/a/g;->last([Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -584,7 +584,7 @@
 
     check-cast v7, Lcom/camerakit/b/c;
 
-    iget-object v4, v4, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iget-object v4, v4, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     array-length v8, v4
 
@@ -697,7 +697,7 @@
 
     check-cast v4, Ljava/lang/Throwable;
 
-    sget-object v6, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v4}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -736,7 +736,7 @@
     :catch_0
     :cond_14
     :goto_8
-    sget-object v1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v1
 
diff --git a/com.discord/smali/com/camerakit/a$i.smali b/com.discord/smali/com/camerakit/a$i.smali
index c09349b318..c57f654563 100644
--- a/com.discord/smali/com/camerakit/a$i.smali
+++ b/com.discord/smali/com/camerakit/a$i.smali
@@ -105,7 +105,7 @@
 
     check-cast p1, Lcom/camerakit/a$i;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$i;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -139,7 +139,7 @@
 
     invoke-static {v0, p1, v1}, Lkotlinx/coroutines/f;->a(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$j$1.smali b/com.discord/smali/com/camerakit/a$j$1.smali
index 93a36ca39f..a385a1df70 100644
--- a/com.discord/smali/com/camerakit/a$j$1.smali
+++ b/com.discord/smali/com/camerakit/a$j$1.smali
@@ -106,7 +106,7 @@
 
     check-cast p1, Lcom/camerakit/a$j$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$j$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 
     iget-object p1, p1, Lcom/camerakit/a$j;->this$0:Lcom/camerakit/a;
 
-    sget-object v1, Lcom/camerakit/a$c;->nZ:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->nY:Lcom/camerakit/a$c;
 
     invoke-virtual {p1, v1}, Lcom/camerakit/a;->setLifecycleState(Lcom/camerakit/a$c;)V
 
@@ -193,9 +193,9 @@
 
     check-cast v2, Lkotlin/coroutines/Continuation;
 
-    iput-object v2, p1, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
+    iput-object v2, p1, Lcom/camerakit/a;->nL:Lkotlin/coroutines/Continuation;
 
-    sget-object v2, Lcom/camerakit/a$a;->nQ:Lcom/camerakit/a$a;
+    sget-object v2, Lcom/camerakit/a$a;->nP:Lcom/camerakit/a$a;
 
     invoke-virtual {p1, v2}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
@@ -228,7 +228,7 @@
 
     :cond_4
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$j.smali b/com.discord/smali/com/camerakit/a$j.smali
index 12a5027d2a..6013977865 100644
--- a/com.discord/smali/com/camerakit/a$j.smali
+++ b/com.discord/smali/com/camerakit/a$j.smali
@@ -111,7 +111,7 @@
 
     check-cast p1, Lcom/camerakit/a$j;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$j;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -145,7 +145,7 @@
 
     invoke-static {v0, p1, v1}, Lkotlinx/coroutines/f;->a(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$k$1.smali b/com.discord/smali/com/camerakit/a$k$1.smali
index 5fbccc292d..71622d33b8 100644
--- a/com.discord/smali/com/camerakit/a$k$1.smali
+++ b/com.discord/smali/com/camerakit/a$k$1.smali
@@ -106,7 +106,7 @@
 
     check-cast p1, Lcom/camerakit/a$k$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$k$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -161,7 +161,7 @@
 
     iget-object p1, p1, Lcom/camerakit/a$k;->this$0:Lcom/camerakit/a;
 
-    sget-object v1, Lcom/camerakit/a$c;->oc:Lcom/camerakit/a$c;
+    sget-object v1, Lcom/camerakit/a$c;->ob:Lcom/camerakit/a$c;
 
     invoke-virtual {p1, v1}, Lcom/camerakit/a;->setLifecycleState(Lcom/camerakit/a$c;)V
 
@@ -183,7 +183,7 @@
 
     check-cast v2, Lkotlin/coroutines/Continuation;
 
-    sget-object v3, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
+    sget-object v3, Lcom/camerakit/a$a;->nV:Lcom/camerakit/a$a;
 
     invoke-virtual {p1, v3}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
@@ -193,9 +193,9 @@
 
     invoke-interface {p1}, Lcom/camerakit/a/b;->release()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
-    sget-object v3, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v3, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -222,7 +222,7 @@
 
     :cond_4
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a$k.smali b/com.discord/smali/com/camerakit/a$k.smali
index 42713b06ab..6a1658e8a8 100644
--- a/com.discord/smali/com/camerakit/a$k.smali
+++ b/com.discord/smali/com/camerakit/a$k.smali
@@ -105,7 +105,7 @@
 
     check-cast p1, Lcom/camerakit/a$k;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/camerakit/a$k;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -139,7 +139,7 @@
 
     invoke-static {v0, p1, v1}, Lkotlinx/coroutines/f;->a(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
diff --git a/com.discord/smali/com/camerakit/a.smali b/com.discord/smali/com/camerakit/a.smali
index 70c5b76f00..da03308a38 100644
--- a/com.discord/smali/com/camerakit/a.smali
+++ b/com.discord/smali/com/camerakit/a.smali
@@ -20,7 +20,7 @@
 
 
 # static fields
-.field public static final nP:Lcom/camerakit/a$b;
+.field public static final nO:Lcom/camerakit/a$b;
 
 
 # instance fields
@@ -28,27 +28,25 @@
 
 .field private nB:I
 
-.field private nC:I
+.field private nC:Lcom/camerakit/b/c;
 
 .field private nD:Lcom/camerakit/b/c;
 
 .field private nE:Lcom/camerakit/b/c;
 
-.field private nF:Lcom/camerakit/b/c;
+.field private nF:Lcom/camerakit/b/b;
 
-.field private nG:Lcom/camerakit/b/b;
+.field private nG:F
 
-.field private nH:F
+.field nH:Lcom/camerakit/preview/CameraSurfaceTexture;
 
-.field nI:Lcom/camerakit/preview/CameraSurfaceTexture;
+.field nI:Lcom/camerakit/a/c;
 
-.field nJ:Lcom/camerakit/a/c;
+.field private final nJ:Lcom/camerakit/preview/CameraSurfaceView;
 
-.field private final nK:Lcom/camerakit/preview/CameraSurfaceView;
+.field final nK:Lkotlinx/coroutines/ab;
 
-.field final nL:Lkotlinx/coroutines/ab;
-
-.field nM:Lkotlin/coroutines/Continuation;
+.field nL:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -59,7 +57,7 @@
     .end annotation
 .end field
 
-.field private nN:Lkotlin/coroutines/Continuation;
+.field private nM:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -70,17 +68,19 @@
     .end annotation
 .end field
 
-.field private final nO:Lcom/camerakit/a/b;
+.field private final nN:Lcom/camerakit/a/b;
 
-.field private nm:Lcom/camerakit/b/a;
+.field private nl:Lcom/camerakit/b/a;
 
-.field private nw:Lcom/camerakit/a$c;
+.field private nv:Lcom/camerakit/a$c;
 
-.field private nx:Lcom/camerakit/a$f;
+.field private nw:Lcom/camerakit/a$f;
 
-.field private ny:Lcom/camerakit/a$a;
+.field private nx:Lcom/camerakit/a$a;
 
-.field private nz:Lcom/camerakit/a$d;
+.field private ny:Lcom/camerakit/a$d;
+
+.field private nz:I
 
 
 # direct methods
@@ -93,7 +93,7 @@
 
     invoke-direct {v0, v1}, Lcom/camerakit/a$b;-><init>(B)V
 
-    sput-object v0, Lcom/camerakit/a;->nP:Lcom/camerakit/a$b;
+    sput-object v0, Lcom/camerakit/a;->nO:Lcom/camerakit/a$b;
 
     return-void
 .end method
@@ -107,17 +107,17 @@
 
     invoke-direct {p0, p1}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
-    sget-object p1, Lcom/camerakit/a$c;->oc:Lcom/camerakit/a$c;
+    sget-object p1, Lcom/camerakit/a$c;->ob:Lcom/camerakit/a$c;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$c;
+    iput-object p1, p0, Lcom/camerakit/a;->nv:Lcom/camerakit/a$c;
 
-    sget-object p1, Lcom/camerakit/a$f;->of:Lcom/camerakit/a$f;
+    sget-object p1, Lcom/camerakit/a$f;->oe:Lcom/camerakit/a$f;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$f;
+    iput-object p1, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$f;
 
-    sget-object p1, Lcom/camerakit/a$a;->nX:Lcom/camerakit/a$a;
+    sget-object p1, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
 
-    iput-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$a;
+    iput-object p1, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$a;
 
     new-instance p1, Lcom/camerakit/b/c;
 
@@ -125,6 +125,12 @@
 
     invoke-direct {p1, v1, v1}, Lcom/camerakit/b/c;-><init>(II)V
 
+    iput-object p1, p0, Lcom/camerakit/a;->nC:Lcom/camerakit/b/c;
+
+    new-instance p1, Lcom/camerakit/b/c;
+
+    invoke-direct {p1, v1, v1}, Lcom/camerakit/b/c;-><init>(II)V
+
     iput-object p1, p0, Lcom/camerakit/a;->nD:Lcom/camerakit/b/c;
 
     new-instance p1, Lcom/camerakit/b/c;
@@ -133,23 +139,17 @@
 
     iput-object p1, p0, Lcom/camerakit/a;->nE:Lcom/camerakit/b/c;
 
-    new-instance p1, Lcom/camerakit/b/c;
+    sget-object p1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
-    invoke-direct {p1, v1, v1}, Lcom/camerakit/b/c;-><init>(II)V
-
-    iput-object p1, p0, Lcom/camerakit/a;->nF:Lcom/camerakit/b/c;
-
-    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
-
-    iput-object p1, p0, Lcom/camerakit/a;->nG:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a;->nF:Lcom/camerakit/b/b;
 
     const/high16 p1, 0x40000000    # 2.0f
 
-    iput p1, p0, Lcom/camerakit/a;->nH:F
+    iput p1, p0, Lcom/camerakit/a;->nG:F
 
-    sget-object p1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object p1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nm:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a;->nl:Lcom/camerakit/b/a;
 
     new-instance p1, Lcom/camerakit/preview/CameraSurfaceView;
 
@@ -161,7 +161,7 @@
 
     invoke-direct {p1, v2}, Lcom/camerakit/preview/CameraSurfaceView;-><init>(Landroid/content/Context;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nK:Lcom/camerakit/preview/CameraSurfaceView;
+    iput-object p1, p0, Lcom/camerakit/a;->nJ:Lcom/camerakit/preview/CameraSurfaceView;
 
     const-string p1, "name"
 
@@ -181,7 +181,7 @@
 
     check-cast p1, Lkotlinx/coroutines/ab;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
+    iput-object p1, p0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
 
     new-instance p1, Lcom/camerakit/a/f;
 
@@ -232,7 +232,7 @@
 
     check-cast p1, Lcom/camerakit/a/b;
 
-    iput-object p1, p0, Lcom/camerakit/a;->nO:Lcom/camerakit/a/b;
+    iput-object p1, p0, Lcom/camerakit/a;->nN:Lcom/camerakit/a/b;
 
     invoke-virtual {p0}, Lcom/camerakit/a;->getContext()Landroid/content/Context;
 
@@ -262,9 +262,9 @@
 
     mul-int/lit8 p1, p1, 0x5a
 
-    iput p1, p0, Lcom/camerakit/a;->nA:I
+    iput p1, p0, Lcom/camerakit/a;->nz:I
 
-    iget-object p1, p0, Lcom/camerakit/a;->nK:Lcom/camerakit/preview/CameraSurfaceView;
+    iget-object p1, p0, Lcom/camerakit/a;->nJ:Lcom/camerakit/preview/CameraSurfaceView;
 
     new-instance v0, Lcom/camerakit/a$1;
 
@@ -274,7 +274,7 @@
 
     invoke-virtual {p1, v0}, Lcom/camerakit/preview/CameraSurfaceView;->setCameraSurfaceTextureListener(Lcom/camerakit/preview/a;)V
 
-    iget-object p1, p0, Lcom/camerakit/a;->nK:Lcom/camerakit/preview/CameraSurfaceView;
+    iget-object p1, p0, Lcom/camerakit/a;->nJ:Lcom/camerakit/preview/CameraSurfaceView;
 
     check-cast p1, Landroid/view/View;
 
@@ -295,7 +295,7 @@
 .method public static final synthetic a(Lcom/camerakit/a;)Lcom/camerakit/b/a;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/a;->nm:Lcom/camerakit/b/a;
+    iget-object p0, p0, Lcom/camerakit/a;->nl:Lcom/camerakit/b/a;
 
     return-object p0
 .end method
@@ -303,7 +303,7 @@
 .method public static final synthetic a(Lcom/camerakit/a;Lcom/camerakit/b/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a;->nm:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a;->nl:Lcom/camerakit/b/a;
 
     return-void
 .end method
@@ -311,7 +311,7 @@
 .method public static final synthetic a(Lcom/camerakit/a;Lcom/camerakit/preview/CameraSurfaceTexture;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a;->nI:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iput-object p1, p0, Lcom/camerakit/a;->nH:Lcom/camerakit/preview/CameraSurfaceTexture;
 
     return-void
 .end method
@@ -319,7 +319,7 @@
 .method public static final synthetic a(Lcom/camerakit/a;Lkotlin/coroutines/Continuation;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a;->nN:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
 
     return-void
 .end method
@@ -327,7 +327,7 @@
 .method public static final synthetic b(Lcom/camerakit/a;)Lcom/camerakit/a/b;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/a;->nO:Lcom/camerakit/a/b;
+    iget-object p0, p0, Lcom/camerakit/a;->nN:Lcom/camerakit/a/b;
 
     return-object p0
 .end method
@@ -341,19 +341,19 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nQ:Lcom/camerakit/a$a;
 
     invoke-virtual {p0, v0}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nJ:Lcom/camerakit/a/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nI:Lcom/camerakit/a/c;
 
-    iget-object p1, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lcom/camerakit/a;->nL:Lkotlin/coroutines/Continuation;
 
     if-eqz p1, :cond_0
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
-    sget-object v1, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -364,7 +364,7 @@
     :cond_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lcom/camerakit/a;->nL:Lkotlin/coroutines/Continuation;
 
     return-void
 .end method
@@ -372,17 +372,17 @@
 .method public final bP()V
     .locals 3
 
-    sget-object v0, Lcom/camerakit/a$a;->nT:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nS:Lcom/camerakit/a$a;
 
     invoke-virtual {p0, v0}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
-    iget-object v0, p0, Lcom/camerakit/a;->nN:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -393,7 +393,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/camerakit/a;->nN:Lkotlin/coroutines/Continuation;
+    iput-object v0, p0, Lcom/camerakit/a;->nM:Lkotlin/coroutines/Continuation;
 
     return-void
 .end method
@@ -401,7 +401,7 @@
 .method public final bQ()V
     .locals 1
 
-    sget-object v0, Lcom/camerakit/a$a;->nV:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nU:Lcom/camerakit/a$a;
 
     invoke-virtual {p0, v0}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
@@ -411,11 +411,11 @@
 .method public final bT()V
     .locals 4
 
-    sget-object v0, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v0, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    iget-object v1, p0, Lcom/camerakit/a;->nL:Lkotlinx/coroutines/ab;
+    iget-object v1, p0, Lcom/camerakit/a;->nK:Lkotlinx/coroutines/ab;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext;
 
@@ -437,7 +437,7 @@
 .method public final getCameraState()Lcom/camerakit/a$a;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$a;
+    iget-object v0, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$a;
 
     return-object v0
 .end method
@@ -445,7 +445,7 @@
 .method public final getCaptureOrientation()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a;->nC:I
+    iget v0, p0, Lcom/camerakit/a;->nB:I
 
     return v0
 .end method
@@ -453,7 +453,7 @@
 .method public final getDisplayOrientation()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a;->nA:I
+    iget v0, p0, Lcom/camerakit/a;->nz:I
 
     return v0
 .end method
@@ -461,7 +461,7 @@
 .method public final getFlash()Lcom/camerakit/b/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nG:Lcom/camerakit/b/b;
+    iget-object v0, p0, Lcom/camerakit/a;->nF:Lcom/camerakit/b/b;
 
     return-object v0
 .end method
@@ -469,7 +469,7 @@
 .method public final getImageMegaPixels()F
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a;->nH:F
+    iget v0, p0, Lcom/camerakit/a;->nG:F
 
     return v0
 .end method
@@ -477,7 +477,7 @@
 .method public final getLifecycleState()Lcom/camerakit/a$c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$c;
+    iget-object v0, p0, Lcom/camerakit/a;->nv:Lcom/camerakit/a$c;
 
     return-object v0
 .end method
@@ -485,7 +485,7 @@
 .method public final getListener()Lcom/camerakit/a$d;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
+    iget-object v0, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
 
     return-object v0
 .end method
@@ -493,7 +493,7 @@
 .method public final getPhotoSize()Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nF:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a;->nE:Lcom/camerakit/b/c;
 
     return-object v0
 .end method
@@ -501,7 +501,7 @@
 .method public final getPreviewOrientation()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a;->nB:I
+    iget v0, p0, Lcom/camerakit/a;->nA:I
 
     return v0
 .end method
@@ -509,7 +509,7 @@
 .method public final getPreviewSize()Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nD:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a;->nC:Lcom/camerakit/b/c;
 
     return-object v0
 .end method
@@ -517,16 +517,16 @@
 .method public final getSurfaceSize()Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nI:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iget-object v0, p0, Lcom/camerakit/a;->nH:Lcom/camerakit/preview/CameraSurfaceTexture;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iget-object v0, v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/camerakit/a;->nE:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a;->nD:Lcom/camerakit/b/c;
 
     :cond_1
     return-object v0
@@ -535,7 +535,7 @@
 .method public final getSurfaceState()Lcom/camerakit/a$f;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$f;
+    iget-object v0, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$f;
 
     return-object v0
 .end method
@@ -543,7 +543,7 @@
 .method public final onCameraClosed()V
     .locals 1
 
-    sget-object v0, Lcom/camerakit/a$a;->nX:Lcom/camerakit/a$a;
+    sget-object v0, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
 
     invoke-virtual {p0, v0}, Lcom/camerakit/a;->setCameraState(Lcom/camerakit/a$a;)V
 
@@ -557,7 +557,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$a;
+    iput-object p1, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$a;
 
     sget-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$0:[I
 
@@ -586,7 +586,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_1
 
@@ -597,7 +597,7 @@
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_3
 
@@ -607,7 +607,7 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_5
 
@@ -617,7 +617,7 @@
     return-void
 
     :cond_6
-    iget-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
+    iget-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
 
     if-eqz p1, :cond_7
 
@@ -630,7 +630,7 @@
 .method public final setCaptureOrientation(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a;->nC:I
+    iput p1, p0, Lcom/camerakit/a;->nB:I
 
     return-void
 .end method
@@ -638,7 +638,7 @@
 .method public final setDisplayOrientation(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a;->nA:I
+    iput p1, p0, Lcom/camerakit/a;->nz:I
 
     return-void
 .end method
@@ -650,7 +650,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nG:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a;->nF:Lcom/camerakit/b/b;
 
     return-void
 .end method
@@ -658,7 +658,7 @@
 .method public final setImageMegaPixels(F)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a;->nH:F
+    iput p1, p0, Lcom/camerakit/a;->nG:F
 
     return-void
 .end method
@@ -670,7 +670,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$c;
+    iput-object p1, p0, Lcom/camerakit/a;->nv:Lcom/camerakit/a$c;
 
     return-void
 .end method
@@ -678,7 +678,7 @@
 .method public final setListener(Lcom/camerakit/a$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a;->nz:Lcom/camerakit/a$d;
+    iput-object p1, p0, Lcom/camerakit/a;->ny:Lcom/camerakit/a$d;
 
     return-void
 .end method
@@ -690,7 +690,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nF:Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nE:Lcom/camerakit/b/c;
 
     return-void
 .end method
@@ -698,7 +698,7 @@
 .method public final setPreviewOrientation(I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a;->nB:I
+    iput p1, p0, Lcom/camerakit/a;->nA:I
 
     return-void
 .end method
@@ -710,7 +710,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nD:Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nC:Lcom/camerakit/b/c;
 
     return-void
 .end method
@@ -722,7 +722,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nE:Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a;->nD:Lcom/camerakit/b/c;
 
     return-void
 .end method
@@ -734,7 +734,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a;->nx:Lcom/camerakit/a$f;
+    iput-object p1, p0, Lcom/camerakit/a;->nw:Lcom/camerakit/a$f;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/camerakit/a/a/a$a.smali b/com.discord/smali/com/camerakit/a/a/a$a.smali
index 09124c7465..44ccf8c89f 100644
--- a/com.discord/smali/com/camerakit/a/a/a$a.smali
+++ b/com.discord/smali/com/camerakit/a/a/a$a.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final oA:[Lcom/camerakit/b/c;
+.field private final oA:[Lcom/camerakit/b/b;
 
-.field private final oB:[Lcom/camerakit/b/b;
+.field private final ow:Lcom/camerakit/b/a;
 
-.field private final ox:Lcom/camerakit/b/a;
+.field private final ox:I
 
-.field private final oy:I
+.field private final oy:[Lcom/camerakit/b/c;
 
 .field private final oz:[Lcom/camerakit/b/c;
 
@@ -47,29 +47,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p3, p0, Lcom/camerakit/a/a/a$a;->ox:Lcom/camerakit/b/a;
+    iput-object p3, p0, Lcom/camerakit/a/a/a$a;->ow:Lcom/camerakit/b/a;
 
     iget p1, p1, Landroid/hardware/Camera$CameraInfo;->orientation:I
 
-    iput p1, p0, Lcom/camerakit/a/a/a$a;->oy:I
+    iput p1, p0, Lcom/camerakit/a/a/a$a;->ox:I
 
     invoke-static {p2}, Lcom/camerakit/a/a/a/a;->a(Landroid/hardware/Camera$Parameters;)[Lcom/camerakit/b/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oz:[Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oy:[Lcom/camerakit/b/c;
 
     invoke-static {p2}, Lcom/camerakit/a/a/a/a;->b(Landroid/hardware/Camera$Parameters;)[Lcom/camerakit/b/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oA:[Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oz:[Lcom/camerakit/b/c;
 
     invoke-static {p2}, Lcom/camerakit/a/a/a/a;->c(Landroid/hardware/Camera$Parameters;)[Lcom/camerakit/b/b;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oB:[Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$a;->oA:[Lcom/camerakit/b/b;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 .method public final bW()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a/a/a$a;->oy:I
+    iget v0, p0, Lcom/camerakit/a/a/a$a;->ox:I
 
     return v0
 .end method
@@ -87,7 +87,7 @@
 .method public final bX()[Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a$a;->oz:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/a/a$a;->oy:[Lcom/camerakit/b/c;
 
     return-object v0
 .end method
@@ -95,7 +95,7 @@
 .method public final bY()[Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a$a;->oA:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/a/a$a;->oz:[Lcom/camerakit/b/c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/camerakit/a/a/a$b.smali b/com.discord/smali/com/camerakit/a/a/a$b.smali
index a62bd3332f..38d8d7f5f6 100644
--- a/com.discord/smali/com/camerakit/a/a/a$b.smali
+++ b/com.discord/smali/com/camerakit/a/a/a$b.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic oC:Lkotlin/jvm/functions/Function1;
+.field final synthetic oB:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic oD:Landroid/hardware/Camera;
+.field final synthetic oC:Landroid/hardware/Camera;
 
 
 # direct methods
 .method constructor <init>(Lkotlin/jvm/functions/Function1;Landroid/hardware/Camera;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a$b;->oC:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$b;->oB:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/camerakit/a/a/a$b;->oD:Landroid/hardware/Camera;
+    iput-object p2, p0, Lcom/camerakit/a/a/a$b;->oC:Landroid/hardware/Camera;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,7 +41,7 @@
 .method public final onPictureTaken([BLandroid/hardware/Camera;)V
     .locals 1
 
-    iget-object p2, p0, Lcom/camerakit/a/a/a$b;->oC:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/camerakit/a/a/a$b;->oB:Lkotlin/jvm/functions/Function1;
 
     const-string v0, "data"
 
@@ -49,7 +49,7 @@
 
     invoke-interface {p2, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object p1, p0, Lcom/camerakit/a/a/a$b;->oD:Landroid/hardware/Camera;
+    iget-object p1, p0, Lcom/camerakit/a/a/a$b;->oC:Landroid/hardware/Camera;
 
     invoke-virtual {p1}, Landroid/hardware/Camera;->startPreview()V
 
diff --git a/com.discord/smali/com/camerakit/a/a/a$c.smali b/com.discord/smali/com/camerakit/a/a/a$c.smali
index 83d21a68ef..389d6aafa6 100644
--- a/com.discord/smali/com/camerakit/a/a/a$c.smali
+++ b/com.discord/smali/com/camerakit/a/a/a$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic oE:Lcom/camerakit/a/a/a;
+.field final synthetic oD:Lcom/camerakit/a/a/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/a/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a$c;->oE:Lcom/camerakit/a/a/a;
+    iput-object p1, p0, Lcom/camerakit/a/a/a$c;->oD:Lcom/camerakit/a/a/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onPreviewFrame([BLandroid/hardware/Camera;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/camerakit/a/a/a$c;->oE:Lcom/camerakit/a/a/a;
+    iget-object p1, p0, Lcom/camerakit/a/a/a$c;->oD:Lcom/camerakit/a/a/a;
 
     invoke-virtual {p1}, Lcom/camerakit/a/a/a;->bP()V
 
diff --git a/com.discord/smali/com/camerakit/a/a/a.smali b/com.discord/smali/com/camerakit/a/a/a.smali
index 286b8d000f..fdccee9f8b 100644
--- a/com.discord/smali/com/camerakit/a/a/a.smali
+++ b/com.discord/smali/com/camerakit/a/a/a.smali
@@ -18,11 +18,11 @@
 # instance fields
 .field private camera:Landroid/hardware/Camera;
 
-.field private final ou:Lcom/camerakit/a/e;
+.field private final ot:Lcom/camerakit/a/e;
 
-.field private ov:Lcom/camerakit/a/c;
+.field private ou:Lcom/camerakit/a/c;
 
-.field private final synthetic ow:Lcom/camerakit/a/d;
+.field private final synthetic ov:Lcom/camerakit/a/d;
 
 
 # direct methods
@@ -35,15 +35,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a;->ow:Lcom/camerakit/a/d;
+    iput-object p1, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/d;
 
-    sget-object p1, Lcom/camerakit/a/e;->oq:Lcom/camerakit/a/e$a;
+    sget-object p1, Lcom/camerakit/a/e;->oo:Lcom/camerakit/a/e$a;
 
     invoke-static {}, Lcom/camerakit/a/e$a;->bZ()Lcom/camerakit/a/e;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/camerakit/a/a/a;->ou:Lcom/camerakit/a/e;
+    iput-object p1, p0, Lcom/camerakit/a/a/a;->ot:Lcom/camerakit/a/e;
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/d;->a(Lcom/camerakit/a/c;)V
 
@@ -222,7 +222,7 @@
 
     check-cast v4, Lcom/camerakit/a/c;
 
-    iput-object v4, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/c;
+    iput-object v4, p0, Lcom/camerakit/a/a/a;->ou:Lcom/camerakit/a/c;
 
     check-cast v6, Lcom/camerakit/a/c;
 
@@ -305,7 +305,7 @@
 .method public final bP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0}, Lcom/camerakit/a/d;->bP()V
 
@@ -315,7 +315,7 @@
 .method public final bQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0}, Lcom/camerakit/a/d;->bQ()V
 
@@ -354,7 +354,7 @@
 .method public final bV()Lcom/camerakit/a/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a;->ou:Lcom/camerakit/a/e;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ot:Lcom/camerakit/a/e;
 
     return-object v0
 .end method
@@ -362,7 +362,7 @@
 .method public final onCameraClosed()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/a/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0}, Lcom/camerakit/a/d;->onCameraClosed()V
 
@@ -386,7 +386,7 @@
 
     iput-object v0, p0, Lcom/camerakit/a/a/a;->camera:Landroid/hardware/Camera;
 
-    iput-object v0, p0, Lcom/camerakit/a/a/a;->ov:Lcom/camerakit/a/c;
+    iput-object v0, p0, Lcom/camerakit/a/a/a;->ou:Lcom/camerakit/a/c;
 
     invoke-virtual {p0}, Lcom/camerakit/a/a/a;->onCameraClosed()V
     :try_end_0
diff --git a/com.discord/smali/com/camerakit/a/a/a/a.smali b/com.discord/smali/com/camerakit/a/a/a/a.smali
index ca49566d9c..c97a4e2cd2 100644
--- a/com.discord/smali/com/camerakit/a/a/a/a.smali
+++ b/com.discord/smali/com/camerakit/a/a/a/a.smali
@@ -390,7 +390,7 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->pi:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
 
     goto :goto_5
 
@@ -401,7 +401,7 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     goto :goto_5
 
@@ -412,7 +412,7 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
     goto :goto_5
 
@@ -423,13 +423,13 @@
 
     if-eqz v2, :cond_e
 
-    sget-object v2, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     goto :goto_5
 
     :cond_e
     :goto_4
-    sget-object v2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object v2, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
     :goto_5
     invoke-interface {p0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/com/camerakit/a/a/b.smali b/com.discord/smali/com/camerakit/a/a/b.smali
index 926938f2c7..a7e1455d3f 100644
--- a/com.discord/smali/com/camerakit/a/a/b.smali
+++ b/com.discord/smali/com/camerakit/a/a/b.smali
@@ -22,7 +22,7 @@
 
     sput-object v0, Lcom/camerakit/a/a/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
@@ -34,7 +34,7 @@
 
     sget-object v0, Lcom/camerakit/a/a/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
@@ -54,7 +54,7 @@
 
     sput-object v0, Lcom/camerakit/a/a/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
@@ -64,7 +64,7 @@
 
     sget-object v0, Lcom/camerakit/a/a/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
@@ -74,7 +74,7 @@
 
     sget-object v0, Lcom/camerakit/a/a/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
@@ -86,7 +86,7 @@
 
     sget-object v0, Lcom/camerakit/a/a/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pi:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
diff --git a/com.discord/smali/com/camerakit/a/b/a$a.smali b/com.discord/smali/com/camerakit/a/b/a$a.smali
index ff04be925c..6e97133de8 100644
--- a/com.discord/smali/com/camerakit/a/b/a$a.smali
+++ b/com.discord/smali/com/camerakit/a/b/a$a.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final oA:[Lcom/camerakit/b/c;
+.field private final oA:[Lcom/camerakit/b/b;
 
-.field private final oB:[Lcom/camerakit/b/b;
+.field private final ow:Lcom/camerakit/b/a;
 
-.field private final ox:Lcom/camerakit/b/a;
+.field private final ox:I
 
-.field private final oy:I
+.field private final oy:[Lcom/camerakit/b/c;
 
 .field private final oz:[Lcom/camerakit/b/c;
 
@@ -43,7 +43,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/camerakit/a/b/a$a;->ox:Lcom/camerakit/b/a;
+    iput-object p2, p0, Lcom/camerakit/a/b/a$a;->ow:Lcom/camerakit/b/a;
 
     const-string p2, "receiver$0"
 
@@ -71,19 +71,19 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput v0, p0, Lcom/camerakit/a/b/a$a;->oy:I
+    iput v0, p0, Lcom/camerakit/a/b/a$a;->ox:I
 
     invoke-static {p1}, Lcom/camerakit/a/b/a/a;->a(Landroid/hardware/camera2/CameraCharacteristics;)[Lcom/camerakit/b/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/camerakit/a/b/a$a;->oz:[Lcom/camerakit/b/c;
+    iput-object v0, p0, Lcom/camerakit/a/b/a$a;->oy:[Lcom/camerakit/b/c;
 
     invoke-static {p1}, Lcom/camerakit/a/b/a/a;->b(Landroid/hardware/camera2/CameraCharacteristics;)[Lcom/camerakit/b/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/camerakit/a/b/a$a;->oA:[Lcom/camerakit/b/c;
+    iput-object v0, p0, Lcom/camerakit/a/b/a$a;->oz:[Lcom/camerakit/b/c;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -109,25 +109,25 @@
 
     new-array p1, p1, [Lcom/camerakit/b/b;
 
-    sget-object p2, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object p2, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
     aput-object p2, p1, v1
 
     const/4 p2, 0x1
 
-    sget-object v0, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     aput-object v0, p1, p2
 
     const/4 p2, 0x2
 
-    sget-object v0, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     aput-object v0, p1, p2
 
     const/4 p2, 0x3
 
-    sget-object v0, Lcom/camerakit/b/b;->pi:Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
 
     aput-object v0, p1, p2
 
@@ -137,7 +137,7 @@
     new-array p1, v1, [Lcom/camerakit/b/b;
 
     :goto_1
-    iput-object p1, p0, Lcom/camerakit/a/b/a$a;->oB:[Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/b/a$a;->oA:[Lcom/camerakit/b/b;
 
     return-void
 .end method
@@ -147,7 +147,7 @@
 .method public final bW()I
     .locals 1
 
-    iget v0, p0, Lcom/camerakit/a/b/a$a;->oy:I
+    iget v0, p0, Lcom/camerakit/a/b/a$a;->ox:I
 
     return v0
 .end method
@@ -155,7 +155,7 @@
 .method public final bX()[Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a$a;->oz:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/b/a$a;->oy:[Lcom/camerakit/b/c;
 
     return-object v0
 .end method
@@ -163,7 +163,7 @@
 .method public final bY()[Lcom/camerakit/b/c;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a$a;->oA:[Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/a/b/a$a;->oz:[Lcom/camerakit/b/c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/camerakit/a/b/a$d$1.smali b/com.discord/smali/com/camerakit/a/b/a$d$1.smali
index d470894feb..125bd0a0f4 100644
--- a/com.discord/smali/com/camerakit/a/b/a$d$1.smali
+++ b/com.discord/smali/com/camerakit/a/b/a$d$1.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic oP:Lcom/camerakit/a/b/a$d;
+.field final synthetic oO:Lcom/camerakit/a/b/a$d;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a$d$1;->oP:Lcom/camerakit/a/b/a$d;
+    iput-object p1, p0, Lcom/camerakit/a/b/a$d$1;->oO:Lcom/camerakit/a/b/a$d;
 
     invoke-direct {p0}, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p3, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$d$1;->oP:Lcom/camerakit/a/b/a$d;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$d$1;->oO:Lcom/camerakit/a/b/a$d;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$d;->this$0:Lcom/camerakit/a/b/a;
 
diff --git a/com.discord/smali/com/camerakit/a/b/a$d.smali b/com.discord/smali/com/camerakit/a/b/a$d.smali
index bed9b40519..7746c0eddf 100644
--- a/com.discord/smali/com/camerakit/a/b/a$d.smali
+++ b/com.discord/smali/com/camerakit/a/b/a$d.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field final synthetic oN:Landroid/hardware/camera2/CameraCaptureSession;
+.field final synthetic oM:Landroid/hardware/camera2/CameraCaptureSession;
 
-.field final synthetic oO:Landroid/hardware/camera2/CaptureRequest$Builder;
+.field final synthetic oN:Landroid/hardware/camera2/CaptureRequest$Builder;
 
 .field final synthetic this$0:Lcom/camerakit/a/b/a;
 
@@ -31,9 +31,9 @@
 
     iput-object p1, p0, Lcom/camerakit/a/b/a$d;->this$0:Lcom/camerakit/a/b/a;
 
-    iput-object p2, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CameraCaptureSession;
+    iput-object p2, p0, Lcom/camerakit/a/b/a$d;->oM:Landroid/hardware/camera2/CameraCaptureSession;
 
-    iput-object p3, p0, Lcom/camerakit/a/b/a$d;->oO:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iput-object p3, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,9 +45,9 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CameraCaptureSession;
+    iget-object v0, p0, Lcom/camerakit/a/b/a$d;->oM:Landroid/hardware/camera2/CameraCaptureSession;
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a$d;->oO:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object v1, p0, Lcom/camerakit/a/b/a$d;->oN:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     invoke-virtual {v1}, Landroid/hardware/camera2/CaptureRequest$Builder;->build()Landroid/hardware/camera2/CaptureRequest;
 
@@ -61,7 +61,7 @@
 
     iget-object v3, p0, Lcom/camerakit/a/b/a$d;->this$0:Lcom/camerakit/a/b/a;
 
-    iget-object v3, v3, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v3, v3, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v3, Landroid/os/Handler;
 
diff --git a/com.discord/smali/com/camerakit/a/b/a$e$1.smali b/com.discord/smali/com/camerakit/a/b/a$e$1.smali
index 8b3b9b2547..a89c335215 100644
--- a/com.discord/smali/com/camerakit/a/b/a$e$1.smali
+++ b/com.discord/smali/com/camerakit/a/b/a$e$1.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic oQ:Lcom/camerakit/a/b/a$e;
+.field final synthetic oP:Lcom/camerakit/a/b/a$e;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iput-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     invoke-direct {p0}, Landroid/hardware/camera2/CameraDevice$StateCallback;-><init>()V
 
@@ -45,7 +45,7 @@
 
     invoke-virtual {p1}, Landroid/hardware/camera2/CameraDevice;->close()V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
@@ -53,13 +53,13 @@
 
     invoke-static {p1, v0}, Lcom/camerakit/a/b/a;->a(Lcom/camerakit/a/b/a;Landroid/hardware/camera2/CameraDevice;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
     invoke-static {p1, v0}, Lcom/camerakit/a/b/a;->a(Lcom/camerakit/a/b/a;Landroid/hardware/camera2/CameraCaptureSession;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
@@ -77,7 +77,7 @@
 
     invoke-virtual {p1}, Landroid/hardware/camera2/CameraDevice;->close()V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
@@ -85,7 +85,7 @@
 
     invoke-static {p1, p2}, Lcom/camerakit/a/b/a;->a(Lcom/camerakit/a/b/a;Landroid/hardware/camera2/CameraDevice;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
@@ -103,7 +103,7 @@
 
     new-instance v0, Lcom/camerakit/a/b/a$a;
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object v1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object v1, v1, Lcom/camerakit/a/b/a$e;->$cameraCharacteristics:Landroid/hardware/camera2/CameraCharacteristics;
 
@@ -111,19 +111,19 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object v2, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object v2, v2, Lcom/camerakit/a/b/a$e;->$facing:Lcom/camerakit/b/a;
 
     invoke-direct {v0, v1, v2}, Lcom/camerakit/a/b/a$a;-><init>(Landroid/hardware/camera2/CameraCharacteristics;Lcom/camerakit/b/a;)V
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object v1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object v1, v1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
     invoke-static {v1, p1}, Lcom/camerakit/a/b/a;->a(Lcom/camerakit/a/b/a;Landroid/hardware/camera2/CameraDevice;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
@@ -131,7 +131,7 @@
 
     invoke-static {p1, v0}, Lcom/camerakit/a/b/a;->a(Lcom/camerakit/a/b/a;Lcom/camerakit/a/c;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oQ:Lcom/camerakit/a/b/a$e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a$e$1;->oP:Lcom/camerakit/a/b/a$e;
 
     iget-object p1, p1, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
diff --git a/com.discord/smali/com/camerakit/a/b/a$e.smali b/com.discord/smali/com/camerakit/a/b/a$e.smali
index ef0170731f..a84e52e6bd 100644
--- a/com.discord/smali/com/camerakit/a/b/a$e.smali
+++ b/com.discord/smali/com/camerakit/a/b/a$e.smali
@@ -76,13 +76,13 @@
 
     iget-object v3, p0, Lcom/camerakit/a/b/a$e;->this$0:Lcom/camerakit/a/b/a;
 
-    iget-object v3, v3, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v3, v3, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v3, Landroid/os/Handler;
 
     invoke-virtual {v0, v1, v2, v3}, Landroid/hardware/camera2/CameraManager;->openCamera(Ljava/lang/String;Landroid/hardware/camera2/CameraDevice$StateCallback;Landroid/os/Handler;)V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/camerakit/a/b/a$f.smali b/com.discord/smali/com/camerakit/a/b/a$f.smali
index fe08332c31..1b18b406b0 100644
--- a/com.discord/smali/com/camerakit/a/b/a$f.smali
+++ b/com.discord/smali/com/camerakit/a/b/a$f.smali
@@ -109,7 +109,7 @@
 
     iget-object v3, p0, Lcom/camerakit/a/b/a$f;->this$0:Lcom/camerakit/a/b/a;
 
-    iget-object v3, v3, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v3, v3, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v3, Landroid/os/Handler;
 
@@ -120,7 +120,7 @@
     invoke-static {p1, v0}, Lcom/camerakit/a/b/a;->a(Lcom/camerakit/a/b/a;Landroid/hardware/camera2/CaptureRequest$Builder;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/camerakit/a/b/a.smali b/com.discord/smali/com/camerakit/a/b/a.smali
index d1f3511ccf..c075b6a195 100644
--- a/com.discord/smali/com/camerakit/a/b/a.smali
+++ b/com.discord/smali/com/camerakit/a/b/a.smali
@@ -17,7 +17,7 @@
 
 
 # static fields
-.field public static final oM:Lcom/camerakit/a/b/a$b;
+.field public static final oL:Lcom/camerakit/a/b/a$b;
 
 
 # instance fields
@@ -27,15 +27,15 @@
 
 .field private captureSession:Landroid/hardware/camera2/CameraCaptureSession;
 
-.field private nG:Lcom/camerakit/b/b;
+.field private nF:Lcom/camerakit/b/b;
 
-.field private nm:Lcom/camerakit/b/a;
+.field private nl:Lcom/camerakit/b/a;
 
-.field private oF:Landroid/hardware/camera2/CaptureRequest$Builder;
+.field private oE:Landroid/hardware/camera2/CaptureRequest$Builder;
 
-.field private oG:Landroid/media/ImageReader;
+.field private oF:Landroid/media/ImageReader;
 
-.field private oH:Lkotlin/jvm/functions/Function1;
+.field private oG:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -46,19 +46,19 @@
     .end annotation
 .end field
 
-.field private oI:Z
+.field private oH:Z
+
+.field private oI:I
 
 .field private oJ:I
 
-.field private oK:I
+.field private final oK:Lcom/camerakit/a/b/a$c;
 
-.field private final oL:Lcom/camerakit/a/b/a$c;
+.field final ot:Lcom/camerakit/a/e;
 
-.field final ou:Lcom/camerakit/a/e;
+.field private ou:Lcom/camerakit/a/c;
 
-.field private ov:Lcom/camerakit/a/c;
-
-.field private final synthetic ow:Lcom/camerakit/a/d;
+.field private final synthetic ov:Lcom/camerakit/a/d;
 
 
 # direct methods
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v1}, Lcom/camerakit/a/b/a$b;-><init>(B)V
 
-    sput-object v0, Lcom/camerakit/a/b/a;->oM:Lcom/camerakit/a/b/a$b;
+    sput-object v0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$b;
 
     return-void
 .end method
@@ -89,15 +89,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->ow:Lcom/camerakit/a/d;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/d;
 
-    sget-object p1, Lcom/camerakit/a/e;->oq:Lcom/camerakit/a/e$a;
+    sget-object p1, Lcom/camerakit/a/e;->oo:Lcom/camerakit/a/e$a;
 
     invoke-static {}, Lcom/camerakit/a/e$a;->bZ()Lcom/camerakit/a/e;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     const-string p1, "camera"
 
@@ -111,19 +111,19 @@
 
     iput-object p1, p0, Lcom/camerakit/a/b/a;->cameraManager:Landroid/hardware/camera2/CameraManager;
 
-    sget-object p1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sget-object p1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->nG:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nF:Lcom/camerakit/b/b;
 
-    sget-object p1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object p1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->nm:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nl:Lcom/camerakit/b/a;
 
     new-instance p1, Lcom/camerakit/a/b/a$c;
 
     invoke-direct {p1, p0}, Lcom/camerakit/a/b/a$c;-><init>(Lcom/camerakit/a/b/a;)V
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     return-void
 
@@ -148,7 +148,7 @@
 .method public static final synthetic a(Lcom/camerakit/a/b/a;I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a/b/a;->oK:I
+    iput p1, p0, Lcom/camerakit/a/b/a;->oJ:I
 
     return-void
 .end method
@@ -172,7 +172,7 @@
 .method public static final synthetic a(Lcom/camerakit/a/b/a;Landroid/hardware/camera2/CaptureRequest$Builder;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->oF:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     return-void
 .end method
@@ -180,7 +180,7 @@
 .method public static final synthetic a(Lcom/camerakit/a/b/a;Lcom/camerakit/a/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/c;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/c;
 
     return-void
 .end method
@@ -188,7 +188,7 @@
 .method public static final synthetic b(Lcom/camerakit/a/b/a;)Lcom/camerakit/a/b/a$c;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     return-object p0
 .end method
@@ -196,7 +196,7 @@
 .method public static final synthetic b(Lcom/camerakit/a/b/a;I)V
     .locals 0
 
-    iput p1, p0, Lcom/camerakit/a/b/a;->oJ:I
+    iput p1, p0, Lcom/camerakit/a/b/a;->oI:I
 
     return-void
 .end method
@@ -204,7 +204,7 @@
 .method public static final synthetic c(Lcom/camerakit/a/b/a;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->oF:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     iget-object v1, p0, Lcom/camerakit/a/b/a;->captureSession:Landroid/hardware/camera2/CameraCaptureSession;
 
@@ -226,11 +226,11 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iget-object v3, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     check-cast v3, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object v4, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v4, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v4, Landroid/os/Handler;
 
@@ -238,7 +238,7 @@
 
     const/4 v2, 0x0
 
-    iput v2, p0, Lcom/camerakit/a/b/a;->oK:I
+    iput v2, p0, Lcom/camerakit/a/b/a;->oJ:I
 
     sget-object v3, Landroid/hardware/camera2/CaptureRequest;->CONTROL_AF_TRIGGER:Landroid/hardware/camera2/CaptureRequest$Key;
 
@@ -258,11 +258,11 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     check-cast v2, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast p0, Landroid/os/Handler;
 
@@ -279,7 +279,7 @@
 
     iget-object v1, p0, Lcom/camerakit/a/b/a;->cameraDevice:Landroid/hardware/camera2/CameraDevice;
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
 
     if-eqz v0, :cond_2
 
@@ -311,7 +311,7 @@
 
     sget-object v2, Landroid/hardware/camera2/CaptureRequest;->FLASH_MODE:Landroid/hardware/camera2/CaptureRequest$Key;
 
-    iget-object v3, p0, Lcom/camerakit/a/b/a;->nG:Lcom/camerakit/b/b;
+    iget-object v3, p0, Lcom/camerakit/a/b/a;->nF:Lcom/camerakit/b/b;
 
     sget-object v4, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$1:[I
 
@@ -339,7 +339,7 @@
 
     invoke-virtual {v1, v2, v3}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a;->nG:Lcom/camerakit/b/b;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->nF:Lcom/camerakit/b/b;
 
     sget-object v3, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$2:[I
 
@@ -359,7 +359,7 @@
     const-wide/16 v2, 0x4b
 
     :goto_1
-    iget-object v4, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v4, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     new-instance v5, Lcom/camerakit/a/b/a$d;
 
@@ -376,7 +376,7 @@
 .method public static final synthetic d(Lcom/camerakit/a/b/a;)I
     .locals 0
 
-    iget p0, p0, Lcom/camerakit/a/b/a;->oK:I
+    iget p0, p0, Lcom/camerakit/a/b/a;->oJ:I
 
     return p0
 .end method
@@ -384,7 +384,7 @@
 .method public static final synthetic e(Lcom/camerakit/a/b/a;)Landroid/media/ImageReader;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
 
     return-object p0
 .end method
@@ -392,7 +392,7 @@
 .method public static final synthetic f(Lcom/camerakit/a/b/a;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->oH:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->oG:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -402,7 +402,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/camerakit/a/b/a;->oH:Lkotlin/jvm/functions/Function1;
+    iput-object v0, p0, Lcom/camerakit/a/b/a;->oG:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -410,7 +410,7 @@
 .method public static final synthetic h(Lcom/camerakit/a/b/a;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->oF:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     iget-object v1, p0, Lcom/camerakit/a/b/a;->captureSession:Landroid/hardware/camera2/CameraCaptureSession;
 
@@ -430,17 +430,17 @@
 
     const/4 v2, 0x2
 
-    iput v2, p0, Lcom/camerakit/a/b/a;->oK:I
+    iput v2, p0, Lcom/camerakit/a/b/a;->oJ:I
 
     invoke-virtual {v0}, Landroid/hardware/camera2/CaptureRequest$Builder;->build()Landroid/hardware/camera2/CaptureRequest;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iget-object v5, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     check-cast v5, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object v6, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v6, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v6, Landroid/os/Handler;
 
@@ -454,7 +454,7 @@
 
     sget-object v4, Landroid/hardware/camera2/CaptureRequest;->FLASH_MODE:Landroid/hardware/camera2/CaptureRequest$Key;
 
-    iget-object v5, p0, Lcom/camerakit/a/b/a;->nG:Lcom/camerakit/b/b;
+    iget-object v5, p0, Lcom/camerakit/a/b/a;->nF:Lcom/camerakit/b/b;
 
     sget-object v6, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$0:[I
 
@@ -479,11 +479,11 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     check-cast v2, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object p0, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object p0, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast p0, Landroid/os/Handler;
 
@@ -504,7 +504,7 @@
 .method public static final synthetic j(Lcom/camerakit/a/b/a;)I
     .locals 0
 
-    iget p0, p0, Lcom/camerakit/a/b/a;->oJ:I
+    iget p0, p0, Lcom/camerakit/a/b/a;->oI:I
 
     return p0
 .end method
@@ -512,7 +512,7 @@
 .method public static final synthetic k(Lcom/camerakit/a/b/a;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/camerakit/a/b/a;->oI:Z
+    iget-boolean p0, p0, Lcom/camerakit/a/b/a;->oH:Z
 
     return p0
 .end method
@@ -522,7 +522,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oI:Z
+    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oH:Z
 
     return-void
 .end method
@@ -541,7 +541,7 @@
 
     iget-object v0, p0, Lcom/camerakit/a/b/a;->cameraDevice:Landroid/hardware/camera2/CameraDevice;
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
+    iget-object v1, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
 
     if-eqz v0, :cond_0
 
@@ -551,7 +551,7 @@
 
     invoke-direct {v2, p1}, Landroid/view/Surface;-><init>(Landroid/graphics/SurfaceTexture;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object p1, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast p1, Landroid/os/Handler;
 
@@ -631,7 +631,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/d;->a(Lcom/camerakit/a/c;)V
 
@@ -648,7 +648,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->nm:Lcom/camerakit/b/a;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nl:Lcom/camerakit/b/a;
 
     iget-object v0, p0, Lcom/camerakit/a/b/a;->cameraManager:Landroid/hardware/camera2/CameraManager;
 
@@ -765,7 +765,7 @@
 
     iget-object v1, p0, Lcom/camerakit/a/b/a;->cameraManager:Landroid/hardware/camera2/CameraManager;
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v2, Landroid/os/Handler;
 
@@ -850,15 +850,15 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->oH:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oG:Lkotlin/jvm/functions/Function1;
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a;->nm:Lcom/camerakit/b/a;
+    iget-object p1, p0, Lcom/camerakit/a/b/a;->nl:Lcom/camerakit/b/a;
 
-    sget-object v0, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     if-ne p1, v0, :cond_1
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a;->oF:Landroid/hardware/camera2/CaptureRequest$Builder;
+    iget-object p1, p0, Lcom/camerakit/a/b/a;->oE:Landroid/hardware/camera2/CaptureRequest$Builder;
 
     iget-object v0, p0, Lcom/camerakit/a/b/a;->captureSession:Landroid/hardware/camera2/CameraCaptureSession;
     :try_end_0
@@ -879,21 +879,21 @@
 
     invoke-virtual {p1, v1, v3}, Landroid/hardware/camera2/CaptureRequest$Builder;->set(Landroid/hardware/camera2/CaptureRequest$Key;Ljava/lang/Object;)V
 
-    iput v2, p0, Lcom/camerakit/a/b/a;->oK:I
+    iput v2, p0, Lcom/camerakit/a/b/a;->oJ:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/camerakit/a/b/a;->oJ:I
+    iput v1, p0, Lcom/camerakit/a/b/a;->oI:I
 
     invoke-virtual {p1}, Landroid/hardware/camera2/CaptureRequest$Builder;->build()Landroid/hardware/camera2/CaptureRequest;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/camerakit/a/b/a;->oL:Lcom/camerakit/a/b/a$c;
+    iget-object v2, p0, Lcom/camerakit/a/b/a;->oK:Lcom/camerakit/a/b/a$c;
 
     check-cast v2, Landroid/hardware/camera2/CameraCaptureSession$CaptureCallback;
 
-    iget-object v3, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v3, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     check-cast v3, Landroid/os/Handler;
 
@@ -939,7 +939,7 @@
 .method public final bP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0}, Lcom/camerakit/a/d;->bP()V
 
@@ -949,7 +949,7 @@
 .method public final bQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0}, Lcom/camerakit/a/d;->bQ()V
 
@@ -999,7 +999,7 @@
     :goto_0
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oI:Z
+    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oH:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -1018,7 +1018,7 @@
 .method public final bV()Lcom/camerakit/a/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/e;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ot:Lcom/camerakit/a/e;
 
     return-object v0
 .end method
@@ -1026,7 +1026,7 @@
 .method public final onCameraClosed()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a;->ow:Lcom/camerakit/a/d;
+    iget-object v0, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/d;
 
     invoke-interface {v0}, Lcom/camerakit/a/d;->onCameraClosed()V
 
@@ -1059,20 +1059,20 @@
     :cond_1
     iput-object v0, p0, Lcom/camerakit/a/b/a;->captureSession:Landroid/hardware/camera2/CameraCaptureSession;
 
-    iput-object v0, p0, Lcom/camerakit/a/b/a;->ov:Lcom/camerakit/a/c;
+    iput-object v0, p0, Lcom/camerakit/a/b/a;->ou:Lcom/camerakit/a/c;
 
-    iget-object v1, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
+    iget-object v1, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
 
     if-eqz v1, :cond_2
 
     invoke-virtual {v1}, Landroid/media/ImageReader;->close()V
 
     :cond_2
-    iput-object v0, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
+    iput-object v0, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oI:Z
+    iput-boolean v0, p0, Lcom/camerakit/a/b/a;->oH:Z
 
     invoke-virtual {p0}, Lcom/camerakit/a/b/a;->onCameraClosed()V
     :try_end_0
@@ -1100,7 +1100,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->nG:Lcom/camerakit/b/b;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->nF:Lcom/camerakit/b/b;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1138,7 +1138,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a;->oG:Landroid/media/ImageReader;
+    iput-object p1, p0, Lcom/camerakit/a/b/a;->oF:Landroid/media/ImageReader;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/camerakit/a/b/a/b$a.smali b/com.discord/smali/com/camerakit/a/b/a/b$a.smali
index 863c0fa4ee..4be97de390 100644
--- a/com.discord/smali/com/camerakit/a/b/a/b$a.smali
+++ b/com.discord/smali/com/camerakit/a/b/a/b$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic oC:Lkotlin/jvm/functions/Function1;
+.field final synthetic oB:Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a/b$a;->oC:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/camerakit/a/b/a/b$a;->oB:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Landroid/hardware/camera2/CameraCaptureSession$StateCallback;-><init>()V
 
@@ -38,7 +38,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a/b$a;->oC:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/b$a;->oB:Lkotlin/jvm/functions/Function1;
 
     const/4 v1, 0x0
 
@@ -56,7 +56,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a/b$a;->oC:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/camerakit/a/b/a/b$a;->oB:Lkotlin/jvm/functions/Function1;
 
     const/4 v0, 0x0
 
@@ -72,7 +72,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a/b$a;->oC:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/b$a;->oB: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/camerakit/a/b/a/c$a.smali b/com.discord/smali/com/camerakit/a/b/a/c$a.smali
index 2bd9207faf..bdb59bf2ac 100644
--- a/com.discord/smali/com/camerakit/a/b/a/c$a.smali
+++ b/com.discord/smali/com/camerakit/a/b/a/c$a.smali
@@ -17,18 +17,18 @@
 # instance fields
 .field final synthetic $callback:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic oR:Landroid/hardware/camera2/CameraManager;
+.field final synthetic oQ:Landroid/hardware/camera2/CameraManager;
 
-.field final synthetic oS:Ljava/lang/String;
+.field final synthetic oR:Ljava/lang/String;
 
 
 # direct methods
 .method public constructor <init>(Landroid/hardware/camera2/CameraManager;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/a/b/a/c$a;->oR:Landroid/hardware/camera2/CameraManager;
+    iput-object p1, p0, Lcom/camerakit/a/b/a/c$a;->oQ:Landroid/hardware/camera2/CameraManager;
 
-    iput-object p2, p0, Lcom/camerakit/a/b/a/c$a;->oS:Ljava/lang/String;
+    iput-object p2, p0, Lcom/camerakit/a/b/a/c$a;->oR:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/camerakit/a/b/a/c$a;->$callback:Lkotlin/jvm/functions/Function0;
 
@@ -46,7 +46,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a/c$a;->oS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/c$a;->oR:Ljava/lang/String;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -54,7 +54,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/camerakit/a/b/a/c$a;->oR:Landroid/hardware/camera2/CameraManager;
+    iget-object p1, p0, Lcom/camerakit/a/b/a/c$a;->oQ:Landroid/hardware/camera2/CameraManager;
 
     move-object v0, p0
 
@@ -77,7 +77,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/b/a/c$a;->oS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/camerakit/a/b/a/c$a;->oR:Ljava/lang/String;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali/com/camerakit/a/b/a/d.smali b/com.discord/smali/com/camerakit/a/b/a/d.smali
index 0ddcac9b37..f9fcb96f8f 100644
--- a/com.discord/smali/com/camerakit/a/b/a/d.smali
+++ b/com.discord/smali/com/camerakit/a/b/a/d.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lcom/camerakit/a/b/a/d;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
@@ -32,7 +32,7 @@
 
     sget-object v0, Lcom/camerakit/a/b/a/d;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
diff --git a/com.discord/smali/com/camerakit/a/b/b.smali b/com.discord/smali/com/camerakit/a/b/b.smali
index 647d040647..de61195196 100644
--- a/com.discord/smali/com/camerakit/a/b/b.smali
+++ b/com.discord/smali/com/camerakit/a/b/b.smali
@@ -24,7 +24,7 @@
 
     sput-object v0, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
@@ -44,7 +44,7 @@
 
     sput-object v0, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
@@ -62,7 +62,7 @@
 
     sput-object v0, Lcom/camerakit/a/b/b;->$EnumSwitchMapping$2:[I
 
-    sget-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sget-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     invoke-virtual {v1}, Lcom/camerakit/b/b;->ordinal()I
 
diff --git a/com.discord/smali/com/camerakit/a/e$1.smali b/com.discord/smali/com/camerakit/a/e$1.smali
index 9f4e52925c..8ad2883b1f 100644
--- a/com.discord/smali/com/camerakit/a/e$1.smali
+++ b/com.discord/smali/com/camerakit/a/e$1.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final or:Lcom/camerakit/a/e$1;
+.field public static final oq:Lcom/camerakit/a/e$1;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/camerakit/a/e$1;-><init>()V
 
-    sput-object v0, Lcom/camerakit/a/e$1;->or:Lcom/camerakit/a/e$1;
+    sput-object v0, Lcom/camerakit/a/e$1;->oq:Lcom/camerakit/a/e$1;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/camerakit/a/e.smali b/com.discord/smali/com/camerakit/a/e.smali
index 15bb5b41fc..8d95923c68 100644
--- a/com.discord/smali/com/camerakit/a/e.smali
+++ b/com.discord/smali/com/camerakit/a/e.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final oq:Lcom/camerakit/a/e$a;
+.field public static final oo:Lcom/camerakit/a/e$a;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {v0, v1}, Lcom/camerakit/a/e$a;-><init>(B)V
 
-    sput-object v0, Lcom/camerakit/a/e;->oq:Lcom/camerakit/a/e$a;
+    sput-object v0, Lcom/camerakit/a/e;->oo:Lcom/camerakit/a/e$a;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
 
     invoke-direct {p0, v0}, Landroid/os/Handler;-><init>(Landroid/os/Looper;)V
 
-    sget-object v0, Lcom/camerakit/a/e$1;->or:Lcom/camerakit/a/e$1;
+    sget-object v0, Lcom/camerakit/a/e$1;->oq:Lcom/camerakit/a/e$1;
 
     check-cast v0, Ljava/lang/Thread$UncaughtExceptionHandler;
 
diff --git a/com.discord/smali/com/camerakit/a/f.smali b/com.discord/smali/com/camerakit/a/f.smali
index 788917f651..ee89e5a5b8 100644
--- a/com.discord/smali/com/camerakit/a/f.smali
+++ b/com.discord/smali/com/camerakit/a/f.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final ot:Lcom/camerakit/a/b;
+.field private final or:Lcom/camerakit/a/b;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iput-object p1, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
 
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->a(Landroid/graphics/SurfaceTexture;)V
     :try_end_0
@@ -64,7 +64,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->a(Lcom/camerakit/a/c;)V
 
@@ -83,7 +83,7 @@
 
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->a(Lcom/camerakit/b/a;)V
     :try_end_0
@@ -122,7 +122,7 @@
 
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->a(Lkotlin/jvm/functions/Function1;)V
     :try_end_0
@@ -143,7 +143,7 @@
 .method public final bP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0}, Lcom/camerakit/a/b;->bP()V
 
@@ -153,7 +153,7 @@
 .method public final bQ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0}, Lcom/camerakit/a/b;->bQ()V
 
@@ -168,7 +168,7 @@
     :try_start_0
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0}, Lcom/camerakit/a/b;->bU()V
     :try_end_0
@@ -189,7 +189,7 @@
 .method public final bV()Lcom/camerakit/a/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0}, Lcom/camerakit/a/b;->bV()Lcom/camerakit/a/e;
 
@@ -201,7 +201,7 @@
 .method public final onCameraClosed()V
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0}, Lcom/camerakit/a/b;->onCameraClosed()V
 
@@ -216,7 +216,7 @@
     :try_start_0
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0}, Lcom/camerakit/a/b;->release()V
     :try_end_0
@@ -246,7 +246,7 @@
 
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->setFlash(Lcom/camerakit/b/b;)V
     :try_end_0
@@ -276,7 +276,7 @@
 
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->setPhotoSize(Lcom/camerakit/b/c;)V
     :try_end_0
@@ -302,7 +302,7 @@
     :try_start_0
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->setPreviewOrientation(I)V
     :try_end_0
@@ -329,7 +329,7 @@
 
     invoke-virtual {p0}, Lcom/camerakit/a/f;->bV()Lcom/camerakit/a/e;
 
-    iget-object v0, p0, Lcom/camerakit/a/f;->ot:Lcom/camerakit/a/b;
+    iget-object v0, p0, Lcom/camerakit/a/f;->or:Lcom/camerakit/a/b;
 
     invoke-interface {v0, p1}, Lcom/camerakit/a/b;->setPreviewSize(Lcom/camerakit/b/c;)V
 
diff --git a/com.discord/smali/com/camerakit/b.smali b/com.discord/smali/com/camerakit/b.smali
index 9eafa74c51..4ba8654585 100644
--- a/com.discord/smali/com/camerakit/b.smali
+++ b/com.discord/smali/com/camerakit/b.smali
@@ -24,7 +24,7 @@
 
     sput-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/a$a;->nR:Lcom/camerakit/a$a;
+    sget-object v1, Lcom/camerakit/a$a;->nQ:Lcom/camerakit/a$a;
 
     invoke-virtual {v1}, Lcom/camerakit/a$a;->ordinal()I
 
@@ -36,7 +36,7 @@
 
     sget-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/a$a;->nT:Lcom/camerakit/a$a;
+    sget-object v1, Lcom/camerakit/a$a;->nS:Lcom/camerakit/a$a;
 
     invoke-virtual {v1}, Lcom/camerakit/a$a;->ordinal()I
 
@@ -48,7 +48,7 @@
 
     sget-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/a$a;->nV:Lcom/camerakit/a$a;
+    sget-object v1, Lcom/camerakit/a$a;->nU:Lcom/camerakit/a$a;
 
     invoke-virtual {v1}, Lcom/camerakit/a$a;->ordinal()I
 
@@ -60,7 +60,7 @@
 
     sget-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lcom/camerakit/a$a;->nW:Lcom/camerakit/a$a;
+    sget-object v1, Lcom/camerakit/a$a;->nV:Lcom/camerakit/a$a;
 
     invoke-virtual {v1}, Lcom/camerakit/a$a;->ordinal()I
 
@@ -80,7 +80,7 @@
 
     sput-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
@@ -90,7 +90,7 @@
 
     sget-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
@@ -108,7 +108,7 @@
 
     sput-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$2:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
@@ -118,7 +118,7 @@
 
     sget-object v0, Lcom/camerakit/b;->$EnumSwitchMapping$2:[I
 
-    sget-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sget-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     invoke-virtual {v1}, Lcom/camerakit/b/a;->ordinal()I
 
diff --git a/com.discord/smali/com/camerakit/b/a.smali b/com.discord/smali/com/camerakit/b/a.smali
index a06c0268ec..e1d67aea8b 100644
--- a/com.discord/smali/com/camerakit/b/a.smali
+++ b/com.discord/smali/com/camerakit/b/a.smali
@@ -14,11 +14,11 @@
 
 
 # static fields
+.field public static final enum pb:Lcom/camerakit/b/a;
+
 .field public static final enum pc:Lcom/camerakit/b/a;
 
-.field public static final enum pd:Lcom/camerakit/b/a;
-
-.field private static final synthetic pe:[Lcom/camerakit/b/a;
+.field private static final synthetic pd:[Lcom/camerakit/b/a;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/b/a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
+    sput-object v1, Lcom/camerakit/b/a;->pb:Lcom/camerakit/b/a;
 
     aput-object v1, v0, v2
 
@@ -49,11 +49,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/b/a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/b/a;->pd:Lcom/camerakit/b/a;
+    sput-object v1, Lcom/camerakit/b/a;->pc:Lcom/camerakit/b/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/b/a;->pe:[Lcom/camerakit/b/a;
+    sput-object v0, Lcom/camerakit/b/a;->pd:[Lcom/camerakit/b/a;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 .method public static values()[Lcom/camerakit/b/a;
     .locals 1
 
-    sget-object v0, Lcom/camerakit/b/a;->pe:[Lcom/camerakit/b/a;
+    sget-object v0, Lcom/camerakit/b/a;->pd:[Lcom/camerakit/b/a;
 
     invoke-virtual {v0}, [Lcom/camerakit/b/a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/camerakit/b/b.smali b/com.discord/smali/com/camerakit/b/b.smali
index 3885f5ce1c..c9a7285070 100644
--- a/com.discord/smali/com/camerakit/b/b.smali
+++ b/com.discord/smali/com/camerakit/b/b.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
+.field public static final enum pe:Lcom/camerakit/b/b;
+
 .field public static final enum pf:Lcom/camerakit/b/b;
 
 .field public static final enum pg:Lcom/camerakit/b/b;
 
 .field public static final enum ph:Lcom/camerakit/b/b;
 
-.field public static final enum pi:Lcom/camerakit/b/b;
-
-.field private static final synthetic pj:[Lcom/camerakit/b/b;
+.field private static final synthetic pi:[Lcom/camerakit/b/b;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/b/b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->pe:Lcom/camerakit/b/b;
 
     aput-object v1, v0, v2
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/b/b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->pf:Lcom/camerakit/b/b;
 
     aput-object v1, v0, v2
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/b/b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->pg:Lcom/camerakit/b/b;
 
     aput-object v1, v0, v2
 
@@ -77,11 +77,11 @@
 
     invoke-direct {v1, v3, v2}, Lcom/camerakit/b/b;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lcom/camerakit/b/b;->pi:Lcom/camerakit/b/b;
+    sput-object v1, Lcom/camerakit/b/b;->ph:Lcom/camerakit/b/b;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/camerakit/b/b;->pj:[Lcom/camerakit/b/b;
+    sput-object v0, Lcom/camerakit/b/b;->pi:[Lcom/camerakit/b/b;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 .method public static values()[Lcom/camerakit/b/b;
     .locals 1
 
-    sget-object v0, Lcom/camerakit/b/b;->pj:[Lcom/camerakit/b/b;
+    sget-object v0, Lcom/camerakit/b/b;->pi:[Lcom/camerakit/b/b;
 
     invoke-virtual {v0}, [Lcom/camerakit/b/b;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/camerakit/c$1.smali b/com.discord/smali/com/camerakit/c$1.smali
index dd49caa986..3588a48efe 100644
--- a/com.discord/smali/com/camerakit/c$1.smali
+++ b/com.discord/smali/com/camerakit/c$1.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic oo:Lcom/camerakit/c;
+.field final synthetic om:Lcom/camerakit/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iput-object p1, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-direct {p0}, Landroid/view/GestureDetector$SimpleOnGestureListener;-><init>()V
 
@@ -36,13 +36,13 @@
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
-    iget-object v0, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-virtual {v0}, Lcom/camerakit/c;->getWidth()I
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
-    iget-object v0, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-virtual {v0}, Lcom/camerakit/c;->getHeight()I
 
@@ -58,13 +58,13 @@
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
-    iget-object v0, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-virtual {v0}, Lcom/camerakit/c;->getWidth()I
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
-    iget-object p1, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iget-object p1, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-virtual {p1}, Lcom/camerakit/c;->getHeight()I
 
@@ -76,13 +76,13 @@
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
-    iget-object v0, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-virtual {v0}, Lcom/camerakit/c;->getWidth()I
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
-    iget-object v0, p0, Lcom/camerakit/c$1;->oo:Lcom/camerakit/c;
+    iget-object v0, p0, Lcom/camerakit/c$1;->om:Lcom/camerakit/c;
 
     invoke-virtual {v0}, Lcom/camerakit/c;->getHeight()I
 
diff --git a/com.discord/smali/com/camerakit/c$2.smali b/com.discord/smali/com/camerakit/c$2.smali
index c249adedab..22b01741f8 100644
--- a/com.discord/smali/com/camerakit/c$2.smali
+++ b/com.discord/smali/com/camerakit/c$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic oo:Lcom/camerakit/c;
+.field final synthetic om:Lcom/camerakit/c;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/c;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/c$2;->oo:Lcom/camerakit/c;
+    iput-object p1, p0, Lcom/camerakit/c$2;->om:Lcom/camerakit/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/camerakit/c.smali b/com.discord/smali/com/camerakit/c.smali
index 43329753f0..3f013b6083 100644
--- a/com.discord/smali/com/camerakit/c.smali
+++ b/com.discord/smali/com/camerakit/c.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private oj:Landroid/view/ScaleGestureDetector;
+.field private oi:Landroid/view/ScaleGestureDetector;
 
-.field private ok:Landroid/view/GestureDetector;
+.field private oj:Landroid/view/GestureDetector;
 
-.field private ol:Landroid/view/GestureDetector$SimpleOnGestureListener;
+.field private ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
-.field private om:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+.field private ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
 
 
 # direct methods
@@ -23,13 +23,13 @@
 
     invoke-direct {p1, p0}, Lcom/camerakit/c$1;-><init>(Lcom/camerakit/c;)V
 
-    iput-object p1, p0, Lcom/camerakit/c;->ol:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     new-instance p1, Lcom/camerakit/c$2;
 
     invoke-direct {p1, p0}, Lcom/camerakit/c$2;-><init>(Lcom/camerakit/c;)V
 
-    iput-object p1, p0, Lcom/camerakit/c;->om:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
 
     invoke-direct {p0}, Lcom/camerakit/c;->initialize()V
 
@@ -45,13 +45,13 @@
 
     invoke-direct {p1, p0}, Lcom/camerakit/c$1;-><init>(Lcom/camerakit/c;)V
 
-    iput-object p1, p0, Lcom/camerakit/c;->ol:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     new-instance p1, Lcom/camerakit/c$2;
 
     invoke-direct {p1, p0}, Lcom/camerakit/c$2;-><init>(Lcom/camerakit/c;)V
 
-    iput-object p1, p0, Lcom/camerakit/c;->om:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
 
     invoke-direct {p0}, Lcom/camerakit/c;->initialize()V
 
@@ -67,13 +67,13 @@
 
     invoke-direct {p1, p0}, Lcom/camerakit/c$1;-><init>(Lcom/camerakit/c;)V
 
-    iput-object p1, p0, Lcom/camerakit/c;->ol:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     new-instance p1, Lcom/camerakit/c$2;
 
     invoke-direct {p1, p0}, Lcom/camerakit/c$2;-><init>(Lcom/camerakit/c;)V
 
-    iput-object p1, p0, Lcom/camerakit/c;->om:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iput-object p1, p0, Lcom/camerakit/c;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
 
     invoke-direct {p0}, Lcom/camerakit/c;->initialize()V
 
@@ -89,11 +89,11 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/camerakit/c;->om:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
+    iget-object v2, p0, Lcom/camerakit/c;->ol:Landroid/view/ScaleGestureDetector$OnScaleGestureListener;
 
     invoke-direct {v0, v1, v2}, Landroid/view/ScaleGestureDetector;-><init>(Landroid/content/Context;Landroid/view/ScaleGestureDetector$OnScaleGestureListener;)V
 
-    iput-object v0, p0, Lcom/camerakit/c;->oj:Landroid/view/ScaleGestureDetector;
+    iput-object v0, p0, Lcom/camerakit/c;->oi:Landroid/view/ScaleGestureDetector;
 
     new-instance v0, Landroid/view/GestureDetector;
 
@@ -101,11 +101,11 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/camerakit/c;->ol:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v2, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector$SimpleOnGestureListener;
 
     invoke-direct {v0, v1, v2}, Landroid/view/GestureDetector;-><init>(Landroid/content/Context;Landroid/view/GestureDetector$OnGestureListener;)V
 
-    iput-object v0, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/camerakit/c;->oj:Landroid/view/GestureDetector;
 
     return-void
 .end method
@@ -115,11 +115,11 @@
 .method public onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/c;->ok:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/camerakit/c;->oj:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-object v0, p0, Lcom/camerakit/c;->oj:Landroid/view/ScaleGestureDetector;
+    iget-object v0, p0, Lcom/camerakit/c;->oi:Landroid/view/ScaleGestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/ScaleGestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
diff --git a/com.discord/smali/com/camerakit/c/a.smali b/com.discord/smali/com/camerakit/c/a.smali
index 6515484d45..304a012905 100644
--- a/com.discord/smali/com/camerakit/c/a.smali
+++ b/com.discord/smali/com/camerakit/c/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final pk:[Lcom/camerakit/b/c;
+.field public final pj:[Lcom/camerakit/b/c;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/camerakit/c/a;->pk:[Lcom/camerakit/b/c;
+    iput-object p1, p0, Lcom/camerakit/c/a;->pj:[Lcom/camerakit/b/c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/camerakit/preview/CameraSurfaceTexture.smali b/com.discord/smali/com/camerakit/preview/CameraSurfaceTexture.smali
index b8d39b6f5c..3d696a3d5b 100644
--- a/com.discord/smali/com/camerakit/preview/CameraSurfaceTexture.smali
+++ b/com.discord/smali/com/camerakit/preview/CameraSurfaceTexture.smali
@@ -12,19 +12,19 @@
 
 
 # static fields
-.field public static final oX:Lcom/camerakit/preview/CameraSurfaceTexture$a;
+.field public static final oW:Lcom/camerakit/preview/CameraSurfaceTexture$a;
 
 
 # instance fields
 .field private nativeHandle:J
 
-.field public oT:Lcom/camerakit/b/c;
+.field public oS:Lcom/camerakit/b/c;
 
-.field public oU:Z
+.field public oT:Z
 
-.field public final oV:[F
+.field public final oU:[F
 
-.field final oW:I
+.field final oV:I
 
 .field private final transformMatrix:[F
 
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1}, Lcom/camerakit/preview/CameraSurfaceTexture$a;-><init>(B)V
 
-    sput-object v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oX:Lcom/camerakit/preview/CameraSurfaceTexture$a;
+    sput-object v0, Lcom/camerakit/preview/CameraSurfaceTexture;->oW:Lcom/camerakit/preview/CameraSurfaceTexture$a;
 
     const-string v0, "camerakit"
 
@@ -53,7 +53,7 @@
 
     invoke-direct {p0, p1}, Landroid/graphics/SurfaceTexture;-><init>(I)V
 
-    iput p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oW:I
+    iput p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:I
 
     new-instance p2, Lcom/camerakit/b/c;
 
@@ -61,7 +61,7 @@
 
     invoke-direct {p2, v0, v0}, Lcom/camerakit/b/c;-><init>(II)V
 
-    iput-object p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iput-object p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     const/16 p2, 0x10
 
@@ -71,13 +71,13 @@
 
     new-array p2, p2, [F
 
-    iput-object p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
+    iput-object p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
 
-    iget p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oW:I
+    iget p2, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:I
 
     invoke-direct {p0, p1, p2}, Lcom/camerakit/preview/CameraSurfaceTexture;->nativeInit(II)V
 
-    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
+    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
 
     invoke-static {p1, v0}, Landroid/opengl/Matrix;->setIdentityM([FI)V
 
@@ -126,15 +126,15 @@
 .method public final updateTexImage()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:Z
+    iget-boolean v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     iget v0, v0, Lcom/camerakit/b/c;->width:I
 
-    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     iget v1, v1, Lcom/camerakit/b/c;->height:I
 
@@ -142,7 +142,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:Z
+    iput-boolean v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Z
 
     :cond_0
     invoke-super {p0}, Landroid/graphics/SurfaceTexture;->updateTexImage()V
@@ -153,7 +153,7 @@
 
     iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->transformMatrix:[F
 
-    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:[F
+    iget-object v1, p0, Lcom/camerakit/preview/CameraSurfaceTexture;->oU:[F
 
     invoke-direct {p0, v0, v1}, Lcom/camerakit/preview/CameraSurfaceTexture;->nativeUpdateTexImage([F[F)V
 
diff --git a/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b$a.smali b/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b$a.smali
index 4e77e957d8..4b2c90a1a2 100644
--- a/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b$a.smali
+++ b/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic pb:Lcom/camerakit/preview/CameraSurfaceView$b;
+.field final synthetic pa:Lcom/camerakit/preview/CameraSurfaceView$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/camerakit/preview/CameraSurfaceView$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView$b$a;->pb:Lcom/camerakit/preview/CameraSurfaceView$b;
+    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView$b$a;->pa:Lcom/camerakit/preview/CameraSurfaceView$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onFrameAvailable(Landroid/graphics/SurfaceTexture;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView$b$a;->pb:Lcom/camerakit/preview/CameraSurfaceView$b;
+    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView$b$a;->pa:Lcom/camerakit/preview/CameraSurfaceView$b;
 
     iget-object p1, p1, Lcom/camerakit/preview/CameraSurfaceView$b;->this$0:Lcom/camerakit/preview/CameraSurfaceView;
 
diff --git a/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b.smali b/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b.smali
index f9a47d096f..c139c98ff7 100644
--- a/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b.smali
+++ b/com.discord/smali/com/camerakit/preview/CameraSurfaceView$b.smali
@@ -89,7 +89,7 @@
     :cond_0
     invoke-static {v0, v1}, Lcom/camerakit/preview/CameraSurfaceView;->a(Lcom/camerakit/preview/CameraSurfaceView;Lcom/camerakit/preview/CameraSurfaceTexture;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/camerakit/preview/CameraSurfaceView.smali b/com.discord/smali/com/camerakit/preview/CameraSurfaceView.smali
index 635802d8ef..0d2ea3def9 100644
--- a/com.discord/smali/com/camerakit/preview/CameraSurfaceView.smali
+++ b/com.discord/smali/com/camerakit/preview/CameraSurfaceView.smali
@@ -15,15 +15,15 @@
 
 
 # static fields
-.field public static final pa:Lcom/camerakit/preview/CameraSurfaceView$a;
+.field public static final oZ:Lcom/camerakit/preview/CameraSurfaceView$a;
 
 
 # instance fields
 .field private nativeHandle:J
 
-.field private oY:Lcom/camerakit/preview/a;
+.field private oX:Lcom/camerakit/preview/a;
 
-.field private oZ:Lcom/camerakit/preview/CameraSurfaceTexture;
+.field private oY:Lcom/camerakit/preview/CameraSurfaceTexture;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1}, Lcom/camerakit/preview/CameraSurfaceView$a;-><init>(B)V
 
-    sput-object v0, Lcom/camerakit/preview/CameraSurfaceView;->pa:Lcom/camerakit/preview/CameraSurfaceView$a;
+    sput-object v0, Lcom/camerakit/preview/CameraSurfaceView;->oZ:Lcom/camerakit/preview/CameraSurfaceView$a;
 
     const-string v0, "camerakit"
 
@@ -76,7 +76,7 @@
 .method public static final synthetic a(Lcom/camerakit/preview/CameraSurfaceView;Lcom/camerakit/preview/CameraSurfaceTexture;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oZ:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oY:Lcom/camerakit/preview/CameraSurfaceTexture;
 
     return-void
 .end method
@@ -121,7 +121,7 @@
 .method public final getCameraSurfaceTextureListener()Lcom/camerakit/preview/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceView;->oY:Lcom/camerakit/preview/a;
+    iget-object v0, p0, Lcom/camerakit/preview/CameraSurfaceView;->oX:Lcom/camerakit/preview/a;
 
     return-object v0
 .end method
@@ -133,7 +133,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oZ:Lcom/camerakit/preview/CameraSurfaceTexture;
+    iget-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oY:Lcom/camerakit/preview/CameraSurfaceTexture;
 
     if-eqz p1, :cond_0
 
@@ -141,13 +141,13 @@
 
     invoke-virtual {p1}, Lcom/camerakit/preview/CameraSurfaceTexture;->updateTexImage()V
 
-    iget v0, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oW:I
+    iget v0, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oV:I
 
-    iget-object v1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iget-object v1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     iget v1, v1, Lcom/camerakit/b/c;->width:I
 
-    iget-object p1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oT:Lcom/camerakit/b/c;
+    iget-object p1, p1, Lcom/camerakit/preview/CameraSurfaceTexture;->oS:Lcom/camerakit/b/c;
 
     iget p1, p1, Lcom/camerakit/b/c;->height:I
 
@@ -234,7 +234,7 @@
 .method public final setCameraSurfaceTextureListener(Lcom/camerakit/preview/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oY:Lcom/camerakit/preview/a;
+    iput-object p1, p0, Lcom/camerakit/preview/CameraSurfaceView;->oX:Lcom/camerakit/preview/a;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali b/com.discord/smali/com/crashlytics/android/CrashlyticsInitProvider.smali
index 25f989e617..b25f2443e8 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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -259,7 +259,7 @@
     return v3
 
     :cond_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 d82b890248..ee0cfe8302 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 pl:Lcom/crashlytics/android/answers/Answers;
+.field public final pk:Lcom/crashlytics/android/answers/Answers;
 
-.field public final pm:Lcom/crashlytics/android/beta/a;
+.field public final pl:Lcom/crashlytics/android/beta/a;
 
-.field public final pn:Lcom/crashlytics/android/core/l;
+.field public final pm:Lcom/crashlytics/android/core/l;
 
-.field public final po:Ljava/util/Collection;
+.field public final pn: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;->pl:Lcom/crashlytics/android/answers/Answers;
+    iput-object p1, p0, Lcom/crashlytics/android/a;->pk:Lcom/crashlytics/android/answers/Answers;
 
-    iput-object p2, p0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/beta/a;
+    iput-object p2, p0, Lcom/crashlytics/android/a;->pl:Lcom/crashlytics/android/beta/a;
 
-    iput-object p3, p0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iput-object p3, p0, Lcom/crashlytics/android/a;->pm: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;->po:Ljava/util/Collection;
+    iput-object p1, p0, Lcom/crashlytics/android/a;->pn:Ljava/util/Collection;
 
     return-void
 .end method
@@ -106,9 +106,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
 
     if-nez v1, :cond_0
 
@@ -124,15 +124,15 @@
 
     move-result-object p0
 
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sR: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;->sT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sS: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,9 +149,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
 
     if-nez v1, :cond_0
 
@@ -169,13 +169,13 @@
 
     iput-object p0, v0, Lcom/crashlytics/android/core/l;->userName:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sR: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;->sT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sS: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,9 +192,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
 
     if-nez v1, :cond_0
 
@@ -210,15 +210,15 @@
 
     move-result-object p0
 
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sT:Ljava/lang/String;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
 
-    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sR: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;->sT:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sS: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,9 +235,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
 
     if-nez v1, :cond_1
 
@@ -251,7 +251,7 @@
 
     if-nez p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sQ: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;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v3, v0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v4, Lcom/crashlytics/android/core/k$25;
 
@@ -332,9 +332,9 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
 
-    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v1, v0, Lcom/crashlytics/android/core/l;->sU:Z
 
     if-nez v1, :cond_2
 
@@ -350,7 +350,7 @@
 
     move-result-object p0
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentHashMap;->size()I
 
@@ -360,7 +360,7 @@
 
     if-lt v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-virtual {v1, p0}, Ljava/util/concurrent/ConcurrentHashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -368,7 +368,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -393,15 +393,15 @@
     move-result-object p1
 
     :goto_0
-    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v0, Lcom/crashlytics/android/core/l;->sM: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;->sR:Lcom/crashlytics/android/core/k;
+    iget-object p0, v0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object p1, v0, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object p1, v0, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v1, Lcom/crashlytics/android/core/k$3;
 
@@ -422,7 +422,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/crashlytics/android/a;->pn:Lcom/crashlytics/android/core/l;
+    iget-object v0, v0, Lcom/crashlytics/android/a;->pm:Lcom/crashlytics/android/core/l;
 
     const-string v1, "CrashlyticsCore"
 
@@ -453,7 +453,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/a;->po:Ljava/util/Collection;
+    iget-object v0, p0, Lcom/crashlytics/android/a;->pn: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 19edd6b97e..a4e8f155da 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 public pq:Z
+.field public pp:Z
 
-.field public pr:Lcom/crashlytics/android/answers/ac;
+.field public pq:Lcom/crashlytics/android/answers/ac;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pq:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pp:Z
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public static F(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BX()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->pq: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;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CR()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v1
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bfR:Lio/fabric/sdk/android/a/g/m;
+    iget-object v2, v1, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/m;->bfr:Z
+    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/m;->bfC:Z
 
     if-eqz v2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/t;->qv:Lio/fabric/sdk/android/a/g/b;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/t;->qu: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;->pL:Lcom/crashlytics/android/answers/k;
+    iget-object v4, v2, Lcom/crashlytics/android/answers/ac;->pK:Lcom/crashlytics/android/answers/k;
 
-    iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/b;->pS:Z
+    iget-boolean v5, v1, Lio/fabric/sdk/android/a/g/b;->pR:Z
 
-    iput-boolean v5, v4, Lcom/crashlytics/android/answers/k;->pS:Z
+    iput-boolean v5, v4, Lcom/crashlytics/android/answers/k;->pR:Z
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/ac;->qx: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/Answers;->pq: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -222,7 +222,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pq:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/Answers;->pp:Z
 
     if-eqz v0, :cond_0
 
@@ -233,11 +233,11 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -255,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;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
 
     new-instance v1, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qO: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;->pW:Ljava/lang/String;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/l;->pV:Ljava/lang/String;
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/lang/String;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
 
     const/4 p1, 0x0
 
@@ -383,7 +383,7 @@
     goto :goto_1
 
     :goto_2
-    iget-object v1, v9, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v9, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
     new-instance v6, Lcom/crashlytics/android/answers/ah;
 
@@ -399,7 +399,7 @@
 
     new-instance v7, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -471,11 +471,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;->pr:Lcom/crashlytics/android/answers/ac;
+    iput-object v1, v9, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v1, v9, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v1, v9, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
 
     new-instance v3, Lcom/crashlytics/android/answers/e$4;
 
@@ -483,27 +483,27 @@
 
     invoke-virtual {v2, v3}, Lcom/crashlytics/android/answers/e;->c(Ljava/lang/Runnable;)V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qz:Lio/fabric/sdk/android/a;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qy:Lio/fabric/sdk/android/a;
 
     new-instance v3, Lcom/crashlytics/android/answers/g;
 
-    iget-object v4, v1, Lcom/crashlytics/android/answers/ac;->pL:Lcom/crashlytics/android/answers/k;
+    iget-object v4, v1, Lcom/crashlytics/android/answers/ac;->pK: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;->pL:Lcom/crashlytics/android/answers/k;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->pK: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;->qA:Lcom/crashlytics/android/answers/h;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qz:Lcom/crashlytics/android/answers/h;
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/h;->pM:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/h;->pL:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -517,9 +517,9 @@
 
     if-eqz v2, :cond_2
 
-    iget-wide v4, v1, Lcom/crashlytics/android/answers/ac;->qx:J
+    iget-wide v4, v1, Lcom/crashlytics/android/answers/ac;->qw:J
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -527,11 +527,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;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
 
     new-instance v6, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v7, Lcom/crashlytics/android/answers/ae$b;->qO:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v7, Lcom/crashlytics/android/answers/ae$b;->qN:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-direct {v6, v7}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
@@ -545,17 +545,17 @@
 
     move-result-object v4
 
-    iput-object v4, v6, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/util/Map;
+    iput-object v4, v6, Lcom/crashlytics/android/answers/ae$a;->qC: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;->qA:Lcom/crashlytics/android/answers/h;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/ac;->qz:Lcom/crashlytics/android/answers/h;
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/h;->pM:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/h;->pL:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v1, v1, Lcom/crashlytics/android/answers/h;->pM:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/h;->pL:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v1
 
@@ -574,7 +574,7 @@
 
     move-result v0
 
-    iput-boolean v0, v9, Lcom/crashlytics/android/answers/Answers;->pq:Z
+    iput-boolean v0, v9, Lcom/crashlytics/android/answers/Answers;->pp:Z
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -583,7 +583,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 9942acfd6c..f912db49bf 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 pp:Ljava/math/BigDecimal;
+.field static final po:Ljava/math/BigDecimal;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/answers/a;->pp:Ljava/math/BigDecimal;
+    sput-object v0, Lcom/crashlytics/android/answers/a;->po: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 2ea3917e40..1017756550 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 qv:Lio/fabric/sdk/android/a/g/b;
+.field qu: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;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->beb:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BW()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BZ()J
 
     move-result-wide v2
 
@@ -78,7 +78,7 @@
 .method public final cr()I
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->qv:Lio/fabric/sdk/android/a/g/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->qu: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;->beQ:I
+    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->bfa:I
 
     return v0
 .end method
@@ -97,7 +97,7 @@
 .method public final cs()I
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->qv:Lio/fabric/sdk/android/a/g/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/aa;->qu: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;->beO:I
+    iget v0, v0, Lio/fabric/sdk/android/a/g/b;->beY: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 178c7caf01..6cf5bb5d22 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 qw:Ljava/lang/String;
+.field private final qv: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;->beg:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->beq: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;->qw:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/ab;->qv:Ljava/lang/String;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->BN()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->BQ()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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->cc()Ljava/lang/String;
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->qw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ab;->qv: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -158,11 +158,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;->CD()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CG()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/answers/ac.smali b/com.discord/smali/com/crashlytics/android/answers/ac.smali
index 23abc8d6b8..a80c4cd49e 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 pL:Lcom/crashlytics/android/answers/k;
+.field final pK:Lcom/crashlytics/android/answers/k;
 
-.field final qA:Lcom/crashlytics/android/answers/h;
+.field final qw:J
 
-.field final qx:J
+.field public final qx:Lcom/crashlytics/android/answers/e;
 
-.field public final qy:Lcom/crashlytics/android/answers/e;
+.field final qy:Lio/fabric/sdk/android/a;
 
-.field final qz:Lio/fabric/sdk/android/a;
+.field final qz:Lcom/crashlytics/android/answers/h;
 
 
 # direct methods
@@ -24,15 +24,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/ac;->qz:Lio/fabric/sdk/android/a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/ac;->qy:Lio/fabric/sdk/android/a;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/ac;->pL:Lcom/crashlytics/android/answers/k;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/ac;->pK:Lcom/crashlytics/android/answers/k;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/ac;->qA:Lcom/crashlytics/android/answers/h;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ac;->qz:Lcom/crashlytics/android/answers/h;
 
-    iput-wide p5, p0, Lcom/crashlytics/android/answers/ac;->qx:J
+    iput-wide p5, p0, Lcom/crashlytics/android/answers/ac;->qw: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qx: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -100,11 +100,11 @@
 
     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;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
 
     new-instance v1, Lcom/crashlytics/android/answers/ae$a;
 
-    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qQ:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/answers/ae$a;-><init>(Lcom/crashlytics/android/answers/ae$b;)V
 
@@ -112,19 +112,19 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/lang/String;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/w;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/w;->qm:Lcom/crashlytics/android/answers/b;
 
-    iget-object v2, v2, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
+    iget-object v2, v2, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
 
-    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qH:Ljava/util/Map;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
 
-    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
 
     const/4 p1, 0x0
 
@@ -136,7 +136,7 @@
 .method public final cl()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -146,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;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qx:Lcom/crashlytics/android/answers/e;
 
     new-instance v1, Lcom/crashlytics/android/answers/e$5;
 
@@ -160,11 +160,11 @@
 .method public final disable()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qz:Lio/fabric/sdk/android/a;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qy:Lio/fabric/sdk/android/a;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a;->BA()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a;->BD()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ac;->qx: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 94d84480e5..65e451e424 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 qC:Lcom/crashlytics/android/answers/ae$b;
+.field final qB:Lcom/crashlytics/android/answers/ae$b;
 
-.field public qD:Ljava/util/Map;
+.field public qC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field qE:Ljava/lang/String;
+.field qD:Ljava/lang/String;
 
-.field public qF:Ljava/util/Map;
+.field public qE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field qG:Ljava/lang/String;
+.field qF:Ljava/lang/String;
 
-.field qH:Ljava/util/Map;
+.field qG: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;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qB: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;->qD:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qC:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qH:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae$a;->qG: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 6d58323228..9a23174a16 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 qI:Lcom/crashlytics/android/answers/ae$b;
+
 .field public static final enum qJ:Lcom/crashlytics/android/answers/ae$b;
 
 .field public static final enum qK:Lcom/crashlytics/android/answers/ae$b;
@@ -37,9 +39,7 @@
 
 .field public static final enum qP:Lcom/crashlytics/android/answers/ae$b;
 
-.field public static final enum qQ:Lcom/crashlytics/android/answers/ae$b;
-
-.field private static final synthetic qR:[Lcom/crashlytics/android/answers/ae$b;
+.field private static final synthetic qQ:[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;->qJ:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qI: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;->qK:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qJ: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;->qL:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qK: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;->qM:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qL: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;->qN:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qM: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;->qO:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qN: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;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qO: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;->qQ:Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qP: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;->qJ:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v9, Lcom/crashlytics/android/answers/ae$b;->qI:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v9, v0, v1
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qK:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qJ:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qL:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qK:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qM:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qL:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qN:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qM:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qO:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qN:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qO:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qQ:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
 
     aput-object v1, v0, v8
 
-    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qR:[Lcom/crashlytics/android/answers/ae$b;
+    sput-object v0, Lcom/crashlytics/android/answers/ae$b;->qQ:[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;->qR:[Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qQ:[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 a426ac769c..5b1d480ff0 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 qB:Lcom/crashlytics/android/answers/af;
+.field public final qA:Lcom/crashlytics/android/answers/af;
 
-.field public final qC:Lcom/crashlytics/android/answers/ae$b;
+.field public final qB:Lcom/crashlytics/android/answers/ae$b;
 
-.field public final qD:Ljava/util/Map;
+.field public final qC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field public final qE:Ljava/lang/String;
+.field public final qD:Ljava/lang/String;
 
-.field public final qF:Ljava/util/Map;
+.field public final qE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field public final qG:Ljava/lang/String;
+.field public final qF:Ljava/lang/String;
 
-.field public final qH:Ljava/util/Map;
+.field public final qG:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field private qI:Ljava/lang/String;
+.field private qH: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;->qB:Lcom/crashlytics/android/answers/af;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/ae;->qA: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;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/ae;->qD:Ljava/util/Map;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/ae;->qC:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/ae;->qE:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/ae;->qD:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/ae;->qF:Ljava/util/Map;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/ae;->qE:Ljava/util/Map;
 
-    iput-object p8, p0, Lcom/crashlytics/android/answers/ae;->qG:Ljava/lang/String;
+    iput-object p8, p0, Lcom/crashlytics/android/answers/ae;->qF:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
 
     return-void
 .end method
@@ -135,7 +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;->qD:Ljava/util/Map;
+    iput-object p1, v0, Lcom/crashlytics/android/answers/ae$a;->qC:Ljava/util/Map;
 
     return-object v0
 .end method
@@ -145,7 +145,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qH:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -177,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;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qB:Lcom/crashlytics/android/answers/ae$b;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -185,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;->qD:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qC:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -193,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;->qE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qD:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -201,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;->qF:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qE:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -209,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;->qG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qF:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -217,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;->qH:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -225,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;->qB:Lcom/crashlytics/android/answers/af;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qA:Lcom/crashlytics/android/answers/af;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -237,10 +237,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/ae;->qI:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/ae;->qH:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/ae;->qH: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 1873ec2740..12893516bd 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 cq:Ljava/lang/String;
+.field public final cp:Ljava/lang/String;
 
-.field private qI:Ljava/lang/String;
+.field private qH:Ljava/lang/String;
+
+.field public final qR:Ljava/lang/String;
 
 .field public final qS:Ljava/lang/String;
 
 .field public final qT:Ljava/lang/String;
 
-.field public final qU:Ljava/lang/String;
+.field public final qU:Ljava/lang/Boolean;
 
-.field public final qV:Ljava/lang/Boolean;
+.field public final qV:Ljava/lang/String;
 
 .field public final qW:Ljava/lang/String;
 
@@ -24,8 +26,6 @@
 
 .field public final qZ:Ljava/lang/String;
 
-.field public final ra: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;->qS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/af;->qR:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/af;->qT:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/af;->qS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/af;->qT:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/af;->qV:Ljava/lang/Boolean;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/Boolean;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/af;->qW:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/af;->qV:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/af;->qX:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/af;->qW:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/af;->cq:Ljava/lang/String;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/af;->cp:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/crashlytics/android/answers/af;->qY:Ljava/lang/String;
+    iput-object p8, p0, Lcom/crashlytics/android/answers/af;->qX:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/answers/af;->qZ:Ljava/lang/String;
+    iput-object p9, p0, Lcom/crashlytics/android/answers/af;->qY:Ljava/lang/String;
 
-    iput-object p10, p0, Lcom/crashlytics/android/answers/af;->ra:Ljava/lang/String;
+    iput-object p10, p0, Lcom/crashlytics/android/answers/af;->qZ: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;->qI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qH: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;->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;
 
@@ -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;->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;
 
@@ -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;->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;
 
@@ -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;->qV:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qU: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;->qW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qV: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;->qX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qW: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;->cq:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->cp: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;->qY:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qX: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;->qZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qY: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;->ra:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/af;->qZ: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;->qI:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/af;->qH:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/af;->qH: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 1a8d476267..97704c66cc 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;->qB:Lcom/crashlytics/android/answers/af;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qA:Lcom/crashlytics/android/answers/af;
 
     const-string v2, "appBundleId"
 
-    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, "executionId"
 
-    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, "installationId"
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qT: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;->qV:Ljava/lang/Boolean;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qU: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;->qW:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qV: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;->qX:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qW: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;->cq:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->cp: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;->qY:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qX: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;->qZ:Ljava/lang/String;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/af;->qY: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;->ra:Ljava/lang/String;
+    iget-object v1, v1, Lcom/crashlytics/android/answers/af;->qZ: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;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->qB: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;->qD:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qC: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;->qD:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->qC: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;->qE:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->qD: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;->qF:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qE: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;->qF:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/ae;->qE: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;->qG:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object p0, p0, Lcom/crashlytics/android/answers/ae;->qG: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 cb626554d2..810409e72c 100644
--- a/com.discord/smali/com/crashlytics/android/answers/ah.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/ah.smali
@@ -6,12 +6,12 @@
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final rb:Lio/fabric/sdk/android/a/b/s;
+.field final ra:Lio/fabric/sdk/android/a/b/s;
+
+.field final rb:Ljava/lang/String;
 
 .field final rc:Ljava/lang/String;
 
-.field final rd:Ljava/lang/String;
-
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Lio/fabric/sdk/android/a/b/s;Ljava/lang/String;Ljava/lang/String;)V
@@ -21,11 +21,11 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/answers/ah;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/ah;->rb:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/ah;->rd:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
 
     return-void
 .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 a0ab72954a..05d7d9ae0e 100644
--- a/com.discord/smali/com/crashlytics/android/answers/b.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/b.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final ps:Lcom/crashlytics/android/answers/d;
+.field final pr:Lcom/crashlytics/android/answers/d;
 
-.field final pt:Ljava/util/Map;
+.field final ps: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;->pt:Ljava/util/Map;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/b;->ps:Lcom/crashlytics/android/answers/d;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/b;->pr: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->pr:Lcom/crashlytics/android/answers/d;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->pt:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->ps: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;->pt:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -61,7 +61,7 @@
 .method public final g(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->pr: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->pr: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->pr:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/d;->G(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/b;->pr:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v0, p2}, Lcom/crashlytics/android/answers/d;->G(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;->pt:Ljava/util/Map;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/b;->ps: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 462956d2c8..60aa69f031 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 ps:Lcom/crashlytics/android/answers/d;
+.field final pr:Lcom/crashlytics/android/answers/d;
 
-.field final pu:Lcom/crashlytics/android/answers/b;
+.field final pt: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;->BC()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->BF()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;->ps:Lcom/crashlytics/android/answers/d;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->pr:Lcom/crashlytics/android/answers/d;
 
     new-instance v0, Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/c;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/c;->pr: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;->pu:Lcom/crashlytics/android/answers/b;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
 
     return-void
 .end method
@@ -60,9 +60,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
 
-    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->pr: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->pr: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v1, v0, Lcom/crashlytics/android/answers/b;->pr:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v1, p1}, Lcom/crashlytics/android/answers/d;->G(Ljava/lang/String;)Ljava/lang/String;
 
@@ -109,7 +109,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pu:Lcom/crashlytics/android/answers/b;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/c;->pt:Lcom/crashlytics/android/answers/b;
 
     invoke-virtual {v0, p1, p2}, Lcom/crashlytics/android/answers/b;->g(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 97ecb72a40..919d42daae 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 pu:I
+
 .field final pv:I
 
-.field final pw:I
-
-.field px:Z
+.field pw:Z
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     const/16 v0, 0x14
 
-    iput v0, p0, Lcom/crashlytics/android/answers/d;->pv:I
+    iput v0, p0, Lcom/crashlytics/android/answers/d;->pu:I
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/crashlytics/android/answers/d;->pw:I
+    iput v0, p0, Lcom/crashlytics/android/answers/d;->pv:I
 
-    iput-boolean p1, p0, Lcom/crashlytics/android/answers/d;->px:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/answers/d;->pw: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;->px:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/d;->pw:Z
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -62,7 +62,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->pw:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->pv: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;->pw:I
+    iget v2, p0, Lcom/crashlytics/android/answers/d;->pv: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;->pw:I
+    iget v0, p0, Lcom/crashlytics/android/answers/d;->pv: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;->pv:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->pu:I
 
     const/4 v2, 0x0
 
@@ -175,7 +175,7 @@
 
     new-array v0, p2, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/crashlytics/android/answers/d;->pv:I
+    iget v1, p0, Lcom/crashlytics/android/answers/d;->pu: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 96c4c4f737..a0a564c0e9 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 pF:Lio/fabric/sdk/android/a/g/b;
+.field final synthetic pE:Lio/fabric/sdk/android/a/g/b;
 
-.field final synthetic pG:Ljava/lang/String;
+.field final synthetic pF:Ljava/lang/String;
 
-.field final synthetic pH:Lcom/crashlytics/android/answers/e;
+.field final synthetic pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$1;->pG:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/e$1;->pF:Lio/fabric/sdk/android/a/g/b;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/e$1;->pE:Lio/fabric/sdk/android/a/g/b;
 
-    iput-object p3, p0, Lcom/crashlytics/android/answers/e$1;->pG:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/e$1;->pF: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$1;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$1;->pF:Lio/fabric/sdk/android/a/g/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$1;->pE:Lio/fabric/sdk/android/a/g/b;
 
-    iget-object v2, p0, Lcom/crashlytics/android/answers/e$1;->pG:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/e$1;->pF: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 1f4c7c972f..cb7932dc31 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 pH:Lcom/crashlytics/android/answers/e;
+.field final synthetic pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$2;->pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$2;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$2;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$2;->pG: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;->pE:Lcom/crashlytics/android/answers/ad;
+    iput-object v2, v1, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->cn()V
     :try_end_0
@@ -59,7 +59,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 8731d51285..c18886dc25 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 pH:Lcom/crashlytics/android/answers/e;
+.field final synthetic pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$3;->pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$3;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->cm()V
     :try_end_0
@@ -51,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 35745c796c..23a1370611 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 pH:Lcom/crashlytics/android/answers/e;
+.field final synthetic pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$4;->pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pA:Lcom/crashlytics/android/answers/ah;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pz:Lcom/crashlytics/android/answers/ah;
 
-    iget-object v2, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/s;->ct()Ljava/util/Map;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v5, v3, Lio/fabric/sdk/android/a/b/s;->bbm:Ljava/lang/String;
+    iget-object v5, v3, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->BY()Ljava/lang/String;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
 
     move-result-object v7
 
-    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, v0, Lcom/crashlytics/android/answers/ah;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v4, v3, Lio/fabric/sdk/android/a/b/s;->bcB:Z
+    iget-boolean v4, v3, Lio/fabric/sdk/android/a/b/s;->bcK:Z
 
     if-eqz v4, :cond_0
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->lf:Landroid/content/Context;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
 
     invoke-static {v4}, Lio/fabric/sdk/android/a/b/r;->ba(Landroid/content/Context;)Z
 
@@ -86,13 +86,13 @@
 
     if-eqz v4, :cond_1
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->BR()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/s;->BU()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;->bbG:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/b/b;->bbP: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;->bcJ:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v3, Lio/fabric/sdk/android/a/b/s$a;->bcS:Lio/fabric/sdk/android/a/b/s$a;
 
     invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -145,7 +145,7 @@
 
     move-result-object v11
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->BZ()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->Cc()Ljava/lang/String;
 
     move-result-object v12
 
@@ -159,17 +159,17 @@
 
     new-instance v19, Lcom/crashlytics/android/answers/af;
 
-    iget-object v13, v0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
+    iget-object v13, v0, Lcom/crashlytics/android/answers/ah;->rb:Ljava/lang/String;
 
-    iget-object v14, v0, Lcom/crashlytics/android/answers/ah;->rd:Ljava/lang/String;
+    iget-object v14, v0, Lcom/crashlytics/android/answers/ah;->rc:Ljava/lang/String;
 
     move-object/from16 v4, v19
 
     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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pz:Lcom/crashlytics/android/answers/f;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->py: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;->pK:Lio/fabric/sdk/android/a/f/a;
+    iget-object v4, v0, Lcom/crashlytics/android/answers/f;->pJ: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
     new-instance v2, Lcom/crashlytics/android/answers/n;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v14, v3, Lcom/crashlytics/android/answers/e;->py:Lio/fabric/sdk/android/i;
+    iget-object v14, v3, Lcom/crashlytics/android/answers/e;->px:Lio/fabric/sdk/android/i;
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v3, v3, Lcom/crashlytics/android/answers/e;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, v3, Lcom/crashlytics/android/answers/e;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-object v5, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v5, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v5, v5, Lcom/crashlytics/android/answers/e;->pB:Lio/fabric/sdk/android/a/e/e;
+    iget-object v5, v5, Lcom/crashlytics/android/answers/e;->pA:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v6, v1, Lcom/crashlytics/android/answers/e$4;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v6, v1, Lcom/crashlytics/android/answers/e$4;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v6, v6, Lcom/crashlytics/android/answers/e;->pC:Lcom/crashlytics/android/answers/q;
+    iget-object v6, v6, Lcom/crashlytics/android/answers/e;->pB: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;->pE:Lcom/crashlytics/android/answers/ad;
+    iput-object v2, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
     return-void
 
@@ -269,7 +269,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 55cb413239..e50609bf51 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 pH:Lcom/crashlytics/android/answers/e;
+.field final synthetic pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$5;->pG: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$5;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->co()Z
     :try_end_0
@@ -51,7 +51,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 ce5821d7ef..ef49173417 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 pH:Lcom/crashlytics/android/answers/e;
+.field final synthetic pG:Lcom/crashlytics/android/answers/e;
 
-.field final synthetic pI:Lcom/crashlytics/android/answers/ae$a;
+.field final synthetic pH:Lcom/crashlytics/android/answers/ae$a;
 
-.field final synthetic pJ:Z
+.field final synthetic pI: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;->pH:Lcom/crashlytics/android/answers/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e$6;->pG:Lcom/crashlytics/android/answers/e;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/e$6;->pI:Lcom/crashlytics/android/answers/ae$a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/ae$a;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/answers/e$6;->pJ:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/answers/e$6;->pI: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;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/e$6;->pI:Lcom/crashlytics/android/answers/ae$a;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/e$6;->pH: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;->pJ:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/answers/e$6;->pI:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pH:Lcom/crashlytics/android/answers/e;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e$6;->pG:Lcom/crashlytics/android/answers/e;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pE:Lcom/crashlytics/android/answers/ad;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
     invoke-interface {v0}, Lcom/crashlytics/android/answers/ad;->co()Z
     :try_end_0
@@ -72,7 +72,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 e409d59c00..f680633d3d 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 pA:Lcom/crashlytics/android/answers/ah;
+.field final pA:Lio/fabric/sdk/android/a/e/e;
 
-.field final pB:Lio/fabric/sdk/android/a/e/e;
+.field final pB:Lcom/crashlytics/android/answers/q;
 
-.field final pC:Lcom/crashlytics/android/answers/q;
+.field final pC:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field final pD:Ljava/util/concurrent/ScheduledExecutorService;
+.field pD:Lcom/crashlytics/android/answers/ad;
 
-.field pE:Lcom/crashlytics/android/answers/ad;
+.field final px:Lio/fabric/sdk/android/i;
 
-.field final py:Lio/fabric/sdk/android/i;
+.field final py:Lcom/crashlytics/android/answers/f;
 
-.field final pz:Lcom/crashlytics/android/answers/f;
+.field final pz:Lcom/crashlytics/android/answers/ah;
 
 
 # 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;->pE:Lcom/crashlytics/android/answers/ad;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/e;->pD:Lcom/crashlytics/android/answers/ad;
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/e;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/e;->px: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;->pz:Lcom/crashlytics/android/answers/f;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/e;->py:Lcom/crashlytics/android/answers/f;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/e;->pA:Lcom/crashlytics/android/answers/ah;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/e;->pz:Lcom/crashlytics/android/answers/ah;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/e;->pB:Lio/fabric/sdk/android/a/e/e;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/e;->pA:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/e;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/e;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/e;->pC:Lcom/crashlytics/android/answers/q;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/e;->pB: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->pC: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -110,7 +110,7 @@
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/e;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ScheduledExecutorService;->submit(Ljava/lang/Runnable;)Ljava/util/concurrent/Future;
     :try_end_0
@@ -121,7 +121,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 029cad645a..a78416ffc5 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 pK:Lio/fabric/sdk/android/a/f/a;
+.field final pJ: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;->pK:Lio/fabric/sdk/android/a/f/a;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/f;->pJ: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 ecd1aebbe1..e43be0c51f 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 pL:Lcom/crashlytics/android/answers/k;
+.field private final pK:Lcom/crashlytics/android/answers/k;
 
-.field private final pr:Lcom/crashlytics/android/answers/ac;
+.field private final pq:Lcom/crashlytics/android/answers/ac;
 
 
 # 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;->pr:Lcom/crashlytics/android/answers/ac;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/g;->pq:Lcom/crashlytics/android/answers/ac;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/g;->pL:Lcom/crashlytics/android/answers/k;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/g;->pK: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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pq:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qL:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qK: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;->pL:Lcom/crashlytics/android/answers/k;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pK:Lcom/crashlytics/android/answers/k;
 
-    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pS:Z
+    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pR:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pU:Z
+    iget-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pT:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pU:Z
+    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pT:Z
 
     :try_start_0
-    iget-object v0, p1, Lcom/crashlytics/android/answers/k;->pT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/k;->pS:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    iget-object v2, p1, Lcom/crashlytics/android/answers/k;->pR:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p1, Lcom/crashlytics/android/answers/k;->pQ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pq:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qK:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qJ: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;->pL:Lcom/crashlytics/android/answers/k;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/g;->pK:Lcom/crashlytics/android/answers/k;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pU:Z
+    iput-boolean v0, p1, Lcom/crashlytics/android/answers/k;->pT:Z
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/k;->pT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/k;->pS: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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pq:Lcom/crashlytics/android/answers/ac;
 
-    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;
 
     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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/g;->pq:Lcom/crashlytics/android/answers/ac;
 
-    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qM:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v1, Lcom/crashlytics/android/answers/ae$b;->qL: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 54817cd1fd..9eb35b2e05 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 pM:Lio/fabric/sdk/android/a/f/c;
+.field final pL: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;->pM:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/h;->pL: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 92d1fbc985..5fc3508d2d 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 pN:Lcom/crashlytics/android/answers/ab;
+.field private final pM:Lcom/crashlytics/android/answers/ab;
 
-.field private final pO:Lcom/crashlytics/android/answers/y;
+.field private final pN: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;->pN:Lcom/crashlytics/android/answers/ab;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/i;->pM:Lcom/crashlytics/android/answers/ab;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/i;->pO:Lcom/crashlytics/android/answers/y;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/i;->pN: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;->pO:Lcom/crashlytics/android/answers/y;
+    iget-object v2, p0, Lcom/crashlytics/android/answers/i;->pN:Lcom/crashlytics/android/answers/y;
 
-    iget-object v3, v2, Lcom/crashlytics/android/answers/y;->qs:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v3, v2, Lcom/crashlytics/android/answers/y;->qr:Lio/fabric/sdk/android/a/c/a/e;
 
-    iget-object v4, v3, Lio/fabric/sdk/android/a/c/a/e;->qo:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/c/a/e;->qn: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;->qr:J
+    iget-wide v5, v2, Lcom/crashlytics/android/answers/y;->qq: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;->pN:Lcom/crashlytics/android/answers/ab;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/i;->pM:Lcom/crashlytics/android/answers/ab;
 
     invoke-virtual {v3, p1}, Lcom/crashlytics/android/answers/ab;->d(Ljava/util/List;)Z
 
@@ -88,32 +88,32 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pO:Lcom/crashlytics/android/answers/y;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pN:Lcom/crashlytics/android/answers/y;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qr:J
+    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qq:J
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qs:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qr: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;->qo:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/c/a/e;->qn:Lio/fabric/sdk/android/a/c/a/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdP:Lio/fabric/sdk/android/a/c/a/d;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdZ: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;->qs:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->qr:Lio/fabric/sdk/android/a/c/a/e;
 
     return v2
 
     :cond_1
-    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pO:Lcom/crashlytics/android/answers/y;
+    iget-object p1, p0, Lcom/crashlytics/android/answers/i;->pN:Lcom/crashlytics/android/answers/y;
 
-    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qr:J
+    iput-wide v0, p1, Lcom/crashlytics/android/answers/y;->qq:J
 
-    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qs:Lio/fabric/sdk/android/a/c/a/e;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/y;->qr: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;->qo:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/c/a/e;->qn:Lio/fabric/sdk/android/a/c/a/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdP:Lio/fabric/sdk/android/a/c/a/d;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a/e;->bdZ: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;->qs:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object v1, p1, Lcom/crashlytics/android/answers/y;->qr: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 d7ba7db99a..ca05489e79 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 pP:Ljava/lang/reflect/Method;
+.field private final pO:Ljava/lang/reflect/Method;
 
-.field private final pQ:Ljava/lang/Object;
+.field private final pP: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;->pQ:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/j;->pP:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/j;->pP:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/j;->pO:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -184,9 +184,9 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/j;->pP:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/j;->pO:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/j;->pQ:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/j;->pP: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 70f0d6f9fd..775967508a 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 pV:Lcom/crashlytics/android/answers/k;
+.field final synthetic pU: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;->pV:Lcom/crashlytics/android/answers/k;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/k$1;->pU: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;->pV:Lcom/crashlytics/android/answers/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->pU:Lcom/crashlytics/android/answers/k;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/k;->pT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/k;->pS: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;->pV:Lcom/crashlytics/android/answers/k;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/k$1;->pU: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 ca9df9c14b..849eb27740 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 pR:Ljava/util/concurrent/ScheduledExecutorService;
+.field final pQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field volatile pS:Z
+.field volatile pR:Z
 
-.field final pT:Ljava/util/concurrent/atomic/AtomicReference;
+.field final pS: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 pU:Z
+.field pT:Z
 
 
 # direct methods
@@ -53,17 +53,17 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pS:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pR: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;->pT:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v1, p0, Lcom/crashlytics/android/answers/k;->pS:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pU:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/k;->pT:Z
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/k;->pR:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/k;->pQ: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 3321ed494d..3da3752713 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 pW:Ljava/lang/String;
+.field final pV: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/l;->pr:Lcom/crashlytics/android/answers/d;
 
     invoke-virtual {v0, p1}, Lcom/crashlytics/android/answers/d;->G(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/l;->pW:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/l;->pV: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;->pW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->pV: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;->pu:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/l;->pt: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 f012aef50b..2467afd1c1 100644
--- a/com.discord/smali/com/crashlytics/android/answers/n.smali
+++ b/com.discord/smali/com/crashlytics/android/answers/n.smali
@@ -9,15 +9,15 @@
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final pC:Lcom/crashlytics/android/answers/q;
+.field private final pB:Lcom/crashlytics/android/answers/q;
 
-.field private final pR:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final pQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final pX:Lio/fabric/sdk/android/a/e/e;
+.field private final pW:Lio/fabric/sdk/android/a/e/e;
 
-.field private final pY:Lcom/crashlytics/android/answers/aa;
+.field private final pX:Lcom/crashlytics/android/answers/aa;
 
-.field private final pZ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final pY:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -27,26 +27,26 @@
     .end annotation
 .end field
 
-.field private final py:Lio/fabric/sdk/android/i;
+.field final pZ:Lcom/crashlytics/android/answers/af;
 
-.field final qa:Lcom/crashlytics/android/answers/af;
+.field private final px:Lio/fabric/sdk/android/i;
 
-.field qb:Lio/fabric/sdk/android/a/d/f;
+.field qa:Lio/fabric/sdk/android/a/d/f;
 
-.field qc:Lio/fabric/sdk/android/a/b/g;
+.field qb:Lio/fabric/sdk/android/a/b/g;
 
-.field qd:Lcom/crashlytics/android/answers/o;
+.field qc:Lcom/crashlytics/android/answers/o;
+
+.field qd:Z
 
 .field qe:Z
 
-.field qf:Z
+.field volatile qf:I
 
-.field volatile qg:I
+.field qg:Z
 
 .field qh:Z
 
-.field qi:Z
-
 
 # direct methods
 .method public constructor <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
@@ -58,49 +58,49 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->pY: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;->qc:Lio/fabric/sdk/android/a/b/g;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->qb: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;->qd:Lcom/crashlytics/android/answers/o;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->qc:Lcom/crashlytics/android/answers/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qe:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qd:Z
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qf:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qe:Z
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/crashlytics/android/answers/n;->qg:I
+    iput v0, p0, Lcom/crashlytics/android/answers/n;->qf:I
 
     const/4 v0, 0x0
 
+    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qg:Z
+
     iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qh:Z
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/answers/n;->qi:Z
-
-    iput-object p1, p0, Lcom/crashlytics/android/answers/n;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/n;->px: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;->pR:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p3, p0, Lcom/crashlytics/android/answers/n;->pQ:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p4, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iput-object p4, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
-    iput-object p5, p0, Lcom/crashlytics/android/answers/n;->pX:Lio/fabric/sdk/android/a/e/e;
+    iput-object p5, p0, Lcom/crashlytics/android/answers/n;->pW:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p6, p0, Lcom/crashlytics/android/answers/n;->qa:Lcom/crashlytics/android/answers/af;
+    iput-object p6, p0, Lcom/crashlytics/android/answers/n;->pZ:Lcom/crashlytics/android/answers/af;
 
-    iput-object p7, p0, Lcom/crashlytics/android/answers/n;->pC:Lcom/crashlytics/android/answers/q;
+    iput-object p7, p0, Lcom/crashlytics/android/answers/n;->pB: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;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY: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;->u(Landroid/content/Context;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->pR:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->pQ: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;->qa:Lcom/crashlytics/android/answers/af;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/n;->pZ: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;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v0, Lcom/crashlytics/android/answers/ae$a;->qB:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v7, v0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/util/Map;
+    iget-object v7, v0, Lcom/crashlytics/android/answers/ae$a;->qC:Ljava/util/Map;
 
-    iget-object v8, v0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/lang/String;
+    iget-object v8, v0, Lcom/crashlytics/android/answers/ae$a;->qD:Ljava/lang/String;
 
-    iget-object v9, v0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/util/Map;
+    iget-object v9, v0, Lcom/crashlytics/android/answers/ae$a;->qE:Ljava/util/Map;
 
-    iget-object v10, v0, Lcom/crashlytics/android/answers/ae$a;->qG:Ljava/lang/String;
+    iget-object v10, v0, Lcom/crashlytics/android/answers/ae$a;->qF:Ljava/lang/String;
 
-    iget-object v11, v0, Lcom/crashlytics/android/answers/ae$a;->qH:Ljava/util/Map;
+    iget-object v11, v0, Lcom/crashlytics/android/answers/ae$a;->qG: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;->qe:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->qd:Z
 
     const-string v2, "Answers"
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qO:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qB: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qf:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->qe:Z
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qQ:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qB: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qd:Lcom/crashlytics/android/answers/o;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->qc: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
     invoke-virtual {v0, v13}, Lcom/crashlytics/android/answers/aa;->aN(Ljava/lang/Object;)V
     :try_end_0
@@ -324,7 +324,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qg:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->qf:I
 
     const/4 v3, -0x1
 
@@ -357,20 +357,20 @@
     :goto_1
     if-eqz v0, :cond_4
 
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->qg:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->qf:I
 
     int-to-long v6, v0
 
-    iget v0, v1, Lcom/crashlytics/android/answers/n;->qg:I
+    iget v0, v1, Lcom/crashlytics/android/answers/n;->qf: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;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qO:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qB: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;->qQ:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v0, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qB: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;->qG:Ljava/lang/String;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qF:Ljava/lang/String;
 
     const-string v7, "purchase"
 
@@ -408,7 +408,7 @@
 
     move-result v6
 
-    iget-boolean v8, v1, Lcom/crashlytics/android/answers/n;->qh:Z
+    iget-boolean v8, v1, Lcom/crashlytics/android/answers/n;->qg: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;->qi:Z
+    iget-boolean v0, v1, Lcom/crashlytics/android/answers/n;->qh:Z
 
     if-nez v0, :cond_8
 
@@ -427,9 +427,9 @@
 
     :cond_8
     :try_start_1
-    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pC:Lcom/crashlytics/android/answers/q;
+    iget-object v0, v1, Lcom/crashlytics/android/answers/n;->pB:Lcom/crashlytics/android/answers/q;
 
-    iget-object v6, v0, Lcom/crashlytics/android/answers/q;->qk:Lcom/crashlytics/android/answers/p;
+    iget-object v6, v0, Lcom/crashlytics/android/answers/q;->qj: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;->qk:Lcom/crashlytics/android/answers/p;
+    iput-object v6, v0, Lcom/crashlytics/android/answers/q;->qj:Lcom/crashlytics/android/answers/p;
 
     :cond_9
-    iget-object v0, v0, Lcom/crashlytics/android/answers/q;->qk:Lcom/crashlytics/android/answers/p;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/q;->qj:Lcom/crashlytics/android/answers/p;
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qP:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v6, Lcom/crashlytics/android/answers/ae$b;->qO:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->qB: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;->qE:Ljava/lang/String;
+    iget-object v6, v13, Lcom/crashlytics/android/answers/ae;->qD: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;->qQ:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v8, Lcom/crashlytics/android/answers/ae$b;->qP:Lcom/crashlytics/android/answers/ae$b;
 
-    iget-object v9, v13, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v9, v13, Lcom/crashlytics/android/answers/ae;->qB: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;->qG:Ljava/lang/String;
+    iget-object v8, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qG:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
 
     const-string v4, "itemType"
 
@@ -592,7 +592,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
 
     const-string v4, "itemType"
 
@@ -671,7 +671,7 @@
 
     const-string v0, "price"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
 
     const-string v4, "itemPrice"
 
@@ -687,7 +687,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/util/Map;
 
     const-string v4, "itemCount"
 
@@ -756,7 +756,7 @@
 
     const-string v0, "value"
 
-    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qH:Ljava/util/Map;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v3, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qF:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qE: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;->qF:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qE:Ljava/util/Map;
 
     if-eqz v0, :cond_1b
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qE: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;->qH:Ljava/util/Map;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG: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;->qG:Ljava/lang/String;
+    iget-object v1, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->qE:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qD:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/crashlytics/android/answers/t;->H(Ljava/lang/String;)Ljava/lang/String;
 
@@ -1503,7 +1503,7 @@
 
     :goto_e
     :pswitch_b
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pW:Ljava/lang/String;
+    iget-object v0, v3, Lcom/crashlytics/android/answers/s;->pV:Ljava/lang/String;
 
-    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->ql:Landroid/os/Bundle;
+    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->qk:Landroid/os/Bundle;
 
     move-object/from16 v4, v16
 
     invoke-interface {v4, v0, v1}, Lcom/crashlytics/android/answers/p;->a(Ljava/lang/String;Landroid/os/Bundle;)V
 
-    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qG:Ljava/lang/String;
+    iget-object v0, v13, Lcom/crashlytics/android/answers/ae;->qF: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;->ql:Landroid/os/Bundle;
+    iget-object v1, v3, Lcom/crashlytics/android/answers/s;->qk:Landroid/os/Bundle;
 
     invoke-interface {v4, v0, v1}, Lcom/crashlytics/android/answers/p;->a(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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/n;->px:Lio/fabric/sdk/android/i;
 
-    iget-object v3, p1, Lio/fabric/sdk/android/a/g/b;->beM:Ljava/lang/String;
+    iget-object v3, p1, Lio/fabric/sdk/android/a/g/b;->beW:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pX:Lio/fabric/sdk/android/a/e/e;
+    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pW:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qc:Lio/fabric/sdk/android/a/b/g;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qb: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;->qb:Lio/fabric/sdk/android/a/d/f;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/n;->qa:Lio/fabric/sdk/android/a/d/f;
 
-    iget-object p2, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object p2, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
-    iput-object p1, p2, Lcom/crashlytics/android/answers/aa;->qv:Lio/fabric/sdk/android/a/g/b;
+    iput-object p1, p2, Lcom/crashlytics/android/answers/aa;->qu:Lio/fabric/sdk/android/a/g/b;
 
-    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->beR:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->bfb:Z
+
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qg:Z
+
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->qh:Z
 
     iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qh:Z
 
-    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->qi:Z
-
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qi:Z
-
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qh:Z
+    iget-boolean v1, p0, Lcom/crashlytics/android/answers/n;->qg: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qi:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->qh: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;->beS:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->bfc:Z
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qe:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qd:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qe:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->qd: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;->beT:Z
+    iget-boolean p2, p1, Lio/fabric/sdk/android/a/g/b;->bfd:Z
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qf:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/answers/n;->qe:Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qf:Z
+    iget-boolean v4, p0, Lcom/crashlytics/android/answers/n;->qe: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;->qt:I
+    iget p2, p1, Lio/fabric/sdk/android/a/g/b;->qs:I
 
     const/4 v0, 0x1
 
     if-le p2, v0, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qt:I
+    iget v0, p1, Lio/fabric/sdk/android/a/g/b;->qs:I
 
     invoke-direct {p2, v0}, Lcom/crashlytics/android/answers/z;-><init>(I)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/n;->qd:Lcom/crashlytics/android/answers/o;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/n;->qc:Lcom/crashlytics/android/answers/o;
 
     :cond_4
-    iget p1, p1, Lio/fabric/sdk/android/a/g/b;->beN:I
+    iget p1, p1, Lio/fabric/sdk/android/a/g/b;->beX:I
 
-    iput p1, p0, Lcom/crashlytics/android/answers/n;->qg:I
+    iput p1, p0, Lcom/crashlytics/android/answers/n;->qf:I
 
     const-wide/16 p1, 0x0
 
-    iget v0, p0, Lcom/crashlytics/android/answers/n;->qg:I
+    iget v0, p0, Lcom/crashlytics/android/answers/n;->qf:I
 
     int-to-long v0, v0
 
@@ -1858,7 +1858,7 @@
 .method public final cm()V
     .locals 8
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qb:Lio/fabric/sdk/android/a/d/f;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->qa: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;->u(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cp()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cs()Ljava/util/List;
 
     move-result-object v0
 
@@ -1921,7 +1921,7 @@
 
     invoke-static {v3, v4}, Lio/fabric/sdk/android/a/b/i;->u(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/answers/n;->qb:Lio/fabric/sdk/android/a/d/f;
+    iget-object v3, p0, Lcom/crashlytics/android/answers/n;->qa:Lio/fabric/sdk/android/a/d/f;
 
     invoke-interface {v3, v0}, Lio/fabric/sdk/android/a/d/f;->d(Ljava/util/List;)Z
 
@@ -1935,16 +1935,16 @@
 
     add-int/2addr v2, v4
 
-    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v4, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
     invoke-virtual {v4, v0}, Lcom/crashlytics/android/answers/aa;->S(Ljava/util/List;)V
 
     :cond_1
     if-eqz v3, :cond_2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cp()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cs()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;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cr()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cu()V
 
     :cond_3
     return-void
@@ -1989,9 +1989,9 @@
 .method public final cn()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
-    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Cq()V
+    invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->Ct()V
 
     return-void
 .end method
@@ -2000,7 +2000,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY:Lcom/crashlytics/android/answers/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pX:Lcom/crashlytics/android/answers/aa;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/answers/aa;->co()Z
 
@@ -2025,7 +2025,7 @@
 .method public final cp()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY: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;->u(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY: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;->pZ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/n;->pY: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 f2ee178fe8..4399144d06 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 qj:Lcom/crashlytics/android/answers/t;
+.field final qi:Lcom/crashlytics/android/answers/t;
 
-.field qk:Lcom/crashlytics/android/answers/p;
+.field qj: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;->qj:Lcom/crashlytics/android/answers/t;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/q;->qi: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 cb8786d53c..e103ff5f7d 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 pW:Ljava/lang/String;
+.field final pV:Ljava/lang/String;
 
-.field final ql:Landroid/os/Bundle;
+.field final qk:Landroid/os/Bundle;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/answers/s;->pW:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/s;->pV:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/answers/s;->ql:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/crashlytics/android/answers/s;->qk: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 984769bd3d..44fea7ab56 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 qm:Ljava/util/Set;
+.field private static final ql: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;->qm:Ljava/util/Set;
+    sput-object v0, Lcom/crashlytics/android/answers/t;->ql:Ljava/util/Set;
 
     return-void
 .end method
@@ -214,7 +214,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/crashlytics/android/answers/t;->qm:Ljava/util/Set;
+    sget-object v0, Lcom/crashlytics/android/answers/t;->ql: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;->pp:Ljava/math/BigDecimal;
+    sget-object p0, Lcom/crashlytics/android/answers/a;->po: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/w.smali b/com.discord/smali/com/crashlytics/android/answers/w.smali
index 018fca24d3..21689520ae 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 public final qn:Lcom/crashlytics/android/answers/b;
+.field public final qm: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;->ps:Lcom/crashlytics/android/answers/d;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->pr: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;->qn:Lcom/crashlytics/android/answers/b;
+    iput-object v0, p0, Lcom/crashlytics/android/answers/w;->qm: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;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->qm: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;->pu:Lcom/crashlytics/android/answers/b;
+    iget-object v1, p0, Lcom/crashlytics/android/answers/w;->pt: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 23020b760e..912fdbebb3 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 qo:Lio/fabric/sdk/android/a/c/a/a;
+.field final qn:Lio/fabric/sdk/android/a/c/a/a;
 
-.field final qq:D
+.field final qo: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;->qo:Lio/fabric/sdk/android/a/c/a/a;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/x;->qn:Lio/fabric/sdk/android/a/c/a/a;
 
     const-wide p1, 0x3fb999999999999aL    # 0.1
 
-    iput-wide p1, p0, Lcom/crashlytics/android/answers/x;->qq:D
+    iput-wide p1, p0, Lcom/crashlytics/android/answers/x;->qo:D
 
     iput-object p4, p0, Lcom/crashlytics/android/answers/x;->random:Ljava/util/Random;
 
@@ -61,7 +61,7 @@
 .method public final l(I)J
     .locals 6
 
-    iget-wide v0, p0, Lcom/crashlytics/android/answers/x;->qq:D
+    iget-wide v0, p0, Lcom/crashlytics/android/answers/x;->qo: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;->qo:Lio/fabric/sdk/android/a/c/a/a;
+    iget-object v0, p0, Lcom/crashlytics/android/answers/x;->qn:Lio/fabric/sdk/android/a/c/a/a;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/c/a/a;->l(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 7f0dd23930..0909b1cc11 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 qr:J
+.field qq:J
 
-.field qs:Lio/fabric/sdk/android/a/c/a/e;
+.field qr: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;->qs:Lio/fabric/sdk/android/a/c/a/e;
+    iput-object p1, p0, Lcom/crashlytics/android/answers/y;->qr: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 ee62545500..daa1dd8a55 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;->qI: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;->qJ: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;->qM: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 ff1e494d4e..fd52fe357a 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 qu:Ljava/util/Set;
+.field static final qt:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field final qt:I
+.field final qs: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;->qu:Ljava/util/Set;
+    sput-object v0, Lcom/crashlytics/android/answers/z;->qt: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;->qt:I
+    iput p1, p0, Lcom/crashlytics/android/answers/z;->qs: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;->qu:Ljava/util/Set;
+    sget-object v0, Lcom/crashlytics/android/answers/z;->qt:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/crashlytics/android/answers/ae;->qC:Lcom/crashlytics/android/answers/ae$b;
+    iget-object v1, p1, Lcom/crashlytics/android/answers/ae;->qB: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;->qB:Lcom/crashlytics/android/answers/af;
+    iget-object v0, p1, Lcom/crashlytics/android/answers/ae;->qA:Lcom/crashlytics/android/answers/af;
 
-    iget-object v0, v0, Lcom/crashlytics/android/answers/af;->qW:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/answers/af;->qV: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;->qB:Lcom/crashlytics/android/answers/af;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/ae;->qA:Lcom/crashlytics/android/answers/af;
 
-    iget-object p1, p1, Lcom/crashlytics/android/answers/af;->qU:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/answers/af;->qT:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
 
     move-result p1
 
-    iget v3, p0, Lcom/crashlytics/android/answers/z;->qt:I
+    iget v3, p0, Lcom/crashlytics/android/answers/z;->qs: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 3ac7348a68..6c3fd6344e 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;->bcg:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/l;->bcp: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 df01922182..2fa505a9eb 100644
--- a/com.discord/smali/com/crashlytics/android/beta/a.smali
+++ b/com.discord/smali/com/crashlytics/android/beta/a.smali
@@ -39,7 +39,7 @@
 .method public final synthetic cf()Ljava/lang/Object;
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 9993ec7fce..cfedf219fa 100644
--- a/com.discord/smali/com/crashlytics/android/core/a.smali
+++ b/com.discord/smali/com/crashlytics/android/core/a.smali
@@ -6,16 +6,16 @@
 # instance fields
 .field public final packageName:Ljava/lang/String;
 
-.field public final qX:Ljava/lang/String;
+.field public final qW:Ljava/lang/String;
 
-.field public final qw:Ljava/lang/String;
+.field public final qv:Ljava/lang/String;
+
+.field public final rb:Ljava/lang/String;
 
 .field public final rc:Ljava/lang/String;
 
 .field public final rd:Ljava/lang/String;
 
-.field public final re:Ljava/lang/String;
-
 
 # direct methods
 .method constructor <init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -23,17 +23,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/a;->qX:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/a;->qW:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/a;->re:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/a;->rd: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;->rc:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/a;->rb:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/crashlytics/android/core/a;->rd:Ljava/lang/String;
+    iput-object p6, p0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/core/ab.smali b/com.discord/smali/com/crashlytics/android/core/ab.smali
index 0815aa0562..f6e2561a56 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 tr:[Ljava/io/File;
+.field private final tq:[Ljava/io/File;
 
-.field private final ts:Ljava/util/Map;
+.field private final tr:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final tt:Ljava/lang/String;
+.field private final ts:Ljava/lang/String;
 
 
 # direct methods
@@ -29,17 +29,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->tq:[Ljava/io/File;
 
     new-instance p2, Ljava/util/HashMap;
 
-    sget-object v0, Lcom/crashlytics/android/core/ar;->tU:Ljava/util/Map;
+    sget-object v0, Lcom/crashlytics/android/core/ar;->tT:Ljava/util/Map;
 
     invoke-direct {p2, v0}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->ts:Ljava/util/Map;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ab;->tr:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ab;->tt:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ab;->ts:Ljava/lang/String;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 .method public final df()Ljava/io/File;
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tq:[Ljava/io/File;
 
     const/4 v1, 0x0
 
@@ -61,7 +61,7 @@
 .method public final dg()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tq:[Ljava/io/File;
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->ts:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -90,7 +90,7 @@
 .method public final di()I
     .locals 1
 
-    sget v0, Lcom/crashlytics/android/core/aq$a;->tR:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tQ:I
 
     return v0
 .end method
@@ -98,7 +98,7 @@
 .method public final getFileName()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tr:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tq:[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;->tt:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->ts: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;->tr:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ab;->tq:[Ljava/io/File;
 
     array-length v1, v0
 
@@ -133,7 +133,7 @@
 
     aget-object v3, v0, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 2db38202f1..424a19d434 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 tu:Lcom/crashlytics/android/core/ac$b;
+.field private static final tt:Lcom/crashlytics/android/core/ac$b;
 
 
 # instance fields
 .field private final context:Landroid/content/Context;
 
-.field private final tv:Lcom/crashlytics/android/core/ac$a;
+.field private final tu:Lcom/crashlytics/android/core/ac$a;
 
-.field tw:Lcom/crashlytics/android/core/aa;
+.field tv: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;->tu:Lcom/crashlytics/android/core/ac$b;
+    sput-object v0, Lcom/crashlytics/android/core/ac;->tt:Lcom/crashlytics/android/core/ac$b;
 
     return-void
 .end method
@@ -56,11 +56,11 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/ac;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/ac$a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$a;
 
-    sget-object p1, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$b;
+    sget-object p1, Lcom/crashlytics/android/core/ac;->tt:Lcom/crashlytics/android/core/ac$b;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
 
     invoke-virtual {p0, p3}, Lcom/crashlytics/android/core/ac;->R(Ljava/lang/String;)V
 
@@ -88,7 +88,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/ac$a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$a;
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/ac$a;->cK()Ljava/io/File;
 
@@ -108,7 +108,7 @@
 
     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;->tw:Lcom/crashlytics/android/core/aa;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
 
     return-void
 .end method
@@ -118,13 +118,13 @@
 .method final R(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/aa;->dd()V
 
-    sget-object v0, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$b;
+    sget-object v0, Lcom/crashlytics/android/core/ac;->tt:Lcom/crashlytics/android/core/ac$b;
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ac;->tv: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -176,7 +176,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/ac$a;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tu:Lcom/crashlytics/android/core/ac$a;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ac$a;->cK()Ljava/io/File;
 
@@ -241,7 +241,7 @@
 .method final dj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/aa;->de()V
 
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 eb21e69110..006e24217d 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 tz:Lcom/crashlytics/android/core/az;
+.field final synthetic ty:Lcom/crashlytics/android/core/az;
 
 
 # direct methods
@@ -27,11 +27,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ae$1;->tz:Lcom/crashlytics/android/core/az;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ae$1;->ty:Lcom/crashlytics/android/core/az;
 
     invoke-direct {p0}, Lorg/json/JSONObject;-><init>()V
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->tz:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->ty: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;->tz:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->ty: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;->tz:Lcom/crashlytics/android/core/az;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ae$1;->ty: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 3b4060c557..af344c164f 100644
--- a/com.discord/smali/com/crashlytics/android/core/ae.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ae.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field static final tx:Ljava/nio/charset/Charset;
+.field static final tw:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final ty:Ljava/io/File;
+.field private final tx:Ljava/io/File;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/ae;->tx:Ljava/nio/charset/Charset;
+    sput-object v0, Lcom/crashlytics/android/core/ae;->tw:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -31,7 +31,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ae;->ty:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ae;->tx:Ljava/io/File;
 
     return-void
 .end method
@@ -123,7 +123,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object p1, Lcom/crashlytics/android/core/az;->uj:Lcom/crashlytics/android/core/az;
+    sget-object p1, Lcom/crashlytics/android/core/az;->ui:Lcom/crashlytics/android/core/az;
 
     return-object p1
 
@@ -200,7 +200,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->uj:Lcom/crashlytics/android/core/az;
+    sget-object p1, Lcom/crashlytics/android/core/az;->ui:Lcom/crashlytics/android/core/az;
 
     return-object p1
 
@@ -229,7 +229,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->ty:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->tx:Ljava/io/File;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -255,7 +255,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->ty:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ae;->tx: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 2d1352cc7f..b4789b0774 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 tA:I
+.field private final tA:[Lcom/crashlytics/android/core/aw;
 
-.field private final tB:[Lcom/crashlytics/android/core/aw;
+.field private final tB:Lcom/crashlytics/android/core/ag;
 
-.field private final tC:Lcom/crashlytics/android/core/ag;
+.field private final tz:I
 
 
 # direct methods
@@ -22,15 +22,15 @@
 
     const/16 v0, 0x400
 
-    iput v0, p0, Lcom/crashlytics/android/core/af;->tA:I
+    iput v0, p0, Lcom/crashlytics/android/core/af;->tz:I
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/af;->tB:[Lcom/crashlytics/android/core/aw;
+    iput-object p1, p0, Lcom/crashlytics/android/core/af;->tA:[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;->tC:Lcom/crashlytics/android/core/ag;
+    iput-object p1, p0, Lcom/crashlytics/android/core/af;->tB: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;->tA:I
+    iget v1, p0, Lcom/crashlytics/android/core/af;->tz:I
 
     if-gt v0, v1, :cond_0
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/af;->tB:[Lcom/crashlytics/android/core/aw;
+    iget-object v0, p0, Lcom/crashlytics/android/core/af;->tA:[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;->tA:I
+    iget v6, p0, Lcom/crashlytics/android/core/af;->tz: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;->tA:I
+    iget v0, p0, Lcom/crashlytics/android/core/af;->tz:I
 
     if-le p1, v0, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/af;->tC:Lcom/crashlytics/android/core/ag;
+    iget-object p1, p0, Lcom/crashlytics/android/core/af;->tB: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 66511d99a8..83f3e0dccb 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 tD:I
+.field private final tC:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/16 p1, 0x400
 
-    iput p1, p0, Lcom/crashlytics/android/core/ag;->tD:I
+    iput p1, p0, Lcom/crashlytics/android/core/ag;->tC:I
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     array-length v0, p1
 
-    iget v1, p0, Lcom/crashlytics/android/core/ag;->tD:I
+    iget v1, p0, Lcom/crashlytics/android/core/ag;->tC: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 73d4a2e945..479ca42c6a 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;->beg:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->beq:I
 
     move-object v0, p0
 
@@ -297,11 +297,11 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->BN()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->BQ()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qw:Ljava/lang/String;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qv: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;->py:Lio/fabric/sdk/android/i;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v3}, Lio/fabric/sdk/android/i;->cc()Ljava/lang/String;
 
@@ -335,7 +335,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->py:Lio/fabric/sdk/android/i;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ah;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v3}, Lio/fabric/sdk/android/i;->cc()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;->sK:Lcom/crashlytics/android/core/aq;
+    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sJ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -381,11 +381,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;->CD()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CG()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/aj.smali b/com.discord/smali/com/crashlytics/android/core/aj.smali
index 71df544c0b..4753053410 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 tE:Ljava/io/File;
+.field private final tD:Ljava/io/File;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/aj;->tE:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/aj;->tD:Ljava/io/File;
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public final dg()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tE:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tD:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -63,7 +63,7 @@
 .method public final di()I
     .locals 1
 
-    sget v0, Lcom/crashlytics/android/core/aq$a;->tS:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tR:I
 
     return v0
 .end method
@@ -79,7 +79,7 @@
 .method public final getIdentifier()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tE:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tD: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;->tE:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tD: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->tE:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/aj;->tD: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;->tE:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/aj;->tD: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 3a10d7f19d..5f9fd8f10a 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 tF:Lio/fabric/sdk/android/a/f/c;
+.field final tE:Lio/fabric/sdk/android/a/f/c;
 
-.field final tG:Lcom/crashlytics/android/core/l;
+.field final tF: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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/al;->tG:Lcom/crashlytics/android/core/l;
+    iput-object p2, p0, Lcom/crashlytics/android/core/al;->tF: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 b4ae73902b..c350414774 100644
--- a/com.discord/smali/com/crashlytics/android/core/am.smali
+++ b/com.discord/smali/com/crashlytics/android/core/am.smali
@@ -8,9 +8,9 @@
 
 .field public final size:J
 
-.field public final tH:J
+.field public final tG:J
 
-.field public final tI:Ljava/lang/String;
+.field public final tH:Ljava/lang/String;
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p1, p0, Lcom/crashlytics/android/core/am;->tH:J
+    iput-wide p1, p0, Lcom/crashlytics/android/core/am;->tG:J
 
     iput-wide p3, p0, Lcom/crashlytics/android/core/am;->size:J
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/am;->tI:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/am;->tH: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 b164737186..f8eed8c127 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 tJ:Ljava/util/regex/Pattern;
+.field private static final tI:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/an;->tJ:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/crashlytics/android/core/an;->tI:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -25,7 +25,7 @@
 .method public static W(Ljava/lang/String;)Lcom/crashlytics/android/core/am;
     .locals 11
 
-    sget-object v0, Lcom/crashlytics/android/core/an;->tJ:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/crashlytics/android/core/an;->tI: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 e1554ac8a4..32392e0fd3 100644
--- a/com.discord/smali/com/crashlytics/android/core/ao$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ao$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic tN:[B
+.field final synthetic tM:[B
 
-.field final synthetic tO:[I
+.field final synthetic tN:[I
 
-.field final synthetic tP:Lcom/crashlytics/android/core/ao;
+.field final synthetic tO: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;->tP:Lcom/crashlytics/android/core/ao;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao$1;->tO:Lcom/crashlytics/android/core/ao;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ao$1;->tN:[B
+    iput-object p2, p0, Lcom/crashlytics/android/core/ao$1;->tM:[B
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ao$1;->tO:[I
+    iput-object p3, p0, Lcom/crashlytics/android/core/ao$1;->tN:[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;->tN:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tM:[B
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ao$1;->tO:[I
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao$1;->tN:[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;->tO:[I
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao$1;->tN:[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 9dd500fa1e..38d70ddc70 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 rg:[B
+.field public final rf:[B
 
-.field final synthetic tP:Lcom/crashlytics/android/core/ao;
+.field final synthetic tO: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;->tP:Lcom/crashlytics/android/core/ao;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao$a;->tO:Lcom/crashlytics/android/core/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ao$a;->rg:[B
+    iput-object p2, p0, Lcom/crashlytics/android/core/ao$a;->rf:[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 69e1b2ee46..161da5afb0 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 tK:Ljava/io/File;
+.field private final tJ:Ljava/io/File;
 
-.field private final tL:I
+.field private final tK:I
 
-.field private tM:Lio/fabric/sdk/android/a/b/u;
+.field private tL:Lio/fabric/sdk/android/a/b/u;
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ao;->tK:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ao;->tJ:Ljava/io/File;
 
     const/high16 p1, 0x10000
 
-    iput p1, p0, Lcom/crashlytics/android/core/ao;->tL:I
+    iput p1, p0, Lcom/crashlytics/android/core/ao;->tK:I
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 .method private dl()Lcom/crashlytics/android/core/ao$a;
     .locals 7
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tK:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tJ:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->exists()Z
 
@@ -55,7 +55,7 @@
     :cond_0
     invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->dm()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tL: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;->Cb()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
 
     move-result v0
 
     new-array v0, v0, [B
 
     :try_start_0
-    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tL: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -115,18 +115,18 @@
 .method private dm()V
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tL: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;->tK:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->tJ: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;->tM:Lio/fabric/sdk/android/a/b/u;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->tL: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->tK:Ljava/io/File;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ao;->tJ:Ljava/io/File;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -170,7 +170,7 @@
 
     invoke-direct {p0}, Lcom/crashlytics/android/core/ao;->dm()V
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ao;->tL: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;->tL:I
+    iget v1, p0, Lcom/crashlytics/android/core/ao;->tK:I
 
     div-int/lit8 v1, v1, 0x4
 
@@ -255,14 +255,14 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object p2, p0, Lcom/crashlytics/android/core/ao;->tL:Lio/fabric/sdk/android/a/b/u;
 
     array-length p3, p1
 
     invoke-virtual {p2, p1, p3}, Lio/fabric/sdk/android/a/b/u;->n([BI)V
 
     :goto_0
-    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tL: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;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tL:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->Cb()I
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/u;->Ce()I
 
     move-result p1
 
-    iget p2, p0, Lcom/crashlytics/android/core/ao;->tL:I
+    iget p2, p0, Lcom/crashlytics/android/core/ao;->tK:I
 
     if-le p1, p2, :cond_2
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ao;->tL: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -322,7 +322,7 @@
     return-object v0
 
     :cond_0
-    iget-object v1, v0, Lcom/crashlytics/android/core/ao$a;->rg:[B
+    iget-object v1, v0, Lcom/crashlytics/android/core/ao$a;->rf:[B
 
     iget v0, v0, Lcom/crashlytics/android/core/ao$a;->offset:I
 
@@ -347,7 +347,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lcom/crashlytics/android/core/ao$a;->rg:[B
+    iget-object v0, v0, Lcom/crashlytics/android/core/ao$a;->rf:[B
 
     return-object v0
 .end method
@@ -355,7 +355,7 @@
 .method public final dd()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tM:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tL: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;->tM:Lio/fabric/sdk/android/a/b/u;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ao;->tL:Lio/fabric/sdk/android/a/b/u;
 
     return-void
 .end method
@@ -373,7 +373,7 @@
 
     invoke-virtual {p0}, Lcom/crashlytics/android/core/ao;->dd()V
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tK:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ao;->tJ: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 02ce3c6847..2a02275ed9 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 tQ:I
+.field private final tP:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/crashlytics/android/core/ap;->tQ:I
+    iput p1, p0, Lcom/crashlytics/android/core/ap;->tP: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;->tQ:I
+    iget v0, p0, Lcom/crashlytics/android/core/ap;->tP: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 8cf5657897..06a7a38b4b 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 tR:I = 0x1
+.field public static final tQ:I = 0x1
 
-.field public static final tS:I = 0x2
+.field public static final tR:I = 0x2
 
-.field private static final synthetic tT:[I
+.field private static final synthetic tS:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/crashlytics/android/core/aq$a;->tR:I
+    sget v1, Lcom/crashlytics/android/core/aq$a;->tQ:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/crashlytics/android/core/aq$a;->tS:I
+    sget v1, Lcom/crashlytics/android/core/aq$a;->tR:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/crashlytics/android/core/aq$a;->tT:[I
+    sput-object v0, Lcom/crashlytics/android/core/aq$a;->tS:[I
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public static dn()[I
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/aq$a;->tT:[I
+    sget-object v0, Lcom/crashlytics/android/core/aq$a;->tS:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
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 c8ebe6a61b..445aca0366 100644
--- a/com.discord/smali/com/crashlytics/android/core/ar$e.smali
+++ b/com.discord/smali/com/crashlytics/android/core/ar$e.smali
@@ -15,24 +15,24 @@
 
 
 # instance fields
-.field private final sU:F
+.field private final sT:F
 
-.field private final tZ:Lcom/crashlytics/android/core/ar$d;
+.field private final tY:Lcom/crashlytics/android/core/ar$d;
 
-.field final synthetic ua:Lcom/crashlytics/android/core/ar;
+.field final synthetic tZ: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;->ua:Lcom/crashlytics/android/core/ar;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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;->sU:F
+    iput p2, p0, Lcom/crashlytics/android/core/ar$e;->sT:F
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ar$e;->tZ:Lcom/crashlytics/android/core/ar$d;
+    iput-object p3, p0, Lcom/crashlytics/android/core/ar$e;->tY:Lcom/crashlytics/android/core/ar$d;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     const-string v0, "CrashlyticsCore"
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sU:F
+    iget v3, p0, Lcom/crashlytics/android/core/ar$e;->sT: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;->sU:F
+    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sT: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;->sU:F
+    iget v1, p0, Lcom/crashlytics/android/core/ar$e;->sT: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;->ua:Lcom/crashlytics/android/core/ar;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->tZ:Lcom/crashlytics/android/core/ar;
 
     invoke-virtual {v1}, Lcom/crashlytics/android/core/ar;->do()Ljava/util/List;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->ua:Lcom/crashlytics/android/core/ar;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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;->tZ:Lcom/crashlytics/android/core/ar$d;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar$e;->tY:Lcom/crashlytics/android/core/ar$d;
 
     invoke-interface {v2}, Lcom/crashlytics/android/core/ar$d;->cL()Z
 
@@ -139,7 +139,7 @@
 
     if-nez v2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->ua:Lcom/crashlytics/android/core/ar;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -252,14 +252,14 @@
 
     check-cast v3, Lcom/crashlytics/android/core/aq;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/ar$e;->ua:Lcom/crashlytics/android/core/ar;
+    iget-object v4, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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;->ua:Lcom/crashlytics/android/core/ar;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar$e;->tZ:Lcom/crashlytics/android/core/ar;
 
     invoke-virtual {v1}, Lcom/crashlytics/android/core/ar;->do()Ljava/util/List;
 
@@ -293,7 +293,7 @@
 
     int-to-long v2, v2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->ua:Lcom/crashlytics/android/core/ar;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar$e;->tZ: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 53e00b675f..6e87c2f369 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 tU:Ljava/util/Map;
+.field static final tT:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,21 +27,21 @@
     .end annotation
 .end field
 
-.field private static final tV:[S
+.field private static final tU:[S
 
 
 # instance fields
-.field private final qw:Ljava/lang/String;
+.field private final qv:Ljava/lang/String;
 
-.field private final rQ:Lcom/crashlytics/android/core/ar$c;
+.field private final rP:Lcom/crashlytics/android/core/ar$c;
 
-.field private final rR:Lcom/crashlytics/android/core/ar$b;
+.field private final rQ:Lcom/crashlytics/android/core/ar$b;
 
-.field private final tW:Ljava/lang/Object;
+.field private final tV:Ljava/lang/Object;
 
-.field private final tX:Lcom/crashlytics/android/core/v;
+.field private final tW:Lcom/crashlytics/android/core/v;
 
-.field private tY:Ljava/lang/Thread;
+.field private tX:Ljava/lang/Thread;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/ar;->tU:Ljava/util/Map;
+    sput-object v0, Lcom/crashlytics/android/core/ar;->tT: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;->tV:[S
+    sput-object v0, Lcom/crashlytics/android/core/ar;->tU:[S
 
     return-void
 
@@ -90,17 +90,17 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tW:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tV:Ljava/lang/Object;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/ar;->tX:Lcom/crashlytics/android/core/v;
+    iput-object p2, p0, Lcom/crashlytics/android/core/ar;->tW:Lcom/crashlytics/android/core/v;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->qw:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->qv:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iput-object p3, p0, Lcom/crashlytics/android/core/ar;->rP:Lcom/crashlytics/android/core/ar$c;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/ar;->rR:Lcom/crashlytics/android/core/ar$b;
+    iput-object p4, p0, Lcom/crashlytics/android/core/ar;->rQ: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;->tY:Ljava/lang/Thread;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ar;->tX:Ljava/lang/Thread;
 
     return-object v0
 .end method
@@ -127,7 +127,7 @@
 .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;->rR:Lcom/crashlytics/android/core/ar$b;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$b;
 
     return-object p0
 .end method
@@ -135,7 +135,7 @@
 .method static synthetic dp()[S
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/ar;->tV:[S
+    sget-object v0, Lcom/crashlytics/android/core/ar;->tU:[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;->tY:Ljava/lang/Thread;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tX:Ljava/lang/Thread;
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->tY:Ljava/lang/Thread;
+    iput-object p1, p0, Lcom/crashlytics/android/core/ar;->tX:Ljava/lang/Thread;
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/ar;->tY:Ljava/lang/Thread;
+    iget-object p1, p0, Lcom/crashlytics/android/core/ar;->tX: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;->tW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tV: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;->qw:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->qv: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;->tX:Lcom/crashlytics/android/core/v;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->tW: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -323,7 +323,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->tW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/ar;->tV:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iget-object v1, p0, Lcom/crashlytics/android/core/ar;->rP:Lcom/crashlytics/android/core/ar$c;
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/ar$c;->cM()[Ljava/io/File;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iget-object v2, p0, Lcom/crashlytics/android/core/ar;->rP:Lcom/crashlytics/android/core/ar$c;
 
     invoke-interface {v2}, Lcom/crashlytics/android/core/ar$c;->cN()[Ljava/io/File;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ar;->rP:Lcom/crashlytics/android/core/ar$c;
 
     invoke-interface {v3}, Lcom/crashlytics/android/core/ar$c;->cO()[Ljava/io/File;
 
@@ -377,7 +377,7 @@
 
     aget-object v7, v1, v6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 1f0edf1c1b..5d2be64764 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 rU:Ljava/lang/String;
+.field private rT:Ljava/lang/String;
 
-.field private final ub:Lcom/crashlytics/android/core/ay;
+.field private final ua:Lcom/crashlytics/android/core/ay;
 
-.field private uc:Z
+.field private ub:Z
 
 
 # direct methods
@@ -24,11 +24,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->uc:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->ub:Z
 
     iput-object p1, p0, Lcom/crashlytics/android/core/as;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/as;->ub:Lcom/crashlytics/android/core/ay;
+    iput-object p2, p0, Lcom/crashlytics/android/core/as;->ua:Lcom/crashlytics/android/core/ay;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 .method public final dk()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/core/as;->uc:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/core/as;->ub:Z
 
     if-nez v0, :cond_0
 
@@ -48,21 +48,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/as;->rU:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/core/as;->rT:Ljava/lang/String;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->uc:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/as;->ub:Z
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/as;->rU:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/as;->rT:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/crashlytics/android/core/as;->ub:Lcom/crashlytics/android/core/ay;
+    iget-object v0, p0, Lcom/crashlytics/android/core/as;->ua:Lcom/crashlytics/android/core/ay;
 
     if-eqz v0, :cond_2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/at.smali b/com.discord/smali/com/crashlytics/android/core/at.smali
index 21dbe462a6..38fba148b8 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 ud:Lcom/crashlytics/android/core/d;
+.field private static final uc:Lcom/crashlytics/android/core/d;
 
-.field private static final ue:Lcom/crashlytics/android/core/d;
+.field private static final ud:Lcom/crashlytics/android/core/d;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/at;->ud:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/at;->uc:Lcom/crashlytics/android/core/d;
 
     const-string v0, "Unity"
 
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/at;->ue:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/at;->ud:Lcom/crashlytics/android/core/d;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     add-int/2addr v0, v2
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->ug:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->uf:Ljava/lang/String;
 
     if-eqz v3, :cond_0
 
@@ -85,7 +85,7 @@
     add-int/2addr v0, v3
 
     :cond_0
-    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->uh:[Ljava/lang/StackTraceElement;
+    iget-object v3, p0, Lcom/crashlytics/android/core/ax;->ug:[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;->ui:Lcom/crashlytics/android/core/ax;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->uh: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;->ui:Lcom/crashlytics/android/core/ax;
+    iget-object p0, p0, Lcom/crashlytics/android/core/ax;->uh:Lcom/crashlytics/android/core/ax;
 
     add-int/lit8 v2, v2, 0x1
 
@@ -1347,7 +1347,7 @@
 
     move-object/from16 v3, p10
 
-    iget-object v4, v3, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
+    iget-object v4, v3, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v4}, Lcom/crashlytics/android/core/aa;->db()Lcom/crashlytics/android/core/d;
 
@@ -1355,7 +1355,7 @@
 
     if-nez v9, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -1611,11 +1611,11 @@
 
     invoke-virtual {v0, v2}, Lcom/crashlytics/android/core/g;->p(I)V
 
-    sget-object v2, Lcom/crashlytics/android/core/at;->ud:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->uc: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;->ud:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->uc:Lcom/crashlytics/android/core/d;
 
     invoke-virtual {v0, v13, v2}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
@@ -1894,7 +1894,7 @@
 
     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;->ug:Ljava/lang/String;
+    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->uf:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -1907,7 +1907,7 @@
     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;->uh:[Ljava/lang/StackTraceElement;
+    iget-object v0, p1, Lcom/crashlytics/android/core/ax;->ug:[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;->ui:Lcom/crashlytics/android/core/ax;
+    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->uh: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;->ui:Lcom/crashlytics/android/core/ax;
+    iget-object p1, p1, Lcom/crashlytics/android/core/ax;->uh:Lcom/crashlytics/android/core/ax;
 
     add-int/lit8 v2, v2, 0x1
 
@@ -2175,7 +2175,7 @@
 
     if-eqz v7, :cond_1
 
-    sget-object v12, Lcom/crashlytics/android/core/at;->ue:Lcom/crashlytics/android/core/d;
+    sget-object v12, Lcom/crashlytics/android/core/at;->ud: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;->ue:Lcom/crashlytics/android/core/d;
+    sget-object v2, Lcom/crashlytics/android/core/at;->ud:Lcom/crashlytics/android/core/d;
 
     invoke-virtual {v0, v15, v2}, Lcom/crashlytics/android/core/g;->a(ILcom/crashlytics/android/core/d;)V
 
@@ -2357,7 +2357,7 @@
 .method private static dr()I
     .locals 4
 
-    sget-object v0, Lcom/crashlytics/android/core/at;->ud:Lcom/crashlytics/android/core/d;
+    sget-object v0, Lcom/crashlytics/android/core/at;->uc: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;->ud:Lcom/crashlytics/android/core/d;
+    sget-object v1, Lcom/crashlytics/android/core/at;->uc:Lcom/crashlytics/android/core/d;
 
     const/4 v2, 0x2
 
diff --git a/com.discord/smali/com/crashlytics/android/core/au.smali b/com.discord/smali/com/crashlytics/android/core/au.smali
index 882fa435fb..46200f50b8 100644
--- a/com.discord/smali/com/crashlytics/android/core/au.smali
+++ b/com.discord/smali/com/crashlytics/android/core/au.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final tr:[Ljava/io/File;
+.field private final tq:[Ljava/io/File;
 
-.field private final ts:Ljava/util/Map;
+.field private final tr:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,7 +20,7 @@
     .end annotation
 .end field
 
-.field private final uf:Ljava/io/File;
+.field private final ue:Ljava/io/File;
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/au;->uf:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     const/4 v0, 0x1
 
@@ -61,15 +61,15 @@
 
     aput-object p1, v0, v1
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/au;->tr:[Ljava/io/File;
+    iput-object v0, p0, Lcom/crashlytics/android/core/au;->tq:[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;->ts:Ljava/util/Map;
+    iput-object p1, p0, Lcom/crashlytics/android/core/au;->tr:Ljava/util/Map;
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/au;->uf:Ljava/io/File;
+    iget-object p1, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->length()J
 
@@ -81,9 +81,9 @@
 
     if-nez v2, :cond_0
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/au;->ts:Ljava/util/Map;
+    iget-object p1, p0, Lcom/crashlytics/android/core/au;->tr:Ljava/util/Map;
 
-    sget-object p2, Lcom/crashlytics/android/core/ar;->tU:Ljava/util/Map;
+    sget-object p2, Lcom/crashlytics/android/core/ar;->tT:Ljava/util/Map;
 
     invoke-interface {p1, p2}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
@@ -96,7 +96,7 @@
 .method public final df()Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     return-object v0
 .end method
@@ -104,7 +104,7 @@
 .method public final dg()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->tr:[Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->tq:[Ljava/io/File;
 
     return-object v0
 .end method
@@ -121,7 +121,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->ts:Ljava/util/Map;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->tr:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -133,7 +133,7 @@
 .method public final di()I
     .locals 1
 
-    sget v0, Lcom/crashlytics/android/core/aq$a;->tR:I
+    sget v0, Lcom/crashlytics/android/core/aq$a;->tQ:I
 
     return v0
 .end method
@@ -141,7 +141,7 @@
 .method public final getFileName()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -153,7 +153,7 @@
 .method public final getIdentifier()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/au;->uf:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -177,7 +177,7 @@
 .method public final remove()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -187,7 +187,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/au;->uf:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     invoke-virtual {v2}, Ljava/io/File;->getPath()Ljava/lang/String;
 
@@ -203,7 +203,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/core/au;->uf:Ljava/io/File;
+    iget-object v0, p0, Lcom/crashlytics/android/core/au;->ue:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
diff --git a/com.discord/smali/com/crashlytics/android/core/ax.smali b/com.discord/smali/com/crashlytics/android/core/ax.smali
index 3b566632d9..497b4a1aa4 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 ug:Ljava/lang/String;
+.field public final uf:Ljava/lang/String;
 
-.field public final uh:[Ljava/lang/StackTraceElement;
+.field public final ug:[Ljava/lang/StackTraceElement;
 
-.field public final ui:Lcom/crashlytics/android/core/ax;
+.field public final uh:Lcom/crashlytics/android/core/ax;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->ug:Ljava/lang/String;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->uf: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;->uh:[Ljava/lang/StackTraceElement;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->ug:[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;->ui:Lcom/crashlytics/android/core/ax;
+    iput-object v0, p0, Lcom/crashlytics/android/core/ax;->uh:Lcom/crashlytics/android/core/ax;
 
     return-void
 .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 575f8b4b56..40477985a3 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 uj:Lcom/crashlytics/android/core/az;
+.field public static final ui: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;->uj:Lcom/crashlytics/android/core/az;
+    sput-object v0, Lcom/crashlytics/android/core/az;->ui: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 4c28d5c2ad..7ef1a9efaa 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 uk:Ljava/io/FilenameFilter;
+.field private static final uj: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;->uk:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/ba;->uj:Ljava/io/FilenameFilter;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/crashlytics/android/core/ba;->uk:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/ba;->uj: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 83ce34a9bc..7aed8c59a4 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 ul:I = 0xb
+.field static final uk:I = 0xb
 
-.field static final um:I = 0xc
+.field static final ul:I = 0xc
 
-.field static final un:I = 0x10
+.field static final um:I = 0x10
 
-.field static final uo:I = 0x1a
+.field static final un:I = 0x1a
 
 
 # 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 c669092611..6b0c56bdc1 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 rf:Lcom/crashlytics/android/core/c$a;
+.field private final re:Lcom/crashlytics/android/core/c$a;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/c;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/c;->rf:Lcom/crashlytics/android/core/c$a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/c;->re:Lcom/crashlytics/android/core/c$a;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v2, p1, Lcom/crashlytics/android/core/am;->tI:Ljava/lang/String;
+    iget-object v2, p1, Lcom/crashlytics/android/core/am;->tH: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;->rf:Lcom/crashlytics/android/core/c$a;
+    iget-object v2, p0, Lcom/crashlytics/android/core/c;->re: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;->tH:J
+    iget-wide v5, p1, Lcom/crashlytics/android/core/am;->tG: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -396,7 +396,7 @@
     :catch_0
     move-exception p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     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 bf32b2658e..71a18ccc57 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 rh:Lcom/crashlytics/android/core/d;
+.field public static final rg:Lcom/crashlytics/android/core/d;
 
 
 # instance fields
-.field final rg:[B
+.field final rf:[B
 
-.field private volatile ri:I
+.field private volatile rh: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;->rh:Lcom/crashlytics/android/core/d;
+    sput-object v0, Lcom/crashlytics/android/core/d;->rg:Lcom/crashlytics/android/core/d;
 
     return-void
 .end method
@@ -37,9 +37,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/crashlytics/android/core/d;->ri:I
+    iput v0, p0, Lcom/crashlytics/android/core/d;->rh:I
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/d;->rg:[B
+    iput-object p1, p0, Lcom/crashlytics/android/core/d;->rf:[B
 
     return-void
 .end method
@@ -95,7 +95,7 @@
 .method public final a([BIII)V
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rg:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rf:[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;->rg:[B
+    iget-object v1, p0, Lcom/crashlytics/android/core/d;->rf:[B
 
     array-length v3, v1
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rg:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rf:[B
 
     array-length v4, p1
 
@@ -161,11 +161,11 @@
 .method public final hashCode()I
     .locals 5
 
-    iget v0, p0, Lcom/crashlytics/android/core/d;->ri:I
+    iget v0, p0, Lcom/crashlytics/android/core/d;->rh:I
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rg:[B
+    iget-object v0, p0, Lcom/crashlytics/android/core/d;->rf:[B
 
     array-length v1, v0
 
@@ -197,7 +197,7 @@
     move v0, v3
 
     :goto_1
-    iput v0, p0, Lcom/crashlytics/android/core/d;->ri:I
+    iput v0, p0, Lcom/crashlytics/android/core/d;->rh: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 76e5b6e9f2..ec2d7330d4 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 rj:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final ri:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static rk:Ljava/lang/String;
+.field private static rj: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;->rj:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/crashlytics/android/core/e;->ri: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;->rj:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v1, Lcom/crashlytics/android/core/e;->ri: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;->BY()Ljava/lang/String;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
 
     move-result-object p1
 
@@ -215,7 +215,7 @@
 
     move-result-object p1
 
-    sput-object p1, Lcom/crashlytics/android/core/e;->rk:Ljava/lang/String;
+    sput-object p1, Lcom/crashlytics/android/core/e;->rj: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;->rk:Ljava/lang/String;
+    sget-object v0, Lcom/crashlytics/android/core/e;->rj: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 39a7e1ef02..337b12d548 100644
--- a/com.discord/smali/com/crashlytics/android/core/f.smali
+++ b/com.discord/smali/com/crashlytics/android/core/f.smali
@@ -4,16 +4,16 @@
 
 
 # static fields
-.field public static final ro:Ljava/io/FilenameFilter;
+.field public static final rn:Ljava/io/FilenameFilter;
 
 
 # instance fields
-.field private final rl:Ljava/lang/String;
+.field private final rk:Ljava/lang/String;
+
+.field private rl:Ljava/io/File;
 
 .field private rm:Ljava/io/File;
 
-.field private rn:Ljava/io/File;
-
 .field private w:Z
 
 
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Lcom/crashlytics/android/core/f$1;-><init>()V
 
-    sput-object v0, Lcom/crashlytics/android/core/f;->ro:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/f;->rn:Ljava/io/FilenameFilter;
 
     return-void
 .end method
@@ -78,7 +78,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/f;->rl:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/f;->rk: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;->rl:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/f;->rk: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;->rm:Ljava/io/File;
+    iput-object p1, p0, Lcom/crashlytics/android/core/f;->rl:Ljava/io/File;
 
     return-void
 .end method
@@ -142,7 +142,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/f;->rl:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/core/f;->rk:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -156,7 +156,7 @@
 
     invoke-direct {v0, v1}, Ljava/io/File;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
+    iget-object v1, p0, Lcom/crashlytics/android/core/f;->rl:Ljava/io/File;
 
     invoke-virtual {v1, v0}, Ljava/io/File;->renameTo(Ljava/io/File;)Z
 
@@ -166,9 +166,9 @@
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
+    iput-object v1, p0, Lcom/crashlytics/android/core/f;->rl:Ljava/io/File;
 
-    iput-object v0, p0, Lcom/crashlytics/android/core/f;->rn:Ljava/io/File;
+    iput-object v0, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -186,7 +186,7 @@
 
     if-nez v2, :cond_2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
+    iget-object v2, p0, Lcom/crashlytics/android/core/f;->rl:Ljava/io/File;
 
     invoke-virtual {v2}, Ljava/io/File;->exists()Z
 
@@ -211,7 +211,7 @@
 
     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/f;->rm:Ljava/io/File;
+    iget-object v4, p0, Lcom/crashlytics/android/core/f;->rl: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 76c1d992c7..60abe8738c 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 rp:Ljava/io/OutputStream;
+.field final ro: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;->rp:Ljava/io/OutputStream;
+    iput-object p1, p0, Lcom/crashlytics/android/core/g;->ro: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;->rg:[B
+    iget-object v0, p1, Lcom/crashlytics/android/core/d;->rf:[B
 
     array-length v0, v0
 
@@ -208,7 +208,7 @@
 
     move-result v0
 
-    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rg:[B
+    iget-object p1, p1, Lcom/crashlytics/android/core/d;->rf:[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;->rg:[B
+    iget-object p1, p2, Lcom/crashlytics/android/core/d;->rf:[B
 
     array-length p1, p1
 
     invoke-virtual {p0, p1}, Lcom/crashlytics/android/core/g;->p(I)V
 
-    iget-object p1, p2, Lcom/crashlytics/android/core/d;->rg:[B
+    iget-object p1, p2, Lcom/crashlytics/android/core/d;->rf:[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;->rg:[B
+    iget-object p2, p2, Lcom/crashlytics/android/core/d;->rf:[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;->rp:Ljava/io/OutputStream;
+    iget-object p2, p0, Lcom/crashlytics/android/core/g;->ro: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;->rp:Ljava/io/OutputStream;
+    iget-object v0, p0, Lcom/crashlytics/android/core/g;->ro:Ljava/io/OutputStream;
 
     if-eqz v0, :cond_0
 
@@ -741,7 +741,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/g;->rp:Ljava/io/OutputStream;
+    iget-object v0, p0, Lcom/crashlytics/android/core/g;->ro: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 5c499103b4..99405167d2 100644
--- a/com.discord/smali/com/crashlytics/android/core/h$1.smali
+++ b/com.discord/smali/com/crashlytics/android/core/h$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic rs:[I
+.field static final synthetic rr:[I
 
 
 # direct methods
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/crashlytics/android/core/h$1;->rs:[I
+    sput-object v0, Lcom/crashlytics/android/core/h$1;->rr:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/crashlytics/android/core/h$1;->rs:[I
+    sget-object v1, Lcom/crashlytics/android/core/h$1;->rr:[I
 
-    sget v2, Lcom/crashlytics/android/core/aq$a;->tR:I
+    sget v2, Lcom/crashlytics/android/core/aq$a;->tQ:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/crashlytics/android/core/h$1;->rs:[I
+    sget-object v1, Lcom/crashlytics/android/core/h$1;->rr:[I
 
-    sget v2, Lcom/crashlytics/android/core/aq$a;->tS:I
+    sget v2, Lcom/crashlytics/android/core/aq$a;->tR: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 a1e554c1cd..c46b7e6ed2 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 rq:Lcom/crashlytics/android/core/x;
+.field private final rp:Lcom/crashlytics/android/core/x;
 
-.field private final rr:Lcom/crashlytics/android/core/ah;
+.field private final rq: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;->rq:Lcom/crashlytics/android/core/x;
+    iput-object p1, p0, Lcom/crashlytics/android/core/h;->rp:Lcom/crashlytics/android/core/x;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/h;->rr:Lcom/crashlytics/android/core/ah;
+    iput-object p2, p0, Lcom/crashlytics/android/core/h;->rq:Lcom/crashlytics/android/core/ah;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final a(Lcom/crashlytics/android/core/u;)Z
     .locals 3
 
-    sget-object v0, Lcom/crashlytics/android/core/h$1;->rs:[I
+    sget-object v0, Lcom/crashlytics/android/core/h$1;->rr:[I
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sK:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sJ:Lcom/crashlytics/android/core/aq;
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->di()I
 
@@ -55,14 +55,14 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/h;->rr:Lcom/crashlytics/android/core/ah;
+    iget-object v0, p0, Lcom/crashlytics/android/core/h;->rq: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;->rq:Lcom/crashlytics/android/core/x;
+    iget-object v0, p0, Lcom/crashlytics/android/core/h;->rp: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 64a84af8e7..1f72113382 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 rv:Lcom/crashlytics/android/core/i$b;
+.field final synthetic ru: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;->rv:Lcom/crashlytics/android/core/i$b;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$1;->ru:Lcom/crashlytics/android/core/i$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/content/DialogInterface;I)V
     .locals 1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$1;->rv:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$1;->ru:Lcom/crashlytics/android/core/i$b;
 
     const/4 v0, 0x1
 
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 a26ac1442f..4c1c5387ab 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 rv:Lcom/crashlytics/android/core/i$b;
+.field final synthetic ru: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;->rv:Lcom/crashlytics/android/core/i$b;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$2;->ru:Lcom/crashlytics/android/core/i$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/content/DialogInterface;I)V
     .locals 1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$2;->rv:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$2;->ru:Lcom/crashlytics/android/core/i$b;
 
     const/4 v0, 0x0
 
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 fd5b669b3f..5d236eb28c 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 rv:Lcom/crashlytics/android/core/i$b;
+.field final synthetic ru:Lcom/crashlytics/android/core/i$b;
 
-.field final synthetic rw:Lcom/crashlytics/android/core/i$a;
+.field final synthetic rv: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;->rw:Lcom/crashlytics/android/core/i$a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i$3;->rv:Lcom/crashlytics/android/core/i$a;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/i$3;->rv:Lcom/crashlytics/android/core/i$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/i$3;->ru:Lcom/crashlytics/android/core/i$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,11 +41,11 @@
 .method public final onClick(Landroid/content/DialogInterface;I)V
     .locals 1
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->rw:Lcom/crashlytics/android/core/i$a;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->rv:Lcom/crashlytics/android/core/i$a;
 
     invoke-interface {p2}, Lcom/crashlytics/android/core/i$a;->cy()V
 
-    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->rv:Lcom/crashlytics/android/core/i$b;
+    iget-object p2, p0, Lcom/crashlytics/android/core/i$3;->ru:Lcom/crashlytics/android/core/i$b;
 
     const/4 v0, 0x1
 
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 88b469c51e..2d603d73f3 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 rx:Z
+.field rw:Z
 
-.field final ry:Ljava/util/concurrent/CountDownLatch;
+.field final rx:Ljava/util/concurrent/CountDownLatch;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/crashlytics/android/core/i$b;->rx:Z
+    iput-boolean v0, p0, Lcom/crashlytics/android/core/i$b;->rw: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;->ry:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/crashlytics/android/core/i$b;->rx:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
@@ -54,9 +54,9 @@
 .method final k(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/crashlytics/android/core/i$b;->rx:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/core/i$b;->rw:Z
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/i$b;->ry:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/crashlytics/android/core/i$b;->rx: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 d9d9ab904f..05dd677dfa 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 rt:Lcom/crashlytics/android/core/i$b;
+.field final rs:Lcom/crashlytics/android/core/i$b;
 
-.field final ru:Landroid/app/AlertDialog$Builder;
+.field final rt: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;->rt:Lcom/crashlytics/android/core/i$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/i;->rs:Lcom/crashlytics/android/core/i$b;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/i;->ru:Landroid/app/AlertDialog$Builder;
+    iput-object p1, p0, Lcom/crashlytics/android/core/i;->rt: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 abe72e1f4e..08cc48f00a 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 rA:Lcom/crashlytics/android/core/j;
+.field final synthetic ry:Ljava/lang/Runnable;
 
-.field final synthetic rz:Ljava/lang/Runnable;
+.field final synthetic rz: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;->rA:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/j$1;->rz:Lcom/crashlytics/android/core/j;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/j$1;->rz:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/crashlytics/android/core/j$1;->ry: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;->rz:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/crashlytics/android/core/j$1;->ry: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 e89bc10450..c6fa7b0ed1 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 rA:Lcom/crashlytics/android/core/j;
+.field final synthetic rz: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;->rA:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/j$2;->rz: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 c256469569..1ff41e388e 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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 df43e5bc24..de53e7c8f3 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;->sh:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->sg: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;->si:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$10;->sh: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;->sj:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$10;->si: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 1ee39fd80e..0469b42d4a 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
+
+.field final synthetic sg:Ljava/lang/String;
 
 .field final synthetic sh:Ljava/lang/String;
 
-.field final synthetic si:Ljava/lang/String;
-
-.field final synthetic sj:J
+.field final synthetic si: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$10;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$10;->sh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$10;->sg:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$10;->si:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$10;->sh:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$10;->sj:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$10;->si: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 5a864bce99..f79f110388 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$11.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$11.smali
@@ -18,7 +18,9 @@
 
 
 # instance fields
-.field final synthetic sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
+
+.field final synthetic sj:Ljava/lang/String;
 
 .field final synthetic sk:Ljava/lang/String;
 
@@ -26,26 +28,24 @@
 
 .field final synthetic sm:Ljava/lang/String;
 
-.field final synthetic sn:Ljava/lang/String;
-
-.field final synthetic so:I
+.field final synthetic sn:I
 
 
 # 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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$11;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$11;->sj:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$11;->sn:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
 
-    iput p6, p0, Lcom/crashlytics/android/core/k$11;->so:I
+    iput p6, p0, Lcom/crashlytics/android/core/k$11;->sn: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;->sk:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$11;->sj:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sa: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;->qw:Ljava/lang/String;
+    iget-object v2, v0, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$11;->sk:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k$11;->sl:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k$11;->sn:Ljava/lang/String;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k$11;->sm:Ljava/lang/String;
 
-    iget v6, p0, Lcom/crashlytics/android/core/k$11;->so:I
+    iget v6, p0, Lcom/crashlytics/android/core/k$11;->sn:I
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$11;->sa: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 2589e2af3f..2f7a65386e 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;->sk:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sj: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sa: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;->qw:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/a;->qv: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;->sl:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sk: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;->sm:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sl: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;->sn:Ljava/lang/String;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sm: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;->so:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$13;->sn: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$13;->sa: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 3c75f4c2ed..785acddeea 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$13.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$13.smali
@@ -18,7 +18,9 @@
 
 
 # instance fields
-.field final synthetic sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
+
+.field final synthetic sj:Ljava/lang/String;
 
 .field final synthetic sk:Ljava/lang/String;
 
@@ -26,26 +28,24 @@
 
 .field final synthetic sm:Ljava/lang/String;
 
-.field final synthetic sn:Ljava/lang/String;
-
-.field final synthetic so:I
+.field final synthetic sn:I
 
 
 # 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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$13;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$13;->sk:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$13;->sj:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$13;->sl:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$13;->sk:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$13;->sm:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$13;->sl:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$13;->sn:Ljava/lang/String;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$13;->sm:Ljava/lang/String;
 
-    iput p6, p0, Lcom/crashlytics/android/core/k$13;->so:I
+    iput p6, p0, Lcom/crashlytics/android/core/k$13;->sn: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 af0551d4c3..8bd86bc402 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sp:Z
+.field final synthetic so:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$14;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$14;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$14;->sp:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$14;->so: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;->sp:Z
+    iget-boolean v2, p0, Lcom/crashlytics/android/core/k$14;->so: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 0f7de2fff9..f32b3a28c5 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;->sp:Z
+    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$15;->so: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 a1752408bc..b7a1686b1f 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sp:Z
+.field final synthetic so:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/crashlytics/android/core/k;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$15;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$15;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$15;->sp:Z
+    iput-boolean p2, p0, Lcom/crashlytics/android/core/k$15;->so: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 fc7d6efacc..bcdf98ca8f 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
+
+.field final synthetic sp:I
 
 .field final synthetic sq:I
 
-.field final synthetic sr:I
+.field final synthetic sr:J
 
 .field final synthetic ss:J
 
-.field final synthetic st:J
+.field final synthetic st:Z
 
-.field final synthetic su:Z
+.field final synthetic su:Ljava/util/Map;
 
-.field final synthetic sv:Ljava/util/Map;
-
-.field final synthetic sw:I
+.field final synthetic sv:I
 
 
 # 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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$16;->sa:Lcom/crashlytics/android/core/k;
 
-    iput p2, p0, Lcom/crashlytics/android/core/k$16;->sq:I
+    iput p2, p0, Lcom/crashlytics/android/core/k$16;->sp:I
 
-    iput p3, p0, Lcom/crashlytics/android/core/k$16;->sr:I
+    iput p3, p0, Lcom/crashlytics/android/core/k$16;->sq:I
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$16;->ss:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$16;->sr:J
 
-    iput-wide p6, p0, Lcom/crashlytics/android/core/k$16;->st:J
+    iput-wide p6, p0, Lcom/crashlytics/android/core/k$16;->ss:J
 
-    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$16;->su:Z
+    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$16;->st:Z
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k$16;->sv:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k$16;->su:Ljava/util/Map;
 
-    iput p10, p0, Lcom/crashlytics/android/core/k$16;->sw:I
+    iput p10, p0, Lcom/crashlytics/android/core/k$16;->sv:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -70,21 +70,21 @@
         }
     .end annotation
 
-    iget v1, p0, Lcom/crashlytics/android/core/k$16;->sq:I
+    iget v1, p0, Lcom/crashlytics/android/core/k$16;->sp:I
 
     sget-object v2, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
-    iget v3, p0, Lcom/crashlytics/android/core/k$16;->sr:I
+    iget v3, p0, Lcom/crashlytics/android/core/k$16;->sq:I
 
-    iget-wide v4, p0, Lcom/crashlytics/android/core/k$16;->ss:J
+    iget-wide v4, p0, Lcom/crashlytics/android/core/k$16;->sr:J
 
-    iget-wide v6, p0, Lcom/crashlytics/android/core/k$16;->st:J
+    iget-wide v6, p0, Lcom/crashlytics/android/core/k$16;->ss:J
 
-    iget-boolean v8, p0, Lcom/crashlytics/android/core/k$16;->su:Z
+    iget-boolean v8, p0, Lcom/crashlytics/android/core/k$16;->st:Z
 
-    iget-object v9, p0, Lcom/crashlytics/android/core/k$16;->sv:Ljava/util/Map;
+    iget-object v9, p0, Lcom/crashlytics/android/core/k$16;->su:Ljava/util/Map;
 
-    iget v10, p0, Lcom/crashlytics/android/core/k$16;->sw:I
+    iget v10, p0, Lcom/crashlytics/android/core/k$16;->sv: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 dcd424a16f..8deb9077bb 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;->sq:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->sp: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;->sr:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->sq: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;->ss:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->sr: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;->st:J
+    iget-wide v0, p1, Lcom/crashlytics/android/core/k$17;->ss: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;->su:Z
+    iget-boolean p1, p1, Lcom/crashlytics/android/core/k$17;->st: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;->sv:Ljava/util/Map;
+    iget-object p1, p1, Lcom/crashlytics/android/core/k$17;->su: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;->sw:I
+    iget p1, p1, Lcom/crashlytics/android/core/k$17;->sv: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 ca7d069754..593383b0f0 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
+
+.field final synthetic sp:I
 
 .field final synthetic sq:I
 
-.field final synthetic sr:I
+.field final synthetic sr:J
 
 .field final synthetic ss:J
 
-.field final synthetic st:J
+.field final synthetic st:Z
 
-.field final synthetic su:Z
+.field final synthetic su:Ljava/util/Map;
 
-.field final synthetic sv:Ljava/util/Map;
-
-.field final synthetic sw:I
+.field final synthetic sv:I
 
 
 # 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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$17;->sa:Lcom/crashlytics/android/core/k;
 
-    iput p2, p0, Lcom/crashlytics/android/core/k$17;->sq:I
+    iput p2, p0, Lcom/crashlytics/android/core/k$17;->sp:I
 
-    iput p3, p0, Lcom/crashlytics/android/core/k$17;->sr:I
+    iput p3, p0, Lcom/crashlytics/android/core/k$17;->sq:I
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$17;->ss:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$17;->sr:J
 
-    iput-wide p6, p0, Lcom/crashlytics/android/core/k$17;->st:J
+    iput-wide p6, p0, Lcom/crashlytics/android/core/k$17;->ss:J
 
-    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$17;->su:Z
+    iput-boolean p8, p0, Lcom/crashlytics/android/core/k$17;->st:Z
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k$17;->sv:Ljava/util/Map;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k$17;->su:Ljava/util/Map;
 
-    iput p10, p0, Lcom/crashlytics/android/core/k$17;->sw:I
+    iput p10, p0, Lcom/crashlytics/android/core/k$17;->sv: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 ec078f03b5..d0e7e7745f 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sx:Lcom/crashlytics/android/core/az;
+.field final synthetic sw:Lcom/crashlytics/android/core/az;
 
 
 # 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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$18;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$18;->sx:Lcom/crashlytics/android/core/az;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$18;->sw: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;->sx:Lcom/crashlytics/android/core/az;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$18;->sw: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;->sx:Lcom/crashlytics/android/core/az;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$18;->sw: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;->sx:Lcom/crashlytics/android/core/az;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$18;->sw: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 3f5c91816a..a75f2dcf81 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 rX:Ljava/lang/String;
+
 .field final synthetic rY:Ljava/lang/String;
 
 .field final synthetic rZ:Ljava/lang/String;
 
-.field final synthetic sa:Ljava/lang/String;
-
-.field final synthetic sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$2;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$2;->rX:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$2;->rZ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$2;->sa:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$2;->rZ: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$2;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$2;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v3}, Lcom/crashlytics/android/core/k;->getFilesDir()Ljava/io/File;
 
@@ -81,11 +81,11 @@
 
     new-instance v3, Lcom/crashlytics/android/core/az;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k$2;->rX:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/k$2;->rZ:Ljava/lang/String;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k$2;->rY:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k$2;->sa:Ljava/lang/String;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k$2;->rZ: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
 
@@ -108,7 +108,7 @@
 
     invoke-direct {v6, v1}, Ljava/io/FileOutputStream;-><init>(Ljava/io/File;)V
 
-    sget-object v1, Lcom/crashlytics/android/core/ae;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/crashlytics/android/core/ae;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v5, v6, v1}, Ljava/io/OutputStreamWriter;-><init>(Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V
 
@@ -144,7 +144,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 3da0449c24..4553c7c151 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$22;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$22;->sa: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 26be2cc960..96b0ec4a5f 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 sA:Lcom/crashlytics/android/core/t$b;
+.field final synthetic sA:Z
 
-.field final synthetic sB:Z
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sx:Ljava/util/Date;
 
-.field final synthetic sy:Ljava/util/Date;
+.field final synthetic sy:Ljava/lang/Throwable;
 
-.field final synthetic sz:Ljava/lang/Throwable;
+.field final synthetic sz:Lcom/crashlytics/android/core/t$b;
 
 .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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$23;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$23;->sy:Ljava/util/Date;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$23;->sx: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;->sz:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$23;->sy:Ljava/lang/Throwable;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k$23;->sA:Lcom/crashlytics/android/core/t$b;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k$23;->sz:Lcom/crashlytics/android/core/t$b;
 
-    iput-boolean p6, p0, Lcom/crashlytics/android/core/k$23;->sB:Z
+    iput-boolean p6, p0, Lcom/crashlytics/android/core/k$23;->sA: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sa: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;->sP:Lcom/crashlytics/android/core/m;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sO:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cV()Z
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sa:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$23;->sy:Ljava/util/Date;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$23;->sx: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;->sz:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sy: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;->sA:Lcom/crashlytics/android/core/t$b;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$23;->sz:Lcom/crashlytics/android/core/t$b;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/t$b;->cJ()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;->bfQ:Lio/fabric/sdk/android/a/g/p;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/g/t;->bga:Lio/fabric/sdk/android/a/g/p;
 
-    iget-object v3, v0, Lio/fabric/sdk/android/a/g/t;->bfR:Lio/fabric/sdk/android/a/g/m;
+    iget-object v3, v0, Lio/fabric/sdk/android/a/g/t;->bgb: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;->bft:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bfD: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;->sB:Z
+    iget-boolean v3, p0, Lcom/crashlytics/android/core/k$23;->sA:Z
 
     if-eqz v3, :cond_4
 
     :cond_3
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sa:Lcom/crashlytics/android/core/k;
 
-    iget-object v6, p0, Lcom/crashlytics/android/core/k$23;->sy:Ljava/util/Date;
+    iget-object v6, p0, Lcom/crashlytics/android/core/k$23;->sx: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$23;->sa:Lcom/crashlytics/android/core/k;
 
-    iget v2, v2, Lio/fabric/sdk/android/a/g/p;->bfG:I
+    iget v2, v2, Lio/fabric/sdk/android/a/g/p;->bfQ:I
 
     invoke-virtual {v3}, Lcom/crashlytics/android/core/k;->cE()Ljava/io/File;
 
     move-result-object v6
 
-    sget-object v7, Lcom/crashlytics/android/core/k;->rF:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->rE: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;->rF:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->rE: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;->rC:Ljava/io/FilenameFilter;
+    sget-object v6, Lcom/crashlytics/android/core/k;->rB:Ljava/io/FilenameFilter;
 
-    sget-object v7, Lcom/crashlytics/android/core/k;->rF:Ljava/util/Comparator;
+    sget-object v7, Lcom/crashlytics/android/core/k;->rE: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sa: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;->BX()Z
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
 
     move-result v2
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$23;->sa: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 21d41285bf..e87a10b992 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 sC:J
+.field final synthetic sB:J
 
-.field final synthetic sD:Ljava/lang/String;
+.field final synthetic sC:Ljava/lang/String;
 
-.field final synthetic sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$24;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-wide p2, p0, Lcom/crashlytics/android/core/k$24;->sC:J
+    iput-wide p2, p0, Lcom/crashlytics/android/core/k$24;->sB:J
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k$24;->sD:Ljava/lang/String;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$24;->sC: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cD()Z
 
@@ -67,17 +67,17 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$24;->sa: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;->sC:J
+    iget-wide v1, p0, Lcom/crashlytics/android/core/k$24;->sB:J
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$24;->sD:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$24;->sC:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/ac;->tw:Lcom/crashlytics/android/core/aa;
+    iget-object v0, v0, Lcom/crashlytics/android/core/ac;->tv: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 d362244c00..c5c896aaf8 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 sE:Ljava/util/Date;
+.field final synthetic sD:Ljava/util/Date;
 
-.field final synthetic sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sz:Ljava/lang/Throwable;
+.field final synthetic sy:Ljava/lang/Throwable;
 
 .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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$25;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$25;->sE:Ljava/util/Date;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$25;->sD: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;->sz:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k$25;->sy: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cD()Z
 
@@ -57,13 +57,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$25;->sa:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$25;->sE:Ljava/util/Date;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$25;->sD: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;->sz:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$25;->sy: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 5f0fa9202d..4f38b97222 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sd:Ljava/util/Map;
+.field final synthetic sc: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$3;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$3;->sd:Ljava/util/Map;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$3;->sc: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$3;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v3}, Lcom/crashlytics/android/core/k;->getFilesDir()Ljava/io/File;
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v2, v3}, Lcom/crashlytics/android/core/ae;-><init>(Ljava/io/File;)V
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->sd:Ljava/util/Map;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$3;->sc:Ljava/util/Map;
 
     invoke-virtual {v2, v1}, Lcom/crashlytics/android/core/ae;->V(Ljava/lang/String;)Ljava/io/File;
 
@@ -92,7 +92,7 @@
 
     invoke-direct {v6, v1}, Ljava/io/FileOutputStream;-><init>(Ljava/io/File;)V
 
-    sget-object v1, Lcom/crashlytics/android/core/ae;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/crashlytics/android/core/ae;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v5, v6, v1}, Ljava/io/OutputStreamWriter;-><init>(Ljava/io/OutputStream;Ljava/nio/charset/Charset;)V
 
@@ -128,7 +128,7 @@
 
     :goto_0
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 e1093f0d03..f1e892154f 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$4;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$4;->sa: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 309c728726..0ef726b89c 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic se:Lio/fabric/sdk/android/a/g/p;
+.field final synthetic sd: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$5;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$5;->se:Lio/fabric/sdk/android/a/g/p;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$5;->sd: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cD()Z
 
@@ -65,7 +65,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$5;->sa:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k$5;->se:Lio/fabric/sdk/android/a/g/p;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$5;->sd: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 2698c90aa0..b233545700 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$6;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$6;->sa: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 38622f3a65..2995fc2228 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sf:Ljava/util/Set;
+.field final synthetic se: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$7;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$7;->sf:Ljava/util/Set;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$7;->se: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;->sf:Ljava/util/Set;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k$7;->se: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 d66ee13b23..f9b32c14f8 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
 
-.field final synthetic sg:Lcom/crashlytics/android/core/p;
+.field final synthetic sf: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$8;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$8;->sg:Lcom/crashlytics/android/core/p;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$8;->sf: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;->sg:Lcom/crashlytics/android/core/p;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$8;->sf:Lcom/crashlytics/android/core/p;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/p;->ta:Ljava/util/TreeSet;
+    iget-object v0, v0, Lcom/crashlytics/android/core/p;->sZ:Ljava/util/TreeSet;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k$8;->sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$8;->sa: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 b304965904..dd3c517bf1 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa:Lcom/crashlytics/android/core/k;
+
+.field final synthetic sg:Ljava/lang/String;
 
 .field final synthetic sh:Ljava/lang/String;
 
-.field final synthetic si:Ljava/lang/String;
-
-.field final synthetic sj:J
+.field final synthetic si: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$9;->sa:Lcom/crashlytics/android/core/k;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$9;->sg:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$9;->si:Ljava/lang/String;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/crashlytics/android/core/k$9;->sj:J
+    iput-wide p4, p0, Lcom/crashlytics/android/core/k$9;->si: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;->sh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$9;->sg:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$9;->si:Ljava/lang/String;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$9;->sh:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/crashlytics/android/core/k$9;->sj:J
+    iget-wide v2, p0, Lcom/crashlytics/android/core/k$9;->si: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 7b9b51b1ed..bfffebefa7 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;->rC:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rB: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 3bace8ce1d..78e9926ab4 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 cJ()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CR()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/core/k$d.smali b/com.discord/smali/com/crashlytics/android/core/k$d.smali
index fa47080965..d45f00fc83 100644
--- a/com.discord/smali/com/crashlytics/android/core/k$d.smali
+++ b/com.discord/smali/com/crashlytics/android/core/k$d.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final sF:Ljava/lang/String;
+.field private final sE:Ljava/lang/String;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$d;->sF:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$d;->sE:Ljava/lang/String;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method public accept(Ljava/io/File;Ljava/lang/String;)Z
     .locals 0
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/k$d;->sF:Ljava/lang/String;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k$d;->sE:Ljava/lang/String;
 
     invoke-virtual {p2, p1}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
 
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 cf499f3b8c..bcbedf3b4b 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;->ro:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/f;->rn: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 d33826031b..6c3defcf7f 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 sG:Lio/fabric/sdk/android/a/f/a;
+.field private final sF: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;->sG:Lio/fabric/sdk/android/a/f/a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$g;->sF: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;->sG:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$g;->sF: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 65a25371c5..832b50c18a 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 sI:Lcom/crashlytics/android/core/k$h;
+.field final synthetic sH: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;->sI:Lcom/crashlytics/android/core/k$h;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$1;->sH:Lcom/crashlytics/android/core/k$h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +37,15 @@
 .method public final cy()V
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$1;->sI:Lcom/crashlytics/android/core/k$h;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$1;->sH:Lcom/crashlytics/android/core/k$h;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/k$h;->rM:Lcom/crashlytics/android/core/al;
+    iget-object v0, v0, Lcom/crashlytics/android/core/k$h;->rL:Lcom/crashlytics/android/core/al;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v0, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, v0, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v0
 
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 53687e065f..b3fb9670d5 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 sI:Lcom/crashlytics/android/core/k$h;
+.field final synthetic sH:Lcom/crashlytics/android/core/k$h;
 
-.field final synthetic sJ:Lcom/crashlytics/android/core/i;
+.field final synthetic sI: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;->sI:Lcom/crashlytics/android/core/k$h;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h$2;->sH:Lcom/crashlytics/android/core/k$h;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$h$2;->sJ:Lcom/crashlytics/android/core/i;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$h$2;->sI: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;->sJ:Lcom/crashlytics/android/core/i;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h$2;->sI:Lcom/crashlytics/android/core/i;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/i;->ru:Landroid/app/AlertDialog$Builder;
+    iget-object v0, v0, Lcom/crashlytics/android/core/i;->rt: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 7ceb30aec8..1e97c891ed 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 py:Lio/fabric/sdk/android/i;
+.field private final px:Lio/fabric/sdk/android/i;
 
-.field final rM:Lcom/crashlytics/android/core/al;
+.field final rL:Lcom/crashlytics/android/core/al;
 
-.field private final sH:Lio/fabric/sdk/android/a/g/o;
+.field private final sG:Lio/fabric/sdk/android/a/g/o;
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k$h;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$h;->px:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k$h;->rM:Lcom/crashlytics/android/core/al;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$h;->rL:Lcom/crashlytics/android/core/al;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$h;->sH:Lio/fabric/sdk/android/a/g/o;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$h;->sG:Lio/fabric/sdk/android/a/g/o;
 
     return-void
 .end method
@@ -45,15 +45,15 @@
 .method public final cL()Z
     .locals 14
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$h;->py:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$h;->px:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbr:Lio/fabric/sdk/android/c;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbA:Lio/fabric/sdk/android/c;
 
-    iget-object v1, v0, Lio/fabric/sdk/android/c;->bbc:Ljava/lang/ref/WeakReference;
+    iget-object v1, v0, Lio/fabric/sdk/android/c;->bbl:Ljava/lang/ref/WeakReference;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbc:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbl: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;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k$h;->sG: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;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->sG: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;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v9, v5, Lcom/crashlytics/android/core/z;->sG: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;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->sG:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfv:Ljava/lang/String;
+    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfF: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;->bfw:Z
+    iget-boolean v4, v2, Lio/fabric/sdk/android/a/g/o;->bfG: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;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v7, v5, Lcom/crashlytics/android/core/z;->sG:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfx:Ljava/lang/String;
+    iget-object v7, v7, Lio/fabric/sdk/android/a/g/o;->bfH: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;->bfy:Z
+    iget-boolean v2, v2, Lio/fabric/sdk/android/a/g/o;->bfI: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;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v1, v5, Lcom/crashlytics/android/core/z;->sG:Lio/fabric/sdk/android/a/g/o;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/o;->bfz:Ljava/lang/String;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/o;->bfJ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rt:Lcom/crashlytics/android/core/i$b;
+    iget-object v0, v1, Lcom/crashlytics/android/core/i;->rs:Lcom/crashlytics/android/core/i$b;
 
     :try_start_0
-    iget-object v0, v0, Lcom/crashlytics/android/core/i$b;->ry:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, v0, Lcom/crashlytics/android/core/i$b;->rx: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;->rt:Lcom/crashlytics/android/core/i$b;
+    iget-object v0, v1, Lcom/crashlytics/android/core/i;->rs:Lcom/crashlytics/android/core/i$b;
 
-    iget-boolean v0, v0, Lcom/crashlytics/android/core/i$b;->rx:Z
+    iget-boolean v0, v0, Lcom/crashlytics/android/core/i$b;->rw: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 f084e3fd56..858a7436b3 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$i;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final cM()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cA()[Ljava/io/File;
 
@@ -57,7 +57,7 @@
 .method public final cN()[Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cG()Ljava/io/File;
 
@@ -73,9 +73,9 @@
 .method public final cO()[Ljava/io/File;
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$i;->sa:Lcom/crashlytics/android/core/k;
 
-    sget-object v1, Lcom/crashlytics/android/core/k;->rD:Ljava/io/FileFilter;
+    sget-object v1, Lcom/crashlytics/android/core/k;->rC:Ljava/io/FileFilter;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->getFilesDir()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 0146426aa4..eeed2207f5 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 sc:Lcom/crashlytics/android/core/k;
+.field final synthetic sa: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;->sc:Lcom/crashlytics/android/core/k;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k$j;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 .method public final cD()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k$j;->sc:Lcom/crashlytics/android/core/k;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$j;->sa:Lcom/crashlytics/android/core/k;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/k;->cD()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 f85196ea09..a7a78fcefe 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 sK:Lcom/crashlytics/android/core/aq;
+.field private final sJ:Lcom/crashlytics/android/core/aq;
 
-.field private final sL:Lcom/crashlytics/android/core/ar;
+.field private final sK: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;->sK:Lcom/crashlytics/android/core/aq;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k$k;->sJ:Lcom/crashlytics/android/core/aq;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k$k;->sL:Lcom/crashlytics/android/core/ar;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k$k;->sK:Lcom/crashlytics/android/core/ar;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sL:Lcom/crashlytics/android/core/ar;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k$k;->sK:Lcom/crashlytics/android/core/ar;
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/k$k;->sK:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p0, Lcom/crashlytics/android/core/k$k;->sJ: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 9e7c2ec813..6667228360 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 rA:Ljava/io/FilenameFilter;
+
 .field static final rB:Ljava/io/FilenameFilter;
 
-.field static final rC:Ljava/io/FilenameFilter;
+.field static final rC:Ljava/io/FileFilter;
 
-.field static final rD:Ljava/io/FileFilter;
+.field static final rD:Ljava/util/Comparator;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Comparator<",
+            "Ljava/io/File;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 .field static final rE:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
@@ -39,19 +49,9 @@
     .end annotation
 .end field
 
-.field static final rF:Ljava/util/Comparator;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Comparator<",
-            "Ljava/io/File;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private static final rF:Ljava/util/regex/Pattern;
 
-.field private static final rG:Ljava/util/regex/Pattern;
-
-.field private static final rH:Ljava/util/Map;
+.field private static final rG:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -62,45 +62,45 @@
     .end annotation
 .end field
 
-.field private static final rI:[Ljava/lang/String;
+.field private static final rH:[Ljava/lang/String;
 
 
 # instance fields
-.field private final pK:Lio/fabric/sdk/android/a/f/a;
+.field private final pJ:Lio/fabric/sdk/android/a/f/a;
 
-.field private final pX:Lio/fabric/sdk/android/a/e/e;
+.field private final pW:Lio/fabric/sdk/android/a/e/e;
 
-.field private final rJ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final rI:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final rK:Lcom/crashlytics/android/core/l;
+.field final rJ:Lcom/crashlytics/android/core/l;
 
-.field public final rL:Lcom/crashlytics/android/core/j;
+.field public final rK:Lcom/crashlytics/android/core/j;
 
-.field final rM:Lcom/crashlytics/android/core/al;
+.field final rL:Lcom/crashlytics/android/core/al;
 
-.field final rN:Lcom/crashlytics/android/core/a;
+.field final rM:Lcom/crashlytics/android/core/a;
 
-.field private final rO:Lcom/crashlytics/android/core/k$g;
+.field private final rN:Lcom/crashlytics/android/core/k$g;
 
-.field private final rP:Lcom/crashlytics/android/core/ac;
+.field private final rO:Lcom/crashlytics/android/core/ac;
 
-.field final rQ:Lcom/crashlytics/android/core/ar$c;
+.field final rP:Lcom/crashlytics/android/core/ar$c;
 
-.field final rR:Lcom/crashlytics/android/core/ar$b;
+.field final rQ:Lcom/crashlytics/android/core/ar$b;
 
-.field final rS:Lcom/crashlytics/android/core/y;
+.field final rR:Lcom/crashlytics/android/core/y;
 
-.field private final rT:Lcom/crashlytics/android/core/aw;
+.field private final rS:Lcom/crashlytics/android/core/aw;
 
-.field private final rU:Ljava/lang/String;
+.field private final rT:Ljava/lang/String;
 
-.field final rV:Lcom/crashlytics/android/core/b;
+.field final rU:Lcom/crashlytics/android/core/b;
 
-.field private final rW:Lcom/crashlytics/android/answers/p;
+.field private final rV:Lcom/crashlytics/android/answers/p;
 
-.field rX:Lcom/crashlytics/android/core/t;
+.field rW:Lcom/crashlytics/android/core/t;
 
-.field private final rb:Lio/fabric/sdk/android/a/b/s;
+.field private final ra:Lio/fabric/sdk/android/a/b/s;
 
 
 # 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;->rB:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rA: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;->rC:Ljava/io/FilenameFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rB: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;->rD:Ljava/io/FileFilter;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rC: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;->rE:Ljava/util/Comparator;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rD: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;->rF:Ljava/util/Comparator;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rE: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;->rG:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rF: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;->rH:Ljava/util/Map;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rG:Ljava/util/Map;
 
     const/4 v0, 0x4
 
@@ -185,7 +185,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/crashlytics/android/core/k;->rI:[Ljava/lang/String;
+    sput-object v0, Lcom/crashlytics/android/core/k;->rH:[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;->rJ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/crashlytics/android/core/k;->rI:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/j;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
-    iput-object p3, p0, Lcom/crashlytics/android/core/k;->pX:Lio/fabric/sdk/android/a/e/e;
+    iput-object p3, p0, Lcom/crashlytics/android/core/k;->pW:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
+    iput-object p4, p0, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iput-object p5, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/al;
+    iput-object p5, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/al;
 
-    iput-object p6, p0, Lcom/crashlytics/android/core/k;->pK:Lio/fabric/sdk/android/a/f/a;
+    iput-object p6, p0, Lcom/crashlytics/android/core/k;->pJ:Lio/fabric/sdk/android/a/f/a;
 
-    iput-object p7, p0, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
+    iput-object p7, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
     invoke-interface {p8}, Lcom/crashlytics/android/core/ay;->dk()Ljava/lang/String;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rU:Ljava/lang/String;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rT:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/crashlytics/android/core/k;->rV:Lcom/crashlytics/android/core/b;
+    iput-object p9, p0, Lcom/crashlytics/android/core/k;->rU:Lcom/crashlytics/android/core/b;
 
-    iput-object p10, p0, Lcom/crashlytics/android/core/k;->rW:Lcom/crashlytics/android/answers/p;
+    iput-object p10, p0, Lcom/crashlytics/android/core/k;->rV: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;->rO:Lcom/crashlytics/android/core/k$g;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/k$g;
 
     new-instance p2, Lcom/crashlytics/android/core/ac;
 
-    iget-object p3, p0, Lcom/crashlytics/android/core/k;->rO:Lcom/crashlytics/android/core/k$g;
+    iget-object p3, p0, Lcom/crashlytics/android/core/k;->rN: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;->rP:Lcom/crashlytics/android/core/ac;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rO: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;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rP: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;->rR:Lcom/crashlytics/android/core/ar$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rQ: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;->rS:Lcom/crashlytics/android/core/y;
+    iput-object p2, p0, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/y;
 
     new-instance p1, Lcom/crashlytics/android/core/af;
 
@@ -277,7 +277,7 @@
 
     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;->rT:Lcom/crashlytics/android/core/aw;
+    iput-object p1, p0, Lcom/crashlytics/android/core/k;->rS:Lcom/crashlytics/android/core/aw;
 
     return-void
 .end method
@@ -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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rJ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -442,7 +442,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->rI:[Ljava/lang/String;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rH:[Ljava/lang/String;
 
     array-length v1, v0
 
@@ -487,7 +487,7 @@
 
     if-nez v6, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rT:Lcom/crashlytics/android/core/aw;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rS: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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rJ: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;->rS:Lcom/crashlytics/android/core/y;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/y;
 
-    iget-boolean v4, v4, Lcom/crashlytics/android/core/y;->tp:Z
+    iget-boolean v4, v4, Lcom/crashlytics/android/core/y;->to: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;->BU()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BX()J
 
     move-result-wide v6
 
@@ -639,15 +639,15 @@
 
     invoke-direct {v9}, Ljava/util/LinkedList;-><init>()V
 
-    iget-object v7, v5, Lcom/crashlytics/android/core/ax;->uh:[Ljava/lang/StackTraceElement;
+    iget-object v7, v5, Lcom/crashlytics/android/core/ax;->ug:[Ljava/lang/StackTraceElement;
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
-    iget-object v15, v4, Lcom/crashlytics/android/core/a;->qX:Ljava/lang/String;
+    iget-object v15, v4, Lcom/crashlytics/android/core/a;->qW:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v4, v0, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v14, v4, Lio/fabric/sdk/android/a/b/s;->bbm:Ljava/lang/String;
+    iget-object v14, v4, Lio/fabric/sdk/android/a/b/s;->bbv: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;->rT:Lcom/crashlytics/android/core/aw;
+    iget-object v6, v0, Lcom/crashlytics/android/core/k;->rS: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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v1, v0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v1, v1, Lcom/crashlytics/android/core/l;->sN:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, v1, Lcom/crashlytics/android/core/l;->sM: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;->rP:Lcom/crashlytics/android/core/ac;
+    iget-object v11, v0, Lcom/crashlytics/android/core/k;->rO: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;->bbP:Ljava/util/Comparator;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i;->bbY: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rW:Lcom/crashlytics/android/answers/p;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rV:Lcom/crashlytics/android/answers/p;
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rW:Lcom/crashlytics/android/answers/p;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rV:Lcom/crashlytics/android/answers/p;
 
     const-string p1, "clx"
 
@@ -922,7 +922,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1096,15 +1096,15 @@
 
     new-instance v7, Lcom/crashlytics/android/core/ac;
 
-    iget-object v8, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v8, p0, Lcom/crashlytics/android/core/k;->rJ: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;->rO:Lcom/crashlytics/android/core/k$g;
+    iget-object v9, p0, Lcom/crashlytics/android/core/k;->rN: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;->tw:Lcom/crashlytics/android/core/aa;
+    iget-object v8, v7, Lcom/crashlytics/android/core/ac;->tv:Lcom/crashlytics/android/core/aa;
 
     invoke-interface {v8}, Lcom/crashlytics/android/core/aa;->dc()[B
 
@@ -1130,7 +1130,7 @@
 
     new-instance v9, Ljava/io/File;
 
-    iget-object p0, p0, Lcom/crashlytics/android/core/k;->pK:Lio/fabric/sdk/android/a/f/a;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->pJ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p0
 
@@ -1239,7 +1239,7 @@
 
     :cond_7
     :goto_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v6
 
@@ -1512,7 +1512,7 @@
 
     move-result-object v8
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rp:Ljava/io/OutputStream;
+    iget-object p1, p1, Lcom/crashlytics/android/core/g;->ro: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -2060,7 +2060,7 @@
 
     move-result-object v6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -2366,7 +2366,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/crashlytics/android/core/k;->rG:Ljava/util/regex/Pattern;
+    sget-object v4, Lcom/crashlytics/android/core/k;->rF: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, v11, Lcom/crashlytics/android/core/k;->ra: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -2584,27 +2584,27 @@
 
     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;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v7, v0, Lio/fabric/sdk/android/a/b/s;->bbm:Ljava/lang/String;
+    iget-object v7, v0, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
-    iget-object v8, v0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
+    iget-object v8, v0, Lcom/crashlytics/android/core/a;->rb:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
-    iget-object v9, v0, Lcom/crashlytics/android/core/a;->rd:Ljava/lang/String;
+    iget-object v9, v0, Lcom/crashlytics/android/core/a;->rc:Ljava/lang/String;
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/s;->BY()Ljava/lang/String;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
 
     move-result-object v10
 
-    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/a;->re:Ljava/lang/String;
+    iget-object v0, v0, Lcom/crashlytics/android/core/a;->rd:Ljava/lang/String;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/b/m;->di(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
 
@@ -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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rJ: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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rJ: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;->BT()I
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BW()I
 
     move-result v13
 
@@ -2694,7 +2694,7 @@
 
     move-result v14
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BU()J
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i;->BX()J
 
     move-result-wide v15
 
@@ -2716,7 +2716,7 @@
 
     move-result v19
 
-    iget-object v1, v11, Lcom/crashlytics/android/core/k;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v11, Lcom/crashlytics/android/core/k;->ra:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->ct()Ljava/util/Map;
 
@@ -2768,7 +2768,7 @@
 
     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;->rP:Lcom/crashlytics/android/core/ac;
+    iget-object v0, v11, Lcom/crashlytics/android/core/k;->rO:Lcom/crashlytics/android/core/ac;
 
     invoke-virtual {v0, v12}, Lcom/crashlytics/android/core/ac;->R(Ljava/lang/String;)V
 
@@ -2780,7 +2780,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rJ: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;->bfP:Lio/fabric/sdk/android/a/g/e;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v1, v1, Lio/fabric/sdk/android/a/g/e;->bfd:Ljava/lang/String;
+    iget-object v1, v1, Lio/fabric/sdk/android/a/g/e;->bfn:Ljava/lang/String;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bfP:Lio/fabric/sdk/android/a/g/e;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/e;->bfe:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/e;->bfo:Ljava/lang/String;
 
     invoke-virtual {p0, v1, p1}, Lcom/crashlytics/android/core/k;->j(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;->rN:Lcom/crashlytics/android/core/a;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
+    iget-object v2, v2, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->rP:Lcom/crashlytics/android/core/ar$c;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/ar$b;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rQ: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;->rH:Ljava/util/Map;
+    sget-object v6, Lcom/crashlytics/android/core/k;->rG: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;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rK: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -2951,7 +2951,7 @@
 
     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;->rJ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v8, Lcom/crashlytics/android/core/k;->rI:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->getAndIncrement()I
 
@@ -3053,7 +3053,7 @@
 
     :goto_1
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -3082,7 +3082,7 @@
 
     move-object v1, v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rP:Lcom/crashlytics/android/core/ac;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rO:Lcom/crashlytics/android/core/ac;
 
     return-object p0
 .end method
@@ -3132,13 +3132,13 @@
 .method private cB()[Ljava/io/File;
     .locals 2
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->rB:Ljava/io/FilenameFilter;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rA: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;->rE:Ljava/util/Comparator;
+    sget-object v1, Lcom/crashlytics/android/core/k;->rD:Ljava/util/Comparator;
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
 
@@ -3168,7 +3168,7 @@
 .method static synthetic cI()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/crashlytics/android/core/k;->rG:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/crashlytics/android/core/k;->rF: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;->rF:Ljava/util/Comparator;
+    sget-object p1, Lcom/crashlytics/android/core/k;->rE: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;->rN:Lcom/crashlytics/android/core/a;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rM: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;->rU:Ljava/lang/String;
+    iget-object p0, p0, Lcom/crashlytics/android/core/k;->rT:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -3362,7 +3362,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p0, :cond_2
 
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq: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;->bcc:Ljava/lang/String;
+    iget-object v0, v1, Lio/fabric/sdk/android/a/b/j;->bcl: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->qy:Lcom/crashlytics/android/answers/e;
+    iget-object p0, p0, Lcom/crashlytics/android/answers/ac;->qx: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;->qN:Lcom/crashlytics/android/answers/ae$b;
+    sget-object v2, Lcom/crashlytics/android/answers/ae$b;->qM: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;->qD:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qC: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;->qF:Ljava/util/Map;
+    iput-object p1, v1, Lcom/crashlytics/android/answers/ae$a;->qE: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;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->rS:Lcom/crashlytics/android/core/y;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/y;
 
-    iget-object v1, v0, Lcom/crashlytics/android/core/y;->tm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lcom/crashlytics/android/core/y;->tl: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;->to:Landroid/content/BroadcastReceiver;
+    iget-object v2, v0, Lcom/crashlytics/android/core/y;->tn: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;->tn:Landroid/content/BroadcastReceiver;
+    iget-object v0, v0, Lcom/crashlytics/android/core/y;->tm: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;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rK: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;->rP:Lcom/crashlytics/android/core/ac;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rO: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3663,17 +3663,17 @@
 
     new-instance v3, Lcom/crashlytics/android/core/az;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v4, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v5, v4, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v5, v4, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v5, v5, Lio/fabric/sdk/android/a/b/s;->bcC:Z
+    iget-boolean v5, v5, Lio/fabric/sdk/android/a/b/s;->bcL:Z
 
     const/4 v6, 0x0
 
     if-eqz v5, :cond_2
 
-    iget-object v4, v4, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iget-object v4, v4, Lcom/crashlytics/android/core/l;->sR:Ljava/lang/String;
 
     goto :goto_1
 
@@ -3681,11 +3681,11 @@
     move-object v4, v6
 
     :goto_1
-    iget-object v5, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v5, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v7, v5, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v7, v5, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v7, v7, Lio/fabric/sdk/android/a/b/s;->bcC:Z
+    iget-boolean v7, v7, Lio/fabric/sdk/android/a/b/s;->bcL:Z
 
     if-eqz v7, :cond_3
 
@@ -3697,15 +3697,15 @@
     move-object v5, v6
 
     :goto_2
-    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v7, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v8, v7, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v8, v7, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-boolean v8, v8, Lio/fabric/sdk/android/a/b/s;->bcC:Z
+    iget-boolean v8, v8, Lio/fabric/sdk/android/a/b/s;->bcL:Z
 
     if-eqz v8, :cond_4
 
-    iget-object v6, v7, Lcom/crashlytics/android/core/l;->sT:Ljava/lang/String;
+    iget-object v6, v7, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
 
     :cond_4
     invoke-direct {v3, v4, v5, v6}, Lcom/crashlytics/android/core/az;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -3736,7 +3736,7 @@
 
     if-nez p1, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -3747,7 +3747,7 @@
     return-void
 
     :cond_6
-    iget p1, p1, Lio/fabric/sdk/android/a/g/p;->bfC:I
+    iget p1, p1, Lio/fabric/sdk/android/a/g/p;->bfM:I
 
     invoke-direct {p0, v0, p2, p1}, Lcom/crashlytics/android/core/k;->a([Ljava/io/File;II)V
 
@@ -3757,7 +3757,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;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v1, Lcom/crashlytics/android/core/k$2;
 
@@ -3778,17 +3778,17 @@
     return v0
 
     :cond_0
-    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bfR:Lio/fabric/sdk/android/a/g/m;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean p1, p1, Lio/fabric/sdk/android/a/g/m;->bfo:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/g/m;->bfz:Z
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/al;
+    iget-object p1, p0, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/al;
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3806,13 +3806,13 @@
 
     new-instance v1, Lio/fabric/sdk/android/a/f/d;
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tG:Lcom/crashlytics/android/core/l;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tF: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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object v5
 
@@ -3822,7 +3822,7 @@
 
     if-nez v5, :cond_1
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object v5
 
@@ -3842,7 +3842,7 @@
     :goto_0
     if-eqz v5, :cond_2
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -3850,11 +3850,11 @@
 
     move-result v1
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v6, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v6, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v6}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v6}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v6
 
@@ -3865,11 +3865,11 @@
     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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v5, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v5}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v5
 
@@ -3880,9 +3880,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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p1, Lcom/crashlytics/android/core/al;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object p1
 
@@ -3923,7 +3923,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->rC:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->rB:Ljava/io/FilenameFilter;
 
     invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
@@ -3935,7 +3935,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->rC:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->rB:Ljava/io/FilenameFilter;
 
     invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
@@ -3947,7 +3947,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/crashlytics/android/core/k;->rC:Ljava/io/FilenameFilter;
+    sget-object v2, Lcom/crashlytics/android/core/k;->rB:Ljava/io/FilenameFilter;
 
     invoke-static {v1, v2}, Lcom/crashlytics/android/core/k;->a(Ljava/io/File;Ljava/io/FilenameFilter;)[Ljava/io/File;
 
@@ -4048,11 +4048,11 @@
 .method final cD()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rX:Lcom/crashlytics/android/core/t;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rW:Lcom/crashlytics/android/core/t;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/t;->tf:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/crashlytics/android/core/t;->te:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -4121,7 +4121,7 @@
 .method final getFilesDir()Ljava/io/File;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->pK:Lio/fabric/sdk/android/a/f/a;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->pJ:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
@@ -4133,7 +4133,7 @@
 .method final j(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/core/v;
     .locals 4
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
     iget-object v0, v0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -4145,17 +4145,17 @@
 
     new-instance v1, Lcom/crashlytics/android/core/x;
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pX:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pW: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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pX:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lcom/crashlytics/android/core/k;->pW: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 213ef67858..76a45967c0 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 sY:Lcom/crashlytics/android/core/l;
+.field final synthetic sX: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;->sY:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$1;->sX:Lcom/crashlytics/android/core/l;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/c/g;-><init>()V
 
@@ -42,7 +42,7 @@
 .method public final cT()I
     .locals 1
 
-    sget v0, Lio/fabric/sdk/android/a/c/e;->bdC:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bdM:I
 
     return v0
 .end method
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l$1;->sY:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$1;->sX:Lcom/crashlytics/android/core/l;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/l;->cP()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 fa90939cf5..3bfcbacf11 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 sY:Lcom/crashlytics/android/core/l;
+.field final synthetic sX: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;->sY:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$2;->sX: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;->sY:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$2;->sX: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;->cV()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 63b50a5493..b44c3c238b 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 sY:Lcom/crashlytics/android/core/l;
+.field final synthetic sX: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;->sY:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$3;->sX: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;->sY:Lcom/crashlytics/android/core/l;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l$3;->sX: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 462092e6fa..34ca4ed6d0 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 sP:Lcom/crashlytics/android/core/m;
+.field private final sO: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;->sP:Lcom/crashlytics/android/core/m;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l$a;->sO: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;->sP:Lcom/crashlytics/android/core/m;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->sO:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cW()Ljava/io/File;
 
@@ -68,7 +68,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sP:Lcom/crashlytics/android/core/m;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l$a;->sO:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v0}, Lcom/crashlytics/android/core/m;->cW()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 b760a25980..70e766f34a 100644
--- a/com.discord/smali/com/crashlytics/android/core/l.smali
+++ b/com.discord/smali/com/crashlytics/android/core/l.smali
@@ -27,13 +27,13 @@
 
 
 # instance fields
-.field private pX:Lio/fabric/sdk/android/a/e/e;
+.field private pW:Lio/fabric/sdk/android/a/e/e;
 
-.field private rL:Lcom/crashlytics/android/core/j;
+.field private rK:Lcom/crashlytics/android/core/j;
 
-.field private final sM:J
+.field private final sL:J
 
-.field public final sN:Ljava/util/concurrent/ConcurrentHashMap;
+.field public final sM:Ljava/util/concurrent/ConcurrentHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentHashMap<",
@@ -44,25 +44,25 @@
     .end annotation
 .end field
 
-.field private sO:Lcom/crashlytics/android/core/m;
+.field private sN:Lcom/crashlytics/android/core/m;
 
-.field sP:Lcom/crashlytics/android/core/m;
+.field sO:Lcom/crashlytics/android/core/m;
 
-.field private sQ:Lcom/crashlytics/android/core/o;
+.field private sP:Lcom/crashlytics/android/core/o;
 
-.field public sR:Lcom/crashlytics/android/core/k;
+.field public sQ:Lcom/crashlytics/android/core/k;
+
+.field public sR:Ljava/lang/String;
 
 .field public sS:Ljava/lang/String;
 
-.field public sT:Ljava/lang/String;
+.field private sT:F
 
-.field private sU:F
+.field public sU:Z
 
-.field public sV:Z
+.field private final sV:Lcom/crashlytics/android/core/ak;
 
-.field private final sW:Lcom/crashlytics/android/core/ak;
-
-.field public sX:Lcom/crashlytics/android/core/q;
+.field public sW:Lcom/crashlytics/android/core/q;
 
 .field public userName:Ljava/lang/String;
 
@@ -115,15 +115,15 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sR:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sT:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sS: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;->sU:F
+    iput p2, p0, Lcom/crashlytics/android/core/l;->sT:F
 
     new-instance p2, Lcom/crashlytics/android/core/l$b;
 
@@ -131,29 +131,29 @@
 
     invoke-direct {p2, p3}, Lcom/crashlytics/android/core/l$b;-><init>(B)V
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/o;
+    iput-object p2, p0, Lcom/crashlytics/android/core/l;->sP:Lcom/crashlytics/android/core/o;
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sW:Lcom/crashlytics/android/core/ak;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sV:Lcom/crashlytics/android/core/ak;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/core/l;->sV:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/core/l;->sU: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;->rL:Lcom/crashlytics/android/core/j;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->rK: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;->sN:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object p1, p0, Lcom/crashlytics/android/core/l;->sM:Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/crashlytics/android/core/l;->sM:J
+    iput-wide p1, p0, Lcom/crashlytics/android/core/l;->sL:J
 
     return-void
 .end method
@@ -167,7 +167,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v0, v0, Lcom/crashlytics/android/core/l;->sQ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -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;->sO:Lcom/crashlytics/android/core/m;
+    iget-object p0, p0, Lcom/crashlytics/android/core/l;->sN:Lcom/crashlytics/android/core/m;
 
     return-object p0
 .end method
@@ -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;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbB:Lio/fabric/sdk/android/h;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Ch()Ljava/util/Collection;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/h;->Ck()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;->bbr:Lio/fabric/sdk/android/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbA: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -397,7 +397,7 @@
 .method private cS()V
     .locals 2
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/l;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v0, p0, Lcom/crashlytics/android/core/l;->rK: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;->BX()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
 
     move-result v1
 
@@ -429,7 +429,7 @@
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sV:Z
+    iput-boolean v13, v12, Lcom/crashlytics/android/core/l;->sU:Z
 
     :cond_0
-    iget-boolean v1, v12, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v1, v12, Lcom/crashlytics/android/core/l;->sU:Z
 
     const/4 v15, 0x0
 
@@ -476,7 +476,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -567,7 +567,7 @@
     const/4 v11, 0x0
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sP:Lcom/crashlytics/android/core/m;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sO: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;->sO:Lcom/crashlytics/android/core/m;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sN: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;->sW:Lcom/crashlytics/android/core/ak;
+    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sV: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;->sW:Lcom/crashlytics/android/core/ak;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->sV:Lcom/crashlytics/android/core/ak;
 
     invoke-direct {v1, v2}, Lcom/crashlytics/android/core/s;-><init>(Lcom/crashlytics/android/core/ak;)V
 
@@ -633,25 +633,25 @@
     :goto_2
     new-instance v2, Lio/fabric/sdk/android/a/e/b;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->pX:Lio/fabric/sdk/android/a/e/e;
+    iput-object v2, v12, Lcom/crashlytics/android/core/l;->pW:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v2, v12, Lcom/crashlytics/android/core/l;->pX:Lio/fabric/sdk/android/a/e/e;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->pW: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;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v12, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
     invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Ca()Ljava/lang/String;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Cd()Ljava/lang/String;
 
     move-result-object v5
 
@@ -713,9 +713,9 @@
 
     new-instance v5, Lcom/crashlytics/android/core/k;
 
-    iget-object v3, v12, Lcom/crashlytics/android/core/l;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v3, v12, Lcom/crashlytics/android/core/l;->rK:Lcom/crashlytics/android/core/j;
 
-    iget-object v4, v12, Lcom/crashlytics/android/core/l;->pX:Lio/fabric/sdk/android/a/e/e;
+    iget-object v4, v12, Lcom/crashlytics/android/core/l;->pW: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;->sR:Lcom/crashlytics/android/core/k;
+    iput-object v13, v12, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sO:Lcom/crashlytics/android/core/m;
+    iget-object v1, v12, Lcom/crashlytics/android/core/l;->sN:Lcom/crashlytics/android/core/m;
 
     invoke-virtual {v1}, Lcom/crashlytics/android/core/m;->cW()Ljava/io/File;
 
@@ -757,11 +757,11 @@
 
     move-result v1
 
-    iget-object v2, v12, Lcom/crashlytics/android/core/l;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v2, v12, Lcom/crashlytics/android/core/l;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v3, Lcom/crashlytics/android/core/l$a;
 
-    iget-object v4, v12, Lcom/crashlytics/android/core/l;->sP:Lcom/crashlytics/android/core/m;
+    iget-object v4, v12, Lcom/crashlytics/android/core/l;->sO: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;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v3, v12, Lcom/crashlytics/android/core/l;->sQ: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;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rK: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;->rX:Lcom/crashlytics/android/core/t;
+    iput-object v6, v3, Lcom/crashlytics/android/core/k;->rW:Lcom/crashlytics/android/core/t;
 
-    iget-object v2, v3, Lcom/crashlytics/android/core/k;->rX:Lcom/crashlytics/android/core/t;
+    iget-object v2, v3, Lcom/crashlytics/android/core/k;->rW: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -838,7 +838,7 @@
     return v15
 
     :cond_7
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sR:Lcom/crashlytics/android/core/k;
+    iput-object v1, v12, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
     return v15
 
@@ -888,7 +888,7 @@
 
     const-string v0, "CrashlyticsCore"
 
-    iget-object v1, p0, Lcom/crashlytics/android/core/l;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v2, Lcom/crashlytics/android/core/l$2;
 
@@ -896,9 +896,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;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v1, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, v1, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v2, v1, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v3, Lcom/crashlytics/android/core/k$6;
 
@@ -909,11 +909,11 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v2, v2, Lcom/crashlytics/android/core/k;->rS:Lcom/crashlytics/android/core/y;
+    iget-object v2, v2, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/y;
 
-    iget-object v3, v2, Lcom/crashlytics/android/core/y;->tm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v3, v2, Lcom/crashlytics/android/core/y;->tl:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v4, 0x1
 
@@ -925,7 +925,7 @@
 
     iget-object v3, v2, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    sget-object v5, Lcom/crashlytics/android/core/y;->tj:Landroid/content/IntentFilter;
+    sget-object v5, Lcom/crashlytics/android/core/y;->ti:Landroid/content/IntentFilter;
 
     invoke-virtual {v3, v1, v5}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
 
@@ -962,36 +962,36 @@
     const/4 v3, 0x1
 
     :goto_1
-    iput-boolean v3, v2, Lcom/crashlytics/android/core/y;->tp:Z
+    iput-boolean v3, v2, Lcom/crashlytics/android/core/y;->to:Z
 
     iget-object v3, v2, Lcom/crashlytics/android/core/y;->context:Landroid/content/Context;
 
-    iget-object v5, v2, Lcom/crashlytics/android/core/y;->to:Landroid/content/BroadcastReceiver;
+    iget-object v5, v2, Lcom/crashlytics/android/core/y;->tn:Landroid/content/BroadcastReceiver;
 
-    sget-object v6, Lcom/crashlytics/android/core/y;->tk:Landroid/content/IntentFilter;
+    sget-object v6, Lcom/crashlytics/android/core/y;->tj: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;->tn:Landroid/content/BroadcastReceiver;
+    iget-object v2, v2, Lcom/crashlytics/android/core/y;->tm:Landroid/content/BroadcastReceiver;
 
-    sget-object v5, Lcom/crashlytics/android/core/y;->tl:Landroid/content/IntentFilter;
+    sget-object v5, Lcom/crashlytics/android/core/y;->tk: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;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lio/fabric/sdk/android/a/g/q;->CR()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v2}, Lio/fabric/sdk/android/a/g/q;->CU()Lio/fabric/sdk/android/a/g/t;
 
     move-result-object v2
 
     if-nez v2, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1008,21 +1008,21 @@
 
     :cond_4
     :try_start_1
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bfR:Lio/fabric/sdk/android/a/g/m;
+    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v5, v5, Lio/fabric/sdk/android/a/g/m;->bft:Z
+    iget-boolean v5, v5, Lio/fabric/sdk/android/a/g/m;->bfD:Z
 
     if-eqz v5, :cond_5
 
-    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rV:Lcom/crashlytics/android/core/b;
+    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rU:Lcom/crashlytics/android/core/b;
 
     invoke-interface {v3}, Lcom/crashlytics/android/core/b;->cu()Z
 
     move-result v3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -1039,13 +1039,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;->bfR:Lio/fabric/sdk/android/a/g/m;
+    iget-object v3, v2, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
 
-    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bfq:Z
+    iget-boolean v3, v3, Lio/fabric/sdk/android/a/g/m;->bfB:Z
 
     if-nez v3, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1068,13 +1068,13 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/l;->BX()Z
+    invoke-virtual {v3}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
 
     move-result v3
 
     if-nez v3, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1091,11 +1091,11 @@
 
     :cond_7
     :try_start_3
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sX:Lcom/crashlytics/android/core/q;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sW:Lcom/crashlytics/android/core/q;
 
     if-eqz v3, :cond_8
 
-    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sX:Lcom/crashlytics/android/core/q;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sW:Lcom/crashlytics/android/core/q;
 
     invoke-interface {v3}, Lcom/crashlytics/android/core/q;->cX()Lcom/crashlytics/android/core/p;
 
@@ -1109,14 +1109,14 @@
     :goto_2
     if-eqz v3, :cond_a
 
-    iget-object v5, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v5, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
     if-nez v3, :cond_9
 
     goto :goto_3
 
     :cond_9
-    iget-object v4, v5, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v4, v5, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v6, Lcom/crashlytics/android/core/k$8;
 
@@ -1135,7 +1135,7 @@
     :goto_3
     if-nez v4, :cond_a
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1144,11 +1144,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;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget-object v4, v2, Lio/fabric/sdk/android/a/g/t;->bfQ:Lio/fabric/sdk/android/a/g/p;
+    iget-object v4, v2, Lio/fabric/sdk/android/a/g/t;->bga:Lio/fabric/sdk/android/a/g/p;
 
-    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/j;
+    iget-object v5, v3, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/j;
 
     new-instance v6, Lcom/crashlytics/android/core/k$5;
 
@@ -1166,7 +1166,7 @@
 
     if-nez v3, :cond_b
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1175,13 +1175,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;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v3, p0, Lcom/crashlytics/android/core/l;->sQ:Lcom/crashlytics/android/core/k;
 
-    iget v4, p0, Lcom/crashlytics/android/core/l;->sU:F
+    iget v4, p0, Lcom/crashlytics/android/core/l;->sT:F
 
     if-nez v2, :cond_c
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -1192,13 +1192,13 @@
     goto :goto_5
 
     :cond_c
-    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bfP:Lio/fabric/sdk/android/a/g/e;
+    iget-object v5, v2, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v5, v5, Lio/fabric/sdk/android/a/g/e;->bfd:Ljava/lang/String;
+    iget-object v5, v5, Lio/fabric/sdk/android/a/g/e;->bfn:Ljava/lang/String;
 
-    iget-object v6, v2, Lio/fabric/sdk/android/a/g/t;->bfP:Lio/fabric/sdk/android/a/g/e;
+    iget-object v6, v2, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
 
-    iget-object v6, v6, Lio/fabric/sdk/android/a/g/e;->bfe:Ljava/lang/String;
+    iget-object v6, v6, Lio/fabric/sdk/android/a/g/e;->bfo:Ljava/lang/String;
 
     invoke-virtual {v3, v5, v6}, Lcom/crashlytics/android/core/k;->j(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/core/v;
 
@@ -1212,11 +1212,11 @@
 
     new-instance v6, Lcom/crashlytics/android/core/k$h;
 
-    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rJ:Lcom/crashlytics/android/core/l;
 
-    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/al;
+    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rL:Lcom/crashlytics/android/core/al;
 
-    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->sH:Lio/fabric/sdk/android/a/g/o;
+    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->sG: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
 
@@ -1230,13 +1230,13 @@
     :goto_4
     new-instance v2, Lcom/crashlytics/android/core/ar;
 
-    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rN:Lcom/crashlytics/android/core/a;
+    iget-object v7, v3, Lcom/crashlytics/android/core/k;->rM:Lcom/crashlytics/android/core/a;
 
-    iget-object v7, v7, Lcom/crashlytics/android/core/a;->qw:Ljava/lang/String;
+    iget-object v7, v7, Lcom/crashlytics/android/core/a;->qv:Ljava/lang/String;
 
-    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rQ:Lcom/crashlytics/android/core/ar$c;
+    iget-object v8, v3, Lcom/crashlytics/android/core/k;->rP:Lcom/crashlytics/android/core/ar$c;
 
-    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rR:Lcom/crashlytics/android/core/ar$b;
+    iget-object v3, v3, Lcom/crashlytics/android/core/k;->rQ: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
 
@@ -1256,7 +1256,7 @@
     move-exception v2
 
     :try_start_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1318,7 +1318,7 @@
 .method public l(Ljava/lang/String;Ljava/lang/String;)V
     .locals 4
 
-    iget-boolean v0, p0, Lcom/crashlytics/android/core/l;->sV:Z
+    iget-boolean v0, p0, Lcom/crashlytics/android/core/l;->sU:Z
 
     if-eqz v0, :cond_0
 
@@ -1340,11 +1340,11 @@
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/crashlytics/android/core/l;->sM:J
+    iget-wide v2, p0, Lcom/crashlytics/android/core/l;->sL:J
 
     sub-long/2addr v0, v2
 
-    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sR:Lcom/crashlytics/android/core/k;
+    iget-object v2, p0, Lcom/crashlytics/android/core/l;->sQ: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 45e622a487..ee38017e07 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 pK:Lio/fabric/sdk/android/a/f/a;
+.field private final pJ:Lio/fabric/sdk/android/a/f/a;
 
-.field private final sZ:Ljava/lang/String;
+.field private final sY: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;->sZ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/m;->sY:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/m;->pK:Lio/fabric/sdk/android/a/f/a;
+    iput-object p2, p0, Lcom/crashlytics/android/core/m;->pJ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->sZ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/crashlytics/android/core/m;->sY: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;->pK:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/core/m;->pJ: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;->sZ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/crashlytics/android/core/m;->sY: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 9b29483187..aa42c052ad 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 ta:Ljava/util/TreeSet;
+.field public final sZ: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;->ta:Ljava/util/TreeSet;
+    iput-object p1, p0, Lcom/crashlytics/android/core/p;->sZ: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 ad5ab56d9c..3e602a52e9 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 sW:Lcom/crashlytics/android/core/ak;
+.field private final sV: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;->sW:Lcom/crashlytics/android/core/ak;
+    iput-object p1, p0, Lcom/crashlytics/android/core/s;->sV:Lcom/crashlytics/android/core/ak;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final cY()Ljava/io/InputStream;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sW:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sV:Lcom/crashlytics/android/core/ak;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ak;->cY()Ljava/io/InputStream;
 
@@ -38,7 +38,7 @@
 .method public final cZ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sW:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sV:Lcom/crashlytics/android/core/ak;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ak;->cZ()Ljava/lang/String;
 
@@ -50,7 +50,7 @@
 .method public final da()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sW:Lcom/crashlytics/android/core/ak;
+    iget-object v0, p0, Lcom/crashlytics/android/core/s;->sV:Lcom/crashlytics/android/core/ak;
 
     invoke-interface {v0}, Lcom/crashlytics/android/core/ak;->da()[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 ab408034b0..961648e360 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 tb:Lcom/crashlytics/android/core/t$a;
+.field private final ta:Lcom/crashlytics/android/core/t$a;
 
-.field private final tc:Lcom/crashlytics/android/core/t$b;
+.field private final tb:Lcom/crashlytics/android/core/t$b;
 
-.field private final td:Z
+.field private final tc:Z
 
-.field private final te:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final td:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field final tf:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final te: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;->tb:Lcom/crashlytics/android/core/t$a;
+    iput-object p1, p0, Lcom/crashlytics/android/core/t;->ta:Lcom/crashlytics/android/core/t$a;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/t;->tc:Lcom/crashlytics/android/core/t$b;
+    iput-object p2, p0, Lcom/crashlytics/android/core/t;->tb:Lcom/crashlytics/android/core/t$b;
 
-    iput-boolean p3, p0, Lcom/crashlytics/android/core/t;->td:Z
+    iput-boolean p3, p0, Lcom/crashlytics/android/core/t;->tc:Z
 
-    iput-object p4, p0, Lcom/crashlytics/android/core/t;->te:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p4, p0, Lcom/crashlytics/android/core/t;->td: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;->tf:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/crashlytics/android/core/t;->te: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;->tf:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v2, p0, Lcom/crashlytics/android/core/t;->te: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;->tb:Lcom/crashlytics/android/core/t$a;
+    iget-object v3, p0, Lcom/crashlytics/android/core/t;->ta:Lcom/crashlytics/android/core/t$a;
 
-    iget-object v4, p0, Lcom/crashlytics/android/core/t;->tc:Lcom/crashlytics/android/core/t$b;
+    iget-object v4, p0, Lcom/crashlytics/android/core/t;->tb:Lcom/crashlytics/android/core/t$b;
 
-    iget-boolean v5, p0, Lcom/crashlytics/android/core/t;->td:Z
+    iget-boolean v5, p0, Lcom/crashlytics/android/core/t;->tc: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->te:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v0, p0, Lcom/crashlytics/android/core/t;->td: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;->tf:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/crashlytics/android/core/t;->te: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->te:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v0, p0, Lcom/crashlytics/android/core/t;->td: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;->tf:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/crashlytics/android/core/t;->te: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 45d9937c6e..72d45854bf 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 qw:Ljava/lang/String;
+.field public final qv:Ljava/lang/String;
 
-.field public final sK:Lcom/crashlytics/android/core/aq;
+.field public final sJ: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;->qw:Ljava/lang/String;
+    iput-object p1, p0, Lcom/crashlytics/android/core/u;->qv:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/u;->sK:Lcom/crashlytics/android/core/aq;
+    iput-object p2, p0, Lcom/crashlytics/android/core/u;->sJ: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 e78987fb1f..cffd41a2aa 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 ti:Lcom/crashlytics/android/core/w;
+.field final synthetic th: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;->ti:Lcom/crashlytics/android/core/w;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w$1;->th: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;->ti:Lcom/crashlytics/android/core/w;
+    iget-object p1, p0, Lcom/crashlytics/android/core/w$1;->th: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 867eaa06af..03b29f9494 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 tg:Ljava/util/List;
+.field private static final tf:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -19,9 +19,9 @@
 
 
 # instance fields
-.field private final rK:Lcom/crashlytics/android/core/l;
+.field private final rJ:Lcom/crashlytics/android/core/l;
 
-.field private th:Ljava/lang/Object;
+.field private tg:Ljava/lang/Object;
 
 
 # direct methods
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/crashlytics/android/core/w;->tg:Ljava/util/List;
+    sput-object v0, Lcom/crashlytics/android/core/w;->tf:Ljava/util/List;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/core/w;->rK:Lcom/crashlytics/android/core/l;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w;->rJ:Lcom/crashlytics/android/core/l;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rJ: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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object p0, p0, Lcom/crashlytics/android/core/w;->rJ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->tg:Ljava/util/List;
+    sget-object v1, Lcom/crashlytics/android/core/w;->tf: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;->tg:Ljava/util/List;
+    sget-object v0, Lcom/crashlytics/android/core/w;->tf: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;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v2, p0, Lcom/crashlytics/android/core/w;->rJ: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;->th:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->tg:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rK:Lcom/crashlytics/android/core/l;
+    iget-object v0, p0, Lcom/crashlytics/android/core/w;->rJ: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;->th:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/crashlytics/android/core/w;->tg:Ljava/lang/Object;
 
     :cond_0
-    iget-object p1, p0, Lcom/crashlytics/android/core/w;->th:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/crashlytics/android/core/w;->tg:Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -411,7 +411,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -447,7 +447,7 @@
 
     if-nez v4, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 1a13073cab..0efb46266c 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;->beg:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->beq: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;->BN()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->BQ()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qw:Ljava/lang/String;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->qv: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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lcom/crashlytics/android/core/x;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->cc()Ljava/lang/String;
 
@@ -64,7 +64,7 @@
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sK:Lcom/crashlytics/android/core/aq;
+    iget-object v1, p1, Lcom/crashlytics/android/core/u;->sJ:Lcom/crashlytics/android/core/aq;
 
     invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->dh()Ljava/util/Map;
 
@@ -110,7 +110,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sK:Lcom/crashlytics/android/core/aq;
+    iget-object p1, p1, Lcom/crashlytics/android/core/u;->sJ:Lcom/crashlytics/android/core/aq;
 
     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String;
 
@@ -140,7 +140,7 @@
 
     if-ne v1, v5, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -202,7 +202,7 @@
 
     aget-object v10, v1, v8
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v11
 
@@ -262,7 +262,7 @@
 
     :cond_2
     :goto_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -284,11 +284,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;->CD()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CG()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -312,7 +312,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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
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 a7c7b4d225..63ba781d6e 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 tq:Lcom/crashlytics/android/core/y;
+.field final synthetic tp: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;->tq:Lcom/crashlytics/android/core/y;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y$1;->tp: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;->tq:Lcom/crashlytics/android/core/y;
+    iget-object p1, p0, Lcom/crashlytics/android/core/y$1;->tp: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 f53b375f71..b84d238922 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 tq:Lcom/crashlytics/android/core/y;
+.field final synthetic tp: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;->tq:Lcom/crashlytics/android/core/y;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y$2;->tp: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;->tq:Lcom/crashlytics/android/core/y;
+    iget-object p1, p0, Lcom/crashlytics/android/core/y$2;->tp: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 7f3313ad3b..8ab760b555 100644
--- a/com.discord/smali/com/crashlytics/android/core/y.smali
+++ b/com.discord/smali/com/crashlytics/android/core/y.smali
@@ -4,23 +4,23 @@
 
 
 # static fields
+.field static final ti:Landroid/content/IntentFilter;
+
 .field static final tj:Landroid/content/IntentFilter;
 
 .field static final tk:Landroid/content/IntentFilter;
 
-.field static final tl:Landroid/content/IntentFilter;
-
 
 # instance fields
 .field final context:Landroid/content/Context;
 
-.field final tm:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final tl:Ljava/util/concurrent/atomic/AtomicBoolean;
+
+.field final tm:Landroid/content/BroadcastReceiver;
 
 .field final tn:Landroid/content/BroadcastReceiver;
 
-.field final to:Landroid/content/BroadcastReceiver;
-
-.field tp:Z
+.field to: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;->tj:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->ti: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;->tk:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->tj: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;->tl:Landroid/content/IntentFilter;
+    sput-object v0, Lcom/crashlytics/android/core/y;->tk: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;->to:Landroid/content/BroadcastReceiver;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->tn: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;->tn:Landroid/content/BroadcastReceiver;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->tm: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;->tm:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/crashlytics/android/core/y;->tl: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;->tp:Z
+    iput-boolean p1, p0, Lcom/crashlytics/android/core/y;->to: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 7eb41e00ec..78d620b51c 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 sH:Lio/fabric/sdk/android/a/g/o;
+.field final sG:Lio/fabric/sdk/android/a/g/o;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/core/z;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/core/z;->sH:Lio/fabric/sdk/android/a/g/o;
+    iput-object p2, p0, Lcom/crashlytics/android/core/z;->sG:Lio/fabric/sdk/android/a/g/o;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/crashlytics/android/ndk/a.smali b/com.discord/smali/com/crashlytics/android/ndk/a.smali
index 2056a7909e..818b39f7ad 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 uq:Lcom/crashlytics/android/ndk/d;
+.field private final uo:Lcom/crashlytics/android/ndk/d;
 
-.field private final ur:Lcom/crashlytics/android/ndk/b;
+.field private final uq:Lcom/crashlytics/android/ndk/b;
 
 
 # direct methods
@@ -22,9 +22,9 @@
 
     iput-object p1, p0, Lcom/crashlytics/android/ndk/a;->context:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/d;
+    iput-object p2, p0, Lcom/crashlytics/android/ndk/a;->uo:Lcom/crashlytics/android/ndk/d;
 
-    iput-object p3, p0, Lcom/crashlytics/android/ndk/a;->ur:Lcom/crashlytics/android/ndk/b;
+    iput-object p3, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/b;
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public final ds()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->ur:Lcom/crashlytics/android/ndk/b;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/b;
 
     invoke-interface {v0}, Lcom/crashlytics/android/ndk/b;->du()Ljava/io/File;
 
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/d;
+    iget-object v2, p0, Lcom/crashlytics/android/ndk/a;->uo: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->ur:Lcom/crashlytics/android/ndk/b;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/a;->uq:Lcom/crashlytics/android/ndk/b;
 
     invoke-interface {v0}, Lcom/crashlytics/android/ndk/b;->dv()Ljava/util/TreeSet;
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/c.smali b/com.discord/smali/com/crashlytics/android/ndk/c.smali
index 161a3c6cc2..a05025ee38 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 us:Lcom/crashlytics/android/ndk/f;
+.field private ur:Lcom/crashlytics/android/ndk/f;
 
-.field private ut:Lcom/crashlytics/android/core/p;
+.field private us: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;->us:Lcom/crashlytics/android/ndk/f;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->ur:Lcom/crashlytics/android/ndk/f;
 
     invoke-interface {v0}, Lcom/crashlytics/android/ndk/f;->dt()Lcom/crashlytics/android/core/p;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/crashlytics/android/ndk/c;->ut:Lcom/crashlytics/android/core/p;
+    iput-object v0, p0, Lcom/crashlytics/android/ndk/c;->us: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -72,7 +72,7 @@
 .method public final cX()Lcom/crashlytics/android/core/p;
     .locals 1
 
-    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->ut:Lcom/crashlytics/android/core/p;
+    iget-object v0, p0, Lcom/crashlytics/android/ndk/c;->us:Lcom/crashlytics/android/core/p;
 
     return-object v0
 .end method
@@ -130,7 +130,7 @@
 
     invoke-direct {v2}, Lcom/crashlytics/android/core/n;-><init>()V
 
-    iput-object v1, p0, Lcom/crashlytics/android/ndk/c;->us:Lcom/crashlytics/android/ndk/f;
+    iput-object v1, p0, Lcom/crashlytics/android/ndk/c;->ur:Lcom/crashlytics/android/ndk/f;
 
     invoke-interface {v1}, Lcom/crashlytics/android/ndk/f;->ds()Z
 
@@ -138,9 +138,9 @@
 
     if-eqz v1, :cond_0
 
-    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sX:Lcom/crashlytics/android/core/q;
+    iput-object p0, v0, Lcom/crashlytics/android/core/l;->sW:Lcom/crashlytics/android/core/q;
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/crashlytics/android/ndk/e.smali b/com.discord/smali/com/crashlytics/android/ndk/e.smali
index 1486a0f48b..70b999277d 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 uu:Ljava/io/FileFilter;
+.field private static final ut:Ljava/io/FileFilter;
 
 
 # instance fields
-.field private final pK:Lio/fabric/sdk/android/a/f/a;
+.field private final pJ: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;->uu:Ljava/io/FileFilter;
+    sput-object v0, Lcom/crashlytics/android/ndk/e;->ut:Ljava/io/FileFilter;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/crashlytics/android/ndk/e;->pK:Lio/fabric/sdk/android/a/f/a;
+    iput-object p1, p0, Lcom/crashlytics/android/ndk/e;->pJ:Lio/fabric/sdk/android/a/f/a;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/crashlytics/android/ndk/e;->pK:Lio/fabric/sdk/android/a/f/a;
+    iget-object v1, p0, Lcom/crashlytics/android/ndk/e;->pJ:Lio/fabric/sdk/android/a/f/a;
 
     invoke-interface {v1}, Lio/fabric/sdk/android/a/f/a;->getFilesDir()Ljava/io/File;
 
@@ -137,7 +137,7 @@
     return-object v0
 
     :cond_0
-    sget-object v1, Lcom/crashlytics/android/ndk/e;->uu:Ljava/io/FileFilter;
+    sget-object v1, Lcom/crashlytics/android/ndk/e;->ut:Ljava/io/FileFilter;
 
     invoke-virtual {v0, v1}, Ljava/io/File;->listFiles(Ljava/io/FileFilter;)[Ljava/io/File;
 
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index ebc3cde962..19ebd2f24b 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/973"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/974"
 
-.field public static final VERSION_CODE:I = 0x3cd
+.field public static final VERSION_CODE:I = 0x3ce
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "9.7.3"
+.field public static final VERSION_NAME:Ljava/lang/String; = "9.7.4"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/R$a.smali b/com.discord/smali/com/discord/R$a.smali
index d5f4654821..c8efbadbdb 100644
--- a/com.discord/smali/com/discord/R$a.smali
+++ b/com.discord/smali/com/discord/R$a.smali
@@ -1457,11 +1457,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
 
@@ -2742,7 +2744,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
 
@@ -2782,7 +2784,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f04027c
+    const v6, 0x7f04027d
 
     aput v6, v5, v3
 
@@ -2830,7 +2832,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -2980,7 +2982,7 @@
 
     new-array v0, v1, [I
 
-    const v2, 0x7f0403e7
+    const v2, 0x7f0403e8
 
     aput v2, v0, v3
 
@@ -2988,7 +2990,7 @@
 
     new-array v0, v1, [I
 
-    const v2, 0x7f0403e9
+    const v2, 0x7f0403ea
 
     aput v2, v0, v3
 
@@ -3022,7 +3024,7 @@
 
     new-array v0, v1, [I
 
-    const v1, 0x7f0403ef
+    const v1, 0x7f0403f0
 
     aput v1, v0, v3
 
@@ -3070,15 +3072,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -3087,8 +3089,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -3102,11 +3104,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -3140,15 +3142,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040258
+        0x7f040259
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
+        0x7f040319
     .end array-data
 
     :array_9
@@ -3160,17 +3162,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_c
@@ -3195,8 +3197,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_e
@@ -3272,47 +3274,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -3322,14 +3323,15 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_f
     .array-data 4
         0x101014f
-        0x7f0403d3
         0x7f0403d4
         0x7f0403d5
+        0x7f0403d6
     .end array-data
 
     :array_10
@@ -3353,7 +3355,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_12
@@ -3367,8 +3369,8 @@
     :array_13
     .array-data 4
         0x7f040072
-        0x7f040347
-        0x7f040363
+        0x7f040348
+        0x7f040364
     .end array-data
 
     :array_14
@@ -3459,10 +3461,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d7
-        0x7f040305
-        0x7f040360
-        0x7f040362
+        0x7f0402d8
+        0x7f040306
+        0x7f040361
+        0x7f040363
     .end array-data
 
     :array_19
@@ -3471,8 +3473,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
-        0x7f040309
         0x7f04030a
+        0x7f04030b
     .end array-data
 
     :array_1a
@@ -3512,12 +3514,12 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f5
-        0x7f0402f7
-        0x7f04031a
-        0x7f0403be
+        0x7f0402f6
+        0x7f0402f8
+        0x7f04031b
         0x7f0403bf
-        0x7f0403c9
+        0x7f0403c0
+        0x7f0403ca
     .end array-data
 
     :array_1c
@@ -3697,7 +3699,7 @@
     :array_22
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_23
@@ -3725,15 +3727,15 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_26
     .array-data 4
         0x7f040163
         0x7f040165
-        0x7f04029f
+        0x7f0402a0
     .end array-data
 
     :array_27
@@ -3746,9 +3748,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
-        0x7f040301
         0x7f040302
         0x7f040303
+        0x7f040304
     .end array-data
 
     :array_28
@@ -3775,11 +3777,11 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027b
-        0x7f04029e
-        0x7f0402d7
-        0x7f040305
-        0x7f0403e6
+        0x7f04027c
+        0x7f04029f
+        0x7f0402d8
+        0x7f040306
+        0x7f0403e7
     .end array-data
 
     :array_2a
@@ -3787,7 +3789,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025a
+        0x7f04025b
     .end array-data
 
     :array_2b
@@ -3811,7 +3813,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_2d
@@ -3828,16 +3830,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3851,7 +3852,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_2f
@@ -3885,8 +3887,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_32
@@ -3908,6 +3910,7 @@
         0x7f040255
         0x7f040256
         0x7f040257
+        0x7f040258
     .end array-data
 
     :array_35
@@ -3919,7 +3922,6 @@
 
     :array_36
     .array-data 4
-        0x7f040268
         0x7f040269
         0x7f04026a
         0x7f04026b
@@ -3933,6 +3935,7 @@
         0x7f040273
         0x7f040274
         0x7f040275
+        0x7f040276
     .end array-data
 
     :array_37
@@ -3950,15 +3953,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d7
-        0x7f04031e
+        0x7f0402d8
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_38
     .array-data 4
-        0x7f04031e
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_39
@@ -3975,13 +3978,12 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
-        0x7f040277
         0x7f040278
-        0x7f040283
-        0x7f0402f6
-        0x7f04030b
-        0x7f040341
-        0x7f040349
+        0x7f040279
+        0x7f040284
+        0x7f0402f7
+        0x7f04030c
+        0x7f040342
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3991,10 +3993,11 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040357
-        0x7f04035c
+        0x7f040353
+        0x7f040358
         0x7f04035d
-        0x7f040361
+        0x7f04035e
+        0x7f040362
     .end array-data
 
     :array_3a
@@ -4029,9 +4032,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_3c
@@ -4043,8 +4046,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_3d
@@ -4060,20 +4063,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_3e
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_3f
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_40
@@ -4086,9 +4089,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .end array-data
 
     :array_41
@@ -4103,20 +4106,20 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_42
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f4
+        0x7f0402f5
     .end array-data
 
     :array_43
@@ -4128,16 +4131,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -4151,20 +4153,21 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_44
     .array-data 4
-        0x7f04030b
         0x7f04030c
+        0x7f04030d
     .end array-data
 
     :array_45
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f040279
+        0x7f04027a
     .end array-data
 
     :array_46
@@ -4173,7 +4176,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_47
@@ -4188,7 +4191,6 @@
 
     :array_48
     .array-data 4
-        0x7f0402e6
         0x7f0402e7
         0x7f0402e8
         0x7f0402e9
@@ -4202,6 +4204,7 @@
         0x7f0402f1
         0x7f0402f2
         0x7f0402f3
+        0x7f0402f4
     .end array-data
 
     :array_49
@@ -4209,17 +4212,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_4a
@@ -4231,7 +4234,6 @@
 
     :array_4b
     .array-data 4
-        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -4253,15 +4255,16 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040342
+        0x7f040341
         0x7f040343
         0x7f040344
+        0x7f040345
     .end array-data
 
     :array_4c
     .array-data 4
         0x101014f
-        0x7f040345
+        0x7f040346
     .end array-data
 
     :array_4d
@@ -4278,7 +4281,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_4e
@@ -4306,11 +4309,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
-        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
+        0x7f040297
     .end array-data
 
     :array_4f
@@ -4333,17 +4336,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -4351,21 +4353,22 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_51
     .array-data 4
-        0x7f0403ea
         0x7f0403eb
+        0x7f0403ec
     .end array-data
 
     :array_52
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .end array-data
 
     :array_53
@@ -4385,19 +4388,18 @@
     :array_55
     .array-data 4
         0x7f040049
-        0x7f0403e8
+        0x7f0403e9
     .end array-data
 
     :array_56
     .array-data 4
-        0x7f0403d6
         0x7f0403d7
         0x7f0403d8
+        0x7f0403d9
     .end array-data
 
     :array_57
     .array-data 4
-        0x7f0403d9
         0x7f0403da
         0x7f0403db
         0x7f0403dc
@@ -4410,6 +4412,7 @@
         0x7f0403e3
         0x7f0403e4
         0x7f0403e5
+        0x7f0403e6
     .end array-data
 .end method
 
diff --git a/com.discord/smali/com/discord/app/App$b.smali b/com.discord/smali/com/discord/app/App$b.smali
index c10e123a3c..a98d7fc8cb 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 uy:Lcom/discord/app/App$b;
+.field public static final ux: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;->uy:Lcom/discord/app/App$b;
+    sput-object v0, Lcom/discord/app/App$b;->ux: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 d4f54ceef2..9328753017 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2de0783018..ed8a4dbe6d 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 uz:Lcom/discord/app/App$d;
+.field public static final uy: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;->uz:Lcom/discord/app/App$d;
+    sput-object v0, Lcom/discord/app/App$d;->uy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9a3a8be50c..5b803ebf63 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 uw:Z
+.field private static final uv:Z
 
-.field public static final ux:Lcom/discord/app/App$a;
+.field public static final uw:Lcom/discord/app/App$a;
 
 
 # instance fields
-.field private final uv:Z
+.field private final uu: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;->ux:Lcom/discord/app/App$a;
+    sput-object v0, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
 
     const-string v0, "productionDiscordExternal"
 
@@ -49,7 +49,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lcom/discord/app/App;->uw:Z
+    sput-boolean v0, Lcom/discord/app/App;->uv:Z
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 .method public static final synthetic dx()Z
     .locals 1
 
-    sget-boolean v0, Lcom/discord/app/App;->uw:Z
+    sget-boolean v0, Lcom/discord/app/App;->uv:Z
 
     return v0
 .end method
@@ -81,7 +81,7 @@
 
     invoke-super {p0, p1}, Landroid/app/Application;->attachBaseContext(Landroid/content/Context;)V
 
-    iget-boolean p1, p0, Lcom/discord/app/App;->uv:Z
+    iget-boolean p1, p0, Lcom/discord/app/App;->uu:Z
 
     if-nez p1, :cond_0
 
@@ -108,7 +108,7 @@
 
     sget-object v1, Lcom/discord/utilities/analytics/AdjustConfig;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig;
 
-    iget-boolean v2, p0, Lcom/discord/app/App;->uv:Z
+    iget-boolean v2, p0, Lcom/discord/app/App;->uu:Z
 
     invoke-virtual {v1, v0, v2}, Lcom/discord/utilities/analytics/AdjustConfig;->init(Landroid/app/Application;Z)V
 
@@ -134,7 +134,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -142,7 +142,7 @@
 
     move-result-object v1
 
-    sget-object v3, Lcom/discord/app/App$b;->uy:Lcom/discord/app/App$b;
+    sget-object v3, Lcom/discord/app/App$b;->ux:Lcom/discord/app/App$b;
 
     check-cast v3, Lrx/functions/Action1;
 
@@ -166,7 +166,7 @@
 
     new-instance v1, Lcom/discord/app/App$c;
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-direct {v1, v2}, Lcom/discord/app/App$c;-><init>(Lcom/discord/app/AppLog;)V
 
@@ -188,11 +188,11 @@
 
     sget-object v1, Lcom/discord/utilities/view/text/LinkifiedTextView;->Companion:Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     check-cast v2, Lcom/discord/utilities/logging/Logger;
 
-    sget-object v3, Lcom/discord/app/App$d;->uz:Lcom/discord/app/App$d;
+    sget-object v3, Lcom/discord/app/App$d;->uy:Lcom/discord/app/App$d;
 
     check-cast v3, Lkotlin/jvm/functions/Function2;
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali b/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali
index 6c61bcd030..45ff6ba7a3 100644
--- a/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$AppAction$a.smali
@@ -71,6 +71,10 @@
 
     const v2, -0x45ee9a33
 
+    if-eq v1, v2, :cond_3
+
+    const v2, -0x41c4677b
+
     if-eq v1, v2, :cond_2
 
     const v2, -0x37c67be
@@ -86,25 +90,36 @@
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     goto :goto_0
 
     :cond_2
+    const-string v1, "com.discord.intent.action.SDK"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_4
+
+    goto :goto_0
+
+    :cond_3
     const-string v1, "android.intent.action.SEND"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
     move-result v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_4
 
     :goto_0
     const-class v0, Lcom/discord/widgets/share/WidgetIncomingShare;
 
     return-object v0
 
-    :cond_3
+    :cond_4
     :goto_1
     const-class v0, Lcom/discord/widgets/main/WidgetMain;
 
diff --git a/com.discord/smali/com/discord/app/AppActivity$AppAction.smali b/com.discord/smali/com/discord/app/AppActivity$AppAction.smali
index ff06b22b74..ff80b80bbc 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 uE:Lkotlin/Lazy;
+.field private final uD:Lkotlin/Lazy;
 
 
 # direct methods
@@ -74,7 +74,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uE:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uD:Lkotlin/Lazy;
 
     return-void
 .end method
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uE:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$AppAction;->uD:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
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 9d472efbae..c51d46c1a1 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 uN:Lcom/discord/app/AppActivity$b$a$a;
+.field public static final uM: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;->uN:Lcom/discord/app/AppActivity$b$a$a;
+    sput-object v0, Lcom/discord/app/AppActivity$b$a$a;->uM: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 27aef85c37..adeb5c0b59 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 uM:Lcom/discord/app/AppActivity$b$a;
+.field public static final uL:Lcom/discord/app/AppActivity$b$a;
 
 
 # instance fields
 .field final fontScale:I
 
-.field final uK:Ljava/lang/String;
+.field final uJ:Ljava/lang/String;
 
-.field final uL:Ljava/lang/String;
+.field final uK: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;->uM:Lcom/discord/app/AppActivity$b$a;
+    sput-object v0, Lcom/discord/app/AppActivity$b;->uL: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;->uK:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/app/AppActivity$b;->uJ:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/discord/app/AppActivity$b;->uL:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/app/AppActivity$b;->uK: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;->uK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uJ:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->uJ:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->uL:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->uL:Ljava/lang/String;
+    iget-object v3, p1, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->uK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$b;->uJ: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;->uL:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
 
     if-eqz v2, :cond_1
 
@@ -186,7 +186,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -194,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;->uL:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$b;->uK: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 57cd5464a0..3d5159090d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$d.smali b/com.discord/smali/com/discord/app/AppActivity$d.smali
index 283075cf51..fa3dcb70f2 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -108,7 +108,7 @@
 
     check-cast v0, Landroid/app/Activity;
 
-    const v1, 0x7f060136
+    const v1, 0x7f060137
 
     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 8231df574f..e7dea5086e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -78,7 +78,7 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/discord/app/j;->wv:Lcom/discord/app/j$a;
+    iput-object v0, v1, Lcom/discord/app/j;->wt: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;->vB:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vA: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 1816841747..d6b5e0e596 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e0566fda41..4cc869c32b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/app/AppActivity$h.smali b/com.discord/smali/com/discord/app/AppActivity$h.smali
index 5b90e43082..cf92eec2c6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 49fc8f0982..a1471802bb 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 uO:Landroidx/appcompat/widget/Toolbar;
+.field final synthetic uN:Landroidx/appcompat/widget/Toolbar;
 
-.field final synthetic uP:I
+.field final synthetic uO:I
 
-.field final synthetic uQ:Lrx/functions/Action2;
+.field final synthetic uP:Lrx/functions/Action2;
 
-.field final synthetic uR:Lrx/functions/Action1;
+.field final synthetic uQ: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;->uO:Landroidx/appcompat/widget/Toolbar;
+    iput-object p1, p0, Lcom/discord/app/AppActivity$j;->uN:Landroidx/appcompat/widget/Toolbar;
 
-    iput p2, p0, Lcom/discord/app/AppActivity$j;->uP:I
+    iput p2, p0, Lcom/discord/app/AppActivity$j;->uO:I
 
-    iput-object p3, p0, Lcom/discord/app/AppActivity$j;->uQ:Lrx/functions/Action2;
+    iput-object p3, p0, Lcom/discord/app/AppActivity$j;->uP:Lrx/functions/Action2;
 
-    iput-object p4, p0, Lcom/discord/app/AppActivity$j;->uR:Lrx/functions/Action1;
+    iput-object p4, p0, Lcom/discord/app/AppActivity$j;->uQ: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;->uQ:Lrx/functions/Action2;
+    iget-object v0, p0, Lcom/discord/app/AppActivity$j;->uP:Lrx/functions/Action2;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity$j;->uO:Landroidx/appcompat/widget/Toolbar;
+    iget-object v1, p0, Lcom/discord/app/AppActivity$j;->uN: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bd2dfc86c1..31ed672e29 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 uS:Lcom/discord/app/AppActivity$m;
+.field public static final uR: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;->uS:Lcom/discord/app/AppActivity$m;
+    sput-object v0, Lcom/discord/app/AppActivity$m;->uR: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 8730425582..4a434e4967 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 private static uG:Z
+.field private static uF:Z
 
-.field private static final uH:Landroid/content/Intent;
+.field private static final uG:Landroid/content/Intent;
 
-.field private static uI:Z
+.field private static uH:Z
 
-.field public static final uJ:Lcom/discord/app/AppActivity$a;
+.field public static final uI:Lcom/discord/app/AppActivity$a;
 
 
 # instance fields
@@ -43,7 +43,17 @@
 
 .field public toolbar:Landroidx/appcompat/widget/Toolbar;
 
-.field final uA:Ljava/util/LinkedHashMap;
+.field private uA:I
+
+.field private uB:Ljava/lang/String;
+
+.field private final uC:Lkotlin/Lazy;
+
+.field private final uD:Lkotlin/Lazy;
+
+.field private uE:Landroid/content/Intent;
+
+.field final uz:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -56,16 +66,6 @@
     .end annotation
 .end field
 
-.field private uB:I
-
-.field private uC:Ljava/lang/String;
-
-.field private final uD:Lkotlin/Lazy;
-
-.field private final uE:Lkotlin/Lazy;
-
-.field private uF:Landroid/content/Intent;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -127,15 +127,15 @@
 
     invoke-direct {v0, v3}, Lcom/discord/app/AppActivity$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/app/AppActivity;->uJ:Lcom/discord/app/AppActivity$a;
+    sput-object v0, Lcom/discord/app/AppActivity;->uI: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;->uH:Landroid/content/Intent;
+    sput-object v0, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
 
-    sput-boolean v2, Lcom/discord/app/AppActivity;->uI:Z
+    sput-boolean v2, Lcom/discord/app/AppActivity;->uH: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;->uA:Ljava/util/LinkedHashMap;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uz:Ljava/util/LinkedHashMap;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/app/AppActivity;->uB:I
+    iput v0, p0, Lcom/discord/app/AppActivity;->uA:I
 
     const-string v0, ""
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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;->bgj:Lkotlin/j;
+    sget-object v0, Lkotlin/j;->bgt:Lkotlin/j;
 
-    sget-object v1, Lcom/discord/app/AppActivity$m;->uS:Lcom/discord/app/AppActivity$m;
+    sget-object v1, Lcom/discord/app/AppActivity$m;->uR:Lcom/discord/app/AppActivity$m;
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
@@ -181,7 +181,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uD:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uC:Lkotlin/Lazy;
 
     new-instance v0, Lcom/discord/app/AppActivity$i;
 
@@ -193,11 +193,11 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uE:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uD:Lkotlin/Lazy;
 
-    sget-object v0, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
+    sget-object v0, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uF:Landroid/content/Intent;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uE:Landroid/content/Intent;
 
     return-void
 .end method
@@ -225,7 +225,7 @@
 
     move-result p1
 
-    sput-boolean p1, Lcom/discord/app/AppActivity;->uG:Z
+    sput-boolean p1, Lcom/discord/app/AppActivity;->uF:Z
 
     return-void
 .end method
@@ -233,7 +233,7 @@
 .method public static final synthetic a(Lcom/discord/app/AppActivity;I)V
     .locals 0
 
-    iput p1, p0, Lcom/discord/app/AppActivity;->uB:I
+    iput p1, p0, Lcom/discord/app/AppActivity;->uA:I
 
     return-void
 .end method
@@ -249,7 +249,7 @@
 .method public static final synthetic a(Lcom/discord/app/AppActivity;Ljava/lang/String;)V
     .locals 1
 
-    sget-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     invoke-static {}, Lcom/discord/app/f;->dJ()Ljava/util/List;
 
@@ -306,7 +306,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;->uL:Ljava/lang/String;
+    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->uK:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/discord/models/domain/ModelUserSettings;->getLocaleObject(Ljava/lang/String;)Ljava/util/Locale;
 
@@ -324,16 +324,16 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p1, Lcom/discord/app/AppActivity$b;->uL:Ljava/lang/String;
+    iget-object p1, p1, Lcom/discord/app/AppActivity$b;->uK: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;->uK:Ljava/lang/String;
+    iget-object v0, p1, Lcom/discord/app/AppActivity$b;->uJ:Ljava/lang/String;
 
-    sget-object v2, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sget-object v2, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     invoke-static {}, Lcom/discord/app/f;->dJ()Ljava/util/List;
 
@@ -356,7 +356,7 @@
 
     invoke-direct {v2, p0}, Lcom/discord/app/AppActivity$k;-><init>(Lcom/discord/app/AppActivity;)V
 
-    const v4, 0x7f04039d
+    const v4, 0x7f04039e
 
     invoke-virtual {v2, v4, v1}, Lcom/discord/app/AppActivity$k;->b(IZ)Landroid/util/TypedValue;
 
@@ -393,14 +393,14 @@
 
     if-ne p1, v2, :cond_2
 
-    iget v4, p0, Lcom/discord/app/AppActivity;->uB:I
+    iget v4, p0, Lcom/discord/app/AppActivity;->uA:I
 
     if-ne v4, v0, :cond_3
 
     :cond_2
     if-eq p1, v2, :cond_4
 
-    iget p0, p0, Lcom/discord/app/AppActivity;->uB:I
+    iget p0, p0, Lcom/discord/app/AppActivity;->uA:I
 
     if-eq p0, p1, :cond_4
 
@@ -585,7 +585,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object p1, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sget-object p1, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     invoke-static {}, Lcom/discord/app/f;->dH()Ljava/util/List;
 
@@ -597,7 +597,7 @@
 
     if-eqz p0, :cond_3
 
-    sget-object p0, Lcom/discord/app/j$c;->wE:Lcom/discord/app/j$c;
+    sget-object p0, Lcom/discord/app/j$c;->wC:Lcom/discord/app/j$c;
 
     goto :goto_1
 
@@ -731,7 +731,7 @@
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/discord/app/AppActivity;->uI:Z
+    sput-boolean v0, Lcom/discord/app/AppActivity;->uH:Z
 
     return-void
 .end method
@@ -739,7 +739,7 @@
 .method public static final synthetic dB()Z
     .locals 1
 
-    sget-boolean v0, Lcom/discord/app/AppActivity;->uG:Z
+    sget-boolean v0, Lcom/discord/app/AppActivity;->uF:Z
 
     return v0
 .end method
@@ -747,7 +747,7 @@
 .method public static final synthetic dz()Z
     .locals 1
 
-    sget-boolean v0, Lcom/discord/app/AppActivity;->uI:Z
+    sget-boolean v0, Lcom/discord/app/AppActivity;->uH:Z
 
     return v0
 .end method
@@ -755,7 +755,7 @@
 .method private final getUserSettings()Lcom/discord/stores/StoreUserSettings;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uD:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uC:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -773,7 +773,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/j$c;->wC:Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->wA:Lcom/discord/app/j$c;
 
     check-cast v0, Ljava/io/Serializable;
 
@@ -827,7 +827,9 @@
 
     check-cast v0, Landroid/view/View;
 
-    invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;)V
+    const/4 v1, 0x0
+
+    invoke-virtual {p1, v0, v1}, Landroidx/appcompat/widget/Toolbar;->addView(Landroid/view/View;I)V
 
     :cond_0
     iget-object p1, p0, Lcom/discord/app/AppActivity;->toolbar:Landroidx/appcompat/widget/Toolbar;
@@ -924,7 +926,7 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/discord/app/AppActivity;->uB:I
+    iput v1, p0, Lcom/discord/app/AppActivity;->uA:I
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -1054,9 +1056,9 @@
 .method public final getMostRecentIntent()Landroid/content/Intent;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uF:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uE:Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
+    sget-object v1, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
 
     if-ne v0, v1, :cond_0
 
@@ -1068,7 +1070,7 @@
 
     new-instance v0, Landroid/content/Intent;
 
-    sget-object v1, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
+    sget-object v1, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
 
     invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
@@ -1105,7 +1107,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uE:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uD:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -1252,7 +1254,7 @@
 .method public onDestroy()V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uz:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -1268,10 +1270,10 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/discord/app/AppActivity;->uH:Landroid/content/Intent;
+    sget-object p1, Lcom/discord/app/AppActivity;->uG:Landroid/content/Intent;
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/app/AppActivity;->uF:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/discord/app/AppActivity;->uE:Landroid/content/Intent;
 
     invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getMostRecentIntent()Landroid/content/Intent;
 
@@ -1283,7 +1285,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uz:Ljava/util/LinkedHashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -1343,7 +1345,7 @@
 
     invoke-super {p0}, Lcom/discord/app/c;->onResume()V
 
-    sget-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     invoke-static {p0}, Lcom/discord/app/f;->c(Lcom/discord/app/AppActivity;)Z
 
@@ -1362,7 +1364,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -1374,7 +1376,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1403,9 +1405,9 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v0, p0, Lcom/discord/app/AppActivity;->uC:Ljava/lang/String;
+    iput-object v0, p0, Lcom/discord/app/AppActivity;->uB:Ljava/lang/String;
 
-    sget-object v0, Lcom/discord/app/AppActivity$b;->uM:Lcom/discord/app/AppActivity$b$a;
+    sget-object v0, Lcom/discord/app/AppActivity$b;->uL:Lcom/discord/app/AppActivity$b$a;
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -1437,7 +1439,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/AppActivity$b$a$a;->uN:Lcom/discord/app/AppActivity$b$a$a;
+    sget-object v3, Lcom/discord/app/AppActivity$b$a$a;->uM:Lcom/discord/app/AppActivity$b$a$a;
 
     check-cast v3, Lkotlin/jvm/functions/Function3;
 
@@ -1512,7 +1514,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setSubtitle(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
@@ -1533,7 +1535,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setTitle(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8bb0ee011a..5368e4d9bd 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 uT:Landroid/view/View;
+.field final synthetic uS:Landroid/view/View;
 
-.field final synthetic uU:Lkotlin/jvm/functions/Function1;
+.field final synthetic uT: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;->uT:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppBottomSheet$d;->uS:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/discord/app/AppBottomSheet$d;->uU:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/AppBottomSheet$d;->uT: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;->uU:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/app/AppBottomSheet$d;->uT:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/app/AppBottomSheet$d;->uT:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/app/AppBottomSheet$d;->uS: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 669b5b1ac5..c5b573901c 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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 ef94410d09..80926c2b6e 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 uT:Landroid/view/View;
+.field final synthetic uS:Landroid/view/View;
 
-.field final synthetic uU:Lkotlin/jvm/functions/Function1;
+.field final synthetic uT:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic uV:Lcom/discord/app/AppDialog;
+.field final synthetic uU: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;->uV:Lcom/discord/app/AppDialog;
+    iput-object p1, p0, Lcom/discord/app/AppDialog$a;->uU:Lcom/discord/app/AppDialog;
 
-    iput-object p2, p0, Lcom/discord/app/AppDialog$a;->uT:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppDialog$a;->uS:Landroid/view/View;
 
-    iput-object p3, p0, Lcom/discord/app/AppDialog$a;->uU:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/AppDialog$a;->uT: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;->uU:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->uT:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/app/AppDialog$a;->uT:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/app/AppDialog$a;->uS: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;->uV:Lcom/discord/app/AppDialog;
+    iget-object p1, p0, Lcom/discord/app/AppDialog$a;->uU: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 14a7c580af..961fb978e0 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -399,7 +399,7 @@
     return-void
 
     :cond_0
-    sget-object p2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p2, Lcom/discord/app/AppLog;->vm: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 04036bfaca..368382a6d1 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 uW:Z
+.field private uV: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;->uW:Z
+    iget-boolean v0, p0, Lcom/discord/app/AppEditText;->uV: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;->uW:Z
+    iput-boolean p1, p0, Lcom/discord/app/AppEditText;->uV: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 b1cd4803f2..35fb5870e7 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, 0x7f12052a
+    const v3, 0x7f12054f
 
     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 edda19bd5d..836dec9fe0 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, 0x7f121260
+    const p1, 0x7f1212e8
 
     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 b0c463d802..5e2734d318 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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
 
@@ -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;->Bi()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Bl()Ljava/io/File;
 
     move-result-object v0
 
@@ -561,7 +561,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/discord/app/c;->uX:Ljava/util/TreeMap;
+    iget-object v0, v0, Lcom/discord/app/c;->uW: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;->bmR:Lkotterknife/a;
+    sget-object v0, Lkotterknife/a;->bnb:Lkotterknife/a;
 
     invoke-static {p0}, Lkotterknife/a;->bi(Ljava/lang/Object;)V
 
@@ -629,7 +629,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
+    iget-object v0, v0, Lcom/discord/app/AppActivity;->uz: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
 
@@ -1133,7 +1133,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
@@ -1210,7 +1210,7 @@
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, v0, Lcom/discord/app/c;->uX:Ljava/util/TreeMap;
+    iget-object v2, v0, Lcom/discord/app/c;->uW: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;->uX:Ljava/util/TreeMap;
+    iget-object p1, v0, Lcom/discord/app/c;->uW:Ljava/util/TreeMap;
 
     check-cast p1, Ljava/util/Map;
 
@@ -1286,7 +1286,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, v1, Lcom/discord/app/AppActivity;->uA:Ljava/util/LinkedHashMap;
+    iget-object v0, v1, Lcom/discord/app/AppActivity;->uz:Ljava/util/LinkedHashMap;
 
     check-cast v0, Ljava/util/Map;
 
diff --git a/com.discord/smali/com/discord/app/AppLog$Elapsed.smali b/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
index b1646a84aa..c806213ac1 100644
--- a/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
+++ b/com.discord/smali/com/discord/app/AppLog$Elapsed.smali
@@ -19,12 +19,12 @@
 
 
 # instance fields
-.field private final sM:J
+.field private final sL:J
+
+.field private final vn:Lkotlin/Lazy;
 
 .field private final vo:Lkotlin/Lazy;
 
-.field private final vp:Lkotlin/Lazy;
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -94,7 +94,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/discord/app/AppLog$Elapsed;->sM:J
+    iput-wide v0, p0, Lcom/discord/app/AppLog$Elapsed;->sL:J
 
     new-instance v0, Lcom/discord/app/AppLog$Elapsed$a;
 
@@ -106,7 +106,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vo:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vn: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;->vp:Lkotlin/Lazy;
+    iput-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vo:Lkotlin/Lazy;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
 .method public static final synthetic a(Lcom/discord/app/AppLog$Elapsed;)J
     .locals 2
 
-    iget-wide v0, p0, Lcom/discord/app/AppLog$Elapsed;->sM:J
+    iget-wide v0, p0, Lcom/discord/app/AppLog$Elapsed;->sL:J
 
     return-wide v0
 .end method
@@ -136,7 +136,7 @@
 .method public final dE()J
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vo:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vn:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
@@ -154,7 +154,7 @@
 .method public final dF()F
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vp:Lkotlin/Lazy;
+    iget-object v0, p0, Lcom/discord/app/AppLog$Elapsed;->vo:Lkotlin/Lazy;
 
     invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/app/AppLog$a.smali b/com.discord/smali/com/discord/app/AppLog$a.smali
index 47687d0b44..39dd799dc8 100644
--- a/com.discord/smali/com/discord/app/AppLog$a.smali
+++ b/com.discord/smali/com/discord/app/AppLog$a.smali
@@ -86,7 +86,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm: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;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5cc1ea8e45..53d099840e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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 a2f977abe9..5b77ec89e0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1e90d8b96c..273cb40cb4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 725690cb44..5eb68f184e 100644
--- a/com.discord/smali/com/discord/app/AppLog.smali
+++ b/com.discord/smali/com/discord/app/AppLog.smali
@@ -13,9 +13,9 @@
 
 
 # static fields
-.field private static vl:Landroid/content/SharedPreferences;
+.field private static vk:Landroid/content/SharedPreferences;
 
-.field private static final vm:Lrx/subjects/SerializedSubject;
+.field private static final vl:Lrx/subjects/SerializedSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/SerializedSubject<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field public static final vn:Lcom/discord/app/AppLog;
+.field public static final vm:Lcom/discord/app/AppLog;
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     invoke-direct {v0}, Lcom/discord/app/AppLog;-><init>()V
 
-    sput-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sput-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/a;->Ky()Lrx/subjects/a;
+    invoke-static {}, Lrx/subjects/a;->KB()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;->vm:Lrx/subjects/SerializedSubject;
+    sput-object v0, Lcom/discord/app/AppLog;->vl:Lrx/subjects/SerializedSubject;
 
     return-void
 .end method
@@ -116,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;->vl:Landroid/content/SharedPreferences;
+    sget-object v0, Lcom/discord/app/AppLog;->vk:Landroid/content/SharedPreferences;
 
     if-eqz v0, :cond_0
 
@@ -169,7 +169,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lrx/subjects/SerializedSubject;
+    sget-object v0, Lcom/discord/app/AppLog;->vl:Lrx/subjects/SerializedSubject;
 
     new-instance v1, Lcom/discord/app/AppLog$LoggedItem;
 
@@ -429,7 +429,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/AppLog;->vm:Lrx/subjects/SerializedSubject;
+    sget-object v0, Lcom/discord/app/AppLog;->vl:Lrx/subjects/SerializedSubject;
 
     check-cast v0, Lrx/Observable;
 
@@ -437,7 +437,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -459,7 +459,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v1, 0x0
 
@@ -481,7 +481,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/AppLog;->vl:Landroid/content/SharedPreferences;
+    sput-object v0, Lcom/discord/app/AppLog;->vk:Landroid/content/SharedPreferences;
 
     const/4 v0, 0x2
 
@@ -523,7 +523,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
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 a5bd2279a1..558b42c61c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2d13d6582b..081d328c7f 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0588e904e2..92ae26cdd8 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 vr:Ljava/util/HashMap;
+.field private static final vq: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 vs:I = 0xd2
+.field private static final vr:I = 0xd2
 
 # The value of this static final field might be set in the static constructor
-.field private static final vt:I = 0xd3
+.field private static final vs:I = 0xd3
 
 # The value of this static final field might be set in the static constructor
-.field private static final vu:I = 0xde
+.field private static final vt:I = 0xde
 
 # The value of this static final field might be set in the static constructor
-.field private static final vv:I = 0xd5
+.field private static final vu:I = 0xd5
 
-.field public static final vw:Lcom/discord/app/AppPermissions$a;
+.field public static final vv: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 vq:Ljava/util/HashMap;
+.field private final vp: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;->vw:Lcom/discord/app/AppPermissions$a;
+    sput-object v0, Lcom/discord/app/AppPermissions;->vv: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;->vr:Ljava/util/HashMap;
+    sput-object v0, Lcom/discord/app/AppPermissions;->vq:Ljava/util/HashMap;
 
     const/16 v0, 0xd2
 
-    sput v0, Lcom/discord/app/AppPermissions;->vs:I
+    sput v0, Lcom/discord/app/AppPermissions;->vr:I
 
     const/16 v0, 0xd3
 
-    sput v0, Lcom/discord/app/AppPermissions;->vt:I
+    sput v0, Lcom/discord/app/AppPermissions;->vs:I
 
     const/16 v0, 0xde
 
-    sput v0, Lcom/discord/app/AppPermissions;->vu:I
+    sput v0, Lcom/discord/app/AppPermissions;->vt:I
 
     const/16 v0, 0xd5
 
-    sput v0, Lcom/discord/app/AppPermissions;->vv:I
+    sput v0, Lcom/discord/app/AppPermissions;->vu:I
 
-    sget-object v0, Lcom/discord/app/AppPermissions;->vr:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vq:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vt:I
+    sget v2, Lcom/discord/app/AppPermissions;->vs: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;->vr:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vq:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vs:I
+    sget v2, Lcom/discord/app/AppPermissions;->vr: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;->vr:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vq:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vu:I
+    sget v2, Lcom/discord/app/AppPermissions;->vt: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;->vr:Ljava/util/HashMap;
+    sget-object v0, Lcom/discord/app/AppPermissions;->vq:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
-    sget v2, Lcom/discord/app/AppPermissions;->vv:I
+    sget v2, Lcom/discord/app/AppPermissions;->vu: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;->vq:Ljava/util/HashMap;
+    iput-object p1, p0, Lcom/discord/app/AppPermissions;->vp: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;->vr:Ljava/util/HashMap;
+    sget-object p2, Lcom/discord/app/AppPermissions;->vq: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;->vq:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->vp: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;->vq:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/app/AppPermissions;->vp: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;->vt:I
+    sget v2, Lcom/discord/app/AppPermissions;->vs:I
 
     if-ne p1, v2, :cond_0
 
-    const p1, 0x7f120d99
+    const p1, 0x7f120dce
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->s(I)Lkotlin/jvm/functions/Function0;
 
@@ -424,11 +424,11 @@
     goto :goto_0
 
     :cond_0
-    sget v2, Lcom/discord/app/AppPermissions;->vu:I
+    sget v2, Lcom/discord/app/AppPermissions;->vt:I
 
     if-ne p1, v2, :cond_1
 
-    const p1, 0x7f120d97
+    const p1, 0x7f120dcc
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->s(I)Lkotlin/jvm/functions/Function0;
 
@@ -437,11 +437,11 @@
     goto :goto_0
 
     :cond_1
-    sget v2, Lcom/discord/app/AppPermissions;->vv:I
+    sget v2, Lcom/discord/app/AppPermissions;->vu:I
 
     if-ne p1, v2, :cond_2
 
-    const p1, 0x7f120d98
+    const p1, 0x7f120dcd
 
     invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->s(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;->vu:I
+    sget v0, Lcom/discord/app/AppPermissions;->vt: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;->vv:I
+    sget v0, Lcom/discord/app/AppPermissions;->vu: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;->vt:I
+    sget v0, Lcom/discord/app/AppPermissions;->vs: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;->vs:I
+    sget v0, Lcom/discord/app/AppPermissions;->vr: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 01ffcb9b2a..d9f45fd46f 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 vF:Lcom/discord/app/AppScrollingViewBehavior;
+.field final synthetic vE:Lcom/discord/app/AppScrollingViewBehavior;
 
-.field final synthetic vG:Landroid/view/View;
+.field final synthetic vF: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;->vF:Lcom/discord/app/AppScrollingViewBehavior;
+    iput-object p1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vE:Lcom/discord/app/AppScrollingViewBehavior;
 
-    iput-object p2, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vG:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vF: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;->vF:Lcom/discord/app/AppScrollingViewBehavior;
+    iget-object v0, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vE:Lcom/discord/app/AppScrollingViewBehavior;
 
-    iget-object v1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vG:Landroid/view/View;
+    iget-object v1, p0, Lcom/discord/app/AppScrollingViewBehavior$a;->vF: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 15f5ac4d2b..fd353b082a 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 vD:F
+.field private final vC:F
 
-.field private vE:Z
+.field private vD:Z
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD:F
+    iput p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->vC:F
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vE:Z
+    iput-boolean v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD: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;->vE:Z
+    iput-boolean p1, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD:Z
 
     return-void
 .end method
@@ -150,7 +150,7 @@
 
     div-float/2addr p1, v0
 
-    iget v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vD:F
+    iget v0, p0, Lcom/discord/app/AppScrollingViewBehavior;->vC: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 bf91ee4d9b..cfac2ac33e 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 vK:I
+
 .field private vL:I
 
-.field private vM:I
-
-.field private vN:Ljava/lang/String;
+.field private vM:Ljava/lang/String;
 
 
 # direct methods
@@ -63,7 +63,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/app/AppTextView;->vM:I
+    iput v0, p0, Lcom/discord/app/AppTextView;->vL:I
 
     if-eqz p2, :cond_1
 
@@ -79,7 +79,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/discord/app/AppTextView;->vN:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/app/AppTextView;->vM:Ljava/lang/String;
 
     const/4 p2, 0x3
 
@@ -87,7 +87,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/app/AppTextView;->vM:I
+    iput p2, p0, Lcom/discord/app/AppTextView;->vL:I
 
     const/4 p2, 0x2
 
@@ -95,7 +95,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/discord/app/AppTextView;->vL:I
+    iput p2, p0, Lcom/discord/app/AppTextView;->vK: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;->vL:I
+    iget p1, p0, Lcom/discord/app/AppTextView;->vK:I
 
     if-lez p1, :cond_0
 
-    iget p1, p0, Lcom/discord/app/AppTextView;->vM:I
+    iget p1, p0, Lcom/discord/app/AppTextView;->vL:I
 
     if-lez p1, :cond_0
 
@@ -123,7 +123,7 @@
 
     move-result-object v1
 
-    iget v3, p0, Lcom/discord/app/AppTextView;->vL:I
+    iget v3, p0, Lcom/discord/app/AppTextView;->vK:I
 
     new-array p2, p2, [Ljava/lang/Object;
 
@@ -141,7 +141,7 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object p2, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     array-length p2, v0
 
@@ -170,7 +170,7 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object p1, p0, Lcom/discord/app/AppTextView;->vN:Ljava/lang/String;
+    iget-object p1, p0, Lcom/discord/app/AppTextView;->vM: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;->vN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppTextView;->vM: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;->vN:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/app/AppTextView;->vM:Ljava/lang/String;
 
     return-void
 .end method
@@ -320,9 +320,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
-    iget-object v0, p0, Lcom/discord/app/AppTextView;->vN:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/app/AppTextView;->vM: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 82deac3a70..8d5423512c 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 c688710ccc..f2cf410fcb 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 wM:Lcom/discord/app/DiscordConnectService$b;
+.field public static final wK: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;->wM:Lcom/discord/app/DiscordConnectService$b;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$b;->wK: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 3c4d5ad655..ed17f495c2 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 wO:Lcom/discord/app/DiscordConnectService$c$1;
+.field public static final wM: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;->wO:Lcom/discord/app/DiscordConnectService$c$1;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wM: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 8ff6747a71..c2b01ab694 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 wN:Lcom/discord/app/DiscordConnectService$c;
+.field public static final wL: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;->wN:Lcom/discord/app/DiscordConnectService$c;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$c;->wL: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;->wO:Lcom/discord/app/DiscordConnectService$c$1;
+    sget-object v0, Lcom/discord/app/DiscordConnectService$c$1;->wM: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 f53bed3421..a5c563a720 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 wP:Lcom/discord/app/DiscordConnectService$d;
+.field public static final wN: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;->wP:Lcom/discord/app/DiscordConnectService$d;
+    sput-object v0, Lcom/discord/app/DiscordConnectService$d;->wN: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 97bc1040e3..26457deca4 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;->wL:Lcom/discord/app/DiscordConnectService$a;
+    sget-object v0, Lcom/discord/app/DiscordConnectService;->wJ: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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 7af49907bd..3e3d8d3aa9 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/DiscordConnectService;->wL:Lcom/discord/app/DiscordConnectService$a;
+    sget-object v0, Lcom/discord/app/DiscordConnectService;->wJ: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f4d5ca1a21..119a5cee7f 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 wK:Z
+.field private static final wI:Z
 
-.field public static final wL:Lcom/discord/app/DiscordConnectService$a;
+.field public static final wJ: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;->wL:Lcom/discord/app/DiscordConnectService$a;
+    sput-object v0, Lcom/discord/app/DiscordConnectService;->wJ:Lcom/discord/app/DiscordConnectService$a;
 
-    sget-object v0, Lcom/discord/samsung/a;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eI()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
 
     move-result v0
 
-    sput-boolean v0, Lcom/discord/app/DiscordConnectService;->wK:Z
+    sput-boolean v0, Lcom/discord/app/DiscordConnectService;->wI:Z
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    sget-boolean v0, Lcom/discord/app/DiscordConnectService;->wK:Z
+    sget-boolean v0, Lcom/discord/app/DiscordConnectService;->wI: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;->vJ:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->m(Ljava/lang/Object;)V
 
@@ -153,13 +153,13 @@
 
     move-result-object v0
 
-    const v2, 0x7f08030e
+    const v2, 0x7f08031a
 
     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, 0x7f120440
+    const v1, 0x7f120465
 
     invoke-virtual {p0, v1}, Lcom/discord/app/DiscordConnectService;->getString(I)Ljava/lang/String;
 
@@ -181,7 +181,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120447
+    const v1, 0x7f12046c
 
     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;->vJ:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->n(Ljava/lang/Object;)V
 
@@ -275,7 +275,7 @@
     move-object v3, v2
 
     :goto_0
-    sget-boolean v4, Lcom/discord/app/DiscordConnectService;->wK:Z
+    sget-boolean v4, Lcom/discord/app/DiscordConnectService;->wI:Z
 
     if-eqz v4, :cond_b
 
@@ -329,7 +329,7 @@
 
     check-cast v2, Landroid/content/Context;
 
-    const v3, 0x7f120d0b
+    const v3, 0x7f120d3d
 
     invoke-static {v2, v3}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -355,7 +355,7 @@
     goto/16 :goto_5
 
     :cond_3
-    sget-object v4, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v4, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dW()Lkotlin/text/Regex;
 
@@ -531,7 +531,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/DiscordConnectService$b;->wM:Lcom/discord/app/DiscordConnectService$b;
+    sget-object v3, Lcom/discord/app/DiscordConnectService$b;->wK: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;->wN:Lcom/discord/app/DiscordConnectService$c;
+    sget-object v3, Lcom/discord/app/DiscordConnectService$c;->wL: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;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {v2}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
 
@@ -640,7 +640,7 @@
 
     const/4 v13, 0x0
 
-    sget-object v2, Lcom/discord/app/DiscordConnectService$d;->wP:Lcom/discord/app/DiscordConnectService$d;
+    sget-object v2, Lcom/discord/app/DiscordConnectService$d;->wN: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 4d12576ec8..2e242b8235 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 wO:Ljava/lang/String;
+
+.field private static final wP:Ljava/lang/String;
+
 .field private static final wQ:Ljava/lang/String;
 
-.field private static final wR:Ljava/lang/String;
+.field private static final wR:Lkotlin/text/Regex;
 
-.field private static final wS:Ljava/lang/String;
+.field private static final wS:Lkotlin/text/Regex;
 
-.field private static final wT:Lkotlin/text/Regex;
+.field public static final wT:Lkotlin/text/Regex;
 
-.field private static final wU:Lkotlin/text/Regex;
+.field public static final wU:Lkotlin/text/Regex;
 
-.field public static final wV:Lkotlin/text/Regex;
+.field private static final wV:Lkotlin/text/Regex;
 
-.field public static final wW:Lkotlin/text/Regex;
+.field private static final wW:Lkotlin/text/Regex;
 
 .field private static final wX:Lkotlin/text/Regex;
 
@@ -36,11 +40,7 @@
 
 .field private static final xc:Lkotlin/text/Regex;
 
-.field private static final xd:Lkotlin/text/Regex;
-
-.field private static final xe:Lkotlin/text/Regex;
-
-.field public static final xf:Lcom/discord/app/a/a;
+.field public static final xd:Lcom/discord/app/a/a;
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/a/a;-><init>()V
 
-    sput-object v0, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sput-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     const-string v0, "https://discordapp.com"
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wO:Ljava/lang/String;
 
     sget-object v1, Lcom/discord/app/a/a;->HOST_GIFT:Ljava/lang/String;
 
@@ -105,7 +105,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/a/a;->wR:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wP:Ljava/lang/String;
 
     sget-object v1, Lcom/discord/app/a/a;->HOST_INVITE:Ljava/lang/String;
 
@@ -117,9 +117,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/a/a;->wS:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -127,9 +127,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;->wT:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wR:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -137,7 +137,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;->wU:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wS:Lkotlin/text/Regex;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -145,7 +145,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wO:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -153,7 +153,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v1, Lcom/discord/app/a/a;->wS:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -161,7 +161,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v1, Lcom/discord/app/a/a;->wS:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -173,13 +173,13 @@
 
     move-result-object v0
 
-    sget-object v2, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v2, Lkotlin/text/k;->bjh: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;->wV:Lkotlin/text/Regex;
+    sput-object v3, Lcom/discord/app/a/a;->wT:Lkotlin/text/Regex;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -187,7 +187,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/a/a;->wO:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -195,7 +195,7 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    sget-object v2, Lcom/discord/app/a/a;->wR:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/a/a;->wP:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -205,15 +205,15 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v1, Lkotlin/text/k;->bjh: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;->wW:Lkotlin/text/Regex;
+    sput-object v2, Lcom/discord/app/a/a;->wU:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -221,9 +221,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;->wX:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wV:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -231,9 +231,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;->wY:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wW:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -241,9 +241,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;->wZ:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wX:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -251,9 +251,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;->xa:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wY:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -261,7 +261,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;->xb:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->wZ:Lkotlin/text/Regex;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -269,7 +269,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/a/a;->wQ:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/a/a;->wO:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -281,15 +281,15 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v1, Lkotlin/text/k;->bjh: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;->xc:Lkotlin/text/Regex;
+    sput-object v2, Lcom/discord/app/a/a;->xa:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -297,9 +297,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;->xd:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->xb:Lkotlin/text/Regex;
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -307,7 +307,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;->xe:Lkotlin/text/Regex;
+    sput-object v1, Lcom/discord/app/a/a;->xc:Lkotlin/text/Regex;
 
     return-void
 .end method
@@ -361,7 +361,7 @@
 
     check-cast p0, Ljava/lang/CharSequence;
 
-    sget-object v0, Lcom/discord/app/a/a;->wU:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wS:Lkotlin/text/Regex;
 
     invoke-virtual {v0, p0}, Lkotlin/text/Regex;->matches(Ljava/lang/CharSequence;)Z
 
@@ -418,7 +418,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v0, Lcom/discord/app/a/a;->xc:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xa:Lkotlin/text/Regex;
 
     check-cast p0, Ljava/lang/CharSequence;
 
@@ -477,7 +477,7 @@
 .method public static dU()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wT:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wR:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -485,7 +485,7 @@
 .method public static dV()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wU:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wS:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -493,7 +493,7 @@
 .method public static dW()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wX:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wV:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -501,7 +501,7 @@
 .method public static dX()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wY:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wW:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -509,7 +509,7 @@
 .method public static dY()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->wZ:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wX:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -517,7 +517,7 @@
 .method public static dZ()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->xa:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wY:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -525,7 +525,7 @@
 .method public static ea()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->xb:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->wZ:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -533,7 +533,7 @@
 .method public static eb()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->xd:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xb:Lkotlin/text/Regex;
 
     return-object v0
 .end method
@@ -541,7 +541,7 @@
 .method public static ec()Lkotlin/text/Regex;
     .locals 1
 
-    sget-object v0, Lcom/discord/app/a/a;->xe:Lkotlin/text/Regex;
+    sget-object v0, Lcom/discord/app/a/a;->xc: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 568cf2806a..ea313fc961 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 uY:Lcom/discord/app/c$a;
+.field public static final uX:Lcom/discord/app/c$a;
 
 
 # instance fields
-.field final uX:Ljava/util/TreeMap;
+.field final uW: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;->uY:Lcom/discord/app/c$a;
+    sput-object v0, Lcom/discord/app/c;->uX: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;->uX:Ljava/util/TreeMap;
+    iput-object v0, p0, Lcom/discord/app/c;->uW: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;->uX:Ljava/util/TreeMap;
+    iget-object v0, p0, Lcom/discord/app/c;->uW: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 765800dee1..66c8cb9034 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 uZ:Ljava/lang/String; = "https://status.discordapp.com/"
+.field public static final uY: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 va:Ljava/lang/String; = "https://support.discordapp.com"
+.field public static final uZ: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 vb:Ljava/lang/String; = "https://support-dev.discordapp.com"
+.field public static final va: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 vc:Ljava/lang/String; = "https://discordapp.com/acknowledgements"
+.field public static final vb: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 vd:J = 0xd1679fcL
+.field public static final vc:J = 0xd1679fcL
 
 # The value of this static final field might be set in the static constructor
-.field public static final ve:J = 0x53d1ea1c57L
+.field public static final vd:J = 0x53d1ea1c57L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vf:J = 0x53d1e9852cL
+.field public static final ve:J = 0x53d1e9852cL
 
 # The value of this static final field might be set in the static constructor
-.field public static final vg:J = 0x53d1eac657L
+.field public static final vf:J = 0x53d1eac657L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vh:J = 0x53d28f5538L
+.field public static final vg:J = 0x53d28f5538L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vi:J = 0x53d3623db8L
+.field public static final vh:J = 0x53d3623db8L
 
 # The value of this static final field might be set in the static constructor
-.field public static final vj:J = 0x53d357e4d0L
+.field public static final vi:J = 0x53d357e4d0L
 
-.field public static final vk:Lcom/discord/app/e;
+.field public static final vj: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;->vk:Lcom/discord/app/e;
+    sput-object v0, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
     const-string v0, "https://status.discordapp.com/"
 
-    sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->uY:Ljava/lang/String;
 
     const-string v0, "https://support.discordapp.com"
 
-    sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
 
     const-string v0, "https://support-dev.discordapp.com"
 
-    sput-object v0, Lcom/discord/app/e;->vb:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
 
     const-string v0, "https://discordapp.com/acknowledgements"
 
-    sput-object v0, Lcom/discord/app/e;->vc:Ljava/lang/String;
+    sput-object v0, Lcom/discord/app/e;->vb:Ljava/lang/String;
 
     const-wide/32 v0, 0xd1679fc
 
-    sput-wide v0, Lcom/discord/app/e;->vd:J
+    sput-wide v0, Lcom/discord/app/e;->vc:J
 
     const-wide v0, 0x53d1ea1c57L
 
-    sput-wide v0, Lcom/discord/app/e;->ve:J
+    sput-wide v0, Lcom/discord/app/e;->vd:J
 
     const-wide v0, 0x53d1e9852cL
 
-    sput-wide v0, Lcom/discord/app/e;->vf:J
+    sput-wide v0, Lcom/discord/app/e;->ve:J
 
     const-wide v0, 0x53d1eac657L
 
-    sput-wide v0, Lcom/discord/app/e;->vg:J
+    sput-wide v0, Lcom/discord/app/e;->vf:J
 
     const-wide v0, 0x53d28f5538L
 
-    sput-wide v0, Lcom/discord/app/e;->vh:J
+    sput-wide v0, Lcom/discord/app/e;->vg:J
 
     const-wide v0, 0x53d3623db8L
 
-    sput-wide v0, Lcom/discord/app/e;->vi:J
+    sput-wide v0, Lcom/discord/app/e;->vh:J
 
     const-wide v0, 0x53d357e4d0L
 
-    sput-wide v0, Lcom/discord/app/e;->vj:J
+    sput-wide v0, Lcom/discord/app/e;->vi:J
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    sget-object v1, Lcom/discord/app/e;->va:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/e;->uZ: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;->va:Ljava/lang/String;
+    sget-object v1, Lcom/discord/app/e;->uZ: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 89e7e621ab..c947abd553 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 vC:Lcom/discord/app/AppActivity;
+.field final synthetic vB: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;->vC:Lcom/discord/app/AppActivity;
+    iput-object p1, p0, Lcom/discord/app/f$a;->vB: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;->vC:Lcom/discord/app/AppActivity;
+    iget-object v0, p0, Lcom/discord/app/f$a;->vB: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 ccc871c30a..bf727e8898 100644
--- a/com.discord/smali/com/discord/app/f.smali
+++ b/com.discord/smali/com/discord/app/f.smali
@@ -4,7 +4,9 @@
 
 
 # static fields
-.field private static final vA:Ljava/util/List;
+.field public static final vA:Lcom/discord/app/f;
+
+.field private static final vw:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -16,8 +18,6 @@
     .end annotation
 .end field
 
-.field public static final vB:Lcom/discord/app/f;
-
 .field private static final vx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -36,7 +36,7 @@
             "Ljava/util/List<",
             "Lkotlin/reflect/b<",
             "+",
-            "Lcom/discord/app/AppFragment;",
+            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
             ">;>;"
         }
     .end annotation
@@ -48,7 +48,7 @@
             "Ljava/util/List<",
             "Lkotlin/reflect/b<",
             "+",
-            "Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;",
+            "Lcom/discord/app/AppFragment;",
             ">;>;"
         }
     .end annotation
@@ -63,7 +63,7 @@
 
     invoke-direct {v0}, Lcom/discord/app/f;-><init>()V
 
-    sput-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sput-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     const/4 v0, 0x6
 
@@ -133,7 +133,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/discord/app/f;->vx:Ljava/util/List;
+    sput-object v1, Lcom/discord/app/f;->vw:Ljava/util/List;
 
     const/16 v1, 0x21
 
@@ -459,7 +459,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/discord/app/f;->vy:Ljava/util/List;
+    sput-object v1, Lcom/discord/app/f;->vx:Ljava/util/List;
 
     new-array v0, v0, [Lkotlin/reflect/b;
 
@@ -515,7 +515,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/f;->vz:Ljava/util/List;
+    sput-object v0, Lcom/discord/app/f;->vy:Ljava/util/List;
 
     new-array v0, v5, [Lkotlin/reflect/b;
 
@@ -539,7 +539,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/f;->vA:Ljava/util/List;
+    sput-object v0, Lcom/discord/app/f;->vz:Ljava/util/List;
 
     return-void
 .end method
@@ -878,7 +878,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vx:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vw:Ljava/util/List;
 
     return-object v0
 .end method
@@ -896,7 +896,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vy:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vx:Ljava/util/List;
 
     return-object v0
 .end method
@@ -914,7 +914,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vz:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vy:Ljava/util/List;
 
     return-object v0
 .end method
@@ -932,7 +932,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/f;->vA:Ljava/util/List;
+    sget-object v0, Lcom/discord/app/f;->vz: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 9e88c0878c..862f2604ba 100644
--- a/com.discord/smali/com/discord/app/g$a.smali
+++ b/com.discord/smali/com/discord/app/g$a.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final vK:Lcom/discord/app/g$a;
+.field public static final vJ: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;->vK:Lcom/discord/app/g$a;
+    sput-object v0, Lcom/discord/app/g$a;->vJ: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 b8a21df186..ce801dea63 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 vH:Ljava/util/ArrayList;
+.field private static final vG:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final vI:Lrx/subjects/BehaviorSubject;
+.field private static final vH:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/subjects/BehaviorSubject<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public static final vJ:Lcom/discord/app/g;
+.field public static final vI: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;->vJ:Lcom/discord/app/g;
+    sput-object v0, Lcom/discord/app/g;->vI: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;->vH:Ljava/util/ArrayList;
+    sput-object v0, Lcom/discord/app/g;->vG:Ljava/util/ArrayList;
 
     const/4 v0, 0x0
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/app/g;->vI:Lrx/subjects/BehaviorSubject;
+    sput-object v0, Lcom/discord/app/g;->vH:Lrx/subjects/BehaviorSubject;
 
     return-void
 .end method
@@ -79,9 +79,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/g;->vI:Lrx/subjects/BehaviorSubject;
+    sget-object v0, Lcom/discord/app/g;->vH:Lrx/subjects/BehaviorSubject;
 
-    sget-object v1, Lcom/discord/app/g$a;->vK:Lcom/discord/app/g$a;
+    sget-object v1, Lcom/discord/app/g$a;->vJ:Lcom/discord/app/g$a;
 
     check-cast v1, Lrx/functions/b;
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -116,13 +116,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/g;->vH:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vG: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v1, "Gateway Connection consumer add "
 
@@ -140,9 +140,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;->vI:Lrx/subjects/BehaviorSubject;
+    sget-object p1, Lcom/discord/app/g;->vH:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lcom/discord/app/g;->vH:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vG:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -178,13 +178,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/g;->vH:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vG: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v1, "Gateway Connection consumer rm "
 
@@ -202,9 +202,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;->vI:Lrx/subjects/BehaviorSubject;
+    sget-object p1, Lcom/discord/app/g;->vH:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lcom/discord/app/g;->vH:Ljava/util/ArrayList;
+    sget-object v0, Lcom/discord/app/g;->vG: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 4ecbefb10c..b38788d196 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 vO:Lcom/discord/app/h;
+.field public static final vN: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;->vO:Lcom/discord/app/h;
+    sput-object v0, Lcom/discord/app/h;->vN:Lcom/discord/app/h;
 
     return-void
 .end method
@@ -244,7 +244,7 @@
 .method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;)V
     .locals 1
 
-    const v0, 0x7f12045b
+    const v0, 0x7f120480
 
     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, 0x7f12045b
+    const v0, 0x7f120480
 
     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 91b3dc1d95..91ed3cdfaa 100644
--- a/com.discord/smali/com/discord/app/i$a.smali
+++ b/com.discord/smali/com/discord/app/i$a.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final vQ:Lcom/discord/app/i$a;
+.field public static final vP: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;->vQ:Lcom/discord/app/i$a;
+    sput-object v0, Lcom/discord/app/i$a;->vP: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 7cc0a1e1c5..bfcf5122c2 100644
--- a/com.discord/smali/com/discord/app/i$b.smali
+++ b/com.discord/smali/com/discord/app/i$b.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final vR:Lcom/discord/app/i$b;
+.field public static final vQ: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;->vR:Lcom/discord/app/i$b;
+    sput-object v0, Lcom/discord/app/i$b;->vQ:Lcom/discord/app/i$b;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/app/i$c.smali b/com.discord/smali/com/discord/app/i$c.smali
index 9b6b2ac861..388214d317 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 vS:Lcom/discord/app/i$c;
+.field public static final vR: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;->vS:Lcom/discord/app/i$c;
+    sput-object v0, Lcom/discord/app/i$c;->vR:Lcom/discord/app/i$c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/app/i$d.smali b/com.discord/smali/com/discord/app/i$d.smali
index 14e3762c43..5a6fe75e70 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 vT:Lcom/discord/app/i$d;
+.field public static final vS: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;->vT:Lcom/discord/app/i$d;
+    sput-object v0, Lcom/discord/app/i$d;->vS: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 65586c7101..53d4e7c32e 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 vX:Ljava/util/Map;
+.field final synthetic vW: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;->vX:Ljava/util/Map;
+    iput-object p1, p0, Lcom/discord/app/i$e$1$1;->vW: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;->vX:Ljava/util/Map;
+    iget-object v0, p0, Lcom/discord/app/i$e$1$1;->vW: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 312bdbd4b8..1f63c94b5c 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 vY:Lcom/discord/app/i$e$1$2;
+.field public static final vX: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;->vY:Lcom/discord/app/i$e$1$2;
+    sput-object v0, Lcom/discord/app/i$e$1$2;->vX: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 dd0c9b0e4c..36ad8a261e 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 vX:Ljava/util/Map;
+.field final synthetic vW:Ljava/util/Map;
 
-.field final synthetic vZ:Lcom/discord/app/i$e$1;
+.field final synthetic vY: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;->vZ:Lcom/discord/app/i$e$1;
+    iput-object p1, p0, Lcom/discord/app/i$e$1$3;->vY:Lcom/discord/app/i$e$1;
 
-    iput-object p2, p0, Lcom/discord/app/i$e$1$3;->vX:Ljava/util/Map;
+    iput-object p2, p0, Lcom/discord/app/i$e$1$3;->vW: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;->vZ:Lcom/discord/app/i$e$1;
+    iget-object v0, p0, Lcom/discord/app/i$e$1$3;->vY:Lcom/discord/app/i$e$1;
 
-    iget-object v0, v0, Lcom/discord/app/i$e$1;->vW:Lcom/discord/app/i$e;
+    iget-object v0, v0, Lcom/discord/app/i$e$1;->vV:Lcom/discord/app/i$e;
 
-    iget-object v0, v0, Lcom/discord/app/i$e;->vV:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$e;->vU:Lkotlin/jvm/functions/Function1;
 
-    iget-object v1, p0, Lcom/discord/app/i$e$1$3;->vX:Ljava/util/Map;
+    iget-object v1, p0, Lcom/discord/app/i$e$1$3;->vW: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 e0db9a2cc0..a04ca42a30 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 vW:Lcom/discord/app/i$e;
+.field final synthetic vV: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;->vW:Lcom/discord/app/i$e;
+    iput-object p1, p0, Lcom/discord/app/i$e$1;->vV: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;->vW:Lcom/discord/app/i$e;
+    iget-object v0, p0, Lcom/discord/app/i$e$1;->vV:Lcom/discord/app/i$e;
 
-    iget-object v0, v0, Lcom/discord/app/i$e;->vU:Ljava/util/Collection;
+    iget-object v0, v0, Lcom/discord/app/i$e;->vT: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;->vY:Lcom/discord/app/i$e$1$2;
+    sget-object v1, Lcom/discord/app/i$e$1$2;->vX: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 d2f2a331b2..ba5f2c5a05 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 vU:Ljava/util/Collection;
+.field final synthetic vT:Ljava/util/Collection;
 
-.field final synthetic vV:Lkotlin/jvm/functions/Function1;
+.field final synthetic vU: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;->vU:Ljava/util/Collection;
+    iput-object p1, p0, Lcom/discord/app/i$e;->vT:Ljava/util/Collection;
 
-    iput-object p2, p0, Lcom/discord/app/i$e;->vV:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/app/i$e;->vU:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -69,7 +69,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 e03bd02bf4..c3b73fd937 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 wd:Lcom/discord/app/i$f;
+.field final synthetic wc: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;->wd:Lcom/discord/app/i$f;
+    iput-object p1, p0, Lcom/discord/app/i$f$1;->wc: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;->wd:Lcom/discord/app/i$f;
+    iget-object v0, p0, Lcom/discord/app/i$f$1;->wc:Lcom/discord/app/i$f;
 
-    iget-object v0, v0, Lcom/discord/app/i$f;->wa:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$f;->vZ: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;->wd:Lcom/discord/app/i$f;
+    iget-object p1, p0, Lcom/discord/app/i$f$1;->wc:Lcom/discord/app/i$f;
 
-    iget-object p1, p1, Lcom/discord/app/i$f;->wb:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/discord/app/i$f;->wa:Ljava/lang/Object;
 
     invoke-static {p1}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/app/i$f$1;->wd:Lcom/discord/app/i$f;
+    iget-object v0, p0, Lcom/discord/app/i$f$1;->wc: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;->wd:Lcom/discord/app/i$f;
+    iget-object v2, p0, Lcom/discord/app/i$f$1;->wc:Lcom/discord/app/i$f;
 
-    iget-object v2, v2, Lcom/discord/app/i$f;->wc:Ljava/util/concurrent/TimeUnit;
+    iget-object v2, v2, Lcom/discord/app/i$f;->wb: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 20c9deea34..e9ec68b94d 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 wa:Lkotlin/jvm/functions/Function1;
+.field final synthetic vZ:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic wb:Ljava/lang/Object;
+.field final synthetic wa:Ljava/lang/Object;
 
-.field final synthetic wc:Ljava/util/concurrent/TimeUnit;
+.field final synthetic wb: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;->wa:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/app/i$f;->vZ:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/discord/app/i$f;->wb:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/app/i$f;->wa:Ljava/lang/Object;
 
     iput-wide p3, p0, Lcom/discord/app/i$f;->$timeout:J
 
-    iput-object p5, p0, Lcom/discord/app/i$f;->wc:Ljava/util/concurrent/TimeUnit;
+    iput-object p5, p0, Lcom/discord/app/i$f;->wb: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 09b5854a34..76fcce1bc7 100644
--- a/com.discord/smali/com/discord/app/i$g.smali
+++ b/com.discord/smali/com/discord/app/i$g.smali
@@ -31,14 +31,14 @@
 
 
 # instance fields
-.field final synthetic we:Z
+.field final synthetic wd:Z
 
 
 # direct methods
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/discord/app/i$g;->we:Z
+    iput-boolean p1, p0, Lcom/discord/app/i$g;->wd:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,7 +56,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/discord/app/i$g;->we:Z
+    iget-boolean v0, p0, Lcom/discord/app/i$g;->wd: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 0975c1de67..3cf4f78533 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2b4e0a1659..9b40c33737 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 70290919ee..353fed5da4 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 wj:Lcom/discord/app/i$j$1;
+.field public static final wh: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;->wj:Lcom/discord/app/i$j$1;
+    sput-object v0, Lcom/discord/app/i$j$1;->wh: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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 46d938e902..a1a0dbcf01 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 wf:Ljava/lang/Class;
+.field final synthetic we:Ljava/lang/Class;
 
-.field final synthetic wg:Lkotlin/jvm/functions/Function1;
+.field final synthetic wf:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic wh:Lrx/functions/Action1;
-
-.field final synthetic wi:Lkotlin/jvm/functions/Function0;
+.field final synthetic wg: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;->wf:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/discord/app/i$j;->we:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/discord/app/i$j;->wg:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$j;->wf: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;->wh:Lrx/functions/Action1;
+    iput-object p5, p0, Lcom/discord/app/i$j;->wg:Lrx/functions/Action1;
 
-    iput-object p6, p0, Lcom/discord/app/i$j;->wi: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;->wf:Ljava/lang/Class;
+    iget-object p1, p0, Lcom/discord/app/i$j;->we:Ljava/lang/Class;
 
     invoke-virtual {p1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
 
@@ -90,17 +90,17 @@
 
     invoke-static {v2, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v3, p0, Lcom/discord/app/i$j;->wg:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p0, Lcom/discord/app/i$j;->wf: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;->wh:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/app/i$j;->wg:Lrx/functions/Action1;
 
     const/4 v7, 0x0
 
     if-eqz p1, :cond_0
 
-    sget-object v5, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v5, Lcom/discord/app/i;->vO: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;->wi: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;->wj:Lcom/discord/app/i$j$1;
+    sget-object p1, Lcom/discord/app/i$j$1;->wh: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 67ea49ba72..3a6f5c3586 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 wk:Lcom/discord/app/i$k$1;
+.field public static final wi: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;->wk:Lcom/discord/app/i$k$1;
+    sput-object v0, Lcom/discord/app/i$k$1;->wi: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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 064f905f81..912d70d528 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 wg:Lkotlin/jvm/functions/Function1;
-
-.field final synthetic wi:Lkotlin/jvm/functions/Function0;
+.field final synthetic wf: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;->wg:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$k;->wf: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;->wi: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;->wg:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p0, Lcom/discord/app/i$k;->wf: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;->wi: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;->wk:Lcom/discord/app/i$k$1;
+    sget-object p1, Lcom/discord/app/i$k$1;->wi: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 35f8b77d4b..56dc6e110c 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 wl:Lcom/discord/app/i$l;
+.field public static final wj: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;->wl:Lcom/discord/app/i$l;
+    sput-object v0, Lcom/discord/app/i$l;->wj: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 749110ef9d..b289bfc09e 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 wm:Lcom/discord/app/i$m;
+.field public static final wk: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;->wm:Lcom/discord/app/i$m;
+    sput-object v0, Lcom/discord/app/i$m;->wk: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6d917ea045..80888cbb43 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 50c50b4d1a..62fac82bb6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 172af058a6..ed10692c68 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 40d0928037..0eed74abc3 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 wq:Lcom/discord/app/i$q;
+.field final synthetic wo: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;->wq:Lcom/discord/app/i$q;
+    iput-object p1, p0, Lcom/discord/app/i$q$1;->wo: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;->wq:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->wo:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->wn:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->wl: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;->wq:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->wo:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->wo:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->wm: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;->wq:Lcom/discord/app/i$q;
+    iget-object v0, p0, Lcom/discord/app/i$q$1;->wo:Lcom/discord/app/i$q;
 
-    iget-object v0, v0, Lcom/discord/app/i$q;->wp:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/app/i$q;->wn: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 71901ee177..a50fcb8075 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 wl:Lkotlin/jvm/functions/Function1;
+
+.field final synthetic wm:Lkotlin/jvm/functions/Function1;
+
 .field final synthetic wn:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic wo:Lkotlin/jvm/functions/Function1;
-
-.field final synthetic wp: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;->wn:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/app/i$q;->wl:Lkotlin/jvm/functions/Function1;
 
-    iput-object p2, p0, Lcom/discord/app/i$q;->wo:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/app/i$q;->wm:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lcom/discord/app/i$q;->wp:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lcom/discord/app/i$q;->wn: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 e12884dfd9..cd6d02f333 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 wr:Lcom/discord/app/i$r;
+.field public static final wp: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;->wr:Lcom/discord/app/i$r;
+    sput-object v0, Lcom/discord/app/i$r;->wp: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 a474b6eac6..fe72dc315b 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 ws:J
+.field final synthetic wq:J
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     const-wide/16 p1, 0x1388
 
-    iput-wide p1, p0, Lcom/discord/app/i$u;->ws:J
+    iput-wide p1, p0, Lcom/discord/app/i$u;->wq:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,7 +60,7 @@
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/discord/app/i$u;->ws:J
+    iget-wide v1, p0, Lcom/discord/app/i$u;->wq: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 49b316c2eb..028695069a 100644
--- a/com.discord/smali/com/discord/app/i$v.smali
+++ b/com.discord/smali/com/discord/app/i$v.smali
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final wt:Lcom/discord/app/i$v;
+.field public static final wr: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;->wt:Lcom/discord/app/i$v;
+    sput-object v0, Lcom/discord/app/i$v;->wr:Lcom/discord/app/i$v;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 33d89e10c0..bb63e42871 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;->wu:Lcom/discord/utilities/dimmer/DimmerView;
+    iget-object v0, v0, Lcom/discord/app/i$x;->ws: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 68afcc8e0b..001f3b295d 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 wu:Lcom/discord/utilities/dimmer/DimmerView;
+.field final synthetic ws: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;->wu:Lcom/discord/utilities/dimmer/DimmerView;
+    iput-object p1, p0, Lcom/discord/app/i$x;->ws: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 4fca767c09..3ba7cd6497 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6b962d79d7..275fa80b53 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 vP:Lcom/discord/app/i;
+.field public static final vO: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;->vP:Lcom/discord/app/i;
+    sput-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     return-void
 .end method
@@ -134,7 +134,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$r;->wr:Lcom/discord/app/i$r;
+    sget-object v0, Lcom/discord/app/i$r;->wp:Lcom/discord/app/i$r;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -174,7 +174,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$c;->vS:Lcom/discord/app/i$c;
+    sget-object v0, Lcom/discord/app/i$c;->vR:Lcom/discord/app/i$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -233,7 +233,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/discord/app/i$d;->vT:Lcom/discord/app/i$d;
+    sget-object p0, Lcom/discord/app/i$d;->vS:Lcom/discord/app/i$d;
 
     check-cast p0, Lrx/Observable$c;
 
@@ -707,7 +707,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p1}, Lcom/discord/app/AppDialog;->getContext()Landroid/content/Context;
 
@@ -752,7 +752,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getContext()Landroid/content/Context;
 
@@ -942,7 +942,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$l;->wl:Lcom/discord/app/i$l;
+    sget-object v0, Lcom/discord/app/i$l;->wj:Lcom/discord/app/i$l;
 
     move-object v1, v0
 
@@ -1069,7 +1069,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/i$v;->wt:Lcom/discord/app/i$v;
+    sget-object v0, Lcom/discord/app/i$v;->wr:Lcom/discord/app/i$v;
 
     check-cast v0, Lrx/Observable$c;
 
@@ -1121,7 +1121,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/i$a;->vQ:Lcom/discord/app/i$a;
+    sget-object v0, Lcom/discord/app/i$a;->vP:Lcom/discord/app/i$a;
 
     check-cast v0, Lrx/Observable$c;
 
@@ -1140,7 +1140,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/app/i$b;->vR:Lcom/discord/app/i$b;
+    sget-object v0, Lcom/discord/app/i$b;->vQ:Lcom/discord/app/i$b;
 
     check-cast v0, Lrx/Observable$c;
 
@@ -1177,7 +1177,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/i$m;->wm:Lcom/discord/app/i$m;
+    sget-object v0, Lcom/discord/app/i$m;->wk:Lcom/discord/app/i$m;
 
     move-object v1, v0
 
diff --git a/com.discord/smali/com/discord/app/j$a.smali b/com.discord/smali/com/discord/app/j$a.smali
index 0500a5e3bc..55438bb83e 100644
--- a/com.discord/smali/com/discord/app/j$a.smali
+++ b/com.discord/smali/com/discord/app/j$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field final wA:I
+.field final ww:I
 
-.field final wB:I
+.field final wx:I
 
 .field final wy:I
 
@@ -30,13 +30,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/app/j$a;->wy:I
+    iput p1, p0, Lcom/discord/app/j$a;->ww:I
 
-    iput p2, p0, Lcom/discord/app/j$a;->wz:I
+    iput p2, p0, Lcom/discord/app/j$a;->wx:I
 
-    iput p3, p0, Lcom/discord/app/j$a;->wA:I
+    iput p3, p0, Lcom/discord/app/j$a;->wy:I
 
-    iput p4, p0, Lcom/discord/app/j$a;->wB:I
+    iput p4, p0, Lcom/discord/app/j$a;->wz: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 5b5f189883..0135c64475 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 wA:Lcom/discord/app/j$c;
+
+.field public static final enum wB:Lcom/discord/app/j$c;
+
 .field public static final enum wC:Lcom/discord/app/j$c;
 
 .field public static final enum wD:Lcom/discord/app/j$c;
@@ -33,11 +37,7 @@
 
 .field public static final enum wG:Lcom/discord/app/j$c;
 
-.field public static final enum wH:Lcom/discord/app/j$c;
-
-.field public static final enum wI:Lcom/discord/app/j$c;
-
-.field private static final synthetic wJ:[Lcom/discord/app/j$c;
+.field private static final synthetic wH:[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;->wC:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wA: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;->wD:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wB: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;->wE:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wC: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;->wF:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wD: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;->wG:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wE: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;->wH:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wF: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;->wI:Lcom/discord/app/j$c;
+    sput-object v1, Lcom/discord/app/j$c;->wG:Lcom/discord/app/j$c;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/app/j$c;->wJ:[Lcom/discord/app/j$c;
+    sput-object v0, Lcom/discord/app/j$c;->wH:[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;->wJ:[Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->wH:[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 0fc86ea16b..0fadd95546 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 ww:Z
+.field private static wu:Z
 
-.field public static final wx:Lcom/discord/app/j$b;
+.field public static final wv:Lcom/discord/app/j$b;
 
 
 # instance fields
-.field wv:Lcom/discord/app/j$a;
+.field wt: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;->wx:Lcom/discord/app/j$b;
+    sput-object v0, Lcom/discord/app/j;->wv: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;->wG:Lcom/discord/app/j$c;
+    sget-object v0, Lcom/discord/app/j$c;->wE: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;->wv:Lcom/discord/app/j$a;
+    iput-object v0, p0, Lcom/discord/app/j;->wt: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;->wv:Lcom/discord/app/j$a;
+    iget-object p1, p0, Lcom/discord/app/j;->wt:Lcom/discord/app/j$a;
 
     if-eqz p1, :cond_5
 
     if-eqz p2, :cond_3
 
-    iget v0, p1, Lcom/discord/app/j$a;->wy:I
+    iget v0, p1, Lcom/discord/app/j$a;->ww:I
 
     goto :goto_0
 
     :cond_3
-    iget v0, p1, Lcom/discord/app/j$a;->wA:I
+    iget v0, p1, Lcom/discord/app/j$a;->wy:I
 
     :goto_0
     if-eqz p2, :cond_4
 
-    iget p1, p1, Lcom/discord/app/j$a;->wz:I
+    iget p1, p1, Lcom/discord/app/j$a;->wx:I
 
     goto :goto_1
 
     :cond_4
-    iget p1, p1, Lcom/discord/app/j$a;->wB:I
+    iget p1, p1, Lcom/discord/app/j$a;->wz:I
 
     :goto_1
     invoke-virtual {p0, v0, p1}, Lcom/discord/app/j;->overridePendingTransition(II)V
@@ -103,7 +103,7 @@
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/discord/app/j;->ww:Z
+    sput-boolean v0, Lcom/discord/app/j;->wu:Z
 
     return-void
 .end method
@@ -117,7 +117,7 @@
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/discord/app/j;->ww:Z
+    sput-boolean v0, Lcom/discord/app/j;->wu: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;->ww:Z
+    sget-boolean v0, Lcom/discord/app/j;->wu: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;->ww:Z
+    sget-boolean v0, Lcom/discord/app/j;->wu:Z
 
     const/4 v1, 0x1
 
@@ -149,7 +149,7 @@
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/discord/app/j;->ww:Z
+    sput-boolean v0, Lcom/discord/app/j;->wu: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
index 6d1f4af44c..495722acdb 100644
--- a/com.discord/smali/com/discord/app/k.smali
+++ b/com.discord/smali/com/discord/app/k.smali
@@ -25,7 +25,7 @@
 
     invoke-direct {p0}, Landroidx/lifecycle/ViewModel;-><init>()V
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali
index f534829baf..4e7a29243f 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$PreviewType.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final enum xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
-
-.field public static final enum xo:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
-
 .field public static final enum xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-.field private static final synthetic xq:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+.field public static final enum xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field public static final enum xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+
+.field private static final synthetic xs:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
 
 # instance fields
@@ -54,7 +54,7 @@
 
     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;->xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     aput-object v1, v0, v2
 
@@ -68,7 +68,7 @@
 
     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;->xo:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     aput-object v1, v0, v2
 
@@ -82,11 +82,11 @@
 
     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;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xq:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xs:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     return-void
 .end method
@@ -123,7 +123,7 @@
 .method public static values()[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
     .locals 1
 
-    sget-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xq:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v0, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xs:[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     invoke-virtual {v0}, [Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali
index ec9faa098b..51abba269e 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$b.smali
@@ -20,14 +20,14 @@
 # instance fields
 .field final synthetic $mimeType:Ljava/lang/String;
 
-.field final synthetic xr:Lcom/discord/dialogs/ImageUploadDialog;
+.field final synthetic xt: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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     iput-object p2, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->$mimeType:Ljava/lang/String;
 
@@ -41,13 +41,13 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xt: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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-virtual {v0}, Lcom/discord/dialogs/ImageUploadDialog;->getUri()Landroid/net/Uri;
 
@@ -55,13 +55,13 @@
 
     iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->$mimeType:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
-    iget-object v2, v2, Lcom/discord/dialogs/ImageUploadDialog;->xk:Lrx/functions/Action1;
+    iget-object v2, v2, Lcom/discord/dialogs/ImageUploadDialog;->xm: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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$b;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
index 9b209d330e..ff60cbebfb 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xr:Lcom/discord/dialogs/ImageUploadDialog;
+.field final synthetic xt: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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +37,15 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xt: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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
-    iget-object v0, v0, Lcom/discord/dialogs/ImageUploadDialog;->xj:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+    iget-object v0, v0, Lcom/discord/dialogs/ImageUploadDialog;->xl:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
     if-nez v0, :cond_0
 
@@ -54,7 +54,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog;->getUri()Landroid/net/Uri;
 
@@ -62,7 +62,7 @@
 
     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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$c;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali
index c8e38163cc..419c3fe215 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xr:Lcom/discord/dialogs/ImageUploadDialog;
+.field final synthetic xt: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;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iput-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$d;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     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/dialogs/ImageUploadDialog$d;->xr:Lcom/discord/dialogs/ImageUploadDialog;
+    iget-object p1, p0, Lcom/discord/dialogs/ImageUploadDialog$d;->xt:Lcom/discord/dialogs/ImageUploadDialog;
 
     invoke-virtual {p1}, Lcom/discord/dialogs/ImageUploadDialog;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
index 706eb384a4..b167ba45fb 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
@@ -15,7 +15,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xm:Lcom/discord/dialogs/ImageUploadDialog$a;
+.field public static final xo:Lcom/discord/dialogs/ImageUploadDialog$a;
 
 
 # instance fields
@@ -27,13 +27,13 @@
 
 .field public uri:Landroid/net/Uri;
 
-.field private final xh:Lkotlin/properties/ReadOnlyProperty;
+.field private final xj:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xi:Lkotlin/properties/ReadOnlyProperty;
+.field private final xk:Lkotlin/properties/ReadOnlyProperty;
 
-.field public xj:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+.field public xl:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
 
-.field public xk:Lrx/functions/Action1;
+.field public xm:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field public xl:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+.field public xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
 
 # direct methods
@@ -150,7 +150,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/ImageUploadDialog$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog;->xm:Lcom/discord/dialogs/ImageUploadDialog$a;
+    sput-object v0, Lcom/discord/dialogs/ImageUploadDialog;->xo:Lcom/discord/dialogs/ImageUploadDialog$a;
 
     return-void
 .end method
@@ -160,23 +160,23 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a04a2
+    const v0, 0x7f0a04ac
 
     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;->xh:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xj:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a049d
+    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;->xi:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xk:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a049c
+    const v0, 0x7f0a04a6
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -184,7 +184,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a0
+    const v0, 0x7f0a04aa
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -195,10 +195,10 @@
     return-void
 .end method
 
-.method private final ed()Landroid/view/View;
+.method private final ee()Landroid/view/View;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xi:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->xk:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -240,7 +240,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d003a
+    const v0, 0x7f0d003c
 
     return v0
 .end method
@@ -273,7 +273,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/dialogs/ImageUploadDialog;->setRetainInstance(Z)V
 
-    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog;->xl:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    iget-object v1, p0, Lcom/discord/dialogs/ImageUploadDialog;->xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     iget-object v2, p0, Lcom/discord/dialogs/ImageUploadDialog;->mimeType:Ljava/lang/String;
 
@@ -290,7 +290,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/discord/dialogs/ImageUploadDialog;->xh:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v4, p0, Lcom/discord/dialogs/ImageUploadDialog;->xj:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -312,7 +312,7 @@
 
     invoke-virtual {v4, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->ed()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->ee()Landroid/view/View;
 
     move-result-object v2
 
@@ -324,7 +324,7 @@
 
     if-nez v3, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->ed()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/dialogs/ImageUploadDialog;->ee()Landroid/view/View;
 
     move-result-object v2
 
@@ -387,7 +387,7 @@
 
     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
+    sget-object v2, Lcom/discord/dialogs/c;->$EnumSwitchMapping$0:[I
 
     invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
 
@@ -410,7 +410,7 @@
 
     int-to-float v2, v8
 
-    const v3, 0x7f0402b3
+    const v3, 0x7f0402b4
 
     invoke-static {p1, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
diff --git a/com.discord/smali/com/discord/dialogs/a$a.smali b/com.discord/smali/com/discord/dialogs/a$a.smali
index 06e0a3b800..1757c4e43e 100644
--- a/com.discord/smali/com/discord/dialogs/a$a.smali
+++ b/com.discord/smali/com/discord/dialogs/a$a.smali
@@ -1,65 +1,32 @@
-.class final Lcom/discord/dialogs/a$a;
-.super Lkotlin/jvm/internal/m;
-.source "FriendRequestDialogs.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.class public final Lcom/discord/dialogs/a$a;
+.super Ljava/lang/Object;
+.source "ConnectedAccountActionsDialog.kt"
 
 
 # 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
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
+    accessFlags = 0x19
+    name = "a"
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "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
+.method private constructor <init>()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/m;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
+.method public synthetic constructor <init>(B)V
+    .locals 0
 
-# virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+    invoke-direct {p0}, Lcom/discord/dialogs/a$a;-><init>()V
 
-    check-cast p1, Landroid/view/View;
-
-    const-string v0, "view"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;->bgo:Lkotlin/Unit;
-
-    return-object p1
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a$b.smali b/com.discord/smali/com/discord/dialogs/a$b.smali
index 22c42765b1..312f089498 100644
--- a/com.discord/smali/com/discord/dialogs/a$b.smali
+++ b/com.discord/smali/com/discord/dialogs/a$b.smali
@@ -1,14 +1,14 @@
 .class final Lcom/discord/dialogs/a$b;
-.super Lkotlin/jvm/internal/m;
-.source "FriendRequestDialogs.kt"
+.super Ljava/lang/Object;
+.source "ConnectedAccountActionsDialog.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Landroid/view/View$OnClickListener;
 
 
 # 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
+    value = Lcom/discord/dialogs/a;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,50 +16,52 @@
     name = null
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Landroid/view/View;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
 
 # instance fields
-.field final synthetic $onIgnore:Lkotlin/jvm/functions/Function0;
+.field final synthetic $profileUrl:Ljava/lang/String;
+
+.field final synthetic xh:Lcom/discord/dialogs/a;
 
 
 # direct methods
-.method constructor <init>(Lkotlin/jvm/functions/Function0;)V
+.method constructor <init>(Lcom/discord/dialogs/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a$b;->$onIgnore:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/dialogs/a$b;->xh:Lcom/discord/dialogs/a;
 
-    const/4 p1, 0x1
+    iput-object p2, p0, Lcom/discord/dialogs/a$b;->$profileUrl:Ljava/lang/String;
 
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+.method public final onClick(Landroid/view/View;)V
+    .locals 3
 
-    check-cast p1, Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/dialogs/a$b;->xh:Lcom/discord/dialogs/a;
 
-    const-string v0, "view"
+    invoke-virtual {p1}, Lcom/discord/dialogs/a;->requireContext()Landroid/content/Context;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object p1
 
-    iget-object p1, p0, Lcom/discord/dialogs/a$b;->$onIgnore:Lkotlin/jvm/functions/Function0;
+    const-string v0, "requireContext()"
 
-    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    iget-object v0, p0, Lcom/discord/dialogs/a$b;->$profileUrl:Ljava/lang/String;
 
-    return-object p1
+    const/4 v1, 0x0
+
+    const/4 v2, 0x4
+
+    invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/a$b;->xh:Lcom/discord/dialogs/a;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/a;->dismiss()V
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a$c.smali b/com.discord/smali/com/discord/dialogs/a$c.smali
index 525cc8cc65..09d38c6750 100644
--- a/com.discord/smali/com/discord/dialogs/a$c.smali
+++ b/com.discord/smali/com/discord/dialogs/a$c.smali
@@ -1,14 +1,14 @@
 .class final Lcom/discord/dialogs/a$c;
-.super Lkotlin/jvm/internal/m;
-.source "FriendRequestDialogs.kt"
+.super Ljava/lang/Object;
+.source "ConnectedAccountActionsDialog.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Landroid/view/View$OnClickListener;
 
 
 # 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
+    value = Lcom/discord/dialogs/a;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,56 +16,56 @@
     name = null
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Landroid/view/View;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
 
 # instance fields
-.field final synthetic $onConfirm:Lkotlin/jvm/functions/Function1;
+.field final synthetic $username:Ljava/lang/String;
+
+.field final synthetic xh:Lcom/discord/dialogs/a;
 
 
 # direct methods
-.method constructor <init>(Lkotlin/jvm/functions/Function1;)V
+.method constructor <init>(Lcom/discord/dialogs/a;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/dialogs/a$c;->xh:Lcom/discord/dialogs/a;
 
-    const/4 p1, 0x1
+    iput-object p2, p0, Lcom/discord/dialogs/a$c;->$username:Ljava/lang/String;
 
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 1
+.method public final onClick(Landroid/view/View;)V
+    .locals 2
 
-    check-cast p1, Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/dialogs/a$c;->xh:Lcom/discord/dialogs/a;
 
-    const-string v0, "view"
+    invoke-virtual {p1}, Lcom/discord/dialogs/a;->requireContext()Landroid/content/Context;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object p1
 
-    iget-object p1, p0, Lcom/discord/dialogs/a$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
+    const-string v0, "requireContext()"
 
-    const v0, 0x7f1206b1
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/dialogs/a$c;->$username:Ljava/lang/String;
 
-    move-result-object v0
+    const-string v1, "username"
 
-    invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    check-cast v0, Ljava/lang/CharSequence;
 
-    return-object p1
+    const v1, 0x7f120480
+
+    invoke-static {p1, v0, v1}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/a$c;->xh:Lcom/discord/dialogs/a;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/a;->dismiss()V
+
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a.smali b/com.discord/smali/com/discord/dialogs/a.smali
index b523d6b2c6..8e2e7c42eb 100644
--- a/com.discord/smali/com/discord/dialogs/a.smali
+++ b/com.discord/smali/com/discord/dialogs/a.smali
@@ -1,299 +1,342 @@
 .class public final Lcom/discord/dialogs/a;
-.super Ljava/lang/Object;
-.source "FriendRequestDialogs.kt"
+.super Lcom/discord/app/AppDialog;
+.source "ConnectedAccountActionsDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/dialogs/a$a;
+    }
+.end annotation
 
 
 # static fields
-.field public static final xg:Lcom/discord/dialogs/a;
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final xg:Lcom/discord/dialogs/a$a;
+
+
+# instance fields
+.field private final dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final xe:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final xf:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 1
+    .locals 7
 
-    new-instance v0, Lcom/discord/dialogs/a;
+    const-class v0, Lcom/discord/dialogs/a;
 
-    invoke-direct {v0}, Lcom/discord/dialogs/a;-><init>()V
+    const/4 v1, 0x3
 
-    sput-object v0, Lcom/discord/dialogs/a;->xg:Lcom/discord/dialogs/a;
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
 
-    return-void
-.end method
+    new-instance v2, Lkotlin/jvm/internal/x;
 
-.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, "fragmentManager"
-
-    move-object/from16 v5, p0
-
-    invoke-static {v5, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v3, "context"
-
-    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v3, "onAccept"
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v3, "onIgnore"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
-
-    const v3, 0x7f1209c9
-
-    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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f1212bc
-
-    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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f1206af
-
-    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    const v3, 0x7f1206b2
-
-    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, 0x7f0a04a1
-
-    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
     move-result-object v3
 
-    new-instance v10, Lcom/discord/dialogs/a$a;
+    const-string v4, "dialogHeader"
 
-    invoke-direct {v10, v1}, Lcom/discord/dialogs/a$a;-><init>(Lkotlin/jvm/functions/Function0;)V
+    const-string v5, "getDialogHeader()Landroid/widget/TextView;"
 
-    invoke-static {v3, v10}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
-    move-result-object v1
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
 
     const/4 v3, 0x0
 
-    aput-object v1, v0, v3
+    aput-object v2, v1, v3
 
-    const v1, 0x7f0a049c
+    new-instance v2, Lkotlin/jvm/internal/x;
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
-    move-result-object v1
+    move-result-object v4
 
-    new-instance v3, Lcom/discord/dialogs/a$b;
+    const-string v5, "openInBrowserItem"
 
-    invoke-direct {v3, v2}, Lcom/discord/dialogs/a$b;-><init>(Lkotlin/jvm/functions/Function0;)V
+    const-string v6, "getOpenInBrowserItem()Landroid/widget/TextView;"
 
-    invoke-static {v1, v3}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
-    move-result-object v1
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v4, "copyUsernameItem"
+
+    const-string v5, "getCopyUsernameItem()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/dialogs/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/dialogs/a$a;
+
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/a$a;-><init>(B)V
+
+    sput-object v0, Lcom/discord/dialogs/a;->xg:Lcom/discord/dialogs/a$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a0223
+
+    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/a;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0224
+
+    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/a;->xe:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0222
+
+    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/a;->xf:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method private final ed()Landroid/widget/TextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/a;->xe:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     const/4 v2, 0x1
 
-    aput-object v1, v0, v2
+    aget-object v1, v1, v2
 
-    invoke-static {v0}, Lkotlin/a/ad;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    move-result-object v10
+    move-result-object v0
 
-    const/4 v11, 0x0
+    check-cast v0, Landroid/widget/TextView;
 
-    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
-
-    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
+    return-object v0
 .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
+.method private final getDialogHeader()Landroid/widget/TextView;
+    .locals 3
 
-    move-object/from16 v0, p1
+    iget-object v0, p0, Lcom/discord/dialogs/a;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    move-object/from16 v1, p3
+    sget-object v1, Lcom/discord/dialogs/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const-string v2, "user"
+    const/4 v2, 0x0
 
-    move-object/from16 v3, p0
+    aget-object v1, v1, v2
 
-    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    const-string v2, "context"
+    move-result-object v0
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    check-cast v0, Landroid/widget/TextView;
 
-    const-string v2, "fragmentManager"
+    return-object v0
+.end method
 
-    move-object/from16 v4, p2
 
-    invoke-static {v4, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
 
-    const-string v2, "onConfirm"
+    const v0, 0x7f0d0022
 
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    return v0
+.end method
 
-    sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 11
 
-    const v5, 0x7f120cf6
+    const-string v0, "view"
 
-    invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object v5
+    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const-string v6, "context.getString(R.stri\u2026.outgoing_friend_request)"
+    invoke-virtual {p0}, Lcom/discord/dialogs/a;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object p1
 
-    const/4 v6, 0x1
+    const-string v0, ""
 
-    new-array v6, v6, [Ljava/lang/Object;
+    const-string v1, "ARG_PROFILE_URL"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+    invoke-virtual {p1, v1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/a;->getArgumentsOrDefault()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    const-string v2, "ARG_USERNAME"
+
+    invoke-virtual {v1, v2, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/a;->getArgumentsOrDefault()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    const-string v3, "ARG_PLATFORM_IMAGE_RES"
+
+    invoke-virtual {v1, v3, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
+
+    move-result v5
+
+    if-eqz v5, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/dialogs/a;->getDialogHeader()Landroid/widget/TextView;
+
+    move-result-object v4
+
+    const/4 v6, 0x0
 
     const/4 v7, 0x0
 
-    aput-object v3, v6, v7
+    const/4 v8, 0x0
 
-    const v3, 0x7f120cf7
-
-    invoke-virtual {v0, v3, v6}, 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f1204e2
-
-    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v7
-
-    const v3, 0x7f12037b
-
-    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    const v0, 0x7f0a04a1
-
-    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;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lkotlin/a/ad;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
-
-    move-result-object v9
-
-    const v0, 0x7f040285
-
-    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v13
+    const/16 v9, 0xe
 
     const/4 v10, 0x0
 
-    const/4 v11, 0x0
+    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    const/4 v12, 0x0
+    :cond_0
+    invoke-direct {p0}, Lcom/discord/dialogs/a;->getDialogHeader()Landroid/widget/TextView;
 
-    const/4 v14, 0x0
+    move-result-object v1
 
-    const/4 v15, 0x0
+    move-object v3, v0
 
-    const/16 v16, 0xdc0
+    check-cast v3, Ljava/lang/CharSequence;
 
-    const/16 v17, 0x0
+    invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    move-object v3, v2
+    invoke-direct {p0}, Lcom/discord/dialogs/a;->ed()Landroid/widget/TextView;
 
-    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
+    move-result-object v1
+
+    check-cast v1, Landroid/view/View;
+
+    move-object v3, p1
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    const/4 v4, 0x1
+
+    if-eqz v3, :cond_2
+
+    invoke-interface {v3}, Ljava/lang/CharSequence;->length()I
+
+    move-result v3
+
+    if-nez 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
+    xor-int/2addr v3, v4
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x2
+
+    invoke-static {v1, v3, v2, v5, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/a;->ed()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/dialogs/a$b;
+
+    invoke-direct {v2, p0, p1}, Lcom/discord/dialogs/a$b;-><init>(Lcom/discord/dialogs/a;Ljava/lang/String;)V
+
+    check-cast v2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/a;->xf:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    aget-object v1, v1, v5
+
+    invoke-interface {p1, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/widget/TextView;
+
+    new-instance v1, Lcom/discord/dialogs/a$c;
+
+    invoke-direct {v1, p0, v0}, Lcom/discord/dialogs/a$c;-><init>(Lcom/discord/dialogs/a;Ljava/lang/String;)V
+
+    check-cast v1, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/a$b.smali b/com.discord/smali/com/discord/dialogs/a/a$b.smali
index 506097b5b4..8d2e9e4cc2 100644
--- a/com.discord/smali/com/discord/dialogs/a/a$b.smali
+++ b/com.discord/smali/com/discord/dialogs/a/a$b.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xN:Lcom/discord/dialogs/a/a;
+.field final synthetic xP:Lcom/discord/dialogs/a/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a/a$b;->xN:Lcom/discord/dialogs/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a$b;->xP:Lcom/discord/dialogs/a/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 13
 
-    iget-object p1, p0, Lcom/discord/dialogs/a/a$b;->xN:Lcom/discord/dialogs/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a/a$b;->xP:Lcom/discord/dialogs/a/a;
 
     invoke-static {p1}, Lcom/discord/dialogs/a/a;->a(Lcom/discord/dialogs/a/a;)Lcom/discord/dialogs/a/b;
 
diff --git a/com.discord/smali/com/discord/dialogs/a/a$c.smali b/com.discord/smali/com/discord/dialogs/a/a$c.smali
index 0b79123ce5..4f18212d2b 100644
--- a/com.discord/smali/com/discord/dialogs/a/a$c.smali
+++ b/com.discord/smali/com/discord/dialogs/a/a$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xN:Lcom/discord/dialogs/a/a;
+.field final synthetic xP:Lcom/discord/dialogs/a/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a/a$c;->xN:Lcom/discord/dialogs/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a$c;->xP:Lcom/discord/dialogs/a/a;
 
     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/dialogs/a/a$c;->xN:Lcom/discord/dialogs/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a/a$c;->xP:Lcom/discord/dialogs/a/a;
 
     invoke-static {p1}, Lcom/discord/dialogs/a/a;->a(Lcom/discord/dialogs/a/a;)Lcom/discord/dialogs/a/b;
 
     move-result-object p1
 
-    const v0, 0x7f1212b2
+    const v0, 0x7f12133a
 
     invoke-virtual {p1, v0}, Lcom/discord/dialogs/a/b;->removeRelationship(I)V
 
diff --git a/com.discord/smali/com/discord/dialogs/a/a$d.smali b/com.discord/smali/com/discord/dialogs/a/a$d.smali
index 3e4c2497a5..75e2ff9ec8 100644
--- a/com.discord/smali/com/discord/dialogs/a/a$d.smali
+++ b/com.discord/smali/com/discord/dialogs/a/a$d.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xN:Lcom/discord/dialogs/a/a;
+.field final synthetic xP:Lcom/discord/dialogs/a/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a/a$d;->xN:Lcom/discord/dialogs/a/a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a$d;->xP:Lcom/discord/dialogs/a/a;
 
     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/dialogs/a/a$d;->xN:Lcom/discord/dialogs/a/a;
+    iget-object p1, p0, Lcom/discord/dialogs/a/a$d;->xP:Lcom/discord/dialogs/a/a;
 
     invoke-static {p1}, Lcom/discord/dialogs/a/a;->a(Lcom/discord/dialogs/a/a;)Lcom/discord/dialogs/a/b;
 
     move-result-object p1
 
-    const v0, 0x7f1206aa
+    const v0, 0x7f1206ce
 
     invoke-virtual {p1, v0}, Lcom/discord/dialogs/a/b;->removeRelationship(I)V
 
diff --git a/com.discord/smali/com/discord/dialogs/a/a$e.smali b/com.discord/smali/com/discord/dialogs/a/a$e.smali
index 978387dd62..657bf140ea 100644
--- a/com.discord/smali/com/discord/dialogs/a/a$e.smali
+++ b/com.discord/smali/com/discord/dialogs/a/a$e.smali
@@ -83,7 +83,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/dialogs/a/a;->a(Lcom/discord/dialogs/a/a;Lcom/discord/dialogs/a/b$d;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/a$f.smali b/com.discord/smali/com/discord/dialogs/a/a$f.smali
index fc810f7037..194ed245e7 100644
--- a/com.discord/smali/com/discord/dialogs/a/a$f.smali
+++ b/com.discord/smali/com/discord/dialogs/a/a$f.smali
@@ -83,7 +83,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/dialogs/a/a;->a(Lcom/discord/dialogs/a/a;Lcom/discord/dialogs/a/b$a;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/a.smali b/com.discord/smali/com/discord/dialogs/a/a.smali
index 7c36ff9df3..13227b950a 100644
--- a/com.discord/smali/com/discord/dialogs/a/a.smali
+++ b/com.discord/smali/com/discord/dialogs/a/a.smali
@@ -14,7 +14,7 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xM:Lcom/discord/dialogs/a/a$a;
+.field public static final xO:Lcom/discord/dialogs/a/a$a;
 
 
 # instance fields
@@ -24,13 +24,13 @@
 
 .field private final userName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xI:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final xJ:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final xK:Lkotlin/properties/ReadOnlyProperty;
 
-.field private xL:Lcom/discord/dialogs/a/b;
+.field private final xL:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final xM:Lkotlin/properties/ReadOnlyProperty;
+
+.field private xN:Lcom/discord/dialogs/a/b;
 
 
 # direct methods
@@ -159,7 +159,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/a/a$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/a/a;->xM:Lcom/discord/dialogs/a/a$a;
+    sput-object v0, Lcom/discord/dialogs/a/a;->xO:Lcom/discord/dialogs/a/a$a;
 
     return-void
 .end method
@@ -169,7 +169,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0782
+    const v0, 0x7f0a07a6
 
     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/dialogs/a/a;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0786
+    const v0, 0x7f0a07aa
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -185,23 +185,7 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/a/a;->userName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0783
-
-    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/a/a;->xI:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0785
-
-    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/a/a;->xJ:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0784
+    const v0, 0x7f0a07a7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,6 +193,22 @@
 
     iput-object v0, p0, Lcom/discord/dialogs/a/a;->xK:Lkotlin/properties/ReadOnlyProperty;
 
+    const v0, 0x7f0a07a9
+
+    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/a/a;->xL:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07a8
+
+    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/a/a;->xM:Lkotlin/properties/ReadOnlyProperty;
+
     new-instance v0, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;
 
     invoke-direct {v0}, Lcom/discord/utilities/images/MGImages$DistinctChangeDetector;-><init>()V
@@ -221,7 +221,7 @@
 .method public static final synthetic a(Lcom/discord/dialogs/a/a;)Lcom/discord/dialogs/a/b;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/dialogs/a/a;->xL:Lcom/discord/dialogs/a/b;
+    iget-object p0, p0, Lcom/discord/dialogs/a/a;->xN:Lcom/discord/dialogs/a/b;
 
     if-nez p0, :cond_0
 
@@ -246,7 +246,7 @@
 
     check-cast p1, Lcom/discord/dialogs/a/b$a$b;
 
-    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xP:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xR:I
 
     invoke-static {v0, p1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -263,7 +263,7 @@
 
     check-cast p1, Lcom/discord/dialogs/a/b$a$a;
 
-    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xO:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xQ:I
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -338,13 +338,13 @@
 
     invoke-static {v5, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0402a1
+    const v6, 0x7f0402a2
 
     const v7, 0x7f090003
 
     const v8, 0x7f0b0012
 
-    const v9, 0x7f0402aa
+    const v9, 0x7f0402ab
 
     const v10, 0x7f090002
 
@@ -358,13 +358,13 @@
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->el()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->em()Landroid/widget/TextView;
 
     move-result-object v0
 
     check-cast v0, Landroid/view/View;
 
-    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xU:Z
+    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xW:Z
 
     const/4 v3, 0x0
 
@@ -372,33 +372,33 @@
 
     invoke-static {v0, v1, v2, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->em()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->en()Landroid/widget/TextView;
 
     move-result-object v0
 
     check-cast v0, Landroid/view/View;
 
-    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xV:Z
+    iget-boolean v1, p1, Lcom/discord/dialogs/a/b$d;->xX:Z
 
     invoke-static {v0, v1, v2, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->en()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->eo()Landroid/widget/TextView;
 
     move-result-object p0
 
     check-cast p0, Landroid/view/View;
 
-    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->xY:Z
 
     invoke-static {p0, p1, v2, v4, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
     return-void
 .end method
 
-.method private final el()Landroid/widget/TextView;
+.method private final em()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xI:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xK:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -415,10 +415,10 @@
     return-object v0
 .end method
 
-.method private final em()Landroid/widget/TextView;
+.method private final en()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xJ:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xL:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -435,10 +435,10 @@
     return-object v0
 .end method
 
-.method private final en()Landroid/widget/TextView;
+.method private final eo()Landroid/widget/TextView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xK:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xM:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/a/a;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -460,7 +460,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0068
+    const v0, 0x7f0d006b
 
     return v0
 .end method
@@ -518,7 +518,7 @@
 
     check-cast p1, Lcom/discord/dialogs/a/b;
 
-    iput-object p1, p0, Lcom/discord/dialogs/a/a;->xL:Lcom/discord/dialogs/a/b;
+    iput-object p1, p0, Lcom/discord/dialogs/a/a;->xN:Lcom/discord/dialogs/a/b;
 
     return-void
 .end method
@@ -532,7 +532,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->el()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->em()Landroid/widget/TextView;
 
     move-result-object p1
 
@@ -544,7 +544,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->em()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->en()Landroid/widget/TextView;
 
     move-result-object p1
 
@@ -556,7 +556,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->en()Landroid/widget/TextView;
+    invoke-direct {p0}, Lcom/discord/dialogs/a/a;->eo()Landroid/widget/TextView;
 
     move-result-object p1
 
@@ -576,7 +576,7 @@
 
     invoke-super {p0}, Lcom/discord/app/AppDialog;->onViewBoundOrOnResume()V
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xL:Lcom/discord/dialogs/a/b;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xN:Lcom/discord/dialogs/a/b;
 
     const-string v1, "viewModel"
 
@@ -635,7 +635,7 @@
 
     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/dialogs/a/a;->xL:Lcom/discord/dialogs/a/b;
+    iget-object v0, p0, Lcom/discord/dialogs/a/a;->xN:Lcom/discord/dialogs/a/b;
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$1.smali b/com.discord/smali/com/discord/dialogs/a/b$1.smali
index 14353b35a0..b25ce0a986 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$1.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$1.smali
@@ -83,7 +83,7 @@
 
     invoke-static {v0, p1}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;Lcom/discord/dialogs/a/b$c;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/b$a$a.smali b/com.discord/smali/com/discord/dialogs/a/b$a$a.smali
index 3c702903fc..8111ba6864 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$a$a.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$a$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final xO:I
+.field final xQ:I
 
 
 # direct methods
@@ -26,9 +26,9 @@
 
     invoke-direct {p0, v0}, Lcom/discord/dialogs/a/b$a;-><init>(B)V
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
-    iput v0, p0, Lcom/discord/dialogs/a/b$a$a;->xO:I
+    iput v0, p0, Lcom/discord/dialogs/a/b$a$a;->xQ:I
 
     return-void
 .end method
@@ -50,9 +50,9 @@
 
     check-cast p1, Lcom/discord/dialogs/a/b$a$a;
 
-    iget v1, p0, Lcom/discord/dialogs/a/b$a$a;->xO:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$a;->xQ:I
 
-    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xO:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$a;->xQ:I
 
     if-ne v1, p1, :cond_0
 
@@ -79,7 +79,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/dialogs/a/b$a$a;->xO:I
+    iget v0, p0, Lcom/discord/dialogs/a/b$a$a;->xQ:I
 
     invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/dialogs/a/b$a$a;->xO:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$a;->xQ:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$a$b.smali b/com.discord/smali/com/discord/dialogs/a/b$a$b.smali
index e42b21283e..b314dd6561 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$a$b.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$a$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final xP:I
+.field final xR:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0, v0}, Lcom/discord/dialogs/a/b$a;-><init>(B)V
 
-    iput p1, p0, Lcom/discord/dialogs/a/b$a$b;->xP:I
+    iput p1, p0, Lcom/discord/dialogs/a/b$a$b;->xR:I
 
     return-void
 .end method
@@ -48,9 +48,9 @@
 
     check-cast p1, Lcom/discord/dialogs/a/b$a$b;
 
-    iget v1, p0, Lcom/discord/dialogs/a/b$a$b;->xP:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$b;->xR:I
 
-    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xP:I
+    iget p1, p1, Lcom/discord/dialogs/a/b$a$b;->xR:I
 
     if-ne v1, p1, :cond_0
 
@@ -77,7 +77,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/dialogs/a/b$a$b;->xP:I
+    iget v0, p0, Lcom/discord/dialogs/a/b$a$b;->xR:I
 
     invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -95,7 +95,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/dialogs/a/b$a$b;->xP:I
+    iget v1, p0, Lcom/discord/dialogs/a/b$a$b;->xR:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$b$a$a.smali b/com.discord/smali/com/discord/dialogs/a/b$b$a$a.smali
index 79010167ba..ca7b189d82 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$b$a$a.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$b$a$a.smali
@@ -33,14 +33,14 @@
 # instance fields
 .field final synthetic $channel$inlined:Lcom/discord/models/domain/ModelChannel;
 
-.field final synthetic xR:Lcom/discord/dialogs/a/b$b$a;
+.field final synthetic xT:Lcom/discord/dialogs/a/b$b$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a/b$b$a;Lcom/discord/models/domain/ModelChannel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a/b$b$a$a;->xR:Lcom/discord/dialogs/a/b$b$a;
+    iput-object p1, p0, Lcom/discord/dialogs/a/b$b$a$a;->xT:Lcom/discord/dialogs/a/b$b$a;
 
     iput-object p2, p0, Lcom/discord/dialogs/a/b$b$a$a;->$channel$inlined:Lcom/discord/models/domain/ModelChannel;
 
@@ -56,9 +56,9 @@
 
     check-cast p1, Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/discord/dialogs/a/b$b$a$a;->xR:Lcom/discord/dialogs/a/b$b$a;
+    iget-object v0, p0, Lcom/discord/dialogs/a/b$b$a$a;->xT:Lcom/discord/dialogs/a/b$b$a;
 
-    iget-object v0, v0, Lcom/discord/dialogs/a/b$b$a;->xQ:Lcom/discord/dialogs/a/b$b;
+    iget-object v0, v0, Lcom/discord/dialogs/a/b$b$a;->xS:Lcom/discord/dialogs/a/b$b;
 
     iget-wide v0, v0, Lcom/discord/dialogs/a/b$b;->userId:J
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$b$a.smali b/com.discord/smali/com/discord/dialogs/a/b$b$a.smali
index 6a438e1c8b..4902bd7c24 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$b$a.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$b$a.smali
@@ -35,14 +35,14 @@
 # instance fields
 .field final synthetic $storeGuilds:Lcom/discord/stores/StoreGuilds;
 
-.field final synthetic xQ:Lcom/discord/dialogs/a/b$b;
+.field final synthetic xS:Lcom/discord/dialogs/a/b$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/discord/dialogs/a/b$b;Lcom/discord/stores/StoreGuilds;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/a/b$b$a;->xQ:Lcom/discord/dialogs/a/b$b;
+    iput-object p1, p0, Lcom/discord/dialogs/a/b$b$a;->xS:Lcom/discord/dialogs/a/b$b;
 
     iput-object p2, p0, Lcom/discord/dialogs/a/b$b$a;->$storeGuilds:Lcom/discord/stores/StoreGuilds;
 
@@ -74,7 +74,7 @@
 
     move-result-wide v1
 
-    iget-object v3, p0, Lcom/discord/dialogs/a/b$b$a;->xQ:Lcom/discord/dialogs/a/b$b;
+    iget-object v3, p0, Lcom/discord/dialogs/a/b$b$a;->xS:Lcom/discord/dialogs/a/b$b;
 
     iget-wide v3, v3, Lcom/discord/dialogs/a/b$b;->userId:J
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$b$b.smali b/com.discord/smali/com/discord/dialogs/a/b$b$b.smali
index 0b3d93b707..0ba1408893 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$b$b.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$b$b.smali
@@ -35,7 +35,7 @@
 
 
 # static fields
-.field public static final xS:Lcom/discord/dialogs/a/b$b$b;
+.field public static final xU:Lcom/discord/dialogs/a/b$b$b;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     invoke-direct {v0}, Lcom/discord/dialogs/a/b$b$b;-><init>()V
 
-    sput-object v0, Lcom/discord/dialogs/a/b$b$b;->xS:Lcom/discord/dialogs/a/b$b$b;
+    sput-object v0, Lcom/discord/dialogs/a/b$b$b;->xU:Lcom/discord/dialogs/a/b$b$b;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/b$b.smali b/com.discord/smali/com/discord/dialogs/a/b$b.smali
index 552891ec99..152749101c 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$b.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$b.smali
@@ -114,7 +114,7 @@
 
     move-result-object v4
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v5
 
@@ -126,7 +126,7 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v5, Lcom/discord/dialogs/a/b$b$b;->xS:Lcom/discord/dialogs/a/b$b$b;
+    sget-object v5, Lcom/discord/dialogs/a/b$b$b;->xU:Lcom/discord/dialogs/a/b$b$b;
 
     check-cast v5, Lrx/functions/Func3;
 
@@ -134,7 +134,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$c.smali b/com.discord/smali/com/discord/dialogs/a/b$c.smali
index da7a538040..92971adbc9 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$c.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$c.smali
@@ -19,7 +19,7 @@
 
 .field final userRelationshipType:Ljava/lang/Integer;
 
-.field final xT:Lcom/discord/models/domain/ModelGuildMember$Computed;
+.field final xV:Lcom/discord/models/domain/ModelGuildMember$Computed;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     iput-object p2, p0, Lcom/discord/dialogs/a/b$c;->userRelationshipType:Ljava/lang/Integer;
 
-    iput-object p3, p0, Lcom/discord/dialogs/a/b$c;->xT:Lcom/discord/models/domain/ModelGuildMember$Computed;
+    iput-object p3, p0, Lcom/discord/dialogs/a/b$c;->xV:Lcom/discord/models/domain/ModelGuildMember$Computed;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/b$d.smali b/com.discord/smali/com/discord/dialogs/a/b$d.smali
index 72a5ca0880..548523aded 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$d.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$d.smali
@@ -19,12 +19,12 @@
 
 .field final userNickname:Ljava/lang/String;
 
-.field final xU:Z
-
-.field final xV:Z
-
 .field final xW:Z
 
+.field final xX:Z
+
+.field final xY:Z
+
 
 # direct methods
 .method public constructor <init>(Lcom/discord/models/domain/ModelUser;Ljava/lang/String;ZZZ)V
@@ -40,11 +40,11 @@
 
     iput-object p2, p0, Lcom/discord/dialogs/a/b$d;->userNickname:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/discord/dialogs/a/b$d;->xU:Z
+    iput-boolean p3, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
 
-    iput-boolean p4, p0, Lcom/discord/dialogs/a/b$d;->xV:Z
+    iput-boolean p4, p0, Lcom/discord/dialogs/a/b$d;->xX:Z
 
-    iput-boolean p5, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iput-boolean p5, p0, Lcom/discord/dialogs/a/b$d;->xY:Z
 
     return-void
 .end method
@@ -86,9 +86,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xU:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
 
-    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xU:Z
+    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xW:Z
 
     if-ne v1, v3, :cond_0
 
@@ -102,9 +102,9 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xV:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xX:Z
 
-    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xV:Z
+    iget-boolean v3, p1, Lcom/discord/dialogs/a/b$d;->xX:Z
 
     if-ne v1, v3, :cond_1
 
@@ -118,9 +118,9 @@
     :goto_1
     if-eqz v1, :cond_3
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xY:Z
 
-    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean p1, p1, Lcom/discord/dialogs/a/b$d;->xY:Z
 
     if-ne v1, p1, :cond_2
 
@@ -178,7 +178,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xU:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
 
     const/4 v2, 0x1
 
@@ -191,7 +191,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xV:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xX:Z
 
     if-eqz v1, :cond_3
 
@@ -202,7 +202,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xY:Z
 
     if-eqz v1, :cond_4
 
@@ -239,7 +239,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xU:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -247,7 +247,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xV:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xX:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -255,7 +255,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xW:Z
+    iget-boolean v1, p0, Lcom/discord/dialogs/a/b$d;->xY:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/dialogs/a/b$e.smali b/com.discord/smali/com/discord/dialogs/a/b$e.smali
index 725224c8d4..2b6a7b7475 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$e.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$e.smali
@@ -51,11 +51,11 @@
 
     iget-object p1, p0, Lcom/discord/dialogs/a/b$e;->this$0:Lcom/discord/dialogs/a/b;
 
-    const v0, 0x7f1212b1
+    const v0, 0x7f121339
 
     invoke-static {p1, v0}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;I)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/b$f.smali b/com.discord/smali/com/discord/dialogs/a/b$f.smali
index 4d480cc883..5dc2fee647 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$f.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$f.smali
@@ -59,7 +59,7 @@
 
     invoke-static {p1}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/b$g.smali b/com.discord/smali/com/discord/dialogs/a/b$g.smali
index 6fb75b7796..f5589c8f82 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$g.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$g.smali
@@ -59,7 +59,7 @@
 
     invoke-static {p1, v0}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;I)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/a/b$h.smali b/com.discord/smali/com/discord/dialogs/a/b$h.smali
index 94d5f7f64b..14a08e6119 100644
--- a/com.discord/smali/com/discord/dialogs/a/b$h.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b$h.smali
@@ -59,7 +59,7 @@
 
     invoke-static {p1}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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
index e7283e3e65..458d9e603a 100644
--- a/com.discord/smali/com/discord/dialogs/a/b.smali
+++ b/com.discord/smali/com/discord/dialogs/a/b.smali
@@ -67,13 +67,13 @@
 
     iput-object p3, p0, Lcom/discord/dialogs/a/b;->restAPI:Lcom/discord/utilities/rest/RestAPI;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
     iput-object p1, p0, Lcom/discord/dialogs/a/b;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -83,7 +83,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -213,7 +213,7 @@
     const/4 v9, 0x0
 
     :goto_2
-    iget-object v0, p1, Lcom/discord/dialogs/a/b$c;->xT:Lcom/discord/models/domain/ModelGuildMember$Computed;
+    iget-object v0, p1, Lcom/discord/dialogs/a/b$c;->xV:Lcom/discord/models/domain/ModelGuildMember$Computed;
 
     if-eqz v0, :cond_3
 
diff --git a/com.discord/smali/com/discord/dialogs/b$a.smali b/com.discord/smali/com/discord/dialogs/b$a.smali
new file mode 100644
index 0000000000..2792581005
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/b$a.smali
@@ -0,0 +1,65 @@
+.class final Lcom/discord/dialogs/b$a;
+.super Lkotlin/jvm/internal/m;
+.source "FriendRequestDialogs.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/b;->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/m;",
+        "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/b$a;->$onAccept:Lkotlin/jvm/functions/Function0;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/b$a;->$onAccept:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/b$b.smali b/com.discord/smali/com/discord/dialogs/b$b.smali
new file mode 100644
index 0000000000..2e852bd09b
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/b$b.smali
@@ -0,0 +1,65 @@
+.class final Lcom/discord/dialogs/b$b;
+.super Lkotlin/jvm/internal/m;
+.source "FriendRequestDialogs.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/b;->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/m;",
+        "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/b$b;->$onIgnore:Lkotlin/jvm/functions/Function0;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/b$b;->$onIgnore:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/b$c.smali b/com.discord/smali/com/discord/dialogs/b$c.smali
new file mode 100644
index 0000000000..d25092a614
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/b$c.smali
@@ -0,0 +1,71 @@
+.class final Lcom/discord/dialogs/b$c;
+.super Lkotlin/jvm/internal/m;
+.source "FriendRequestDialogs.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/b;->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/m;",
+        "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/b$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/b$c;->$onConfirm:Lkotlin/jvm/functions/Function1;
+
+    const v0, 0x7f1206d5
+
+    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;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/b.smali b/com.discord/smali/com/discord/dialogs/b.smali
index c98a5c7f17..c569d68699 100644
--- a/com.discord/smali/com/discord/dialogs/b.smali
+++ b/com.discord/smali/com/discord/dialogs/b.smali
@@ -1,46 +1,299 @@
-.class public final synthetic Lcom/discord/dialogs/b;
+.class public final Lcom/discord/dialogs/b;
 .super Ljava/lang/Object;
+.source "FriendRequestDialogs.kt"
 
 
 # static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
+.field public static final xi:Lcom/discord/dialogs/b;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 3
+.method static constructor <clinit>()V
+    .locals 1
 
-    invoke-static {}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->values()[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    new-instance v0, Lcom/discord/dialogs/b;
 
-    move-result-object v0
+    invoke-direct {v0}, Lcom/discord/dialogs/b;-><init>()V
 
-    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;->xo: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;->xp: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
+    sput-object v0, Lcom/discord/dialogs/b;->xi:Lcom/discord/dialogs/b;
+
+    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, "fragmentManager"
+
+    move-object/from16 v5, p0
+
+    invoke-static {v5, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "context"
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "onAccept"
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v3, "onIgnore"
+
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+
+    const v3, 0x7f1209fe
+
+    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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f121344
+
+    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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f1206d3
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    const v3, 0x7f1206d6
+
+    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, 0x7f0a04ab
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    new-instance v10, Lcom/discord/dialogs/b$a;
+
+    invoke-direct {v10, v1}, Lcom/discord/dialogs/b$a;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-static {v3, v10}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v1
+
+    const/4 v3, 0x0
+
+    aput-object v1, v0, v3
+
+    const v1, 0x7f0a04a6
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    new-instance v3, Lcom/discord/dialogs/b$b;
+
+    invoke-direct {v3, v2}, Lcom/discord/dialogs/b$b;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    invoke-static {v1, v3}, Lkotlin/q;->to(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;->mapOf([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
+
+    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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "context"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    move-object/from16 v4, p2
+
+    invoke-static {v4, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "onConfirm"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v2, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
+
+    const v5, 0x7f120d28
+
+    invoke-virtual {v0, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "context.getString(R.stri\u2026.outgoing_friend_request)"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v6, 0x1
+
+    new-array v6, v6, [Ljava/lang/Object;
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v7, 0x0
+
+    aput-object v3, v6, v7
+
+    const v3, 0x7f120d29
+
+    invoke-virtual {v0, v3, v6}, 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v3, 0x7f120507
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v7
+
+    const v3, 0x7f1203a0
+
+    invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    const v0, 0x7f0a04ab
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    new-instance v3, Lcom/discord/dialogs/b$c;
+
+    invoke-direct {v3, v1}, Lcom/discord/dialogs/b$c;-><init>(Lkotlin/jvm/functions/Function1;)V
+
+    invoke-static {v0, v3}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lkotlin/a/ad;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
+
+    move-result-object v9
+
+    const v0, 0x7f040286
+
+    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
+
+    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/c$a.smali b/com.discord/smali/com/discord/dialogs/c$a.smali
deleted file mode 100644
index 630fd88e0d..0000000000
--- a/com.discord/smali/com/discord/dialogs/c$a.smali
+++ /dev/null
@@ -1,172 +0,0 @@
-.class public final Lcom/discord/dialogs/c$a;
-.super Ljava/lang/Object;
-.source "PremiumUpsellDialog.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/c;
-.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/c$a;-><init>()V
-
-    return-void
-.end method
-
-.method public static synthetic a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
-    .locals 11
-
-    move/from16 v0, p7
-
-    and-int/lit8 v1, v0, 0x4
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_0
-
-    move-object v5, v2
-
-    goto :goto_0
-
-    :cond_0
-    move-object v5, p2
-
-    :goto_0
-    and-int/lit8 v1, v0, 0x10
-
-    if-eqz v1, :cond_1
-
-    move-object v7, v2
-
-    goto :goto_1
-
-    :cond_1
-    move-object v7, p3
-
-    :goto_1
-    and-int/lit8 v1, v0, 0x20
-
-    if-eqz v1, :cond_2
-
-    move-object v8, v2
-
-    goto :goto_2
-
-    :cond_2
-    move-object v8, p4
-
-    :goto_2
-    and-int/lit8 v1, v0, 0x40
-
-    if-eqz v1, :cond_3
-
-    move-object v9, v2
-
-    goto :goto_3
-
-    :cond_3
-    move-object/from16 v9, p5
-
-    :goto_3
-    and-int/lit16 v0, v0, 0x80
-
-    if-eqz v0, :cond_4
-
-    move-object v10, v2
-
-    goto :goto_4
-
-    :cond_4
-    move-object/from16 v10, p6
-
-    :goto_4
-    const/4 v6, 0x0
-
-    move-object v3, p0
-
-    move v4, p1
-
-    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
-
-.method public static a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 3
-
-    const-string v0, "fragmentManager"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/dialogs/c;
-
-    invoke-direct {v0}, Lcom/discord/dialogs/c;-><init>()V
-
-    new-instance v1, Landroid/os/Bundle;
-
-    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
-
-    const-string v2, "extra_page_number"
-
-    invoke-virtual {v1, v2, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
-
-    if-eqz p2, :cond_0
-
-    const-string p1, "extra_header_string"
-
-    invoke-virtual {v1, p1, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_0
-    if-eqz p3, :cond_1
-
-    const-string p1, "extra_body_text"
-
-    invoke-virtual {v1, p1, p3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    :cond_1
-    const-string p1, "extra_page_name"
-
-    invoke-virtual {v1, p1, p4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p1, "extra_section_name"
-
-    invoke-virtual {v1, p1, p5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p1, "extra_object_name"
-
-    invoke-virtual {v1, p1, p6}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    const-string p1, "extra_object_type"
-
-    invoke-virtual {v1, p1, p7}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-virtual {v0, v1}, Lcom/discord/dialogs/c;->setArguments(Landroid/os/Bundle;)V
-
-    const-class p1, Lcom/discord/dialogs/c;
-
-    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
-    move-result-object p1
-
-    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/dialogs/c$b.smali b/com.discord/smali/com/discord/dialogs/c$b.smali
deleted file mode 100644
index 500aa6e901..0000000000
--- a/com.discord/smali/com/discord/dialogs/c$b.smali
+++ /dev/null
@@ -1,194 +0,0 @@
-.class public final Lcom/discord/dialogs/c$b;
-.super Ljava/lang/Object;
-.source "PremiumUpsellDialog.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "b"
-.end annotation
-
-
-# instance fields
-.field bodyText:Ljava/lang/String;
-
-.field headerText:Ljava/lang/String;
-
-.field final xv:I
-
-
-# direct methods
-.method public constructor <init>(ILjava/lang/String;Ljava/lang/String;)V
-    .locals 1
-
-    const-string v0, "headerText"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "bodyText"
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p1, p0, Lcom/discord/dialogs/c$b;->xv:I
-
-    iput-object p2, p0, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
-
-    iput-object p3, p0, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
-
-    return-void
-.end method
-
-
-# virtual methods
-.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/dialogs/c$b;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Lcom/discord/dialogs/c$b;
-
-    iget v1, p0, Lcom/discord/dialogs/c$b;->xv:I
-
-    iget v3, p1, Lcom/discord/dialogs/c$b;->xv: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/dialogs/c$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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/dialogs/c$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/l;->areEqual(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 hashCode()I
-    .locals 3
-
-    iget v0, p0, Lcom/discord/dialogs/c$b;->xv: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/dialogs/c$b;->headerText:Ljava/lang/String;
-
-    const/4 v2, 0x0
-
-    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
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v1, p0, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
-    move-result v2
-
-    :cond_1
-    add-int/2addr v0, v2
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "UpsellData(imageResId="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget v1, p0, Lcom/discord/dialogs/c$b;->xv:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", headerText="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    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;
-
-    const-string v1, ", bodyText="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    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;
-
-    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/dialogs/c$c.smali b/com.discord/smali/com/discord/dialogs/c$c.smali
deleted file mode 100644
index e50d271ec8..0000000000
--- a/com.discord/smali/com/discord/dialogs/c$c.smali
+++ /dev/null
@@ -1,295 +0,0 @@
-.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/dialogs/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "c"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/dialogs/c$c$a;
-    }
-.end annotation
-
-
-# static fields
-.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-.field public static final xw:Lcom/discord/dialogs/c$c$a;
-
-
-# instance fields
-.field private final body$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final header$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final image$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 7
-
-    const-class v0, Lcom/discord/dialogs/c$c;
-
-    const/4 v1, 0x3
-
-    new-array v1, v1, [Lkotlin/reflect/KProperty;
-
-    new-instance v2, Lkotlin/jvm/internal/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "image"
-
-    const-string v5, "getImage()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v4
-
-    const-string v5, "header"
-
-    const-string v6, "getHeader()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v0
-
-    const-string v4, "body"
-
-    const-string v5, "getBody()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/dialogs/c$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lcom/discord/dialogs/c$c$a;
-
-    invoke-direct {v0, v3}, Lcom/discord/dialogs/c$c$a;-><init>(B)V
-
-    sput-object v0, Lcom/discord/dialogs/c$c;->xw:Lcom/discord/dialogs/c$c$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
-
-    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/dialogs/c$c;->image$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/dialogs/c$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    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/dialogs/c$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getContentViewResId()I
-    .locals 1
-
-    const v0, 0x7f0d015a
-
-    return v0
-.end method
-
-.method public final onViewBoundOrOnResume()V
-    .locals 4
-
-    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
-
-    iget-object v0, p0, Lcom/discord/dialogs/c$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/c$c;->$$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;
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c$c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    const-string v2, "extra_image_id"
-
-    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
-
-    move-result v2
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    iget-object v0, p0, Lcom/discord/dialogs/c$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/c$c;->$$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;
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c$c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    const-string v3, "extra_header_string"
-
-    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_0
-
-    :cond_1
-    move-object v1, v2
-
-    :goto_0
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object v0, p0, Lcom/discord/dialogs/c$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/c$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v3, 0x2
-
-    aget-object v1, v1, v3
-
-    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;
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c$c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_2
-
-    const-string v3, "extra_body_text"
-
-    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v1
-
-    goto :goto_1
-
-    :cond_2
-    move-object v1, v2
-
-    :goto_1
-    instance-of v3, v1, Ljava/lang/CharSequence;
-
-    if-nez v3, :cond_3
-
-    move-object v1, v2
-
-    :cond_3
-    check-cast v1, Ljava/lang/CharSequence;
-
-    if-nez v1, :cond_4
-
-    const-string v1, ""
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    :cond_4
-    invoke-static {v1}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/dialogs/c$d.smali b/com.discord/smali/com/discord/dialogs/c$d.smali
deleted file mode 100644
index 4f86192f0b..0000000000
--- a/com.discord/smali/com/discord/dialogs/c$d.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.class final Lcom/discord/dialogs/c$d;
-.super Landroidx/fragment/app/FragmentStatePagerAdapter;
-.source "PremiumUpsellDialog.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/c;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = "d"
-.end annotation
-
-
-# instance fields
-.field private final xx:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/dialogs/c$c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method public constructor <init>(Landroidx/fragment/app/FragmentManager;Ljava/util/List;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroidx/fragment/app/FragmentManager;",
-            "Ljava/util/List<",
-            "Lcom/discord/dialogs/c$c;",
-            ">;)V"
-        }
-    .end annotation
-
-    const-string v0, "fragmentManager"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "pages"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0, p1}, Landroidx/fragment/app/FragmentStatePagerAdapter;-><init>(Landroidx/fragment/app/FragmentManager;)V
-
-    iput-object p2, p0, Lcom/discord/dialogs/c$d;->xx:Ljava/util/List;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final getCount()I
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/dialogs/c$d;->xx:Ljava/util/List;
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final synthetic getItem(I)Landroidx/fragment/app/Fragment;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/dialogs/c$d;->xx:Ljava/util/List;
-
-    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/dialogs/c$c;
-
-    check-cast p1, Landroidx/fragment/app/Fragment;
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/dialogs/c.smali b/com.discord/smali/com/discord/dialogs/c.smali
index 5fe66d52ce..1a1b710810 100644
--- a/com.discord/smali/com/discord/dialogs/c.smali
+++ b/com.discord/smali/com/discord/dialogs/c.smali
@@ -1,826 +1,46 @@
-.class public final Lcom/discord/dialogs/c;
-.super Lcom/discord/app/AppDialog;
-.source "PremiumUpsellDialog.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/dialogs/c$d;,
-        Lcom/discord/dialogs/c$c;,
-        Lcom/discord/dialogs/c$b;,
-        Lcom/discord/dialogs/c$a;
-    }
-.end annotation
+.class public final synthetic Lcom/discord/dialogs/c;
+.super Ljava/lang/Object;
 
 
 # static fields
-.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-.field public static final xu:Lcom/discord/dialogs/c$a;
-
-
-# instance fields
-.field private final close$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final xs:Lkotlin/properties/ReadOnlyProperty;
-
-.field private xt:Lcom/discord/dialogs/c$d;
+.field public static final synthetic $EnumSwitchMapping$0:[I
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 7
-
-    const-class v0, Lcom/discord/dialogs/c;
-
-    const/4 v1, 0x4
-
-    new-array v1, v1, [Lkotlin/reflect/KProperty;
-
-    new-instance v2, Lkotlin/jvm/internal/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
-    const-string v4, "viewPager"
-
-    const-string v5, "getViewPager()Landroidx/viewpager/widget/ViewPager;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v4
-
-    const-string v5, "tabDots"
-
-    const-string v6, "getTabDots()Lcom/google/android/material/tabs/TabLayout;"
-
-    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v4
-
-    const-string v5, "close"
-
-    const-string v6, "getClose()Landroid/view/View;"
-
-    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v0
-
-    const-string v4, "learnMore"
-
-    const-string v5, "getLearnMore()Landroid/view/View;"
-
-    invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lcom/discord/dialogs/c$a;
-
-    invoke-direct {v0, v3}, Lcom/discord/dialogs/c$a;-><init>(B)V
-
-    sput-object v0, Lcom/discord/dialogs/c;->xu:Lcom/discord/dialogs/c$a;
-
-    return-void
-.end method
-
-.method public constructor <init>()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
-
-    const v0, 0x7f0a0538
-
-    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/c;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0534
-
-    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/c;->xs:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0533
-
-    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/c;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0537
-
-    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/c;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-.end method
-
-.method public static final a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
-    .locals 8
-
-    const/4 v4, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    move-object v0, p0
-
-    move v1, p1
-
-    move-object v2, p2
-
-    move-object v3, p3
-
-    move-object v5, p4
-
-    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
-
-.method private final ee()Landroidx/viewpager/widget/ViewPager;
+.method static synthetic constructor <clinit>()V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/c;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/c;->$$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;
+    invoke-static {}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->values()[Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     move-result-object v0
 
-    check-cast v0, Landroidx/viewpager/widget/ViewPager;
+    array-length v0, v0
 
-    return-object v0
-.end method
+    new-array v0, v0, [I
 
+    sput-object v0, Lcom/discord/dialogs/c;->$EnumSwitchMapping$0:[I
 
-# virtual methods
-.method public final getContentViewResId()I
-    .locals 1
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-    const v0, 0x7f0d0053
-
-    return v0
-.end method
-
-.method public final onCreate(Landroid/os/Bundle;)V
-    .locals 10
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onCreate(Landroid/os/Bundle;)V
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getActivity()Landroidx/fragment/app/FragmentActivity;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/app/Activity;
-
-    const/4 v0, 0x4
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    invoke-static {p1, v2, v1, v0, v1}, Lcom/discord/utilities/keyboard/Keyboard;->setKeyboardOpen$default(Landroid/app/Activity;ZLandroid/view/View;ILjava/lang/Object;)V
-
-    const/4 p1, 0x6
-
-    new-array p1, p1, [Lcom/discord/dialogs/c$b;
-
-    new-instance v1, Lcom/discord/dialogs/c$b;
-
-    const v3, 0x7f120ec3
-
-    invoke-virtual {p0, v3}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v4, "getString(R.string.premi\u2026psell_tag_passive_mobile)"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v4, 0x7f120ec2
-
-    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "getString(R.string.premi\u2026l_tag_description_mobile)"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v5, 0x7f080451
-
-    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/dialogs/c$b;
-
-    const v3, 0x7f120ec0
-
-    invoke-virtual {p0, v3}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v3
-
-    const-string v4, "getString(R.string.premi\u2026ell_emoji_passive_mobile)"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v4, 0x7f120ebf
-
-    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "getString(R.string.premi\u2026emoji_description_mobile)"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v5, 0x7f08042b
-
-    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/dialogs/c$b;
-
-    const v4, 0x7f120eba
-
-    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "getString(R.string.premi\u2026ed_emojis_passive_mobile)"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v5, 0x7f120eb9
-
-    invoke-virtual {p0, v5}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v6, "getString(R.string.premi\u2026mojis_description_mobile)"
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v6, 0x7f080407
-
-    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/dialogs/c$b;
-
-    const v5, 0x7f120ec6
-
-    invoke-virtual {p0, v5}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v6, "getString(R.string.premi\u2026ll_upload_passive_mobile)"
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v6, 0x3
-
-    new-array v7, v6, [Ljava/lang/Object;
-
-    const v8, 0x7f1205bf
-
-    invoke-virtual {p0, v8}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    aput-object v8, v7, v2
-
-    const v8, 0x7f1205be
-
-    invoke-virtual {p0, v8}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    aput-object v8, v7, v3
-
-    const v8, 0x7f1205bd
-
-    invoke-virtual {p0, v8}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v8
-
-    aput-object v8, v7, v4
-
-    const v4, 0x7f120ec5
-
-    invoke-virtual {p0, v4, v7}, Lcom/discord/dialogs/c;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v7, "getString(R.string.premi\u2026ad_limit_premium_tier_1))"
-
-    invoke-static {v4, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v7, 0x7f080452
-
-    invoke-direct {v1, v7, v5, v4}, Lcom/discord/dialogs/c$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
-
-    aput-object v1, p1, v6
-
-    new-instance v1, Lcom/discord/dialogs/c$b;
-
-    const v4, 0x7f120eb7
-
-    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "getString(R.string.premi\u2026ed_avatar_passive_mobile)"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v5, 0x7f120eb6
-
-    invoke-virtual {p0, v5}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v5
-
-    const-string v6, "getString(R.string.premi\u2026vatar_description_mobile)"
-
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v6, 0x7f080410
-
-    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/dialogs/c$b;
-
-    const v1, 0x7f120ebd
-
-    invoke-virtual {p0, v1}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    const-string v4, "getString(R.string.premi\u2026ell_badge_passive_mobile)"
-
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v4, 0x7f120ebc
-
-    invoke-virtual {p0, v4}, Lcom/discord/dialogs/c;->getString(I)Ljava/lang/String;
-
-    move-result-object v4
-
-    const-string v5, "getString(R.string.premi\u2026badge_description_mobile)"
-
-    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v5, 0x7f080413
-
-    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;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const-string v1, "extra_page_number"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v1
-
-    const-string v4, "<set-?>"
-
-    const-string v5, ""
-
-    const-string v6, "extra_header_string"
-
-    if-eqz v1, :cond_3
-
-    invoke-virtual {v1, v6}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
 
     move-result v1
 
-    if-ne v1, v3, :cond_3
+    const/4 v2, 0x1
 
-    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+    aput v2, v0, v1
 
-    move-result-object v1
+    sget-object v0, Lcom/discord/dialogs/c;->$EnumSwitchMapping$0:[I
 
-    check-cast v1, Lcom/discord/dialogs/c$b;
+    sget-object v1, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v7
-
-    if-eqz v7, :cond_1
-
-    invoke-virtual {v7, v6}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v7
-
-    if-nez v7, :cond_2
-
-    :cond_1
-    move-object v7, v5
-
-    :cond_2
-    invoke-static {v7, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v7, v1, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
-
-    :cond_3
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v1
-
-    const-string v7, "extra_body_text"
-
-    if-eqz v1, :cond_6
-
-    invoke-virtual {v1, v7}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+    invoke-virtual {v1}, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->ordinal()I
 
     move-result v1
 
-    if-ne v1, v3, :cond_6
+    const/4 v2, 0x2
 
-    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/dialogs/c$b;
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
-
-    move-result-object v8
-
-    if-eqz v8, :cond_5
-
-    invoke-virtual {v8, v7}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v8
-
-    if-nez v8, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    move-object v5, v8
-
-    :cond_5
-    :goto_1
-    invoke-static {v5, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iput-object v5, v1, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
-
-    :cond_6
-    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/dialogs/c$b;
-
-    invoke-static {v1}, Lkotlin/a/m;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/util/Collection;
-
-    check-cast p1, 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 {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    const/4 v5, 0x0
-
-    :goto_2
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_a
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v8
-
-    add-int/lit8 v9, v5, 0x1
-
-    if-gez v5, :cond_7
-
-    invoke-static {}, Lkotlin/a/m;->throwIndexOverflow()V
-
-    :cond_7
-    if-eq v5, v0, :cond_8
-
-    const/4 v5, 0x1
-
-    goto :goto_3
-
-    :cond_8
-    const/4 v5, 0x0
-
-    :goto_3
-    if-eqz v5, :cond_9
-
-    invoke-interface {v4, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    :cond_9
-    move v5, v9
-
-    goto :goto_2
-
-    :cond_a
-    check-cast v4, Ljava/util/List;
-
-    check-cast v4, Ljava/lang/Iterable;
-
-    invoke-static {v1, v4}, Lkotlin/a/m;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/Iterable;
-
-    new-instance v0, Ljava/util/ArrayList;
-
-    const/16 v1, 0xa
-
-    invoke-static {p1, v1}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v1
-
-    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
-
-    check-cast v0, Ljava/util/Collection;
-
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :goto_4
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_b
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Lcom/discord/dialogs/c$b;
-
-    sget-object v2, Lcom/discord/dialogs/c$c;->xw:Lcom/discord/dialogs/c$c$a;
-
-    iget v2, v1, Lcom/discord/dialogs/c$b;->xv:I
-
-    iget-object v3, v1, Lcom/discord/dialogs/c$b;->headerText:Ljava/lang/String;
-
-    iget-object v1, v1, Lcom/discord/dialogs/c$b;->bodyText:Ljava/lang/String;
-
-    const-string v4, "headerText"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v4, "bodyText"
-
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v4, Landroid/os/Bundle;
-
-    invoke-direct {v4}, Landroid/os/Bundle;-><init>()V
-
-    const-string v5, "extra_image_id"
-
-    invoke-virtual {v4, v5, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
-
-    invoke-virtual {v4, v6, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-virtual {v4, v7, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
-
-    new-instance v1, Lcom/discord/dialogs/c$c;
-
-    invoke-direct {v1}, Lcom/discord/dialogs/c$c;-><init>()V
-
-    invoke-virtual {v1, v4}, Lcom/discord/dialogs/c$c;->setArguments(Landroid/os/Bundle;)V
-
-    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_4
-
-    :cond_b
-    check-cast v0, Ljava/util/List;
-
-    new-instance p1, Lcom/discord/dialogs/c$d;
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/c;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
-
-    move-result-object v1
-
-    const-string v2, "childFragmentManager"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p1, v1, v0}, Lcom/discord/dialogs/c$d;-><init>(Landroidx/fragment/app/FragmentManager;Ljava/util/List;)V
-
-    iput-object p1, p0, Lcom/discord/dialogs/c;->xt:Lcom/discord/dialogs/c$d;
-
-    return-void
-.end method
-
-.method public final onViewBound(Landroid/view/View;)V
-    .locals 2
-
-    const-string v0, "view"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/c;->ee()Landroidx/viewpager/widget/ViewPager;
-
-    move-result-object p1
-
-    iget-object v0, p0, Lcom/discord/dialogs/c;->xt:Lcom/discord/dialogs/c$d;
-
-    if-nez v0, :cond_0
-
-    const-string v1, "pagerAdapter"
-
-    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(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/dialogs/c;->xs:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v0, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v1, 0x1
-
-    aget-object v0, v0, v1
-
-    invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/google/android/material/tabs/TabLayout;
-
-    invoke-direct {p0}, Lcom/discord/dialogs/c;->ee()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/dialogs/c;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v0, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v1, 0x2
-
-    aget-object v0, v0, v1
-
-    invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/view/View;
-
-    new-instance v0, Lcom/discord/dialogs/c$e;
-
-    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/dialogs/c;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v0, Lcom/discord/dialogs/c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v1, 0x3
-
-    aget-object v0, v0, v1
-
-    invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/view/View;
-
-    new-instance v0, Lcom/discord/dialogs/c$f;
-
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/c$f;-><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
+    aput v2, v0, v1
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/d$a.smali b/com.discord/smali/com/discord/dialogs/d$a.smali
index 2555b3022f..d0239be717 100644
--- a/com.discord/smali/com/discord/dialogs/d$a.smali
+++ b/com.discord/smali/com/discord/dialogs/d$a.smali
@@ -1,6 +1,6 @@
 .class public final Lcom/discord/dialogs/d$a;
 .super Ljava/lang/Object;
-.source "SelectorDialog.kt"
+.source "PremiumUpsellDialog.kt"
 
 
 # annotations
@@ -31,40 +31,91 @@
     return-void
 .end method
 
-.method public static a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/d;
+.method public static synthetic a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
+    .locals 11
+
+    move/from16 v0, p7
+
+    and-int/lit8 v1, v0, 0x4
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_0
+
+    move-object v5, v2
+
+    goto :goto_0
+
+    :cond_0
+    move-object v5, p2
+
+    :goto_0
+    and-int/lit8 v1, v0, 0x10
+
+    if-eqz v1, :cond_1
+
+    move-object v7, v2
+
+    goto :goto_1
+
+    :cond_1
+    move-object v7, p3
+
+    :goto_1
+    and-int/lit8 v1, v0, 0x20
+
+    if-eqz v1, :cond_2
+
+    move-object v8, v2
+
+    goto :goto_2
+
+    :cond_2
+    move-object v8, p4
+
+    :goto_2
+    and-int/lit8 v1, v0, 0x40
+
+    if-eqz v1, :cond_3
+
+    move-object v9, v2
+
+    goto :goto_3
+
+    :cond_3
+    move-object/from16 v9, p5
+
+    :goto_3
+    and-int/lit16 v0, v0, 0x80
+
+    if-eqz v0, :cond_4
+
+    move-object v10, v2
+
+    goto :goto_4
+
+    :cond_4
+    move-object/from16 v10, p6
+
+    :goto_4
+    const/4 v6, 0x0
+
+    move-object v3, p0
+
+    move v4, p1
+
+    invoke-static/range {v3 .. v10}, Lcom/discord/dialogs/d$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
+
+.method public static a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroidx/fragment/app/FragmentManager;",
-            "Ljava/lang/String;",
-            "[",
-            "Ljava/lang/CharSequence;",
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Integer;",
-            "Lkotlin/Unit;",
-            ">;)",
-            "Lcom/discord/dialogs/d;"
-        }
-    .end annotation
 
     const-string v0, "fragmentManager"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "title"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "options"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "onSelectedListener"
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     new-instance v0, Lcom/discord/dialogs/d;
 
     invoke-direct {v0}, Lcom/discord/dialogs/d;-><init>()V
@@ -73,29 +124,49 @@
 
     invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
 
-    const-string v2, "INTENT_DIALOG_TITLE"
+    const-string v2, "extra_page_number"
 
-    invoke-virtual {v1, v2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v1, v2, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    const-string p1, "INTENT_DIALOG_OPTIONS"
+    if-eqz p2, :cond_0
 
-    invoke-virtual {v1, p1, p2}, Landroid/os/Bundle;->putCharSequenceArray(Ljava/lang/String;[Ljava/lang/CharSequence;)V
+    const-string p1, "extra_header_string"
+
+    invoke-virtual {v1, p1, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_0
+    if-eqz p3, :cond_1
+
+    const-string p1, "extra_body_text"
+
+    invoke-virtual {v1, p1, p3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    :cond_1
+    const-string p1, "extra_page_name"
+
+    invoke-virtual {v1, p1, p4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p1, "extra_section_name"
+
+    invoke-virtual {v1, p1, p5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p1, "extra_object_name"
+
+    invoke-virtual {v1, p1, p6}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p1, "extra_object_type"
+
+    invoke-virtual {v1, p1, p7}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     invoke-virtual {v0, v1}, Lcom/discord/dialogs/d;->setArguments(Landroid/os/Bundle;)V
 
-    iput-object p3, v0, Lcom/discord/dialogs/d;->xz:Lkotlin/jvm/functions/Function1;
-
     const-class p1, Lcom/discord/dialogs/d;
 
-    invoke-static {p1}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
 
     move-result-object p1
 
     invoke-virtual {v0, p0, p1}, Lcom/discord/dialogs/d;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
 
-    return-object v0
+    return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/d$b.smali b/com.discord/smali/com/discord/dialogs/d$b.smali
index 4d6ee072df..690db7f6d2 100644
--- a/com.discord/smali/com/discord/dialogs/d$b.smali
+++ b/com.discord/smali/com/discord/dialogs/d$b.smali
@@ -1,6 +1,6 @@
 .class public final Lcom/discord/dialogs/d$b;
-.super Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
-.source "SelectorDialog.kt"
+.super Ljava/lang/Object;
+.source "PremiumUpsellDialog.kt"
 
 
 # annotations
@@ -9,75 +9,186 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x11
+    accessFlags = 0x19
     name = "b"
 .end annotation
 
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder<",
-        "Ljava/lang/CharSequence;",
-        ">;"
-    }
-.end annotation
-
 
 # instance fields
-.field private final nameTv:Landroid/widget/TextView;
+.field bodyText:Ljava/lang/String;
 
-.field final synthetic this$0:Lcom/discord/dialogs/d;
+.field headerText:Ljava/lang/String;
+
+.field final xx:I
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/dialogs/d;Landroid/view/View;)V
+.method public constructor <init>(ILjava/lang/String;Ljava/lang/String;)V
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/view/View;",
-            ")V"
-        }
-    .end annotation
 
-    const-string v0, "itemView"
+    const-string v0, "headerText"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/dialogs/d$b;->this$0:Lcom/discord/dialogs/d;
+    const-string v0, "bodyText"
 
-    invoke-direct {p0, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast p2, Landroid/widget/TextView;
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/discord/dialogs/d$b;->nameTv:Landroid/widget/TextView;
+    iput p1, p0, Lcom/discord/dialogs/d$b;->xx:I
+
+    iput-object p2, p0, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    iput-object p3, p0, Lcom/discord/dialogs/d$b;->bodyText:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic bind(Ljava/lang/Object;)V
-    .locals 1
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 4
 
-    check-cast p1, Ljava/lang/CharSequence;
+    const/4 v0, 0x1
 
-    const-string v0, "data"
+    if-eq p0, p1, :cond_2
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    instance-of v1, p1, Lcom/discord/dialogs/d$b;
 
-    iget-object v0, p0, Lcom/discord/dialogs/d$b;->nameTv:Landroid/widget/TextView;
+    const/4 v2, 0x0
 
-    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    if-eqz v1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/dialogs/d$b;->nameTv:Landroid/widget/TextView;
+    check-cast p1, Lcom/discord/dialogs/d$b;
 
-    new-instance v0, Lcom/discord/dialogs/d$b$a;
+    iget v1, p0, Lcom/discord/dialogs/d$b;->xx:I
 
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/d$b$a;-><init>(Lcom/discord/dialogs/d$b;)V
+    iget v3, p1, Lcom/discord/dialogs/d$b;->xx:I
 
-    check-cast v0, Landroid/view/View$OnClickListener;
+    if-ne v1, v3, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    const/4 v1, 0x1
 
-    return-void
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    iget-object v1, p0, Lcom/discord/dialogs/d$b;->bodyText:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/dialogs/d$b;->bodyText:Ljava/lang/String;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->areEqual(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 hashCode()I
+    .locals 3
+
+    iget v0, p0, Lcom/discord/dialogs/d$b;->xx: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/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    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
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v1, p0, Lcom/discord/dialogs/d$b;->bodyText:Ljava/lang/String;
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    :cond_1
+    add-int/2addr v0, v2
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "UpsellData(imageResId="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget v1, p0, Lcom/discord/dialogs/d$b;->xx:I
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", headerText="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", bodyText="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/dialogs/d$b;->bodyText: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/dialogs/c$c$a.smali b/com.discord/smali/com/discord/dialogs/d$c$a.smali
similarity index 76%
rename from com.discord/smali/com/discord/dialogs/c$c$a.smali
rename to com.discord/smali/com/discord/dialogs/d$c$a.smali
index ae1584f93a..009fdfe338 100644
--- a/com.discord/smali/com/discord/dialogs/c$c$a.smali
+++ b/com.discord/smali/com/discord/dialogs/d$c$a.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/dialogs/c$c$a;
+.class public final Lcom/discord/dialogs/d$c$a;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/c$c;
+    value = Lcom/discord/dialogs/d$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/dialogs/c$c$a;-><init>()V
+    invoke-direct {p0}, Lcom/discord/dialogs/d$c$a;-><init>()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/d$c.smali b/com.discord/smali/com/discord/dialogs/d$c.smali
index 007bcd51c5..d0692f8781 100644
--- a/com.discord/smali/com/discord/dialogs/d$c.smali
+++ b/com.discord/smali/com/discord/dialogs/d$c.smali
@@ -1,45 +1,295 @@
-.class final Lcom/discord/dialogs/d$c;
-.super Ljava/lang/Object;
-.source "SelectorDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
+.class public final Lcom/discord/dialogs/d$c;
+.super Lcom/discord/app/AppFragment;
+.source "PremiumUpsellDialog.kt"
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/d;->onViewBound(Landroid/view/View;)V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
+    accessFlags = 0x19
+    name = "c"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/dialogs/d$c$a;
+    }
 .end annotation
 
 
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+.field public static final xy:Lcom/discord/dialogs/d$c$a;
+
+
 # instance fields
-.field final synthetic this$0:Lcom/discord/dialogs/d;
+.field private final body$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final header$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final image$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/d;)V
-    .locals 0
+.method static constructor <clinit>()V
+    .locals 7
 
-    iput-object p1, p0, Lcom/discord/dialogs/d$c;->this$0:Lcom/discord/dialogs/d;
+    const-class v0, Lcom/discord/dialogs/d$c;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 v1, 0x3
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "image"
+
+    const-string v5, "getImage()Landroid/widget/ImageView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "header"
+
+    const-string v6, "getHeader()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v4, "body"
+
+    const-string v5, "getBody()Landroid/widget/TextView;"
+
+    invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/dialogs/d$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    new-instance v0, Lcom/discord/dialogs/d$c$a;
+
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/d$c$a;-><init>(B)V
+
+    sput-object v0, Lcom/discord/dialogs/d$c;->xy:Lcom/discord/dialogs/d$c$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
+
+    const v0, 0x7f0a0541
+
+    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/dialogs/d$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0540
+
+    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/dialogs/d$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a053d
+
+    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/dialogs/d$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 0
+.method public final getContentViewResId()I
+    .locals 1
 
-    iget-object p1, p0, Lcom/discord/dialogs/d$c;->this$0:Lcom/discord/dialogs/d;
+    const v0, 0x7f0d0160
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
+    return v0
+.end method
+
+.method public final onViewBoundOrOnResume()V
+    .locals 4
+
+    invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
+
+    iget-object v0, p0, Lcom/discord/dialogs/d$c;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/d$c;->$$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;
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d$c;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    const-string v2, "extra_image_id"
+
+    invoke-virtual {v1, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
+
+    move-result v2
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    iget-object v0, p0, Lcom/discord/dialogs/d$c;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/d$c;->$$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;
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d$c;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
+
+    const-string v3, "extra_header_string"
+
+    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_0
+
+    :cond_1
+    move-object v1, v2
+
+    :goto_0
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v0, p0, Lcom/discord/dialogs/d$c;->body$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/d$c;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v3, 0x2
+
+    aget-object v1, v1, v3
+
+    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;
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d$c;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_2
+
+    const-string v3, "extra_body_text"
+
+    invoke-virtual {v1, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_1
+
+    :cond_2
+    move-object v1, v2
+
+    :goto_1
+    instance-of v3, v1, Ljava/lang/CharSequence;
+
+    if-nez v3, :cond_3
+
+    move-object v1, v2
+
+    :cond_3
+    check-cast v1, Ljava/lang/CharSequence;
+
+    if-nez v1, :cond_4
+
+    const-string v1, ""
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    :cond_4
+    invoke-static {v1}, Lcom/discord/simpleast/core/a/b;->a(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/d$d.smali b/com.discord/smali/com/discord/dialogs/d$d.smali
index 22f2a929f4..a0e9395e6e 100644
--- a/com.discord/smali/com/discord/dialogs/d$d.smali
+++ b/com.discord/smali/com/discord/dialogs/d$d.smali
@@ -1,84 +1,87 @@
 .class final Lcom/discord/dialogs/d$d;
-.super Lkotlin/jvm/internal/m;
-.source "SelectorDialog.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function2;
+.super Landroidx/fragment/app/FragmentStatePagerAdapter;
+.source "PremiumUpsellDialog.kt"
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/d;->onViewBound(Landroid/view/View;)V
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/d;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function2<",
-        "Landroid/view/LayoutInflater;",
-        "Landroid/view/ViewGroup;",
-        "Lcom/discord/dialogs/d$b;",
-        ">;"
-    }
+    name = "d"
 .end annotation
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/dialogs/d;
+.field private final xz:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/dialogs/d$c;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/d;)V
-    .locals 0
+.method public constructor <init>(Landroidx/fragment/app/FragmentManager;Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Ljava/util/List<",
+            "Lcom/discord/dialogs/d$c;",
+            ">;)V"
+        }
+    .end annotation
 
-    iput-object p1, p0, Lcom/discord/dialogs/d$d;->this$0:Lcom/discord/dialogs/d;
+    const-string v0, "fragmentManager"
 
-    const/4 p1, 0x2
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
+    const-string v0, "pages"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Landroidx/fragment/app/FragmentStatePagerAdapter;-><init>(Landroidx/fragment/app/FragmentManager;)V
+
+    iput-object p2, p0, Lcom/discord/dialogs/d$d;->xz:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .locals 2
+.method public final getCount()I
+    .locals 1
 
-    check-cast p1, Landroid/view/LayoutInflater;
+    iget-object v0, p0, Lcom/discord/dialogs/d$d;->xz:Ljava/util/List;
 
-    check-cast p2, Landroid/view/ViewGroup;
+    check-cast v0, Ljava/util/Collection;
 
-    const-string v0, "inflater"
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result v0
 
-    const-string v0, "parent"
+    return v0
+.end method
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+.method public final synthetic getItem(I)Landroidx/fragment/app/Fragment;
+    .locals 1
 
-    const v0, 0x7f0d0033
+    iget-object v0, p0, Lcom/discord/dialogs/d$d;->xz:Ljava/util/List;
 
-    const/4 v1, 0x0
-
-    invoke-virtual {p1, v0, p2, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
+    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    new-instance p2, Lcom/discord/dialogs/d$b;
+    check-cast p1, Lcom/discord/dialogs/d$c;
 
-    iget-object v0, p0, Lcom/discord/dialogs/d$d;->this$0:Lcom/discord/dialogs/d;
+    check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const-string v1, "itemView"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p2, v0, p1}, Lcom/discord/dialogs/d$b;-><init>(Lcom/discord/dialogs/d;Landroid/view/View;)V
-
-    return-object p2
+    return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/c$e.smali b/com.discord/smali/com/discord/dialogs/d$e.smali
similarity index 57%
rename from com.discord/smali/com/discord/dialogs/c$e.smali
rename to com.discord/smali/com/discord/dialogs/d$e.smali
index b58e4ae5d6..bf32724b4b 100644
--- a/com.discord/smali/com/discord/dialogs/c$e.smali
+++ b/com.discord/smali/com/discord/dialogs/d$e.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/c$e;
+.class final Lcom/discord/dialogs/d$e;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/c;->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 xy:Lcom/discord/dialogs/c;
+.field final synthetic xA:Lcom/discord/dialogs/d;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/c;)V
+.method constructor <init>(Lcom/discord/dialogs/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/c$e;->xy:Lcom/discord/dialogs/c;
+    iput-object p1, p0, Lcom/discord/dialogs/d$e;->xA: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/dialogs/c$e;->xy:Lcom/discord/dialogs/c;
+    iget-object p1, p0, Lcom/discord/dialogs/d$e;->xA:Lcom/discord/dialogs/d;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/c$f.smali b/com.discord/smali/com/discord/dialogs/d$f.smali
similarity index 77%
rename from com.discord/smali/com/discord/dialogs/c$f.smali
rename to com.discord/smali/com/discord/dialogs/d$f.smali
index 574a64d6ec..72348d4069 100644
--- a/com.discord/smali/com/discord/dialogs/c$f.smali
+++ b/com.discord/smali/com/discord/dialogs/d$f.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/c$f;
+.class final Lcom/discord/dialogs/d$f;
 .super Ljava/lang/Object;
 .source "PremiumUpsellDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/c;->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 xy:Lcom/discord/dialogs/c;
+.field final synthetic xA:Lcom/discord/dialogs/d;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/c;)V
+.method constructor <init>(Lcom/discord/dialogs/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/c$f;->xy:Lcom/discord/dialogs/c;
+    iput-object p1, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
 
     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/dialogs/c$f;->xy:Lcom/discord/dialogs/c;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
 
-    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -63,9 +63,9 @@
     move-object v1, v9
 
     :goto_0
-    iget-object v0, p0, Lcom/discord/dialogs/c$f;->xy:Lcom/discord/dialogs/c;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
 
-    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -85,9 +85,9 @@
     move-object v2, v9
 
     :goto_1
-    iget-object v0, p0, Lcom/discord/dialogs/c$f;->xy:Lcom/discord/dialogs/c;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
 
-    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -107,9 +107,9 @@
     move-object v3, v9
 
     :goto_2
-    iget-object v0, p0, Lcom/discord/dialogs/c$f;->xy:Lcom/discord/dialogs/c;
+    iget-object v0, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
 
-    invoke-virtual {v0}, Lcom/discord/dialogs/c;->getArguments()Landroid/os/Bundle;
+    invoke-virtual {v0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -161,9 +161,9 @@
 
     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/dialogs/c$f;->xy:Lcom/discord/dialogs/c;
+    iget-object p1, p0, Lcom/discord/dialogs/d$f;->xA:Lcom/discord/dialogs/d;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/c;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/d.smali b/com.discord/smali/com/discord/dialogs/d.smali
index 98ec498f2d..9d588a01b6 100644
--- a/com.discord/smali/com/discord/dialogs/d.smali
+++ b/com.discord/smali/com/discord/dialogs/d.smali
@@ -1,11 +1,13 @@
 .class public final Lcom/discord/dialogs/d;
 .super Lcom/discord/app/AppDialog;
-.source "SelectorDialog.kt"
+.source "PremiumUpsellDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lcom/discord/dialogs/d$d;,
+        Lcom/discord/dialogs/d$c;,
         Lcom/discord/dialogs/d$b;,
         Lcom/discord/dialogs/d$a;
     }
@@ -15,27 +17,19 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xB:Lcom/discord/dialogs/d$a;
+.field public static final xw:Lcom/discord/dialogs/d$a;
 
 
 # instance fields
-.field private final cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private final close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private final learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final xA:Lkotlin/properties/ReadOnlyProperty;
+.field private final viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field xz:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "-",
-            "Ljava/lang/Integer;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private final xu:Lkotlin/properties/ReadOnlyProperty;
+
+.field private xv:Lcom/discord/dialogs/d$d;
 
 
 # direct methods
@@ -44,7 +38,7 @@
 
     const-class v0, Lcom/discord/dialogs/d;
 
-    const/4 v1, 0x3
+    const/4 v1, 0x4
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -54,9 +48,9 @@
 
     move-result-object v3
 
-    const-string v4, "titleTv"
+    const-string v4, "viewPager"
 
-    const-string v5, "getTitleTv()Landroid/widget/TextView;"
+    const-string v5, "getViewPager()Landroidx/viewpager/widget/ViewPager;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -76,9 +70,9 @@
 
     move-result-object v4
 
-    const-string v5, "listRv"
+    const-string v5, "tabDots"
 
-    const-string v6, "getListRv()Landroidx/recyclerview/widget/RecyclerView;"
+    const-string v6, "getTabDots()Lcom/google/android/material/tabs/TabLayout;"
 
     invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -96,11 +90,33 @@
 
     invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
+    move-result-object v4
+
+    const-string v5, "close"
+
+    const-string v6, "getClose()Landroid/view/View;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
     move-result-object v0
 
-    const-string v4, "cancelBtn"
+    const-string v4, "learnMore"
 
-    const-string v5, "getCancelBtn()Landroid/widget/Button;"
+    const-string v5, "getLearnMore()Landroid/view/View;"
 
     invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -110,7 +126,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x3
 
     aput-object v0, v1, v2
 
@@ -120,7 +136,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/d$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/d;->xB:Lcom/discord/dialogs/d$a;
+    sput-object v0, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$a;
 
     return-void
 .end method
@@ -130,41 +146,73 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a0271
+    const v0, 0x7f0a0543
 
     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/d;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0270
+    const v0, 0x7f0a053f
 
     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/d;->xA:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->xu:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a025c
+    const v0, 0x7f0a053e
 
     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/d;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/d;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0542
+
+    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/d;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method private final ef()Landroidx/recyclerview/widget/RecyclerView;
+.method public static final a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    .locals 8
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    move-object v0, p0
+
+    move v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v5, p4
+
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/d$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
+
+.method private final ef()Landroidx/viewpager/widget/ViewPager;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/d;->xA:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/d;->viewPager$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x1
+    const/4 v2, 0x0
 
     aget-object v1, v1, v2
 
@@ -172,7 +220,7 @@
 
     move-result-object v0
 
-    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
+    check-cast v0, Landroidx/viewpager/widget/ViewPager;
 
     return-object v0
 .end method
@@ -182,23 +230,510 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0032
+    const v0, 0x7f0d0055
 
     return v0
 .end method
 
-.method public final onPause()V
-    .locals 0
+.method public final onCreate(Landroid/os/Bundle;)V
+    .locals 10
 
-    invoke-super {p0}, Lcom/discord/app/AppDialog;->onPause()V
+    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onCreate(Landroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/d;->dismiss()V
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getActivity()Landroidx/fragment/app/FragmentActivity;
+
+    move-result-object p1
+
+    check-cast p1, Landroid/app/Activity;
+
+    const/4 v0, 0x4
+
+    const/4 v1, 0x0
+
+    const/4 v2, 0x0
+
+    invoke-static {p1, v2, v1, v0, v1}, Lcom/discord/utilities/keyboard/Keyboard;->setKeyboardOpen$default(Landroid/app/Activity;ZLandroid/view/View;ILjava/lang/Object;)V
+
+    const/4 p1, 0x6
+
+    new-array p1, p1, [Lcom/discord/dialogs/d$b;
+
+    new-instance v1, Lcom/discord/dialogs/d$b;
+
+    const v3, 0x7f120f48
+
+    invoke-virtual {p0, v3}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "getString(R.string.premi\u2026psell_tag_passive_mobile)"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v4, 0x7f120f47
+
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "getString(R.string.premi\u2026l_tag_description_mobile)"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f08045f
+
+    invoke-direct {v1, v5, v3, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    aput-object v1, p1, v2
+
+    new-instance v1, Lcom/discord/dialogs/d$b;
+
+    const v3, 0x7f120f3f
+
+    invoke-virtual {p0, v3}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "getString(R.string.premi\u2026ell_emoji_passive_mobile)"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v4, 0x7f120f3e
+
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "getString(R.string.premi\u2026emoji_description_mobile)"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f080439
+
+    invoke-direct {v1, v5, v3, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    const/4 v3, 0x1
+
+    aput-object v1, p1, v3
+
+    new-instance v1, Lcom/discord/dialogs/d$b;
+
+    const v4, 0x7f120f39
+
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "getString(R.string.premi\u2026ed_emojis_passive_mobile)"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f120f38
+
+    invoke-virtual {p0, v5}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "getString(R.string.premi\u2026mojis_description_mobile)"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v6, 0x7f080415
+
+    invoke-direct {v1, v6, v4, v5}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    const/4 v4, 0x2
+
+    aput-object v1, p1, v4
+
+    new-instance v1, Lcom/discord/dialogs/d$b;
+
+    const v5, 0x7f120f4d
+
+    invoke-virtual {p0, v5}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "getString(R.string.premi\u2026ll_upload_passive_mobile)"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v6, 0x3
+
+    new-array v7, v6, [Ljava/lang/Object;
+
+    const v8, 0x7f1205e4
+
+    invoke-virtual {p0, v8}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    aput-object v8, v7, v2
+
+    const v8, 0x7f1205e3
+
+    invoke-virtual {p0, v8}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    aput-object v8, v7, v3
+
+    const v8, 0x7f1205e2
+
+    invoke-virtual {p0, v8}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v8
+
+    aput-object v8, v7, v4
+
+    const v4, 0x7f120f4c
+
+    invoke-virtual {p0, v4, v7}, Lcom/discord/dialogs/d;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v7, "getString(R.string.premi\u2026ad_limit_premium_tier_1))"
+
+    invoke-static {v4, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v7, 0x7f080460
+
+    invoke-direct {v1, v7, v5, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    aput-object v1, p1, v6
+
+    new-instance v1, Lcom/discord/dialogs/d$b;
+
+    const v4, 0x7f120f36
+
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "getString(R.string.premi\u2026ed_avatar_passive_mobile)"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f120f35
+
+    invoke-virtual {p0, v5}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "getString(R.string.premi\u2026vatar_description_mobile)"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v6, 0x7f08041e
+
+    invoke-direct {v1, v6, v4, v5}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    aput-object v1, p1, v0
+
+    new-instance v0, Lcom/discord/dialogs/d$b;
+
+    const v1, 0x7f120f3c
+
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v4, "getString(R.string.premi\u2026ell_badge_passive_mobile)"
+
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v4, 0x7f120f3b
+
+    invoke-virtual {p0, v4}, Lcom/discord/dialogs/d;->getString(I)Ljava/lang/String;
+
+    move-result-object v4
+
+    const-string v5, "getString(R.string.premi\u2026badge_description_mobile)"
+
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v5, 0x7f080421
+
+    invoke-direct {v0, v5, v1, v4}, Lcom/discord/dialogs/d$b;-><init>(ILjava/lang/String;Ljava/lang/String;)V
+
+    const/4 v1, 0x5
+
+    aput-object v0, p1, v1
+
+    invoke-static {p1}, Lkotlin/a/m;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "extra_page_number"
+
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;)I
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    const-string v4, "<set-?>"
+
+    const-string v5, ""
+
+    const-string v6, "extra_header_string"
+
+    if-eqz v1, :cond_3
+
+    invoke-virtual {v1, v6}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+
+    move-result v1
+
+    if-ne v1, v3, :cond_3
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/dialogs/d$b;
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v7
+
+    if-eqz v7, :cond_1
+
+    invoke-virtual {v7, v6}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v7
+
+    if-nez v7, :cond_2
+
+    :cond_1
+    move-object v7, v5
+
+    :cond_2
+    invoke-static {v7, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v7, v1, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    :cond_3
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v1
+
+    const-string v7, "extra_body_text"
+
+    if-eqz v1, :cond_6
+
+    invoke-virtual {v1, v7}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+
+    move-result v1
+
+    if-ne v1, v3, :cond_6
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/dialogs/d$b;
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v8
+
+    if-eqz v8, :cond_5
+
+    invoke-virtual {v8, v7}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v8
+
+    if-nez v8, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    move-object v5, v8
+
+    :cond_5
+    :goto_1
+    invoke-static {v5, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object v5, v1, Lcom/discord/dialogs/d$b;->bodyText:Ljava/lang/String;
+
+    :cond_6
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/dialogs/d$b;
+
+    invoke-static {v1}, Lkotlin/a/m;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/Collection;
+
+    check-cast p1, 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 {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    const/4 v5, 0x0
+
+    :goto_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v8
+
+    if-eqz v8, :cond_a
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v8
+
+    add-int/lit8 v9, v5, 0x1
+
+    if-gez v5, :cond_7
+
+    invoke-static {}, Lkotlin/a/m;->throwIndexOverflow()V
+
+    :cond_7
+    if-eq v5, v0, :cond_8
+
+    const/4 v5, 0x1
+
+    goto :goto_3
+
+    :cond_8
+    const/4 v5, 0x0
+
+    :goto_3
+    if-eqz v5, :cond_9
+
+    invoke-interface {v4, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    :cond_9
+    move v5, v9
+
+    goto :goto_2
+
+    :cond_a
+    check-cast v4, Ljava/util/List;
+
+    check-cast v4, Ljava/lang/Iterable;
+
+    invoke-static {v1, v4}, Lkotlin/a/m;->plus(Ljava/util/Collection;Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {p1, v1}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_4
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_b
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/dialogs/d$b;
+
+    sget-object v2, Lcom/discord/dialogs/d$c;->xy:Lcom/discord/dialogs/d$c$a;
+
+    iget v2, v1, Lcom/discord/dialogs/d$b;->xx:I
+
+    iget-object v3, v1, Lcom/discord/dialogs/d$b;->headerText:Ljava/lang/String;
+
+    iget-object v1, v1, Lcom/discord/dialogs/d$b;->bodyText:Ljava/lang/String;
+
+    const-string v4, "headerText"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v4, "bodyText"
+
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v4, Landroid/os/Bundle;
+
+    invoke-direct {v4}, Landroid/os/Bundle;-><init>()V
+
+    const-string v5, "extra_image_id"
+
+    invoke-virtual {v4, v5, v2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    invoke-virtual {v4, v6, v3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-virtual {v4, v7, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    new-instance v1, Lcom/discord/dialogs/d$c;
+
+    invoke-direct {v1}, Lcom/discord/dialogs/d$c;-><init>()V
+
+    invoke-virtual {v1, v4}, Lcom/discord/dialogs/d$c;->setArguments(Landroid/os/Bundle;)V
+
+    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_4
+
+    :cond_b
+    check-cast v0, Ljava/util/List;
+
+    new-instance p1, Lcom/discord/dialogs/d$d;
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v1
+
+    const-string v2, "childFragmentManager"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p1, v1, v0}, Lcom/discord/dialogs/d$d;-><init>(Landroidx/fragment/app/FragmentManager;Ljava/util/List;)V
+
+    iput-object p1, p0, Lcom/discord/dialogs/d;->xv:Lcom/discord/dialogs/d$d;
 
     return-void
 .end method
 
 .method public final onViewBound(Landroid/view/View;)V
-    .locals 4
+    .locals 2
 
     const-string v0, "view"
 
@@ -206,11 +741,28 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    iget-object p1, p0, Lcom/discord/dialogs/d;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+    invoke-direct {p0}, Lcom/discord/dialogs/d;->ef()Landroidx/viewpager/widget/ViewPager;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/dialogs/d;->xv:Lcom/discord/dialogs/d$d;
+
+    if-nez v0, :cond_0
+
+    const-string v1, "pagerAdapter"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(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/dialogs/d;->xu:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v0, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v1, 0x0
+    const/4 v1, 0x1
 
     aget-object v0, v0, v1
 
@@ -218,105 +770,57 @@
 
     move-result-object p1
 
-    check-cast p1, Landroid/widget/TextView;
+    check-cast p1, Lcom/google/android/material/tabs/TabLayout;
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArgumentsOrDefault()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/discord/dialogs/d;->ef()Landroidx/viewpager/widget/ViewPager;
 
     move-result-object v0
 
-    const-string v2, "INTENT_DIALOG_TITLE"
+    invoke-virtual {p1, v0}, Lcom/google/android/material/tabs/TabLayout;->setupWithViewPager(Landroidx/viewpager/widget/ViewPager;)V
 
-    const/4 v3, 0x0
-
-    invoke-virtual {v0, v2, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object p1, p0, Lcom/discord/dialogs/d;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object p1, p0, Lcom/discord/dialogs/d;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v0, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    aget-object v0, v0, v2
+    aget-object v0, v0, v1
 
     invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
     move-result-object p1
 
-    check-cast p1, Landroid/widget/Button;
+    check-cast p1, Landroid/view/View;
 
-    new-instance v0, Lcom/discord/dialogs/d$c;
+    new-instance v0, Lcom/discord/dialogs/d$e;
 
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/d$c;-><init>(Lcom/discord/dialogs/d;)V
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/d$e;-><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 {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/d;->getArgumentsOrDefault()Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/discord/dialogs/d;->learnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v0, Lcom/discord/dialogs/d;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v1, 0x3
+
+    aget-object v0, v0, v1
+
+    invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
     move-result-object p1
 
-    const-string v0, "INTENT_DIALOG_OPTIONS"
+    check-cast p1, Landroid/view/View;
 
-    invoke-virtual {p1, v0}, Landroid/os/Bundle;->getCharSequenceArray(Ljava/lang/String;)[Ljava/lang/CharSequence;
+    new-instance v0, Lcom/discord/dialogs/d$f;
 
-    move-result-object p1
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/d$f;-><init>(Lcom/discord/dialogs/d;)V
 
-    if-eqz p1, :cond_1
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    invoke-direct {p0}, Lcom/discord/dialogs/d;->ef()Landroidx/recyclerview/widget/RecyclerView;
+    invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    move-result-object v0
-
-    new-instance v2, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
-
-    invoke-static {p1}, Lkotlin/a/g;->asList([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    new-instance v3, Lcom/discord/dialogs/d$d;
-
-    invoke-direct {v3, p0}, Lcom/discord/dialogs/d$d;-><init>(Lcom/discord/dialogs/d;)V
-
-    check-cast v3, Lkotlin/jvm/functions/Function2;
-
-    invoke-direct {v2, p1, v3}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
-
-    check-cast v2, Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
-    invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/d;->ef()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
-
-    :cond_0
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
-
-    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
-
-    sget-object p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->Companion:Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;
-
-    invoke-direct {p0}, Lcom/discord/dialogs/d;->ef()Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v0
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;->addThemedDivider(Landroidx/recyclerview/widget/RecyclerView;)V
-
-    :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e$a.smali b/com.discord/smali/com/discord/dialogs/e$a.smali
index d6c9ad707f..ed009815a6 100644
--- a/com.discord/smali/com/discord/dialogs/e$a.smali
+++ b/com.discord/smali/com/discord/dialogs/e$a.smali
@@ -1,6 +1,6 @@
 .class public final Lcom/discord/dialogs/e$a;
 .super Ljava/lang/Object;
-.source "WidgetGiftAcceptDialog.kt"
+.source "SelectorDialog.kt"
 
 
 # annotations
@@ -31,112 +31,71 @@
     return-void
 .end method
 
-.method public static a(Ljava/lang/String;Ljava/lang/String;J)V
-    .locals 18
+.method public static a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/e;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroidx/fragment/app/FragmentManager;",
+            "Ljava/lang/String;",
+            "[",
+            "Ljava/lang/CharSequence;",
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;)",
+            "Lcom/discord/dialogs/e;"
+        }
+    .end annotation
 
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    const-string v2, "giftCode"
-
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v2, "source"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v2, Lcom/discord/stores/StoreNotices$Notice;
-
-    invoke-static/range {p0 .. p0}, Lcom/discord/dialogs/e$a;->getNoticeName(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v4
-
-    const/4 v3, 0x2
-
-    new-array v3, v3, [Lkotlin/reflect/b;
-
-    const-class v5, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
-
-    invoke-static {v5}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v5
-
-    const/4 v6, 0x0
-
-    aput-object v5, v3, v6
-
-    const-class v5, Lcom/discord/widgets/main/WidgetMain;
-
-    invoke-static {v5}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v5
-
-    const/4 v6, 0x1
-
-    aput-object v5, v3, v6
-
-    invoke-static {v3}, Lkotlin/a/m;->listOf([Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v10
-
-    new-instance v3, Lcom/discord/dialogs/e$a$a;
-
-    move-wide/from16 v5, p2
-
-    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
-
-    check-cast v15, Lkotlin/jvm/functions/Function1;
-
-    const-wide/16 v5, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/4 v9, 0x0
-
-    const-wide/16 v11, 0x0
-
-    const-wide/16 v13, 0x0
-
-    const/16 v16, 0x1a
-
-    const/16 v17, 0x0
-
-    move-object v3, v2
-
-    invoke-direct/range {v3 .. v17}, 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, v2}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
-
-    return-void
-.end method
-
-.method public static getNoticeName(Ljava/lang/String;)Ljava/lang/String;
-    .locals 1
-
-    const-string v0, "giftCode"
+    const-string v0, "fragmentManager"
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    const-string v0, "title"
 
-    move-result-object p0
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "gift:"
+    const-string v0, "options"
 
-    invoke-virtual {v0, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-result-object p0
+    const-string v0, "onSelectedListener"
 
-    return-object p0
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/dialogs/e;
+
+    invoke-direct {v0}, Lcom/discord/dialogs/e;-><init>()V
+
+    new-instance v1, Landroid/os/Bundle;
+
+    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
+
+    const-string v2, "INTENT_DIALOG_TITLE"
+
+    invoke-virtual {v1, v2, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p1, "INTENT_DIALOG_OPTIONS"
+
+    invoke-virtual {v1, p1, p2}, Landroid/os/Bundle;->putCharSequenceArray(Ljava/lang/String;[Ljava/lang/CharSequence;)V
+
+    invoke-virtual {v0, v1}, Lcom/discord/dialogs/e;->setArguments(Landroid/os/Bundle;)V
+
+    iput-object p3, v0, Lcom/discord/dialogs/e;->xB:Lkotlin/jvm/functions/Function1;
+
+    const-class p1, Lcom/discord/dialogs/e;
+
+    invoke-static {p1}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Ljava/lang/Object;->toString()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p0, p1}, Lcom/discord/dialogs/e;->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/e$b$a.smali
similarity index 50%
rename from com.discord/smali/com/discord/dialogs/d$b$a.smali
rename to com.discord/smali/com/discord/dialogs/e$b$a.smali
index c5042229e2..25d5150750 100644
--- a/com.discord/smali/com/discord/dialogs/d$b$a.smali
+++ b/com.discord/smali/com/discord/dialogs/e$b$a.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/d$b$a;
+.class final Lcom/discord/dialogs/e$b$a;
 .super Ljava/lang/Object;
 .source "SelectorDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/d$b;
+    value = Lcom/discord/dialogs/e$b;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic xC:Lcom/discord/dialogs/d$b;
+.field final synthetic xE:Lcom/discord/dialogs/e$b;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/d$b;)V
+.method constructor <init>(Lcom/discord/dialogs/e$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/d$b$a;->xC:Lcom/discord/dialogs/d$b;
+    iput-object p1, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,17 +37,17 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/discord/dialogs/d$b$a;->xC:Lcom/discord/dialogs/d$b;
+    iget-object p1, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
 
-    iget-object p1, p1, Lcom/discord/dialogs/d$b;->this$0:Lcom/discord/dialogs/d;
+    iget-object p1, p1, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
-    iget-object p1, p1, Lcom/discord/dialogs/d;->xz:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p1, Lcom/discord/dialogs/e;->xB:Lkotlin/jvm/functions/Function1;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/dialogs/d$b$a;->xC:Lcom/discord/dialogs/d$b;
+    iget-object v0, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
 
-    invoke-virtual {v0}, Lcom/discord/dialogs/d$b;->getAdapterPosition()I
+    invoke-virtual {v0}, Lcom/discord/dialogs/e$b;->getAdapterPosition()I
 
     move-result v0
 
@@ -58,11 +58,11 @@
     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;->xC:Lcom/discord/dialogs/d$b;
+    iget-object p1, p0, Lcom/discord/dialogs/e$b$a;->xE:Lcom/discord/dialogs/e$b;
 
-    iget-object p1, p1, Lcom/discord/dialogs/d$b;->this$0:Lcom/discord/dialogs/d;
+    iget-object p1, p1, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/d;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e$b.smali b/com.discord/smali/com/discord/dialogs/e$b.smali
index 62bc890e54..95b899b09c 100644
--- a/com.discord/smali/com/discord/dialogs/e$b.smali
+++ b/com.discord/smali/com/discord/dialogs/e$b.smali
@@ -1,9 +1,6 @@
-.class final Lcom/discord/dialogs/e$b;
-.super Ljava/lang/Object;
-.source "WidgetGiftAcceptDialog.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
+.class public final Lcom/discord/dialogs/e$b;
+.super Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;
+.source "SelectorDialog.kt"
 
 
 # annotations
@@ -12,34 +9,75 @@
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
+    accessFlags = 0x11
+    name = "b"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder<",
+        "Ljava/lang/CharSequence;",
+        ">;"
+    }
 .end annotation
 
 
 # instance fields
+.field private final nameTv:Landroid/widget/TextView;
+
 .field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/e;)V
-    .locals 0
+.method public constructor <init>(Lcom/discord/dialogs/e;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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iput-object p1, p0, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    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/dialogs/e$b;->nameTv:Landroid/widget/TextView;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 0
+.method public final synthetic bind(Ljava/lang/Object;)V
+    .locals 1
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$b;->this$0:Lcom/discord/dialogs/e;
+    check-cast p1, Ljava/lang/CharSequence;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
+    const-string v0, "data"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/dialogs/e$b;->nameTv:Landroid/widget/TextView;
+
+    invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object p1, p0, Lcom/discord/dialogs/e$b;->nameTv:Landroid/widget/TextView;
+
+    new-instance v0, Lcom/discord/dialogs/e$b$a;
+
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$b$a;-><init>(Lcom/discord/dialogs/e$b;)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/dialogs/e$c.smali b/com.discord/smali/com/discord/dialogs/e$c.smali
index 2b4c49e81d..c8bf3fdd3d 100644
--- a/com.discord/smali/com/discord/dialogs/e$c.smali
+++ b/com.discord/smali/com/discord/dialogs/e$c.smali
@@ -1,14 +1,14 @@
 .class final Lcom/discord/dialogs/e$c;
 .super Ljava/lang/Object;
-.source "WidgetGiftAcceptDialog.kt"
+.source "SelectorDialog.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/e;
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/dialogs/e$d.smali b/com.discord/smali/com/discord/dialogs/e$d.smali
index e133cc6f57..89d23b93c1 100644
--- a/com.discord/smali/com/discord/dialogs/e$d.smali
+++ b/com.discord/smali/com/discord/dialogs/e$d.smali
@@ -1,14 +1,14 @@
 .class final Lcom/discord/dialogs/e$d;
-.super Ljava/lang/Object;
-.source "WidgetGiftAcceptDialog.kt"
+.super Lkotlin/jvm/internal/m;
+.source "SelectorDialog.kt"
 
 # interfaces
-.implements Landroid/view/View$OnClickListener;
+.implements Lkotlin/jvm/functions/Function2;
 
 
 # annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/e;
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -16,40 +16,69 @@
     name = null
 .end annotation
 
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/m;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroid/view/LayoutInflater;",
+        "Landroid/view/ViewGroup;",
+        "Lcom/discord/dialogs/e$b;",
+        ">;"
+    }
+.end annotation
+
 
 # instance fields
-.field final synthetic xG:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+.field final synthetic this$0:Lcom/discord/dialogs/e;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+.method constructor <init>(Lcom/discord/dialogs/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/e$d;->xG:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+    iput-object p1, p0, Lcom/discord/dialogs/e$d;->this$0:Lcom/discord/dialogs/e;
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 p1, 0x2
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final onClick(Landroid/view/View;)V
-    .locals 1
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    .locals 2
 
-    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    check-cast p1, Landroid/view/LayoutInflater;
 
-    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGifting()Lcom/discord/stores/StoreGifting;
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const-string v0, "inflater"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "parent"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0d0034
+
+    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
 
-    iget-object v0, p0, Lcom/discord/dialogs/e$d;->xG:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+    new-instance p2, Lcom/discord/dialogs/e$b;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getGift()Lcom/discord/models/domain/ModelGift;
+    iget-object v0, p0, Lcom/discord/dialogs/e$d;->this$0:Lcom/discord/dialogs/e;
 
-    move-result-object v0
+    const-string v1, "itemView"
 
-    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreGifting;->acceptGift(Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-void
+    invoke-direct {p2, v0, p1}, Lcom/discord/dialogs/e$b;-><init>(Lcom/discord/dialogs/e;Landroid/view/View;)V
+
+    return-object p2
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e.smali b/com.discord/smali/com/discord/dialogs/e.smali
index 8bdfcb597f..5854815685 100644
--- a/com.discord/smali/com/discord/dialogs/e.smali
+++ b/com.discord/smali/com/discord/dialogs/e.smali
@@ -1,11 +1,12 @@
 .class public final Lcom/discord/dialogs/e;
 .super Lcom/discord/app/AppDialog;
-.source "WidgetGiftAcceptDialog.kt"
+.source "SelectorDialog.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
+        Lcom/discord/dialogs/e$b;,
         Lcom/discord/dialogs/e$a;
     }
 .end annotation
@@ -14,19 +15,27 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final xF:Lcom/discord/dialogs/e$a;
+.field public static final xD:Lcom/discord/dialogs/e$a;
 
 
 # instance fields
-.field private final dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private final cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private final titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field xB:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "-",
+            "Ljava/lang/Integer;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
 
-.field private final xD:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final xE:Lkotlin/properties/ReadOnlyProperty;
+.field private final xC:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
@@ -35,7 +44,7 @@
 
     const-class v0, Lcom/discord/dialogs/e;
 
-    const/4 v1, 0x5
+    const/4 v1, 0x3
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -45,9 +54,9 @@
 
     move-result-object v3
 
-    const-string v4, "dialogHeader"
+    const-string v4, "titleTv"
 
-    const-string v5, "getDialogHeader()Lcom/discord/app/AppTextView;"
+    const-string v5, "getTitleTv()Landroid/widget/TextView;"
 
     invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -67,9 +76,9 @@
 
     move-result-object v4
 
-    const-string v5, "dialogText"
+    const-string v5, "listRv"
 
-    const-string v6, "getDialogText()Lcom/discord/app/AppTextView;"
+    const-string v6, "getListRv()Landroidx/recyclerview/widget/RecyclerView;"
 
     invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -87,55 +96,11 @@
 
     invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
-    move-result-object v4
-
-    const-string v5, "dialogImage"
-
-    const-string v6, "getDialogImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
-
-    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v4
-
-    const-string v5, "button"
-
-    const-string v6, "getButton()Landroid/widget/Button;"
-
-    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
-
-    move-result-object v2
-
-    check-cast v2, Lkotlin/reflect/KProperty;
-
-    const/4 v4, 0x3
-
-    aput-object v2, v1, v4
-
-    new-instance v2, Lkotlin/jvm/internal/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
     move-result-object v0
 
-    const-string v4, "progress"
+    const-string v4, "cancelBtn"
 
-    const-string v5, "getProgress()Landroid/view/View;"
+    const-string v5, "getCancelBtn()Landroid/widget/Button;"
 
     invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -145,7 +110,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x2
 
     aput-object v0, v1, v2
 
@@ -155,7 +120,7 @@
 
     invoke-direct {v0, v3}, Lcom/discord/dialogs/e$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/dialogs/e;->xF:Lcom/discord/dialogs/e$a;
+    sput-object v0, Lcom/discord/dialogs/e;->xD:Lcom/discord/dialogs/e$a;
 
     return-void
 .end method
@@ -165,1191 +130,37 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a000a
+    const v0, 0x7f0a0274
 
     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/e;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0008
+    const v0, 0x7f0a0273
 
     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/e;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->xC:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0007
+    const v0, 0x7f0a025f
 
     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/e;->xD:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a0009
-
-    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/e;->xE:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a000b
-
-    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/e;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object v0, p0, Lcom/discord/dialogs/e;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
 
-.method public static final synthetic a(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
-    .locals 2
-
-    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f120798
-
-    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f12077c
-
-    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const v1, 0x7f120791
-
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/dialogs/e$f;
-
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$f;-><init>(Lcom/discord/dialogs/e;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.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/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Lcom/discord/app/AppTextView;
-
-    move-result-object v0
-
-    const v1, 0x7f120798
-
-    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object v0
-
-    const v1, 0x7f12078d
-
-    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    const/4 v3, 0x0
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v0, v2, v4}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getCanRetry()Z
-
-    move-result v0
-
-    const/4 v2, 0x0
-
-    if-eqz v0, :cond_1
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
-
-    move-result-object v1
-
-    if-eqz v1, :cond_0
-
-    const v2, 0x7f120f52
-
-    invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
-    move-result-object v2
-
-    :cond_0
-    invoke-virtual {v0, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p0
-
-    new-instance v0, Lcom/discord/dialogs/e$d;
-
-    invoke-direct {v0, p1}, Lcom/discord/dialogs/e$d;-><init>(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p0, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-
-    :cond_1
-    invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getErrorCode()Ljava/lang/Integer;
-
-    move-result-object p1
-
-    if-nez p1, :cond_2
-
-    goto :goto_0
-
-    :cond_2
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    const v1, 0xc386
-
-    if-ne v0, v1, :cond_3
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f120780
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
-
-    goto :goto_3
-
-    :cond_3
-    :goto_0
-    if-nez p1, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    const v1, 0x186b8
-
-    if-ne v0, v1, :cond_5
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f12077c
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
-
-    goto :goto_3
-
-    :cond_5
-    :goto_1
-    if-nez p1, :cond_6
-
-    goto :goto_2
-
-    :cond_6
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    const v1, 0x186b6
-
-    if-ne v0, v1, :cond_7
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f12077d
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
-
-    goto :goto_3
-
-    :cond_7
-    :goto_2
-    if-nez p1, :cond_8
-
-    goto :goto_3
-
-    :cond_8
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
-
-    move-result p1
-
-    const v0, 0x186b9
-
-    if-ne p1, v0, :cond_9
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f12077b
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
-
-    :cond_9
-    :goto_3
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_a
-
-    const v1, 0x7f120791
-
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
-    move-result-object v2
-
-    :cond_a
-    invoke-virtual {p1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/dialogs/e$e;
-
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$e;-><init>(Lcom/discord/dialogs/e;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method private final a(Lcom/discord/models/domain/ModelGift;)V
-    .locals 9
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ei()Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/ImageView;
-
-    sget-object v2, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
-
-    invoke-virtual {v2, p1}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
-
-    move-result p1
-
-    const/4 v2, 0x4
-
-    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
-
-    goto :goto_1
-
-    :cond_0
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_2
-
-    sget-object v2, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
-
-    move-result-wide v0
-
-    goto :goto_0
-
-    :cond_1
-    const-wide/16 v0, 0x0
-
-    :goto_0
-    move-wide v3, v0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x4
-
-    const/4 v8, 0x0
-
-    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v1
-
-    :cond_2
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ei()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/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    const/4 v0, 0x0
-
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ek()Landroid/view/View;
-
-    move-result-object p1
-
-    const/16 v0, 0x8
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
-
-    return-void
-.end method
-
-.method private final b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
-    .locals 8
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getSubscriptionPlan()Lcom/discord/models/domain/ModelSubscriptionPlan;
-
-    move-result-object p1
-
-    if-nez p1, :cond_0
-
-    const-string p1, ""
-
-    return-object p1
-
-    :cond_0
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getInterval()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
-
-    move-result-object v0
-
-    sget-object v1, Lcom/discord/dialogs/f;->$EnumSwitchMapping$0:[I
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
-
-    move-result v0
-
-    aget v0, v1, v0
-
-    const/4 v1, 0x2
-
-    const/4 v2, 0x1
-
-    if-eq v0, v2, :cond_2
-
-    if-ne v0, v1, :cond_1
-
-    const v0, 0x7f100052
-
-    goto :goto_0
-
-    :cond_1
-    new-instance p1, Lkotlin/k;
-
-    invoke-direct {p1}, Lkotlin/k;-><init>()V
-
-    throw p1
-
-    :cond_2
-    const v0, 0x7f100051
-
-    :goto_0
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->requireContext()Landroid/content/Context;
-
-    move-result-object v3
-
-    const-string v4, "requireContext()"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v3
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
-
-    move-result v4
-
-    new-array v5, v2, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
-
-    move-result v6
-
-    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v6
-
-    const/4 v7, 0x0
-
-    aput-object v6, v5, v7
-
-    invoke-virtual {v3, v0, v4, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v3, "requireContext().resourc\u2026t, subPlan.intervalCount)"
-
-    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/dialogs/f;->$EnumSwitchMapping$1:[I
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
-
-    move-result v3
-
-    aget v3, v4, v3
-
-    const-string v4, "getString(R.string.gift_\u2026String(), timeUnitString)"
-
-    if-eq v3, v2, :cond_4
-
-    if-ne v3, v1, :cond_3
-
-    const v3, 0x7f12079c
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    aput-object p1, v1, v7
-
-    aput-object v0, v1, v2
-
-    invoke-virtual {p0, v3, v1}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-
-    :cond_3
-    new-instance p1, Lkotlin/k;
-
-    invoke-direct {p1}, Lkotlin/k;-><init>()V
-
-    throw p1
-
-    :cond_4
-    const v3, 0x7f12079b
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object p1
-
-    aput-object p1, v1, v7
-
-    aput-object v0, v1, v2
-
-    invoke-virtual {p0, v3, v1}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    invoke-static {p1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
-
-.method public static final synthetic b(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
-    .locals 6
-
-    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;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    :cond_0
-    const-string v0, ""
-
-    :cond_1
-    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_2
-
-    const v2, 0x7f12079a
-
-    new-array v5, v3, [Ljava/lang/Object;
-
-    aput-object v0, v5, v4
-
-    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, 0x7f120799
-
-    invoke-virtual {p0, v2}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    :goto_0
-    const-string v5, "when {\n      gift.isAnyN\u2026ion_header_success)\n    }"
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isNitroClassicGift()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_3
-
-    const p1, 0x7f120787
-
-    new-array v0, v3, [Ljava/lang/Object;
-
-    aput-object v1, v0, v4
-
-    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_3
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isNitroGift()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_4
-
-    const p1, 0x7f120788
-
-    new-array v0, v3, [Ljava/lang/Object;
-
-    aput-object v1, v0, v4
-
-    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, 0x7f120786
-
-    new-array v1, v3, [Ljava/lang/Object;
-
-    aput-object v0, v1, v4
-
-    invoke-virtual {p0, p1, v1}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    :goto_1
-    const-string v0, "when {\n      gift.isNitr\u2026ccess_mobile, name)\n    }"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Lcom/discord/app/AppTextView;
-
-    move-result-object v0
-
-    check-cast v2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object v0
-
-    new-array v1, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_5
-
-    const v1, 0x7f120795
-
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_5
-    const/4 v0, 0x0
-
-    :goto_2
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/dialogs/e$b;
-
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$b;-><init>(Lcom/discord/dialogs/e;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method public static final synthetic c(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
-    .locals 2
-
-    invoke-direct {p0, p1}, Lcom/discord/dialogs/e;->a(Lcom/discord/models/domain/ModelGift;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f120798
-
-    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p1
-
-    const v0, 0x7f120778
-
-    invoke-virtual {p0, v0}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    new-array v1, v1, [Ljava/lang/Object;
-
-    invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const v1, 0x7f120791
-
-    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p1
-
-    new-instance v0, Lcom/discord/dialogs/e$c;
-
-    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$c;-><init>(Lcom/discord/dialogs/e;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method public static final synthetic d(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
-    .locals 7
-
-    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;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    move-object v0, v1
-
-    :goto_0
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
-    move-result v2
-
-    const/4 v3, 0x1
-
-    const/4 v4, 0x0
-
-    if-eqz v2, :cond_1
-
-    const v2, 0x7f120797
-
-    new-array v5, v3, [Ljava/lang/Object;
-
-    aput-object v0, v5, v4
-
-    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, 0x7f120796
-
-    invoke-virtual {p0, v2}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    :goto_1
-    const-string v5, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
-
-    invoke-static {v2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_2
-
-    const v5, 0x7f12077a
-
-    const/4 v6, 0x2
-
-    new-array v6, v6, [Ljava/lang/Object;
-
-    aput-object v0, v6, v4
-
-    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/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_2
-
-    :cond_2
-    const v5, 0x7f120779
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    aput-object v0, v3, v4
-
-    invoke-virtual {p0, v5, v3}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    :goto_2
-    const-string v3, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
-
-    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Lcom/discord/app/AppTextView;
-
-    move-result-object v3
-
-    check-cast v2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v3, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object v2
-
-    new-array v3, v4, [Ljava/lang/Object;
-
-    invoke-virtual {v2, v0, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_3
-
-    const v1, 0x7f12078f
-
-    invoke-virtual {v2, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
-
-    move-result-object v1
-
-    :cond_3
-    invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object p0
-
-    new-instance v0, Lcom/discord/dialogs/e$g;
-
-    invoke-direct {v0, p1}, Lcom/discord/dialogs/e$g;-><init>(Lcom/discord/models/domain/ModelGift;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p0, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-.end method
-
-.method public static final synthetic e(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
-    .locals 6
-
-    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;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ej()Landroid/widget/Button;
-
-    move-result-object v1
-
-    const/16 v2, 0x8
-
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->ek()Landroid/view/View;
-
-    move-result-object v1
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
-    move-result v1
-
-    const/4 v3, 0x1
-
-    if-eqz v1, :cond_1
-
-    const v1, 0x7f120797
-
-    new-array v4, v3, [Ljava/lang/Object;
-
-    aput-object v0, v4, v2
-
-    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, 0x7f120796
-
-    invoke-virtual {p0, v1}, Lcom/discord/dialogs/e;->getString(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    :goto_1
-    const-string v4, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
-
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_2
-
-    const v4, 0x7f12077a
-
-    const/4 v5, 0x2
-
-    new-array v5, v5, [Ljava/lang/Object;
-
-    aput-object v0, v5, v2
-
-    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/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    goto :goto_2
-
-    :cond_2
-    const p1, 0x7f120779
-
-    new-array v3, v3, [Ljava/lang/Object;
-
-    aput-object v0, v3, v2
-
-    invoke-virtual {p0, p1, v3}, Lcom/discord/dialogs/e;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object p1
-
-    :goto_2
-    const-string v0, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Lcom/discord/app/AppTextView;
-
-    move-result-object v0
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/dialogs/e;->eh()Lcom/discord/app/AppTextView;
-
-    move-result-object p0
-
-    new-array v0, v2, [Ljava/lang/Object;
-
-    invoke-virtual {p0, p1, v0}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
-
-    return-void
-.end method
-
-.method private final eg()Lcom/discord/app/AppTextView;
+.method private final eg()Landroidx/recyclerview/widget/RecyclerView;
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/dialogs/e;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/e;->$$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/app/AppTextView;
-
-    return-object v0
-.end method
-
-.method private final eh()Lcom/discord/app/AppTextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/dialogs/e;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/dialogs/e;->xC:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -1361,67 +172,7 @@
 
     move-result-object v0
 
-    check-cast v0, Lcom/discord/app/AppTextView;
-
-    return-object v0
-.end method
-
-.method private final ei()Lcom/facebook/drawee/view/SimpleDraweeView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/dialogs/e;->xD:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/e;->$$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/facebook/drawee/view/SimpleDraweeView;
-
-    return-object v0
-.end method
-
-.method private final ej()Landroid/widget/Button;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/dialogs/e;->xE:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/e;->$$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/Button;
-
-    return-object v0
-.end method
-
-.method private final ek()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/dialogs/e;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/dialogs/e;->$$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;
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
 
     return-object v0
 .end method
@@ -1431,54 +182,23 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00b6
+    const v0, 0x7f0d0033
 
     return v0
 .end method
 
-.method public final onDestroy()V
-    .locals 2
+.method public final onPause()V
+    .locals 0
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getArguments()Landroid/os/Bundle;
+    invoke-super {p0}, Lcom/discord/app/AppDialog;->onPause()V
 
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const-string v1, "ARG_GIFT_CODE"
-
-    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    const-string v1, "it"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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
-
-    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;->getNotices()Lcom/discord/stores/StoreNotices;
-
-    move-result-object v1
-
-    invoke-virtual {v1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
-
-    :cond_0
-    invoke-super {p0}, Lcom/discord/app/AppDialog;->onDestroy()V
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->dismiss()V
 
     return-void
 .end method
 
 .method public final onViewBound(Landroid/view/View;)V
-    .locals 12
+    .locals 4
 
     const-string v0, "view"
 
@@ -1486,106 +206,117 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getArguments()Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/discord/dialogs/e;->titleTv$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v0, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v1, 0x0
+
+    aget-object v0, v0, v1
+
+    invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
     move-result-object p1
 
-    const/4 v0, 0x0
+    check-cast p1, Landroid/widget/TextView;
 
-    if-eqz p1, :cond_0
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    const-string v1, "ARG_GIFT_CODE"
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+    const-string v2, "INTENT_DIALOG_TITLE"
 
-    move-result-object p1
+    const/4 v3, 0x0
 
-    goto :goto_0
+    invoke-virtual {v0, v2, v3}, Landroid/os/Bundle;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
-    :cond_0
-    move-object p1, v0
+    move-result-object v0
 
-    :goto_0
-    if-nez p1, :cond_1
+    check-cast v0, Ljava/lang/CharSequence;
 
-    invoke-virtual {p0}, Lcom/discord/dialogs/e;->dismiss()V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    return-void
+    iget-object p1, p0, Lcom/discord/dialogs/e;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    :cond_1
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGifting()Lcom/discord/stores/StoreGifting;
-
-    move-result-object v1
-
-    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreGifting;->requestGift(Ljava/lang/String;)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()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/dialogs/e$h;->xH:Lcom/discord/dialogs/e$h;
-
-    check-cast v2, Lrx/functions/Func2;
-
-    invoke-static {p1, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v1, "Observable.combineLatest\u2026, me -> giftState to me }"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v1, p0
-
-    check-cast v1, Lcom/discord/app/AppComponent;
+    sget-object v0, Lcom/discord/dialogs/e;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
     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;
+    aget-object v0, v0, v2
 
-    move-result-object v3
+    invoke-interface {p1, p0, v0}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    move-result-object p1
 
-    move-result-object v4
+    check-cast p1, Landroid/widget/Button;
 
-    const/4 v5, 0x0
+    new-instance v0, Lcom/discord/dialogs/e$c;
 
-    const/4 v6, 0x0
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/e$c;-><init>(Lcom/discord/dialogs/e;)V
 
-    new-instance p1, Lcom/discord/dialogs/e$i;
+    check-cast v0, Landroid/view/View$OnClickListener;
 
-    invoke-direct {p1, p0}, Lcom/discord/dialogs/e$i;-><init>(Lcom/discord/dialogs/e;)V
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    move-object v7, p1
+    invoke-virtual {p0}, Lcom/discord/dialogs/e;->getArgumentsOrDefault()Landroid/os/Bundle;
 
-    check-cast v7, Lkotlin/jvm/functions/Function1;
+    move-result-object p1
 
-    const/4 v8, 0x0
+    const-string v0, "INTENT_DIALOG_OPTIONS"
 
-    new-instance p1, Lcom/discord/dialogs/e$j;
+    invoke-virtual {p1, v0}, Landroid/os/Bundle;->getCharSequenceArray(Ljava/lang/String;)[Ljava/lang/CharSequence;
 
-    invoke-direct {p1, p0}, Lcom/discord/dialogs/e$j;-><init>(Lcom/discord/dialogs/e;)V
+    move-result-object p1
 
-    move-object v9, p1
+    if-eqz p1, :cond_1
 
-    check-cast v9, Lkotlin/jvm/functions/Function1;
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Landroidx/recyclerview/widget/RecyclerView;
 
-    const/16 v10, 0x16
+    move-result-object v0
 
-    const/4 v11, 0x0
+    new-instance v2, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static {p1}, Lkotlin/a/g;->asList([Ljava/lang/Object;)Ljava/util/List;
 
+    move-result-object p1
+
+    new-instance v3, Lcom/discord/dialogs/e$d;
+
+    invoke-direct {v3, p0}, Lcom/discord/dialogs/e$d;-><init>(Lcom/discord/dialogs/e;)V
+
+    check-cast v3, Lkotlin/jvm/functions/Function2;
+
+    invoke-direct {v2, p1, v3}, Lcom/discord/utilities/views/SimpleRecyclerAdapter;-><init>(Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
+
+    check-cast v2, Landroidx/recyclerview/widget/RecyclerView$Adapter;
+
+    invoke-virtual {v0, v2}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView;->getAdapter()Landroidx/recyclerview/widget/RecyclerView$Adapter;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->notifyDataSetChanged()V
+
+    :cond_0
+    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+
+    invoke-virtual {p1, v1}, Landroidx/recyclerview/widget/RecyclerView;->setNestedScrollingEnabled(Z)V
+
+    sget-object p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;->Companion:Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;
+
+    invoke-direct {p0}, Lcom/discord/dialogs/e;->eg()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$Companion;->addThemedDivider(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    :cond_1
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e$a$a.smali b/com.discord/smali/com/discord/dialogs/f$a$a.smali
similarity index 77%
rename from com.discord/smali/com/discord/dialogs/e$a$a.smali
rename to com.discord/smali/com/discord/dialogs/f$a$a.smali
index ce0e07372f..f7ecff5fab 100644
--- a/com.discord/smali/com/discord/dialogs/e$a$a.smali
+++ b/com.discord/smali/com/discord/dialogs/f$a$a.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$a$a;
+.class final Lcom/discord/dialogs/f$a$a;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    value = Lcom/discord/dialogs/f$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/dialogs/e$a$a;->$giftCode:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/dialogs/f$a$a;->$giftCode:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/discord/dialogs/e$a$a;->$source:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/dialogs/f$a$a;->$source:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/discord/dialogs/e$a$a;->$channelId:J
+    iput-wide p3, p0, Lcom/discord/dialogs/f$a$a;->$channelId:J
 
     const/4 p1, 0x1
 
@@ -69,29 +69,29 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/dialogs/e$a$a;->$giftCode:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/dialogs/f$a$a;->$giftCode:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/discord/dialogs/e$a$a;->$source:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/dialogs/f$a$a;->$source:Ljava/lang/String;
 
-    iget-wide v3, p0, Lcom/discord/dialogs/e$a$a;->$channelId:J
+    iget-wide v3, p0, Lcom/discord/dialogs/f$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/dialogs/e;
+    new-instance v0, Lcom/discord/dialogs/f;
 
-    invoke-direct {v0}, Lcom/discord/dialogs/e;-><init>()V
+    invoke-direct {v0}, Lcom/discord/dialogs/f;-><init>()V
 
     new-instance v1, Landroid/os/Bundle;
 
     invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v2, p0, Lcom/discord/dialogs/e$a$a;->$giftCode:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/dialogs/f$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/dialogs/e;->setArguments(Landroid/os/Bundle;)V
+    invoke-virtual {v0, v1}, Lcom/discord/dialogs/f;->setArguments(Landroid/os/Bundle;)V
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
 
@@ -101,7 +101,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-class v1, Lcom/discord/dialogs/e;
+    const-class v1, Lcom/discord/dialogs/f;
 
     invoke-static {v1}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -111,7 +111,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/dialogs/e;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+    invoke-virtual {v0, p1, v1}, Lcom/discord/dialogs/f;->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/dialogs/f$a.smali b/com.discord/smali/com/discord/dialogs/f$a.smali
new file mode 100644
index 0000000000..242917b412
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/f$a.smali
@@ -0,0 +1,142 @@
+.class public final Lcom/discord/dialogs/f$a;
+.super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/f;
+.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/f$a;-><init>()V
+
+    return-void
+.end method
+
+.method public static a(Ljava/lang/String;Ljava/lang/String;J)V
+    .locals 18
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    const-string v2, "giftCode"
+
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "source"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v2, Lcom/discord/stores/StoreNotices$Notice;
+
+    invoke-static/range {p0 .. p0}, Lcom/discord/dialogs/f$a;->getNoticeName(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
+    const/4 v3, 0x2
+
+    new-array v3, v3, [Lkotlin/reflect/b;
+
+    const-class v5, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;
+
+    invoke-static {v5}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v5
+
+    const/4 v6, 0x0
+
+    aput-object v5, v3, v6
+
+    const-class v5, Lcom/discord/widgets/main/WidgetMain;
+
+    invoke-static {v5}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v5
+
+    const/4 v6, 0x1
+
+    aput-object v5, v3, v6
+
+    invoke-static {v3}, Lkotlin/a/m;->listOf([Ljava/lang/Object;)Ljava/util/List;
+
+    move-result-object v10
+
+    new-instance v3, Lcom/discord/dialogs/f$a$a;
+
+    move-wide/from16 v5, p2
+
+    invoke-direct {v3, v0, v1, v5, v6}, Lcom/discord/dialogs/f$a$a;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
+
+    move-object v15, v3
+
+    check-cast v15, Lkotlin/jvm/functions/Function1;
+
+    const-wide/16 v5, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const-wide/16 v11, 0x0
+
+    const-wide/16 v13, 0x0
+
+    const/16 v16, 0x1a
+
+    const/16 v17, 0x0
+
+    move-object v3, v2
+
+    invoke-direct/range {v3 .. v17}, 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, v2}, Lcom/discord/stores/StoreNotices;->requestToShow(Lcom/discord/stores/StoreNotices$Notice;)V
+
+    return-void
+.end method
+
+.method public static getNoticeName(Ljava/lang/String;)Ljava/lang/String;
+    .locals 1
+
+    const-string v0, "giftCode"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string v0, "gift:"
+
+    invoke-virtual {v0, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p0
+
+    return-object p0
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/e$f.smali b/com.discord/smali/com/discord/dialogs/f$b.smali
similarity index 58%
rename from com.discord/smali/com/discord/dialogs/e$f.smali
rename to com.discord/smali/com/discord/dialogs/f$b.smali
index b8a4786877..24ac7e9d66 100644
--- a/com.discord/smali/com/discord/dialogs/e$f.smali
+++ b/com.discord/smali/com/discord/dialogs/f$b.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$f;
+.class final Lcom/discord/dialogs/f$b;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/e;
+    value = Lcom/discord/dialogs/f;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/dialogs/e;
+.field final synthetic this$0:Lcom/discord/dialogs/f;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/e;)V
+.method constructor <init>(Lcom/discord/dialogs/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/e$f;->this$0:Lcom/discord/dialogs/e;
+    iput-object p1, p0, Lcom/discord/dialogs/f$b;->this$0:Lcom/discord/dialogs/f;
 
     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/dialogs/e$f;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$b;->this$0:Lcom/discord/dialogs/f;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e$e.smali b/com.discord/smali/com/discord/dialogs/f$c.smali
similarity index 58%
rename from com.discord/smali/com/discord/dialogs/e$e.smali
rename to com.discord/smali/com/discord/dialogs/f$c.smali
index 70a1154deb..393e212014 100644
--- a/com.discord/smali/com/discord/dialogs/e$e.smali
+++ b/com.discord/smali/com/discord/dialogs/f$c.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$e;
+.class final Lcom/discord/dialogs/f$c;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/e;
+    value = Lcom/discord/dialogs/f;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/dialogs/e;
+.field final synthetic this$0:Lcom/discord/dialogs/f;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/e;)V
+.method constructor <init>(Lcom/discord/dialogs/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/e$e;->this$0:Lcom/discord/dialogs/e;
+    iput-object p1, p0, Lcom/discord/dialogs/f$c;->this$0:Lcom/discord/dialogs/f;
 
     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/dialogs/e$e;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$c;->this$0:Lcom/discord/dialogs/f;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/f$d.smali b/com.discord/smali/com/discord/dialogs/f$d.smali
new file mode 100644
index 0000000000..1aa0d973fb
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/f$d.smali
@@ -0,0 +1,55 @@
+.class final Lcom/discord/dialogs/f$d;
+.super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic xI: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/dialogs/f$d;->xI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+
+    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;->getGifting()Lcom/discord/stores/StoreGifting;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/dialogs/f$d;->xI:Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getGift()Lcom/discord/models/domain/ModelGift;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/stores/StoreGifting;->acceptGift(Lcom/discord/models/domain/ModelGift;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/f$e.smali b/com.discord/smali/com/discord/dialogs/f$e.smali
new file mode 100644
index 0000000000..ff4e0d6051
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/f$e.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/dialogs/f$e;
+.super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/dialogs/f;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/dialogs/f;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/f$e;->this$0:Lcom/discord/dialogs/f;
+
+    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/f$e;->this$0:Lcom/discord/dialogs/f;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/f$f.smali b/com.discord/smali/com/discord/dialogs/f$f.smali
new file mode 100644
index 0000000000..291c8c51b4
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/f$f.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/dialogs/f$f;
+.super Ljava/lang/Object;
+.source "WidgetGiftAcceptDialog.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/dialogs/f;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/dialogs/f;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/dialogs/f;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/dialogs/f$f;->this$0:Lcom/discord/dialogs/f;
+
+    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/f$f;->this$0:Lcom/discord/dialogs/f;
+
+    invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/dialogs/e$g.smali b/com.discord/smali/com/discord/dialogs/f$g.smali
similarity index 84%
rename from com.discord/smali/com/discord/dialogs/e$g.smali
rename to com.discord/smali/com/discord/dialogs/f$g.smali
index 2d57ae0e18..eeb34d96d1 100644
--- a/com.discord/smali/com/discord/dialogs/e$g.smali
+++ b/com.discord/smali/com/discord/dialogs/f$g.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$g;
+.class final Lcom/discord/dialogs/f$g;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/dialogs/e;
+    value = Lcom/discord/dialogs/f;
 .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/dialogs/e$g;->$gift:Lcom/discord/models/domain/ModelGift;
+    iput-object p1, p0, Lcom/discord/dialogs/f$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/dialogs/e$g;->$gift:Lcom/discord/models/domain/ModelGift;
+    iget-object v0, p0, Lcom/discord/dialogs/f$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/dialogs/e$h.smali b/com.discord/smali/com/discord/dialogs/f$h.smali
similarity index 78%
rename from com.discord/smali/com/discord/dialogs/e$h.smali
rename to com.discord/smali/com/discord/dialogs/f$h.smali
index 0854a07a82..f60b8cd157 100644
--- a/com.discord/smali/com/discord/dialogs/e$h.smali
+++ b/com.discord/smali/com/discord/dialogs/f$h.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$h;
+.class final Lcom/discord/dialogs/f$h;
 .super Ljava/lang/Object;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/f;->onViewBound(Landroid/view/View;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final xH:Lcom/discord/dialogs/e$h;
+.field public static final xJ:Lcom/discord/dialogs/f$h;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/dialogs/e$h;
+    new-instance v0, Lcom/discord/dialogs/f$h;
 
-    invoke-direct {v0}, Lcom/discord/dialogs/e$h;-><init>()V
+    invoke-direct {v0}, Lcom/discord/dialogs/f$h;-><init>()V
 
-    sput-object v0, Lcom/discord/dialogs/e$h;->xH:Lcom/discord/dialogs/e$h;
+    sput-object v0, Lcom/discord/dialogs/f$h;->xJ:Lcom/discord/dialogs/f$h;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e$i.smali b/com.discord/smali/com/discord/dialogs/f$i.smali
similarity index 69%
rename from com.discord/smali/com/discord/dialogs/e$i.smali
rename to com.discord/smali/com/discord/dialogs/f$i.smali
index 8a3bf9266c..8847d3ba93 100644
--- a/com.discord/smali/com/discord/dialogs/e$i.smali
+++ b/com.discord/smali/com/discord/dialogs/f$i.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$i;
+.class final Lcom/discord/dialogs/f$i;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/f;->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/dialogs/e;
+.field final synthetic this$0:Lcom/discord/dialogs/f;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/e;)V
+.method constructor <init>(Lcom/discord/dialogs/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/e$i;->this$0:Lcom/discord/dialogs/e;
+    iput-object p1, p0, Lcom/discord/dialogs/f$i;->this$0:Lcom/discord/dialogs/f;
 
     const/4 p1, 0x1
 
@@ -55,11 +55,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$i;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$i;->this$0:Lcom/discord/dialogs/f;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/e$j.smali b/com.discord/smali/com/discord/dialogs/f$j.smali
similarity index 73%
rename from com.discord/smali/com/discord/dialogs/e$j.smali
rename to com.discord/smali/com/discord/dialogs/f$j.smali
index 3fdc0429f5..db9403ded2 100644
--- a/com.discord/smali/com/discord/dialogs/e$j.smali
+++ b/com.discord/smali/com/discord/dialogs/f$j.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/dialogs/e$j;
+.class final Lcom/discord/dialogs/f$j;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetGiftAcceptDialog.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/dialogs/e;->onViewBound(Landroid/view/View;)V
+    value = Lcom/discord/dialogs/f;->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/dialogs/e;
+.field final synthetic this$0:Lcom/discord/dialogs/f;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/dialogs/e;)V
+.method constructor <init>(Lcom/discord/dialogs/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iput-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     const/4 p1, 0x1
 
@@ -100,13 +100,13 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     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/dialogs/e;->a(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/f;->a(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -121,13 +121,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     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/dialogs/e;->b(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/f;->b(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -150,24 +150,24 @@
 
     if-ne p1, v1, :cond_2
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     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/dialogs/e;->c(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/f;->c(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     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/dialogs/e;->d(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/f;->d(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -176,7 +176,7 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$Redeeming;
 
@@ -184,7 +184,7 @@
 
     move-result-object v0
 
-    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->e(Lcom/discord/dialogs/e;Lcom/discord/models/domain/ModelGift;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/f;->e(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
 
     goto :goto_0
 
@@ -193,21 +193,21 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
     check-cast v0, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;
 
-    invoke-static {p1, v0}, Lcom/discord/dialogs/e;->a(Lcom/discord/dialogs/e;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+    invoke-static {p1, v0}, Lcom/discord/dialogs/f;->a(Lcom/discord/dialogs/f;Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
 
     goto :goto_0
 
     :cond_5
-    iget-object p1, p0, Lcom/discord/dialogs/e$j;->this$0:Lcom/discord/dialogs/e;
+    iget-object p1, p0, Lcom/discord/dialogs/f$j;->this$0:Lcom/discord/dialogs/f;
 
-    invoke-virtual {p1}, Lcom/discord/dialogs/e;->dismiss()V
+    invoke-virtual {p1}, Lcom/discord/dialogs/f;->dismiss()V
 
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/dialogs/f.smali b/com.discord/smali/com/discord/dialogs/f.smali
index d296f92a02..e09f189a72 100644
--- a/com.discord/smali/com/discord/dialogs/f.smali
+++ b/com.discord/smali/com/discord/dialogs/f.smali
@@ -1,76 +1,1591 @@
-.class public final synthetic Lcom/discord/dialogs/f;
-.super Ljava/lang/Object;
+.class public final Lcom/discord/dialogs/f;
+.super Lcom/discord/app/AppDialog;
+.source "WidgetGiftAcceptDialog.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/dialogs/f$a;
+    }
+.end annotation
 
 
 # static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field public static final synthetic $EnumSwitchMapping$1:[I
+.field public static final xH:Lcom/discord/dialogs/f$a;
+
+
+# instance fields
+.field private final dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final xF:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final xG:Lkotlin/properties/ReadOnlyProperty;
 
 
 # direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 4
+.method static constructor <clinit>()V
+    .locals 7
 
-    invoke-static {}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->values()[Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+    const-class v0, Lcom/discord/dialogs/f;
+
+    const/4 v1, 0x5
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "dialogHeader"
+
+    const-string v5, "getDialogHeader()Lcom/discord/app/AppTextView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "dialogText"
+
+    const-string v6, "getDialogText()Lcom/discord/app/AppTextView;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "dialogImage"
+
+    const-string v6, "getDialogImage()Lcom/facebook/drawee/view/SimpleDraweeView;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v4
+
+    const-string v5, "button"
+
+    const-string v6, "getButton()Landroid/widget/Button;"
+
+    invoke-direct {v2, v4, v5, v6}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/4 v4, 0x3
+
+    aput-object v2, v1, v4
+
+    new-instance v2, Lkotlin/jvm/internal/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
     move-result-object v0
 
-    array-length v0, v0
+    const-string v4, "progress"
 
-    new-array v0, v0, [I
+    const-string v5, "getProgress()Landroid/view/View;"
 
-    sput-object v0, Lcom/discord/dialogs/f;->$EnumSwitchMapping$0:[I
+    invoke-direct {v2, v0, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x1
-
-    aput v2, v0, v1
-
-    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;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
-
-    move-result v1
-
-    const/4 v3, 0x2
-
-    aput v3, v0, v1
-
-    invoke-static {}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->values()[Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
 
     move-result-object v0
 
-    array-length v0, v0
+    check-cast v0, Lkotlin/reflect/KProperty;
 
-    new-array v0, v0, [I
+    const/4 v2, 0x4
 
-    sput-object v0, Lcom/discord/dialogs/f;->$EnumSwitchMapping$1:[I
+    aput-object v0, v1, v2
 
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+    sput-object v1, Lcom/discord/dialogs/f;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+    new-instance v0, Lcom/discord/dialogs/f$a;
 
-    move-result v1
+    invoke-direct {v0, v3}, Lcom/discord/dialogs/f$a;-><init>(B)V
 
-    aput v2, v0, v1
-
-    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;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
-
-    move-result v1
-
-    aput v3, v0, v1
+    sput-object v0, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$a;
+
+    return-void
+.end method
+
+.method public constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
+
+    const v0, 0x7f0a000a
+
+    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/f;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0008
+
+    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/f;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0007
+
+    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/f;->xF:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0009
+
+    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/f;->xG:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a000b
+
+    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/f;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    return-void
+.end method
+
+.method public static final synthetic a(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
+    .locals 2
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->a(Lcom/discord/models/domain/ModelGift;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->eh()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f1207bc
+
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f1207a0
+
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const v1, 0x7f1207b5
+
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/dialogs/f$f;
+
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/f$f;-><init>(Lcom/discord/dialogs/f;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public static final synthetic a(Lcom/discord/dialogs/f;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/dialogs/f;->a(Lcom/discord/models/domain/ModelGift;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->eh()Lcom/discord/app/AppTextView;
+
+    move-result-object v0
+
+    const v1, 0x7f1207bc
+
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object v0
+
+    const v1, 0x7f1207b1
+
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    const/4 v3, 0x0
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v2, v4}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getCanRetry()Z
+
+    move-result v0
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_1
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    invoke-virtual {v0, v1, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getContext()Landroid/content/Context;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_0
+
+    const v2, 0x7f120fd9
+
+    invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
+
+    move-result-object v2
+
+    :cond_0
+    invoke-virtual {v0, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p0
+
+    new-instance v0, Lcom/discord/dialogs/f$d;
+
+    invoke-direct {v0, p1}, Lcom/discord/dialogs/f$d;-><init>(Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p0, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+
+    :cond_1
+    invoke-virtual {p1}, Lcom/discord/stores/StoreGifting$GiftState$RedeemedFailed;->getErrorCode()Ljava/lang/Integer;
+
+    move-result-object p1
+
+    if-nez p1, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    const v1, 0xc386
+
+    if-ne v0, v1, :cond_3
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f1207a4
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
+
+    goto :goto_3
+
+    :cond_3
+    :goto_0
+    if-nez p1, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    const v1, 0x186b8
+
+    if-ne v0, v1, :cond_5
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f1207a0
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
+
+    goto :goto_3
+
+    :cond_5
+    :goto_1
+    if-nez p1, :cond_6
+
+    goto :goto_2
+
+    :cond_6
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    const v1, 0x186b6
+
+    if-ne v0, v1, :cond_7
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f1207a1
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
+
+    goto :goto_3
+
+    :cond_7
+    :goto_2
+    if-nez p1, :cond_8
+
+    goto :goto_3
+
+    :cond_8
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    const v0, 0x186b9
+
+    if-ne p1, v0, :cond_9
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f12079f
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
+
+    :cond_9
+    :goto_3
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_a
+
+    const v1, 0x7f1207b5
+
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
+
+    move-result-object v2
+
+    :cond_a
+    invoke-virtual {p1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/dialogs/f$e;
+
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/f$e;-><init>(Lcom/discord/dialogs/f;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method private final a(Lcom/discord/models/domain/ModelGift;)V
+    .locals 9
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+
+    move-result v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ej()Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/widget/ImageView;
+
+    sget-object v2, Lcom/discord/utilities/premium/PremiumUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumUtils;
+
+    invoke-virtual {v2, p1}, Lcom/discord/utilities/premium/PremiumUtils;->getNitroGiftIcon(Lcom/discord/models/domain/ModelGift;)I
+
+    move-result p1
+
+    const/4 v2, 0x4
+
+    invoke-static {v0, p1, v1, v2, v1}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_2
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getIcon()Ljava/lang/String;
+
+    move-result-object v5
+
+    if-eqz v5, :cond_2
+
+    sget-object v2, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSku;->getApplicationId()J
+
+    move-result-wide v0
+
+    goto :goto_0
+
+    :cond_1
+    const-wide/16 v0, 0x0
+
+    :goto_0
+    move-wide v3, v0
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x4
+
+    const/4 v8, 0x0
+
+    invoke-static/range {v2 .. v8}, Lcom/discord/utilities/icon/IconUtils;->getApplicationIcon$default(Lcom/discord/utilities/icon/IconUtils;JLjava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    :cond_2
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ej()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/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->el()Landroid/view/View;
+
+    move-result-object p1
+
+    const/16 v0, 0x8
+
+    invoke-virtual {p1, v0}, Landroid/view/View;->setVisibility(I)V
+
+    return-void
+.end method
+
+.method private final b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
+    .locals 8
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getSubscriptionPlan()Lcom/discord/models/domain/ModelSubscriptionPlan;
+
+    move-result-object p1
+
+    if-nez p1, :cond_0
+
+    const-string p1, ""
+
+    return-object p1
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getInterval()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/dialogs/g;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+
+    move-result v0
+
+    aget v0, v1, v0
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x1
+
+    if-eq v0, v2, :cond_2
+
+    if-ne v0, v1, :cond_1
+
+    const v0, 0x7f100053
+
+    goto :goto_0
+
+    :cond_1
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+
+    :cond_2
+    const v0, 0x7f100052
+
+    :goto_0
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->requireContext()Landroid/content/Context;
+
+    move-result-object v3
+
+    const-string v4, "requireContext()"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v3}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
+
+    move-result v4
+
+    new-array v5, v2, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
+
+    move-result v6
+
+    invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v6
+
+    const/4 v7, 0x0
+
+    aput-object v6, v5, v7
+
+    invoke-virtual {v3, v0, v4, v5}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v3, "requireContext().resourc\u2026t, subPlan.intervalCount)"
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/dialogs/g;->$EnumSwitchMapping$1:[I
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+
+    move-result v3
+
+    aget v3, v4, v3
+
+    const-string v4, "getString(R.string.gift_\u2026String(), timeUnitString)"
+
+    if-eq v3, v2, :cond_4
+
+    if-ne v3, v1, :cond_3
+
+    const v3, 0x7f1207c0
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    aput-object p1, v1, v7
+
+    aput-object v0, v1, v2
+
+    invoke-virtual {p0, v3, v1}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_3
+    new-instance p1, Lkotlin/k;
+
+    invoke-direct {p1}, Lkotlin/k;-><init>()V
+
+    throw p1
+
+    :cond_4
+    const v3, 0x7f1207bf
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscriptionPlan;->getIntervalCount()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+
+    move-result-object p1
+
+    aput-object p1, v1, v7
+
+    aput-object v0, v1, v2
+
+    invoke-virtual {p0, v3, v1}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public static final synthetic b(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
+    .locals 6
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->a(Lcom/discord/models/domain/ModelGift;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-nez v0, :cond_1
+
+    :cond_0
+    const-string v0, ""
+
+    :cond_1
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->b(Lcom/discord/models/domain/ModelGift;)Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-eqz v2, :cond_2
+
+    const v2, 0x7f1207be
+
+    new-array v5, v3, [Ljava/lang/Object;
+
+    aput-object v0, v5, v4
+
+    invoke-virtual {p0, v2, v5}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_0
+
+    :cond_2
+    const v2, 0x7f1207bd
+
+    invoke-virtual {p0, v2}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    :goto_0
+    const-string v5, "when {\n      gift.isAnyN\u2026ion_header_success)\n    }"
+
+    invoke-static {v2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isNitroClassicGift()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_3
+
+    const p1, 0x7f1207ab
+
+    new-array v0, v3, [Ljava/lang/Object;
+
+    aput-object v1, v0, v4
+
+    invoke-virtual {p0, p1, v0}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_1
+
+    :cond_3
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isNitroGift()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_4
+
+    const p1, 0x7f1207ac
+
+    new-array v0, v3, [Ljava/lang/Object;
+
+    aput-object v1, v0, v4
+
+    invoke-virtual {p0, p1, v0}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_1
+
+    :cond_4
+    const p1, 0x7f1207aa
+
+    new-array v1, v3, [Ljava/lang/Object;
+
+    aput-object v0, v1, v4
+
+    invoke-virtual {p0, p1, v1}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_1
+    const-string v0, "when {\n      gift.isNitr\u2026ccess_mobile, name)\n    }"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->eh()Lcom/discord/app/AppTextView;
+
+    move-result-object v0
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object v0
+
+    new-array v1, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_5
+
+    const v1, 0x7f1207b9
+
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    goto :goto_2
+
+    :cond_5
+    const/4 v0, 0x0
+
+    :goto_2
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/dialogs/f$b;
+
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/f$b;-><init>(Lcom/discord/dialogs/f;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public static final synthetic c(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
+    .locals 2
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->a(Lcom/discord/models/domain/ModelGift;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->eh()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f1207bc
+
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/CharSequence;
+
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p1
+
+    const v0, 0x7f12079c
+
+    invoke-virtual {p0, v0}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    new-array v1, v1, [Ljava/lang/Object;
+
+    invoke-virtual {p1, v0, v1}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getContext()Landroid/content/Context;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const v1, 0x7f1207b5
+
+    invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p1
+
+    new-instance v0, Lcom/discord/dialogs/f$c;
+
+    invoke-direct {v0, p0}, Lcom/discord/dialogs/f$c;-><init>(Lcom/discord/dialogs/f;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public static final synthetic d(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
+    .locals 7
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->a(Lcom/discord/models/domain/ModelGift;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :goto_0
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+
+    move-result v2
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-eqz v2, :cond_1
+
+    const v2, 0x7f1207bb
+
+    new-array v5, v3, [Ljava/lang/Object;
+
+    aput-object v0, v5, v4
+
+    invoke-virtual {p0, v2, v5}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v2
+
+    goto :goto_1
+
+    :cond_1
+    const v2, 0x7f1207ba
+
+    invoke-virtual {p0, v2}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    :goto_1
+    const-string v5, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
+
+    invoke-static {v2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+
+    move-result v5
+
+    if-eqz v5, :cond_2
+
+    const v5, 0x7f12079e
+
+    const/4 v6, 0x2
+
+    new-array v6, v6, [Ljava/lang/Object;
+
+    aput-object v0, v6, v4
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->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/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_2
+
+    :cond_2
+    const v5, 0x7f12079d
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    aput-object v0, v3, v4
+
+    invoke-virtual {p0, v5, v3}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    :goto_2
+    const-string v3, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->eh()Lcom/discord/app/AppTextView;
+
+    move-result-object v3
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v3, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object v2
+
+    new-array v3, v4, [Ljava/lang/Object;
+
+    invoke-virtual {v2, v0, v3}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_3
+
+    const v1, 0x7f1207b3
+
+    invoke-virtual {v2, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
+
+    move-result-object v1
+
+    :cond_3
+    invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object p0
+
+    new-instance v0, Lcom/discord/dialogs/f$g;
+
+    invoke-direct {v0, p1}, Lcom/discord/dialogs/f$g;-><init>(Lcom/discord/models/domain/ModelGift;)V
+
+    check-cast v0, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p0, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+.end method
+
+.method public static final synthetic e(Lcom/discord/dialogs/f;Lcom/discord/models/domain/ModelGift;)V
+    .locals 6
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->a(Lcom/discord/models/domain/ModelGift;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->getStoreListing()Lcom/discord/models/domain/ModelStoreListing;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelStoreListing;->getSku()Lcom/discord/models/domain/ModelSku;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSku;->getName()Ljava/lang/String;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ek()Landroid/widget/Button;
+
+    move-result-object v1
+
+    const/16 v2, 0x8
+
+    invoke-virtual {v1, v2}, Landroid/widget/Button;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->el()Landroid/view/View;
+
+    move-result-object v1
+
+    const/4 v2, 0x0
+
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+
+    move-result v1
+
+    const/4 v3, 0x1
+
+    if-eqz v1, :cond_1
+
+    const v1, 0x7f1207bb
+
+    new-array v4, v3, [Ljava/lang/Object;
+
+    aput-object v0, v4, v2
+
+    invoke-virtual {p0, v1, v4}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v1
+
+    goto :goto_1
+
+    :cond_1
+    const v1, 0x7f1207ba
+
+    invoke-virtual {p0, v1}, Lcom/discord/dialogs/f;->getString(I)Ljava/lang/String;
+
+    move-result-object v1
+
+    :goto_1
+    const-string v4, "when {\n      gift.isAnyN\u2026ion_header_confirm)\n    }"
+
+    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelGift;->isAnyNitroGift()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_2
+
+    const v4, 0x7f12079e
+
+    const/4 v5, 0x2
+
+    new-array v5, v5, [Ljava/lang/Object;
+
+    aput-object v0, v5, v2
+
+    invoke-direct {p0, p1}, Lcom/discord/dialogs/f;->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/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_2
+
+    :cond_2
+    const p1, 0x7f12079d
+
+    new-array v3, v3, [Ljava/lang/Object;
+
+    aput-object v0, v3, v2
+
+    invoke-virtual {p0, p1, v3}, Lcom/discord/dialogs/f;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p1
+
+    :goto_2
+    const-string v0, "when {\n      gift.isAnyN\u2026body_confirm, name)\n    }"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->eh()Lcom/discord/app/AppTextView;
+
+    move-result-object v0
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v1}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/dialogs/f;->ei()Lcom/discord/app/AppTextView;
+
+    move-result-object p0
+
+    new-array v0, v2, [Ljava/lang/Object;
+
+    invoke-virtual {p0, p1, v0}, Lcom/discord/app/AppTextView;->g(Ljava/lang/String;[Ljava/lang/Object;)V
+
+    return-void
+.end method
+
+.method private final eh()Lcom/discord/app/AppTextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/f;->dialogHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/f;->$$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/app/AppTextView;
+
+    return-object v0
+.end method
+
+.method private final ei()Lcom/discord/app/AppTextView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/f;->dialogText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/f;->$$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/app/AppTextView;
+
+    return-object v0
+.end method
+
+.method private final ej()Lcom/facebook/drawee/view/SimpleDraweeView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/f;->xF:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/f;->$$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/facebook/drawee/view/SimpleDraweeView;
+
+    return-object v0
+.end method
+
+.method private final ek()Landroid/widget/Button;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/f;->xG:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/f;->$$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/Button;
+
+    return-object v0
+.end method
+
+.method private final el()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/dialogs/f;->progress$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/dialogs/f;->$$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
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d00bc
+
+    return v0
+.end method
+
+.method public final onDestroy()V
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getArguments()Landroid/os/Bundle;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "ARG_GIFT_CODE"
+
+    invoke-virtual {v0, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "it"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0}, Lcom/discord/dialogs/f$a;->getNoticeName(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;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getNotices()Lcom/discord/stores/StoreNotices;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v0}, Lcom/discord/stores/StoreNotices;->markDialogSeen(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-super {p0}, Lcom/discord/app/AppDialog;->onDestroy()V
+
+    return-void
+.end method
+
+.method public final onViewBound(Landroid/view/View;)V
+    .locals 12
+
+    const-string v0, "view"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->getArguments()Landroid/os/Bundle;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    if-eqz p1, :cond_0
+
+    const-string v1, "ARG_GIFT_CODE"
+
+    invoke-virtual {p1, v1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    goto :goto_0
+
+    :cond_0
+    move-object p1, v0
+
+    :goto_0
+    if-nez p1, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/dialogs/f;->dismiss()V
+
+    return-void
+
+    :cond_1
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGifting()Lcom/discord/stores/StoreGifting;
+
+    move-result-object v1
+
+    invoke-virtual {v1, p1}, Lcom/discord/stores/StoreGifting;->requestGift(Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object p1
+
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()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/dialogs/f$h;->xJ:Lcom/discord/dialogs/f$h;
+
+    check-cast v2, Lrx/functions/Func2;
+
+    invoke-static {p1, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string v1, "Observable.combineLatest\u2026, me -> giftState to me }"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x0
+
+    new-instance p1, Lcom/discord/dialogs/f$i;
+
+    invoke-direct {p1, p0}, Lcom/discord/dialogs/f$i;-><init>(Lcom/discord/dialogs/f;)V
+
+    move-object v7, p1
+
+    check-cast v7, Lkotlin/jvm/functions/Function1;
+
+    const/4 v8, 0x0
+
+    new-instance p1, Lcom/discord/dialogs/f$j;
+
+    invoke-direct {p1, p0}, Lcom/discord/dialogs/f$j;-><init>(Lcom/discord/dialogs/f;)V
+
+    move-object v9, p1
+
+    check-cast v9, Lkotlin/jvm/functions/Function1;
+
+    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
diff --git a/com.discord/smali/com/discord/dialogs/g.smali b/com.discord/smali/com/discord/dialogs/g.smali
new file mode 100644
index 0000000000..5ebd21dd93
--- /dev/null
+++ b/com.discord/smali/com/discord/dialogs/g.smali
@@ -0,0 +1,76 @@
+.class public final synthetic Lcom/discord/dialogs/g;
+.super Ljava/lang/Object;
+
+
+# static fields
+.field public static final synthetic $EnumSwitchMapping$0:[I
+
+.field public static final synthetic $EnumSwitchMapping$1:[I
+
+
+# direct methods
+.method static synthetic constructor <clinit>()V
+    .locals 4
+
+    invoke-static {}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->values()[Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/dialogs/g;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/dialogs/g;->$EnumSwitchMapping$0:[I
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+
+    move-result v1
+
+    const/4 v3, 0x2
+
+    aput v3, v0, v1
+
+    invoke-static {}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->values()[Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    move-result-object v0
+
+    array-length v0, v0
+
+    new-array v0, v0, [I
+
+    sput-object v0, Lcom/discord/dialogs/g;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+
+    move-result v1
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/dialogs/g;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->ordinal()I
+
+    move-result v1
+
+    aput v3, v0, v1
+
+    return-void
+.end method
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 0812c64d43..51660c051d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 56bc57b77d..409a04c736 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 71de3f8ae0..7da9658a53 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ce20566dae..1ecbcb0362 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 41b52ebfe8..ea33b92878 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f72dff8c9d..0f8841689d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 60c92cde5e..2327f55eef 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d28a36ca6d..4315faf80d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 074f6a8ba3..0df9629b39 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0edd602e5d..2326b8cf68 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 efebe419e4..05a5a76445 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 09801b060e..1d2250e992 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1003661921..e342571a44 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7b88660eed..36be03bf2d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 eb742cee6a..27a0fc47a9 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ff558ba69c..e4915cf3f6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 430b48c2af..f828dc0686 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 c221d0daea..3fddad6f7a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 40bd5f6046..234b376645 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fa87393c4c..34bfece391 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 331a0fc65c..4886aae44d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 09419a1c37..0613cc9357 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2501da4e9b..b8163e173d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 465ffb0a76..178d15f9a3 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d2282a99af..7fb9815337 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 54d0c48583..c7b90e50f7 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 08e30e9ef4..91ba2014aa 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 71b748ae95..57f94f40f9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bb42e2fc4b..722a0f6c3c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d42f0ae614..2db63171c8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4d3700b6f0..c653baceb9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5f68999b2b..0ee2f5f260 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 2596b81203..dd19b6bb5d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 1474b3d287..92ea8d16e7 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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..2c8bbf9a61
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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..67cf52081b
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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 6474743666..a8a32f8779 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ba7250f315..78d15293a3 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2d1a3bf2d2..9194914577 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;->Aw()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Az()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;->Aw()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Az()Lcom/google/gson/Gson;
 
     move-result-object v0
 
@@ -405,7 +405,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -875,7 +875,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;
 
@@ -971,7 +971,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;
 
@@ -1939,7 +1939,7 @@
 
     iget-object p1, p0, Lcom/discord/gateway/GatewaySocket;->eventHandler:Lcom/discord/gateway/GatewayEventHandler;
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-interface {p1, p2, v0}, Lcom/discord/gateway/GatewayEventHandler;->handleDispatch(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -3302,6 +3302,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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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 aad6be25f1..03abc90c9a 100644
--- a/com.discord/smali/com/discord/gateway/R$attr.smali
+++ b/com.discord/smali/com/discord/gateway/R$attr.smali
@@ -673,463 +673,463 @@
 
 .field public static final layout_wrapBefore:I = 0x7f040254
 
-.field public static final liftOnScroll:I = 0x7f040258
+.field public static final liftOnScroll:I = 0x7f040259
 
-.field public static final lineHeight:I = 0x7f040259
+.field public static final lineHeight:I = 0x7f04025a
 
-.field public static final lineSpacing:I = 0x7f04025a
+.field public static final lineSpacing:I = 0x7f04025b
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
 
-.field public static final listDividerAlertDialog:I = 0x7f04025c
+.field public static final listDividerAlertDialog:I = 0x7f04025d
 
-.field public static final listItemLayout:I = 0x7f04025d
+.field public static final listItemLayout:I = 0x7f04025e
 
-.field public static final listLayout:I = 0x7f04025e
+.field public static final listLayout:I = 0x7f04025f
 
-.field public static final listMenuViewStyle:I = 0x7f04025f
+.field public static final listMenuViewStyle:I = 0x7f040260
 
-.field public static final listPopupWindowStyle:I = 0x7f040260
+.field public static final listPopupWindowStyle:I = 0x7f040261
 
-.field public static final listPreferredItemHeight:I = 0x7f040261
+.field public static final listPreferredItemHeight:I = 0x7f040262
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040262
+.field public static final listPreferredItemHeightLarge:I = 0x7f040263
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040263
+.field public static final listPreferredItemHeightSmall:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040265
+.field public static final listPreferredItemPaddingRight:I = 0x7f040266
 
-.field public static final logo:I = 0x7f040266
+.field public static final logo:I = 0x7f040267
 
-.field public static final logoDescription:I = 0x7f040267
+.field public static final logoDescription:I = 0x7f040268
 
-.field public static final materialButtonStyle:I = 0x7f040277
+.field public static final materialButtonStyle:I = 0x7f040278
 
-.field public static final materialCardViewStyle:I = 0x7f040278
+.field public static final materialCardViewStyle:I = 0x7f040279
 
-.field public static final maxActionInlineWidth:I = 0x7f040279
+.field public static final maxActionInlineWidth:I = 0x7f04027a
 
-.field public static final maxButtonHeight:I = 0x7f04027a
+.field public static final maxButtonHeight:I = 0x7f04027b
 
-.field public static final maxImageSize:I = 0x7f04027b
+.field public static final maxImageSize:I = 0x7f04027c
 
-.field public static final max_height:I = 0x7f04027c
+.field public static final max_height:I = 0x7f04027d
 
-.field public static final measureWithLargestChild:I = 0x7f04027d
+.field public static final measureWithLargestChild:I = 0x7f04027e
 
-.field public static final menu:I = 0x7f04027e
+.field public static final menu:I = 0x7f04027f
 
-.field public static final multiChoiceItemLayout:I = 0x7f04027f
+.field public static final multiChoiceItemLayout:I = 0x7f040280
 
-.field public static final navigationContentDescription:I = 0x7f040280
+.field public static final navigationContentDescription:I = 0x7f040281
 
-.field public static final navigationIcon:I = 0x7f040281
+.field public static final navigationIcon:I = 0x7f040282
 
-.field public static final navigationMode:I = 0x7f040282
+.field public static final navigationMode:I = 0x7f040283
 
-.field public static final navigationViewStyle:I = 0x7f040283
+.field public static final navigationViewStyle:I = 0x7f040284
 
-.field public static final numericModifiers:I = 0x7f040286
+.field public static final numericModifiers:I = 0x7f040287
 
-.field public static final overlapAnchor:I = 0x7f040287
+.field public static final overlapAnchor:I = 0x7f040288
 
-.field public static final overlayImage:I = 0x7f040288
+.field public static final overlayImage:I = 0x7f040289
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028b
+.field public static final paddingBottomNoButtons:I = 0x7f04028c
 
-.field public static final paddingEnd:I = 0x7f04028c
+.field public static final paddingEnd:I = 0x7f04028d
 
-.field public static final paddingStart:I = 0x7f04028d
+.field public static final paddingStart:I = 0x7f04028e
 
-.field public static final paddingTopNoTitle:I = 0x7f04028e
+.field public static final paddingTopNoTitle:I = 0x7f04028f
 
-.field public static final panelBackground:I = 0x7f04028f
+.field public static final panelBackground:I = 0x7f040290
 
-.field public static final panelMenuListTheme:I = 0x7f040290
+.field public static final panelMenuListTheme:I = 0x7f040291
 
-.field public static final panelMenuListWidth:I = 0x7f040291
+.field public static final panelMenuListWidth:I = 0x7f040292
 
-.field public static final passwordToggleContentDescription:I = 0x7f040292
+.field public static final passwordToggleContentDescription:I = 0x7f040293
 
-.field public static final passwordToggleDrawable:I = 0x7f040293
+.field public static final passwordToggleDrawable:I = 0x7f040294
 
-.field public static final passwordToggleEnabled:I = 0x7f040294
+.field public static final passwordToggleEnabled:I = 0x7f040295
 
-.field public static final passwordToggleTint:I = 0x7f040295
+.field public static final passwordToggleTint:I = 0x7f040296
 
-.field public static final passwordToggleTintMode:I = 0x7f040296
+.field public static final passwordToggleTintMode:I = 0x7f040297
 
-.field public static final placeholderImage:I = 0x7f040297
+.field public static final placeholderImage:I = 0x7f040298
 
-.field public static final placeholderImageScaleType:I = 0x7f040298
+.field public static final placeholderImageScaleType:I = 0x7f040299
 
-.field public static final popupMenuStyle:I = 0x7f040299
+.field public static final popupMenuStyle:I = 0x7f04029a
 
-.field public static final popupTheme:I = 0x7f04029a
+.field public static final popupTheme:I = 0x7f04029b
 
-.field public static final popupWindowStyle:I = 0x7f04029b
+.field public static final popupWindowStyle:I = 0x7f04029c
 
-.field public static final preserveIconSpacing:I = 0x7f04029c
+.field public static final preserveIconSpacing:I = 0x7f04029d
 
-.field public static final pressedStateOverlayImage:I = 0x7f04029d
+.field public static final pressedStateOverlayImage:I = 0x7f04029e
 
-.field public static final pressedTranslationZ:I = 0x7f04029e
+.field public static final pressedTranslationZ:I = 0x7f04029f
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402c5
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402c6
 
-.field public static final progressBarImage:I = 0x7f0402c6
+.field public static final progressBarImage:I = 0x7f0402c7
 
-.field public static final progressBarImageScaleType:I = 0x7f0402c7
+.field public static final progressBarImageScaleType:I = 0x7f0402c8
 
-.field public static final progressBarPadding:I = 0x7f0402c8
+.field public static final progressBarPadding:I = 0x7f0402c9
 
-.field public static final progressBarStyle:I = 0x7f0402c9
+.field public static final progressBarStyle:I = 0x7f0402ca
 
-.field public static final queryBackground:I = 0x7f0402cc
+.field public static final queryBackground:I = 0x7f0402cd
 
-.field public static final queryHint:I = 0x7f0402cd
+.field public static final queryHint:I = 0x7f0402ce
 
-.field public static final radioButtonStyle:I = 0x7f0402ce
+.field public static final radioButtonStyle:I = 0x7f0402cf
 
-.field public static final ratingBarStyle:I = 0x7f0402d1
+.field public static final ratingBarStyle:I = 0x7f0402d2
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d3
+.field public static final ratingBarStyleSmall:I = 0x7f0402d4
 
-.field public static final retryImage:I = 0x7f0402d4
+.field public static final retryImage:I = 0x7f0402d5
 
-.field public static final retryImageScaleType:I = 0x7f0402d5
+.field public static final retryImageScaleType:I = 0x7f0402d6
 
-.field public static final reverseLayout:I = 0x7f0402d6
+.field public static final reverseLayout:I = 0x7f0402d7
 
-.field public static final rippleColor:I = 0x7f0402d7
+.field public static final rippleColor:I = 0x7f0402d8
 
-.field public static final roundAsCircle:I = 0x7f0402d8
+.field public static final roundAsCircle:I = 0x7f0402d9
 
-.field public static final roundBottomEnd:I = 0x7f0402d9
+.field public static final roundBottomEnd:I = 0x7f0402da
 
-.field public static final roundBottomLeft:I = 0x7f0402da
+.field public static final roundBottomLeft:I = 0x7f0402db
 
-.field public static final roundBottomRight:I = 0x7f0402db
+.field public static final roundBottomRight:I = 0x7f0402dc
 
-.field public static final roundBottomStart:I = 0x7f0402dc
+.field public static final roundBottomStart:I = 0x7f0402dd
 
-.field public static final roundTopEnd:I = 0x7f0402dd
+.field public static final roundTopEnd:I = 0x7f0402de
 
-.field public static final roundTopLeft:I = 0x7f0402de
+.field public static final roundTopLeft:I = 0x7f0402df
 
-.field public static final roundTopRight:I = 0x7f0402df
+.field public static final roundTopRight:I = 0x7f0402e0
 
-.field public static final roundTopStart:I = 0x7f0402e0
+.field public static final roundTopStart:I = 0x7f0402e1
 
-.field public static final roundWithOverlayColor:I = 0x7f0402e1
+.field public static final roundWithOverlayColor:I = 0x7f0402e2
 
-.field public static final roundedCornerRadius:I = 0x7f0402e2
+.field public static final roundedCornerRadius:I = 0x7f0402e3
 
-.field public static final roundingBorderColor:I = 0x7f0402e3
+.field public static final roundingBorderColor:I = 0x7f0402e4
 
-.field public static final roundingBorderPadding:I = 0x7f0402e4
+.field public static final roundingBorderPadding:I = 0x7f0402e5
 
-.field public static final roundingBorderWidth:I = 0x7f0402e5
+.field public static final roundingBorderWidth:I = 0x7f0402e6
 
-.field public static final scopeUris:I = 0x7f0402f4
+.field public static final scopeUris:I = 0x7f0402f5
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f5
+.field public static final scrimAnimationDuration:I = 0x7f0402f6
 
-.field public static final scrimBackground:I = 0x7f0402f6
+.field public static final scrimBackground:I = 0x7f0402f7
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
 
-.field public static final searchHintIcon:I = 0x7f0402f8
+.field public static final searchHintIcon:I = 0x7f0402f9
 
-.field public static final searchIcon:I = 0x7f0402f9
+.field public static final searchIcon:I = 0x7f0402fa
 
-.field public static final searchViewStyle:I = 0x7f0402fa
+.field public static final searchViewStyle:I = 0x7f0402fb
 
-.field public static final seekBarStyle:I = 0x7f0402fc
+.field public static final seekBarStyle:I = 0x7f0402fd
 
-.field public static final selectableItemBackground:I = 0x7f0402fd
+.field public static final selectableItemBackground:I = 0x7f0402fe
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
 
-.field public static final showAsAction:I = 0x7f040300
+.field public static final showAsAction:I = 0x7f040301
 
-.field public static final showDivider:I = 0x7f040301
+.field public static final showDivider:I = 0x7f040302
 
-.field public static final showDividerHorizontal:I = 0x7f040302
+.field public static final showDividerHorizontal:I = 0x7f040303
 
-.field public static final showDividerVertical:I = 0x7f040303
+.field public static final showDividerVertical:I = 0x7f040304
 
-.field public static final showDividers:I = 0x7f040304
+.field public static final showDividers:I = 0x7f040305
 
-.field public static final showMotionSpec:I = 0x7f040305
+.field public static final showMotionSpec:I = 0x7f040306
 
-.field public static final showText:I = 0x7f040306
+.field public static final showText:I = 0x7f040307
 
-.field public static final showTitle:I = 0x7f040307
+.field public static final showTitle:I = 0x7f040308
 
-.field public static final singleChoiceItemLayout:I = 0x7f040308
+.field public static final singleChoiceItemLayout:I = 0x7f040309
 
-.field public static final singleLine:I = 0x7f040309
+.field public static final singleLine:I = 0x7f04030a
 
-.field public static final singleSelection:I = 0x7f04030a
+.field public static final singleSelection:I = 0x7f04030b
 
-.field public static final snackbarButtonStyle:I = 0x7f04030b
+.field public static final snackbarButtonStyle:I = 0x7f04030c
 
-.field public static final snackbarStyle:I = 0x7f04030c
+.field public static final snackbarStyle:I = 0x7f04030d
 
-.field public static final spanCount:I = 0x7f04030d
+.field public static final spanCount:I = 0x7f04030e
 
-.field public static final spinBars:I = 0x7f04030e
+.field public static final spinBars:I = 0x7f04030f
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
+.field public static final spinnerDropDownItemStyle:I = 0x7f040310
 
-.field public static final spinnerStyle:I = 0x7f040310
+.field public static final spinnerStyle:I = 0x7f040311
 
-.field public static final splitTrack:I = 0x7f040311
+.field public static final splitTrack:I = 0x7f040312
 
-.field public static final srcCompat:I = 0x7f040312
+.field public static final srcCompat:I = 0x7f040313
 
-.field public static final stackFromEnd:I = 0x7f040313
+.field public static final stackFromEnd:I = 0x7f040314
 
-.field public static final state_above_anchor:I = 0x7f040314
+.field public static final state_above_anchor:I = 0x7f040315
 
-.field public static final state_collapsed:I = 0x7f040315
+.field public static final state_collapsed:I = 0x7f040316
 
-.field public static final state_collapsible:I = 0x7f040316
+.field public static final state_collapsible:I = 0x7f040317
 
-.field public static final state_liftable:I = 0x7f040317
+.field public static final state_liftable:I = 0x7f040318
 
-.field public static final state_lifted:I = 0x7f040318
+.field public static final state_lifted:I = 0x7f040319
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final statusBarScrim:I = 0x7f04031a
+.field public static final statusBarScrim:I = 0x7f04031b
 
-.field public static final strokeColor:I = 0x7f04031e
+.field public static final strokeColor:I = 0x7f04031f
 
-.field public static final strokeWidth:I = 0x7f04031f
+.field public static final strokeWidth:I = 0x7f040320
 
-.field public static final subMenuArrow:I = 0x7f040320
+.field public static final subMenuArrow:I = 0x7f040321
 
-.field public static final submitBackground:I = 0x7f040321
+.field public static final submitBackground:I = 0x7f040322
 
-.field public static final subtitle:I = 0x7f040322
+.field public static final subtitle:I = 0x7f040323
 
-.field public static final subtitleTextAppearance:I = 0x7f040323
+.field public static final subtitleTextAppearance:I = 0x7f040324
 
-.field public static final subtitleTextColor:I = 0x7f040324
+.field public static final subtitleTextColor:I = 0x7f040325
 
-.field public static final subtitleTextStyle:I = 0x7f040325
+.field public static final subtitleTextStyle:I = 0x7f040326
 
-.field public static final suggestionRowLayout:I = 0x7f040326
+.field public static final suggestionRowLayout:I = 0x7f040327
 
-.field public static final switchMinWidth:I = 0x7f040327
+.field public static final switchMinWidth:I = 0x7f040328
 
-.field public static final switchPadding:I = 0x7f040328
+.field public static final switchPadding:I = 0x7f040329
 
-.field public static final switchStyle:I = 0x7f040329
+.field public static final switchStyle:I = 0x7f04032a
 
-.field public static final switchTextAppearance:I = 0x7f04032a
+.field public static final switchTextAppearance:I = 0x7f04032b
 
-.field public static final tabBackground:I = 0x7f04032b
+.field public static final tabBackground:I = 0x7f04032c
 
-.field public static final tabContentStart:I = 0x7f04032c
+.field public static final tabContentStart:I = 0x7f04032d
 
-.field public static final tabGravity:I = 0x7f04032d
+.field public static final tabGravity:I = 0x7f04032e
 
-.field public static final tabIconTint:I = 0x7f04032e
+.field public static final tabIconTint:I = 0x7f04032f
 
-.field public static final tabIconTintMode:I = 0x7f04032f
+.field public static final tabIconTintMode:I = 0x7f040330
 
-.field public static final tabIndicator:I = 0x7f040330
+.field public static final tabIndicator:I = 0x7f040331
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
 
-.field public static final tabIndicatorColor:I = 0x7f040332
+.field public static final tabIndicatorColor:I = 0x7f040333
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040333
+.field public static final tabIndicatorFullWidth:I = 0x7f040334
 
-.field public static final tabIndicatorGravity:I = 0x7f040334
+.field public static final tabIndicatorGravity:I = 0x7f040335
 
-.field public static final tabIndicatorHeight:I = 0x7f040335
+.field public static final tabIndicatorHeight:I = 0x7f040336
 
-.field public static final tabInlineLabel:I = 0x7f040336
+.field public static final tabInlineLabel:I = 0x7f040337
 
-.field public static final tabMaxWidth:I = 0x7f040337
+.field public static final tabMaxWidth:I = 0x7f040338
 
-.field public static final tabMinWidth:I = 0x7f040338
+.field public static final tabMinWidth:I = 0x7f040339
 
-.field public static final tabMode:I = 0x7f040339
+.field public static final tabMode:I = 0x7f04033a
 
-.field public static final tabPadding:I = 0x7f04033a
+.field public static final tabPadding:I = 0x7f04033b
 
-.field public static final tabPaddingBottom:I = 0x7f04033b
+.field public static final tabPaddingBottom:I = 0x7f04033c
 
-.field public static final tabPaddingEnd:I = 0x7f04033c
+.field public static final tabPaddingEnd:I = 0x7f04033d
 
-.field public static final tabPaddingStart:I = 0x7f04033d
+.field public static final tabPaddingStart:I = 0x7f04033e
 
-.field public static final tabPaddingTop:I = 0x7f04033e
+.field public static final tabPaddingTop:I = 0x7f04033f
 
-.field public static final tabRippleColor:I = 0x7f04033f
+.field public static final tabRippleColor:I = 0x7f040340
 
-.field public static final tabSelectedTextColor:I = 0x7f040340
+.field public static final tabSelectedTextColor:I = 0x7f040341
 
-.field public static final tabStyle:I = 0x7f040341
+.field public static final tabStyle:I = 0x7f040342
 
-.field public static final tabTextAppearance:I = 0x7f040342
+.field public static final tabTextAppearance:I = 0x7f040343
 
-.field public static final tabTextColor:I = 0x7f040343
+.field public static final tabTextColor:I = 0x7f040344
 
-.field public static final tabUnboundedRipple:I = 0x7f040344
+.field public static final tabUnboundedRipple:I = 0x7f040345
 
-.field public static final textAllCaps:I = 0x7f040348
+.field public static final textAllCaps:I = 0x7f040349
 
-.field public static final textAppearanceBody1:I = 0x7f040349
+.field public static final textAppearanceBody1:I = 0x7f04034a
 
-.field public static final textAppearanceBody2:I = 0x7f04034a
+.field public static final textAppearanceBody2:I = 0x7f04034b
 
-.field public static final textAppearanceButton:I = 0x7f04034b
+.field public static final textAppearanceButton:I = 0x7f04034c
 
-.field public static final textAppearanceCaption:I = 0x7f04034c
+.field public static final textAppearanceCaption:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034d
+.field public static final textAppearanceHeadline1:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034e
+.field public static final textAppearanceHeadline2:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline3:I = 0x7f04034f
+.field public static final textAppearanceHeadline3:I = 0x7f040350
 
-.field public static final textAppearanceHeadline4:I = 0x7f040350
+.field public static final textAppearanceHeadline4:I = 0x7f040351
 
-.field public static final textAppearanceHeadline5:I = 0x7f040351
+.field public static final textAppearanceHeadline5:I = 0x7f040352
 
-.field public static final textAppearanceHeadline6:I = 0x7f040352
+.field public static final textAppearanceHeadline6:I = 0x7f040353
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
 
-.field public static final textAppearanceListItem:I = 0x7f040354
+.field public static final textAppearanceListItem:I = 0x7f040355
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040355
+.field public static final textAppearanceListItemSecondary:I = 0x7f040356
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040356
+.field public static final textAppearanceListItemSmall:I = 0x7f040357
 
-.field public static final textAppearanceOverline:I = 0x7f040357
+.field public static final textAppearanceOverline:I = 0x7f040358
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035c
+.field public static final textAppearanceSubtitle1:I = 0x7f04035d
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035d
+.field public static final textAppearanceSubtitle2:I = 0x7f04035e
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035e
+.field public static final textColorAlertDialogListItem:I = 0x7f04035f
 
-.field public static final textColorSearchUrl:I = 0x7f04035f
+.field public static final textColorSearchUrl:I = 0x7f040360
 
-.field public static final textEndPadding:I = 0x7f040360
+.field public static final textEndPadding:I = 0x7f040361
 
-.field public static final textInputStyle:I = 0x7f040361
+.field public static final textInputStyle:I = 0x7f040362
 
-.field public static final textStartPadding:I = 0x7f040362
+.field public static final textStartPadding:I = 0x7f040363
 
-.field public static final theme:I = 0x7f040364
+.field public static final theme:I = 0x7f040365
 
-.field public static final thickness:I = 0x7f0403b5
+.field public static final thickness:I = 0x7f0403b6
 
-.field public static final thumbTextPadding:I = 0x7f0403b6
+.field public static final thumbTextPadding:I = 0x7f0403b7
 
-.field public static final thumbTint:I = 0x7f0403b7
+.field public static final thumbTint:I = 0x7f0403b8
 
-.field public static final thumbTintMode:I = 0x7f0403b8
+.field public static final thumbTintMode:I = 0x7f0403b9
 
-.field public static final tickMark:I = 0x7f0403b9
+.field public static final tickMark:I = 0x7f0403ba
 
-.field public static final tickMarkTint:I = 0x7f0403ba
+.field public static final tickMarkTint:I = 0x7f0403bb
 
-.field public static final tickMarkTintMode:I = 0x7f0403bb
+.field public static final tickMarkTintMode:I = 0x7f0403bc
 
-.field public static final tint:I = 0x7f0403bc
+.field public static final tint:I = 0x7f0403bd
 
-.field public static final tintMode:I = 0x7f0403bd
+.field public static final tintMode:I = 0x7f0403be
 
-.field public static final title:I = 0x7f0403be
+.field public static final title:I = 0x7f0403bf
 
-.field public static final titleEnabled:I = 0x7f0403bf
+.field public static final titleEnabled:I = 0x7f0403c0
 
-.field public static final titleMargin:I = 0x7f0403c0
+.field public static final titleMargin:I = 0x7f0403c1
 
-.field public static final titleMarginBottom:I = 0x7f0403c1
+.field public static final titleMarginBottom:I = 0x7f0403c2
 
-.field public static final titleMarginEnd:I = 0x7f0403c2
+.field public static final titleMarginEnd:I = 0x7f0403c3
 
-.field public static final titleMarginStart:I = 0x7f0403c3
+.field public static final titleMarginStart:I = 0x7f0403c4
 
-.field public static final titleMarginTop:I = 0x7f0403c4
+.field public static final titleMarginTop:I = 0x7f0403c5
 
-.field public static final titleMargins:I = 0x7f0403c5
+.field public static final titleMargins:I = 0x7f0403c6
 
-.field public static final titleTextAppearance:I = 0x7f0403c6
+.field public static final titleTextAppearance:I = 0x7f0403c7
 
-.field public static final titleTextColor:I = 0x7f0403c7
+.field public static final titleTextColor:I = 0x7f0403c8
 
-.field public static final titleTextStyle:I = 0x7f0403c8
+.field public static final titleTextStyle:I = 0x7f0403c9
 
-.field public static final toolbarId:I = 0x7f0403c9
+.field public static final toolbarId:I = 0x7f0403ca
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403ca
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
-.field public static final toolbarStyle:I = 0x7f0403cb
+.field public static final toolbarStyle:I = 0x7f0403cc
 
-.field public static final tooltipForegroundColor:I = 0x7f0403cc
+.field public static final tooltipForegroundColor:I = 0x7f0403cd
 
-.field public static final tooltipFrameBackground:I = 0x7f0403cd
+.field public static final tooltipFrameBackground:I = 0x7f0403ce
 
-.field public static final tooltipText:I = 0x7f0403ce
+.field public static final tooltipText:I = 0x7f0403cf
 
-.field public static final track:I = 0x7f0403cf
+.field public static final track:I = 0x7f0403d0
 
-.field public static final trackTint:I = 0x7f0403d0
+.field public static final trackTint:I = 0x7f0403d1
 
-.field public static final trackTintMode:I = 0x7f0403d1
+.field public static final trackTintMode:I = 0x7f0403d2
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
-.field public static final useCompatPadding:I = 0x7f0403e6
+.field public static final useCompatPadding:I = 0x7f0403e7
 
-.field public static final viewAspectRatio:I = 0x7f0403ec
+.field public static final viewAspectRatio:I = 0x7f0403ed
 
-.field public static final viewInflaterClass:I = 0x7f0403ed
+.field public static final viewInflaterClass:I = 0x7f0403ee
 
-.field public static final voiceIcon:I = 0x7f0403ee
+.field public static final voiceIcon:I = 0x7f0403ef
 
-.field public static final windowActionBar:I = 0x7f0403f0
+.field public static final windowActionBar:I = 0x7f0403f1
 
-.field public static final windowActionBarOverlay:I = 0x7f0403f1
+.field public static final windowActionBarOverlay:I = 0x7f0403f2
 
-.field public static final windowActionModeOverlay:I = 0x7f0403f2
+.field public static final windowActionModeOverlay:I = 0x7f0403f3
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403f3
+.field public static final windowFixedHeightMajor:I = 0x7f0403f4
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403f4
+.field public static final windowFixedHeightMinor:I = 0x7f0403f5
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403f5
+.field public static final windowFixedWidthMajor:I = 0x7f0403f6
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403f6
+.field public static final windowFixedWidthMinor:I = 0x7f0403f7
 
-.field public static final windowMinWidthMajor:I = 0x7f0403f7
+.field public static final windowMinWidthMajor:I = 0x7f0403f8
 
-.field public static final windowMinWidthMinor:I = 0x7f0403f8
+.field public static final windowMinWidthMinor:I = 0x7f0403f9
 
-.field public static final windowNoTitle:I = 0x7f0403f9
+.field public static final windowNoTitle:I = 0x7f0403fa
 
 
 # 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 6388565cc2..16f893d19e 100644
--- a/com.discord/smali/com/discord/gateway/R$color.smali
+++ b/com.discord/smali/com/discord/gateway/R$color.smali
@@ -75,221 +75,221 @@
 
 .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 = 0x7f06004e
+.field public static final common_google_signin_btn_text_dark:I = 0x7f06004f
 
-.field public static final common_google_signin_btn_text_dark_default:I = 0x7f06004f
+.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 = 0x7f060050
+.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 = 0x7f060051
+.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 = 0x7f060052
+.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060053
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f060053
+.field public static final common_google_signin_btn_text_light:I = 0x7f060054
 
-.field public static final common_google_signin_btn_text_light_default:I = 0x7f060054
+.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 = 0x7f060055
+.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 = 0x7f060056
+.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 = 0x7f060057
+.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060058
 
-.field public static final common_google_signin_btn_tint:I = 0x7f060058
+.field public static final common_google_signin_btn_tint:I = 0x7f060059
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005b
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005c
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005d
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005e
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005f
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060060
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060061
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060066
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060067
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006c
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006d
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a7
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600aa
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ac
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
 
 # 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 7bfd4ed8be..d142898240 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 = 0x7f0800a1
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
+.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 = 0x7f0800a4
+.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 = 0x7f0800a5
+.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 = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
+.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 = 0x7f0800a9
+.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 = 0x7f0800aa
+.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 = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
+.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 = 0x7f0800ad
+.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 = 0x7f0800ae
+.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 = 0x7f0800af
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
+.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 = 0x7f0800b2
+.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 = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b5
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b6
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b7
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b8
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b9
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final drawable_chip_background:I = 0x7f080101
+.field public static final drawable_chip_background:I = 0x7f080105
 
-.field public static final drawable_chip_circle:I = 0x7f080102
+.field public static final drawable_chip_circle:I = 0x7f080106
 
-.field public static final drawable_chip_delete:I = 0x7f080103
+.field public static final drawable_chip_delete:I = 0x7f080107
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801b0
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801b1
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
 
-.field public static final mtrl_snackbar_background:I = 0x7f080461
+.field public static final mtrl_snackbar_background:I = 0x7f08046f
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080462
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
 
-.field public static final navigation_empty_icon:I = 0x7f080463
+.field public static final navigation_empty_icon:I = 0x7f080471
 
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
 
 # 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 e5dd47754d..9b3409a879 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -127,13 +127,13 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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
 
@@ -157,303 +157,303 @@
 
 .field public static final column_reverse:I = 0x7f0a0221
 
-.field public static final container:I = 0x7f0a0230
+.field public static final container:I = 0x7f0a0233
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a023a
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final dark:I = 0x7f0a0251
+.field public static final dark:I = 0x7f0a0254
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final design_bottom_sheet:I = 0x7f0a0256
+.field public static final design_bottom_sheet:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area:I = 0x7f0a0257
+.field public static final design_menu_item_action_area:I = 0x7f0a025a
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0258
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
 
-.field public static final design_menu_item_text:I = 0x7f0a0259
+.field public static final design_menu_item_text:I = 0x7f0a025c
 
-.field public static final design_navigation_view:I = 0x7f0a025a
+.field public static final design_navigation_view:I = 0x7f0a025d
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final fill:I = 0x7f0a02e0
+.field public static final fill:I = 0x7f0a02e4
 
-.field public static final filled:I = 0x7f0a02e3
+.field public static final filled:I = 0x7f0a02e7
 
-.field public static final fitBottomStart:I = 0x7f0a02e4
+.field public static final fitBottomStart:I = 0x7f0a02e8
 
-.field public static final fitCenter:I = 0x7f0a02e5
+.field public static final fitCenter:I = 0x7f0a02e9
 
-.field public static final fitEnd:I = 0x7f0a02e6
+.field public static final fitEnd:I = 0x7f0a02ea
 
-.field public static final fitStart:I = 0x7f0a02e7
+.field public static final fitStart:I = 0x7f0a02eb
 
-.field public static final fitXY:I = 0x7f0a02e8
+.field public static final fitXY:I = 0x7f0a02ec
 
-.field public static final fixed:I = 0x7f0a02e9
+.field public static final fixed:I = 0x7f0a02ed
 
-.field public static final flex_end:I = 0x7f0a02ea
+.field public static final flex_end:I = 0x7f0a02ee
 
-.field public static final flex_start:I = 0x7f0a02eb
+.field public static final flex_start:I = 0x7f0a02ef
 
-.field public static final focusCrop:I = 0x7f0a02ec
+.field public static final focusCrop:I = 0x7f0a02f0
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final ghost_view:I = 0x7f0a0312
+.field public static final ghost_view:I = 0x7f0a0316
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final icon_only:I = 0x7f0a0390
+.field public static final icon_only:I = 0x7f0a0398
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0405
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
 
-.field public static final labeled:I = 0x7f0a040c
+.field public static final labeled:I = 0x7f0a0414
 
-.field public static final largeLabel:I = 0x7f0a040d
+.field public static final largeLabel:I = 0x7f0a0415
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final light:I = 0x7f0a0414
+.field public static final light:I = 0x7f0a041c
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final masked:I = 0x7f0a0437
+.field public static final masked:I = 0x7f0a043f
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final mini:I = 0x7f0a0480
+.field public static final mini:I = 0x7f0a048a
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0481
+.field public static final mtrl_child_content_container:I = 0x7f0a048b
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0482
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final navigation_header_container:I = 0x7f0a0485
+.field public static final navigation_header_container:I = 0x7f0a048f
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final nowrap:I = 0x7f0a04a6
+.field public static final nowrap:I = 0x7f0a04b0
 
-.field public static final outline:I = 0x7f0a04c7
+.field public static final outline:I = 0x7f0a04d1
 
-.field public static final parallax:I = 0x7f0a04d6
+.field public static final parallax:I = 0x7f0a04e0
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final parent_matrix:I = 0x7f0a04d9
+.field public static final parent_matrix:I = 0x7f0a04e3
 
-.field public static final pin:I = 0x7f0a0515
+.field public static final pin:I = 0x7f0a0520
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final row:I = 0x7f0a05a1
+.field public static final row:I = 0x7f0a05b6
 
-.field public static final row_reverse:I = 0x7f0a05a2
+.field public static final row_reverse:I = 0x7f0a05b7
 
-.field public static final save_image_matrix:I = 0x7f0a05a3
+.field public static final save_image_matrix:I = 0x7f0a05b8
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05a4
+.field public static final save_non_transition_alpha:I = 0x7f0a05b9
 
-.field public static final save_scale_type:I = 0x7f0a05a5
+.field public static final save_scale_type:I = 0x7f0a05ba
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final scrollable:I = 0x7f0a05ad
+.field public static final scrollable:I = 0x7f0a05c2
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final selected:I = 0x7f0a05cb
+.field public static final selected:I = 0x7f0a05e0
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final smallLabel:I = 0x7f0a0708
+.field public static final smallLabel:I = 0x7f0a071d
 
-.field public static final snackbar_action:I = 0x7f0a0709
+.field public static final snackbar_action:I = 0x7f0a071e
 
-.field public static final snackbar_text:I = 0x7f0a070a
+.field public static final snackbar_text:I = 0x7f0a071f
 
-.field public static final space_around:I = 0x7f0a070e
+.field public static final space_around:I = 0x7f0a0723
 
-.field public static final space_between:I = 0x7f0a070f
+.field public static final space_between:I = 0x7f0a0724
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final standard:I = 0x7f0a0718
+.field public static final standard:I = 0x7f0a0733
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final stretch:I = 0x7f0a0730
+.field public static final stretch:I = 0x7f0a0754
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_input_password_toggle:I = 0x7f0a0751
+.field public static final text_input_password_toggle:I = 0x7f0a0775
 
-.field public static final textinput_counter:I = 0x7f0a0754
+.field public static final textinput_counter:I = 0x7f0a0778
 
-.field public static final textinput_error:I = 0x7f0a0755
+.field public static final textinput_error:I = 0x7f0a0779
 
-.field public static final textinput_helper_text:I = 0x7f0a0756
+.field public static final textinput_helper_text:I = 0x7f0a077a
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final touch_outside:I = 0x7f0a0764
+.field public static final touch_outside:I = 0x7f0a0788
 
-.field public static final transition_current_scene:I = 0x7f0a0765
+.field public static final transition_current_scene:I = 0x7f0a0789
 
-.field public static final transition_layout_save:I = 0x7f0a0766
+.field public static final transition_layout_save:I = 0x7f0a078a
 
-.field public static final transition_position:I = 0x7f0a0767
+.field public static final transition_position:I = 0x7f0a078b
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0768
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
 
-.field public static final transition_transform:I = 0x7f0a0769
+.field public static final transition_transform:I = 0x7f0a078d
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final unlabeled:I = 0x7f0a0776
+.field public static final unlabeled:I = 0x7f0a079a
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_offset_helper:I = 0x7f0a07ff
+.field public static final view_offset_helper:I = 0x7f0a082e
 
-.field public static final visible:I = 0x7f0a0802
+.field public static final visible:I = 0x7f0a0831
 
-.field public static final wide:I = 0x7f0a082e
+.field public static final wide:I = 0x7f0a085e
 
-.field public static final wrap:I = 0x7f0a0850
+.field public static final wrap:I = 0x7f0a0880
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
-.field public static final wrap_reverse:I = 0x7f0a0852
+.field public static final wrap_reverse:I = 0x7f0a0882
 
 
 # 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 d0f1477513..21e18a2cfb 100644
--- a/com.discord/smali/com/discord/gateway/R$layout.smali
+++ b/com.discord/smali/com/discord/gateway/R$layout.smali
@@ -71,61 +71,61 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final design_bottom_navigation_item:I = 0x7f0d0023
+.field public static final design_bottom_navigation_item:I = 0x7f0d0024
 
-.field public static final design_bottom_sheet_dialog:I = 0x7f0d0024
+.field public static final design_bottom_sheet_dialog:I = 0x7f0d0025
 
-.field public static final design_layout_snackbar:I = 0x7f0d0025
+.field public static final design_layout_snackbar:I = 0x7f0d0026
 
-.field public static final design_layout_snackbar_include:I = 0x7f0d0026
+.field public static final design_layout_snackbar_include:I = 0x7f0d0027
 
-.field public static final design_layout_tab_icon:I = 0x7f0d0027
+.field public static final design_layout_tab_icon:I = 0x7f0d0028
 
-.field public static final design_layout_tab_text:I = 0x7f0d0028
+.field public static final design_layout_tab_text:I = 0x7f0d0029
 
-.field public static final design_menu_item_action_area:I = 0x7f0d0029
+.field public static final design_menu_item_action_area:I = 0x7f0d002a
 
-.field public static final design_navigation_item:I = 0x7f0d002a
+.field public static final design_navigation_item:I = 0x7f0d002b
 
-.field public static final design_navigation_item_header:I = 0x7f0d002b
+.field public static final design_navigation_item_header:I = 0x7f0d002c
 
-.field public static final design_navigation_item_separator:I = 0x7f0d002c
+.field public static final design_navigation_item_separator:I = 0x7f0d002d
 
-.field public static final design_navigation_item_subheader:I = 0x7f0d002d
+.field public static final design_navigation_item_subheader:I = 0x7f0d002e
 
-.field public static final design_navigation_menu:I = 0x7f0d002e
+.field public static final design_navigation_menu:I = 0x7f0d002f
 
-.field public static final design_navigation_menu_item:I = 0x7f0d002f
+.field public static final design_navigation_menu_item:I = 0x7f0d0030
 
-.field public static final design_text_input_password_icon:I = 0x7f0d0030
+.field public static final design_text_input_password_icon:I = 0x7f0d0031
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0043
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0044
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final view_chip_default:I = 0x7f0d007e
+.field public static final view_chip_default:I = 0x7f0d0083
 
 
 # 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 d3d67b5dbd..593d7d4e32 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -97,69 +97,69 @@
 
 .field public static final appbar_scrolling_view_behavior:I = 0x7f1200ed
 
-.field public static final bottom_sheet_behavior:I = 0x7f120340
+.field public static final bottom_sheet_behavior:I = 0x7f120365
 
-.field public static final character_counter_content_description:I = 0x7f1203cb
+.field public static final character_counter_content_description:I = 0x7f1203f0
 
-.field public static final character_counter_pattern:I = 0x7f1203cc
+.field public static final character_counter_pattern:I = 0x7f1203f1
 
-.field public static final common_google_play_services_enable_button:I = 0x7f12040b
+.field public static final common_google_play_services_enable_button:I = 0x7f120430
 
-.field public static final common_google_play_services_enable_text:I = 0x7f12040c
+.field public static final common_google_play_services_enable_text:I = 0x7f120431
 
-.field public static final common_google_play_services_enable_title:I = 0x7f12040d
+.field public static final common_google_play_services_enable_title:I = 0x7f120432
 
-.field public static final common_google_play_services_install_button:I = 0x7f12040e
+.field public static final common_google_play_services_install_button:I = 0x7f120433
 
-.field public static final common_google_play_services_install_text:I = 0x7f12040f
+.field public static final common_google_play_services_install_text:I = 0x7f120434
 
-.field public static final common_google_play_services_install_title:I = 0x7f120410
+.field public static final common_google_play_services_install_title:I = 0x7f120435
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120411
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120436
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120412
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120437
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120413
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120438
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120414
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120439
 
-.field public static final common_google_play_services_update_button:I = 0x7f120415
+.field public static final common_google_play_services_update_button:I = 0x7f12043a
 
-.field public static final common_google_play_services_update_text:I = 0x7f120416
+.field public static final common_google_play_services_update_text:I = 0x7f12043b
 
-.field public static final common_google_play_services_update_title:I = 0x7f120417
+.field public static final common_google_play_services_update_title:I = 0x7f12043c
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120418
+.field public static final common_google_play_services_updating_text:I = 0x7f12043d
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120419
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12043e
 
-.field public static final common_open_on_phone:I = 0x7f12041a
+.field public static final common_open_on_phone:I = 0x7f12043f
 
-.field public static final common_signin_button_text:I = 0x7f12041b
+.field public static final common_signin_button_text:I = 0x7f120440
 
-.field public static final common_signin_button_text_long:I = 0x7f12041c
+.field public static final common_signin_button_text_long:I = 0x7f120441
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120933
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd8
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
 
-.field public static final password_toggle_content_description:I = 0x7f120d44
+.field public static final password_toggle_content_description:I = 0x7f120d77
 
-.field public static final path_password_eye:I = 0x7f120d47
+.field public static final path_password_eye:I = 0x7f120d7a
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d48
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d49
+.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
 
-.field public static final path_password_strike_through:I = 0x7f120d4a
+.field public static final path_password_strike_through:I = 0x7f120d7d
 
-.field public static final search_menu_title:I = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 24fab738b6..872c26b688 100644
--- a/com.discord/smali/com/discord/gateway/R$styleable.smali
+++ b/com.discord/smali/com/discord/gateway/R$styleable.smali
@@ -2134,7 +2134,7 @@
 
     new-array v6, v1, [I
 
-    const v9, 0x7f04027c
+    const v9, 0x7f04027d
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -2364,15 +2364,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -2381,8 +2381,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -2396,11 +2396,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -2434,15 +2434,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040258
+        0x7f040259
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
+        0x7f040319
     .end array-data
 
     :array_9
@@ -2454,17 +2454,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_c
@@ -2489,8 +2489,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_e
@@ -2566,47 +2566,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -2616,6 +2615,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_f
@@ -2639,7 +2639,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_11
@@ -2699,10 +2699,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d7
-        0x7f040305
-        0x7f040360
-        0x7f040362
+        0x7f0402d8
+        0x7f040306
+        0x7f040361
+        0x7f040363
     .end array-data
 
     :array_14
@@ -2711,8 +2711,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
-        0x7f040309
         0x7f04030a
+        0x7f04030b
     .end array-data
 
     :array_15
@@ -2752,12 +2752,12 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f5
-        0x7f0402f7
-        0x7f04031a
-        0x7f0403be
+        0x7f0402f6
+        0x7f0402f8
+        0x7f04031b
         0x7f0403bf
-        0x7f0403c9
+        0x7f0403c0
+        0x7f0403ca
     .end array-data
 
     :array_17
@@ -2783,7 +2783,7 @@
     :array_1a
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_1b
@@ -2811,8 +2811,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_1e
@@ -2825,9 +2825,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
-        0x7f040301
         0x7f040302
         0x7f040303
+        0x7f040304
     .end array-data
 
     :array_1f
@@ -2854,11 +2854,11 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027b
-        0x7f04029e
-        0x7f0402d7
-        0x7f040305
-        0x7f0403e6
+        0x7f04027c
+        0x7f04029f
+        0x7f0402d8
+        0x7f040306
+        0x7f0403e7
     .end array-data
 
     :array_21
@@ -2866,7 +2866,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025a
+        0x7f04025b
     .end array-data
 
     :array_22
@@ -2890,7 +2890,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_24
@@ -2907,16 +2907,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -2930,7 +2929,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_26
@@ -2964,8 +2964,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_29
@@ -3004,15 +3004,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d7
-        0x7f04031e
+        0x7f0402d8
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04031e
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2e
@@ -3029,13 +3029,12 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
-        0x7f040277
         0x7f040278
-        0x7f040283
-        0x7f0402f6
-        0x7f04030b
-        0x7f040341
-        0x7f040349
+        0x7f040279
+        0x7f040284
+        0x7f0402f7
+        0x7f04030c
+        0x7f040342
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3045,10 +3044,11 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040357
-        0x7f04035c
+        0x7f040353
+        0x7f040358
         0x7f04035d
-        0x7f040361
+        0x7f04035e
+        0x7f040362
     .end array-data
 
     :array_2f
@@ -3083,9 +3083,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_31
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_32
@@ -3114,20 +3114,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_35
@@ -3140,9 +3140,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .end array-data
 
     :array_36
@@ -3157,20 +3157,20 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_37
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f4
+        0x7f0402f5
     .end array-data
 
     :array_38
@@ -3182,16 +3182,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3205,20 +3204,21 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f04030b
         0x7f04030c
+        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f040279
+        0x7f04027a
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_3c
@@ -3245,17 +3245,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_3e
@@ -3267,7 +3267,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3289,9 +3288,10 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040342
+        0x7f040341
         0x7f040343
         0x7f040344
+        0x7f040345
     .end array-data
 
     :array_40
@@ -3308,7 +3308,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_41
@@ -3336,11 +3336,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
-        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
+        0x7f040297
     .end array-data
 
     :array_42
@@ -3363,17 +3363,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3381,15 +3380,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 47a2621c3a..2f8a47ad67 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,7 @@
 
     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
@@ -727,7 +803,7 @@
 
     return-void
 
-    :sswitch_19
+    :sswitch_1d
     const-string v1, "CALL_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -738,7 +814,7 @@
 
     goto :goto_5
 
-    :sswitch_1a
+    :sswitch_1e
     const-string v1, "CALL_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -762,7 +838,7 @@
 
     return-void
 
-    :sswitch_1b
+    :sswitch_1f
     const-string v1, "GUILD_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -773,7 +849,7 @@
 
     goto/16 :goto_8
 
-    :sswitch_1c
+    :sswitch_20
     const-string v1, "GUILD_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -784,7 +860,7 @@
 
     goto/16 :goto_8
 
-    :sswitch_1d
+    :sswitch_21
     const-string v1, "TYPING_START"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -807,7 +883,7 @@
 
     return-void
 
-    :sswitch_1e
+    :sswitch_22
     const-string v1, "CHANNEL_RECIPIENT_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -831,7 +907,7 @@
 
     return-void
 
-    :sswitch_1f
+    :sswitch_23
     const-string v1, "CHANNEL_DELETE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -842,7 +918,7 @@
 
     goto :goto_7
 
-    :sswitch_20
+    :sswitch_24
     const-string v1, "CHANNEL_CREATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -866,7 +942,7 @@
 
     return-void
 
-    :sswitch_21
+    :sswitch_25
     const-string v1, "RELATIONSHIP_REMOVE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -877,7 +953,7 @@
 
     goto/16 :goto_b
 
-    :sswitch_22
+    :sswitch_26
     const-string v1, "USER_SETTINGS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -900,7 +976,7 @@
 
     return-void
 
-    :sswitch_23
+    :sswitch_27
     const-string v1, "GUILD_INTEGRATIONS_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -923,7 +999,7 @@
 
     return-void
 
-    :sswitch_24
+    :sswitch_28
     const-string v1, "PRESENCE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -946,7 +1022,7 @@
 
     return-void
 
-    :sswitch_25
+    :sswitch_29
     const-string v1, "GUILD_SYNC"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -970,7 +1046,7 @@
 
     return-void
 
-    :sswitch_26
+    :sswitch_2a
     const-string v1, "USER_NOTE_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -993,7 +1069,7 @@
 
     return-void
 
-    :sswitch_27
+    :sswitch_2b
     const-string v1, "GUILD_MEMBER_LIST_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1012,7 +1088,7 @@
 
     return-void
 
-    :sswitch_28
+    :sswitch_2c
     const-string v1, "MESSAGE_REACTION_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1023,7 +1099,7 @@
 
     goto :goto_c
 
-    :sswitch_29
+    :sswitch_2d
     const-string v1, "GUILD_MEMBER_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1047,7 +1123,7 @@
 
     return-void
 
-    :sswitch_2a
+    :sswitch_2e
     const-string v1, "GUILD_BAN_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1071,7 +1147,7 @@
 
     return-void
 
-    :sswitch_2b
+    :sswitch_2f
     const-string v1, "RELATIONSHIP_ADD"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1095,7 +1171,7 @@
 
     return-void
 
-    :sswitch_2c
+    :sswitch_30
     const-string v1, "USER_REQUIRED_ACTION_UPDATE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1118,7 +1194,7 @@
 
     return-void
 
-    :sswitch_2d
+    :sswitch_31
     const-string v1, "MESSAGE_REACTION_REMOVE_ALL"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1142,7 +1218,7 @@
 
     return-void
 
-    :sswitch_2e
+    :sswitch_32
     const-string v1, "GUILD_MEMBERS_CHUNK"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1165,7 +1241,7 @@
 
     return-void
 
-    :sswitch_2f
+    :sswitch_33
     const-string v1, "USER_CONNECTIONS_INTEGRATION_JOINING"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1177,13 +1253,13 @@
     :goto_d
     invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     iput-object p1, p0, Lcom/discord/gateway/io/IncomingParser;->data:Ljava/lang/Object;
 
     return-void
 
-    :sswitch_30
+    :sswitch_34
     const-string v1, "SESSIONS_REPLACE"
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1228,55 +1304,59 @@
 
     :sswitch_data_0
     .sparse-switch
-        -0x78ca470e -> :sswitch_30
-        -0x70da87b1 -> :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
-        -0x394108be -> :sswitch_26
-        -0x37ee0c79 -> :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
-        -0x10511518 -> :sswitch_1c
-        -0xf503069 -> :sswitch_1b
-        -0xdeca603 -> :sswitch_1a
-        -0xcebc154 -> :sswitch_19
-        -0xc585f03 -> :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..20243d0887
--- /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/l;->checkParameterIsNotNull(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$WatchStream.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$WatchStream.smali
new file mode 100644
index 0000000000..2bb9d75c4c
--- /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/l;->checkParameterIsNotNull(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 3526350c6f..ab7ee379c8 100644
--- a/com.discord/smali/com/discord/gateway/rest/RestClient.smali
+++ b/com.discord/smali/com/discord/gateway/rest/RestClient.smali
@@ -58,7 +58,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kx()Lrx/Scheduler;
 
     move-result-object v2
 
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 699d52a3dd..fcd7c2d647 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;->aVZ:Ljava/lang/Class;
+    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aWi: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 fea4616f9b..bedd78938f 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;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 487e76a82f..c7c2f66a40 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$Parser.smali
@@ -116,7 +116,7 @@
 
     invoke-static {v12, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/properties/a;->bhF:Lkotlin/properties/a;
+    sget-object v0, Lkotlin/properties/a;->bhP:Lkotlin/properties/a;
 
     invoke-virtual {v0}, Lkotlin/properties/a;->notNull()Lkotlin/properties/ReadWriteProperty;
 
@@ -128,7 +128,7 @@
 
     aget-object v14, v0, v1
 
-    sget-object v0, Lkotlin/properties/a;->bhF:Lkotlin/properties/a;
+    sget-object v0, Lkotlin/properties/a;->bhP:Lkotlin/properties/a;
 
     invoke-virtual {v0}, Lkotlin/properties/a;->notNull()Lkotlin/properties/ReadWriteProperty;
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali
index e5a5572472..ce13c63467 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication$ThirdPartySku$Parser.smali
@@ -92,7 +92,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/properties/a;->bhF:Lkotlin/properties/a;
+    sget-object v0, Lkotlin/properties/a;->bhP:Lkotlin/properties/a;
 
     invoke-virtual {v0}, Lkotlin/properties/a;->notNull()Lkotlin/properties/ReadWriteProperty;
 
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 4c14a20b11..1cebc6d0fc 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,90 @@
 
 
 # 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v1, p1
+
+    check-cast v1, Ljava/lang/CharSequence;
+
+    const/4 p1, 0x1
+
+    new-array v2, p1, [Ljava/lang/String;
+
+    const/4 v0, 0x0
+
+    const-string v3, ":"
+
+    aput-object v3, v2, v0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x6
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, Lkotlin/text/l;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZIILjava/lang/Object;)Ljava/util/List;
+
+    move-result-object v1
+
+    invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    move-object v3, v0
+
+    check-cast v3, Ljava/lang/String;
+
+    invoke-interface {v1, p1}, 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 v6
+
+    const/4 p1, 0x2
+
+    invoke-interface {v1, p1}, 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 v8
+
+    const/4 p1, 0x3
+
+    invoke-interface {v1, p1}, 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 +128,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 +144,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..f516e44744 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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->areEqual(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/ModelGuild.smali b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
index 49a0f1f27a..7fc6e5ce01 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
@@ -69,6 +69,10 @@
 
 .field public static final LARGE_GUILD_THRESHOLD:I = 0xc8
 
+.field public static final NEW_TIER_2_BOOSTS:I = 0xf
+
+.field public static final NEW_TIER_3_BOOSTS:I = 0x1e
+
 .field public static final SYSTEM_CHANNEL_FLAG_SUPPRESS_BOOST:I = 0x2
 
 .field public static final SYSTEM_CHANNEL_FLAG_SUPPRESS_JOIN:I = 0x1
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali b/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali
index 6a370523e4..93794ad684 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage$Activity.smali
@@ -44,6 +44,29 @@
     return-void
 .end method
 
+.method public constructor <init>(ILjava/lang/String;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    if-eqz p2, :cond_0
+
+    iput p1, p0, Lcom/discord/models/domain/ModelMessage$Activity;->type:I
+
+    iput-object p2, p0, Lcom/discord/models/domain/ModelMessage$Activity;->partyId:Ljava/lang/String;
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ljava/lang/NullPointerException;
+
+    const-string p2, "partyId is marked @NonNull but is null"
+
+    invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
 
 # virtual methods
 .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
diff --git a/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionCooldown.smali b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionCooldown.smali
deleted file mode 100644
index b6e71c495f..0000000000
--- a/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionCooldown.smali
+++ /dev/null
@@ -1,273 +0,0 @@
-.class public final Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-.super Ljava/lang/Object;
-.source "ModelPremiumGuildSubscriptionCooldown.kt"
-
-
-# instance fields
-.field private final endsAt:Ljava/lang/String;
-
-.field private final limit:I
-
-.field private final remaining:I
-
-
-# direct methods
-.method public constructor <init>(Ljava/lang/String;II)V
-    .locals 1
-
-    const-string v0, "endsAt"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    iput p2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    iput p3, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining:I
-
-    return-void
-.end method
-
-.method private final component1()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;Ljava/lang/String;IIILjava/lang/Object;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-    .locals 0
-
-    and-int/lit8 p5, p4, 0x1
-
-    if-eqz p5, :cond_0
-
-    iget-object p1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    :cond_0
-    and-int/lit8 p5, p4, 0x2
-
-    if-eqz p5, :cond_1
-
-    iget p2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    :cond_1
-    and-int/lit8 p4, p4, 0x4
-
-    if-eqz p4, :cond_2
-
-    iget p3, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining:I
-
-    :cond_2
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->copy(Ljava/lang/String;II)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component2()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    return v0
-.end method
-
-.method public final component3()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining:I
-
-    return v0
-.end method
-
-.method public final copy(Ljava/lang/String;II)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-    .locals 1
-
-    const-string v0, "endsAt"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;-><init>(Ljava/lang/String;II)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/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_2
-
-    check-cast p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    iget-object v3, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    iget v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    iget v3, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit: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_2
-
-    iget v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining:I
-
-    iget p1, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining: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 getExpiresAtTimestamp()J
-    .locals 2
-
-    invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Lcom/miguelgaeta/simple_time/SimpleTime;->parseUTCDate(Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final getLimit()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    return v0
-.end method
-
-.method public final getRemaining()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining:I
-
-    return v0
-.end method
-
-.method public final hashCode()I
-    .locals 2
-
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    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 v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining: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, "ModelPremiumGuildSubscriptionCooldown(endsAt="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->endsAt:Ljava/lang/String;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", limit="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->limit:I
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", remaining="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->remaining: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/models/domain/ModelPremiumGuildSubscriptionSlot.smali b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali
new file mode 100644
index 0000000000..c0691be78a
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.smali
@@ -0,0 +1,367 @@
+.class public final Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+.super Ljava/lang/Object;
+.source "ModelPremiumGuildSubscriptionSlot.kt"
+
+
+# instance fields
+.field private final cooldownEndsAt:Ljava/lang/String;
+
+.field private final id:J
+
+.field private final premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+.field private final subscriptionId:J
+
+
+# direct methods
+.method public constructor <init>(Ljava/lang/String;JJLcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    iput-wide p2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    iput-wide p4, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    iput-object p6, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    return-void
+.end method
+
+.method private final component1()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;Ljava/lang/String;JJLcom/discord/models/domain/ModelPremiumGuildSubscription;ILjava/lang/Object;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+    .locals 4
+
+    and-int/lit8 p8, p7, 0x1
+
+    if-eqz p8, :cond_0
+
+    iget-object p1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    :cond_0
+    and-int/lit8 p8, p7, 0x2
+
+    if-eqz p8, :cond_1
+
+    iget-wide p2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    :cond_1
+    move-wide v0, p2
+
+    and-int/lit8 p2, p7, 0x4
+
+    if-eqz p2, :cond_2
+
+    iget-wide p4, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    :cond_2
+    move-wide v2, p4
+
+    and-int/lit8 p2, p7, 0x8
+
+    if-eqz p2, :cond_3
+
+    iget-object p6, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    :cond_3
+    move-object p8, p6
+
+    move-object p2, p0
+
+    move-object p3, p1
+
+    move-wide p4, v0
+
+    move-wide p6, v2
+
+    invoke-virtual/range {p2 .. p8}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->copy(Ljava/lang/String;JJLcom/discord/models/domain/ModelPremiumGuildSubscription;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component2()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    return-wide v0
+.end method
+
+.method public final component3()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    return-wide v0
+.end method
+
+.method public final component4()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/String;JJLcom/discord/models/domain/ModelPremiumGuildSubscription;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+    .locals 8
+
+    new-instance v7, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    move-object v0, v7
+
+    move-object v1, p1
+
+    move-wide v2, p2
+
+    move-wide v4, p4
+
+    move-object v6, p6
+
+    invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;-><init>(Ljava/lang/String;JJLcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+
+    return-object v7
+.end method
+
+.method public final equals(Ljava/lang/Object;)Z
+    .locals 7
+
+    const/4 v0, 0x1
+
+    if-eq p0, p1, :cond_3
+
+    instance-of v1, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    check-cast p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    iget-object v3, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    iget-wide v3, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    iget-wide v5, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    cmp-long v1, v3, v5
+
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_2
+
+    iget-wide v3, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    iget-wide v5, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    cmp-long v1, v3, v5
+
+    if-nez v1, :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/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    iget-object p1, p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->areEqual(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 getCooldownExpiresAtTimestamp()J
+    .locals 2
+
+    invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
+
+    move-result-object v0
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    invoke-virtual {v0, v1}, Lcom/miguelgaeta/simple_time/SimpleTime;->parseUTCDate(Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final getId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    return-wide v0
+.end method
+
+.method public final getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    return-object v0
+.end method
+
+.method public final getSubscriptionId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    return-wide v0
+.end method
+
+.method public final hashCode()I
+    .locals 7
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt: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-wide v2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    const/16 v4, 0x20
+
+    ushr-long v5, v2, v4
+
+    xor-long/2addr v2, v5
+
+    long-to-int v3, v2
+
+    add-int/2addr v0, v3
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    ushr-long v4, v2, v4
+
+    xor-long/2addr v2, v4
+
+    long-to-int v3, v2
+
+    add-int/2addr v0, v3
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    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 3
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ModelPremiumGuildSubscriptionSlot(cooldownEndsAt="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->cooldownEndsAt:Ljava/lang/String;
+
+    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;
+
+    iget-wide v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->id:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, ", subscriptionId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->subscriptionId:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)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/models/domain/ModelPremiumGuildSubscriptionSlot;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    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/ModelPresence$Party$Size.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Party$Size.smali
new file mode 100644
index 0000000000..e9240dcefb
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Party$Size.smali
@@ -0,0 +1,333 @@
+.class public Lcom/discord/models/domain/ModelPresence$Party$Size;
+.super Ljava/lang/Object;
+.source "ModelPresence.java"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/models/domain/ModelPresence$Party;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x9
+    name = "Size"
+.end annotation
+
+
+# instance fields
+.field protected current:I
+
+.field protected max:I
+
+
+# direct methods
+.method constructor <init>()V
+    .locals 1
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
+
+    iput v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
+
+    return-void
+.end method
+
+.method constructor <init>(Ljava/util/List;)V
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Ljava/lang/Integer;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
+
+    iput v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
+
+    invoke-interface {p1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    if-le v1, v2, :cond_0
+
+    invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Integer;
+
+    invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
+
+    move-result v3
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v3, 0x0
+
+    :goto_0
+    iput v3, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
+
+    if-lez v1, :cond_1
+
+    sub-int/2addr v1, v2
+
+    invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/Integer;
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    :cond_1
+    iput v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
+    .locals 5
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
+
+    move-result v1
+
+    const v2, 0x1a564
+
+    const/4 v3, 0x1
+
+    const/4 v4, 0x0
+
+    if-eq v1, v2, :cond_1
+
+    const v2, 0x432bbd79
+
+    if-eq v1, v2, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v1, "current"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x0
+
+    goto :goto_1
+
+    :cond_1
+    const-string v1, "max"
+
+    invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    const/4 v0, 0x1
+
+    goto :goto_1
+
+    :cond_2
+    :goto_0
+    const/4 v0, -0x1
+
+    :goto_1
+    if-eqz v0, :cond_4
+
+    if-eq v0, v3, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
+
+    return-void
+
+    :cond_3
+    invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+
+    move-result p1
+
+    iput p1, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
+
+    return-void
+
+    :cond_4
+    invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+
+    move-result p1
+
+    iput p1, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
+
+    return-void
+.end method
+
+.method protected canEqual(Ljava/lang/Object;)Z
+    .locals 0
+
+    instance-of p1, p1, Lcom/discord/models/domain/ModelPresence$Party$Size;
+
+    return p1
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+    .locals 4
+
+    const/4 v0, 0x1
+
+    if-ne p1, p0, :cond_0
+
+    return v0
+
+    :cond_0
+    instance-of v1, p1, Lcom/discord/models/domain/ModelPresence$Party$Size;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_1
+
+    return v2
+
+    :cond_1
+    check-cast p1, Lcom/discord/models/domain/ModelPresence$Party$Size;
+
+    invoke-virtual {p1, p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->canEqual(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_2
+
+    return v2
+
+    :cond_2
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getCurrent()I
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getCurrent()I
+
+    move-result v3
+
+    if-eq v1, v3, :cond_3
+
+    return v2
+
+    :cond_3
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getMax()I
+
+    move-result v1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getMax()I
+
+    move-result p1
+
+    if-eq v1, p1, :cond_4
+
+    return v2
+
+    :cond_4
+    return v0
+.end method
+
+.method public getCurrent()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
+
+    return v0
+.end method
+
+.method public getMax()I
+    .locals 1
+
+    iget v0, p0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
+
+    return v0
+.end method
+
+.method public hashCode()I
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getCurrent()I
+
+    move-result v0
+
+    add-int/lit8 v0, v0, 0x3b
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getMax()I
+
+    move-result v1
+
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+    .locals 2
+
+    new-instance v0, Ljava/lang/StringBuilder;
+
+    const-string v1, "ModelPresence.Party.Size(current="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getCurrent()I
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+    const-string v1, ", max="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party$Size;->getMax()I
+
+    move-result v1
+
+    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/models/domain/ModelPresence$Party.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali
index 03676d4dfa..512f292575 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Party.smali
@@ -16,19 +16,17 @@
     name = "Party"
 .end annotation
 
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/models/domain/ModelPresence$Party$Size;
+    }
+.end annotation
+
 
 # instance fields
 .field protected id:Ljava/lang/String;
 
-.field protected size:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field protected size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
 
 # direct methods
@@ -141,15 +139,37 @@
     return-void
 
     :cond_3
+    :try_start_0
     new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelPresence$Party$-xfseglJkl0izFqAY60Ri2Jc9bs;
 
     invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelPresence$Party$-xfseglJkl0izFqAY60Ri2Jc9bs;-><init>(Lcom/discord/models/domain/Model$JsonReader;)V
 
     invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
 
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/models/domain/ModelPresence$Party$Size;
+
+    invoke-direct {v1, v0}, Lcom/discord/models/domain/ModelPresence$Party$Size;-><init>(Ljava/util/List;)V
+
+    iput-object v1, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
+    :try_end_0
+    .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-void
+
+    :catch_0
+    new-instance v0, Lcom/discord/models/domain/ModelPresence$Party$Size;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelPresence$Party$Size;-><init>()V
+
+    invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
+    check-cast p1, Lcom/discord/models/domain/ModelPresence$Party$Size;
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     return-void
 
@@ -228,11 +248,11 @@
     return v2
 
     :cond_4
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     move-result-object p1
 
@@ -257,38 +277,20 @@
 .end method
 
 .method public getCurrentSize()I
-    .locals 3
+    .locals 1
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    const/4 v1, 0x0
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v2, 0x1
-
-    if-le v0, v2, :cond_0
-
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
+    iget v0, v0, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
 
     return v0
 
     :cond_0
-    return v1
+    const/4 v0, 0x0
+
+    return v0
 .end method
 
 .method public getId()Ljava/lang/String;
@@ -300,35 +302,13 @@
 .end method
 
 .method public getMaxSize()I
-    .locals 2
+    .locals 1
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    if-lez v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    add-int/lit8 v1, v1, -0x1
-
-    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
+    iget v0, v0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
 
     return v0
 
@@ -339,68 +319,32 @@
 .end method
 
 .method public getOpenSlots()I
-    .locals 3
+    .locals 2
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    const/4 v1, 0x0
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Ljava/util/List;->size()I
+    iget v0, v0, Lcom/discord/models/domain/ModelPresence$Party$Size;->max:I
 
-    move-result v0
+    iget-object v1, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
-    const/4 v2, 0x2
-
-    if-lt v0, v2, :cond_0
-
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    const/4 v2, 0x1
-
-    invoke-interface {v0, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    iget-object v2, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
-
-    invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Integer;
-
-    invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
-    move-result v1
+    iget v1, v1, Lcom/discord/models/domain/ModelPresence$Party$Size;->current:I
 
     sub-int/2addr v0, v1
 
     return v0
 
     :cond_0
-    return v1
+    const/4 v0, 0x0
+
+    return v0
 .end method
 
-.method public getSize()Ljava/util/List;
+.method public getSize()Lcom/discord/models/domain/ModelPresence$Party$Size;
     .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Party;->size:Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     return-object v0
 .end method
@@ -428,7 +372,7 @@
     :goto_0
     add-int/lit8 v0, v0, 0x3b
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     move-result-object v2
 
@@ -468,7 +412,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Party;->getSize()Lcom/discord/models/domain/ModelPresence$Party$Size;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscription.smali b/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
index 3a514ca204..d49e003b3b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscription.smali
@@ -1147,6 +1147,39 @@
     return v0
 .end method
 
+.method public final isNonePlan()Z
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    if-eq v0, v1, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    move-result-object v0
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_1
+    :goto_0
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
 .method public final toString()Ljava/lang/String;
     .locals 3
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType.smali b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType.smali
index ddab9731c1..65676fa5f8 100644
--- a/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType.smali
@@ -33,6 +33,10 @@
 
 .field public static final Companion:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType$Companion;
 
+.field public static final enum NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+.field public static final enum NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
 .field public static final enum PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
 .field public static final enum PREMIUM_GUILD_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -64,7 +68,7 @@
 .method static constructor <clinit>()V
     .locals 18
 
-    const/16 v0, 0x8
+    const/16 v0, 0xa
 
     new-array v0, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
@@ -72,21 +76,21 @@
 
     sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    const-string v2, "PREMIUM_MONTH_LEGACY"
+    const-string v2, "NONE_MONTH"
 
     const/4 v3, 0x0
 
-    const/16 v4, 0x1f3
+    const/4 v4, 0x0
 
-    const-string v6, "premium_month"
+    const-string v6, "none_month"
 
-    const-wide v7, 0x719c0a6fe400000L    # 1.85953420074464E-274
+    const-wide v7, 0x8b873825d000000L
 
     move-object v1, v9
 
     invoke-direct/range {v1 .. v8}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;-><init>(Ljava/lang/String;IILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Ljava/lang/String;J)V
 
-    sput-object v9, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sput-object v9, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     const/4 v1, 0x0
 
@@ -96,21 +100,21 @@
 
     sget-object v14, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    const-string v11, "PREMIUM_YEAR_LEGACY"
+    const-string v11, "NONE_YEAR"
 
     const/4 v12, 0x1
 
-    const/16 v13, 0x1387
+    const/4 v13, 0x0
 
-    const-string v15, "premium_year"
+    const-string v15, "none_year"
 
-    const-wide v16, 0x719c0a80c000000L
+    const-wide v16, 0x8b875b5c4c00000L
 
     move-object v10, v1
 
     invoke-direct/range {v10 .. v17}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;-><init>(Ljava/lang/String;IILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Ljava/lang/String;J)V
 
-    sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     const/4 v2, 0x1
 
@@ -120,12 +124,60 @@
 
     sget-object v7, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
 
-    const-string v4, "PREMIUM_MONTH_TIER_1"
+    const-string v4, "PREMIUM_MONTH_LEGACY"
 
     const/4 v5, 0x2
 
     const/16 v6, 0x1f3
 
+    const-string v8, "premium_month"
+
+    const-wide v9, 0x719c0a6fe400000L    # 1.85953420074464E-274
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v10}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;-><init>(Ljava/lang/String;IILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Ljava/lang/String;J)V
+
+    sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    sget-object v7, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->YEARLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    const-string v4, "PREMIUM_YEAR_LEGACY"
+
+    const/4 v5, 0x3
+
+    const/16 v6, 0x1387
+
+    const-string v8, "premium_year"
+
+    const-wide v9, 0x719c0a80c000000L
+
+    move-object v3, v1
+
+    invoke-direct/range {v3 .. v10}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;-><init>(Ljava/lang/String;IILcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;Ljava/lang/String;J)V
+
+    sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    const/4 v2, 0x3
+
+    aput-object v1, v0, v2
+
+    new-instance v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    sget-object v7, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;->MONTHLY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionInterval;
+
+    const-string v4, "PREMIUM_MONTH_TIER_1"
+
+    const/4 v5, 0x4
+
+    const/16 v6, 0x1f3
+
     const-string v8, "premium_month_tier_1"
 
     const-wide v9, 0x719c0aa9f800000L
@@ -136,7 +188,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
@@ -146,7 +198,7 @@
 
     const-string v4, "PREMIUM_YEAR_TIER_1"
 
-    const/4 v5, 0x3
+    const/4 v5, 0x5
 
     const/16 v6, 0x1387
 
@@ -160,7 +212,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x3
+    const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
@@ -170,7 +222,7 @@
 
     const-string v4, "PREMIUM_MONTH_TIER_2"
 
-    const/4 v5, 0x4
+    const/4 v5, 0x6
 
     const/16 v6, 0x3e7
 
@@ -184,7 +236,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
@@ -194,7 +246,7 @@
 
     const-string v4, "PREMIUM_YEAR_TIER_2"
 
-    const/4 v5, 0x5
+    const/4 v5, 0x7
 
     const/16 v6, 0x270f
 
@@ -208,7 +260,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
@@ -218,7 +270,7 @@
 
     const-string v4, "PREMIUM_GUILD_MONTH"
 
-    const/4 v5, 0x6
+    const/16 v5, 0x8
 
     const/16 v6, 0x1f3
 
@@ -232,7 +284,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x6
+    const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
@@ -242,7 +294,7 @@
 
     const-string v4, "PREMIUM_GUILD_YEAR"
 
-    const/4 v5, 0x7
+    const/16 v5, 0x9
 
     const/16 v6, 0x1387
 
@@ -254,7 +306,7 @@
 
     sput-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v2, 0x7
+    const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser.smali
index 518aa67a1d..9f56d76660 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali
@@ -255,6 +255,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
 
diff --git a/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali b/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
index 3b0c173479..8c1d2af62c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelUserProfile.smali
@@ -70,6 +70,61 @@
     return-void
 .end method
 
+.method private constructor <init>(Ljava/util/List;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelConnectedAccount;",
+            ">;)V"
+        }
+    .end annotation
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelUserProfile;->connectedAccounts:Ljava/util/List;
+
+    invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelUserProfile;->mutualGuilds:Ljava/util/Map;
+
+    new-instance v0, Lcom/discord/models/domain/ModelUser;
+
+    invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;-><init>()V
+
+    iput-object v0, p0, Lcom/discord/models/domain/ModelUserProfile;->user:Lcom/discord/models/domain/ModelUser;
+
+    iput-object p1, p0, Lcom/discord/models/domain/ModelUserProfile;->connectedAccounts:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static createForTesting(Ljava/util/List;)Lcom/discord/models/domain/ModelUserProfile;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelConnectedAccount;",
+            ">;)",
+            "Lcom/discord/models/domain/ModelUserProfile;"
+        }
+    .end annotation
+
+    new-instance v0, Lcom/discord/models/domain/ModelUserProfile;
+
+    invoke-direct {v0, p0}, Lcom/discord/models/domain/ModelUserProfile;-><init>(Ljava/util/List;)V
+
+    return-object v0
+.end method
+
 .method static synthetic lambda$assignField$0(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelConnectedAccount;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
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..dd4d29b0c7
--- /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/l;->checkParameterIsNotNull(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/l;->throwNpe()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/l;->throwNpe()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
+
+    invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List;
+
+    move-result-object v3
+
+    :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..579c4bdf64
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcServerId"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcServerId"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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..d5b4f4182a
--- /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/l;->checkParameterIsNotNull(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/l;->throwNpe()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..16a2de747c
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "reason"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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..e1b4ab24f3
--- /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/l;->checkParameterIsNotNull(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/l;->throwNpe()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..ec35e29aaa
--- /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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final 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..68c34898f6
--- /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/l;->checkParameterIsNotNull(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/l;->throwNpe()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
+
+    invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List;
+
+    move-result-object v3
+
+    :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..b0b4308e94
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "viewerIds"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/overlay/OverlayManager$a.smali b/com.discord/smali/com/discord/overlay/OverlayManager$a.smali
index bf0b451a3c..15b739216c 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;->yc:Lcom/discord/overlay/views/a;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->ye: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;->yK:Landroid/graphics/Rect;
+    iget-object v0, v0, Lcom/discord/overlay/views/a;->yM: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 73b6706d3d..3f8a8959fb 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;->yg:Landroid/view/WindowManager;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yi: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;->yb:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yd: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 c6ac483b97..78ff3a5f0d 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;->yc:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p1, Lcom/discord/overlay/views/a;->yI:Landroid/animation/Animator;
+    iget-object p1, p1, Lcom/discord/overlay/views/a;->yK: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;->yc:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p1, Lcom/discord/overlay/views/a;->yJ:Landroid/animation/Animator;
+    iget-object p1, p1, Lcom/discord/overlay/views/a;->yL:Landroid/animation/Animator;
 
     invoke-virtual {p1}, Landroid/animation/Animator;->start()V
 
@@ -93,7 +93,7 @@
 
     :cond_2
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d891addf4d..90190b9d5a 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 yl:Lcom/discord/overlay/OverlayManager$d$1;
+.field final synthetic yn:Lcom/discord/overlay/OverlayManager$d$1;
 
-.field final synthetic ym:Landroid/view/View;
+.field final synthetic yo: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;->yl:Lcom/discord/overlay/OverlayManager$d$1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yn:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->ym:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yo: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;->ym:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yo:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yl:Lcom/discord/overlay/OverlayManager$d$1;
+    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yn:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yj:Ljava/lang/Object;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yl: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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yl:Lcom/discord/overlay/OverlayManager$d$1;
+    iget-object p2, p0, Lcom/discord/overlay/OverlayManager$d$1$a;->yn:Lcom/discord/overlay/OverlayManager$d$1;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p2, Lcom/discord/overlay/OverlayManager$d;->yk: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 ad8b24677f..ca6b33ae99 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 yk:Lcom/discord/overlay/OverlayManager$d;
+.field final synthetic ym:Lcom/discord/overlay/OverlayManager$d;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym: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;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yj:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yl: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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager$d;->yk: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;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     check-cast p1, Landroid/view/View;
 
@@ -105,17 +105,17 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yk: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;->yk:Lcom/discord/overlay/OverlayManager$d;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d$1;->ym:Lcom/discord/overlay/OverlayManager$d;
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-virtual {p1, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->n(Z)V
 
diff --git a/com.discord/smali/com/discord/overlay/OverlayManager$d.smali b/com.discord/smali/com/discord/overlay/OverlayManager$d.smali
index 8bc3bda961..3e7fd1ebf0 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 yh:Lkotlin/jvm/functions/Function1;
+.field final synthetic yj:Lkotlin/jvm/functions/Function1;
 
-.field final synthetic yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field final synthetic yj:Ljava/lang/Object;
+.field final synthetic yl: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;->yh:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$d;->yj:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p3, p0, Lcom/discord/overlay/OverlayManager$d;->yk:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    iput-object p4, p0, Lcom/discord/overlay/OverlayManager$d;->yj:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/discord/overlay/OverlayManager$d;->yl: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;->yh:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->yj:Lkotlin/jvm/functions/Function1;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yk: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;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager$d;->yk: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;->yg:Landroid/view/WindowManager;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yi:Landroid/view/WindowManager;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yk: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;->yg:Landroid/view/WindowManager;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yi:Landroid/view/WindowManager;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yi:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$d;->yk: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 1b1b603c78..51a3bf97b9 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 yn:Lcom/discord/overlay/OverlayManager$e;
+.field public static final yp: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;->yn:Lcom/discord/overlay/OverlayManager$e;
+    sput-object v0, Lcom/discord/overlay/OverlayManager$e;->yp:Lcom/discord/overlay/OverlayManager$e;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b55815a279..83d68840d6 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 yo:Lcom/discord/overlay/OverlayManager$f;
+.field public static final yq: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;->yo:Lcom/discord/overlay/OverlayManager$f;
+    sput-object v0, Lcom/discord/overlay/OverlayManager$f;->yq:Lcom/discord/overlay/OverlayManager$f;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0b80d1ab02..8907038fb8 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 yp:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yr: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;->yp:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p2, p0, Lcom/discord/overlay/OverlayManager$g;->yr:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,26 +57,26 @@
 
     iget-object p1, p0, Lcom/discord/overlay/OverlayManager$g;->this$0:Lcom/discord/overlay/OverlayManager;
 
-    invoke-virtual {p1}, Lcom/discord/overlay/OverlayManager;->eo()Lcom/discord/overlay/views/a;
+    invoke-virtual {p1}, Lcom/discord/overlay/OverlayManager;->ep()Lcom/discord/overlay/views/a;
 
     move-result-object p1
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yp:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yr: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;
 
-    invoke-virtual {p1}, Lcom/discord/overlay/OverlayManager;->ep()Lcom/discord/overlay/a;
+    invoke-virtual {p1}, Lcom/discord/overlay/OverlayManager;->eq()Lcom/discord/overlay/a;
 
     move-result-object p1
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yp:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager$g;->yr: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 51066588fd..3e0905c06d 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 xX:Landroid/graphics/Rect;
+.field private final xZ:Landroid/graphics/Rect;
 
-.field private final xY:Ljava/util/ArrayList;
+.field private final ya:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field public final xZ:Ljava/util/List;
+.field public final yb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field public ya:Lkotlin/jvm/functions/Function1;
+.field public yc:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field yb:Lkotlin/jvm/functions/Function1;
+.field yd:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -53,15 +53,15 @@
     .end annotation
 .end field
 
-.field yc:Lcom/discord/overlay/views/a;
+.field ye:Lcom/discord/overlay/views/a;
 
-.field yd:Lcom/discord/overlay/a;
+.field yf:Lcom/discord/overlay/a;
 
-.field public ye:Landroid/view/View$OnTouchListener;
+.field public yg:Landroid/view/View$OnTouchListener;
 
-.field private yf:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field private yh:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field final yg:Landroid/view/WindowManager;
+.field final yi: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;->yg:Landroid/view/WindowManager;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yi: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;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yi: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;->xX:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->xZ: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;->xY:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->ya:Ljava/util/ArrayList;
 
-    iget-object p1, p0, Lcom/discord/overlay/OverlayManager;->xY:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/overlay/OverlayManager;->ya:Ljava/util/ArrayList;
 
     check-cast p1, Ljava/util/List;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->xZ:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yb:Ljava/util/List;
 
-    sget-object p1, Lcom/discord/overlay/OverlayManager$e;->yn:Lcom/discord/overlay/OverlayManager$e;
+    sget-object p1, Lcom/discord/overlay/OverlayManager$e;->yp:Lcom/discord/overlay/OverlayManager$e;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->ya:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yc:Lkotlin/jvm/functions/Function1;
 
-    sget-object p1, Lcom/discord/overlay/OverlayManager$f;->yo:Lcom/discord/overlay/OverlayManager$f;
+    sget-object p1, Lcom/discord/overlay/OverlayManager$f;->yq:Lcom/discord/overlay/OverlayManager$f;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yb:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yd: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;->ye:Landroid/view/View$OnTouchListener;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yg: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;->yD:Landroid/graphics/Point;
+    iget-object v0, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroid/graphics/Point;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yC:Landroid/graphics/Point;
+    iget-object v1, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yC:Landroid/graphics/Point;
+    iget-object v2, p1, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yf:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yh:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -248,16 +248,16 @@
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yf:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yh:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye: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;->yd:Lcom/discord/overlay/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yf:Lcom/discord/overlay/a;
 
     if-eqz v0, :cond_2
 
@@ -276,7 +276,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xY:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ya: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;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yi: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;->yb:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yd:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -307,7 +307,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yi:Landroid/view/WindowManager;
 
     move-object v1, p1
 
@@ -321,13 +321,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;->xY:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ya: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;->ya:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc:Lkotlin/jvm/functions/Function1;
 
     invoke-interface {v0, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -351,7 +351,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yb:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/OverlayManager;->yd:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -359,7 +359,7 @@
 .method public close()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->xY:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ya:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/util/List;
 
@@ -371,11 +371,11 @@
 
     invoke-static {v0, v1}, Lkotlin/a/m;->removeAll(Ljava/util/List;Lkotlin/jvm/functions/Function1;)Z
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->yg:Landroid/view/WindowManager;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->yi: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;->yc:Lcom/discord/overlay/views/a;
+    iput-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
     return-void
 .end method
@@ -396,13 +396,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yi: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;->xX:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->xZ: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;->xX:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/OverlayManager;->xZ:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->centerX()I
 
@@ -444,18 +444,18 @@
     return-void
 .end method
 
-.method public final eo()Lcom/discord/overlay/views/a;
+.method public final ep()Lcom/discord/overlay/views/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yc:Lcom/discord/overlay/views/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
     return-object v0
 .end method
 
-.method public final ep()Lcom/discord/overlay/a;
+.method public final eq()Lcom/discord/overlay/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yd:Lcom/discord/overlay/a;
+    iget-object v0, p0, Lcom/discord/overlay/OverlayManager;->yf: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 a02f83ff55..d47b0243e1 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;->xZ:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yb: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6b30fb2709..605072c04d 100644
--- a/com.discord/smali/com/discord/overlay/OverlayService.smali
+++ b/com.discord/smali/com/discord/overlay/OverlayService.smali
@@ -84,7 +84,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_2
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yc:Lcom/discord/overlay/views/a;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
     if-nez p1, :cond_4
 
@@ -111,9 +111,9 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, v0, Lcom/discord/overlay/OverlayManager;->yc:Lcom/discord/overlay/views/a;
+    iput-object p1, v0, Lcom/discord/overlay/OverlayManager;->ye:Lcom/discord/overlay/views/a;
 
-    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yg:Landroid/view/WindowManager;
+    iget-object v0, v0, Lcom/discord/overlay/OverlayManager;->yi:Landroid/view/WindowManager;
 
     move-object v1, p1
 
@@ -204,7 +204,7 @@
 
     check-cast v2, Lcom/discord/overlay/a;
 
-    iput-object v2, v0, Lcom/discord/overlay/OverlayManager;->yd:Lcom/discord/overlay/a;
+    iput-object v2, v0, Lcom/discord/overlay/OverlayManager;->yf:Lcom/discord/overlay/a;
 
     iget-object v0, p0, Lcom/discord/overlay/OverlayService;->overlayManager:Lcom/discord/overlay/OverlayManager;
 
diff --git a/com.discord/smali/com/discord/overlay/R$c.smali b/com.discord/smali/com/discord/overlay/R$c.smali
index 7045ff3e8a..99d7613111 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 = 0x7f080099
+.field public static final bubble_state_selector:I = 0x7f08009a
 
-.field public static final ic_close_24dp:I = 0x7f08023d
+.field public static final ic_close_24dp:I = 0x7f080249
 
-.field public static final ic_trash_outline:I = 0x7f08039a
+.field public static final ic_trash_outline:I = 0x7f0803a7
 
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
-.field public static final trash_bg:I = 0x7f080479
+.field public static final trash_bg:I = 0x7f080487
 
 
 # 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 d4141e2b75..00925a518a 100644
--- a/com.discord/smali/com/discord/overlay/R$d.smali
+++ b/com.discord/smali/com/discord/overlay/R$d.smali
@@ -123,9 +123,9 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -135,179 +135,179 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final trash_wrap_icon:I = 0x7f0a076a
+.field public static final trash_wrap_icon:I = 0x7f0a078e
 
-.field public static final trash_wrap_target_container:I = 0x7f0a076b
+.field public static final trash_wrap_target_container:I = 0x7f0a078f
 
-.field public static final trash_wrap_target_zone:I = 0x7f0a076c
+.field public static final trash_wrap_target_zone:I = 0x7f0a0790
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
 
 # 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 f68aa8c7a7..fb09f3d876 100644
--- a/com.discord/smali/com/discord/overlay/R$e.smali
+++ b/com.discord/smali/com/discord/overlay/R$e.smali
@@ -71,29 +71,29 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final trash_wrap:I = 0x7f0d0060
+.field public static final trash_wrap:I = 0x7f0d0063
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/b.smali b/com.discord/smali/com/discord/overlay/b.smali
index 31743c0bdf..74602983de 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 yq:Lcom/discord/overlay/b;
+.field public static final ys: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;->yq:Lcom/discord/overlay/b;
+    sput-object v0, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     return-object p1
 .end method
 
-.method public static eq()Landroid/view/WindowManager$LayoutParams;
+.method public static er()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 1013015e64..72a2aa3f39 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 yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yG:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-direct {p0, p2}, Lkotlin/properties/c;-><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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$a;->yG: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 ab24fa8541..8b489af83d 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 yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field final synthetic yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->yG: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;->yE:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap$b;->yG: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 68f62199f5..5024673abd 100644
--- a/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
+++ b/com.discord/smali/com/discord/overlay/views/OverlayBubbleWrap.smali
@@ -8,27 +8,31 @@
 
 
 # instance fields
-.field private final yA:Landroidx/dynamicanimation/animation/SpringAnimation;
+.field private yA:I
 
-.field private final yB:Landroidx/dynamicanimation/animation/SpringAnimation;
+.field private yB:I
 
-.field public yC:Landroid/graphics/Point;
+.field private final yC:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-.field public yD:Landroid/graphics/Point;
+.field private final yD:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-.field private final yg:Landroid/view/WindowManager;
+.field public yE:Landroid/graphics/Point;
 
-.field private yr:Landroid/view/WindowManager$LayoutParams;
+.field public yF:Landroid/graphics/Point;
 
-.field private final ys:Landroid/graphics/Rect;
+.field private final yi:Landroid/view/WindowManager;
 
-.field private final yt:I
+.field private yt:Landroid/view/WindowManager$LayoutParams;
 
 .field private final yu:Landroid/graphics/Rect;
 
-.field private final yv:Lkotlin/properties/ReadWriteProperty;
+.field private final yv:I
 
-.field private yw:Lkotlin/jvm/functions/Function1;
+.field private final yw:Landroid/graphics/Rect;
+
+.field private final yx:Lkotlin/properties/ReadWriteProperty;
+
+.field private yy:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -40,11 +44,7 @@
     .end annotation
 .end field
 
-.field private final yx:[I
-
-.field private yy:I
-
-.field private yz:I
+.field private final yz:[I
 
 
 # direct methods
@@ -107,11 +107,11 @@
 
     check-cast p1, Landroid/view/WindowManager;
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yg:Landroid/view/WindowManager;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
-    sget-object p1, Lcom/discord/overlay/b;->yq:Lcom/discord/overlay/b;
+    sget-object p1, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
 
-    invoke-static {}, Lcom/discord/overlay/b;->eq()Landroid/view/WindowManager$LayoutParams;
+    invoke-static {}, Lcom/discord/overlay/b;->er()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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->ys:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu: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;->yt:I
+    iput p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi: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;->yu:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
-    sget-object p1, Lkotlin/properties/a;->bhF:Lkotlin/properties/a;
+    sget-object p1, Lkotlin/properties/a;->bhP: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;->yv:Lkotlin/properties/ReadWriteProperty;
+    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:Lkotlin/properties/ReadWriteProperty;
 
     const/4 p1, 0x2
 
     new-array p1, p1, [I
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:[I
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[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;->yA:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC: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;->yB:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     new-instance p1, Landroid/graphics/Point;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yC:Landroid/graphics/Point;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
 
     return-void
 
@@ -307,9 +307,9 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yB:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object p2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
 
-    iget-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object p3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yu:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
     iget v1, p1, Landroid/graphics/Rect;->left:I
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->ys:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu: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;->ys:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu: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;->ys:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu: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;->ys:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu: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;->yu:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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 es()V
+.method private final et()V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
 
     invoke-virtual {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->getLocationOnScreen([I)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
 
     const/4 v1, 0x0
 
     aget v2, v0, v1
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yx:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
 
     const/4 v1, 0x1
 
     aget v2, v0, v1
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     iget v3, v3, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -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;->es()V
+    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->et()V
 
     return-void
 .end method
@@ -491,7 +491,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/overlay/b;->yq:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->ys: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;->yx:[I
+    iget-object v4, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[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;->yg:Landroid/view/WindowManager;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi: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;->yC:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -618,15 +618,15 @@
     goto/16 :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->er()Z
+    invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->es()Z
 
     move-result v0
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:I
+    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA:I
 
-    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yt:I
+    iget v3, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv: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;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yy:I
+    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA:I
 
     sub-int/2addr v1, v2
 
     iput v1, v0, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yz:I
+    iget v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:I
 
     sub-int/2addr v1, v2
 
@@ -696,29 +696,29 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroid/graphics/Point;
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yg:Landroid/view/WindowManager;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v2, Landroid/view/ViewGroup$LayoutParams;
 
@@ -727,7 +727,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->er()Z
+    invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->es()Z
 
     move-result v0
 
@@ -744,13 +744,13 @@
 
     float-to-int v0, v0
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yy:I
+    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yz:I
+    iput v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:I
 
     :cond_5
     :goto_0
@@ -775,10 +775,10 @@
     return p1
 .end method
 
-.method public er()Z
+.method public es()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:Lkotlin/properties/ReadWriteProperty;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:Lkotlin/properties/ReadWriteProperty;
 
     sget-object v1, Lcom/discord/overlay/views/OverlayBubbleWrap;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -802,7 +802,7 @@
 .method protected final getAllowedAreaBounds()Landroid/graphics/Rect;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
     return-object v0
 .end method
@@ -810,7 +810,7 @@
 .method public final getCenterX()I
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -828,7 +828,7 @@
 .method public final getCenterY()I
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -846,7 +846,7 @@
 .method public final getInsetMargins()Landroid/graphics/Rect;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->ys:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu:Landroid/graphics/Rect;
 
     return-object v0
 .end method
@@ -854,7 +854,7 @@
 .method public final getMoveThresholdPx()I
     .locals 1
 
-    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:I
+    iget v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yv:I
 
     return v0
 .end method
@@ -871,7 +871,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Lkotlin/jvm/functions/Function1;
 
     return-object v0
 .end method
@@ -879,7 +879,7 @@
 .method public final getScreenOffset()[I
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx:[I
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yz:[I
 
     return-object v0
 .end method
@@ -887,7 +887,7 @@
 .method protected final getSpringAnimationX()Landroidx/dynamicanimation/animation/SpringAnimation;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     return-object v0
 .end method
@@ -895,7 +895,7 @@
 .method protected final getSpringAnimationY()Landroidx/dynamicanimation/animation/SpringAnimation;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     return-object v0
 .end method
@@ -903,7 +903,7 @@
 .method public final getWindowLayoutParams()Landroid/view/WindowManager$LayoutParams;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     return-object v0
 .end method
@@ -911,7 +911,7 @@
 .method protected final getWindowManager()Landroid/view/WindowManager;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
     return-object v0
 .end method
@@ -919,7 +919,7 @@
 .method public getX()F
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->x:I
 
@@ -931,7 +931,7 @@
 .method public getY()F
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     iget v0, v0, Landroid/view/WindowManager$LayoutParams;->y:I
 
@@ -957,7 +957,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -965,7 +965,7 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v2, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -977,23 +977,23 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD:Landroid/graphics/Point;
+    iput-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF:Landroid/graphics/Point;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yA:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroidx/dynamicanimation/animation/SpringAnimation;
 
     invoke-virtual {v0}, Landroidx/dynamicanimation/animation/SpringAnimation;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yB:Landroidx/dynamicanimation/animation/SpringAnimation;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yD: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;->yC:Landroid/graphics/Point;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
 
     iget p1, p1, Landroid/graphics/Point;->x:I
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE:Landroid/graphics/Point;
 
     iget v0, v0, Landroid/graphics/Point;->y:I
 
@@ -1002,29 +1002,29 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yg:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -1038,17 +1038,17 @@
 
     invoke-super {p0}, Landroid/widget/FrameLayout;->onAttachedToWindow()V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi: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;->yu:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v1}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
     invoke-direct {p0, v0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->a(Landroid/graphics/Rect;)V
 
@@ -1060,27 +1060,27 @@
 
     invoke-super {p0, p1}, Landroid/widget/FrameLayout;->onConfigurationChanged(Landroid/content/res/Configuration;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yg:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi: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;->yu:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw:Landroid/graphics/Rect;
 
     invoke-virtual {p1, v0}, Landroid/view/Display;->getRectSize(Landroid/graphics/Rect;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yu:Landroid/graphics/Rect;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yw: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;->yg:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt:Landroid/view/WindowManager$LayoutParams;
 
     check-cast v1, Landroid/view/ViewGroup$LayoutParams;
 
@@ -1098,7 +1098,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->es()V
+    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->et()V
 
     return-void
 
@@ -1136,7 +1136,7 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->er()Z
+    invoke-virtual {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->es()Z
 
     move-result p1
 
@@ -1150,7 +1150,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->es()V
+    invoke-direct {p0}, Lcom/discord/overlay/views/OverlayBubbleWrap;->et()V
 
     :cond_0
     return-void
@@ -1163,7 +1163,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yC:Landroid/graphics/Point;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yD:Landroid/graphics/Point;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF: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;->yC:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yE: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;->yD:Landroid/graphics/Point;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yF: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;->yq:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
 
-    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yg:Landroid/view/WindowManager;
+    iget-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/View;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yv:Lkotlin/properties/ReadWriteProperty;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yx: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;->yw:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yy:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -1311,7 +1311,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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;->yg:Landroid/view/WindowManager;
+    iget-object v0, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yi:Landroid/view/WindowManager;
 
-    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v1, p0, Lcom/discord/overlay/views/OverlayBubbleWrap;->yt: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 9e17159e8f..eee9bb1811 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;->yq:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
 
     const/4 v0, 0x2
 
@@ -55,7 +55,7 @@
 
 
 # virtual methods
-.method public final er()Z
+.method public final es()Z
     .locals 1
 
     const/4 v0, 0x0
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 01c22fbb1b..1d3abc98df 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 yN:Lcom/discord/overlay/views/a;
+.field final synthetic yP: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;->yN:Lcom/discord/overlay/views/a;
+    iput-object p1, p0, Lcom/discord/overlay/views/a$a;->yP:Lcom/discord/overlay/views/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -71,7 +71,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a$a;->yN:Lcom/discord/overlay/views/a;
+    iget-object p1, p0, Lcom/discord/overlay/views/a$a;->yP: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 372c18c726..5aa1d4db51 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 yN:Lcom/discord/overlay/views/a;
+.field final synthetic yP: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;->yN:Lcom/discord/overlay/views/a;
+    iput-object p1, p0, Lcom/discord/overlay/views/a$b;->yP:Lcom/discord/overlay/views/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a$b;->yN:Lcom/discord/overlay/views/a;
+    iget-object p1, p0, Lcom/discord/overlay/views/a$b;->yP: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 a50a2b08a9..f2566b3e9b 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 final yF:Landroid/view/View;
+.field private final yH:Landroid/view/View;
 
-.field private final yG:Landroid/view/View;
+.field private final yI:Landroid/view/View;
 
-.field private final yH:Landroid/widget/ImageView;
+.field private final yJ:Landroid/widget/ImageView;
 
-.field public final yI:Landroid/animation/Animator;
+.field public final yK:Landroid/animation/Animator;
 
-.field public final yJ:Landroid/animation/Animator;
+.field public final yL:Landroid/animation/Animator;
 
-.field public final yK:Landroid/graphics/Rect;
+.field public final yM:Landroid/graphics/Rect;
 
-.field private final yL:[I
+.field private final yN:[I
 
-.field private yM:Lcom/discord/overlay/views/OverlayBubbleWrap;
+.field private yO:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
-.field private yr:Landroid/view/WindowManager$LayoutParams;
+.field private yt: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;->yq:Lcom/discord/overlay/b;
+    sget-object p1, Lcom/discord/overlay/b;->ys:Lcom/discord/overlay/b;
 
-    invoke-static {}, Lcom/discord/overlay/b;->eq()Landroid/view/WindowManager$LayoutParams;
+    invoke-static {}, Lcom/discord/overlay/b;->er()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;->yq:Lcom/discord/overlay/b;
+    sget-object v0, Lcom/discord/overlay/b;->ys: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yt: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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->yF:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yH: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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->yG:Landroid/view/View;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yI: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;->yH:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yJ: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;->yF:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->yH: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;->yI:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yK: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;->yF:Landroid/view/View;
+    iget-object v3, p0, Lcom/discord/overlay/views/a;->yH: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;->yJ:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yL: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;->yK:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yM:Landroid/graphics/Rect;
 
     new-array p1, v0, [I
 
     fill-array-data p1, :array_0
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->yL:[I
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yN:[I
 
     return-void
 
@@ -268,7 +268,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v4, p0, Lcom/discord/overlay/views/a;->yG:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleX()F
 
     move-result v7
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleY()F
 
     move-result v9
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getPivotX()F
 
     move-result v11
 
-    iget-object v5, p0, Lcom/discord/overlay/views/a;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v4, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v5, p0, Lcom/discord/overlay/views/a;->yI:Landroid/view/View;
 
     invoke-virtual {v5}, Landroid/view/View;->getScaleX()F
 
     move-result v5
 
-    iget-object v6, p0, Lcom/discord/overlay/views/a;->yG:Landroid/view/View;
+    iget-object v6, p0, Lcom/discord/overlay/views/a;->yI: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;->yG:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yI: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;->yM:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yO:Lcom/discord/overlay/views/OverlayBubbleWrap;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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;->yH:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yJ: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;->yM:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yO: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;->yM:Lcom/discord/overlay/views/OverlayBubbleWrap;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yO: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;->yJ:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yL: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;->yI:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yK: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;->yr:Landroid/view/WindowManager$LayoutParams;
+    iget-object v0, p0, Lcom/discord/overlay/views/a;->yt: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;->yF:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/overlay/views/a;->yH:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/discord/overlay/views/a;->yL:[I
+    iget-object p2, p0, Lcom/discord/overlay/views/a;->yN:[I
 
     invoke-virtual {p1, p2}, Landroid/view/View;->getLocationOnScreen([I)V
 
-    iget-object p1, p0, Lcom/discord/overlay/views/a;->yL:[I
+    iget-object p1, p0, Lcom/discord/overlay/views/a;->yN:[I
 
     const/4 p2, 0x0
 
@@ -496,9 +496,9 @@
 
     aget p1, p1, p3
 
-    iget-object p3, p0, Lcom/discord/overlay/views/a;->yK:Landroid/graphics/Rect;
+    iget-object p3, p0, Lcom/discord/overlay/views/a;->yM:Landroid/graphics/Rect;
 
-    iget-object p4, p0, Lcom/discord/overlay/views/a;->yF:Landroid/view/View;
+    iget-object p4, p0, Lcom/discord/overlay/views/a;->yH: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;->yF:Landroid/view/View;
+    iget-object p5, p0, Lcom/discord/overlay/views/a;->yH:Landroid/view/View;
 
     invoke-virtual {p5}, Landroid/view/View;->getHeight()I
 
@@ -527,7 +527,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/overlay/views/a;->yr:Landroid/view/WindowManager$LayoutParams;
+    iput-object p1, p0, Lcom/discord/overlay/views/a;->yt: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 23fabecf5e..3d9b8fd31a 100644
--- a/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
+++ b/com.discord/smali/com/discord/restapi/BreadcrumbInterceptor.smali
@@ -34,15 +34,15 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fu()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FH()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/w;->FK()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lokhttp3/w;->FG()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/w;->FJ()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;->Fu()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fx()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 e7287546d3..29c706481e 100644
--- a/com.discord/smali/com/discord/restapi/R$attr.smali
+++ b/com.discord/smali/com/discord/restapi/R$attr.smali
@@ -673,463 +673,463 @@
 
 .field public static final layout_wrapBefore:I = 0x7f040254
 
-.field public static final liftOnScroll:I = 0x7f040258
+.field public static final liftOnScroll:I = 0x7f040259
 
-.field public static final lineHeight:I = 0x7f040259
+.field public static final lineHeight:I = 0x7f04025a
 
-.field public static final lineSpacing:I = 0x7f04025a
+.field public static final lineSpacing:I = 0x7f04025b
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
 
-.field public static final listDividerAlertDialog:I = 0x7f04025c
+.field public static final listDividerAlertDialog:I = 0x7f04025d
 
-.field public static final listItemLayout:I = 0x7f04025d
+.field public static final listItemLayout:I = 0x7f04025e
 
-.field public static final listLayout:I = 0x7f04025e
+.field public static final listLayout:I = 0x7f04025f
 
-.field public static final listMenuViewStyle:I = 0x7f04025f
+.field public static final listMenuViewStyle:I = 0x7f040260
 
-.field public static final listPopupWindowStyle:I = 0x7f040260
+.field public static final listPopupWindowStyle:I = 0x7f040261
 
-.field public static final listPreferredItemHeight:I = 0x7f040261
+.field public static final listPreferredItemHeight:I = 0x7f040262
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040262
+.field public static final listPreferredItemHeightLarge:I = 0x7f040263
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040263
+.field public static final listPreferredItemHeightSmall:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040265
+.field public static final listPreferredItemPaddingRight:I = 0x7f040266
 
-.field public static final logo:I = 0x7f040266
+.field public static final logo:I = 0x7f040267
 
-.field public static final logoDescription:I = 0x7f040267
+.field public static final logoDescription:I = 0x7f040268
 
-.field public static final materialButtonStyle:I = 0x7f040277
+.field public static final materialButtonStyle:I = 0x7f040278
 
-.field public static final materialCardViewStyle:I = 0x7f040278
+.field public static final materialCardViewStyle:I = 0x7f040279
 
-.field public static final maxActionInlineWidth:I = 0x7f040279
+.field public static final maxActionInlineWidth:I = 0x7f04027a
 
-.field public static final maxButtonHeight:I = 0x7f04027a
+.field public static final maxButtonHeight:I = 0x7f04027b
 
-.field public static final maxImageSize:I = 0x7f04027b
+.field public static final maxImageSize:I = 0x7f04027c
 
-.field public static final max_height:I = 0x7f04027c
+.field public static final max_height:I = 0x7f04027d
 
-.field public static final measureWithLargestChild:I = 0x7f04027d
+.field public static final measureWithLargestChild:I = 0x7f04027e
 
-.field public static final menu:I = 0x7f04027e
+.field public static final menu:I = 0x7f04027f
 
-.field public static final multiChoiceItemLayout:I = 0x7f04027f
+.field public static final multiChoiceItemLayout:I = 0x7f040280
 
-.field public static final navigationContentDescription:I = 0x7f040280
+.field public static final navigationContentDescription:I = 0x7f040281
 
-.field public static final navigationIcon:I = 0x7f040281
+.field public static final navigationIcon:I = 0x7f040282
 
-.field public static final navigationMode:I = 0x7f040282
+.field public static final navigationMode:I = 0x7f040283
 
-.field public static final navigationViewStyle:I = 0x7f040283
+.field public static final navigationViewStyle:I = 0x7f040284
 
-.field public static final numericModifiers:I = 0x7f040286
+.field public static final numericModifiers:I = 0x7f040287
 
-.field public static final overlapAnchor:I = 0x7f040287
+.field public static final overlapAnchor:I = 0x7f040288
 
-.field public static final overlayImage:I = 0x7f040288
+.field public static final overlayImage:I = 0x7f040289
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028b
+.field public static final paddingBottomNoButtons:I = 0x7f04028c
 
-.field public static final paddingEnd:I = 0x7f04028c
+.field public static final paddingEnd:I = 0x7f04028d
 
-.field public static final paddingStart:I = 0x7f04028d
+.field public static final paddingStart:I = 0x7f04028e
 
-.field public static final paddingTopNoTitle:I = 0x7f04028e
+.field public static final paddingTopNoTitle:I = 0x7f04028f
 
-.field public static final panelBackground:I = 0x7f04028f
+.field public static final panelBackground:I = 0x7f040290
 
-.field public static final panelMenuListTheme:I = 0x7f040290
+.field public static final panelMenuListTheme:I = 0x7f040291
 
-.field public static final panelMenuListWidth:I = 0x7f040291
+.field public static final panelMenuListWidth:I = 0x7f040292
 
-.field public static final passwordToggleContentDescription:I = 0x7f040292
+.field public static final passwordToggleContentDescription:I = 0x7f040293
 
-.field public static final passwordToggleDrawable:I = 0x7f040293
+.field public static final passwordToggleDrawable:I = 0x7f040294
 
-.field public static final passwordToggleEnabled:I = 0x7f040294
+.field public static final passwordToggleEnabled:I = 0x7f040295
 
-.field public static final passwordToggleTint:I = 0x7f040295
+.field public static final passwordToggleTint:I = 0x7f040296
 
-.field public static final passwordToggleTintMode:I = 0x7f040296
+.field public static final passwordToggleTintMode:I = 0x7f040297
 
-.field public static final placeholderImage:I = 0x7f040297
+.field public static final placeholderImage:I = 0x7f040298
 
-.field public static final placeholderImageScaleType:I = 0x7f040298
+.field public static final placeholderImageScaleType:I = 0x7f040299
 
-.field public static final popupMenuStyle:I = 0x7f040299
+.field public static final popupMenuStyle:I = 0x7f04029a
 
-.field public static final popupTheme:I = 0x7f04029a
+.field public static final popupTheme:I = 0x7f04029b
 
-.field public static final popupWindowStyle:I = 0x7f04029b
+.field public static final popupWindowStyle:I = 0x7f04029c
 
-.field public static final preserveIconSpacing:I = 0x7f04029c
+.field public static final preserveIconSpacing:I = 0x7f04029d
 
-.field public static final pressedStateOverlayImage:I = 0x7f04029d
+.field public static final pressedStateOverlayImage:I = 0x7f04029e
 
-.field public static final pressedTranslationZ:I = 0x7f04029e
+.field public static final pressedTranslationZ:I = 0x7f04029f
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402c5
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402c6
 
-.field public static final progressBarImage:I = 0x7f0402c6
+.field public static final progressBarImage:I = 0x7f0402c7
 
-.field public static final progressBarImageScaleType:I = 0x7f0402c7
+.field public static final progressBarImageScaleType:I = 0x7f0402c8
 
-.field public static final progressBarPadding:I = 0x7f0402c8
+.field public static final progressBarPadding:I = 0x7f0402c9
 
-.field public static final progressBarStyle:I = 0x7f0402c9
+.field public static final progressBarStyle:I = 0x7f0402ca
 
-.field public static final queryBackground:I = 0x7f0402cc
+.field public static final queryBackground:I = 0x7f0402cd
 
-.field public static final queryHint:I = 0x7f0402cd
+.field public static final queryHint:I = 0x7f0402ce
 
-.field public static final radioButtonStyle:I = 0x7f0402ce
+.field public static final radioButtonStyle:I = 0x7f0402cf
 
-.field public static final ratingBarStyle:I = 0x7f0402d1
+.field public static final ratingBarStyle:I = 0x7f0402d2
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d3
+.field public static final ratingBarStyleSmall:I = 0x7f0402d4
 
-.field public static final retryImage:I = 0x7f0402d4
+.field public static final retryImage:I = 0x7f0402d5
 
-.field public static final retryImageScaleType:I = 0x7f0402d5
+.field public static final retryImageScaleType:I = 0x7f0402d6
 
-.field public static final reverseLayout:I = 0x7f0402d6
+.field public static final reverseLayout:I = 0x7f0402d7
 
-.field public static final rippleColor:I = 0x7f0402d7
+.field public static final rippleColor:I = 0x7f0402d8
 
-.field public static final roundAsCircle:I = 0x7f0402d8
+.field public static final roundAsCircle:I = 0x7f0402d9
 
-.field public static final roundBottomEnd:I = 0x7f0402d9
+.field public static final roundBottomEnd:I = 0x7f0402da
 
-.field public static final roundBottomLeft:I = 0x7f0402da
+.field public static final roundBottomLeft:I = 0x7f0402db
 
-.field public static final roundBottomRight:I = 0x7f0402db
+.field public static final roundBottomRight:I = 0x7f0402dc
 
-.field public static final roundBottomStart:I = 0x7f0402dc
+.field public static final roundBottomStart:I = 0x7f0402dd
 
-.field public static final roundTopEnd:I = 0x7f0402dd
+.field public static final roundTopEnd:I = 0x7f0402de
 
-.field public static final roundTopLeft:I = 0x7f0402de
+.field public static final roundTopLeft:I = 0x7f0402df
 
-.field public static final roundTopRight:I = 0x7f0402df
+.field public static final roundTopRight:I = 0x7f0402e0
 
-.field public static final roundTopStart:I = 0x7f0402e0
+.field public static final roundTopStart:I = 0x7f0402e1
 
-.field public static final roundWithOverlayColor:I = 0x7f0402e1
+.field public static final roundWithOverlayColor:I = 0x7f0402e2
 
-.field public static final roundedCornerRadius:I = 0x7f0402e2
+.field public static final roundedCornerRadius:I = 0x7f0402e3
 
-.field public static final roundingBorderColor:I = 0x7f0402e3
+.field public static final roundingBorderColor:I = 0x7f0402e4
 
-.field public static final roundingBorderPadding:I = 0x7f0402e4
+.field public static final roundingBorderPadding:I = 0x7f0402e5
 
-.field public static final roundingBorderWidth:I = 0x7f0402e5
+.field public static final roundingBorderWidth:I = 0x7f0402e6
 
-.field public static final scopeUris:I = 0x7f0402f4
+.field public static final scopeUris:I = 0x7f0402f5
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f5
+.field public static final scrimAnimationDuration:I = 0x7f0402f6
 
-.field public static final scrimBackground:I = 0x7f0402f6
+.field public static final scrimBackground:I = 0x7f0402f7
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
 
-.field public static final searchHintIcon:I = 0x7f0402f8
+.field public static final searchHintIcon:I = 0x7f0402f9
 
-.field public static final searchIcon:I = 0x7f0402f9
+.field public static final searchIcon:I = 0x7f0402fa
 
-.field public static final searchViewStyle:I = 0x7f0402fa
+.field public static final searchViewStyle:I = 0x7f0402fb
 
-.field public static final seekBarStyle:I = 0x7f0402fc
+.field public static final seekBarStyle:I = 0x7f0402fd
 
-.field public static final selectableItemBackground:I = 0x7f0402fd
+.field public static final selectableItemBackground:I = 0x7f0402fe
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
 
-.field public static final showAsAction:I = 0x7f040300
+.field public static final showAsAction:I = 0x7f040301
 
-.field public static final showDivider:I = 0x7f040301
+.field public static final showDivider:I = 0x7f040302
 
-.field public static final showDividerHorizontal:I = 0x7f040302
+.field public static final showDividerHorizontal:I = 0x7f040303
 
-.field public static final showDividerVertical:I = 0x7f040303
+.field public static final showDividerVertical:I = 0x7f040304
 
-.field public static final showDividers:I = 0x7f040304
+.field public static final showDividers:I = 0x7f040305
 
-.field public static final showMotionSpec:I = 0x7f040305
+.field public static final showMotionSpec:I = 0x7f040306
 
-.field public static final showText:I = 0x7f040306
+.field public static final showText:I = 0x7f040307
 
-.field public static final showTitle:I = 0x7f040307
+.field public static final showTitle:I = 0x7f040308
 
-.field public static final singleChoiceItemLayout:I = 0x7f040308
+.field public static final singleChoiceItemLayout:I = 0x7f040309
 
-.field public static final singleLine:I = 0x7f040309
+.field public static final singleLine:I = 0x7f04030a
 
-.field public static final singleSelection:I = 0x7f04030a
+.field public static final singleSelection:I = 0x7f04030b
 
-.field public static final snackbarButtonStyle:I = 0x7f04030b
+.field public static final snackbarButtonStyle:I = 0x7f04030c
 
-.field public static final snackbarStyle:I = 0x7f04030c
+.field public static final snackbarStyle:I = 0x7f04030d
 
-.field public static final spanCount:I = 0x7f04030d
+.field public static final spanCount:I = 0x7f04030e
 
-.field public static final spinBars:I = 0x7f04030e
+.field public static final spinBars:I = 0x7f04030f
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
+.field public static final spinnerDropDownItemStyle:I = 0x7f040310
 
-.field public static final spinnerStyle:I = 0x7f040310
+.field public static final spinnerStyle:I = 0x7f040311
 
-.field public static final splitTrack:I = 0x7f040311
+.field public static final splitTrack:I = 0x7f040312
 
-.field public static final srcCompat:I = 0x7f040312
+.field public static final srcCompat:I = 0x7f040313
 
-.field public static final stackFromEnd:I = 0x7f040313
+.field public static final stackFromEnd:I = 0x7f040314
 
-.field public static final state_above_anchor:I = 0x7f040314
+.field public static final state_above_anchor:I = 0x7f040315
 
-.field public static final state_collapsed:I = 0x7f040315
+.field public static final state_collapsed:I = 0x7f040316
 
-.field public static final state_collapsible:I = 0x7f040316
+.field public static final state_collapsible:I = 0x7f040317
 
-.field public static final state_liftable:I = 0x7f040317
+.field public static final state_liftable:I = 0x7f040318
 
-.field public static final state_lifted:I = 0x7f040318
+.field public static final state_lifted:I = 0x7f040319
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final statusBarScrim:I = 0x7f04031a
+.field public static final statusBarScrim:I = 0x7f04031b
 
-.field public static final strokeColor:I = 0x7f04031e
+.field public static final strokeColor:I = 0x7f04031f
 
-.field public static final strokeWidth:I = 0x7f04031f
+.field public static final strokeWidth:I = 0x7f040320
 
-.field public static final subMenuArrow:I = 0x7f040320
+.field public static final subMenuArrow:I = 0x7f040321
 
-.field public static final submitBackground:I = 0x7f040321
+.field public static final submitBackground:I = 0x7f040322
 
-.field public static final subtitle:I = 0x7f040322
+.field public static final subtitle:I = 0x7f040323
 
-.field public static final subtitleTextAppearance:I = 0x7f040323
+.field public static final subtitleTextAppearance:I = 0x7f040324
 
-.field public static final subtitleTextColor:I = 0x7f040324
+.field public static final subtitleTextColor:I = 0x7f040325
 
-.field public static final subtitleTextStyle:I = 0x7f040325
+.field public static final subtitleTextStyle:I = 0x7f040326
 
-.field public static final suggestionRowLayout:I = 0x7f040326
+.field public static final suggestionRowLayout:I = 0x7f040327
 
-.field public static final switchMinWidth:I = 0x7f040327
+.field public static final switchMinWidth:I = 0x7f040328
 
-.field public static final switchPadding:I = 0x7f040328
+.field public static final switchPadding:I = 0x7f040329
 
-.field public static final switchStyle:I = 0x7f040329
+.field public static final switchStyle:I = 0x7f04032a
 
-.field public static final switchTextAppearance:I = 0x7f04032a
+.field public static final switchTextAppearance:I = 0x7f04032b
 
-.field public static final tabBackground:I = 0x7f04032b
+.field public static final tabBackground:I = 0x7f04032c
 
-.field public static final tabContentStart:I = 0x7f04032c
+.field public static final tabContentStart:I = 0x7f04032d
 
-.field public static final tabGravity:I = 0x7f04032d
+.field public static final tabGravity:I = 0x7f04032e
 
-.field public static final tabIconTint:I = 0x7f04032e
+.field public static final tabIconTint:I = 0x7f04032f
 
-.field public static final tabIconTintMode:I = 0x7f04032f
+.field public static final tabIconTintMode:I = 0x7f040330
 
-.field public static final tabIndicator:I = 0x7f040330
+.field public static final tabIndicator:I = 0x7f040331
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
 
-.field public static final tabIndicatorColor:I = 0x7f040332
+.field public static final tabIndicatorColor:I = 0x7f040333
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040333
+.field public static final tabIndicatorFullWidth:I = 0x7f040334
 
-.field public static final tabIndicatorGravity:I = 0x7f040334
+.field public static final tabIndicatorGravity:I = 0x7f040335
 
-.field public static final tabIndicatorHeight:I = 0x7f040335
+.field public static final tabIndicatorHeight:I = 0x7f040336
 
-.field public static final tabInlineLabel:I = 0x7f040336
+.field public static final tabInlineLabel:I = 0x7f040337
 
-.field public static final tabMaxWidth:I = 0x7f040337
+.field public static final tabMaxWidth:I = 0x7f040338
 
-.field public static final tabMinWidth:I = 0x7f040338
+.field public static final tabMinWidth:I = 0x7f040339
 
-.field public static final tabMode:I = 0x7f040339
+.field public static final tabMode:I = 0x7f04033a
 
-.field public static final tabPadding:I = 0x7f04033a
+.field public static final tabPadding:I = 0x7f04033b
 
-.field public static final tabPaddingBottom:I = 0x7f04033b
+.field public static final tabPaddingBottom:I = 0x7f04033c
 
-.field public static final tabPaddingEnd:I = 0x7f04033c
+.field public static final tabPaddingEnd:I = 0x7f04033d
 
-.field public static final tabPaddingStart:I = 0x7f04033d
+.field public static final tabPaddingStart:I = 0x7f04033e
 
-.field public static final tabPaddingTop:I = 0x7f04033e
+.field public static final tabPaddingTop:I = 0x7f04033f
 
-.field public static final tabRippleColor:I = 0x7f04033f
+.field public static final tabRippleColor:I = 0x7f040340
 
-.field public static final tabSelectedTextColor:I = 0x7f040340
+.field public static final tabSelectedTextColor:I = 0x7f040341
 
-.field public static final tabStyle:I = 0x7f040341
+.field public static final tabStyle:I = 0x7f040342
 
-.field public static final tabTextAppearance:I = 0x7f040342
+.field public static final tabTextAppearance:I = 0x7f040343
 
-.field public static final tabTextColor:I = 0x7f040343
+.field public static final tabTextColor:I = 0x7f040344
 
-.field public static final tabUnboundedRipple:I = 0x7f040344
+.field public static final tabUnboundedRipple:I = 0x7f040345
 
-.field public static final textAllCaps:I = 0x7f040348
+.field public static final textAllCaps:I = 0x7f040349
 
-.field public static final textAppearanceBody1:I = 0x7f040349
+.field public static final textAppearanceBody1:I = 0x7f04034a
 
-.field public static final textAppearanceBody2:I = 0x7f04034a
+.field public static final textAppearanceBody2:I = 0x7f04034b
 
-.field public static final textAppearanceButton:I = 0x7f04034b
+.field public static final textAppearanceButton:I = 0x7f04034c
 
-.field public static final textAppearanceCaption:I = 0x7f04034c
+.field public static final textAppearanceCaption:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034d
+.field public static final textAppearanceHeadline1:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034e
+.field public static final textAppearanceHeadline2:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline3:I = 0x7f04034f
+.field public static final textAppearanceHeadline3:I = 0x7f040350
 
-.field public static final textAppearanceHeadline4:I = 0x7f040350
+.field public static final textAppearanceHeadline4:I = 0x7f040351
 
-.field public static final textAppearanceHeadline5:I = 0x7f040351
+.field public static final textAppearanceHeadline5:I = 0x7f040352
 
-.field public static final textAppearanceHeadline6:I = 0x7f040352
+.field public static final textAppearanceHeadline6:I = 0x7f040353
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
 
-.field public static final textAppearanceListItem:I = 0x7f040354
+.field public static final textAppearanceListItem:I = 0x7f040355
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040355
+.field public static final textAppearanceListItemSecondary:I = 0x7f040356
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040356
+.field public static final textAppearanceListItemSmall:I = 0x7f040357
 
-.field public static final textAppearanceOverline:I = 0x7f040357
+.field public static final textAppearanceOverline:I = 0x7f040358
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035c
+.field public static final textAppearanceSubtitle1:I = 0x7f04035d
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035d
+.field public static final textAppearanceSubtitle2:I = 0x7f04035e
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035e
+.field public static final textColorAlertDialogListItem:I = 0x7f04035f
 
-.field public static final textColorSearchUrl:I = 0x7f04035f
+.field public static final textColorSearchUrl:I = 0x7f040360
 
-.field public static final textEndPadding:I = 0x7f040360
+.field public static final textEndPadding:I = 0x7f040361
 
-.field public static final textInputStyle:I = 0x7f040361
+.field public static final textInputStyle:I = 0x7f040362
 
-.field public static final textStartPadding:I = 0x7f040362
+.field public static final textStartPadding:I = 0x7f040363
 
-.field public static final theme:I = 0x7f040364
+.field public static final theme:I = 0x7f040365
 
-.field public static final thickness:I = 0x7f0403b5
+.field public static final thickness:I = 0x7f0403b6
 
-.field public static final thumbTextPadding:I = 0x7f0403b6
+.field public static final thumbTextPadding:I = 0x7f0403b7
 
-.field public static final thumbTint:I = 0x7f0403b7
+.field public static final thumbTint:I = 0x7f0403b8
 
-.field public static final thumbTintMode:I = 0x7f0403b8
+.field public static final thumbTintMode:I = 0x7f0403b9
 
-.field public static final tickMark:I = 0x7f0403b9
+.field public static final tickMark:I = 0x7f0403ba
 
-.field public static final tickMarkTint:I = 0x7f0403ba
+.field public static final tickMarkTint:I = 0x7f0403bb
 
-.field public static final tickMarkTintMode:I = 0x7f0403bb
+.field public static final tickMarkTintMode:I = 0x7f0403bc
 
-.field public static final tint:I = 0x7f0403bc
+.field public static final tint:I = 0x7f0403bd
 
-.field public static final tintMode:I = 0x7f0403bd
+.field public static final tintMode:I = 0x7f0403be
 
-.field public static final title:I = 0x7f0403be
+.field public static final title:I = 0x7f0403bf
 
-.field public static final titleEnabled:I = 0x7f0403bf
+.field public static final titleEnabled:I = 0x7f0403c0
 
-.field public static final titleMargin:I = 0x7f0403c0
+.field public static final titleMargin:I = 0x7f0403c1
 
-.field public static final titleMarginBottom:I = 0x7f0403c1
+.field public static final titleMarginBottom:I = 0x7f0403c2
 
-.field public static final titleMarginEnd:I = 0x7f0403c2
+.field public static final titleMarginEnd:I = 0x7f0403c3
 
-.field public static final titleMarginStart:I = 0x7f0403c3
+.field public static final titleMarginStart:I = 0x7f0403c4
 
-.field public static final titleMarginTop:I = 0x7f0403c4
+.field public static final titleMarginTop:I = 0x7f0403c5
 
-.field public static final titleMargins:I = 0x7f0403c5
+.field public static final titleMargins:I = 0x7f0403c6
 
-.field public static final titleTextAppearance:I = 0x7f0403c6
+.field public static final titleTextAppearance:I = 0x7f0403c7
 
-.field public static final titleTextColor:I = 0x7f0403c7
+.field public static final titleTextColor:I = 0x7f0403c8
 
-.field public static final titleTextStyle:I = 0x7f0403c8
+.field public static final titleTextStyle:I = 0x7f0403c9
 
-.field public static final toolbarId:I = 0x7f0403c9
+.field public static final toolbarId:I = 0x7f0403ca
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403ca
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
-.field public static final toolbarStyle:I = 0x7f0403cb
+.field public static final toolbarStyle:I = 0x7f0403cc
 
-.field public static final tooltipForegroundColor:I = 0x7f0403cc
+.field public static final tooltipForegroundColor:I = 0x7f0403cd
 
-.field public static final tooltipFrameBackground:I = 0x7f0403cd
+.field public static final tooltipFrameBackground:I = 0x7f0403ce
 
-.field public static final tooltipText:I = 0x7f0403ce
+.field public static final tooltipText:I = 0x7f0403cf
 
-.field public static final track:I = 0x7f0403cf
+.field public static final track:I = 0x7f0403d0
 
-.field public static final trackTint:I = 0x7f0403d0
+.field public static final trackTint:I = 0x7f0403d1
 
-.field public static final trackTintMode:I = 0x7f0403d1
+.field public static final trackTintMode:I = 0x7f0403d2
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
-.field public static final useCompatPadding:I = 0x7f0403e6
+.field public static final useCompatPadding:I = 0x7f0403e7
 
-.field public static final viewAspectRatio:I = 0x7f0403ec
+.field public static final viewAspectRatio:I = 0x7f0403ed
 
-.field public static final viewInflaterClass:I = 0x7f0403ed
+.field public static final viewInflaterClass:I = 0x7f0403ee
 
-.field public static final voiceIcon:I = 0x7f0403ee
+.field public static final voiceIcon:I = 0x7f0403ef
 
-.field public static final windowActionBar:I = 0x7f0403f0
+.field public static final windowActionBar:I = 0x7f0403f1
 
-.field public static final windowActionBarOverlay:I = 0x7f0403f1
+.field public static final windowActionBarOverlay:I = 0x7f0403f2
 
-.field public static final windowActionModeOverlay:I = 0x7f0403f2
+.field public static final windowActionModeOverlay:I = 0x7f0403f3
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403f3
+.field public static final windowFixedHeightMajor:I = 0x7f0403f4
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403f4
+.field public static final windowFixedHeightMinor:I = 0x7f0403f5
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403f5
+.field public static final windowFixedWidthMajor:I = 0x7f0403f6
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403f6
+.field public static final windowFixedWidthMinor:I = 0x7f0403f7
 
-.field public static final windowMinWidthMajor:I = 0x7f0403f7
+.field public static final windowMinWidthMajor:I = 0x7f0403f8
 
-.field public static final windowMinWidthMinor:I = 0x7f0403f8
+.field public static final windowMinWidthMinor:I = 0x7f0403f9
 
-.field public static final windowNoTitle:I = 0x7f0403f9
+.field public static final windowNoTitle:I = 0x7f0403fa
 
 
 # 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 dd680f0557..7b4d63d95d 100644
--- a/com.discord/smali/com/discord/restapi/R$color.smali
+++ b/com.discord/smali/com/discord/restapi/R$color.smali
@@ -75,221 +75,221 @@
 
 .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 = 0x7f06004e
+.field public static final common_google_signin_btn_text_dark:I = 0x7f06004f
 
-.field public static final common_google_signin_btn_text_dark_default:I = 0x7f06004f
+.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 = 0x7f060050
+.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 = 0x7f060051
+.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 = 0x7f060052
+.field public static final common_google_signin_btn_text_dark_pressed:I = 0x7f060053
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f060053
+.field public static final common_google_signin_btn_text_light:I = 0x7f060054
 
-.field public static final common_google_signin_btn_text_light_default:I = 0x7f060054
+.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 = 0x7f060055
+.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 = 0x7f060056
+.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 = 0x7f060057
+.field public static final common_google_signin_btn_text_light_pressed:I = 0x7f060058
 
-.field public static final common_google_signin_btn_tint:I = 0x7f060058
+.field public static final common_google_signin_btn_tint:I = 0x7f060059
 
-.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005b
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005c
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005d
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005e
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005f
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060060
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060061
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060066
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060067
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006c
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006d
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a7
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600aa
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ac
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
 
 # 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 caeb09f8ce..6d868f1435 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 = 0x7f0800a1
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
+.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 = 0x7f0800a4
+.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 = 0x7f0800a5
+.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 = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
+.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 = 0x7f0800a9
+.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 = 0x7f0800aa
+.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 = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
+.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 = 0x7f0800ad
+.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 = 0x7f0800ae
+.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 = 0x7f0800af
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
+.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 = 0x7f0800b2
+.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 = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b5
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b6
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b7
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b8
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b9
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final drawable_chip_background:I = 0x7f080101
+.field public static final drawable_chip_background:I = 0x7f080105
 
-.field public static final drawable_chip_circle:I = 0x7f080102
+.field public static final drawable_chip_circle:I = 0x7f080106
 
-.field public static final drawable_chip_delete:I = 0x7f080103
+.field public static final drawable_chip_delete:I = 0x7f080107
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801b0
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801b1
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
 
-.field public static final mtrl_snackbar_background:I = 0x7f080461
+.field public static final mtrl_snackbar_background:I = 0x7f08046f
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080462
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
 
-.field public static final navigation_empty_icon:I = 0x7f080463
+.field public static final navigation_empty_icon:I = 0x7f080471
 
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
 
 # 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 d5afd10242..ddf2f1dfeb 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -127,13 +127,13 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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
 
@@ -157,303 +157,303 @@
 
 .field public static final column_reverse:I = 0x7f0a0221
 
-.field public static final container:I = 0x7f0a0230
+.field public static final container:I = 0x7f0a0233
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a023a
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final dark:I = 0x7f0a0251
+.field public static final dark:I = 0x7f0a0254
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final design_bottom_sheet:I = 0x7f0a0256
+.field public static final design_bottom_sheet:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area:I = 0x7f0a0257
+.field public static final design_menu_item_action_area:I = 0x7f0a025a
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0258
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
 
-.field public static final design_menu_item_text:I = 0x7f0a0259
+.field public static final design_menu_item_text:I = 0x7f0a025c
 
-.field public static final design_navigation_view:I = 0x7f0a025a
+.field public static final design_navigation_view:I = 0x7f0a025d
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final fill:I = 0x7f0a02e0
+.field public static final fill:I = 0x7f0a02e4
 
-.field public static final filled:I = 0x7f0a02e3
+.field public static final filled:I = 0x7f0a02e7
 
-.field public static final fitBottomStart:I = 0x7f0a02e4
+.field public static final fitBottomStart:I = 0x7f0a02e8
 
-.field public static final fitCenter:I = 0x7f0a02e5
+.field public static final fitCenter:I = 0x7f0a02e9
 
-.field public static final fitEnd:I = 0x7f0a02e6
+.field public static final fitEnd:I = 0x7f0a02ea
 
-.field public static final fitStart:I = 0x7f0a02e7
+.field public static final fitStart:I = 0x7f0a02eb
 
-.field public static final fitXY:I = 0x7f0a02e8
+.field public static final fitXY:I = 0x7f0a02ec
 
-.field public static final fixed:I = 0x7f0a02e9
+.field public static final fixed:I = 0x7f0a02ed
 
-.field public static final flex_end:I = 0x7f0a02ea
+.field public static final flex_end:I = 0x7f0a02ee
 
-.field public static final flex_start:I = 0x7f0a02eb
+.field public static final flex_start:I = 0x7f0a02ef
 
-.field public static final focusCrop:I = 0x7f0a02ec
+.field public static final focusCrop:I = 0x7f0a02f0
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final ghost_view:I = 0x7f0a0312
+.field public static final ghost_view:I = 0x7f0a0316
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final icon_only:I = 0x7f0a0390
+.field public static final icon_only:I = 0x7f0a0398
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0405
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
 
-.field public static final labeled:I = 0x7f0a040c
+.field public static final labeled:I = 0x7f0a0414
 
-.field public static final largeLabel:I = 0x7f0a040d
+.field public static final largeLabel:I = 0x7f0a0415
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final light:I = 0x7f0a0414
+.field public static final light:I = 0x7f0a041c
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final masked:I = 0x7f0a0437
+.field public static final masked:I = 0x7f0a043f
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final mini:I = 0x7f0a0480
+.field public static final mini:I = 0x7f0a048a
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0481
+.field public static final mtrl_child_content_container:I = 0x7f0a048b
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0482
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final navigation_header_container:I = 0x7f0a0485
+.field public static final navigation_header_container:I = 0x7f0a048f
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final nowrap:I = 0x7f0a04a6
+.field public static final nowrap:I = 0x7f0a04b0
 
-.field public static final outline:I = 0x7f0a04c7
+.field public static final outline:I = 0x7f0a04d1
 
-.field public static final parallax:I = 0x7f0a04d6
+.field public static final parallax:I = 0x7f0a04e0
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final parent_matrix:I = 0x7f0a04d9
+.field public static final parent_matrix:I = 0x7f0a04e3
 
-.field public static final pin:I = 0x7f0a0515
+.field public static final pin:I = 0x7f0a0520
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final row:I = 0x7f0a05a1
+.field public static final row:I = 0x7f0a05b6
 
-.field public static final row_reverse:I = 0x7f0a05a2
+.field public static final row_reverse:I = 0x7f0a05b7
 
-.field public static final save_image_matrix:I = 0x7f0a05a3
+.field public static final save_image_matrix:I = 0x7f0a05b8
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05a4
+.field public static final save_non_transition_alpha:I = 0x7f0a05b9
 
-.field public static final save_scale_type:I = 0x7f0a05a5
+.field public static final save_scale_type:I = 0x7f0a05ba
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final scrollable:I = 0x7f0a05ad
+.field public static final scrollable:I = 0x7f0a05c2
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final selected:I = 0x7f0a05cb
+.field public static final selected:I = 0x7f0a05e0
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final smallLabel:I = 0x7f0a0708
+.field public static final smallLabel:I = 0x7f0a071d
 
-.field public static final snackbar_action:I = 0x7f0a0709
+.field public static final snackbar_action:I = 0x7f0a071e
 
-.field public static final snackbar_text:I = 0x7f0a070a
+.field public static final snackbar_text:I = 0x7f0a071f
 
-.field public static final space_around:I = 0x7f0a070e
+.field public static final space_around:I = 0x7f0a0723
 
-.field public static final space_between:I = 0x7f0a070f
+.field public static final space_between:I = 0x7f0a0724
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final standard:I = 0x7f0a0718
+.field public static final standard:I = 0x7f0a0733
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final stretch:I = 0x7f0a0730
+.field public static final stretch:I = 0x7f0a0754
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_input_password_toggle:I = 0x7f0a0751
+.field public static final text_input_password_toggle:I = 0x7f0a0775
 
-.field public static final textinput_counter:I = 0x7f0a0754
+.field public static final textinput_counter:I = 0x7f0a0778
 
-.field public static final textinput_error:I = 0x7f0a0755
+.field public static final textinput_error:I = 0x7f0a0779
 
-.field public static final textinput_helper_text:I = 0x7f0a0756
+.field public static final textinput_helper_text:I = 0x7f0a077a
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final touch_outside:I = 0x7f0a0764
+.field public static final touch_outside:I = 0x7f0a0788
 
-.field public static final transition_current_scene:I = 0x7f0a0765
+.field public static final transition_current_scene:I = 0x7f0a0789
 
-.field public static final transition_layout_save:I = 0x7f0a0766
+.field public static final transition_layout_save:I = 0x7f0a078a
 
-.field public static final transition_position:I = 0x7f0a0767
+.field public static final transition_position:I = 0x7f0a078b
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0768
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
 
-.field public static final transition_transform:I = 0x7f0a0769
+.field public static final transition_transform:I = 0x7f0a078d
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final unlabeled:I = 0x7f0a0776
+.field public static final unlabeled:I = 0x7f0a079a
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_offset_helper:I = 0x7f0a07ff
+.field public static final view_offset_helper:I = 0x7f0a082e
 
-.field public static final visible:I = 0x7f0a0802
+.field public static final visible:I = 0x7f0a0831
 
-.field public static final wide:I = 0x7f0a082e
+.field public static final wide:I = 0x7f0a085e
 
-.field public static final wrap:I = 0x7f0a0850
+.field public static final wrap:I = 0x7f0a0880
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
-.field public static final wrap_reverse:I = 0x7f0a0852
+.field public static final wrap_reverse:I = 0x7f0a0882
 
 
 # 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 0e68acbc58..a87f78e376 100644
--- a/com.discord/smali/com/discord/restapi/R$layout.smali
+++ b/com.discord/smali/com/discord/restapi/R$layout.smali
@@ -71,61 +71,61 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final design_bottom_navigation_item:I = 0x7f0d0023
+.field public static final design_bottom_navigation_item:I = 0x7f0d0024
 
-.field public static final design_bottom_sheet_dialog:I = 0x7f0d0024
+.field public static final design_bottom_sheet_dialog:I = 0x7f0d0025
 
-.field public static final design_layout_snackbar:I = 0x7f0d0025
+.field public static final design_layout_snackbar:I = 0x7f0d0026
 
-.field public static final design_layout_snackbar_include:I = 0x7f0d0026
+.field public static final design_layout_snackbar_include:I = 0x7f0d0027
 
-.field public static final design_layout_tab_icon:I = 0x7f0d0027
+.field public static final design_layout_tab_icon:I = 0x7f0d0028
 
-.field public static final design_layout_tab_text:I = 0x7f0d0028
+.field public static final design_layout_tab_text:I = 0x7f0d0029
 
-.field public static final design_menu_item_action_area:I = 0x7f0d0029
+.field public static final design_menu_item_action_area:I = 0x7f0d002a
 
-.field public static final design_navigation_item:I = 0x7f0d002a
+.field public static final design_navigation_item:I = 0x7f0d002b
 
-.field public static final design_navigation_item_header:I = 0x7f0d002b
+.field public static final design_navigation_item_header:I = 0x7f0d002c
 
-.field public static final design_navigation_item_separator:I = 0x7f0d002c
+.field public static final design_navigation_item_separator:I = 0x7f0d002d
 
-.field public static final design_navigation_item_subheader:I = 0x7f0d002d
+.field public static final design_navigation_item_subheader:I = 0x7f0d002e
 
-.field public static final design_navigation_menu:I = 0x7f0d002e
+.field public static final design_navigation_menu:I = 0x7f0d002f
 
-.field public static final design_navigation_menu_item:I = 0x7f0d002f
+.field public static final design_navigation_menu_item:I = 0x7f0d0030
 
-.field public static final design_text_input_password_icon:I = 0x7f0d0030
+.field public static final design_text_input_password_icon:I = 0x7f0d0031
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0043
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0044
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final view_chip_default:I = 0x7f0d007e
+.field public static final view_chip_default:I = 0x7f0d0083
 
 
 # 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 269675a167..0da64cd581 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -95,69 +95,69 @@
 
 .field public static final appbar_scrolling_view_behavior:I = 0x7f1200ed
 
-.field public static final bottom_sheet_behavior:I = 0x7f120340
+.field public static final bottom_sheet_behavior:I = 0x7f120365
 
-.field public static final character_counter_content_description:I = 0x7f1203cb
+.field public static final character_counter_content_description:I = 0x7f1203f0
 
-.field public static final character_counter_pattern:I = 0x7f1203cc
+.field public static final character_counter_pattern:I = 0x7f1203f1
 
-.field public static final common_google_play_services_enable_button:I = 0x7f12040b
+.field public static final common_google_play_services_enable_button:I = 0x7f120430
 
-.field public static final common_google_play_services_enable_text:I = 0x7f12040c
+.field public static final common_google_play_services_enable_text:I = 0x7f120431
 
-.field public static final common_google_play_services_enable_title:I = 0x7f12040d
+.field public static final common_google_play_services_enable_title:I = 0x7f120432
 
-.field public static final common_google_play_services_install_button:I = 0x7f12040e
+.field public static final common_google_play_services_install_button:I = 0x7f120433
 
-.field public static final common_google_play_services_install_text:I = 0x7f12040f
+.field public static final common_google_play_services_install_text:I = 0x7f120434
 
-.field public static final common_google_play_services_install_title:I = 0x7f120410
+.field public static final common_google_play_services_install_title:I = 0x7f120435
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120411
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120436
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120412
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120437
 
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120413
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120438
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120414
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120439
 
-.field public static final common_google_play_services_update_button:I = 0x7f120415
+.field public static final common_google_play_services_update_button:I = 0x7f12043a
 
-.field public static final common_google_play_services_update_text:I = 0x7f120416
+.field public static final common_google_play_services_update_text:I = 0x7f12043b
 
-.field public static final common_google_play_services_update_title:I = 0x7f120417
+.field public static final common_google_play_services_update_title:I = 0x7f12043c
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120418
+.field public static final common_google_play_services_updating_text:I = 0x7f12043d
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120419
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12043e
 
-.field public static final common_open_on_phone:I = 0x7f12041a
+.field public static final common_open_on_phone:I = 0x7f12043f
 
-.field public static final common_signin_button_text:I = 0x7f12041b
+.field public static final common_signin_button_text:I = 0x7f120440
 
-.field public static final common_signin_button_text_long:I = 0x7f12041c
+.field public static final common_signin_button_text_long:I = 0x7f120441
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120933
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd8
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
 
-.field public static final password_toggle_content_description:I = 0x7f120d44
+.field public static final password_toggle_content_description:I = 0x7f120d77
 
-.field public static final path_password_eye:I = 0x7f120d47
+.field public static final path_password_eye:I = 0x7f120d7a
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d48
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d49
+.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
 
-.field public static final path_password_strike_through:I = 0x7f120d4a
+.field public static final path_password_strike_through:I = 0x7f120d7d
 
-.field public static final search_menu_title:I = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 3ed5c4c787..8dd4c43197 100644
--- a/com.discord/smali/com/discord/restapi/R$styleable.smali
+++ b/com.discord/smali/com/discord/restapi/R$styleable.smali
@@ -2134,7 +2134,7 @@
 
     new-array v6, v1, [I
 
-    const v9, 0x7f04027c
+    const v9, 0x7f04027d
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -2364,15 +2364,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -2381,8 +2381,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -2396,11 +2396,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -2434,15 +2434,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040258
+        0x7f040259
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
+        0x7f040319
     .end array-data
 
     :array_9
@@ -2454,17 +2454,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_c
@@ -2489,8 +2489,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_e
@@ -2566,47 +2566,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -2616,6 +2615,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_f
@@ -2639,7 +2639,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_11
@@ -2699,10 +2699,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d7
-        0x7f040305
-        0x7f040360
-        0x7f040362
+        0x7f0402d8
+        0x7f040306
+        0x7f040361
+        0x7f040363
     .end array-data
 
     :array_14
@@ -2711,8 +2711,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
-        0x7f040309
         0x7f04030a
+        0x7f04030b
     .end array-data
 
     :array_15
@@ -2752,12 +2752,12 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f5
-        0x7f0402f7
-        0x7f04031a
-        0x7f0403be
+        0x7f0402f6
+        0x7f0402f8
+        0x7f04031b
         0x7f0403bf
-        0x7f0403c9
+        0x7f0403c0
+        0x7f0403ca
     .end array-data
 
     :array_17
@@ -2783,7 +2783,7 @@
     :array_1a
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_1b
@@ -2811,8 +2811,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_1e
@@ -2825,9 +2825,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
-        0x7f040301
         0x7f040302
         0x7f040303
+        0x7f040304
     .end array-data
 
     :array_1f
@@ -2854,11 +2854,11 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027b
-        0x7f04029e
-        0x7f0402d7
-        0x7f040305
-        0x7f0403e6
+        0x7f04027c
+        0x7f04029f
+        0x7f0402d8
+        0x7f040306
+        0x7f0403e7
     .end array-data
 
     :array_21
@@ -2866,7 +2866,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025a
+        0x7f04025b
     .end array-data
 
     :array_22
@@ -2890,7 +2890,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_24
@@ -2907,16 +2907,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -2930,7 +2929,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_26
@@ -2964,8 +2964,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_29
@@ -3004,15 +3004,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d7
-        0x7f04031e
+        0x7f0402d8
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04031e
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2e
@@ -3029,13 +3029,12 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
-        0x7f040277
         0x7f040278
-        0x7f040283
-        0x7f0402f6
-        0x7f04030b
-        0x7f040341
-        0x7f040349
+        0x7f040279
+        0x7f040284
+        0x7f0402f7
+        0x7f04030c
+        0x7f040342
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3045,10 +3044,11 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040357
-        0x7f04035c
+        0x7f040353
+        0x7f040358
         0x7f04035d
-        0x7f040361
+        0x7f04035e
+        0x7f040362
     .end array-data
 
     :array_2f
@@ -3083,9 +3083,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_31
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_32
@@ -3114,20 +3114,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_35
@@ -3140,9 +3140,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .end array-data
 
     :array_36
@@ -3157,20 +3157,20 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_37
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f4
+        0x7f0402f5
     .end array-data
 
     :array_38
@@ -3182,16 +3182,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3205,20 +3204,21 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f04030b
         0x7f04030c
+        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f040279
+        0x7f04027a
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_3c
@@ -3245,17 +3245,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_3e
@@ -3267,7 +3267,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3289,9 +3288,10 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040342
+        0x7f040341
         0x7f040343
         0x7f040344
+        0x7f040345
     .end array-data
 
     :array_40
@@ -3308,7 +3308,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_41
@@ -3336,11 +3336,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
-        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
+        0x7f040297
     .end array-data
 
     :array_42
@@ -3363,17 +3363,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3381,15 +3380,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 90446e53b4..a2e0903f86 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;->Fu()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {v4}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object v4
 
@@ -101,7 +101,7 @@
     invoke-virtual {v3, v0, v2}, Lokhttp3/w$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_2
-    invoke-virtual {v3}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v3}, Lokhttp3/w$a;->FN()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 b4df3a5044..40528cf5e6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3323d94ecb..c802c069a1 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;->aSJ:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSS:Lcom/google/gson/d;
 
-    iput-object v1, v0, Lcom/google/gson/f;->aTa:Lcom/google/gson/e;
+    iput-object v1, v0, Lcom/google/gson/f;->aTj: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;->aSP:Ljava/util/List;
+    iget-object v2, v0, Lcom/google/gson/f;->aSY: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;->aSP:Ljava/util/List;
+    iget-object v4, v0, Lcom/google/gson/f;->aSY: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;->Aw()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Az()Lcom/google/gson/Gson;
 
     move-result-object p4
 
@@ -276,7 +276,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/a/a/i;->IC()Lb/a/a/i;
+    invoke-static {}, Lb/a/a/i;->IF()Lb/a/a/i;
 
     move-result-object p5
 
@@ -286,7 +286,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lb/b/b/c;->ID()Lb/b/b/c;
+    invoke-static {}, Lb/b/b/c;->IG()Lb/b/b/c;
 
     move-result-object p5
 
@@ -310,7 +310,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lb/n$a;->Iz()Lb/n;
+    invoke-virtual {p1}, Lb/n$a;->IC()Lb/n;
 
     move-result-object p1
 
@@ -432,7 +432,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->FA()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->FD()Lokhttp3/t;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali
index 4b4a02727f..ebbabe4b02 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;
-            IE = true
+            IH = true
             value = "reaction"
         .end annotation
     .end param
@@ -1789,7 +1789,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "emoji"
         .end annotation
     .end param
@@ -1902,6 +1902,22 @@
     .end annotation
 .end method
 
+.method public abstract getSubscriptionSlots()Lrx/Observable;
+    .annotation runtime Lb/c/f;
+        value = "users/@me/guilds/premium/subscription-slots"
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            ">;>;"
+        }
+    .end annotation
+.end method
+
 .method public abstract getSubscriptions()Lrx/Observable;
     .annotation runtime Lb/c/f;
         value = "users/@me/billing/subscriptions"
@@ -1918,37 +1934,6 @@
     .end annotation
 .end method
 
-.method public abstract getUserPremiumGuildSubscriptions()Lrx/Observable;
-    .annotation runtime Lb/c/f;
-        value = "users/@me/guilds/premium/subscriptions"
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;>;"
-        }
-    .end annotation
-.end method
-
-.method public abstract getUserPremiumGuildSubscriptionsCooldown()Lrx/Observable;
-    .annotation runtime Lb/c/f;
-        value = "users/@me/guilds/premium/subscriptions/cooldown"
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ">;"
-        }
-    .end annotation
-.end method
-
 .method public abstract getVanityUrl(J)Lrx/Observable;
     .param p1    # J
         .annotation runtime Lb/c/s;
@@ -2536,7 +2521,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "reaction"
         .end annotation
     .end param
@@ -2601,7 +2586,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "reaction"
         .end annotation
     .end param
@@ -3188,19 +3173,25 @@
     .end annotation
 .end method
 
-.method public abstract subscribeToGuild(J)Lrx/Observable;
+.method public abstract subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
     .param p1    # J
         .annotation runtime Lb/c/s;
             value = "guildId"
         .end annotation
     .end param
+    .param p3    # Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
+        .annotation runtime Lb/c/a;
+        .end annotation
+    .end param
     .annotation runtime Lb/c/p;
         value = "guilds/{guildId}/premium/subscriptions"
     .end annotation
 
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(J)",
+            "(J",
+            "Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;",
+            ")",
             "Lrx/Observable<",
             "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
             ">;"
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali
new file mode 100644
index 0000000000..d2e57a946a
--- /dev/null
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$PremiumGuildSubscribe.smali
@@ -0,0 +1,40 @@
+.class public final Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
+.super Ljava/lang/Object;
+.source "RestAPIParams.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/restapi/RestAPIParams;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "PremiumGuildSubscribe"
+.end annotation
+
+
+# instance fields
+.field private final userPremiumGuildSubscriptionSlotId:J
+
+
+# direct methods
+.method public constructor <init>(J)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-wide p1, p0, Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;->userPremiumGuildSubscriptionSlotId:J
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getUserPremiumGuildSubscriptionSlotId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;->userPremiumGuildSubscriptionSlotId:J
+
+    return-wide v0
+.end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
index 96e0546533..4124664a98 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$UserNoteUpdate.smali
@@ -28,3 +28,118 @@
 
     return-void
 .end method
+
+.method private final component1()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note:Ljava/lang/String;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->copy(Ljava/lang/String;)Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final copy(Ljava/lang/String;)Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+    .locals 1
+
+    new-instance v0, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+
+    invoke-direct {v0, p1}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)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/restapi/RestAPIParams$UserNoteUpdate;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+
+    iget-object v0, p0, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note:Ljava/lang/String;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note:Ljava/lang/String;
+
+    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, "UserNoteUpdate(note="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;->note: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/restapi/RestAPIParams.smali b/com.discord/smali/com/discord/restapi/RestAPIParams.smali
index 71c31481b9..9b8cd5057f 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams.smali
@@ -54,7 +54,8 @@
         Lcom/discord/restapi/RestAPIParams$DisableAccount;,
         Lcom/discord/restapi/RestAPIParams$ActivateMfaSMS;,
         Lcom/discord/restapi/RestAPIParams$OAuth2Authorize;,
-        Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;
+        Lcom/discord/restapi/RestAPIParams$GenerateGiftCode;,
+        Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
     }
 .end annotation
 
diff --git a/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali b/com.discord/smali/com/discord/restapi/SpotifyTokenInterceptor.smali
index db40b0f36f..5bff155b93 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fu()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -64,7 +64,7 @@
 
     invoke-virtual {v0, v2, v1}, Lokhttp3/w$a;->ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FN()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 e4f564dd3f..3bd2350640 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b9a6cb7a26..75303c713f 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
@@ -152,7 +152,7 @@
 
     iget-object v0, p0, Lcom/discord/restapi/utils/CountingRequestBody;->bytesWrittenSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -160,7 +160,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ak;->Jw()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
 
     move-result-object v1
 
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 fcb547fa85..e06f900cf9 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,29 +89,29 @@
 
     check-cast v0, Lb/h;
 
-    invoke-virtual {v0}, Lb/h;->CD()I
+    invoke-virtual {v0}, Lb/h;->CG()I
 
     move-result v2
 
-    invoke-virtual {v0}, Lb/h;->Iq()Lb/m;
+    invoke-virtual {v0}, Lb/h;->It()Lb/m;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lb/m;->Iy()Lokhttp3/Response;
+    invoke-virtual {v0}, Lb/m;->IB()Lokhttp3/Response;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/Response;->Fu()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/Response;->Fx()Lokhttp3/w;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FH()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/w;->FK()Ljava/lang/String;
 
     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 ffeda2bd94..fe62a7bfa2 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 3bdc7978b2..2c92be24e4 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 zd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum zg:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field public static final enum ze:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum zh:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field public static final enum zf:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field public static final enum zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
-.field private static final synthetic zg:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+.field private static final synthetic zj:[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;->zd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zg: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;->ze:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zh: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;->zf:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zi:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zg:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zj:[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;->zg:[Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zj:[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 8c1d1a2aa4..c5a6324257 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 zh:Lcom/discord/rtcconnection/RtcConnection$Quality;
-
-.field public static final enum zi:Lcom/discord/rtcconnection/RtcConnection$Quality;
-
-.field public static final enum zj:Lcom/discord/rtcconnection/RtcConnection$Quality;
-
 .field public static final enum zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field private static final synthetic zl:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+.field public static final enum zl:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
-.field public static final zm:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+.field public static final enum zm:Lcom/discord/rtcconnection/RtcConnection$Quality;
+
+.field public static final enum zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
+
+.field private static final synthetic zo:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+
+.field public static final zp: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;->zh:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zk: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;->zi:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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;->zj:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm: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;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo:[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;->zm:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zp: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;->zl:[Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zo:[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 e2357e0a47..ad6394c0c1 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 zn:Lcom/discord/rtcconnection/RtcConnection$State$a;
+.field public static final zq: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;->zn:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq: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 170c60c490..94121b91dd 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 zo:Lcom/discord/rtcconnection/RtcConnection$State$b;
+.field public static final zr: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;->zo:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr: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 57c86661b2..4fa08cb701 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 zp:Lcom/discord/rtcconnection/RtcConnection$State$c;
+.field public static final zs: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;->zp:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->zs: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 cf193e21aa..371f352057 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 zq:Z
+.field public final zt: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;->zq:Z
+    iput-boolean p1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt: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;->zq:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt:Z
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zq:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt: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;->zq:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt: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;->zq:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt: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 bfe43796f5..5db161f973 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 zr:Lcom/discord/rtcconnection/RtcConnection$State$e;
+.field public static final zu: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;->zr:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu: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 9b71c0b1a0..3f8db8d432 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 zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+.field public static final zv: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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv: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 130eb57da5..1c139b8a55 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 zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+.field public static final zw: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;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw: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 15456bb332..d3c4c5cd2a 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 zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+.field public static final zx: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;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx: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 ea45d22195..1ba8ae1012 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fea7278d80..a569f18d77 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/m;
 .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;
@@ -220,13 +220,13 @@
 
     invoke-virtual {v3}, Lcom/discord/rtcconnection/socket/a;->removeAllListeners()V
 
-    sget-object v5, Lcom/discord/rtcconnection/socket/a$d;->AR:Lcom/discord/rtcconnection/socket/a$d;
+    sget-object v5, Lcom/discord/rtcconnection/socket/a$d;->AS:Lcom/discord/rtcconnection/socket/a$d;
 
     check-cast v5, Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v3, v5}, Lcom/discord/rtcconnection/socket/a;->h(Lkotlin/jvm/functions/Function1;)V
 
-    iput-boolean v4, v3, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iput-boolean v4, v3, Lcom/discord/rtcconnection/socket/a;->AJ:Z
 
     :cond_4
     iget-object v3, v1, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
@@ -365,7 +365,7 @@
 
     iget-object v0, v1, Lcom/discord/rtcconnection/RtcConnection$d;->this$0:Lcom/discord/rtcconnection/RtcConnection;
 
-    sget-object v2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zo:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object v2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     check-cast v2, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -447,7 +447,7 @@
 
     move-result-object v3
 
-    invoke-interface {v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eA()Ljava/util/concurrent/ExecutorService;
+    invoke-interface {v3}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eC()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v15
 
@@ -471,12 +471,12 @@
 
     invoke-interface {v4, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/a;->eC()Z
+    invoke-virtual {v2}, Lcom/discord/rtcconnection/socket/a;->eE()Z
 
     invoke-static {v0, v2}, Lcom/discord/rtcconnection/RtcConnection;->a(Lcom/discord/rtcconnection/RtcConnection;Lcom/discord/rtcconnection/socket/a;)V
 
     :goto_4
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 07a829a2c9..533b6651cd 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/m;
 .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;->eu()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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 5e53befc29..cf81dede65 100644
--- a/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
+++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection$f.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final zv:Lcom/discord/rtcconnection/RtcConnection$f;
+.field public static final zy: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;->zv:Lcom/discord/rtcconnection/RtcConnection$f;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection$f;->zy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 69107a8f59..7ec2cf3921 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "supportedVideoCodecs"
+    const-string p1, "transportInfo"
 
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "exception"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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 02666158b1..fd1b6ea287 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fb5d8f3969..a70bbc9ba9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d25557764e..9a99d27e29 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 4fa87e0d2e..9c6e6cc10f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 89441a3e88..876f3ca6f3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ffbc0bd0e5..fa73d3c9d6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1ce24af575..7a021ab5b7 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;
@@ -114,7 +114,7 @@
     return-void
 .end method
 
-.method public final ew()V
+.method public final ey()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 ex()V
+.method public final ez()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 1003e98cca..2470c9f618 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 zb:I
+.field private static ze:I
 
-.field public static final zc:Lcom/discord/rtcconnection/RtcConnection$a;
+.field public static final zf: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 yO:Ljava/lang/String;
+.field private final yQ:Ljava/lang/String;
 
-.field private final yP:Lcom/discord/rtcconnection/d;
+.field private final yR:Lcom/discord/rtcconnection/d;
 
-.field private final yQ:Lcom/discord/utilities/networking/Backoff;
+.field private final yS:Lcom/discord/utilities/networking/Backoff;
 
-.field private yR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+.field private yT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-.field private yS:Z
+.field private yU:Z
 
-.field private yT:Ljava/util/LinkedList;
+.field private yV:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -72,19 +74,21 @@
     .end annotation
 .end field
 
-.field private yU:Lcom/discord/rtcconnection/socket/a;
+.field private yW:Lcom/discord/rtcconnection/socket/a;
 
-.field private yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.field public yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-.field private yW:Ljava/lang/Integer;
+.field private yY:Ljava/lang/Integer;
 
-.field private yX:I
+.field private yZ:I
 
-.field private yY:Ljava/lang/Long;
+.field private za:Ljava/lang/Long;
 
-.field private final yZ:Lcom/discord/rtcconnection/RtcConnection$n;
+.field private final zb:Lcom/discord/rtcconnection/RtcConnection$n;
 
-.field private final za:Lcom/discord/rtcconnection/RtcConnection$g;
+.field private final zc:Lcom/discord/rtcconnection/RtcConnection$g;
+
+.field private final zd: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;->zc:Lcom/discord/rtcconnection/RtcConnection$a;
+    sput-object v0, Lcom/discord/rtcconnection/RtcConnection;->zf: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "sessionId"
 
-    const-string v4, "mediaEngine"
+    invoke-static {v1, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "rtcServerId"
 
-    const-string v4, "logger"
+    invoke-static {v2, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v5, "mediaEngine"
 
-    const-string v4, "networkMonitor"
+    invoke-static {v3, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v5, p9
+    const-string v5, "logger"
 
-    invoke-static {v5, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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;->zd: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;->zb:I
+    sget v2, Lcom/discord/rtcconnection/RtcConnection;->ze:I
 
     add-int/lit8 v2, v2, 0x1
 
-    sput v2, Lcom/discord/rtcconnection/RtcConnection;->zb:I
+    sput v2, Lcom/discord/rtcconnection/RtcConnection;->ze: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;->yO:Ljava/lang/String;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->yP:Lcom/discord/rtcconnection/d;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yR: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;->yQ: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;->yS: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;->yT:Ljava/util/LinkedList;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yV: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;->yO:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->IR()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IU()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;->yZ:Lcom/discord/rtcconnection/RtcConnection$n;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->zb: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;->za:Lcom/discord/rtcconnection/RtcConnection$g;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->zc: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;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS: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;->eC()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;->yW:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw: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;->zd: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;->yP:Lcom/discord/rtcconnection/d;
+    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
 
     const-string p3, "connection"
 
@@ -488,7 +559,7 @@
 
     const/4 p3, 0x0
 
-    iput-object p3, p2, Lcom/discord/rtcconnection/d;->zw:Lco/discord/media_engine/Stats;
+    iput-object p3, p2, Lcom/discord/rtcconnection/d;->zz: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;->ey()Lkotlin/Unit;
+    invoke-virtual {p2}, Lcom/discord/rtcconnection/d;->eA()Lkotlin/Unit;
 
     :cond_0
-    iget-wide v0, p2, Lcom/discord/rtcconnection/d;->zx:J
+    iget-wide v0, p2, Lcom/discord/rtcconnection/d;->zA: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;->za:Lcom/discord/rtcconnection/RtcConnection$g;
+    iget-object p2, p0, Lcom/discord/rtcconnection/RtcConnection;->zc: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX: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;->yT:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV: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;->yT:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV: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;->yT:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV: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;->yX:I
+    iget v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:I
+    iput v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
 
     :cond_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm:Lcom/discord/rtcconnection/RtcConnection$Quality$a;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$Quality;->zp: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;->zh:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zk: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;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn: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;->zj:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     goto :goto_0
 
     :cond_4
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zi:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->zr:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -854,47 +947,47 @@
     throw p0
 
     :cond_1
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv: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;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw: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;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx: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;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw: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;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     if-ne p1, v0, :cond_4
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eu()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
 
     :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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne p1, v0, :cond_5
 
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zg: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;->yY:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Ljava/lang/Long;
 
     :cond_5
     return-void
@@ -1007,7 +1100,7 @@
 
     move-result-object v13
 
-    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yO:Ljava/lang/String;
+    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->yO:Ljava/lang/String;
+    iget-object v5, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->ze:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zh:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
 
     new-array v2, v11, [Lkotlin/Pair;
 
@@ -1071,13 +1164,13 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object v3, v0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v3}, Lcom/discord/utilities/networking/Backoff;->succeed()V
 
-    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
+    iput-object v1, v0, Lcom/discord/rtcconnection/RtcConnection;->yT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;
 
-    iget-object v3, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v3, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac: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;->yO:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1126,7 +1219,7 @@
     :cond_0
     iget-object v12, v0, Lcom/discord/rtcconnection/RtcConnection;->logger:Lcom/discord/utilities/logging/Logger;
 
-    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yO:Ljava/lang/String;
+    iget-object v14, v0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, v0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->AJ:Lcom/discord/rtcconnection/socket/a$a;
+    sget-object v2, Lcom/discord/rtcconnection/socket/a;->AK: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->yW:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yY: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p0, :cond_0
 
@@ -1331,7 +1424,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Lcom/discord/rtcconnection/RtcConnection$g;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->zc: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;->ev()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ex()V
 
     :cond_2
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:I
+    iput p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
 
     const-wide/16 v0, 0x0
 
@@ -1378,7 +1471,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yY:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->za: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;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object p1, p0, Lcom/discord/rtcconnection/RtcConnection;->yS: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->yO:Ljava/lang/String;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
 
     return-object p0
 .end method
 
-.method private final et()V
+.method private final ev()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->ev()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ex()V
 
     :cond_1
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX: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;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     new-instance v0, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
@@ -1633,17 +1726,17 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Z
+    iput-boolean v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Z
 
     return-void
 .end method
 
-.method private final eu()V
+.method private final ew()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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
 
     const-string v1, "reconnect"
 
@@ -1655,19 +1748,19 @@
 
     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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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;->eC()Z
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/socket/a;->eE()Z
 
     :cond_0
     return-void
 .end method
 
-.method private final ev()V
+.method private final ex()V
     .locals 6
 
     const/4 v0, 0x2
@@ -1686,7 +1779,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:I
+    iget v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yZ:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1706,7 +1799,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yT:Ljava/util/LinkedList;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Ljava/util/LinkedList;
 
     check-cast v1, Ljava/lang/Iterable;
 
@@ -1742,9 +1835,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;->yP:Lcom/discord/rtcconnection/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
 
-    iget-object v1, v1, Lcom/discord/rtcconnection/d;->zw:Lco/discord/media_engine/Stats;
+    iget-object v1, v1, Lcom/discord/rtcconnection/d;->zz:Lco/discord/media_engine/Stats;
 
     if-eqz v1, :cond_4
 
@@ -1840,7 +1933,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;->yY:Ljava/lang/Long;
+    iget-object v1, p0, Lcom/discord/rtcconnection/RtcConnection;->za:Ljava/lang/Long;
 
     if-eqz v1, :cond_5
 
@@ -1865,13 +1958,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;->zf:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zi: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;->yP:Lcom/discord/rtcconnection/d;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->ey()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->eA()Lkotlin/Unit;
 
     return-void
 .end method
@@ -1879,7 +1972,7 @@
 .method public static final synthetic f(Lcom/discord/rtcconnection/RtcConnection;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Z
+    iget-boolean p0, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Z
 
     return p0
 .end method
@@ -1895,7 +1988,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;->yZ:Lcom/discord/rtcconnection/RtcConnection$n;
+    iget-object p0, p0, Lcom/discord/rtcconnection/RtcConnection;->zb:Lcom/discord/rtcconnection/RtcConnection$n;
 
     return-object p0
 .end method
@@ -1903,7 +1996,7 @@
 .method public static final synthetic i(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->et()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ev()V
 
     return-void
 .end method
@@ -1911,7 +2004,7 @@
 .method public static final synthetic j(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eu()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
 
     return-void
 .end method
@@ -1919,7 +2012,7 @@
 .method public static final synthetic k(Lcom/discord/rtcconnection/RtcConnection;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
@@ -1931,7 +2024,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v2, p0, Lcom/discord/rtcconnection/RtcConnection;->yW:Lcom/discord/rtcconnection/socket/a;
 
     if-eqz v2, :cond_0
 
@@ -1949,7 +2042,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1959,7 +2052,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;->zp:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -1969,15 +2062,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;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Ljava/lang/String;
 
     const-string v2, "Connected to RTC server."
 
@@ -1989,86 +2082,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;->yU:Lcom/discord/rtcconnection/socket/a;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yW: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "sessionId"
+
+    invoke-static {v5, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yQ: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;->AN:I
 
-    iget-wide v5, p0, Lcom/discord/rtcconnection/RtcConnection;->userId:J
+    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AB: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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v1, v9
 
-    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AH: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;->yO: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;->AM:I
-
-    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AA: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;->zn:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    :goto_0
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     check-cast v0, Lcom/discord/rtcconnection/RtcConnection$State;
 
@@ -2080,11 +2157,11 @@
 .method private final o(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yP:Lcom/discord/rtcconnection/d;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yR:Lcom/discord/rtcconnection/d;
 
-    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->ey()Lkotlin/Unit;
+    invoke-virtual {v0}, Lcom/discord/rtcconnection/d;->eA()Lkotlin/Unit;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
     if-eqz v0, :cond_0
 
@@ -2093,9 +2170,9 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+    iput-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yX:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yQ:Lcom/discord/utilities/networking/Backoff;
+    iget-object v0, p0, Lcom/discord/rtcconnection/RtcConnection;->yS:Lcom/discord/utilities/networking/Backoff;
 
     invoke-virtual {v0}, Lcom/discord/utilities/networking/Backoff;->cancel()V
 
@@ -2109,57 +2186,88 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->eu()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ew()V
 
     return-void
 
     :cond_1
-    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$f;->zv:Lcom/discord/rtcconnection/RtcConnection$f;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$f;->zy:Lcom/discord/rtcconnection/RtcConnection$f;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/RtcConnection;->c(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->et()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/RtcConnection;->ev()V
 
     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;->eA()Ljava/util/concurrent/ExecutorService;
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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 eu()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 6051fd0070..11447b1314 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;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zM: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;->zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zO: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;->zL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zN: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 b7a5b746f6..bd40707873 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;->Ab:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ad:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->ordinal()I
 
@@ -42,36 +42,12 @@
 
     sput-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
-
-    invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
-
-    move-result v1
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
-
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
-
-    invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
-
-    move-result v1
-
-    const/4 v2, 0x2
-
-    aput v2, v0, v1
-
-    sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
-
     sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
 
     move-result v1
 
-    const/4 v2, 0x3
-
     aput v2, v0, v1
 
     sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
@@ -82,6 +58,30 @@
 
     move-result v1
 
+    const/4 v2, 0x2
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
+
+    move-result v1
+
+    const/4 v2, 0x3
+
+    aput v2, v0, v1
+
+    sget-object v0, Lcom/discord/rtcconnection/b;->$EnumSwitchMapping$1:[I
+
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->ordinal()I
+
+    move-result v1
+
     const/4 v2, 0x4
 
     aput v2, v0, v1
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 264eff4ba5..e630ada206 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 141e88c091..0ba38b5274 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 zy:Lcom/discord/rtcconnection/d;
+.field final synthetic $connection:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
 
-.field final synthetic zz:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;
+.field final synthetic zB: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;->zy:Lcom/discord/rtcconnection/d;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d$a;->zB:Lcom/discord/rtcconnection/d;
 
-    iput-object p2, p0, Lcom/discord/rtcconnection/d$a;->zz: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;->zz: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;->zy:Lcom/discord/rtcconnection/d;
+    iget-object v1, p0, Lcom/discord/rtcconnection/d$a;->zB: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 bf2c0d2026..e204c7f28d 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 zy:Lcom/discord/rtcconnection/d;
+.field final synthetic zB: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;->zy:Lcom/discord/rtcconnection/d;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d$b;->zB: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;->zy:Lcom/discord/rtcconnection/d;
+    iget-object p1, p0, Lcom/discord/rtcconnection/d$b;->zB: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 5c05e5f4a5..3488c45c10 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 zw:Lco/discord/media_engine/Stats;
+.field final zA:J
 
-.field final zx:J
+.field zz:Lco/discord/media_engine/Stats;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     const-wide/16 v0, 0x7530
 
-    iput-wide v0, p0, Lcom/discord/rtcconnection/d;->zx:J
+    iput-wide v0, p0, Lcom/discord/rtcconnection/d;->zA: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;->zw:Lco/discord/media_engine/Stats;
+    iput-object p1, p0, Lcom/discord/rtcconnection/d;->zz:Lco/discord/media_engine/Stats;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ey()Lkotlin/Unit;
+.method public final eA()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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d9e34e6fb9..5d5758ac69 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 zA:F
+.field public final zC:F
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zA:F
+    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC: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;->zA:F
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC:F
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zA:F
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC: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;->zA:F
+    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC: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;->zA:F
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC: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 e2db2c957d..45cadb05e9 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 zB:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
-.field public static final enum zC:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
-
 .field public static final enum zD:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
-.field private static final synthetic zE:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+.field public static final enum zE:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+.field public static final enum zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+
+.field private static final synthetic zG:[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;->zB:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zD: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;->zC:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zE: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;->zD:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zE:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG:[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;->zE:[Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zG:[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 4783bcd04a..2d51ad99b6 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngine.smali
@@ -16,11 +16,12 @@
 
 
 # virtual methods
-.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;",
@@ -60,10 +61,10 @@
     .end annotation
 .end method
 
-.method public abstract eA()Ljava/util/concurrent/ExecutorService;
+.method public abstract eB()Lcom/hammerandchisel/libdiscord/Discord;
 .end method
 
-.method public abstract ez()Lcom/hammerandchisel/libdiscord/Discord;
+.method public abstract eC()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 5f402102d6..cdcb5ee1f3 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 zF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
-
-.field public static final enum zG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
-
 .field public static final enum zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
 .field public static final enum zI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field private static final synthetic zJ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field public static final enum zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+.field public static final enum zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+.field private static final synthetic zL:[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;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zH: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;->zG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zI: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;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zJ: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;->zI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zJ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zL:[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;->zJ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zL:[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 1b3150df46..5fe36ac76d 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,10 +29,6 @@
 
 
 # static fields
-.field public static final enum zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
-
-.field public static final enum zL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
-
 .field public static final enum zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
 .field public static final enum zN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
@@ -41,9 +37,13 @@
 
 .field public static final enum zP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field private static final synthetic zQ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+.field public static final enum zQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-.field public static final zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+.field public static final enum zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+
+.field private static final synthetic zS:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+
+.field public static final zT: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;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zM: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;->zL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zN: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;->zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zO: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;->zN:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zP: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;->zO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ: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;->zP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zQ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS:[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;->zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zT: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;->zQ:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zS:[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 58c2d60ff5..018e95657d 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;->zR:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zT: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;->zK:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zM: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;->zL:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zN: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;->zM:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zO:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
     goto :goto_2
 
     :cond_5
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zP:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;->zR: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 56a41663fb..cc6e80055d 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 zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field public static final enum zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-.field public static final enum zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field public static final enum zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
-.field private static final synthetic zU:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+.field private static final synthetic zW:[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;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zU: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;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     aput-object v2, v1, v4
 
-    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zU:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW:[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;->zU:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zW:[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 390883faea..79ac8cd007 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 Ab:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public static final enum Ad:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-.field public static final enum Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public static final enum Ae:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-.field private static final synthetic Ad:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field private static final synthetic Af:[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;->Ab:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ad: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;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ae:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Ad:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Af:[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;->Ad:[Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;->Af:[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 cd7153a440..f6057b4708 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field public final Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+.field public final Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
 .field public final address:Ljava/lang/String;
 
@@ -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;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iput-object p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac: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;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
-    iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->areEqual(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;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac: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;->Aa:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo$a;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$TransportInfo;->Ac: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 bd3f615d01..0e8b90c9ac 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection$a.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field public final zV:I
+.field public final Aa:Z
 
-.field public final zW:I
+.field public final Ab:I
 
 .field public final zX:I
 
-.field public final zY:Z
+.field public final zY:I
 
 .field public final zZ:I
 
@@ -52,15 +52,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zV:I
+    iput p1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
 
-    iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zW:I
+    iput p2, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
 
-    iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
+    iput p3, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
-    iput-boolean p4, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:Z
+    iput-boolean p4, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:Z
 
-    iput p5, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iput p5, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab: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;->zV:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zV:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX: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;->zW:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zW:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY: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;->zX:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
-    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
+    iget v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ: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;->zY:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:Z
 
-    iget-boolean v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:Z
+    iget-boolean v3, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa: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;->zZ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
 
-    iget p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iget p1, p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab: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;->zV:I
+    iget v0, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zW:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa: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;->zZ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab: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;->zV:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX: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;->zW:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY: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;->zX:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ: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;->zY:Z
+    iget-boolean v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa: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;->zZ:I
+    iget v1, p0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab: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/a/a$b.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$b.smali
index eff5894c03..e8ab03b22e 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/l;->checkParameterIsNotNull(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;->bgo: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;->bgy: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 edfa85333e..72600dc46e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 73b4fb4d8a..5a1e336050 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2d14e4abaa..91b2ad0e95 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 a7ac8bd803..b7befb4d2d 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 Am: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;->Am: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/m;-><init>(I)V
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zF: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;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    sget-object p1, Lkotlin/Unit;->bgo: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;->bgy: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 37bfc40a86..4ced63672a 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
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic An:Lkotlin/jvm/functions/Function1;
+.field final synthetic Ao:Lkotlin/jvm/functions/Function1;
 
 .field final synthetic this$0:Lcom/discord/rtcconnection/mediaengine/a/a;
 
@@ -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;->An:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->Ao:Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->An:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a$h;->Ao: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/rtcconnection/mediaengine/a/a$i.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a$i.smali
index 2e7679bfb0..11c4f8619d 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/l;->checkParameterIsNotNull(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;->bgo: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;->bgy: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 87a0872802..93a9fc8a33 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 Ao: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;->Ao: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/m;-><init>(I)V
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/l;->checkParameterIsNotNull(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;->zN: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;->zP: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;->bgo: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;->bgy: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 6e88a2cadf..2c1b725079 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/l;->checkParameterIsNotNull(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;->bgo: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;->bgy: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 20b3e290d6..b91c303632 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ceabc263b0..fb660c2990 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
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 567df2677a..aa881f7322 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/l;->checkParameterIsNotNull(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;->zO: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;->zQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    sget-object p1, Lkotlin/Unit;->bgo: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;->bgy: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 b77cd23c37..51a3ebf19a 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/l;->checkParameterIsNotNull(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;->zO: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;->zQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    sget-object p1, Lkotlin/Unit;->bgo: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;->bgy: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 4af8ea9a6b..1412ca9db2 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/l;->checkParameterIsNotNull(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;->zO: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;->zQ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$FailedConnectionException$a;
 
-    sget-object p1, Lkotlin/Unit;->bgo: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;->bgy: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 f182af3af1..963de23a6f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/a.smali
@@ -15,15 +15,15 @@
 
 
 # static fields
-.field public static final Al:Lcom/discord/rtcconnection/mediaengine/a/a$a;
+.field public static final An:Lcom/discord/rtcconnection/mediaengine/a/a$a;
 
 .field private static final TAG:Ljava/lang/String;
 
 
 # instance fields
-.field private Af:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+.field private Ah:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-.field private final Ag:Ljava/util/HashMap;
+.field private final Ai:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final Ah:Ljava/util/HashMap;
+.field private final Aj:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field private final Ai:Ljava/util/ArrayList;
+.field private final Ak:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -55,9 +55,9 @@
     .end annotation
 .end field
 
-.field private final Aj:Lco/discord/media_engine/Connection;
+.field private final Al:Lco/discord/media_engine/Connection;
 
-.field private final Ak:Lcom/hammerandchisel/libdiscord/Discord;
+.field private final Am:Lcom/hammerandchisel/libdiscord/Discord;
 
 .field private final executorService:Ljava/util/concurrent/ExecutorService;
 
@@ -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;->Al:Lcom/discord/rtcconnection/mediaengine/a/a$a;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/a;->An:Lcom/discord/rtcconnection/mediaengine/a/a$a;
 
     const-class v0, Lcom/discord/rtcconnection/mediaengine/a/a;
 
@@ -101,15 +101,15 @@
     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 8
+.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<",
             "+",
@@ -118,137 +118,157 @@
         }
     .end annotation
 
-    const-string v0, "executorService"
+    move-object v0, p0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "listeners"
+    const-string v6, "logger"
 
-    invoke-static {p7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "voiceEngineLegacy"
+
+    invoke-static {v3, v6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "connectionOptions"
+
+    invoke-static {v4, v6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "listeners"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object v3, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zI:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Af:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ah:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
-    new-array p1, p1, [Lkotlin/Pair;
+    new-array v1, 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 p2
+    move-result-object v2
 
-    iget p3, p6, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
+    iget v3, v4, Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;->ssrc:I
 
-    invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object p3
+    move-result-object v3
 
-    invoke-static {p2, p3}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v2, v3}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    move-result-object p2
+    move-result-object v2
 
-    const/4 p3, 0x0
+    const/4 v3, 0x0
 
-    aput-object p2, p1, p3
+    aput-object v2, v1, v3
 
-    invoke-static {p1}, Lkotlin/a/ad;->hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
+    invoke-static {v1}, Lkotlin/a/ad;->hashMapOf([Lkotlin/Pair;)Ljava/util/HashMap;
 
-    move-result-object p1
+    move-result-object v1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ag:Ljava/util/HashMap;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai: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;->Ah:Ljava/util/HashMap;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj: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;->Ai:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v6, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am: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 v7, p1
+    move-object v13, v1
 
-    check-cast v7, Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
+    check-cast v13, Lcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;
 
-    const/4 v6, 0x0
+    move-wide/from16 v8, p5
 
-    move-wide v2, p4
+    move/from16 v12, p4
 
-    invoke-virtual/range {v0 .. v7}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
+    invoke-virtual/range {v6 .. v13}, Lcom/hammerandchisel/libdiscord/Discord;->connectToServer(IJLjava/lang/String;IZLcom/hammerandchisel/libdiscord/Discord$ConnectToServerCallback;)Lco/discord/media_engine/Connection;
 
-    move-result-object p1
+    move-result-object v1
 
-    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/a$c;
+    new-instance v2, Lcom/discord/rtcconnection/mediaengine/a/a$c;
 
-    invoke-direct {p2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$c;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    check-cast p2, Lco/discord/media_engine/Connection$OnVideoCallback;
+    check-cast v2, Lco/discord/media_engine/Connection$OnVideoCallback;
 
-    invoke-virtual {p1, p2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
+    invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setOnVideoCallback(Lco/discord/media_engine/Connection$OnVideoCallback;)V
 
-    new-instance p2, Lcom/discord/rtcconnection/mediaengine/a/a$d;
+    new-instance v2, Lcom/discord/rtcconnection/mediaengine/a/a$d;
 
-    invoke-direct {p2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$d;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
+    invoke-direct {v2, p0}, Lcom/discord/rtcconnection/mediaengine/a/a$d;-><init>(Lcom/discord/rtcconnection/mediaengine/a/a;)V
 
-    check-cast p2, Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
+    check-cast v2, Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;
 
-    invoke-virtual {p1, p2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
+    invoke-virtual {v1, v2}, Lco/discord/media_engine/Connection;->setUserSpeakingStatusChangedCallback(Lco/discord/media_engine/Connection$UserSpeakingStatusChangedCallback;)V
 
-    const-string p2, "connection"
+    const-string v2, "findme"
 
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v3, "added speaking listener"
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    invoke-static {v2, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    new-instance p1, Ljava/util/ArrayList;
+    const-string v2, "connection"
 
-    check-cast p7, Ljava/util/Collection;
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p1, p7}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+    iput-object v1, v0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
-    check-cast p1, Ljava/util/List;
+    new-instance v1, Ljava/util/ArrayList;
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->listeners:Ljava/util/List;
+    move-object v2, v5
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zG:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    check-cast v2, Ljava/util/Collection;
 
-    invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
+    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;->zI: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
@@ -282,11 +302,11 @@
 .method private final a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Af:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ah: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;
 
@@ -298,7 +318,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;->Ah:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -334,9 +354,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;->Ag:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -365,6 +385,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
@@ -461,7 +503,7 @@
 
     invoke-direct {v1, 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;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    sget-object p1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zJ:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
 
     invoke-direct {p0, p1}, Lcom/discord/rtcconnection/mediaengine/a/a;->a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;)V
 
@@ -481,7 +523,7 @@
 
     invoke-direct/range {v2 .. v7}, 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;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     invoke-virtual {p2}, Lcom/hammerandchisel/libdiscord/Discord;->getSupportedVideoCodecs()[Ljava/lang/String;
 
@@ -499,15 +541,15 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak: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;->Ai:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
 
     check-cast p2, Ljava/util/Collection;
 
@@ -535,7 +577,9 @@
     :cond_3
     if-nez p1, :cond_4
 
-    sget-object p1, Lcom/discord/rtcconnection/mediaengine/a/a$j;->Ao: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;
 
@@ -546,7 +590,7 @@
     :cond_4
     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;
 
@@ -566,7 +610,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;->Ag:Ljava/util/HashMap;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
 
     return-object p0
 .end method
@@ -574,7 +618,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;->Ai:Ljava/util/ArrayList;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
 
     return-object p0
 .end method
@@ -832,7 +876,7 @@
 .method public final a(JI)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     int-to-float p3, p3
 
@@ -850,7 +894,7 @@
 
     if-nez p4, :cond_0
 
-    iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ah:Ljava/util/HashMap;
+    iget-object p4, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -877,7 +921,7 @@
     const/4 p4, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ag:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -911,7 +955,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ah:Ljava/util/HashMap;
+    iget-object v3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -943,7 +987,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-static {p4}, Lcom/discord/rtcconnection/mediaengine/a/a;->w(I)I
 
@@ -962,7 +1006,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;->Ag:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/HashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -976,7 +1020,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;->Ah:Ljava/util/HashMap;
+    iget-object p3, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Ljava/util/HashMap;
 
     check-cast p3, Ljava/util/Map;
 
@@ -996,7 +1040,7 @@
 .method public final a(JZ)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1, p2, p3}, Lco/discord/media_engine/Connection;->muteUser(JZ)V
 
@@ -1014,23 +1058,23 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zW:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADLeadingFramesToBuffer(I)V
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
     invoke-virtual {v0, v1}, Lco/discord/media_engine/Connection;->setVADTrailingFramesToSend(I)V
 
-    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zV:I
+    iget v1, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX: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;->zY:Z
+    iget-boolean p2, p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Aa:Z
 
     if-eqz p2, :cond_0
 
@@ -1056,7 +1100,7 @@
 
     invoke-virtual {v0, p2}, Lco/discord/media_engine/Connection;->setExpectedPacketLossRate(F)V
 
-    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     invoke-virtual {p2, p1}, Lcom/hammerandchisel/libdiscord/Discord;->enableBuiltInAEC(Z)V
 
@@ -1064,7 +1108,7 @@
 .end method
 
 .method public final a(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
-    .locals 1
+    .locals 2
 
     const-string v0, "listener"
 
@@ -1074,9 +1118,13 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Af: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;->Ah: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
@@ -1096,7 +1144,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;->Aj:Lco/discord/media_engine/Connection;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-virtual {p1, v0}, Lco/discord/media_engine/Connection;->setEncryptionSettings(Lco/discord/media_engine/EncryptionSettings;)V
 
@@ -1134,11 +1182,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;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al: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;->Am: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;
 
@@ -1164,7 +1214,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     new-instance v1, Lcom/discord/rtcconnection/mediaengine/a/a$h;
 
@@ -1180,7 +1230,7 @@
 .method public final p(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->muteLocalUser(Z)V
 
@@ -1198,7 +1248,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1241,7 +1291,7 @@
 
     check-cast v8, Lcom/discord/rtcconnection/mediaengine/a;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ai:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Ak:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -1286,7 +1336,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;
 
@@ -1299,7 +1349,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;
 
@@ -1314,7 +1364,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;
 
@@ -1427,7 +1477,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;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     new-array v5, v3, [Lco/discord/media_engine/AudioDecoder;
 
@@ -1445,7 +1495,7 @@
 .method public final setPttActive(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->setPTTActive(Z)V
 
@@ -1455,7 +1505,7 @@
 .method public final setSelfDeafen(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->deafenLocalUser(Z)V
 
@@ -1465,7 +1515,7 @@
 .method public final setVideoBroadcast(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Aj:Lco/discord/media_engine/Connection;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/a;->Al:Lco/discord/media_engine/Connection;
 
     invoke-virtual {v0, p1}, Lco/discord/media_engine/Connection;->setVideoBroadcast(Z)V
 
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 3065e463f9..fd13ee9f27 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/m;-><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;->At: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;->bgo: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;->bgy: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 4e10cf2b11..62e2263d69 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/m;-><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;->At: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;->bgo: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;->bgy: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 b80c8962ae..44fd19b7ae 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/m;-><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;->At: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;->bgo: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;->bgy: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 fb5dbdb731..4c8002a4ee 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;
@@ -24,16 +24,20 @@
 
 .field final synthetic Au:Lcom/discord/rtcconnection/mediaengine/MediaEngine$a;
 
+.field final synthetic Av: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;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
 
     iput-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->Au: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;->Av: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string p1, "supportedVideoCodecs"
+    const-string p1, "transportInfo"
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string p1, "supportedVideoCodecs"
+
+    invoke-static {p3, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+    const-string v0, "connectionState"
 
-    if-ne p1, v0, :cond_0
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;->zH:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$ConnectionState;
+
+    if-ne p2, v0, :cond_0
+
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At: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
 
+    const-string v0, "connection"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At:Lcom/discord/rtcconnection/mediaengine/a/c;
+    const-string v0, "exception"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$b;->At: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 60d49eb1a0..5e7318a48d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3174fc2467..b21a4fb797 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 Av:Lkotlin/jvm/functions/Function1;
+.field final synthetic Aw: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;->Av:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->Aw: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;->Av:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/discord/rtcconnection/mediaengine/a/c$d;->Aw: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 b82a390959..48f7b9b2fb 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;->eB()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->eD()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -39,7 +39,7 @@
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c$e;->At: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 80316670ea..4e55d82496 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;->eB()V
+    value = Lcom/discord/rtcconnection/mediaengine/a/c;->eD()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final Aw:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+.field public static final Ax: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;->Aw:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->Ax: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1651b00057..98191b042c 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/a/c.smali
@@ -21,9 +21,19 @@
 
 
 # instance fields
-.field private Ak:Lcom/hammerandchisel/libdiscord/Discord;
+.field private Am:Lcom/hammerandchisel/libdiscord/Discord;
 
 .field private final Ap:Ljava/util/ArrayList;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/ArrayList<",
+            "Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final Aq:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -33,8 +43,6 @@
     .end annotation
 .end field
 
-.field private Aq:Lcom/discord/rtcconnection/mediaengine/a/a;
-
 .field private final Ar:Ljava/util/concurrent/ExecutorService;
 
 .field private final context:Landroid/content/Context;
@@ -106,9 +114,23 @@
 
     iput-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap: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;->Aq: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
 
@@ -127,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;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
-
-    const/4 v1, 0x0
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am: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;->Aq:Lcom/discord/rtcconnection/mediaengine/a/a;
+    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap: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
-
-    iget-object p0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->logger:Lcom/discord/utilities/logging/Logger;
-
-    return-object p0
-.end method
-
-.method private final eB()V
+.method private final eD()V
     .locals 8
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -234,7 +250,7 @@
 
     invoke-direct {v0, v1}, Lcom/hammerandchisel/libdiscord/Discord;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am: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
@@ -308,11 +324,11 @@
     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;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->Aw:Lcom/discord/rtcconnection/mediaengine/a/c$f;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/a/c$f;->Ax:Lcom/discord/rtcconnection/mediaengine/a/c$f;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -335,7 +351,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aq:Ljava/util/ArrayList;
 
     check-cast v0, Ljava/lang/Iterable;
 
@@ -392,12 +408,13 @@
 
 
 # virtual methods
-.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;",
@@ -407,74 +424,92 @@
         }
     .end annotation
 
-    const-string v0, "options"
+    move-object/from16 v6, p0
 
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v14, p3
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eB()V
+    invoke-static {v14, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    const-string v1, "onFailure"
 
-    if-nez v0, :cond_0
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;->eD()V
 
-    invoke-direct {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine$c;-><init>()V
+    iget-object v1, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Am: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;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v10, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Am: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;
 
-    invoke-static {p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+    invoke-static/range {p3 .. p3}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
-    move-result-object p4
+    move-result-object v2
 
-    const-string v0, "Connecting with options: "
+    const-string v3, "Connecting with options: "
 
-    invoke-virtual {v0, p4}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+    invoke-virtual {v3, v2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
 
-    move-result-object v7
+    move-result-object v2
 
-    const/4 v8, 0x0
+    const/4 v3, 0x0
 
-    const/4 v9, 0x4
+    const/4 v4, 0x4
 
-    const/4 v10, 0x0
+    const/4 v5, 0x0
 
-    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
+    invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
 
-    new-instance p4, Lcom/discord/rtcconnection/mediaengine/a/c$b;
+    new-instance v7, Lcom/discord/rtcconnection/mediaengine/a/c$b;
 
-    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 v0, v7
+
+    move-object/from16 v1, p0
+
+    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;->Ar:Ljava/util/concurrent/ExecutorService;
+    iget-object v8, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Ar: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;->listOf(Ljava/lang/Object;)Ljava/util/List;
+    invoke-static {v7}, Lkotlin/a/m;->listOf(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
 
@@ -482,26 +517,24 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aq:Lcom/discord/rtcconnection/mediaengine/a/a;
+    if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aq:Lcom/discord/rtcconnection/mediaengine/a/a;
+    iget-object v1, v6, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap: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;->g(Lkotlin/jvm/functions/Function1;)V
+    invoke-direct {v6, v1}, Lcom/discord/rtcconnection/mediaengine/a/c;->g(Lkotlin/jvm/functions/Function1;)V
 
     :cond_2
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aq: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
@@ -511,7 +544,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Aq:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -535,9 +568,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eB()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eD()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -568,9 +601,9 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eB()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/mediaengine/a/c;->eD()V
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -586,7 +619,7 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object p1, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz p1, :cond_2
 
@@ -598,7 +631,15 @@
     return-void
 .end method
 
-.method public final eA()Ljava/util/concurrent/ExecutorService;
+.method public final eB()Lcom/hammerandchisel/libdiscord/Discord;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
+
+    return-object v0
+.end method
+
+.method public final eC()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
     iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ar:Ljava/util/concurrent/ExecutorService;
@@ -606,48 +647,20 @@
     return-object v0
 .end method
 
-.method public final ez()Lcom/hammerandchisel/libdiscord/Discord;
+.method public final bridge synthetic getConnections()Ljava/util/List;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ap:Ljava/util/ArrayList;
 
-    return-object v0
-.end method
+    check-cast v0, Ljava/util/List;
 
-.method public final 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;->Aq:Lcom/discord/rtcconnection/mediaengine/a/a;
-
-    if-eqz v0, :cond_0
-
-    invoke-static {v0}, Lkotlin/a/m;->listOf(Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object v0
-
-    if-nez v0, :cond_1
-
-    :cond_0
-    invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List;
-
-    move-result-object v0
-
-    :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;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -660,7 +673,7 @@
 .method public final setEchoCancellation(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -673,7 +686,7 @@
 .method public final setNoiseSuppression(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -686,7 +699,7 @@
 .method public final setOutputVolume(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am:Lcom/hammerandchisel/libdiscord/Discord;
 
     if-eqz v0, :cond_0
 
@@ -705,7 +718,7 @@
 .method public final v(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Ak:Lcom/hammerandchisel/libdiscord/Discord;
+    iget-object v0, p0, Lcom/discord/rtcconnection/mediaengine/a/c;->Am: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 06e12c55ef..ee7b5529b2 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;->zC:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zE: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;->zD:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zF: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;->zB:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zD: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 152badf36c..f0f138ac0f 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 Ae:Lcom/discord/rtcconnection/mediaengine/b;
+.field public static final Ag: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;->Ae:Lcom/discord/rtcconnection/mediaengine/b;
+    sput-object v0, Lcom/discord/rtcconnection/mediaengine/b;->Ag: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 fa51600150..fc37b41713 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$b.smali
@@ -23,8 +23,6 @@
 
 
 # static fields
-.field public static final AK:I
-
 .field public static final AL:I
 
 .field public static final AM:I
@@ -35,7 +33,9 @@
 
 .field public static final AP:I
 
-.field private static final synthetic AQ:[I
+.field public static final AQ:I
+
+.field private static final synthetic AR:[I
 
 
 # direct methods
@@ -50,27 +50,27 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AK:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AL:I
 
     const/4 v2, 0x2
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AL:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AM:I
 
     const/4 v2, 0x3
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AM:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AN:I
 
     const/4 v2, 0x4
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AN:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AO:I
 
     const/4 v2, 0x5
 
-    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AO:I
+    sput v2, Lcom/discord/rtcconnection/socket/a$b;->AP:I
 
-    sput v0, Lcom/discord/rtcconnection/socket/a$b;->AP:I
+    sput v0, Lcom/discord/rtcconnection/socket/a$b;->AQ:I
 
-    sput-object v1, Lcom/discord/rtcconnection/socket/a$b;->AQ:[I
+    sput-object v1, Lcom/discord/rtcconnection/socket/a$b;->AR:[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 773fb868bd..ca41d888a9 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$c.smali
@@ -39,10 +39,10 @@
 .method public abstract ae(Ljava/lang/String;)V
 .end method
 
-.method public abstract ew()V
+.method public abstract ey()V
 .end method
 
-.method public abstract ex()V
+.method public abstract ez()V
 .end method
 
 .method public abstract k(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 29c204e24b..0cc81047e4 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 AR:Lcom/discord/rtcconnection/socket/a$d;
+.field public static final AS: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;->AR:Lcom/discord/rtcconnection/socket/a$d;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$d;->AS: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d59b3967d8..cb6db3b2cb 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 AS:Lcom/discord/rtcconnection/socket/a$e;
+.field public static final AT: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;->AS:Lcom/discord/rtcconnection/socket/a$e;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$e;->AT:Lcom/discord/rtcconnection/socket/a$e;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->e(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cc86e58056..bc895f1861 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 AT:Lcom/discord/rtcconnection/socket/a$f;
+.field public static final AU: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;->AT:Lcom/discord/rtcconnection/socket/a$f;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$f;->AU: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 70811f4370..3b55a5737c 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;->eD()V
+    value = Lcom/discord/rtcconnection/socket/a;->eF()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final AU:Lcom/discord/rtcconnection/socket/a$g;
+.field public static final AV: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;->AU:Lcom/discord/rtcconnection/socket/a$g;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$g;->AV:Lcom/discord/rtcconnection/socket/a$g;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->e(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c849e88bd0..bcbf0ca62c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 00b311c4c4..ef393b5a11 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;->eD()V
+    value = Lcom/discord/rtcconnection/socket/a;->eF()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 5e567c4d91..e0127e9b6b 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;->eD()V
+    value = Lcom/discord/rtcconnection/socket/a;->eF()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field public static final AV:Lcom/discord/rtcconnection/socket/a$i;
+.field public static final AW: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;->AV:Lcom/discord/rtcconnection/socket/a$i;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$i;->AW:Lcom/discord/rtcconnection/socket/a$i;
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ew()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ey()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4038bcde82..279e4ac85b 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 03705cb4e4..106c594125 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;->eH()Ljava/util/TimerTask;
+    value = Lcom/discord/rtcconnection/socket/a;->eJ()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 511dce9866..ec581cac4b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0494f75d4b..226a36ed8f 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 a2cdffca13..889e11b64a 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;->k(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 814689ed09..f02f9b03ae 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 AW:Lcom/discord/rtcconnection/socket/a$n;
+.field public static final AX: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;->AW:Lcom/discord/rtcconnection/socket/a$n;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$n;->AX:Lcom/discord/rtcconnection/socket/a$n;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->e(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1b8dbcb294..c590a65a31 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 42ad7bc351..8d066ce399 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;->a(IILjava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 42667002e9..2fe0d59e32 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$q.smali
@@ -94,7 +94,7 @@
     invoke-interface {p1, v0}, Lcom/discord/rtcconnection/socket/a$c;->ae(Ljava/lang/String;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f95366e5da..33c818527c 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a$r.smali
@@ -66,7 +66,7 @@
     invoke-interface {p1, v0}, Lcom/discord/rtcconnection/socket/a$c;->ae(Ljava/lang/String;)V
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c0165ce976..c0eefb2884 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/m;-><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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 20e7306899..fa5e957b76 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 40fc31b4f6..e76a884c2d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0b302e46fa..2f48cf898c 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 AX:Lcom/discord/rtcconnection/socket/a$v$1;
+.field public static final AY: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;->AX:Lcom/discord/rtcconnection/socket/a$v$1;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$v$1;->AY: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f7fa303988..c176e56b8a 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;->AX:Lcom/discord/rtcconnection/socket/a$v$1;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$v$1;->AY: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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 39970880cb..c2add0413a 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e29370699c..cc13f88b00 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 AY:Lcom/discord/rtcconnection/socket/a$x$1;
+.field public static final AZ: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;->AY:Lcom/discord/rtcconnection/socket/a$x$1;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$x$1;->AZ:Lcom/discord/rtcconnection/socket/a$x$1;
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ex()V
+    invoke-interface {p1}, Lcom/discord/rtcconnection/socket/a$c;->ez()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ceebb42dfe..c43d880b47 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;->k(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 de0d7e7245..b305cb20a0 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;->AL:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AM: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;->AY:Lcom/discord/rtcconnection/socket/a$x$1;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$x$1;->AZ: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;->AP:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AQ: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;->AO:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AP: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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 897c70930f..c2e09a5749 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 AZ:Lcom/discord/rtcconnection/socket/a$y;
+.field public static final Ba: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;->AZ:Lcom/discord/rtcconnection/socket/a$y;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$y;->Ba:Lcom/discord/rtcconnection/socket/a$y;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1, v0, v1}, Lokhttp3/WebSocket;->e(ILjava/lang/String;)Z
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2a12f55b44..b29bcf6e01 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 Ba:Lcom/discord/rtcconnection/socket/a$z;
+.field public static final Bb: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;->Ba:Lcom/discord/rtcconnection/socket/a$z;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a$z;->Bb:Lcom/discord/rtcconnection/socket/a$z;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9aa0111bd2..8063807c4b 100644
--- a/com.discord/smali/com/discord/rtcconnection/socket/a.smali
+++ b/com.discord/smali/com/discord/rtcconnection/socket/a.smali
@@ -14,33 +14,33 @@
 
 
 # static fields
-.field public static final AJ:Lcom/discord/rtcconnection/socket/a$a;
+.field public static final AK:Lcom/discord/rtcconnection/socket/a$a;
 
-.field private static zb:I
+.field private static ze:I
 
 
 # instance fields
-.field public AA:I
+.field private AA:Z
 
-.field private AB:Ljava/lang/Long;
+.field public AB:I
 
 .field private AC:Ljava/lang/Long;
 
-.field private AD:Ljava/util/TimerTask;
+.field private AD:Ljava/lang/Long;
 
-.field private AF:Ljava/lang/Long;
+.field private AF:Ljava/util/TimerTask;
 
-.field private AG:Ljava/util/TimerTask;
+.field private AG:Ljava/lang/Long;
 
-.field public AH:Z
+.field private AH:Ljava/util/TimerTask;
+
+.field public AJ:Z
 
 .field private final Ar:Ljava/util/concurrent/ExecutorService;
 
-.field private final Ax:Lcom/google/gson/Gson;
+.field private final Ay:Lcom/google/gson/Gson;
 
-.field private Ay:Lokhttp3/WebSocket;
-
-.field private Az:Z
+.field private Az:Lokhttp3/WebSocket;
 
 .field private final backoff:Lcom/discord/utilities/networking/Backoff;
 
@@ -70,7 +70,7 @@
 
 .field public final token:Ljava/lang/String;
 
-.field public final yO:Ljava/lang/String;
+.field public final yQ:Ljava/lang/String;
 
 
 # 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;->AJ:Lcom/discord/rtcconnection/socket/a$a;
+    sput-object v0, Lcom/discord/rtcconnection/socket/a;->AK:Lcom/discord/rtcconnection/socket/a$a;
 
     return-void
 .end method
@@ -135,11 +135,11 @@
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    sget p2, Lcom/discord/rtcconnection/socket/a;->zb:I
+    sget p2, Lcom/discord/rtcconnection/socket/a;->ze:I
 
     add-int/lit8 p2, p2, 0x1
 
-    sput p2, Lcom/discord/rtcconnection/socket/a;->zb:I
+    sput p2, Lcom/discord/rtcconnection/socket/a;->ze: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;->yO:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->Aw()Lcom/google/gson/Gson;
+    invoke-virtual {p1}, Lcom/google/gson/f;->Az()Lcom/google/gson/Gson;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->Ax:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->Ay: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;->AK:I
+    sget p1, Lcom/discord/rtcconnection/socket/a$b;->AL:I
 
-    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eJ()Ljava/util/TimerTask;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AD:Ljava/util/TimerTask;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -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;->AA:I
+    iput p1, p0, Lcom/discord/rtcconnection/socket/a;->AB: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;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AF:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/lang/Long;
 
     const/4 v0, 0x1
 
@@ -361,7 +361,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->Az:Z
+    iput-boolean p1, p0, Lcom/discord/rtcconnection/socket/a;->AA: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;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -390,7 +390,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AC:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AD:Ljava/lang/Long;
 
-    iget-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AD:Ljava/util/TimerTask;
+    iget-object p1, p0, Lcom/discord/rtcconnection/socket/a;->AF: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;->eF()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()V
 
     return-void
 .end method
@@ -463,7 +463,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AB:Ljava/lang/Long;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AC: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->c(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;->AK:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AL:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AB: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     new-instance p0, Ljava/lang/StringBuilder;
 
@@ -801,13 +825,13 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Ay:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->Ay:Lokhttp3/WebSocket;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
 
     return-object p0
 .end method
@@ -860,13 +884,13 @@
 
     move-object v0, p0
 
-    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v1, v0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -883,7 +907,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;->yO:Ljava/lang/String;
+    iget-object v9, v0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -923,17 +947,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;->AZ:Lcom/discord/rtcconnection/socket/a$y;
+    sget-object v1, Lcom/discord/rtcconnection/socket/a$y;->Ba:Lcom/discord/rtcconnection/socket/a$y;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0, v1}, Lcom/discord/rtcconnection/socket/a;->h(Lkotlin/jvm/functions/Function1;)V
 
-    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AP:I
+    sget v1, Lcom/discord/rtcconnection/socket/a$b;->AQ:I
 
-    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iput v1, v0, Lcom/discord/rtcconnection/socket/a;->AB:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eD()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eF()V
 
     return-void
 .end method
@@ -941,7 +965,7 @@
 .method public static final synthetic c(Lcom/discord/rtcconnection/socket/a;)I
     .locals 0
 
-    iget p0, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iget p0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
 
     return p0
 .end method
@@ -999,13 +1023,13 @@
 
     move-object/from16 v3, p3
 
-    iget-boolean v4, v0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v4, v0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->yO:Ljava/lang/String;
+    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -1062,7 +1086,7 @@
 
     invoke-virtual {v0, v4}, Lcom/discord/rtcconnection/socket/a;->h(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/socket/a;->eE()V
+    invoke-direct/range {p0 .. p0}, Lcom/discord/rtcconnection/socket/a;->eG()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;->AF:Ljava/lang/Long;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->AG: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;->Az: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;->yO: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;->AA: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;->yQ: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;->Ba: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;->Bb:Lcom/discord/rtcconnection/socket/a$z;
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
     invoke-direct {p0, v3}, Lcom/discord/rtcconnection/socket/a;->c(Lkotlin/jvm/functions/Function1;)V
 
-    sget v3, Lcom/discord/rtcconnection/socket/a$b;->AN:I
+    sget v3, Lcom/discord/rtcconnection/socket/a$b;->AO:I
 
-    iput v3, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iput v3, p0, Lcom/discord/rtcconnection/socket/a;->AB: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;->AA: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;->AB:Ljava/lang/Long;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->AC:Ljava/lang/Long;
 
     return-object p0
 .end method
 
-.method private final eD()V
+.method private final eF()V
     .locals 13
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->yO:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->Ay:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AU:Lcom/discord/rtcconnection/socket/a$g;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$g;->AV: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;->AB:Ljava/lang/Long;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AC:Ljava/lang/Long;
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH: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;->AG:Ljava/util/TimerTask;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH: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;->AG:Ljava/util/TimerTask;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->AH: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->FA()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->FD()Lokhttp3/t;
 
     move-result-object v0
 
@@ -1368,7 +1423,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object v1
 
@@ -1380,9 +1435,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Ay:Lokhttp3/WebSocket;
+    iput-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az:Lokhttp3/WebSocket;
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$i;->AV:Lcom/discord/rtcconnection/socket/a$i;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$i;->AW:Lcom/discord/rtcconnection/socket/a$i;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1391,7 +1446,7 @@
     return-void
 .end method
 
-.method private final eE()V
+.method private final eG()V
     .locals 1
 
     const/4 v0, 0x0
@@ -1402,25 +1457,25 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->Az:Z
+    iput-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AA:Z
 
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AK:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AL:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
 
     return-void
 .end method
 
-.method private final eF()V
-    .locals 9
+.method private final eH()V
+    .locals 10
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->eG()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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->eI()V
+
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AD: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;->eJ()Ljava/util/TimerTask;
+
+    move-result-object v2
+
+    iput-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AF: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;->AF: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;->AW: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;->yQ: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;->AJ: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;->yQ: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;->AX: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AC: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;->eH()Ljava/util/TimerTask;
-
-    move-result-object v2
-
-    iput-object v2, p0, Lcom/discord/rtcconnection/socket/a;->AD: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;->AD: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 eG()V
+.method private final eI()V
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
@@ -1590,7 +1674,7 @@
     return-void
 .end method
 
-.method private final eH()Ljava/util/TimerTask;
+.method private final eJ()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;->yO:Ljava/lang/String;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->Ax:Lcom/google/gson/Gson;
+    iget-object p0, p0, Lcom/discord/rtcconnection/socket/a;->Ay: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;->eG()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eI()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;->eF()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()V
 
     return-void
 .end method
@@ -1663,7 +1747,7 @@
 
     move-object/from16 v2, p2
 
-    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->Ay:Lokhttp3/WebSocket;
+    iget-object v3, v0, Lcom/discord/rtcconnection/socket/a;->Az: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;->Ax:Lcom/google/gson/Gson;
+    iget-object v4, v0, Lcom/discord/rtcconnection/socket/a;->Ay: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;->yO:Ljava/lang/String;
+    iget-object v6, v0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     const-string v7, "sending: "
 
@@ -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;->yO:Ljava/lang/String;
+    iget-object v12, v0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1750,13 +1834,13 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     const/4 v4, 0x0
 
@@ -1771,13 +1855,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Ay:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AD:Ljava/util/TimerTask;
+    iget-object p3, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
 
     invoke-virtual {p3}, Ljava/util/TimerTask;->cancel()Z
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eH()Ljava/util/TimerTask;
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eJ()Ljava/util/TimerTask;
 
     move-result-object p3
 
-    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a;->AD:Ljava/util/TimerTask;
+    iput-object p3, p0, Lcom/discord/rtcconnection/socket/a;->AF: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;->AD:Ljava/util/TimerTask;
+    iget-object p4, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
 
     invoke-virtual {p3, p4, p1, p2}, Ljava/util/Timer;->schedule(Ljava/util/TimerTask;J)V
 
@@ -1827,7 +1911,7 @@
     :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;->yO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->yO:Ljava/lang/String;
+    iget-object v8, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AS:Lcom/discord/rtcconnection/socket/a$e;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$e;->AT:Lcom/discord/rtcconnection/socket/a$e;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0, v0}, Lcom/discord/rtcconnection/socket/a;->h(Lkotlin/jvm/functions/Function1;)V
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eE()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eG()V
 
-    sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->AT:Lcom/discord/rtcconnection/socket/a$f;
+    sget-object v0, Lcom/discord/rtcconnection/socket/a$f;->AU:Lcom/discord/rtcconnection/socket/a$f;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -1905,10 +1989,10 @@
     return-void
 .end method
 
-.method public final eC()Z
+.method public final eE()Z
     .locals 9
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v3, p0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     const/4 v5, 0x0
 
@@ -1931,15 +2015,15 @@
     return v1
 
     :cond_0
-    iget v0, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iget v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
 
-    sget v2, Lcom/discord/rtcconnection/socket/a$b;->AK:I
+    sget v2, Lcom/discord/rtcconnection/socket/a$b;->AL: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;->yO:Ljava/lang/String;
+    iget-object v4, p0, Lcom/discord/rtcconnection/socket/a;->yQ:Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -1954,11 +2038,11 @@
     return v1
 
     :cond_1
-    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AL:I
+    sget v0, Lcom/discord/rtcconnection/socket/a$b;->AM:I
 
-    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AA:I
+    iput v0, p0, Lcom/discord/rtcconnection/socket/a;->AB:I
 
-    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eD()V
+    invoke-direct {p0}, Lcom/discord/rtcconnection/socket/a;->eF()V
 
     const/4 v0, 0x1
 
@@ -1978,13 +2062,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AH:Z
+    iget-boolean v0, p0, Lcom/discord/rtcconnection/socket/a;->AJ: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;->yO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/rtcconnection/socket/a;->yQ: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;->AD:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AF:Ljava/util/TimerTask;
 
     invoke-virtual {v0}, Ljava/util/TimerTask;->cancel()Z
 
-    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AG:Ljava/util/TimerTask;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->AH: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;->Ay:Lokhttp3/WebSocket;
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Az: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;->Ay:Lokhttp3/WebSocket;
+    iput-object p1, p0, Lcom/discord/rtcconnection/socket/a;->Az: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    iget-object v0, p0, Lcom/discord/rtcconnection/socket/a;->Ay: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 be88a5ae44..6eaa02fcd4 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/l;->areEqual(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$b.smali b/com.discord/smali/com/discord/samsung/SamsungConnectActivity$b.smali
index 8ff24255ba..6e92668266 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 Bg:Lcom/discord/samsung/SamsungConnectActivity;
+.field final synthetic Bh:Lcom/discord/samsung/SamsungConnectActivity;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Bh: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -281,7 +281,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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$b;->Bh: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 41b125d21a..947e9edbaa 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 Bg:Lcom/discord/samsung/SamsungConnectActivity;
+.field final synthetic Bh:Lcom/discord/samsung/SamsungConnectActivity;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object v3, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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;->Bg:Lcom/discord/samsung/SamsungConnectActivity;
+    iget-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity$c;->Bh: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 0e3f0a66b5..3d6913eafb 100644
--- a/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
+++ b/com.discord/smali/com/discord/samsung/SamsungConnectActivity.smali
@@ -12,13 +12,13 @@
 
 
 # static fields
-.field public static final Bf:Lcom/discord/samsung/SamsungConnectActivity$a;
+.field public static final Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
 
 
 # instance fields
-.field private Bd:Lcom/a/a/a/a;
+.field private Be:Lcom/a/a/a/a;
 
-.field private final Be:Lcom/discord/samsung/SamsungConnectActivity$c;
+.field private final Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
 
 .field private serviceBound:Z
 
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/samsung/SamsungConnectActivity$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/samsung/SamsungConnectActivity;->Bf:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sput-object v0, Lcom/discord/samsung/SamsungConnectActivity;->Bg: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;->Be:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iput-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 .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;->Bd:Lcom/a/a/a/a;
+    iget-object p0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Be:Lcom/a/a/a/a;
 
     if-nez p0, :cond_0
 
@@ -209,7 +209,7 @@
 
     check-cast p1, Lcom/a/a/a/a;
 
-    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bd:Lcom/a/a/a/a;
+    iput-object p1, p0, Lcom/discord/samsung/SamsungConnectActivity;->Be:Lcom/a/a/a/a;
 
     new-instance p1, Landroid/content/Intent;
 
@@ -237,7 +237,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -254,7 +254,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Be:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bf:Lcom/discord/samsung/SamsungConnectActivity$c;
 
     check-cast v0, Landroid/content/ServiceConnection;
 
@@ -266,7 +266,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v2, 0x0
 
@@ -291,7 +291,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Be:Lcom/discord/samsung/SamsungConnectActivity$c;
+    iget-object v0, p0, Lcom/discord/samsung/SamsungConnectActivity;->Bf: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 0048e94747..ed7ea2eaa1 100644
--- a/com.discord/smali/com/discord/samsung/a$b.smali
+++ b/com.discord/smali/com/discord/samsung/a$b.smali
@@ -109,7 +109,7 @@
 
     check-cast p1, Lcom/discord/samsung/a$b;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/samsung/a$b;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -147,7 +147,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object p1
 
@@ -159,11 +159,11 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lokhttp3/e;->Fa()Lokhttp3/Response;
+    invoke-interface {p1}, Lokhttp3/e;->Fd()Lokhttp3/Response;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/samsung/a;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc: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 055a20c8a5..47c8f5bb42 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;->eJ()Lrx/Observable;
+    value = Lcom/discord/samsung/a;->eL()Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final Bc:Lcom/discord/samsung/a$c;
+.field public static final Bd: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;->Bc:Lcom/discord/samsung/a$c;
+    sput-object v0, Lcom/discord/samsung/a$c;->Bd: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;->Bb:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eI()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eK()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 6b5c844036..09e7428940 100644
--- a/com.discord/smali/com/discord/samsung/a$d.smali
+++ b/com.discord/smali/com/discord/samsung/a$d.smali
@@ -125,7 +125,7 @@
 
     check-cast p1, Lcom/discord/samsung/a$d;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/samsung/a$d;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -313,7 +313,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object p1
 
@@ -323,11 +323,11 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lokhttp3/e;->Fa()Lokhttp3/Response;
+    invoke-interface {p1}, Lokhttp3/e;->Fd()Lokhttp3/Response;
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/samsung/a;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc: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 4d04126320..2efe87b8cd 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 Bb:Lcom/discord/samsung/a;
+.field public static final Bc: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;->Bb:Lcom/discord/samsung/a;
+    sput-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
     :goto_1
     if-nez v4, :cond_4
 
-    invoke-virtual {p0}, Lokhttp3/Response;->zd()Z
+    invoke-virtual {p0}, Lokhttp3/Response;->zg()Z
 
     move-result v4
 
@@ -147,7 +147,7 @@
     :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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-static {p0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -193,7 +193,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DE()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
@@ -239,7 +239,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DE()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
@@ -335,7 +335,7 @@
     return-object v2
 .end method
 
-.method public static eI()Z
+.method public static eK()Z
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -364,7 +364,7 @@
     return v0
 .end method
 
-.method public static eJ()Lrx/Observable;
+.method public static eL()Lrx/Observable;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -391,7 +391,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/samsung/a$c;->Bc:Lcom/discord/samsung/a$c;
+    sget-object v1, Lcom/discord/samsung/a$c;->Bd:Lcom/discord/samsung/a$c;
 
     check-cast v1, Lrx/functions/b;
 
@@ -406,7 +406,7 @@
     return-object v0
 .end method
 
-.method public static eK()Landroid/content/Intent;
+.method public static eM()Landroid/content/Intent;
     .locals 3
 
     new-instance v0, Landroid/content/Intent;
@@ -430,7 +430,7 @@
     return-object v0
 .end method
 
-.method public static eL()Landroid/content/Intent;
+.method public static eN()Landroid/content/Intent;
     .locals 3
 
     sget-object v0, Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;->INSTANCE:Lcom/discord/utilities/intent/IntentUtils$RouteBuilders$Uris;
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 dfa054d81e..36ad842191 100644
--- a/com.discord/smali/com/discord/simpleast/a/a$a.smali
+++ b/com.discord/smali/com/discord/simpleast/a/a$a.smali
@@ -87,9 +87,9 @@
 
     check-cast v0, Ljava/util/Collection;
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v1
 
@@ -138,9 +138,9 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->BH:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BI:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eV()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eX()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
@@ -424,7 +424,7 @@
     move-object p1, v0
 
     :goto_4
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 26a52cd8f5..ed65c3161d 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;->BH:Lcom/discord/simpleast/a/a;
+    sget-object p1, Lcom/discord/simpleast/a/a;->BI:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eU()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eW()Ljava/util/regex/Pattern;
 
     move-result-object p1
 
@@ -170,7 +170,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 f9f8fc2786..930fa28556 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->BH:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BI:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eT()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eV()Ljava/util/regex/Pattern;
 
     move-result-object v0
 
@@ -188,7 +188,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 70492ccb62..537497aef4 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 BD:Ljava/util/regex/Pattern;
-
 .field private static final BE:Ljava/util/regex/Pattern;
 
 .field private static final BF:Ljava/util/regex/Pattern;
 
 .field private static final BG:Ljava/util/regex/Pattern;
 
-.field public static final BH:Lcom/discord/simpleast/a/a;
+.field private static final BH:Ljava/util/regex/Pattern;
+
+.field public static final BI:Lcom/discord/simpleast/a/a;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Lcom/discord/simpleast/a/a;-><init>()V
 
-    sput-object v0, Lcom/discord/simpleast/a/a;->BH:Lcom/discord/simpleast/a/a;
+    sput-object v0, Lcom/discord/simpleast/a/a;->BI:Lcom/discord/simpleast/a/a;
 
     const/4 v0, 0x0
 
@@ -47,7 +47,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/discord/simpleast/a/a;->BD:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/discord/simpleast/a/a;->BE:Ljava/util/regex/Pattern;
 
     const-string v1, "^\\s*(#+)[ \\t](.*) *(?=\\n|$)"
 
@@ -57,7 +57,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/discord/simpleast/a/a;->BE:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/discord/simpleast/a/a;->BF:Ljava/util/regex/Pattern;
 
     const-string v1, "^\\s*(.+)\\n *(=|-){3,} *(?=\\n|$)"
 
@@ -67,7 +67,7 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/discord/simpleast/a/a;->BF:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/a/a;->BG:Ljava/util/regex/Pattern;
 
     new-instance v0, Lkotlin/text/Regex;
 
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/simpleast/a/a;->BG:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/a/a;->BH:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -92,15 +92,7 @@
     return-void
 .end method
 
-.method public static eS()Ljava/util/regex/Pattern;
-    .locals 1
-
-    sget-object v0, Lcom/discord/simpleast/a/a;->BD:Ljava/util/regex/Pattern;
-
-    return-object v0
-.end method
-
-.method public static eT()Ljava/util/regex/Pattern;
+.method public static eU()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->BE:Ljava/util/regex/Pattern;
@@ -108,7 +100,7 @@
     return-object v0
 .end method
 
-.method public static eU()Ljava/util/regex/Pattern;
+.method public static eV()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->BF:Ljava/util/regex/Pattern;
@@ -116,10 +108,18 @@
     return-object v0
 .end method
 
-.method public static eV()Ljava/util/regex/Pattern;
+.method public static eW()Ljava/util/regex/Pattern;
     .locals 1
 
     sget-object v0, Lcom/discord/simpleast/a/a;->BG:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
+
+.method public static eX()Ljava/util/regex/Pattern;
+    .locals 1
+
+    sget-object v0, Lcom/discord/simpleast/a/a;->BH: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 c274adeb67..13246a0d89 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;->eO()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final Bx:Lcom/discord/simpleast/core/a/a$a;
+.field public static final By: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;->Bx:Lcom/discord/simpleast/core/a/a$a;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$a;->By: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 08ebf285d2..f87edb46e3 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;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->eS()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic By:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Bz: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;->By:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$b;->Bz: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 7dc9fbbd28..5092a00310 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 By:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Bz: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;->By:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$c;->Bz: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 fcadce495c..1bd86cfe06 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 By:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Bz: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;->By:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$d;->Bz: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 1141cc2649..1fd9a6a84e 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 Bz:Lkotlin/jvm/functions/Function0;
+.field final synthetic BA: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;->Bz:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$e;->BA: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;->Bz:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/simpleast/core/a/a$e;->BA: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 07dca885cc..39d0b3eb0f 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 BA:Lcom/discord/simpleast/core/a/a$f;
+.field public static final BB: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;->BA:Lcom/discord/simpleast/core/a/a$f;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$f;->BB: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 a1eb2401c0..219e372c21 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;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    value = Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field final synthetic By:Lcom/discord/simpleast/core/a/a;
+.field final synthetic Bz: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;->By:Lcom/discord/simpleast/core/a/a;
+    iput-object p1, p0, Lcom/discord/simpleast/core/a/a$g;->Bz: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 a969908857..1bf7618fb5 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 BB:Lcom/discord/simpleast/core/a/a$h;
+.field public static final BC: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;->BB:Lcom/discord/simpleast/core/a/a$h;
+    sput-object v0, Lcom/discord/simpleast/core/a/a$h;->BC: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 d559779e5f..97ae26460b 100644
--- a/com.discord/smali/com/discord/simpleast/core/a/a.smali
+++ b/com.discord/smali/com/discord/simpleast/core/a/a.smali
@@ -4,8 +4,6 @@
 
 
 # static fields
-.field private static final Bp:Ljava/util/regex/Pattern;
-
 .field private static final Bq:Ljava/util/regex/Pattern;
 
 .field private static final Br:Ljava/util/regex/Pattern;
@@ -18,7 +16,9 @@
 
 .field private static final Bv:Ljava/util/regex/Pattern;
 
-.field public static final Bw:Lcom/discord/simpleast/core/a/a;
+.field private static final Bw:Ljava/util/regex/Pattern;
+
+.field public static final Bx: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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bx: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;->Bp:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bq: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;->Bq:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Br: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;->Br:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bs: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;->Bs:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bt: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;->Bt:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bu: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;->Bu:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bv: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;->Bv:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/discord/simpleast/core/a/a;->Bw:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -138,23 +138,23 @@
     return-object v0
 .end method
 
-.method public static eM()Ljava/util/regex/Pattern;
+.method public static eO()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bp:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bq:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static eN()Ljava/util/regex/Pattern;
+.method public static eP()Ljava/util/regex/Pattern;
     .locals 1
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bt:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bu:Ljava/util/regex/Pattern;
 
     return-object v0
 .end method
 
-.method public static eO()Lcom/discord/simpleast/core/parser/Rule;
+.method public static eQ()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;->Bp:Ljava/util/regex/Pattern;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bq:Ljava/util/regex/Pattern;
 
     const-string v1, "PATTERN_BOLD"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a$a;->Bx:Lcom/discord/simpleast/core/a/a$a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a$a;->By:Lcom/discord/simpleast/core/a/a$a;
 
     check-cast v1, Lkotlin/jvm/functions/Function0;
 
@@ -187,7 +187,7 @@
     return-object v0
 .end method
 
-.method public static synthetic eR()Ljava/util/List;
+.method public static synthetic eT()Ljava/util/List;
     .locals 1
 
     const/4 v0, 0x1
@@ -220,19 +220,19 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eS()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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx: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;->Bs:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/discord/simpleast/core/a/a;->Bt: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;->eO()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eQ()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;->Bq:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Br:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_UNDERLINE"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a$h;->BB:Lcom/discord/simpleast/core/a/a$h;
+    sget-object v2, Lcom/discord/simpleast/core/a/a$h;->BC: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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx: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;->Bv:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/discord/simpleast/core/a/a;->Bw: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;->Br:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bs:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_STRIKETHRU"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/simpleast/core/a/a$f;->BA:Lcom/discord/simpleast/core/a/a$f;
+    sget-object v2, Lcom/discord/simpleast/core/a/a$f;->BB: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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object p0, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p0}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p0
 
@@ -316,7 +316,7 @@
 
 
 # virtual methods
-.method public final eP()Lcom/discord/simpleast/core/parser/Rule;
+.method public final eR()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;->Bt:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bu:Ljava/util/regex/Pattern;
 
     const-string v2, "PATTERN_TEXT"
 
@@ -347,7 +347,7 @@
     return-object v0
 .end method
 
-.method public final eQ()Lcom/discord/simpleast/core/parser/Rule;
+.method public final eS()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;->Bu:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bv: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 1cd42b9a9d..5362a438b9 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 BC:Lcom/discord/simpleast/core/a/b;
+.field public static final BD: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;->BC:Lcom/discord/simpleast/core/a/b;
+    sput-object v0, Lcom/discord/simpleast/core/a/b;->BD:Lcom/discord/simpleast/core/a/b;
 
     return-void
 .end method
@@ -84,7 +84,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eR()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eT()Ljava/util/List;
 
     move-result-object v1
 
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 5abc065968..b9d4f416f5 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 Bj:Lcom/discord/simpleast/core/node/StyleNode$b;
+.field public static final Bk: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;->Bj:Lcom/discord/simpleast/core/node/StyleNode$b;
+    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode$b;->Bk: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 c409e0d9cb..d4f80f9356 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 Bi:Lcom/discord/simpleast/core/node/StyleNode$a;
+.field public static final Bj:Lcom/discord/simpleast/core/node/StyleNode$a;
 
 
 # instance fields
-.field private final Bh:Ljava/util/List;
+.field private final Bi: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;->Bi:Lcom/discord/simpleast/core/node/StyleNode$a;
+    sput-object v0, Lcom/discord/simpleast/core/node/StyleNode;->Bj: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;->Bh:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/simpleast/core/node/StyleNode;->Bi: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;->Bh:Ljava/util/List;
+    iget-object p2, p0, Lcom/discord/simpleast/core/node/StyleNode;->Bi: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;->Bj:Lcom/discord/simpleast/core/node/StyleNode$b;
+    sget-object v1, Lcom/discord/simpleast/core/node/StyleNode$b;->Bk: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 a657e9a206..27812bb950 100644
--- a/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
+++ b/com.discord/smali/com/discord/simpleast/core/parser/ParseSpec.smali
@@ -25,11 +25,11 @@
 
 
 # static fields
-.field public static final Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+.field public static final Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
 
 # instance fields
-.field public final Bk:Lcom/discord/simpleast/core/node/Node;
+.field public final Bl:Lcom/discord/simpleast/core/node/Node;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -37,9 +37,9 @@
     .end annotation
 .end field
 
-.field final Bl:Z
+.field final Bm:Z
 
-.field final Bm:Ljava/lang/Object;
+.field final Bn:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TS;"
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field Bn:I
+.field Bo:I
 
 .field startIndex:I
 
@@ -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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sput-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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;->Bk:Lcom/discord/simpleast/core/node/Node;
+    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl:Lcom/discord/simpleast/core/node/Node;
 
-    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl:Z
+    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm: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;->Bk:Lcom/discord/simpleast/core/node/Node;
+    iput-object p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl:Lcom/discord/simpleast/core/node/Node;
 
-    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl:Z
+    iput-boolean p1, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Z
 
     iput p3, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->startIndex:I
 
-    iput p4, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:I
+    iput p4, p0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo: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 573fe795c8..cf7060b7f2 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;->Bn:I
+    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo: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;->Bn:I
+    iget v6, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
 
     invoke-interface {p1, v5, v6}, Ljava/lang/CharSequence;->subSequence(II)Ljava/lang/CharSequence;
 
@@ -470,7 +470,7 @@
 
     check-cast v8, Lcom/discord/simpleast/core/parser/Rule;
 
-    iget-object v9, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Ljava/lang/Object;
+    iget-object v9, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
 
     invoke-virtual {v8, v5, v3, v9}, Lcom/discord/simpleast/core/parser/Rule;->match(Ljava/lang/CharSequence;Ljava/lang/String;Ljava/lang/Object;)Ljava/util/regex/Matcher;
 
@@ -486,15 +486,15 @@
 
     add-int/2addr v3, v6
 
-    iget-object v5, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Ljava/lang/Object;
+    iget-object v5, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
 
     invoke-virtual {v8, v9, p0, v5}, Lcom/discord/simpleast/core/parser/Rule;->parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/Object;)Lcom/discord/simpleast/core/parser/ParseSpec;
 
     move-result-object v5
 
-    iget-object v7, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bk:Lcom/discord/simpleast/core/node/Node;
+    iget-object v7, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl:Lcom/discord/simpleast/core/node/Node;
 
-    iget-object v8, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bk:Lcom/discord/simpleast/core/node/Node;
+    iget-object v8, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl: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;->Bn:I
+    iget v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
 
     if-eq v3, v8, :cond_5
 
-    sget-object v8, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v8, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
-    iget-object v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm:Ljava/lang/Object;
+    iget-object v8, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:Ljava/lang/Object;
 
-    iget p2, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:I
+    iget p2, p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo: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;->Bl:Z
+    iget-boolean p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bm: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;->Bn:I
+    iget p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
 
     add-int/2addr p2, v6
 
-    iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bn:I
+    iput p2, v5, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:I
 
     invoke-virtual {v0, v5}, Ljava/util/Stack;->push(Ljava/lang/Object;)Ljava/lang/Object;
 
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 078cbb5932..e1465797b7 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9aaeb9ae92..ec923b09a5 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0dd3dd7c60..ec98f821f7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c3d5c3de49..abb48706b1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3b04373dff..1407bccbf4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3968491f84..270a7e196b 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 32fde0d425..3493449fa4 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 4887751b7c..c130f98850 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e919f7cfef..2094c7a240 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 2902b811cd..6c4ef531b2 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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..dd7987ffd5
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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 71f9f6f7b3..7c872b3af1 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d2d80e8ea3..834fdca8dc 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -1356,11 +1356,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/aq;->JD()Lrx/internal/a/aq;
+    invoke-static {}, Lrx/internal/a/aq;->JG()Lrx/internal/a/aq;
 
     move-result-object v0
 
@@ -1479,6 +1479,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/l;->checkParameterIsNotNull(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 trackChannelOpened(J)V
     .locals 3
     .annotation runtime Lcom/discord/stores/StoreThread;
diff --git a/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali b/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali
index 7bc7aed605..0560de7416 100644
--- a/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAndroidPackages$1$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreAndroidPackages$1$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali b/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
index 6072266a8b..82b2831aa3 100644
--- a/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
+++ b/com.discord/smali/com/discord/stores/StoreAndroidPackages.smali
@@ -51,7 +51,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreAndroidPackages;->installedPackagesSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -198,7 +198,7 @@
 
     move-object v2, p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -243,7 +243,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreAndroidPackages;->installedPackagesSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 438a365c5d..dee57ae02d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0f07d3806f..23ad5f93e8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d302dadfcb..1d443c3be3 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e4860a304d..06e60fed1a 100644
--- a/com.discord/smali/com/discord/stores/StoreApplication.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplication.smali
@@ -315,7 +315,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 3661899c0b..97c6ad5c5b 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d7dd84f812..527ee5939e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 694525f8a2..87c27905e5 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 7cc8a7af61..3f4d6e592a 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 97d3abda98..861ebaee5e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 8531ea0390..a67a3c6b05 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c5c1db9c96..6154816de8 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 4880d1cdb2..b7291a685a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreamPreviews.smali
index 7f97c01d08..2cc026c230 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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..736c468955
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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..0ca960a322
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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..6eb097a58c
--- /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/l;->throwUninitializedPropertyAccessException(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/l;->throwUninitializedPropertyAccessException(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/l;->checkParameterIsNotNull(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/l;->throwUninitializedPropertyAccessException(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/l;->checkParameterIsNotNull(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/l;->throwUninitializedPropertyAccessException(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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..0fc31ce0a3
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final 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..0ddc3981c2
--- /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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final 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..37a1874f48
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcStreams"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "rtcStreams"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final 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 8f9ea4e364..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/l;->checkExpressionValueIsNotNull(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 2d4c0eac95..acbe5a7a4e 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 72%
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 b5a35b9d08..7faeb05db7 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    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-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 72%
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 670481c1bc..42f156cb30 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    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-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
index 3f13601b73..bdae8507c0 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "voiceChannelSelectedStore"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "storeStream"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;->bD(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/StreamDelete;->getUnavailable()Z
+
+    move-result 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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->throwNpe()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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->areEqual(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/l;->checkExpressionValueIsNotNull(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$Configuration.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
index e19fe4b5a3..dfe3a94835 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "outputMode"
+    const-string v0, "streamConnectionState"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "audioOutputState"
+    const-string v0, "outputMode"
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "audioOutputState"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "outputMode"
+    const-string v0, "streamConnectionState"
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v0, "audioOutputState"
+    const-string v0, "outputMode"
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "audioOutputState"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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,15 +366,33 @@
 
     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
@@ -326,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 ee06fb7e0a..c7ccfeceba 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;->zs: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;->zv: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 8f614be2a4..7667231b2e 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "p4"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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 f2353cc7f0..fe16faec28 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0.smali
rename to com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
index 7243b3a2a5..824ec6f22a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0;
+.class final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;
 .super Ljava/lang/Object;
-.source "WidgetChatListAdapterItemGameInvite.kt"
+.source "StoreAudioManager.kt"
 
 # interfaces
 .implements Lrx/functions/Func5;
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
+    iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
 
     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;)Ljava/lang/Object;
     .locals 6
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
+    iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
 
     move-object v1, p1
 
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
index 9e5493c540..b622576e50 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "streamRtcConnectionStore"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 a34c85ea1d..ebc5c02928 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 52cf28c61c..82e2741142 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a876dd98ec..371be44bd9 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 904022cae3..51c38c1e43 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 5d94625ce2..ba466f1ad0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 31ba582885..f1ba7530c6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 71c53e0ada..bef1d0ca15 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 03e67dfb0e..8bb6792596 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d9c67eec79..322dcf7dee 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cc9b3bce8d..351a425de3 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -1340,7 +1340,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 3b1a81f117..f66725cf99 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2e9a702cb4..2aa3b958d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ed52890360..151fcee92c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c8f3aeb204..5533e00e46 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6cd3940d21..7b310c2a2c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7633b4cec3..e1592ae83f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 68c3add68c..c7b44f8753 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cdb1b3fbed..8d0a3ad8b2 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -105,7 +105,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/subjects/SerializedSubject;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -429,7 +429,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->tokenSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -465,7 +465,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->fingerprintSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -676,7 +676,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->userInitiatedAuthEventSubject:Lrx/subjects/PublishSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 c75d7b3358..a78e0bedcc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 40cccb343d..30fe44e4ff 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 4f3201b974..bd6387eeb5 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 9c069465f5..750f8f7ba7 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$1.smali
@@ -61,7 +61,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 e2ecb9ee6d..b397ee5e2d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a418f3c4f0..d212b4a8bf 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$2$3;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali b/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
index 006de56e5e..e11055573d 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$2.smali
@@ -81,7 +81,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreCalls$call$2;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 d65898d27b..c379087edc 100644
--- a/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreCalls$call$5.smali
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreCalls$call$5;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fc3598b1ca..3af76cf211 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 79f75a5afc..b0e09a3153 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fc8dc41b72..76a20857de 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a337fbfeb8..d70e1169ef 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -424,7 +424,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v1
 
@@ -492,7 +492,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
index 7b895822ca..0741cb549e 100644
--- a/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
+++ b/com.discord/smali/com/discord/stores/StoreCallsIncoming.smali
@@ -303,7 +303,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 11ea2c1734..cdea5b21a6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ebe0907a4a..daded7fa58 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 da827338b9..1e8f63a837 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, 0x7f1203a0
+    const v4, 0x7f1203c5
 
     invoke-virtual {v0, p1, v4, v1}, Lcom/discord/utilities/StringUtils;->getStringByLocale(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
 
@@ -277,7 +277,7 @@
     goto :goto_2
 
     :cond_4
-    const p2, 0x7f1203a1
+    const p2, 0x7f1203c6
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -356,7 +356,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -424,7 +424,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1203a1
+    const v0, 0x7f1203c6
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
index df86c410c0..34f4438f24 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -360,7 +360,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$1.smali
index ebdae9d69f..bdebaed626 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 63029e53c5..7d81917113 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$MemberListUpdateLogger.smali
@@ -172,7 +172,7 @@
 
     invoke-static {p1}, Lcom/crashlytics/android/a;->log(Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 9c5dd73828..90b2e58756 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 14ce4cad98..73a1c3bb55 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, 0x7f1210e4
+    const v0, 0x7f12116b
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -120,7 +120,7 @@
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f1210e5
+    const v0, 0x7f12116c
 
     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 73f1ed3040..40dac7e5ff 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -163,7 +163,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance p2, Lcom/discord/stores/StoreChannelMembersLazy$1;
 
@@ -1070,7 +1070,7 @@
 
     :cond_4
     :goto_2
-    sget-object v5, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1195,7 +1195,7 @@
 
     move-result-object p3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p4
 
@@ -1473,7 +1473,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreChannelMembersLazy;->flushTrigger:Lrx/subjects/PublishSubject;
 
-    sget-object v1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy: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$3$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$addGroupRecipients$3$2.smali
index d842b59113..35f58580cb 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
 
-    sget-object v0, Lrx/internal/a/ba$a;->bKN:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKX:Lrx/internal/a/ba;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
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 e892c70a2f..0711590de5 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
 
-    sget-object v1, Lrx/internal/a/ba$a;->bKN:Lrx/internal/a/ba;
+    sget-object v1, Lrx/internal/a/ba$a;->bKX:Lrx/internal/a/ba;
 
     invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
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 d0ea551dbb..9e25a992e0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
index 074705a6a8..7d24cb072b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -79,12 +79,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f12038c
+    const p1, 0x7f1203b1
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203b1
+    const p1, 0x7f1203d6
 
     :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 e94e401da6..fc546fec67 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;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -750,7 +750,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -958,7 +958,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -995,7 +995,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1031,7 +1031,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1136,7 +1136,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 4a7f1ac228..70c9b72168 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 c8cb443f78..76f004536f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c61245dd09..10d6a61f99 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0ed93c9877..179f473d65 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d393d5fa1e..276448738c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, "/2131231388"
+    const-string v1, "/2131231400"
 
     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 14315d9795..0141b7df49 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v12, Lcom/discord/app/AppLog;->vm: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 81afcf57d5..53d3bc0168 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali
index c591bdb04b..18ab2fc953 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$handleSelectChannelId$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreChannelsSelected$handleSelectChannelId$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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 b231645e14..c562ed792f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5691d6d4b6..c3a89089a5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 15b6d51020..0e7611686c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0aa5bc6fe9..4b2c807e29 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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;->bhF:Lkotlin/properties/a;
+    sget-object p1, Lkotlin/properties/a;->bhP:Lkotlin/properties/a;
 
     new-instance p1, Lcom/discord/stores/StoreChannelsSelected$$special$$inlined$observable$1;
 
@@ -278,7 +278,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 861e8dc6f3..47c2cf8af7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c4a4a96d86..420409ae93 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -234,7 +234,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -313,7 +313,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 72d83b23e6..28d3236b50 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cac885a218..b2f21b2b55 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bab9f9322b..a077ab705d 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, 0x3cd
+    const/16 v0, 0x3ce
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
@@ -149,7 +149,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     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 7ea12f5f56..2440019c09 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 802ce0c7aa..61b6e5014b 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
@@ -53,13 +53,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQT:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iget-object v1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQT:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
-    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEm:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEv:Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
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 867ece3aab..d5c2a2fb8b 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;->zY()Lcom/google/firebase/dynamiclinks/a;
+    invoke-static {}, Lcom/google/firebase/dynamiclinks/a;->Ab()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 e2ba5c2279..83a3d873bb 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9bec210981..b48b38ce95 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;->xf:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     const-string v0, "uri"
 
@@ -85,7 +85,7 @@
 
     if-eqz v0, :cond_4
 
-    sget-object v0, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dV()Lkotlin/text/Regex;
 
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 fed287221a..621e0173d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 970f8a9750..f9e43c3301 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-object p1, Lrx/Emitter$a;->bFX:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
 
@@ -250,7 +250,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 f603be33ee..97f687fbd2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f537cc813f..7288536d7f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 acfa07a64e..6fcbec1db3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 17257f6b4d..9e92bed00d 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji.smali
@@ -1037,7 +1037,7 @@
 
     move-result-object p3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p4
 
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 e79904bbbb..471cbc5b8a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 079d507203..3c4e1991b9 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
@@ -408,7 +408,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -627,7 +627,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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9c26cbe20c..335b046767 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 af823673ae..98cf17a68b 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cfd9f2428c..831bb3740a 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 cb90bde872..a747ebd9b6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e8fe377147..644357751d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 4f8233afcc..df47c41d41 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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
index 0f121580b1..0d253f0d5d 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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
index 2815b84016..de12a48887 100644
--- 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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
index 47ebc64eb9..be22413e48 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 41897b82d0..b21b5f15af 100644
--- 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
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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
index 767a09c852..71738a67a6 100644
--- a/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3.smali
@@ -56,7 +56,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreEntitlements$Actions$fetchMyEntitlementsForApplication$3;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 640bff46b5..c51b0838bf 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 74e31a57fb..4a0f03cf9c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e8b5e5c5d2..51e71b4c38 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9ac3bdc2f3..8588d34611 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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 2e2cd21ad1..2d6598b351 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 60b441c035..f55569e370 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ed8227e46b..4c265a1730 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments.smali b/com.discord/smali/com/discord/stores/StoreExperiments.smali
index b2c0a5c6d6..3df796bc40 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments.smali
@@ -802,7 +802,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -896,7 +896,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreGameParty.smali b/com.discord/smali/com/discord/stores/StoreGameParty.smali
index 7792b2e0c7..036f985fbc 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 399f31bedc..71fa53574b 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection$ClientState$Companion.smali
@@ -127,7 +127,7 @@
 
     move-result-object p1
 
-    sget-object v2, Lcom/discord/app/g;->vJ:Lcom/discord/app/g;
+    sget-object v2, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-static {}, Lcom/discord/app/g;->dK()Lrx/Observable;
 
@@ -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 7e475a4778..f945852703 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7393ba5947..b74340355d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4a5c7d20a5..9b9294c008 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4e192ccfe9..678a09a3c6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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..dd205c7c5e
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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..6ec40023ce
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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 a655b78d46..134eee02f1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 74c16cc3bc..6906aa7506 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 460be0bad7..b8398d1d1e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ab979b0b90..bd41cd7582 100644
--- a/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreGatewayConnection.smali
@@ -403,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 = {
@@ -585,7 +629,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -597,7 +641,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -609,7 +653,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -621,7 +665,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -633,7 +677,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -645,7 +689,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -657,7 +701,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -669,7 +713,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -681,7 +725,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -693,7 +737,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -705,7 +749,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -717,7 +761,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -729,7 +773,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -741,7 +785,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -753,7 +797,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -765,7 +809,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -777,7 +821,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -789,7 +833,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -801,7 +845,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -813,7 +857,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -825,7 +869,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -837,7 +881,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -849,7 +893,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -861,7 +905,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -873,7 +917,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -885,7 +929,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -897,7 +941,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -909,7 +953,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -921,7 +965,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -933,7 +977,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -945,7 +989,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -957,7 +1001,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -969,7 +1013,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -981,7 +1025,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -993,7 +1037,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1005,7 +1049,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1017,7 +1061,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1029,7 +1073,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1041,7 +1085,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1053,7 +1097,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1065,7 +1109,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1077,7 +1121,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1089,7 +1133,7 @@
 
     new-instance p1, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -1099,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;->Kz()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;->Kz()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;->Kz()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;->Kz()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
 
@@ -1180,7 +1272,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
+    sget-object v1, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
 
     invoke-static {}, Lcom/discord/app/App;->dx()Z
 
@@ -1202,7 +1294,7 @@
     move-object v12, v1
 
     :goto_0
-    sget-object v1, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
+    sget-object v1, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
 
     invoke-static {}, Lcom/discord/app/App;->dx()Z
 
@@ -1239,7 +1331,7 @@
 
     iget-object v7, p0, Lcom/discord/stores/StoreGatewayConnection;->scheduler:Lrx/Scheduler;
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v8, v2
 
@@ -1670,7 +1762,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connected:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1698,7 +1790,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreGatewayConnection;->connectionReady:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -2144,6 +2236,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;
@@ -2397,6 +2557,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
@@ -2405,9 +2580,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
@@ -2422,7 +2597,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
@@ -2437,7 +2612,7 @@
 
     return-void
 
-    :sswitch_3
+    :sswitch_4
     const-string v0, "PRESENCES_REPLACE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2452,7 +2627,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
@@ -2467,7 +2657,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
@@ -2482,7 +2687,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
@@ -2497,7 +2702,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
@@ -2508,13 +2713,13 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreGatewayConnection;->userConnectionUpdate:Lrx/subjects/SerializedSubject;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy: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
@@ -2530,7 +2735,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
@@ -2545,7 +2750,7 @@
 
     return-void
 
-    :sswitch_a
+    :sswitch_d
     const-string v0, "MESSAGE_ACK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2560,7 +2765,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
@@ -2575,7 +2780,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
@@ -2590,7 +2795,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
@@ -2605,7 +2810,7 @@
 
     return-void
 
-    :sswitch_e
+    :sswitch_11
     const-string v0, "MESSAGE_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2616,7 +2821,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
@@ -2631,7 +2836,7 @@
 
     return-void
 
-    :sswitch_10
+    :sswitch_13
     const-string v0, "USER_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2646,7 +2851,7 @@
 
     return-void
 
-    :sswitch_11
+    :sswitch_14
     const-string v0, "CALL_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2655,9 +2860,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
@@ -2668,7 +2873,22 @@
 
     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
@@ -2683,7 +2903,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
@@ -2694,7 +2914,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
@@ -2710,7 +2930,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
@@ -2725,7 +2945,7 @@
 
     return-void
 
-    :sswitch_17
+    :sswitch_1b
     const-string v0, "CHANNEL_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2736,7 +2956,7 @@
 
     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
@@ -2751,7 +2971,7 @@
 
     return-void
 
-    :sswitch_19
+    :sswitch_1d
     const-string v0, "CALL_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2766,7 +2986,7 @@
 
     return-void
 
-    :sswitch_1a
+    :sswitch_1e
     const-string v0, "CALL_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2782,7 +3002,7 @@
 
     return-void
 
-    :sswitch_1b
+    :sswitch_1f
     const-string v0, "GUILD_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2797,7 +3017,7 @@
 
     return-void
 
-    :sswitch_1c
+    :sswitch_20
     const-string v0, "GUILD_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2813,7 +3033,7 @@
 
     return-void
 
-    :sswitch_1d
+    :sswitch_21
     const-string v0, "USER_PAYMENT_SOURCES_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2828,7 +3048,7 @@
 
     return-void
 
-    :sswitch_1e
+    :sswitch_22
     const-string v0, "TYPING_START"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2843,7 +3063,7 @@
 
     return-void
 
-    :sswitch_1f
+    :sswitch_23
     const-string v0, "CHANNEL_RECIPIENT_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2858,7 +3078,7 @@
 
     return-void
 
-    :sswitch_20
+    :sswitch_24
     const-string v0, "CHANNEL_DELETE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2873,7 +3093,7 @@
 
     return-void
 
-    :sswitch_21
+    :sswitch_25
     const-string v0, "CHANNEL_CREATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2889,7 +3109,7 @@
 
     return-void
 
-    :sswitch_22
+    :sswitch_26
     const-string v0, "RELATIONSHIP_REMOVE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2904,7 +3124,7 @@
 
     return-void
 
-    :sswitch_23
+    :sswitch_27
     const-string v0, "USER_SETTINGS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2919,7 +3139,7 @@
 
     return-void
 
-    :sswitch_24
+    :sswitch_28
     const-string v0, "GUILD_INTEGRATIONS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2934,7 +3154,7 @@
 
     return-void
 
-    :sswitch_25
+    :sswitch_29
     const-string v0, "PRESENCE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2949,7 +3169,7 @@
 
     return-void
 
-    :sswitch_26
+    :sswitch_2a
     const-string v0, "USER_NOTE_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2964,7 +3184,7 @@
 
     return-void
 
-    :sswitch_27
+    :sswitch_2b
     const-string v0, "USER_SUBSCRIPTIONS_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2977,9 +3197,9 @@
 
     invoke-virtual {p1, p2}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    goto/16 :goto_6
+    return-void
 
-    :sswitch_28
+    :sswitch_2c
     const-string v0, "GUILD_MEMBER_LIST_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -2994,7 +3214,7 @@
 
     return-void
 
-    :sswitch_29
+    :sswitch_2d
     const-string v0, "MESSAGE_REACTION_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3009,7 +3229,7 @@
 
     return-void
 
-    :sswitch_2a
+    :sswitch_2e
     const-string v0, "GUILD_MEMBER_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3025,7 +3245,7 @@
 
     return-void
 
-    :sswitch_2b
+    :sswitch_2f
     const-string v0, "GUILD_BAN_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3040,7 +3260,7 @@
 
     return-void
 
-    :sswitch_2c
+    :sswitch_30
     const-string v0, "RELATIONSHIP_ADD"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3055,7 +3275,7 @@
 
     return-void
 
-    :sswitch_2d
+    :sswitch_31
     const-string v0, "USER_REQUIRED_ACTION_UPDATE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3070,7 +3290,7 @@
 
     return-void
 
-    :sswitch_2e
+    :sswitch_32
     const-string v0, "MESSAGE_REACTION_REMOVE_ALL"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3085,7 +3305,7 @@
 
     return-void
 
-    :sswitch_2f
+    :sswitch_33
     const-string v0, "GUILD_MEMBERS_CHUNK"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3100,7 +3320,7 @@
 
     return-void
 
-    :sswitch_30
+    :sswitch_34
     const-string v0, "SESSIONS_REPLACE"
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -3121,55 +3341,59 @@
 
     :sswitch_data_0
     .sparse-switch
-        -0x78ca470e -> :sswitch_30
-        -0x6cd113e5 -> :sswitch_2f
-        -0x5c91e13c -> :sswitch_2e
-        -0x57767eba -> :sswitch_2d
-        -0x4f1a5206 -> :sswitch_2c
-        -0x4b2dfc3b -> :sswitch_2b
-        -0x4a71b2b8 -> :sswitch_2a
-        -0x49d2993d -> :sswitch_29
-        -0x47a432af -> :sswitch_28
-        -0x3a1461ba -> :sswitch_27
-        -0x394108be -> :sswitch_26
-        -0x35d8e373 -> :sswitch_25
-        -0x32448a83 -> :sswitch_24
-        -0x2e5f9c0f -> :sswitch_23
-        -0x2ad96395 -> :sswitch_22
-        -0x283cac28 -> :sswitch_21
-        -0x273bc779 -> :sswitch_20
-        -0x20ab369a -> :sswitch_1f
-        -0x1e714c86 -> :sswitch_1e
-        -0x11eeea43 -> :sswitch_1d
-        -0x10511518 -> :sswitch_1c
-        -0xf503069 -> :sswitch_1b
-        -0xdeca603 -> :sswitch_1a
-        -0xcebc154 -> :sswitch_19
-        -0xc585f03 -> :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
 
@@ -3206,7 +3430,7 @@
 
     check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zq:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt:Z
 
     if-eqz p1, :cond_0
 
@@ -3521,6 +3745,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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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 2eff52550c..512ffc8fc3 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ad64bd2c49..acfde70db7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 30ed3e55cc..e4a76a0180 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 696f6c8be5..5112fdbfc9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 87b4ec4017..304eb4b9b0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -96,7 +96,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kx()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 56b2daaf24..76dcd0849f 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 442c3ddddc..97f8a78a6f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 faeffcee99..1886e2d108 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 df82fbd693..f48b06beb8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fbc306d592..eeb97219e1 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 c98da0e2bd..bbb5ec50f1 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -84,7 +84,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm: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 6b11fd15a9..2a721b52e9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c5bfbd4382..8062e803d0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 468200a03d..89f471ac48 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fd72c26374..3bdce7afbc 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 79fd38e1d7..7faee9467a 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -84,7 +84,7 @@
 
     if-eq v0, v1, :cond_0
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm: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 c49bac2dc3..86666a9acc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 de74f6420d..9cdd1f3a6f 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0295c8c985..ffa051a9e5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 65f6443885..980b5184bf 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d10785f857..176b449a1a 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 90b91f5c25..b7c73e2a97 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 700384fdcc..fc22655d27 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c8a1a7d5ea..239cc378fe 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 756ec79a6d..25f9cd7078 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a961aaf92b..63c9f7b19e 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 669749806e..7a8589f2ca 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 07f3d6b73e..d3e32857df 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 782077beca..f295874b0c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 efdd4b74ed..3515c010fa 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 85ab14287e..ca0a226d65 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 3eda7c725b..5c25ef0d94 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0e126d702b..b95c8784c6 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildIntegrations.smali
@@ -265,7 +265,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreGuildIntegrations$requestGuildIntegrations$1;
 
@@ -323,7 +323,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -363,7 +363,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -420,7 +420,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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 0114f8a058..638157bbb0 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 4ac555c7e5..d8d5d0858a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4d1347cf47..987dd1c39d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ee22c57dc1..7fa2952b80 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -149,7 +149,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -181,7 +181,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -270,7 +270,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 d2a13961c9..d039501abd 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 b54e563640..92049cdf69 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e9c799ac71..b5e732beb4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8cb8b5dcbc..41ed3861eb 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Actions.smali
index dcf3345677..6874725214 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds.smali b/com.discord/smali/com/discord/stores/StoreGuilds.smali
index 4440658199..8f78b5ef34 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;->IU()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->IX()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -1685,7 +1685,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1749,7 +1749,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1874,7 +1874,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1973,7 +1973,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -2037,7 +2037,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -2094,7 +2094,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 9fb90566fa..787c67ed8d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0f010b5010..3d160c25c5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 847375593d..db8a74e7ab 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 a0fc9b8b01..a2e0a51212 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f5d23b5857..cdd6feb6c5 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 dc009e8578..6b9184a0d5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 09a081e670..55e4958c3a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 677e3f521b..d33e76e4f5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f61ceb820a..218aedef3c 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -315,7 +315,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreInstantInvites;->invitesPublisher:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -469,7 +469,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 0f0862ae6b..3c6ef0f02f 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;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()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 5551e1cb8d..f212e840a9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7dc0db0d98..a74c06b2a7 100644
--- a/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreInviteSettings.smali
@@ -261,7 +261,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -391,7 +391,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreInviteSettings;->pendingInviteCodeSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -429,7 +429,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 037c8376a8..3e3dabf9f4 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d8bcbae48e..c0c532e976 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali b/com.discord/smali/com/discord/stores/StoreLurking$joinGuild$1.smali
index 8fce308219..b8d4e5025b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 adf0619949..d98cdf4b1f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ec6498c7a2..02d235bfca 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 82390d4ddc..6e113876a6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 867bcdffd4..01ef5453b1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cc4e4ad6e2..f03d16d9ff 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7687616a31..acf018a785 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0192bb8e24..a36ed368aa 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking.smali
@@ -223,7 +223,7 @@
 
     if-nez v4, :cond_0
 
-    sget-object v4, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -776,7 +776,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -883,7 +883,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 d633c20f4b..ebe44816b6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 8c0868c026..95c0b51b46 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 b7e376c47e..051ade006c 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;->zW:I
+    iget v6, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zY:I
 
-    iget v7, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zX:I
+    iget v7, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
 
-    iget v9, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->zZ:I
+    iget v9, v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;->Ab:I
 
     new-instance v2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$a;
 
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 a154943e0b..171c6d105b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b312cffbb5..36f6fb0bb9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a947341559..e4f9e0c7e8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1df667f8bd..40db9a1d49 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string p1, "transportInfo"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     const-string p1, "supportedVideoCodecs"
 
+    invoke-static {p3, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string p1, "connectionState"
+
     invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string p1, "exception"
+
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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 a433766512..e10ee78acb 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 02809201f8..35f6cd546d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 00e3d43834..afa326ef57 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 fba18c2e37..6862bcd11b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$selectVideoInputDevice$1.smali
index 2d72297a10..9e670413be 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 75a2dd6c15..325a1eb379 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7d78881ba8..10205d2e25 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 db8d298370..78ec651fbe 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ddb124dfed..a46bd42bd4 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 7bd521505d..46eeea0ea5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 92c358ad4c..0219b5fcef 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 f05358fb95..12d61a6b37 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;->zD:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zF: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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -269,7 +269,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -321,7 +321,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/b/b;->Kc()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/b/b;->Kf()Lrx/Observable;
 
     move-result-object p1
 
@@ -1415,7 +1415,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->selectedVideoInputDeviceSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1452,7 +1452,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine;->videoInputDevicesSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1482,7 +1482,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->ez()Lcom/hammerandchisel/libdiscord/Discord;
+    invoke-interface {v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngine;->eB()Lcom/hammerandchisel/libdiscord/Discord;
 
     move-result-object v0
     :try_end_0
@@ -1594,7 +1594,7 @@
 
     invoke-virtual {v1, v0}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/b;->Ae:Lcom/discord/rtcconnection/mediaengine/b;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/b;->Ag:Lcom/discord/rtcconnection/mediaengine/b;
 
     invoke-static {}, Ljava/util/concurrent/Executors;->newSingleThreadExecutor()Ljava/util/concurrent/ExecutorService;
 
@@ -1604,7 +1604,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     check-cast v2, Lcom/discord/utilities/logging/Logger;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index a70c48bc57..747d0d5980 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, 0x7f12044a
+    const p1, 0x7f12046f
 
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zo:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -67,12 +67,12 @@
 
     if-eqz p2, :cond_1
 
-    const p1, 0x7f120447
+    const p1, 0x7f12046c
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->zn:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -80,12 +80,12 @@
 
     if-eqz p2, :cond_2
 
-    const p1, 0x7f120446
+    const p1, 0x7f12046b
 
     goto :goto_0
 
     :cond_2
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->zp:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -93,12 +93,12 @@
 
     if-eqz p2, :cond_3
 
-    const p1, 0x7f120449
+    const p1, 0x7f12046e
 
     goto :goto_0
 
     :cond_3
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -106,12 +106,12 @@
 
     if-eqz p2, :cond_4
 
-    const p1, 0x7f12044e
+    const p1, 0x7f120473
 
     goto :goto_0
 
     :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -119,12 +119,12 @@
 
     if-eqz p2, :cond_5
 
-    const p1, 0x7f12044d
+    const p1, 0x7f120472
 
     goto :goto_0
 
     :cond_5
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -132,12 +132,12 @@
 
     if-eqz p2, :cond_6
 
-    const p1, 0x7f120448
+    const p1, 0x7f12046d
 
     goto :goto_0
 
     :cond_6
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->zr:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -145,7 +145,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f12044c
+    const p1, 0x7f120471
 
     :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 0dfacd0b5a..28c220a770 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, 0x7f121325
+    const v0, 0x7f1213b1
 
     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 8bd2d47ec0..fad914b3e2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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 4e042f149f..651ed844cd 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;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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 35120f3ae2..1211ffa58b 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -108,7 +108,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -176,7 +176,7 @@
 
     iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification;->notificationDataObservable:Lrx/Observable;
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v2, Lcom/discord/stores/StoreMediaNotification$init$4;
 
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 99bb53558d..0f123d292f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 262148ff36..5f5d80cbc5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 73a51add23..02e8d0e05c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
@@ -206,7 +206,7 @@
 
     new-instance v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    sget-object v10, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v10, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     sget-object v11, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
 
@@ -470,7 +470,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -495,7 +495,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v3, 0x0
 
@@ -668,7 +668,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zU:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     if-ne v0, v1, :cond_0
 
@@ -761,7 +761,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -805,7 +805,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -849,7 +849,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -893,7 +893,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -927,7 +927,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -971,7 +971,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1015,7 +1015,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1059,7 +1059,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1103,7 +1103,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1147,7 +1147,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1201,7 +1201,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1247,7 +1247,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1283,7 +1283,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1319,7 +1319,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1353,7 +1353,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1474,7 +1474,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v2, Lcom/discord/stores/StoreMediaSettings$init$1;
 
@@ -1533,7 +1533,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreMediaSettings$init$3;
 
@@ -1597,7 +1597,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1641,7 +1641,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 03df162746..c3b3ec293e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$ack$1.smali
index 455bfc89a3..4cdae357d0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d64878f590..21950900d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6dcda7faea..f37b10a382 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
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 1dfeda4377..28f156cf2c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 b33c77bb70..ca19dc5d97 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 73ff26fd5f..737f2b51ee 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 decdf88ac5..ff916668aa 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a386596537..a1a5b1f563 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -931,7 +931,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 559b5dab2b..23bf3cd9ff 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2ca0b568e0..b47045b37c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0bca47b48e..17aca8bdd1 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0ec70a367d..f917935a47 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali
index da3e37be38..780131530e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 4d265f1b75..568a97fe16 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 473f197acd..b488fe8c2e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 90b2821dd1..24a1d0e0d9 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageState.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageState.smali
@@ -254,7 +254,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 3c802dce7f..e045271eea 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 da7f43abe2..93211a76dc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1fb7032fb5..a9f5a3b86a 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$2.smali
index 178ee66b9c..f88a101fa6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 51212fd97b..47d8e2b8b6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$3.smali
index 6c920a0c1c..3b549784e0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5eee6b5910..c8464cea3b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -314,7 +314,7 @@
 .method private final handleSendMessageValidationError(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V
     .locals 7
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v1, "ValidationError"
 
@@ -598,7 +598,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -887,7 +887,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1116,7 +1116,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget-object v1, Lrx/Emitter$a;->bFW:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
 
     invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
 
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
index 22316e4e8b..6f78e46006 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
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 4395fc3847..95e0a7f783 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 24bb38fd8a..6fdba6329a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 affa23c376..5f0cef089c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a031b13eb8..1136ccc788 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ef2b9c6941..bf7bd636b0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 17bf107b97..848b8002d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,7 +75,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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 f3a41093cf..2a22bb25a0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3f9ec5fae5..f24d455a7c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3b7791c90e..09a2349282 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1b5addd5ed..58bdd4e826 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5b177c6bc9..7d72424aa1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d25fe6c485..c18816e0ce 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -251,7 +251,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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 589c3a0777..b62afa4c77 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6a249e1a5d..b413ebc82a 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -1695,7 +1695,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -2162,7 +2162,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p3}, Lrx/Observable;->IV()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 12cf46f7ba..e3a4306961 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesMostRecent.smali
@@ -384,7 +384,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 5722625aa6..e231a484fe 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$authNavHandler$1.smali
index b3510c10e7..cc171fdf0d 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,7 +86,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     invoke-static {}, Lcom/discord/app/f;->dG()Ljava/util/List;
 
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 f5e3943559..e2872179b4 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 2c89ea2ae0..d9de853267 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 098108c7e3..0af8e7079c 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,7 +86,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/f;->vB:Lcom/discord/app/f;
+    sget-object v0, Lcom/discord/app/f;->vA:Lcom/discord/app/f;
 
     invoke-static {}, Lcom/discord/app/f;->dI()Ljava/util/List;
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali b/com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks.smali
index 4fec5baed2..0e2fd838ad 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 a55d47df0e..6731312e38 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120441
+    const v0, 0x7f120466
 
     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 18dd552c88..921073b0e5 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, 0x7f1210e7
+    const v2, 0x7f12116e
 
     invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -81,7 +81,7 @@
 
     aput-object v2, v0, v3
 
-    const v2, 0x7f1211df
+    const v2, 0x7f121267
 
     invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
@@ -91,7 +91,7 @@
 
     aput-object v2, v0, v3
 
-    const v2, 0x7f120445
+    const v2, 0x7f12046a
 
     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 14d642b05c..211c7ef1d8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -83,7 +83,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->uY: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 325ed7f257..8b1117b4de 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;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()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 b85dfbfc1f..1eac62c589 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0188f75c62..c486d2e4f6 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
 
     const-string v1, "CONNECTION_ISSUES"
 
-    const v4, 0x7f08039e
+    const v4, 0x7f0803ab
 
     const/16 v5, 0x1e
 
@@ -232,7 +232,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -266,7 +266,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -300,7 +300,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -374,7 +374,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 c9cfa45076..5c0e181b31 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 93e1f61c4a..82a75f1e99 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 9fea8b0ee9..5b9f3fbed4 100644
--- a/com.discord/smali/com/discord/stores/StoreNotices.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotices.smali
@@ -211,7 +211,7 @@
 
     iput-object p1, p0, Lcom/discord/stores/StoreNotices;->lastShownTimes:Ljava/util/HashMap;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -395,7 +395,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreNotices;->noticePublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -427,7 +427,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
 
-    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v0, 0x2
 
@@ -437,7 +437,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;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -795,7 +795,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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -827,7 +827,7 @@
     :cond_9
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
     :try_end_0
@@ -967,7 +967,7 @@
 
     invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -1004,7 +1004,7 @@
     :cond_3
     iget-object p1, p0, Lcom/discord/stores/StoreNotices;->processTrigger:Lrx/subjects/PublishSubject;
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ba52c6145e..aed9172563 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3ee420aa9b..95b9180492 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6e0f255a54..0325edf211 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0242287329..587524edef 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 248a28bbca..7951e50ca0 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -213,7 +213,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -479,7 +479,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v3, Lcom/discord/stores/StoreNotifications$tryTokenPersist$1;
 
@@ -523,7 +523,7 @@
 .end method
 
 .method public final getSettings()Lrx/Observable;
-    .locals 2
+    .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -543,18 +543,6 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
-
-    move-result-object v1
-
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string v1, "notificationSettings.get\u2026  .distinctUntilChanged()"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
     return-object v0
 .end method
 
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 65a54badb9..be06bd04fa 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 bc387c054d..dc5e575ab1 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 2ffb545cbb..83c12c33c0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 5e9c6f7d14..bc7144925c 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 c6c084c540..f40851b251 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ef9c9f840c..d39bde34a2 100644
--- a/com.discord/smali/com/discord/stores/StorePaymentSources.smali
+++ b/com.discord/smali/com/discord/stores/StorePaymentSources.smali
@@ -392,7 +392,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StorePaymentSources;->paymentSourcesStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StorePermissions.smali b/com.discord/smali/com/discord/stores/StorePermissions.smali
index 0887e1505f..a61919aea7 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions.smali
@@ -581,7 +581,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -649,7 +649,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -723,7 +723,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -761,7 +761,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
index 8464661a2b..0007f5856d 100644
--- a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
+++ b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
@@ -454,7 +454,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -499,7 +499,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 d5d8b642a3..c9ac9cdbc7 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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$2$1.smali
similarity index 81%
rename from com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
rename to com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1.smali
index c66eda3319..93dcbb92d9 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;
+.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
 .super Lkotlin/jvm/internal/m;
 .source "StorePremiumGuildSubscription.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->invoke(Lcom/discord/utilities/error/Error;)V
+    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->invoke(Lcom/discord/utilities/error/Error;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,18 +27,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;
+.field public static final INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;
+    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
 
-    invoke-direct {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;-><init>()V
 
-    sput-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;
+    sput-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;
 
     return-void
 .end method
@@ -58,9 +58,9 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;->invoke()V
+    invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2.smali
index f2e1b97da0..06f3d15ba2 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2.smali
@@ -1,9 +1,9 @@
 .class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;
-.super Ljava/lang/Object;
+.super Lkotlin/jvm/internal/m;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lrx/functions/b;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -18,15 +18,10 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "<T:",
-        "Ljava/lang/Object;",
-        "R:",
-        "Ljava/lang/Object;",
-        ">",
-        "Ljava/lang/Object;",
-        "Lrx/functions/b<",
-        "Ljava/lang/Throwable;",
-        "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
+        "Lkotlin/jvm/internal/m;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/utilities/error/Error;",
+        "Lkotlin/Unit;",
         ">;"
     }
 .end annotation
@@ -50,62 +45,47 @@
 .end method
 
 .method constructor <init>()V
-    .locals 0
+    .locals 1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final call(Ljava/lang/Throwable;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-    .locals 5
-
-    invoke-virtual {p1}, Ljava/lang/Throwable;->getMessage()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_0
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    const-string v1, "404"
-
-    check-cast v1, Ljava/lang/CharSequence;
-
-    const/4 v2, 0x0
-
-    const/4 v3, 0x2
-
-    const/4 v4, 0x0
-
-    invoke-static {v0, v1, v2, v3, v4}, Lkotlin/text/l;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    return-object v4
-
-    :cond_0
-    const-string v0, "it"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    throw p1
-.end method
-
-.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/lang/Throwable;
+    check-cast p1, Lcom/discord/utilities/error/Error;
 
-    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->call(Ljava/lang/Throwable;)Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->bgy: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object p1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
+
+    invoke-static {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStream$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StoreStream;
+
+    move-result-object p1
+
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$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/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
rename to com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1.smali
index 8a48f62a6c..c73990dd13 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;
+.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;
 .super Lkotlin/jvm/internal/m;
 .source "StorePremiumGuildSubscription.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->appendNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->invoke(Ljava/util/List;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic $premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+.field final synthetic $subscriptionsSlots:Ljava/util/List;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+.method constructor <init>(Ljava/util/List;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->$premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;->$subscriptionsSlots:Ljava/util/List;
 
     const/4 p1, 0x0
 
@@ -48,9 +48,9 @@
 .method public final bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->invoke()V
+    invoke-virtual {p0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -64,9 +64,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;->$premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;->$subscriptionsSlots:Ljava/util/List;
 
-    invoke-virtual {v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->handleNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+    invoke-virtual {v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->handleFetchStateSuccess(Ljava/util/List;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3.smali
index 124a47164b..47c630f9ee 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3.smali
@@ -1,9 +1,9 @@
 .class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;
-.super Ljava/lang/Object;
+.super Lkotlin/jvm/internal/m;
 .source "StorePremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lrx/functions/Func2;
+.implements Lkotlin/jvm/functions/Function1;
 
 
 # annotations
@@ -18,16 +18,14 @@
 
 .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;>;"
+        "Lkotlin/jvm/internal/m;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Ljava/util/List<",
+        "+",
+        "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+        ">;",
+        "Lkotlin/Unit;",
+        ">;"
     }
 .end annotation
 
@@ -50,51 +48,57 @@
 .end method
 
 .method constructor <init>()V
-    .locals 0
+    .locals 1
 
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
     check-cast p1, Ljava/util/List;
 
-    check-cast p2, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->invoke(Ljava/util/List;)V
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->call(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)Lkotlin/Pair;
-
-    move-result-object p1
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final call(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)Lkotlin/Pair;
-    .locals 0
+.method public final invoke(Ljava/util/List;)V
+    .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ")",
-            "Lkotlin/Pair<",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ">;"
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            ">;)V"
         }
     .end annotation
 
-    invoke-static {p1, p2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    const-string v0, "subscriptionsSlots"
 
-    move-result-object p1
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return-object p1
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
+
+    invoke-static {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStream$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StoreStream;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;
+
+    invoke-direct {v1, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3$1;-><init>(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/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
deleted file mode 100644
index 2f46c02e69..0000000000
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;
-.super Lkotlin/jvm/internal/m;
-.source "StorePremiumGuildSubscription.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->fetchUserGuildPremiumState()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/utilities/error/Error;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;
-
-    invoke-direct {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;-><init>()V
-
-    sput-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><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/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->invoke(Lcom/discord/utilities/error/Error;)V
-
-    sget-object p1, Lkotlin/Unit;->bgo: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object p1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
-
-    invoke-static {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStream$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StoreStream;
-
-    move-result-object p1
-
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$1;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4$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/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali
deleted file mode 100644
index af7ca87ac8..0000000000
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1.smali
+++ /dev/null
@@ -1,82 +0,0 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;
-.super Lkotlin/jvm/internal/m;
-.source "StorePremiumGuildSubscription.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;->invoke(Lkotlin/Pair;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-.field final synthetic $subscriptions:Ljava/util/List;
-
-
-# direct methods
-.method constructor <init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;->$subscriptions:Ljava/util/List;
-
-    iput-object p2, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;->$cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 3
-
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
-
-    invoke-static {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStore$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;->$subscriptions:Ljava/util/List;
-
-    const-string v2, "subscriptions"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v2, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;->$cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StorePremiumGuildSubscription;->handleFetchStateSuccess(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
-
-    return-void
-.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
deleted file mode 100644
index aa31ffb500..0000000000
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5.smali
+++ /dev/null
@@ -1,120 +0,0 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;
-.super Lkotlin/jvm/internal/m;
-.source "StorePremiumGuildSubscription.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->fetchUserGuildPremiumState()V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lkotlin/Pair<",
-        "+",
-        "Ljava/util/List<",
-        "+",
-        "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-        ">;+",
-        "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-        ">;",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;
-
-    invoke-direct {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;-><init>()V
-
-    sput-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;
-
-    return-void
-.end method
-
-.method constructor <init>()V
-    .locals 1
-
-    const/4 v0, 0x1
-
-    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><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/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;->invoke(Lkotlin/Pair;)V
-
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
-
-    return-object p1
-.end method
-
-.method public final invoke(Lkotlin/Pair;)V
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lkotlin/Pair<",
-            "+",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ">;)V"
-        }
-    .end annotation
-
-    invoke-virtual {p1}, Lkotlin/Pair;->component1()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/List;
-
-    invoke-virtual {p1}, Lkotlin/Pair;->component2()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    sget-object v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
-
-    invoke-static {v1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStream$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StoreStream;
-
-    move-result-object v1
-
-    new-instance v2, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;
-
-    invoke-direct {v2, v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5$1;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
-
-    check-cast v2, Lkotlin/jvm/functions/Function0;
-
-    invoke-virtual {v1, v2}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
-
-    return-void
-.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
deleted file mode 100644
index 82e3c4b570..0000000000
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1.smali
+++ /dev/null
@@ -1,72 +0,0 @@
-.class final Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;
-.super Lkotlin/jvm/internal/m;
-.source "StorePremiumGuildSubscription.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->removeNewPremiumGuildSubscription(J)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lkotlin/Unit;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic $subscriptionId:J
-
-
-# direct methods
-.method constructor <init>(J)V
-    .locals 0
-
-    iput-wide p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;->$subscriptionId:J
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;->invoke()V
-
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
-
-    return-object v0
-.end method
-
-.method public final invoke()V
-    .locals 3
-
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
-
-    invoke-static {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->access$getStore$p(Lcom/discord/stores/StorePremiumGuildSubscription$Actions;)Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    move-result-object v0
-
-    iget-wide v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;->$subscriptionId:J
-
-    invoke-virtual {v0, v1, v2}, Lcom/discord/stores/StorePremiumGuildSubscription;->handleRemovePremiumGuildSubscription(J)V
-
-    return-void
-.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 fa02ec6642..c629d8070e 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$Actions.smali
@@ -91,35 +91,8 @@
 
 
 # virtual methods
-.method public final appendNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
-    .locals 2
-
-    const-string v0, "premiumGuildSubscription"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->stream:Lcom/discord/stores/StoreStream;
-
-    if-nez v0, :cond_0
-
-    const-string v1, "stream"
-
-    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    :cond_0
-    new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;
-
-    invoke-direct {v1, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$appendNewPremiumGuildSubscription$1;-><init>(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)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 fetchUserGuildPremiumState()V
-    .locals 12
+    .locals 13
 
     sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->stream:Lcom/discord/stores/StoreStream;
 
@@ -142,7 +115,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI;->getUserPremiumGuildSubscriptions()Lrx/Observable;
+    invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI;->getSubscriptionSlots()Lrx/Observable;
 
     move-result-object v0
 
@@ -152,69 +125,35 @@
 
     const/4 v3, 0x0
 
-    invoke-static {v0, v3, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v0
-
-    sget-object v4, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
-
-    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/discord/utilities/rest/RestAPI;->getUserPremiumGuildSubscriptionsCooldown()Lrx/Observable;
-
-    move-result-object v4
-
-    invoke-static {v4, v3, v2, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;
-
-    check-cast v2, Lrx/functions/b;
-
-    invoke-virtual {v1, v2}, Lrx/Observable;->f(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object v1
-
-    sget-object v2, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;
-
-    check-cast v2, Lrx/functions/Func2;
-
-    invoke-static {v0, v1, v2}, Lrx/Observable;->b(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object v3
-
-    const-string v0, "Observable.zip(\n        \u2026bscriptions to cooldown }"
-
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-class v4, Lcom/discord/stores/StorePremiumGuildSubscription;
-
-    const/4 v5, 0x0
+    const-class v5, Lcom/discord/stores/StorePremiumGuildSubscription;
 
     const/4 v6, 0x0
 
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$4;
+    const/4 v7, 0x0
 
-    move-object v7, v0
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$2;
 
-    check-cast v7, Lkotlin/jvm/functions/Function1;
+    move-object v8, v0
 
-    const/4 v8, 0x0
+    check-cast v8, Lkotlin/jvm/functions/Function1;
 
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$5;
+    const/4 v9, 0x0
 
-    move-object v9, v0
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions$fetchUserGuildPremiumState$3;
 
-    check-cast v9, Lkotlin/jvm/functions/Function1;
+    move-object v10, v0
 
-    const/16 v10, 0x16
+    check-cast v10, Lkotlin/jvm/functions/Function1;
 
-    const/4 v11, 0x0
+    const/16 v11, 0x16
 
-    invoke-static/range {v3 .. v11}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    const/4 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
@@ -236,26 +175,3 @@
 
     return-void
 .end method
-
-.method public final removeNewPremiumGuildSubscription(J)V
-    .locals 2
-
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->stream:Lcom/discord/stores/StoreStream;
-
-    if-nez v0, :cond_0
-
-    const-string v1, "stream"
-
-    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    :cond_0
-    new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;
-
-    invoke-direct {v1, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions$removeNewPremiumGuildSubscription$1;-><init>(J)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/StorePremiumGuildSubscription$State$Loaded.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
index 808d72a2ae..c055d297a7 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$State$Loaded.smali
@@ -15,13 +15,11 @@
 
 
 # instance fields
-.field private final cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-.field private final premiumGuildSubscriptions:Ljava/util/List;
+.field private final premiumGuildSubscriptionSlots:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
             ">;"
         }
     .end annotation
@@ -29,20 +27,18 @@
 
 
 # direct methods
-.method public constructor <init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
+.method public constructor <init>(Ljava/util/List;)V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ")V"
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            ">;)V"
         }
     .end annotation
 
-    const-string v0, "premiumGuildSubscriptions"
+    const-string v0, "premiumGuildSubscriptionSlots"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -50,31 +46,22 @@
 
     invoke-direct {p0, v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
-
-    iput-object p2, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;ILjava/lang/Object;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+.method public static synthetic copy$default(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
     .locals 0
 
-    and-int/lit8 p4, p3, 0x1
+    and-int/lit8 p2, p2, 0x1
 
-    if-eqz p4, :cond_0
+    if-eqz p2, :cond_0
 
-    iget-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
+    iget-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
     :cond_0
-    and-int/lit8 p3, p3, 0x2
-
-    if-eqz p3, :cond_1
-
-    iget-object p2, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->copy(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    invoke-virtual {p0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->copy(Ljava/util/List;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
     move-result-object p0
 
@@ -89,51 +76,41 @@
         value = {
             "()",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
             ">;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
     return-object v0
 .end method
 
-.method public final component2()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    return-object v0
-.end method
-
-.method public final copy(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+.method public final copy(Ljava/util/List;)Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ")",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            ">;)",
             "Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;"
         }
     .end annotation
 
-    const-string v0, "premiumGuildSubscriptions"
+    const-string v0, "premiumGuildSubscriptionSlots"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
+    invoke-direct {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;)V
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 2
+    .locals 1
 
     if-eq p0, p1, :cond_1
 
@@ -143,19 +120,9 @@
 
     check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
-    iget-object v1, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    iget-object p1, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    iget-object p1, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -177,36 +144,26 @@
     return p1
 .end method
 
-.method public final getCooldown()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    return-object v0
-.end method
-
-.method public final getPremiumGuildSubscriptions()Ljava/util/List;
+.method public final getPremiumGuildSubscriptionSlots()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
             ">;"
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
     return-object v0
 .end method
 
 .method public final hashCode()I
-    .locals 3
+    .locals 1
 
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
-
-    const/4 v1, 0x0
+    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -214,25 +171,11 @@
 
     move-result v0
 
-    goto :goto_0
+    return v0
 
     :cond_0
     const/4 v0, 0x0
 
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-object v2, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    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
 
@@ -241,19 +184,11 @@
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v1, "Loaded(premiumGuildSubscriptions="
+    const-string v1, "Loaded(premiumGuildSubscriptionSlots="
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptions:Ljava/util/List;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", cooldown="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->cooldown:Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    iget-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->premiumGuildSubscriptionSlots: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/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
index fa7ae51ab9..b7bde957cb 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1.smali
@@ -48,118 +48,106 @@
 
 # virtual methods
 .method public final call(Lcom/discord/stores/StorePremiumGuildSubscription$State;)Lcom/discord/stores/StorePremiumGuildSubscription$State;
-    .locals 8
+    .locals 4
 
     instance-of v0, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_4
 
     iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
 
     if-nez v0, :cond_0
 
-    move-object v0, p1
+    check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
+    move-result-object p1
 
-    move-result-object v0
-
-    goto :goto_3
+    goto :goto_2
 
     :cond_0
-    move-object v0, p1
+    check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
+    move-result-object p1
 
-    move-result-object v0
+    check-cast p1, Ljava/lang/Iterable;
 
-    check-cast v0, Ljava/lang/Iterable;
+    new-instance v0, Ljava/util/ArrayList;
 
-    new-instance v1, Ljava/util/ArrayList;
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
+    check-cast v0, Ljava/util/Collection;
 
-    check-cast v1, Ljava/util/Collection;
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
+    move-result-object p1
 
     :cond_1
     :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_4
+    if-eqz v1, :cond_3
 
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    move-object v2, v1
+
+    check-cast v2, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
     move-result-object v2
 
-    move-object v3, v2
+    if-eqz v2, :cond_2
 
-    check-cast v3, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
+    move-result-wide v2
 
-    move-result-wide v3
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    iget-object v5, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
-
-    if-nez v5, :cond_2
+    move-result-object v2
 
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
+    const/4 v2, 0x0
 
-    move-result-wide v5
-
-    cmp-long v7, v3, v5
-
-    if-nez v7, :cond_3
-
-    const/4 v3, 0x1
-
-    goto :goto_2
-
-    :cond_3
     :goto_1
-    const/4 v3, 0x0
+    iget-object v3, p0, Lcom/discord/stores/StorePremiumGuildSubscription$getPremiumGuildSubscriptionsState$1;->$guildId:Ljava/lang/Long;
 
-    :goto_2
-    if-eqz v3, :cond_1
+    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    move-result v2
+
+    if-eqz v2, :cond_1
+
+    invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
+    :cond_3
+    move-object p1, v0
+
+    check-cast p1, Ljava/util/List;
+
+    :goto_2
+    new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
+
+    invoke-direct {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;)V
+
+    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State;
+
+    return-object v0
+
     :cond_4
-    move-object v0, v1
-
-    check-cast v0, Ljava/util/List;
-
-    :goto_3
-    new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getCooldown()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    move-result-object p1
-
-    invoke-direct {v1, v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
-
-    check-cast v1, Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    return-object v1
-
-    :cond_5
     return-object p1
 .end method
 
diff --git a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali
index ef215a4501..10ce6aa56c 100644
--- a/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/stores/StorePremiumGuildSubscription.smali
@@ -145,7 +145,7 @@
     return-void
 .end method
 
-.method public final handleFetchStateSuccess(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
+.method public final handleFetchStateSuccess(Ljava/util/List;)V
     .locals 1
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
@@ -154,20 +154,18 @@
         value = {
             "(",
             "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ")V"
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            ">;)V"
         }
     .end annotation
 
-    const-string v0, "premiumGuildSubscriptions"
+    const-string v0, "premiumGuildSubscriptionSlots"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
+    invoke-direct {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;)V
 
     check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
@@ -198,141 +196,6 @@
     return-void
 .end method
 
-.method public final handleNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
-    .locals 2
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    const-string v0, "premiumGuildSubscription"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->state:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    if-eqz v1, :cond_0
-
-    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/util/Collection;
-
-    invoke-static {v1, p1}, Lkotlin/a/m;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
-
-    move-result-object p1
-
-    new-instance v1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getCooldown()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    move-result-object v0
-
-    invoke-direct {v1, p1, v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
-
-    check-cast v1, Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    iput-object v1, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->state:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    const/4 p1, 0x1
-
-    iput-boolean p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->isDirty:Z
-
-    :cond_0
-    return-void
-.end method
-
-.method public final handleRemovePremiumGuildSubscription(J)V
-    .locals 8
-    .annotation runtime Lcom/discord/stores/StoreThread;
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->state:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    if-eqz v1, :cond_3
-
-    check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
-
-    move-result-object v1
-
-    check-cast v1, 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 {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_0
-    :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v3
-
-    const/4 v4, 0x1
-
-    if-eqz v3, :cond_2
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v3
-
-    move-object v5, v3
-
-    check-cast v5, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getId()J
-
-    move-result-wide v5
-
-    cmp-long v7, v5, p1
-
-    if-eqz v7, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v4, 0x0
-
-    :goto_1
-    if-eqz v4, :cond_0
-
-    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_0
-
-    :cond_2
-    check-cast v2, Ljava/util/List;
-
-    new-instance p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
-
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getCooldown()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
-
-    move-result-object p2
-
-    invoke-direct {p1, v2, p2}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;-><init>(Ljava/util/List;Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;)V
-
-    check-cast p1, Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    iput-object p1, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->state:Lcom/discord/stores/StorePremiumGuildSubscription$State;
-
-    iput-boolean v4, p0, Lcom/discord/stores/StorePremiumGuildSubscription;->isDirty:Z
-
-    :cond_3
-    return-void
-.end method
-
 .method public final onDispatchEnded()V
     .locals 2
     .annotation runtime Lcom/discord/stores/StoreThread;
diff --git a/com.discord/smali/com/discord/stores/StoreReadStates.smali b/com.discord/smali/com/discord/stores/StoreReadStates.smali
index 38ccd04120..7131b1872f 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;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -608,7 +608,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -624,7 +624,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v1
 
@@ -801,7 +801,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -913,11 +913,11 @@
 
     invoke-direct {v0, p0}, Lcom/discord/stores/-$$Lambda$StoreReadStates$BEpBYAlVtMYsmcI--VrnnzTNNnc;-><init>(Lcom/discord/stores/StoreReadStates;)V
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v1
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()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 8b56118c89..92cc7bd367 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f71ccc9296..3b2b97fc99 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 eab134c262..05ffc36db5 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;->zd:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zg: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;->ze:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zh: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;->zf:Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$AnalyticsEvent;->zi: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 e0d5161a85..d91bdaf8fc 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e5512e7102..dda74d150e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d932fdef53..e285e4dfda 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 f984195d99..7006bed8f5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e9e70d2199..4f0fa77d44 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2fabc061ca..d21c7189f0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ff95237b7e..2ee9419890 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0f469cae19..01e4d9a774 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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;->zh:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object p1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bD(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -161,7 +161,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -187,7 +187,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -213,7 +213,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -331,7 +331,7 @@
     return-void
 
     :cond_3
-    sget-object v2, Lcom/discord/app/App;->ux:Lcom/discord/app/App$a;
+    sget-object v2, Lcom/discord/app/App;->uw:Lcom/discord/app/App$a;
 
     invoke-static {}, Lcom/discord/app/App;->dx()Z
 
@@ -363,17 +363,7 @@
 
     move-result-object v1
 
-    const-string v3, "endpoint"
-
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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
@@ -381,7 +371,7 @@
 .end method
 
 .method private final createRtcConnection()V
-    .locals 12
+    .locals 14
     .annotation runtime Lcom/discord/stores/StoreThread;
     .end annotation
 
@@ -481,15 +471,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;
@@ -536,54 +526,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;->vn: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;->vm: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/l;->throwUninitializedPropertyAccessException(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/l;->checkParameterIsNotNull(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
 
@@ -599,13 +603,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;->eu()Ljava/util/concurrent/Future;
 
     :cond_0
     const/4 v0, 0x0
@@ -958,7 +956,7 @@
 .method private final recordBreadcrumb(Ljava/lang/String;)V
     .locals 6
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1377,7 +1375,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$1;
 
@@ -1415,7 +1413,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$2;
 
@@ -1453,7 +1451,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/stores/StoreRtcConnection$init$4;
 
@@ -1571,7 +1569,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$setRunningGame$1.smali b/com.discord/smali/com/discord/stores/StoreRunningGame$setRunningGame$1.smali
index 69b724cabd..9d09225967 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e1bed11fa1..0e3855befc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bD(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;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy: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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 7de27ec7ba..9031d15d92 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8d61e7fdf6..55904524ce 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 06225dd0f9..8a97eca276 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p2
 
@@ -496,7 +496,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 0d012f060b..ccaf035506 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8949ca379f..554df19ddc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0ad1274b33..7a312aa9b6 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     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 7c0ead3061..7deb945ad8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2b99b33c3a..6c184bfc9f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 800230989b..00de1bc499 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 77af8635a6..3858ca36f2 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -180,7 +180,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -188,7 +188,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/stores/StoreSearchInput$2;
 
@@ -452,7 +452,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -470,7 +470,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()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 968c4d0fe9..d4b843ca12 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bef05e14b9..28cb6076e8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fdc7418505..b235ed3698 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 aebae7abbb..d0cef76946 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5dff0c576c..ce2238cb62 100644
--- a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
+++ b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali
@@ -531,7 +531,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreSearchQuery;->searchStateSubject:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -773,7 +773,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IV()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 ef65bfe9ba..c8bd2ef6c4 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -239,7 +239,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/b/b;->Kc()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/b/b;->Kf()Lrx/Observable;
 
     move-result-object v0
 
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 840d0a16f4..008845d928 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e76fce8847..133b3319d6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ec6a2a8329..412f27587b 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -143,7 +143,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy: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 1e9276e7c7..d61c1f5e68 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5ff4c78694..ff97241dc1 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 d67bf298bc..5da615595e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 20c7d1a424..7b722ac2d7 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object p1
 
@@ -653,7 +653,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreSpotify;->publishStateTrigger:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -669,7 +669,7 @@
 
     iget-object p1, p0, Lcom/discord/stores/StoreSpotify;->publishStateTrigger:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
@@ -797,7 +797,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
index 95f963a19b..013509fc29 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
@@ -1083,6 +1083,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
 
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
index 404dfed7f8..e350791a60 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$1;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
index 2e6e75d1de..7f8064f39e 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$10.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$deferredInit$1$10;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
index fe31fbc99c..4d1f3283dd 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$11.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$11;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
index 84f3a77876..0bd3512402 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$13;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
index 5bccee7e97..2708ec7ea1 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
index 1e6057e96b..9bd289765c 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$3.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$3;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
index 41556cb42b..aee3d01fe1 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$4.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$4;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
index 39f291605e..e877bf97f8 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$5.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$deferredInit$1$5;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
index 0dca8e354d..9e22657f4d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$6.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/stores/StoreStream$deferredInit$1$6;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
index 7bea793190..54dc6b71da 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$7.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$7;->invoke(Ljava/util/Set;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
index 426ad5b00a..b49dd50df9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$8.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$8;->invoke(Lco/discord/media_engine/VideoInputDeviceDescription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
index 21ce48a030..387b85bbe9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$9.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$9;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
index d306403711..6a2ff07970 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -508,6 +508,18 @@
 
     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
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 271c513a68..6495b98a2b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9713d329b2..06616a6d4f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6445d572c4..ee20b3a368 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9f28c44855..2d26b69630 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 941aa0692e..ba5f9c55bd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 61ba97afe3..8b30ce09dd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 df956f96db..e57d5ec340 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c07c3cb948..c213653786 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 57cac436ac..ead9552930 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$16.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$16;->invoke(Lcom/discord/models/domain/ModelChannelUnreadUpdate;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
index 16765e7f4f..8bb2a693d5 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$17.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$17;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
index 7e554dd9da..d69fa7d79b 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$18.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$18;->invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
index a2e0c5bc52..46ba2223ae 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$19.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$2.smali
index 7677ea5860..36fd74f399 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 45a54eb64c..5053371af3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$20.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$20;->invoke(Lcom/discord/models/domain/ModelUserRelationship;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
index 67bdca9d3b..1ea35e7dc3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$21.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$21;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
index 8e71a9d61b..e0c412e103 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$22.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$22;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
index 997bc0a89f..2ef006c4bc 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$23.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$23;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
index 23121d452a..b389d12258 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$24.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$24;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
index 3e86d51084..29560f689a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$25.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$25;->invoke(Lcom/discord/models/domain/ModelMessageReaction$Update;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
index d514170997..c3600545fe 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$26.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$26;->invoke(Lcom/discord/models/domain/ModelMessageDelete;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
index bf4bc4ea63..b5c66f2689 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$27.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$27;->invoke(Lcom/discord/models/domain/ModelReadState;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
index 0a85179871..880855f6c3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$28.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$28;->invoke(Lcom/discord/models/domain/ModelVoice$State;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
index 1607771f3f..e65660f7d3 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$29.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$29;->invoke(Lcom/discord/models/domain/ModelVoice$Server;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$3.smali
index cbf348c292..b7ba57b037 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 20f9ade132..c4d97a8fe9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$30.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$30;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
index aa7e5b2afa..1c694d7ea9 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$31.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$31;->invoke(Lcom/discord/models/domain/ModelUserSettings;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali
index 5ff2900d2f..1e17106032 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$32.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$32;->invoke(Lcom/discord/models/domain/ModelUser$Typing;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali
index b40dd868e2..1894e9c9ce 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$33.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$33;->invoke(Lcom/discord/models/domain/ModelPresence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
index f216e321c8..e2ab6374c0 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$34.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$34;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 f80d65ac74..b9cdc651c5 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$35.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
index 2c57f855cc..1d6470f2b5 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$36.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$36;->invoke(Lcom/discord/models/domain/ModelChannel$Recipient;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
index e463f6e023..08ec918aa7 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$37.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
index be6a7b4a4e..4817cde848 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$38.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$38;->invoke(Lcom/discord/models/domain/ModelCall;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
index cd0189fd0e..8aea69d322 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$39.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$39;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$4.smali
index 9498c69a03..1518a6a098 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c9a06852f5..42e4e9a64a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$40.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$40;->invoke(Lcom/discord/models/domain/ModelUser$RequiredActionUpdate;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
index 2919b20f38..be627ea4ef 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$41.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$41;->invoke(Lcom/discord/models/domain/ModelGuildMemberListUpdate;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali
index 1f7dd81cf1..7d94d9833a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$42.smali
@@ -78,7 +78,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$42;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$43.smali
index 821a486aa5..fc8522c0fa 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
index 94c5402d97..28d625fd8a 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$initGatewaySocketListeners$44.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$initGatewaySocketListeners$44;->invoke(Lkotlin/Unit;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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..b882741dbd
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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..cebe8236be
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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..7b45206f51
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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..46a07cad7f
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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 5b5505968b..3ce34dc6ed 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 96cae3a077..763d8e1fbd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 40e343555b..e493a55941 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8dde1d9f5b..ab00e2af35 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 38bbd61d16..1629a6285e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2453783d3e..7f86e26ab0 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -188,6 +188,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;
@@ -641,16 +643,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;
@@ -819,10 +811,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
@@ -1280,6 +1292,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
 
@@ -1403,7 +1447,7 @@
         }
     .end annotation
 
-    const/16 v0, 0x23
+    const/16 v0, 0x24
 
     new-array v0, v0, [Lcom/discord/stores/DispatchHandler;
 
@@ -1687,6 +1731,14 @@
 
     aput-object v1, v0, v2
 
+    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;->arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
 
     move-result-object v0
@@ -1728,7 +1780,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aj;->Ju()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jx()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -1825,7 +1877,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/aj;->Ju()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jx()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -2770,6 +2822,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
 
@@ -3219,6 +3283,10 @@
 
     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 "
@@ -4505,6 +4573,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;
@@ -4624,6 +4790,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
@@ -5044,7 +5214,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -5554,9 +5724,9 @@
 
     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;
 
@@ -5572,9 +5742,9 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v2, "streamUserPaymentSourcesUpdate"
+    const-string v3, "streamUserPaymentSourcesUpdate"
 
-    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;
 
@@ -5590,7 +5760,79 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const-string v2, "streamUserSubscriptionsUpdate"
+    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
 
@@ -6343,6 +6585,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
 
@@ -6579,7 +6829,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreStream;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
@@ -6593,3 +6843,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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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..90a5cf5fe1
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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..033c6fede8
--- /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/l;->throwUninitializedPropertyAccessException(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/l;->throwUninitializedPropertyAccessException(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/l;->checkParameterIsNotNull(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/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
similarity index 60%
rename from com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali
rename to com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
index 944ade578c..3302123d9d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$Companion.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;
+.class public final Lcom/discord/stores/StoreStreamRtcConnection$Companion;
 .super Ljava/lang/Object;
-.source "WidgetChatListAdapterItemGameInvite.kt"
+.source "StoreStreamRtcConnection.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+    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/chat/list/WidgetChatListAdapterItemGameInvite$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..a194fe4158
--- /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/l;->checkParameterIsNotNull(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;->bD(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/l;->areEqual(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;->vm: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/l;->throwUninitializedPropertyAccessException(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/l;->checkExpressionValueIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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;->eu()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/l;->checkParameterIsNotNull(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;->uw:Lcom/discord/app/App$a;
+
+    invoke-static {}, Lcom/discord/app/App;->dx()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/l;->throwNpe()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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "properties"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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;->yX: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 c4e8801dd8..b78a4a8e02 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 f4fe305891..ebd96d247f 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 533da8f924..866d095c93 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 6873a674e9..cbb6d7634f 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUser.smali b/com.discord/smali/com/discord/stores/StoreUser.smali
index 2b22804078..ea1fa167b5 100644
--- a/com.discord/smali/com/discord/stores/StoreUser.smali
+++ b/com.discord/smali/com/discord/stores/StoreUser.smali
@@ -523,7 +523,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -1337,7 +1337,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -1368,7 +1368,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lkotlin/jvm/functions/Function0;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -1384,7 +1384,7 @@
 
     invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStream;->handleUserUpdated(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 908cbbfabf..c6423f9be4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7b79fdd948..8e96cdbb5c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3312308368..2d405ce8af 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 4722e0ff15..a5515b1364 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 12821761f3..d5e20a5bc0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 42b4873b54..b112b94350 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bf82a59ca8..2c6bd1a11c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 404e40ebe6..04aa44574a 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -502,7 +502,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO: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 a2550ec181..e2c01b774d 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-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -413,7 +413,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -449,7 +449,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -482,7 +482,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -597,7 +597,7 @@
 
     invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
 
-    const v6, 0x7f1203be
+    const v6, 0x7f1203e3
 
     move-object v1, p0
 
@@ -641,16 +641,16 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f1203be
+    const p2, 0x7f1203e3
 
-    const v6, 0x7f1203be
+    const v6, 0x7f1203e3
 
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f12038f
+    const p2, 0x7f1203b4
 
-    const v6, 0x7f12038f
+    const v6, 0x7f1203b4
 
     :goto_0
     move-object v1, p0
@@ -693,7 +693,7 @@
 
     invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
 
-    const v6, 0x7f1203be
+    const v6, 0x7f1203e3
 
     move-object v1, p0
 
@@ -715,7 +715,7 @@
 
     invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;-><init>(I)V
 
-    const v5, 0x7f121055
+    const v5, 0x7f1210dc
 
     move-object v0, p0
 
@@ -737,7 +737,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, 0x7f121055
+    const v5, 0x7f1210dc
 
     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 97471ab6ea..2b78fbb0b8 100644
--- a/com.discord/smali/com/discord/stores/StoreUserNotes.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserNotes.smali
@@ -175,7 +175,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
index 6a2e3dbbf1..e62e29a20c 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
@@ -812,7 +812,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -861,7 +861,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -895,7 +895,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserProfile.smali b/com.discord/smali/com/discord/stores/StoreUserProfile.smali
index 3d0c013750..3db2f16ebe 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -301,7 +301,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 0e9047efb2..d198c7d98d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 bd3a5f6f54..b10aa801b5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fb5f0b66eb..9c9113deff 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -212,7 +212,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -250,7 +250,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -537,7 +537,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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 e2c2fe1ea8..5e03952a41 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 1bee239850..99dc5a8823 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -132,7 +132,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -142,7 +142,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -210,7 +210,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -220,7 +220,7 @@
 
     new-instance v0, Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -651,7 +651,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -928,7 +928,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->localePublisher:Lrx/subjects/Subject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1116,7 +1116,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1385,7 +1385,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1211a6
+    const v1, 0x7f12122e
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1540,7 +1540,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f120afb
+    const v0, 0x7f120b2c
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1868,7 +1868,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f1211a6
+    const v0, 0x7f12122e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1899,7 +1899,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f1211a5
+    const v0, 0x7f12122d
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
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 d067b426a2..418452c0e6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 8cd646d200..38407f4855 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 30d6f1f195..d46519c124 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 75de8ea91a..f87e875fc5 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ab1e8475a8..366f216518 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b0ab77f2a5..f2ba760293 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali b/com.discord/smali/com/discord/stores/StoreUsersMutualGuilds.smali
index 2cf36ba032..da96a95a34 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 803aa693aa..5cff3b4756 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e5cdc02db7..fef8e580b3 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 cf739d7054..dc0e123138 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 3cf96885a2..05c73ee617 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cae1583da8..d1750115fd 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -126,7 +126,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -428,7 +428,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -459,6 +459,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;
@@ -880,3 +888,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$2.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1$2.smali
index e2c70cf8bc..9dfe7eb0b5 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/y;->getOrCreateKotlinClass(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p2"
-
-    move-object v3, p2
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p3"
-
-    move-object v4, p3
-
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p4"
-
-    move-object v5, p4
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p5"
-
-    move-object v6, p5
-
-    invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p6"
-
-    move-object v7, p6
-
-    invoke-static {p6, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p7"
-
-    move-object/from16 v8, p7
-
-    invoke-static {v8, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "otherUsers"
+
+    move-object/from16 v7, p2
+
+    invoke-static {v7, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "voiceStates"
+
+    move-object/from16 v8, p3
+
+    invoke-static {v8, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "speakingUsers"
+
+    move-object/from16 v9, p4
+
+    invoke-static {v9, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "guildMembers"
+
+    move-object/from16 v12, p7
+
+    invoke-static {v12, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v1, "applicationStreamingState"
+
+    move-object/from16 v13, p8
+
+    invoke-static {v13, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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 7186bc40f5..6612f463ba 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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 6e9cf07069..8ac6a6a311 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     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 1eff5ed7fc..887c2085eb 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;->to(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;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v7
+
+    aput-object v7, v5, v8
 
     invoke-static {v5}, Lkotlin/a/ad;->mutableMapOf([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;->collectionSizeOrDefault(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;->collectionSizeOrDefault(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
 
@@ -542,7 +776,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -580,7 +814,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
index 4c8b9f5b1f..508eea74db 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -209,7 +209,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->IQ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p0
 
@@ -296,7 +296,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceStates.smali b/com.discord/smali/com/discord/stores/StoreVoiceStates.smali
index 8eaa94aaff..3255716934 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -420,7 +420,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali
index d050ebb37e..8e3fe3c9e2 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties$$special$$inlined$observable$1.smali
@@ -91,7 +91,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sget-object p3, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     if-eqz p2, :cond_1
 
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index de8cea9e80..2da6104d2f 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;->bhF:Lkotlin/properties/a;
+    sget-object v1, Lkotlin/properties/a;->bhP: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/973"
+    const-string v2, "Discord-Android/974"
 
     invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
@@ -189,7 +189,7 @@
 
     aput-object v1, v0, v2
 
-    const/16 v1, 0x3cd
+    const/16 v1, 0x3ce
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -207,7 +207,7 @@
 
     const-string v1, "client_version"
 
-    const-string v2, "9.7.3"
+    const-string v2, "9.7.4"
 
     invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
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 90475e583b..d7f05f4b4c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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..d132bfbb71
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "guildChannels"
+
+    move-object/from16 v3, p3
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "channelPresences"
+
+    move-object/from16 v4, p5
+
+    invoke-static {v4, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "guildRoles"
+
+    move-object/from16 v5, p7
+
+    invoke-static {v5, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "guildMembers"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;->to(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;->throwCountOverflow()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;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v4
+
+    aput-object v4, v6, v10
+
+    invoke-static {v6}, Lkotlin/a/ad;->mutableMapOf([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/l;->checkExpressionValueIsNotNull(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 6d50c5e186..a8f9922d45 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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..6c1dfb29b8
--- /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/l;->checkExpressionValueIsNotNull(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..d7dfa55c23
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkExpressionValueIsNotNull(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;->plus(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..499d182504
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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 2a95968670..d4b2301ca8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$videoInputDeviceSelected$1.smali
index 673591b198..77eb4d0e65 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5805ed16f0..34c0f7140d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b329e9ea4f..5cc03ff72d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7654dff970..ee5bdcf82b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -94,6 +94,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 final synthetic access$insertUriProperties(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/util/Map;Landroid/net/Uri;)Ljava/util/Map;
     .locals 0
 
@@ -208,7 +218,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -254,7 +264,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$addAttachment$2;
 
@@ -949,6 +959,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;->bq(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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
 
@@ -1827,7 +2011,7 @@
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/ai;-><init>()V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/ai;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/ai;->qm:Lcom/crashlytics/android/answers/b;
 
     const-string v3, "invite"
 
@@ -1839,7 +2023,7 @@
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/crashlytics/android/answers/ai;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v3, v1, Lcom/crashlytics/android/answers/ai;->qm:Lcom/crashlytics/android/answers/b;
 
     const-string v4, "contentId"
 
@@ -1874,7 +2058,7 @@
     invoke-virtual {v1, v2, p0}, Lcom/crashlytics/android/answers/ai;->a(Ljava/lang/String;Ljava/lang/Number;)Lcom/crashlytics/android/answers/c;
 
     :cond_4
-    iget-boolean p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Z
+    iget-boolean p0, v0, Lcom/crashlytics/android/answers/Answers;->pp:Z
 
     if-eqz p0, :cond_5
 
@@ -1885,11 +2069,11 @@
     return-void
 
     :cond_5
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p0, :cond_6
 
-    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p0, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {p0, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
@@ -2448,6 +2632,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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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 1
     .annotation system Ldalvik/annotation/Signature;
@@ -2521,7 +2811,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     sget-object p2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
 
@@ -3875,7 +4165,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;
 
@@ -3995,7 +4285,7 @@
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/v;-><init>()V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qm:Lcom/crashlytics/android/answers/b;
 
     const-string v3, "email"
 
@@ -4003,7 +4293,7 @@
 
     invoke-virtual {v2, v4, v3}, Lcom/crashlytics/android/answers/b;->g(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/v;->qm:Lcom/crashlytics/android/answers/b;
 
     invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
 
@@ -4024,7 +4314,7 @@
     invoke-virtual {v1, p2, p1}, Lcom/crashlytics/android/answers/v;->h(Ljava/lang/String;Ljava/lang/String;)Lcom/crashlytics/android/answers/c;
 
     :cond_1
-    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Z
+    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->pp:Z
 
     if-eqz p1, :cond_2
 
@@ -4035,11 +4325,11 @@
     return-void
 
     :cond_2
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
@@ -4891,7 +5181,7 @@
     return-void
 
     :cond_d
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -4978,7 +5268,7 @@
 
     invoke-direct {v1}, Lcom/crashlytics/android/answers/aj;-><init>()V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qm:Lcom/crashlytics/android/answers/b;
 
     const-string v3, "email"
 
@@ -4986,7 +5276,7 @@
 
     invoke-virtual {v2, v4, v3}, Lcom/crashlytics/android/answers/b;->g(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qn:Lcom/crashlytics/android/answers/b;
+    iget-object v2, v1, Lcom/crashlytics/android/answers/aj;->qm:Lcom/crashlytics/android/answers/b;
 
     invoke-static {p1}, Ljava/lang/Boolean;->toString(Z)Ljava/lang/String;
 
@@ -4996,7 +5286,7 @@
 
     invoke-virtual {v2, v3, p1}, Lcom/crashlytics/android/answers/b;->g(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Z
+    iget-boolean p1, v0, Lcom/crashlytics/android/answers/Answers;->pp:Z
 
     if-eqz p1, :cond_1
 
@@ -5007,11 +5297,11 @@
     return-void
 
     :cond_1
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pr:Lcom/crashlytics/android/answers/ac;
+    iget-object p1, v0, Lcom/crashlytics/android/answers/Answers;->pq:Lcom/crashlytics/android/answers/ac;
 
     invoke-virtual {p1, v1}, Lcom/crashlytics/android/answers/ac;->a(Lcom/crashlytics/android/answers/w;)V
 
@@ -5019,6 +5309,141 @@
     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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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 47792b0dfd..891ab6831f 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
@@ -431,7 +431,7 @@
 
     move-object v2, p2
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p2, Ljava/lang/StringBuilder;
 
@@ -726,11 +726,11 @@
 
     if-eqz p2, :cond_1
 
-    iget-boolean v0, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->awV:Z
+    iget-boolean v0, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPZ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 v0, 0x0
 
@@ -741,9 +741,9 @@
     return-void
 
     :cond_0
-    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v1
 
@@ -751,7 +751,7 @@
 
     const/4 v6, 0x1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
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 b2e7927f06..132c2ee314 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
index 0947138154..fcec4a4dcc 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
@@ -492,7 +492,7 @@
     throw p0
 
     :cond_3
-    invoke-virtual {v3}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object p0
 
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 0ff168351e..05b3863ed9 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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v8, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     const-string v8, "#%06X"
 
@@ -832,7 +832,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f100063
+    const v7, 0x7f100064
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
 
@@ -1028,7 +1028,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f100066
+    const v7, 0x7f100067
 
     invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
 
@@ -1204,7 +1204,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -1334,9 +1334,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120864
+    const v0, 0x7f120888
 
-    const v1, 0x7f120863
+    const v1, 0x7f120887
 
     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, 0x7f120862
+    const v0, 0x7f120886
 
-    const v1, 0x7f120861
+    const v1, 0x7f120885
 
     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, 0x7f120867
+    const v0, 0x7f12088b
 
-    const v1, 0x7f120866
+    const v1, 0x7f12088a
 
     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, 0x7f120860
+    const p1, 0x7f120884
 
     return p1
 
@@ -1418,7 +1418,7 @@
 
     if-nez p1, :cond_1
 
-    const p1, 0x7f120859
+    const p1, 0x7f12087d
 
     return p1
 
@@ -1427,7 +1427,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f12085a
+    const p1, 0x7f12087e
 
     return p1
 
@@ -1456,9 +1456,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120858
+    const v0, 0x7f12087c
 
-    const v1, 0x7f120857
+    const v1, 0x7f12087b
 
     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, 0x7f12085f
+    const p1, 0x7f120883
 
     return p1
 
@@ -1488,9 +1488,9 @@
 
     if-eqz v0, :cond_4
 
-    const v0, 0x7f120854
+    const v0, 0x7f120878
 
-    const v1, 0x7f120853
+    const v1, 0x7f120877
 
     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, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -1568,9 +1568,9 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f120870
+    const v0, 0x7f120894
 
-    const v1, 0x7f12086f
+    const v1, 0x7f120893
 
     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, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -1613,7 +1613,7 @@
 
     const/16 v0, 0xe10
 
-    const v3, 0x7f100025
+    const v3, 0x7f100026
 
     if-eq p1, v0, :cond_3
 
@@ -1638,7 +1638,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100024
+    const p2, 0x7f100025
 
     new-array v0, v2, [Ljava/lang/Object;
 
@@ -1720,7 +1720,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100027
+    const p2, 0x7f100028
 
     new-array v0, v2, [Ljava/lang/Object;
 
@@ -1739,7 +1739,7 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f120c3f
+    const p1, 0x7f120c71
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1804,14 +1804,14 @@
 
     if-ne p1, v5, :cond_1
 
-    const p1, 0x7f120892
+    const p1, 0x7f1208b6
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f120891
+    const p1, 0x7f1208b5
 
     return p1
 
@@ -1840,7 +1840,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120881
+    const p1, 0x7f1208a5
 
     return p1
 
@@ -1853,9 +1853,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120890
+    const v0, 0x7f1208b4
 
-    const v1, 0x7f12088f
+    const v1, 0x7f1208b3
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1872,9 +1872,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120889
+    const v0, 0x7f1208ad
 
-    const v1, 0x7f120888
+    const v1, 0x7f1208ac
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -1912,12 +1912,12 @@
     return v1
 
     :cond_4
-    const p1, 0x7f120877
+    const p1, 0x7f12089b
 
     return p1
 
     :cond_5
-    const p1, 0x7f120876
+    const p1, 0x7f12089a
 
     return p1
 
@@ -1958,12 +1958,12 @@
     return v1
 
     :cond_7
-    const p1, 0x7f12087f
+    const p1, 0x7f1208a3
 
     return p1
 
     :cond_8
-    const p1, 0x7f12087e
+    const p1, 0x7f1208a2
 
     return p1
 
@@ -1983,7 +1983,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120884
+    const p1, 0x7f1208a8
 
     return p1
 
@@ -1996,7 +1996,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120880
+    const p1, 0x7f1208a4
 
     return p1
 
@@ -2009,7 +2009,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120874
+    const p1, 0x7f120898
 
     return p1
 
@@ -2053,27 +2053,27 @@
     return v1
 
     :cond_a
-    const p1, 0x7f12088e
+    const p1, 0x7f1208b2
 
     return p1
 
     :cond_b
-    const p1, 0x7f12088a
+    const p1, 0x7f1208ae
 
     return p1
 
     :cond_c
-    const p1, 0x7f12088c
+    const p1, 0x7f1208b0
 
     return p1
 
     :cond_d
-    const p1, 0x7f12088b
+    const p1, 0x7f1208af
 
     return p1
 
     :cond_e
-    const p1, 0x7f12088d
+    const p1, 0x7f1208b1
 
     return p1
 
@@ -2093,7 +2093,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120883
+    const p1, 0x7f1208a7
 
     return p1
 
@@ -2106,7 +2106,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -2119,9 +2119,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120886
+    const v0, 0x7f1208aa
 
-    const v1, 0x7f120885
+    const v1, 0x7f1208a9
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2138,7 +2138,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f12087d
+    const p1, 0x7f1208a1
 
     return p1
 
@@ -2151,9 +2151,9 @@
 
     if-eqz v0, :cond_14
 
-    const v0, 0x7f120873
+    const v0, 0x7f120897
 
-    const v1, 0x7f120872
+    const v1, 0x7f120896
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -2193,17 +2193,17 @@
     return v1
 
     :cond_10
-    const p1, 0x7f12087a
+    const p1, 0x7f12089e
 
     return p1
 
     :cond_11
-    const p1, 0x7f12087c
+    const p1, 0x7f1208a0
 
     return p1
 
     :cond_12
-    const p1, 0x7f12087b
+    const p1, 0x7f12089f
 
     return p1
 
@@ -2223,7 +2223,7 @@
 
     if-eqz p1, :cond_14
 
-    const p1, 0x7f120875
+    const p1, 0x7f120899
 
     return p1
 
@@ -2302,14 +2302,14 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f12089c
+    const p1, 0x7f1208c0
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f12089b
+    const p1, 0x7f1208bf
 
     return p1
 
@@ -2354,12 +2354,12 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120897
+    const p1, 0x7f1208bb
 
     return p1
 
     :cond_4
-    const p1, 0x7f120898
+    const p1, 0x7f1208bc
 
     return p1
 
@@ -2395,12 +2395,12 @@
 
     if-eqz p1, :cond_6
 
-    const p1, 0x7f120899
+    const p1, 0x7f1208bd
 
     return p1
 
     :cond_6
-    const p1, 0x7f12089a
+    const p1, 0x7f1208be
 
     return p1
 
@@ -2420,7 +2420,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f120894
+    const p1, 0x7f1208b8
 
     return p1
 
@@ -2433,7 +2433,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -2446,7 +2446,7 @@
 
     if-eqz p1, :cond_8
 
-    const p1, 0x7f120893
+    const p1, 0x7f1208b7
 
     return p1
 
@@ -2776,7 +2776,7 @@
 
     if-eqz p2, :cond_9
 
-    const p2, 0x7f120860
+    const p2, 0x7f120884
 
     new-array p3, v4, [Ljava/lang/Object;
 
@@ -2784,7 +2784,7 @@
 
     move-result-object p4
 
-    const v3, 0x7f100062
+    const v3, 0x7f100063
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -2827,7 +2827,7 @@
 
     if-eqz p2, :cond_9
 
-    const p2, 0x7f12085f
+    const p2, 0x7f120883
 
     new-array p3, v4, [Ljava/lang/Object;
 
@@ -2835,7 +2835,7 @@
 
     move-result-object p4
 
-    const v3, 0x7f100061
+    const v3, 0x7f100062
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -2975,7 +2975,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100068
+    const p2, 0x7f100069
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3014,7 +3014,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100062
+    const p2, 0x7f100063
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3053,7 +3053,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100061
+    const p2, 0x7f100062
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3092,7 +3092,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100067
+    const p2, 0x7f100068
 
     invoke-interface {v0}, Ljava/util/Collection;->size()I
 
@@ -3189,14 +3189,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f1208b6
+    const p1, 0x7f1208da
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1208b5
+    const p1, 0x7f1208d9
 
     return p1
 
@@ -3241,12 +3241,12 @@
 
     if-nez p1, :cond_4
 
-    const p1, 0x7f1208b2
+    const p1, 0x7f1208d6
 
     return p1
 
     :cond_4
-    const p1, 0x7f1208b0
+    const p1, 0x7f1208d4
 
     return p1
 
@@ -3268,7 +3268,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f1208bc
+    const p1, 0x7f1208e0
 
     return p1
 
@@ -3295,14 +3295,14 @@
 
     if-ne p1, v3, :cond_6
 
-    const p1, 0x7f1208b8
+    const p1, 0x7f1208dc
 
     return p1
 
     :cond_6
     if-nez p1, :cond_7
 
-    const p1, 0x7f1208b7
+    const p1, 0x7f1208db
 
     return p1
 
@@ -3329,9 +3329,9 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f1208ba
+    const v0, 0x7f1208de
 
-    const v1, 0x7f1208b9
+    const v1, 0x7f1208dd
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -3348,7 +3348,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f1208bb
+    const p1, 0x7f1208df
 
     return p1
 
@@ -3361,7 +3361,7 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -3403,72 +3403,72 @@
     return p1
 
     :sswitch_0
-    const p1, 0x7f120b70
+    const p1, 0x7f120ba1
 
     return p1
 
     :sswitch_1
-    const p1, 0x7f120b80
+    const p1, 0x7f120bb1
 
     return p1
 
     :sswitch_2
-    const p1, 0x7f120b7a
+    const p1, 0x7f120bab
 
     return p1
 
     :sswitch_3
-    const p1, 0x7f120b76
+    const p1, 0x7f120ba7
 
     return p1
 
     :sswitch_4
-    const p1, 0x7f1203a5
+    const p1, 0x7f1203ca
 
     return p1
 
     :sswitch_5
-    const p1, 0x7f12126f    # 1.94163E38f
+    const p1, 0x7f1212f7
 
     return p1
 
     :sswitch_6
-    const p1, 0x7f120bd4
+    const p1, 0x7f120c06
 
     return p1
 
     :sswitch_7
-    const p1, 0x7f1204d8
+    const p1, 0x7f1204fd
 
     return p1
 
     :sswitch_8
-    const p1, 0x7f120be0
+    const p1, 0x7f120c12
 
     return p1
 
     :sswitch_9
-    const p1, 0x7f1210bc
+    const p1, 0x7f121143
 
     return p1
 
     :sswitch_a
-    const p1, 0x7f120428
+    const p1, 0x7f12044d
 
     return p1
 
     :sswitch_b
-    const p1, 0x7f12126c
+    const p1, 0x7f1212f4
 
     return p1
 
     :sswitch_c
-    const p1, 0x7f120b9e
+    const p1, 0x7f120bcf
 
     return p1
 
     :sswitch_d
-    const p1, 0x7f120f13
+    const p1, 0x7f120f9a
 
     return p1
 
@@ -3478,42 +3478,42 @@
     return p1
 
     :sswitch_f
-    const p1, 0x7f120577
+    const p1, 0x7f12059c
 
     return p1
 
     :sswitch_10
-    const p1, 0x7f120b73
+    const p1, 0x7f120ba4
 
     return p1
 
     :sswitch_11
-    const p1, 0x7f12103c
+    const p1, 0x7f1210c3
 
     return p1
 
     :sswitch_12
-    const p1, 0x7f12103a
+    const p1, 0x7f1210c1
 
     return p1
 
     :sswitch_13
-    const p1, 0x7f120f14
+    const p1, 0x7f120f9b
 
     return p1
 
     :sswitch_14
-    const p1, 0x7f1210f3
+    const p1, 0x7f121178
 
     return p1
 
     :sswitch_15
-    const p1, 0x7f120ecb
+    const p1, 0x7f120f52
 
     return p1
 
     :sswitch_16
-    const p1, 0x7f121360
+    const p1, 0x7f1213ec
 
     return p1
 
@@ -3523,7 +3523,7 @@
     return p1
 
     :sswitch_18
-    const p1, 0x7f120b7c
+    const p1, 0x7f120bad
 
     return p1
 
@@ -3536,12 +3536,12 @@
 
     if-ne p1, p2, :cond_0
 
-    const p1, 0x7f120b6c
+    const p1, 0x7f120b9d
 
     return p1
 
     :cond_0
-    const p1, 0x7f120b6e
+    const p1, 0x7f120b9f
 
     return p1
 
@@ -3551,17 +3551,17 @@
     return p1
 
     :sswitch_1b
-    const p1, 0x7f1202a0
+    const p1, 0x7f1202a2
 
     return p1
 
     :cond_1
-    const p1, 0x7f120af0
+    const p1, 0x7f120b21
 
     return p1
 
     :cond_2
-    const p1, 0x7f120478
+    const p1, 0x7f12049d
 
     return p1
 
@@ -3633,7 +3633,7 @@
     if-eq p2, v0, :cond_1
 
     :goto_0
-    const p2, 0x7f0600c2
+    const p2, 0x7f0600c3
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3642,7 +3642,7 @@
     return p1
 
     :cond_1
-    const p2, 0x7f06011a
+    const p2, 0x7f06011b
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3651,7 +3651,7 @@
     return p1
 
     :cond_2
-    const p2, 0x7f060125
+    const p2, 0x7f060126
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3660,7 +3660,7 @@
     return p1
 
     :cond_3
-    const p2, 0x7f060104
+    const p2, 0x7f060105
 
     invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -3702,7 +3702,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f1208ad
+    const p1, 0x7f1208d1
 
     return p1
 
@@ -3715,19 +3715,19 @@
 
     if-eqz v0, :cond_7
 
-    const v0, 0x7f1208a6
+    const v0, 0x7f1208ca
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v3
 
-    const v0, 0x7f1208a7
+    const v0, 0x7f1208cb
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v4
 
-    const v0, 0x7f1208a8
+    const v0, 0x7f1208cc
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3772,14 +3772,14 @@
 
     if-ne p1, v3, :cond_1
 
-    const p1, 0x7f1208a5
+    const p1, 0x7f1208c9
 
     return p1
 
     :cond_1
     if-nez p1, :cond_2
 
-    const p1, 0x7f1208a4
+    const p1, 0x7f1208c8
 
     return p1
 
@@ -3820,14 +3820,14 @@
 
     if-ne p1, v3, :cond_4
 
-    const p1, 0x7f1208a2
+    const p1, 0x7f1208c6
 
     return p1
 
     :cond_4
     if-nez p1, :cond_5
 
-    const p1, 0x7f1208a1
+    const p1, 0x7f1208c5
 
     return p1
 
@@ -3854,7 +3854,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f1208ac
+    const p1, 0x7f1208d0
 
     return p1
 
@@ -3867,7 +3867,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -3880,7 +3880,7 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f1208aa
+    const p1, 0x7f1208ce
 
     return p1
 
@@ -3931,7 +3931,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f1208bf
+    const p1, 0x7f1208e3
 
     return p1
 
@@ -3944,9 +3944,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f1208c5
+    const v0, 0x7f1208e9
 
-    const v1, 0x7f1208c4
+    const v1, 0x7f1208e8
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -3963,7 +3963,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f12086c
+    const p1, 0x7f120890
 
     return p1
 
@@ -3976,9 +3976,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f1208c1
+    const v0, 0x7f1208e5
 
-    const v1, 0x7f1208c0
+    const v1, 0x7f1208e4
 
     invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
 
@@ -5396,7 +5396,7 @@
 
     invoke-virtual {v9, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder;
 
-    sget-object v0, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     new-array v0, v15, [Ljava/lang/Object;
 
@@ -5479,7 +5479,7 @@
     throw v0
 
     :cond_d
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
index 4c833d8146..bb417335a6 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, 0x7f12086e
+    const p1, 0x7f120892
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f120871
-
-    return p1
-
-    :pswitch_2
-    const p1, 0x7f12086d
-
-    return p1
-
-    :pswitch_3
-    const p1, 0x7f1208c3
-
-    return p1
-
-    :pswitch_4
-    const p1, 0x7f1208c6
-
-    return p1
-
-    :pswitch_5
-    const p1, 0x7f1208c2
-
-    return p1
-
-    :pswitch_6
-    const p1, 0x7f120896
-
-    return p1
-
-    :pswitch_7
-    const p1, 0x7f12089d
-
-    return p1
-
-    :pswitch_8
     const p1, 0x7f120895
 
     return p1
 
+    :pswitch_2
+    const p1, 0x7f120891
+
+    return p1
+
+    :pswitch_3
+    const p1, 0x7f1208e7
+
+    return p1
+
+    :pswitch_4
+    const p1, 0x7f1208ea
+
+    return p1
+
+    :pswitch_5
+    const p1, 0x7f1208e6
+
+    return p1
+
+    :pswitch_6
+    const p1, 0x7f1208ba
+
+    return p1
+
+    :pswitch_7
+    const p1, 0x7f1208c1
+
+    return p1
+
+    :pswitch_8
+    const p1, 0x7f1208b9
+
+    return p1
+
     :pswitch_9
-    const p1, 0x7f1208b4
+    const p1, 0x7f1208d8
 
     return p1
 
     :pswitch_a
-    const p1, 0x7f1208bd
+    const p1, 0x7f1208e1
 
     return p1
 
     :pswitch_b
-    const p1, 0x7f1208b3
+    const p1, 0x7f1208d7
 
     return p1
 
     :pswitch_c
-    const p1, 0x7f1208ab
+    const p1, 0x7f1208cf
 
     return p1
 
     :pswitch_d
-    const p1, 0x7f1208ae
+    const p1, 0x7f1208d2
 
     return p1
 
     :pswitch_e
-    const p1, 0x7f1208a0
+    const p1, 0x7f1208c4
 
     return p1
 
     :pswitch_f
-    const p1, 0x7f12089f
+    const p1, 0x7f1208c3
 
     return p1
 
     :pswitch_10
-    const p1, 0x7f1208a9
+    const p1, 0x7f1208cd
 
     return p1
 
     :pswitch_11
-    const p1, 0x7f1208a3
+    const p1, 0x7f1208c7
 
     return p1
 
     :pswitch_12
-    const p1, 0x7f12085c
+    const p1, 0x7f120880
 
     return p1
 
     :pswitch_13
-    const p1, 0x7f12085d
+    const p1, 0x7f120881
 
     return p1
 
     :pswitch_14
-    const p1, 0x7f12085b
+    const p1, 0x7f12087f
 
     return p1
 
     :pswitch_15
-    const p1, 0x7f120856
+    const p1, 0x7f12087a
 
     return p1
 
     :pswitch_16
-    const p1, 0x7f12086a
+    const p1, 0x7f12088e
 
     return p1
 
@@ -292,17 +292,17 @@
 
     if-eq p1, v0, :cond_3
 
-    const p1, 0x7f120865
+    const p1, 0x7f120889
 
     return p1
 
     :cond_3
-    const p1, 0x7f120855
+    const p1, 0x7f120879
 
     return p1
 
     :cond_4
-    const p1, 0x7f12086b
+    const p1, 0x7f12088f
 
     return p1
 
@@ -322,12 +322,12 @@
     return p1
 
     :cond_7
-    const p1, 0x7f1208af
+    const p1, 0x7f1208d3
 
     return p1
 
     :cond_8
-    const p1, 0x7f120887
+    const p1, 0x7f1208ab
 
     return p1
 
@@ -946,7 +946,7 @@
 
     if-gez v5, :cond_0
 
-    const v0, 0x7f1208be
+    const v0, 0x7f1208e2
 
     const/4 v1, 0x2
 
@@ -1038,137 +1038,137 @@
     return p1
 
     :pswitch_0
-    const p1, 0x7f120840
+    const p1, 0x7f120864
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f120841
+    const p1, 0x7f120865
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f12083f
+    const p1, 0x7f120863
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120851
+    const p1, 0x7f120875
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f120852
+    const p1, 0x7f120876
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120850
+    const p1, 0x7f120874
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f120844
+    const p1, 0x7f120868
 
     return p1
 
     :pswitch_7
-    const p1, 0x7f120845
+    const p1, 0x7f120869
 
     return p1
 
     :pswitch_8
-    const p1, 0x7f120843
+    const p1, 0x7f120867
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f12084e
+    const p1, 0x7f120872
 
     return p1
 
     :pswitch_a
-    const p1, 0x7f12084f
+    const p1, 0x7f120873
 
     return p1
 
     :pswitch_b
-    const p1, 0x7f12084d
+    const p1, 0x7f120871
 
     return p1
 
     :pswitch_c
-    const p1, 0x7f12084a
+    const p1, 0x7f12086e
 
     return p1
 
     :pswitch_d
-    const p1, 0x7f12084b
+    const p1, 0x7f12086f
 
     return p1
 
     :pswitch_e
-    const p1, 0x7f120847
+    const p1, 0x7f12086b
 
     return p1
 
     :pswitch_f
-    const p1, 0x7f120846
+    const p1, 0x7f12086a
 
     return p1
 
     :pswitch_10
-    const p1, 0x7f120849
+    const p1, 0x7f12086d
 
     return p1
 
     :pswitch_11
-    const p1, 0x7f120848
+    const p1, 0x7f12086c
 
     return p1
 
     :pswitch_12
-    const p1, 0x7f12083c
+    const p1, 0x7f120860
 
     return p1
 
     :pswitch_13
-    const p1, 0x7f12083d
+    const p1, 0x7f120861
 
     return p1
 
     :pswitch_14
-    const p1, 0x7f12083b
+    const p1, 0x7f12085f
 
     return p1
 
     :pswitch_15
-    const p1, 0x7f12083a
+    const p1, 0x7f12085e
 
     return p1
 
     :pswitch_16
-    const p1, 0x7f12083e
+    const p1, 0x7f120862
 
     return p1
 
     :pswitch_17
-    const p1, 0x7f120839
+    const p1, 0x7f12085d
 
     return p1
 
     :cond_0
-    const p1, 0x7f12084c
+    const p1, 0x7f120870
 
     return p1
 
     :cond_1
-    const p1, 0x7f120842
+    const p1, 0x7f120866
 
     return p1
 
     :cond_2
-    const p1, 0x7f1208d2
+    const p1, 0x7f1208f6
 
     return p1
 
@@ -1261,17 +1261,17 @@
     return p1
 
     :cond_1
-    const p1, 0x7f0801e6
+    const p1, 0x7f0801f1
 
     return p1
 
     :cond_2
-    const p1, 0x7f0801e7
+    const p1, 0x7f0801f2
 
     return p1
 
     :cond_3
-    const p1, 0x7f0801e5
+    const p1, 0x7f0801f0
 
     return p1
 .end method
@@ -1496,7 +1496,7 @@
 
     move-result-object p2
 
-    const v5, 0x7f100069
+    const v5, 0x7f10006a
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
@@ -1724,7 +1724,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f100065
+    const v0, 0x7f100066
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
 
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 847dacfc27..53156b302f 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 431e6fc403..def7ddb532 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -326,7 +326,7 @@
 
     iget v0, v4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzy:I
+    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
 
     sub-int/2addr v0, v1
 
@@ -344,7 +344,7 @@
 
     iget v5, v4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bzy:I
+    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
 
     sub-int/2addr v5, v6
 
@@ -360,17 +360,17 @@
 
     iget-object v5, v4, Lorg/apache/commons/a/a/b$a;->buffer:[B
 
-    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bzy:I
+    iget v6, v4, Lorg/apache/commons/a/a/b$a;->bzI: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;->bzy:I
+    iget v5, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
 
     add-int/2addr v5, v1
 
-    iput v5, v4, Lorg/apache/commons/a/a/b$a;->bzy:I
+    iput v5, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
 
-    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzy:I
+    iget v1, v4, Lorg/apache/commons/a/a/b$a;->bzI:I
 
     iget v5, v4, Lorg/apache/commons/a/a/b$a;->pos:I
 
@@ -380,7 +380,7 @@
 
     :cond_2
     :goto_1
-    sget-object v1, Lorg/apache/commons/a/a;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lorg/apache/commons/a/a;->tw:Ljava/nio/charset/Charset;
 
     if-nez v0, :cond_3
 
diff --git a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
index e091d7b706..fd462daea8 100644
--- a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
@@ -4,12 +4,52 @@
 
 
 # static fields
+.field private static final ALL_PAID_PLANS:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private static final GRANDFATHERED_MONTHLY_END_DATE:Ljava/util/Date;
 
 .field private static final GRANDFATHERED_YEARLY_END_DATE:Ljava/util/Date;
 
 .field public static final MAX_INVOICE_PAYMENT_DAYS:I = 0x3
 
+.field private static final NONE_PLANS:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final TIER_1_PLANS:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final TIER_2_PLANS:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 .field private static final UPGRADE_ELIGIBILITY:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -25,7 +65,7 @@
 
 # direct methods
 .method static constructor <clinit>()V
-    .locals 9
+    .locals 6
 
     invoke-static {}, Ljava/util/Calendar;->getInstance()Ljava/util/Calendar;
 
@@ -75,35 +115,79 @@
 
     sput-object v0, Lcom/discord/utilities/billing/PremiumUtilsKt;->GRANDFATHERED_YEARLY_END_DATE:Ljava/util/Date;
 
-    const/4 v0, 0x7
+    const/4 v0, 0x2
 
-    new-array v0, v0, [Lkotlin/Pair;
+    new-array v3, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    const/4 v3, 0x4
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    new-array v4, v3, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    aput-object v4, v3, v2
 
-    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    aput-object v5, v4, v2
+    aput-object v4, v3, v1
 
-    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    invoke-static {v3}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
 
-    aput-object v5, v4, v1
+    move-result-object v3
 
-    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sput-object v3, Lcom/discord/utilities/billing/PremiumUtilsKt;->NONE_PLANS:Ljava/util/Set;
 
-    const/4 v6, 0x2
+    new-array v3, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    aput-object v5, v4, v6
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    aput-object v4, v3, v2
 
-    const/4 v7, 0x3
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    aput-object v5, v4, v7
+    aput-object v4, v3, v1
 
-    invoke-static {v4}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v3}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v3
+
+    sput-object v3, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_1_PLANS:Ljava/util/Set;
+
+    new-array v3, v0, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    aput-object v4, v3, v2
+
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    aput-object v4, v3, v1
+
+    invoke-static {v3}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v3
+
+    sput-object v3, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_2_PLANS:Ljava/util/Set;
+
+    sget-object v3, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_1_PLANS:Ljava/util/Set;
+
+    sget-object v4, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_2_PLANS:Ljava/util/Set;
+
+    check-cast v4, Ljava/lang/Iterable;
+
+    invoke-static {v3, v4}, Lkotlin/a/ak;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
+
+    move-result-object v3
+
+    sput-object v3, Lcom/discord/utilities/billing/PremiumUtilsKt;->ALL_PAID_PLANS:Ljava/util/Set;
+
+    const/16 v3, 0x9
+
+    new-array v3, v3, [Lkotlin/Pair;
+
+    sget-object v4, Lcom/discord/utilities/billing/PremiumUtilsKt;->NONE_PLANS:Ljava/util/Set;
+
+    sget-object v5, Lcom/discord/utilities/billing/PremiumUtilsKt;->ALL_PAID_PLANS:Ljava/util/Set;
+
+    check-cast v5, Ljava/lang/Iterable;
+
+    invoke-static {v4, v5}, Lkotlin/a/ak;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v4
 
@@ -113,119 +197,151 @@
 
     move-result-object v4
 
-    aput-object v4, v0, v2
+    aput-object v4, v3, v2
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    new-array v5, v7, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    sget-object v8, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    aput-object v8, v5, v2
-
-    sget-object v8, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    aput-object v8, v5, v1
-
-    sget-object v8, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    aput-object v8, v5, v6
-
-    invoke-static {v5}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v5
-
-    invoke-static {v4, v5}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v4}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v4
 
-    aput-object v4, v0, v1
+    sget-object v5, Lcom/discord/utilities/billing/PremiumUtilsKt;->ALL_PAID_PLANS:Ljava/util/Set;
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    check-cast v5, Ljava/lang/Iterable;
 
-    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {v5}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v5
-
-    invoke-static {v4, v5}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v4, v5}, Lkotlin/a/ak;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v4
 
-    aput-object v4, v0, v6
+    invoke-static {v2, v4}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    move-result-object v2
 
-    new-array v5, v7, [Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    aput-object v2, v3, v1
 
-    sget-object v8, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->NONE_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    aput-object v8, v5, v2
+    sget-object v2, Lcom/discord/utilities/billing/PremiumUtilsKt;->ALL_PAID_PLANS:Ljava/util/Set;
 
-    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    aput-object v2, v5, v1
-
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    aput-object v1, v5, v6
-
-    invoke-static {v5}, Lkotlin/a/ak;->setOf([Ljava/lang/Object;)Ljava/util/Set;
+    invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
     move-result-object v1
 
-    invoke-static {v4, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    aput-object v1, v3, v0
 
-    move-result-object v1
-
-    aput-object v1, v0, v7
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     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_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {v2}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v1}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v1
 
-    aput-object v1, v0, v3
+    sget-object v2, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_2_PLANS:Ljava/util/Set;
 
-    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    check-cast v2, Ljava/lang/Iterable;
 
-    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-static {v2}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v1, v2}, Lkotlin/a/ak;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
 
     move-result-object v1
 
-    const/4 v2, 0x5
+    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    aput-object v1, v0, v2
+    move-result-object v0
+
+    const/4 v1, 0x3
+
+    aput-object v0, v3, v1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    invoke-static {}, Lkotlin/a/ak;->emptySet()Ljava/util/Set;
-
-    move-result-object v2
-
-    invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+    invoke-static {v1}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
 
     move-result-object v1
 
-    const/4 v2, 0x6
+    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
 
-    aput-object v1, v0, v2
+    move-result-object v0
 
-    invoke-static {v0}, Lkotlin/a/ad;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+    const/4 v1, 0x4
+
+    aput-object v0, v3, v1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {v1}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v1
+
+    sget-object v2, Lcom/discord/utilities/billing/PremiumUtilsKt;->TIER_2_PLANS:Ljava/util/Set;
+
+    check-cast v2, Ljava/lang/Iterable;
+
+    invoke-static {v1, v2}, Lkotlin/a/ak;->plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    const/4 v1, 0x5
+
+    aput-object v0, v3, v1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {v1}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    const/4 v1, 0x6
+
+    aput-object v0, v3, v1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    sget-object v1, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {v1}, Lkotlin/a/ak;->setOf(Ljava/lang/Object;)Ljava/util/Set;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    const/4 v1, 0x7
+
+    aput-object v0, v3, v1
+
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+
+    invoke-static {}, Lkotlin/a/ak;->emptySet()Ljava/util/Set;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
+    move-result-object v0
+
+    const/16 v1, 0x8
+
+    aput-object v0, v3, v1
+
+    invoke-static {v3}, Lkotlin/a/ad;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
 
     move-result-object v0
 
@@ -307,14 +423,14 @@
 
     if-eqz v0, :cond_0
 
-    const p0, 0x7f080248
+    const p0, 0x7f080254
 
     return p0
 
     :cond_0
     instance-of v0, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourceCard;
 
-    const v1, 0x7f080246
+    const v1, 0x7f080252
 
     if-eqz v0, :cond_3
 
@@ -362,7 +478,7 @@
 
     if-eqz p0, :cond_1
 
-    const p0, 0x7f080245
+    const p0, 0x7f080251
 
     return p0
 
@@ -386,7 +502,7 @@
 
     if-eqz p0, :cond_1
 
-    const p0, 0x7f080249
+    const p0, 0x7f080255
 
     return p0
 
@@ -400,7 +516,7 @@
     if-eqz p0, :cond_1
 
     :goto_0
-    const p0, 0x7f080244
+    const p0, 0x7f080250
 
     return p0
 
@@ -414,7 +530,7 @@
     if-eqz p0, :cond_1
 
     :goto_1
-    const p0, 0x7f080247
+    const p0, 0x7f080253
 
     return p0
 
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 01a74818e4..4176eb8fd9 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, 0x7f120384
+    const v1, 0x7f1203a9
 
     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 3573b69a39..bf4a81e1aa 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,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;->uR()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/safetynet/SafetyNetApi$RecaptchaTokenResponse;->uU()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 46d5c76620..5d30a1bf01 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, 0x7f120383
+    const v1, 0x7f1203a8
 
     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 b86ce379c2..5a0511646b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a997824078..83de5c005c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 882337647f..c1a0ab3179 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 29a6f5d012..bd5e5c41b5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 63bcf2b978..9a280991ca 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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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 1ad63887fd..af960d51fb 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
@@ -129,9 +129,9 @@
 
     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;->ahm:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p2, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     :goto_0
     new-instance p2, Lcom/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$1;
@@ -170,7 +170,7 @@
     :cond_2
     new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
 
-    const p2, 0x7f120385
+    const p2, 0x7f1203aa
 
     const-string p3, "unsupported_device"
 
@@ -200,9 +200,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLb:Lcom/google/android/gms/safetynet/SafetyNetApi;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLk:Lcom/google/android/gms/safetynet/SafetyNetApi;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/h;->afn:Lcom/google/android/gms/common/api/i;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/h;->afw:Lcom/google/android/gms/common/api/i;
 
     const-string v1, "6Lff5jIUAAAAAImNXvYYPv2VW2En3Dexy4oX2o4s"
 
@@ -284,19 +284,19 @@
 
     invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v2, 0x7f120388
+    const v2, 0x7f1203ad
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f120389
+    const v2, 0x7f1203ae
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f120387
+    const v2, 0x7f1203ac
 
     new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
 
@@ -308,7 +308,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f12037b
+    const p2, 0x7f1203a0
 
     const/4 v1, 0x2
 
@@ -362,7 +362,7 @@
 
     check-cast v0, Lrx/functions/Action1;
 
-    sget-object p1, Lrx/Emitter$a;->bFX:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)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 a4dd7880e9..76bbd03f19 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -318,7 +318,7 @@
     :cond_1
     if-eqz v0, :cond_2
 
-    const p2, 0x7f1207f2
+    const p2, 0x7f120816
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -332,7 +332,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    const p2, 0x7f120a0c
+    const p2, 0x7f120a41
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -352,7 +352,7 @@
 
     if-eqz v0, :cond_6
 
-    const p2, 0x7f120512
+    const p2, 0x7f120537
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -376,7 +376,7 @@
 
     if-eqz v0, :cond_8
 
-    const p2, 0x7f120a0b
+    const p2, 0x7f120a40
 
     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 913d2bd7db..474b84be1b 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali
index 829aa448e1..9a6071c7ab 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     const/4 v0, 0x0
 
diff --git a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
index a48f9156c3..aa8f55119a 100644
--- a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
@@ -405,7 +405,7 @@
     return p1
 
     :cond_2
-    const p1, 0x7f080284
+    const p1, 0x7f080290
 
     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 42fe5a7eb4..b02e1864de 100644
--- a/com.discord/smali/com/discord/utilities/embed/FileType.smali
+++ b/com.discord/smali/com/discord/utilities/embed/FileType.smali
@@ -392,52 +392,52 @@
     throw v0
 
     :pswitch_0
-    const v0, 0x7f080287
+    const v0, 0x7f080293
 
     return v0
 
     :pswitch_1
-    const v0, 0x7f080283
+    const v0, 0x7f08028f
 
     return v0
 
     :pswitch_2
-    const v0, 0x7f08027c
+    const v0, 0x7f080288
 
     return v0
 
     :pswitch_3
-    const v0, 0x7f08027b
+    const v0, 0x7f080287
 
     return v0
 
     :pswitch_4
-    const v0, 0x7f08027a
+    const v0, 0x7f080286
 
     return v0
 
     :pswitch_5
-    const v0, 0x7f080279
+    const v0, 0x7f080285
 
     return v0
 
     :pswitch_6
-    const v0, 0x7f080282
+    const v0, 0x7f08028e
 
     return v0
 
     :pswitch_7
-    const v0, 0x7f080278
+    const v0, 0x7f080284
 
     return v0
 
     :pswitch_8
-    const v0, 0x7f080277
+    const v0, 0x7f080283
 
     return v0
 
     :pswitch_9
-    const v0, 0x7f080286
+    const v0, 0x7f080292
 
     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 b3c6b202bc..6210171035 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;->bEH:Lokhttp3/Response;
+    iget-object v4, v0, Lb/m;->bER:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v4, v4, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
-    iget-object v5, v0, Lb/m;->bEJ:Lokhttp3/x;
+    iget-object v5, v0, Lb/m;->bET:Lokhttp3/x;
 
     if-eqz v5, :cond_2
 
@@ -162,11 +162,11 @@
     :goto_0
     if-eqz v6, :cond_1
 
-    iget-object v1, v6, Lokhttp3/MediaType;->bri:Ljava/lang/String;
+    iget-object v1, v6, Lokhttp3/MediaType;->brs:Ljava/lang/String;
 
     :cond_1
     :try_start_0
-    invoke-virtual {v5}, Lokhttp3/x;->FO()Ljava/lang/String;
+    invoke-virtual {v5}, Lokhttp3/x;->FR()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;->bEH:Lokhttp3/Response;
+    iget-object v0, v0, Lb/m;->bER: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;->bsq:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p0, p0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bnk: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, 0x7f120bef
+    const v0, 0x7f120c21
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -654,7 +654,7 @@
     return-object p1
 
     :pswitch_1
-    const v0, 0x7f120a04
+    const v0, 0x7f120a39
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -667,7 +667,7 @@
     return-object p1
 
     :pswitch_2
-    const v0, 0x7f120bee
+    const v0, 0x7f120c20
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -680,7 +680,7 @@
     return-object p1
 
     :pswitch_3
-    const v0, 0x7f120beb
+    const v0, 0x7f120c1d
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -693,7 +693,7 @@
     return-object p1
 
     :pswitch_4
-    const v0, 0x7f1211aa
+    const v0, 0x7f121232
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -706,7 +706,7 @@
     return-object p1
 
     :pswitch_5
-    const v0, 0x7f120bed
+    const v0, 0x7f120c1f
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -719,7 +719,7 @@
     return-object p1
 
     :pswitch_6
-    const v0, 0x7f120be9
+    const v0, 0x7f120c1b
 
     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, 0x7f120be6
+    const v1, 0x7f120c18
 
     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, 0x7f120bea
+    const v1, 0x7f120c1c
 
     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, 0x7f120f06
+    const v0, 0x7f120f8d
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -775,7 +775,7 @@
     return-object p1
 
     :pswitch_a
-    const v0, 0x7f120be8
+    const v0, 0x7f120c1a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -788,7 +788,7 @@
     return-object p1
 
     :pswitch_b
-    const v0, 0x7f120be7
+    const v0, 0x7f120c19
 
     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, 0x7f120bec
+    const v1, 0x7f120c1e
 
     invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
index 49848e1b78..61a6a84567 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationActions.smali
@@ -87,7 +87,7 @@
 
     move-result-wide v2
 
-    sget-object p1, Lcom/discord/workers/MessageAckWorker;->FG:Lcom/discord/workers/MessageAckWorker$a;
+    sget-object p1, Lcom/discord/workers/MessageAckWorker;->FP:Lcom/discord/workers/MessageAckWorker$a;
 
     new-instance p1, Landroidx/work/Data$Builder;
 
@@ -303,7 +303,7 @@
     goto/16 :goto_1
 
     :cond_1
-    sget-object p1, Lcom/discord/workers/MessageSendWorker;->FH:Lcom/discord/workers/MessageSendWorker$a;
+    sget-object p1, Lcom/discord/workers/MessageSendWorker;->FQ:Lcom/discord/workers/MessageSendWorker$a;
 
     const-string p1, "message"
 
@@ -569,7 +569,7 @@
 
     :cond_6
     :goto_2
-    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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 75e05ac3ce..806be8103c 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali
@@ -32,11 +32,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBG:Ljava/util/Map;
+    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBP:Ljava/util/Map;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aCi:Landroid/os/Bundle;
+    iget-object v0, p1, Lcom/google/firebase/messaging/RemoteMessage;->aCr:Landroid/os/Bundle;
 
     new-instance v1, Landroidx/collection/ArrayMap;
 
@@ -119,10 +119,10 @@
     goto :goto_0
 
     :cond_1
-    iput-object v1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBG:Ljava/util/Map;
+    iput-object v1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBP:Ljava/util/Map;
 
     :cond_2
-    iget-object p1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBG:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/firebase/messaging/RemoteMessage;->aBP:Ljava/util/Map;
 
     const-string v0, "remoteMessage.data"
 
@@ -196,7 +196,7 @@
 
     if-nez v1, :cond_4
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v4, 0x0
 
@@ -284,7 +284,7 @@
 
     if-eqz v1, :cond_9
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const/4 v4, 0x0
 
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 7a7779631c..05aa7d9d6d 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 912f1fceb7..b4e05e50ed 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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 da6e5b472d..e49451cd21 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 81c89f0c6a..130a202e8f 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;->Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
@@ -274,7 +274,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
 
     invoke-static {v0}, Lcom/google/firebase/iid/j;->c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
 
@@ -315,7 +315,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v2, p1
 
@@ -372,7 +372,7 @@
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 906fedfa76..6088123124 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1181,7 +1181,7 @@
 
     if-eqz v0, :cond_c
 
-    const v0, 0x7f120cfe
+    const v0, 0x7f120d30
 
     new-array v1, v6, [Ljava/lang/Object;
 
@@ -1269,7 +1269,7 @@
     return-object v1
 
     :cond_2
-    const v0, 0x7f120c81
+    const v0, 0x7f120cb3
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1290,7 +1290,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f120c7f
+    const v0, 0x7f120cb1
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1342,7 +1342,7 @@
 
     if-ne v0, v4, :cond_6
 
-    const v0, 0x7f120c87
+    const v0, 0x7f120cb9
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1365,7 +1365,7 @@
     :cond_6
     if-ne v0, v6, :cond_7
 
-    const v0, 0x7f120c85
+    const v0, 0x7f120cb7
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1412,7 +1412,7 @@
 
     if-nez v0, :cond_9
 
-    const v0, 0x7f120c7d
+    const v0, 0x7f120caf
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -1442,7 +1442,7 @@
 
     if-eqz v0, :cond_c
 
-    const v0, 0x7f120725
+    const v0, 0x7f120749
 
     new-array v1, v6, [Ljava/lang/Object;
 
@@ -1476,7 +1476,7 @@
     goto :goto_0
 
     :cond_a
-    const v0, 0x7f120c89
+    const v0, 0x7f120cbb
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1485,7 +1485,7 @@
     goto :goto_0
 
     :cond_b
-    const v0, 0x7f120c7b
+    const v0, 0x7f120cad
 
     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, 0x7f121038    # 1.941515E38f
+    const v0, 0x7f1210bf
 
     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, 0x7f080368
+    const v3, 0x7f080374
 
-    const v4, 0x7f120c8a
+    const v4, 0x7f120cbc
 
     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, 0x7f08022f
+    const v2, 0x7f08023a
 
-    const v3, 0x7f120b83
+    const v3, 0x7f120bb4
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2601,7 +2601,7 @@
     goto :goto_0
 
     :cond_0
-    const v2, 0x7f12052a
+    const v2, 0x7f12054f
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2788,7 +2788,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f08030f
+    const v0, 0x7f08031b
 
     return v0
 
@@ -2801,7 +2801,7 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080311
+    const v0, 0x7f08031d
 
     return v0
 
@@ -2814,13 +2814,13 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f080310
+    const v0, 0x7f08031c
 
     return v0
 
     :cond_3
     :goto_0
-    const v0, 0x7f08030e
+    const v0, 0x7f08031a
 
     return v0
 .end method
@@ -2864,7 +2864,7 @@
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1209c5
+    const v0, 0x7f1209fa
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2982,7 +2982,7 @@
 
     if-nez v0, :cond_4
 
-    const v0, 0x7f120c8f
+    const v0, 0x7f120cc1
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -3002,7 +3002,7 @@
 
     if-eqz v0, :cond_5
 
-    const v0, 0x7f120726
+    const v0, 0x7f12074a
 
     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 c5afb12139..00118fdf22 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 39a67bee89..c8325e51ff 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 bbb926c2c2..528a287ed3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cd537d8f02..5c0e2c8a46 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b88de81cbe..af1b377689 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c7403772e5..6ee7ce7d57 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, 0x7f0600f5
+    const p3, 0x7f0600f6
 
     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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v2, p2
 
@@ -432,7 +432,7 @@
 
     invoke-direct {v0}, Landroidx/core/app/Person$Builder;-><init>()V
 
-    const v1, 0x7f120b92
+    const v1, 0x7f120bc3
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -823,12 +823,12 @@
 
     if-eqz p5, :cond_0
 
-    const p5, 0x7f120c8c
+    const p5, 0x7f120cbe
 
     goto :goto_0
 
     :cond_0
-    const p5, 0x7f120c8b
+    const p5, 0x7f120cbd
 
     :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, 0x7f080311
+    const v3, 0x7f08031d
 
     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, 0x7f120369
+    const v1, 0x7f12038e
 
     invoke-virtual {p1, v1}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -963,7 +963,7 @@
 
     new-instance v2, Landroid/app/NotificationChannel;
 
-    const v4, 0x7f121369
+    const v4, 0x7f1213f5
 
     invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -979,7 +979,7 @@
 
     new-instance v4, Landroid/app/NotificationChannel;
 
-    const v6, 0x7f120bb7
+    const v6, 0x7f120be8
 
     invoke-virtual {p1, v6}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -995,7 +995,7 @@
 
     new-instance v6, Landroid/app/NotificationChannel;
 
-    const v8, 0x7f120513
+    const v8, 0x7f120538
 
     invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1009,7 +1009,7 @@
 
     new-instance v8, Landroid/app/NotificationChannel;
 
-    const v9, 0x7f1206bb
+    const v9, 0x7f1206df
 
     invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1023,7 +1023,7 @@
 
     new-instance v9, Landroid/app/NotificationChannel;
 
-    const v10, 0x7f120702
+    const v10, 0x7f120726
 
     invoke-virtual {p1, v10}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
@@ -1088,7 +1088,7 @@
 
     invoke-virtual {v6, v11}, Landroid/app/NotificationChannel;->enableLights(Z)V
 
-    const v7, 0x7f0600f5
+    const v7, 0x7f0600f6
 
     invoke-virtual {p1, v7}, Landroid/app/Application;->getColor(I)I
 
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
index b8146e8450..27f98a19db 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionHelper.smali
@@ -475,7 +475,7 @@
 
     if-eqz v2, :cond_1
 
-    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
@@ -579,7 +579,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 cfbdaca83f..cf127f116c 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, 0x7f08030e
+    const v3, 0x7f08031a
 
     invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
 
     move-result-object v2
 
-    const v3, 0x7f12052a
+    const v3, 0x7f12054f
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -126,7 +126,7 @@
 
     if-nez p2, :cond_0
 
-    const p2, 0x7f120702
+    const p2, 0x7f120726
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -135,7 +135,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f1206fd
+    const v3, 0x7f120721
 
     const/4 v4, 0x1
 
@@ -239,7 +239,7 @@
 
     :catch_0
     :try_start_2
-    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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 d4827c393d..bfa4390209 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8467a268ef..c5770c9f9f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8f4c553a6e..0326ea2417 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;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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 2c0cfc455a..a83a55167f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 55f4d67640..c628786ee7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e6d3077761..481a9e5a26 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 db4c46f052..1def6c98d8 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;->vJ:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->m(Ljava/lang/Object;)V
 
@@ -211,7 +211,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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;->vJ:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->n(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali b/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali
index 165f46cb10..34c880aa74 100644
--- a/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali
+++ b/com.discord/smali/com/discord/utilities/gifting/GiftingUtils.smali
@@ -69,7 +69,7 @@
 
     if-lez v0, :cond_0
 
-    const p1, 0x7f100025
+    const p1, 0x7f100026
 
     new-array p2, v2, [Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
 
     move-result p1
 
-    const p2, 0x7f100027
+    const p2, 0x7f100028
 
     new-array v0, v2, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali b/com.discord/smali/com/discord/utilities/guilds/RoleUtils.smali
index 91cc4f78cd..317363a9ae 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, 0x7f0600c2
+    const p2, 0x7f0600c3
 
     :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 3f8761cc8c..65c2903440 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -2710,7 +2710,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803df
+    const p1, 0x7f0803ed
 
     return p1
 
@@ -2723,7 +2723,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803ec
+    const p1, 0x7f0803fa
 
     return p1
 
@@ -2736,7 +2736,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803ef
+    const p1, 0x7f0803fd
 
     return p1
 
@@ -2771,7 +2771,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803e8
+    const p1, 0x7f0803f6
 
     return p1
 
@@ -2784,7 +2784,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803db
+    const p1, 0x7f0803e9
 
     return p1
 
@@ -2797,7 +2797,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803f4
+    const p1, 0x7f080402
 
     return p1
 
@@ -2810,7 +2810,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803e7
+    const p1, 0x7f0803f5
 
     return p1
 
@@ -2823,7 +2823,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803f2
+    const p1, 0x7f080400
 
     return p1
 
@@ -2858,7 +2858,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f0803f5
+    const p1, 0x7f080403
 
     return p1
 
@@ -2872,7 +2872,7 @@
     if-eqz p1, :cond_1
 
     :goto_0
-    const p1, 0x7f0803e2
+    const p1, 0x7f0803f0
 
     return p1
 
@@ -2886,13 +2886,13 @@
     if-eqz p1, :cond_1
 
     :goto_1
-    const p1, 0x7f0803e4
+    const p1, 0x7f0803f2
 
     return p1
 
     :cond_1
     :goto_2
-    const p1, 0x7f0803fa
+    const p1, 0x7f080408
 
     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 86ea83d013..e325859d04 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, 0x7f12121c
+    const v1, 0x7f1212a4
 
     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 10fcbc8c9a..9773d23ed9 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali
@@ -73,9 +73,9 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v1, v0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
-    iget-object v1, v1, Lcom/facebook/drawee/view/b;->Pn:Lcom/facebook/drawee/d/b;
+    iget-object v1, v1, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
 
     if-eqz v1, :cond_0
 
@@ -97,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;->hM()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/a;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
@@ -141,9 +141,9 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
     const-string v1, "requestBuilder"
 
@@ -172,16 +172,16 @@
     goto :goto_0
 
     :cond_0
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aaf:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
 
     :goto_1
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
     if-lez p1, :cond_2
 
@@ -196,7 +196,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/a/e;-><init>(II)V
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
 
     :cond_3
     return-object v0
@@ -239,7 +239,7 @@
 
     invoke-static {p5, v4}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->xm:Lcom/discord/dialogs/ImageUploadDialog$a;
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog;->xo:Lcom/discord/dialogs/ImageUploadDialog$a;
 
     invoke-static {p2, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -263,13 +263,13 @@
 
     invoke-static {p3, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p3, v0, Lcom/discord/dialogs/ImageUploadDialog;->xj:Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
+    iput-object p3, v0, Lcom/discord/dialogs/ImageUploadDialog;->xl: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;->xk:Lrx/functions/Action1;
+    iput-object p4, v0, Lcom/discord/dialogs/ImageUploadDialog;->xm:Lrx/functions/Action1;
 
-    iput-object p5, v0, Lcom/discord/dialogs/ImageUploadDialog;->xl:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    iput-object p5, v0, Lcom/discord/dialogs/ImageUploadDialog;->xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     const-class p0, Lcom/discord/dialogs/ImageUploadDialog;
 
@@ -297,37 +297,37 @@
 
     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
 
-    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aXX:Landroid/os/Bundle;
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aYg:Landroid/os/Bundle;
 
     const-string v3, "com.yalantis.ucrop.ToolbarColor"
 
     invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    const v1, 0x7f060030
+    const v1, 0x7f060031
 
     invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v1
 
-    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aXX:Landroid/os/Bundle;
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aYg:Landroid/os/Bundle;
 
     const-string v3, "com.yalantis.ucrop.StatusBarColor"
 
     invoke-virtual {v2, v3, v1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
 
-    const v1, 0x7f060149
+    const v1, 0x7f06014a
 
     invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v1
 
-    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aXX:Landroid/os/Bundle;
+    iget-object v2, v6, Lcom/yalantis/ucrop/a$a;->aYg:Landroid/os/Bundle;
 
     const-string v3, "com.yalantis.ucrop.UcropToolbarWidgetColor"
 
@@ -337,7 +337,7 @@
 
     move-result v0
 
-    iget-object v1, v6, Lcom/yalantis/ucrop/a$a;->aXX:Landroid/os/Bundle;
+    iget-object v1, v6, Lcom/yalantis/ucrop/a$a;->aYg:Landroid/os/Bundle;
 
     const-string v2, "com.yalantis.ucrop.UcropColorWidgetActive"
 
@@ -392,7 +392,7 @@
 
     const/4 v1, 0x1
 
-    const v2, 0x7f120296
+    const v2, 0x7f120298
 
     const/4 v3, 0x0
 
@@ -427,7 +427,7 @@
 
     invoke-interface {p3, p2}, Lrx/functions/Action1;->call(Ljava/lang/Object;)V
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -524,11 +524,11 @@
 
     invoke-direct {p1}, Lcom/facebook/drawee/generic/d;-><init>()V
 
-    iput-boolean v0, p1, Lcom/facebook/drawee/generic/d;->ON:Z
+    iput-boolean v0, p1, Lcom/facebook/drawee/generic/d;->OW:Z
 
-    sget-object p2, Lcom/facebook/drawee/generic/d$a;->OP:Lcom/facebook/drawee/generic/d$a;
+    sget-object p2, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object p2, p1, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iput-object p2, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
     goto :goto_0
 
@@ -548,7 +548,7 @@
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-boolean v0, p1, Lcom/facebook/drawee/generic/d;->Nx:Z
+    iput-boolean v0, p1, Lcom/facebook/drawee/generic/d;->NG:Z
 
     :cond_1
     if-eqz p3, :cond_2
@@ -1100,7 +1100,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;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -1125,7 +1125,7 @@
 
     check-cast p1, [Lcom/facebook/imagepipeline/request/b;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p2
 
@@ -1139,11 +1139,11 @@
 
     move-result-object p3
 
-    iput-object p3, p2, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object p3, p2, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
-    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Ma:Z
+    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Mj:Z
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -1161,9 +1161,9 @@
 
     invoke-static {v0, p3}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iput-object p1, p2, Lcom/facebook/drawee/controller/a;->LY:[Ljava/lang/Object;
+    iput-object p1, p2, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
 
-    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->LZ:Z
+    iput-boolean v1, p2, Lcom/facebook/drawee/controller/a;->Mi:Z
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -1173,7 +1173,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p2}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p2}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
index 125d5cf58f..10c27abe29 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap.smali
@@ -74,7 +74,7 @@
 
     invoke-static {p6, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()Lcom/facebook/imagepipeline/b/h;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gR()Lcom/facebook/imagepipeline/b/h;
 
     move-result-object v0
 
@@ -92,14 +92,14 @@
 
     check-cast p4, Lcom/facebook/imagepipeline/request/c;
 
-    iput-object p4, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object p4, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    sget-object p2, Lcom/facebook/imagepipeline/request/b$b;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p2, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
 
     const/4 p3, 0x0
 
@@ -168,7 +168,7 @@
 
     if-eqz p4, :cond_2
 
-    invoke-virtual {p4}, Lcom/facebook/imagepipeline/g/b;->jj()Landroid/graphics/Bitmap;
+    invoke-virtual {p4}, Lcom/facebook/imagepipeline/g/b;->jm()Landroid/graphics/Bitmap;
 
     move-result-object p4
 
@@ -190,7 +190,7 @@
     invoke-interface {p6, p4}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :goto_0
-    sget-object p4, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p4, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -229,7 +229,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :goto_1
-    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
 
     return-void
 
@@ -251,14 +251,14 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_3
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
 
     return-void
 
     :catchall_3
     move-exception p2
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()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 b5404f9c49..d86a71e9f0 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;->SX:I
+    iget v2, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
 
-    iget v3, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SY:I
+    iget v3, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
 
-    iget v4, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SZ:I
+    iget v4, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ti:I
 
-    iget v5, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ta:I
+    iget v5, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tj:I
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SX:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg: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 3dc879f2a2..4794411469 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImagesConfig.smali
@@ -82,15 +82,15 @@
 
     move-result-object p1
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GP:Lcom/facebook/common/d/l;
+    iput-object p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
 
-    iput-object p2, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GO:Ljava/lang/String;
+    iput-object p2, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY:Ljava/lang/String;
 
     const-wide/32 p1, 0x2800000
 
-    iput-wide p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY:J
+    iput-wide p1, v0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hh:J
 
-    invoke-virtual {v0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fR()Lcom/facebook/cache/disk/DiskCacheConfig;
+    invoke-virtual {v0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fU()Lcom/facebook/cache/disk/DiskCacheConfig;
 
     move-result-object p1
 
@@ -118,7 +118,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/i$a;->Uh:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/i$a;->Uq:Z
 
     const-string v2, "app_images_cache"
 
@@ -126,7 +126,7 @@
 
     move-result-object v2
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     const-string v2, "app_images_cache_small"
 
@@ -134,7 +134,7 @@
 
     move-result-object v2
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/images/MGImagesConfig;->getAppBitmapMemoryCacheParamsSupplier(Landroid/content/Context;)Lcom/facebook/imagepipeline/cache/DefaultBitmapMemoryCacheParamsSupplier;
 
@@ -148,15 +148,15 @@
 
     check-cast v2, Lcom/facebook/common/d/l;
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Uf:Lcom/facebook/common/d/l;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/d/l;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/imagepipeline/b/j$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i$a;->UN:Lcom/facebook/imagepipeline/b/j$a;
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/j$a;->Qr:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/j$a;->QA:Z
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/j$a;->UV:Lcom/facebook/imagepipeline/b/i$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/j$a;->Ve:Lcom/facebook/imagepipeline/b/i$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/i$a;->iI()Lcom/facebook/imagepipeline/b/i;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/i$a;->iL()Lcom/facebook/imagepipeline/b/i;
 
     move-result-object v0
 
@@ -195,7 +195,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gO()Lcom/facebook/imagepipeline/b/h;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gR()Lcom/facebook/imagepipeline/b/h;
 
     move-result-object p1
 
@@ -203,11 +203,11 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/b/h$1;-><init>(Lcom/facebook/imagepipeline/b/h;)V
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/h;->Ud: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/h;->TV:Lcom/facebook/imagepipeline/cache/o;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/h;->Ue:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/cache/o;->b(Lcom/facebook/common/d/j;)I
 
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 8907407af1..c0a84bb80e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 015862f598..8cb39e2682 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 de1a9df71f..54e1ab140d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9f2205bb25..fa4ec9e2e5 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;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy: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.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
index e497e0e296..eb1e6c3fd3 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils$RouteBuilders.smali
@@ -241,7 +241,7 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    sget-object v0, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dT()Ljava/lang/String;
 
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 55c0144399..e0c9a5737b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 837855aae7..4da0c4ba30 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5ddc5e2472..3b746a5cf6 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -44,7 +44,7 @@
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dX()Lkotlin/text/Regex;
 
@@ -64,7 +64,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dZ()Lkotlin/text/Regex;
 
@@ -84,7 +84,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->ea()Lkotlin/text/Regex;
 
@@ -104,7 +104,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->eb()Lkotlin/text/Regex;
 
@@ -124,7 +124,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dW()Lkotlin/text/Regex;
 
@@ -144,7 +144,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dY()Lkotlin/text/Regex;
 
@@ -164,7 +164,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->ec()Lkotlin/text/Regex;
 
@@ -184,7 +184,7 @@
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v1, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dU()Lkotlin/text/Regex;
 
@@ -253,7 +253,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-static {}, Lcom/discord/app/a/a;->dS()Ljava/lang/String;
 
@@ -273,7 +273,7 @@
 .method private final isHttpDomainUrl(Landroid/net/Uri;)Z
     .locals 3
 
-    sget-object v0, Lkotlin/text/k;->biX:Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjh:Lkotlin/text/k;
 
     new-instance v1, Lkotlin/text/Regex;
 
@@ -301,7 +301,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/discord/app/a/a;->xf:Lcom/discord/app/a/a;
+    sget-object v0, Lcom/discord/app/a/a;->xd:Lcom/discord/app/a/a;
 
     invoke-virtual {p1}, Landroid/net/Uri;->getHost()Ljava/lang/String;
 
@@ -376,7 +376,7 @@
 
     if-eqz p3, :cond_0
 
-    const p2, 0x7f12108f
+    const p2, 0x7f121116
 
     invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -620,7 +620,7 @@
 
     check-cast p2, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
 
-    sget-object p3, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p3, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v1, "Intent handler activated for: "
 
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 53231e1264..f1c803f6d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cc1332f335..09bdab258a 100644
--- a/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
+++ b/com.discord/smali/com/discord/utilities/intent/RouteHandlers.smali
@@ -127,11 +127,11 @@
 
     if-ne p3, v0, :cond_4
 
-    sget-object p3, Lcom/discord/dialogs/e;->xF:Lcom/discord/dialogs/e$a;
+    sget-object p3, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$a;
 
     const-wide/16 v0, 0x0
 
-    invoke-static {p2, p1, v0, v1}, Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-static {p2, p1, v0, v1}, Lcom/discord/dialogs/f$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 
     :cond_4
     new-instance p1, Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;
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 4e57d48e8b..06c88e2469 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy: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 f22a627d0f..5eb8b10e12 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;->Aw()Lcom/google/gson/Gson;
+    invoke-virtual {v0}, Lcom/google/gson/f;->Az()Lcom/google/gson/Gson;
 
     move-result-object v0
 
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 b0085c834d..2e8b8b311b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 cebbe198d3..da47935fdc 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;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 7ebfc8502b..914456e690 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 4b83e622a7..e55b984fa1 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;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object p2
 
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 5c2269b69f..b07cab2aa7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 669ab3e4c9..d842990478 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5f15c69190..fa42b1a95b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 af5e31c49c..c5d6066cbd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5c0e535906..2e45b1e5d8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0d11a8f17b..3e224a9cb4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 62ee52421b..4b876375a0 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 cbb0740134..520b0d3b98 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 492ff0e9b5..bc84c2cd79 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 000d2cb546..b36ea9945e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1af608e20e..ebc65a4cdc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6441074253..aa0031cbae 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 140e47ece7..d387533a93 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8b38022f17..402a7416b3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 659353a0f7..d6b4dd2dad 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageQueue.smali
@@ -417,7 +417,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v2}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v2}, Lrx/Observable;->IV()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 444e7fdac3..8977a0a3c1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter$LoggingLinearLayoutManager.smali
index fdc8afd56f..b480c46b70 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v6, v2
 
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 c9317570d0..84a12881c5 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v2, "Unable to configure recycler."
 
@@ -292,7 +292,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v2
 
@@ -306,7 +306,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 6882a80c38..c482cd44b6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 8055aca92a..c9fae42f0f 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -187,7 +187,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 5b666a2055..831c64b5b5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -132,7 +132,7 @@
     return-void
 
     :cond_2
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm: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 981c0aef9a..5e80daf5d4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1e635b6574..17d67f41e2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a875cef0f5..0623fe8118 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, 0x7f120528
+    const v1, 0x7f12054d
 
     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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120527
+    const v0, 0x7f12054c
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -167,7 +167,7 @@
 
     invoke-static {v4, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a04a1
+    const v0, 0x7f0a04ab
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -185,7 +185,7 @@
 
     move-result-object v7
 
-    const p2, 0x7f120525
+    const p2, 0x7f12054a
 
     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, 0x7f120f09
+    const v0, 0x7f120f90
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -232,7 +232,7 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120f08
+    const v0, 0x7f120f8f
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -242,7 +242,7 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0098
+    const v0, 0x7f0d009e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -266,7 +266,7 @@
 
     aput-object v4, v0, v3
 
-    const v3, 0x7f0a04a1
+    const v3, 0x7f0a04ab
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -286,13 +286,13 @@
 
     move-result-object v5
 
-    const v0, 0x7f120ce1
+    const v0, 0x7f120d13
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v3
 
-    const v0, 0x7f120c3e
+    const v0, 0x7f120c70
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 e9a9152313..fe9c3c72a9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a24e5ada90..b1abc9cd6e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4582ad3793..cc0b9a9311 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 21ac3f5ca3..763d74a284 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 80956f7971..5d206b6c7b 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
@@ -138,7 +138,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO: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;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO: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 b90ea5fecd..6762f3d97d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9d1ac0c086..8682ded726 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -110,7 +110,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/utilities/persister/Persister$Preloader$2;
 
@@ -275,7 +275,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 012955b4ed..6706e6e132 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 347fe92638..8f9248adfd 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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 677f9b173d..0497927036 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister.smali
@@ -690,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;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy: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 9f624d21ca..35bc6b5519 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a73bf788fe..62fb4ffa63 100644
--- a/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
+++ b/com.discord/smali/com/discord/utilities/persister/PersisterConfig.smali
@@ -85,11 +85,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IR()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IU()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/g;->vJ:Lcom/discord/app/g;
+    sget-object v1, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-static {}, Lcom/discord/app/g;->dK()Lrx/Observable;
 
@@ -103,7 +103,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -133,7 +133,7 @@
 
     sget-object v0, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v1, "[Persister]"
 
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index e22f5fa67d..922e7ad599 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, 0x7f060158
 
-    const v6, 0x7f0801c8
+    const v6, 0x7f0801d3
 
-    const v7, 0x7f0803d7
+    const v7, 0x7f0803e5
 
     const/4 v8, 0x0
 
@@ -129,9 +129,9 @@
 
     const v18, 0x7f060020
 
-    const v19, 0x7f0801b7
+    const v19, 0x7f0801c2
 
-    const v20, 0x7f080205
+    const v20, 0x7f080210
 
     const/16 v21, 0x0
 
@@ -161,11 +161,11 @@
 
     const-string v6, "Facebook"
 
-    const v7, 0x7f06006e
+    const v7, 0x7f06006f
 
-    const v8, 0x7f0801bc
+    const v8, 0x7f0801c7
 
-    const v9, 0x7f080275
+    const v9, 0x7f080281
 
     const/4 v11, 0x0
 
@@ -193,11 +193,11 @@
 
     const-string v6, "Google"
 
-    const v7, 0x7f060074
+    const v7, 0x7f060075
 
-    const v8, 0x7f0801bd
+    const v8, 0x7f0801c8
 
-    const v9, 0x7f080298
+    const v9, 0x7f0802a4
 
     const/4 v10, 0x0
 
@@ -223,11 +223,11 @@
 
     const-string v6, "League of Legends"
 
-    const v7, 0x7f060087
+    const v7, 0x7f060088
 
-    const v8, 0x7f0801be
+    const v8, 0x7f0801c9
 
-    const v9, 0x7f0802e0
+    const v9, 0x7f0802ec
 
     move-object v3, v1
 
@@ -249,7 +249,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f0801c0
+    const v8, 0x7f0801cb
 
     const/4 v9, 0x0
 
@@ -273,7 +273,7 @@
 
     const-string v6, "Patreon"
 
-    const v8, 0x7f0801c1
+    const v8, 0x7f0801cc
 
     move-object v3, v1
 
@@ -293,11 +293,11 @@
 
     const-string v6, "Reddit"
 
-    const v7, 0x7f0600f8
+    const v7, 0x7f0600f9
 
-    const v8, 0x7f0801c2
+    const v8, 0x7f0801cd
 
-    const v9, 0x7f080356
+    const v9, 0x7f080362
 
     const/4 v12, 0x1
 
@@ -351,11 +351,11 @@
 
     const-string v6, "Skype"
 
-    const v7, 0x7f0600ff
+    const v7, 0x7f060100
 
-    const v8, 0x7f0801c3
+    const v8, 0x7f0801ce
 
-    const v9, 0x7f080373
+    const v9, 0x7f08037f
 
     const/4 v10, 0x1
 
@@ -381,11 +381,11 @@
 
     const-string v6, "Spotify"
 
-    const v7, 0x7f060100
+    const v7, 0x7f060101
 
-    const v8, 0x7f0801c4
+    const v8, 0x7f0801cf
 
-    const v9, 0x7f08037a
+    const v9, 0x7f080386
 
     const/4 v10, 0x0
 
@@ -413,11 +413,11 @@
 
     const-string v6, "Steam"
 
-    const v7, 0x7f06012c
+    const v7, 0x7f06012d
 
-    const v8, 0x7f0801c5
+    const v8, 0x7f0801d0
 
-    const v9, 0x7f080382
+    const v9, 0x7f08038e
 
     const/4 v11, 0x0
 
@@ -441,11 +441,11 @@
 
     const-string v6, "Twitch"
 
-    const v7, 0x7f060137
+    const v7, 0x7f060138
 
-    const v8, 0x7f0801c6
+    const v8, 0x7f0801d1
 
-    const v9, 0x7f08039b
+    const v9, 0x7f0803a8
 
     move-object v3, v1
 
@@ -465,11 +465,11 @@
 
     const-string v6, "Twitter"
 
-    const v7, 0x7f060138
+    const v7, 0x7f060139
 
-    const v8, 0x7f0801c7
+    const v8, 0x7f0801d2
 
-    const v9, 0x7f08039d
+    const v9, 0x7f0803aa
 
     move-object v3, v1
 
@@ -491,7 +491,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f0801c9
+    const v8, 0x7f0801d4
 
     const/4 v9, 0x0
 
@@ -517,11 +517,11 @@
 
     const-string v6, "Youtube"
 
-    const v7, 0x7f060158
+    const v7, 0x7f060159
 
-    const v8, 0x7f0801ca
+    const v8, 0x7f0801d5
 
-    const v9, 0x7f0803d8
+    const v9, 0x7f0803e6
 
     const/4 v12, 0x1
 
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
index 04716b171e..dcfc8b4e0b 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumGuildSubscriptionUtils.smali
@@ -28,16 +28,16 @@
     return-void
 .end method
 
-.method private final getCurrentTierSubs(I)I
+.method private final getCurrentTierSubs(IZ)I
     .locals 2
 
     const/4 v0, 0x1
 
     const/4 v1, 0x2
 
-    if-eq p1, v0, :cond_2
+    if-eq p1, v0, :cond_4
 
-    if-eq p1, v1, :cond_1
+    if-eq p1, v1, :cond_2
 
     const/4 v0, 0x3
 
@@ -48,33 +48,47 @@
     return p1
 
     :cond_0
-    const/16 p1, 0x14
+    if-eqz p2, :cond_1
+
+    const/16 p1, 0x1e
 
     return p1
 
     :cond_1
-    const/16 p1, 0xa
+    const/16 p1, 0x14
 
     return p1
 
     :cond_2
+    if-eqz p2, :cond_3
+
+    const/16 p1, 0xf
+
+    return p1
+
+    :cond_3
+    const/16 p1, 0xa
+
+    return p1
+
+    :cond_4
     return v1
 .end method
 
-.method private final getNextTierSubs(I)I
-    .locals 2
+.method private final getNextTierSubs(IZ)I
+    .locals 1
 
     const/4 v0, 0x1
 
-    if-eq p1, v0, :cond_2
+    if-eq p1, v0, :cond_3
 
     const/4 v0, 0x2
 
     if-eq p1, v0, :cond_1
 
-    const/4 v1, 0x3
+    const/4 p2, 0x3
 
-    if-eq p1, v1, :cond_0
+    if-eq p1, p2, :cond_0
 
     return v0
 
@@ -84,11 +98,25 @@
     return p1
 
     :cond_1
-    const/16 p1, 0x14
+    if-eqz p2, :cond_2
+
+    const/16 p1, 0x1e
 
     return p1
 
     :cond_2
+    const/16 p1, 0x14
+
+    return p1
+
+    :cond_3
+    if-eqz p2, :cond_4
+
+    const/16 p1, 0xf
+
+    return p1
+
+    :cond_4
     const/16 p1, 0xa
 
     return p1
@@ -96,7 +124,7 @@
 
 
 # virtual methods
-.method public final calculatePercentToNextTier(II)I
+.method public final calculatePercentToNextTier(IIZ)I
     .locals 1
 
     const/4 v0, 0x3
@@ -108,11 +136,11 @@
     return p1
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(I)I
+    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(IZ)I
 
     move-result v0
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(I)I
+    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(IZ)I
 
     move-result p1
 
@@ -135,170 +163,8 @@
     return p1
 .end method
 
-.method public final calculateTotalBoostCount(Ljava/util/List;)I
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelSubscription;",
-            ">;)I"
-        }
-    .end annotation
-
-    const-string v0, "subscriptions"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    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
-
-    :goto_0
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_4
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/models/domain/ModelSubscription;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    move-result-object v3
-
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    if-eq v3, v4, :cond_1
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    move-result-object v3
-
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_2:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    if-eq v3, v4, :cond_1
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    move-result-object v3
-
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    if-eq v3, v4, :cond_1
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    move-result-object v3
-
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_LEGACY:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    if-ne v3, v4, :cond_0
-
-    goto :goto_1
-
-    :cond_0
-    const/4 v3, 0x0
-
-    goto :goto_2
-
-    :cond_1
-    :goto_1
-    const/4 v3, 0x1
-
-    :goto_2
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->getAdditionalPlanIds()Ljava/util/Map;
-
-    move-result-object v4
-
-    if-eqz v4, :cond_2
-
-    sget-object v5, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_MONTH:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
-
-    move-result-wide v5
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v5
-
-    invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/lang/Integer;
-
-    if-eqz v4, :cond_2
-
-    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
-
-    move-result v4
-
-    goto :goto_3
-
-    :cond_2
-    const/4 v4, 0x0
-
-    :goto_3
-    add-int/2addr v3, v4
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->getAdditionalPlanIds()Ljava/util/Map;
-
-    move-result-object v2
-
-    if-eqz v2, :cond_3
-
-    sget-object v4, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_GUILD_YEAR:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPlanId()J
-
-    move-result-wide v4
-
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v4
-
-    invoke-interface {v2, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/Integer;
-
-    if-eqz v2, :cond_3
-
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
-
-    move-result v2
-
-    goto :goto_4
-
-    :cond_3
-    const/4 v2, 0x0
-
-    :goto_4
-    add-int/2addr v3, v2
-
-    add-int/2addr v1, v3
-
-    goto :goto_0
-
-    :cond_4
-    return v1
-.end method
-
-.method public final calculateTotalProgress(II)I
-    .locals 2
+.method public final calculateTotalProgress(IIZ)I
+    .locals 1
 
     const/4 v0, 0x3
 
@@ -309,31 +175,31 @@
     return p1
 
     :cond_0
-    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(I)I
+    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getNextTierSubs(IZ)I
 
     move-result v0
 
-    invoke-direct {p0, p1}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(I)I
+    invoke-direct {p0, p1, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->getCurrentTierSubs(IZ)I
 
-    move-result v1
+    move-result p3
 
-    sub-int/2addr p2, v1
+    sub-int/2addr p2, p3
 
     int-to-float p2, p2
 
-    sub-int/2addr v0, v1
+    sub-int/2addr v0, p3
 
-    int-to-float v0, v0
+    int-to-float p3, v0
 
-    div-float/2addr p2, v0
+    div-float/2addr p2, p3
 
     int-to-float p1, p1
 
-    const v0, 0x42053333    # 33.3f
+    const p3, 0x42053333    # 33.3f
 
-    mul-float p1, p1, v0
+    mul-float p1, p1, p3
 
-    mul-float p2, p2, v0
+    mul-float p2, p2, p3
 
     add-float/2addr p1, p2
 
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
index 945c8e6d0c..d7b8880ecc 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1$1;->invoke(Landroidx/browser/customtabs/CustomTabsIntent;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
index 6cfd49330d..063e50953c 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
index 326886faf6..1bb97e37f5 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
@@ -203,12 +203,12 @@
     return p1
 
     :cond_2
-    const p1, 0x7f080128
+    const p1, 0x7f08012c
 
     return p1
 
     :cond_3
-    const p1, 0x7f080129
+    const p1, 0x7f08012d
 
     return p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index 38ac1057ab..c69438502e 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, 0x7f12128c
+    const v0, 0x7f121314
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -79,7 +79,7 @@
     goto :goto_2
 
     :cond_1
-    const v0, 0x7f121287
+    const v0, 0x7f12130f
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -96,7 +96,7 @@
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f121288
+    const v0, 0x7f121310
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -143,7 +143,7 @@
     :goto_0
     if-eqz p1, :cond_6
 
-    const v0, 0x7f12128a
+    const v0, 0x7f121312
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -164,7 +164,7 @@
 
     :cond_6
     :goto_1
-    const p1, 0x7f121289
+    const p1, 0x7f121311
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -207,7 +207,7 @@
     return-object v0
 
     :cond_1
-    sget-object v0, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     const/4 v0, 0x1
 
@@ -264,7 +264,7 @@
     return-object p1
 
     :cond_0
-    const p2, 0x7f121385
+    const p2, 0x7f121411
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -273,7 +273,7 @@
     return-object p1
 
     :cond_1
-    const p2, 0x7f120b50
+    const p2, 0x7f120b81
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -282,7 +282,7 @@
     return-object p1
 
     :cond_2
-    const p2, 0x7f12112c
+    const p2, 0x7f1211b1
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -291,7 +291,7 @@
     return-object p1
 
     :cond_3
-    const p2, 0x7f120dc2
+    const p2, 0x7f120df7
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -311,7 +311,7 @@
 
     if-eqz p2, :cond_0
 
-    const v0, 0x7f12112c
+    const v0, 0x7f1211b1
 
     const/4 v1, 0x1
 
@@ -336,7 +336,7 @@
     if-nez p2, :cond_1
 
     :cond_0
-    const p2, 0x7f12112d
+    const p2, 0x7f1211b2
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -392,7 +392,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    const p1, 0x7f080380
+    const p1, 0x7f08038c
 
     return p1
 
@@ -421,7 +421,7 @@
 
     if-ne p1, v1, :cond_4
 
-    const p1, 0x7f08037f
+    const p1, 0x7f08038b
 
     return p1
 
@@ -440,7 +440,7 @@
 
     if-ne p1, v1, :cond_6
 
-    const p1, 0x7f08037d
+    const p1, 0x7f080389
 
     return p1
 
@@ -459,7 +459,7 @@
 
     if-ne p1, v1, :cond_8
 
-    const p1, 0x7f08037c
+    const p1, 0x7f080388
 
     return p1
 
@@ -473,7 +473,7 @@
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     :goto_4
-    const p1, 0x7f08037e
+    const p1, 0x7f08038a
 
     return p1
 .end method
@@ -510,7 +510,7 @@
 
     if-ne v0, v1, :cond_2
 
-    const p1, 0x7f1210e5
+    const p1, 0x7f12116c
 
     return p1
 
@@ -529,7 +529,7 @@
 
     if-ne v0, v1, :cond_4
 
-    const p1, 0x7f1210e1
+    const p1, 0x7f121168
 
     return p1
 
@@ -548,13 +548,13 @@
 
     if-ne p1, v0, :cond_6
 
-    const p1, 0x7f1210df
+    const p1, 0x7f121166
 
     return p1
 
     :cond_6
     :goto_3
-    const p1, 0x7f1210e4
+    const p1, 0x7f12116b
 
     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 9818fc9524..0c8ade6efb 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;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 3545536dbb..6ba82515c6 100644
--- a/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
+++ b/com.discord/smali/com/discord/utilities/receiver/spotify/SpotifyMetadataReceiver.smali
@@ -79,7 +79,7 @@
     return-void
 
     :catch_0
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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/resources/StringResourceUtilsKt.smali b/com.discord/smali/com/discord/utilities/resources/StringResourceUtilsKt.smali
new file mode 100644
index 0000000000..5807514f1e
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/resources/StringResourceUtilsKt.smali
@@ -0,0 +1,51 @@
+.class public final Lcom/discord/utilities/resources/StringResourceUtilsKt;
+.super Ljava/lang/Object;
+.source "StringResourceUtils.kt"
+
+
+# direct methods
+.method public static final varargs getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/content/res/Resources$NotFoundException;
+        }
+    .end annotation
+
+    const-string v0, "$this$getQuantityString"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "formatArgs"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    if-eqz p3, :cond_0
+
+    array-length p2, p4
+
+    invoke-static {p4, p2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
+
+    move-result-object p2
+
+    invoke-virtual {p0, p1, p3, p2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "getQuantityString(id, quantity, *formatArgs)"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_0
+    invoke-virtual {p0, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
+
+    move-result-object p0
+
+    const-string p1, "getString(zeroCountStringId)"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
index a8163afe9f..d91cc76fc5 100644
--- a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
+++ b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
@@ -227,7 +227,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 38c1495c42..38f9b266e2 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/973"
+    const-string v0, "Discord-Android/974"
 
     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 477bf56d4f..055eb3ed89 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;->Fu()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object v0
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FN()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 477ffab3bc..e8361cd2b2 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 93f5b43d91..8bd6a138b1 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$Companion.smali
@@ -72,11 +72,11 @@
 
     invoke-direct {v0, v1}, Lokhttp3/a/a;-><init>(Lokhttp3/a/a$b;)V
 
-    sget v1, Lokhttp3/a/a$a;->bym:I
+    sget v1, Lokhttp3/a/a$a;->byw:I
 
     if-eqz v1, :cond_0
 
-    iput v1, v0, Lokhttp3/a/a;->byk:I
+    iput v1, v0, Lokhttp3/a/a;->byu:I
 
     const-string v1, "HttpLoggingInterceptor(H\u2026.Level.BASIC\n          })"
 
@@ -183,7 +183,7 @@
 
     new-instance v2, Lcom/discord/restapi/BreadcrumbInterceptor;
 
-    sget-object v3, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v3, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     check-cast v3, Lcom/discord/utilities/logging/Logger;
 
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 fa991d657e..0a74c09ba9 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;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/JsonObject;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
 
     const-string v0, "discord_android_min_version"
 
@@ -74,7 +74,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/gson/JsonElement;->AC()I
+    invoke-virtual {p1}, Lcom/google/gson/JsonElement;->AF()I
 
     move-result p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
index ea970039a9..661fd03efc 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali
@@ -398,7 +398,7 @@
     :catch_0
     move-exception v3
 
-    sget-object v4, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v7, v3
 
@@ -430,7 +430,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sget-object v0, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     if-eqz p1, :cond_1
 
@@ -798,7 +798,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "reaction"
         .end annotation
     .end param
@@ -3577,7 +3577,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "emoji"
         .end annotation
     .end param
@@ -3754,6 +3754,31 @@
     return-object p1
 .end method
 
+.method public final getSubscriptionSlots()Lrx/Observable;
+    .locals 1
+    .annotation runtime Lb/c/f;
+        value = "users/@me/guilds/premium/subscription-slots"
+    .end annotation
+
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lrx/Observable<",
+            "Ljava/util/List<",
+            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;",
+            ">;>;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
+
+    invoke-interface {v0}, Lcom/discord/restapi/RestAPIInterface;->getSubscriptionSlots()Lrx/Observable;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
 .method public final getSubscriptions()Lrx/Observable;
     .locals 1
     .annotation runtime Lb/c/f;
@@ -3779,55 +3804,6 @@
     return-object v0
 .end method
 
-.method public final getUserPremiumGuildSubscriptions()Lrx/Observable;
-    .locals 1
-    .annotation runtime Lb/c/f;
-        value = "users/@me/guilds/premium/subscriptions"
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Ljava/util/List<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
-            ">;>;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    invoke-interface {v0}, Lcom/discord/restapi/RestAPIInterface;->getUserPremiumGuildSubscriptions()Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final getUserPremiumGuildSubscriptionsCooldown()Lrx/Observable;
-    .locals 1
-    .annotation runtime Lb/c/f;
-        value = "users/@me/guilds/premium/subscriptions/cooldown"
-    .end annotation
-
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lrx/Observable<",
-            "Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
-
-    invoke-interface {v0}, Lcom/discord/restapi/RestAPIInterface;->getUserPremiumGuildSubscriptionsCooldown()Lrx/Observable;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public final getVanityUrl(J)Lrx/Observable;
     .locals 1
     .param p1    # J
@@ -4870,7 +4846,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "reaction"
         .end annotation
     .end param
@@ -5019,7 +4995,7 @@
     .end param
     .param p5    # Ljava/lang/String;
         .annotation runtime Lb/c/s;
-            IE = true
+            IH = true
             value = "reaction"
         .end annotation
     .end param
@@ -6135,29 +6111,39 @@
     return-object p1
 .end method
 
-.method public final subscribeToGuild(J)Lrx/Observable;
+.method public final subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
     .locals 1
     .param p1    # J
         .annotation runtime Lb/c/s;
             value = "guildId"
         .end annotation
     .end param
+    .param p3    # Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
+        .annotation runtime Lb/c/a;
+        .end annotation
+    .end param
     .annotation runtime Lb/c/p;
         value = "guilds/{guildId}/premium/subscriptions"
     .end annotation
 
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(J)",
+            "(J",
+            "Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;",
+            ")",
             "Lrx/Observable<",
             "Lcom/discord/models/domain/ModelPremiumGuildSubscription;",
             ">;"
         }
     .end annotation
 
+    const-string v0, "premiumGuildSubscribe"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface;
 
-    invoke-interface {v0, p1, p2}, Lcom/discord/restapi/RestAPIInterface;->subscribeToGuild(J)Lrx/Observable;
+    invoke-interface {v0, p1, p2, p3}, Lcom/discord/restapi/RestAPIInterface;->subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
index 92a2a73d46..bde9800be6 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, 0x7f120336
+    const v2, 0x7f12035b
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -58,7 +58,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120332
+    const v3, 0x7f120357
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -78,7 +78,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120331
+    const v3, 0x7f120356
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -98,7 +98,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120333
+    const v3, 0x7f120358
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index 2a42bec8bd..da6f5ab5a9 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-object p1, Lrx/Emitter$a;->bFX:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
 
@@ -324,20 +324,20 @@
     goto :goto_0
 
     :cond_0
-    const p2, 0x7f1205be
+    const p2, 0x7f1205e3
 
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f1205bd
+    const p2, 0x7f1205e2
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f1205bf
+    const p2, 0x7f1205e4
 
     :goto_0
-    const v0, 0x7f0d00ec
+    const v0, 0x7f0d00f2
 
     const/4 v2, 0x0
 
@@ -391,7 +391,7 @@
 
     if-eqz p1, :cond_3
 
-    const p2, 0x7f060136
+    const p2, 0x7f060137
 
     invoke-virtual {p1, p2}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
 
@@ -648,7 +648,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object p3
 
@@ -759,7 +759,7 @@
     goto :goto_0
 
     :cond_1
-    const p3, 0x7f120be6
+    const p3, 0x7f120c18
 
     invoke-static {p2, p3}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -802,11 +802,11 @@
     :cond_0
     if-nez p5, :cond_1
 
-    sget-object p3, Lcom/discord/dialogs/c;->xu:Lcom/discord/dialogs/c$a;
+    sget-object p3, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$a;
 
     const/4 v1, 0x3
 
-    const p3, 0x7f120ec4
+    const p3, 0x7f120f4b
 
     invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -824,7 +824,7 @@
 
     move-object v0, p2
 
-    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
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/d$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 524efd0939..766008372a 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 b2ea04712c..985adc3277 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;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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 824033a929..7d2aa43534 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 52216607f3..cdc4ff4a07 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 d500469ada..16f83e1c97 100644
--- a/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/rx/ObservableExtensionsKt.smali
@@ -320,7 +320,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/internal/a/aj;->Ju()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jx()Lrx/internal/a/aj;
 
     move-result-object v0
 
@@ -328,7 +328,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -336,7 +336,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -369,7 +369,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/internal/a/ak;->Jw()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
 
     move-result-object v0
 
@@ -377,7 +377,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -385,7 +385,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -545,7 +545,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/d/a;->Ku()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kx()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -620,7 +620,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object p0
 
@@ -681,6 +681,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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "appComponent"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p0
+
+    :cond_0
+    const-string p1, "observable"
+
+    invoke-static {p0, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;
@@ -699,7 +761,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -739,7 +801,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -747,34 +809,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/l;->checkExpressionValueIsNotNull(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 d8a2441e6a..0353559ce8 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;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()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 1e6a392170..e06e22afa9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 87d07e1bfa..cea77dd7a0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1388e0799b..edb0b9bf0c 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;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 ac268c7754..38237ad0d1 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;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()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 85052a5a76..15bda1a5ac 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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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 3d07f229d9..988fb65fb0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 daeb09c99c..872d6265d5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 75678d1d3b..57e3570aa1 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;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -417,7 +417,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -529,7 +529,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO: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/query/node/answer/UserNode.smali b/com.discord/smali/com/discord/utilities/search/query/node/answer/UserNode.smali
index 0fe9aeb9ca..2bf3ec54a3 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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v1, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     const/4 v1, 0x1
 
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 fd5791565a..72aeb3ab17 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, 0x7f120ff7
+    const v0, 0x7f12107e
 
     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, 0x7f120ff9
+    const v0, 0x7f121080
 
     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, 0x7f120ffb
+    const v0, 0x7f121082    # 1.94153E38f
 
     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, 0x7f120ff8
+    const v0, 0x7f12107f    # 1.9415294E38f
 
     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, 0x7f120fe3
+    const v0, 0x7f12106a
 
     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, 0x7f120fe1
+    const v0, 0x7f121068
 
     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, 0x7f120fe0
+    const v0, 0x7f121067
 
     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, 0x7f120fe5
+    const v0, 0x7f12106c
 
     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, 0x7f120fe2
+    const v0, 0x7f121069
 
     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, 0x7f120fe4
+    const v0, 0x7f12106b
 
     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 060143bcaf..7ddf545a96 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 110ab40e20..59a8de1399 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v2
 
@@ -1157,7 +1157,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 a31cbe5320..5970050728 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 9222482817..1de01710d0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1a67bc910c..33fcb8c4f7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 458319285c..b6934baa95 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c95e68c626..330aa0f9ed 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3eff458ab1..e8e5317ce0 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -297,7 +297,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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 30c0a287f1..66cd9105a3 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, 0x7f0d007f
+    const v1, 0x7f0d0084
 
     const/4 v2, 0x0
 
@@ -158,7 +158,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a07fc
+    const v2, 0x7f0a082b
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -166,7 +166,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a07fd
+    const v3, 0x7f0a082c
 
     invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -174,7 +174,7 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    const v4, 0x7f0a07fa
+    const v4, 0x7f0a0829
 
     invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -182,7 +182,7 @@
 
     check-cast v4, Landroid/widget/TextView;
 
-    const v5, 0x7f0a07fb
+    const v5, 0x7f0a082a
 
     invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -190,11 +190,11 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    const v5, 0x7f120523
+    const v5, 0x7f120548
 
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
 
-    const v2, 0x7f120524
+    const v2, 0x7f120549
 
     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, 0x7f120ce1
+    const v2, 0x7f120d13
 
     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 6003952538..acc664984c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5a679a0d09..ef85822297 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 29afff00fb..a09f4b988f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1$1.smali b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1$1.smali
index bd73c9cfeb..697d3d15be 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion$get$1$1.smali
@@ -3,7 +3,7 @@
 .source "StreamContext.kt"
 
 # interfaces
-.implements Lrx/functions/Func2;
+.implements Lrx/functions/Func3;
 
 
 # annotations
@@ -22,12 +22,14 @@
         "Ljava/lang/Object;",
         "T2:",
         "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lrx/functions/Func3<",
+        "TT1;TT2;TT3;TR;>;"
     }
 .end annotation
 
@@ -49,7 +51,7 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)Lcom/discord/utilities/streams/StreamContext;
+.method public final call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Ljava/lang/Integer;)Lcom/discord/utilities/streams/StreamContext;
     .locals 2
 
     if-nez p1, :cond_0
@@ -59,23 +61,31 @@
     return-object p1
 
     :cond_0
+    const/high16 v0, 0x100000
+
+    invoke-static {v0, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
+
+    move-result p3
+
     new-instance v0, Lcom/discord/utilities/streams/StreamContext;
 
     iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;->$stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-direct {v0, v1, p1, p2}, Lcom/discord/utilities/streams/StreamContext;-><init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)V
+    invoke-direct {v0, v1, p1, p2, p3}, Lcom/discord/utilities/streams/StreamContext;-><init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)V
 
     return-object v0
 .end method
 
-.method public final bridge synthetic call(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;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelGuild;
 
     check-cast p2, Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;->call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)Lcom/discord/utilities/streams/StreamContext;
+    check-cast p3, Ljava/lang/Integer;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;->call(Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Ljava/lang/Integer;)Lcom/discord/utilities/streams/StreamContext;
 
     move-result-object p1
 
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 4232d8e723..339c94b20d 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
@@ -62,7 +62,7 @@
 .end method
 
 .method public final call(Lcom/discord/models/domain/ModelApplicationStream;)Lrx/Observable;
-    .locals 3
+    .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -108,13 +108,27 @@
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-direct {v2, p1}, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;-><init>(Lcom/discord/models/domain/ModelApplicationStream;)V
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getPermissions()Lcom/discord/stores/StorePermissions;
 
-    check-cast v2, Lrx/functions/Func2;
+    move-result-object v2
 
-    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+    move-result-wide v3
+
+    invoke-virtual {v2, v3, v4}, Lcom/discord/stores/StorePermissions;->getForChannel(J)Lrx/Observable;
+
+    move-result-object v2
+
+    new-instance v3, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;
+
+    invoke-direct {v3, p1}, Lcom/discord/utilities/streams/StreamContext$Companion$get$1$1;-><init>(Lcom/discord/models/domain/ModelApplicationStream;)V
+
+    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;
 
     move-result-object p1
 
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 9a322423e3..2351bf7994 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext$Companion.smali
@@ -186,7 +186,7 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p4, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getForUser(J)Lrx/Observable;
+    invoke-virtual {p4, p1, p2}, Lcom/discord/stores/StoreApplicationStreaming;->getStreamsForUser(J)Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContext.smali b/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
index 265d0b70df..72ac6d4aa6 100644
--- a/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
+++ b/com.discord/smali/com/discord/utilities/streams/StreamContext.smali
@@ -16,6 +16,8 @@
 
 
 # instance fields
+.field private final canJoinChannel:Z
+
 .field private final guild:Lcom/discord/models/domain/ModelGuild;
 
 .field private final preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
@@ -38,7 +40,7 @@
     return-void
 .end method
 
-.method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)V
+.method public constructor <init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)V
     .locals 1
 
     const-string v0, "stream"
@@ -57,34 +59,43 @@
 
     iput-object p3, p0, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
+    iput-boolean p4, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;ILjava/lang/Object;)Lcom/discord/utilities/streams/StreamContext;
+.method public static synthetic copy$default(Lcom/discord/utilities/streams/StreamContext;Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;ZILjava/lang/Object;)Lcom/discord/utilities/streams/StreamContext;
     .locals 0
 
-    and-int/lit8 p5, p4, 0x1
+    and-int/lit8 p6, p5, 0x1
 
-    if-eqz p5, :cond_0
+    if-eqz p6, :cond_0
 
     iget-object p1, p0, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
     :cond_0
-    and-int/lit8 p5, p4, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p5, :cond_1
+    if-eqz p6, :cond_1
 
     iget-object p2, p0, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
 
     :cond_1
-    and-int/lit8 p4, p4, 0x4
+    and-int/lit8 p6, p5, 0x4
 
-    if-eqz p4, :cond_2
+    if-eqz p6, :cond_2
 
     iget-object p3, p0, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
     :cond_2
-    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/streams/StreamContext;->copy(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)Lcom/discord/utilities/streams/StreamContext;
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-boolean p4, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/utilities/streams/StreamContext;->copy(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)Lcom/discord/utilities/streams/StreamContext;
 
     move-result-object p0
 
@@ -117,7 +128,15 @@
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)Lcom/discord/utilities/streams/StreamContext;
+.method public final component4()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)Lcom/discord/utilities/streams/StreamContext;
     .locals 1
 
     const-string v0, "stream"
@@ -130,64 +149,88 @@
 
     new-instance v0, Lcom/discord/utilities/streams/StreamContext;
 
-    invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/streams/StreamContext;-><init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/utilities/streams/StreamContext;-><init>(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Z)V
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 2
+    .locals 4
 
-    if-eq p0, p1, :cond_1
+    const/4 v0, 0x1
 
-    instance-of v0, p1, Lcom/discord/utilities/streams/StreamContext;
+    if-eq p0, p1, :cond_2
 
-    if-eqz v0, :cond_0
+    instance-of v1, p1, Lcom/discord/utilities/streams/StreamContext;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
 
     check-cast p1, Lcom/discord/utilities/streams/StreamContext;
 
-    iget-object v0, p0, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+    iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
+    iget-object v3, p1, Lcom/discord/utilities/streams/StreamContext;->stream:Lcom/discord/models/domain/ModelApplicationStream;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    iget-object v1, p1, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object v3, p1, Lcom/discord/utilities/streams/StreamContext;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
+    iget-object v1, p0, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
-    iget-object p1, p1, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
+    iget-object v3, p1, Lcom/discord/utilities/streams/StreamContext;->preview:Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;
 
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v1
 
-    if-eqz p1, :cond_0
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    iget-boolean p1, p1, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    if-ne v1, p1, :cond_0
+
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    return p1
+    :goto_0
+    if-eqz p1, :cond_1
+
+    goto :goto_1
 
     :cond_1
-    :goto_0
-    const/4 p1, 0x1
+    return v2
 
-    return p1
+    :cond_2
+    :goto_1
+    return v0
+.end method
+
+.method public final getCanJoinChannel()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    return v0
 .end method
 
 .method public final getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -264,6 +307,17 @@
     :cond_2
     add-int/2addr v0, v1
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    if-eqz v1, :cond_3
+
+    const/4 v1, 0x1
+
+    :cond_3
+    add-int/2addr v0, v1
+
     return v0
 .end method
 
@@ -296,6 +350,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", canJoinChannel="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/utilities/streams/StreamContext;->canJoinChannel:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
     const-string v1, ")"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext$1.smali
index f9ccd1b3b1..27459016c0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e5bf602fe4..d1cd604c0f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 45ada3745e..7ce070201b 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, 0x7f06008c
+    const v2, 0x7f06008d
 
-    const v8, 0x7f06008c
+    const v8, 0x7f06008d
 
     goto :goto_3
 
@@ -803,7 +803,7 @@
 
     if-eqz v2, :cond_6
 
-    const v2, 0x7f04037e
+    const v2, 0x7f04037f
 
     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, 0x7f04037f
+    const v2, 0x7f040380
 
     invoke-static {p1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
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 921c9fe617..c10bc49413 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
@@ -141,7 +141,7 @@
     move-result-object p1
 
     :goto_1
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 30386261c1..6234d24c6e 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 74d6cc5fb6..5743c6ec56 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
@@ -178,7 +178,7 @@
     move-result-object p1
 
     :goto_3
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 dae6645063..5cdb081057 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
@@ -147,7 +147,7 @@
     move-result-object p1
 
     :goto_1
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 a83929bd5a..b6018a719d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUnparser.smali
@@ -315,9 +315,9 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/simpleast/core/a/a;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object p2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eR()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 03148925c4..d6fdd195c6 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
-        0x7f121157
-        0x7f121158
-        0x7f121159
-        0x7f12115a
-        0x7f12115b
-        0x7f12115c
-        0x7f12115d
-        0x7f12115e
-        0x7f12115f
-        0x7f121160
-        0x7f121161
-        0x7f121162
-        0x7f121163
-        0x7f121164
-        0x7f121165
-        0x7f121166
-        0x7f121167
-        0x7f121168
-        0x7f121169
-        0x7f12116a
-        0x7f12116b
-        0x7f12116c
-        0x7f12116d
-        0x7f12116e
-        0x7f12116f
-        0x7f121170
-        0x7f121171
-        0x7f121172
-        0x7f121173
-        0x7f121174
-        0x7f121175
-        0x7f121176
-        0x7f121177
-        0x7f121178
-        0x7f121179
-        0x7f12117a
-        0x7f12117b
-        0x7f12117c
-        0x7f12117d
+        0x7f1211df
+        0x7f1211e0
+        0x7f1211e1
+        0x7f1211e2
+        0x7f1211e3
+        0x7f1211e4
+        0x7f1211e5
+        0x7f1211e6
+        0x7f1211e7
+        0x7f1211e8
+        0x7f1211e9
+        0x7f1211ea
+        0x7f1211eb
+        0x7f1211ec
+        0x7f1211ed
+        0x7f1211ee
+        0x7f1211ef
+        0x7f1211f0
+        0x7f1211f1
+        0x7f1211f2
+        0x7f1211f3
+        0x7f1211f4
+        0x7f1211f5
+        0x7f1211f6
+        0x7f1211f7
+        0x7f1211f8
+        0x7f1211f9
+        0x7f1211fa
+        0x7f1211fb
+        0x7f1211fc
+        0x7f1211fd
+        0x7f1211fe
+        0x7f1211ff
+        0x7f121200
+        0x7f121201
+        0x7f121202
+        0x7f121203
+        0x7f121204
+        0x7f121205
     .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 53c405346f..194ce0dfae 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1695408707..09017b03c5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 88980bfaa1..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, 0x7f06008c
+    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 4f3d488cfc..5a4668285c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8235b11fa1..38adedcb8b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 126462fed4..c43439825d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cf38cd0a22..a508e9d4a5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 177248c241..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, 0x7f06008c
+    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 b54f54d6db..a42d4643a4 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Parsers.smali
@@ -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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eQ()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eS()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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eQ()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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eR()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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eQ()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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v2}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object v2
 
@@ -460,7 +460,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v5, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     const/4 v6, 0x0
 
@@ -650,7 +650,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eR()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eT()Ljava/util/List;
 
     move-result-object v1
 
@@ -660,7 +660,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v4, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     const/4 v5, 0x0
 
@@ -765,7 +765,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eR()Ljava/util/List;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eT()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 798c7430c3..cc6fdef985 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;->Bk:Lcom/discord/simpleast/core/node/Node;
+    iget-object p2, p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bl: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 6c53d6ee1e..a0c500e310 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/simpleast/a/a;->BH:Lcom/discord/simpleast/a/a;
+    sget-object v0, Lcom/discord/simpleast/a/a;->BI:Lcom/discord/simpleast/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/a/a;->eS()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/a/a;->eU()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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 6addf43fd3..9eaf5cbab9 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p3, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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$createChannelMentionRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createChannelMentionRule$1.smali
index dae45992fe..a0a0e06d6f 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 3726beae19..89c233847c 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 8aad8f3ab5..06dc98b993 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 69a7a6706c..ac2e9f85fb 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,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp:Lcom/discord/simpleast/core/parser/ParseSpec$a;
 
     new-instance p2, Lcom/discord/simpleast/core/node/StyleNode;
 
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 03f2a0fbab..62352284dd 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 247a033629..1898eb550e 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 e40f8a2345..2b1b531228 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 e74c30bbc6..47d19ad8e0 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 830580e06e..7892d16eca 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 36206b3759..0a6a0b74c6 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 4e5148c54b..70fc9982e5 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 809bff0fb0..a7ebf2aaf9 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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object p2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {p2}, Lcom/discord/simpleast/core/a/a;->eR()Lcom/discord/simpleast/core/parser/Rule;
 
     move-result-object p2
 
@@ -226,7 +226,7 @@
     check-cast p1, Lcom/discord/simpleast/core/node/Node;
 
     :goto_1
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 a6cc6f4516..d041a8f3da 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 e92d900443..31bd0b5227 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p1, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 acf614ec97..8e99c4e751 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 50b539557b..1c7c550a6f 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 3c10d06990..a88fd16242 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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object v0, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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;->Bo:Lcom/discord/simpleast/core/parser/ParseSpec$a;
+    sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->Bp: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 954f443dd4..e691e16535 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali
@@ -487,9 +487,9 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v0, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eM()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eN()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eP()Ljava/util/regex/Pattern;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
index c1f68e22ed..508d972fa0 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/Spans.smali
@@ -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
 
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 810781eee0..ea7223dcbf 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, 0x7f040366
+    const v4, 0x7f040367
 
     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 d26a27c79e..e9c272ddf0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 71f8b36d05..248a068a50 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, 0x7f0600f1
+    const v3, 0x7f0600f2
 
     if-eqz p2, :cond_1
 
@@ -189,7 +189,7 @@
     :goto_1
     new-instance v3, Landroid/text/style/BackgroundColorSpan;
 
-    const v4, 0x7f0600f2
+    const v4, 0x7f0600f3
 
     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 4fc625d155..0ceb034816 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, 0x7f040369
+    const v8, 0x7f04036a
 
     const/16 v9, 0xa
 
@@ -306,7 +306,7 @@
     goto :goto_2
 
     :cond_5
-    const v2, 0x7f04037e
+    const v2, 0x7f04037f
 
     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, 0x7f04036a
+    const v2, 0x7f04036b
 
     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.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
index d181a3e1f6..bc5af8ef45 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali
@@ -412,15 +412,15 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v3
 
-    iput-object v2, v3, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iput-object v2, v3, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     check-cast v3, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -428,11 +428,11 @@
 
     move-result v2
 
-    iput-boolean v2, v3, Lcom/facebook/drawee/controller/a;->Ma:Z
+    iput-boolean v2, v3, Lcom/facebook/drawee/controller/a;->Mj:Z
 
     check-cast v3, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v3}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v3}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v2
 
@@ -452,9 +452,9 @@
 
     check-cast v4, Landroid/graphics/drawable/Drawable;
 
-    iput-object v4, v3, Lcom/facebook/drawee/generic/a;->Ow:Landroid/graphics/drawable/Drawable;
+    iput-object v4, v3, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/drawable/Drawable;
 
-    sget-object v4, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Of:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v4, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo: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;
 
@@ -484,7 +484,7 @@
     goto :goto_0
 
     :cond_1
-    const p2, 0x7f04037e
+    const p2, 0x7f04037f
 
     invoke-static {v0, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -504,7 +504,7 @@
 
     check-cast p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
-    invoke-virtual {v3}, Lcom/facebook/drawee/generic/a;->hM()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v3}, Lcom/facebook/drawee/generic/a;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object v0
 
@@ -555,7 +555,7 @@
     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;->Pc:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+    iget-object v3, p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pl:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 
     invoke-virtual {v2, v3}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
 
@@ -564,7 +564,7 @@
 
     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;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
     instance-of v3, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
@@ -579,7 +579,7 @@
     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;->Pb:Ljava/util/Set;
+    iget-object v0, p2, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pk:Ljava/util/Set;
 
     invoke-interface {v0, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
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 610e105c1f..66f5775abc 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, 0x7f0600f1
+    const v4, 0x7f0600f2
 
     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, 0x7f0600f2
+    const v1, 0x7f0600f3
 
     invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
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 11679375d5..f40f285f9e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 def44acb1f..88d6fd238d 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, 0x7f060137
 
     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/UrlNode$render$style$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$render$style$1.smali
index 1d84fcfbe7..0c15e42d62 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b2772f674b..567873d067 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5c480371a6..5cded1da21 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ac4baa8ff0..dcd280c114 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, 0x7f0600f2
+    const v6, 0x7f0600f3
 
     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, 0x7f0600f1
+    const v4, 0x7f0600f2
 
     if-eqz v5, :cond_4
 
@@ -354,7 +354,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f0600f2
+    const v4, 0x7f0600f3
 
     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, 0x7f0600f1
+    const v3, 0x7f0600f2
 
     invoke-static {p2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali
index dd44156f17..5b00fcccc8 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler$directToPlayStore$2.smali
@@ -54,7 +54,7 @@
 
     invoke-virtual {p0}, Lcom/discord/utilities/uri/UriHandler$directToPlayStore$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 7cacb2adfc..367ecd70cf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 589d73e817..f715b8e3a1 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
@@ -581,7 +581,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p2, Ljava/lang/Exception;
 
@@ -657,14 +657,14 @@
 
     invoke-direct {p2, p1, p3}, Lcom/discord/utilities/uri/UriHandler;->showUnhandledUrlDialog(Landroid/content/Context;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     goto :goto_0
 
     :cond_1
     invoke-virtual {p1, v0}, Landroid/content/Context;->startActivity(Landroid/content/Intent;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_2
     :goto_0
@@ -739,7 +739,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
 
@@ -761,7 +761,7 @@
 
     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;->wx:Lcom/discord/app/j$b;
+    sget-object p2, Lcom/discord/app/j;->wv:Lcom/discord/app/j$b;
 
     invoke-static {}, Lcom/discord/app/j;->dR()V
 
@@ -846,7 +846,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d0040
+    const v1, 0x7f0d0042
 
     const/4 v2, 0x0
 
@@ -866,7 +866,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0a0773
+    const v1, 0x7f0a0797
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -874,7 +874,7 @@
 
     check-cast v1, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0774
+    const v2, 0x7f0a0798
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1103,7 +1103,7 @@
 
     :cond_7
     :goto_2
-    const p2, 0x7f121228
+    const p2, 0x7f1212b0
 
     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 fa341fda94..4db6e3a97a 100644
--- a/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
+++ b/com.discord/smali/com/discord/utilities/users/UserRequestManager.smali
@@ -207,7 +207,7 @@
 
     check-cast v1, Lrx/functions/Action0;
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()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 e394c401a4..c61e450407 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;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR: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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
 
     goto :goto_1
 
     :cond_1
-    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aaf:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object p0, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
 
     :goto_1
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St: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;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v1
 
@@ -113,7 +113,7 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object v2, v1, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     check-cast v1, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -123,7 +123,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/controller/a;->Ma:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/controller/a;->Mj:Z
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -131,15 +131,15 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hr()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 0f2f610b76..5c005d1608 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c99deb4fef..3376c208b2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a23f888784..a0a1ed97d5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 936cadb8b1..c12438410f 100644
--- a/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
+++ b/com.discord/smali/com/discord/utilities/view/extensions/ViewExtensions.smali
@@ -832,7 +832,7 @@
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p2, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object p2, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     array-length p2, p3
 
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 e83cd9f073..7fc19d42d7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ef30d112a1..de90a444fd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5460ce15ee..e257605c27 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 3641adb5ef..dc83890172 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f37dfc8a90..aa099f5032 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
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy: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;
 
@@ -146,7 +146,7 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/spans/ClickableSpan;->onLongPress(Landroid/view/View;)Lkotlin/Unit;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 15aba6041e..d1fd3363fc 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
@@ -119,7 +119,7 @@
 
     check-cast p1, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -185,7 +185,7 @@
 
     if-gtz v1, :cond_2
 
-    sget-object v1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -210,7 +210,7 @@
 
     invoke-static {v7, v8}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v8, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v8, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v8, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -229,7 +229,7 @@
 
     if-nez v7, :cond_4
 
-    invoke-static {}, Lkotlinx/coroutines/al;->DA()Lkotlinx/coroutines/an;
+    invoke-static {}, Lkotlinx/coroutines/al;->DD()Lkotlinx/coroutines/an;
 
     move-result-object v7
 
@@ -272,11 +272,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lkotlinx/coroutines/CoroutineScope;->Da()Lkotlin/coroutines/CoroutineContext;
+    invoke-interface {p1}, Lkotlinx/coroutines/CoroutineScope;->Dd()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -305,7 +305,7 @@
 
     if-eqz v0, :cond_8
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DD()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/as;->DG()Lkotlinx/coroutines/bq;
 
     move-result-object v1
 
@@ -322,7 +322,7 @@
     invoke-static {p1, v1, v3, v0}, Lkotlinx/coroutines/e;->a(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;I)Lkotlinx/coroutines/Job;
 
     :cond_8
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 70d149ee67..8412fe03d8 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
@@ -652,7 +652,7 @@
 
     invoke-virtual {p2, p1}, Landroid/text/style/ClickableSpan;->onClick(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     goto :goto_9
 
@@ -697,11 +697,11 @@
 
     invoke-direct {p2, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object p1, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast p1, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DC()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
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 76a0bfec62..4be113a2f4 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
@@ -77,7 +77,7 @@
 
     invoke-static {p2}, Lcom/discord/utilities/view/text/LinkifiedTextView;->access$setOnURLSpanClicked$cp(Lkotlin/jvm/functions/Function2;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
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 948c6599f1..931bc6b079 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5ba5ea5c5e..d2947eb731 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_1
     return-void
@@ -251,7 +251,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_1
     return-void
@@ -289,7 +289,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_1
     return-void
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 2025fb6c28..8f92c8761f 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a02d5
+    const v0, 0x7f0a02d9
 
     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 6e486e5363..32b017045e 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, 0x7f0a02d4
+    const v1, 0x7f0a02d8
 
     if-ne v0, v1, :cond_0
 
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 4d62d1a7f7..22ea933e28 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;->zq:Z
+    iget-boolean p1, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;->zt: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 94f98d74d7..04b30192a3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 dab1bca9d2..032fff3396 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, 0x7f120d08
+    const v0, 0x7f120d3a
 
     const/4 v1, 0x1
 
@@ -249,7 +249,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 953acb33d2..467575bbb1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1a4cb652bc..e027c10ec2 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, 0x7f0a04cd
+    const v1, 0x7f0a04d7
 
     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 ee023199a1..446bbd9c57 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6ed6211ff0..aaf875aae1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8e339b82f9..48a3ca173d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -108,7 +108,7 @@
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->xZ:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yb: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 dc65aa4e34..b1fd466875 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
@@ -195,7 +195,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, v0, Lcom/discord/overlay/OverlayManager;->ye:Landroid/view/View$OnTouchListener;
+    iget-object v2, v0, Lcom/discord/overlay/OverlayManager;->yg: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, 0x7f08030e
+    const v4, 0x7f08031a
 
     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, 0x7f060106
 
     invoke-static {p1, v4}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
 
@@ -323,7 +323,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120cf8
+    const v2, 0x7f120d2a
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -335,7 +335,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120d09
+    const v2, 0x7f120d3b
 
     invoke-virtual {p0, v2}, Lcom/discord/utilities/voice/DiscordOverlayService;->getString(I)Ljava/lang/String;
 
@@ -351,7 +351,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f1203e4
+    const v2, 0x7f120409
 
     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, 0x7f08023e
+    const v3, 0x7f08024a
 
     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, 0x7f121063
+    const v0, 0x7f1210ea
 
     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, 0x7f08036c
+    const v2, 0x7f080378
 
     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;->xZ:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yb: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;->xZ:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/overlay/OverlayManager;->yb:Ljava/util/List;
 
     check-cast p1, Ljava/lang/Iterable;
 
@@ -603,7 +603,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->ya:Lkotlin/jvm/functions/Function1;
+    iput-object v1, v0, Lcom/discord/overlay/OverlayManager;->yc:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {p0}, Lcom/discord/utilities/voice/DiscordOverlayService;->getOverlayManager()Lcom/discord/overlay/OverlayManager;
 
@@ -715,7 +715,7 @@
     :catch_0
     move-exception p1
 
-    sget-object v4, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v6, p1
 
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 e1b9a02506..37a3dd4527 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, 0x7f08030e
+    const v2, 0x7f08031a
 
     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, 0x7f08020e
+    const v9, 0x7f080219
 
     invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
     move-result-object v10
 
-    const v11, 0x7f120525
+    const v11, 0x7f12054a
 
     invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -318,12 +318,12 @@
 
     if-eqz v3, :cond_0
 
-    const v8, 0x7f0802f6
+    const v8, 0x7f080302
 
     goto :goto_0
 
     :cond_0
-    const v8, 0x7f0802f5
+    const v8, 0x7f080301
 
     :goto_0
     if-eqz v3, :cond_1
@@ -332,7 +332,7 @@
 
     move-result-object v3
 
-    const v9, 0x7f12122f
+    const v9, 0x7f1212b7
 
     invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -345,7 +345,7 @@
 
     move-result-object v3
 
-    const v9, 0x7f120bd9
+    const v9, 0x7f120c0b
 
     invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -362,12 +362,12 @@
 
     if-eqz p0, :cond_2
 
-    const v4, 0x7f0802b7
+    const v4, 0x7f0802c3
 
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f0802b6
+    const v4, 0x7f0802c2
 
     :goto_2
     if-eqz p0, :cond_3
@@ -376,7 +376,7 @@
 
     move-result-object p0
 
-    const v6, 0x7f121226
+    const v6, 0x7f1212ae
 
     invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -389,7 +389,7 @@
 
     move-result-object p0
 
-    const v6, 0x7f1204d7
+    const v6, 0x7f1204fc
 
     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 b85e081a49..e690325ff8 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;->vJ:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->m(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;->vJ:Lcom/discord/app/g;
+    sget-object v0, Lcom/discord/app/g;->vI:Lcom/discord/app/g;
 
     invoke-virtual {v0, p0}, Lcom/discord/app/g;->n(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 86b3431ede..f9cb11e3ec 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;->zi:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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;->zj:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm: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;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn: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;->zh:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zk: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;->zi:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zl: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;->zj:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zm: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;->zk:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zn: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;->zh:Lcom/discord/rtcconnection/RtcConnection$Quality;
+    sget-object v1, Lcom/discord/rtcconnection/RtcConnection$Quality;->zk: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 99bde210e1..3d4a8ff6fd 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
-    const v1, 0x7f06011b
+    const v1, 0x7f06011c
 
-    const v2, 0x7f060126
+    const v2, 0x7f060127
 
     if-eqz v0, :cond_4
 
-    const p1, 0x7f060105
+    const p1, 0x7f060106
 
     if-nez p2, :cond_0
 
@@ -109,7 +109,7 @@
     return p1
 
     :cond_4
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zo:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(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;->zp:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$c;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(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;->zn:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(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;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(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;->zr:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(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, 0x7f0402a1
+    const v0, 0x7f0402a2
 
     if-nez p2, :cond_8
 
-    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object p2, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(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, 0x7f0803cb
+    const v0, 0x7f0803d8
 
     if-nez p1, :cond_0
 
@@ -238,17 +238,17 @@
     return v0
 
     :cond_2
-    const p1, 0x7f0803ca
+    const p1, 0x7f0803d7
 
     return p1
 
     :cond_3
-    const p1, 0x7f0803c8
+    const p1, 0x7f0803d5
 
     return p1
 
     :cond_4
-    const p1, 0x7f0803c9
+    const p1, 0x7f0803d6
 
     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;->zp:Lcom/discord/rtcconnection/RtcConnection$State$c;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$c;->zs:Lcom/discord/rtcconnection/RtcConnection$State$c;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -264,12 +264,12 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f120449
+    const p1, 0x7f12046e
 
     return p1
 
     :cond_0
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->zr:Lcom/discord/rtcconnection/RtcConnection$State$e;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$e;->zu:Lcom/discord/rtcconnection/RtcConnection$State$e;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -277,12 +277,12 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f12044c
+    const p1, 0x7f120471
 
     return p1
 
     :cond_1
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->zo:Lcom/discord/rtcconnection/RtcConnection$State$b;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$b;->zr:Lcom/discord/rtcconnection/RtcConnection$State$b;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -290,12 +290,12 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f120447
+    const p1, 0x7f12046c
 
     return p1
 
     :cond_2
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zn:Lcom/discord/rtcconnection/RtcConnection$State$a;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$a;->zq:Lcom/discord/rtcconnection/RtcConnection$State$a;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -303,12 +303,12 @@
 
     if-eqz v0, :cond_3
 
-    const p1, 0x7f120446
+    const p1, 0x7f12046b
 
     return p1
 
     :cond_3
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zt:Lcom/discord/rtcconnection/RtcConnection$State$g;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$g;->zw:Lcom/discord/rtcconnection/RtcConnection$State$g;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -316,12 +316,12 @@
 
     if-eqz v0, :cond_4
 
-    const p1, 0x7f12044d
+    const p1, 0x7f120472
 
     return p1
 
     :cond_4
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -329,18 +329,18 @@
 
     if-eqz v0, :cond_5
 
-    const p1, 0x7f120451
+    const p1, 0x7f120476
 
     return p1
 
     :cond_5
     instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
 
-    const v1, 0x7f12044a
+    const v1, 0x7f12046f
 
     if-nez v0, :cond_6
 
-    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zu:Lcom/discord/rtcconnection/RtcConnection$State$h;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$h;->zx:Lcom/discord/rtcconnection/RtcConnection$State$h;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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 32beab632d..da36ebdeb1 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ac15b9acc0..3fb0907fce 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 96310ffc69..1ab9587d1e 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 61836d013f..eaf3289283 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9e1ad1bb82..f8360a344e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d5885e19c4..4e39729fdd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 68a9883d94..1dfa94915f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3e04b5f1ad..0083af2d08 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6bf1761dc5..816654e4d7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8136909926..85d16c9930 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 008483b70f..e1dcd0b3c2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 35d06fb85e..fc4f615673 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4e0fdb90e7..c8c0b2b1c2 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p2
 
@@ -188,7 +188,7 @@
 
     iget-object p2, p0, Lcom/discord/utilities/websocket/WebSocket;->schedulerSubject:Lrx/subjects/PublishSubject;
 
-    invoke-static {}, Lrx/internal/a/aj;->Ju()Lrx/internal/a/aj;
+    invoke-static {}, Lrx/internal/a/aj;->Jx()Lrx/internal/a/aj;
 
     move-result-object p3
 
@@ -198,7 +198,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-static {}, Lrx/d/a;->Ks()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()Lrx/Scheduler;
 
     move-result-object p1
 
@@ -296,7 +296,7 @@
 
     invoke-virtual {v0, v1, v2, p2}, Lokhttp3/t$a;->b(JLjava/util/concurrent/TimeUnit;)Lokhttp3/t$a;
 
-    invoke-virtual {v0}, Lokhttp3/t$a;->FA()Lokhttp3/t;
+    invoke-virtual {v0}, Lokhttp3/t$a;->FD()Lokhttp3/t;
 
     move-result-object p2
 
@@ -308,7 +308,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {p1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali b/com.discord/smali/com/discord/utilities/websocket/ZLibWebSocketListener.smali
index 03faf7844a..e3f6304c8e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali
index 42e9d78aa4..192a3b06a6 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 = 0x7f0800a1
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
+.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 = 0x7f0800a4
+.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 = 0x7f0800a5
+.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 = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
+.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 = 0x7f0800a9
+.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 = 0x7f0800aa
+.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 = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
+.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 = 0x7f0800ad
+.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 = 0x7f0800ae
+.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 = 0x7f0800af
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
+.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 = 0x7f0800b2
+.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 = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800b4
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b5
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b6
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b7
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b8
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b9
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final drawable_chip_background:I = 0x7f080101
+.field public static final drawable_chip_background:I = 0x7f080105
 
-.field public static final drawable_chip_circle:I = 0x7f080102
+.field public static final drawable_chip_circle:I = 0x7f080106
 
-.field public static final drawable_chip_delete:I = 0x7f080103
+.field public static final drawable_chip_delete:I = 0x7f080107
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801b0
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801b1
+.field public static final googleg_standard_color_18:I = 0x7f0801bc
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
 
-.field public static final mtrl_snackbar_background:I = 0x7f080461
+.field public static final mtrl_snackbar_background:I = 0x7f08046f
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080462
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
 
-.field public static final navigation_empty_icon:I = 0x7f080463
+.field public static final navigation_empty_icon:I = 0x7f080471
 
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
 
 # 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 8dffb309b7..aefaaf0973 100644
--- a/com.discord/smali/com/discord/utils/R$d.smali
+++ b/com.discord/smali/com/discord/utils/R$d.smali
@@ -127,13 +127,13 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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
 
@@ -157,303 +157,303 @@
 
 .field public static final column_reverse:I = 0x7f0a0221
 
-.field public static final container:I = 0x7f0a0230
+.field public static final container:I = 0x7f0a0233
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a023a
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final dark:I = 0x7f0a0251
+.field public static final dark:I = 0x7f0a0254
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final design_bottom_sheet:I = 0x7f0a0256
+.field public static final design_bottom_sheet:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area:I = 0x7f0a0257
+.field public static final design_menu_item_action_area:I = 0x7f0a025a
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0258
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
 
-.field public static final design_menu_item_text:I = 0x7f0a0259
+.field public static final design_menu_item_text:I = 0x7f0a025c
 
-.field public static final design_navigation_view:I = 0x7f0a025a
+.field public static final design_navigation_view:I = 0x7f0a025d
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final fill:I = 0x7f0a02e0
+.field public static final fill:I = 0x7f0a02e4
 
-.field public static final filled:I = 0x7f0a02e3
+.field public static final filled:I = 0x7f0a02e7
 
-.field public static final fitBottomStart:I = 0x7f0a02e4
+.field public static final fitBottomStart:I = 0x7f0a02e8
 
-.field public static final fitCenter:I = 0x7f0a02e5
+.field public static final fitCenter:I = 0x7f0a02e9
 
-.field public static final fitEnd:I = 0x7f0a02e6
+.field public static final fitEnd:I = 0x7f0a02ea
 
-.field public static final fitStart:I = 0x7f0a02e7
+.field public static final fitStart:I = 0x7f0a02eb
 
-.field public static final fitXY:I = 0x7f0a02e8
+.field public static final fitXY:I = 0x7f0a02ec
 
-.field public static final fixed:I = 0x7f0a02e9
+.field public static final fixed:I = 0x7f0a02ed
 
-.field public static final flex_end:I = 0x7f0a02ea
+.field public static final flex_end:I = 0x7f0a02ee
 
-.field public static final flex_start:I = 0x7f0a02eb
+.field public static final flex_start:I = 0x7f0a02ef
 
-.field public static final focusCrop:I = 0x7f0a02ec
+.field public static final focusCrop:I = 0x7f0a02f0
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final ghost_view:I = 0x7f0a0312
+.field public static final ghost_view:I = 0x7f0a0316
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final icon_only:I = 0x7f0a0390
+.field public static final icon_only:I = 0x7f0a0398
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0405
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
 
-.field public static final labeled:I = 0x7f0a040c
+.field public static final labeled:I = 0x7f0a0414
 
-.field public static final largeLabel:I = 0x7f0a040d
+.field public static final largeLabel:I = 0x7f0a0415
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final light:I = 0x7f0a0414
+.field public static final light:I = 0x7f0a041c
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final masked:I = 0x7f0a0437
+.field public static final masked:I = 0x7f0a043f
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final mini:I = 0x7f0a0480
+.field public static final mini:I = 0x7f0a048a
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0481
+.field public static final mtrl_child_content_container:I = 0x7f0a048b
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0482
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final navigation_header_container:I = 0x7f0a0485
+.field public static final navigation_header_container:I = 0x7f0a048f
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final nowrap:I = 0x7f0a04a6
+.field public static final nowrap:I = 0x7f0a04b0
 
-.field public static final outline:I = 0x7f0a04c7
+.field public static final outline:I = 0x7f0a04d1
 
-.field public static final parallax:I = 0x7f0a04d6
+.field public static final parallax:I = 0x7f0a04e0
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final parent_matrix:I = 0x7f0a04d9
+.field public static final parent_matrix:I = 0x7f0a04e3
 
-.field public static final pin:I = 0x7f0a0515
+.field public static final pin:I = 0x7f0a0520
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final row:I = 0x7f0a05a1
+.field public static final row:I = 0x7f0a05b6
 
-.field public static final row_reverse:I = 0x7f0a05a2
+.field public static final row_reverse:I = 0x7f0a05b7
 
-.field public static final save_image_matrix:I = 0x7f0a05a3
+.field public static final save_image_matrix:I = 0x7f0a05b8
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05a4
+.field public static final save_non_transition_alpha:I = 0x7f0a05b9
 
-.field public static final save_scale_type:I = 0x7f0a05a5
+.field public static final save_scale_type:I = 0x7f0a05ba
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final scrollable:I = 0x7f0a05ad
+.field public static final scrollable:I = 0x7f0a05c2
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final selected:I = 0x7f0a05cb
+.field public static final selected:I = 0x7f0a05e0
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final smallLabel:I = 0x7f0a0708
+.field public static final smallLabel:I = 0x7f0a071d
 
-.field public static final snackbar_action:I = 0x7f0a0709
+.field public static final snackbar_action:I = 0x7f0a071e
 
-.field public static final snackbar_text:I = 0x7f0a070a
+.field public static final snackbar_text:I = 0x7f0a071f
 
-.field public static final space_around:I = 0x7f0a070e
+.field public static final space_around:I = 0x7f0a0723
 
-.field public static final space_between:I = 0x7f0a070f
+.field public static final space_between:I = 0x7f0a0724
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final standard:I = 0x7f0a0718
+.field public static final standard:I = 0x7f0a0733
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final stretch:I = 0x7f0a0730
+.field public static final stretch:I = 0x7f0a0754
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_input_password_toggle:I = 0x7f0a0751
+.field public static final text_input_password_toggle:I = 0x7f0a0775
 
-.field public static final textinput_counter:I = 0x7f0a0754
+.field public static final textinput_counter:I = 0x7f0a0778
 
-.field public static final textinput_error:I = 0x7f0a0755
+.field public static final textinput_error:I = 0x7f0a0779
 
-.field public static final textinput_helper_text:I = 0x7f0a0756
+.field public static final textinput_helper_text:I = 0x7f0a077a
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final touch_outside:I = 0x7f0a0764
+.field public static final touch_outside:I = 0x7f0a0788
 
-.field public static final transition_current_scene:I = 0x7f0a0765
+.field public static final transition_current_scene:I = 0x7f0a0789
 
-.field public static final transition_layout_save:I = 0x7f0a0766
+.field public static final transition_layout_save:I = 0x7f0a078a
 
-.field public static final transition_position:I = 0x7f0a0767
+.field public static final transition_position:I = 0x7f0a078b
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0768
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
 
-.field public static final transition_transform:I = 0x7f0a0769
+.field public static final transition_transform:I = 0x7f0a078d
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final unlabeled:I = 0x7f0a0776
+.field public static final unlabeled:I = 0x7f0a079a
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_offset_helper:I = 0x7f0a07ff
+.field public static final view_offset_helper:I = 0x7f0a082e
 
-.field public static final visible:I = 0x7f0a0802
+.field public static final visible:I = 0x7f0a0831
 
-.field public static final wide:I = 0x7f0a082e
+.field public static final wide:I = 0x7f0a085e
 
-.field public static final wrap:I = 0x7f0a0850
+.field public static final wrap:I = 0x7f0a0880
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
-.field public static final wrap_reverse:I = 0x7f0a0852
+.field public static final wrap_reverse:I = 0x7f0a0882
 
 
 # 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 809319825c..ce9228f113 100644
--- a/com.discord/smali/com/discord/utils/R$e.smali
+++ b/com.discord/smali/com/discord/utils/R$e.smali
@@ -71,61 +71,61 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final design_bottom_navigation_item:I = 0x7f0d0023
+.field public static final design_bottom_navigation_item:I = 0x7f0d0024
 
-.field public static final design_bottom_sheet_dialog:I = 0x7f0d0024
+.field public static final design_bottom_sheet_dialog:I = 0x7f0d0025
 
-.field public static final design_layout_snackbar:I = 0x7f0d0025
+.field public static final design_layout_snackbar:I = 0x7f0d0026
 
-.field public static final design_layout_snackbar_include:I = 0x7f0d0026
+.field public static final design_layout_snackbar_include:I = 0x7f0d0027
 
-.field public static final design_layout_tab_icon:I = 0x7f0d0027
+.field public static final design_layout_tab_icon:I = 0x7f0d0028
 
-.field public static final design_layout_tab_text:I = 0x7f0d0028
+.field public static final design_layout_tab_text:I = 0x7f0d0029
 
-.field public static final design_menu_item_action_area:I = 0x7f0d0029
+.field public static final design_menu_item_action_area:I = 0x7f0d002a
 
-.field public static final design_navigation_item:I = 0x7f0d002a
+.field public static final design_navigation_item:I = 0x7f0d002b
 
-.field public static final design_navigation_item_header:I = 0x7f0d002b
+.field public static final design_navigation_item_header:I = 0x7f0d002c
 
-.field public static final design_navigation_item_separator:I = 0x7f0d002c
+.field public static final design_navigation_item_separator:I = 0x7f0d002d
 
-.field public static final design_navigation_item_subheader:I = 0x7f0d002d
+.field public static final design_navigation_item_subheader:I = 0x7f0d002e
 
-.field public static final design_navigation_menu:I = 0x7f0d002e
+.field public static final design_navigation_menu:I = 0x7f0d002f
 
-.field public static final design_navigation_menu_item:I = 0x7f0d002f
+.field public static final design_navigation_menu_item:I = 0x7f0d0030
 
-.field public static final design_text_input_password_icon:I = 0x7f0d0030
+.field public static final design_text_input_password_icon:I = 0x7f0d0031
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0043
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0044
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final view_chip_default:I = 0x7f0d007e
+.field public static final view_chip_default:I = 0x7f0d0083
 
 
 # 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 50ac2cfa4f..c917731117 100644
--- a/com.discord/smali/com/discord/utils/R$f.smali
+++ b/com.discord/smali/com/discord/utils/R$f.smali
@@ -2134,7 +2134,7 @@
 
     new-array v6, v1, [I
 
-    const v9, 0x7f04027c
+    const v9, 0x7f04027d
 
     aput v9, v6, v3
 
@@ -2180,7 +2180,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -2364,15 +2364,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -2381,8 +2381,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -2396,11 +2396,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -2434,15 +2434,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040258
+        0x7f040259
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
+        0x7f040319
     .end array-data
 
     :array_9
@@ -2454,17 +2454,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_c
@@ -2489,8 +2489,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_e
@@ -2566,47 +2566,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -2616,6 +2615,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_f
@@ -2639,7 +2639,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_11
@@ -2699,10 +2699,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d7
-        0x7f040305
-        0x7f040360
-        0x7f040362
+        0x7f0402d8
+        0x7f040306
+        0x7f040361
+        0x7f040363
     .end array-data
 
     :array_14
@@ -2711,8 +2711,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
-        0x7f040309
         0x7f04030a
+        0x7f04030b
     .end array-data
 
     :array_15
@@ -2752,12 +2752,12 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f5
-        0x7f0402f7
-        0x7f04031a
-        0x7f0403be
+        0x7f0402f6
+        0x7f0402f8
+        0x7f04031b
         0x7f0403bf
-        0x7f0403c9
+        0x7f0403c0
+        0x7f0403ca
     .end array-data
 
     :array_17
@@ -2783,7 +2783,7 @@
     :array_1a
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_1b
@@ -2811,8 +2811,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_1e
@@ -2825,9 +2825,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
-        0x7f040301
         0x7f040302
         0x7f040303
+        0x7f040304
     .end array-data
 
     :array_1f
@@ -2854,11 +2854,11 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027b
-        0x7f04029e
-        0x7f0402d7
-        0x7f040305
-        0x7f0403e6
+        0x7f04027c
+        0x7f04029f
+        0x7f0402d8
+        0x7f040306
+        0x7f0403e7
     .end array-data
 
     :array_21
@@ -2866,7 +2866,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025a
+        0x7f04025b
     .end array-data
 
     :array_22
@@ -2890,7 +2890,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_24
@@ -2907,16 +2907,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -2930,7 +2929,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_26
@@ -2964,8 +2964,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_29
@@ -3004,15 +3004,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d7
-        0x7f04031e
+        0x7f0402d8
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04031e
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2e
@@ -3029,13 +3029,12 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
-        0x7f040277
         0x7f040278
-        0x7f040283
-        0x7f0402f6
-        0x7f04030b
-        0x7f040341
-        0x7f040349
+        0x7f040279
+        0x7f040284
+        0x7f0402f7
+        0x7f04030c
+        0x7f040342
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3045,10 +3044,11 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040357
-        0x7f04035c
+        0x7f040353
+        0x7f040358
         0x7f04035d
-        0x7f040361
+        0x7f04035e
+        0x7f040362
     .end array-data
 
     :array_2f
@@ -3083,9 +3083,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_31
@@ -3097,8 +3097,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_32
@@ -3114,20 +3114,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_33
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_34
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_35
@@ -3140,9 +3140,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .end array-data
 
     :array_36
@@ -3157,20 +3157,20 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_37
     .array-data 4
         0x7f04007b
         0x7f0400c6
-        0x7f0402f4
+        0x7f0402f5
     .end array-data
 
     :array_38
@@ -3182,16 +3182,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3205,20 +3204,21 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f04030b
         0x7f04030c
+        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f040279
+        0x7f04027a
     .end array-data
 
     :array_3b
@@ -3227,7 +3227,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_3c
@@ -3245,17 +3245,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_3e
@@ -3267,7 +3267,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3289,9 +3288,10 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040342
+        0x7f040341
         0x7f040343
         0x7f040344
+        0x7f040345
     .end array-data
 
     :array_40
@@ -3308,7 +3308,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_41
@@ -3336,11 +3336,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
-        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
+        0x7f040297
     .end array-data
 
     :array_42
@@ -3363,17 +3363,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3381,15 +3380,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 12e7f08bd6..8e06598a85 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 BT:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+.field public static final BU: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;->BT:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BU: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 9ed068ed47..99aef8c46d 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 BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+.field public static final BV: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;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BV: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 9bd4e82929..7d75091b7e 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 BV:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
-
 .field public static final enum BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
 .field public static final enum BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
-.field private static final synthetic BY:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+.field public static final enum BY:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+
+.field private static final synthetic BZ:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
 
 # instance fields
@@ -52,13 +52,13 @@
 
     const-string v3, "MECH_WUMPUS"
 
-    const v4, 0x7f08045d
+    const v4, 0x7f08046b
 
     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;->BV:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
@@ -68,11 +68,11 @@
 
     const-string v3, "WHEEL_WUMPUS"
 
-    const v4, 0x7f08045e
+    const v4, 0x7f08046c
 
     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;->BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
@@ -82,15 +82,15 @@
 
     const-string v3, "BROKEN_WHEEL"
 
-    const v4, 0x7f08043b
+    const v4, 0x7f080449
 
     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;->BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BY:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BY:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sput-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BZ:[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;->BY:[Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BZ:[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 6529eef59b..d65adb239f 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 BZ:Ljava/util/HashSet;
+.field private final Ca: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;->BZ:Ljava/util/HashSet;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Ca: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/l;->checkExpressionValueIsNotNull(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;->BT:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p1, 0x7f1202bb
-
-    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;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p1
-
-    if-eqz p1, :cond_3
-
-    invoke-static {p2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p1, 0x7f12026d
-
-    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, 0x7f120d67
+    const v2, 0x7f120d9b
 
     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/l;->checkExpressionValueIsNotNull(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;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const p1, 0x7f1202bc
+
+    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;->BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_3
+
+    invoke-static {p2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const p1, 0x7f12026e
+
+    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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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;->BZ:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Ca: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;->BZ:Ljava/util/HashSet;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView$a;->Ca: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 cedbc999a5..b747328c94 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 Ca:Lkotlin/jvm/functions/Function0;
+.field final synthetic Cb: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;->Ca:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->Cb: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;->Ca:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->Cb: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 e276ddf04d..e29462fe30 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 Cb:Lkotlin/jvm/functions/Function0;
+.field final synthetic Cc: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;->Cb:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->Cc: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;->Cb:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$c;->Cc: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 15c0490bab..70bf92739f 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 Cc:Ljava/util/List;
+.field final synthetic Cd:Ljava/util/List;
 
-.field final synthetic Cd:Lkotlin/jvm/functions/Function1;
+.field final synthetic Ce: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;->Cc:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Cd:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Cd:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Ce: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;->Cc:Ljava/util/List;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Cd: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;->Cd:Lkotlin/jvm/functions/Function1;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView$d;->Ce: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 0219f50afa..2f9a3a40f4 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
@@ -14,28 +14,28 @@
 
 
 # instance fields
-.field private final BI:Landroid/widget/TextView;
+.field private final BJ:Landroid/widget/TextView;
 
-.field private final BJ:Landroid/widget/Spinner;
-
-.field private final BK:Landroid/widget/ImageView;
+.field private final BK:Landroid/widget/Spinner;
 
 .field private final BL:Landroid/widget/ImageView;
 
 .field private final BM:Landroid/widget/ImageView;
 
-.field private final BN:Landroid/widget/TextView;
+.field private final BN:Landroid/widget/ImageView;
 
-.field private final BO:Landroid/widget/Button;
+.field private final BO:Landroid/widget/TextView;
 
-.field private final BP:Landroid/widget/ProgressBar;
+.field private final BP:Landroid/widget/Button;
 
-.field private final BQ:Landroid/widget/Button;
+.field private final BQ:Landroid/widget/ProgressBar;
 
-.field private final BR:Landroid/widget/TextView;
+.field private final BR:Landroid/widget/Button;
 
 .field private final BS:Landroid/widget/TextView;
 
+.field private final BT:Landroid/widget/TextView;
+
 .field private final headerTv:Landroid/widget/TextView;
 
 
@@ -93,7 +93,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d006e
+    const p3, 0x7f0d0072
 
     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;->BI:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ:Landroid/widget/TextView;
 
     const p1, 0x7f0a004c
 
@@ -123,7 +123,7 @@
 
     check-cast p1, Landroid/widget/Spinner;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ:Landroid/widget/Spinner;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/Spinner;
 
     const p1, 0x7f0a0049
 
@@ -151,7 +151,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BL:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0047
 
@@ -165,7 +165,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BL:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BM:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0048
 
@@ -179,7 +179,7 @@
 
     check-cast p1, Landroid/widget/ImageView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BM:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BN:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0043
 
@@ -193,7 +193,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BN:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BO:Landroid/widget/TextView;
 
     const p1, 0x7f0a004e
 
@@ -207,7 +207,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BO:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/Button;
 
     const p1, 0x7f0a004b
 
@@ -221,7 +221,7 @@
 
     check-cast p1, Landroid/widget/ProgressBar;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/ProgressBar;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BQ:Landroid/widget/ProgressBar;
 
     const p1, 0x7f0a004f
 
@@ -235,7 +235,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BQ:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR:Landroid/widget/Button;
 
     const p1, 0x7f0a0045
 
@@ -249,7 +249,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BS:Landroid/widget/TextView;
 
     const p1, 0x7f0a0044
 
@@ -263,7 +263,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BS:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BT:Landroid/widget/TextView;
 
     return-void
 .end method
@@ -301,23 +301,23 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/views/ActiveSubscriptionView;->BL:Landroid/widget/ImageView;
 
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BL:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BM: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;->BL:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BM: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;->BM:Landroid/widget/ImageView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BN: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;->BR:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BS: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;->BS:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BT: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;->BS:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BT: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;->BN:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BO: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;->BO:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/Button;
 
     invoke-virtual {p5, p7}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BO:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP: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;->BO:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP:Landroid/widget/Button;
 
     invoke-virtual {p5, p1}, Landroid/widget/Button;->setVisibility(I)V
 
     :goto_0
-    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BO:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP: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;->BO:Landroid/widget/Button;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BP: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;->BP:Landroid/widget/ProgressBar;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BQ: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;->BQ:Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR: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;->BQ:Landroid/widget/Button;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BR: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;->BJ:Landroid/widget/Spinner;
+    iget-object p5, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/Spinner;
 
     invoke-virtual {p5, p2}, Landroid/widget/Spinner;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BK: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;->BJ:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BK: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;->BJ:Landroid/widget/Spinner;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BK:Landroid/widget/Spinner;
 
     invoke-virtual {p2, p4}, Landroid/widget/Spinner;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BI:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ:Landroid/widget/TextView;
 
     invoke-virtual {p2, p4}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ:Landroid/widget/Spinner;
+    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->BK: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;->BJ:Landroid/widget/Spinner;
+    iget-object p1, p0, Lcom/discord/views/ActiveSubscriptionView;->BK: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;->BI:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/discord/views/ActiveSubscriptionView;->BJ: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 045a5734b9..921d6ad9d5 100644
--- a/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
+++ b/com.discord/smali/com/discord/views/ApplicationNewsView$a$a.smali
@@ -15,10 +15,10 @@
 
 
 # instance fields
-.field final Cm:I
-
 .field final Cn:I
 
+.field final Co: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;->Cm:I
+    iput p2, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Cn:I
 
-    iput p3, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Cn:I
+    iput p3, p0, Lcom/discord/views/ApplicationNewsView$a$a;->Co: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 7e02238fe8..39ab61713e 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 Co:Lcom/discord/views/ApplicationNewsView$a$b;
+.field public static final Cp: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;->Co:Lcom/discord/views/ApplicationNewsView$a$b;
+    sput-object v0, Lcom/discord/views/ApplicationNewsView$a$b;->Cp: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 ba79d61fbf..956cfe9e6b 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 Cp:Lkotlin/jvm/functions/Function0;
+.field final synthetic Cq: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;->Cp:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Cq: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;->Cp:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView$b;->Cq: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 54ee8282d3..320489ea84 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 BR:Landroid/widget/TextView;
+.field public final BS:Landroid/widget/TextView;
 
-.field public final Ce:Landroid/view/ViewGroup;
+.field public final Cf:Landroid/view/ViewGroup;
 
-.field private final Cf:Landroid/widget/FrameLayout;
+.field private final Cg:Landroid/widget/FrameLayout;
 
-.field public final Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field public final Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field private final Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field private final Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field public final Ci:Landroid/widget/TextView;
+.field public final Cj:Landroid/widget/TextView;
 
-.field public final Cj:Landroid/widget/ImageView;
+.field public final Ck:Landroid/widget/ImageView;
 
-.field public final Ck:Landroid/view/ViewGroup;
+.field public final Cl:Landroid/view/ViewGroup;
 
-.field private final Cl:Landroid/widget/Button;
+.field private final Cm:Landroid/widget/Button;
 
 .field public final titleTv:Landroid/widget/TextView;
 
@@ -51,7 +51,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0070
+    const v1, 0x7f0d0074
 
     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;->Cj:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0077
 
@@ -81,7 +81,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0075
 
@@ -95,7 +95,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ce:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007a
 
@@ -109,7 +109,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
 
     const p1, 0x7f0a007b
 
@@ -123,7 +123,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007d
 
@@ -137,7 +137,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a0079
 
@@ -151,7 +151,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BR:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BS:Landroid/widget/TextView;
 
     const p1, 0x7f0a007e
 
@@ -179,7 +179,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/TextView;
 
     const p1, 0x7f0a0078
 
@@ -193,7 +193,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/Button;
 
     return-void
 .end method
@@ -215,7 +215,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0070
+    const v0, 0x7f0d0074
 
     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;->Cj:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0077
 
@@ -245,7 +245,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0075
 
@@ -259,7 +259,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ce:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007a
 
@@ -273,7 +273,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
 
     const p1, 0x7f0a007b
 
@@ -287,7 +287,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007d
 
@@ -301,7 +301,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a0079
 
@@ -315,7 +315,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BR:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BS:Landroid/widget/TextView;
 
     const p1, 0x7f0a007e
 
@@ -343,7 +343,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/TextView;
 
     const p1, 0x7f0a0078
 
@@ -357,7 +357,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/Button;
 
     return-void
 .end method
@@ -379,7 +379,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0070
+    const p3, 0x7f0d0074
 
     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;->Cj:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
 
     const p1, 0x7f0a0077
 
@@ -409,7 +409,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a0075
 
@@ -423,7 +423,7 @@
 
     check-cast p1, Landroid/view/ViewGroup;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ce:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
 
     const p1, 0x7f0a007a
 
@@ -437,7 +437,7 @@
 
     check-cast p1, Landroid/widget/FrameLayout;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/widget/FrameLayout;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Landroid/widget/FrameLayout;
 
     const p1, 0x7f0a007b
 
@@ -451,7 +451,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a007d
 
@@ -465,7 +465,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     const p1, 0x7f0a0079
 
@@ -479,7 +479,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BR:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->BS:Landroid/widget/TextView;
 
     const p1, 0x7f0a007e
 
@@ -507,7 +507,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/TextView;
 
     const p1, 0x7f0a0078
 
@@ -521,7 +521,7 @@
 
     check-cast p1, Landroid/widget/Button;
 
-    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cm:Landroid/widget/Button;
 
     return-void
 .end method
@@ -572,7 +572,7 @@
 
     div-float/2addr p1, p2
 
-    iget-object p2, p0, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/discord/views/ApplicationNewsView;->Cg: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;->Cf:Landroid/widget/FrameLayout;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cg: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;->Cf:Landroid/widget/FrameLayout;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Cg: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ci: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ci: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;->Ch:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ci: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;->Cm:I
+    iget v0, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Cn:I
 
-    iget p1, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Cn:I
+    iget p1, p1, Lcom/discord/views/ApplicationNewsView$a$a;->Co:I
 
     invoke-direct {p0, v0, p1}, Lcom/discord/views/ApplicationNewsView;->h(II)I
 
@@ -736,23 +736,23 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ce:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cf: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;->Cj:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cl: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;->Cl:Landroid/widget/Button;
+    iget-object v0, p0, Lcom/discord/views/ApplicationNewsView;->Cm: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;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch: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;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/discord/views/ApplicationNewsView;->Ch: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;->Co:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object p1, Lcom/discord/views/ApplicationNewsView$a$b;->Cp: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 c8c44efad6..6e1c87a9c6 100644
--- a/com.discord/smali/com/discord/views/BoxedButton.smali
+++ b/com.discord/smali/com/discord/views/BoxedButton.smali
@@ -8,10 +8,10 @@
 
 
 # instance fields
-.field private final Cq:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Cr:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final Cs:Lkotlin/properties/ReadOnlyProperty;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -87,7 +87,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cq:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a010d
 
@@ -95,7 +95,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cs:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -115,7 +115,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cq:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a010d
 
@@ -123,7 +123,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cs:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-direct {p0, p2}, Lcom/discord/views/BoxedButton;->a(Landroid/util/AttributeSet;)V
 
@@ -145,7 +145,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cq:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a010d
 
@@ -153,7 +153,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/BoxedButton;->Cs: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, 0x7f0d0075
+    const v2, 0x7f0d0079
 
     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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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;->Cr:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Cs: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;->Cq:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/BoxedButton;->Cr: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 29b4a9cacd..7b2fd63eb3 100644
--- a/com.discord/smali/com/discord/views/ChatActionItem.smali
+++ b/com.discord/smali/com/discord/views/ChatActionItem.smali
@@ -4,12 +4,12 @@
 
 
 # instance fields
-.field private Cs:Landroid/widget/ImageView;
-
-.field private Ct:Lcom/discord/app/AppTextView;
+.field private Ct:Landroid/widget/ImageView;
 
 .field private Cu:Lcom/discord/app/AppTextView;
 
+.field private Cv:Lcom/discord/app/AppTextView;
+
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;)V
@@ -92,7 +92,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d0079
+    const v2, 0x7f0d007d
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -108,7 +108,7 @@
 
     check-cast v0, Lcom/discord/app/AppTextView;
 
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Ct:Lcom/discord/app/AppTextView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cu:Lcom/discord/app/AppTextView;
 
     const v0, 0x7f0a01bc
 
@@ -122,7 +122,7 @@
 
     check-cast v0, Lcom/discord/app/AppTextView;
 
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cu:Lcom/discord/app/AppTextView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cv:Lcom/discord/app/AppTextView;
 
     const v0, 0x7f0a01bb
 
@@ -136,7 +136,7 @@
 
     check-cast v0, Landroid/widget/ImageView;
 
-    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Cs:Landroid/widget/ImageView;
+    iput-object v0, p0, Lcom/discord/views/ChatActionItem;->Ct:Landroid/widget/ImageView;
 
     invoke-virtual {p0}, Lcom/discord/views/ChatActionItem;->getContext()Landroid/content/Context;
 
@@ -150,7 +150,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Ct:Lcom/discord/app/AppTextView;
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Cu:Lcom/discord/app/AppTextView;
 
     if-nez v0, :cond_0
 
@@ -169,7 +169,7 @@
 
     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;->Cu:Lcom/discord/app/AppTextView;
+    iget-object v0, p0, Lcom/discord/views/ChatActionItem;->Cv:Lcom/discord/app/AppTextView;
 
     if-nez v0, :cond_1
 
@@ -190,13 +190,13 @@
 
     const/4 v0, 0x1
 
-    const v1, 0x7f08010e
+    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;->Cs:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Ct:Landroid/widget/ImageView;
 
     const-string v3, "image"
 
@@ -223,7 +223,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Cs:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/discord/views/ChatActionItem;->Ct:Landroid/widget/ImageView;
 
     if-nez v1, :cond_3
 
diff --git a/com.discord/smali/com/discord/views/CheckableImageView.smali b/com.discord/smali/com/discord/views/CheckableImageView.smali
index f1578367ec..b639ea131d 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 Cv:[I
+.field private final Cw:[I
 
 .field private checked:Z
 
@@ -32,7 +32,7 @@
 
     aput v2, v0, v1
 
-    iput-object v0, p0, Lcom/discord/views/CheckableImageView;->Cv:[I
+    iput-object v0, p0, Lcom/discord/views/CheckableImageView;->Cw:[I
 
     if-eqz p2, :cond_0
 
@@ -99,7 +99,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/discord/views/CheckableImageView;->Cv:[I
+    iget-object v0, p0, Lcom/discord/views/CheckableImageView;->Cw:[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 c14f258c24..55460aa0f2 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 CB:I
-
 .field public static final CC:I
 
 .field public static final CD:I
 
-.field private static final synthetic CE:[I
+.field public static final CE:I
 
-.field private static final CF:[I
+.field private static final synthetic CF:[I
 
-.field public static final CG:Lcom/discord/views/CheckedSetting$b$a;
+.field private static final CG:[I
+
+.field public static final CH:Lcom/discord/views/CheckedSetting$b$a;
 
 
 # direct methods
@@ -54,15 +54,15 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lcom/discord/views/CheckedSetting$b;->CB:I
+    sput v2, Lcom/discord/views/CheckedSetting$b;->CC:I
 
     const/4 v2, 0x2
 
-    sput v2, Lcom/discord/views/CheckedSetting$b;->CC:I
+    sput v2, Lcom/discord/views/CheckedSetting$b;->CD:I
 
-    sput v0, Lcom/discord/views/CheckedSetting$b;->CD:I
+    sput v0, Lcom/discord/views/CheckedSetting$b;->CE:I
 
-    sput-object v1, Lcom/discord/views/CheckedSetting$b;->CE:[I
+    sput-object v1, Lcom/discord/views/CheckedSetting$b;->CF:[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;->CG:Lcom/discord/views/CheckedSetting$b$a;
+    sput-object v0, Lcom/discord/views/CheckedSetting$b;->CH:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eX()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eZ()[I
 
     move-result-object v0
 
-    sput-object v0, Lcom/discord/views/CheckedSetting$b;->CF:[I
+    sput-object v0, Lcom/discord/views/CheckedSetting$b;->CG:[I
 
     return-void
 
@@ -90,18 +90,18 @@
     .end array-data
 .end method
 
-.method public static final synthetic eW()[I
+.method public static final synthetic eY()[I
     .locals 1
 
-    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CF:[I
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CG:[I
 
     return-object v0
 .end method
 
-.method public static eX()[I
+.method public static eZ()[I
     .locals 1
 
-    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CE:[I
+    sget-object v0, Lcom/discord/views/CheckedSetting$b;->CF:[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 1d3dd8e0b5..d42cf1e55a 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting$c.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting$c.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic CH:Lcom/discord/views/CheckedSetting;
+.field final synthetic CI:Lcom/discord/views/CheckedSetting;
 
-.field final synthetic CI:Ljava/lang/String;
+.field final synthetic CJ: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;->CH:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CI:Lcom/discord/views/CheckedSetting;
 
-    iput-object p2, p0, Lcom/discord/views/CheckedSetting$c;->CI:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/CheckedSetting$c;->CJ: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;->CI:Ljava/lang/String;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CJ:Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CH:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$c;->CI: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;->CI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting$c;->CJ: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 898c83a403..4d9cf12d7e 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 CH:Lcom/discord/views/CheckedSetting;
+.field final synthetic CI: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;->CH:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$d;->CI: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;->CH:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$d;->CI: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 502572cac3..13f7a0ac8b 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 CH:Lcom/discord/views/CheckedSetting;
+.field final synthetic CI: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;->CH:Lcom/discord/views/CheckedSetting;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$e;->CI: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;->CH:Lcom/discord/views/CheckedSetting;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$e;->CI: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;->CH:Lcom/discord/views/CheckedSetting;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting$e;->CI: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 184363fdca..1336007404 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 CJ:Lrx/functions/Action1;
+.field final synthetic CK:Lrx/functions/Action1;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Action1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$f;->CJ:Lrx/functions/Action1;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$f;->CK: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;->CJ:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$f;->CK: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 b44f7e07fa..dd13698ac8 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 CK:Lrx/functions/Action0;
+.field final synthetic CL:Lrx/functions/Action0;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Action0;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting$g;->CK:Lrx/functions/Action0;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting$g;->CL: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;->CK:Lrx/functions/Action0;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting$g;->CL: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 e6c71c6d1a..ab3a3ecc8a 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting.smali
@@ -16,14 +16,16 @@
 
 
 # static fields
-.field public static final CA:Lcom/discord/views/CheckedSetting$a;
+.field public static final CB:Lcom/discord/views/CheckedSetting$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private Cw:Lrx/functions/Action1;
+.field private CA:Landroid/widget/TextView;
+
+.field private Cx:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -33,9 +35,7 @@
     .end annotation
 .end field
 
-.field private Cx:Landroid/widget/CompoundButton;
-
-.field private Cy:Landroid/widget/TextView;
+.field private Cy:Landroid/widget/CompoundButton;
 
 .field private Cz:Landroid/widget/TextView;
 
@@ -52,7 +52,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/views/CheckedSetting$a;-><init>(B)V
 
-    sput-object v0, Lcom/discord/views/CheckedSetting;->CA:Lcom/discord/views/CheckedSetting$a;
+    sput-object v0, Lcom/discord/views/CheckedSetting;->CB: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;->CB:I
+    sget p1, Lcom/discord/views/CheckedSetting$b;->CC:I
 
     invoke-direct {p0, p1}, Lcom/discord/views/CheckedSetting;->z(I)V
 
@@ -130,7 +130,7 @@
     const/16 p2, 0xd
 
     :try_start_0
-    sget p3, Lcom/discord/views/CheckedSetting$b;->CB:I
+    sget p3, Lcom/discord/views/CheckedSetting$b;->CC:I
 
     const/4 v1, 0x1
 
@@ -140,9 +140,9 @@
 
     move-result p2
 
-    sget-object p3, Lcom/discord/views/CheckedSetting$b;->CG:Lcom/discord/views/CheckedSetting$b$a;
+    sget-object p3, Lcom/discord/views/CheckedSetting$b;->CH:Lcom/discord/views/CheckedSetting$b$a;
 
-    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eW()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eY()[I
 
     move-result-object p3
 
@@ -169,7 +169,7 @@
     if-lez v4, :cond_2
 
     :try_start_1
-    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez v4, :cond_1
 
@@ -187,7 +187,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez v4, :cond_3
 
@@ -197,7 +197,7 @@
     invoke-virtual {v4, p2}, Landroid/widget/TextView;->setTextColor(Landroid/content/res/ColorStateList;)V
 
     :cond_4
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez p2, :cond_5
 
@@ -216,7 +216,7 @@
 
     invoke-virtual {p2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez p2, :cond_6
 
@@ -233,7 +233,7 @@
 
     invoke-virtual {p2, v4}, Landroid/widget/TextView;->setCompoundDrawablePadding(I)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez p2, :cond_7
 
@@ -274,7 +274,7 @@
 
     if-eq p2, v4, :cond_9
 
-    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object v4, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez v4, :cond_8
 
@@ -326,7 +326,7 @@
     if-eqz v1, :cond_d
 
     :try_start_2
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez p2, :cond_c
 
@@ -338,7 +338,7 @@
     goto :goto_1
 
     :cond_d
-    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez v1, :cond_e
 
@@ -347,7 +347,7 @@
     :cond_e
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez p2, :cond_f
 
@@ -365,7 +365,7 @@
 
     if-lez p3, :cond_11
 
-    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez p3, :cond_10
 
@@ -383,7 +383,7 @@
 
     if-eqz p2, :cond_13
 
-    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object p3, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez p3, :cond_12
 
@@ -404,7 +404,7 @@
     goto :goto_2
 
     :cond_14
-    const p2, 0x7f0800db
+    const p2, 0x7f0800dc
 
     invoke-virtual {p0, p2}, Lcom/discord/views/CheckedSetting;->setBackgroundResource(I)V
     :try_end_2
@@ -487,7 +487,7 @@
 .method public static final synthetic b(Lcom/discord/views/CheckedSetting;)Landroid/widget/CompoundButton;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object p0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez p0, :cond_0
 
@@ -520,7 +520,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f0d00a3
+    const v0, 0x7f0d00a9
 
     goto :goto_0
 
@@ -532,12 +532,12 @@
     throw p1
 
     :cond_1
-    const v0, 0x7f0d00a2
+    const v0, 0x7f0d00a8
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f0d00a1
+    const v0, 0x7f0d00a7
 
     :goto_0
     invoke-virtual {p0}, Lcom/discord/views/CheckedSetting;->getContext()Landroid/content/Context;
@@ -550,7 +550,7 @@
 
     invoke-static {v1, v0, v2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a0659
+    const v0, 0x7f0a066e
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -562,9 +562,9 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
-    const v0, 0x7f0a065a
+    const v0, 0x7f0a066f
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -576,9 +576,9 @@
 
     check-cast v0, Landroid/widget/TextView;
 
-    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0656
+    const v0, 0x7f0a066b
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -590,9 +590,9 @@
 
     check-cast v0, Landroid/widget/CompoundButton;
 
-    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iput-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
-    const v0, 0x7f0a0657
+    const v0, 0x7f0a066c
 
     invoke-virtual {p0, v0}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -604,7 +604,7 @@
 
     iput-object v0, p0, Lcom/discord/views/CheckedSetting;->container:Landroid/view/View;
 
-    sget v0, Lcom/discord/views/CheckedSetting$b;->CC:I
+    sget v0, Lcom/discord/views/CheckedSetting$b;->CD:I
 
     const-string v1, "container"
 
@@ -676,7 +676,7 @@
 .method public final a(Ljava/lang/CharSequence;Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     const-string v1, "subLabel"
 
@@ -689,7 +689,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez p1, :cond_1
 
@@ -740,7 +740,7 @@
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez p2, :cond_0
 
@@ -751,7 +751,7 @@
 
     invoke-virtual {p2, v1}, Landroid/widget/CompoundButton;->setOnCheckedChangeListener(Landroid/widget/CompoundButton$OnCheckedChangeListener;)V
 
-    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez p2, :cond_1
 
@@ -760,14 +760,14 @@
     :cond_1
     invoke-virtual {p2, p1}, Landroid/widget/CompoundButton;->setChecked(Z)V
 
-    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Cw:Lrx/functions/Action1;
+    iget-object p1, p0, Lcom/discord/views/CheckedSetting;->Cx: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;->Cx:Landroid/widget/CompoundButton;
+    iget-object p2, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez p2, :cond_3
 
@@ -822,7 +822,7 @@
 .method public final isChecked()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
@@ -849,7 +849,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
@@ -926,7 +926,7 @@
 .method public final setButtonAlpha(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
@@ -961,9 +961,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/CheckedSetting;->Cw:Lrx/functions/Action1;
+    iput-object p1, p0, Lcom/discord/views/CheckedSetting;->Cx:Lrx/functions/Action1;
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
@@ -996,7 +996,7 @@
 .method public final setSubtextColor(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
@@ -1017,7 +1017,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->CA:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
@@ -1040,7 +1040,7 @@
 .method public final setText(Ljava/lang/CharSequence;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
@@ -1057,7 +1057,7 @@
 .method public final setTextColor(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cz:Landroid/widget/TextView;
 
     if-nez v0, :cond_0
 
@@ -1074,7 +1074,7 @@
 .method public final toggle()V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cx:Landroid/widget/CompoundButton;
+    iget-object v0, p0, Lcom/discord/views/CheckedSetting;->Cy:Landroid/widget/CompoundButton;
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali b/com.discord/smali/com/discord/views/CustomAppBarLayout$a.smali
index a26cfb18c0..d12b99c473 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 CO:Lcom/discord/views/CustomAppBarLayout$a;
+.field public static final CP: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;->CO:Lcom/discord/views/CustomAppBarLayout$a;
+    sput-object v0, Lcom/discord/views/CustomAppBarLayout$a;->CP: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 240fb904d2..c9155a25b9 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 CP:Lcom/discord/views/CustomAppBarLayout;
+.field final synthetic CQ: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;->CP:Lcom/discord/views/CustomAppBarLayout;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout$b;->CQ: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;->CP:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->CQ: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;->CP:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->CQ: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;->CP:Lcom/discord/views/CustomAppBarLayout;
+    iget-object p2, p0, Lcom/discord/views/CustomAppBarLayout$b;->CQ: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 ef2582f4fc..e0f4e1fcd3 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 CL:F
+.field private CM:F
 
-.field private final CM:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+.field private final CN:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-.field private CN:Lkotlin/jvm/functions/Function1;
+.field private CO: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;->CM:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CN:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
 
-    sget-object p1, Lcom/discord/views/CustomAppBarLayout$a;->CO:Lcom/discord/views/CustomAppBarLayout$a;
+    sget-object p1, Lcom/discord/views/CustomAppBarLayout$a;->CP:Lcom/discord/views/CustomAppBarLayout$a;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CN:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CO: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;->CL:F
+    iget p0, p0, Lcom/discord/views/CustomAppBarLayout;->CM: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;->CL:F
+    iput p1, p0, Lcom/discord/views/CustomAppBarLayout;->CM: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;->CN:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lcom/discord/views/CustomAppBarLayout;->CO: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;->CL:F
+    iget v0, p0, Lcom/discord/views/CustomAppBarLayout;->CM: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;->CM:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->CN: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;->CM:Lcom/google/android/material/appbar/AppBarLayout$OnOffsetChangedListener;
+    iget-object v0, p0, Lcom/discord/views/CustomAppBarLayout;->CN: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CN:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/CustomAppBarLayout;->CO: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 e08d9b446e..e0327c4b0d 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;->CS:Lcom/discord/views/DigitVerificationView$a;
+    sget-object v0, Lcom/discord/views/DigitVerificationView;->CT: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 15ac756251..d0d4fcdcd3 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 CT:Lkotlin/jvm/functions/Function0;
+.field private final CU:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -28,10 +28,10 @@
     .end annotation
 .end field
 
-.field private final CU:Landroid/widget/EditText;
-
 .field private final CV:Landroid/widget/EditText;
 
+.field private final CW:Landroid/widget/EditText;
+
 
 # direct methods
 .method public constructor <init>(Lkotlin/jvm/functions/Function0;Landroid/widget/EditText;Landroid/widget/EditText;)V
@@ -54,11 +54,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CT:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CU:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CU:Landroid/widget/EditText;
+    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CV:Landroid/widget/EditText;
 
-    iput-object p3, p0, Lcom/discord/views/DigitVerificationView$b;->CV:Landroid/widget/EditText;
+    iput-object p3, p0, Lcom/discord/views/DigitVerificationView$b;->CW: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;->CU:Landroid/widget/EditText;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CV:Landroid/widget/EditText;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CV:Landroid/widget/EditText;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$b;->CW:Landroid/widget/EditText;
 
     :goto_0
-    sget-object p2, Lcom/discord/views/DigitVerificationView;->CS:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p2, Lcom/discord/views/DigitVerificationView;->CT:Lcom/discord/views/DigitVerificationView$a;
 
-    iget-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CT:Lkotlin/jvm/functions/Function0;
+    iget-object p2, p0, Lcom/discord/views/DigitVerificationView$b;->CU: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 a54ddaa88e..0c2106be04 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 CR:Ljava/util/List;
+.field private final CS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final CT:Lkotlin/jvm/functions/Function0;
+.field private final CU: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;->CT:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->CU:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$c;->CR:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/DigitVerificationView$c;->CS: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;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$c;->CS: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;->CR:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView$c;->CS: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;->CS:Lcom/discord/views/DigitVerificationView$a;
+    sget-object v1, Lcom/discord/views/DigitVerificationView;->CT: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;->CS:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p1, Lcom/discord/views/DigitVerificationView;->CT: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;->CS:Lcom/discord/views/DigitVerificationView$a;
+    sget-object p1, Lcom/discord/views/DigitVerificationView;->CT:Lcom/discord/views/DigitVerificationView$a;
 
-    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->CT:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/DigitVerificationView$c;->CU: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 f4e3f1d737..6494a77701 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;->eY()Landroid/view/ViewGroup;
+    value = Lcom/discord/views/DigitVerificationView;->fa()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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 dec2e10bb7..baee56fddf 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 CW:Landroid/widget/EditText;
+.field final synthetic CX:Landroid/widget/EditText;
 
 
 # direct methods
 .method constructor <init>(Landroid/widget/EditText;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$f;->CW:Landroid/widget/EditText;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView$f;->CX: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;->CW:Landroid/widget/EditText;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView$f;->CX: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 aef864e800..2b78fa405a 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 CX:Lcom/discord/views/DigitVerificationView$g;
+.field public static final CY: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;->CX:Lcom/discord/views/DigitVerificationView$g;
+    sput-object v0, Lcom/discord/views/DigitVerificationView$g;->CY: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 e0c28db986..fcef7f66b9 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 CS:Lcom/discord/views/DigitVerificationView$a;
+.field public static final CT:Lcom/discord/views/DigitVerificationView$a;
 
 
 # instance fields
-.field private CQ:Lcom/discord/views/DigitVerificationView$d;
+.field private CR:Lcom/discord/views/DigitVerificationView$d;
 
-.field public CR:Ljava/util/List;
+.field public CS: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;->CS:Lcom/discord/views/DigitVerificationView$a;
+    sput-object v0, Lcom/discord/views/DigitVerificationView;->CT:Lcom/discord/views/DigitVerificationView$a;
 
     return-void
 .end method
@@ -138,7 +138,7 @@
 .method public static final synthetic b(Lcom/discord/views/DigitVerificationView;)Ljava/util/List;
     .locals 1
 
-    iget-object p0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object p0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez p0, :cond_0
 
@@ -153,7 +153,7 @@
 .method private final getVerificationCode()Ljava/lang/String;
     .locals 11
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -180,7 +180,7 @@
 
     const/4 v7, 0x0
 
-    sget-object v0, Lcom/discord/views/DigitVerificationView$g;->CX:Lcom/discord/views/DigitVerificationView$g;
+    sget-object v0, Lcom/discord/views/DigitVerificationView$g;->CY:Lcom/discord/views/DigitVerificationView$g;
 
     move-object v8, v0
 
@@ -202,7 +202,7 @@
 .method public final clear()V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     const-string v1, "digits"
 
@@ -237,7 +237,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v0, :cond_2
 
@@ -255,7 +255,7 @@
     return-void
 .end method
 
-.method public final eY()Landroid/view/ViewGroup;
+.method public final fa()Landroid/view/ViewGroup;
     .locals 12
 
     invoke-virtual {p0}, Lcom/discord/views/DigitVerificationView;->getInflater()Landroid/view/LayoutInflater;
@@ -268,7 +268,7 @@
 
     const/4 v2, 0x1
 
-    const v3, 0x7f0d0080
+    const v3, 0x7f0d0085
 
     invoke-virtual {v0, v3, v1, v2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
@@ -278,7 +278,7 @@
 
     new-array v3, v3, [Ljava/lang/Integer;
 
-    const v4, 0x7f0a07f4
+    const v4, 0x7f0a0823
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -288,7 +288,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f0a07f5
+    const v4, 0x7f0a0824
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -296,7 +296,7 @@
 
     aput-object v4, v3, v2
 
-    const v4, 0x7f0a07f6
+    const v4, 0x7f0a0825
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -306,7 +306,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a07f7
+    const v4, 0x7f0a0826
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -316,7 +316,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a07f8
+    const v4, 0x7f0a0827
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -326,7 +326,7 @@
 
     aput-object v4, v3, v6
 
-    const v4, 0x7f0a07f9
+    const v4, 0x7f0a0828
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -388,7 +388,7 @@
     :cond_0
     check-cast v4, Ljava/util/List;
 
-    iput-object v4, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iput-object v4, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     new-instance v0, Lcom/discord/views/DigitVerificationView$e;
 
@@ -396,7 +396,7 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     const-string v4, "digits"
 
@@ -443,7 +443,7 @@
 
     new-instance v9, Lcom/discord/views/DigitVerificationView$c;
 
-    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v10, :cond_3
 
@@ -458,7 +458,7 @@
 
     new-instance v9, Lcom/discord/views/DigitVerificationView$b;
 
-    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v10, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v10, :cond_4
 
@@ -471,7 +471,7 @@
 
     check-cast v10, Landroid/widget/EditText;
 
-    iget-object v11, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v11, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v11, :cond_5
 
@@ -497,7 +497,7 @@
     goto :goto_1
 
     :cond_6
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v0, :cond_7
 
@@ -518,7 +518,7 @@
 .method public final getOnCodeEntered()Lcom/discord/views/DigitVerificationView$d;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CQ:Lcom/discord/views/DigitVerificationView$d;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Lcom/discord/views/DigitVerificationView$d;
 
     return-object v0
 .end method
@@ -562,7 +562,7 @@
 .method public final setInputType(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -601,7 +601,7 @@
 .method public final setOnCodeEntered(Lcom/discord/views/DigitVerificationView$d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/DigitVerificationView;->CQ:Lcom/discord/views/DigitVerificationView$d;
+    iput-object p1, p0, Lcom/discord/views/DigitVerificationView;->CR:Lcom/discord/views/DigitVerificationView$d;
 
     return-void
 .end method
@@ -617,7 +617,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     const-string v2, "digits"
 
@@ -639,7 +639,7 @@
     :goto_0
     if-ge v1, v0, :cond_2
 
-    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v3, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v3, :cond_1
 
@@ -671,7 +671,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v0, :cond_3
 
@@ -682,7 +682,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object v1, p0, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez v1, :cond_4
 
diff --git a/com.discord/smali/com/discord/views/GuildView.smali b/com.discord/smali/com/discord/views/GuildView.smali
index 9111286d0d..b5bcb65e78 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 CY:I
+.field public CZ: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, 0x7f0a0379
+    const p3, 0x7f0a0381
 
     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, 0x7f0a0378
+    const p3, 0x7f0a0380
 
     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;->CY:I
+    iput p3, p0, Lcom/discord/views/GuildView;->CZ:I
 
     move-object v0, p0
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0088
+    const v1, 0x7f0d008e
 
     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;->CY:I
+    iput p2, p0, Lcom/discord/views/GuildView;->CZ: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 89eb02c230..6c04da86b7 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 Cq:Lkotlin/properties/ReadOnlyProperty;
+.field private final Cr:Lkotlin/properties/ReadOnlyProperty;
+
+.field private Da:F
 
 .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, 0x7f0a041b
+    const p3, 0x7f0a0423
 
     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;->Cq:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/LoadingButton;->Cr:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a041a
+    const p3, 0x7f0a0422
 
     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;->Da:F
+
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d008e
+    const v0, 0x7f0d0094
 
     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;->Da:F
+
+    invoke-virtual {p1, v1, p2}, Landroid/content/res/TypedArray;->getFloat(IF)F
+
+    move-result p2
+
+    iput p2, p0, Lcom/discord/views/LoadingButton;->Da:F
+
+    invoke-direct {p0}, Lcom/discord/views/LoadingButton;->fb()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 fb()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;->Da: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;->Cq:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/LoadingButton;->Cr: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;->fb()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 a1897dc143..e155183b80 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 DC:I
+.field final DE: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;->DC:I
+    iput p1, p0, Lcom/discord/views/OverlayMenuView$a;->DE: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;->DC:I
+    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->DE:I
 
-    iget v3, p1, Lcom/discord/views/OverlayMenuView$a;->DC:I
+    iget v3, p1, Lcom/discord/views/OverlayMenuView$a;->DE:I
 
     if-ne v1, v3, :cond_0
 
@@ -111,7 +111,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/views/OverlayMenuView$a;->DC:I
+    iget v0, p0, Lcom/discord/views/OverlayMenuView$a;->DE:I
 
     invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -162,7 +162,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->DC:I
+    iget v1, p0, Lcom/discord/views/OverlayMenuView$a;->DE: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 3ff769c9bb..8e4e28516d 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 DD:Lcom/discord/views/OverlayMenuView$b$1;
+.field public static final DF: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;->DD:Lcom/discord/views/OverlayMenuView$b$1;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$b$1;->DF: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 dbadda2942..8c04557d65 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 DE:Lcom/discord/views/OverlayMenuView$b$2;
+.field public static final DG: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;->DE:Lcom/discord/views/OverlayMenuView$b$2;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$b$2;->DG: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 a8e52f6a00..72f1352c5e 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, 0x7f1209e3
+    const v0, 0x7f120a18
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9a349a69c1..0a783db458 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, 0x7f120a55
+    const v1, 0x7f120a8a
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ddd53e0cad..c2a36dcdde 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;->DD:Lcom/discord/views/OverlayMenuView$b$1;
+    sget-object v0, Lcom/discord/views/OverlayMenuView$b$1;->DF: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;->DE:Lcom/discord/views/OverlayMenuView$b$2;
+    sget-object v0, Lcom/discord/views/OverlayMenuView$b$2;->DG: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 4f3a361ea1..d89bb49eeb 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 DF:Lcom/discord/views/OverlayMenuView$e;
+.field public static final DH: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;->DF:Lcom/discord/views/OverlayMenuView$e;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$e;->DH: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 f0fe0d3a0c..a586f6bcd7 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 DG:Lcom/discord/views/OverlayMenuView$f;
+.field public static final DI: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;->DG:Lcom/discord/views/OverlayMenuView$f;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$f;->DI: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 34e0570511..08fffc4dcf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fa5ef48448..6126f92473 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 DH:Lcom/discord/views/OverlayMenuView$h;
+.field public static final DJ: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;->DH:Lcom/discord/views/OverlayMenuView$h;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$h;->DJ: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 64d44a9eef..43cb4d3ba0 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;->DC:I
+    iget v1, p1, Lcom/discord/views/OverlayMenuView$a;->DE:I
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f0803cb
+    const v1, 0x7f0803d8
 
     :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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 23a01ae5d9..a7eb27c720 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 DI:Lcom/discord/views/OverlayMenuView$j;
+.field public static final DK: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;->DI:Lcom/discord/views/OverlayMenuView$j;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$j;->DK: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 f586cf61aa..8b82cc44b6 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 DJ:Lcom/discord/views/OverlayMenuView$k;
+.field public static final DL: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;->DJ:Lcom/discord/views/OverlayMenuView$k;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$k;->DL: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 ed62432f39..6545e289ad 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 DK:Lcom/discord/views/OverlayMenuView$m;
+.field public static final DN: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;->DK:Lcom/discord/views/OverlayMenuView$m;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$m;->DN: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 7a0fc74d1c..f8890d0e49 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$n.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$n.smali
@@ -104,7 +104,7 @@
     :goto_0
     invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setActivated(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a334ff8641..2f9695909b 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 DL:Lcom/discord/views/OverlayMenuView$o;
+.field public static final DO: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;->DL:Lcom/discord/views/OverlayMenuView$o;
+    sput-object v0, Lcom/discord/views/OverlayMenuView$o;->DO: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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 0d0f1f3e40..faa3017dde 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView.smali
@@ -21,7 +21,11 @@
 # instance fields
 .field private final DA:Lkotlin/properties/ReadOnlyProperty;
 
-.field private DB:Lkotlin/jvm/functions/Function0;
+.field private final DB:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final DC:Lkotlin/properties/ReadOnlyProperty;
+
+.field private DD:Lkotlin/jvm/functions/Function0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function0<",
@@ -31,10 +35,6 @@
     .end annotation
 .end field
 
-.field private final Ds:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final Dt:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Du:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final Dv:Lkotlin/properties/ReadOnlyProperty;
@@ -289,11 +289,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0092
+    const v1, 0x7f0d0098
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -305,23 +305,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->paused:Lrx/subjects/Subject;
 
-    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/OverlayMenuView;->Ds:Lkotlin/properties/ReadOnlyProperty;
-
-    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;->Dt:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04c9
+    const p1, 0x7f0a04db
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -329,7 +313,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Du:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04cc
+    const p1, 0x7f0a04d4
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -345,7 +329,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dw:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04d2
+    const p1, 0x7f0a04d6
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -353,7 +337,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0717
+    const p1, 0x7f0a04dd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -361,7 +345,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dy:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0484
+    const p1, 0x7f0a04dc
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -369,7 +353,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dz:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0282
+    const p1, 0x7f0a0732
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -377,11 +361,27 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DA:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DL:Lcom/discord/views/OverlayMenuView$o;
+    const p1, 0x7f0a048e
+
+    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;->DB:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0285
+
+    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;->DC:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DO:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DB:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -403,11 +403,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0092
+    const v0, 0x7f0d0098
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -419,23 +419,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->paused:Lrx/subjects/Subject;
 
-    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/OverlayMenuView;->Ds:Lkotlin/properties/ReadOnlyProperty;
-
-    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;->Dt:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04c9
+    const p1, 0x7f0a04db
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -443,7 +427,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Du:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04cc
+    const p1, 0x7f0a04d4
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -459,7 +443,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dw:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04d2
+    const p1, 0x7f0a04d6
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -467,7 +451,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0717
+    const p1, 0x7f0a04dd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -475,7 +459,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dy:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0484
+    const p1, 0x7f0a04dc
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -483,7 +467,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dz:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0282
+    const p1, 0x7f0a0732
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -491,11 +475,27 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DA:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DL:Lcom/discord/views/OverlayMenuView$o;
+    const p1, 0x7f0a048e
+
+    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;->DB:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0285
+
+    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;->DC:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DO:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DB:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD:Lkotlin/jvm/functions/Function0;
 
     return-void
 .end method
@@ -517,11 +517,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0092
+    const p3, 0x7f0d0098
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object p1
 
@@ -533,23 +533,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->paused:Lrx/subjects/Subject;
 
-    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/OverlayMenuView;->Ds:Lkotlin/properties/ReadOnlyProperty;
-
-    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;->Dt:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04c9
+    const p1, 0x7f0a04db
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -557,7 +541,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Du:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04cc
+    const p1, 0x7f0a04d4
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -573,7 +557,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dw:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a04d2
+    const p1, 0x7f0a04d6
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -581,7 +565,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0717
+    const p1, 0x7f0a04dd
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -589,7 +573,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dy:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0484
+    const p1, 0x7f0a04dc
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -597,7 +581,7 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->Dz:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0282
+    const p1, 0x7f0a0732
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -605,11 +589,27 @@
 
     iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DA:Lkotlin/properties/ReadOnlyProperty;
 
-    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DL:Lcom/discord/views/OverlayMenuView$o;
+    const p1, 0x7f0a048e
+
+    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;->DB:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0285
+
+    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;->DC:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object p1, Lcom/discord/views/OverlayMenuView$o;->DO:Lcom/discord/views/OverlayMenuView$o;
 
     check-cast p1, Lkotlin/jvm/functions/Function0;
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DB:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD: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;->Du:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Dw: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;->DA:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DC: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;->Dt:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Dv: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;->Dv:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Dx: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;->Dz:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DB: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;->Ds:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Du: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;->Dx:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Dz: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;->Dy:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DA: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;->Dw:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->Dy: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;->DB:Lkotlin/jvm/functions/Function0;
+    iget-object v0, p0, Lcom/discord/views/OverlayMenuView;->DD: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;->DH:Lcom/discord/views/OverlayMenuView$h;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$h;->DJ:Lcom/discord/views/OverlayMenuView$h;
 
     check-cast v4, Lrx/functions/b;
 
@@ -932,7 +932,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -980,7 +980,7 @@
 
     move-result-object v0
 
-    sget-object v5, Lcom/discord/views/OverlayMenuView$j;->DI:Lcom/discord/views/OverlayMenuView$j;
+    sget-object v5, Lcom/discord/views/OverlayMenuView$j;->DK:Lcom/discord/views/OverlayMenuView$j;
 
     check-cast v5, Landroid/view/View$OnClickListener;
 
@@ -990,7 +990,7 @@
 
     move-result-object v0
 
-    sget-object v5, Lcom/discord/views/OverlayMenuView$k;->DJ:Lcom/discord/views/OverlayMenuView$k;
+    sget-object v5, Lcom/discord/views/OverlayMenuView$k;->DL:Lcom/discord/views/OverlayMenuView$k;
 
     check-cast v5, Landroid/view/View$OnClickListener;
 
@@ -1028,7 +1028,7 @@
 
     move-result-object v5
 
-    sget-object v6, Lcom/discord/views/OverlayMenuView$m;->DK:Lcom/discord/views/OverlayMenuView$m;
+    sget-object v6, Lcom/discord/views/OverlayMenuView$m;->DN:Lcom/discord/views/OverlayMenuView$m;
 
     check-cast v6, Lrx/functions/Func2;
 
@@ -1036,7 +1036,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v5
 
@@ -1119,7 +1119,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/views/OverlayMenuView$e;->DF:Lcom/discord/views/OverlayMenuView$e;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$e;->DH:Lcom/discord/views/OverlayMenuView$e;
 
     check-cast v4, Lrx/functions/b;
 
@@ -1127,7 +1127,7 @@
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/views/OverlayMenuView$f;->DG:Lcom/discord/views/OverlayMenuView$f;
+    sget-object v4, Lcom/discord/views/OverlayMenuView$f;->DI:Lcom/discord/views/OverlayMenuView$f;
 
     check-cast v4, Lrx/functions/b;
 
@@ -1143,7 +1143,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -1221,7 +1221,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DB:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->DD: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 d6e490715f..0fe21602ca 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 DV:Ljava/util/List;
+.field private DX: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;->DV:Ljava/util/List;
+    iput-object v0, p0, Lcom/discord/views/RadioManager;->DX:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -82,7 +82,7 @@
 
     :cond_1
     :goto_1
-    iget-object v4, p0, Lcom/discord/views/RadioManager;->DV:Ljava/util/List;
+    iget-object v4, p0, Lcom/discord/views/RadioManager;->DX: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;->DV:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DX: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;->DV:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DX: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 fe()I
+.method public final fh()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;->DV:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DX: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;->DV:Ljava/util/List;
+    iget-object v2, p0, Lcom/discord/views/RadioManager;->DX: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 ff()Landroid/widget/Checkable;
+.method public final fi()Landroid/widget/Checkable;
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/views/RadioManager;->DV:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/RadioManager;->DX:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->fe()I
+    invoke-virtual {p0}, Lcom/discord/views/RadioManager;->fh()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 366bedf93f..31a8e86e78 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 Ef:Lcom/discord/views/ServerFolderView;
+.field final synthetic Eh:Lcom/discord/views/ServerFolderView;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/ServerFolderView$a;->Ef:Lcom/discord/views/ServerFolderView;
+    iput-object p1, p0, Lcom/discord/views/ServerFolderView$a;->Eh: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;->Ef:Lcom/discord/views/ServerFolderView;
+    iget-object p1, p0, Lcom/discord/views/ServerFolderView$a;->Eh: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 350fd59254..300f55cbdf 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 Eb:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final Ec:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Ed:Lkotlin/properties/ReadOnlyProperty;
 
-.field private Ee:Landroid/view/animation/Animation;
+.field private final Ee:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Ef:Lkotlin/properties/ReadOnlyProperty;
+
+.field private Eg: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, 0x7f0a02ed
+    const p2, 0x7f0a02f1
 
     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;->Eb:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->Ed:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a037a
+    const p2, 0x7f0a0382
 
     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;->Ec:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->Ee:Lkotlin/properties/ReadOnlyProperty;
 
     const/4 p2, 0x4
 
@@ -181,7 +181,7 @@
 
     invoke-static {p2, p3}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p3, Lkotterknife/b$d;->bmS:Lkotterknife/b$d;
+    sget-object p3, Lkotterknife/b$d;->bnc: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;->Ed:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p2, p0, Lcom/discord/views/ServerFolderView;->Ef:Lkotlin/properties/ReadOnlyProperty;
 
     move-object p2, p0
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d009a
+    const p3, 0x7f0d00a0
 
     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
-        0x7f0a0374
-        0x7f0a0375
-        0x7f0a0376
-        0x7f0a0377
+        0x7f0a037c
+        0x7f0a037d
+        0x7f0a037e
+        0x7f0a037f
     .end array-data
 .end method
 
@@ -243,9 +243,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/discord/views/ServerFolderView;->Ee:Landroid/view/animation/Animation;
+    iput-object v0, p0, Lcom/discord/views/ServerFolderView;->Eg:Landroid/view/animation/Animation;
 
-    invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->fg()V
+    invoke-virtual {p0}, Lcom/discord/views/ServerFolderView;->fj()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;->Ec:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->Ee: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;->Ee:Landroid/view/animation/Animation;
+    iput-object p1, p0, Lcom/discord/views/ServerFolderView;->Eg: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 fg()V
+.method public final fj()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;->Eb:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->Ed: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;->Ed:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ServerFolderView;->Ef: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 cdab9badda..af8658e899 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 Eq:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Es: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Es: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$c;->Es:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fk()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fn()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 9ae1dcfa83..a459b27b66 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 Eq:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Es: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Es: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$d;->Es:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fk()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fn()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 46406d6ba0..83a7036578 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 Eq:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Es: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Es: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$e;->Es:Lcom/discord/views/TernaryCheckBox;
 
-    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fk()Lcom/discord/views/TernaryCheckBox$a;
+    invoke-static {}, Lcom/discord/views/TernaryCheckBox;->fn()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 46fde589ab..f7d2613a1d 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 Eq:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Es:Lcom/discord/views/TernaryCheckBox;
 
-.field final synthetic Er:Ljava/lang/String;
+.field final synthetic Et: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Es:Lcom/discord/views/TernaryCheckBox;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$f;->Er:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$f;->Et: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$f;->Es: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;->Er:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$f;->Et: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 104e894a72..843ed45db2 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 Eq:Lcom/discord/views/TernaryCheckBox;
+.field final synthetic Es:Lcom/discord/views/TernaryCheckBox;
 
-.field final synthetic Er:Ljava/lang/String;
+.field final synthetic Et: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Es:Lcom/discord/views/TernaryCheckBox;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$g;->Er:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox$g;->Et: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;->Eq:Lcom/discord/views/TernaryCheckBox;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox$g;->Es: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;->Er:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox$g;->Et: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 d392682d9e..be24926af8 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 Ep:Lcom/discord/views/TernaryCheckBox$a;
+.field public static final Er:Lcom/discord/views/TernaryCheckBox$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private Cy:Landroid/widget/TextView;
-
-.field private Eg:Lcom/discord/views/CheckableImageView;
-
-.field private Eh:Lcom/discord/views/CheckableImageView;
+.field private Cz:Landroid/widget/TextView;
 
 .field private Ei:Lcom/discord/views/CheckableImageView;
 
-.field private Ej:Landroid/view/View;
+.field private Ej:Lcom/discord/views/CheckableImageView;
 
-.field private Ek:Landroid/view/View;
+.field private Ek:Lcom/discord/views/CheckableImageView;
 
-.field private El:Ljava/lang/String;
+.field private El:Landroid/view/View;
 
-.field private Em:Ljava/lang/String;
+.field private Em:Landroid/view/View;
 
-.field private En:Lcom/discord/views/TernaryCheckBox$b;
+.field private En:Ljava/lang/String;
 
-.field public Eo:I
+.field private Eo:Ljava/lang/String;
+
+.field private Ep:Lcom/discord/views/TernaryCheckBox$b;
+
+.field public Eq: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;->Ep:Lcom/discord/views/TernaryCheckBox$a;
+    sput-object v0, Lcom/discord/views/TernaryCheckBox;->Er:Lcom/discord/views/TernaryCheckBox$a;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
     const/4 v0, 0x0
 
@@ -89,7 +89,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iput v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
     invoke-direct {p0, p1, p2}, Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -107,7 +107,7 @@
 
     const/4 p3, -0x1
 
-    iput p3, p0, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iput p3, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
     invoke-direct {p0, p1, p2}, Lcom/discord/views/TernaryCheckBox;->b(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -144,7 +144,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->El:Ljava/lang/String;
+    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->En:Ljava/lang/String;
 
     const/4 v1, 0x1
 
@@ -152,7 +152,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Em:Ljava/lang/String;
+    iput-object v1, p0, Lcom/discord/views/TernaryCheckBox;->Eo:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -169,7 +169,7 @@
 
     :cond_0
     :goto_0
-    const p2, 0x7f0d00aa
+    const p2, 0x7f0d00b0
 
     move-object v1, p0
 
@@ -179,7 +179,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0a0659
+    const p2, 0x7f0a066e
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -191,9 +191,9 @@
 
     check-cast p2, Landroid/widget/TextView;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cy:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cz:Landroid/widget/TextView;
 
-    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cy:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cz:Landroid/widget/TextView;
 
     const-string v1, "label"
 
@@ -202,7 +202,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->El:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->En:Ljava/lang/String;
 
     const/16 v3, 0x8
 
@@ -218,20 +218,20 @@
     :goto_1
     invoke-virtual {p2, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cy:Landroid/widget/TextView;
+    iget-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Cz:Landroid/widget/TextView;
 
     if-nez p2, :cond_3
 
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_3
-    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->El:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/views/TernaryCheckBox;->En:Ljava/lang/String;
 
     check-cast v1, Ljava/lang/CharSequence;
 
     invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a065a
+    const p2, 0x7f0a066f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -254,7 +254,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_4
-    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->Em:Ljava/lang/String;
+    iget-object v2, p0, Lcom/discord/views/TernaryCheckBox;->Eo:Ljava/lang/String;
 
     if-eqz v2, :cond_5
 
@@ -273,13 +273,13 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_6
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Em:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo:Ljava/lang/String;
 
     check-cast v0, Ljava/lang/CharSequence;
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0a0658
+    const p2, 0x7f0a066d
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -289,9 +289,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->El:Landroid/view/View;
 
-    const p2, 0x7f0a04c5
+    const p2, 0x7f0a04cf
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -301,9 +301,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Em:Landroid/view/View;
 
-    const p2, 0x7f0a0749
+    const p2, 0x7f0a076d
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -315,9 +315,9 @@
 
     check-cast p2, Lcom/discord/views/CheckableImageView;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Eg:Lcom/discord/views/CheckableImageView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Ei:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a0748
+    const p2, 0x7f0a076c
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -329,9 +329,9 @@
 
     check-cast p2, Lcom/discord/views/CheckableImageView;
 
-    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Eh:Lcom/discord/views/CheckableImageView;
+    iput-object p2, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
 
-    const p2, 0x7f0a0747
+    const p2, 0x7f0a076b
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -343,9 +343,9 @@
 
     check-cast p1, Lcom/discord/views/CheckableImageView;
 
-    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ei:Lcom/discord/views/CheckableImageView;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Lcom/discord/views/CheckableImageView;
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Eg:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ei:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_7
 
@@ -362,7 +362,7 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckableImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Eh:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_8
 
@@ -379,7 +379,7 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckableImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ei:Lcom/discord/views/CheckableImageView;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Lcom/discord/views/CheckableImageView;
 
     if-nez p1, :cond_9
 
@@ -399,10 +399,10 @@
     return-void
 .end method
 
-.method public static final synthetic fk()Lcom/discord/views/TernaryCheckBox$a;
+.method public static final synthetic fn()Lcom/discord/views/TernaryCheckBox$a;
     .locals 1
 
-    sget-object v0, Lcom/discord/views/TernaryCheckBox;->Ep:Lcom/discord/views/TernaryCheckBox$a;
+    sget-object v0, Lcom/discord/views/TernaryCheckBox;->Er:Lcom/discord/views/TernaryCheckBox$a;
 
     return-object v0
 .end method
@@ -410,7 +410,7 @@
 .method private final setDisabled(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eh:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
@@ -423,7 +423,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setEnabled(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Em:Landroid/view/View;
 
     if-nez v0, :cond_1
 
@@ -436,7 +436,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El:Landroid/view/View;
 
     const-string v1, "allDisabledOverlay"
 
@@ -453,7 +453,7 @@
 
     invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->El:Landroid/view/View;
 
     if-nez p1, :cond_3
 
@@ -470,7 +470,7 @@
 .method private final setOffDisabled(Ljava/lang/String;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eh:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
@@ -483,7 +483,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setEnabled(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El:Landroid/view/View;
 
     if-nez v0, :cond_1
 
@@ -496,7 +496,7 @@
 
     invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Em:Landroid/view/View;
 
     const-string v2, "offDisabledOverlay"
 
@@ -513,7 +513,7 @@
 
     invoke-virtual {v0, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Landroid/view/View;
+    iget-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Em:Landroid/view/View;
 
     if-nez p1, :cond_3
 
@@ -527,10 +527,10 @@
 
 
 # virtual methods
-.method public final fh()Z
+.method public final fk()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
     const/4 v1, 0x1
 
@@ -544,10 +544,10 @@
     return v0
 .end method
 
-.method public final fi()Z
+.method public final fl()Z
     .locals 2
 
-    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
     const/4 v1, -0x1
 
@@ -563,10 +563,10 @@
     return v0
 .end method
 
-.method public final fj()V
+.method public final fm()V
     .locals 3
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eh:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
@@ -579,7 +579,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/views/CheckableImageView;->setEnabled(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Em:Landroid/view/View;
 
     if-nez v0, :cond_1
 
@@ -592,7 +592,7 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->El:Landroid/view/View;
 
     if-nez v0, :cond_2
 
@@ -609,7 +609,7 @@
 .method public final getOnSwitchStatusChangedListener()Lcom/discord/views/TernaryCheckBox$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->En:Lcom/discord/views/TernaryCheckBox$b;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ep: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;->Eo:I
+    iget v0, p0, Lcom/discord/views/TernaryCheckBox;->Eq: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;->En:Lcom/discord/views/TernaryCheckBox$b;
+    iput-object p1, p0, Lcom/discord/views/TernaryCheckBox;->Ep:Lcom/discord/views/TernaryCheckBox$b;
 
     return-void
 .end method
@@ -673,9 +673,9 @@
 .method public final setSwitchStatus(I)V
     .locals 4
 
-    iput p1, p0, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iput p1, p0, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eg:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ei:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_0
 
@@ -700,7 +700,7 @@
     :goto_0
     invoke-virtual {v0, v3}, Lcom/discord/views/CheckableImageView;->setChecked(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Eh:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ej:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_2
 
@@ -723,7 +723,7 @@
     :goto_1
     invoke-virtual {v0, v3}, Lcom/discord/views/CheckableImageView;->setChecked(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ei:Lcom/discord/views/CheckableImageView;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ek:Lcom/discord/views/CheckableImageView;
 
     if-nez v0, :cond_4
 
@@ -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;->En:Lcom/discord/views/TernaryCheckBox$b;
+    iget-object v0, p0, Lcom/discord/views/TernaryCheckBox;->Ep: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 4f40a7c6ef..e190abdaa4 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 Es:Lkotlin/properties/ReadOnlyProperty;
+.field private final Eu:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Et:Lkotlin/properties/ReadOnlyProperty;
+.field private final Ev: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, 0x7f0a075f
+    const p1, 0x7f0a0783
 
     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, 0x7f0a0760
+    const p1, 0x7f0a0784
 
     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;->Es:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Eu:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a075e
+    const p1, 0x7f0a0782
 
     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;->Et:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->Ev: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;->Es:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Eu:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/ToolbarTitleLayout;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -174,7 +174,7 @@
 
 
 # virtual methods
-.method public final eY()Landroid/view/ViewGroup;
+.method public final fa()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, 0x7f0d00ab
+    const v2, 0x7f0d00b1
 
     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;->Et:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/ToolbarTitleLayout;->Ev: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 230517263b..f6eddcfca9 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 Ex:Lcom/discord/views/UploadProgressView$a;
+.field public static final Ez:Lcom/discord/views/UploadProgressView$a;
 
 
 # instance fields
-.field private final Eu:Landroid/widget/TextView;
+.field private final Ew:Landroid/widget/TextView;
 
-.field private final Ev:Landroid/graphics/drawable/Drawable;
+.field private final Ex:Landroid/graphics/drawable/Drawable;
 
-.field private final Ew:Landroid/graphics/drawable/Drawable;
+.field private final Ey: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;->Ex:Lcom/discord/views/UploadProgressView$a;
+    sput-object v0, Lcom/discord/views/UploadProgressView;->Ez:Lcom/discord/views/UploadProgressView$a;
 
     return-void
 .end method
@@ -57,11 +57,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d00ac
+    const v1, 0x7f0d00b2
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0555
+    const p1, 0x7f0a0560
 
     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;->Eu:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0554
+    const p1, 0x7f0a055f
 
     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, 0x7f0a054e
+    const p1, 0x7f0a0559
 
     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, 0x7f0a0552
+    const p1, 0x7f0a055d
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -121,7 +121,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0402ca
+    const v0, 0x7f0402cb
 
     const/4 v1, 0x0
 
@@ -137,19 +137,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const v0, 0x7f080143
+    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;->Ev:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ex:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -167,11 +167,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00ac
+    const v0, 0x7f0d00b2
 
     invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0555
+    const p1, 0x7f0a0560
 
     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;->Eu:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0554
+    const p1, 0x7f0a055f
 
     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, 0x7f0a054e
+    const p1, 0x7f0a0559
 
     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, 0x7f0a0552
+    const p1, 0x7f0a055d
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -231,7 +231,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0402ca
+    const p2, 0x7f0402cb
 
     const/4 v0, 0x0
 
@@ -247,19 +247,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const p2, 0x7f080143
+    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;->Ev:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ex:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -281,11 +281,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d00ac
+    const p3, 0x7f0d00b2
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0555
+    const p1, 0x7f0a0560
 
     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;->Eu:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0554
+    const p1, 0x7f0a055f
 
     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, 0x7f0a054e
+    const p1, 0x7f0a0559
 
     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, 0x7f0a0552
+    const p1, 0x7f0a055d
 
     invoke-virtual {p0, p1}, Lcom/discord/views/UploadProgressView;->findViewById(I)Landroid/view/View;
 
@@ -345,7 +345,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f0402ca
+    const p2, 0x7f0402cb
 
     const/4 p3, 0x0
 
@@ -361,19 +361,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ey:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0}, Lcom/discord/views/UploadProgressView;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const p2, 0x7f080143
+    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;->Ev:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/discord/views/UploadProgressView;->Ex:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -434,7 +434,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/UploadProgressView;->Eu:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/UploadProgressView;->Ew: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;->Ev:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Ex:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Ew:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/discord/views/UploadProgressView;->Ey: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 4bf0742270..e134786dd4 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 EA:Landroid/view/View;
+.field public final EA:Landroid/widget/TextView;
 
-.field public final Ey:Landroid/widget/TextView;
+.field public final EB:Landroid/widget/ImageView;
 
-.field public final Ez:Landroid/widget/ImageView;
+.field public final EC:Landroid/view/View;
 
 .field public final userAvatar:Landroid/widget/ImageView;
 
@@ -77,13 +77,13 @@
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00ae
+    const v0, 0x7f0d00b4
 
     invoke-virtual {p1, v0, p3, p2}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
 
     move-result-object p1
 
-    const p2, 0x7f0a0795
+    const p2, 0x7f0a07b9
 
     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, 0x7f0a0796
+    const p2, 0x7f0a07ba
 
     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, 0x7f0a0797
+    const p2, 0x7f0a07bb
 
     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;->Ey:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/discord/views/UserListItemView;->EA:Landroid/widget/TextView;
 
-    const p2, 0x7f0a0799
+    const p2, 0x7f0a07bd
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -135,9 +135,9 @@
 
     invoke-static {p2, p3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p0, Lcom/discord/views/UserListItemView;->EA:Landroid/view/View;
+    iput-object p2, p0, Lcom/discord/views/UserListItemView;->EC:Landroid/view/View;
 
-    const p2, 0x7f0a0798
+    const p2, 0x7f0a07bc
 
     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;->Ez:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/discord/views/UserListItemView;->EB: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 3fe26e7e24..3d7ebcb421 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 EE:Lcom/discord/views/VoiceUserView$a;
-
-.field public static final enum EF:Lcom/discord/views/VoiceUserView$a;
-
 .field public static final enum EG:Lcom/discord/views/VoiceUserView$a;
 
 .field public static final enum EH:Lcom/discord/views/VoiceUserView$a;
 
 .field public static final enum EI:Lcom/discord/views/VoiceUserView$a;
 
-.field private static final synthetic EJ:[Lcom/discord/views/VoiceUserView$a;
+.field public static final enum EJ:Lcom/discord/views/VoiceUserView$a;
+
+.field public static final enum EK:Lcom/discord/views/VoiceUserView$a;
+
+.field private static final synthetic EL:[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;->EE:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EG: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;->EF:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EH: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;->EG:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EI: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;->EH:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EJ: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;->EI:Lcom/discord/views/VoiceUserView$a;
+    sput-object v1, Lcom/discord/views/VoiceUserView$a;->EK:Lcom/discord/views/VoiceUserView$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/discord/views/VoiceUserView$a;->EJ:[Lcom/discord/views/VoiceUserView$a;
+    sput-object v0, Lcom/discord/views/VoiceUserView$a;->EL:[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;->EJ:[Lcom/discord/views/VoiceUserView$a;
+    sget-object v0, Lcom/discord/views/VoiceUserView$a;->EL:[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 07d9d664d2..6ccb901973 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;->EH:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EJ: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 cde5904275..71cf8bfeaa 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 28d3faef69..2b84c2a8e2 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 EB:Lcom/discord/views/VoiceUserView$a;
+.field private ED:Lcom/discord/views/VoiceUserView$a;
 
-.field private final EC:Lcom/discord/utilities/anim/RingAnimator;
+.field private final EE:Lcom/discord/utilities/anim/RingAnimator;
 
-.field private ED:Lcom/discord/models/domain/ModelVoice$User;
+.field private EF: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, 0x7f0a0824
+    const p3, 0x7f0a0853
 
     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, 0x7f0a082a
+    const p3, 0x7f0a085a
 
     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;->EC:Lcom/discord/utilities/anim/RingAnimator;
+    iput-object p3, p0, Lcom/discord/views/VoiceUserView;->EE:Lcom/discord/utilities/anim/RingAnimator;
 
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b1
+    const v0, 0x7f0d00b7
 
     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;->EB:Lcom/discord/views/VoiceUserView$a;
+    iget-object p0, p0, Lcom/discord/views/VoiceUserView;->ED:Lcom/discord/views/VoiceUserView$a;
 
     return-object p0
 .end method
@@ -292,7 +292,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EF:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EH: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;->EH:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EJ: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;->EI:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EK: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;->EG:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EI:Lcom/discord/views/VoiceUserView$a;
 
     goto :goto_1
 
     :cond_4
-    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EE:Lcom/discord/views/VoiceUserView$a;
+    sget-object p1, Lcom/discord/views/VoiceUserView$a;->EG: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;->EB:Lcom/discord/views/VoiceUserView$a;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->ED:Lcom/discord/views/VoiceUserView$a;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->EB:Lcom/discord/views/VoiceUserView$a;
+    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->ED: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, 0x7f08018b
+    const v0, 0x7f080196
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f08018c
+    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;->EC:Lcom/discord/utilities/anim/RingAnimator;
+    iget-object p1, p0, Lcom/discord/views/VoiceUserView;->EE: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->ED:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/VoiceUserView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -446,7 +446,7 @@
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->ED:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/VoiceUserView;->EF:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-direct {p0}, Lcom/discord/views/VoiceUserView;->getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;
 
diff --git a/com.discord/smali/com/discord/views/a.smali b/com.discord/smali/com/discord/views/a.smali
index 1a668a8d5f..850e5b7a7a 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;->eX()[I
+    invoke-static {}, Lcom/discord/views/CheckedSetting$b;->eZ()[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;->CB:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->CC: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;->CC:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->CD: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;->CD:I
+    sget v1, Lcom/discord/views/CheckedSetting$b;->CE: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 b5afb1707d..7b7488e0ce 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 Db:Lcom/discord/views/b$a;
+.field final synthetic Dd: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;->Db:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$1;->Dd: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;->Db:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$1;->Dd: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 c337614cc9..6af8d63ce9 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 Db:Lcom/discord/views/b$a;
+.field final synthetic Dd: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;->Db:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$2;->Dd: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;->Db:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$2;->Dd: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 0598a8b422..8230f30d0c 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 Db:Lcom/discord/views/b$a;
+.field final synthetic Dd: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;->Db:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$3;->Dd: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;->Db:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$3;->Dd: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 a2bb67c5bc..e39e9b06c9 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 Db:Lcom/discord/views/b$a;
+.field final synthetic Dd: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;->Db:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$4;->Dd: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;->Db:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$4;->Dd: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 51c1c555bd..1b2625af5f 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 Db:Lcom/discord/views/b$a;
+.field final synthetic Dd: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;->Db:Lcom/discord/views/b$a;
+    iput-object p1, p0, Lcom/discord/views/b$a$5;->Dd: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;->Db:Lcom/discord/views/b$a;
+    iget-object v0, p0, Lcom/discord/views/b$a$5;->Dd: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 573e19edb0..d40ac92819 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 Da:Lcom/discord/views/b;
+.field private final Dc: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;->Da:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->Dc:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->Da:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->Dc: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;->Da:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->Dc:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->Da:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->Dc: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;->Da:Lcom/discord/views/b;
+    iput-object p1, p0, Lcom/discord/views/b$a;->Dc:Lcom/discord/views/b;
 
-    iget-object p1, p0, Lcom/discord/views/b$a;->Da:Lcom/discord/views/b;
+    iget-object p1, p0, Lcom/discord/views/b$a;->Dc: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;->Da:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->Dc: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;->CZ:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Db: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;->Da:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->Dc: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;->CZ:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Db: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;->Da:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->Dc: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;->CZ:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Db: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;->Da:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->Dc: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;->CZ:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Db: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;->Da:Lcom/discord/views/b;
+    iget-object v0, p0, Lcom/discord/views/b$a;->Dc: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;->CZ:Landroid/view/ViewGroup;
+    iget-object v0, v0, Lcom/discord/views/b;->Db: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 fb7e32a6d8..df5fffe23a 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 eY()Landroid/view/ViewGroup;
+.method public abstract fa()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 91c6eff6db..79d4fb52f8 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 CZ:Landroid/view/ViewGroup;
+.field Db: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;->eY()Landroid/view/ViewGroup;
+    invoke-interface {p1}, Lcom/discord/views/b$b;->fa()Landroid/view/ViewGroup;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/discord/views/b;->CZ:Landroid/view/ViewGroup;
+    iput-object p1, p0, Lcom/discord/views/b;->Db: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 10c4ed8002..ad34f5fab1 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 Dd:Landroid/widget/TextView;
+.field private final Df:Landroid/widget/TextView;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iput-object p1, p0, Lcom/discord/views/c$a;->Dd:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/c$a;->Df:Landroid/widget/TextView;
 
     return-void
 .end method
@@ -54,9 +54,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/views/c;->Dc:Lcom/discord/views/c;
+    sget-object v0, Lcom/discord/views/c;->De:Lcom/discord/views/c;
 
-    iget-object v0, p0, Lcom/discord/views/c$a;->Dd:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/c$a;->Df: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 e1b30826b4..57ac0f64bc 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;->eZ()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    value = Lcom/discord/views/c;->fc()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final De:Lcom/discord/views/c$b;
+.field public static final Dg: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;->De:Lcom/discord/views/c$b;
+    sput-object v0, Lcom/discord/views/c$b;->Dg:Lcom/discord/views/c$b;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d004a
+    const v0, 0x7f0d004c
 
     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 401a6643e5..19e6103dc3 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 Df:Lcom/discord/views/c$c;
+.field public static final Dh: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;->Df:Lcom/discord/views/c$c;
+    sput-object v0, Lcom/discord/views/c$c;->Dh: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 3db9ddcd47..57c40365eb 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 Dg:Lcom/discord/views/c$d;
+.field public static final Di: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;->Dg:Lcom/discord/views/c$d;
+    sput-object v0, Lcom/discord/views/c$d;->Di: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 6f3f67a2a9..1faaa1e5ad 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 Dc:Lcom/discord/views/c;
+.field public static final De: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;->Dc:Lcom/discord/views/c;
+    sput-object v0, Lcom/discord/views/c;->De:Lcom/discord/views/c;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f9d
+    const p0, 0x7f121024
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -89,7 +89,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f9f
+    const p0, 0x7f121026
 
     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;->Df:Lcom/discord/views/c$c;
+    sget-object p0, Lcom/discord/views/c$c;->Dh:Lcom/discord/views/c$c;
 
     move-object v8, p0
 
@@ -163,7 +163,7 @@
     if-nez v2, :cond_4
 
     :cond_1
-    const p0, 0x7f120fac
+    const p0, 0x7f121033
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -180,7 +180,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fbd
+    const p0, 0x7f121044
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -197,7 +197,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fa3
+    const p0, 0x7f12102a
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -214,7 +214,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fb0
+    const p0, 0x7f121037
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -250,7 +250,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fbe
+    const p0, 0x7f121045
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -267,7 +267,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fa5
+    const p0, 0x7f12102c
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -303,7 +303,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f99
+    const p0, 0x7f121020
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -320,7 +320,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fb8
+    const p0, 0x7f12103f
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -337,7 +337,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fc0
+    const p0, 0x7f121047
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -354,7 +354,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fa1
+    const p0, 0x7f121028
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -411,7 +411,7 @@
 
     const/4 v7, 0x0
 
-    sget-object p0, Lcom/discord/views/c$d;->Dg:Lcom/discord/views/c$d;
+    sget-object p0, Lcom/discord/views/c$d;->Di:Lcom/discord/views/c$d;
 
     move-object v8, p0
 
@@ -428,7 +428,7 @@
     if-nez v2, :cond_4
 
     :cond_3
-    const p0, 0x7f120fb2
+    const p0, 0x7f121039
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -445,7 +445,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fb4
+    const p0, 0x7f12103b
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -462,7 +462,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120f9b
+    const p0, 0x7f121022
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -479,7 +479,7 @@
 
     if-eqz p0, :cond_4
 
-    const p0, 0x7f120fba
+    const p0, 0x7f121041
 
     invoke-virtual {p1, p0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -542,7 +542,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f9c
+    const v0, 0x7f121023
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -559,7 +559,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f9e
+    const v0, 0x7f121025
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -576,7 +576,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fab
+    const v0, 0x7f121032
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -593,7 +593,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fbc
+    const v0, 0x7f121043
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -610,7 +610,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fa2
+    const v0, 0x7f121029
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -627,7 +627,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120faf
+    const v0, 0x7f121036
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -644,7 +644,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fad
+    const v0, 0x7f121034
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -661,7 +661,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fbb
+    const v0, 0x7f121042
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -678,7 +678,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fa4
+    const v0, 0x7f12102b
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -695,7 +695,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fb6
+    const v0, 0x7f12103d
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -712,7 +712,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f98
+    const v0, 0x7f12101f
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -729,7 +729,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fb7
+    const v0, 0x7f12103e
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -746,7 +746,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fbf
+    const v0, 0x7f121046
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -763,7 +763,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fa0
+    const v0, 0x7f121027
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -780,7 +780,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fb1
+    const v0, 0x7f121038    # 1.941515E38f
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -797,7 +797,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fb3
+    const v0, 0x7f12103a
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -814,7 +814,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f9a
+    const v0, 0x7f121021
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -831,7 +831,7 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120fb9
+    const v0, 0x7f121040
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -886,7 +886,7 @@
     .end sparse-switch
 .end method
 
-.method public static eZ()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+.method public static fc()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -900,7 +900,7 @@
 
     new-instance v0, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    sget-object v1, Lcom/discord/views/c$b;->De:Lcom/discord/views/c$b;
+    sget-object v1, Lcom/discord/views/c$b;->Dg: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 0cc7326c05..ea640a1bb5 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 Di:Lcom/discord/views/e;
+.field final synthetic Dk: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;->Di:Lcom/discord/views/e;
+    iput-object p1, p0, Lcom/discord/views/e$1;->Dk: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;->Di:Lcom/discord/views/e;
+    iget-object p1, p0, Lcom/discord/views/e$1;->Dk:Lcom/discord/views/e;
 
-    invoke-virtual {p1}, Lcom/discord/views/e;->fa()V
+    invoke-virtual {p1}, Lcom/discord/views/e;->fd()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 1d297387d7..e24776f0f1 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;->fa()V
+    value = Lcom/discord/views/e;->fd()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Di:Lcom/discord/views/e;
+.field final synthetic Dk: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;->Di:Lcom/discord/views/e;
+    iput-object p1, p0, Lcom/discord/views/e$a;->Dk:Lcom/discord/views/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,13 +51,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/views/e$a;->Di:Lcom/discord/views/e;
+    iget-object p1, p0, Lcom/discord/views/e$a;->Dk: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;->Di:Lcom/discord/views/e;
+    iget-object v0, p0, Lcom/discord/views/e$a;->Dk: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 ed4e934554..7d1893f19c 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;->fa()V
+    value = Lcom/discord/views/e;->fd()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Dj:Landroid/animation/Animator;
+.field final synthetic Dl:Landroid/animation/Animator;
 
 
 # direct methods
 .method constructor <init>(Landroid/animation/Animator;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/e$b;->Dj:Landroid/animation/Animator;
+    iput-object p1, p0, Lcom/discord/views/e$b;->Dl: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;->Dj:Landroid/animation/Animator;
+    iget-object p1, p0, Lcom/discord/views/e$b;->Dl: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 2be87bd34e..006d5a6e88 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 Dk:Lcom/discord/views/e$c;
+.field public static final Dm: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;->Dk:Lcom/discord/views/e$c;
+    sput-object v0, Lcom/discord/views/e$c;->Dm:Lcom/discord/views/e$c;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2bc6b027d6..39299d619b 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 Dh:Lkotlin/jvm/functions/Function1;
+.field private Dj: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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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;->Dk:Lcom/discord/views/e$c;
+    sget-object p1, Lcom/discord/views/e$c;->Dm:Lcom/discord/views/e$c;
 
     check-cast p1, Lkotlin/jvm/functions/Function1;
 
-    iput-object p1, p0, Lcom/discord/views/e;->Dh:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/e;->Dj:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final fa()V
+.method public final fd()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;->Dh:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/views/e;->Dj: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;->Dh:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lcom/discord/views/e;->Dj:Lkotlin/jvm/functions/Function1;
 
     return-object v0
 .end method
@@ -217,7 +217,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/discord/views/e;->Dh:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lcom/discord/views/e;->Dj: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 b8ff190e2c..e7e610b366 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;->fa()V
+    invoke-virtual {v0}, Lcom/discord/views/f;->fd()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/views/f$b.smali b/com.discord/smali/com/discord/views/f$b.smali
index e590145c36..3277dff7b1 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 Do:Lcom/discord/views/f$b;
+.field public static final Dq: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;->Do:Lcom/discord/views/f$b;
+    sput-object v0, Lcom/discord/views/f$b;->Dq:Lcom/discord/views/f$b;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d004c
+    const v0, 0x7f0d004e
 
     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 499b94ff1a..1f7afb296d 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 Dq:Lcom/discord/views/f$c$1;
+.field public static final Ds: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;->Dq:Lcom/discord/views/f$c$1;
+    sput-object v0, Lcom/discord/views/f$c$1;->Ds: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 98ed03b442..66f0512669 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 Dp:Lcom/discord/views/f$c;
+.field public static final Dr: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;->Dp:Lcom/discord/views/f$c;
+    sput-object v0, Lcom/discord/views/f$c;->Dr:Lcom/discord/views/f$c;
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/views/f$c$1;->Dq:Lcom/discord/views/f$c$1;
+    sget-object v0, Lcom/discord/views/f$c$1;->Ds:Lcom/discord/views/f$c$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -117,7 +117,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/views/f$d.smali b/com.discord/smali/com/discord/views/f$d.smali
index ef1cd79c98..a5b910d307 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 Dr:Lcom/discord/views/f$d;
+.field public static final Dt: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;->Dr:Lcom/discord/views/f$d;
+    sput-object v0, Lcom/discord/views/f$d;->Dt: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 fd4de137db..f8d8c6acf4 100644
--- a/com.discord/smali/com/discord/views/f$e.smali
+++ b/com.discord/smali/com/discord/views/f$e.smali
@@ -78,7 +78,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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a29f1c27d9..f87f3cd4b9 100644
--- a/com.discord/smali/com/discord/views/f.smali
+++ b/com.discord/smali/com/discord/views/f.smali
@@ -19,12 +19,12 @@
 
 
 # instance fields
-.field private final Dl:Lkotlin/properties/ReadOnlyProperty;
-
-.field private final Dm:Lkotlin/properties/ReadOnlyProperty;
-
 .field private final Dn:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final Do:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Dp:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final adapter:Lcom/discord/utilities/views/SimpleRecyclerAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -159,7 +159,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d004b
+    const v1, 0x7f0d004d
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -167,31 +167,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/views/f;->setClipChildren(Z)V
 
-    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;->Dl:Lkotlin/properties/ReadOnlyProperty;
-
-    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/f;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04ce
-
-    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;->Dm:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a04cf
+    const p1, 0x7f0a04da
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -199,9 +175,33 @@
 
     iput-object p1, p0, Lcom/discord/views/f;->Dn:Lkotlin/properties/ReadOnlyProperty;
 
+    const p1, 0x7f0a04d5
+
+    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;->header$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a04d8
+
+    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;->Do:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a04d9
+
+    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;->Dp:Lkotlin/properties/ReadOnlyProperty;
+
     new-instance p1, Lcom/discord/utilities/views/SimpleRecyclerAdapter;
 
-    sget-object v0, Lcom/discord/views/f$b;->Do:Lcom/discord/views/f$b;
+    sget-object v0, Lcom/discord/views/f$b;->Dq: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;->Dn:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Dp: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;->Dm:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Do: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;->Dl:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/f;->Dn: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;->Dp:Lcom/discord/views/f$c;
+    sget-object v2, Lcom/discord/views/f$c;->Dr: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;->Dr:Lcom/discord/views/f$d;
+    sget-object v2, Lcom/discord/views/f$d;->Dt: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 38d57b87f5..f2701c9af5 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 DR:Lcom/discord/views/g$b$1;
+.field public static final DT: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;->DR:Lcom/discord/views/g$b$1;
+    sput-object v0, Lcom/discord/views/g$b$1;->DT: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 5beae0cfff..728f9f4063 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 DQ:Lcom/discord/views/g$b;
+.field public static final DS: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;->DQ:Lcom/discord/views/g$b;
+    sput-object v0, Lcom/discord/views/g$b;->DS: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;->DR:Lcom/discord/views/g$b$1;
+    sget-object v0, Lcom/discord/views/g$b$1;->DT:Lcom/discord/views/g$b$1;
 
     check-cast v0, Lrx/functions/b;
 
@@ -115,7 +115,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/views/g$c.smali b/com.discord/smali/com/discord/views/g$c.smali
index d5716c0bd2..4274676713 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b9fbe5aefd..52ae660ade 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 DO:Lcom/discord/views/g$a;
+.field public static final DR:Lcom/discord/views/g$a;
 
 
 # instance fields
-.field private final DN:Lkotlin/properties/ReadOnlyProperty;
+.field private final DQ: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;->DO:Lcom/discord/views/g$a;
+    sput-object v0, Lcom/discord/views/g;->DR:Lcom/discord/views/g$a;
 
     return-void
 .end method
@@ -95,11 +95,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d004d
+    const v1, 0x7f0d004f
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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, 0x7f0a04c8
+    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/g;->DN:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/g;->DQ:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
 .end method
@@ -127,7 +127,7 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/discord/views/g;->fb()V
+    invoke-direct {p0}, Lcom/discord/views/g;->fe()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;->fc()V
+    invoke-direct {p0}, Lcom/discord/views/g;->ff()V
 
     return-void
 .end method
 
-.method private final fb()V
+.method private final fe()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 fc()V
+.method private final ff()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;->fc()V
+    invoke-direct {p0}, Lcom/discord/views/g;->ff()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;->DN:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/g;->DQ:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/g;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -273,7 +273,7 @@
 .method public final n(Z)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/discord/views/g;->fb()V
+    invoke-direct {p0}, Lcom/discord/views/g;->fe()V
 
     invoke-super {p0, p1}, Lcom/discord/overlay/views/OverlayBubbleWrap;->n(Z)V
 
@@ -295,7 +295,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/views/g$b;->DQ:Lcom/discord/views/g$b;
+    sget-object v1, Lcom/discord/views/g$b;->DS:Lcom/discord/views/g$b;
 
     check-cast v1, Lrx/functions/b;
 
diff --git a/com.discord/smali/com/discord/views/h$b.smali b/com.discord/smali/com/discord/views/h$b.smali
index e85484c7c1..88af542118 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;->wL:Lcom/discord/app/DiscordConnectService$a;
+    sget-object p2, Lcom/discord/app/DiscordConnectService;->wJ:Lcom/discord/app/DiscordConnectService$a;
 
     invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
@@ -138,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;->fa()V
+    invoke-virtual {p1}, Lcom/discord/views/h;->fd()V
 
     :cond_1
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f1860bc34c..c7cf5802dd 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;->fd()V
+    value = Lcom/discord/views/h;->fg()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;->fa()V
+    invoke-virtual {p1}, Lcom/discord/views/h;->fd()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 6753c02b4b..69c548f2b8 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;->fd()V
+    value = Lcom/discord/views/h;->fg()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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c3d96eb40f..7cdc1728d5 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;->fd()V
+    value = Lcom/discord/views/h;->fg()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -31,7 +31,7 @@
 
 
 # static fields
-.field public static final DU:Lcom/discord/views/h$e;
+.field public static final DW: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;->DU:Lcom/discord/views/h$e;
+    sput-object v0, Lcom/discord/views/h$e;->DW: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 3fcbc68c08..83b9f76c64 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;->fd()V
+    value = Lcom/discord/views/h;->fg()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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 65c3473d89..5bbc39f5ea 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 DS:Lkotlin/properties/ReadOnlyProperty;
+.field private final DU:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final DT:Lkotlin/properties/ReadOnlyProperty;
+.field private final DV:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
@@ -168,7 +168,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d004e
+    const v1, 0x7f0d0050
 
     invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -180,15 +180,15 @@
 
     iput-object p1, p0, Lcom/discord/views/h;->closeBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a05b8
+    const p1, 0x7f0a05cd
 
     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;->DS:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/h;->DU:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a02ba
+    const p1, 0x7f0a02bd
 
     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, 0x7f0a0566
+    const p1, 0x7f0a057b
 
     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;->DT:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/views/h;->DV:Lkotlin/properties/ReadOnlyProperty;
 
     new-instance p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 
@@ -388,7 +388,7 @@
     return-object p0
 .end method
 
-.method private final fd()V
+.method private final fg()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;->DU:Lcom/discord/views/h$e;
+    sget-object v2, Lcom/discord/views/h$e;->DW: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;->DS:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/h;->DU: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;->DT:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/h;->DV:Lkotlin/properties/ReadOnlyProperty;
 
     sget-object v1, Lcom/discord/views/h;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
@@ -613,7 +613,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a025d
+    const v1, 0x7f0a0260
 
     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;->fd()V
+    invoke-direct {p0}, Lcom/discord/views/h;->fg()V
 
     invoke-virtual {p0}, Lcom/discord/views/h;->getContext()Landroid/content/Context;
 
@@ -645,7 +645,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a025d
+    const v1, 0x7f0a0260
 
     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;->bmR:Lkotterknife/a;
+    sget-object p1, Lkotterknife/a;->bnb:Lkotterknife/a;
 
     invoke-static {p0}, Lkotterknife/a;->bi(Ljava/lang/Object;)V
 
@@ -685,11 +685,11 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d004e
+    const v1, 0x7f0d0050
 
     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;->fd()V
+    invoke-direct {p0}, Lcom/discord/views/h;->fg()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 1adab690c4..746d42eff5 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 DW:Landroid/widget/TextSwitcher;
+.field public DY:Landroid/widget/TextSwitcher;
 
-.field private DX:Landroid/widget/TextView;
+.field private DZ:Landroid/widget/TextView;
 
-.field private DY:Landroid/widget/TextView;
+.field private Ea:Landroid/widget/TextView;
 
-.field public DZ:I
+.field public Eb:I
 
-.field public Ea:Ljava/lang/Long;
+.field public Ec:Ljava/lang/Long;
 
 .field public emojiTextView:Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
@@ -29,13 +29,13 @@
 
     move-result-object p1
 
-    const v0, 0x7f0d0055
+    const v0, 0x7f0d0057
 
     invoke-static {p1, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
     move-result-object p1
 
-    const v0, 0x7f0a0562
+    const v0, 0x7f0a056d
 
     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, 0x7f0a0561
+    const v0, 0x7f0a056c
 
     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;->DW:Landroid/widget/TextSwitcher;
+    iput-object v0, p0, Lcom/discord/views/i;->DY:Landroid/widget/TextSwitcher;
 
-    const v0, 0x7f0a055f
+    const v0, 0x7f0a056a
 
     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;->DX:Landroid/widget/TextView;
+    iput-object v0, p0, Lcom/discord/views/i;->DZ:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0560
+    const v0, 0x7f0a056b
 
     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;->DY:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/i;->Ea: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;->DX:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/i;->DZ:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setActivated(Z)V
 
-    iget-object v0, p0, Lcom/discord/views/i;->DY:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/views/i;->Ea: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 ccb3c15aca..6eb20e27ac 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;->EF:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EH: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;->EG:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EI: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;->EI:Lcom/discord/views/VoiceUserView$a;
+    sget-object v1, Lcom/discord/views/VoiceUserView$a;->EK: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 939b3ffea6..cc800e9fee 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 EY:Ljava/lang/Class;
+.field final Fa:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,13 +26,13 @@
     .end annotation
 .end field
 
-.field private final EZ:I
-
-.field private final Fa:I
-
 .field private final Fb:I
 
-.field private final Fc:Lkotlin/jvm/functions/Function1;
+.field private final Fc:I
+
+.field private final Fd:I
+
+.field private final Fe: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 Fd:Lkotlin/jvm/functions/Function1;
+.field private final Ff: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 Fe:Z
+.field private final Fg:Z
 
-.field private final Ff:Z
+.field private final Fh: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;->EY:Ljava/lang/Class;
+    iput-object v11, v10, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
 
     move v0, p2
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->EZ:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
 
     move v0, p3
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fa:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fc:I
 
     move/from16 v0, p4
 
-    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
+    iput v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fd:I
 
     const/4 v0, 0x0
 
-    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fc:Lkotlin/jvm/functions/Function1;
+    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fe: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;->Fd:Lkotlin/jvm/functions/Function1;
+    iput-object v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Ff:Lkotlin/jvm/functions/Function1;
 
     move/from16 v0, p8
 
-    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fe:Z
+    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fg:Z
 
     move/from16 v0, p9
 
-    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Ff:Z
+    iput-boolean v0, v10, Lcom/discord/views/steps/StepsView$b$a;->Fh:Z
 
     return-void
 .end method
@@ -170,9 +170,9 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f120c0a
+    const v1, 0x7f120c3c
 
-    const v4, 0x7f120c0a
+    const v4, 0x7f120c3c
 
     goto :goto_0
 
@@ -184,9 +184,9 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f120299
+    const v1, 0x7f12029b
 
-    const v5, 0x7f120299
+    const v5, 0x7f12029b
 
     goto :goto_1
 
@@ -198,9 +198,9 @@
 
     if-eqz v1, :cond_2
 
-    const v1, 0x7f120547
+    const v1, 0x7f12056c
 
-    const v6, 0x7f120547
+    const v6, 0x7f12056c
 
     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;->EY:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->EY:Ljava/lang/Class;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->EZ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->EZ:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fb: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;->Fa:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fc:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fa:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fc: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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fd: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;->Fc:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fc:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fe:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Ff:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->Fe:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fg:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fe:Z
+    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$a;->Fg: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;->Ff:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fh:Z
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Ff:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Fh: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;->EY:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
 
     const/4 v1, 0x0
 
@@ -417,26 +417,6 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->EZ: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;->Fa: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;->Fb:I
 
     invoke-static {v2}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
@@ -447,7 +427,27 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fc:Lkotlin/jvm/functions/Function1;
+    iget v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fc: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;->Fd: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;->Fe:Lkotlin/jvm/functions/Function1;
 
     if-eqz v2, :cond_1
 
@@ -483,7 +483,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff:Lkotlin/jvm/functions/Function1;
 
     if-eqz v2, :cond_3
 
@@ -496,7 +496,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fg:Z
 
     const/4 v2, 0x1
 
@@ -509,7 +509,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fh:Z
 
     if-eqz v1, :cond_5
 
@@ -530,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;->EY:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -538,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;->EZ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fb:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -546,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;->Fa:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fc:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -554,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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fd:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -562,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;->Fc:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fe:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -578,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;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Ff:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -586,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;->Fe:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fg:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -594,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;->Ff:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$a;->Fh: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 abf592fc27..2979390168 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 EZ:I
-
-.field private final Fa:I
-
 .field private final Fb:I
 
-.field private final Fc:Lkotlin/jvm/functions/Function1;
+.field private final Fc:I
+
+.field private final Fd:I
+
+.field private final Fe: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 Fd:Lkotlin/jvm/functions/Function1;
+.field private final Ff: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 Fe:Z
+.field private final Fg:Z
 
-.field private final Ff:Z
+.field private final Fh:Z
 
-.field final Fg:I
+.field final Fi: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;->Fg:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fi:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fg:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fi: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;->EZ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fb:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->EZ:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fb: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;->Fa:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fc:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fa:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fc: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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fd:I
 
-    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fb:I
+    iget v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fd: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;->Fc:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fc:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fe:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff:Lkotlin/jvm/functions/Function1;
 
-    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Ff:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->Fe:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fe:Z
+    iget-boolean v3, p1, Lcom/discord/views/steps/StepsView$b$b;->Fg: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;->Ff:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fh:Z
 
-    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Ff:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Fh:Z
 
     if-ne v1, p1, :cond_5
 
@@ -216,7 +216,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg:I
+    iget v0, p0, Lcom/discord/views/steps/StepsView$b$b;->Fi:I
 
     invoke-static {v0}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
 
@@ -224,26 +224,6 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->EZ: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;->Fa: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;->Fb:I
 
     invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
@@ -254,7 +234,27 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fc:Lkotlin/jvm/functions/Function1;
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fc: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;->Fd: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;->Fe:Lkotlin/jvm/functions/Function1;
 
     const/4 v2, 0x0
 
@@ -292,7 +292,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff:Lkotlin/jvm/functions/Function1;
 
     if-eqz v1, :cond_2
 
@@ -305,7 +305,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg:Z
 
     const/4 v2, 0x1
 
@@ -318,7 +318,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fh:Z
 
     if-eqz v1, :cond_4
 
@@ -339,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;->Fg:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fi:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -347,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;->EZ:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fb:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -355,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;->Fa:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fc:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -363,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;->Fb:I
+    iget v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fd:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -371,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;->Fc:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fe:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -387,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;->Fd:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Ff:Lkotlin/jvm/functions/Function1;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -395,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;->Fe:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fg:Z
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
@@ -403,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;->Ff:Z
+    iget-boolean v1, p0, Lcom/discord/views/steps/StepsView$b$b;->Fh: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 7ada7235ae..63d9d2f7e9 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b.smali
@@ -22,33 +22,11 @@
 
 
 # instance fields
-.field final EP:I
-
-.field final ER:I
-
 .field final ES:I
 
-.field final ET:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Landroid/view/View;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field final ET:I
 
-.field final EU:Lkotlin/jvm/functions/Function1;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lkotlin/jvm/functions/Function1<",
-            "Landroid/view/View;",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field final EU:I
 
 .field final EV:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
@@ -61,9 +39,31 @@
     .end annotation
 .end field
 
-.field final EW:Z
+.field final EW:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Landroid/view/View;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
 
-.field final EX:Z
+.field final EX:Lkotlin/jvm/functions/Function1;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function1<",
+            "Landroid/view/View;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final EY:Z
+
+.field final EZ:Z
 
 
 # direct methods
@@ -92,21 +92,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/discord/views/steps/StepsView$b;->EP:I
+    iput p1, p0, Lcom/discord/views/steps/StepsView$b;->ES:I
 
-    iput p2, p0, Lcom/discord/views/steps/StepsView$b;->ER:I
+    iput p2, p0, Lcom/discord/views/steps/StepsView$b;->ET:I
 
-    iput p3, p0, Lcom/discord/views/steps/StepsView$b;->ES:I
+    iput p3, p0, Lcom/discord/views/steps/StepsView$b;->EU:I
 
-    iput-object p4, p0, Lcom/discord/views/steps/StepsView$b;->ET:Lkotlin/jvm/functions/Function1;
+    iput-object p4, p0, Lcom/discord/views/steps/StepsView$b;->EV:Lkotlin/jvm/functions/Function1;
 
-    iput-object p5, p0, Lcom/discord/views/steps/StepsView$b;->EU:Lkotlin/jvm/functions/Function1;
+    iput-object p5, p0, Lcom/discord/views/steps/StepsView$b;->EW:Lkotlin/jvm/functions/Function1;
 
-    iput-object p6, p0, Lcom/discord/views/steps/StepsView$b;->EV:Lkotlin/jvm/functions/Function1;
+    iput-object p6, p0, Lcom/discord/views/steps/StepsView$b;->EX:Lkotlin/jvm/functions/Function1;
 
-    iput-boolean p7, p0, Lcom/discord/views/steps/StepsView$b;->EW:Z
+    iput-boolean p7, p0, Lcom/discord/views/steps/StepsView$b;->EY:Z
 
-    iput-boolean p8, p0, Lcom/discord/views/steps/StepsView$b;->EX:Z
+    iput-boolean p8, p0, Lcom/discord/views/steps/StepsView$b;->EZ: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 4a7088611f..710d5e646b 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 Fg:I
+.field private Fi:I
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/discord/views/steps/StepsView$c;->Fg:I
+    iput v0, p0, Lcom/discord/views/steps/StepsView$c;->Fi: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;->Fg:I
+    iget v0, p0, Lcom/discord/views/steps/StepsView$c;->Fi:I
 
     return v0
 .end method
@@ -64,7 +64,7 @@
     const/4 p1, -0x1
 
     :goto_0
-    iput p1, p0, Lcom/discord/views/steps/StepsView$c;->Fg:I
+    iput p1, p0, Lcom/discord/views/steps/StepsView$c;->Fi: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 eaf111c4c2..3e2bd2c600 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 Fh:Ljava/util/List;
+.field public Fj: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;->Fh:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->Fj: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;->Fh:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$d;->Fj:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -86,7 +86,7 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b$a;
 
-    iget-object p1, p1, Lcom/discord/views/steps/StepsView$b$a;->EY:Ljava/lang/Class;
+    iget-object p1, p1, Lcom/discord/views/steps/StepsView$b$a;->Fa:Ljava/lang/Class;
 
     invoke-virtual {p1}, Ljava/lang/Class;->newInstance()Ljava/lang/Object;
 
@@ -111,7 +111,7 @@
 
     check-cast p1, Lcom/discord/views/steps/StepsView$b$b;
 
-    iget p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Fg:I
+    iget p1, p1, Lcom/discord/views/steps/StepsView$b$b;->Fi: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 0e0e057bf5..4037d3404e 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 Fi:Lcom/discord/views/steps/StepsView;
+.field final synthetic Fk:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic Fj:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fl:Lkotlin/jvm/functions/Function0;
 
 
 # direct methods
@@ -34,9 +34,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/discord/views/steps/StepsView$e;->Fi:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$e;->Fk:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$e;->Fj:Lkotlin/jvm/functions/Function0;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$e;->Fl: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$e;->Fk:Lcom/discord/views/steps/StepsView;
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView$e;->Fj:Lkotlin/jvm/functions/Function0;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView$e;->Fl: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 007bf897c7..393603894a 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 Fj:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fl: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;->Fj:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$f;->Fl: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;->Fj:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$f;->Fl: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 5df0e6ddba..6c2ecbc875 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 Fi:Lcom/discord/views/steps/StepsView;
+.field final synthetic Fk:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic Fk:Ljava/util/List;
+.field final synthetic Fm: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Fk:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$g;->Fk:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$g;->Fm: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;->Fk:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Fm: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;->ET:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->EV: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Fk: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Fk: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$g;->Fk: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$g;->Fk: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 30cccce9e9..f31e92bea1 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 Fi:Lcom/discord/views/steps/StepsView;
+.field final synthetic Fk:Lcom/discord/views/steps/StepsView;
 
-.field final synthetic Fj:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fl:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic Fk:Ljava/util/List;
+.field final synthetic Fm: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fk:Lcom/discord/views/steps/StepsView;
 
-    iput-object p2, p0, Lcom/discord/views/steps/StepsView$h;->Fk:Ljava/util/List;
+    iput-object p2, p0, Lcom/discord/views/steps/StepsView$h;->Fm:Ljava/util/List;
 
     iput p3, p0, Lcom/discord/views/steps/StepsView$h;->$position:I
 
-    iput-object p4, p0, Lcom/discord/views/steps/StepsView$h;->Fj:Lkotlin/jvm/functions/Function0;
+    iput-object p4, p0, Lcom/discord/views/steps/StepsView$h;->Fl: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;->Fk:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->Fm: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;->EU:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->EW: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fk: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;->Fj:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fl: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$h;->Fk: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;->Fi:Lcom/discord/views/steps/StepsView;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$h;->Fk: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 c6329cb085..992629463f 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 Fj:Lkotlin/jvm/functions/Function0;
+.field final synthetic Fl:Lkotlin/jvm/functions/Function0;
 
-.field final synthetic Fk:Ljava/util/List;
+.field final synthetic Fm: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;->Fk:Ljava/util/List;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView$i;->Fm:Ljava/util/List;
 
     iput p2, p0, Lcom/discord/views/steps/StepsView$i;->$position:I
 
-    iput-object p3, p0, Lcom/discord/views/steps/StepsView$i;->Fj:Lkotlin/jvm/functions/Function0;
+    iput-object p3, p0, Lcom/discord/views/steps/StepsView$i;->Fl: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;->Fk:Ljava/util/List;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView$i;->Fm: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;->EV:Lkotlin/jvm/functions/Function1;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$b;->EX: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;->Fj:Lkotlin/jvm/functions/Function0;
+    iget-object p1, p0, Lcom/discord/views/steps/StepsView$i;->Fl: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 d3f6333d14..3e04d5a34d 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 EO:Lcom/discord/views/steps/StepsView$a;
+.field public static final ER:Lcom/discord/views/steps/StepsView$a;
 
 
 # instance fields
-.field private EK:Landroid/widget/Button;
+.field private EM:Landroid/widget/Button;
 
-.field private EL:Landroid/widget/Button;
+.field private EN:Landroid/widget/Button;
 
-.field private EM:Landroid/widget/TextView;
+.field private EO:Landroid/widget/TextView;
 
-.field public EN:Lcom/discord/views/steps/StepsView$d;
+.field public EP: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;->EO:Lcom/discord/views/steps/StepsView$a;
+    sput-object v0, Lcom/discord/views/steps/StepsView;->ER:Lcom/discord/views/steps/StepsView$a;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     check-cast p1, Landroid/view/LayoutInflater;
 
-    const p2, 0x7f0d00a9
+    const p2, 0x7f0d00af
 
     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, 0x7f0a0729
+    const p1, 0x7f0a0744
 
     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;->EK:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->EM:Landroid/widget/Button;
 
-    const p1, 0x7f0a0728
+    const p1, 0x7f0a0743
 
     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, 0x7f0a072a
+    const p1, 0x7f0a0745
 
     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;->EL:Landroid/widget/Button;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->EN:Landroid/widget/Button;
 
-    const p1, 0x7f0a0727
+    const p1, 0x7f0a0742
 
     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;->EM:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/views/steps/StepsView;->EO:Landroid/widget/TextView;
 
-    const p1, 0x7f0a072b
+    const p1, 0x7f0a0746
 
     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;->EN:Lcom/discord/views/steps/StepsView$d;
+    iget-object p0, p0, Lcom/discord/views/steps/StepsView;->EP: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;->EN:Lcom/discord/views/steps/StepsView$d;
+    iget-object v0, p0, Lcom/discord/views/steps/StepsView;->EP:Lcom/discord/views/steps/StepsView$d;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, v0, Lcom/discord/views/steps/StepsView$d;->Fh:Ljava/util/List;
+    iget-object v0, v0, Lcom/discord/views/steps/StepsView$d;->Fj:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -289,55 +289,11 @@
 
     check-cast v2, Lcom/discord/views/steps/StepsView$b;
 
-    iget-boolean v2, v2, Lcom/discord/views/steps/StepsView$b;->EX:Z
+    iget-boolean v2, v2, Lcom/discord/views/steps/StepsView$b;->EZ:Z
 
     invoke-virtual {v1, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setScrollingEnabled(Z)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EL:Landroid/widget/Button;
-
-    invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/discord/views/steps/StepsView$b;
-
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->EP:I
-
-    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EM:Landroid/widget/TextView;
-
-    invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
-
-    move-result-object v2
-
-    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Lcom/discord/views/steps/StepsView$b;
-
-    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->ER:I
-
-    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/CharSequence;
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EK:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EN:Landroid/widget/Button;
 
     invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
 
@@ -359,7 +315,51 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EL:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO:Landroid/widget/TextView;
+
+    invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/views/steps/StepsView$b;
+
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->ET:I
+
+    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EM:Landroid/widget/Button;
+
+    invoke-virtual {p0}, Lcom/discord/views/steps/StepsView;->getContext()Landroid/content/Context;
+
+    move-result-object v2
+
+    invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/views/steps/StepsView$b;
+
+    iget v3, v3, Lcom/discord/views/steps/StepsView$b;->EU:I
+
+    invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v2}, Landroid/widget/Button;->setText(Ljava/lang/CharSequence;)V
+
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EN: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;->EM:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO: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;->EK:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EM: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;->EN:Lcom/discord/views/steps/StepsView$d;
+    iget-object p2, p0, Lcom/discord/views/steps/StepsView;->EP: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;->EL:Landroid/widget/Button;
+    iget-object v3, p0, Lcom/discord/views/steps/StepsView;->EN: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;->EW:Z
+    iget-boolean p1, p1, Lcom/discord/views/steps/StepsView$b;->EY: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;->EM:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EO: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;->EK:Landroid/widget/Button;
+    iget-object v1, p0, Lcom/discord/views/steps/StepsView;->EM: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 ab93ae2c97..52ec2dfd0c 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 FF:Lcom/discord/views/video/a;
+.field final synthetic Fu: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;->FF:Lcom/discord/views/video/a;
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;->Fu: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;->FF:Lcom/discord/views/video/a;
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$1;->Fu: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..420517ca0b
--- /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/m;
+.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/m;",
+        "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/m;-><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/l;->checkParameterIsNotNull(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;->bgy: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/AppVideoStreamRenderer$a$3.smali
similarity index 50%
rename from com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
rename to com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali
index e748c94e45..d074534226 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$b$3.smali
+++ b/com.discord/smali/com/discord/views/video/AppVideoStreamRenderer$a$3.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/views/video/VideoCallParticipantView$b$3;
+.class final Lcom/discord/views/video/AppVideoStreamRenderer$a$3;
 .super Lkotlin/jvm/internal/m;
-.source "VideoCallParticipantView.kt"
+.source "AppVideoStreamRenderer.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -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;
@@ -28,14 +28,14 @@
 
 
 # instance fields
-.field final synthetic this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
+.field final synthetic this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/views/video/VideoCallParticipantView$b;)V
+.method constructor <init>(Lcom/discord/views/video/AppVideoStreamRenderer$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$b$3;->this$0:Lcom/discord/views/video/VideoCallParticipantView$b;
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
 
     const/4 p1, 0x1
 
@@ -55,13 +55,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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, p0, Lcom/discord/views/video/AppVideoStreamRenderer$a$3;->this$0:Lcom/discord/views/video/AppVideoStreamRenderer$a;
 
-    iget-object v0, v0, Lcom/discord/views/video/VideoCallParticipantView$b;->this$0:Lcom/discord/views/video/VideoCallParticipantView;
+    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/VideoCallParticipantView;->a(Lcom/discord/views/video/VideoCallParticipantView;Lrx/Subscription;)V
+    invoke-static {v0, p1}, Lcom/discord/views/video/AppVideoStreamRenderer;->a(Lcom/discord/views/video/AppVideoStreamRenderer;Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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..17c71c5105
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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;->Fv:I
+
+    add-int/lit8 p1, p1, 0x1
+
+    sput p1, Lcom/discord/views/video/a;->Fv: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;->Fv: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..9116ef5dcd
--- /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 Fn:Z
+
+.field private Fo:Z
+
+.field private final Fp:Lrx/subjects/BehaviorSubject;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/subjects/BehaviorSubject<",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private Fq:Lrx/Subscription;
+
+.field private Fr:Lco/discord/media_engine/VideoStreamRenderer;
+
+.field private Fs:Lorg/webrtc/RendererCommon$ScalingType;
+
+.field private Ft: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/l;->checkParameterIsNotNull(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;->bgy:Lkotlin/Unit;
+
+    invoke-static {p1}, Lrx/subjects/BehaviorSubject;->bD(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Fp: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;->Fs: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;->Fq: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;->Fq: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;->Fp: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;->Fr:Lco/discord/media_engine/VideoStreamRenderer;
+
+    return-object p0
+.end method
+
+.method private final fo()V
+    .locals 6
+
+    iget-object v0, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Fr:Lco/discord/media_engine/VideoStreamRenderer;
+
+    if-eqz v0, :cond_1
+
+    iget-object v1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Fq: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;->Fr: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;->Fr:Lco/discord/media_engine/VideoStreamRenderer;
+
+    sget v0, Lcom/discord/views/video/a;->Fv:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    sput v0, Lcom/discord/views/video/a;->Fv: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;->Fv: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;->Fr: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/l;->checkExpressionValueIsNotNull(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;->Fr: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/l;->areEqual(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;->Fr: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;->Fr: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;->Fr: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;->Fn:Z
+
+    invoke-virtual {p1, p4}, Lco/discord/media_engine/VideoStreamRenderer;->setZOrderMediaOverlay(Z)V
+
+    :cond_4
+    iget-object p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Fs: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;->Fs: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;->fo()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;->Ft: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;->fo()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;->Fp:Lrx/subjects/BehaviorSubject;
+
+    sget-object p2, Lkotlin/Unit;->bgy: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;->Fn:Z
+
+    return-void
+.end method
+
+.method public final setMatchVideoOrientation(Z)V
+    .locals 0
+
+    iput-boolean p1, p0, Lcom/discord/views/video/AppVideoStreamRenderer;->Fo: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;->Ft: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..191824c949
--- /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/y;->getOrCreateKotlinClass(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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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;->FA:Z
+
+    sget-object p1, Lkotlin/Unit;->bgy: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..9a72d7ce41
--- /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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final 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..21a931264d
--- /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 FB: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;->FB: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..721f8a1ac3
--- /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 FC: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;->FC: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..08419b03bb
--- /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 FA:Z
+
+.field private final Fw:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Fx:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Fy:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final Fz:Lkotlin/properties/ReadOnlyProperty;
+
+.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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/l;->checkParameterIsNotNull(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, 0x7f0a032b
+
+    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;->Fw:Lkotlin/properties/ReadOnlyProperty;
+
+    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;->Fx: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;->Fy:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a032a
+
+    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;->Fz:Lkotlin/properties/ReadOnlyProperty;
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const p3, 0x7f0d008c
+
+    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;->FA: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/l;->areEqual(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;->FA: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;->Fy: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;->Fz: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;->Fx: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;->Fw: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;->bgy: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;->bgy:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_1
+    sget-object v0, Lcom/discord/views/video/ApplicationStreamView$a$b;->FB:Lcom/discord/views/video/ApplicationStreamView$a$b;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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;->bgy:Lkotlin/Unit;
+
+    goto :goto_0
+
+    :cond_2
+    sget-object v0, Lcom/discord/views/video/ApplicationStreamView$a$c;->FC:Lcom/discord/views/video/ApplicationStreamView$a$c;
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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;->bgy: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..c0cf91fdf9
--- /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/y;->getOrCreateKotlinClass(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/l;->checkParameterIsNotNull(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;->bgy: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 13b1688c8d..b90e9fa9fa 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 FB:Lorg/webrtc/RendererCommon$ScalingType;
+.field final FM:Lcom/discord/models/domain/ModelVoice$User;
 
-.field final FE:Z
+.field final FO:Z
 
-.field final Fz:Lcom/discord/models/domain/ModelVoice$User;
+.field final Fs: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM:Lcom/discord/models/domain/ModelVoice$User;
 
-    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE:Z
+    iput-boolean p2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO:Z
 
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FB:Lorg/webrtc/RendererCommon$ScalingType;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM:Lcom/discord/models/domain/ModelVoice$User;
 
-    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM:Lcom/discord/models/domain/ModelVoice$User;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->FE:Z
+    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO:Z
 
-    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE:Z
+    iget-boolean v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO: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;->FB:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
 
-    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FB:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v3, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs:Lorg/webrtc/RendererCommon$ScalingType;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM: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;->FE:Z
+    iget-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO: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;->FB:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM: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;->FE:Z
+    iget-boolean v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FO: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;->FB:Lorg/webrtc/RendererCommon$ScalingType;
+    iget-object v1, p0, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->Fs: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 46fce891a3..1bb577a7aa 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView$a.smali
@@ -95,15 +95,15 @@
 
     new-instance v1, Ljp/wasabeef/fresco/a/c;
 
-    iget-object v0, v0, Ljp/wasabeef/fresco/a/c$a;->bgg:Ljava/util/List;
+    iget-object v0, v0, Ljp/wasabeef/fresco/a/c$a;->bgq:Ljava/util/List;
 
     invoke-direct {v1, v0, v2}, Ljp/wasabeef/fresco/a/c;-><init>(Ljava/util/List;B)V
 
     check-cast v1, Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object v1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 10d5ecce58..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/m;
-.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/m;",
-        "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/m;-><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;->bgo: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 d3a37872c8..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/m;
-.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/m;",
-        "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/m;-><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/l;->checkParameterIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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;->bgo: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 dd0fa5f5de..8d81871afd 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 FA:Lco/discord/media_engine/VideoStreamRenderer;
+.field private final FF:Lkotlin/properties/ReadOnlyProperty;
 
-.field private FB:Lorg/webrtc/RendererCommon$ScalingType;
+.field private final FG:Lkotlin/properties/ReadOnlyProperty;
 
-.field private FC:Z
+.field private final FH:Lkotlin/properties/ReadOnlyProperty;
 
-.field private FD:Ljava/lang/String;
+.field private final FI:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Fn:Lkotlin/properties/ReadOnlyProperty;
+.field private final FJ:Lkotlin/properties/ReadOnlyProperty;
 
-.field private final Fo:Lkotlin/properties/ReadOnlyProperty;
+.field private final FK:I
 
-.field private final Fp:Lkotlin/properties/ReadOnlyProperty;
+.field private final FL:I
 
-.field private final Fq:Lkotlin/properties/ReadOnlyProperty;
+.field private FM:Lcom/discord/models/domain/ModelVoice$User;
 
-.field private final Fr:Lkotlin/properties/ReadOnlyProperty;
+.field private FN:Ljava/lang/String;
 
-.field private final Fs:Lkotlin/properties/ReadOnlyProperty;
+.field private final Fo:Z
 
-.field private final Ft:I
-
-.field private final Fu:I
-
-.field private final Fv:Lrx/subjects/BehaviorSubject;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/subjects/BehaviorSubject<",
-            "Lkotlin/Unit;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private Fw:Lrx/Subscription;
-
-.field private final Fx:Z
-
-.field private final Fy:Z
-
-.field private Fz:Lcom/discord/models/domain/ModelVoice$User;
-
-.field private scalingTypeMismatchOrientation:Lorg/webrtc/RendererCommon$ScalingType;
-
-.field private streamId:Ljava/lang/Integer;
+.field private final Fx: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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -262,53 +238,53 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p3, 0x7f0a04dc
+    const p3, 0x7f0a04ea
 
     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;->Fn:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04df
+    const p3, 0x7f0a04e4
 
     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;->Fo:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04da
+    const p3, 0x7f0a04e9
 
     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;->Fp:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FH:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04de
+    const p3, 0x7f0a04e7
 
     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;->Fq:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fx:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04dd
+    const p3, 0x7f0a04e5
 
     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;->Fr:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FI:Lkotlin/properties/ReadOnlyProperty;
 
-    const p3, 0x7f0a04db
+    const p3, 0x7f0a04e8
 
     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;->Fs:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FJ:Lkotlin/properties/ReadOnlyProperty;
 
     invoke-virtual {p0}, Lcom/discord/views/video/VideoCallParticipantView;->getResources()Landroid/content/res/Resources;
 
@@ -320,7 +296,7 @@
 
     move-result p3
 
-    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ft:I
+    iput p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->FK: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;->Fu:I
-
-    sget-object p3, Lkotlin/Unit;->bgo:Lkotlin/Unit;
-
-    invoke-static {p3}, Lrx/subjects/BehaviorSubject;->bD(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
-    move-result-object p3
-
-    iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fv: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;->FB: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;->FL:I
 
     move-object p3, p0
 
     check-cast p3, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d00b0
+    const v0, 0x7f0d00b6
 
     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;->Fx: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;->Fy:Z
+    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fo: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;->Fx:Z
+    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fo:Z
 
-    iput-boolean p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fy: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;->Fo: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;->Fw: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;->Fy:Z
+    :cond_2
+    iget-boolean p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fo: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;->FA: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;->FB: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;->Fw: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;->Fv: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 fl()V
-    .locals 7
-
-    iget-object v6, p0, Lcom/discord/views/video/VideoCallParticipantView;->FA:Lco/discord/media_engine/VideoStreamRenderer;
-
-    if-eqz v6, :cond_1
-
-    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fw: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;->FA: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;->Fp:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FG: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;->Fn: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;->Fs: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;->Fr:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FI: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;->Fq:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->Fx: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;->FJ: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;->FH: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;->Fo:Lkotlin/properties/ReadOnlyProperty;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FF: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v0, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM: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;->fl()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;->Fu:I
+    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FL:I
 
     sub-int/2addr p1, p2
 
-    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->Ft:I
+    iget p2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FK: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;->Fv:Lrx/subjects/BehaviorSubject;
-
-    sget-object p2, Lkotlin/Unit;->bgo: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;->FM: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iget-object v2, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FM: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
 
-    const/4 v1, 0x0
+    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM:Lcom/discord/models/domain/ModelVoice$User;
 
-    if-eqz p1, :cond_1
-
-    iget-boolean v2, p1, Lcom/discord/views/video/VideoCallParticipantView$ParticipantData;->FE:Z
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v2, 0x0
-
-    :goto_1
-    iput-boolean v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FC:Z
-
-    iget-object v2, p0, Lcom/discord/views/video/VideoCallParticipantView;->FB: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;->FB: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;->FB: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;->FB: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;->FA: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;->Fz: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;->Fz: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;->FD:Ljava/lang/String;
-
-    invoke-static {p1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->FD: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;->Fz: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;->Fz: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;->Fz: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, 0x7f0802af
-
-    goto :goto_8
-
-    :cond_10
-    if-eqz p1, :cond_11
-
-    const p1, 0x7f0802f2
-
-    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;->Fz: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;->FA: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/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    const-string v5, "context"
+    move-result v0
 
-    invoke-static {v3, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;->FA: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;->FM: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/l;->areEqual(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;->FA: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;->FA: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;->FA: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;->FA: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;->FB: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;->FM: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;->FC: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;->Fx: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;->FM: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;->fl()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;->FN:Ljava/lang/String;
+
+    invoke-static {v0, v5}, Lkotlin/jvm/internal/l;->areEqual(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;->FN: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;->FM: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;->FM: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;->FM: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, 0x7f0802bb
+
+    goto :goto_a
+
+    :cond_e
+    if-eqz v0, :cond_f
+
+    const v0, 0x7f0802fe
+
+    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;->FM: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;->Fs: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;->FO: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;->Fz:Lcom/discord/models/domain/ModelVoice$User;
+    iput-object p1, p0, Lcom/discord/views/video/VideoCallParticipantView;->FM: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 d20e1bcae5..fdc3158f97 100644
--- a/com.discord/smali/com/discord/views/video/a.smali
+++ b/com.discord/smali/com/discord/views/video/a.smali
@@ -1,108 +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 Fl: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;->Kw()Lrx/subjects/BehaviorSubject;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/discord/views/video/a;->Fl: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;->Fl: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;->Fm: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-static {}, Lrx/internal/a/ak;->Jw()Lrx/internal/a/ak;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
-
-    move-result-object p0
-
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
-
-    move-result-object v0
-
-    invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
-
-    move-result-object p0
-
-    const-string v0, "frameResolutionSubject\n \u2026  .distinctUntilChanged()"
-
-    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;->Fl: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 Fv: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 74%
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 8ae13d2bbf..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,7 +115,7 @@
 .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
 
@@ -123,7 +123,7 @@
 
     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
 
@@ -133,7 +133,7 @@
 
     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
 
@@ -153,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;
 
@@ -161,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;
 
@@ -169,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 21fb91c7db..a97c2c1418 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 Fm:Lcom/discord/views/video/a$b;
+.field public static final FE: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;->Fm:Lcom/discord/views/video/a$b;
+    sput-object v0, Lcom/discord/views/video/b$b;->FE: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..1dc6238e0b 100644
--- a/com.discord/smali/com/discord/views/video/b.smali
+++ b/com.discord/smali/com/discord/views/video/b.smali
@@ -1,34 +1,126 @@
-.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 FD: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;->Kz()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;->FD: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;->FD: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;->FE: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-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object p0
+
+    const-string v0, "frameResolutionSubject\n \u2026  .onBackpressureLatest()"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;->FD: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 21711dc7d8..7993bc3012 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 01997eb0d7..3a51b20934 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;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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 cc9669a141..5c69a91254 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 10b32e10ac..f19d85f88d 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, 0x7f0d00b9
+    const v0, 0x7f0d00bf
 
     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 e0ecdbbab5..db15d3a2e6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b1962f0148..c2b66a1a6a 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;
 
@@ -510,7 +510,7 @@
 
     move-result v5
 
-    const v7, 0x7f120286
+    const v7, 0x7f120288
 
     if-eqz v5, :cond_6
 
@@ -586,7 +586,7 @@
 
     :cond_5
     :goto_3
-    const p1, 0x7f1209fc
+    const p1, 0x7f120a31
 
     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, 0x7f1209fa
+    const p1, 0x7f120a2f
 
     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, 0x7f0d00bb
+    const v0, 0x7f0d00c1
 
     return v0
 .end method
@@ -684,7 +684,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLanding.smali
index 72e8791633..64a4d85810 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;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eI()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f0d00bd
+    const v0, 0x7f0d00c3
 
     return v0
 
     :cond_0
-    const v0, 0x7f0d00bc
+    const v0, 0x7f0d00c2
 
     return v0
 .end method
@@ -212,9 +212,9 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    sget-object p1, Lcom/discord/samsung/a;->Bb:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eI()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
 
     move-result p1
 
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 3c662cc1e9..35d1a82a79 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a3df8b3a17..b4c257a68f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 aee2cb8697..390e602842 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 859bbe247c..cdbd86dd61 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d9319433e4..4304537e7d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cc09fa00eb..6f000d297e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 273b406944..c031c004e5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 796a8d1c50..2892b050d5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 263e998162..9bc2238a54 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -97,7 +97,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120d41
+    const v0, 0x7f120d74
 
     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 20b8c6e0ab..1d81b2debd 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, 0x7f120d3e
+    const v0, 0x7f120d71
 
     invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const v0, 0x7f120d3f
+    const v0, 0x7f120d72
 
     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, 0x7f120d40
+    const v1, 0x7f120d73
 
     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, 0x7f12037b
+    const v1, 0x7f1203a0
 
     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 98896b44ac..5792857458 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, 0x7f120574
+    const v6, 0x7f120599
 
     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, 0x7f120573
+    const v7, 0x7f120598
 
     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, 0x7f120d43
+    const v8, 0x7f120d76
 
     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 675bdb5d60..8ae38a3d12 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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f120574
+    const v1, 0x7f120599
 
     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, 0x7f120575
+    const p1, 0x7f12059a
 
     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, 0x7f0d00be
+    const v0, 0x7f0d00c4
 
     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 aa72f44ac6..7c16e25c33 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 742f55e288..0c7f4e8612 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 0x7f0a0443
+    .packed-switch 0x7f0a044b
         :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 78c7cc1450..3584e9a12f 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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f1211e6
+    const p2, 0x7f12126e
 
     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, 0x7f12120f
+    const v0, 0x7f121297
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -264,7 +264,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0d00c0
+    const v1, 0x7f0d00c6
 
     const/4 v2, 0x0
 
@@ -353,7 +353,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0831
+    const v2, 0x7f0a0861
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -361,13 +361,13 @@
 
     check-cast v2, Landroid/widget/EditText;
 
-    const v3, 0x7f0a0832
+    const v3, 0x7f0a0862
 
     invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v3
 
-    const v4, 0x7f0a0830
+    const v4, 0x7f0a0860
 
     invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -420,7 +420,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0d00c1
+    const v1, 0x7f0d00c7
 
     const/4 v2, 0x0
 
@@ -428,7 +428,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a0834
+    const v2, 0x7f0a0864
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -438,7 +438,7 @@
 
     check-cast v6, Landroid/widget/TextView;
 
-    const v2, 0x7f0a0833
+    const v2, 0x7f0a0863
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -456,7 +456,7 @@
 
     move-result-object v8
 
-    const v1, 0x7f1211f0
+    const v1, 0x7f121278
 
     const/4 v2, 0x2
 
@@ -518,7 +518,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00bf
+    const v0, 0x7f0d00c5
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$onActivityResult$1.smali
index d87fb88ff7..7245e2ddaf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0b9b32f032..1fefc84bfd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e655329a26..4826c52d61 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 247282fed9..6e33297329 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 79855996c5..fbe2395626 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8770aefd9a..006ea2b030 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 db58826456..93265d6c12 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, 0x7f121196
+    const v0, 0x7f12121e
 
     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 f5172661b9..078a1e54bb 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, 0x7f121322
+    const v7, 0x7f1213ae
 
     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, 0x7f120574
+    const v9, 0x7f120599
 
     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, 0x7f120573
+    const v9, 0x7f120598
 
     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, 0x7f120d43
+    const v9, 0x7f120d76
 
     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, 0x7f120d3d
+    const v8, 0x7f120d70
 
     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 739fe871c2..de3b674842 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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f121193
+    const v1, 0x7f12121b
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -710,7 +710,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f120ed0
+    const v1, 0x7f120f57
 
     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, 0x7f0d00c2
+    const v0, 0x7f0d00c8
 
     return v0
 .end method
@@ -1312,12 +1312,12 @@
 
     if-eqz v3, :cond_1
 
-    const v3, 0x7f121195
+    const v3, 0x7f12121d
 
     goto :goto_1
 
     :cond_1
-    const v3, 0x7f121194
+    const v3, 0x7f12121c
 
     :goto_1
     invoke-direct {p0, v5, v3}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthUndeleteAccount.smali
index af13c66fb8..79b81a2728 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, 0x7f0d00c3
+    const v0, 0x7f0d00c9
 
     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 6b64a16adf..c819dd11d2 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
@@ -142,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;->Bb:Lcom/discord/samsung/a;
+    sget-object v1, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
     const-string v1, "clientId"
 
@@ -156,7 +156,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lcom/discord/samsung/a;->eI()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
 
     move-result p2
 
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 00a196fc59..c5bc731b40 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, 0x7f0a04c3
+    const p1, 0x7f0a04cd
 
     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, 0x7f0a04c1
+    const p1, 0x7f0a04cb
 
     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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/views/c;->Dc:Lcom/discord/views/c;
+    sget-object v0, Lcom/discord/views/c;->De: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 52710382f6..36ee6f8af5 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0049
+    const v0, 0x7f0d004b
 
     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 bd89bfa3ba..3925b5a142 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8b1fdc6312..c4306e4ceb 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -73,7 +73,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 736d026398..c3177bf1ab 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ce6de5dcc3..7603da04e2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b930cf409c..45ea4b66cf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 315329df14..0c27c733a9 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
@@ -155,7 +155,7 @@
 
     iget-object v2, v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
 
-    const v3, 0x7f120cdc
+    const v3, 0x7f120d0e
 
     new-array v4, v1, [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 4a9b4519fb..0e565c9401 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
@@ -370,7 +370,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a04b3
+    const v0, 0x7f0a04bd
 
     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/auth/WidgetOauth2Authorize;->appIconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04b4
+    const v0, 0x7f0a04be
 
     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/auth/WidgetOauth2Authorize;->appNameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04bc
+    const v0, 0x7f0a04c6
 
     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/auth/WidgetOauth2Authorize;->permissionsLabelTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04be
+    const v0, 0x7f0a04c8
 
     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/auth/WidgetOauth2Authorize;->securityNoticeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04bd
+    const v0, 0x7f0a04c7
 
     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/auth/WidgetOauth2Authorize;->permissionsList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04b8
+    const v0, 0x7f0a04c2
 
     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/auth/WidgetOauth2Authorize;->grantBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04bf
+    const v0, 0x7f0a04c9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -438,7 +438,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->denyBtns$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04b9
+    const v0, 0x7f0a04c3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -446,7 +446,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->loadingScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04b6
+    const v0, 0x7f0a04c0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -454,7 +454,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->contentScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04bb
+    const v0, 0x7f0a04c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -492,9 +492,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a04b7
-        0x7f0a04ba
-        0x7f0a04c0
+        0x7f0a04c1
+        0x7f0a04c4
+        0x7f0a04ca
     .end array-data
 .end method
 
@@ -684,19 +684,19 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f120cd7
+    const p1, 0x7f120d09
 
     goto :goto_2
 
     :cond_2
     if-eqz p1, :cond_3
 
-    const p1, 0x7f120cd8
+    const p1, 0x7f120d0a
 
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120cdf
+    const p1, 0x7f120d11
 
     :goto_2
     invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->getString(I)Ljava/lang/String;
@@ -727,7 +727,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f060149
+    const v4, 0x7f06014a
 
     invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -1049,7 +1049,7 @@
 
     aput-object v5, v4, v1
 
-    const v5, 0x7f120cd9
+    const v5, 0x7f120d0b
 
     invoke-virtual {v2, v5, v4}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
 
@@ -1181,7 +1181,7 @@
 
     new-instance v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$PermissionModel;
 
-    sget-object v3, Lcom/discord/views/c;->Dc:Lcom/discord/views/c;
+    sget-object v3, Lcom/discord/views/c;->De:Lcom/discord/views/c;
 
     invoke-virtual {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->requireContext()Landroid/content/Context;
 
@@ -1308,7 +1308,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0157
+    const v0, 0x7f0d015d
 
     return v0
 .end method
@@ -1551,7 +1551,7 @@
     :catch_0
     move-exception p1
 
-    const v2, 0x7f120cdd
+    const v2, 0x7f120d0f
 
     new-array v3, v1, [Ljava/lang/Object;
 
@@ -1569,7 +1569,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v3, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
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 314b0467d3..15aa69d618 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d252f2ff01..be271bf164 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 41b9ab8b90..b8c6eb16c2 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logI$1;
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion$logW$1;
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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 dcccd11440..26837dd939 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 331df01475..42c47fedd6 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
@@ -113,7 +113,7 @@
 
     check-cast p1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2$1;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -183,7 +183,7 @@
 
     :cond_2
     :goto_0
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0d2c5497d8..af9fa89d89 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v0, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DE()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
 
     move-result-object v1
 
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 55aeb48c64..28b5b07c68 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_1
     return-void
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 f016d16bca..48dd21503c 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
@@ -103,7 +103,7 @@
 
     check-cast p1, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -127,7 +127,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f12028e
+    const v0, 0x7f120290
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -141,7 +141,7 @@
 
     invoke-virtual {p1}, Lcom/discord/app/AppActivity;->finish()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cddc0cff4a..e37748fb46 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bb14457a9e..4dadc77df6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a8f86a4294..9d5f9c3535 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, 0x7f0a04b8
+    const v0, 0x7f0a04c2
 
     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;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eK()Landroid/content/Intent;
+    invoke-static {}, Lcom/discord/samsung/a;->eM()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -229,7 +229,7 @@
 .method private final startSamsungAccountLink(Ljava/lang/String;Ljava/lang/String;)V
     .locals 12
 
-    sget-object v0, Lcom/discord/samsung/a;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
     invoke-static {p1}, Lcom/discord/samsung/a;->ag(Ljava/lang/String;)Ljava/lang/String;
 
@@ -402,7 +402,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0157
+    const v0, 0x7f0d015d
 
     return v0
 .end method
@@ -493,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;->Bf:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
 
     move-object p1, p0
 
@@ -569,7 +569,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;->Bf:Lcom/discord/samsung/SamsungConnectActivity$a;
+    sget-object p1, Lcom/discord/samsung/SamsungConnectActivity;->Bg:Lcom/discord/samsung/SamsungConnectActivity$a;
 
     move-object p1, p0
 
@@ -646,7 +646,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const p2, 0x7f1205b6
+    const p2, 0x7f1205db
 
     invoke-static {p1, p2}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -819,9 +819,9 @@
 
     const/4 v2, 0x0
 
-    iput-boolean v2, p3, Lokhttp3/t$a;->brJ:Z
+    iput-boolean v2, p3, Lokhttp3/t$a;->brT:Z
 
-    invoke-virtual {p3}, Lokhttp3/t$a;->FA()Lokhttp3/t;
+    invoke-virtual {p3}, Lokhttp3/t$a;->FD()Lokhttp3/t;
 
     move-result-object p3
 
@@ -831,7 +831,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;->Bb:Lcom/discord/samsung/a;
+    sget-object v2, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
     invoke-static {p3, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -893,7 +893,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;->Bb:Lcom/discord/samsung/a;
+    sget-object v8, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -960,7 +960,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/as;->DD()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/as;->DG()Lkotlinx/coroutines/bq;
 
     move-result-object v5
 
@@ -1000,7 +1000,7 @@
 
     :cond_8
     :goto_3
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0cb0edd426..f09e1eaa38 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, 0x7f0d005d
+    const v0, 0x7f0d005f
 
     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, 0x7f0a043d
+    const v0, 0x7f0a0445
 
     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, 0x7f0a043a
+    const v0, 0x7f0a0442
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
index b1dcddff74..fe8021fb67 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, 0x7f0d005e
+    const v0, 0x7f0d0060
 
     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, 0x7f0a0640
+    const v0, 0x7f0a0655
 
     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 1ddcbb9c29..b5c125a1a8 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -68,7 +68,7 @@
     :array_0
     .array-data 4
         0x7f0a0164
-        0x7f0a06b8
+        0x7f0a06cd
     .end array-data
 .end method
 
@@ -209,7 +209,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1203bd
+    const v2, 0x7f1203e2
 
     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, 0x7f120b0a
+    const p1, 0x7f120b3b
 
     const/4 v2, 0x1
 
@@ -344,7 +344,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120b07
+    const v1, 0x7f120b38
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -358,13 +358,13 @@
 
     move-result-object p1
 
-    const p3, 0x7f040285
+    const p3, 0x7f040286
 
     invoke-virtual {p1, p3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setDialogAttrTheme(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object p1
 
-    const p3, 0x7f120b06
+    const p3, 0x7f120b37
 
     new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$c8xwH3a5VMhyc7oYmYZ83i0PPRA;
 
@@ -374,7 +374,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f12037b
+    const p2, 0x7f1203a0
 
     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, 0x7f120f97
+    const v0, 0x7f12101e
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -531,7 +531,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c7
+    const v0, 0x7f0d00cd
 
     return v0
 .end method
@@ -577,7 +577,7 @@
 
     move-result p3
 
-    const v0, 0x7f0a0461
+    const v0, 0x7f0a0469
 
     if-eq p3, v0, :cond_0
 
@@ -709,9 +709,9 @@
 .method public synthetic lambda$null$7$WidgetChannelGroupDMSettings()V
     .locals 2
 
-    const v0, 0x7f1203d8
+    const v0, 0x7f1203fd
 
-    const v1, 0x7f12121c
+    const v1, 0x7f1212a4
 
     invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
@@ -729,7 +729,7 @@
 
     iget-object v4, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconEditedResult:Lrx/functions/Action1;
 
-    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     move-object v0, p1
 
@@ -785,7 +785,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->saveButton:Landroid/view/View;
 
-    const v1, 0x7f0a0326
+    const v1, 0x7f0a032e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -795,7 +795,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->scrollView:Landroidx/core/widget/NestedScrollView;
 
-    const v1, 0x7f0a0484
+    const v1, 0x7f0a048e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -805,7 +805,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->muteToggle:Lcom/discord/views/CheckedSetting;
 
-    const v1, 0x7f0a06b9
+    const v1, 0x7f0a06ce
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -815,7 +815,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconLabel:Lcom/discord/app/AppTextView;
 
-    const v1, 0x7f0a06ba
+    const v1, 0x7f0a06cf
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -823,7 +823,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconRemove:Landroid/view/View;
 
-    const v1, 0x7f0a06b8
+    const v1, 0x7f0a06cd
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 64573e01f2..c7a6c6f022 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 eaee67c1a3..f3e2a7e905 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6b9a7a73e6..51abfd7b7d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 932d3411c5..54476d5800 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -378,7 +378,7 @@
 
     if-eqz v1, :cond_0
 
-    const v1, 0x7f120bdb
+    const v1, 0x7f120c0d
 
     const/4 v3, 0x1
 
@@ -421,7 +421,7 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f120bda
+    const v1, 0x7f120c0c
 
     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, 0x7f0d00cc
+    const v0, 0x7f0d00d2
 
     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, 0x7f120c8d
+    const v1, 0x7f120cbf
 
     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.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter.smali
index eaf9813200..bceaee170a 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, 0x7f0d00d1
+    const v0, 0x7f0d00d7
 
     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 088d36c7ef..5c4f9e1b67 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -124,9 +124,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120c44
+    const p6, 0x7f120c76
 
-    const v6, 0x7f120c44
+    const v6, 0x7f120c76
 
     goto :goto_1
 
@@ -168,9 +168,9 @@
 
     if-eqz p5, :cond_1
 
-    const p6, 0x7f120c44
+    const p6, 0x7f120c76
 
-    const v6, 0x7f120c44
+    const v6, 0x7f120c76
 
     goto :goto_1
 
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 2a78bde310..48ba05efea 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 dd7fb04af2..b5c417410a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 41389450df..134927de4c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
@@ -317,7 +317,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d0
+    const v0, 0x7f0d00d6
 
     return v0
 .end method
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 bfd6c8beda..fbbcf491df 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
@@ -315,7 +315,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -781,7 +781,7 @@
     return-void
 
     :cond_0
-    iget v0, p1, Lcom/discord/views/TernaryCheckBox;->Eo:I
+    iget v0, p1, Lcom/discord/views/TernaryCheckBox;->Eq:I
 
     if-nez v0, :cond_1
 
@@ -793,7 +793,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    const v1, 0x7f12037e
+    const v1, 0x7f1203a3
 
     if-eqz v0, :cond_4
 
@@ -811,7 +811,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fj()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
 
     return-void
 
@@ -821,25 +821,25 @@
     return-void
 
     :cond_3
-    const p2, 0x7f12037c
+    const p2, 0x7f1203a1
 
     invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(I)V
 
     return-void
 
     :cond_4
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fi()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fl()Z
 
     move-result v0
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fj()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
 
     return-void
 
     :cond_5
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fh()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()Z
 
     move-result v0
 
@@ -873,7 +873,7 @@
 
     if-eqz p2, :cond_8
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fj()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()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 047b909dcb..155e156cc8 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
@@ -369,11 +369,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fh()Z
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fk()Z
 
     move-result p2
 
-    const v0, 0x7f12037d
+    const v0, 0x7f1203a2
 
     if-eqz p2, :cond_0
 
@@ -395,12 +395,12 @@
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fj()V
+    invoke-virtual {p1}, Lcom/discord/views/TernaryCheckBox;->fm()V
 
     return-void
 
     :cond_2
-    const p2, 0x7f12037c
+    const p2, 0x7f1203a1
 
     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 c429af87df..fd9e51cc6d 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, 0x7f12038e
+    const v0, 0x7f1203b3
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203bd
+    const v0, 0x7f1203e2
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->setActionBarTitle(I)Lkotlin/Unit;
@@ -627,7 +627,7 @@
 
     check-cast v3, Lcom/discord/views/TernaryCheckBox;
 
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fh()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fk()Z
 
     move-result v4
 
@@ -646,7 +646,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fi()Z
+    invoke-virtual {v3}, Lcom/discord/views/TernaryCheckBox;->fl()Z
 
     move-result v4
 
@@ -836,7 +836,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d3
+    const v0, 0x7f0d00d9
 
     return v0
 .end method
@@ -848,7 +848,7 @@
 
     move-result p4
 
-    const p5, 0x7f0a0459
+    const p5, 0x7f0a0461
 
     if-eq p4, p5, :cond_0
 
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 8eebdc6532..66b35f618b 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -574,7 +574,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
index 51cd46c12d..e4b33b15fb 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
@@ -209,7 +209,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d4
+    const v0, 0x7f0d00da
 
     return v0
 .end method
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 41cb2ca542..a417180c37 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole$Model.smali
@@ -324,7 +324,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
index f627e3c8d2..51e48796a0 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
@@ -143,7 +143,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d5
+    const v0, 0x7f0d00db
 
     return v0
 .end method
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 a60745203a..c6c38a0ce5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview$Model.smali
@@ -555,7 +555,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
index 81d7e2524e..77e8786274 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, 0x7f12038e
+    const v0, 0x7f1203b3
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1203bd
+    const v0, 0x7f1203e2
 
     :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, 0x7f0d00d6
+    const v0, 0x7f0d00dc
 
     return v0
 .end method
@@ -352,7 +352,7 @@
     return-void
 
     :cond_0
-    const p1, 0x7f120d2e
+    const p1, 0x7f120d60
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -424,7 +424,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->membersContainer:Landroid/view/View;
 
-    const v0, 0x7f0a0838
+    const v0, 0x7f0a0868
 
     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, 0x7f0a0837
+    const v0, 0x7f0a0867
 
     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 650b4cf7d2..ebd5f499b4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fbbd14fbae..b902173acd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a547afcf84..6e7c126c9a 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
@@ -161,7 +161,7 @@
     :goto_1
     new-instance p2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;
 
-    const p3, 0x7f1203c5
+    const p3, 0x7f1203ea
 
     invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -253,7 +253,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 7b7ac8d0c2..9edec07157 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bf8174b2a2..8ac01417e1 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
@@ -165,7 +165,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d7
+    const v0, 0x7f0d00dd
 
     return v0
 .end method
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 087cd58368..bafa22b697 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, 0x7f0d007c
+    const v0, 0x7f0d0081
 
     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, 0x7f0a057a
+    const v0, 0x7f0a058f
 
     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 b55ca5c331..23b89233c8 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, 0x7f120474
+    const v0, 0x7f120499
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f120475
+    const v0, 0x7f12049a
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetCreateChannel;->setActionBarTitle(I)Lkotlin/Unit;
@@ -473,7 +473,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0112
+    const v0, 0x7f0d0118
 
     return v0
 .end method
@@ -485,7 +485,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0472
+    const p2, 0x7f0a047a
 
     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, 0x7f0a023b
 
     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, 0x7f0a023c
 
     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, 0x7f0a0241
 
     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, 0x7f0a0244
 
     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, 0x7f0a0247
 
     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, 0x7f0a023f
 
     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, 0x7f0a0240
 
     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, 0x7f0a023e
 
     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, 0x7f0a0243
 
     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, 0x7f0a0246
 
     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, 0x7f0a023d
 
     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, 0x7f0a0242
 
     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, 0x7f0a0245
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -939,12 +939,12 @@
 
     if-ne v1, v2, :cond_4
 
-    const v1, 0x7f120ed2
+    const v1, 0x7f120f59
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f120ed4
+    const v1, 0x7f120f5b
 
     :goto_1
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -955,12 +955,12 @@
 
     if-ne v1, v2, :cond_5
 
-    const v1, 0x7f120ed3
+    const v1, 0x7f120f5a
 
     goto :goto_2
 
     :cond_5
-    const v1, 0x7f120ed5
+    const v1, 0x7f120f5c
 
     :goto_2
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -971,12 +971,12 @@
 
     if-ne v1, v2, :cond_6
 
-    const v1, 0x7f12061e
+    const v1, 0x7f120642
 
     goto :goto_3
 
     :cond_6
-    const v1, 0x7f120621
+    const v1, 0x7f120645
 
     :goto_3
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -987,12 +987,12 @@
 
     if-ne v1, v2, :cond_7
 
-    const v1, 0x7f12038d
+    const v1, 0x7f1203b2
 
     goto :goto_4
 
     :cond_7
-    const v1, 0x7f12061f
+    const v1, 0x7f120643
 
     :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$getFriendChanges$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$Model$Companion$getFriendChanges$1$1.smali
index a897c99cce..7771e80abc 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
 
-    sget-object v0, Lrx/internal/a/ba$a;->bKN:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKX:Lrx/internal/a/ba;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
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 19ef93d9eb..0de8f2d243 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
@@ -87,7 +87,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -305,7 +305,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object 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 02604ecebd..7a94e982ad 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, 0x7f1207f9
+    const p2, 0x7f12081d
 
     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 039cda21a5..b6f89a0ad2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cd547ff15b..4dbc12a237 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9f67674ea3..6142f73245 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, 0x7f1207f9
+    const v0, 0x7f12081d
 
     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 44d8ddc704..4cb7358b5c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1970fed08e..a7d833fc0a 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, 0x7f0a0329
+    const v0, 0x7f0a0331
 
     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, 0x7f0a032c
+    const v0, 0x7f0a0334
 
     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, 0x7f0a032a
+    const v0, 0x7f0a0332
 
     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, 0x7f0a0327
+    const v0, 0x7f0a032f
 
     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, 0x7f0a0328
+    const v0, 0x7f0a0330
 
     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, 0x7f1207f2
+    const p1, 0x7f120816
 
     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, 0x7f120805
+    const v2, 0x7f120829
 
     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, 0x7f1207f8
+    const p1, 0x7f12081c
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -891,7 +891,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f10005e
+    const v4, 0x7f10005f
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -915,7 +915,7 @@
     :cond_1
     if-nez v2, :cond_2
 
-    const p1, 0x7f120804
+    const p1, 0x7f120828
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
 
@@ -934,7 +934,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f10005f
+    const v4, 0x7f100060
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -1033,7 +1033,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0123
+    const v0, 0x7f0d0129
 
     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 db3759ea6a..ee6f51e8ae 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, 0x7f0a030d
+    const p2, 0x7f0a0311
 
     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, 0x7f0a030e
+    const p2, 0x7f0a0312
 
     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, 0x7f0a02ff
+    const p2, 0x7f0a0303
 
     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, 0x7f0a02f6
+    const p2, 0x7f0a02fa
 
     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, 0x7f0a02ef
+    const p2, 0x7f0a02f3
 
     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, 0x7f0a07c9
+    const p2, 0x7f0a07f2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.smali
index fc59d94d83..9f5aaac5c9 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, 0x7f0d0124
+    const p2, 0x7f0d012a
 
     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$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$Model$Companion.smali
index a3f734c4b4..a28fc610f7 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 f20857ee57..082a5105bb 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 0x7f0a0447
+    .packed-switch 0x7f0a044f
         :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 25b38749dc..fdaa904e5d 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, 0x7f0a0447
+    const v0, 0x7f0a044f
 
     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 0b29595718..e1a23a9e6c 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, 0x7f120db6
+    const v0, 0x7f120deb
 
     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$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBoundOrOnResume$1.smali
index 588766a2c4..1f8381daba 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 011046109f..e3222fbd98 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,12 +77,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f12038f
+    const p1, 0x7f1203b4
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1203be
+    const p1, 0x7f1203e3
 
     :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 c402092575..0f0715a398 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -849,12 +849,12 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f1203bd
+    const v0, 0x7f1203e2
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f12038e
+    const v0, 0x7f1203b3
 
     :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, 0x7f12061f
+    const v4, 0x7f120643
 
-    const v5, 0x7f12038d
+    const v5, 0x7f1203b2
 
     if-eqz v3, :cond_4
 
-    const v3, 0x7f12061f
+    const v3, 0x7f120643
 
     goto :goto_2
 
     :cond_4
-    const v3, 0x7f12038d
+    const v3, 0x7f1203b2
 
     :goto_2
     invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V
@@ -986,7 +986,7 @@
     goto :goto_3
 
     :cond_5
-    const v4, 0x7f12038d
+    const v4, 0x7f1203b2
 
     :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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
 
@@ -1386,7 +1386,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d00d2
+    const v1, 0x7f0d00d8
 
     const/4 v2, 0x0
 
@@ -1452,12 +1452,12 @@
 
     if-eqz v5, :cond_0
 
-    const v5, 0x7f1204eb
+    const v5, 0x7f120510
 
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f1204ea
+    const v5, 0x7f12050f
 
     :goto_0
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
@@ -1482,7 +1482,7 @@
 
     invoke-static {v3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1204ec
+    const v0, 0x7f120511
 
     const/4 v2, 0x1
 
@@ -1892,7 +1892,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO: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, 0x7f12068b
+    const v0, 0x7f1206af
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String;
 
@@ -2012,7 +2012,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f10002a
+    const v2, 0x7f10002b
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -2035,7 +2035,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f100027
+    const v3, 0x7f100028
 
     div-int/2addr p1, v1
 
@@ -2051,7 +2051,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f100025
+    const v3, 0x7f100026
 
     div-int/2addr p1, v2
 
@@ -2067,7 +2067,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ba
+    const v0, 0x7f0d01c6
 
     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 a84cf9a1c0..e472b7eb5f 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, 0x7f120513
+    const v2, 0x7f120538
 
     const/4 v4, 0x0
 
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 e462303ec1..c6579b2a75 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 97eb9946fa..19bab76713 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
@@ -797,7 +797,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -889,7 +889,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 f4a286af7c..ca1caf5ed8 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 ec40109bfb..ebb775f3fa 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 313b5bc976..b29a2abb60 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -276,9 +276,9 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f120bf6
+    const v0, 0x7f120c28
 
-    const v6, 0x7f120bf6
+    const v6, 0x7f120c28
 
     goto :goto_1
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_2
 
-    const v0, 0x7f120c02
+    const v0, 0x7f120c34
 
-    const v7, 0x7f120c02
+    const v7, 0x7f120c34
 
     goto :goto_2
 
@@ -370,12 +370,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0800f0
+    const p1, 0x7f0800f1
 
     return p1
 
     :cond_0
-    const p1, 0x7f0800f5
+    const p1, 0x7f0800f9
 
     return p1
 .end method
@@ -710,16 +710,16 @@
 
     if-eqz p3, :cond_0
 
-    const p1, 0x7f0801de
+    const p1, 0x7f0801e9
 
-    const v3, 0x7f0801de
+    const v3, 0x7f0801e9
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f0801dc
+    const p1, 0x7f0801e7
 
-    const v3, 0x7f0801dc
+    const v3, 0x7f0801e7
 
     :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 6904e6bfcc..e857b22b94 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 abbc43ab18..031a7f2ecd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 01722a6093..60be35011a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 aff64b82d7..ab2a95f408 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f66c25cf94..b4156bdb55 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 053f9da219..1ccd61d166 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -95,7 +95,7 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    const v1, 0x7f120a55
+    const v1, 0x7f120a8a
 
     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 61c5466d54..8f4eeb9516 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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 591a07b69d..31c31fc265 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 175e68b0bc..c1e9c57c0a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b5e352bcca..557c1bbf50 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -408,16 +408,16 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0803bc
+    const p1, 0x7f0803c9
 
-    const v1, 0x7f0803bc
+    const v1, 0x7f0803c9
 
     goto/16 :goto_0
 
     :cond_0
-    const p1, 0x7f0803bd
+    const p1, 0x7f0803ca
 
-    const v1, 0x7f0803bd
+    const v1, 0x7f0803ca
 
     goto/16 :goto_0
 
@@ -438,16 +438,16 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f080323
+    const p1, 0x7f08032f
 
-    const v1, 0x7f080323
+    const v1, 0x7f08032f
 
     goto/16 :goto_0
 
     :cond_2
-    const p1, 0x7f080324
+    const p1, 0x7f080330
 
-    const v1, 0x7f080324
+    const v1, 0x7f080330
 
     goto/16 :goto_0
 
@@ -489,16 +489,16 @@
 
     if-eqz p1, :cond_5
 
-    const p1, 0x7f0802a7
+    const p1, 0x7f0802b3
 
-    const v1, 0x7f0802a7
+    const v1, 0x7f0802b3
 
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f0802a8
+    const p1, 0x7f0802b4
 
-    const v1, 0x7f0802a8
+    const v1, 0x7f0802b4
 
     goto :goto_0
 
@@ -521,16 +521,16 @@
 
     if-eqz p1, :cond_7
 
-    const p1, 0x7f08029e
+    const p1, 0x7f0802aa
 
-    const v1, 0x7f08029e
+    const v1, 0x7f0802aa
 
     goto :goto_0
 
     :cond_7
-    const p1, 0x7f08029f
+    const p1, 0x7f0802ab
 
-    const v1, 0x7f08029f
+    const v1, 0x7f0802ab
 
     goto :goto_0
 
@@ -553,16 +553,16 @@
 
     if-eqz p1, :cond_9
 
-    const p1, 0x7f0802a0
+    const p1, 0x7f0802ac
 
-    const v1, 0x7f0802a0
+    const v1, 0x7f0802ac
 
     goto :goto_0
 
     :cond_9
-    const p1, 0x7f0802a1
+    const p1, 0x7f0802ad
 
-    const v1, 0x7f0802a1
+    const v1, 0x7f0802ad
 
     goto :goto_0
 
@@ -585,16 +585,16 @@
 
     if-eqz p1, :cond_b
 
-    const p1, 0x7f0802a2
+    const p1, 0x7f0802ae
 
-    const v1, 0x7f0802a2
+    const v1, 0x7f0802ae
 
     goto :goto_0
 
     :cond_b
-    const p1, 0x7f0802a3
+    const p1, 0x7f0802af
 
-    const v1, 0x7f0802a3
+    const v1, 0x7f0802af
 
     goto :goto_0
 
@@ -610,7 +610,7 @@
 
     const/4 v2, 0x0
 
-    const v3, 0x7f080400
+    const v3, 0x7f08040e
 
     const/4 v4, 0x0
 
@@ -1022,7 +1022,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00d8
+    const v0, 0x7f0d00de
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item.smali
index 087e58d5b2..9578799411 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, 0x7f080135
+    const p2, 0x7f080139
 
     goto :goto_1
 
     :cond_1
-    const p2, 0x7f080133
+    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 aa9c3d0371..d32d00aa02 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, 0x7f080234
+    const p1, 0x7f080240
 
     return p1
 
@@ -141,7 +141,7 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f080231
+    const p1, 0x7f08023c
 
     return p1
 
@@ -158,7 +158,7 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f080235
+    const p1, 0x7f080241
 
     return p1
 
@@ -175,7 +175,7 @@
 
     if-nez p1, :cond_3
 
-    const p1, 0x7f080232
+    const p1, 0x7f08023d
 
     return p1
 
@@ -194,12 +194,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0600ca
+    const p1, 0x7f0600cb
 
     return p1
 
     :cond_0
-    const p1, 0x7f0600c5
+    const p1, 0x7f0600c6
 
     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 37e7ecd0bc..91a872c9f7 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
@@ -268,7 +268,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f080133
+    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 caef5c7078..697c8557b2 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
@@ -372,7 +372,7 @@
 
     add-int/lit8 p1, p1, 0x1
 
-    const v0, 0x7f120b99
+    const v0, 0x7f120bca
 
     invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -414,12 +414,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f08016b
+    const p1, 0x7f080176
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080170
+    const p1, 0x7f08017b
 
     :goto_0
     invoke-static {v0, p1}, 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$ItemChannelText.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
index a10f3e9303..49db8ddb88 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
@@ -188,7 +188,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f080220
+    const p1, 0x7f08022b
 
     return p1
 
@@ -199,7 +199,7 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f08021e
+    const p1, 0x7f080229
 
     return p1
 
@@ -210,12 +210,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f08021f
+    const p1, 0x7f08022a
 
     return p1
 
     :cond_2
-    const p1, 0x7f08021a
+    const p1, 0x7f080225
 
     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, 0x7f0600ba
+    const v0, 0x7f0600bb
 
     if-eqz p2, :cond_0
 
@@ -316,7 +316,7 @@
 
     if-eqz p2, :cond_1
 
-    const p1, 0x7f0600ca
+    const p1, 0x7f0600cb
 
     return p1
 
@@ -330,7 +330,7 @@
     return v0
 
     :cond_2
-    const p1, 0x7f0600c5
+    const p1, 0x7f0600c6
 
     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 7a24cbacdb..0c0709f01a 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
@@ -268,26 +268,26 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f0803c7
+    const p2, 0x7f0803d4
 
     goto :goto_0
 
     :cond_0
     if-nez v1, :cond_1
 
-    const p2, 0x7f080218
+    const p2, 0x7f080223
 
     goto :goto_0
 
     :cond_1
     if-eqz v3, :cond_2
 
-    const p2, 0x7f080225
+    const p2, 0x7f080230
 
     goto :goto_0
 
     :cond_2
-    const p2, 0x7f080222
+    const p2, 0x7f08022d
 
     :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$ItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
index 57e690c0e2..47f88b77d6 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
@@ -182,17 +182,17 @@
 
     if-eqz v0, :cond_3
 
-    const v0, 0x7f120cf2
+    const v0, 0x7f120d24
 
     if-eq p1, v0, :cond_2
 
-    const p2, 0x7f12119c
+    const p2, 0x7f121224
 
     const/4 v0, 0x0
 
     if-eq p1, p2, :cond_1
 
-    const p2, 0x7f121372
+    const p2, 0x7f1213fe
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
index 0e09b65c70..5a500de11e 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
@@ -113,7 +113,7 @@
 .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
     .locals 7
 
-    const v0, 0x7f1211fd
+    const v0, 0x7f121285
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -169,9 +169,9 @@
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
-    sget-object p1, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object p1, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide p1, Lcom/discord/app/e;->vd:J
+    sget-wide p1, Lcom/discord/app/e;->vc:J
 
     invoke-static {p1, p2}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
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 8df5a782ed..bd20435a86 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9d50534344..1859873308 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0921bbe428..8623d54091 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 07be46df16..fe7a2296c4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a4e3802c55..b3083c4e8e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3f86af699c..751893d919 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 763301b7dc..d22dc35d8d 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, 0x7f0d00e1
+    const p2, 0x7f0d00e7
 
     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, 0x7f0d00db
+    const p2, 0x7f0d00e1
 
     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, 0x7f0d00e2
+    const p2, 0x7f0d00e8
 
     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, 0x7f0d00e0
+    const p2, 0x7f0d00e6
 
     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, 0x7f0d00df
+    const p2, 0x7f0d00e5
 
     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, 0x7f0d00dd
+    const p2, 0x7f0d00e3
 
     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, 0x7f0d00e4
+    const p2, 0x7f0d00ea
 
     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, 0x7f0d00de
+    const p2, 0x7f0d00e4
 
     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, 0x7f0d00dc
+    const p2, 0x7f0d00e2
 
     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 438c86c9d3..ee36078439 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 0cb0d14ba4..70fc0162f4 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, 0x7f12122f
+    const v0, 0x7f1212b7
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -340,7 +340,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f120bdb
+    const v0, 0x7f120c0d
 
     const/4 v1, 0x1
 
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 3bc9b3e9f0..41cb1f5704 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9a2d8bfc8e..bce9cbaf3f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$2.smali
index 06e4dda384..d4fff26887 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d6df12fffe..b2d6d2fb5d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c7c29dc3ff..6d387556f4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 063487efc3..336bf7e09c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b1e42109f8..f72b18bede 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 51bc782a9a..7c788ab6e6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -898,7 +898,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120562
+    const p1, 0x7f120587
 
     goto :goto_0
 
@@ -911,7 +911,7 @@
 
     if-nez p2, :cond_1
 
-    const p1, 0x7f1203bd
+    const p1, 0x7f1203e2
 
     goto :goto_0
 
@@ -922,12 +922,12 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f120561
+    const p1, 0x7f120586
 
     goto :goto_0
 
     :cond_2
-    const p1, 0x7f120f78
+    const p1, 0x7f120fff
 
     :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, 0x7f0d00e3
+    const v0, 0x7f0d00e9
 
     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 1c2585e9be..df1a58dac9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7a80f152d8..af9ffccd8f 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 7acda8147d..695bd31152 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 eb4267a900..5faeef2535 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e13aafe157..b09ef30a8d 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 3594c807fa..bc0e50b7b5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 61dfeebc07..b77b1c0c63 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 720bf71f96..b87718b4db 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, 0x7f0a0808
+    const v0, 0x7f0a0837
 
     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, 0x7f0a0804
+    const v0, 0x7f0a0833
 
     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, 0x7f0a0806
+    const v0, 0x7f0a0835
 
     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, 0x7f0a0809
+    const v0, 0x7f0a0838
 
     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, 0x7f0a080a
+    const v0, 0x7f0a0839
 
     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, 0x7f0a0807
+    const v0, 0x7f0a0836
 
     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, 0x7f0a080b
+    const v0, 0x7f0a083a
 
     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, 0x7f0a080c
+    const v0, 0x7f0a083b
 
     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, 0x7f0a0805
+    const v0, 0x7f0a0834
 
     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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v2, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     new-array v2, v6, [Ljava/lang/Object;
 
@@ -1040,7 +1040,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d4
+    const v0, 0x7f0d01e0
 
     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 0f511429e1..9990e9aca5 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, 0x7f0a0841
+    const p1, 0x7f0a0871
 
     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, 0x7f0a0840
+    const p1, 0x7f0a0870
 
     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, 0x7f080125
+    const p2, 0x7f080129
 
     const/4 v0, 0x4
 
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 87254286c2..ca67ef3796 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, 0x7f0d0110
+    const p2, 0x7f0d0116
 
     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/memberlist/PrivateChannelMembersListModelProvider.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
index 217aeabfea..d0c8011cd3 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;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -435,7 +435,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    const v1, 0x7f120b99
+    const v1, 0x7f120bca
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -525,7 +525,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$RxOnScrollListener.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$RxOnScrollListener.smali
index f9fc02c8cc..ccd60f8103 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy: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 af07b98951..db362191db 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 19ac0889ec..dc2d2b98d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1afe8ce2a4..5602699dd8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 852d8017be..e87a84060a 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList.smali
@@ -348,7 +348,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -356,7 +356,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ak;->Jw()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
 
     move-result-object v1
 
@@ -482,7 +482,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c8
+    const v0, 0x7f0d00ce
 
     return v0
 .end method
@@ -633,7 +633,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()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 dddd949e72..519f84c70d 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
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 8c9c8486bb..f9f684bfa5 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cf1165c548..1cfc81cb6f 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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-static {}, Lrx/internal/a/ak;->Jw()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
 
     move-result-object v2
 
@@ -117,11 +117,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IR()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IU()Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -129,7 +129,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -267,7 +267,7 @@
 
     :catch_0
     :try_start_2
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v3, "Failed to cast header"
 
@@ -314,7 +314,7 @@
 .method public final getHeaderLayout(I)I
     .locals 0
 
-    const p1, 0x7f0d00c9
+    const p1, 0x7f0d00cf
 
     return p1
 .end method
@@ -411,7 +411,7 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d00c9
+    const v2, 0x7f0d00cf
 
     const/4 v3, 0x0
 
@@ -564,7 +564,7 @@
 
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading;
 
-    const p2, 0x7f0d00ca
+    const p2, 0x7f0d00d0
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -586,7 +586,7 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;
 
-    const p2, 0x7f0d00cb
+    const p2, 0x7f0d00d1
 
     invoke-virtual {v0, p2}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
@@ -601,7 +601,7 @@
     :cond_2
     new-instance p1, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;
 
-    const p2, 0x7f0d00c9
+    const p2, 0x7f0d00cf
 
     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/ChannelMembersListViewHolderLoading.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
index 47877a3f2d..5f7a683454 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, 0x7f0a07f3
+    const v0, 0x7f0a0822
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 52bcec457e..5d57bd2692 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, 0x7f120e5c
+    const v2, 0x7f120ecb
 
     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 778ed1b6ef..61559e8c99 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
@@ -197,7 +197,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v4, 0x7f0402a0
+    const v4, 0x7f0402a1
 
     invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
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 8fa5f3c10e..56f5ce4678 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, 0x7f12067e
+    const v2, 0x7f1206a2
 
     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 bcba056d8b..9864843d50 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, 0x7f0a0275
+    const v0, 0x7f0a0278
 
     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, 0x7f0a0272
+    const v0, 0x7f0a0275
 
     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, 0x7f0a0273
+    const v0, 0x7f0a0276
 
     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, 0x7f0a0274
+    const v0, 0x7f0a0277
 
     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, 0x7f0d01bd
+    const v0, 0x7f0d01c9
 
     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 b27e1e186f..f9a8061df8 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 b96a9a3f2f..2d63557530 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 ec78daff16..3ef9d6583d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9f3d96861e..f1807405be 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, 0x7f0d00e6
+    const v0, 0x7f0d00ec
 
     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 3c924a8c0c..bb12a4f533 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, 0x7f0d00e8
+    const v3, 0x7f0d00ee
 
     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 248430184d..9afb16131a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fae89305a4..a3d8fda897 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -381,7 +381,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b66
+    const v1, 0x7f120b97
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -389,7 +389,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120b65
+    const v1, 0x7f120b96
 
     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, 0x7f0d00e7
+    const v0, 0x7f0d00ed
 
     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 0008368d96..90c98c2a62 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, 0x7f0d00eb
+    const v1, 0x7f0d00f1
 
     const/4 v2, 0x1
 
@@ -54,7 +54,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f0a0512
+    const v0, 0x7f0a051d
 
     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, 0x7f121189
+    const v2, 0x7f121211
 
     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 68f516fc68..13bfde797d 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, 0x7f0d00eb
+    const v1, 0x7f0d00f1
 
     const v2, 0x7f0a0037
 
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 56dd98cafc..88d5fc94a4 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, 0x7f0d00eb
+    const v1, 0x7f0d00f1
 
     const v2, 0x7f0a0037
 
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 93b0e9d557..156c2420e1 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, 0x7f0a0512
+    const v0, 0x7f0a051d
 
     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, 0x7f12118a
+    const v1, 0x7f121212
 
     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 70ec63a7c7..a73e5d43a2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d855387ac0..aeea3b5907 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;->AU()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->AX()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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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;->aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX: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 f543fd5088..97968a481f 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, 0x7f120270
+    const v2, 0x7f120272
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -239,9 +239,9 @@
 
     new-instance v5, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;
 
-    const v6, 0x7f0802c6
+    const v6, 0x7f0802d2
 
-    const v7, 0x7f120273
+    const v7, 0x7f120275
 
     invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;-><init>(II)V
 
@@ -251,9 +251,9 @@
 
     new-instance v5, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;
 
-    const v6, 0x7f080276
+    const v6, 0x7f080282
 
-    const v7, 0x7f120271
+    const v7, 0x7f120273
 
     invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;-><init>(II)V
 
@@ -267,9 +267,9 @@
 
     new-instance v7, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;
 
-    const v8, 0x7f0801cc
+    const v8, 0x7f0801d7
 
-    const v9, 0x7f12026e
+    const v9, 0x7f120270
 
     invoke-direct {v7, v8, v9}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;-><init>(II)V
 
@@ -291,7 +291,7 @@
 
     invoke-virtual {v4, v6}, Landroidx/appcompat/widget/AppCompatEditText;->setFocusableInTouchMode(Z)V
 
-    iget-object v5, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXi:Landroid/widget/LinearLayout;
+    iget-object v5, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroid/widget/LinearLayout;
 
     new-instance v6, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;
 
@@ -311,7 +311,7 @@
 
     check-cast v4, Lcom/lytefast/flexinput/managers/a;
 
-    iput-object v4, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Lcom/lytefast/flexinput/managers/a;
+    iput-object v4, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;->getContentResolver()Landroid/content/ContentResolver;
 
@@ -326,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, 0x7f0a02b2
+    const v4, 0x7f0a02b5
 
     invoke-virtual {v0, v4}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
 
@@ -370,7 +370,7 @@
 
     invoke-virtual {v4}, Landroidx/fragment/app/FragmentTransaction;->commit()I
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
 
     invoke-virtual {v1, v2}, Landroidx/appcompat/widget/AppCompatImageButton;->setVisibility(I)V
 
@@ -442,7 +442,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bf()Z
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bi()Z
 
     move-result v0
 
@@ -466,7 +466,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXi:Landroid/widget/LinearLayout;
+    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroid/widget/LinearLayout;
 
     invoke-virtual {v2}, Landroid/widget/LinearLayout;->getChildCount()I
 
@@ -474,7 +474,7 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXi:Landroid/widget/LinearLayout;
+    iget-object v2, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroid/widget/LinearLayout;
 
     invoke-virtual {v2, v1}, Landroid/widget/LinearLayout;->getChildAt(I)Landroid/view/View;
 
@@ -489,7 +489,7 @@
     :cond_0
     if-eqz p1, :cond_1
 
-    iget-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {p1}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
@@ -512,7 +512,7 @@
 
     if-eqz v0, :cond_0
 
-    iput-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Lcom/lytefast/flexinput/InputListener;
+    iput-object p1, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXA: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 2f54bc921d..2524153a4c 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
@@ -242,7 +242,7 @@
 
     iget-object v2, p0, Lcom/discord/widgets/chat/input/WidgetChatInputCommandsAdapter$Item;->itemName:Landroid/widget/TextView;
 
-    const v3, 0x7f060110
+    const v3, 0x7f060111
 
     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 b98875061f..3e529504c8 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, 0x7f0d00ea
+    const p2, 0x7f0d00f0
 
     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 331b4da787..3f9276b8e2 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputCommandsModel.smali
@@ -807,7 +807,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -891,7 +891,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v1
 
@@ -907,7 +907,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -954,7 +954,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1054,7 +1054,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     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 e1363ddb3f..a65cb8892d 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 e5c2439625..f0ae52d07b 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-object p1, Lrx/Emitter$a;->bFX:Lrx/Emitter$a;
+    sget-object p1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
 
     invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
 
@@ -929,7 +929,7 @@
     invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
 
     :cond_0
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -937,7 +937,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 226fcf7123..0f01ecd66b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -111,7 +111,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f120546
+    const p1, 0x7f12056b
 
     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, 0x7f120c3b
+    const p1, 0x7f120c6d
 
     invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -135,7 +135,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f12119f
+    const p2, 0x7f121227
 
     invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -229,7 +229,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -379,7 +379,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -399,7 +399,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -837,7 +837,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f121351
+    const v0, 0x7f1213dd
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -846,7 +846,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f121347
+    const v0, 0x7f1213d3
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -883,7 +883,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f120925
+    const v0, 0x7f12095a
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -892,7 +892,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f120923
+    const v0, 0x7f120958
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -907,7 +907,7 @@
     return-object p1
 
     :cond_2
-    const v0, 0x7f120922
+    const v0, 0x7f120957
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -922,7 +922,7 @@
     return-object p1
 
     :cond_3
-    const v0, 0x7f120924
+    const v0, 0x7f120959
 
     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 602e067561..2afd3ececc 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -110,7 +110,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v3, Lkotlin/jvm/internal/h;->bhz:Lkotlin/jvm/internal/h;
+    sget-object v3, Lkotlin/jvm/internal/h;->bhJ:Lkotlin/jvm/internal/h;
 
     invoke-virtual {v3}, Lkotlin/jvm/internal/h;->getMAX_VALUE()F
 
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 db307fc1d3..8ba1e1c173 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bd29bd4447..b5252b348b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     const/4 p1, 0x0
 
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 7602b302b8..c4bbf44c81 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, 0x7f1203c4
+    const p2, 0x7f1203e9
 
     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, 0x7f12056c
+    const p2, 0x7f120591
 
     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, 0x7f120c3b
+    const p2, 0x7f120c6d
 
     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 aa574630ef..4a4707d816 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
@@ -31,13 +31,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;)V
     .locals 2
 
-    const v0, 0x7f0d0034
+    const v0, 0x7f0d0035
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
     iget-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$EmojiViewHolder;->itemView:Landroid/view/View;
 
-    const v1, 0x7f0a02b3
+    const v1, 0x7f0a02b6
 
     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 25974f52ff..b69e8405d7 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, 0x7f1210e9
+    const p1, 0x7f121170
 
     return p1
 
     :pswitch_0
-    const p1, 0x7f120580
+    const p1, 0x7f1205a5
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f12057a
+    const p1, 0x7f12059f
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f12057b
+    const p1, 0x7f1205a0
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f120581
+    const p1, 0x7f1205a6
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f12057e
+    const p1, 0x7f1205a3
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f120582
+    const p1, 0x7f1205a7
 
     return p1
 
     :pswitch_6
-    const p1, 0x7f120579
+    const p1, 0x7f12059e
 
     return p1
 
     :pswitch_7
-    const p1, 0x7f12057c
+    const p1, 0x7f1205a1
 
     return p1
 
     :pswitch_8
-    const p1, 0x7f12057d
+    const p1, 0x7f1205a2
 
     return p1
 
     :pswitch_9
-    const p1, 0x7f12057f
+    const p1, 0x7f1205a4
 
     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 bdaa742874..fcc046f9ad 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
@@ -31,13 +31,13 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0035
+    const v0, 0x7f0d0036
 
     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/input/emoji/WidgetChatInputEmojiAdapter$HeaderViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a038b
+    const v0, 0x7f0a0393
 
     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 c6be2fa9e8..4860d538a3 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-object v1, Lrx/Emitter$a;->bFZ:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGj:Lrx/Emitter$a;
 
     invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
 
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 0be2bdf7c0..b71cc9c654 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,52 +206,52 @@
 
     packed-switch p0, :pswitch_data_0
 
-    const p0, 0x7f040384
-
-    return p0
-
-    :pswitch_0
-    const p0, 0x7f04038a
-
-    return p0
-
-    :pswitch_1
     const p0, 0x7f040385
 
     return p0
 
-    :pswitch_2
+    :pswitch_0
     const p0, 0x7f04038b
 
     return p0
 
-    :pswitch_3
-    const p0, 0x7f040388
-
-    return p0
-
-    :pswitch_4
-    const p0, 0x7f04038c
-
-    return p0
-
-    :pswitch_5
-    const p0, 0x7f040383
-
-    return p0
-
-    :pswitch_6
+    :pswitch_1
     const p0, 0x7f040386
 
     return p0
 
-    :pswitch_7
+    :pswitch_2
+    const p0, 0x7f04038c
+
+    return p0
+
+    :pswitch_3
+    const p0, 0x7f040389
+
+    return p0
+
+    :pswitch_4
+    const p0, 0x7f04038d
+
+    return p0
+
+    :pswitch_5
+    const p0, 0x7f040384
+
+    return p0
+
+    :pswitch_6
     const p0, 0x7f040387
 
     return p0
 
+    :pswitch_7
+    const p0, 0x7f040388
+
+    return p0
+
     :pswitch_8
-    const p0, 0x7f040389
+    const p0, 0x7f04038a
 
     return p0
 
@@ -284,7 +284,7 @@
 
     sget-object v0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->state:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -822,7 +822,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00e9
+    const v0, 0x7f0d00ef
 
     return v0
 .end method
@@ -1037,12 +1037,12 @@
     :cond_1
     if-eqz v1, :cond_2
 
-    const v0, 0x7f120eb8
+    const v0, 0x7f120f37
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f120ebe
+    const v0, 0x7f120f3d
 
     :goto_0
     invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
@@ -1051,12 +1051,12 @@
 
     if-eqz v1, :cond_3
 
-    const v1, 0x7f120eb9
+    const v1, 0x7f120f38
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120ebf
+    const v1, 0x7f120f3e
 
     :goto_1
     invoke-virtual {p0, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
@@ -1065,7 +1065,7 @@
 
     const-string v3, "Emoji Picker Popout"
 
-    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
+    invoke-static {p1, v2, v0, v1, v3}, Lcom/discord/dialogs/d;->a(Landroidx/fragment/app/FragmentManager;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 
@@ -1080,7 +1080,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120583
+    const v0, 0x7f1205a8
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -1154,7 +1154,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->emojisRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a02b8
+    const v0, 0x7f0a02bb
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1164,7 +1164,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->tabLayout:Lcom/google/android/material/tabs/TabLayout;
 
-    const v0, 0x7f0a02b7
+    const v0, 0x7f0a02ba
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1174,7 +1174,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchButton:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a02b5
+    const v0, 0x7f0a02b8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1184,7 +1184,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->backspaceButton:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a02b9
+    const v0, 0x7f0a02bc
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1192,7 +1192,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->emojiSearchBar:Landroid/view/View;
 
-    const v0, 0x7f0a05b8
+    const v0, 0x7f0a05cd
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1202,7 +1202,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchInput:Landroid/widget/EditText;
 
-    const v0, 0x7f0a05ae
+    const v0, 0x7f0a05c3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1210,7 +1210,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->searchBackButton:Landroid/view/View;
 
-    const v0, 0x7f0a05b2
+    const v0, 0x7f0a05c7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Companion.smali
new file mode 100644
index 0000000000..af854b2c23
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Companion.smali
@@ -0,0 +1,32 @@
+.class public final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Companion;
+.super Ljava/lang/Object;
+.source "ViewEmbedGameInvite.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+.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/chat/list/ViewEmbedGameInvite$Companion;-><init>()V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali
similarity index 67%
rename from com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali
index 5fe8c82317..cd1ec5ee6f 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1.smali
@@ -1,6 +1,6 @@
-.class final synthetic Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1;
+.class final synthetic Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1;
 .super Lkotlin/jvm/internal/j;
-.source "WidgetChatListAdapterItemGameInvite.kt"
+.source "ViewEmbedGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function5;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;->get(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lrx/Observable;
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->get(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -32,14 +32,14 @@
         "+",
         "Landroid/content/pm/PackageInfo;",
         ">;",
-        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;",
+        "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
         ">;"
     }
 .end annotation
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;)V
+.method constructor <init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;)V
     .locals 1
 
     const/4 v0, 0x5
@@ -62,7 +62,7 @@
 .method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    const-class v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
+    const-class v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
 
     invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -74,12 +74,12 @@
 .method public final getSignature()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;"
+    const-string v0, "create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
 
     return-object v0
 .end method
 
-.method public final invoke(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
+.method public final invoke(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -96,7 +96,7 @@
             "+",
             "Landroid/content/pm/PackageInfo;",
             ">;)",
-            "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;"
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
         }
     .end annotation
 
@@ -116,11 +116,11 @@
 
     invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1;->receiver:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1;->receiver:Ljava/lang/Object;
 
     move-object v1, v0
 
-    check-cast v1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
+    check-cast v1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
 
     move-object v2, p1
 
@@ -132,7 +132,7 @@
 
     move-object v6, p5
 
-    invoke-virtual/range {v1 .. v6}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;->create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
+    invoke-static/range {v1 .. v6}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->access$create(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
     move-result-object p1
 
@@ -152,7 +152,7 @@
 
     check-cast p5, Ljava/util/List;
 
-    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1;->invoke(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
+    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1;->invoke(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali
new file mode 100644
index 0000000000..fec681d919
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1.smali
@@ -0,0 +1,192 @@
+.class final synthetic Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1;
+.super Lkotlin/jvm/internal/j;
+.source "ViewEmbedGameInvite.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function7;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->getForShare(Landroid/content/Context;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)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/Function7<",
+        "Lcom/discord/models/domain/ModelUser;",
+        "Ljava/lang/Long;",
+        "Lcom/discord/models/domain/ModelMessage$Activity;",
+        "Lcom/discord/models/domain/ModelPresence$Activity;",
+        "Ljava/util/Map<",
+        "Ljava/lang/Long;",
+        "+",
+        "Lcom/discord/models/domain/ModelUser;",
+        ">;",
+        "Lcom/discord/models/domain/ModelApplication;",
+        "Ljava/util/List<",
+        "+",
+        "Landroid/content/pm/PackageInfo;",
+        ">;",
+        "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+        ">;"
+    }
+.end annotation
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;)V
+    .locals 1
+
+    const/4 v0, 0x7
+
+    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, "createForShare"
+
+    return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+    .locals 1
+
+    const-class v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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, "createForShare(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+
+    return-object v0
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "J",
+            "Lcom/discord/models/domain/ModelMessage$Activity;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;",
+            "Lcom/discord/models/domain/ModelApplication;",
+            "Ljava/util/List<",
+            "+",
+            "Landroid/content/pm/PackageInfo;",
+            ">;)",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+        }
+    .end annotation
+
+    const-string v0, "p1"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p3"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p5"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "p7"
+
+    move-object/from16 v9, p8
+
+    invoke-static {v9, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1;->receiver:Ljava/lang/Object;
+
+    check-cast v1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    move-wide v3, p2
+
+    move-object v6, p5
+
+    move-object/from16 v8, p7
+
+    invoke-static/range {v1 .. v9}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->access$createForShare(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    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;
+    .locals 9
+
+    move-object v1, p1
+
+    check-cast v1, Lcom/discord/models/domain/ModelUser;
+
+    move-object v0, p2
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v2
+
+    move-object v4, p3
+
+    check-cast v4, Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-object v5, p4
+
+    check-cast v5, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-object v6, p5
+
+    check-cast v6, Ljava/util/Map;
+
+    move-object v7, p6
+
+    check-cast v7, Lcom/discord/models/domain/ModelApplication;
+
+    move-object/from16 v8, p7
+
+    check-cast v8, Ljava/util/List;
+
+    move-object v0, p0
+
+    invoke-virtual/range {v0 .. v8}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1;->invoke(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-result-object v0
+
+    return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
new file mode 100644
index 0000000000..396ea10e37
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
@@ -0,0 +1,816 @@
+.class public final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+.super Ljava/lang/Object;
+.source "ViewEmbedGameInvite.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$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/chat/list/ViewEmbedGameInvite$Model$Companion;-><init>()V
+
+    return-void
+.end method
+
+.method public static final synthetic access$create(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 0
+
+    invoke-direct/range {p0 .. p5}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method public static final synthetic access$createForShare(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 0
+
+    invoke-direct/range {p0 .. p8}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->createForShare(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+.method private final create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
+            "Lcom/discord/models/domain/ModelUser;",
+            "Lcom/discord/models/domain/ModelPresence;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;",
+            "Ljava/util/List<",
+            "+",
+            "Landroid/content/pm/PackageInfo;",
+            ">;)",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+        }
+    .end annotation
+
+    if-eqz p3, :cond_0
+
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    move-object v9, v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getUserId()J
+
+    move-result-wide v3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getMessageId()J
+
+    move-result-wide v0
+
+    const/16 v2, 0x16
+
+    ushr-long/2addr v0, v2
+
+    const-wide v5, 0x14aa2cab000L
+
+    add-long/2addr v5, v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v7
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object v8
+
+    move-object v0, p0
+
+    check-cast v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    move-object/from16 v1, p4
+
+    invoke-direct {v0, v1, v9}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->createPartyUsers(Ljava/util/Map;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/util/ArrayList;
+
+    move-result-object v1
+
+    move-object v10, v1
+
+    check-cast v10, Ljava/util/List;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v1
+
+    move-object/from16 v2, p5
+
+    invoke-direct {v0, v1, v2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Z
+
+    move-result v11
+
+    new-instance v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-object v1, v0
+
+    move-object v2, p2
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;-><init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;Z)V
+
+    return-object v0
+.end method
+
+.method private final createForShare(Lcom/discord/models/domain/ModelUser;JLcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/Map;Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "J",
+            "Lcom/discord/models/domain/ModelMessage$Activity;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;",
+            "Lcom/discord/models/domain/ModelApplication;",
+            "Ljava/util/List<",
+            "+",
+            "Landroid/content/pm/PackageInfo;",
+            ">;)",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+        }
+    .end annotation
+
+    move-object/from16 v6, p7
+
+    if-nez v6, :cond_0
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_0
+    new-instance v11, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    move-object v0, p0
+
+    check-cast v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    move-object/from16 v8, p5
+
+    move-object/from16 v1, p6
+
+    invoke-direct {v0, v1, v8}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->createPartyUsers(Ljava/util/Map;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/util/ArrayList;
+
+    move-result-object v1
+
+    move-object v9, v1
+
+    check-cast v9, Ljava/util/List;
+
+    move-object/from16 v1, p8
+
+    invoke-direct {v0, v6, v1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Z
+
+    move-result v10
+
+    move-object v0, v11
+
+    move-object v1, p1
+
+    move-wide v4, p2
+
+    move-object/from16 v6, p7
+
+    move-object/from16 v7, p4
+
+    invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;-><init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;Z)V
+
+    return-object v11
+.end method
+
+.method private final createPartyUsers(Ljava/util/Map;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/util/ArrayList;
+    .locals 10
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/Map<",
+            "Ljava/lang/Long;",
+            "+",
+            "Lcom/discord/models/domain/ModelUser;",
+            ">;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ")",
+            "Ljava/util/ArrayList<",
+            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
+            ">;"
+        }
+    .end annotation
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
+
+    invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Iterable;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_0
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    move-object v3, v0
+
+    check-cast v3, Ljava/util/Collection;
+
+    move-object v5, v2
+
+    check-cast v5, Lcom/discord/models/domain/ModelUser;
+
+    new-instance v2, Lcom/discord/widgets/channels/list/items/CollapsedUser;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x6
+
+    const/4 v9, 0x0
+
+    move-object v4, v2
+
+    invoke-direct/range {v4 .. v9}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    invoke-interface {v3, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+
+    move-result-object p2
+
+    if-eqz p2, :cond_1
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
+
+    move-result p2
+
+    goto :goto_1
+
+    :cond_1
+    const/4 p2, 0x0
+
+    :goto_1
+    invoke-interface {p1}, Ljava/util/Map;->size()I
+
+    move-result p1
+
+    const/4 v2, 0x6
+
+    invoke-static {v2, p2}, Ljava/lang/Math;->min(II)I
+
+    move-result v3
+
+    invoke-static {p1, v3}, Lkotlin/ranges/c;->until(II)Lkotlin/ranges/IntRange;
+
+    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_2
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    move-object v3, p1
+
+    check-cast v3, Lkotlin/a/ab;
+
+    invoke-virtual {v3}, Lkotlin/a/ab;->nextInt()I
+
+    move-result v3
+
+    const/4 v4, 0x5
+
+    if-ne v3, v4, :cond_2
+
+    add-int/lit8 v3, p2, -0x6
+
+    goto :goto_3
+
+    :cond_2
+    const/4 v3, 0x0
+
+    :goto_3
+    sget-object v4, Lcom/discord/widgets/channels/list/items/CollapsedUser;->Companion:Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;
+
+    invoke-virtual {v4, v3}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser;
+
+    move-result-object v3
+
+    invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_3
+    return-object v0
+.end method
+
+.method private final isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Z
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelApplication;",
+            "Ljava/util/List<",
+            "+",
+            "Landroid/content/pm/PackageInfo;",
+            ">;)Z"
+        }
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getGPlayPackageNames()Ljava/util/List;
+
+    move-result-object p1
+
+    move-object v0, p1
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    const/4 v2, 0x0
+
+    if-eqz v0, :cond_2
+
+    check-cast p2, Ljava/lang/Iterable;
+
+    instance-of v0, p2, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    move-object v0, p2
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    :cond_0
+    invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p2
+
+    :cond_1
+    invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/content/pm/PackageInfo;
+
+    iget-object v0, v0, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
+
+    invoke-interface {p1, v0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_1
+
+    return v1
+
+    :cond_2
+    return v2
+.end method
+
+
+# virtual methods
+.method public final get(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lrx/Observable;
+    .locals 7
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "item"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p2}, Lrx/Observable;->bq(Ljava/lang/Object;)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;->getUsers()Lcom/discord/stores/StoreUser;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()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 {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getUserId()J
+
+    move-result-wide v3
+
+    invoke-virtual {v0, v3, v4}, 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;->getGameParty()Lcom/discord/stores/StoreGameParty;
+
+    move-result-object v0
+
+    invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage$Activity;->getPartyId()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {v0, p2}, Lcom/discord/stores/StoreGameParty;->getUsersForPartyId(Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object v4
+
+    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getAndroidPackages()Lcom/discord/stores/StoreAndroidPackages;
+
+    move-result-object p2
+
+    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreAndroidPackages;->getInstalledPackages(Landroid/content/Context;)Lrx/Observable;
+
+    move-result-object v5
+
+    new-instance p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1;
+
+    sget-object p2, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    invoke-direct {p1, p2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$get$1;-><init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;)V
+
+    check-cast p1, Lkotlin/jvm/functions/Function5;
+
+    new-instance p2, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func5$0;
+
+    invoke-direct {p2, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func5$0;-><init>(Lkotlin/jvm/functions/Function5;)V
+
+    move-object v6, p2
+
+    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
+
+    const-string p2, "Observable\n            .\u2026       Companion::create)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "Observable\n            .\u2026  .distinctUntilChanged()"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
+
+.method public final getForShare(Landroid/content/Context;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)Lrx/Observable;
+    .locals 11
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/content/Context;",
+            "Landroid/net/Uri;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+            ">;"
+        }
+    .end annotation
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "Observable.just(null)"
+
+    const/4 v1, 0x0
+
+    if-nez p2, :cond_0
+
+    invoke-static {v1}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_0
+    const-string v2, "application_id"
+
+    invoke-virtual {p2, v2}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_1
+
+    invoke-static {v2}, Lkotlin/text/l;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long;
+
+    move-result-object v2
+
+    goto :goto_0
+
+    :cond_1
+    move-object v2, v1
+
+    :goto_0
+    const-string v3, "party_id"
+
+    invoke-virtual {p2, v3}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v3
+
+    const-string v4, "type"
+
+    invoke-virtual {p2, v4}, Landroid/net/Uri;->getQueryParameter(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_2
+
+    invoke-static {v4}, Lkotlin/text/l;->toIntOrNull(Ljava/lang/String;)Ljava/lang/Integer;
+
+    move-result-object v4
+
+    goto :goto_1
+
+    :cond_2
+    move-object v4, v1
+
+    :goto_1
+    if-eqz v2, :cond_4
+
+    if-eqz v3, :cond_4
+
+    if-eqz v4, :cond_4
+
+    invoke-virtual {p2}, Landroid/net/Uri;->getPath()Ljava/lang/String;
+
+    move-result-object v5
+
+    const-string v6, "/send/activity"
+
+    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v5
+
+    xor-int/lit8 v5, v5, 0x1
+
+    if-eqz v5, :cond_3
+
+    goto :goto_2
+
+    :cond_3
+    new-instance p2, Lcom/discord/models/domain/ModelMessage$Activity;
+
+    invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    invoke-direct {p2, v0, v3}, Lcom/discord/models/domain/ModelMessage$Activity;-><init>(ILjava/lang/String;)V
+
+    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 v3
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v0
+
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    invoke-static {v0}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v4
+
+    invoke-static {p2}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v5
+
+    invoke-static {p3}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object v6
+
+    sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p3}, Lcom/discord/stores/StoreStream$Companion;->getGameParty()Lcom/discord/stores/StoreGameParty;
+
+    move-result-object p3
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage$Activity;->getPartyId()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p3, p2}, Lcom/discord/stores/StoreGameParty;->getUsersForPartyId(Ljava/lang/String;)Lrx/Observable;
+
+    move-result-object v7
+
+    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getApplication()Lcom/discord/stores/StoreApplication;
+
+    move-result-object p2
+
+    invoke-virtual {p2, v2}, Lcom/discord/stores/StoreApplication;->get(Ljava/lang/Long;)Lrx/Observable;
+
+    move-result-object v8
+
+    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getAndroidPackages()Lcom/discord/stores/StoreAndroidPackages;
+
+    move-result-object p2
+
+    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreAndroidPackages;->getInstalledPackages(Landroid/content/Context;)Lrx/Observable;
+
+    move-result-object v9
+
+    new-instance p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1;
+
+    sget-object p2, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    invoke-direct {p1, p2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion$getForShare$1;-><init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;)V
+
+    check-cast p1, Lkotlin/jvm/functions/Function7;
+
+    new-instance p2, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0;
+
+    invoke-direct {p2, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0;-><init>(Lkotlin/jvm/functions/Function7;)V
+
+    move-object v10, p2
+
+    check-cast v10, Lrx/functions/Func7;
+
+    invoke-static/range {v3 .. v10}, 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            .\u2026ompanion::createForShare)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object p1
+
+    const-string p2, "Observable\n            .\u2026  .distinctUntilChanged()"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+
+    :cond_4
+    :goto_2
+    sget-object p1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
+
+    invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string p3, "Malformed Share URI: "
+
+    invoke-virtual {p3, p2}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
+    const/4 p3, 0x2
+
+    invoke-static {p1, p2, v1, p3, v1}, Lcom/discord/utilities/logging/Logger;->w$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+
+    invoke-static {v1}, Lrx/Observable;->bq(Ljava/lang/Object;)Lrx/Observable;
+
+    move-result-object p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
new file mode 100644
index 0000000000..7680a2495b
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
@@ -0,0 +1,1014 @@
+.class public final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+.super Ljava/lang/Object;
+.source "ViewEmbedGameInvite.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "Model"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+
+# instance fields
+.field private final activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+.field private final application:Lcom/discord/models/domain/ModelApplication;
+
+.field private final canJoin:Z
+
+.field private final creationTime:J
+
+.field private final creatorId:J
+
+.field private final gPlayPackageNames:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final isGameInstalled:Z
+
+.field private final isInParty:Z
+
+.field private final meUser:Lcom/discord/models/domain/ModelUser;
+
+.field private final messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+.field private final users:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;Z)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "JJ",
+            "Lcom/discord/models/domain/ModelApplication;",
+            "Lcom/discord/models/domain/ModelMessage$Activity;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
+            ">;Z)V"
+        }
+    .end annotation
+
+    const-string v0, "meUser"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "application"
+
+    invoke-static {p6, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "messageActivity"
+
+    invoke-static {p7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "users"
+
+    invoke-static {p9, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    iput-wide p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    iput-wide p4, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    iput-object p6, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    iput-object p7, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    iput-object p8, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    iput-object p9, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    iput-boolean p10, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    instance-of p2, p1, Ljava/util/Collection;
+
+    const/4 p3, 0x0
+
+    const/4 p4, 0x1
+
+    if-eqz p2, :cond_0
+
+    move-object p2, p1
+
+    check-cast p2, Ljava/util/Collection;
+
+    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p2
+
+    if-nez p2, :cond_3
+
+    :cond_0
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :cond_1
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_3
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object p2
+
+    check-cast p2, Lcom/discord/widgets/channels/list/items/CollapsedUser;
+
+    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide p5
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide p7
+
+    cmp-long p2, p5, p7
+
+    if-nez p2, :cond_2
+
+    const/4 p2, 0x1
+
+    goto :goto_0
+
+    :cond_2
+    const/4 p2, 0x0
+
+    :goto_0
+    if-eqz p2, :cond_1
+
+    const/4 p1, 0x1
+
+    goto :goto_1
+
+    :cond_3
+    const/4 p1, 0x0
+
+    :goto_1
+    iput-boolean p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isInParty:Z
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    if-eqz p1, :cond_4
+
+    const/4 p2, 0x2
+
+    invoke-virtual {p1, p2}, Lcom/discord/models/domain/ModelPresence$Activity;->hasFlag(I)Z
+
+    move-result p1
+
+    if-ne p1, p4, :cond_4
+
+    const/4 p3, 0x1
+
+    :cond_4
+    iput-boolean p3, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->canJoin:Z
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getGPlayPackageNames()Ljava/util/List;
+
+    move-result-object p1
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->gPlayPackageNames:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 11
+
+    move-object v0, p0
+
+    move/from16 v1, p11
+
+    and-int/lit8 v2, v1, 0x1
+
+    if-eqz v2, :cond_0
+
+    iget-object v2, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser: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-wide v3, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    goto :goto_1
+
+    :cond_1
+    move-wide v3, p2
+
+    :goto_1
+    and-int/lit8 v5, v1, 0x4
+
+    if-eqz v5, :cond_2
+
+    iget-wide v5, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    goto :goto_2
+
+    :cond_2
+    move-wide v5, p4
+
+    :goto_2
+    and-int/lit8 v7, v1, 0x8
+
+    if-eqz v7, :cond_3
+
+    iget-object v7, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    goto :goto_3
+
+    :cond_3
+    move-object/from16 v7, p6
+
+    :goto_3
+    and-int/lit8 v8, v1, 0x10
+
+    if-eqz v8, :cond_4
+
+    iget-object v8, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    goto :goto_4
+
+    :cond_4
+    move-object/from16 v8, p7
+
+    :goto_4
+    and-int/lit8 v9, v1, 0x20
+
+    if-eqz v9, :cond_5
+
+    iget-object v9, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    goto :goto_5
+
+    :cond_5
+    move-object/from16 v9, p8
+
+    :goto_5
+    and-int/lit8 v10, v1, 0x40
+
+    if-eqz v10, :cond_6
+
+    iget-object v10, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    goto :goto_6
+
+    :cond_6
+    move-object/from16 v10, p9
+
+    :goto_6
+    and-int/lit16 v1, v1, 0x80
+
+    if-eqz v1, :cond_7
+
+    iget-boolean v1, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    goto :goto_7
+
+    :cond_7
+    move/from16 v1, p10
+
+    :goto_7
+    move-object p1, v2
+
+    move-wide p2, v3
+
+    move-wide p4, v5
+
+    move-object/from16 p6, v7
+
+    move-object/from16 p7, v8
+
+    move-object/from16 p8, v9
+
+    move-object/from16 p9, v10
+
+    move/from16 p10, v1
+
+    invoke-virtual/range {p0 .. p10}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->copy(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;Z)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method private final getPartyId()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage$Activity;->getPartyId()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "messageActivity.partyId"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final component2()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    return-wide v0
+.end method
+
+.method public final component3()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    return-wide v0
+.end method
+
+.method public final component4()Lcom/discord/models/domain/ModelApplication;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    return-object v0
+.end method
+
+.method public final component5()Lcom/discord/models/domain/ModelMessage$Activity;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    return-object v0
+.end method
+
+.method public final component6()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    return-object v0
+.end method
+
+.method public final component7()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final component8()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    return v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;Z)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 12
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/models/domain/ModelUser;",
+            "JJ",
+            "Lcom/discord/models/domain/ModelApplication;",
+            "Lcom/discord/models/domain/ModelMessage$Activity;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
+            ">;Z)",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;"
+        }
+    .end annotation
+
+    const-string v0, "meUser"
+
+    move-object v2, p1
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "application"
+
+    move-object/from16 v7, p6
+
+    invoke-static {v7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "messageActivity"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "users"
+
+    move-object/from16 v10, p9
+
+    invoke-static {v10, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-object v1, v0
+
+    move-wide v3, p2
+
+    move-wide/from16 v5, p4
+
+    move-object/from16 v9, p8
+
+    move/from16 v11, p10
+
+    invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;-><init>(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/ModelPresence$Activity;Ljava/util/List;Z)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_4
+
+    instance-of v1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_3
+
+    check-cast p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    iget-object v3, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-wide v3, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    iget-wide v5, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    cmp-long v1, v3, v5
+
+    if-nez v1, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    if-eqz v1, :cond_3
+
+    iget-wide v3, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    iget-wide v5, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    cmp-long v1, v3, v5
+
+    if-nez v1, :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/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    iget-object v3, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    iget-object v3, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    iget-object v3, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    iget-object v3, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    iget-boolean p1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    if-ne v1, p1, :cond_2
+
+    const/4 p1, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 p1, 0x0
+
+    :goto_2
+    if-eqz p1, :cond_3
+
+    goto :goto_3
+
+    :cond_3
+    return v2
+
+    :cond_4
+    :goto_3
+    return v0
+.end method
+
+.method public final getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    return-object v0
+.end method
+
+.method public final getApplication()Lcom/discord/models/domain/ModelApplication;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    return-object v0
+.end method
+
+.method public final getCanJoin()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->canJoin:Z
+
+    return v0
+.end method
+
+.method public final getCreationTime()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    return-wide v0
+.end method
+
+.method public final getCreatorId()J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    return-wide v0
+.end method
+
+.method public final getGPlayPackageNames()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->gPlayPackageNames:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final getMeUser()Lcom/discord/models/domain/ModelUser;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    return-object v0
+.end method
+
+.method public final getMessageActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    return-object v0
+.end method
+
+.method public final getUsers()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$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-wide v2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v2
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-wide v2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    invoke-static {v2, v3}, L$r8$java8methods$utility$Long$hashCode$IJ;->hashCode(J)I
+
+    move-result v2
+
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    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/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    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/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    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/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    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/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    if-eqz v1, :cond_5
+
+    const/4 v1, 0x1
+
+    :cond_5
+    add-int/2addr v0, v1
+
+    return v0
+.end method
+
+.method public final isDeadInvite()Z
+    .locals 8
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Party;->getId()Ljava/lang/String;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    invoke-direct {p0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getPartyId()Ljava/lang/String;
+
+    move-result-object v2
+
+    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    iget-wide v2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    const-wide/32 v4, 0x6ddd00
+
+    add-long/2addr v2, v4
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+
+    move-result-wide v4
+
+    const/4 v6, 0x1
+
+    cmp-long v7, v2, v4
+
+    if-gez v7, :cond_1
+
+    const/4 v2, 0x1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v0, :cond_3
+
+    if-eqz v2, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    return v1
+
+    :cond_3
+    :goto_2
+    return v6
+.end method
+
+.method public final isGameInstalled()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+
+    return v0
+.end method
+
+.method public final isInParty()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isInParty:Z
+
+    return v0
+.end method
+
+.method public final toString()Ljava/lang/String;
+    .locals 3
+
+    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/chat/list/ViewEmbedGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", creatorId="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creatorId:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, ", creationTime="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-wide v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->creationTime:J
+
+    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const-string v1, ", application="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->application:Lcom/discord/models/domain/ModelApplication;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", messageActivity="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->messageActivity:Lcom/discord/models/domain/ModelMessage$Activity;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", activity="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", users="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", isGameInstalled="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled: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/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
rename to com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2.smali
index 773da77db2..567a47f8ca 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;
+.class final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;
 .super Lkotlin/jvm/internal/m;
-.source "WidgetChatListAdapterItemGameInvite.kt"
+.source "ViewEmbedGameInvite.kt"
 
 # interfaces
 .implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;)V
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->configureUI(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -28,18 +28,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;
+.field public static final INSTANCE:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;
+    new-instance v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;
 
-    invoke-direct {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;
+    sput-object v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;->INSTANCE:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;
 
     return-void
 .end method
@@ -61,9 +61,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;->invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;->invoke(Lcom/facebook/imagepipeline/request/ImageRequestBuilder;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,13 +75,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$getCOVER_IMAGE_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
+    invoke-static {}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->access$getCOVER_IMAGE_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
 
     move-result-object v0
 
     check-cast v0, Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali
new file mode 100644
index 0000000000..9fc36aa684
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1.smali
@@ -0,0 +1,62 @@
+.class final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;
+.super Ljava/lang/Object;
+.source "ViewEmbedGameInvite.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->onConfigureActionButton(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $this_onConfigureActionButton:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+.field final synthetic this$0:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;->this$0:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+    iput-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    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 v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;->this$0:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->getOnActionButtonClick()Lkotlin/jvm/functions/Function2;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    const-string v1, "it"
+
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    invoke-interface {v0, p1, v1}, Lkotlin/jvm/functions/Function2;->invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali
similarity index 65%
rename from com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2.smali
rename to com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali
index 0d484f26a8..0af3f7e0bf 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2;
+.class final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2;
 .super Ljava/lang/Object;
-.source "WidgetChatListAdapterItemGameInvite.kt"
+.source "ViewEmbedGameInvite.kt"
 
 # interfaces
 .implements Landroid/view/View$OnClickListener;
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->onConfigureActionButton(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
+    value = Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->onConfigureActionButton(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -25,7 +25,7 @@
 .method constructor <init>(Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2;->$packageName:Ljava/lang/String;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2;->$packageName:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2;->$packageName:Ljava/lang/String;
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2;->$packageName:Ljava/lang/String;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func5$0.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func5$0.smali
new file mode 100644
index 0000000000..7ba17e3d33
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func5$0.smali
@@ -0,0 +1,46 @@
+.class final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func5$0;
+.super Ljava/lang/Object;
+.source "ViewEmbedGameInvite.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/widgets/chat/list/ViewEmbedGameInvite$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/widgets/chat/list/ViewEmbedGameInvite$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/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0.smali
similarity index 71%
rename from com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali
rename to com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0.smali
index 62de350811..30b2dd2a63 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0.smali
@@ -1,6 +1,6 @@
-.class final Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;
+.class final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0;
 .super Ljava/lang/Object;
-.source "StoreVoiceParticipants.kt"
+.source "ViewEmbedGameInvite.kt"
 
 # interfaces
 .implements Lrx/functions/Func7;
@@ -16,7 +16,7 @@
 
     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;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0;->function:Lkotlin/jvm/functions/Function7;
 
     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;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;
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$sam$rx_functions_Func7$0;->function:Lkotlin/jvm/functions/Function7;
 
     move-object v1, p1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
new file mode 100644
index 0000000000..7b7bf03ff2
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
@@ -0,0 +1,1026 @@
+.class public final Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+.super Landroidx/constraintlayout/widget/ConstraintLayout;
+.source "ViewEmbedGameInvite.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;,
+        Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Companion;
+    }
+.end annotation
+
+
+# static fields
+.field private static final COVER_IMAGE_POSTPROCESSOR:Lcom/discord/utilities/fresco/GrayscalePostprocessor;
+
+.field public static final Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Companion;
+
+.field private static final EMBED_LIFETIME_MILLIS:J = 0x6ddd00L
+
+.field private static final MAX_USERS_SHOWN:I = 0x6
+
+
+# instance fields
+.field private final actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+.field private final applicationNameText:Landroid/widget/TextView;
+
+.field private final coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+.field private final headerText:Landroid/widget/TextView;
+
+.field private onActionButtonClick:Lkotlin/jvm/functions/Function2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Landroid/view/View;",
+            "-",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+.field private final statusText:Landroid/widget/TextView;
+
+.field private final userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Companion;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Companion;
+
+    new-instance v0, Lcom/discord/utilities/fresco/GrayscalePostprocessor;
+
+    invoke-direct {v0}, Lcom/discord/utilities/fresco/GrayscalePostprocessor;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->COVER_IMAGE_POSTPROCESSOR:Lcom/discord/utilities/fresco/GrayscalePostprocessor;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;)V
+    .locals 2
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    move-object v0, p0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    const v1, 0x7f0d007e
+
+    invoke-static {p1, v1, v0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    const p1, 0x7f0a03e0
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_header)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03e2
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_status)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03de
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_g\u2026_invite_application_name)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03df
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_cover_image)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a03e1
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_recycler)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    const p1, 0x7f0a03dd
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string v0, "findViewById(R.id.item_game_invite_action_btn)"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/google/android/material/button/MaterialButton;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    new-instance v0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    iget-object v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    invoke-direct {v0, v1}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;-><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/channels/list/WidgetCollapsedUsersListAdapter;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const v0, 0x7f0d007e
+
+    invoke-static {p1, v0, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    const p1, 0x7f0a03e0
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_header)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03e2
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_status)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03de
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_g\u2026_invite_application_name)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03df
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_cover_image)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a03e1
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_recycler)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    const p1, 0x7f0a03dd
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_action_btn)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/google/android/material/button/MaterialButton;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    new-instance p2, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    invoke-direct {p2, v0}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    check-cast p2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    invoke-virtual {p1, p2}, 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/channels/list/WidgetCollapsedUsersListAdapter;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    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/l;->checkParameterIsNotNull(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
+
+    invoke-virtual {p0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->getContext()Landroid/content/Context;
+
+    move-result-object p1
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const p3, 0x7f0d007e
+
+    invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    const p1, 0x7f0a03e0
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_header)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03e2
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_status)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03de
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_g\u2026_invite_application_name)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
+
+    const p1, 0x7f0a03df
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_cover_image)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    const p1, 0x7f0a03e1
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_recycler)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    const p1, 0x7f0a03dd
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->findViewById(I)Landroid/view/View;
+
+    move-result-object p1
+
+    const-string p2, "findViewById(R.id.item_game_invite_action_btn)"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Lcom/google/android/material/button/MaterialButton;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    sget-object p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    new-instance p2, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    iget-object p3, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    invoke-direct {p2, p3}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+
+    check-cast p2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    invoke-virtual {p1, p2}, 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/channels/list/WidgetCollapsedUsersListAdapter;
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    return-void
+.end method
+
+.method public static final synthetic access$getCOVER_IMAGE_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
+    .locals 1
+
+    sget-object v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->COVER_IMAGE_POSTPROCESSOR:Lcom/discord/utilities/fresco/GrayscalePostprocessor;
+
+    return-object v0
+.end method
+
+.method private final configureUI(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+    .locals 22
+
+    move-object/from16 v0, p0
+
+    iget-object v1, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->headerText:Landroid/widget/TextView;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getMessageActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
+
+    move-result v2
+
+    const/4 v3, 0x2
+
+    if-eq v2, v3, :cond_0
+
+    const v2, 0x7f120a68
+
+    goto :goto_0
+
+    :cond_0
+    const v2, 0x7f120a6a
+
+    :goto_0
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
+
+    iget-object v1, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->applicationNameText:Landroid/widget/TextView;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/CharSequence;
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isDeadInvite()Z
+
+    move-result v1
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_2
+
+    :cond_1
+    const/4 v4, 0x0
+
+    goto :goto_1
+
+    :cond_2
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_1
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence$Party;->getOpenSlots()I
+
+    move-result v4
+
+    :goto_1
+    if-gtz v4, :cond_3
+
+    const/4 v4, 0x1
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v4, 0x0
+
+    :goto_2
+    iget-object v5, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->statusText:Landroid/widget/TextView;
+
+    if-eqz v1, :cond_4
+
+    const v4, 0x7f120a63
+
+    goto :goto_3
+
+    :cond_4
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getMessageActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object v6
+
+    invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
+
+    move-result v6
+
+    if-ne v6, v3, :cond_5
+
+    const v4, 0x7f120a74
+
+    goto :goto_3
+
+    :cond_5
+    if-eqz v4, :cond_6
+
+    const v4, 0x7f120a61
+
+    goto :goto_3
+
+    :cond_6
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isInParty()Z
+
+    move-result v4
+
+    if-eqz v4, :cond_7
+
+    const v4, 0x7f120a66
+
+    goto :goto_3
+
+    :cond_7
+    const v4, 0x7f120a6c
+
+    :goto_3
+    invoke-virtual {v5, v4}, Landroid/widget/TextView;->setText(I)V
+
+    iget-object v4, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+    check-cast v4, Landroid/view/View;
+
+    xor-int/lit8 v5, v1, 0x1
+
+    const/4 v6, 0x0
+
+    invoke-static {v4, v5, v2, v3, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    if-nez v1, :cond_8
+
+    iget-object v2, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->userAdapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getUsers()Ljava/util/List;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
+
+    :cond_8
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_9
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
+
+    move-result-object v2
+
+    goto :goto_4
+
+    :cond_9
+    move-object v2, v6
+
+    :goto_4
+    if-eqz v2, :cond_a
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeImage()Ljava/lang/String;
+
+    move-result-object v3
+
+    move-object v9, v3
+
+    goto :goto_5
+
+    :cond_a
+    move-object v9, v6
+
+    :goto_5
+    if-nez v1, :cond_b
+
+    if-eqz v9, :cond_b
+
+    sget-object v7, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelApplication;->getId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v8
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x4
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/icon/IconUtils;->getAssetImage$default(Lcom/discord/utilities/icon/IconUtils;Ljava/lang/Long;Ljava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v14
+
+    if-eqz v14, :cond_c
+
+    iget-object v3, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-object v13, v3
+
+    check-cast v13, Landroid/widget/ImageView;
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    const/16 v17, 0x0
+
+    const/16 v18, 0x0
+
+    const/16 v19, 0x0
+
+    const/16 v20, 0x7c
+
+    const/16 v21, 0x0
+
+    invoke-static/range {v13 .. v21}, 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
+
+    goto :goto_6
+
+    :cond_b
+    iget-object v3, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    move-object v7, v3
+
+    check-cast v7, Landroid/widget/ImageView;
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    const-string v4, "https://cdn.discordapp.com/app-icons/"
+
+    invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelApplication;->getId()J
+
+    move-result-wide v4
+
+    invoke-virtual {v3, v4, v5}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+    const/16 v4, 0x2f
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelApplication;->getCoverImage()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v4, ".jpg"
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v8
+
+    const/4 v9, 0x0
+
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    sget-object v3, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;->INSTANCE:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$configureUI$2;
+
+    move-object v12, v3
+
+    check-cast v12, Lkotlin/jvm/functions/Function1;
+
+    const/4 v13, 0x0
+
+    const/16 v14, 0x5c
+
+    const/4 v15, 0x0
+
+    invoke-static/range {v7 .. v15}, 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_c
+    :goto_6
+    iget-object v3, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+    if-eqz v2, :cond_d
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
+
+    move-result-object v6
+
+    :cond_d
+    check-cast v6, Ljava/lang/CharSequence;
+
+    invoke-virtual {v3, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setContentDescription(Ljava/lang/CharSequence;)V
+
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v2
+
+    move-object/from16 v3, p1
+
+    invoke-direct {v0, v3, v1, v2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->onConfigureActionButton(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
+
+    return-void
+.end method
+
+.method private final onConfigureActionButton(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
+    .locals 6
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+
+    move-result v0
+
+    const/4 v1, 0x2
+
+    const/4 v2, 0x0
+
+    const/4 v3, 0x0
+
+    if-nez p2, :cond_5
+
+    if-eqz p3, :cond_0
+
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence$Activity;->getPlatform()Ljava/lang/String;
+
+    move-result-object p2
+
+    goto :goto_0
+
+    :cond_0
+    move-object p2, v2
+
+    :goto_0
+    const-string p3, "android"
+
+    invoke-static {p2, p3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    const/4 p3, 0x1
+
+    xor-int/2addr p2, p3
+
+    if-nez p2, :cond_5
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getCanJoin()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_5
+
+    if-nez v0, :cond_1
+
+    goto/16 :goto_2
+
+    :cond_1
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    check-cast p2, Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getGPlayPackageNames()Ljava/util/List;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v0
+
+    xor-int/2addr v0, p3
+
+    invoke-static {p2, v0, v3, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled()Z
+
+    move-result p2
+
+    if-eqz p2, :cond_3
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isInParty()Z
+
+    move-result v0
+
+    if-nez v0, :cond_2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getCreatorId()J
+
+    move-result-wide v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getMeUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v4
+
+    cmp-long v2, v0, v4
+
+    if-nez v2, :cond_2
+
+    goto :goto_1
+
+    :cond_2
+    const/4 p3, 0x0
+
+    :goto_1
+    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setEnabled(Z)V
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    const p3, 0x7f120ac6
+
+    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setText(I)V
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    new-instance p3, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;
+
+    invoke-direct {p3, p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$1;-><init>(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+
+    check-cast p3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    return-void
+
+    :cond_3
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getGPlayPackageNames()Ljava/util/List;
+
+    move-result-object p2
+
+    check-cast p2, Ljava/util/Collection;
+
+    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result p2
+
+    xor-int/2addr p2, p3
+
+    if-eqz p2, :cond_4
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getGPlayPackageNames()Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lkotlin/a/m;->first(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/lang/String;
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    const v0, 0x7f1212fc
+
+    invoke-virtual {p2, v0}, Lcom/google/android/material/button/MaterialButton;->setText(I)V
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setEnabled(Z)V
+
+    iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    new-instance p3, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2;
+
+    invoke-direct {p3, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$onConfigureActionButton$2;-><init>(Ljava/lang/String;)V
+
+    check-cast p3, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    :cond_4
+    return-void
+
+    :cond_5
+    :goto_2
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
+
+    check-cast p1, Landroid/view/View;
+
+    invoke-static {p1, v3, v3, v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final bind(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+    .locals 1
+
+    const-string v0, "model"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->configureUI(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+
+    return-void
+.end method
+
+.method public final getOnActionButtonClick()Lkotlin/jvm/functions/Function2;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/jvm/functions/Function2<",
+            "Landroid/view/View;",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->onActionButtonClick:Lkotlin/jvm/functions/Function2;
+
+    return-object v0
+.end method
+
+.method public final setOnActionButtonClick(Lkotlin/jvm/functions/Function2;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function2<",
+            "-",
+            "Landroid/view/View;",
+            "-",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->onActionButtonClick:Lkotlin/jvm/functions/Function2;
+
+    return-void
+.end method
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 39d6c7e276..6c0ee0c26f 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, 0x7f120550
+    const v0, 0x7f120575
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -98,7 +98,7 @@
 
     check-cast p0, Landroid/content/Context;
 
-    const v0, 0x7f12054f
+    const v0, 0x7f120574
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p0
 .end method
@@ -204,7 +204,7 @@
     :catch_0
     move-exception p1
 
-    sget-object p2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v0, "SDK action unhandled."
 
@@ -254,7 +254,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1212ba
+    const p2, 0x7f121342
 
     const/4 v0, 0x0
 
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 88b17dfa0f..9e6f2f6443 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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()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;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     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 a55725a008..422deaf968 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, 0x7f0d00ee
+    const v0, 0x7f0d00f4
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
index 61c0da9b2e..3a790fc570 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, 0x7f0800c8
+    const v0, 0x7f0800c9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setBackgroundResource(I)V
 
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 1cc4599ea9..0a5decc7e8 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ee8fee2cbb..4c2837c3ac 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, 0x7f0d00f7
+    const p2, 0x7f0d00fd
 
     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, 0x7f0d0108
+    const p2, 0x7f0d010e
 
     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, 0x7f0d00f3
+    const p2, 0x7f0d00f9
 
     move-object v0, p0
 
@@ -508,7 +508,7 @@
     :pswitch_e
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0104
+    const p2, 0x7f0d010a
 
     move-object v0, p0
 
@@ -521,7 +521,7 @@
     :pswitch_f
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0103
+    const p2, 0x7f0d0109
 
     move-object v0, p0
 
@@ -534,7 +534,7 @@
     :pswitch_10
     new-instance p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
 
-    const p2, 0x7f0d0105
+    const p2, 0x7f0d010b
 
     move-object v0, p0
 
@@ -583,7 +583,7 @@
     :pswitch_15
     new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListItem;
 
-    const p2, 0x7f0d0106
+    const p2, 0x7f0d010c
 
     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, 0x7f0d00fd
+    const p2, 0x7f0d0103
 
     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, 0x7f0d0100
+    const p2, 0x7f0d0106
 
     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, 0x7f0d0109
+    const p2, 0x7f0d010f
 
     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 df86ac14dc..48e3c52c42 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2ef690c38d..b8d7ec63cd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7606e4e05d..0361fa9afc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3a5a0801ba..74a49e732d 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f0
+    const v0, 0x7f0d00f6
 
     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;->Co:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object v7, Lcom/discord/views/ApplicationNewsView$a$b;->Cp:Lcom/discord/views/ApplicationNewsView$a$b;
 
     move-object v8, v7
 
@@ -192,15 +192,15 @@
 
     invoke-static {v8, v9}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Ce:Landroid/view/ViewGroup;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
 
     invoke-virtual {v9, v5}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/ImageView;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
 
     invoke-virtual {v9, v6}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/view/ViewGroup;
+    iget-object v9, v2, Lcom/discord/views/ApplicationNewsView;->Cl: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;->BR:Landroid/widget/TextView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->BS: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;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->Ch: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;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v6, v2, Lcom/discord/views/ApplicationNewsView;->Ch: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;->Ci:Landroid/widget/TextView;
+    iget-object v4, v2, Lcom/discord/views/ApplicationNewsView;->Cj: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;->Ce:Landroid/view/ViewGroup;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Cf:Landroid/view/ViewGroup;
 
     invoke-virtual {v1, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Cj:Landroid/widget/ImageView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/widget/ImageView;
 
     invoke-virtual {v1, v5}, Landroid/widget/ImageView;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ck:Landroid/view/ViewGroup;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Cl:Landroid/view/ViewGroup;
 
     invoke-virtual {v1, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ch: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;->Cg:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, v2, Lcom/discord/views/ApplicationNewsView;->Ch: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;->Co:Lcom/discord/views/ApplicationNewsView$a$b;
+    sget-object v1, Lcom/discord/views/ApplicationNewsView$a$b;->Cp: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 56b7a5a703..ac850db3aa 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 689a94b7b9..e45cfe8cf4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0a92760c77..bbc156d220 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a9fa4d8bb5..34a86a1591 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemAttachment.smali
@@ -248,7 +248,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f1
+    const v0, 0x7f0d00f7
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
index 5d61f03c2b..672eb95d23 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
@@ -55,7 +55,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f2
+    const v0, 0x7f0d00f8
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -105,7 +105,7 @@
 .method private final getBlockedText(Landroid/content/res/Resources;I)Ljava/lang/String;
     .locals 5
 
-    const v0, 0x7f100018
+    const v0, 0x7f100019
 
     invoke-virtual {p1, v0, p2}, Landroid/content/res/Resources;->getQuantityString(II)Ljava/lang/String;
 
@@ -143,7 +143,7 @@
 
     aput-object p2, v2, v4
 
-    const p2, 0x7f12032d
+    const p2, 0x7f120352
 
     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 9b98ed81c5..9c517f29e0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -201,7 +201,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage;->statusIcon:Landroid/widget/ImageView;
 
-    const v2, 0x7f08020f
+    const v2, 0x7f08021a
 
     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, 0x7f080211
+    const v2, 0x7f08021c
 
     invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -256,7 +256,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f121151
+    const v3, 0x7f1211d9
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f121150
+    const v3, 0x7f1211d8
 
     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 5b5661692f..b095479196 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 770561e8b3..33b7d7038a 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
@@ -515,7 +515,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-static {}, Lrx/Observable;->IQ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p1
 
@@ -634,7 +634,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 933451b426..9c704e5213 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 8a519c340b..d65c3a112e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7914fb888b..48ace9fc7a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 aeeea2ce60..3169afae69 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b197c22db7..6fa7e493b2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ee5f699f63..21886ff296 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0115ca0e95..1568c5d956 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5d2999f3b4..d889952cc3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c6a30ce5c8..e0e78e96c5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed.smali
@@ -458,7 +458,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f4
+    const v0, 0x7f0d00fa
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -510,7 +510,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->embedFields$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a02b0
+    const p1, 0x7f0a02b3
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1052,7 +1052,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f04036c
+    const v1, 0x7f04036d
 
     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, 0x7f0d00f5
+    const v5, 0x7f0d00fb
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed;->getEmbedFields()Landroid/view/ViewGroup;
 
@@ -1747,7 +1747,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v4, 0x7f06008c
+    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, 0x7f0402a1
+    const v4, 0x7f0402a2
 
     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;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v4, p1
 
@@ -2819,7 +2819,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IV()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 f389239819..42bc82b8fc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmptyPins.smali
@@ -11,7 +11,7 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d00f6
+    const v0, 0x7f0d00fc
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
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
deleted file mode 100644
index b218bf03f1..0000000000
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion.smali
+++ /dev/null
@@ -1,431 +0,0 @@
-.class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
-.super Ljava/lang/Object;
-.source "WidgetChatListAdapterItemGameInvite.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$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/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;-><init>()V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final create(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Ljava/util/List;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-    .locals 15
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/models/domain/ModelPresence;",
-            "Ljava/util/Map<",
-            "Ljava/lang/Long;",
-            "+",
-            "Lcom/discord/models/domain/ModelUser;",
-            ">;",
-            "Ljava/util/List<",
-            "+",
-            "Landroid/content/pm/PackageInfo;",
-            ">;)",
-            "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;"
-        }
-    .end annotation
-
-    move-object/from16 v0, p5
-
-    const-string v1, "item"
-
-    move-object/from16 v3, p1
-
-    invoke-static {v3, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v1, "meUser"
-
-    move-object/from16 v4, p2
-
-    invoke-static {v4, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v1, "userMap"
-
-    move-object/from16 v2, p4
-
-    invoke-static {v2, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v1, "installedPackages"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
-
-    if-eqz p3, :cond_0
-
-    invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v5
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v5, 0x0
-
-    :goto_0
-    invoke-interface/range {p4 .. p4}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object v6
-
-    check-cast v6, Ljava/lang/Iterable;
-
-    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 v7
-
-    if-eqz v7, :cond_1
-
-    invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v7
-
-    move-object v8, v1
-
-    check-cast v8, Ljava/util/Collection;
-
-    move-object v10, v7
-
-    check-cast v10, Lcom/discord/models/domain/ModelUser;
-
-    new-instance v7, Lcom/discord/widgets/channels/list/items/CollapsedUser;
-
-    const/4 v11, 0x0
-
-    const/4 v12, 0x0
-
-    const/4 v13, 0x6
-
-    const/4 v14, 0x0
-
-    move-object v9, v7
-
-    invoke-direct/range {v9 .. v14}, Lcom/discord/widgets/channels/list/items/CollapsedUser;-><init>(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    invoke-interface {v8, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v6, 0x0
-
-    if-eqz v5, :cond_2
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
-
-    move-result-object v5
-
-    if-eqz v5, :cond_2
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPresence$Party;->getMaxSize()I
-
-    move-result v5
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v5, 0x0
-
-    :goto_2
-    invoke-interface/range {p4 .. p4}, Ljava/util/Map;->size()I
-
-    move-result v2
-
-    const/4 v7, 0x6
-
-    invoke-static {v7, v5}, Ljava/lang/Math;->min(II)I
-
-    move-result v8
-
-    invoke-static {v2, v8}, Lkotlin/ranges/c;->until(II)Lkotlin/ranges/IntRange;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/Iterable;
-
-    invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :goto_3
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v8
-
-    if-eqz v8, :cond_4
-
-    move-object v8, v2
-
-    check-cast v8, Lkotlin/a/ab;
-
-    invoke-virtual {v8}, Lkotlin/a/ab;->nextInt()I
-
-    move-result v8
-
-    const/4 v9, 0x5
-
-    if-ne v8, v9, :cond_3
-
-    add-int/lit8 v8, v5, -0x6
-
-    goto :goto_4
-
-    :cond_3
-    const/4 v8, 0x0
-
-    :goto_4
-    sget-object v9, Lcom/discord/widgets/channels/list/items/CollapsedUser;->Companion:Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;
-
-    invoke-virtual {v9, v8}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser;
-
-    move-result-object v8
-
-    invoke-virtual {v1, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_3
-
-    :cond_4
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelApplication;->getGPlayPackageNames()Ljava/util/List;
-
-    move-result-object v2
-
-    move-object v5, v2
-
-    check-cast v5, Ljava/util/Collection;
-
-    invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v5
-
-    const/4 v7, 0x1
-
-    xor-int/2addr v5, v7
-
-    if-eqz v5, :cond_7
-
-    check-cast v0, Ljava/lang/Iterable;
-
-    instance-of v5, v0, Ljava/util/Collection;
-
-    if-eqz v5, :cond_5
-
-    move-object v5, v0
-
-    check-cast v5, Ljava/util/Collection;
-
-    invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v5
-
-    if-nez v5, :cond_7
-
-    :cond_5
-    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :cond_6
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v5
-
-    if-eqz v5, :cond_7
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v5
-
-    check-cast v5, Landroid/content/pm/PackageInfo;
-
-    iget-object v5, v5, Landroid/content/pm/PackageInfo;->packageName:Ljava/lang/String;
-
-    invoke-interface {v2, v5}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-eqz v5, :cond_6
-
-    goto :goto_5
-
-    :cond_7
-    const/4 v7, 0x0
-
-    :goto_5
-    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    move-object v6, v1
-
-    check-cast v6, Ljava/util/List;
-
-    move-object v2, v0
-
-    move-object/from16 v3, p1
-
-    move-object/from16 v4, p2
-
-    move-object/from16 v5, p3
-
-    invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;-><init>(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Z)V
-
-    return-object v0
-.end method
-
-.method public final get(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lrx/Observable;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/content/Context;",
-            "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
-            ")",
-            "Lrx/Observable<",
-            "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;",
-            ">;"
-        }
-    .end annotation
-
-    const-string v0, "context"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "item"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p2}, Lrx/Observable;->bq(Ljava/lang/Object;)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;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()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 {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getUserId()J
-
-    move-result-wide v3
-
-    invoke-virtual {v0, v3, v4}, 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;->getGameParty()Lcom/discord/stores/StoreGameParty;
-
-    move-result-object v0
-
-    invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage$Activity;->getPartyId()Ljava/lang/String;
-
-    move-result-object p2
-
-    invoke-virtual {v0, p2}, Lcom/discord/stores/StoreGameParty;->getUsersForPartyId(Ljava/lang/String;)Lrx/Observable;
-
-    move-result-object v4
-
-    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getAndroidPackages()Lcom/discord/stores/StoreAndroidPackages;
-
-    move-result-object p2
-
-    invoke-virtual {p2, p1}, Lcom/discord/stores/StoreAndroidPackages;->getInstalledPackages(Landroid/content/Context;)Lrx/Observable;
-
-    move-result-object v5
-
-    new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1;
-
-    sget-object p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
-
-    invoke-direct {p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion$get$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;)V
-
-    check-cast p1, Lkotlin/jvm/functions/Function5;
-
-    new-instance p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0;
-
-    invoke-direct {p2, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$sam$rx_functions_Func5$0;-><init>(Lkotlin/jvm/functions/Function5;)V
-
-    move-object v6, p2
-
-    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
-
-    const-string p2, "Observable\n            .\u2026       Companion::create)"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string p2, "Observable\n            .\u2026  .distinctUntilChanged()"
-
-    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali
deleted file mode 100644
index b4c95c6c6f..0000000000
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model.smali
+++ /dev/null
@@ -1,795 +0,0 @@
-.class public final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-.super Ljava/lang/Object;
-.source "WidgetChatListAdapterItemGameInvite.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "Model"
-.end annotation
-
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field public static final Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
-
-
-# instance fields
-.field private final canJoin:Z
-
-.field private final gPlayPackageNames:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final isGameInstalled:Z
-
-.field private final isInParty:Z
-
-.field private final item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-.field private final meUser:Lcom/discord/models/domain/ModelUser;
-
-.field private final presence:Lcom/discord/models/domain/ModelPresence;
-
-.field private final users:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-
-# direct methods
-.method static constructor <clinit>()V
-    .locals 2
-
-    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
-
-    return-void
-.end method
-
-.method public constructor <init>(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Z)V
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/models/domain/ModelPresence;",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
-            ">;Z)V"
-        }
-    .end annotation
-
-    const-string v0, "item"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "meUser"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "users"
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    iput-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    iput-object p3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    iput-object p4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    iput-boolean p5, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled:Z
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    check-cast p1, Ljava/lang/Iterable;
-
-    instance-of p2, p1, Ljava/util/Collection;
-
-    const/4 p3, 0x0
-
-    const/4 p4, 0x1
-
-    if-eqz p2, :cond_0
-
-    move-object p2, p1
-
-    check-cast p2, Ljava/util/Collection;
-
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p2
-
-    if-nez p2, :cond_3
-
-    :cond_0
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object p1
-
-    :cond_1
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object p2
-
-    check-cast p2, Lcom/discord/widgets/channels/list/items/CollapsedUser;
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v0
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v2
-
-    cmp-long p2, v0, v2
-
-    if-nez p2, :cond_2
-
-    const/4 p2, 0x1
-
-    goto :goto_0
-
-    :cond_2
-    const/4 p2, 0x0
-
-    :goto_0
-    if-eqz p2, :cond_1
-
-    const/4 p1, 0x1
-
-    goto :goto_1
-
-    :cond_3
-    const/4 p1, 0x0
-
-    :goto_1
-    iput-boolean p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isInParty:Z
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz p1, :cond_4
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object p1
-
-    if-eqz p1, :cond_4
-
-    const/4 p2, 0x2
-
-    invoke-virtual {p1, p2}, Lcom/discord/models/domain/ModelPresence$Activity;->hasFlag(I)Z
-
-    move-result p1
-
-    if-ne p1, p4, :cond_4
-
-    const/4 p3, 0x1
-
-    :cond_4
-    iput-boolean p3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->canJoin:Z
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplication;->getGPlayPackageNames()Ljava/util/List;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->gPlayPackageNames:Ljava/util/List;
-
-    return-void
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-    .locals 3
-
-    and-int/lit8 p7, p6, 0x1
-
-    if-eqz p7, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    :cond_0
-    and-int/lit8 p7, p6, 0x2
-
-    if-eqz p7, :cond_1
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    :cond_1
-    move-object p7, p2
-
-    and-int/lit8 p2, p6, 0x4
-
-    if-eqz p2, :cond_2
-
-    iget-object p3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    :cond_2
-    move-object v0, p3
-
-    and-int/lit8 p2, p6, 0x8
-
-    if-eqz p2, :cond_3
-
-    iget-object p4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    :cond_3
-    move-object v1, p4
-
-    and-int/lit8 p2, p6, 0x10
-
-    if-eqz p2, :cond_4
-
-    iget-boolean p5, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled: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/chat/list/WidgetChatListAdapterItemGameInvite$Model;->copy(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Z)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    return-object v0
-.end method
-
-.method public final component2()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final component3()Lcom/discord/models/domain/ModelPresence;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    return-object v0
-.end method
-
-.method public final component4()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public final component5()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled:Z
-
-    return v0
-.end method
-
-.method public final copy(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Z)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-    .locals 7
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Lcom/discord/widgets/chat/list/entries/GameInviteEntry;",
-            "Lcom/discord/models/domain/ModelUser;",
-            "Lcom/discord/models/domain/ModelPresence;",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
-            ">;Z)",
-            "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;"
-        }
-    .end annotation
-
-    const-string v0, "item"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "meUser"
-
-    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "users"
-
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    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/chat/list/WidgetChatListAdapterItemGameInvite$Model;-><init>(Lcom/discord/widgets/chat/list/entries/GameInviteEntry;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelPresence;Ljava/util/List;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/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    const/4 v2, 0x0
-
-    if-eqz v1, :cond_1
-
-    check-cast p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    iget-object v3, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled:Z
-
-    iget-boolean p1, p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled: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 getCanJoin()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->canJoin:Z
-
-    return v0
-.end method
-
-.method public final getGPlayPackageNames()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->gPlayPackageNames:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public final getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    return-object v0
-.end method
-
-.method public final getMeUser()Lcom/discord/models/domain/ModelUser;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser:Lcom/discord/models/domain/ModelUser;
-
-    return-object v0
-.end method
-
-.method public final getPresence()Lcom/discord/models/domain/ModelPresence;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    return-object v0
-.end method
-
-.method public final getUsers()Ljava/util/List;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/List<",
-            "Lcom/discord/widgets/channels/list/items/CollapsedUser;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    return-object v0
-.end method
-
-.method public final hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    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/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser: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/chat/list/WidgetChatListAdapterItemGameInvite$Model;->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/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users: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
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled:Z
-
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x1
-
-    :cond_4
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final isDeadInvite()Z
-    .locals 8
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    const/4 v1, 0x0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$Party;->getId()Ljava/lang/String;
-
-    move-result-object v0
-
-    if-eqz v0, :cond_1
-
-    iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    invoke-virtual {v2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage$Activity;->getPartyId()Ljava/lang/String;
-
-    move-result-object v2
-
-    invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v0, 0x0
-
-    :goto_1
-    invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime;
-
-    move-result-object v2
-
-    iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    invoke-virtual {v3}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getMessageId()J
-
-    move-result-wide v3
-
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v3
-
-    invoke-virtual {v2, v3}, Lcom/miguelgaeta/simple_time/SimpleTime;->parseSnowflake(Ljava/lang/Long;)J
-
-    move-result-wide v2
-
-    const-wide/32 v4, 0x6ddd00
-
-    add-long/2addr v2, v4
-
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
-
-    move-result-wide v4
-
-    const/4 v6, 0x1
-
-    cmp-long v7, v2, v4
-
-    if-gez v7, :cond_2
-
-    const/4 v2, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v2, 0x0
-
-    :goto_2
-    if-eqz v0, :cond_4
-
-    if-eqz v2, :cond_3
-
-    goto :goto_3
-
-    :cond_3
-    return v1
-
-    :cond_4
-    :goto_3
-    return v6
-.end method
-
-.method public final isGameInstalled()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled:Z
-
-    return v0
-.end method
-
-.method public final isInParty()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isInParty:Z
-
-    return v0
-.end method
-
-.method public final toString()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    const-string v1, "Model(item="
-
-    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", meUser="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->meUser: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/chat/list/WidgetChatListAdapterItemGameInvite$Model;->presence:Lcom/discord/models/domain/ModelPresence;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", users="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->users:Ljava/util/List;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isGameInstalled="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled: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/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1.smali
index 7cf8ba7150..7fb70b699e 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
@@ -3,7 +3,7 @@
 .source "WidgetChatListAdapterItemGameInvite.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lkotlin/jvm/functions/Function2;
 
 
 # annotations
@@ -19,8 +19,9 @@
 .annotation system Ldalvik/annotation/Signature;
     value = {
         "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function1<",
-        "Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;",
+        "Lkotlin/jvm/functions/Function2<",
+        "Landroid/view/View;",
+        "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -28,16 +29,20 @@
 
 
 # instance fields
+.field final synthetic $item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
 .field final synthetic this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
+.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
-    const/4 p1, 0x1
+    iput-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
+    const/4 p1, 0x2
 
     invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
 
@@ -46,28 +51,73 @@
 
 
 # virtual methods
-.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
+    check-cast p1, Landroid/view/View;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;)V
+    check-cast p2, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->invoke(Landroid/view/View;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;)V
-    .locals 1
+.method public final invoke(Landroid/view/View;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+    .locals 8
 
-    const-string v0, "it"
+    const-string v0, "<anonymous parameter 0>"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+    const-string p1, "model"
 
-    invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;)V
+    invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    invoke-virtual {p2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object v6
+
+    if-eqz v6, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+
+    invoke-static {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+
+    move-result-object v0
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getUserId()J
+
+    move-result-wide v1
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getMessageId()J
+
+    move-result-wide v3
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
+
+    move-result v5
+
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;->$item:Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
+
+    move-result-object v7
+
+    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->onUserActivityAction(JJILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelApplication;)V
+
+    :cond_0
     return-void
 .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 7a1311edb4..c6a4ba5b99 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
@@ -20,7 +20,7 @@
     value = {
         "Lkotlin/jvm/internal/m;",
         "Lkotlin/jvm/functions/Function1<",
-        "Lrx/Subscription;",
+        "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
         "Lkotlin/Unit;",
         ">;"
     }
@@ -49,16 +49,16 @@
 .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/chat/list/ViewEmbedGameInvite$Model;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;->invoke(Lrx/Subscription;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;->invoke(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
 
-.method public final invoke(Lrx/Subscription;)V
+.method public final invoke(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
     .locals 1
 
     const-string v0, "it"
@@ -67,7 +67,11 @@
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
 
-    invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lrx/Subscription;)V
+    invoke-static {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$getGameInviteView$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->bind(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
new file mode 100644
index 0000000000..15c292a792
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3.smali
@@ -0,0 +1,73 @@
+.class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetChatListAdapterItemGameInvite.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/m;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lrx/Subscription;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+
+    const/4 p1, 0x1
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;->invoke(Lrx/Subscription;)V
+
+    sget-object p1, Lkotlin/Unit;->bgy: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
+
+    invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$setSubscription$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lrx/Subscription;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1.smali
deleted file mode 100644
index 51d4a854a6..0000000000
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;
-.super Ljava/lang/Object;
-.source "WidgetChatListAdapterItemGameInvite.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->onConfigureActionButton(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-
-# instance fields
-.field final synthetic $gameActivity:Lcom/discord/models/domain/ModelPresence$Activity;
-
-.field final synthetic $this_onConfigureActionButton:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-.field final synthetic this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;Lcom/discord/models/domain/ModelPresence$Activity;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-    iput-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    iput-object p3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->$gameActivity:Lcom/discord/models/domain/ModelPresence$Activity;
-
-    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 p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-    invoke-static {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
-    move-result-object v0
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getUserId()J
-
-    move-result-wide v1
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getMessageId()J
-
-    move-result-wide v3
-
-    iget-object v6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->$gameActivity:Lcom/discord/models/domain/ModelPresence$Activity;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;->$this_onConfigureActionButton:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v7
-
-    const/4 v5, 0x1
-
-    invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->onUserActivityAction(JJILcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelApplication;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali
deleted file mode 100644
index 1591a2413d..0000000000
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2.smali
+++ /dev/null
@@ -1,82 +0,0 @@
-.class final Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;
-.super Lkotlin/jvm/internal/m;
-.source "WidgetChatListAdapterItemGameInvite.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x18
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Lkotlin/jvm/internal/m;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field final synthetic this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-
-# direct methods
-.method constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
-    .locals 0
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-    const/4 p1, 0x0
-
-    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
-    .locals 3
-
-    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
-
-    new-instance v1, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
-
-    iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-    invoke-static {v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->access$getRecyclerView$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Landroidx/recyclerview/widget/RecyclerView;
-
-    move-result-object v2
-
-    invoke-direct {v1, v2}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;-><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/channels/list/WidgetCollapsedUsersListAdapter;
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;->invoke()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
index 8c3d03c397..dbdea64fea 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
@@ -3,96 +3,13 @@
 .source "WidgetChatListAdapterItemGameInvite.kt"
 
 
-# annotations
-.annotation system Ldalvik/annotation/MemberClasses;
-    value = {
-        Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;,
-        Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;
-    }
-.end annotation
-
-
-# static fields
-.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-.field private static final COVER_IMAGE_POSTPROCESSOR:Lcom/discord/utilities/fresco/GrayscalePostprocessor;
-
-.field public static final Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;
-
-.field private static final EMBED_LIFETIME_MILLIS:J = 0x6ddd00L
-
-.field private static final MAX_USERS_SHOWN:I = 0x6
-
-
 # instance fields
-.field private final actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-.field private final applicationNameText:Landroid/widget/TextView;
-
-.field private final coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-.field private final headerText:Landroid/widget/TextView;
-
-.field private final recyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
-.field private final statusText:Landroid/widget/TextView;
+.field private final gameInviteView:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
 
 .field private subscription:Lrx/Subscription;
 
-.field private final userAdapter$delegate:Lkotlin/Lazy;
-
 
 # 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/x;
-
-    const-class v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v2
-
-    const-string v3, "userAdapter"
-
-    const-string v4, "getUserAdapter()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;"
-
-    invoke-direct {v1, v2, v3, v4}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v1}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/chat/list/WidgetChatListAdapterItemGameInvite;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;
-
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
-    sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Companion;
-
-    new-instance v0, Lcom/discord/utilities/fresco/GrayscalePostprocessor;
-
-    invoke-direct {v0}, Lcom/discord/utilities/fresco/GrayscalePostprocessor;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->COVER_IMAGE_POSTPROCESSOR:Lcom/discord/utilities/fresco/GrayscalePostprocessor;
-
-    return-void
-.end method
-
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
@@ -100,119 +17,28 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f8
+    const v0, 0x7f0d00fe
 
     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;
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListItem;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a03d8
+    if-eqz p1, :cond_0
 
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    check-cast p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
 
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026.item_game_invite_header)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->headerText:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
-
-    const v0, 0x7f0a03da
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026.item_game_invite_status)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->statusText:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
-
-    const v0, 0x7f0a03d6
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026_invite_application_name)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroid/widget/TextView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->applicationNameText:Landroid/widget/TextView;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
-
-    const v0, 0x7f0a03d7
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026_game_invite_cover_image)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
-
-    const v0, 0x7f0a03d9
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026tem_game_invite_recycler)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->itemView:Landroid/view/View;
-
-    const v0, 0x7f0a03d5
-
-    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
-
-    move-result-object p1
-
-    const-string v0, "itemView.findViewById(R.\u2026m_game_invite_action_btn)"
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/google/android/material/button/MaterialButton;
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$userAdapter$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
-
-    check-cast p1, Lkotlin/jvm/functions/Function0;
-
-    invoke-static {p1}, Lkotlin/f;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->userAdapter$delegate:Lkotlin/Lazy;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->gameInviteView:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
 
     return-void
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string v0, "null cannot be cast to non-null type com.discord.widgets.chat.list.ViewEmbedGameInvite"
+
+    invoke-direct {p1, v0}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
 .end method
 
 .method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
@@ -225,18 +51,10 @@
     return-object p0
 .end method
 
-.method public static final synthetic access$getCOVER_IMAGE_POSTPROCESSOR$cp()Lcom/discord/utilities/fresco/GrayscalePostprocessor;
-    .locals 1
-
-    sget-object v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->COVER_IMAGE_POSTPROCESSOR:Lcom/discord/utilities/fresco/GrayscalePostprocessor;
-
-    return-object v0
-.end method
-
-.method public static final synthetic access$getRecyclerView$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Landroidx/recyclerview/widget/RecyclerView;
+.method public static final synthetic access$getGameInviteView$p(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
     .locals 0
 
-    iget-object p0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->gameInviteView:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
 
     return-object p0
 .end method
@@ -257,527 +75,8 @@
     return-void
 .end method
 
-.method private final getUserAdapter()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->userAdapter$delegate:Lkotlin/Lazy;
-
-    invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
-
-    return-object v0
-.end method
-
-.method private final onConfigureActionButton(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
-    .locals 7
-
-    const/4 v0, 0x2
-
-    const/4 v1, 0x0
-
-    const/4 v2, 0x0
-
-    if-nez p2, :cond_5
-
-    if-eqz p3, :cond_0
-
-    invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence$Activity;->getPlatform()Ljava/lang/String;
-
-    move-result-object p2
-
-    goto :goto_0
-
-    :cond_0
-    move-object p2, v1
-
-    :goto_0
-    const-string v3, "android"
-
-    invoke-static {p2, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result p2
-
-    const/4 v3, 0x1
-
-    xor-int/2addr p2, v3
-
-    if-nez p2, :cond_5
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getCanJoin()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_5
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object p2
-
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
-
-    move-result p2
-
-    if-nez p2, :cond_1
-
-    goto/16 :goto_1
-
-    :cond_1
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    check-cast p2, Landroid/view/View;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getGPlayPackageNames()Ljava/util/List;
-
-    move-result-object v4
-
-    check-cast v4, Ljava/util/Collection;
-
-    invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v4
-
-    xor-int/2addr v4, v3
-
-    invoke-static {p2, v4, v2, v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isGameInstalled()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isInParty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_2
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getUserId()J
-
-    move-result-wide v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getMeUser()Lcom/discord/models/domain/ModelUser;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
-
-    move-result-wide v4
-
-    cmp-long v6, v0, v4
-
-    if-nez v6, :cond_2
-
-    const/4 v2, 0x1
-
-    :cond_2
-    invoke-virtual {p2, v2}, Lcom/google/android/material/button/MaterialButton;->setEnabled(Z)V
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    const v0, 0x7f120a95
-
-    invoke-virtual {p2, v0}, Lcom/google/android/material/button/MaterialButton;->setText(I)V
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;
-
-    invoke-direct {v0, p0, p1, p3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;Lcom/discord/models/domain/ModelPresence$Activity;)V
-
-    check-cast v0, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p2, v0}, Lcom/google/android/material/button/MaterialButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    return-void
-
-    :cond_3
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getGPlayPackageNames()Ljava/util/List;
-
-    move-result-object p2
-
-    check-cast p2, Ljava/util/Collection;
-
-    invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result p2
-
-    xor-int/2addr p2, v3
-
-    if-eqz p2, :cond_4
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getGPlayPackageNames()Ljava/util/List;
-
-    move-result-object p1
-
-    invoke-static {p1}, Lkotlin/a/m;->first(Ljava/util/List;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/lang/String;
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    const p3, 0x7f121274
-
-    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setText(I)V
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    invoke-virtual {p2, v3}, Lcom/google/android/material/button/MaterialButton;->setEnabled(Z)V
-
-    iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    new-instance p3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2;
-
-    invoke-direct {p3, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigureActionButton$2;-><init>(Ljava/lang/String;)V
-
-    check-cast p3, Landroid/view/View$OnClickListener;
-
-    invoke-virtual {p2, p3}, Lcom/google/android/material/button/MaterialButton;->setOnClickListener(Landroid/view/View$OnClickListener;)V
-
-    :cond_4
-    return-void
-
-    :cond_5
-    :goto_1
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
-
-    check-cast p1, Landroid/view/View;
-
-    invoke-static {p1, v2, v2, v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    return-void
-.end method
-
 
 # virtual methods
-.method public final configureUI(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;)V
-    .locals 22
-
-    move-object/from16 v0, p0
-
-    move-object/from16 v1, p1
-
-    const-string v2, "$this$configureUI"
-
-    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isDeadInvite()Z
-
-    move-result v2
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getPresence()Lcom/discord/models/domain/ModelPresence;
-
-    move-result-object v3
-
-    const/4 v4, 0x0
-
-    if-eqz v3, :cond_0
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getPlayingActivity()Lcom/discord/models/domain/ModelPresence$Activity;
-
-    move-result-object v3
-
-    goto :goto_0
-
-    :cond_0
-    move-object v3, v4
-
-    :goto_0
-    const/4 v5, 0x0
-
-    if-eqz v2, :cond_2
-
-    :cond_1
-    const/4 v6, 0x0
-
-    goto :goto_1
-
-    :cond_2
-    if-eqz v3, :cond_1
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getParty()Lcom/discord/models/domain/ModelPresence$Party;
-
-    move-result-object v6
-
-    if-eqz v6, :cond_1
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelPresence$Party;->getOpenSlots()I
-
-    move-result v6
-
-    :goto_1
-    if-gtz v6, :cond_3
-
-    const/4 v6, 0x1
-
-    goto :goto_2
-
-    :cond_3
-    const/4 v6, 0x0
-
-    :goto_2
-    iget-object v7, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->statusText:Landroid/widget/TextView;
-
-    const/4 v8, 0x2
-
-    if-eqz v2, :cond_4
-
-    const v6, 0x7f120a2e
-
-    goto :goto_3
-
-    :cond_4
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object v9
-
-    invoke-virtual {v9}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
-
-    move-result-object v9
-
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
-
-    move-result v9
-
-    if-ne v9, v8, :cond_5
-
-    const v6, 0x7f120a3f
-
-    goto :goto_3
-
-    :cond_5
-    if-eqz v6, :cond_6
-
-    const v6, 0x7f120a2c
-
-    goto :goto_3
-
-    :cond_6
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->isInParty()Z
-
-    move-result v6
-
-    if-eqz v6, :cond_7
-
-    const v6, 0x7f120a31
-
-    goto :goto_3
-
-    :cond_7
-    const v6, 0x7f120a37
-
-    :goto_3
-    invoke-virtual {v7, v6}, Landroid/widget/TextView;->setText(I)V
-
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->recyclerView:Landroidx/recyclerview/widget/RecyclerView;
-
-    check-cast v6, Landroid/view/View;
-
-    xor-int/lit8 v7, v2, 0x1
-
-    invoke-static {v6, v7, v5, v8, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
-
-    if-nez v2, :cond_8
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->getUserAdapter()Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;
-
-    move-result-object v5
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getUsers()Ljava/util/List;
-
-    move-result-object v6
-
-    invoke-virtual {v5, v6}, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter;->setData(Ljava/util/List;)V
-
-    :cond_8
-    if-eqz v3, :cond_9
-
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
-
-    move-result-object v5
-
-    goto :goto_4
-
-    :cond_9
-    move-object v5, v4
-
-    :goto_4
-    if-eqz v5, :cond_a
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeImage()Ljava/lang/String;
-
-    move-result-object v6
-
-    move-object v9, v6
-
-    goto :goto_5
-
-    :cond_a
-    move-object v9, v4
-
-    :goto_5
-    if-nez v2, :cond_b
-
-    if-eqz v9, :cond_b
-
-    sget-object v7, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object v6
-
-    invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v6
-
-    invoke-virtual {v6}, Lcom/discord/models/domain/ModelApplication;->getId()J
-
-    move-result-wide v10
-
-    invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v8
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x4
-
-    const/4 v12, 0x0
-
-    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/icon/IconUtils;->getAssetImage$default(Lcom/discord/utilities/icon/IconUtils;Ljava/lang/Long;Ljava/lang/String;IILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v14
-
-    if-eqz v14, :cond_c
-
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-object v13, v6
-
-    check-cast v13, Landroid/widget/ImageView;
-
-    const/4 v15, 0x0
-
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0x0
-
-    const/16 v19, 0x0
-
-    const/16 v20, 0x7c
-
-    const/16 v21, 0x0
-
-    invoke-static/range {v13 .. v21}, 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
-
-    goto :goto_6
-
-    :cond_b
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    move-object v7, v6
-
-    check-cast v7, Landroid/widget/ImageView;
-
-    new-instance v6, Ljava/lang/StringBuilder;
-
-    const-string v8, "https://cdn.discordapp.com/app-icons/"
-
-    invoke-direct {v6, v8}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object v8
-
-    invoke-virtual {v8}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v8
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelApplication;->getId()J
-
-    move-result-wide v8
-
-    invoke-virtual {v6, v8, v9}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    const/16 v8, 0x2f
-
-    invoke-virtual {v6, v8}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
-
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->getItem()Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
-
-    move-result-object v8
-
-    invoke-virtual {v8}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v8
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelApplication;->getCoverImage()Ljava/lang/String;
-
-    move-result-object v8
-
-    invoke-virtual {v6, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    const-string v8, ".jpg"
-
-    invoke-virtual {v6, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v8
-
-    const/4 v9, 0x0
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x0
-
-    sget-object v6, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;->INSTANCE:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$configureUI$2;
-
-    move-object v12, v6
-
-    check-cast v12, Lkotlin/jvm/functions/Function1;
-
-    const/4 v13, 0x0
-
-    const/16 v14, 0x5c
-
-    const/4 v15, 0x0
-
-    invoke-static/range {v7 .. v15}, 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_c
-    :goto_6
-    iget-object v6, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->coverImage:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-    if-eqz v5, :cond_d
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
-
-    move-result-object v4
-
-    :cond_d
-    check-cast v4, Ljava/lang/CharSequence;
-
-    invoke-virtual {v6, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setContentDescription(Ljava/lang/CharSequence;)V
-
-    invoke-direct {v0, v1, v2, v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->onConfigureActionButton(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;ZLcom/discord/models/domain/ModelPresence$Activity;)V
-
-    return-void
-.end method
-
 .method public final getSubscription()Lrx/Subscription;
     .locals 1
 
@@ -797,45 +96,17 @@
 
     check-cast p2, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;
 
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->headerText:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->gameInviteView:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
 
-    invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+    new-instance v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;
 
-    move-result-object v0
+    invoke-direct {v0, p0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)V
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage$Activity;->getType()I
+    check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    move-result v0
+    invoke-virtual {p1, v0}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->setOnActionButtonClick(Lkotlin/jvm/functions/Function2;)V
 
-    const/4 v1, 0x2
-
-    if-eq v0, v1, :cond_0
-
-    const v0, 0x7f120a33
-
-    goto :goto_0
-
-    :cond_0
-    const v0, 0x7f120a35
-
-    :goto_0
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
-
-    iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->applicationNameText:Landroid/widget/TextView;
-
-    invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/GameInviteEntry;->getApplication()Lcom/discord/models/domain/ModelApplication;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelApplication;->getName()Ljava/lang/String;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/CharSequence;
-
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    sget-object p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;
+    sget-object p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
 
     iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
@@ -845,7 +116,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1, v0, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$Model$Companion;->get(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lrx/Observable;
+    invoke-virtual {p1, v0, p2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->get(Landroid/content/Context;Lcom/discord/widgets/chat/list/entries/GameInviteEntry;)Lrx/Observable;
 
     move-result-object p1
 
@@ -853,11 +124,9 @@
 
     move-result-object v0
 
-    const/4 v1, 0x0
+    new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;
 
-    new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;
-
-    invoke-direct {p1, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$1;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
 
     move-object v4, p1
 
@@ -875,14 +144,16 @@
 
     invoke-static {v2, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;
+    new-instance p1, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;
 
-    invoke-direct {p1, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$2;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
+    invoke-direct {p1, p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite$onConfigure$3;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite;)V
 
     move-object v3, p1
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
+    const/4 v1, 0x0
+
     const/4 v5, 0x0
 
     const/4 v6, 0x0
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 61900b5c06..e15d21a00d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -81,7 +81,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     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 0dee9ebbf9..d63605c341 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/dialogs/e;->xF:Lcom/discord/dialogs/e$a;
+    sget-object p1, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$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/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-static {p1, v2, v0, v1}, Lcom/discord/dialogs/f$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 f9e304d1ee..1cbdf3eaea 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 33246f102e..a608e3391b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f7b7e4e0fc..88944e9bf8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4ea2ff3aed..aa881bfbf3 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00f9
+    const v0, 0x7f0d00ff
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03df
+    const p1, 0x7f0a03e7
 
     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, 0x7f0a03e3
+    const p1, 0x7f0a03eb
 
     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, 0x7f0a03e0
+    const p1, 0x7f0a03e8
 
     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, 0x7f0a03e1
+    const p1, 0x7f0a03e9
 
     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, 0x7f0a03de
+    const p1, 0x7f0a03e6
 
     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, 0x7f0a03e4
+    const p1, 0x7f0a03ec
 
     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, 0x7f0a03db
+    const p1, 0x7f0a03e3
 
     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, 0x7f0a03e5
+    const p1, 0x7f0a03ed
 
     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, 0x7f0a03dc
+    const p1, 0x7f0a03e4
 
     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, 0x7f0a03e2
+    const p1, 0x7f0a03ea
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -590,7 +590,7 @@
 
     if-eqz p1, :cond_2
 
-    const p1, 0x7f1207c0
+    const p1, 0x7f1207e4
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -601,7 +601,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f1207bf
+    const p1, 0x7f1207e3
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -616,7 +616,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f1207bc
+    const v2, 0x7f1207e0
 
     invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V
 
@@ -624,7 +624,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f06011b
+    const v2, 0x7f06011c
 
     invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -646,7 +646,7 @@
 
     const p1, 0x7f0401f2
 
-    const v2, 0x7f08044d
+    const v2, 0x7f08045b
 
     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, 0x7f1207c1
+    const v2, 0x7f1207e5
 
     invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -730,7 +730,7 @@
 
     move-result-object v1
 
-    const v3, 0x7f0402a1
+    const v3, 0x7f0402a2
 
     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, 0x7f080112
+    const v1, 0x7f080116
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
@@ -1056,7 +1056,7 @@
 
     const v3, 0x7f040154
 
-    const v12, 0x7f08043e
+    const v12, 0x7f08044c
 
     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, 0x7f1207c4
+    const v4, 0x7f1207e8
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1140,7 +1140,7 @@
     goto :goto_7
 
     :cond_8
-    const v4, 0x7f1207c3
+    const v4, 0x7f1207e7
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1189,7 +1189,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f0402a1
+    const v4, 0x7f0402a2
 
     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, 0x7f1207b7
+    const v4, 0x7f1207db
 
     invoke-virtual {v2, v4, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1414,7 +1414,7 @@
 
     if-nez v3, :cond_f
 
-    const v3, 0x7f12076e
+    const v3, 0x7f120792
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1465,7 +1465,7 @@
     :cond_f
     if-eqz v7, :cond_10
 
-    const v3, 0x7f12079f
+    const v3, 0x7f1207c3
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1476,7 +1476,7 @@
     :cond_10
     if-eqz v9, :cond_11
 
-    const v3, 0x7f12077c
+    const v3, 0x7f1207a0
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1491,7 +1491,7 @@
 
     if-eqz v3, :cond_12
 
-    const v3, 0x7f12076d
+    const v3, 0x7f120791
 
     const/4 v4, 0x1
 
@@ -1550,7 +1550,7 @@
     :cond_12
     if-eqz v8, :cond_13
 
-    const v3, 0x7f12076c
+    const v3, 0x7f120790
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1620,7 +1620,7 @@
 
     if-eqz v9, :cond_16
 
-    const v4, 0x7f1207b2
+    const v4, 0x7f1207d6
 
     goto :goto_e
 
@@ -1631,7 +1631,7 @@
 
     if-eqz v4, :cond_17
 
-    const v4, 0x7f1207b4
+    const v4, 0x7f1207d8
 
     goto :goto_e
 
@@ -1644,12 +1644,12 @@
 
     if-eqz v4, :cond_18
 
-    const v4, 0x7f1207b5
+    const v4, 0x7f1207d9
 
     goto :goto_e
 
     :cond_18
-    const v4, 0x7f1207b3
+    const v4, 0x7f1207d7
 
     :goto_e
     invoke-virtual {v3, v4}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
index 583ea120c0..f91bf4b1fc 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fa
+    const v0, 0x7f0d0100
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03e7
+    const p1, 0x7f0a03ef
 
     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, 0x7f0a03e8
+    const p1, 0x7f0a03f0
 
     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, 0x7f0a082d
+    const p1, 0x7f0a085d
 
     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, 0x7f0a082c
+    const p1, 0x7f0a085c
 
     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, 0x7f1213a5
+    const v6, 0x7f121431
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -327,7 +327,7 @@
 
     check-cast v3, Landroid/view/View;
 
-    const v6, 0x7f1213aa
+    const v6, 0x7f121436
 
     new-array v7, v4, [Ljava/lang/Object;
 
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 2f64dc6de6..6462c1d32d 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
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 5e9224e770..f1813389ff 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5f8c64d992..0a886bde91 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;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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 85d587d9e7..b8c2cb8eaf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 41cb0b3300..39842db30d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4fe4576adf..9a893b4211 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5a24d07b2b..c4bff042bd 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -356,105 +356,57 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fb
+    const v0, 0x7f0d0101
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03ed
-
-    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/WidgetChatListAdapterItemInvite;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a03f5
 
     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/WidgetChatListAdapterItemInvite;->headerText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03fd
+
+    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/WidgetChatListAdapterItemInvite;->nameText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a03ee
-
-    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/WidgetChatListAdapterItemInvite;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03ef
-
-    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/WidgetChatListAdapterItemInvite;->imageText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f7
-
-    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/WidgetChatListAdapterItemInvite;->onlineMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f9
-
-    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/WidgetChatListAdapterItemInvite;->totalMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f0
-
-    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/WidgetChatListAdapterItemInvite;->joinButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f1
-
-    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/WidgetChatListAdapterItemInvite;->joinedButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f4
-
-    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/WidgetChatListAdapterItemInvite;->mentionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f2
-
-    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/WidgetChatListAdapterItemInvite;->loadingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a03f3
-
-    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/WidgetChatListAdapterItemInvite;->memberContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
-
     const p1, 0x7f0a03f6
 
     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/WidgetChatListAdapterItemInvite;->onlineDot$delegate:Lkotlin/properties/ReadOnlyProperty;
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->image$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03f7
+
+    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/WidgetChatListAdapterItemInvite;->imageText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03ff
+
+    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/WidgetChatListAdapterItemInvite;->onlineMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0401
+
+    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/WidgetChatListAdapterItemInvite;->totalMemberText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     const p1, 0x7f0a03f8
 
@@ -462,6 +414,54 @@
 
     move-result-object p1
 
+    iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemInvite;->joinButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03f9
+
+    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/WidgetChatListAdapterItemInvite;->joinedButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03fc
+
+    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/WidgetChatListAdapterItemInvite;->mentionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03fa
+
+    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/WidgetChatListAdapterItemInvite;->loadingButton$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03fb
+
+    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/WidgetChatListAdapterItemInvite;->memberContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a03fe
+
+    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/WidgetChatListAdapterItemInvite;->onlineDot$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p1, 0x7f0a0400
+
+    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/WidgetChatListAdapterItemInvite;->totalDot$delegate:Lkotlin/properties/ReadOnlyProperty;
 
     return-void
@@ -593,7 +593,7 @@
 
     if-eqz v2, :cond_2
 
-    const v4, 0x7f120a25
+    const v4, 0x7f120a5a
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -604,7 +604,7 @@
     goto :goto_2
 
     :cond_2
-    const v4, 0x7f120a20
+    const v4, 0x7f120a55
 
     invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -619,7 +619,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120a14
+    const v4, 0x7f120a49
 
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
 
@@ -627,7 +627,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f06011b
+    const v4, 0x7f06011c
 
     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, 0x7f080459
+    const v5, 0x7f080467
 
     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, 0x7f1209dd
+    const v3, 0x7f120a12
 
     const/4 v6, 0x1
 
@@ -714,7 +714,7 @@
     :goto_4
     if-nez v3, :cond_6
 
-    const v3, 0x7f1209dc
+    const v3, 0x7f120a11
 
     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, 0x7f120a15
+    const v3, 0x7f120a4a
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -775,7 +775,7 @@
 
     if-eqz v2, :cond_8
 
-    const v3, 0x7f120478
+    const v3, 0x7f12049d
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -786,7 +786,7 @@
     goto :goto_6
 
     :cond_8
-    const v3, 0x7f120b9d
+    const v3, 0x7f120bce
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -853,7 +853,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1209f7
+    const v2, 0x7f120a2c
 
     invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
 
@@ -869,7 +869,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a1
+    const v2, 0x7f0402a2
 
     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, 0x7f080112
+    const v1, 0x7f080116
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
@@ -1061,7 +1061,7 @@
 
     if-eqz v2, :cond_4
 
-    const v2, 0x7f120a24
+    const v2, 0x7f120a59
 
     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, 0x7f120a23
+    const v2, 0x7f120a58
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1085,7 +1085,7 @@
 
     if-nez v2, :cond_6
 
-    const v2, 0x7f120a1f
+    const v2, 0x7f120a54
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1102,7 +1102,7 @@
 
     if-eqz v2, :cond_8
 
-    const v2, 0x7f1209fb
+    const v2, 0x7f120a30
 
     new-array v3, v8, [Ljava/lang/Object;
 
@@ -1131,7 +1131,7 @@
     goto :goto_5
 
     :cond_8
-    const v2, 0x7f120a1e
+    const v2, 0x7f120a53
 
     invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -1193,7 +1193,7 @@
 
     move-result-object v2
 
-    const v11, 0x7f0402a1
+    const v11, 0x7f0402a2
 
     invoke-static {v7, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1384,7 +1384,7 @@
 
     move-result-object v11
 
-    const v12, 0x7f1209e9
+    const v12, 0x7f120a1e
 
     new-array v13, v8, [Ljava/lang/Object;
 
@@ -1438,7 +1438,7 @@
 
     move-result-object v3
 
-    const v12, 0x7f100071
+    const v12, 0x7f100073
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getApproximateMemberCount()I
 
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 6940a96547..e40a83f913 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
@@ -284,7 +284,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 aa724ed5c3..20c726abe7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3e3c004b9f..7e039c46d7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8d5d0967ee..943195b569 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00fc
+    const v0, 0x7f0d0102
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
-    const p1, 0x7f0a03fd
+    const p1, 0x7f0a0405
 
     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, 0x7f0a0401
+    const p1, 0x7f0a0409
 
     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, 0x7f0a03fb
+    const p1, 0x7f0a0403
 
     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, 0x7f0a03fa
+    const p1, 0x7f0a0402
 
     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, 0x7f0a0400
+    const p1, 0x7f0a0408
 
     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, 0x7f0a03ff
+    const p1, 0x7f0a0407
 
     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, 0x7f0a03fc
+    const p1, 0x7f0a0404
 
     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, 0x7f120a34
+    const v5, 0x7f120a69
 
     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, 0x7f121296
+    const v7, 0x7f12131e
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -706,7 +706,7 @@
     return-object v0
 
     :cond_0
-    const p2, 0x7f12062b
+    const p2, 0x7f12064f
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 b785937dce..ca35b1f7a9 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter.smali
@@ -13,7 +13,7 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d00fe
+    const v0, 0x7f0d0104
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -29,7 +29,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMentionFooter;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0758
+    const v0, 0x7f0a077c
 
     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 ab75157b10..c70db8854b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -232,7 +232,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f04037b
+    const v1, 0x7f04037c
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -697,7 +697,7 @@
 
     move-result-object v3
 
-    const v6, 0x7f1210bb
+    const v6, 0x7f121142
 
     invoke-virtual {v3, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -767,7 +767,7 @@
 
     new-instance v3, Landroid/text/style/ForegroundColorSpan;
 
-    const v4, 0x7f040382
+    const v4, 0x7f040383
 
     invoke-static {v15, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -860,7 +860,7 @@
 
     move-result-object v9
 
-    const v16, 0x7f06008c
+    const v16, 0x7f06008d
 
     sget-object v17, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$60jxcMRoqFWr9QV1VXHiEYdL9tA;->INSTANCE:Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$60jxcMRoqFWr9QV1VXHiEYdL9tA;
 
@@ -868,13 +868,13 @@
 
     invoke-direct {v3, v0}, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$lARKCYE9aP17zPkRmIJzvvjOQYQ;-><init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;)V
 
-    const v2, 0x7f04037e
+    const v2, 0x7f04037f
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v18
 
-    const v2, 0x7f04037f
+    const v2, 0x7f040380
 
     invoke-static {v15, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1052,7 +1052,7 @@
     :cond_9
     if-eqz v2, :cond_a
 
-    const v2, 0x7f04037a
+    const v2, 0x7f04037b
 
     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 b55afe11af..f64885d821 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessageHeader.smali
@@ -17,7 +17,7 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d00ff
+    const v0, 0x7f0d0105
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
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 d9083ea8c3..489e5e03a5 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
@@ -103,7 +103,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010a
+    const v0, 0x7f0d0110
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -139,7 +139,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f06011b
+    const v1, 0x7f06011c
 
     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, 0x7f120bf8
+    const v1, 0x7f120c2a
 
     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 d6d6432262..3f13e93bdf 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemReactions.smali
@@ -17,7 +17,7 @@
 .method public constructor <init>(Lcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
     .locals 1
 
-    const v0, 0x7f0d0101
+    const v0, 0x7f0d0107
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d0054
+    const v1, 0x7f0d0056
 
     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;->Ea:Ljava/lang/Long;
+    iget-object v6, v5, Lcom/discord/views/i;->Ec:Ljava/lang/Long;
 
     const/4 v7, 0x1
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v5, Lcom/discord/views/i;->Ea:Ljava/lang/Long;
+    iget-object v6, v5, Lcom/discord/views/i;->Ec: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;->DZ:I
+    iget v9, v5, Lcom/discord/views/i;->Eb:I
 
     if-eq v8, v9, :cond_7
 
     if-eqz v6, :cond_5
 
-    iget-object v6, v5, Lcom/discord/views/i;->DW:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->DY: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;->DW:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->DY:Landroid/widget/TextSwitcher;
 
     invoke-virtual {v6}, Landroid/widget/TextSwitcher;->getContext()Landroid/content/Context;
 
     move-result-object v6
 
-    iget v9, v5, Lcom/discord/views/i;->DZ:I
+    iget v9, v5, Lcom/discord/views/i;->Eb:I
 
     if-le v8, v9, :cond_6
 
-    iget-object v9, v5, Lcom/discord/views/i;->DW:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->DY: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;->DW:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->DY:Landroid/widget/TextSwitcher;
 
     const v10, 0x7f01002c
 
@@ -249,20 +249,20 @@
     goto :goto_5
 
     :cond_6
-    iget-object v9, v5, Lcom/discord/views/i;->DW:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->DY: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;->DW:Landroid/widget/TextSwitcher;
+    iget-object v9, v5, Lcom/discord/views/i;->DY: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;->DW:Landroid/widget/TextSwitcher;
+    iget-object v6, v5, Lcom/discord/views/i;->DY: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;->DZ:I
+    iput v8, v5, Lcom/discord/views/i;->Eb: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;->Ea:Ljava/lang/Long;
+    iput-object v4, v5, Lcom/discord/views/i;->Ec: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 47d62bdc9d..99a025b1c8 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, 0x7f0d0102
+    const v0, 0x7f0d0108
 
     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, 0x7f0a0565
+    const v0, 0x7f0a057a
 
     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 6a95e90f5d..edbecd5e3b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
@@ -55,7 +55,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0107
+    const v0, 0x7f0d010d
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -87,22 +87,22 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f1202ae
+    const p1, 0x7f1202b0
 
     return p1
 
     :cond_0
-    const p1, 0x7f1202af
+    const p1, 0x7f1202b1
 
     return p1
 
     :cond_1
-    const p1, 0x7f1202b3
+    const p1, 0x7f1202b5
 
     return p1
 
     :cond_2
-    const p1, 0x7f1202b2
+    const p1, 0x7f1202b4
 
     return p1
 .end method
@@ -195,7 +195,7 @@
 
     move-result-object p1
 
-    const v3, 0x7f121231
+    const v3, 0x7f1212b9
 
     invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
index 965f5b4d09..99d75e5971 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, 0x7f12117f
+    const v2, 0x7f121207
 
     const/4 v3, 0x2
 
@@ -109,7 +109,7 @@
     goto/16 :goto_1
 
     :pswitch_1
-    const v0, 0x7f121152
+    const v0, 0x7f1211da
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -142,7 +142,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120e5f
+    const v1, 0x7f120ed3
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -167,7 +167,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120e5e
+    const v1, 0x7f120ed2
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -192,7 +192,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f120e5d
+    const v1, 0x7f120ed1
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -207,7 +207,7 @@
     goto/16 :goto_1
 
     :pswitch_5
-    const v0, 0x7f12117e
+    const v0, 0x7f121206
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -247,7 +247,7 @@
     goto/16 :goto_1
 
     :pswitch_7
-    const v0, 0x7f121182
+    const v0, 0x7f12120a
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -262,7 +262,7 @@
     goto/16 :goto_1
 
     :pswitch_8
-    const v0, 0x7f121154
+    const v0, 0x7f1211dc
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
     goto :goto_1
 
     :pswitch_9
-    const v0, 0x7f121155
+    const v0, 0x7f1211dd
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -329,7 +329,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f121187
+    const v0, 0x7f12120f
 
     new-array v1, v4, [Ljava/lang/Object;
 
@@ -345,7 +345,7 @@
 
     :cond_1
     :goto_0
-    const v0, 0x7f121186
+    const v0, 0x7f12120e
 
     new-array v1, v3, [Ljava/lang/Object;
 
@@ -364,7 +364,7 @@
     goto :goto_1
 
     :pswitch_b
-    const v0, 0x7f121185
+    const v0, 0x7f12120d
 
     new-array v1, v3, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
index 2858eb57e4..5bc7f14a9b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
@@ -103,7 +103,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d0108
+    const v0, 0x7f0d010e
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -173,11 +173,11 @@
 
     move-result p1
 
-    const v0, 0x7f08029b
+    const v0, 0x7f0802a7
 
-    const v1, 0x7f08029c
+    const v1, 0x7f0802a8
 
-    const v2, 0x7f0803b3
+    const v2, 0x7f0803c0
 
     packed-switch p1, :pswitch_data_0
 
@@ -194,7 +194,7 @@
     return v1
 
     :pswitch_4
-    const p1, 0x7f080219
+    const p1, 0x7f080224
 
     return p1
 
@@ -202,7 +202,7 @@
     return v0
 
     :pswitch_6
-    const p1, 0x7f08029d
+    const p1, 0x7f0802a9
 
     return p1
 
@@ -465,7 +465,7 @@
 
     move-result-object p2
 
-    const v1, 0x7f04037b
+    const v1, 0x7f04037c
 
     invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -529,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;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v2, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eM()Ljava/util/regex/Pattern;
+    invoke-static {}, Lcom/discord/simpleast/core/a/a;->eO()Ljava/util/regex/Pattern;
 
     move-result-object v2
 
@@ -553,9 +553,9 @@
 
     move-result-object p2
 
-    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bw:Lcom/discord/simpleast/core/a/a;
+    sget-object v1, Lcom/discord/simpleast/core/a/a;->Bx:Lcom/discord/simpleast/core/a/a;
 
-    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eP()Lcom/discord/simpleast/core/parser/Rule;
+    invoke-virtual {v1}, Lcom/discord/simpleast/core/a/a;->eR()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 d51ec9bc07..01a63253ee 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemTimestamp.smali
@@ -103,7 +103,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010a
+    const v0, 0x7f0d0110
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListItem;-><init>(ILcom/discord/widgets/chat/list/WidgetChatListAdapter;)V
 
@@ -139,7 +139,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f04036b
+    const v1, 0x7f04036c
 
     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$ModelProvider.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress$ModelProvider.smali
index 54b6ffd7af..99e34e7e46 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p3
 
@@ -365,7 +365,7 @@
     return p1
 
     :cond_0
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/Exception;
 
@@ -462,7 +462,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p3
 
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 73f4c5f85a..6168699f44 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5477967d8e..53fa2e34ea 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cb16e61ea3..a5ae1d7f81 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 3fe2841a18..a822050f4a 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d010b
+    const v0, 0x7f0d0111
 
     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, 0x7f0a077e
+    const v0, 0x7f0a07a2
 
     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, 0x7f0a077f
+    const v0, 0x7f0a07a3
 
     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, 0x7f0a0780
+    const v0, 0x7f0a07a4
 
     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, 0x7f0a0550
+    const v0, 0x7f0a055b
 
     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, 0x7f0a054f
+    const v0, 0x7f0a055a
 
     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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v4, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     const/4 v4, 0x2
 
@@ -613,7 +613,7 @@
 
     check-cast p2, Landroid/view/View;
 
-    const v0, 0x7f121262
+    const v0, 0x7f1212ea
 
     invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -642,7 +642,7 @@
 
     const/4 v7, 0x1
 
-    const v8, 0x7f1000b4
+    const v8, 0x7f1000bd
 
     const/4 v9, -0x1
 
@@ -885,7 +885,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ak;->Jw()Lrx/internal/a/ak;
+    invoke-static {}, Lrx/internal/a/ak;->Jz()Lrx/internal/a/ak;
 
     move-result-object v0
 
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 065efaa629..5251b2a34f 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f040367
+    const p2, 0x7f040368
 
     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 d344448d29..b7688364fc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ca17ea66e0..26a2ee0d45 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -71,12 +71,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120bb4
+    const p1, 0x7f120be5
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120bab
+    const p1, 0x7f120bdc
 
     :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 40787b338b..2bc337d883 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
index 2d8065d76d..81e5c85832 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
@@ -70,7 +70,7 @@
 
     sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-    const v3, 0x7f1204ee
+    const v3, 0x7f120513
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -80,7 +80,7 @@
 
     invoke-static {v6, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1204ef
+    const v3, 0x7f120514
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -90,19 +90,19 @@
 
     invoke-static {v7, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f1204e2
+    const v3, 0x7f120507
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v8
 
-    const v3, 0x7f12037b
+    const v3, 0x7f1203a0
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v9
 
-    const v0, 0x7f0a04a1
+    const v0, 0x7f0a04ab
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -120,7 +120,7 @@
 
     move-result-object v10
 
-    const v0, 0x7f040285
+    const v0, 0x7f040286
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -198,12 +198,12 @@
 
     if-eqz v2, :cond_0
 
-    const v0, 0x7f121239
+    const v0, 0x7f1212c1
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120dad
+    const v0, 0x7f120de2
 
     :goto_0
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -216,12 +216,12 @@
 
     if-eqz v2, :cond_1
 
-    const v0, 0x7f121235
+    const v0, 0x7f1212bd
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f120dab
+    const v0, 0x7f120de0
 
     :goto_1
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -234,25 +234,25 @@
 
     if-eqz v2, :cond_2
 
-    const v0, 0x7f121232
+    const v0, 0x7f1212ba
 
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f120da7
+    const v0, 0x7f120ddc
 
     :goto_2
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v10
 
-    const v0, 0x7f12037b
+    const v0, 0x7f1203a0
 
     invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
     move-result-object v11
 
-    const v0, 0x7f0a04a1
+    const v0, 0x7f0a04ab
 
     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 36c70a19b4..8d6cd71a25 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, 0x7f0a02b4
+    const p1, 0x7f0a02b7
 
     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 1eb52105cf..4b6dafb9d2 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
@@ -222,7 +222,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
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 4d13243aa6..e50cb618fd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ebf351e44d..1cd5cf152e 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d007a
+    const v0, 0x7f0d007f
 
     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 9aae36e495..1d90e19224 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 1559130b3a..89f5d19e5c 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, 0x7f121094
+    const v2, 0x7f12111b
 
     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 b005f59494..50e998dcd7 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 8318a2dca8..25f06c3f40 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 188b0b5721..293da75395 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 081cfd02d3..60f40d9c7a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c4d940e278..0afc8cc68c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b24fac2fc7..fa8e3d00eb 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e7973afdf9..089b5cf5f2 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, 0x7f0a025f
+    const v0, 0x7f0a0262
 
     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, 0x7f0a0260
+    const v0, 0x7f0a0263
 
     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, 0x7f0a0266
+    const v0, 0x7f0a0269
 
     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, 0x7f0a0269
+    const v0, 0x7f0a026c
 
     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, 0x7f0a0265
+    const v0, 0x7f0a0268
 
     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, 0x7f0a026a
+    const v0, 0x7f0a026d
 
     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, 0x7f0a0262
+    const v0, 0x7f0a0265
 
     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, 0x7f0a0263
+    const v0, 0x7f0a0266
 
     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, 0x7f0a026b
+    const v0, 0x7f0a026e
 
     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, 0x7f0a0264
+    const v0, 0x7f0a0267
 
     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, 0x7f0a0267
+    const v0, 0x7f0a026a
 
     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, 0x7f0a026d
+    const v0, 0x7f0a0270
 
     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, 0x7f0a026c
+    const v0, 0x7f0a026f
 
     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, 0x7f0a0261
+    const v0, 0x7f0a0264
 
     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, 0x7f0a0268
+    const v0, 0x7f0a026b
 
     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, 0x7f0a025e
+    const v0, 0x7f0a0261
 
     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, 0x7f121232
+    const v1, 0x7f1212ba
 
     goto :goto_4
 
     :cond_6
-    const v1, 0x7f120da7
+    const v1, 0x7f120ddc
 
     :goto_4
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1315,7 +1315,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2;
 
@@ -1679,7 +1679,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120f2f
+    const v3, 0x7f120fb6
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
@@ -1689,7 +1689,7 @@
 
     invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120f2e
+    const v4, 0x7f120fb5
 
     invoke-virtual {v0, v4}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
@@ -1699,19 +1699,19 @@
 
     invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f1213ba
+    const v5, 0x7f121447
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
     move-result-object v5
 
-    const v6, 0x7f120c3d
+    const v6, 0x7f120c6f
 
     invoke-virtual {v0, v6}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String;
 
     move-result-object v6
 
-    const v7, 0x7f0a04a1
+    const v7, 0x7f0a04ab
 
     invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1837,7 +1837,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00ef
+    const v0, 0x7f0d00f5
 
     return v0
 .end method
@@ -1911,7 +1911,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
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 47a3cb6025..a6fd1fd38f 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
@@ -720,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;->vn:Lcom/discord/app/AppLog;
+    sget-object p0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     const-string v1, "unable to construct application news embed"
 
@@ -1148,7 +1148,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lcom/discord/app/a/a;->wW:Lkotlin/text/Regex;
+    sget-object v2, Lcom/discord/app/a/a;->wU:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
@@ -1287,7 +1287,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sget-object v2, Lcom/discord/app/a/a;->wV:Lkotlin/text/Regex;
+    sget-object v2, Lcom/discord/app/a/a;->wT:Lkotlin/text/Regex;
 
     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
 
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 fbc0de7497..eb74144793 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
@@ -451,7 +451,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -547,7 +547,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
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 227c98a99f..81634c5fe1 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -192,7 +192,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 73f331cbc8..291c34e97c 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, 0x7f0d014a
+    const v0, 0x7f0d0150
 
     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, 0x7f0a042e
+    const v0, 0x7f0a0436
 
     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, 0x7f0a042d
+    const v0, 0x7f0a0435
 
     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, 0x7f0a042f
+    const v0, 0x7f0a0437
 
     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 76f02e157a..2b4c49a439 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
@@ -119,7 +119,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
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 9dd3005ab1..dd846bf17c 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 833369c550..2c2c36fe34 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, 0x7f0d014b
+    const v0, 0x7f0d0151
 
     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, 0x7f0a0431
+    const v0, 0x7f0a0439
 
     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 ede626a885..647247f255 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, 0x7f0d014c
+    const v0, 0x7f0d0152
 
     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$ReactionUserViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter$ReactionUserViewHolder.smali
index b60be90c54..e3ee20b50b 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, 0x7f0d014d
+    const v0, 0x7f0d0153
 
     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, 0x7f0a0435
+    const v0, 0x7f0a043d
 
     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, 0x7f0a0434
+    const v0, 0x7f0a043c
 
     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, 0x7f0a0433
+    const v0, 0x7f0a043b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 7457cad3e5..8fa857b494 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 441611df2c..33f06e8e2a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 267f3c1f4d..8ede781b0a 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, 0x7f0a0430
+    const v0, 0x7f0a0438
 
     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, 0x7f0a0436
+    const v0, 0x7f0a043e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -262,7 +262,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0149
+    const v0, 0x7f0d014f
 
     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, 0x7f120f11
+    const p1, 0x7f120f98
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
index 0237925a6b..ef184451dd 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, 0x7f120c35
+    const v1, 0x7f120c67
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f120c34
+    const v1, 0x7f120c66
 
     :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 eae236136c..dd62f6536c 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, 0x7f0d00cd
+    const v0, 0x7f0d00d3
 
     return v0
 .end method
@@ -176,7 +176,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120db1
+    const p1, 0x7f120de6
 
     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 2413fabde8..2d4d4584ec 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 9885423841..9a58d50355 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6a7bce3b37..3d31456789 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
@@ -366,7 +366,7 @@
 
     if-nez p3, :cond_1
 
-    const p1, 0x7f1203c4
+    const p1, 0x7f1203e9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->getString(I)Ljava/lang/String;
 
@@ -443,7 +443,7 @@
 
     if-eq v0, v5, :cond_0
 
-    const p2, 0x7f12108e
+    const p2, 0x7f121115
 
     invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -456,9 +456,9 @@
     return-object p1
 
     :cond_0
-    sget-object v0, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f1211a9
+    const v0, 0x7f121231
 
     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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f121213
+    const v0, 0x7f12129b
 
     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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f120ce2
+    const v0, 0x7f120d14
 
     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, 0x7f0d010d
+    const v0, 0x7f0d0113
 
     return v0
 .end method
@@ -652,7 +652,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali b/com.discord/smali/com/discord/widgets/client/WidgetClientOutdated.smali
index 37108b0a1c..437fa52418 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, 0x7f0d010f
+    const v0, 0x7f0d0115
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging$Adapter$Item.smali
index de1bf1a087..0ca79017d6 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, 0x7f0a0252
+    const p1, 0x7f0a0255
 
     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, 0x7f0402a1
+    const p2, 0x7f0402a2
 
     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, 0x7f06011c
 
     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, 0x7f060127
 
     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, 0x7f060106
 
     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, 0x7f0402a7
+    const p2, 0x7f0402a8
 
     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 09d5ea71f8..e476002d8d 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, 0x7f0d0114
+    const p2, 0x7f0d011a
 
     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 8e2dec67b5..d8dd5d84a7 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 0x7f0a0457
+    .packed-switch 0x7f0a045f
         :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 fd3e0e131c..44dafb647b 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, 0x7f0a0457
+    const v0, 0x7f0a045f
 
     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 7248265ee5..f446826dc9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f36d7ac517..1e34d5ec0b 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, 0x7f0a0253
+    const v0, 0x7f0a0256
 
     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, 0x7f0d0113
+    const v0, 0x7f0d0119
 
     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, 0x7f1204dc
+    const p1, 0x7f120501
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -317,7 +317,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/debugging/WidgetDebugging;->filterSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
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 1bca93af13..a86e66e705 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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 3308aa9aaf..d617249998 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, 0x7f0a02dc
+    const v0, 0x7f0a02e0
 
     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, 0x7f0a02db
+    const v0, 0x7f0a02df
 
     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, 0x7f0a02dd
+    const v0, 0x7f0a02e1
 
     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, 0x7f0a02d7
+    const v0, 0x7f0a02db
 
     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, 0x7f0a02da
+    const v0, 0x7f0a02de
 
     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, 0x7f0a02d9
+    const v0, 0x7f0a02dd
 
     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, 0x7f0d0119
+    const v0, 0x7f0d011f
 
     return v0
 .end method
@@ -409,7 +409,7 @@
 
     aput-object v3, v1, v2
 
-    const v3, 0x7f120470
+    const v3, 0x7f120495
 
     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, 0x7f1210e9
+    const v5, 0x7f121170
 
     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, 0x7f12046f
+    const v5, 0x7f120494
 
     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, 0x7f120471
+    const v3, 0x7f120496
 
     new-array v5, v0, [Ljava/lang/Object;
 
@@ -498,11 +498,11 @@
 
     move-result-object p1
 
-    const v1, 0x7f120469
+    const v1, 0x7f12048e
 
     new-array v3, v0, [Ljava/lang/Object;
 
-    const-string v4, "9.7.3"
+    const-string v4, "9.7.4"
 
     aput-object v4, v3, v2
 
@@ -518,7 +518,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12046d
+    const v1, 0x7f120492
 
     new-array v3, v0, [Ljava/lang/Object;
 
@@ -542,7 +542,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12046c
+    const v1, 0x7f120491
 
     new-array v0, v0, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
index 08ad205af3..1f1d919382 100644
--- a/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
+++ b/com.discord/smali/com/discord/widgets/friends/NearbyManager.smali
@@ -262,7 +262,7 @@
 .method private final parseUserId(Lcom/google/android/gms/nearby/messages/Message;)Ljava/lang/Long;
     .locals 4
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
     const-string v0, "message.content"
 
@@ -270,7 +270,7 @@
 
     new-instance v0, Ljava/lang/String;
 
-    sget-object v1, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v0, p1, v1}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
@@ -331,9 +331,9 @@
 
     check-cast v1, Lcom/google/android/gms/nearby/messages/c;
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJD:Lcom/google/android/gms/nearby/messages/c;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJM:Lcom/google/android/gms/nearby/messages/c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->yX()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->za()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
@@ -349,7 +349,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sget-object p2, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     if-eqz p1, :cond_0
 
@@ -394,11 +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;->aJF:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->yZ()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zc()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     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 f97b5a61fe..f1a0112d3c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -128,7 +128,7 @@
     return-void
 
     :catch_0
-    sget-object v2, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/Exception;
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index 2394c7f773..d13ddc11fa 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, 0x7f0a02f4
+    const v0, 0x7f0a02f8
 
     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, 0x7f0a02f5
+    const v0, 0x7f0a02f9
 
     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, 0x7f0a02f3
+    const v0, 0x7f0a02f7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -434,7 +434,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011a
+    const v0, 0x7f0d0120
 
     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, 0x7f1206d2
+    const v1, 0x7f1206f6
 
     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.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
index 913e91c61f..67898a0b74 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, 0x7f0d00b7
+    const v0, 0x7f0d00bd
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -465,7 +465,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120a4f
+    const p2, 0x7f120a84
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -484,7 +484,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120b92
+    const p2, 0x7f120bc3
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 48b86d93ca..a8c227b466 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b7ddcb7d71..3ba55041f7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2.smali
index c0b331db84..9b144883ef 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -96,7 +96,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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 59afc7c6ea..51f34e8a26 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cc1001a442..654107f128 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -89,7 +89,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO: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 5d772b552f..3cf89111bb 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v0, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v0, Lcom/discord/app/e;->vh:J
+    sget-wide v0, Lcom/discord/app/e;->vg:J
 
     invoke-static {v0, v1}, Lcom/discord/app/e;->j(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 73df7b0d29..91d929a7d5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2c56b74515..f2b57da1f2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 908c3f799f..ebf0422479 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, 0x7f0a048d
+    const v0, 0x7f0a0497
 
     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, 0x7f0a048b
+    const v0, 0x7f0a0495
 
     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, 0x7f0a0487
+    const v0, 0x7f0a0491
 
     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, 0x7f0a048a
+    const v0, 0x7f0a0494
 
     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, 0x7f0a0489
+    const v0, 0x7f0a0493
 
     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, 0x7f0a0488
+    const v0, 0x7f0a0492
 
     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, 0x7f0a048e
+    const v0, 0x7f0a0498
 
     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, 0x7f0a048f
+    const v0, 0x7f0a0499
 
     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, 0x7f0a048c
+    const v0, 0x7f0a0496
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -892,7 +892,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011e
+    const v0, 0x7f0d0124
 
     return v0
 .end method
@@ -955,7 +955,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object p1
 
@@ -975,7 +975,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     new-instance v0, Lcom/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$1;
 
@@ -1164,7 +1164,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1188,7 +1188,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/friends/WidgetFriendsFindNearby;->getContext()Landroid/content/Context;
 
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 efdec31fc2..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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "presences"
-
-    move-object v8, p1
-
-    invoke-static {p1, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "guilds"
-
-    invoke-static {p3, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v6, "applicationStreams"
-
-    move-object/from16 v10, p6
-
-    invoke-static {v10, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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;->listOf(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..d178943d8b
--- /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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "presences"
+
+    move-object v8, p1
+
+    invoke-static {p1, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "guilds"
+
+    invoke-static {p3, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v6, "applicationStreams"
+
+    move-object/from16 v10, p6
+
+    invoke-static {v10, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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;->listOf(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 ab44a2645d..c8cc4e937c 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object 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 6fa4c8d011..bcdd5bb81a 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, 0x7f0d010c
+    const v2, 0x7f0d0112
 
     const/4 v3, 0x0
 
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 856e97e3f7..d057fb5c97 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fe55c26bb0..190ded02cc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 56dbc007ad..9b00886b39 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6301babd2e..9468f48192 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5710e2d081..6399781c1c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4457974d5d..dc8013beb8 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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, 0x7f1206d5
+    const v2, 0x7f1206f9
 
     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, 0x7f1206d3
+    const v0, 0x7f1206f7
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f1206d4
+    const v0, 0x7f1206f8
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f1206d5
+    const v0, 0x7f1206f9
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
 
-    const v0, 0x7f12032c
+    const v0, 0x7f120351
 
     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, 0x7f0d011b
+    const v0, 0x7f0d0121
 
     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 9408a730a4..40cb4e129c 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d011d
+    const v0, 0x7f0d0123
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a02f8
+    const v0, 0x7f0a02fc
 
     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 8966d3051b..fdd70b50a9 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d011c
+    const v0, 0x7f0d0122
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/friends/WidgetFriendsListAdapter$Item;-><init>(ILcom/discord/widgets/friends/WidgetFriendsListAdapter;)V
 
-    const v0, 0x7f0a02f6
+    const v0, 0x7f0a02fa
 
     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, 0x7f0a030d
+    const v0, 0x7f0a0311
 
     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, 0x7f0a02ff
+    const v0, 0x7f0a0303
 
     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, 0x7f0a030e
+    const v0, 0x7f0a0312
 
     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, 0x7f0a0309
+    const v0, 0x7f0a030d
 
     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, 0x7f0a030b
+    const v0, 0x7f0a030f
 
     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
-        0x7f0a0300
-        0x7f0a0303
-        0x7f0a0306
+        0x7f0a0304
+        0x7f0a0307
+        0x7f0a030a
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0a0301
-        0x7f0a0304
-        0x7f0a0307
+        0x7f0a0305
+        0x7f0a0308
+        0x7f0a030b
     .end array-data
 
     :array_2
     .array-data 4
-        0x7f0a0302
-        0x7f0a0305
-        0x7f0a0308
+        0x7f0a0306
+        0x7f0a0309
+        0x7f0a030c
     .end array-data
 .end method
 
@@ -736,7 +736,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f120cf6
+    const v4, 0x7f120d28
 
     invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -763,7 +763,7 @@
 
     move-result-object v1
 
-    const v4, 0x7f1209c9
+    const v4, 0x7f1209fe
 
     invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 de0c8e5ac2..e75ce8c4a5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9593440bc2..4d2d6848b7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 eb3776d984..d0665fb803 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 29c5aa4a3b..5774f7e288 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, 0x7f0a0331
+    const v0, 0x7f0a0339
 
     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, 0x7f0a032f
+    const v0, 0x7f0a0337
 
     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, 0x7f0d0125
+    const v0, 0x7f0d012b
 
     return v0
 .end method
@@ -210,7 +210,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f060136
+    const v1, 0x7f060137
 
     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 25cc8eed10..7172cb4fed 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 1711436fd4..852f446172 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2e8c64ef48..5f69e0b084 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d467a44b85..0ef980e50c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 54d62ffaa1..41e86ad2e6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 46b18a17e1..988ca3c84d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 48c2291e9e..d3f2ecf5fd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c49d3ee885..1869dc268e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 24227213a3..42573af3aa 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 5a1a81151b..cbd5e73642 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 01336229ff..25c11166ba 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1db14860c0..0f5e6698a0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 aee2fbe839..eaa8207f77 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, 0x7f0a033b
+    const v0, 0x7f0a0343
 
     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, 0x7f0a0339
+    const v0, 0x7f0a0341
 
     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, 0x7f0a033a
+    const v0, 0x7f0a0342
 
     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, 0x7f0a0337
+    const v0, 0x7f0a033f
 
     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, 0x7f0a0338
+    const v0, 0x7f0a0340
 
     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, 0x7f0a0333
+    const v0, 0x7f0a033b
 
     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, 0x7f0a0336
+    const v0, 0x7f0a033e
 
     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, 0x7f0a033c
+    const v0, 0x7f0a0344
 
     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, 0x7f0a033e
+    const v0, 0x7f0a0346
 
     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, 0x7f0a0340
+    const v0, 0x7f0a0348
 
     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, 0x7f0a0335
+    const v0, 0x7f0a033d
 
     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, 0x7f0a033f
+    const v0, 0x7f0a0347
 
     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, 0x7f0a0341
+    const v0, 0x7f0a0349
 
     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, 0x7f0a033d
+    const v0, 0x7f0a0345
 
     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, 0x7f0a0334
+    const v0, 0x7f0a033c
 
     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, 0x7f12109d
+    const v1, 0x7f121124
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f120937
+    const v1, 0x7f12096c
 
     :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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -1354,7 +1354,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f0d00d9
+    const v2, 0x7f0d00df
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -1498,7 +1498,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d00da
+    const v1, 0x7f0d00e0
 
     const/4 v2, 0x0
 
@@ -1666,7 +1666,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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, 0x7f0d0126
+    const v0, 0x7f0d012c
 
     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 b1559e476c..79309e5314 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, 0x7f0d0129
+    const v3, 0x7f0d012f
 
     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;->ff()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fi()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -279,7 +279,7 @@
 .method private getCommunityGuidelines()Ljava/lang/CharSequence;
     .locals 4
 
-    const v0, 0x7f120484
+    const v0, 0x7f1204a9
 
     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, 0x7f0a045f
+    const v0, 0x7f0a0467
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -399,7 +399,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0128
+    const v0, 0x7f0d012e
 
     return v0
 .end method
@@ -461,7 +461,7 @@
 
     if-eqz v1, :cond_0
 
-    const p1, 0x7f12104e
+    const p1, 0x7f1210d5
 
     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, 0x7f12122c
+    const p1, 0x7f1212b4
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -539,9 +539,9 @@
 .method public synthetic lambda$null$3$WidgetGuildCreate()V
     .locals 2
 
-    const v0, 0x7f1203d8
+    const v0, 0x7f1203fd
 
-    const v1, 0x7f12121c
+    const v1, 0x7f1212a4
 
     invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
 
@@ -650,7 +650,7 @@
 
     invoke-static {}, Lcom/discord/utilities/analytics/AnalyticsTracker;->createGuildViewed()V
 
-    const p1, 0x7f12047f
+    const p1, 0x7f1204a4
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -678,7 +678,7 @@
 
     iget-object v4, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIconSelectedResult:Lrx/functions/Action1;
 
-    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v5, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     move-object v0, p1
 
@@ -712,7 +712,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -722,7 +722,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->dimmer:Lcom/discord/utilities/dimmer/DimmerView;
 
-    const v0, 0x7f0a0349
+    const v0, 0x7f0a0351
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -732,7 +732,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->serverNameView:Landroid/widget/EditText;
 
-    const v0, 0x7f0a034a
+    const v0, 0x7f0a0352
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -742,7 +742,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->serverRegionsView:Landroid/view/ViewGroup;
 
-    const v0, 0x7f0a0348
+    const v0, 0x7f0a0350
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -750,7 +750,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateWrap:Landroid/view/View;
 
-    const v0, 0x7f0a0346
+    const v0, 0x7f0a034e
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -760,7 +760,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIcon:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0347
+    const v0, 0x7f0a034f
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -770,7 +770,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->guildCreateIconPlaceholder:Landroid/widget/ImageView;
 
-    const v0, 0x7f0a0345
+    const v0, 0x7f0a034d
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
index 3914a833e8..1623494e5a 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
@@ -42,7 +42,7 @@
 
     check-cast p1, Ljava/lang/CharSequence;
 
-    const p2, 0x7f120a55
+    const p2, 0x7f120a8a
 
     invoke-static {p0, p1, p2}, Lcom/discord/app/h;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
 
@@ -103,7 +103,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1209f0
+    const v1, 0x7f120a25
 
     invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -130,7 +130,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f1211b4
+    const v0, 0x7f12123c
 
     invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
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 ed1c9869be..d81c4a4c21 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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
index 5236721d48..8e751b1d6b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/InviteGenerator$generateForAppComponent$1;->invoke(Lcom/discord/models/domain/ModelInvite;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteGenerator.smali
index aa2090648d..5837ef23b0 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -214,7 +214,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p3, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getContext()Landroid/content/Context;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
index d3c1168ac4..d01be42f02 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali
@@ -98,7 +98,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v1}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v1
 
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 fb2eb3040b..4a9046b7d1 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p3, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object p3, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     const/4 p3, 0x1
 
@@ -166,7 +166,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p3, 0x7f0d008d
+    const p3, 0x7f0d0093
 
     const/4 v0, 0x1
 
@@ -204,7 +204,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p3, 0x7f0d008c
+    const p3, 0x7f0d0092
 
     const/4 v0, 0x0
 
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 efa1267b49..f94c2e7706 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet$onGenerateLinkListener$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet$updateSettings$1.smali
index ed2ffecd62..0d8f262ea1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d31dc23e1a..2d41794105 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
@@ -189,7 +189,7 @@
 
     invoke-direct {p0, p1}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f0a034e
+    const p1, 0x7f0a0356
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +197,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0355
+    const p1, 0x7f0a035d
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +205,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a035b
+    const p1, 0x7f0a0363
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +213,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0362
+    const p1, 0x7f0a036a
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +221,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0358
+    const p1, 0x7f0a0360
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -239,7 +239,7 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0d008c
+    const v2, 0x7f0d0092
 
     const/4 v3, 0x0
 
@@ -273,7 +273,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d0089
+    const v1, 0x7f0d008f
 
     invoke-static {p1, v1, v0}, Landroidx/core/widget/NestedScrollView;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -345,7 +345,7 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p1, 0x7f0a034e
+    const p1, 0x7f0a0356
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -353,7 +353,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0355
+    const p1, 0x7f0a035d
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -361,7 +361,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a035b
+    const p1, 0x7f0a0363
 
     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/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0362
+    const p1, 0x7f0a036a
 
     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/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0358
+    const p1, 0x7f0a0360
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -395,7 +395,7 @@
 
     invoke-static {v1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0d008c
+    const v2, 0x7f0d0092
 
     const/4 v3, 0x0
 
@@ -429,7 +429,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0089
+    const v0, 0x7f0d008f
 
     invoke-static {p1, v0, p2}, Landroidx/core/widget/NestedScrollView;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -501,7 +501,7 @@
 
     invoke-direct {p0, p1, p2, p3}, Landroidx/core/widget/NestedScrollView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;I)V
 
-    const p1, 0x7f0a034e
+    const p1, 0x7f0a0356
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -509,7 +509,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->channelSpinner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0355
+    const p1, 0x7f0a035d
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -517,7 +517,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->expiresAfterRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a035b
+    const p1, 0x7f0a0363
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -525,7 +525,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->maxUsesRadioGroup$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0362
+    const p1, 0x7f0a036a
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -533,7 +533,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->temporaryMembershipSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0358
+    const p1, 0x7f0a0360
 
     invoke-static {p0, p1}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -551,7 +551,7 @@
 
     invoke-static {v1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0d008c
+    const v2, 0x7f0d0092
 
     const/4 v3, 0x0
 
@@ -585,7 +585,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d0089
+    const p3, 0x7f0d008f
 
     invoke-static {p1, p3, p2}, Landroidx/core/widget/NestedScrollView;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -743,7 +743,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f0d0097
+    const v6, 0x7f0d009d
 
     move-object v7, p1
 
@@ -864,7 +864,7 @@
 
     const/16 v0, 0xe10
 
-    const v3, 0x7f100025
+    const v3, 0x7f100026
 
     if-eq p1, v0, :cond_3
 
@@ -889,7 +889,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f100024
+    const v0, 0x7f100025
 
     new-array v3, v2, [Ljava/lang/Object;
 
@@ -987,7 +987,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f100027
+    const v0, 0x7f100028
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -1010,7 +1010,7 @@
     return-object p1
 
     :cond_5
-    const p1, 0x7f120c3f
+    const p1, 0x7f120c71
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureUI$1$1.smali
index 76d651a97b..c4ab8c85d6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c7d5cb95af..a9a3c544f0 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;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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 16c973414d..3e2e8ee850 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -74,7 +74,7 @@
     return-void
 
     :cond_0
-    sget-object p1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object p1, Lcom/discord/app/AppLog;->vm: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 7824f2e331..aa427d64ef 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, 0x7f0a0359
+    const v0, 0x7f0a0361
 
     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, 0x7f0a034b
+    const v0, 0x7f0a0353
 
     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, 0x7f0a034d
+    const v0, 0x7f0a0355
 
     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, 0x7f0a035f
+    const v0, 0x7f0a0367
 
     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, 0x7f0d012a
+    const v0, 0x7f0d0130
 
     return v0
 .end method
@@ -759,7 +759,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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
index c9d2549059..1ea570cc1c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$1.smali
@@ -61,7 +61,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 789044630a..5ad70645bb 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2.smali
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->invoke(Ljava/util/List;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 3cdf50662e..3814b6dc79 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, 0x7f0d012e
+    const v0, 0x7f0d0134
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03eb
+    const p1, 0x7f0a03f3
 
     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, 0x7f0a0403
+    const p1, 0x7f0a040b
 
     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, 0x7f0a03ec
+    const p1, 0x7f0a03f4
 
     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, 0x7f0a0404
+    const p1, 0x7f0a040c
 
     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 f4214074b9..2332825447 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fd9978f7c6..8468def75c 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
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index a7bd590ab8..d5f781df21 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$initBottomSheet$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBound$2.smali
index 775d0efdee..262923766e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1.smali
index 11558ef183..fb4cb5c755 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$onViewBoundOrOnResume$1;->invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 24429340f4..b1c0d49f71 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
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 24dc2bb321..065e6486de 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
@@ -356,7 +356,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a05ae
+    const v0, 0x7f0a05c3
 
     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/guilds/invite/WidgetGuildInviteShare;->searchBack$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05b8
+    const v0, 0x7f0a05cd
 
     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/guilds/invite/WidgetGuildInviteShare;->searchInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05b2
+    const v0, 0x7f0a05c7
 
     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/guilds/invite/WidgetGuildInviteShare;->searchClear$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0361
+    const v0, 0x7f0a0369
 
     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/guilds/invite/WidgetGuildInviteShare;->suggestionsFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0360
+    const v0, 0x7f0a0368
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -396,7 +396,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->suggestionRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a034f
+    const v0, 0x7f0a0357
 
     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/guilds/invite/WidgetGuildInviteShare;->emptyResults$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035e
+    const v0, 0x7f0a0366
 
     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/guilds/invite/WidgetGuildInviteShare;->shareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035c
+    const v0, 0x7f0a0364
 
     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/guilds/invite/WidgetGuildInviteShare;->neverExpireSwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035a
+    const v0, 0x7f0a0362
 
     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/guilds/invite/WidgetGuildInviteShare;->inviteLinkTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a035d
+    const v0, 0x7f0a0365
 
     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/guilds/invite/WidgetGuildInviteShare;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03cb
+    const v0, 0x7f0a03d3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1303,7 +1303,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v3, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getContext()Landroid/content/Context;
 
@@ -1381,7 +1381,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012c
+    const v0, 0x7f0d0132
 
     return v0
 .end method
@@ -1525,7 +1525,7 @@
 
     invoke-virtual {p0, v5, v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
 
-    const v4, 0x7f120a65
+    const v4, 0x7f120a9a
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1564,7 +1564,7 @@
 
     invoke-static {v4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0403a5
+    const v1, 0x7f0403a6
 
     invoke-static {v4, v1, v0, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
index fe87fff5a3..98421c742f 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$initBottomSheet$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
index cf900babff..281f83bb54 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$onViewBoundOrOnResume$1.smali
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index b305535289..562c4a052b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
@@ -185,7 +185,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0352
+    const v0, 0x7f0a035a
 
     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/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsShareBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0353
+    const v0, 0x7f0a035b
 
     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/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteSettingsBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0351
+    const v0, 0x7f0a0359
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -209,7 +209,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->emptySuggestionsInviteLinkTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0354
+    const v0, 0x7f0a035c
 
     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/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->backgroundTint$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a03cb
+    const v0, 0x7f0a03d3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -449,7 +449,7 @@
 
     aput-object v3, v2, v4
 
-    const v3, 0x7f100025
+    const v3, 0x7f100026
 
     invoke-virtual {v0, v3, p1, v2}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -471,7 +471,7 @@
 
     aput-object p2, v2, v1
 
-    const p1, 0x7f120a69
+    const p1, 0x7f120a9e
 
     invoke-virtual {v0, p1, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -641,7 +641,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120b91
+    const v1, 0x7f120bc2
 
     invoke-virtual {p1, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -695,7 +695,7 @@
 
     const/4 v4, 0x2
 
-    const v5, 0x7f120a69
+    const v5, 0x7f120a9e
 
     if-eq v0, v1, :cond_5
 
@@ -722,7 +722,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f100024
+    const v1, 0x7f100025
 
     invoke-virtual {v0, v1, v3}, Landroid/content/res/Resources;->getQuantityString(II)Ljava/lang/String;
 
@@ -810,7 +810,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f100028
+    const v1, 0x7f100029
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -863,7 +863,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120b8d
+    const v2, 0x7f120bbe
 
     invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -903,7 +903,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d012d
+    const v0, 0x7f0d0133
 
     return v0
 .end method
@@ -1027,7 +1027,7 @@
 
     invoke-virtual {p0, v4, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
 
-    const v3, 0x7f120a65
+    const v3, 0x7f120a9a
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
index f042077ff5..b925fad2ba 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
index 106e6535b2..b32e0ee98d 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali
@@ -177,13 +177,13 @@
 
     iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->selectedChannelSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {v2}, Lrx/subjects/BehaviorSubject;->bD(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -404,7 +404,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -580,7 +580,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->refreshUiSubject:Lrx/subjects/BehaviorSubject;
 
-    sget-object v1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
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 e1fa3569a9..4e61dcbac3 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, 0x7f0a03c9
+    const p1, 0x7f0a03d1
 
     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, 0x7f0a03cd
+    const p1, 0x7f0a03d5
 
     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, 0x7f0a03c8
+    const p1, 0x7f0a03d0
 
     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, 0x7f0a03c5
+    const p1, 0x7f0a03cd
 
     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, 0x7f0a03c4
+    const p1, 0x7f0a03cc
 
     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, 0x7f0a03c6
+    const p1, 0x7f0a03ce
 
     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, 0x7f0a03c7
+    const p1, 0x7f0a03cf
 
     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, 0x7f0a03b7
+    const p1, 0x7f0a03bf
 
     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, 0x7f0a03ba
+    const p1, 0x7f0a03c2
 
     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, 0x7f0a03b8
+    const p1, 0x7f0a03c0
 
     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, 0x7f0a03b9
+    const p1, 0x7f0a03c1
 
     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, 0x7f0a03c1
+    const p1, 0x7f0a03c9
 
     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, 0x7f0d012b
+    const v1, 0x7f0d0131
 
     invoke-static {p1, v1, v0}, Landroidx/appcompat/widget/LinearLayoutCompat;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -898,7 +898,7 @@
 
     move-result-object v9
 
-    const v10, 0x7f0803bc
+    const v10, 0x7f0803c9
 
     const/4 v11, 0x0
 
@@ -931,7 +931,7 @@
 
     move-result-object v9
 
-    const v10, 0x7f080323
+    const v10, 0x7f08032f
 
     const/4 v11, 0x0
 
@@ -1100,7 +1100,7 @@
 
     if-nez p1, :cond_0
 
-    const p1, 0x7f1209fa
+    const p1, 0x7f120a2f
 
     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, 0x7f120286
+    const v0, 0x7f120288
 
     const/4 v1, 0x1
 
@@ -1147,7 +1147,7 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f120286
+    const p2, 0x7f120288
 
     const/4 v0, 0x1
 
@@ -1172,7 +1172,7 @@
     return-object p1
 
     :cond_0
-    const p1, 0x7f1209fc
+    const p1, 0x7f120a31
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1230,7 +1230,7 @@
 
     aput-object v3, v0, v4
 
-    const v3, 0x7f100071
+    const v3, 0x7f100073
 
     invoke-virtual {v2, v3, p1, v0}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1242,7 +1242,7 @@
 
     aput-object p1, v1, v4
 
-    const p1, 0x7f1209ea
+    const p1, 0x7f120a1f
 
     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, 0x7f1209e9
+    const p1, 0x7f120a1e
 
     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, 0x7f1209e1
+    const v1, 0x7f120a16
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -1547,7 +1547,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120a12
+    const v1, 0x7f120a47
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$1.smali
index 6b01055274..a90382f5db 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+    value = Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1.smali
index dbb83cec45..0e78a91693 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1.smali
@@ -70,7 +70,7 @@
 .end method
 
 .method public final call(Lkotlin/Pair;)Lrx/Observable;
-    .locals 16
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -152,16 +152,22 @@
 
     iget-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;
 
-    iget-object v15, v1, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeStateRxScheduler:Lrx/Scheduler;
+    iget-object v15, v1, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeUserNotes:Lcom/discord/stores/StoreUserNotes;
 
-    invoke-static/range {v2 .. v15}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->access$observeStoreStateFromUsersAndChannels(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+    iget-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2$$special$$inlined$let$lambda$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;
+
+    iget-object v1, v1, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeStateRxScheduler:Lrx/Scheduler;
+
+    move-object/from16 v16, v1
+
+    invoke-static/range {v2 .. v16}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->access$observeStoreStateFromUsersAndChannels(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object v1
 
     if-nez v1, :cond_1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2.smali
index 018e1c5693..d53f6a56ba 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+    value = Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -45,6 +45,8 @@
 
 .field final synthetic $storeStateRxScheduler:Lrx/Scheduler;
 
+.field final synthetic $storeUserNotes:Lcom/discord/stores/StoreUserNotes;
+
 .field final synthetic $storeUserPresence:Lcom/discord/stores/StoreUserPresence;
 
 .field final synthetic $storeUserProfile:Lcom/discord/stores/StoreUserProfile;
@@ -59,7 +61,7 @@
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)V
+.method constructor <init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;
@@ -84,7 +86,9 @@
 
     iput-object p11, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeApplicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
 
-    iput-object p12, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeStateRxScheduler:Lrx/Scheduler;
+    iput-object p12, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeUserNotes:Lcom/discord/stores/StoreUserNotes;
+
+    iput-object p13, p0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;->$storeStateRxScheduler:Lrx/Scheduler;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -175,7 +179,7 @@
     if-nez p1, :cond_1
 
     :cond_0
-    invoke-static {}, Lrx/Observable;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1.smali
index d673a41151..05eb848bf0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1.smali
@@ -3,12 +3,12 @@
 .source "WidgetUserSheetViewModelFactory.kt"
 
 # interfaces
-.implements Lrx/functions/Func4;
+.implements Lrx/functions/Func5;
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreStateFromUsersAndChannels(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+    value = Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreStateFromUsersAndChannels(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -26,12 +26,14 @@
         "Ljava/lang/Object;",
         "T4:",
         "Ljava/lang/Object;",
+        "T5:",
+        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lrx/functions/Func5<",
+        "TT1;TT2;TT3;TT4;TT5;TR;>;"
     }
 .end annotation
 
@@ -61,8 +63,8 @@
 
 
 # virtual methods
-.method public final call(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$StoreChunk;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
-    .locals 18
+.method public final call(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$StoreChunk;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -73,14 +75,26 @@
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelVoice$State;",
-            ">;)",
+            ">;",
+            "Ljava/lang/String;",
+            ")",
             "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;"
         }
     .end annotation
 
     move-object/from16 v0, p0
 
-    new-instance v17, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    move-object/from16 v15, p2
+
+    move-object/from16 v16, p3
+
+    move-object/from16 v8, p4
+
+    move-object/from16 v17, p5
+
+    new-instance v18, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+
+    move-object/from16 v1, v18
 
     iget-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;->$user:Lcom/discord/models/domain/ModelUser;
 
@@ -100,11 +114,11 @@
 
     move-result-object v7
 
-    const-string v1, "channelVoiceStates"
+    const-string v9, "channelVoiceStates"
 
-    move-object/from16 v8, p4
+    move-object/from16 v10, p4
 
-    invoke-static {v8, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v10, v9}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$StoreChunk;->getMuted()Z
 
@@ -130,22 +144,22 @@
 
     move-result-object v14
 
-    const-string v1, "userProfile"
+    const-string v0, "userProfile"
 
-    move-object/from16 v15, p2
+    move-object/from16 p3, v1
 
-    invoke-static {v15, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v1, p2
 
-    move-object/from16 v1, v17
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v16, p3
+    move-object/from16 v1, p3
 
-    invoke-direct/range {v1 .. v16}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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
+    invoke-direct/range {v1 .. v17}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;Ljava/lang/String;)V
 
-    return-object v17
+    return-object v18
 .end method
 
-.method public final bridge synthetic call(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;
     .locals 0
 
     check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$StoreChunk;
@@ -156,7 +170,9 @@
 
     check-cast p4, Ljava/util/Map;
 
-    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;->call(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$StoreChunk;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Ljava/util/Map;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    check-cast p5, Ljava/lang/String;
+
+    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;->call(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$StoreChunk;Lcom/discord/models/domain/ModelUserProfile;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
index 37635ce9d5..830f40f7fd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory.smali
@@ -37,10 +37,10 @@
     return-void
 .end method
 
-.method public static final synthetic access$observeStoreStateFromUsersAndChannels(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+.method public static final synthetic access$observeStoreStateFromUsersAndChannels(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
     .locals 0
 
-    invoke-direct/range {p0 .. p13}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreStateFromUsersAndChannels(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+    invoke-direct/range {p0 .. p14}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreStateFromUsersAndChannels(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object p0
 
@@ -299,8 +299,8 @@
     return-object v0
 .end method
 
-.method private final observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
-    .locals 16
+.method private final observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -315,6 +315,7 @@
             "Lcom/discord/stores/StoreUserPresence;",
             "Lcom/discord/stores/StorePermissions;",
             "Lcom/discord/stores/StoreApplicationStreaming;",
+            "Lcom/discord/stores/StoreUserNotes;",
             "Lrx/Scheduler;",
             ")",
             "Lrx/Observable<",
@@ -323,9 +324,9 @@
         }
     .end annotation
 
-    move-object/from16 v13, p0
+    move-object/from16 v14, p0
 
-    iget-wide v0, v13, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->userId:J
+    iget-wide v0, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->userId:J
 
     move-object/from16 v2, p1
 
@@ -343,11 +344,11 @@
 
     invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
 
-    move-result-object v14
+    move-result-object v15
 
-    new-instance v15, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;
+    new-instance v16, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;
 
-    move-object v0, v15
+    move-object/from16 v0, v16
 
     move-object/from16 v1, p0
 
@@ -373,11 +374,15 @@
 
     move-object/from16 v12, p12
 
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)V
+    move-object/from16 v13, p13
 
-    check-cast v15, Lrx/functions/b;
+    invoke-direct/range {v0 .. v13}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreState$2;-><init>(Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)V
 
-    invoke-virtual {v14, v15}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    move-object/from16 v0, v16
+
+    check-cast v0, Lrx/functions/b;
+
+    invoke-virtual {v15, v0}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object v0
 
@@ -389,7 +394,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -404,7 +409,7 @@
     return-object v0
 .end method
 
-.method private final observeStoreStateFromUsersAndChannels(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+.method private final observeStoreStateFromUsersAndChannels(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
     .locals 12
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -421,6 +426,7 @@
             "Lcom/discord/stores/StoreUserPresence;",
             "Lcom/discord/stores/StorePermissions;",
             "Lcom/discord/stores/StoreApplicationStreaming;",
+            "Lcom/discord/stores/StoreUserNotes;",
             "Lrx/Scheduler;",
             ")",
             "Lrx/Observable<",
@@ -451,7 +457,7 @@
 
     move-object/from16 v10, p12
 
-    move-object/from16 v11, p13
+    move-object/from16 v11, p14
 
     invoke-direct/range {v0 .. v11}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreChunk(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
 
@@ -499,23 +505,45 @@
 
     move-result-object v3
 
-    new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-object v5, p1
+    move-result-wide v4
 
-    move-object v6, p2
+    move-object/from16 v6, p13
 
-    move-object v7, p3
+    invoke-virtual {v6, v4, v5}, Lcom/discord/stores/StoreUserNotes;->getForUserId(J)Lrx/Observable;
 
-    invoke-direct {v4, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
+    move-result-object v4
 
-    check-cast v4, Lrx/functions/Func4;
+    new-instance v5, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;
 
-    invoke-static {v0, v1, v2, v3, v4}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+    move-object v6, p1
+
+    move-object v7, p2
+
+    move-object v8, p3
+
+    invoke-direct {v5, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory$observeStoreStateFromUsersAndChannels$1;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;)V
+
+    check-cast v5, Lrx/functions/Func5;
+
+    move-object p1, v0
+
+    move-object p2, v1
+
+    move-object p3, v2
+
+    move-object/from16 p4, v3
+
+    move-object/from16 p5, v4
+
+    move-object/from16 p6, v5
+
+    invoke-static/range {p1 .. p6}, 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\u2026lationshipType)\n        }"
+    const-string v1, "Observable\n        .comb\u2026ote = userNote)\n        }"
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
@@ -525,7 +553,7 @@
 
 # virtual methods
 .method public final create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-    .locals 25
+    .locals 27
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<T:",
@@ -536,7 +564,7 @@
         }
     .end annotation
 
-    move-object/from16 v13, p0
+    move-object/from16 v14, p0
 
     const-string v0, "modelClass"
 
@@ -544,13 +572,13 @@
 
     invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v14, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
+    new-instance v15, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    iget-wide v11, v13, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->userId:J
+    iget-wide v12, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->userId:J
 
-    iget-wide v9, v13, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:J
+    iget-wide v10, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->channelId:J
 
-    iget-boolean v15, v13, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->isVoiceContext:Z
+    iget-boolean v9, v14, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->isVoiceContext:Z
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -636,41 +664,53 @@
 
     move-result-object v21
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsersNotes()Lcom/discord/stores/StoreUserNotes;
+
+    move-result-object v22
+
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
-    move-wide/from16 v22, v9
+    move/from16 p1, v9
 
     const-string v9, "Schedulers.computation()"
 
     invoke-static {v0, v9}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v24, v0
+    move-object/from16 v23, v0
 
     move-object/from16 v0, p0
 
+    move/from16 v24, p1
+
     move-object/from16 v9, v19
 
+    move-wide/from16 v25, v10
+
     move-object/from16 v10, v20
 
-    move-wide/from16 v19, v11
-
     move-object/from16 v11, v21
 
-    move-object/from16 v12, v24
+    move-wide/from16 v19, v12
 
-    invoke-direct/range {v0 .. v12}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lrx/Scheduler;)Lrx/Observable;
+    move-object/from16 v12, v22
+
+    move-object/from16 v13, v23
+
+    invoke-direct/range {v0 .. v13}, Lcom/discord/widgets/guilds/invite/WidgetUserSheetViewModelFactory;->observeStoreState(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreUserProfile;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StoreVoiceStates;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreUserPresence;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreApplicationStreaming;Lcom/discord/stores/StoreUserNotes;Lrx/Scheduler;)Lrx/Observable;
 
     move-result-object v10
 
-    move-object v1, v14
+    move-object v1, v15
 
     move-wide/from16 v2, v19
 
-    move-wide/from16 v4, v22
+    move-wide/from16 v4, v25
 
-    move v6, v15
+    move/from16 v6, v24
 
     move-object/from16 v7, v16
 
@@ -680,9 +720,9 @@
 
     invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;-><init>(JJZLcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreChannels;Lcom/discord/utilities/rest/RestAPI;Lrx/Observable;)V
 
-    check-cast v14, Landroidx/lifecycle/ViewModel;
+    check-cast v15, Landroidx/lifecycle/ViewModel;
 
-    return-object v14
+    return-object v15
 .end method
 
 .method public final getChannelId()J
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 2969847af1..4d07d124c4 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, 0x7f120a9a
+    const v0, 0x7f120acb
 
     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 08a0f9b8aa..c5781cd57b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0dc870eafd..8ab2ae4dac 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, 0x7f0a0365
+    const v0, 0x7f0a036d
 
     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, 0x7f0d012f
+    const v0, 0x7f0d0135
 
     return v0
 .end method
@@ -120,7 +120,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a0460
+    const v0, 0x7f0a0468
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
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 3e303ffa4d..654bb9f739 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, 0x7f0a0381
+    const p2, 0x7f0a0389
 
     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, 0x7f0a0380
+    const p2, 0x7f0a0388
 
     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, 0x7f0a0387
+    const p2, 0x7f0a038f
 
     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, 0x7f0a0388
+    const p2, 0x7f0a0390
 
     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, 0x7f0a0384
+    const p2, 0x7f0a038c
 
     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, 0x7f0a0389
+    const p2, 0x7f0a0391
 
     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, 0x7f0a0383
+    const p2, 0x7f0a038b
 
     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;->fg()V
+    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->fj()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;->fg()V
+    invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->fj()V
 
     :goto_6
     invoke-virtual {v2}, Lcom/discord/views/ServerFolderView;->getGuildViews()Ljava/util/List;
@@ -544,13 +544,13 @@
     const/4 v11, 0x0
 
     :goto_a
-    iget v12, v4, Lcom/discord/views/GuildView;->CY:I
+    iget v12, v4, Lcom/discord/views/GuildView;->CZ:I
 
     const/4 v14, -0x1
 
     if-eq v12, v14, :cond_c
 
-    iget v12, v4, Lcom/discord/views/GuildView;->CY:I
+    iget v12, v4, Lcom/discord/views/GuildView;->CZ:I
 
     goto :goto_b
 
@@ -803,7 +803,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f080155
+    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 d6c572caf5..7c2d86788d 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, 0x7f0a0385
+    const p2, 0x7f0a038d
 
     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, 0x7f0a0386
+    const p2, 0x7f0a038e
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -136,12 +136,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f080154
+    const p1, 0x7f080158
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080106
+    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 d6e6731ac3..5362e42a92 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, 0x7f0a037d
+    const p2, 0x7f0a0385
 
     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, 0x7f0a037b
+    const p2, 0x7f0a0383
 
     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, 0x7f0a037c
+    const p2, 0x7f0a0384
 
     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, 0x7f0a0384
+    const p2, 0x7f0a038c
 
     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, 0x7f0a0389
+    const p2, 0x7f0a0391
 
     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, 0x7f0a0388
+    const p2, 0x7f0a0390
 
     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, 0x7f0a0387
+    const p2, 0x7f0a038f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -419,7 +419,7 @@
 
     check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    const v3, 0x7f080070
+    const v3, 0x7f080071
 
     invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->R(I)V
 
@@ -658,12 +658,12 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080156
+    const p1, 0x7f08015a
 
     goto :goto_1
 
     :cond_1
-    const p1, 0x7f08010d
+    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 b70e02dcbc..235defccb5 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, 0x7f0a037e
+    const p2, 0x7f0a0386
 
     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, 0x7f0a037f
+    const p2, 0x7f0a0387
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 b32043d444..60fbd09d03 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, 0x7f120ba7
+    const v2, 0x7f120bd8
 
     const/4 v3, 0x1
 
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 198405f254..f47f93b572 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9a8ddebc75..69f187d5c0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7731e7acf7..ada534edfc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2375a7aae3..cd6d7932b0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0ac9f62414..c3cb933906 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6e65e2c105..f1eb9d5ea0 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 048773f56b..adbf0fafd0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildListAdapter.smali
@@ -510,7 +510,7 @@
     throw p1
 
     :pswitch_0
-    const p1, 0x7f0d0138
+    const p1, 0x7f0d013e
 
     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, 0x7f0d013a
+    const p1, 0x7f0d0140
 
     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, 0x7f0d013b
+    const p1, 0x7f0d0141
 
     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, 0x7f0d013c
+    const p2, 0x7f0d0142
 
     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, 0x7f060080
+    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, 0x7f0600cc
+    const p2, 0x7f0600cd
 
     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, 0x7f0d0137
+    const p1, 0x7f0d013d
 
     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, 0x7f0d0135
+    const p1, 0x7f0d013b
 
     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, 0x7f0d013d
+    const p1, 0x7f0d0143
 
     invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/list/WidgetGuildListAdapter$onCreateViewHolder$1;->invoke(I)Landroid/view/View;
 
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 ea22155e60..25be4d7262 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fb138b8d04..685cfd9f78 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2bf645ad42..000d0b105b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6784d27904..0442850526 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, 0x7f0a05b8
+    const v0, 0x7f0a05cd
 
     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, 0x7f0a05b2
+    const v0, 0x7f0a05c7
 
     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, 0x7f0a05ae
+    const v0, 0x7f0a05c3
 
     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, 0x7f0a036e
+    const v0, 0x7f0a0376
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -354,7 +354,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0131
+    const v0, 0x7f0d0137
 
     return v0
 .end method
@@ -408,7 +408,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -482,7 +482,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120e47
+    const v0, 0x7f120e87
 
     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 46d7d657a4..f39aa28a3e 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, 0x7f0d0132
+    const v0, 0x7f0d0138
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a036c
+    const p1, 0x7f0a0374
 
     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, 0x7f0a036d
+    const p1, 0x7f0a0375
 
     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 5fb74d1f8c..078548762d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6152b243d2..32abaf5dc5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a4a6ba88f4..e788344b92 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4d4229a006..286b0ed4e2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ba8cfa54fa..7b0840c134 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4d271ca896..2d54721e82 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c0aa10b40a..b427dfbe62 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, 0x7f0a0366
+    const v0, 0x7f0a036e
 
     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, 0x7f0a0368
+    const v0, 0x7f0a0370
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -563,7 +563,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f080155
+    const v3, 0x7f080159
 
     invoke-static {v2, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -582,7 +582,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f080157
+    const v4, 0x7f08015b
 
     invoke-static {v3, v4}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -601,7 +601,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f08012f
+    const v5, 0x7f080133
 
     invoke-static {v4, v5}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -732,7 +732,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0134
+    const v0, 0x7f0d013a
 
     return v0
 .end method
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 3af6c4f1df..d565913d53 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 a840e57d63..92a1fcbb94 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v5
 
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 0bcf7f850f..46f01e3483 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -91,7 +91,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -99,7 +99,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -1822,7 +1822,7 @@
 
     new-instance v4, Lcom/discord/widgets/guilds/list/GuildListItem$FolderItem;
 
-    sget-object v7, Lkotlin/f/c;->bhJ:Lkotlin/f/c$b;
+    sget-object v7, Lkotlin/f/c;->bhT:Lkotlin/f/c$b;
 
     invoke-virtual {v7}, Lkotlin/f/c$b;->nextLong()J
 
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 7cce9084ff..750b34d596 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 87dbfdedcf..ff131338af 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 5a6f4bd151..1d169fea7b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b93e7f5f0d..99075eab82 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 af47c2cce0..c10fda165c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -116,7 +116,7 @@
     return-void
 
     :cond_1
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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 9d990dbc07..39f8c1c803 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 09ce843d07..ee72eb2791 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a1abaa9112..cfe702b0e9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object 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 3cf0b65b68..0c254c51c2 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
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$3;->invoke(Lcom/discord/utilities/surveys/SurveyUtils$Survey;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object 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
index 6055b4e603..157517b035 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$5;->invoke(Lcom/discord/stores/StoreNux$NuxState;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 1e2347d11a..e8619fce14 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
@@ -91,7 +91,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f120c74
+    const v4, 0x7f120ca6
 
     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 e96d08200c..8207ef2067 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, 0x7f0a0367
+    const v0, 0x7f0a036f
 
     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, 0x7f0a041e
+    const v0, 0x7f0a0426
 
     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, 0x7f0a042b
+    const v0, 0x7f0a0433
 
     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;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -678,7 +678,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0140
+    const v0, 0x7f0d0146
 
     return v0
 .end method
@@ -850,9 +850,9 @@
 
     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;->Bb:Lcom/discord/samsung/a;
+    sget-object p1, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eI()Z
+    invoke-static {}, Lcom/discord/samsung/a;->eK()Z
 
     move-result p1
 
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 85c1975739..d97d248e18 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, 0x7f0a0428
+    const v0, 0x7f0a0430
 
     const/4 v2, 0x0
 
     if-eq p1, v0, :cond_2
 
-    const v0, 0x7f0a042a
+    const v0, 0x7f0a0432
 
     if-eq p1, v0, :cond_1
 
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 a8a19981b3..411550a36a 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, 0x7f0a0452
+    const v2, 0x7f0a045a
 
     const/4 v3, 0x1
 
@@ -65,7 +65,7 @@
 
     if-ne v0, v4, :cond_0
 
-    const v0, 0x7f0a0449
+    const v0, 0x7f0a0451
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -108,7 +108,7 @@
 
     if-nez v0, :cond_1
 
-    const v0, 0x7f0a044e
+    const v0, 0x7f0a0456
 
     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, 0x7f0a044f
+    const v5, 0x7f0a0457
 
     const/16 v6, 0x8
 
@@ -147,7 +147,7 @@
     goto :goto_1
 
     :cond_2
-    const v0, 0x7f0a044c
+    const v0, 0x7f0a0454
 
     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, 0x7f0a044d
+    const v0, 0x7f0a0455
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -174,7 +174,7 @@
     goto :goto_1
 
     :cond_3
-    const v0, 0x7f0a044b
+    const v0, 0x7f0a0453
 
     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, 0x7f0a044a
+    const v0, 0x7f0a0452
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -209,7 +209,7 @@
     goto :goto_1
 
     :cond_4
-    const v0, 0x7f0a0446
+    const v0, 0x7f0a044e
 
     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, 0x7f0a0445
+    const v0, 0x7f0a044d
 
     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, 0x7f0a0450
+    const v0, 0x7f0a0458
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -331,7 +331,7 @@
     const/4 v0, 0x0
 
     :goto_2
-    const v2, 0x7f0a0451
+    const v2, 0x7f0a0459
 
     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, 0x7f0a0453
+    const v2, 0x7f0a045b
 
     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, 0x7f0a0454
+    const v0, 0x7f0a045c
 
     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 4c94a8e9c9..e73c1432f8 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
@@ -398,7 +398,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0445
+    .packed-switch 0x7f0a044d
         :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 e484000ae3..cd29640d36 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, 0x7f0402aa
+    const v1, 0x7f0402ab
 
     invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -188,7 +188,7 @@
     return-object v2
 
     :cond_4
-    const p1, 0x7f1203ca
+    const p1, 0x7f1203ef
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -197,7 +197,7 @@
     goto :goto_0
 
     :cond_5
-    const p1, 0x7f1206bb
+    const p1, 0x7f1206df
 
     invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 01d1944fef..4f0d241241 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 1104722073..f31d88569b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 02fd829edd..db7c017e6f 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, 0x7f0a0429
+    const v0, 0x7f0a0431
 
     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, 0x7f0a0420
+    const v0, 0x7f0a0428
 
     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 15f33ac373..374e38cd3d 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, 0x7f0a0421
+    const v0, 0x7f0a0429
 
     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, 0x7f0a0423
+    const v0, 0x7f0a042b
 
     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, 0x7f0a0422
+    const v0, 0x7f0a042a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -108,7 +108,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203ca
+    const v1, 0x7f1203ef
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -127,7 +127,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1203c9
+    const v1, 0x7f1203ee
 
     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 86c7f88ac0..c0e73fa336 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, 0x7f0a0424
+    const p2, 0x7f0a042c
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -151,7 +151,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a083d
+    const v1, 0x7f0a086d
 
     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, 0x7f0a0426
+    const v0, 0x7f0a042e
 
     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, 0x7f0a0427
+    const v0, 0x7f0a042f
 
     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 f1f49f5293..37157b1c36 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
@@ -81,7 +81,7 @@
 
     if-nez p4, :cond_0
 
-    const p2, 0x7f120c76
+    const p2, 0x7f120ca8
 
     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 c48b028060..fba81d02a1 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, 0x7f0a07fc
+    const v0, 0x7f0a082b
 
     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, 0x7f0a07fd
+    const v0, 0x7f0a082c
 
     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, 0x7f0a07fb
+    const v0, 0x7f0a082a
 
     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, 0x7f0a07fa
+    const v0, 0x7f0a0829
 
     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, 0x7f0d007f
+    const v0, 0x7f0d0084
 
     return v0
 .end method
@@ -389,7 +389,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120c75
+    const v3, 0x7f120ca7
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
@@ -411,7 +411,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120c3e
+    const v2, 0x7f120c70
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String;
 
@@ -437,7 +437,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120ce1
+    const v2, 0x7f120d13
 
     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$onViewBoundOrOnResume$1$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
index afe902999f..59617a1c86 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, 0x7f120550
+    const v2, 0x7f120575
 
     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 685e64d32a..99ed63c92c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, 0x7f12054f
+    const v1, 0x7f120574
 
     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 963ae3fb48..362e683f52 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 0x7f0a0463
+    .packed-switch 0x7f0a046b
         :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 c9051fb81c..de41b41592 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f23fc2caea..ebf0d7c3a8 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, 0x7f0a0438
+    const v0, 0x7f0a0440
 
     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, 0x7f0a0439
+    const v0, 0x7f0a0441
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -413,7 +413,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d014e
+    const v0, 0x7f0d0154
 
     return v0
 .end method
@@ -533,7 +533,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, 0x7f121363
+    const v4, 0x7f1213ef
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -591,7 +591,7 @@
 
     check-cast v0, Landroid/widget/ImageView;
 
-    sget-object v1, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Of:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v1, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const-string v2, "ScalingUtils.ScaleType.FIT_CENTER"
 
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 833e143e71..87d59f2bf9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cb61935d31..7a3f9b9757 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9ec6c7cb8b..bc8a800a09 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 04ac05510c..264b9caed9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0b696da513..210d39ccf6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1441132275..bc8654c398 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6db9bca78d..9c656a631d 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, 0x7f0a04a1
+    const v8, 0x7f0a04ab
 
     invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -442,7 +442,7 @@
 
     aput-object v8, v1, v9
 
-    const v8, 0x7f0a049c
+    const v8, 0x7f0a04a6
 
     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 543ad051c2..24cc2ec668 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,7 +75,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0a07fe
+    const v2, 0x7f0a082d
 
     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 a6de4520a4..e563d16aec 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 417c2ef4fd..c97a332a67 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0a07fe
+    const v0, 0x7f0a082d
 
     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 aa1bfc4d78..793078a0bc 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, 0x7f0a04a1
+    const v4, 0x7f0a04ab
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -424,7 +424,7 @@
 
     if-eqz v3, :cond_0
 
-    const v2, 0x7f0a049c
+    const v2, 0x7f0a04a6
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -462,13 +462,13 @@
 
     invoke-static {v6, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0d008b
+    const v1, 0x7f0d0091
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v14
 
-    const v1, 0x7f120421
+    const v1, 0x7f120446
 
     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 5a04955cd4..992d041812 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 42b8c5d647..0b54920838 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 = 0x7f0a049c
+.field public static final CANCEL_BUTTON:I = 0x7f0a04a6
 
 .field public static final Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
 
-.field public static final OK_BUTTON:I = 0x7f0a04a1
+.field public static final OK_BUTTON:I = 0x7f0a04ab
 
 .field public static final ON_SHOW:I
 
@@ -232,7 +232,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a049f
+    const v0, 0x7f0a04a9
 
     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, 0x7f0a049e
+    const v0, 0x7f0a04a8
 
     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, 0x7f0a049b
+    const v0, 0x7f0a04a5
 
     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, 0x7f0a04a1
+    const v0, 0x7f0a04ab
 
     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, 0x7f0a049c
+    const v0, 0x7f0a04a6
 
     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, 0x7f0a049a
+    const v0, 0x7f0a04a4
 
     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, 0x7f0d0150
+    const v0, 0x7f0d0156
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.smali
index 91bd1c454c..174517e8a6 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a06f9
+    const v1, 0x7f0a070e
 
     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 5680d27ef0..eb0d84a280 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, 0x7f0a02bb
+    const v0, 0x7f0a02be
 
     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, 0x7f0d0151
+    const v0, 0x7f0d0157
 
     return v0
 .end method
@@ -183,7 +183,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f060136
+    const v1, 0x7f060137
 
     invoke-virtual {v0, v1}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
index 6ac409c510..428c6b8ecb 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/notice/WidgetNoticeNuxSamsungLink$Companion$enqueue$2;->invoke(Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
index 78b6d014f3..0d53695a31 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$onViewBound$1.smali
@@ -39,9 +39,9 @@
 
     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;->Bb:Lcom/discord/samsung/a;
+    sget-object v0, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eL()Landroid/content/Intent;
+    invoke-static {}, Lcom/discord/samsung/a;->eN()Landroid/content/Intent;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
index eaecdf9d62..e113fef09d 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.smali
@@ -97,7 +97,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a02bb
+    const v0, 0x7f0a02be
 
     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, 0x7f0d0152
+    const v0, 0x7f0d0158
 
     return v0
 .end method
@@ -183,7 +183,7 @@
 
     if-eqz v0, :cond_0
 
-    const v1, 0x7f060136
+    const v1, 0x7f060137
 
     invoke-virtual {v0, v1}, Landroid/view/Window;->setBackgroundDrawableResource(I)V
 
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 2772f3225c..86f8dc1d31 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f1ca1e2959..55e20987dd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 024830bda0..850e0badd0 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, 0x7f0a051d
+    const v0, 0x7f0a0528
 
     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, 0x7f0a0518
+    const v0, 0x7f0a0523
 
     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, 0x7f0a051b
+    const v0, 0x7f0a0526
 
     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, 0x7f0a051a
+    const v0, 0x7f0a0525
 
     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, 0x7f0a0519
+    const v0, 0x7f0a0524
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -327,7 +327,7 @@
 
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->end()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 
@@ -499,7 +499,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0153
+    const v0, 0x7f0d0159
 
     return v0
 .end method
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 070c6011e6..41c1e58cda 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b070bfcdca..a49e47dbab 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9b7914d9a9..87d929bdeb 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, 0x7f040380
+    const v5, 0x7f040381
 
     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 080f6296df..a128e2c4ec 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f29a37184a..95cd5753d5 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, 0x7f0a051c
+    const v0, 0x7f0a0527
 
     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, 0x7f0a0517
+    const v0, 0x7f0a0522
 
     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, 0x7f040380
+    const v5, 0x7f040381
 
     invoke-static {v1, v5, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
@@ -360,13 +360,13 @@
 
     check-cast v1, Landroid/view/View;
 
-    const v5, 0x7f0403b1
+    const v5, 0x7f0403b2
 
     invoke-static {v1, v5, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I
 
     move-result v1
 
-    sget-object v5, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v5, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     iget-object v6, v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -506,7 +506,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f0402a0
+    const v1, 0x7f0402a1
 
     invoke-static {p1, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -955,7 +955,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0154
+    const v0, 0x7f0d015a
 
     return v0
 .end method
@@ -973,7 +973,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1032,7 +1032,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -1116,7 +1116,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildUseCases.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildUseCases.smali
index 0355d8b7bc..cea9ee04d7 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildUseCases.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildUseCases.smali
@@ -173,7 +173,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a04ac
+    const v0, 0x7f0a04b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -181,7 +181,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildUseCases;->voiceChatItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a8
+    const v0, 0x7f0a04b2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -189,7 +189,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildUseCases;->chatWithFriendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a9
+    const v0, 0x7f0a04b3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +197,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/nux/WidgetNuxGuildUseCases;->clubItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04aa
+    const v0, 0x7f0a04b4
 
     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/nux/WidgetNuxGuildUseCases;->gamingItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04ab
+    const v0, 0x7f0a04b5
 
     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/nux/WidgetNuxGuildUseCases;->joinAFriendItem$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a04a7
+    const v0, 0x7f0a04b1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -349,7 +349,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0155
+    const v0, 0x7f0d015b
 
     return v0
 .end method
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 d8149c4d6d..ea22f77414 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -81,12 +81,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f120cd0
+    const p1, 0x7f120d02
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120a95
+    const p1, 0x7f120ac6
 
     :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 0dec3bf259..4418238eb0 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.smali
@@ -75,7 +75,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin;-><init>()V
 
-    const v0, 0x7f0a0363
+    const v0, 0x7f0a036b
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -129,7 +129,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0156
+    const v0, 0x7f0d015c
 
     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 3d8befe068..eb7a237dc0 100644
--- a/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/roles/RolesAdapter.smali
@@ -173,7 +173,7 @@
 
     move-result-object p2
 
-    const v0, 0x7f0d0099
+    const v0, 0x7f0d009f
 
     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 e6a107c330..81ad16dd2c 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
@@ -238,7 +238,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f12100e
+    const p1, 0x7f121095
 
     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, 0x7f12100e
+    const p1, 0x7f121095
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -290,7 +290,7 @@
     return-object p0
 
     :cond_1
-    const p1, 0x7f120ff0
+    const p1, 0x7f121077
 
     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 0af7c387df..3200f14fd7 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, 0x7f0d015e
+    const v0, 0x7f0d0164
 
     return v0
 .end method
@@ -519,7 +519,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05b8
+    const v0, 0x7f0a05cd
 
     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, 0x7f0a05bc
+    const v0, 0x7f0a05d1
 
     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, 0x7f0a05ae
+    const v0, 0x7f0a05c3
 
     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, 0x7f0a05b2
+    const v0, 0x7f0a05c7
 
     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, 0x7f0a0847
+    const v0, 0x7f0a0877
 
     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, 0x7f0a0846
+    const v0, 0x7f0a0876
 
     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 2a0596ba2f..40299d617b 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali
@@ -273,7 +273,7 @@
 
     move-result-object v11
 
-    const v12, 0x7f1000b3
+    const v12, 0x7f1000bc
 
     new-array v9, v9, [Ljava/lang/Object;
 
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 09b88c29a1..e050c84984 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, 0x7f0d015f
+    const v0, 0x7f0d0165
 
     return v0
 .end method
@@ -98,7 +98,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05bb
+    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/WidgetSearchSuggestions.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.smali
index 461ca67337..f4fa7e7cad 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, 0x7f0d0162
+    const v0, 0x7f0d0168
 
     return v0
 .end method
@@ -84,7 +84,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05c8
+    const v0, 0x7f0a05dd
 
     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 8385dd23f5..e77a77fe04 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, 0x7f0d0166
+    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$FilterViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a0734
+    const v0, 0x7f0a0758
 
     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, 0x7f0a0736
+    const v0, 0x7f0a075a
 
     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, 0x7f0a0735
+    const v0, 0x7f0a0759
 
     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, 0x7f0a0733
+    const v0, 0x7f0a0757
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -117,27 +117,27 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f120f78
+    const p1, 0x7f120fff
 
     return p1
 
     :cond_0
-    const p1, 0x7f120fe6
+    const p1, 0x7f12106d
 
     return p1
 
     :cond_1
-    const p1, 0x7f120fdf
+    const p1, 0x7f121066
 
     return p1
 
     :cond_2
-    const p1, 0x7f120fe8
+    const p1, 0x7f12106f
 
     return p1
 
     :cond_3
-    const p1, 0x7f120fde
+    const p1, 0x7f121065
 
     return p1
 .end method
@@ -169,27 +169,27 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f120f78
+    const p1, 0x7f120fff
 
     return p1
 
     :cond_0
-    const p1, 0x7f120ff9
+    const p1, 0x7f121080
 
     return p1
 
     :cond_1
-    const p1, 0x7f120ff8
+    const p1, 0x7f12107f    # 1.9415294E38f
 
     return p1
 
     :cond_2
-    const p1, 0x7f120ffb
+    const p1, 0x7f121082    # 1.94153E38f
 
     return p1
 
     :cond_3
-    const p1, 0x7f120ff7
+    const p1, 0x7f12107e
 
     return p1
 .end method
@@ -226,22 +226,22 @@
     return p1
 
     :cond_0
-    const p1, 0x7f0403a8
+    const p1, 0x7f0403a9
 
     return p1
 
     :cond_1
-    const p1, 0x7f0403a7
+    const p1, 0x7f0403a8
 
     return p1
 
     :cond_2
-    const p1, 0x7f0403ae
+    const p1, 0x7f0403af
 
     return p1
 
     :cond_3
-    const p1, 0x7f0403af
+    const p1, 0x7f0403b0
 
     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 86e60e0487..4368df7ea1 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, 0x7f0d0164
+    const v0, 0x7f0d016a
 
     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, 0x7f0a05bf
+    const v0, 0x7f0a05d4
 
     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, 0x7f0a05c4
+    const v0, 0x7f0a05d9
 
     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, 0x7f0a05c5
+    const v0, 0x7f0a05da
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -121,32 +121,32 @@
 
     if-eq p0, v0, :cond_0
 
-    const p0, 0x7f0403ad
+    const p0, 0x7f0403ae
 
     return p0
 
     :cond_0
-    const p0, 0x7f0403aa
+    const p0, 0x7f0403ab
 
     return p0
 
     :cond_1
-    const p0, 0x7f0403b0
-
-    return p0
-
-    :cond_2
-    const p0, 0x7f0403ac
-
-    return p0
-
-    :cond_3
     const p0, 0x7f0403b1
 
     return p0
 
+    :cond_2
+    const p0, 0x7f0403ad
+
+    return p0
+
+    :cond_3
+    const p0, 0x7f0403b2
+
+    return p0
+
     :cond_4
-    const p0, 0x7f0403a7
+    const p0, 0x7f0403a8
 
     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 5643622edd..14e57ad956 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, 0x7f0d0160
+    const v0, 0x7f0d0166
 
     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, 0x7f0a0737
+    const v0, 0x7f0a075b
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -80,32 +80,32 @@
     throw v0
 
     :pswitch_0
-    const p1, 0x7f121002
+    const p1, 0x7f121089
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f121003
+    const p1, 0x7f12108a
 
     return p1
 
     :pswitch_2
-    const p1, 0x7f121007
+    const p1, 0x7f12108e
 
     return p1
 
     :pswitch_3
-    const p1, 0x7f121006
+    const p1, 0x7f12108d
 
     return p1
 
     :pswitch_4
-    const p1, 0x7f12100a
+    const p1, 0x7f121091
 
     return p1
 
     :pswitch_5
-    const p1, 0x7f12100b
+    const p1, 0x7f121092
 
     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 0cbd9796ea..32aa0fd3e5 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, 0x7f0d0161
+    const v0, 0x7f0d0167
 
     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, 0x7f0a0738
+    const v0, 0x7f0a075c
 
     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 0443aff85f..dc9213859c 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, 0x7f0d0163
+    const v0, 0x7f0d0169
 
     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, 0x7f0a05be
+    const v0, 0x7f0a05d3
 
     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, 0x7f0a05c3
+    const v0, 0x7f0a05d8
 
     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 bb2f2d903c..f227d76690 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, 0x7f0d0165
+    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$RecentQueryViewHolder;->itemView:Landroid/view/View;
 
-    const v0, 0x7f0a05c0
+    const v0, 0x7f0a05d5
 
     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, 0x7f0a05c7
+    const v0, 0x7f0a05dc
 
     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 c2c82a8ea1..0e199bedab 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, 0x7f0d0167
+    const v0, 0x7f0d016d
 
     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, 0x7f0a05c1
+    const v0, 0x7f0a05d6
 
     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;->Ey:Landroid/widget/TextView;
+    iget-object v0, p2, Lcom/discord/views/UserListItemView;->EA: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;->Ey:Landroid/widget/TextView;
+    iget-object v1, p2, Lcom/discord/views/UserListItemView;->EA:Landroid/widget/TextView;
 
     check-cast v0, Ljava/lang/CharSequence;
 
@@ -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;->EA:Landroid/view/View;
+    iget-object p2, p2, Lcom/discord/views/UserListItemView;->EC: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 107a551152..948398800b 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
@@ -115,7 +115,7 @@
 
     if-eqz v0, :cond_0
 
-    const p1, 0x7f12065e
+    const p1, 0x7f120682
 
     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 ce5183b4f4..47b5d93e3f 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
@@ -153,7 +153,7 @@
 
     if-eqz v0, :cond_1
 
-    const p1, 0x7f12065e
+    const p1, 0x7f120682
 
     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 5238c4343a..76f85946d8 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, 0x7f12060d
+    const p1, 0x7f120631
 
     return p1
 
@@ -103,7 +103,7 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f120668
+    const p1, 0x7f12068c
 
     return p1
 
@@ -112,7 +112,7 @@
 
     if-ne p1, v0, :cond_2
 
-    const p1, 0x7f120662
+    const p1, 0x7f120686
 
     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 39ef58f963..a639a590d0 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter.smali
@@ -217,7 +217,7 @@
 
     new-instance p2, Lcom/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder;
 
-    const v3, 0x7f0d0077
+    const v3, 0x7f0d007b
 
     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, 0x7f0d0078
+    const v3, 0x7f0d007c
 
     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$CategoryListItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
index cb26eeec11..d1ad4a9ed2 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, 0x7f0d005b
+    const v0, 0x7f0d005d
 
     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, 0x7f0a069b
+    const v0, 0x7f0a06b0
 
     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, 0x7f0a069a
+    const v0, 0x7f0a06af
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -172,7 +172,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121223
+    const v0, 0x7f1212ab
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 eff8f3a82a..80c06110a4 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, 0x7f0d005c
+    const v0, 0x7f0d005e
 
     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, 0x7f0a069d
+    const v0, 0x7f0a06b2
 
     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, 0x7f0a069e
+    const v0, 0x7f0a06b3
 
     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, 0x7f0a069f
+    const v0, 0x7f0a06b4
 
     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, 0x7f0a069c
+    const v0, 0x7f0a06b1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -205,12 +205,12 @@
 
     if-eqz v1, :cond_1
 
-    const v1, 0x7f08021a
+    const v1, 0x7f080225
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f080222
+    const v1, 0x7f08022d
 
     :goto_0
     invoke-virtual {p2, v1}, Landroid/widget/ImageView;->setImageResource(I)V
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 9c40fb1e21..37eccbcc1f 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v2, Lcom/discord/app/AppLog;->vm: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 49f6ce6f7a..ecc02e6ace 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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 ea105c0def..f85cfba53e 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 8490d4931c..53b032e72d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b2f475b072..ed5f3588c5 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, 0x7f0a05ed
+    const v0, 0x7f0a0602
 
     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, 0x7f0a05f0
+    const v0, 0x7f0a0605
 
     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, 0x7f0a05eb
+    const v0, 0x7f0a0600
 
     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, 0x7f0a05ec
+    const v0, 0x7f0a0601
 
     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, 0x7f0a05ef
+    const v0, 0x7f0a0604
 
     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, 0x7f0a05ee
+    const v0, 0x7f0a0603
 
     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, 0x7f0d016a
+    const v0, 0x7f0d0170
 
     return v0
 .end method
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 5d1e14316f..40d80b4165 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 db23bdd348..4cc415ee56 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 989cc8d183..68c9b92bb5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 358b0db1a3..312ee1533b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 36195c2977..62f4200e65 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, 0x7f0a05d5
+    const v0, 0x7f0a05ea
 
     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, 0x7f0a05d4
+    const v0, 0x7f0a05e9
 
     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, 0x7f0a05d1
+    const v0, 0x7f0a05e6
 
     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, 0x7f0a05d2
+    const v0, 0x7f0a05e7
 
     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, 0x7f0a05d3
+    const v0, 0x7f0a05e8
 
     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, 0x7f0a05d0
+    const v0, 0x7f0a05e5
 
     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, 0x7f0a05d6
+    const v0, 0x7f0a05eb
 
     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, 0x7f0a0369
+    const v0, 0x7f0a0371
 
     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, 0x7f0a036b
+    const v0, 0x7f0a0373
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -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, 0x7f120c8d
+    const v0, 0x7f120cbf
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -522,7 +522,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f12065c
+    const v3, 0x7f120680
 
     new-array v6, v4, [Ljava/lang/Object;
 
@@ -596,7 +596,7 @@
 
     move-result-object v0
 
-    const v3, 0x7f12068f
+    const v3, 0x7f1206b3
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String;
 
@@ -664,7 +664,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120668
+    const v1, 0x7f12068c
 
     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, 0x7f06011c
 
     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, 0x7f08024e
+    const v3, 0x7f08025a
 
     invoke-static {v2, v3}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -948,7 +948,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016c
+    const v0, 0x7f0d0172
 
     return v0
 .end method
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 c29c941bc9..4d4fa2d301 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 aeadd04caf..c7b947b3da 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 dae6ce6f38..1b6615d526 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5631f54464..31766d9b00 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 28009e78bc..2c9cc81e2a 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, 0x7f0a05b8
+    const v0, 0x7f0a05cd
 
     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, 0x7f0a036a
+    const v0, 0x7f0a0372
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +210,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016b
+    const v0, 0x7f0d0171
 
     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, 0x7f120c88
+    const p1, 0x7f120cba
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f121025
+    const p1, 0x7f1210ac
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarSubtitle(I)Lkotlin/Unit;
 
@@ -244,7 +244,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f120fd9
+    const v1, 0x7f121060
 
     invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerRegionSelectDialog$Model$Companion.smali
index 23d648a19a..828695baec 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 620926c90f..8bbbf133c8 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, 0x7f0a0625
+    const p1, 0x7f0a063a
 
     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, 0x7f08022f
+    const p1, 0x7f08023a
 
-    const v3, 0x7f08022f
+    const v3, 0x7f08023a
 
     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 d8f76e19b2..9fe1ae1861 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, 0x7f0d018e
+    const p2, 0x7f0d0194
 
     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 8e5abbf6c8..1f7a546d4e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 85852d7863..7348455886 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a3dd23914e..69b424f78e 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, 0x7f0a0626
+    const v0, 0x7f0a063b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -236,7 +236,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018d
+    const v0, 0x7f0d0193
 
     return v0
 .end method
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 0baf86a02e..545d6389d4 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 eeafd50ce6..1756d79ae4 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, 0x7f0a046d
+    const p2, 0x7f0a0475
 
     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 00e4907ecf..6fc21f459b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 19ae757b24..8b2dc63e56 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, 0x7f0a064b
+    const v0, 0x7f0a0660
 
     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, 0x7f0a064c
+    const v0, 0x7f0a0661
 
     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, 0x7f0a064d
+    const v0, 0x7f0a0662
 
     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, 0x7f0a0643
+    const v0, 0x7f0a0658
 
     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, 0x7f0a060f
+    const v0, 0x7f0a0624
 
     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, 0x7f0a060e
+    const v0, 0x7f0a0623
 
     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, 0x7f0a060b
+    const v0, 0x7f0a0620
 
     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, 0x7f0a060c
+    const v0, 0x7f0a0621
 
     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, 0x7f0a060d
+    const v0, 0x7f0a0622
 
     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, 0x7f0a0610
+    const v0, 0x7f0a0625
 
     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, 0x7f0a0611
+    const v0, 0x7f0a0626
 
     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, 0x7f0a0644
+    const v0, 0x7f0a0659
 
     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, 0x7f0a0645
+    const v0, 0x7f0a065a
 
     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, 0x7f0a05ff
+    const v0, 0x7f0a0614
 
     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, 0x7f0a0641
+    const v0, 0x7f0a0656
 
     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, 0x7f0a05fa
+    const v0, 0x7f0a060f
 
     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, 0x7f0a05de
+    const v0, 0x7f0a05f3
 
     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, 0x7f0a05f6
+    const v0, 0x7f0a060b
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1736,7 +1736,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016e
+    const v0, 0x7f0d0174
 
     return v0
 .end method
@@ -1758,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, 0x7f121054
+    const p1, 0x7f1210db
 
     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 9cf8a6fc4d..d57cbe5ee2 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, 0x7f0d0174
+    const p1, 0x7f0d017a
 
     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;
 
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 63bea09aed..2a9c3c4baf 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -204,7 +204,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 040e313c07..844214c15c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e0a2bd8ef6..d61b58a0eb 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 373446e697..1036f1c20d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 29841767d5..846fb4f988 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 73b34ffabe..68890dbb93 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b03c09e146..6d88e8b771 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, 0x7f0a05e0
+    const v0, 0x7f0a05f5
 
     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, 0x7f0a05e1
+    const v0, 0x7f0a05f6
 
     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, 0x7f0a05df
+    const v0, 0x7f0a05f4
 
     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, 0x7f1202a7
+    const v0, 0x7f1202a9
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -447,7 +447,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f12121f
+    const v4, 0x7f1212a7
 
     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, 0x7f12121e
+    const v3, 0x7f1212a6
 
     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, 0x7f12037b
+    const v2, 0x7f1203a0
 
     const/4 v3, 0x2
 
@@ -503,7 +503,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f12121d
+    const p1, 0x7f1212a5
 
     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, 0x7f0d0175
+    const v0, 0x7f0d017b
 
     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 f7bdf934f3..5010b695f6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels$Model.smali
@@ -888,7 +888,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
index 812d7d163f..6e780dae2c 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, 0x7f1203c8
+    const v0, 0x7f1203ed
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f1210a7
+    const v0, 0x7f12112e
 
     :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, 0x7f0a0472
+    const v0, 0x7f0a047a
 
     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, 0x7f0a0473
+    const v0, 0x7f0a047b
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -422,7 +422,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0176
+    const v0, 0x7f0d017c
 
     return v0
 .end method
@@ -472,7 +472,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0472
+    .packed-switch 0x7f0a047a
         :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, 0x7f1203ba
+    const p1, 0x7f1203df
 
     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, 0x7f0a05e6
+    const v0, 0x7f0a05fb
 
     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, 0x7f0a05e2
+    const v0, 0x7f0a05f7
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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 4e785d5022..6e0ba9b323 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, 0x7f0a0848
+    const p2, 0x7f0a0878
 
     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, 0x7f0a02d1
+    const v1, 0x7f0a02d5
 
     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, 0x7f0a02d3
+    const v1, 0x7f0a02d7
 
     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, 0x7f0a02d2
+    const v1, 0x7f0a02d6
 
     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, 0x7f0a02d4
+    const v1, 0x7f0a02d8
 
     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, 0x7f0d0178
+    const p3, 0x7f0d017e
 
     const/4 v0, 0x0
 
@@ -332,7 +332,7 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const p3, 0x7f0a02d6
+    const p3, 0x7f0a02da
 
     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 e95a923dfb..030c7396c1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 cb704606a2..8f8645edb1 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, 0x7f0a05e3
+    const v0, 0x7f0a05f8
 
     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, 0x7f0a05e5
+    const v0, 0x7f0a05fa
 
     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, 0x7f0a05e4
+    const v0, 0x7f0a05f9
 
     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, 0x7f0d0177
+    const v0, 0x7f0d017d
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
index c76e25c9fa..0c09cf93fe 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 = 0x7f0a028d
+.field private static final STATE_KEY_ENABLE_TWITCH_EMOTES:I = 0x7f0a0290
 
-.field private static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0290
+.field private static final STATE_KEY_EXPIRE_BEHAVIOR:I = 0x7f0a0293
 
-.field private static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0291
+.field private static final STATE_KEY_GRACE_PERIOD:I = 0x7f0a0294
 
 .field private static final gracePeriodDays:[I
 
@@ -126,9 +126,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a028d
         0x7f0a0290
-        0x7f0a0291
+        0x7f0a0293
+        0x7f0a0294
     .end array-data
 .end method
 
@@ -144,7 +144,7 @@
     goto/16 :goto_4
 
     :cond_0
-    const v0, 0x7f1209fe
+    const v0, 0x7f120a33
 
     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, 0x7f0600c2
+    const v3, 0x7f0600c3
 
     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, 0x7f0a0290
+    const v2, 0x7f0a0293
 
     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, 0x7f0a0291
+    const v3, 0x7f0a0294
 
     invoke-direct {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->getGracePeriodPosition(I)I
 
@@ -768,7 +768,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017a
+    const v0, 0x7f0d0180
 
     return v0
 .end method
@@ -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;->fe()I
+    invoke-virtual {p2}, Lcom/discord/views/RadioManager;->fh()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;->fe()I
+    invoke-virtual {v1}, Lcom/discord/views/RadioManager;->fh()I
 
     move-result v1
 
@@ -956,7 +956,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a028d
+    const v1, 0x7f0a0290
 
     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, 0x7f0a0299
+    const v0, 0x7f0a029c
 
     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, 0x7f0a029b
+    const v0, 0x7f0a029e
 
     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, 0x7f0a0297
+    const v0, 0x7f0a029a
 
     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, 0x7f0a029f
+    const v0, 0x7f0a02a2
 
     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, 0x7f0a029e
+    const v0, 0x7f0a02a1
 
     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, 0x7f0a02a1
+    const v0, 0x7f0a02a4
 
     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, 0x7f0a02a0
+    const v0, 0x7f0a02a3
 
     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, 0x7f0a0298
+    const v0, 0x7f0a029b
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f0a029c
+    const v0, 0x7f0a029f
 
     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, 0x7f0a028f
+    const v2, 0x7f0a0292
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1184,7 +1184,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a028e
+    const v2, 0x7f0a0291
 
     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, 0x7f0a0293
+    const v2, 0x7f0a0296
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1216,7 +1216,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a0295
+    const v2, 0x7f0a0298
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1226,7 +1226,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0296
+    const v2, 0x7f0a0299
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1236,7 +1236,7 @@
 
     aput-object v2, v1, v0
 
-    const v0, 0x7f0a0292
+    const v0, 0x7f0a0295
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1248,7 +1248,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f0a0294
+    const v0, 0x7f0a0297
 
     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, 0x7f0a028c
+    const v0, 0x7f0a028f
 
     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, 0x7f0a028d
+    const v0, 0x7f0a0290
 
     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, 0x7f0a0290
+    const v0, 0x7f0a0293
 
     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, 0x7f0a0291
+    const v0, 0x7f0a0294
 
     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 b89c779479..101f2335e5 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p3
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index 42af3615ed..7bde0c5a0c 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, 0x7f0a02a5
+    const v3, 0x7f0a02a8
 
     aput v3, v1, v2
 
@@ -242,7 +242,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView;
 
-    const v6, 0x7f120af5
+    const v6, 0x7f120b26
 
     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, 0x7f1202a6
+    const v6, 0x7f1202a8
 
     new-array v2, v2, [Ljava/lang/Object;
 
@@ -449,7 +449,7 @@
 
     if-nez v0, :cond_0
 
-    const v0, 0x7f120c0c
+    const v0, 0x7f120c3e
 
     const/4 v1, 0x1
 
@@ -466,7 +466,7 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f120c0d
+    const p1, 0x7f120c3f
 
     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, 0x7f120827
+    const p1, 0x7f12084b
 
     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, 0x7f0d017b
+    const v0, 0x7f0d0181
 
     return v0
 .end method
@@ -908,7 +908,7 @@
 
     invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, 0x7f0a02a5
+    const v1, 0x7f0a02a8
 
     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, 0x7f0a02a6
+    const v1, 0x7f0a02a9
 
     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, 0x7f0a02a9
+    const v1, 0x7f0a02ac
 
     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, 0x7f0a02a8
+    const v1, 0x7f0a02ab
 
     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, 0x7f0a02a7
+    const v1, 0x7f0a02aa
 
     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, 0x7f0a02a2
+    const v1, 0x7f0a02a5
 
     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, 0x7f0a02a4
+    const v1, 0x7f0a02a7
 
     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, 0x7f0a02a3
+    const v1, 0x7f0a02a6
 
     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, 0x7f0a02aa
+    const v1, 0x7f0a02ad
 
     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 d4dad61e58..b211d8f6ff 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, 0x7f0d007b
+    const v0, 0x7f0d0080
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a057a
+    const p1, 0x7f0a058f
 
     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, 0x7f120b82
+    const p2, 0x7f120bb3
 
     invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->y(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 b714ba7b27..624aa3465a 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
index 678fda55da..80490be837 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, 0x7f0a02ac
+    const v3, 0x7f0a02af
 
     aput v3, v1, v2
 
@@ -291,7 +291,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f12062c
+    const p1, 0x7f120650
 
     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, 0x7f1211fe
+    const p1, 0x7f121286
 
     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, 0x7f120931
+    const p1, 0x7f120966
 
     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, 0x7f120930
+    const p1, 0x7f120965
 
     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, 0x7f12092e
+    const p1, 0x7f120963
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -522,7 +522,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a057b
+    .packed-switch 0x7f0a0590
         :pswitch_1c
         :pswitch_1b
         :pswitch_1a
@@ -706,7 +706,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0600f1
+    const v2, 0x7f0600f2
 
     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, 0x7f0600f3
+    const v1, 0x7f0600f4
 
     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, 0x7f0600ba
+    const v0, 0x7f0600bb
 
     goto :goto_1
 
     :cond_1
-    const v0, 0x7f0600c8
+    const v0, 0x7f0600c9
 
     :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, 0x7f12067a
+    const v2, 0x7f12069e
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
 
@@ -870,7 +870,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f08010e
+    const v1, 0x7f080112
 
     invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
 
@@ -1145,7 +1145,7 @@
 
     const/4 v6, 0x1
 
-    const v7, 0x7f120932
+    const v7, 0x7f120967
 
     if-eq v5, v6, :cond_2
 
@@ -1208,7 +1208,7 @@
     :cond_4
     if-nez v4, :cond_5
 
-    const v2, 0x7f12092f
+    const v2, 0x7f120964
 
     invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->y(I)V
 
@@ -1299,7 +1299,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0116
+    const v0, 0x7f0d011c
 
     return v0
 .end method
@@ -1346,7 +1346,7 @@
     return-void
 
     :cond_0
-    const p1, 0x7f120678
+    const p1, 0x7f12069c
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
@@ -1561,7 +1561,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a045a
+    const p3, 0x7f0a0462
 
     if-eq p2, p3, :cond_0
 
@@ -1645,7 +1645,7 @@
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setRetainInstance(Z)V
 
-    const v1, 0x7f0a0584
+    const v1, 0x7f0a0599
 
     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, 0x7f0a0580
+    const v1, 0x7f0a0595
 
     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, 0x7f0a02ac
+    const v1, 0x7f0a02af
 
     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, 0x7f0a0581
+    const v1, 0x7f0a0596
 
     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, 0x7f0a0583
+    const v1, 0x7f0a0598
 
     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, 0x7f0a02ad
+    const v1, 0x7f0a02b0
 
     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, 0x7f0a0586
+    const v1, 0x7f0a059b
 
     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, 0x7f0a0590
+    const v1, 0x7f0a05a5
 
     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, 0x7f0a057c
+    const v2, 0x7f0a0591
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1731,7 +1731,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f0a057d
+    const v2, 0x7f0a0592
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1741,7 +1741,7 @@
 
     aput-object v2, v1, v0
 
-    const v2, 0x7f0a057e
+    const v2, 0x7f0a0593
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1753,7 +1753,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a057f
+    const v2, 0x7f0a0594
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1765,7 +1765,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0582
+    const v2, 0x7f0a0597
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1777,7 +1777,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0585
+    const v2, 0x7f0a059a
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1789,7 +1789,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0587
+    const v2, 0x7f0a059c
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1801,7 +1801,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a0588
+    const v2, 0x7f0a059d
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1813,7 +1813,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a058a
+    const v2, 0x7f0a059f
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1825,7 +1825,7 @@
 
     aput-object v2, v1, v4
 
-    const v2, 0x7f0a058b
+    const v2, 0x7f0a05a0
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1837,7 +1837,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0589
+    const v2, 0x7f0a059e
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1849,7 +1849,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058c
+    const v2, 0x7f0a05a1
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1861,7 +1861,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058d
+    const v2, 0x7f0a05a2
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1873,7 +1873,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058e
+    const v2, 0x7f0a05a3
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1885,7 +1885,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a058f
+    const v2, 0x7f0a05a4
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1897,7 +1897,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0592
+    const v2, 0x7f0a05a7
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1909,7 +1909,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0593
+    const v2, 0x7f0a05a8
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1921,7 +1921,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0594
+    const v2, 0x7f0a05a9
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1933,7 +1933,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0595
+    const v2, 0x7f0a05aa
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1945,7 +1945,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0596
+    const v2, 0x7f0a05ab
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1957,7 +1957,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a057b
+    const v2, 0x7f0a0590
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1969,7 +1969,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0597
+    const v2, 0x7f0a05ac
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1981,7 +1981,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0598
+    const v2, 0x7f0a05ad
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1993,7 +1993,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a059c
+    const v2, 0x7f0a05b1
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2005,7 +2005,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a059b
+    const v2, 0x7f0a05b0
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2017,7 +2017,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a0599
+    const v2, 0x7f0a05ae
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2029,7 +2029,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a059a
+    const v2, 0x7f0a05af
 
     invoke-virtual {p1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -2041,7 +2041,7 @@
 
     aput-object v2, v1, v5
 
-    const v2, 0x7f0a059d
+    const v2, 0x7f0a05b2
 
     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 9bda6449d7..8f158dea1a 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, 0x7f0d017c
+    const v0, 0x7f0d0182
 
     return v0
 .end method
@@ -177,21 +177,21 @@
 
     const/high16 v3, 0x42340000    # 45.0f
 
-    iput v3, v2, Lcom/angarron/colorpicker/b$a;->mT:F
+    iput v3, v2, Lcom/angarron/colorpicker/b$a;->mS:F
 
-    iput v1, v2, Lcom/angarron/colorpicker/b$a;->mR:I
+    iput v1, v2, Lcom/angarron/colorpicker/b$a;->mQ:I
 
-    iput-object v0, v2, Lcom/angarron/colorpicker/b$a;->mQ:[I
+    iput-object v0, v2, Lcom/angarron/colorpicker/b$a;->mP:[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;->mQ:[I
+    iget-object v6, v2, Lcom/angarron/colorpicker/b$a;->mP:[I
 
-    iget v7, v2, Lcom/angarron/colorpicker/b$a;->mR:I
+    iget v7, v2, Lcom/angarron/colorpicker/b$a;->mQ:I
 
-    iget v8, v2, Lcom/angarron/colorpicker/b$a;->mT:F
+    iget v8, v2, Lcom/angarron/colorpicker/b$a;->mS: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;->mP:F
+    iget v2, v0, Lcom/angarron/colorpicker/b;->mO: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 3e1c7b7d29..fd19842e62 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, 0x7f0d017f
+    const v0, 0x7f0d0185
 
     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 f36c9a466a..98d94a65bd 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, 0x7f0d0180
+    const v0, 0x7f0d0186
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a084c
+    const p1, 0x7f0a087c
 
     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, 0x7f0a084b
+    const p1, 0x7f0a087b
 
     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, 0x7f1208cc
+    const p2, 0x7f1208f0
 
     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 89d914eff5..3638157b93 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, 0x7f0d0181
+    const v0, 0x7f0d0187
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a05f2
+    const p1, 0x7f0a0607
 
     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, 0x7f0a05f8
+    const p1, 0x7f0a060d
 
     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, 0x7f0a05f5
+    const p1, 0x7f0a060a
 
     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, 0x7f0a05f1
+    const p1, 0x7f0a0606
 
     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, 0x7f0a05f9
+    const p1, 0x7f0a060e
 
     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/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
index 5d0db8e0a3..2131e17682 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, 0x7f0d0182
+    const v0, 0x7f0d0188
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a084a
+    const p1, 0x7f0a087a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -163,7 +163,7 @@
 
     aput-object v4, v3, v5
 
-    const v4, 0x7f10002c
+    const v4, 0x7f10002d
 
     invoke-virtual {v1, v4, v0, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -177,7 +177,7 @@
 
     aput-object v0, v1, v5
 
-    const v0, 0x7f120588
+    const v0, 0x7f1205ad
 
     invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -207,7 +207,7 @@
 
     aput-object v0, v3, v2
 
-    const p2, 0x7f120587
+    const p2, 0x7f1205ac
 
     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 20258aad32..b9c72f7aa3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 19c382aeb5..68fdf4a643 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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 7f487f6508..b14cc59d78 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, 0x7f120578
+    const v6, 0x7f12059d
 
     invoke-direct {v4, v0, v5, v6}, 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 74ee34acdf..d26315d4b0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 fab3881001..ee158ad9b7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 40892f9448..f077b97f88 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a1afe3b204..ab4e8b9625 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, 0x7f1203d8
+    const v1, 0x7f1203fd
 
-    const v2, 0x7f12121c
+    const v2, 0x7f1212a4
 
     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 a620208bc1..01408c822a 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, 0x7f0a084d
+    const v0, 0x7f0a087d
 
     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, 0x7f0a0849
+    const v0, 0x7f0a0879
 
     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, 0x7f120578
+    const v0, 0x7f12059d
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -486,7 +486,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d017d
+    const v0, 0x7f0d0183
 
     return v0
 .end method
@@ -534,7 +534,7 @@
 
     iget-object v5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->uploadEmojiAction:Lrx/functions/Action1;
 
-    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xn:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     move-object v1, p1
 
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 8bcea7b407..2f04a3ef6e 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, 0x7f0a046e
+    const p2, 0x7f0a0476
 
     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 91066663df..e6e061a4aa 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, 0x7f0a05f3
+    const v0, 0x7f0a0608
 
     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, 0x7f0a05f4
+    const v1, 0x7f0a0609
 
     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, 0x7f120578
+    const v0, 0x7f12059d
 
     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, 0x7f120f95
+    const v0, 0x7f12101c
 
     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, 0x7f0d017e
+    const v0, 0x7f0d0184
 
     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 767c519475..29ae8cf6c9 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
@@ -197,11 +197,11 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lrx/Observable;->IU()Lrx/Observable;
+    invoke-virtual {p0}, Lrx/Observable;->IX()Lrx/Observable;
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
index 814218f362..0efee52194 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, 0x7f1209fd
+    const v0, 0x7f120a32
 
     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, 0x7f0d0185
+    const v0, 0x7f0d018b
 
     return v0
 .end method
@@ -254,7 +254,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a05fc
+    const v0, 0x7f0a0611
 
     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, 0x7f0a05fb
+    const v0, 0x7f0a0610
 
     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 dc647a8fbf..2b34b3b586 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fcfaef2944..389d7b0e94 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, 0x7f121092
+    const v3, 0x7f121119
 
     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 54a0b5fa3e..abb0c2ff21 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, 0x7f0a03b6
+    const v0, 0x7f0a03be
 
     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, 0x7f0a03b4
+    const v0, 0x7f0a03bc
 
     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, 0x7f0a03b3
+    const v0, 0x7f0a03bb
 
     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, 0x7f0a03b5
+    const v0, 0x7f0a03bd
 
     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, 0x7f0d0183
+    const v0, 0x7f0d0189
 
     return v0
 .end method
@@ -362,7 +362,7 @@
     return-void
 
     :cond_2
-    sget-object v4, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v4, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     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 1d2142fa58..a85900876e 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, 0x7f0d0184
+    const v0, 0x7f0d018a
 
     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, 0x7f0a03bd
+    const v0, 0x7f0a03c5
 
     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, 0x7f0a03bc
+    const v0, 0x7f0a03c4
 
     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, 0x7f0a03bb
+    const v0, 0x7f0a03c3
 
     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, 0x7f0a03ce
+    const v0, 0x7f0a03d6
 
     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, 0x7f0a03c3
+    const v0, 0x7f0a03cb
 
     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, 0x7f0a03cf
+    const v0, 0x7f0a03d7
 
     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, 0x7f0a03c0
+    const v0, 0x7f0a03c8
 
     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, 0x7f060108
 
     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, 0x7f120b8c
+    const v0, 0x7f120bbd
 
     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, 0x7f060075
+    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, 0x7f1209e7
+    const v1, 0x7f120a1c
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)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 dc76e8fd9d..36951c1f2d 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -361,7 +361,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 3109aa8896..ec46265821 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 aecc96d606..b96ce15f99 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2b4ce14b22..58030b8009 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, 0x7f0a03b1
+    const v0, 0x7f0a03b9
 
     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, 0x7f0a03b0
+    const v0, 0x7f0a03b8
 
     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, 0x7f1209ff
+    const v0, 0x7f120a34
 
     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, 0x7f0d0187
+    const v0, 0x7f0d018d
 
     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 a19c0205aa..a6fd879dc6 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, 0x7f0d0186
+    const v0, 0x7f0d018c
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a03a6
+    const p1, 0x7f0a03ae
 
     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, 0x7f0a03a5
+    const p1, 0x7f0a03ad
 
     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, 0x7f0a03aa
+    const p1, 0x7f0a03b2
 
     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, 0x7f0a03a8
+    const p1, 0x7f0a03b0
 
     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, 0x7f0a03a7
+    const p1, 0x7f0a03af
 
     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, 0x7f0a03ab
+    const p1, 0x7f0a03b3
 
     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, 0x7f0a03ad
+    const p1, 0x7f0a03b5
 
     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, 0x7f0a03ac
+    const p1, 0x7f0a03b4
 
     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, 0x7f0d0179
+    const v0, 0x7f0d017f
 
     const/4 v1, 0x0
 
@@ -516,19 +516,19 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a05e9
+    const v1, 0x7f0a05fe
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v7
 
-    const v1, 0x7f0a05e8
+    const v1, 0x7f0a05fd
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object v1
 
-    const v2, 0x7f0a05e7
+    const v2, 0x7f0a05fc
 
     invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -586,12 +586,12 @@
 
     if-eqz p5, :cond_2
 
-    const v0, 0x7f12051c
+    const v0, 0x7f120541
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f12051d
+    const v0, 0x7f120542
 
     :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$RolesSpinnerAdapter.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers$RolesSpinnerAdapter.smali
index bd23c1fe50..c988fe29c6 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, 0x7f0a059e
+    const p2, 0x7f0a05b3
 
     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, 0x7f0d005a
+    const p3, 0x7f0d005c
 
     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, 0x7f0d0059
+    const p3, 0x7f0d005b
 
     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 035cb2a290..e5cb3e2136 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, 0x7f120b96
+    const v0, 0x7f120bc7
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -415,7 +415,7 @@
 
     move-result-object p2
 
-    const v1, 0x7f0d0059
+    const v1, 0x7f0d005b
 
     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, 0x7f0d0189
+    const v0, 0x7f0d018f
 
     return v0
 .end method
@@ -451,7 +451,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a046f
+    const p3, 0x7f0a0477
 
     if-eq p2, p3, :cond_0
 
@@ -515,7 +515,7 @@
 
     if-nez v0, :cond_1
 
-    const p1, 0x7f120380
+    const p1, 0x7f1203a5
 
     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, 0x7f120381
+    const p1, 0x7f1203a6
 
     invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V
 
     return-void
 
     :cond_3
-    const p1, 0x7f12037f
+    const p1, 0x7f1203a4
 
     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, 0x7f0a05fe
+    const v0, 0x7f0a0613
 
     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, 0x7f0a0600
+    const v0, 0x7f0a0615
 
     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, 0x7f0a0601
+    const v0, 0x7f0a0616
 
     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, 0x7f0a0602
+    const v0, 0x7f0a0617
 
     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 ff9932dbcb..0333910c0d 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, 0x7f0d0188
+    const v0, 0x7f0d018e
 
     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, 0x7f0a043b
+    const v0, 0x7f0a0443
 
     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, 0x7f0a043d
+    const v0, 0x7f0a0445
 
     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, 0x7f0a043a
+    const v0, 0x7f0a0442
 
     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, 0x7f0a043f
+    const v0, 0x7f0a0447
 
     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, 0x7f0a043c
+    const v0, 0x7f0a0444
 
     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, 0x7f0a043e
+    const v0, 0x7f0a0446
 
     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, 0x7f060111
 
     invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index 535c518b6b..d713c9a986 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -323,7 +323,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018a
+    const v0, 0x7f0d0190
 
     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, 0x7f121055
+    const p1, 0x7f1210dc
 
     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, 0x7f120bd0
+    const v0, 0x7f120c01
 
     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, 0x7f0a0606
+    const v1, 0x7f0a061b
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -401,7 +401,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0607
+    const v1, 0x7f0a061c
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -413,7 +413,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a0608
+    const v1, 0x7f0a061d
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -425,7 +425,7 @@
 
     aput-object v1, v0, v4
 
-    const v1, 0x7f0a0609
+    const v1, 0x7f0a061e
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -437,7 +437,7 @@
 
     aput-object v1, v0, v5
 
-    const v1, 0x7f0a060a
+    const v1, 0x7f0a061f
 
     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, 0x7f0a0603
+    const v1, 0x7f0a0618
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -467,7 +467,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a0604
+    const v1, 0x7f0a0619
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -477,7 +477,7 @@
 
     aput-object v1, v0, v3
 
-    const v1, 0x7f0a0605
+    const v1, 0x7f0a061a
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -523,7 +523,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f12133c
+    const v1, 0x7f1213c8    # 1.9417E38f
 
     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, 0x7f121338
+    const v1, 0x7f1213c4
 
     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 6bf0b7fd8d..494cf97661 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
-        0x7f0a0615
-        0x7f0a0616
-        0x7f0a0617
-        0x7f0a0618
-        0x7f0a0619
+        0x7f0a062a
+        0x7f0a062b
+        0x7f0a062c
+        0x7f0a062d
+        0x7f0a062e
     .end array-data
 .end method
 
@@ -121,7 +121,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018c
+    const v0, 0x7f0d0192
 
     return v0
 .end method
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 e1782a9d71..413b9d4780 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -96,7 +96,7 @@
 
     const/16 v0, 0x3c
 
-    const v1, 0x7f100028
+    const v1, 0x7f100029
 
     const/4 v2, 0x0
 
@@ -129,7 +129,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f100025
+    const p2, 0x7f100026
 
     new-array v0, v3, [Ljava/lang/Object;
 
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 413b4b0b08..91eb9e7991 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/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object p2, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     invoke-static {p2}, Lkotlin/text/l;->getCASE_INSENSITIVE_ORDER(Lkotlin/jvm/internal/ab;)Ljava/util/Comparator;
 
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 b76ec1ee54..173972f496 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, 0x7f1203d8
+    const v1, 0x7f1203fd
 
-    const v2, 0x7f12121c
+    const v2, 0x7f1212a4
 
     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 907a9984c0..ea38f4e17f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 8f9a3f31ec..f19e7226e1 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, 0x7f1203d8
+    const v1, 0x7f1203fd
 
-    const v2, 0x7f12121c
+    const v2, 0x7f1212a4
 
     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 1667036758..f1d9ffd42f 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, 0x7f1203d8
+    const v1, 0x7f1203fd
 
-    const v2, 0x7f12121c
+    const v2, 0x7f1212a4
 
     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 9fb613e067..d078222d94 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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 64c7a14338..fc84302bc5 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, 0x7f120c10
+    const v6, 0x7f120c42
 
     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 61b84a02e8..f14d697750 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, 0x7f120c3c
+    const v6, 0x7f120c6e
 
     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$emphasizeIcon$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$emphasizeIcon$1.smali
index 58f9ec44ee..e47560e2a4 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 ae28b012b6..bdd00362f4 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9262e66378..9c4f13edf5 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 10c0baffa5..44d50561ad 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a062a
+    const v1, 0x7f0a063f
 
     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, 0x7f0a0612
+    const v1, 0x7f0a0627
 
     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 97c78813e2..8de23a9f30 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -105,7 +105,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 ef0b7d2a4b..a6dea9f9f9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ebb690d895..030212a6b8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -85,7 +85,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0a0623
+    const v3, 0x7f0a0638
 
     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, 0x7f0a0624
+    const v3, 0x7f0a0639
 
     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, 0x7f0a0627
+    const v3, 0x7f0a063c
 
     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 74f3962254..130dde887c 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, 0x7f0a0629
+    const v0, 0x7f0a063e
 
     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, 0x7f0a061d
+    const v0, 0x7f0a0632
 
     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, 0x7f0a061e
+    const v0, 0x7f0a0633
 
     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, 0x7f0a061c
+    const v0, 0x7f0a0631
 
     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, 0x7f0a061f
+    const v0, 0x7f0a0634
 
     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, 0x7f0a061b
+    const v0, 0x7f0a0630
 
     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, 0x7f0a0620
+    const v0, 0x7f0a0635
 
     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, 0x7f0a0623
+    const v0, 0x7f0a0638
 
     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, 0x7f0a0624
+    const v0, 0x7f0a0639
 
     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, 0x7f0a0627
+    const v0, 0x7f0a063c
 
     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, 0x7f0a0613
+    const v0, 0x7f0a0628
 
     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, 0x7f0a0612
+    const v0, 0x7f0a0627
 
     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, 0x7f0a061a
+    const v0, 0x7f0a062f
 
     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, 0x7f0a0614
+    const v0, 0x7f0a0629
 
     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, 0x7f0a062d
+    const v0, 0x7f0a0642
 
     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, 0x7f0a062a
+    const v0, 0x7f0a063f
 
     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, 0x7f0a062c
+    const v0, 0x7f0a0641
 
     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, 0x7f0a062b
+    const v0, 0x7f0a0640
 
     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, 0x7f0a0636
+    const v0, 0x7f0a064b
 
     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, 0x7f0a0635
+    const v0, 0x7f0a064a
 
     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, 0x7f0a063a
+    const v0, 0x7f0a064f
 
     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, 0x7f0a0638
+    const v0, 0x7f0a064d
 
     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, 0x7f0a0639
+    const v0, 0x7f0a064e
 
     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, 0x7f0a0637
+    const v0, 0x7f0a064c
 
     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, 0x7f0a063b
+    const v0, 0x7f0a0650
 
     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, 0x7f0a062f
+    const v0, 0x7f0a0644
 
     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, 0x7f0a062e
+    const v0, 0x7f0a0643
 
     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, 0x7f0a0633
+    const v0, 0x7f0a0648
 
     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, 0x7f0a0631
+    const v0, 0x7f0a0646
 
     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, 0x7f0a0632
+    const v0, 0x7f0a0647
 
     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, 0x7f0a0630
+    const v0, 0x7f0a0645
 
     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, 0x7f0a0634
+    const v0, 0x7f0a0649
 
     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, 0x7f0a0628
+    const v0, 0x7f0a063d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1203,25 +1203,25 @@
 
     :array_0
     .array-data 4
-        0x7f0a0621
-        0x7f0a0622
+        0x7f0a0636
+        0x7f0a0637
     .end array-data
 
     :array_1
     .array-data 4
-        0x7f0a061b
-        0x7f0a0620
-        0x7f0a0623
-        0x7f0a0624
-        0x7f0a0627
-        0x7f0a0612
-        0x7f0a0614
-        0x7f0a061a
-        0x7f0a062a
+        0x7f0a0630
         0x7f0a0635
-        0x7f0a062e
-        0x7f0a062c
-        0x7f0a062b
+        0x7f0a0638
+        0x7f0a0639
+        0x7f0a063c
+        0x7f0a0627
+        0x7f0a0629
+        0x7f0a062f
+        0x7f0a063f
+        0x7f0a064a
+        0x7f0a0643
+        0x7f0a0641
+        0x7f0a0640
         0x15f91
     .end array-data
 .end method
@@ -1479,9 +1479,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120c10
+    const v1, 0x7f120c42
 
-    const v2, 0x7f080223
+    const v2, 0x7f08022e
 
     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, 0x7f0800bf
+    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, 0x7f12090d
+    const v6, 0x7f120931
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -1691,7 +1691,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f080328
+    const v8, 0x7f080334
 
     const/4 v9, 0x0
 
@@ -1711,7 +1711,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f060149
+    const v6, 0x7f06014a
 
     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, 0x7f12090f
+    const v0, 0x7f120933
 
     new-array v6, v2, [Ljava/lang/Object;
 
@@ -1875,7 +1875,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f10006c
+    const v2, 0x7f10006d
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1897,7 +1897,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12090c
+    const v2, 0x7f120930
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1917,7 +1917,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f080327
+    const v4, 0x7f080333
 
     const/4 v5, 0x0
 
@@ -1937,7 +1937,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a7
+    const v2, 0x7f0402a8
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1953,7 +1953,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402b5
+    const v2, 0x7f0402b6
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2487,7 +2487,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f0800bf
+    const v6, 0x7f0800c0
 
     invoke-virtual {v0, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setBackgroundResource(I)V
 
@@ -2495,7 +2495,7 @@
 
     move-result-object v0
 
-    const v6, 0x7f12090d
+    const v6, 0x7f120931
 
     new-array v7, v4, [Ljava/lang/Object;
 
@@ -2515,7 +2515,7 @@
 
     const/4 v7, 0x0
 
-    const v8, 0x7f080328
+    const v8, 0x7f080334
 
     const/4 v9, 0x0
 
@@ -2535,7 +2535,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f060149
+    const v6, 0x7f06014a
 
     invoke-static {v1, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -2609,7 +2609,7 @@
     return-void
 
     :cond_3
-    const v0, 0x7f12090f
+    const v0, 0x7f120933
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -2699,7 +2699,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f10006c
+    const v1, 0x7f10006d
 
     new-array v2, v4, [Ljava/lang/Object;
 
@@ -2721,7 +2721,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f12090c
+    const v2, 0x7f120930
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -2741,7 +2741,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f080327
+    const v4, 0x7f080333
 
     const/4 v5, 0x0
 
@@ -2761,7 +2761,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402a7
+    const v2, 0x7f0402a8
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2777,7 +2777,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0402b5
+    const v2, 0x7f0402b6
 
     invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -2807,9 +2807,9 @@
 
     move-result-object v0
 
-    const v1, 0x7f120c3c
+    const v1, 0x7f120c6e
 
-    const v2, 0x7f08021b
+    const v2, 0x7f080226
 
     invoke-direct {p0, v0, p1, v1, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureChannel(Landroid/widget/TextView;Lcom/discord/models/domain/ModelChannel;II)V
 
@@ -2961,7 +2961,7 @@
     goto :goto_0
 
     :cond_1
-    const v2, 0x7f121053
+    const v2, 0x7f1210da
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String;
 
@@ -3467,7 +3467,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f121055
+    const v0, 0x7f1210dc
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -4333,7 +4333,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d018b
+    const v0, 0x7f0d0191
 
     return v0
 .end method
@@ -4397,7 +4397,7 @@
 
     iget-object v5, p0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->imageSelectedResult:Lrx/functions/Action1;
 
-    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xp:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xr:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     move-object v1, p1
 
@@ -4537,9 +4537,9 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->vi:J
+    sget-wide v2, Lcom/discord/app/e;->vh:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -4547,7 +4547,7 @@
 
     aput-object v2, v1, v6
 
-    const v2, 0x7f120919
+    const v2, 0x7f120940
 
     invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -4589,9 +4589,9 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sget-object v1, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v7, Lcom/discord/app/e;->vi:J
+    sget-wide v7, Lcom/discord/app/e;->vh:J
 
     invoke-static {v7, v8}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -4599,7 +4599,7 @@
 
     aput-object v1, v0, v6
 
-    const v1, 0x7f1208c7
+    const v1, 0x7f1208eb
 
     invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -4649,7 +4649,7 @@
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V
 
-    const v0, 0x7f120d2b
+    const v0, 0x7f120d5d
 
     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 56de2f8568..0ee1770873 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
index a100019eb3..3e92a42cf9 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, 0x7f120f5a
+    const v0, 0x7f120fe1
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -489,7 +489,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0191
+    const v0, 0x7f0d0197
 
     return v0
 .end method
@@ -549,7 +549,7 @@
 .method public synthetic lambda$processRoleDrop$3$WidgetServerSettingsRolesList(Ljava/lang/Void;)V
     .locals 0
 
-    const p1, 0x7f120f59
+    const p1, 0x7f120fe0
 
     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, 0x7f0a059f
+    const v0, 0x7f0a05b4
 
     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, 0x7f0a0642
+    const v0, 0x7f0a0657
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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 4a5ee79db7..62a0fb02f5 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, 0x7f0d0190
+    const v0, 0x7f0d0196
 
     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, 0x7f0a0640
+    const v0, 0x7f0a0655
 
     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, 0x7f0a063e
+    const v0, 0x7f0a0653
 
     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, 0x7f0a063f
+    const v0, 0x7f0a0654
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -87,7 +87,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f12062c
+    const v0, 0x7f120650
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -103,7 +103,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f12092e
+    const v0, 0x7f120963
 
     invoke-static {p0, v0}, Lcom/discord/app/h;->d(Landroid/content/Context;I)V
 
@@ -119,7 +119,7 @@
 
     move-result-object p0
 
-    const v0, 0x7f1211fe
+    const v0, 0x7f121286
 
     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$ToggleMfaDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
index 16294db13a..ad70a8ab73 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, 0x7f120514
+    const v1, 0x7f120539
 
     goto :goto_0
 
     :cond_1
-    const v1, 0x7f12058c
+    const v1, 0x7f1205b1
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -75,12 +75,12 @@
 
     if-eqz p3, :cond_2
 
-    const v1, 0x7f0800f5
+    const v1, 0x7f0800f9
 
     goto :goto_1
 
     :cond_2
-    const v1, 0x7f0800ec
+    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, 0x7f0d0193
+    const v0, 0x7f0d0199
 
     return v0
 .end method
@@ -227,7 +227,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0649
+    const v0, 0x7f0a065e
 
     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, 0x7f0a0646
+    const v0, 0x7f0a065b
 
     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, 0x7f0a0647
+    const v0, 0x7f0a065c
 
     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 7e78fd7b60..6646c76939 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, 0x7f121023
+    const v0, 0x7f1210aa
 
     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, 0x7f120837
+    const v1, 0x7f12085b
 
     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, 0x7f0800f5
+    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, 0x7f120838
+    const v1, 0x7f12085c
 
     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, 0x7f0800ec
+    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, 0x7f0d0192
+    const v0, 0x7f0d0198
 
     return v0
 .end method
@@ -286,7 +286,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a064a
+    const v0, 0x7f0a065f
 
     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, 0x7f0a047c
+    const v0, 0x7f0a0486
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
index f17f96a1c6..db25bbb8ef 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, 0x7f1211d4
+    const v2, 0x7f12125c
 
     const/4 v3, 0x1
 
@@ -257,7 +257,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0133
+    const v0, 0x7f0d0139
 
     return v0
 .end method
@@ -359,7 +359,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0371
+    const v0, 0x7f0a0379
 
     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, 0x7f0a0370
+    const v0, 0x7f0a0378
 
     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, 0x7f0a0373
+    const v0, 0x7f0a037b
 
     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, 0x7f0a0372
+    const v0, 0x7f0a037a
 
     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, 0x7f0a036f
+    const v0, 0x7f0a0377
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index a2118c4762..67b7b79bca 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, 0x7f0a064e
+    const v3, 0x7f0a0663
 
     aput v3, v1, v2
 
@@ -114,7 +114,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v4, 0x7f12132a
+    const v4, 0x7f1213b6
 
     const/4 v5, 0x1
 
@@ -162,7 +162,7 @@
 .method private configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f12108d
+    const v0, 0x7f121114
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -481,7 +481,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0194
+    const v0, 0x7f0d019a
 
     return v0
 .end method
@@ -632,7 +632,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a064e
+    const v0, 0x7f0a0663
 
     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, 0x7f0a0651
+    const v0, 0x7f0a0666
 
     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, 0x7f0a0652
+    const v0, 0x7f0a0667
 
     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, 0x7f0a0653
+    const v0, 0x7f0a0668
 
     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, 0x7f0a0650
+    const v0, 0x7f0a0665
 
     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, 0x7f0a064f
+    const v0, 0x7f0a0664
 
     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, 0x7f0a0654
+    const v0, 0x7f0a0669
 
     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, 0x7f0a0655
+    const v0, 0x7f0a066a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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 ae65a5cad0..54f711cf49 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,7 +919,7 @@
     :cond_1a
     iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
 
-    const v2, 0x7f1208d3
+    const v2, 0x7f1208f7
 
     invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 d22cfb715b..37fa1e4fea 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 c6360b4d71..9b4be36dc9 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 0x7f0a0441
+    .packed-switch 0x7f0a0449
         :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 e817c0c9c6..5fe0f02524 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, 0x7f0a045b
+    const v0, 0x7f0a0463
 
     if-eq p1, v0, :cond_0
 
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 6b2f0d592a..7210d5ca5e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8bfa877339..b4e66a64b5 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, 0x7f0a05dc
+    const v0, 0x7f0a05f1
 
     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, 0x7f0a05dd
+    const v0, 0x7f0a05f2
 
     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, 0x7f0a05d9
+    const v0, 0x7f0a05ee
 
     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, 0x7f0a05da
+    const v0, 0x7f0a05ef
 
     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, 0x7f0a05d7
+    const v0, 0x7f0a05ec
 
     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, 0x7f0d016f
+    const v0, 0x7f0d0175
 
     return v0
 .end method
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120472
+    const v1, 0x7f120497
 
     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, 0x7f120904
+    const v0, 0x7f120928
 
     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 8098c811b1..1961cd8fcc 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, 0x7f0d0172
+    const v0, 0x7f0d0178
 
     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, 0x7f080232
+    const v0, 0x7f08023d
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -675,7 +675,7 @@
 
     invoke-static {v0, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0402bc
+    const v1, 0x7f0402bd
 
     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, 0x7f080235
+    const v0, 0x7f080241
 
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -702,7 +702,7 @@
 
     invoke-static {v0, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0402b5
+    const v1, 0x7f0402b6
 
     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 0c6149f7f1..16ef65e6fb 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, 0x7f0d0173
+    const v0, 0x7f0d0179
 
     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 7583787fcf..74cd98392f 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, 0x7f0d0170
+    const v0, 0x7f0d0176
 
     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 93c94df0ba..02be2b219a 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, 0x7f0d0171
+    const v0, 0x7f0d0177
 
     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;
 
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 41162fbc80..2846572c9f 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, 0x7f1208d3
+    const v1, 0x7f1208f7
 
     invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
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 fd35cfbfea..5c95b37452 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -129,7 +129,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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 153784c4be..542b48d4a4 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9cc8d54ef8..f39f6f498d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 9501701359..d2cb4136f3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d17de48b11..28c72254e7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 68102195fb..9bbaede857 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, 0x7f0d00b8
+    const v0, 0x7f0d00be
 
     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, 0x7f120904
+    const p1, 0x7f120928
 
     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, 0x7f1208d4
+    const p1, 0x7f1208f8
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const p1, 0x7f1208d0
+    const p1, 0x7f1208f4
 
     :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, 0x7f12100f
+    const p2, 0x7f121096
 
     goto :goto_3
 
     :cond_3
     :goto_2
-    const p2, 0x7f120fda
+    const p2, 0x7f121061
 
     :goto_3
     invoke-virtual {p1, p2}, Landroid/widget/EditText;->setHint(I)V
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
index e296614b61..306333c6ec 100644
--- 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index dd58d43a34..c8e318c618 100644
--- 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 72f90105cd..be84ba122b 100644
--- 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
@@ -28,19 +28,15 @@
 
 
 # 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
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)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/m;-><init>(I)V
@@ -57,19 +53,13 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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
+    .locals 0
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
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
index ce490d1e1e..a796502c3b 100644
--- 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali
index bd77d07fed..c703d0c85f 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$setGuildId$2;->invoke(Lcom/discord/models/domain/ModelGuild;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 64b3683a2a..1a73f2a931 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(JJ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
index 9b9c137224..8f8d890167 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(JJ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
index af177fe2bb..2f41acc51c 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(JJ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -53,21 +53,13 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;->invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
 
 .method public final invoke(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
-    .locals 2
-
-    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
-
-    const-string v1, "newSubscription"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v0, p1}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->appendNewPremiumGuildSubscription(Lcom/discord/models/domain/ModelPremiumGuildSubscription;)V
+    .locals 0
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$subscribeToPremiumGuild$3;->this$0:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
index 502f5f379e..8954c2818a 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel.smali
@@ -142,6 +142,10 @@
 .method private final handlePremiumGuildSubscriptionCompleted()V
     .locals 3
 
+    sget-object v0, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$Actions;
+
+    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$Actions;->fetchUserGuildPremiumState()V
+
     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;
@@ -375,15 +379,15 @@
 
     const/4 p2, 0x0
 
-    const/4 v0, 0x1
+    const/4 p3, 0x1
 
-    const/4 v1, 0x0
+    const/4 p4, 0x0
 
-    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p2, p3, p4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object p2
 
@@ -415,7 +419,7 @@
 
     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
+    invoke-direct {p1, p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$removePremiumGuildSubscription$3;-><init>(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
 
     move-object v6, p1
 
@@ -454,7 +458,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
@@ -462,7 +466,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object p2
 
@@ -511,7 +515,7 @@
     return-void
 .end method
 
-.method public final subscribeToPremiumGuild(J)V
+.method public final subscribeToPremiumGuild(JJ)V
     .locals 9
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->handlePremiumGuildSubscriptionStarted()V
@@ -522,21 +526,25 @@
 
     move-result-object v0
 
-    invoke-virtual {v0, p1, p2}, Lcom/discord/utilities/rest/RestAPI;->subscribeToGuild(J)Lrx/Observable;
+    new-instance v1, Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;
+
+    invoke-direct {v1, p3, p4}, Lcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;-><init>(J)V
+
+    invoke-virtual {v0, p1, p2, v1}, Lcom/discord/utilities/rest/RestAPI;->subscribeToGuild(JLcom/discord/restapi/RestAPIParams$PremiumGuildSubscribe;)Lrx/Observable;
 
     move-result-object p1
 
     const/4 p2, 0x0
 
-    const/4 v0, 0x1
+    const/4 p3, 0x1
 
-    const/4 v1, 0x0
+    const/4 p4, 0x0
 
-    invoke-static {p1, p2, v0, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+    invoke-static {p1, p2, p3, p4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
index dc15f5acd7..c3d8f8e25c 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
+    value = Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(IIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -62,7 +62,7 @@
 
     if-eqz p2, :cond_0
 
-    const p1, 0x7f08022e
+    const p1, 0x7f080239
 
     :cond_0
     return p1
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
index 70329c2c66..7a72584152 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
@@ -102,11 +102,11 @@
 
     check-cast v1, Landroid/view/ViewGroup;
 
-    const v2, 0x7f0d008f
+    const v2, 0x7f0d0095
 
     invoke-static {v0, v2, v1}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const v0, 0x7f0a050e
+    const v0, 0x7f0a0519
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -118,7 +118,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->header:Landroid/view/View;
 
-    const v0, 0x7f0a0510
+    const v0, 0x7f0a051b
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -132,7 +132,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a050f
+    const v0, 0x7f0a051a
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -146,7 +146,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerBoostText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a0511
+    const v0, 0x7f0a051c
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -158,7 +158,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerUnlocked:Landroid/view/View;
 
-    const v0, 0x7f0a050c
+    const v0, 0x7f0a0517
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -172,7 +172,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentText:Landroid/widget/TextView;
 
-    const v0, 0x7f0a050d
+    const v0, 0x7f0a0518
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -186,7 +186,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->contentRecycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a0230
+    const v0, 0x7f0a0233
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->findViewById(I)Landroid/view/View;
 
@@ -245,7 +245,7 @@
 
 
 # virtual methods
-.method public final configure(II)V
+.method public final configure(IIZ)V
     .locals 18
 
     move-object/from16 v0, p0
@@ -281,7 +281,7 @@
     invoke-static {v6}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_1
-    const v6, 0x7f0800bf
+    const v6, 0x7f0800c0
 
     invoke-virtual {v7, v6}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -299,7 +299,7 @@
 
     check-cast v6, Landroid/view/View;
 
-    const v8, 0x7f0402bb
+    const v8, 0x7f0402bc
 
     invoke-static {v6, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -312,9 +312,9 @@
 
     const/4 v7, 0x2
 
-    if-eq v1, v3, :cond_6
+    if-eq v1, v3, :cond_8
 
-    if-eq v1, v7, :cond_5
+    if-eq v1, v7, :cond_6
 
     if-eq v1, v6, :cond_4
 
@@ -323,16 +323,30 @@
     goto :goto_2
 
     :cond_4
-    const/16 v8, 0x14
+    if-eqz p3, :cond_5
+
+    const/16 v8, 0x1e
 
     goto :goto_2
 
     :cond_5
-    const/16 v8, 0xa
+    const/16 v8, 0x14
 
     goto :goto_2
 
     :cond_6
+    if-eqz p3, :cond_7
+
+    const/16 v8, 0xf
+
+    goto :goto_2
+
+    :cond_7
+    const/16 v8, 0xa
+
+    goto :goto_2
+
+    :cond_8
     const/4 v8, 0x2
 
     :goto_2
@@ -340,33 +354,33 @@
 
     const-string v10, "headerText"
 
-    if-nez v9, :cond_7
+    if-nez v9, :cond_9
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_7
-    if-eq v1, v3, :cond_a
+    :cond_9
+    if-eq v1, v3, :cond_c
 
-    if-eq v1, v7, :cond_9
+    if-eq v1, v7, :cond_b
 
-    if-eq v1, v6, :cond_8
+    if-eq v1, v6, :cond_a
 
     const/4 v11, 0x0
 
     goto :goto_3
 
-    :cond_8
-    const v11, 0x7f120902
-
-    goto :goto_3
-
-    :cond_9
-    const v11, 0x7f120901
-
-    goto :goto_3
-
     :cond_a
-    const v11, 0x7f120900
+    const v11, 0x7f120926
+
+    goto :goto_3
+
+    :cond_b
+    const v11, 0x7f120925
+
+    goto :goto_3
+
+    :cond_c
+    const v11, 0x7f120924
 
     :goto_3
     invoke-static {v0, v11}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -377,70 +391,70 @@
 
     invoke-virtual {v9, v11}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    if-eq v1, v3, :cond_f
+    if-eq v1, v3, :cond_11
 
-    if-eq v1, v7, :cond_d
+    if-eq v1, v7, :cond_f
 
-    if-eq v1, v6, :cond_b
+    if-eq v1, v6, :cond_d
 
     const/4 v12, 0x0
 
     goto :goto_4
 
-    :cond_b
-    if-eqz v5, :cond_c
-
-    const v9, 0x7f08032c
-
-    const v12, 0x7f08032c
-
-    goto :goto_4
-
-    :cond_c
-    const v9, 0x7f08032d
-
-    const v12, 0x7f08032d
-
-    goto :goto_4
-
     :cond_d
     if-eqz v5, :cond_e
 
-    const v9, 0x7f08032a
+    const v9, 0x7f080338
 
-    const v12, 0x7f08032a
+    const v12, 0x7f080338
 
     goto :goto_4
 
     :cond_e
-    const v9, 0x7f08032b
+    const v9, 0x7f080339
 
-    const v12, 0x7f08032b
+    const v12, 0x7f080339
 
     goto :goto_4
 
     :cond_f
     if-eqz v5, :cond_10
 
-    const v9, 0x7f080328
+    const v9, 0x7f080336
 
-    const v12, 0x7f080328
+    const v12, 0x7f080336
 
     goto :goto_4
 
     :cond_10
-    const v9, 0x7f080329
+    const v9, 0x7f080337
 
-    const v12, 0x7f080329
+    const v12, 0x7f080337
+
+    goto :goto_4
+
+    :cond_11
+    if-eqz v5, :cond_12
+
+    const v9, 0x7f080334
+
+    const v12, 0x7f080334
+
+    goto :goto_4
+
+    :cond_12
+    const v9, 0x7f080335
+
+    const v12, 0x7f080335
 
     :goto_4
     iget-object v11, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
 
-    if-nez v11, :cond_11
+    if-nez v11, :cond_13
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_11
+    :cond_13
     const/4 v13, 0x0
 
     const/4 v14, 0x0
@@ -455,18 +469,18 @@
 
     iget-object v9, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerText:Landroid/widget/TextView;
 
-    if-nez v9, :cond_12
+    if-nez v9, :cond_14
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_12
+    :cond_14
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getContext()Landroid/content/Context;
 
     move-result-object v10
 
-    if-eqz v5, :cond_13
+    if-eqz v5, :cond_15
 
-    const v11, 0x7f060149
+    const v11, 0x7f06014a
 
     invoke-static {v10, v11}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -474,8 +488,8 @@
 
     goto :goto_5
 
-    :cond_13
-    const v11, 0x7f0402a7
+    :cond_15
+    const v11, 0x7f0402a8
 
     invoke-static {v10, v11}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -488,16 +502,16 @@
 
     const-string v10, "headerBoostText"
 
-    if-nez v9, :cond_14
+    if-nez v9, :cond_16
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_14
+    :cond_16
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->getResources()Landroid/content/res/Resources;
 
     move-result-object v11
 
-    const v12, 0x7f10006f
+    const v12, 0x7f100070
 
     new-array v13, v3, [Ljava/lang/Object;
 
@@ -517,11 +531,11 @@
 
     iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerBoostText:Landroid/widget/TextView;
 
-    if-nez v8, :cond_15
+    if-nez v8, :cond_17
 
     invoke-static {v10}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_15
+    :cond_17
     check-cast v8, Landroid/view/View;
 
     xor-int/lit8 v9, v5, 0x1
@@ -532,27 +546,27 @@
 
     iget-object v8, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->headerUnlocked:Landroid/view/View;
 
-    if-nez v8, :cond_16
+    if-nez v8, :cond_18
 
     const-string v9, "headerUnlocked"
 
     invoke-static {v9}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_16
+    :cond_18
     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
+    if-nez v8, :cond_19
 
     const-string v9, "contentText"
 
     invoke-static {v9}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_17
-    if-eq v1, v3, :cond_18
+    :cond_19
+    if-eq v1, v3, :cond_1a
 
-    const v9, 0x7f1208fe
+    const v9, 0x7f120922
 
     invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -562,8 +576,8 @@
 
     goto :goto_6
 
-    :cond_18
-    const v9, 0x7f1208fc
+    :cond_1a
+    const v9, 0x7f120920
 
     invoke-static {v0, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -580,19 +594,19 @@
 
     const/4 v10, 0x4
 
-    const v11, 0x7f1208f9
+    const v11, 0x7f12091d
 
-    const v12, 0x7f0802ab
+    const v12, 0x7f0802b7
 
-    const v13, 0x7f1208fa
+    const v13, 0x7f12091e
 
-    const v14, 0x7f080375
+    const v14, 0x7f080381
 
-    if-eq v1, v3, :cond_1b
+    if-eq v1, v3, :cond_1d
 
-    if-eq v1, v7, :cond_1a
+    if-eq v1, v7, :cond_1c
 
-    if-eq v1, v6, :cond_19
+    if-eq v1, v6, :cond_1b
 
     invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List;
 
@@ -600,7 +614,7 @@
 
     goto/16 :goto_7
 
-    :cond_19
+    :cond_1b
     new-array v1, v10, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -671,17 +685,17 @@
 
     new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v9, 0x7f0803a2
+    const v9, 0x7f0803af
 
     invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v9
 
-    const v10, 0x7f1208fb
+    const v10, 0x7f12091f
 
     new-array v11, v3, [Ljava/lang/Object;
 
-    const v12, 0x7f1205bc
+    const v12, 0x7f1205e1
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -715,13 +729,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f08037b
+    const v4, 0x7f080387
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f1208f8
+    const v4, 0x7f12091c
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -737,7 +751,7 @@
 
     goto/16 :goto_7
 
-    :cond_1a
+    :cond_1c
     new-array v1, v9, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     new-instance v9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -806,17 +820,17 @@
 
     new-instance v8, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v9, 0x7f0803a2
+    const v9, 0x7f0803af
 
     invoke-virtual {v2, v9, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v9
 
-    const v11, 0x7f1208fb
+    const v11, 0x7f12091f
 
     new-array v12, v3, [Ljava/lang/Object;
 
-    const v13, 0x7f1205bc
+    const v13, 0x7f1205e1
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -850,13 +864,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802c7
+    const v4, 0x7f0802d3
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f1208f6
+    const v7, 0x7f12091a
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -868,13 +882,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802a6
+    const v4, 0x7f0802b2
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f1208f7
+    const v4, 0x7f12091b
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -890,7 +904,7 @@
 
     goto/16 :goto_7
 
-    :cond_1b
+    :cond_1d
     new-array v1, v9, [Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
     new-instance v9, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
@@ -959,13 +973,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f080307
+    const v4, 0x7f080313
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v8, 0x7f1208f3
+    const v8, 0x7f120917
 
     invoke-static {v0, v8}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -977,13 +991,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802c7
+    const v4, 0x7f0802d3
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v4
 
-    const v7, 0x7f1208f4
+    const v7, 0x7f120918
 
     invoke-static {v0, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -995,13 +1009,13 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f0802a6
+    const v4, 0x7f0802b2
 
     invoke-virtual {v2, v4, v5}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
     move-result v2
 
-    const v4, 0x7f1208f5
+    const v4, 0x7f120919
 
     invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
@@ -1018,13 +1032,13 @@
     :goto_7
     iget-object v2, v0, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->adapter:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;
 
-    if-nez v2, :cond_1c
+    if-nez v2, :cond_1e
 
     const-string v3, "adapter"
 
     invoke-static {v3}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    :cond_1c
+    :cond_1e
     invoke-virtual {v2, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter;->configure(Ljava/util/List;)V
 
     return-void
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
index 2c9d707651..41c0c26751 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PerkViewHolder.smali
@@ -77,11 +77,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0090
+    const v0, 0x7f0d0096
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a050b
+    const p1, 0x7f0a0516
 
     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/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali
index b3adc57bb2..222fea84ba 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1.smali
@@ -3,7 +3,7 @@
 .source "WidgetPremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lrx/functions/Func4;
+.implements Lrx/functions/Func5;
 
 
 # annotations
@@ -26,12 +26,14 @@
         "Ljava/lang/Object;",
         "T4:",
         "Ljava/lang/Object;",
+        "T5:",
+        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func4<",
-        "TT1;TT2;TT3;TT4;TR;>;"
+        "Lrx/functions/Func5<",
+        "TT1;TT2;TT3;TT4;TT5;TR;>;"
     }
 .end annotation
 
@@ -63,29 +65,59 @@
 
 
 # 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/premiumguild/WidgetPremiumGuildSubscription$Model;
-    .locals 2
+.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/models/domain/ModelExperiment;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .locals 7
 
-    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    new-instance v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
-    const-string v1, "me"
+    const-string v0, "me"
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "premiumGuildSubscriptionsState"
+    const-string v0, "premiumGuildSubscriptionsState"
 
-    invoke-static {p3, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const-string v1, "premiumSubscriptionState"
+    const-string v0, "premiumSubscriptionState"
 
-    invoke-static {p4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)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
+    const/4 v0, 0x1
 
-    return-object v0
+    if-eqz p5, :cond_0
+
+    invoke-virtual {p5}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
+
+    move-result p5
+
+    if-ne p5, v0, :cond_0
+
+    const/4 v5, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p5, 0x0
+
+    const/4 v5, 0x0
+
+    :goto_0
+    move-object v0, v6
+
+    move-object v1, p1
+
+    move-object v2, p2
+
+    move-object v3, p3
+
+    move-object v4, p4
+
+    invoke-direct/range {v0 .. v5}, 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;Z)V
+
+    return-object v6
 .end method
 
-.method public final bridge synthetic call(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;
     .locals 0
 
     check-cast p1, Lcom/discord/models/domain/ModelUser;
@@ -96,7 +128,9 @@
 
     check-cast p4, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    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;
+    check-cast p5, Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-virtual/range {p0 .. p5}, 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/models/domain/ModelExperiment;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
index 8884cc22b0..396e0878f6 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion.smali
@@ -34,7 +34,7 @@
 
 # virtual methods
 .method public final get(J)Lrx/Observable;
-    .locals 3
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(J)",
@@ -52,55 +52,71 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()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;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
     move-result-object v0
 
-    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
+    move-result-object v2
 
-    move-result-object v1
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    const/4 p2, 0x0
 
-    invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getPremiumGuildSubscriptions()Lcom/discord/stores/StorePremiumGuildSubscription;
+    const/4 v0, 0x1
 
-    move-result-object p2
-
-    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
-
-    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, p1, p2, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
+    invoke-static {p1, p2, v0, p2}, Lcom/discord/stores/StorePremiumGuildSubscription;->getPremiumGuildSubscriptionsState$default(Lcom/discord/stores/StorePremiumGuildSubscription;Ljava/lang/Long;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object p1
 
-    const-string p2, "Observable\n             \u2026ionState)\n              }"
+    invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+    move-result-object v3
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
+
+    move-result-object v4
+
+    sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object p1
+
+    const-string v0, "2019-10_android_premium_changes"
+
+    const/4 v5, 0x2
+
+    invoke-static {p1, v0, p2, v5, p2}, 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
+
+    sget-object p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model$Companion$get$1;
+
+    move-object v6, p1
+
+    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
+
+    const-string p2, "Observable\n             \u2026ket == 1)\n              }"
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
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
index 7e38e6172a..0302acef37 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model.smali
@@ -33,6 +33,8 @@
 
 .field private final premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
+.field private final useNewPremiumTierValues:Z
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -49,7 +51,7 @@
     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
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StorePremiumGuildSubscription$State;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Z)V
     .locals 1
 
     const-string v0, "meUser"
@@ -74,41 +76,70 @@
 
     iput-object p4, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
+    iput-boolean p5, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
     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
+.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;ZILjava/lang/Object;)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .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/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
     :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/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
     :cond_1
-    and-int/lit8 p6, p5, 0x4
+    move-object p7, p2
 
-    if-eqz p6, :cond_2
+    and-int/lit8 p2, p6, 0x4
+
+    if-eqz p2, :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
+    move-object v0, p3
 
-    if-eqz p5, :cond_3
+    and-int/lit8 p2, p6, 0x8
+
+    if-eqz p2, :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-object v1, p4
+
+    and-int/lit8 p2, p6, 0x10
+
+    if-eqz p2, :cond_4
+
+    iget-boolean p5, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues: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/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;Z)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
 
     move-result-object p0
 
@@ -149,9 +180,17 @@
     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;
+.method public final component5()Z
     .locals 1
 
+    iget-boolean v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
+    return 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;Z)Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    .locals 7
+
     const-string v0, "meUser"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
@@ -166,74 +205,102 @@
 
     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
+    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/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;Z)V
 
     return-object v0
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
-    .locals 2
+    .locals 4
 
-    if-eq p0, p1, :cond_1
+    const/4 v0, 0x1
 
-    instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+    if-eq p0, p1, :cond_2
 
-    if-eqz v0, :cond_0
+    instance-of v1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;
+
+    const/4 v2, 0x0
+
+    if-eqz v1, :cond_1
 
     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, 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;
+    iget-object v3, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->meUser:Lcom/discord/models/domain/ModelUser;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+    iget-object v1, 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;
+    iget-object v3, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->guild:Lcom/discord/models/domain/ModelGuild;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
+    iget-object v1, 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;
+    iget-object v3, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumGuildSubscriptionState:Lcom/discord/stores/StorePremiumGuildSubscription$State;
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_0
+    if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
+    iget-object v1, 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;
+    iget-object v3, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->premiumSubscriptionState:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result p1
+    move-result v1
 
-    if-eqz p1, :cond_0
+    if-eqz v1, :cond_1
+
+    iget-boolean v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
+    iget-boolean p1, p1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
+    if-ne v1, p1, :cond_0
+
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
     const/4 p1, 0x0
 
-    return p1
+    :goto_0
+    if-eqz p1, :cond_1
+
+    goto :goto_1
 
     :cond_1
-    :goto_0
-    const/4 p1, 0x1
+    return v2
 
-    return p1
+    :cond_2
+    :goto_1
+    return v0
 .end method
 
 .method public final getGuild()Lcom/discord/models/domain/ModelGuild;
@@ -268,6 +335,14 @@
     return-object v0
 .end method
 
+.method public final getUseNewPremiumTierValues()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
+    return v0
+.end method
+
 .method public final hashCode()I
     .locals 3
 
@@ -336,6 +411,17 @@
     :cond_3
     add-int/2addr v0, v1
 
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-boolean v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
+    if-eqz v1, :cond_4
+
+    const/4 v1, 0x1
+
+    :cond_4
+    add-int/2addr v0, v1
+
     return v0
 .end method
 
@@ -376,6 +462,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", useNewPremiumTierValues="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-boolean v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->useNewPremiumTierValues:Z
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
     const-string v1, ")"
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
index 5ad100bf16..ffa91e8d49 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter.smali
@@ -31,6 +31,8 @@
 
 .field private subscriptionCount:I
 
+.field private final useNewPremiumTierValues:Z
+
 .field private final views:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -58,16 +60,18 @@
     return-void
 .end method
 
-.method public constructor <init>()V
-    .locals 1
+.method public constructor <init>(Z)V
+    .locals 0
 
     invoke-direct {p0}, Landroidx/viewpager/widget/PagerAdapter;-><init>()V
 
-    new-instance v0, Ljava/util/HashMap;
+    iput-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->useNewPremiumTierValues:Z
 
-    invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
+    new-instance p1, Ljava/util/HashMap;
 
-    iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
+    invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->views:Ljava/util/HashMap;
 
     return-void
 .end method
@@ -100,7 +104,7 @@
 
     if-eqz v1, :cond_3
 
-    const v2, 0x7f0a05cf
+    const v2, 0x7f0a05e4
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -120,12 +124,12 @@
 
     if-nez v3, :cond_0
 
-    const v3, 0x7f120e38
+    const v3, 0x7f120e70
 
     goto :goto_1
 
     :cond_0
-    const v3, 0x7f120e3a
+    const v3, 0x7f120e74
 
     :goto_1
     invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -153,7 +157,9 @@
 
     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
+    iget-boolean v3, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->useNewPremiumTierValues:Z
+
+    invoke-virtual {v1, v0, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(IIZ)V
 
     :cond_3
     :goto_3
@@ -207,6 +213,14 @@
     return v0
 .end method
 
+.method public final getUseNewPremiumTierValues()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->useNewPremiumTierValues:Z
+
+    return v0
+.end method
+
 .method public final instantiateItem(Landroid/view/ViewGroup;I)Landroid/view/View;
     .locals 7
 
@@ -240,7 +254,9 @@
 
     iget v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->premiumTier:I
 
-    invoke-virtual {v0, p2, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(II)V
+    iget-boolean v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->useNewPremiumTierValues:Z
+
+    invoke-virtual {v0, p2, v1, v2}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView;->configure(IIZ)V
 
     check-cast v0, Landroid/view/View;
 
@@ -255,7 +271,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d0073
+    const v1, 0x7f0d0077
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
index 730f4684b9..265e779347 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2.smali
@@ -17,26 +17,20 @@
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
+# instance fields
+.field final synthetic $availableBoosts:Ljava/util/List;
+
+.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
-
-    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
-
-    return-void
-.end method
-
-.method constructor <init>()V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Ljava/util/List;)V
     .locals 0
 
+    iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+
+    iput-object p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->$availableBoosts:Ljava/util/List;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -45,9 +39,9 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 2
+    .locals 5
 
-    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
     const-string v1, "it"
 
@@ -61,13 +55,29 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v1, 0x1
+    iget-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->access$getGuildId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)J
 
-    move-result-object v1
+    move-result-wide v1
 
-    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
+    iget-object v3, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->$availableBoosts:Ljava/util/List;
+
+    invoke-static {v3}, Lkotlin/a/m;->first(Ljava/util/List;)Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getId()J
+
+    move-result-wide v3
+
+    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    invoke-virtual {v0, p1, v1, v2, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;JLjava/lang/Long;)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
index ca35599b9b..81998ca5a0 100644
--- 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
@@ -17,20 +17,26 @@
 .end annotation
 
 
-# instance fields
-.field final synthetic $hasAppleSubscription:Z
-
-.field final synthetic this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
+
+    invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
+
+    return-void
+.end method
+
+.method constructor <init>()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
@@ -39,36 +45,29 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 3
+    .locals 2
 
-    iget-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->$hasAppleSubscription:Z
+    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;
 
-    if-eqz p1, :cond_0
+    const-string v1, "it"
 
-    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const-string v0, "requireContext()"
+    const-string v1, "it.context"
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/4 v1, 0x1
 
-    const v1, 0x7f1200ef
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
+    move-result-object v1
 
-    move-result-object v0
+    invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$Companion;->launch(Landroid/content/Context;Ljava/lang/Integer;)V
 
-    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
index 3dffa577b0..26f47c0361 100644
--- 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
@@ -18,15 +18,19 @@
 
 
 # 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;)V
+.method constructor <init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
+    iput-boolean p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->$hasAppleSubscription:Z
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -37,27 +41,34 @@
 .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;
+    iget-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->$hasAppleSubscription:Z
 
-    const-string v1, "it"
+    if-eqz p1, :cond_0
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;
 
-    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
     move-result-object p1
 
-    const-string v1, "it.context"
+    const-string v0, "requireContext()"
 
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;
+    iget-object v0, 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
+    const v1, 0x7f1200ef
 
-    move-result-wide v1
+    invoke-virtual {v0, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
-    invoke-virtual {v0, p1, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
+    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$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
index 7769535db3..18b30a07b3 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
index c037540cd3..4abda25800 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
@@ -561,7 +561,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostInfo$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d1
+    const v0, 0x7f0a00d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -569,7 +569,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostProgressBar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d3
+    const v0, 0x7f0a00d4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -577,7 +577,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier0Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d5
+    const v0, 0x7f0a00d6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -585,7 +585,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier1Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d6
+    const v0, 0x7f0a00d7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -593,7 +593,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier1Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d8
+    const v0, 0x7f0a00d9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -601,7 +601,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier2Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00d9
+    const v0, 0x7f0a00da
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -609,7 +609,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier2Tv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00db
+    const v0, 0x7f0a00dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -617,7 +617,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->boostTier3Iv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00dc
+    const v0, 0x7f0a00dd
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -689,12 +689,6 @@
 
     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
@@ -842,7 +836,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v3, 0x7f0402a0
+    const v3, 0x7f0402a1
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -855,7 +849,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v3, 0x7f0402aa
+    const v3, 0x7f0402ab
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -873,8 +867,8 @@
     return-void
 .end method
 
-.method private final configureProgressBar(II)V
-    .locals 6
+.method private final configureProgressBar(IIZ)V
+    .locals 5
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProgressBar()Landroid/widget/ProgressBar;
 
@@ -882,66 +876,66 @@
 
     sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
 
-    invoke-virtual {v1, p1, p2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalProgress(II)I
+    invoke-virtual {v1, p1, p2, p3}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalProgress(IIZ)I
 
-    move-result v1
+    move-result p3
 
-    invoke-virtual {v0, v1}, Landroid/widget/ProgressBar;->setProgress(I)V
+    invoke-virtual {v0, p3}, Landroid/widget/ProgressBar;->setProgress(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostProgressBar()Landroid/widget/ProgressBar;
 
-    move-result-object v0
+    move-result-object p3
 
-    const/4 v1, 0x3
+    const/4 v0, 0x3
 
-    const/4 v2, 0x2
+    const/4 v1, 0x2
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
-    const/4 v4, 0x1
+    const/4 v3, 0x1
 
     if-eqz p1, :cond_3
 
-    if-eq p1, v4, :cond_2
+    if-eq p1, v3, :cond_2
 
-    if-eq p1, v2, :cond_1
+    if-eq p1, v1, :cond_1
 
-    if-eq p1, v1, :cond_0
+    if-eq p1, v0, :cond_0
 
-    const/4 v5, 0x0
+    const/4 v4, 0x0
 
     goto :goto_0
 
     :cond_0
-    const v5, 0x7f120e5f
+    const v4, 0x7f120ed3
 
     goto :goto_0
 
     :cond_1
-    const v5, 0x7f120e5e
+    const v4, 0x7f120ed2
 
     goto :goto_0
 
     :cond_2
-    const v5, 0x7f120e5d
+    const v4, 0x7f120ed1
 
     goto :goto_0
 
     :cond_3
-    const v5, 0x7f120e29
+    const v4, 0x7f120e5c
 
     :goto_0
-    invoke-virtual {p0, v5}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
+    invoke-virtual {p0, v4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v4
 
-    check-cast v5, Ljava/lang/CharSequence;
+    check-cast v4, Ljava/lang/CharSequence;
 
-    invoke-virtual {v0, v5}, Landroid/widget/ProgressBar;->setContentDescription(Ljava/lang/CharSequence;)V
+    invoke-virtual {p3, v4}, Landroid/widget/ProgressBar;->setContentDescription(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier0Iv()Landroid/widget/ImageView;
 
-    move-result-object v0
+    move-result-object p3
 
     if-lez p2, :cond_4
 
@@ -953,7 +947,7 @@
     const/4 p2, 0x0
 
     :goto_1
-    invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p3, p2}, Landroid/widget/ImageView;->setEnabled(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier1Iv()Landroid/widget/ImageView;
 
@@ -961,42 +955,42 @@
 
     if-lez p1, :cond_5
 
-    const/4 v0, 0x1
+    const/4 p3, 0x1
 
     goto :goto_2
 
     :cond_5
-    const/4 v0, 0x0
+    const/4 p3, 0x0
 
     :goto_2
-    invoke-virtual {p2, v0}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p2, p3}, Landroid/widget/ImageView;->setEnabled(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier2Iv()Landroid/widget/ImageView;
 
     move-result-object p2
 
-    if-lt p1, v2, :cond_6
+    if-lt p1, v1, :cond_6
 
-    const/4 v0, 0x1
+    const/4 p3, 0x1
 
     goto :goto_3
 
     :cond_6
-    const/4 v0, 0x0
+    const/4 p3, 0x0
 
     :goto_3
-    invoke-virtual {p2, v0}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p2, p3}, Landroid/widget/ImageView;->setEnabled(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostTier3Iv()Landroid/widget/ImageView;
 
     move-result-object p2
 
-    if-lt p1, v1, :cond_7
+    if-lt p1, v0, :cond_7
 
-    const/4 v3, 0x1
+    const/4 v2, 0x1
 
     :cond_7
-    invoke-virtual {p2, v3}, Landroid/widget/ImageView;->setEnabled(Z)V
+    invoke-virtual {p2, v2}, Landroid/widget/ImageView;->setEnabled(Z)V
 
     return-void
 .end method
@@ -1004,7 +998,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120e34
+    const v0, 0x7f120e69
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1016,7 +1010,7 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;)V
-    .locals 26
+    .locals 21
 
     move-object/from16 v0, p0
 
@@ -1058,7 +1052,7 @@
 
     const/4 v6, 0x0
 
-    if-nez v5, :cond_1c
+    if-nez v5, :cond_16
 
     sget-object v5, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;->INSTANCE:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;
 
@@ -1068,7 +1062,7 @@
 
     if-eqz v5, :cond_2
 
-    goto/16 :goto_d
+    goto/16 :goto_9
 
     :cond_2
     sget-object v5, Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;->INSTANCE:Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;
@@ -1079,7 +1073,7 @@
 
     const/4 v7, 0x1
 
-    if-nez v5, :cond_1b
+    if-nez v5, :cond_15
 
     sget-object v5, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;->INSTANCE:Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
 
@@ -1089,7 +1083,7 @@
 
     if-eqz v5, :cond_3
 
-    goto/16 :goto_c
+    goto/16 :goto_8
 
     :cond_3
     instance-of v5, v3, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
@@ -1109,19 +1103,15 @@
     invoke-virtual {v5, v8}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     :cond_4
-    if-eqz v3, :cond_1a
+    if-eqz v3, :cond_14
 
     check-cast v3, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-virtual {v3}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->component1()Ljava/util/List;
-
-    move-result-object v5
-
-    invoke-virtual {v3}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->component2()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    invoke-virtual {v3}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
 
     move-result-object v3
 
-    if-eqz v4, :cond_19
+    if-eqz v4, :cond_13
 
     check-cast v4, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
@@ -1131,33 +1121,35 @@
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()I
 
-    move-result v9
+    move-result v5
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
 
-    move-result-object v10
+    move-result-object v9
 
-    if-eqz v10, :cond_5
+    if-eqz v9, :cond_5
 
-    invoke-virtual {v10}, Ljava/lang/Integer;->intValue()I
+    invoke-virtual {v9}, Ljava/lang/Integer;->intValue()I
 
-    move-result v10
+    move-result v9
 
     goto :goto_0
 
     :cond_5
-    const/4 v10, 0x0
+    const/4 v9, 0x0
 
     :goto_0
-    move-object v11, v5
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
-    check-cast v11, Ljava/lang/Iterable;
+    move-result-wide v10
 
-    instance-of v12, v11, Ljava/util/Collection;
+    check-cast v4, Ljava/lang/Iterable;
+
+    instance-of v12, v4, Ljava/util/Collection;
 
     if-eqz v12, :cond_6
 
-    move-object v12, v11
+    move-object v12, v4
 
     check-cast v12, Ljava/util/Collection;
 
@@ -1165,167 +1157,122 @@
 
     move-result v12
 
-    if-nez v12, :cond_9
+    if-nez v12, :cond_8
 
     :cond_6
-    invoke-interface {v11}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result-object v11
+    move-result-object v4
 
     :cond_7
-    invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v12
 
-    if-eqz v12, :cond_9
+    if-eqz v12, :cond_8
 
-    invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v12
 
-    check-cast v12, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    check-cast v12, Lcom/discord/models/domain/ModelSubscription;
 
-    invoke-virtual {v12}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
+    invoke-virtual {v12}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
 
-    move-result-wide v12
+    move-result v12
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    if-eqz v12, :cond_7
 
-    move-result-wide v14
-
-    cmp-long v16, v12, v14
-
-    if-nez v16, :cond_8
-
-    const/4 v12, 0x1
+    const/4 v4, 0x1
 
     goto :goto_1
 
     :cond_8
-    const/4 v12, 0x0
+    const/4 v4, 0x0
 
     :goto_1
-    if-eqz v12, :cond_7
+    check-cast v3, Ljava/lang/Iterable;
 
-    const/4 v11, 0x1
+    new-instance v12, Ljava/util/ArrayList;
 
-    goto :goto_2
+    invoke-direct {v12}, Ljava/util/ArrayList;-><init>()V
+
+    check-cast v12, Ljava/util/Collection;
+
+    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v3
 
     :cond_9
-    const/4 v11, 0x0
-
     :goto_2
-    if-eqz v3, :cond_a
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getExpiresAtTimestamp()J
+    move-result v13
 
-    move-result-wide v12
+    if-eqz v13, :cond_b
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v13
+
+    move-object v14, v13
+
+    check-cast v14, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    move-result-object v15
+
+    if-nez v15, :cond_a
+
+    invoke-virtual {v14}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
+
+    move-result-wide v14
+
+    cmp-long v16, v14, v10
+
+    if-gtz v16, :cond_a
+
+    const/4 v14, 0x1
 
     goto :goto_3
 
     :cond_a
-    const-wide/16 v12, 0x0
+    const/4 v14, 0x0
 
     :goto_3
-    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
+    if-eqz v14, :cond_9
 
-    move-result-wide v14
+    invoke-interface {v12, v13}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    cmp-long v3, v12, v14
-
-    if-lez v3, :cond_b
-
-    const/4 v3, 0x1
-
-    goto :goto_4
+    goto :goto_2
 
     :cond_b
-    const/4 v3, 0x0
+    check-cast v12, Ljava/util/List;
 
-    :goto_4
-    move-object v12, v4
+    move-object v3, v12
 
-    check-cast v12, Ljava/lang/Iterable;
+    check-cast v3, Ljava/util/Collection;
 
-    instance-of v13, v12, Ljava/util/Collection;
+    invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
 
-    if-eqz v13, :cond_c
+    move-result v3
 
-    move-object v13, v12
+    xor-int/2addr v3, v7
 
-    check-cast v13, Ljava/util/Collection;
-
-    invoke-interface {v13}, Ljava/util/Collection;->isEmpty()Z
-
-    move-result v13
-
-    if-nez v13, :cond_e
-
-    :cond_c
-    invoke-interface {v12}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v12
-
-    :cond_d
-    invoke-interface {v12}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v13
-
-    if-eqz v13, :cond_e
-
-    invoke-interface {v12}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v13
-
-    check-cast v13, Lcom/discord/models/domain/ModelSubscription;
-
-    invoke-virtual {v13}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
-
-    move-result v13
-
-    if-eqz v13, :cond_d
-
-    const/4 v12, 0x1
-
-    goto :goto_5
-
-    :cond_e
-    const/4 v12, 0x0
-
-    :goto_5
-    sget-object v13, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
-
-    invoke-virtual {v13, v4}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
-
-    move-result v4
-
-    check-cast v5, Ljava/util/Collection;
-
-    invoke-interface {v5}, Ljava/util/Collection;->size()I
-
-    move-result v5
-
-    sub-int/2addr v4, v5
-
-    if-lez v4, :cond_f
-
-    const/4 v4, 0x1
-
-    goto :goto_6
-
-    :cond_f
-    const/4 v4, 0x0
-
-    :goto_6
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-direct {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureToolbar(Ljava/lang/String;)V
 
-    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureProgressBar(II)V
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$Model;->getUseNewPremiumTierValues()Z
 
-    invoke-direct {v0, v9, v10}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureViewpager(II)V
+    move-result v2
+
+    invoke-direct {v0, v5, v9, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureProgressBar(IIZ)V
+
+    invoke-direct {v0, v5, v9}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->configureViewpager(II)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getBoostNumber()Landroid/widget/TextView;
 
@@ -1335,17 +1282,17 @@
 
     move-result-object v5
 
-    const v9, 0x7f100092
+    const v10, 0x7f100095
 
-    new-array v13, v7, [Ljava/lang/Object;
+    new-array v11, v7, [Ljava/lang/Object;
 
-    invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    move-result-object v14
+    move-result-object v13
 
-    aput-object v14, v13, v6
+    aput-object v13, v11, v6
 
-    invoke-virtual {v5, v9, v10, v13}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v5, v10, v9, v11}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object v5
 
@@ -1353,24 +1300,9 @@
 
     invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getPremiumType()I
+    const/16 v2, 0x8
 
-    move-result v2
-
-    const v5, 0x7f0600c2
-
-    if-eqz v2, :cond_14
-
-    if-eq v2, v7, :cond_14
-
-    if-eq v2, v8, :cond_10
-
-    goto :goto_8
-
-    :cond_10
-    if-eqz v4, :cond_11
-
-    if-nez v3, :cond_11
+    if-eqz v3, :cond_c
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
@@ -1382,31 +1314,48 @@
 
     move-result-object v1
 
-    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;
+    new-instance v3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
 
-    invoke-direct {v2, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;)V
+    invoke-direct {v3, v0, v12}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Ljava/util/List;)V
 
-    check-cast v2, Landroid/view/View$OnClickListener;
+    check-cast v3, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v3}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
     move-result-object v1
 
-    const/16 v2, 0x8
-
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setVisibility(I)V
 
     return-void
 
-    :cond_11
+    :cond_c
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getPremiumType()I
+
+    move-result v3
+
+    if-eqz v3, :cond_e
+
+    if-eq v3, v7, :cond_e
+
+    if-eq v3, v8, :cond_d
+
+    goto :goto_4
+
+    :cond_d
     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/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setVisibility(I)V
+
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getManageButton()Landroid/widget/Button;
 
     move-result-object v1
@@ -1417,73 +1366,10 @@
 
     invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    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/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/view/View;
-
-    invoke-static {v2, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setTextColor(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
-
-    move-result-object v4
-
-    const v5, 0x7f0801d6
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    const/4 v8, 0x0
-
-    const/16 v9, 0xe
-
-    const/4 v10, 0x0
-
-    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/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    if-eqz v3, :cond_12
-
-    const v2, 0x7f120e3d
-
-    goto :goto_7
-
-    :cond_12
-    if-eqz v11, :cond_13
-
-    const v2, 0x7f120e3b
-
-    goto :goto_7
-
-    :cond_13
-    const v2, 0x7f120e3c
-
-    :goto_7
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I)Ljava/lang/String;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/CharSequence;
-
-    invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
-
-    :goto_8
+    :goto_4
     return-void
 
-    :cond_14
+    :cond_e
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v2
@@ -1498,16 +1384,16 @@
 
     move-result v1
 
-    if-nez v1, :cond_15
+    if-nez v1, :cond_f
 
-    const v1, 0x7f120e2f
+    const v1, 0x7f120e62
 
-    goto :goto_9
+    goto :goto_5
 
-    :cond_15
-    const v1, 0x7f120e31
+    :cond_f
+    const v1, 0x7f120e66
 
-    :goto_9
+    :goto_5
     invoke-virtual {v2, v1}, Landroid/widget/Button;->setText(I)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getUpgradeButton()Landroid/widget/Button;
@@ -1516,19 +1402,19 @@
 
     check-cast v1, Landroid/view/View;
 
-    xor-int/lit8 v2, v12, 0x1
+    xor-int/lit8 v2, v4, 0x1
 
     const/4 v3, 0x0
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
-    invoke-static {v1, v2, v3, v8, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+    invoke-static {v1, v2, v3, v8, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
 
     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/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$2;
+    sget-object v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;->INSTANCE:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
@@ -1544,110 +1430,106 @@
 
     check-cast v2, Landroid/view/View;
 
-    if-eqz v12, :cond_16
+    if-eqz v4, :cond_10
 
-    const v3, 0x7f060126
+    const v3, 0x7f060127
 
+    goto :goto_6
+
+    :cond_10
+    const v3, 0x7f0600c3
+
+    :goto_6
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
     move-result v2
 
-    goto :goto_a
-
-    :cond_16
-    invoke-static {v2, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
-
-    move-result v2
-
-    :goto_a
     invoke-virtual {v1, v2}, Landroid/widget/TextView;->setTextColor(I)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getButtonInfo()Landroid/widget/TextView;
 
-    move-result-object v13
+    move-result-object v8
 
-    if-eqz v12, :cond_17
+    if-eqz v4, :cond_11
 
-    const v1, 0x7f0801d7
+    const v1, 0x7f0801e2
 
-    const v14, 0x7f0801d7
+    const v9, 0x7f0801e2
 
-    goto :goto_b
+    goto :goto_7
+
+    :cond_11
+    const/4 v9, 0x0
+
+    :goto_7
+    const/4 v10, 0x0
+
+    const/4 v11, 0x0
+
+    const/4 v12, 0x0
+
+    const/16 v13, 0xe
 
-    :cond_17
     const/4 v14, 0x0
 
-    :goto_b
-    const/4 v15, 0x0
+    invoke-static/range {v8 .. v14}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
-    const/16 v16, 0x0
-
-    const/16 v17, 0x0
-
-    const/16 v18, 0xe
-
-    const/16 v19, 0x0
-
-    invoke-static/range {v13 .. v19}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
-    if-eqz v12, :cond_18
+    if-eqz v4, :cond_12
 
     invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
+    move-result-object v15
+
+    const-string v1, "requireContext()"
+
+    invoke-static {v15, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v1, 0x7f120e67
+
+    new-array v2, v7, [Ljava/lang/Object;
+
+    const-string v3, "https://support.apple.com/en-us/HT202039"
+
+    aput-object v3, v2, v6
+
+    invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
     move-result-object v1
 
-    const-string v2, "requireContext()"
+    const-string v2, "getString(R.string.premi\u2026pple.com/en-us/HT202039\")"
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f120e32
+    move-object/from16 v16, v1
 
-    new-array v3, v7, [Ljava/lang/Object;
+    check-cast v16, Ljava/lang/CharSequence;
 
-    const-string v4, "https://support.apple.com/en-us/HT202039"
+    const/16 v17, 0x0
 
-    aput-object v4, v3, v6
+    const/16 v18, 0x0
 
-    invoke-virtual {v0, v2, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    const/16 v19, 0xc
 
-    move-result-object v2
+    const/16 v20, 0x0
 
-    const-string v3, "getString(R.string.premi\u2026pple.com/en-us/HT202039\")"
+    invoke-static/range {v15 .. v20}, 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;
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-result-object v5
 
-    move-object/from16 v21, v2
-
-    check-cast v21, Ljava/lang/CharSequence;
-
-    const/16 v22, 0x0
-
-    const/16 v23, 0x0
-
-    const/16 v24, 0xc
-
-    const/16 v25, 0x0
-
-    move-object/from16 v20, v1
-
-    invoke-static/range {v20 .. v25}, 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 v4
-
-    :cond_18
+    :cond_12
     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-static {v1, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
 
     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/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;
+    new-instance v2, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;
 
-    invoke-direct {v2, v0, v12}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$3;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
+    invoke-direct {v2, v0, v4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$configureUI$4;-><init>(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;Z)V
 
     check-cast v2, Landroid/view/View$OnClickListener;
 
@@ -1655,7 +1537,7 @@
 
     return-void
 
-    :cond_19
+    :cond_13
     new-instance v1, Lkotlin/r;
 
     const-string v2, "null cannot be cast to non-null type com.discord.stores.StoreSubscriptions.SubscriptionsState.Loaded"
@@ -1664,7 +1546,7 @@
 
     throw v1
 
-    :cond_1a
+    :cond_14
     new-instance v1, Lkotlin/r;
 
     const-string v2, "null cannot be cast to non-null type com.discord.stores.StorePremiumGuildSubscription.State.Loaded"
@@ -1673,8 +1555,8 @@
 
     throw v1
 
-    :cond_1b
-    :goto_c
+    :cond_15
+    :goto_8
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
@@ -1695,8 +1577,8 @@
 
     return-void
 
-    :cond_1c
-    :goto_d
+    :cond_16
+    :goto_9
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v1
@@ -1707,23 +1589,40 @@
 .end method
 
 .method private final configureViewpager(II)V
-    .locals 1
+    .locals 2
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
+    const-string v1, "pagerAdapter"
+
+    if-nez v0, :cond_0
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_0
     invoke-virtual {v0, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->setPremiumTier(I)V
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
+    if-nez v0, :cond_1
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_1
     invoke-virtual {v0, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->setSubscriptionCount(I)V
 
     iget-object p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
+    if-nez p2, :cond_2
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_2
     invoke-virtual {p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->configureViews()V
 
     iget-boolean p2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->wasPagerPageSet:Z
 
-    if-nez p2, :cond_0
+    if-nez p2, :cond_3
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
@@ -1739,7 +1638,7 @@
 
     iput-boolean p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->wasPagerPageSet:Z
 
-    :cond_0
+    :cond_3
     return-void
 .end method
 
@@ -2148,13 +2047,13 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0169
+    const v0, 0x7f0d016f
 
     return v0
 .end method
 
 .method public final onActivityCreated(Landroid/os/Bundle;)V
-    .locals 2
+    .locals 5
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
@@ -2164,15 +2063,46 @@
 
     const/4 v1, 0x3
 
-    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-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;
+
+    new-instance v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
+
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v2
+
+    const-string v3, "2019-10_android_premium_changes"
+
+    const/4 v4, 0x2
+
+    invoke-static {v2, v3, v0, v4, v0}, Lcom/discord/stores/StoreExperiments;->getExperimentSnapshot$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/models/domain/ModelExperiment;
+
+    move-result-object v0
+
+    const/4 v2, 0x1
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
+
+    move-result v0
+
+    if-ne v0, v2, :cond_0
+
+    const/4 p1, 0x1
+
+    :cond_0
+    invoke-direct {v1, p1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;-><init>(Z)V
+
+    iput-object v1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
     move-result-object p1
 
-    const/4 v0, 0x1
-
-    invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setWrapHeight(Z)V
+    invoke-virtual {p1, v2}, Lcom/discord/utilities/simple_pager/SimplePager;->setWrapHeight(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager;
 
@@ -2180,6 +2110,13 @@
 
     iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;
 
+    if-nez v0, :cond_1
+
+    const-string v1, "pagerAdapter"
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_1
     check-cast v0, Landroidx/viewpager/widget/PagerAdapter;
 
     invoke-virtual {p1, v0}, Lcom/discord/utilities/simple_pager/SimplePager;->setAdapter(Landroidx/viewpager/widget/PagerAdapter;)V
@@ -2212,9 +2149,9 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->vj:J
+    sget-wide v2, Lcom/discord/app/e;->vi:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -2224,7 +2161,7 @@
 
     aput-object v2, v1, v3
 
-    const v2, 0x7f120e2c
+    const v2, 0x7f120e60
 
     invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -2382,7 +2319,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
index 9b2d4a831a..a803270b19 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion.smali
@@ -31,9 +31,24 @@
     return-void
 .end method
 
+.method public static synthetic create$default(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;Landroid/content/Context;JLjava/lang/Long;ILjava/lang/Object;)V
+    .locals 0
+
+    and-int/lit8 p5, p5, 0x4
+
+    if-eqz p5, :cond_0
+
+    const/4 p4, 0x0
+
+    :cond_0
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;JLjava/lang/Long;)V
+
+    return-void
+.end method
+
 
 # virtual methods
-.method public final create(Landroid/content/Context;J)V
+.method public final create(Landroid/content/Context;JLjava/lang/Long;)V
     .locals 2
 
     const-string v0, "context"
@@ -50,7 +65,15 @@
 
     move-result-object p2
 
-    const-string p3, "Intent().putExtra(INTENT_EXTRA_GUILD_ID, guildId)"
+    check-cast p4, Ljava/io/Serializable;
+
+    const-string p3, "SLOT_ID"
+
+    invoke-virtual {p2, p3, p4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/io/Serializable;)Landroid/content/Intent;
+
+    move-result-object p2
+
+    const-string p3, "Intent()\n          .putE\u2026NT_EXTRA_SLOT_ID, slotId)"
 
     invoke-static {p2, p3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
index d98c03a1d6..aeb01ee985 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onResume$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 8a114024cd..37ae950f47 100644
--- 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
@@ -35,7 +35,7 @@
 
 # virtual methods
 .method public final onClick(Landroid/view/View;)V
-    .locals 2
+    .locals 4
 
     iget-object p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
@@ -49,7 +49,13 @@
 
     move-result-wide v0
 
-    invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(J)V
+    iget-object v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1;->this$0:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
+
+    invoke-static {v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->access$getSlotId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)J
+
+    move-result-wide v2
+
+    invoke-virtual {p1, v0, v1, v2, v3}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;->subscribeToPremiumGuild(JJ)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
index 8ad9b0698f..83d3f267da 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
@@ -14,12 +14,12 @@
 # static fields
 .field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-.field private static final COOLDOWN_DAYS:I = 0x7
-
 .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"
 
+.field private static final INTENT_EXTRA_SLOT_ID:Ljava/lang/String; = "SLOT_ID"
+
 .field private static final VIEW_INDEX_BOOSTED:I = 0x1
 
 .field private static final VIEW_INDEX_LOADED:I
@@ -46,9 +46,9 @@
 
 .field private final select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-.field private viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
+.field private slotId:J
 
-.field private final warning$delegate:Lkotlin/properties/ReadOnlyProperty;
+.field private viewModel:Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
 
 
 # direct methods
@@ -57,7 +57,7 @@
 
     const-class v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;
 
-    const/16 v1, 0xa
+    const/16 v1, 0x9
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -89,28 +89,6 @@
 
     move-result-object v3
 
-    const-string v4, "warning"
-
-    const-string v5, "getWarning()Landroid/widget/TextView;"
-
-    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
-
-    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
-
-    move-result-object v3
-
     const-string v4, "avatar"
 
     const-string v5, "getAvatar()Lcom/facebook/drawee/view/SimpleDraweeView;"
@@ -123,7 +101,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x2
+    const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
@@ -145,7 +123,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x3
+    const/4 v3, 0x2
 
     aput-object v2, v1, v3
 
@@ -167,7 +145,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x4
+    const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
@@ -189,7 +167,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x5
+    const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
@@ -211,7 +189,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x6
+    const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
@@ -233,7 +211,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x7
+    const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
@@ -255,7 +233,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x8
+    const/4 v3, 0x7
 
     aput-object v2, v1, v3
 
@@ -277,7 +255,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x9
+    const/16 v2, 0x8
 
     aput-object v0, v1, v2
 
@@ -299,7 +277,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a00e2
+    const v0, 0x7f0a00e3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -307,15 +285,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const v0, 0x7f0a00dd
+    const v0, 0x7f0a00de
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -323,7 +293,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->avatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e3
+    const v0, 0x7f0a00e4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -331,7 +301,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e4
+    const v0, 0x7f0a00e5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -339,7 +309,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->level$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e6
+    const v0, 0x7f0a00e7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -347,7 +317,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->select$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00df
+    const v0, 0x7f0a00e0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,7 +325,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->cancel$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e0
+    const v0, 0x7f0a00e1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +333,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->close$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a00e1
+    const v0, 0x7f0a00e2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +341,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -383,6 +353,8 @@
 
     iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
 
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->slotId:J
+
     return-void
 .end method
 
@@ -402,6 +374,14 @@
     return-wide v0
 .end method
 
+.method public static final synthetic access$getSlotId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)J
+    .locals 2
+
+    iget-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->slotId:J
+
+    return-wide v0
+.end method
+
 .method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;)Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;
     .locals 1
 
@@ -425,6 +405,14 @@
     return-void
 .end method
 
+.method public static final synthetic access$setSlotId$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;J)V
+    .locals 0
+
+    iput-wide p1, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->slotId:J
+
+    return-void
+.end method
+
 .method public static final synthetic access$setViewModel$p(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel;)V
     .locals 0
 
@@ -509,7 +497,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120e5f
+    const v3, 0x7f120ed3
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -555,7 +543,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120e5e
+    const v3, 0x7f120ed2
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -600,7 +588,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120e5d
+    const v3, 0x7f120ed1
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -645,7 +633,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120e29
+    const v2, 0x7f120e5c
 
     invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -659,7 +647,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f0802a8
+    const v4, 0x7f0802b4
 
     const/4 v5, 0x0
 
@@ -679,7 +667,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120e34
+    const v0, 0x7f120e69
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -691,7 +679,7 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State;)V
-    .locals 13
+    .locals 6
 
     instance-of v0, p1, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Uninitialized;
 
@@ -739,78 +727,6 @@
 
     invoke-direct {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->configureGuildCard(Lcom/discord/models/domain/ModelGuild;)V
 
-    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getResources()Landroid/content/res/Resources;
-
-    move-result-object v0
-
-    const v1, 0x7f100096
-
-    const/4 v2, 0x1
-
-    new-array v3, v2, [Ljava/lang/Object;
-
-    const/4 v4, 0x7
-
-    invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v5
-
-    const/4 v6, 0x0
-
-    aput-object v5, v3, v6
-
-    invoke-virtual {v0, v1, v4, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v1, "resources.getQuantityStr\u2026DOWN_DAYS, COOLDOWN_DAYS)"
-
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->requireContext()Landroid/content/Context;
-
-    move-result-object v8
-
-    const-string v3, "requireContext()"
-
-    invoke-static {v8, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v3, 0x7f120e45
-
-    new-array v4, v2, [Ljava/lang/Object;
-
-    aput-object v0, v4, v6
-
-    invoke-virtual {p0, v3, v4}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    const-string v3, "getString(R.string.premi\u2026down_warning, timeString)"
-
-    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object v9, v0
-
-    check-cast v9, Ljava/lang/CharSequence;
-
-    const/4 v10, 0x0
-
-    const/4 v11, 0x4
-
-    const/4 v12, 0x0
-
-    invoke-static/range {v7 .. v12}, Lcom/discord/utilities/textprocessing/Parsers;->parseMarkdown$default(Lcom/discord/utilities/textprocessing/Parsers;Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
-
-    move-result-object v0
-
-    invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
     invoke-virtual {p1}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$State$Loaded;->getPremiumGuildSubscriptionState()Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionInProgressViewModel$PremiumGuildSubscriptionState;
 
     move-result-object p1
@@ -823,21 +739,25 @@
 
     aget p1, v0, p1
 
-    const/4 v0, 0x0
+    const/4 v0, 0x1
 
-    const/4 v1, 0x4
+    const/4 v1, 0x0
+
+    const/4 v2, 0x4
 
     const/4 v3, 0x2
 
-    if-eq p1, v2, :cond_5
+    const/4 v4, 0x0
+
+    if-eq p1, v0, :cond_5
 
     if-eq p1, v3, :cond_4
 
-    const/4 v4, 0x3
+    const/4 v5, 0x3
 
-    if-eq p1, v4, :cond_3
+    if-eq p1, v5, :cond_3
 
-    if-eq p1, v1, :cond_2
+    if-eq p1, v2, :cond_2
 
     goto :goto_0
 
@@ -846,19 +766,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v2}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v0}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     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-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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     :goto_0
     return-void
@@ -868,19 +788,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     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-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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v4}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
@@ -889,19 +809,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     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-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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
@@ -910,19 +830,19 @@
 
     move-result-object p1
 
-    invoke-virtual {p1, v6}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {p1, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     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-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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getError()Landroid/view/View;
 
     move-result-object p1
 
-    invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     return-void
 
@@ -936,12 +856,12 @@
     throw p1
 .end method
 
-.method public static final create(Landroid/content/Context;J)V
+.method public static final create(Landroid/content/Context;JLjava/lang/Long;)V
     .locals 1
 
     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/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
+    invoke-virtual {v0, p0, p1, p2, p3}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;JLjava/lang/Long;)V
 
     return-void
 .end method
@@ -953,7 +873,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x2
+    const/4 v2, 0x1
 
     aget-object v1, v1, v2
 
@@ -973,7 +893,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x6
+    const/4 v2, 0x5
 
     aget-object v1, v1, v2
 
@@ -993,7 +913,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x7
+    const/4 v2, 0x6
 
     aget-object v1, v1, v2
 
@@ -1013,7 +933,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x9
+    const/16 v2, 0x8
 
     aget-object v1, v1, v2
 
@@ -1033,7 +953,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/4 v2, 0x7
 
     aget-object v1, v1, v2
 
@@ -1073,7 +993,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x3
 
     aget-object v1, v1, v2
 
@@ -1093,7 +1013,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x3
+    const/4 v2, 0x2
 
     aget-object v1, v1, v2
 
@@ -1113,7 +1033,7 @@
 
     sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x4
 
     aget-object v1, v1, v2
 
@@ -1126,32 +1046,12 @@
     return-object v0
 .end method
 
-.method private final getWarning()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->warning$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->$$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
-
 
 # virtual methods
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0168
+    const v0, 0x7f0d016e
 
     return v0
 .end method
@@ -1173,7 +1073,7 @@
 .end method
 
 .method public final onCreate(Landroid/os/Bundle;)V
-    .locals 3
+    .locals 4
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onCreate(Landroid/os/Bundle;)V
 
@@ -1181,15 +1081,27 @@
 
     move-result-object p1
 
-    const-string v0, "GUILD_ID"
+    const-wide/16 v0, -0x1
 
-    const-wide/16 v1, -0x1
+    const-string v2, "GUILD_ID"
 
-    invoke-virtual {p1, v0, v1, v2}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+    invoke-virtual {p1, v2, v0, v1}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
+
+    move-result-wide v2
+
+    iput-wide v2, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
+
+    invoke-virtual {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object p1
+
+    const-string v2, "SLOT_ID"
+
+    invoke-virtual {p1, v2, v0, v1}, Landroid/content/Intent;->getLongExtra(Ljava/lang/String;J)J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->guildId:J
+    iput-wide v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->slotId:J
 
     return-void
 .end method
@@ -1281,7 +1193,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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
index b6a5781c7d..b8f2af3a1b 100644
--- 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
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali
index 18436f413a..0b537c6b3f 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation.smali
@@ -273,7 +273,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->error$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -429,7 +429,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120e5f
+    const v3, 0x7f120ed3
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -475,7 +475,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120e5e
+    const v3, 0x7f120ed2
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -520,7 +520,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120e5d
+    const v3, 0x7f120ed1
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -565,7 +565,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120e29
+    const v2, 0x7f120e5c
 
     invoke-virtual {v0, v2}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->getString(I)Ljava/lang/String;
 
@@ -579,7 +579,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f0802a8
+    const v4, 0x7f0802b4
 
     const/4 v5, 0x0
 
@@ -599,7 +599,7 @@
 .method private final configureToolbar(Ljava/lang/String;)V
     .locals 1
 
-    const v0, 0x7f120e34
+    const v0, 0x7f120e69
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/premiumguild/WidgetRemovePremiumGuildSubscriptionConfirmation;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -919,7 +919,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d016d
+    const v0, 0x7f0d0173
 
     return v0
 .end method
@@ -1061,7 +1061,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 b0b4d0f73a..5e83b9685d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 49200b988d..8366ec2d29 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 4c7fe7ceed..307b437b9d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f41c74dd04..1702e5f7e6 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;->hj()Landroid/graphics/drawable/Animatable;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/a;->hm()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 8322aea7f8..708bfbd297 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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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 4a7bc07bd4..86be71e368 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -345,7 +345,7 @@
 
     invoke-static {v3, v4, v2, v1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
@@ -357,7 +357,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -365,7 +365,7 @@
 
     move-result-object p1
 
-    iput-boolean v2, p1, Lcom/facebook/drawee/controller/a;->Ma:Z
+    iput-boolean v2, p1, Lcom/facebook/drawee/controller/a;->Mj:Z
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -373,11 +373,11 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-object v0, p1, Lcom/facebook/drawee/controller/a;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p1, Lcom/facebook/drawee/controller/a;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -470,7 +470,7 @@
 .method private final getDateString(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 3
 
-    const v0, 0x7f1203a1
+    const v0, 0x7f1203c6
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String;
 
@@ -631,7 +631,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c6
+    const v0, 0x7f0d00cc
 
     return v0
 .end method
@@ -721,7 +721,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, 0x7f1213ac
+    const p1, 0x7f121438
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -751,7 +751,7 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f1203a0
+    const v0, 0x7f1203c5
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String;
 
@@ -787,7 +787,7 @@
 
     invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
 
-    const p1, 0x7f1203a4
+    const p1, 0x7f1203c9
 
     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 ad6a218b8f..bcf8be7f2c 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 0x7f0a0470
+    .packed-switch 0x7f0a0478
         :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 930a455cd7..04b0668a4f 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->va:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->uZ: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 211e4a3e8b..73ff3e43ee 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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->vc:Ljava/lang/String;
+    sget-object v0, Lcom/discord/app/e;->vb:Ljava/lang/String;
 
     const/4 v1, 0x0
 
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 96bfe82b8d..49825bb41f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2ddec23dd1..de40dcd008 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 19c4d8b5e1..9d383f9c4b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -624,7 +624,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0679
+    const v0, 0x7f0a068e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -632,7 +632,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->appInfoTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cb
+    const v0, 0x7f0a07f4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -640,7 +640,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c4
+    const v0, 0x7f0a06d9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -648,7 +648,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c5
+    const v0, 0x7f0a06da
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -656,7 +656,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroBoosting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c6
+    const v0, 0x7f0a06db
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -664,7 +664,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNitroGifting$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a068e
+    const v0, 0x7f0a06a3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -672,7 +672,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsBilling$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a065b
+    const v0, 0x7f0a0670
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -680,7 +680,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAccount$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06d2
+    const v0, 0x7f0a06e7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -688,7 +688,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsPrivacy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0685
+    const v0, 0x7f0a069a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -696,7 +696,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAuthorizedApp$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a0
+    const v0, 0x7f0a06b5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -704,7 +704,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsConnections$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a067a
+    const v0, 0x7f0a068f
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -712,7 +712,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAppearance$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0689
+    const v0, 0x7f0a069e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -720,7 +720,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsBehavior$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06bc
+    const v0, 0x7f0a06d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -728,7 +728,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsLanguage$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06cb
+    const v0, 0x7f0a06e0
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -736,7 +736,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsNotifications$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a4
+    const v0, 0x7f0a06b9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -744,7 +744,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsGameActivity$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e3
+    const v0, 0x7f0a06f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -752,7 +752,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsTextImages$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ea
+    const v0, 0x7f0a06ff
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -760,7 +760,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsVoice$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a2
+    const v0, 0x7f0a06b7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -768,7 +768,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloperDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a3
+    const v0, 0x7f0a06b8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -776,7 +776,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloperHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06a1
+    const v0, 0x7f0a06b6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -784,7 +784,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsDeveloper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06e2
+    const v0, 0x7f0a06f7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -792,7 +792,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsSupport$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0678
+    const v0, 0x7f0a068d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -800,7 +800,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsAcknowledgements$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0699
+    const v0, 0x7f0a06ae
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -808,7 +808,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/WidgetSettings;->settingsChangelog$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06c7
+    const v0, 0x7f0a06dc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -938,12 +938,12 @@
 
     if-ne p1, v0, :cond_3
 
-    const p1, 0x7f120e8f
+    const p1, 0x7f120f0d
 
     goto :goto_3
 
     :cond_3
-    const p1, 0x7f120e8e
+    const p1, 0x7f120f0c
 
     :goto_3
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->getString(I)Ljava/lang/String;
@@ -1467,19 +1467,19 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const p1, 0x7f120b62
+    const p1, 0x7f120b93
 
     invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f1212e1
+    const v2, 0x7f12136d
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v1
 
-    const v2, 0x7f040285
+    const v2, 0x7f040286
 
     invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setDialogAttrTheme(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -1493,7 +1493,7 @@
 
     move-result-object p1
 
-    const v1, 0x7f12037b
+    const v1, 0x7f1203a0
 
     const/4 v2, 0x2
 
@@ -1513,7 +1513,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0195
+    const v0, 0x7f0d019b
 
     return v0
 .end method
@@ -1527,7 +1527,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1603,7 +1603,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 9.7.3 (973)"
+    const-string v0, " - 9.7.4 (974)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
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 add4b49294..2cdc8b9120 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 b751939d03..925a85ab27 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8bc5625a22..8a2558a27f 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, 0x7f0a0683
+    const v0, 0x7f0a0698
 
     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, 0x7f0a0682
+    const v0, 0x7f0a0697
 
     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, 0x7f0a0684
+    const v0, 0x7f0a0699
 
     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, 0x7f0a0681
+    const v0, 0x7f0a0696
 
     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, 0x7f0a067e
+    const v0, 0x7f0a0693
 
     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, 0x7f0a067d
+    const v0, 0x7f0a0692
 
     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, 0x7f0a067b
+    const v0, 0x7f0a0690
 
     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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -1068,7 +1068,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1212d2
+    const v0, 0x7f12135e
 
     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, 0x7f0d019a
+    const v0, 0x7f0d01a0
 
     return v0
 .end method
@@ -1100,7 +1100,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     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 854f13e1ce..6f6a5924b9 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, 0x7f0a04b1
+    const p1, 0x7f0a04bb
 
     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, 0x7f0a04b0
+    const p1, 0x7f0a04ba
 
     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, 0x7f0a04ae
+    const p1, 0x7f0a04b8
 
     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, 0x7f0a04af
+    const p1, 0x7f0a04b9
 
     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, 0x7f0a04b2
+    const p1, 0x7f0a04bc
 
     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, 0x7f0a04ad
+    const p1, 0x7f0a04b7
 
     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;->Dc:Lcom/discord/views/c;
+    sget-object p1, Lcom/discord/views/c;->De:Lcom/discord/views/c;
 
-    invoke-static {}, Lcom/discord/views/c;->eZ()Lcom/discord/utilities/views/SimpleRecyclerAdapter;
+    invoke-static {}, Lcom/discord/views/c;->fc()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 5a05fc267d..202607f1dd 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 59944b9df1..63563f14ed 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d019c
+    const v0, 0x7f0d01a2
 
     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 d4970bfc87..ca7effe359 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 209a755227..8f07649527 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 57ea272d4c..e42fc4ccbe 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 f5082a952a..916810fe4c 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, 0x7f1204da
+    const v1, 0x7f1204ff
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204e9
+    const v1, 0x7f12050e
 
     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, 0x7f12037b
+    const v2, 0x7f1203a0
 
     const/4 v3, 0x2
 
@@ -253,7 +253,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const p1, 0x7f1204d9
+    const p1, 0x7f1204fe
 
     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, 0x7f0d019b
+    const v0, 0x7f0d01a1
 
     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 41326416df..cb724c6e36 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, 0x7f0a068a
+    const v0, 0x7f0a069f
 
     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, 0x7f0a068d
+    const v0, 0x7f0a06a2
 
     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, 0x7f0a068c
+    const v0, 0x7f0a06a1
 
     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, 0x7f0a068b
+    const v0, 0x7f0a06a0
 
     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, 0x7f0d019d
+    const v0, 0x7f0d01a3
 
     return v0
 .end method
@@ -285,11 +285,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120648
+    const p1, 0x7f12066c
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -383,7 +383,7 @@
 
     aput-object v4, v1, v3
 
-    const v3, 0x7f12050d
+    const v3, 0x7f120532
 
     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 2adcaf7454..e1424fe637 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, 0x7f0d01a2
+    const v0, 0x7f0d01a8
 
     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, 0x7f12050e
+    const p1, 0x7f120533
 
     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 858da9e304..6f6f6d64fd 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 8b1b99c141..82addd5056 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 50630e8f40..00519b6161 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
@@ -81,7 +81,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v5, 0x7f121267
+    const v5, 0x7f1212ef
 
     invoke-virtual {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String;
 
@@ -93,7 +93,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v6, 0x7f120700
+    const v6, 0x7f120724
 
     invoke-virtual {v1, v6}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String;
 
@@ -105,7 +105,7 @@
 
     iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
 
-    const v7, 0x7f120701
+    const v7, 0x7f120725
 
     invoke-virtual {v1, v7}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String;
 
@@ -113,7 +113,7 @@
 
     const/4 v8, 0x0
 
-    const v1, 0x7f0a04a1
+    const v1, 0x7f0a04ab
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -135,7 +135,7 @@
 
     const/4 v11, 0x0
 
-    const v1, 0x7f0d01be
+    const v1, 0x7f0d01ca
 
     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 eadd49a226..5d391061cb 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 577f706036..18a25b8f06 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, 0x7f0a06aa
+    const v0, 0x7f0a06bf
 
     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, 0x7f0a06ab
+    const v0, 0x7f0a06c0
 
     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, 0x7f0a06a9
+    const v0, 0x7f0a06be
 
     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, 0x7f0a06a8
+    const v0, 0x7f0a06bd
 
     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, 0x7f0a06a6
+    const v0, 0x7f0a06bb
 
     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, 0x7f0a06a7
+    const v0, 0x7f0a06bc
 
     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, 0x7f0a06a5
+    const v0, 0x7f0a06ba
 
     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, 0x7f0800ec
+    const v1, 0x7f0800ed
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -337,7 +337,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121075
+    const v1, 0x7f1210fc
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -362,7 +362,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0800f0
+    const v1, 0x7f0800f1
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -370,7 +370,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121070
+    const v1, 0x7f1210f7
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -378,7 +378,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f121072
+    const v1, 0x7f1210f9
 
     invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
 
@@ -663,7 +663,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120da0
+    const v1, 0x7f120dd5
 
     const/4 v2, 0x1
 
@@ -678,7 +678,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a7
+    const v0, 0x7f0d01ad
 
     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 e7633d2145..6b482667f7 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, 0x7f0803e2
+    const v0, 0x7f0803f0
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f0803e9
-
-    return p0
-
-    :pswitch_1
     const p0, 0x7f0803f7
 
     return p0
 
+    :pswitch_1
+    const p0, 0x7f080405
+
+    return p0
+
     :pswitch_2
-    const p0, 0x7f0803fb
+    const p0, 0x7f080409
 
     return p0
 
     :pswitch_3
-    const p0, 0x7f0803fc
+    const p0, 0x7f08040a
 
     return p0
 
     :pswitch_4
-    const p0, 0x7f0803f3
+    const p0, 0x7f080401
 
     return p0
 
     :pswitch_5
-    const p0, 0x7f0803ea
-
-    return p0
-
-    :pswitch_6
-    const p0, 0x7f0803ee
-
-    return p0
-
-    :pswitch_7
-    const p0, 0x7f0803e0
-
-    return p0
-
-    :pswitch_8
-    const p0, 0x7f0803f0
-
-    return p0
-
-    :pswitch_9
-    const p0, 0x7f0803e5
-
-    return p0
-
-    :pswitch_a
-    const p0, 0x7f0803ed
-
-    return p0
-
-    :pswitch_b
-    const p0, 0x7f0803fd
-
-    return p0
-
-    :pswitch_c
-    const p0, 0x7f0803ec
-
-    return p0
-
-    :pswitch_d
-    const p0, 0x7f0803f9
-
-    return p0
-
-    :pswitch_e
-    const p0, 0x7f0803f4
-
-    return p0
-
-    :pswitch_f
-    const p0, 0x7f0803dc
-
-    return p0
-
-    :pswitch_10
-    const p0, 0x7f0803dd
-
-    return p0
-
-    :pswitch_11
     const p0, 0x7f0803f8
 
     return p0
 
-    :pswitch_12
-    const p0, 0x7f0803f6
+    :pswitch_6
+    const p0, 0x7f0803fc
 
     return p0
 
-    :pswitch_13
-    const p0, 0x7f0803f2
+    :pswitch_7
+    const p0, 0x7f0803ee
 
     return p0
 
-    :pswitch_14
-    const p0, 0x7f0803f1
+    :pswitch_8
+    const p0, 0x7f0803fe
 
     return p0
 
-    :pswitch_15
-    const p0, 0x7f0803ef
+    :pswitch_9
+    const p0, 0x7f0803f3
 
     return p0
 
-    :pswitch_16
+    :pswitch_a
+    const p0, 0x7f0803fb
+
+    return p0
+
+    :pswitch_b
+    const p0, 0x7f08040b
+
+    return p0
+
+    :pswitch_c
+    const p0, 0x7f0803fa
+
+    return p0
+
+    :pswitch_d
+    const p0, 0x7f080407
+
+    return p0
+
+    :pswitch_e
+    const p0, 0x7f080402
+
+    return p0
+
+    :pswitch_f
+    const p0, 0x7f0803ea
+
+    return p0
+
+    :pswitch_10
     const p0, 0x7f0803eb
 
     return p0
 
+    :pswitch_11
+    const p0, 0x7f080406
+
+    return p0
+
+    :pswitch_12
+    const p0, 0x7f080404
+
+    return p0
+
+    :pswitch_13
+    const p0, 0x7f080400
+
+    return p0
+
+    :pswitch_14
+    const p0, 0x7f0803ff
+
+    return p0
+
+    :pswitch_15
+    const p0, 0x7f0803fd
+
+    return p0
+
+    :pswitch_16
+    const p0, 0x7f0803f9
+
+    return p0
+
     :pswitch_17
-    const p0, 0x7f0803e6
+    const p0, 0x7f0803f4
 
     return p0
 
     :pswitch_18
-    const p0, 0x7f0803e3
+    const p0, 0x7f0803f1
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f0803e1
+    const p0, 0x7f0803ef
 
     return p0
 
@@ -1198,12 +1198,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f0803df
+    const p0, 0x7f0803ed
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f0803de
+    const p0, 0x7f0803ec
 
     return p0
 
@@ -1667,139 +1667,139 @@
     const/4 p0, -0x1
 
     :goto_1
-    const v0, 0x7f12058b
+    const v0, 0x7f1205b0
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f1211a0
+    const p0, 0x7f121228
 
     return p0
 
     :pswitch_1
-    const p0, 0x7f121354
+    const p0, 0x7f1213e0
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f1213bf
+    const p0, 0x7f12144c
 
     return p0
 
     :pswitch_3
-    const p0, 0x7f120f58
+    const p0, 0x7f120fdf
 
     return p0
 
     :pswitch_4
-    const p0, 0x7f12093e
+    const p0, 0x7f120973
 
     return p0
 
     :pswitch_5
-    const p0, 0x7f120b63
+    const p0, 0x7f120b94
 
     return p0
 
     :pswitch_6
-    const p0, 0x7f12056d
+    const p0, 0x7f120592
 
     return p0
 
     :pswitch_7
-    const p0, 0x7f120c0f
+    const p0, 0x7f120c41
 
     return p0
 
     :pswitch_8
-    const p0, 0x7f1205b8
+    const p0, 0x7f1205dd
 
     return p0
 
     :pswitch_9
-    const p0, 0x7f12093d
+    const p0, 0x7f120972
 
     return p0
 
     :pswitch_a
-    const p0, 0x7f120af6
+    const p0, 0x7f120b27
 
     return p0
 
     :pswitch_b
-    const p0, 0x7f1213c0
+    const p0, 0x7f12144d
 
     return p0
 
     :pswitch_c
-    const p0, 0x7f120a94
+    const p0, 0x7f120ac5
 
     return p0
 
     :pswitch_d
-    const p0, 0x7f121219
+    const p0, 0x7f1212a1
 
     return p0
 
     :pswitch_e
-    const p0, 0x7f120f6e
+    const p0, 0x7f120ff5
 
     return p0
 
     :pswitch_f
-    const p0, 0x7f1202b6
+    const p0, 0x7f1202b8
 
     return p0
 
     :pswitch_10
-    const p0, 0x7f1204a1
+    const p0, 0x7f1204c6
 
     return p0
 
     :pswitch_11
-    const p0, 0x7f1211d1
+    const p0, 0x7f121259
 
     return p0
 
     :pswitch_12
-    const p0, 0x7f121138
+    const p0, 0x7f1211c0
 
     return p0
 
     :pswitch_13
-    const p0, 0x7f120eda
+    const p0, 0x7f120f61
 
     return p0
 
     :pswitch_14
-    const p0, 0x7f120db7
+    const p0, 0x7f120dec
 
     return p0
 
     :pswitch_15
-    const p0, 0x7f120c0e
+    const p0, 0x7f120c40
 
     return p0
 
     :pswitch_16
-    const p0, 0x7f120a93
+    const p0, 0x7f120ac4
 
     return p0
 
     :pswitch_17
-    const p0, 0x7f1206a9
+    const p0, 0x7f1206cd
 
     return p0
 
     :pswitch_18
-    const p0, 0x7f12059d
+    const p0, 0x7f1205c2
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f12058a
+    const p0, 0x7f1205af
 
     return p0
 
@@ -1807,12 +1807,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f1204d6
+    const p0, 0x7f1204fb
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f1204b8
+    const p0, 0x7f1204dd
 
     return p0
 
@@ -1906,7 +1906,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ad
+    const v0, 0x7f0d01b3
 
     return v0
 .end method
@@ -1928,17 +1928,17 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f1212c1
+    const v0, 0x7f12134d
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120af8
+    const v0, 0x7f120b29
 
     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, 0x7f0a06bd
+    const v0, 0x7f0a06d2
 
     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, 0x7f0a06bf
+    const v0, 0x7f0a06d4
 
     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, 0x7f0a06be
+    const v0, 0x7f0a06d3
 
     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, 0x7f0a06c3
+    const v0, 0x7f0a06d8
 
     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 d4b5c3fa51..804f790d86 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, 0x7f0a06c0
+    const p1, 0x7f0a06d5
 
     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, 0x7f0a06c1
+    const p1, 0x7f0a06d6
 
     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 1b210acd00..61cd3e18c3 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, 0x7f0d01af
+    const p2, 0x7f0d01b5
 
     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.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguageSelect.smali
index 728aa72f68..c27590fac5 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, 0x7f0a06c2
+    const v0, 0x7f0a06d7
 
     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, 0x7f0d01ae
+    const v0, 0x7f0d01b4
 
     return v0
 .end method
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 3c3cdeecf0..5b77ee242b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 6f0dbbe691..138aedb5c6 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, 0x7f0a06e5
+    const v0, 0x7f0a06fa
 
     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, 0x7f0a06e6
+    const v0, 0x7f0a06fb
 
     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, 0x7f0a06e7
+    const v0, 0x7f0a06fc
 
     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, 0x7f0a06e8
+    const v0, 0x7f0a06fd
 
     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, 0x7f0a06e4
+    const v0, 0x7f0a06f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -360,7 +360,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b0
+    const v0, 0x7f0d01b6
 
     return v0
 .end method
@@ -370,11 +370,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f12119a
+    const p1, 0x7f121222
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -429,9 +429,9 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
-    const v0, 0x7f1209cf
+    const v0, 0x7f120a04
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali
index 1d4bddff11..9d2a3fe9bf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 dafaa4522e..0d00a1223a 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, 0x7f0a06cd
+    const v0, 0x7f0a06e2
 
     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, 0x7f0a06bb
+    const v0, 0x7f0a06d0
 
     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, 0x7f0a06d0
+    const v0, 0x7f0a06e5
 
     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, 0x7f0a06cc
+    const v0, 0x7f0a06e1
 
     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, 0x7f0a06cf
+    const v0, 0x7f0a06e4
 
     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, 0x7f0a06ce
+    const v0, 0x7f0a06e3
 
     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, 0x7f0a06d1
+    const v0, 0x7f0a06e6
 
     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, 0x7f0d01b2
+    const v0, 0x7f0d01b8
 
     return v0
 .end method
@@ -523,11 +523,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120c93
+    const p1, 0x7f120cc5
 
     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;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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 1bc9e0a226..205f3be6d9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 8cffc0f84b..49ac32055e 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, 0x7f0a06ca
+    const v0, 0x7f0a06df
 
     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, 0x7f0a06bb
+    const v0, 0x7f0a06d0
 
     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, 0x7f0a06c8
+    const v0, 0x7f0a06dd
 
     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, 0x7f0d01b1
+    const v0, 0x7f0d01b7
 
     return v0
 .end method
@@ -273,7 +273,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v1, Lcom/discord/app/i;->vO: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$Model$Companion$get$2$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$Model$Companion$get$2$2.smali
index 9cc91bee05..41edd0882d 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;->Ku()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kx()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 cbfb92befc..c78f8ac6d7 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 4412fd746e..114482a3a8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -109,15 +109,15 @@
 
     invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12126b
+    const v0, 0x7f1212f3
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f121268
+    const p2, 0x7f1212f0
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f121269
+    const p2, 0x7f1212f1
 
     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, 0x7f12126a
+    const p2, 0x7f1212f2
 
     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 0ab810a5ca..ab73fd0667 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -109,15 +109,15 @@
 
     invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120da4
+    const v0, 0x7f120dd9
 
     invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f120da1
+    const p2, 0x7f120dd6
 
     invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
 
-    const p2, 0x7f120da2
+    const p2, 0x7f120dd7
 
     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, 0x7f120da3
+    const p2, 0x7f120dd8
 
     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 e4b1e2f517..d13767def9 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, 0x7f1204d0
+    const v0, 0x7f1204f5
 
     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$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
index e89fec721a..486831fc54 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, 0x7f1204cf
+    const v1, 0x7f1204f4
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204ce
+    const v1, 0x7f1204f3
 
     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, 0x7f120ce1
+    const v2, 0x7f120d13
 
     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 0f00f2fc36..e9aae7947a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, 0x7f1204c6
+    const v1, 0x7f1204eb
 
     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, 0x7f1204c5
+    const v1, 0x7f1204ea
 
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -111,7 +111,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120ce1
+    const v0, 0x7f120d13
 
     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 537585024a..190c4a2585 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a0254dccb9..d062357798 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ed1721669f..e562ca74d6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 869271ed49..3119b33466 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3e4ea9dd0e..6c30a0775a 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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, 0x7f1204c4
+    const v1, 0x7f1204e9
 
     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, 0x7f1204ee
 
     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, 0x7f120ce1
+    const v2, 0x7f120d13
 
     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, 0x7f12037b
+    const v2, 0x7f1203a0
 
     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 185fa39113..dab7a2471c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c0ebc0f709..26f9818dec 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2a0a19c360..77eaf52761 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 67d68a4181..eb602fd3ae 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, 0x7f0a06d8
+    const v0, 0x7f0a06ed
 
     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, 0x7f0a06d9
+    const v0, 0x7f0a06ee
 
     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, 0x7f0a06da
+    const v0, 0x7f0a06ef
 
     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, 0x7f0a06db
+    const v0, 0x7f0a06f0
 
     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, 0x7f0a06dc
+    const v0, 0x7f0a06f1
 
     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, 0x7f0a06dd
+    const v0, 0x7f0a06f2
 
     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, 0x7f0a06d5
+    const v0, 0x7f0a06ea
 
     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, 0x7f0a06d4
+    const v0, 0x7f0a06e9
 
     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, 0x7f0a06e1
+    const v0, 0x7f0a06f6
 
     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, 0x7f0a06de
+    const v0, 0x7f0a06f3
 
     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, 0x7f0a06d3
+    const v0, 0x7f0a06e8
 
     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, 0x7f0a06df
+    const v0, 0x7f0a06f4
 
     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, 0x7f0a06e0
+    const v0, 0x7f0a06f5
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1168,7 +1168,7 @@
         }
     .end annotation
 
-    const v0, 0x7f0d007f
+    const v0, 0x7f0d0084
 
     const/4 v1, 0x0
 
@@ -1198,7 +1198,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07fc
+    const v1, 0x7f0a082b
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1208,7 +1208,7 @@
 
     invoke-static {v3, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07fd
+    const v1, 0x7f0a082c
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1218,7 +1218,7 @@
 
     invoke-static {v4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07fa
+    const v1, 0x7f0a0829
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1228,7 +1228,7 @@
 
     invoke-static {v5, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v1, 0x7f0a07fb
+    const v1, 0x7f0a082a
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1655,7 +1655,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0d01b6
+    const v1, 0x7f0d01bc
 
     const/4 v2, 0x0
 
@@ -1663,7 +1663,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0a06d6
+    const v1, 0x7f0a06eb
 
     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, 0x7f0a06d7
+    const v1, 0x7f0a06ec
 
     invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -1762,7 +1762,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1204bd
+    const p2, 0x7f1204e2
 
     const/4 v1, 0x1
 
@@ -1784,7 +1784,7 @@
 
     invoke-direct {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v0, 0x7f1204d3
+    const v0, 0x7f1204f8
 
     invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -1794,7 +1794,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f120ce1
+    const p2, 0x7f120d13
 
     const/4 v0, 0x2
 
@@ -1857,7 +1857,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getContext()Landroid/content/Context;
 
@@ -1930,7 +1930,7 @@
     move-result-object p2
 
     :goto_0
-    invoke-virtual {p2}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p2}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object p2
 
@@ -1948,7 +1948,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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, 0x7f0d01b5
+    const v0, 0x7f0d01bb
 
     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, 0x7f1212c1
+    const v1, 0x7f12134d
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v1, 0x7f120ece
+    const v1, 0x7f120f55
 
     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;->vk:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v4, Lcom/discord/app/e;->vg:J
+    sget-wide v4, Lcom/discord/app/e;->vf:J
 
     invoke-static {v4, v5}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -2157,7 +2157,7 @@
 
     aput-object v1, v5, v3
 
-    const v1, 0x7f1204c2
+    const v1, 0x7f1204e7
 
     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;->vk:Lcom/discord/app/e;
+    sget-object v1, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v5, Lcom/discord/app/e;->ve:J
+    sget-wide v5, Lcom/discord/app/e;->vd:J
 
     invoke-static {v5, v6}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
     move-result-object v1
 
-    const v5, 0x7f1204bf
+    const v5, 0x7f1204e4
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String;
 
@@ -2245,7 +2245,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f0a0656
+    const v7, 0x7f0a066b
 
     invoke-virtual {v6, v7}, Lcom/discord/views/CheckedSetting;->findViewById(I)Landroid/view/View;
 
@@ -2296,9 +2296,9 @@
 
     invoke-virtual {v5, v6}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V
 
-    sget-object v5, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v5, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v5, Lcom/discord/app/e;->vf:J
+    sget-wide v5, Lcom/discord/app/e;->ve:J
 
     invoke-static {v5, v6}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -2320,7 +2320,7 @@
 
     invoke-direct {v7, v8}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const v8, 0x7f120c7a
+    const v8, 0x7f120cac
 
     invoke-virtual {v0, v8}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String;
 
@@ -2362,13 +2362,13 @@
 
     invoke-virtual {v1, v6}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    const v1, 0x7f1204d1
+    const v1, 0x7f1204f6
 
     new-array v5, v4, [Ljava/lang/Object;
 
-    sget-object v6, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v6, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v6, Lcom/discord/app/e;->vg:J
+    sget-wide v6, Lcom/discord/app/e;->vf:J
 
     invoke-static {v6, v7}, Lcom/discord/app/e;->j(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 5b5efeca6e..9ad66c0864 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, 0x7f0a0227
+    const p1, 0x7f0a022a
 
     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, 0x7f0a0229
+    const p1, 0x7f0a022c
 
     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, 0x7f0a0222
+    const p1, 0x7f0a0225
 
     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, 0x7f0a0224
+    const p1, 0x7f0a0227
 
     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, 0x7f0a022a
+    const p1, 0x7f0a022d
 
     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, 0x7f0a0223
+    const p1, 0x7f0a0226
 
     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, 0x7f0a0226
+    const p1, 0x7f0a0229
 
     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, 0x7f12053c
+    const v5, 0x7f120561
 
     new-array v3, v3, [Ljava/lang/Object;
 
@@ -841,7 +841,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1210c7
+    const v1, 0x7f12114e
 
     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 baa603cabb..ad9b5331cd 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, 0x7f0d01ac
+    const p2, 0x7f0d01b2
 
     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 8b24774f36..d170ef5aed 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, 0x7f0a0440
+    const p2, 0x7f0a0448
 
     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 1f39fa485b..2f88d58963 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ba0dd947df..399feec99a 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, 0x7f0a022c
+    const v0, 0x7f0a022f
 
     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, 0x7f0a022d
+    const v0, 0x7f0a0230
 
     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, 0x7f0d01a0
+    const v0, 0x7f0d01a6
 
     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, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120453
+    const p1, 0x7f120478
 
     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 d97e8a9549..bd9ba51519 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, 0x7f0d01a9
+    const v0, 0x7f0d01af
 
     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 5d614b7569..939e477e13 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 291073bec0..389b44d50b 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, 0x7f0a022d
+    const v0, 0x7f0a0230
 
     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, 0x7f0d01a1
+    const v0, 0x7f0d01a7
 
     return v0
 .end method
@@ -139,7 +139,7 @@
 
     invoke-virtual {v0}, Landroid/app/Dialog;->dismiss()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cfb426574d..891c307b33 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, 0x7f0a022e
+    const v0, 0x7f0a0231
 
     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, 0x7f0a022f
+    const v0, 0x7f0a0232
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f120443
+    const v1, 0x7f120468
 
     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, 0x7f0d0111
+    const v0, 0x7f0d0117
 
     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, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120453
+    const p1, 0x7f120478
 
     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 747ef7f383..6ab8fd669f 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 10de41ca6b..39bd924d12 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;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV: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;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object p2, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zU: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 a39836f640..581f524243 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;->zB:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zD: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;->zC:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zE: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;->zD:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zF: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 834db3210f..c11bbb4439 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;->zS:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zU: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 784ce6bfd8..e796f2b7e5 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;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV: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 5795d549cd..85a4048614 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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(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 2310454bba..e6cb72d0ff 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 93518d9f43..26a8065952 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e65c1a6215..7cd5aa8dd7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 63845eeccb..df98bb7af8 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, 0x7f0a06fa
+    const v0, 0x7f0a070f
 
     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, 0x7f0a06f9
+    const v0, 0x7f0a070e
 
     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, 0x7f0a06f1
+    const v0, 0x7f0a0706
 
     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, 0x7f0a06f2
+    const v0, 0x7f0a0707
 
     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, 0x7f0a06ec
+    const v0, 0x7f0a0701
 
     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, 0x7f0a06eb
+    const v0, 0x7f0a0700
 
     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, 0x7f0a06f4
+    const v0, 0x7f0a0709
 
     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, 0x7f0a06f6
+    const v0, 0x7f0a070b
 
     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, 0x7f0a06f5
+    const v0, 0x7f0a070a
 
     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, 0x7f0a06ed
+    const v0, 0x7f0a0702
 
     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, 0x7f0a06ee
+    const v0, 0x7f0a0703
 
     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, 0x7f0a06f3
+    const v0, 0x7f0a0708
 
     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, 0x7f0a06f0
+    const v0, 0x7f0a0705
 
     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, 0x7f0a06f7
+    const v0, 0x7f0a070c
 
     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, 0x7f0a0702
+    const v0, 0x7f0a0717
 
     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, 0x7f0a06fe
+    const v0, 0x7f0a0713
 
     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, 0x7f0a06fb
+    const v0, 0x7f0a0710
 
     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, 0x7f0a0701
+    const v0, 0x7f0a0716
 
     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, 0x7f0a06fd
+    const v0, 0x7f0a0712
 
     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, 0x7f0a0700
+    const v0, 0x7f0a0715
 
     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, 0x7f0a06ff
+    const v0, 0x7f0a0714
 
     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, 0x7f0a0703
+    const v0, 0x7f0a0718
 
     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, 0x7f0a06ef
+    const v0, 0x7f0a0704
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1479,12 +1479,12 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f08018a
+    const p1, 0x7f080195
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080189
+    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;->zA:F
+    iget v1, v1, Lcom/discord/rtcconnection/mediaengine/MediaEngine$LocalVoiceStatus;->zC:F
 
     const/high16 v2, 0x42c80000    # 100.0f
 
@@ -2045,7 +2045,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->ff()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fi()Landroid/widget/Checkable;
 
     move-result-object v0
 
@@ -2126,7 +2126,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->ff()Landroid/widget/Checkable;
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fi()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;->zC:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zE: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;->zD:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
+    sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;->zF:Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;
 
     goto :goto_0
 
@@ -2178,7 +2178,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f121307
+    const v1, 0x7f121393
 
     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, 0x7f0d01b7
+    const v0, 0x7f0d01bd
 
     return v0
 .end method
@@ -2478,9 +2478,9 @@
 
     iput-object v3, v0, Lcom/discord/widgets/settings/WidgetSettingsVoice;->openSLESConfigRadioManager:Lcom/discord/views/RadioManager;
 
-    sget-object v3, Lcom/discord/samsung/a;->Bb:Lcom/discord/samsung/a;
+    sget-object v3, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eJ()Lrx/Observable;
+    invoke-static {}, Lcom/discord/samsung/a;->eL()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 e2e5bfc895..8363b12a6a 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, 0x7f120515
+    const v4, 0x7f12053a
 
-    const v5, 0x7f120516
+    const v5, 0x7f12053b
 
-    const v6, 0x7f120514
+    const v6, 0x7f120539
 
     move-object v1, v7
 
@@ -74,11 +74,11 @@
 
     const/4 v10, 0x1
 
-    const v11, 0x7f1204e3
+    const v11, 0x7f120508
 
-    const v12, 0x7f1204e4
+    const v12, 0x7f120509
 
-    const v13, 0x7f1204e2
+    const v13, 0x7f120507
 
     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 9f49142d28..d959d342ad 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bd9656b09b..9ed2f2ef31 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 473df16833..55577522bb 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 92243b1fd0..2c2cc48440 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0941ced548..8408332955 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ce89e32aa4..2cfc9fa0be 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, 0x7f0a027f
+    const v0, 0x7f0a0282
 
     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, 0x7f0a027a
+    const v0, 0x7f0a027d
 
     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, 0x7f0a027b
+    const v0, 0x7f0a027e
 
     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, 0x7f0a027e
+    const v0, 0x7f0a0281
 
     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, 0x7f0a0280
+    const v0, 0x7f0a0283
 
     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, 0x7f0a0281
+    const v0, 0x7f0a0284
 
     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, 0x7f0a027c
+    const v0, 0x7f0a027f
 
     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, 0x7f0a027d
+    const v0, 0x7f0a0280
 
     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, 0x7f0d0115
+    const v0, 0x7f0d011b
 
     return v0
 .end method
@@ -801,7 +801,7 @@
     :goto_0
     if-nez v0, :cond_1
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm: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 51ebfb3e28..ae5731f558 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 17d71737fc..c01e9b7cfe 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a6637014b6..395cec3bb8 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, 0x7f0a02c3
+    const v0, 0x7f0a02c6
 
     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, 0x7f0a02c0
+    const v0, 0x7f0a02c3
 
     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, 0x7f0a02c5
+    const v0, 0x7f0a02c8
 
     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, 0x7f0a02c4
+    const v0, 0x7f0a02c7
 
     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, 0x7f0a02c1
+    const v0, 0x7f0a02c4
 
     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, 0x7f0a02c2
+    const v0, 0x7f0a02c5
 
     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, 0x7f0d0118
+    const v0, 0x7f0d011e
 
     return v0
 .end method
@@ -582,7 +582,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bc0
+    const v3, 0x7f120bf1
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -600,7 +600,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bbc
+    const v3, 0x7f120bed
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -618,7 +618,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12058c
+    const v3, 0x7f1205b1
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -637,7 +637,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bc5
+    const v3, 0x7f120bf6
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -655,7 +655,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120bbe
+    const v3, 0x7f120bef
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -673,7 +673,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120514
+    const v3, 0x7f120539
 
     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 e35ba450ea..91798ad301 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
@@ -89,7 +89,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/discord/dialogs/c;->xu:Lcom/discord/dialogs/c$a;
+    sget-object p1, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$a;
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
@@ -105,7 +105,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
 
-    const v2, 0x7f120eb5
+    const v2, 0x7f120f34
 
     invoke-virtual {p1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
 
@@ -121,7 +121,7 @@
 
     const-string v4, "My Account"
 
-    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
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/d$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
 
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 52c2b35734..64bf63db04 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, 0x7f1203d8
+    const v1, 0x7f1203fd
 
-    const v2, 0x7f12121c
+    const v2, 0x7f1212a4
 
     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 59ec4c9508..d647a4a32d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ddc35eb923..4f22726103 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -77,7 +77,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f1212fc
+    const v2, 0x7f121388
 
     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 59f7dc0cda..b7227a4b18 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2d30036a5b..a6dfc9d1fb 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, 0x7f0a0671
+    const v0, 0x7f0a0686
 
     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, 0x7f0a0670
+    const v0, 0x7f0a0685
 
     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, 0x7f0a0660
+    const v0, 0x7f0a0675
 
     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, 0x7f0a0674
+    const v0, 0x7f0a0689
 
     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, 0x7f0a0662
+    const v0, 0x7f0a0677
 
     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, 0x7f0a0661
+    const v0, 0x7f0a0676
 
     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, 0x7f0a065c
+    const v0, 0x7f0a0671
 
     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, 0x7f0a0675
+    const v1, 0x7f0a068a
 
     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, 0x7f0a0676
+    const v1, 0x7f0a068b
 
     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, 0x7f0a065d
+    const v1, 0x7f0a0672
 
     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, 0x7f0a066e
+    const v1, 0x7f0a0683
 
     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, 0x7f0a0667
+    const v1, 0x7f0a067c
 
     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, 0x7f0a0677
+    const v1, 0x7f0a068c
 
     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, 0x7f0a066f
+    const v1, 0x7f0a0684
 
     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, 0x7f0a0672
+    const v1, 0x7f0a0687
 
     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, 0x7f0a0673
+    const v1, 0x7f0a0688
 
     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, 0x7f0a0668
+    const v1, 0x7f0a067d
 
     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, 0x7f0a0669
+    const v1, 0x7f0a067e
 
     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, 0x7f0a066a
+    const v1, 0x7f0a067f
 
     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, 0x7f0a0665
+    const v1, 0x7f0a067a
 
     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, 0x7f0a0666
+    const v1, 0x7f0a067b
 
     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, 0x7f0a0664
+    const v1, 0x7f0a0679
 
     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, 0x7f0a066d
+    const v1, 0x7f0a0682
 
     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, 0x7f0a066c
+    const v1, 0x7f0a0681
 
     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, 0x7f0a066b
+    const v1, 0x7f0a0680
 
     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, 0x7f0a0277
+    const v1, 0x7f0a027a
 
     invoke-static {p0, v1}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1193,7 +1193,7 @@
 
     move-result-object v3
 
-    const v8, 0x7f0402aa
+    const v8, 0x7f0402ab
 
     invoke-static {v3, v8}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -1596,7 +1596,7 @@
     :goto_9
     if-nez v2, :cond_b
 
-    const v2, 0x7f120bbb
+    const v2, 0x7f120bec
 
     new-array v3, v4, [Ljava/lang/Object;
 
@@ -1631,7 +1631,7 @@
 
     if-eqz p1, :cond_c
 
-    const p1, 0x7f120bbf
+    const p1, 0x7f120bf0
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
 
@@ -1640,7 +1640,7 @@
     goto :goto_a
 
     :cond_c
-    const p1, 0x7f120bbc
+    const p1, 0x7f120bed
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
 
@@ -1694,7 +1694,7 @@
 
     check-cast v0, Landroidx/fragment/app/Fragment;
 
-    const v1, 0x7f120f97
+    const v1, 0x7f12101e
 
     invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
@@ -2417,13 +2417,13 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f1204e6
+    const v1, 0x7f12050b
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
     move-result-object v0
 
-    const v1, 0x7f1204e7
+    const v1, 0x7f12050c
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -2431,7 +2431,7 @@
 
     const/4 v1, 0x0
 
-    const v2, 0x7f120ce1
+    const v2, 0x7f120d13
 
     const/4 v3, 0x2
 
@@ -2470,7 +2470,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12120a
+    const v3, 0x7f121292
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2484,7 +2484,7 @@
 
     move-result-object v3
 
-    const v4, 0x7f1212f9
+    const v4, 0x7f121385
 
     invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2498,7 +2498,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f1211e4
+    const v5, 0x7f12126c
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -2528,7 +2528,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0196
+    const v0, 0x7f0d019c
 
     return v0
 .end method
@@ -2560,7 +2560,7 @@
 
     iget-object v5, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->accountAvatarSelectedResult:Lrx/functions/Action1;
 
-    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xo:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
+    sget-object v6, Lcom/discord/dialogs/ImageUploadDialog$PreviewType;->xq:Lcom/discord/dialogs/ImageUploadDialog$PreviewType;
 
     move-object v1, p1
 
@@ -2604,11 +2604,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1212ff
+    const p1, 0x7f12138b
 
     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 d91b8d3316..de624a91e5 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, 0x7f0a03e9
+    const p1, 0x7f0a03f1
 
     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 4ed18759b5..bfe1513772 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, 0x7f12045b
+    const v0, 0x7f120480
 
     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 e77e495f31..fc9b0578ca 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, 0x7f0a03d2
+    const p1, 0x7f0a03da
 
     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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f12029d
+    const v4, 0x7f12029f
 
     const/4 v5, 0x1
 
@@ -213,7 +213,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f08022b
+    const p2, 0x7f080236
 
     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 4de335b73b..a6b1a10301 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, 0x7f0d01aa
+    const p2, 0x7f0d01b0
 
     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, 0x7f0d01ab
+    const p2, 0x7f0d01b1
 
     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 e2efb0f170..fda4c7c701 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -179,7 +179,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f1212db
+    const v5, 0x7f121367
 
     invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -258,7 +258,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f12130f
+    const v4, 0x7f12139b
 
     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 442769ccbb..423b69973a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 c14fa77920..3161bfa625 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 f036dbdedd..8ef0ed310a 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, 0x7f0a0687
+    const v0, 0x7f0a069c
 
     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, 0x7f0a0688
+    const v0, 0x7f0a069d
 
     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, 0x7f0a0686
+    const v0, 0x7f0a069b
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -312,7 +312,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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, 0x7f1212e5
+    const v3, 0x7f121371
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -456,7 +456,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f1211ea
+    const v4, 0x7f121272
 
     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, 0x7f0d0197
+    const v0, 0x7f0d019d
 
     return v0
 .end method
@@ -511,11 +511,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1211ea
+    const p1, 0x7f121272
 
     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, 0x7f1211e9
+    const v0, 0x7f121271
 
     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 181acfb240..20ec33aad7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a048da247d..d888952c40 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 000909ee22..fc7c1e77df 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 30dd6354f4..0c47ba241e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 05265e3a50..da9251549f 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, 0x7f120f97
+    const v1, 0x7f12101e
 
     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 4e209ba4ed..86d5cfb588 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
@@ -193,7 +193,7 @@
 
     iput-object v1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->twoFA$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v1, 0x7f0a0277
+    const v1, 0x7f0a027a
 
     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, 0x7f120d43
+    const v3, 0x7f120d76
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -546,7 +546,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f120d3d
+    const v3, 0x7f120d70
 
     invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -609,7 +609,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f12120f
+    const v3, 0x7f121297
 
     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, 0x7f0d0198
+    const v0, 0x7f0d019e
 
     return v0
 .end method
@@ -734,11 +734,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1203a8
+    const p1, 0x7f1203cd
 
     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 ce0661de06..0888998051 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/dialogs/c;->xu:Lcom/discord/dialogs/c$a;
+    sget-object p1, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$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, 0x7f120ec1
+    const p2, 0x7f120f46
 
     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/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
+    invoke-static/range {v0 .. v7}, Lcom/discord/dialogs/d$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 c4cc8cea93..1c696504cb 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ceeec75911..0ced962293 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 69499632c3..2dcbfaef40 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fe2c08411f..550d765cc7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a2e1df1573..67dc1e0e53 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, 0x7f120f97
+    const v1, 0x7f12101e
 
     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 0d02cc74d7..a0eddfc9c7 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, 0x7f121322
+    const v7, 0x7f1213ae
 
     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, 0x7f120ddb
+    const v8, 0x7f120e10
 
-    const v9, 0x7f120de0
+    const v9, 0x7f120e15
 
     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, 0x7f120574
+    const v9, 0x7f120599
 
     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, 0x7f120573
+    const v9, 0x7f120598
 
     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, 0x7f120d43
+    const v8, 0x7f120d76
 
     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, 0x7f120d3d
+    const v7, 0x7f120d70
 
     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 99ddfa55bb..534b3adc41 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, 0x7f0a028b
+    const v0, 0x7f0a028e
 
     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, 0x7f0a028a
+    const v0, 0x7f0a028d
 
     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, 0x7f0a0283
+    const v0, 0x7f0a0286
 
     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, 0x7f0a0285
+    const v0, 0x7f0a0288
 
     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, 0x7f0a0286
+    const v0, 0x7f0a0289
 
     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, 0x7f0a0288
+    const v0, 0x7f0a028b
 
     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, 0x7f0a0287
+    const v0, 0x7f0a028a
 
     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, 0x7f0a0670
+    const v0, 0x7f0a0685
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -391,9 +391,9 @@
 
     :array_0
     .array-data 4
-        0x7f0a028a
-        0x7f0a0283
-        0x7f0a0285
+        0x7f0a028d
+        0x7f0a0286
+        0x7f0a0288
     .end array-data
 .end method
 
@@ -524,7 +524,7 @@
 
     move-result v4
 
-    sget-object v5, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sget-object v5, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     new-array v5, v1, [Ljava/lang/Object;
 
@@ -1058,7 +1058,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0199
+    const v0, 0x7f0d019f
 
     return v0
 .end method
@@ -1072,11 +1072,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1212e2
+    const p1, 0x7f12136e
 
     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 a5a30d78f5..1a6b9127a6 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, 0x7f0a047d
+    const v0, 0x7f0a0487
 
     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, 0x7f0d01a3
+    const v0, 0x7f0d01a9
 
     return v0
 .end method
@@ -119,7 +119,7 @@
 
     aput-object v2, v0, v1
 
-    const v1, 0x7f1211f0
+    const v1, 0x7f121278
 
     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 89c32f646a..4a632b92a2 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, 0x7f0a07ca
+    const v0, 0x7f0a07f3
 
     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, 0x7f0d01aa
 
     return v0
 .end method
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 f855b393cf..6ff8625b8a 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, 0x7f0a02bc
+    const v0, 0x7f0a02bf
 
     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, 0x7f0a02bd
+    const v0, 0x7f0a02c0
 
     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, 0x7f0a02be
+    const v0, 0x7f0a02c1
 
     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, 0x7f12045b
+    const v0, 0x7f120480
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
@@ -293,7 +293,7 @@
 
     const/4 v2, 0x1
 
-    const v3, 0x7f120b03
+    const v3, 0x7f120b34
 
     const/4 v4, 0x0
 
@@ -305,7 +305,7 @@
 
     new-array v5, v2, [Ljava/lang/Object;
 
-    const v6, 0x7f1211e2
+    const v6, 0x7f12126a
 
     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, 0x7f1211e3
+    const v5, 0x7f12126b
 
     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, 0x7f0d01a5
+    const v0, 0x7f0d01ab
 
     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 3712323ad5..b6e2250535 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 9c02c8b79a..bbdf7223d1 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->EN:Lcom/discord/views/steps/StepsView$d;
+    iget-object v1, v0, Lcom/discord/views/steps/StepsView;->EP: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 89a744505b..6164d79e71 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, 0x7f0a02bf
+    const v0, 0x7f0a02c2
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f0d0117
+    const v0, 0x7f0d011d
 
     return v0
 .end method
@@ -251,7 +251,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f12037b
+    const v4, 0x7f1203a0
 
     const/4 v5, 0x0
 
@@ -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;->Fh:Ljava/util/List;
+    iput-object v0, v2, Lcom/discord/views/steps/StepsView$d;->Fj: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v2, v0, Lcom/discord/views/steps/StepsView;->EN:Lcom/discord/views/steps/StepsView$d;
+    iput-object v2, v0, Lcom/discord/views/steps/StepsView;->EP: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;->EN:Lcom/discord/views/steps/StepsView$d;
+    iget-object v5, v0, Lcom/discord/views/steps/StepsView;->EP: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 a9b44b6e7c..07104ddd9d 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, 0x7f0a047e
+    const v0, 0x7f0a0488
 
     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, 0x7f0d01a6
+    const v0, 0x7f0d01ac
 
     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 5ab809030c..909f0d3120 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 59d469cf46..c18e4565cc 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0e7d4ebca4..a5b6f9b8d2 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bdce84ea59..8d0e6007cd 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -238,7 +238,7 @@
 
     move-result-object p2
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()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 bb6249fa35..cfa4578316 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, 0x7f0d004f
+    const v0, 0x7f0d0051
 
     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 c340e2eed8..730337a3f9 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, 0x7f0d0050
+    const v0, 0x7f0d0052
 
     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, 0x7f120cf0
+    const p2, 0x7f120d22
 
     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 d6096a889f..ab2fa62d57 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, 0x7f0d0051
+    const v0, 0x7f0d0053
 
     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, 0x7f0a04f0
+    const v0, 0x7f0a04fb
 
     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, 0x7f0a04ee
+    const v0, 0x7f0a04f9
 
     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 48649f8ab2..dc5a0526d6 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, 0x7f0d0052
+    const p3, 0x7f0d0054
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0504
+    const p1, 0x7f0a050f
 
     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, 0x7f0a0509
+    const p1, 0x7f0a0514
 
     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, 0x7f0a0508
+    const p1, 0x7f0a0513
 
     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, 0x7f0a0507
+    const p1, 0x7f0a0512
 
     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, 0x7f0a0506
+    const p1, 0x7f0a0511
 
     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, 0x7f120d66
+    const v2, 0x7f120d9a
 
     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, 0x7f120d68
+    const p1, 0x7f120d9c
 
     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, 0x7f120d84
+    const v1, 0x7f120db8
 
     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 a1cc1c8d49..d13a1a3402 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 e74513d77b..c30f111480 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 75610d7c10..2a337b9aaa 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
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 4c3f729eee..de54587143 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120d6e
+    const v0, 0x7f120da2
 
     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 5ded2535cc..c1de741204 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 5c9be39249..3e7baf2446 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 77a3317bf9..d910b49c2b 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
@@ -53,7 +53,7 @@
 
     iget-object v3, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v4, 0x7f120d6c
+    const v4, 0x7f120da0
 
     invoke-virtual {v3, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -65,7 +65,7 @@
 
     iget-object v4, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v5, 0x7f120d6d
+    const v5, 0x7f120da1
 
     invoke-virtual {v4, v5}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String;
 
@@ -77,7 +77,7 @@
 
     iget-object v5, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
 
-    const v6, 0x7f120ce1
+    const v6, 0x7f120d13
 
     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$selectState$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$selectState$2.smali
index 2760eeca1d..40e165def8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 caa959cbcd..20c37a71c7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f120d71
+    const v0, 0x7f120da5
 
     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 79a19749a0..3c2c64ccad 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1ece45bf6a..4e3f4bf672 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 1a3e6674bb..813161c1de 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, 0x7f0a0503
+    const v0, 0x7f0a050e
 
     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, 0x7f0a04ff
+    const v0, 0x7f0a050a
 
     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, 0x7f0a04fe
+    const v0, 0x7f0a0509
 
     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, 0x7f0a0500
+    const v0, 0x7f0a050b
 
     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, 0x7f0a04f9
+    const v0, 0x7f0a0504
 
     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, 0x7f0a04fa
+    const v0, 0x7f0a0505
 
     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, 0x7f0a04fb
+    const v0, 0x7f0a0506
 
     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, 0x7f0a0502
+    const v0, 0x7f0a050d
 
     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, 0x7f0a0501
+    const v0, 0x7f0a050c
 
     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, 0x7f0a04fc
+    const v0, 0x7f0a0507
 
     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, 0x7f0a04fd
+    const v0, 0x7f0a0508
 
     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, 0x7f0a026f
+    const v0, 0x7f0a0272
 
     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, 0x7f0a026e
+    const v0, 0x7f0a0271
 
     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, 0x7f120d70
+    const v3, 0x7f120da4
 
     new-array v4, v9, [Ljava/lang/Object;
 
@@ -1201,7 +1201,7 @@
     goto :goto_0
 
     :cond_0
-    const v3, 0x7f120d6f
+    const v3, 0x7f120da3
 
     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, 0x7f1202cc
+    const v0, 0x7f1202cd
 
     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, 0x7f1202c9
+    const v0, 0x7f1202ca
 
     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, 0x7f1202c8
+    const v7, 0x7f1202c9
 
     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, 0x7f1202c0
+    const v8, 0x7f1202c1
 
     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, 0x7f1202c3
+    const v8, 0x7f1202c4
 
     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, 0x7f1202cd
+    const p1, 0x7f1202ce
 
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f1202d0
+    const p1, 0x7f1202d1
 
     :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, 0x7f1202cb
+    const v6, 0x7f1202cc
 
     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/dialogs/d;->xB:Lcom/discord/dialogs/d$a;
+    sget-object v0, Lcom/discord/dialogs/e;->xD:Lcom/discord/dialogs/e$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, 0x7f120d72
+    const v1, 0x7f120da6
 
     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/dialogs/d$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/d;
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/dialogs/e$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/e;
 
     invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getPostalCodeInput()Lcom/google/android/material/textfield/TextInputLayout;
 
@@ -2166,7 +2166,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d0158
+    const v0, 0x7f0d015e
 
     return v0
 .end method
@@ -2404,7 +2404,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IV()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 2406f4e06f..34709ee5dc 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, 0x7f0a068f
+    const v0, 0x7f0a06a4
 
     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, 0x7f0d019e
+    const v0, 0x7f0d01a4
 
     return v0
 .end method
@@ -117,11 +117,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
 
-    const p1, 0x7f1202b7
+    const p1, 0x7f1202b9
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     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, 0x7f1202fa
+    const v4, 0x7f1202ff
 
     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, 0x7f1202f5
+    const v4, 0x7f1202fa
 
     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 4238ec18a0..c38c950305 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 99a0b920ba..9b63b8c4c1 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, 0x7f0a082b
+    const v0, 0x7f0a085b
 
     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, 0x7f0d01d8
+    const v0, 0x7f0d01e4
 
     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 c28f3da3fc..8517b3a4f6 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 e6bea7e9c3..99c745962c 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 33b0e1741f..f32804f75a 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, 0x7f0a04f8
+    const v0, 0x7f0a0503
 
     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, 0x7f0a04f6
+    const v0, 0x7f0a0501
 
     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, 0x7f0a04f7
+    const v0, 0x7f0a0502
 
     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, 0x7f0a04f1
+    const v0, 0x7f0a04fc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -475,7 +475,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b3
+    const v0, 0x7f0d01b9
 
     return v0
 .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
index 3936d5ce98..c3b808ce12 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/AccountCreditView.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/AccountCreditView.smali
@@ -67,11 +67,11 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const p3, 0x7f0d006d
+    const p3, 0x7f0d0071
 
     invoke-static {p1, p3, p2}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
-    const p1, 0x7f0a0246
+    const p1, 0x7f0a0249
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
 
@@ -81,7 +81,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->icon:Landroid/widget/ImageView;
 
-    const p1, 0x7f0a0245
+    const p1, 0x7f0a0248
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
 
@@ -91,7 +91,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->header:Landroid/widget/TextView;
 
-    const p1, 0x7f0a0247
+    const p1, 0x7f0a024a
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
 
@@ -101,7 +101,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/AccountCreditView;->infoText:Landroid/widget/TextView;
 
-    const p1, 0x7f0a024c
+    const p1, 0x7f0a024f
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/AccountCreditView;->findViewById(I)Landroid/view/View;
 
@@ -180,7 +180,7 @@
 
     move-result-wide v5
 
-    const v2, 0x7f120e90
+    const v2, 0x7f120f10
 
     const-string v7, "header"
 
@@ -192,7 +192,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f120e98
+    const v6, 0x7f120f1c
 
     invoke-virtual {v5, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -204,7 +204,7 @@
 
     iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->icon:Landroid/widget/ImageView;
 
-    const v8, 0x7f080129
+    const v8, 0x7f08012d
 
     invoke-virtual {v6, v8}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -245,7 +245,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f120e99
+    const v6, 0x7f120f1d
 
     invoke-virtual {v5, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -257,7 +257,7 @@
 
     iget-object v6, v0, Lcom/discord/widgets/settings/premium/AccountCreditView;->icon:Landroid/widget/ImageView;
 
-    const v8, 0x7f080128
+    const v8, 0x7f08012c
 
     invoke-virtual {v6, v8}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -335,7 +335,7 @@
 
     move-result-object v2
 
-    const v7, 0x7f120e92
+    const v7, 0x7f120f12
 
     new-array v8, v3, [Ljava/lang/Object;
 
@@ -360,7 +360,7 @@
 
     move-result-object v2
 
-    const v7, 0x7f120e91
+    const v7, 0x7f120f11
 
     new-array v8, v3, [Ljava/lang/Object;
 
@@ -385,7 +385,7 @@
 
     move-result-object v5
 
-    const v6, 0x7f1000a6
+    const v6, 0x7f1000af
 
     new-array v3, v3, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali
index 890ce4bddd..8299c785b0 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$2.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali
index 821c59cdf5..8d0926c16f 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel$3.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$3;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index dc41c51c41..9bad527877 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/SettingsPremiumViewModel.smali
@@ -61,7 +61,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v0
 
@@ -837,7 +837,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -938,7 +938,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1317,7 +1317,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -1434,7 +1434,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali
index b19e6bee74..bec4dc1d61 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog$onResume$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali
index eb5dc5dc54..19ea92f6f8 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetCancelPremiumDialog.smali
@@ -279,7 +279,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->errorTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c9
+    const v0, 0x7f0a02cc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -376,7 +376,7 @@
     goto :goto_1
 
     :pswitch_0
-    const v2, 0x7f120e98
+    const v2, 0x7f120f1c
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
 
@@ -386,14 +386,14 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120dd0
+    const v4, 0x7f120e05
 
-    const v5, 0x7f120dd1
+    const v5, 0x7f120e06
 
     goto :goto_1
 
     :pswitch_1
-    const v2, 0x7f120e99
+    const v2, 0x7f120f1d
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
 
@@ -403,16 +403,16 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120dd3
+    const v4, 0x7f120e08
 
-    const v5, 0x7f120dd4
+    const v5, 0x7f120e09
 
     :goto_1
     invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetCancelPremiumDialog;->getHeaderTv()Landroid/widget/TextView;
 
     move-result-object v6
 
-    const v7, 0x7f120dd7
+    const v7, 0x7f120e0c
 
     const/4 v8, 0x1
 
@@ -810,7 +810,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d00c5
+    const v0, 0x7f0d00cb
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
index ca0610c6d6..b0967784ca 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$1;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
index c83336cbd5..71668a4a4f 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
index 90066f4ca6..665b4c939a 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$3;->invoke(Lcom/discord/models/domain/ModelGift;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
index d550735f7d..5d0008e0d8 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$configureUI$4;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
index 547b4bb3e8..6731c837e9 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$2;->invoke(Landroid/widget/TextView;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
index 111f3f1a65..737741c53b 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$7.smali
@@ -66,7 +66,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
index 6b6adf4bdd..2e2668634c 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$8.smali
@@ -66,7 +66,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 3ad2d7ebb6..3513fc8582 100644
--- 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
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
index 34d6ff6b3b..2f4106cbd3 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBoundOrOnResume$2;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,13 +75,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/dialogs/e;->xF:Lcom/discord/dialogs/e$a;
+    sget-object v0, Lcom/discord/dialogs/f;->xH:Lcom/discord/dialogs/f$a;
 
     const-string v0, "Settings - Gifting"
 
     const-wide/16 v1, 0x0
 
-    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/e$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/f$a;->a(Ljava/lang/String;Ljava/lang/String;J)V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
index 726db7146e..c1106397a9 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
@@ -347,7 +347,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a06b6
+    const v0, 0x7f0a06cb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -355,7 +355,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ac
+    const v0, 0x7f0a06c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -363,7 +363,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b7
+    const v0, 0x7f0a06cc
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -371,7 +371,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->recyclerView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ad
+    const v0, 0x7f0a06c2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -379,7 +379,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInput$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06af
+    const v0, 0x7f0a06c4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -387,7 +387,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06ae
+    const v0, 0x7f0a06c3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -395,7 +395,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->codeInputProgress$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b5
+    const v0, 0x7f0a06ca
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -403,7 +403,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b4
+    const v0, 0x7f0a06c9
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -411,7 +411,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b3
+    const v0, 0x7f0a06c8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -419,7 +419,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->nitroLearnMore$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b2
+    const v0, 0x7f0a06c7
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -427,7 +427,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicYearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b1
+    const v0, 0x7f0a06c6
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -435,7 +435,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->buyNitroClassicMonthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a06b0
+    const v0, 0x7f0a06c5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1359,7 +1359,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01a8
+    const v0, 0x7f0d01ae
 
     return v0
 .end method
@@ -1464,7 +1464,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f06011b
+    const v4, 0x7f06011c
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
@@ -1502,7 +1502,7 @@
 
     aput-object v4, v2, v0
 
-    const v4, 0x7f120302
+    const v4, 0x7f120307
 
     invoke-virtual {p0, v4, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1546,7 +1546,7 @@
 
     aput-object v5, v2, v0
 
-    const v5, 0x7f120300
+    const v5, 0x7f120305
 
     invoke-virtual {p0, v5, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1664,7 +1664,7 @@
 
     invoke-static {v2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f120e75
+    const v3, 0x7f120eed
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
 
@@ -1710,7 +1710,7 @@
 
     invoke-static {v2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f120df7
+    const v4, 0x7f120e2e
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/premium/WidgetSettingsGifting;->getString(I)Ljava/lang/String;
 
@@ -1819,7 +1819,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
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
index 1ad7ef2719..c74020b9e8 100644
--- 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
@@ -60,7 +60,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
index d237178e8a..bee16ee0ff 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
@@ -265,11 +265,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0084
+    const v0, 0x7f0d0089
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a0318
+    const p1, 0x7f0a031c
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -277,7 +277,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0315
+    const p1, 0x7f0a0319
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -285,7 +285,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0313
+    const p1, 0x7f0a0317
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -293,7 +293,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->code$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;
 
@@ -301,7 +301,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->codeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0316
+    const p1, 0x7f0a031a
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -309,7 +309,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->copy$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a031a
+    const p1, 0x7f0a031e
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -317,7 +317,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->revokeText$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0319
+    const p1, 0x7f0a031d
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -325,7 +325,7 @@
 
     iput-object p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem;->generate$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a0317
+    const p1, 0x7f0a031b
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -631,12 +631,12 @@
 
     if-eqz v2, :cond_2
 
-    const v7, 0x7f08009b
+    const v7, 0x7f08009c
 
     goto :goto_0
 
     :cond_2
-    const v7, 0x7f08009a
+    const v7, 0x7f08009b
 
     :goto_0
     invoke-virtual {v6, v7}, Landroid/widget/TextView;->setBackgroundResource(I)V
@@ -655,12 +655,12 @@
 
     if-eqz v2, :cond_3
 
-    const v8, 0x7f12045a
+    const v8, 0x7f12047f
 
     goto :goto_1
 
     :cond_3
-    const v8, 0x7f12045c
+    const v8, 0x7f120481
 
     :goto_1
     invoke-virtual {v7, v8}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -692,7 +692,7 @@
     :cond_4
     invoke-static {v5, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v2, 0x7f0402ba
+    const v2, 0x7f0402bb
 
     invoke-static {v5, v2, v3, v13, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -747,7 +747,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f1207cb
+    const v7, 0x7f1207ef
 
     new-array v8, v11, [Ljava/lang/Object;
 
@@ -903,7 +903,7 @@
 
     invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v4, 0x7f0402b7
+    const v4, 0x7f0402b8
 
     invoke-static {v2, v4, v3, v13, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
 
@@ -926,7 +926,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0402b5
+    const v3, 0x7f0402b6
 
     invoke-static {v2, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
index 65837bf6e5..eb9a1abc28 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$NoGiftsListItem.smali
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0091
+    const v0, 0x7f0d0097
 
     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.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
index 84481ebf8e..7af610031e 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem.smali
@@ -149,11 +149,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d0085
+    const v0, 0x7f0d008a
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a031d
+    const p1, 0x7f0a0321
 
     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/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a031e
+    const p1, 0x7f0a0322
 
     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/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->name$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a031c
+    const p1, 0x7f0a0320
 
     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/settings/premium/WidgetSettingsGiftingAdapter$SkuListItem;->copies$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p1, 0x7f0a031b
+    const p1, 0x7f0a031f
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -348,7 +348,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f100058
+    const v1, 0x7f100059
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$GiftItem;->getCopies()Ljava/lang/Integer;
 
@@ -392,12 +392,12 @@
 
     if-eqz v0, :cond_1
 
-    const v0, 0x7f080233
+    const v0, 0x7f08023e
 
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f080236
+    const v0, 0x7f080242
 
     :goto_0
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
index b9c837b31e..ba4ced7406 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickCopyListener$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
index e3e0d8617d..9f19a0e885 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onClickSkuListener$1;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
index b2a76a8c18..7d7d11547e 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1.smali
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, v0, v1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onGenerateClickListener$1;->invoke(JLjava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
index a520368327..b17b06bbc5 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$onRevokeClickListener$1;->invoke(Lcom/discord/models/domain/ModelGift;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
index 5feb443a40..3eb47684fe 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
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
index 7653a964ae..a41c837bda 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$2.smali
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
index fe0810ad93..4b09e86aeb 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$onGiftCodeResolved$1;->invoke(Ljava/lang/String;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
index 4695aa4aa3..c5b9a39d08 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
index 4fd18f65e9..47dacac4f5 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel$redeemGiftCode$2;->invoke(Lcom/discord/stores/StoreGifting$GiftState;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
index a3c795eb26..9ca6bd6c19 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingViewModel.smali
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v1
 
@@ -89,7 +89,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -1016,7 +1016,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/android/b/a;->IZ()Lrx/Scheduler;
+    invoke-static {}, Lrx/android/b/a;->Jc()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
index 668af2c335..a41df7f565 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$Companion.smali
@@ -142,7 +142,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
index ee9814f742..22620aba00 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;->invoke(Lcom/discord/views/ActiveSubscriptionView$DropdownItem;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 2e5ec2e95a..207e7b370a 100644
--- 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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
index 79bbf43cfa..690d31f490 100644
--- 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$bottomButtonConfig$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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
index 6657bdc0ee..cddddf0786 100644
--- 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .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
index b094a9b3c9..f42e6257b4 100644
--- 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
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$topButtonConfig$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
index d98156bf15..7a8d1bb60f 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
@@ -66,7 +66,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const v0, 0x7f120e69
+    const v0, 0x7f120ee1
 
     return v0
 
@@ -78,7 +78,7 @@
     throw v0
 
     :cond_1
-    const v0, 0x7f120e68
+    const v0, 0x7f120ee0
 
     return v0
 .end method
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
index 403f676601..ce8a087f7d 100644
--- 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
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali
index 225eb85904..493b778e9a 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$onResume$2.smali
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index b96ef6a3f3..3adda8f3bc 100644
--- 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;->invoke(Landroid/view/View;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index c34efca006..ff5e25066e 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -556,7 +556,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a051e
+    const v0, 0x7f0a0529
 
     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/settings/premium/WidgetSettingsPremium;->uploadPerks$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052c
+    const v0, 0x7f0a0537
 
     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/settings/premium/WidgetSettingsPremium;->buyTier2Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052b
+    const v0, 0x7f0a0536
 
     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/settings/premium/WidgetSettingsPremium;->buyTier2Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052a
+    const v0, 0x7f0a0535
 
     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/settings/premium/WidgetSettingsPremium;->buyTier2Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0529
+    const v0, 0x7f0a0534
 
     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/settings/premium/WidgetSettingsPremium;->buyTier1Yearly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0528
+    const v0, 0x7f0a0533
 
     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/settings/premium/WidgetSettingsPremium;->buyTier1Monthly$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0527
+    const v0, 0x7f0a0532
 
     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/settings/premium/WidgetSettingsPremium;->buyTier1Gift$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052f
+    const v0, 0x7f0a053a
 
     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/settings/premium/WidgetSettingsPremium;->buyTier1Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0530
+    const v0, 0x7f0a053b
 
     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/settings/premium/WidgetSettingsPremium;->buyTier2Container$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0531
+    const v0, 0x7f0a053c
 
     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/settings/premium/WidgetSettingsPremium;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a051f
+    const v0, 0x7f0a052a
 
     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/settings/premium/WidgetSettingsPremium;->activeSubscriptionView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052d
+    const v0, 0x7f0a0538
 
     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/settings/premium/WidgetSettingsPremium;->retryButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0522
+    const v0, 0x7f0a052d
 
     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/settings/premium/WidgetSettingsPremium;->legalese$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0521
+    const v0, 0x7f0a052c
 
     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/settings/premium/WidgetSettingsPremium;->grandfathered$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a052e
+    const v0, 0x7f0a0539
 
     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/settings/premium/WidgetSettingsPremium;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0520
+    const v0, 0x7f0a052b
 
     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/settings/premium/WidgetSettingsPremium;->creditContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0249
+    const v0, 0x7f0a024c
 
     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/settings/premium/WidgetSettingsPremium;->creditNitro$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a024a
+    const v0, 0x7f0a024d
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -700,7 +700,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->creditNitroClassic$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a024b
+    const v0, 0x7f0a024e
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -963,7 +963,7 @@
 .end method
 
 .method private final configureActiveSubscriptionView(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;)V
-    .locals 17
+    .locals 18
 
     move-object/from16 v0, p0
 
@@ -975,22 +975,24 @@
 
     move-result-object v2
 
-    if-nez v1, :cond_0
+    if-eqz v1, :cond_9
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    move-result-object v1
+    move-result-object v3
 
-    const/16 v2, 0x8
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->isNitroSubscription()Z
 
-    invoke-virtual {v1, v2}, Lcom/discord/views/ActiveSubscriptionView;->setVisibility(I)V
+    move-result v3
 
-    return-void
+    if-nez v3, :cond_0
+
+    goto/16 :goto_3
 
     :cond_0
     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
+    move-result-object v16
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
 
@@ -1010,7 +1012,7 @@
 
     new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v3, 0x7f12037b
+    const v3, 0x7f1203a0
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1097,7 +1099,7 @@
 
     new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v3, 0x7f120f51
+    const v3, 0x7f120fd8
 
     invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1140,7 +1142,7 @@
 
     new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v5, 0x7f1202ec
+    const v5, 0x7f1202f1
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1159,7 +1161,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-interface {v15}, Ljava/util/List;->isEmpty()Z
+    invoke-interface/range {v16 .. v16}, Ljava/util/List;->isEmpty()Z
 
     move-result v3
 
@@ -1167,7 +1169,7 @@
 
     new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
 
-    const v5, 0x7f1202bb
+    const v5, 0x7f1202bc
 
     invoke-virtual {v0, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1221,61 +1223,61 @@
 
     invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscription;->isAppleSubscription()Z
 
-    move-result v1
+    move-result v9
 
     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
+    move-result-object v1
 
-    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/premium/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
+    invoke-direct {v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getSubscriptionErrorText(Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$SubscriptionError;)Ljava/lang/CharSequence;
 
     move-result-object v10
 
-    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getText()Ljava/lang/CharSequence;
 
     move-result-object v11
 
+    invoke-virtual {v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
+
+    move-result-object v12
+
     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/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
-
     move-result-object v14
 
+    invoke-virtual {v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;->getOnClick()Lkotlin/jvm/functions/Function0;
+
+    move-result-object v15
+
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->isBusy()Z
 
-    move-result v12
+    move-result v13
 
-    new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
+    new-instance v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;
 
-    move-object v3, v0
+    move-object v2, v0
 
-    check-cast v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
+    check-cast v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;
 
-    invoke-direct {v2, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
+    invoke-direct {v1, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$configureActiveSubscriptionView$1;-><init>(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
 
-    move-object/from16 v16, v2
+    move-object/from16 v17, v1
 
-    check-cast v16, Lkotlin/jvm/functions/Function1;
+    check-cast v17, Lkotlin/jvm/functions/Function1;
 
-    move-object v3, v4
+    invoke-static/range {v4 .. v17}, Lcom/discord/views/ActiveSubscriptionView;->a(Lcom/discord/views/ActiveSubscriptionView;ILcom/discord/views/ActiveSubscriptionView$HeaderImage;ILjava/lang/CharSequence;ZLjava/lang/CharSequence;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;ZLjava/lang/CharSequence;Lkotlin/jvm/functions/Function0;Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
 
-    move v4, v5
+    return-void
 
-    move-object v5, v6
+    :cond_9
+    :goto_3
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActiveSubscriptionView()Lcom/discord/views/ActiveSubscriptionView;
 
-    move v6, v7
+    move-result-object v1
 
-    move-object v7, v8
+    const/16 v2, 0x8
 
-    move v8, v1
-
-    invoke-static/range {v3 .. v16}, Lcom/discord/views/ActiveSubscriptionView;->a(Lcom/discord/views/ActiveSubscriptionView;ILcom/discord/views/ActiveSubscriptionView$HeaderImage;ILjava/lang/CharSequence;ZLjava/lang/CharSequence;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function0;ZLjava/lang/CharSequence;Lkotlin/jvm/functions/Function0;Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+    invoke-virtual {v1, v2}, Lcom/discord/views/ActiveSubscriptionView;->setVisibility(I)V
 
     return-void
 .end method
@@ -1811,7 +1813,7 @@
     goto :goto_2
 
     :cond_2
-    const p1, 0x7f120e13
+    const p1, 0x7f120e4a
 
     new-array v4, v3, [Ljava/lang/Object;
 
@@ -1840,7 +1842,7 @@
     goto :goto_2
 
     :cond_3
-    const p1, 0x7f120e0e
+    const p1, 0x7f120e45
 
     new-array v4, v3, [Ljava/lang/Object;
 
@@ -1908,17 +1910,19 @@
 .method private final configureLegalese(Lcom/discord/models/domain/ModelSubscription;)V
     .locals 13
 
-    if-nez p1, :cond_0
+    if-eqz p1, :cond_3
 
-    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    move-result-object p1
+    move-result-object v0
 
-    const/16 v0, 0x8
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->isNitroSubscription()Z
 
-    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setVisibility(I)V
+    move-result v0
 
-    return-void
+    if-nez v0, :cond_0
+
+    goto/16 :goto_2
 
     :cond_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -1945,7 +1949,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const v0, 0x7f1202f7
+    const v0, 0x7f1202fc
 
     goto :goto_0
 
@@ -1957,7 +1961,7 @@
     throw p1
 
     :cond_2
-    const v0, 0x7f1202f8
+    const v0, 0x7f1202fd
 
     :goto_0
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -1979,7 +1983,7 @@
     goto :goto_1
 
     :pswitch_0
-    const v3, 0x7f120e99
+    const v3, 0x7f120f1d
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -1988,7 +1992,7 @@
     goto :goto_1
 
     :pswitch_1
-    const v3, 0x7f120e98
+    const v3, 0x7f120f1c
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -2043,7 +2047,7 @@
 
     aput-object v3, v5, v6
 
-    const v3, 0x7f121193
+    const v3, 0x7f12121b
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -2091,6 +2095,18 @@
 
     return-void
 
+    :cond_3
+    :goto_2
+    invoke-direct {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getLegalese()Landroid/widget/TextView;
+
+    move-result-object p1
+
+    const/16 v0, 0x8
+
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setVisibility(I)V
+
+    return-void
+
     nop
 
     :pswitch_data_0
@@ -2558,7 +2574,7 @@
 
     if-nez v1, :cond_2
 
-    sget-object v1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sget-object v1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     invoke-virtual {v2, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -2647,7 +2663,7 @@
     :cond_4
     if-eqz v0, :cond_5
 
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BT:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     invoke-virtual {v2, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -2688,7 +2704,7 @@
 
     if-ne v0, v1, :cond_0
 
-    const p1, 0x7f08008f
+    const p1, 0x7f080090
 
     return p1
 
@@ -2697,7 +2713,7 @@
 
     if-ne v0, v1, :cond_1
 
-    const p1, 0x7f080091
+    const p1, 0x7f080092
 
     return p1
 
@@ -2741,12 +2757,12 @@
     throw v0
 
     :pswitch_0
-    const p1, 0x7f08008e
+    const p1, 0x7f08008f
 
     return p1
 
     :pswitch_1
-    const p1, 0x7f080090
+    const p1, 0x7f080091
 
     return p1
 
@@ -2820,18 +2836,18 @@
     throw v0
 
     :pswitch_0
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BV:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
     :pswitch_1
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BW:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
     :cond_1
     :goto_0
-    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BX:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
+    sget-object p1, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->BY:Lcom/discord/views/ActiveSubscriptionView$HeaderImage;
 
     return-object p1
 
@@ -2879,12 +2895,12 @@
 
     if-eq p1, v0, :cond_0
 
-    const p1, 0x7f080435
+    const p1, 0x7f080443
 
     return p1
 
     :cond_0
-    const p1, 0x7f080432
+    const p1, 0x7f080440
 
     return p1
 .end method
@@ -2942,7 +2958,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f120e6f
+    const v2, 0x7f120ee7
 
     new-array v3, v6, [Ljava/lang/Object;
 
@@ -3056,7 +3072,7 @@
 
     :cond_2
     :goto_0
-    const v1, 0x7f120dd9
+    const v1, 0x7f120e0e
 
     new-array v2, v6, [Ljava/lang/Object;
 
@@ -3110,7 +3126,7 @@
 
     if-ne v1, v2, :cond_0
 
-    const p3, 0x7f120307
+    const p3, 0x7f12030d
 
     goto :goto_0
 
@@ -3125,7 +3141,7 @@
 
     if-ne p3, v1, :cond_1
 
-    const p3, 0x7f12030c
+    const p3, 0x7f120313
 
     goto :goto_0
 
@@ -3138,7 +3154,7 @@
 
     if-ne p3, v1, :cond_2
 
-    const p3, 0x7f120306
+    const p3, 0x7f12030b
 
     goto :goto_0
 
@@ -3151,7 +3167,7 @@
 
     if-ne p3, v1, :cond_3
 
-    const p3, 0x7f12030b
+    const p3, 0x7f120311
 
     goto :goto_0
 
@@ -3263,13 +3279,13 @@
 
     if-ne p1, v0, :cond_1
 
-    const p1, 0x7f1205ea
+    const p1, 0x7f12060e
 
     new-array v0, v0, [Ljava/lang/Object;
 
     const/4 v1, 0x0
 
-    sget-object v2, Lcom/discord/app/e;->uZ:Ljava/lang/String;
+    sget-object v2, Lcom/discord/app/e;->uY:Ljava/lang/String;
 
     aput-object v2, v0, v1
 
@@ -3400,7 +3416,7 @@
     return-void
 
     :cond_1
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BT:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$a;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3413,7 +3429,7 @@
     return-void
 
     :cond_2
-    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BU:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
+    sget-object v0, Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;->BV:Lcom/discord/views/ActiveSubscriptionView$DropdownItem$b;
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -3535,27 +3551,73 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object v0
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->isNitroSubscription()Z
 
     move-result v0
 
-    if-nez v0, :cond_1
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    move-result-object v0
+
+    goto :goto_0
+
+    :cond_0
+    move-object v0, v1
+
+    :goto_0
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelSubscription;->isNonePlan()Z
+
+    move-result v2
+
+    invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v2
+
+    goto :goto_1
+
+    :cond_1
+    move-object v2, v1
+
+    :goto_1
+    sget-object v3, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    sget-object v2, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance v0, Ljava/lang/StringBuilder;
 
-    const-string v2, "Attempting to open WidgetSettingsPremium with non-Nitro subscription: "
+    const-string v1, "Attempting to open WidgetSettingsPremium with non-Premium and non-PremiumGuild subscription: "
 
-    invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
@@ -3569,30 +3631,30 @@
 
     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
-    move-result-object v2
-
-    const/4 v3, 0x0
+    move-result-object v3
 
     const/4 v4, 0x0
 
-    const/4 v5, 0x6
+    const/4 v5, 0x0
 
-    const/4 v6, 0x0
+    const/4 v6, 0x6
 
-    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
+    const/4 v7, 0x0
+
+    invoke-static/range {v2 .. v7}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
     move-result-object p1
 
-    if-eqz p1, :cond_0
+    if-eqz p1, :cond_2
 
     invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->finish()V
 
-    :cond_0
+    :cond_2
     return-void
 
-    :cond_1
+    :cond_3
     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/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
@@ -3619,9 +3681,9 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getPremiumSubscription()Lcom/discord/models/domain/ModelSubscription;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-direct {p0, v0, v1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->configureAccountCredit(Ljava/util/List;Lcom/discord/models/domain/ModelSubscription;)V
+    invoke-direct {p0, v0, v2}, 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;
 
@@ -3631,15 +3693,13 @@
 
     move-result-object v0
 
-    const/4 v1, -0x1
+    const/4 v2, -0x1
 
-    const-string v2, "intent_section"
+    const-string v3, "intent_section"
 
-    const/4 v3, 0x0
+    if-eqz v0, :cond_4
 
-    if-eqz v0, :cond_2
-
-    invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
+    invoke-virtual {v0, v3, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
 
     move-result v0
 
@@ -3647,36 +3707,36 @@
 
     move-result-object v0
 
-    goto :goto_0
+    goto :goto_2
 
-    :cond_2
-    move-object v0, v3
+    :cond_4
+    move-object v0, v1
 
-    :goto_0
-    if-nez v0, :cond_3
+    :goto_2
+    if-nez v0, :cond_5
 
-    goto :goto_1
+    goto :goto_3
 
-    :cond_3
+    :cond_5
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
     move-result v4
 
-    if-eq v4, v1, :cond_4
+    if-eq v4, v2, :cond_6
 
-    :goto_1
+    :goto_3
     const-wide/16 v4, 0x12c
 
     :try_start_0
-    sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    invoke-static {v4, v5, v1}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v4, v5, v2}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
     const-string v4, "Observable\n            .\u20260, TimeUnit.MILLISECONDS)"
 
-    invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     move-object v4, p0
 
@@ -3684,9 +3744,9 @@
 
     const/4 v5, 0x2
 
-    invoke-static {v1, v4, v3, v5, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v2, v4, v1, v5, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v2
 
     new-instance v4, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showContent$1;
 
@@ -3694,16 +3754,16 @@
 
     check-cast v4, Lrx/functions/Action1;
 
-    invoke-virtual {v1, v4}, Lrx/Observable;->b(Lrx/functions/Action1;)Lrx/Subscription;
+    invoke-virtual {v2, v4}, Lrx/Observable;->b(Lrx/functions/Action1;)Lrx/Subscription;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    goto :goto_2
+    goto :goto_4
 
     :catch_0
     move-exception v0
 
-    sget-object v4, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v4, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     move-object v6, v0
 
@@ -3719,19 +3779,19 @@
 
     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
+    :goto_4
     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
+    invoke-virtual {v0, v3}, Landroid/content/Intent;->removeExtra(Ljava/lang/String;)V
 
-    :cond_4
+    :cond_6
     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
+    if-eqz v0, :cond_7
 
     invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$ViewState$Loaded;->getDialog()Lcom/discord/widgets/settings/premium/SettingsPremiumViewModel$Dialog;
 
@@ -3741,10 +3801,10 @@
 
     return-void
 
-    :cond_5
+    :cond_7
     const/4 p1, 0x1
 
-    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
+    invoke-static {p0, v1, p1, v1}, 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
@@ -3834,7 +3894,7 @@
 
     invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;-><init>(Landroid/content/Context;)V
 
-    const v1, 0x7f120eae
+    const v1, 0x7f120f2d
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3846,7 +3906,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f120ead
+    const v1, 0x7f120f2c
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3858,7 +3918,7 @@
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    const v2, 0x7f120ce1
+    const v2, 0x7f120d13
 
     invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
 
@@ -3940,7 +4000,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b4
+    const v0, 0x7f0d01ba
 
     return v0
 .end method
@@ -4076,7 +4136,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -4195,11 +4255,11 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const p1, 0x7f1212c1
+    const p1, 0x7f12134d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const p1, 0x7f120e9c
+    const p1, 0x7f120f20
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -4217,7 +4277,7 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    const v3, 0x7f1205bf
+    const v3, 0x7f1205e4
 
     invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -4225,7 +4285,7 @@
 
     aput-object v3, p1, v0
 
-    const v0, 0x7f1205be
+    const v0, 0x7f1205e3
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -4235,7 +4295,7 @@
 
     aput-object v0, p1, v3
 
-    const v0, 0x7f1205bd
+    const v0, 0x7f1205e2
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
 
@@ -4245,7 +4305,7 @@
 
     aput-object v0, p1, v4
 
-    const v0, 0x7f120de9
+    const v0, 0x7f120e1f
 
     invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali
index f6bdf98a0b..9d8c08c909 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1.smali
@@ -91,13 +91,13 @@
 
     instance-of v0, p1, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_3
 
     move-object v0, p1
 
     check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
 
     move-result-object v0
 
@@ -105,13 +105,7 @@
 
     new-instance v1, Ljava/util/ArrayList;
 
-    const/16 v2, 0xa
-
-    invoke-static {v0, v2}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
-    move-result v2
-
-    invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
+    invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
     check-cast v1, Ljava/util/Collection;
 
@@ -119,18 +113,25 @@
 
     move-result-object v0
 
+    :cond_0
     :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
     move-result v2
 
-    if-eqz v2, :cond_0
+    if-eqz v2, :cond_2
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v2
 
-    check-cast v2, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    check-cast v2, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    move-result-object v2
+
+    if-eqz v2, :cond_1
 
     invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
 
@@ -140,11 +141,19 @@
 
     move-result-object v2
 
+    goto :goto_1
+
+    :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    if-eqz v2, :cond_0
+
     invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
-    :cond_0
+    :cond_2
     check-cast v1, Ljava/util/List;
 
     check-cast v1, Ljava/lang/Iterable;
@@ -175,7 +184,7 @@
 
     return-object p1
 
-    :cond_1
+    :cond_3
     invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map;
 
     move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali
index 8b46a6c349..5d12bba9fe 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2.smali
@@ -3,7 +3,7 @@
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
 # interfaces
-.implements Lrx/functions/Func2;
+.implements Lrx/functions/Func3;
 
 
 # annotations
@@ -22,12 +22,14 @@
         "Ljava/lang/Object;",
         "T2:",
         "Ljava/lang/Object;",
+        "T3:",
+        "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func2<",
-        "TT1;TT2;TR;>;"
+        "Lrx/functions/Func3<",
+        "TT1;TT2;TT3;TR;>;"
     }
 .end annotation
 
@@ -59,7 +61,7 @@
 
 
 # virtual methods
-.method public final call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+.method public final call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -74,6 +76,7 @@
             "Lcom/discord/models/domain/ModelGuild;",
             ">;>;",
             "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;",
+            "Lcom/discord/models/domain/ModelExperiment;",
             ")",
             "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;"
         }
@@ -93,65 +96,85 @@
 
     instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loading;
 
-    if-nez v1, :cond_a
+    if-nez v1, :cond_b
 
     instance-of v1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loading;
 
     if-eqz v1, :cond_0
 
-    goto/16 :goto_4
+    goto/16 :goto_5
 
     :cond_0
     instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Failure;
 
-    if-nez v1, :cond_9
+    if-nez v1, :cond_a
 
     instance-of v1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Failure;
 
     if-eqz v1, :cond_1
 
-    goto/16 :goto_3
+    goto/16 :goto_4
 
     :cond_1
     instance-of v1, v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    if-eqz v1, :cond_8
+    if-eqz v1, :cond_9
 
     instance-of v1, p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
-    if-eqz v1, :cond_8
-
-    sget-object v1, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
-
-    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 v2
-
-    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/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
-
-    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
+    if-eqz v1, :cond_9
 
     check-cast v0, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;
 
-    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;
+    invoke-virtual {v0}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v1
+
+    const/4 v2, 0x1
+
+    xor-int/2addr v1, v2
+
+    const/4 v3, 0x0
+
+    if-eqz v1, :cond_3
+
+    new-instance p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;
+
+    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
+
+    if-eqz p3, :cond_2
+
+    invoke-virtual {p3}, Lcom/discord/models/domain/ModelExperiment;->getBucket()I
+
+    move-result p3
+
+    if-ne p3, v2, :cond_2
+
+    goto :goto_0
+
+    :cond_2
+    const/4 v2, 0x0
+
+    :goto_0
+    invoke-static {v1, v0, p1, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->access$createBoostItems(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;Z)Ljava/util/List;
 
     move-result-object p1
 
-    invoke-direct {v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;-><init>(Ljava/util/List;)V
+    invoke-direct {p2, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Loaded;-><init>(Ljava/util/List;)V
 
-    check-cast v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
+    check-cast p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
-    return-object v1
+    return-object p2
+
+    :cond_3
+    check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;
 
-    :cond_2
     invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->getSubscriptions()Ljava/util/List;
 
     move-result-object p1
@@ -160,11 +183,7 @@
 
     instance-of p2, p1, Ljava/util/Collection;
 
-    const/4 v0, 0x1
-
-    const/4 v1, 0x0
-
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_4
 
     move-object p2, p1
 
@@ -174,19 +193,19 @@
 
     move-result p2
 
-    if-nez p2, :cond_7
+    if-nez p2, :cond_8
 
-    :cond_3
+    :cond_4
     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
     move-result-object p1
 
-    :cond_4
+    :cond_5
     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
 
     move-result p2
 
-    if-eqz p2, :cond_7
+    if-eqz p2, :cond_8
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -196,57 +215,49 @@
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    move-result-object v2
+    move-result-object p3
 
-    sget-object v3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object v0, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_MONTH_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    if-eq v2, v3, :cond_6
+    if-eq p3, v0, :cond_7
 
     invoke-virtual {p2}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
     move-result-object p2
 
-    sget-object v2, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
+    sget-object p3, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->PREMIUM_YEAR_TIER_1:Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
 
-    if-ne p2, v2, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    const/4 p2, 0x0
+    if-ne p2, p3, :cond_6
 
     goto :goto_1
 
     :cond_6
-    :goto_0
-    const/4 p2, 0x1
-
-    :goto_1
-    if-eqz p2, :cond_4
+    const/4 p2, 0x0
 
     goto :goto_2
 
     :cond_7
-    const/4 v0, 0x0
+    :goto_1
+    const/4 p2, 0x1
 
     :goto_2
-    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
+    if-eqz p2, :cond_5
 
-    invoke-direct {p1, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;-><init>(Z)V
-
-    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
-
-    return-object p1
+    goto :goto_3
 
     :cond_8
-    sget-object p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Failure;
+    const/4 v2, 0x0
+
+    :goto_3
+    new-instance p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;
+
+    invoke-direct {p1, v2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;-><init>(Z)V
 
     check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     return-object p1
 
     :cond_9
-    :goto_3
     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/premium/WidgetSettingsPremiumGuildSubscription$Model;
@@ -255,6 +266,14 @@
 
     :cond_a
     :goto_4
+    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/premium/WidgetSettingsPremiumGuildSubscription$Model;
+
+    return-object p1
+
+    :cond_b
+    :goto_5
     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/premium/WidgetSettingsPremiumGuildSubscription$Model;
@@ -262,14 +281,16 @@
     return-object p1
 .end method
 
-.method public final bridge synthetic call(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;
     .locals 0
 
     check-cast p1, Lkotlin/Pair;
 
     check-cast p2, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;
 
-    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;
+    check-cast p3, Lcom/discord/models/domain/ModelExperiment;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->call(Lkotlin/Pair;Lcom/discord/stores/StoreSubscriptions$SubscriptionsState;Lcom/discord/models/domain/ModelExperiment;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
index 702fa176fb..8cbff4d730 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion.smali
@@ -31,183 +31,380 @@
     return-void
 .end method
 
-.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;
+.method public static final synthetic access$createBoostItems(Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;Z)Ljava/util/List;
     .locals 0
 
-    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;
+    invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;->createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;Z)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;)Ljava/util/List;
-    .locals 5
+.method private final createBoostItems(Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;Ljava/util/Map;Z)Ljava/util/List;
+    .locals 14
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
             "Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;",
-            "Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
             "+",
             "Lcom/discord/models/domain/ModelGuild;",
-            ">;)",
+            ">;Z)",
             "Ljava/util/List<",
             "Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;",
             ">;"
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getCooldown()Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;
+    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptionSlots()Ljava/util/List;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/discord/stores/StoreSubscriptions$SubscriptionsState$Loaded;->getSubscriptions()Ljava/util/List;
-
-    move-result-object p2
-
-    invoke-virtual {p1}, Lcom/discord/stores/StorePremiumGuildSubscription$State$Loaded;->getPremiumGuildSubscriptions()Ljava/util/List;
-
-    move-result-object p1
-
     new-instance v1, Ljava/util/ArrayList;
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object v2, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->INSTANCE:Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;
+    check-cast v0, Ljava/lang/Iterable;
 
-    invoke-virtual {v2, p2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculateTotalBoostCount(Ljava/util/List;)I
+    new-instance v2, Ljava/util/ArrayList;
 
-    move-result p2
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getRemaining()I
-
-    move-result p2
-
-    goto :goto_0
-
-    :cond_0
-    move-object v2, p1
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
     check-cast v2, Ljava/util/Collection;
 
-    invoke-interface {v2}, Ljava/util/Collection;->size()I
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    move-result v2
-
-    sub-int/2addr p2, v2
+    move-result-object v3
 
+    :cond_0
     :goto_0
-    if-nez v0, :cond_1
+    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
 
-    if-lez p2, :cond_3
+    move-result v4
+
+    const/4 v5, 0x0
+
+    const/4 v6, 0x1
+
+    if-eqz v4, :cond_2
+
+    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v4
+
+    move-object v7, v4
+
+    check-cast v7, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v7}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    move-result-object v7
+
+    if-nez v7, :cond_1
+
+    const/4 v5, 0x1
 
     :cond_1
-    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+    if-eqz v5, :cond_0
 
-    if-eqz v0, :cond_2
+    invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionCooldown;->getExpiresAtTimestamp()J
+    goto :goto_0
+
+    :cond_2
+    check-cast v2, Ljava/util/List;
+
+    invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v3
 
-    invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-object v7, v2
 
-    move-result-object v0
+    check-cast v7, Ljava/lang/Iterable;
 
-    goto :goto_1
+    new-instance v8, Ljava/util/ArrayList;
 
-    :cond_2
-    const/4 v0, 0x0
+    invoke-direct {v8}, Ljava/util/ArrayList;-><init>()V
 
-    :goto_1
-    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;
+    check-cast v8, Ljava/util/Collection;
 
-    move-result-object v0
+    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    move-result-object v9
 
     :cond_3
-    if-lez p2, :cond_4
+    :goto_1
+    invoke-interface {v9}, Ljava/util/Iterator;->hasNext()Z
 
-    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+    move-result v10
 
-    const/4 v0, 0x1
+    if-eqz v10, :cond_5
 
-    invoke-virtual {p2, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    invoke-interface {v9}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object p2
+    move-result-object v10
 
-    invoke-virtual {v1, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    move-object v11, v10
+
+    check-cast v11, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v11}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
+
+    move-result-wide v11
+
+    cmp-long v13, v11, v3
+
+    if-gtz v13, :cond_4
+
+    const/4 v11, 0x1
 
     goto :goto_2
 
     :cond_4
-    invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
+    const/4 v11, 0x0
 
-    move-result p2
+    :goto_2
+    if-eqz v11, :cond_3
 
-    if-eqz p2, :cond_5
+    invoke-interface {v8, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    sget-object p2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
-
-    const/4 v0, 0x0
-
-    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
-
-    invoke-virtual {v1, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    goto :goto_1
 
     :cond_5
-    :goto_2
-    check-cast p1, Ljava/lang/Iterable;
+    check-cast v8, Ljava/util/List;
 
-    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    check-cast v2, Ljava/util/Collection;
 
-    move-result-object p1
+    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v6
+
+    const/16 v4, 0xa
+
+    if-eqz v3, :cond_9
+
+    invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_7
+
+    new-instance v3, Ljava/util/ArrayList;
+
+    invoke-static {v7, v4}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v9
+
+    invoke-direct {v3, v9}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v3, Ljava/util/Collection;
+
+    invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v7
 
     :goto_3
-    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+    invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result p2
+    move-result v9
 
-    if-eqz p2, :cond_6
+    if-eqz v9, :cond_6
 
-    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object p2
+    move-result-object v9
 
-    check-cast p2, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+    check-cast v9, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
 
-    sget-object v0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getCooldownExpiresAtTimestamp()J
 
-    invoke-virtual {p2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
+    move-result-wide v9
 
-    move-result-wide v2
+    invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    move-result-object v9
 
-    move-result-object v2
-
-    invoke-interface {p3, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/models/domain/ModelGuild;
-
-    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
-
-    invoke-virtual {v1, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    invoke-interface {v3, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_3
 
     :cond_6
+    check-cast v3, Ljava/util/List;
+
+    check-cast v3, Ljava/lang/Iterable;
+
+    invoke-static {v3}, Lkotlin/a/m;->min(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/Long;
+
+    goto :goto_4
+
+    :cond_7
+    const/4 v3, 0x0
+
+    :goto_4
+    sget-object v7, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
+
+    move-result v9
+
+    if-eqz v9, :cond_8
+
+    const/4 v9, 0x0
+
+    goto :goto_5
+
+    :cond_8
+    invoke-interface {v2}, Ljava/util/Collection;->size()I
+
+    move-result v9
+
+    :goto_5
+    invoke-virtual {v7, v3, v9}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_9
+    check-cast v8, Ljava/util/Collection;
+
+    invoke-interface {v8}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v3
+
+    xor-int/2addr v3, v6
+
+    if-eqz v3, :cond_a
+
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    invoke-virtual {v2, v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_6
+
+    :cond_a
+    invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+
+    move-result v2
+
+    xor-int/2addr v2, v6
+
+    if-eqz v2, :cond_b
+
+    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    invoke-virtual {v2, v5}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    :cond_b
+    :goto_6
+    new-instance v2, Ljava/util/ArrayList;
+
+    invoke-static {v0, v4}, Lkotlin/a/m;->collectionSizeOrDefault(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 {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_7
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_c
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v3
+
+    check-cast v3, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;
+
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelPremiumGuildSubscriptionSlot;->getPremiumGuildSubscription()Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_7
+
+    :cond_c
+    check-cast v2, Ljava/util/List;
+
+    check-cast v2, Ljava/lang/Iterable;
+
+    invoke-static {v2}, Lkotlin/a/m;->filterNotNull(Ljava/lang/Iterable;)Ljava/util/List;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Iterable;
+
+    invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_8
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_d
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelPremiumGuildSubscription;
+
+    sget-object v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->Companion:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelPremiumGuildSubscription;->getGuildId()J
+
+    move-result-wide v4
+
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v4
+
+    move-object/from16 v5, p2
+
+    invoke-interface {v5, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/models/domain/ModelGuild;
+
+    move/from16 v6, p3
+
+    invoke-virtual {v3, v2, v4, v6}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem$Companion;->createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+    goto :goto_8
+
+    :cond_d
     check-cast v1, Ljava/util/List;
 
     return-object v1
@@ -216,7 +413,7 @@
 
 # virtual methods
 .method public final get()Lrx/Observable;
-    .locals 3
+    .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -240,45 +437,59 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$1;
+    sget-object v2, 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;
+    check-cast v2, Lrx/functions/b;
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object v0
 
-    const-string v1, "StoreStream\n            \u2026      }\n                }"
+    const-string v2, "StoreStream\n            \u2026      }\n                }"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+    invoke-virtual {v0, v2}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
     move-result-object v0
 
-    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;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+    invoke-virtual {v3}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments;
+
+    move-result-object v3
+
+    const-string v4, "2019-10_android_premium_changes"
+
+    const/4 v5, 0x2
+
+    invoke-static {v3, v4, v1, v5, v1}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/discord/stores/StoreSubscriptions;->getSubscriptions()Lrx/Observable;
+    sget-object v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
 
-    move-result-object v1
+    check-cast v3, Lrx/functions/Func3;
 
-    sget-object v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion$get$2;
-
-    check-cast v2, Lrx/functions/Func2;
-
-    invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+    invoke-static {v0, v2, v1, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
 
     move-result-object v0
 
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$LoadedNoPremiumGuildSubscriptions.smali
similarity index 77%
rename from com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
rename to com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions.smali
index a2e8a7c923..e0351b4a95 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
+.class public final Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;
 .super Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model;
 .source "WidgetSettingsPremiumGuildSubscription.kt"
 
@@ -10,7 +10,7 @@
 
 .annotation system Ldalvik/annotation/InnerClass;
     accessFlags = 0x19
-    name = "LoadedNotPremiumTier2"
+    name = "LoadedNoPremiumGuildSubscriptions"
 .end annotation
 
 
@@ -26,7 +26,7 @@
 
     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
+    iput-boolean p1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;->isNitroClassic:Z
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 .method public final isNitroClassic()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic:Z
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;->isNitroClassic:Z
 
     return v0
 .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
index 7810ddb8e3..381537a06b 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model.smali
@@ -18,7 +18,7 @@
         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$LoadedNoPremiumGuildSubscriptions;,
         Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$Companion;
     }
 .end annotation
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali
index 51f97bbd70..8ef80a046f 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
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
index d2ad247d54..54e69379ab 100644
--- 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
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$configureUI$2;->invoke(JJ)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
index f2723bf5b7..c07c418fa9 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$onViewBound$1.smali
@@ -59,9 +59,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v0, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v0, Lcom/discord/app/e;->vj:J
+    sget-wide v0, Lcom/discord/app/e;->vi:J
 
     invoke-static {v0, v1}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
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
index bb36655694..2d20c95d5b 100644
--- 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
@@ -53,7 +53,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali
index 7f5d329a29..a60c4e35c8 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali
@@ -202,7 +202,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0698
+    const v0, 0x7f0a06ad
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -210,7 +210,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->subtext$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0697
+    const v0, 0x7f0a06ac
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -218,7 +218,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->retry$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0696
+    const v0, 0x7f0a06ab
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -226,7 +226,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0691
+    const v0, 0x7f0a06a6
 
     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/settings/premium/WidgetSettingsPremiumGuildSubscription;->flipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0692
+    const v0, 0x7f0a06a7
 
     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/settings/premium/WidgetSettingsPremiumGuildSubscription;->noNitroBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0693
+    const v0, 0x7f0a06a8
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -346,7 +346,7 @@
     return-void
 
     :cond_3
-    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
+    instance-of v0, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;
 
     if-eqz v0, :cond_5
 
@@ -358,27 +358,27 @@
 
     invoke-virtual {v0, v3}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
-    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;
+    check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNotPremiumTier2;->isNitroClassic()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription$Model$LoadedNoPremiumGuildSubscriptions;->isNitroClassic()Z
 
     move-result p1
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f120e27
+    const p1, 0x7f120e56
 
     goto :goto_0
 
     :cond_4
-    const p1, 0x7f120e26
+    const p1, 0x7f120e55
 
     :goto_0
     new-array v0, v2, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v2, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v2, Lcom/discord/app/e;->vj:J
+    sget-wide v2, Lcom/discord/app/e;->vi:J
 
     invoke-static {v2, v3}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -575,13 +575,13 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d019f
+    const v0, 0x7f0d01a5
 
     return v0
 .end method
 
 .method public final onActivityResult(IILandroid/content/Intent;)V
-    .locals 2
+    .locals 7
 
     invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppFragment;->onActivityResult(IILandroid/content/Intent;)V
 
@@ -617,19 +617,25 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move-result-wide p1
+    move-result-wide v2
 
-    sget-object p3, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
+    sget-object v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation;->Companion:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->requireContext()Landroid/content/Context;
 
-    move-result-object v0
+    move-result-object v1
 
-    const-string v1, "requireContext()"
+    const-string p1, "requireContext()"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p3, v0, p1, p2}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create(Landroid/content/Context;J)V
+    const/4 v4, 0x0
+
+    const/4 v5, 0x4
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;->create$default(Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation$Companion;Landroid/content/Context;JLjava/lang/Long;ILjava/lang/Object;)V
 
     goto :goto_1
 
@@ -664,11 +670,11 @@
 
     invoke-static {p0, v1, v0, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f1212c1
+    const v0, 0x7f12134d
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarSubtitle(I)Lkotlin/Unit;
 
-    const v0, 0x7f120e5b
+    const v0, 0x7f120eca
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -708,9 +714,9 @@
 
     new-array p1, p1, [Ljava/lang/Object;
 
-    sget-object v3, Lcom/discord/app/e;->vk:Lcom/discord/app/e;
+    sget-object v3, Lcom/discord/app/e;->vj:Lcom/discord/app/e;
 
-    sget-wide v3, Lcom/discord/app/e;->vj:J
+    sget-wide v3, Lcom/discord/app/e;->vi:J
 
     invoke-static {v3, v4}, Lcom/discord/app/e;->j(J)Ljava/lang/String;
 
@@ -718,7 +724,7 @@
 
     aput-object v3, p1, v1
 
-    const v1, 0x7f120e58
+    const v1, 0x7f120ec7
 
     invoke-virtual {p0, v1, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
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
index 24353a578f..2dd8dd8ce3 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$AvailablePremiumGuildSubscriptionListItem.smali
@@ -77,11 +77,11 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d00a4
+    const v0, 0x7f0d00aa
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
-    const p1, 0x7f0a00d0
+    const p1, 0x7f0a00d1
 
     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/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali
index ede867107d..63b8ab28e9 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildListItem.smali
@@ -269,7 +269,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d00a6
+    const v0, 0x7f0d00ac
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -724,7 +724,7 @@
 
     move-result-object v1
 
-    const v6, 0x7f100098
+    const v6, 0x7f10009f
 
     const/4 v7, 0x1
 
@@ -771,17 +771,17 @@
     goto :goto_1
 
     :cond_2
-    const v1, 0x7f08020a
+    const v1, 0x7f080215
 
     goto :goto_1
 
     :cond_3
-    const v1, 0x7f080209
+    const v1, 0x7f080214
 
     goto :goto_1
 
     :cond_4
-    const v1, 0x7f080208
+    const v1, 0x7f080213
 
     goto :goto_1
 
@@ -820,22 +820,22 @@
     goto :goto_2
 
     :cond_6
-    const v1, 0x7f120e5f
+    const v1, 0x7f120ed3
 
     goto :goto_2
 
     :cond_7
-    const v1, 0x7f120e5e
+    const v1, 0x7f120ed2
 
     goto :goto_2
 
     :cond_8
-    const v1, 0x7f120e5d
+    const v1, 0x7f120ed1
 
     goto :goto_2
 
     :cond_9
-    const v1, 0x7f120e29
+    const v1, 0x7f120e5c
 
     :goto_2
     invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -875,7 +875,11 @@
     move-result v4
 
     :cond_a
-    invoke-virtual {v0, v1, v4}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculatePercentToNextTier(II)I
+    invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getUseNewPremiumTierValues()Z
+
+    move-result v2
+
+    invoke-virtual {v0, v1, v4, v2}, Lcom/discord/utilities/premium/PremiumGuildSubscriptionUtils;->calculatePercentToNextTier(IIZ)I
 
     move-result v0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali
index 594d6d1045..afe69499fd 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionInfoListItem.smali
@@ -101,7 +101,7 @@
 
     check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
-    const v0, 0x7f0d00a5
+    const v0, 0x7f0d00ab
 
     invoke-direct {p0, v0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
 
@@ -211,7 +211,7 @@
 
     move-result-object p1
 
-    const v4, 0x7f0800c0
+    const v4, 0x7f0800c1
 
     invoke-virtual {p1, v4}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -221,7 +221,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f100097
+    const v0, 0x7f10009a
 
     invoke-virtual {p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->getBoostsRemaining()Ljava/lang/Integer;
 
@@ -253,7 +253,7 @@
 
     sget-object v0, Lcom/discord/utilities/textprocessing/Parsers;->INSTANCE:Lcom/discord/utilities/textprocessing/Parsers;
 
-    const v4, 0x7f120e4a
+    const v4, 0x7f120e92
 
     new-array v1, v1, [Ljava/lang/Object;
 
@@ -296,7 +296,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f0402bf
+    const v5, 0x7f0402c0
 
     const/4 v6, 0x0
 
@@ -364,7 +364,7 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120e14
+    const v0, 0x7f120e4b
 
     const/4 v5, 0x3
 
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
index 46d85e6432..248f321876 100644
--- 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
@@ -34,9 +34,9 @@
 
 # virtual methods
 .method public final createAvailableBoostItem(Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
-    .locals 10
+    .locals 11
 
-    new-instance v9, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    new-instance v10, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     const/4 v1, 0x0
 
@@ -46,25 +46,27 @@
 
     const/4 v4, 0x0
 
-    const/4 v6, 0x1
+    const/4 v6, 0x0
 
-    const/16 v7, 0xf
+    const/4 v7, 0x1
 
-    const/4 v8, 0x0
+    const/16 v8, 0xf
 
-    move-object v0, v9
+    const/4 v9, 0x0
+
+    move-object v0, v10
 
     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
+    invoke-direct/range {v0 .. 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;ZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v9
+    return-object v10
 .end method
 
 .method public final createBoostInfoItem(Ljava/lang/Long;I)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
-    .locals 10
+    .locals 11
 
-    new-instance v9, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    new-instance v10, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -78,21 +80,23 @@
 
     const/4 v6, 0x0
 
-    const/16 v7, 0x1c
+    const/4 v7, 0x0
 
-    const/4 v8, 0x0
+    const/16 v8, 0x1c
 
-    move-object v0, v9
+    const/4 v9, 0x0
+
+    move-object v0, v10
 
     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
+    invoke-direct/range {v0 .. 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;ZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    return-object v9
+    return-object v10
 .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
+.method public final createBoostedGuildItem(Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;Z)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 11
 
     const-string v0, "premiumGuildSubscription"
 
@@ -106,11 +110,11 @@
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x2
+    const/4 v8, 0x2
 
-    const/16 v8, 0x13
+    const/16 v9, 0x13
 
-    const/4 v9, 0x0
+    const/4 v10, 0x0
 
     move-object v1, v0
 
@@ -118,7 +122,9 @@
 
     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
+    move v7, p3
+
+    invoke-direct/range {v1 .. v10}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZIILkotlin/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
index 57c1bfb11f..dfaeb971b9 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem.smali
@@ -46,6 +46,8 @@
 
 .field private final typeInt:I
 
+.field private final useNewPremiumTierValues:Z
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -62,7 +64,7 @@
     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
+.method public constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZI)V
     .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
@@ -77,15 +79,17 @@
 
     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
+    iput-boolean p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues:Z
+
+    iput p7, 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
+.method public synthetic constructor <init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZIILkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 10
 
-    and-int/lit8 v0, p7, 0x1
+    and-int/lit8 v0, p8, 0x1
 
     const/4 v1, 0x0
 
@@ -99,7 +103,7 @@
     move-object v3, p1
 
     :goto_0
-    and-int/lit8 v0, p7, 0x2
+    and-int/lit8 v0, p8, 0x2
 
     if-eqz v0, :cond_1
 
@@ -111,7 +115,7 @@
     move-object v4, p2
 
     :goto_1
-    and-int/lit8 v0, p7, 0x4
+    and-int/lit8 v0, p8, 0x4
 
     if-eqz v0, :cond_2
 
@@ -123,7 +127,7 @@
     move-object v5, p3
 
     :goto_2
-    and-int/lit8 v0, p7, 0x8
+    and-int/lit8 v0, p8, 0x8
 
     if-eqz v0, :cond_3
 
@@ -135,7 +139,7 @@
     move-object v6, p4
 
     :goto_3
-    and-int/lit8 v0, p7, 0x10
+    and-int/lit8 v0, p8, 0x10
 
     if-eqz v0, :cond_4
 
@@ -151,33 +155,35 @@
     :goto_4
     move-object v2, p0
 
-    move v8, p6
+    move/from16 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
+    move/from16 v9, p7
+
+    invoke-direct/range {v2 .. 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;ZZI)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
+.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;ZZIILjava/lang/Object;)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 5
 
-    and-int/lit8 p8, p7, 0x1
+    and-int/lit8 p9, p8, 0x1
 
-    if-eqz p8, :cond_0
+    if-eqz p9, :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
+    and-int/lit8 p9, p8, 0x2
 
-    if-eqz p8, :cond_1
+    if-eqz p9, :cond_1
 
     iget-object p2, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
 
     :cond_1
-    move-object p8, p2
+    move-object p9, p2
 
-    and-int/lit8 p2, p7, 0x4
+    and-int/lit8 p2, p8, 0x4
 
     if-eqz p2, :cond_2
 
@@ -186,7 +192,7 @@
     :cond_2
     move-object v0, p3
 
-    and-int/lit8 p2, p7, 0x8
+    and-int/lit8 p2, p8, 0x8
 
     if-eqz p2, :cond_3
 
@@ -195,7 +201,7 @@
     :cond_3
     move-object v1, p4
 
-    and-int/lit8 p2, p7, 0x10
+    and-int/lit8 p2, p8, 0x10
 
     if-eqz p2, :cond_4
 
@@ -204,20 +210,29 @@
     :cond_4
     move v2, p5
 
-    and-int/lit8 p2, p7, 0x20
+    and-int/lit8 p2, p8, 0x20
 
     if-eqz p2, :cond_5
 
-    iget p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+    iget-boolean p6, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues:Z
 
     :cond_5
     move v3, p6
 
+    and-int/lit8 p2, p8, 0x40
+
+    if-eqz p2, :cond_6
+
+    iget p7, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
+
+    :cond_6
+    move v4, p7
+
     move-object p2, p0
 
     move-object p3, p1
 
-    move-object p4, p8
+    move-object p4, p9
 
     move-object p5, v0
 
@@ -227,7 +242,9 @@
 
     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 p9, v4
+
+    invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     move-result-object p0
 
@@ -276,7 +293,15 @@
     return v0
 .end method
 
-.method public final component6()I
+.method public final component6()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues:Z
+
+    return v0
+.end method
+
+.method public final component7()I
     .locals 1
 
     iget v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
@@ -284,12 +309,12 @@
     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
+.method public final copy(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZI)Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    .locals 9
 
-    new-instance v7, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
+    new-instance v8, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
-    move-object v0, v7
+    move-object v0, v8
 
     move-object v1, p1
 
@@ -303,9 +328,11 @@
 
     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
+    move/from16 v7, p7
 
-    return-object v7
+    invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;-><init>(Ljava/lang/Long;Ljava/lang/Integer;Lcom/discord/models/domain/ModelPremiumGuildSubscription;Lcom/discord/models/domain/ModelGuild;ZZI)V
+
+    return-object v8
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -313,13 +340,13 @@
 
     const/4 v0, 0x1
 
-    if-eq p0, p1, :cond_3
+    if-eq p0, p1, :cond_4
 
     instance-of v1, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
     const/4 v2, 0x0
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     check-cast p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;
 
@@ -331,7 +358,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->boostsRemaining:Ljava/lang/Integer;
 
@@ -341,7 +368,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->premiumGuildSubscription:Lcom/discord/models/domain/ModelPremiumGuildSubscription;
 
@@ -351,7 +378,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     iget-object v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->guild:Lcom/discord/models/domain/ModelGuild;
 
@@ -361,7 +388,7 @@
 
     move-result v1
 
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
 
     iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
 
@@ -377,31 +404,47 @@
     const/4 v1, 0x0
 
     :goto_0
-    if-eqz v1, :cond_2
+    if-eqz v1, :cond_3
+
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues:Z
+
+    iget-boolean v3, p1, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues: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 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
+    if-ne v1, p1, :cond_2
 
     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
+    const/4 p1, 0x0
+
+    :goto_2
+    if-eqz p1, :cond_3
+
+    goto :goto_3
 
     :cond_3
-    :goto_2
+    return v2
+
+    :cond_4
+    :goto_3
     return v0
 .end method
 
@@ -502,6 +545,14 @@
     return v0
 .end method
 
+.method public final getUseNewPremiumTierValues()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues:Z
+
+    return v0
+.end method
+
 .method public final hashCode()I
     .locals 3
 
@@ -574,6 +625,8 @@
 
     iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->enabled:Z
 
+    const/4 v2, 0x1
+
     if-eqz v1, :cond_4
 
     const/4 v1, 0x1
@@ -583,6 +636,17 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
+    iget-boolean v1, p0, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->useNewPremiumTierValues: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/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubscriptionItem;->typeInt:I
 
     invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)I
@@ -639,6 +703,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
 
+    const-string v1, ", useNewPremiumTierValues="
+
+    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;->useNewPremiumTierValues: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;
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
index 8468a82e77..2fcc8a72b6 100644
--- 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
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$boostClickListener$1;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali
index 8b3bb68573..c24c6c8453 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1.smali
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, v0, v1, p1, p2}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscriptionAdapter$removeClickListener$1;->invoke(JJ)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali
index ab54accfed..0964398dd9 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog$onResume$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali
index 54cadd1635..2686191fca 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetUpgradePremiumDialog.smali
@@ -175,7 +175,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a077d
+    const v0, 0x7f0a07a1
 
     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/settings/premium/WidgetUpgradePremiumDialog;->headerTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0779
+    const v0, 0x7f0a079d
 
     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/settings/premium/WidgetUpgradePremiumDialog;->bodyTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a077a
+    const v0, 0x7f0a079e
 
     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/settings/premium/WidgetUpgradePremiumDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a077b
+    const v0, 0x7f0a079f
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -207,7 +207,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->confirmBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02c9
+    const v0, 0x7f0a02cc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -215,7 +215,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->errorDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a077c
+    const v0, 0x7f0a07a0
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -341,7 +341,7 @@
 
     if-nez v4, :cond_7
 
-    sget-object v5, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v5, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
@@ -385,7 +385,7 @@
 
     move-result-object v4
 
-    const v5, 0x7f120ea9
+    const v5, 0x7f120f28
 
     const/4 v6, 0x1
 
@@ -423,7 +423,7 @@
 
     if-ne v4, v8, :cond_8
 
-    const v4, 0x7f120ea3
+    const v4, 0x7f120f25
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -472,7 +472,7 @@
 
     if-ne v4, v8, :cond_9
 
-    const v4, 0x7f120ea5
+    const v4, 0x7f120f26
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -521,7 +521,7 @@
 
     if-ne v4, v8, :cond_a
 
-    const v4, 0x7f120ea1
+    const v4, 0x7f120f24
 
     new-array v8, v7, [Ljava/lang/Object;
 
@@ -558,7 +558,7 @@
     goto :goto_3
 
     :cond_a
-    const v2, 0x7f120e9f
+    const v2, 0x7f120f23
 
     new-array v4, v6, [Ljava/lang/Object;
 
@@ -828,7 +828,7 @@
     goto :goto_0
 
     :pswitch_0
-    const p1, 0x7f120e98
+    const p1, 0x7f120f1c
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
 
@@ -837,7 +837,7 @@
     goto :goto_0
 
     :pswitch_1
-    const p1, 0x7f120e99
+    const p1, 0x7f120f1d
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
 
@@ -868,7 +868,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01bc
+    const v0, 0x7f0d01c8
 
     return v0
 .end method
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 c3338000cb..eb3057a4af 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ee5d366941..eaf27190a3 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, 0x7f0d008a
+    const v0, 0x7f0d0090
 
     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 c225eb7ed9..8dd9738bdb 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
@@ -151,9 +151,9 @@
 
     invoke-virtual {p1, v7}, Landroid/content/Intent;->getParcelableArrayListExtra(Ljava/lang/String;)Ljava/util/ArrayList;
 
-    move-result-object v5
+    move-result-object v1
 
-    goto :goto_5
+    goto :goto_6
 
     :cond_8
     const-string v4, "android.intent.action.SEND"
@@ -166,27 +166,104 @@
 
     invoke-virtual {p1, v7}, Landroid/content/Intent;->getParcelableExtra(Ljava/lang/String;)Landroid/os/Parcelable;
 
-    move-result-object p1
+    move-result-object v1
 
-    check-cast p1, Landroid/net/Uri;
+    check-cast v1, Landroid/net/Uri;
 
-    if-eqz p1, :cond_9
+    if-eqz v1, :cond_9
 
-    new-array v1, v3, [Landroid/net/Uri;
+    new-array v3, v3, [Landroid/net/Uri;
 
-    aput-object p1, v1, v2
+    aput-object v1, v3, v2
 
-    invoke-static {v1}, Lkotlin/a/m;->arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
+    invoke-static {v3}, Lkotlin/a/m;->arrayListOf([Ljava/lang/Object;)Ljava/util/ArrayList;
 
-    move-result-object v5
+    move-result-object v1
+
+    goto :goto_6
 
     :cond_9
     :goto_5
+    move-object v1, v5
+
+    :goto_6
+    invoke-virtual {p1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
+
+    move-result-object v2
+
+    if-nez v2, :cond_a
+
+    goto :goto_7
+
+    :cond_a
+    invoke-virtual {v2}, Ljava/lang/String;->hashCode()I
+
+    move-result v3
+
+    const v4, -0x41c4677b
+
+    if-eq v3, v4, :cond_b
+
+    goto :goto_7
+
+    :cond_b
+    const-string v3, "com.discord.intent.action.SDK"
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_c
+
+    invoke-virtual {p1}, Landroid/content/Intent;->getData()Landroid/net/Uri;
+
+    move-result-object v2
+
+    goto :goto_8
+
+    :cond_c
+    :goto_7
+    move-object v2, v5
+
+    :goto_8
+    const-string v3, "com.discord.intent.extra.EXTRA_ACTIVITY"
+
+    invoke-virtual {p1, v3}, Landroid/content/Intent;->getStringExtra(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_d
+
+    new-instance v3, Lcom/discord/models/domain/Model$JsonReader;
+
+    new-instance v4, Ljava/io/StringReader;
+
+    invoke-direct {v4, p1}, Ljava/io/StringReader;-><init>(Ljava/lang/String;)V
+
+    check-cast v4, Ljava/io/Reader;
+
+    invoke-direct {v3, v4}, Lcom/discord/models/domain/Model$JsonReader;-><init>(Ljava/io/Reader;)V
+
+    new-instance p1, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    invoke-direct {p1}, Lcom/discord/models/domain/ModelPresence$Activity;-><init>()V
+
+    check-cast p1, Lcom/discord/models/domain/Model;
+
+    invoke-virtual {v3, p1}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
+
+    move-result-object p1
+
+    move-object v5, p1
+
+    check-cast v5, Lcom/discord/models/domain/ModelPresence$Activity;
+
+    :cond_d
     new-instance p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    check-cast v5, Ljava/util/List;
+    check-cast v1, Ljava/util/List;
 
-    invoke-direct {p1, v0, v5}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;)V
+    invoke-direct {p1, v0, v1, v2, v5}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
index ff2b3ca27e..b6f5910310 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$ContentModel.smali
@@ -25,6 +25,10 @@
 
 
 # instance fields
+.field private final activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+.field private final activityActionUri:Landroid/net/Uri;
+
 .field private final sharedText:Ljava/lang/CharSequence;
 
 .field private final uris:Ljava/util/List;
@@ -53,7 +57,7 @@
     return-void
 .end method
 
-.method public constructor <init>(Ljava/lang/CharSequence;Ljava/util/List;)V
+.method public constructor <init>(Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -62,7 +66,10 @@
             "Ljava/util/List<",
             "+",
             "Landroid/net/Uri;",
-            ">;)V"
+            ">;",
+            "Landroid/net/Uri;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ")V"
         }
     .end annotation
 
@@ -72,27 +79,45 @@
 
     iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->uris:Ljava/util/List;
 
+    iput-object p3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    iput-object p4, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/CharSequence;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+.method public static synthetic copy$default(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;ILjava/lang/Object;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
     .locals 0
 
-    and-int/lit8 p4, p3, 0x1
+    and-int/lit8 p6, p5, 0x1
 
-    if-eqz p4, :cond_0
+    if-eqz p6, :cond_0
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->sharedText:Ljava/lang/CharSequence;
 
     :cond_0
-    and-int/lit8 p3, p3, 0x2
+    and-int/lit8 p6, p5, 0x2
 
-    if-eqz p3, :cond_1
+    if-eqz p6, :cond_1
 
     iget-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->uris:Ljava/util/List;
 
     :cond_1
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->copy(Ljava/lang/CharSequence;Ljava/util/List;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    and-int/lit8 p6, p5, 0x4
+
+    if-eqz p6, :cond_2
+
+    iget-object p3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    :cond_2
+    and-int/lit8 p5, p5, 0x8
+
+    if-eqz p5, :cond_3
+
+    iget-object p4, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    :cond_3
+    invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->copy(Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
     move-result-object p0
 
@@ -125,7 +150,23 @@
     return-object v0
 .end method
 
-.method public final copy(Ljava/lang/CharSequence;Ljava/util/List;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+.method public final component3()Landroid/net/Uri;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    return-object v0
+.end method
+
+.method public final component4()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -134,14 +175,17 @@
             "Ljava/util/List<",
             "+",
             "Landroid/net/Uri;",
-            ">;)",
+            ">;",
+            "Landroid/net/Uri;",
+            "Lcom/discord/models/domain/ModelPresence$Activity;",
+            ")",
             "Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;"
         }
     .end annotation
 
     new-instance v0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    invoke-direct {v0, p1, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;)V
+    invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     return-object v0
 .end method
@@ -169,7 +213,27 @@
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->uris:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->uris:Ljava/util/List;
+    iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->uris:Ljava/util/List;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    iget-object v1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    iget-object p1, p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
 
     invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -191,6 +255,22 @@
     return p1
 .end method
 
+.method public final getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    return-object v0
+.end method
+
+.method public final getActivityActionUri()Landroid/net/Uri;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    return-object v0
+.end method
+
 .method public final getSharedText()Ljava/lang/CharSequence;
     .locals 1
 
@@ -242,9 +322,45 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
+
+    goto :goto_1
 
     :cond_1
+    const/4 v2, 0x0
+
+    :goto_1
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    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/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    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
@@ -271,6 +387,22 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", activityActionUri="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activityActionUri:Landroid/net/Uri;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", activity="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->activity:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    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/widgets/share/WidgetIncomingShare$Model.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali
index 859b0602a5..9db7f61ad1 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$Model.smali
@@ -19,6 +19,8 @@
 
 .field private final contentModel:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
+.field private final gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
 .field private final isOnCooldown:Z
 
 .field private final isUserPremium:Z
@@ -31,7 +33,7 @@
 
 
 # direct methods
-.method public constructor <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
+.method public constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;ZIZ)V
     .locals 1
 
     const-string v0, "contentModel"
@@ -40,23 +42,25 @@
 
     const-string v0, "searchModel"
 
-    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->contentModel:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->comment:Ljava/lang/String;
+    iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
-    iput-object p3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->searchModel:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
+    iput-object p3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->comment:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    iput-object p4, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->searchModel:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
-    iput-boolean p5, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isOnCooldown:Z
+    iput-object p5, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    iput p6, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->maxFileSizeMB:I
+    iput-boolean p6, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isOnCooldown:Z
 
-    iput-boolean p7, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium:Z
+    iput p7, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->maxFileSizeMB:I
+
+    iput-boolean p8, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium:Z
 
     return-void
 .end method
@@ -79,6 +83,14 @@
     return-object v0
 .end method
 
+.method public final getGameInviteModel()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    return-object v0
+.end method
+
 .method public final getMaxFileSizeMB()I
     .locals 1
 
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 8489f55915..5d755e7649 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
index 593729d81e..1017e4cfd4 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$1.smali
@@ -39,7 +39,7 @@
 
 # virtual methods
 .method public final onEditorAction(Landroid/widget/TextView;ILandroid/view/KeyEvent;)Z
-    .locals 7
+    .locals 8
 
     const/4 p1, 0x0
 
@@ -80,33 +80,35 @@
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getContentModel()Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getGameInviteModel()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
     move-result-object v3
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isOnCooldown()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getContentModel()Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    move-result v4
+    move-result-object v4
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getMaxFileSizeMB()I
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isOnCooldown()Z
 
     move-result v5
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getMaxFileSizeMB()I
 
     move-result v6
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$1;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium()Z
+
+    move-result v7
+
+    invoke-static/range {v0 .. v7}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 
     const/4 p1, 0x1
 
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 05a626e65b..6122fc86c4 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
@@ -54,7 +54,7 @@
 
 # virtual methods
 .method public final call(Landroid/view/MenuItem;Landroid/content/Context;)V
-    .locals 8
+    .locals 9
 
     const-string v0, "menuItem"
 
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const v0, 0x7f0a046c
+    const v0, 0x7f0a0474
 
     if-eq p1, v0, :cond_0
 
@@ -85,35 +85,37 @@
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getContentModel()Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getGameInviteModel()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
     move-result-object v4
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isOnCooldown()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getContentModel()Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    move-result v5
+    move-result-object v5
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getMaxFileSizeMB()I
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isOnCooldown()Z
 
     move-result v6
 
     iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
 
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium()Z
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getMaxFileSizeMB()I
 
     move-result v7
 
+    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->isUserPremium()Z
+
+    move-result v8
+
     move-object v2, p2
 
-    invoke-static/range {v1 .. v7}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    invoke-static/range {v1 .. v8}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
similarity index 68%
rename from com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
rename to com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
index 0aab797e31..43cf9a5011 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$configureUi$5.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;
+.class final Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;
 .super Lkotlin/jvm/internal/m;
 .source "WidgetIncomingShare.kt"
 
@@ -37,9 +37,9 @@
 .method constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
+    iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    iput-object p2, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
     const/4 p1, 0x1
 
@@ -55,9 +55,9 @@
 
     check-cast p1, Landroid/net/Uri;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->invoke(Landroid/net/Uri;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;->invoke(Landroid/net/Uri;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,25 +65,21 @@
 .method public final invoke(Landroid/net/Uri;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;->$this_configureUi:Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
     invoke-virtual {v0}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
 
     move-result-object v1
 
-    const/4 v2, 0x1
-
-    const/4 v3, 0x0
-
     if-eqz v1, :cond_2
 
     check-cast v1, Ljava/lang/Iterable;
 
-    new-instance v4, Ljava/util/ArrayList;
+    new-instance v2, Ljava/util/ArrayList;
 
-    invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    check-cast v4, Ljava/util/Collection;
+    check-cast v2, Ljava/util/Collection;
 
     invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
 
@@ -93,46 +89,56 @@
     :goto_0
     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v5
+    move-result v3
 
-    if-eqz v5, :cond_1
+    if-eqz v3, :cond_1
 
     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v5
+    move-result-object v3
 
-    move-object v6, v5
+    move-object v4, v3
 
-    check-cast v6, Landroid/net/Uri;
+    check-cast v4, Landroid/net/Uri;
 
-    invoke-static {v6, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    move-result v6
+    move-result v4
 
-    xor-int/2addr v6, v2
+    xor-int/lit8 v4, v4, 0x1
 
-    if-eqz v6, :cond_0
+    if-eqz v4, :cond_0
 
-    invoke-interface {v4, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
     goto :goto_0
 
     :cond_1
-    move-object p1, v4
-
-    check-cast p1, Ljava/util/List;
+    check-cast v2, Ljava/util/List;
 
     goto :goto_1
 
     :cond_2
-    move-object p1, v3
+    const/4 p1, 0x0
+
+    move-object v2, p1
 
     :goto_1
-    invoke-static {v0, v3, p1, v2, v3}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->copy$default(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/CharSequence;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    const/4 v1, 0x0
+
+    const/4 v3, 0x0
+
+    const/4 v4, 0x0
+
+    const/16 v5, 0xd
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->copy$default(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;ILjava/lang/Object;)Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
     invoke-static {v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getContentPublisher$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Lrx/subjects/BehaviorSubject;
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
index e600a0431e..74066659f5 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 47110452e2..30c2bd8480 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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -37,11 +37,13 @@
 
 .field final synthetic $data:Ljava/util/List;
 
+.field final synthetic $gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
 .field final synthetic this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;)V
+.method constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
     .locals 0
 
     iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
@@ -50,6 +52,8 @@
 
     iput-object p3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->$context:Landroid/content/Context;
 
+    iput-object p4, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->$gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -70,7 +74,7 @@
 .end method
 
 .method public final call(Lkotlin/Pair;)Lrx/Observable;
-    .locals 13
+    .locals 11
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -100,7 +104,7 @@
 
     check-cast p1, Lcom/discord/models/domain/ModelChannel;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_5
 
     sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -202,19 +206,59 @@
     :goto_1
     const/4 v6, 0x0
 
-    const/4 v8, 0x0
+    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->$gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
-    const/4 v9, 0x0
+    const/4 v4, 0x0
 
-    const/4 v10, 0x0
+    if-eqz p1, :cond_2
 
-    const/16 v11, 0xe0
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getApplication()Lcom/discord/models/domain/ModelApplication;
 
-    const/4 v12, 0x0
+    move-result-object p1
 
+    move-object v8, p1
+
+    goto :goto_2
+
+    :cond_2
+    move-object v8, v4
+
+    :goto_2
+    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->$gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    if-eqz p1, :cond_3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object p1
+
+    move-object v9, p1
+
+    goto :goto_3
+
+    :cond_3
+    move-object v9, v4
+
+    :goto_3
+    iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;->$gameInviteModel:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    if-eqz p1, :cond_4
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getMessageActivity()Lcom/discord/models/domain/ModelMessage$Activity;
+
+    move-result-object p1
+
+    move-object v10, p1
+
+    goto :goto_4
+
+    :cond_4
+    move-object v10, v4
+
+    :goto_4
     move-object v4, v0
 
-    invoke-static/range {v1 .. v12}, Lcom/discord/stores/StoreMessages;->sendMessage$default(Lcom/discord/stores/StoreMessages;JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelMessage$Activity;ILjava/lang/Object;)Lrx/Observable;
+    invoke-virtual/range {v1 .. v10}, Lcom/discord/stores/StoreMessages;->sendMessage(JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelPresence$Activity;Lcom/discord/models/domain/ModelMessage$Activity;)Lrx/Observable;
 
     move-result-object p1
 
@@ -228,10 +272,10 @@
 
     move-result-object p1
 
-    if-nez p1, :cond_3
+    if-nez p1, :cond_6
 
-    :cond_2
-    invoke-static {}, Lrx/Observable;->IP()Lrx/Observable;
+    :cond_5
+    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object p1
 
@@ -239,6 +283,6 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    :cond_3
+    :cond_6
     return-object p1
 .end method
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 641dc58faa..15ec7fa7e0 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
@@ -153,7 +153,7 @@
 
     move-result v8
 
-    sget-object v0, Lkotlin/jvm/internal/h;->bhz:Lkotlin/jvm/internal/h;
+    sget-object v0, Lkotlin/jvm/internal/h;->bhJ:Lkotlin/jvm/internal/h;
 
     invoke-virtual {v0}, Lkotlin/jvm/internal/h;->getMAX_VALUE()F
 
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 6003368587..67e941be26 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
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -70,7 +70,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->invoke(Lkotlin/Pair;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -157,7 +157,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f100019
+    const v2, 0x7f10001a
 
     new-array v0, v0, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
index 51651bfed6..8d844524ee 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
index 78c31ff309..5222596a36 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
index fd779ba419..d14b1c5282 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    value = Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
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 70ac5feb04..ee3302dcf3 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1cef826168..9252ac5904 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 d925fcb0cb..6c32e218bf 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
index e17662b074..b41fc2042c 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1.smali
@@ -25,31 +25,23 @@
         ">",
         "Ljava/lang/Object;",
         "Lrx/functions/b<",
-        "TT;TR;>;"
+        "TT;",
+        "Lrx/Observable<",
+        "+TR;>;>;"
     }
 .end annotation
 
 
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;
+# instance fields
+.field final synthetic this$0:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;
 
 
 # direct methods
-.method static constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;
-
-    invoke-direct {v0}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;
-
-    return-void
-.end method
-
-.method constructor <init>()V
+.method constructor <init>(Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;)V
     .locals 0
 
+    iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;
+
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
@@ -57,41 +49,56 @@
 
 
 # virtual methods
-.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Ljava/lang/Integer;
+    check-cast p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;->call(Ljava/lang/Integer;)Z
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;->call(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)Lrx/Observable;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final call(Ljava/lang/Integer;)Z
-    .locals 1
+.method public final call(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)Lrx/Observable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;",
+            ")",
+            "Lrx/Observable<",
+            "Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;",
+            ">;"
+        }
+    .end annotation
 
-    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+    sget-object v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->Companion:Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;
 
-    move-result p1
+    iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;
 
-    const/4 v0, 0x0
+    iget-object v1, v1, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->compare(II)I
+    invoke-virtual {v1}, Lcom/discord/widgets/share/WidgetIncomingShare;->requireContext()Landroid/content/Context;
 
-    move-result p1
+    move-result-object v1
 
-    if-lez p1, :cond_0
+    const-string v2, "requireContext()"
 
-    const/4 p1, 0x1
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    return p1
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getActivityActionUri()Landroid/net/Uri;
 
-    :cond_0
-    return v0
+    move-result-object v2
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getActivity()Lcom/discord/models/domain/ModelPresence$Activity;
+
+    move-result-object p1
+
+    invoke-virtual {v0, v1, v2, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->getForShare(Landroid/content/Context;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)Lrx/Observable;
+
+    move-result-object p1
+
+    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 10b6b51ea1..e3446b0e09 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
@@ -3,7 +3,7 @@
 .source "WidgetIncomingShare.kt"
 
 # interfaces
-.implements Lrx/functions/Func5;
+.implements Lrx/functions/b;
 
 
 # annotations
@@ -18,35 +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:",
+        "<T:",
         "Ljava/lang/Object;",
         "R:",
         "Ljava/lang/Object;",
         ">",
         "Ljava/lang/Object;",
-        "Lrx/functions/Func5<",
-        "TT1;TT2;TT3;TT4;TT5;TR;>;"
+        "Lrx/functions/b<",
+        "TT;TR;>;"
     }
 .end annotation
 
 
-# instance fields
-.field final synthetic $receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
 
 
 # direct methods
-.method constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
-    .locals 0
+.method static constructor <clinit>()V
+    .locals 1
 
-    iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    new-instance v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
+
+    invoke-direct {v0}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 0
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,115 +57,41 @@
 
 
 # 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 10
-
-    iget-object v0, p0, 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;
-
-    if-eqz v1, :cond_0
-
-    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    instance-of v1, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
-
-    if-eqz v1, :cond_1
-
-    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
-
-    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 v0, 0x0
-
-    :goto_0
-    const-string v1, "contentModel"
-
-    invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v1, "searchModel"
-
-    invoke-static {p3, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    iget-object v6, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
-
-    const-string v1, "isOnCooldown"
-
-    invoke-static {p4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v7
-
-    const-string p4, "meUser"
-
-    invoke-static {p5, p4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p5}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
-
-    move-result p4
-
-    invoke-static {v0, p4}, Ljava/lang/Math;->max(II)I
-
-    move-result v8
-
-    invoke-virtual {p5}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
-
-    move-result v9
-
-    new-instance p4, Lcom/discord/widgets/share/WidgetIncomingShare$Model;
-
-    move-object v2, p4
-
-    move-object v3, p1
-
-    move-object v4, p2
-
-    move-object v5, p3
-
-    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 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;
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    check-cast p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+    check-cast p1, Ljava/lang/Integer;
 
-    check-cast p2, Ljava/lang/String;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->call(Ljava/lang/Integer;)Z
 
-    check-cast p3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
+    move-result p1
 
-    check-cast p4, Ljava/lang/Boolean;
-
-    check-cast p5, Lcom/discord/models/domain/ModelUser;
-
-    invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->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;
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
     move-result-object p1
 
     return-object p1
 .end method
+
+.method public final call(Ljava/lang/Integer;)Z
+    .locals 1
+
+    invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+    move-result p1
+
+    const/4 v0, 0x0
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->compare(II)I
+
+    move-result p1
+
+    if-lez p1, :cond_0
+
+    const/4 p1, 0x1
+
+    return p1
+
+    :cond_0
+    return v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali
new file mode 100644
index 0000000000..a837474726
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3.smali
@@ -0,0 +1,181 @@
+.class final Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;
+.super Ljava/lang/Object;
+.source "WidgetIncomingShare.kt"
+
+# interfaces
+.implements Lrx/functions/Func6;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;->call(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)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 $receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+    .locals 12
+
+    move-object v0, p0
+
+    iget-object v1, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    instance-of v2, v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+
+    if-eqz v2, :cond_0
+
+    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
+
+    move-result v1
+
+    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
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getMaxFileSizeMB()I
+
+    move-result v1
+
+    goto :goto_0
+
+    :cond_1
+    const/4 v1, 0x0
+
+    :goto_0
+    const-string v2, "contentModel"
+
+    move-object v4, p1
+
+    invoke-static {p1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "searchModel"
+
+    move-object/from16 v7, p4
+
+    invoke-static {v7, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v8, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    const-string v2, "isOnCooldown"
+
+    move-object/from16 v3, p5
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p5 .. p5}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v9
+
+    const-string v2, "meUser"
+
+    move-object/from16 v3, p6
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/models/domain/ModelUser;->getMaxFileSizeMB()I
+
+    move-result v2
+
+    invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I
+
+    move-result v10
+
+    invoke-virtual/range {p6 .. p6}, Lcom/discord/models/domain/ModelUser;->isPremium()Z
+
+    move-result v11
+
+    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+
+    move-object v3, v1
+
+    move-object v5, p2
+
+    move-object v6, p3
+
+    invoke-direct/range {v3 .. v11}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;ZIZ)V
+
+    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;
+    .locals 0
+
+    check-cast p1, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
+
+    check-cast p2, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    check-cast p3, Ljava/lang/String;
+
+    check-cast p4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
+
+    check-cast p5, Ljava/lang/Boolean;
+
+    check-cast p6, Lcom/discord/models/domain/ModelUser;
+
+    invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;->call(Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Ljava/lang/String;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/share/WidgetIncomingShare$Model;
+
+    move-result-object p1
+
+    return-object p1
+.end method
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 027e744ae6..4a6b283bb4 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
@@ -62,7 +62,7 @@
 .end method
 
 .method public final call(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)Lrx/Observable;
-    .locals 7
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -86,45 +86,61 @@
 
     iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
+    invoke-static {v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getContentPublisher$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Lrx/subjects/BehaviorSubject;
+
+    move-result-object v0
+
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;
+
+    invoke-direct {v2, p0}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;)V
+
+    check-cast v2, Lrx/functions/b;
+
+    invoke-virtual {v0, v2}, Lrx/subjects/BehaviorSubject;->g(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v2
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
+
     invoke-static {v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getCommentPublisher$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
-    const-string v2, "commentPublisher"
+    const-string v3, "commentPublisher"
 
-    invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v0, Lrx/Observable;
 
-    sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+    sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    const-wide/16 v3, 0x1f4
+    const-wide/16 v4, 0x1f4
 
-    invoke-static {v0, v3, v4, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+    invoke-static {v0, v4, v5, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
 
-    move-result-object v2
+    move-result-object v3
 
     sget-object v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->Companion:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;
 
-    iget-object v3, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
+    iget-object v4, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    invoke-static {v3}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getSearchQueryPublisher$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Lrx/subjects/BehaviorSubject;
+    invoke-static {v4}, Lcom/discord/widgets/share/WidgetIncomingShare;->access$getSearchQueryPublisher$p(Lcom/discord/widgets/share/WidgetIncomingShare;)Lrx/subjects/BehaviorSubject;
 
-    move-result-object v3
+    move-result-object v4
 
-    const-string v4, "searchQueryPublisher"
+    const-string v5, "searchQueryPublisher"
 
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    check-cast v3, Lrx/Observable;
+    check-cast v4, Lrx/Observable;
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
-    const/4 v5, 0x2
+    const/4 v6, 0x2
 
-    invoke-static {v0, v3, v4, v5, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getForSend$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;Lrx/Observable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+    invoke-static {v0, v4, v5, v6, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;->getForSend$default(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion;Lrx/Observable;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
 
-    move-result-object v3
+    move-result-object v4
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -136,38 +152,38 @@
 
     invoke-interface {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
+    move-result-object v6
+
+    if-eqz v6, :cond_0
+
+    invoke-virtual {v6}, 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
 
-    if-eqz v5, :cond_0
-
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v4
-
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v4
-
     :cond_0
-    invoke-virtual {v0, v4}, Lcom/discord/stores/StoreSlowMode;->getCooldownSecs(Ljava/lang/Long;)Lrx/Observable;
+    invoke-virtual {v0, v5}, Lcom/discord/stores/StoreSlowMode;->getCooldownSecs(Ljava/lang/Long;)Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v4, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$1;
+    sget-object v5, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
 
-    check-cast v4, Lrx/functions/b;
+    check-cast v5, Lrx/functions/b;
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+    invoke-virtual {v0, v5}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
-    move-result-object v4
+    move-result-object v5
 
-    invoke-virtual {v0, v4}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+    invoke-virtual {v0, v5}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
-    move-result-object v4
+    move-result-object v5
 
     sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
@@ -177,17 +193,17 @@
 
     invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
 
-    move-result-object v5
+    move-result-object v6
 
-    new-instance v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;
+    new-instance v0, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+    invoke-direct {v0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onViewBoundOrOnResume$1$3;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
-    move-object v6, v0
+    move-object v7, v0
 
-    check-cast v6, Lrx/functions/Func5;
+    check-cast v7, Lrx/functions/Func6;
 
-    invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
+    invoke-static/range {v1 .. v7}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable;
 
     move-result-object p1
 
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 c870bfb873..21fbe99f73 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 a49c044041..d828318256 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -25,6 +25,8 @@
 
 
 # instance fields
+.field private final activityActionPreview$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final commentPublisher:Lrx/subjects/BehaviorSubject;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -96,7 +98,7 @@
 
     const-class v0, Lcom/discord/widgets/share/WidgetIncomingShare;
 
-    const/16 v1, 0x9
+    const/16 v1, 0xa
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -172,6 +174,28 @@
 
     move-result-object v3
 
+    const-string v4, "activityActionPreview"
+
+    const-string v5, "getActivityActionPreview()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
     const-string v4, "scrollView"
 
     const-string v5, "getScrollView()Landroidx/core/widget/NestedScrollView;"
@@ -184,7 +208,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x3
+    const/4 v3, 0x4
 
     aput-object v2, v1, v3
 
@@ -206,7 +230,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x4
+    const/4 v3, 0x5
 
     aput-object v2, v1, v3
 
@@ -228,7 +252,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x5
+    const/4 v3, 0x6
 
     aput-object v2, v1, v3
 
@@ -250,7 +274,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x6
+    const/4 v3, 0x7
 
     aput-object v2, v1, v3
 
@@ -272,7 +296,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/4 v3, 0x7
+    const/16 v3, 0x8
 
     aput-object v2, v1, v3
 
@@ -294,7 +318,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/16 v2, 0x9
 
     aput-object v0, v1, v2
 
@@ -316,7 +340,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -324,7 +348,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->dimmer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02cd
+    const v0, 0x7f0a02d1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -332,7 +356,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->commentTv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02ce
+    const v0, 0x7f0a02d2
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -340,7 +364,15 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->previewList$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05ac
+    const v0, 0x7f0a02d0
+
+    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/share/WidgetIncomingShare;->activityActionPreview$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a05c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -348,7 +380,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->scrollView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a05b6
+    const v0, 0x7f0a05cb
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -356,7 +388,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02cf
+    const v0, 0x7f0a02d3
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -364,7 +396,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchEt$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a02d0
+    const v0, 0x7f0a02d4
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -372,7 +404,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchResultsRv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0835
+    const v0, 0x7f0a0865
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -380,7 +412,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiver$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0836
+    const v0, 0x7f0a0866
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -388,7 +420,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverRemoveIv$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -408,7 +440,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->searchQueryPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -513,10 +545,10 @@
     return-void
 .end method
 
-.method public static final synthetic access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+.method public static final synthetic access$onSendClicked(Lcom/discord/widgets/share/WidgetIncomingShare;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
     .locals 0
 
-    invoke-direct/range {p0 .. p6}, Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
+    invoke-direct/range {p0 .. p7}, Lcom/discord/widgets/share/WidgetIncomingShare;->onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
 
     return-void
 .end method
@@ -605,9 +637,9 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$4;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$5;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;)V
 
     check-cast v2, Lkotlin/jvm/functions/Function1;
 
@@ -669,7 +701,7 @@
     goto :goto_1
 
     :cond_3
-    const p1, 0x7f12124d
+    const p1, 0x7f1212d5
 
     :goto_1
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V
@@ -678,7 +710,7 @@
 .end method
 
 .method private final configureUi(Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
-    .locals 9
+    .locals 11
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getContentModel()Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
@@ -704,23 +736,23 @@
 
     const/4 v1, 0x0
 
-    const/4 v2, 0x0
+    const/4 v2, 0x1
 
-    const/4 v3, 0x1
+    const/4 v3, 0x0
 
-    if-eqz v0, :cond_7
+    if-eqz v0, :cond_8
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {v0, v2}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchEt()Landroid/widget/EditText;
 
     move-result-object v0
 
-    invoke-virtual {v0, v2}, Landroid/widget/EditText;->setFocusable(Z)V
+    invoke-virtual {v0, v3}, Landroid/widget/EditText;->setFocusable(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getCommentTv()Landroid/widget/TextView;
 
@@ -756,7 +788,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    if-eqz v0, :cond_2
+    if-eqz v0, :cond_4
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getContentModel()Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;
 
@@ -766,62 +798,58 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_3
+    if-eqz v0, :cond_2
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
     move-result v0
 
-    if-nez v0, :cond_3
+    if-eqz v0, :cond_4
 
     :cond_2
-    const/4 v2, 0x1
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getGameInviteModel()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
 
-    :cond_3
-    if-eqz v2, :cond_4
+    move-result-object v0
 
-    const v0, 0x7f0e000b
+    if-eqz v0, :cond_3
 
     goto :goto_2
 
-    :cond_4
-    const v0, 0x7f0e000a
-
-    :goto_2
-    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;
-
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
-
-    check-cast v2, Lrx/functions/Action2;
-
-    invoke-virtual {p0, v0, v2, v1}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
-
-    move-result-object v0
-
-    instance-of v2, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
-
-    if-eqz v2, :cond_5
-
-    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSelectedReceiver()Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
-
-    move-result-object v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
-
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;)V
+    :cond_3
+    const/4 v0, 0x0
 
     goto :goto_3
 
+    :cond_4
+    :goto_2
+    const/4 v0, 0x1
+
+    :goto_3
+    if-eqz v0, :cond_5
+
+    const v0, 0x7f0e000b
+
+    goto :goto_4
+
     :cond_5
-    instance-of v2, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
+    const v0, 0x7f0e000a
 
-    if-eqz v2, :cond_6
+    :goto_4
+    new-instance v4, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;
+
+    invoke-direct {v4, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
+
+    check-cast v4, Lrx/functions/Action2;
+
+    invoke-virtual {p0, v0, v4, v1}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    move-result-object v0
+
+    instance-of v4, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+
+    if-eqz v4, :cond_6
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSelectedReceiver()Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
@@ -829,18 +857,18 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    move-result-object v2
+    move-result-object v4
 
-    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
+    check-cast v4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;)V
+    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;)V
 
-    goto :goto_3
+    goto :goto_5
 
     :cond_6
-    instance-of v0, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    instance-of v4, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
-    if-eqz v0, :cond_8
+    if-eqz v4, :cond_7
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSelectedReceiver()Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
 
@@ -848,153 +876,207 @@
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    move-result-object v2
+    move-result-object v4
 
-    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    check-cast v4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;)V
+    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;)V
 
-    goto :goto_3
+    goto :goto_5
 
     :cond_7
+    instance-of v0, v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+
+    if-eqz v0, :cond_9
+
+    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSelectedReceiver()Lcom/discord/widgets/user/search/ViewGlobalSearchItem;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    move-result-object v4
+
+    check-cast v4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+
+    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/search/ViewGlobalSearchItem;->onConfigure(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;)V
+
+    goto :goto_5
+
+    :cond_8
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchFlipper()Lcom/discord/app/AppViewFlipper;
 
     move-result-object v0
 
-    invoke-virtual {v0, v2}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
+    invoke-virtual {v0, v3}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchEt()Landroid/widget/EditText;
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Landroid/widget/EditText;->setFocusable(Z)V
+    invoke-virtual {v0, v2}, Landroid/widget/EditText;->setFocusable(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getSearchEt()Landroid/widget/EditText;
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Landroid/widget/EditText;->setFocusableInTouchMode(Z)V
+    invoke-virtual {v0, v2}, Landroid/widget/EditText;->setFocusableInTouchMode(Z)V
 
     invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getCommentTv()Landroid/widget/TextView;
 
     move-result-object v0
 
-    const/4 v2, 0x5
+    const/4 v4, 0x5
 
-    invoke-virtual {v0, v2}, Landroid/widget/TextView;->setImeOptions(I)V
+    invoke-virtual {v0, v4}, Landroid/widget/TextView;->setImeOptions(I)V
 
-    const v4, 0x7f0e000a
+    const v6, 0x7f0e000a
 
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x4
+    const/4 v7, 0x0
 
     const/4 v8, 0x0
 
-    move-object v3, p0
+    const/4 v9, 0x4
 
-    invoke-static/range {v3 .. v8}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu$default(Lcom/discord/app/AppFragment;ILrx/functions/Action2;Lrx/functions/Action1;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+    const/4 v10, 0x0
 
-    :cond_8
-    :goto_3
-    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
+    move-object v5, p0
 
-    if-nez v0, :cond_9
-
-    const-string v2, "resultsAdapter"
-
-    invoke-static {v2}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static/range {v5 .. v10}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu$default(Lcom/discord/app/AppFragment;ILrx/functions/Action2;Lrx/functions/Action1;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
     :cond_9
-    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;
+    :goto_5
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
 
-    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
+    if-nez v0, :cond_a
 
-    check-cast v2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
+    const-string v4, "resultsAdapter"
 
-    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->setOnUpdated(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;)V
+    invoke-static {v4}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_a
+    new-instance v4, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;
+
+    invoke-direct {v4, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
+
+    check-cast v4, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;
+
+    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->setOnUpdated(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple$OnUpdated;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getSearchModel()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;
 
-    move-result-object v2
+    move-result-object v4
 
-    invoke-virtual {v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->getData()Ljava/util/List;
-
-    move-result-object v2
-
-    check-cast v2, 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 {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v2
-
-    :cond_a
-    :goto_4
-    invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v4
-
-    if-eqz v4, :cond_c
-
-    invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-virtual {v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel;->getData()Ljava/util/List;
 
     move-result-object v4
 
-    move-object v5, v4
+    check-cast v4, Ljava/lang/Iterable;
 
-    check-cast v5, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+    new-instance v5, Ljava/util/ArrayList;
 
-    invoke-interface {v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getKey()Ljava/lang/String;
+    invoke-direct {v5}, Ljava/util/ArrayList;-><init>()V
 
-    move-result-object v5
+    check-cast v5, Ljava/util/Collection;
+
+    invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v4
+
+    :cond_b
+    :goto_6
+    invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v6
+
+    if-eqz v6, :cond_d
+
+    invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v6
+
+    move-object v7, v6
+
+    check-cast v7, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
+
+    invoke-interface {v7}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getKey()Ljava/lang/String;
+
+    move-result-object v7
 
     invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getReceiver()Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;
 
-    move-result-object v6
+    move-result-object v8
 
-    if-eqz v6, :cond_b
+    if-eqz v8, :cond_c
 
-    invoke-interface {v6}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getKey()Ljava/lang/String;
+    invoke-interface {v8}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getKey()Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v8
 
-    goto :goto_5
-
-    :cond_b
-    move-object v6, v1
-
-    :goto_5
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v5
-
-    if-nez v5, :cond_a
-
-    invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_4
+    goto :goto_7
 
     :cond_c
-    check-cast v3, Ljava/util/List;
+    move-object v8, v1
 
-    invoke-virtual {v0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->setData(Ljava/util/List;)V
+    :goto_7
+    invoke-static {v7, v8}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
-    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;
+    move-result v7
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
+    if-nez v7, :cond_b
 
-    check-cast v1, Lkotlin/jvm/functions/Function4;
+    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {v0, v1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->setOnSelectedListener(Lkotlin/jvm/functions/Function4;)V
+    goto :goto_6
 
+    :cond_d
+    check-cast v5, Ljava/util/List;
+
+    invoke-virtual {v0, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->setData(Ljava/util/List;)V
+
+    new-instance v4, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;
+
+    invoke-direct {v4, p0, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$configureUi$$inlined$apply$lambda$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Lcom/discord/widgets/share/WidgetIncomingShare$Model;)V
+
+    check-cast v4, Lkotlin/jvm/functions/Function4;
+
+    invoke-virtual {v0, v4}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;->setOnSelectedListener(Lkotlin/jvm/functions/Function4;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getActivityActionPreview()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getGameInviteModel()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-result-object v4
+
+    if-eqz v4, :cond_e
+
+    goto :goto_8
+
+    :cond_e
+    const/4 v2, 0x0
+
+    :goto_8
+    const/4 v4, 0x2
+
+    invoke-static {v0, v2, v3, v4, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/share/WidgetIncomingShare$Model;->getGameInviteModel()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_f
+
+    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getActivityActionPreview()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+    move-result-object v0
+
+    invoke-virtual {v0, p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->bind(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+
+    :cond_f
     return-void
 .end method
 
@@ -1013,6 +1095,26 @@
     return-void
 .end method
 
+.method private final getActivityActionPreview()Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->activityActionPreview$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x3
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;
+
+    return-object v0
+.end method
+
 .method private final getCommentTv()Landroid/widget/TextView;
     .locals 3
 
@@ -1080,7 +1182,7 @@
 
     sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x3
+    const/4 v2, 0x4
 
     aget-object v1, v1, v2
 
@@ -1100,7 +1202,7 @@
 
     sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x5
+    const/4 v2, 0x6
 
     aget-object v1, v1, v2
 
@@ -1120,7 +1222,7 @@
 
     sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x4
+    const/4 v2, 0x5
 
     aget-object v1, v1, v2
 
@@ -1140,7 +1242,7 @@
 
     sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x6
+    const/4 v2, 0x7
 
     aget-object v1, v1, v2
 
@@ -1160,7 +1262,7 @@
 
     sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/4 v2, 0x7
+    const/16 v2, 0x8
 
     aget-object v1, v1, v2
 
@@ -1180,7 +1282,7 @@
 
     sget-object v1, Lcom/discord/widgets/share/WidgetIncomingShare;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x8
+    const/16 v2, 0x9
 
     aget-object v1, v1, v2
 
@@ -1280,379 +1382,385 @@
     return-void
 .end method
 
-.method private final onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Ljava/util/List;ZIZ)V
-    .locals 9
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "(",
-            "Landroid/content/Context;",
-            "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;",
-            "Ljava/util/List<",
-            "+",
-            "Landroid/net/Uri;",
-            ">;ZIZ)V"
-        }
-    .end annotation
+.method private final onSendClicked(Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;ZIZ)V
+    .locals 20
 
-    if-eqz p4, :cond_0
+    move-object/from16 v0, p0
 
-    const p2, 0x7f1203c4
+    move-object/from16 v7, p1
 
-    invoke-static {p1, p2}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
+    move-object/from16 v8, p2
+
+    if-eqz p5, :cond_0
+
+    const v1, 0x7f1203e9
+
+    invoke-static {v7, v1}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
     return-void
 
     :cond_0
-    instance-of p4, p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
+    instance-of v1, v8, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
-    if-eqz p4, :cond_1
+    if-eqz v1, :cond_1
 
-    sget-object p4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {p4}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
-
-    move-result-object p4
-
-    move-object v0, p2
-
-    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
-
-    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
 
     move-result-object v1
 
-    invoke-virtual {p4, v1}, Lcom/discord/stores/StoreChannelsSelected;->set(Lcom/discord/models/domain/ModelChannel;)V
+    move-object v2, v8
 
-    new-instance p4, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1;
+    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;
 
-    invoke-direct {p4, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+    invoke-virtual {v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    check-cast p4, Lkotlin/jvm/functions/Function1;
+    move-result-object v3
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {v1, v3}, Lcom/discord/stores/StoreChannelsSelected;->set(Lcom/discord/models/domain/ModelChannel;)V
 
-    move-result-object v0
+    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1;
 
-    invoke-static {p4, v0}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$c;
+    invoke-direct {v1, v8}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$1;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
-    move-result-object p4
+    check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    goto :goto_0
+    invoke-virtual {v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v2
+
+    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$c;
+
+    move-result-object v1
+
+    :goto_0
+    move-object v9, v1
+
+    goto :goto_1
 
     :cond_1
-    instance-of p4, p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    instance-of v1, v8, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
-    if-eqz p4, :cond_2
+    if-eqz v1, :cond_2
 
-    sget-object p4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {p4}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
 
-    move-result-object p4
+    move-result-object v1
 
-    move-object v0, p2
+    move-object v2, v8
 
-    check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
+    check-cast v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getUser()Lcom/discord/models/domain/ModelUser;
+    invoke-virtual {v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemUser;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->getId()J
 
-    move-result-wide v0
+    move-result-wide v2
 
-    invoke-virtual {p4, p1, v0, v1}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
+    invoke-virtual {v1, v7, v2, v3}, Lcom/discord/stores/StoreChannelsSelected;->findAndSetDirectMessage(Landroid/content/Context;J)V
 
-    new-instance p4, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2;
+    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2;
 
-    invoke-direct {p4, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+    invoke-direct {v1, v8}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$2;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
-    check-cast p4, Lkotlin/jvm/functions/Function1;
+    check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    invoke-interface {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-interface/range {p2 .. p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-static {p4, v0}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$c;
 
-    move-result-object p4
+    move-result-object v1
 
     goto :goto_0
 
     :cond_2
-    instance-of p4, p2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    instance-of v1, v8, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    if-eqz p4, :cond_7
+    if-eqz v1, :cond_7
 
-    sget-object p4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {p4}, Lcom/discord/stores/StoreStream$Companion;->getGuildSelected()Lcom/discord/stores/StoreGuildSelected;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuildSelected()Lcom/discord/stores/StoreGuildSelected;
 
-    move-result-object v0
+    move-result-object v9
 
-    move-object p4, p2
+    move-object v1, v8
 
-    check-cast p4, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
+    check-cast v1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;
 
-    invoke-virtual {p4}, 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 p4
+    move-result-object v1
 
-    invoke-virtual {p4}, Lcom/discord/models/domain/ModelGuild;->getId()J
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
 
-    move-result-wide v1
+    move-result-wide v10
 
-    const/4 v3, 0x0
+    const/4 v12, 0x0
 
-    const/4 v4, 0x2
+    const/4 v13, 0x2
 
-    const/4 v5, 0x0
+    const/4 v14, 0x0
 
-    invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreGuildSelected;->set$default(Lcom/discord/stores/StoreGuildSelected;JLrx/functions/Action0;ILjava/lang/Object;)V
+    invoke-static/range {v9 .. v14}, Lcom/discord/stores/StoreGuildSelected;->set$default(Lcom/discord/stores/StoreGuildSelected;JLrx/functions/Action0;ILjava/lang/Object;)V
 
-    new-instance p4, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;
+    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;
 
-    invoke-direct {p4, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+    invoke-direct {v1, v8}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;-><init>(Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
 
-    check-cast p4, Lkotlin/jvm/functions/Function1;
+    check-cast v1, Lkotlin/jvm/functions/Function1;
 
-    invoke-interface {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-interface/range {p2 .. p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v2
 
-    invoke-static {p4, v0}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$c;
+    invoke-static {v1, v2}, Lcom/discord/app/i;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Lrx/Observable$c;
 
-    move-result-object p4
+    move-result-object v1
 
-    :goto_0
-    if-eqz p3, :cond_4
-
-    move-object v0, p3
-
-    check-cast v0, Ljava/lang/Iterable;
-
-    new-instance v1, Ljava/util/ArrayList;
-
-    const/16 v2, 0xa
-
-    invoke-static {v0, v2}, Lkotlin/a/m;->collectionSizeOrDefault(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 :goto_0
 
     :goto_1
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    invoke-virtual/range {p4 .. p4}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;->getUris()Ljava/util/List;
 
-    move-result v2
+    move-result-object v10
 
-    if-eqz v2, :cond_3
+    if-eqz v10, :cond_4
 
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/net/Uri;
-
-    invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
-
-    move-result-object v3
-
-    const-string v4, "context.contentResolver"
-
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v2, v3}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeMegabytes(Landroid/net/Uri;Landroid/content/ContentResolver;)F
-
-    move-result v2
-
-    invoke-static {v2}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
-    goto :goto_1
-
-    :cond_3
-    check-cast v1, Ljava/util/List;
+    move-object v1, v10
 
     check-cast v1, Ljava/lang/Iterable;
 
-    invoke-static {v1}, Lkotlin/a/m;->sumOfFloat(Ljava/lang/Iterable;)F
+    new-instance v2, Ljava/util/ArrayList;
 
-    move-result v0
+    const/16 v3, 0xa
 
-    move v4, v0
+    invoke-static {v1, v3}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    goto :goto_2
+    move-result v3
 
-    :cond_4
-    const/4 v0, 0x0
+    invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(I)V
 
-    const/4 v4, 0x0
+    check-cast v2, Ljava/util/Collection;
+
+    invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
 
     :goto_2
-    sget-object v1, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    invoke-virtual {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v3
 
-    const-string v0, "requireFragmentManager()"
+    check-cast v3, Landroid/net/Uri;
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
-    move-object v2, p1
+    move-result-object v4
 
-    move v5, p5
+    const-string v5, "context.contentResolver"
 
-    move v6, p6
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3, v4}, Lcom/discord/utilities/rest/SendUtilsKt;->computeFileSizeMegabytes(Landroid/net/Uri;Landroid/content/ContentResolver;)F
+
+    move-result v3
+
+    invoke-static {v3}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_2
+
+    :cond_3
+    check-cast v2, Ljava/util/List;
+
+    check-cast v2, Ljava/lang/Iterable;
+
+    invoke-static {v2}, Lkotlin/a/m;->sumOfFloat(Ljava/lang/Iterable;)F
+
+    move-result v1
+
+    move v4, v1
+
+    goto :goto_3
+
+    :cond_4
+    const/4 v1, 0x0
+
+    const/4 v4, 0x0
+
+    :goto_3
+    sget-object v1, Lcom/discord/utilities/rest/SendUtils;->INSTANCE:Lcom/discord/utilities/rest/SendUtils;
+
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v3
+
+    const-string v2, "requireFragmentManager()"
+
+    invoke-static {v3, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object/from16 v2, p1
+
+    move/from16 v5, p6
+
+    move/from16 v6, p7
 
     invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/rest/SendUtils;->tryShowFilesTooLargeDialog(Landroid/content/Context;Landroidx/fragment/app/FragmentManager;FIZ)Z
 
-    move-result p5
+    move-result v1
 
-    if-eqz p5, :cond_5
+    if-eqz v1, :cond_5
 
     return-void
 
     :cond_5
-    sget-object p5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+    sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    invoke-virtual {p5}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
-
-    move-result-object p5
-
-    invoke-virtual {p5}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
-
-    move-result-object p5
-
-    sget-object p6, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
-    invoke-virtual {p6}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
-
-    move-result-object p6
-
-    invoke-virtual {p6}, Lcom/discord/stores/StoreChannelsSelected;->get()Lrx/Observable;
-
-    move-result-object p6
-
-    invoke-virtual {p6, p4}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string p4, "StoreStream\n            \u2026         .compose(filter)"
-
-    invoke-static {v0, p4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-wide/16 v1, 0x3e8
-
-    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 p4
-
-    sget-object p6, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$1;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$1;
-
-    check-cast p6, Lrx/functions/Func2;
-
-    invoke-static {p5, p4, p6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
-
-    move-result-object p4
-
-    invoke-virtual {p4}, Lrx/Observable;->IS()Lrx/Observable;
-
-    move-result-object p4
-
-    new-instance p5, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;
-
-    invoke-direct {p5, p0, p3, p1}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;)V
-
-    check-cast p5, Lrx/functions/b;
-
-    invoke-virtual {p4, p5}, Lrx/Observable;->c(Lrx/functions/b;)Lrx/Observable;
-
-    move-result-object p4
-
-    const-string p5, "Observable\n        .comb\u2026ervable.empty()\n        }"
-
-    invoke-static {p4, p5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    move-object p5, p0
-
-    check-cast p5, Lcom/discord/app/AppComponent;
-
-    iget-object p6, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
-
-    if-nez p6, :cond_6
-
-    const-string v0, "resultsAdapter"
-
-    invoke-static {v0}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
-    :cond_6
-    check-cast p6, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
-
-    invoke-static {p4, p5, p6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
-
-    move-result-object p4
-
-    invoke-direct {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
-
-    move-result-object p5
-
-    const-wide/16 v0, 0x0
-
-    invoke-static {p5, v0, v1}, Lcom/discord/app/i;->a(Lcom/discord/utilities/dimmer/DimmerView;J)Lrx/Observable$c;
-
-    move-result-object p5
-
-    invoke-virtual {p4, p5}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
-    move-result-object v0
-
-    const-string p4, "Observable\n        .comb\u2026rs.withDimmer(dimmer, 0))"
-
-    invoke-static {v0, p4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+    invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
 
     move-result-object v1
 
-    const/4 v2, 0x0
+    invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable;
 
-    const/4 v3, 0x0
+    move-result-object v1
 
-    const/4 v4, 0x0
+    sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
 
-    const/4 v5, 0x0
+    invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
 
-    new-instance p4, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;
+    move-result-object v2
 
-    invoke-direct {p4, p0, p3, p1, p2}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+    invoke-virtual {v2}, Lcom/discord/stores/StoreChannelsSelected;->get()Lrx/Observable;
 
-    move-object v6, p4
+    move-result-object v2
 
-    check-cast v6, Lkotlin/jvm/functions/Function1;
+    invoke-virtual {v2, v9}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
 
-    const/16 v7, 0x1e
+    move-result-object v11
 
-    const/4 v8, 0x0
+    const-string v2, "StoreStream\n            \u2026         .compose(filter)"
 
-    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static {v11, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-wide/16 v12, 0x3e8
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x2
+
+    const/16 v16, 0x0
+
+    invoke-static/range {v11 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v2
+
+    sget-object v3, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$1;->INSTANCE:Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$1;
+
+    check-cast v3, Lrx/functions/Func2;
+
+    invoke-static {v1, v2, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lrx/Observable;->IV()Lrx/Observable;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;
+
+    move-object/from16 v3, p3
+
+    invoke-direct {v2, v0, v10, v7, v3}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$2;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;)V
+
+    check-cast v2, Lrx/functions/b;
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->c(Lrx/functions/b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v2, "Observable\n        .comb\u2026ervable.empty()\n        }"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, v0
+
+    check-cast v2, Lcom/discord/app/AppComponent;
+
+    iget-object v3, v0, Lcom/discord/widgets/share/WidgetIncomingShare;->resultsAdapter:Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;
+
+    if-nez v3, :cond_6
+
+    const-string v4, "resultsAdapter"
+
+    invoke-static {v4}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_6
+    check-cast v3, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+
+    invoke-static {v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;)Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getDimmer()Lcom/discord/utilities/dimmer/DimmerView;
+
+    move-result-object v2
+
+    const-wide/16 v3, 0x0
+
+    invoke-static {v2, v3, v4}, Lcom/discord/app/i;->a(Lcom/discord/utilities/dimmer/DimmerView;J)Lrx/Observable$c;
+
+    move-result-object v2
+
+    invoke-virtual {v1, v2}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
+    move-result-object v11
+
+    const-string v1, "Observable\n        .comb\u2026rs.withDimmer(dimmer, 0))"
+
+    invoke-static {v11, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v12
+
+    const/4 v13, 0x0
+
+    const/4 v14, 0x0
+
+    const/4 v15, 0x0
+
+    const/16 v16, 0x0
+
+    new-instance v1, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;
+
+    invoke-direct {v1, v0, v10, v7, v8}, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;-><init>(Lcom/discord/widgets/share/WidgetIncomingShare;Ljava/util/List;Landroid/content/Context;Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload;)V
+
+    move-object/from16 v17, v1
+
+    check-cast v17, Lkotlin/jvm/functions/Function1;
+
+    const/16 v18, 0x1e
+
+    const/16 v19, 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
 
     :cond_7
     return-void
@@ -1678,6 +1786,22 @@
 
     move-result-object v1
 
+    invoke-virtual {v1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "com.discord.intent.action.SDK"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-nez v1, :cond_1
+
+    invoke-virtual {p0}, Lcom/discord/widgets/share/WidgetIncomingShare;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object v1
+
     const/4 v2, 0x1
 
     const-string v3, "com.discord.intent.extra.EXTRA_CONTINUE_IN_APP"
@@ -1715,7 +1839,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d013e
+    const v0, 0x7f0d0144
 
     return v0
 .end method
@@ -1740,7 +1864,7 @@
     return-void
 
     :cond_0
-    const v0, 0x7f12108f
+    const v0, 0x7f121116
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit;
 
@@ -1754,7 +1878,7 @@
 
     const/4 v7, 0x0
 
-    invoke-direct {v3, v1, v7}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;)V
+    invoke-direct {v3, v1, v7, v7, v7}, Lcom/discord/widgets/share/WidgetIncomingShare$ContentModel;-><init>(Ljava/lang/CharSequence;Ljava/util/List;Landroid/net/Uri;Lcom/discord/models/domain/ModelPresence$Activity;)V
 
     const/4 v4, 0x0
 
@@ -1961,7 +2085,7 @@
 
     iget-object v1, p0, Lcom/discord/widgets/share/WidgetIncomingShare;->selectedReceiverPublisher:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1983,7 +2107,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+    invoke-static {v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
 
     move-result-object v1
 
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..72a5effa4f
--- /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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->checkParameterIsNotNull(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..6b6f583186
--- /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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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 0x7f0a047c
+        :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..c87569532a
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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..1b424a6691
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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;->until(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;->collectionSizeOrDefault(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;->contains(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/l;->checkExpressionValueIsNotNull(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..4d0f8f2528
--- /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/l;->checkExpressionValueIsNotNull(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..a00ab7833e
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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..02d56a0730
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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..9f32e78825
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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..e0cc11629c
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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..04b9fa21d6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectate.smali
@@ -0,0 +1,1441 @@
+.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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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;->setOf([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, 0x7f0a0036
+
+    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, 0x7f0a0726
+
+    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, 0x7f0a007f
+
+    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, 0x7f0a0727
+
+    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, 0x7f0a0728
+
+    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, 0x7f0a0729
+
+    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, 0x7f0a072a
+
+    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/l;->throwUninitializedPropertyAccessException(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, 0x7f08023f
+
+    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;->FC: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;->FB: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, 0x7f0802fe
+
+    goto :goto_1
+
+    :cond_0
+    const v2, 0x7f080303
+
+    :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;->zV: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/l;->throwUninitializedPropertyAccessException(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/l;->areEqual(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;->listOf(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/l;->checkExpressionValueIsNotNull(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/l;->areEqual(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;->bgy: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/l;->areEqual(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;->bgy: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/l;->areEqual(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;->bgy: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, 0x7f0d01be
+
+    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/l;->checkParameterIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_0
+    invoke-virtual {v1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel;->observeViewState()Lrx/Observable;
+
+    move-result-object v1
+
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v3}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-string v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->throwUninitializedPropertyAccessException(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/l;->throwUninitializedPropertyAccessException(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..7f40bf2bde
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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..f8a76d0d0a
--- /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, 0x7f1211aa
+
+    invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
+
+    return-void
+
+    nop
+
+    :pswitch_data_0
+    .packed-switch 0x7f0a056f
+        :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..07efe2b63f
--- /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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "submitBtn"
+
+    const-string v5, "getSubmitBtn()Lcom/discord/views/LoadingButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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, 0x7f0a0578
+
+    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, 0x7f0a0576
+
+    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, 0x7f0a0574
+
+    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, 0x7f0a0575
+
+    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, 0x7f0a0571
+
+    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, 0x7f0a0572
+
+    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, 0x7f0a0573
+
+    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, 0x7f0a056f
+
+    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, 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;->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/l;->throwUninitializedPropertyAccessException(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, 0x7f121199
+
+    goto :goto_0
+
+    :cond_0
+    const v1, 0x7f121195
+
+    :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, 0x7f12119a
+
+    goto :goto_1
+
+    :cond_1
+    const v1, 0x7f121196
+
+    :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, 0x7f12119b
+
+    goto :goto_2
+
+    :cond_2
+    const v1, 0x7f12119f
+
+    :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, 0x7f12119c
+
+    goto :goto_3
+
+    :cond_3
+    const v1, 0x7f1211a1
+
+    :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, 0x7f121197
+
+    goto :goto_4
+
+    :cond_4
+    const v1, 0x7f121193
+
+    :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, 0x7f121198
+
+    goto :goto_5
+
+    :cond_5
+    const p1, 0x7f121194
+
+    :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()Lcom/discord/views/LoadingButton;
+    .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, Lcom/discord/views/LoadingButton;
+
+    return-object v0
+.end method
+
+
+# virtual methods
+.method public final getContentViewResId()I
+    .locals 1
+
+    const v0, 0x7f0d01c0
+
+    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/l;->checkExpressionValueIsNotNull(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/l;->throwUninitializedPropertyAccessException(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/l;->checkExpressionValueIsNotNull(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()Lcom/discord/views/LoadingButton;
+
+    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}, Lcom/discord/views/LoadingButton;->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..a4d7afdcd0
--- /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/x;
+
+    const-class v2, Lcom/discord/widgets/spectate/WidgetSpectateStreamFullDialog;
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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, 0x7f0a0750
+
+    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/l;->throwUninitializedPropertyAccessException(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, 0x7f0d01c1
+
+    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/l;->checkExpressionValueIsNotNull(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..8ed1b8de55
--- /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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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..dbe0606a93
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputMode"
+
+    invoke-static {p7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "stream"
+
+    move-object v5, p4
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "inputMode"
+
+    move-object/from16 v8, p7
+
+    invoke-static {v8, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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/l;->areEqual(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..2f04e711c2
--- /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/l;->checkExpressionValueIsNotNull(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..758622e18c
--- /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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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..6c06236636
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel$fetchData$1.smali
@@ -0,0 +1,241 @@
+.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 11
+    .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;->zU: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;->bq(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-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+
+    move-result-object v3
+
+    invoke-virtual {v2, v3}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
+
+    move-result-object v4
+
+    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-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)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;->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-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$b;)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;->isSelfMuted()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;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getInputMode()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;->getApplicationStreaming()Lcom/discord/stores/StoreApplicationStreaming;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/stores/StoreApplicationStreaming;->getState()Lrx/Observable;
+
+    move-result-object v9
+
+    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 v10, v0
+
+    check-cast v10, Lrx/functions/Func6;
+
+    invoke-static/range {v4 .. v10}, 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..264b9fa87a
--- /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/y;->getOrCreateKotlinClass(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;->bgy: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/l;->checkParameterIsNotNull(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..e256ba37b8
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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/l;->checkParameterIsNotNull(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..a0ebe702c4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateViewModel.smali
@@ -0,0 +1,1147 @@
+.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;->bD(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;->KA()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;->Jc()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;->Jc()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/l;->checkExpressionValueIsNotNull(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 14
+
+    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;
+
+    const/4 v3, 0x0
+
+    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 v13, 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 v4, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ACTIVE:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne v2, v4, :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 v4, Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;->ENDED:Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream$State;
+
+    if-ne v2, v4, :cond_1
+
+    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
+
+    :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
+    move-object v13, v3
+
+    :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 v12, v0
+
+    goto :goto_2
+
+    :cond_3
+    const/4 v0, 0x0
+
+    const/4 v12, 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 v5
+
+    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 v3
+
+    :cond_4
+    move-object v6, v3
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getVideoStreamId()Ljava/lang/Integer;
+
+    move-result-object v7
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getStream()Lcom/discord/stores/StoreApplicationStreaming$ActiveApplicationStream;
+
+    move-result-object v8
+
+    const/4 v9, 0x1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->isMuted()Z
+
+    move-result v10
+
+    invoke-virtual {p1}, Lcom/discord/widgets/spectate/WidgetSpectateViewModel$RawData;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+
+    move-result-object v11
+
+    move-object v4, v0
+
+    invoke-direct/range {v4 .. v13}, 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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkParameterIsNotNull(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, 0x7f1211aa
+
+    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..739d363e26
--- /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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "values"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0d0061
+
+    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, 0x7f0d0061
+
+    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/l;->throwNpe()V
+
+    :cond_1
+    const v0, 0x7f0a074e
+
+    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/l;->checkExpressionValueIsNotNull(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, 0x7f1211a0
+
+    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, 0x7f121198
+
+    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, 0x7f121197
+
+    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, 0x7f12119c
+
+    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, 0x7f12119b
+
+    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, 0x7f12119a
+
+    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, 0x7f121199
+
+    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/l;->checkParameterIsNotNull(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/l;->checkParameterIsNotNull(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..8c7608c0ed
--- /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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "submitBtn"
+
+    const-string v5, "getSubmitBtn()Lcom/discord/views/LoadingButton;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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, 0x7f0a074f
+
+    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, 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/WidgetStreamFeedbackDialog;->cancelBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a074d
+
+    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, 0x7f0a074a
+
+    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, 0x7f0a0749
+
+    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, 0x7f0a074b
+
+    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, 0x7f0a074c
+
+    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/l;->throwUninitializedPropertyAccessException(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()Lcom/discord/views/LoadingButton;
+    .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, Lcom/discord/views/LoadingButton;
+
+    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()Lcom/discord/views/LoadingButton;
+
+    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}, Lcom/discord/views/LoadingButton;->setEnabled(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSubmitBtn()Lcom/discord/views/LoadingButton;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-direct {p0}, Lcom/discord/widgets/spectate/WidgetStreamFeedbackDialog;->getSubmitBtn()Lcom/discord/views/LoadingButton;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/views/LoadingButton;->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, 0x7f0d01c4
+
+    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/l;->checkExpressionValueIsNotNull(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()Lcom/discord/views/LoadingButton;
+
+    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}, Lcom/discord/views/LoadingButton;->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/l;->checkExpressionValueIsNotNull(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 011c6ce6a1..54a164d517 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;->IS()Lrx/Observable;
+    invoke-virtual {p1}, Lrx/Observable;->IV()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 258731fe64..f4fcba5b43 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -235,7 +235,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -307,7 +307,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
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 858c83f3a7..d83ea4aca6 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 193114f1c5..7a7fd7a9b5 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, 0x7f0a071d
+    const v0, 0x7f0a0738
 
     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, 0x7f0a0721
+    const v0, 0x7f0a073c
 
     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, 0x7f0a0720
+    const v0, 0x7f0a073b
 
     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, 0x7f0a071f
+    const v0, 0x7f0a073a
 
     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, 0x7f0a0722
+    const v0, 0x7f0a073d
 
     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, 0x7f0a0724
+    const v0, 0x7f0a073f
 
     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, 0x7f0a0723
+    const v0, 0x7f0a073e
 
     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, 0x7f120440
+    const v0, 0x7f120465
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -505,7 +505,7 @@
 
     if-eqz p2, :cond_1
 
-    const p2, 0x7f120bf1
+    const p2, 0x7f120c23
 
     invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -698,7 +698,7 @@
 
     move-result-object p1
 
-    const v2, 0x7f120bf9
+    const v2, 0x7f120c2b
 
     new-array p4, p4, [Ljava/lang/Object;
 
@@ -747,7 +747,7 @@
 
     move-result-object p2
 
-    const v2, 0x7f120bf7
+    const v2, 0x7f120c29
 
     new-array p4, p4, [Ljava/lang/Object;
 
@@ -771,7 +771,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01b8
+    const v0, 0x7f0d01c3
 
     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 84885d212b..88cc4684d8 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 688b35f798..423cb42552 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;->vP:Lcom/discord/app/i;
+    sget-object v0, Lcom/discord/app/i;->vO: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 a54dfdb1f1..4267b4ee66 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, 0x7f0a0471
+    const p2, 0x7f0a0479
 
     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 a6ead39ff7..72893a5446 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3643d9b839..d526644c4f 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, 0x7f121193
+    const v2, 0x7f12121b
 
     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, 0x7f120ed0
+    const v1, 0x7f120f57
 
     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, 0x7f0d01bb
+    const v0, 0x7f0d01c7
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE.smali
new file mode 100644
index 0000000000..4e30aa13ca
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE.smali
@@ -0,0 +1,40 @@
+.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Action3;
+
+
+# instance fields
+.field private final synthetic f$0:Landroid/app/Activity;
+
+
+# direct methods
+.method public synthetic constructor <init>(Landroid/app/Activity;)V
+    .locals 0
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE;->f$0:Landroid/app/Activity;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE;->f$0:Landroid/app/Activity;
+
+    check-cast p1, Landroid/view/View;
+
+    check-cast p2, Ljava/lang/Integer;
+
+    check-cast p3, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;
+
+    invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->lambda$new$0(Landroid/app/Activity;Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI.smali b/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI.smali
deleted file mode 100644
index 09dcaee4ff..0000000000
--- a/com.discord/smali/com/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Action3;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;
-
-
-# direct methods
-.method static synthetic constructor <clinit>()V
-    .locals 1
-
-    new-instance v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;
-
-    invoke-direct {v0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;-><init>()V
-
-    sput-object v0, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;
-
-    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/WidgetUserMutualFriends$Model$Item;
-
-    invoke-static {p1, p2, p3}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->lambda$new$0(Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;)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
index 66bd37dde6..baa6bd5413 100644
--- 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->invoke(Lcom/discord/widgets/user/Badge;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -75,7 +75,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/discord/dialogs/c;->xu:Lcom/discord/dialogs/c$a;
+    sget-object v0, Lcom/discord/dialogs/d;->xw:Lcom/discord/dialogs/d$a;
 
     iget-object v1, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$fragmentManager:Landroidx/fragment/app/FragmentManager;
 
@@ -83,7 +83,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
 
-    const v3, 0x7f120ebb
+    const v3, 0x7f120f3a
 
     invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -101,7 +101,7 @@
 
     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
+    invoke-static/range {v1 .. v8}, Lcom/discord/dialogs/d$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
 
diff --git a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
index efef69b2df..e75493be64 100644
--- a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
@@ -84,15 +84,15 @@
 
     new-instance v4, Lcom/discord/widgets/user/Badge;
 
-    const v7, 0x7f080353
+    const v7, 0x7f08035f
 
-    const v6, 0x7f06002c
+    const v6, 0x7f06002d
 
     invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v8
 
-    const v6, 0x7f1210d6
+    const v6, 0x7f12115d
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -129,15 +129,15 @@
 
     new-instance v4, Lcom/discord/widgets/user/Badge;
 
-    const v7, 0x7f080348
+    const v7, 0x7f080354
 
-    const v6, 0x7f06008c
+    const v6, 0x7f06008d
 
     invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v8
 
-    const v6, 0x7f120d38
+    const v6, 0x7f120d6b
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -174,15 +174,15 @@
 
     new-instance v4, Lcom/discord/widgets/user/Badge;
 
-    const v7, 0x7f080346
+    const v7, 0x7f080352
 
-    const v6, 0x7f060126
+    const v6, 0x7f060127
 
     invoke-static {v2, v6}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v8
 
-    const v6, 0x7f120940
+    const v6, 0x7f120975
 
     invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -215,7 +215,7 @@
 
     move-result v4
 
-    const v6, 0x7f120951
+    const v6, 0x7f120986
 
     const/4 v7, 0x0
 
@@ -237,25 +237,25 @@
 
     if-eqz v4, :cond_4
 
-    const v4, 0x7f0802c1
+    const v4, 0x7f0802cd
 
-    const v10, 0x7f0802c1
+    const v10, 0x7f0802cd
 
     goto :goto_1
 
     :cond_4
-    const v4, 0x7f0802c0
+    const v4, 0x7f0802cc
 
-    const v10, 0x7f0802c0
+    const v10, 0x7f0802cc
 
     :goto_1
-    const v4, 0x7f060084
+    const v4, 0x7f060085
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v4, 0x7f120948
+    const v4, 0x7f12097d
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -320,25 +320,25 @@
 
     if-eqz v4, :cond_7
 
-    const v4, 0x7f0802c3
+    const v4, 0x7f0802cf
 
-    const v10, 0x7f0802c3
+    const v10, 0x7f0802cf
 
     goto :goto_3
 
     :cond_7
-    const v4, 0x7f0802c2
+    const v4, 0x7f0802ce
 
-    const v10, 0x7f0802c2
+    const v10, 0x7f0802ce
 
     :goto_3
-    const v4, 0x7f060085
+    const v4, 0x7f060086
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v4, 0x7f120949
+    const v4, 0x7f12097e
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -352,7 +352,7 @@
 
     aput-object v4, v9, v7
 
-    const v4, 0x7f120951
+    const v4, 0x7f120986
 
     invoke-virtual {v2, v4, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -405,25 +405,25 @@
 
     if-eqz v1, :cond_a
 
-    const v1, 0x7f0802c5
+    const v1, 0x7f0802d1
 
-    const v10, 0x7f0802c5
+    const v10, 0x7f0802d1
 
     goto :goto_5
 
     :cond_a
-    const v1, 0x7f0802c4
+    const v1, 0x7f0802d0
 
-    const v10, 0x7f0802c4
+    const v10, 0x7f0802d0
 
     :goto_5
-    const v1, 0x7f060086
+    const v1, 0x7f060087
 
     invoke-static {v2, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v1, 0x7f12094a
+    const v1, 0x7f12097f
 
     invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -437,7 +437,7 @@
 
     aput-object v1, v9, v7
 
-    const v1, 0x7f120951
+    const v1, 0x7f120986
 
     invoke-virtual {v2, v1, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -472,15 +472,15 @@
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080345
+    const v10, 0x7f080351
 
-    const v4, 0x7f060105
+    const v4, 0x7f060106
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v4, 0x7f120356
+    const v4, 0x7f12037b
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -513,19 +513,19 @@
 
     move-result v1
 
-    const v4, 0x7f0402aa
+    const v4, 0x7f0402ab
 
     if-eqz v1, :cond_d
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080349
+    const v10, 0x7f080355
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
     move-result v11
 
-    const v5, 0x7f12055e
+    const v5, 0x7f120583
 
     invoke-virtual {v2, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -552,13 +552,13 @@
 
     move-result v1
 
-    const v5, 0x7f120e9c
+    const v5, 0x7f120f20
 
     if-eqz v1, :cond_e
 
     new-instance v1, Lcom/discord/widgets/user/Badge;
 
-    const v10, 0x7f080347
+    const v10, 0x7f080353
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -568,7 +568,7 @@
 
     move-result-object v12
 
-    const v9, 0x7f120dcc
+    const v9, 0x7f120e01
 
     new-array v13, v8, [Ljava/lang/Object;
 
@@ -615,9 +615,9 @@
 
     if-ltz v9, :cond_f
 
-    const v1, 0x7f080352
+    const v1, 0x7f08035e
 
-    const v10, 0x7f080352
+    const v10, 0x7f08035e
 
     goto/16 :goto_6
 
@@ -634,9 +634,9 @@
 
     if-ltz v9, :cond_10
 
-    const v1, 0x7f080351
+    const v1, 0x7f08035d
 
-    const v10, 0x7f080351
+    const v10, 0x7f08035d
 
     goto/16 :goto_6
 
@@ -653,9 +653,9 @@
 
     if-ltz v9, :cond_11
 
-    const v1, 0x7f080350
+    const v1, 0x7f08035c
 
-    const v10, 0x7f080350
+    const v10, 0x7f08035c
 
     goto :goto_6
 
@@ -672,9 +672,9 @@
 
     if-ltz v9, :cond_12
 
-    const v1, 0x7f08034f
+    const v1, 0x7f08035b
 
-    const v10, 0x7f08034f
+    const v10, 0x7f08035b
 
     goto :goto_6
 
@@ -691,9 +691,9 @@
 
     if-ltz v9, :cond_13
 
-    const v1, 0x7f08034e
+    const v1, 0x7f08035a
 
-    const v10, 0x7f08034e
+    const v10, 0x7f08035a
 
     goto :goto_6
 
@@ -710,9 +710,9 @@
 
     if-ltz v9, :cond_14
 
-    const v1, 0x7f08034d
+    const v1, 0x7f080359
 
-    const v10, 0x7f08034d
+    const v10, 0x7f080359
 
     goto :goto_6
 
@@ -727,9 +727,9 @@
 
     if-ltz v6, :cond_15
 
-    const v1, 0x7f08034c
+    const v1, 0x7f080358
 
-    const v10, 0x7f08034c
+    const v10, 0x7f080358
 
     goto :goto_6
 
@@ -746,9 +746,9 @@
 
     if-ltz v6, :cond_16
 
-    const v1, 0x7f08034b
+    const v1, 0x7f080357
 
-    const v10, 0x7f08034b
+    const v10, 0x7f080357
 
     goto :goto_6
 
@@ -759,9 +759,9 @@
 
     invoke-static {v1, v8}, Lkotlin/jvm/internal/l;->compare(II)I
 
-    const v1, 0x7f08034a
+    const v1, 0x7f080356
 
-    const v10, 0x7f08034a
+    const v10, 0x7f080356
 
     :goto_6
     new-instance v1, Lcom/discord/widgets/user/Badge;
@@ -774,7 +774,7 @@
 
     move-result-object v12
 
-    const v4, 0x7f120e5c
+    const v4, 0x7f120ecb
 
     new-array v5, v8, [Ljava/lang/Object;
 
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 b26c9d8d5f..1d3783c0fc 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, 0x7f1202a4
+    const v2, 0x7f1202a6
 
     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 d003b1b039..2f015f7eb9 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;->fe()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fh()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 b43d14e50f..d275cc36be 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, 0x7f0d00c4
+    const v0, 0x7f0d00ca
 
     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 d1ead879ac..751dc05c68 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, 0x7f120af3
+    const v2, 0x7f120b24
 
     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 72e21411b0..5ebebaa73d 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, 0x7f0a040b
+    const v0, 0x7f0a0413
 
     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, 0x7f0a0407
+    const v0, 0x7f0a040f
 
     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, 0x7f0a0409
+    const v0, 0x7f0a0411
 
     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, 0x7f0a0408
+    const v0, 0x7f0a0410
 
     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, 0x7f0a040a
+    const v0, 0x7f0a0412
 
     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, 0x7f0d013f
+    const v0, 0x7f0d0145
 
     return v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
index f1a404eb18..7f881bd7b1 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, 0x7f120ed9
+    const v1, 0x7f120f60
 
     invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String;
 
@@ -237,7 +237,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f10002e
+    const v5, 0x7f10002f
 
     iget v6, p1, Lcom/discord/widgets/user/WidgetPruneUsers$Model;->pruneCount:I
 
@@ -259,7 +259,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f10002d
+    const v5, 0x7f10002e
 
     new-array v6, v1, [Ljava/lang/Object;
 
@@ -275,7 +275,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
 
-    const v5, 0x7f1205f9
+    const v5, 0x7f12061d
 
     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;->fe()I
+    invoke-virtual {v0}, Lcom/discord/views/RadioManager;->fh()I
 
     move-result v0
 
@@ -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;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -461,7 +461,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015d
+    const v0, 0x7f0d0163
 
     return v0
 .end method
@@ -555,7 +555,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppDialog;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0557
+    const v0, 0x7f0a0562
 
     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, 0x7f0a0559
+    const v0, 0x7f0a0564
 
     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, 0x7f0a055d
+    const v0, 0x7f0a0568
 
     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, 0x7f0a0558
+    const v0, 0x7f0a0563
 
     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, 0x7f0a0556
+    const v0, 0x7f0a0561
 
     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, 0x7f0a055a
+    const v1, 0x7f0a0565
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -617,7 +617,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a055b
+    const v1, 0x7f0a0566
 
     invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -629,7 +629,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f0a055c
+    const v1, 0x7f0a0567
 
     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.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion.smali
index 31e2a02b81..45b14227ed 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
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 e3312bc8c3..5b9281adc8 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 2c163b580b..1beb195ebb 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, 0x7f0a079c
+    const v0, 0x7f0a07c0
 
     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, 0x7f0a079a
+    const v0, 0x7f0a07be
 
     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, 0x7f0a079b
+    const v0, 0x7f0a07bf
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -393,7 +393,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c6
+    const v0, 0x7f0d01d2
 
     return v0
 .end method
@@ -474,7 +474,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f1211a8
+    const v4, 0x7f121230
 
     new-array v3, v3, [Ljava/lang/Object;
 
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 77e1ef63d7..a4ecb40f7f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 749f727c58..f74d6e6aef 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, 0x7f0a0474
+    const p2, 0x7f0a047e
 
     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 cde8212b6e..a72c37aa31 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 66ac503af7..d6db4385a9 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 dc1e211e77..867eda7be7 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, 0x7f0a079d
+    const v0, 0x7f0a07c1
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -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, 0x7f0d01c5
+    const v0, 0x7f0d01d1
 
     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, 0x7f120f18
+    const p1, 0x7f120f9f
 
     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 b543c0d02b..dfae5ae19c 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$Model.smali
@@ -280,7 +280,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lrx/internal/a/ba;->JF()Lrx/internal/a/ba;
+    invoke-static {}, Lrx/internal/a/ba;->JI()Lrx/internal/a/ba;
 
     move-result-object v0
 
@@ -330,7 +330,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 a45e58e0b3..6688f93971 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
@@ -37,15 +37,15 @@
 
 # direct methods
 .method public constructor <init>(ILcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)V
-    .locals 0
+    .locals 1
 
     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/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07a9
+    const v0, 0x7f0a07cf
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
@@ -55,9 +55,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07af
+    const v0, 0x7f0a07d5
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
@@ -67,9 +67,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07ae
+    const v0, 0x7f0a07d4
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
@@ -79,9 +79,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07ad
+    const v0, 0x7f0a07d3
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
@@ -91,9 +91,9 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07aa
+    const v0, 0x7f0a07d0
 
-    invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+    invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
     move-result-object p1
 
@@ -101,25 +101,44 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->itemMutualServers:Landroid/view/ViewGroup;
 
-    sget-object p1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;->INSTANCE:Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$vQtTQy5BWUlCnjl0Et21pjHKzOI;
+    invoke-static {p2}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;->access$100(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)Lcom/discord/app/AppFragment;
 
-    const/4 p2, 0x0
+    move-result-object p1
 
-    new-array p2, p2, [Landroid/view/View;
+    invoke-virtual {p1}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
 
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;->setOnClickListener(Lrx/functions/Action3;[Landroid/view/View;)V
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE;
+
+    invoke-direct {p2, p1}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder$KotLNlPcAVBbHHO7-m9mz_CwblE;-><init>(Landroid/app/Activity;)V
+
+    const/4 p1, 0x0
+
+    new-array p1, p1, [Landroid/view/View;
+
+    invoke-virtual {p0, p2, p1}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$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/WidgetUserMutualFriends$Model$Item;)V
+.method static synthetic lambda$new$0(Landroid/app/Activity;Landroid/view/View;Ljava/lang/Integer;Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;)V
     .locals 0
 
-    invoke-virtual {p0}, Landroid/view/View;->getContext()Landroid/content/Context;
+    if-eqz p0, :cond_0
+
+    const/4 p2, -0x1
+
+    invoke-virtual {p0, p2}, Landroid/app/Activity;->setResult(I)V
+
+    invoke-virtual {p0}, Landroid/app/Activity;->finish()V
+
+    :cond_0
+    invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object p0
 
-    iget-object p1, p2, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;->user:Lcom/discord/models/domain/ModelUser;
+    iget-object p1, p3, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model$Item;->user:Lcom/discord/models/domain/ModelUser;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
 
@@ -186,7 +205,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0a07ac
+    const v2, 0x7f0a07d2
 
     invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -194,7 +213,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f0a07ab
+    const v3, 0x7f0a07d1
 
     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 691b1a0428..e560c23829 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -28,15 +28,29 @@
 .end annotation
 
 
+# instance fields
+.field private final fragment:Lcom/discord/app/AppFragment;
+
+
 # direct methods
-.method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
+.method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/app/AppFragment;)V
     .locals 0
 
     invoke-direct {p0, p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
 
+    iput-object p2, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;->fragment:Lcom/discord/app/AppFragment;
+
     return-void
 .end method
 
+.method static synthetic access$100(Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)Lcom/discord/app/AppFragment;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;->fragment:Lcom/discord/app/AppFragment;
+
+    return-object p0
+.end method
+
 
 # virtual methods
 .method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
@@ -71,7 +85,7 @@
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;
 
-    const p2, 0x7f0d01cd
+    const p2, 0x7f0d01d9
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter$ViewHolder;-><init>(ILcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;)V
 
@@ -87,11 +101,11 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;
 
-    const p2, 0x7f0d01cc
+    const p2, 0x7f0d01d8
 
     const v0, 0x7f0401f0
 
-    const v1, 0x7f120c2f
+    const v1, 0x7f120c61
 
     invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
index ce93bdd774..61bddedde0 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -12,6 +12,10 @@
 .end annotation
 
 
+# static fields
+.field private static EXTRA_SHOW_TOOLBAR:Ljava/lang/String; = "EXTRA_SHOW_TOOLBAR"
+
+
 # instance fields
 .field private adapter:Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
@@ -19,6 +23,12 @@
 
 
 # direct methods
+.method static constructor <clinit>()V
+    .locals 0
+
+    return-void
+.end method
+
 .method public constructor <init>()V
     .locals 0
 
@@ -45,10 +55,68 @@
     return-wide v0
 .end method
 
+.method public static show(Landroidx/fragment/app/Fragment;JI)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;
+
+    sget-object p1, Lcom/discord/widgets/user/WidgetUserMutualFriends;->EXTRA_SHOW_TOOLBAR:Ljava/lang/String;
+
+    const/4 p2, 0x1
+
+    invoke-virtual {v0, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
+
+    const-class p1, Lcom/discord/widgets/user/WidgetUserMutualFriends;
+
+    invoke-static {p0, p1, v0, p3}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+
+    return-void
+.end method
+
 
 # virtual methods
 .method public configureUI(Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;)V
-    .locals 1
+    .locals 5
+
+    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;->access$000(Lcom/discord/widgets/user/WidgetUserMutualFriends$Model;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    const v3, 0x7f1000c7
+
+    const v4, 0x7f120c13
+
+    invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->setActionBarTitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends;->adapter:Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
@@ -64,31 +132,61 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c7
+    const v0, 0x7f0d01d3
 
     return v0
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 1
+    .locals 3
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a079e
+    const v0, 0x7f0a07c3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
+    move-result-object v0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    const v1, 0x7f0a07c2
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
     move-result-object p1
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
+    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object p1
+
+    sget-object v1, Lcom/discord/widgets/user/WidgetUserMutualFriends;->EXTRA_SHOW_TOOLBAR:Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p1, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v2, 0x8
+
+    :goto_0
+    invoke-virtual {v0, v2}, Landroid/view/ViewGroup;->setVisibility(I)V
+
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualFriends;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    invoke-direct {p1, v0}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    invoke-direct {p1, v0, p0}, Lcom/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lcom/discord/app/AppFragment;)V
 
     invoke-static {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
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 6f7e033b4b..ebc6ccd234 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, 0x7f0a07b0
+    const v0, 0x7f0a07d6
 
     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, 0x7f0a07b3
+    const v0, 0x7f0a07d9
 
     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, 0x7f0a07b1
+    const v0, 0x7f0a07d7
 
     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, 0x7f0a07b2
+    const v0, 0x7f0a07d8
 
     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 8afda0800a..d69feb1b63 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, 0x7f0d01cf
+    const p2, 0x7f0d01db
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter$ViewHolder;-><init>(ILcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;)V
 
@@ -101,11 +101,11 @@
     :cond_1
     new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;
 
-    const p2, 0x7f0d01cc
+    const p2, 0x7f0d01d8
 
     const v0, 0x7f0401f1
 
-    const v1, 0x7f120c30
+    const v1, 0x7f120c62
 
     invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;-><init>(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
index 6f05898078..3440c18efc 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -12,6 +12,10 @@
 .end annotation
 
 
+# static fields
+.field private static EXTRA_SHOW_TOOLBAR:Ljava/lang/String; = "EXTRA_SHOW_TOOLBAR"
+
+
 # instance fields
 .field private adapter:Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;
 
@@ -19,6 +23,12 @@
 
 
 # direct methods
+.method static constructor <clinit>()V
+    .locals 0
+
+    return-void
+.end method
+
 .method public constructor <init>()V
     .locals 0
 
@@ -45,10 +55,68 @@
     return-wide v0
 .end method
 
+.method public static show(Landroidx/fragment/app/Fragment;JI)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;
+
+    sget-object p1, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->EXTRA_SHOW_TOOLBAR:Ljava/lang/String;
+
+    const/4 p2, 0x1
+
+    invoke-virtual {v0, p1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
+
+    const-class p1, Lcom/discord/widgets/user/WidgetUserMutualGuilds;
+
+    invoke-static {p0, p1, v0, p3}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;Ljava/lang/Class;Landroid/content/Intent;I)V
+
+    return-void
+.end method
+
 
 # virtual methods
 .method public configureUI(Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model;)V
-    .locals 1
+    .locals 5
+
+    invoke-static {p1}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model;->access$000(Lcom/discord/widgets/user/WidgetUserMutualGuilds$Model;)Ljava/util/List;
+
+    move-result-object v0
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->getResources()Landroid/content/res/Resources;
+
+    move-result-object v1
+
+    const/4 v2, 0x1
+
+    new-array v2, v2, [Ljava/lang/Object;
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    aput-object v3, v2, v4
+
+    const v3, 0x7f1000c8
+
+    const v4, 0x7f120c14
+
+    invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-virtual {p0, v0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->setActionBarTitle(Ljava/lang/CharSequence;)Lkotlin/Unit;
 
     iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->adapter:Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;
 
@@ -64,13 +132,13 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c8
+    const v0, 0x7f0d01d4
 
     return v0
 .end method
 
 .method public synthetic lambda$onViewBound$0$WidgetUserMutualGuilds()V
-    .locals 1
+    .locals 2
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->getActivity()Landroidx/fragment/app/FragmentActivity;
 
@@ -78,25 +146,33 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->getActivity()Landroidx/fragment/app/FragmentActivity;
+    const/4 v1, -0x1
 
-    move-result-object v0
+    invoke-virtual {v0, v1}, Landroid/app/Activity;->setResult(I)V
 
-    invoke-virtual {v0}, Landroidx/fragment/app/FragmentActivity;->finish()V
+    invoke-virtual {v0}, Landroid/app/Activity;->finish()V
 
     :cond_0
     return-void
 .end method
 
 .method public onViewBound(Landroid/view/View;)V
-    .locals 2
+    .locals 3
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a079f
+    const v0, 0x7f0a07c5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
+    move-result-object v0
+
+    check-cast v0, Landroid/view/ViewGroup;
+
+    const v1, 0x7f0a07c4
+
+    invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
+
     move-result-object p1
 
     check-cast p1, Landroidx/recyclerview/widget/RecyclerView;
@@ -105,13 +181,13 @@
 
     new-instance p1, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->recycler:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    new-instance v1, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;
+    new-instance v2, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;
 
-    invoke-direct {v1, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;-><init>(Lcom/discord/widgets/user/WidgetUserMutualGuilds;)V
+    invoke-direct {v2, p0}, Lcom/discord/widgets/user/-$$Lambda$WidgetUserMutualGuilds$0gG6wkTTmOf0AO_Epar-aK7PWQQ;-><init>(Lcom/discord/widgets/user/WidgetUserMutualGuilds;)V
 
-    invoke-direct {p1, v0, v1}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lrx/functions/Action0;)V
+    invoke-direct {p1, v1, v2}, Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;-><init>(Landroidx/recyclerview/widget/RecyclerView;Lrx/functions/Action0;)V
 
     invoke-static {p1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->configure(Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
 
@@ -121,6 +197,28 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->adapter:Lcom/discord/widgets/user/WidgetUserMutualGuilds$Adapter;
 
+    invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->getMostRecentIntent()Landroid/content/Intent;
+
+    move-result-object p1
+
+    sget-object v1, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->EXTRA_SHOW_TOOLBAR:Ljava/lang/String;
+
+    const/4 v2, 0x0
+
+    invoke-virtual {p1, v1, v2}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/16 v2, 0x8
+
+    :goto_0
+    invoke-virtual {v0, v2}, Landroid/view/ViewGroup;->setVisibility(I)V
+
     return-void
 .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 5a54be8a75..50a0907a7b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 31d99b1e11..8afd63562b 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, 0x7f0a07f2
+    const v0, 0x7f0a0821
 
     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, 0x7f0a07f0
+    const v0, 0x7f0a081f
 
     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, 0x7f0a07ef
+    const v0, 0x7f0a081e
 
     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, 0x7f0a07f1
+    const v0, 0x7f0a0820
 
     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, 0x7f0a07ec
+    const v0, 0x7f0a081b
 
     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, 0x7f0a07ee
+    const p2, 0x7f0a081d
 
     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, 0x7f0a07ed
+    const p2, 0x7f0a081c
 
     if-eqz p4, :cond_0
 
@@ -405,7 +405,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d3
+    const v0, 0x7f0d01df
 
     return v0
 .end method
@@ -433,9 +433,9 @@
 
     move-result-object v2
 
-    const v3, 0x7f08037f
+    const v3, 0x7f08038b
 
-    const v4, 0x7f1210e5
+    const v4, 0x7f12116c
 
     const/4 v5, 0x0
 
@@ -463,9 +463,9 @@
 
     move-result-object v1
 
-    const v2, 0x7f08037d
+    const v2, 0x7f080389
 
-    const v3, 0x7f1210e1
+    const v3, 0x7f121168
 
     const/4 v4, 0x0
 
@@ -493,15 +493,15 @@
 
     move-result-object p1
 
-    const p2, 0x7f1210e0
+    const p2, 0x7f121167
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    const v0, 0x7f08037c
+    const v0, 0x7f080388
 
-    const v1, 0x7f1210df
+    const v1, 0x7f121166
 
     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, 0x7f1210e3
+    const p2, 0x7f12116a
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    const v0, 0x7f08037e
+    const v0, 0x7f08038a
 
-    const v1, 0x7f1210e2
+    const v1, 0x7f121169
 
     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 1cc13af8ad..4c8e15e0aa 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, 0x7f12132f
+    const v0, 0x7f1213bb
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -55,7 +55,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f121337
+    const v0, 0x7f1213c3
 
     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, 0x7f0d01bf
+    const v0, 0x7f0d01cb
 
     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 a6c33405cb..8a49a9e2ab 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1e9068c670..9008e5be73 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, 0x7f0a0471
+    const p2, 0x7f0a0479
 
     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 941f74598b..b76d8b2947 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerifyBase.smali
@@ -213,7 +213,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -472,7 +472,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     new-instance p1, Ljava/lang/StringBuilder;
 
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 abfaa7badb..80df29c481 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 3680591ca3..a11a06e229 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 7ed4c699d8..531ad87879 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, 0x7f0a078c
+    const v0, 0x7f0a07b0
 
     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, 0x7f0a078e
+    const v0, 0x7f0a07b2
 
     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, 0x7f0a078b
+    const v0, 0x7f0a07af
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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, 0x7f0d01c0
+    const v0, 0x7f0d01cc
 
     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 a9e8e197bf..ffabf280e4 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 962f84a82e..58dace4539 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 bf13117198..c4f9a46d1d 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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 
@@ -398,7 +398,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c1
+    const v0, 0x7f0d01cd
 
     return v0
 .end method
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 a152a74cef..b2edc88249 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, 0x7f121331
+    const p1, 0x7f1213bd
 
     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, 0x7f0d01c2
+    const v0, 0x7f0d01ce
 
     return v0
 .end method
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 4cedc39107..0b474a80da 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, 0x7f0d01c9
+    const v0, 0x7f0d01d5
 
     return v0
 .end method
@@ -511,7 +511,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07a4
+    const v0, 0x7f0a07ca
 
     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, 0x7f0a07a1
+    const v0, 0x7f0a07c7
 
     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, 0x7f0a07a3
+    const v0, 0x7f0a07c9
 
     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, 0x7f0a07a2
+    const v0, 0x7f0a07c8
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     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 f1d009e9b6..68b0d1975d 100644
--- a/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/phone/WidgetUserPhoneVerify.smali
@@ -189,7 +189,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01ca
+    const v0, 0x7f0d01d6
 
     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, 0x7f0a07a6
+    const v0, 0x7f0a07cc
 
     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, 0x7f0a07a5
+    const v0, 0x7f0a07cb
 
     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, 0x7f0a0277
+    const v0, 0x7f0a027a
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -303,7 +303,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/phone/WidgetUserPhoneVerify;->digitVerificationView:Lcom/discord/views/DigitVerificationView;
 
-    iget-object p1, p1, Lcom/discord/views/DigitVerificationView;->CR:Ljava/util/List;
+    iget-object p1, p1, Lcom/discord/views/DigitVerificationView;->CS:Ljava/util/List;
 
     if-nez p1, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
index f5de2ea8f0..94716dd7cb 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
@@ -59,7 +59,7 @@
 
     if-eqz v2, :cond_0
 
-    const v3, 0x7f12129c
+    const v3, 0x7f121324
 
     const/4 v4, 0x2
 
@@ -259,10 +259,27 @@
     throw p1
 .end method
 
-.method public final configureUi(Lcom/discord/widgets/user/presence/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/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    const-string v0, "appPermissions"
+
+    invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
index 3fcd484148..b9472ef61e 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
index 5540f88e4e..788547494d 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
index b8fd07b7f3..79d65187ae 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
index 8f9a4c07e3..c7c109a511 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$4.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
index 97168a3544..96f780441f 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
@@ -33,7 +33,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0570
+    const v0, 0x7f0a0585
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0571
+    const v0, 0x7f0a0586
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0573
+    const v0, 0x7f0a0588
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a056f
+    const v0, 0x7f0a0584
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -79,7 +79,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a056e
+    const v0, 0x7f0a0583
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -94,18 +94,35 @@
 
 
 # virtual methods
-.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-    .locals 11
+.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 p6, "appPermissions"
+
+    invoke-static {p5, p6}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->disposeTimer()V
 
-    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+    iget-object p5, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {p5}, Landroid/view/View;->getContext()Landroid/content/Context;
 
-    move-result-object v0
+    move-result-object p5
 
-    const/4 v1, 0x0
+    const/4 p6, 0x0
 
     if-eqz p1, :cond_0
 
@@ -116,304 +133,304 @@
     goto :goto_0
 
     :cond_0
-    move-object p1, v1
+    move-object p1, p6
 
     :goto_0
     if-eqz p1, :cond_7
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->isRichPresence()Z
 
-    move-result v2
+    move-result v0
 
-    if-nez v2, :cond_1
+    if-nez v0, :cond_1
 
     goto/16 :goto_4
 
     :cond_1
-    iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
+    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->containerView:Landroid/view/View;
 
-    const/4 v3, 0x0
+    const/4 v1, 0x0
 
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
+    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 v2
+    move-result-object v0
 
-    const/4 v4, 0x1
+    const/4 v2, 0x1
 
-    const-string v5, "spotify"
+    const-string v3, "spotify"
 
-    invoke-static {v2, v5, v4}, Lkotlin/text/l;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
+    invoke-static {v0, v3, v2}, Lkotlin/text/l;->equals(Ljava/lang/String;Ljava/lang/String;Z)Z
 
-    move-result v2
+    move-result v0
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getState()Ljava/lang/String;
 
-    move-result-object v5
+    move-result-object v3
 
-    if-eqz v5, :cond_2
+    if-eqz v3, :cond_2
 
-    const/16 v6, 0x3b
+    const/16 v4, 0x3b
 
-    const/16 v7, 0x2c
+    const/16 v5, 0x2c
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x4
 
     const/4 v8, 0x0
 
-    const/4 v9, 0x4
+    invoke-static/range {v3 .. v8}, Lkotlin/text/l;->replace$default(Ljava/lang/String;CCZILjava/lang/Object;)Ljava/lang/String;
 
-    const/4 v10, 0x0
-
-    invoke-static/range {v5 .. v10}, Lkotlin/text/l;->replace$default(Ljava/lang/String;CCZILjava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v5
+    move-result-object v3
 
     goto :goto_1
 
     :cond_2
-    move-object v5, v1
+    move-object v3, p6
 
     :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v6
+    move-result-object v4
 
-    const-string v7, "headerTv"
+    const-string v5, "headerTv"
 
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v8
-
-    invoke-static {v8, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v8}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
-    move-result-object v7
-
-    const-string v8, "headerTv.context"
-
-    invoke-static {v7, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {v7, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
-
-    move-result-object v7
-
-    invoke-virtual {v6, v7}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getSmallIv()Landroid/widget/ImageView;
-
     move-result-object v6
 
-    const-string v7, "smallIv"
+    invoke-static {v6, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast v6, Landroid/view/View;
-
-    const/4 v7, 0x2
-
-    invoke-static {v6, v3, v3, v7, v1}, 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 v6
-
-    const-string v8, "titleTv"
-
-    invoke-static {v6, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getDetails()Ljava/lang/String;
-
-    move-result-object v8
-
-    check-cast v8, Ljava/lang/CharSequence;
-
-    invoke-virtual {v6, v8}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getDetailsTv()Landroid/widget/TextView;
-
-    move-result-object v6
-
-    const-string v8, "detailsTv"
-
-    invoke-static {v6, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const v8, 0x7f121296
-
-    new-array v9, v4, [Ljava/lang/Object;
-
-    aput-object v5, v9, v3
-
-    invoke-virtual {v0, v8, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {v6}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
     move-result-object v5
 
-    check-cast v5, Ljava/lang/CharSequence;
-
-    invoke-static {v6, v5}, 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 v5
-
-    const-string v6, "timeTv"
+    const-string v6, "headerTv.context"
 
     invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f121295
+    invoke-static {v5, p1}, Lcom/discord/utilities/presence/PresenceUtils;->getActivityHeader(Landroid/content/Context;Lcom/discord/models/domain/ModelPresence$Activity;)Ljava/lang/CharSequence;
 
-    new-array v8, v4, [Ljava/lang/Object;
+    move-result-object v5
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getAssets()Lcom/discord/models/domain/ModelPresence$Assets;
+    invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    move-result-object v9
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getSmallIv()Landroid/widget/ImageView;
 
-    if-eqz v9, :cond_3
+    move-result-object v4
 
-    invoke-virtual {v9}, Lcom/discord/models/domain/ModelPresence$Assets;->getLargeText()Ljava/lang/String;
+    const-string v5, "smallIv"
 
-    move-result-object v9
+    invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    goto :goto_2
+    check-cast v4, Landroid/view/View;
 
-    :cond_3
-    move-object v9, v1
+    const/4 v5, 0x2
 
-    :goto_2
-    aput-object v9, v8, v3
+    invoke-static {v4, v1, v1, v5, p6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
 
-    invoke-virtual {v0, v6, v8}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getTitleTv()Landroid/widget/TextView;
+
+    move-result-object v4
+
+    const-string v6, "titleTv"
+
+    invoke-static {v4, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getDetails()Ljava/lang/String;
 
     move-result-object v6
 
     check-cast v6, Ljava/lang/CharSequence;
 
-    invoke-static {v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V
+    invoke-virtual {v4, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->getDetailsTv()Landroid/widget/TextView;
+
+    move-result-object v4
+
+    const-string v6, "detailsTv"
+
+    invoke-static {v4, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v6, 0x7f12131e
+
+    new-array v7, v2, [Ljava/lang/Object;
+
+    aput-object v3, v7, v1
+
+    invoke-virtual {p5, v6, v7}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v3
+
+    check-cast v3, Ljava/lang/CharSequence;
+
+    invoke-static {v4, v3}, 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 v3
+
+    const-string v4, "timeTv"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v4, 0x7f12131d
+
+    new-array v6, v2, [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, v6, v1
+
+    invoke-virtual {p5, v4, v6}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v4
+
+    check-cast v4, Ljava/lang/CharSequence;
+
+    invoke-static {v3, v4}, 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 v5
+    move-result-object v3
 
-    const-string v6, "textContainer"
+    const-string v4, "textContainer"
 
-    invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v5, v4}, Landroid/view/View;->setSelected(Z)V
+    invoke-virtual {v3, v2}, 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 v5, "playButton"
+    const-string v3, "playButton"
 
-    invoke-static {p2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p2, v2, v3, v7, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v0, v1, v5, 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 v6, "musicSuperBar"
+    const-string v4, "musicSuperBar"
 
-    invoke-static {p2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/View;
 
-    invoke-static {p2, v2, v3, v7, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v0, v1, v5, 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 v6, "musicDuration"
+    const-string v4, "musicDuration"
 
-    invoke-static {p2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/View;
 
-    invoke-static {p2, v2, v3, v7, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v0, v1, v5, 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 v6, "musicElapsed"
+    const-string v4, "musicElapsed"
 
-    invoke-static {p2, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast p2, Landroid/view/View;
 
-    invoke-static {p2, v2, v3, v7, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    invoke-static {p2, v0, v1, v5, 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 v1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+    iget-object p6, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
 
-    invoke-static {v1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f12127c
+    const p2, 0x7f121304
 
-    invoke-virtual {v0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+    invoke-virtual {p5, 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
+    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, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v3}, Landroid/view/View;->setEnabled(Z)V
+    invoke-virtual {p2, v1}, Landroid/view/View;->setEnabled(Z)V
 
     goto :goto_3
 
     :cond_4
-    iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
+    iget-object p6, p0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;->playButtonText:Landroid/widget/TextView;
 
-    invoke-static {v1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p6, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121299
+    const p2, 0x7f121321
 
-    new-array v2, v4, [Ljava/lang/Object;
+    new-array v0, v2, [Ljava/lang/Object;
 
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
 
-    move-result-object v6
+    move-result-object v4
 
-    if-nez v6, :cond_5
+    if-nez v4, :cond_5
 
-    const/16 v6, 0x3f
+    const/16 v4, 0x3f
 
-    invoke-static {v6}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
+    invoke-static {v4}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
 
-    move-result-object v6
+    move-result-object v4
 
     :cond_5
-    aput-object v6, v2, v3
+    aput-object v4, v0, v1
 
-    invoke-virtual {v0, p2, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    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 {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    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, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v4}, Landroid/view/View;->setEnabled(Z)V
+    invoke-virtual {p2, v2}, 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"
+    const-string p6, "context"
 
-    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p5, p6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p2, v0}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
+    invoke-virtual {p2, p5}, Lcom/discord/utilities/integrations/SpotifyHelper;->isSpotifyInstalled(Landroid/content/Context;)Z
 
     move-result p2
 
@@ -423,35 +440,35 @@
 
     move-result-object p2
 
-    new-instance v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;
+    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p5, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$1;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
 
-    check-cast v0, Landroid/view/View$OnClickListener;
+    check-cast p5, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, v0}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    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 v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;
+    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;
 
-    invoke-direct {v0, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
+    invoke-direct {p5, p1}, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$2;-><init>(Lcom/discord/models/domain/ModelPresence$Activity;)V
 
-    check-cast v0, Landroid/view/View$OnClickListener;
+    check-cast p5, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    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 v0, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;
+    new-instance p5, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence$configureUi$3;
 
-    invoke-direct {v0, 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
+    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 v0, Landroid/view/View$OnClickListener;
+    check-cast p5, Landroid/view/View$OnClickListener;
 
-    invoke-virtual {p2, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {p2, p5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     return-void
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
index d59b5bbe09..3f27166503 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
index dc4a92b184..38b744af78 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
index b53a5b639c..48c485c29a 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$3;->invoke(Ljava/lang/Boolean;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
index d45ec25db0..4d2459da5c 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->configureUi(Lcom/discord/widgets/user/presence/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;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
index e40f4103c9..68ad9776d2 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
@@ -29,7 +29,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0570
+    const v0, 0x7f0a0585
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -39,7 +39,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a0571
+    const v0, 0x7f0a0586
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -237,8 +237,25 @@
 
 
 # virtual methods
-.method public final configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
-    .locals 10
+.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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->disposeSubscriptions()V
 
@@ -260,97 +277,97 @@
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isGamePlatform()Z
 
-    move-result v0
+    move-result p5
 
-    if-nez v0, :cond_1
+    if-nez p5, :cond_1
 
     goto/16 :goto_3
 
     :cond_1
-    iget-object v0, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
+    iget-object p5, p0, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->containerView:Landroid/view/View;
 
-    const/4 v1, 0x0
+    const/4 p6, 0x0
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {p5, p6}, Landroid/view/View;->setVisibility(I)V
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->isXboxActivity()Z
 
-    move-result v0
+    move-result p5
 
-    if-eqz v0, :cond_2
+    if-eqz p5, :cond_2
 
-    sget-object v0, Lcom/discord/utilities/platform/Platform;->XBOX:Lcom/discord/utilities/platform/Platform;
+    sget-object p5, 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;
+    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 v2
+    move-result-object v0
 
-    if-nez v2, :cond_3
+    if-nez v0, :cond_3
 
-    const-string v2, ""
+    const-string v0, ""
 
     :cond_3
-    invoke-virtual {v0, v2}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
+    invoke-virtual {p5, v0}, Lcom/discord/utilities/platform/Platform$Companion;->from(Ljava/lang/String;)Lcom/discord/utilities/platform/Platform;
 
-    move-result-object v0
+    move-result-object p5
 
     :goto_1
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v2
+    move-result-object v0
 
-    const-string v3, "headerTv"
+    const-string v1, "headerTv"
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;->getHeaderTv()Landroid/widget/TextView;
 
-    move-result-object v4
+    move-result-object v2
 
-    invoke-static {v4, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v4}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+    invoke-virtual {v2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v3
+    move-result-object v1
 
-    const-string v4, "headerTv.context"
+    const-string v2, "headerTv.context"
 
-    invoke-static {v3, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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;
+    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 v3
+    move-result-object v1
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    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 v2
+    move-result-object v0
 
-    const-string v3, "titleTv"
+    const-string v1, "titleTv"
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getName()Ljava/lang/String;
 
-    move-result-object v3
+    move-result-object v1
 
-    check-cast v3, Ljava/lang/CharSequence;
+    check-cast v1, Ljava/lang/CharSequence;
 
-    invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    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 v2
+    move-result-object v0
 
-    const-string v3, "timeTv"
+    const-string v1, "timeTv"
 
-    invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p4}, Lcom/discord/models/domain/ModelPresence$Activity;->getTimestamps()Lcom/discord/models/domain/ModelPresence$Timestamps;
 
@@ -368,33 +385,33 @@
     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-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 v2, "textContainer"
+    const-string v0, "textContainer"
 
-    invoke-static {p4, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const/4 v2, 0x1
+    const/4 v0, 0x1
 
-    invoke-virtual {p4, v2}, Landroid/view/View;->setSelected(Z)V
+    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 v3, "connectButton"
+    const-string v1, "connectButton"
 
-    invoke-static {p4, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
+    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
 
-    move-result v3
+    move-result v1
 
-    const/4 v4, 0x2
+    const/4 v2, 0x2
 
-    invoke-static {p4, v3, v1, v4, p3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+    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;
 
@@ -408,17 +425,17 @@
 
     move-result-object p4
 
-    const v3, 0x7f121280
+    const v1, 0x7f121308
 
-    new-array v2, v2, [Ljava/lang/Object;
+    new-array v0, v0, [Ljava/lang/Object;
 
-    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
+    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String;
 
-    move-result-object v4
+    move-result-object v2
 
-    aput-object v4, v2, v1
+    aput-object v2, v0, p6
 
-    invoke-virtual {p4, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+    invoke-virtual {p4, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
     move-result-object p4
 
@@ -426,7 +443,7 @@
 
     invoke-virtual {p3, p4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
+    invoke-virtual {p5}, Lcom/discord/utilities/platform/Platform;->getEnabled()Z
 
     move-result p3
 
@@ -444,7 +461,7 @@
 
     new-instance p4, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;
 
-    invoke-direct {p4, v0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$1;-><init>(Lcom/discord/utilities/platform/Platform;)V
+    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;
 
@@ -452,7 +469,7 @@
 
     move-result-object p3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p4
 
@@ -466,13 +483,13 @@
 
     invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable;
 
-    move-result-object v1
+    move-result-object v0
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
-    move-result-object v2
+    move-result-object v1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     new-instance p3, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;
 
@@ -480,40 +497,40 @@
 
     invoke-direct {p3, p4}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$2;-><init>(Lrx/subscriptions/CompositeSubscription;)V
 
-    move-object v4, p3
+    move-object v3, p3
 
-    check-cast v4, Lkotlin/jvm/functions/Function1;
+    check-cast v3, Lkotlin/jvm/functions/Function1;
+
+    const/4 v4, 0x0
 
     const/4 v5, 0x0
 
-    const/4 v6, 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 v7, p3
+    move-object v6, p3
 
-    check-cast v7, Lkotlin/jvm/functions/Function1;
+    check-cast v6, Lkotlin/jvm/functions/Function1;
 
-    const/16 v8, 0x1a
+    const/16 v7, 0x1a
 
-    const/4 v9, 0x0
+    const/4 v8, 0x0
 
-    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+    invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     iget-object 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, v0}, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence$configureUi$4;-><init>(Lcom/discord/utilities/platform/Platform;)V
+    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, v0, 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
+    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
 
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..4bbf776d81
--- /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/l;->checkExpressionValueIsNotNull(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..f2e6ebd1b4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1.smali
@@ -0,0 +1,74 @@
+.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/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;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;->$streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$appPermissions:Lcom/discord/app/AppPermissions;
+
+    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
+
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;->$streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    invoke-virtual {p1}, Lcom/discord/utilities/streams/StreamContext;->getCanJoinChannel()Z
+
+    move-result p1
+
+    if-nez p1, :cond_0
+
+    return-void
+
+    :cond_0
+    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/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
index c1bf85b5a3..cf6e07eb20 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1.smali
@@ -60,7 +60,7 @@
 
     iget-object p2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$streamPreviewControllerListener$1;->this$0:Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    const v0, 0x7f121104
+    const v0, 0x7f121189
 
     invoke-virtual {p2, v0}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
index f292df023c..43df43c8d9 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
@@ -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
@@ -42,7 +44,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a072e
+    const v0, 0x7f0a0752
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -52,7 +54,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a072f
+    const v0, 0x7f0a0753
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -64,7 +66,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
 
-    const v0, 0x7f0a072d
+    const v0, 0x7f0a0751
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -74,6 +76,20 @@
 
     iput-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->streamPreviewIv:Lcom/facebook/drawee/view/SimpleDraweeView;
 
+    iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+
+    const v0, 0x7f0a058b
+
+    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/l;->checkExpressionValueIsNotNull(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
@@ -83,6 +99,14 @@
     return-void
 .end method
 
+.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/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View;
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$getStreamPreviewPlaceholder$p(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;)Landroid/view/View;
     .locals 0
 
@@ -125,7 +149,7 @@
 
     if-eqz v1, :cond_1
 
-    const v0, 0x7f12129c
+    const v0, 0x7f121324
 
     const/4 v2, 0x2
 
@@ -235,7 +259,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121106
+    const p2, 0x7f12118b
 
     invoke-virtual {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
@@ -245,7 +269,7 @@
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -262,7 +286,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object p2
 
@@ -276,7 +300,7 @@
 
     move-result-object v0
 
-    iput-object v0, p2, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object v0, p2, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     check-cast p2, Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -292,11 +316,11 @@
 
     check-cast p2, Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-object p2, p1, Lcom/facebook/drawee/controller/a;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p2, p1, Lcom/facebook/drawee/controller/a;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object p1
 
@@ -312,7 +336,7 @@
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     goto :goto_0
 
@@ -321,7 +345,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const p2, 0x7f121104
+    const p2, 0x7f121189
 
     invoke-virtual {p0, p2}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->getString(I)Ljava/lang/String;
 
@@ -331,7 +355,7 @@
 
     invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :goto_0
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
@@ -395,7 +419,7 @@
 
     if-eqz v1, :cond_0
 
-    const v5, 0x7f12128b
+    const v5, 0x7f121313
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -544,3 +568,54 @@
 
     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/l;->checkParameterIsNotNull(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
+    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, p1, p2, p3}, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence$configureWatchButton$1;-><init>(Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;Lcom/discord/utilities/streams/StreamContext;Lcom/discord/app/AppPermissions;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 p2, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->watchStreamButton:Landroid/view/View;
+
+    invoke-virtual {p1}, Lcom/discord/utilities/streams/StreamContext;->getCanJoinChannel()Z
+
+    move-result p1
+
+    const/4 p3, 0x0
+
+    const/4 v0, 0x2
+
+    const/4 v1, 0x0
+
+    invoke-static {p2, p1, p3, v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setEnabledAlpha$default(Landroid/view/View;ZFILjava/lang/Object;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
index 2681d02a88..14db6a36bd 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence$Companion.smali
@@ -46,7 +46,7 @@
 
     const-string v2, "inflater.inflate(R.layou\u2026er_rich_presence, parent)"
 
-    const v3, 0x7f0d01d1
+    const v3, 0x7f0d01dd
 
     if-eq p2, v1, :cond_3
 
@@ -81,7 +81,7 @@
     :cond_0
     new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;
 
-    const v1, 0x7f0d01b9
+    const v1, 0x7f0d01c5
 
     invoke-virtual {v0, v1, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -100,7 +100,7 @@
     :cond_1
     new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderPlatformRichPresence;
 
-    const v1, 0x7f0d0159
+    const v1, 0x7f0d015f
 
     invoke-virtual {v0, v1, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -119,7 +119,7 @@
     :cond_2
     new-instance p2, Lcom/discord/widgets/user/presence/ViewHolderMusicRichPresence;
 
-    const v1, 0x7f0d014f
+    const v1, 0x7f0d0155
 
     invoke-virtual {v0, v1, p1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View;
 
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
index b15f4b878b..105b68fe86 100644
--- 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
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$1;->invoke(Lrx/Subscription;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index d306938a16..ec3495c70a 100644
--- 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
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence$configureUiTimestamp$2;->invoke(Ljava/lang/Long;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
index 1ec507666f..5f00937773 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
@@ -79,7 +79,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a056c
+    const p2, 0x7f0a0581
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -91,7 +91,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a056d
+    const p2, 0x7f0a0582
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -103,7 +103,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a056b
+    const p2, 0x7f0a0580
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -115,7 +115,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0575
+    const p2, 0x7f0a058a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -127,7 +127,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a056a
+    const p2, 0x7f0a057f
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -139,7 +139,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0574
+    const p2, 0x7f0a0589
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -151,7 +151,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0572
+    const p2, 0x7f0a0587
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -163,7 +163,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View;
 
-    const p2, 0x7f0a0569
+    const p2, 0x7f0a057e
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -205,6 +205,46 @@
     return-void
 .end method
 
+.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
 
@@ -433,7 +473,7 @@
 
     if-eqz v2, :cond_1
 
-    const v3, 0x7f12129c
+    const v3, 0x7f121324
 
     const/4 v4, 0x2
 
@@ -622,8 +662,51 @@
     return-void
 .end method
 
-.method public configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+.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
+
+    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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->disposeTimer()V
 
@@ -670,6 +753,8 @@
 
     invoke-virtual {p3, p4}, Landroid/view/View;->setSelected(Z)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
@@ -779,6 +864,26 @@
     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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
+
 .method public disposeSubscriptions()V
     .locals 0
 
@@ -831,7 +936,7 @@
 
     move-result-wide v8
 
-    const p1, 0x7f12129e
+    const p1, 0x7f121326
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
@@ -862,7 +967,7 @@
 
     move-result-wide v8
 
-    const p1, 0x7f1212a0
+    const p1, 0x7f121328
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali
index 71cc148391..9428d23066 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali
@@ -119,7 +119,7 @@
 
     invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const v0, 0x7f0a0787
+    const v0, 0x7f0a07ab
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -127,7 +127,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->avatarSimpleDraweeView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a078a
+    const v0, 0x7f0a07ae
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -135,7 +135,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserAvatarPresenceView;->presencePadding$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0789
+    const v0, 0x7f0a07ad
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -153,7 +153,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d00ad
+    const v1, 0x7f0d00b3
 
     invoke-static {p1, v1, v0}, Landroid/widget/RelativeLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -167,7 +167,7 @@
 
     check-cast p2, Landroid/view/View;
 
-    const v0, 0x7f0402bb
+    const v0, 0x7f0402bc
 
     invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
index 9b1b538111..ba8f95a9c5 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
@@ -189,7 +189,7 @@
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a07b6
+    const p2, 0x7f0a07dc
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -197,7 +197,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->editMemberButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07b7
+    const p2, 0x7f0a07dd
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -205,7 +205,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->kickButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07b5
+    const p2, 0x7f0a07db
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -213,7 +213,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->banButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07ba
+    const p2, 0x7f0a07e0
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +221,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverMuteButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07b8
+    const p2, 0x7f0a07de
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +229,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileAdminView;->serverDeafenButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07b9
+    const p2, 0x7f0a07df
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -241,7 +241,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d0069
+    const v0, 0x7f0d006c
 
     invoke-static {p1, v0, p2}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -591,12 +591,12 @@
 
     if-eqz v0, :cond_0
 
-    const v0, 0x7f120f33
+    const v0, 0x7f120fba
 
     goto :goto_0
 
     :cond_0
-    const v0, 0x7f120aee
+    const v0, 0x7f120b1f
 
     :goto_0
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getKickButton()Landroid/widget/TextView;
@@ -635,26 +635,26 @@
 
     if-eqz v0, :cond_1
 
-    const v1, 0x7f0802f1
+    const v1, 0x7f0802fd
 
-    const v6, 0x7f0802f1
+    const v6, 0x7f0802fd
 
     goto :goto_1
 
     :cond_1
-    const v1, 0x7f0802f4
+    const v1, 0x7f080300
 
-    const v6, 0x7f0802f4
+    const v6, 0x7f080300
 
     :goto_1
     if-eqz v0, :cond_2
 
-    const v0, 0x7f121059
+    const v0, 0x7f1210e0
 
     goto :goto_2
 
     :cond_2
-    const v0, 0x7f12104b
+    const v0, 0x7f1210d2
 
     :goto_2
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerMuteButton()Landroid/widget/TextView;
@@ -697,26 +697,26 @@
 
     if-eqz v0, :cond_3
 
-    const v1, 0x7f0802ae
+    const v1, 0x7f0802ba
 
-    const v6, 0x7f0802ae
+    const v6, 0x7f0802ba
 
     goto :goto_3
 
     :cond_3
-    const v1, 0x7f0802b4
+    const v1, 0x7f0802c0
 
-    const v6, 0x7f0802b4
+    const v6, 0x7f0802c0
 
     :goto_3
     if-eqz v0, :cond_4
 
-    const v0, 0x7f121058
+    const v0, 0x7f1210df
 
     goto :goto_4
 
     :cond_4
-    const v0, 0x7f121040
+    const v0, 0x7f1210c7
 
     :goto_4
     invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerDeafenButton()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali
new file mode 100644
index 0000000000..55e6ef2ad5
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem.smali
@@ -0,0 +1,188 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+.super Ljava/lang/Object;
+.source "UserProfileConnectionsView.kt"
+
+# interfaces
+.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ConnectedAccountItem"
+.end annotation
+
+
+# instance fields
+.field private final connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
+    .locals 1
+
+    const-string v0, "connectedAccount"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;Lcom/discord/models/domain/ModelConnectedAccount;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->copy(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/models/domain/ModelConnectedAccount;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+    .locals 1
+
+    const-string v0, "connectedAccount"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
+
+    return-object v0
+.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/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    return-object v0
+.end method
+
+.method public final getKey()Ljava/lang/String;
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelConnectedAccount;->getId()Ljava/lang/String;
+
+    move-result-object v0
+
+    const-string v1, "connectedAccount.id"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-object v0
+.end method
+
+.method public final getType()I
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    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, "ConnectedAccountItem(connectedAccount="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->connectedAccount:Lcom/discord/models/domain/ModelConnectedAccount;
+
+    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/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali
new file mode 100644
index 0000000000..4159fd21b8
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1.smali
@@ -0,0 +1,89 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;
+.super Lkotlin/jvm/internal/m;
+.source "UserProfileConnectionsView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;-><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/m;",
+        "Lkotlin/jvm/functions/Function3<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/String;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x3
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><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;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    check-cast p3, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;->invoke(Ljava/lang/String;ILjava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/String;ILjava/lang/String;)V
+    .locals 0
+
+    const-string p2, "<anonymous parameter 0>"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali
new file mode 100644
index 0000000000..20afc7d8ff
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter.smali
@@ -0,0 +1,148 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+.super Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;
+.source "UserProfileConnectionsView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "ConnectedAccountsAdapter"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<",
+        "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field private onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/functions/Function3<",
+            "-",
+            "Ljava/lang/String;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/String;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method public constructor <init>(Landroidx/recyclerview/widget/RecyclerView;)V
+    .locals 1
+
+    const-string v0, "recyclerView"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;->INSTANCE:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter$onConnectedAccountClick$1;
+
+    check-cast p1, Lkotlin/jvm/functions/Function3;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final getOnConnectedAccountClick()Lkotlin/jvm/functions/Function3;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lkotlin/jvm/functions/Function3<",
+            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
+            "Lkotlin/Unit;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+
+    return-object v0
+.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/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->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 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Landroid/view/ViewGroup;",
+            "I)",
+            "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+            ">;"
+        }
+    .end annotation
+
+    const-string p2, "parent"
+
+    invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
+
+    const p2, 0x7f0d003b
+
+    invoke-direct {p1, p2, p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;-><init>(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;)V
+
+    check-cast p1, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+
+    return-object p1
+.end method
+
+.method public final setOnConnectedAccountClick(Lkotlin/jvm/functions/Function3;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/functions/Function3<",
+            "-",
+            "Ljava/lang/String;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/String;",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "<set-?>"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali
new file mode 100644
index 0000000000..c50d7ae5e3
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.smali
@@ -0,0 +1,101 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;
+.super Ljava/lang/Object;
+.source "UserProfileConnectionsView.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->onConfigure(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $data:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+.field final synthetic $platformImageRes:I
+
+.field final synthetic $profileUrl:Ljava/lang/String;
+
+.field final synthetic $username:Ljava/lang/String;
+
+.field final synthetic this$0:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;Ljava/lang/String;ILjava/lang/String;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$data:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    iput-object p3, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$username:Ljava/lang/String;
+
+    iput p4, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$platformImageRes:I
+
+    iput-object p5, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$profileUrl: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
+
+    sget-object p1, Lcom/discord/utilities/platform/Platform;->Companion:Lcom/discord/utilities/platform/Platform$Companion;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$data:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    invoke-virtual {v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Lcom/discord/utilities/platform/Platform$Companion;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->connectedAccountViewed(Ljava/lang/String;)V
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->this$0:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
+
+    invoke-static {p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->access$getAdapter$p(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->getOnConnectedAccountClick()Lkotlin/jvm/functions/Function3;
+
+    move-result-object p1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$username:Ljava/lang/String;
+
+    const-string v1, "username"
+
+    invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$platformImageRes:I
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;->$profileUrl:Ljava/lang/String;
+
+    invoke-interface {p1, v0, v1, v2}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali
new file mode 100644
index 0000000000..4291b75525
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder.smali
@@ -0,0 +1,162 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
+.super Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;
+.source "UserProfileConnectionsView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = "ViewHolder"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<",
+        "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;",
+        "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field private final listItemTextView:Landroid/widget/TextView;
+
+
+# direct methods
+.method public constructor <init>(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;)V
+    .locals 1
+
+    const-string v0, "adapter"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p2, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    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/profile/UserProfileConnectionsView$ViewHolder;->itemView:Landroid/view/View;
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Landroid/widget/TextView;
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->listItemTextView:Landroid/widget/TextView;
+
+    return-void
+
+    :cond_0
+    new-instance p1, Lkotlin/r;
+
+    const-string p2, "null cannot be cast to non-null type android.widget.TextView"
+
+    invoke-direct {p1, p2}, Lkotlin/r;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
+
+.method public static final synthetic access$getAdapter$p(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+    .locals 0
+
+    iget-object p0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+    check-cast p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    return-object p0
+.end method
+
+
+# virtual methods
+.method protected final onConfigure(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;)V
+    .locals 13
+
+    const-string v0, "data"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
+
+    invoke-virtual {p2}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;->getConnectedAccount()Lcom/discord/models/domain/ModelConnectedAccount;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()Ljava/lang/String;
+
+    move-result-object v3
+
+    sget-object v0, Lcom/discord/utilities/platform/Platform;->Companion:Lcom/discord/utilities/platform/Platform$Companion;
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/platform/Platform$Companion;->from(Lcom/discord/models/domain/ModelConnectedAccount;)Lcom/discord/utilities/platform/Platform;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/utilities/platform/Platform;->getPlatformImage()I
+
+    move-result v11
+
+    invoke-virtual {v0, p1}, Lcom/discord/utilities/platform/Platform;->getProfileUrl(Lcom/discord/models/domain/ModelConnectedAccount;)Ljava/lang/String;
+
+    move-result-object v12
+
+    iget-object v4, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->listItemTextView:Landroid/widget/TextView;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/16 v9, 0xe
+
+    const/4 v10, 0x0
+
+    move v5, v11
+
+    invoke-static/range {v4 .. v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->listItemTextView:Landroid/widget/TextView;
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelConnectedAccount;->getUsername()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
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->itemView:Landroid/view/View;
+
+    new-instance v6, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;
+
+    move-object v0, v6
+
+    move-object v1, p0
+
+    move-object v2, p2
+
+    move v4, v11
+
+    move-object v5, v12
+
+    invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1;-><init>(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;Ljava/lang/String;ILjava/lang/String;)V
+
+    check-cast v6, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, v6}, 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/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;->onConfigure(ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
new file mode 100644
index 0000000000..e6f5c346a0
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewState.smali
@@ -0,0 +1,202 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+.super Ljava/lang/Object;
+.source "UserProfileConnectionsView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ViewState"
+.end annotation
+
+
+# instance fields
+.field private final connectedAccountItems:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+            ">;"
+        }
+    .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/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "connectedAccountItems"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    return-void
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    .locals 0
+
+    and-int/lit8 p2, p2, 0x1
+
+    if-eqz p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    :cond_0
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->copy(Ljava/util/List;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    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/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final copy(Ljava/util/List;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+            ">;)",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;"
+        }
+    .end annotation
+
+    const-string v0, "connectedAccountItems"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    invoke-direct {v0, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;-><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/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    if-eqz v0, :cond_0
+
+    check-cast p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-eqz p1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 p1, 0x0
+
+    return p1
+
+    :cond_1
+    :goto_0
+    const/4 p1, 0x1
+
+    return p1
+.end method
+
+.method public final getConnectedAccountItems()Ljava/util/List;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/List<",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems:Ljava/util/List;
+
+    return-object v0
+.end method
+
+.method public final hashCode()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems: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, "ViewState(connectedAccountItems="
+
+    invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+
+    iget-object v1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->connectedAccountItems: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/user/profile/UserProfileConnectionsView$updateViewState$1.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1.smali
new file mode 100644
index 0000000000..c4d0449bbb
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1.smali
@@ -0,0 +1,87 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;
+.super Lkotlin/jvm/internal/m;
+.source "UserProfileConnectionsView.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lkotlin/jvm/functions/Function3;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/m;",
+        "Lkotlin/jvm/functions/Function3<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/String;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function3;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;->$onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+
+    const/4 p1, 0x3
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    check-cast p3, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;->invoke(Ljava/lang/String;ILjava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/String;ILjava/lang/String;)V
+    .locals 1
+
+    const-string v0, "username"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;->$onConnectedAccountClick:Lkotlin/jvm/functions/Function3;
+
+    invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p2
+
+    invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2.smali
new file mode 100644
index 0000000000..b49c4550a4
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;
+.super Ljava/lang/Object;
+.source "UserProfileConnectionsView.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $onMutualGuildsItemClick:Lkotlin/jvm/functions/Function0;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;->$onMutualGuildsItemClick:Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;->$onMutualGuildsItemClick:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3.smali
new file mode 100644
index 0000000000..0eccebbcb9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3.smali
@@ -0,0 +1,45 @@
+.class final Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;
+.super Ljava/lang/Object;
+.source "UserProfileConnectionsView.kt"
+
+# interfaces
+.implements Landroid/view/View$OnClickListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+
+# instance fields
+.field final synthetic $onMutualFriendsItemClick:Lkotlin/jvm/functions/Function0;
+
+
+# direct methods
+.method constructor <init>(Lkotlin/jvm/functions/Function0;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;->$onMutualFriendsItemClick:Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onClick(Landroid/view/View;)V
+    .locals 0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;->$onMutualFriendsItemClick:Lkotlin/jvm/functions/Function0;
+
+    invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
new file mode 100644
index 0000000000..c914cbd33e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileConnectionsView.smali
@@ -0,0 +1,361 @@
+.class public final Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+.super Landroid/widget/LinearLayout;
+.source "UserProfileConnectionsView.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;,
+        Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;,
+        Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;,
+        Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder;
+    }
+.end annotation
+
+
+# static fields
+.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field private connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+.field private final connectedAccountsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final mutualFriendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+.field private final mutualGuildsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    const-class v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+
+    const/4 v1, 0x3
+
+    new-array v1, v1, [Lkotlin/reflect/KProperty;
+
+    new-instance v2, Lkotlin/jvm/internal/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "connectedAccountsRecycler"
+
+    const-string v5, "getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "mutualGuildsItem"
+
+    const-string v5, "getMutualGuildsItem()Landroid/view/View;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v0
+
+    const-string v3, "mutualFriendsItem"
+
+    const-string v4, "getMutualFriendsItem()Landroid/view/View;"
+
+    invoke-direct {v2, v0, v3, v4}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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/UserProfileConnectionsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    return-void
+.end method
+
+.method public constructor <init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+    .locals 1
+
+    const-string v0, "context"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "attrs"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
+
+    const p2, 0x7f0a07e4
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a07e3
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->mutualGuildsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const p2, 0x7f0a07e2
+
+    invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
+
+    move-result-object p2
+
+    iput-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->mutualFriendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    move-object p2, p0
+
+    check-cast p2, Landroid/view/ViewGroup;
+
+    const v0, 0x7f0d006d
+
+    invoke-static {p1, v0, p2}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
+
+    return-void
+.end method
+
+.method private final getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/4 v2, 0x0
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Landroidx/recyclerview/widget/RecyclerView;
+
+    return-object v0
+.end method
+
+.method private final getMutualFriendsItem()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->mutualFriendsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->$$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 getMutualGuildsItem()Landroid/view/View;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->mutualGuildsItem$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->$$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
+
+
+# virtual methods
+.method protected final onAttachedToWindow()V
+    .locals 3
+
+    invoke-super {p0}, Landroid/widget/LinearLayout;->onAttachedToWindow()V
+
+    sget-object v0, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;->Companion:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter$Companion;
+
+    new-instance v1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v2
+
+    invoke-direct {v1, v2}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;-><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/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v0
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Landroidx/recyclerview/widget/RecyclerView;->setHasFixedSize(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getConnectedAccountsRecycler()Landroidx/recyclerview/widget/RecyclerView;
+
+    move-result-object v0
+
+    check-cast v0, Landroid/view/View;
+
+    invoke-static {v0, v1}, Landroidx/core/view/ViewCompat;->setNestedScrollingEnabled(Landroid/view/View;Z)V
+
+    return-void
+.end method
+
+.method public final updateViewState(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;",
+            "Lkotlin/jvm/functions/Function3<",
+            "-",
+            "Ljava/lang/String;",
+            "-",
+            "Ljava/lang/Integer;",
+            "-",
+            "Ljava/lang/String;",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;",
+            "Lkotlin/jvm/functions/Function0<",
+            "Lkotlin/Unit;",
+            ">;)V"
+        }
+    .end annotation
+
+    const-string v0, "viewState"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onConnectedAccountClick"
+
+    invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onMutualGuildsItemClick"
+
+    invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "onMutualFriendsItemClick"
+
+    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    const-string v1, "connectedAccountsAdapter"
+
+    if-nez v0, :cond_0
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_0
+    new-instance v2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;
+
+    invoke-direct {v2, p2}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$1;-><init>(Lkotlin/jvm/functions/Function3;)V
+
+    check-cast v2, Lkotlin/jvm/functions/Function3;
+
+    invoke-virtual {v0, v2}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->setOnConnectedAccountClick(Lkotlin/jvm/functions/Function3;)V
+
+    iget-object p2, p0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->connectedAccountsAdapter:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;
+
+    if-nez p2, :cond_1
+
+    invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+    :cond_1
+    invoke-virtual {p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;->getConnectedAccountItems()Ljava/util/List;
+
+    move-result-object p1
+
+    invoke-virtual {p2, p1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountsAdapter;->setData(Ljava/util/List;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getMutualGuildsItem()Landroid/view/View;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;
+
+    invoke-direct {p2, p3}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$2;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    check-cast p2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->getMutualFriendsItem()Landroid/view/View;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;
+
+    invoke-direct {p2, p4}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$updateViewState$3;-><init>(Lkotlin/jvm/functions/Function0;)V
+
+    check-cast p2, Landroid/view/View$OnClickListener;
+
+    invoke-virtual {p1, p2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)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
index 7de6bf38d9..446097b026 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$1.smali
@@ -58,7 +58,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d006a
+    const v0, 0x7f0d006e
 
     const/4 v1, 0x0
 
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
index 3722283400..b7fbb17aaf 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView$BadgeViewHolder.smali
@@ -47,7 +47,7 @@
 
     invoke-direct {p0, p2}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;-><init>(Landroid/view/View;)V
 
-    const p1, 0x7f0a07d2
+    const p1, 0x7f0a07fb
 
     invoke-virtual {p2, p1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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
index 9f7bd510aa..e6ce0a3aa9 100644
--- 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
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 38d71e628c..273073207f 100644
--- 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
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onAvatarClick$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 9700ed62df..22bf7d7a2c 100644
--- 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
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/profile/UserProfileHeaderView$onBadgeClick$1;->invoke(Lcom/discord/widgets/user/Badge;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .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
index 6aded9f81e..dec656db59 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderView.smali
@@ -213,7 +213,7 @@
 
     invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const v0, 0x7f0a07c4
+    const v0, 0x7f0a07ed
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -221,7 +221,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->primaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c5
+    const v0, 0x7f0a07ee
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -229,7 +229,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->secondaryName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c2
+    const v0, 0x7f0a07eb
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -237,7 +237,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->customStatusTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07bb
+    const v0, 0x7f0a07e1
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -245,7 +245,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderView;->userAvatarPresenceView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07c1
+    const v0, 0x7f0a07ea
 
     invoke-static {p0, v0}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -269,7 +269,7 @@
 
     check-cast v0, Landroid/view/ViewGroup;
 
-    const v1, 0x7f0d006b
+    const v1, 0x7f0d006f
 
     invoke-static {p1, v1, v0}, Landroidx/constraintlayout/widget/ConstraintLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
@@ -323,7 +323,7 @@
 
     check-cast p2, Landroid/view/View;
 
-    const v0, 0x7f0402bb
+    const v0, 0x7f0402bc
 
     invoke-static {p2, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
 
@@ -433,13 +433,13 @@
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f0402a1
+    const v3, 0x7f0402a2
 
     const v4, 0x7f090001
 
     const v5, 0x7f0b0013
 
-    const v6, 0x7f0402aa
+    const v6, 0x7f0402ab
 
     const v7, 0x7f090002
 
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
index 4fcfbe9f99..a6281b3aad 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali
index 4c03d0e815..540a84b419 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel$Factory$observeStoreState$2.smali
@@ -225,7 +225,7 @@
 
     :cond_1
     :goto_0
-    invoke-static {}, Lrx/Observable;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
index 70cf375f7c..86051e0cbe 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileHeaderViewModel.smali
@@ -64,13 +64,13 @@
 
     invoke-direct {p0}, Lcom/discord/app/k;-><init>()V
 
-    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/UserProfileHeaderViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
index 2e84176fdb..8f3b880ee4 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfile.smali
@@ -328,29 +328,29 @@
 
     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
+    :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
@@ -466,7 +466,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01cb
+    const v0, 0x7f0d01d7
 
     return v0
 .end method
@@ -482,7 +482,7 @@
 .method public synthetic lambda$configureActionButtons$10$WidgetUserProfile(Landroid/view/View;)V
     .locals 0
 
-    const p1, 0x7f1206b3
+    const p1, 0x7f1206d7
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
 
@@ -494,7 +494,7 @@
 
     const/4 p1, 0x0
 
-    const v0, 0x7f1206ba
+    const v0, 0x7f1206de
 
     invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
 
@@ -520,7 +520,7 @@
 
     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
+    invoke-static {p1, p2, v0, v1}, Lcom/discord/dialogs/b;->a(Lcom/discord/models/domain/ModelUser;Landroid/content/Context;Landroidx/fragment/app/FragmentManager;Lkotlin/jvm/functions/Function1;)V
 
     return-void
 .end method
@@ -544,7 +544,7 @@
 
     move-result p2
 
-    const p3, 0x7f0a0455
+    const p3, 0x7f0a045d
 
     if-eq p2, p3, :cond_0
 
@@ -553,14 +553,14 @@
     goto :goto_0
 
     :pswitch_0
-    const p1, 0x7f1212b2
+    const p1, 0x7f12133a
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
 
     return-void
 
     :pswitch_1
-    const p1, 0x7f1206aa
+    const p1, 0x7f1206ce
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
 
@@ -572,14 +572,14 @@
     return-void
 
     :pswitch_3
-    const p1, 0x7f1206b3
+    const p1, 0x7f1206d7
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
 
     return-void
 
     :pswitch_4
-    const p1, 0x7f1206b1
+    const p1, 0x7f1206d5
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
 
@@ -592,7 +592,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f1212b1
+    const p2, 0x7f121339
 
     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
 
@@ -619,7 +619,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0475
+    .packed-switch 0x7f0a047f
         :pswitch_5
         :pswitch_4
         :pswitch_3
@@ -647,11 +647,11 @@
     :cond_0
     const/4 v0, 0x0
 
-    const v1, 0x7f0a0455
+    const v1, 0x7f0a045d
 
     const v2, 0xffff
 
-    const v3, 0x7f12045f
+    const v3, 0x7f120484
 
     invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem;
 
@@ -701,7 +701,7 @@
 
     invoke-direct {p0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->removeRelationship(I)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -752,7 +752,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a07c8
+    const v0, 0x7f0a07f1
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -770,7 +770,7 @@
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/simple_pager/SimplePager;->addOnPageChangeListener(Landroidx/viewpager/widget/ViewPager$OnPageChangeListener;)V
 
-    const v0, 0x7f0a07c6
+    const v0, 0x7f0a07ef
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -780,7 +780,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->userProfileHeaderView:Lcom/discord/widgets/user/profile/UserProfileHeaderView;
 
-    const v0, 0x7f0a07bf
+    const v0, 0x7f0a07e8
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -788,7 +788,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIncomingContainer:Landroid/view/View;
 
-    const v0, 0x7f0a07c0
+    const v0, 0x7f0a07e9
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -796,7 +796,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestSentBtn:Landroid/view/View;
 
-    const v0, 0x7f0a07bc
+    const v0, 0x7f0a07e5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -804,7 +804,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestBtn:Landroid/view/View;
 
-    const v0, 0x7f0a07bd
+    const v0, 0x7f0a07e6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -812,7 +812,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestAcceptBtn:Landroid/view/View;
 
-    const v0, 0x7f0a07be
+    const v0, 0x7f0a07e7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -820,7 +820,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfile;->friendRequestIgnoreBtn:Landroid/view/View;
 
-    const v0, 0x7f0a07c7
+    const v0, 0x7f0a07f0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -840,13 +840,13 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f120ed6
+    const p1, 0x7f120f5d
 
     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, 0x7f0e001c
+    const v0, 0x7f0e001d
 
     invoke-virtual {p0, v0, p1}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->setActionBarOptionsMenu(ILrx/functions/Action2;)Landroidx/appcompat/widget/Toolbar;
 
@@ -880,7 +880,7 @@
 
     new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v4, 0x7f1212b3
+    const v4, 0x7f12133b
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
 
@@ -896,7 +896,7 @@
 
     new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v4, 0x7f120be2
+    const v4, 0x7f120c14
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
 
@@ -912,7 +912,7 @@
 
     new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v4, 0x7f120be1
+    const v4, 0x7f120c13
 
     invoke-virtual {p0, v4}, Lcom/discord/widgets/user/profile/WidgetUserProfile;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
index 2e84dddfc3..b2cc3ba42c 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.smali
@@ -36,7 +36,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07a7
+    const p2, 0x7f0a07cd
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -46,7 +46,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a07a8
+    const p2, 0x7f0a07ce
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
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
index d4202fe436..13e17ceeda 100644
--- 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
@@ -43,7 +43,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0227
+    const p2, 0x7f0a022a
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -55,7 +55,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0229
+    const p2, 0x7f0a022c
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;->itemView:Landroid/view/View;
 
-    const p2, 0x7f0a0228
+    const p2, 0x7f0a022b
 
     invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
index bceab92934..6a73d0e0e6 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter.smali
@@ -65,7 +65,7 @@
 
     new-instance p1, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter$ViewHolder;
 
-    const p2, 0x7f0d01c4
+    const p2, 0x7f0d01d0
 
     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
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
index 3ec2410018..adba9a4c96 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileInfo.smali
@@ -95,7 +95,7 @@
 
 # virtual methods
 .method public configureUI(Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Model;)V
-    .locals 6
+    .locals 8
 
     iget-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->adapter:Lcom/discord/widgets/user/profile/WidgetUserProfileInfo$Adapter;
 
@@ -166,25 +166,29 @@
 
     iput-object v1, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityViewHolder:Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;
 
-    iget-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 v2
+    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 v3
+    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 v4
+    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 v5
+    move-result-object v6
 
-    invoke-virtual {v1, v2, v3, v4, v5}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    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;
 
@@ -252,7 +256,7 @@
 .method public getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01c3
+    const v0, 0x7f0d01cf
 
     return v0
 .end method
@@ -338,7 +342,7 @@
 
     invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
 
-    const v0, 0x7f0a0792
+    const v0, 0x7f0a07b6
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -348,7 +352,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->notes:Landroid/widget/EditText;
 
-    const v0, 0x7f0a0516
+    const v0, 0x7f0a0521
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -358,7 +362,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->recycler:Landroidx/recyclerview/widget/RecyclerView;
 
-    const v0, 0x7f0a0793
+    const v0, 0x7f0a07b7
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -368,7 +372,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityContainer:Landroid/widget/FrameLayout;
 
-    const v0, 0x7f0a078f
+    const v0, 0x7f0a07b3
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -376,7 +380,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->activityDivider:Landroid/view/View;
 
-    const v0, 0x7f0a0790
+    const v0, 0x7f0a07b4
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -384,7 +388,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/profile/WidgetUserProfileInfo;->identitiesDivider:Landroid/view/View;
 
-    const v0, 0x7f0a0791
+    const v0, 0x7f0a07b5
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
index d70624e138..2a69bd68cc 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$Model$Companion.smali
@@ -92,7 +92,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
index 33e727e31f..ed08860647 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip$onViewBoundOrOnResume$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
index 96a4c1e997..b50126ce81 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
@@ -229,7 +229,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a0546
+    const v0, 0x7f0a0551
 
     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/user/profile/WidgetUserProfileStrip;->profileAvatarWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0547
+    const v0, 0x7f0a0552
 
     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/user/profile/WidgetUserProfileStrip;->profileAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a054d
+    const v0, 0x7f0a0558
 
     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/user/profile/WidgetUserProfileStrip;->profileOnlineStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a054a
+    const v0, 0x7f0a0555
 
     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/user/profile/WidgetUserProfileStrip;->profileStripName$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0548
+    const v0, 0x7f0a0553
 
     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/user/profile/WidgetUserProfileStrip;->profileStripDiscriminator$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a054b
+    const v0, 0x7f0a0556
 
     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/user/profile/WidgetUserProfileStrip;->profileStripSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a054c
+    const v0, 0x7f0a0557
 
     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/user/profile/WidgetUserProfileStrip;->profileStripSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0549
+    const v0, 0x7f0a0554
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -452,12 +452,12 @@
 
     if-eqz v0, :cond_3
 
-    const v2, 0x7f08036d
+    const v2, 0x7f080379
 
     goto :goto_2
 
     :cond_3
-    const v2, 0x7f0802bc
+    const v2, 0x7f0802c8
 
     :goto_2
     invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -668,7 +668,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d0
+    const v0, 0x7f0d01dc
 
     return v0
 .end method
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 3d02c7170d..0a075d9886 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, 0x7f0a03eb
+    const p1, 0x7f0a03f3
 
     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, 0x7f0a0403
+    const p1, 0x7f0a040b
 
     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, 0x7f0a03d4
+    const p1, 0x7f0a03dc
 
     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, 0x7f0a03e6
+    const p1, 0x7f0a03ee
 
     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, 0x7f0a0402
+    const p1, 0x7f0a040a
 
     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, 0x7f0a0406
+    const p1, 0x7f0a040e
 
     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, 0x7f0d0086
+    const p3, 0x7f0d008b
 
     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, 0x7f08021c
+    const v9, 0x7f080227
 
     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, 0x7f080224
+    const v9, 0x7f08022f
 
     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
 
@@ -740,7 +740,7 @@
 
     check-cast v2, Landroid/view/View;
 
-    const v4, 0x7f060154
+    const v4, 0x7f060155
 
     invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
 
@@ -1027,7 +1027,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1206bb
+    const v1, 0x7f1206df
 
     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 b1899c1179..7c88b25217 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, 0x7f121323
+    const v1, 0x7f1213af
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -87,7 +87,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f12119c
+    const v1, 0x7f121224
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -107,7 +107,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f121372
+    const v1, 0x7f1213fe
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -127,7 +127,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f12105c
+    const v1, 0x7f1210e3
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
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 138acd29fb..e0947faf87 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 210ae11ee8..4c4329166a 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1b782d3493..ad63a12e74 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 fc4ba98ea6..e8ba67604f 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 800073f55c..aca4504697 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 2b972efa23..0615b23979 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 15a4a8bb59..988697d59b 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 ec258c35f2..b00f6ef3f0 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, 0x7f0a0322
+    const v0, 0x7f0a0326
 
     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, 0x7f0a0320
+    const v0, 0x7f0a0324
 
     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, 0x7f0a0323
+    const v0, 0x7f0a0327
 
     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, 0x7f0a031f
+    const v0, 0x7f0a0323
 
     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, 0x7f0a0321
+    const v0, 0x7f0a0325
 
     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, 0x7f0a05ae
+    const v0, 0x7f0a05c3
 
     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, 0x7f0a05b8
+    const v0, 0x7f0a05cd
 
     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, 0x7f0a05b2
+    const v0, 0x7f0a05c7
 
     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, 0x7f0a05b5
+    const v0, 0x7f0a05ca
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -1186,9 +1186,9 @@
 
     check-cast v1, [Ljava/lang/String;
 
-    sget-object v2, Lcom/discord/dialogs/d;->xB:Lcom/discord/dialogs/d$a;
+    sget-object v2, Lcom/discord/dialogs/e;->xD:Lcom/discord/dialogs/e$a;
 
-    const v2, 0x7f1205c3
+    const v2, 0x7f1205e8
 
     invoke-virtual {p0, v2}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
 
@@ -1206,7 +1206,7 @@
 
     check-cast v3, Lkotlin/jvm/functions/Function1;
 
-    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;
+    invoke-static {v0, v2, v1, v3}, Lcom/discord/dialogs/e$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;[Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Lcom/discord/dialogs/e;
 
     return-void
 
@@ -1255,7 +1255,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d011f
+    const v0, 0x7f0d0125
 
     return v0
 .end method
@@ -1344,7 +1344,7 @@
 
     move-result-object v2
 
-    const v3, 0x7f0402b5
+    const v3, 0x7f0402b6
 
     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, 0x7f120ef7
+    const v0, 0x7f120f7e
 
     invoke-virtual {p1, v0}, Landroid/widget/EditText;->setHint(I)V
 
@@ -1582,7 +1582,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1590,7 +1590,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IR()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IU()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 177dbcdc42..65fef49080 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00cf
+    const v0, 0x7f0d00d5
 
     invoke-direct {p0, v0, p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchAdapter$Item;-><init>(ILcom/discord/widgets/user/search/WidgetGlobalSearchAdapter;)V
 
-    const p1, 0x7f0a03ea
+    const p1, 0x7f0a03f2
 
     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 bd4462ac65..db758cfc75 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f0d00ce
+    const v0, 0x7f0d00d4
 
     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 24396e5478..6e7725af9d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 639421116d..a988a5600d 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
@@ -175,7 +175,7 @@
 
     if-eqz p2, :cond_2
 
-    const p3, 0x7f12093b
+    const p3, 0x7f120970
 
     invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -228,7 +228,7 @@
 
     invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v3, 0x7f04028a
+    const v3, 0x7f04028b
 
     const/4 v4, 0x2
 
@@ -238,7 +238,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setBackgroundResource(I)V
 
-    const v0, 0x7f120ba7
+    const v0, 0x7f120bd8
 
     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 f3d1bb1f44..69c95f663d 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, 0x7f0a037e
+    const p1, 0x7f0a0386
 
     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, 0x7f0a037f
+    const p1, 0x7f0a0387
 
     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$ItemGuild.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$ItemGuild.smali
index c6cee75132..45e4df0528 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, 0x7f0a037b
+    const p1, 0x7f0a0383
 
     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, 0x7f0a037c
+    const p1, 0x7f0a0384
 
     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, 0x7f0a0384
+    const p1, 0x7f0a038c
 
     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, 0x7f0a0389
+    const p1, 0x7f0a0391
 
     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, 0x7f0a0388
+    const p1, 0x7f0a0390
 
     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, 0x7f0a0387
+    const p1, 0x7f0a038f
 
     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 69b3d23554..06ab3f4562 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0a4715499e..75472d183d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 0128d136ef..a33e65e04a 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, 0x7f0d0122
+    const p2, 0x7f0d0128
 
     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, 0x7f0d0121
+    const p2, 0x7f0d0127
 
     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, 0x7f0d0120
+    const p2, 0x7f0d0126
 
     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/WidgetGlobalSearchModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
index 40aeba7fc7..ffa4adcead 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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -230,7 +230,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -311,7 +311,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -432,7 +432,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -484,7 +484,7 @@
 
     move-result-object v2
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v3
 
@@ -542,7 +542,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -1330,7 +1330,7 @@
 
     new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f121131
+    const v6, 0x7f1211b9
 
     const/4 v7, 0x0
 
@@ -1365,7 +1365,7 @@
 
     new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v7, 0x7f120ef4
+    const v7, 0x7f120f7b
 
     const/4 v8, 0x0
 
@@ -1393,7 +1393,7 @@
 
     new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
 
-    const v6, 0x7f121131
+    const v6, 0x7f1211b9
 
     const/4 v7, 0x0
 
diff --git a/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali b/com.discord/smali/com/esotericsoftware/kryo/Kryo.smali
index 1c05123ba2..428c0d442e 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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez p2, :cond_7
 
@@ -2221,7 +2221,7 @@
 
     :cond_5
     :goto_0
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez v1, :cond_6
 
@@ -2384,7 +2384,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez p2, :cond_4
 
@@ -2544,7 +2544,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez p2, :cond_4
 
@@ -2734,7 +2734,7 @@
 
     if-nez v3, :cond_6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     const/4 p2, 0x0
 
@@ -2779,7 +2779,7 @@
 
     :cond_7
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez p2, :cond_8
 
@@ -2946,7 +2946,7 @@
 
     if-nez v1, :cond_6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     const/4 p2, 0x0
 
@@ -2991,7 +2991,7 @@
 
     :cond_7
     :goto_0
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez p2, :cond_8
 
@@ -3108,7 +3108,7 @@
 
     if-nez p1, :cond_3
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     const/4 p2, 0x0
 
@@ -3176,7 +3176,7 @@
 
     move-result p1
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
@@ -4043,7 +4043,7 @@
 
     :cond_3
     :try_start_2
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez v0, :cond_4
 
@@ -4177,7 +4177,7 @@
 
     :cond_1
     :try_start_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez v1, :cond_2
 
@@ -4318,7 +4318,7 @@
 
     :cond_1
     :try_start_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez v1, :cond_2
 
@@ -4465,7 +4465,7 @@
 
     if-nez p2, :cond_5
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez v1, :cond_7
 
@@ -4651,7 +4651,7 @@
 
     if-nez p2, :cond_5
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-nez v1, :cond_7
 
@@ -4771,7 +4771,7 @@
 
     if-nez p2, :cond_2
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p1, :cond_7
 
diff --git a/com.discord/smali/com/facebook/a/a.smali b/com.discord/smali/com/facebook/a/a.smali
index ae55e65d73..32df8b9c87 100644
--- a/com.discord/smali/com/facebook/a/a.smali
+++ b/com.discord/smali/com/facebook/a/a.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract fG()Ljava/io/InputStream;
+.method public abstract fJ()Ljava/io/InputStream;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,5 +12,5 @@
     .end annotation
 .end method
 
-.method public abstract fH()J
+.method public abstract fK()J
 .end method
diff --git a/com.discord/smali/com/facebook/a/b.smali b/com.discord/smali/com/facebook/a/b.smali
index b1c7cdc6d9..a2b5a265c1 100644
--- a/com.discord/smali/com/facebook/a/b.smali
+++ b/com.discord/smali/com/facebook/a/b.smali
@@ -79,7 +79,7 @@
     return p1
 .end method
 
-.method public final fG()Ljava/io/InputStream;
+.method public final fJ()Ljava/io/InputStream;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -96,7 +96,7 @@
     return-object v0
 .end method
 
-.method public final fH()J
+.method public final fK()J
     .locals 2
 
     iget-object v0, p0, Lcom/facebook/a/b;->mFile:Ljava/io/File;
diff --git a/com.discord/smali/com/facebook/c/a.smali b/com.discord/smali/com/facebook/c/a.smali
index 00ed5d1e61..f3b8e493ae 100644
--- a/com.discord/smali/com/facebook/c/a.smali
+++ b/com.discord/smali/com/facebook/c/a.smali
@@ -26,11 +26,11 @@
 
 
 # instance fields
-.field private Iq:Z
+.field private Iz:Z
 
-.field private Jk:I
+.field private Jt:I
 
-.field private Jl:Ljava/lang/Object;
+.field private Ju:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field private Jm:Ljava/lang/Throwable;
+.field private Jv:Ljava/lang/Throwable;
 
-.field private final Jn:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -67,9 +67,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/facebook/c/a;->Jm:Ljava/lang/Throwable;
+    iput-object v0, p0, Lcom/facebook/c/a;->Jv:Ljava/lang/Throwable;
 
     const/4 v0, 0x0
 
@@ -77,17 +77,17 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/c/a;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
 
-    sget v0, Lcom/facebook/c/a$a;->Jt:I
+    sget v0, Lcom/facebook/c/a$a;->JC:I
 
-    iput v0, p0, Lcom/facebook/c/a;->Jk:I
+    iput v0, p0, Lcom/facebook/c/a;->Jt:I
 
     new-instance v0, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/c/a;->Jn:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lcom/facebook/c/a;->Jw: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/c/a;->Iq:Z
+    iget-boolean v1, p0, Lcom/facebook/c/a;->Iz:Z
 
     if-nez v1, :cond_4
 
-    iget v1, p0, Lcom/facebook/c/a;->Jk:I
+    iget v1, p0, Lcom/facebook/c/a;->Jt:I
 
-    sget v2, Lcom/facebook/c/a$a;->Jt:I
+    sget v2, Lcom/facebook/c/a$a;->JC:I
 
     if-eq v1, v2, :cond_0
 
@@ -148,25 +148,25 @@
     :cond_0
     if-eqz p2, :cond_1
 
-    sget p2, Lcom/facebook/c/a$a;->Ju:I
+    sget p2, Lcom/facebook/c/a$a;->JD:I
 
-    iput p2, p0, Lcom/facebook/c/a;->Jk:I
+    iput p2, p0, Lcom/facebook/c/a;->Jt:I
 
     const/high16 p2, 0x3f800000    # 1.0f
 
     iput p2, p0, Lcom/facebook/c/a;->mProgress:F
 
     :cond_1
-    iget-object p2, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iget-object p2, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
 
     if-eq p2, p1, :cond_2
 
-    iget-object p2, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iget-object p2, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_2
 
     :try_start_2
-    iput-object p1, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/c/a;->Ju: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/c/a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/c/a;->Jk:I
+    iget v0, p0, Lcom/facebook/c/a;->Jt:I
 
-    sget v1, Lcom/facebook/c/a$a;->Jt:I
+    sget v1, Lcom/facebook/c/a$a;->JC:I
 
     if-eq v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget v0, Lcom/facebook/c/a$a;->Jv:I
+    sget v0, Lcom/facebook/c/a$a;->JE:I
 
-    iput v0, p0, Lcom/facebook/c/a;->Jk:I
+    iput v0, p0, Lcom/facebook/c/a;->Jt:I
 
-    iput-object p1, p0, Lcom/facebook/c/a;->Jm:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/c/a;->Jv: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 gB()Z
+.method private declared-synchronized gE()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/c/a;->Jk:I
+    iget v0, p0, Lcom/facebook/c/a;->Jt:I
 
-    sget v1, Lcom/facebook/c/a$a;->Jv:I
+    sget v1, Lcom/facebook/c/a$a;->JE:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -338,18 +338,18 @@
     goto :goto_1
 .end method
 
-.method private gE()V
+.method private gH()V
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gB()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gE()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gF()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gI()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/facebook/c/a;->Jn:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v2, p0, Lcom/facebook/c/a;->Jw: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 gF()Z
+.method private declared-synchronized gI()Z
     .locals 1
 
     monitor-enter p0
@@ -436,15 +436,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/c/a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/facebook/c/a;->Jk:I
+    iget v0, p0, Lcom/facebook/c/a;->Jt:I
 
-    sget v2, Lcom/facebook/c/a$a;->Jt:I
+    sget v2, Lcom/facebook/c/a$a;->JC:I
 
     if-eq v0, v2, :cond_0
 
@@ -510,7 +510,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/c/a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
 
     if-eqz v0, :cond_0
 
@@ -519,13 +519,13 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/facebook/c/a;->Jk:I
+    iget v0, p0, Lcom/facebook/c/a;->Jt:I
 
-    sget v1, Lcom/facebook/c/a$a;->Jt:I
+    sget v1, Lcom/facebook/c/a$a;->JC:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/c/a;->Jn:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/c/a;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-static {p1, p2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair;
 
@@ -534,7 +534,7 @@
     invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/c/a;->gA()Z
+    invoke-virtual {p0}, Lcom/facebook/c/a;->gD()Z
 
     move-result v0
 
@@ -546,7 +546,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gF()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gI()Z
 
     move-result v0
 
@@ -570,11 +570,11 @@
 
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gB()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gE()Z
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gF()Z
+    invoke-direct {p0}, Lcom/facebook/c/a;->gI()Z
 
     move-result v1
 
@@ -612,7 +612,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gE()V
+    invoke-direct {p0}, Lcom/facebook/c/a;->gH()V
 
     :cond_0
     return p1
@@ -627,19 +627,19 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gE()V
+    invoke-direct {p0}, Lcom/facebook/c/a;->gH()V
 
     :cond_0
     return p1
 .end method
 
-.method public declared-synchronized gA()Z
+.method public declared-synchronized gD()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -671,7 +671,7 @@
     goto :goto_1
 .end method
 
-.method public final declared-synchronized gC()Ljava/lang/Throwable;
+.method public final declared-synchronized gF()Ljava/lang/Throwable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -679,7 +679,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/a;->Jm:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/c/a;->Jv:Ljava/lang/Throwable;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -695,13 +695,13 @@
     throw v0
 .end method
 
-.method public gD()Z
+.method public gG()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/c/a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
 
     if-eqz v0, :cond_0
 
@@ -714,13 +714,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/c/a;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
 
-    iget-object v1, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iput-object v2, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
 
     monitor-exit p0
     :try_end_0
@@ -737,13 +737,13 @@
 
     if-nez v1, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/c/a;->gE()V
+    invoke-direct {p0}, Lcom/facebook/c/a;->gH()V
 
     :cond_2
     monitor-enter p0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/c/a;->Jn:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lcom/facebook/c/a;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
 
@@ -802,7 +802,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/a;->Jn:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/c/a;->Jw:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0}, Ljava/util/concurrent/ConcurrentLinkedQueue;->iterator()Ljava/util/Iterator;
 
@@ -847,7 +847,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/c/a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a;->Iz:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -869,9 +869,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/c/a;->Jk:I
+    iget v0, p0, Lcom/facebook/c/a;->Jt:I
 
-    sget v1, Lcom/facebook/c/a$a;->Jt:I
+    sget v1, Lcom/facebook/c/a$a;->JC:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -917,7 +917,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/a;->Jl:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/c/a;->Ju:Ljava/lang/Object;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/c/c.smali b/com.discord/smali/com/facebook/c/c.smali
index db8d9884b4..289db2716f 100644
--- a/com.discord/smali/com/facebook/c/c.smali
+++ b/com.discord/smali/com/facebook/c/c.smali
@@ -27,15 +27,15 @@
     .end annotation
 .end method
 
-.method public abstract gA()Z
+.method public abstract gD()Z
 .end method
 
-.method public abstract gC()Ljava/lang/Throwable;
+.method public abstract gF()Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
-.method public abstract gD()Z
+.method public abstract gG()Z
 .end method
 
 .method public abstract getProgress()F
diff --git a/com.discord/smali/com/facebook/c/f$a.smali b/com.discord/smali/com/facebook/c/f$a.smali
index 528bdd266c..2da543740f 100644
--- a/com.discord/smali/com/facebook/c/f$a.smali
+++ b/com.discord/smali/com/facebook/c/f$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field JB:Lcom/facebook/c/c;
+.field JK:Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/c/c<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field JC:Lcom/facebook/c/c;
+.field JL:Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/c/c<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field final synthetic JD:Lcom/facebook/c/f;
+.field final synthetic JM:Lcom/facebook/c/f;
 
 .field private mIndex:I
 
@@ -55,7 +55,7 @@
 .method public constructor <init>(Lcom/facebook/c/f;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/facebook/c/f$a;->JD:Lcom/facebook/c/f;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JM:Lcom/facebook/c/f;
 
     invoke-direct {p0}, Lcom/facebook/c/a;-><init>()V
 
@@ -65,11 +65,11 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
 
-    iput-object p1, p0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
-    invoke-direct {p0}, Lcom/facebook/c/f$a;->gH()Z
+    invoke-direct {p0}, Lcom/facebook/c/f$a;->gK()Z
 
     move-result p1
 
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v0
 
@@ -105,13 +105,13 @@
     invoke-static {p1}, Lcom/facebook/c/f$a;->h(Lcom/facebook/c/c;)V
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/c/f$a;->gH()Z
+    invoke-direct {p0}, Lcom/facebook/c/f$a;->gK()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gC()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/c/c;->gF()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -150,7 +150,7 @@
 
     :cond_0
     :try_start_1
-    iput-object p1, p0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -187,7 +187,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
 
     if-eq p1, v0, :cond_0
 
@@ -196,7 +196,7 @@
     :cond_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -222,10 +222,10 @@
     throw p1
 .end method
 
-.method private gH()Z
+.method private gK()Z
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/c/f$a;->gI()Lcom/facebook/common/d/l;
+    invoke-direct {p0}, Lcom/facebook/c/f$a;->gL()Lcom/facebook/common/d/l;
 
     move-result-object v0
 
@@ -257,7 +257,7 @@
 
     invoke-direct {v1, p0, v2}, Lcom/facebook/c/f$a$a;-><init>(Lcom/facebook/c/f$a;B)V
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fY()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->gb()Lcom/facebook/common/b/a;
 
     move-result-object v2
 
@@ -273,7 +273,7 @@
     return v2
 .end method
 
-.method private declared-synchronized gI()Lcom/facebook/common/d/l;
+.method private declared-synchronized gL()Lcom/facebook/common/d/l;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -298,9 +298,9 @@
 
     iget v0, p0, Lcom/facebook/c/f$a;->mIndex:I
 
-    iget-object v1, p0, Lcom/facebook/c/f$a;->JD:Lcom/facebook/c/f;
+    iget-object v1, p0, Lcom/facebook/c/f$a;->JM:Lcom/facebook/c/f;
 
-    iget-object v1, v1, Lcom/facebook/c/f;->JA:Ljava/util/List;
+    iget-object v1, v1, Lcom/facebook/c/f;->JJ:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -308,9 +308,9 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/f$a;->JD:Lcom/facebook/c/f;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JM:Lcom/facebook/c/f;
 
-    iget-object v0, v0, Lcom/facebook/c/f;->JA:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/c/f;->JJ:Ljava/util/List;
 
     iget v1, p0, Lcom/facebook/c/f$a;->mIndex:I
 
@@ -357,7 +357,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p0}, Lcom/facebook/c/c;->gG()Z
 
     :cond_0
     return-void
@@ -365,19 +365,19 @@
 
 
 # virtual methods
-.method public final declared-synchronized gA()Z
+.method public final declared-synchronized gD()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/c/c;->gA()Z
+    invoke-interface {v0}, Lcom/facebook/c/c;->gD()Z
 
     move-result v0
     :try_end_0
@@ -411,13 +411,13 @@
     goto :goto_1
 .end method
 
-.method public final gD()Z
+.method public final gG()Z
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/c/a;->gD()Z
+    invoke-super {p0}, Lcom/facebook/c/a;->gG()Z
 
     move-result v0
 
@@ -430,15 +430,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iput-object v1, p0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
 
-    iget-object v2, p0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iget-object v2, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
-    iput-object v1, p0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iput-object v1, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
     monitor-exit p0
     :try_end_0
@@ -463,7 +463,7 @@
     throw v0
 .end method
 
-.method declared-synchronized gJ()Lcom/facebook/c/c;
+.method declared-synchronized gM()Lcom/facebook/c/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -479,7 +479,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -509,7 +509,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/f$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/c/g$a.smali b/com.discord/smali/com/facebook/c/g$a.smali
index 8c7cc1cc13..b1c3d6b0bb 100644
--- a/com.discord/smali/com/facebook/c/g$a.smali
+++ b/com.discord/smali/com/facebook/c/g$a.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field private JG:Ljava/util/ArrayList;
+.field private JP:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -41,33 +41,33 @@
     .end annotation
 .end field
 
-.field JH:I
+.field JQ:I
 
-.field private JI:I
+.field private JR:I
 
-.field private JJ:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private JS:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private JK:Ljava/lang/Throwable;
+.field private JT:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final synthetic JL:Lcom/facebook/c/g;
+.field final synthetic JU:Lcom/facebook/c/g;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/c/g;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/g$a;->JL:Lcom/facebook/c/g;
+    iput-object p1, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
 
     invoke-direct {p0}, Lcom/facebook/c/a;-><init>()V
 
-    iget-boolean p1, p1, Lcom/facebook/c/g;->JF:Z
+    iget-boolean p1, p1, Lcom/facebook/c/g;->JO:Z
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gK()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
 
     :cond_0
     return-void
@@ -91,7 +91,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v0
     :try_end_0
@@ -147,22 +147,22 @@
 
     if-nez p1, :cond_0
 
-    invoke-interface {p2}, Lcom/facebook/c/c;->gC()Ljava/lang/Throwable;
+    invoke-interface {p2}, Lcom/facebook/c/c;->gF()Ljava/lang/Throwable;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/c/g$a;->JK:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/c/g$a;->JT:Ljava/lang/Throwable;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gL()V
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gO()V
 
     return-void
 .end method
 
-.method private gK()V
+.method private gN()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JJ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
 
     if-eqz v0, :cond_0
 
@@ -172,7 +172,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JJ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
 
     if-nez v0, :cond_1
 
@@ -182,32 +182,32 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/c/g$a;->JJ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/c/g$a;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
 
-    iget-object v0, v0, Lcom/facebook/c/g;->JA:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/c/g;->JJ:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/c/g$a;->JI:I
+    iput v0, p0, Lcom/facebook/c/g$a;->JR:I
 
-    iput v0, p0, Lcom/facebook/c/g$a;->JH:I
+    iput v0, p0, Lcom/facebook/c/g$a;->JQ:I
 
     new-instance v2, Ljava/util/ArrayList;
 
     invoke-direct {v2, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v2, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iput-object v2, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/c/g$a;->JL:Lcom/facebook/c/g;
+    iget-object v2, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
 
-    iget-object v2, v2, Lcom/facebook/c/g;->JA:Ljava/util/List;
+    iget-object v2, v2, Lcom/facebook/c/g;->JJ:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -221,7 +221,7 @@
 
     check-cast v2, Lcom/facebook/c/c;
 
-    iget-object v3, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     invoke-virtual {v3, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -229,13 +229,13 @@
 
     invoke-direct {v3, p0, v1}, Lcom/facebook/c/g$a$a;-><init>(Lcom/facebook/c/g$a;I)V
 
-    invoke-static {}, Lcom/facebook/common/b/a;->fY()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->gb()Lcom/facebook/common/b/a;
 
     move-result-object v4
 
     invoke-interface {v2, v3, v4}, Lcom/facebook/c/c;->a(Lcom/facebook/c/e;Ljava/util/concurrent/Executor;)V
 
-    invoke-interface {v2}, Lcom/facebook/c/c;->gA()Z
+    invoke-interface {v2}, Lcom/facebook/c/c;->gD()Z
 
     move-result v2
 
@@ -278,7 +278,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-interface {p0}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p0}, Lcom/facebook/c/c;->gG()Z
 
     :cond_0
     return-void
@@ -302,11 +302,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -314,7 +314,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -359,13 +359,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -373,7 +373,7 @@
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1, v1}, Ljava/util/ArrayList;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -400,28 +400,28 @@
     throw p1
 .end method
 
-.method public final declared-synchronized gA()Z
+.method public final declared-synchronized gD()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
 
-    iget-boolean v0, v0, Lcom/facebook/c/g;->JF:Z
+    iget-boolean v0, v0, Lcom/facebook/c/g;->JO:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gK()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/c/c;->gA()Z
+    invoke-interface {v0}, Lcom/facebook/c/c;->gD()Z
 
     move-result v0
     :try_end_0
@@ -455,22 +455,22 @@
     goto :goto_1
 .end method
 
-.method public final gD()Z
+.method public final gG()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
 
-    iget-boolean v0, v0, Lcom/facebook/c/g;->JF:Z
+    iget-boolean v0, v0, Lcom/facebook/c/g;->JO:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gK()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
 
     :cond_0
     monitor-enter p0
 
     :try_start_0
-    invoke-super {p0}, Lcom/facebook/c/a;->gD()Z
+    invoke-super {p0}, Lcom/facebook/c/a;->gG()Z
 
     move-result v0
 
@@ -483,11 +483,11 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/c/g$a;->JG:Ljava/util/ArrayList;
+    iput-object v2, p0, Lcom/facebook/c/g$a;->JP:Ljava/util/ArrayList;
 
     monitor-exit p0
     :try_end_0
@@ -536,7 +536,7 @@
     goto :goto_1
 .end method
 
-.method declared-synchronized gJ()Lcom/facebook/c/c;
+.method declared-synchronized gM()Lcom/facebook/c/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -552,7 +552,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/c/g$a;->JH:I
+    iget v0, p0, Lcom/facebook/c/g$a;->JQ:I
 
     invoke-virtual {p0, v0}, Lcom/facebook/c/g$a;->H(I)Lcom/facebook/c/c;
 
@@ -572,20 +572,20 @@
     throw v0
 .end method
 
-.method gL()V
+.method gO()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JJ:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JS:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/c/g$a;->JI:I
+    iget v1, p0, Lcom/facebook/c/g$a;->JR:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JK:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JT:Ljava/lang/Throwable;
 
     if-eqz v0, :cond_0
 
@@ -609,16 +609,16 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/g$a;->JL:Lcom/facebook/c/g;
+    iget-object v0, p0, Lcom/facebook/c/g$a;->JU:Lcom/facebook/c/g;
 
-    iget-boolean v0, v0, Lcom/facebook/c/g;->JF:Z
+    iget-boolean v0, v0, Lcom/facebook/c/g;->JO:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/c/g$a;->gK()V
+    invoke-direct {p0}, Lcom/facebook/c/g$a;->gN()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/cache/common/CacheKey.smali b/com.discord/smali/com/facebook/cache/common/CacheKey.smali
index 581a8e8479..a8792823d4 100644
--- a/com.discord/smali/com/facebook/cache/common/CacheKey.smali
+++ b/com.discord/smali/com/facebook/cache/common/CacheKey.smali
@@ -7,7 +7,7 @@
 .method public abstract equals(Ljava/lang/Object;)Z
 .end method
 
-.method public abstract fI()Ljava/lang/String;
+.method public abstract fL()Ljava/lang/String;
 .end method
 
 .method public abstract hashCode()I
diff --git a/com.discord/smali/com/facebook/cache/common/e.smali b/com.discord/smali/com/facebook/cache/common/e.smali
index 258cf2d0f9..4a96a4468d 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 Gx:Lcom/facebook/cache/common/e;
+.field private static GG: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 fJ()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;->Gx:Lcom/facebook/cache/common/e;
+    sget-object v1, Lcom/facebook/cache/common/e;->GG: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;->Gx:Lcom/facebook/cache/common/e;
+    sput-object v1, Lcom/facebook/cache/common/e;->GG:Lcom/facebook/cache/common/e;
 
     :cond_0
-    sget-object v1, Lcom/facebook/cache/common/e;->Gx:Lcom/facebook/cache/common/e;
+    sget-object v1, Lcom/facebook/cache/common/e;->GG: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 bee758414a..ff4804b037 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 Gy:Lcom/facebook/cache/common/f;
+.field private static GH: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 fK()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;->Gy:Lcom/facebook/cache/common/f;
+    sget-object v1, Lcom/facebook/cache/common/f;->GH: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;->Gy:Lcom/facebook/cache/common/f;
+    sput-object v1, Lcom/facebook/cache/common/f;->GH:Lcom/facebook/cache/common/f;
 
     :cond_0
-    sget-object v1, Lcom/facebook/cache/common/f;->Gy:Lcom/facebook/cache/common/f;
+    sget-object v1, Lcom/facebook/cache/common/f;->GH: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 0d72da4bcd..ea817277d8 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field GE:Lcom/facebook/cache/common/a;
+.field GN:Lcom/facebook/cache/common/a;
 
-.field public GO:Ljava/lang/String;
+.field public GY:Ljava/lang/String;
 
-.field public GP:Lcom/facebook/common/d/l;
+.field public GZ:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -29,19 +29,19 @@
     .end annotation
 .end field
 
-.field GU:Lcom/facebook/cache/disk/g;
+.field Hd:Lcom/facebook/cache/disk/g;
 
-.field GV:Lcom/facebook/cache/common/b;
+.field He:Lcom/facebook/cache/common/b;
 
-.field GW:Lcom/facebook/common/a/a;
+.field Hf:Lcom/facebook/common/a/a;
 
-.field GX:Z
+.field Hg:Z
 
-.field public GY:J
+.field public Hh:J
 
-.field GZ:J
+.field Hi:J
 
-.field Ha:J
+.field Hj: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;->GO:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY:Ljava/lang/String;
 
     const-wide/32 v0, 0x2800000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hh:J
 
     const-wide/32 v0, 0xa00000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hi:J
 
     const-wide/32 v0, 0x200000
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ha:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hj: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;->GU:Lcom/facebook/cache/disk/g;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hd:Lcom/facebook/cache/disk/g;
 
     iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->mContext:Landroid/content/Context;
 
@@ -102,10 +102,10 @@
 
 
 # virtual methods
-.method public final fR()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;->GP:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
 
     const/4 v1, 0x0
 
@@ -131,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;->GP:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
 
     if-nez v0, :cond_2
 
@@ -143,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;->GP:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
 
     :cond_2
     new-instance v0, Lcom/facebook/cache/disk/DiskCacheConfig;
diff --git a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
index ab16698bec..e16532a954 100644
--- a/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
+++ b/com.discord/smali/com/facebook/cache/disk/DiskCacheConfig.smali
@@ -12,11 +12,11 @@
 
 
 # instance fields
-.field public final GE:Lcom/facebook/cache/common/a;
+.field public final GN:Lcom/facebook/cache/common/a;
 
-.field public final GO:Ljava/lang/String;
+.field public final GY:Ljava/lang/String;
 
-.field public final GP:Lcom/facebook/common/d/l;
+.field public final GZ:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -26,19 +26,19 @@
     .end annotation
 .end field
 
-.field public final GQ:J
+.field public final Ha:J
 
-.field public final GR:J
+.field public final Hb:J
 
-.field public final GS:J
+.field public final Hc:J
 
-.field public final GU:Lcom/facebook/cache/disk/g;
+.field public final Hd:Lcom/facebook/cache/disk/g;
 
-.field public final GV:Lcom/facebook/cache/common/b;
+.field public final He:Lcom/facebook/cache/common/b;
 
-.field public final GW:Lcom/facebook/common/a/a;
+.field public final Hf:Lcom/facebook/common/a/a;
 
-.field public final GX:Z
+.field public final Hg:Z
 
 .field public 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;->GO:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY: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;->GO:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GY:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GP:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:Lcom/facebook/common/d/l;
 
     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/l;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GP:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GZ:Lcom/facebook/common/d/l;
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GY:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hh:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GQ:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Ha:J
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GZ:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hi:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GR:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hb:J
 
-    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Ha:J
+    iget-wide v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hj:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GS:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hc:J
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GU:Lcom/facebook/cache/disk/g;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hd: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;->GU:Lcom/facebook/cache/disk/g;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hd:Lcom/facebook/cache/disk/g;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GE:Lcom/facebook/cache/common/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GN:Lcom/facebook/cache/common/a;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/cache/common/e;->fJ()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;->GE:Lcom/facebook/cache/common/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GN:Lcom/facebook/cache/common/a;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GE:Lcom/facebook/cache/common/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GN:Lcom/facebook/cache/common/a;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GV:Lcom/facebook/cache/common/b;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->He:Lcom/facebook/cache/common/b;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/cache/common/f;->fK()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;->GV:Lcom/facebook/cache/common/b;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->He:Lcom/facebook/cache/common/b;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GV:Lcom/facebook/cache/common/b;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->He:Lcom/facebook/cache/common/b;
 
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GW:Lcom/facebook/common/a/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hf:Lcom/facebook/common/a/a;
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/common/a/b;->fX()Lcom/facebook/common/a/b;
+    invoke-static {}, Lcom/facebook/common/a/b;->ga()Lcom/facebook/common/a/b;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->GW:Lcom/facebook/common/a/a;
+    iget-object v0, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hf:Lcom/facebook/common/a/a;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GW:Lcom/facebook/common/a/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hf: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;->GX:Z
+    iget-boolean p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig$a;->Hg:Z
 
-    iput-boolean p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->GX:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig;->Hg: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 75915f612e..3b26fd5269 100644
--- a/com.discord/smali/com/facebook/cache/disk/a.smali
+++ b/com.discord/smali/com/facebook/cache/disk/a.smali
@@ -20,9 +20,7 @@
 
 
 # static fields
-.field static final GA:J
-
-.field private static final Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -31,17 +29,19 @@
     .end annotation
 .end field
 
+.field static final GJ:J
+
 
 # instance fields
-.field private final GB:Ljava/io/File;
+.field private final GK:Ljava/io/File;
 
-.field private final GC:Z
+.field private final GL:Z
 
-.field private final GD:Ljava/io/File;
+.field private final GM:Ljava/io/File;
 
-.field private final GE:Lcom/facebook/cache/common/a;
+.field private final GN:Lcom/facebook/cache/common/a;
 
-.field private final GF:Lcom/facebook/common/time/a;
+.field private final GO: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/a;->GI: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;->GA:J
+    sput-wide v0, Lcom/facebook/cache/disk/a;->GJ: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;->GB:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GK: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;->GC:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a;->GL:Z
 
     new-instance p1, Ljava/io/File;
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GB:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GK: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;->GD:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GM:Ljava/io/File;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/a;->GE:Lcom/facebook/cache/common/a;
+    iput-object p3, p0, Lcom/facebook/cache/disk/a;->GN:Lcom/facebook/cache/common/a;
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GB:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GK: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;->GD:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GM:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->exists()Z
 
@@ -145,7 +145,7 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GB:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GK:Ljava/io/File;
 
     invoke-static {p1}, Lcom/facebook/common/c/a;->m(Ljava/io/File;)Z
 
@@ -158,7 +158,7 @@
     if-eqz v4, :cond_2
 
     :try_start_0
-    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GD:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a;->GM:Ljava/io/File;
 
     invoke-static {p1}, Lcom/facebook/common/c/c;->n(Ljava/io/File;)V
     :try_end_0
@@ -167,7 +167,7 @@
     goto :goto_1
 
     :catch_0
-    sget p1, Lcom/facebook/cache/common/a$a;->Gj:I
+    sget p1, Lcom/facebook/cache/common/a$a;->Gs: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;->GD:Ljava/io/File;
+    iget-object p2, p0, Lcom/facebook/cache/disk/a;->GM: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;->gy()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->gB()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GF:Lcom/facebook/common/time/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a;->GO:Lcom/facebook/common/time/a;
 
     return-void
 .end method
@@ -282,7 +282,7 @@
     :goto_2
     if-eqz v1, :cond_6
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/a$c;->GJ:Ljava/lang/String;
+    iget-object v0, v1, Lcom/facebook/cache/disk/a$c;->GS:Ljava/lang/String;
 
     invoke-direct {p0, v0}, Lcom/facebook/cache/disk/a;->ao(Ljava/lang/String;)Ljava/io/File;
 
@@ -307,7 +307,7 @@
 .method static synthetic a(Lcom/facebook/cache/disk/a;)Ljava/io/File;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GD:Ljava/io/File;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GM:Ljava/io/File;
 
     return-object p0
 .end method
@@ -333,7 +333,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a;->GD:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a;->GM:Ljava/io/File;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -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;->GB:Ljava/io/File;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GK: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;->GF:Lcom/facebook/common/time/a;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GO: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;->GE:Lcom/facebook/cache/common/a;
+    iget-object p0, p0, Lcom/facebook/cache/disk/a;->GN:Lcom/facebook/cache/common/a;
 
     return-object p0
 .end method
 
-.method static synthetic fN()Ljava/lang/Class;
+.method static synthetic fQ()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/cache/disk/a;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/cache/disk/a;->GI: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;->Gp:I
+    sget p0, Lcom/facebook/cache/common/a$a;->Gy: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;->Gp:I
+    sget p0, Lcom/facebook/cache/common/a$a;->Gy: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;->GI:Lcom/facebook/a/b;
+    iget-object p1, p1, Lcom/facebook/cache/disk/a$b;->GR:Lcom/facebook/a/b;
 
     iget-object p1, p1, Lcom/facebook/a/b;->mFile:Ljava/io/File;
 
@@ -508,7 +508,7 @@
 
     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;->GJ:Ljava/lang/String;
+    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->GS:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/facebook/cache/disk/a;->an(Ljava/lang/String;)Ljava/lang/String;
 
@@ -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;->GJ:Ljava/lang/String;
+    iget-object p1, v1, Lcom/facebook/cache/disk/a$c;->GS:Ljava/lang/String;
 
     invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -571,7 +571,7 @@
 
     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;->GJ:Ljava/lang/String;
+    iget-object v1, p2, Lcom/facebook/cache/disk/a$c;->GS:Ljava/lang/String;
 
     invoke-direct {p0, v1}, Lcom/facebook/cache/disk/a;->ao(Ljava/lang/String;)Ljava/io/File;
 
@@ -593,7 +593,7 @@
     :catch_0
     move-exception p1
 
-    sget p2, Lcom/facebook/cache/common/a$a;->Gj:I
+    sget p2, Lcom/facebook/cache/common/a$a;->Gs: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;->GJ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/facebook/cache/disk/a$c;->GS: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;->Ge:I
+    sget p2, Lcom/facebook/cache/common/a$a;->Gn:I
 
     throw p1
 .end method
@@ -651,7 +651,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/a;->GF:Lcom/facebook/common/time/a;
+    iget-object p2, p0, Lcom/facebook/cache/disk/a;->GO: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 fL()V
+.method public final fO()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GB:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a;->GK:Ljava/io/File;
 
     new-instance v1, Lcom/facebook/cache/disk/a$f;
 
@@ -687,7 +687,7 @@
     return-void
 .end method
 
-.method public final synthetic fM()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;->GD:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a;->GM: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;->GG:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/cache/disk/a$a;->GP: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;->GC:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a;->GL: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 7c291b0981..1adf296264 100644
--- a/com.discord/smali/com/facebook/cache/disk/c.smali
+++ b/com.discord/smali/com/facebook/cache/disk/c.smali
@@ -45,10 +45,10 @@
     .end annotation
 .end method
 
-.method public abstract fL()V
+.method public abstract fO()V
 .end method
 
-.method public abstract fM()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 dc834aeb18..0bd8274e88 100644
--- a/com.discord/smali/com/facebook/cache/disk/d.smali
+++ b/com.discord/smali/com/facebook/cache/disk/d.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field private static final Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,31 +25,31 @@
     .end annotation
 .end field
 
-.field private static final Hc:J
+.field private static final Hl:J
 
-.field private static final Hd:J
+.field private static final Hm:J
 
 
 # instance fields
-.field private final GE:Lcom/facebook/cache/common/a;
+.field private final GN:Lcom/facebook/cache/common/a;
 
-.field private final GF:Lcom/facebook/common/time/a;
+.field private final GO:Lcom/facebook/common/time/a;
 
-.field private final GU:Lcom/facebook/cache/disk/g;
+.field private final Hd:Lcom/facebook/cache/disk/g;
 
-.field private final GV:Lcom/facebook/cache/common/b;
+.field private final He:Lcom/facebook/cache/common/b;
 
-.field private final GX:Z
+.field private final Hg:Z
 
-.field private final He:J
+.field private final Hn:J
 
-.field private final Hf:J
+.field private final Ho:J
 
-.field private final Hg:Ljava/util/concurrent/CountDownLatch;
+.field private final Hp:Ljava/util/concurrent/CountDownLatch;
 
-.field private Hh:J
+.field private Hq:J
 
-.field final Hi:Ljava/util/Set;
+.field final Hr:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -59,17 +59,17 @@
     .end annotation
 .end field
 
-.field private Hj:J
+.field private Hs:J
 
-.field private final Hk:J
+.field private final Ht:J
 
-.field private final Hl:Lcom/facebook/common/h/a;
+.field private final Hu:Lcom/facebook/common/h/a;
 
-.field private final Hm:Lcom/facebook/cache/disk/c;
+.field private final Hv:Lcom/facebook/cache/disk/c;
 
-.field private final Hn:Lcom/facebook/cache/disk/d$a;
+.field private final Hw:Lcom/facebook/cache/disk/d$a;
 
-.field private Ho:Z
+.field private Hx: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/d;->GI: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;->Hc:J
+    sput-wide v0, Lcom/facebook/cache/disk/d;->Hl: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;->Hd:J
+    sput-wide v0, Lcom/facebook/cache/disk/d;->Hm: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;->He:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Hn:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->He:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hn:J
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Hf:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Ho:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hf:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Ho:J
 
-    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Hf:J
+    iget-wide v0, p3, Lcom/facebook/cache/disk/d$b;->Ho:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hh:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d;->Hq:J
 
-    invoke-static {}, Lcom/facebook/common/h/a;->gu()Lcom/facebook/common/h/a;
+    invoke-static {}, Lcom/facebook/common/h/a;->gx()Lcom/facebook/common/h/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/d;->Hl:Lcom/facebook/common/h/a;
+    iput-object v0, p0, Lcom/facebook/cache/disk/d;->Hu:Lcom/facebook/common/h/a;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hm:Lcom/facebook/cache/disk/c;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/d;->GU:Lcom/facebook/cache/disk/g;
+    iput-object p2, p0, Lcom/facebook/cache/disk/d;->Hd:Lcom/facebook/cache/disk/g;
 
     const-wide/16 p1, -0x1
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Hj:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Hs:J
 
-    iput-object p4, p0, Lcom/facebook/cache/disk/d;->GV:Lcom/facebook/cache/common/b;
+    iput-object p4, p0, Lcom/facebook/cache/disk/d;->He:Lcom/facebook/cache/common/b;
 
-    iget-wide p1, p3, Lcom/facebook/cache/disk/d$b;->Hk:J
+    iget-wide p1, p3, Lcom/facebook/cache/disk/d$b;->Ht:J
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Hk:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d;->Ht:J
 
-    iput-object p5, p0, Lcom/facebook/cache/disk/d;->GE:Lcom/facebook/cache/common/a;
+    iput-object p5, p0, Lcom/facebook/cache/disk/d;->GN: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;->Hn:Lcom/facebook/cache/disk/d$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-static {}, Lcom/facebook/common/time/c;->gy()Lcom/facebook/common/time/c;
+    invoke-static {}, Lcom/facebook/common/time/c;->gB()Lcom/facebook/common/time/c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->GF:Lcom/facebook/common/time/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->GO:Lcom/facebook/common/time/a;
 
-    iput-boolean p7, p0, Lcom/facebook/cache/disk/d;->GX:Z
+    iput-boolean p7, p0, Lcom/facebook/cache/disk/d;->Hg:Z
 
     new-instance p1, Ljava/util/HashSet;
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
 
-    iget-boolean p1, p0, Lcom/facebook/cache/disk/d;->GX:Z
+    iget-boolean p1, p0, Lcom/facebook/cache/disk/d;->Hg: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;->Hg:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hp: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;->Hg:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d;->Hp:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
@@ -215,17 +215,17 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fP()Lcom/facebook/a/a;
+    invoke-interface {p1}, Lcom/facebook/cache/disk/c$b;->fS()Lcom/facebook/a/a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
 
     invoke-interface {v1, p2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object p2, p0, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-interface {p1}, Lcom/facebook/a/a;->fH()J
+    invoke-interface {p1}, Lcom/facebook/a/a;->fK()J
 
     move-result-wide v1
 
@@ -262,11 +262,11 @@
     monitor-enter v2
 
     :try_start_0
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fS()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;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
 
     invoke-interface {v3}, Lcom/facebook/cache/disk/c;->isExternal()Z
 
@@ -274,31 +274,31 @@
 
     if-eqz v3, :cond_0
 
-    sget v3, Lcom/facebook/common/h/a$a;->IK:I
+    sget v3, Lcom/facebook/common/h/a$a;->IU:I
 
     goto :goto_0
 
     :cond_0
-    sget v3, Lcom/facebook/common/h/a$a;->IJ:I
+    sget v3, Lcom/facebook/common/h/a$a;->IT:I
 
     :goto_0
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hl:Lcom/facebook/common/h/a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hu:Lcom/facebook/common/h/a;
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hf:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Ho:J
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v7}, Lcom/facebook/cache/disk/d$a;->fO()J
+    invoke-virtual {v7}, Lcom/facebook/cache/disk/d$a;->fR()J
 
     move-result-wide v7
 
     sub-long/2addr v5, v7
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gv()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gy()V
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gv()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gy()V
 
-    iget-object v7, v4, Lcom/facebook/common/h/a;->II:Ljava/util/concurrent/locks/Lock;
+    iget-object v7, v4, Lcom/facebook/common/h/a;->IS: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;->IH:J
+    iget-wide v9, v4, Lcom/facebook/common/h/a;->IR:J
 
     sub-long/2addr v7, v9
 
-    sget-wide v9, Lcom/facebook/common/h/a;->IC:J
+    sget-wide v9, Lcom/facebook/common/h/a;->IL:J
 
     cmp-long v11, v7, v9
 
     if-lez v11, :cond_1
 
-    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gw()V
+    invoke-virtual {v4}, Lcom/facebook/common/h/a;->gz()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;->II:Ljava/util/concurrent/locks/Lock;
+    iget-object v7, v4, Lcom/facebook/common/h/a;->IS: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;->II:Ljava/util/concurrent/locks/Lock;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->IS: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;->IJ:I
+    sget v7, Lcom/facebook/common/h/a$a;->IT:I
 
     if-ne v3, v7, :cond_3
 
-    iget-object v3, v4, Lcom/facebook/common/h/a;->ID:Landroid/os/StatFs;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
 
     goto :goto_2
 
     :cond_3
-    iget-object v3, v4, Lcom/facebook/common/h/a;->IF:Landroid/os/StatFs;
+    iget-object v3, v4, Lcom/facebook/common/h/a;->IP: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;->He:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hn:J
 
-    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hh:J
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hq:J
 
     goto :goto_6
 
     :cond_7
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hf:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Ho:J
 
-    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hh:J
+    iput-wide v3, v1, Lcom/facebook/cache/disk/d;->Hq:J
 
     :goto_6
-    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v3, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v3}, Lcom/facebook/cache/disk/d$a;->fO()J
+    invoke-virtual {v3}, Lcom/facebook/cache/disk/d$a;->fR()J
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hh:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hq:J
 
     cmp-long v10, v3, v5
 
@@ -446,20 +446,20 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hw: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;->fS()Z
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/cache/disk/d;->fV()Z
 
     :cond_8
-    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hh:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/d;->Hq:J
 
     cmp-long v0, v3, v5
 
     if-lez v0, :cond_d
 
-    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hh:J
+    iget-wide v3, v1, Lcom/facebook/cache/disk/d;->Hq:J
 
     const-wide/16 v5, 0x9
 
@@ -469,24 +469,24 @@
 
     div-long/2addr v3, v5
 
-    sget v0, Lcom/facebook/cache/common/b$a;->Gr:I
+    sget v0, Lcom/facebook/cache/common/b$a;->GA: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;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/c;->fM()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;->GF:Lcom/facebook/common/time/a;
+    iget-object v6, v1, Lcom/facebook/cache/disk/d;->GO: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;->Hc:J
+    sget-wide v12, Lcom/facebook/cache/disk/d;->Hl:J
 
     add-long/2addr v10, v12
 
@@ -541,9 +541,9 @@
     goto :goto_7
 
     :cond_a
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->GU:Lcom/facebook/cache/disk/g;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hd:Lcom/facebook/cache/disk/g;
 
-    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->fQ()Lcom/facebook/cache/disk/f;
+    invoke-interface {v5}, Lcom/facebook/cache/disk/g;->fT()Lcom/facebook/cache/disk/f;
 
     move-result-object v5
 
@@ -555,9 +555,9 @@
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
     :try_start_4
-    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v5}, Lcom/facebook/cache/disk/d$a;->fO()J
+    invoke-virtual {v5}, Lcom/facebook/cache/disk/d$a;->fR()J
 
     move-result-wide v10
 
@@ -586,7 +586,7 @@
 
     if-gtz v16, :cond_c
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hv: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;->Hi:Ljava/util/Set;
+    iget-object v5, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
 
     move-wide/from16 v18, v12
 
@@ -614,7 +614,7 @@
 
     add-long/2addr v14, v7
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fW()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fZ()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;->GK:Ljava/lang/String;
+    iput-object v6, v5, Lcom/facebook/cache/disk/i;->GU:Ljava/lang/String;
 
-    iput v0, v5, Lcom/facebook/cache/disk/i;->HD:I
+    iput v0, v5, Lcom/facebook/cache/disk/i;->HM:I
 
-    iput-wide v7, v5, Lcom/facebook/cache/disk/i;->Hz:J
+    iput-wide v7, v5, Lcom/facebook/cache/disk/i;->HI:J
 
     sub-long v6, v10, v14
 
-    iput-wide v6, v5, Lcom/facebook/cache/disk/i;->HB:J
+    iput-wide v6, v5, Lcom/facebook/cache/disk/i;->HK:J
 
-    iput-wide v3, v5, Lcom/facebook/cache/disk/i;->HA:J
+    iput-wide v3, v5, Lcom/facebook/cache/disk/i;->HJ: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;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hw: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;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fL()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;->Gn:I
+    sget v3, Lcom/facebook/cache/common/a$a;->Gw: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;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hv: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;->fS()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;->Ho:Z
+    iput-boolean v0, p0, Lcom/facebook/cache/disk/d;->Hx: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;->Hg:Ljava/util/concurrent/CountDownLatch;
+    iget-object p0, p0, Lcom/facebook/cache/disk/d;->Hp:Ljava/util/concurrent/CountDownLatch;
 
     return-object p0
 .end method
 
-.method private fS()Z
+.method private fV()Z
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/d;->GF:Lcom/facebook/common/time/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d;->GO: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;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v2, p0, Lcom/facebook/cache/disk/d;->Hw: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;->Hj:J
+    iget-wide v2, p0, Lcom/facebook/cache/disk/d;->Hs:J
 
     const-wide/16 v4, -0x1
 
@@ -779,7 +779,7 @@
 
     sub-long/2addr v0, v2
 
-    sget-wide v2, Lcom/facebook/cache/disk/d;->Hd:J
+    sget-wide v2, Lcom/facebook/cache/disk/d;->Hm:J
 
     cmp-long v4, v0, v2
 
@@ -794,33 +794,33 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fT()Z
+    invoke-direct {p0}, Lcom/facebook/cache/disk/d;->fW()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method private fT()Z
+.method private fW()Z
     .locals 23
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->GF:Lcom/facebook/common/time/a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->GO: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;->Hc:J
+    sget-wide v4, Lcom/facebook/cache/disk/d;->Hl:J
 
     add-long/2addr v4, v2
 
-    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->GX:Z
+    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->Hg:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hr: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;->Hi:Ljava/util/Set;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
 
     goto :goto_0
 
     :cond_0
-    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->GX:Z
+    iget-boolean v0, v1, Lcom/facebook/cache/disk/d;->Hg:Z
 
     if-eqz v0, :cond_1
 
@@ -848,9 +848,9 @@
 
     :goto_0
     :try_start_0
-    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v7, v1, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
 
-    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->fM()Ljava/util/Collection;
+    invoke-interface {v7}, Lcom/facebook/cache/disk/c;->fP()Ljava/util/Collection;
 
     move-result-object v7
 
@@ -891,7 +891,7 @@
 
     add-int/lit8 v10, v10, 0x1
 
-    invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->fO()J
+    invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->fR()J
 
     move-result-wide v17
 
@@ -911,7 +911,7 @@
 
     int-to-long v6, v14
 
-    invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->fO()J
+    invoke-interface/range {v16 .. v16}, Lcom/facebook/cache/disk/c$a;->fR()J
 
     move-result-wide v19
 
@@ -938,7 +938,7 @@
     :cond_2
     move-object/from16 v18, v7
 
-    iget-boolean v6, v1, Lcom/facebook/cache/disk/d;->GX:Z
+    iget-boolean v6, v1, Lcom/facebook/cache/disk/d;->Hg: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;->Gc:I
+    sget v4, Lcom/facebook/cache/common/a$a;->Gl:I
 
     new-instance v4, Ljava/lang/StringBuilder;
 
@@ -983,9 +983,9 @@
     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;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fU()J
+    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fX()J
 
     move-result-wide v4
 
@@ -995,9 +995,9 @@
 
     if-nez v8, :cond_6
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fO()J
+    invoke-virtual {v4}, Lcom/facebook/cache/disk/d$a;->fR()J
 
     move-result-wide v4
 
@@ -1006,31 +1006,31 @@
     if-eqz v8, :cond_8
 
     :cond_6
-    iget-boolean v4, v1, Lcom/facebook/cache/disk/d;->GX:Z
+    iget-boolean v4, v1, Lcom/facebook/cache/disk/d;->Hg:Z
 
     if-eqz v4, :cond_7
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
 
     if-eq v4, v0, :cond_7
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hr:Ljava/util/Set;
 
     invoke-interface {v4}, Ljava/util/Set;->clear()V
 
-    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iget-object v4, v1, Lcom/facebook/cache/disk/d;->Hr: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;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v0, v1, Lcom/facebook/cache/disk/d;->Hw: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;->Hj:J
+    iput-wide v2, v1, Lcom/facebook/cache/disk/d;->Hs:J
 
     const/4 v0, 0x1
 
@@ -1039,7 +1039,7 @@
     :catch_0
     move-exception v0
 
-    sget v2, Lcom/facebook/cache/common/a$a;->Go:I
+    sget v2, Lcom/facebook/cache/common/a$a;->Gx:I
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -1068,11 +1068,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/cache/disk/i;->fW()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fZ()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HH: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;->GK:Ljava/lang/String;
+    iput-object v2, v0, Lcom/facebook/cache/disk/i;->GU: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;
@@ -1104,19 +1104,19 @@
 
     move-result-object p2
 
-    invoke-interface {p2}, Lcom/facebook/a/a;->fH()J
+    invoke-interface {p2}, Lcom/facebook/a/a;->fK()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->Hz:J
+    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HI:J
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hn:Lcom/facebook/cache/disk/d$a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d;->Hw:Lcom/facebook/cache/disk/d$a;
 
-    invoke-virtual {v1}, Lcom/facebook/cache/disk/d$a;->fO()J
+    invoke-virtual {v1}, Lcom/facebook/cache/disk/d$a;->fR()J
 
     move-result-wide v1
 
-    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HB:J
+    iput-wide v1, v0, Lcom/facebook/cache/disk/i;->HK:J
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -1127,7 +1127,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/facebook/cache/disk/d;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/cache/disk/d;->GI:Ljava/lang/Class;
 
     const-string v1, "Failed to delete temp file"
 
@@ -1151,7 +1151,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lcom/facebook/cache/disk/d;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/cache/disk/d;->GI: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;->HC:Ljava/io/IOException;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HL:Ljava/io/IOException;
 
-    sget-object p2, Lcom/facebook/cache/disk/d;->Gz:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/cache/disk/d;->GI: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;->fW()Lcom/facebook/cache/disk/i;
+    invoke-static {}, Lcom/facebook/cache/disk/i;->fZ()Lcom/facebook/cache/disk/i;
 
     move-result-object v0
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HH: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;->GK:Ljava/lang/String;
+    iput-object v5, v0, Lcom/facebook/cache/disk/i;->GU:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/facebook/cache/disk/d;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v6, p0, Lcom/facebook/cache/disk/d;->Hv: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;->Hi:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/cache/disk/d;->Hr: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;->Hi:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/cache/disk/d;->Hr: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;->Go:I
+    sget v2, Lcom/facebook/cache/common/a$a;->Gx:I
 
-    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HC:Ljava/io/IOException;
+    iput-object p1, v0, Lcom/facebook/cache/disk/i;->HL: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;->Hm:Lcom/facebook/cache/disk/c;
+    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Hv:Lcom/facebook/cache/disk/c;
 
     invoke-interface {v3, v2}, Lcom/facebook/cache/disk/c;->ap(Ljava/lang/String;)J
 
-    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Hi:Ljava/util/Set;
+    iget-object v3, p0, Lcom/facebook/cache/disk/d;->Hr: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;->Gm:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gv: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 acc0258a4b..afbe0e5901 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 Ht:Lcom/facebook/cache/disk/c;
+.field public final HC:Lcom/facebook/cache/disk/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Hu:Ljava/io/File;
+.field public final HD: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;->Ht:Lcom/facebook/cache/disk/c;
+    iput-object p2, p0, Lcom/facebook/cache/disk/e$a;->HC:Lcom/facebook/cache/disk/c;
 
-    iput-object p1, p0, Lcom/facebook/cache/disk/e$a;->Hu:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/cache/disk/e$a;->HD: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 72ec232412..c12a5ddee3 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 HF:Lcom/facebook/common/a/b;
+.field private static HO: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 fX()Lcom/facebook/common/a/b;
+.method public static declared-synchronized ga()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;->HF:Lcom/facebook/common/a/b;
+    sget-object v1, Lcom/facebook/common/a/b;->HO: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;->HF:Lcom/facebook/common/a/b;
+    sput-object v1, Lcom/facebook/common/a/b;->HO:Lcom/facebook/common/a/b;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/a/b;->HF:Lcom/facebook/common/a/b;
+    sget-object v1, Lcom/facebook/common/a/b;->HO: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/e.smali b/com.discord/smali/com/facebook/common/b/e.smali
index 61c9a7573b..0ebcbb6efc 100644
--- a/com.discord/smali/com/facebook/common/b/e.smali
+++ b/com.discord/smali/com/facebook/common/b/e.smali
@@ -134,7 +134,7 @@
     return-void
 .end method
 
-.method public final gb()Z
+.method public final gf()Z
     .locals 2
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
diff --git a/com.discord/smali/com/facebook/common/b/f.smali b/com.discord/smali/com/facebook/common/b/f.smali
index dbca7aa83d..88940ce51e 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 HN:Ljava/util/concurrent/FutureTask;
+.field private final HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iput-object p1, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iput-object p1, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HW: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;->HN:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lcom/facebook/common/b/f;->HW: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 a45a9e9220..3e384cf330 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 HO:Ljava/util/concurrent/atomic/AtomicInteger;
+.field protected final HX: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;->HO:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/common/b/h;->HX: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;->HO:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/h;->HX: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;->gd()V
+    invoke-virtual {p0}, Lcom/facebook/common/b/h;->gg()V
 
     :cond_0
     return-void
 .end method
 
-.method protected gd()V
+.method protected gg()V
     .locals 0
 
     return-void
@@ -113,7 +113,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/common/b/h;->HO:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/h;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v1, 0x0
 
@@ -135,7 +135,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;->HO:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/h;->HX:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/4 v2, 0x3
 
@@ -160,7 +160,7 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/common/b/h;->HO:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/h;->HX: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 56e3fe87e3..8910c99f6f 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 HP:Lcom/facebook/common/b/i;
+.field private static HY: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 ge()Lcom/facebook/common/b/i;
+.method public static gh()Lcom/facebook/common/b/i;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/i;->HP:Lcom/facebook/common/b/i;
+    sget-object v0, Lcom/facebook/common/b/i;->HY: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;->HP:Lcom/facebook/common/b/i;
+    sput-object v0, Lcom/facebook/common/b/i;->HY:Lcom/facebook/common/b/i;
 
     :cond_0
-    sget-object v0, Lcom/facebook/common/b/i;->HP:Lcom/facebook/common/b/i;
+    sget-object v0, Lcom/facebook/common/b/i;->HY:Lcom/facebook/common/b/i;
 
     return-object v0
 .end method
@@ -57,7 +57,7 @@
 .method public final execute(Ljava/lang/Runnable;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/common/b/i;->gb()Z
+    invoke-virtual {p0}, Lcom/facebook/common/b/i;->gf()Z
 
     move-result v0
 
diff --git a/com.discord/smali/com/facebook/common/d/b.smali b/com.discord/smali/com/facebook/common/d/b.smali
index 3dcc3770de..f273d6bb18 100644
--- a/com.discord/smali/com/facebook/common/d/b.smali
+++ b/com.discord/smali/com/facebook/common/d/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final HQ:Ljava/util/logging/Logger;
+.field static final HZ:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/d/b;->HQ:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/facebook/common/d/b;->HZ:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
     :catch_0
     move-exception p0
 
-    sget-object v0, Lcom/facebook/common/d/b;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/facebook/common/d/b;->HZ:Ljava/util/logging/Logger;
 
     sget-object v1, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
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 9dfdda48f0..336e47b9ae 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 HU:Lcom/facebook/common/d/h$a$a;
+.field Id: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 ee4df153f6..2a11fedc08 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 HR:Lcom/facebook/common/d/h$a$a;
+.field private Ia:Lcom/facebook/common/d/h$a$a;
 
-.field private HS:Lcom/facebook/common/d/h$a$a;
+.field private Ib:Lcom/facebook/common/d/h$a$a;
 
-.field private HT:Z
+.field private Ic: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;->HR:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->Ia:Lcom/facebook/common/d/h$a$a;
 
-    iget-object v0, p0, Lcom/facebook/common/d/h$a;->HR:Lcom/facebook/common/d/h$a$a;
+    iget-object v0, p0, Lcom/facebook/common/d/h$a;->Ia:Lcom/facebook/common/d/h$a$a;
 
-    iput-object v0, p0, Lcom/facebook/common/d/h$a;->HS:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->Ib:Lcom/facebook/common/d/h$a$a;
 
-    iput-boolean v1, p0, Lcom/facebook/common/d/h$a;->HT:Z
+    iput-boolean v1, p0, Lcom/facebook/common/d/h$a;->Ic: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 gf()Lcom/facebook/common/d/h$a$a;
+.method private gi()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;->HS:Lcom/facebook/common/d/h$a$a;
+    iget-object v1, p0, Lcom/facebook/common/d/h$a;->Ib:Lcom/facebook/common/d/h$a$a;
 
-    iput-object v0, v1, Lcom/facebook/common/d/h$a$a;->HU:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, v1, Lcom/facebook/common/d/h$a$a;->Id:Lcom/facebook/common/d/h$a$a;
 
-    iput-object v0, p0, Lcom/facebook/common/d/h$a;->HS:Lcom/facebook/common/d/h$a$a;
+    iput-object v0, p0, Lcom/facebook/common/d/h$a;->Ib: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;->gf()Lcom/facebook/common/d/h$a$a;
+    invoke-direct {p0}, Lcom/facebook/common/d/h$a;->gi()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;->HT:Z
+    iget-boolean v0, p0, Lcom/facebook/common/d/h$a;->Ic: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;->HR:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, p0, Lcom/facebook/common/d/h$a;->Ia:Lcom/facebook/common/d/h$a$a;
 
-    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->HU:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->Id: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;->HU:Lcom/facebook/common/d/h$a$a;
+    iget-object v2, v2, Lcom/facebook/common/d/h$a$a;->Id: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 b579bdd3bf..8a897a757e 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 Ic:Ljava/util/Map;
+.field public static final Il:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,7 +32,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/f/a;->Ic:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/f/a;->Il:Ljava/util/Map;
 
     return-void
 .end method
@@ -120,7 +120,7 @@
 
     if-nez v0, :cond_3
 
-    sget-object v0, Lcom/facebook/common/f/a;->Ic:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/f/a;->Il: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 27f5efa080..48b7ce4557 100644
--- a/com.discord/smali/com/facebook/common/g/f.smali
+++ b/com.discord/smali/com/facebook/common/g/f.smali
@@ -26,7 +26,7 @@
     .end annotation
 .end method
 
-.method public abstract gl()J
+.method public abstract go()J
 .end method
 
 .method public abstract isClosed()Z
diff --git a/com.discord/smali/com/facebook/common/h/a.smali b/com.discord/smali/com/facebook/common/h/a.smali
index e3e2a2132c..7ea50007e9 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 IB:Lcom/facebook/common/h/a;
+.field private static IK:Lcom/facebook/common/h/a;
 
-.field public static final IC:J
+.field public static final IL:J
 
 
 # instance fields
-.field public volatile ID:Landroid/os/StatFs;
+.field public volatile IM:Landroid/os/StatFs;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile IE:Ljava/io/File;
+.field private volatile IO:Ljava/io/File;
 
-.field public volatile IF:Landroid/os/StatFs;
+.field public volatile IP:Landroid/os/StatFs;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile IG:Ljava/io/File;
+.field private volatile IQ:Ljava/io/File;
 
-.field public IH:J
+.field public IR:J
 
-.field public final II:Ljava/util/concurrent/locks/Lock;
+.field public final IS: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;->IC:J
+    sput-wide v0, Lcom/facebook/common/h/a;->IL:J
 
     return-void
 .end method
@@ -63,9 +63,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->ID:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
 
-    iput-object v0, p0, Lcom/facebook/common/h/a;->IF:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IP: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;->II:Ljava/util/concurrent/locks/Lock;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IS:Ljava/util/concurrent/locks/Lock;
 
     return-void
 .end method
@@ -153,7 +153,7 @@
     return-object v0
 .end method
 
-.method public static declared-synchronized gu()Lcom/facebook/common/h/a;
+.method public static declared-synchronized gx()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;->IB:Lcom/facebook/common/h/a;
+    sget-object v1, Lcom/facebook/common/h/a;->IK: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;->IB:Lcom/facebook/common/h/a;
+    sput-object v1, Lcom/facebook/common/h/a;->IK:Lcom/facebook/common/h/a;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/h/a;->IB:Lcom/facebook/common/h/a;
+    sget-object v1, Lcom/facebook/common/h/a;->IK: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 gv()V
+.method public final gy()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;->II:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IS: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;->IE:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IO: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;->IG:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IQ:Ljava/io/File;
 
-    invoke-virtual {p0}, Lcom/facebook/common/h/a;->gw()V
+    invoke-virtual {p0}, Lcom/facebook/common/h/a;->gz()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;->II:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IS: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;->II:Ljava/util/concurrent/locks/Lock;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->IS: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 gw()V
+.method public gz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->ID:Landroid/os/StatFs;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->IE:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->IO: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;->ID:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IM:Landroid/os/StatFs;
 
-    iget-object v0, p0, Lcom/facebook/common/h/a;->IF:Landroid/os/StatFs;
+    iget-object v0, p0, Lcom/facebook/common/h/a;->IP:Landroid/os/StatFs;
 
-    iget-object v1, p0, Lcom/facebook/common/h/a;->IG:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/common/h/a;->IQ: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;->IF:Landroid/os/StatFs;
+    iput-object v0, p0, Lcom/facebook/common/h/a;->IP:Landroid/os/StatFs;
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/common/h/a;->IH:J
+    iput-wide v0, p0, Lcom/facebook/common/h/a;->IR: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 928c103f82..a96b646f8d 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 IZ:Landroid/net/Uri;
+.field private static final Ji:Landroid/net/Uri;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/j/f;->IZ:Landroid/net/Uri;
+    sput-object v0, Lcom/facebook/common/j/f;->Ji:Landroid/net/Uri;
 
     return-void
 .end method
@@ -300,7 +300,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/facebook/common/j/f;->IZ:Landroid/net/Uri;
+    sget-object v0, Lcom/facebook/common/j/f;->Ji: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 c4eeeee000..448bc69111 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 Ja:Z
+.field public static final Jj:Z
 
-.field public static final Jb:Z
+.field public static final Jk:Z
 
-.field public static final Jc:Z
+.field public static final Jl:Z
 
-.field public static Jd:Lcom/facebook/common/k/b;
+.field public static Jm:Lcom/facebook/common/k/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static Je:Z
+.field private static Jn:Z
 
-.field private static final Jf:[B
+.field private static final Jo:[B
 
-.field private static final Jg:[B
+.field private static final Jp:[B
 
-.field private static final Jh:[B
+.field private static final Jq:[B
 
-.field private static final Ji:[B
+.field private static final Jr:[B
 
-.field private static final Jj:[B
+.field private static final Js:[B
 
 
 # direct methods
@@ -50,7 +50,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/facebook/common/k/c;->Ja:Z
+    sput-boolean v0, Lcom/facebook/common/k/c;->Jj: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;->Jb:Z
+    sput-boolean v0, Lcom/facebook/common/k/c;->Jk:Z
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -111,13 +111,13 @@
 
     :cond_4
     :goto_3
-    sput-boolean v2, Lcom/facebook/common/k/c;->Jc:Z
+    sput-boolean v2, Lcom/facebook/common/k/c;->Jl:Z
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jd:Lcom/facebook/common/k/b;
+    sput-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
 
-    sput-boolean v3, Lcom/facebook/common/k/c;->Je:Z
+    sput-boolean v3, Lcom/facebook/common/k/c;->Jn:Z
 
     const-string v0, "RIFF"
 
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jf:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jo:[B
 
     const-string v0, "WEBP"
 
@@ -133,7 +133,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jg:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jp:[B
 
     const-string v0, "VP8 "
 
@@ -141,7 +141,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jh:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jq:[B
 
     const-string v0, "VP8L"
 
@@ -149,7 +149,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Ji:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Jr:[B
 
     const-string v0, "VP8X"
 
@@ -157,7 +157,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/k/c;->Jj:[B
+    sput-object v0, Lcom/facebook/common/k/c;->Js:[B
 
     return-void
 .end method
@@ -169,7 +169,7 @@
 
     if-lt p2, v0, :cond_0
 
-    sget-object p2, Lcom/facebook/common/k/c;->Jf:[B
+    sget-object p2, Lcom/facebook/common/k/c;->Jo:[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;->Jg:[B
+    sget-object p2, Lcom/facebook/common/k/c;->Jp:[B
 
     invoke-static {p0, p1, p2}, Lcom/facebook/common/k/c;->a([BI[B)Z
 
@@ -287,7 +287,7 @@
 
     const/16 p1, 0xc
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jj:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Js:[B
 
     invoke-static {p0, p1, v0}, Lcom/facebook/common/k/c;->a([BI[B)Z
 
@@ -308,7 +308,7 @@
 .method public static d([B)Z
     .locals 4
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jj:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Js:[B
 
     const/16 v1, 0xc
 
@@ -351,7 +351,7 @@
 .method public static e([B)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jh:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jq:[B
 
     const/16 v1, 0xc
 
@@ -365,7 +365,7 @@
 .method public static f([B)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/k/c;->Ji:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Jr:[B
 
     const/16 v1, 0xc
 
@@ -379,7 +379,7 @@
 .method public static g([B)Z
     .locals 4
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jj:[B
+    sget-object v0, Lcom/facebook/common/k/c;->Js:[B
 
     const/16 v1, 0xc
 
@@ -419,16 +419,16 @@
     return v3
 .end method
 
-.method public static gz()Lcom/facebook/common/k/b;
+.method public static gC()Lcom/facebook/common/k/b;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Je:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jn:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jd:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Jm: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;->Je:Z
+    sput-boolean v1, Lcom/facebook/common/k/c;->Jn:Z
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/common/references/CloseableReference$2.smali b/com.discord/smali/com/facebook/common/references/CloseableReference$2.smali
index 961f67229a..76f2a7a62d 100644
--- a/com.discord/smali/com/facebook/common/references/CloseableReference$2.smali
+++ b/com.discord/smali/com/facebook/common/references/CloseableReference$2.smali
@@ -45,7 +45,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/common/references/CloseableReference;->gq()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/references/CloseableReference;->gt()Ljava/lang/Class;
 
     move-result-object p2
 
diff --git a/com.discord/smali/com/facebook/common/references/CloseableReference.smali b/com.discord/smali/com/facebook/common/references/CloseableReference.smali
index 49ab7babe9..121b218178 100644
--- a/com.discord/smali/com/facebook/common/references/CloseableReference.smali
+++ b/com.discord/smali/com/facebook/common/references/CloseableReference.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field private static Gz:Ljava/lang/Class;
+.field private static GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private static final Iu:Lcom/facebook/common/references/b;
+.field private static final ID:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -47,13 +47,11 @@
     .end annotation
 .end field
 
-.field private static final Iv:Lcom/facebook/common/references/CloseableReference$a;
+.field private static final IE:Lcom/facebook/common/references/CloseableReference$a;
 
 
 # instance fields
-.field private Iq:Z
-
-.field public final Ir:Lcom/facebook/common/references/c;
+.field public final IA:Lcom/facebook/common/references/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/c<",
@@ -62,13 +60,15 @@
     .end annotation
 .end field
 
-.field private final Is:Lcom/facebook/common/references/CloseableReference$a;
+.field private final IB:Lcom/facebook/common/references/CloseableReference$a;
 
-.field private final It:Ljava/lang/Throwable;
+.field private final IC:Ljava/lang/Throwable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
+.field private Iz:Z
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -76,19 +76,19 @@
 
     const-class v0, Lcom/facebook/common/references/CloseableReference;
 
-    sput-object v0, Lcom/facebook/common/references/CloseableReference;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->GI: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;->Iu:Lcom/facebook/common/references/b;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->ID:Lcom/facebook/common/references/b;
 
     new-instance v0, Lcom/facebook/common/references/CloseableReference$2;
 
     invoke-direct {v0}, Lcom/facebook/common/references/CloseableReference$2;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/references/CloseableReference;->Iv:Lcom/facebook/common/references/CloseableReference$a;
+    sput-object v0, Lcom/facebook/common/references/CloseableReference;->IE:Lcom/facebook/common/references/CloseableReference$a;
 
     return-void
 .end method
@@ -114,7 +114,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz:Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -122,13 +122,13 @@
 
     check-cast v0, Lcom/facebook/common/references/c;
 
-    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ir:Lcom/facebook/common/references/c;
+    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/c;->gr()V
+    invoke-virtual {p1}, Lcom/facebook/common/references/c;->gu()V
 
-    iput-object p2, p0, Lcom/facebook/common/references/CloseableReference;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iput-object p2, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
-    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->It:Ljava/lang/Throwable;
+    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -154,17 +154,17 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz: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;->Ir:Lcom/facebook/common/references/c;
+    iput-object v0, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
-    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iput-object p3, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
-    iput-object p4, p0, Lcom/facebook/common/references/CloseableReference;->It:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -192,7 +192,7 @@
     :cond_0
     new-instance v1, Lcom/facebook/common/references/CloseableReference;
 
-    sget-object v2, Lcom/facebook/common/references/CloseableReference;->Iu:Lcom/facebook/common/references/b;
+    sget-object v2, Lcom/facebook/common/references/CloseableReference;->ID:Lcom/facebook/common/references/b;
 
     invoke-direct {v1, p0, v2, p1, v0}, Lcom/facebook/common/references/CloseableReference;-><init>(Ljava/lang/Object;Lcom/facebook/common/references/b;Lcom/facebook/common/references/CloseableReference$a;Ljava/lang/Throwable;)V
 
@@ -213,7 +213,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/references/CloseableReference;->Iv:Lcom/facebook/common/references/CloseableReference$a;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->IE:Lcom/facebook/common/references/CloseableReference$a;
 
     invoke-static {p0, p1, v0}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;Lcom/facebook/common/references/CloseableReference$a;)Lcom/facebook/common/references/CloseableReference;
 
@@ -350,7 +350,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gp()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gs()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p0
 
@@ -374,7 +374,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/references/CloseableReference;->Iu:Lcom/facebook/common/references/b;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->ID:Lcom/facebook/common/references/b;
 
     invoke-static {p0, v0}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;)Lcom/facebook/common/references/CloseableReference;
 
@@ -465,10 +465,10 @@
     return-void
 .end method
 
-.method static synthetic gq()Ljava/lang/Class;
+.method static synthetic gt()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/references/CloseableReference;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/references/CloseableReference;->GI:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -483,7 +483,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->go()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gr()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -496,7 +496,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz:Z
 
     if-eqz v0, :cond_0
 
@@ -507,15 +507,15 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz: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;->Ir:Lcom/facebook/common/references/c;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
-    invoke-virtual {v0}, Lcom/facebook/common/references/c;->gs()I
+    invoke-virtual {v0}, Lcom/facebook/common/references/c;->gv()I
 
     move-result v1
 
@@ -534,7 +534,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iget-object v0, v0, Lcom/facebook/common/references/c;->Ij:Lcom/facebook/common/references/b;
+    iget-object v0, v0, Lcom/facebook/common/references/c;->Is:Lcom/facebook/common/references/b;
 
     invoke-interface {v0, v1}, Lcom/facebook/common/references/b;->r(Ljava/lang/Object;)V
 
@@ -581,7 +581,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz:Z
 
     if-eqz v0, :cond_0
 
@@ -600,11 +600,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
-    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->Ir:Lcom/facebook/common/references/c;
+    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
-    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->It:Ljava/lang/Throwable;
+    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/common/references/CloseableReference$a;->a(Lcom/facebook/common/references/c;Ljava/lang/Throwable;)V
 
@@ -648,7 +648,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz:Z
 
     if-nez v0, :cond_0
 
@@ -662,7 +662,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->Ir:Lcom/facebook/common/references/c;
+    iget-object v0, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/c;->get()Ljava/lang/Object;
 
@@ -682,7 +682,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized go()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gr()Lcom/facebook/common/references/CloseableReference;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -703,11 +703,11 @@
 
     new-instance v0, Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->Ir:Lcom/facebook/common/references/c;
+    iget-object v1, p0, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
-    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v2, p0, Lcom/facebook/common/references/CloseableReference;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
-    iget-object v3, p0, Lcom/facebook/common/references/CloseableReference;->It:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/facebook/common/references/CloseableReference;->IC:Ljava/lang/Throwable;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/common/references/CloseableReference;-><init>(Lcom/facebook/common/references/c;Lcom/facebook/common/references/CloseableReference$a;Ljava/lang/Throwable;)V
     :try_end_0
@@ -725,7 +725,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized gp()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized gs()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -747,7 +747,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->go()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p0}, Lcom/facebook/common/references/CloseableReference;->gr()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
     :try_end_0
@@ -778,7 +778,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/common/references/CloseableReference;->Iz:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/d/a/a.smali b/com.discord/smali/com/facebook/d/a/a.smali
index e0e5a4f1a7..d2ca82b73d 100644
--- a/com.discord/smali/com/facebook/d/a/a.smali
+++ b/com.discord/smali/com/facebook/d/a/a.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract gM()V
+.method public abstract gP()V
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/a/a.smali b/com.discord/smali/com/facebook/drawee/a/a.smali
index 1ba68efcfc..04c1a4d874 100644
--- a/com.discord/smali/com/facebook/drawee/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/a/a.smali
@@ -12,14 +12,14 @@
 
 
 # static fields
-.field private static KR:Lcom/facebook/drawee/a/a;
+.field private static La:Lcom/facebook/drawee/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field public final KS:Ljava/util/Set;
+.field public final Lb:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field public final KT:Landroid/os/Handler;
+.field public final Lc:Landroid/os/Handler;
 
-.field public final KU:Ljava/lang/Runnable;
+.field public final Ld: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;->KU:Ljava/lang/Runnable;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->Ld: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;->KS:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->Lb: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;->KT:Landroid/os/Handler;
+    iput-object v0, p0, Lcom/facebook/drawee/a/a;->Lc: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;->KS:Ljava/util/Set;
+    iget-object p0, p0, Lcom/facebook/drawee/a/a;->Lb:Ljava/util/Set;
 
     return-object p0
 .end method
 
-.method public static declared-synchronized gY()Lcom/facebook/drawee/a/a;
+.method public static declared-synchronized hb()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;->KR:Lcom/facebook/drawee/a/a;
+    sget-object v1, Lcom/facebook/drawee/a/a;->La: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;->KR:Lcom/facebook/drawee/a/a;
+    sput-object v1, Lcom/facebook/drawee/a/a;->La:Lcom/facebook/drawee/a/a;
 
     :cond_0
-    sget-object v1, Lcom/facebook/drawee/a/a;->KR:Lcom/facebook/drawee/a/a;
+    sget-object v1, Lcom/facebook/drawee/a/a;->La: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 gZ()V
+.method public static hc()V
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
@@ -144,10 +144,10 @@
     return-void
 .end method
 
-.method static synthetic ha()V
+.method static synthetic hd()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gZ()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->hc()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;->gZ()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->hc()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/a;->KS:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a;->Lb: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 7be8bc0e49..55682f3499 100644
--- a/com.discord/smali/com/facebook/drawee/b/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a.smali
@@ -7,29 +7,13 @@
 
 
 # instance fields
-.field private Km:Ljava/lang/String;
+.field private Kv:Ljava/lang/String;
 
-.field private MA:I
+.field private MA:Ljava/lang/String;
 
-.field private MB:I
+.field public MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field private MC:I
-
-.field private MD:J
-
-.field private Mn:Ljava/lang/String;
-
-.field private Mo:I
-
-.field private Mp:I
-
-.field public Mq:I
-
-.field private Mr:Ljava/lang/String;
-
-.field public Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-.field private Mt:Ljava/util/HashMap;
+.field private MC:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -40,17 +24,33 @@
     .end annotation
 .end field
 
-.field private Mu:I
+.field private MD:I
 
-.field private Mv:I
+.field private MF:I
 
-.field private Mw:I
+.field private MG:I
 
-.field private final Mx:Landroid/graphics/RectF;
+.field private final MH:Landroid/graphics/RectF;
+
+.field private MI:I
+
+.field private MJ:I
+
+.field private MK:I
+
+.field private ML:I
+
+.field private MM:I
+
+.field private MN:J
+
+.field private Mw:Ljava/lang/String;
+
+.field private Mx:I
 
 .field private My:I
 
-.field private Mz:I
+.field public Mz:I
 
 .field private final mMatrix:Landroid/graphics/Matrix;
 
@@ -71,11 +71,11 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Mt:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->MC:Ljava/util/HashMap;
 
     const/16 v0, 0x50
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mw:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MG:I
 
     new-instance v0, Landroid/graphics/Paint;
 
@@ -101,7 +101,7 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Mx:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->MH:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->reset()V
 
@@ -119,11 +119,11 @@
 
     move-result-object p2
 
-    iget p3, p0, Lcom/facebook/drawee/b/a;->MB:I
+    iget p3, p0, Lcom/facebook/drawee/b/a;->ML:I
 
     int-to-float p3, p3
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->MC:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MM:I
 
     int-to-float v0, v0
 
@@ -131,13 +131,13 @@
 
     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;->MC:I
+    iget p1, p0, Lcom/facebook/drawee/b/a;->MM:I
 
-    iget p2, p0, Lcom/facebook/drawee/b/a;->MA:I
+    iget p2, p0, Lcom/facebook/drawee/b/a;->MK:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lcom/facebook/drawee/b/a;->MC:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->MM:I
 
     return-void
 .end method
@@ -159,7 +159,7 @@
     const-string p1, "none"
 
     :goto_0
-    iput-object p1, p0, Lcom/facebook/drawee/b/a;->Km:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/b/a;->Kv:Ljava/lang/String;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->invalidateSelf()V
 
@@ -235,11 +235,11 @@
 
     iget-object v1, v0, Lcom/facebook/drawee/b/a;->mPaint:Landroid/graphics/Paint;
 
-    iget v2, v0, Lcom/facebook/drawee/b/a;->Mo:I
+    iget v2, v0, Lcom/facebook/drawee/b/a;->Mx:I
 
-    iget v3, v0, Lcom/facebook/drawee/b/a;->Mp:I
+    iget v3, v0, Lcom/facebook/drawee/b/a;->My:I
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-virtual/range {p0 .. p0}, Lcom/facebook/drawee/b/a;->getBounds()Landroid/graphics/Rect;
 
@@ -308,7 +308,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;->Mx:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->MH:Landroid/graphics/RectF;
 
     iput v6, v9, Landroid/graphics/RectF;->top:F
 
@@ -326,7 +326,7 @@
 
     invoke-virtual {v10, v9}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z
 
-    iget-object v9, v0, Lcom/facebook/drawee/b/a;->Mx:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/facebook/drawee/b/a;->MH:Landroid/graphics/RectF;
 
     invoke-virtual {v9}, Landroid/graphics/RectF;->width()F
 
@@ -334,7 +334,7 @@
 
     float-to-int v9, v9
 
-    iget-object v10, v0, Lcom/facebook/drawee/b/a;->Mx:Landroid/graphics/RectF;
+    iget-object v10, v0, Lcom/facebook/drawee/b/a;->MH:Landroid/graphics/RectF;
 
     invoke-virtual {v10}, Landroid/graphics/RectF;->height()F
 
@@ -471,15 +471,15 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->My:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MI:I
 
-    iput v1, v0, Lcom/facebook/drawee/b/a;->MB:I
+    iput v1, v0, Lcom/facebook/drawee/b/a;->ML:I
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->Mz:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MJ:I
 
-    iput v1, v0, Lcom/facebook/drawee/b/a;->MC:I
+    iput v1, v0, Lcom/facebook/drawee/b/a;->MM:I
 
-    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Mn:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Mw:Ljava/lang/String;
 
     const/4 v2, 0x2
 
@@ -489,7 +489,7 @@
 
     new-array v4, v2, [Ljava/lang/Object;
 
-    iget-object v5, v0, Lcom/facebook/drawee/b/a;->Km:Ljava/lang/String;
+    iget-object v5, v0, Lcom/facebook/drawee/b/a;->Kv:Ljava/lang/String;
 
     aput-object v5, v4, v18
 
@@ -504,7 +504,7 @@
     :cond_5
     new-array v1, v3, [Ljava/lang/Object;
 
-    iget-object v4, v0, Lcom/facebook/drawee/b/a;->Km:Ljava/lang/String;
+    iget-object v4, v0, Lcom/facebook/drawee/b/a;->Kv:Ljava/lang/String;
 
     aput-object v4, v1, v18
 
@@ -541,7 +541,7 @@
 
     new-array v1, v2, [Ljava/lang/Object;
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->Mo:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Mx:I
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -549,7 +549,7 @@
 
     aput-object v4, v1, v18
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->Mp:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->My:I
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -563,7 +563,7 @@
 
     new-array v1, v3, [Ljava/lang/Object;
 
-    iget v4, v0, Lcom/facebook/drawee/b/a;->Mq:I
+    iget v4, v0, Lcom/facebook/drawee/b/a;->Mz:I
 
     div-int/lit16 v4, v4, 0x400
 
@@ -577,7 +577,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;->Mr:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->MA:Ljava/lang/String;
 
     if-eqz v1, :cond_6
 
@@ -590,7 +590,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;->Mu:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MD:I
 
     if-lez v1, :cond_7
 
@@ -602,7 +602,7 @@
 
     aput-object v1, v4, v18
 
-    iget v1, v0, Lcom/facebook/drawee/b/a;->Mv:I
+    iget v1, v0, Lcom/facebook/drawee/b/a;->MF:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -615,7 +615,7 @@
     invoke-direct {v0, v7, v1, v4}, 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;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     if-eqz v1, :cond_8
 
@@ -628,7 +628,7 @@
     invoke-direct {v0, v7, v1, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_8
-    iget-wide v4, v0, Lcom/facebook/drawee/b/a;->MD:J
+    iget-wide v4, v0, Lcom/facebook/drawee/b/a;->MN:J
 
     const-wide/16 v8, 0x0
 
@@ -662,7 +662,7 @@
     invoke-direct {v0, v7, v1, v4}, Lcom/facebook/drawee/b/a;->a(Landroid/graphics/Canvas;Ljava/lang/String;[Ljava/lang/Object;)V
 
     :cond_a
-    iget-object v1, v0, Lcom/facebook/drawee/b/a;->Mt:Ljava/util/HashMap;
+    iget-object v1, v0, Lcom/facebook/drawee/b/a;->MC:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->entrySet()Ljava/util/Set;
 
@@ -720,9 +720,9 @@
 .method public final j(II)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/b/a;->Mo:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->Mx:I
 
-    iput p2, p0, Lcom/facebook/drawee/b/a;->Mp:I
+    iput p2, p0, Lcom/facebook/drawee/b/a;->My:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->invalidateSelf()V
 
@@ -732,7 +732,7 @@
 .method public final m(J)V
     .locals 0
 
-    iput-wide p1, p0, Lcom/facebook/drawee/b/a;->MD:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a;->MN:J
 
     invoke-virtual {p0}, Lcom/facebook/drawee/b/a;->invalidateSelf()V
 
@@ -780,28 +780,28 @@
 
     add-int/lit8 v0, v0, 0x8
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MA:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MK:I
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->Mw:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MG:I
 
     const/16 v2, 0x50
 
     if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->MA:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MK:I
 
     mul-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->MA:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MK:I
 
     :cond_0
     iget v0, p1, Landroid/graphics/Rect;->left:I
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->My:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MI:I
 
-    iget v0, p0, Lcom/facebook/drawee/b/a;->Mw:I
+    iget v0, p0, Lcom/facebook/drawee/b/a;->MG:I
 
     if-ne v0, v2, :cond_1
 
@@ -819,7 +819,7 @@
     add-int/2addr p1, v1
 
     :goto_0
-    iput p1, p0, Lcom/facebook/drawee/b/a;->Mz:I
+    iput p1, p0, Lcom/facebook/drawee/b/a;->MJ:I
 
     return-void
 .end method
@@ -829,31 +829,31 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mo:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Mx:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mp:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->My:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mq:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->Mz:I
 
     new-instance v1, Ljava/util/HashMap;
 
     invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v1, p0, Lcom/facebook/drawee/b/a;->Mt:Ljava/util/HashMap;
+    iput-object v1, p0, Lcom/facebook/drawee/b/a;->MC:Ljava/util/HashMap;
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mu:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MD:I
 
-    iput v0, p0, Lcom/facebook/drawee/b/a;->Mv:I
+    iput v0, p0, Lcom/facebook/drawee/b/a;->MF:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/b/a;->Mr:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/drawee/b/a;->MA:Ljava/lang/String;
 
     invoke-virtual {p0, v0}, Lcom/facebook/drawee/b/a;->ax(Ljava/lang/String;)V
 
     const-wide/16 v1, -0x1
 
-    iput-wide v1, p0, Lcom/facebook/drawee/b/a;->MD:J
+    iput-wide v1, p0, Lcom/facebook/drawee/b/a;->MN: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 dad584579e..a0b4930f1e 100644
--- a/com.discord/smali/com/facebook/drawee/b/a/a.smali
+++ b/com.discord/smali/com/facebook/drawee/b/a/a.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private MF:J
+.field private MO:J
 
-.field private MG:J
+.field private MP:J
 
-.field private MH:Lcom/facebook/drawee/b/a/b;
+.field private MQ:Lcom/facebook/drawee/b/a/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -26,11 +26,11 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MF:J
+    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MO:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MG:J
+    iput-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MP:J
 
-    iput-object p1, p0, Lcom/facebook/drawee/b/a/a;->MH:Lcom/facebook/drawee/b/a/b;
+    iput-object p1, p0, Lcom/facebook/drawee/b/a/a;->MQ: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;->MG:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->MP:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->MH:Lcom/facebook/drawee/b/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/b/a/a;->MQ:Lcom/facebook/drawee/b/a/b;
 
     if-eqz p1, :cond_0
 
-    iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->MG:J
+    iget-wide p2, p0, Lcom/facebook/drawee/b/a/a;->MP:J
 
-    iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MF:J
+    iget-wide v0, p0, Lcom/facebook/drawee/b/a/a;->MO:J
 
     sub-long/2addr p2, v0
 
@@ -77,7 +77,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->MF:J
+    iput-wide p1, p0, Lcom/facebook/drawee/b/a/a;->MO: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 e52abc8ba2..a67c230666 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 JN:Lcom/facebook/imagepipeline/f/a;
+.field private final JW:Lcom/facebook/imagepipeline/f/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;->JN:Lcom/facebook/imagepipeline/f/a;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/a;->JW:Lcom/facebook/imagepipeline/f/a;
 
     return-void
 .end method
@@ -48,7 +48,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     instance-of v0, p1, Lcom/facebook/imagepipeline/g/d;
 
@@ -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/g/d;->Nm:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
     const/4 v2, 0x0
 
@@ -72,7 +72,7 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nm:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
     const/4 v4, -0x1
 
@@ -88,11 +88,11 @@
     :goto_0
     if-nez v1, :cond_2
 
-    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     if-eq v1, v3, :cond_1
 
-    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iget v1, p1, Lcom/facebook/imagepipeline/g/d;->Nw:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -103,7 +103,7 @@
     :cond_1
     if-nez v2, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
@@ -111,25 +111,25 @@
     :try_start_1
     new-instance v1, Lcom/facebook/drawee/drawable/i;
 
-    iget v2, p1, Lcom/facebook/imagepipeline/g/d;->Nm:I
+    iget v2, p1, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
-    iget p1, p1, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iget p1, p1, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     invoke-direct {v1, v0, v2, p1}, Lcom/facebook/drawee/drawable/i;-><init>(Landroid/graphics/drawable/Drawable;II)V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v1
 
     :cond_3
     :try_start_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JN:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JW:Lcom/facebook/imagepipeline/f/a;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JN:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JW:Lcom/facebook/imagepipeline/f/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/f/a;->a(Lcom/facebook/imagepipeline/g/c;)Z
 
@@ -137,7 +137,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JN:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/a;->JW:Lcom/facebook/imagepipeline/f/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/f/a;->b(Lcom/facebook/imagepipeline/g/c;)Landroid/graphics/drawable/Drawable;
 
@@ -145,12 +145,12 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :cond_4
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 p1, 0x0
 
@@ -159,7 +159,7 @@
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
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 028db5c584..7a29862750 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 JO:Lcom/facebook/common/d/e;
+.field final JX: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 JP:Lcom/facebook/drawee/backends/pipeline/g;
+.field final JY:Lcom/facebook/drawee/backends/pipeline/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final JQ:Lcom/facebook/common/d/l;
+.field final JZ:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final JR:Lcom/facebook/drawee/backends/pipeline/b/f;
+.field final Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
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 cac01cd07d..928147e3ab 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 JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private final KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final KZ:Lcom/facebook/common/time/b;
 
-.field private final KQ:Lcom/facebook/common/time/b;
+.field private final Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
 
 # 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;->KQ:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KZ:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     return-void
 .end method
@@ -39,17 +39,17 @@
 .method private l(J)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 v1, 0x0
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/backends/pipeline/b/h;->g(Z)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
+    iput-wide p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki: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;->KQ:Lcom/facebook/common/time/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KZ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:J
+    iput-wide v0, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
 
-    iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Km:Ljava/lang/String;
+    iput-object p1, p2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 v2, 0x5
 
@@ -97,23 +97,23 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/g/f;
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KQ:Lcom/facebook/common/time/b;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KZ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
-    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
 
-    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Km:Ljava/lang/String;
+    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
 
-    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Lcom/facebook/imagepipeline/g/f;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     const/4 p2, 0x3
 
@@ -131,21 +131,21 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/g/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KQ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KZ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Km:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
 
-    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Lcom/facebook/imagepipeline/g/f;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki: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;->KQ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KZ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget v2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:I
+    iget v2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KY: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Km:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki: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;->KQ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KZ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ks:J
+    iput-wide v0, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
 
-    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Km:Ljava/lang/String;
+    iput-object p1, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
 
-    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:Ljava/lang/Object;
+    iput-object p2, v2, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 p2, 0x1
 
     invoke-virtual {p1, p2}, Lcom/facebook/drawee/backends/pipeline/b/h;->g(Z)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
+    iput-wide v0, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KN:J
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/a;->Ki: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 9473f8aeca..dd67072806 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 Km:Ljava/lang/String;
+.field Kv:Ljava/lang/String;
 
-.field private final Kn:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private final Kw: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/h/a;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kn:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kw:Lcom/facebook/drawee/backends/pipeline/b/b;
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Km:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kv: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;->Kn:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kw:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Km:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kv: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 4a0b6bd6a7..125e5ae2f9 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,65 +4,65 @@
 
 
 # instance fields
-.field private final KA:Z
+.field private final KA:Lcom/facebook/imagepipeline/g/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field private final KB:I
+.field private final KB:J
 
-.field private final KC:I
+.field private final KC:J
 
-.field private final KD:I
+.field private final KD:J
 
 .field private final KE:J
 
 .field private final KF:J
 
-.field private final KG:Ljava/lang/String;
+.field private final KG:J
+
+.field private final KH:J
+
+.field private final KI:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kk:I
+.field private final KJ:Z
 
-.field private final Km:Ljava/lang/String;
+.field private final KK:I
+
+.field private final KL:I
+
+.field private final KM:I
+
+.field private final KN:J
+
+.field private final KO:J
+
+.field private final KP:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Ko:Ljava/lang/String;
+.field private final Kt:I
+
+.field private final Kv:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kp:Ljava/lang/Object;
+.field private final Kx:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kq:Lcom/facebook/imagepipeline/request/b;
+.field private final Ky:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kr:Lcom/facebook/imagepipeline/g/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private final Ks:J
-
-.field private final Kt:J
-
-.field private final Ku:J
-
-.field private final Kv:J
-
-.field private final Kw:J
-
-.field private final Kx:J
-
-.field private final Ky:J
-
-.field private final Kz:Ljava/lang/String;
+.field private final Kz:Lcom/facebook/imagepipeline/request/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -106,87 +106,87 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Km:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kv:Ljava/lang/String;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ko:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kx:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kz:Lcom/facebook/imagepipeline/request/b;
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kp:Ljava/lang/Object;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ky:Ljava/lang/Object;
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kr:Lcom/facebook/imagepipeline/g/f;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KA:Lcom/facebook/imagepipeline/g/f;
 
     move-wide v1, p6
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ks:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KB:J
 
     move-wide v1, p8
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kt:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KC:J
 
     move-wide v1, p10
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ku:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KD:J
 
     move-wide v1, p12
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kv:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KE:J
 
     move-wide/from16 v1, p14
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kw:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KF:J
 
     move-wide/from16 v1, p16
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kx:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KG:J
 
     move-wide/from16 v1, p18
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Ky:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KH:J
 
     move/from16 v1, p20
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kk:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kt:I
 
     move-object/from16 v1, p21
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->Kz:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KI:Ljava/lang/String;
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KA:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KJ:Z
 
     move/from16 v1, p23
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KB:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KK:I
 
     move/from16 v1, p24
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KC:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KL:I
 
     move/from16 v1, p25
 
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KD:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KM:I
 
     move-wide/from16 v1, p26
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KE:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KN:J
 
     move-wide/from16 v1, p28
 
-    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KF:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KO:J
 
     move-object/from16 v1, p30
 
-    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KG:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/e;->KP: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 a6f76ba1b7..b7de4a6003 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,33 +4,33 @@
 
 
 # instance fields
-.field private final KH:Lcom/facebook/drawee/backends/pipeline/d;
+.field private final KQ:Lcom/facebook/drawee/backends/pipeline/d;
 
-.field private final KI:Lcom/facebook/common/time/b;
+.field private final KR:Lcom/facebook/common/time/b;
 
-.field public final KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field public final KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private KK:Lcom/facebook/drawee/backends/pipeline/b/c;
+.field private KT:Lcom/facebook/drawee/backends/pipeline/b/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KL:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+.field private KU:Lcom/facebook/drawee/backends/pipeline/b/a/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KM:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+.field private KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private KN:Lcom/facebook/imagepipeline/h/b;
+.field private KW:Lcom/facebook/imagepipeline/h/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public KO:Ljava/util/List;
+.field public KX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -57,92 +57,92 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KI:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     return-void
 .end method
 
-.method private gW()V
+.method private gZ()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KM:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KV: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;->KI:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->KM:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KL:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KU: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;->KI:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KR:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->KL:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KU:Lcom/facebook/drawee/backends/pipeline/b/a/c;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KK:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT: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;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk: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;->KK:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT:Lcom/facebook/drawee/backends/pipeline/b/c;
 
     goto :goto_0
 
     :cond_3
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->Km:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/c;->Kv:Ljava/lang/String;
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KN:Lcom/facebook/imagepipeline/h/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KW:Lcom/facebook/imagepipeline/h/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;->KL:Lcom/facebook/drawee/backends/pipeline/b/a/c;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KU: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;->KK:Lcom/facebook/drawee/backends/pipeline/b/c;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KT:Lcom/facebook/drawee/backends/pipeline/b/c;
 
     aput-object v3, v1, v2
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/h/b;-><init>([Lcom/facebook/imagepipeline/h/c;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KN:Lcom/facebook/imagepipeline/h/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KW:Lcom/facebook/imagepipeline/h/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;->KO:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX: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;->gX()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->ha()Lcom/facebook/drawee/backends/pipeline/b/e;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX: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;->KP:I
+    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KY: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;->KO:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX: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;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
 
-    iget-object p2, p2, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p2, p2, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->KB:I
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS: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;->KC:I
+    iput p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
 
     :cond_1
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->gX()Lcom/facebook/drawee/backends/pipeline/b/e;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/b/h;->ha()Lcom/facebook/drawee/backends/pipeline/b/e;
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX: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;->gW()V
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/b/g;->gZ()V
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KM:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KN:Lcom/facebook/imagepipeline/h/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KW:Lcom/facebook/imagepipeline/h/b;
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/imagepipeline/h/c;)V
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KM:Lcom/facebook/drawee/backends/pipeline/b/a/a;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KV:Lcom/facebook/drawee/backends/pipeline/b/a/a;
 
     if-eqz p1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ: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;->KN:Lcom/facebook/imagepipeline/h/b;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KW:Lcom/facebook/imagepipeline/h/b;
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KH:Lcom/facebook/drawee/backends/pipeline/d;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/g;->KQ:Lcom/facebook/drawee/backends/pipeline/d;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->b(Lcom/facebook/imagepipeline/h/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 5cbae2f2bc..d4109f8fbf 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,67 +4,67 @@
 
 
 # instance fields
-.field public KA:Z
+.field public KA:Lcom/facebook/imagepipeline/g/f;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field public KB:I
+.field public KB:J
 
-.field public KC:I
+.field public KC:J
 
-.field public KD:I
+.field public KD:J
 
 .field public KE:J
 
 .field public KF:J
 
-.field public KG:Ljava/lang/String;
+.field public KG:J
+
+.field public KH:J
+
+.field public KI:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public KP:I
+.field public KJ:Z
 
-.field public Kk:I
+.field public KK:I
 
-.field public Km:Ljava/lang/String;
+.field public KL:I
+
+.field public KM:I
+
+.field public KN:J
+
+.field public KO:J
+
+.field public KP:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Ko:Ljava/lang/String;
+.field public KY:I
+
+.field public Kt:I
+
+.field public Kv:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Kp:Ljava/lang/Object;
+.field public Kx:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Kq:Lcom/facebook/imagepipeline/request/b;
+.field public Ky:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Kr:Lcom/facebook/imagepipeline/g/f;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field public Ks:J
-
-.field public Kt:J
-
-.field public Ku:J
-
-.field public Kv:J
-
-.field public Kw:J
-
-.field public Kx:J
-
-.field public Ky:J
-
-.field public Kz:Ljava/lang/String;
+.field public Kz:Lcom/facebook/imagepipeline/request/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -78,36 +78,36 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ks:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:J
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
 
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:J
-
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:J
-
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:J
-
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:J
-
-    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:J
-
-    const/4 v2, -0x1
-
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kk:I
-
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:I
-
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:I
-
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:I
-
-    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:I
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
     iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
 
     iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
 
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:J
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
+
+    const/4 v2, -0x1
+
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:I
+
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:I
+
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
+
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KY:I
+
+    iput v2, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KN:J
+
+    iput-wide v0, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
+
     return-void
 .end method
 
@@ -126,12 +126,12 @@
     const/4 p1, 0x2
 
     :goto_0
-    iput p1, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:I
+    iput p1, p0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
 
     return-void
 .end method
 
-.method public final gX()Lcom/facebook/drawee/backends/pipeline/b/e;
+.method public final ha()Lcom/facebook/drawee/backends/pipeline/b/e;
     .locals 35
 
     move-object/from16 v0, p0
@@ -140,73 +140,73 @@
 
     move-object/from16 v1, v32
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Km:Ljava/lang/String;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ko:Ljava/lang/String;
+    iget-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iget-object v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:Ljava/lang/Object;
+    iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
 
-    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Lcom/facebook/imagepipeline/g/f;
+    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
 
-    iget-wide v7, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ks:J
+    iget-wide v7, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
 
-    iget-wide v9, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:J
+    iget-wide v9, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:J
 
-    iget-wide v11, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:J
+    iget-wide v11, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
-    iget-wide v13, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:J
+    iget-wide v13, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
 
     move-object/from16 v33, v1
 
     move-object/from16 v34, v2
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
 
     move-wide v15, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:J
 
     move-wide/from16 v17, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
 
     move-wide/from16 v19, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kk:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:I
 
     move/from16 v21, v1
 
-    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:Ljava/lang/String;
 
     move-object/from16 v22, v1
 
-    iget-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Z
+    iget-boolean v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
 
     move/from16 v23, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:I
 
     move/from16 v24, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
 
     move/from16 v25, v1
 
-    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:I
+    iget v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
 
     move/from16 v26, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KN:J
 
     move-wide/from16 v27, v1
 
-    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
+    iget-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
 
     move-wide/from16 v29, v1
 
-    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:Ljava/lang/String;
+    iget-object v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:Ljava/lang/String;
 
     move-object/from16 v31, v1
 
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 3201aeb34b..ed7abf86a4 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,9 +13,9 @@
     .end annotation
 .end field
 
-.field private static JS:Lcom/facebook/drawee/backends/pipeline/f; = null
+.field private static Kb:Lcom/facebook/drawee/backends/pipeline/f; = null
 
-.field private static volatile JT:Z = false
+.field private static volatile Kc: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/c;->GI:Ljava/lang/Class;
 
     return-void
 .end method
@@ -44,13 +44,13 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    sget-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->JT:Z
+    sget-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->Kc:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->GI: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,15 +61,15 @@
     :cond_0
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->JT:Z
+    sput-boolean v0, Lcom/facebook/drawee/backends/pipeline/c;->Kc:Z
 
     :goto_0
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p0}, Lcom/facebook/soloader/SoLoader;->A(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -87,7 +87,7 @@
     invoke-static {p1}, Lcom/facebook/imagepipeline/b/k;->a(Lcom/facebook/imagepipeline/b/i;)V
 
     :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     new-instance p1, Lcom/facebook/drawee/backends/pipeline/f;
 
@@ -95,20 +95,20 @@
 
     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;->JS:Lcom/facebook/drawee/backends/pipeline/f;
+    sput-object p1, Lcom/facebook/drawee/backends/pipeline/c;->Kb:Lcom/facebook/drawee/backends/pipeline/f;
 
     invoke-static {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->a(Lcom/facebook/common/d/l;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     new-instance p1, Ljava/lang/RuntimeException;
 
@@ -119,26 +119,26 @@
     throw p1
 .end method
 
-.method public static gN()Lcom/facebook/drawee/backends/pipeline/e;
+.method public static gQ()Lcom/facebook/drawee/backends/pipeline/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->JS:Lcom/facebook/drawee/backends/pipeline/f;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/c;->Kb:Lcom/facebook/drawee/backends/pipeline/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->gV()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/f;->gY()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static gO()Lcom/facebook/imagepipeline/b/h;
+.method public static gR()Lcom/facebook/imagepipeline/b/h;
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iJ()Lcom/facebook/imagepipeline/b/k;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/b/k;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/k;->gO()Lcom/facebook/imagepipeline/b/h;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/b/k;->gR()Lcom/facebook/imagepipeline/b/h;
 
     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 66e7f65190..901b463e49 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -28,9 +28,9 @@
 
 
 # instance fields
-.field private Hy:Lcom/facebook/cache/common/CacheKey;
+.field private HH:Lcom/facebook/cache/common/CacheKey;
 
-.field private JO:Lcom/facebook/common/d/e;
+.field private JX:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -43,9 +43,9 @@
     .end annotation
 .end field
 
-.field private final JU:Lcom/facebook/imagepipeline/f/a;
+.field private final Kd:Lcom/facebook/imagepipeline/f/a;
 
-.field private final JV:Lcom/facebook/common/d/e;
+.field private final Ke:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field private final JW:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kf:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -72,7 +72,7 @@
     .end annotation
 .end field
 
-.field private JX:Lcom/facebook/common/d/l;
+.field private Kg:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -84,14 +84,14 @@
     .end annotation
 .end field
 
-.field JY:Z
+.field Kh:Z
 
-.field private JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Ka:Ljava/util/Set;
+.field private Kj:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -104,12 +104,12 @@
     .end annotation
 .end field
 
-.field private Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Kc:Lcom/facebook/drawee/backends/pipeline/a/a;
+.field private Kl: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/d;->GI: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/f/a;)V
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->JU:Lcom/facebook/imagepipeline/f/a;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kd:Lcom/facebook/imagepipeline/f/a;
 
-    iput-object p6, p0, Lcom/facebook/drawee/backends/pipeline/d;->JV:Lcom/facebook/common/d/e;
+    iput-object p6, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/common/d/e;
 
-    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     return-void
 .end method
@@ -243,7 +243,7 @@
 
     invoke-virtual {p2, v0}, Lcom/facebook/drawee/b/a;->ax(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     const/4 v1, 0x0
 
@@ -259,16 +259,16 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/facebook/drawee/drawable/p;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     move-object v1, v0
 
     :cond_0
-    iput-object v1, p2, Lcom/facebook/drawee/b/a;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v1, p2, Lcom/facebook/drawee/b/a;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kc:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kl:Lcom/facebook/drawee/backends/pipeline/a/a;
 
-    iget v0, v0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kk:I
+    iget v0, v0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kt:I
 
     invoke-static {v0}, Lcom/facebook/drawee/backends/pipeline/b/d;->J(I)Ljava/lang/String;
 
@@ -288,11 +288,11 @@
 
     invoke-virtual {p2, v0, v1}, Lcom/facebook/drawee/b/a;->j(II)V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->fF()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->fI()I
 
     move-result p1
 
-    iput p1, p2, Lcom/facebook/drawee/b/a;->Mq:I
+    iput p1, p2, Lcom/facebook/drawee/b/a;->Mz:I
 
     return-void
 
@@ -309,14 +309,14 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JY:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kh:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hf()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hi()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -334,23 +334,23 @@
 
     invoke-direct {v2}, Lcom/facebook/drawee/backends/pipeline/a/a;-><init>()V
 
-    iput-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kc:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iput-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kl: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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kc:Lcom/facebook/drawee/backends/pipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kl: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
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hf()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hi()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -358,7 +358,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hf()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/d;->hi()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -383,7 +383,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -399,7 +399,7 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->c(Lcom/facebook/imagepipeline/g/c;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JO:Lcom/facebook/common/d/e;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JX:Lcom/facebook/common/d/e;
 
     invoke-static {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/common/d/e;Lcom/facebook/imagepipeline/g/c;)Landroid/graphics/drawable/Drawable;
 
@@ -409,13 +409,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JV:Lcom/facebook/common/d/e;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ke:Lcom/facebook/common/d/e;
 
     invoke-static {v0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/common/d/e;Lcom/facebook/imagepipeline/g/c;)Landroid/graphics/drawable/Drawable;
 
@@ -425,13 +425,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :cond_1
     :try_start_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JU:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kd:Lcom/facebook/imagepipeline/f/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/f/a;->b(Lcom/facebook/imagepipeline/g/c;)Landroid/graphics/drawable/Drawable;
 
@@ -441,7 +441,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
@@ -468,12 +468,12 @@
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
 
-.method private gR()Lcom/facebook/common/references/CloseableReference;
+.method private gU()Lcom/facebook/common/references/CloseableReference;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -487,25 +487,25 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->HH: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;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->HH:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v0, v2}, Lcom/facebook/imagepipeline/cache/o;->D(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -519,11 +519,11 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/g/c;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/g/c;->jk()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/g/c;->jn()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/g/h;->jz()Z
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/g/h;->jC()Z
 
     move-result v2
 
@@ -533,25 +533,25 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v1
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v1
 
     :catchall_0
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
@@ -571,7 +571,7 @@
 
     check-cast p1, Lcom/facebook/d/a/a;
 
-    invoke-interface {p1}, Lcom/facebook/d/a/a;->gM()V
+    invoke-interface {p1}, Lcom/facebook/d/a/a;->gP()V
 
     :cond_0
     return-void
@@ -606,24 +606,24 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-super {p0, p2, p4}, Lcom/facebook/drawee/controller/AbstractDraweeController;->f(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->JX:Lcom/facebook/common/d/l;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg:Lcom/facebook/common/d/l;
 
     const/4 p1, 0x0
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/backends/pipeline/d;->c(Lcom/facebook/imagepipeline/g/c;)V
 
-    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/d;->HH:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->JO:Lcom/facebook/common/d/e;
+    iput-object p5, p0, Lcom/facebook/drawee/backends/pipeline/d;->JX:Lcom/facebook/common/d/e;
 
     monitor-enter p0
 
     :try_start_0
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     monitor-exit p0
     :try_end_0
@@ -633,7 +633,7 @@
 
     invoke-virtual {p0, p6}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/drawee/backends/pipeline/b/b;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -654,13 +654,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk: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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/b/a;
 
@@ -674,7 +674,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz v0, :cond_1
 
@@ -686,7 +686,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     aput-object v3, v1, v2
 
@@ -696,7 +696,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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -706,7 +706,7 @@
 
     :cond_1
     :try_start_2
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -732,19 +732,19 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki: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;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
@@ -753,58 +753,58 @@
 
     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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
     const/4 v3, 0x0
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ko:Ljava/lang/String;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:Ljava/lang/Object;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kr:Lcom/facebook/imagepipeline/g/f;
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Lcom/facebook/imagepipeline/g/f;
 
     const-wide/16 v4, -0x1
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ks:J
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:J
 
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ku:J
-
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kv:J
-
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kw:J
-
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:J
-
-    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:J
-
-    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kk:I
-
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Ljava/lang/String;
-
-    iput-boolean v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Z
-
-    const/4 v2, -0x1
-
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KB:I
-
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KC:I
-
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:I
-
-    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:I
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KD:J
 
     iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KE:J
 
     iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KF:J
 
-    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:Ljava/lang/String;
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:J
+
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
+
+    iput v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:I
+
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:Ljava/lang/String;
+
+    iput-boolean v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
+
+    const/4 v2, -0x1
+
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KK:I
+
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KL:I
+
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KY:I
+
+    iput v2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KM:I
+
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KN:J
+
+    iput-wide v4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KO:J
+
+    iput-object v3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KP:Ljava/lang/String;
 
     :cond_1
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     if-nez v0, :cond_2
 
@@ -816,14 +816,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;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     if-eqz p1, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
 
     if-nez v2, :cond_3
 
@@ -831,15 +831,15 @@
 
     invoke-direct {v2}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iput-object v2, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX:Ljava/util/List;
 
     :cond_3
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KO:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/b/g;->KX: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;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     invoke-virtual {p1, v1}, Lcom/facebook/drawee/backends/pipeline/b/g;->setEnabled(Z)V
     :try_end_0
@@ -864,7 +864,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
@@ -872,10 +872,10 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -899,13 +899,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk: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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     check-cast v0, Lcom/facebook/drawee/backends/pipeline/b/a;
 
@@ -919,7 +919,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz v0, :cond_1
 
@@ -931,7 +931,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     aput-object v3, v1, v2
 
@@ -941,7 +941,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;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -951,7 +951,7 @@
 
     :cond_1
     :try_start_2
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -973,7 +973,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -985,7 +985,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
     :try_end_1
@@ -1013,11 +1013,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     const/4 v0, 0x5
 
@@ -1042,7 +1042,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized gP()Lcom/facebook/imagepipeline/h/c;
+.method public final declared-synchronized gS()Lcom/facebook/imagepipeline/h/c;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -1052,7 +1052,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     if-eqz v1, :cond_0
 
@@ -1060,24 +1060,24 @@
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kk: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;->Ka:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
 
     if-eqz v1, :cond_2
 
     new-instance v1, Lcom/facebook/imagepipeline/h/b;
 
-    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Ka:Ljava/util/Set;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kj:Ljava/util/Set;
 
     invoke-direct {v1, v2}, Lcom/facebook/imagepipeline/h/b;-><init>(Ljava/util/Set;)V
 
     if-eqz v0, :cond_1
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -1101,7 +1101,7 @@
     throw v0
 .end method
 
-.method public final gQ()Lcom/facebook/c/c;
+.method public final gT()Lcom/facebook/c/c;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1113,7 +1113,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 v0, 0x2
 
@@ -1123,7 +1123,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/d;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/d;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1138,7 +1138,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;->JX:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg:Lcom/facebook/common/d/l;
 
     invoke-interface {v0}, Lcom/facebook/common/d/l;->get()Ljava/lang/Object;
 
@@ -1146,17 +1146,17 @@
 
     check-cast v0, Lcom/facebook/c/c;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 .end method
 
-.method public final synthetic gS()Ljava/lang/Object;
+.method public final synthetic gV()Ljava/lang/Object;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->gR()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/d;->gU()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -1196,7 +1196,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->JX:Lcom/facebook/common/d/l;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/d;->Kg:Lcom/facebook/common/d/l;
 
     const-string v2, "dataSourceSupplier"
 
@@ -1244,7 +1244,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/facebook/common/references/CloseableReference;->Ir:Lcom/facebook/common/references/c;
+    iget-object p1, p1, Lcom/facebook/common/references/CloseableReference;->IA:Lcom/facebook/common/references/c;
 
     invoke-virtual {p1}, Lcom/facebook/common/references/c;->get()Ljava/lang/Object;
 
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 31f825adc6..a518c6faf8 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/e.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private JO:Lcom/facebook/common/d/e;
+.field private JX:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
@@ -32,19 +32,19 @@
     .end annotation
 .end field
 
-.field private final JP:Lcom/facebook/drawee/backends/pipeline/g;
+.field private final JY:Lcom/facebook/drawee/backends/pipeline/g;
 
-.field private JR:Lcom/facebook/drawee/backends/pipeline/b/f;
+.field private Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+.field private Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Kd:Lcom/facebook/imagepipeline/b/h;
+.field private final Km:Lcom/facebook/imagepipeline/b/h;
 
 
 # direct methods
@@ -64,24 +64,24 @@
 
     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;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iput-object p3, p0, Lcom/facebook/drawee/backends/pipeline/e;->Km:Lcom/facebook/imagepipeline/b/h;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/e;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/e;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
     return-void
 .end method
 
-.method private gT()Lcom/facebook/drawee/backends/pipeline/d;
+.method private gW()Lcom/facebook/drawee/backends/pipeline/d;
     .locals 11
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hn()Lcom/facebook/drawee/d/a;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hq()Lcom/facebook/drawee/d/a;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/e;->hp()Ljava/lang/String;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/e;->hs()Ljava/lang/String;
 
     move-result-object v3
 
@@ -94,19 +94,19 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
     iget-object v5, v0, Lcom/facebook/drawee/backends/pipeline/g;->mResources:Landroid/content/res/Resources;
 
-    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kh:Lcom/facebook/drawee/a/a;
+    iget-object v6, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kq:Lcom/facebook/drawee/a/a;
 
-    iget-object v7, v0, Lcom/facebook/drawee/backends/pipeline/g;->JN:Lcom/facebook/imagepipeline/f/a;
+    iget-object v7, v0, Lcom/facebook/drawee/backends/pipeline/g;->JW:Lcom/facebook/imagepipeline/f/a;
 
-    iget-object v8, v0, Lcom/facebook/drawee/backends/pipeline/g;->Ki:Ljava/util/concurrent/Executor;
+    iget-object v8, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kr:Ljava/util/concurrent/Executor;
 
-    iget-object v9, v0, Lcom/facebook/drawee/backends/pipeline/g;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v9, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v10, v0, Lcom/facebook/drawee/backends/pipeline/g;->Kj:Lcom/facebook/common/d/e;
+    iget-object v10, v0, Lcom/facebook/drawee/backends/pipeline/g;->Ks:Lcom/facebook/common/d/e;
 
     new-instance v1, Lcom/facebook/drawee/backends/pipeline/d;
 
@@ -114,11 +114,11 @@
 
     invoke-direct/range {v4 .. v10}, Lcom/facebook/drawee/backends/pipeline/d;-><init>(Landroid/content/res/Resources;Lcom/facebook/drawee/a/a;Lcom/facebook/imagepipeline/f/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;->JQ:Lcom/facebook/common/d/l;
+    iget-object v2, v0, Lcom/facebook/drawee/backends/pipeline/g;->JZ:Lcom/facebook/common/d/l;
 
     if-eqz v2, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/g;->JQ:Lcom/facebook/common/d/l;
+    iget-object v0, v0, Lcom/facebook/drawee/backends/pipeline/g;->JZ:Lcom/facebook/common/d/l;
 
     invoke-interface {v0}, Lcom/facebook/common/d/l;->get()Ljava/lang/Object;
 
@@ -130,7 +130,7 @@
 
     move-result v0
 
-    iput-boolean v0, v1, Lcom/facebook/drawee/backends/pipeline/d;->JY:Z
+    iput-boolean v0, v1, Lcom/facebook/drawee/backends/pipeline/d;->Kh:Z
 
     :cond_1
     move-object v0, v1
@@ -140,15 +140,15 @@
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hl()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->ho()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/e;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/e;->Km:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/b/h;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/b/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     const/4 v5, 0x0
 
@@ -156,11 +156,11 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v5, v1, Lcom/facebook/imagepipeline/request/b;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v5, :cond_2
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hk()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hn()Ljava/lang/Object;
 
     move-result-object v5
 
@@ -171,7 +171,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hk()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hn()Ljava/lang/Object;
 
     move-result-object v5
 
@@ -188,32 +188,32 @@
     move-object v4, v5
 
     :goto_2
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hk()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/e;->hn()Ljava/lang/Object;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/facebook/drawee/backends/pipeline/e;->JO:Lcom/facebook/common/d/e;
+    iget-object v6, p0, Lcom/facebook/drawee/backends/pipeline/e;->JX:Lcom/facebook/common/d/e;
 
-    iget-object v7, p0, Lcom/facebook/drawee/backends/pipeline/e;->Kb:Lcom/facebook/drawee/backends/pipeline/b/b;
+    iget-object v7, p0, Lcom/facebook/drawee/backends/pipeline/e;->Kk:Lcom/facebook/drawee/backends/pipeline/b/b;
 
     move-object v1, v0
 
     invoke-virtual/range {v1 .. v7}, Lcom/facebook/drawee/backends/pipeline/d;->a(Lcom/facebook/common/d/l;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;->JR:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/e;->Ka: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
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :catchall_0
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
@@ -225,9 +225,9 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/e;->Km:Lcom/facebook/imagepipeline/b/h;
 
-    sget-object v1, Lcom/facebook/drawee/backends/pipeline/e$1;->Ke:[I
+    sget-object v1, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
 
     invoke-virtual {p4}, Lcom/facebook/drawee/controller/a$a;->ordinal()I
 
@@ -247,7 +247,7 @@
 
     if-ne v1, v2, :cond_0
 
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aak:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aat:Lcom/facebook/imagepipeline/request/b$b;
 
     goto :goto_0
 
@@ -275,12 +275,12 @@
     throw p1
 
     :cond_1
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aai:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aar:Lcom/facebook/imagepipeline/request/b$b;
 
     goto :goto_0
 
     :cond_2
-    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object p4, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
 
     :goto_0
     instance-of v1, p1, Lcom/facebook/drawee/backends/pipeline/d;
@@ -289,7 +289,7 @@
 
     check-cast p1, Lcom/facebook/drawee/backends/pipeline/d;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->gP()Lcom/facebook/imagepipeline/h/c;
+    invoke-virtual {p1}, Lcom/facebook/drawee/backends/pipeline/d;->gS()Lcom/facebook/imagepipeline/h/c;
 
     move-result-object p1
 
@@ -362,7 +362,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
@@ -384,7 +384,7 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/e;->JR:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/e;->Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     move-object p1, p0
 
@@ -393,10 +393,10 @@
     return-object p1
 .end method
 
-.method public final synthetic gU()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final synthetic gX()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->gT()Lcom/facebook/drawee/backends/pipeline/d;
+    invoke-direct {p0}, Lcom/facebook/drawee/backends/pipeline/e;->gW()Lcom/facebook/drawee/backends/pipeline/d;
 
     move-result-object v0
 
@@ -427,13 +427,13 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iy()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iB()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()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 f8943bfb28..9ae4fca1f2 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/f.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final JP:Lcom/facebook/drawee/backends/pipeline/g;
+.field private final JY:Lcom/facebook/drawee/backends/pipeline/g;
 
-.field private final Kd:Lcom/facebook/imagepipeline/b/h;
+.field private final Km:Lcom/facebook/imagepipeline/b/h;
 
-.field private final Kf:Ljava/util/Set;
+.field private final Ko:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final Kg:Lcom/facebook/drawee/backends/pipeline/b/f;
+.field private final Kp:Lcom/facebook/drawee/backends/pipeline/b/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -48,7 +48,7 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iJ()Lcom/facebook/imagepipeline/b/k;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/b/k;
 
     move-result-object p2
 
@@ -93,21 +93,21 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/f;->mContext:Landroid/content/Context;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->gO()Lcom/facebook/imagepipeline/b/h;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->gR()Lcom/facebook/imagepipeline/b/h;
 
     move-result-object p4
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Km:Lcom/facebook/imagepipeline/b/h;
 
     if-eqz p3, :cond_0
 
-    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
     if-eqz p4, :cond_0
 
-    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
     goto :goto_0
 
@@ -116,20 +116,20 @@
 
     invoke-direct {p4}, Lcom/facebook/drawee/backends/pipeline/g;-><init>()V
 
-    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iput-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
     :goto_0
-    iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object p4, p0, Lcom/facebook/drawee/backends/pipeline/f;->JY: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;->gY()Lcom/facebook/drawee/a/a;
+    invoke-static {}, Lcom/facebook/drawee/a/a;->hb()Lcom/facebook/drawee/a/a;
 
     move-result-object v0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->iK()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object p2
 
@@ -142,22 +142,22 @@
     goto :goto_1
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->hY()Lcom/facebook/imagepipeline/f/a;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/b/a;->ib()Lcom/facebook/imagepipeline/f/a;
 
     move-result-object p2
 
     :goto_1
-    invoke-static {}, Lcom/facebook/common/b/i;->ge()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->gh()Lcom/facebook/common/b/i;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Km:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/h;->Ud:Lcom/facebook/imagepipeline/cache/o;
 
     if-eqz p3, :cond_2
 
-    iget-object v4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JO:Lcom/facebook/common/d/e;
+    iget-object v4, p3, Lcom/facebook/drawee/backends/pipeline/b;->JX:Lcom/facebook/common/d/e;
 
     goto :goto_2
 
@@ -167,7 +167,7 @@
     :goto_2
     if-eqz p3, :cond_3
 
-    iget-object v5, p3, Lcom/facebook/drawee/backends/pipeline/b;->JQ:Lcom/facebook/common/d/l;
+    iget-object v5, p3, Lcom/facebook/drawee/backends/pipeline/b;->JZ:Lcom/facebook/common/d/l;
 
     goto :goto_3
 
@@ -177,48 +177,48 @@
     :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;->Kh:Lcom/facebook/drawee/a/a;
+    iput-object v0, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kq:Lcom/facebook/drawee/a/a;
 
-    iput-object p2, p4, Lcom/facebook/drawee/backends/pipeline/g;->JN:Lcom/facebook/imagepipeline/f/a;
+    iput-object p2, p4, Lcom/facebook/drawee/backends/pipeline/g;->JW:Lcom/facebook/imagepipeline/f/a;
 
-    iput-object v2, p4, Lcom/facebook/drawee/backends/pipeline/g;->Ki:Ljava/util/concurrent/Executor;
+    iput-object v2, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kr:Ljava/util/concurrent/Executor;
 
-    iput-object v3, p4, Lcom/facebook/drawee/backends/pipeline/g;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v3, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object v4, p4, Lcom/facebook/drawee/backends/pipeline/g;->Kj:Lcom/facebook/common/d/e;
+    iput-object v4, p4, Lcom/facebook/drawee/backends/pipeline/g;->Ks:Lcom/facebook/common/d/e;
 
-    iput-object v5, p4, Lcom/facebook/drawee/backends/pipeline/g;->JQ:Lcom/facebook/common/d/l;
+    iput-object v5, p4, Lcom/facebook/drawee/backends/pipeline/g;->JZ:Lcom/facebook/common/d/l;
 
-    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kf:Ljava/util/Set;
+    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ko:Ljava/util/Set;
 
     if-eqz p3, :cond_4
 
-    iget-object v1, p3, Lcom/facebook/drawee/backends/pipeline/b;->JR:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p3, Lcom/facebook/drawee/backends/pipeline/b;->Ka:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     :cond_4
-    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kg:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iput-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kp:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final gV()Lcom/facebook/drawee/backends/pipeline/e;
+.method public final gY()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;->JP:Lcom/facebook/drawee/backends/pipeline/g;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/f;->JY:Lcom/facebook/drawee/backends/pipeline/g;
 
-    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iget-object v3, p0, Lcom/facebook/drawee/backends/pipeline/f;->Km:Lcom/facebook/imagepipeline/b/h;
 
-    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kf:Ljava/util/Set;
+    iget-object v4, p0, Lcom/facebook/drawee/backends/pipeline/f;->Ko: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/h;Ljava/util/Set;)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kg:Lcom/facebook/drawee/backends/pipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/f;->Kp:Lcom/facebook/drawee/backends/pipeline/b/f;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/backends/pipeline/e;->b(Lcom/facebook/drawee/backends/pipeline/b/f;)Lcom/facebook/drawee/backends/pipeline/e;
 
@@ -230,7 +230,7 @@
 .method public final synthetic get()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->gV()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-virtual {p0}, Lcom/facebook/drawee/backends/pipeline/f;->gY()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v0
 
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 118de17495..86da5b2a80 100644
--- a/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
+++ b/com.discord/smali/com/facebook/drawee/backends/pipeline/g.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field JN:Lcom/facebook/imagepipeline/f/a;
+.field JW:Lcom/facebook/imagepipeline/f/a;
 
-.field JQ:Lcom/facebook/common/d/l;
+.field JZ:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field JW:Lcom/facebook/imagepipeline/cache/o;
+.field Kf:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -30,11 +30,11 @@
     .end annotation
 .end field
 
-.field Kh:Lcom/facebook/drawee/a/a;
+.field Kq:Lcom/facebook/drawee/a/a;
 
-.field Ki:Ljava/util/concurrent/Executor;
+.field Kr:Ljava/util/concurrent/Executor;
 
-.field Kj:Lcom/facebook/common/d/e;
+.field Ks:Lcom/facebook/common/d/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/e<",
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 c52a6f8fa6..5782b4f10a 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 hh()Z
+.method public abstract hk()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 e472834525..8fbc15115e 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 OT:Lcom/facebook/drawee/c/a$a;
+.field public Pc:Lcom/facebook/drawee/c/a$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final OU:F
+.field public final Pd:F
 
-.field public OV:Z
+.field public Pe:Z
 
-.field public OW:Z
+.field public Pf:Z
 
-.field public OX:J
+.field public Pg:J
 
-.field public OY:F
+.field public Ph:F
 
-.field public OZ:F
+.field public Pi:F
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     int-to-float p1, p1
 
-    iput p1, p0, Lcom/facebook/drawee/c/a;->OU:F
+    iput p1, p0, Lcom/facebook/drawee/c/a;->Pd: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;->OT:Lcom/facebook/drawee/c/a$a;
+    iput-object v0, p0, Lcom/facebook/drawee/c/a;->Pc: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;->OV:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Pe:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->OW:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/c/a;->Pf: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 80070c1dc8..bf62a141bb 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -42,30 +42,30 @@
 
 
 # instance fields
-.field private final Kh:Lcom/facebook/drawee/a/a;
+.field private final Kq:Lcom/facebook/drawee/a/a;
 
-.field private Kp:Ljava/lang/Object;
+.field private Ky:Ljava/lang/Object;
 
-.field private final LB:Lcom/facebook/drawee/a/b;
+.field private final LK:Lcom/facebook/drawee/a/b;
 
-.field private final LC:Ljava/util/concurrent/Executor;
+.field private final LL:Ljava/util/concurrent/Executor;
 
-.field LD:Lcom/facebook/drawee/a/c;
+.field LM:Lcom/facebook/drawee/a/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field LE:Lcom/facebook/drawee/c/a;
+.field LN:Lcom/facebook/drawee/c/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field LF:Lcom/facebook/drawee/controller/c;
+.field LO:Lcom/facebook/drawee/controller/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field protected LG:Lcom/facebook/drawee/controller/ControllerListener;
+.field protected LP:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -77,30 +77,30 @@
     .end annotation
 .end field
 
-.field public LH:Lcom/facebook/drawee/d/c;
+.field public LQ:Lcom/facebook/drawee/d/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LI:Landroid/graphics/drawable/Drawable;
+.field private LR:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LJ:Z
+.field private LS:Z
 
-.field private LK:Z
+.field private LU:Z
 
-.field private LL:Z
+.field private LV:Z
 
-.field LM:Z
+.field LW:Z
 
-.field LN:Ljava/lang/String;
+.field LX:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LO:Lcom/facebook/c/c;
+.field private LY:Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/c/c<",
@@ -112,7 +112,7 @@
     .end annotation
 .end field
 
-.field private LP:Ljava/lang/Object;
+.field private LZ:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -123,7 +123,7 @@
     .end annotation
 .end field
 
-.field private LQ:Z
+.field private Ma:Z
 
 .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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI: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;->hb()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->he()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ma:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LC:Ljava/util/concurrent/Executor;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Ljava/util/concurrent/Executor;
 
     const/4 p1, 0x0
 
@@ -187,14 +187,14 @@
 
     invoke-direct {p0, p3, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->e(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p2}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p2}, Lcom/facebook/c/c;->gG()Z
 
     return-void
 
     :cond_0
     if-nez p4, :cond_1
 
-    iget-object p0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     const/4 p1, 0x0
 
@@ -254,7 +254,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Ljava/lang/String;Lcom/facebook/c/c;)Z
 
@@ -268,26 +268,26 @@
 
     invoke-virtual {p0, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->u(Ljava/lang/Object;)V
 
-    invoke-interface {p2}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p2}, Lcom/facebook/c/c;->gG()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
     if-eqz p5, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lj:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ls:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lk:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lt: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
@@ -303,11 +303,11 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ: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;->LP:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ:Ljava/lang/Object;
 
     iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
     :try_end_3
@@ -326,13 +326,13 @@
 
     const/4 p4, 0x0
 
-    iput-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iput-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -340,7 +340,7 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hj()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hm()Landroid/graphics/drawable/Animatable;
 
     move-result-object p6
 
@@ -360,11 +360,11 @@
 
     invoke-direct {p0, p4, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->h(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -372,7 +372,7 @@
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hj()Landroid/graphics/drawable/Animatable;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hm()Landroid/graphics/drawable/Animatable;
 
     move-result-object p6
 
@@ -385,11 +385,11 @@
 
     invoke-direct {p0, p5, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->h(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p5, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p5, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p4
 
@@ -421,7 +421,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
     :cond_5
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -458,14 +458,14 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -483,7 +483,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Ljava/lang/String;Lcom/facebook/c/c;)Z
 
@@ -495,23 +495,23 @@
 
     invoke-direct {p0, p1, p3}, Lcom/facebook/drawee/controller/AbstractDraweeController;->e(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-interface {p2}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p2}, Lcom/facebook/c/c;->gG()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
     if-eqz p4, :cond_1
 
-    sget-object p2, Lcom/facebook/drawee/a/b$a;->Ll:Lcom/facebook/drawee/a/b$a;
+    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lu:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lm:Lcom/facebook/drawee/a/b$a;
+    sget-object p2, Lcom/facebook/drawee/a/b$a;->Lv: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
@@ -524,13 +524,13 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
 
-    iget-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Z
+    iget-boolean p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
 
     if-eqz p2, :cond_2
 
@@ -538,7 +538,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -547,25 +547,25 @@
     goto :goto_1
 
     :cond_2
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hc()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hL()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hO()V
 
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hK()V
+    invoke-interface {p1}, Lcom/facebook/drawee/d/c;->hN()V
 
     :goto_1
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p1
 
@@ -580,7 +580,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;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object p1
 
@@ -589,7 +589,7 @@
     invoke-interface {p1, p2, p3}, Lcom/facebook/drawee/controller/ControllerListener;->onIntermediateImageFailed(Ljava/lang/String;Ljava/lang/Throwable;)V
 
     :goto_2
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -609,7 +609,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     if-nez v1, :cond_0
 
@@ -624,11 +624,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     if-ne p2, p1, :cond_1
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
     if-eqz p1, :cond_1
 
@@ -651,7 +651,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -681,23 +681,23 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Le:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ln: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;->LQ:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ma:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a$a;)V
 
@@ -706,35 +706,35 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LU:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hd()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hg()V
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM: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;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/c/a;->init()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
-    iput-object p0, v0, Lcom/facebook/drawee/c/a;->OT:Lcom/facebook/drawee/c/a$a;
+    iput-object p0, v0, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     instance-of v0, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -742,36 +742,36 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     check-cast v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->hr()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->hu()V
 
     goto :goto_0
 
     :cond_3
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     :goto_0
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LF:Lcom/facebook/drawee/controller/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/drawee/controller/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->LH:Lcom/facebook/drawee/d/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     :cond_4
-    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Landroid/graphics/drawable/Drawable;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
 
     const/4 v0, 0x2
 
@@ -781,7 +781,7 @@
 
     if-eqz v0, :cond_5
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     const-string v1, "controller %x %s -> %s: initialize"
 
@@ -800,9 +800,9 @@
     :cond_5
     iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kp:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Ljava/lang/Object;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -836,7 +836,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     const/4 v2, 0x5
 
@@ -890,18 +890,18 @@
     return-void
 .end method
 
-.method private hc()Z
+.method private hf()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->hc()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/a/c;->hf()Z
 
     move-result v0
 
@@ -917,26 +917,26 @@
     return v0
 .end method
 
-.method private hd()V
+.method private hg()V
     .locals 4
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    invoke-interface {v1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {v1}, Lcom/facebook/c/c;->gG()Z
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     :cond_0
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mDrawable:Landroid/graphics/drawable/Drawable;
@@ -946,16 +946,16 @@
     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;->LN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LX:Ljava/lang/String;
 
     if-eqz v1, :cond_2
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Ljava/lang/String;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LX: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;->LP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ:Ljava/lang/Object;
 
     if-eqz v1, :cond_3
 
@@ -963,16 +963,16 @@
 
     invoke-direct {p0, v3, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->h(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ:Ljava/lang/Object;
 
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->u(Ljava/lang/Object;)V
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Ljava/lang/Object;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ:Ljava/lang/Object;
 
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()Lcom/facebook/drawee/controller/ControllerListener;
 
     move-result-object v0
 
@@ -984,7 +984,7 @@
     return-void
 .end method
 
-.method private he()Lcom/facebook/drawee/controller/ControllerListener;
+.method private hh()Lcom/facebook/drawee/controller/ControllerListener;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -994,7 +994,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     if-nez v0, :cond_0
 
@@ -1006,12 +1006,12 @@
     return-object v0
 .end method
 
-.method private hi()V
+.method private hl()V
     .locals 8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gS()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gV()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1021,29 +1021,29 @@
 
     if-eqz v3, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iput-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lw:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LF: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;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()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;->Kp:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky:Ljava/lang/Object;
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/drawee/controller/ControllerListener;->onSubmit(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -1053,7 +1053,7 @@
 
     iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     const/high16 v4, 0x3f800000    # 1.0f
 
@@ -1067,44 +1067,44 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Ljava/lang/String;Lcom/facebook/c/c;Ljava/lang/Object;FZZZ)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v3, Lcom/facebook/drawee/a/b$a;->Li:Lcom/facebook/drawee/a/b$a;
+    sget-object v3, Lcom/facebook/drawee/a/b$a;->Lr: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;->he()Lcom/facebook/drawee/controller/ControllerListener;
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hh()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;->Kp:Ljava/lang/Object;
+    iget-object v4, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ky: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;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->LJ:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gQ()Lcom/facebook/c/c;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->gT()Lcom/facebook/c/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     const/4 v0, 0x2
 
@@ -1114,7 +1114,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1126,7 +1126,7 @@
 
     iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/c/c;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
     invoke-static {v3}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1143,9 +1143,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;->LO:Lcom/facebook/c/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
-    invoke-interface {v1}, Lcom/facebook/c/c;->gA()Z
+    invoke-interface {v1}, Lcom/facebook/c/c;->gD()Z
 
     move-result v1
 
@@ -1153,13 +1153,13 @@
 
     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;->LO:Lcom/facebook/c/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LY:Lcom/facebook/c/c;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LC:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Ljava/util/concurrent/Executor;
 
     invoke-interface {v0, v2, v1}, Lcom/facebook/c/c;->a(Lcom/facebook/c/e;Ljava/util/concurrent/Executor;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -1216,7 +1216,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;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     instance-of v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1235,12 +1235,12 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     return-void
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     return-void
 .end method
@@ -1252,13 +1252,13 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
 
@@ -1278,7 +1278,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;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     instance-of v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -1295,7 +1295,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     :cond_1
     return-void
@@ -1321,12 +1321,12 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Ma:Z
 
     return-void
 .end method
 
-.method protected abstract gQ()Lcom/facebook/c/c;
+.method protected abstract gT()Lcom/facebook/c/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -1336,7 +1336,7 @@
     .end annotation
 .end method
 
-.method protected gS()Ljava/lang/Object;
+.method protected gV()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1357,25 +1357,25 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     return-object v0
 .end method
 
-.method protected final hf()Landroid/graphics/drawable/Drawable;
+.method protected final hi()Landroid/graphics/drawable/Drawable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
 
-.method public final hg()V
+.method public final hj()V
     .locals 5
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 v0, 0x2
 
@@ -1385,7 +1385,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1397,7 +1397,7 @@
 
     iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mId:Ljava/lang/String;
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
     if-eqz v3, :cond_0
 
@@ -1414,17 +1414,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;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lf:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lo: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;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->Kh:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/a/a;->a(Lcom/facebook/drawee/a/a$a;)V
 
@@ -1432,19 +1432,19 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hi()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hl()V
 
     :cond_2
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
 
-.method public final hh()Z
+.method public final hk()Z
     .locals 4
 
     const/4 v0, 0x2
@@ -1455,7 +1455,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1472,27 +1472,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;->hc()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
-    iget v1, v0, Lcom/facebook/drawee/a/c;->LA:I
+    iget v1, v0, Lcom/facebook/drawee/a/c;->LJ:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lcom/facebook/drawee/a/c;->LA:I
+    iput v1, v0, Lcom/facebook/drawee/a/c;->LJ:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/c;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hi()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hl()V
 
     return v2
 
@@ -1502,7 +1502,7 @@
     return v0
 .end method
 
-.method public final hj()Landroid/graphics/drawable/Animatable;
+.method public final hm()Landroid/graphics/drawable/Animatable;
     .locals 2
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -1526,7 +1526,7 @@
 .method public final onDetach()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 v0, 0x2
 
@@ -1536,7 +1536,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1553,9 +1553,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;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lg:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lp:Lcom/facebook/drawee/a/b$a;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/a/b;->a(Lcom/facebook/drawee/a/b$a;)V
 
@@ -1563,11 +1563,11 @@
 
     iput-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq:Lcom/facebook/drawee/a/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/a;->gZ()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->hc()V
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->KS:Ljava/util/Set;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Lb:Ljava/util/Set;
 
     invoke-interface {v1, p0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1575,7 +1575,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->KS:Ljava/util/Set;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Lb:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->size()I
 
@@ -1585,14 +1585,14 @@
 
     if-ne v1, v2, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/drawee/a/a;->KT:Landroid/os/Handler;
+    iget-object v1, v0, Lcom/facebook/drawee/a/a;->Lc:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/facebook/drawee/a/a;->KU:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/facebook/drawee/a/a;->Ld:Ljava/lang/Runnable;
 
     invoke-virtual {v1, v0}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -1608,7 +1608,7 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1625,7 +1625,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;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
     const/4 v2, 0x0
 
@@ -1634,11 +1634,11 @@
     return v2
 
     :cond_1
-    iget-boolean v1, v1, Lcom/facebook/drawee/c/a;->OV:Z
+    iget-boolean v1, v1, Lcom/facebook/drawee/c/a;->Pe:Z
 
     if-nez v1, :cond_3
 
-    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hc()Z
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hf()Z
 
     move-result v1
 
@@ -1651,7 +1651,7 @@
 
     :cond_3
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -1672,7 +1672,7 @@
     goto/16 :goto_2
 
     :cond_4
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->OV:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pe:Z
 
     goto :goto_1
 
@@ -1681,7 +1681,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->OY:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Ph:F
 
     sub-float/2addr v0, v3
 
@@ -1689,7 +1689,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->OU:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     cmpl-float v0, v0, v3
 
@@ -1699,7 +1699,7 @@
 
     move-result p1
 
-    iget v0, v1, Lcom/facebook/drawee/c/a;->OZ:F
+    iget v0, v1, Lcom/facebook/drawee/c/a;->Pi:F
 
     sub-float/2addr p1, v0
 
@@ -1707,25 +1707,25 @@
 
     move-result p1
 
-    iget v0, v1, Lcom/facebook/drawee/c/a;->OU:F
+    iget v0, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     cmpl-float p1, p1, v0
 
     if-lez p1, :cond_c
 
     :cond_6
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->OW:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pf:Z
 
     goto :goto_2
 
     :cond_7
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->OV:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pe:Z
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->OY:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Ph:F
 
     sub-float/2addr v0, v3
 
@@ -1733,7 +1733,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->OU:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     cmpl-float v0, v0, v3
 
@@ -1743,7 +1743,7 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->OZ:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pi:F
 
     sub-float/2addr v0, v3
 
@@ -1751,17 +1751,17 @@
 
     move-result v0
 
-    iget v3, v1, Lcom/facebook/drawee/c/a;->OU:F
+    iget v3, v1, Lcom/facebook/drawee/c/a;->Pd:F
 
     cmpl-float v0, v0, v3
 
     if-lez v0, :cond_9
 
     :cond_8
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->OW:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pf:Z
 
     :cond_9
-    iget-boolean v0, v1, Lcom/facebook/drawee/c/a;->OW:Z
+    iget-boolean v0, v1, Lcom/facebook/drawee/c/a;->Pf:Z
 
     if-eqz v0, :cond_a
 
@@ -1769,7 +1769,7 @@
 
     move-result-wide v5
 
-    iget-wide v7, v1, Lcom/facebook/drawee/c/a;->OX:J
+    iget-wide v7, v1, Lcom/facebook/drawee/c/a;->Pg:J
 
     sub-long/2addr v5, v7
 
@@ -1783,42 +1783,42 @@
 
     if-gtz p1, :cond_a
 
-    iget-object p1, v1, Lcom/facebook/drawee/c/a;->OT:Lcom/facebook/drawee/c/a$a;
+    iget-object p1, v1, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
 
     if-eqz p1, :cond_a
 
-    iget-object p1, v1, Lcom/facebook/drawee/c/a;->OT:Lcom/facebook/drawee/c/a$a;
+    iget-object p1, v1, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->hh()Z
+    invoke-interface {p1}, Lcom/facebook/drawee/c/a$a;->hk()Z
 
     :cond_a
     :goto_1
-    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->OW:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/c/a;->Pf:Z
 
     goto :goto_2
 
     :cond_b
-    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->OV:Z
+    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Pe:Z
 
-    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->OW:Z
+    iput-boolean v4, v1, Lcom/facebook/drawee/c/a;->Pf:Z
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getEventTime()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/facebook/drawee/c/a;->OX:J
+    iput-wide v2, v1, Lcom/facebook/drawee/c/a;->Pg:J
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getX()F
 
     move-result v0
 
-    iput v0, v1, Lcom/facebook/drawee/c/a;->OY:F
+    iput v0, v1, Lcom/facebook/drawee/c/a;->Ph:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result p1
 
-    iput p1, v1, Lcom/facebook/drawee/c/a;->OZ:F
+    iput p1, v1, Lcom/facebook/drawee/c/a;->Pi:F
 
     :cond_c
     :goto_2
@@ -1828,36 +1828,36 @@
 .method public final release()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lh:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lq: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;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput v1, v0, Lcom/facebook/drawee/a/c;->LA:I
+    iput v1, v0, Lcom/facebook/drawee/a/c;->LJ:I
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN: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;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ: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;->hd()V
+    invoke-direct {p0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->hg()V
 
     return-void
 .end method
@@ -1877,7 +1877,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->GI:Ljava/lang/Class;
 
     invoke-static {p0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -1894,32 +1894,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;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->KZ:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Li:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->La:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lj: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;->LJ:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kh:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->Kq: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;->LH:Lcom/facebook/drawee/d/c;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     if-eqz v0, :cond_3
 
@@ -1927,7 +1927,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;->LH:Lcom/facebook/drawee/d/c;
+    iput-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
     :cond_3
     if-eqz p1, :cond_4
@@ -1938,11 +1938,11 @@
 
     check-cast p1, Lcom/facebook/drawee/d/c;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
-    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LH:Lcom/facebook/drawee/d/c;
+    iget-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LQ:Lcom/facebook/drawee/d/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LI:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LR:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/facebook/drawee/d/c;->b(Landroid/graphics/drawable/Drawable;)V
 
@@ -1965,7 +1965,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LJ:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LS:Z
 
     const-string v2, "isRequestSubmitted"
 
@@ -1973,7 +1973,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LL:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LV:Z
 
     const-string v2, "hasFetchFailed"
 
@@ -1981,7 +1981,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LZ:Ljava/lang/Object;
 
     invoke-virtual {p0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->v(Ljava/lang/Object;)I
 
@@ -1993,7 +1993,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LK: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 9645c7b6a3..04fc200c79 100644
--- a/com.discord/smali/com/facebook/drawee/controller/a.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/a.smali
@@ -33,7 +33,7 @@
 
 
 # static fields
-.field private static final LU:Lcom/facebook/drawee/controller/ControllerListener;
+.field private static final Md:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -43,13 +43,13 @@
     .end annotation
 .end field
 
-.field private static final LV:Ljava/lang/NullPointerException;
+.field private static final Me:Ljava/lang/NullPointerException;
 
-.field private static final Mc:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final Ml:Ljava/util/concurrent/atomic/AtomicLong;
 
 
 # instance fields
-.field private JX:Lcom/facebook/common/d/l;
+.field private Kg:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final Kf:Ljava/util/Set;
+.field private final Ko:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -72,17 +72,19 @@
     .end annotation
 .end field
 
-.field public Kp:Ljava/lang/Object;
+.field public Ky:Ljava/lang/Object;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private LF:Lcom/facebook/drawee/controller/c;
+.field private LH:Z
+
+.field private LO:Lcom/facebook/drawee/controller/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public LG:Lcom/facebook/drawee/controller/ControllerListener;
+.field public LP:Lcom/facebook/drawee/controller/ControllerListener;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/controller/ControllerListener<",
@@ -94,11 +96,11 @@
     .end annotation
 .end field
 
-.field private LM:Z
+.field private LW:Z
 
-.field private LN:Ljava/lang/String;
+.field private LX:Ljava/lang/String;
 
-.field public LW:Ljava/lang/Object;
+.field public Mf:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TREQUEST;"
@@ -109,7 +111,7 @@
     .end annotation
 .end field
 
-.field private LX:Ljava/lang/Object;
+.field private Mg:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TREQUEST;"
@@ -120,7 +122,7 @@
     .end annotation
 .end field
 
-.field public LY:[Ljava/lang/Object;
+.field public Mh:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TREQUEST;"
@@ -131,13 +133,11 @@
     .end annotation
 .end field
 
-.field public LZ:Z
+.field public Mi:Z
 
-.field private Ly:Z
+.field public Mj:Z
 
-.field public Ma:Z
-
-.field public Mb:Lcom/facebook/drawee/d/a;
+.field public Mk:Lcom/facebook/drawee/d/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -153,7 +153,7 @@
 
     invoke-direct {v0}, Lcom/facebook/drawee/controller/a$1;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/controller/a;->LU:Lcom/facebook/drawee/controller/ControllerListener;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->Md: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;->LV:Ljava/lang/NullPointerException;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->Me: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;->Mc:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/facebook/drawee/controller/a;->Ml: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;->Kf:Ljava/util/Set;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/a;->Ko:Ljava/util/Set;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Kp:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LY:[Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
 
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->LZ:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Mi:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LF:Lcom/facebook/drawee/controller/c;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LO:Lcom/facebook/drawee/controller/c;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Ly:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->LH:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Ma:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/controller/a;->Mj:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LN:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/String;
 
     return-void
 .end method
@@ -235,7 +235,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Mj:Lcom/facebook/drawee/controller/a$a;
+    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Ms: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/l;
 
@@ -260,7 +260,7 @@
         }
     .end annotation
 
-    iget-object v5, p0, Lcom/facebook/drawee/controller/a;->Kp:Ljava/lang/Object;
+    iget-object v5, p0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
 
     new-instance v7, Lcom/facebook/drawee/controller/a$2;
 
@@ -281,10 +281,10 @@
     return-object v7
 .end method
 
-.method protected static hp()Ljava/lang/String;
+.method protected static hs()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/facebook/drawee/controller/a;->Mc:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lcom/facebook/drawee/controller/a;->Ml:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->JX:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Kg:Lcom/facebook/common/d/l;
 
     if-eqz v0, :cond_0
 
@@ -337,7 +337,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     const/4 v2, 0x2
 
@@ -352,11 +352,11 @@
     goto :goto_2
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LY:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
 
     if-eqz v1, :cond_4
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->LZ:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/controller/a;->Mi:Z
 
     new-instance v4, Ljava/util/ArrayList;
 
@@ -377,7 +377,7 @@
 
     aget-object v5, v1, v0
 
-    sget-object v6, Lcom/facebook/drawee/controller/a$a;->Ml:Lcom/facebook/drawee/controller/a$a;
+    sget-object v6, Lcom/facebook/drawee/controller/a$a;->Mu: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/l;
 
@@ -418,7 +418,7 @@
     :goto_2
     if-eqz v0, :cond_5
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
 
     if-eqz v1, :cond_5
 
@@ -428,7 +428,7 @@
 
     invoke-interface {v1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg: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/l;
 
@@ -443,7 +443,7 @@
     :cond_5
     if-nez v0, :cond_6
 
-    sget-object p1, Lcom/facebook/drawee/controller/a;->LV:Ljava/lang/NullPointerException;
+    sget-object p1, Lcom/facebook/drawee/controller/a;->Me:Ljava/lang/NullPointerException;
 
     new-instance v0, Lcom/facebook/c/d$1;
 
@@ -468,7 +468,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     return-object p0
 .end method
@@ -480,25 +480,25 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     return-object p0
 .end method
 
-.method protected abstract gU()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method protected abstract gX()Lcom/facebook/drawee/controller/AbstractDraweeController;
 .end method
 
-.method public final hk()Ljava/lang/Object;
+.method public final hn()Ljava/lang/Object;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Kp:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final hl()Ljava/lang/Object;
+.method public final ho()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -509,12 +509,12 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final hm()Lcom/facebook/drawee/controller/a;
+.method public final hp()Lcom/facebook/drawee/controller/a;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -525,25 +525,25 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/controller/a;->Ly:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/controller/a;->LH:Z
 
     return-object p0
 .end method
 
-.method public final hn()Lcom/facebook/drawee/d/a;
+.method public final hq()Lcom/facebook/drawee/d/a;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
     return-object v0
 .end method
 
-.method public final ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+.method public final hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LY:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -551,7 +551,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
@@ -571,19 +571,19 @@
 
     invoke-static {v0, v3}, Lcom/facebook/common/d/i;->a(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->JX:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Kg:Lcom/facebook/common/d/l;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LY:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
@@ -595,48 +595,48 @@
 
     invoke-static {v1, v0}, Lcom/facebook/common/d/i;->a(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LY:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mh:[Ljava/lang/Object;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
 
     if-eqz v0, :cond_4
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/controller/a;->Mg:Ljava/lang/Object;
 
     :cond_4
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gU()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->gX()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LM:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LW:Z
 
-    iput-boolean v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Z
+    iput-boolean v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LW:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LN:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LX:Ljava/lang/String;
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Ljava/lang/String;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LX:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LF:Lcom/facebook/drawee/controller/c;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LO:Lcom/facebook/drawee/controller/c;
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LF:Lcom/facebook/drawee/controller/c;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LO:Lcom/facebook/drawee/controller/c;
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->Ly:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->LH:Z
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
     if-nez v1, :cond_5
 
@@ -644,16 +644,16 @@
 
     invoke-direct {v1}, Lcom/facebook/drawee/a/c;-><init>()V
 
-    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iput-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
     :cond_5
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LD:Lcom/facebook/drawee/a/c;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LM:Lcom/facebook/drawee/a/c;
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/controller/a;->Ly:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/controller/a;->LH:Z
 
-    iput-boolean v2, v1, Lcom/facebook/drawee/a/c;->Ly:Z
+    iput-boolean v2, v1, Lcom/facebook/drawee/a/c;->LH:Z
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
     if-nez v1, :cond_6
 
@@ -663,18 +663,18 @@
 
     invoke-direct {v2, v1}, Lcom/facebook/drawee/c/a;-><init>(Landroid/content/Context;)V
 
-    iput-object v2, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iput-object v2, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LE:Lcom/facebook/drawee/c/a;
+    iget-object v1, v0, Lcom/facebook/drawee/controller/AbstractDraweeController;->LN:Lcom/facebook/drawee/c/a;
 
-    iput-object v0, v1, Lcom/facebook/drawee/c/a;->OT:Lcom/facebook/drawee/c/a$a;
+    iput-object v0, v1, Lcom/facebook/drawee/c/a;->Pc:Lcom/facebook/drawee/c/a$a;
 
     :cond_6
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Kf:Ljava/util/Set;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->Ko:Ljava/util/Set;
 
     if-eqz v1, :cond_7
 
@@ -700,31 +700,31 @@
     goto :goto_2
 
     :cond_7
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a;->LP: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;->Ma:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/controller/a;->Mj:Z
 
     if-eqz v1, :cond_9
 
-    sget-object v1, Lcom/facebook/drawee/controller/a;->LU:Lcom/facebook/drawee/controller/ControllerListener;
+    sget-object v1, Lcom/facebook/drawee/controller/a;->Md:Lcom/facebook/drawee/controller/ControllerListener;
 
     invoke-virtual {v0, v1}, Lcom/facebook/drawee/controller/AbstractDraweeController;->a(Lcom/facebook/drawee/controller/ControllerListener;)V
 
     :cond_9
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 .end method
 
-.method public final synthetic hq()Lcom/facebook/drawee/d/a;
+.method public final synthetic ht()Lcom/facebook/drawee/d/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {p0}, Lcom/facebook/drawee/controller/a;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
@@ -740,7 +740,7 @@
         }
     .end annotation
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/controller/a;->Ma:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/controller/a;->Mj:Z
 
     return-object p0
 .end method
@@ -754,7 +754,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     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 2762951401..5bdd5385e8 100644
--- a/com.discord/smali/com/facebook/drawee/controller/d.smali
+++ b/com.discord/smali/com/facebook/drawee/controller/d.smali
@@ -149,7 +149,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized hr()V
+.method public final declared-synchronized hu()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 6f22b97393..768e64ca14 100644
--- a/com.discord/smali/com/facebook/drawee/d/a.smali
+++ b/com.discord/smali/com/facebook/drawee/d/a.smali
@@ -9,10 +9,10 @@
     .end annotation
 .end method
 
-.method public abstract hg()V
+.method public abstract hj()V
 .end method
 
-.method public abstract hj()Landroid/graphics/drawable/Animatable;
+.method public abstract hm()Landroid/graphics/drawable/Animatable;
 .end method
 
 .method public abstract onDetach()V
diff --git a/com.discord/smali/com/facebook/drawee/d/c.smali b/com.discord/smali/com/facebook/drawee/d/c.smali
index f52eec1b16..740663c3a7 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 hK()V
+.method public abstract hN()V
 .end method
 
-.method public abstract hL()V
+.method public abstract hO()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 fde4877e2d..651b703583 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 hq()Lcom/facebook/drawee/d/a;
+.method public abstract ht()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 8588140749..fd6a737e44 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/ScalingUtils.smali
@@ -55,7 +55,7 @@
 
     check-cast p0, Lcom/facebook/drawee/drawable/c;
 
-    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object p0
 
@@ -68,7 +68,7 @@
 
     check-cast p0, Lcom/facebook/drawee/drawable/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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 1310c5b676..f17ef2471f 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 MI:Lcom/facebook/drawee/drawable/r;
+.field private MR:Lcom/facebook/drawee/drawable/r;
 
-.field private final MJ:Lcom/facebook/drawee/drawable/d;
+.field private final MS:Lcom/facebook/drawee/drawable/d;
 
-.field public final MK:[Landroid/graphics/drawable/Drawable;
+.field public final MT:[Landroid/graphics/drawable/Drawable;
 
-.field public final ML:[Lcom/facebook/drawee/drawable/c;
+.field public final MU:[Lcom/facebook/drawee/drawable/c;
 
-.field private MM:Z
+.field private MV:Z
 
-.field private MN:Z
+.field private MW:Z
 
-.field private MO:Z
+.field private MX: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/a;->MS: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;->MM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MV:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MN:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MW:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MO:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MX: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
 
     :goto_0
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->ML:[Lcom/facebook/drawee/drawable/c;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->MU:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MO:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->MX: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MS: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;->MN:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/a;->MW:Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MI:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MR: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;->MI:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a;->MR: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;->MI:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MR: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MN:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MW:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MV:Z
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MM:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/a;->MV: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;->MM:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/a;->MV:Z
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->MN:Z
+    iput-boolean v4, p0, Lcom/facebook/drawee/drawable/a;->MW:Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MM:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MV:Z
 
     return v0
 .end method
@@ -562,7 +562,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MO:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/a;->MX: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MS: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MS: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MS: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a;->MS: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/a;->MT:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
 
     array-length v3, v2
 
diff --git a/com.discord/smali/com/facebook/drawee/drawable/c.smali b/com.discord/smali/com/facebook/drawee/drawable/c.smali
index 7f0cd7787c..2870172789 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/c.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/c.smali
@@ -7,5 +7,5 @@
 .method public abstract c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 .end method
 
-.method public abstract hs()Landroid/graphics/drawable/Drawable;
+.method public abstract hv()Landroid/graphics/drawable/Drawable;
 .end method
diff --git a/com.discord/smali/com/facebook/drawee/drawable/g.smali b/com.discord/smali/com/facebook/drawee/drawable/g.smali
index 5c3dae67c2..40a6ed0b78 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/g.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/g.smali
@@ -10,15 +10,15 @@
 
 
 # static fields
-.field private static final Nh:Landroid/graphics/Matrix;
+.field private static final Nq:Landroid/graphics/Matrix;
 
 
 # instance fields
-.field protected MI:Lcom/facebook/drawee/drawable/r;
+.field protected MR:Lcom/facebook/drawee/drawable/r;
 
-.field private final MJ:Lcom/facebook/drawee/drawable/d;
+.field private final MS:Lcom/facebook/drawee/drawable/d;
 
-.field private Ng:Landroid/graphics/drawable/Drawable;
+.field private Np:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    sput-object v0, Lcom/facebook/drawee/drawable/g;->Nh:Landroid/graphics/Matrix;
+    sput-object v0, Lcom/facebook/drawee/drawable/g;->Nq: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/g;->MS:Lcom/facebook/drawee/drawable/d;
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->MI:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MR: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;->MI:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->MR: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;->Nh:Landroid/graphics/Matrix;
+    sget-object v0, Lcom/facebook/drawee/drawable/g;->Nq: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;->Nh:Landroid/graphics/Matrix;
+    sget-object v0, Lcom/facebook/drawee/drawable/g;->Nq: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;->MI:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MR: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->MS: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
@@ -232,7 +232,7 @@
 .method public getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -253,7 +253,7 @@
 .method public getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -274,7 +274,7 @@
 .method public getOpacity()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -293,7 +293,7 @@
 .method public getPadding(Landroid/graphics/Rect;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
@@ -311,7 +311,7 @@
     return p1
 .end method
 
-.method public final hs()Landroid/graphics/drawable/Drawable;
+.method public final hv()Landroid/graphics/drawable/Drawable;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -334,7 +334,7 @@
 .method public isStateful()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MS:Lcom/facebook/drawee/drawable/d;
 
     iput p1, v0, Lcom/facebook/drawee/drawable/d;->mAlpha:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MS: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MS: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->MS: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/g;->Np: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;->Ng:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/g;->Np: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 3f42750d30..03f325a991 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/j.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/j.smali
@@ -10,7 +10,7 @@
 .method public abstract a([F)V
 .end method
 
-.method public abstract hz()V
+.method public abstract hC()V
 .end method
 
 .method public abstract k(F)V
diff --git a/com.discord/smali/com/facebook/drawee/drawable/k.smali b/com.discord/smali/com/facebook/drawee/drawable/k.smali
index abc205f534..975f8f40ef 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 No:Landroid/graphics/Paint;
+.field private final Nx:Landroid/graphics/Paint;
 
-.field private Np:Ljava/lang/ref/WeakReference;
+.field private Ny: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;->No:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/k;->Nx: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;->No:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
 
     sget-object p2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style;
 
@@ -83,9 +83,9 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hA()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hD()Z
 
     move-result v0
 
@@ -93,16 +93,16 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/n;->draw(Landroid/graphics/Canvas;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_0
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hH()V
+
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hE()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hB()V
-
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->Np:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->Ny: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;->Np:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/k;->Ny: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;->NN:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NW:Z
 
     :cond_2
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NN:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NW:Z
 
     if-eqz v0, :cond_3
 
@@ -150,18 +150,18 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->NZ:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Oi: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;->NN:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/k;->NW:Z
 
     :cond_3
     iget-object v0, p0, Lcom/facebook/drawee/drawable/k;->mPaint:Landroid/graphics/Paint;
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hD()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/k;->hG()Z
 
     move-result v1
 
@@ -171,7 +171,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->NX:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Og:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -181,7 +181,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;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/k;->ND:F
 
     const/4 v2, 0x0
 
@@ -189,15 +189,15 @@
 
     if-lez v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->No:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/k;->Nu:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/k;->ND:F
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->No:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/k;->Nv:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/k;->NE:I
 
     iget-object v3, p0, Lcom/facebook/drawee/drawable/k;->mPaint:Landroid/graphics/Paint;
 
@@ -211,24 +211,24 @@
 
     invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->Ny:Landroid/graphics/Path;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/k;->NH:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/k;->No:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/k;->Nx:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v1, v2}, Landroid/graphics/Canvas;->drawPath(Landroid/graphics/Path;Landroid/graphics/Paint;)V
 
     :cond_4
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
 
-.method final hA()Z
+.method final hD()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->hA()Z
+    invoke-super {p0}, Lcom/facebook/drawee/drawable/n;->hD()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 59e67202a6..401c0dd187 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/l.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/l.smali
@@ -7,28 +7,28 @@
 
 
 # instance fields
-.field private final Nq:[F
+.field final NA:[F
 
-.field final Nr:[F
-
-.field Ns:[F
+.field NB:[F
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Nt:Z
+.field private NC:Z
 
-.field private Nu:F
+.field private ND:F
 
-.field private Nv:I
+.field private NE:I
 
-.field private Nw:Z
+.field private NF:Z
 
-.field private Nx:Z
+.field private NG:Z
 
-.field final Ny:Landroid/graphics/Path;
+.field final NH:Landroid/graphics/Path;
 
-.field private final Nz:Landroid/graphics/RectF;
+.field private final NI:Landroid/graphics/RectF;
+
+.field private final Nz:[F
 
 .field private mAlpha:I
 
@@ -51,11 +51,11 @@
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nr:[F
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->NA:[F
 
     new-instance v0, Landroid/graphics/Paint;
 
@@ -67,19 +67,19 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Nt:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iput v1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     iput v1, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/l;->Nv:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/l;->NE:I
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Nw:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Nx:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NG:Z
 
     new-instance v1, Landroid/graphics/Path;
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v1}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->Ny:Landroid/graphics/Path;
+    iput-object v1, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
 
     iput v0, p0, Lcom/facebook/drawee/drawable/l;->mColor:I
 
@@ -99,7 +99,7 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     const/16 v0, 0xff
 
@@ -131,18 +131,18 @@
     return-object v0
 .end method
 
-.method private hB()V
+.method private hE()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;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->getBounds()Landroid/graphics/Rect;
 
@@ -150,9 +150,9 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -162,19 +162,19 @@
 
     invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Nt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -186,15 +186,15 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Ny:Landroid/graphics/Path;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
@@ -210,13 +210,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nr:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NA:[F
 
     array-length v4, v3
 
     if-ge v0, v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
 
     aget v4, v4, v0
 
@@ -224,7 +224,7 @@
 
     add-float/2addr v4, v5
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     div-float/2addr v5, v2
 
@@ -237,18 +237,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NI: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;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     neg-float v4, v3
 
@@ -262,11 +262,11 @@
 
     iget v0, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->Nw:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
 
     if-eqz v3, :cond_2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     goto :goto_2
 
@@ -276,21 +276,21 @@
     :goto_2
     add-float/2addr v0, v3
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v0, v0}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->Nt:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
 
     if-eqz v3, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->width()F
 
     move-result v1
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -304,13 +304,13 @@
 
     iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->mPath:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerX()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->Nz:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerY()F
 
@@ -323,11 +323,11 @@
     goto :goto_4
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/l;->Nw:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Ns:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->NB:[F
 
     if-nez v2, :cond_4
 
@@ -335,21 +335,21 @@
 
     new-array v2, v2, [F
 
-    iput-object v2, p0, Lcom/facebook/drawee/drawable/l;->Ns:[F
+    iput-object v2, p0, Lcom/facebook/drawee/drawable/l;->NB:[F
 
     :cond_4
     :goto_3
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->Ns:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->NB:[F
 
     array-length v3, v2
 
     if-ge v1, v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
 
     aget v3, v3, v1
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     sub-float/2addr v3, v4
 
@@ -362,7 +362,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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     sget-object v4, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
@@ -373,16 +373,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;->Nz:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/l;->Nz:[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;->Nz:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->NI:Landroid/graphics/RectF;
 
     neg-float v0, v0
 
@@ -396,24 +396,24 @@
 .method public final a(IF)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/l;->Nv:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/l;->NE:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/l;->Nv:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/l;->NE:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
     :cond_0
-    iget p1, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget p1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     cmpl-float p1, p1, p2
 
     if-eqz p1, :cond_1
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -426,7 +426,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
 
     const/4 v0, 0x0
 
@@ -455,12 +455,12 @@
 
     invoke-static {v0, v3}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nz:[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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -490,7 +490,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/drawable/l;->Nx:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/drawable/l;->NG:Z
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setFilterBitmap(Z)V
 
@@ -500,7 +500,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;->Nu:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     const/4 v1, 0x0
 
@@ -510,7 +510,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Nv:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->NE:I
 
     iget v2, p0, Lcom/facebook/drawee/drawable/l;->mAlpha:I
 
@@ -528,11 +528,11 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/l;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/l;->ND:F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->NH:Landroid/graphics/Path;
 
     iget-object v1, p0, Lcom/facebook/drawee/drawable/l;->mPaint:Landroid/graphics/Paint;
 
@@ -584,7 +584,7 @@
     return v0
 .end method
 
-.method public final hz()V
+.method public final hC()V
     .locals 2
 
     const/4 v0, 0x1
@@ -593,13 +593,13 @@
 
     invoke-static {v0, v1}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nq:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/l;->Nz:[F
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -617,7 +617,7 @@
 
     iput p1, p0, Lcom/facebook/drawee/drawable/l;->mPadding:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -630,7 +630,7 @@
 
     invoke-super {p0, p1}, Landroid/graphics/drawable/Drawable;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     return-void
 .end method
@@ -659,9 +659,9 @@
 .method public final t(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Nt:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NC:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -671,13 +671,13 @@
 .method public final u(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Nw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Nw:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NF:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/l;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/l;->invalidateSelf()V
 
@@ -688,11 +688,11 @@
 .method public final v(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->Nx:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/l;->NG:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->Nx:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/l;->NG:Z
 
     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 aaa9bdd389..ba362fcc77 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/m.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/m.smali
@@ -15,39 +15,39 @@
 
 
 # instance fields
-.field NA:I
+.field final NA:[F
 
-.field private final NB:Landroid/graphics/RectF;
+.field private NC:Z
 
-.field private NC:Landroid/graphics/RectF;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private ND:Landroid/graphics/Matrix;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field private ND:F
 
 .field private NE:I
 
-.field private final NF:Landroid/graphics/RectF;
+.field private NF:Z
 
-.field private final Nq:[F
+.field private NG:Z
 
-.field final Nr:[F
+.field private final NH:Landroid/graphics/Path;
 
-.field private Nt:Z
+.field NJ:I
 
-.field private Nu:F
+.field private final NK:Landroid/graphics/RectF;
 
-.field private Nv:I
+.field private NM:Landroid/graphics/RectF;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field private Nw:Z
+.field private NN:Landroid/graphics/Matrix;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
 
-.field private Nx:Z
+.field private NO:I
 
-.field private final Ny:Landroid/graphics/Path;
+.field private final NP:Landroid/graphics/RectF;
+
+.field private final Nz:[F
 
 .field private mPadding:F
 
@@ -68,25 +68,25 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/drawable/g;-><init>(Landroid/graphics/drawable/Drawable;)V
 
-    sget p1, Lcom/facebook/drawee/drawable/m$a;->NH:I
+    sget p1, Lcom/facebook/drawee/drawable/m$a;->NR:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NA:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NJ:I
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     const/16 p1, 0x8
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nq:[F
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Nr:[F
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NA:[F
 
     new-instance p1, Landroid/graphics/Paint;
 
@@ -98,21 +98,21 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Nt:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
-
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Nv:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     iput p1, p0, Lcom/facebook/drawee/drawable/m;->NE:I
 
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NO:I
+
     iput v0, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Nw:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NF:Z
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Nx:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NG:Z
 
     new-instance p1, Landroid/graphics/Path;
 
@@ -124,29 +124,29 @@
 
     invoke-direct {p1}, Landroid/graphics/Path;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->Ny:Landroid/graphics/Path;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NH: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;->NF:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     return-void
 .end method
 
-.method private hB()V
+.method private hE()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;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->getBounds()Landroid/graphics/Rect;
 
@@ -154,7 +154,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     iget v1, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
@@ -162,13 +162,13 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NP: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;->Nt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
 
     const/high16 v1, 0x40000000    # 2.0f
 
@@ -176,25 +176,25 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPath:Landroid/graphics/Path;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->centerX()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerY()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
@@ -215,16 +215,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;->NF:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nq:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nz:[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;->NF:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     iget v2, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
@@ -234,9 +234,9 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     div-float v3, v2, v1
 
@@ -244,17 +244,17 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Nt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
@@ -266,15 +266,15 @@
 
     div-float/2addr v0, v1
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Ny:Landroid/graphics/Path;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->centerX()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerY()F
 
@@ -290,13 +290,13 @@
     const/4 v0, 0x0
 
     :goto_1
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->Nr:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NA:[F
 
     array-length v3, v2
 
     if-ge v0, v3, :cond_2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nq:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
 
     aget v3, v3, v0
 
@@ -304,7 +304,7 @@
 
     add-float/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     div-float/2addr v4, v1
 
@@ -317,18 +317,18 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/Path;
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NF:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NP: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;->NF:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NP:Landroid/graphics/RectF;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     neg-float v3, v2
 
@@ -348,7 +348,7 @@
 .method public final N(I)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NE:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NO:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -358,11 +358,11 @@
 .method public final a(IF)V
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/m;->Nv:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/m;->NE:I
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -374,7 +374,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/m;->Nq:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
 
     const/4 v0, 0x0
 
@@ -403,12 +403,12 @@
 
     invoke-static {v0, v3}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nq:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nz:[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;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -418,7 +418,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 10
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->getBounds()Landroid/graphics/Rect;
 
@@ -426,9 +426,9 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    sget-object v0, Lcom/facebook/drawee/drawable/m$1;->NG:[I
+    sget-object v0, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NA:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NJ:I
 
     const/4 v2, 0x1
 
@@ -445,47 +445,47 @@
     goto/16 :goto_2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Nw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NF:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NC:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NM:Landroid/graphics/RectF;
 
     if-nez v0, :cond_1
 
     new-instance v0, Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-direct {v0, v1}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->NC:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->NM: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;->ND:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/m;->NN:Landroid/graphics/Matrix;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NC:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NM:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->ND:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NN:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NC:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NM:Landroid/graphics/RectF;
 
     sget-object v3, Landroid/graphics/Matrix$ScaleToFit;->FILL:Landroid/graphics/Matrix$ScaleToFit;
 
@@ -495,11 +495,11 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->clipRect(Landroid/graphics/RectF;)Z
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->ND:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->NN:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -521,7 +521,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NE:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NO:I
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -533,7 +533,7 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/m;->Nx:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/m;->NG:Z
 
     invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setFilterBitmap(Z)V
 
@@ -549,17 +549,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;->Nt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
@@ -567,7 +567,7 @@
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iget v2, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     add-float/2addr v0, v2
 
@@ -575,13 +575,13 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
@@ -589,7 +589,7 @@
 
     sub-float/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/m;->Nu:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     add-float/2addr v3, v4
 
@@ -599,21 +599,21 @@
 
     if-lez v2, :cond_3
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v5, v2, Landroid/graphics/RectF;->left:F
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v6, v2, Landroid/graphics/RectF;->top:F
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NB:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v8, v2, Landroid/graphics/RectF;->bottom:F
 
@@ -623,21 +623,21 @@
 
     invoke-virtual/range {v4 .. v9}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v6, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v8, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -650,19 +650,19 @@
 
     if-lez v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v5, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v6, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
@@ -674,21 +674,21 @@
 
     invoke-virtual/range {v4 .. v9}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v5, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK: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;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v7, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NB:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NK:Landroid/graphics/RectF;
 
     iget v8, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -719,7 +719,7 @@
 
     :cond_5
     :goto_2
-    iget v0, p0, Lcom/facebook/drawee/drawable/m;->Nv:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/m;->NE:I
 
     if-eqz v0, :cond_6
 
@@ -731,13 +731,13 @@
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/m;->Nv:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->NE: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;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/m;->ND:F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStrokeWidth(F)V
 
@@ -747,7 +747,7 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->NH:Landroid/graphics/Path;
 
     iget-object v1, p0, Lcom/facebook/drawee/drawable/m;->mPaint:Landroid/graphics/Paint;
 
@@ -757,16 +757,16 @@
     return-void
 .end method
 
-.method public final hz()V
+.method public final hC()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nq:[F
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/m;->Nz:[F
 
     const/4 v1, 0x0
 
     invoke-static {v0, v1}, Ljava/util/Arrays;->fill([FF)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -778,7 +778,7 @@
 
     iput p1, p0, Lcom/facebook/drawee/drawable/m;->mPadding:F
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -790,7 +790,7 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/g;->onBoundsChange(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     return-void
 .end method
@@ -798,9 +798,9 @@
 .method public final t(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Nt:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NC:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -810,9 +810,9 @@
 .method public final u(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Nw:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NF:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hB()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/m;->hE()V
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/m;->invalidateSelf()V
 
@@ -822,11 +822,11 @@
 .method public final v(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->Nx:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/m;->NG:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->Nx:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/m;->NG:Z
 
     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 e0126c284b..05cc0639f4 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/n.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/n.smali
@@ -8,59 +8,59 @@
 
 
 # instance fields
-.field private MI:Lcom/facebook/drawee/drawable/r;
+.field private MR:Lcom/facebook/drawee/drawable/r;
 
-.field NC:Landroid/graphics/RectF;
+.field final NA:[F
 
-.field ND:Landroid/graphics/Matrix;
+.field NB:[F
 
-.field private final NK:Landroid/graphics/drawable/Drawable;
+.field protected NC:Z
 
-.field protected NM:Z
+.field protected ND:F
 
-.field protected NN:Z
+.field protected NE:I
 
-.field private final NO:[F
+.field private NF:Z
 
-.field final NP:Landroid/graphics/RectF;
+.field private NG:Z
 
-.field final NQ:Landroid/graphics/RectF;
+.field protected final NH:Landroid/graphics/Path;
 
-.field final NR:Landroid/graphics/RectF;
+.field NM:Landroid/graphics/RectF;
 
-.field final NS:Landroid/graphics/RectF;
+.field NN:Landroid/graphics/Matrix;
 
-.field final NT:Landroid/graphics/Matrix;
+.field private final NU:Landroid/graphics/drawable/Drawable;
 
-.field final NU:Landroid/graphics/Matrix;
+.field protected NV:Z
 
-.field final NV:Landroid/graphics/Matrix;
+.field protected NW:Z
 
-.field final NW:Landroid/graphics/Matrix;
+.field private final NX:[F
 
-.field final NX:Landroid/graphics/Matrix;
+.field final NY:Landroid/graphics/RectF;
 
-.field NY:Landroid/graphics/Matrix;
+.field final NZ:Landroid/graphics/RectF;
 
-.field final NZ:Landroid/graphics/Matrix;
+.field final Oa:Landroid/graphics/RectF;
 
-.field final Nr:[F
+.field final Ob:Landroid/graphics/RectF;
 
-.field Ns:[F
+.field final Oc:Landroid/graphics/Matrix;
 
-.field protected Nt:Z
+.field final Od:Landroid/graphics/Matrix;
 
-.field protected Nu:F
+.field final Oe:Landroid/graphics/Matrix;
 
-.field protected Nv:I
+.field final Of:Landroid/graphics/Matrix;
 
-.field private Nw:Z
+.field final Og:Landroid/graphics/Matrix;
 
-.field private Nx:Z
+.field Oh:Landroid/graphics/Matrix;
 
-.field protected final Ny:Landroid/graphics/Path;
+.field final Oi:Landroid/graphics/Matrix;
 
-.field private Oa:Z
+.field private Oj:Z
 
 .field private mPadding:F
 
@@ -75,13 +75,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nt:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iput v1, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     new-instance v2, Landroid/graphics/Path;
 
@@ -91,95 +91,95 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NN:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NW:Z
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/n;->Nv:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/n;->NE:I
 
     new-instance v3, Landroid/graphics/Path;
 
     invoke-direct {v3}, Landroid/graphics/Path;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ny:Landroid/graphics/Path;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
 
     const/16 v3, 0x8
 
     new-array v4, v3, [F
 
-    iput-object v4, p0, Lcom/facebook/drawee/drawable/n;->NO:[F
+    iput-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
 
     new-array v3, v3, [F
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nr:[F
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NA:[F
 
     new-instance v3, Landroid/graphics/RectF;
 
     invoke-direct {v3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY: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;->NQ:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->NZ: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;->NR:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Oa: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;->NS:Landroid/graphics/RectF;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ob: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;->NT:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Oc: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;->NU:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Od: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;->NV:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Oe: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;->NW:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Of: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;->NX:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Og: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;->NZ:Landroid/graphics/Matrix;
+    iput-object v3, p0, Lcom/facebook/drawee/drawable/n;->Oi:Landroid/graphics/Matrix;
 
     iput v1, p0, Lcom/facebook/drawee/drawable/n;->mPadding:F
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nx:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NG:Z
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -189,24 +189,24 @@
 .method public final a(IF)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Nv:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->NE:I
 
     if-ne v0, p1, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     cmpl-float v0, v0, p2
 
     if-eqz v0, :cond_1
 
     :cond_0
-    iput p1, p0, Lcom/facebook/drawee/drawable/n;->Nv:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/n;->NE:I
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iput p2, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -217,7 +217,7 @@
 .method public final a(Lcom/facebook/drawee/drawable/r;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->MI:Lcom/facebook/drawee/drawable/r;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/n;->MR:Lcom/facebook/drawee/drawable/r;
 
     return-void
 .end method
@@ -233,11 +233,11 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/n;->NO:[F
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
 
     invoke-static {p1, v0}, Ljava/util/Arrays;->fill([FF)V
 
-    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NM:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
 
     goto :goto_3
 
@@ -260,18 +260,18 @@
 
     invoke-static {v3, v5}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NO:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NX:[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;->NM:Z
+    iput-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
 
     const/4 v3, 0x0
 
     :goto_1
     if-ge v3, v4, :cond_3
 
-    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NM:Z
+    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
 
     aget v6, p1, v3
 
@@ -289,7 +289,7 @@
     :goto_2
     or-int/2addr v5, v6
 
-    iput-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NM:Z
+    iput-boolean v5, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
 
     add-int/lit8 v3, v3, 0x1
 
@@ -297,7 +297,7 @@
 
     :cond_3
     :goto_3
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -307,7 +307,7 @@
 .method public clearColorFilter()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->clearColorFilter()V
 
@@ -317,13 +317,13 @@
 .method public draw(Landroid/graphics/Canvas;)V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -331,7 +331,7 @@
 .method public getAlpha()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getAlpha()I
 
@@ -343,7 +343,7 @@
 .method public getColorFilter()Landroid/graphics/ColorFilter;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getColorFilter()Landroid/graphics/ColorFilter;
 
@@ -355,7 +355,7 @@
 .method public getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
@@ -367,7 +367,7 @@
 .method public getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
 
@@ -379,7 +379,7 @@
 .method public getOpacity()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getOpacity()I
 
@@ -388,18 +388,42 @@
     return v0
 .end method
 
-.method hA()Z
+.method public final hC()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;->NX:[F
+
+    const/4 v2, 0x0
+
+    invoke-static {v1, v2}, Ljava/util/Arrays;->fill([FF)V
+
+    const/4 v1, 0x0
+
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
+
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
+
+    return-void
+.end method
+
+.method hD()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Z
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     const/4 v1, 0x0
 
@@ -421,20 +445,20 @@
     return v0
 .end method
 
-.method protected final hB()V
+.method protected final hE()V
     .locals 8
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     const/high16 v2, 0x40000000    # 2.0f
 
@@ -444,19 +468,19 @@
 
     invoke-virtual {v0, v3, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nt:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
@@ -468,15 +492,15 @@
 
     div-float/2addr v0, v2
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ny:Landroid/graphics/Path;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
@@ -492,13 +516,13 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nr:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NA:[F
 
     array-length v4, v3
 
     if-ge v0, v4, :cond_1
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NO:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
 
     aget v4, v4, v0
 
@@ -506,7 +530,7 @@
 
     add-float/2addr v4, v5
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     div-float/2addr v5, v2
 
@@ -519,18 +543,18 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ny:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NH:Landroid/graphics/Path;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NY: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;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     neg-float v4, v3
 
@@ -548,11 +572,11 @@
 
     iget v0, p0, Lcom/facebook/drawee/drawable/n;->mPadding:F
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     if-eqz v3, :cond_2
 
-    iget v3, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v3, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     goto :goto_2
 
@@ -562,35 +586,35 @@
     :goto_2
     add-float/2addr v0, v3
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v0, v0}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->Nt:Z
+    iget-boolean v3, p0, Lcom/facebook/drawee/drawable/n;->NC: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;->NP:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->centerX()F
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->centerY()F
 
     move-result v5
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v6}, Landroid/graphics/RectF;->width()F
 
     move-result v6
 
-    iget-object v7, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v7}, Landroid/graphics/RectF;->height()F
 
@@ -609,11 +633,11 @@
     goto :goto_4
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ns:[F
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
 
     if-nez v2, :cond_4
 
@@ -621,25 +645,25 @@
 
     new-array v2, v2, [F
 
-    iput-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ns:[F
+    iput-object v2, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
 
     :cond_4
     const/4 v2, 0x0
 
     :goto_3
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Nr:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NA:[F
 
     array-length v3, v3
 
     if-ge v2, v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->Ns:[F
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NO:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[F
 
     aget v4, v4, v2
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v5, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     sub-float/2addr v4, v5
 
@@ -652,9 +676,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;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->Ns:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NB:[F
 
     sget-object v5, Landroid/graphics/Path$Direction;->CW:Landroid/graphics/Path$Direction;
 
@@ -665,16 +689,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;->NP:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NO:[F
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/n;->NX:[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;->NP:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     neg-float v0, v0
 
@@ -686,45 +710,45 @@
 
     invoke-virtual {v0, v2}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     :cond_7
     return-void
 .end method
 
-.method public final hD()Z
+.method public final hG()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nx:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NG:Z
 
     return v0
 .end method
 
-.method protected final hE()V
+.method protected final hH()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MI:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MR:Lcom/facebook/drawee/drawable/r;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Oe: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;->MI:Lcom/facebook/drawee/drawable/r;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->MR:Lcom/facebook/drawee/drawable/r;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY: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;->NV:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->getBounds()Landroid/graphics/Rect;
 
@@ -733,7 +757,7 @@
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NR:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/RectF;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->getIntrinsicWidth()I
 
@@ -751,9 +775,9 @@
 
     invoke-virtual {v0, v3, v3, v1, v2}, Landroid/graphics/RectF;->set(FFFF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NS:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Ob:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->getBounds()Landroid/graphics/Rect;
 
@@ -761,47 +785,47 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NT:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NR:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NS:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Ob: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;->Nw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
 
     if-nez v0, :cond_1
 
     new-instance v0, Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-direct {v0, v1}, Landroid/graphics/RectF;-><init>(Landroid/graphics/RectF;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NC:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY: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;->NC:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/n;->Nu:F
+    iget v1, p0, Lcom/facebook/drawee/drawable/n;->ND:F
 
     invoke-virtual {v0, v1, v1}, Landroid/graphics/RectF;->inset(FF)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
 
     if-nez v0, :cond_2
 
@@ -809,14 +833,14 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NC:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NM:Landroid/graphics/RectF;
 
     sget-object v3, Landroid/graphics/Matrix$ScaleToFit;->FILL:Landroid/graphics/Matrix$ScaleToFit;
 
@@ -825,7 +849,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_4
 
@@ -833,9 +857,9 @@
 
     :cond_4
     :goto_2
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NW:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->Of:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -845,9 +869,9 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NT:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -855,11 +879,11 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_9
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oh:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->equals(Ljava/lang/Object;)Z
 
@@ -868,76 +892,76 @@
     if-nez v0, :cond_9
 
     :cond_5
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NN:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NW:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NX:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Og:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->invert(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oi:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oi:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NN: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;->NZ:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oi:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NT:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NW:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Of:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NV:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oe:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Od:Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NT:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->Oc:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oh:Landroid/graphics/Matrix;
 
     if-nez v0, :cond_7
 
     new-instance v0, Landroid/graphics/Matrix;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NN:Landroid/graphics/Matrix;
 
     invoke-direct {v0, v2}, Landroid/graphics/Matrix;-><init>(Landroid/graphics/Matrix;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oh:Landroid/graphics/Matrix;
 
     goto :goto_3
 
     :cond_7
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->ND:Landroid/graphics/Matrix;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NN: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;->NY:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->Oh:Landroid/graphics/Matrix;
 
     if-eqz v0, :cond_9
 
@@ -945,9 +969,9 @@
 
     :cond_9
     :goto_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NQ:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v2}, Landroid/graphics/RectF;->equals(Ljava/lang/Object;)Z
 
@@ -955,11 +979,11 @@
 
     if-nez v0, :cond_a
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NQ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NZ:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NP:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/n;->NY:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -967,30 +991,6 @@
     return-void
 .end method
 
-.method public final hz()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;->NO:[F
-
-    const/4 v2, 0x0
-
-    invoke-static {v1, v2}, Ljava/util/Arrays;->fill([FF)V
-
-    const/4 v1, 0x0
-
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/n;->NM:Z
-
-    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
-
-    return-void
-.end method
-
 .method public final k(F)V
     .locals 1
 
@@ -1004,7 +1004,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -1015,7 +1015,7 @@
 .method protected onBoundsChange(Landroid/graphics/Rect;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
 
@@ -1025,7 +1025,7 @@
 .method public setAlpha(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V
 
@@ -1035,7 +1035,7 @@
 .method public setColorFilter(ILandroid/graphics/PorterDuff$Mode;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1, p2}, Landroid/graphics/drawable/Drawable;->setColorFilter(ILandroid/graphics/PorterDuff$Mode;)V
 
@@ -1045,7 +1045,7 @@
 .method public setColorFilter(Landroid/graphics/ColorFilter;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NK:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/n;->NU:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V
 
@@ -1055,11 +1055,11 @@
 .method public final t(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Nt:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NC:Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -1069,15 +1069,15 @@
 .method public final u(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Nw:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NF:Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oa:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Oj:Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/n;->invalidateSelf()V
 
@@ -1088,11 +1088,11 @@
 .method public final v(Z)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->Nx:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/n;->NG:Z
 
     if-eq v0, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->Nx:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/n;->NG: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 452ffe5c9b..f43c5b45a7 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/p.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/p.smali
@@ -4,17 +4,17 @@
 
 
 # instance fields
-.field public Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field Ni:Landroid/graphics/Matrix;
+.field Nr:Landroid/graphics/Matrix;
 
-.field Nj:I
+.field Ns:I
 
-.field Nk:I
+.field Nt:I
 
-.field Ob:Ljava/lang/Object;
+.field Ok:Ljava/lang/Object;
 
-.field Oc:Landroid/graphics/PointF;
+.field Ol:Landroid/graphics/PointF;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -36,13 +36,13 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Oc:Landroid/graphics/PointF;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Ol:Landroid/graphics/PointF;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Nj:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Ns:I
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Nk:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/p;->Nt:I
 
     new-instance p1, Landroid/graphics/Matrix;
 
@@ -50,15 +50,134 @@
 
     iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/p;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
 
-.method private hF()V
+.method private hB()V
+    .locals 8
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
+
+    move-result-object v0
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getBounds()Landroid/graphics/Rect;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Landroid/graphics/Rect;->width()I
+
+    move-result v1
+
+    invoke-virtual {v3}, Landroid/graphics/Rect;->height()I
+
+    move-result v2
+
+    invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
+
+    move-result v4
+
+    iput v4, p0, Lcom/facebook/drawee/drawable/p;->Ns:I
+
+    invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
+
+    move-result v5
+
+    iput v5, p0, Lcom/facebook/drawee/drawable/p;->Nt:I
+
+    const/4 v6, 0x0
+
+    if-lez v4, :cond_5
+
+    if-gtz v5, :cond_0
+
+    goto :goto_2
+
+    :cond_0
+    if-ne v4, v1, :cond_1
+
+    if-ne v5, v2, :cond_1
+
+    invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
+
+    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Nr:Landroid/graphics/Matrix;
+
+    return-void
+
+    :cond_1
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Om: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;->Nr:Landroid/graphics/Matrix;
+
+    return-void
+
+    :cond_2
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1, v1, v4, v5}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->MB: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;->Ol:Landroid/graphics/PointF;
+
+    const/high16 v6, 0x3f000000    # 0.5f
+
+    if-eqz v0, :cond_3
+
+    iget v0, v0, Landroid/graphics/PointF;->x:F
+
+    goto :goto_0
+
+    :cond_3
+    const/high16 v0, 0x3f000000    # 0.5f
+
+    :goto_0
+    iget-object v7, p0, Lcom/facebook/drawee/drawable/p;->Ol:Landroid/graphics/PointF;
+
+    if-eqz v7, :cond_4
+
+    iget v6, v7, Landroid/graphics/PointF;->y:F
+
+    move v7, v6
+
+    goto :goto_1
+
+    :cond_4
+    const/high16 v7, 0x3f000000    # 0.5f
+
+    :goto_1
+    move v6, v0
+
+    invoke-interface/range {v1 .. v7}, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->a(Landroid/graphics/Matrix;Landroid/graphics/Rect;IIFF)Landroid/graphics/Matrix;
+
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
+
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nr:Landroid/graphics/Matrix;
+
+    return-void
+
+    :cond_5
+    :goto_2
+    invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
+
+    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Nr:Landroid/graphics/Matrix;
+
+    return-void
+.end method
+
+.method private hI()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     instance-of v1, v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
@@ -70,13 +189,13 @@
 
     check-cast v0, Lcom/facebook/drawee/drawable/ScalingUtils$k;
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$k;->hG()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/ScalingUtils$k;->hJ()Ljava/lang/Object;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Ob:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Ok:Ljava/lang/Object;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -96,7 +215,7 @@
     const/4 v1, 0x1
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ob:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ok:Ljava/lang/Object;
 
     goto :goto_2
 
@@ -104,7 +223,7 @@
     const/4 v1, 0x0
 
     :goto_2
-    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Nj:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Ns:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -116,7 +235,7 @@
 
     if-ne v0, v4, :cond_4
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Nk:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/p;->Nt:I
 
     invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
 
@@ -140,137 +259,18 @@
     if-eqz v1, :cond_6
 
     :cond_5
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()V
 
     :cond_6
     return-void
 .end method
 
-.method private hy()V
-    .locals 8
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getCurrent()Landroid/graphics/drawable/Drawable;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/p;->getBounds()Landroid/graphics/Rect;
-
-    move-result-object v3
-
-    invoke-virtual {v3}, Landroid/graphics/Rect;->width()I
-
-    move-result v1
-
-    invoke-virtual {v3}, Landroid/graphics/Rect;->height()I
-
-    move-result v2
-
-    invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
-
-    move-result v4
-
-    iput v4, p0, Lcom/facebook/drawee/drawable/p;->Nj:I
-
-    invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
-
-    move-result v5
-
-    iput v5, p0, Lcom/facebook/drawee/drawable/p;->Nk:I
-
-    const/4 v6, 0x0
-
-    if-lez v4, :cond_5
-
-    if-gtz v5, :cond_0
-
-    goto :goto_2
-
-    :cond_0
-    if-ne v4, v1, :cond_1
-
-    if-ne v5, v2, :cond_1
-
-    invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
-
-    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Ni:Landroid/graphics/Matrix;
-
-    return-void
-
-    :cond_1
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Od: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;->Ni:Landroid/graphics/Matrix;
-
-    return-void
-
-    :cond_2
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1, v1, v4, v5}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Ms: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;->Oc:Landroid/graphics/PointF;
-
-    const/high16 v6, 0x3f000000    # 0.5f
-
-    if-eqz v0, :cond_3
-
-    iget v0, v0, Landroid/graphics/PointF;->x:F
-
-    goto :goto_0
-
-    :cond_3
-    const/high16 v0, 0x3f000000    # 0.5f
-
-    :goto_0
-    iget-object v7, p0, Lcom/facebook/drawee/drawable/p;->Oc:Landroid/graphics/PointF;
-
-    if-eqz v7, :cond_4
-
-    iget v6, v7, Landroid/graphics/PointF;->y:F
-
-    move v7, v6
-
-    goto :goto_1
-
-    :cond_4
-    const/high16 v7, 0x3f000000    # 0.5f
-
-    :goto_1
-    move v6, v0
-
-    invoke-interface/range {v1 .. v7}, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->a(Landroid/graphics/Matrix;Landroid/graphics/Rect;IIFF)Landroid/graphics/Matrix;
-
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->mTempMatrix:Landroid/graphics/Matrix;
-
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ni:Landroid/graphics/Matrix;
-
-    return-void
-
-    :cond_5
-    :goto_2
-    invoke-virtual {v0, v3}, Landroid/graphics/drawable/Drawable;->setBounds(Landroid/graphics/Rect;)V
-
-    iput-object v6, p0, Lcom/facebook/drawee/drawable/p;->Ni:Landroid/graphics/Matrix;
-
-    return-void
-.end method
-
 
 # virtual methods
 .method public final a(Landroid/graphics/PointF;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Oc:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ol: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;->Oc:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ol: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;->Oc:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ol:Landroid/graphics/PointF;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Oc:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ol:Landroid/graphics/PointF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()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;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->MB: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;->Ms:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->MB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Ob:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/p;->Ok:Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()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;->hF()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hI()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ni:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nr: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;->hF()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hI()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Ni:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/p;->Nr: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;->Ni:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/p;->Nr: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;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()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;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/p;->hB()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 d75796bf2e..c9279acb82 100644
--- a/com.discord/smali/com/facebook/drawee/drawable/t.smali
+++ b/com.discord/smali/com/facebook/drawee/drawable/t.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract hH()V
+.method public abstract hK()V
 .end method
 
 .method public abstract w(Z)V
diff --git a/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali b/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
index 2755a49dd8..c3d86472e1 100644
--- a/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/GenericDraweeHierarchy.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final On:Landroid/graphics/drawable/Drawable;
+.field public final OA:Lcom/facebook/drawee/drawable/g;
 
-.field private Oo:Lcom/facebook/drawee/generic/d;
+.field private final Ow:Landroid/graphics/drawable/Drawable;
+
+.field private Ox:Lcom/facebook/drawee/generic/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Op:Lcom/facebook/drawee/generic/c;
+.field private final Oy:Lcom/facebook/drawee/generic/c;
 
-.field private final Oq:Lcom/facebook/drawee/drawable/f;
-
-.field public final Or:Lcom/facebook/drawee/drawable/g;
+.field private final Oz:Lcom/facebook/drawee/drawable/f;
 
 .field public final mResources:Landroid/content/res/Resources;
 
@@ -35,33 +35,33 @@
 
     invoke-direct {v0, v1}, Landroid/graphics/drawable/ColorDrawable;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->On:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow:Landroid/graphics/drawable/Drawable;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     iget-object v0, p1, Lcom/facebook/drawee/generic/a;->mResources:Landroid/content/res/Resources;
 
     iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/generic/d;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
 
     new-instance v0, Lcom/facebook/drawee/drawable/g;
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->On:Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow: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;->Or:Lcom/facebook/drawee/drawable/g;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->OA:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OI:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
 
     const/4 v2, 0x1
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OI:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS: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;->OJ:Landroid/graphics/drawable/Drawable;
+    iget-object v3, p1, Lcom/facebook/drawee/generic/a;->OT: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;->Ow:Landroid/graphics/drawable/Drawable;
+    iget-object v4, p1, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/drawable/Drawable;
 
-    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OG: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;->Or:Lcom/facebook/drawee/drawable/g;
+    iget-object v6, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->OA:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OE:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iget-object v8, p1, Lcom/facebook/drawee/generic/a;->OG:Landroid/graphics/PointF;
+    iget-object v8, p1, Lcom/facebook/drawee/generic/a;->OQ:Landroid/graphics/PointF;
 
-    iget-object v9, p1, Lcom/facebook/drawee/generic/a;->OH:Landroid/graphics/ColorFilter;
+    iget-object v9, p1, Lcom/facebook/drawee/generic/a;->OR: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;->OC:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OD:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->ON: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;->Oy:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OH:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->Oz:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OI: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;->OA:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p1, Lcom/facebook/drawee/generic/a;->OJ:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iget-object v7, p1, Lcom/facebook/drawee/generic/a;->OL: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;->OI:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OI:Ljava/util/List;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OS: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;->OJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OT:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_3
 
     add-int/lit8 v2, v2, 0x6
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OJ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/a;->OT: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;->Oq:Lcom/facebook/drawee/drawable/f;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    iget p1, p1, Lcom/facebook/drawee/generic/a;->Ou:I
+    iget p1, p1, Lcom/facebook/drawee/generic/a;->OD:I
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->K(I)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox: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,15 +246,15 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/drawee/generic/c;-><init>(Landroid/graphics/drawable/Drawable;)V
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Op:Lcom/facebook/drawee/generic/c;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy:Lcom/facebook/drawee/generic/c;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Op:Lcom/facebook/drawee/generic/c;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy: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;->hI()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hL()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -264,7 +264,7 @@
 
     if-ltz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->L(I)V
 
@@ -277,7 +277,7 @@
 
     if-ltz p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->M(I)V
 
@@ -288,7 +288,7 @@
 .method private O(I)Lcom/facebook/drawee/drawable/c;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz: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;->ML:[Lcom/facebook/drawee/drawable/c;
+    iget-object v3, v0, Lcom/facebook/drawee/drawable/a;->MU:[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;->ML:[Lcom/facebook/drawee/drawable/c;
+    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->MU:[Lcom/facebook/drawee/drawable/c;
 
     aget-object v1, v1, p1
 
     if-nez v1, :cond_2
 
-    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->ML:[Lcom/facebook/drawee/drawable/c;
+    iget-object v1, v0, Lcom/facebook/drawee/drawable/a;->MU:[Lcom/facebook/drawee/drawable/c;
 
     new-instance v2, Lcom/facebook/drawee/drawable/a$1;
 
@@ -335,11 +335,11 @@
     aput-object v2, v1, p1
 
     :cond_2
-    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->ML:[Lcom/facebook/drawee/drawable/c;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->MU:[Lcom/facebook/drawee/drawable/c;
 
     aget-object p1, v0, p1
 
-    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -347,14 +347,14 @@
 
     if-eqz v0, :cond_3
 
-    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
     check-cast p1, Lcom/facebook/drawee/drawable/h;
 
     :cond_3
-    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -362,7 +362,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p1}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object p1
 
@@ -385,7 +385,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
 
     iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -400,38 +400,38 @@
     return-object p1
 .end method
 
-.method private hI()V
+.method private hL()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->ht()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hv()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hy()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hJ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
 
     const/4 v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->L(I)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
+
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hA()V
+
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hx()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
-
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()V
-
     :cond_0
     return-void
 .end method
 
-.method private hJ()V
+.method private hM()V
     .locals 1
 
     const/4 v0, 0x1
@@ -460,7 +460,7 @@
 .method private setProgress(F)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x3
 
@@ -540,7 +540,7 @@
     return-object p1
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Od:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Om: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;
 
@@ -552,7 +552,7 @@
 .method public final Q(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/drawable/f;->K(I)V
 
@@ -576,7 +576,7 @@
 .method public final a(FZ)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x3
 
@@ -589,22 +589,22 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->ht()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()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;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hA()V
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hu()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()V
 
     return-void
 .end method
@@ -612,7 +612,7 @@
 .method public final a(Landroid/graphics/drawable/Drawable;FZ)V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
 
     iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -622,15 +622,15 @@
 
     invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Or:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->OA: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;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->ht()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hw()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hJ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
 
     const/4 p1, 0x2
 
@@ -640,14 +640,14 @@
 
     if-eqz p3, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hA()V
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hu()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hx()V
 
     return-void
 .end method
@@ -659,20 +659,20 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Op:Lcom/facebook/drawee/generic/c;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy:Lcom/facebook/drawee/generic/c;
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox: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;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/facebook/drawee/drawable/a;->MT:[Landroid/graphics/drawable/Drawable;
 
     array-length v0, v0
 
@@ -682,7 +682,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
 
     iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -703,9 +703,9 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Op:Lcom/facebook/drawee/generic/c;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy:Lcom/facebook/drawee/generic/c;
 
-    iput-object p1, v0, Lcom/facebook/drawee/generic/c;->LI:Landroid/graphics/drawable/Drawable;
+    iput-object p1, v0, Lcom/facebook/drawee/generic/c;->LR:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/generic/c;->invalidateSelf()V
 
@@ -739,7 +739,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object p1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x0
 
@@ -748,7 +748,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ox:Lcom/facebook/drawee/generic/d;
 
     iget-object v2, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->mResources:Landroid/content/res/Resources;
 
@@ -768,7 +768,7 @@
 .method public final getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Op:Lcom/facebook/drawee/generic/c;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oy:Lcom/facebook/drawee/generic/c;
 
     return-object v0
 .end method
@@ -785,16 +785,16 @@
     return-void
 .end method
 
-.method public final hK()V
+.method public final hN()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->ht()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hJ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x5
 
@@ -814,23 +814,23 @@
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->L(I)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hx()V
 
     return-void
 .end method
 
-.method public final hL()V
+.method public final hO()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->ht()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hw()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hJ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hM()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
     const/4 v1, 0x4
 
@@ -850,9 +850,9 @@
     invoke-direct {p0, v0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->L(I)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oq:Lcom/facebook/drawee/drawable/f;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Oz:Lcom/facebook/drawee/drawable/f;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hu()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/drawable/f;->hx()V
 
     return-void
 .end method
@@ -860,13 +860,13 @@
 .method public final reset()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Or:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->OA:Lcom/facebook/drawee/drawable/g;
 
-    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->On:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->Ow: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;->hI()V
+    invoke-direct {p0}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->hL()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 1356e65b9f..3fb80abd32 100644
--- a/com.discord/smali/com/facebook/drawee/generic/a.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/a.smali
@@ -4,53 +4,77 @@
 
 
 # static fields
-.field public static final Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # instance fields
-.field OA:Landroid/graphics/drawable/Drawable;
+.field OD:I
+
+.field public OE:F
+
+.field public OF:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field OG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OC:Landroid/graphics/drawable/Drawable;
+.field OH:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OD:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field OI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OE:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field OJ:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private OF:Landroid/graphics/Matrix;
+.field OL:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OG:Landroid/graphics/PointF;
+.field OM:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OH:Landroid/graphics/ColorFilter;
+.field ON:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field OI:Ljava/util/List;
+.field OO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private OP:Landroid/graphics/Matrix;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field OQ:Landroid/graphics/PointF;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field OR:Landroid/graphics/ColorFilter;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field OS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -63,36 +87,12 @@
     .end annotation
 .end field
 
-.field OJ:Landroid/graphics/drawable/Drawable;
+.field OT:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Oo:Lcom/facebook/drawee/generic/d;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field Ou:I
-
-.field public Ov:F
-
-.field public Ow:Landroid/graphics/drawable/Drawable;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field Oy:Landroid/graphics/drawable/Drawable;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field Oz:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field Ox:Lcom/facebook/drawee/generic/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -109,13 +109,13 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/generic/a;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/generic/a;->OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/generic/a;->Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/generic/a;->OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
@@ -129,49 +129,49 @@
 
     const/16 p1, 0x12c
 
-    iput p1, p0, Lcom/facebook/drawee/generic/a;->Ou:I
+    iput p1, p0, Lcom/facebook/drawee/generic/a;->OD:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/generic/a;->Ov:F
+    iput p1, p0, Lcom/facebook/drawee/generic/a;->OE:F
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ow:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/drawable/Drawable;
 
-    sget-object v0, Lcom/facebook/drawee/generic/a;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/generic/a;->OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OG:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Oy:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OH:Landroid/graphics/drawable/Drawable;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Oz:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OA:Landroid/graphics/drawable/Drawable;
-
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OC:Landroid/graphics/drawable/Drawable;
-
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OD:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    sget-object v0, Lcom/facebook/drawee/generic/a;->Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OE:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/Matrix;
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OG:Landroid/graphics/PointF;
-
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OH: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;->OI:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OI:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OJ:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Oo:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OL:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
+
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->ON:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    sget-object v0, Lcom/facebook/drawee/generic/a;->OC:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->OO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OP:Landroid/graphics/Matrix;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OQ:Landroid/graphics/PointF;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OR: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;->OS:Ljava/util/List;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OT:Landroid/graphics/drawable/Drawable;
+
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/generic/d;
 
     return-void
 .end method
@@ -189,7 +189,7 @@
 .method private validate()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->OI:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -227,16 +227,16 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OE:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OO:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OP:Landroid/graphics/Matrix;
 
     return-object p0
 .end method
 
-.method public final hM()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+.method public final hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/drawee/generic/a;->validate()V
@@ -259,7 +259,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OI:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OS:Ljava/util/List;
 
     goto :goto_0
 
@@ -276,7 +276,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OI:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/a;->OS: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 4be2dcf029..dda481cd22 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;->Ol:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ou:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_3
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_4
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oh:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_5
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Og:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Op:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_6
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Of:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_7
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oe:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->On:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
     :pswitch_8
-    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Od:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object p0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-object p0
 
@@ -178,7 +178,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Ow:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OF:Landroid/graphics/drawable/Drawable;
 
     goto :goto_1
 
@@ -195,7 +195,7 @@
 
     const/4 v3, 0x0
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OJ:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OT: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;->OJ:Landroid/graphics/drawable/Drawable;
+    iput-object v4, v0, Lcom/facebook/drawee/generic/a;->OT:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -231,7 +231,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OC:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OM:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -246,7 +246,7 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/facebook/drawee/generic/a;->Ou:I
+    iput v3, v0, Lcom/facebook/drawee/generic/a;->OD:I
 
     goto :goto_2
 
@@ -261,7 +261,7 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/facebook/drawee/generic/a;->Ov:F
+    iput v3, v0, Lcom/facebook/drawee/generic/a;->OE:F
 
     goto :goto_2
 
@@ -274,7 +274,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OG: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;->Oy:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OH:Landroid/graphics/drawable/Drawable;
 
     goto :goto_2
 
@@ -300,7 +300,7 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->Oz:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OI: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;->OA:Landroid/graphics/drawable/Drawable;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OJ: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;->OB:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->OL: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;->OD:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    iput-object v3, v0, Lcom/facebook/drawee/generic/a;->ON:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     goto/16 :goto_2
 
@@ -407,7 +407,7 @@
 
     move-result v3
 
-    iput-boolean v3, v7, Lcom/facebook/drawee/generic/d;->ON:Z
+    iput-boolean v3, v7, Lcom/facebook/drawee/generic/d;->OW: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;->Nu:F
+    iput v3, v1, Lcom/facebook/drawee/generic/d;->ND:F
 
     goto :goto_7
 
@@ -611,7 +611,7 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/facebook/drawee/generic/d;->Nv:I
+    iput v3, v1, Lcom/facebook/drawee/generic/d;->NE:I
 
     goto :goto_7
 
@@ -845,7 +845,7 @@
     const/4 v6, 0x1
 
     :goto_12
-    iget-object v7, v0, Lcom/facebook/drawee/generic/a;->OC:Landroid/graphics/drawable/Drawable;
+    iget-object v7, v0, Lcom/facebook/drawee/generic/a;->OM: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;->OC:Landroid/graphics/drawable/Drawable;
+    iget-object v8, v0, Lcom/facebook/drawee/generic/a;->OM: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;->OC:Landroid/graphics/drawable/Drawable;
+    iput-object v7, v0, Lcom/facebook/drawee/generic/a;->OM: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;->hN()[F
+    invoke-virtual {v1}, Lcom/facebook/drawee/generic/d;->hQ()[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;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/a;->Ox: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;->Oo:Lcom/facebook/drawee/generic/d;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/generic/d;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/drawee/generic/a;->Oo:Lcom/facebook/drawee/generic/d;
+    iget-object p0, p0, Lcom/facebook/drawee/generic/a;->Ox:Lcom/facebook/drawee/generic/d;
 
     return-object p0
 .end method
@@ -974,7 +974,7 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -988,7 +988,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     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 1276f98bbf..f8f853b67a 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 LI:Landroid/graphics/drawable/Drawable;
+.field LR:Landroid/graphics/drawable/Drawable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private OL:Lcom/facebook/drawee/drawable/t;
+.field private OU: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;->LI:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->LR: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;->OL:Lcom/facebook/drawee/drawable/t;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/c;->OU:Lcom/facebook/drawee/drawable/t;
 
     return-void
 .end method
@@ -57,16 +57,16 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->OL:Lcom/facebook/drawee/drawable/t;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->OU:Lcom/facebook/drawee/drawable/t;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/t;->hH()V
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/t;->hK()V
 
     :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;->LI:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->LR: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;->LI:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->LR:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -103,7 +103,7 @@
 .method public final setVisible(ZZ)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->OL:Lcom/facebook/drawee/drawable/t;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/c;->OU:Lcom/facebook/drawee/drawable/t;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/com/facebook/drawee/generic/d.smali b/com.discord/smali/com/facebook/drawee/generic/d.smali
index d403a17591..41c654821f 100644
--- a/com.discord/smali/com/facebook/drawee/generic/d.smali
+++ b/com.discord/smali/com/facebook/drawee/generic/d.smali
@@ -12,21 +12,21 @@
 
 
 # instance fields
+.field ND:F
+
 .field NE:I
 
-.field Nu:F
+.field NF:Z
 
-.field Nv:I
+.field public NG:Z
 
-.field Nw:Z
+.field NO:I
 
-.field public Nx:Z
+.field public OV:Lcom/facebook/drawee/generic/d$a;
 
-.field public OM:Lcom/facebook/drawee/generic/d$a;
+.field public OW:Z
 
-.field public ON:Z
-
-.field OO:[F
+.field OX:[F
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -40,31 +40,31 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/facebook/drawee/generic/d$a;->OQ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v0, Lcom/facebook/drawee/generic/d$a;->OZ:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->ON:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->OW:Z
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/drawee/generic/d;->OO:[F
+    iput-object v1, p0, Lcom/facebook/drawee/generic/d;->OX:[F
+
+    iput v0, p0, Lcom/facebook/drawee/generic/d;->NO:I
+
+    const/4 v1, 0x0
+
+    iput v1, p0, Lcom/facebook/drawee/generic/d;->ND:F
 
     iput v0, p0, Lcom/facebook/drawee/generic/d;->NE:I
 
-    const/4 v1, 0x0
-
-    iput v1, p0, Lcom/facebook/drawee/generic/d;->Nu:F
-
-    iput v0, p0, Lcom/facebook/drawee/generic/d;->Nv:I
-
     iput v1, p0, Lcom/facebook/drawee/generic/d;->mPadding:F
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->Nw:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NF:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->Nx:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/generic/d;->NG:Z
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method private l(F)Lcom/facebook/drawee/generic/d;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/generic/d;->hN()[F
+    invoke-virtual {p0}, Lcom/facebook/drawee/generic/d;->hQ()[F
 
     move-result-object v0
 
@@ -100,11 +100,11 @@
 .method public final S(I)Lcom/facebook/drawee/generic/d;
     .locals 0
 
-    iput p1, p0, Lcom/facebook/drawee/generic/d;->NE:I
+    iput p1, p0, Lcom/facebook/drawee/generic/d;->NO:I
 
-    sget-object p1, Lcom/facebook/drawee/generic/d$a;->OP:Lcom/facebook/drawee/generic/d$a;
+    sget-object p1, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
 
-    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iput-object p1, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
     return-object p0
 .end method
@@ -142,27 +142,27 @@
     :cond_1
     check-cast p1, Lcom/facebook/drawee/generic/d;
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->ON:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->OW:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->ON:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->OW:Z
 
     if-eq v1, v2, :cond_2
 
     return v0
 
     :cond_2
-    iget v1, p0, Lcom/facebook/drawee/generic/d;->NE:I
+    iget v1, p0, Lcom/facebook/drawee/generic/d;->NO:I
 
-    iget v2, p1, Lcom/facebook/drawee/generic/d;->NE:I
+    iget v2, p1, Lcom/facebook/drawee/generic/d;->NO:I
 
     if-eq v1, v2, :cond_3
 
     return v0
 
     :cond_3
-    iget v1, p1, Lcom/facebook/drawee/generic/d;->Nu:F
+    iget v1, p1, Lcom/facebook/drawee/generic/d;->ND:F
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->Nu:F
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->ND:F
 
     invoke-static {v1, v2}, Ljava/lang/Float;->compare(FF)I
 
@@ -173,9 +173,9 @@
     return v0
 
     :cond_4
-    iget v1, p0, Lcom/facebook/drawee/generic/d;->Nv:I
+    iget v1, p0, Lcom/facebook/drawee/generic/d;->NE:I
 
-    iget v2, p1, Lcom/facebook/drawee/generic/d;->Nv:I
+    iget v2, p1, Lcom/facebook/drawee/generic/d;->NE:I
 
     if-eq v1, v2, :cond_5
 
@@ -195,36 +195,36 @@
     return v0
 
     :cond_6
-    iget-object v1, p0, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
-    iget-object v2, p1, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v2, p1, Lcom/facebook/drawee/generic/d;->OV: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;->Nw:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NF:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->Nw:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NF:Z
 
     if-eq v1, v2, :cond_8
 
     return v0
 
     :cond_8
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Nx:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NG:Z
 
-    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->Nx:Z
+    iget-boolean v2, p1, Lcom/facebook/drawee/generic/d;->NG:Z
 
     if-eq v1, v2, :cond_9
 
     return v0
 
     :cond_9
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OO:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
 
-    iget-object p1, p1, Lcom/facebook/drawee/generic/d;->OO:[F
+    iget-object p1, p1, Lcom/facebook/drawee/generic/d;->OX:[F
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->equals([F[F)Z
 
@@ -237,10 +237,10 @@
     return v0
 .end method
 
-.method final hN()[F
+.method final hQ()[F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OO:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
 
     if-nez v0, :cond_0
 
@@ -248,10 +248,10 @@
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OO:[F
+    iput-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OO:[F
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OX:[F
 
     return-object v0
 .end method
@@ -259,7 +259,7 @@
 .method public final hashCode()I
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p0, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
     const/4 v1, 0x0
 
@@ -277,13 +277,13 @@
     :goto_0
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v2, p0, Lcom/facebook/drawee/generic/d;->ON:Z
+    iget-boolean v2, p0, Lcom/facebook/drawee/generic/d;->OW:Z
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->OO:[F
+    iget-object v2, p0, Lcom/facebook/drawee/generic/d;->OX:[F
 
     if-eqz v2, :cond_1
 
@@ -301,13 +301,13 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->NE:I
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->NO:I
 
     add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->Nu:F
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->ND:F
 
     const/4 v3, 0x0
 
@@ -329,7 +329,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v2, p0, Lcom/facebook/drawee/generic/d;->Nv:I
+    iget v2, p0, Lcom/facebook/drawee/generic/d;->NE:I
 
     add-int/2addr v0, v2
 
@@ -350,13 +350,13 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Nw:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NF:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->Nx:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/generic/d;->NG:Z
 
     add-int/2addr v0, v1
 
diff --git a/com.discord/smali/com/facebook/drawee/generic/e.smali b/com.discord/smali/com/facebook/drawee/generic/e.smali
index c233db9d9d..bfd27b9648 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 OS:Landroid/graphics/drawable/Drawable;
+.field private static final Pb: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;->OS:Landroid/graphics/drawable/Drawable;
+    sput-object v0, Lcom/facebook/drawee/generic/e;->Pb:Landroid/graphics/drawable/Drawable;
 
     return-void
 .end method
@@ -39,7 +39,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     if-eqz p0, :cond_2
 
@@ -57,13 +57,13 @@
     invoke-virtual {v0, p2}, Lcom/facebook/drawee/drawable/p;->a(Landroid/graphics/PointF;)V
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p0
 .end method
@@ -80,15 +80,15 @@
     .end param
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     if-eqz p0, :cond_1
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OP:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
 
     if-eq v0, v1, :cond_0
 
@@ -101,26 +101,26 @@
 
     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;->NE:I
+    iget p0, p1, Lcom/facebook/drawee/generic/d;->NO:I
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/drawable/m;->N(I)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :cond_1
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p0
 
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p0
 .end method
@@ -137,15 +137,15 @@
     .end param
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     if-eqz p0, :cond_2
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OQ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OZ: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;->OS:Landroid/graphics/drawable/Drawable;
+    sget-object v1, Lcom/facebook/drawee/generic/e;->Pb:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {v0, v1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -178,7 +178,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p0
 
@@ -190,20 +190,20 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p0
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p0
 
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p0
 .end method
@@ -212,7 +212,7 @@
     .locals 2
 
     :goto_0
-    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
@@ -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;->OS:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/facebook/drawee/generic/e;->Pb:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -265,15 +265,15 @@
         .end annotation
     .end param
 
-    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OP:Lcom/facebook/drawee/generic/d$a;
+    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OY: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;->NE:I
+    iget p0, p1, Lcom/facebook/drawee/generic/d;->NO:I
 
     invoke-virtual {v0, p0}, Lcom/facebook/drawee/drawable/m;->N(I)V
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/generic/e;->OS:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/facebook/drawee/generic/e;->Pb: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;->OS:Landroid/graphics/drawable/Drawable;
+    sget-object p1, Lcom/facebook/drawee/generic/e;->Pb: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;->OS:Landroid/graphics/drawable/Drawable;
+    sget-object p0, Lcom/facebook/drawee/generic/e;->Pb:Landroid/graphics/drawable/Drawable;
 
     const/4 p1, 0x0
 
@@ -342,15 +342,15 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hs()Landroid/graphics/drawable/Drawable;
+    invoke-interface {p0}, Lcom/facebook/drawee/drawable/c;->hv()Landroid/graphics/drawable/Drawable;
 
     move-result-object v0
 
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OM:Lcom/facebook/drawee/generic/d$a;
+    iget-object v1, p1, Lcom/facebook/drawee/generic/d;->OV:Lcom/facebook/drawee/generic/d$a;
 
-    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OQ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v2, Lcom/facebook/drawee/generic/d$a;->OZ: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;->OS:Landroid/graphics/drawable/Drawable;
+    sget-object v1, Lcom/facebook/drawee/generic/e;->Pb:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p0, v1}, Lcom/facebook/drawee/drawable/c;->c(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
@@ -390,7 +390,7 @@
 
     invoke-interface {v0, p0}, Lcom/facebook/drawee/drawable/j;->t(Z)V
 
-    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->hz()V
+    invoke-interface {v0}, Lcom/facebook/drawee/drawable/j;->hC()V
 
     const/4 p1, 0x0
 
@@ -409,17 +409,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;->ON:Z
+    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->OW:Z
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->t(Z)V
 
-    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OO:[F
+    iget-object v0, p1, Lcom/facebook/drawee/generic/d;->OX:[F
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->a([F)V
 
-    iget v0, p1, Lcom/facebook/drawee/generic/d;->Nv:I
+    iget v0, p1, Lcom/facebook/drawee/generic/d;->NE:I
 
-    iget v1, p1, Lcom/facebook/drawee/generic/d;->Nu:F
+    iget v1, p1, Lcom/facebook/drawee/generic/d;->ND:F
 
     invoke-interface {p0, v0, v1}, Lcom/facebook/drawee/drawable/j;->a(IF)V
 
@@ -427,11 +427,11 @@
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->k(F)V
 
-    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->Nw:Z
+    iget-boolean v0, p1, Lcom/facebook/drawee/generic/d;->NF:Z
 
     invoke-interface {p0, v0}, Lcom/facebook/drawee/drawable/j;->u(Z)V
 
-    iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->Nx:Z
+    iget-boolean p1, p1, Lcom/facebook/drawee/generic/d;->NG:Z
 
     invoke-interface {p0, p1}, Lcom/facebook/drawee/drawable/j;->v(Z)V
 
diff --git a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
index 8e81c4d325..a92e332194 100644
--- a/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
+++ b/com.discord/smali/com/facebook/drawee/view/DraweeView.smali
@@ -15,11 +15,13 @@
 
 
 # static fields
-.field private static Ps:Z = false
+.field private static PB:Z = false
 
 
 # instance fields
-.field public Pa:Lcom/facebook/drawee/view/b;
+.field private PA:Z
+
+.field public Pj:Lcom/facebook/drawee/view/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/drawee/view/b<",
@@ -28,13 +30,11 @@
     .end annotation
 .end field
 
-.field private final Pp:Lcom/facebook/drawee/view/a$a;
+.field private final Py:Lcom/facebook/drawee/view/a$a;
 
-.field private Pq:Z
+.field private Pz:Z
 
-.field private Pr:Z
-
-.field private mV:F
+.field private mU:F
 
 
 # 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;->Pp:Lcom/facebook/drawee/view/a$a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Py:Lcom/facebook/drawee/view/a$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iput v0, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pq:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->PA: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;->Pp:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Py:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pq:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->PA: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;->Pp:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Py:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pq:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->PA: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;->Pp:Lcom/facebook/drawee/view/a$a;
+    iput-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Py:Lcom/facebook/drawee/view/a$a;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iput p2, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pq:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
 
-    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iput-boolean p2, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
 
     invoke-direct {p0, p1}, Lcom/facebook/drawee/view/DraweeView;->init(Landroid/content/Context;)V
 
     return-void
 .end method
 
-.method private hS()V
+.method private hV()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
 
     if-eqz v0, :cond_1
 
@@ -187,15 +187,15 @@
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pq:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -203,7 +203,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pq:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pz:Z
 
     const/4 v1, 0x0
 
@@ -211,7 +211,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iput-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -227,7 +227,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -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;->Ps:Z
+    sget-boolean v1, Lcom/facebook/drawee/view/DraweeView;->PB:Z
 
     if-eqz v1, :cond_3
 
@@ -260,18 +260,18 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -279,7 +279,7 @@
 .method public static setGlobalLegacyVisibilityHandlingEnabled(Z)V
     .locals 0
 
-    sput-boolean p0, Lcom/facebook/drawee/view/DraweeView;->Ps:Z
+    sput-boolean p0, Lcom/facebook/drawee/view/DraweeView;->PB:Z
 
     return-void
 .end method
@@ -289,7 +289,7 @@
 .method public getAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mU: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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Px: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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Pn:Lcom/facebook/drawee/d/b;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Pw: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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -346,11 +346,11 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onAttachedToWindow()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hV()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hg()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hj()V
 
     return-void
 .end method
@@ -360,9 +360,9 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onDetachedFromWindow()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hV()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->onDetach()V
 
@@ -374,11 +374,11 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onFinishTemporaryDetach()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hV()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hg()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hj()V
 
     return-void
 .end method
@@ -386,13 +386,13 @@
 .method protected onMeasure(II)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pp:Lcom/facebook/drawee/view/a$a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Py: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;->mV:F
+    iget p1, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/DraweeView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
 
@@ -512,11 +512,11 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pp:Lcom/facebook/drawee/view/a$a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Py: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;->Pp:Lcom/facebook/drawee/view/a$a;
+    iget-object p2, p0, Lcom/facebook/drawee/view/DraweeView;->Py:Lcom/facebook/drawee/view/a$a;
 
     iget p2, p2, Lcom/facebook/drawee/view/a$a;->height:I
 
@@ -530,9 +530,9 @@
 
     invoke-super {p0}, Landroid/widget/ImageView;->onStartTemporaryDetach()V
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hV()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->onDetach()V
 
@@ -542,9 +542,9 @@
 .method public onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hO()Z
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hR()Z
 
     move-result v1
 
@@ -555,7 +555,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, v0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/drawee/d/a;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -581,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;->hS()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/DraweeView;->hV()V
 
     return-void
 .end method
@@ -589,7 +589,7 @@
 .method public setAspectRatio(F)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iget v0, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     cmpl-float v0, p1, v0
 
@@ -598,7 +598,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lcom/facebook/drawee/view/DraweeView;->mV:F
+    iput p1, p0, Lcom/facebook/drawee/view/DraweeView;->mU:F
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/DraweeView;->requestLayout()V
 
@@ -612,11 +612,11 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj: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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -635,11 +635,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj: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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -661,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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -683,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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -705,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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -727,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;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/DraweeView;->Pj:Lcom/facebook/drawee/view/b;
 
     const/4 v1, 0x0
 
@@ -741,7 +741,7 @@
 .method public setLegacyVisibilityHandlingEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/view/DraweeView;->Pr:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/view/DraweeView;->PA:Z
 
     return-void
 .end method
@@ -753,7 +753,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/DraweeView;->Pj: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 b02ce3329b..0419b0952d 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 Pt:Lcom/facebook/common/d/l;
+.field private static PC:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private Pu:Lcom/facebook/drawee/controller/a;
+.field private PD:Lcom/facebook/drawee/controller/a;
 
 
 # direct methods
@@ -87,7 +87,7 @@
         }
     .end annotation
 
-    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pt:Lcom/facebook/common/d/l;
+    sput-object p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PC:Lcom/facebook/common/d/l;
 
     return-void
 .end method
@@ -100,7 +100,7 @@
     .end param
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/SimpleDraweeView;->isInEditMode()Z
 
@@ -127,13 +127,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pt:Lcom/facebook/common/d/l;
+    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->PC:Lcom/facebook/common/d/l;
 
     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;->Pt:Lcom/facebook/common/d/l;
+    sget-object v0, Lcom/facebook/drawee/view/SimpleDraweeView;->PC:Lcom/facebook/common/d/l;
 
     invoke-interface {v0}, Lcom/facebook/common/d/l;->get()Ljava/lang/Object;
 
@@ -141,7 +141,7 @@
 
     check-cast v0, Lcom/facebook/drawee/controller/a;
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pu:Lcom/facebook/drawee/controller/a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PD:Lcom/facebook/drawee/controller/a;
 
     :goto_0
     if-eqz p2, :cond_4
@@ -231,14 +231,14 @@
 
     :cond_4
     :goto_2
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -252,9 +252,9 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pu:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PD:Lcom/facebook/drawee/controller/a;
 
-    iput-object p2, v0, Lcom/facebook/drawee/controller/a;->Kp:Ljava/lang/Object;
+    iput-object p2, v0, Lcom/facebook/drawee/controller/a;->Ky:Ljava/lang/Object;
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/a;->n(Landroid/net/Uri;)Lcom/facebook/drawee/d/d;
 
@@ -268,7 +268,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->hq()Lcom/facebook/drawee/d/a;
+    invoke-interface {p1}, Lcom/facebook/drawee/d/d;->ht()Lcom/facebook/drawee/d/a;
 
     move-result-object p1
 
@@ -280,7 +280,7 @@
 .method protected getControllerBuilder()Lcom/facebook/drawee/controller/a;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pu:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PD:Lcom/facebook/drawee/controller/a;
 
     return-object v0
 .end method
@@ -302,17 +302,17 @@
 .method public setImageRequest(Lcom/facebook/imagepipeline/request/b;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->Pu:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/SimpleDraweeView;->PD:Lcom/facebook/drawee/controller/a;
 
-    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->LW:Ljava/lang/Object;
+    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mf:Ljava/lang/Object;
 
     invoke-virtual {p0}, Lcom/facebook/drawee/view/SimpleDraweeView;->getController()Lcom/facebook/drawee/d/a;
 
     move-result-object p1
 
-    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mb:Lcom/facebook/drawee/d/a;
+    iput-object p1, v0, Lcom/facebook/drawee/controller/a;->Mk:Lcom/facebook/drawee/d/a;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/controller/a;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/controller/a;->hr()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 22a0ac3b0e..713822f9ce 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 LB:Lcom/facebook/drawee/a/b;
+.field private final LK:Lcom/facebook/drawee/a/b;
 
-.field private Pk:Z
+.field private Pt:Z
 
-.field private Pl:Z
+.field private Pu:Z
 
-.field private Pm:Z
+.field private Pv:Z
 
-.field public Pn:Lcom/facebook/drawee/d/b;
+.field public Pw:Lcom/facebook/drawee/d/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TDH;"
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field public Po:Lcom/facebook/drawee/d/a;
+.field public Px:Lcom/facebook/drawee/d/a;
 
 
 # direct methods
@@ -55,23 +55,23 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pk:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pl:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pu:Z
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pm:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pv:Z
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iput-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
-    invoke-static {}, Lcom/facebook/drawee/a/b;->hb()Lcom/facebook/drawee/a/b;
+    invoke-static {}, Lcom/facebook/drawee/a/b;->he()Lcom/facebook/drawee/a/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iput-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_0
 
@@ -127,27 +127,27 @@
     return-void
 .end method
 
-.method private hP()V
+.method private hS()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pk:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lf:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lo: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;->Pk:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px: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;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
-    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->hg()V
+    invoke-interface {v0}, Lcom/facebook/drawee/d/a;->hj()V
 
     :cond_1
     return-void
 .end method
 
-.method private hQ()V
+.method private hT()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pk:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lg:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lp: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;->Pk:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hO()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hR()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
     invoke-interface {v0}, Lcom/facebook/drawee/d/a;->onDetach()V
 
@@ -199,23 +199,23 @@
     return-void
 .end method
 
-.method private hR()V
+.method private hU()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pl:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pu:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pm:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pv:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()V
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hQ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hT()V
 
     return-void
 .end method
@@ -227,7 +227,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pn:Lcom/facebook/drawee/d/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
 
     if-nez v0, :cond_0
 
@@ -243,10 +243,10 @@
     return-object v0
 .end method
 
-.method public final hH()V
+.method public final hK()V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pk:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
     if-eqz v0, :cond_0
 
@@ -271,7 +271,7 @@
 
     aput-object v3, v1, v2
 
-    iget-object v2, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v2, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
     invoke-static {v2}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
@@ -297,19 +297,19 @@
 
     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;->Pl:Z
+    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Pu:Z
 
-    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Pm:Z
+    iput-boolean v3, p0, Lcom/facebook/drawee/view/b;->Pv:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hR()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
 
     return-void
 .end method
 
-.method public final hO()Z
+.method public final hR()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
     if-eqz v0, :cond_0
 
@@ -317,7 +317,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pn:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
 
     if-ne v0, v1, :cond_0
 
@@ -331,20 +331,20 @@
     return v0
 .end method
 
-.method public final hg()V
+.method public final hj()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ln:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lw: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;->Pl:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pu:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hR()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
 
     return-void
 .end method
@@ -352,17 +352,17 @@
 .method public final onDetach()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lo:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lx: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;->Pl:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pu:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hR()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()V
 
     return-void
 .end method
@@ -374,63 +374,63 @@
         .end annotation
     .end param
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pk:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hQ()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hT()V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hO()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hR()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v2, Lcom/facebook/drawee/a/b$a;->Lc:Lcom/facebook/drawee/a/b$a;
+    sget-object v2, Lcom/facebook/drawee/a/b$a;->Ll: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;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Px: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;->Po:Lcom/facebook/drawee/d/a;
+    iput-object p1, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lb:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lk: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;->Po:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->Px:Lcom/facebook/drawee/d/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pn:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pw: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;->LB:Lcom/facebook/drawee/a/b;
+    iget-object p1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ld:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lm: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;->hP()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hS()V
 
     :cond_3
     return-void
@@ -444,13 +444,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->KZ:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Li: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;->hO()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/view/b;->hR()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;->Pn:Lcom/facebook/drawee/d/b;
+    iput-object v1, p0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pn:Lcom/facebook/drawee/d/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->Pw:Lcom/facebook/drawee/d/b;
 
     invoke-interface {v1}, Lcom/facebook/drawee/d/b;->getTopLevelDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -498,7 +498,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Po:Lcom/facebook/drawee/d/a;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->Px: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;->Pk:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pt:Z
 
     const-string v2, "controllerAttached"
 
@@ -521,7 +521,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pl:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pu:Z
 
     const-string v2, "holderAttached"
 
@@ -529,7 +529,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pm:Z
+    iget-boolean v1, p0, Lcom/facebook/drawee/view/b;->Pv:Z
 
     const-string v2, "drawableVisible"
 
@@ -537,7 +537,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v1, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
     invoke-virtual {v1}, Lcom/facebook/drawee/a/b;->toString()Ljava/lang/String;
 
@@ -559,30 +559,30 @@
 .method public final w(Z)V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pm:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/view/b;->Pv:Z
 
     if-ne v0, p1, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LB:Lcom/facebook/drawee/a/b;
+    iget-object v0, p0, Lcom/facebook/drawee/view/b;->LK:Lcom/facebook/drawee/a/b;
 
     if-eqz p1, :cond_1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lp:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ly:Lcom/facebook/drawee/a/b$a;
 
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lq:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lz: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;->Pm:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/view/b;->Pv:Z
 
-    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hR()V
+    invoke-direct {p0}, Lcom/facebook/drawee/view/b;->hU()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 9b383d29db..f595995fe4 100644
--- a/com.discord/smali/com/facebook/drawee/view/c.smali
+++ b/com.discord/smali/com/facebook/drawee/view/c.smali
@@ -73,23 +73,23 @@
         .end annotation
     .end param
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p1, p2}, Lcom/facebook/drawee/generic/b;->c(Landroid/content/Context;Landroid/util/AttributeSet;)Lcom/facebook/drawee/generic/a;
 
     move-result-object p1
 
-    iget p2, p1, Lcom/facebook/drawee/generic/a;->Ov:F
+    iget p2, p1, Lcom/facebook/drawee/generic/a;->OE:F
 
     invoke-virtual {p0, p2}, Lcom/facebook/drawee/view/c;->setAspectRatio(F)V
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->hM()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {p1}, Lcom/facebook/drawee/generic/a;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
     invoke-virtual {p0, p1}, Lcom/facebook/drawee/view/c;->setHierarchy(Lcom/facebook/drawee/d/b;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/e/a.smali b/com.discord/smali/com/facebook/e/a.smali
index fb45da55d5..22dce3ff63 100644
--- a/com.discord/smali/com/facebook/e/a.smali
+++ b/com.discord/smali/com/facebook/e/a.smali
@@ -7,33 +7,33 @@
 
 
 # static fields
-.field private static final QD:[B
+.field private static final QM:[B
 
-.field private static final QE:I
+.field private static final QN:I
 
-.field private static final QF:[B
+.field private static final QO:[B
 
-.field private static final QG:I
+.field private static final QP:I
 
-.field private static final QH:[B
+.field private static final QQ:[B
 
-.field private static final QI:[B
+.field private static final QR:[B
 
-.field private static final QJ:[B
+.field private static final QS:[B
 
-.field private static final QK:I
+.field private static final QT:I
 
-.field private static final QL:[B
+.field private static final QU:[B
 
-.field private static final QM:I
+.field private static final QV:I
 
-.field private static final QN:[Ljava/lang/String;
+.field private static final QW:[Ljava/lang/String;
 
-.field private static final QO:I
+.field private static final QX:I
 
 
 # instance fields
-.field final QC:I
+.field final QL:I
 
 
 # direct methods
@@ -46,9 +46,9 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/facebook/e/a;->QD:[B
+    sput-object v1, Lcom/facebook/e/a;->QM:[B
 
-    sput v0, Lcom/facebook/e/a;->QE:I
+    sput v0, Lcom/facebook/e/a;->QN:I
 
     const/16 v1, 0x8
 
@@ -56,9 +56,9 @@
 
     fill-array-data v2, :array_1
 
-    sput-object v2, Lcom/facebook/e/a;->QF:[B
+    sput-object v2, Lcom/facebook/e/a;->QO:[B
 
-    sput v1, Lcom/facebook/e/a;->QG:I
+    sput v1, Lcom/facebook/e/a;->QP:I
 
     const-string v1, "GIF87a"
 
@@ -66,7 +66,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/e/a;->QH:[B
+    sput-object v1, Lcom/facebook/e/a;->QQ:[B
 
     const-string v1, "GIF89a"
 
@@ -74,7 +74,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/e/a;->QI:[B
+    sput-object v1, Lcom/facebook/e/a;->QR:[B
 
     const-string v1, "BM"
 
@@ -82,11 +82,11 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/facebook/e/a;->QJ:[B
+    sput-object v1, Lcom/facebook/e/a;->QS:[B
 
     array-length v1, v1
 
-    sput v1, Lcom/facebook/e/a;->QK:I
+    sput v1, Lcom/facebook/e/a;->QT:I
 
     const/4 v1, 0x4
 
@@ -94,9 +94,9 @@
 
     fill-array-data v2, :array_2
 
-    sput-object v2, Lcom/facebook/e/a;->QL:[B
+    sput-object v2, Lcom/facebook/e/a;->QU:[B
 
-    sput v1, Lcom/facebook/e/a;->QM:I
+    sput v1, Lcom/facebook/e/a;->QV:I
 
     const/4 v2, 0x6
 
@@ -134,7 +134,7 @@
 
     aput-object v1, v2, v0
 
-    sput-object v2, Lcom/facebook/e/a;->QN:[Ljava/lang/String;
+    sput-object v2, Lcom/facebook/e/a;->QW:[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/e/a;->QN:[Ljava/lang/String;
+    sget-object v1, Lcom/facebook/e/a;->QW:[Ljava/lang/String;
 
     aget-object v1, v1, v3
 
@@ -158,7 +158,7 @@
 
     array-length v0, v0
 
-    sput v0, Lcom/facebook/e/a;->QO:I
+    sput v0, Lcom/facebook/e/a;->QX:I
 
     return-void
 
@@ -213,13 +213,13 @@
 
     aput v2, v0, v1
 
-    sget v1, Lcom/facebook/e/a;->QE:I
+    sget v1, Lcom/facebook/e/a;->QN:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/e/a;->QG:I
+    sget v1, Lcom/facebook/e/a;->QP:I
 
     const/4 v2, 0x3
 
@@ -231,17 +231,17 @@
 
     aput v1, v0, v2
 
-    sget v2, Lcom/facebook/e/a;->QK:I
+    sget v2, Lcom/facebook/e/a;->QT:I
 
     const/4 v3, 0x5
 
     aput v2, v0, v3
 
-    sget v2, Lcom/facebook/e/a;->QM:I
+    sget v2, Lcom/facebook/e/a;->QV:I
 
     aput v2, v0, v1
 
-    sget v1, Lcom/facebook/e/a;->QO:I
+    sget v1, Lcom/facebook/e/a;->QX:I
 
     const/4 v2, 0x7
 
@@ -251,7 +251,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/e/a;->QC:I
+    iput v0, p0, Lcom/facebook/e/a;->QL:I
 
     return-void
 .end method
@@ -285,7 +285,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -296,7 +296,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -313,7 +313,7 @@
 
     if-eqz p2, :cond_2
 
-    sget-object p1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -324,22 +324,22 @@
 
     if-eqz p1, :cond_3
 
-    sget-object p1, Lcom/facebook/e/b;->QX:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_3
-    sget-object p1, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_4
-    sget-object p1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_5
-    sget-object v1, Lcom/facebook/e/a;->QD:[B
+    sget-object v1, Lcom/facebook/e/a;->QM:[B
 
     array-length v2, v1
 
@@ -363,12 +363,12 @@
     :goto_0
     if-eqz v1, :cond_7
 
-    sget-object p1, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_7
-    sget-object v1, Lcom/facebook/e/a;->QF:[B
+    sget-object v1, Lcom/facebook/e/a;->QO:[B
 
     array-length v2, v1
 
@@ -390,7 +390,7 @@
     :goto_1
     if-eqz v1, :cond_9
 
-    sget-object p1, Lcom/facebook/e/b;->QQ:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
     return-object p1
 
@@ -399,7 +399,7 @@
 
     if-lt p2, v1, :cond_b
 
-    sget-object v1, Lcom/facebook/e/a;->QH:[B
+    sget-object v1, Lcom/facebook/e/a;->QQ:[B
 
     invoke-static {p1, v1}, Lcom/facebook/e/e;->a([B[B)Z
 
@@ -407,7 +407,7 @@
 
     if-nez v1, :cond_a
 
-    sget-object v1, Lcom/facebook/e/a;->QI:[B
+    sget-object v1, Lcom/facebook/e/a;->QR:[B
 
     invoke-static {p1, v1}, Lcom/facebook/e/e;->a([B[B)Z
 
@@ -426,12 +426,12 @@
     :goto_2
     if-eqz v1, :cond_c
 
-    sget-object p1, Lcom/facebook/e/b;->QR:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_c
-    sget-object v1, Lcom/facebook/e/a;->QJ:[B
+    sget-object v1, Lcom/facebook/e/a;->QS:[B
 
     array-length v2, v1
 
@@ -449,12 +449,12 @@
     :goto_3
     if-eqz v1, :cond_e
 
-    sget-object p1, Lcom/facebook/e/b;->QS:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_e
-    sget-object v1, Lcom/facebook/e/a;->QL:[B
+    sget-object v1, Lcom/facebook/e/a;->QU:[B
 
     array-length v2, v1
 
@@ -472,12 +472,12 @@
     :goto_4
     if-eqz v1, :cond_10
 
-    sget-object p1, Lcom/facebook/e/b;->QT:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Rc:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_10
-    sget v1, Lcom/facebook/e/a;->QO:I
+    sget v1, Lcom/facebook/e/a;->QX:I
 
     if-lt p2, v1, :cond_12
 
@@ -489,7 +489,7 @@
 
     if-lt p2, v1, :cond_12
 
-    sget-object p2, Lcom/facebook/e/a;->QN:[Ljava/lang/String;
+    sget-object p2, Lcom/facebook/e/a;->QW:[Ljava/lang/String;
 
     array-length v1, p2
 
@@ -516,7 +516,7 @@
 
     move-result-object v4
 
-    sget v6, Lcom/facebook/e/a;->QO:I
+    sget v6, Lcom/facebook/e/a;->QX:I
 
     invoke-static {p1, v5, v4, v6}, Lcom/facebook/e/e;->a([BI[BI)I
 
@@ -537,20 +537,20 @@
     :goto_6
     if-eqz v0, :cond_13
 
-    sget-object p1, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
 
     return-object p1
 
     :cond_13
-    sget-object p1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object p1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     return-object p1
 .end method
 
-.method public final ib()I
+.method public final if()I
     .locals 1
 
-    iget v0, p0, Lcom/facebook/e/a;->QC:I
+    iget v0, p0, Lcom/facebook/e/a;->QL:I
 
     return v0
 .end method
diff --git a/com.discord/smali/com/facebook/e/c$a.smali b/com.discord/smali/com/facebook/e/c$a.smali
index 247ae21683..c91e695f32 100644
--- a/com.discord/smali/com/facebook/e/c$a.smali
+++ b/com.discord/smali/com/facebook/e/c$a.smali
@@ -20,5 +20,5 @@
     .end annotation
 .end method
 
-.method public abstract ib()I
+.method public abstract if()I
 .end method
diff --git a/com.discord/smali/com/facebook/e/c.smali b/com.discord/smali/com/facebook/e/c.smali
index 110024e494..d11e41bfef 100644
--- a/com.discord/smali/com/facebook/e/c.smali
+++ b/com.discord/smali/com/facebook/e/c.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field public static final Ra:Lcom/facebook/e/c;
+.field public static final Rj:Lcom/facebook/e/c;
 
 
 # instance fields
-.field private final Rb:Ljava/lang/String;
+.field private final Rk:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -36,7 +36,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     iput-object p1, p0, Lcom/facebook/e/c;->mName:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/e/c;->Rb:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/e/c;->Rk:Ljava/lang/String;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/e/d.smali b/com.discord/smali/com/facebook/e/d.smali
index 966c62c1b2..fb8cf61eb0 100644
--- a/com.discord/smali/com/facebook/e/d.smali
+++ b/com.discord/smali/com/facebook/e/d.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static Rc:Lcom/facebook/e/d;
+.field private static Rl:Lcom/facebook/e/d;
 
 
 # instance fields
-.field private Rd:I
+.field private Rm:I
 
-.field public Re:Ljava/util/List;
+.field public Rn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final Rf:Lcom/facebook/e/c$a;
+.field private final Ro:Lcom/facebook/e/c$a;
 
 
 # direct methods
@@ -36,9 +36,9 @@
 
     invoke-direct {v0}, Lcom/facebook/e/a;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/e/d;->Rf:Lcom/facebook/e/c$a;
+    iput-object v0, p0, Lcom/facebook/e/d;->Ro:Lcom/facebook/e/c$a;
 
-    invoke-virtual {p0}, Lcom/facebook/e/d;->ic()V
+    invoke-virtual {p0}, Lcom/facebook/e/d;->ig()V
 
     return-void
 .end method
@@ -107,23 +107,23 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/e/d;->ie()Lcom/facebook/e/d;
+    invoke-static {}, Lcom/facebook/e/d;->ih()Lcom/facebook/e/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/e/d;->Rd:I
+    iget v1, v0, Lcom/facebook/e/d;->Rm:I
 
     new-array v1, v1, [B
 
-    iget v2, v0, Lcom/facebook/e/d;->Rd:I
+    iget v2, v0, Lcom/facebook/e/d;->Rm:I
 
     invoke-static {v2, p0, v1}, Lcom/facebook/e/d;->a(ILjava/io/InputStream;[B)I
 
     move-result p0
 
-    iget-object v2, v0, Lcom/facebook/e/d;->Rf:Lcom/facebook/e/c$a;
+    iget-object v2, v0, Lcom/facebook/e/d;->Ro:Lcom/facebook/e/c$a;
 
     invoke-interface {v2, v1, p0}, Lcom/facebook/e/c$a;->c([BI)Lcom/facebook/e/c;
 
@@ -131,18 +131,18 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v3, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v3, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-eq v2, v3, :cond_0
 
     return-object v2
 
     :cond_0
-    iget-object v2, v0, Lcom/facebook/e/d;->Re:Ljava/util/List;
+    iget-object v2, v0, Lcom/facebook/e/d;->Rn:Ljava/util/List;
 
     if-eqz v2, :cond_2
 
-    iget-object v0, v0, Lcom/facebook/e/d;->Re:Ljava/util/List;
+    iget-object v0, v0, Lcom/facebook/e/d;->Rn: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/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v3, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-eq v2, v3, :cond_1
 
     return-object v2
 
     :cond_2
-    sget-object p0, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object p0, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/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 ie()Lcom/facebook/e/d;
+.method public static declared-synchronized ih()Lcom/facebook/e/d;
     .locals 2
 
     const-class v0, Lcom/facebook/e/d;
@@ -204,7 +204,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/e/d;->Rc:Lcom/facebook/e/d;
+    sget-object v1, Lcom/facebook/e/d;->Rl:Lcom/facebook/e/d;
 
     if-nez v1, :cond_0
 
@@ -212,10 +212,10 @@
 
     invoke-direct {v1}, Lcom/facebook/e/d;-><init>()V
 
-    sput-object v1, Lcom/facebook/e/d;->Rc:Lcom/facebook/e/d;
+    sput-object v1, Lcom/facebook/e/d;->Rl:Lcom/facebook/e/d;
 
     :cond_0
-    sget-object v1, Lcom/facebook/e/d;->Rc:Lcom/facebook/e/d;
+    sget-object v1, Lcom/facebook/e/d;->Rl:Lcom/facebook/e/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -233,18 +233,18 @@
 
 
 # virtual methods
-.method public final ic()V
+.method public final ig()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/e/d;->Rf:Lcom/facebook/e/c$a;
+    iget-object v0, p0, Lcom/facebook/e/d;->Ro:Lcom/facebook/e/c$a;
 
-    invoke-interface {v0}, Lcom/facebook/e/c$a;->ib()I
+    invoke-interface {v0}, Lcom/facebook/e/c$a;->if()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/e/d;->Rd:I
+    iput v0, p0, Lcom/facebook/e/d;->Rm:I
 
-    iget-object v0, p0, Lcom/facebook/e/d;->Re:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/e/d;->Rn:Ljava/util/List;
 
     if-eqz v0, :cond_0
 
@@ -265,9 +265,9 @@
 
     check-cast v1, Lcom/facebook/e/c$a;
 
-    iget v2, p0, Lcom/facebook/e/d;->Rd:I
+    iget v2, p0, Lcom/facebook/e/d;->Rm:I
 
-    invoke-interface {v1}, Lcom/facebook/e/c$a;->ib()I
+    invoke-interface {v1}, Lcom/facebook/e/c$a;->if()I
 
     move-result v1
 
@@ -275,7 +275,7 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/facebook/e/d;->Rd:I
+    iput v1, p0, Lcom/facebook/e/d;->Rm:I
 
     goto :goto_0
 
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 b04bb62d10..9c2709b4d8 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 Pv:Lcom/facebook/fresco/animation/a/a;
+.field private PE: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method public final U(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -118,7 +118,7 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -133,7 +133,7 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -143,10 +143,10 @@
     return-void
 .end method
 
-.method public final fB()I
+.method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -155,17 +155,17 @@
     return v0
 
     :cond_0
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fB()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fE()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final fD()I
+.method public final fG()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -174,7 +174,7 @@
     return v0
 
     :cond_0
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fD()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fG()I
 
     move-result v0
 
@@ -184,7 +184,7 @@
 .method public final getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -203,7 +203,7 @@
 .method public final getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -222,7 +222,7 @@
 .method public final setAlpha(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/b;->PE: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 5a03a3a536..e987011ffa 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 KI:Lcom/facebook/common/time/b;
+.field final KR:Lcom/facebook/common/time/b;
 
-.field private PA:J
+.field private final PF:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field PB:Lcom/facebook/fresco/animation/a/c$a;
+.field PG:Z
+
+.field PH:J
+
+.field PI:J
+
+.field private PJ:J
+
+.field PK:Lcom/facebook/fresco/animation/a/c$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final PC:Ljava/lang/Runnable;
-
-.field private final Pw:Ljava/util/concurrent/ScheduledExecutorService;
-
-.field Px:Z
-
-.field Py:J
-
-.field Pz:J
+.field private final PL:Ljava/lang/Runnable;
 
 
 # direct methods
@@ -67,27 +67,27 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/fresco/animation/a/c;->Px:Z
+    iput-boolean p1, p0, Lcom/facebook/fresco/animation/a/c;->PG:Z
 
     const-wide/16 v0, 0x7d0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->Pz:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PI:J
 
     const-wide/16 v0, 0x3e8
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PA:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PJ: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;->PC:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c;->PL:Ljava/lang/Runnable;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/a/c;->PB:Lcom/facebook/fresco/animation/a/c$a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/a/c;->PK:Lcom/facebook/fresco/animation/a/c$a;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/a/c;->KI:Lcom/facebook/common/time/b;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/a/c;->KR:Lcom/facebook/common/time/b;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/a/c;->Pw:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/a/c;->PF: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;->KI:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->KR: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;->Py:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/a/c;->PH: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;->hT()V
+    invoke-virtual {p0}, Lcom/facebook/fresco/animation/a/c;->hW()V
 
     return p1
 .end method
 
-.method final declared-synchronized hT()V
+.method final declared-synchronized hW()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->Px:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->PG:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->Px:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/a/c;->PG:Z
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->Pw:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c;->PF:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c;->PC:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c;->PL:Ljava/lang/Runnable;
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/a/c;->PA:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/a/c;->PJ: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 cdc29af0bd..e16e137196 100644
--- a/com.discord/smali/com/facebook/fresco/animation/a/d.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/a/d.smali
@@ -7,8 +7,8 @@
 .method public abstract U(I)I
 .end method
 
-.method public abstract fB()I
+.method public abstract fE()I
 .end method
 
-.method public abstract fD()I
+.method public abstract fG()I
 .end method
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 fe30bd5ada..f8582fde9f 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -19,25 +19,25 @@
 
 
 # instance fields
-.field private final PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final PF:Lcom/facebook/fresco/animation/b/b;
+.field private final PO:Lcom/facebook/fresco/animation/b/b;
 
-.field private final PG:Lcom/facebook/fresco/animation/a/d;
+.field private final PP:Lcom/facebook/fresco/animation/a/d;
 
-.field private final PH:Lcom/facebook/fresco/animation/b/c;
+.field private final PQ:Lcom/facebook/fresco/animation/b/c;
 
-.field private final PI:Lcom/facebook/fresco/animation/b/b/a;
+.field private final PR:Lcom/facebook/fresco/animation/b/b/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final PJ:Lcom/facebook/fresco/animation/b/b/b;
+.field private final PS:Lcom/facebook/fresco/animation/b/b/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private PK:Landroid/graphics/Bitmap$Config;
+.field private PT:Landroid/graphics/Bitmap$Config;
 
 .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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/a;->GI: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;->PK:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PT:Landroid/graphics/Bitmap$Config;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PF:Lcom/facebook/fresco/animation/b/b;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/b/a;->PH:Lcom/facebook/fresco/animation/b/c;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/b/a;->PQ:Lcom/facebook/fresco/animation/b/c;
 
-    iput-object p5, p0, Lcom/facebook/fresco/animation/b/a;->PI:Lcom/facebook/fresco/animation/b/b/a;
+    iput-object p5, p0, Lcom/facebook/fresco/animation/b/a;->PR:Lcom/facebook/fresco/animation/b/b/a;
 
-    iput-object p6, p0, Lcom/facebook/fresco/animation/b/a;->PJ:Lcom/facebook/fresco/animation/b/b/b;
+    iput-object p6, p0, Lcom/facebook/fresco/animation/b/a;->PS: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;->hU()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hX()V
 
     return-void
 .end method
@@ -130,7 +130,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PH:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PQ: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;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PO: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;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hV()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hY()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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PN: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;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object v8, p0, Lcom/facebook/fresco/animation/b/a;->PT: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;->Gz:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a;->GI: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;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hW()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/b/b;->hZ()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;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {p3, p2}, Lcom/facebook/fresco/animation/b/b;->V(I)Lcom/facebook/common/references/CloseableReference;
 
@@ -405,10 +405,10 @@
     goto :goto_4
 .end method
 
-.method private hU()V
+.method private hX()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PH:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PQ: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;->PH:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PQ:Lcom/facebook/fresco/animation/b/c;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/b/c;->getIntrinsicHeight()I
 
@@ -474,7 +474,7 @@
 .method public final U(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/a/d;->U(I)I
 
@@ -492,15 +492,15 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PI:Lcom/facebook/fresco/animation/b/b/a;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a;->PR:Lcom/facebook/fresco/animation/b/b/a;
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PJ:Lcom/facebook/fresco/animation/b/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PS:Lcom/facebook/fresco/animation/b/b/b;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a;->PO: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
 
@@ -517,11 +517,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;->PH:Lcom/facebook/fresco/animation/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PQ:Lcom/facebook/fresco/animation/b/c;
 
     invoke-interface {v0, p1}, Lcom/facebook/fresco/animation/b/c;->b(Landroid/graphics/Rect;)V
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hU()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a;->hX()V
 
     return-void
 .end method
@@ -529,31 +529,31 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PO:Lcom/facebook/fresco/animation/b/b;
 
     invoke-interface {v0}, Lcom/facebook/fresco/animation/b/b;->clear()V
 
     return-void
 .end method
 
-.method public final fB()I
+.method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fB()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fE()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final fD()I
+.method public final fG()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fD()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fG()I
 
     move-result v0
 
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 9b1ce2abef..0d3214ac7f 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field private final PL:Lcom/facebook/imagepipeline/animated/c/c;
+.field private final PU:Lcom/facebook/imagepipeline/animated/c/c;
 
-.field private final PM:Z
+.field private final PV:Z
 
-.field private final PN:Landroid/util/SparseArray;
+.field private final PW:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private PO:Lcom/facebook/common/references/CloseableReference;
+.field private PY: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/a/a;->GI: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;->PL:Lcom/facebook/imagepipeline/animated/c/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->PU:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iput-boolean p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PM:Z
+    iput-boolean p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PV: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;->PN:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PN:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PN:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/fresco/animation/b/a/a;->GI: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;->PN:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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/g/d;->jm()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/d;->jp()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
     :try_end_0
@@ -213,7 +213,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/g/d;
 
-    sget-object v1, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sget-object v1, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
     invoke-direct {v0, p0, v1}, Lcom/facebook/imagepipeline/g/d;-><init>(Lcom/facebook/common/references/CloseableReference;Lcom/facebook/imagepipeline/g/h;)V
 
@@ -243,9 +243,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PL:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PU:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/animated/c/c;->Z(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;->PO:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PY: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;->PL:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PU: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;->PO:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/a/a;->PY: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;->PL:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/a/a;->PU: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;->PN:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PN:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->Gz:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/fresco/animation/b/a/a;->GI: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;->PN:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PO:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PY: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;->PO:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PY:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PN:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PN:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PN:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PW: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;->PL:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PU:Lcom/facebook/imagepipeline/animated/c/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/animated/c/c;->Z(I)Lcom/facebook/imagepipeline/animated/c/c$a;
 
@@ -548,7 +548,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized hV()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hY()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;->PO:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PY: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 hW()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hZ()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;->PM:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PV: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;->PL:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/a;->PU:Lcom/facebook/imagepipeline/animated/c/c;
 
     :cond_1
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->ij()Lcom/facebook/cache/common/CacheKey;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/animated/c/c;->im()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;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {v3, v2}, Lcom/facebook/imagepipeline/cache/h;->E(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 49351d0b00..4bcb3996bc 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 PP:I
+.field private PZ:I
 
-.field private PQ:Lcom/facebook/common/references/CloseableReference;
+.field private Qa: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;->PP:I
+    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ:I
 
     return-void
 .end method
 
-.method private declared-synchronized hX()V
+.method private declared-synchronized ia()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PP:I
+    iput v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ: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;->PP:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ:I
 
     if-ne v0, p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa:Lcom/facebook/common/references/CloseableReference;
 
-    iput p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PP:I
+    iput p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ: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;->hX()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->ia()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;->PP:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/a/b;->PZ:I
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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 hV()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hY()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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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 hW()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized hZ()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;->PQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/a/b;->Qa: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;->hX()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->ia()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;->hX()V
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/b/a/b;->ia()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 9020849a53..8f2c18f5a7 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 hV()Lcom/facebook/common/references/CloseableReference;
+.method public final hY()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 hW()Lcom/facebook/common/references/CloseableReference;
+.method public final hZ()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 069722e054..1d8191f665 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 hV()Lcom/facebook/common/references/CloseableReference;
+.method public abstract hY()Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -60,7 +60,7 @@
     .end annotation
 .end method
 
-.method public abstract hW()Lcom/facebook/common/references/CloseableReference;
+.method public abstract hZ()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 f1e81db56f..4aa0c03fd8 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 Qb:Lcom/facebook/fresco/animation/b/c/b;
+.field final synthetic Qk: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;->Qb:Lcom/facebook/fresco/animation/b/c/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b$1;->Qk: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;->Qb:Lcom/facebook/fresco/animation/b/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b$1;->Qk: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 146618b4a3..54097255b0 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final PF:Lcom/facebook/fresco/animation/b/b;
+.field private final PO:Lcom/facebook/fresco/animation/b/b;
 
-.field private PY:Lcom/facebook/imagepipeline/animated/a/a;
+.field private Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-.field private PZ:Lcom/facebook/imagepipeline/animated/c/d;
+.field private Qi:Lcom/facebook/imagepipeline/animated/c/d;
 
-.field private final Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+.field private final Qj: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/c/b;->GI: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;->Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->PF:Lcom/facebook/fresco/animation/b/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qj: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;->PZ:Lcom/facebook/imagepipeline/animated/c/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qi: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;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/c/b;->PO: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;->PZ:Lcom/facebook/imagepipeline/animated/c/d;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qi: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;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/fresco/animation/b/c/b;->GI:Ljava/lang/Class;
 
     new-array v0, v0, [Ljava/lang/Object;
 
@@ -119,27 +119,27 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->c(Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     if-eq p1, v0, :cond_0
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qj: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;->PZ:Lcom/facebook/imagepipeline/animated/c/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/b;->Qi:Lcom/facebook/imagepipeline/animated/c/d;
 
     :cond_0
     return-void
@@ -148,7 +148,7 @@
 .method public final getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->getHeight()I
 
@@ -160,7 +160,7 @@
 .method public final getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/b;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->getWidth()I
 
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 eec3b99d63..f7fc1200b0 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,49 +25,49 @@
     .end annotation
 .end field
 
-.field private static final Qc:Lcom/facebook/fresco/animation/c/b;
+.field private static final Ql:Lcom/facebook/fresco/animation/c/b;
 
 
 # instance fields
-.field private MJ:Lcom/facebook/drawee/drawable/d;
+.field private MS:Lcom/facebook/drawee/drawable/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Nb:J
+.field private Nk:J
 
-.field private Pv:Lcom/facebook/fresco/animation/a/a;
+.field private PE:Lcom/facebook/fresco/animation/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private Qd:Lcom/facebook/fresco/animation/d/b;
+.field private Qm:Lcom/facebook/fresco/animation/d/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private volatile Qe:Z
+.field private volatile Qn:Z
 
-.field private Qf:J
+.field private Qo:J
 
-.field private Qg:J
+.field private Qp:J
 
-.field private Qh:I
+.field private Qq:I
 
-.field private Qi:J
+.field private Qr:J
 
-.field private Qj:J
+.field private Qs:J
 
-.field private Qk:I
+.field private Qt:I
 
-.field private volatile Ql:Lcom/facebook/fresco/animation/c/b;
+.field private volatile Qu:Lcom/facebook/fresco/animation/c/b;
 
-.field private volatile Qm:Lcom/facebook/fresco/animation/c/a$a;
+.field private volatile Qv:Lcom/facebook/fresco/animation/c/a$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Qn:Ljava/lang/Runnable;
+.field private final Qw: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/c/a;->GI: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;->Qc:Lcom/facebook/fresco/animation/c/b;
+    sput-object v0, Lcom/facebook/fresco/animation/c/a;->Ql: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;->Qi:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qr:J
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qj:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qs:J
 
-    sget-object v0, Lcom/facebook/fresco/animation/c/a;->Qc:Lcom/facebook/fresco/animation/c/b;
+    sget-object v0, Lcom/facebook/fresco/animation/c/a;->Ql:Lcom/facebook/fresco/animation/c/b;
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql:Lcom/facebook/fresco/animation/c/b;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qm:Lcom/facebook/fresco/animation/c/a$a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qv: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;->Qn:Ljava/lang/Runnable;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/c/a;->Qw:Ljava/lang/Runnable;
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->PE: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;->Qd:Lcom/facebook/fresco/animation/d/b;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qm: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;->Qn:Ljava/lang/Runnable;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/c/a;->Qw: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qd:Lcom/facebook/fresco/animation/d/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qm: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;->Qe:Z
+    iget-boolean v2, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     if-eqz v2, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
     sub-long v2, v0, v2
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qj:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qs:J
 
     add-long/2addr v2, v4
 
     goto :goto_0
 
     :cond_1
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qf:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qo: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;->Qd:Lcom/facebook/fresco/animation/d/b;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/c/a;->Qm:Lcom/facebook/fresco/animation/d/b;
 
     invoke-interface {v4, v2, v3}, Lcom/facebook/fresco/animation/d/b;->n(J)I
 
@@ -209,40 +209,40 @@
 
     if-ne v4, v5, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fB()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fE()I
 
     move-result v0
 
     add-int/lit8 v4, v0, -0x1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qe:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     goto :goto_1
 
     :cond_2
     if-nez v4, :cond_3
 
-    iget v6, p0, Lcom/facebook/fresco/animation/c/a;->Qh:I
+    iget v6, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
 
     if-eq v6, v5, :cond_3
 
-    iget-wide v5, p0, Lcom/facebook/fresco/animation/c/a;->Qg:J
+    iget-wide v5, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
 
     cmp-long v7, v0, v5
 
     if-ltz v7, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE: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;->Ql:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu:Lcom/facebook/fresco/animation/c/b;
 
-    iput v4, p0, Lcom/facebook/fresco/animation/c/a;->Qh:I
+    iput v4, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
 
     :cond_4
     if-nez p1, :cond_5
 
-    iget p1, p0, Lcom/facebook/fresco/animation/c/a;->Qk:I
+    iget p1, p0, Lcom/facebook/fresco/animation/c/a;->Qt:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/facebook/fresco/animation/c/a;->Qk:I
+    iput p1, p0, Lcom/facebook/fresco/animation/c/a;->Qt:I
 
     const/4 p1, 0x2
 
@@ -271,9 +271,9 @@
 
     if-eqz p1, :cond_5
 
-    sget-object p1, Lcom/facebook/fresco/animation/c/a;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/c/a;->GI:Ljava/lang/Class;
 
-    iget v0, p0, Lcom/facebook/fresco/animation/c/a;->Qk:I
+    iget v0, p0, Lcom/facebook/fresco/animation/c/a;->Qt: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;->Qe:Z
+    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qd:Lcom/facebook/fresco/animation/d/b;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qm:Lcom/facebook/fresco/animation/d/b;
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
     sub-long/2addr v0, v4
 
@@ -308,41 +308,41 @@
 
     if-eqz p1, :cond_6
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qi:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qr:J
 
     add-long/2addr v0, v4
 
-    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iget-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
     add-long/2addr v4, v0
 
-    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qg:J
+    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
 
-    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Ljava/lang/Runnable;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qw:Ljava/lang/Runnable;
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qg:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp: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;->Qm:Lcom/facebook/fresco/animation/c/a$a;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/c/a;->Qv:Lcom/facebook/fresco/animation/c/a$a;
 
     if-eqz p1, :cond_7
 
-    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->Qe:Z
+    iget-boolean p1, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     :cond_7
-    iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qf:J
+    iput-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
 
     :cond_8
     :goto_2
     return-void
 .end method
 
-.method public final gM()V
+.method public final gP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_0
 
@@ -355,7 +355,7 @@
 .method public getIntrinsicHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -376,7 +376,7 @@
 .method public getIntrinsicWidth()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-nez v0, :cond_0
 
@@ -405,7 +405,7 @@
 .method public isRunning()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qe:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE: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;->Qe:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     const/4 v1, 0x0
 
@@ -437,7 +437,7 @@
     return v1
 
     :cond_0
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qf:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/c/a;->Qo: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;->Qf:J
+    iput-wide v4, p0, Lcom/facebook/fresco/animation/c/a;->Qo: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS:Lcom/facebook/drawee/drawable/d;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS: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;->MJ:Lcom/facebook/drawee/drawable/d;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS:Lcom/facebook/drawee/drawable/d;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MJ:Lcom/facebook/drawee/drawable/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->MS: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_1
 
@@ -516,15 +516,15 @@
 .method public start()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qe:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fB()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/a;->fE()I
 
     move-result v0
 
@@ -535,29 +535,29 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/fresco/animation/c/a;->Qe:Z
+    iput-boolean v1, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qg:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qf:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qh:I
+    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
 
     invoke-virtual {p0}, Lcom/facebook/fresco/animation/c/a;->invalidateSelf()V
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Ql:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu: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;->Qe:Z
+    iget-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn: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;->Qe:Z
+    iput-boolean v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Z
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nb:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Nk:J
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qg:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qp:J
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qf:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/c/a;->Qo:J
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qh:I
+    iput v0, p0, Lcom/facebook/fresco/animation/c/a;->Qq:I
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qn:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qw: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;->Ql:Lcom/facebook/fresco/animation/c/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a;->Qu: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 2963fbbc8a..f08e9c4dd5 100644
--- a/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
+++ b/com.discord/smali/com/facebook/fresco/animation/factory/AnimatedFactoryV2Impl.smali
@@ -7,16 +7,33 @@
 
 
 # instance fields
-.field private JN:Lcom/facebook/imagepipeline/f/a;
+.field private JW:Lcom/facebook/imagepipeline/f/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final Qp:Lcom/facebook/imagepipeline/b/f;
+.field private final QA:Z
 
-.field private final Qq:Lcom/facebook/imagepipeline/cache/h;
+.field private QB:Lcom/facebook/imagepipeline/animated/b/d;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private QC:Lcom/facebook/imagepipeline/animated/c/b;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private QD:Lcom/facebook/imagepipeline/animated/d/a;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field private final Qy:Lcom/facebook/imagepipeline/b/f;
+
+.field private final Qz:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -27,23 +44,6 @@
     .end annotation
 .end field
 
-.field private final Qr:Z
-
-.field private Qs:Lcom/facebook/imagepipeline/animated/b/d;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private Qt:Lcom/facebook/imagepipeline/animated/c/b;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field private Qu:Lcom/facebook/imagepipeline/animated/d/a;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/imagepipeline/b/f;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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-boolean p4, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qr:Z
+    iput-boolean p4, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QA: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;->Qs:Lcom/facebook/imagepipeline/animated/b/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QB: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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->PN: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;->Qs:Lcom/facebook/imagepipeline/animated/b/d;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QB:Lcom/facebook/imagepipeline/animated/b/d;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qs:Lcom/facebook/imagepipeline/animated/b/d;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QB: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;->Qu:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QD: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;->Qu:Lcom/facebook/imagepipeline/animated/d/a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QD:Lcom/facebook/imagepipeline/animated/d/a;
 
     :cond_0
-    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qu:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QD: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;->Qr:Z
+    iget-boolean p0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QA:Z
 
     return p0
 .end method
@@ -147,12 +147,12 @@
     return-object v0
 .end method
 
-.method public final hY()Lcom/facebook/imagepipeline/f/a;
+.method public final ib()Lcom/facebook/imagepipeline/f/a;
     .locals 10
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JN:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JW:Lcom/facebook/imagepipeline/f/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;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iE()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iH()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;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QC: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;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QC:Lcom/facebook/imagepipeline/animated/c/b;
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->QC:Lcom/facebook/imagepipeline/animated/c/b;
 
-    invoke-static {}, Lcom/facebook/common/b/i;->ge()Lcom/facebook/common/b/i;
+    invoke-static {}, Lcom/facebook/common/b/i;->gh()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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v6, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v7, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v7, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->Qz: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/l;Lcom/facebook/common/d/l;)V
 
-    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JN:Lcom/facebook/imagepipeline/f/a;
+    iput-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JW:Lcom/facebook/imagepipeline/f/a;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JN:Lcom/facebook/imagepipeline/f/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;->JW:Lcom/facebook/imagepipeline/f/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 0277f4f919..3935fe3f4f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/b.smali
@@ -4,33 +4,33 @@
 
 
 # static fields
-.field private static final Th:Lcom/facebook/imagepipeline/a/b;
+.field private static final Tq:Lcom/facebook/imagepipeline/a/b;
 
 
 # instance fields
-.field public final Ti:I
+.field public final Tr:I
 
-.field public final Tj:Z
+.field public final Ts:Z
 
-.field public final Tk:Z
+.field public final Tt:Z
 
-.field public final Tl:Z
+.field public final Tu:Z
 
-.field public final Tm:Z
+.field public final Tv:Z
 
-.field public final Tn:Landroid/graphics/Bitmap$Config;
+.field public final Tw:Landroid/graphics/Bitmap$Config;
 
-.field public final To:Lcom/facebook/imagepipeline/e/c;
+.field public final Tx:Lcom/facebook/imagepipeline/e/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Tp:Lcom/facebook/imagepipeline/l/a;
+.field public final Ty:Lcom/facebook/imagepipeline/l/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Tq:Landroid/graphics/ColorSpace;
+.field public final Tz:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -48,7 +48,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;->Th:Lcom/facebook/imagepipeline/a/b;
+    sput-object v1, Lcom/facebook/imagepipeline/a/b;->Tq:Lcom/facebook/imagepipeline/a/b;
 
     return-void
 .end method
@@ -58,49 +58,49 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget v0, p1, Lcom/facebook/imagepipeline/a/c;->Tr:I
+    iget v0, p1, Lcom/facebook/imagepipeline/a/c;->TA:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/a/b;->Ti:I
+    iput v0, p0, Lcom/facebook/imagepipeline/a/b;->Tr:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Ts:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TB:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tj:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Tt:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TC:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tk:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Tu:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TD:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tl:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->Tv:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/a/c;->TE:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->PT:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->Tw:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->TF:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->Tx:Lcom/facebook/imagepipeline/l/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/a/c;->TG:Lcom/facebook/imagepipeline/l/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/a/c;->Ty:Landroid/graphics/ColorSpace;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/a/c;->TH:Landroid/graphics/ColorSpace;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
     return-void
 .end method
 
-.method public static iw()Lcom/facebook/imagepipeline/a/b;
+.method public static iz()Lcom/facebook/imagepipeline/a/b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/b;->Th:Lcom/facebook/imagepipeline/a/b;
+    sget-object v0, Lcom/facebook/imagepipeline/a/b;->Tq:Lcom/facebook/imagepipeline/a/b;
 
     return-object v0
 .end method
@@ -136,72 +136,72 @@
     :cond_1
     check-cast p1, Lcom/facebook/imagepipeline/a/b;
 
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tj:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tj:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Ts:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tk:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tk:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tt:Z
 
     if-eq v2, v3, :cond_3
 
     return v1
 
     :cond_3
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tl:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tl:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tu:Z
 
     if-eq v2, v3, :cond_4
 
     return v1
 
     :cond_4
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
     if-eq v2, v3, :cond_5
 
     return v1
 
     :cond_5
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
     if-eq v2, v3, :cond_6
 
     return v1
 
     :cond_6
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
     if-eq v2, v3, :cond_7
 
     return v1
 
     :cond_7
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
     if-eq v2, v3, :cond_8
 
     return v1
 
     :cond_8
-    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
     if-eq v2, p1, :cond_9
 
@@ -218,35 +218,35 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/b;->Ti:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/b;->Tr:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tj:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tk:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tl:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
     invoke-virtual {v1}, Landroid/graphics/Bitmap$Config;->ordinal()I
 
@@ -256,7 +256,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
     const/4 v2, 0x0
 
@@ -276,7 +276,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
     if-eqz v1, :cond_1
 
@@ -294,7 +294,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
     if-eqz v1, :cond_2
 
@@ -315,7 +315,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/b;->Ti:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/b;->Tr:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -325,7 +325,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tj:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Ts:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -335,7 +335,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tk:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tt:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -345,7 +345,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tl:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tu:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -355,7 +355,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -365,7 +365,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
     invoke-virtual {v1}, Landroid/graphics/Bitmap$Config;->name()Ljava/lang/String;
 
@@ -375,19 +375,19 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
     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 84df1f8601..b5a07a37cb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/a/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/a/c.smali
@@ -4,29 +4,29 @@
 
 
 # instance fields
-.field PK:Landroid/graphics/Bitmap$Config;
+.field PT:Landroid/graphics/Bitmap$Config;
 
-.field Tr:I
+.field TA:I
 
-.field Ts:Z
+.field TB:Z
 
-.field Tt:Z
+.field TC:Z
 
-.field Tu:Z
+.field TD:Z
 
-.field Tv:Z
+.field TE:Z
 
-.field Tw:Lcom/facebook/imagepipeline/e/c;
+.field TF:Lcom/facebook/imagepipeline/e/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Tx:Lcom/facebook/imagepipeline/l/a;
+.field TG:Lcom/facebook/imagepipeline/l/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Ty:Landroid/graphics/ColorSpace;
+.field TH:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -40,11 +40,11 @@
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/facebook/imagepipeline/a/c;->Tr:I
+    iput v0, p0, Lcom/facebook/imagepipeline/a/c;->TA:I
 
     sget-object v0, Landroid/graphics/Bitmap$Config;->ARGB_8888:Landroid/graphics/Bitmap$Config;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/a/c;->PK:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/a/c;->PT: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 711eacb089..8b83774428 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 TA:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum TI:Lcom/facebook/imagepipeline/a/d;
 
-.field public static final enum TB:Lcom/facebook/imagepipeline/a/d;
+.field public static final enum TJ:Lcom/facebook/imagepipeline/a/d;
 
-.field private static final synthetic TC:[Lcom/facebook/imagepipeline/a/d;
+.field public static final enum TK:Lcom/facebook/imagepipeline/a/d;
 
-.field public static final enum Tz:Lcom/facebook/imagepipeline/a/d;
+.field private static final synthetic TL:[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;->Tz:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TI: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;->TA:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TJ: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;->TB:Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TK: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;->Tz:Lcom/facebook/imagepipeline/a/d;
+    sget-object v4, Lcom/facebook/imagepipeline/a/d;->TI:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TA:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TJ:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TB:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TK:Lcom/facebook/imagepipeline/a/d;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TC:[Lcom/facebook/imagepipeline/a/d;
+    sput-object v0, Lcom/facebook/imagepipeline/a/d;->TL:[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;->TC:[Lcom/facebook/imagepipeline/a/d;
+    sget-object v0, Lcom/facebook/imagepipeline/a/d;->TL:[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 eed3fc9686..39d7889cc8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/a/a.smali
@@ -16,10 +16,10 @@
 .method public abstract c(Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
 .end method
 
-.method public abstract fB()I
+.method public abstract fE()I
 .end method
 
-.method public abstract fD()I
+.method public abstract fG()I
 .end method
 
 .method public abstract getHeight()I
@@ -28,8 +28,8 @@
 .method public abstract getWidth()I
 .end method
 
-.method public abstract if()I
+.method public abstract ii()I
 .end method
 
-.method public abstract ig()I
+.method public abstract ij()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 4b8651301e..0d0d6fdf7b 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 Rs:Lcom/facebook/imagepipeline/animated/a/c;
+.field public final RB:Lcom/facebook/imagepipeline/animated/a/c;
 
-.field private final Rt:I
+.field private final RC:I
 
-.field private Ru:Lcom/facebook/common/references/CloseableReference;
+.field private RD: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 Rv:Ljava/util/List;
+.field private RE: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;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rt:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RC: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;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->RB: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;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Rt:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->RC:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rt:I
+    iput v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RC:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/animated/a/f;->RD: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;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RD:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/a/f;->Rv:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/a/f;->RE: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;->Rv:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RE: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;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RD: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;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RD:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/a/e;->Rv:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/a/e;->RE: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;->Rv:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/e;->RE: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 f7f7fe86b3..423997bbd4 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 hY()Lcom/facebook/imagepipeline/f/a;
+.method public abstract ib()Lcom/facebook/imagepipeline/f/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 5e14f76498..8af81affb1 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 RB:Lcom/facebook/imagepipeline/animated/b/e;
+.field final synthetic RK: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;->RB:Lcom/facebook/imagepipeline/animated/b/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$1;->RK: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 af419e97ef..57eeff8639 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 RA:Lcom/facebook/imagepipeline/animated/b/c;
+.field static RI:Lcom/facebook/imagepipeline/animated/b/c;
 
-.field static Rz:Lcom/facebook/imagepipeline/animated/b/c;
+.field static RJ:Lcom/facebook/imagepipeline/animated/b/c;
 
 
 # instance fields
-.field private final Qt:Lcom/facebook/imagepipeline/animated/c/b;
+.field private final QC:Lcom/facebook/imagepipeline/animated/c/b;
 
-.field private final Ry:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Rz:Lcom/facebook/imagepipeline/animated/b/c;
+    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RI:Lcom/facebook/imagepipeline/animated/b/c;
 
     const-string v0, "com.facebook.animated.webp.WebPImage"
 
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RA:Lcom/facebook/imagepipeline/animated/b/c;
+    sput-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RJ: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;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e;->QC:Lcom/facebook/imagepipeline/animated/c/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e;->Ry:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e;->RH: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;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->QC:Lcom/facebook/imagepipeline/animated/c/b;
 
     const/4 v1, 0x0
 
@@ -116,13 +116,13 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-boolean v1, p1, Lcom/facebook/imagepipeline/a/b;->Tk:Z
+    iget-boolean v1, p1, Lcom/facebook/imagepipeline/a/b;->Tt:Z
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fB()I
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
 
     move-result v1
 
@@ -134,7 +134,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
     if-eqz v3, :cond_1
 
@@ -144,7 +144,7 @@
 
     move-result-object p2
 
-    sget-object p3, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sget-object p3, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
     invoke-direct {p1, p2, p3}, Lcom/facebook/imagepipeline/g/d;-><init>(Lcom/facebook/common/references/CloseableReference;Lcom/facebook/imagepipeline/g/h;)V
     :try_end_0
@@ -158,7 +158,7 @@
 
     :cond_1
     :try_start_1
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tl:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/a/b;->Tu:Z
 
     if-eqz v3, :cond_3
 
@@ -166,7 +166,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/b/e;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/b/e;->QC: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;
 
@@ -174,7 +174,7 @@
 
     new-instance v4, Ljava/util/ArrayList;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/animated/a/a;->fB()I
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/animated/a/a;->fE()I
 
     move-result v5
 
@@ -189,7 +189,7 @@
     invoke-direct {v5, v3, v6}, Lcom/facebook/imagepipeline/animated/c/d;-><init>(Lcom/facebook/imagepipeline/animated/a/a;Lcom/facebook/imagepipeline/animated/c/d$a;)V
 
     :goto_1
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/animated/a/a;->fB()I
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/animated/a/a;->fE()I
 
     move-result v6
 
@@ -241,7 +241,7 @@
     move-object v4, v0
 
     :goto_2
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/b;->Tj:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/b;->Ts:Z
 
     if-eqz p1, :cond_4
 
@@ -262,17 +262,17 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->RD:Lcom/facebook/common/references/CloseableReference;
 
-    iput v1, p1, Lcom/facebook/imagepipeline/animated/a/f;->Rt:I
+    iput v1, p1, Lcom/facebook/imagepipeline/animated/a/f;->RC: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;->Rv:Ljava/util/List;
+    iput-object p2, p1, Lcom/facebook/imagepipeline/animated/a/f;->RE:Ljava/util/List;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->ih()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/animated/a/f;->ik()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
@@ -351,7 +351,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->Ry:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e;->RH: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/g/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/g/c;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->Rz:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RI:Lcom/facebook/imagepipeline/animated/b/c;
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->Wd: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;->Rz:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RI: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;->Rz:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RI:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->gl()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->go()J
 
     move-result-wide v2
 
@@ -475,11 +475,11 @@
 .method public final b(Lcom/facebook/imagepipeline/g/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/g/c;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RA:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v0, Lcom/facebook/imagepipeline/animated/b/e;->RJ:Lcom/facebook/imagepipeline/animated/b/c;
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->Wd: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;->RA:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RJ: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;->RA:Lcom/facebook/imagepipeline/animated/b/c;
+    sget-object v1, Lcom/facebook/imagepipeline/animated/b/e;->RJ:Lcom/facebook/imagepipeline/animated/b/c;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/f;->gl()J
+    invoke-interface {v0}, Lcom/facebook/common/g/f;->go()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 a37771f592..ac4d05f112 100644
--- a/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/animated/c/a.smali
@@ -7,29 +7,29 @@
 
 
 # instance fields
-.field private final Na:I
+.field private final Nj:I
 
-.field private final Qr:Z
+.field private final QA:Z
 
-.field private final Qu:Lcom/facebook/imagepipeline/animated/d/a;
+.field private final QD:Lcom/facebook/imagepipeline/animated/d/a;
 
-.field private final RD:Lcom/facebook/imagepipeline/animated/a/e;
+.field private final RM:Lcom/facebook/imagepipeline/animated/a/e;
 
-.field private final RE:Lcom/facebook/imagepipeline/animated/a/c;
+.field private final RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-.field private final RF:Landroid/graphics/Rect;
+.field private final RO:Landroid/graphics/Rect;
 
-.field private final RG:[I
+.field private final RP:[I
 
-.field private final RH:[I
+.field private final RQ:[I
 
-.field private final RI:[Lcom/facebook/imagepipeline/animated/a/b;
+.field private final RR:[Lcom/facebook/imagepipeline/animated/a/b;
 
-.field private final RJ:Landroid/graphics/Rect;
+.field private final RS:Landroid/graphics/Rect;
 
-.field private final RK:Landroid/graphics/Rect;
+.field private final RT:Landroid/graphics/Rect;
 
-.field private RL:Landroid/graphics/Bitmap;
+.field private RU:Landroid/graphics/Bitmap;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -45,84 +45,84 @@
 
     invoke-direct {v0}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RS: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;->RK:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RT:Landroid/graphics/Rect;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qu:Lcom/facebook/imagepipeline/animated/d/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QD:Lcom/facebook/imagepipeline/animated/d/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RD:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RM:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/animated/a/e;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fC()[I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fF()[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RG:[I
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RG:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/animated/d/a;->d([I)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RG:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[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;->Na:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Nj:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RG:[I
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[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;->RH:[I
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RQ:[I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN: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;->RF:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qr:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Z
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fB()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
 
     move-result p1
 
     new-array p1, p1, [Lcom/facebook/imagepipeline/animated/a/b;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RI:[Lcom/facebook/imagepipeline/animated/a/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RR:[Lcom/facebook/imagepipeline/animated/a/b;
 
     const/4 p1, 0x0
 
     :goto_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fB()I
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
 
     move-result p2
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RI:[Lcom/facebook/imagepipeline/animated/a/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RR:[Lcom/facebook/imagepipeline/animated/a/b;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {p3, p1}, Lcom/facebook/imagepipeline/animated/a/c;->B(I)Lcom/facebook/imagepipeline/animated/a/b;
 
@@ -191,23 +191,23 @@
     return-object v1
 .end method
 
-.method private declared-synchronized ii()V
+.method private declared-synchronized il()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU: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;->RL:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU: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;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU: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;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU: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;->ii()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/animated/c/a;->il()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU: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;->RL:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
     const/4 p2, 0x0
 
@@ -292,7 +292,7 @@
 .method public final B(I)Lcom/facebook/imagepipeline/animated/a/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RI:[Lcom/facebook/imagepipeline/animated/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RR:[Lcom/facebook/imagepipeline/animated/a/b;
 
     aget-object p1, v0, p1
 
@@ -302,7 +302,7 @@
 .method public final Y(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RG:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RP:[I
 
     aget p1, v0, p1
 
@@ -312,16 +312,16 @@
 .method public final a(ILandroid/graphics/Canvas;)V
     .locals 10
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/c;->C(I)Lcom/facebook/imagepipeline/animated/a/d;
 
     move-result-object p1
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fE()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fH()Z
 
     move-result v0
 
@@ -329,7 +329,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RF:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -337,7 +337,7 @@
 
     int-to-double v2, v0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getWidth()I
 
@@ -354,7 +354,7 @@
     div-double/2addr v2, v4
 
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RF:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->height()I
 
@@ -362,7 +362,7 @@
 
     int-to-double v4, v0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getHeight()I
 
@@ -417,7 +417,7 @@
 
     long-to-int v7, v6
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fy()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fB()I
 
     move-result v6
     :try_end_4
@@ -432,7 +432,7 @@
     double-to-int v2, v8
 
     :try_start_5
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fz()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fC()I
 
     move-result v3
     :try_end_5
@@ -452,13 +452,13 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_2
 
     :try_start_7
-    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/c/a;->RF:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
     invoke-virtual {v4}, Landroid/graphics/Rect;->width()I
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RF:Landroid/graphics/Rect;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
     invoke-virtual {v5}, Landroid/graphics/Rect;->height()I
 
@@ -466,17 +466,17 @@
 
     invoke-direct {p0, v4, v5}, Lcom/facebook/imagepipeline/animated/c/a;->m(II)V
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU: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;->RJ:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RS: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;->RK:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RT:Landroid/graphics/Rect;
 
     add-int/2addr v4, v2
 
@@ -484,11 +484,11 @@
 
     invoke-virtual {v0, v2, v3, v4, v5}, Landroid/graphics/Rect;->set(IIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RJ:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RS:Landroid/graphics/Rect;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RK:Landroid/graphics/Rect;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->RT: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
 
@@ -507,7 +507,7 @@
     throw p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qr:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA:Z
 
     if-eqz v0, :cond_1
 
@@ -579,7 +579,7 @@
 
     float-to-int v3, v3
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fy()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fB()I
 
     move-result v4
 
@@ -589,7 +589,7 @@
 
     float-to-int v4, v4
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fz()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fC()I
 
     move-result v5
 
@@ -610,11 +610,11 @@
 
     move-result v3
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fy()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fB()I
 
     move-result v4
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fz()I
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/animated/a/d;->fC()I
 
     move-result v0
 
@@ -626,7 +626,7 @@
     :try_start_9
     invoke-direct {p0, v2, v3}, Lcom/facebook/imagepipeline/animated/c/a;->m(II)V
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
     invoke-interface {p1, v2, v3, v5}, Lcom/facebook/imagepipeline/animated/a/d;->a(IILandroid/graphics/Bitmap;)V
 
@@ -638,7 +638,7 @@
 
     invoke-virtual {p2, v2, v0}, Landroid/graphics/Canvas;->translate(FF)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RL:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RU:Landroid/graphics/Bitmap;
 
     const/4 v2, 0x0
 
@@ -679,13 +679,13 @@
 .method public final c(Landroid/graphics/Rect;)Lcom/facebook/imagepipeline/animated/a/a;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN: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;->RF:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
     invoke-virtual {v0, v1}, Landroid/graphics/Rect;->equals(Ljava/lang/Object;)Z
 
@@ -698,35 +698,35 @@
     :cond_0
     new-instance v0, Lcom/facebook/imagepipeline/animated/c/a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qu:Lcom/facebook/imagepipeline/animated/d/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/a;->QD:Lcom/facebook/imagepipeline/animated/d/a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RD:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/a;->RM:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-boolean v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->Qr:Z
+    iget-boolean v3, p0, Lcom/facebook/imagepipeline/animated/c/a;->QA: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 fB()I
+.method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fB()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fE()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final fD()I
+.method public final fG()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fD()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fG()I
 
     move-result v0
 
@@ -736,7 +736,7 @@
 .method public final getHeight()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN: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;->RE:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RN: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 if()I
+.method public final ii()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RF:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
@@ -769,10 +769,10 @@
     return v0
 .end method
 
-.method public final ig()I
+.method public final ij()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RF:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/a;->RO: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 9930e047f6..e65789bac0 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 RM:Lcom/facebook/cache/common/CacheKey;
+.field private final RV:Lcom/facebook/cache/common/CacheKey;
 
-.field private final RQ:I
+.field private final RZ: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;->RM:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:Lcom/facebook/cache/common/CacheKey;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RQ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ: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;->RQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RQ:I
+    iget v3, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ:I
 
     if-ne v1, v3, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RM:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RM:Lcom/facebook/cache/common/CacheKey;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/animated/c/c$a;->RV:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v1, p1}, Lcom/facebook/cache/common/CacheKey;->equals(Ljava/lang/Object;)Z
 
@@ -78,7 +78,7 @@
     return v2
 .end method
 
-.method public final fI()Ljava/lang/String;
+.method public final fL()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
@@ -91,7 +91,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RM:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV: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;->RQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ: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;->RM:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RV: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;->RQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/animated/c/c$a;->RZ: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 24bb3837ce..71649d74f5 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 Qq:Lcom/facebook/imagepipeline/cache/h;
+.field public final Qz: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 RM:Lcom/facebook/cache/common/CacheKey;
+.field private final RV:Lcom/facebook/cache/common/CacheKey;
 
-.field private final RN:Lcom/facebook/imagepipeline/cache/h$c;
+.field private final RW: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 RO:Ljava/util/LinkedHashSet;
+.field private final RX: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;->RM:Lcom/facebook/cache/common/CacheKey;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RV:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qz: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;->RO:Ljava/util/LinkedHashSet;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RX: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;->RN:Lcom/facebook/imagepipeline/cache/h$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RW:Lcom/facebook/imagepipeline/cache/h$c;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/animated/c/c$a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RM:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RV: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
 
@@ -103,7 +103,7 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->RO:Ljava/util/LinkedHashSet;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->RX:Ljava/util/LinkedHashSet;
 
     invoke-virtual {p2, p1}, Ljava/util/LinkedHashSet;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -115,7 +115,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->RO:Ljava/util/LinkedHashSet;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/c;->RX:Ljava/util/LinkedHashSet;
 
     invoke-virtual {p2, p1}, Ljava/util/LinkedHashSet;->remove(Ljava/lang/Object;)Z
     :try_end_1
@@ -150,13 +150,13 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c;->Qz:Lcom/facebook/imagepipeline/cache/h;
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/animated/c/c;->Z(I)Lcom/facebook/imagepipeline/animated/c/c$a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RN:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RW: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 ij()Lcom/facebook/cache/common/CacheKey;
+.method public final declared-synchronized im()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;->RO:Ljava/util/LinkedHashSet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/c;->RX:Ljava/util/LinkedHashSet;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashSet;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/a$1.smali b/com.discord/smali/com/facebook/imagepipeline/b/a$1.smali
index f9199478c1..2d4cfade4c 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/a$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic TK:Lcom/facebook/imagepipeline/d/a;
+.field final synthetic TT:Lcom/facebook/imagepipeline/d/a;
 
-.field final synthetic TL:Lcom/facebook/imagepipeline/b/a;
+.field final synthetic TU:Lcom/facebook/imagepipeline/b/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/b/a;Lcom/facebook/imagepipeline/d/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/a$1;->TL:Lcom/facebook/imagepipeline/b/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/a$1;->TU:Lcom/facebook/imagepipeline/b/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/a$1;->TK:Lcom/facebook/imagepipeline/d/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/a$1;->TT:Lcom/facebook/imagepipeline/d/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/h.smali b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
index a49397519d..ffa9272dcb 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/h.smali
@@ -4,65 +4,13 @@
 
 
 # static fields
-.field private static final TQ:Ljava/util/concurrent/CancellationException;
+.field private static final TZ:Ljava/util/concurrent/CancellationException;
 
 
 # instance fields
-.field private final TR:Lcom/facebook/imagepipeline/b/n;
+.field private final Ua:Lcom/facebook/imagepipeline/b/n;
 
-.field private final TS:Lcom/facebook/imagepipeline/h/c;
-
-.field private final TT:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final TU:Lcom/facebook/imagepipeline/cache/o;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/cache/o<",
-            "Lcom/facebook/cache/common/CacheKey;",
-            "Lcom/facebook/imagepipeline/g/c;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public final TV:Lcom/facebook/imagepipeline/cache/o;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/cache/o<",
-            "Lcom/facebook/cache/common/CacheKey;",
-            "Lcom/facebook/common/g/f;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final TW:Lcom/facebook/imagepipeline/cache/e;
-
-.field private final TX:Lcom/facebook/imagepipeline/cache/e;
-
-.field public final TY:Lcom/facebook/imagepipeline/cache/f;
-
-.field private final TZ:Lcom/facebook/imagepipeline/i/as;
-
-.field private final Ua:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private Ub:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final Ub:Lcom/facebook/imagepipeline/h/c;
 
 .field private final Uc:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
@@ -74,7 +22,59 @@
     .end annotation
 .end field
 
-.field private final Ud:Lcom/facebook/b/a;
+.field public final Ud:Lcom/facebook/imagepipeline/cache/o;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/cache/o<",
+            "Lcom/facebook/cache/common/CacheKey;",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public final Ue:Lcom/facebook/imagepipeline/cache/o;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/cache/o<",
+            "Lcom/facebook/cache/common/CacheKey;",
+            "Lcom/facebook/common/g/f;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final Uf:Lcom/facebook/imagepipeline/cache/e;
+
+.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
+
+.field public final Uh:Lcom/facebook/imagepipeline/cache/f;
+
+.field private final Ui:Lcom/facebook/imagepipeline/i/as;
+
+.field private final Uj:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private Uk:Ljava/util/concurrent/atomic/AtomicLong;
+
+.field private final Ul:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final Um:Lcom/facebook/b/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CancellationException;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/b/h;->TQ:Ljava/util/concurrent/CancellationException;
+    sput-object v0, Lcom/facebook/imagepipeline/b/h;->TZ:Ljava/util/concurrent/CancellationException;
 
     return-void
 .end method
@@ -140,35 +140,35 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Ub:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Uk:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->TR:Lcom/facebook/imagepipeline/b/n;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->Ua:Lcom/facebook/imagepipeline/b/n;
 
     new-instance p1, Lcom/facebook/imagepipeline/h/b;
 
     invoke-direct {p1, p2}, Lcom/facebook/imagepipeline/h/b;-><init>(Ljava/util/Set;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->TS:Lcom/facebook/imagepipeline/h/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/b/h;->TT:Lcom/facebook/common/d/l;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/b/h;->Uc:Lcom/facebook/common/d/l;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/b/h;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/b/h;->Ud:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/b/h;->TV:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/b/h;->Ue:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/b/h;->TW:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/b/h;->Uf:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/b/h;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/b/h;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/b/h;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/b/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p9, p0, Lcom/facebook/imagepipeline/b/h;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iput-object p9, p0, Lcom/facebook/imagepipeline/b/h;->Ui:Lcom/facebook/imagepipeline/i/as;
 
-    iput-object p10, p0, Lcom/facebook/imagepipeline/b/h;->Ua:Lcom/facebook/common/d/l;
+    iput-object p10, p0, Lcom/facebook/imagepipeline/b/h;->Uj:Lcom/facebook/common/d/l;
 
-    iput-object p11, p0, Lcom/facebook/imagepipeline/b/h;->Uc:Lcom/facebook/common/d/l;
+    iput-object p11, p0, Lcom/facebook/imagepipeline/b/h;->Ul:Lcom/facebook/common/d/l;
 
-    iput-object p12, p0, Lcom/facebook/imagepipeline/b/h;->Ud:Lcom/facebook/b/a;
+    iput-object p12, p0, Lcom/facebook/imagepipeline/b/h;->Um:Lcom/facebook/b/a;
 
     return-void
 .end method
@@ -202,7 +202,7 @@
 
     move-object v0, p2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 v2, 0x2
 
@@ -212,11 +212,11 @@
 
     if-nez p5, :cond_1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     if-nez v5, :cond_0
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     move-object v11, v2
 
@@ -227,11 +227,11 @@
 
     new-array v2, v2, [Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v6, v2, v4
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v6, v2, v3
 
@@ -240,7 +240,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     if-nez v5, :cond_2
 
@@ -248,7 +248,7 @@
 
     new-array v2, v2, [Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v6, v2, v4
 
@@ -265,13 +265,13 @@
 
     new-array v6, v6, [Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/h;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v7, v6, v4
 
     aput-object p5, v6, v3
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
 
     aput-object v7, v6, v2
 
@@ -282,7 +282,7 @@
 
     :goto_1
     :try_start_0
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
     move-object/from16 v5, p3
 
@@ -292,7 +292,7 @@
 
     new-instance v12, Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->Ub:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/h;->Uk:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -304,11 +304,11 @@
 
     const/4 v8, 0x0
 
-    iget-boolean v2, v0, Lcom/facebook/imagepipeline/request/b;->UF:Z
+    iget-boolean v2, v0, Lcom/facebook/imagepipeline/request/b;->UO:Z
 
     if-nez v2, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-static {v2}, Lcom/facebook/common/j/f;->c(Landroid/net/Uri;)Z
 
@@ -328,7 +328,7 @@
     const/4 v9, 0x1
 
     :goto_3
-    iget-object v10, v0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/request/b;->aaj:Lcom/facebook/imagepipeline/a/d;
 
     move-object v2, v12
 
@@ -342,7 +342,7 @@
 
     invoke-direct/range {v2 .. v10}, Lcom/facebook/imagepipeline/i/ap;-><init>(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Lcom/facebook/imagepipeline/i/am;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/b$b;ZZLcom/facebook/imagepipeline/a/d;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     new-instance v0, Lcom/facebook/imagepipeline/c/b;
 
@@ -350,12 +350,12 @@
 
     invoke-direct {v0, p1, v12, v11}, Lcom/facebook/imagepipeline/c/b;-><init>(Lcom/facebook/imagepipeline/i/aj;Lcom/facebook/imagepipeline/i/ap;Lcom/facebook/imagepipeline/h/c;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
@@ -374,12 +374,12 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
     :goto_4
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
@@ -408,15 +408,15 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->TR:Lcom/facebook/imagepipeline/b/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/h;->Ua:Lcom/facebook/imagepipeline/b/n;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/n;->b(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v2, :cond_0
 
@@ -425,7 +425,7 @@
     move-result-object v1
 
     :cond_0
-    iget-boolean v2, v0, Lcom/facebook/imagepipeline/b/n;->UL:Z
+    iget-boolean v2, v0, Lcom/facebook/imagepipeline/b/n;->UV:Z
 
     if-eqz v2, :cond_1
 
@@ -434,7 +434,7 @@
     move-result-object v1
 
     :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     move-object v0, p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/i$a.smali b/com.discord/smali/com/facebook/imagepipeline/b/i$a.smali
index 7fbc6afddf..75bb40eba8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/i$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/i$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field Ka:Ljava/util/Set;
+.field Kj:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,15 +25,38 @@
     .end annotation
 .end field
 
-.field PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field PK:Landroid/graphics/Bitmap$Config;
+.field PT:Landroid/graphics/Bitmap$Config;
 
-.field Qp:Lcom/facebook/imagepipeline/b/f;
+.field Qy:Lcom/facebook/imagepipeline/b/f;
 
-.field Sw:Lcom/facebook/imagepipeline/cache/m;
+.field SF:Lcom/facebook/imagepipeline/cache/m;
 
-.field TT:Lcom/facebook/common/d/l;
+.field UB:Lcom/facebook/imagepipeline/memory/ad;
+
+.field UC:Lcom/facebook/imagepipeline/e/e;
+
+.field UD:Z
+
+.field public UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+
+.field UF:Lcom/facebook/imagepipeline/e/d;
+
+.field UH:Z
+
+.field UI:Lcom/facebook/imagepipeline/d/a;
+
+.field UL:Ljava/lang/Integer;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field UM:I
+
+.field public final UN:Lcom/facebook/imagepipeline/b/j$a;
+
+.field Uc:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -43,20 +66,11 @@
     .end annotation
 .end field
 
-.field TY:Lcom/facebook/imagepipeline/cache/f;
+.field Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field UC:Ljava/lang/Integer;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
+.field Um:Lcom/facebook/b/a;
 
-.field UD:I
-
-.field public final UE:Lcom/facebook/imagepipeline/b/j$a;
-
-.field Ud:Lcom/facebook/b/a;
-
-.field public Uf:Lcom/facebook/common/d/l;
+.field public Uo:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -66,13 +80,13 @@
     .end annotation
 .end field
 
-.field Ug:Lcom/facebook/imagepipeline/cache/h$a;
+.field Up:Lcom/facebook/imagepipeline/cache/h$a;
 
-.field public Uh:Z
+.field public Uq:Z
 
-.field Ui:Lcom/facebook/imagepipeline/b/g;
+.field Ur:Lcom/facebook/imagepipeline/b/g;
 
-.field Uj:Lcom/facebook/common/d/l;
+.field Us:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -82,34 +96,20 @@
     .end annotation
 .end field
 
-.field Uk:Lcom/facebook/imagepipeline/e/c;
+.field Ut:Lcom/facebook/imagepipeline/e/c;
 
-.field Ul:Lcom/facebook/imagepipeline/k/d;
+.field Uu:Lcom/facebook/imagepipeline/k/d;
 
-.field Um:Ljava/lang/Integer;
+.field Uv:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+.field public Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-.field Uo:Lcom/facebook/common/g/b;
+.field Ux:Lcom/facebook/common/g/b;
 
-.field Uq:Lcom/facebook/imagepipeline/i/af;
-
-.field Us:Lcom/facebook/imagepipeline/memory/ad;
-
-.field Ut:Lcom/facebook/imagepipeline/e/e;
-
-.field Uu:Z
-
-.field public Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-.field Uw:Lcom/facebook/imagepipeline/e/d;
-
-.field Uy:Z
-
-.field Uz:Lcom/facebook/imagepipeline/d/a;
+.field Uz:Lcom/facebook/imagepipeline/i/af;
 
 .field final mContext:Landroid/content/Context;
 
@@ -122,35 +122,35 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uh:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uq:Z
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Um:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uv:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UC:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UL:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uu:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UD:Z
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UD:I
+    iput v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UM:I
 
     new-instance v1, Lcom/facebook/imagepipeline/b/j$a;
 
     invoke-direct {v1, p0}, Lcom/facebook/imagepipeline/b/j$a;-><init>(Lcom/facebook/imagepipeline/b/i$a;)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/imagepipeline/b/j$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i$a;->UN:Lcom/facebook/imagepipeline/b/j$a;
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uy:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UH:Z
 
     new-instance v0, Lcom/facebook/imagepipeline/d/b;
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/d/b;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->Uz:Lcom/facebook/imagepipeline/d/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i$a;->UI:Lcom/facebook/imagepipeline/d/a;
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -173,7 +173,7 @@
 
 
 # virtual methods
-.method public final iI()Lcom/facebook/imagepipeline/b/i;
+.method public final iL()Lcom/facebook/imagepipeline/b/i;
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/b/i;
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/i.smali b/com.discord/smali/com/facebook/imagepipeline/b/i.smali
index 4a2a1cc320..92ba9a93b0 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/i.smali
@@ -13,11 +13,11 @@
 
 
 # static fields
-.field private static UA:Lcom/facebook/imagepipeline/b/i$b;
+.field private static UJ:Lcom/facebook/imagepipeline/b/i$b;
 
 
 # instance fields
-.field final Ka:Ljava/util/Set;
+.field final Kj:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,18 +27,39 @@
     .end annotation
 .end field
 
-.field private final PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final PK:Landroid/graphics/Bitmap$Config;
+.field final PT:Landroid/graphics/Bitmap$Config;
 
-.field final Qp:Lcom/facebook/imagepipeline/b/f;
+.field final Qy:Lcom/facebook/imagepipeline/b/f;
 
-.field final Sw:Lcom/facebook/imagepipeline/cache/m;
+.field final SF:Lcom/facebook/imagepipeline/cache/m;
 
-.field final TT:Lcom/facebook/common/d/l;
+.field private final UA:I
+
+.field final UB:Lcom/facebook/imagepipeline/memory/ad;
+
+.field final UC:Lcom/facebook/imagepipeline/e/e;
+
+.field final UD:Z
+
+.field final UE:Lcom/facebook/cache/disk/DiskCacheConfig;
+
+.field final UF:Lcom/facebook/imagepipeline/e/d;
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field final UG:Lcom/facebook/imagepipeline/b/j;
+
+.field final UH:Z
+
+.field final UI:Lcom/facebook/imagepipeline/d/a;
+
+.field final Uc:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -48,14 +69,14 @@
     .end annotation
 .end field
 
-.field final TY:Lcom/facebook/imagepipeline/cache/f;
+.field final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field final Ud:Lcom/facebook/b/a;
+.field final Um:Lcom/facebook/b/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Uf:Lcom/facebook/common/d/l;
+.field final Uo:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -65,13 +86,13 @@
     .end annotation
 .end field
 
-.field final Ug:Lcom/facebook/imagepipeline/cache/h$a;
+.field final Up:Lcom/facebook/imagepipeline/cache/h$a;
 
-.field final Uh:Z
+.field final Uq:Z
 
-.field final Ui:Lcom/facebook/imagepipeline/b/g;
+.field final Ur:Lcom/facebook/imagepipeline/b/g;
 
-.field final Uj:Lcom/facebook/common/d/l;
+.field final Us:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -81,49 +102,28 @@
     .end annotation
 .end field
 
-.field final Uk:Lcom/facebook/imagepipeline/e/c;
+.field final Ut:Lcom/facebook/imagepipeline/e/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Ul:Lcom/facebook/imagepipeline/k/d;
+.field final Uu:Lcom/facebook/imagepipeline/k/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Um:Ljava/lang/Integer;
+.field final Uv:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+.field final Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-.field final Uo:Lcom/facebook/common/g/b;
+.field final Ux:Lcom/facebook/common/g/b;
 
-.field final Up:I
+.field final Uy:I
 
-.field final Uq:Lcom/facebook/imagepipeline/i/af;
-
-.field private final Ur:I
-
-.field final Us:Lcom/facebook/imagepipeline/memory/ad;
-
-.field final Ut:Lcom/facebook/imagepipeline/e/e;
-
-.field final Uu:Z
-
-.field final Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
-
-.field final Uw:Lcom/facebook/imagepipeline/e/d;
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field final Ux:Lcom/facebook/imagepipeline/b/j;
-
-.field final Uy:Z
-
-.field final Uz:Lcom/facebook/imagepipeline/d/a;
+.field final Uz:Lcom/facebook/imagepipeline/i/af;
 
 .field final mContext:Landroid/content/Context;
 
@@ -138,7 +138,7 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/b/i$b;-><init>(B)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/b/i;->UA:Lcom/facebook/imagepipeline/b/i$b;
+    sput-object v0, Lcom/facebook/imagepipeline/b/i;->UJ:Lcom/facebook/imagepipeline/b/i$b;
 
     return-void
 .end method
@@ -148,9 +148,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/imagepipeline/b/j$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UN:Lcom/facebook/imagepipeline/b/j$a;
 
     new-instance v1, Lcom/facebook/imagepipeline/b/j;
 
@@ -158,9 +158,9 @@
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/b/j;-><init>(Lcom/facebook/imagepipeline/b/j$a;B)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uf:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/d/l;
 
     if-nez v0, :cond_0
 
@@ -181,12 +181,12 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uf:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/d/l;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uf:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uo:Lcom/facebook/common/d/l;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ug:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Up:Lcom/facebook/imagepipeline/cache/h$a;
 
     if-nez v0, :cond_1
 
@@ -197,12 +197,12 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ug:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Up:Lcom/facebook/imagepipeline/cache/h$a;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ug:Lcom/facebook/imagepipeline/cache/h$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/cache/h$a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PT:Landroid/graphics/Bitmap$Config;
 
     if-nez v0, :cond_2
 
@@ -211,26 +211,26 @@
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PT:Landroid/graphics/Bitmap$Config;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PK:Landroid/graphics/Bitmap$Config;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PT:Landroid/graphics/Bitmap$Config;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->is()Lcom/facebook/imagepipeline/cache/i;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/i;->iv()Lcom/facebook/imagepipeline/cache/i;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     :goto_3
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->mContext:Landroid/content/Context;
 
@@ -242,7 +242,7 @@
 
     iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->mContext:Landroid/content/Context;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ui:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ur:Lcom/facebook/imagepipeline/b/g;
 
     if-nez v0, :cond_4
 
@@ -257,16 +257,16 @@
     goto :goto_4
 
     :cond_4
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ui:Lcom/facebook/imagepipeline/b/g;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ur:Lcom/facebook/imagepipeline/b/g;
 
     :goto_4
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ui:Lcom/facebook/imagepipeline/b/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ur:Lcom/facebook/imagepipeline/b/g;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uh:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Uh:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Uq:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uj:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us:Lcom/facebook/common/d/l;
 
     if-nez v0, :cond_5
 
@@ -277,36 +277,36 @@
     goto :goto_5
 
     :cond_5
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uj:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us:Lcom/facebook/common/d/l;
 
     :goto_5
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uj:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/common/d/l;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SF:Lcom/facebook/imagepipeline/cache/m;
 
     if-nez v0, :cond_6
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->it()Lcom/facebook/imagepipeline/cache/r;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/r;->iw()Lcom/facebook/imagepipeline/cache/r;
 
     move-result-object v0
 
     goto :goto_6
 
     :cond_6
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->SF:Lcom/facebook/imagepipeline/cache/m;
 
     :goto_6
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Um:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Ljava/lang/Integer;
 
     if-nez v0, :cond_7
 
@@ -323,11 +323,11 @@
 
     :cond_8
     :goto_7
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     goto :goto_8
 
@@ -335,13 +335,13 @@
     const/4 v0, 0x0
 
     :goto_8
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uu:Lcom/facebook/imagepipeline/k/d;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Um:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Ljava/lang/Integer;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Um:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uv:Ljava/lang/Integer;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TT:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uc:Lcom/facebook/common/d/l;
 
     if-nez v0, :cond_a
 
@@ -352,12 +352,12 @@
     goto :goto_9
 
     :cond_a
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->TT:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uc:Lcom/facebook/common/d/l;
 
     :goto_9
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->TT:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uc:Lcom/facebook/common/d/l;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     if-nez v0, :cond_b
 
@@ -370,34 +370,34 @@
     goto :goto_a
 
     :cond_b
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     :goto_a
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ux:Lcom/facebook/common/g/b;
 
     if-nez v0, :cond_c
 
-    invoke-static {}, Lcom/facebook/common/g/c;->gi()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->gl()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
     goto :goto_b
 
     :cond_c
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uo:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ux:Lcom/facebook/common/g/b;
 
     :goto_b
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uo:Lcom/facebook/common/g/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->UC:Ljava/lang/Integer;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->UL:Ljava/lang/Integer;
 
     if-eqz v1, :cond_d
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UC:Ljava/lang/Integer;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UL:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -406,7 +406,7 @@
     goto :goto_c
 
     :cond_d
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UR:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->Va:Z
 
     if-eqz v0, :cond_e
 
@@ -418,9 +418,9 @@
     const/4 v0, 0x0
 
     :goto_c
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Up:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Uy:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UD:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UM:I
 
     if-gez v0, :cond_f
 
@@ -429,38 +429,38 @@
     goto :goto_d
 
     :cond_f
-    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UD:I
+    iget v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UM:I
 
     :goto_d
-    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->Ur:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/i;->UA:I
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     if-nez v0, :cond_10
 
     new-instance v0, Lcom/facebook/imagepipeline/i/t;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/b/i;->Ur:I
+    iget v1, p0, Lcom/facebook/imagepipeline/b/i;->UA:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/i/t;-><init>(I)V
 
     goto :goto_e
 
     :cond_10
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     :goto_e
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uz:Lcom/facebook/imagepipeline/i/af;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
     if-nez v0, :cond_11
 
@@ -479,12 +479,12 @@
     goto :goto_f
 
     :cond_11
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
     :goto_f
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UC:Lcom/facebook/imagepipeline/e/e;
 
     if-nez v0, :cond_12
 
@@ -495,12 +495,12 @@
     goto :goto_10
 
     :cond_12
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UC:Lcom/facebook/imagepipeline/e/e;
 
     :goto_10
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ka:Ljava/util/Set;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Kj:Ljava/util/Set;
 
     if-nez v0, :cond_13
 
@@ -511,40 +511,40 @@
     goto :goto_11
 
     :cond_13
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ka:Ljava/util/Set;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Kj:Ljava/util/Set;
 
     :goto_11
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ka:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Kj:Ljava/util/Set;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uu:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UD:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Uu:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->UD:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     if-nez v0, :cond_14
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     goto :goto_12
 
     :cond_14
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
 
     :goto_12
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uw:Lcom/facebook/imagepipeline/e/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UF:Lcom/facebook/imagepipeline/e/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/imagepipeline/e/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/ad;->jT()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qy:Lcom/facebook/imagepipeline/b/f;
 
     if-nez v1, :cond_15
 
@@ -555,53 +555,53 @@
     goto :goto_13
 
     :cond_15
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i$a;->Qy:Lcom/facebook/imagepipeline/b/f;
 
     :goto_13
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Uy:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/i$a;->UH:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->Uy:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i;->UH:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Ud:Lcom/facebook/b/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/i$a;->Um:Lcom/facebook/b/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Ud:Lcom/facebook/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/i;->Um:Lcom/facebook/b/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i$a;->Uz:Lcom/facebook/imagepipeline/d/a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i$a;->UI:Lcom/facebook/imagepipeline/d/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i;->Uz:Lcom/facebook/imagepipeline/d/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UI:Lcom/facebook/imagepipeline/d/a;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UJ:Lcom/facebook/common/k/b;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UT: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/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/bitmaps/d;-><init>(Lcom/facebook/imagepipeline/memory/ad;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
     invoke-static {p1, v1, v0}, Lcom/facebook/imagepipeline/b/i;->a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/j;Lcom/facebook/common/k/a;)V
 
     goto :goto_14
 
     :cond_16
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j;->UG:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j;->UQ:Z
 
     if-eqz p1, :cond_17
 
-    sget-boolean p1, Lcom/facebook/common/k/c;->Ja:Z
+    sget-boolean p1, Lcom/facebook/common/k/c;->Jj:Z
 
     if-eqz p1, :cond_17
 
-    invoke-static {}, Lcom/facebook/common/k/c;->gz()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->gC()Lcom/facebook/common/k/b;
 
     move-result-object p1
 
@@ -609,17 +609,17 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/bitmaps/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/bitmaps/d;-><init>(Lcom/facebook/imagepipeline/memory/ad;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
     invoke-static {p1, v1, v0}, Lcom/facebook/imagepipeline/b/i;->a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/j;Lcom/facebook/common/k/a;)V
 
     :cond_17
     :goto_14
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -635,9 +635,9 @@
 .method private static a(Lcom/facebook/common/k/b;Lcom/facebook/imagepipeline/b/j;Lcom/facebook/common/k/a;)V
     .locals 0
 
-    sput-object p0, Lcom/facebook/common/k/c;->Jd:Lcom/facebook/common/k/b;
+    sput-object p0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UH:Lcom/facebook/common/k/b$a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/j;->UR:Lcom/facebook/common/k/b$a;
 
     if-eqz p1, :cond_0
 
@@ -649,10 +649,10 @@
     return-void
 .end method
 
-.method public static iH()Lcom/facebook/imagepipeline/b/i$b;
+.method public static iK()Lcom/facebook/imagepipeline/b/i$b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/b/i;->UA:Lcom/facebook/imagepipeline/b/i$b;
+    sget-object v0, Lcom/facebook/imagepipeline/b/i;->UJ:Lcom/facebook/imagepipeline/b/i$b;
 
     return-object v0
 .end method
@@ -661,26 +661,26 @@
     .locals 0
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p0}, Lcom/facebook/cache/disk/DiskCacheConfig;->x(Landroid/content/Context;)Lcom/facebook/cache/disk/DiskCacheConfig$a;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/facebook/cache/disk/DiskCacheConfig$a;->fR()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
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p0
 
     :catchall_0
     move-exception p0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/b/k.smali b/com.discord/smali/com/facebook/imagepipeline/b/k.smali
index 9503b75457..13bafb9421 100644
--- a/com.discord/smali/com/facebook/imagepipeline/b/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/b/k.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,27 +13,31 @@
     .end annotation
 .end field
 
-.field private static UW:Lcom/facebook/imagepipeline/b/k;
+.field private static Vf:Lcom/facebook/imagepipeline/b/k;
 
 
 # instance fields
-.field private Kd:Lcom/facebook/imagepipeline/b/h;
+.field private Km:Lcom/facebook/imagepipeline/b/h;
 
-.field private PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final RZ:Lcom/facebook/imagepipeline/b/a;
+.field private final Si:Lcom/facebook/imagepipeline/b/a;
 
-.field private TR:Lcom/facebook/imagepipeline/b/n;
+.field private Ua:Lcom/facebook/imagepipeline/b/n;
 
-.field private TW:Lcom/facebook/imagepipeline/cache/e;
+.field private Uf:Lcom/facebook/imagepipeline/cache/e;
 
-.field private TX:Lcom/facebook/imagepipeline/cache/e;
+.field private Ug:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final TZ:Lcom/facebook/imagepipeline/i/as;
+.field private final Ui:Lcom/facebook/imagepipeline/i/as;
 
-.field private final UX:Lcom/facebook/imagepipeline/b/i;
+.field private Ut:Lcom/facebook/imagepipeline/e/c;
 
-.field private UY:Lcom/facebook/imagepipeline/cache/h;
+.field private Uu:Lcom/facebook/imagepipeline/k/d;
+
+.field private final Vg:Lcom/facebook/imagepipeline/b/i;
+
+.field private Vh:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -44,7 +48,7 @@
     .end annotation
 .end field
 
-.field private UZ:Lcom/facebook/imagepipeline/cache/n;
+.field private Vi:Lcom/facebook/imagepipeline/cache/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/n<",
@@ -55,11 +59,7 @@
     .end annotation
 .end field
 
-.field private Uk:Lcom/facebook/imagepipeline/e/c;
-
-.field private Ul:Lcom/facebook/imagepipeline/k/d;
-
-.field private Va:Lcom/facebook/imagepipeline/cache/h;
+.field private Vj:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -70,7 +70,7 @@
     .end annotation
 .end field
 
-.field private Vb:Lcom/facebook/imagepipeline/cache/n;
+.field private Vk:Lcom/facebook/imagepipeline/cache/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/n<",
@@ -81,15 +81,15 @@
     .end annotation
 .end field
 
-.field private Vc:Lcom/facebook/cache/disk/h;
+.field private Vl:Lcom/facebook/cache/disk/h;
 
-.field private Vd:Lcom/facebook/imagepipeline/b/m;
+.field private Vm:Lcom/facebook/imagepipeline/b/m;
 
-.field private Ve:Lcom/facebook/cache/disk/h;
+.field private Vn:Lcom/facebook/cache/disk/h;
 
-.field private Vf:Lcom/facebook/imagepipeline/platform/f;
+.field private Vo:Lcom/facebook/imagepipeline/platform/f;
 
-.field private Vg:Lcom/facebook/imagepipeline/animated/b/a;
+.field private Vp:Lcom/facebook/imagepipeline/animated/b/a;
 
 
 # direct methods
@@ -98,7 +98,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/b/k;
 
-    sput-object v0, Lcom/facebook/imagepipeline/b/k;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/b/k;->GI:Ljava/lang/Class;
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -116,29 +116,29 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/b/i;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
     new-instance v0, Lcom/facebook/imagepipeline/i/as;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iG()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iJ()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/i/as;-><init>(Ljava/util/concurrent/Executor;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ui:Lcom/facebook/imagepipeline/i/as;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/a;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->Uz:Lcom/facebook/imagepipeline/d/a;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/b/i;->UI:Lcom/facebook/imagepipeline/d/a;
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/b/a;-><init>(Lcom/facebook/imagepipeline/d/a;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Si:Lcom/facebook/imagepipeline/b/a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -151,11 +151,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/b/k;->UW:Lcom/facebook/imagepipeline/b/k;
+    sget-object v1, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/b/k;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/imagepipeline/b/k;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/b/k;->GI:Ljava/lang/Class;
 
     const-string v2, "ImagePipelineFactory has already been initialized! `ImagePipelineFactory.initialize(...)` should only be called once to avoid unexpected behavior."
 
@@ -166,7 +166,7 @@
 
     invoke-direct {v1, p0}, Lcom/facebook/imagepipeline/b/k;-><init>(Lcom/facebook/imagepipeline/b/i;)V
 
-    sput-object v1, Lcom/facebook/imagepipeline/b/k;->UW:Lcom/facebook/imagepipeline/b/k;
+    sput-object v1, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/b/k;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -182,10 +182,10 @@
     throw p0
 .end method
 
-.method public static iJ()Lcom/facebook/imagepipeline/b/k;
+.method public static iM()Lcom/facebook/imagepipeline/b/k;
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/b/k;->UW:Lcom/facebook/imagepipeline/b/k;
+    sget-object v0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/b/k;
 
     const-string v1, "ImagePipelineFactory was not initialized!"
 
@@ -198,7 +198,7 @@
     return-object v0
 .end method
 
-.method private iL()Lcom/facebook/imagepipeline/cache/h;
+.method private iO()Lcom/facebook/imagepipeline/cache/h;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -210,31 +210,31 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UY:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/imagepipeline/cache/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uf:Lcom/facebook/common/d/l;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uo:Lcom/facebook/common/d/l;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ug:Lcom/facebook/imagepipeline/cache/h$a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Up:Lcom/facebook/imagepipeline/cache/h$a;
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/cache/a;->a(Lcom/facebook/common/d/l;Lcom/facebook/imagepipeline/cache/h$a;)Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UY:Lcom/facebook/imagepipeline/cache/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/imagepipeline/cache/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UY:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vh:Lcom/facebook/imagepipeline/cache/h;
 
     return-object v0
 .end method
 
-.method private iM()Lcom/facebook/imagepipeline/cache/n;
+.method private iP()Lcom/facebook/imagepipeline/cache/n;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -246,17 +246,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UZ:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/cache/n;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iL()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
 
     new-instance v2, Lcom/facebook/imagepipeline/cache/b$1;
 
@@ -266,15 +266,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/k;->UZ:Lcom/facebook/imagepipeline/cache/n;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/cache/n;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UZ:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vi:Lcom/facebook/imagepipeline/cache/n;
 
     return-object v0
 .end method
 
-.method private iN()Lcom/facebook/imagepipeline/cache/n;
+.method private iQ()Lcom/facebook/imagepipeline/cache/n;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -286,17 +286,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vb:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/cache/n;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Va:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/imagepipeline/cache/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uj:Lcom/facebook/common/d/l;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/common/d/l;
 
     new-instance v1, Lcom/facebook/imagepipeline/cache/k$1;
 
@@ -310,14 +310,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/l;)V
 
-    iput-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Va:Lcom/facebook/imagepipeline/cache/h;
+    iput-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/imagepipeline/cache/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Va:Lcom/facebook/imagepipeline/cache/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vj:Lcom/facebook/imagepipeline/cache/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->SF:Lcom/facebook/imagepipeline/cache/m;
 
     new-instance v2, Lcom/facebook/imagepipeline/cache/l$1;
 
@@ -327,201 +327,201 @@
 
     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/k;->Vb:Lcom/facebook/imagepipeline/cache/n;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/cache/n;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vb:Lcom/facebook/imagepipeline/cache/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vk:Lcom/facebook/imagepipeline/cache/n;
 
     return-object v0
 .end method
 
-.method private iO()Lcom/facebook/imagepipeline/cache/e;
+.method private iR()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TW:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uf: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/k;->Vc:Lcom/facebook/cache/disk/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vl:Lcom/facebook/cache/disk/h;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Un:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->Ui:Lcom/facebook/imagepipeline/b/g;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->Ur:Lcom/facebook/imagepipeline/b/g;
 
     invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/b/g;->a(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/cache/disk/h;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/cache/disk/h;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vl:Lcom/facebook/cache/disk/h;
 
     :cond_0
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vc:Lcom/facebook/cache/disk/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vl:Lcom/facebook/cache/disk/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Up:I
+    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Uy:I
 
     invoke-virtual {v1, v3}, Lcom/facebook/imagepipeline/memory/ad;->aw(I)Lcom/facebook/common/g/g;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jS()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jV()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iG()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->SF: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/k;->TW:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uf:Lcom/facebook/imagepipeline/cache/e;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TW:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uf:Lcom/facebook/imagepipeline/cache/e;
 
     return-object v0
 .end method
 
-.method private iP()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.method private iS()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iT()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Si:Lcom/facebook/imagepipeline/b/a;
 
     invoke-static {v0, v1, v2}, Lcom/facebook/imagepipeline/bitmaps/f;->a(Lcom/facebook/imagepipeline/memory/ad;Lcom/facebook/imagepipeline/platform/f;Lcom/facebook/imagepipeline/b/a;)Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     return-object v0
 .end method
 
-.method private iQ()Lcom/facebook/imagepipeline/platform/f;
+.method private iT()Lcom/facebook/imagepipeline/platform/f;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vo:Lcom/facebook/imagepipeline/platform/f;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->UU:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->Vd:Z
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/platform/g;->a(Lcom/facebook/imagepipeline/memory/ad;Z)Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/platform/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vo:Lcom/facebook/imagepipeline/platform/f;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vf:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vo:Lcom/facebook/imagepipeline/platform/f;
 
     return-object v0
 .end method
 
-.method private iR()Lcom/facebook/imagepipeline/b/m;
+.method private iU()Lcom/facebook/imagepipeline/b/m;
     .locals 23
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     if-nez v1, :cond_4
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/b/j;->UT:Lcom/facebook/imagepipeline/b/j$c;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/b/j;->Vc:Lcom/facebook/imagepipeline/b/j$c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
     iget-object v3, v1, Lcom/facebook/imagepipeline/b/i;->mContext:Landroid/content/Context;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jT()Lcom/facebook/common/g/a;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jW()Lcom/facebook/common/g/a;
 
     move-result-object v4
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
 
     goto :goto_1
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iK()Lcom/facebook/imagepipeline/animated/b/a;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object v1
 
@@ -529,17 +529,17 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->PT:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {v1, v5}, Lcom/facebook/imagepipeline/animated/b/a;->a(Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/e/c;
 
     move-result-object v5
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->PT:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {v1, v6}, Lcom/facebook/imagepipeline/animated/b/a;->b(Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/e/c;
 
@@ -551,152 +551,152 @@
     move-object v1, v5
 
     :goto_0
-    iget-object v6, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/imagepipeline/e/d;
+    iget-object v6, v6, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
 
     if-nez v6, :cond_2
 
     new-instance v6, Lcom/facebook/imagepipeline/e/b;
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iT()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v7
 
     invoke-direct {v6, v5, v1, v7}, Lcom/facebook/imagepipeline/e/b;-><init>(Lcom/facebook/imagepipeline/e/c;Lcom/facebook/imagepipeline/e/c;Lcom/facebook/imagepipeline/platform/f;)V
 
-    iput-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iput-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
 
     goto :goto_1
 
     :cond_2
     new-instance v6, Lcom/facebook/imagepipeline/e/b;
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/platform/f;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iT()Lcom/facebook/imagepipeline/platform/f;
 
     move-result-object v7
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v8, v8, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/imagepipeline/e/d;
+    iget-object v8, v8, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
 
-    iget-object v8, v8, Lcom/facebook/imagepipeline/e/d;->VH:Ljava/util/Map;
+    iget-object v8, v8, Lcom/facebook/imagepipeline/e/d;->VQ:Ljava/util/Map;
 
     invoke-direct {v6, v5, v1, v7, v8}, Lcom/facebook/imagepipeline/e/b;-><init>(Lcom/facebook/imagepipeline/e/c;Lcom/facebook/imagepipeline/e/c;Lcom/facebook/imagepipeline/platform/f;Ljava/util/Map;)V
 
-    iput-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iput-object v6, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    invoke-static {}, Lcom/facebook/e/d;->ie()Lcom/facebook/e/d;
+    invoke-static {}, Lcom/facebook/e/d;->ih()Lcom/facebook/e/d;
 
     move-result-object v1
 
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->Uw:Lcom/facebook/imagepipeline/e/d;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/b/i;->UF:Lcom/facebook/imagepipeline/e/d;
 
-    iget-object v5, v5, Lcom/facebook/imagepipeline/e/d;->VI:Ljava/util/List;
+    iget-object v5, v5, Lcom/facebook/imagepipeline/e/d;->VR:Ljava/util/List;
 
-    iput-object v5, v1, Lcom/facebook/e/d;->Re:Ljava/util/List;
+    iput-object v5, v1, Lcom/facebook/e/d;->Rn:Ljava/util/List;
 
-    invoke-virtual {v1}, Lcom/facebook/e/d;->ic()V
+    invoke-virtual {v1}, Lcom/facebook/e/d;->ig()V
 
     :cond_3
     :goto_1
-    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v5, v0, Lcom/facebook/imagepipeline/b/k;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/b/i;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/b/i;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v7, v1, Lcom/facebook/imagepipeline/b/i;->Uh:Z
+    iget-boolean v7, v1, Lcom/facebook/imagepipeline/b/i;->Uq:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->Uu:Z
+    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->UD:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v9, v1, Lcom/facebook/imagepipeline/b/j;->UI:Z
+    iget-boolean v9, v1, Lcom/facebook/imagepipeline/b/j;->US:Z
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v10, v1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v10, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v11, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v11, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget v11, v11, Lcom/facebook/imagepipeline/b/i;->Up:I
+    iget v11, v11, Lcom/facebook/imagepipeline/b/i;->Uy:I
 
     invoke-virtual {v1, v11}, Lcom/facebook/imagepipeline/memory/ad;->aw(I)Lcom/facebook/common/g/g;
 
     move-result-object v11
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v12
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v13
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v14
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iU()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iX()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v15
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     move-object/from16 v16, v1
 
-    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct/range {p0 .. p0}, Lcom/facebook/imagepipeline/b/k;->iS()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v17
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UM:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UW:I
 
     move/from16 v18, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UN:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UX:I
 
     move/from16 v19, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->UO:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/j;->UY:Z
 
     move/from16 v20, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UQ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ:I
 
     move/from16 v21, v1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Si:Lcom/facebook/imagepipeline/b/a;
 
     move-object/from16 v22, v1
 
@@ -704,15 +704,15 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     :cond_4
-    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/b/k;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     return-object v1
 .end method
 
-.method private iS()Lcom/facebook/imagepipeline/b/n;
+.method private iV()Lcom/facebook/imagepipeline/b/n;
     .locals 13
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -721,11 +721,11 @@
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UL:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UV:Z
 
     if-eqz v0, :cond_0
 
@@ -741,13 +741,13 @@
     const/4 v9, 0x0
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TR:Lcom/facebook/imagepipeline/b/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ua:Lcom/facebook/imagepipeline/b/n;
 
     if-nez v0, :cond_1
 
     new-instance v0, Lcom/facebook/imagepipeline/b/n;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->mContext:Landroid/content/Context;
 
@@ -759,41 +759,41 @@
 
     move-result-object v2
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/b/m;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iU()Lcom/facebook/imagepipeline/b/m;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->Uz:Lcom/facebook/imagepipeline/i/af;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v5, v1, Lcom/facebook/imagepipeline/b/i;->Uu:Z
+    iget-boolean v5, v1, Lcom/facebook/imagepipeline/b/i;->UD:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v6, v1, Lcom/facebook/imagepipeline/b/j;->UG:Z
+    iget-boolean v6, v1, Lcom/facebook/imagepipeline/b/j;->UQ:Z
 
-    iget-object v7, p0, Lcom/facebook/imagepipeline/b/k;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iget-object v7, p0, Lcom/facebook/imagepipeline/b/k;->Ui:Lcom/facebook/imagepipeline/i/as;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->Uh:Z
+    iget-boolean v8, v1, Lcom/facebook/imagepipeline/b/i;->Uq:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v10, v1, Lcom/facebook/imagepipeline/b/j;->US:Z
+    iget-boolean v10, v1, Lcom/facebook/imagepipeline/b/j;->Vb:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/i;->Uy:Z
+    iget-boolean v11, v1, Lcom/facebook/imagepipeline/b/i;->UH:Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iV()Lcom/facebook/imagepipeline/k/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iY()Lcom/facebook/imagepipeline/k/d;
 
     move-result-object v12
 
@@ -801,177 +801,177 @@
 
     invoke-direct/range {v1 .. v12}, Lcom/facebook/imagepipeline/b/n;-><init>(Landroid/content/ContentResolver;Lcom/facebook/imagepipeline/b/m;Lcom/facebook/imagepipeline/i/af;ZZLcom/facebook/imagepipeline/i/as;ZZZZLcom/facebook/imagepipeline/k/d;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TR:Lcom/facebook/imagepipeline/b/n;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ua:Lcom/facebook/imagepipeline/b/n;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TR:Lcom/facebook/imagepipeline/b/n;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ua:Lcom/facebook/imagepipeline/b/n;
 
     return-object v0
 .end method
 
-.method private iT()Lcom/facebook/cache/disk/h;
+.method private iW()Lcom/facebook/cache/disk/h;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ve:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vn:Lcom/facebook/cache/disk/h;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uv:Lcom/facebook/cache/disk/DiskCacheConfig;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UE:Lcom/facebook/cache/disk/DiskCacheConfig;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ui:Lcom/facebook/imagepipeline/b/g;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ur:Lcom/facebook/imagepipeline/b/g;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/b/g;->a(Lcom/facebook/cache/disk/DiskCacheConfig;)Lcom/facebook/cache/disk/h;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ve:Lcom/facebook/cache/disk/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vn:Lcom/facebook/cache/disk/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ve:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vn:Lcom/facebook/cache/disk/h;
 
     return-object v0
 .end method
 
-.method private iU()Lcom/facebook/imagepipeline/cache/e;
+.method private iX()Lcom/facebook/imagepipeline/cache/e;
     .locals 8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ug: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/k;->iT()Lcom/facebook/cache/disk/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iW()Lcom/facebook/cache/disk/h;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Up:I
+    iget v3, v3, Lcom/facebook/imagepipeline/b/i;->Uy:I
 
     invoke-virtual {v1, v3}, Lcom/facebook/imagepipeline/memory/ad;->aw(I)Lcom/facebook/common/g/g;
 
     move-result-object v3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Us:Lcom/facebook/imagepipeline/memory/ad;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UB:Lcom/facebook/imagepipeline/memory/ad;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jS()Lcom/facebook/common/g/j;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/memory/ad;->jV()Lcom/facebook/common/g/j;
 
     move-result-object v4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v5
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iD()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iG()Ljava/util/concurrent/Executor;
 
     move-result-object v6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object v7, v1, Lcom/facebook/imagepipeline/b/i;->SF: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/k;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
     return-object v0
 .end method
 
-.method private iV()Lcom/facebook/imagepipeline/k/d;
+.method private iY()Lcom/facebook/imagepipeline/k/d;
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Um:Ljava/lang/Integer;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Uv:Ljava/lang/Integer;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->UR:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/j;->Va:Z
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/k/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UQ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/k/h;-><init>(I)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     goto :goto_0
 
     :cond_0
     new-instance v0, Lcom/facebook/imagepipeline/k/f;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UQ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/b/j;->UZ:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v2, v2, Lcom/facebook/imagepipeline/b/j;->UK:Z
+    iget-boolean v2, v2, Lcom/facebook/imagepipeline/b/j;->UU:Z
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->Uu:Lcom/facebook/imagepipeline/k/d;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/b/i;->Um:Ljava/lang/Integer;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/b/i;->Uv:Ljava/lang/Integer;
 
     invoke-direct {v0, v1, v2, v3, v4}, Lcom/facebook/imagepipeline/k/f;-><init>(IZLcom/facebook/imagepipeline/k/d;Ljava/lang/Integer;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     return-object v0
 .end method
@@ -984,19 +984,19 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p0}, Lcom/facebook/imagepipeline/b/i;->z(Landroid/content/Context;)Lcom/facebook/imagepipeline/b/i$a;
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/b/i$a;->iI()Lcom/facebook/imagepipeline/b/i;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/b/i$a;->iL()Lcom/facebook/imagepipeline/b/i;
 
     move-result-object p0
 
     invoke-static {p0}, Lcom/facebook/imagepipeline/b/k;->a(Lcom/facebook/imagepipeline/b/i;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1014,52 +1014,52 @@
 
 
 # virtual methods
-.method public final gO()Lcom/facebook/imagepipeline/b/h;
+.method public final gR()Lcom/facebook/imagepipeline/b/h;
     .locals 14
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Km:Lcom/facebook/imagepipeline/b/h;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/b/h;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iS()Lcom/facebook/imagepipeline/b/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iV()Lcom/facebook/imagepipeline/b/n;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ka:Ljava/util/Set;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Kj: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/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->TT:Lcom/facebook/common/d/l;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/b/i;->Uc:Lcom/facebook/common/d/l;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iM()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v5
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iN()Lcom/facebook/imagepipeline/cache/n;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iQ()Lcom/facebook/imagepipeline/cache/n;
 
     move-result-object v6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iR()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v7
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iU()Lcom/facebook/imagepipeline/cache/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iX()Lcom/facebook/imagepipeline/cache/e;
 
     move-result-object v8
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v9, v1, Lcom/facebook/imagepipeline/b/i;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v9, v1, Lcom/facebook/imagepipeline/b/i;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v10, p0, Lcom/facebook/imagepipeline/b/k;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iget-object v10, p0, Lcom/facebook/imagepipeline/b/k;->Ui:Lcom/facebook/imagepipeline/i/as;
 
     sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -1067,63 +1067,63 @@
 
     move-result-object v11
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-object v12, v1, Lcom/facebook/imagepipeline/b/j;->Uc:Lcom/facebook/common/d/l;
+    iget-object v12, v1, Lcom/facebook/imagepipeline/b/j;->Ul:Lcom/facebook/common/d/l;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v13, v1, Lcom/facebook/imagepipeline/b/i;->Ud:Lcom/facebook/b/a;
+    iget-object v13, v1, Lcom/facebook/imagepipeline/b/i;->Um:Lcom/facebook/b/a;
 
     move-object v1, v0
 
     invoke-direct/range {v1 .. v13}, Lcom/facebook/imagepipeline/b/h;-><init>(Lcom/facebook/imagepipeline/b/n;Ljava/util/Set;Lcom/facebook/common/d/l;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/i/as;Lcom/facebook/common/d/l;Lcom/facebook/common/d/l;Lcom/facebook/b/a;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Km:Lcom/facebook/imagepipeline/b/h;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Kd:Lcom/facebook/imagepipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Km:Lcom/facebook/imagepipeline/b/h;
 
     return-object v0
 .end method
 
-.method public final iK()Lcom/facebook/imagepipeline/animated/b/a;
+.method public final iN()Lcom/facebook/imagepipeline/animated/b/a;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/animated/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vp:Lcom/facebook/imagepipeline/animated/b/a;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iP()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iS()Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/i;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iL()Lcom/facebook/imagepipeline/cache/h;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/k;->iO()Lcom/facebook/imagepipeline/cache/h;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->UX:Lcom/facebook/imagepipeline/b/i;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/b/i;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->Ux:Lcom/facebook/imagepipeline/b/j;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/i;->UG:Lcom/facebook/imagepipeline/b/j;
 
-    iget-boolean v3, v3, Lcom/facebook/imagepipeline/b/j;->Qr:Z
+    iget-boolean v3, v3, Lcom/facebook/imagepipeline/b/j;->QA:Z
 
     invoke-static {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/animated/b/b;->a(Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Lcom/facebook/imagepipeline/b/f;Lcom/facebook/imagepipeline/cache/h;Z)Lcom/facebook/imagepipeline/animated/b/a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/animated/b/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vp:Lcom/facebook/imagepipeline/animated/b/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vg:Lcom/facebook/imagepipeline/animated/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/k;->Vp: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 9a62318e32..8a5b2a8906 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 VB:Lcom/facebook/imagepipeline/c/a;
+.field final synthetic VK: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;->VB:Lcom/facebook/imagepipeline/c/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/c/a$1;->VK:Lcom/facebook/imagepipeline/c/a;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/b;-><init>()V
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VB:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VK:Lcom/facebook/imagepipeline/c/a;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/c/a;->a(Ljava/lang/Object;I)V
 
@@ -60,19 +60,19 @@
 .method public final h(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VB:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VK: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 jg()V
+.method public final jj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VB:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VK:Lcom/facebook/imagepipeline/c/a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/c/a;->jg()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/c/a;->jj()V
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method public final n(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VB:Lcom/facebook/imagepipeline/c/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a$1;->VK: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 11348a58d1..894c30c08c 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 TS:Lcom/facebook/imagepipeline/h/c;
+.field private final Ub:Lcom/facebook/imagepipeline/h/c;
 
-.field private final VA:Lcom/facebook/imagepipeline/i/ap;
+.field private final VJ:Lcom/facebook/imagepipeline/i/ap;
 
 
 # direct methods
@@ -37,37 +37,37 @@
 
     invoke-direct {p0}, Lcom/facebook/c/a;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/c/a;->TS:Lcom/facebook/imagepipeline/h/c;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/c/a;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v0, p2, Lcom/facebook/imagepipeline/i/d;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p2, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Kp:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Ky:Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
     iget-object v2, v2, Lcom/facebook/imagepipeline/i/d;->mId:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ap;->ka()Z
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ap;->kd()Z
 
     move-result v3
 
     invoke-interface {p3, v0, v1, v2, v3}, Lcom/facebook/imagepipeline/h/c;->a(Lcom/facebook/imagepipeline/request/b;Ljava/lang/Object;Ljava/lang/String;Z)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     new-instance p3, Lcom/facebook/imagepipeline/c/a$1;
 
@@ -75,9 +75,9 @@
 
     invoke-interface {p1, p3, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
@@ -91,19 +91,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
     iget-object v2, v2, Lcom/facebook/imagepipeline/i/d;->mId:Ljava/lang/String;
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ap;->ka()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ap;->kd()Z
 
     move-result p0
 
@@ -139,19 +139,19 @@
 
     if-eqz p2, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/c/a;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/i/d;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/d;->mId:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ap;->ka()Z
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ap;->kd()Z
 
     move-result v1
 
@@ -161,10 +161,10 @@
     return-void
 .end method
 
-.method public final gD()Z
+.method public final gG()Z
     .locals 2
 
-    invoke-super {p0}, Lcom/facebook/c/a;->gD()Z
+    invoke-super {p0}, Lcom/facebook/c/a;->gG()Z
 
     move-result v0
 
@@ -181,17 +181,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
     iget-object v1, v1, Lcom/facebook/imagepipeline/i/d;->mId:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/h/c;->aw(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VA:Lcom/facebook/imagepipeline/i/ap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/c/a;->VJ:Lcom/facebook/imagepipeline/i/ap;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/d;->kd()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/d;->kg()Ljava/util/List;
 
     move-result-object v0
 
@@ -203,7 +203,7 @@
     return v0
 .end method
 
-.method final declared-synchronized jg()V
+.method final declared-synchronized jj()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 cd98a9f177..bc901e3172 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 Kp:Ljava/lang/Object;
+.field private final Ky:Ljava/lang/Object;
 
-.field private final Sj:Ljava/lang/String;
+.field private final Ss:Ljava/lang/String;
 
-.field private final Sk:Lcom/facebook/imagepipeline/a/e;
+.field private final St:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Sl:Lcom/facebook/imagepipeline/a/f;
+.field private final Su:Lcom/facebook/imagepipeline/a/f;
 
-.field private final Sm:Lcom/facebook/imagepipeline/a/b;
+.field private final Sv:Lcom/facebook/imagepipeline/a/b;
 
-.field private final Sn:Lcom/facebook/cache/common/CacheKey;
+.field private final Sw:Lcom/facebook/cache/common/CacheKey;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final So:Ljava/lang/String;
+.field private final Sx:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Sp:I
+.field private final Sy:I
 
-.field private final Sq:J
+.field private final Sz:J
 
 
 # direct methods
@@ -59,17 +59,17 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sj:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/c;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/c;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/c;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/c;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/c;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Sn:Lcom/facebook/cache/common/CacheKey;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/c;->So:Ljava/lang/String;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/c;->Sx: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;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object p5, p0, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sn:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sw: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;->Sp:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/c;->Sy:I
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/cache/c;->Kp:Ljava/lang/Object;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/cache/c;->Ky: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;->Sq:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/c;->Sz: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;->Sp:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sy:I
 
-    iget v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sp:I
+    iget v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sy:I
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sj:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sj:Ljava/lang/String;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Ss: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->St: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;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Su: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;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sv: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;->Sn:Lcom/facebook/cache/common/CacheKey;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sn:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/cache/c;->Sw: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;->So:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sx:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/c;->So:Ljava/lang/String;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/c;->Sx:Ljava/lang/String;
 
     invoke-static {v0, p1}, Lcom/facebook/common/d/h;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -308,10 +308,10 @@
     return v1
 .end method
 
-.method public final fI()Ljava/lang/String;
+.method public final fL()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sj:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/c;->Ss: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;->Sp:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/c;->Sy: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;->Sj:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Ss:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->St:Lcom/facebook/imagepipeline/a/e;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Su:Lcom/facebook/imagepipeline/a/f;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sn:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sw:Lcom/facebook/cache/common/CacheKey;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->So:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sx:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sp:I
+    iget v1, p0, Lcom/facebook/imagepipeline/cache/c;->Sy: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 3417a26037..83d99f8445 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 Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic Sy:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic SH:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Sz:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SI: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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SI:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$1;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private im()Lcom/facebook/imagepipeline/g/e;
+.method private ip()Lcom/facebook/imagepipeline/g/e;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -61,9 +61,9 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SG: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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SI: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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH:Lcom/facebook/cache/common/CacheKey;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/cache/s;->i(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/imagepipeline/g/e;
 
@@ -85,42 +85,42 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ga()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ge()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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH:Lcom/facebook/cache/common/CacheKey;
 
-    invoke-interface {v3}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {v3}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v3
 
     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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SI: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;->ga()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ge()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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH:Lcom/facebook/cache/common/CacheKey;
 
-    invoke-interface {v2}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v2
 
     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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$1;->SI: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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$1;->SI:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$1;->SH: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;
 
@@ -142,7 +142,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
@@ -178,7 +178,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ga()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/e;->ge()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -200,7 +200,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
     :cond_3
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
@@ -216,7 +216,7 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
     :catch_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 
@@ -233,7 +233,7 @@
     :catchall_1
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
@@ -251,7 +251,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->im()Lcom/facebook/imagepipeline/g/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/e$1;->ip()Lcom/facebook/imagepipeline/g/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 8c446e2b5a..8474e96d2d 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field private final Sc:Lcom/facebook/common/g/g;
+.field private final SA:Lcom/facebook/cache/disk/h;
 
-.field private final Sr:Lcom/facebook/cache/disk/h;
+.field private final SB:Lcom/facebook/common/g/j;
 
-.field private final Ss:Lcom/facebook/common/g/j;
+.field private final SC:Ljava/util/concurrent/Executor;
 
-.field private final St:Ljava/util/concurrent/Executor;
+.field private final SD:Ljava/util/concurrent/Executor;
 
-.field private final Su:Ljava/util/concurrent/Executor;
+.field private final SE:Lcom/facebook/imagepipeline/cache/s;
 
-.field private final Sv:Lcom/facebook/imagepipeline/cache/s;
+.field private final SF:Lcom/facebook/imagepipeline/cache/m;
 
-.field private final Sw:Lcom/facebook/imagepipeline/cache/m;
+.field private final Sl:Lcom/facebook/common/g/g;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/cache/e;
 
-    sput-object v0, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/cache/e;->GI: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;->Sr:Lcom/facebook/cache/disk/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->SA:Lcom/facebook/cache/disk/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->Sc:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->Sl:Lcom/facebook/common/g/g;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e;->Ss:Lcom/facebook/common/g/j;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e;->SB:Lcom/facebook/common/g/j;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/e;->St:Ljava/util/concurrent/Executor;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/cache/e;->SC:Ljava/util/concurrent/Executor;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/e;->Su:Ljava/util/concurrent/Executor;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/cache/e;->SD:Ljava/util/concurrent/Executor;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/cache/e;->SF:Lcom/facebook/imagepipeline/cache/m;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->iu()Lcom/facebook/imagepipeline/cache/s;
+    invoke-static {}, Lcom/facebook/imagepipeline/cache/s;->ix()Lcom/facebook/imagepipeline/cache/s;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->Sv:Lcom/facebook/imagepipeline/cache/s;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e;->SE: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;->Sv:Lcom/facebook/imagepipeline/cache/s;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->SE:Lcom/facebook/imagepipeline/cache/s;
 
     return-object p0
 .end method
@@ -93,9 +93,9 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
     .locals 3
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v1
 
@@ -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;->Sr:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SA:Lcom/facebook/cache/disk/h;
 
     new-instance v1, Lcom/facebook/imagepipeline/cache/e$4;
 
@@ -112,11 +112,11 @@
 
     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;->Gz:Ljava/lang/Class;
+    sget-object p0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string p2, "Successful disk-cache write for key %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
     :catch_0
     move-exception p0
 
-    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const/4 v0, 0x1
 
@@ -137,7 +137,7 @@
 
     const/4 v1, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object p1
 
@@ -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;->St:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/e;->SC: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;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const/4 v1, 0x1
 
@@ -190,7 +190,7 @@
 
     const/4 v2, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object p1
 
@@ -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;->Sw:Lcom/facebook/imagepipeline/cache/m;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->SF: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;->Sr:Lcom/facebook/cache/disk/h;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->SA:Lcom/facebook/cache/disk/h;
 
     return-object p0
 .end method
@@ -226,7 +226,7 @@
 .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;->Ss:Lcom/facebook/common/g/j;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/cache/e;->SB:Lcom/facebook/common/g/j;
 
     return-object p0
 .end method
@@ -243,17 +243,17 @@
     .end annotation
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string v1, "Disk cache read for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v2
 
     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;->Sr:Lcom/facebook/cache/disk/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SA:Lcom/facebook/cache/disk/h;
 
     invoke-interface {v0, p1}, Lcom/facebook/cache/disk/h;->d(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/a/a;
 
@@ -261,11 +261,11 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string v1, "Disk cache miss for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v2
 
@@ -276,26 +276,26 @@
     return-object p1
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string v2, "Found entry in disk cache for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-static {v1, v2, v3}, Lcom/facebook/common/e/a;->a(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-interface {v0}, Lcom/facebook/a/a;->fG()Ljava/io/InputStream;
+    invoke-interface {v0}, Lcom/facebook/a/a;->fJ()Ljava/io/InputStream;
 
     move-result-object v1
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e;->Sc:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e;->Sl:Lcom/facebook/common/g/g;
 
-    invoke-interface {v0}, Lcom/facebook/a/a;->fH()J
+    invoke-interface {v0}, Lcom/facebook/a/a;->fK()J
 
     move-result-wide v3
 
@@ -310,11 +310,11 @@
     :try_start_2
     invoke-virtual {v1}, Ljava/io/InputStream;->close()V
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string v2, "Successful read from disk cache for %s"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v3
 
@@ -334,7 +334,7 @@
     :catch_0
     move-exception v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const/4 v2, 0x1
 
@@ -342,7 +342,7 @@
 
     const/4 v3, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object p1
 
@@ -355,10 +355,10 @@
     throw v0
 .end method
 
-.method static synthetic ga()Ljava/lang/Class;
+.method static synthetic ge()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -380,9 +380,9 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Sv:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SE:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/s;->i(Lcom/facebook/cache/common/CacheKey;)Lcom/facebook/imagepipeline/g/e;
 
@@ -390,11 +390,11 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->Gz:Ljava/lang/Class;
+    sget-object p2, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string v1, "Found image for %s in staging area"
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object p1
 
@@ -406,7 +406,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
@@ -418,14 +418,14 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -434,7 +434,7 @@
     .locals 7
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -444,7 +444,7 @@
 
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->Sv:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SE:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/cache/s;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/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;->Su:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->SD: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;->Gz:Ljava/lang/Class;
+    sget-object v2, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const-string v3, "Failed to schedule disk-cache write for %s"
 
@@ -482,7 +482,7 @@
 
     const/4 v5, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v6
 
@@ -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;->Sv:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->SE:Lcom/facebook/imagepipeline/cache/s;
 
     invoke-virtual {v1, p1, p2}, Lcom/facebook/imagepipeline/cache/s;->b(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)Z
 
@@ -499,14 +499,14 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -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;->Sv:Lcom/facebook/imagepipeline/cache/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e;->SE: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;->Su:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e;->SD: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;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/e;->GI:Ljava/lang/Class;
 
     const/4 v2, 0x1
 
@@ -556,7 +556,7 @@
 
     const/4 v3, 0x0
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/cache/g.smali b/com.discord/smali/com/facebook/imagepipeline/cache/g.smali
index b38bc34fb3..e9ac456f2a 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 SC:Lcom/facebook/imagepipeline/cache/t;
+.field private final SL: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 SD:Ljava/util/LinkedHashMap;
+.field private final SM:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private SE:I
+.field private SN:I
 
 
 # direct methods
@@ -55,13 +55,13 @@
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SD:Ljava/util/LinkedHashMap;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM:Ljava/util/LinkedHashMap;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SE:I
+    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/g;->SC:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/g;->SL: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;->SC:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SL:Lcom/facebook/imagepipeline/cache/t;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/t;->A(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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SE:I
+    iget v3, p0, Lcom/facebook/imagepipeline/cache/g;->SN: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;->SE:I
+    iput v3, p0, Lcom/facebook/imagepipeline/cache/g;->SN: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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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 fF()I
+.method public final declared-synchronized fI()I
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->SE:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->SN: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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->size()I
 
@@ -301,7 +301,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized in()Ljava/lang/Object;
+.method public final declared-synchronized iq()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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SE:I
+    iget v1, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/cache/g;->B(Ljava/lang/Object;)I
 
@@ -389,13 +389,13 @@
 
     sub-int/2addr v1, v2
 
-    iput v1, p0, Lcom/facebook/imagepipeline/cache/g;->SE:I
+    iput v1, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->SD:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SE:I
+    iget p1, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/cache/g;->B(Ljava/lang/Object;)I
 
@@ -403,7 +403,7 @@
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/g;->SE:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/g;->SN: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;->SD:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/g;->SM: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;->SE:I
+    iget v0, p0, Lcom/facebook/imagepipeline/cache/g;->SN:I
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/cache/g;->B(Ljava/lang/Object;)I
 
@@ -447,7 +447,7 @@
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SE:I
+    iput v0, p0, Lcom/facebook/imagepipeline/cache/g;->SN: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 bb10c4c8d9..2ab27bafbd 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 SQ:Lcom/facebook/common/references/CloseableReference;
+.field public final SZ:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -35,11 +35,11 @@
     .end annotation
 .end field
 
-.field public SR:I
+.field public Ta:I
 
-.field public SS:Z
+.field public Tb:Z
 
-.field public final ST:Lcom/facebook/imagepipeline/cache/h$c;
+.field public final Tc: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;->SQ:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->SZ:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->SS:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h$b;->ST:Lcom/facebook/imagepipeline/cache/h$c;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tc: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 3ca39ab5ab..ce396eaf49 100644
--- a/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/cache/h.smali
@@ -30,7 +30,7 @@
 
 
 # instance fields
-.field private final SC:Lcom/facebook/imagepipeline/cache/t;
+.field private final SL:Lcom/facebook/imagepipeline/cache/t;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/t<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final SF:Lcom/facebook/imagepipeline/cache/g;
+.field final SO:Lcom/facebook/imagepipeline/cache/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/g<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field final SG:Lcom/facebook/imagepipeline/cache/g;
+.field final SQ:Lcom/facebook/imagepipeline/cache/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/g<",
@@ -61,7 +61,7 @@
     .end annotation
 .end field
 
-.field final SH:Ljava/util/Map;
+.field final SR:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -72,9 +72,9 @@
     .end annotation
 .end field
 
-.field private final SI:Lcom/facebook/imagepipeline/cache/h$a;
+.field private final SS:Lcom/facebook/imagepipeline/cache/h$a;
 
-.field private final SJ:Lcom/facebook/common/d/l;
+.field private final ST:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -84,9 +84,9 @@
     .end annotation
 .end field
 
-.field protected SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+.field protected SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-.field private SL:J
+.field private SV:J
 
 
 # direct methods
@@ -110,9 +110,9 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SH:Ljava/util/Map;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SR:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SC:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SL:Lcom/facebook/imagepipeline/cache/t;
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/g;
 
@@ -122,7 +122,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;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     new-instance v0, Lcom/facebook/imagepipeline/cache/g;
 
@@ -132,13 +132,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;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->SI:Lcom/facebook/imagepipeline/cache/h$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->SS:Lcom/facebook/imagepipeline/cache/h$a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h;->SJ:Lcom/facebook/common/d/l;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/h;->ST:Lcom/facebook/common/d/l;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SJ:Lcom/facebook/common/d/l;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->ST:Lcom/facebook/common/d/l;
 
     invoke-interface {p1}, Lcom/facebook/common/d/l;->get()Ljava/lang/Object;
 
@@ -146,13 +146,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h;->SU: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;->SL:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/cache/h;->SV:J
 
     return-void
 .end method
@@ -168,25 +168,25 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SC:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL:Lcom/facebook/imagepipeline/cache/t;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/t;->A(Ljava/lang/Object;)I
 
     move-result p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tb:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tk:I
 
     if-gt p1, v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iq()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->it()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SY:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
 
     const/4 v2, 0x1
 
@@ -194,13 +194,13 @@
 
     if-gt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iu()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SX:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -244,7 +244,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;->SQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SZ:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -326,11 +326,11 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->ST:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->ST:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
 
     iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->key:Ljava/lang/Object;
 
@@ -339,9 +339,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;->io()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
 
     return-void
 
@@ -457,15 +457,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SS:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
 
     if-nez v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     iget-object v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->key:Ljava/lang/Object;
 
@@ -514,11 +514,11 @@
 
     if-eqz p0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->ST:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->ST:Lcom/facebook/imagepipeline/cache/h$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$b;->Tc:Lcom/facebook/imagepipeline/cache/h$c;
 
     iget-object p0, p0, Lcom/facebook/imagepipeline/cache/h$b;->key:Ljava/lang/Object;
 
@@ -601,7 +601,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;->SS:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
 
     const/4 v1, 0x1
 
@@ -617,7 +617,7 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iput-boolean v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SS:Z
+    iput-boolean v1, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -648,7 +648,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;->SS:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
 
     const/4 v1, 0x1
 
@@ -664,11 +664,11 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -699,7 +699,7 @@
     :try_start_0
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
     const/4 v1, 0x1
 
@@ -715,11 +715,11 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iput v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -755,15 +755,15 @@
     :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;->SS:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Tb:Z
 
     if-eqz v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iget v0, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
     if-nez v0, :cond_0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SZ:Lcom/facebook/common/references/CloseableReference;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -786,17 +786,17 @@
     throw p1
 .end method
 
-.method private declared-synchronized io()V
+.method private declared-synchronized ir()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SV:J
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget-wide v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc:J
+    iget-wide v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tl:J
 
     add-long/2addr v0, v2
 
@@ -820,9 +820,9 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SL:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/cache/h;->SV:J
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SJ:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->ST:Lcom/facebook/common/d/l;
 
     invoke-interface {v0}, Lcom/facebook/common/d/l;->get()Ljava/lang/Object;
 
@@ -830,7 +830,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -846,21 +846,21 @@
     throw v0
 .end method
 
-.method private ip()V
+.method private is()V
     .locals 4
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ta:I
+    iget v0, v0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tj:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SY:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iq()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->it()I
 
     move-result v2
 
@@ -870,15 +870,15 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SZ:I
+    iget v1, v1, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ti:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SK:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SU:Lcom/facebook/imagepipeline/cache/MemoryCacheParams;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SX:I
+    iget v2, v2, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()I
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->iu()I
 
     move-result v3
 
@@ -915,19 +915,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized iq()I
+.method private declared-synchronized it()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ: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;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
@@ -949,21 +949,21 @@
     throw v0
 .end method
 
-.method private declared-synchronized ir()I
+.method private declared-synchronized iu()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fF()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fI()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fF()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fI()I
 
     move-result v1
     :try_end_0
@@ -1010,7 +1010,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
@@ -1018,9 +1018,9 @@
 
     if-gt v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fF()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/cache/g;->fI()I
 
     move-result v0
     :try_end_0
@@ -1041,7 +1041,7 @@
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     :goto_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->getCount()I
 
@@ -1049,9 +1049,9 @@
 
     if-gt v1, p1, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fF()I
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->fI()I
 
     move-result v1
     :try_end_1
@@ -1069,17 +1069,17 @@
     :cond_2
     :goto_1
     :try_start_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->in()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/cache/g;->iq()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SO: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;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1125,7 +1125,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1133,7 +1133,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/cache/h$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1, p1}, Lcom/facebook/imagepipeline/cache/g;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1159,9 +1159,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;->io()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
 
     return-object p1
 
@@ -1194,7 +1194,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1208,7 +1208,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/h;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v3, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1218,7 +1218,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget v3, p1, Lcom/facebook/imagepipeline/cache/h$b;->SR:I
+    iget v3, p1, Lcom/facebook/imagepipeline/cache/h$b;->Ta:I
 
     if-nez v3, :cond_0
 
@@ -1227,7 +1227,7 @@
     :cond_0
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SZ:Lcom/facebook/common/references/CloseableReference;
 
     goto :goto_0
 
@@ -1301,12 +1301,12 @@
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->io()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1314,7 +1314,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/cache/h$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1, p1}, Lcom/facebook/imagepipeline/cache/g;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1352,7 +1352,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;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/cache/h;->SQ: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;
 
@@ -1369,7 +1369,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;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
 
     return-object v2
 
@@ -1397,13 +1397,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SF:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SO: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;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/h;->SQ:Lcom/facebook/imagepipeline/cache/g;
 
     invoke-virtual {v1, p1}, Lcom/facebook/imagepipeline/cache/g;->a(Lcom/facebook/common/d/j;)Ljava/util/ArrayList;
 
@@ -1419,9 +1419,9 @@
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/cache/h;->b(Ljava/util/ArrayList;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->io()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ir()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->ip()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/h;->is()V
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
 
@@ -1451,7 +1451,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SG:Lcom/facebook/imagepipeline/cache/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h;->SQ: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 0ca4efacae..b449a4bb8c 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private Te:Ljava/util/Map;
+.field private Tn: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/cache/s;->GI: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;->Te:Ljava/util/Map;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tn:Ljava/util/Map;
 
     return-void
 .end method
 
-.method public static iu()Lcom/facebook/imagepipeline/cache/s;
+.method public static ix()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 iv()V
+.method private declared-synchronized iy()V
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/cache/s;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/imagepipeline/cache/s;->GI:Ljava/lang/Class;
 
     const-string v1, "Count = %d"
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/s;->Te:Ljava/util/Map;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/s;->Tn: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;->Te:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tn:Ljava/util/Map;
 
     invoke-static {p2}, Lcom/facebook/imagepipeline/g/e;->b(Lcom/facebook/imagepipeline/g/e;)Lcom/facebook/imagepipeline/g/e;
 
@@ -128,7 +128,7 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->iy()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;->Te:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tn: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/g/e;->Wd: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/g/e;->Wd: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;->Te:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->Tn: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/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/cache/s;->iy()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;->Te:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tn: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;->Te:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/s;->Tn: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;->Te:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/s;->Tn: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;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/s;->GI:Ljava/lang/Class;
 
     const-string v2, "Found closed reference %d for key %s (%d)"
 
@@ -382,7 +382,7 @@
 
     const/4 v4, 0x1
 
-    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p1}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/e/b.smali b/com.discord/smali/com/facebook/imagepipeline/e/b.smali
index 838d2212e3..4ab682f3d3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/e/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/e/b.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field final VC:Lcom/facebook/imagepipeline/e/c;
+.field final VL:Lcom/facebook/imagepipeline/e/c;
 
-.field final VD:Lcom/facebook/imagepipeline/e/c;
+.field final VM:Lcom/facebook/imagepipeline/e/c;
 
-.field private final VE:Lcom/facebook/imagepipeline/e/c;
+.field private final VN:Lcom/facebook/imagepipeline/e/c;
 
-.field private final VF:Ljava/util/Map;
+.field private final VO:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final Vf:Lcom/facebook/imagepipeline/platform/f;
+.field private final Vo:Lcom/facebook/imagepipeline/platform/f;
 
 
 # direct methods
@@ -66,15 +66,15 @@
 
     invoke-direct {v0, p0}, Lcom/facebook/imagepipeline/e/b$1;-><init>(Lcom/facebook/imagepipeline/e/b;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/e/b;->VE:Lcom/facebook/imagepipeline/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/e/b;->VN:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b;->VC:Lcom/facebook/imagepipeline/e/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b;->VL:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/e/b;->VD:Lcom/facebook/imagepipeline/e/c;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/e/b;->VM:Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/e/b;->Vf:Lcom/facebook/imagepipeline/platform/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/e/b;->Vo:Lcom/facebook/imagepipeline/platform/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/e/b;->VF:Ljava/util/Map;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/e/b;->VO:Ljava/util/Map;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     if-lt v0, v1, :cond_1
 
-    invoke-interface {p0}, Lcom/facebook/imagepipeline/l/a;->kH()Z
+    invoke-interface {p0}, Lcom/facebook/imagepipeline/l/a;->kK()Z
 
     move-result p0
 
@@ -131,11 +131,11 @@
 .method public final a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
     .locals 2
 
-    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->To:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p4, Lcom/facebook/imagepipeline/a/b;->Tx:Lcom/facebook/imagepipeline/e/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/e/c;->a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
 
@@ -144,13 +144,13 @@
     return-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    sget-object v1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_2
 
@@ -163,10 +163,10 @@
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/e/b;->VF:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/e/b;->VO:Ljava/util/Map;
 
     if-eqz v1, :cond_3
 
@@ -185,7 +185,7 @@
     return-object p1
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->VE:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->VN:Lcom/facebook/imagepipeline/e/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/e/c;->a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
 
@@ -197,11 +197,11 @@
 .method public final a(Lcom/facebook/imagepipeline/g/e;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/d;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->Vf:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->Vo:Lcom/facebook/imagepipeline/platform/f;
 
-    iget-object v1, p2, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iget-object v1, p2, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
-    iget-object v2, p2, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iget-object v2, p2, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
     const/4 v3, 0x0
 
@@ -210,19 +210,19 @@
     move-result-object v0
 
     :try_start_0
-    iget-object p2, p2, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
     invoke-static {p2, v0}, Lcom/facebook/imagepipeline/e/b;->a(Lcom/facebook/imagepipeline/l/a;Lcom/facebook/common/references/CloseableReference;)V
 
     new-instance p2, Lcom/facebook/imagepipeline/g/d;
 
-    sget-object v1, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sget-object v1, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result p1
 
@@ -245,11 +245,11 @@
 .method public final b(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/d;
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->Vf:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b;->Vo:Lcom/facebook/imagepipeline/platform/f;
 
-    iget-object v2, p4, Lcom/facebook/imagepipeline/a/b;->Tn:Landroid/graphics/Bitmap$Config;
+    iget-object v2, p4, Lcom/facebook/imagepipeline/a/b;->Tw:Landroid/graphics/Bitmap$Config;
 
-    iget-object v5, p4, Lcom/facebook/imagepipeline/a/b;->Tq:Landroid/graphics/ColorSpace;
+    iget-object v5, p4, Lcom/facebook/imagepipeline/a/b;->Tz:Landroid/graphics/ColorSpace;
 
     const/4 v3, 0x0
 
@@ -262,17 +262,17 @@
     move-result-object p2
 
     :try_start_0
-    iget-object p4, p4, Lcom/facebook/imagepipeline/a/b;->Tp:Lcom/facebook/imagepipeline/l/a;
+    iget-object p4, p4, Lcom/facebook/imagepipeline/a/b;->Ty:Lcom/facebook/imagepipeline/l/a;
 
     invoke-static {p4, p2}, Lcom/facebook/imagepipeline/e/b;->a(Lcom/facebook/imagepipeline/l/a;Lcom/facebook/common/references/CloseableReference;)V
 
     new-instance p4, Lcom/facebook/imagepipeline/g/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result p1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/b.smali b/com.discord/smali/com/facebook/imagepipeline/g/b.smali
index b4c529fd4c..192a1940e5 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/b.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract jj()Landroid/graphics/Bitmap;
+.method public abstract jm()Landroid/graphics/Bitmap;
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/c.smali b/com.discord/smali/com/facebook/imagepipeline/g/c.smali
index b10c4f7aa0..fb309fb483 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/c.smali
@@ -21,7 +21,7 @@
 .method public abstract close()V
 .end method
 
-.method public abstract fF()I
+.method public abstract fI()I
 .end method
 
 .method protected finalize()V
@@ -103,10 +103,10 @@
     return v0
 .end method
 
-.method public jk()Lcom/facebook/imagepipeline/g/h;
+.method public jn()Lcom/facebook/imagepipeline/g/h;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sget-object v0, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/g/d.smali b/com.discord/smali/com/facebook/imagepipeline/g/d.smali
index 7512ee0a48..076f244f96 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/d.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final Nm:I
+.field public final Nv:I
 
-.field public final Nn:I
+.field public final Nw:I
 
-.field private VS:Lcom/facebook/common/references/CloseableReference;
+.field private Wb: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 VT:Lcom/facebook/imagepipeline/g/h;
+.field private final Wc:Lcom/facebook/imagepipeline/g/h;
 
 .field public volatile mBitmap:Landroid/graphics/Bitmap;
 
@@ -81,15 +81,15 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/g/d;->VT:Lcom/facebook/imagepipeline/g/h;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/g/d;->Wc:Lcom/facebook/imagepipeline/g/h;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nm:I
+    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iput p1, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     return-void
 .end method
@@ -129,7 +129,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/g/b;-><init>()V
 
-    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gp()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gs()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/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/g/d;->Wb: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/g/d;->mBitmap:Landroid/graphics/Bitmap;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/g/d;->VT:Lcom/facebook/imagepipeline/g/h;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/g/d;->Wc:Lcom/facebook/imagepipeline/g/h;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/g/d;->Nm:I
+    iput p3, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
-    iput p4, p0, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iput p4, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     return-void
 .end method
@@ -202,7 +202,7 @@
     return p0
 .end method
 
-.method private declared-synchronized jl()Lcom/facebook/common/references/CloseableReference;
+.method private declared-synchronized jo()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/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
 
     iput-object v1, p0, Lcom/facebook/imagepipeline/g/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/g/d;->jl()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/d;->jo()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -255,7 +255,7 @@
     return-void
 .end method
 
-.method public final fF()I
+.method public final fI()I
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->mBitmap:Landroid/graphics/Bitmap;
@@ -270,13 +270,13 @@
 .method public final getHeight()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
     rem-int/lit16 v0, v0, 0xb4
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     const/4 v1, 0x5
 
@@ -311,13 +311,13 @@
 .method public final getWidth()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
     rem-int/lit16 v0, v0, 0xb4
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     const/4 v1, 0x5
 
@@ -355,7 +355,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -387,7 +387,7 @@
     goto :goto_1
 .end method
 
-.method public final jj()Landroid/graphics/Bitmap;
+.method public final jm()Landroid/graphics/Bitmap;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->mBitmap:Landroid/graphics/Bitmap;
@@ -395,15 +395,15 @@
     return-object v0
 .end method
 
-.method public final jk()Lcom/facebook/imagepipeline/g/h;
+.method public final jn()Lcom/facebook/imagepipeline/g/h;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VT:Lcom/facebook/imagepipeline/g/h;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->Wc:Lcom/facebook/imagepipeline/g/h;
 
     return-object v0
 .end method
 
-.method public final declared-synchronized jm()Lcom/facebook/common/references/CloseableReference;
+.method public final declared-synchronized jp()Lcom/facebook/common/references/CloseableReference;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -420,7 +420,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->VS:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/d;->Wb:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, 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/g/e.smali b/com.discord/smali/com/facebook/imagepipeline/g/e.smali
index a3d47d033d..fdedde83fd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/g/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/g/e.smali
@@ -7,16 +7,16 @@
 
 
 # instance fields
-.field public Nm:I
+.field public Nv:I
 
-.field public Nn:I
+.field public Nw:I
 
-.field private Ty:Landroid/graphics/ColorSpace;
+.field private TH:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final VU:Lcom/facebook/common/references/CloseableReference;
+.field public final Wd:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field public final VV:Lcom/facebook/common/d/l;
+.field public final We:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -42,13 +42,13 @@
     .end annotation
 .end field
 
-.field public VW:Lcom/facebook/e/c;
+.field public Wf:Lcom/facebook/e/c;
 
-.field public VX:I
+.field public Wg:I
 
-.field private VY:I
+.field private Wh:I
 
-.field public VZ:Lcom/facebook/imagepipeline/a/a;
+.field public Wi:Lcom/facebook/imagepipeline/a/a;
     .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/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
     iput v0, p0, Lcom/facebook/imagepipeline/g/e;->mWidth:I
 
@@ -90,17 +90,17 @@
 
     const/4 v1, 0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->VY:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->VV:Lcom/facebook/common/d/l;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
 
     return-void
 .end method
@@ -118,7 +118,7 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/g/e;-><init>(Lcom/facebook/common/d/l;)V
 
-    iput p2, p0, Lcom/facebook/imagepipeline/g/e;->VY:I
+    iput p2, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
 
     return-void
 .end method
@@ -136,17 +136,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
     iput v0, p0, Lcom/facebook/imagepipeline/g/e;->mWidth:I
 
@@ -154,9 +154,9 @@
 
     const/4 v1, 0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iput v1, p0, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->VY:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh: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;->go()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gr()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->VV:Lcom/facebook/common/d/l;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
 
     return-void
 .end method
@@ -184,7 +184,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jn()Lcom/facebook/imagepipeline/g/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jq()Lcom/facebook/imagepipeline/g/e;
 
     move-result-object p0
 
@@ -199,7 +199,7 @@
 .method public static d(Lcom/facebook/imagepipeline/g/e;)Z
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     if-ltz v0, :cond_0
 
@@ -261,25 +261,25 @@
     return p0
 .end method
 
-.method private jn()Lcom/facebook/imagepipeline/g/e;
+.method private jq()Lcom/facebook/imagepipeline/g/e;
     .locals 3
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VV:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
 
     if-eqz v0, :cond_0
 
     new-instance v1, Lcom/facebook/imagepipeline/g/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->VY:I
+    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/g/e;-><init>(Lcom/facebook/common/d/l;I)V
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -318,19 +318,19 @@
     throw v1
 .end method
 
-.method private jr()Landroid/graphics/ColorSpace;
+.method private ju()Landroid/graphics/ColorSpace;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Ty:Landroid/graphics/ColorSpace;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->TH:Landroid/graphics/ColorSpace;
 
     return-object v0
 .end method
 
-.method private jt()V
+.method private jw()V
     .locals 1
 
     iget v0, p0, Lcom/facebook/imagepipeline/g/e;->mWidth:I
@@ -342,13 +342,13 @@
     if-gez v0, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->ju()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jx()V
 
     :cond_1
     return-void
 .end method
 
-.method private jv()Landroid/util/Pair;
+.method private jy()Landroid/util/Pair;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -394,7 +394,7 @@
     return-object v0
 .end method
 
-.method private jw()Lcom/facebook/imageutils/b;
+.method private jz()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;->Ty:Landroid/graphics/ColorSpace;
+    iget-object v2, v1, Lcom/facebook/imageutils/b;->TH:Landroid/graphics/ColorSpace;
 
-    iput-object v2, p0, Lcom/facebook/imagepipeline/g/e;->Ty:Landroid/graphics/ColorSpace;
+    iput-object v2, p0, Lcom/facebook/imagepipeline/g/e;->TH:Landroid/graphics/ColorSpace;
 
-    iget-object v2, v1, Lcom/facebook/imageutils/b;->aau:Landroid/util/Pair;
+    iget-object v2, v1, Lcom/facebook/imageutils/b;->aaD:Landroid/util/Pair;
 
     if-eqz v2, :cond_0
 
@@ -479,11 +479,11 @@
 .method public final c(Lcom/facebook/imagepipeline/g/e;)V
     .locals 1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getWidth()I
 
@@ -497,37 +497,37 @@
 
     iput v0, p0, Lcom/facebook/imagepipeline/g/e;->mHeight:I
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iget v0, p1, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getSize()I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->VY:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-direct {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Landroid/graphics/ColorSpace;
+    invoke-direct {p1}, Lcom/facebook/imagepipeline/g/e;->ju()Landroid/graphics/ColorSpace;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->Ty:Landroid/graphics/ColorSpace;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/e;->TH: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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/g/e;->jt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/g/e;->mHeight:I
 
@@ -557,7 +557,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VV:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
 
     if-eqz v0, :cond_0
 
@@ -570,7 +570,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd: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/g/e;->VY:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Wh:I
 
     return v0
 .end method
@@ -644,7 +644,7 @@
 .method public final getWidth()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/g/e;->mWidth:I
 
@@ -657,7 +657,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -665,7 +665,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VV:Lcom/facebook/common/d/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -701,40 +701,40 @@
     goto :goto_2
 .end method
 
-.method public final jo()Lcom/facebook/e/c;
+.method public final jr()Lcom/facebook/e/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     return-object v0
 .end method
 
-.method public final jp()I
+.method public final js()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     return v0
 .end method
 
-.method public final jq()I
+.method public final jt()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
     return v0
 .end method
 
-.method public final js()Ljava/lang/String;
+.method public final jv()Ljava/lang/String;
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -840,7 +840,7 @@
     goto :goto_1
 .end method
 
-.method public final ju()V
+.method public final jx()V
     .locals 4
 
     invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->getInputStream()Ljava/io/InputStream;
@@ -851,7 +851,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     invoke-static {v0}, Lcom/facebook/e/b;->a(Lcom/facebook/e/c;)Z
 
@@ -859,27 +859,27 @@
 
     if-eqz v1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jv()Landroid/util/Pair;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jy()Landroid/util/Pair;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jw()Lcom/facebook/imageutils/b;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/g/e;->jz()Lcom/facebook/imageutils/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imageutils/b;->aau:Landroid/util/Pair;
+    iget-object v1, v1, Lcom/facebook/imageutils/b;->aaD:Landroid/util/Pair;
 
     :goto_0
-    sget-object v2, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     const/4 v3, -0x1
 
     if-ne v0, v2, :cond_1
 
-    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iget v2, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     if-ne v2, v3, :cond_1
 
@@ -893,24 +893,24 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
     invoke-static {v0}, Lcom/facebook/imageutils/e;->aE(I)I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     return-void
 
     :cond_1
-    sget-object v1, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     if-ne v0, v3, :cond_2
 
@@ -922,22 +922,22 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/e;->Nw:I
 
     invoke-static {v0}, Lcom/facebook/imageutils/e;->aE(I)I
 
     move-result v0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     return-void
 
     :cond_2
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     :cond_3
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/h/b.smali b/com.discord/smali/com/facebook/imagepipeline/h/b.smali
index dc1b88dd86..11bdc1b04a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/h/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/h/b.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field public final We:Ljava/util/List;
+.field public final Wn: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/h/b;->We:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     array-length v0, p1
 
@@ -96,7 +96,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -427,7 +427,7 @@
 .method public final aA(Ljava/lang/String;)Z
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -440,7 +440,7 @@
     :goto_0
     if-ge v2, v0, :cond_1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -470,7 +470,7 @@
 .method public final aw(Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -481,7 +481,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -517,7 +517,7 @@
 .method public final b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -626,7 +626,7 @@
 .method public final y(Ljava/lang/String;Ljava/lang/String;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->We:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/h/b;->Wn: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/h/b;->We:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/h/b;->Wn:Ljava/util/List;
 
     invoke-interface {v2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ac$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ac$1.smali
index 334b9db29a..fd84f28002 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ac$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ac$1.smali
@@ -24,33 +24,33 @@
 
 
 # instance fields
-.field final synthetic YS:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic Yq:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic YW:Lcom/facebook/imagepipeline/i/ac;
+.field final synthetic Yr:Ljava/lang/String;
 
-.field final synthetic Yh:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic Zb:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Yi:Ljava/lang/String;
+.field final synthetic Zf:Lcom/facebook/imagepipeline/i/ac;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ac;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac$1;->YW:Lcom/facebook/imagepipeline/i/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zf:Lcom/facebook/imagepipeline/i/ac;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yi:Ljava/lang/String;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yr:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ac$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/i/aq;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method private kq()Lcom/facebook/common/references/CloseableReference;
+.method private kt()Lcom/facebook/common/references/CloseableReference;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -73,9 +73,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->YW:Lcom/facebook/imagepipeline/i/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zf:Lcom/facebook/imagepipeline/i/ac;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
     invoke-virtual {v1, v2}, Lcom/facebook/imagepipeline/i/ac;->g(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
 
@@ -91,15 +91,15 @@
     :goto_0
     if-eqz v1, :cond_4
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     const/16 v4, 0x800
 
     if-eqz v3, :cond_0
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     iget v3, v3, Lcom/facebook/imagepipeline/a/e;->width:I
 
@@ -113,11 +113,11 @@
 
     if-gt v3, v5, :cond_3
 
-    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     if-eqz v3, :cond_1
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     iget v4, v2, Lcom/facebook/imagepipeline/a/e;->height:I
 
@@ -143,13 +143,13 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->YW:Lcom/facebook/imagepipeline/i/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zf:Lcom/facebook/imagepipeline/i/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ac;->Vl:Landroid/content/ContentResolver;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ac;->Vu:Landroid/content/ContentResolver;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ac$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-static {v1, v2}, Lcom/facebook/imagepipeline/i/ac;->b(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/graphics/Bitmap;
 
@@ -163,11 +163,11 @@
     :cond_5
     new-instance v0, Lcom/facebook/imagepipeline/g/d;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->il()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->io()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/g/d;-><init>(Landroid/graphics/Bitmap;Lcom/facebook/common/references/b;Lcom/facebook/imagepipeline/g/h;)V
 
@@ -219,7 +219,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ac$1;->kq()Lcom/facebook/common/references/CloseableReference;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ac$1;->kt()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object v0
 
@@ -241,9 +241,9 @@
 
     invoke-super {p0, p1}, Lcom/facebook/imagepipeline/i/aq;->onFailure(Ljava/lang/Exception;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yr:Ljava/lang/String;
 
     const-string v1, "VideoThumbnailProducer"
 
@@ -261,9 +261,9 @@
 
     invoke-super {p0, p1}, Lcom/facebook/imagepipeline/i/aq;->onSuccess(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ac$1;->Yr:Ljava/lang/String;
 
     if-eqz p1, :cond_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ac.smali b/com.discord/smali/com/facebook/imagepipeline/i/ac.smali
index 0c3f0ad540..2a802fff61 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ac.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ac.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field final Vl:Landroid/content/ContentResolver;
+.field final Vu:Landroid/content/ContentResolver;
 
 .field private final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -32,7 +32,7 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac;->Vl:Landroid/content/ContentResolver;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac;->Vu:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -98,7 +98,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v6
 
@@ -106,7 +106,7 @@
 
     move-result-object v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v8
 
@@ -144,7 +144,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->d(Landroid/net/Uri;)Z
 
@@ -152,7 +152,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kD()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kG()Ljava/io/File;
 
     move-result-object p1
 
@@ -229,7 +229,7 @@
     move-object v9, v8
 
     :goto_0
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ac;->Vl:Landroid/content/ContentResolver;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ac;->Vu:Landroid/content/ContentResolver;
 
     new-array v7, v4, [Ljava/lang/String;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ad$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ad$a.smali
index 005f20aa2d..c94c4a5551 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ad$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ad$a.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field final YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+.field final Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/CopyOnWriteArraySet<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field YZ:Ljava/io/Closeable;
+.field Zi:Ljava/io/Closeable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -45,16 +45,16 @@
     .end annotation
 .end field
 
-.field Za:F
+.field Zj:F
 
-.field private Zb:I
+.field private Zk:I
 
-.field Zc:Lcom/facebook/imagepipeline/i/d;
+.field Zl:Lcom/facebook/imagepipeline/i/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+.field Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/ad<",
@@ -66,7 +66,7 @@
     .end annotation
 .end field
 
-.field final synthetic Ze:Lcom/facebook/imagepipeline/i/ad;
+.field final synthetic Zn:Lcom/facebook/imagepipeline/i/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/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/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/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/i/ad$a;->mKey:Ljava/lang/Object;
 
@@ -127,13 +127,75 @@
     return-void
 .end method
 
-.method private declared-synchronized kt()Z
+.method private declared-synchronized kA()Lcom/facebook/imagepipeline/a/d;
+    .locals 3
+
+    monitor-enter p0
+
+    :try_start_0
+    sget-object v0, Lcom/facebook/imagepipeline/a/d;->TI:Lcom/facebook/imagepipeline/a/d;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
+
+    invoke-virtual {v1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_0
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Landroid/util/Pair;
+
+    iget-object v2, v2, Landroid/util/Pair;->second:Ljava/lang/Object;
+
+    check-cast v2, Lcom/facebook/imagepipeline/i/ak;
+
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->ke()Lcom/facebook/imagepipeline/a/d;
+
+    move-result-object v2
+
+    invoke-static {v0, v2}, Lcom/facebook/imagepipeline/a/d;->a(Lcom/facebook/imagepipeline/a/d;Lcom/facebook/imagepipeline/a/d;)Lcom/facebook/imagepipeline/a/d;
+
+    move-result-object v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    goto :goto_0
+
+    :cond_0
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+
+    goto :goto_2
+
+    :goto_1
+    throw v0
+
+    :goto_2
+    goto :goto_1
+.end method
+
+.method private declared-synchronized kw()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -156,7 +218,7 @@
 
     check-cast v1, Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->ka()Z
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v1
     :try_end_0
@@ -191,13 +253,13 @@
     goto :goto_0
 .end method
 
-.method private declared-synchronized kv()Z
+.method private declared-synchronized ky()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -220,7 +282,7 @@
 
     check-cast v1, Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result v1
     :try_end_0
@@ -255,68 +317,6 @@
     goto :goto_0
 .end method
 
-.method private declared-synchronized kx()Lcom/facebook/imagepipeline/a/d;
-    .locals 3
-
-    monitor-enter p0
-
-    :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/a/d;->Tz:Lcom/facebook/imagepipeline/a/d;
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
-
-    invoke-virtual {v1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Landroid/util/Pair;
-
-    iget-object v2, v2, Landroid/util/Pair;->second:Ljava/lang/Object;
-
-    check-cast v2, Lcom/facebook/imagepipeline/i/ak;
-
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/a/d;
-
-    move-result-object v2
-
-    invoke-static {v0, v2}, Lcom/facebook/imagepipeline/a/d;->a(Lcom/facebook/imagepipeline/a/d;Lcom/facebook/imagepipeline/a/d;)Lcom/facebook/imagepipeline/a/d;
-
-    move-result-object v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    goto :goto_0
-
-    :cond_0
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-
-    goto :goto_2
-
-    :goto_1
-    throw v0
-
-    :goto_2
-    goto :goto_1
-.end method
-
 
 # virtual methods
 .method public final a(Lcom/facebook/imagepipeline/i/ad$a$a;Ljava/io/Closeable;I)V
@@ -332,7 +332,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
 
     if-eq v0, p1, :cond_0
 
@@ -341,15 +341,15 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/i/ad$a;->d(Ljava/io/Closeable;)V
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
     invoke-virtual {v0, p2}, Lcom/facebook/imagepipeline/i/ad;->c(Ljava/io/Closeable;)Ljava/io/Closeable;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zb:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zk:I
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->clear()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->mKey:Ljava/lang/Object;
 
@@ -463,7 +463,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a;->mKey:Ljava/lang/Object;
 
@@ -480,27 +480,27 @@
     return p1
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/CopyOnWriteArraySet;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ks()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kz()Ljava/util/List;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ku()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
-    iget v5, p0, Lcom/facebook/imagepipeline/i/ad$a;->Za:F
+    iget v5, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zj:F
 
-    iget v6, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zb:I
+    iget v6, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zk: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/i/ad$a;->YZ:Ljava/io/Closeable;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
     invoke-virtual {v1, v4}, Lcom/facebook/imagepipeline/i/ad;->c(Ljava/io/Closeable;)Ljava/io/Closeable;
 
@@ -605,13 +605,13 @@
     throw p1
 .end method
 
-.method final kr()V
+.method final ku()V
     .locals 12
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/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/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/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/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
     iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->mKey:Ljava/lang/Object;
 
@@ -660,7 +660,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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/i/d;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
@@ -686,27 +686,27 @@
 
     move-result-object v5
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v6
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v8
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kt()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Z
 
     move-result v9
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ky()Z
 
     move-result v10
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kA()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v11
 
@@ -714,25 +714,25 @@
 
     invoke-direct/range {v3 .. v11}, Lcom/facebook/imagepipeline/i/d;-><init>(Lcom/facebook/imagepipeline/request/b;Ljava/lang/String;Lcom/facebook/imagepipeline/i/am;Ljava/lang/Object;Lcom/facebook/imagepipeline/request/b$b;ZZLcom/facebook/imagepipeline/a/d;)V
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
     new-instance v0, Lcom/facebook/imagepipeline/i/ad$a$a;
 
     invoke-direct {v0, p0, v2}, Lcom/facebook/imagepipeline/i/ad$a$a;-><init>(Lcom/facebook/imagepipeline/i/ad$a;B)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/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/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/i/ad;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/i/ad;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v2, v1, v0}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
@@ -749,7 +749,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized ks()Ljava/util/List;
+.method final declared-synchronized kv()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -766,7 +766,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -780,9 +780,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kt()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Z
 
     move-result v1
 
@@ -804,7 +804,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized ku()Ljava/util/List;
+.method final declared-synchronized kx()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -821,7 +821,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -835,9 +835,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->ky()Z
 
     move-result v1
 
@@ -859,7 +859,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized kw()Ljava/util/List;
+.method final declared-synchronized kz()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -876,7 +876,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -890,9 +890,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Lcom/facebook/imagepipeline/a/d;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ad$a;->kA()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ae.smali b/com.discord/smali/com/facebook/imagepipeline/i/ae.smali
index 3c7ea82d09..0a728511a7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ae.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ae.smali
@@ -18,11 +18,11 @@
 
 
 # instance fields
-.field final Ip:Lcom/facebook/common/g/a;
+.field final Iy:Lcom/facebook/common/g/a;
 
-.field final Sc:Lcom/facebook/common/g/g;
+.field final Sl:Lcom/facebook/common/g/g;
 
-.field final Uq:Lcom/facebook/imagepipeline/i/af;
+.field final Uz:Lcom/facebook/imagepipeline/i/af;
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ae;->Sc:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ae;->Sl:Lcom/facebook/common/g/g;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Ip:Lcom/facebook/common/g/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ae;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ae;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/facebook/common/g/i;->gn()Lcom/facebook/common/g/f;
+    invoke-virtual {p0}, Lcom/facebook/common/g/i;->gq()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/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object p2, v1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->ju()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->jx()V
 
     invoke-interface {p3, v1, p1}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_1
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
@@ -135,13 +135,13 @@
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/af;->b(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)Lcom/facebook/imagepipeline/i/s;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ae;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     new-instance v0, Lcom/facebook/imagepipeline/i/ae$1;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ag$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ag$a.smali
index b7dad9cbad..4f6ea41902 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ag$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ag$a.smali
@@ -24,15 +24,15 @@
 
 
 # instance fields
-.field private final Ip:Lcom/facebook/common/g/a;
+.field private final Iy:Lcom/facebook/common/g/a;
 
-.field private final Sc:Lcom/facebook/common/g/g;
+.field private final Sl:Lcom/facebook/common/g/g;
 
-.field private final Vn:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final Zl:Lcom/facebook/cache/common/CacheKey;
+.field private final Zu:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Zm:Lcom/facebook/imagepipeline/g/e;
+.field private final Zv:Lcom/facebook/imagepipeline/g/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -62,15 +62,15 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zl:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zu:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sc:Lcom/facebook/common/g/g;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sl:Lcom/facebook/common/g/g;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$a;->Ip:Lcom/facebook/common/g/a;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iy:Lcom/facebook/common/g/a;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zm:Lcom/facebook/imagepipeline/g/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Ip:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iy: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/i/ag$a;->Ip:Lcom/facebook/common/g/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iy:Lcom/facebook/common/g/a;
 
     invoke-interface {p2, v0}, Lcom/facebook/common/g/a;->r(Ljava/lang/Object;)V
 
     throw p1
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Ip:Lcom/facebook/common/g/a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Iy:Lcom/facebook/common/g/a;
 
     invoke-interface {p1, v0}, Lcom/facebook/common/g/a;->r(Ljava/lang/Object;)V
 
@@ -201,36 +201,36 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zm:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zm:Lcom/facebook/imagepipeline/g/e;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getSize()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->To:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sc:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Sl:Lcom/facebook/common/g/g;
 
     invoke-interface {v1, v0}, Lcom/facebook/common/g/g;->F(I)Lcom/facebook/common/g/i;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iget v1, v1, Lcom/facebook/imagepipeline/a/a;->To:I
 
     invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->getInputStream()Ljava/io/InputStream;
 
@@ -248,7 +248,7 @@
 
     invoke-direct {p0, p2, v0, v1}, Lcom/facebook/imagepipeline/i/ag$a;->a(Ljava/io/InputStream;Ljava/io/OutputStream;I)V
 
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gn()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gq()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/g/e;->ju()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->jx()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p2}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
     :try_end_4
@@ -334,13 +334,13 @@
     :goto_1
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->close()V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zm:Lcom/facebook/imagepipeline/g/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->close()V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zl:Lcom/facebook/cache/common/CacheKey;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zu: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/g/e;->close()V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zm:Lcom/facebook/imagepipeline/g/e;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zv:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->close()V
 
@@ -370,22 +370,22 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zl:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$a;->Zu:Lcom/facebook/cache/common/CacheKey;
 
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ag.smali b/com.discord/smali/com/facebook/imagepipeline/i/ag.smali
index fa51658f3f..ffa55f542f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ag.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ag.smali
@@ -24,15 +24,15 @@
 
 
 # instance fields
-.field private final Ip:Lcom/facebook/common/g/a;
+.field private final Iy:Lcom/facebook/common/g/a;
 
-.field private final Sc:Lcom/facebook/common/g/g;
+.field private final Sl:Lcom/facebook/common/g/g;
 
-.field private final TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vn:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -61,15 +61,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag;->Sc:Lcom/facebook/common/g/g;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag;->Sl:Lcom/facebook/common/g/g;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag;->Ip:Lcom/facebook/common/g/a;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag;->Iy:Lcom/facebook/common/g/a;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -140,11 +140,11 @@
 
     new-instance v8, Lcom/facebook/imagepipeline/i/ag$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag;->Sc:Lcom/facebook/common/g/g;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag;->Sl:Lcom/facebook/common/g/g;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag;->Ip:Lcom/facebook/common/g/a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag;->Iy:Lcom/facebook/common/g/a;
 
     const/4 v7, 0x0
 
@@ -158,7 +158,7 @@
 
     invoke-direct/range {v0 .. v7}, Lcom/facebook/imagepipeline/i/ag$a;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/common/g/g;Lcom/facebook/common/g/a;Lcom/facebook/imagepipeline/g/e;B)V
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/i/ag;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/i/ag;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {p0, v8, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
@@ -180,22 +180,22 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aab:Z
+    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aak:Z
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
     return-void
 
     :cond_0
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v1
 
@@ -207,7 +207,7 @@
 
     invoke-interface {v1, v2, v3}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
 
@@ -225,9 +225,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/cache/f;->o(Landroid/net/Uri;)Lcom/facebook/cache/common/CacheKey;
 
@@ -239,7 +239,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag;->Vw: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;
 
@@ -249,7 +249,7 @@
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v4
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
index dd38f75f7c..9902ef1dc8 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ai$a.smali
@@ -27,17 +27,13 @@
 
 
 # instance fields
-.field private Iq:Z
+.field private Iz:Z
 
-.field final Ko:Ljava/lang/String;
+.field final Kx:Ljava/lang/String;
 
-.field YC:I
+.field YL:I
 
-.field final Zp:Lcom/facebook/imagepipeline/i/am;
-
-.field final Zq:Lcom/facebook/imagepipeline/request/c;
-
-.field Zr:Lcom/facebook/common/references/CloseableReference;
+.field ZA:Lcom/facebook/common/references/CloseableReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/CloseableReference<",
@@ -50,11 +46,15 @@
     .end annotation
 .end field
 
-.field Zs:Z
+.field ZB:Z
 
-.field Zt:Z
+.field ZC:Z
 
-.field final synthetic Zu:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZD:Lcom/facebook/imagepipeline/i/ai;
+
+.field final Zy:Lcom/facebook/imagepipeline/i/am;
+
+.field final Zz:Lcom/facebook/imagepipeline/request/c;
 
 
 # direct methods
@@ -75,27 +75,27 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZD:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YC:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YL:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zs:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zt:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zp:Lcom/facebook/imagepipeline/i/am;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ai$a;->Ko:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     new-instance p2, Lcom/facebook/imagepipeline/i/ai$a$1;
 
@@ -149,13 +149,13 @@
     return-object p0
 .end method
 
-.method private gD()Z
+.method private gG()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
 
     if-eqz v0, :cond_0
 
@@ -166,15 +166,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iq:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
 
     monitor-exit p0
     :try_end_0
@@ -201,7 +201,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz: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/i/ai$a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
 
     if-eqz v0, :cond_2
 
@@ -256,21 +256,21 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA: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/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YC:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/ai$a;->YL:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zs:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kz()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kC()Z
 
     move-result p1
 
@@ -282,7 +282,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->ky()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kB()V
 
     :cond_3
     return-void
@@ -324,14 +324,14 @@
     :cond_0
     if-eqz v0, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gD()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gG()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -358,24 +358,24 @@
 
     iget-object v1, v0, Lcom/facebook/imagepipeline/g/d;->mBitmap:Landroid/graphics/Bitmap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/ai;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZD:Lcom/facebook/imagepipeline/i/ai;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ai;->Ry:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ai;->RH: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/g/d;->Nm:I
+    iget v2, v0, Lcom/facebook/imagepipeline/g/d;->Nv:I
 
-    iget v0, v0, Lcom/facebook/imagepipeline/g/d;->Nn:I
+    iget v0, v0, Lcom/facebook/imagepipeline/g/d;->Nw:I
 
     :try_start_0
     new-instance v3, Lcom/facebook/imagepipeline/g/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->jk()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->jn()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object p1
 
@@ -410,13 +410,13 @@
 .method final j(Ljava/lang/Throwable;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gD()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gG()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
@@ -424,35 +424,18 @@
     return-void
 .end method
 
-.method protected final jg()V
+.method protected final jj()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kA()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$a;->kD()V
 
     return-void
 .end method
 
-.method final kA()V
-    .locals 1
-
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gD()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
-
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
-
-    :cond_0
-    return-void
-.end method
-
-.method final ky()V
+.method final kB()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zu:Lcom/facebook/imagepipeline/i/ai;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZD:Lcom/facebook/imagepipeline/i/ai;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/ai;->mExecutor:Ljava/util/concurrent/Executor;
 
@@ -465,25 +448,25 @@
     return-void
 .end method
 
-.method final declared-synchronized kz()Z
+.method final declared-synchronized kC()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Iz:Z
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zs:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZB:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zt:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {v0}, Lcom/facebook/common/references/CloseableReference;->a(Lcom/facebook/common/references/CloseableReference;)Z
 
@@ -493,7 +476,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->Zt:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -515,3 +498,20 @@
 
     throw v0
 .end method
+
+.method final kD()V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ai$a;->gG()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
+
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ai$b.smali b/com.discord/smali/com/facebook/imagepipeline/i/ai$b.smali
index 0dec759f5d..3b3a06ac5e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ai$b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ai$b.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private Iq:Z
+.field private Iz:Z
 
-.field private Zr:Lcom/facebook/common/references/CloseableReference;
+.field private ZA: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 Zu:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZD:Lcom/facebook/imagepipeline/i/ai;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/i/ai;Lcom/facebook/imagepipeline/i/ai$a;Lcom/facebook/imagepipeline/i/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zu:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZD:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iq:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz:Z
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     new-instance p2, Lcom/facebook/imagepipeline/i/ai$b$1;
 
@@ -94,7 +94,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iq:Z
+    iget-boolean p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz:Z
 
     if-eqz p2, :cond_0
 
@@ -103,13 +103,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA: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/i/ai$b;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA: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/i/ai$b;->Iq:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz:Z
 
     if-eqz p1, :cond_1
 
@@ -130,7 +130,7 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA: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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/4 v0, 0x0
 
@@ -184,13 +184,13 @@
     return-void
 .end method
 
-.method final gD()Z
+.method final gG()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz:Z
 
     if-eqz v0, :cond_0
 
@@ -201,15 +201,15 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->ZA:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iq:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/i/ai$b;->Iz: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/i/ai$b;->gD()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$b;->gG()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
@@ -247,18 +247,18 @@
     return-void
 .end method
 
-.method protected final jg()V
+.method protected final jj()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$b;->gD()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/ai$b;->gG()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ak.smali b/com.discord/smali/com/facebook/imagepipeline/i/ak.smali
index a5bdd381f5..6360b2d52e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ak.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ak.smali
@@ -10,23 +10,23 @@
 .method public abstract getId()Ljava/lang/String;
 .end method
 
-.method public abstract hk()Ljava/lang/Object;
+.method public abstract hn()Ljava/lang/Object;
 .end method
 
-.method public abstract jX()Lcom/facebook/imagepipeline/request/b;
+.method public abstract ka()Lcom/facebook/imagepipeline/request/b;
 .end method
 
-.method public abstract jY()Lcom/facebook/imagepipeline/i/am;
+.method public abstract kb()Lcom/facebook/imagepipeline/i/am;
 .end method
 
-.method public abstract jZ()Lcom/facebook/imagepipeline/request/b$b;
+.method public abstract kc()Lcom/facebook/imagepipeline/request/b$b;
 .end method
 
-.method public abstract ka()Z
+.method public abstract kd()Z
 .end method
 
-.method public abstract kb()Lcom/facebook/imagepipeline/a/d;
+.method public abstract ke()Lcom/facebook/imagepipeline/a/d;
 .end method
 
-.method public abstract kc()Z
+.method public abstract kf()Z
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ao$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ao$a.smali
index c30dcc85c1..dbbd87433b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ao$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ao$a.smali
@@ -24,17 +24,17 @@
 
 
 # instance fields
-.field final Ul:Lcom/facebook/imagepipeline/k/d;
+.field final Uu:Lcom/facebook/imagepipeline/k/d;
 
-.field XL:Z
+.field XU:Z
 
-.field final XU:Lcom/facebook/imagepipeline/i/ak;
+.field final Yd:Lcom/facebook/imagepipeline/i/ak;
 
-.field final Ya:Lcom/facebook/imagepipeline/i/u;
+.field final Yj:Lcom/facebook/imagepipeline/i/u;
 
-.field final Zy:Z
+.field final ZH:Z
 
-.field final synthetic Zz:Lcom/facebook/imagepipeline/i/ao;
+.field final synthetic ZI:Lcom/facebook/imagepipeline/i/ao;
 
 
 # direct methods
@@ -53,23 +53,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Zz:Lcom/facebook/imagepipeline/i/ao;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZI:Lcom/facebook/imagepipeline/i/ao;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XL:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/facebook/imagepipeline/request/b;->aad:Ljava/lang/Boolean;
+    iget-object p3, p3, Lcom/facebook/imagepipeline/request/b;->aam:Ljava/lang/Boolean;
 
     if-eqz p3, :cond_0
 
@@ -78,9 +78,9 @@
     move-result p4
 
     :cond_0
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Zy:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZH:Z
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ao$a;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ao$a;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     new-instance p3, Lcom/facebook/imagepipeline/i/ao$a$1;
 
@@ -94,9 +94,9 @@
 
     invoke-direct {p4, p5, p3, v0}, Lcom/facebook/imagepipeline/i/u;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/i/u$a;I)V
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     new-instance p4, Lcom/facebook/imagepipeline/i/ao$a$2;
 
@@ -120,7 +120,7 @@
 
     if-eqz v0, :cond_0
 
-    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     :cond_0
     return-object v0
@@ -137,7 +137,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/g/e;
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XL:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Z
 
     if-nez v0, :cond_11
 
@@ -151,7 +151,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/4 p2, 0x0
 
@@ -161,19 +161,19 @@
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a;->Uu:Lcom/facebook/imagepipeline/k/d;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao$a;->Zy:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao$a;->ZH:Z
 
     invoke-interface {v4, v2, v5}, Lcom/facebook/imagepipeline/k/d;->createImageTranscoder(Lcom/facebook/e/c;Z)Lcom/facebook/imagepipeline/k/c;
 
@@ -189,18 +189,18 @@
 
     if-eqz p1, :cond_a
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v6
 
-    sget-object v7, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v7, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-ne v6, v7, :cond_2
 
     goto :goto_4
 
     :cond_2
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v6
 
@@ -210,14 +210,14 @@
 
     if-nez v6, :cond_3
 
-    sget-object v1, Lcom/facebook/common/j/e;->IW:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
 
     goto :goto_5
 
     :cond_3
-    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-boolean v7, v6, Lcom/facebook/imagepipeline/a/f;->TG:Z
+    iget-boolean v7, v6, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
     if-nez v7, :cond_7
 
@@ -227,22 +227,22 @@
 
     if-nez v7, :cond_6
 
-    invoke-virtual {v6}, Lcom/facebook/imagepipeline/a/f;->iA()Z
+    invoke-virtual {v6}, Lcom/facebook/imagepipeline/a/f;->iD()Z
 
     move-result v7
 
     if-eqz v7, :cond_5
 
-    iget-boolean v6, v6, Lcom/facebook/imagepipeline/a/f;->TG:Z
+    iget-boolean v6, v6, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
     if-eqz v6, :cond_4
 
     goto :goto_0
 
     :cond_4
-    sget-object v6, Lcom/facebook/imagepipeline/k/e;->aaq:Lcom/facebook/common/d/e;
+    sget-object v6, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result v7
 
@@ -258,7 +258,7 @@
 
     :cond_5
     :goto_0
-    iput v5, p1, Lcom/facebook/imagepipeline/g/e;->Nn:I
+    iput v5, p1, Lcom/facebook/imagepipeline/g/e;->Nw: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;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v3, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     invoke-interface {v4, p1, v6, v3}, Lcom/facebook/imagepipeline/k/c;->a(Lcom/facebook/imagepipeline/g/e;Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;)Z
 
@@ -301,52 +301,52 @@
 
     :cond_a
     :goto_4
-    sget-object v1, Lcom/facebook/common/j/e;->IX:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
 
     :goto_5
     if-nez v0, :cond_b
 
-    sget-object v3, Lcom/facebook/common/j/e;->IX:Lcom/facebook/common/j/e;
+    sget-object v3, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
 
     if-eq v1, v3, :cond_11
 
     :cond_b
-    sget-object v3, Lcom/facebook/common/j/e;->IV:Lcom/facebook/common/j/e;
+    sget-object v3, Lcom/facebook/common/j/e;->Je:Lcom/facebook/common/j/e;
 
     if-eq v1, v3, :cond_f
 
-    sget-object v0, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     if-eq v2, v0, :cond_d
 
-    sget-object v0, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
 
     if-ne v2, v0, :cond_c
 
     goto :goto_6
 
     :cond_c
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iz()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
 
     move-result v1
 
     if-nez v1, :cond_e
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iD()Z
 
     move-result v1
 
     if-eqz v1, :cond_e
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iB()I
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/a/f;->iE()I
 
     move-result v0
 
@@ -358,25 +358,25 @@
 
     :cond_d
     :goto_6
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/a/f;->TG:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
     if-nez v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v0
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v0
 
@@ -390,14 +390,14 @@
 
     :cond_e
     :goto_7
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
     return-void
 
     :cond_f
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
 
     invoke-virtual {v1, p1, p2}, Lcom/facebook/imagepipeline/i/u;->c(Lcom/facebook/imagepipeline/g/e;I)Z
 
@@ -407,18 +407,18 @@
 
     if-nez v0, :cond_10
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result p1
 
     if-eqz p1, :cond_11
 
     :cond_10
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->kl()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->ko()Z
 
     :cond_11
     return-void
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/aq.smali b/com.discord/smali/com/facebook/imagepipeline/i/aq.smali
index 5bfdf77f20..db33a93840 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/aq.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/aq.smali
@@ -16,11 +16,11 @@
 
 
 # instance fields
-.field private final Ko:Ljava/lang/String;
+.field private final Kx:Ljava/lang/String;
 
-.field private final XH:Lcom/facebook/imagepipeline/i/am;
+.field private final XQ:Lcom/facebook/imagepipeline/i/am;
 
-.field private final Yg:Lcom/facebook/imagepipeline/i/k;
+.field private final Yp:Lcom/facebook/imagepipeline/i/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/k<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final ZC:Ljava/lang/String;
+.field private final ZL: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/i/aq;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/aq;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->XH:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZC:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/aq;->Ko:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/aq;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->Ko:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZC:Ljava/lang/String;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
 
     invoke-interface {p1, p2, p3}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -90,14 +90,14 @@
     return-object p1
 .end method
 
-.method public gd()V
+.method public gg()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Ko:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZC:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/am;->aA(Ljava/lang/String;)Z
 
@@ -105,9 +105,9 @@
 
     invoke-interface {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/i/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     return-void
 .end method
@@ -123,11 +123,11 @@
 .method public onFailure(Ljava/lang/Exception;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Ko:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZC:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/am;->aA(Ljava/lang/String;)Z
 
@@ -135,7 +135,7 @@
 
     invoke-interface {v0, v1, v2, p1, v3}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
@@ -150,11 +150,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Ko:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/aq;->Kx:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZC:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/aq;->ZL:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/am;->aA(Ljava/lang/String;)Z
 
@@ -174,7 +174,7 @@
     :goto_0
     invoke-interface {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/aq;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ar$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/ar$1.smali
index 13b467fe04..de6fbf086a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ar$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ar$1.smali
@@ -22,30 +22,30 @@
 
 
 # instance fields
-.field final synthetic Yi:Ljava/lang/String;
+.field final synthetic Yr:Ljava/lang/String;
 
-.field final synthetic Yj:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic ZD:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic ZM:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic ZE:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic ZN:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ar;
+.field final synthetic ZO:Lcom/facebook/imagepipeline/i/ar;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ar;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZF:Lcom/facebook/imagepipeline/i/ar;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZO:Lcom/facebook/imagepipeline/i/ar;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZD:Lcom/facebook/imagepipeline/i/am;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZM:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yi:Ljava/lang/String;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yr:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/ar$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p9, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZE:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p9, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZN:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/i/aq;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -95,9 +95,9 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZD:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZM:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yr:Ljava/lang/String;
 
     const-string v1, "BackgroundThreadHandoffProducer"
 
@@ -105,13 +105,13 @@
 
     invoke-interface {p1, v0, v1, v2}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZF:Lcom/facebook/imagepipeline/i/ar;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZO:Lcom/facebook/imagepipeline/i/ar;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/ar;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/ar;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZE:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$1;->ZN:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/ax$a.smali b/com.discord/smali/com/facebook/imagepipeline/i/ax$a.smali
index 2b44f116a5..67d43c5734 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/ax$a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/ax$a.smali
@@ -24,11 +24,11 @@
 
 
 # instance fields
-.field private final Yn:Lcom/facebook/imagepipeline/i/ak;
+.field private final Yw:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic ZT:Lcom/facebook/imagepipeline/i/ax;
+.field final synthetic aac:Lcom/facebook/imagepipeline/i/ax;
 
-.field private ZU:Lcom/facebook/common/j/e;
+.field private aad:Lcom/facebook/common/j/e;
 
 
 # direct methods
@@ -45,15 +45,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZT:Lcom/facebook/imagepipeline/i/ax;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->aac:Lcom/facebook/imagepipeline/i/ax;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ax$a;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ax$a;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
-    sget-object p1, Lcom/facebook/common/j/e;->IX:Lcom/facebook/common/j/e;
+    sget-object p1, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZU:Lcom/facebook/common/j/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
 
     return-void
 .end method
@@ -69,9 +69,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/g/e;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZU:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->IX:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jg: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;->jV()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jY()Lcom/facebook/imagepipeline/nativecode/e;
 
     move-result-object v1
 
@@ -112,24 +112,24 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lcom/facebook/common/j/e;->IX:Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
 
     goto :goto_0
 
     :cond_1
-    sget-object v0, Lcom/facebook/common/j/e;->IW:Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZU:Lcom/facebook/common/j/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZU:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->IW:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jf: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/i/ax$a;->ZU:Lcom/facebook/common/j/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->aad:Lcom/facebook/common/j/e;
 
-    sget-object v1, Lcom/facebook/common/j/e;->IV:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Je:Lcom/facebook/common/j/e;
 
     if-ne v0, v1, :cond_3
 
     if-eqz p1, :cond_3
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ax$a;->ZT:Lcom/facebook/imagepipeline/i/ax;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ax$a;->aac:Lcom/facebook/imagepipeline/i/ax;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$a;->Yw:Lcom/facebook/imagepipeline/i/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/i/ax$1;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v5
 
@@ -184,7 +184,7 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/b.smali b/com.discord/smali/com/facebook/imagepipeline/i/b.smali
index d370d25a0b..56188ffb83 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/b.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private XG:Z
+.field private XP:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XG:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
 
     return-void
 .end method
@@ -145,7 +145,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP: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/i/b;->XG:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP: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 gd()V
+.method public final declared-synchronized gg()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP: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/i/b;->XG:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/b;->jg()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/b;->jj()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/i/b;->XG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP: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/i/b;->XG:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -306,7 +306,7 @@
     throw p1
 .end method
 
-.method protected abstract jg()V
+.method protected abstract jj()V
 .end method
 
 .method protected n(F)V
@@ -321,7 +321,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/b;->XP:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/d.smali b/com.discord/smali/com/facebook/imagepipeline/i/d.smali
index 168d148eb9..00f2bbe9cf 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/d.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/d.smali
@@ -7,21 +7,21 @@
 
 
 # instance fields
-.field private KA:Z
+.field private KJ:Z
 
-.field public final Kp:Ljava/lang/Object;
+.field public final Ky:Ljava/lang/Object;
 
-.field public final Kq:Lcom/facebook/imagepipeline/request/b;
+.field public final Kz:Lcom/facebook/imagepipeline/request/b;
 
-.field private final XH:Lcom/facebook/imagepipeline/i/am;
+.field private final XQ:Lcom/facebook/imagepipeline/i/am;
 
-.field private final XI:Lcom/facebook/imagepipeline/request/b$b;
+.field private final XR:Lcom/facebook/imagepipeline/request/b$b;
 
-.field private XJ:Lcom/facebook/imagepipeline/a/d;
+.field private XS:Lcom/facebook/imagepipeline/a/d;
 
-.field private XK:Z
+.field private XT:Z
 
-.field private XL:Z
+.field private XU: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/i/d;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/i/d;->mId:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/d;->XH:Lcom/facebook/imagepipeline/i/am;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/d;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/d;->Kp:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/d;->Ky:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/d;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/d;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/d;->KA:Z
+    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/d;->KJ:Z
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/d;->XJ:Lcom/facebook/imagepipeline/a/d;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/d;->XS:Lcom/facebook/imagepipeline/a/d;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/d;->XK:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/d;->XT:Z
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XL:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XU:Z
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -108,7 +108,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->ke()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kh()V
 
     goto :goto_0
 
@@ -153,7 +153,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kf()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->ki()V
 
     goto :goto_0
 
@@ -198,7 +198,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kg()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kj()V
 
     goto :goto_0
 
@@ -243,7 +243,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/i/al;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kh()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/al;->kk()V
 
     goto :goto_0
 
@@ -272,7 +272,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XJ:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XS:Lcom/facebook/imagepipeline/a/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -286,7 +286,7 @@
 
     :cond_0
     :try_start_1
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/d;->XJ:Lcom/facebook/imagepipeline/a/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/d;->XS:Lcom/facebook/imagepipeline/a/d;
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -318,7 +318,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XL:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XU:Z
 
     monitor-exit p0
     :try_end_0
@@ -326,7 +326,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->ke()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/al;->kh()V
 
     :cond_0
     return-void
@@ -350,45 +350,45 @@
     return-object v0
 .end method
 
-.method public final hk()Ljava/lang/Object;
+.method public final hn()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Kp:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Ky:Ljava/lang/Object;
 
     return-object v0
 .end method
 
-.method public final jX()Lcom/facebook/imagepipeline/request/b;
+.method public final ka()Lcom/facebook/imagepipeline/request/b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->Kz:Lcom/facebook/imagepipeline/request/b;
 
     return-object v0
 .end method
 
-.method public final jY()Lcom/facebook/imagepipeline/i/am;
+.method public final kb()Lcom/facebook/imagepipeline/i/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XQ:Lcom/facebook/imagepipeline/i/am;
 
     return-object v0
 .end method
 
-.method public final jZ()Lcom/facebook/imagepipeline/request/b$b;
+.method public final kc()Lcom/facebook/imagepipeline/request/b$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
     return-object v0
 .end method
 
-.method public final declared-synchronized ka()Z
+.method public final declared-synchronized kd()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KA:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KJ:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -404,13 +404,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized kb()Lcom/facebook/imagepipeline/a/d;
+.method public final declared-synchronized ke()Lcom/facebook/imagepipeline/a/d;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XJ:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/d;->XS:Lcom/facebook/imagepipeline/a/d;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -426,13 +426,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized kc()Z
+.method public final declared-synchronized kf()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XK:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XT:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -448,7 +448,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized kd()Ljava/util/List;
+.method public final declared-synchronized kg()Ljava/util/List;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -465,7 +465,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XL:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XU:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -481,7 +481,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XL:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XU:Z
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -520,7 +520,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KA:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->KJ:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -534,7 +534,7 @@
 
     :cond_0
     :try_start_1
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->KA:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->KJ:Z
 
     new-instance p1, Ljava/util/ArrayList;
 
@@ -573,7 +573,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XK:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/d;->XT:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -587,7 +587,7 @@
 
     :cond_0
     :try_start_1
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XK:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/d;->XT:Z
 
     new-instance p1, Ljava/util/ArrayList;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/k.smali b/com.discord/smali/com/facebook/imagepipeline/i/k.smali
index ee20e6d703..5f827aefd3 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/k.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/k.smali
@@ -23,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract gd()V
+.method public abstract gg()V
 .end method
 
 .method public abstract i(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/m$c.smali b/com.discord/smali/com/facebook/imagepipeline/i/m$c.smali
index 2c315424dd..ba5b27c45a 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/m$c.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/m$c.smali
@@ -25,19 +25,19 @@
 
 
 # instance fields
-.field private final Sm:Lcom/facebook/imagepipeline/a/b;
+.field private final Sv:Lcom/facebook/imagepipeline/a/b;
 
 .field private final TAG:Ljava/lang/String;
 
-.field private XG:Z
+.field private XP:Z
 
-.field private final XH:Lcom/facebook/imagepipeline/i/am;
+.field private final XQ:Lcom/facebook/imagepipeline/i/am;
 
-.field final XU:Lcom/facebook/imagepipeline/i/ak;
+.field final Yd:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic XX:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
 
-.field final Ya:Lcom/facebook/imagepipeline/i/u;
+.field final Yj:Lcom/facebook/imagepipeline/i/u;
 
 
 # direct methods
@@ -55,7 +55,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XX:Lcom/facebook/imagepipeline/i/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
@@ -63,25 +63,25 @@
 
     iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->TAG:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XH:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/facebook/imagepipeline/request/b;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object p2, p2, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
     const/4 p2, 0x0
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XG:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XP:Z
 
     new-instance p2, Lcom/facebook/imagepipeline/i/m$c$1;
 
@@ -91,15 +91,15 @@
 
     iget-object p5, p1, Lcom/facebook/imagepipeline/i/m;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/a/b;->Ti:I
+    iget v0, v0, Lcom/facebook/imagepipeline/a/b;->Tr:I
 
     invoke-direct {p3, p5, p2, v0}, Lcom/facebook/imagepipeline/i/u;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/imagepipeline/i/u$a;I)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     new-instance p3, Lcom/facebook/imagepipeline/i/m$c$2;
 
@@ -150,9 +150,9 @@
 
     move-object/from16 v5, p9
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/m$c;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v7}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -173,7 +173,7 @@
 
     move-result-object v6
 
-    invoke-interface/range {p4 .. p4}, Lcom/facebook/imagepipeline/g/h;->jy()Z
+    invoke-interface/range {p4 .. p4}, Lcom/facebook/imagepipeline/g/h;->jB()Z
 
     move-result v7
 
@@ -304,11 +304,11 @@
 
     const-string v13, "DecodeProducer"
 
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v1
 
-    sget-object v2, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     if-eq v1, v2, :cond_1
 
@@ -340,7 +340,7 @@
     goto/16 :goto_9
 
     :cond_2
-    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual/range {p1 .. p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v1
 
@@ -382,7 +382,7 @@
 
     move-result-object v8
 
-    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
@@ -418,13 +418,13 @@
 
     move-result v14
 
-    iget-object v15, v11, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v15, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v15}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v15}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v15
 
-    iget-object v15, v15, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v15, v15, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     if-eqz v15, :cond_5
 
@@ -455,19 +455,19 @@
 
     :goto_3
     :try_start_0
-    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/u;->kn()J
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/u;->kq()J
 
     move-result-wide v17
 
-    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -500,7 +500,7 @@
     goto :goto_6
 
     :cond_8
-    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/i/m$c;->jk()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual/range {p0 .. p0}, Lcom/facebook/imagepipeline/i/m$c;->jn()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v3
 
@@ -508,14 +508,14 @@
 
     :cond_9
     :goto_6
-    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sget-object v3, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
     :goto_7
     move-object v5, v3
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v14}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -526,11 +526,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->XX:Lcom/facebook/imagepipeline/i/m;
+    iget-object v14, v11, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
 
-    iget-object v14, v14, Lcom/facebook/imagepipeline/i/m;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v14, v14, Lcom/facebook/imagepipeline/i/m;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Sv:Lcom/facebook/imagepipeline/a/b;
 
     invoke-interface {v14, v12, v2, v5, v3}, Lcom/facebook/imagepipeline/e/c;->a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
 
@@ -541,7 +541,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iget v1, v12, Lcom/facebook/imagepipeline/g/e;->Wg: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
@@ -564,9 +564,9 @@
 
     move-result-object v1
 
-    iget-object v2, v11, Lcom/facebook/imagepipeline/i/m$c;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -574,11 +574,11 @@
 
     invoke-interface {v2, v3, v13, v1}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->XX:Lcom/facebook/imagepipeline/i/m;
+    iget-object v1, v11, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m;->Si:Lcom/facebook/imagepipeline/b/a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/b/a;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/b/a;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
     invoke-static {v14, v1}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/io/Closeable;Lcom/facebook/common/references/CloseableReference$a;)Lcom/facebook/common/references/CloseableReference;
 
@@ -593,7 +593,7 @@
 
     invoke-direct {v11, v2}, Lcom/facebook/imagepipeline/i/m$c;->z(Z)V
 
-    iget-object v2, v11, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v2, v1, v0}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_4
@@ -656,7 +656,7 @@
 
     const/4 v1, 0x2
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/g/e;->js()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/g/e;->jv()Ljava/lang/String;
 
     move-result-object v4
 
@@ -693,9 +693,9 @@
 
     move-result-object v1
 
-    iget-object v2, v11, Lcom/facebook/imagepipeline/i/m$c;->XH:Lcom/facebook/imagepipeline/i/am;
+    iget-object v2, v11, Lcom/facebook/imagepipeline/i/m$c;->XQ:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v11, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -730,7 +730,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/m$c;->z(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
@@ -743,7 +743,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c;->XG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c;->XP:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -767,14 +767,14 @@
     if-eqz p1, :cond_1
 
     :try_start_0
-    iget-boolean p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XG:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XP:Z
 
     if-eqz p1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
@@ -782,15 +782,15 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XG:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XP:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->kk()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->kn()V
 
     return-void
 
@@ -819,7 +819,7 @@
     check-cast p1, Lcom/facebook/imagepipeline/g/e;
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p2}, Lcom/facebook/imagepipeline/i/m$c;->ay(I)Z
 
@@ -843,7 +843,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -857,7 +857,7 @@
 
     if-nez p1, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -873,30 +873,30 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
     :cond_2
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->kl()Z
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/i/u;->ko()Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :cond_3
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -904,7 +904,7 @@
 .method protected a(Lcom/facebook/imagepipeline/g/e;I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
 
     invoke-virtual {v0, p1, p2}, Lcom/facebook/imagepipeline/i/u;->c(Lcom/facebook/imagepipeline/g/e;I)Z
 
@@ -924,27 +924,27 @@
     return-void
 .end method
 
-.method public final jg()V
+.method public final jj()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/m$c;->kj()V
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/m$c;->km()V
 
     return-void
 .end method
 
-.method protected abstract jk()Lcom/facebook/imagepipeline/g/h;
+.method protected abstract jn()Lcom/facebook/imagepipeline/g/h;
 .end method
 
-.method final kj()V
+.method final km()V
     .locals 1
 
     const/4 v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/m$c;->z(Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     return-void
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/n.smali b/com.discord/smali/com/facebook/imagepipeline/i/n.smali
index 1ea752bc44..2eaaaaa43e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/n.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/n.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final Yg:Lcom/facebook/imagepipeline/i/k;
+.field final Yp:Lcom/facebook/imagepipeline/i/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/k<",
@@ -41,7 +41,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/b;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     return-void
 .end method
@@ -51,19 +51,19 @@
 .method protected h(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
     return-void
 .end method
 
-.method protected jg()V
+.method protected jj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 .method protected n(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->o(F)V
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/o.smali b/com.discord/smali/com/facebook/imagepipeline/i/o.smali
index 30ec17928c..8a406ac2bc 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/o.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/o.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field private final TX:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vn:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
 
-.field final XF:Lcom/facebook/imagepipeline/i/aj;
+.field final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -52,13 +52,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -139,23 +139,23 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aab:Z
+    iget-boolean v1, v0, Lcom/facebook/imagepipeline/request/b;->aak:Z
 
     const/4 v2, 0x1
 
     if-nez v1, :cond_1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()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;->aai:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aar: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/i/o;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
     return-void
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v1
 
@@ -187,17 +187,17 @@
 
     invoke-interface {v1, v3, v4}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     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;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
 
     const/4 v4, 0x0
 
@@ -211,12 +211,12 @@
     :goto_0
     if-eqz v2, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
     goto :goto_1
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
     :goto_1
     new-instance v2, Ljava/util/concurrent/atomic/AtomicBoolean;
@@ -231,7 +231,7 @@
 
     move-result-object v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v5
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/s.smali b/com.discord/smali/com/facebook/imagepipeline/i/s.smali
index b18c33d922..2e495e7e31 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/s.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final Yg:Lcom/facebook/imagepipeline/i/k;
+.field final Yp:Lcom/facebook/imagepipeline/i/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/k<",
@@ -14,13 +14,13 @@
     .end annotation
 .end field
 
-.field final Yn:Lcom/facebook/imagepipeline/i/ak;
+.field final Yw:Lcom/facebook/imagepipeline/i/ak;
 
-.field Yo:J
+.field Yx:J
 
-.field Yp:I
+.field Yy:I
 
-.field Yq:Lcom/facebook/imagepipeline/a/a;
+.field Yz: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/i/s;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/s;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/s;->Yo:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/s;->Yx: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/i/s;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -67,12 +67,12 @@
     return-object v0
 .end method
 
-.method public final jY()Lcom/facebook/imagepipeline/i/am;
+.method public final kb()Lcom/facebook/imagepipeline/i/am;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/s;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/w.smali b/com.discord/smali/com/facebook/imagepipeline/i/w.smali
index 0e16e0c01a..0f6907fa1e 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/w.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/w.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final YO:[Ljava/lang/String;
+.field private static final YX:[Ljava/lang/String;
 
 
 # instance fields
-.field private final Vl:Landroid/content/ContentResolver;
+.field private final Vu:Landroid/content/ContentResolver;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/w;->YO:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/i/w;->YX:[Ljava/lang/String;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/i/z;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/w;->Vl:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -57,9 +57,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
 
-    sget-object v2, Lcom/facebook/imagepipeline/i/w;->YO:[Ljava/lang/String;
+    sget-object v2, Lcom/facebook/imagepipeline/i/w;->YX:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -164,7 +164,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-static {p1}, Lcom/facebook/common/j/f;->f(Landroid/net/Uri;)Z
 
@@ -186,7 +186,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
 
     invoke-virtual {v0, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
 
@@ -210,7 +210,7 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
 
     const-string v3, "r"
 
@@ -242,7 +242,7 @@
     throw v0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
 
     invoke-static {v0, p1}, Landroid/provider/ContactsContract$Contacts;->openContactPhotoInputStream(Landroid/content/ContentResolver;Landroid/net/Uri;)Ljava/io/InputStream;
 
@@ -290,7 +290,7 @@
     return-object v0
 
     :cond_4
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/w;->Vu:Landroid/content/ContentResolver;
 
     invoke-virtual {v0, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
 
@@ -303,7 +303,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalContentUriFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/x.smali b/com.discord/smali/com/facebook/imagepipeline/i/x.smali
index 6aeaa73d8c..546cfeaa56 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/x.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/x.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static final Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -27,17 +27,17 @@
     .end annotation
 .end field
 
-.field private static final YO:[Ljava/lang/String;
+.field private static final YX:[Ljava/lang/String;
 
-.field private static final YP:[Ljava/lang/String;
+.field private static final YY:[Ljava/lang/String;
 
-.field private static final YQ:Landroid/graphics/Rect;
+.field private static final YZ:Landroid/graphics/Rect;
 
-.field private static final YR:Landroid/graphics/Rect;
+.field private static final Za:Landroid/graphics/Rect;
 
 
 # instance fields
-.field private final Vl:Landroid/content/ContentResolver;
+.field private final Vu:Landroid/content/ContentResolver;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     const-class v0, Lcom/facebook/imagepipeline/i/x;
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/x;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->GI:Ljava/lang/Class;
 
     const/4 v0, 0x2
 
@@ -64,13 +64,13 @@
 
     aput-object v2, v0, v3
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YO:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YX:[Ljava/lang/String;
 
     new-array v0, v3, [Ljava/lang/String;
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YP:[Ljava/lang/String;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YY:[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/i/x;->YQ:Landroid/graphics/Rect;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->YZ: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/i/x;->YR:Landroid/graphics/Rect;
+    sput-object v0, Lcom/facebook/imagepipeline/i/x;->Za:Landroid/graphics/Rect;
 
     return-void
 .end method
@@ -98,7 +98,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/i/z;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/x;->Vl:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/x;->Vu:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -114,9 +114,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/x;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/x;->Vu:Landroid/content/ContentResolver;
 
-    sget-object v2, Lcom/facebook/imagepipeline/i/x;->YO:[Ljava/lang/String;
+    sget-object v2, Lcom/facebook/imagepipeline/i/x;->YX:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -186,7 +186,7 @@
 
     move-result v0
 
-    iput v0, p2, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput v0, p2, Lcom/facebook/imagepipeline/g/e;->Nv: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/i/x;->YR:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/i/x;->Za:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YR:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/i/x;->Za: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/i/x;->YQ:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/i/x;->YZ:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YQ:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YZ:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->height()I
 
@@ -275,11 +275,11 @@
 
     :cond_2
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/x;->Vl:Landroid/content/ContentResolver;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/x;->Vu:Landroid/content/ContentResolver;
 
     int-to-long v2, p2
 
-    sget-object p2, Lcom/facebook/imagepipeline/i/x;->YP:[Ljava/lang/String;
+    sget-object p2, Lcom/facebook/imagepipeline/i/x;->YY:[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;
 
@@ -419,7 +419,7 @@
     :catch_0
     move-exception v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/i/x;->Gz:Ljava/lang/Class;
+    sget-object v3, Lcom/facebook/imagepipeline/i/x;->GI: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/i/x;->YQ:Landroid/graphics/Rect;
+    sget-object v0, Lcom/facebook/imagepipeline/i/x;->YZ:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YQ:Landroid/graphics/Rect;
+    sget-object v1, Lcom/facebook/imagepipeline/i/x;->YZ:Landroid/graphics/Rect;
 
     invoke-virtual {v1}, Landroid/graphics/Rect;->height()I
 
@@ -468,7 +468,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     invoke-direct {p0, v0, p1}, Lcom/facebook/imagepipeline/i/x;->a(Landroid/net/Uri;Lcom/facebook/imagepipeline/a/e;)Lcom/facebook/imagepipeline/g/e;
 
@@ -492,7 +492,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalContentUriThumbnailFetchProducer"
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/y$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/y$1.smali
index c7f8ed5094..7758166503 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/y$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/y$1.smali
@@ -23,18 +23,18 @@
 
 
 # instance fields
-.field final synthetic YS:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic Zb:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic YT:Lcom/facebook/imagepipeline/i/y;
+.field final synthetic Zc:Lcom/facebook/imagepipeline/i/y;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/y;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/y$1;->YT:Lcom/facebook/imagepipeline/i/y;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/y$1;->Zc:Lcom/facebook/imagepipeline/i/y;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/y$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/y$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/i/aq;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/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/i/y$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/y$1;->YT:Lcom/facebook/imagepipeline/i/y;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/y$1;->Zc:Lcom/facebook/imagepipeline/i/y;
 
     invoke-virtual {v1, v0}, Lcom/facebook/imagepipeline/i/y;->q(Landroid/net/Uri;)Landroid/media/ExifInterface;
 
@@ -107,7 +107,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/y$1;->YT:Lcom/facebook/imagepipeline/i/y;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/y$1;->Zc:Lcom/facebook/imagepipeline/i/y;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/i/y;->a(Lcom/facebook/imagepipeline/i/y;)Lcom/facebook/common/g/g;
 
@@ -117,7 +117,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/y$1;->YT:Lcom/facebook/imagepipeline/i/y;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/y$1;->Zc:Lcom/facebook/imagepipeline/i/y;
 
     invoke-static {v2, v1, v0}, Lcom/facebook/imagepipeline/i/y;->a(Lcom/facebook/imagepipeline/i/y;Lcom/facebook/common/g/f;Landroid/media/ExifInterface;)Lcom/facebook/imagepipeline/g/e;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/y.smali b/com.discord/smali/com/facebook/imagepipeline/i/y.smali
index c375b7d9a2..39abe3cd96 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/y.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/y.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final Sc:Lcom/facebook/common/g/g;
+.field private final Sl:Lcom/facebook/common/g/g;
 
-.field private final Vl:Landroid/content/ContentResolver;
+.field private final Vu:Landroid/content/ContentResolver;
 
 .field private final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -33,9 +33,9 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/i/y;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y;->Sc:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y;->Sl:Lcom/facebook/common/g/g;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/y;->Vl:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/y;->Vu:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/i/y;)Lcom/facebook/common/g/g;
     .locals 0
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/i/y;->Sc:Lcom/facebook/common/g/g;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/i/y;->Sl: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/e/b;->QP:Lcom/facebook/e/c;
+    sget-object p0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
-    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nm:I
+    iput p1, v0, Lcom/facebook/imagepipeline/g/e;->Nv:I
 
     iput v2, v0, Lcom/facebook/imagepipeline/g/e;->mWidth:I
 
@@ -160,7 +160,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
@@ -168,7 +168,7 @@
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
@@ -214,7 +214,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y;->Vu:Landroid/content/ContentResolver;
 
     invoke-static {v0, p1}, Lcom/facebook/common/j/f;->a(Landroid/content/ContentResolver;Landroid/net/Uri;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/z$1.smali b/com.discord/smali/com/facebook/imagepipeline/i/z$1.smali
index 75b78ecc25..3d7876816f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/z$1.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/z$1.smali
@@ -23,26 +23,26 @@
 
 
 # instance fields
-.field final synthetic YS:Lcom/facebook/imagepipeline/request/b;
+.field final synthetic Yq:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic YV:Lcom/facebook/imagepipeline/i/z;
+.field final synthetic Yr:Ljava/lang/String;
 
-.field final synthetic Yh:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic Zb:Lcom/facebook/imagepipeline/request/b;
 
-.field final synthetic Yi:Ljava/lang/String;
+.field final synthetic Ze:Lcom/facebook/imagepipeline/i/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/z;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/request/b;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/z$1;->YV:Lcom/facebook/imagepipeline/i/z;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/z$1;->Ze:Lcom/facebook/imagepipeline/i/z;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/z$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/z$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p7, p0, Lcom/facebook/imagepipeline/i/z$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iput-object p7, p0, Lcom/facebook/imagepipeline/i/z$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p8, p0, Lcom/facebook/imagepipeline/i/z$1;->Yi:Ljava/lang/String;
+    iput-object p8, p0, Lcom/facebook/imagepipeline/i/z$1;->Yr:Ljava/lang/String;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/i/aq;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -62,9 +62,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$1;->YV:Lcom/facebook/imagepipeline/i/z;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$1;->Ze:Lcom/facebook/imagepipeline/i/z;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->YS:Lcom/facebook/imagepipeline/request/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Zb:Lcom/facebook/imagepipeline/request/b;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/z;->c(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/imagepipeline/g/e;
 
@@ -72,13 +72,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yr:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->YV:Lcom/facebook/imagepipeline/i/z;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Ze:Lcom/facebook/imagepipeline/i/z;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/z;->ki()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/z;->kl()Ljava/lang/String;
 
     move-result-object v2
 
@@ -91,15 +91,15 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->ju()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->jx()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Yi:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/z$1;->Yr:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/z$1;->YV:Lcom/facebook/imagepipeline/i/z;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/z$1;->Ze:Lcom/facebook/imagepipeline/i/z;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/z;->ki()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/z;->kl()Ljava/lang/String;
 
     move-result-object v3
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/i/z.smali b/com.discord/smali/com/facebook/imagepipeline/i/z.smali
index a877fba020..6f8dc9a2ab 100644
--- a/com.discord/smali/com/facebook/imagepipeline/i/z.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/i/z.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final Sc:Lcom/facebook/common/g/g;
+.field private final Sl:Lcom/facebook/common/g/g;
 
 .field private final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -31,7 +31,7 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/i/z;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z;->Sc:Lcom/facebook/common/g/g;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z;->Sl:Lcom/facebook/common/g/g;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v7
 
@@ -59,13 +59,13 @@
 
     move-result-object v8
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
     new-instance v9, Lcom/facebook/imagepipeline/i/z$1;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/z;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/z;->kl()Ljava/lang/String;
 
     move-result-object v4
 
@@ -115,7 +115,7 @@
     if-gtz p2, :cond_0
 
     :try_start_0
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/z;->Sc:Lcom/facebook/common/g/g;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/z;->Sl: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/i/z;->Sc:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/z;->Sl: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 ki()Ljava/lang/String;
+.method protected abstract kl()Ljava/lang/String;
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/j/b.smali b/com.discord/smali/com/facebook/imagepipeline/j/b.smali
index 3d1da7e66b..8f4849970f 100644
--- a/com.discord/smali/com/facebook/imagepipeline/j/b.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/j/b.smali
@@ -14,9 +14,9 @@
 
 
 # static fields
-.field public static final aan:Lcom/facebook/imagepipeline/j/b$a;
+.field public static final aaw:Lcom/facebook/imagepipeline/j/b$a;
 
-.field private static volatile aao:Lcom/facebook/imagepipeline/j/b$c;
+.field private static volatile aax:Lcom/facebook/imagepipeline/j/b$c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -32,11 +32,11 @@
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/j/b$b;-><init>(B)V
 
-    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aan:Lcom/facebook/imagepipeline/j/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aaw:Lcom/facebook/imagepipeline/j/b$a;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aao:Lcom/facebook/imagepipeline/j/b$c;
+    sput-object v0, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
 
     return-void
 .end method
@@ -49,20 +49,20 @@
     return-void
 .end method
 
-.method public static kF()Z
+.method public static kI()Z
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kG()Lcom/facebook/imagepipeline/j/b$c;
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kJ()Lcom/facebook/imagepipeline/j/b$c;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method private static kG()Lcom/facebook/imagepipeline/j/b$c;
+.method private static kJ()Lcom/facebook/imagepipeline/j/b$c;
     .locals 2
 
-    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aao:Lcom/facebook/imagepipeline/j/b$c;
+    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
 
     if-nez v0, :cond_1
 
@@ -71,7 +71,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/j/b;->aao:Lcom/facebook/imagepipeline/j/b$c;
+    sget-object v1, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
 
     if-nez v1, :cond_0
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v1}, Lcom/facebook/imagepipeline/j/a;-><init>()V
 
-    sput-object v1, Lcom/facebook/imagepipeline/j/b;->aao:Lcom/facebook/imagepipeline/j/b$c;
+    sput-object v1, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
 
     :cond_0
     monitor-exit v0
@@ -97,7 +97,7 @@
 
     :cond_1
     :goto_0
-    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aao:Lcom/facebook/imagepipeline/j/b$c;
+    sget-object v0, Lcom/facebook/imagepipeline/j/b;->aax:Lcom/facebook/imagepipeline/j/b$c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/a.smali b/com.discord/smali/com/facebook/imagepipeline/k/a.smali
index d3b49c32ce..5168dda7b6 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/a.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/a.smali
@@ -215,11 +215,11 @@
 
     move-result p0
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_1
 
@@ -249,7 +249,7 @@
 
     if-eqz p1, :cond_2
 
-    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TD:F
+    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
 
     goto :goto_1
 
@@ -265,11 +265,11 @@
 
     if-lez p3, :cond_4
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object p3
 
-    sget-object v1, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     if-ne p3, v1, :cond_3
 
@@ -289,7 +289,7 @@
 .method private static a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/g/e;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iz()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
 
     move-result p0
 
@@ -300,7 +300,7 @@
     return v0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/e.smali b/com.discord/smali/com/facebook/imagepipeline/k/e.smali
index 9070afade1..9d64c8e77b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/e.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final aaq:Lcom/facebook/common/d/e;
+.field public static final aaz: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/k/e;->aaq:Lcom/facebook/common/d/e;
+    sput-object v0, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
 
     return-void
 .end method
@@ -91,9 +91,9 @@
 
     move-result p3
 
-    sget-object v1, Lcom/facebook/imagepipeline/k/e;->aaq:Lcom/facebook/common/d/e;
+    sget-object v1, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result v2
 
@@ -198,26 +198,26 @@
 
     mul-float v1, p0, p3
 
-    iget v2, p1, Lcom/facebook/imagepipeline/a/e;->TD:F
+    iget v2, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
 
     cmpl-float v1, v1, v2
 
     if-lez v1, :cond_8
 
-    iget p3, p1, Lcom/facebook/imagepipeline/a/e;->TD:F
+    iget p3, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
 
     div-float/2addr p3, p0
 
     :cond_8
     mul-float p0, p2, p3
 
-    iget v1, p1, Lcom/facebook/imagepipeline/a/e;->TD:F
+    iget v1, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
 
     cmpl-float p0, p0, v1
 
     if-lez p0, :cond_9
 
-    iget p0, p1, Lcom/facebook/imagepipeline/a/e;->TD:F
+    iget p0, p1, Lcom/facebook/imagepipeline/a/e;->TM:F
 
     div-float/2addr p0, p2
 
@@ -227,7 +227,7 @@
     move p0, p3
 
     :goto_3
-    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TE:F
+    iget p1, p1, Lcom/facebook/imagepipeline/a/e;->TN:F
 
     const/high16 p2, 0x41000000    # 8.0f
 
@@ -253,7 +253,7 @@
 .method public static a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/g/e;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iA()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iD()Z
 
     move-result v0
 
@@ -268,7 +268,7 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iz()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
 
     move-result v0
 
@@ -277,7 +277,7 @@
     return p1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iB()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iE()I
 
     move-result p0
 
@@ -293,9 +293,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aaq:Lcom/facebook/common/d/e;
+    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result v1
 
@@ -467,11 +467,11 @@
 .method public static b(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/g/e;)I
     .locals 2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result p1
 
-    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aaq:Lcom/facebook/common/d/e;
+    sget-object v0, Lcom/facebook/imagepipeline/k/e;->aaz: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;->iz()Z
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iB()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iE()I
 
     move-result v0
 
     :cond_0
     div-int/lit8 v0, v0, 0x5a
 
-    sget-object p0, Lcom/facebook/imagepipeline/k/e;->aaq:Lcom/facebook/common/d/e;
+    sget-object p0, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
 
     add-int/2addr p1, v0
 
@@ -533,7 +533,7 @@
 .method private static h(Lcom/facebook/imagepipeline/g/e;)I
     .locals 2
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v0
 
@@ -554,7 +554,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/f.smali b/com.discord/smali/com/facebook/imagepipeline/k/f.smali
index 4cdec92a3e..58ba6122a1 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/f.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/f.smali
@@ -7,16 +7,16 @@
 
 
 # instance fields
-.field private final UQ:I
+.field private final UZ:I
 
-.field private final Um:Ljava/lang/Integer;
+.field private final Uv:Ljava/lang/Integer;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final Xy:Z
+.field private final XH:Z
 
-.field private final aar:Lcom/facebook/imagepipeline/k/d;
+.field private final aaA:Lcom/facebook/imagepipeline/k/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/k/f;->UQ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/k/f;->UZ:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/k/f;->Xy:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/k/f;->XH:Z
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/k/f;->aar:Lcom/facebook/imagepipeline/k/d;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/k/f;->aaA:Lcom/facebook/imagepipeline/k/d;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/k/f;->Um:Ljava/lang/Integer;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/k/f;->Uv:Ljava/lang/Integer;
 
     return-void
 .end method
@@ -52,9 +52,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget v0, p0, Lcom/facebook/imagepipeline/k/f;->UQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/k/f;->UZ:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/k/f;->Xy:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/k/f;->XH:Z
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/nativecode/b;->c(IZ)Lcom/facebook/imagepipeline/k/d;
 
@@ -72,7 +72,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/k/h;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/k/f;->UQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/k/f;->UZ:I
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/k/h;-><init>(I)V
 
@@ -88,7 +88,7 @@
 .method public final createImageTranscoder(Lcom/facebook/e/c;Z)Lcom/facebook/imagepipeline/k/c;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/k/f;->aar:Lcom/facebook/imagepipeline/k/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/k/f;->aaA:Lcom/facebook/imagepipeline/k/d;
 
     const/4 v1, 0x0
 
@@ -106,7 +106,7 @@
     :goto_0
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/k/f;->Um:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/k/f;->Uv:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/k/g.smali b/com.discord/smali/com/facebook/imagepipeline/k/g.smali
index 91633e6f01..4abcf428c4 100644
--- a/com.discord/smali/com/facebook/imagepipeline/k/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/k/g.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final UQ:I
+.field private final UZ:I
 
-.field private final Xw:Z
+.field private final XF:Z
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/k/g;->Xw:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/k/g;->XF:Z
 
-    iput p2, p0, Lcom/facebook/imagepipeline/k/g;->UQ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/k/g;->UZ:I
 
     return-void
 .end method
@@ -66,7 +66,7 @@
     :goto_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->ix()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()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/k/g;->Xw:Z
+    iget-boolean v6, v1, Lcom/facebook/imagepipeline/k/g;->XF:Z
 
     const/4 v7, 0x1
 
@@ -87,7 +87,7 @@
     goto :goto_2
 
     :cond_2
-    iget v6, v1, Lcom/facebook/imagepipeline/k/g;->UQ:I
+    iget v6, v1, Lcom/facebook/imagepipeline/k/g;->UZ:I
 
     move-object/from16 v8, p4
 
@@ -267,16 +267,16 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->ix()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/k/g;->Xw:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/k/g;->XF:Z
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/k/g;->UQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/k/g;->UZ:I
 
     invoke-static {p2, p3, p1, v0}, Lcom/facebook/imagepipeline/k/a;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/g/e;I)I
 
@@ -297,11 +297,11 @@
 .method public final c(Lcom/facebook/e/c;)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
 
     if-eq p1, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/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 646b5cacff..7a1468c0ce 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 Iq:Z
+.field private Iz:Z
 
-.field private final WU:J
+.field private final Xd:J
 
 .field private final mSize:I
 
@@ -19,7 +19,7 @@
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jU()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jX()V
 
     return-void
 .end method
@@ -35,11 +35,11 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 
     move-result-wide v1
 
-    iput-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iput-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     invoke-static {v0, p1, v0, p4, p3}, Lcom/facebook/imagepipeline/memory/u;->a(IIIII)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/s;->gl()J
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/memory/s;->go()J
 
     move-result-wide p1
 
@@ -119,7 +119,7 @@
 
     add-long/2addr p1, v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd: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;->WU:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
     int-to-long v2, p1
 
@@ -267,7 +267,7 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/u;->a(IIIII)V
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd: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/s;->jJ()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jM()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd: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;->WU:J
+    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd: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/s;->jJ()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jM()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
     cmp-long v5, v0, v2
 
@@ -489,7 +489,7 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/u;->a(IIIII)V
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd: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;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iq:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
     invoke-static {v0, v1}, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->nativeFree(J)V
     :try_end_0
@@ -624,10 +624,10 @@
     return v0
 .end method
 
-.method public final gl()J
+.method public final go()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
     return-wide v0
 .end method
@@ -638,7 +638,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iq:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Iz:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -654,10 +654,10 @@
     throw v0
 .end method
 
-.method public final jJ()J
+.method public final jM()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->WU:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/NativeMemoryChunk;->Xd:J
 
     return-wide v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/a.smali b/com.discord/smali/com/facebook/imagepipeline/memory/a.smali
index 2d8b984dc3..3f83c00364 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 Gz:Ljava/lang/Class;
+.field private final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -37,11 +37,11 @@
     .end annotation
 .end field
 
-.field final Uo:Lcom/facebook/common/g/b;
+.field final Ux:Lcom/facebook/common/g/b;
 
-.field final Wf:Lcom/facebook/imagepipeline/memory/ae;
+.field final Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Wg:Landroid/util/SparseArray;
+.field final Wp:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field final Wh:Ljava/util/Set;
+.field final Wq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -60,13 +60,13 @@
     .end annotation
 .end field
 
-.field private Wi:Z
+.field private Wr:Z
 
-.field final Wj:Lcom/facebook/imagepipeline/memory/a$a;
+.field final Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-.field final Wk:Lcom/facebook/imagepipeline/memory/a$a;
+.field final Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-.field private final Wl:Lcom/facebook/imagepipeline/memory/af;
+.field private final Wu:Lcom/facebook/imagepipeline/memory/af;
 
 
 # direct methods
@@ -79,7 +79,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GI: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;->Uo:Lcom/facebook/common/g/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Ux: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/ae;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
     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/af;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wl:Lcom/facebook/imagepipeline/memory/af;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wu:Lcom/facebook/imagepipeline/memory/af;
 
     new-instance p1, Landroid/util/SparseArray;
 
     invoke-direct {p1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ae;->Xr:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jE()V
 
     goto :goto_0
 
@@ -131,23 +131,23 @@
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->a(Landroid/util/SparseIntArray;)V
 
     :goto_0
-    invoke-static {}, Lcom/facebook/common/d/k;->gg()Ljava/util/Set;
+    invoke-static {}, Lcom/facebook/common/d/k;->gj()Ljava/util/Set;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wh:Ljava/util/Set;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wq: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;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt: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;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     return-void
 .end method
@@ -160,13 +160,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;->Wg:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v0}, Landroid/util/SparseArray;->clear()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xo:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xx:Landroid/util/SparseIntArray;
 
     if-eqz v0, :cond_1
 
@@ -193,7 +193,7 @@
 
     move-result v5
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     new-instance v7, Lcom/facebook/imagepipeline/memory/f;
 
@@ -201,9 +201,9 @@
 
     move-result v8
 
-    iget-object v9, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v9, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean v9, v9, Lcom/facebook/imagepipeline/memory/ae;->Xr:Z
+    iget-boolean v9, v9, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
 
     invoke-direct {v7, v8, v4, v5, v9}, Lcom/facebook/imagepipeline/memory/f;-><init>(IIIZ)V
 
@@ -214,7 +214,7 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wi:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wr:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -226,7 +226,7 @@
     const/4 p1, 0x1
 
     :try_start_1
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wi:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wr:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -261,7 +261,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -296,7 +296,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -306,7 +306,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wi:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wr:Z
 
     if-nez v1, :cond_0
 
@@ -321,7 +321,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v1, "creating new bucket %s"
 
@@ -336,7 +336,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1, v0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
     :try_end_0
@@ -366,13 +366,13 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -388,17 +388,17 @@
 
     :cond_0
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xn:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v4, v4, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v4, v4, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     add-int/2addr v3, v4
 
@@ -411,13 +411,13 @@
     invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/memory/a;->trimToSize(I)V
 
     :cond_1
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -446,7 +446,7 @@
     throw p1
 .end method
 
-.method private iv()V
+.method private iy()V
     .locals 7
 
     const/4 v0, 0x2
@@ -457,9 +457,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
@@ -467,15 +467,15 @@
 
     move-result-object v3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv: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;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
     iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->mCount:I
 
@@ -483,9 +483,9 @@
 
     move-result-object v5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -499,21 +499,21 @@
     return-void
 .end method
 
-.method private declared-synchronized jA()V
+.method private declared-synchronized jD()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jD()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jG()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     if-nez v0, :cond_0
 
@@ -545,19 +545,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized jB()V
+.method private declared-synchronized jE()V
     .locals 9
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xo:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xx:Landroid/util/SparseIntArray;
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v1}, Landroid/util/SparseArray;->clear()V
 
@@ -580,7 +580,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     new-instance v6, Lcom/facebook/imagepipeline/memory/f;
 
@@ -588,9 +588,9 @@
 
     move-result v7
 
-    iget-object v8, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v8, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean v8, v8, Lcom/facebook/imagepipeline/memory/ae;->Xr:Z
+    iget-boolean v8, v8, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
 
     invoke-direct {v6, v7, v4, v1, v8}, Lcom/facebook/imagepipeline/memory/f;-><init>(IIIZ)V
 
@@ -601,7 +601,7 @@
     goto :goto_0
 
     :cond_0
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wi:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wr:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -613,7 +613,7 @@
     const/4 v0, 0x1
 
     :try_start_1
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wi:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wr:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -635,21 +635,21 @@
     goto :goto_1
 .end method
 
-.method private declared-synchronized jC()V
+.method private declared-synchronized jF()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jD()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jG()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xn:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/memory/a;->trimToSize(I)V
     :try_end_0
@@ -668,25 +668,25 @@
     throw v0
 .end method
 
-.method private declared-synchronized jD()Z
+.method private declared-synchronized jG()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xn:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -719,21 +719,21 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     add-int/2addr v0, v1
 
     sub-int/2addr v0, p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     invoke-static {v0, v1}, Ljava/lang/Math;->min(II)I
 
@@ -757,7 +757,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v3, "trimToSize: TargetSize = %d; Initial Size = %d; Bytes to free = %d"
 
@@ -765,13 +765,13 @@
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v5, v5, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v5, v5, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v6, v6, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v6, v6, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     add-int/2addr v5, v6
 
@@ -786,12 +786,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;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()V
 
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v3}, Landroid/util/SparseArray;->size()I
 
@@ -801,7 +801,7 @@
 
     if-lez v0, :cond_3
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wg:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wp:Landroid/util/SparseArray;
 
     invoke-virtual {v3, v2}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
@@ -812,7 +812,7 @@
     :goto_1
     if-lez v0, :cond_2
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/memory/f;->jG()Ljava/lang/Object;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/memory/f;->jJ()Ljava/lang/Object;
 
     move-result-object v4
 
@@ -820,13 +820,13 @@
 
     invoke-virtual {p0, v4}, Lcom/facebook/imagepipeline/memory/a;->F(Ljava/lang/Object;)V
 
-    iget v4, v3, Lcom/facebook/imagepipeline/memory/f;->Wu:I
+    iget v4, v3, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     sub-int/2addr v0, v4
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v5, v3, Lcom/facebook/imagepipeline/memory/f;->Wu:I
+    iget v5, v3, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
     invoke-virtual {v4, v5}, Lcom/facebook/imagepipeline/memory/a$a;->an(I)V
 
@@ -838,7 +838,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->D(I)Z
 
@@ -846,7 +846,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v1, "trimToSize: TargetSize = %d; Final Size = %d"
 
@@ -854,13 +854,13 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v2, v2, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     add-int/2addr v2, v3
 
@@ -940,17 +940,17 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/f;->jG()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/f;->jJ()Ljava/lang/Object;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget v1, p1, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v1, p1, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iput v1, p1, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iput v1, p1, Lcom/facebook/imagepipeline/memory/f;->WH:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -997,9 +997,9 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xr:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/memory/ae;->XA:Z
 
     const v2, 0x7fffffff
 
@@ -1018,7 +1018,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jA()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jD()V
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->ag(I)I
 
@@ -1041,7 +1041,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wh:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wq:Ljava/util/Set;
 
     invoke-interface {p1, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1057,15 +1057,15 @@
 
     move-result v0
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v3, v0}, Lcom/facebook/imagepipeline/memory/a$a;->am(I)V
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v3, v0}, Lcom/facebook/imagepipeline/memory/a$a;->an(I)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->D(I)Z
 
@@ -1073,7 +1073,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v1, "get (reuse) (object, size) = (%x, %s)"
 
@@ -1107,17 +1107,17 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v3, v2}, Lcom/facebook/imagepipeline/memory/a$a;->am(I)V
 
     if-eqz v0, :cond_2
 
-    iget v3, v0, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v3, v0, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     add-int/lit8 v3, v3, 0x1
 
-    iput v3, v0, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iput v3, v0, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     :cond_2
     monitor-exit p0
@@ -1141,7 +1141,7 @@
     monitor-enter p0
 
     :try_start_2
-    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v4, v2}, Lcom/facebook/imagepipeline/memory/a$a;->an(I)V
 
@@ -1151,7 +1151,7 @@
 
     if-eqz v2, :cond_3
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->jH()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->jK()V
 
     :cond_3
     monitor-exit p0
@@ -1164,7 +1164,7 @@
     monitor-enter p0
 
     :try_start_3
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wh:Ljava/util/Set;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wq:Ljava/util/Set;
 
     invoke-interface {v2, v0}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -1172,9 +1172,9 @@
 
     invoke-static {v2}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jC()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jF()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()V
 
     invoke-static {v1}, Lcom/facebook/common/e/a;->D(I)Z
 
@@ -1182,7 +1182,7 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v2, "get (alloc) (object, size) = (%x, %s)"
 
@@ -1228,17 +1228,17 @@
     :try_start_5
     new-instance p1, Lcom/facebook/imagepipeline/memory/a$c;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xm:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
-    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v3, v3, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     invoke-direct {p1, v0, v1, v3, v2}, Lcom/facebook/imagepipeline/memory/a$c;-><init>(IIII)V
 
@@ -1279,7 +1279,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wh:Ljava/util/Set;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/a;->Wq:Ljava/util/Set;
 
     invoke-interface {v3, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -1293,7 +1293,7 @@
 
     if-nez v3, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v2, "release (free, value unrecognized) (object, size) = (%x, %s)"
 
@@ -1324,9 +1324,9 @@
     :cond_0
     if-eqz v2, :cond_6
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
-    iget-object v7, v2, Lcom/facebook/imagepipeline/memory/f;->Ww:Ljava/util/Queue;
+    iget-object v7, v2, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
 
     invoke-interface {v7}, Ljava/util/Queue;->size()I
 
@@ -1334,7 +1334,7 @@
 
     add-int/2addr v3, v7
 
-    iget v7, v2, Lcom/facebook/imagepipeline/memory/f;->Wv:I
+    iget v7, v2, Lcom/facebook/imagepipeline/memory/f;->WE:I
 
     if-le v3, v7, :cond_1
 
@@ -1348,7 +1348,7 @@
     :goto_0
     if-nez v3, :cond_6
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jD()Z
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->jG()Z
 
     move-result v3
 
@@ -1365,11 +1365,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;->Wx:Z
+    iget-boolean v3, v2, Lcom/facebook/imagepipeline/memory/f;->WG:Z
 
     if-eqz v3, :cond_4
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     if-lez v3, :cond_3
 
@@ -1378,26 +1378,26 @@
     :cond_3
     invoke-static {v5}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     sub-int/2addr v3, v6
 
-    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     invoke-virtual {v2, p1}, Lcom/facebook/imagepipeline/memory/f;->K(Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_4
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     if-lez v3, :cond_5
 
-    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     sub-int/2addr v3, v6
 
-    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iput v3, v2, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     invoke-virtual {v2, p1}, Lcom/facebook/imagepipeline/memory/f;->K(Ljava/lang/Object;)V
 
@@ -1415,11 +1415,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;->Wk:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wt:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/memory/a$a;->am(I)V
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {v2, v1}, Lcom/facebook/imagepipeline/memory/a$a;->an(I)V
 
@@ -1429,7 +1429,7 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v2, "release (reuse) (object, size) = (%x, %s)"
 
@@ -1453,7 +1453,7 @@
     :goto_2
     if-eqz v2, :cond_7
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->jH()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/f;->jK()V
 
     :cond_7
     invoke-static {v4}, Lcom/facebook/common/e/a;->D(I)Z
@@ -1462,7 +1462,7 @@
 
     if-eqz v2, :cond_8
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->Gz:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/a;->GI:Ljava/lang/Class;
 
     const-string v3, "release (free) (object, size) = (%x, %s)"
 
@@ -1483,13 +1483,13 @@
     :cond_8
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/a;->F(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Wj:Lcom/facebook/imagepipeline/memory/a$a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/a;->Ws:Lcom/facebook/imagepipeline/memory/a$a;
 
     invoke-virtual {p1, v1}, Lcom/facebook/imagepipeline/memory/a$a;->an(I)V
 
     :cond_9
     :goto_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iv()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/a;->iy()V
 
     monitor-exit p0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali
index 70afb031c4..dc749dbf8b 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ab.smali
@@ -42,7 +42,7 @@
     .end annotation
 .end method
 
-.method public abstract jG()Ljava/lang/Object;
+.method public abstract jJ()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali b/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali
index b8e6f9d5df..ecb6481eec 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/ae.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field public final Xm:I
+.field public XA:Z
 
-.field public final Xn:I
+.field public final XB:I
 
-.field public final Xo:Landroid/util/SparseIntArray;
+.field public final Xv:I
 
-.field public final Xp:I
+.field public final Xw:I
 
-.field public final Xq:I
+.field public final Xx:Landroid/util/SparseIntArray;
 
-.field public Xr:Z
+.field public final Xy:I
 
-.field public final Xs:I
+.field public final Xz: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/ae;->Xn:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/ae;->Xw:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/ae;->Xm:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/ae;->Xv:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/ae;->Xo:Landroid/util/SparseIntArray;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/ae;->Xx:Landroid/util/SparseIntArray;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/memory/ae;->Xp:I
+    iput p4, p0, Lcom/facebook/imagepipeline/memory/ae;->Xy:I
 
-    iput p5, p0, Lcom/facebook/imagepipeline/memory/ae;->Xq:I
+    iput p5, p0, Lcom/facebook/imagepipeline/memory/ae;->Xz:I
 
-    iput p6, p0, Lcom/facebook/imagepipeline/memory/ae;->Xs:I
+    iput p6, p0, Lcom/facebook/imagepipeline/memory/ae;->XB: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 c54112831f..d036583c5f 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 Wu:I
+.field public final WD:I
 
-.field public final Wv:I
+.field public final WE:I
 
-.field final Ww:Ljava/util/Queue;
+.field final WF:Ljava/util/Queue;
 
-.field final Wx:Z
+.field final WG:Z
 
-.field Wy:I
+.field WH: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;->Wu:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/f;->WD:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/f;->Wv:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/f;->WE:I
 
     new-instance p1, Ljava/util/LinkedList;
 
     invoke-direct {p1}, Ljava/util/LinkedList;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/f;->Ww:Ljava/util/Queue;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iput p3, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/memory/f;->Wx:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/memory/f;->WG:Z
 
     return-void
 .end method
@@ -97,14 +97,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->Ww:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     return-void
 .end method
 
-.method public jG()Ljava/lang/Object;
+.method public jJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -115,7 +115,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->Ww:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/f;->WF:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -124,10 +124,10 @@
     return-object v0
 .end method
 
-.method public final jH()V
+.method public final jK()V
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     const/4 v1, 0x1
 
@@ -143,11 +143,11 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkState(Z)V
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/f;->Wy:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/f;->WH:I
 
     return-void
 .end method
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 12d9f0a4b9..2e2b1c0461 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 WC:Lcom/facebook/imagepipeline/memory/g$a;
+.field WL: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 WD:Ljava/util/LinkedList;
+.field WM:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field WE:Lcom/facebook/imagepipeline/memory/g$a;
+.field WN: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;->WC:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->WL: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;->WD:Ljava/util/LinkedList;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/g$a;->WM:Ljava/util/LinkedList;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->WE:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g$a;->WN: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 67d0e7ded2..7fc9e58e52 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/g.smali
@@ -21,31 +21,7 @@
 
 
 # instance fields
-.field WA:Lcom/facebook/imagepipeline/memory/g$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/memory/g$a<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field WB:Lcom/facebook/imagepipeline/memory/g$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/memory/g$a<",
-            "TT;>;"
-        }
-    .end annotation
-
-    .annotation runtime Ljavax/annotation/Nullable;
-    .end annotation
-.end field
-
-.field protected final Wz:Landroid/util/SparseArray;
+.field protected final WI:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -55,6 +31,30 @@
     .end annotation
 .end field
 
+.field WJ:Lcom/facebook/imagepipeline/memory/g$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/memory/g$a<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
+.field WK:Lcom/facebook/imagepipeline/memory/g$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/memory/g$a<",
+            "TT;>;"
+        }
+    .end annotation
+
+    .annotation runtime Ljavax/annotation/Nullable;
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>()V
@@ -66,7 +66,7 @@
 
     invoke-direct {v0}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->Wz:Landroid/util/SparseArray;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WI: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;->WC:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WL:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/memory/g$a;->WE:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-eqz v0, :cond_0
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WE:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_0
     if-eqz v1, :cond_1
 
-    iput-object v0, v1, Lcom/facebook/imagepipeline/memory/g$a;->WC:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, v1, Lcom/facebook/imagepipeline/memory/g$a;->WL:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_1
     const/4 v2, 0x0
 
-    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->WC:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->WL:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->WE:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v2, p1, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->WA:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne p1, v2, :cond_2
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WA:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WB:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WK:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-ne p1, v1, :cond_3
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WB:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WK: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;->WA:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WJ: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;->WA:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
     if-nez v0, :cond_1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WA:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WJ:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WB:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WK:Lcom/facebook/imagepipeline/memory/g$a;
 
     return-void
 
     :cond_1
-    iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WE:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WN:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WC:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WL:Lcom/facebook/imagepipeline/memory/g$a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WA:Lcom/facebook/imagepipeline/memory/g$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/g;->WJ: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;->Wz:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WI: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;->WD:Ljava/util/LinkedList;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/g$a;->WM: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;->Wz:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WI: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;->Wz:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/g;->WI: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;->WD:Ljava/util/LinkedList;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WM: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 jI()Ljava/lang/Object;
+.method public final declared-synchronized jL()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;->WB:Lcom/facebook/imagepipeline/memory/g$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/g;->WK: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;->WD:Ljava/util/LinkedList;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/memory/g$a;->WM: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;->WD:Ljava/util/LinkedList;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/memory/g$a;->WM: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;->Wz:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/g;->WI: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 ee0c2fe8b3..cc2bf52267 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/i.smali
@@ -8,9 +8,9 @@
 
 
 # instance fields
-.field private WF:Ljava/nio/ByteBuffer;
+.field private WO:Ljava/nio/ByteBuffer;
 
-.field private final WG:J
+.field private final WP:J
 
 .field private final mSize:I
 
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
 
     iput p1, p0, Lcom/facebook/imagepipeline/memory/i;->mSize:I
 
@@ -35,7 +35,7 @@
 
     int-to-long v0, p1
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WG:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-static {v0, p1, v0, p4, p3}, Lcom/facebook/imagepipeline/memory/u;->a(IIIII)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WO: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;->WF:Ljava/nio/ByteBuffer;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/i;->WO: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;->WF:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO: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/u;->a(IIIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
 
     invoke-virtual {p1, p2, p3, p4}, Ljava/nio/ByteBuffer;->get([BII)Ljava/nio/ByteBuffer;
     :try_end_0
@@ -242,11 +242,11 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jJ()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jM()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WG:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
 
     const/4 v4, 0x0
 
@@ -260,7 +260,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/i;->WG:J
+    iget-wide v1, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->toHexString(J)Ljava/lang/String;
 
@@ -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/s;->jJ()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jM()J
 
     move-result-wide v1
 
@@ -297,11 +297,11 @@
     invoke-static {v4}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
     :cond_0
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jJ()J
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/memory/s;->jM()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WG:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
 
     cmp-long v5, v0, v2
 
@@ -427,11 +427,11 @@
 
     invoke-static {p1, v0, p3, p4, v1}, Lcom/facebook/imagepipeline/memory/u;->a(IIIII)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
 
     invoke-virtual {v0, p1}, Ljava/nio/ByteBuffer;->position(I)Ljava/nio/Buffer;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/i;->WO: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;->WF:Ljava/nio/ByteBuffer;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -481,7 +481,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -505,7 +505,7 @@
     return v0
 .end method
 
-.method public final gl()J
+.method public final go()J
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -523,7 +523,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WF:Ljava/nio/ByteBuffer;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/i;->WO:Ljava/nio/ByteBuffer;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -555,10 +555,10 @@
     goto :goto_1
 .end method
 
-.method public final jJ()J
+.method public final jM()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WG:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/i;->WP:J
 
     return-wide v0
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/r.smali b/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
index e84197637f..83af9a09fd 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/r.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final WP:Ljava/util/Set;
+.field private final WZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final WQ:Lcom/facebook/imagepipeline/memory/g;
+.field private final Xa: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/r;->WP:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WZ: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/r;->WQ:Lcom/facebook/imagepipeline/memory/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->Xa: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/r;->WP:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WZ:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -112,7 +112,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WP:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WZ:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -124,7 +124,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WQ:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->Xa:Lcom/facebook/imagepipeline/memory/g;
 
     invoke-virtual {p0, p1}, Lcom/facebook/imagepipeline/memory/r;->J(Ljava/lang/Object;)I
 
@@ -157,7 +157,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WQ:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->Xa:Lcom/facebook/imagepipeline/memory/g;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/g;->ao(I)Ljava/lang/Object;
 
@@ -170,7 +170,7 @@
     return-object p1
 .end method
 
-.method public final jG()Ljava/lang/Object;
+.method public final jJ()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -181,9 +181,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->WQ:Lcom/facebook/imagepipeline/memory/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/r;->Xa:Lcom/facebook/imagepipeline/memory/g;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->jI()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/g;->jL()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/s.smali b/com.discord/smali/com/facebook/imagepipeline/memory/s.smali
index 2ffa2abcdb..ff2f9ef249 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/s.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/s.smali
@@ -27,7 +27,7 @@
 .method public abstract getSize()I
 .end method
 
-.method public abstract gl()J
+.method public abstract go()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/lang/UnsupportedOperationException;
@@ -38,5 +38,5 @@
 .method public abstract isClosed()Z
 .end method
 
-.method public abstract jJ()J
+.method public abstract jM()J
 .end method
diff --git a/com.discord/smali/com/facebook/imagepipeline/memory/v.smali b/com.discord/smali/com/facebook/imagepipeline/memory/v.smali
index cca8d2f01c..33b725d9c7 100644
--- a/com.discord/smali/com/facebook/imagepipeline/memory/v.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/memory/v.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field WR:Lcom/facebook/common/references/CloseableReference;
+.field Xb: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;->go()Lcom/facebook/common/references/CloseableReference;
+    invoke-virtual {p1}, Lcom/facebook/common/references/CloseableReference;->gr()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/v;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     iput p2, p0, Lcom/facebook/imagepipeline/memory/v;->mSize:I
 
     return-void
 .end method
 
-.method private declared-synchronized gt()V
+.method private declared-synchronized gw()V
     .locals 1
 
     monitor-enter p0
@@ -115,7 +115,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gw()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/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb: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/v;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gw()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/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb: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/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb: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/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb:Lcom/facebook/common/references/CloseableReference;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -257,7 +257,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -283,7 +283,7 @@
     throw v0
 .end method
 
-.method public final declared-synchronized gl()J
+.method public final declared-synchronized go()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -294,9 +294,9 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gw()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -304,7 +304,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/memory/s;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/s;->gl()J
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/s;->go()J
 
     move-result-wide v0
     :try_end_0
@@ -328,7 +328,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/v;->Xb: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/v;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/v;->gw()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/v;->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 4eeec8e637..35b9a31456 100644
--- a/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder.smali
@@ -15,18 +15,18 @@
 
 
 # static fields
-.field protected static final Xt:[B
+.field protected static final XC:[B
 
 
 # instance fields
-.field private final Xu:Lcom/facebook/imagepipeline/memory/b;
+.field private final XD:Lcom/facebook/imagepipeline/memory/b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jU()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jX()V
 
     const/4 v0, 0x2
 
@@ -34,7 +34,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xt:[B
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XC:[B
 
     return-void
 
@@ -50,11 +50,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->jF()Lcom/facebook/imagepipeline/memory/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/c;->jI()Lcom/facebook/imagepipeline/memory/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
     return-void
 .end method
@@ -161,7 +161,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;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/b;->c(Landroid/graphics/Bitmap;)Z
 
@@ -169,9 +169,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/b;->Wp:Lcom/facebook/common/references/b;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/b;->Wy: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;
 
@@ -202,7 +202,7 @@
 
     const/4 v0, 0x1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->getCount()I
 
@@ -216,9 +216,9 @@
 
     const/4 v0, 0x2
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->fO()J
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->fR()J
 
     move-result-wide v2
 
@@ -230,9 +230,9 @@
 
     const/4 v0, 0x3
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->jE()I
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->jH()I
 
     move-result v2
 
@@ -244,7 +244,7 @@
 
     const/4 v0, 0x4
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->Xu:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->XD:Lcom/facebook/imagepipeline/memory/b;
 
     invoke-virtual {v2}, Lcom/facebook/imagepipeline/memory/b;->getMaxSize()I
 
@@ -371,7 +371,7 @@
         }
     .end annotation
 
-    iget p3, p1, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iget p3, p1, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
     invoke-static {p3, p2}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->a(ILandroid/graphics/Bitmap$Config;)Landroid/graphics/BitmapFactory$Options;
 
@@ -386,7 +386,7 @@
     invoke-static {p2, p5}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder$OreoUtils;->a(Landroid/graphics/BitmapFactory$Options;Landroid/graphics/ColorSpace;)V
 
     :cond_0
-    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
     invoke-static {p1}, Lcom/facebook/common/references/CloseableReference;->b(Lcom/facebook/common/references/CloseableReference;)Lcom/facebook/common/references/CloseableReference;
 
@@ -441,7 +441,7 @@
         }
     .end annotation
 
-    iget p3, p1, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iget p3, p1, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
     invoke-static {p3, p2}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder;->a(ILandroid/graphics/Bitmap$Config;)Landroid/graphics/BitmapFactory$Options;
 
@@ -456,7 +456,7 @@
     invoke-static {p2, p4}, Lcom/facebook/imagepipeline/nativecode/DalvikPurgeableDecoder$OreoUtils;->a(Landroid/graphics/BitmapFactory$Options;Landroid/graphics/ColorSpace;)V
 
     :cond_0
-    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/g/e;->Wd: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 f03088cd40..7d955f04e8 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 UQ:I
+.field private UZ:I
 
-.field private Xw:Z
+.field private XF:Z
 
-.field private Xx:Z
+.field private XG:Z
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fD()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;->Xw:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XF:Z
 
-    iput p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UQ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UZ:I
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Xx:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XG:Z
 
     return-void
 .end method
@@ -86,12 +86,12 @@
     :cond_0
     if-nez p3, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->ix()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p3
 
     :cond_1
-    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->UZ:I
 
     invoke-static {p3, p4, p1, v0}, Lcom/facebook/imagepipeline/k/a;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/g/e;I)I
 
@@ -100,7 +100,7 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Xw:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XF:Z
 
     invoke-static {p3, p4, p1, v2}, Lcom/facebook/imagepipeline/k/e;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/g/e;Z)I
 
@@ -110,7 +110,7 @@
 
     move-result v2
 
-    iget-boolean v3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Xx:Z
+    iget-boolean v3, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XG:Z
 
     if-eqz v3, :cond_2
 
@@ -121,9 +121,9 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/facebook/imagepipeline/k/e;->aaq:Lcom/facebook/common/d/e;
+    sget-object v2, Lcom/facebook/imagepipeline/k/e;->aaz:Lcom/facebook/common/d/e;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jq()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jt()I
 
     move-result v3
 
@@ -160,7 +160,7 @@
 
     move-result p3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fD()V
 
     if-lez p4, :cond_3
 
@@ -259,7 +259,7 @@
 
     move-result p3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/c;->fD()V
 
     if-lez p4, :cond_a
 
@@ -384,12 +384,12 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->ix()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object p2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->Xw:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoder;->XF:Z
 
     invoke-static {p2, p3, p1, v0}, Lcom/facebook/imagepipeline/k/e;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/g/e;Z)I
 
@@ -412,7 +412,7 @@
 .method public final c(Lcom/facebook/e/c;)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/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 3a2de8994a..56ba9314fc 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 UQ:I
+.field private final UZ:I
 
-.field private final Xy:Z
+.field private final XH:Z
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->UQ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->UZ:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->Xy:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->XH:Z
 
     return-void
 .end method
@@ -32,7 +32,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/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;->UQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->UZ:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->Xy:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/nativecode/NativeJpegTranscoderFactory;->XH: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 02980770a8..39553c0e05 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -16,18 +16,18 @@
     .end annotation
 .end field
 
-.field private static final XD:[B
+.field private static final XM:[B
 
 
 # instance fields
-.field private final RY:Lcom/facebook/imagepipeline/memory/d;
+.field private final Sh:Lcom/facebook/imagepipeline/memory/d;
 
-.field private final XB:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+.field private final XK:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final XC:Landroidx/core/util/Pools$SynchronizedPool;
+.field final XL: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->GI: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;->XD:[B
+    sput-object v0, Lcom/facebook/imagepipeline/platform/b;->XM:[B
 
     return-void
 
@@ -86,18 +86,18 @@
     const/4 v0, 0x0
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/b;->XB:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/b;->XK:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->XC:Landroidx/core/util/Pools$SynchronizedPool;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->XL: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;->XC:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->XL: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/g/e;->VX:I
+    iget v1, p0, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
     iput v1, v0, Landroid/graphics/BitmapFactory$Options;->inSampleSize:I
 
@@ -227,7 +227,7 @@
 
     if-lt v2, v3, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/platform/b;->XB:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/platform/b;->XK:Lcom/facebook/imagepipeline/platform/PreverificationHelper;
 
     if-eqz v2, :cond_1
 
@@ -273,7 +273,7 @@
 
     move-result v2
 
-    iget-object v7, p0, Lcom/facebook/imagepipeline/platform/b;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v7, p0, Lcom/facebook/imagepipeline/platform/b;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {v7, v2}, Lcom/facebook/imagepipeline/memory/d;->get(I)Ljava/lang/Object;
 
@@ -302,7 +302,7 @@
     iput-object p4, p2, Landroid/graphics/BitmapFactory$Options;->inPreferredColorSpace:Landroid/graphics/ColorSpace;
 
     :cond_5
-    iget-object p4, p0, Lcom/facebook/imagepipeline/platform/b;->XC:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p4, p0, Lcom/facebook/imagepipeline/platform/b;->XL:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p4}, Landroidx/core/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object;
 
@@ -377,7 +377,7 @@
 
     :catch_1
     :try_start_4
-    sget-object v1, Lcom/facebook/imagepipeline/platform/b;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/imagepipeline/platform/b;->GI:Ljava/lang/Class;
 
     const-string v3, "Could not decode region %s, decoding full bitmap instead."
 
@@ -424,7 +424,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
     :cond_a
-    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->XC:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->XL:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p1, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -435,7 +435,7 @@
     goto :goto_5
 
     :cond_b
-    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {p1, v2}, Lcom/facebook/imagepipeline/memory/d;->r(Ljava/lang/Object;)V
 
@@ -449,7 +449,7 @@
 
     :cond_c
     :goto_5
-    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/platform/b;->Sh: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;
 
@@ -468,7 +468,7 @@
     if-eqz v2, :cond_d
 
     :try_start_6
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {p2, v2}, Lcom/facebook/imagepipeline/memory/d;->r(Ljava/lang/Object;)V
 
@@ -480,7 +480,7 @@
 
     if-eqz v2, :cond_e
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p3, p0, Lcom/facebook/imagepipeline/platform/b;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {p3, v2}, Lcom/facebook/imagepipeline/memory/d;->r(Ljava/lang/Object;)V
     :try_end_6
@@ -496,7 +496,7 @@
 
     if-eqz p1, :cond_f
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->il()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->io()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object p3
 
@@ -507,7 +507,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;->XC:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->XL:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p2, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -527,7 +527,7 @@
     .catchall {:try_start_9 .. :try_end_9} :catchall_2
 
     :goto_6
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->XC:Landroidx/core/util/Pools$SynchronizedPool;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/b;->XL:Landroidx/core/util/Pools$SynchronizedPool;
 
     invoke-virtual {p2, p4}, Landroidx/core/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z
 
@@ -607,9 +607,9 @@
     .end annotation
 
     :goto_0
-    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
-    sget-object v0, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     const/4 v1, 0x0
 
@@ -623,18 +623,18 @@
     goto :goto_2
 
     :cond_0
-    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->VV:Lcom/facebook/common/d/l;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->We:Lcom/facebook/common/d/l;
 
     if-eqz p3, :cond_1
 
     goto :goto_1
 
     :cond_1
-    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->Wd: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/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object p3, p1, Lcom/facebook/imagepipeline/g/e;->Wd:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {p3}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -695,7 +695,7 @@
 
     new-instance p3, Lcom/facebook/common/i/b;
 
-    sget-object v3, Lcom/facebook/imagepipeline/platform/b;->XD:[B
+    sget-object v3, Lcom/facebook/imagepipeline/platform/b;->XM:[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 3f3091a9fa..be7a155b3f 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 XE:Ljava/lang/reflect/Method;
+.field private static XN:Ljava/lang/reflect/Method;
 
 
 # instance fields
-.field private final UJ:Lcom/facebook/common/k/b;
+.field private final UT: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;->gz()Lcom/facebook/common/k/b;
+    invoke-static {}, Lcom/facebook/common/k/c;->gC()Lcom/facebook/common/k/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/c;->UJ:Lcom/facebook/common/k/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/platform/c;->UT: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;->UJ:Lcom/facebook/common/k/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->UT:Lcom/facebook/common/k/b;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->UJ:Lcom/facebook/common/k/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/platform/c;->UT: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;
 
@@ -247,7 +247,7 @@
     .locals 2
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/platform/c;->jW()Ljava/lang/reflect/Method;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/platform/c;->jZ()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
@@ -275,13 +275,13 @@
     throw p1
 .end method
 
-.method private declared-synchronized jW()Ljava/lang/reflect/Method;
+.method private declared-synchronized jZ()Ljava/lang/reflect/Method;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XE:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XN: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;->XE:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/facebook/imagepipeline/platform/c;->XN: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;->XE:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XN: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;->Xt:[B
+    sget-object v0, Lcom/facebook/imagepipeline/platform/c;->XC:[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 93a66dd74e..70d7b8e9d9 100644
--- a/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
+++ b/com.discord/smali/com/facebook/imagepipeline/request/ImageRequestBuilder.smali
@@ -12,58 +12,58 @@
 
 
 # instance fields
-.field public Sk:Lcom/facebook/imagepipeline/a/e;
+.field public St:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public Sl:Lcom/facebook/imagepipeline/a/f;
+.field public Su:Lcom/facebook/imagepipeline/a/f;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field Sm:Lcom/facebook/imagepipeline/a/b;
+.field Sv:Lcom/facebook/imagepipeline/a/b;
 
-.field TS:Lcom/facebook/imagepipeline/h/c;
+.field UH:Z
+
+.field UO:Z
+
+.field Ub:Lcom/facebook/imagepipeline/h/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field UF:Z
-
-.field Uy:Z
-
-.field public VZ:Lcom/facebook/imagepipeline/a/a;
+.field public Wi:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public XI:Lcom/facebook/imagepipeline/request/b$b;
+.field public XR:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public ZV:Lcom/facebook/imagepipeline/request/b$a;
-
-.field ZW:Landroid/net/Uri;
-
-.field ZZ:Z
-
-.field public Zq:Lcom/facebook/imagepipeline/request/c;
+.field public Zz:Lcom/facebook/imagepipeline/request/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field aaa:Lcom/facebook/imagepipeline/a/d;
+.field public aae:Lcom/facebook/imagepipeline/request/b$a;
 
-.field aac:Ljava/lang/Boolean;
+.field aaf:Landroid/net/Uri;
+
+.field aai:Z
+
+.field aaj:Lcom/facebook/imagepipeline/a/d;
+
+.field aal:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field aad:Ljava/lang/Boolean;
+.field aam:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field aam:Z
+.field aav:Z
 
 
 # direct methods
@@ -74,55 +74,55 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->iw()Lcom/facebook/imagepipeline/a/b;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/b;->iz()Lcom/facebook/imagepipeline/a/b;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aaf:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/b/i;->iH()Lcom/facebook/imagepipeline/b/i$b;
+    invoke-static {}, Lcom/facebook/imagepipeline/b/i;->iK()Lcom/facebook/imagepipeline/b/i$b;
 
     move-result-object v1
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i$b;->UF:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/b/i$b;->UO:Z
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UF:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UO:Z
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZZ:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Z
 
-    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TB:Lcom/facebook/imagepipeline/a/d;
+    sget-object v1, Lcom/facebook/imagepipeline/a/d;->TK:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaj:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uy:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UH:Z
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aam:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aav:Z
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aac:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aal:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aad:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aam:Ljava/lang/Boolean;
 
     return-void
 .end method
@@ -130,59 +130,59 @@
 .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;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf: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;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->ZZ:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->aai:Z
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZZ:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->UF:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->UO:Z
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UF:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UO:Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaj:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaj:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->TS:Lcom/facebook/imagepipeline/h/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aac:Ljava/lang/Boolean;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aal:Ljava/lang/Boolean;
 
-    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aac:Ljava/lang/Boolean;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aal: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;->ZW:Landroid/net/Uri;
+    iput-object p0, v0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
     return-object v0
 .end method
@@ -210,7 +210,7 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
 
     return-object p0
 .end method
@@ -222,15 +222,15 @@
         .end annotation
     .end param
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
 
     return-object p0
 .end method
 
-.method public final kE()Lcom/facebook/imagepipeline/request/b;
+.method public final kH()Lcom/facebook/imagepipeline/request/b;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
     if-eqz v0, :cond_5
 
@@ -240,7 +240,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->isAbsolute()Z
 
@@ -248,7 +248,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -261,7 +261,7 @@
     if-nez v0, :cond_0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -308,7 +308,7 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->h(Landroid/net/Uri;)Z
 
@@ -316,7 +316,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf: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 d4b0ef35b4..db8c1198e8 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 Sk:Lcom/facebook/imagepipeline/a/e;
+.field public final St:Lcom/facebook/imagepipeline/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final Sl:Lcom/facebook/imagepipeline/a/f;
+.field public final Su:Lcom/facebook/imagepipeline/a/f;
 
-.field public final Sm:Lcom/facebook/imagepipeline/a/b;
+.field public final Sv:Lcom/facebook/imagepipeline/a/b;
 
-.field public final TS:Lcom/facebook/imagepipeline/h/c;
+.field public final UO:Z
+
+.field public final Ub:Lcom/facebook/imagepipeline/h/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final UF:Z
-
-.field public final VZ:Lcom/facebook/imagepipeline/a/a;
+.field public final Wi:Lcom/facebook/imagepipeline/a/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final XI:Lcom/facebook/imagepipeline/request/b$b;
+.field public final XR:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public final Ym:Z
+.field public final Yv:Z
 
-.field public final ZV:Lcom/facebook/imagepipeline/request/b$a;
-
-.field public final ZW:Landroid/net/Uri;
-
-.field public final ZX:I
-
-.field private ZY:Ljava/io/File;
-
-.field public final ZZ:Z
-
-.field public final Zq:Lcom/facebook/imagepipeline/request/c;
+.field public final Zz:Lcom/facebook/imagepipeline/request/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final aaa:Lcom/facebook/imagepipeline/a/d;
+.field public final aae:Lcom/facebook/imagepipeline/request/b$a;
 
-.field public final aab:Z
+.field public final aaf:Landroid/net/Uri;
 
-.field final aac:Ljava/lang/Boolean;
+.field public final aag:I
+
+.field private aah:Ljava/io/File;
+
+.field public final aai:Z
+
+.field public final aaj:Lcom/facebook/imagepipeline/a/d;
+
+.field public final aak:Z
+
+.field final aal:Ljava/lang/Boolean;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final aad:Ljava/lang/Boolean;
+.field public final aam:Ljava/lang/Boolean;
     .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;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf:Landroid/net/Uri;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     const/4 v1, 0x0
 
@@ -187,57 +187,57 @@
     const/4 v0, -0x1
 
     :goto_0
-    iput v0, p0, Lcom/facebook/imagepipeline/request/b;->ZX:I
+    iput v0, p0, Lcom/facebook/imagepipeline/request/b;->aag:I
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UF:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UO:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->UF:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->UO:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZZ:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aai:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->ZZ:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->aai:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->ix()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()Lcom/facebook/imagepipeline/a/f;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_8
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Su:Lcom/facebook/imagepipeline/a/f;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaj:Lcom/facebook/imagepipeline/a/d;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaj:Lcom/facebook/imagepipeline/a/d;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XI:Lcom/facebook/imagepipeline/request/b$b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->XR:Lcom/facebook/imagepipeline/request/b$b;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Uy:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->UH:Z
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->ZW:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aaf: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;->aab:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/request/b;->aak:Z
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aam:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aav:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Ym:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/request/b;->Yv:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aac:Ljava/lang/Boolean;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aal:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aac:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aal:Ljava/lang/Boolean;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Zz:Lcom/facebook/imagepipeline/request/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->TS:Lcom/facebook/imagepipeline/h/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->TS:Lcom/facebook/imagepipeline/h/c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Ub:Lcom/facebook/imagepipeline/h/c;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aad:Ljava/lang/Boolean;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->aam:Ljava/lang/Boolean;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/request/b;->aad:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/request/b;->aam: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;->ZW:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aae: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;->ZY:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->ZY:Ljava/io/File;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->aah: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;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Wi: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;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sv: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->St: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;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->Su: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;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zz: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;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Zz: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;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->Zz: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;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->ZY:Ljava/io/File;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x3
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x4
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sv:Lcom/facebook/imagepipeline/a/b;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x5
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     aput-object v3, v1, v2
 
     const/4 v2, 0x6
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/request/b;->Su: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;->aad:Ljava/lang/Boolean;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/request/b;->aam:Ljava/lang/Boolean;
 
     aput-object v2, v1, v0
 
@@ -478,19 +478,19 @@
     return v0
 .end method
 
-.method public final declared-synchronized kD()Ljava/io/File;
+.method public final declared-synchronized kG()Ljava/io/File;
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->ZY:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
 
     if-nez v0, :cond_0
 
     new-instance v0, Ljava/io/File;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaf: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;->ZY:Ljava/io/File;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah:Ljava/io/File;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->ZY:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/request/b;->aah: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;->ZW:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     const-string v2, "uri"
 
@@ -532,7 +532,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aae: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;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Sv: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;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Zz: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;->aaa:Lcom/facebook/imagepipeline/a/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aaj: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->St: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;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Su: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;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->Wi: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;->aad:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/request/b;->aam: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 e2560be548..1735c939fa 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 aas:Landroidx/core/util/Pools$SynchronizedPool;
+.field private static final aaB: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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sput-object v0, Lcom/facebook/imageutils/a;->aaB: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;->aat:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v0, Lcom/facebook/imageutils/a;->aaB: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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object p0, Lcom/facebook/imageutils/a;->aaB: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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->aaB: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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v0, Lcom/facebook/imageutils/a;->aaB: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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->aaB: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;->aas:Landroidx/core/util/Pools$SynchronizedPool;
+    sget-object v1, Lcom/facebook/imageutils/a;->aaB: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 aa20dc7744..f911027614 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 Ty:Landroid/graphics/ColorSpace;
+.field public final TH:Landroid/graphics/ColorSpace;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final aau:Landroid/util/Pair;
+.field public final aaD: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;->aau:Landroid/util/Pair;
+    iput-object v0, p0, Lcom/facebook/imageutils/b;->aaD:Landroid/util/Pair;
 
-    iput-object p3, p0, Lcom/facebook/imageutils/b;->Ty:Landroid/graphics/ColorSpace;
+    iput-object p3, p0, Lcom/facebook/imageutils/b;->TH: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 0026abb7c1..e695ba307b 100644
--- a/com.discord/smali/com/facebook/soloader/SoLoader.smali
+++ b/com.discord/smali/com/facebook/soloader/SoLoader.smali
@@ -13,33 +13,33 @@
 
 
 # static fields
-.field static final abL:Z
+.field static final abU:Z
 
-.field static abM:Lcom/facebook/soloader/h;
+.field static abV:Lcom/facebook/soloader/h;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static final abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+.field private static final abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
-.field private static abO:[Lcom/facebook/soloader/i;
+.field private static abX:[Lcom/facebook/soloader/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static abP:I
+.field private static abY:I
 
-.field private static abQ:[Lcom/facebook/soloader/k;
+.field private static abZ:[Lcom/facebook/soloader/k;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static abR:Lcom/facebook/soloader/b;
+.field private static aca:Lcom/facebook/soloader/b;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static final abS:Ljava/util/HashSet;
+.field private static final acb:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field private static final abT:Ljava/util/Map;
+.field private static final acc:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -60,7 +60,7 @@
     .end annotation
 .end field
 
-.field private static final abU:Ljava/util/Set;
+.field private static final acd:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -70,12 +70,12 @@
     .end annotation
 .end field
 
-.field private static abV:Lcom/facebook/soloader/j;
+.field private static ace:Lcom/facebook/soloader/j;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private static abW:I
+.field private static acf:I
 
 
 # direct methods
@@ -86,27 +86,27 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;-><init>()V
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abO:[Lcom/facebook/soloader/i;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
 
     const/4 v1, 0x0
 
-    sput v1, Lcom/facebook/soloader/SoLoader;->abP:I
+    sput v1, Lcom/facebook/soloader/SoLoader;->abY:I
 
     new-instance v2, Ljava/util/HashSet;
 
     invoke-direct {v2}, Ljava/util/HashSet;-><init>()V
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->abS:Ljava/util/HashSet;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->acb:Ljava/util/HashSet;
 
     new-instance v2, Ljava/util/HashMap;
 
     invoke-direct {v2}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v2, Lcom/facebook/soloader/SoLoader;->abT:Ljava/util/Map;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->acc: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;->abU:Ljava/util/Set;
+    sput-object v2, Lcom/facebook/soloader/SoLoader;->acd:Ljava/util/Set;
 
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abV:Lcom/facebook/soloader/j;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->ace: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;->abL:Z
+    sput-boolean v1, Lcom/facebook/soloader/SoLoader;->abU: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v5, Lcom/facebook/soloader/SoLoader;->abW: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;->abO:[Lcom/facebook/soloader/i;
+    sget-object v5, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
 
     if-nez v5, :cond_9
 
@@ -193,7 +193,7 @@
 
     const/4 v5, 0x0
 
-    sput v5, Lcom/facebook/soloader/SoLoader;->abW:I
+    sput v5, Lcom/facebook/soloader/SoLoader;->acf: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;->abR:Lcom/facebook/soloader/b;
+    sput-object v9, Lcom/facebook/soloader/SoLoader;->aca: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;->abR:Lcom/facebook/soloader/b;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->aca: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;->abR:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aca: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;->abW:I
+    sget v9, Lcom/facebook/soloader/SoLoader;->acf:I
 
     and-int/lit8 v9, v9, 0x8
 
     if-eqz v9, :cond_5
 
-    sput-object v4, Lcom/facebook/soloader/SoLoader;->abQ:[Lcom/facebook/soloader/k;
+    sput-object v4, Lcom/facebook/soloader/SoLoader;->abZ:[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;->abQ:[Lcom/facebook/soloader/k;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abZ:[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;->lf()I
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->li()I
 
     move-result v4
 
@@ -543,15 +543,15 @@
     goto :goto_6
 
     :cond_8
-    sput-object v0, Lcom/facebook/soloader/SoLoader;->abO:[Lcom/facebook/soloader/i;
+    sput-object v0, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
 
-    sget v0, Lcom/facebook/soloader/SoLoader;->abP:I
+    sget v0, Lcom/facebook/soloader/SoLoader;->abY:I
 
     const/4 v4, 0x1
 
     add-int/2addr v0, v4
 
-    sput v0, Lcom/facebook/soloader/SoLoader;->abP:I
+    sput v0, Lcom/facebook/soloader/SoLoader;->abY: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;->abO:[Lcom/facebook/soloader/i;
+    sget-object v4, Lcom/facebook/soloader/SoLoader;->abX:[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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abW: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;->lg()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader;->lj()Ljava/lang/reflect/Method;
 
     move-result-object v5
 
@@ -663,7 +663,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->lh()Ljava/lang/String;
+    invoke-static {}, Lcom/facebook/soloader/SoLoader$Api14Utils;->lk()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;->abM:Lcom/facebook/soloader/h;
+    sput-object v7, Lcom/facebook/soloader/SoLoader;->abV: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;->abU:Ljava/util/Set;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->acd: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;->abS:Ljava/util/HashSet;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->acb: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;->abT:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->acc: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;->abT:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->acc: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;->abT:Ljava/util/Map;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->acc: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;->abS:Ljava/util/HashSet;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->acb: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;->abS:Ljava/util/HashSet;
+    sget-object p3, Lcom/facebook/soloader/SoLoader;->acb: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;->abU:Ljava/util/Set;
+    sget-object p0, Lcom/facebook/soloader/SoLoader;->acd:Ljava/util/Set;
 
     invoke-interface {p0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -1037,7 +1037,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1046,7 +1046,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
 
     :try_start_0
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abO:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
 
     if-nez v0, :cond_3
 
@@ -1064,7 +1064,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1075,14 +1075,14 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :try_start_1
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abO:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abX:[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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1110,7 +1110,7 @@
     move-exception p0
 
     :try_start_4
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1128,7 +1128,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :try_start_5
-    sget-object v1, Lcom/facebook/soloader/SoLoader;->abS:Ljava/util/HashSet;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->acb:Ljava/util/HashSet;
 
     invoke-virtual {v1, p0}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
 
@@ -1138,7 +1138,7 @@
 
     if-eqz v1, :cond_2
 
-    sget-object v2, Lcom/facebook/soloader/SoLoader;->abV:Lcom/facebook/soloader/j;
+    sget-object v2, Lcom/facebook/soloader/SoLoader;->ace:Lcom/facebook/soloader/j;
 
     if-nez v2, :cond_2
 
@@ -1149,7 +1149,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_1
 
-    sget-object p0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object p0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {p0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1174,7 +1174,7 @@
 
     :cond_3
     :goto_0
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1199,7 +1199,7 @@
     :catchall_2
     move-exception p0
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -1228,7 +1228,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW: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;->abO:[Lcom/facebook/soloader/i;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abX:[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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW: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;->abL:Z
+    sget-boolean v5, Lcom/facebook/soloader/SoLoader;->abU:Z
 
     if-eqz v5, :cond_1
 
@@ -1302,7 +1302,7 @@
     const/4 v6, 0x3
 
     :try_start_1
-    sget-object v7, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v7, Lcom/facebook/soloader/SoLoader;->abW: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;->abP:I
+    sget v7, Lcom/facebook/soloader/SoLoader;->abY: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;->abO:[Lcom/facebook/soloader/i;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abX:[Lcom/facebook/soloader/i;
 
     array-length v9, v9
 
     if-ge v8, v9, :cond_5
 
-    sget-object v9, Lcom/facebook/soloader/SoLoader;->abO:[Lcom/facebook/soloader/i;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abX:[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;->abQ:[Lcom/facebook/soloader/k;
+    sget-object v9, Lcom/facebook/soloader/SoLoader;->abZ:[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;->abQ:[Lcom/facebook/soloader/k;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abZ:[Lcom/facebook/soloader/k;
 
     array-length v9, v8
 
@@ -1391,7 +1391,7 @@
     move-exception p1
 
     :try_start_3
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abW: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abW: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;->abR:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aca:Lcom/facebook/soloader/b;
 
     if-eqz v8, :cond_6
 
-    sget-object v8, Lcom/facebook/soloader/SoLoader;->abR:Lcom/facebook/soloader/b;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->aca:Lcom/facebook/soloader/b;
 
-    invoke-virtual {v8}, Lcom/facebook/soloader/b;->la()Z
+    invoke-virtual {v8}, Lcom/facebook/soloader/b;->ld()Z
 
     move-result v8
 
     if-eqz v8, :cond_6
 
-    sget v8, Lcom/facebook/soloader/SoLoader;->abP:I
+    sget v8, Lcom/facebook/soloader/SoLoader;->abY:I
 
     add-int/2addr v8, v3
 
-    sput v8, Lcom/facebook/soloader/SoLoader;->abP:I
+    sput v8, Lcom/facebook/soloader/SoLoader;->abY:I
 
     :cond_6
-    sget v8, Lcom/facebook/soloader/SoLoader;->abP:I
+    sget v8, Lcom/facebook/soloader/SoLoader;->abY: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v8, Lcom/facebook/soloader/SoLoader;->abW: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW: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;->abL:Z
+    sget-boolean p1, Lcom/facebook/soloader/SoLoader;->abU:Z
 
     if-eqz p1, :cond_9
 
@@ -1533,7 +1533,7 @@
     :catchall_2
     move-exception p1
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abL:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abU:Z
 
     if-eqz v0, :cond_c
 
@@ -1639,7 +1639,7 @@
     :catchall_3
     move-exception p0
 
-    sget-object p1, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object p1, Lcom/facebook/soloader/SoLoader;->abW: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 lf()I
+.method private static li()I
     .locals 2
 
-    sget-object v0, Lcom/facebook/soloader/SoLoader;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lcom/facebook/soloader/SoLoader;->abW: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;->abW:I
+    sget v0, Lcom/facebook/soloader/SoLoader;->acf: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abW: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;->abN:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v1, Lcom/facebook/soloader/SoLoader;->abW: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 lg()Ljava/lang/reflect/Method;
+.method private static lj()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 8e48912b47..7b3a50e3e9 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 aby:Ljava/io/File;
+.field protected final abH: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;->aby:Ljava/io/File;
+    iput-object p1, p0, Lcom/facebook/soloader/c;->abH:Ljava/io/File;
 
     iput p2, p0, Lcom/facebook/soloader/c;->flags:I
 
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abL:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abU:Z
 
     if-eqz v0, :cond_0
 
@@ -126,7 +126,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abL:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abU:Z
 
     if-eqz v0, :cond_1
 
@@ -138,7 +138,7 @@
     :catchall_0
     move-exception p0
 
-    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abL:Z
+    sget-boolean v0, Lcom/facebook/soloader/SoLoader;->abU:Z
 
     if-eqz v0, :cond_2
 
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/c;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->abH: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;->abM:Lcom/facebook/soloader/h;
+    sget-object p1, Lcom/facebook/soloader/SoLoader;->abV: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;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->abH: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;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/c;->abH: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 f13164ed2b..7fa6cc360f 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 abD:[Lcom/facebook/soloader/e$a;
+.field abM:[Lcom/facebook/soloader/e$a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final abE:Ljava/util/zip/ZipFile;
+.field final abN:Ljava/util/zip/ZipFile;
 
-.field private final abF:Lcom/facebook/soloader/k;
+.field private final abO:Lcom/facebook/soloader/k;
 
-.field final synthetic abG:Lcom/facebook/soloader/e;
+.field final synthetic abP:Lcom/facebook/soloader/e;
 
 
 # direct methods
@@ -42,19 +42,19 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/soloader/e$b;->abG:Lcom/facebook/soloader/e;
+    iput-object p1, p0, Lcom/facebook/soloader/e$b;->abP: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;->abz:Ljava/io/File;
+    iget-object p1, p1, Lcom/facebook/soloader/e;->abI: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;->abE:Ljava/util/zip/ZipFile;
+    iput-object v0, p0, Lcom/facebook/soloader/e$b;->abN:Ljava/util/zip/ZipFile;
 
-    iput-object p2, p0, Lcom/facebook/soloader/e$b;->abF:Lcom/facebook/soloader/k;
+    iput-object p2, p0, Lcom/facebook/soloader/e$b;->abO:Lcom/facebook/soloader/k;
 
     return-void
 .end method
@@ -77,17 +77,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abE:Ljava/util/zip/ZipFile;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abN:Ljava/util/zip/ZipFile;
 
     invoke-virtual {v0}, Ljava/util/zip/ZipFile;->close()V
 
     return-void
 .end method
 
-.method final lb()[Lcom/facebook/soloader/e$a;
+.method final le()[Lcom/facebook/soloader/e$a;
     .locals 9
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abD:[Lcom/facebook/soloader/e$a;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abM:[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;->abG:Lcom/facebook/soloader/e;
+    iget-object v2, p0, Lcom/facebook/soloader/e$b;->abP:Lcom/facebook/soloader/e;
 
-    iget-object v2, v2, Lcom/facebook/soloader/e;->abA:Ljava/lang/String;
+    iget-object v2, v2, Lcom/facebook/soloader/e;->abJ: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;->abE:Ljava/util/zip/ZipFile;
+    iget-object v4, p0, Lcom/facebook/soloader/e$b;->abN: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;->abC:I
+    iget v7, v7, Lcom/facebook/soloader/e$a;->abL: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;->abF:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/e$b;->abO: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;->acd:[Ljava/lang/String;
+    iput-object v0, v2, Lcom/facebook/soloader/k;->acn:[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;->abB:Ljava/util/zip/ZipEntry;
+    iget-object v5, v4, Lcom/facebook/soloader/e$a;->abK: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;->abD:[Lcom/facebook/soloader/e$a;
+    iput-object v2, p0, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
 
     :cond_7
-    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abD:[Lcom/facebook/soloader/e$a;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
 
     return-object v0
 .end method
 
-.method protected final lc()Lcom/facebook/soloader/k$b;
+.method protected final lf()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;->lb()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {p0}, Lcom/facebook/soloader/e$b;->le()[Lcom/facebook/soloader/e$a;
 
     move-result-object v1
 
@@ -311,7 +311,7 @@
     return-object v0
 .end method
 
-.method protected final ld()Lcom/facebook/soloader/k$d;
+.method protected final lg()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 df837033c8..9a528f41b7 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 abJ:Ljava/io/FileOutputStream;
+.field private final abS:Ljava/io/FileOutputStream;
 
-.field private final abK:Ljava/nio/channels/FileLock;
+.field private final abT: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;->abJ:Ljava/io/FileOutputStream;
+    iput-object v0, p0, Lcom/facebook/soloader/f;->abS:Ljava/io/FileOutputStream;
 
     :try_start_0
-    iget-object p1, p0, Lcom/facebook/soloader/f;->abJ:Ljava/io/FileOutputStream;
+    iget-object p1, p0, Lcom/facebook/soloader/f;->abS:Ljava/io/FileOutputStream;
 
     invoke-virtual {p1}, Ljava/io/FileOutputStream;->getChannel()Ljava/nio/channels/FileChannel;
 
@@ -47,19 +47,19 @@
 
     if-nez p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->abJ:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abS:Ljava/io/FileOutputStream;
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
     :cond_0
-    iput-object p1, p0, Lcom/facebook/soloader/f;->abK:Ljava/nio/channels/FileLock;
+    iput-object p1, p0, Lcom/facebook/soloader/f;->abT:Ljava/nio/channels/FileLock;
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->abJ:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abS:Ljava/io/FileOutputStream;
 
     invoke-virtual {v0}, Ljava/io/FileOutputStream;->close()V
 
@@ -92,18 +92,18 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/soloader/f;->abK:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abT:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/soloader/f;->abK:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abT: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;->abJ:Ljava/io/FileOutputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/f;->abS: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;->abJ:Ljava/io/FileOutputStream;
+    iget-object v1, p0, Lcom/facebook/soloader/f;->abS: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 36e85e5858..aaa3242bb9 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 lc()Lcom/facebook/soloader/k$b;
+.method protected abstract lf()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 ld()Lcom/facebook/soloader/k$d;
+.method protected abstract lg()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 69e170c39e..2e59ccb996 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 acc:Ljava/lang/String;
+.field protected acm:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field acd:[Ljava/lang/String;
+.field acn:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final ace:Ljava/util/Map;
+.field private final aco: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;->ace:Ljava/util/Map;
+    iput-object p2, p0, Lcom/facebook/soloader/k;->aco: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;->aby:Ljava/io/File;
+    iget-object v3, v1, Lcom/facebook/soloader/k;->abH: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;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v0, v5, Lcom/facebook/soloader/k$b;->acw:[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;->le()Lcom/facebook/soloader/k$c;
+    invoke-virtual/range {p3 .. p3}, Lcom/facebook/soloader/k$d;->lh()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;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acw:[Lcom/facebook/soloader/k$a;
 
     array-length v11, v11
 
     if-ge v10, v11, :cond_3
 
-    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acw:[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;->aco:Lcom/facebook/soloader/k$a;
+    iget-object v12, v9, Lcom/facebook/soloader/k$c;->acx: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;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v11, v8, Lcom/facebook/soloader/k$b;->acw:[Lcom/facebook/soloader/k$a;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lcom/facebook/soloader/k$a;->acm:Ljava/lang/String;
+    iget-object v11, v11, Lcom/facebook/soloader/k$a;->acv:Ljava/lang/String;
 
-    iget-object v12, v9, Lcom/facebook/soloader/k$c;->aco:Lcom/facebook/soloader/k$a;
+    iget-object v12, v9, Lcom/facebook/soloader/k$c;->acx:Lcom/facebook/soloader/k$a;
 
-    iget-object v12, v12, Lcom/facebook/soloader/k$a;->acm:Ljava/lang/String;
+    iget-object v12, v12, Lcom/facebook/soloader/k$a;->acv: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;->aco:Lcom/facebook/soloader/k$a;
+    iget-object v10, v9, Lcom/facebook/soloader/k$c;->acx: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;->aby:Ljava/io/File;
+    iget-object v0, v1, Lcom/facebook/soloader/k;->abH: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;->aby:Ljava/io/File;
+    iget-object v0, v1, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
-    iget-object v11, v9, Lcom/facebook/soloader/k$c;->aco:Lcom/facebook/soloader/k$a;
+    iget-object v11, v9, Lcom/facebook/soloader/k$c;->acx:Lcom/facebook/soloader/k$a;
 
     iget-object v11, v11, Lcom/facebook/soloader/k$a;->name:Ljava/lang/String;
 
@@ -350,7 +350,7 @@
 
     :goto_4
     :try_start_5
-    iget-object v0, v9, Lcom/facebook/soloader/k$c;->acp:Ljava/io/InputStream;
+    iget-object v0, v9, Lcom/facebook/soloader/k$c;->acy: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;->acp:Ljava/io/InputStream;
+    iget-object v0, v9, Lcom/facebook/soloader/k$c;->acy:Ljava/io/InputStream;
 
     invoke-static {v11, v0, v5}, Lcom/facebook/soloader/SysUtil;->a(Ljava/io/RandomAccessFile;Ljava/io/InputStream;[B)I
 
@@ -450,7 +450,7 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, v1, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v4, v1, Lcom/facebook/soloader/k;->abH: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;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abH: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;->aby:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-direct {v4, v5, v3}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -733,7 +733,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abH: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;->aby:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abH: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;->aby:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abH: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;->aby:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abH: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;->kY()Lcom/facebook/soloader/k$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->lb()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;->lc()Lcom/facebook/soloader/k$b;
+    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->lf()Lcom/facebook/soloader/k$b;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->ld()Lcom/facebook/soloader/k$d;
+    invoke-virtual {v0}, Lcom/facebook/soloader/k$e;->lg()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;->aby:Ljava/io/File;
+    iget-object p3, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {p3}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -1078,12 +1078,12 @@
 .method private aG(Ljava/lang/String;)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->ace:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->aco:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/soloader/k;->ace:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->aco: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;->ace:Ljava/util/Map;
+    iget-object v2, p0, Lcom/facebook/soloader/k;->aco:Ljava/util/Map;
 
     invoke-interface {v2, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1131,7 +1131,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k;->abH: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
 
@@ -1167,7 +1167,7 @@
 
     const-string v3, "fb-UnpackingSoSource"
 
-    iget-object v4, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v4, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {v4}, Ljava/io/File;->mkdirs()Z
 
@@ -1204,7 +1204,7 @@
     :goto_0
     new-instance v4, Ljava/io/File;
 
-    iget-object v5, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     const-string v6, "dso_lock"
 
@@ -1221,7 +1221,7 @@
 
     invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v6, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1231,7 +1231,7 @@
 
     invoke-static {v3, v5}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kZ()[B
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->lc()[B
 
     move-result-object v5
 
@@ -1252,7 +1252,7 @@
 
     invoke-direct {p1, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v5, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {p1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1271,7 +1271,7 @@
 
     invoke-direct {p1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1290,7 +1290,7 @@
 
     invoke-direct {p1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1313,7 +1313,7 @@
 
     invoke-direct {v1, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1332,7 +1332,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v2, p0, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1368,7 +1368,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iput-object p1, p0, Lcom/facebook/soloader/k;->acc:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/soloader/k;->acm:Ljava/lang/String;
 
     const/4 p1, 0x2
 
@@ -1403,7 +1403,7 @@
     throw p1
 .end method
 
-.method protected abstract kY()Lcom/facebook/soloader/k$e;
+.method protected abstract lb()Lcom/facebook/soloader/k$e;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -1411,7 +1411,7 @@
     .end annotation
 .end method
 
-.method protected kZ()[B
+.method protected lc()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1423,16 +1423,16 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/facebook/soloader/k;->kY()Lcom/facebook/soloader/k$e;
+    invoke-virtual {p0}, Lcom/facebook/soloader/k;->lb()Lcom/facebook/soloader/k$e;
 
     move-result-object v1
 
     :try_start_0
-    invoke-virtual {v1}, Lcom/facebook/soloader/k$e;->lc()Lcom/facebook/soloader/k$b;
+    invoke-virtual {v1}, Lcom/facebook/soloader/k$e;->lf()Lcom/facebook/soloader/k$b;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/facebook/soloader/k$b;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v2, v2, Lcom/facebook/soloader/k$b;->acw:[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;->acm:Ljava/lang/String;
+    iget-object v4, v4, Lcom/facebook/soloader/k$a;->acv: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 3a949b8015..57635923ae 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 UH:Lcom/facebook/common/k/b$a;
+.field private static UR:Lcom/facebook/common/k/b$a;
 
-.field public static final acq:Z
+.field private static acA:Lcom/facebook/common/k/a;
 
-.field private static acr:Lcom/facebook/common/k/a;
+.field public static final acz:Z
 
 
 # direct methods
@@ -32,7 +32,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acq:Z
+    sput-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz:Z
 
     return-void
 .end method
@@ -85,7 +85,7 @@
     return-void
 
     :cond_3
-    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acq:Z
+    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz: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;->acq:Z
+    sget-boolean v0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz:Z
 
     if-eqz v0, :cond_0
 
@@ -189,7 +189,7 @@
     return-object p0
 
     :cond_0
-    sget-object p2, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acr:Lcom/facebook/common/k/a;
+    sget-object p2, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acA: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;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()V
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Ja:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jj: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;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()V
 
     const/4 v0, 0x0
 
@@ -440,7 +440,7 @@
 
     move-result-object v4
 
-    sget-boolean v5, Lcom/facebook/common/k/c;->Ja:Z
+    sget-boolean v5, Lcom/facebook/common/k/c;->Jj:Z
 
     if-eqz v5, :cond_0
 
@@ -592,7 +592,7 @@
 
     :cond_1
     :goto_0
-    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acq:Z
+    sget-boolean p0, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acz: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;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()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;->Ja:Z
+    sget-boolean v1, Lcom/facebook/common/k/c;->Jj: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;->acr:Lcom/facebook/common/k/a;
+    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->acA: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;->UH:Lcom/facebook/common/k/b$a;
+    sput-object p1, Lcom/facebook/webpsupport/WebpBitmapFactoryImpl;->UR: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 efb8b80c33..d49941b4db 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
@@ -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;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
     const/4 p1, 0x1
 
@@ -421,7 +421,7 @@
 
     iput-boolean v0, p1, Lcom/google/android/gms/common/a;->zze:Z
 
-    iget-object p1, p1, Lcom/google/android/gms/common/a;->aeT:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p1, Lcom/google/android/gms/common/a;->afc: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;->adH:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adQ:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
     :try_end_0
@@ -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;->adI:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adR: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;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/a/e;->nO()Z
 
     move-result v0
     :try_end_6
@@ -947,7 +947,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
     iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->mContext:Landroid/content/Context;
 
@@ -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;->adI:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adR: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;->nK()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/a/e;->nN()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 3b00c85056..70c31074b4 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 aeP:Ljava/util/concurrent/locks/Lock;
+.field private static final aeY:Ljava/util/concurrent/locks/Lock;
 
-.field private static aeQ:Lcom/google/android/gms/auth/api/signin/a/a;
+.field private static aeZ:Lcom/google/android/gms/auth/api/signin/a/a;
 
 
 # instance fields
-.field private final aeR:Ljava/util/concurrent/locks/Lock;
+.field private final afa:Ljava/util/concurrent/locks/Lock;
 
-.field private final aeS:Landroid/content/SharedPreferences;
+.field private final afb:Landroid/content/SharedPreferences;
 
 
 # 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;->aeP:Ljava/util/concurrent/locks/Lock;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeY: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;->aeR:Ljava/util/concurrent/locks/Lock;
+    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->afa: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;->aeS:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/auth/api/signin/a/a;->afb: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;->aeP:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeY: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;->aeQ:Lcom/google/android/gms/auth/api/signin/a/a;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeZ: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;->aeQ:Lcom/google/android/gms/auth/api/signin/a/a;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeZ:Lcom/google/android/gms/auth/api/signin/a/a;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeQ:Lcom/google/android/gms/auth/api/signin/a/a;
+    sget-object p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeZ: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;->aeP:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeY: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;->aeP:Ljava/util/concurrent/locks/Lock;
+    sget-object v0, Lcom/google/android/gms/auth/api/signin/a/a;->aeY:Ljava/util/concurrent/locks/Lock;
 
     invoke-interface {v0}, Ljava/util/concurrent/locks/Lock;->unlock()V
 
@@ -173,12 +173,12 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->aeR:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->afa: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;->aeS:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->afb: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;->aeR:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->afa: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;->aeR:Ljava/util/concurrent/locks/Lock;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/a/a;->afa: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 513f84b246..03254fa88e 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 afd:Lcom/google/android/gms/common/g;
+.field private static afn: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;->afd:Lcom/google/android/gms/common/g;
+    sget-object v1, Lcom/google/android/gms/common/g;->afn: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;->afd:Lcom/google/android/gms/common/g;
+    sput-object v1, Lcom/google/android/gms/common/g;->afn: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;->afd:Lcom/google/android/gms/common/g;
+    sget-object p0, Lcom/google/android/gms/common/g;->afn: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;->amt:[Lcom/google/android/gms/common/n;
+    sget-object p1, Lcom/google/android/gms/common/q;->amC:[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;->amt:[Lcom/google/android/gms/common/n;
+    sget-object v2, Lcom/google/android/gms/common/q;->amC:[Lcom/google/android/gms/common/n;
 
     aget-object v2, v2, v0
 
@@ -196,7 +196,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -344,7 +344,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -413,7 +413,7 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->nG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->nJ()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;->nG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/v;->nJ()Ljava/lang/String;
 
     move-result-object p1
 
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 34212a9fde..34f162e985 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 akk:Landroid/content/res/Resources;
+.field private final akt:Landroid/content/res/Resources;
 
-.field private final akl:Ljava/lang/String;
+.field private final aku:Ljava/lang/String;
 
 
 # direct methods
@@ -20,9 +20,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->akk:Landroid/content/res/Resources;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->akt:Landroid/content/res/Resources;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/t;->akk:Landroid/content/res/Resources;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/t;->akt: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;->akl:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/t;->aku: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;->akk:Landroid/content/res/Resources;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->akt:Landroid/content/res/Resources;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->akl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/t;->aku: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;->akk:Landroid/content/res/Resources;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/t;->akt: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 94ed9451e2..b662617973 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 aml:Lcom/google/android/gms/common/internal/ao;
+.field private static volatile amu:Lcom/google/android/gms/common/internal/ao;
 
-.field private static final amm:Ljava/lang/Object;
+.field private static final amv:Ljava/lang/Object;
 
-.field private static amn:Landroid/content/Context;
+.field private static amw: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;->amm:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/l;->amv: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;->amn:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->amw: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;->amn:Landroid/content/Context;
+    sput-object p0, Lcom/google/android/gms/common/l;->amw:Landroid/content/Context;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -142,28 +142,28 @@
     .locals 4
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/common/l;->aml:Lcom/google/android/gms/common/internal/ao;
+    sget-object v0, Lcom/google/android/gms/common/l;->amu:Lcom/google/android/gms/common/internal/ao;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/l;->amn:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/common/l;->amw: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;->amm:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/l;->amv: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;->aml:Lcom/google/android/gms/common/internal/ao;
+    sget-object v1, Lcom/google/android/gms/common/l;->amu:Lcom/google/android/gms/common/internal/ao;
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/common/l;->amn:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->amw:Landroid/content/Context;
 
-    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amL:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amU:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     const-string v3, "com.google.android.gms.googlecertificates"
 
@@ -181,7 +181,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/common/l;->aml:Lcom/google/android/gms/common/internal/ao;
+    sput-object v1, Lcom/google/android/gms/common/l;->amu: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;->amn:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/common/l;->amw: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;->aml:Lcom/google/android/gms/common/internal/ao;
+    sget-object p3, Lcom/google/android/gms/common/l;->amu:Lcom/google/android/gms/common/internal/ao;
 
-    sget-object v1, Lcom/google/android/gms/common/l;->amn:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/common/l;->amw: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;->nF()Lcom/google/android/gms/common/v;
+    invoke-static {}, Lcom/google/android/gms/common/v;->nI()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 8c48a2ec20..073b5b5fe1 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 alO:Ljava/lang/String;
+.field private static alX:Ljava/lang/String;
 
-.field private static alP:I
+.field private static alY:I
 
 
 # direct methods
@@ -135,16 +135,16 @@
     return-object v0
 .end method
 
-.method public static nu()Ljava/lang/String;
+.method public static nx()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/common/util/m;->alO:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/common/util/m;->alX:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    sget v0, Lcom/google/android/gms/common/util/m;->alP:I
+    sget v0, Lcom/google/android/gms/common/util/m;->alY:I
 
     if-nez v0, :cond_0
 
@@ -152,19 +152,19 @@
 
     move-result v0
 
-    sput v0, Lcom/google/android/gms/common/util/m;->alP:I
+    sput v0, Lcom/google/android/gms/common/util/m;->alY:I
 
     :cond_0
-    sget v0, Lcom/google/android/gms/common/util/m;->alP:I
+    sget v0, Lcom/google/android/gms/common/util/m;->alY:I
 
     invoke-static {v0}, Lcom/google/android/gms/common/util/m;->be(I)Ljava/lang/String;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/m;->alO:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/common/util/m;->alX:Ljava/lang/String;
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/common/util/m;->alO:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/common/util/m;->alX: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 5fb036c31f..007d292032 100644
--- a/com.discord/smali/com/google/android/gms/common/v.smali
+++ b/com.discord/smali/com/google/android/gms/common/v.smali
@@ -8,11 +8,11 @@
 
 
 # static fields
-.field private static final amx:Lcom/google/android/gms/common/v;
+.field private static final amG:Lcom/google/android/gms/common/v;
 
 
 # instance fields
-.field private final amy:Ljava/lang/String;
+.field private final amH: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;->amx:Lcom/google/android/gms/common/v;
+    sput-object v0, Lcom/google/android/gms/common/v;->amG:Lcom/google/android/gms/common/v;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     iput-boolean p1, p0, Lcom/google/android/gms/common/v;->zzad:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/common/v;->amy:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/v;->amH:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/common/v;->cause:Ljava/lang/Throwable;
 
@@ -105,7 +105,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/n;->nD()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/common/n;->nG()[B
 
     move-result-object p1
 
@@ -175,22 +175,22 @@
     return-object v0
 .end method
 
-.method static nF()Lcom/google/android/gms/common/v;
+.method static nI()Lcom/google/android/gms/common/v;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/v;->amx:Lcom/google/android/gms/common/v;
+    sget-object v0, Lcom/google/android/gms/common/v;->amG:Lcom/google/android/gms/common/v;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method nG()Ljava/lang/String;
+.method nJ()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/v;->amy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/v;->amH: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 0d13f65a6c..d9f8f84fb6 100644
--- a/com.discord/smali/com/google/android/gms/common/zzk.smali
+++ b/com.discord/smali/com/google/android/gms/common/zzk.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field private final amu:Lcom/google/android/gms/common/n;
+.field private final amD:Lcom/google/android/gms/common/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final amv:Z
+.field private final amE:Z
 
-.field private final amw:Z
+.field private final amF:Z
 
 .field private final zzy:Ljava/lang/String;
 
@@ -55,11 +55,11 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->amu:Lcom/google/android/gms/common/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/zzk;->amD:Lcom/google/android/gms/common/n;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amv:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amE:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amw:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amF:Z
 
     return-void
 .end method
@@ -75,11 +75,11 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/zzk;->zzy:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/zzk;->amu:Lcom/google/android/gms/common/n;
+    iput-object p2, p0, Lcom/google/android/gms/common/zzk;->amD:Lcom/google/android/gms/common/n;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amv:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/zzk;->amE:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amw:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/zzk;->amF:Z
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/common/internal/ak;->nd()Lcom/google/android/gms/a/a;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/ak;->ng()Lcom/google/android/gms/a/a;
 
     move-result-object p0
     :try_end_0
@@ -168,7 +168,7 @@
 
     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;->amu:Lcom/google/android/gms/common/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/zzk;->amD: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;->amv:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->amE: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;->amw:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/zzk;->amF: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 84bfed2e82..defe2a3503 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 ano:Ljava/util/logging/Logger;
+.field private static final anx:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/e/j;->ano:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/e/j;->anx: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;->ano:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/google/android/gms/internal/e/j;->anx: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/az.smali b/com.discord/smali/com/google/android/gms/internal/measurement/az.smali
index f257b6c40a..cc3bed5e2d 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/az.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/az.smali
@@ -7,16 +7,16 @@
 
 
 # static fields
-.field private static atA:Lcom/google/android/gms/internal/measurement/az;
+.field private static atJ:Lcom/google/android/gms/internal/measurement/az;
 
 
 # instance fields
-.field final atB:Landroid/content/Context;
+.field final atK:Landroid/content/Context;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final atC:Landroid/database/ContentObserver;
+.field private final atL:Landroid/database/ContentObserver;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -30,9 +30,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atB:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atC:Landroid/database/ContentObserver;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
 
     return-void
 .end method
@@ -42,21 +42,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/az;->atB:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/bb;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/bb;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atC:Landroid/database/ContentObserver;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
 
     invoke-virtual {p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object p1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->atc:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->atl:Landroid/net/Uri;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/az;->atC:Landroid/database/ContentObserver;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
 
     const/4 v2, 0x1
 
@@ -73,7 +73,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
     if-nez v1, :cond_2
 
@@ -107,10 +107,10 @@
     invoke-direct {v1}, Lcom/google/android/gms/internal/measurement/az;-><init>()V
 
     :goto_1
-    sput-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
     monitor-exit v0
 
@@ -129,7 +129,7 @@
 .method private final bY(Ljava/lang/String;)Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -202,40 +202,40 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atB:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atC:Landroid/database/ContentObserver;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atB:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/az;->atK:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/az;->atC:Landroid/database/ContentObserver;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/az;->atL:Landroid/database/ContentObserver;
 
     invoke-virtual {v1, v2}, Landroid/content/ContentResolver;->unregisterContentObserver(Landroid/database/ContentObserver;)V
 
     :cond_0
     const/4 v1, 0x0
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/az;->atA:Lcom/google/android/gms/internal/measurement/az;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/az;->atJ:Lcom/google/android/gms/internal/measurement/az;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/ba.smali b/com.discord/smali/com/google/android/gms/internal/measurement/ba.smali
index 2481706a66..cd47b80d96 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/ba.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/ba.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final atp:Ljava/util/Map;
+.field final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -42,7 +42,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ba;->atp:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ba;->aty:Ljava/util/Map;
 
     return-void
 .end method
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bk.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bk.smali
index 8864d88f53..c69604aab0 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bk.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bk.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field final anh:Ljava/lang/String;
+.field final anq:Ljava/lang/String;
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
-.field final atK:Landroid/net/Uri;
+.field final atT:Landroid/net/Uri;
 
-.field final atL:Lcom/google/android/gms/internal/measurement/bo;
+.field final atU:Lcom/google/android/gms/internal/measurement/bo;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bo<",
@@ -62,11 +62,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bk;->atJ:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bk;->atS:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bk;->atK:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bk;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/bk;->anq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/bk;->zzd:Ljava/lang/String;
 
@@ -80,7 +80,7 @@
 
     iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/bk;->zzh:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bk;->atL:Lcom/google/android/gms/internal/measurement/bo;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bk;->atU:Lcom/google/android/gms/internal/measurement/bo;
 
     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 c07cb01c54..f8f432fc86 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
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field static final atS:Lcom/google/android/gms/internal/measurement/bp;
+.field static final aub:Lcom/google/android/gms/internal/measurement/bp;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bp<",
@@ -35,7 +35,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/bp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bp;->atS:Lcom/google/android/gms/internal/measurement/bp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bp;->aub:Lcom/google/android/gms/internal/measurement/bp;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -85,7 +85,7 @@
     return v0
 .end method
 
-.method public final rD()Ljava/lang/Object;
+.method public final rG()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/br.smali b/com.discord/smali/com/google/android/gms/internal/measurement/br.smali
index e338654945..1cd0fa6aba 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/br.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/br.smali
@@ -50,7 +50,7 @@
     return-object v0
 .end method
 
-.method public static rE()Lcom/google/android/gms/internal/measurement/br;
+.method public static rH()Lcom/google/android/gms/internal/measurement/br;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -62,17 +62,17 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bp;->atS:Lcom/google/android/gms/internal/measurement/bp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bp;->aub:Lcom/google/android/gms/internal/measurement/bp;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
-.method public abstract rD()Ljava/lang/Object;
+.method public abstract rG()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bs.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bs.smali
index a134c6a2d9..30a4126c9f 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bs.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bs.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract rz()Ljava/lang/Object;
+.method public abstract rC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bu.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bu.smali
index 90b5883010..0cbf053a3c 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bu.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bu.smali
@@ -88,7 +88,7 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -96,7 +96,7 @@
     return v0
 .end method
 
-.method public final rD()Ljava/lang/Object;
+.method public final rG()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/bv.smali b/com.discord/smali/com/google/android/gms/internal/measurement/bv.smali
index f1b4431923..2aafd1d54d 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/bv.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/bv.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private volatile transient atx:Z
+.field private volatile transient atG:Z
 
 .field private final zza:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
@@ -71,7 +71,7 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -79,20 +79,20 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atG:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atG:Z
 
     if-nez v0, :cond_0
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bv;->zza:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -100,7 +100,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bv;->atx:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/bv;->atG:Z
 
     monitor-exit p0
 
@@ -130,7 +130,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/bv;->atG:Z
 
     if-eqz v0, :cond_0
 
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 67d8772586..9f7cde1472 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
@@ -120,7 +120,7 @@
     return v0
 .end method
 
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali/com/google/android/gms/internal/measurement/by.smali b/com.discord/smali/com/google/android/gms/internal/measurement/by.smali
index 7f30e55952..b1dbf25619 100644
--- a/com.discord/smali/com/google/android/gms/internal/measurement/by.smali
+++ b/com.discord/smali/com/google/android/gms/internal/measurement/by.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private volatile atx:Z
+.field private volatile atG:Z
 
 .field private volatile zza:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
@@ -69,7 +69,7 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -77,20 +77,20 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atG:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/by;->atG:Z
 
     if-nez v0, :cond_0
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/by;->zza:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -98,7 +98,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/by;->atx:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/measurement/by;->atG:Z
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/google/firebase/d/a.smali b/com.discord/smali/com/google/firebase/d/a.smali
index 04386b8db4..1e02d4539a 100644
--- a/com.discord/smali/com/google/firebase/d/a.smali
+++ b/com.discord/smali/com/google/firebase/d/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final aSw:Ljava/lang/String;
+.field private final aSF:Ljava/lang/String;
 
-.field private final aSx:Ljava/lang/String;
+.field private final aSG:Ljava/lang/String;
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     if-eqz p1, :cond_1
 
-    iput-object p1, p0, Lcom/google/firebase/d/a;->aSw:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/google/firebase/d/a;->aSx:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/d/a;->aSG:Ljava/lang/String;
 
     return-void
 
@@ -46,12 +46,12 @@
 
 
 # virtual methods
-.method public final Ap()Ljava/lang/String;
+.method public final As()Ljava/lang/String;
     .locals 1
     .annotation runtime Ljavax/annotation/Nonnull;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/d/a;->aSw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -61,7 +61,7 @@
     .annotation runtime Ljavax/annotation/Nonnull;
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/d/a;->aSx:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aSG:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -84,9 +84,9 @@
 
     check-cast p1, Lcom/google/firebase/d/e;
 
-    iget-object v1, p0, Lcom/google/firebase/d/a;->aSw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/firebase/d/e;->Ap()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/d/e;->As()Ljava/lang/String;
 
     move-result-object v3
 
@@ -96,7 +96,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/firebase/d/a;->aSx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSG:Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/google/firebase/d/e;->cc()Ljava/lang/String;
 
@@ -117,7 +117,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/d/a;->aSw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
 
@@ -129,7 +129,7 @@
 
     mul-int v0, v0, v1
 
-    iget-object v1, p0, Lcom/google/firebase/d/a;->aSx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSG:Ljava/lang/String;
 
     invoke-virtual {v1}, 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;->aSw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSF:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -157,7 +157,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/firebase/d/a;->aSx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/a;->aSG: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 9abfd48067..ec35b73c36 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 Ap()Ljava/lang/String;
+.method public abstract As()Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nonnull;
     .end annotation
 .end method
diff --git a/com.discord/smali/com/google/firebase/iid/w.smali b/com.discord/smali/com/google/firebase/iid/w.smali
index ce743c3ab9..a642cf8259 100644
--- a/com.discord/smali/com/google/firebase/iid/w.smali
+++ b/com.discord/smali/com/google/firebase/iid/w.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field aRJ:Lcom/google/firebase/iid/x;
+.field aRS:Lcom/google/firebase/iid/x;
     .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/w;->aRJ:Lcom/google/firebase/iid/x;
+    iput-object p1, p0, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
 
     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/w;->aRJ:Lcom/google/firebase/iid/x;
+    iget-object p1, p0, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
 
     if-nez p1, :cond_0
 
@@ -42,7 +42,7 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qd()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()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/w;->aRJ:Lcom/google/firebase/iid/x;
+    iget-object p1, p0, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
 
     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/w;->aRJ:Lcom/google/firebase/iid/x;
+    iget-object p1, p0, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object p1
 
@@ -71,7 +71,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/w;->aRJ:Lcom/google/firebase/iid/x;
+    iput-object p1, p0, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
 
     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 967875c01d..7c372211ac 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;
-        AG = true
-        AH = true
+        AJ = true
+        AK = true
     .end subannotation
 .end annotation
 
@@ -29,8 +29,8 @@
 
 
 # virtual methods
-.method public abstract AG()Z
+.method public abstract AJ()Z
 .end method
 
-.method public abstract AH()Z
+.method public abstract AK()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 63ba981b3b..51dacad89f 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;
-        AI = true
+        AL = true
     .end subannotation
 .end annotation
 
@@ -26,7 +26,7 @@
 
 
 # virtual methods
-.method public abstract AI()Z
+.method public abstract AL()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 842f0ad22b..450fdca078 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;
-        AJ = {}
+        AM = {}
     .end subannotation
 .end annotation
 
@@ -29,7 +29,7 @@
 
 
 # virtual methods
-.method public abstract AJ()[Ljava/lang/String;
+.method public abstract AM()[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 0aac43c296..2317d52f1d 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 AK()D
+.method public abstract AN()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 b60aa550ef..834d9bb257 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 AK()D
+.method public abstract AN()D
 .end method
diff --git a/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali b/com.discord/smali/com/miguelgaeta/backgrounded/Backgrounded.smali
index d014581dd4..4fd0658f51 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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v1
 
@@ -106,7 +106,7 @@
 
     sget-object v0, Lcom/miguelgaeta/backgrounded/Backgrounded;->emitter:Lrx/subjects/SerializedSubject;
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -149,7 +149,7 @@
 
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iget-object v0, v0, Lrx/b/a;->bNM:Lrx/Observable;
+    iget-object v0, v0, Lrx/b/a;->bNW: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 1792c9dd40..f444f45963 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 bgo:Lkotlin/Unit;
+.field public static final bgy:Lkotlin/Unit;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/Unit;-><init>()V
 
-    sput-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sput-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-void
 .end method
diff --git a/com.discord/smali/kotlin/a/o.smali b/com.discord/smali/kotlin/a/o.smali
index 904d64f8c9..3c47f00674 100644
--- a/com.discord/smali/kotlin/a/o.smali
+++ b/com.discord/smali/kotlin/a/o.smali
@@ -85,7 +85,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/y;->bgD:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bgN:Lkotlin/a/y;
 
     check-cast v0, Ljava/util/List;
 
diff --git a/com.discord/smali/kotlin/a/p.smali b/com.discord/smali/kotlin/a/p.smali
index fc634446f1..5a9e5e09ef 100644
--- a/com.discord/smali/kotlin/a/p.smali
+++ b/com.discord/smali/kotlin/a/p.smali
@@ -36,6 +36,45 @@
     return p1
 .end method
 
+.method public static final collectionSizeOrNull(Ljava/lang/Iterable;)Ljava/lang/Integer;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/lang/Integer;"
+        }
+    .end annotation
+
+    const-string v0, "$this$collectionSizeOrNull"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    instance-of v0, p0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_0
+
+    check-cast p0, Ljava/util/Collection;
+
+    invoke-interface {p0}, Ljava/util/Collection;->size()I
+
+    move-result p0
+
+    invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p0
+
+    return-object p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return-object p0
+.end method
+
 .method public static final convertToSetForSetOperationWith(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
diff --git a/com.discord/smali/kotlin/a/w.smali b/com.discord/smali/kotlin/a/w.smali
index e3d7f56f40..289cf1fbc8 100644
--- a/com.discord/smali/kotlin/a/w.smali
+++ b/com.discord/smali/kotlin/a/w.smali
@@ -89,7 +89,7 @@
     :cond_1
     if-nez v2, :cond_2
 
-    sget-object p0, Lkotlin/jvm/internal/g;->bht:Lkotlin/jvm/internal/g;
+    sget-object p0, Lkotlin/jvm/internal/g;->bhD:Lkotlin/jvm/internal/g;
 
     invoke-virtual {p0}, Lkotlin/jvm/internal/g;->getNaN()D
 
@@ -1275,6 +1275,71 @@
     return-object v0
 .end method
 
+.method public static final min(Ljava/lang/Iterable;)Ljava/lang/Comparable;
+    .locals 3
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T::",
+            "Ljava/lang/Comparable<",
+            "-TT;>;>(",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)TT;"
+        }
+    .end annotation
+
+    const-string v0, "$this$min"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p0
+
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    const/4 p0, 0x0
+
+    return-object p0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/Comparable;
+
+    :cond_1
+    :goto_0
+    invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Comparable;
+
+    invoke-interface {v0, v1}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+
+    move-result v2
+
+    if-lez v2, :cond_1
+
+    move-object v0, v1
+
+    goto :goto_0
+
+    :cond_2
+    return-object v0
+.end method
+
 .method public static final minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
diff --git a/com.discord/smali/kotlin/jvm/internal/ab.smali b/com.discord/smali/kotlin/jvm/internal/ab.smali
index 1eb18a9bce..d24e322d34 100644
--- a/com.discord/smali/kotlin/jvm/internal/ab.smali
+++ b/com.discord/smali/kotlin/jvm/internal/ab.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bhE:Lkotlin/jvm/internal/ab;
+.field public static final bhO:Lkotlin/jvm/internal/ab;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/ab;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/ab;->bhE:Lkotlin/jvm/internal/ab;
+    sput-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab;
 
     return-void
 .end method
diff --git a/com.discord/smali/kotlin/jvm/internal/c.smali b/com.discord/smali/kotlin/jvm/internal/c.smali
index 3fcd380269..5a0c829640 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;->CW()Lkotlin/jvm/internal/c$a;
+    invoke-static {}, Lkotlin/jvm/internal/c$a;->CZ()Lkotlin/jvm/internal/c$a;
 
     move-result-object v0
 
diff --git a/com.discord/smali/kotlin/ranges/IntProgression.smali b/com.discord/smali/kotlin/ranges/IntProgression.smali
index 602321b981..bfdd4d5b1d 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 bhR:Lkotlin/ranges/IntProgression$a;
+.field public static final bib:Lkotlin/ranges/IntProgression$a;
 
 
 # instance fields
-.field private final bhO:I
+.field private final bhY:I
 
-.field private final bhP:I
+.field private final bhZ:I
 
-.field private final bhQ:I
+.field private final bia:I
 
 
 # direct methods
@@ -47,7 +47,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/ranges/IntProgression$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/ranges/IntProgression;->bhR:Lkotlin/ranges/IntProgression$a;
+    sput-object v0, Lkotlin/ranges/IntProgression;->bib:Lkotlin/ranges/IntProgression$a;
 
     return-void
 .end method
@@ -63,15 +63,15 @@
 
     if-eq p3, v0, :cond_0
 
-    iput p1, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iput p1, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
     invoke-static {p1, p2, p3}, Lkotlin/c/c;->getProgressionLastElement(III)I
 
     move-result p1
 
-    iput p1, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iput p1, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
-    iput p3, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iput p3, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     return-void
 
@@ -124,23 +124,23 @@
     if-nez v0, :cond_1
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
     check-cast p1, Lkotlin/ranges/IntProgression;
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bhY:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
-    iget v1, p1, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v1, p1, Lkotlin/ranges/IntProgression;->bhZ:I
 
     if-ne v0, v1, :cond_2
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
 
-    iget p1, p1, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget p1, p1, Lkotlin/ranges/IntProgression;->bia:I
 
     if-ne v0, p1, :cond_2
 
@@ -158,7 +158,7 @@
 .method public final getFirst()I
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
     return v0
 .end method
@@ -166,7 +166,7 @@
 .method public final getLast()I
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
     return v0
 .end method
@@ -174,7 +174,7 @@
 .method public final getStep()I
     .locals 1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     return v0
 .end method
@@ -193,17 +193,17 @@
     return v0
 
     :cond_0
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     add-int/2addr v0, v1
 
@@ -213,7 +213,7 @@
 .method public isEmpty()Z
     .locals 4
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     const/4 v1, 0x1
 
@@ -221,9 +221,9 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
     if-le v0, v3, :cond_0
 
@@ -233,9 +233,9 @@
     return v2
 
     :cond_1
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
     if-ge v0, v3, :cond_2
 
@@ -262,11 +262,11 @@
 
     new-instance v0, Lkotlin/ranges/b;
 
-    iget v1, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhZ:I
 
-    iget v3, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget v3, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     invoke-direct {v0, v1, v2, v3}, Lkotlin/ranges/b;-><init>(III)V
 
@@ -278,7 +278,7 @@
 .method public toString()Ljava/lang/String;
     .locals 3
 
-    iget v0, p0, Lkotlin/ranges/IntProgression;->bhQ:I
+    iget v0, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     const-string v1, " step "
 
@@ -288,7 +288,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -296,13 +296,13 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhZ: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;->bhQ:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     :goto_0
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
@@ -318,7 +318,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhO:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhY:I
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -326,13 +326,13 @@
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v2, p0, Lkotlin/ranges/IntProgression;->bhP:I
+    iget v2, p0, Lkotlin/ranges/IntProgression;->bhZ: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;->bhQ:I
+    iget v1, p0, Lkotlin/ranges/IntProgression;->bia:I
 
     neg-int v1, v1
 
diff --git a/com.discord/smali/kotlin/ranges/IntRange.smali b/com.discord/smali/kotlin/ranges/IntRange.smali
index e3842627eb..fd04106cb7 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 bhU:Lkotlin/ranges/IntRange;
+.field private static final bie:Lkotlin/ranges/IntRange;
 
-.field public static final bhV:Lkotlin/ranges/IntRange$a;
+.field public static final bif:Lkotlin/ranges/IntRange$a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/ranges/IntRange$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/ranges/IntRange;->bhV:Lkotlin/ranges/IntRange$a;
+    sput-object v0, Lkotlin/ranges/IntRange;->bif:Lkotlin/ranges/IntRange$a;
 
     new-instance v0, Lkotlin/ranges/IntRange;
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v1, v2}, Lkotlin/ranges/IntRange;-><init>(II)V
 
-    sput-object v0, Lkotlin/ranges/IntRange;->bhU:Lkotlin/ranges/IntRange;
+    sput-object v0, Lkotlin/ranges/IntRange;->bie:Lkotlin/ranges/IntRange;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 .method public static final synthetic access$getEMPTY$cp()Lkotlin/ranges/IntRange;
     .locals 1
 
-    sget-object v0, Lkotlin/ranges/IntRange;->bhU:Lkotlin/ranges/IntRange;
+    sget-object v0, Lkotlin/ranges/IntRange;->bie:Lkotlin/ranges/IntRange;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/kotlin/ranges/b.smali b/com.discord/smali/kotlin/ranges/b.smali
index a560f0b299..cdba71a57e 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 bhQ:I
+.field private final bia:I
 
-.field private final bhS:I
+.field private final bic:I
 
-.field private bhT:I
+.field private bid:I
 
 .field private hasNext:Z
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Lkotlin/a/ab;-><init>()V
 
-    iput p3, p0, Lkotlin/ranges/b;->bhQ:I
+    iput p3, p0, Lkotlin/ranges/b;->bia:I
 
-    iput p2, p0, Lkotlin/ranges/b;->bhS:I
+    iput p2, p0, Lkotlin/ranges/b;->bic:I
 
-    iget p3, p0, Lkotlin/ranges/b;->bhQ:I
+    iget p3, p0, Lkotlin/ranges/b;->bia:I
 
     const/4 v0, 0x1
 
@@ -53,10 +53,10 @@
     goto :goto_1
 
     :cond_2
-    iget p1, p0, Lkotlin/ranges/b;->bhS:I
+    iget p1, p0, Lkotlin/ranges/b;->bic:I
 
     :goto_1
-    iput p1, p0, Lkotlin/ranges/b;->bhT:I
+    iput p1, p0, Lkotlin/ranges/b;->bid:I
 
     return-void
 .end method
@@ -74,9 +74,9 @@
 .method public final nextInt()I
     .locals 2
 
-    iget v0, p0, Lkotlin/ranges/b;->bhT:I
+    iget v0, p0, Lkotlin/ranges/b;->bid:I
 
-    iget v1, p0, Lkotlin/ranges/b;->bhS:I
+    iget v1, p0, Lkotlin/ranges/b;->bic:I
 
     if-ne v0, v1, :cond_1
 
@@ -100,11 +100,11 @@
     throw v0
 
     :cond_1
-    iget v1, p0, Lkotlin/ranges/b;->bhQ:I
+    iget v1, p0, Lkotlin/ranges/b;->bia:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lkotlin/ranges/b;->bhT:I
+    iput v1, p0, Lkotlin/ranges/b;->bid:I
 
     :goto_0
     return v0
diff --git a/com.discord/smali/kotlin/ranges/f.smali b/com.discord/smali/kotlin/ranges/f.smali
index 0752ec92af..d2c0b04319 100644
--- a/com.discord/smali/kotlin/ranges/f.smali
+++ b/com.discord/smali/kotlin/ranges/f.smali
@@ -104,7 +104,7 @@
 .method public static final downTo(II)Lkotlin/ranges/IntProgression;
     .locals 2
 
-    sget-object v0, Lkotlin/ranges/IntProgression;->bhR:Lkotlin/ranges/IntProgression$a;
+    sget-object v0, Lkotlin/ranges/IntProgression;->bib:Lkotlin/ranges/IntProgression$a;
 
     const/4 v1, -0x1
 
@@ -140,7 +140,7 @@
 
     invoke-static {v0, v1}, Lkotlin/ranges/c;->checkStepIsPositive(ZLjava/lang/Number;)V
 
-    sget-object v0, Lkotlin/ranges/IntProgression;->bhR:Lkotlin/ranges/IntProgression$a;
+    sget-object v0, Lkotlin/ranges/IntProgression;->bib:Lkotlin/ranges/IntProgression$a;
 
     invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getFirst()I
 
@@ -176,7 +176,7 @@
 
     if-gt p1, v0, :cond_0
 
-    sget-object p0, Lkotlin/ranges/IntRange;->bhV:Lkotlin/ranges/IntRange$a;
+    sget-object p0, Lkotlin/ranges/IntRange;->bif:Lkotlin/ranges/IntRange$a;
 
     invoke-virtual {p0}, Lkotlin/ranges/IntRange$a;->getEMPTY()Lkotlin/ranges/IntRange;
 
diff --git a/com.discord/smali/kotlin/sequences/l.smali b/com.discord/smali/kotlin/sequences/l.smali
index 7efb74cc06..f85544edd6 100644
--- a/com.discord/smali/kotlin/sequences/l.smali
+++ b/com.discord/smali/kotlin/sequences/l.smali
@@ -39,7 +39,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/g;
 
-    sget-object v1, Lkotlin/sequences/l$c;->biw:Lkotlin/sequences/l$c;
+    sget-object v1, Lkotlin/sequences/l$c;->biG:Lkotlin/sequences/l$c;
 
     check-cast v1, Lkotlin/jvm/functions/Function1;
 
@@ -62,7 +62,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/sequences/e;->bih:Lkotlin/sequences/e;
+    sget-object v0, Lkotlin/sequences/e;->bir:Lkotlin/sequences/e;
 
     check-cast v0, Lkotlin/sequences/Sequence;
 
@@ -89,7 +89,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/l$a;->biu:Lkotlin/sequences/l$a;
+    sget-object v0, Lkotlin/sequences/l$a;->biE:Lkotlin/sequences/l$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -120,7 +120,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/l$b;->biv:Lkotlin/sequences/l$b;
+    sget-object v0, Lkotlin/sequences/l$b;->biF:Lkotlin/sequences/l$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali/kotlin/sequences/n.smali b/com.discord/smali/kotlin/sequences/n.smali
index ffafd6e4ed..6a13238d38 100644
--- a/com.discord/smali/kotlin/sequences/n.smali
+++ b/com.discord/smali/kotlin/sequences/n.smali
@@ -76,7 +76,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/n$b;->biy:Lkotlin/sequences/n$b;
+    sget-object v0, Lkotlin/sequences/n$b;->biI:Lkotlin/sequences/n$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
@@ -300,7 +300,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/sequences/n$c;->biz:Lkotlin/sequences/n$c;
+    sget-object v0, Lkotlin/sequences/n$c;->biJ:Lkotlin/sequences/n$c;
 
     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 cb1b1ec300..c5570fbba8 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 biK:Ljava/lang/CharSequence;
+.field private final biU:Ljava/lang/CharSequence;
 
-.field private final biL:Lkotlin/jvm/functions/Function2;
+.field private final biV: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;->biK:Ljava/lang/CharSequence;
+    iput-object p1, p0, Lkotlin/text/e;->biU: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;->biL:Lkotlin/jvm/functions/Function2;
+    iput-object p4, p0, Lkotlin/text/e;->biV:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 .method public static final synthetic access$getGetNextMatch$p(Lkotlin/text/e;)Lkotlin/jvm/functions/Function2;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/text/e;->biL:Lkotlin/jvm/functions/Function2;
+    iget-object p0, p0, Lkotlin/text/e;->biV:Lkotlin/jvm/functions/Function2;
 
     return-object p0
 .end method
@@ -91,7 +91,7 @@
 .method public static final synthetic access$getInput$p(Lkotlin/text/e;)Ljava/lang/CharSequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/text/e;->biK:Ljava/lang/CharSequence;
+    iget-object p0, p0, Lkotlin/text/e;->biU:Ljava/lang/CharSequence;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/kotlin/text/w$a.smali b/com.discord/smali/kotlin/text/w$a.smali
index 3934e2ee60..b2dd687f79 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 bjf:Lkotlin/text/w$a;
+.field public static final bjp: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;->bjf:Lkotlin/text/w$a;
+    sput-object v0, Lkotlin/text/w$a;->bjp: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 3ae80e0dcc..0153c1d1e7 100644
--- a/com.discord/smali/kotlin/text/w.smali
+++ b/com.discord/smali/kotlin/text/w.smali
@@ -411,7 +411,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/text/w$a;->bjf:Lkotlin/text/w$a;
+    sget-object v0, Lkotlin/text/w$a;->bjp:Lkotlin/text/w$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function1;
 
diff --git a/com.discord/smali/okhttp3/Headers.smali b/com.discord/smali/okhttp3/Headers.smali
index 2639ed36d4..fe10d0a2be 100644
--- a/com.discord/smali/okhttp3/Headers.smali
+++ b/com.discord/smali/okhttp3/Headers.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field public final bqS:[Ljava/lang/String;
+.field public final brc:[Ljava/lang/String;
 
 
 # direct methods
@@ -21,9 +21,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/Headers$a;->bqT:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/Headers$a;->brd:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/Headers$a;->bqT:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/Headers$a;->brd: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;->bqS:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->brc:[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;->bqS:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     return-void
 .end method
@@ -391,16 +391,16 @@
 
 
 # virtual methods
-.method public final Fi()Lokhttp3/Headers$a;
+.method public final Fl()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;->bqT:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
 
-    iget-object v2, p0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     invoke-static {v1, v2}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
@@ -412,7 +412,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     invoke-static {v0, p1}, Lokhttp3/Headers;->b([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -424,7 +424,7 @@
 .method public final de(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
@@ -436,7 +436,7 @@
 .method public final df(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     mul-int/lit8 p1, p1, 0x2
 
@@ -460,9 +460,9 @@
 
     check-cast p1, Lokhttp3/Headers;
 
-    iget-object p1, p1, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     invoke-static {p1, v0}, Ljava/util/Arrays;->equals([Ljava/lang/Object;[Ljava/lang/Object;)Z
 
@@ -483,7 +483,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/Headers;->brc:[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;->bqS:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v1, v1
 
diff --git a/com.discord/smali/okhttp3/Interceptor$Chain.smali b/com.discord/smali/okhttp3/Interceptor$Chain.smali
index 9c2868df0b..de08276007 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 Fu()Lokhttp3/w;
+.method public abstract FA()I
 .end method
 
-.method public abstract Fv()Lokhttp3/i;
+.method public abstract FB()I
+.end method
+
+.method public abstract Fx()Lokhttp3/w;
+.end method
+
+.method public abstract Fy()Lokhttp3/i;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end method
 
-.method public abstract Fw()I
-.end method
-
-.method public abstract Fx()I
-.end method
-
-.method public abstract Fy()I
+.method public abstract Fz()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 a3f3a9e5e0..7e28db5631 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 brf:Ljava/util/regex/Pattern;
+.field private static final brp:Ljava/util/regex/Pattern;
 
-.field private static final brg:Ljava/util/regex/Pattern;
+.field private static final brq:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final brh:Ljava/lang/String;
+.field private final brr:Ljava/lang/String;
 
-.field public final bri:Ljava/lang/String;
+.field public final brs:Ljava/lang/String;
 
-.field private final brj:Ljava/lang/String;
+.field private final brt: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;->brf:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->brp: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;->brg:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/MediaType;->brq:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -54,13 +54,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MediaType;->brh:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/MediaType;->brr:Ljava/lang/String;
 
     iput-object p2, p0, Lokhttp3/MediaType;->type:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/MediaType;->bri:Ljava/lang/String;
+    iput-object p3, p0, Lokhttp3/MediaType;->brs:Ljava/lang/String;
 
-    iput-object p4, p0, Lokhttp3/MediaType;->brj:Ljava/lang/String;
+    iput-object p4, p0, Lokhttp3/MediaType;->brt:Ljava/lang/String;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 .method public static dK(Ljava/lang/String;)Lokhttp3/MediaType;
     .locals 11
 
-    sget-object v0, Lokhttp3/MediaType;->brf:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/MediaType;->brp: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;->brg:Ljava/util/regex/Pattern;
+    sget-object v7, Lokhttp3/MediaType;->brq:Ljava/util/regex/Pattern;
 
     invoke-virtual {v7, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -348,11 +348,11 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/MediaType;->brj:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brt:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MediaType;->brj:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brt: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;->brh:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/MediaType;->brr:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/MediaType;->brh:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brr: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;->brh:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brr: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;->brh:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/MediaType;->brr: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 898ec085fb..df34c35a83 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 brx:Lokhttp3/Headers;
+.field final brH:Lokhttp3/Headers;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bry:Lokhttp3/RequestBody;
+.field final brI:Lokhttp3/RequestBody;
 
 
 # direct methods
@@ -33,9 +33,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->brx:Lokhttp3/Headers;
+    iput-object p1, p0, Lokhttp3/MultipartBody$Part;->brH:Lokhttp3/Headers;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->bry:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/MultipartBody$Part;->brI: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 be272c617e..c11adbc3a3 100644
--- a/com.discord/smali/okhttp3/MultipartBody$a.smali
+++ b/com.discord/smali/okhttp3/MultipartBody$a.smali
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public final brs:Lokio/ByteString;
+.field public final brC:Lokio/ByteString;
 
-.field public final brv:Ljava/util/List;
+.field public final brF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field public brw:Lokhttp3/MediaType;
+.field public brG:Lokhttp3/MediaType;
 
 
 # direct methods
@@ -52,21 +52,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/MultipartBody;->brk:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/MultipartBody;->bru:Lokhttp3/MediaType;
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brw:Lokhttp3/MediaType;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brG:Lokhttp3/MediaType;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brv:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/MultipartBody$a;->brF:Ljava/util/List;
 
     invoke-static {p1}, Lokio/ByteString;->ek(Ljava/lang/String;)Lokio/ByteString;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody$a;->brs:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody$a;->brC:Lokio/ByteString;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/MultipartBody$a;->brv:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/MultipartBody$a;->brF: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 ff1d850fde..10d2b358af 100644
--- a/com.discord/smali/okhttp3/MultipartBody.smali
+++ b/com.discord/smali/okhttp3/MultipartBody.smali
@@ -13,31 +13,31 @@
 
 
 # static fields
-.field public static final brk:Lokhttp3/MediaType;
+.field private static final brA:[B
 
-.field public static final brl:Lokhttp3/MediaType;
+.field private static final brB:[B
 
-.field public static final brm:Lokhttp3/MediaType;
+.field public static final bru:Lokhttp3/MediaType;
 
-.field public static final brn:Lokhttp3/MediaType;
+.field public static final brv:Lokhttp3/MediaType;
 
-.field public static final bro:Lokhttp3/MediaType;
+.field public static final brw:Lokhttp3/MediaType;
 
-.field private static final brp:[B
+.field public static final brx:Lokhttp3/MediaType;
 
-.field private static final brq:[B
+.field public static final bry:Lokhttp3/MediaType;
 
-.field private static final brr:[B
+.field private static final brz:[B
 
 
 # instance fields
-.field private final brs:Lokio/ByteString;
+.field private final brC:Lokio/ByteString;
 
-.field private final brt:Lokhttp3/MediaType;
+.field private final brD:Lokhttp3/MediaType;
 
-.field private final bru:Lokhttp3/MediaType;
+.field private final brE:Lokhttp3/MediaType;
 
-.field private final brv:Ljava/util/List;
+.field private final brF:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brk:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bru:Lokhttp3/MediaType;
 
     const-string v0, "multipart/alternative"
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brl:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brv:Lokhttp3/MediaType;
 
     const-string v0, "multipart/digest"
 
@@ -76,7 +76,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brm:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brw:Lokhttp3/MediaType;
 
     const-string v0, "multipart/parallel"
 
@@ -84,7 +84,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->brn:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->brx:Lokhttp3/MediaType;
 
     const-string v0, "multipart/form-data"
 
@@ -92,7 +92,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/MultipartBody;->bro:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/MultipartBody;->bry:Lokhttp3/MediaType;
 
     const/4 v0, 0x2
 
@@ -100,19 +100,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/MultipartBody;->brp:[B
+    sput-object v1, Lokhttp3/MultipartBody;->brz:[B
 
     new-array v1, v0, [B
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lokhttp3/MultipartBody;->brq:[B
+    sput-object v1, Lokhttp3/MultipartBody;->brA:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_2
 
-    sput-object v0, Lokhttp3/MultipartBody;->brr:[B
+    sput-object v0, Lokhttp3/MultipartBody;->brB:[B
 
     return-void
 
@@ -160,9 +160,9 @@
 
     iput-wide v0, p0, Lokhttp3/MultipartBody;->contentLength:J
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->brs:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->brC:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/MultipartBody;->brt:Lokhttp3/MediaType;
+    iput-object p2, p0, Lokhttp3/MultipartBody;->brD: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;->Hq()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object p1
 
@@ -188,13 +188,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->bru:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->brE:Lokhttp3/MediaType;
 
     invoke-static {p3}, Lokhttp3/internal/c;->U(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/MultipartBody;->brv:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/MultipartBody;->brF:Ljava/util/List;
 
     return-void
 .end method
@@ -225,7 +225,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/MultipartBody;->brv:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->brF: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;->brv:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/MultipartBody;->brF: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;->brx:Lokhttp3/Headers;
+    iget-object v7, v6, Lokhttp3/MultipartBody$Part;->brH:Lokhttp3/Headers;
 
-    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->bry:Lokhttp3/RequestBody;
+    iget-object v6, v6, Lokhttp3/MultipartBody$Part;->brI:Lokhttp3/RequestBody;
 
-    sget-object v8, Lokhttp3/MultipartBody;->brr:[B
+    sget-object v8, Lokhttp3/MultipartBody;->brB:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v8, p0, Lokhttp3/MultipartBody;->brs:Lokio/ByteString;
+    iget-object v8, p0, Lokhttp3/MultipartBody;->brC:Lokio/ByteString;
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v8, Lokhttp3/MultipartBody;->brq:[B
+    sget-object v8, Lokhttp3/MultipartBody;->brA:[B
 
     invoke-interface {p1, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     if-eqz v7, :cond_1
 
-    iget-object v8, v7, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v8, v7, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v8, v8
 
@@ -287,7 +287,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->brp:[B
+    sget-object v11, Lokhttp3/MultipartBody;->brz:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -301,7 +301,7 @@
 
     move-result-object v10
 
-    sget-object v11, Lokhttp3/MultipartBody;->brq:[B
+    sget-object v11, Lokhttp3/MultipartBody;->brA:[B
 
     invoke-interface {v10, v11}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -330,7 +330,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lokhttp3/MultipartBody;->brq:[B
+    sget-object v8, Lokhttp3/MultipartBody;->brA:[B
 
     invoke-interface {v7, v8}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -355,7 +355,7 @@
 
     move-result-object v9
 
-    sget-object v10, Lokhttp3/MultipartBody;->brq:[B
+    sget-object v10, Lokhttp3/MultipartBody;->brA:[B
 
     invoke-interface {v9, v10}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
@@ -370,7 +370,7 @@
 
     :cond_4
     :goto_3
-    sget-object v9, Lokhttp3/MultipartBody;->brq:[B
+    sget-object v9, Lokhttp3/MultipartBody;->brA:[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;->brq:[B
+    sget-object v6, Lokhttp3/MultipartBody;->brA:[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;->brr:[B
+    sget-object v1, Lokhttp3/MultipartBody;->brB:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/MultipartBody;->brs:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/MultipartBody;->brC:Lokio/ByteString;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->m(Lokio/ByteString;)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->brr:[B
+    sget-object v1, Lokhttp3/MultipartBody;->brB:[B
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/MultipartBody;->brq:[B
+    sget-object v1, Lokhttp3/MultipartBody;->brA:[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;->bru:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/MultipartBody;->brE: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 ba1a78f3ea..070f1bc1fc 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 bsk:Lokhttp3/MediaType;
+.field final synthetic bsu:Lokhttp3/MediaType;
 
-.field final synthetic bsl:Lokio/ByteString;
+.field final synthetic bsv:Lokio/ByteString;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Lokio/ByteString;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$1;->bsk:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$1;->bsu:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$1;->bsl:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/RequestBody$1;->bsv:Lokio/ByteString;
 
     invoke-direct {p0}, Lokhttp3/RequestBody;-><init>()V
 
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsl:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsv: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;->bsk:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsu:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsl:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/RequestBody$1;->bsv: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 66990c4dba..574095e410 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 bsk:Lokhttp3/MediaType;
+.field final synthetic bsu:Lokhttp3/MediaType;
 
-.field final synthetic bsm:I
+.field final synthetic bsw:I
 
-.field final synthetic bsn:[B
+.field final synthetic bsx:[B
 
-.field final synthetic bso:I
+.field final synthetic bsy:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;I[BI)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$2;->bsk:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$2;->bsu:Lokhttp3/MediaType;
 
-    iput p2, p0, Lokhttp3/RequestBody$2;->bsm:I
+    iput p2, p0, Lokhttp3/RequestBody$2;->bsw:I
 
-    iput-object p3, p0, Lokhttp3/RequestBody$2;->bsn:[B
+    iput-object p3, p0, Lokhttp3/RequestBody$2;->bsx:[B
 
-    iput p4, p0, Lokhttp3/RequestBody$2;->bso:I
+    iput p4, p0, Lokhttp3/RequestBody$2;->bsy: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;->bsm:I
+    iget v0, p0, Lokhttp3/RequestBody$2;->bsw:I
 
     int-to-long v0, v0
 
@@ -58,7 +58,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsk:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsu:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -71,11 +71,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsn:[B
+    iget-object v0, p0, Lokhttp3/RequestBody$2;->bsx:[B
 
-    iget v1, p0, Lokhttp3/RequestBody$2;->bso:I
+    iget v1, p0, Lokhttp3/RequestBody$2;->bsy:I
 
-    iget v2, p0, Lokhttp3/RequestBody$2;->bsm:I
+    iget v2, p0, Lokhttp3/RequestBody$2;->bsw:I
 
     invoke-interface {p1, v0, v1, v2}, Lokio/BufferedSink;->l([BII)Lokio/BufferedSink;
 
diff --git a/com.discord/smali/okhttp3/RequestBody$3.smali b/com.discord/smali/okhttp3/RequestBody$3.smali
index f5a219cc2c..885261636f 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 bsk:Lokhttp3/MediaType;
+.field final synthetic bsu:Lokhttp3/MediaType;
 
-.field final synthetic bsp:Ljava/io/File;
+.field final synthetic bsz:Ljava/io/File;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;Ljava/io/File;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/RequestBody$3;->bsk:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/RequestBody$3;->bsu:Lokhttp3/MediaType;
 
-    iput-object p2, p0, Lokhttp3/RequestBody$3;->bsp:Ljava/io/File;
+    iput-object p2, p0, Lokhttp3/RequestBody$3;->bsz: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;->bsp:Ljava/io/File;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bsz: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;->bsk:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/RequestBody$3;->bsu:Lokhttp3/MediaType;
 
     return-object v0
 .end method
@@ -68,7 +68,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/RequestBody$3;->bsp:Ljava/io/File;
+    iget-object v1, p0, Lokhttp3/RequestBody$3;->bsz:Ljava/io/File;
 
     invoke-static {v1}, Lokio/j;->C(Ljava/io/File;)Lokio/r;
 
diff --git a/com.discord/smali/okhttp3/RequestBody.smali b/com.discord/smali/okhttp3/RequestBody.smali
index 6cccbc97e2..4d73d3b937 100644
--- a/com.discord/smali/okhttp3/RequestBody.smali
+++ b/com.discord/smali/okhttp3/RequestBody.smali
@@ -44,7 +44,7 @@
         .end annotation
     .end param
 
-    sget-object v0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v0, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     if-eqz p0, :cond_0
 
@@ -56,7 +56,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v0, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/okhttp3/Response$a.smali b/com.discord/smali/okhttp3/Response$a.smali
index 20e3b04040..5b38e1be9d 100644
--- a/com.discord/smali/okhttp3/Response$a.smali
+++ b/com.discord/smali/okhttp3/Response$a.smali
@@ -15,46 +15,46 @@
 
 
 # instance fields
-.field public bsj:Lokhttp3/Headers$a;
-
-.field public bsq:Lokhttp3/w;
+.field public bsA:Lokhttp3/w;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsr:Lokhttp3/u;
+.field public bsB:Lokhttp3/u;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bss:Lokhttp3/r;
+.field public bsC:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bst:Lokhttp3/x;
+.field public bsD:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bsu:Lokhttp3/Response;
+.field bsE:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bsv:Lokhttp3/Response;
+.field bsF:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsw:Lokhttp3/Response;
+.field public bsG:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bsx:J
+.field public bsH:J
 
-.field public bsy:J
+.field public bsI:J
+
+.field public bst:Lokhttp3/Headers$a;
 
 .field public code:I
 
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsj:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bst: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;->bsq:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsr:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response;->bsB:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsB: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;->bss:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response;->bsC:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bss:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v0, p1, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
-    invoke-virtual {v0}, Lokhttp3/Headers;->Fi()Lokhttp3/Headers$a;
+    invoke-virtual {v0}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsj:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
 
-    iget-object v0, p1, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsu:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsE:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsu:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsE:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsv:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsF:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsv:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsF:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response;->bsw:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bsw:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsG:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response;->bsx:J
+    iget-wide v0, p1, Lokhttp3/Response;->bsH:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->bsx:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bsH:J
 
-    iget-wide v0, p1, Lokhttp3/Response;->bsy:J
+    iget-wide v0, p1, Lokhttp3/Response;->bsI:J
 
-    iput-wide v0, p0, Lokhttp3/Response$a;->bsy:J
+    iput-wide v0, p0, Lokhttp3/Response$a;->bsI: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;->bst:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     if-nez v0, :cond_3
 
-    iget-object v0, p1, Lokhttp3/Response;->bsu:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsE:Lokhttp3/Response;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lokhttp3/Response;->bsv:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response;->bsF:Lokhttp3/Response;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p1, Lokhttp3/Response;->bsw:Lokhttp3/Response;
+    iget-object p1, p1, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
     if-nez p1, :cond_0
 
@@ -252,14 +252,14 @@
 
 
 # virtual methods
-.method public final FM()Lokhttp3/Response;
+.method public final FP()Lokhttp3/Response;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iget-object v0, p0, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
 
     if-eqz v0, :cond_2
 
@@ -329,7 +329,7 @@
 .method public final aq(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Response$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->aj(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;->bsu:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bsE: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;->Fi()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/Response$a;->bsj:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/Response$a;->bst: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;->bsv:Lokhttp3/Response;
+    iput-object p1, p0, Lokhttp3/Response$a;->bsF:Lokhttp3/Response;
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/Response.smali b/com.discord/smali/okhttp3/Response.smali
index e6ddf4c4ac..30d6db7e98 100644
--- a/com.discord/smali/okhttp3/Response.smali
+++ b/com.discord/smali/okhttp3/Response.smali
@@ -15,46 +15,46 @@
 
 
 # instance fields
-.field public final brx:Lokhttp3/Headers;
+.field public final brH:Lokhttp3/Headers;
 
-.field private volatile bsi:Lokhttp3/d;
+.field public final bsA:Lokhttp3/w;
+
+.field final bsB:Lokhttp3/u;
+
+.field public final bsC:Lokhttp3/r;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsq:Lokhttp3/w;
-
-.field final bsr:Lokhttp3/u;
-
-.field public final bss:Lokhttp3/r;
+.field public final bsD:Lokhttp3/x;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bst:Lokhttp3/x;
+.field final bsE:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bsu:Lokhttp3/Response;
+.field final bsF:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bsv:Lokhttp3/Response;
+.field public final bsG:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsw:Lokhttp3/Response;
+.field public final bsH:J
+
+.field public final bsI:J
+
+.field private volatile bss:Lokhttp3/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsx:J
-
-.field public final bsy: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;->bsq:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iput-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsr:Lokhttp3/u;
+    iput-object v0, p0, Lokhttp3/Response;->bsB:Lokhttp3/u;
 
     iget v0, p1, Lokhttp3/Response$a;->code:I
 
@@ -82,69 +82,69 @@
 
     iput-object v0, p0, Lokhttp3/Response;->message:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bss:Lokhttp3/r;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
 
-    iput-object v0, p0, Lokhttp3/Response;->bss:Lokhttp3/r;
+    iput-object v0, p0, Lokhttp3/Response;->bsC:Lokhttp3/r;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    iput-object v0, p0, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsu:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsE:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsu:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bsE:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsv:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsF:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsv:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bsF:Lokhttp3/Response;
 
-    iget-object v0, p1, Lokhttp3/Response$a;->bsw:Lokhttp3/Response;
+    iget-object v0, p1, Lokhttp3/Response$a;->bsG:Lokhttp3/Response;
 
-    iput-object v0, p0, Lokhttp3/Response;->bsw:Lokhttp3/Response;
+    iput-object v0, p0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->bsx:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bsH:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->bsx:J
+    iput-wide v0, p0, Lokhttp3/Response;->bsH:J
 
-    iget-wide v0, p1, Lokhttp3/Response$a;->bsy:J
+    iget-wide v0, p1, Lokhttp3/Response$a;->bsI:J
 
-    iput-wide v0, p0, Lokhttp3/Response;->bsy:J
+    iput-wide v0, p0, Lokhttp3/Response;->bsI:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FJ()Lokhttp3/d;
+.method public final FM()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->bsi:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/Response;->bss:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/Response;->bsi:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/Response;->bss:Lokhttp3/d;
 
     return-object v0
 .end method
 
-.method public final FL()Lokhttp3/Response$a;
+.method public final FO()Lokhttp3/Response$a;
     .locals 1
 
     new-instance v0, Lokhttp3/Response$a;
@@ -154,10 +154,10 @@
     return-object v0
 .end method
 
-.method public final Fu()Lokhttp3/w;
+.method public final Fx()Lokhttp3/w;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
     return-object v0
 .end method
@@ -165,7 +165,7 @@
 .method public final close()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
@@ -188,7 +188,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers;->dA(Ljava/lang/String;)Ljava/lang/String;
 
@@ -225,7 +225,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/Response;->bsr:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/Response;->bsB:Lokhttp3/u;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -249,9 +249,9 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v1, v1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -266,7 +266,7 @@
     return-object v0
 .end method
 
-.method public final zd()Z
+.method public final zg()Z
     .locals 2
 
     iget v0, p0, Lokhttp3/Response;->code:I
diff --git a/com.discord/smali/okhttp3/a.smali b/com.discord/smali/okhttp3/a.smali
index 532ae55fdd..e5a5034626 100644
--- a/com.discord/smali/okhttp3/a.smali
+++ b/com.discord/smali/okhttp3/a.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field public final bna:Lokhttp3/s;
+.field public final bnk:Lokhttp3/s;
 
-.field public final bnb:Lokhttp3/o;
+.field public final bnl:Lokhttp3/o;
 
-.field public final bnc:Ljavax/net/SocketFactory;
+.field public final bnm:Ljavax/net/SocketFactory;
 
-.field public final bnd:Lokhttp3/b;
+.field public final bnn:Lokhttp3/b;
 
-.field public final bne:Ljava/util/List;
+.field public final bno:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field public final bnf:Ljava/util/List;
+.field public final bnp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,19 +32,19 @@
     .end annotation
 .end field
 
-.field public final bng:Ljava/net/ProxySelector;
+.field public final bnq:Ljava/net/ProxySelector;
 
-.field public final bnh:Ljava/net/Proxy;
+.field public final bnr:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bni:Ljavax/net/ssl/HostnameVerifier;
+.field public final bns:Ljavax/net/ssl/HostnameVerifier;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bnj:Lokhttp3/g;
+.field public final bnt: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;->bqV:Ljava/lang/String;
+    iput-object v10, v8, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     goto :goto_1
 
@@ -150,7 +150,7 @@
 
     if-eqz v10, :cond_b
 
-    iput-object v9, v8, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iput-object v9, v8, Lokhttp3/s$a;->brf: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;->bqW:Ljava/lang/String;
+    iput-object v9, v8, Lokhttp3/s$a;->brg: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;->Ft()Lokhttp3/s;
+    invoke-virtual {v8}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iput-object v1, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     if-eqz v3, :cond_7
 
-    iput-object v3, v0, Lokhttp3/a;->bnb:Lokhttp3/o;
+    iput-object v3, v0, Lokhttp3/a;->bnl:Lokhttp3/o;
 
     if-eqz v4, :cond_6
 
-    iput-object v4, v0, Lokhttp3/a;->bnc:Ljavax/net/SocketFactory;
+    iput-object v4, v0, Lokhttp3/a;->bnm:Ljavax/net/SocketFactory;
 
     if-eqz v6, :cond_5
 
-    iput-object v6, v0, Lokhttp3/a;->bnd:Lokhttp3/b;
+    iput-object v6, v0, Lokhttp3/a;->bnn:Lokhttp3/b;
 
     if-eqz p10, :cond_4
 
@@ -201,7 +201,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bne:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/a;->bno:Ljava/util/List;
 
     if-eqz p11, :cond_3
 
@@ -209,25 +209,25 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/a;->bnf:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/a;->bnp:Ljava/util/List;
 
     if-eqz v7, :cond_2
 
-    iput-object v7, v0, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iput-object v7, v0, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
     move-object/from16 v1, p9
 
-    iput-object v1, v0, Lokhttp3/a;->bnh:Ljava/net/Proxy;
+    iput-object v1, v0, Lokhttp3/a;->bnr:Ljava/net/Proxy;
 
     iput-object v5, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     move-object/from16 v1, p6
 
-    iput-object v1, v0, Lokhttp3/a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v1, v0, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
     move-object/from16 v1, p7
 
-    iput-object v1, v0, Lokhttp3/a;->bnj:Lokhttp3/g;
+    iput-object v1, v0, Lokhttp3/a;->bnt:Lokhttp3/g;
 
     return-void
 
@@ -347,9 +347,9 @@
 .method final a(Lokhttp3/a;)Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/a;->bnb:Lokhttp3/o;
+    iget-object v0, p0, Lokhttp3/a;->bnl:Lokhttp3/o;
 
-    iget-object v1, p1, Lokhttp3/a;->bnb:Lokhttp3/o;
+    iget-object v1, p1, Lokhttp3/a;->bnl: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;->bnd:Lokhttp3/b;
+    iget-object v0, p0, Lokhttp3/a;->bnn:Lokhttp3/b;
 
-    iget-object v1, p1, Lokhttp3/a;->bnd:Lokhttp3/b;
+    iget-object v1, p1, Lokhttp3/a;->bnn: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;->bne:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bno:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bne:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bno: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;->bnf:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/a;->bnp:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/a;->bnf:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/a;->bnp:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -387,9 +387,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object v0, p0, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
-    iget-object v1, p1, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object v1, p1, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
     invoke-virtual {v0, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -397,9 +397,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bnh:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/a;->bnr:Ljava/net/Proxy;
 
-    iget-object v1, p1, Lokhttp3/a;->bnh:Ljava/net/Proxy;
+    iget-object v1, p1, Lokhttp3/a;->bnr:Ljava/net/Proxy;
 
     invoke-static {v0, v1}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -417,9 +417,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v0, p0, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v1, p1, Lokhttp3/a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v1, p1, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
     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;->bnj:Lokhttp3/g;
+    iget-object v0, p0, Lokhttp3/a;->bnt:Lokhttp3/g;
 
-    iget-object v1, p1, Lokhttp3/a;->bnj:Lokhttp3/g;
+    iget-object v1, p1, Lokhttp3/a;->bnt: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;->bna:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     iget v0, v0, Lokhttp3/s;->port:I
 
-    iget-object p1, p1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     iget p1, p1, Lokhttp3/s;->port:I
 
@@ -468,11 +468,11 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     check-cast p1, Lokhttp3/a;
 
-    iget-object v1, p1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v1, p1, Lokhttp3/a;->bnk: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;->bna:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/a;->bnk: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;->bnb:Lokhttp3/o;
+    iget-object v1, p0, Lokhttp3/a;->bnl: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;->bnd:Lokhttp3/b;
+    iget-object v1, p0, Lokhttp3/a;->bnn: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;->bne:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bno: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;->bnf:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/a;->bnp:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->hashCode()I
 
@@ -549,7 +549,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object v1, p0, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
     invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
 
@@ -559,7 +559,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bnh:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bnr:Ljava/net/Proxy;
 
     const/4 v2, 0x0
 
@@ -597,7 +597,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v1, p0, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
     if-eqz v1, :cond_2
 
@@ -615,7 +615,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/a;->bnj:Lokhttp3/g;
+    iget-object v1, p0, Lokhttp3/a;->bnt: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;->bna:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brg: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;->bna:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/a;->bnk: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;->bnh:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bnr: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;->bnh:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/a;->bnr:Ljava/net/Proxy;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -673,7 +673,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object v1, p0, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
     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 b5c5f5142b..a999b2ff6f 100644
--- a/com.discord/smali/okhttp3/d.smali
+++ b/com.discord/smali/okhttp3/d.smali
@@ -12,38 +12,38 @@
 
 
 # static fields
-.field public static final bnn:Lokhttp3/d;
+.field public static final bnx:Lokhttp3/d;
 
-.field public static final bno:Lokhttp3/d;
+.field public static final bny:Lokhttp3/d;
 
 
 # instance fields
-.field bnA:Ljava/lang/String;
+.field public final bnA:Z
+
+.field public final bnB:I
+
+.field private final bnC:I
+
+.field public final bnD:Z
+
+.field public final bnE:Z
+
+.field public final bnF:Z
+
+.field public final bnG:I
+
+.field public final bnH:I
+
+.field public final bnI:Z
+
+.field private final bnJ:Z
+
+.field bnK:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bnp:Z
-
-.field public final bnq:Z
-
-.field public final bnr:I
-
-.field private final bns:I
-
-.field public final bnt:Z
-
-.field public final bnu:Z
-
-.field public final bnv:Z
-
-.field public final bnw:I
-
-.field public final bnx:I
-
-.field public final bny:Z
-
-.field private final bnz:Z
+.field public final bnz:Z
 
 .field private final immutable:Z
 
@@ -58,19 +58,19 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bnp:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bnz:Z
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->EZ()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->Fc()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bnn:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bnx:Lokhttp3/d;
 
     new-instance v0, Lokhttp3/d$a;
 
     invoke-direct {v0}, Lokhttp3/d$a;-><init>()V
 
-    iput-boolean v1, v0, Lokhttp3/d$a;->bny:Z
+    iput-boolean v1, v0, Lokhttp3/d$a;->bnI: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;->bnw:I
+    iput v1, v0, Lokhttp3/d$a;->bnG:I
 
-    invoke-virtual {v0}, Lokhttp3/d$a;->EZ()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/d$a;->Fc()Lokhttp3/d;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/d;->bno:Lokhttp3/d;
+    sput-object v0, Lokhttp3/d;->bny:Lokhttp3/d;
 
     return-void
 .end method
@@ -108,46 +108,46 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lokhttp3/d$a;->bnp:Z
-
-    iput-boolean v0, p0, Lokhttp3/d;->bnp:Z
-
-    iget-boolean v0, p1, Lokhttp3/d$a;->bnq:Z
-
-    iput-boolean v0, p0, Lokhttp3/d;->bnq:Z
-
-    iget v0, p1, Lokhttp3/d$a;->bnr:I
-
-    iput v0, p0, Lokhttp3/d;->bnr:I
-
-    const/4 v0, -0x1
-
-    iput v0, p0, Lokhttp3/d;->bns:I
-
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Lokhttp3/d;->bnt:Z
-
-    iput-boolean v0, p0, Lokhttp3/d;->bnu:Z
-
-    iput-boolean v0, p0, Lokhttp3/d;->bnv:Z
-
-    iget v0, p1, Lokhttp3/d$a;->bnw:I
-
-    iput v0, p0, Lokhttp3/d;->bnw:I
-
-    iget v0, p1, Lokhttp3/d$a;->bnx:I
-
-    iput v0, p0, Lokhttp3/d;->bnx:I
-
-    iget-boolean v0, p1, Lokhttp3/d$a;->bny:Z
-
-    iput-boolean v0, p0, Lokhttp3/d;->bny:Z
-
     iget-boolean v0, p1, Lokhttp3/d$a;->bnz:Z
 
     iput-boolean v0, p0, Lokhttp3/d;->bnz:Z
 
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnA:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnA:Z
+
+    iget v0, p1, Lokhttp3/d$a;->bnB:I
+
+    iput v0, p0, Lokhttp3/d;->bnB:I
+
+    const/4 v0, -0x1
+
+    iput v0, p0, Lokhttp3/d;->bnC:I
+
+    const/4 v0, 0x0
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnD:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnE:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnF:Z
+
+    iget v0, p1, Lokhttp3/d$a;->bnG:I
+
+    iput v0, p0, Lokhttp3/d;->bnG:I
+
+    iget v0, p1, Lokhttp3/d$a;->bnH:I
+
+    iput v0, p0, Lokhttp3/d;->bnH:I
+
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnI:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnI:Z
+
+    iget-boolean v0, p1, Lokhttp3/d$a;->bnJ:Z
+
+    iput-boolean v0, p0, Lokhttp3/d;->bnJ:Z
+
     iget-boolean p1, p1, Lokhttp3/d$a;->immutable:Z
 
     iput-boolean p1, p0, Lokhttp3/d;->immutable:Z
@@ -164,31 +164,31 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/d;->bnp:Z
+    iput-boolean p1, p0, Lokhttp3/d;->bnz:Z
 
-    iput-boolean p2, p0, Lokhttp3/d;->bnq:Z
+    iput-boolean p2, p0, Lokhttp3/d;->bnA:Z
 
-    iput p3, p0, Lokhttp3/d;->bnr:I
+    iput p3, p0, Lokhttp3/d;->bnB:I
 
-    iput p4, p0, Lokhttp3/d;->bns:I
+    iput p4, p0, Lokhttp3/d;->bnC:I
 
-    iput-boolean p5, p0, Lokhttp3/d;->bnt:Z
+    iput-boolean p5, p0, Lokhttp3/d;->bnD:Z
 
-    iput-boolean p6, p0, Lokhttp3/d;->bnu:Z
+    iput-boolean p6, p0, Lokhttp3/d;->bnE:Z
 
-    iput-boolean p7, p0, Lokhttp3/d;->bnv:Z
+    iput-boolean p7, p0, Lokhttp3/d;->bnF:Z
 
-    iput p8, p0, Lokhttp3/d;->bnw:I
+    iput p8, p0, Lokhttp3/d;->bnG:I
 
-    iput p9, p0, Lokhttp3/d;->bnx:I
+    iput p9, p0, Lokhttp3/d;->bnH:I
 
-    iput-boolean p10, p0, Lokhttp3/d;->bny:Z
+    iput-boolean p10, p0, Lokhttp3/d;->bnI:Z
 
-    iput-boolean p11, p0, Lokhttp3/d;->bnz:Z
+    iput-boolean p11, p0, Lokhttp3/d;->bnJ:Z
 
     iput-boolean p12, p0, Lokhttp3/d;->immutable:Z
 
-    iput-object p13, p0, Lokhttp3/d;->bnA:Ljava/lang/String;
+    iput-object p13, p0, Lokhttp3/d;->bnK:Ljava/lang/String;
 
     return-void
 .end method
@@ -198,7 +198,7 @@
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -602,7 +602,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/d;->bnA:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/d;->bnK: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;->bnp:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnz: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;->bnq:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnA: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;->bnr:I
+    iget v1, p0, Lokhttp3/d;->bnB: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;->bnr:I
+    iget v1, p0, Lokhttp3/d;->bnB: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;->bns:I
+    iget v1, p0, Lokhttp3/d;->bnC: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;->bns:I
+    iget v1, p0, Lokhttp3/d;->bnC: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;->bnt:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnD: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;->bnu:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnE: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;->bnv:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnF: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;->bnw:I
+    iget v1, p0, Lokhttp3/d;->bnG: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;->bnw:I
+    iget v1, p0, Lokhttp3/d;->bnG: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;->bnx:I
+    iget v1, p0, Lokhttp3/d;->bnH: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;->bnx:I
+    iget v1, p0, Lokhttp3/d;->bnH: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;->bny:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnI: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;->bnz:Z
+    iget-boolean v1, p0, Lokhttp3/d;->bnJ:Z
 
     if-eqz v1, :cond_b
 
@@ -777,7 +777,7 @@
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/d;->bnA:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/d;->bnK: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 375478e35f..f3f37a5a6d 100644
--- a/com.discord/smali/okhttp3/e.smali
+++ b/com.discord/smali/okhttp3/e.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Fa()Lokhttp3/Response;
+.method public abstract Fd()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 f29dfbc92f..fb2a8c0264 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 bnB:Lokhttp3/g;
+.field public static final bnL:Lokhttp3/g;
 
 
 # instance fields
-.field final bnC:Ljava/util/Set;
+.field final bnM:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field final bnD:Lokhttp3/internal/i/c;
+.field final bnN: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;->beF:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/g$a;->beP: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;->bnB:Lokhttp3/g;
+    sput-object v1, Lokhttp3/g;->bnL:Lokhttp3/g;
 
     return-void
 .end method
@@ -77,9 +77,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/g;->bnC:Ljava/util/Set;
+    iput-object p1, p0, Lokhttp3/g;->bnM:Ljava/util/Set;
 
-    iput-object p2, p0, Lokhttp3/g;->bnD:Lokhttp3/internal/i/c;
+    iput-object p2, p0, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->Hr()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Hu()Ljava/lang/String;
 
     move-result-object p0
 
@@ -140,7 +140,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/ByteString;->Ht()Lokio/ByteString;
+    invoke-virtual {p0}, Lokio/ByteString;->Hw()Lokio/ByteString;
 
     move-result-object p0
 
@@ -167,11 +167,11 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bnD:Lokhttp3/internal/i/c;
+    iget-object v1, p0, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
 
     check-cast p1, Lokhttp3/g;
 
-    iget-object v2, p1, Lokhttp3/g;->bnD:Lokhttp3/internal/i/c;
+    iget-object v2, p1, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
 
     invoke-static {v1, v2}, Lokhttp3/internal/c;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -179,9 +179,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/g;->bnC:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bnM:Ljava/util/Set;
 
-    iget-object p1, p1, Lokhttp3/g;->bnC:Ljava/util/Set;
+    iget-object p1, p1, Lokhttp3/g;->bnM:Ljava/util/Set;
 
     invoke-interface {v1, p1}, Ljava/util/Set;->equals(Ljava/lang/Object;)Z
 
@@ -223,7 +223,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/g;->bnC:Ljava/util/Set;
+    iget-object v2, v0, Lokhttp3/g;->bnM:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -275,7 +275,7 @@
 
     sub-int/2addr v2, v12
 
-    iget-object v3, v11, Lokhttp3/g$b;->bnE:Ljava/lang/String;
+    iget-object v3, v11, Lokhttp3/g$b;->bnO:Ljava/lang/String;
 
     invoke-virtual {v3}, Ljava/lang/String;->length()I
 
@@ -287,11 +287,11 @@
 
     add-int/lit8 v3, v1, 0x1
 
-    iget-object v4, v11, Lokhttp3/g$b;->bnE:Ljava/lang/String;
+    iget-object v4, v11, Lokhttp3/g$b;->bnO:Ljava/lang/String;
 
     const/4 v5, 0x0
 
-    iget-object v1, v11, Lokhttp3/g$b;->bnE:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bnO:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -310,7 +310,7 @@
     goto :goto_1
 
     :cond_1
-    iget-object v1, v11, Lokhttp3/g$b;->bnE:Ljava/lang/String;
+    iget-object v1, v11, Lokhttp3/g$b;->bnO:Ljava/lang/String;
 
     invoke-virtual {v7, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -345,7 +345,7 @@
     return-void
 
     :cond_5
-    iget-object v1, v0, Lokhttp3/g;->bnD:Lokhttp3/internal/i/c;
+    iget-object v1, v0, Lokhttp3/g;->bnN:Lokhttp3/internal/i/c;
 
     move-object/from16 v2, p2
 
@@ -397,7 +397,7 @@
 
     check-cast v12, Lokhttp3/g$b;
 
-    iget-object v13, v12, Lokhttp3/g$b;->bnF:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bnP:Ljava/lang/String;
 
     const-string v14, "sha256/"
 
@@ -414,7 +414,7 @@
     move-result-object v8
 
     :cond_7
-    iget-object v12, v12, Lokhttp3/g$b;->bnG:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
 
     invoke-virtual {v12, v8}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -425,7 +425,7 @@
     return-void
 
     :cond_8
-    iget-object v13, v12, Lokhttp3/g$b;->bnF:Ljava/lang/String;
+    iget-object v13, v12, Lokhttp3/g$b;->bnP:Ljava/lang/String;
 
     const-string v14, "sha1/"
 
@@ -449,12 +449,12 @@
 
     move-result-object v11
 
-    invoke-virtual {v11}, Lokio/ByteString;->Hs()Lokio/ByteString;
+    invoke-virtual {v11}, Lokio/ByteString;->Hv()Lokio/ByteString;
 
     move-result-object v11
 
     :cond_9
-    iget-object v12, v12, Lokhttp3/g$b;->bnG:Lokio/ByteString;
+    iget-object v12, v12, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
 
     invoke-virtual {v12, v11}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -478,7 +478,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v3, v12, Lokhttp3/g$b;->bnF:Ljava/lang/String;
+    iget-object v3, v12, Lokhttp3/g$b;->bnP:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -598,7 +598,7 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/g;->bnD:Lokhttp3/internal/i/c;
+    iget-object v0, p0, Lokhttp3/g;->bnN: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;->bnC:Ljava/util/Set;
+    iget-object v1, p0, Lokhttp3/g;->bnM: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 d5843e92e8..9de958df62 100644
--- a/com.discord/smali/okhttp3/i.smali
+++ b/com.discord/smali/okhttp3/i.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract Fb()Lokhttp3/u;
+.method public abstract Fe()Lokhttp3/u;
 .end method
diff --git a/com.discord/smali/okhttp3/internal/a.smali b/com.discord/smali/okhttp3/internal/a.smali
index 4a0ad0d80d..96dd9ddaaf 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 bsL:Lokhttp3/internal/a;
+.field public static bsV: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 f6c17fbf20..0aff3a9bfd 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 bsv:Lokhttp3/Response;
+.field public final bsF:Lokhttp3/Response;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bti:Lokhttp3/w;
+.field public final bts: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;->bti:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/a/c;->bts:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/a/c;->bsv:Lokhttp3/Response;
+    iput-object p2, p0, Lokhttp3/internal/a/c;->bsF:Lokhttp3/Response;
 
     return-void
 .end method
@@ -97,29 +97,29 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object v0
 
-    iget v0, v0, Lokhttp3/d;->bnr:I
+    iget v0, v0, Lokhttp3/d;->bnB:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bnu:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bnE:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bnt:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bnD:Z
 
     if-nez v0, :cond_1
 
@@ -128,19 +128,19 @@
 
     :cond_1
     :pswitch_1
-    invoke-virtual {p0}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {p0}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bnq:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bnA:Z
 
     if-nez p0, :cond_2
 
-    invoke-virtual {p1}, Lokhttp3/w;->FJ()Lokhttp3/d;
+    invoke-virtual {p1}, Lokhttp3/w;->FM()Lokhttp3/d;
 
     move-result-object p0
 
-    iget-boolean p0, p0, Lokhttp3/d;->bnq:Z
+    iget-boolean p0, p0, Lokhttp3/d;->bnA: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 c97184e5e4..1e374a8198 100644
--- a/com.discord/smali/okhttp3/internal/b/c.smali
+++ b/com.discord/smali/okhttp3/internal/b/c.smali
@@ -7,29 +7,29 @@
 
 
 # instance fields
-.field private final brH:Lokhttp3/j;
+.field private final brR:Lokhttp3/j;
 
-.field private bsr:Lokhttp3/u;
+.field private bsB:Lokhttp3/u;
 
-.field public bss:Lokhttp3/r;
+.field public bsC:Lokhttp3/r;
 
-.field public final btL:Lokhttp3/y;
+.field public final btV:Lokhttp3/y;
 
-.field public btM:Ljava/net/Socket;
+.field public btW:Ljava/net/Socket;
 
-.field public btN:Ljava/net/Socket;
+.field public btX:Ljava/net/Socket;
 
-.field btO:Lokhttp3/internal/e/g;
+.field btY:Lokhttp3/internal/e/g;
 
-.field public btP:Lokio/BufferedSink;
+.field public btZ:Lokio/BufferedSink;
 
-.field public btQ:Z
+.field public bua:Z
 
-.field public btR:I
+.field public bub:I
 
-.field public btS:I
+.field public buc:I
 
-.field public final btT:Ljava/util/List;
+.field public final bud:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -40,9 +40,9 @@
     .end annotation
 .end field
 
-.field public btU:J
+.field public bue:J
 
-.field public lZ:Lokio/d;
+.field public lY:Lokio/d;
 
 
 # direct methods
@@ -53,21 +53,21 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/b/c;->btS:I
+    iput v0, p0, Lokhttp3/internal/b/c;->buc:I
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
 
     const-wide v0, 0x7fffffffffffffffL
 
-    iput-wide v0, p0, Lokhttp3/internal/b/c;->btU:J
+    iput-wide v0, p0, Lokhttp3/internal/b/c;->bue:J
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->brH:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->brR:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iput-object p2, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
     return-void
 .end method
@@ -80,13 +80,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN: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;->bnc:Ljavax/net/SocketFactory;
+    iget-object v0, v1, Lokhttp3/a;->bnm: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;->btM:Ljava/net/Socket;
+    iput-object v1, p0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
     invoke-virtual {v0, p2}, Ljava/net/Socket;->setSoTimeout(I)V
 
     :try_start_0
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bsO: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;->btM:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btW: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;->lZ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btW: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;->btP:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->btZ: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;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -232,7 +232,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     const/4 v1, 0x0
 
@@ -242,47 +242,55 @@
 
     invoke-direct {v0}, Lokhttp3/internal/e/g$a;-><init>()V
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
-    iget-object v2, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v2, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v2, v2, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v2, v2, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iget-object v4, p0, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iget-object v4, p0, Lokhttp3/internal/b/c;->btZ: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;->bvA:Lokhttp3/internal/e/g$b;
+    iput-object p0, v0, Lokhttp3/internal/e/g$a;->bvK:Lokhttp3/internal/e/g$b;
 
-    iput p1, v0, Lokhttp3/internal/e/g$a;->bvX:I
+    iput p1, v0, Lokhttp3/internal/e/g$a;->bwh:I
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Gu()Lokhttp3/internal/e/g;
+    invoke-virtual {v0}, Lokhttp3/internal/e/g$a;->Gx()Lokhttp3/internal/e/g;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
-    iget-object p1, p0, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gs()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gv()V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FY()Z
+.method public final Fe()Lokhttp3/u;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
+
+    return-object v0
+.end method
+
+.method public final Gb()Z
+    .locals 1
+
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
@@ -296,18 +304,10 @@
     return v0
 .end method
 
-.method public final Fb()Lokhttp3/u;
-    .locals 1
-
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bsr:Lokhttp3/u;
-
-    return-object v0
-.end method
-
 .method public final X(Z)Z
     .locals 4
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->isClosed()Z
 
@@ -317,7 +317,7 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->isInputShutdown()Z
 
@@ -325,7 +325,7 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {v0}, Ljava/net/Socket;->isOutputShutdown()Z
 
@@ -336,7 +336,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
@@ -357,7 +357,7 @@
     if-eqz p1, :cond_4
 
     :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object p1, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {p1}, Ljava/net/Socket;->getSoTimeout()I
 
@@ -367,13 +367,13 @@
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {v0, v2}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Z
+    invoke-interface {v0}, Lokio/d;->Hi()Z
 
     move-result v0
     :try_end_1
@@ -382,14 +382,14 @@
     if-eqz v0, :cond_3
 
     :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX: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;->btN:Ljava/net/Socket;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {v0, p1}, Ljava/net/Socket;->setSoTimeout(I)V
 
@@ -398,7 +398,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-virtual {v3, p1}, Ljava/net/Socket;->setSoTimeout(I)V
 
@@ -426,29 +426,29 @@
 
     move/from16 v2, p4
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->bsr:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
 
     if-nez v0, :cond_1c
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bnf:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bnp: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;->btL:Lokhttp3/y;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v4, v4, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v4, v4, Lokhttp3/y;->bsN:Lokhttp3/a;
 
     iget-object v4, v4, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-nez v4, :cond_2
 
-    sget-object v4, Lokhttp3/k;->bqk:Lokhttp3/k;
+    sget-object v4, Lokhttp3/k;->bqu:Lokhttp3/k;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -456,15 +456,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v4
 
@@ -517,13 +517,13 @@
     throw v0
 
     :cond_2
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bne:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bno:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->brU:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bse:Lokhttp3/u;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -542,9 +542,9 @@
     const/4 v7, 0x1
 
     :try_start_0
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->FQ()Z
+    invoke-virtual {v0}, Lokhttp3/y;->FT()Z
 
     move-result v0
 
@@ -554,11 +554,11 @@
 
     invoke-direct {v0}, Lokhttp3/w$a;-><init>()V
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v8, v8, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v8, v8, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v8, v8, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v8, v8, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     invoke-virtual {v0, v8}, Lokhttp3/w$a;->b(Lokhttp3/s;)Lokhttp3/w$a;
 
@@ -572,11 +572,11 @@
 
     const-string v8, "Host"
 
-    iget-object v9, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v9, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v9, v9, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v9, v9, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v9, v9, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     invoke-static {v9, v7}, Lokhttp3/internal/c;->a(Lokhttp3/s;Z)Ljava/lang/String;
 
@@ -602,7 +602,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v0}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object v0
 
@@ -610,11 +610,11 @@
 
     invoke-direct {v8}, Lokhttp3/Response$a;-><init>()V
 
-    iput-object v0, v8, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object v0, v8, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    sget-object v9, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v9, Lokhttp3/u;->bsb:Lokhttp3/u;
 
-    iput-object v9, v8, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iput-object v9, v8, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
 
     const/16 v9, 0x197
 
@@ -624,27 +624,27 @@
 
     iput-object v10, v8, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    sget-object v10, Lokhttp3/internal/c;->bsN:Lokhttp3/x;
+    sget-object v10, Lokhttp3/internal/c;->bsX:Lokhttp3/x;
 
-    iput-object v10, v8, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v10, v8, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
     const-wide/16 v10, -0x1
 
-    iput-wide v10, v8, Lokhttp3/Response$a;->bsx:J
+    iput-wide v10, v8, Lokhttp3/Response$a;->bsH:J
 
-    iput-wide v10, v8, Lokhttp3/Response$a;->bsy:J
+    iput-wide v10, v8, Lokhttp3/Response$a;->bsI:J
 
     const-string v12, "Proxy-Authenticate"
 
     const-string v13, "OkHttp-Preemptive"
 
-    iget-object v14, v8, Lokhttp3/Response$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v14, v8, Lokhttp3/Response$a;->bst:Lokhttp3/Headers$a;
 
     invoke-virtual {v14, v12, v13}, Lokhttp3/Headers$a;->al(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
-    invoke-virtual {v8}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v8}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
-    iget-object v8, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v8, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->R(II)V
 
@@ -670,13 +670,13 @@
 
     new-instance v12, Lokhttp3/internal/d/a;
 
-    iget-object v13, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object v13, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iget-object v14, v1, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iget-object v14, v1, Lokhttp3/internal/b/c;->btZ: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;->lZ:Lokio/d;
+    iget-object v13, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
     invoke-interface {v13}, Lokio/d;->timeout()Lokio/s;
 
@@ -695,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;->btP:Lokio/BufferedSink;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v4}, Lokio/BufferedSink;->timeout()Lokio/s;
 
@@ -712,19 +712,19 @@
 
     invoke-virtual {v4, v9, v10, v11}, Lokio/s;->d(JLjava/util/concurrent/TimeUnit;)Lokio/s;
 
-    iget-object v4, v0, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/w;->brH: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;->Gh()V
+    invoke-virtual {v12}, Lokhttp3/internal/d/a;->Gk()V
 
     invoke-virtual {v12, v6}, Lokhttp3/internal/d/a;->Y(Z)Lokhttp3/Response$a;
 
     move-result-object v4
 
-    iput-object v0, v4, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object v0, v4, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -793,31 +793,31 @@
     throw v0
 
     :cond_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Hf()Z
+    invoke-virtual {v0}, Lokio/c;->Hi()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->Hf()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Hf()Z
+    invoke-virtual {v0}, Lokio/c;->Hi()Z
 
     move-result v0
 
     if-eqz v0, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
     if-nez v0, :cond_8
 
@@ -847,21 +847,21 @@
     invoke-direct/range {p0 .. p2}, Lokhttp3/internal/b/c;->R(II)V
 
     :cond_8
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsN: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;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bne:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/a;->bno:Ljava/util/List;
 
-    sget-object v4, Lokhttp3/u;->brU:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bse:Lokhttp3/u;
 
     invoke-interface {v0, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -869,46 +869,46 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->brU:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bse:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bsr:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
 
     invoke-direct {v1, v2}, Lokhttp3/internal/b/c;->dg(I)V
 
     goto/16 :goto_4
 
     :cond_9
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
-    sget-object v0, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
 
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bsr:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
 
     goto/16 :goto_4
 
     :cond_a
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, v0, Lokhttp3/y;->bsN: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;->btM:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
-    iget-object v9, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v9, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v9, v9, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v9, v9, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v10, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     iget v10, v10, Lokhttp3/s;->port:I
 
@@ -926,19 +926,19 @@
 
     move-result-object v8
 
-    iget-boolean v9, v8, Lokhttp3/k;->bqm:Z
+    iget-boolean v9, v8, Lokhttp3/k;->bqw:Z
 
     if-eqz v9, :cond_b
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v9
 
-    iget-object v10, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v10, v10, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v10, v10, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v11, v0, Lokhttp3/a;->bne:Ljava/util/List;
+    iget-object v11, v0, Lokhttp3/a;->bno: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
 
@@ -953,11 +953,11 @@
 
     move-result-object v10
 
-    iget-object v11, v0, Lokhttp3/a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v11, v0, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v12, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v12, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v12, v12, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v12, v12, Lokhttp3/s;->brg:Ljava/lang/String;
 
     invoke-interface {v11, v12, v9}, Ljavax/net/ssl/HostnameVerifier;->verify(Ljava/lang/String;Ljavax/net/ssl/SSLSession;)Z
 
@@ -965,21 +965,21 @@
 
     if-eqz v9, :cond_13
 
-    iget-object v9, v0, Lokhttp3/a;->bnj:Lokhttp3/g;
+    iget-object v9, v0, Lokhttp3/a;->bnt:Lokhttp3/g;
 
-    iget-object v0, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v11, v10, Lokhttp3/r;->bqQ:Ljava/util/List;
+    iget-object v11, v10, Lokhttp3/r;->bra:Ljava/util/List;
 
     invoke-virtual {v9, v0, v11}, Lokhttp3/g;->f(Ljava/lang/String;Ljava/util/List;)V
 
-    iget-boolean v0, v8, Lokhttp3/k;->bqm:Z
+    iget-boolean v0, v8, Lokhttp3/k;->bqw:Z
 
     if-eqz v0, :cond_c
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -993,9 +993,9 @@
     const/4 v0, 0x0
 
     :goto_2
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-static {v8}, Lokio/j;->c(Ljava/net/Socket;)Lokio/r;
 
@@ -1005,9 +1005,9 @@
 
     move-result-object v8
 
-    iput-object v8, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iput-object v8, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iget-object v8, v1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v8, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-static {v8}, Lokio/j;->b(Ljava/net/Socket;)Lokio/q;
 
@@ -1017,9 +1017,9 @@
 
     move-result-object v8
 
-    iput-object v8, v1, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iput-object v8, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
 
-    iput-object v10, v1, Lokhttp3/internal/b/c;->bss:Lokhttp3/r;
+    iput-object v10, v1, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
     if-eqz v0, :cond_d
 
@@ -1030,10 +1030,10 @@
     goto :goto_3
 
     :cond_d
-    sget-object v0, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
 
     :goto_3
-    iput-object v0, v1, Lokhttp3/internal/b/c;->bsr:Lokhttp3/u;
+    iput-object v0, v1, Lokhttp3/internal/b/c;->bsB: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
@@ -1041,16 +1041,16 @@
     if-eqz v4, :cond_e
 
     :try_start_5
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()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;->bsr:Lokhttp3/u;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->brT:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bsd:Lokhttp3/u;
 
     if-ne v0, v4, :cond_f
 
@@ -1060,15 +1060,15 @@
 
     :cond_f
     :goto_4
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    invoke-virtual {v0}, Lokhttp3/y;->FQ()Z
+    invoke-virtual {v0}, Lokhttp3/y;->FT()Z
 
     move-result v0
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
     if-eqz v0, :cond_10
 
@@ -1089,22 +1089,22 @@
 
     :cond_11
     :goto_5
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_12
 
-    iget-object v2, v1, Lokhttp3/internal/b/c;->brH:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/c;->brR:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_6
-    iget-object v0, v1, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object v0, v1, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gq()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gt()I
 
     move-result v0
 
-    iput v0, v1, Lokhttp3/internal/b/c;->btS:I
+    iput v0, v1, Lokhttp3/internal/b/c;->buc:I
 
     monitor-exit v2
 
@@ -1124,7 +1124,7 @@
 
     :cond_13
     :try_start_7
-    iget-object v8, v10, Lokhttp3/r;->bqQ:Ljava/util/List;
+    iget-object v8, v10, Lokhttp3/r;->bra:Ljava/util/List;
 
     invoke-interface {v8, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1140,9 +1140,9 @@
 
     invoke-direct {v10, v11}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
 
     invoke-virtual {v10, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1234,7 +1234,7 @@
     if-eqz v4, :cond_15
 
     :try_start_9
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v8
 
@@ -1263,29 +1263,29 @@
     move/from16 v5, p3
 
     :goto_9
-    iget-object v4, v1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     invoke-static {v4}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
-    iget-object v4, v1, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v4, v1, Lokhttp3/internal/b/c;->btW: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;->btN:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bss:Lokhttp3/r;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->bsr:Lokhttp3/u;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->bsB:Lokhttp3/u;
 
-    iput-object v4, v1, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iput-object v4, v1, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
     if-nez p7, :cond_16
 
@@ -1307,9 +1307,9 @@
     :goto_a
     if-eqz p5, :cond_1a
 
-    iput-boolean v7, v3, Lokhttp3/internal/b/b;->btK:Z
+    iput-boolean v7, v3, Lokhttp3/internal/b/b;->btU:Z
 
-    iget-boolean v9, v3, Lokhttp3/internal/b/b;->btJ:Z
+    iget-boolean v9, v3, Lokhttp3/internal/b/b;->btT:Z
 
     if-eqz v9, :cond_19
 
@@ -1393,16 +1393,16 @@
 .method public final a(Lokhttp3/internal/e/g;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->brR:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gq()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/g;->Gt()I
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/internal/b/c;->btS:I
+    iput p1, p0, Lokhttp3/internal/b/c;->buc:I
 
     monitor-exit v0
 
@@ -1426,7 +1426,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->buJ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -1440,30 +1440,30 @@
         .end annotation
     .end param
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget v1, p0, Lokhttp3/internal/b/c;->btS:I
+    iget v1, p0, Lokhttp3/internal/b/c;->buc:I
 
     const/4 v2, 0x0
 
     if-ge v0, v1, :cond_a
 
-    iget-boolean v0, p0, Lokhttp3/internal/b/c;->btQ:Z
+    iget-boolean v0, p0, Lokhttp3/internal/b/c;->bua:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
     invoke-virtual {v0, v1, p1}, Lokhttp3/internal/a;->a(Lokhttp3/a;Lokhttp3/a;)Z
 
@@ -1474,17 +1474,17 @@
     return v2
 
     :cond_1
-    iget-object v0, p1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brg:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -1497,7 +1497,7 @@
     return v1
 
     :cond_2
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
     if-nez v0, :cond_3
 
@@ -1509,7 +1509,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p2, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v0, p2, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1522,9 +1522,9 @@
     return v2
 
     :cond_5
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -1537,11 +1537,11 @@
     return v2
 
     :cond_6
-    iget-object v0, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v0, v0, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
 
-    iget-object v3, p2, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v3, p2, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
 
     invoke-virtual {v0, v3}, Ljava/net/InetSocketAddress;->equals(Ljava/lang/Object;)Z
 
@@ -1552,18 +1552,18 @@
     return v2
 
     :cond_7
-    iget-object p2, p2, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object p2, p2, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object p2, p2, Lokhttp3/a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object p2, p2, Lokhttp3/a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/internal/i/d;->bxt:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
 
     if-eq p2, v0, :cond_8
 
     return v2
 
     :cond_8
-    iget-object p2, p1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     invoke-virtual {p0, p2}, Lokhttp3/internal/b/c;->c(Lokhttp3/s;)Z
 
@@ -1575,15 +1575,15 @@
 
     :cond_9
     :try_start_0
-    iget-object p2, p1, Lokhttp3/a;->bnj:Lokhttp3/g;
+    iget-object p2, p1, Lokhttp3/a;->bnt:Lokhttp3/g;
 
-    iget-object p1, p1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/c;->bss:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
-    iget-object v0, v0, Lokhttp3/r;->bqQ:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/r;->bra:Ljava/util/List;
 
     invoke-virtual {p2, p1, v0}, Lokhttp3/g;->f(Ljava/lang/String;Ljava/util/List;)V
     :try_end_0
@@ -1602,11 +1602,11 @@
 
     iget v0, p1, Lokhttp3/s;->port:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
     iget v1, v1, Lokhttp3/s;->port:I
 
@@ -1617,15 +1617,15 @@
     return v2
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brg: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;->bss:Lokhttp3/r;
+    iget-object v0, p0, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/i/d;->bxt:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
 
-    iget-object p1, p1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v3, p0, Lokhttp3/internal/b/c;->bss:Lokhttp3/r;
+    iget-object v3, p0, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
-    iget-object v3, v3, Lokhttp3/r;->bqQ:Ljava/util/List;
+    iget-object v3, v3, Lokhttp3/r;->bra: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;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v1, v1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/s;->brg: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;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, v1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v1, v1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v1, v1, Lokhttp3/a;->bnk: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;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v1, v1, Lokhttp3/y;->bnr: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;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v1, v1, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v1, v1, Lokhttp3/y;->bsO: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;->bss:Lokhttp3/r;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v1, Lokhttp3/r;->bqP:Lokhttp3/h;
+    iget-object v1, v1, Lokhttp3/r;->bqZ: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;->bsr:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/b/c;->bsB: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 04afe3a90a..d41d98262c 100644
--- a/com.discord/smali/okhttp3/internal/c.smali
+++ b/com.discord/smali/okhttp3/internal/c.smali
@@ -6,7 +6,7 @@
 # static fields
 .field public static final EMPTY_STRING_ARRAY:[Ljava/lang/String;
 
-.field public static final aTJ:Ljava/util/Comparator;
+.field public static final aTS:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -16,39 +16,39 @@
     .end annotation
 .end field
 
-.field public static final biI:Ljava/nio/charset/Charset;
+.field public static final biS:Ljava/nio/charset/Charset;
 
-.field public static final bsM:[B
+.field public static final bsW:[B
 
-.field public static final bsN:Lokhttp3/x;
+.field public static final bsX:Lokhttp3/x;
 
-.field public static final bsO:Lokhttp3/RequestBody;
+.field public static final bsY:Lokhttp3/RequestBody;
 
-.field private static final bsP:Lokio/ByteString;
+.field private static final bsZ:Lokio/ByteString;
 
-.field private static final bsQ:Lokio/ByteString;
+.field private static final bta:Lokio/ByteString;
 
-.field private static final bsR:Lokio/ByteString;
+.field private static final btb:Lokio/ByteString;
 
-.field private static final bsS:Lokio/ByteString;
+.field private static final btc:Lokio/ByteString;
 
-.field private static final bsT:Lokio/ByteString;
+.field private static final btd:Lokio/ByteString;
 
-.field private static final bsU:Ljava/nio/charset/Charset;
+.field private static final bte:Ljava/nio/charset/Charset;
 
-.field private static final bsV:Ljava/nio/charset/Charset;
+.field private static final btf:Ljava/nio/charset/Charset;
 
-.field private static final bsW:Ljava/nio/charset/Charset;
+.field private static final btg:Ljava/nio/charset/Charset;
 
-.field private static final bsX:Ljava/nio/charset/Charset;
+.field private static final bth:Ljava/nio/charset/Charset;
 
-.field public static final bsY:Ljava/util/TimeZone;
+.field public static final bti:Ljava/util/TimeZone;
 
-.field private static final bsZ:Ljava/lang/reflect/Method;
+.field private static final btj:Ljava/lang/reflect/Method;
 
-.field private static final bta:Ljava/util/regex/Pattern;
+.field private static final btk:Ljava/util/regex/Pattern;
 
-.field public static final tx:Ljava/nio/charset/Charset;
+.field public static final tw:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -59,21 +59,21 @@
 
     new-array v1, v0, [B
 
-    sput-object v1, Lokhttp3/internal/c;->bsM:[B
+    sput-object v1, Lokhttp3/internal/c;->bsW:[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;->bsM:[B
+    sget-object v1, Lokhttp3/internal/c;->bsW:[B
 
     invoke-static {v1}, Lokhttp3/x;->A([B)Lokhttp3/x;
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsN:Lokhttp3/x;
+    sput-object v1, Lokhttp3/internal/c;->bsX:Lokhttp3/x;
 
-    sget-object v1, Lokhttp3/internal/c;->bsM:[B
+    sget-object v1, Lokhttp3/internal/c;->bsW:[B
 
     const/4 v2, 0x0
 
@@ -81,7 +81,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsO:Lokhttp3/RequestBody;
+    sput-object v1, Lokhttp3/internal/c;->bsY:Lokhttp3/RequestBody;
 
     const-string v1, "efbbbf"
 
@@ -89,7 +89,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsP:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bsZ:Lokio/ByteString;
 
     const-string v1, "feff"
 
@@ -97,7 +97,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsQ:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->bta:Lokio/ByteString;
 
     const-string v1, "fffe"
 
@@ -105,7 +105,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsR:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->btb:Lokio/ByteString;
 
     const-string v1, "0000ffff"
 
@@ -113,7 +113,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsS:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->btc:Lokio/ByteString;
 
     const-string v1, "ffff0000"
 
@@ -121,7 +121,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsT:Lokio/ByteString;
+    sput-object v1, Lokhttp3/internal/c;->btd:Lokio/ByteString;
 
     const-string v1, "UTF-8"
 
@@ -129,7 +129,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     const-string v1, "ISO-8859-1"
 
@@ -137,7 +137,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->biI:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->biS:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-16BE"
 
@@ -145,7 +145,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsU:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bte:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-16LE"
 
@@ -153,7 +153,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsV:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->btf:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32BE"
 
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsW:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->btg:Ljava/nio/charset/Charset;
 
     const-string v1, "UTF-32LE"
 
@@ -169,7 +169,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsX:Ljava/nio/charset/Charset;
+    sput-object v1, Lokhttp3/internal/c;->bth:Ljava/nio/charset/Charset;
 
     const-string v1, "GMT"
 
@@ -177,13 +177,13 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/internal/c;->bsY:Ljava/util/TimeZone;
+    sput-object v1, Lokhttp3/internal/c;->bti: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;->aTJ:Ljava/util/Comparator;
+    sput-object v1, Lokhttp3/internal/c;->aTS: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;->bsZ:Ljava/lang/reflect/Method;
+    sput-object v2, Lokhttp3/internal/c;->btj: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;->bta:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/c;->btk:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method public static FR()Ljavax/net/ssl/X509TrustManager;
+.method public static FU()Ljavax/net/ssl/X509TrustManager;
     .locals 4
 
     :try_start_0
@@ -353,17 +353,17 @@
 
     check-cast v1, Lokhttp3/internal/e/c;
 
-    sget-object v2, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object v3, v1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
-    invoke-virtual {v3}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {v3}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v1
 
@@ -372,7 +372,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object p0
 
@@ -650,7 +650,7 @@
 .method public static a(Lokhttp3/s;Z)Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brg:Ljava/lang/String;
 
     const-string v1, ":"
 
@@ -666,7 +666,7 @@
 
     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->brg:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -681,14 +681,14 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brg:Ljava/lang/String;
 
     :goto_0
     if-nez p1, :cond_2
 
     iget p1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-static {v2}, Lokhttp3/s;->dD(Ljava/lang/String;)I
 
@@ -730,7 +730,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/c;->bsP:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bsZ:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -738,7 +738,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lokhttp3/internal/c;->bsP:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bsZ:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -748,12 +748,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aB(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/c;->bsQ:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->bta:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -761,7 +761,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object p1, Lokhttp3/internal/c;->bsQ:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->bta:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -771,12 +771,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aB(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bsU:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bte:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/c;->bsR:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->btb:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -784,7 +784,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object p1, Lokhttp3/internal/c;->bsR:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->btb:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -794,12 +794,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aB(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bsV:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->btf:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/internal/c;->bsS:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->btc:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -807,7 +807,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p1, Lokhttp3/internal/c;->bsS:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->btc:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -817,12 +817,12 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aB(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bsW:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->btg:Ljava/nio/charset/Charset;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/internal/c;->bsT:Lokio/ByteString;
+    sget-object v0, Lokhttp3/internal/c;->btd:Lokio/ByteString;
 
     invoke-interface {p0, v0}, Lokio/d;->l(Lokio/ByteString;)Z
 
@@ -830,7 +830,7 @@
 
     if-eqz v0, :cond_4
 
-    sget-object p1, Lokhttp3/internal/c;->bsT:Lokio/ByteString;
+    sget-object p1, Lokhttp3/internal/c;->btd:Lokio/ByteString;
 
     invoke-virtual {p1}, Lokio/ByteString;->size()I
 
@@ -840,7 +840,7 @@
 
     invoke-interface {p0, v0, v1}, Lokio/d;->aB(J)V
 
-    sget-object p0, Lokhttp3/internal/c;->bsX:Ljava/nio/charset/Charset;
+    sget-object p0, Lokhttp3/internal/c;->bth:Ljava/nio/charset/Charset;
 
     return-object p0
 
@@ -970,7 +970,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->HA()Z
+    invoke-virtual {v2}, Lokio/s;->HD()Z
 
     move-result v2
 
@@ -982,7 +982,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->HB()J
+    invoke-virtual {v2}, Lokio/s;->HE()J
 
     move-result-wide v5
 
@@ -1046,7 +1046,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->HD()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->HG()Lokio/s;
 
     goto :goto_2
 
@@ -1075,7 +1075,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->HD()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->HG()Lokio/s;
 
     goto :goto_3
 
@@ -1102,7 +1102,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokio/s;->HD()Lokio/s;
+    invoke-virtual {p0}, Lokio/s;->HG()Lokio/s;
 
     goto :goto_4
 
@@ -1373,7 +1373,7 @@
 .method public static d(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
     .locals 3
 
-    sget-object v0, Lokhttp3/internal/c;->bsZ:Ljava/lang/reflect/Method;
+    sget-object v0, Lokhttp3/internal/c;->btj:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
@@ -1570,7 +1570,7 @@
     goto :goto_3
 
     :cond_8
-    invoke-virtual {p0}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1737,7 +1737,7 @@
 .method public static dV(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/c;->bta:Ljava/util/regex/Pattern;
+    sget-object v0, Lokhttp3/internal/c;->btk:Ljava/util/regex/Pattern;
 
     invoke-virtual {v0, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
diff --git a/com.discord/smali/okhttp3/internal/c/h.smali b/com.discord/smali/okhttp3/internal/c/h.smali
index 9c3f8280e1..bdf3741ec7 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 buw:Ljava/lang/String;
+.field private final buG:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 .field private final contentLength:J
 
-.field private final lZ:Lokio/d;
+.field private final lY:Lokio/d;
 
 
 # direct methods
@@ -24,21 +24,21 @@
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/h;->buw:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/c/h;->buG:Ljava/lang/String;
 
     iput-wide p2, p0, Lokhttp3/internal/c/h;->contentLength:J
 
-    iput-object p4, p0, Lokhttp3/internal/c/h;->lZ:Lokio/d;
+    iput-object p4, p0, Lokhttp3/internal/c/h;->lY:Lokio/d;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FN()Lokio/d;
+.method public final FQ()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->lY:Lokio/d;
 
     return-object v0
 .end method
@@ -54,7 +54,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/h;->buw:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/internal/c/h;->buG:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali/okhttp3/internal/e/g$b.smali b/com.discord/smali/okhttp3/internal/e/g$b.smali
index e5e876575c..f14027ac73 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 bvY:Lokhttp3/internal/e/g$b;
+.field public static final bwi: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;->bvY:Lokhttp3/internal/e/g$b;
+    sput-object v0, Lokhttp3/internal/e/g$b;->bwi: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 1f9262a796..3931d2be17 100644
--- a/com.discord/smali/okhttp3/internal/e/i.smali
+++ b/com.discord/smali/okhttp3/internal/e/i.smali
@@ -18,13 +18,17 @@
 
 
 # instance fields
-.field bvI:J
+.field final bvE:Lokhttp3/internal/e/g;
 
-.field bvJ:J
+.field bvS:J
 
-.field final bvu:Lokhttp3/internal/e/g;
+.field bvT:J
 
-.field final bwl:Ljava/util/Deque;
+.field final bwA:Lokhttp3/internal/e/i$c;
+
+.field final bwB:Lokhttp3/internal/e/i$c;
+
+.field final bwv:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -34,17 +38,13 @@
     .end annotation
 .end field
 
-.field private bwm:Lokhttp3/internal/e/c$a;
+.field private bww:Lokhttp3/internal/e/c$a;
 
-.field bwn:Z
+.field bwx:Z
 
-.field final bwo:Lokhttp3/internal/e/i$b;
+.field final bwy:Lokhttp3/internal/e/i$b;
 
-.field final bwp:Lokhttp3/internal/e/i$a;
-
-.field final bwq:Lokhttp3/internal/e/i$c;
-
-.field final bwr:Lokhttp3/internal/e/i$c;
+.field final bwz:Lokhttp3/internal/e/i$a;
 
 .field errorCode:Lokhttp3/internal/e/b;
 
@@ -69,25 +69,25 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvI:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvS:J
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/e/i;->bwl:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bwv: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;->bwq:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bwA: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;->bwr:Lokhttp3/internal/e/i$c;
+    iput-object v0, p0, Lokhttp3/internal/e/i;->bwB: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;->bvu:Lokhttp3/internal/e/g;
+    iput-object p2, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object p1, p2, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object p1, p2, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GL()I
 
     move-result p1
 
     int-to-long v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvJ:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvT:J
 
     new-instance p1, Lokhttp3/internal/e/i$b;
 
-    iget-object p2, p2, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/m;
+    iget-object p2, p2, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p2}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {p2}, Lokhttp3/internal/e/m;->GL()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;->bwo:Lokhttp3/internal/e/i$b;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->bwy: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;->bwp:Lokhttp3/internal/e/i$a;
+    iput-object p1, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
 
-    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->bwt:Z
+    iput-boolean p4, p1, Lokhttp3/internal/e/i$b;->bwD:Z
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->bwt:Z
+    iput-boolean p3, p1, Lokhttp3/internal/e/i$a;->bwD:Z
 
     if-eqz p5, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bwl:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
 
     invoke-interface {p1, p5}, Ljava/util/Deque;->add(Ljava/lang/Object;)Z
 
     :cond_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gw()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gz()Z
 
     move-result p1
 
@@ -165,7 +165,7 @@
 
     :cond_2
     :goto_0
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gw()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gz()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;->bwl:Ljava/util/Deque;
+    iget-object p0, p0, Lokhttp3/internal/e/i;->bwv: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;->bwm:Lokhttp3/internal/e/c$a;
+    iget-object p0, p0, Lokhttp3/internal/e/i;->bww: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;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwD:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
 
     if-eqz v0, :cond_1
 
@@ -256,7 +256,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -279,7 +279,7 @@
 
 
 # virtual methods
-.method final GA()V
+.method public final declared-synchronized GA()Lokhttp3/Headers;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -290,25 +290,217 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwt:Z
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->enter()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_1
+
+    :goto_0
+    :try_start_1
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
+
+    invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->GF()V
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :cond_0
+    :try_start_2
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GG()V
+
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
+
+    invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
+
+    move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
+
+    invoke-interface {v0}, Ljava/util/Deque;->removeFirst()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lokhttp3/Headers;
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_1
+
+    monitor-exit p0
+
+    return-object v0
+
+    :cond_1
+    :try_start_3
+    new-instance v0, Lokhttp3/internal/e/n;
+
+    iget-object v1, p0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
+
+    invoke-direct {v0, v1}, Lokhttp3/internal/e/n;-><init>(Lokhttp3/internal/e/b;)V
+
+    throw v0
+
+    :catchall_0
+    move-exception v0
+
+    iget-object v1, p0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
+
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GG()V
+
+    throw v0
+    :try_end_3
+    .catchall {:try_start_3 .. :try_end_3} :catchall_1
+
+    :catchall_1
+    move-exception v0
+
+    monitor-exit p0
+
+    goto :goto_2
+
+    :goto_1
+    throw v0
+
+    :goto_2
+    goto :goto_1
+.end method
+
+.method public final GB()Lokio/q;
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bwx:Z
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gz()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "reply before requesting the sink"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
+
+    return-object v0
+
+    :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 final GC()V
+    .locals 2
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+
+    const/4 v1, 0x1
+
+    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->bwD:Z
+
+    invoke-virtual {p0}, Lokhttp3/internal/e/i;->isOpen()Z
+
+    move-result v0
+
+    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
+
+    iget v1, p0, Lokhttp3/internal/e/i;->id:I
+
+    invoke-virtual {v0, v1}, Lokhttp3/internal/e/g;->do(I)Lokhttp3/internal/e/i;
+
+    :cond_0
+    return-void
+
+    :catchall_0
+    move-exception v0
+
+    :try_start_1
+    monitor-exit p0
+    :try_end_1
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    throw v0
+.end method
+
+.method final GD()V
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
+
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwD:Z
+
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->w:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->w:Z
 
@@ -333,7 +525,7 @@
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0}, Lokhttp3/internal/e/i;->b(Lokhttp3/internal/e/b;)V
 
@@ -342,7 +534,7 @@
     :cond_2
     if-nez v1, :cond_3
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
     iget v1, p0, Lokhttp3/internal/e/i;->id:I
 
@@ -362,7 +554,7 @@
     throw v0
 .end method
 
-.method final GB()V
+.method final GE()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -370,15 +562,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->w:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
 
     if-nez v0, :cond_1
 
@@ -414,7 +606,7 @@
     throw v0
 .end method
 
-.method final GC()V
+.method final GF()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -443,7 +635,7 @@
     throw v0
 .end method
 
-.method public final Gw()Z
+.method public final Gz()Z
     .locals 4
 
     iget v0, p0, Lokhttp3/internal/e/i;->id:I
@@ -464,9 +656,9 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v3, p0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-boolean v3, v3, Lokhttp3/internal/e/g;->bvz:Z
+    iget-boolean v3, v3, Lokhttp3/internal/e/g;->bvJ:Z
 
     if-ne v3, v0, :cond_1
 
@@ -476,206 +668,14 @@
     return v2
 .end method
 
-.method public final declared-synchronized Gx()Lokhttp3/Headers;
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwq: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
-
-    :goto_0
-    :try_start_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwl:Ljava/util/Deque;
-
-    invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->GC()V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :cond_0
-    :try_start_2
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
-
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GD()V
-
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwl:Ljava/util/Deque;
-
-    invoke-interface {v0}, Ljava/util/Deque;->isEmpty()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwl:Ljava/util/Deque;
-
-    invoke-interface {v0}, Ljava/util/Deque;->removeFirst()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lokhttp3/Headers;
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_1
-
-    monitor-exit p0
-
-    return-object v0
-
-    :cond_1
-    :try_start_3
-    new-instance v0, Lokhttp3/internal/e/n;
-
-    iget-object v1, p0, Lokhttp3/internal/e/i;->errorCode:Lokhttp3/internal/e/b;
-
-    invoke-direct {v0, v1}, Lokhttp3/internal/e/n;-><init>(Lokhttp3/internal/e/b;)V
-
-    throw v0
-
-    :catchall_0
-    move-exception v0
-
-    iget-object v1, p0, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
-
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GD()V
-
-    throw v0
-    :try_end_3
-    .catchall {:try_start_3 .. :try_end_3} :catchall_1
-
-    :catchall_1
-    move-exception v0
-
-    monitor-exit p0
-
-    goto :goto_2
-
-    :goto_1
-    throw v0
-
-    :goto_2
-    goto :goto_1
-.end method
-
-.method public final Gy()Lokio/q;
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bwn:Z
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->Gw()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "reply before requesting the sink"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
-
-    return-object v0
-
-    :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 final Gz()V
-    .locals 2
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
-
-    const/4 v1, 0x1
-
-    iput-boolean v1, v0, Lokhttp3/internal/e/i$b;->bwt:Z
-
-    invoke-virtual {p0}, Lokhttp3/internal/e/i;->isOpen()Z
-
-    move-result v0
-
-    invoke-virtual {p0}, Ljava/lang/Object;->notifyAll()V
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
-
-    iget v1, p0, Lokhttp3/internal/e/i;->id:I
-
-    invoke-virtual {v0, v1}, Lokhttp3/internal/e/g;->do(I)Lokhttp3/internal/e/i;
-
-    :cond_0
-    return-void
-
-    :catchall_0
-    move-exception v0
-
-    :try_start_1
-    monitor-exit p0
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    throw v0
-.end method
-
 .method final at(J)V
     .locals 3
 
-    iget-wide v0, p0, Lokhttp3/internal/e/i;->bvJ:J
+    iget-wide v0, p0, Lokhttp3/internal/e/i;->bvT:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvJ:J
+    iput-wide v0, p0, Lokhttp3/internal/e/i;->bvT:J
 
     const-wide/16 v0, 0x0
 
@@ -706,7 +706,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE: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;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bvE: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;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->bwD:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$b;->w:Z
 
     if-eqz v0, :cond_3
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, p0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
     iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->w:Z
 
     if-eqz v0, :cond_3
 
     :cond_2
-    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bwn:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/i;->bwx: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 a2fc1ce3e3..e6226b8bec 100644
--- a/com.discord/smali/okhttp3/internal/g/a.smali
+++ b/com.discord/smali/okhttp3/internal/g/a.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final bwM:Ljava/lang/Class;
+.field private final bwW:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final bwN:Lokhttp3/internal/g/e;
+.field private final bwX:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final bwO:Lokhttp3/internal/g/e;
+.field private final bwY:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final bwP:Lokhttp3/internal/g/e;
+.field private final bwZ:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -53,7 +53,7 @@
     .end annotation
 .end field
 
-.field private final bwQ:Lokhttp3/internal/g/e;
+.field private final bxa:Lokhttp3/internal/g/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lokhttp3/internal/g/e<",
@@ -63,7 +63,7 @@
     .end annotation
 .end field
 
-.field private final bwR:Lokhttp3/internal/g/a$c;
+.field private final bxb:Lokhttp3/internal/g/a$c;
 
 
 # direct methods
@@ -91,26 +91,26 @@
 
     invoke-direct {p0}, Lokhttp3/internal/g/f;-><init>()V
 
-    invoke-static {}, Lokhttp3/internal/g/a$c;->GM()Lokhttp3/internal/g/a$c;
+    invoke-static {}, Lokhttp3/internal/g/a$c;->GP()Lokhttp3/internal/g/a$c;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/g/a;->bwR:Lokhttp3/internal/g/a$c;
+    iput-object v0, p0, Lokhttp3/internal/g/a;->bxb:Lokhttp3/internal/g/a$c;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a;->bwM:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/a;->bwW:Ljava/lang/Class;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a;->bwN:Lokhttp3/internal/g/e;
+    iput-object p2, p0, Lokhttp3/internal/g/a;->bwX:Lokhttp3/internal/g/e;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a;->bwO:Lokhttp3/internal/g/e;
+    iput-object p3, p0, Lokhttp3/internal/g/a;->bwY:Lokhttp3/internal/g/e;
 
-    iput-object p4, p0, Lokhttp3/internal/g/a;->bwP:Lokhttp3/internal/g/e;
+    iput-object p4, p0, Lokhttp3/internal/g/a;->bwZ:Lokhttp3/internal/g/e;
 
-    iput-object p5, p0, Lokhttp3/internal/g/a;->bwQ:Lokhttp3/internal/g/e;
+    iput-object p5, p0, Lokhttp3/internal/g/a;->bxa:Lokhttp3/internal/g/e;
 
     return-void
 .end method
 
-.method private static GJ()Z
+.method private static GM()Z
     .locals 2
 
     const-string v0, "GMSCore_OpenSSL"
@@ -141,7 +141,7 @@
     return v0
 .end method
 
-.method public static GK()Lokhttp3/internal/g/f;
+.method public static GN()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;->GJ()Z
+    invoke-static {}, Lokhttp3/internal/g/a;->GM()Z
 
     move-result v2
 
@@ -371,7 +371,7 @@
 
 
 # virtual methods
-.method public final GL()Ljavax/net/ssl/SSLContext;
+.method public final GO()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;->bwN:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->bwX: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;->bwO:Lokhttp3/internal/g/e;
+    iget-object v2, p0, Lokhttp3/internal/g/a;->bwY: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;->bwQ:Lokhttp3/internal/g/e;
+    iget-object p2, p0, Lokhttp3/internal/g/a;->bxa:Lokhttp3/internal/g/e;
 
     if-eqz p2, :cond_3
 
@@ -670,7 +670,7 @@
 
     check-cast v4, Lokhttp3/u;
 
-    sget-object v5, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v5, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     if-eq v4, v5, :cond_1
 
@@ -702,7 +702,7 @@
 
     aput-object p3, p2, v0
 
-    iget-object p3, p0, Lokhttp3/internal/g/a;->bwQ:Lokhttp3/internal/g/e;
+    iget-object p3, p0, Lokhttp3/internal/g/a;->bxa:Lokhttp3/internal/g/e;
 
     invoke-virtual {p3, p1, p2}, Lokhttp3/internal/g/e;->d(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;->bwM:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwW: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;->bwP:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwZ: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;->bwP:Lokhttp3/internal/g/e;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bwZ:Lokhttp3/internal/g/e;
 
     const/4 v2, 0x0
 
@@ -940,7 +940,7 @@
 
     new-instance v0, Ljava/lang/String;
 
-    sget-object v1, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v0, p1, v1}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
@@ -953,7 +953,7 @@
 .method public final ed(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bwR:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bxb:Lokhttp3/internal/g/a$c;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/g/a$c;->ef(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1035,7 +1035,7 @@
 .method public final u(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/g/a;->bwR:Lokhttp3/internal/g/a$c;
+    iget-object v0, p0, Lokhttp3/internal/g/a;->bxb:Lokhttp3/internal/g/a$c;
 
     invoke-virtual {v0, p2}, Lokhttp3/internal/g/a$c;->bj(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 70d779f641..47bbaec26b 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 private static GN()Ljava/security/Provider;
+.method private static GQ()Ljava/security/Provider;
     .locals 1
 
     invoke-static {}, Lorg/conscrypt/Conscrypt;->newProviderBuilder()Lorg/conscrypt/Conscrypt$ProviderBuilder;
@@ -30,7 +30,7 @@
     return-object v0
 .end method
 
-.method public static GO()Lokhttp3/internal/g/b;
+.method public static GR()Lokhttp3/internal/g/b;
     .locals 2
 
     const/4 v0, 0x0
@@ -63,13 +63,13 @@
 
 
 # virtual methods
-.method public final GL()Ljavax/net/ssl/SSLContext;
+.method public final GO()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     :try_start_0
     const-string v0, "TLSv1.3"
 
-    invoke-static {}, Lokhttp3/internal/g/b;->GN()Ljava/security/Provider;
+    invoke-static {}, Lokhttp3/internal/g/b;->GQ()Ljava/security/Provider;
 
     move-result-object v1
 
@@ -87,7 +87,7 @@
     :try_start_1
     const-string v1, "TLS"
 
-    invoke-static {}, Lokhttp3/internal/g/b;->GN()Ljava/security/Provider;
+    invoke-static {}, Lokhttp3/internal/g/b;->GQ()Ljava/security/Provider;
 
     move-result-object v2
 
diff --git a/com.discord/smali/okhttp3/internal/g/c.smali b/com.discord/smali/okhttp3/internal/g/c.smali
index b3b274236c..8aa3841c05 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 bwY:Ljava/lang/reflect/Method;
+.field final bxi:Ljava/lang/reflect/Method;
 
-.field final bwZ:Ljava/lang/reflect/Method;
+.field final bxj: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;->bwY:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/c;->bxi:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lokhttp3/internal/g/c;->bwZ:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/c;->bxj:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method public static GP()Lokhttp3/internal/g/c;
+.method public static GS()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;->bwY:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->bxi: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;->bwZ:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/c;->bxj: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 e54e12ddaf..2bd61b275f 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 bxa:Ljava/lang/reflect/Method;
+.field private final bxk:Ljava/lang/reflect/Method;
 
-.field private final bxb:Ljava/lang/reflect/Method;
+.field private final bxl:Ljava/lang/reflect/Method;
 
-.field private final bxc:Ljava/lang/Class;
+.field private final bxm:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final bxd:Ljava/lang/Class;
+.field private final bxn: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;->bxa:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lokhttp3/internal/g/d;->bxk: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;->bxb:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/d;->bxl:Ljava/lang/reflect/Method;
 
-    iput-object p4, p0, Lokhttp3/internal/g/d;->bxc:Ljava/lang/Class;
+    iput-object p4, p0, Lokhttp3/internal/g/d;->bxm:Ljava/lang/Class;
 
-    iput-object p5, p0, Lokhttp3/internal/g/d;->bxd:Ljava/lang/Class;
+    iput-object p5, p0, Lokhttp3/internal/g/d;->bxn:Ljava/lang/Class;
 
     return-void
 .end method
 
-.method public static GK()Lokhttp3/internal/g/f;
+.method public static GN()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;->bxc:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->bxm:Ljava/lang/Class;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lokhttp3/internal/g/d;->bxd:Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/d;->bxn:Ljava/lang/Class;
 
     const/4 v4, 0x1
 
@@ -245,7 +245,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lokhttp3/internal/g/d;->bxa:Ljava/lang/reflect/Method;
+    iget-object p3, p0, Lokhttp3/internal/g/d;->bxk: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;->bxe:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bxo:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lokhttp3/internal/g/d$a;->bxf:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/internal/g/d$a;->bxp:Ljava/lang/String;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -329,14 +329,14 @@
     return-object p1
 
     :cond_0
-    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bxe:Z
+    iget-boolean v1, v0, Lokhttp3/internal/g/d$a;->bxo:Z
 
     if-eqz v1, :cond_1
 
     return-object p1
 
     :cond_1
-    iget-object p1, v0, Lokhttp3/internal/g/d$a;->bxf:Ljava/lang/String;
+    iget-object p1, v0, Lokhttp3/internal/g/d$a;->bxp: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
@@ -365,7 +365,7 @@
     .locals 4
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/g/d;->bxb:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/d;->bxl: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 3199ea33fd..2f4df872e0 100644
--- a/com.discord/smali/okhttp3/internal/g/f.smali
+++ b/com.discord/smali/okhttp3/internal/g/f.smali
@@ -4,16 +4,16 @@
 
 
 # static fields
-.field private static final HQ:Ljava/util/logging/Logger;
+.field private static final HZ:Ljava/util/logging/Logger;
 
-.field private static final bxi:Lokhttp3/internal/g/f;
+.field private static final bxs:Lokhttp3/internal/g/f;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/a;->GK()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/a;->GN()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;->GO()Lokhttp3/internal/g/b;
+    invoke-static {}, Lokhttp3/internal/g/b;->GR()Lokhttp3/internal/g/b;
 
     move-result-object v0
 
@@ -71,7 +71,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-static {}, Lokhttp3/internal/g/c;->GP()Lokhttp3/internal/g/c;
+    invoke-static {}, Lokhttp3/internal/g/c;->GS()Lokhttp3/internal/g/c;
 
     move-result-object v0
 
@@ -80,7 +80,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/g/d;->GK()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/d;->GN()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;->bxi:Lokhttp3/internal/g/f;
+    sput-object v0, Lokhttp3/internal/g/f;->bxs:Lokhttp3/internal/g/f;
 
     const-class v0, Lokhttp3/t;
 
@@ -106,7 +106,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/g/f;->HQ:Ljava/util/logging/Logger;
+    sput-object v0, Lokhttp3/internal/g/f;->HZ:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -119,10 +119,10 @@
     return-void
 .end method
 
-.method public static GQ()Lokhttp3/internal/g/f;
+.method public static GT()Lokhttp3/internal/g/f;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/g/f;->bxi:Lokhttp3/internal/g/f;
+    sget-object v0, Lokhttp3/internal/g/f;->bxs:Lokhttp3/internal/g/f;
 
     return-object v0
 .end method
@@ -164,7 +164,7 @@
 
     check-cast v3, Lokhttp3/u;
 
-    sget-object v4, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v4, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     if-eq v3, v4, :cond_0
 
@@ -289,7 +289,7 @@
 
 
 # virtual methods
-.method public GL()Ljavax/net/ssl/SSLContext;
+.method public GO()Ljavax/net/ssl/SSLContext;
     .locals 3
 
     const-string v0, "java.specification.version"
@@ -361,7 +361,7 @@
     sget-object p1, Ljava/util/logging/Level;->INFO:Ljava/util/logging/Level;
 
     :goto_0
-    sget-object v0, Lokhttp3/internal/g/f;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/g/f;->HZ:Ljava/util/logging/Logger;
 
     invoke-virtual {v0, p1, p2, p3}, Ljava/util/logging/Logger;->log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V
 
@@ -502,7 +502,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    sget-object v2, Lokhttp3/internal/g/f;->bxi:Lokhttp3/internal/g/f;
+    sget-object v2, Lokhttp3/internal/g/f;->bxs:Lokhttp3/internal/g/f;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -538,7 +538,7 @@
 .method public ed(Ljava/lang/String;)Ljava/lang/Object;
     .locals 2
 
-    sget-object v0, Lokhttp3/internal/g/f;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/g/f;->HZ:Ljava/util/logging/Logger;
 
     sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
 
diff --git a/com.discord/smali/okhttp3/internal/j/a.smali b/com.discord/smali/okhttp3/internal/j/a.smali
index 5200c771ae..59f71fc74e 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 bxu:Ljava/util/List;
+.field public static final bxE:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,15 +34,25 @@
 
 
 # instance fields
-.field public final bsb:Lokhttp3/w;
+.field public final bsl:Lokhttp3/w;
 
-.field public btY:Lokhttp3/e;
+.field public bui:Lokhttp3/e;
 
-.field bvH:Z
+.field bvR:Z
 
-.field private bxA:Lokhttp3/internal/j/a$e;
+.field final bxF:Lokhttp3/WebSocketListener;
 
-.field private final bxB:Ljava/util/ArrayDeque;
+.field final bxG:J
+
+.field private final bxH:Ljava/lang/Runnable;
+
+.field private bxI:Lokhttp3/internal/j/c;
+
+.field bxJ:Lokhttp3/internal/j/d;
+
+.field private bxK:Lokhttp3/internal/j/a$e;
+
+.field private final bxL:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -52,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final bxC:Ljava/util/ArrayDeque;
+.field private final bxM:Ljava/util/ArrayDeque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayDeque<",
@@ -62,11 +72,11 @@
     .end annotation
 .end field
 
-.field private bxD:J
+.field private bxN:J
 
-.field private bxE:Z
+.field private bxO:Z
 
-.field private bxF:Ljava/util/concurrent/ScheduledFuture;
+.field private bxP:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -75,31 +85,21 @@
     .end annotation
 .end field
 
-.field private bxG:I
+.field private bxQ:I
 
-.field private bxH:Ljava/lang/String;
+.field private bxR:Ljava/lang/String;
 
-.field bxI:Z
+.field bxS:Z
 
-.field bxJ:I
+.field bxT:I
 
-.field private bxK:I
+.field private bxU:I
 
-.field private bxL:I
-
-.field final bxv:Lokhttp3/WebSocketListener;
-
-.field final bxw:J
-
-.field private final bxx:Ljava/lang/Runnable;
-
-.field private bxy:Lokhttp3/internal/j/c;
-
-.field bxz:Lokhttp3/internal/j/d;
+.field private bxV:I
 
 .field public final key:Ljava/lang/String;
 
-.field private pD:Ljava/util/concurrent/ScheduledExecutorService;
+.field private pC: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;->brR:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsb: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;->bxu:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/j/a;->bxE:Ljava/util/List;
 
     return-void
 .end method
@@ -128,19 +128,19 @@
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/a;->bxB:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bxL: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;->bxC:Ljava/util/ArrayDeque;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bxM:Ljava/util/ArrayDeque;
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/j/a;->bxG:I
+    iput v0, p0, Lokhttp3/internal/j/a;->bxQ:I
 
-    iget-object v0, p1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     const-string v1, "GET"
 
@@ -150,13 +150,13 @@
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/j/a;->bsb:Lokhttp3/w;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bsl:Lokhttp3/w;
 
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bxv:Lokhttp3/WebSocketListener;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
 
     iput-object p3, p0, Lokhttp3/internal/j/a;->random:Ljava/util/Random;
 
-    iput-wide p4, p0, Lokhttp3/internal/j/a;->bxw:J
+    iput-wide p4, p0, Lokhttp3/internal/j/a;->bxG:J
 
     const/16 p1, 0x10
 
@@ -168,7 +168,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Hr()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hu()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;->bxx:Ljava/lang/Runnable;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bxH:Ljava/lang/Runnable;
 
     return-void
 
@@ -191,7 +191,7 @@
 
     invoke-direct {p3, p4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object p1, p1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {p3, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -204,14 +204,14 @@
     throw p2
 .end method
 
-.method private GU()V
+.method private GX()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxx:Ljava/lang/Runnable;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxH:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/ScheduledExecutorService;->execute(Ljava/lang/Runnable;)V
 
@@ -268,11 +268,11 @@
 
     :cond_1
     :goto_0
-    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxI:Z
+    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxS:Z
 
     if-nez p2, :cond_3
 
-    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxE:Z
+    iget-boolean p2, p0, Lokhttp3/internal/j/a;->bxO:Z
 
     if-eqz p2, :cond_2
 
@@ -281,9 +281,9 @@
     :cond_2
     const/4 p2, 0x1
 
-    iput-boolean p2, p0, Lokhttp3/internal/j/a;->bxE:Z
+    iput-boolean p2, p0, Lokhttp3/internal/j/a;->bxO:Z
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxC:Ljava/util/ArrayDeque;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxM: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;->GU()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GX()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;->bxI:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxO:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-wide v2, p0, Lokhttp3/internal/j/a;->bxD:J
+    iget-wide v2, p0, Lokhttp3/internal/j/a;->bxN: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;->bxD:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxN: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;->bxD:J
+    iput-wide v0, p0, Lokhttp3/internal/j/a;->bxN:J
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxC:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxM: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;->GU()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GX()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -412,7 +412,7 @@
 
 
 # virtual methods
-.method public final GS()V
+.method public final GV()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -421,21 +421,21 @@
     .end annotation
 
     :goto_0
-    iget v0, p0, Lokhttp3/internal/j/a;->bxG:I
+    iget v0, p0, Lokhttp3/internal/j/a;->bxQ:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxy:Lokhttp3/internal/j/c;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxI:Lokhttp3/internal/j/c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GW()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GZ()V
 
-    iget-boolean v1, v0, Lokhttp3/internal/j/c;->bxW:Z
+    iget-boolean v1, v0, Lokhttp3/internal/j/c;->byg:Z
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GX()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Ha()V
 
     goto :goto_0
 
@@ -477,15 +477,15 @@
 
     :cond_2
     :goto_1
-    invoke-virtual {v0}, Lokhttp3/internal/j/c;->GZ()V
+    invoke-virtual {v0}, Lokhttp3/internal/j/c;->Hc()V
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, v0, Lokhttp3/internal/j/c;->bxT:Lokhttp3/internal/j/c$a;
+    iget-object v1, v0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/c;->bxY:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/c;->byi:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object v0
 
@@ -494,11 +494,11 @@
     goto :goto_0
 
     :cond_3
-    iget-object v1, v0, Lokhttp3/internal/j/c;->bxT:Lokhttp3/internal/j/c$a;
+    iget-object v1, v0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/c;->bxY:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/c;->byi:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Gs()Lokio/ByteString;
 
     move-result-object v0
 
@@ -510,21 +510,21 @@
     return-void
 .end method
 
-.method public final declared-synchronized GT()V
+.method public final declared-synchronized GW()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lokhttp3/internal/j/a;->bxL:I
+    iget v0, p0, Lokhttp3/internal/j/a;->bxV:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lokhttp3/internal/j/a;->bxL:I
+    iput v0, p0, Lokhttp3/internal/j/a;->bxV:I
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bvH:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bvR:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -540,7 +540,7 @@
     throw v0
 .end method
 
-.method final GV()Z
+.method final GY()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;->bxI:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
 
     const/4 v1, 0x0
 
@@ -562,9 +562,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxz:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxJ:Lokhttp3/internal/j/d;
 
-    iget-object v2, p0, Lokhttp3/internal/j/a;->bxB:Ljava/util/ArrayDeque;
+    iget-object v2, p0, Lokhttp3/internal/j/a;->bxL: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;->bxC:Ljava/util/ArrayDeque;
+    iget-object v4, p0, Lokhttp3/internal/j/a;->bxM: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;->bxG:I
+    iget v5, p0, Lokhttp3/internal/j/a;->bxQ:I
 
-    iget-object v6, p0, Lokhttp3/internal/j/a;->bxH:Ljava/lang/String;
+    iget-object v6, p0, Lokhttp3/internal/j/a;->bxR:Ljava/lang/String;
 
     const/4 v7, -0x1
 
     if-eq v5, v7, :cond_1
 
-    iget-object v7, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/internal/j/a$e;
+    iget-object v7, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
-    iput-object v3, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/internal/j/a$e;
+    iput-object v3, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
-    iget-object v3, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, p0, Lokhttp3/internal/j/a;->pC: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v7, p0, Lokhttp3/internal/j/a;->pC: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;->bxP:J
+    iget-wide v9, v9, Lokhttp3/internal/j/a$b;->bxZ: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;->bxF:Ljava/util/concurrent/ScheduledFuture;
+    iput-object v7, p0, Lokhttp3/internal/j/a;->bxP: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;->bxR:Lokio/ByteString;
+    iget-object v2, v2, Lokhttp3/internal/j/a$c;->byb:Lokio/ByteString;
 
     check-cast v4, Lokhttp3/internal/j/a$c;
 
-    iget v4, v4, Lokhttp3/internal/j/a$c;->bxQ:I
+    iget v4, v4, Lokhttp3/internal/j/a$c;->bya: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;->bye:Z
+    iget-boolean v8, v0, Lokhttp3/internal/j/d;->byo:Z
 
     if-nez v8, :cond_6
 
-    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bye:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->byo:Z
 
-    iget-object v8, v0, Lokhttp3/internal/j/d;->byd:Lokhttp3/internal/j/d$a;
+    iget-object v8, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
 
-    iput v4, v8, Lokhttp3/internal/j/d$a;->bxQ:I
+    iput v4, v8, Lokhttp3/internal/j/d$a;->bya:I
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->byd:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
 
     iput-wide v5, v4, Lokhttp3/internal/j/d$a;->contentLength:J
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->byd:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
 
-    iput-boolean v7, v4, Lokhttp3/internal/j/d$a;->byf:Z
+    iput-boolean v7, v4, Lokhttp3/internal/j/d$a;->byp:Z
 
-    iget-object v4, v0, Lokhttp3/internal/j/d;->byd:Lokhttp3/internal/j/d$a;
+    iget-object v4, v0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
 
     iput-boolean v1, v4, Lokhttp3/internal/j/d$a;->w:Z
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->byd:Lokhttp3/internal/j/d$a;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->byn: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;->bxD:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxN: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;->bxD:J
+    iput-wide v0, p0, Lokhttp3/internal/j/a;->bxN: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;->bxO:Lokio/ByteString;
+    iget-object v2, v4, Lokhttp3/internal/j/a$b;->bxY:Lokio/ByteString;
 
-    sget-object v4, Lokio/ByteString;->byH:Lokio/ByteString;
+    sget-object v4, Lokio/ByteString;->byR:Lokio/ByteString;
 
     if-nez v1, :cond_8
 
@@ -792,7 +792,7 @@
     invoke-virtual {v4, v2}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
     :cond_a
-    invoke-virtual {v4}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/c;->Gs()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;->byc:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bym:Z
 
     if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF: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;->byc:Z
+    iput-boolean v7, v0, Lokhttp3/internal/j/d;->bym:Z
 
     throw v1
 
@@ -868,7 +868,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxI:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
 
     if-eqz v0, :cond_0
 
@@ -879,30 +879,30 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bxI:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/internal/j/a$e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/internal/j/a$e;
+    iput-object v1, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->pC: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;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF: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;->bxA:Lokhttp3/internal/j/a$e;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
     new-instance v0, Lokhttp3/internal/j/d;
 
-    iget-boolean v1, p2, Lokhttp3/internal/j/a$e;->bvz:Z
+    iget-boolean v1, p2, Lokhttp3/internal/j/a$e;->bvJ:Z
 
-    iget-object v2, p2, Lokhttp3/internal/j/a$e;->btP:Lokio/BufferedSink;
+    iget-object v2, p2, Lokhttp3/internal/j/a$e;->btZ: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;->bxz:Lokhttp3/internal/j/d;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->bxJ: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v0, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxw:J
+    iget-wide v0, p0, Lokhttp3/internal/j/a;->bxG:J
 
     const-wide/16 v2, 0x0
 
@@ -987,22 +987,22 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->pC: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;->bxw:J
+    iget-wide v2, p0, Lokhttp3/internal/j/a;->bxG:J
 
-    iget-wide v4, p0, Lokhttp3/internal/j/a;->bxw:J
+    iget-wide v4, p0, Lokhttp3/internal/j/a;->bxG: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;->bxC:Ljava/util/ArrayDeque;
+    iget-object p1, p0, Lokhttp3/internal/j/a;->bxM: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;->GU()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GX()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;->bvz:Z
+    iget-boolean v0, p2, Lokhttp3/internal/j/a$e;->bvJ:Z
 
-    iget-object p2, p2, Lokhttp3/internal/j/a$e;->lZ:Lokio/d;
+    iget-object p2, p2, Lokhttp3/internal/j/a$e;->lY: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;->bxy:Lokhttp3/internal/j/c;
+    iput-object p1, p0, Lokhttp3/internal/j/a;->bxI:Lokhttp3/internal/j/c;
 
     return-void
 
@@ -1043,7 +1043,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->btY:Lokhttp3/e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bui:Lokhttp3/e;
 
     invoke-interface {v0}, Lokhttp3/e;->cancel()V
 
@@ -1093,7 +1093,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Ljava/lang/String;)V
 
@@ -1110,21 +1110,21 @@
     monitor-enter p0
 
     :try_start_0
-    iget v1, p0, Lokhttp3/internal/j/a;->bxG:I
+    iget v1, p0, Lokhttp3/internal/j/a;->bxQ:I
 
     if-ne v1, v0, :cond_3
 
-    iput p1, p0, Lokhttp3/internal/j/a;->bxG:I
+    iput p1, p0, Lokhttp3/internal/j/a;->bxQ:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a;->bxH:Ljava/lang/String;
+    iput-object p2, p0, Lokhttp3/internal/j/a;->bxR:Ljava/lang/String;
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxO:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxC:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxM:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z
 
@@ -1132,22 +1132,22 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/internal/j/a$e;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
-    iput-object v1, p0, Lokhttp3/internal/j/a;->bxA:Lokhttp3/internal/j/a$e;
+    iput-object v1, p0, Lokhttp3/internal/j/a;->bxK:Lokhttp3/internal/j/a$e;
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP:Ljava/util/concurrent/ScheduledFuture;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxP: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v1}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
@@ -1162,13 +1162,13 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object v1, p0, Lokhttp3/internal/j/a;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF: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;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v1, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v1, p0, p1, p2}, Lokhttp3/WebSocketListener;->onClosed(Lokhttp3/WebSocket;ILjava/lang/String;)V
     :try_end_1
@@ -1221,7 +1221,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
 
     invoke-virtual {v0, p0, p1}, Lokhttp3/WebSocketListener;->onMessage(Lokhttp3/WebSocket;Lokio/ByteString;)V
 
@@ -1234,15 +1234,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxI:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxS:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/a;->bxO:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/a;->bxC:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxM: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;->bxB:Ljava/util/ArrayDeque;
+    iget-object v0, p0, Lokhttp3/internal/j/a;->bxL:Ljava/util/ArrayDeque;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayDeque;->add(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lokhttp3/internal/j/a;->GU()V
+    invoke-direct {p0}, Lokhttp3/internal/j/a;->GX()V
 
-    iget p1, p0, Lokhttp3/internal/j/a;->bxK:I
+    iget p1, p0, Lokhttp3/internal/j/a;->bxU:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/j/a;->bxK:I
+    iput p1, p0, Lokhttp3/internal/j/a;->bxU: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 7236d44df6..2e200ba88e 100644
--- a/com.discord/smali/okhttp3/internal/j/c$a.smali
+++ b/com.discord/smali/okhttp3/internal/j/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract GT()V
+.method public abstract GW()V
 .end method
 
 .method public abstract eh(Ljava/lang/String;)V
diff --git a/com.discord/smali/okhttp3/k$a.smali b/com.discord/smali/okhttp3/k$a.smali
index 7e25033e4a..c6916b5c11 100644
--- a/com.discord/smali/okhttp3/k$a.smali
+++ b/com.discord/smali/okhttp3/k$a.smali
@@ -15,16 +15,16 @@
 
 
 # instance fields
-.field bql:Z
+.field bqv:Z
 
-.field bqm:Z
+.field bqw:Z
 
-.field bqn:[Ljava/lang/String;
+.field bqx:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bqo:[Ljava/lang/String;
+.field bqy:[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;->bql:Z
+    iget-boolean v0, p1, Lokhttp3/k;->bqv:Z
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bql:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bqv:Z
 
-    iget-object v0, p1, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bqn:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->bqx:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k$a;->bqo:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k$a;->bqy:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k;->bqm:Z
+    iget-boolean p1, p1, Lokhttp3/k;->bqw:Z
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bqm:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bqw:Z
 
     return-void
 .end method
@@ -60,23 +60,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/k$a;->bql:Z
+    iput-boolean p1, p0, Lokhttp3/k$a;->bqv:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fc()Lokhttp3/k$a;
+.method public final Ff()Lokhttp3/k$a;
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k$a;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqv:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/k$a;->bqm:Z
+    iput-boolean v0, p0, Lokhttp3/k$a;->bqw:Z
 
     return-object p0
 
@@ -90,7 +90,7 @@
     throw v0
 .end method
 
-.method public final Fd()Lokhttp3/k;
+.method public final Fg()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;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqv: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;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqv: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;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqv:Z
 
     if-eqz v0, :cond_1
 
@@ -219,7 +219,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bqn:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->bqx:[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;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k$a;->bqv:Z
 
     if-eqz v0, :cond_1
 
@@ -259,7 +259,7 @@
 
     check-cast p1, [Ljava/lang/String;
 
-    iput-object p1, p0, Lokhttp3/k$a;->bqo:[Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/k$a;->bqy:[Ljava/lang/String;
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/k.smali b/com.discord/smali/okhttp3/k.smali
index 8a279c2d97..f9ba219eef 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 bqf:[Lokhttp3/h;
+.field private static final bqp:[Lokhttp3/h;
 
-.field private static final bqg:[Lokhttp3/h;
+.field private static final bqq:[Lokhttp3/h;
 
-.field public static final bqh:Lokhttp3/k;
+.field public static final bqr:Lokhttp3/k;
 
-.field public static final bqi:Lokhttp3/k;
+.field public static final bqs:Lokhttp3/k;
 
-.field public static final bqj:Lokhttp3/k;
+.field public static final bqt:Lokhttp3/k;
 
-.field public static final bqk:Lokhttp3/k;
+.field public static final bqu:Lokhttp3/k;
 
 
 # instance fields
-.field final bql:Z
+.field final bqv:Z
 
-.field public final bqm:Z
+.field public final bqw:Z
 
-.field final bqn:[Ljava/lang/String;
+.field final bqx:[Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bqo:[Ljava/lang/String;
+.field final bqy:[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;->bpT:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqd:Lokhttp3/h;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqe:Lokhttp3/h;
 
     const/4 v4, 0x1
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bpV:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqf:Lokhttp3/h;
 
     const/4 v5, 0x2
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bpW:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqg:Lokhttp3/h;
 
     const/4 v6, 0x3
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bpX:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqh:Lokhttp3/h;
 
     const/4 v7, 0x4
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bpF:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
 
     const/4 v8, 0x5
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bpJ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpT:Lokhttp3/h;
 
     const/4 v9, 0x6
 
     aput-object v2, v1, v9
 
-    sget-object v2, Lokhttp3/h;->bpG:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpQ:Lokhttp3/h;
 
     const/4 v10, 0x7
 
     aput-object v2, v1, v10
 
-    sget-object v2, Lokhttp3/h;->bpK:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
 
     const/16 v11, 0x8
 
     aput-object v2, v1, v11
 
-    sget-object v2, Lokhttp3/h;->bpQ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqa:Lokhttp3/h;
 
     const/16 v12, 0x9
 
     aput-object v2, v1, v12
 
-    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpZ:Lokhttp3/h;
 
     const/16 v13, 0xa
 
     aput-object v2, v1, v13
 
-    sput-object v1, Lokhttp3/k;->bqf:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->bqp:[Lokhttp3/h;
 
     const/16 v1, 0x12
 
     new-array v1, v1, [Lokhttp3/h;
 
-    sget-object v2, Lokhttp3/h;->bpT:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqd:Lokhttp3/h;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqe:Lokhttp3/h;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/h;->bpV:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqf:Lokhttp3/h;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/h;->bpW:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqg:Lokhttp3/h;
 
     aput-object v2, v1, v6
 
-    sget-object v2, Lokhttp3/h;->bpX:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqh:Lokhttp3/h;
 
     aput-object v2, v1, v7
 
-    sget-object v2, Lokhttp3/h;->bpF:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
 
     aput-object v2, v1, v8
 
-    sget-object v2, Lokhttp3/h;->bpJ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpT:Lokhttp3/h;
 
     aput-object v2, v1, v9
 
-    sget-object v2, Lokhttp3/h;->bpG:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpQ:Lokhttp3/h;
 
     aput-object v2, v1, v10
 
-    sget-object v2, Lokhttp3/h;->bpK:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpU:Lokhttp3/h;
 
     aput-object v2, v1, v11
 
-    sget-object v2, Lokhttp3/h;->bpQ:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bqa:Lokhttp3/h;
 
     aput-object v2, v1, v12
 
-    sget-object v2, Lokhttp3/h;->bpP:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpZ:Lokhttp3/h;
 
     aput-object v2, v1, v13
 
-    sget-object v2, Lokhttp3/h;->bpq:Lokhttp3/h;
+    sget-object v2, Lokhttp3/h;->bpA:Lokhttp3/h;
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lokhttp3/h;->bpr:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bpB:Lokhttp3/h;
 
     const/16 v2, 0xc
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->boO:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->boY:Lokhttp3/h;
 
     const/16 v2, 0xd
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->boP:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->boZ:Lokhttp3/h;
 
     const/16 v2, 0xe
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bol:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bow:Lokhttp3/h;
 
     const/16 v2, 0xf
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bop:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->boA:Lokhttp3/h;
 
     const/16 v2, 0x10
 
     aput-object v0, v1, v2
 
-    sget-object v0, Lokhttp3/h;->bnP:Lokhttp3/h;
+    sget-object v0, Lokhttp3/h;->bnZ:Lokhttp3/h;
 
     const/16 v2, 0x11
 
     aput-object v0, v1, v2
 
-    sput-object v1, Lokhttp3/k;->bqg:[Lokhttp3/h;
+    sput-object v1, Lokhttp3/k;->bqq:[Lokhttp3/h;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bqf:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bqp:[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;->bsF:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsP:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->bsG:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsQ:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
@@ -231,21 +231,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fc()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Ff()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqh:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqr:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bqg:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bqq:[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;->bsF:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsP:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/z;->bsG:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsQ:Lokhttp3/z;
 
     aput-object v2, v1, v4
 
-    sget-object v2, Lokhttp3/z;->bsH:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsR:Lokhttp3/z;
 
     aput-object v2, v1, v5
 
-    sget-object v2, Lokhttp3/z;->bsI:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsS:Lokhttp3/z;
 
     aput-object v2, v1, v6
 
@@ -273,21 +273,21 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fc()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Ff()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqi:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqs:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v4}, Lokhttp3/k$a;-><init>(Z)V
 
-    sget-object v1, Lokhttp3/k;->bqg:[Lokhttp3/h;
+    sget-object v1, Lokhttp3/k;->bqq:[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;->bsI:Lokhttp3/z;
+    sget-object v2, Lokhttp3/z;->bsS:Lokhttp3/z;
 
     aput-object v2, v1, v3
 
@@ -303,25 +303,25 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fc()Lokhttp3/k$a;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Ff()Lokhttp3/k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqj:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqt:Lokhttp3/k;
 
     new-instance v0, Lokhttp3/k$a;
 
     invoke-direct {v0, v3}, Lokhttp3/k$a;-><init>(Z)V
 
-    invoke-virtual {v0}, Lokhttp3/k$a;->Fd()Lokhttp3/k;
+    invoke-virtual {v0}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/k;->bqk:Lokhttp3/k;
+    sput-object v0, Lokhttp3/k;->bqu: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;->bql:Z
+    iget-boolean v0, p1, Lokhttp3/k$a;->bqv:Z
 
-    iput-boolean v0, p0, Lokhttp3/k;->bql:Z
+    iput-boolean v0, p0, Lokhttp3/k;->bqv:Z
 
-    iget-object v0, p1, Lokhttp3/k$a;->bqn:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->bqx:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/k$a;->bqo:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k$a;->bqy:[Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
-    iget-boolean p1, p1, Lokhttp3/k$a;->bqm:Z
+    iget-boolean p1, p1, Lokhttp3/k$a;->bqw:Z
 
-    iput-boolean p1, p0, Lokhttp3/k;->bqm:Z
+    iput-boolean p1, p0, Lokhttp3/k;->bqw: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;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqv:Z
 
     const/4 v1, 0x0
 
@@ -364,13 +364,13 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/c;->aTJ:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/internal/c;->aTS:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqy:[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;->bqn:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
     if-eqz v0, :cond_2
 
-    sget-object v0, Lokhttp3/h;->bnH:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bnR:Ljava/util/Comparator;
 
-    iget-object v2, p0, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqx:[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;->bql:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bqv:Z
 
-    iget-boolean v3, p1, Lokhttp3/k;->bql:Z
+    iget-boolean v3, p1, Lokhttp3/k;->bqv:Z
 
     if-eq v2, v3, :cond_2
 
@@ -447,9 +447,9 @@
     :cond_2
     if-eqz v2, :cond_5
 
-    iget-object v2, p0, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bqx:[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;->bqo:[Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
-    iget-object v3, p1, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bqy:[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;->bqm:Z
+    iget-boolean v2, p0, Lokhttp3/k;->bqw:Z
 
-    iget-boolean p1, p1, Lokhttp3/k;->bqm:Z
+    iget-boolean p1, p1, Lokhttp3/k;->bqw:Z
 
     if-eq v2, p1, :cond_5
 
@@ -488,11 +488,11 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-boolean v0, p0, Lokhttp3/k;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqv:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqx:[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;->bqo:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/k;->bqy:[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;->bqm:Z
+    iget-boolean v1, p0, Lokhttp3/k;->bqw: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;->bql:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqv:Z
 
     if-nez v0, :cond_0
 
@@ -539,7 +539,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -569,7 +569,7 @@
     move-object v0, v2
 
     :goto_1
-    iget-object v3, p0, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/k;->bqy:[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;->bqm:Z
+    iget-boolean v0, p0, Lokhttp3/k;->bqw: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 6b366bfe8d..5902833a6a 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 bqt:J
+.field public bqD:J
 
-.field bqu:Ljava/lang/String;
+.field bqE:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public bqv:Z
+.field public bqF:Z
 
-.field public bqw:Z
+.field public bqG:Z
 
-.field public bqx:Z
+.field public bqH:Z
 
-.field bqy:Z
+.field bqI: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;->bqt:J
+    iput-wide v0, p0, Lokhttp3/l$a;->bqD:J
 
     const-string v0, "/"
 
@@ -73,9 +73,9 @@
 
     if-eqz v0, :cond_0
 
-    iput-object v0, p0, Lokhttp3/l$a;->bqu:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l$a;->bqE:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lokhttp3/l$a;->bqy:Z
+    iput-boolean p2, p0, Lokhttp3/l$a;->bqI:Z
 
     return-object p0
 
diff --git a/com.discord/smali/okhttp3/l.smali b/com.discord/smali/okhttp3/l.smali
index 9da0273cef..61ea9c3e0e 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 bqp:Ljava/util/regex/Pattern;
+.field private static final bqA:Ljava/util/regex/Pattern;
 
-.field private static final bqq:Ljava/util/regex/Pattern;
+.field private static final bqB:Ljava/util/regex/Pattern;
 
-.field private static final bqr:Ljava/util/regex/Pattern;
+.field private static final bqC:Ljava/util/regex/Pattern;
 
-.field private static final bqs:Ljava/util/regex/Pattern;
+.field private static final bqz:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field public final bqt:J
+.field public final bqD:J
 
-.field public final bqu:Ljava/lang/String;
+.field public final bqE:Ljava/lang/String;
 
-.field public final bqv:Z
+.field public final bqF:Z
 
-.field public final bqw:Z
+.field public final bqG:Z
 
-.field public final bqx:Z
+.field public final bqH:Z
 
-.field public final bqy:Z
+.field public final bqI:Z
 
 .field public final name:Ljava/lang/String;
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bqp:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqz: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;->bqq:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqA:Ljava/util/regex/Pattern;
 
     const-string v0, "(\\d{1,2})[^\\d]*"
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/l;->bqr:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqB: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;->bqs:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/l;->bqC: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;->bqt:J
+    iput-wide p3, p0, Lokhttp3/l;->bqD:J
 
-    iput-object p5, p0, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iput-object p5, p0, Lokhttp3/l;->bqE:Ljava/lang/String;
 
     iput-object p6, p0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lokhttp3/l;->bqv:Z
+    iput-boolean p7, p0, Lokhttp3/l;->bqF:Z
 
-    iput-boolean p8, p0, Lokhttp3/l;->bqw:Z
+    iput-boolean p8, p0, Lokhttp3/l;->bqG:Z
 
-    iput-boolean p9, p0, Lokhttp3/l;->bqy:Z
+    iput-boolean p9, p0, Lokhttp3/l;->bqI:Z
 
-    iput-boolean p10, p0, Lokhttp3/l;->bqx:Z
+    iput-boolean p10, p0, Lokhttp3/l;->bqH:Z
 
     return-void
 .end method
@@ -119,7 +119,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l$a;->bqu:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->bqE: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;->bqt:J
+    iget-wide v0, p1, Lokhttp3/l$a;->bqD:J
 
-    iput-wide v0, p0, Lokhttp3/l;->bqt:J
+    iput-wide v0, p0, Lokhttp3/l;->bqD:J
 
-    iget-object v0, p1, Lokhttp3/l$a;->bqu:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l$a;->bqE:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/l;->bqE: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;->bqv:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bqF:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bqv:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bqF:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bqw:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bqG:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bqw:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bqG:Z
 
-    iget-boolean v0, p1, Lokhttp3/l$a;->bqx:Z
+    iget-boolean v0, p1, Lokhttp3/l$a;->bqH:Z
 
-    iput-boolean v0, p0, Lokhttp3/l;->bqx:Z
+    iput-boolean v0, p0, Lokhttp3/l;->bqH:Z
 
-    iget-boolean p1, p1, Lokhttp3/l$a;->bqy:Z
+    iget-boolean p1, p1, Lokhttp3/l$a;->bqI:Z
 
-    iput-boolean p1, p0, Lokhttp3/l;->bqy:Z
+    iput-boolean p1, p0, Lokhttp3/l;->bqI:Z
 
     return-void
 
@@ -286,7 +286,7 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -538,7 +538,7 @@
 
     move-result v6
 
-    sget-object v12, Lokhttp3/l;->bqs:Ljava/util/regex/Pattern;
+    sget-object v12, Lokhttp3/l;->bqC: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;->bqs:Ljava/util/regex/Pattern;
+    sget-object v6, Lokhttp3/l;->bqC: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;->bqr:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqB: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;->bqq:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqA: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;->bqq:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqA: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;->bqp:Ljava/util/regex/Pattern;
+    sget-object v9, Lokhttp3/l;->bqz: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;->bsY:Ljava/util/TimeZone;
+    sget-object v9, Lokhttp3/internal/c;->bti:Ljava/util/TimeZone;
 
     invoke-direct {v15, v9}, Ljava/util/GregorianCalendar;-><init>(Ljava/util/TimeZone;)V
 
@@ -1135,7 +1135,7 @@
     move-wide/from16 v12, v21
 
     :goto_b
-    iget-object v1, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->brg:Ljava/lang/String;
 
     if-nez v8, :cond_22
 
@@ -1172,7 +1172,7 @@
 
     if-eq v1, v3, :cond_24
 
-    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->GR()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    invoke-static {}, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->GU()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     move-result-object v1
 
@@ -1206,7 +1206,7 @@
 
     :cond_26
     :goto_d
-    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Fo()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lokhttp3/s;->Fr()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;->Fo()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fr()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1455,9 +1455,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/l;->bqE:Ljava/lang/String;
 
-    iget-object v2, p0, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/l;->bqE: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;->bqt:J
+    iget-wide v2, p1, Lokhttp3/l;->bqD:J
 
-    iget-wide v4, p0, Lokhttp3/l;->bqt:J
+    iget-wide v4, p0, Lokhttp3/l;->bqD:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bqv:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bqF:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bqv:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bqF:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bqw:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bqG:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bqw:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bqG:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean v0, p1, Lokhttp3/l;->bqx:Z
+    iget-boolean v0, p1, Lokhttp3/l;->bqH:Z
 
-    iget-boolean v2, p0, Lokhttp3/l;->bqx:Z
+    iget-boolean v2, p0, Lokhttp3/l;->bqH:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-boolean p1, p1, Lokhttp3/l;->bqy:Z
+    iget-boolean p1, p1, Lokhttp3/l;->bqI:Z
 
-    iget-boolean v0, p0, Lokhttp3/l;->bqy:Z
+    iget-boolean v0, p0, Lokhttp3/l;->bqI:Z
 
     if-ne p1, v0, :cond_1
 
@@ -1538,7 +1538,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v1, p0, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bqE: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;->bqt:J
+    iget-wide v1, p0, Lokhttp3/l;->bqD:J
 
     const/16 v3, 0x20
 
@@ -1572,7 +1572,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqv:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqF:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1580,7 +1580,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqw:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqG:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1588,7 +1588,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqx:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqH:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1596,7 +1596,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-boolean v1, p0, Lokhttp3/l;->bqy:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqI: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;->bqx:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqH:Z
 
     if-eqz v1, :cond_1
 
-    iget-wide v1, p0, Lokhttp3/l;->bqt:J
+    iget-wide v1, p0, Lokhttp3/l;->bqD:J
 
     const-wide/high16 v3, -0x8000000000000000L
 
@@ -1649,7 +1649,7 @@
 
     new-instance v1, Ljava/util/Date;
 
-    iget-wide v2, p0, Lokhttp3/l;->bqt:J
+    iget-wide v2, p0, Lokhttp3/l;->bqD: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;->bqy:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqI: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;->bqu:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bqE: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;->bqv:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqF: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;->bqw:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqG:Z
 
     if-eqz v1, :cond_4
 
diff --git a/com.discord/smali/okhttp3/n.smali b/com.discord/smali/okhttp3/n.smali
index 461db745ef..c5b7763df5 100644
--- a/com.discord/smali/okhttp3/n.smali
+++ b/com.discord/smali/okhttp3/n.smali
@@ -8,16 +8,16 @@
 
 
 # instance fields
-.field private bqA:I
+.field private bqK:I
 
-.field private bqB:I
+.field private bqL:I
 
-.field private bqC:Ljava/lang/Runnable;
+.field private bqM:Ljava/lang/Runnable;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bqD:Ljava/util/Deque;
+.field final bqN:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bqE:Ljava/util/Deque;
+.field private final bqO:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final bqF:Ljava/util/Deque;
+.field private final bqP: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;->bqA:I
+    iput v0, p0, Lokhttp3/n;->bqK:I
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/n;->bqB:I
+    iput v0, p0, Lokhttp3/n;->bqL:I
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bqD:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bqN:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bqE:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bqO:Ljava/util/Deque;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/n;->bqF:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/n;->bqP:Ljava/util/Deque;
 
     return-void
 .end method
 
-.method private declared-synchronized Fe()Ljava/util/concurrent/ExecutorService;
+.method private declared-synchronized Fh()Ljava/util/concurrent/ExecutorService;
     .locals 9
 
     monitor-enter p0
@@ -149,19 +149,19 @@
     throw v0
 .end method
 
-.method private declared-synchronized Fg()I
+.method private declared-synchronized Fj()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/n;->bqE:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqO:Ljava/util/Deque;
 
     invoke-interface {v0}, Ljava/util/Deque;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/n;->bqF:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->bqP: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;->bqE:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqO: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;->bse:Lokhttp3/v;
+    iget-object v3, v2, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-boolean v3, v3, Lokhttp3/v;->bsc:Z
+    iget-boolean v3, v3, Lokhttp3/v;->bsm:Z
 
     if-nez v3, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/v$a;->FF()Ljava/lang/String;
+    invoke-virtual {v2}, Lokhttp3/v$a;->FI()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lokhttp3/v$a;->FF()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v$a;->FI()Ljava/lang/String;
 
     move-result-object v3
 
@@ -257,13 +257,13 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lokhttp3/n;->bqC:Ljava/lang/Runnable;
+    iget-object p1, p0, Lokhttp3/n;->bqM:Ljava/lang/Runnable;
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lokhttp3/n;->Ff()Z
+    invoke-virtual {p0}, Lokhttp3/n;->Fi()Z
 
     move-result p2
 
@@ -298,7 +298,7 @@
 
 
 # virtual methods
-.method final Ff()Z
+.method final Fi()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;->bqD:Ljava/util/Deque;
+    iget-object v1, p0, Lokhttp3/n;->bqN: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;->bqE:Ljava/util/Deque;
+    iget-object v3, p0, Lokhttp3/n;->bqO:Ljava/util/Deque;
 
     invoke-interface {v3}, Ljava/util/Deque;->size()I
 
     move-result v3
 
-    iget v4, p0, Lokhttp3/n;->bqA:I
+    iget v4, p0, Lokhttp3/n;->bqK:I
 
     if-ge v3, v4, :cond_1
 
@@ -342,7 +342,7 @@
 
     move-result v3
 
-    iget v4, p0, Lokhttp3/n;->bqB:I
+    iget v4, p0, Lokhttp3/n;->bqL: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;->bqE:Ljava/util/Deque;
+    iget-object v3, p0, Lokhttp3/n;->bqO: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;->Fg()I
+    invoke-direct {p0}, Lokhttp3/n;->Fj()I
 
     move-result v1
 
@@ -390,7 +390,7 @@
 
     check-cast v4, Lokhttp3/v$a;
 
-    invoke-direct {p0}, Lokhttp3/n;->Fe()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lokhttp3/n;->Fh()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;->bse:Lokhttp3/v;
+    iget-object v5, v4, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
     invoke-static {v5}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v5, v4, Lokhttp3/v$a;->bsf:Lokhttp3/f;
+    iget-object v5, v4, Lokhttp3/v$a;->bsp: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;->bse:Lokhttp3/v;
+    iget-object v5, v4, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v5, v5, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v5, v5, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v5, v5, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v5, v5, Lokhttp3/t;->brL: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;->bse:Lokhttp3/v;
+    iget-object v1, v4, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v1, v1, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brL: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;->bqF:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqP: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;->bqE:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqO: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;->bqF:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqP: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;->bqD:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqN: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;->bse:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/n;->bqE:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqO: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;->bse:Lokhttp3/v;
+    iget-object v1, v1, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
     invoke-virtual {v1}, Lokhttp3/internal/c/j;->cancel()V
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/n;->bqF:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/n;->bqP: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;->brY:Lokhttp3/internal/c/j;
+    iget-object v1, v1, Lokhttp3/v;->bsi: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 d1c25b32d0..13672a9f3d 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 bqJ:Lokhttp3/MediaType;
+.field private static final bqT:Lokhttp3/MediaType;
 
 
 # instance fields
-.field private final bqK:Ljava/util/List;
+.field private final bqU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final bqL:Ljava/util/List;
+.field private final bqV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,7 +47,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/q;->bqJ:Lokhttp3/MediaType;
+    sput-object v0, Lokhttp3/q;->bqT:Lokhttp3/MediaType;
 
     return-void
 .end method
@@ -72,13 +72,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->bqK:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->bqU:Ljava/util/List;
 
     invoke-static {p2}, Lokhttp3/internal/c;->U(Ljava/util/List;)Ljava/util/List;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/q;->bqL:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q;->bqV:Ljava/util/List;
 
     return-void
 .end method
@@ -99,14 +99,14 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {p1}, Lokio/BufferedSink;->Hc()Lokio/c;
+    invoke-interface {p1}, Lokio/BufferedSink;->Hf()Lokio/c;
 
     move-result-object p1
 
     :goto_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lokhttp3/q;->bqK:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/q;->bqU:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -122,7 +122,7 @@
     invoke-virtual {p1, v2}, Lokio/c;->du(I)Lokio/c;
 
     :cond_1
-    iget-object v2, p0, Lokhttp3/q;->bqK:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->bqU:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -136,7 +136,7 @@
 
     invoke-virtual {p1, v2}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object v2, p0, Lokhttp3/q;->bqL:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/q;->bqV:Ljava/util/List;
 
     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -185,7 +185,7 @@
 .method public final contentType()Lokhttp3/MediaType;
     .locals 1
 
-    sget-object v0, Lokhttp3/q;->bqJ:Lokhttp3/MediaType;
+    sget-object v0, Lokhttp3/q;->bqT:Lokhttp3/MediaType;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/okhttp3/r.smali b/com.discord/smali/okhttp3/r.smali
index 776543e31b..24a9946c47 100644
--- a/com.discord/smali/okhttp3/r.smali
+++ b/com.discord/smali/okhttp3/r.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final bqO:Lokhttp3/z;
+.field private final bqY:Lokhttp3/z;
 
-.field public final bqP:Lokhttp3/h;
+.field public final bqZ:Lokhttp3/h;
 
-.field public final bqQ:Ljava/util/List;
+.field public final bra:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final bqR:Ljava/util/List;
+.field private final brb: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;->bqO:Lokhttp3/z;
+    iput-object p1, p0, Lokhttp3/r;->bqY:Lokhttp3/z;
 
-    iput-object p2, p0, Lokhttp3/r;->bqP:Lokhttp3/h;
+    iput-object p2, p0, Lokhttp3/r;->bqZ:Lokhttp3/h;
 
-    iput-object p3, p0, Lokhttp3/r;->bqQ:Ljava/util/List;
+    iput-object p3, p0, Lokhttp3/r;->bra:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/r;->bqR:Ljava/util/List;
+    iput-object p4, p0, Lokhttp3/r;->brb:Ljava/util/List;
 
     return-void
 .end method
@@ -211,9 +211,9 @@
     :cond_0
     check-cast p1, Lokhttp3/r;
 
-    iget-object v0, p0, Lokhttp3/r;->bqO:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->bqY:Lokhttp3/z;
 
-    iget-object v2, p1, Lokhttp3/r;->bqO:Lokhttp3/z;
+    iget-object v2, p1, Lokhttp3/r;->bqY: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;->bqP:Lokhttp3/h;
+    iget-object v0, p0, Lokhttp3/r;->bqZ:Lokhttp3/h;
 
-    iget-object v2, p1, Lokhttp3/r;->bqP:Lokhttp3/h;
+    iget-object v2, p1, Lokhttp3/r;->bqZ: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;->bqQ:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->bra:Ljava/util/List;
 
-    iget-object v2, p1, Lokhttp3/r;->bqQ:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/r;->bra: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;->bqR:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/r;->brb:Ljava/util/List;
 
-    iget-object p1, p1, Lokhttp3/r;->bqR:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/r;->brb: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;->bqO:Lokhttp3/z;
+    iget-object v0, p0, Lokhttp3/r;->bqY: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;->bqP:Lokhttp3/h;
+    iget-object v1, p0, Lokhttp3/r;->bqZ: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;->bqQ:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->bra: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;->bqR:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/r;->brb: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 887cc981c0..7b3f6d82ac 100644
--- a/com.discord/smali/okhttp3/s$a.smali
+++ b/com.discord/smali/okhttp3/s$a.smali
@@ -15,21 +15,21 @@
 
 
 # instance fields
-.field bqV:Ljava/lang/String;
+.field brf:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bqW:Ljava/lang/String;
+.field brg:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bra:Ljava/lang/String;
+.field brk:Ljava/lang/String;
 
-.field brb:Ljava/lang/String;
+.field brl:Ljava/lang/String;
 
-.field final brc:Ljava/util/List;
+.field final brm:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field brd:Ljava/util/List;
+.field brn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,7 +52,7 @@
     .end annotation
 .end field
 
-.field bre:Ljava/lang/String;
+.field bro: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;->bra:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->brk:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s$a;->brl: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;->brc:Ljava/util/List;
+    iput-object v1, p0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
-    iget-object v1, p0, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->clear()V
 
-    iget-object v3, v0, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
     invoke-interface {v4, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -595,7 +595,7 @@
 
 
 # virtual methods
-.method final Fs()I
+.method final Fv()I
     .locals 2
 
     iget v0, p0, Lokhttp3/s$a;->port:I
@@ -607,7 +607,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     invoke-static {v0}, Lokhttp3/s;->dD(Ljava/lang/String;)I
 
@@ -616,14 +616,14 @@
     return v0
 .end method
 
-.method public final Ft()Lokhttp3/s;
+.method public final Fw()Lokhttp3/s;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/s$a;->bqW:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -661,7 +661,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -741,7 +741,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     if-eqz p2, :cond_1
 
@@ -871,7 +871,7 @@
 
     const-string v2, "https"
 
-    iput-object v2, v0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     add-int/lit8 v9, v9, 0x6
 
@@ -898,7 +898,7 @@
 
     const-string v2, "http"
 
-    iput-object v2, v0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brf: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;->bqV:Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->brf:Ljava/lang/String;
 
-    iput-object v2, v0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brf: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;->bqV:Ljava/lang/String;
+    iget-object v3, v1, Lokhttp3/s;->brf:Ljava/lang/String;
 
-    iget-object v4, v0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v4, v0, Lokhttp3/s$a;->brf: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;->Fm()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fp()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->bra:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fn()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fq()Ljava/lang/String;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
 
-    iget-object v2, v1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v2, v1, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iput-object v2, v0, Lokhttp3/s$a;->bqW:Ljava/lang/String;
+    iput-object v2, v0, Lokhttp3/s$a;->brg: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;->brc:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
     invoke-interface {v2}, Ljava/util/List;->clear()V
 
-    iget-object v2, v0, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fp()Ljava/util/List;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fs()Ljava/util/List;
 
     move-result-object v3
 
@@ -1007,7 +1007,7 @@
     if-ne v2, v14, :cond_e
 
     :cond_4
-    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fq()Ljava/lang/String;
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Ft()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1113,7 +1113,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/s$a;->bra:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->brk: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;->bra:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
 
     if-eq v15, v12, :cond_9
 
@@ -1152,7 +1152,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brl: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;->brb:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->brl: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;->brb:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brl: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;->bqW:Ljava/lang/String;
+    iput-object v5, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
     invoke-static {v10, v3, v12}, Lokhttp3/s$a;->j(Ljava/lang/String;II)I
 
@@ -1274,9 +1274,9 @@
 
     move-result-object v3
 
-    iput-object v3, v0, Lokhttp3/s$a;->bqW:Ljava/lang/String;
+    iput-object v3, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
-    iget-object v3, v0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     invoke-static {v3}, Lokhttp3/s;->dD(Ljava/lang/String;)I
 
@@ -1285,7 +1285,7 @@
     iput v3, v0, Lokhttp3/s$a;->port:I
 
     :goto_5
-    iget-object v3, v0, Lokhttp3/s$a;->bqW:Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
     if-eqz v3, :cond_11
 
@@ -1343,7 +1343,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iput-object v1, v0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     move v1, v12
 
@@ -1382,7 +1382,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
 
     :cond_10
     return-object v0
@@ -1463,7 +1463,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/s$a;->brn: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;->bqV:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brf: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;->bra:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brk: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;->brb:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brl: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;->bra:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brk:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brl: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;->brb:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brl: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;->bqW:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brg: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;->bqW:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brg: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;->bqW:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -1573,16 +1573,16 @@
 
     if-ne v1, v3, :cond_6
 
-    iget-object v1, p0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     if-eqz v1, :cond_8
 
     :cond_6
-    invoke-virtual {p0}, Lokhttp3/s$a;->Fs()I
+    invoke-virtual {p0}, Lokhttp3/s$a;->Fv()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v3, p0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
     if-eqz v3, :cond_7
 
@@ -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;->brc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
     invoke-static {v0, v1}, Lokhttp3/s;->a(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
-    iget-object v1, p0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/s$a;->brn: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;->bre:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bro: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;->bre:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s$a;->bro: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 8bdd1b5325..141962eac1 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 bqU:[C
+.field private static final bre:[C
 
 
 # instance fields
-.field public final bqV:Ljava/lang/String;
+.field public final brf:Ljava/lang/String;
 
-.field public final bqW:Ljava/lang/String;
+.field public final brg:Ljava/lang/String;
 
-.field public final bqX:Ljava/util/List;
+.field public final brh:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final bqY:Ljava/util/List;
+.field public final bri:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final bqZ:Ljava/lang/String;
+.field private final brj:Ljava/lang/String;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -67,7 +67,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokhttp3/s;->bqU:[C
+    sput-object v0, Lokhttp3/s;->bre:[C
 
     return-void
 
@@ -97,11 +97,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bra:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brk: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;->brb:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brl: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;->bqW:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->Fs()I
+    invoke-virtual {p1}, Lokhttp3/s$a;->Fv()I
 
     move-result v0
 
     iput v0, p0, Lokhttp3/s;->port:I
 
-    iget-object v0, p1, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->brm: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;->bqX:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->brh:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     const/4 v3, 0x1
 
@@ -157,20 +157,20 @@
     move-object v0, v2
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/s;->bqY:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/s;->bri:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bro:Ljava/lang/String;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/s$a;->bro:Ljava/lang/String;
 
     invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String;
 
     move-result-object v2
 
     :cond_1
-    iput-object v2, p0, Lokhttp3/s;->bqZ:Ljava/lang/String;
+    iput-object v2, p0, Lokhttp3/s;->brj:Ljava/lang/String;
 
     invoke-virtual {p1}, Lokhttp3/s$a;->toString()Ljava/lang/String;
 
@@ -358,7 +358,7 @@
     :cond_a
     if-eqz v3, :cond_12
 
-    sget-object v14, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v14, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3, v14}, Ljava/nio/charset/Charset;->equals(Ljava/lang/Object;)Z
 
@@ -389,7 +389,7 @@
 
     if-eqz v3, :cond_d
 
-    sget-object v15, Lokio/t;->tx:Ljava/nio/charset/Charset;
+    sget-object v15, Lokio/t;->tw:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3, v15}, Ljava/nio/charset/Charset;->equals(Ljava/lang/Object;)Z
 
@@ -512,7 +512,7 @@
     invoke-virtual {v12, v13}, Lokio/c;->dt(I)Lokio/c;
 
     :goto_6
-    invoke-virtual {v12}, Lokio/c;->Hf()Z
+    invoke-virtual {v12}, Lokio/c;->Hi()Z
 
     move-result v6
 
@@ -526,7 +526,7 @@
 
     invoke-virtual {v5, v11}, Lokio/c;->du(I)Lokio/c;
 
-    sget-object v14, Lokhttp3/s;->bqU:[C
+    sget-object v14, Lokhttp3/s;->bre:[C
 
     shr-int/lit8 v15, v6, 0x4
 
@@ -536,7 +536,7 @@
 
     invoke-virtual {v5, v14}, Lokio/c;->du(I)Lokio/c;
 
-    sget-object v14, Lokhttp3/s;->bqU:[C
+    sget-object v14, Lokhttp3/s;->bre:[C
 
     and-int/lit8 v6, v6, 0xf
 
@@ -559,7 +559,7 @@
     goto/16 :goto_2
 
     :cond_14
-    invoke-virtual {v5}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v5}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object v0
 
@@ -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;->Hl()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object p0
 
@@ -1137,7 +1137,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lokhttp3/s$a;->Ft()Lokhttp3/s;
+    invoke-virtual {p0}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
 
     move-result-object p0
 
@@ -1162,36 +1162,36 @@
 
 
 # virtual methods
-.method public final Fk()Ljava/net/URI;
+.method public final Fn()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;->bqV:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
-    iput-object v1, v0, Lokhttp3/s$a;->bqV:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brf:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fm()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fp()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bra:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fn()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fq()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iput-object v1, v0, Lokhttp3/s$a;->bqW:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brg:Ljava/lang/String;
 
     iget v1, p0, Lokhttp3/s;->port:I
 
-    iget-object v2, p0, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-static {v2}, Lokhttp3/s;->dD(Ljava/lang/String;)I
 
@@ -1209,25 +1209,25 @@
     :goto_0
     iput v1, v0, Lokhttp3/s$a;->port:I
 
-    iget-object v1, v0, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->clear()V
 
-    iget-object v1, v0, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fp()Ljava/util/List;
+    invoke-virtual {p0}, Lokhttp3/s;->Fs()Ljava/util/List;
 
     move-result-object v2
 
     invoke-interface {v1, v2}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Ft()Ljava/lang/String;
 
     move-result-object v1
 
     invoke-virtual {v0, v1}, Lokhttp3/s$a;->dJ(Ljava/lang/String;)Lokhttp3/s$a;
 
-    iget-object v1, p0, Lokhttp3/s;->bqZ:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->brj:Ljava/lang/String;
 
     if-nez v1, :cond_1
 
@@ -1253,9 +1253,9 @@
     move-result-object v1
 
     :goto_1
-    iput-object v1, v0, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
 
-    iget-object v1, v0, Lokhttp3/s$a;->brc:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm: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;->brc:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/s$a;->brm:Ljava/util/List;
 
     const/4 v7, 0x1
 
@@ -1301,11 +1301,11 @@
     goto :goto_2
 
     :cond_2
-    iget-object v1, v0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lokhttp3/s$a;->brd:Ljava/util/List;
+    iget-object v1, v0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brn: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;->brd:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/s$a;->brn:Ljava/util/List;
 
     const/4 v6, 0x1
 
@@ -1350,11 +1350,11 @@
     goto :goto_3
 
     :cond_4
-    iget-object v1, v0, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
 
     if-eqz v1, :cond_5
 
-    iget-object v2, v0, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/s$a;->bro:Ljava/lang/String;
 
     const/4 v4, 0x1
 
@@ -1370,7 +1370,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bre:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->bro: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 Fl()Z
+.method public final Fo()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     const-string v1, "https"
 
@@ -1434,7 +1434,7 @@
     return v0
 .end method
 
-.method public final Fm()Ljava/lang/String;
+.method public final Fp()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;->bqV:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-virtual {v0}, Ljava/lang/String;->length()I
 
@@ -1479,7 +1479,7 @@
     return-object v0
 .end method
 
-.method public final Fn()Ljava/lang/String;
+.method public final Fq()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;->bqV:Ljava/lang/String;
+    iget-object v2, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-virtual {v2}, Ljava/lang/String;->length()I
 
@@ -1530,12 +1530,12 @@
     return-object v0
 .end method
 
-.method public final Fo()Ljava/lang/String;
+.method public final Fr()Ljava/lang/String;
     .locals 4
 
     iget-object v0, p0, Lokhttp3/s;->url:Ljava/lang/String;
 
-    iget-object v1, p0, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1570,7 +1570,7 @@
     return-object v0
 .end method
 
-.method public final Fp()Ljava/util/List;
+.method public final Fs()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;->bqV:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -1640,12 +1640,12 @@
     return-object v3
 .end method
 
-.method public final Fq()Ljava/lang/String;
+.method public final Ft()Ljava/lang/String;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/s;->bqY:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/s;->bri:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -1685,7 +1685,7 @@
     return-object v0
 .end method
 
-.method public final Fr()Ljava/lang/String;
+.method public final Fu()Ljava/lang/String;
     .locals 8
 
     const-string v0, "/..."
@@ -1710,7 +1710,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->bra:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brk:Ljava/lang/String;
 
     const-string v2, ""
 
@@ -1724,9 +1724,9 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lokhttp3/s$a;->brb:Ljava/lang/String;
+    iput-object v1, v0, Lokhttp3/s$a;->brl:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lokhttp3/s$a;->Ft()Lokhttp3/s;
+    invoke-virtual {v0}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
 
     move-result-object v0
 
@@ -1748,7 +1748,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lokhttp3/s$a;->Ft()Lokhttp3/s;
+    invoke-virtual {p1}, Lokhttp3/s$a;->Fw()Lokhttp3/s;
 
     move-result-object p1
 
diff --git a/com.discord/smali/okhttp3/t$1.smali b/com.discord/smali/okhttp3/t$1.smali
index 9f08f57da3..bfb1785cbf 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;->bqb:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bql: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;->FY()Z
+    invoke-virtual {v0}, Lokhttp3/internal/b/c;->Gb()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p3}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {p3}, Lokhttp3/internal/b/g;->Gg()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;->brH:Lokhttp3/j;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->brR: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;->bum:Lokhttp3/internal/c/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
 
     if-nez p1, :cond_5
 
-    iget-object p1, p3, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bud: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;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p3, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -169,9 +169,9 @@
 
     move-result-object p2
 
-    iput-object v0, p3, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iput-object v0, p3, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget-object p3, v0, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iget-object p3, v0, Lokhttp3/internal/b/c;->bud: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;->bqb:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bql: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;->bqc:Lokhttp3/internal/b/d;
+    iget-object p1, p1, Lokhttp3/j;->bqm:Lokhttp3/internal/b/d;
 
     return-object p1
 .end method
@@ -274,9 +274,9 @@
 
     check-cast p1, Lokhttp3/v;
 
-    iget-object p1, p1, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object p1, p1, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
-    iget-object p1, p1, Lokhttp3/internal/c/j;->but:Lokhttp3/internal/b/g;
+    iget-object p1, p1, Lokhttp3/internal/c/j;->buD: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;->bqn:[Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/h;->bnH:Ljava/util/Comparator;
+    sget-object v0, Lokhttp3/h;->bnR:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p1, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object v2, p1, Lokhttp3/k;->bqx:[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;->bqo:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lokhttp3/internal/c;->aTJ:Ljava/util/Comparator;
+    sget-object v1, Lokhttp3/internal/c;->aTS:Ljava/util/Comparator;
 
     invoke-virtual {p2}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p1, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object v3, p1, Lokhttp3/k;->bqy:[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;->bnH:Ljava/util/Comparator;
+    sget-object v3, Lokhttp3/h;->bnR:Ljava/util/Comparator;
 
     const-string v4, "TLS_FALLBACK_SCSV"
 
@@ -431,24 +431,24 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokhttp3/k$a;->Fd()Lokhttp3/k;
+    invoke-virtual {p1}, Lokhttp3/k$a;->Fg()Lokhttp3/k;
 
     move-result-object p1
 
-    iget-object p3, p1, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p1, Lokhttp3/k;->bqo:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bqy:[Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
 
     :cond_3
-    iget-object p3, p1, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/k;->bqx:[Ljava/lang/String;
 
     if-eqz p3, :cond_4
 
-    iget-object p1, p1, Lokhttp3/k;->bqn:[Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/k;->bqx:[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;->btQ:Z
+    iget-boolean v0, p2, Lokhttp3/internal/b/c;->bua:Z
 
     if-nez v0, :cond_3
 
-    iget v0, p1, Lokhttp3/j;->bpY:I
+    iget v0, p1, Lokhttp3/j;->bqi:I
 
     if-nez v0, :cond_2
 
@@ -509,7 +509,7 @@
 
     :cond_3
     :goto_1
-    iget-object p1, p1, Lokhttp3/j;->bqb:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bql: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;->bqd:Z
+    iget-boolean v0, p1, Lokhttp3/j;->bqn:Z
 
     if-nez v0, :cond_2
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokhttp3/j;->bqd:Z
+    iput-boolean v0, p1, Lokhttp3/j;->bqn:Z
 
     sget-object v0, Lokhttp3/j;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v1, p1, Lokhttp3/j;->bqa:Ljava/lang/Runnable;
+    iget-object v1, p1, Lokhttp3/j;->bqk:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
     :cond_2
-    iget-object p1, p1, Lokhttp3/j;->bqb:Ljava/util/Deque;
+    iget-object p1, p1, Lokhttp3/j;->bql: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 2d476a1839..370bdc5883 100644
--- a/com.discord/smali/okhttp3/t$a.smali
+++ b/com.discord/smali/okhttp3/t$a.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field bnD:Lokhttp3/internal/i/c;
+.field bnN:Lokhttp3/internal/i/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bnb:Lokhttp3/o;
+.field bnl:Lokhttp3/o;
 
-.field bnc:Ljavax/net/SocketFactory;
+.field bnm:Ljavax/net/SocketFactory;
 
-.field bnd:Lokhttp3/b;
+.field bnn:Lokhttp3/b;
 
-.field bne:Ljava/util/List;
+.field bno:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field bnf:Ljava/util/List;
+.field bnp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,25 +46,25 @@
     .end annotation
 .end field
 
-.field bng:Ljava/net/ProxySelector;
+.field bnq:Ljava/net/ProxySelector;
 
-.field bnh:Ljava/net/Proxy;
+.field bnr:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bni:Ljavax/net/ssl/HostnameVerifier;
+.field bns:Ljavax/net/ssl/HostnameVerifier;
 
-.field bnj:Lokhttp3/g;
+.field bnt:Lokhttp3/g;
 
-.field bnl:Lokhttp3/internal/a/e;
+.field bnv:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field brB:Lokhttp3/n;
+.field brL:Lokhttp3/n;
 
-.field final brC:Ljava/util/List;
+.field final brM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -74,7 +74,7 @@
     .end annotation
 .end field
 
-.field final brD:Ljava/util/List;
+.field final brN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -84,32 +84,32 @@
     .end annotation
 .end field
 
-.field brE:Lokhttp3/p$a;
+.field brO:Lokhttp3/p$a;
 
-.field brF:Lokhttp3/c;
+.field brP:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field brG:Lokhttp3/b;
+.field brQ:Lokhttp3/b;
 
-.field brH:Lokhttp3/j;
+.field brR:Lokhttp3/j;
 
-.field brI:Z
+.field brS:Z
 
-.field public brJ:Z
+.field public brT:Z
 
-.field brK:Z
+.field brU:Z
 
-.field brL:I
+.field brV:I
 
-.field brM:I
+.field brW:I
 
-.field brN:I
+.field brX:I
 
-.field brO:I
+.field brY:I
 
-.field brP:I
+.field brZ:I
 
 .field cookieJar:Lokhttp3/m;
 
@@ -129,43 +129,43 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brC:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brD:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brN:Ljava/util/List;
 
     new-instance v0, Lokhttp3/n;
 
     invoke-direct {v0}, Lokhttp3/n;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brB:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->brL:Lokhttp3/n;
 
-    sget-object v0, Lokhttp3/t;->brz:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->brJ:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bne:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bno:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/t;->brA:Ljava/util/List;
+    sget-object v0, Lokhttp3/t;->brK:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnf:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bnp:Ljava/util/List;
 
-    sget-object v0, Lokhttp3/p;->bqH:Lokhttp3/p;
+    sget-object v0, Lokhttp3/p;->bqR:Lokhttp3/p;
 
     invoke-static {v0}, Lokhttp3/p;->a(Lokhttp3/p;)Lokhttp3/p$a;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->brE:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
 
     invoke-static {}, Ljava/net/ProxySelector;->getDefault()Ljava/net/ProxySelector;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t$a;->bng:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
 
-    iget-object v0, p0, Lokhttp3/t$a;->bng:Ljava/net/ProxySelector;
+    iget-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
 
     if-nez v0, :cond_0
 
@@ -173,10 +173,10 @@
 
     invoke-direct {v0}, Lokhttp3/internal/h/a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->bng:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
 
     :cond_0
-    sget-object v0, Lokhttp3/m;->bqz:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->bqJ: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;->bnc:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bnm:Ljavax/net/SocketFactory;
 
-    sget-object v0, Lokhttp3/internal/i/d;->bxt:Lokhttp3/internal/i/d;
+    sget-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v0, p0, Lokhttp3/t$a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    sget-object v0, Lokhttp3/g;->bnB:Lokhttp3/g;
+    sget-object v0, Lokhttp3/g;->bnL:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnj:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bnt:Lokhttp3/g;
 
-    sget-object v0, Lokhttp3/b;->bnk:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bnu:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnd:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bnn:Lokhttp3/b;
 
-    sget-object v0, Lokhttp3/b;->bnk:Lokhttp3/b;
+    sget-object v0, Lokhttp3/b;->bnu:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brG:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->brQ:Lokhttp3/b;
 
     new-instance v0, Lokhttp3/j;
 
     invoke-direct {v0}, Lokhttp3/j;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brH:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->brR:Lokhttp3/j;
 
-    sget-object v0, Lokhttp3/o;->bqG:Lokhttp3/o;
+    sget-object v0, Lokhttp3/o;->bqQ:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnb:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bnl:Lokhttp3/o;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brI:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brS:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brJ:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brT:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brK:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brU:Z
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/t$a;->brL:I
+    iput v0, p0, Lokhttp3/t$a;->brV:I
 
     const/16 v1, 0x2710
 
-    iput v1, p0, Lokhttp3/t$a;->brM:I
+    iput v1, p0, Lokhttp3/t$a;->brW:I
 
-    iput v1, p0, Lokhttp3/t$a;->brN:I
+    iput v1, p0, Lokhttp3/t$a;->brX:I
 
-    iput v1, p0, Lokhttp3/t$a;->brO:I
+    iput v1, p0, Lokhttp3/t$a;->brY:I
 
-    iput v0, p0, Lokhttp3/t$a;->brP:I
+    iput v0, p0, Lokhttp3/t$a;->brZ:I
 
     return-void
 .end method
@@ -246,136 +246,136 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brC:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/t$a;->brD:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->brN:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t;->brL:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brB:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t$a;->brL:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t;->bnh:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t;->bnr:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnh:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t$a;->bnr:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t;->bne:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bno:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bne:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bno:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t;->bnf:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t;->bnp:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnf:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t$a;->bnp:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/t$a;->brC:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->brC:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->brM:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/t$a;->brD:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->brN:Ljava/util/List;
 
-    iget-object v1, p1, Lokhttp3/t;->brD:Ljava/util/List;
+    iget-object v1, p1, Lokhttp3/t;->brN:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p1, Lokhttp3/t;->brE:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t;->brO:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brE:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
 
-    iget-object v0, p1, Lokhttp3/t;->bng:Ljava/net/ProxySelector;
+    iget-object v0, p1, Lokhttp3/t;->bnq:Ljava/net/ProxySelector;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bng:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
 
     iget-object v0, p1, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
     iput-object v0, p0, Lokhttp3/t$a;->cookieJar:Lokhttp3/m;
 
-    iget-object v0, p1, Lokhttp3/t;->bnl:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t;->bnv:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnl:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t$a;->bnv:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t;->brF:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t;->brP:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brF:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t$a;->brP:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t;->bnc:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t;->bnm:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnc:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t$a;->bnm: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;->bnD:Lokhttp3/internal/i/c;
+    iget-object v0, p1, Lokhttp3/t;->bnN:Lokhttp3/internal/i/c;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnD:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t$a;->bnN:Lokhttp3/internal/i/c;
 
-    iget-object v0, p1, Lokhttp3/t;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v0, p1, Lokhttp3/t;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v0, p0, Lokhttp3/t$a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t;->bnj:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t;->bnt:Lokhttp3/g;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnj:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t$a;->bnt:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t;->bnd:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->bnn:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnd:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->bnn:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->brG:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t;->brQ:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brG:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t$a;->brQ:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t;->brH:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t;->brR:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t$a;->brH:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t$a;->brR:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t;->bnb:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t;->bnl:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t$a;->bnb:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t$a;->bnl:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t;->brI:Z
+    iget-boolean v0, p1, Lokhttp3/t;->brS:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brI:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brS:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->brJ:Z
+    iget-boolean v0, p1, Lokhttp3/t;->brT:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brJ:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brT:Z
 
-    iget-boolean v0, p1, Lokhttp3/t;->brK:Z
+    iget-boolean v0, p1, Lokhttp3/t;->brU:Z
 
-    iput-boolean v0, p0, Lokhttp3/t$a;->brK:Z
+    iput-boolean v0, p0, Lokhttp3/t$a;->brU:Z
 
-    iget v0, p1, Lokhttp3/t;->brL:I
+    iget v0, p1, Lokhttp3/t;->brV:I
 
-    iput v0, p0, Lokhttp3/t$a;->brL:I
+    iput v0, p0, Lokhttp3/t$a;->brV:I
 
-    iget v0, p1, Lokhttp3/t;->brM:I
+    iget v0, p1, Lokhttp3/t;->brW:I
 
-    iput v0, p0, Lokhttp3/t$a;->brM:I
+    iput v0, p0, Lokhttp3/t$a;->brW:I
 
-    iget v0, p1, Lokhttp3/t;->brN:I
+    iget v0, p1, Lokhttp3/t;->brX:I
 
-    iput v0, p0, Lokhttp3/t$a;->brN:I
+    iput v0, p0, Lokhttp3/t$a;->brX:I
 
-    iget v0, p1, Lokhttp3/t;->brO:I
+    iget v0, p1, Lokhttp3/t;->brY:I
 
-    iput v0, p0, Lokhttp3/t$a;->brO:I
+    iput v0, p0, Lokhttp3/t$a;->brY:I
 
-    iget p1, p1, Lokhttp3/t;->brP:I
+    iget p1, p1, Lokhttp3/t;->brZ:I
 
-    iput p1, p0, Lokhttp3/t$a;->brP:I
+    iput p1, p0, Lokhttp3/t$a;->brZ:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FA()Lokhttp3/t;
+.method public final FD()Lokhttp3/t;
     .locals 1
 
     new-instance v0, Lokhttp3/t;
@@ -394,7 +394,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->brM:I
+    iput p1, p0, Lokhttp3/t$a;->brW:I
 
     return-object p0
 .end method
@@ -406,7 +406,7 @@
 
     iput-object p1, p0, Lokhttp3/t$a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -414,7 +414,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/t$a;->bnD:Lokhttp3/internal/i/c;
+    iput-object p1, p0, Lokhttp3/t$a;->bnN:Lokhttp3/internal/i/c;
 
     return-object p0
 
@@ -433,7 +433,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/t$a;->brC:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t$a;->brM:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -477,7 +477,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->brN:I
+    iput p1, p0, Lokhttp3/t$a;->brX:I
 
     return-object p0
 .end method
@@ -491,7 +491,7 @@
 
     move-result p1
 
-    iput p1, p0, Lokhttp3/t$a;->brO:I
+    iput p1, p0, Lokhttp3/t$a;->brY:I
 
     return-object p0
 .end method
diff --git a/com.discord/smali/okhttp3/t.smali b/com.discord/smali/okhttp3/t.smali
index 375eadad24..5bdb568975 100644
--- a/com.discord/smali/okhttp3/t.smali
+++ b/com.discord/smali/okhttp3/t.smali
@@ -16,21 +16,21 @@
 
 
 # static fields
-.field static final brA:Ljava/util/List;
+.field static final brJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lokhttp3/k;",
+            "Lokhttp3/u;",
             ">;"
         }
     .end annotation
 .end field
 
-.field static final brz:Ljava/util/List;
+.field static final brK:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lokhttp3/u;",
+            "Lokhttp3/k;",
             ">;"
         }
     .end annotation
@@ -38,15 +38,15 @@
 
 
 # instance fields
-.field final bnD:Lokhttp3/internal/i/c;
+.field final bnN:Lokhttp3/internal/i/c;
 
-.field public final bnb:Lokhttp3/o;
+.field public final bnl:Lokhttp3/o;
 
-.field public final bnc:Ljavax/net/SocketFactory;
+.field public final bnm:Ljavax/net/SocketFactory;
 
-.field public final bnd:Lokhttp3/b;
+.field public final bnn:Lokhttp3/b;
 
-.field public final bne:Ljava/util/List;
+.field public final bno:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field public final bnf:Ljava/util/List;
+.field public final bnp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -66,25 +66,25 @@
     .end annotation
 .end field
 
-.field public final bng:Ljava/net/ProxySelector;
+.field public final bnq:Ljava/net/ProxySelector;
 
-.field public final bnh:Ljava/net/Proxy;
+.field public final bnr:Ljava/net/Proxy;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bni:Ljavax/net/ssl/HostnameVerifier;
+.field public final bns:Ljavax/net/ssl/HostnameVerifier;
 
-.field public final bnj:Lokhttp3/g;
+.field public final bnt:Lokhttp3/g;
 
-.field final bnl:Lokhttp3/internal/a/e;
+.field final bnv:Lokhttp3/internal/a/e;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final brB:Lokhttp3/n;
+.field public final brL:Lokhttp3/n;
 
-.field final brC:Ljava/util/List;
+.field final brM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -94,7 +94,7 @@
     .end annotation
 .end field
 
-.field final brD:Ljava/util/List;
+.field final brN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -104,32 +104,32 @@
     .end annotation
 .end field
 
-.field final brE:Lokhttp3/p$a;
+.field final brO:Lokhttp3/p$a;
 
-.field final brF:Lokhttp3/c;
+.field final brP:Lokhttp3/c;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final brG:Lokhttp3/b;
+.field public final brQ:Lokhttp3/b;
 
-.field public final brH:Lokhttp3/j;
+.field public final brR:Lokhttp3/j;
 
-.field public final brI:Z
+.field public final brS:Z
 
-.field public final brJ:Z
+.field public final brT:Z
 
-.field public final brK:Z
+.field public final brU:Z
 
-.field final brL:I
+.field final brV:I
 
-.field final brM:I
+.field final brW:I
 
-.field final brN:I
+.field final brX:I
 
-.field final brO:I
+.field final brY:I
 
-.field public final brP:I
+.field public final brZ:I
 
 .field public final cookieJar:Lokhttp3/m;
 
@@ -144,13 +144,13 @@
 
     new-array v1, v0, [Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->brT:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bsd:Lokhttp3/u;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    sget-object v2, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bsb:Lokhttp3/u;
 
     const/4 v4, 0x1
 
@@ -160,15 +160,15 @@
 
     move-result-object v1
 
-    sput-object v1, Lokhttp3/t;->brz:Ljava/util/List;
+    sput-object v1, Lokhttp3/t;->brJ:Ljava/util/List;
 
     new-array v0, v0, [Lokhttp3/k;
 
-    sget-object v1, Lokhttp3/k;->bqi:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bqs:Lokhttp3/k;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/k;->bqk:Lokhttp3/k;
+    sget-object v1, Lokhttp3/k;->bqu:Lokhttp3/k;
 
     aput-object v1, v0, v4
 
@@ -176,13 +176,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/t;->brA:Ljava/util/List;
+    sput-object v0, Lokhttp3/t;->brK:Ljava/util/List;
 
     new-instance v0, Lokhttp3/t$1;
 
     invoke-direct {v0}, Lokhttp3/t$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sput-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
     return-void
 .end method
@@ -204,63 +204,63 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/t$a;->brB:Lokhttp3/n;
+    iget-object v0, p1, Lokhttp3/t$a;->brL:Lokhttp3/n;
 
-    iput-object v0, p0, Lokhttp3/t;->brB:Lokhttp3/n;
+    iput-object v0, p0, Lokhttp3/t;->brL:Lokhttp3/n;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnh:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/t$a;->bnr:Ljava/net/Proxy;
 
-    iput-object v0, p0, Lokhttp3/t;->bnh:Ljava/net/Proxy;
+    iput-object v0, p0, Lokhttp3/t;->bnr:Ljava/net/Proxy;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bne:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bno:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bne:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bno:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnf:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->bnp:Ljava/util/List;
 
-    iput-object v0, p0, Lokhttp3/t;->bnf:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->bnp:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brC:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->brM:Ljava/util/List;
 
     invoke-static {v0}, Lokhttp3/internal/c;->U(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->brC:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->brM:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brD:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/t$a;->brN:Ljava/util/List;
 
     invoke-static {v0}, Lokhttp3/internal/c;->U(Ljava/util/List;)Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->brD:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/t;->brN:Ljava/util/List;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brE:Lokhttp3/p$a;
+    iget-object v0, p1, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
 
-    iput-object v0, p0, Lokhttp3/t;->brE:Lokhttp3/p$a;
+    iput-object v0, p0, Lokhttp3/t;->brO:Lokhttp3/p$a;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bng:Ljava/net/ProxySelector;
+    iget-object v0, p1, Lokhttp3/t$a;->bnq:Ljava/net/ProxySelector;
 
-    iput-object v0, p0, Lokhttp3/t;->bng:Ljava/net/ProxySelector;
+    iput-object v0, p0, Lokhttp3/t;->bnq:Ljava/net/ProxySelector;
 
     iget-object v0, p1, Lokhttp3/t$a;->cookieJar:Lokhttp3/m;
 
     iput-object v0, p0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brF:Lokhttp3/c;
+    iget-object v0, p1, Lokhttp3/t$a;->brP:Lokhttp3/c;
 
-    iput-object v0, p0, Lokhttp3/t;->brF:Lokhttp3/c;
+    iput-object v0, p0, Lokhttp3/t;->brP:Lokhttp3/c;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnl:Lokhttp3/internal/a/e;
+    iget-object v0, p1, Lokhttp3/t$a;->bnv:Lokhttp3/internal/a/e;
 
-    iput-object v0, p0, Lokhttp3/t;->bnl:Lokhttp3/internal/a/e;
+    iput-object v0, p0, Lokhttp3/t;->bnv:Lokhttp3/internal/a/e;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnc:Ljavax/net/SocketFactory;
+    iget-object v0, p1, Lokhttp3/t$a;->bnm:Ljavax/net/SocketFactory;
 
-    iput-object v0, p0, Lokhttp3/t;->bnc:Ljavax/net/SocketFactory;
+    iput-object v0, p0, Lokhttp3/t;->bnm:Ljavax/net/SocketFactory;
 
-    iget-object v0, p0, Lokhttp3/t;->bnf:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/t;->bnp: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;->bql:Z
+    iget-boolean v2, v3, Lokhttp3/k;->bqv:Z
 
     if-eqz v2, :cond_0
 
@@ -305,7 +305,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lokhttp3/internal/c;->FR()Ljavax/net/ssl/X509TrustManager;
+    invoke-static {}, Lokhttp3/internal/c;->FU()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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v1
 
@@ -323,7 +323,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/t;->bnD:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t;->bnN: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;->bnD:Lokhttp3/internal/i/c;
+    iget-object v0, p1, Lokhttp3/t$a;->bnN:Lokhttp3/internal/i/c;
 
-    iput-object v0, p0, Lokhttp3/t;->bnD:Lokhttp3/internal/i/c;
+    iput-object v0, p0, Lokhttp3/t;->bnN: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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -351,15 +351,15 @@
     invoke-virtual {v0, v1}, Lokhttp3/internal/g/f;->c(Ljavax/net/ssl/SSLSocketFactory;)V
 
     :cond_5
-    iget-object v0, p1, Lokhttp3/t$a;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v0, p1, Lokhttp3/t$a;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iput-object v0, p0, Lokhttp3/t;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iput-object v0, p0, Lokhttp3/t;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnj:Lokhttp3/g;
+    iget-object v0, p1, Lokhttp3/t$a;->bnt:Lokhttp3/g;
 
-    iget-object v1, p0, Lokhttp3/t;->bnD:Lokhttp3/internal/i/c;
+    iget-object v1, p0, Lokhttp3/t;->bnN:Lokhttp3/internal/i/c;
 
-    iget-object v2, v0, Lokhttp3/g;->bnD:Lokhttp3/internal/i/c;
+    iget-object v2, v0, Lokhttp3/g;->bnN: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;->bnC:Ljava/util/Set;
+    iget-object v0, v0, Lokhttp3/g;->bnM: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;->bnj:Lokhttp3/g;
+    iput-object v0, p0, Lokhttp3/t;->bnt:Lokhttp3/g;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnd:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->bnn:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->bnd:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->bnn:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brG:Lokhttp3/b;
+    iget-object v0, p1, Lokhttp3/t$a;->brQ:Lokhttp3/b;
 
-    iput-object v0, p0, Lokhttp3/t;->brG:Lokhttp3/b;
+    iput-object v0, p0, Lokhttp3/t;->brQ:Lokhttp3/b;
 
-    iget-object v0, p1, Lokhttp3/t$a;->brH:Lokhttp3/j;
+    iget-object v0, p1, Lokhttp3/t$a;->brR:Lokhttp3/j;
 
-    iput-object v0, p0, Lokhttp3/t;->brH:Lokhttp3/j;
+    iput-object v0, p0, Lokhttp3/t;->brR:Lokhttp3/j;
 
-    iget-object v0, p1, Lokhttp3/t$a;->bnb:Lokhttp3/o;
+    iget-object v0, p1, Lokhttp3/t$a;->bnl:Lokhttp3/o;
 
-    iput-object v0, p0, Lokhttp3/t;->bnb:Lokhttp3/o;
+    iput-object v0, p0, Lokhttp3/t;->bnl:Lokhttp3/o;
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->brI:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->brS:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->brI:Z
+    iput-boolean v0, p0, Lokhttp3/t;->brS:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->brJ:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->brT:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->brJ:Z
+    iput-boolean v0, p0, Lokhttp3/t;->brT:Z
 
-    iget-boolean v0, p1, Lokhttp3/t$a;->brK:Z
+    iget-boolean v0, p1, Lokhttp3/t$a;->brU:Z
 
-    iput-boolean v0, p0, Lokhttp3/t;->brK:Z
+    iput-boolean v0, p0, Lokhttp3/t;->brU:Z
 
-    iget v0, p1, Lokhttp3/t$a;->brL:I
+    iget v0, p1, Lokhttp3/t$a;->brV:I
 
-    iput v0, p0, Lokhttp3/t;->brL:I
+    iput v0, p0, Lokhttp3/t;->brV:I
 
-    iget v0, p1, Lokhttp3/t$a;->brM:I
+    iget v0, p1, Lokhttp3/t$a;->brW:I
 
-    iput v0, p0, Lokhttp3/t;->brM:I
+    iput v0, p0, Lokhttp3/t;->brW:I
 
-    iget v0, p1, Lokhttp3/t$a;->brN:I
+    iget v0, p1, Lokhttp3/t$a;->brX:I
 
-    iput v0, p0, Lokhttp3/t;->brN:I
+    iput v0, p0, Lokhttp3/t;->brX:I
 
-    iget v0, p1, Lokhttp3/t$a;->brO:I
+    iget v0, p1, Lokhttp3/t$a;->brY:I
 
-    iput v0, p0, Lokhttp3/t;->brO:I
+    iput v0, p0, Lokhttp3/t;->brY:I
 
-    iget p1, p1, Lokhttp3/t$a;->brP:I
+    iget p1, p1, Lokhttp3/t$a;->brZ:I
 
-    iput p1, p0, Lokhttp3/t;->brP:I
+    iput p1, p0, Lokhttp3/t;->brZ:I
 
-    iget-object p1, p0, Lokhttp3/t;->brC:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->brM:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -439,7 +439,7 @@
 
     if-nez p1, :cond_8
 
-    iget-object p1, p0, Lokhttp3/t;->brD:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/t;->brN: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;->brD:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->brN: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;->brC:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/t;->brM: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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/internal/g/f;->GL()Ljavax/net/ssl/SSLContext;
+    invoke-virtual {v0}, Lokhttp3/internal/g/f;->GO()Ljavax/net/ssl/SSLContext;
 
     move-result-object v0
 
@@ -544,19 +544,19 @@
 
 
 # virtual methods
-.method final Fz()Lokhttp3/internal/a/e;
+.method final FC()Lokhttp3/internal/a/e;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/t;->brF:Lokhttp3/c;
+    iget-object v0, p0, Lokhttp3/t;->brP:Lokhttp3/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/c;->bnl:Lokhttp3/internal/a/e;
+    iget-object v0, v0, Lokhttp3/c;->bnv:Lokhttp3/internal/a/e;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/t;->bnl:Lokhttp3/internal/a/e;
+    iget-object v0, p0, Lokhttp3/t;->bnv: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;->brP:I
+    iget v0, p0, Lokhttp3/t;->brZ: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;->bqH:Lokhttp3/p;
+    sget-object p2, Lokhttp3/p;->bqR:Lokhttp3/p;
 
     if-eqz p2, :cond_6
 
@@ -594,15 +594,15 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lokhttp3/t$a;->brE:Lokhttp3/p$a;
+    iput-object p2, p1, Lokhttp3/t$a;->brO:Lokhttp3/p$a;
 
-    sget-object p2, Lokhttp3/internal/j/a;->bxu:Ljava/util/List;
+    sget-object p2, Lokhttp3/internal/j/a;->bxE: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;->brU:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bse: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;->brR:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bsb: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;->brU:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bse: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;->brQ:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bsa: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;->brS:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bsc: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;->bne:Ljava/util/List;
+    iput-object p2, p1, Lokhttp3/t$a;->bno:Ljava/util/List;
 
-    invoke-virtual {p1}, Lokhttp3/t$a;->FA()Lokhttp3/t;
+    invoke-virtual {p1}, Lokhttp3/t$a;->FD()Lokhttp3/t;
 
     move-result-object p1
 
-    iget-object p2, v6, Lokhttp3/internal/j/a;->bsb:Lokhttp3/w;
+    iget-object p2, v6, Lokhttp3/internal/j/a;->bsl:Lokhttp3/w;
 
-    invoke-virtual {p2}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {p2}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object p2
 
@@ -742,27 +742,27 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {p2}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object p2
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV: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;->btY:Lokhttp3/e;
+    iput-object p1, v6, Lokhttp3/internal/j/a;->bui:Lokhttp3/e;
 
-    iget-object p1, v6, Lokhttp3/internal/j/a;->btY:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/j/a;->bui:Lokhttp3/e;
 
     invoke-interface {p1}, Lokhttp3/e;->timeout()Lokio/s;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/s;->HC()Lokio/s;
+    invoke-virtual {p1}, Lokio/s;->HF()Lokio/s;
 
-    iget-object p1, v6, Lokhttp3/internal/j/a;->btY:Lokhttp3/e;
+    iget-object p1, v6, Lokhttp3/internal/j/a;->bui: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 a8c5ec25ac..dc1e8a4274 100644
--- a/com.discord/smali/okhttp3/v.smali
+++ b/com.discord/smali/okhttp3/v.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final brX:Lokhttp3/t;
+.field final bsh:Lokhttp3/t;
 
-.field final brY:Lokhttp3/internal/c/j;
+.field final bsi:Lokhttp3/internal/c/j;
 
-.field final brZ:Lokio/a;
+.field final bsj:Lokio/a;
 
-.field private bsa:Lokhttp3/p;
+.field private bsk:Lokhttp3/p;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field final bsb:Lokhttp3/w;
+.field final bsl:Lokhttp3/w;
 
-.field final bsc:Z
+.field final bsm:Z
 
-.field private bsd:Z
+.field private bsn:Z
 
 
 # direct methods
@@ -39,27 +39,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/v;->bsb:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
 
-    iput-boolean p3, p0, Lokhttp3/v;->bsc:Z
+    iput-boolean p3, p0, Lokhttp3/v;->bsm: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;->brY:Lokhttp3/internal/c/j;
+    iput-object p2, p0, Lokhttp3/v;->bsi: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;->brZ:Lokio/a;
+    iput-object p2, p0, Lokhttp3/v;->bsj:Lokio/a;
 
-    iget-object p2, p0, Lokhttp3/v;->brZ:Lokio/a;
+    iget-object p2, p0, Lokhttp3/v;->bsj:Lokio/a;
 
-    iget p1, p1, Lokhttp3/t;->brL:I
+    iget p1, p1, Lokhttp3/t;->brV:I
 
     int-to-long v0, p1
 
@@ -70,10 +70,10 @@
     return-void
 .end method
 
-.method private FB()V
+.method private FE()V
     .locals 2
 
-    invoke-static {}, Lokhttp3/internal/g/f;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v0
 
@@ -83,9 +83,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v1, p0, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
-    iput-object v0, v1, Lokhttp3/internal/c/j;->bug:Ljava/lang/Object;
+    iput-object v0, v1, Lokhttp3/internal/c/j;->buq: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;->brE:Lokhttp3/p$a;
+    iget-object p0, p0, Lokhttp3/t;->brO:Lokhttp3/p$a;
 
-    invoke-interface {p0}, Lokhttp3/p$a;->Fh()Lokhttp3/p;
+    invoke-interface {p0}, Lokhttp3/p$a;->Fk()Lokhttp3/p;
 
     move-result-object p0
 
-    iput-object p0, v0, Lokhttp3/v;->bsa:Lokhttp3/p;
+    iput-object p0, v0, Lokhttp3/v;->bsk: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;->bsa:Lokhttp3/p;
+    iget-object p0, p0, Lokhttp3/v;->bsk:Lokhttp3/p;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method final FC()Ljava/lang/String;
+.method final FF()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->bsb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->Fr()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Fu()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final FD()Lokhttp3/Response;
+.method final FG()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;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brC:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->brM:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v0, p0, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bsi: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;->brX:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bsh: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;->brX:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    invoke-virtual {v2}, Lokhttp3/t;->Fz()Lokhttp3/internal/a/e;
+    invoke-virtual {v2}, Lokhttp3/t;->FC()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;->brX:Lokhttp3/t;
+    iget-object v2, p0, Lokhttp3/v;->bsh: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;->bsc:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bsm:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brD:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/t;->brN: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;->bsc:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bsm: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;->bsb:Lokhttp3/w;
+    iget-object v6, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
 
-    iget-object v8, p0, Lokhttp3/v;->bsa:Lokhttp3/p;
+    iget-object v8, p0, Lokhttp3/v;->bsk:Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget v9, v0, Lokhttp3/t;->brM:I
+    iget v9, v0, Lokhttp3/t;->brW:I
 
-    iget-object v0, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget v10, v0, Lokhttp3/t;->brN:I
+    iget v10, v0, Lokhttp3/t;->brX:I
 
-    iget-object v0, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget v11, v0, Lokhttp3/t;->brO:I
+    iget v11, v0, Lokhttp3/t;->brY: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;->bsb:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/v;->bsl: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 Fa()Lokhttp3/Response;
+.method public final Fd()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;->bsd:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bsn:Z
 
     if-nez v0, :cond_1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->bsd:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bsn:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->FB()V
+    invoke-direct {p0}, Lokhttp3/v;->FE()V
 
-    iget-object v0, p0, Lokhttp3/v;->brZ:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bsj:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_1
-    iget-object v0, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
 
     invoke-virtual {v0, p0}, Lokhttp3/n;->a(Lokhttp3/v;)V
 
-    invoke-virtual {p0}, Lokhttp3/v;->FD()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/v;->FG()Lokhttp3/Response;
 
     move-result-object v0
     :try_end_1
@@ -289,9 +289,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brL: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;->brX:Lokhttp3/t;
+    iget-object v1, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brL: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;->bsd:Z
+    iget-boolean v0, p0, Lokhttp3/v;->bsn:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/v;->bsd:Z
+    iput-boolean v0, p0, Lokhttp3/v;->bsn:Z
 
     monitor-exit p0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    invoke-direct {p0}, Lokhttp3/v;->FB()V
+    invoke-direct {p0}, Lokhttp3/v;->FE()V
 
-    iget-object v0, p0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
 
     new-instance v1, Lokhttp3/v$a;
 
@@ -387,7 +387,7 @@
     monitor-enter v0
 
     :try_start_1
-    iget-object p1, v0, Lokhttp3/n;->bqD:Ljava/util/Deque;
+    iget-object p1, v0, Lokhttp3/n;->bqN: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;->Ff()Z
+    invoke-virtual {v0}, Lokhttp3/n;->Fi()Z
 
     return-void
 
@@ -438,9 +438,9 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/v;->brZ:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bsj:Lokio/a;
 
-    invoke-virtual {v0}, Lokio/a;->Ha()Z
+    invoke-virtual {v0}, Lokio/a;->Hd()Z
 
     move-result v0
 
@@ -466,7 +466,7 @@
 .method public final cancel()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bsi: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;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v1, p0, Lokhttp3/v;->bsb:Lokhttp3/w;
+    iget-object v1, p0, Lokhttp3/v;->bsl:Lokhttp3/w;
 
-    iget-boolean v2, p0, Lokhttp3/v;->bsc:Z
+    iget-boolean v2, p0, Lokhttp3/v;->bsm: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;->brY:Lokhttp3/internal/c/j;
+    iget-object v0, p0, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
-    iget-boolean v0, v0, Lokhttp3/internal/c/j;->bul:Z
+    iget-boolean v0, v0, Lokhttp3/internal/c/j;->buv:Z
 
     return v0
 .end method
@@ -507,7 +507,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v;->brZ:Lokio/a;
+    iget-object v0, p0, Lokhttp3/v;->bsj: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 5f957c2076..c88aebcb41 100644
--- a/com.discord/smali/okhttp3/w$a.smali
+++ b/com.discord/smali/okhttp3/w$a.smali
@@ -15,19 +15,19 @@
 
 
 # instance fields
-.field bna:Lokhttp3/s;
+.field bnk:Lokhttp3/s;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bry:Lokhttp3/RequestBody;
+.field brI:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field bsg:Ljava/lang/String;
+.field bsq:Ljava/lang/String;
 
-.field bsh:Ljava/util/Map;
+.field bsr:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field bsj:Lokhttp3/Headers$a;
+.field bst:Lokhttp3/Headers$a;
 
 
 # direct methods
@@ -52,17 +52,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsh:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bsr:Ljava/util/Map;
 
     const-string v0, "GET"
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsg:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/w$a;->bsq:Ljava/lang/String;
 
     new-instance v0, Lokhttp3/Headers$a;
 
     invoke-direct {v0}, Lokhttp3/Headers$a;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iput-object v0, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
     return-void
 .end method
@@ -76,21 +76,21 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsh:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bsr:Ljava/util/Map;
 
-    iget-object v0, p1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bna:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w$a;->bnk:Lokhttp3/s;
 
-    iget-object v0, p1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bsg:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/w$a;->bsq:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w$a;->bry:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w$a;->brI:Lokhttp3/RequestBody;
 
-    iget-object v0, p1, Lokhttp3/w;->bsh:Ljava/util/Map;
+    iget-object v0, p1, Lokhttp3/w;->bsr:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -107,30 +107,30 @@
     :cond_0
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    iget-object v1, p1, Lokhttp3/w;->bsh:Ljava/util/Map;
+    iget-object v1, p1, Lokhttp3/w;->bsr:Ljava/util/Map;
 
     invoke-direct {v0, v1}, Ljava/util/LinkedHashMap;-><init>(Ljava/util/Map;)V
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/w$a;->bsh:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/w$a;->bsr:Ljava/util/Map;
 
-    iget-object p1, p1, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Fi()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FK()Lokhttp3/w;
+.method public final FN()Lokhttp3/w;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/w$a;->bna:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w$a;->bnk:Lokhttp3/s;
 
     if-eqz v0, :cond_0
 
@@ -233,9 +233,9 @@
 
     :cond_3
     :goto_1
-    iput-object p1, p0, Lokhttp3/w$a;->bsg:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/w$a;->bsq:Ljava/lang/String;
 
-    iput-object p2, p0, Lokhttp3/w$a;->bry:Lokhttp3/RequestBody;
+    iput-object p2, p0, Lokhttp3/w$a;->brI:Lokhttp3/RequestBody;
 
     return-object p0
 
@@ -261,7 +261,7 @@
 .method public final ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->al(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -271,7 +271,7 @@
 .method public final ap(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/Headers$a;->aj(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
 
@@ -281,11 +281,11 @@
 .method public final b(Lokhttp3/Headers;)Lokhttp3/w$a;
     .locals 0
 
-    invoke-virtual {p1}, Lokhttp3/Headers;->Fi()Lokhttp3/Headers$a;
+    invoke-virtual {p1}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iput-object p1, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
     return-object p0
 .end method
@@ -295,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokhttp3/w$a;->bna:Lokhttp3/s;
+    iput-object p1, p0, Lokhttp3/w$a;->bnk:Lokhttp3/s;
 
     return-object p0
 
@@ -414,7 +414,7 @@
 .method public final dO(Ljava/lang/String;)Lokhttp3/w$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v0, p0, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers$a;->dC(Ljava/lang/String;)Lokhttp3/Headers$a;
 
diff --git a/com.discord/smali/okhttp3/w.smali b/com.discord/smali/okhttp3/w.smali
index 8f78b7e6bc..b3601be251 100644
--- a/com.discord/smali/okhttp3/w.smali
+++ b/com.discord/smali/okhttp3/w.smali
@@ -12,18 +12,18 @@
 
 
 # instance fields
-.field public final bna:Lokhttp3/s;
+.field public final bnk:Lokhttp3/s;
 
-.field public final brx:Lokhttp3/Headers;
+.field public final brH:Lokhttp3/Headers;
 
-.field public final bry:Lokhttp3/RequestBody;
+.field public final brI:Lokhttp3/RequestBody;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field public final bsg:Ljava/lang/String;
+.field public final bsq:Ljava/lang/String;
 
-.field final bsh:Ljava/util/Map;
+.field final bsr:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private volatile bsi:Lokhttp3/d;
+.field private volatile bss:Lokhttp3/d;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -47,56 +47,56 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lokhttp3/w$a;->bna:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w$a;->bnk:Lokhttp3/s;
 
-    iput-object v0, p0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iput-object v0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object v0, p1, Lokhttp3/w$a;->bsg:Ljava/lang/String;
+    iget-object v0, p1, Lokhttp3/w$a;->bsq:Ljava/lang/String;
 
-    iput-object v0, p0, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iput-object v0, p0, Lokhttp3/w;->bsq:Ljava/lang/String;
 
-    iget-object v0, p1, Lokhttp3/w$a;->bsj:Lokhttp3/Headers$a;
+    iget-object v0, p1, Lokhttp3/w$a;->bst:Lokhttp3/Headers$a;
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iput-object v0, p0, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
-    iget-object v0, p1, Lokhttp3/w$a;->bry:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w$a;->brI:Lokhttp3/RequestBody;
 
-    iput-object v0, p0, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iput-object v0, p0, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
-    iget-object p1, p1, Lokhttp3/w$a;->bsh:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/w$a;->bsr:Ljava/util/Map;
 
     invoke-static {p1}, Lokhttp3/internal/c;->p(Ljava/util/Map;)Ljava/util/Map;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/w;->bsh:Ljava/util/Map;
+    iput-object p1, p0, Lokhttp3/w;->bsr:Ljava/util/Map;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final FG()Lokhttp3/s;
+.method public final FJ()Lokhttp3/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     return-object v0
 .end method
 
-.method public final FH()Ljava/lang/String;
+.method public final FK()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final FI()Lokhttp3/w$a;
+.method public final FL()Lokhttp3/w$a;
     .locals 1
 
     new-instance v0, Lokhttp3/w$a;
@@ -106,23 +106,23 @@
     return-object v0
 .end method
 
-.method public final FJ()Lokhttp3/d;
+.method public final FM()Lokhttp3/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/w;->bsi:Lokhttp3/d;
+    iget-object v0, p0, Lokhttp3/w;->bss:Lokhttp3/d;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
     invoke-static {v0}, Lokhttp3/d;->a(Lokhttp3/Headers;)Lokhttp3/d;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/w;->bsi:Lokhttp3/d;
+    iput-object v0, p0, Lokhttp3/w;->bss:Lokhttp3/d;
 
     return-object v0
 .end method
@@ -132,7 +132,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v0, p0, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
     invoke-virtual {v0, p1}, Lokhttp3/Headers;->dA(Ljava/lang/String;)Ljava/lang/String;
 
@@ -150,7 +150,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -158,7 +158,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/w;->bnk: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;->bsh:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/w;->bsr: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 88fbbf52ca..fcd4d0c49a 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 bsA:J
+.field final synthetic bsK:J
 
-.field final synthetic bsB:Lokio/d;
+.field final synthetic bsL:Lokio/d;
 
-.field final synthetic bsk:Lokhttp3/MediaType;
+.field final synthetic bsu:Lokhttp3/MediaType;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/MediaType;JLokio/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/x$1;->bsk:Lokhttp3/MediaType;
+    iput-object p1, p0, Lokhttp3/x$1;->bsu:Lokhttp3/MediaType;
 
-    iput-wide p2, p0, Lokhttp3/x$1;->bsA:J
+    iput-wide p2, p0, Lokhttp3/x$1;->bsK:J
 
-    iput-object p4, p0, Lokhttp3/x$1;->bsB:Lokio/d;
+    iput-object p4, p0, Lokhttp3/x$1;->bsL:Lokio/d;
 
     invoke-direct {p0}, Lokhttp3/x;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final FN()Lokio/d;
+.method public final FQ()Lokio/d;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/x$1;->bsB:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$1;->bsL: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;->bsA:J
+    iget-wide v0, p0, Lokhttp3/x$1;->bsK:J
 
     return-wide v0
 .end method
@@ -60,7 +60,7 @@
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/x$1;->bsk:Lokhttp3/MediaType;
+    iget-object v0, p0, Lokhttp3/x$1;->bsu: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 6674c75653..829baca0b4 100644
--- a/com.discord/smali/okhttp3/x$a.smali
+++ b/com.discord/smali/okhttp3/x$a.smali
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field private final bqN:Ljava/nio/charset/Charset;
+.field private final bqX:Ljava/nio/charset/Charset;
 
-.field private bsC:Ljava/io/Reader;
+.field private bsM:Ljava/io/Reader;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private final lZ:Lokio/d;
+.field private final lY:Lokio/d;
 
 .field private w:Z
 
@@ -33,9 +33,9 @@
 
     invoke-direct {p0}, Ljava/io/Reader;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/x$a;->lZ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/x$a;->lY:Lokio/d;
 
-    iput-object p2, p0, Lokhttp3/x$a;->bqN:Ljava/nio/charset/Charset;
+    iput-object p2, p0, Lokhttp3/x$a;->bqX:Ljava/nio/charset/Charset;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 
     iput-boolean v0, p0, Lokhttp3/x$a;->w:Z
 
-    iget-object v0, p0, Lokhttp3/x$a;->bsC:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bsM:Ljava/io/Reader;
 
     if-eqz v0, :cond_0
 
@@ -63,7 +63,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/x$a;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->lY: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;->bsC:Ljava/io/Reader;
+    iget-object v0, p0, Lokhttp3/x$a;->bsM:Ljava/io/Reader;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/x$a;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/x$a;->lY:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/x$a;->bqN:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/x$a;->bqX: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;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/x$a;->lY:Lokio/d;
 
-    invoke-interface {v2}, Lokio/d;->Hg()Ljava/io/InputStream;
+    invoke-interface {v2}, Lokio/d;->Hj()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;->bsC:Ljava/io/Reader;
+    iput-object v1, p0, Lokhttp3/x$a;->bsM:Ljava/io/Reader;
 
     move-object v0, v1
 
diff --git a/com.discord/smali/okhttp3/x.smali b/com.discord/smali/okhttp3/x.smali
index e0e03eb203..7a9c406b87 100644
--- a/com.discord/smali/okhttp3/x.smali
+++ b/com.discord/smali/okhttp3/x.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public bsz:Ljava/io/Reader;
+.field public bsJ:Ljava/io/Reader;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
@@ -81,10 +81,10 @@
 
 
 # virtual methods
-.method public abstract FN()Lokio/d;
+.method public abstract FQ()Lokio/d;
 .end method
 
-.method public final FO()Ljava/lang/String;
+.method public final FR()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -92,12 +92,12 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v0
 
     :try_start_0
-    invoke-virtual {p0}, Lokhttp3/x;->FP()Ljava/nio/charset/Charset;
+    invoke-virtual {p0}, Lokhttp3/x;->FS()Ljava/nio/charset/Charset;
 
     move-result-object v1
 
@@ -123,7 +123,7 @@
     throw v1
 .end method
 
-.method public final FP()Ljava/nio/charset/Charset;
+.method public final FS()Ljava/nio/charset/Charset;
     .locals 2
 
     invoke-virtual {p0}, Lokhttp3/x;->contentType()Lokhttp3/MediaType;
@@ -132,7 +132,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     invoke-virtual {v0, v1}, Lokhttp3/MediaType;->b(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -141,7 +141,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v0, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     return-object v0
 .end method
@@ -149,7 +149,7 @@
 .method public close()V
     .locals 1
 
-    invoke-virtual {p0}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {p0}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v0
 
diff --git a/com.discord/smali/okhttp3/y.smali b/com.discord/smali/okhttp3/y.smali
index bff9523c97..895e7d6977 100644
--- a/com.discord/smali/okhttp3/y.smali
+++ b/com.discord/smali/okhttp3/y.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final bnh:Ljava/net/Proxy;
+.field public final bnr:Ljava/net/Proxy;
 
-.field public final bsD:Lokhttp3/a;
+.field public final bsN:Lokhttp3/a;
 
-.field public final bsE:Ljava/net/InetSocketAddress;
+.field public final bsO:Ljava/net/InetSocketAddress;
 
 
 # direct methods
@@ -23,11 +23,11 @@
 
     if-eqz p3, :cond_0
 
-    iput-object p1, p0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iput-object p2, p0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
-    iput-object p3, p0, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iput-object p3, p0, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
 
     return-void
 
@@ -61,16 +61,16 @@
 
 
 # virtual methods
-.method public final FQ()Z
+.method public final FT()Z
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->bsN:Lokhttp3/a;
 
     iget-object v0, v0, Lokhttp3/a;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v0, p0, Lokhttp3/y;->bnr: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;->bsD:Lokhttp3/a;
+    iget-object v0, p1, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v1, p0, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v1, p0, Lokhttp3/y;->bsN: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;->bnh:Ljava/net/Proxy;
+    iget-object v0, p1, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
-    iget-object v1, p0, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bnr: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;->bsE:Ljava/net/InetSocketAddress;
+    iget-object p1, p1, Lokhttp3/y;->bsO:Ljava/net/InetSocketAddress;
 
-    iget-object v0, p0, Lokhttp3/y;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v0, p0, Lokhttp3/y;->bsO: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;->bsD:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/y;->bsN: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;->bnh:Ljava/net/Proxy;
+    iget-object v1, p0, Lokhttp3/y;->bnr: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;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->bsO: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;->bsE:Ljava/net/InetSocketAddress;
+    iget-object v1, p0, Lokhttp3/y;->bsO: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 adacaf700b..cc735e06ed 100644
--- a/com.discord/smali/okio/BufferedSink.smali
+++ b/com.discord/smali/okio/BufferedSink.smali
@@ -16,10 +16,10 @@
     .end annotation
 .end method
 
-.method public abstract Hc()Lokio/c;
+.method public abstract Hf()Lokio/c;
 .end method
 
-.method public abstract He()Lokio/BufferedSink;
+.method public abstract Hh()Lokio/BufferedSink;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -27,7 +27,7 @@
     .end annotation
 .end method
 
-.method public abstract Hp()Lokio/BufferedSink;
+.method public abstract Hs()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 fa1da323f0..a714d98cde 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 byr:J
+.field private static final byB:J
 
-.field private static final bys:J
+.field private static final byC:J
 
-.field static byt:Lokio/a;
+.field static byD:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
 
 # instance fields
-.field private byu:Z
+.field private byE:Z
 
-.field private byv:Lokio/a;
+.field private byF:Lokio/a;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field private byw:J
+.field private byG:J
 
 
 # direct methods
@@ -45,17 +45,17 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->byr:J
+    sput-wide v0, Lokio/a;->byB:J
 
     sget-object v0, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
 
-    sget-wide v1, Lokio/a;->byr:J
+    sget-wide v1, Lokio/a;->byB:J
 
     invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/TimeUnit;->toNanos(J)J
 
     move-result-wide v0
 
-    sput-wide v0, Lokio/a;->bys:J
+    sput-wide v0, Lokio/a;->byC:J
 
     return-void
 .end method
@@ -68,7 +68,7 @@
     return-void
 .end method
 
-.method static Hb()Lokio/a;
+.method static He()Lokio/a;
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -81,9 +81,9 @@
 
     const-class v0, Lokio/a;
 
-    sget-object v1, Lokio/a;->byt:Lokio/a;
+    sget-object v1, Lokio/a;->byD:Lokio/a;
 
-    iget-object v1, v1, Lokio/a;->byv:Lokio/a;
+    iget-object v1, v1, Lokio/a;->byF:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -93,13 +93,13 @@
 
     move-result-wide v3
 
-    sget-wide v5, Lokio/a;->byr:J
+    sget-wide v5, Lokio/a;->byB:J
 
     invoke-virtual {v0, v5, v6}, Ljava/lang/Object;->wait(J)V
 
-    sget-object v0, Lokio/a;->byt:Lokio/a;
+    sget-object v0, Lokio/a;->byD:Lokio/a;
 
-    iget-object v0, v0, Lokio/a;->byv:Lokio/a;
+    iget-object v0, v0, Lokio/a;->byF:Lokio/a;
 
     if-nez v0, :cond_0
 
@@ -109,13 +109,13 @@
 
     sub-long/2addr v0, v3
 
-    sget-wide v3, Lokio/a;->bys:J
+    sget-wide v3, Lokio/a;->byC:J
 
     cmp-long v5, v0, v3
 
     if-ltz v5, :cond_0
 
-    sget-object v0, Lokio/a;->byt:Lokio/a;
+    sget-object v0, Lokio/a;->byD:Lokio/a;
 
     return-object v0
 
@@ -127,7 +127,7 @@
 
     move-result-wide v3
 
-    iget-wide v5, v1, Lokio/a;->byw:J
+    iget-wide v5, v1, Lokio/a;->byG:J
 
     sub-long/2addr v5, v3
 
@@ -152,13 +152,13 @@
     return-object v2
 
     :cond_2
-    sget-object v0, Lokio/a;->byt:Lokio/a;
+    sget-object v0, Lokio/a;->byD:Lokio/a;
 
-    iget-object v3, v1, Lokio/a;->byv:Lokio/a;
+    iget-object v3, v1, Lokio/a;->byF:Lokio/a;
 
-    iput-object v3, v0, Lokio/a;->byv:Lokio/a;
+    iput-object v3, v0, Lokio/a;->byF:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->byv:Lokio/a;
+    iput-object v2, v1, Lokio/a;->byF:Lokio/a;
 
     return-object v1
 .end method
@@ -171,7 +171,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->byt:Lokio/a;
+    sget-object v1, Lokio/a;->byD:Lokio/a;
 
     if-nez v1, :cond_0
 
@@ -179,7 +179,7 @@
 
     invoke-direct {v1}, Lokio/a;-><init>()V
 
-    sput-object v1, Lokio/a;->byt:Lokio/a;
+    sput-object v1, Lokio/a;->byD:Lokio/a;
 
     new-instance v1, Lokio/a$a;
 
@@ -200,7 +200,7 @@
 
     if-eqz p3, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->HB()J
+    invoke-virtual {p0}, Lokio/a;->HE()J
 
     move-result-wide v3
 
@@ -212,7 +212,7 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->byw:J
+    iput-wide p1, p0, Lokio/a;->byG:J
 
     goto :goto_0
 
@@ -223,34 +223,34 @@
 
     add-long/2addr p1, v1
 
-    iput-wide p1, p0, Lokio/a;->byw:J
+    iput-wide p1, p0, Lokio/a;->byG:J
 
     goto :goto_0
 
     :cond_2
     if-eqz p3, :cond_6
 
-    invoke-virtual {p0}, Lokio/a;->HB()J
+    invoke-virtual {p0}, Lokio/a;->HE()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/a;->byw:J
+    iput-wide p1, p0, Lokio/a;->byG:J
 
     :goto_0
-    iget-wide p1, p0, Lokio/a;->byw:J
+    iget-wide p1, p0, Lokio/a;->byG:J
 
     sub-long/2addr p1, v1
 
-    sget-object p3, Lokio/a;->byt:Lokio/a;
+    sget-object p3, Lokio/a;->byD:Lokio/a;
 
     :goto_1
-    iget-object v3, p3, Lokio/a;->byv:Lokio/a;
+    iget-object v3, p3, Lokio/a;->byF:Lokio/a;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p3, Lokio/a;->byv:Lokio/a;
+    iget-object v3, p3, Lokio/a;->byF:Lokio/a;
 
-    iget-wide v3, v3, Lokio/a;->byw:J
+    iget-wide v3, v3, Lokio/a;->byG:J
 
     sub-long/2addr v3, v1
 
@@ -261,19 +261,19 @@
     goto :goto_2
 
     :cond_3
-    iget-object p3, p3, Lokio/a;->byv:Lokio/a;
+    iget-object p3, p3, Lokio/a;->byF:Lokio/a;
 
     goto :goto_1
 
     :cond_4
     :goto_2
-    iget-object p1, p3, Lokio/a;->byv:Lokio/a;
+    iget-object p1, p3, Lokio/a;->byF:Lokio/a;
 
-    iput-object p1, p0, Lokio/a;->byv:Lokio/a;
+    iput-object p1, p0, Lokio/a;->byF:Lokio/a;
 
-    iput-object p0, p3, Lokio/a;->byv:Lokio/a;
+    iput-object p0, p3, Lokio/a;->byF:Lokio/a;
 
-    sget-object p0, Lokio/a;->byt:Lokio/a;
+    sget-object p0, Lokio/a;->byD:Lokio/a;
 
     if-ne p3, p0, :cond_5
 
@@ -322,22 +322,22 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/a;->byt:Lokio/a;
+    sget-object v1, Lokio/a;->byD:Lokio/a;
 
     :goto_0
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lokio/a;->byv:Lokio/a;
+    iget-object v2, v1, Lokio/a;->byF:Lokio/a;
 
     if-ne v2, p0, :cond_0
 
-    iget-object v2, p0, Lokio/a;->byv:Lokio/a;
+    iget-object v2, p0, Lokio/a;->byF:Lokio/a;
 
-    iput-object v2, v1, Lokio/a;->byv:Lokio/a;
+    iput-object v2, v1, Lokio/a;->byF:Lokio/a;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lokio/a;->byv:Lokio/a;
+    iput-object v1, p0, Lokio/a;->byF: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;->byv:Lokio/a;
+    iget-object v1, v1, Lokio/a;->byF:Lokio/a;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -378,16 +378,16 @@
 
 
 # virtual methods
-.method protected FE()V
+.method protected FH()V
     .locals 0
 
     return-void
 .end method
 
-.method public final Ha()Z
+.method public final Hd()Z
     .locals 2
 
-    iget-boolean v0, p0, Lokio/a;->byu:Z
+    iget-boolean v0, p0, Lokio/a;->byE:Z
 
     const/4 v1, 0x0
 
@@ -396,7 +396,7 @@
     return v1
 
     :cond_0
-    iput-boolean v1, p0, Lokio/a;->byu:Z
+    iput-boolean v1, p0, Lokio/a;->byE:Z
 
     invoke-static {p0}, Lokio/a;->a(Lokio/a;)Z
 
@@ -413,7 +413,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/a;->Ha()Z
+    invoke-virtual {p0}, Lokio/a;->Hd()Z
 
     move-result v0
 
@@ -461,15 +461,15 @@
 .method public final enter()V
     .locals 6
 
-    iget-boolean v0, p0, Lokio/a;->byu:Z
+    iget-boolean v0, p0, Lokio/a;->byE:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lokio/a;->Hz()J
+    invoke-virtual {p0}, Lokio/a;->HC()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lokio/a;->HA()Z
+    invoke-virtual {p0}, Lokio/a;->HD()Z
 
     move-result v2
 
@@ -486,7 +486,7 @@
     :cond_0
     const/4 v3, 0x1
 
-    iput-boolean v3, p0, Lokio/a;->byu:Z
+    iput-boolean v3, p0, Lokio/a;->byE: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;->Ha()Z
+    invoke-virtual {p0}, Lokio/a;->Hd()Z
 
     move-result v0
 
diff --git a/com.discord/smali/okio/c.smali b/com.discord/smali/okio/c.smali
index 1a1cebdef5..fedcf32f01 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 byC:[B
+.field private static final byM:[B
 
 
 # instance fields
-.field byD:Lokio/n;
+.field byN: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;->byC:[B
+    sput-object v0, Lokio/c;->byM:[B
 
     return-void
 
@@ -108,7 +108,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -167,11 +167,11 @@
 
     if-ne p1, p2, :cond_2
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byD:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byN: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;->byY:Lokio/n;
+    iget-object p1, v1, Lokio/n;->bzi:Lokio/n;
 
     iget-object v0, p1, Lokio/n;->data:[B
 
@@ -311,7 +311,7 @@
     return-object p1
 .end method
 
-.method public final Gp()Lokio/ByteString;
+.method public final Gs()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
@@ -325,25 +325,25 @@
     return-object v0
 .end method
 
-.method public final Hc()Lokio/c;
+.method public final Hf()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Hd()Lokio/c;
+.method public final Hg()Lokio/c;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final He()Lokio/BufferedSink;
+.method public final Hh()Lokio/BufferedSink;
     .locals 0
 
     return-object p0
 .end method
 
-.method public final Hf()Z
+.method public final Hi()Z
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -364,7 +364,7 @@
     return v0
 .end method
 
-.method public final Hg()Ljava/io/InputStream;
+.method public final Hj()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/c$2;
@@ -374,7 +374,7 @@
     return-object v0
 .end method
 
-.method public final Hh()J
+.method public final Hk()J
     .locals 5
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -388,9 +388,9 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->byZ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
 
     iget v3, v2, Lokio/n;->limit:I
 
@@ -416,7 +416,7 @@
     return-wide v0
 .end method
 
-.method public final Hi()S
+.method public final Hl()S
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readShort()S
@@ -430,7 +430,7 @@
     return v0
 .end method
 
-.method public final Hj()I
+.method public final Hm()I
     .locals 1
 
     invoke-virtual {p0}, Lokio/c;->readInt()I
@@ -444,7 +444,7 @@
     return v0
 .end method
 
-.method public final Hk()J
+.method public final Hn()J
     .locals 15
 
     iget-wide v0, p0, Lokio/c;->size:J
@@ -462,7 +462,7 @@
     const/4 v1, 0x0
 
     :cond_0
-    iget-object v6, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v6, p0, Lokio/c;->byN:Lokio/n;
 
     iget-object v7, v6, Lokio/n;->data:[B
 
@@ -560,7 +560,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v0}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object v0
 
@@ -608,11 +608,11 @@
     :goto_3
     if-ne v8, v9, :cond_7
 
-    invoke-virtual {v6}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v6}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v7
 
-    iput-object v7, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v7, p0, Lokio/c;->byN:Lokio/n;
 
     invoke-static {v6}, Lokio/o;->b(Lokio/n;)V
 
@@ -624,7 +624,7 @@
     :goto_4
     if-nez v0, :cond_8
 
-    iget-object v6, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v6, p0, Lokio/c;->byN:Lokio/n;
 
     if-nez v6, :cond_0
 
@@ -655,13 +655,13 @@
     goto :goto_5
 .end method
 
-.method public final Hl()Ljava/lang/String;
+.method public final Ho()Ljava/lang/String;
     .locals 3
 
     :try_start_0
     iget-wide v0, p0, Lokio/c;->size:J
 
-    sget-object v2, Lokio/t;->tx:Ljava/nio/charset/Charset;
+    sget-object v2, Lokio/t;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {p0, v0, v1, v2}, Lokio/c;->a(JLjava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -681,7 +681,7 @@
     throw v1
 .end method
 
-.method public final Hm()Ljava/lang/String;
+.method public final Hp()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -698,7 +698,7 @@
     return-object v0
 .end method
 
-.method public final Hn()J
+.method public final Hq()J
     .locals 6
 
     const/4 v1, 0x0
@@ -716,7 +716,7 @@
     return-wide v0
 .end method
 
-.method public final Ho()Lokio/c;
+.method public final Hr()Lokio/c;
     .locals 6
 
     new-instance v0, Lokio/c;
@@ -734,34 +734,34 @@
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
-    invoke-virtual {v1}, Lokio/n;->HG()Lokio/n;
+    invoke-virtual {v1}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, v0, Lokio/c;->byD:Lokio/n;
+    iput-object v1, v0, Lokio/c;->byN:Lokio/n;
 
-    iget-object v1, v0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, v0, Lokio/c;->byN:Lokio/n;
 
-    iput-object v1, v1, Lokio/n;->byZ:Lokio/n;
+    iput-object v1, v1, Lokio/n;->bzj:Lokio/n;
 
-    iput-object v1, v1, Lokio/n;->byY:Lokio/n;
+    iput-object v1, v1, Lokio/n;->bzi:Lokio/n;
 
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
     :goto_0
-    iget-object v1, v1, Lokio/n;->byY:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bzi:Lokio/n;
 
-    iget-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
 
     if-eq v1, v2, :cond_1
 
-    iget-object v2, v0, Lokio/c;->byD:Lokio/n;
+    iget-object v2, v0, Lokio/c;->byN:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->byZ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
 
-    invoke-virtual {v1}, Lokio/n;->HG()Lokio/n;
+    invoke-virtual {v1}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v3
 
@@ -777,7 +777,7 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic Hp()Lokio/BufferedSink;
+.method public final bridge synthetic Hs()Lokio/BufferedSink;
     .locals 0
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -804,7 +804,7 @@
     return v1
 
     :cond_0
-    iget-object p1, p1, Lokio/k;->byT:[Lokio/ByteString;
+    iget-object p1, p1, Lokio/k;->bzd:[Lokio/ByteString;
 
     aget-object p1, p1, v0
 
@@ -836,7 +836,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v2, v1, Lokio/c;->byD:Lokio/n;
+    iget-object v2, v1, Lokio/c;->byN:Lokio/n;
 
     const/4 v3, -0x2
 
@@ -847,7 +847,7 @@
     return v3
 
     :cond_0
-    sget-object v2, Lokio/ByteString;->byH:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->byR: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;->byU:[I
+    iget-object v0, v0, Lokio/k;->bze:[I
 
     const/4 v8, -0x1
 
@@ -930,7 +930,7 @@
     :goto_2
     if-ne v4, v11, :cond_6
 
-    iget-object v4, v5, Lokio/n;->byY:Lokio/n;
+    iget-object v4, v5, Lokio/n;->bzi: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;->byY:Lokio/n;
+    iget-object v4, v5, Lokio/n;->bzi:Lokio/n;
 
     iget v5, v4, Lokio/n;->pos:I
 
@@ -1081,7 +1081,7 @@
     return-wide v5
 
     :cond_1
-    iget-object v7, v0, Lokio/c;->byD:Lokio/n;
+    iget-object v7, v0, Lokio/c;->byN:Lokio/n;
 
     if-nez v7, :cond_2
 
@@ -1101,7 +1101,7 @@
 
     if-lez v1, :cond_4
 
-    iget-object v7, v7, Lokio/n;->byZ:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bzj:Lokio/n;
 
     iget v1, v7, Lokio/n;->limit:I
 
@@ -1133,7 +1133,7 @@
 
     if-gez v10, :cond_4
 
-    iget-object v7, v7, Lokio/n;->byY:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_2
 
@@ -1212,7 +1212,7 @@
 
     add-long/2addr v1, v8
 
-    iget-object v7, v7, Lokio/n;->byY:Lokio/n;
+    iget-object v7, v7, Lokio/n;->bzi:Lokio/n;
 
     move-wide v8, v1
 
@@ -1295,7 +1295,7 @@
 
     if-ltz v4, :cond_6
 
-    iget-object v4, v0, Lokio/c;->byD:Lokio/n;
+    iget-object v4, v0, Lokio/c;->byN:Lokio/n;
 
     const-wide/16 v5, -0x1
 
@@ -1317,7 +1317,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v4, v4, Lokio/n;->byZ:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzj:Lokio/n;
 
     iget v2, v4, Lokio/n;->limit:I
 
@@ -1349,7 +1349,7 @@
 
     if-gez v9, :cond_2
 
-    iget-object v4, v4, Lokio/n;->byY:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_1
 
@@ -1452,7 +1452,7 @@
 
     add-long v11, v7, v5
 
-    iget-object v4, v4, Lokio/n;->byY:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzi: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;->ma:Lokio/c;
+    iget-object v0, p1, Lokio/c$a;->lZ:Lokio/c;
 
     if-nez v0, :cond_0
 
-    iput-object p0, p1, Lokio/c$a;->ma:Lokio/c;
+    iput-object p0, p1, Lokio/c$a;->lZ:Lokio/c;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p1, Lokio/c$a;->byF:Z
+    iput-boolean v0, p1, Lokio/c$a;->byP:Z
 
     return-object p1
 
@@ -1673,7 +1673,7 @@
 
     iput-wide v2, p1, Lokio/c;->size:J
 
-    iget-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byN: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;->byY:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_0
 
@@ -1708,7 +1708,7 @@
 
     if-lez v3, :cond_3
 
-    invoke-virtual {v2}, Lokio/n;->HG()Lokio/n;
+    invoke-virtual {v2}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v3
 
@@ -1736,20 +1736,20 @@
 
     iput p2, v3, Lokio/n;->limit:I
 
-    iget-object p2, p1, Lokio/c;->byD:Lokio/n;
+    iget-object p2, p1, Lokio/c;->byN:Lokio/n;
 
     if-nez p2, :cond_2
 
-    iput-object v3, v3, Lokio/n;->byZ:Lokio/n;
+    iput-object v3, v3, Lokio/n;->bzj:Lokio/n;
 
-    iput-object v3, v3, Lokio/n;->byY:Lokio/n;
+    iput-object v3, v3, Lokio/n;->bzi:Lokio/n;
 
-    iput-object v3, p1, Lokio/c;->byD:Lokio/n;
+    iput-object v3, p1, Lokio/c;->byN:Lokio/n;
 
     goto :goto_2
 
     :cond_2
-    iget-object p2, p2, Lokio/n;->byZ:Lokio/n;
+    iget-object p2, p2, Lokio/n;->bzj: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;->byY:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
 
     move-wide p2, v0
 
@@ -1853,13 +1853,13 @@
 
     if-lez v2, :cond_2
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     if-eqz v0, :cond_1
 
     iget v0, v0, Lokio/n;->limit:I
 
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v1, Lokio/n;->pos:I
 
@@ -1883,7 +1883,7 @@
 
     sub-long/2addr p1, v4
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v2, v0, Lokio/n;->pos:I
 
@@ -1891,23 +1891,23 @@
 
     iput v2, v0, Lokio/n;->pos:I
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v0, v0, Lokio/n;->pos:I
 
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v1, Lokio/n;->limit:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v1, p0, Lokio/c;->byN:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
 
@@ -2193,7 +2193,7 @@
 
     add-int/lit8 v8, v8, -0x1
 
-    sget-object v9, Lokio/c;->byC:[B
+    sget-object v9, Lokio/c;->byM:[B
 
     aget-byte v9, v9, v10
 
@@ -2279,7 +2279,7 @@
     :goto_0
     if-lt v4, v5, :cond_1
 
-    sget-object v6, Lokio/c;->byC:[B
+    sget-object v6, Lokio/c;->byM:[B
 
     const-wide/16 v7, 0xf
 
@@ -2388,7 +2388,7 @@
 
     if-lez v4, :cond_1
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     :goto_0
     iget v1, v0, Lokio/n;->limit:I
@@ -2418,17 +2418,17 @@
     :cond_0
     sub-long/2addr p1, v1
 
-    iget-object v0, v0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_0
 
     :cond_1
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     :cond_2
-    iget-object v0, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzj:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -2486,7 +2486,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokio/t;->tx:Ljava/nio/charset/Charset;
+    sget-object v0, Lokio/t;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {p0, p1, p2, v0}, Lokio/c;->a(JLjava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -2619,11 +2619,11 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Gs()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hx()Ljava/lang/String;
 
     move-result-object p1
 
@@ -2714,7 +2714,7 @@
 
     if-ltz v2, :cond_b
 
-    iget-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
 
     const-wide/16 v3, -0x1
 
@@ -2736,7 +2736,7 @@
 
     if-lez v0, :cond_2
 
-    iget-object v2, v2, Lokio/n;->byZ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
 
     iget v0, v2, Lokio/n;->limit:I
 
@@ -2768,7 +2768,7 @@
 
     if-gez v7, :cond_2
 
-    iget-object v2, v2, Lokio/n;->byY:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_1
 
@@ -2854,14 +2854,14 @@
 
     add-long/2addr p2, v5
 
-    iget-object v2, v2, Lokio/n;->byY:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
 
     move-wide v5, p2
 
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p1}, Lokio/ByteString;->Hx()[B
+    invoke-virtual {p1}, Lokio/ByteString;->HA()[B
 
     move-result-object p1
 
@@ -2927,7 +2927,7 @@
 
     add-long/2addr p2, v5
 
-    iget-object v2, v2, Lokio/n;->byY:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
 
     move-wide v5, p2
 
@@ -3034,7 +3034,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokio/c;->Ho()Lokio/c;
+    invoke-virtual {p0}, Lokio/c;->Hr()Lokio/c;
 
     move-result-object v0
 
@@ -3343,26 +3343,26 @@
 
     if-gt p1, v0, :cond_3
 
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lokio/o;->HJ()Lokio/n;
+    invoke-static {}, Lokio/o;->HM()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byD:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byN:Lokio/n;
 
-    iget-object p1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object p1, p0, Lokio/c;->byN:Lokio/n;
 
-    iput-object p1, p1, Lokio/n;->byZ:Lokio/n;
+    iput-object p1, p1, Lokio/n;->bzj:Lokio/n;
 
-    iput-object p1, p1, Lokio/n;->byY:Lokio/n;
+    iput-object p1, p1, Lokio/n;->bzi:Lokio/n;
 
     return-object p1
 
     :cond_0
-    iget-object v1, v1, Lokio/n;->byZ:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bzj:Lokio/n;
 
     iget v2, v1, Lokio/n;->limit:I
 
@@ -3375,7 +3375,7 @@
     if-nez p1, :cond_2
 
     :cond_1
-    invoke-static {}, Lokio/o;->HJ()Lokio/n;
+    invoke-static {}, Lokio/o;->HM()Lokio/n;
 
     move-result-object p1
 
@@ -3496,9 +3496,9 @@
     return v0
 
     :cond_3
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
-    iget-object p1, p1, Lokio/c;->byD:Lokio/n;
+    iget-object p1, p1, Lokio/c;->byN: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;->byY:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bzi: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;->byY:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bzi: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;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -3641,9 +3641,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, v0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzi:Lokio/n;
 
-    iget-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p0, Lokio/c;->byN:Lokio/n;
 
     if-ne v0, v2, :cond_1
 
@@ -4239,7 +4239,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -4288,11 +4288,11 @@
 
     if-ne p1, v2, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byD:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byN: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;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     if-nez v0, :cond_0
 
@@ -4358,11 +4358,11 @@
 
     if-ne p1, p2, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/c;->byD:Lokio/n;
+    iput-object p1, p0, Lokio/c;->byN: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;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4403,11 +4403,11 @@
 
     if-ne v4, v2, :cond_0
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v2, p0, Lokio/c;->byN: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;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4603,11 +4603,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v2, p0, Lokio/c;->byN: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;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4805,11 +4805,11 @@
 
     if-ne v1, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v1, p0, Lokio/c;->byN: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;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     iget v1, v0, Lokio/n;->pos:I
 
@@ -4913,11 +4913,11 @@
 
     if-ne v7, v4, :cond_1
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v2
 
-    iput-object v2, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v2, p0, Lokio/c;->byN: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;->bzd:Lokio/s;
+    sget-object v0, Lokio/s;->bzn:Lokio/s;
 
     return-object v0
 .end method
@@ -4995,7 +4995,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v0, Lokio/ByteString;->byH:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->byR:Lokio/ByteString;
 
     goto :goto_0
 
@@ -5131,11 +5131,11 @@
 
     if-lez v2, :cond_a
 
-    iget-object v0, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
 
     iget v0, v0, Lokio/n;->limit:I
 
-    iget-object v1, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p1, Lokio/c;->byN:Lokio/n;
 
     iget v1, v1, Lokio/n;->pos:I
 
@@ -5149,11 +5149,11 @@
 
     if-gez v3, :cond_5
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzj:Lokio/n;
 
     goto :goto_1
 
@@ -5173,7 +5173,7 @@
 
     add-long/2addr v3, p2
 
-    iget-boolean v1, v0, Lokio/n;->bkc:Z
+    iget-boolean v1, v0, Lokio/n;->bkm:Z
 
     if-eqz v1, :cond_1
 
@@ -5195,7 +5195,7 @@
 
     if-gtz v1, :cond_2
 
-    iget-object v1, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p1, Lokio/c;->byN:Lokio/n;
 
     long-to-int v2, p2
 
@@ -5216,7 +5216,7 @@
     return-void
 
     :cond_2
-    iget-object v0, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
 
     long-to-int v1, p2
 
@@ -5234,14 +5234,14 @@
 
     if-lt v1, v3, :cond_3
 
-    invoke-virtual {v0}, Lokio/n;->HG()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HJ()Lokio/n;
 
     move-result-object v3
 
     goto :goto_3
 
     :cond_3
-    invoke-static {}, Lokio/o;->HJ()Lokio/n;
+    invoke-static {}, Lokio/o;->HM()Lokio/n;
 
     move-result-object v3
 
@@ -5266,11 +5266,11 @@
 
     iput v4, v0, Lokio/n;->pos:I
 
-    iget-object v0, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzj:Lokio/n;
 
     invoke-virtual {v0, v3}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
-    iput-object v3, p1, Lokio/c;->byD:Lokio/n;
+    iput-object v3, p1, Lokio/c;->byN:Lokio/n;
 
     goto :goto_4
 
@@ -5283,7 +5283,7 @@
 
     :cond_5
     :goto_4
-    iget-object v0, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
 
     iget v1, v0, Lokio/n;->limit:I
 
@@ -5293,38 +5293,38 @@
 
     int-to-long v3, v1
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->byD:Lokio/n;
+    iput-object v1, p1, Lokio/c;->byN:Lokio/n;
 
-    iget-object v1, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v1, p0, Lokio/c;->byN:Lokio/n;
 
     if-nez v1, :cond_6
 
-    iput-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iput-object v0, p0, Lokio/c;->byN:Lokio/n;
 
-    iget-object v0, p0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p0, Lokio/c;->byN:Lokio/n;
 
-    iput-object v0, v0, Lokio/n;->byZ:Lokio/n;
+    iput-object v0, v0, Lokio/n;->bzj:Lokio/n;
 
-    iput-object v0, v0, Lokio/n;->byY:Lokio/n;
+    iput-object v0, v0, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_6
 
     :cond_6
-    iget-object v1, v1, Lokio/n;->byZ:Lokio/n;
+    iget-object v1, v1, Lokio/n;->bzj:Lokio/n;
 
     invoke-virtual {v1, v0}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
     move-result-object v0
 
-    iget-object v1, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v1, v0, Lokio/n;->bzj:Lokio/n;
 
     if-eq v1, v0, :cond_9
 
-    iget-object v1, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v1, v0, Lokio/n;->bzj: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;->byZ:Lokio/n;
+    iget-object v5, v0, Lokio/n;->bzj:Lokio/n;
 
     iget v5, v5, Lokio/n;->limit:I
 
     rsub-int v5, v5, 0x2000
 
-    iget-object v6, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v6, v0, Lokio/n;->bzj:Lokio/n;
 
-    iget-boolean v6, v6, Lokio/n;->bkc:Z
+    iget-boolean v6, v6, Lokio/n;->bkm:Z
 
     if-eqz v6, :cond_7
 
     goto :goto_5
 
     :cond_7
-    iget-object v2, v0, Lokio/n;->byZ:Lokio/n;
+    iget-object v2, v0, Lokio/n;->bzj: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;->byZ:Lokio/n;
+    iget-object v2, v0, Lokio/n;->bzj:Lokio/n;
 
     invoke-virtual {v0, v2, v1}, Lokio/n;->a(Lokio/n;I)V
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()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 34d43d2ed6..90bc8e12ff 100644
--- a/com.discord/smali/okio/d.smali
+++ b/com.discord/smali/okio/d.smali
@@ -8,15 +8,15 @@
 
 
 # virtual methods
-.method public abstract Hc()Lokio/c;
+.method public abstract Hf()Lokio/c;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end method
 
-.method public abstract Hd()Lokio/c;
+.method public abstract Hg()Lokio/c;
 .end method
 
-.method public abstract Hf()Z
+.method public abstract Hi()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -24,10 +24,10 @@
     .end annotation
 .end method
 
-.method public abstract Hg()Ljava/io/InputStream;
+.method public abstract Hj()Ljava/io/InputStream;
 .end method
 
-.method public abstract Hi()S
+.method public abstract Hl()S
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -35,23 +35,7 @@
     .end annotation
 .end method
 
-.method public abstract Hj()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract Hk()J
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract Hm()Ljava/lang/String;
+.method public abstract Hm()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -67,6 +51,22 @@
     .end annotation
 .end method
 
+.method public abstract Hp()Ljava/lang/String;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract Hq()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
 .method public abstract a(Lokio/k;)I
     .annotation system Ldalvik/annotation/Throws;
         value = {
diff --git a/com.discord/smali/okio/j$3.smali b/com.discord/smali/okio/j$3.smali
index 040751cdbc..1983fda8b5 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 byS:Ljava/net/Socket;
+.field final synthetic bzc:Ljava/net/Socket;
 
 
 # direct methods
 .method constructor <init>(Ljava/net/Socket;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$3;->byS:Ljava/net/Socket;
+    iput-object p1, p0, Lokio/j$3;->bzc:Ljava/net/Socket;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,13 +31,13 @@
 
 
 # virtual methods
-.method protected final FE()V
+.method protected final FH()V
     .locals 5
 
     const-string v0, "Failed to close timed out socket "
 
     :try_start_0
-    iget-object v1, p0, Lokio/j$3;->byS:Ljava/net/Socket;
+    iget-object v1, p0, Lokio/j$3;->bzc:Ljava/net/Socket;
 
     invoke-virtual {v1}, Ljava/net/Socket;->close()V
     :try_end_0
@@ -55,7 +55,7 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lokio/j;->HQ:Ljava/util/logging/Logger;
+    sget-object v2, Lokio/j;->HZ:Ljava/util/logging/Logger;
 
     sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {v4, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokio/j$3;->byS:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->bzc:Ljava/net/Socket;
 
     invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -81,7 +81,7 @@
     :catch_1
     move-exception v1
 
-    sget-object v2, Lokio/j;->HQ:Ljava/util/logging/Logger;
+    sget-object v2, Lokio/j;->HZ:Ljava/util/logging/Logger;
 
     sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v4, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lokio/j$3;->byS:Ljava/net/Socket;
+    iget-object v0, p0, Lokio/j$3;->bzc: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 01154d5e79..114ef742f4 100644
--- a/com.discord/smali/okio/n.smali
+++ b/com.discord/smali/okio/n.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field bkc:Z
+.field bkm:Z
 
-.field byY:Lokio/n;
+.field bzi:Lokio/n;
 
-.field byZ:Lokio/n;
+.field bzj:Lokio/n;
 
 .field public final data:[B
 
@@ -37,7 +37,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/n;->bkc:Z
+    iput-boolean v0, p0, Lokio/n;->bkm:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     iput p3, p0, Lokio/n;->limit:I
 
-    iput-boolean p4, p0, Lokio/n;->bkc:Z
+    iput-boolean p4, p0, Lokio/n;->bkm:Z
 
     iput-boolean p5, p0, Lokio/n;->owner:Z
 
@@ -62,12 +62,12 @@
 
 
 # virtual methods
-.method final HG()Lokio/n;
+.method final HJ()Lokio/n;
     .locals 7
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/n;->bkc:Z
+    iput-boolean v0, p0, Lokio/n;->bkm:Z
 
     new-instance v0, Lokio/n;
 
@@ -88,7 +88,7 @@
     return-object v0
 .end method
 
-.method final HH()Lokio/n;
+.method final HK()Lokio/n;
     .locals 7
 
     new-instance v6, Lokio/n;
@@ -118,12 +118,12 @@
     return-object v6
 .end method
 
-.method public final HI()Lokio/n;
+.method public final HL()Lokio/n;
     .locals 4
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 
-    iget-object v0, p0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -135,19 +135,19 @@
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p0, Lokio/n;->byZ:Lokio/n;
+    iget-object v2, p0, Lokio/n;->bzj:Lokio/n;
 
-    iget-object v3, p0, Lokio/n;->byY:Lokio/n;
+    iget-object v3, p0, Lokio/n;->bzi:Lokio/n;
 
-    iput-object v3, v2, Lokio/n;->byY:Lokio/n;
+    iput-object v3, v2, Lokio/n;->bzi:Lokio/n;
 
-    iget-object v3, p0, Lokio/n;->byY:Lokio/n;
+    iget-object v3, p0, Lokio/n;->bzi:Lokio/n;
 
-    iput-object v2, v3, Lokio/n;->byZ:Lokio/n;
+    iput-object v2, v3, Lokio/n;->bzj:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->byY:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bzi:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->byZ:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bzj: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;->byZ:Lokio/n;
+    iput-object p0, p1, Lokio/n;->bzj:Lokio/n;
 
-    iget-object v0, p0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
 
-    iput-object v0, p1, Lokio/n;->byY:Lokio/n;
+    iput-object v0, p1, Lokio/n;->bzi:Lokio/n;
 
-    iget-object v0, p0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
 
-    iput-object p1, v0, Lokio/n;->byZ:Lokio/n;
+    iput-object p1, v0, Lokio/n;->bzj:Lokio/n;
 
-    iput-object p1, p0, Lokio/n;->byY:Lokio/n;
+    iput-object p1, p0, Lokio/n;->bzi:Lokio/n;
 
     return-object p1
 .end method
@@ -185,7 +185,7 @@
 
     if-le v1, v2, :cond_2
 
-    iget-boolean v1, p1, Lokio/n;->bkc:Z
+    iget-boolean v1, p1, Lokio/n;->bkm:Z
 
     if-nez v1, :cond_1
 
diff --git a/com.discord/smali/okio/o.smali b/com.discord/smali/okio/o.smali
index b193b86028..13d570645b 100644
--- a/com.discord/smali/okio/o.smali
+++ b/com.discord/smali/okio/o.smali
@@ -4,12 +4,12 @@
 
 
 # static fields
-.field static byY:Lokio/n;
+.field static bzi:Lokio/n;
     .annotation runtime Ljavax/annotation/Nullable;
     .end annotation
 .end field
 
-.field static bza:J
+.field static bzk:J
 
 
 # direct methods
@@ -21,7 +21,7 @@
     return-void
 .end method
 
-.method static HJ()Lokio/n;
+.method static HM()Lokio/n;
     .locals 6
 
     const-class v0, Lokio/o;
@@ -29,27 +29,27 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokio/o;->byY:Lokio/n;
+    sget-object v1, Lokio/o;->bzi:Lokio/n;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokio/o;->byY:Lokio/n;
+    sget-object v1, Lokio/o;->bzi:Lokio/n;
 
-    iget-object v2, v1, Lokio/n;->byY:Lokio/n;
+    iget-object v2, v1, Lokio/n;->bzi:Lokio/n;
 
-    sput-object v2, Lokio/o;->byY:Lokio/n;
+    sput-object v2, Lokio/o;->bzi:Lokio/n;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lokio/n;->byY:Lokio/n;
+    iput-object v2, v1, Lokio/n;->bzi:Lokio/n;
 
-    sget-wide v2, Lokio/o;->bza:J
+    sget-wide v2, Lokio/o;->bzk:J
 
     const-wide/16 v4, 0x2000
 
     sub-long/2addr v2, v4
 
-    sput-wide v2, Lokio/o;->bza:J
+    sput-wide v2, Lokio/o;->bzk:J
 
     monitor-exit v0
 
@@ -80,15 +80,15 @@
 .method static b(Lokio/n;)V
     .locals 8
 
-    iget-object v0, p0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzi:Lokio/n;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokio/n;->byZ:Lokio/n;
+    iget-object v0, p0, Lokio/n;->bzj:Lokio/n;
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/n;->bkc:Z
+    iget-boolean v0, p0, Lokio/n;->bkm:Z
 
     if-eqz v0, :cond_0
 
@@ -100,7 +100,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-wide v1, Lokio/o;->bza:J
+    sget-wide v1, Lokio/o;->bzk:J
 
     const-wide/16 v3, 0x2000
 
@@ -117,15 +117,15 @@
     return-void
 
     :cond_1
-    sget-wide v1, Lokio/o;->bza:J
+    sget-wide v1, Lokio/o;->bzk:J
 
     add-long/2addr v1, v3
 
-    sput-wide v1, Lokio/o;->bza:J
+    sput-wide v1, Lokio/o;->bzk:J
 
-    sget-object v1, Lokio/o;->byY:Lokio/n;
+    sget-object v1, Lokio/o;->bzi:Lokio/n;
 
-    iput-object v1, p0, Lokio/n;->byY:Lokio/n;
+    iput-object v1, p0, Lokio/n;->bzi:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -133,7 +133,7 @@
 
     iput v1, p0, Lokio/n;->pos:I
 
-    sput-object p0, Lokio/o;->byY:Lokio/n;
+    sput-object p0, Lokio/o;->bzi:Lokio/n;
 
     monitor-exit v0
 
diff --git a/com.discord/smali/okio/s.smali b/com.discord/smali/okio/s.smali
index 3575d86aa3..0cc6514099 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 bzd:Lokio/s;
+.field public static final bzn:Lokio/s;
 
 
 # instance fields
-.field private bze:Z
+.field private bzo:Z
 
-.field private bzf:J
+.field private bzp:J
 
-.field private bzg:J
+.field private bzq:J
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lokio/s$1;-><init>()V
 
-    sput-object v0, Lokio/s;->bzd:Lokio/s;
+    sput-object v0, Lokio/s;->bzn:Lokio/s;
 
     return-void
 .end method
@@ -38,22 +38,30 @@
 
 
 # virtual methods
-.method public HA()Z
+.method public HC()J
+    .locals 2
+
+    iget-wide v0, p0, Lokio/s;->bzq:J
+
+    return-wide v0
+.end method
+
+.method public HD()Z
     .locals 1
 
-    iget-boolean v0, p0, Lokio/s;->bze:Z
+    iget-boolean v0, p0, Lokio/s;->bzo:Z
 
     return v0
 .end method
 
-.method public HB()J
+.method public HE()J
     .locals 2
 
-    iget-boolean v0, p0, Lokio/s;->bze:Z
+    iget-boolean v0, p0, Lokio/s;->bzo:Z
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lokio/s;->bzf:J
+    iget-wide v0, p0, Lokio/s;->bzp:J
 
     return-wide v0
 
@@ -67,27 +75,27 @@
     throw v0
 .end method
 
-.method public HC()Lokio/s;
+.method public HF()Lokio/s;
     .locals 2
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokio/s;->bzg:J
+    iput-wide v0, p0, Lokio/s;->bzq:J
 
     return-object p0
 .end method
 
-.method public HD()Lokio/s;
+.method public HG()Lokio/s;
     .locals 1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokio/s;->bze:Z
+    iput-boolean v0, p0, Lokio/s;->bzo:Z
 
     return-object p0
 .end method
 
-.method public HE()V
+.method public HH()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -101,11 +109,11 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lokio/s;->bze:Z
+    iget-boolean v0, p0, Lokio/s;->bzo:Z
 
     if-eqz v0, :cond_1
 
-    iget-wide v0, p0, Lokio/s;->bzf:J
+    iget-wide v0, p0, Lokio/s;->bzp:J
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -150,22 +158,14 @@
     throw v0
 .end method
 
-.method public Hz()J
-    .locals 2
-
-    iget-wide v0, p0, Lokio/s;->bzg:J
-
-    return-wide v0
-.end method
-
 .method public aH(J)Lokio/s;
     .locals 1
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokio/s;->bze:Z
+    iput-boolean v0, p0, Lokio/s;->bzo:Z
 
-    iput-wide p1, p0, Lokio/s;->bzf:J
+    iput-wide p1, p0, Lokio/s;->bzp:J
 
     return-object p0
 .end method
@@ -185,7 +185,7 @@
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lokio/s;->bzg:J
+    iput-wide p1, p0, Lokio/s;->bzq:J
 
     return-object p0
 
diff --git a/com.discord/smali/rx/Observable.smali b/com.discord/smali/rx/Observable.smali
index 452ac7f302..2734deb6e9 100644
--- a/com.discord/smali/rx/Observable.smali
+++ b/com.discord/smali/rx/Observable.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final bGh:Lrx/Observable$a;
+.field final bGr: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;->bGh:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/Observable;->bGr:Lrx/Observable$a;
 
     return-void
 .end method
@@ -76,7 +76,7 @@
     return-object p0
 .end method
 
-.method public static IP()Lrx/Observable;
+.method public static IS()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -88,14 +88,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/e;->Jc()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->Jf()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static IQ()Lrx/Observable;
+.method public static IT()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -107,14 +107,14 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/internal/a/f;->Jc()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/f;->Jf()Lrx/Observable;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private IT()Lrx/Observable;
+.method private IW()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -289,7 +289,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object p1, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
     invoke-direct {p0, p1}, Lrx/Observable;->a(Lrx/functions/b;)Lrx/Observable;
 
@@ -1105,7 +1105,7 @@
 
     if-eqz p0, :cond_3
 
-    iget-object v0, p1, Lrx/Observable;->bGh:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->bGr:Lrx/Observable$a;
 
     if-eqz v0, :cond_2
 
@@ -1123,7 +1123,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p1, Lrx/Observable;->bGh:Lrx/Observable$a;
+    iget-object v0, p1, Lrx/Observable;->bGr:Lrx/Observable$a;
 
     invoke-static {p1, v0}, Lrx/c/c;->a(Lrx/Observable;Lrx/Observable$a;)Lrx/Observable$a;
 
@@ -1169,7 +1169,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :goto_0
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p0
 
@@ -1302,7 +1302,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    sget-object v0, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
     invoke-virtual {p0, v0}, Lrx/internal/util/k;->n(Lrx/functions/b;)Lrx/Observable;
 
@@ -1311,7 +1311,7 @@
     return-object p0
 
     :cond_0
-    invoke-static {}, Lrx/internal/a/ah;->Jm()Lrx/internal/a/ah;
+    invoke-static {}, Lrx/internal/a/ah;->Jp()Lrx/internal/a/ah;
 
     move-result-object v0
 
@@ -1493,7 +1493,7 @@
         }
     .end annotation
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     invoke-static {p0, p1, v0}, Lrx/internal/a/n;->a(Lrx/Observable;Lrx/functions/b;I)Lrx/Observable;
 
@@ -1515,7 +1515,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1581,7 +1581,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -1614,7 +1614,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/e;->Jc()Lrx/Observable;
+    invoke-static {}, Lrx/internal/a/e;->Jf()Lrx/Observable;
 
     move-result-object p0
 
@@ -1660,7 +1660,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -1691,7 +1691,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
     invoke-direct {p0, v0}, Lrx/Observable;->a(Lrx/functions/b;)Lrx/Observable;
 
@@ -1754,7 +1754,7 @@
 
 
 # virtual methods
-.method public final IO()Lrx/f;
+.method public final IR()Lrx/f;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1775,7 +1775,7 @@
     return-object v0
 .end method
 
-.method public final IR()Lrx/Observable;
+.method public final IU()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1798,7 +1798,7 @@
     return-object v0
 .end method
 
-.method public final IS()Lrx/Observable;
+.method public final IV()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1821,7 +1821,7 @@
     return-object v0
 .end method
 
-.method public final IU()Lrx/Observable;
+.method public final IX()Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1831,11 +1831,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lrx/Observable;->IT()Lrx/Observable;
+    invoke-direct {p0}, Lrx/Observable;->IW()Lrx/Observable;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
     invoke-direct {v0, v1}, Lrx/Observable;->d(Lrx/functions/b;)Lrx/Observable;
 
@@ -1923,7 +1923,7 @@
 
     new-instance v0, Lrx/internal/a/q;
 
-    iget-object v1, p0, Lrx/Observable;->bGh:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/Observable;->bGr:Lrx/Observable$a;
 
     invoke-direct {v0, v1, p1}, Lrx/internal/a/q;-><init>(Lrx/Observable$a;Lrx/Observable$b;)V
 
@@ -1969,7 +1969,7 @@
         }
     .end annotation
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {p0, p1, v0}, Lrx/Observable;->a(Lrx/Scheduler;I)Lrx/Observable;
 
@@ -2013,11 +2013,11 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v0
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2106,7 +2106,7 @@
     :try_start_0
     invoke-virtual {p1}, Lrx/Subscriber;->onStart()V
 
-    iget-object v0, p0, Lrx/Observable;->bGh:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->bGr:Lrx/Observable$a;
 
     invoke-static {p0, v0}, Lrx/c/c;->a(Lrx/Observable;Lrx/Observable$a;)Lrx/Observable$a;
 
@@ -2136,7 +2136,7 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p1
 
@@ -2194,7 +2194,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -2239,7 +2239,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/Observable;->bGh:Lrx/Observable$a;
+    iget-object v0, p0, Lrx/Observable;->bGr:Lrx/Observable$a;
 
     instance-of v0, v0, Lrx/internal/a/j;
 
@@ -2270,7 +2270,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
     invoke-direct {p1, v0}, Lrx/Observable;->d(Lrx/functions/b;)Lrx/Observable;
 
@@ -2317,9 +2317,9 @@
 
     if-eqz p1, :cond_0
 
-    sget-object v0, Lrx/internal/util/f;->bMO:Lrx/functions/Action1;
+    sget-object v0, Lrx/internal/util/f;->bMY:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v1
 
@@ -2484,7 +2484,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/au;->JE()Lrx/internal/a/au;
+    invoke-static {}, Lrx/internal/a/au;->JH()Lrx/internal/a/au;
 
     move-result-object v0
 
@@ -2508,7 +2508,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -2564,7 +2564,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2592,7 +2592,7 @@
 
     new-instance v0, Lrx/internal/a/z;
 
-    sget-object v1, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNs: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
 
@@ -2615,7 +2615,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2638,7 +2638,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
@@ -2661,7 +2661,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lrx/d/a;->Kt()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kw()Lrx/Scheduler;
 
     move-result-object v0
 
diff --git a/com.discord/smali/rx/internal/a/ae.smali b/com.discord/smali/rx/internal/a/ae.smali
index 4bf565647b..adcd61d7da 100644
--- a/com.discord/smali/rx/internal/a/ae.smali
+++ b/com.discord/smali/rx/internal/a/ae.smali
@@ -33,7 +33,7 @@
 
 
 # instance fields
-.field final bIF:Lrx/functions/Func2;
+.field final bIP:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field final bIk:Lrx/functions/b;
+.field final bIu:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lrx/internal/util/l$b;->bNi:Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
-    iput-object v0, p0, Lrx/internal/a/ae;->bIk:Lrx/functions/b;
+    iput-object v0, p0, Lrx/internal/a/ae;->bIu:Lrx/functions/b;
 
-    iput-object p1, p0, Lrx/internal/a/ae;->bIF:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ae;->bIP: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;->bIk:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ae;->bIu:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/ae;->bIF:Lrx/functions/Func2;
+    iput-object p0, p0, Lrx/internal/a/ae;->bIP:Lrx/functions/Func2;
 
     return-void
 .end method
 
-.method public static Jl()Lrx/internal/a/ae;
+.method public static Jo()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;->bIJ:Lrx/internal/a/ae;
+    sget-object v0, Lrx/internal/a/ae$a;->bIT:Lrx/internal/a/ae;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnVolumeChange$1.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
similarity index 99%
rename from com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
index 1dcc2b79a4..d73cf66a5c 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.smali
@@ -93,7 +93,7 @@
 
     invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
-    const p2, 0x7f0a07e2
+    const p2, 0x7f0a080e
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -101,7 +101,7 @@
 
     iput-object p2, p0, Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView;->userMutedCheck$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const p2, 0x7f0a07eb
+    const p2, 0x7f0a081a
 
     invoke-static {p0, p2}, Lkotterknife/b;->d(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -113,7 +113,7 @@
 
     check-cast p2, Landroid/view/ViewGroup;
 
-    const v0, 0x7f0d006c
+    const v0, 0x7f0d0070
 
     invoke-static {p1, v0, p2}, Landroid/widget/LinearLayout;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
index 5d0afccbb5..3597cd20dd 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$1.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
index 59cf74d94f..73e4d3c31b 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$bindSubscriptions$2.smali
@@ -75,7 +75,7 @@
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
new file mode 100644
index 0000000000..7f9c90a899
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.smali
@@ -0,0 +1,127 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureConnectionsSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$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/m;",
+        "Lkotlin/jvm/functions/Function3<",
+        "Ljava/lang/String;",
+        "Ljava/lang/Integer;",
+        "Ljava/lang/String;",
+        "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$configureConnectionsSection$onConnectedAccountClick$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    const/4 p1, 0x3
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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;
+    .locals 0
+
+    check-cast p1, Ljava/lang/String;
+
+    check-cast p2, Ljava/lang/Number;
+
+    invoke-virtual {p2}, Ljava/lang/Number;->intValue()I
+
+    move-result p2
+
+    check-cast p3, Ljava/lang/String;
+
+    invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1;->invoke(Ljava/lang/String;ILjava/lang/String;)V
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/String;ILjava/lang/String;)V
+    .locals 4
+
+    const-string v0, "username"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v1, Lcom/discord/dialogs/a;->xg:Lcom/discord/dialogs/a$a;
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-virtual {v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v1
+
+    const-string v2, "requireFragmentManager()"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v2, "fragmentManager"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    new-instance v0, Lcom/discord/dialogs/a;
+
+    invoke-direct {v0}, Lcom/discord/dialogs/a;-><init>()V
+
+    new-instance v2, Landroid/os/Bundle;
+
+    invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
+
+    const-string v3, "ARG_USERNAME"
+
+    invoke-virtual {v2, v3, p1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    const-string p1, "ARG_PLATFORM_IMAGE_RES"
+
+    invoke-virtual {v2, p1, p2}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V
+
+    const-string p1, "ARG_PROFILE_URL"
+
+    invoke-virtual {v2, p1, p3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-virtual {v0, v2}, Lcom/discord/dialogs/a;->setArguments(Landroid/os/Bundle;)V
+
+    const-class p1, Lcom/discord/dialogs/a;
+
+    invoke-virtual {p1}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v0, v1, p1}, Lcom/discord/dialogs/a;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
new file mode 100644
index 0000000000..e492cdeb62
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1.smali
@@ -0,0 +1,76 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureConnectionsSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$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/m;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $userId:J
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    iput-wide p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->$userId:J
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    check-cast v0, Landroidx/fragment/app/Fragment;
+
+    iget-wide v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;->$userId:J
+
+    const/16 v3, 0xfa2
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/widgets/user/WidgetUserMutualFriends;->show(Landroidx/fragment/app/Fragment;JI)V
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
new file mode 100644
index 0000000000..81ee5c0fad
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1.smali
@@ -0,0 +1,76 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureConnectionsSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$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/m;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $userId:J
+
+.field final synthetic this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+
+# direct methods
+.method constructor <init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    iput-wide p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->$userId:J
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 4
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    check-cast v0, Landroidx/fragment/app/Fragment;
+
+    iget-wide v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;->$userId:J
+
+    const/16 v3, 0xfa1
+
+    invoke-static {v0, v1, v2, v3}, Lcom/discord/widgets/user/WidgetUserMutualGuilds;->show(Landroidx/fragment/app/Fragment;JI)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureDeveloperSection$$inlined$apply$lambda$1.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$1.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureIncomingFriendRequest$2.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$1.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$2.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$3.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$4.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
index d2303cf86e..6785e73b3a 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1.smali
@@ -79,7 +79,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$1;->invoke(I)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
index 4ed2dc3a56..8708313a55 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$2;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
index 0e29f995ed..a2f2e5d771 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5$3;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
index 5cc074a945..91c8a5ab4b 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
@@ -96,12 +96,12 @@
 
     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
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/b;->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;->xg:Lcom/discord/dialogs/a;
+    sget-object p1, Lcom/discord/dialogs/b;->xi:Lcom/discord/dialogs/b;
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
@@ -135,7 +135,7 @@
 
     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
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/dialogs/b;->a(Landroidx/fragment/app/FragmentManager;Landroid/content/Context;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
 
     :goto_0
     return-void
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
new file mode 100644
index 0000000000..70f1374c1e
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
@@ -0,0 +1,74 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x18
+    name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Lkotlin/jvm/internal/m;",
+        "Lkotlin/jvm/functions/Function0<",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# instance fields
+.field final synthetic $activity$inlined:Lcom/discord/models/domain/ModelPresence$Activity;
+
+.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>(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$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-object p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$activity$inlined:Lcom/discord/models/domain/ModelPresence$Activity;
+
+    const/4 p1, 0x0
+
+    invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;-><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/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->invoke()V
+
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object v0
+.end method
+
+.method public final invoke()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    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$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
similarity index 84%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
index 39c1dfbd82..734927dd25 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
 .super Ljava/lang/Object;
 .source "WidgetUserSheet.kt"
 
@@ -33,15 +33,15 @@
 .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$1;->$this_apply:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
 
-    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$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$isMe$inlined:Z
+    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$isMe$inlined:Z
 
-    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    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$1;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+    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
 
@@ -55,7 +55,7 @@
 
     sget-object p1, Lcom/discord/widgets/settings/WidgetSettings;->Companion:Lcom/discord/widgets/settings/WidgetSettings$Companion;
 
-    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;->$this_apply:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
 
     invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
@@ -67,7 +67,7 @@
 
     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;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
similarity index 83%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
index 13d30947d6..7176e50149 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3.smali
@@ -1,4 +1,4 @@
-.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
 .super Ljava/lang/Object;
 .source "WidgetUserSheet.kt"
 
@@ -33,15 +33,15 @@
 .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;
+    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$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    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$2;->$isMe$inlined:Z
+    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$2;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    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$2;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+    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,19 +53,19 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 3
 
-    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$this_apply:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$this_apply:Landroid/widget/TextView;
 
     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$2;->$user$inlined:Lcom/discord/models/domain/ModelUser;
+    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}, Lcom/discord/models/domain/ModelUser;->getId()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->$model$inlined:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;
 
     check-cast v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
@@ -79,7 +79,7 @@
 
     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$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
     invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
index cdd6adc3b7..ed06ac13bd 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1.smali
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, v0, v1, p2, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1;->invoke(JLjava/lang/String;I)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
index 6ef64ab45a..ff5a13fc2a 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1.smali
@@ -45,7 +45,7 @@
 .method public final onClick(Landroid/view/View;)V
     .locals 7
 
-    sget-object p1, Lcom/discord/dialogs/a/a;->xM:Lcom/discord/dialogs/a/a$a;
+    sget-object p1, Lcom/discord/dialogs/a/a;->xO:Lcom/discord/dialogs/a/a$a;
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
index 0938ea962a..1b1cc926a3 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$10;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
new file mode 100644
index 0000000000..cedf5a7cc2
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11.smali
@@ -0,0 +1,66 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;
+.super Ljava/lang/Object;
+.source "WidgetUserSheet.kt"
+
+# interfaces
+.implements Landroid/view/View$OnFocusChangeListener;
+
+
+# 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
+
+
+# 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$11;->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 onFocusChange(Landroid/view/View;Z)V
+    .locals 0
+
+    if-nez p2, :cond_0
+
+    iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;->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
+
+    iget-object p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
+
+    invoke-static {p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->access$getNoteTextField$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/app/AppEditText;
+
+    move-result-object p2
+
+    invoke-virtual {p2}, Lcom/discord/app/AppEditText;->getText()Landroid/text/Editable;
+
+    move-result-object p2
+
+    invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-virtual {p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->updateUserNote(Ljava/lang/String;)V
+
+    :cond_0
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
index acca94b218..8043cc0155 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
index 1c5213f7bd..399c55c78c 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$3;->invoke(Landroid/widget/CompoundButton;Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
index 4f323b18c5..1ba07ecd35 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4.smali
@@ -64,7 +64,7 @@
 
     invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$4;->invoke(IZ)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
index f3aa2d66a9..e685280c45 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$5;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
index 22fd1996b2..778ad79b97 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$6;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
index ee2dd16c3c..ad38eaa5df 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$7;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
index b311658ee5..809f9bc40e 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$8;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
index a633e9dbcd..9d8466b5d5 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9.smali
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$9;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
similarity index 91%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index 3ddd9879dd..7425610772 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -26,6 +26,10 @@
 
 .field private static final REQUEST_CODE_MOVE_USER:I = 0xfa0
 
+.field private static final REQUEST_CODE_SELECT_MUTUAL_FRIEND:I = 0xfa2
+
+.field private static final REQUEST_CODE_SELECT_MUTUAL_GUILD:I = 0xfa1
+
 
 # instance fields
 .field private final actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -64,6 +68,8 @@
 
 .field private final moreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final noteTextField$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private privateCallLauncher:Lcom/discord/widgets/user/calls/PrivateCallLauncher;
@@ -80,6 +86,8 @@
 
 .field private final userProfileAdminView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
+.field private final userProfileConnectionsView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
 .field private final userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field private final userProfileVoiceSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -97,7 +105,7 @@
 
     const-class v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;
 
-    const/16 v1, 0x1b
+    const/16 v1, 0x1d
 
     new-array v1, v1, [Lkotlin/reflect/KProperty;
 
@@ -569,6 +577,50 @@
 
     move-result-object v3
 
+    const-string v4, "userProfileConnectionsView"
+
+    const-string v5, "getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x15
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
+    const-string v4, "noteTextField"
+
+    const-string v5, "getNoteTextField()Lcom/discord/app/AppEditText;"
+
+    invoke-direct {v2, v3, v4, v5}, Lkotlin/jvm/internal/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
+
+    move-result-object v2
+
+    check-cast v2, Lkotlin/reflect/KProperty;
+
+    const/16 v3, 0x16
+
+    aput-object v2, v1, v3
+
+    new-instance v2, Lkotlin/jvm/internal/x;
+
+    invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
+
+    move-result-object v3
+
     const-string v4, "actionsDivider"
 
     const-string v5, "getActionsDivider()Landroid/view/View;"
@@ -581,7 +633,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x15
+    const/16 v3, 0x17
 
     aput-object v2, v1, v3
 
@@ -603,7 +655,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x16
+    const/16 v3, 0x18
 
     aput-object v2, v1, v3
 
@@ -625,7 +677,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x17
+    const/16 v3, 0x19
 
     aput-object v2, v1, v3
 
@@ -647,7 +699,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x18
+    const/16 v3, 0x1a
 
     aput-object v2, v1, v3
 
@@ -669,7 +721,7 @@
 
     check-cast v2, Lkotlin/reflect/KProperty;
 
-    const/16 v3, 0x19
+    const/16 v3, 0x1b
 
     aput-object v2, v1, v3
 
@@ -691,7 +743,7 @@
 
     check-cast v0, Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x1a
+    const/16 v2, 0x1c
 
     aput-object v0, v1, v2
 
@@ -713,7 +765,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;-><init>()V
 
-    const v0, 0x7f0a07e1
+    const v0, 0x7f0a080d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -721,7 +773,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->moreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e7
+    const v0, 0x7f0a0816
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -729,7 +781,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileHeaderView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e6
+    const v0, 0x7f0a0815
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -737,7 +789,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e5
+    const v0, 0x7f0a0814
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -745,7 +797,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->profileActionsContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e0
+    const v0, 0x7f0a080c
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -753,7 +805,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->messageActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d3
+    const v0, 0x7f0a07fc
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -761,7 +813,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->callActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ea
+    const v0, 0x7f0a0819
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -769,7 +821,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->videoActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cf
+    const v0, 0x7f0a07f8
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -777,7 +829,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->addFriendActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e3
+    const v0, 0x7f0a0812
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -785,7 +837,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->pendingFriendRequestActionButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07de
+    const v0, 0x7f0a080a
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -793,7 +845,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07df
+    const v0, 0x7f0a080b
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -801,7 +853,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d9
+    const v0, 0x7f0a0805
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -809,7 +861,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->incomingFriendRequestContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d8
+    const v0, 0x7f0a0804
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -817,7 +869,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestIgnoreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d7
+    const v0, 0x7f0a0803
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -825,7 +877,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->friendRequestAcceptButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0568
+    const v0, 0x7f0a057d
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -833,7 +885,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->richPresenceContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07ce
+    const v0, 0x7f0a07f7
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -841,7 +893,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->activityDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e9
+    const v0, 0x7f0a0818
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -849,7 +901,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->rolesRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07da
+    const v0, 0x7f0a0806
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -857,7 +909,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07dc
+    const v0, 0x7f0a0808
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -865,7 +917,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->guildHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d1
+    const v0, 0x7f0a07fa
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -873,7 +925,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->audioSettingsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e8
+    const v0, 0x7f0a0817
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -881,7 +933,23 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileVoiceSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07cc
+    const v0, 0x7f0a07ff
+
+    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;->userProfileConnectionsView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a0811
+
+    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;->noteTextField$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    const v0, 0x7f0a07f5
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -889,7 +957,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->actionsDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07e4
+    const v0, 0x7f0a0813
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -897,7 +965,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->viewProfileButton$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d0
+    const v0, 0x7f0a07f9
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -905,7 +973,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileAdminView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d6
+    const v0, 0x7f0a0802
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -913,7 +981,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d5
+    const v0, 0x7f0a0801
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -921,7 +989,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a07d4
+    const v0, 0x7f0a0800
 
     invoke-static {p0, v0}, Lkotterknife/b;->a(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -977,6 +1045,16 @@
     return-void
 .end method
 
+.method public static final synthetic access$getNoteTextField$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/app/AppEditText;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNoteTextField()Lcom/discord/app/AppEditText;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
     .locals 1
 
@@ -1030,13 +1108,55 @@
     :cond_0
     const/4 v1, 0x0
 
-    const v2, 0x7f1206ba
+    const v2, 0x7f1206de
 
     invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
 
     return-void
 .end method
 
+.method private final configureConnectionsSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+    .locals 5
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getConnectionsViewState()Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    move-result-object v0
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1;
+
+    invoke-direct {v1, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast v1, Lkotlin/jvm/functions/Function3;
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
+
+    move-result-object p1
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+    move-result-wide v2
+
+    new-instance p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;
+
+    invoke-direct {p1, p0, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualGuildsItemClick$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+
+    check-cast p1, Lkotlin/jvm/functions/Function0;
+
+    new-instance v4, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;
+
+    invoke-direct {v4, p0, v2, v3}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onMutualFriendsItemClick$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;J)V
+
+    check-cast v4, Lkotlin/jvm/functions/Function0;
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+
+    move-result-object v2
+
+    invoke-virtual {v2, v0, v1, p1, v4}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;->updateViewState(Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function0;)V
+
+    return-void
+.end method
+
 .method private final configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
     .locals 5
 
@@ -1288,6 +1408,22 @@
     return-void
 .end method
 
+.method private final configureNote(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+    .locals 1
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNoteTextField()Lcom/discord/app/AppEditText;
+
+    move-result-object v0
+
+    invoke-virtual {p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUserNote()Ljava/lang/CharSequence;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/discord/app/AppEditText;->setText(Ljava/lang/CharSequence;)V
+
+    return-void
+.end method
+
 .method private final configureProfileActionButtons(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
     .locals 9
 
@@ -1505,7 +1641,7 @@
 .end method
 
 .method private final configureUI(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;)V
-    .locals 17
+    .locals 18
 
     move-object/from16 v6, p0
 
@@ -1611,21 +1747,35 @@
 
     invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
 
-    move-result-object v1
+    move-result-object v12
 
     invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getStreamContext()Lcom/discord/utilities/streams/StreamContext;
 
-    move-result-object v2
+    move-result-object v13
 
     invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe()Z
 
-    move-result v10
+    move-result v14
 
     invoke-virtual {v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUser()Lcom/discord/models/domain/ModelUser;
 
-    move-result-object v11
+    move-result-object v15
 
-    invoke-virtual {v0, v1, v2, v10, v11}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->configureUi(Lcom/discord/widgets/user/presence/ModelRichPresence;Lcom/discord/utilities/streams/StreamContext;ZLcom/discord/models/domain/ModelUser;)V
+    invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getAppPermissions()Lcom/discord/app/AppPermissions;
+
+    move-result-object v16
+
+    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+
+    invoke-direct {v1, v6, v5, 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 v17, v1
+
+    check-cast v17, Lkotlin/jvm/functions/Function0;
+
+    move-object v11, v0
+
+    invoke-virtual/range {v11 .. v17}, 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
 
@@ -1639,8 +1789,14 @@
 
     invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureIncomingFriendRequest(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
 
+    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+
     invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureGuildSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
 
+    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureConnectionsSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+
+    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureNote(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
+
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getViewProfileButton()Landroid/widget/TextView;
 
     move-result-object v10
@@ -1651,11 +1807,11 @@
 
     if-eqz v3, :cond_4
 
-    const v0, 0x7f121063
+    const v0, 0x7f1210ea
 
     invoke-virtual {v10, v0}, Landroid/widget/TextView;->setText(I)V
 
-    new-instance v13, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$1;
+    new-instance v13, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
 
     move-object v0, v13
 
@@ -1665,7 +1821,7 @@
 
     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/WidgetUserSheetViewModel$ViewState;)V
+    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;
 
@@ -1694,11 +1850,11 @@
     goto :goto_2
 
     :cond_4
-    const v0, 0x7f120ed6
+    const v0, 0x7f120f5d
 
     invoke-virtual {v10, v0}, Landroid/widget/TextView;->setText(I)V
 
-    new-instance v13, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$2;
+    new-instance v13, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$configureUI$$inlined$apply$lambda$3;
 
     move-object v0, v13
 
@@ -1708,7 +1864,7 @@
 
     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
+    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;
 
@@ -1735,8 +1891,6 @@
     invoke-static/range {v10 .. v16}, Lcom/discord/utilities/drawable/DrawableCompat;->setCompoundDrawablesCompat$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
 
     :goto_2
-    invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureVoiceSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
-
     invoke-direct {v6, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->configureDeveloperSection(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;)V
 
     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
@@ -1817,7 +1971,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x15
+    const/16 v2, 0x17
 
     aget-object v1, v1, v2
 
@@ -1917,7 +2071,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x1a
+    const/16 v2, 0x1c
 
     aget-object v1, v1, v2
 
@@ -1937,7 +2091,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x19
+    const/16 v2, 0x1b
 
     aget-object v1, v1, v2
 
@@ -1957,7 +2111,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x18
+    const/16 v2, 0x1a
 
     aget-object v1, v1, v2
 
@@ -2150,6 +2304,26 @@
     return-object v0
 .end method
 
+.method private final getNoteTextField()Lcom/discord/app/AppEditText;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->noteTextField$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x16
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/app/AppEditText;
+
+    return-object v0
+.end method
+
 .method private final getPendingFriendRequestActionButton()Landroid/widget/Button;
     .locals 3
 
@@ -2257,7 +2431,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x17
+    const/16 v2, 0x19
 
     aget-object v1, v1, v2
 
@@ -2270,6 +2444,26 @@
     return-object v0
 .end method
 
+.method private final getUserProfileConnectionsView()Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+    .locals 3
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->userProfileConnectionsView$delegate:Lkotlin/properties/ReadOnlyProperty;
+
+    sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+    const/16 v2, 0x15
+
+    aget-object v1, v1, v2
+
+    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/discord/widgets/user/profile/UserProfileConnectionsView;
+
+    return-object v0
+.end method
+
 .method private final getUserProfileHeaderView()Lcom/discord/widgets/user/profile/UserProfileHeaderView;
     .locals 3
 
@@ -2337,7 +2531,7 @@
 
     sget-object v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
 
-    const/16 v2, 0x16
+    const/16 v2, 0x18
 
     aget-object v1, v1, v2
 
@@ -2624,7 +2818,7 @@
     invoke-static {v1}, Lkotlin/jvm/internal/l;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
     :cond_0
-    const v1, 0x7f1206b3
+    const v1, 0x7f1206d7
 
     invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
 
@@ -2852,39 +3046,75 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d2
+    const v0, 0x7f0d01de
 
     return v0
 .end method
 
 .method public final onActivityResult(IILandroid/content/Intent;)V
-    .locals 7
+    .locals 8
 
     invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppBottomSheet;->onActivityResult(IILandroid/content/Intent;)V
 
-    sget-object v0, Lcom/discord/widgets/channels/WidgetChannelSelector;->Companion:Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;
+    const/4 v0, -0x1
+
+    packed-switch p1, :pswitch_data_0
+
+    goto :goto_1
+
+    :pswitch_0
+    if-eq p2, v0, :cond_0
+
+    goto :goto_1
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
+
+    goto :goto_1
+
+    :pswitch_1
+    if-eq p2, v0, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    invoke-virtual {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->dismiss()V
+
+    :goto_0
+    return-void
+
+    :pswitch_2
+    sget-object v1, Lcom/discord/widgets/channels/WidgetChannelSelector;->Companion:Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;
 
     new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1;
 
     invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onActivityResult$1;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
 
-    move-object v3, p2
+    move-object v4, p2
 
-    check-cast v3, Lkotlin/jvm/functions/Function3;
+    check-cast v4, Lkotlin/jvm/functions/Function3;
 
-    const/4 v4, 0x0
+    const/4 v5, 0x0
 
-    const/16 v5, 0x8
+    const/16 v6, 0x8
 
-    const/4 v6, 0x0
+    const/4 v7, 0x0
 
-    move v1, p1
+    move v2, p1
 
-    move-object v2, p3
+    move-object v3, p3
 
-    invoke-static/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->handleResult$default(Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;ILandroid/content/Intent;Lkotlin/jvm/functions/Function3;ZILjava/lang/Object;)V
+    invoke-static/range {v1 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->handleResult$default(Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;ILandroid/content/Intent;Lkotlin/jvm/functions/Function3;ZILjava/lang/Object;)V
 
+    :goto_1
     return-void
+
+    :pswitch_data_0
+    .packed-switch 0xfa0
+        :pswitch_2
+        :pswitch_1
+        :pswitch_0
+    .end packed-switch
 .end method
 
 .method public final onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
@@ -3191,7 +3421,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0402a7
+    const v1, 0x7f0402a8
 
     invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
 
@@ -3299,5 +3529,25 @@
 
     invoke-virtual {p1, p2}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->setOnServerMove(Lkotlin/jvm/functions/Function0;)V
 
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNoteTextField()Lcom/discord/app/AppEditText;
+
+    move-result-object p1
+
+    const/4 p2, 0x1
+
+    invoke-virtual {p1, p2}, Lcom/discord/app/AppEditText;->setOnBackClearFocus(Z)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->getNoteTextField()Lcom/discord/app/AppEditText;
+
+    move-result-object p1
+
+    new-instance p2, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;
+
+    invoke-direct {p2, p0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$11;-><init>(Lcom/discord/widgets/user/usersheet/WidgetUserSheet;)V
+
+    check-cast p2, Landroid/view/View$OnFocusChangeListener;
+
+    invoke-virtual {p1, p2}, Lcom/discord/app/AppEditText;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V
+
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
similarity index 98%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
index 407337cf47..0276197fb9 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1.smali
@@ -75,7 +75,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$1;->invoke(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Companion.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$DismissSheet.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchBanUser.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchEditMember.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchKickUser.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchMoveUser.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVideoCall.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$LaunchVoiceCall.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event$ShowToast.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$Event.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
similarity index 90%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
index 070c74e194..f37e3fbf83 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState.smali
@@ -77,13 +77,15 @@
 
 .field private final user:Lcom/discord/models/domain/ModelUser;
 
+.field private final userNote:Ljava/lang/String;
+
 .field private final userProfile:Lcom/discord/models/domain/ModelUserProfile;
 
 .field private final userRelationshipType:Ljava/lang/Integer;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;Ljava/lang/String;)V
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -117,6 +119,7 @@
             "Lcom/discord/utilities/streams/StreamContext;",
             "Lcom/discord/models/domain/ModelUserProfile;",
             "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ")V"
         }
     .end annotation
@@ -217,15 +220,19 @@
 
     iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
 
+    move-object/from16 v1, p16
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Ljava/lang/String;
+
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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 16
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    .locals 17
 
     move-object/from16 v0, p0
 
-    move/from16 v1, p16
+    move/from16 v1, p17
 
     and-int/lit8 v2, v1, 0x1
 
@@ -395,18 +402,34 @@
     move-object/from16 v15, p14
 
     :goto_d
-    and-int/lit16 v1, v1, 0x4000
+    move-object/from16 p14, v15
 
-    if-eqz v1, :cond_e
+    and-int/lit16 v15, v1, 0x4000
 
-    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+    if-eqz v15, :cond_e
+
+    iget-object v15, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
 
     goto :goto_e
 
     :cond_e
-    move-object/from16 v1, p15
+    move-object/from16 v15, p15
 
     :goto_e
+    const v16, 0x8000
+
+    and-int v1, v1, v16
+
+    if-eqz v1, :cond_f
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Ljava/lang/String;
+
+    goto :goto_f
+
+    :cond_f
+    move-object/from16 v1, p16
+
+    :goto_f
     move-object/from16 p1, v2
 
     move-object/from16 p2, v3
@@ -433,11 +456,11 @@
 
     move-object/from16 p13, v14
 
-    move-object/from16 p14, v15
+    move-object/from16 p15, v15
 
-    move-object/from16 p15, v1
+    move-object/from16 p16, v1
 
-    invoke-virtual/range {p0 .. p15}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;
+    invoke-virtual/range {p0 .. p16}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;Ljava/lang/String;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
 
     move-result-object v0
 
@@ -502,6 +525,14 @@
     return-object v0
 .end method
 
+.method public final component16()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public final component2()Lcom/discord/models/domain/ModelUser;
     .locals 1
 
@@ -602,8 +633,8 @@
     return v0
 .end method
 
-.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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 17
+.method public final copy(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;Ljava/lang/String;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    .locals 19
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -636,80 +667,101 @@
             "Lcom/discord/utilities/streams/StreamContext;",
             "Lcom/discord/models/domain/ModelUserProfile;",
             "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ")",
             "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;"
         }
     .end annotation
 
+    move-object/from16 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/from16 v8, p8
+
+    move/from16 v9, p9
+
+    move-object/from16 v10, p10
+
+    move-object/from16 v11, p11
+
+    move-object/from16 v12, p12
+
+    move-object/from16 v13, p13
+
+    move-object/from16 v14, p14
+
+    move-object/from16 v15, p15
+
+    move-object/from16 v16, p16
+
     const-string v0, "user"
 
-    move-object/from16 v2, p1
+    move-object/from16 v17, v1
 
-    invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "me"
 
-    move-object/from16 v3, p2
+    move-object/from16 v1, p2
 
-    invoke-static {v3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "channel"
 
-    move-object/from16 v4, p3
+    move-object/from16 v1, p3
 
-    invoke-static {v4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "computedMembers"
 
-    move-object/from16 v5, p4
+    move-object/from16 v1, p4
 
-    invoke-static {v5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "guildRoles"
 
-    move-object/from16 v6, p5
+    move-object/from16 v1, p5
 
-    invoke-static {v6, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "mySelectedVoiceChannelVoiceStates"
 
-    move-object/from16 v7, p6
+    move-object/from16 v1, p6
 
-    invoke-static {v7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "currentChannelVoiceStates"
 
-    move-object/from16 v8, p7
+    move-object/from16 v1, p7
 
-    invoke-static {v8, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "userProfile"
 
-    move-object/from16 v15, p14
+    move-object/from16 v1, p14
 
-    invoke-static {v15, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
+    new-instance v18, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;
 
-    move-object v1, v0
+    move-object/from16 v0, v18
 
-    move/from16 v9, p8
+    move-object/from16 v1, v17
 
-    move/from16 v10, p9
+    invoke-direct/range {v0 .. v16}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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;Ljava/lang/String;)V
 
-    move-object/from16 v11, p10
-
-    move-object/from16 v12, p11
-
-    move-object/from16 v13, p12
-
-    move-object/from16 v14, p13
-
-    move-object/from16 v16, p15
-
-    invoke-direct/range {v1 .. v16}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;-><init>(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;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
+    return-object v18
 .end method
 
 .method public final equals(Ljava/lang/Object;)Z
@@ -881,7 +933,17 @@
 
     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;
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userRelationshipType:Ljava/lang/Integer;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->userNote:Ljava/lang/String;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -1039,6 +1101,14 @@
     return-object v0
 .end method
 
+.method public final getUserNote()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public final getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
     .locals 1
 
@@ -1301,9 +1371,27 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
+
+    goto :goto_c
 
     :cond_d
+    const/4 v2, 0x0
+
+    :goto_c
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->userNote:Ljava/lang/String;
+
+    if-eqz v2, :cond_e
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :cond_e
     add-int/2addr v0, v1
 
     return v0
@@ -1434,6 +1522,14 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
+    const-string v1, ", userNote="
+
+    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;->userNote: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/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
similarity index 79%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
index 57e13e5c4a..23d35868c6 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded.smali
@@ -21,6 +21,8 @@
 
 .field private final channelVoiceState:Lcom/discord/models/domain/ModelVoice$State;
 
+.field private final connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
 .field private final guildName:Ljava/lang/String;
 
 .field private final guildSectionHeaderText:Ljava/lang/String;
@@ -45,14 +47,16 @@
 
 .field private final user:Lcom/discord/models/domain/ModelUser;
 
+.field private final userNote:Ljava/lang/CharSequence;
+
 .field private final userRelationshipType:I
 
 .field private final voiceSettingsViewState:Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;
 
 
 # direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)V
-    .locals 1
+.method public constructor <init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;)V
+    .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -70,69 +74,112 @@
             "Lcom/discord/models/domain/ModelChannel;",
             "Lcom/discord/utilities/streams/StreamContext;",
             "Ljava/lang/String;",
-            "I)V"
+            "I",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;",
+            "Ljava/lang/CharSequence;",
+            ")V"
         }
     .end annotation
 
-    const-string v0, "user"
+    move-object v0, p0
 
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object v1, p1
 
-    const-string v0, "voiceSettingsViewState"
+    move-object v2, p4
 
-    invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v3, p8
 
-    const-string v0, "roleItems"
+    move-object/from16 v4, p9
 
-    invoke-static {p8, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    move-object/from16 v5, p10
 
-    const-string v0, "adminViewState"
+    move-object/from16 v6, p14
 
-    invoke-static {p9, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v7, "user"
 
-    const-string v0, "channel"
+    invoke-static {p1, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {p10, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    const-string v7, "voiceSettingsViewState"
 
-    const/4 v0, 0x0
+    invoke-static {p4, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    const-string v7, "roleItems"
 
-    iput-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
+    invoke-static {v3, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-boolean p2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe:Z
+    const-string v7, "adminViewState"
 
-    iput-boolean p3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->showVoiceSettings:Z
+    invoke-static {v4, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p4, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->voiceSettingsViewState:Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;
+    const-string v7, "channel"
 
-    iput-object p5, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channelVoiceState:Lcom/discord/models/domain/ModelVoice$State;
+    invoke-static {v5, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p6, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+    const-string v7, "connectionsViewState"
 
-    iput-object p7, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->guildSectionHeaderText:Ljava/lang/String;
+    invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p8, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->roleItems:Ljava/util/List;
+    const/4 v7, 0x0
 
-    iput-object p9, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->adminViewState:Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
+    invoke-direct {p0, v7}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    iput-object p10, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channel:Lcom/discord/models/domain/ModelChannel;
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->user:Lcom/discord/models/domain/ModelUser;
 
-    iput-object p11, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+    move v1, p2
 
-    iput-object p12, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->guildName:Ljava/lang/String;
+    iput-boolean v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->isMe:Z
 
-    iput p13, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
+    move v1, p3
+
+    iput-boolean v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->showVoiceSettings:Z
+
+    iput-object v2, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->voiceSettingsViewState:Lcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;
+
+    move-object v1, p5
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channelVoiceState:Lcom/discord/models/domain/ModelVoice$State;
+
+    move-object v1, p6
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->richPresence:Lcom/discord/widgets/user/presence/ModelRichPresence;
+
+    move-object v1, p7
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->guildSectionHeaderText:Ljava/lang/String;
+
+    iput-object v3, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->roleItems:Ljava/util/List;
+
+    iput-object v4, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->adminViewState:Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;
+
+    iput-object v5, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->channel:Lcom/discord/models/domain/ModelChannel;
+
+    move-object/from16 v1, p11
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->streamContext:Lcom/discord/utilities/streams/StreamContext;
+
+    move-object/from16 v1, p12
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->guildName:Ljava/lang/String;
+
+    move/from16 v1, p13
+
+    iput v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
+
+    iput-object v6, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    move-object/from16 v1, p15
+
+    iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
 
     return-void
 .end method
 
-.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;IILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
-    .locals 14
+.method public static synthetic copy$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;ILjava/lang/Object;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+    .locals 16
 
-    move-object v0, p0
+    move-object/from16 v0, p0
 
-    move/from16 v1, p14
+    move/from16 v1, p16
 
     and-int/lit8 v2, v1, 0x1
 
@@ -143,7 +190,7 @@
     goto :goto_0
 
     :cond_0
-    move-object v2, p1
+    move-object/from16 v2, p1
 
     :goto_0
     and-int/lit8 v3, v1, 0x2
@@ -278,19 +325,43 @@
     move-object/from16 v13, p12
 
     :goto_b
-    and-int/lit16 v1, v1, 0x1000
+    and-int/lit16 v14, v1, 0x1000
 
-    if-eqz v1, :cond_c
+    if-eqz v14, :cond_c
 
-    iget v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
+    iget v14, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
 
     goto :goto_c
 
     :cond_c
-    move/from16 v1, p13
+    move/from16 v14, p13
 
     :goto_c
-    move-object p1, v2
+    and-int/lit16 v15, v1, 0x2000
+
+    if-eqz v15, :cond_d
+
+    iget-object v15, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    goto :goto_d
+
+    :cond_d
+    move-object/from16 v15, p14
+
+    :goto_d
+    and-int/lit16 v1, v1, 0x4000
+
+    if-eqz v1, :cond_e
+
+    iget-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    goto :goto_e
+
+    :cond_e
+    move-object/from16 v1, p15
+
+    :goto_e
+    move-object/from16 p1, v2
 
     move/from16 p2, v3
 
@@ -314,9 +385,13 @@
 
     move-object/from16 p12, v13
 
-    move/from16 p13, v1
+    move/from16 p13, v14
 
-    invoke-virtual/range {p0 .. p13}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->copy(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+    move-object/from16 p14, v15
+
+    move-object/from16 p15, v1
+
+    invoke-virtual/range {p0 .. p15}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->copy(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
     move-result-object v0
 
@@ -365,6 +440,22 @@
     return v0
 .end method
 
+.method public final component14()Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    return-object v0
+.end method
+
+.method public final component15()Ljava/lang/CharSequence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    return-object v0
+.end method
+
 .method public final component2()Z
     .locals 1
 
@@ -437,8 +528,8 @@
     return-object v0
 .end method
 
-.method public final copy(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
-    .locals 15
+.method public final copy(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;)Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+    .locals 17
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "(",
@@ -456,7 +547,10 @@
             "Lcom/discord/models/domain/ModelChannel;",
             "Lcom/discord/utilities/streams/StreamContext;",
             "Ljava/lang/String;",
-            "I)",
+            "I",
+            "Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;",
+            "Ljava/lang/CharSequence;",
+            ")",
             "Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;"
         }
     .end annotation
@@ -491,6 +585,12 @@
 
     invoke-static {v11, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
+    const-string v0, "connectionsViewState"
+
+    move-object/from16 v15, p14
+
+    invoke-static {v15, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
     new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
     move-object v1, v0
@@ -511,7 +611,9 @@
 
     move/from16 v14, p13
 
-    invoke-direct/range {v1 .. v14}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)V
+    move-object/from16 v16, p15
+
+    invoke-direct/range {v1 .. v16}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;)V
 
     return-object v0
 .end method
@@ -665,18 +767,38 @@
 
     iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
 
-    iget p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
+    iget v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
 
-    if-ne v1, p1, :cond_2
+    if-ne v1, v3, :cond_2
 
-    const/4 p1, 0x1
+    const/4 v1, 0x1
 
     goto :goto_2
 
     :cond_2
-    const/4 p1, 0x0
+    const/4 v1, 0x0
 
     :goto_2
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    iget-object v3, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    iget-object v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    iget-object p1, p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p1
+
     if-eqz p1, :cond_3
 
     goto :goto_3
@@ -713,6 +835,14 @@
     return-object v0
 .end method
 
+.method public final getConnectionsViewState()Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    return-object v0
+.end method
+
 .method public final getGuildName()Ljava/lang/String;
     .locals 1
 
@@ -796,6 +926,14 @@
     return-object v0
 .end method
 
+.method public final getUserNote()Ljava/lang/CharSequence;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    return-object v0
+.end method
+
 .method public final getUserRelationshipType()I
     .locals 1
 
@@ -1007,19 +1145,55 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
-    move-result v1
+    move-result v2
+
+    goto :goto_9
 
     :cond_b
-    add-int/2addr v0, v1
+    const/4 v2, 0x0
+
+    :goto_9
+    add-int/2addr v0, v2
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
+    iget v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userRelationshipType:I
 
-    invoke-static {v1}, L$r8$java8methods$utility$Integer$hashCode$II;->hashCode(I)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$ViewState$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    if-eqz v2, :cond_c
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    goto :goto_a
+
+    :cond_c
+    const/4 v2, 0x0
+
+    :goto_a
+    add-int/2addr v0, v2
+
+    mul-int/lit8 v0, v0, 0x1f
+
+    iget-object v2, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    if-eqz v2, :cond_d
+
+    invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
 
     move-result v1
 
+    :cond_d
     add-int/2addr v0, v1
 
     return v0
@@ -1142,6 +1316,22 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
+    const-string v1, ", connectionsViewState="
+
+    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$Loaded;->connectionsViewState:Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", userNote="
+
+    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$Loaded;->userNote:Ljava/lang/CharSequence;
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;)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$ViewState$Uninitialized.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Uninitialized.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
similarity index 100%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState.smali
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
index 8dc07141c1..ac8c1a15b3 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
index 3f4380e0e3..45e0ebce57 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
index 06f57d1435..3e5d5874dd 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
index eb58226954..30581e5eab 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
index d6428553ce..d7e17b1bae 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1.smali
@@ -63,7 +63,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
index a150329b47..00c9fa07b1 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
index caa493730c..5ed47982b6 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$kickUser$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
index 56682ef44b..ba674b2bb8 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
index 156ee5fe0c..5b356e12d1 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
index 972d54d217..9ee58f8500 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$1;->invoke(J)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
index 51a295aa61..69b22d924a 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
index ff2a6e7a3f..3bd9ab7058 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -63,7 +63,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f120bd7
+    const v0, 0x7f120c09
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
index a79cd97294..af8f83dfaf 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
similarity index 97%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
index a2f997c685..4761a71e19 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1.smali
@@ -57,7 +57,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$1;->invoke(Ljava/lang/Void;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
similarity index 96%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
index bc656b6afc..facf04e186 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
@@ -53,7 +53,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->invoke(Lcom/discord/utilities/error/Error;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
 
-    const v0, 0x7f1204df
+    const v0, 0x7f120504
 
     invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
new file mode 100644
index 0000000000..c3ad197c50
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.smali
@@ -0,0 +1,79 @@
+.class final Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;
+.super Lkotlin/jvm/internal/m;
+.source "WidgetUserSheetViewModel.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->updateUserNote(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/m;",
+        "Lkotlin/jvm/functions/Function1<",
+        "Lcom/discord/models/domain/ModelUser$Notes$Update;",
+        "Lkotlin/Unit;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 1
+
+    new-instance v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;
+
+    invoke-direct {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;-><init>()V
+
+    sput-object v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;
+
+    return-void
+.end method
+
+.method constructor <init>()V
+    .locals 1
+
+    const/4 v0, 0x1
+
+    invoke-direct {p0, v0}, Lkotlin/jvm/internal/m;-><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/ModelUser$Notes$Update;
+
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;->invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
+
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
+
+    return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/models/domain/ModelUser$Notes$Update;)V
+    .locals 1
+
+    const-string v0, "it"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
similarity index 91%
rename from com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
rename to com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
index 59d291d0a7..ffadef029e 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
@@ -149,7 +149,7 @@
 
     iput-object v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {}, Lrx/subjects/PublishSubject;->Kx()Lrx/subjects/PublishSubject;
+    invoke-static {}, Lrx/subjects/PublishSubject;->KA()Lrx/subjects/PublishSubject;
 
     move-result-object v1
 
@@ -161,7 +161,7 @@
 
     move-result-object v1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v2
 
@@ -529,6 +529,70 @@
     return-object v0
 .end method
 
+.method private final createConnectionsViewState(Lcom/discord/models/domain/ModelUserProfile;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+    .locals 4
+
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserProfile;->getConnectedAccounts()Ljava/util/List;
+
+    move-result-object p1
+
+    const-string v0, "userProfile.connectedAccounts"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast p1, Ljava/lang/Iterable;
+
+    new-instance v0, Ljava/util/ArrayList;
+
+    const/16 v1, 0xa
+
+    invoke-static {p1, v1}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
+
+    check-cast v0, Ljava/util/Collection;
+
+    invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+    move-result-object p1
+
+    :goto_0
+    invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/discord/models/domain/ModelConnectedAccount;
+
+    new-instance v2, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;
+
+    const-string v3, "connectedAccount"
+
+    invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-direct {v2, v1}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ConnectedAccountItem;-><init>(Lcom/discord/models/domain/ModelConnectedAccount;)V
+
+    invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+
+    goto :goto_0
+
+    :cond_0
+    check-cast v0, Ljava/util/List;
+
+    new-instance p1, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    invoke-direct {p1, v0}, Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;-><init>(Ljava/util/List;)V
+
+    return-object p1
+.end method
+
 .method private final createPrivateChannelWithUser(J)Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -966,7 +1030,15 @@
 
     move-result-object v0
 
-    new-instance v1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getUserProfile()Lcom/discord/models/domain/ModelUserProfile;
+
+    move-result-object v1
+
+    invoke-direct {v6, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->createConnectionsViewState(Lcom/discord/models/domain/ModelUserProfile;)Lcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;
+
+    move-result-object v1
+
+    new-instance v2, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
 
     invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getRichPresence()Lcom/discord/widgets/user/presence/ModelRichPresence;
 
@@ -980,9 +1052,9 @@
 
     invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
 
-    move-result-object v2
+    move-result-object v3
 
-    move-object/from16 v19, v2
+    move-object/from16 v19, v3
 
     goto :goto_8
 
@@ -990,7 +1062,15 @@
     move-object/from16 v19, v22
 
     :goto_8
-    move-object v7, v1
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$StoreState;->getUserNote()Ljava/lang/String;
+
+    move-result-object v3
+
+    move-object/from16 v22, v3
+
+    check-cast v22, Ljava/lang/CharSequence;
+
+    move-object v7, v2
 
     move-object v8, v15
 
@@ -1002,11 +1082,13 @@
 
     move/from16 v20, v23
 
-    invoke-direct/range {v7 .. v20}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;I)V
+    move-object/from16 v21, v1
+
+    invoke-direct/range {v7 .. v22}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;-><init>(Lcom/discord/models/domain/ModelUser;ZZLcom/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$ViewState;Lcom/discord/models/domain/ModelVoice$State;Lcom/discord/widgets/user/presence/ModelRichPresence;Ljava/lang/String;Ljava/util/List;Lcom/discord/widgets/user/profile/UserProfileAdminView$ViewState;Lcom/discord/models/domain/ModelChannel;Lcom/discord/utilities/streams/StreamContext;Ljava/lang/String;ILcom/discord/widgets/user/profile/UserProfileConnectionsView$ViewState;Ljava/lang/CharSequence;)V
 
     iget-object v0, v6, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->viewStateSubject:Lrx/subjects/BehaviorSubject;
 
-    invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+    invoke-virtual {v0, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
     return-void
 .end method
@@ -2186,3 +2268,94 @@
     :cond_2
     return-void
 .end method
+
+.method public final updateUserNote(Ljava/lang/String;)V
+    .locals 12
+
+    const-string v0, "noteText"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->getValue()Ljava/lang/Object;
+
+    move-result-object v0
+
+    instance-of v1, v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+
+    const/4 v2, 0x0
+
+    if-nez v1, :cond_0
+
+    move-object v0, v2
+
+    :cond_0
+    check-cast v0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;
+
+    if-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    invoke-virtual {v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$ViewState$Loaded;->getUserNote()Ljava/lang/CharSequence;
+
+    move-result-object v0
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    xor-int/2addr v0, v1
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->restAPI:Lcom/discord/utilities/rest/RestAPI;
+
+    iget-wide v3, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->userId:J
+
+    new-instance v5, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;
+
+    invoke-direct {v5, p1}, Lcom/discord/restapi/RestAPIParams$UserNoteUpdate;-><init>(Ljava/lang/String;)V
+
+    invoke-virtual {v0, v3, v4, v5}, Lcom/discord/utilities/rest/RestAPI;->updateUserNotes(JLcom/discord/restapi/RestAPIParams$UserNoteUpdate;)Lrx/Observable;
+
+    move-result-object p1
+
+    const/4 v0, 0x0
+
+    invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    const/4 v6, 0x0
+
+    sget-object p1, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;->INSTANCE:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1;
+
+    move-object v7, p1
+
+    check-cast v7, Lkotlin/jvm/functions/Function1;
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    const/16 v10, 0x35
+
+    const/4 v11, 0x0
+
+    const-string v5, "updateNote"
+
+    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
+
+    :cond_2
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
index 2cbeae3a3d..4b449832c9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
index 07526d0a58..f97bbe605e 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
index 72e04b83b8..8d4f604ca8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -65,7 +65,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f1206ba
+    const v0, 0x7f1206de
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
index 081edb2ca3..11ea22014c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetCallFailed.smali
@@ -145,7 +145,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppDialog;-><init>()V
 
-    const v0, 0x7f0a07fc
+    const v0, 0x7f0a082b
 
     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, 0x7f0a07fd
+    const v0, 0x7f0a082c
 
     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, 0x7f0a07fb
+    const v0, 0x7f0a082a
 
     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, 0x7f0a07fa
+    const v0, 0x7f0a0829
 
     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, 0x7f12036a
+    const v1, 0x7f12038f
 
     const/4 v2, 0x1
 
@@ -366,7 +366,7 @@
 
     move-result-object p1
 
-    sget-object p2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object p2, Lcom/discord/app/i;->vO: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, 0x7f0d007f
+    const v0, 0x7f0d0084
 
     return v0
 .end method
@@ -410,7 +410,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1210d9
+    const v0, 0x7f121160
 
     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, 0x7f120ce1
+    const v0, 0x7f120d13
 
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/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
index 0f5ebd0b7b..720fcc079b 100644
--- a/com.discord/smali_classes2/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
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/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
index 0aec107cbe..2d4349d64f 100644
--- a/com.discord/smali_classes2/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
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/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
index 9d54a9c0e4..610368b518 100644
--- a/com.discord/smali_classes2/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;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne p1, v0, :cond_0
 
diff --git a/com.discord/smali_classes2/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
index 30bfbcb413..4df63d5967 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/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
index 823bfb6ccd..f11aa98e9c 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/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
index e7a2feb173..65407f3588 100644
--- a/com.discord/smali_classes2/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,7 +50,7 @@
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6;->invoke()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/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
index 35a9e602ad..477df18fc4 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/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
index 7f2691f0df..a4c78efb84 100644
--- a/com.discord/smali_classes2/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
@@ -125,7 +125,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/Observable;->IS()Lrx/Observable;
+    invoke-virtual {v0}, Lrx/Observable;->IV()Lrx/Observable;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$Model$Companion.smali
index a873c76f2f..1faa474277 100644
--- a/com.discord/smali_classes2/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/l;->checkParameterIsNotNull(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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
@@ -138,7 +144,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/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
index c6d27f5107..883a45e70a 100644
--- a/com.discord/smali_classes2/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
@@ -195,7 +195,7 @@
     return-void
 
     :pswitch_data_0
-    .packed-switch 0x7f0a0466
+    .packed-switch 0x7f0a046e
         :pswitch_5
         :pswitch_4
         :pswitch_3
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
index 2a248d26f6..2af8b6eac6 100644
--- 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
@@ -53,7 +53,7 @@
 .method public final call(Landroid/view/Menu;)V
     .locals 9
 
-    const v0, 0x7f0a0469
+    const v0, 0x7f0a0471
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -155,7 +155,7 @@
 
     invoke-interface {v0, v1}, Landroid/view/MenuItem;->setIcon(Landroid/graphics/drawable/Drawable;)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0468
+    const v0, 0x7f0a0470
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -190,7 +190,7 @@
     :cond_2
     invoke-interface {v0, v4}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a046a
+    const v0, 0x7f0a0472
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -214,7 +214,7 @@
 
     invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0467
+    const v0, 0x7f0a046f
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -236,7 +236,7 @@
 
     invoke-interface {v0, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem;
 
-    const v0, 0x7f0a0466
+    const v0, 0x7f0a046e
 
     invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali
index 8145f69d71..1acad733da 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali
index 87294b8861..693d58d9a2 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$1.smali
index ae1231fd6a..969c3b9813 100644
--- a/com.discord/smali_classes2/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;->IQ()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IT()Lrx/Observable;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$configurePushToTalkSubscription$2.smali
index 97c635746b..a5ef195f32 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initUserTapListener$2.smali
index 433edd02e8..a3ea5b3b1b 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali
index 83aaf6cf14..70462820dd 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali
index 95d328c1db..da7d8e205d 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/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
index b0a616930d..45c8f748d0 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/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
index 711af082e2..93de7b6d8a 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/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
index d9817ac3f3..5f1f60d724 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali
index 308f87fa25..0b96cc30da 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali
index 4a9b95bfe2..358889781b 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali
index 8bd0794697..cd3c32263c 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali
index 125af8f37a..a365cc6961 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali
index 1e36d46b97..98a76d34b9 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
index d57cfe9476..06d7f951ee 100644
--- a/com.discord/smali_classes2/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, 0x7f0a0545
+    const v0, 0x7f0a0550
 
     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, 0x7f0a0541
+    const v0, 0x7f0a054c
 
     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, 0x7f0a0542
+    const v0, 0x7f0a054d
 
     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, 0x7f0a0539
+    const v0, 0x7f0a0544
 
     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, 0x7f0a053f
+    const v0, 0x7f0a054a
 
     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, 0x7f0a0544
+    const v0, 0x7f0a054f
 
     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, 0x7f0a053e
+    const v0, 0x7f0a0549
 
     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, 0x7f0a053d
+    const v0, 0x7f0a0548
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -506,7 +506,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/call/WidgetPrivateCall;->videoParticipantTapStream:Lrx/subjects/BehaviorSubject;
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {v0}, Lrx/subjects/BehaviorSubject;->bD(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
 
@@ -743,7 +743,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f0800e0
+    const v1, 0x7f0800e1
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setBackgroundResource(I)V
 
@@ -895,7 +895,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f12137a
+    const v0, 0x7f121406
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
@@ -1299,7 +1299,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     if-ne v2, v3, :cond_8
 
@@ -1746,7 +1746,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d015b
+    const v0, 0x7f0d0161
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
index 1385c42ec6..5f81dae231 100644
--- a/com.discord/smali_classes2/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, 0x7f0a053a
+    const p1, 0x7f0a0545
 
     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, 0x7f0a053b
+    const p1, 0x7f0a0546
 
     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, 0x7f0a053c
+    const p1, 0x7f0a0547
 
     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, 0x7f0d015c
+    const p3, 0x7f0d0162
 
     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, 0x7f0802f2
+    const v1, 0x7f0802fe
 
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f0802f7
+    const v1, 0x7f080303
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -377,12 +377,12 @@
 
     if-eqz v0, :cond_2
 
-    const v1, 0x7f0803c2
+    const v1, 0x7f0803cf
 
     goto :goto_2
 
     :cond_2
-    const v1, 0x7f0803c1
+    const v1, 0x7f0803ce
 
     :goto_2
     invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
index 9632662049..7ab10420c6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali
@@ -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_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
index 372fe54003..7996047b52 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali
@@ -70,7 +70,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
index 18863a1ddc..9888b56753 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index 5c3f43a744..f1d91480de 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -209,7 +209,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a03a3
+    const v0, 0x7f0a03ab
 
     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, 0x7f0a03a0
+    const v0, 0x7f0a03a8
 
     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, 0x7f0a03a1
+    const v0, 0x7f0a03a9
 
     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, 0x7f0a0399
+    const v0, 0x7f0a03a1
 
     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, 0x7f0a039b
+    const v0, 0x7f0a03a3
 
     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, 0x7f0a039d
+    const v0, 0x7f0a03a5
 
     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, 0x7f0a039c
+    const v0, 0x7f0a03a4
 
     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, 0x7f1209ca
+    const v8, 0x7f1209ff
 
     goto :goto_2
 
     :cond_5
-    const v8, 0x7f1209c5
+    const v8, 0x7f1209fa
 
     :goto_2
     invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -446,12 +446,12 @@
 
     if-eqz v8, :cond_6
 
-    const v8, 0x7f121355
+    const v8, 0x7f1213e1
 
     goto :goto_3
 
     :cond_6
-    const v8, 0x7f121369
+    const v8, 0x7f1213f5
 
     :goto_3
     invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -509,12 +509,12 @@
 
     if-eqz v0, :cond_8
 
-    const v0, 0x7f0803c2
+    const v0, 0x7f0803cf
 
     goto :goto_4
 
     :cond_8
-    const v0, 0x7f0802f7
+    const v0, 0x7f080303
 
     :goto_4
     invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -529,12 +529,12 @@
 
     if-eqz v0, :cond_9
 
-    const v0, 0x7f12042b
+    const v0, 0x7f120450
 
     goto :goto_5
 
     :cond_9
-    const v0, 0x7f12042c
+    const v0, 0x7f120451
 
     :goto_5
     invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->getString(I)Ljava/lang/String;
@@ -807,7 +807,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d5
+    const v0, 0x7f0d01e1
 
     return v0
 .end method
@@ -821,7 +821,7 @@
 
     check-cast p1, Landroidx/fragment/app/Fragment;
 
-    const v0, 0x7f06007f
+    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_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali
index a3208978f7..b5a5b235ff 100644
--- a/com.discord/smali_classes2/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, 0x7f0a0821
+    const p1, 0x7f0a0850
 
     invoke-static {p0, p1}, Lkotterknife/b;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali
index c8b8bc6ac8..582fada80d 100644
--- a/com.discord/smali_classes2/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, 0x7f0d010e
+    const p2, 0x7f0d0114
 
     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_classes2/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
index b624430c3e..a168ff8561 100644
--- a/com.discord/smali_classes2/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-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/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
index 9531a9e5f2..2866e60a98 100644
--- a/com.discord/smali_classes2/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
 
-    sget-object v0, Lrx/internal/a/ba$a;->bKN:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKX:Lrx/internal/a/ba;
 
     invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
index cbd40d58ad..54fa022ac1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali
@@ -152,7 +152,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
@@ -182,7 +182,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object v4
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
index f9ec286214..5998d816cd 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali
@@ -67,7 +67,7 @@
 
     invoke-virtual {p0, p1}, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2;->invoke(Z)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
index 92781c4b28..b5fb924af1 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
index 2f1e309f73..6d2e5434fc 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
@@ -280,7 +280,7 @@
 
     invoke-direct {p0}, Lcom/discord/app/AppFragment;-><init>()V
 
-    const v0, 0x7f0a080d
+    const v0, 0x7f0a083c
 
     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, 0x7f0a080e
+    const v0, 0x7f0a083d
 
     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, 0x7f0a080f
+    const v0, 0x7f0a083e
 
     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, 0x7f0a0812
+    const v0, 0x7f0a0841
 
     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, 0x7f0a0810
+    const v0, 0x7f0a083f
 
     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, 0x7f0a081f
+    const v0, 0x7f0a084e
 
     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, 0x7f0a081d
+    const v0, 0x7f0a084c
 
     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, 0x7f0a081e
+    const v0, 0x7f0a084d
 
     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, 0x7f0a0822
+    const v0, 0x7f0a0851
 
     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, 0x7f0a0823
+    const v0, 0x7f0a0852
 
     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, 0x7f120ce4
+    const v2, 0x7f120d16
 
     const/4 v3, 0x1
 
@@ -578,7 +578,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v3, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     const/4 v4, 0x1
 
@@ -606,7 +606,7 @@
 
     move-result-object v2
 
-    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-eq v2, v6, :cond_2
 
@@ -642,7 +642,7 @@
 
     move-result-object v2
 
-    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->zs:Lcom/discord/rtcconnection/RtcConnection$State$f;
+    sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->zv:Lcom/discord/rtcconnection/RtcConnection$State$f;
 
     if-ne v2, v6, :cond_3
 
@@ -984,7 +984,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d6
+    const v0, 0x7f0d01e2
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali
index 25e2f27303..1d9979039f 100644
--- a/com.discord/smali_classes2/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, 0x7f0d00b3
+    const v0, 0x7f0d00b9
 
     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_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali
index e286bd7c22..178c0a4014 100644
--- a/com.discord/smali_classes2/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, 0x7f0d00b4
+    const v0, 0x7f0d00ba
 
     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, 0x7f0a0826
+    const v0, 0x7f0a0855
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali
index 42ad64ef24..66d98b19df 100644
--- a/com.discord/smali_classes2/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, 0x7f0d00b5
+    const v0, 0x7f0d00bb
 
     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, 0x7f0a0828
+    const v0, 0x7f0a0858
 
     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, 0x7f0a0829
+    const v0, 0x7f0a0859
 
     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, 0x7f0a0825
+    const v0, 0x7f0a0856
+
+    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, 0x7f0a0854
 
     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, 0x7f0a0827
+    const v0, 0x7f0a0857
 
     invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
 
@@ -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_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali
index f690f3ff51..1e04083d9b 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali
index 97061fd320..a94b196e63 100644
--- a/com.discord/smali_classes2/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;->zT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
+    sget-object v1, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->zV:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
 
     invoke-virtual {v1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali
index 83510fa0f3..a4192a1bde 100644
--- a/com.discord/smali_classes2/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, 0x7f121325
+    const v0, 0x7f1213b1
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
index 2c19e10cab..af637fc9dd 100644
--- a/com.discord/smali_classes2/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, 0x7f0a081a
+    const p2, 0x7f0a0849
 
     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, 0x7f0a0815
+    const p2, 0x7f0a0844
 
     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, 0x7f0a081b
+    const p2, 0x7f0a084a
 
     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, 0x7f0a0816
+    const p2, 0x7f0a0845
 
     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, 0x7f0a0817
+    const p2, 0x7f0a0846
 
     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, 0x7f0a081c
+    const p2, 0x7f0a084b
 
     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, 0x7f0a0819
+    const p2, 0x7f0a0848
 
     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, 0x7f0a0818
+    const p2, 0x7f0a0847
 
     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, 0x7f0d00b2
+    const p3, 0x7f0d00b8
 
     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, 0x7f0402b5
+    const v1, 0x7f0402b6
 
     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, 0x7f12122f
+    const v3, 0x7f1212b7
 
     goto :goto_2
 
     :cond_2
-    const v3, 0x7f120bd9
+    const v3, 0x7f120c0b
 
     :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, 0x7f121226
+    const p1, 0x7f1212ae
 
     goto :goto_3
 
     :cond_3
-    const p1, 0x7f1204d7
+    const p1, 0x7f1204fc
 
     :goto_3
     invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -947,7 +947,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f12042c
+    const v4, 0x7f120451
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
 
@@ -970,7 +970,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f12121a
+    const v4, 0x7f1212a2
 
     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, 0x7f1203b3
+    const v4, 0x7f1203d8
 
     invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
 
@@ -1013,7 +1013,7 @@
 
     move-result-object v0
 
-    const v4, 0x7f1203b2
+    const v4, 0x7f1203d7
 
     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, 0x7f120ce4
+    const v4, 0x7f120d16
 
     new-array v1, v1, [Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
index 5333eaf5dd..d9ff5de917 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali
@@ -117,7 +117,7 @@
     nop
 
     :pswitch_data_0
-    .packed-switch 0x7f0a045c
+    .packed-switch 0x7f0a0464
         :pswitch_2
         :pswitch_1
         :pswitch_0
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
index 0741db9b05..5dd601f4c5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali
@@ -61,7 +61,7 @@
 
     move-result v0
 
-    const v1, 0x7f0a045c
+    const v1, 0x7f0a0464
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
@@ -101,7 +101,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    const v1, 0x7f0a045d
+    const v1, 0x7f0a0465
 
     invoke-interface {p1, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali
index b7719d99a2..478404db31 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali
index de0b2cd389..d90d9786f6 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali
index ee7184872a..46334e96a6 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali
index 6fc9fbe18e..448bf2bc7a 100644
--- a/com.discord/smali_classes2/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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f12042c
+    const v0, 0x7f120451
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali
index 4e32ef6b8c..006553d90b 100644
--- a/com.discord/smali_classes2/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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f120d99
+    const v0, 0x7f120dce
 
     invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali
index ab9736a21d..91c1b70664 100644
--- a/com.discord/smali_classes2/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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali
index ad1a1c9294..dec3edc025 100644
--- a/com.discord/smali_classes2/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, 0x7f0a0344
+    const v0, 0x7f0a034c
 
     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, 0x7f0a0342
+    const v0, 0x7f0a034a
 
     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, 0x7f0a0343
+    const v0, 0x7f0a034b
 
     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/l;->checkExpressionValueIsNotNull(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/l;->throwUninitializedPropertyAccessException(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/l;->throwUninitializedPropertyAccessException(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, 0x7f0d0127
+    const v0, 0x7f0d012d
 
     return v0
 .end method
@@ -459,7 +436,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v0, 0x7f04016d
+    const v0, 0x7f04016c
 
     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;->Bb:Lcom/discord/samsung/a;
+    sget-object v3, Lcom/discord/samsung/a;->Bc:Lcom/discord/samsung/a;
 
-    invoke-static {}, Lcom/discord/samsung/a;->eJ()Lrx/Observable;
+    invoke-static {}, Lcom/discord/samsung/a;->eL()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, 0x7f0802f1
+    const v7, 0x7f0802fd
 
     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..200e8348ff
--- /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/l;->checkParameterIsNotNull(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..c1931271d6
--- /dev/null
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1.smali
@@ -0,0 +1,111 @@
+.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 10
+
+    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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+    move-result-object v5
+
+    const-string p1, "requireFragmentManager()"
+
+    invoke-static {v5, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/16 v8, 0x18
+
+    const/4 v9, 0x0
+
+    invoke-static/range {v0 .. v9}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;->show$default(Lcom/discord/widgets/user/usersheet/WidgetUserSheet$Companion;JJLandroidx/fragment/app/FragmentManager;Ljava/lang/Long;Ljava/lang/Boolean;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..929eeebe3e
--- /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/m;
+.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/m;",
+        "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/m;-><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;->bgy: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..e515f45dce
--- /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/x;
+
+    const-class v2, Lcom/discord/widgets/voice/fullscreen/WidgetSpectators;
+
+    invoke-static {v2}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(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/x;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+    invoke-static {v1}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)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, 0x7f0a072b
+
+    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/l;->throwUninitializedPropertyAccessException(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/l;->throwUninitializedPropertyAccessException(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, 0x7f0d01c2
+
+    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/l;->checkParameterIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f04016d
+
+    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..6591f6498f
--- /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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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
index 7f1ead2ff1..954758a505 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali
@@ -1,9 +1,9 @@
-.class final synthetic Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
-.super Lkotlin/jvm/internal/j;
+.class final Lcom/discord/widgets/voice/model/CallModel$Companion$get$1$1;
+.super Ljava/lang/Object;
 .source "CallModel.kt"
 
 # interfaces
-.implements Lkotlin/jvm/functions/Function9;
+.implements Lrx/functions/Func8;
 
 
 # annotations
@@ -12,84 +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/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;",
-        ">;"
+        "<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;)V
-    .locals 1
+.method constructor <init>(Lcom/discord/widgets/voice/model/CallModel$Companion$get$1;Lcom/discord/models/domain/ModelChannel;)V
+    .locals 0
 
-    const/16 v0, 0x9
+    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;
 
-    invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/j;-><init>(ILjava/lang/Object;)V
+    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 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/y;->getOrCreateKotlinClass(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
+.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 = {
             "(",
-            "Lcom/discord/models/domain/ModelChannel;",
-            "JJ",
+            "Ljava/lang/Long;",
+            "Ljava/lang/Long;",
             "Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
             "Ljava/util/Map<",
             "Ljava/lang/Long;",
@@ -101,114 +83,107 @@
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
             ">;",
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            "Z)",
+            "Ljava/lang/Boolean;",
+            ")",
             "Lcom/discord/widgets/voice/model/CallModel;"
         }
     .end annotation
 
-    const-string v0, "p1"
-
-    move-object v2, p1
-
-    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p4"
-
-    move-object/from16 v7, p6
-
-    invoke-static {v7, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p5"
-
-    move-object/from16 v8, p7
-
-    invoke-static {v8, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const-string v0, "p7"
-
-    move-object/from16 v10, p9
-
-    invoke-static {v10, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(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;
+    sget-object v1, Lcom/discord/widgets/voice/model/CallModel;->Companion:Lcom/discord/widgets/voice/model/CallModel$Companion;
 
-    check-cast v1, 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;
 
-    move-wide v3, p2
+    const-string v3, "myUserId"
 
-    move-wide/from16 v5, p4
+    move-object v4, p1
 
-    move-object/from16 v9, p8
+    invoke-static {p1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    move-object/from16 v11, p10
+    invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    move/from16 v12, p11
+    move-result-wide v3
 
-    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;
+    const-string v5, "timeConnected"
+
+    move-object/from16 v6, p2
+
+    invoke-static {v6, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "voiceParticipants"
+
+    move-object/from16 v9, p4
+
+    invoke-static {v9, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "videoDevices"
+
+    move-object/from16 v10, p6
+
+    invoke-static {v10, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v7, "isVideoSupported"
+
+    move-object/from16 v11, p8
+
+    invoke-static {v11, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(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 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
+.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
 
-    move-object v1, p1
+    check-cast p1, Ljava/lang/Long;
 
-    check-cast v1, Lcom/discord/models/domain/ModelChannel;
+    check-cast p2, Ljava/lang/Long;
 
-    move-object v0, p2
+    check-cast p3, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
 
-    check-cast v0, Ljava/lang/Number;
+    check-cast p4, Ljava/util/Map;
 
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+    check-cast p5, Ljava/lang/Integer;
 
-    move-result-wide v2
+    check-cast p6, Ljava/util/List;
 
-    move-object v0, p3
+    check-cast p7, Lco/discord/media_engine/VideoInputDeviceDescription;
 
-    check-cast v0, Ljava/lang/Number;
+    check-cast p8, Ljava/lang/Boolean;
 
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+    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-wide v4
+    move-result-object p1
 
-    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
+    return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
index 945f97fa51..4c468caec5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali
@@ -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;->bq(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..b1757dda57
--- /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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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/l;->checkExpressionValueIsNotNull(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
index 4dc7d35e44..a49628cbf3 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
@@ -31,18 +31,18 @@
     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;
+.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 .. 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;
+    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;Z)Lcom/discord/widgets/voice/model/CallModel;
-    .locals 17
+.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 = {
             "(",
@@ -59,11 +59,15 @@
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
             ">;",
             "Lco/discord/media_engine/VideoInputDeviceDescription;",
-            "Z)",
+            "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
@@ -72,7 +76,7 @@
 
     if-eqz v0, :cond_0
 
-    const/4 v15, 0x0
+    const/4 v13, 0x0
 
     goto :goto_1
 
@@ -89,36 +93,135 @@
     :goto_0
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_2
+    if-eqz v3, :cond_2
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Ljava/util/Map$Entry;
+    check-cast v3, Ljava/util/Map$Entry;
 
-    invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+    invoke-interface {v3}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
-    move-result-object v2
+    move-result-object v3
 
-    check-cast v2, Lcom/discord/models/domain/ModelVoice$User;
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
 
-    move-result v2
+    move-result v3
 
-    if-eqz v2, :cond_1
+    if-eqz v3, :cond_1
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_2
-    move v15, v1
+    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
@@ -131,238 +234,531 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result v3
 
     const/4 v4, 0x1
 
-    if-eq v3, v4, :cond_7
+    if-eq v3, v4, :cond_5
 
-    invoke-interface/range {p7 .. p7}, Ljava/util/Map;->values()Ljava/util/Collection;
+    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, Ljava/lang/Iterable;
+    check-cast v3, Lcom/discord/models/domain/ModelVoice$User;
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
-    move-result-object v3
-
-    :goto_2
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    invoke-virtual {v3}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
 
     move-result v5
 
-    if-eqz v5, :cond_4
+    if-eqz v5, :cond_0
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    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, 0x7f1209f9
+
+    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;->collectionSizeOrDefault(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;
 
-    invoke-virtual {v5}, Lcom/discord/models/domain/ModelVoice$User;->isConnected()Z
+    new-instance v6, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
 
-    move-result v6
+    invoke-direct {v6, v5}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
 
-    if-eqz v6, :cond_3
+    invoke-interface {v3, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+    goto :goto_1
 
-    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, 0x7f1209c4
-
-    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
+    :cond_2
+    check-cast v3, Ljava/util/List;
 
     check-cast v3, Ljava/lang/Iterable;
 
-    invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+    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;->sortedWith(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, 0x7f120c7a
+
+    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
 
-    :goto_3
-    invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+    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_5
+    if-eqz v4, :cond_0
 
-    invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    move-result-object v4
+    goto :goto_0
 
-    move-object v5, v2
+    :cond_0
+    invoke-virtual {v2, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    check-cast v5, Ljava/util/Collection;
+    goto :goto_0
 
-    check-cast v4, Lcom/discord/models/domain/ModelVoice$User;
+    :cond_1
+    move-object p1, v1
 
-    new-instance v6, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+    check-cast p1, Ljava/util/Collection;
 
-    invoke-direct {v6, v4}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+    invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
 
-    invoke-interface {v5, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    move-result p1
 
-    goto :goto_3
+    xor-int/lit8 p1, p1, 0x1
 
-    :cond_5
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
+    new-instance v2, Ljava/util/ArrayList;
 
-    move-result v3
+    invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    const/4 v4, 0x2
+    new-instance v3, Ljava/util/ArrayList;
 
-    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, 0x7f120c48
-
-    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
+    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 v0
+    move-result-object v1
 
-    :goto_4
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+    :cond_2
+    :goto_1
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
 
-    move-result v1
+    move-result v4
 
-    if-eqz v1, :cond_7
+    if-eqz v4, :cond_4
 
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+    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, 0x7f121145
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    move-object v3, v2
+    invoke-direct {p1, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;-><init>(Ljava/lang/Integer;)V
 
-    check-cast v3, Ljava/util/Collection;
+    invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    check-cast v1, Lcom/discord/models/domain/ModelVoice$User;
+    check-cast v2, Ljava/lang/Iterable;
 
-    new-instance v4, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;
+    new-instance p1, Ljava/util/ArrayList;
 
-    invoke-direct {v4, v1}, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser;-><init>(Lcom/discord/models/domain/ModelVoice$User;)V
+    const/16 v1, 0xa
 
-    invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+    invoke-static {v2, v1}, Lkotlin/a/m;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
 
-    goto :goto_4
+    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;->sortedWith(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, 0x7f1209f9
+
+    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;->collectionSizeOrDefault(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;->sortedWith(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
-    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
+    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(J)Lrx/Observable;
+.method public final get(JLcom/discord/widgets/voice/model/CallModel$Type;)Lrx/Observable;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "(J)",
+            "(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/l;->checkParameterIsNotNull(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;
@@ -375,7 +771,7 @@
 
     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
+    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;
 
@@ -391,7 +787,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
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_classes2/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$sam$rx_functions_Func9$0.smali
deleted file mode 100644
index d5505a68a1..0000000000
--- a/com.discord/smali_classes2/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_classes2/com/discord/widgets/voice/model/CallModel.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
index d2f7d6adb3..7215a12a3f 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel.smali
@@ -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
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
index 5db188fcc7..6017040de9 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$Model$Companion.smali
@@ -72,7 +72,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lrx/internal/a/ae;->Jl()Lrx/internal/a/ae;
+    invoke-static {}, Lrx/internal/a/ae;->Jo()Lrx/internal/a/ae;
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
index 0927c0276f..f1ec7d68b5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.smali
@@ -64,7 +64,7 @@
 
     move-result p1
 
-    const p2, 0x7f0a0447
+    const p2, 0x7f0a044f
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
index b0e9dd4ae2..d84742e211 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$onViewBoundOrOnResume$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
index 7d5195e329..9bf34e55f5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali
@@ -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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -67,7 +67,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1203be
+    const v0, 0x7f1203e3
 
     invoke-static {p1, v0}, Lcom/discord/app/h;->c(Landroid/content/Context;I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
index 4d35b3ac94..fa441688e2 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
@@ -292,7 +292,7 @@
 
     iput-object v0, p0, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->channelSettingsSave$delegate:Lkotlin/properties/ReadOnlyProperty;
 
-    const v0, 0x7f0a0794
+    const v0, 0x7f0a07b8
 
     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, 0x7f0a024e
+    const v0, 0x7f0a0251
 
     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, 0x7f0a06e9
+    const v0, 0x7f0a06fe
 
     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, 0x7f0a024d
+    const v0, 0x7f0a0250
 
     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, 0x7f0a0690
+    const v0, 0x7f0a06a5
 
     invoke-static {p0, v0}, Lkotterknife/b;->c(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
 
@@ -358,8 +358,8 @@
     .array-data 4
         0x7f0a0164
         0x7f0a0165
-        0x7f0a024e
-        0x7f0a024d
+        0x7f0a0251
+        0x7f0a0250
     .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, 0x7f1203bd
+    const v0, 0x7f1203e2
 
     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, 0x7f120608
+    const v4, 0x7f12062c
 
     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, 0x7f1205ee
+    const v5, 0x7f120612
 
     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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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, 0x7f0d00d2
+    const v1, 0x7f0d00d8
 
     const/4 v2, 0x0
 
@@ -912,7 +912,7 @@
 
     aput-object p1, v0, v3
 
-    const p1, 0x7f1204ec
+    const p1, 0x7f120511
 
     invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -1106,7 +1106,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f120c3f
+    const v0, 0x7f120c71
 
     invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
 
@@ -1244,7 +1244,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/discord/app/i;->vP:Lcom/discord/app/i;
+    sget-object v2, Lcom/discord/app/i;->vO:Lcom/discord/app/i;
 
     invoke-virtual {p0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getContext()Landroid/content/Context;
 
@@ -1270,7 +1270,7 @@
 .method public final getContentViewResId()I
     .locals 1
 
-    const v0, 0x7f0d01d7
+    const v0, 0x7f0d01e3
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali b/com.discord/smali_classes2/com/discord/workers/MessageAckWorker.smali
index 21221941c8..fccda00a89 100644
--- a/com.discord/smali_classes2/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 FG:Lcom/discord/workers/MessageAckWorker$a;
+.field public static final FP: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;->FG:Lcom/discord/workers/MessageAckWorker$a;
+    sput-object v0, Lcom/discord/workers/MessageAckWorker;->FP: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v0, Lcom/discord/app/AppLog;->vm: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v7, Lcom/discord/app/AppLog;->vm: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;->Kb()Ljava/lang/Object;
+    invoke-virtual {v5}, Lrx/b/a;->Ke()Ljava/lang/Object;
 
-    sget-object v9, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v9, Lcom/discord/app/AppLog;->vm: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;->vn:Lcom/discord/app/AppLog;
+    sget-object v9, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali b/com.discord/smali_classes2/com/discord/workers/MessageSendWorker.smali
index d420fc1528..2a9c3f34c1 100644
--- a/com.discord/smali_classes2/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 FH:Lcom/discord/workers/MessageSendWorker$a;
+.field public static final FQ: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;->FH:Lcom/discord/workers/MessageSendWorker$a;
+    sput-object v0, Lcom/discord/workers/MessageSendWorker;->FQ:Lcom/discord/workers/MessageSendWorker$a;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 .method public final doWork()Landroidx/work/ListenableWorker$Result;
     .locals 16
 
-    sget-object v1, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v1, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -111,7 +111,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v8, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v8, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -295,13 +295,13 @@
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lrx/b/a;->Kb()Ljava/lang/Object;
+    invoke-virtual {v6}, Lrx/b/a;->Ke()Ljava/lang/Object;
 
     move-result-object v6
 
     check-cast v6, Lcom/discord/models/domain/ModelMessage;
 
-    sget-object v8, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v8, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -369,7 +369,7 @@
     move-exception v0
 
     :try_start_1
-    sget-object v6, Lcom/discord/app/AppLog;->vn:Lcom/discord/app/AppLog;
+    sget-object v6, Lcom/discord/app/AppLog;->vm:Lcom/discord/app/AppLog;
 
     invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/a/a$a.smali b/com.discord/smali_classes2/com/esotericsoftware/a/a$a.smali
index 18abe43db5..6bd24c8232 100644
--- a/com.discord/smali_classes2/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 FN:J
+.field private FW:J
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/esotericsoftware/a/a$a;->FN:J
+    iput-wide v0, p0, Lcom/esotericsoftware/a/a$a;->FW:J
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     move-result-wide v1
 
-    iget-wide v3, p0, Lcom/esotericsoftware/a/a$a;->FN:J
+    iget-wide v3, p0, Lcom/esotericsoftware/a/a$a;->FW:J
 
     sub-long/2addr v1, v3
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/a/a.smali b/com.discord/smali_classes2/com/esotericsoftware/a/a.smali
index 22af3601e6..14f0384d3b 100644
--- a/com.discord/smali_classes2/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 FI:Z = true
+.field public static FR:Z = true
 
-.field public static FJ:Z = false
+.field public static FS:Z = false
 
-.field public static FK:Z = false
+.field public static FT:Z = false
 
-.field public static FL:Z = false
+.field public static FU:Z = false
 
-.field private static FM:Lcom/esotericsoftware/a/a$a; = null
+.field private static FV: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;->FJ:Z
+    sput-boolean v0, Lcom/esotericsoftware/a/a;->FS: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;->FK:Z
+    sput-boolean v0, Lcom/esotericsoftware/a/a;->FT:Z
 
     sget v0, Lcom/esotericsoftware/a/a;->level:I
 
@@ -90,13 +90,13 @@
     const/4 v1, 0x1
 
     :cond_3
-    sput-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sput-boolean v1, Lcom/esotericsoftware/a/a;->FU: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;->FM:Lcom/esotericsoftware/a/a$a;
+    sput-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
 
     return-void
 .end method
@@ -104,11 +104,11 @@
 .method public static aj(Ljava/lang/String;)V
     .locals 3
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FJ:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FS:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FM:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x4
 
@@ -123,11 +123,11 @@
 .method public static ak(Ljava/lang/String;)V
     .locals 3
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FM:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x1
 
@@ -142,11 +142,11 @@
 .method public static s(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FJ:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FS:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FM:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FV: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;->FM:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x2
 
@@ -176,11 +176,11 @@
 .method public static u(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/a/a;->FM:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FV: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;->FM:Lcom/esotericsoftware/a/a$a;
+    sget-object v0, Lcom/esotericsoftware/a/a;->FV:Lcom/esotericsoftware/a/a$a;
 
     const/4 v1, 0x2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/b/a.smali b/com.discord/smali_classes2/com/esotericsoftware/b/a.smali
index 8bf59a5dcf..db22ea0aaa 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/b/a.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/a.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final FO:Ljava/util/WeakHashMap;
+.field private static final FX:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -16,11 +16,11 @@
     .end annotation
 .end field
 
-.field private static final FP:Ljava/lang/ClassLoader;
+.field private static final FY:Ljava/lang/ClassLoader;
 
-.field private static volatile FQ:Lcom/esotericsoftware/b/a;
+.field private static volatile FZ:Lcom/esotericsoftware/b/a;
 
-.field private static volatile FR:Ljava/lang/reflect/Method;
+.field private static volatile Ga:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->FO:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FX: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;->FP:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FY:Ljava/lang/ClassLoader;
 
     new-instance v0, Lcom/esotericsoftware/b/a;
 
-    sget-object v1, Lcom/esotericsoftware/b/a;->FP:Ljava/lang/ClassLoader;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FY:Ljava/lang/ClassLoader;
 
     invoke-direct {v0, v1}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->FQ:Lcom/esotericsoftware/b/a;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
     return v2
 .end method
 
-.method private static fm()Ljava/lang/reflect/Method;
+.method private static fp()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;->FR:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/esotericsoftware/b/a;->Ga:Ljava/lang/reflect/Method;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->FO:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
 
     monitor-enter v0
 
@@ -185,12 +185,12 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/esotericsoftware/b/a;->FR:Ljava/lang/reflect/Method;
+    sput-object v1, Lcom/esotericsoftware/b/a;->Ga: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;->FR:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/esotericsoftware/b/a;->Ga: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;->FR:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/esotericsoftware/b/a;->Ga:Ljava/lang/reflect/Method;
 
     return-object v0
 .end method
@@ -226,7 +226,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/esotericsoftware/b/a;->FP:Ljava/lang/ClassLoader;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FY: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;->FQ:Lcom/esotericsoftware/b/a;
+    sget-object p0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
 
     if-nez p0, :cond_1
 
-    sget-object p0, Lcom/esotericsoftware/b/a;->FO:Ljava/util/WeakHashMap;
+    sget-object p0, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/esotericsoftware/b/a;->FQ:Lcom/esotericsoftware/b/a;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/esotericsoftware/b/a;
 
-    sget-object v1, Lcom/esotericsoftware/b/a;->FP:Ljava/lang/ClassLoader;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FY:Ljava/lang/ClassLoader;
 
     invoke-direct {v0, v1}, Lcom/esotericsoftware/b/a;-><init>(Ljava/lang/ClassLoader;)V
 
-    sput-object v0, Lcom/esotericsoftware/b/a;->FQ:Lcom/esotericsoftware/b/a;
+    sput-object v0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
 
     :cond_0
     monitor-exit p0
@@ -271,17 +271,17 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/esotericsoftware/b/a;->FQ:Lcom/esotericsoftware/b/a;
+    sget-object p0, Lcom/esotericsoftware/b/a;->FZ:Lcom/esotericsoftware/b/a;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lcom/esotericsoftware/b/a;->FO:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/esotericsoftware/b/a;->FX:Ljava/util/WeakHashMap;
 
     monitor-enter v0
 
     :try_start_1
-    sget-object v1, Lcom/esotericsoftware/b/a;->FO:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FX: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;->FO:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/esotericsoftware/b/a;->FX: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;->FO:Ljava/util/WeakHashMap;
+    sget-object v2, Lcom/esotericsoftware/b/a;->FX: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;->fm()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/esotericsoftware/b/a;->fp()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/b/b.smali b/com.discord/smali_classes2/com/esotericsoftware/b/b.smali
index 7c0087909b..214883148d 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/b/b.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field FS:Z
+.field Gb:Z
 
 
 # direct methods
@@ -484,7 +484,7 @@
     invoke-virtual {v0, v2, v3}, Lorg/a/a/t;->ab(II)V
 
     :goto_4
-    invoke-virtual {v9}, Lorg/a/a/h;->Hw()[B
+    invoke-virtual {v9}, Lorg/a/a/h;->Hz()[B
 
     move-result-object v0
 
@@ -550,7 +550,7 @@
     throw v0
 
     :cond_7
-    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->FS:Z
+    iput-boolean v4, v2, Lcom/esotericsoftware/b/b;->Gb:Z
 
     return-object v2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/b/c.smali b/com.discord/smali_classes2/com/esotericsoftware/b/c.smali
index 0c253cece4..02ce2bc8f6 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/b/c.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/c.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private FT:[Ljava/lang/String;
+.field private Gc:[Ljava/lang/String;
 
-.field private FU:[Ljava/lang/Class;
+.field private Gd:[Ljava/lang/Class;
 
 
 # direct methods
@@ -286,7 +286,7 @@
 
     invoke-virtual {v1, v7, v9}, Lorg/a/a/t;->Z(II)V
 
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Id()I
 
     move-result v7
 
@@ -297,7 +297,7 @@
     goto/16 :goto_2
 
     :pswitch_0
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->HY()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ib()Ljava/lang/String;
 
     move-result-object v7
 
@@ -306,7 +306,7 @@
     goto/16 :goto_2
 
     :pswitch_1
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v7
 
@@ -423,7 +423,7 @@
 
     move-result-object v8
 
-    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual/range {v16 .. v16}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v9
 
@@ -506,11 +506,11 @@
 
     move-object/from16 v1, p2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Id()I
 
     move-result v3
 
@@ -803,7 +803,7 @@
 
     invoke-virtual/range {v14 .. v19}, Lorg/a/a/t;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->HX()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v0
 
@@ -999,7 +999,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual {v6}, Lorg/a/a/aa;->Id()I
 
     move-result v6
 
@@ -1155,11 +1155,11 @@
 
     move-object/from16 v1, p2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Id()I
 
     move-result v3
 
@@ -1431,7 +1431,7 @@
 
     invoke-virtual/range {v11 .. v16}, Lorg/a/a/t;->a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
 
-    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->HX()Ljava/lang/String;
+    invoke-virtual/range {p3 .. p3}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1980,73 +1980,73 @@
 
     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;->bDb:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDl: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;->bDb:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDl: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;->bDd:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDn: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;->bDd:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDn: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;->bDe:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDo: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;->bDe:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDo: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;->bDf:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDp: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;->bDf:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDp: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;->bDh:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDr: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;->bDh:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDr: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;->bDi:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDs: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;->bDi:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDs: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;->bDg:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDq: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;->bDg:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDq: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;->bDc:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDm: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;->bDc:Lorg/a/a/aa;
+    sget-object v3, Lorg/a/a/aa;->bDm: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
 
     invoke-static {v7, v4, v0}, Lcom/esotericsoftware/b/c;->c(Lorg/a/a/h;Ljava/lang/String;Ljava/util/ArrayList;)V
 
-    invoke-virtual {v7}, Lorg/a/a/h;->Hw()[B
+    invoke-virtual {v7}, Lorg/a/a/h;->Hz()[B
 
     move-result-object v0
 
@@ -2067,9 +2067,9 @@
 
     check-cast v0, Lcom/esotericsoftware/b/c;
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/c;->FT:[Ljava/lang/String;
+    iput-object v1, v0, Lcom/esotericsoftware/b/c;->Gc:[Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/esotericsoftware/b/c;->FU:[Ljava/lang/Class;
+    iput-object v2, v0, Lcom/esotericsoftware/b/c;->Gd:[Ljava/lang/Class;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_1
 
@@ -2114,7 +2114,7 @@
 .method public final al(Ljava/lang/String;)I
     .locals 3
 
-    iget-object v0, p0, Lcom/esotericsoftware/b/c;->FT:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/esotericsoftware/b/c;->Gc:[Ljava/lang/String;
 
     array-length v0, v0
 
@@ -2123,7 +2123,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v2, p0, Lcom/esotericsoftware/b/c;->FT:[Ljava/lang/String;
+    iget-object v2, p0, Lcom/esotericsoftware/b/c;->Gc:[Ljava/lang/String;
 
     aget-object v2, v2, v1
 
@@ -2164,32 +2164,32 @@
     goto :goto_1
 .end method
 
-.method public abstract fn()Ljava/lang/Object;
+.method public abstract fq()Ljava/lang/Object;
 .end method
 
-.method public abstract fo()Ljava/lang/String;
+.method public abstract fr()Ljava/lang/String;
 .end method
 
-.method public abstract fp()C
+.method public abstract fs()C
 .end method
 
-.method public abstract fq()Z
+.method public abstract ft()Z
 .end method
 
-.method public abstract fr()B
+.method public abstract fu()B
 .end method
 
-.method public abstract fs()S
+.method public abstract fv()S
 .end method
 
-.method public abstract ft()I
+.method public abstract fw()I
 .end method
 
-.method public abstract fu()J
+.method public abstract fx()J
 .end method
 
-.method public abstract fv()D
+.method public abstract fy()D
 .end method
 
-.method public abstract fw()F
+.method public abstract fz()F
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/b/d.smali b/com.discord/smali_classes2/com/esotericsoftware/b/d.smali
index 2b40a878c6..09211f5cbd 100644
--- a/com.discord/smali_classes2/com/esotericsoftware/b/d.smali
+++ b/com.discord/smali_classes2/com/esotericsoftware/b/d.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private FV:[Ljava/lang/String;
+.field private Ge:[Ljava/lang/String;
 
-.field private FW:[[Ljava/lang/Class;
+.field private Gf:[[Ljava/lang/Class;
 
-.field private FX:[Ljava/lang/Class;
+.field private Gg:[Ljava/lang/Class;
 
 
 # direct methods
@@ -514,7 +514,7 @@
 
     move-result-object v13
 
-    invoke-virtual {v13}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual {v13}, Lorg/a/a/aa;->Id()I
 
     move-result v22
 
@@ -530,7 +530,7 @@
     goto/16 :goto_9
 
     :pswitch_0
-    invoke-virtual {v13}, Lorg/a/a/aa;->HY()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->Ib()Ljava/lang/String;
 
     move-result-object v6
 
@@ -550,7 +550,7 @@
 
     const/16 v7, 0xc0
 
-    invoke-virtual {v13}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v6
 
@@ -757,7 +757,7 @@
     invoke-virtual {v11, v6, v5, v7, v9}, Lorg/a/a/t;->b(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_9
-    invoke-virtual {v13}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {v13}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v5
 
@@ -837,7 +837,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual {v3}, Lorg/a/a/aa;->Id()I
 
     move-result v3
 
@@ -1067,7 +1067,7 @@
 
     invoke-virtual {v11, v0, v0}, Lorg/a/a/t;->ab(II)V
 
-    invoke-virtual {v10}, Lorg/a/a/h;->Hw()[B
+    invoke-virtual {v10}, Lorg/a/a/h;->Hz()[B
 
     move-result-object v0
 
@@ -1090,15 +1090,15 @@
 
     check-cast v0, Lcom/esotericsoftware/b/d;
 
-    iput-object v4, v0, Lcom/esotericsoftware/b/d;->FV:[Ljava/lang/String;
+    iput-object v4, v0, Lcom/esotericsoftware/b/d;->Ge:[Ljava/lang/String;
 
     move-object/from16 v1, v31
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/d;->FW:[[Ljava/lang/Class;
+    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Gf:[[Ljava/lang/Class;
 
     move-object/from16 v1, v30
 
-    iput-object v1, v0, Lcom/esotericsoftware/b/d;->FX:[Ljava/lang/Class;
+    iput-object v1, v0, Lcom/esotericsoftware/b/d;->Gg:[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;->FV:[Ljava/lang/String;
+    iget-object v0, p0, Lcom/esotericsoftware/b/d;->Ge:[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;->FV:[Ljava/lang/String;
+    iget-object v2, p0, Lcom/esotericsoftware/b/d;->Ge:[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;->FW:[[Ljava/lang/Class;
+    iget-object v2, p0, Lcom/esotericsoftware/b/d;->Gf:[[Ljava/lang/Class;
 
     aget-object v2, v2, v1
 
@@ -1244,5 +1244,5 @@
     goto :goto_1
 .end method
 
-.method public varargs abstract fx()Ljava/lang/Object;
+.method public varargs abstract fA()Ljava/lang/Object;
 .end method
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/Registration.smali
index 52a9d68a24..766366b907 100644
--- a/com.discord/smali_classes2/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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/io/InputChunked.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/InputChunked.smali
index 895c6df50d..6b86b21af3 100644
--- a/com.discord/smali_classes2/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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_2
 
diff --git a/com.discord/smali_classes2/com/esotericsoftware/kryo/io/OutputChunked.smali b/com.discord/smali_classes2/com/esotericsoftware/kryo/io/OutputChunked.smali
index 61c148d93d..1d30438dd7 100644
--- a/com.discord/smali_classes2/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;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
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 50bd6716f1..e268d1e25f 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;->fq()Z
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->ft()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 2a0272feae..b0d6e97d95 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;->fr()B
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fu()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 8e9c50b146..721a685c35 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;->fp()C
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fs()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 9175a3e685..54362f2842 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;->fv()D
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fy()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 b23feb6873..d985d25262 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;->fw()F
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fz()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 9230ef0d41..d5c7839d80 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;->ft()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fw()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;->ft()I
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fw()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 00055cd7d3..3aafaeea22 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;->fu()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fx()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;->fu()J
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fx()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 5179da805d..83ceb9efb9 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;->fn()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/esotericsoftware/b/c;->fq()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;->fn()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->fq()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 4c1f9aaaa2..a53e778ebf 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;->fs()S
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fv()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 1cf4399780..9226561cb4 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;->fo()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/esotericsoftware/b/c;->fr()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 fc6cfbe5f0..239ee12b14 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;->fx()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/d;->fA()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 6329debc31..ad33321260 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;->FL:Z
+    sget-boolean v5, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->FU: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 47d3c2f163..148093f4bd 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;->FL:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v8, :cond_0
 
@@ -167,7 +167,7 @@
     goto :goto_2
 
     :cond_3
-    sget-boolean v6, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v6, :cond_4
 
@@ -254,7 +254,7 @@
     goto :goto_8
 
     :cond_9
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v7, :cond_a
 
@@ -326,7 +326,7 @@
     :cond_e
     if-nez v8, :cond_10
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU: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 652bb090fd..51141c6351 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;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU: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 252a71f14b..fa56fdc406 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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
@@ -1111,7 +1111,7 @@
 
     :cond_2
     :goto_1
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p3, :cond_3
 
@@ -1539,7 +1539,7 @@
 .method protected rebuildCachedFields(Z)V
     .locals 9
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
@@ -2341,7 +2341,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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 0e251d3a20..b492229762 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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
@@ -403,7 +403,7 @@
     invoke-static {v1, v0}, Lcom/esotericsoftware/a/a;->u(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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 5121d7abe9..15c2849f59 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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     const-string v3, "kryo"
 
@@ -106,7 +106,7 @@
 
     aget-object v7, p0, v5
 
-    sget-boolean v8, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v8, :cond_4
 
@@ -327,7 +327,7 @@
     return-object p1
 
     :cond_0
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p1, :cond_1
 
@@ -501,7 +501,7 @@
 
     if-lez v1, :cond_d
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     const-string v1, "kryo"
 
@@ -547,7 +547,7 @@
 
     move-result-object v6
 
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v7, :cond_b
 
@@ -689,7 +689,7 @@
 
     aput-object p1, v0, v6
 
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p1, :cond_c
 
@@ -906,7 +906,7 @@
     goto/16 :goto_0
 
     :cond_8
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p3, :cond_9
 
@@ -968,7 +968,7 @@
 
     move-result-object v0
 
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p3, :cond_b
 
@@ -1007,7 +1007,7 @@
     goto :goto_2
 
     :cond_b
-    sget-boolean p3, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p3, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     const-string v1, "kryo"
 
@@ -1080,7 +1080,7 @@
     invoke-static {v1, v0}, Lcom/esotericsoftware/a/a;->u(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_0
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v3, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU: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 a5debf73d3..f72493c4e6 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;->FL:Z
+    sget-boolean v6, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v6, :cond_2
 
@@ -461,7 +461,7 @@
 
     if-le v7, v5, :cond_a
 
-    sget-boolean v5, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v5, Lcom/esotericsoftware/a/a;->FU: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 fd1befcdce..e772946963 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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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 db3e7c4cc2..0bd1418ec7 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;->fn()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/esotericsoftware/b/c;->fq()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -220,7 +220,7 @@
     const-string v1, " ("
 
     :try_start_0
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v2, :cond_0
 
@@ -485,7 +485,7 @@
     const-string v1, " ("
 
     :try_start_0
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU: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 ceefdc607a..e6532ffa70 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;->FL:Z
+    sget-boolean v4, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v8, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v8, :cond_7
 
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 24524c4a04..88a338bf92 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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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 ebe1634f6b..7fcd7863b6 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;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v2, :cond_1
 
@@ -279,7 +279,7 @@
     return-object p1
 
     :cond_4
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     const/4 v1, 0x0
 
@@ -368,7 +368,7 @@
     :catch_0
     move-exception v1
 
-    sget-boolean v3, Lcom/esotericsoftware/a/a;->FJ:Z
+    sget-boolean v3, Lcom/esotericsoftware/a/a;->FS: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;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_5
 
@@ -458,7 +458,7 @@
     goto :goto_2
 
     :cond_4
-    sget-boolean p1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p1, :cond_5
 
@@ -516,7 +516,7 @@
 
     if-eq v0, v1, :cond_1
 
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_0
 
@@ -582,7 +582,7 @@
     goto :goto_0
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v0, :cond_2
 
@@ -741,7 +741,7 @@
 
     if-nez p2, :cond_2
 
-    sget-boolean p2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean p2, Lcom/esotericsoftware/a/a;->FU:Z
 
     const/4 v1, 0x0
 
@@ -791,7 +791,7 @@
     goto :goto_0
 
     :cond_3
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v2, :cond_4
 
@@ -859,7 +859,7 @@
 
     if-eq v0, v2, :cond_1
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v2, :cond_0
 
@@ -893,7 +893,7 @@
     return-void
 
     :cond_1
-    sget-boolean v0, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v0, Lcom/esotericsoftware/a/a;->FU: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 36bb43aecf..c6ceb60d02 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;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v1, :cond_1
 
@@ -257,7 +257,7 @@
     const-wide/16 v14, 0x0
 
     :goto_5
-    sget-boolean v7, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v7, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v7, :cond_2
 
@@ -488,7 +488,7 @@
 
     check-cast v1, Ljava/lang/reflect/Field;
 
-    sget-boolean v2, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU: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 c773d2a826..230bcd12bd 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;->FL:Z
+    sget-boolean p1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz p1, :cond_0
 
@@ -596,7 +596,7 @@
 
     :cond_3
     :goto_0
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v1, :cond_4
 
@@ -671,7 +671,7 @@
 
     if-ne v1, v2, :cond_3
 
-    sget-boolean v1, Lcom/esotericsoftware/a/a;->FL:Z
+    sget-boolean v1, Lcom/esotericsoftware/a/a;->FU: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;->FL:Z
+    sget-boolean v2, Lcom/esotericsoftware/a/a;->FU:Z
 
     if-eqz v2, :cond_4
 
diff --git a/com.discord/smali_classes2/com/facebook/animated/gif/GifFrame.smali b/com.discord/smali_classes2/com/facebook/animated/gif/GifFrame.smali
index 894a51e7bc..c20a429ffe 100644
--- a/com.discord/smali_classes2/com/facebook/animated/gif/GifFrame.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/gif/GifFrame.smali
@@ -54,15 +54,7 @@
     return-void
 .end method
 
-.method protected finalize()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeFinalize()V
-
-    return-void
-.end method
-
-.method public final fy()I
+.method public final fB()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeGetXOffset()I
@@ -72,7 +64,7 @@
     return v0
 .end method
 
-.method public final fz()I
+.method public final fC()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeGetYOffset()I
@@ -82,6 +74,14 @@
     return v0
 .end method
 
+.method protected finalize()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/facebook/animated/gif/GifFrame;->nativeFinalize()V
+
+    return-void
+.end method
+
 .method public final getHeight()I
     .locals 1
 
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 08fab905f5..12ea070f3f 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 FY:Z
+.field private static volatile Gh:Z
 
 
 # instance fields
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method private static declared-synchronized fA()V
+.method private static declared-synchronized fD()V
     .locals 2
 
     const-class v0, Lcom/facebook/animated/gif/GifImage;
@@ -42,13 +42,13 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v1, Lcom/facebook/animated/gif/GifImage;->FY:Z
+    sget-boolean v1, Lcom/facebook/animated/gif/GifImage;->Gh:Z
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/animated/gif/GifImage;->FY:Z
+    sput-boolean v1, Lcom/facebook/animated/gif/GifImage;->Gh:Z
 
     const-string v1, "gifimage"
 
@@ -133,7 +133,7 @@
 
     move-result v6
 
-    sget v7, Lcom/facebook/imagepipeline/animated/a/b$a;->Rl:I
+    sget v7, Lcom/facebook/imagepipeline/animated/a/b$a;->Ru: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;->Rp:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
 
     goto :goto_0
 
@@ -158,12 +158,12 @@
 
     if-ne v1, v2, :cond_1
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rq:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
 
     goto :goto_0
 
     :cond_1
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ro:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx: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;->fA()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fD()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;->fA()V
+    invoke-static {}, Lcom/facebook/animated/gif/GifImage;->fD()V
 
     const-wide/16 v0, 0x0
 
@@ -240,7 +240,7 @@
     return-object p1
 .end method
 
-.method public final fB()I
+.method public final fE()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetFrameCount()I
@@ -250,7 +250,7 @@
     return v0
 .end method
 
-.method public final fC()[I
+.method public final fF()[I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetFrameDurations()[I
@@ -260,7 +260,7 @@
     return-object v0
 .end method
 
-.method public final fD()I
+.method public final fG()I
     .locals 3
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetLoopCount()I
@@ -288,7 +288,7 @@
     return v2
 .end method
 
-.method public final fE()Z
+.method public final fH()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -296,7 +296,7 @@
     return v0
 .end method
 
-.method public final fF()I
+.method public final fI()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/gif/GifImage;->nativeGetSizeInBytes()I
diff --git a/com.discord/smali_classes2/com/facebook/animated/webp/WebPFrame.smali b/com.discord/smali_classes2/com/facebook/animated/webp/WebPFrame.smali
index fd2d26234b..b579c23261 100644
--- a/com.discord/smali_classes2/com/facebook/animated/webp/WebPFrame.smali
+++ b/com.discord/smali_classes2/com/facebook/animated/webp/WebPFrame.smali
@@ -48,15 +48,7 @@
     return-void
 .end method
 
-.method protected finalize()V
-    .locals 0
-
-    invoke-direct {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeFinalize()V
-
-    return-void
-.end method
-
-.method public final fy()I
+.method public final fB()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeGetXOffset()I
@@ -66,7 +58,7 @@
     return v0
 .end method
 
-.method public final fz()I
+.method public final fC()I
     .locals 1
 
     invoke-virtual {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeGetYOffset()I
@@ -76,6 +68,14 @@
     return v0
 .end method
 
+.method protected finalize()V
+    .locals 0
+
+    invoke-direct {p0}, Lcom/facebook/animated/webp/WebPFrame;->nativeFinalize()V
+
+    return-void
+.end method
+
 .method public final getHeight()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 02fe038594..403285a32c 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;->Rl:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Ru:I
 
     goto :goto_0
 
     :cond_0
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rm:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
 
     :goto_0
     move v7, v1
@@ -116,12 +116,12 @@
 
     if-eqz v1, :cond_1
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rp:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
 
     goto :goto_1
 
     :cond_1
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ro:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx: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;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()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;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()V
 
     const-wide/16 v0, 0x0
 
@@ -198,7 +198,7 @@
     return-object p1
 .end method
 
-.method public final fB()I
+.method public final fE()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetFrameCount()I
@@ -208,7 +208,7 @@
     return v0
 .end method
 
-.method public final fC()[I
+.method public final fF()[I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetFrameDurations()[I
@@ -218,7 +218,7 @@
     return-object v0
 .end method
 
-.method public final fD()I
+.method public final fG()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetLoopCount()I
@@ -228,7 +228,7 @@
     return v0
 .end method
 
-.method public final fE()Z
+.method public final fH()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -236,7 +236,7 @@
     return v0
 .end method
 
-.method public final fF()I
+.method public final fI()I
     .locals 1
 
     invoke-direct {p0}, Lcom/facebook/animated/webp/WebPImage;->nativeGetSizeInBytes()I
diff --git a/com.discord/smali_classes2/com/facebook/c/a$1.smali b/com.discord/smali_classes2/com/facebook/c/a$1.smali
index 3e42d6988c..a4d0763ccf 100644
--- a/com.discord/smali_classes2/com/facebook/c/a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/c/a$1.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic Jo:Z
+.field final synthetic JA:Lcom/facebook/c/a;
 
-.field final synthetic Jp:Lcom/facebook/c/e;
+.field final synthetic Jx:Z
 
-.field final synthetic Jq:Z
+.field final synthetic Jy:Lcom/facebook/c/e;
 
-.field final synthetic Jr:Lcom/facebook/c/a;
+.field final synthetic Jz:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/c/a;ZLcom/facebook/c/e;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/a$1;->Jr:Lcom/facebook/c/a;
+    iput-object p1, p0, Lcom/facebook/c/a$1;->JA:Lcom/facebook/c/a;
 
-    iput-boolean p2, p0, Lcom/facebook/c/a$1;->Jo:Z
+    iput-boolean p2, p0, Lcom/facebook/c/a$1;->Jx:Z
 
-    iput-object p3, p0, Lcom/facebook/c/a$1;->Jp:Lcom/facebook/c/e;
+    iput-object p3, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
 
-    iput-boolean p4, p0, Lcom/facebook/c/a$1;->Jq:Z
+    iput-boolean p4, p0, Lcom/facebook/c/a$1;->Jz: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/c/a$1;->Jo:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a$1;->Jx:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/a$1;->Jp:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
 
-    iget-object v1, p0, Lcom/facebook/c/a$1;->Jr:Lcom/facebook/c/a;
+    iget-object v1, p0, Lcom/facebook/c/a$1;->JA:Lcom/facebook/c/a;
 
     invoke-interface {v0, v1}, Lcom/facebook/c/e;->b(Lcom/facebook/c/c;)V
 
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lcom/facebook/c/a$1;->Jq:Z
+    iget-boolean v0, p0, Lcom/facebook/c/a$1;->Jz:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/c/a$1;->Jp:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
 
-    invoke-interface {v0}, Lcom/facebook/c/e;->gG()V
+    invoke-interface {v0}, Lcom/facebook/c/e;->gJ()V
 
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/c/a$1;->Jp:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$1;->Jy:Lcom/facebook/c/e;
 
-    iget-object v1, p0, Lcom/facebook/c/a$1;->Jr:Lcom/facebook/c/a;
+    iget-object v1, p0, Lcom/facebook/c/a$1;->JA:Lcom/facebook/c/a;
 
     invoke-interface {v0, v1}, Lcom/facebook/c/e;->a(Lcom/facebook/c/c;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/c/a$2.smali b/com.discord/smali_classes2/com/facebook/c/a$2.smali
index 3ccadb1da8..0b87b2400f 100644
--- a/com.discord/smali_classes2/com/facebook/c/a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/c/a$2.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Jr:Lcom/facebook/c/a;
+.field final synthetic JA:Lcom/facebook/c/a;
 
-.field final synthetic Js:Lcom/facebook/c/e;
+.field final synthetic JB:Lcom/facebook/c/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/c/a;Lcom/facebook/c/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/a$2;->Jr:Lcom/facebook/c/a;
+    iput-object p1, p0, Lcom/facebook/c/a$2;->JA:Lcom/facebook/c/a;
 
-    iput-object p2, p0, Lcom/facebook/c/a$2;->Js:Lcom/facebook/c/e;
+    iput-object p2, p0, Lcom/facebook/c/a$2;->JB:Lcom/facebook/c/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/c/a$2;->Js:Lcom/facebook/c/e;
+    iget-object v0, p0, Lcom/facebook/c/a$2;->JB:Lcom/facebook/c/e;
 
-    iget-object v1, p0, Lcom/facebook/c/a$2;->Jr:Lcom/facebook/c/a;
+    iget-object v1, p0, Lcom/facebook/c/a$2;->JA:Lcom/facebook/c/a;
 
     invoke-interface {v0, v1}, Lcom/facebook/c/e;->c(Lcom/facebook/c/c;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/c/a$a.smali b/com.discord/smali_classes2/com/facebook/c/a$a.smali
index f2ec75f5a1..76ba7375d3 100644
--- a/com.discord/smali_classes2/com/facebook/c/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/c/a$a.smali
@@ -23,13 +23,13 @@
 
 
 # static fields
-.field public static final Jt:I = 0x1
+.field public static final JC:I = 0x1
 
-.field public static final Ju:I = 0x2
+.field public static final JD:I = 0x2
 
-.field public static final Jv:I = 0x3
+.field public static final JE:I = 0x3
 
-.field private static final synthetic Jw:[I
+.field private static final synthetic JF:[I
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/c/a$a;->Jt:I
+    sget v1, Lcom/facebook/c/a$a;->JC:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/c/a$a;->Ju:I
+    sget v1, Lcom/facebook/c/a$a;->JD:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/c/a$a;->Jv:I
+    sget v1, Lcom/facebook/c/a$a;->JE:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/c/a$a;->Jw:[I
+    sput-object v0, Lcom/facebook/c/a$a;->JF:[I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/c/b.smali b/com.discord/smali_classes2/com/facebook/c/b.smali
index bcaa0f4c72..a29e0157fa 100644
--- a/com.discord/smali_classes2/com/facebook/c/b.smali
+++ b/com.discord/smali_classes2/com/facebook/c/b.smali
@@ -51,7 +51,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
 
     :cond_0
     return-void
@@ -61,7 +61,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()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/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gG()Z
 
     throw v0
 .end method
@@ -127,7 +127,7 @@
     .end annotation
 .end method
 
-.method public final gG()V
+.method public final gJ()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/c/d$1.smali b/com.discord/smali_classes2/com/facebook/c/d$1.smali
index afd6b4777b..3f4d73cd89 100644
--- a/com.discord/smali_classes2/com/facebook/c/d$1.smali
+++ b/com.discord/smali_classes2/com/facebook/c/d$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic Jx:Ljava/lang/Throwable;
+.field final synthetic JG:Ljava/lang/Throwable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Throwable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/d$1;->Jx:Ljava/lang/Throwable;
+    iput-object p1, p0, Lcom/facebook/c/d$1;->JG: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/c/d$1;->Jx:Ljava/lang/Throwable;
+    iget-object v0, p0, Lcom/facebook/c/d$1;->JG:Ljava/lang/Throwable;
 
     invoke-static {v0}, Lcom/facebook/c/d;->g(Ljava/lang/Throwable;)Lcom/facebook/c/c;
 
diff --git a/com.discord/smali_classes2/com/facebook/c/d$2.smali b/com.discord/smali_classes2/com/facebook/c/d$2.smali
index b36df7a900..c97f77cf60 100644
--- a/com.discord/smali_classes2/com/facebook/c/d$2.smali
+++ b/com.discord/smali_classes2/com/facebook/c/d$2.smali
@@ -26,9 +26,9 @@
 
 
 # instance fields
-.field final synthetic Jy:Lcom/facebook/c/d$a;
+.field final synthetic JH:Lcom/facebook/c/d$a;
 
-.field final synthetic Jz:Lcom/facebook/c/d$a;
+.field final synthetic JI:Lcom/facebook/c/d$a;
 
 .field final synthetic val$latch:Ljava/util/concurrent/CountDownLatch;
 
@@ -37,11 +37,11 @@
 .method public constructor <init>(Lcom/facebook/c/d$a;Ljava/util/concurrent/CountDownLatch;Lcom/facebook/c/d$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/d$2;->Jy:Lcom/facebook/c/d$a;
+    iput-object p1, p0, Lcom/facebook/c/d$2;->JH:Lcom/facebook/c/d$a;
 
     iput-object p2, p0, Lcom/facebook/c/d$2;->val$latch:Ljava/util/concurrent/CountDownLatch;
 
-    iput-object p3, p0, Lcom/facebook/c/d$2;->Jz:Lcom/facebook/c/d$a;
+    iput-object p3, p0, Lcom/facebook/c/d$2;->JI:Lcom/facebook/c/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/c/d$2;->Jy:Lcom/facebook/c/d$a;
+    iget-object v0, p0, Lcom/facebook/c/d$2;->JH:Lcom/facebook/c/d$a;
 
     invoke-interface {p1}, Lcom/facebook/c/c;->o()Ljava/lang/Object;
 
@@ -107,9 +107,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/c/d$2;->Jz:Lcom/facebook/c/d$a;
+    iget-object v0, p0, Lcom/facebook/c/d$2;->JI:Lcom/facebook/c/d$a;
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gC()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/c/c;->gF()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -146,7 +146,7 @@
     return-void
 .end method
 
-.method public final gG()V
+.method public final gJ()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/c/e.smali b/com.discord/smali_classes2/com/facebook/c/e.smali
index 44efcc8cf1..a19485d0a3 100644
--- a/com.discord/smali_classes2/com/facebook/c/e.smali
+++ b/com.discord/smali_classes2/com/facebook/c/e.smali
@@ -45,7 +45,7 @@
     .end annotation
 .end method
 
-.method public abstract gG()V
+.method public abstract gJ()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
diff --git a/com.discord/smali_classes2/com/facebook/c/f$a$a.smali b/com.discord/smali_classes2/com/facebook/c/f$a$a.smali
index 4569b572fb..5fe9618a4f 100644
--- a/com.discord/smali_classes2/com/facebook/c/f$a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/c/f$a$a.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic JE:Lcom/facebook/c/f$a;
+.field final synthetic JN:Lcom/facebook/c/f$a;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/c/f$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/f$a$a;->JE:Lcom/facebook/c/f$a;
+    iput-object p1, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,13 +60,13 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gA()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
 
     move-result v0
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JE:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
 
     invoke-interface {p1}, Lcom/facebook/c/c;->isFinished()Z
 
@@ -75,20 +75,20 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v2, v0, Lcom/facebook/c/f$a;->JB:Lcom/facebook/c/c;
+    iget-object v2, v0, Lcom/facebook/c/f$a;->JK:Lcom/facebook/c/c;
 
     const/4 v3, 0x0
 
     if-ne p1, v2, :cond_3
 
-    iget-object v2, v0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iget-object v2, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
     if-ne p1, v2, :cond_0
 
     goto :goto_2
 
     :cond_0
-    iget-object v2, v0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iget-object v2, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
     if-eqz v2, :cond_2
 
@@ -103,9 +103,9 @@
 
     :cond_2
     :goto_0
-    iget-object v1, v0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iget-object v1, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
-    iput-object p1, v0, Lcom/facebook/c/f$a;->JC:Lcom/facebook/c/c;
+    iput-object p1, v0, Lcom/facebook/c/f$a;->JL:Lcom/facebook/c/c;
 
     :goto_1
     monitor-exit v0
@@ -124,7 +124,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_3
-    invoke-virtual {v0}, Lcom/facebook/c/f$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {v0}, Lcom/facebook/c/f$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v1
 
@@ -156,7 +156,7 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JE:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
 
     invoke-static {v0, p1}, Lcom/facebook/c/f$a;->a(Lcom/facebook/c/f$a;Lcom/facebook/c/c;)V
 
@@ -174,7 +174,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JE:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
 
     invoke-static {v0, p1}, Lcom/facebook/c/f$a;->a(Lcom/facebook/c/f$a;Lcom/facebook/c/c;)V
 
@@ -191,13 +191,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JE:Lcom/facebook/c/f$a;
+    iget-object v0, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
 
     invoke-virtual {v0}, Lcom/facebook/c/f$a;->getProgress()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/c/f$a$a;->JE:Lcom/facebook/c/f$a;
+    iget-object v1, p0, Lcom/facebook/c/f$a$a;->JN:Lcom/facebook/c/f$a;
 
     invoke-interface {p1}, Lcom/facebook/c/c;->getProgress()F
 
@@ -212,7 +212,7 @@
     return-void
 .end method
 
-.method public final gG()V
+.method public final gJ()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/c/f.smali b/com.discord/smali_classes2/com/facebook/c/f.smali
index 81ff2e3b88..8adf69549d 100644
--- a/com.discord/smali_classes2/com/facebook/c/f.smali
+++ b/com.discord/smali_classes2/com/facebook/c/f.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final JA:Ljava/util/List;
+.field final JJ: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/c/f;->JA:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/c/f;->JJ:Ljava/util/List;
 
     return-void
 .end method
@@ -92,9 +92,9 @@
     :cond_1
     check-cast p1, Lcom/facebook/c/f;
 
-    iget-object v0, p0, Lcom/facebook/c/f;->JA:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/f;->JJ:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/c/f;->JA:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/c/f;->JJ: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/c/f;->JA:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/f;->JJ: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/c/f;->JA:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/c/f;->JJ:Ljava/util/List;
 
     const-string v2, "list"
 
diff --git a/com.discord/smali_classes2/com/facebook/c/g$a$a.smali b/com.discord/smali_classes2/com/facebook/c/g$a$a.smali
index 3eb30234d0..94a9ad78dc 100644
--- a/com.discord/smali_classes2/com/facebook/c/g$a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/c/g$a$a.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final synthetic JM:Lcom/facebook/c/g$a;
+.field final synthetic JV:Lcom/facebook/c/g$a;
 
 .field private mIndex:I
 
@@ -35,7 +35,7 @@
 .method public constructor <init>(Lcom/facebook/c/g$a;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/c/g$a$a;->JM:Lcom/facebook/c/g$a;
+    iput-object p1, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -56,13 +56,13 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/facebook/c/c;->gA()Z
+    invoke-interface {p1}, Lcom/facebook/c/c;->gD()Z
 
     move-result v0
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JM:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
 
     iget v1, p0, Lcom/facebook/c/g$a$a;->mIndex:I
 
@@ -73,9 +73,9 @@
     monitor-enter v0
 
     :try_start_0
-    iget v3, v0, Lcom/facebook/c/g$a;->JH:I
+    iget v3, v0, Lcom/facebook/c/g$a;->JQ:I
 
-    iget v4, v0, Lcom/facebook/c/g$a;->JH:I
+    iget v4, v0, Lcom/facebook/c/g$a;->JQ:I
 
     invoke-virtual {v0, v1}, Lcom/facebook/c/g$a;->H(I)Lcom/facebook/c/c;
 
@@ -83,14 +83,14 @@
 
     if-ne p1, v5, :cond_3
 
-    iget v5, v0, Lcom/facebook/c/g$a;->JH:I
+    iget v5, v0, Lcom/facebook/c/g$a;->JQ:I
 
     if-ne v1, v5, :cond_0
 
     goto :goto_1
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v5
 
@@ -98,12 +98,12 @@
 
     if-eqz v2, :cond_2
 
-    iget v2, v0, Lcom/facebook/c/g$a;->JH:I
+    iget v2, v0, Lcom/facebook/c/g$a;->JQ:I
 
     if-ge v1, v2, :cond_2
 
     :cond_1
-    iput v1, v0, Lcom/facebook/c/g$a;->JH:I
+    iput v1, v0, Lcom/facebook/c/g$a;->JQ:I
 
     move v4, v1
 
@@ -133,7 +133,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :cond_4
-    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gJ()Lcom/facebook/c/c;
+    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gM()Lcom/facebook/c/c;
 
     move-result-object v2
 
@@ -160,7 +160,7 @@
     invoke-virtual {v0, v2, p1}, Lcom/facebook/c/g$a;->a(Ljava/lang/Object;Z)Z
 
     :cond_6
-    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gL()V
+    invoke-virtual {v0}, Lcom/facebook/c/g$a;->gO()V
 
     return-void
 
@@ -181,7 +181,7 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JM:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
 
     iget v1, p0, Lcom/facebook/c/g$a$a;->mIndex:I
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JM:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
 
     iget v1, p0, Lcom/facebook/c/g$a$a;->mIndex:I
 
@@ -224,7 +224,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JM:Lcom/facebook/c/g$a;
+    iget-object v0, p0, Lcom/facebook/c/g$a$a;->JV:Lcom/facebook/c/g$a;
 
     invoke-interface {p1}, Lcom/facebook/c/c;->getProgress()F
 
@@ -236,7 +236,7 @@
     return-void
 .end method
 
-.method public final gG()V
+.method public final gJ()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/c/g.smali b/com.discord/smali_classes2/com/facebook/c/g.smali
index 4cffacffaa..8c417d45af 100644
--- a/com.discord/smali_classes2/com/facebook/c/g.smali
+++ b/com.discord/smali_classes2/com/facebook/c/g.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field final JA:Ljava/util/List;
+.field final JJ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final JF:Z
+.field final JO:Z
 
 
 # direct methods
@@ -66,11 +66,11 @@
 
     invoke-static {p2, v0}, Lcom/facebook/common/d/i;->checkArgument(ZLjava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/facebook/c/g;->JA:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/c/g;->JJ:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/c/g;->JF:Z
+    iput-boolean p1, p0, Lcom/facebook/c/g;->JO:Z
 
     return-void
 .end method
@@ -98,9 +98,9 @@
     :cond_1
     check-cast p1, Lcom/facebook/c/g;
 
-    iget-object v0, p0, Lcom/facebook/c/g;->JA:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/g;->JJ:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/c/g;->JA:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/c/g;->JJ: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/c/g;->JA:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/c/g;->JJ: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/c/g;->JA:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/c/g;->JJ: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 e85b62cdd9..a92d69b351 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 FZ:I = 0x1
+.field public static final Gi:I = 0x1
 
-.field public static final Ga:I = 0x2
+.field public static final Gj:I = 0x2
 
-.field public static final Gb:I = 0x3
+.field public static final Gk:I = 0x3
 
-.field public static final Gc:I = 0x4
+.field public static final Gl:I = 0x4
 
-.field public static final Gd:I = 0x5
+.field public static final Gm:I = 0x5
 
-.field public static final Ge:I = 0x6
+.field public static final Gn:I = 0x6
 
-.field public static final Gf:I = 0x7
+.field public static final Go:I = 0x7
 
-.field public static final Gg:I = 0x8
+.field public static final Gp:I = 0x8
 
-.field public static final Gh:I = 0x9
+.field public static final Gq:I = 0x9
 
-.field public static final Gi:I = 0xa
+.field public static final Gr:I = 0xa
 
-.field public static final Gj:I = 0xb
+.field public static final Gs:I = 0xb
 
-.field public static final Gk:I = 0xc
+.field public static final Gt:I = 0xc
 
-.field public static final Gl:I = 0xd
+.field public static final Gu:I = 0xd
 
-.field public static final Gm:I = 0xe
+.field public static final Gv:I = 0xe
 
-.field public static final Gn:I = 0xf
+.field public static final Gw:I = 0xf
 
-.field public static final Go:I = 0x10
+.field public static final Gx:I = 0x10
 
-.field public static final Gp:I = 0x11
+.field public static final Gy:I = 0x11
 
-.field private static final synthetic Gq:[I
+.field private static final synthetic Gz:[I
 
 
 # direct methods
@@ -68,109 +68,109 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/cache/common/a$a;->FZ:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gi:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Ga:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gj:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gb:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gk:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gc:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gl:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gd:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gm:I
 
     const/4 v2, 0x4
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Ge:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gn:I
 
     const/4 v2, 0x5
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gf:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Go:I
 
     const/4 v2, 0x6
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gg:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gp:I
 
     const/4 v2, 0x7
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gh:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gq:I
 
     const/16 v2, 0x8
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gi:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
 
     const/16 v2, 0x9
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gj:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gs:I
 
     const/16 v2, 0xa
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gk:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gt:I
 
     const/16 v2, 0xb
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gl:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gu:I
 
     const/16 v2, 0xc
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gm:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gv:I
 
     const/16 v2, 0xd
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gn:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gw:I
 
     const/16 v2, 0xe
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Go:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gx:I
 
     const/16 v2, 0xf
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gp:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gy:I
 
     const/16 v2, 0x10
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/cache/common/a$a;->Gq:[I
+    sput-object v0, Lcom/facebook/cache/common/a$a;->Gz:[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 256ccc4e63..0ebba19635 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 Gr:I = 0x1
+.field public static final GA:I = 0x1
 
-.field public static final Gs:I = 0x2
+.field public static final GB:I = 0x2
 
-.field public static final Gt:I = 0x3
+.field public static final GC:I = 0x3
 
-.field public static final Gu:I = 0x4
+.field public static final GD:I = 0x4
 
-.field private static final synthetic Gv:[I
+.field private static final synthetic GE:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Gr:I
+    sget v1, Lcom/facebook/cache/common/b$a;->GA:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Gs:I
+    sget v1, Lcom/facebook/cache/common/b$a;->GB:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Gt:I
+    sget v1, Lcom/facebook/cache/common/b$a;->GC:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/cache/common/b$a;->Gu:I
+    sget v1, Lcom/facebook/cache/common/b$a;->GD:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/cache/common/b$a;->Gv:[I
+    sput-object v0, Lcom/facebook/cache/common/b$a;->GE:[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 214f370cdd..a3aa0ecc47 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;->Gw:Ljava/util/List;
+    iget-object p0, p0, Lcom/facebook/cache/common/d;->GF: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;->Gw:Ljava/util/List;
+    iget-object p0, p0, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -146,7 +146,7 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {p0}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object p0
 
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 0e4ab61686..688cb8e69f 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 Gw:Ljava/util/List;
+.field final GF: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;->Gw:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/facebook/cache/common/d;->Gw:Ljava/util/List;
+    iget-object p1, p1, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -51,10 +51,10 @@
     return p1
 .end method
 
-.method public final fI()Ljava/lang/String;
+.method public final fL()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/cache/common/d;->Gw:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -64,7 +64,7 @@
 
     check-cast v0, Lcom/facebook/cache/common/CacheKey;
 
-    invoke-interface {v0}, Lcom/facebook/cache/common/CacheKey;->fI()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/facebook/cache/common/CacheKey;->fL()Ljava/lang/String;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/cache/common/d;->Gw:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/cache/common/d;->GF: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;->Gw:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/cache/common/d;->GF:Ljava/util/List;
 
     invoke-virtual {v1}, Ljava/lang/Object;->toString()Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/facebook/cache/common/g.smali b/com.discord/smali_classes2/com/facebook/cache/common/g.smali
index 6192421da9..e5d4a78758 100644
--- a/com.discord/smali_classes2/com/facebook/cache/common/g.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/common/g.smali
@@ -61,7 +61,7 @@
     return p1
 .end method
 
-.method public final fI()Ljava/lang/String;
+.method public final fL()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lcom/facebook/cache/common/g;->mKey: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 b8ee1f6353..423f62a2f8 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;->fR()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 Hb:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+.field final synthetic Hk: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;->Hb:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->Hk: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;->Hb:Lcom/facebook/cache/disk/DiskCacheConfig$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/DiskCacheConfig$a$1;->Hk: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 6228f6f025..4931b26931 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 GG:Ljava/util/List;
+.field final GP:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,14 +28,14 @@
     .end annotation
 .end field
 
-.field final synthetic GH:Lcom/facebook/cache/disk/a;
+.field final synthetic GQ: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;->GH:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->GQ: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;->GG:Ljava/util/List;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$a;->GP: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;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$a;->GQ: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;->GG:Ljava/util/List;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$a;->GP:Ljava/util/List;
 
     new-instance v2, Lcom/facebook/cache/disk/a$b;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/a$c;->GJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/facebook/cache/disk/a$c;->GS: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 a7277ebd08..5a1909dd49 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 GI:Lcom/facebook/a/b;
+.field final GR: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;->GI:Lcom/facebook/a/b;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$b;->GR:Lcom/facebook/a/b;
 
     const-wide/16 p1, -0x1
 
@@ -68,7 +68,7 @@
 
 
 # virtual methods
-.method public final fO()J
+.method public final fR()J
     .locals 5
 
     iget-wide v0, p0, Lcom/facebook/cache/disk/a$b;->size:J
@@ -79,7 +79,7 @@
 
     if-gez v4, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->GI:Lcom/facebook/a/b;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->GR: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;->GI:Lcom/facebook/a/b;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$b;->GR: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 08f7ad6175..53488de2b0 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 GJ:Ljava/lang/String;
+.field public final GS: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;->GJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/cache/disk/a$c;->GS: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;->GJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$c;->GS: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 3f4d39b3b5..f2018bfee3 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 GH:Lcom/facebook/cache/disk/a;
+.field final synthetic GQ:Lcom/facebook/cache/disk/a;
 
-.field private final GK:Ljava/lang/String;
+.field private final GU:Ljava/lang/String;
 
-.field final GL:Ljava/io/File;
+.field final GV: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;->GH:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$e;->GQ:Lcom/facebook/cache/disk/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/a$e;->GK:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/cache/disk/a$e;->GU:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/a$e;->GL:Ljava/io/File;
+    iput-object p3, p0, Lcom/facebook/cache/disk/a$e;->GV: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;->GL:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GV: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;->Hr:J
+    iget-wide v1, v1, Lcom/facebook/common/d/c;->HA: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;->GL:Ljava/io/File;
+    iget-object p1, p0, Lcom/facebook/cache/disk/a$e;->GV: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;->GL:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GV:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->length()J
 
@@ -109,13 +109,13 @@
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->Gf:I
+    sget v0, Lcom/facebook/cache/common/a$a;->Go:I
 
-    invoke-static {}, Lcom/facebook/cache/disk/a;->fN()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->fQ()Ljava/lang/Class;
 
     throw p1
 .end method
@@ -123,7 +123,7 @@
 .method public final cleanUp()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GL:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GV:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->exists()Z
 
@@ -131,7 +131,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GL:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GV:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
@@ -153,7 +153,7 @@
     return v0
 .end method
 
-.method public final fP()Lcom/facebook/a/a;
+.method public final fS()Lcom/facebook/a/a;
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -161,16 +161,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$e;->GQ:Lcom/facebook/cache/disk/a;
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GU:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/facebook/cache/disk/a;->am(Ljava/lang/String;)Ljava/io/File;
 
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GL:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GV:Ljava/io/File;
 
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -281,7 +281,7 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GQ:Lcom/facebook/cache/disk/a;
 
     invoke-static {v1}, Lcom/facebook/cache/disk/a;->c(Lcom/facebook/cache/disk/a;)Lcom/facebook/common/time/a;
 
@@ -317,29 +317,29 @@
 
     if-eqz v1, :cond_5
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gg:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gp:I
 
     goto :goto_1
 
     :cond_5
-    sget v1, Lcom/facebook/cache/common/a$a;->Gi:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
 
     goto :goto_1
 
     :cond_6
-    sget v1, Lcom/facebook/cache/common/a$a;->Gh:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gq:I
 
     goto :goto_1
 
     :cond_7
-    sget v1, Lcom/facebook/cache/common/a$a;->Gi:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gr:I
 
     :goto_1
-    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v1, p0, Lcom/facebook/cache/disk/a$e;->GQ: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;->fN()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/cache/disk/a;->fQ()Ljava/lang/Class;
 
     throw v0
 .end method
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 c66ad11822..cb27b2a991 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 GH:Lcom/facebook/cache/disk/a;
+.field final synthetic GQ:Lcom/facebook/cache/disk/a;
 
-.field private GM:Z
+.field private GW: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;->GH:Lcom/facebook/cache/disk/a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/a$f;->GQ: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;->GM:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GW:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ: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;->GM:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->GW: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;->GM:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GW:Z
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ: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;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ: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;->GA:J
+    sget-wide v7, Lcom/facebook/cache/disk/a;->GJ: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;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ: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;->GM:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GW: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;->GM:Z
+    iget-boolean v0, p0, Lcom/facebook/cache/disk/a$f;->GW:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GH:Lcom/facebook/cache/disk/a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/a$f;->GQ: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;->GM:Z
+    iput-boolean p1, p0, Lcom/facebook/cache/disk/a$f;->GW: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 6020511965..3bc9c1c58f 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;->fQ()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 GN:Lcom/facebook/cache/disk/b;
+.field final synthetic GX: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;->GN:Lcom/facebook/cache/disk/b;
+    iput-object p1, p0, Lcom/facebook/cache/disk/b$1;->GX: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 7a6b0aef6a..c9df210c10 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 fQ()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$a.smali b/com.discord/smali_classes2/com/facebook/cache/disk/c$a.smali
index 1a3fd05b63..174a3f75f2 100644
--- a/com.discord/smali_classes2/com/facebook/cache/disk/c$a.smali
+++ b/com.discord/smali_classes2/com/facebook/cache/disk/c$a.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract fO()J
+.method public abstract fR()J
 .end method
 
 .method public abstract getId()Ljava/lang/String;
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 3fb3897bc9..963568fa36 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
@@ -26,7 +26,7 @@
 .method public abstract cleanUp()Z
 .end method
 
-.method public abstract fP()Lcom/facebook/a/a;
+.method public abstract fS()Lcom/facebook/a/a;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
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 c1131b2762..22b13b802a 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 Hp:Lcom/facebook/cache/disk/d;
+.field final synthetic Hy: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;->Hp:Lcom/facebook/cache/disk/d;
+    iput-object p1, p0, Lcom/facebook/cache/disk/d$1;->Hy: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;->Hp:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Hy: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;->Hp:Lcom/facebook/cache/disk/d;
+    iget-object v1, p0, Lcom/facebook/cache/disk/d$1;->Hy: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;->Hp:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Hy: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;->Hp:Lcom/facebook/cache/disk/d;
+    iget-object v0, p0, Lcom/facebook/cache/disk/d$1;->Hy: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 660527250f..d5cc8c04d7 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 Hq:J
+.field private HA:J
 
-.field private Hr:J
+.field private Hz:J
 
 .field private mInitialized:Z
 
@@ -34,9 +34,9 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hq:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hr:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->HA:J
 
     return-void
 .end method
@@ -53,17 +53,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hq:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hq:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
 
-    iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hr:J
+    iget-wide p1, p0, Lcom/facebook/cache/disk/d$a;->HA:J
 
     add-long/2addr p1, p3
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hr:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->HA:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -80,13 +80,13 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fO()J
+.method public final declared-synchronized fR()J
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hq:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -102,13 +102,13 @@
     throw v0
 .end method
 
-.method public final declared-synchronized fU()J
+.method public final declared-synchronized fX()J
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hr:J
+    iget-wide v0, p0, Lcom/facebook/cache/disk/d$a;->HA: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;->Hr:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->HA:J
 
-    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hq:J
+    iput-wide v0, p0, Lcom/facebook/cache/disk/d$a;->Hz: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;->Hr:J
+    iput-wide p3, p0, Lcom/facebook/cache/disk/d$a;->HA:J
 
-    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hq:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$a;->Hz: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 e7c83fd304..051432f8f7 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 He:J
+.field public final Hn:J
 
-.field public final Hf:J
+.field public final Ho:J
 
-.field public final Hk:J
+.field public final Ht: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;->Hk:J
+    iput-wide p1, p0, Lcom/facebook/cache/disk/d$b;->Ht:J
 
-    iput-wide p3, p0, Lcom/facebook/cache/disk/d$b;->He:J
+    iput-wide p3, p0, Lcom/facebook/cache/disk/d$b;->Hn:J
 
-    iput-wide p5, p0, Lcom/facebook/cache/disk/d$b;->Hf:J
+    iput-wide p5, p0, Lcom/facebook/cache/disk/d$b;->Ho: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 c9e2e683e8..13c7573e0c 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,11 +26,11 @@
 
 
 # instance fields
-.field private final GE:Lcom/facebook/cache/common/a;
+.field private final GN:Lcom/facebook/cache/common/a;
 
-.field private final GO:Ljava/lang/String;
+.field private final GY:Ljava/lang/String;
 
-.field private final GP:Lcom/facebook/common/d/l;
+.field private final GZ:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field volatile Hs:Lcom/facebook/cache/disk/e$a;
+.field volatile HB: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/cache/disk/e;->GI: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;->GE:Lcom/facebook/cache/common/a;
+    iput-object p4, p0, Lcom/facebook/cache/disk/e;->GN:Lcom/facebook/cache/common/a;
 
-    iput-object p2, p0, Lcom/facebook/cache/disk/e;->GP:Lcom/facebook/common/d/l;
+    iput-object p2, p0, Lcom/facebook/cache/disk/e;->GZ:Lcom/facebook/common/d/l;
 
-    iput-object p3, p0, Lcom/facebook/cache/disk/e;->GO:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/cache/disk/e;->GY: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;->Hs:Lcom/facebook/cache/disk/e$a;
+    iput-object p1, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
     return-void
 .end method
 
-.method private declared-synchronized fV()Lcom/facebook/cache/disk/c;
+.method private declared-synchronized fY()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;->Hs:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Ht:Lcom/facebook/cache/disk/c;
+    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->HC:Lcom/facebook/cache/disk/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->Hu:Ljava/io/File;
+    iget-object v1, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hu:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HD: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;->Hs:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Ht:Lcom/facebook/cache/disk/c;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HC:Lcom/facebook/cache/disk/c;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hs:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hu:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hs:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Hu:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HD:Ljava/io/File;
 
     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;->GP:Lcom/facebook/common/d/l;
+    iget-object v1, p0, Lcom/facebook/cache/disk/e;->GZ:Lcom/facebook/common/d/l;
 
     invoke-interface {v1}, Lcom/facebook/common/d/l;->get()Ljava/lang/Object;
 
@@ -163,7 +163,7 @@
 
     check-cast v1, Ljava/io/File;
 
-    iget-object v2, p0, Lcom/facebook/cache/disk/e;->GO:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/cache/disk/e;->GY:Ljava/lang/String;
 
     invoke-direct {v0, v1, v2}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
     :try_end_0
@@ -176,7 +176,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    sget-object v1, Lcom/facebook/cache/disk/e;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/cache/disk/e;->GI: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;->GE:Lcom/facebook/cache/common/a;
+    iget-object v3, p0, Lcom/facebook/cache/disk/e;->GN: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;->Hs:Lcom/facebook/cache/disk/e$a;
+    iput-object v2, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
     goto :goto_2
 
     :catch_0
     move-exception v0
 
-    sget v1, Lcom/facebook/cache/common/a$a;->Gj:I
+    sget v1, Lcom/facebook/cache/common/a$a;->Gs:I
 
     throw v0
 
     :cond_3
     :goto_2
-    iget-object v0, p0, Lcom/facebook/cache/disk/e;->Hs:Lcom/facebook/cache/disk/e$a;
+    iget-object v0, p0, Lcom/facebook/cache/disk/e;->HB:Lcom/facebook/cache/disk/e$a;
 
-    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->Ht:Lcom/facebook/cache/disk/c;
+    iget-object v0, v0, Lcom/facebook/cache/disk/e$a;->HC: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;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -264,7 +264,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -283,7 +283,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
@@ -313,15 +313,15 @@
     return-object p1
 .end method
 
-.method public final fL()V
+.method public final fO()V
     .locals 3
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fL()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;->Gz:Ljava/lang/Class;
+    sget-object v1, Lcom/facebook/cache/disk/e;->GI:Ljava/lang/Class;
 
     const-string v2, "purgeUnexpectedResources"
 
@@ -339,7 +339,7 @@
     return-void
 .end method
 
-.method public final fM()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;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()Lcom/facebook/cache/disk/c;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/facebook/cache/disk/c;->fM()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;->fV()Lcom/facebook/cache/disk/c;
+    invoke-direct {p0}, Lcom/facebook/cache/disk/e;->fY()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 19e5910440..639b5c89d5 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 fQ()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 9a52bc533c..da4037be3d 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 Hv:Ljava/lang/Object;
+.field private static final HE:Ljava/lang/Object;
 
-.field private static Hw:Lcom/facebook/cache/disk/i;
+.field private static HF:Lcom/facebook/cache/disk/i;
 
-.field private static Hx:I
+.field private static HG:I
 
 
 # instance fields
-.field GK:Ljava/lang/String;
+.field GU:Ljava/lang/String;
 
-.field HA:J
+.field HH:Lcom/facebook/cache/common/CacheKey;
 
-.field HB:J
+.field HI:J
 
-.field HC:Ljava/io/IOException;
+.field HJ:J
 
-.field HD:I
+.field HK:J
 
-.field private HE:Lcom/facebook/cache/disk/i;
+.field HL:Ljava/io/IOException;
 
-.field Hy:Lcom/facebook/cache/common/CacheKey;
+.field HM:I
 
-.field Hz:J
+.field private HN: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;->Hv:Ljava/lang/Object;
+    sput-object v0, Lcom/facebook/cache/disk/i;->HE:Ljava/lang/Object;
 
     return-void
 .end method
@@ -50,33 +50,33 @@
     return-void
 .end method
 
-.method public static fW()Lcom/facebook/cache/disk/i;
+.method public static fZ()Lcom/facebook/cache/disk/i;
     .locals 3
 
-    sget-object v0, Lcom/facebook/cache/disk/i;->Hv:Ljava/lang/Object;
+    sget-object v0, Lcom/facebook/cache/disk/i;->HE:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/cache/disk/i;->Hw:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->Hw:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
 
-    iget-object v2, v1, Lcom/facebook/cache/disk/i;->HE:Lcom/facebook/cache/disk/i;
+    iget-object v2, v1, Lcom/facebook/cache/disk/i;->HN:Lcom/facebook/cache/disk/i;
 
-    sput-object v2, Lcom/facebook/cache/disk/i;->Hw:Lcom/facebook/cache/disk/i;
+    sput-object v2, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
 
     const/4 v2, 0x0
 
-    iput-object v2, v1, Lcom/facebook/cache/disk/i;->HE:Lcom/facebook/cache/disk/i;
+    iput-object v2, v1, Lcom/facebook/cache/disk/i;->HN:Lcom/facebook/cache/disk/i;
 
-    sget v2, Lcom/facebook/cache/disk/i;->Hx:I
+    sget v2, Lcom/facebook/cache/disk/i;->HG:I
 
     add-int/lit8 v2, v2, -0x1
 
-    sput v2, Lcom/facebook/cache/disk/i;->Hx:I
+    sput v2, Lcom/facebook/cache/disk/i;->HG:I
 
     monitor-exit v0
 
@@ -109,23 +109,23 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HH:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->GK:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->GU:Ljava/lang/String;
 
     const-wide/16 v1, 0x0
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->Hz:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HI:J
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HA:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HJ:J
 
-    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HB:J
+    iput-wide v1, p0, Lcom/facebook/cache/disk/i;->HK:J
 
-    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HC:Ljava/io/IOException;
+    iput-object v0, p0, Lcom/facebook/cache/disk/i;->HL:Ljava/io/IOException;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/cache/disk/i;->HD:I
+    iput v0, p0, Lcom/facebook/cache/disk/i;->HM:I
 
     return-void
 .end method
@@ -135,12 +135,12 @@
 .method public final recycle()V
     .locals 3
 
-    sget-object v0, Lcom/facebook/cache/disk/i;->Hv:Ljava/lang/Object;
+    sget-object v0, Lcom/facebook/cache/disk/i;->HE:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget v1, Lcom/facebook/cache/disk/i;->Hx:I
+    sget v1, Lcom/facebook/cache/disk/i;->HG: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;->Hx:I
+    sget v1, Lcom/facebook/cache/disk/i;->HG:I
 
     add-int/lit8 v1, v1, 0x1
 
-    sput v1, Lcom/facebook/cache/disk/i;->Hx:I
+    sput v1, Lcom/facebook/cache/disk/i;->HG:I
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->Hw:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/facebook/cache/disk/i;->Hw:Lcom/facebook/cache/disk/i;
+    sget-object v1, Lcom/facebook/cache/disk/i;->HF:Lcom/facebook/cache/disk/i;
 
-    iput-object v1, p0, Lcom/facebook/cache/disk/i;->HE:Lcom/facebook/cache/disk/i;
+    iput-object v1, p0, Lcom/facebook/cache/disk/i;->HN:Lcom/facebook/cache/disk/i;
 
     :cond_0
-    sput-object p0, Lcom/facebook/cache/disk/i;->Hw:Lcom/facebook/cache/disk/i;
+    sput-object p0, Lcom/facebook/cache/disk/i;->HF: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 97533f8dcc..335fc5102a 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 HG:Lcom/facebook/common/b/a;
+.field private static final HP: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;->HG:Lcom/facebook/common/b/a;
+    sput-object v0, Lcom/facebook/common/b/a;->HP:Lcom/facebook/common/b/a;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static fY()Lcom/facebook/common/b/a;
+.method public static gb()Lcom/facebook/common/b/a;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/a;->HG:Lcom/facebook/common/b/a;
+    sget-object v0, Lcom/facebook/common/b/a;->HP: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 252c0b5ef6..cf3bee3df5 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 HM:Lcom/facebook/common/b/b;
+.field final synthetic HV: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;->HM:Lcom/facebook/common/b/b;
+    iput-object p1, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v1, p0, Lcom/facebook/common/b/b$a;->HV: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;->ga()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->ge()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;->HM:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v1, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v2, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v0, p0, Lcom/facebook/common/b/b$a;->HV: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;->ga()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->ge()Ljava/lang/Class;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HM:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v2, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v3, p0, Lcom/facebook/common/b/b$a;->HV: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;->HM:Lcom/facebook/common/b/b;
+    iget-object v0, p0, Lcom/facebook/common/b/b$a;->HV: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;->ga()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/common/b/b;->ge()Ljava/lang/Class;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/common/b/b$a;->HM:Lcom/facebook/common/b/b;
+    iget-object v4, p0, Lcom/facebook/common/b/b$a;->HV: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 3e65806e4e..d6def324a6 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field private volatile HH:I
+.field private volatile HQ:I
 
-.field private final HI:Ljava/util/concurrent/BlockingQueue;
+.field private final HR: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 HJ:Lcom/facebook/common/b/b$a;
+.field private final HS:Lcom/facebook/common/b/b$a;
 
-.field private final HK:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final HT:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final HL:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final HU: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/common/b/b;->GI:Ljava/lang/Class;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/facebook/common/b/b;->HH:I
+    iput p1, p0, Lcom/facebook/common/b/b;->HQ:I
 
-    iput-object p3, p0, Lcom/facebook/common/b/b;->HI:Ljava/util/concurrent/BlockingQueue;
+    iput-object p3, p0, Lcom/facebook/common/b/b;->HR: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;->HJ:Lcom/facebook/common/b/b$a;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->HS: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;->HK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->HT: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;->HL:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lcom/facebook/common/b/b;->HU: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;->HI:Ljava/util/concurrent/BlockingQueue;
+    iget-object p0, p0, Lcom/facebook/common/b/b;->HR: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;->HK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lcom/facebook/common/b/b;->HT: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;->fZ()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->gd()V
 
     return-void
 .end method
 
-.method private fZ()V
+.method private gd()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/common/b/b;->HK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HT: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;->HH:I
+    iget v1, p0, Lcom/facebook/common/b/b;->HQ:I
 
     if-ge v0, v1, :cond_1
 
     add-int/lit8 v1, v0, 0x1
 
-    iget-object v2, p0, Lcom/facebook/common/b/b;->HK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lcom/facebook/common/b/b;->HT: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;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GI: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;->HH:I
+    iget v3, p0, Lcom/facebook/common/b/b;->HQ: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;->HJ:Lcom/facebook/common/b/b$a;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->HS: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;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GI: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;->HK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HT: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 ga()Ljava/lang/Class;
+.method static synthetic ge()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/b/b;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GI: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;->HI:Ljava/util/concurrent/BlockingQueue;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HR: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;->HI:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p0, Lcom/facebook/common/b/b;->HR: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;->HL:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/facebook/common/b/b;->HU: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;->HL:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->HU: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;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/common/b/b;->GI: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;->fZ()V
+    invoke-direct {p0}, Lcom/facebook/common/b/b;->gd()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;->HI:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/facebook/common/b/b;->HR:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v1}, Ljava/util/concurrent/BlockingQueue;->size()I
 
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 8f3f80cc1f..97df064c21 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 Hr:J
+.field public HA:J
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/common/d/c;->Hr:J
+    iput-wide v0, p0, Lcom/facebook/common/d/c;->HA: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;->Hr:J
+    iget-wide v0, p0, Lcom/facebook/common/d/c;->HA:J
 
     const-wide/16 v2, 0x1
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lcom/facebook/common/d/c;->Hr:J
+    iput-wide v0, p0, Lcom/facebook/common/d/c;->HA: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;->Hr:J
+    iget-wide p1, p0, Lcom/facebook/common/d/c;->HA:J
 
     int-to-long v0, p3
 
     add-long/2addr p1, v0
 
-    iput-wide p1, p0, Lcom/facebook/common/d/c;->Hr:J
+    iput-wide p1, p0, Lcom/facebook/common/d/c;->HA:J
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/d/k.smali b/com.discord/smali_classes2/com/facebook/common/d/k.smali
index 80c261b644..f77e6d1d52 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/k.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/k.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static gg()Ljava/util/Set;
+.method public static gj()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/common/d/m$1.smali b/com.discord/smali_classes2/com/facebook/common/d/m$1.smali
index 193f393149..e9228c57de 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/m$1.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/m$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic HX:Ljava/lang/Object;
+.field final synthetic Ig:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/common/d/m$1;->HX:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/facebook/common/d/m$1;->Ig: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/m$1;->HX:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/facebook/common/d/m$1;->Ig:Ljava/lang/Object;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/common/d/m.smali b/com.discord/smali_classes2/com/facebook/common/d/m.smali
index 3a4828adb4..d6d18f8d8b 100644
--- a/com.discord/smali_classes2/com/facebook/common/d/m.smali
+++ b/com.discord/smali_classes2/com/facebook/common/d/m.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final HV:Lcom/facebook/common/d/l;
+.field public static final Ie:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public static final HW:Lcom/facebook/common/d/l;
+.field public static final If:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -33,13 +33,13 @@
 
     invoke-direct {v0}, Lcom/facebook/common/d/m$2;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/d/m;->HV:Lcom/facebook/common/d/l;
+    sput-object v0, Lcom/facebook/common/d/m;->Ie:Lcom/facebook/common/d/l;
 
     new-instance v0, Lcom/facebook/common/d/m$3;
 
     invoke-direct {v0}, Lcom/facebook/common/d/m$3;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/d/m;->HW:Lcom/facebook/common/d/l;
+    sput-object v0, Lcom/facebook/common/d/m;->If:Lcom/facebook/common/d/l;
 
     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 85a0126161..91a5caf2b9 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 HY:Lcom/facebook/common/e/c;
+.field private static Ih:Lcom/facebook/common/e/c;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/common/e/b;->gh()Lcom/facebook/common/e/b;
+    invoke-static {}, Lcom/facebook/common/e/b;->gk()Lcom/facebook/common/e/b;
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/common/e/a;->HY:Lcom/facebook/common/e/c;
+    sput-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
 
     return-void
 .end method
@@ -23,7 +23,7 @@
 .method public static D(I)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/e/a;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0}, Lcom/facebook/common/e/c;->D(I)Z
 
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -429,7 +429,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
 
     const/4 v1, 0x0
 
@@ -659,7 +659,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/common/e/a;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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 x(Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/common/e/a;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih: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;->HY:Lcom/facebook/common/e/c;
+    sget-object v0, Lcom/facebook/common/e/a;->Ih:Lcom/facebook/common/e/c;
 
     invoke-interface {v0, p0, p1}, Lcom/facebook/common/e/c;->x(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 d8c726e4e1..b21a961a1f 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 HZ:Lcom/facebook/common/e/b;
+.field public static final Ii:Lcom/facebook/common/e/b;
 
 
 # instance fields
-.field private Ia:Ljava/lang/String;
+.field private Ij:Ljava/lang/String;
 
-.field private Ib:I
+.field private Ik: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;->HZ:Lcom/facebook/common/e/b;
+    sput-object v0, Lcom/facebook/common/e/b;->Ii: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;->Ia:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/common/e/b;->Ij:Ljava/lang/String;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lcom/facebook/common/e/b;->Ib:I
+    iput v0, p0, Lcom/facebook/common/e/b;->Ik:I
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 .method private aq(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/common/e/b;->Ia:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/common/e/b;->Ij: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;->Ia:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/common/e/b;->Ij:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -155,10 +155,10 @@
     return-object p0
 .end method
 
-.method public static gh()Lcom/facebook/common/e/b;
+.method public static gk()Lcom/facebook/common/e/b;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/e/b;->HZ:Lcom/facebook/common/e/b;
+    sget-object v0, Lcom/facebook/common/e/b;->Ii:Lcom/facebook/common/e/b;
 
     return-object v0
 .end method
@@ -168,7 +168,7 @@
 .method public final D(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/facebook/common/e/b;->Ib:I
+    iget v0, p0, Lcom/facebook/common/e/b;->Ik: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 8c8456c945..094bfa176e 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 Id:Landroid/webkit/MimeTypeMap;
+.field private static final Im:Landroid/webkit/MimeTypeMap;
 
-.field private static final Ie:Ljava/util/Map;
+.field private static final In:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final If:Ljava/util/Map;
+.field private static final Io: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;->Id:Landroid/webkit/MimeTypeMap;
+    sput-object v0, Lcom/facebook/common/f/b;->Im:Landroid/webkit/MimeTypeMap;
 
     const-string v0, "heic"
 
@@ -51,13 +51,13 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/facebook/common/f/b;->Ie:Ljava/util/Map;
+    sput-object v4, Lcom/facebook/common/f/b;->In: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;->If:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/f/b;->Io:Ljava/util/Map;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 .method public static at(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/f/b;->If:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/f/b;->Io: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;->Id:Landroid/webkit/MimeTypeMap;
+    sget-object v0, Lcom/facebook/common/f/b;->Im: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 d4446a9706..834b7a4293 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 Ig:Lcom/facebook/common/g/c;
+.field private static Ip:Lcom/facebook/common/g/c;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized gi()Lcom/facebook/common/g/c;
+.method public static declared-synchronized gl()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;->Ig:Lcom/facebook/common/g/c;
+    sget-object v1, Lcom/facebook/common/g/c;->Ip: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;->Ig:Lcom/facebook/common/g/c;
+    sput-object v1, Lcom/facebook/common/g/c;->Ip:Lcom/facebook/common/g/c;
 
     :cond_0
-    sget-object v1, Lcom/facebook/common/g/c;->Ig:Lcom/facebook/common/g/c;
+    sget-object v1, Lcom/facebook/common/g/c;->Ip: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 511f607394..0b801f62ac 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 Ih:Ljava/io/InputStream;
+.field private final Iq:Ljava/io/InputStream;
 
-.field private final Ii:[B
+.field private final Ir:[B
 
-.field private final Ij:Lcom/facebook/common/references/b;
+.field private final Is: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 Ik:I
+.field private It:I
 
-.field private Il:I
+.field private Iu:I
 
 .field private mClosed:Z
 
@@ -45,7 +45,7 @@
 
     check-cast p1, Ljava/io/InputStream;
 
-    iput-object p1, p0, Lcom/facebook/common/g/e;->Ih:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Iq: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;->Ii:[B
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Ir:[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;->Ij:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/common/g/e;->Is:Lcom/facebook/common/references/b;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/common/g/e;->Ik:I
+    iput p1, p0, Lcom/facebook/common/g/e;->It:I
 
-    iput p1, p0, Lcom/facebook/common/g/e;->Il:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     iput-boolean p1, p0, Lcom/facebook/common/g/e;->mClosed:Z
 
     return-void
 .end method
 
-.method private gj()Z
+.method private gm()Z
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -82,9 +82,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v1, p0, Lcom/facebook/common/g/e;->It:I
 
     const/4 v2, 0x1
 
@@ -93,9 +93,9 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Ih:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Iq:Ljava/io/InputStream;
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->Ii:[B
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Ir:[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;->Ik:I
+    iput v0, p0, Lcom/facebook/common/g/e;->It:I
 
-    iput v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iput v1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     return v2
 .end method
 
-.method private gk()V
+.method private gn()V
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -149,9 +149,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v1, p0, Lcom/facebook/common/g/e;->It: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;->gk()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gn()V
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v0, p0, Lcom/facebook/common/g/e;->It:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     sub-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->Ih:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Iq: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;->Ij:Lcom/facebook/common/references/b;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Is:Lcom/facebook/common/references/b;
 
-    iget-object v1, p0, Lcom/facebook/common/g/e;->Ii:[B
+    iget-object v1, p0, Lcom/facebook/common/g/e;->Ir:[B
 
     invoke-interface {v0, v1}, Lcom/facebook/common/references/b;->r(Ljava/lang/Object;)V
 
@@ -246,9 +246,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v1, p0, Lcom/facebook/common/g/e;->It: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;->gk()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gn()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->gj()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gm()Z
 
     move-result v0
 
@@ -275,13 +275,13 @@
     return v0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Ii:[B
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Ir:[B
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lcom/facebook/common/g/e;->Il:I
+    iput v2, p0, Lcom/facebook/common/g/e;->Iu:I
 
     aget-byte v0, v0, v1
 
@@ -298,9 +298,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v1, p0, Lcom/facebook/common/g/e;->It: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;->gk()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gn()V
 
-    invoke-direct {p0}, Lcom/facebook/common/g/e;->gj()Z
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gm()Z
 
     move-result v0
 
@@ -327,9 +327,9 @@
     return p1
 
     :cond_1
-    iget v0, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v0, p0, Lcom/facebook/common/g/e;->It:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     sub-int/2addr v0, v1
 
@@ -337,17 +337,17 @@
 
     move-result p3
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Ii:[B
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Ir:[B
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iu: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;->Il:I
+    iget p1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     add-int/2addr p1, p3
 
-    iput p1, p0, Lcom/facebook/common/g/e;->Il:I
+    iput p1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     return p3
 .end method
@@ -360,9 +360,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v0, p0, Lcom/facebook/common/g/e;->Iu:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v1, p0, Lcom/facebook/common/g/e;->It: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;->gk()V
+    invoke-direct {p0}, Lcom/facebook/common/g/e;->gn()V
 
-    iget v0, p0, Lcom/facebook/common/g/e;->Ik:I
+    iget v0, p0, Lcom/facebook/common/g/e;->It:I
 
-    iget v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iget v1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     sub-int v2, v0, v1
 
@@ -396,14 +396,14 @@
 
     long-to-int v1, v0
 
-    iput v1, p0, Lcom/facebook/common/g/e;->Il:I
+    iput v1, p0, Lcom/facebook/common/g/e;->Iu:I
 
     return-wide p1
 
     :cond_1
-    iput v0, p0, Lcom/facebook/common/g/e;->Il:I
+    iput v0, p0, Lcom/facebook/common/g/e;->Iu:I
 
-    iget-object v0, p0, Lcom/facebook/common/g/e;->Ih:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/common/g/e;->Iq: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 0c8e204b81..715d338287 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 gm()Lcom/facebook/common/g/i;
+.method public abstract gp()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 dd91e9755c..11933ad153 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 Im:Lcom/facebook/common/g/f;
+.field final Iv:Lcom/facebook/common/g/f;
 
-.field In:I
+.field Iw: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;->Im:Lcom/facebook/common/g/f;
+    iput-object p1, p0, Lcom/facebook/common/g/h;->Iv: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;->In:I
+    iput p1, p0, Lcom/facebook/common/g/h;->Iw: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;->Im:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Iv: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;->In:I
+    iput p1, p0, Lcom/facebook/common/g/h;->Iw:I
 
     return-void
 .end method
@@ -92,7 +92,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/common/g/h;->Im:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Iv: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;->Im:Lcom/facebook/common/g/f;
+    iget-object v0, p0, Lcom/facebook/common/g/h;->Iv: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;->In:I
+    iget v0, p0, Lcom/facebook/common/g/h;->Iw: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 394928f2c5..041fd2252c 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 gn()Lcom/facebook/common/g/f;
+.method public abstract gq()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 604d84f980..156fa7c613 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 Io:I
+.field private final Ix:I
 
-.field private final Ip:Lcom/facebook/common/g/a;
+.field private final Iy:Lcom/facebook/common/g/a;
 
 
 # direct methods
@@ -31,9 +31,9 @@
 
     const/16 p2, 0x4000
 
-    iput p2, p0, Lcom/facebook/common/g/j;->Io:I
+    iput p2, p0, Lcom/facebook/common/g/j;->Ix:I
 
-    iput-object p1, p0, Lcom/facebook/common/g/j;->Ip:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
 
     return-void
 .end method
@@ -48,9 +48,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/common/g/j;->Ip:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
 
-    iget v1, p0, Lcom/facebook/common/g/j;->Io:I
+    iget v1, p0, Lcom/facebook/common/g/j;->Ix: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;->Io:I
+    iget v3, p0, Lcom/facebook/common/g/j;->Ix:I
 
     const/4 v4, 0x0
 
@@ -76,7 +76,7 @@
 
     if-ne v3, v5, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/common/g/j;->Ip:Lcom/facebook/common/g/a;
+    iget-object p1, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
 
     invoke-interface {p1, v0}, Lcom/facebook/common/g/a;->r(Ljava/lang/Object;)V
 
@@ -97,7 +97,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/facebook/common/g/j;->Ip:Lcom/facebook/common/g/a;
+    iget-object p2, p0, Lcom/facebook/common/g/j;->Iy:Lcom/facebook/common/g/a;
 
     invoke-interface {p2, v0}, Lcom/facebook/common/g/a;->r(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 7961410553..64f052cd79 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 IJ:I = 0x1
+.field public static final IT:I = 0x1
 
-.field public static final IK:I = 0x2
+.field public static final IU:I = 0x2
 
-.field private static final synthetic IL:[I
+.field private static final synthetic IV:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/common/h/a$a;->IJ:I
+    sget v1, Lcom/facebook/common/h/a$a;->IT:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/common/h/a$a;->IK:I
+    sget v1, Lcom/facebook/common/h/a$a;->IU:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/common/h/a$a;->IL:[I
+    sput-object v0, Lcom/facebook/common/h/a$a;->IV:[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 5affa79f3e..821a00b8e4 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 IM:I
+.field private IW:I
 
-.field private IO:I
+.field private IX:I
 
 
 # direct methods
@@ -19,11 +19,11 @@
 
     if-ltz p2, :cond_0
 
-    iput p2, p0, Lcom/facebook/common/i/a;->IM:I
+    iput p2, p0, Lcom/facebook/common/i/a;->IW:I
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/facebook/common/i/a;->IO:I
+    iput p1, p0, Lcom/facebook/common/i/a;->IX:I
 
     return-void
 
@@ -60,7 +60,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/common/i/a;->IM:I
+    iget v1, p0, Lcom/facebook/common/i/a;->IW: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;->IM:I
+    iget p1, p0, Lcom/facebook/common/i/a;->IW:I
 
-    iput p1, p0, Lcom/facebook/common/i/a;->IO:I
+    iput p1, p0, Lcom/facebook/common/i/a;->IX:I
 
     :cond_0
     return-void
@@ -100,7 +100,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IM:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
 
     const/4 v1, -0x1
 
@@ -117,11 +117,11 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v1, p0, Lcom/facebook/common/i/a;->IM:I
+    iget v1, p0, Lcom/facebook/common/i/a;->IW:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iput v1, p0, Lcom/facebook/common/i/a;->IM:I
+    iput v1, p0, Lcom/facebook/common/i/a;->IW:I
 
     :cond_1
     return v0
@@ -135,7 +135,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IM:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
 
     if-nez v0, :cond_0
 
@@ -156,11 +156,11 @@
 
     if-lez p1, :cond_1
 
-    iget p2, p0, Lcom/facebook/common/i/a;->IM:I
+    iget p2, p0, Lcom/facebook/common/i/a;->IW:I
 
     sub-int/2addr p2, p1
 
-    iput p2, p0, Lcom/facebook/common/i/a;->IM:I
+    iput p2, p0, Lcom/facebook/common/i/a;->IW:I
 
     :cond_1
     return p1
@@ -182,7 +182,7 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IO:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IX: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;->IO:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IX:I
 
-    iput v0, p0, Lcom/facebook/common/i/a;->IM:I
+    iput v0, p0, Lcom/facebook/common/i/a;->IW:I
 
     return-void
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IM:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
 
     int-to-long v0, v0
 
@@ -239,7 +239,7 @@
 
     move-result-wide p1
 
-    iget v0, p0, Lcom/facebook/common/i/a;->IM:I
+    iget v0, p0, Lcom/facebook/common/i/a;->IW:I
 
     int-to-long v0, v0
 
@@ -247,7 +247,7 @@
 
     long-to-int v1, v0
 
-    iput v1, p0, Lcom/facebook/common/i/a;->IM:I
+    iput v1, p0, Lcom/facebook/common/i/a;->IW: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 8143138ad1..a6ccd927f7 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 IP:[B
+.field private final IY:[B
 
-.field private IQ:I
+.field private IZ:I
 
-.field private IR:I
+.field private Ja:I
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/facebook/common/i/b;->IP:[B
+    iput-object p2, p0, Lcom/facebook/common/i/b;->IY:[B
 
     return-void
 
@@ -40,12 +40,12 @@
     throw p1
 .end method
 
-.method private gx()I
+.method private gA()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/common/i/b;->IQ:I
+    iget v0, p0, Lcom/facebook/common/i/b;->IZ:I
 
-    iget-object v1, p0, Lcom/facebook/common/i/b;->IP:[B
+    iget-object v1, p0, Lcom/facebook/common/i/b;->IY:[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;->IQ:I
+    iput v2, p0, Lcom/facebook/common/i/b;->IZ: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;->IQ:I
+    iget p1, p0, Lcom/facebook/common/i/b;->IZ:I
 
-    iput p1, p0, Lcom/facebook/common/i/b;->IR:I
+    iput p1, p0, Lcom/facebook/common/i/b;->Ja:I
 
     :cond_0
     return-void
@@ -111,7 +111,7 @@
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->gx()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->gA()I
 
     move-result v0
 
@@ -168,7 +168,7 @@
     :goto_0
     if-ge v0, p3, :cond_2
 
-    invoke-direct {p0}, Lcom/facebook/common/i/b;->gx()I
+    invoke-direct {p0}, Lcom/facebook/common/i/b;->gA()I
 
     move-result v2
 
@@ -213,9 +213,9 @@
 
     invoke-virtual {v0}, Ljava/io/InputStream;->reset()V
 
-    iget v0, p0, Lcom/facebook/common/i/b;->IR:I
+    iget v0, p0, Lcom/facebook/common/i/b;->Ja:I
 
-    iput v0, p0, Lcom/facebook/common/i/b;->IQ:I
+    iput v0, p0, Lcom/facebook/common/i/b;->IZ: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 52cf653f1d..55f1646294 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 IU:[B
+.field static final Jd:[B
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/facebook/common/j/c;->IU:[B
+    sput-object v0, Lcom/facebook/common/j/c;->Jd:[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 f96eabc35f..12b3687c94 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 IV:Lcom/facebook/common/j/e;
+.field public static final enum Je:Lcom/facebook/common/j/e;
 
-.field public static final enum IW:Lcom/facebook/common/j/e;
+.field public static final enum Jf:Lcom/facebook/common/j/e;
 
-.field public static final enum IX:Lcom/facebook/common/j/e;
+.field public static final enum Jg:Lcom/facebook/common/j/e;
 
-.field private static final synthetic IY:[Lcom/facebook/common/j/e;
+.field private static final synthetic Jh:[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;->IV:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Je: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;->IW:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Jf: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;->IX:Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Jg: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;->IV:Lcom/facebook/common/j/e;
+    sget-object v4, Lcom/facebook/common/j/e;->Je:Lcom/facebook/common/j/e;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/common/j/e;->IW:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jf:Lcom/facebook/common/j/e;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/common/j/e;->IX:Lcom/facebook/common/j/e;
+    sget-object v1, Lcom/facebook/common/j/e;->Jg:Lcom/facebook/common/j/e;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/common/j/e;->IY:[Lcom/facebook/common/j/e;
+    sput-object v0, Lcom/facebook/common/j/e;->Jh:[Lcom/facebook/common/j/e;
 
     return-void
 .end method
@@ -96,12 +96,12 @@
 
     if-eqz p0, :cond_0
 
-    sget-object p0, Lcom/facebook/common/j/e;->IV:Lcom/facebook/common/j/e;
+    sget-object p0, Lcom/facebook/common/j/e;->Je:Lcom/facebook/common/j/e;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/facebook/common/j/e;->IW:Lcom/facebook/common/j/e;
+    sget-object p0, Lcom/facebook/common/j/e;->Jf: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;->IY:[Lcom/facebook/common/j/e;
+    sget-object v0, Lcom/facebook/common/j/e;->Jh:[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 65928ad362..e282ccceda 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 Iw:Ljava/lang/ref/SoftReference;
+.field public IF:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field public Ix:Ljava/lang/ref/SoftReference;
+.field public IG:Ljava/lang/ref/SoftReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/SoftReference<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public Iy:Ljava/lang/ref/SoftReference;
+.field public IH: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;->Iw:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->IF:Ljava/lang/ref/SoftReference;
 
-    iput-object v0, p0, Lcom/facebook/common/references/a;->Ix:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
 
-    iput-object v0, p0, Lcom/facebook/common/references/a;->Iy:Ljava/lang/ref/SoftReference;
+    iput-object v0, p0, Lcom/facebook/common/references/a;->IH: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 c0a7fa9108..5fcc5235b0 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 Iz:Ljava/util/Map;
+.field private static final II:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,9 +34,9 @@
 
 
 # instance fields
-.field private IA:I
+.field private IJ:I
 
-.field final Ij:Lcom/facebook/common/references/b;
+.field final Is:Lcom/facebook/common/references/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/references/b<",
@@ -62,7 +62,7 @@
 
     invoke-direct {v0}, Ljava/util/IdentityHashMap;-><init>()V
 
-    sput-object v0, Lcom/facebook/common/references/c;->Iz:Ljava/util/Map;
+    sput-object v0, Lcom/facebook/common/references/c;->II: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;->Ij:Lcom/facebook/common/references/b;
+    iput-object p2, p0, Lcom/facebook/common/references/c;->Is:Lcom/facebook/common/references/b;
 
     const/4 p2, 0x1
 
-    iput p2, p0, Lcom/facebook/common/references/c;->IA:I
+    iput p2, p0, Lcom/facebook/common/references/c;->IJ:I
 
-    sget-object v0, Lcom/facebook/common/references/c;->Iz:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/references/c;->Iz:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->II: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;->Iz:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->II: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;->Iz:Ljava/util/Map;
+    sget-object v2, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -178,7 +178,7 @@
     return p0
 .end method
 
-.method private gt()V
+.method private gw()V
     .locals 1
 
     invoke-static {p0}, Lcom/facebook/common/references/c;->a(Lcom/facebook/common/references/c;)Z
@@ -203,7 +203,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -238,12 +238,12 @@
 .method static s(Ljava/lang/Object;)V
     .locals 5
 
-    sget-object v0, Lcom/facebook/common/references/c;->Iz:Ljava/util/Map;
+    sget-object v0, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/common/references/c;->Iz:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
 
     invoke-interface {v1, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -280,14 +280,14 @@
 
     if-ne v3, v2, :cond_1
 
-    sget-object v1, Lcom/facebook/common/references/c;->Iz:Ljava/util/Map;
+    sget-object v1, Lcom/facebook/common/references/c;->II: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;->Iz:Ljava/util/Map;
+    sget-object v3, Lcom/facebook/common/references/c;->II:Ljava/util/Map;
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
@@ -345,19 +345,19 @@
     throw v0
 .end method
 
-.method public final declared-synchronized gr()V
+.method public final declared-synchronized gu()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->gt()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->gw()V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iput v0, p0, Lcom/facebook/common/references/c;->IJ:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -373,15 +373,15 @@
     throw v0
 .end method
 
-.method final declared-synchronized gs()I
+.method final declared-synchronized gv()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/facebook/common/references/c;->gt()V
+    invoke-direct {p0}, Lcom/facebook/common/references/c;->gw()V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
 
     const/4 v1, 0x1
 
@@ -397,13 +397,13 @@
     :goto_0
     invoke-static {v0}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IJ:I
 
     sub-int/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iput v0, p0, Lcom/facebook/common/references/c;->IJ:I
 
-    iget v0, p0, Lcom/facebook/common/references/c;->IA:I
+    iget v0, p0, Lcom/facebook/common/references/c;->IJ: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 a5f182b38d..3aa58ec0b8 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 IS:Lcom/facebook/common/time/RealtimeSinceBootClock;
+.field private static final Jb: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;->IS:Lcom/facebook/common/time/RealtimeSinceBootClock;
+    sput-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->Jb: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;->IS:Lcom/facebook/common/time/RealtimeSinceBootClock;
+    sget-object v0, Lcom/facebook/common/time/RealtimeSinceBootClock;->Jb: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 bc48a1eb60..a0ac0bd60c 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 IT:Lcom/facebook/common/time/c;
+.field private static final Jc: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;->IT:Lcom/facebook/common/time/c;
+    sput-object v0, Lcom/facebook/common/time/c;->Jc:Lcom/facebook/common/time/c;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static gy()Lcom/facebook/common/time/c;
+.method public static gB()Lcom/facebook/common/time/c;
     .locals 1
 
-    sget-object v0, Lcom/facebook/common/time/c;->IT:Lcom/facebook/common/time/c;
+    sget-object v0, Lcom/facebook/common/time/c;->Jc:Lcom/facebook/common/time/c;
 
     return-object v0
 .end method
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 deff4ee9ed..d1d16ac2fa 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/R$a.smali
@@ -171,16 +171,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -194,7 +193,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_1
@@ -206,16 +206,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -229,7 +228,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .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 24e5d22675..8154947e67 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 KV:Lcom/facebook/drawee/a/a;
+.field final synthetic Le: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;->KV:Lcom/facebook/drawee/a/a;
+    iput-object p1, p0, Lcom/facebook/drawee/a/a$1;->Le: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;->ha()V
+    invoke-static {}, Lcom/facebook/drawee/a/a;->hd()V
 
-    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->KV:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->Le: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;->KV:Lcom/facebook/drawee/a/a;
+    iget-object v0, p0, Lcom/facebook/drawee/a/a$1;->Le: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 44ceb9a2e3..908c36ac9e 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,23 +23,19 @@
 
 
 # static fields
-.field public static final enum KZ:Lcom/facebook/drawee/a/b$a;
+.field public static final enum LA:Lcom/facebook/drawee/a/b$a;
 
-.field public static final enum La:Lcom/facebook/drawee/a/b$a;
+.field public static final enum LB:Lcom/facebook/drawee/a/b$a;
 
-.field public static final enum Lb:Lcom/facebook/drawee/a/b$a;
+.field public static final enum LC:Lcom/facebook/drawee/a/b$a;
 
-.field public static final enum Lc:Lcom/facebook/drawee/a/b$a;
+.field public static final enum LD:Lcom/facebook/drawee/a/b$a;
 
-.field public static final enum Ld:Lcom/facebook/drawee/a/b$a;
+.field public static final enum LE:Lcom/facebook/drawee/a/b$a;
 
-.field public static final enum Le:Lcom/facebook/drawee/a/b$a;
+.field public static final enum LF:Lcom/facebook/drawee/a/b$a;
 
-.field public static final enum Lf:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum Lg:Lcom/facebook/drawee/a/b$a;
-
-.field public static final enum Lh:Lcom/facebook/drawee/a/b$a;
+.field private static final synthetic LG:[Lcom/facebook/drawee/a/b$a;
 
 .field public static final enum Li:Lcom/facebook/drawee/a/b$a;
 
@@ -71,7 +67,11 @@
 
 .field public static final enum Lw:Lcom/facebook/drawee/a/b$a;
 
-.field private static final synthetic Lx:[Lcom/facebook/drawee/a/b$a;
+.field public static final enum Lx:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Ly:Lcom/facebook/drawee/a/b$a;
+
+.field public static final enum Lz: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;->KZ:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Li: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;->La:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lj: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;->Lb:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lk: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;->Lc:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ll: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;->Ld:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lm: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;->Le:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ln: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;->Lf:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lo: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;->Lg:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lp: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;->Lh:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lq: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;->Li:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lr: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;->Lj:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ls: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;->Lk:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lt: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;->Ll:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lu: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;->Lm:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lv: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;->Ln:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lw: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;->Lo:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lx: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;->Lp:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Ly: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;->Lq:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lz: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;->Lr:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LA: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;->Ls:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LB: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;->Lt:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LC: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;->Lu:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LD: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;->Lv:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LE: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;->Lw:Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LF: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;->KZ:Lcom/facebook/drawee/a/b$a;
+    sget-object v14, Lcom/facebook/drawee/a/b$a;->Li:Lcom/facebook/drawee/a/b$a;
 
     aput-object v14, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->La:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lj:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lb:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lk:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lc:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ll:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ld:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lm:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Le:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ln:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lf:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lo:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lg:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lp:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lh:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lq:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Li:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lr:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lj:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ls:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lk:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lt:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v12
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ll:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lu:Lcom/facebook/drawee/a/b$a;
 
     aput-object v1, v0, v13
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lm:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lv:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0xd
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ln:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lw:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0xe
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lo:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lx:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0xf
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lp:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ly:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lq:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lz:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x11
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lr:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LA:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x12
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Ls:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LB:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x13
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lt:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LC:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x14
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lu:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LD:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x15
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lv:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LE:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x16
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/a/b$a;->Lw:Lcom/facebook/drawee/a/b$a;
+    sget-object v1, Lcom/facebook/drawee/a/b$a;->LF:Lcom/facebook/drawee/a/b$a;
 
     const/16 v2, 0x17
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/a/b$a;->Lx:[Lcom/facebook/drawee/a/b$a;
+    sput-object v0, Lcom/facebook/drawee/a/b$a;->LG:[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;->Lx:[Lcom/facebook/drawee/a/b$a;
+    sget-object v0, Lcom/facebook/drawee/a/b$a;->LG:[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 00e57ef324..511a0237ee 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 KX:Lcom/facebook/drawee/a/b;
+.field private static final Lg:Lcom/facebook/drawee/a/b;
 
-.field private static KY:Z
+.field private static Lh:Z
 
 
 # instance fields
-.field private final KW:Ljava/util/Queue;
+.field private final Lf: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;->KX:Lcom/facebook/drawee/a/b;
+    sput-object v0, Lcom/facebook/drawee/a/b;->Lg:Lcom/facebook/drawee/a/b;
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/drawee/a/b;->KY:Z
+    sput-boolean v0, Lcom/facebook/drawee/a/b;->Lh: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;->KW:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/facebook/drawee/a/b;->Lf:Ljava/util/Queue;
 
     return-void
 .end method
 
-.method public static hb()Lcom/facebook/drawee/a/b;
+.method public static he()Lcom/facebook/drawee/a/b;
     .locals 1
 
-    sget-boolean v0, Lcom/facebook/drawee/a/b;->KY:Z
+    sget-boolean v0, Lcom/facebook/drawee/a/b;->Lh:Z
 
     if-eqz v0, :cond_0
 
@@ -76,7 +76,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/facebook/drawee/a/b;->KX:Lcom/facebook/drawee/a/b;
+    sget-object v0, Lcom/facebook/drawee/a/b;->Lg: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;->KY:Z
+    sget-boolean v0, Lcom/facebook/drawee/a/b;->Lh:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->KW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lf: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;->KW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lf:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/a/b;->KW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lf: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;->KW:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/drawee/a/b;->Lf: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 2f159be1a8..8036ce2cbc 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 LA:I
+.field public LH:Z
 
-.field public Ly:Z
+.field private LI:I
 
-.field private Lz:I
+.field public LJ:I
 
 
 # direct methods
@@ -24,16 +24,16 @@
 
 
 # virtual methods
-.method public final hc()Z
+.method public final hf()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->Ly:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/a/c;->LH:Z
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/facebook/drawee/a/c;->LA:I
+    iget v0, p0, Lcom/facebook/drawee/a/c;->LJ:I
 
-    iget v1, p0, Lcom/facebook/drawee/a/c;->Lz:I
+    iget v1, p0, Lcom/facebook/drawee/a/c;->LI:I
 
     if-ge v0, v1, :cond_0
 
@@ -52,13 +52,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/drawee/a/c;->Ly:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/a/c;->LH:Z
 
     const/4 v1, 0x4
 
-    iput v1, p0, Lcom/facebook/drawee/a/c;->Lz:I
+    iput v1, p0, Lcom/facebook/drawee/a/c;->LI:I
 
-    iput v0, p0, Lcom/facebook/drawee/a/c;->LA:I
+    iput v0, p0, Lcom/facebook/drawee/a/c;->LJ: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 808e46a862..a5bc184e59 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 Kk:I
+.field public Kt:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kk:I
+    iput v0, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kt:I
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 .method public final a(Ljava/lang/String;IZLjava/lang/String;)V
     .locals 0
 
-    iput p2, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kk:I
+    iput p2, p0, Lcom/facebook/drawee/backends/pipeline/a/a;->Kt: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 053b7c2888..be458a6e12 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 Kl:Ljava/util/List;
+.field private final Ku: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;->Kl:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Ku:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Kl:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Ku: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;->Kl:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Ku: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;->Kl:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Ku: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;->Kl:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Ku: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;->Kl:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a;->Ku: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 a13a515b0e..82bfd9ac69 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 JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+.field private final KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
 
 # 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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Ki:Lcom/facebook/drawee/backends/pipeline/b/g;
 
     return-void
 .end method
@@ -30,13 +30,13 @@
 .method public final a(Ljava/lang/String;IZLjava/lang/String;)V
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Kk:I
+    iput p2, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Kt:I
 
-    iput-object p4, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Ljava/lang/String;
+    iput-object p4, p1, Lcom/facebook/drawee/backends/pipeline/b/h;->KI:Ljava/lang/String;
 
-    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->JZ:Lcom/facebook/drawee/backends/pipeline/b/g;
+    iget-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/b;->Ki: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 e89a8fea62..2464da5018 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 KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+.field private final KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-.field private final KQ:Lcom/facebook/common/time/b;
+.field private final KZ:Lcom/facebook/common/time/b;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/h/a;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KQ:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ:Lcom/facebook/common/time/b;
 
-    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iput-object p2, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KQ:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ: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;->Kx:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KG:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kp:Ljava/lang/Object;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ky:Ljava/lang/Object;
 
-    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ko:Ljava/lang/String;
+    iput-object p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
 
-    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Z
+    iput-boolean p4, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ: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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KQ:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ: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;->Ky:J
+    iput-wide v0, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
 
-    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object p3, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Ko:Ljava/lang/String;
+    iput-object p2, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
 
-    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Z
+    iput-boolean p4, p3, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
 
     return-void
 .end method
@@ -77,23 +77,23 @@
 .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;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KQ:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ: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;->Ky:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kq:Lcom/facebook/imagepipeline/request/b;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kz:Lcom/facebook/imagepipeline/request/b;
 
-    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ko:Ljava/lang/String;
+    iput-object p2, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx:Ljava/lang/String;
 
-    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KA:Z
+    iput-boolean p3, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KJ:Z
 
     return-void
 .end method
@@ -101,19 +101,19 @@
 .method public final aw(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KQ:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KZ: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;->Ky:J
+    iput-wide v1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->KH:J
 
-    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KJ:Lcom/facebook/drawee/backends/pipeline/b/h;
+    iget-object v0, p0, Lcom/facebook/drawee/backends/pipeline/b/a/c;->KS:Lcom/facebook/drawee/backends/pipeline/b/h;
 
-    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Ko:Ljava/lang/String;
+    iput-object p1, v0, Lcom/facebook/drawee/backends/pipeline/b/h;->Kx: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 b3b6532281..149bd714ae 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 Ke:[I
+.field static final synthetic Kn:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Ke:[I
+    sput-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
 
     :try_start_0
-    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Ke:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mj:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Ms: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;->Ke:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mk:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mt: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;->Ke:[I
+    sget-object v0, Lcom/facebook/drawee/backends/pipeline/e$1;->Kn:[I
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Ml:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mu: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 66e9dff786..3850ea16db 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;->hi()V
+    value = Lcom/facebook/drawee/controller/AbstractDraweeController;->hl()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -22,9 +22,9 @@
 
 
 # instance fields
-.field final synthetic LR:Z
+.field final synthetic Mb:Z
 
-.field final synthetic LS:Lcom/facebook/drawee/controller/AbstractDraweeController;
+.field final synthetic Mc: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;->LS:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mc: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;->LR:Z
+    iput-boolean p3, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mb:Z
 
     invoke-direct {p0}, Lcom/facebook/c/b;-><init>()V
 
@@ -64,7 +64,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->LS:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mc: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;->LS:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mc: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;->LR:Z
+    iget-boolean v6, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mb: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;->LS:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mc: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;->LS:Lcom/facebook/drawee/controller/AbstractDraweeController;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/AbstractDraweeController$1;->Mc: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/c/c;->gC()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lcom/facebook/c/c;->gF()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 e72c6a8b25..8399bb2017 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
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     new-instance v0, Lcom/facebook/drawee/controller/AbstractDraweeController$a;
 
@@ -59,7 +59,7 @@
 
     invoke-virtual {v0, p1}, Lcom/facebook/drawee/controller/AbstractDraweeController$a;->c(Lcom/facebook/drawee/controller/ControllerListener;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object v0
 .end method
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 74bec0fbe9..fd8a222b8a 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 Md:Lcom/facebook/drawee/d/a;
+.field final synthetic Mm:Lcom/facebook/drawee/d/a;
 
-.field final synthetic Me:Ljava/lang/String;
+.field final synthetic Mn:Ljava/lang/String;
 
-.field final synthetic Mf:Ljava/lang/Object;
+.field final synthetic Mo:Ljava/lang/Object;
 
-.field final synthetic Mg:Ljava/lang/Object;
+.field final synthetic Mp:Ljava/lang/Object;
 
-.field final synthetic Mh:Lcom/facebook/drawee/controller/a$a;
+.field final synthetic Mq:Lcom/facebook/drawee/controller/a$a;
 
-.field final synthetic Mi:Lcom/facebook/drawee/controller/a;
+.field final synthetic Mr: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;->Mi:Lcom/facebook/drawee/controller/a;
+    iput-object p1, p0, Lcom/facebook/drawee/controller/a$2;->Mr:Lcom/facebook/drawee/controller/a;
 
-    iput-object p2, p0, Lcom/facebook/drawee/controller/a$2;->Md:Lcom/facebook/drawee/d/a;
+    iput-object p2, p0, Lcom/facebook/drawee/controller/a$2;->Mm:Lcom/facebook/drawee/d/a;
 
-    iput-object p3, p0, Lcom/facebook/drawee/controller/a$2;->Me:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/drawee/controller/a$2;->Mn:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/drawee/controller/a$2;->Mf:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/facebook/drawee/controller/a$2;->Mo:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/facebook/drawee/controller/a$2;->Mg:Ljava/lang/Object;
+    iput-object p5, p0, Lcom/facebook/drawee/controller/a$2;->Mp:Ljava/lang/Object;
 
-    iput-object p6, p0, Lcom/facebook/drawee/controller/a$2;->Mh:Lcom/facebook/drawee/controller/a$a;
+    iput-object p6, p0, Lcom/facebook/drawee/controller/a$2;->Mq: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;->Mi:Lcom/facebook/drawee/controller/a;
+    iget-object v0, p0, Lcom/facebook/drawee/controller/a$2;->Mr:Lcom/facebook/drawee/controller/a;
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Md:Lcom/facebook/drawee/d/a;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Mm:Lcom/facebook/drawee/d/a;
 
-    iget-object v2, p0, Lcom/facebook/drawee/controller/a$2;->Mf:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/facebook/drawee/controller/a$2;->Mo:Ljava/lang/Object;
 
-    iget-object v3, p0, Lcom/facebook/drawee/controller/a$2;->Mg:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/facebook/drawee/controller/a$2;->Mp:Ljava/lang/Object;
 
-    iget-object v4, p0, Lcom/facebook/drawee/controller/a$2;->Mh:Lcom/facebook/drawee/controller/a$a;
+    iget-object v4, p0, Lcom/facebook/drawee/controller/a$2;->Mq: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/c/c;
 
@@ -90,7 +90,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Mf:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/facebook/drawee/controller/a$2;->Mo: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 d0063cf9eb..63c9348d7b 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 Mj:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Ms:Lcom/facebook/drawee/controller/a$a;
 
-.field public static final enum Mk:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Mt:Lcom/facebook/drawee/controller/a$a;
 
-.field public static final enum Ml:Lcom/facebook/drawee/controller/a$a;
+.field public static final enum Mu:Lcom/facebook/drawee/controller/a$a;
 
-.field private static final synthetic Mm:[Lcom/facebook/drawee/controller/a$a;
+.field private static final synthetic Mv:[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;->Mj:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Ms: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;->Mk:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mt: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;->Ml:Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mu: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;->Mj:Lcom/facebook/drawee/controller/a$a;
+    sget-object v4, Lcom/facebook/drawee/controller/a$a;->Ms:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mk:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mt:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Ml:Lcom/facebook/drawee/controller/a$a;
+    sget-object v1, Lcom/facebook/drawee/controller/a$a;->Mu:Lcom/facebook/drawee/controller/a$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mm:[Lcom/facebook/drawee/controller/a$a;
+    sput-object v0, Lcom/facebook/drawee/controller/a$a;->Mv:[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;->Mm:[Lcom/facebook/drawee/controller/a$a;
+    sget-object v0, Lcom/facebook/drawee/controller/a$a;->Mv:[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 700253da1a..dc1bd80f84 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 Od:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Oe:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final On:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Of:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Og:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Op:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Oh:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Ok:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-.field public static final Ol:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ou:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Od:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oe:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->On:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Of:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Og:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Op:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oh:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oi:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Or:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ok:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ot:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
-    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ol:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Ou: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 da2e7e9fa7..f0909abb13 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$b;->Ov: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 71280da5cb..2d748cfe40 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$c;->Ov: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 40350ae912..6778c3bbff 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$d;->Ov: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 7bfe3c749f..84a7de2417 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$e;->Ov: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 6f9bcda9a7..94ed309a1f 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$f;->Ov: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 f1ef0f33c3..d504913640 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$g;->Ov: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 f385dd0417..68ad315273 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$h;->Ov: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 35b024fa65..bd2ef8163c 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$i;->Ov: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 38346a733f..58ba8272b6 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 Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+.field public static final Ov: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;->Om:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sput-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$j;->Ov:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$k.smali b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$k.smali
index 725ef14d32..8af0c12f94 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$k.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/ScalingUtils$k.smali
@@ -15,5 +15,5 @@
 
 
 # virtual methods
-.method public abstract hG()Ljava/lang/Object;
+.method public abstract hJ()Ljava/lang/Object;
 .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 c5393b41c4..9a898abf0f 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 MP:Lcom/facebook/drawee/drawable/a;
+.field final synthetic MY: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;->MP:Lcom/facebook/drawee/drawable/a;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/a$1;->MY: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;->MP:Lcom/facebook/drawee/drawable/a;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->MY:Lcom/facebook/drawee/drawable/a;
 
     iget v1, p0, Lcom/facebook/drawee/drawable/a$1;->val$index:I
 
@@ -52,10 +52,10 @@
     return-object p1
 .end method
 
-.method public final hs()Landroid/graphics/drawable/Drawable;
+.method public final hv()Landroid/graphics/drawable/Drawable;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->MP:Lcom/facebook/drawee/drawable/a;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/a$1;->MY: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 1fc189c693..be6a15707c 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 MQ:I
+.field private MZ:I
 
-.field private MR:Z
+.field private Na:Z
 
-.field MS:F
+.field Nb:F
 
-.field private MT:Z
+.field private Nc:Z
 
 
 # direct methods
@@ -40,17 +40,17 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/b;->MS:F
+    iput p1, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MT:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Nc:Z
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/b;->MQ:I
+    iput p2, p0, Lcom/facebook/drawee/drawable/b;->MZ:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MR:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Na:Z
 
     return-void
 .end method
@@ -80,9 +80,9 @@
 
     sub-int/2addr v3, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/b;->MS:F
+    iget v4, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
 
-    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/b;->MR:Z
+    iget-boolean v5, p0, Lcom/facebook/drawee/drawable/b;->Na: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;->MT:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Nc:Z
 
     if-nez p1, :cond_1
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->MT:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/b;->Nc: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;->MT:Z
+    iput-boolean v0, p0, Lcom/facebook/drawee/drawable/b;->Nc:Z
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/b;->MS:F
+    iget v0, p0, Lcom/facebook/drawee/drawable/b;->Nb:F
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/b;->MQ:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/b;->MZ:I
 
     int-to-float v1, v1
 
@@ -162,7 +162,7 @@
 
     add-float/2addr v0, v1
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/b;->MS:F
+    iput v0, p0, Lcom/facebook/drawee/drawable/b;->Nb: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 f2c7622872..0c92485c5e 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 MU:Z
+.field private Nd:Z
 
-.field private MV:I
+.field private Ne:I
 
-.field private MW:I
+.field private Nf:I
 
 .field public mAlpha:I
 
@@ -27,15 +27,15 @@
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/d;->MU:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/d;->Nd: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;->MV:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Ne:I
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/d;->MW:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/d;->Nf: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;->MU:Z
+    iget-boolean v0, p0, Lcom/facebook/drawee/drawable/d;->Nd: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;->MV:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/d;->Ne: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;->MW:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/d;->Nf:I
 
     if-eq v0, v1, :cond_6
 
@@ -114,7 +114,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/d;->MU:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/drawable/d;->Nd: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;->MV:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/d;->Ne: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;->MW:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/d;->Nf: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 ed41bc4b78..db60c03bdf 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 MK:[Landroid/graphics/drawable/Drawable;
+.field private final MT:[Landroid/graphics/drawable/Drawable;
 
-.field private final MX:Z
+.field private final Ng:Z
 
-.field private final MY:I
+.field private final Nh:I
 
-.field MZ:I
+.field Ni:I
 
-.field Na:I
+.field Nj:I
 
-.field Nb:J
+.field Nk:J
 
-.field Nc:[I
+.field Nl:[I
 
-.field Nd:[I
+.field Nm:[I
 
-.field Ne:[Z
+.field Nn:[Z
 
-.field Nf:I
+.field No: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;->MK:[Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->MT:[Landroid/graphics/drawable/Drawable;
 
     array-length p2, p1
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nc:[I
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
 
     array-length p2, p1
 
     new-array p2, p2, [I
 
-    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iput-object p2, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
     const/16 p2, 0xff
 
@@ -85,13 +85,13 @@
 
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
 
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->No:I
 
-    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/f;->MX:Z
+    iput-boolean v1, p0, Lcom/facebook/drawee/drawable/f;->Ng:Z
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/f;->MX:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/drawable/f;->Ng:Z
 
     if-eqz p1, :cond_1
 
@@ -103,39 +103,39 @@
     const/4 p1, 0x0
 
     :goto_1
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->MY:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Nh:I
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nc:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/f;->MY:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/f;->Nh:I
 
     invoke-static {p1, v2}, Ljava/util/Arrays;->fill([II)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nc:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
 
     aput p2, p1, v1
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/f;->MY:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/f;->Nh:I
 
     invoke-static {p1, v2}, Ljava/util/Arrays;->fill([II)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
     aput p2, p1, v1
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
 
-    iget-boolean p2, p0, Lcom/facebook/drawee/drawable/f;->MX:Z
+    iget-boolean p2, p0, Lcom/facebook/drawee/drawable/f;->Ng:Z
 
     invoke-static {p1, p2}, Ljava/util/Arrays;->fill([ZZ)V
 
-    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object p1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[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;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->MT:[Landroid/graphics/drawable/Drawable;
 
     array-length v4, v4
 
     if-ge v2, v4, :cond_5
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nn:[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;->Nd:[I
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
-    iget-object v6, p0, Lcom/facebook/drawee/drawable/f;->Nc:[I
+    iget-object v6, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
 
     aget v6, v6, v2
 
@@ -203,7 +203,7 @@
     aput v1, v5, v2
 
     :cond_1
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
     aget v5, v4, v2
 
@@ -212,13 +212,13 @@
     aput v7, v4, v2
 
     :cond_2
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
 
     aget-boolean v4, v4, v2
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
     aget v4, v4, v2
 
@@ -227,13 +227,13 @@
     const/4 v3, 0x0
 
     :cond_3
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
 
     aget-boolean v4, v4, v2
 
     if-nez v4, :cond_4
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
     aget v4, v4, v2
 
@@ -255,9 +255,9 @@
 .method public final K(I)V
     .locals 1
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Na:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
 
-    iget p1, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iget p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
     const/4 v0, 0x1
 
@@ -265,7 +265,7 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput p1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
     :cond_0
     return-void
@@ -276,9 +276,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
 
     const/4 v1, 0x1
 
@@ -294,9 +294,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[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;->MZ:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
     const/4 v1, 0x2
 
@@ -325,7 +325,7 @@
     goto :goto_4
 
     :cond_0
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Na:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
 
     if-lez v0, :cond_1
 
@@ -343,13 +343,13 @@
 
     move-result-wide v4
 
-    iget-wide v6, p0, Lcom/facebook/drawee/drawable/f;->Nb:J
+    iget-wide v6, p0, Lcom/facebook/drawee/drawable/f;->Nk:J
 
     sub-long/2addr v4, v6
 
     long-to-float v0, v4
 
-    iget v4, p0, Lcom/facebook/drawee/drawable/f;->Na:I
+    iget v4, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
 
     int-to-float v4, v4
 
@@ -367,16 +367,16 @@
     const/4 v1, 0x1
 
     :goto_1
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
     goto :goto_4
 
     :cond_3
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
-    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nc:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nl:[I
 
-    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v5, p0, Lcom/facebook/drawee/drawable/f;->MT:[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;->Nb:J
+    iput-wide v4, p0, Lcom/facebook/drawee/drawable/f;->Nk:J
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Na:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nj:I
 
     if-nez v0, :cond_4
 
@@ -412,10 +412,10 @@
     const/4 v1, 0x1
 
     :goto_3
-    iput v1, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput v1, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
     :goto_4
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->MT:[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;->Nd:[I
+    iget-object v4, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
     aget v4, v4, v2
 
@@ -437,11 +437,11 @@
 
     if-lez v4, :cond_6
 
-    iget v5, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
+    iget v5, p0, Lcom/facebook/drawee/drawable/f;->No:I
 
     add-int/2addr v5, v3
 
-    iput v5, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
+    iput v5, p0, Lcom/facebook/drawee/drawable/f;->No: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;->Nf:I
+    iget v4, p0, Lcom/facebook/drawee/drawable/f;->No:I
 
     sub-int/2addr v4, v3
 
-    iput v4, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
+    iput v4, p0, Lcom/facebook/drawee/drawable/f;->No:I
 
     invoke-virtual {v1, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -479,93 +479,27 @@
     return v0
 .end method
 
-.method public final ht()V
-    .locals 1
-
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
-
-    add-int/lit8 v0, v0, 0x1
-
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
-
-    return-void
-.end method
-
-.method public final hu()V
-    .locals 1
-
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
-
-    add-int/lit8 v0, v0, -0x1
-
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
-
-    return-void
-.end method
-
-.method public final hv()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
-
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
-
-    const/4 v1, 0x1
-
-    invoke-static {v0, v1}, Ljava/util/Arrays;->fill([ZZ)V
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
-
-    return-void
-.end method
-
-.method public final hw()V
-    .locals 2
-
-    const/4 v0, 0x0
-
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
-
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
-
-    invoke-static {v1, v0}, Ljava/util/Arrays;->fill([ZZ)V
-
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
-
-    const/4 v1, 0x1
-
-    aput-boolean v1, v0, v1
-
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
-
-    return-void
-.end method
-
-.method public final hx()V
+.method public final hA()V
     .locals 4
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/facebook/drawee/drawable/f;->MZ:I
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->MK:[Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->MT:[Landroid/graphics/drawable/Drawable;
 
     array-length v2, v2
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->Nd:[I
+    iget-object v2, p0, Lcom/facebook/drawee/drawable/f;->Nm:[I
 
-    iget-object v3, p0, Lcom/facebook/drawee/drawable/f;->Ne:[Z
+    iget-object v3, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
 
     aget-boolean v3, v3, v1
 
@@ -591,10 +525,76 @@
     return-void
 .end method
 
+.method public final hw()V
+    .locals 1
+
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->No:I
+
+    add-int/lit8 v0, v0, 0x1
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->No:I
+
+    return-void
+.end method
+
+.method public final hx()V
+    .locals 1
+
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->No:I
+
+    add-int/lit8 v0, v0, -0x1
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->No:I
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
+
+    return-void
+.end method
+
+.method public final hy()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+
+    const/4 v1, 0x1
+
+    invoke-static {v0, v1}, Ljava/util/Arrays;->fill([ZZ)V
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
+
+    return-void
+.end method
+
+.method public final hz()V
+    .locals 2
+
+    const/4 v0, 0x0
+
+    iput v0, p0, Lcom/facebook/drawee/drawable/f;->Ni:I
+
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+
+    invoke-static {v1, v0}, Ljava/util/Arrays;->fill([ZZ)V
+
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/f;->Nn:[Z
+
+    const/4 v1, 0x1
+
+    aput-boolean v1, v0, v1
+
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/f;->invalidateSelf()V
+
+    return-void
+.end method
+
 .method public final invalidateSelf()V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/f;->Nf:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/f;->No: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 1e02b4a13f..011335072a 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 Ni:Landroid/graphics/Matrix;
+.field private Nr:Landroid/graphics/Matrix;
 
-.field private Nj:I
+.field private Ns:I
 
-.field private Nk:I
+.field private Nt:I
 
 .field private mMatrix:Landroid/graphics/Matrix;
 
 
 # direct methods
-.method private hy()V
+.method private hB()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;->Nj:I
+    iput v2, p0, Lcom/facebook/drawee/drawable/h;->Ns:I
 
     invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
 
     move-result v3
 
-    iput v3, p0, Lcom/facebook/drawee/drawable/h;->Nk:I
+    iput v3, p0, Lcom/facebook/drawee/drawable/h;->Nt: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;->Ni:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nr:Landroid/graphics/Matrix;
 
     return-void
 
@@ -60,7 +60,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Ni:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nr: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;->Ni:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nr: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;->Nj:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/h;->Ns: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;->Nk:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/h;->Nt: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;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->hB()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Ni:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/h;->Nr: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;->Ni:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/h;->Nr: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;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->hB()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;->hy()V
+    invoke-direct {p0}, Lcom/facebook/drawee/drawable/h;->hB()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 b5b35910a2..f739940901 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 Nl:Landroid/graphics/Matrix;
+.field final Nu:Landroid/graphics/Matrix;
 
-.field private Nm:I
+.field private Nv:I
 
-.field private Nn:I
+.field private Nw:I
 
 .field private final mTempMatrix:Landroid/graphics/Matrix;
 
@@ -37,13 +37,13 @@
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     rem-int/lit8 p1, p2, 0x5a
 
     sub-int/2addr p2, p1
 
-    iput p2, p0, Lcom/facebook/drawee/drawable/i;->Nm:I
+    iput p2, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
 
     if-ltz p3, :cond_0
 
@@ -57,7 +57,7 @@
     const/4 p3, 0x0
 
     :goto_0
-    iput p3, p0, Lcom/facebook/drawee/drawable/i;->Nn:I
+    iput p3, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     invoke-virtual {p0, p1}, Lcom/facebook/drawee/drawable/i;->d(Landroid/graphics/Matrix;)V
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->isIdentity()Z
 
@@ -77,7 +77,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->preConcat(Landroid/graphics/Matrix;)Z
 
@@ -88,11 +88,11 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nm:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
 
     if-gtz v0, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nn:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
 
     if-eqz v0, :cond_0
 
@@ -110,7 +110,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Canvas;->concat(Landroid/graphics/Matrix;)V
 
@@ -124,7 +124,7 @@
 .method public final getIntrinsicHeight()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nn:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
 
     const/4 v1, 0x5
 
@@ -134,7 +134,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nm:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
 
     rem-int/lit16 v0, v0, 0xb4
 
@@ -161,7 +161,7 @@
 .method public final getIntrinsicWidth()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nn:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
 
     const/4 v1, 0x5
 
@@ -171,7 +171,7 @@
 
     if-eq v0, v1, :cond_1
 
-    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nm:I
+    iget v0, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
 
     rem-int/lit16 v0, v0, 0xb4
 
@@ -202,11 +202,11 @@
 
     move-result-object v0
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nm:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
 
     if-gtz v1, :cond_1
 
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nn:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
 
     if-eqz v1, :cond_0
 
@@ -223,7 +223,7 @@
 
     :cond_1
     :goto_0
-    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nn:I
+    iget v1, p0, Lcom/facebook/drawee/drawable/i;->Nw:I
 
     const/4 v2, 0x2
 
@@ -247,9 +247,9 @@
 
     if-eq v1, v2, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
-    iget v2, p0, Lcom/facebook/drawee/drawable/i;->Nm:I
+    iget v2, p0, Lcom/facebook/drawee/drawable/i;->Nv:I
 
     int-to-float v2, v2
 
@@ -270,7 +270,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     invoke-virtual {p1}, Landroid/graphics/Rect;->centerX()I
 
@@ -286,21 +286,21 @@
 
     invoke-virtual {v1, v5, v2, v6}, Landroid/graphics/Matrix;->setRotate(FFF)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu: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;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu: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;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     invoke-virtual {p1}, Landroid/graphics/Rect;->centerX()I
 
@@ -316,14 +316,14 @@
 
     invoke-virtual {v1, v5, v2, v6}, Landroid/graphics/Matrix;->setRotate(FFF)V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu: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;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu:Landroid/graphics/Matrix;
 
     invoke-virtual {v1, v4, v3}, Landroid/graphics/Matrix;->setScale(FF)V
 
@@ -332,7 +332,7 @@
 
     invoke-virtual {v1}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nl:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/drawee/drawable/i;->Nu: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 0643fe652b..e96174cbf7 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 NG:[I
+.field static final synthetic NQ:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->hC()[I
+    invoke-static {}, Lcom/facebook/drawee/drawable/m$a;->hF()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/drawee/drawable/m$1;->NG:[I
+    sput-object v0, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NG:[I
+    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
 
-    sget v2, Lcom/facebook/drawee/drawable/m$a;->NI:I
+    sget v2, Lcom/facebook/drawee/drawable/m$a;->NS:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NG:[I
+    sget-object v1, Lcom/facebook/drawee/drawable/m$1;->NQ:[I
 
-    sget v2, Lcom/facebook/drawee/drawable/m$a;->NH:I
+    sget v2, Lcom/facebook/drawee/drawable/m$a;->NR: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 160fcc285d..5c57f8936a 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 NH:I = 0x1
+.field public static final NR:I = 0x1
 
-.field public static final NI:I = 0x2
+.field public static final NS:I = 0x2
 
-.field private static final synthetic NJ:[I
+.field private static final synthetic NT:[I
 
 
 # direct methods
@@ -38,27 +38,27 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/drawee/drawable/m$a;->NH:I
+    sget v1, Lcom/facebook/drawee/drawable/m$a;->NR:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/drawee/drawable/m$a;->NI:I
+    sget v1, Lcom/facebook/drawee/drawable/m$a;->NS:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/drawable/m$a;->NJ:[I
+    sput-object v0, Lcom/facebook/drawee/drawable/m$a;->NT:[I
 
     return-void
 .end method
 
-.method public static hC()[I
+.method public static hF()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/drawee/drawable/m$a;->NJ:[I
+    sget-object v0, Lcom/facebook/drawee/drawable/m$a;->NT:[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 edf9314d8d..94886f874e 100644
--- a/com.discord/smali_classes2/com/facebook/drawee/drawable/o.smali
+++ b/com.discord/smali_classes2/com/facebook/drawee/drawable/o.smali
@@ -17,9 +17,9 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hA()Z
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hD()Z
 
     move-result v0
 
@@ -27,14 +27,14 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/n;->draw(Landroid/graphics/Canvas;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hE()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hH()V
 
-    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hB()V
+    invoke-virtual {p0}, Lcom/facebook/drawee/drawable/o;->hE()V
 
     iget-object v0, p0, Lcom/facebook/drawee/drawable/o;->mPath:Landroid/graphics/Path;
 
@@ -42,7 +42,7 @@
 
     invoke-super {p0, p1}, Lcom/facebook/drawee/drawable/n;->draw(Landroid/graphics/Canvas;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
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 518db8bc35..308ca0f820 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 OP:Lcom/facebook/drawee/generic/d$a;
+.field public static final enum OY:Lcom/facebook/drawee/generic/d$a;
 
-.field public static final enum OQ:Lcom/facebook/drawee/generic/d$a;
+.field public static final enum OZ:Lcom/facebook/drawee/generic/d$a;
 
-.field private static final synthetic OR:[Lcom/facebook/drawee/generic/d$a;
+.field private static final synthetic Pa:[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;->OP:Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->OY: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;->OQ:Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->OZ: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;->OP:Lcom/facebook/drawee/generic/d$a;
+    sget-object v3, Lcom/facebook/drawee/generic/d$a;->OY:Lcom/facebook/drawee/generic/d$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OQ:Lcom/facebook/drawee/generic/d$a;
+    sget-object v1, Lcom/facebook/drawee/generic/d$a;->OZ:Lcom/facebook/drawee/generic/d$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/drawee/generic/d$a;->OR:[Lcom/facebook/drawee/generic/d$a;
+    sput-object v0, Lcom/facebook/drawee/generic/d$a;->Pa:[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;->OR:[Lcom/facebook/drawee/generic/d$a;
+    sget-object v0, Lcom/facebook/drawee/generic/d$a;->Pa:[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 ad2804dc30..90c04cb257 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 Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+.field final synthetic Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;->Pp: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 0e5e2c176f..b469ebb50a 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
@@ -23,32 +23,32 @@
 
 
 # instance fields
-.field final synthetic Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+.field final synthetic Pp:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
 
-.field private final Ph:Lcom/facebook/drawee/span/a;
+.field private final Pq:Lcom/facebook/drawee/span/a;
 
-.field private final Pi:Z
+.field private final Pr:Z
 
-.field private final Pj:I
+.field private final Ps: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pp: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;->Ph:Lcom/facebook/drawee/span/a;
+    iput-object p2, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pq:Lcom/facebook/drawee/span/a;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pi:Z
+    iput-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pr:Z
 
-    iput p4, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pj:I
+    iput p4, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps:I
 
     return-void
 .end method
@@ -60,15 +60,15 @@
 
     check-cast p2, Lcom/facebook/imagepipeline/g/f;
 
-    iget-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pi:Z
+    iget-boolean p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pr:Z
 
     if-eqz p1, :cond_4
 
     if-eqz p2, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ph:Lcom/facebook/drawee/span/a;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pq:Lcom/facebook/drawee/span/a;
 
-    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pj: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;->Ph:Lcom/facebook/drawee/span/a;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pq:Lcom/facebook/drawee/span/a;
 
-    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object p1, p1, Lcom/facebook/drawee/span/a;->Pj: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;->Pj:I
+    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps:I
 
     const/4 v1, -0x1
 
@@ -126,16 +126,16 @@
 
     move-result p3
 
-    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pj:I
+    iget v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps:I
 
     if-eq p3, v0, :cond_1
 
     :cond_0
-    iget p3, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pj:I
+    iget p3, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Ps: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pp: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;->Pg:Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder$b;->Pp: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 384454690f..1948a399ae 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 public final Pb:Ljava/util/Set;
+.field public final Pk:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -24,13 +24,13 @@
     .end annotation
 .end field
 
-.field public final Pc:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+.field public final Pl:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
 
-.field private Pd:Landroid/view/View;
+.field private Pm:Landroid/view/View;
 
-.field private Pe:Landroid/graphics/drawable/Drawable;
+.field private Pn:Landroid/graphics/drawable/Drawable;
 
-.field private Pf:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+.field private Po: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;->Pb:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pk: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;->Pc:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$a;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pl: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;->Pd:Landroid/view/View;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pm: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;->Pe:Landroid/graphics/drawable/Drawable;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pn: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;->Pf:Lcom/facebook/drawee/span/DraweeSpanStringBuilder$c;
+    iget-object p0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Po: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;->Pd:Landroid/view/View;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pm:Landroid/view/View;
 
     if-eq p1, v0, :cond_0
 
@@ -92,7 +92,7 @@
     :cond_0
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pd:Landroid/view/View;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pm:Landroid/view/View;
 
     return-void
 .end method
@@ -102,14 +102,14 @@
 .method public final e(Landroid/view/View;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pd:Landroid/view/View;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pm: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;->Pe:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pn:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_1
 
@@ -117,12 +117,12 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pe:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pn:Landroid/graphics/drawable/Drawable;
 
     :cond_1
-    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pd:Landroid/view/View;
+    iput-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pm:Landroid/view/View;
 
-    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pb:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pk:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -141,9 +141,9 @@
 
     check-cast v0, Lcom/facebook/drawee/span/a;
 
-    iget-object v0, v0, Lcom/facebook/drawee/span/a;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, v0, Lcom/facebook/drawee/span/a;->Pj:Lcom/facebook/drawee/view/b;
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hg()V
+    invoke-virtual {v0}, Lcom/facebook/drawee/view/b;->hj()V
 
     goto :goto_0
 
@@ -156,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;->Pb:Ljava/util/Set;
+    iget-object p1, p0, Lcom/facebook/drawee/span/DraweeSpanStringBuilder;->Pk:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -175,7 +175,7 @@
 
     check-cast v0, Lcom/facebook/drawee/span/a;
 
-    iget-object v0, v0, Lcom/facebook/drawee/span/a;->Pa:Lcom/facebook/drawee/view/b;
+    iget-object v0, v0, Lcom/facebook/drawee/span/a;->Pj: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 82aa506510..2f31cb34a9 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 Pa:Lcom/facebook/drawee/view/b;
+.field final Pj:Lcom/facebook/drawee/view/b;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0, v0, p2}, Lcom/facebook/f/a/a/a;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
-    iput-object p1, p0, Lcom/facebook/drawee/span/a;->Pa:Lcom/facebook/drawee/view/b;
+    iput-object p1, p0, Lcom/facebook/drawee/span/a;->Pj:Lcom/facebook/drawee/view/b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/e/b.smali b/com.discord/smali_classes2/com/facebook/e/b.smali
index f2f1abcb89..d5cdb1408a 100644
--- a/com.discord/smali_classes2/com/facebook/e/b.smali
+++ b/com.discord/smali_classes2/com/facebook/e/b.smali
@@ -4,28 +4,28 @@
 
 
 # static fields
-.field public static final QP:Lcom/facebook/e/c;
-
-.field public static final QQ:Lcom/facebook/e/c;
-
-.field public static final QR:Lcom/facebook/e/c;
-
-.field public static final QS:Lcom/facebook/e/c;
-
-.field public static final QT:Lcom/facebook/e/c;
-
-.field public static final QU:Lcom/facebook/e/c;
-
-.field public static final QV:Lcom/facebook/e/c;
-
-.field public static final QW:Lcom/facebook/e/c;
-
-.field public static final QX:Lcom/facebook/e/c;
-
 .field public static final QY:Lcom/facebook/e/c;
 
 .field public static final QZ:Lcom/facebook/e/c;
 
+.field public static final Ra:Lcom/facebook/e/c;
+
+.field public static final Rb:Lcom/facebook/e/c;
+
+.field public static final Rc:Lcom/facebook/e/c;
+
+.field public static final Rd:Lcom/facebook/e/c;
+
+.field public static final Re:Lcom/facebook/e/c;
+
+.field public static final Rf:Lcom/facebook/e/c;
+
+.field public static final Rg:Lcom/facebook/e/c;
+
+.field public static final Rh:Lcom/facebook/e/c;
+
+.field public static final Ri:Lcom/facebook/e/c;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -39,7 +39,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QQ:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -59,7 +59,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QR:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -69,7 +69,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QS:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rb:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -79,7 +79,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QT:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rc:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -105,7 +105,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -113,7 +113,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QX:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -121,7 +121,7 @@
 
     invoke-direct {v0, v2, v1}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
 
     new-instance v0, Lcom/facebook/e/c;
 
@@ -131,7 +131,7 @@
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/e/c;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    sput-object v0, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
+    sput-object v0, Lcom/facebook/e/b;->Ri:Lcom/facebook/e/c;
 
     return-void
 .end method
@@ -145,7 +145,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
 
     if-ne p0, v0, :cond_0
 
@@ -166,19 +166,19 @@
 .method public static b(Lcom/facebook/e/c;)Z
     .locals 1
 
-    sget-object v0, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lcom/facebook/e/b;->QX:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
 
     if-ne p0, v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/facebook/f/a/a/a.smali b/com.discord/smali_classes2/com/facebook/f/a/a/a.smali
index aecfb2211a..b3897352b2 100644
--- a/com.discord/smali_classes2/com/facebook/f/a/a/a.smali
+++ b/com.discord/smali_classes2/com/facebook/f/a/a/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final acs:I
+.field private final acB:I
 
-.field private final act:Landroid/graphics/Paint$FontMetricsInt;
+.field private final acC: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/f/a/a/a;->act:Landroid/graphics/Paint$FontMetricsInt;
+    iput-object v0, p0, Lcom/facebook/f/a/a/a;->acC:Landroid/graphics/Paint$FontMetricsInt;
 
     iput-object p1, p0, Lcom/facebook/f/a/a/a;->mDrawable:Landroid/graphics/drawable/Drawable;
 
-    iput p2, p0, Lcom/facebook/f/a/a/a;->acs:I
+    iput p2, p0, Lcom/facebook/f/a/a/a;->acB:I
 
     invoke-direct {p0}, Lcom/facebook/f/a/a/a;->aO()V
 
@@ -41,7 +41,7 @@
 .method private a(Landroid/graphics/Paint$FontMetricsInt;)I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/f/a/a/a;->acs:I
+    iget v0, p0, Lcom/facebook/f/a/a/a;->acB: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/f/a/a/a;->act:Landroid/graphics/Paint$FontMetricsInt;
+    iget-object p2, p0, Lcom/facebook/f/a/a/a;->acC:Landroid/graphics/Paint$FontMetricsInt;
 
     invoke-virtual {p9, p2}, Landroid/graphics/Paint;->getFontMetricsInt(Landroid/graphics/Paint$FontMetricsInt;)I
 
-    iget-object p2, p0, Lcom/facebook/f/a/a/a;->act:Landroid/graphics/Paint$FontMetricsInt;
+    iget-object p2, p0, Lcom/facebook/f/a/a/a;->acC:Landroid/graphics/Paint$FontMetricsInt;
 
     invoke-direct {p0, p2}, Lcom/facebook/f/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 32e1936a7b..6740783bb8 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 PD:Lcom/facebook/fresco/animation/a/c;
+.field final synthetic PM: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;->PD:Lcom/facebook/fresco/animation/a/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM: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;->PD:Lcom/facebook/fresco/animation/a/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PD:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v1, Lcom/facebook/fresco/animation/a/c;->Px:Z
+    iput-boolean v2, v1, Lcom/facebook/fresco/animation/a/c;->PG:Z
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PD:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v3, v1, Lcom/facebook/fresco/animation/a/c;->KI:Lcom/facebook/common/time/b;
+    iget-object v3, v1, Lcom/facebook/fresco/animation/a/c;->KR: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;->Py:J
+    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->PH:J
 
     sub-long/2addr v3, v5
 
-    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->Pz:J
+    iget-wide v5, v1, Lcom/facebook/fresco/animation/a/c;->PI: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;->PD:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PB:Lcom/facebook/fresco/animation/a/c$a;
+    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PK:Lcom/facebook/fresco/animation/a/c$a;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PD:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
 
-    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PB:Lcom/facebook/fresco/animation/a/c$a;
+    iget-object v1, v1, Lcom/facebook/fresco/animation/a/c;->PK: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;->PD:Lcom/facebook/fresco/animation/a/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/a/c$1;->PM:Lcom/facebook/fresco/animation/a/c;
 
-    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->hT()V
+    invoke-virtual {v1}, Lcom/facebook/fresco/animation/a/c;->hW()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 ad21bbf89e..37b531fd0e 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 PF:Lcom/facebook/fresco/animation/b/b;
+.field private final PE:Lcom/facebook/fresco/animation/a/a;
 
-.field private final PT:I
+.field private final PO:Lcom/facebook/fresco/animation/b/b;
 
-.field private final PU:I
+.field private final Qd:I
 
-.field final synthetic PV:Lcom/facebook/fresco/animation/b/b/c;
+.field private final Qe:I
 
-.field private final Pv:Lcom/facebook/fresco/animation/a/a;
+.field final synthetic Qf:Lcom/facebook/fresco/animation/b/b/c;
 
 
 # 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;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PE:Lcom/facebook/fresco/animation/a/a;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PF:Lcom/facebook/fresco/animation/b/b;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    iput p4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PT:I
+    iput p4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
 
-    iput p5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PU:I
+    iput p5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qe: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;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->gq()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gt()Ljava/lang/Class;
 
     move-result-object p1
 
-    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PT:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd: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;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PT:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd: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;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PE: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;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PE: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;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->gq()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gt()Ljava/lang/Class;
 
     move-result-object p2
 
@@ -215,17 +215,17 @@
 
     :cond_0
     :try_start_2
-    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     invoke-interface {v1}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicWidth()I
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Pv:Lcom/facebook/fresco/animation/a/a;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PE:Lcom/facebook/fresco/animation/a/a;
 
     invoke-interface {v1}, Lcom/facebook/fresco/animation/a/a;->getIntrinsicHeight()I
 
-    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->hW()Lcom/facebook/common/references/CloseableReference;
+    invoke-interface {p2}, Lcom/facebook/fresco/animation/b/b;->hZ()Lcom/facebook/common/references/CloseableReference;
 
     move-result-object p2
 
@@ -275,9 +275,9 @@
     .locals 5
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PF:Lcom/facebook/fresco/animation/b/b;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PO:Lcom/facebook/fresco/animation/b/b;
 
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PT:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
 
     invoke-interface {v0, v1}, Lcom/facebook/fresco/animation/b/b;->contains(I)Z
 
@@ -285,13 +285,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gq()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gt()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;->PT:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -301,7 +301,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;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;
 
@@ -310,13 +310,13 @@
     monitor-enter v0
 
     :try_start_1
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->PU:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qe:I
 
     invoke-virtual {v1, v2}, Landroid/util/SparseArray;->remove(I)V
 
@@ -335,7 +335,7 @@
 
     :cond_0
     :try_start_2
-    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PT:I
+    iget v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
 
     const/4 v1, 0x1
 
@@ -345,13 +345,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gq()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gt()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;->PT:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -362,7 +362,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gq()Ljava/lang/Class;
+    invoke-static {}, Lcom/facebook/fresco/animation/b/b/c;->gt()Ljava/lang/Class;
 
     move-result-object v0
 
@@ -372,7 +372,7 @@
 
     const/4 v3, 0x0
 
-    iget v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PT:I
+    iget v4, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qd:I
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -385,7 +385,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_2
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;
 
@@ -394,13 +394,13 @@
     monitor-enter v0
 
     :try_start_3
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->PU:I
+    iget v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qe:I
 
     invoke-virtual {v1, v2}, Landroid/util/SparseArray;->remove(I)V
 
@@ -420,7 +420,7 @@
     :catchall_2
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;
 
@@ -429,13 +429,13 @@
     monitor-enter v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->PV:Lcom/facebook/fresco/animation/b/b/c;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qf: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;->PU:I
+    iget v3, p0, Lcom/facebook/fresco/animation/b/b/c$a;->Qe: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 2465ad9c9f..5986e43d9e 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,15 +26,15 @@
 
 
 # instance fields
-.field private final PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final PH:Lcom/facebook/fresco/animation/b/c;
+.field private final PQ:Lcom/facebook/fresco/animation/b/c;
 
-.field private final PK:Landroid/graphics/Bitmap$Config;
+.field private final PT:Landroid/graphics/Bitmap$Config;
 
-.field private final PR:Ljava/util/concurrent/ExecutorService;
+.field private final Qb:Ljava/util/concurrent/ExecutorService;
 
-.field private final PS:Landroid/util/SparseArray;
+.field private final Qc:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -51,7 +51,7 @@
 
     const-class v0, Lcom/facebook/fresco/animation/b/b/c;
 
-    sput-object v0, Lcom/facebook/fresco/animation/b/b/c;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/b/c;->GI: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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c;->PH:Lcom/facebook/fresco/animation/b/c;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/b/b/c;->PQ:Lcom/facebook/fresco/animation/b/c;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c;->PK:Landroid/graphics/Bitmap$Config;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/b/b/c;->PT:Landroid/graphics/Bitmap$Config;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/b/b/c;->PR:Ljava/util/concurrent/ExecutorService;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/b/b/c;->Qb: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;->PS:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Qc: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;->PS:Landroid/util/SparseArray;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->Qc: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;->PK:Landroid/graphics/Bitmap$Config;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PT: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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PN: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;->PH:Lcom/facebook/fresco/animation/b/c;
+    iget-object p0, p0, Lcom/facebook/fresco/animation/b/b/c;->PQ:Lcom/facebook/fresco/animation/b/c;
 
     return-object p0
 .end method
 
-.method static synthetic gq()Ljava/lang/Class;
+.method static synthetic gt()Ljava/lang/Class;
     .locals 1
 
-    sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/fresco/animation/b/b/c;->GI: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;->PS:Landroid/util/SparseArray;
+    iget-object v7, p0, Lcom/facebook/fresco/animation/b/b/c;->Qc:Landroid/util/SparseArray;
 
     monitor-enter v7
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c;->PS:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/b/b/c;->Qc: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;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->GI: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;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/fresco/animation/b/b/c;->GI: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;->PS:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Qc: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;->PR:Ljava/util/concurrent/ExecutorService;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/b/b/c;->Qb: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 e18d69f80c..0f5ba445a2 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final PW:I
+.field private final Qg: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/fresco/animation/b/b/d;->GI: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;->PW:I
+    iput p1, p0, Lcom/facebook/fresco/animation/b/b/d;->Qg:I
 
     return-void
 .end method
@@ -60,13 +60,13 @@
     const/4 v0, 0x1
 
     :goto_0
-    iget v1, p0, Lcom/facebook/fresco/animation/b/b/d;->PW:I
+    iget v1, p0, Lcom/facebook/fresco/animation/b/b/d;->Qg:I
 
     if-gt v0, v1, :cond_1
 
     add-int v1, p4, v0
 
-    invoke-interface {p3}, Lcom/facebook/fresco/animation/a/a;->fB()I
+    invoke-interface {p3}, Lcom/facebook/fresco/animation/a/a;->fE()I
 
     move-result v2
 
@@ -80,7 +80,7 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/facebook/fresco/animation/b/b/d;->Gz:Ljava/lang/Class;
+    sget-object v2, Lcom/facebook/fresco/animation/b/b/d;->GI: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 30efa8519e..c75f1bb3a0 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 PY:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final Qh: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/b/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final U(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->Y(I)I
 
@@ -35,24 +35,24 @@
     return p1
 .end method
 
-.method public final fB()I
+.method public final fE()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fB()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fE()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final fD()I
+.method public final fG()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/b/c/a;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fD()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->fG()I
 
     move-result v0
 
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 3e9b8d6983..094cb5acb7 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 Qo:Lcom/facebook/fresco/animation/c/a;
+.field final synthetic Qx: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;->Qo:Lcom/facebook/fresco/animation/c/a;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/c/a$1;->Qx: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;->Qo:Lcom/facebook/fresco/animation/c/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->Qx: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;->Qo:Lcom/facebook/fresco/animation/c/a;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/c/a$1;->Qx: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 efa9cfaa67..8998002926 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 PG:Lcom/facebook/fresco/animation/a/d;
+.field private final PP:Lcom/facebook/fresco/animation/a/d;
 
-.field private QB:J
+.field private QK:J
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QB:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
     return-void
 .end method
 
-.method private hZ()J
+.method private ic()J
     .locals 6
 
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QB:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
 
     const-wide/16 v2, -0x1
 
@@ -43,11 +43,11 @@
     :cond_0
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QB:J
+    iput-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fB()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fE()I
 
     move-result v0
 
@@ -56,9 +56,9 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->QB:J
+    iget-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
 
-    iget-object v4, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v4, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v4, v1}, Lcom/facebook/fresco/animation/a/d;->U(I)I
 
@@ -68,24 +68,24 @@
 
     add-long/2addr v2, v4
 
-    iput-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->QB:J
+    iput-wide v2, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
 
     add-int/lit8 v1, v1, 0x1
 
     goto :goto_0
 
     :cond_1
-    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QB:J
+    iget-wide v0, p0, Lcom/facebook/fresco/animation/d/a;->QK:J
 
     return-wide v0
 .end method
 
-.method private ia()Z
+.method private ie()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fD()I
+    invoke-interface {v0}, Lcom/facebook/fresco/animation/a/d;->fG()I
 
     move-result v0
 
@@ -106,21 +106,21 @@
 .method public final n(J)I
     .locals 5
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ia()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ie()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hZ()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()J
 
     move-result-wide v0
 
     div-long v0, p1, v0
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fD()I
+    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fG()I
 
     move-result v2
 
@@ -135,7 +135,7 @@
     return p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hZ()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()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;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v3, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v3, v0}, Lcom/facebook/fresco/animation/a/d;->U(I)I
 
@@ -170,7 +170,7 @@
 .method public final o(J)J
     .locals 11
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hZ()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()J
 
     move-result-wide v0
 
@@ -185,21 +185,21 @@
     return-wide v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ia()Z
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ie()Z
 
     move-result v6
 
     if-nez v6, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->hZ()J
+    invoke-direct {p0}, Lcom/facebook/fresco/animation/d/a;->ic()J
 
     move-result-wide v6
 
     div-long v6, p1, v6
 
-    iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v8, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->fD()I
+    invoke-interface {v8}, Lcom/facebook/fresco/animation/a/d;->fG()I
 
     move-result v8
 
@@ -214,9 +214,9 @@
     :cond_1
     rem-long v0, p1, v0
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
-    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fB()I
+    invoke-interface {v2}, Lcom/facebook/fresco/animation/a/d;->fE()I
 
     move-result v2
 
@@ -229,7 +229,7 @@
 
     if-gtz v6, :cond_2
 
-    iget-object v6, p0, Lcom/facebook/fresco/animation/d/a;->PG:Lcom/facebook/fresco/animation/a/d;
+    iget-object v6, p0, Lcom/facebook/fresco/animation/d/a;->PP:Lcom/facebook/fresco/animation/a/d;
 
     invoke-interface {v6, v3}, Lcom/facebook/fresco/animation/a/d;->U(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 2faa499021..f311d3c944 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 Qv:Landroid/graphics/Bitmap$Config;
+.field final synthetic QE:Landroid/graphics/Bitmap$Config;
 
-.field final synthetic Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->Qv:Landroid/graphics/Bitmap$Config;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QE:Landroid/graphics/Bitmap$Config;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
     .locals 0
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QF: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;->Qv:Landroid/graphics/Bitmap$Config;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$1;->QE:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {p2, p1, p4, p3}, Lcom/facebook/imagepipeline/animated/b/d;->a(Lcom/facebook/imagepipeline/g/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/g/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 e027c30a15..b46a8249e5 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 Qv:Landroid/graphics/Bitmap$Config;
+.field final synthetic QE:Landroid/graphics/Bitmap$Config;
 
-.field final synthetic Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QF:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->Qv:Landroid/graphics/Bitmap$Config;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QE:Landroid/graphics/Bitmap$Config;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,13 +41,13 @@
 .method public final a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
     .locals 0
 
-    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object p2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QF: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;->Qv:Landroid/graphics/Bitmap$Config;
+    iget-object p3, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$2;->QE:Landroid/graphics/Bitmap$Config;
 
     invoke-interface {p2, p1, p4, p3}, Lcom/facebook/imagepipeline/animated/b/d;->b(Lcom/facebook/imagepipeline/g/e;Lcom/facebook/imagepipeline/a/b;Landroid/graphics/Bitmap$Config;)Lcom/facebook/imagepipeline/g/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 d14e72c497..c12da30e91 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 Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$3;->QF: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 1912224848..5d84614d3b 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 Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$4;->QF: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 580e897ec4..9156cd4082 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 Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$5;->QF: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 3df1d4f76a..54f4b6b6f7 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 Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+.field final synthetic QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->QF: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;->Qw:Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/AnimatedFactoryV2Impl$6;->QF: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 77fea7c181..d9fecb4bf1 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 QA:Ljava/lang/String;
+.field private final QJ:Ljava/lang/String;
 
 
 # direct methods
@@ -37,17 +37,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a$a;->QA:Ljava/lang/String;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a$a;->QJ:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final fI()Ljava/lang/String;
+.method public final fL()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/a$a;->QA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/fresco/animation/factory/a$a;->QJ: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 28081aa6b7..fe9686d656 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,13 +15,37 @@
 
 
 # instance fields
-.field private final KI:Lcom/facebook/common/time/b;
+.field private final KR:Lcom/facebook/common/time/b;
 
-.field private final PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field private final PF:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final Pw:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final Qq:Lcom/facebook/imagepipeline/cache/h;
+.field private final QC:Lcom/facebook/imagepipeline/animated/c/b;
+
+.field private final QG:Ljava/util/concurrent/ExecutorService;
+
+.field private final QH:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final QI:Lcom/facebook/common/d/l;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/common/d/l<",
+            "Ljava/lang/Integer;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final Qz:Lcom/facebook/imagepipeline/cache/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/h<",
@@ -32,30 +56,6 @@
     .end annotation
 .end field
 
-.field private final Qt:Lcom/facebook/imagepipeline/animated/c/b;
-
-.field private final Qx:Ljava/util/concurrent/ExecutorService;
-
-.field private final Qy:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final Qz:Lcom/facebook/common/d/l;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/common/d/l<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method public constructor <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/l;Lcom/facebook/common/d/l;)V
@@ -83,21 +83,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iput-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->QC:Lcom/facebook/imagepipeline/animated/c/b;
 
-    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/a;->Pw:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p2, p0, Lcom/facebook/fresco/animation/factory/a;->PF:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/a;->Qx:Ljava/util/concurrent/ExecutorService;
+    iput-object p3, p0, Lcom/facebook/fresco/animation/factory/a;->QG:Ljava/util/concurrent/ExecutorService;
 
-    iput-object p4, p0, Lcom/facebook/fresco/animation/factory/a;->KI:Lcom/facebook/common/time/b;
+    iput-object p4, p0, Lcom/facebook/fresco/animation/factory/a;->KR:Lcom/facebook/common/time/b;
 
-    iput-object p5, p0, Lcom/facebook/fresco/animation/factory/a;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p5, p0, Lcom/facebook/fresco/animation/factory/a;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iput-object p6, p0, Lcom/facebook/fresco/animation/factory/a;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p6, p0, Lcom/facebook/fresco/animation/factory/a;->Qz:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p7, p0, Lcom/facebook/fresco/animation/factory/a;->Qy:Lcom/facebook/common/d/l;
+    iput-object p7, p0, Lcom/facebook/fresco/animation/factory/a;->QH:Lcom/facebook/common/d/l;
 
-    iput-object p8, p0, Lcom/facebook/fresco/animation/factory/a;->Qz:Lcom/facebook/common/d/l;
+    iput-object p8, p0, Lcom/facebook/fresco/animation/factory/a;->QI:Lcom/facebook/common/d/l;
 
     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;->Qq:Lcom/facebook/imagepipeline/cache/h;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->Qz: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/g/a;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/a;->ji()Lcom/facebook/imagepipeline/animated/a/e;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/a;->jl()Lcom/facebook/imagepipeline/animated/a/e;
 
     move-result-object p1
 
-    iget-object v1, p1, Lcom/facebook/imagepipeline/animated/a/e;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/animated/a/e;->RB: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;->Qt:Lcom/facebook/imagepipeline/animated/c/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->QC: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;->Qy:Lcom/facebook/common/d/l;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->QH:Lcom/facebook/common/d/l;
 
     invoke-interface {v2}, Lcom/facebook/common/d/l;->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;->Qz:Lcom/facebook/common/d/l;
+    iget-object p1, p0, Lcom/facebook/fresco/animation/factory/a;->QI:Lcom/facebook/common/d/l;
 
     invoke-interface {p1}, Lcom/facebook/common/d/l;->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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v3, p0, Lcom/facebook/fresco/animation/factory/a;->PN: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;->Qx:Ljava/util/concurrent/ExecutorService;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->QG: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;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v5, p0, Lcom/facebook/fresco/animation/factory/a;->PN: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;->KI:Lcom/facebook/common/time/b;
+    iget-object v1, p0, Lcom/facebook/fresco/animation/factory/a;->KR:Lcom/facebook/common/time/b;
 
-    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->Pw:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p0, Lcom/facebook/fresco/animation/factory/a;->PF: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 f10d864fcc..0926310576 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 Tf:I
+.field public final To:I
 
-.field public final Tg:I
+.field public final Tp:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iput p1, p0, Lcom/facebook/imagepipeline/a/a;->To:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iput p2, p0, Lcom/facebook/imagepipeline/a/a;->Tp: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;->Tf:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->To:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iget v3, p1, Lcom/facebook/imagepipeline/a/a;->To:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tp:I
 
-    iget p1, p1, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iget p1, p1, Lcom/facebook/imagepipeline/a/a;->Tp: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;->Tf:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/a;->To:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tp:I
 
     invoke-static {v0, v1}, Lcom/facebook/common/j/b;->i(II)I
 
@@ -103,7 +103,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->To:I
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/a/a;->ab(I)Ljava/lang/String;
 
@@ -113,7 +113,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/a;->Tp:I
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/a/a;->ab(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 c677b7b87c..664e2815fe 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 TD:F
+.field public final TM:F
 
-.field public final TE:F
+.field public final TN:F
 
 .field public final height:I
 
@@ -71,11 +71,11 @@
 
     const/high16 p1, 0x45000000    # 2048.0f
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TD:F
+    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TM:F
 
     const p1, 0x3f2aaaab
 
-    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TE:F
+    iput p1, p0, Lcom/facebook/imagepipeline/a/e;->TN: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 aa8ffded62..4a9ab3af1f 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 TH:Lcom/facebook/imagepipeline/a/f;
+.field private static final TQ:Lcom/facebook/imagepipeline/a/f;
 
-.field private static final TI:Lcom/facebook/imagepipeline/a/f;
+.field private static final TR:Lcom/facebook/imagepipeline/a/f;
 
-.field private static final TJ:Lcom/facebook/imagepipeline/a/f;
+.field private static final TS:Lcom/facebook/imagepipeline/a/f;
 
 
 # instance fields
-.field private final TF:I
+.field private final TO:I
 
-.field public final TG:Z
+.field public final TP: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;->TH:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->TQ: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;->TI:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->TR: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;->TJ:Lcom/facebook/imagepipeline/a/f;
+    sput-object v0, Lcom/facebook/imagepipeline/a/f;->TS: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;->TF:I
+    iput p1, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/a/f;->TG:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
     return-void
 .end method
 
-.method public static ix()Lcom/facebook/imagepipeline/a/f;
+.method public static iA()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TH:Lcom/facebook/imagepipeline/a/f;
+    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TQ:Lcom/facebook/imagepipeline/a/f;
 
     return-object v0
 .end method
 
-.method public static iy()Lcom/facebook/imagepipeline/a/f;
+.method public static iB()Lcom/facebook/imagepipeline/a/f;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TJ:Lcom/facebook/imagepipeline/a/f;
+    sget-object v0, Lcom/facebook/imagepipeline/a/f;->TS: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;->TF:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/a/f;->TF:I
+    iget v3, p1, Lcom/facebook/imagepipeline/a/f;->TO:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TG:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/f;->TG:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
     if-ne v1, p1, :cond_2
 
@@ -122,13 +122,13 @@
 .method public final hashCode()I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TF:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO: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;->TG:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TP:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -141,52 +141,10 @@
     return v0
 .end method
 
-.method public final iA()Z
+.method public final iC()Z
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TF:I
-
-    const/4 v1, -0x2
-
-    if-eq v0, v1, :cond_0
-
-    const/4 v0, 0x1
-
-    return v0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method public final iB()I
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iz()Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TF:I
-
-    return v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Rotation is set to use EXIF"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public final iz()Z
-    .locals 2
-
-    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TF:I
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
 
     const/4 v1, -0x1
 
@@ -202,6 +160,48 @@
     return v0
 .end method
 
+.method public final iD()Z
+    .locals 2
+
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
+
+    const/4 v1, -0x2
+
+    if-eq v0, v1, :cond_0
+
+    const/4 v0, 0x1
+
+    return v0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+.end method
+
+.method public final iE()I
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/a/f;->iC()Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget v0, p0, Lcom/facebook/imagepipeline/a/f;->TO:I
+
+    return v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Rotation is set to use EXIF"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
 .method public final toString()Ljava/lang/String;
     .locals 3
 
@@ -209,7 +209,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->TF:I
+    iget v1, p0, Lcom/facebook/imagepipeline/a/f;->TO: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;->TG:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/a/f;->TP: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 2c3bba3953..02960a5391 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 Rl:I = 0x1
+.field public static final Ru:I = 0x1
 
-.field public static final Rm:I = 0x2
+.field public static final Rv:I = 0x2
 
-.field private static final synthetic Rn:[I
+.field private static final synthetic Rw:[I
 
 
 # direct methods
@@ -38,19 +38,19 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rl:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Ru:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rm:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$a;->Rn:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$a;->Rw:[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 ae5db516dd..9806d22cd2 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 Ro:I = 0x1
+.field private static final synthetic RA:[I
 
-.field public static final Rp:I = 0x2
+.field public static final Rx:I = 0x1
 
-.field public static final Rq:I = 0x3
+.field public static final Ry:I = 0x2
 
-.field private static final synthetic Rr:[I
+.field public static final Rz:I = 0x3
 
 
 # direct methods
@@ -40,25 +40,25 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ro:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rp:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rq:I
+    sget v1, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Rr:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/a/b$b;->RA:[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 18565488c9..0e384d0c7d 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 Rg:I
+.field public final Rp:I
 
-.field public final Rh:I
+.field public final Rq:I
 
-.field public final Ri:I
+.field public final Rr:I
 
-.field public final Rj:I
+.field public final Rs:I
 
-.field public final Rk:I
+.field public final Rt: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;->Rg:I
+    iput p1, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rp:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rh:I
+    iput p2, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rq:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/animated/a/b;->Ri:I
+    iput p3, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rr: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;->Rj:I
+    iput p6, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rs:I
 
-    iput p7, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rk:I
+    iput p7, p0, Lcom/facebook/imagepipeline/animated/a/b;->Rt: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 59994621c7..6dc37f8f5c 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,19 +10,19 @@
 .method public abstract C(I)Lcom/facebook/imagepipeline/animated/a/d;
 .end method
 
-.method public abstract fB()I
+.method public abstract fE()I
 .end method
 
-.method public abstract fC()[I
+.method public abstract fF()[I
 .end method
 
-.method public abstract fD()I
+.method public abstract fG()I
 .end method
 
-.method public abstract fE()Z
+.method public abstract fH()Z
 .end method
 
-.method public abstract fF()I
+.method public abstract fI()I
 .end method
 
 .method public abstract getHeight()I
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/d.smali
index f2ef17f4e1..a526d61fce 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/animated/a/d.smali
@@ -10,10 +10,10 @@
 .method public abstract dispose()V
 .end method
 
-.method public abstract fy()I
+.method public abstract fB()I
 .end method
 
-.method public abstract fz()I
+.method public abstract fC()I
 .end method
 
 .method public abstract getHeight()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 768b3f0604..1d5113653d 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 Rs:Lcom/facebook/imagepipeline/animated/a/c;
+.field final RB:Lcom/facebook/imagepipeline/animated/a/c;
 
-.field public Rt:I
+.field public RC:I
 
-.field public Ru:Lcom/facebook/common/references/CloseableReference;
+.field public RD: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 Rv:Ljava/util/List;
+.field public RE: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;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/a/f;->RB:Lcom/facebook/imagepipeline/animated/a/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ih()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final ik()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;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RD: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;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->RD:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rv:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RE: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;->Rv:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->RE:Ljava/util/List;
 
     return-object v1
 
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RD: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;->Ru:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->RD:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->Rv:Ljava/util/List;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/a/f;->RE: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;->Rv:Ljava/util/List;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/animated/a/f;->RE: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 2b73352dc2..b28480ad80 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 Rw:Z
+.field private static RF:Z
 
-.field private static Rx:Lcom/facebook/imagepipeline/animated/b/a;
+.field private static RG:Lcom/facebook/imagepipeline/animated/b/a;
 
 
 # direct methods
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->Rw:Z
+    sget-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->RF: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;->Rx:Lcom/facebook/imagepipeline/animated/b/a;
+    sput-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RG: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;->Rx:Lcom/facebook/imagepipeline/animated/b/a;
+    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RG:Lcom/facebook/imagepipeline/animated/b/a;
 
     if-eqz p0, :cond_0
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->Rw:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/animated/b/b;->RF:Z
 
     :cond_0
-    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->Rx:Lcom/facebook/imagepipeline/animated/b/a;
+    sget-object p0, Lcom/facebook/imagepipeline/animated/b/b;->RG: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 2473f46a3c..23e8561d73 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 RB:Lcom/facebook/imagepipeline/animated/b/e;
+.field final synthetic RK:Lcom/facebook/imagepipeline/animated/b/e;
 
-.field final synthetic RC:Ljava/util/List;
+.field final synthetic RL: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;->RB:Lcom/facebook/imagepipeline/animated/b/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RK:Lcom/facebook/imagepipeline/animated/b/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RC:Ljava/util/List;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RL: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;->RC:Ljava/util/List;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/b/e$2;->RL: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 ef3d006648..268959dfa5 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 RP:Lcom/facebook/imagepipeline/animated/c/c;
+.field final synthetic RY: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;->RP:Lcom/facebook/imagepipeline/animated/c/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->RY: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;->RP:Lcom/facebook/imagepipeline/animated/c/c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/c$1;->RY: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 d9b2f9465f..a4f3f108c3 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 RS:[I
+.field static final synthetic Sb:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->ik()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/animated/c/d$b;->in()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$1;->RS:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RS:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->RT:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc: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;->RS:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->RU:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sd: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;->RS:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->RW:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Sf: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;->RS:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->RV:I
+    sget v2, Lcom/facebook/imagepipeline/animated/c/d$b;->Se: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 b7f4a19cd4..69307077a7 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 RT:I = 0x1
+.field public static final Sc:I = 0x1
 
-.field public static final RU:I = 0x2
+.field public static final Sd:I = 0x2
 
-.field public static final RV:I = 0x3
+.field public static final Se:I = 0x3
 
-.field public static final RW:I = 0x4
+.field public static final Sf:I = 0x4
 
-.field private static final synthetic RX:[I
+.field private static final synthetic Sg:[I
 
 
 # direct methods
@@ -42,39 +42,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->RT:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->RU:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sd:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->RV:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Se:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->RW:I
+    sget v1, Lcom/facebook/imagepipeline/animated/c/d$b;->Sf:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RX:[I
+    sput-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sg:[I
 
     return-void
 .end method
 
-.method public static ik()[I
+.method public static in()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RX:[I
+    sget-object v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sg:[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 d62909e0b9..345babc30f 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 PY:Lcom/facebook/imagepipeline/animated/a/a;
+.field private final Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-.field private final Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+.field private final Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
 
-.field private final RR:Landroid/graphics/Paint;
+.field private final Sa: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qj: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;->RR:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Sa:Landroid/graphics/Paint;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->RR:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Sa: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;->RR:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Sa: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;->RR:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Sa: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;->Rh:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rq:I
 
     int-to-float v2, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Ri:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rr:I
 
     int-to-float v3, v0
 
-    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rh:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rq: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;->Ri:I
+    iget v0, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rr: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;->RR:Landroid/graphics/Paint;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/animated/c/d;->Sa: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;->Rh:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rq:I
 
     if-nez v0, :cond_0
 
-    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Ri:I
+    iget v0, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rr: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->if()I
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/animated/a/a;->ii()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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->ig()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/a;->ij()I
 
     move-result v0
 
@@ -148,13 +148,13 @@
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v1, p1}, Lcom/facebook/imagepipeline/animated/a/a;->B(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/d;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh: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;->Rj:I
+    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rs:I
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$a;->Rm:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv:I
 
     if-ne v2, v3, :cond_1
 
@@ -177,9 +177,9 @@
     return v0
 
     :cond_1
-    iget v1, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rk:I
+    iget v1, p1, Lcom/facebook/imagepipeline/animated/a/b;->Rt:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Rp:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->B(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v0
 
-    iget v1, v0, Lcom/facebook/imagepipeline/animated/a/b;->Rk:I
+    iget v1, v0, Lcom/facebook/imagepipeline/animated/a/b;->Rt:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ro:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Rx:I
 
     if-ne v1, v2, :cond_0
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RT:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
 
     goto :goto_1
 
     :cond_0
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Rp:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry: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;->RU:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sd:I
 
     goto :goto_1
 
     :cond_1
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RT:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sc:I
 
     goto :goto_1
 
     :cond_2
-    sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Rq:I
+    sget v0, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
 
     if-ne v1, v0, :cond_3
 
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RV:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Se:I
 
     goto :goto_1
 
     :cond_3
-    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->RW:I
+    sget v0, Lcom/facebook/imagepipeline/animated/c/d$b;->Sf:I
 
     :goto_1
-    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->RS:[I
+    sget-object v1, Lcom/facebook/imagepipeline/animated/c/d$1;->Sb:[I
 
     const/4 v2, 0x1
 
@@ -281,13 +281,13 @@
     return p1
 
     :cond_6
-    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/animated/a/a;->B(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qa:Lcom/facebook/imagepipeline/animated/c/d$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qj:Lcom/facebook/imagepipeline/animated/c/d$a;
 
     invoke-interface {v1, p1}, Lcom/facebook/imagepipeline/animated/c/d$a;->X(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;->Rk:I
+    iget v3, v0, Lcom/facebook/imagepipeline/animated/a/b;->Rt:I
 
-    sget v4, Lcom/facebook/imagepipeline/animated/a/b$b;->Rp:I
+    sget v4, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {v1, p2}, Lcom/facebook/imagepipeline/animated/a/a;->B(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object v1
 
-    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rk:I
+    iget v2, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rt:I
 
-    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Rq:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Rz:I
 
     if-eq v2, v3, :cond_2
 
-    iget v3, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rj:I
+    iget v3, v1, Lcom/facebook/imagepipeline/animated/a/b;->Rs:I
 
-    sget v4, Lcom/facebook/imagepipeline/animated/a/b$a;->Rm:I
+    sget v4, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh: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;->Rp:I
+    sget v3, Lcom/facebook/imagepipeline/animated/a/b$b;->Ry: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh:Lcom/facebook/imagepipeline/animated/a/a;
 
     invoke-interface {p2, p1}, Lcom/facebook/imagepipeline/animated/a/a;->B(I)Lcom/facebook/imagepipeline/animated/a/b;
 
     move-result-object p2
 
-    iget v1, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rj:I
+    iget v1, p2, Lcom/facebook/imagepipeline/animated/a/b;->Rs:I
 
-    sget v2, Lcom/facebook/imagepipeline/animated/a/b$a;->Rm:I
+    sget v2, Lcom/facebook/imagepipeline/animated/a/b$a;->Rv: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;->PY:Lcom/facebook/imagepipeline/animated/a/a;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/animated/c/d;->Qh: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 f0a969e162..1b4c59ad9a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final Is:Lcom/facebook/common/references/CloseableReference$a;
+.field public final IB:Lcom/facebook/common/references/CloseableReference$a;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/facebook/imagepipeline/b/a$1;-><init>(Lcom/facebook/imagepipeline/b/a;Lcom/facebook/imagepipeline/d/a;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/a;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->Is:Lcom/facebook/common/references/CloseableReference$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/a;->IB:Lcom/facebook/common/references/CloseableReference$a;
 
     invoke-static {p1, p2, v0}, Lcom/facebook/common/references/CloseableReference;->a(Ljava/lang/Object;Lcom/facebook/common/references/b;Lcom/facebook/common/references/CloseableReference$a;)Lcom/facebook/common/references/CloseableReference;
 
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 8500ca9cde..0137eaa7b4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/b.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final TM:Ljava/util/concurrent/Executor;
+.field private final TV:Ljava/util/concurrent/Executor;
 
-.field private final TN:Ljava/util/concurrent/Executor;
+.field private final TW:Ljava/util/concurrent/Executor;
 
-.field private final TO:Ljava/util/concurrent/Executor;
+.field private final TX: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/b;->TM:Ljava/util/concurrent/Executor;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TV:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/l;
 
@@ -46,7 +46,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TN:Ljava/util/concurrent/Executor;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TW:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/facebook/imagepipeline/b/l;
 
@@ -72,41 +72,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/b;->TO:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/b;->TX:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final iC()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TM:Ljava/util/concurrent/Executor;
-
-    return-object v0
-.end method
-
-.method public final iD()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TM:Ljava/util/concurrent/Executor;
-
-    return-object v0
-.end method
-
-.method public final iE()Ljava/util/concurrent/Executor;
-    .locals 1
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TN:Ljava/util/concurrent/Executor;
-
-    return-object v0
-.end method
-
 .method public final iF()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TV:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
@@ -114,7 +90,31 @@
 .method public final iG()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TO:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TV:Ljava/util/concurrent/Executor;
+
+    return-object v0
+.end method
+
+.method public final iH()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TW:Ljava/util/concurrent/Executor;
+
+    return-object v0
+.end method
+
+.method public final iI()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->mBackgroundExecutor:Ljava/util/concurrent/Executor;
+
+    return-object v0
+.end method
+
+.method public final iJ()Ljava/util/concurrent/Executor;
+    .locals 1
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/b;->TX:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/c.smali
index 4fca177b87..a4e47d08a7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/c.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private TP:Lcom/facebook/imagepipeline/b/d;
+.field private TY:Lcom/facebook/imagepipeline/b/d;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/c;->TP:Lcom/facebook/imagepipeline/b/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/c;->TY:Lcom/facebook/imagepipeline/b/d;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     move-object/from16 v1, p1
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/c;->TP:Lcom/facebook/imagepipeline/b/d;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/c;->TY:Lcom/facebook/imagepipeline/b/d;
 
     invoke-interface {v2, v1}, Lcom/facebook/imagepipeline/b/d;->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;->GS:J
+    iget-wide v11, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hc:J
 
-    iget-wide v13, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GR:J
+    iget-wide v13, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hb:J
 
-    iget-wide v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GQ:J
+    iget-wide v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Ha: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;->GU:Lcom/facebook/cache/disk/g;
+    iget-object v5, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hd:Lcom/facebook/cache/disk/g;
 
-    iget-object v7, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GV:Lcom/facebook/cache/common/b;
+    iget-object v7, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->He:Lcom/facebook/cache/common/b;
 
-    iget-object v8, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GE:Lcom/facebook/cache/common/a;
+    iget-object v8, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GN:Lcom/facebook/cache/common/a;
 
-    iget-boolean v10, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->GX:Z
+    iget-boolean v10, v1, Lcom/facebook/cache/disk/DiskCacheConfig;->Hg:Z
 
     move-object v3, v11
 
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 ca378bf0ef..78a22754fe 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/e.smali
@@ -24,11 +24,11 @@
 
     iget v1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->mVersion:I
 
-    iget-object v2, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GP:Lcom/facebook/common/d/l;
+    iget-object v2, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GZ:Lcom/facebook/common/d/l;
 
-    iget-object v3, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GO:Ljava/lang/String;
+    iget-object v3, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GY:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GE:Lcom/facebook/cache/common/a;
+    iget-object p1, p1, Lcom/facebook/cache/disk/DiskCacheConfig;->GN:Lcom/facebook/cache/common/a;
 
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/facebook/cache/disk/e;-><init>(ILcom/facebook/common/d/l;Ljava/lang/String;Lcom/facebook/cache/common/a;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/f.smali
index 892617790e..0f7ccf4e08 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/f.smali
@@ -4,17 +4,17 @@
 
 
 # virtual methods
-.method public abstract iC()Ljava/util/concurrent/Executor;
-.end method
-
-.method public abstract iD()Ljava/util/concurrent/Executor;
-.end method
-
-.method public abstract iE()Ljava/util/concurrent/Executor;
-.end method
-
 .method public abstract iF()Ljava/util/concurrent/Executor;
 .end method
 
 .method public abstract iG()Ljava/util/concurrent/Executor;
 .end method
+
+.method public abstract iH()Ljava/util/concurrent/Executor;
+.end method
+
+.method public abstract iI()Ljava/util/concurrent/Executor;
+.end method
+
+.method public abstract iJ()Ljava/util/concurrent/Executor;
+.end method
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 73f5c8ffc7..ace04bc4b7 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 Ue:Lcom/facebook/imagepipeline/b/h;
+.field final synthetic Un:Lcom/facebook/imagepipeline/b/h;
 
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/b/h;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$1;->Ue:Lcom/facebook/imagepipeline/b/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/h$1;->Un:Lcom/facebook/imagepipeline/b/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$1.smali
index 2e5d0798b4..fd38dc237e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$1.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic UB:Lcom/facebook/imagepipeline/b/i;
+.field final synthetic UK:Lcom/facebook/imagepipeline/b/i;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/b/i;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i$1;->UB:Lcom/facebook/imagepipeline/b/i;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/i$1;->UK:Lcom/facebook/imagepipeline/b/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$b.smali
index 8b83b30210..a04a17bff8 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/i$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public UF:Z
+.field public UO:Z
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$b;->UF:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/i$b;->UO:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/j$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/j$a.smali
index 577de07ffb..9848dae391 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/j$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/j$a.smali
@@ -15,39 +15,29 @@
 
 
 # instance fields
-.field public Qr:Z
+.field public QA:Z
 
-.field UG:Z
+.field UQ:Z
 
-.field UH:Lcom/facebook/common/k/b$a;
-
-.field UI:Z
-
-.field UJ:Lcom/facebook/common/k/b;
-
-.field UK:Z
-
-.field UL:Z
-
-.field UM:I
-
-.field UN:I
-
-.field public UO:Z
-
-.field UQ:I
-
-.field UR:Z
+.field UR:Lcom/facebook/common/k/b$a;
 
 .field US:Z
 
-.field UT:Lcom/facebook/imagepipeline/b/j$c;
+.field UT:Lcom/facebook/common/k/b;
 
-.field public UU:Z
+.field UU:Z
 
-.field public final UV:Lcom/facebook/imagepipeline/b/i$a;
+.field UV:Z
 
-.field public Uc:Lcom/facebook/common/d/l;
+.field UW:I
+
+.field UX:I
+
+.field public UY:Z
+
+.field UZ:I
+
+.field public Ul:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -57,6 +47,16 @@
     .end annotation
 .end field
 
+.field Va:Z
+
+.field Vb:Z
+
+.field Vc:Lcom/facebook/imagepipeline/b/j$c;
+
+.field public Vd:Z
+
+.field public final Ve:Lcom/facebook/imagepipeline/b/i$a;
+
 
 # direct methods
 .method public constructor <init>(Lcom/facebook/imagepipeline/b/i$a;)V
@@ -66,29 +66,29 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UG:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UI:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UK:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UL:Z
-
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UM:I
-
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UN:I
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UO:Z
-
-    const/16 v1, 0x800
-
-    iput v1, p0, Lcom/facebook/imagepipeline/b/j$a;->UQ:I
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UR:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UQ:Z
 
     iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->US:Z
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/j$a;->UV:Lcom/facebook/imagepipeline/b/i$a;
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UU:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UV:Z
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UW:I
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UX:I
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->UY:Z
+
+    const/16 v1, 0x800
+
+    iput v1, p0, Lcom/facebook/imagepipeline/b/j$a;->UZ:I
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->Va:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j$a;->Vb:Z
+
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/j$a;->Ve:Lcom/facebook/imagepipeline/b/i$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/j.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/j.smali
index 25f42e0fd2..d2252494fc 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/j.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/j.smali
@@ -14,37 +14,29 @@
 
 
 # instance fields
-.field final Qr:Z
+.field final QA:Z
 
-.field final UG:Z
+.field final UQ:Z
 
-.field final UH:Lcom/facebook/common/k/b$a;
-
-.field final UI:Z
-
-.field final UJ:Lcom/facebook/common/k/b;
-
-.field final UK:Z
-
-.field final UL:Z
-
-.field final UM:I
-
-.field final UN:I
-
-.field UO:Z
-
-.field final UQ:I
-
-.field final UR:Z
+.field final UR:Lcom/facebook/common/k/b$a;
 
 .field final US:Z
 
-.field final UT:Lcom/facebook/imagepipeline/b/j$c;
+.field final UT:Lcom/facebook/common/k/b;
 
 .field final UU:Z
 
-.field final Uc:Lcom/facebook/common/d/l;
+.field final UV:Z
+
+.field final UW:I
+
+.field final UX:I
+
+.field UY:Z
+
+.field final UZ:I
+
+.field final Ul:Lcom/facebook/common/d/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/common/d/l<",
@@ -54,6 +46,14 @@
     .end annotation
 .end field
 
+.field final Va:Z
+
+.field final Vb:Z
+
+.field final Vc:Lcom/facebook/imagepipeline/b/j$c;
+
+.field final Vd:Z
+
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/b/j$a;)V
@@ -61,55 +61,55 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UG:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UQ:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UG:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UQ:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UH:Lcom/facebook/common/k/b$a;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UR:Lcom/facebook/common/k/b$a;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UH:Lcom/facebook/common/k/b$a;
-
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UI:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UI:Z
-
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UJ:Lcom/facebook/common/k/b;
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UJ:Lcom/facebook/common/k/b;
-
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UK:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UK:Z
-
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UL:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UL:Z
-
-    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UM:I
-
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UM:I
-
-    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UN:I
-
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UN:I
-
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UO:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UO:Z
-
-    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UQ:I
-
-    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UQ:I
-
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UR:Z
-
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UR:Z
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UR:Lcom/facebook/common/k/b$a;
 
     iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->US:Z
 
     iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->US:Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UT:Lcom/facebook/imagepipeline/b/j$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UT:Lcom/facebook/common/k/b;
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UT:Lcom/facebook/common/k/b;
+
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UU:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UU:Z
+
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UV:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UV:Z
+
+    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UW:I
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UW:I
+
+    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UX:I
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UX:I
+
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UY:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UY:Z
+
+    iget v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UZ:I
+
+    iput v0, p0, Lcom/facebook/imagepipeline/b/j;->UZ:I
+
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Va:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->Va:Z
+
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Vb:Z
+
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->Vb:Z
+
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Vc:Lcom/facebook/imagepipeline/b/j$c;
 
     if-nez v0, :cond_0
 
@@ -117,27 +117,27 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/b/j$b;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UT:Lcom/facebook/imagepipeline/b/j$c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Vc:Lcom/facebook/imagepipeline/b/j$c;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UT:Lcom/facebook/imagepipeline/b/j$c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Vc:Lcom/facebook/imagepipeline/b/j$c;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->UT:Lcom/facebook/imagepipeline/b/j$c;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Vc:Lcom/facebook/imagepipeline/b/j$c;
 
     :goto_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Uc:Lcom/facebook/common/d/l;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Ul:Lcom/facebook/common/d/l;
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Uc:Lcom/facebook/common/d/l;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/j;->Ul:Lcom/facebook/common/d/l;
 
-    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->UU:Z
+    iget-boolean v0, p1, Lcom/facebook/imagepipeline/b/j$a;->Vd:Z
 
-    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->UU:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/b/j;->Vd:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j$a;->Qr:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/b/j$a;->QA:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/j;->Qr:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/b/j;->QA:Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/l$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/l$1.smali
index 07581f214b..b3aa910c7c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/l$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/l$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Vk:Lcom/facebook/imagepipeline/b/l;
+.field final synthetic Vt:Lcom/facebook/imagepipeline/b/l;
 
-.field final synthetic rz:Ljava/lang/Runnable;
+.field final synthetic ry:Ljava/lang/Runnable;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/b/l;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/l$1;->Vk:Lcom/facebook/imagepipeline/b/l;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/l$1;->Vt:Lcom/facebook/imagepipeline/b/l;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/l$1;->rz:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/l$1;->ry: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/l$1;->Vk:Lcom/facebook/imagepipeline/b/l;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l$1;->Vt:Lcom/facebook/imagepipeline/b/l;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/b/l;->a(Lcom/facebook/imagepipeline/b/l;)I
 
@@ -53,7 +53,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :catchall_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l$1;->rz:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/l$1;->ry:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
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 1c96440e21..77225e5324 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/l.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/l.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final Vh:I
+.field private final Vq:I
 
-.field private final Vi:Z
+.field private final Vr:Z
 
-.field private final Vj:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final Vs: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/l;->Vj:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/l;->Vs:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lcom/facebook/imagepipeline/b/l;->Vh:I
+    iput v0, p0, Lcom/facebook/imagepipeline/b/l;->Vq:I
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/b/l;->mPrefix:Ljava/lang/String;
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/b/l;->Vi:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/b/l;->Vr:Z
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/b/l;)I
     .locals 0
 
-    iget p0, p0, Lcom/facebook/imagepipeline/b/l;->Vh:I
+    iget p0, p0, Lcom/facebook/imagepipeline/b/l;->Vq:I
 
     return p0
 .end method
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/facebook/imagepipeline/b/l$1;-><init>(Lcom/facebook/imagepipeline/b/l;Ljava/lang/Runnable;)V
 
-    iget-boolean p1, p0, Lcom/facebook/imagepipeline/b/l;->Vi:Z
+    iget-boolean p1, p0, Lcom/facebook/imagepipeline/b/l;->Vr: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/l;->Vj:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/l;->Vs: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/m.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
index d842698e58..92ed139a94 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/m.smali
@@ -4,17 +4,31 @@
 
 
 # instance fields
-.field final Ip:Lcom/facebook/common/g/a;
+.field final Iy:Lcom/facebook/common/g/a;
 
-.field final PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field final PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field final Qp:Lcom/facebook/imagepipeline/b/f;
+.field final Qy:Lcom/facebook/imagepipeline/b/f;
 
-.field private final RZ:Lcom/facebook/imagepipeline/b/a;
+.field private final Si:Lcom/facebook/imagepipeline/b/a;
 
-.field final Sc:Lcom/facebook/common/g/g;
+.field final Sl:Lcom/facebook/common/g/g;
 
-.field final TU:Lcom/facebook/imagepipeline/cache/o;
+.field private final UC:Lcom/facebook/imagepipeline/e/e;
+
+.field private final UD:Z
+
+.field private final US:Z
+
+.field final UW:I
+
+.field final UX:I
+
+.field UY:Z
+
+.field private final UZ:I
+
+.field final Ud:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -25,7 +39,7 @@
     .end annotation
 .end field
 
-.field private final TV:Lcom/facebook/imagepipeline/cache/o;
+.field private final Ue:Lcom/facebook/imagepipeline/cache/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/cache/o<",
@@ -36,33 +50,19 @@
     .end annotation
 .end field
 
-.field private final TX:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
 
-.field final TY:Lcom/facebook/imagepipeline/cache/f;
+.field final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final UI:Z
+.field private final Uq:Z
 
-.field final UM:I
+.field private final Ut:Lcom/facebook/imagepipeline/e/c;
 
-.field final UN:I
+.field Vu:Landroid/content/ContentResolver;
 
-.field UO:Z
+.field Vv:Landroid/content/res/AssetManager;
 
-.field private final UQ:I
-
-.field private final Uh:Z
-
-.field private final Uk:Lcom/facebook/imagepipeline/e/c;
-
-.field private final Ut:Lcom/facebook/imagepipeline/e/e;
-
-.field private final Uu:Z
-
-.field Vl:Landroid/content/ContentResolver;
-
-.field Vm:Landroid/content/res/AssetManager;
-
-.field private final Vn:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
 
 .field mResources:Landroid/content/res/Resources;
 
@@ -110,7 +110,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vl:Landroid/content/ContentResolver;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
 
     invoke-virtual {p1}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
@@ -130,83 +130,83 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vm:Landroid/content/res/AssetManager;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vv:Landroid/content/res/AssetManager;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ip:Lcom/facebook/common/g/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ut:Lcom/facebook/imagepipeline/e/c;
 
     move-object v1, p4
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->UC:Lcom/facebook/imagepipeline/e/e;
 
     move v1, p5
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->Uh:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->Uq:Z
 
     move v1, p6
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->Uu:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UD:Z
 
     move v1, p7
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UI:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->US:Z
 
     move-object v1, p8
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
     move-object v1, p9
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
     move-object v1, p10
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v1, p11
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->TV:Lcom/facebook/imagepipeline/cache/o;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ue:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v1, p12
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
     move-object v1, p13
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UM:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UW:I
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UN:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UX:I
 
     move/from16 v1, p18
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UO:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/b/m;->UY:Z
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UQ:I
+    iput v1, v0, Lcom/facebook/imagepipeline/b/m;->UZ:I
 
     move-object/from16 v1, p20
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/b/m;->Si:Lcom/facebook/imagepipeline/b/a;
 
     return-void
 .end method
@@ -312,13 +312,13 @@
 
     new-instance v6, Lcom/facebook/imagepipeline/i/ao;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iI()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
     move-object v0, v6
 
@@ -348,9 +348,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/f;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/i/f;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
@@ -372,7 +372,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/g;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/i/g;-><init>(Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
@@ -394,9 +394,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/i/h;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
@@ -417,27 +417,27 @@
 
     new-instance v11, Lcom/facebook/imagepipeline/i/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ip:Lcom/facebook/common/g/a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iE()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iH()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Ut:Lcom/facebook/imagepipeline/e/c;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/b/m;->Uq:Z
 
-    iget-boolean v6, p0, Lcom/facebook/imagepipeline/b/m;->Uu:Z
+    iget-boolean v6, p0, Lcom/facebook/imagepipeline/b/m;->UD:Z
 
-    iget-boolean v7, p0, Lcom/facebook/imagepipeline/b/m;->UI:Z
+    iget-boolean v7, p0, Lcom/facebook/imagepipeline/b/m;->US:Z
 
-    iget v9, p0, Lcom/facebook/imagepipeline/b/m;->UQ:I
+    iget v9, p0, Lcom/facebook/imagepipeline/b/m;->UZ:I
 
-    iget-object v10, p0, Lcom/facebook/imagepipeline/b/m;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iget-object v10, p0, Lcom/facebook/imagepipeline/b/m;->Si:Lcom/facebook/imagepipeline/b/a;
 
     move-object v0, v11
 
@@ -462,11 +462,11 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/facebook/imagepipeline/i/o;-><init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
@@ -487,11 +487,11 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/p;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, v3, p1}, Lcom/facebook/imagepipeline/i/p;-><init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
@@ -512,13 +512,13 @@
 
     new-instance v6, Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->Ip:Lcom/facebook/common/g/a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
 
     move-object v0, v6
 
@@ -543,27 +543,27 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/q;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/i/q;-><init>(Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
     return-object v0
 .end method
 
-.method public final iW()Lcom/facebook/imagepipeline/i/y;
+.method public final iZ()Lcom/facebook/imagepipeline/i/y;
     .locals 4
 
     new-instance v0, Lcom/facebook/imagepipeline/i/y;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Vl:Landroid/content/ContentResolver;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/i/y;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
 
@@ -584,9 +584,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/r;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->TV:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Ue:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/i/r;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
@@ -609,9 +609,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/at;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iG()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iJ()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
@@ -634,13 +634,13 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/ax;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v1}, Lcom/facebook/imagepipeline/b/f;->iI()Ljava/util/concurrent/Executor;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
     invoke-direct {v0, v1, v2, p1}, Lcom/facebook/imagepipeline/i/ax;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Lcom/facebook/imagepipeline/i/aj;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/b/n.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/b/n.smali
index 4caa7269d9..d0f44e6dbb 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/b/n.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/b/n.smali
@@ -4,29 +4,23 @@
 
 
 # instance fields
-.field private final TZ:Lcom/facebook/imagepipeline/i/as;
+.field private final UD:Z
 
-.field private final UG:Z
+.field private final UH:Z
 
-.field final UL:Z
+.field private final UQ:Z
 
-.field private final US:Z
+.field final UV:Z
 
-.field private final Uh:Z
+.field private final Ui:Lcom/facebook/imagepipeline/i/as;
 
-.field private final Ul:Lcom/facebook/imagepipeline/k/d;
+.field private final Uq:Z
 
-.field private final Uq:Lcom/facebook/imagepipeline/i/af;
+.field private final Uu:Lcom/facebook/imagepipeline/k/d;
 
-.field private final Uu:Z
+.field private final Uz:Lcom/facebook/imagepipeline/i/af;
 
-.field private final Uy:Z
-
-.field private final Vd:Lcom/facebook/imagepipeline/b/m;
-
-.field private final Vl:Landroid/content/ContentResolver;
-
-.field Vo:Lcom/facebook/imagepipeline/i/aj;
+.field VA:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -37,17 +31,7 @@
     .end annotation
 .end field
 
-.field private Vp:Lcom/facebook/imagepipeline/i/aj;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/imagepipeline/g/e;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field Vq:Lcom/facebook/imagepipeline/i/aj;
+.field VB:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -58,7 +42,7 @@
     .end annotation
 .end field
 
-.field Vr:Lcom/facebook/imagepipeline/i/aj;
+.field VC:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -69,7 +53,7 @@
     .end annotation
 .end field
 
-.field Vs:Lcom/facebook/imagepipeline/i/aj;
+.field VD:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -80,7 +64,7 @@
     .end annotation
 .end field
 
-.field Vt:Lcom/facebook/imagepipeline/i/aj;
+.field VE:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -91,7 +75,7 @@
     .end annotation
 .end field
 
-.field Vu:Lcom/facebook/imagepipeline/i/aj;
+.field VF:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -102,29 +86,7 @@
     .end annotation
 .end field
 
-.field Vv:Lcom/facebook/imagepipeline/i/aj;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/g/c;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field Vw:Lcom/facebook/imagepipeline/i/aj;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/g/c;",
-            ">;>;"
-        }
-    .end annotation
-.end field
-
-.field Vx:Ljava/util/Map;
+.field VG:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -140,7 +102,7 @@
     .end annotation
 .end field
 
-.field Vy:Ljava/util/Map;
+.field VH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -155,7 +117,7 @@
     .end annotation
 .end field
 
-.field Vz:Ljava/util/Map;
+.field VI:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -171,6 +133,44 @@
     .end annotation
 .end field
 
+.field private final Vb:Z
+
+.field private final Vm:Lcom/facebook/imagepipeline/b/m;
+
+.field private final Vu:Landroid/content/ContentResolver;
+
+.field Vx:Lcom/facebook/imagepipeline/i/aj;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/i/aj<",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
+.field private Vy:Lcom/facebook/imagepipeline/i/aj;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/i/aj<",
+            "Lcom/facebook/imagepipeline/g/e;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field Vz:Lcom/facebook/imagepipeline/i/aj;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/facebook/imagepipeline/i/aj<",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Landroid/content/ContentResolver;Lcom/facebook/imagepipeline/b/m;Lcom/facebook/imagepipeline/i/af;ZZLcom/facebook/imagepipeline/i/as;ZZZZLcom/facebook/imagepipeline/k/d;)V
@@ -178,45 +178,45 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vl:Landroid/content/ContentResolver;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Landroid/content/ContentResolver;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/b/n;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/b/n;->Uz:Lcom/facebook/imagepipeline/i/af;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/b/n;->UD:Z
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/b/n;->UG:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/b/n;->UQ:Z
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VG: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/n;->Vy:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VH: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/n;->Vz:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/b/n;->VI:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/b/n;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/b/n;->Ui:Lcom/facebook/imagepipeline/i/as;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/b/n;->Uh:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/b/n;->Uq:Z
 
-    iput-boolean p8, p0, Lcom/facebook/imagepipeline/b/n;->UL:Z
+    iput-boolean p8, p0, Lcom/facebook/imagepipeline/b/n;->UV:Z
 
-    iput-boolean p9, p0, Lcom/facebook/imagepipeline/b/n;->US:Z
+    iput-boolean p9, p0, Lcom/facebook/imagepipeline/b/n;->Vb:Z
 
-    iput-boolean p10, p0, Lcom/facebook/imagepipeline/b/n;->Uy:Z
+    iput-boolean p10, p0, Lcom/facebook/imagepipeline/b/n;->UH:Z
 
-    iput-object p11, p0, Lcom/facebook/imagepipeline/b/n;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iput-object p11, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     return-void
 .end method
@@ -275,9 +275,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     const/4 v2, 0x1
 
@@ -285,7 +285,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->k(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/at;
 
@@ -320,9 +320,9 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     const/4 v2, 0x1
 
@@ -333,7 +333,7 @@
     return-object p1
 .end method
 
-.method private declared-synchronized iX()Lcom/facebook/imagepipeline/i/aj;
+.method private declared-synchronized ja()Lcom/facebook/imagepipeline/i/aj;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -348,15 +348,15 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vo:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->iY()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jb()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v0
 
@@ -364,219 +364,14 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vo:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     :cond_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vo:Lcom/facebook/imagepipeline/i/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 iY()Lcom/facebook/imagepipeline/i/aj;
-    .locals 4
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/imagepipeline/g/e;",
-            ">;"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vp:Lcom/facebook/imagepipeline/i/aj;
-
-    if-nez v0, :cond_1
-
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uq:Lcom/facebook/imagepipeline/i/af;
-
-    new-instance v2, Lcom/facebook/imagepipeline/i/ae;
-
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
-
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Ip:Lcom/facebook/common/g/a;
-
-    invoke-direct {v2, v3, v0, v1}, Lcom/facebook/imagepipeline/i/ae;-><init>(Lcom/facebook/common/g/g;Lcom/facebook/common/g/a;Lcom/facebook/imagepipeline/i/af;)V
-
-    invoke-direct {p0, v2}, Lcom/facebook/imagepipeline/b/n;->o(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
-
-    move-result-object v0
-
-    invoke-static {v0}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/a;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vp:Lcom/facebook/imagepipeline/i/aj;
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
-
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vp:Lcom/facebook/imagepipeline/i/aj;
-
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Z
-
-    if-eqz v2, :cond_0
-
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/n;->Uh: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/n;->Ul:Lcom/facebook/imagepipeline/k/d;
-
-    invoke-virtual {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/i/aj;ZLcom/facebook/imagepipeline/k/d;)Lcom/facebook/imagepipeline/i/ao;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vp:Lcom/facebook/imagepipeline/i/aj;
-
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
-
-    :cond_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vp:Lcom/facebook/imagepipeline/i/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 iZ()Lcom/facebook/imagepipeline/i/aj;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/g/c;",
-            ">;>;"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vq:Lcom/facebook/imagepipeline/i/aj;
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
-
-    new-instance v1, Lcom/facebook/imagepipeline/i/aa;
-
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
-
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
-
-    move-result-object v2
-
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
-
-    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/i/aa;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
-
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vq:Lcom/facebook/imagepipeline/i/aj;
-
-    :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vq:Lcom/facebook/imagepipeline/i/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 ja()Lcom/facebook/imagepipeline/i/aj;
-    .locals 3
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/g/c;",
-            ">;>;"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vr:Lcom/facebook/imagepipeline/i/aj;
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
-
-    new-instance v1, Lcom/facebook/imagepipeline/i/ac;
-
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
-
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
-
-    move-result-object v2
-
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vl:Landroid/content/ContentResolver;
-
-    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/i/ac;-><init>(Ljava/util/concurrent/Executor;Landroid/content/ContentResolver;)V
-
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->q(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vr:Lcom/facebook/imagepipeline/i/aj;
-
-    :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vr:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -593,82 +388,83 @@
 .end method
 
 .method private declared-synchronized jb()Lcom/facebook/imagepipeline/i/aj;
-    .locals 7
+    .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
             "Lcom/facebook/imagepipeline/i/aj<",
-            "Lcom/facebook/common/references/CloseableReference<",
-            "Lcom/facebook/imagepipeline/g/c;",
-            ">;>;"
+            "Lcom/facebook/imagepipeline/g/e;",
+            ">;"
         }
     .end annotation
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vs:Lcom/facebook/imagepipeline/i/aj;
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    if-nez v0, :cond_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    if-nez v0, :cond_1
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/w;
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Uz:Lcom/facebook/imagepipeline/i/af;
 
-    move-result-object v2
+    new-instance v2, Lcom/facebook/imagepipeline/i/ae;
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Iy:Lcom/facebook/common/g/a;
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/w;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
+    invoke-direct {v2, v3, v0, v1}, Lcom/facebook/imagepipeline/i/ae;-><init>(Lcom/facebook/common/g/g;Lcom/facebook/common/g/a;Lcom/facebook/imagepipeline/i/af;)V
 
-    const/4 v0, 0x2
-
-    new-array v0, v0, [Lcom/facebook/imagepipeline/i/av;
-
-    const/4 v2, 0x0
-
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
-
-    new-instance v4, Lcom/facebook/imagepipeline/i/x;
-
-    iget-object v5, v3, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
-
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
-
-    move-result-object v5
-
-    iget-object v6, v3, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
-
-    iget-object v3, v3, Lcom/facebook/imagepipeline/b/m;->Vl:Landroid/content/ContentResolver;
-
-    invoke-direct {v4, v5, v6, v3}, Lcom/facebook/imagepipeline/i/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/n;->Vd:Lcom/facebook/imagepipeline/b/m;
-
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/m;->iW()Lcom/facebook/imagepipeline/i/y;
-
-    move-result-object v3
-
-    aput-object v3, v0, v2
-
-    invoke-direct {p0, v1, v0}, Lcom/facebook/imagepipeline/b/n;->a(Lcom/facebook/imagepipeline/i/aj;[Lcom/facebook/imagepipeline/i/av;)Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0, v2}, Lcom/facebook/imagepipeline/b/n;->o(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vs:Lcom/facebook/imagepipeline/i/aj;
+    invoke-static {v0}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/a;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
+
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/n;->UD:Z
+
+    if-eqz v2, :cond_0
+
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/b/n;->Uq:Z
+
+    if-nez v2, :cond_0
+
+    const/4 v2, 0x1
+
+    goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vs:Lcom/facebook/imagepipeline/i/aj;
+    const/4 v2, 0x0
+
+    :goto_0
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
+
+    invoke-virtual {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/i/aj;ZLcom/facebook/imagepipeline/k/d;)Lcom/facebook/imagepipeline/i/ao;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
+
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+
+    :cond_1
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vy:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -685,7 +481,7 @@
 .end method
 
 .method private declared-synchronized jc()Lcom/facebook/imagepipeline/i/aj;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -699,34 +495,32 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vw:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vz:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/an;
+    new-instance v1, Lcom/facebook/imagepipeline/i/aa;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vl:Landroid/content/ContentResolver;
-
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/an;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
+    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/i/aa;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
     invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vw:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vz:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vw:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vz:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -743,7 +537,7 @@
 .end method
 
 .method private declared-synchronized jd()Lcom/facebook/imagepipeline/i/aj;
-    .locals 4
+    .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -757,34 +551,32 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vt:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VA:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/ab;
+    new-instance v1, Lcom/facebook/imagepipeline/i/ac;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->mResources:Landroid/content/res/Resources;
+    invoke-direct {v1, v2, v0}, Lcom/facebook/imagepipeline/i/ac;-><init>(Ljava/util/concurrent/Executor;Landroid/content/ContentResolver;)V
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/ab;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/Resources;)V
-
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->q(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vt:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VA:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vt:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VA:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -801,7 +593,7 @@
 .end method
 
 .method private declared-synchronized je()Lcom/facebook/imagepipeline/i/aj;
-    .locals 4
+    .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -815,34 +607,68 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VB:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    new-instance v1, Lcom/facebook/imagepipeline/i/v;
+    new-instance v1, Lcom/facebook/imagepipeline/i/w;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iC()Ljava/util/concurrent/Executor;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vm:Landroid/content/res/AssetManager;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
 
-    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/v;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/AssetManager;)V
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/w;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
 
-    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lcom/facebook/imagepipeline/i/av;
+
+    const/4 v2, 0x0
+
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+
+    new-instance v4, Lcom/facebook/imagepipeline/i/x;
+
+    iget-object v5, v3, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+
+    move-result-object v5
+
+    iget-object v6, v3, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+
+    iget-object v3, v3, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
+
+    invoke-direct {v4, v5, v6, v3}, Lcom/facebook/imagepipeline/i/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/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/b/m;->iZ()Lcom/facebook/imagepipeline/i/y;
+
+    move-result-object v3
+
+    aput-object v3, v0, v2
+
+    invoke-direct {p0, v1, v0}, Lcom/facebook/imagepipeline/b/n;->a(Lcom/facebook/imagepipeline/i/aj;[Lcom/facebook/imagepipeline/i/av;)Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VB:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VB:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -873,32 +699,206 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vv:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VF:Lcom/facebook/imagepipeline/i/aj;
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+
+    new-instance v1, Lcom/facebook/imagepipeline/i/an;
+
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+
+    move-result-object v2
+
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vu:Landroid/content/ContentResolver;
+
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/an;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/ContentResolver;)V
+
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VF:Lcom/facebook/imagepipeline/i/aj;
+
+    :cond_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VF:Lcom/facebook/imagepipeline/i/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 jg()Lcom/facebook/imagepipeline/i/aj;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/imagepipeline/i/aj<",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VC:Lcom/facebook/imagepipeline/i/aj;
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+
+    new-instance v1, Lcom/facebook/imagepipeline/i/ab;
+
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+
+    move-result-object v2
+
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->mResources:Landroid/content/res/Resources;
+
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/ab;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/Resources;)V
+
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VC:Lcom/facebook/imagepipeline/i/aj;
+
+    :cond_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VC:Lcom/facebook/imagepipeline/i/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 jh()Lcom/facebook/imagepipeline/i/aj;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/imagepipeline/i/aj<",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VD:Lcom/facebook/imagepipeline/i/aj;
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
+
+    new-instance v1, Lcom/facebook/imagepipeline/i/v;
+
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
+
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+
+    move-result-object v2
+
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
+
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Vv:Landroid/content/res/AssetManager;
+
+    invoke-direct {v1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/v;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;Landroid/content/res/AssetManager;)V
+
+    invoke-direct {p0, v1}, Lcom/facebook/imagepipeline/b/n;->m(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/aj;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VD:Lcom/facebook/imagepipeline/i/aj;
+
+    :cond_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VD:Lcom/facebook/imagepipeline/i/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 ji()Lcom/facebook/imagepipeline/i/aj;
+    .locals 4
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/facebook/imagepipeline/i/aj<",
+            "Lcom/facebook/common/references/CloseableReference<",
+            "Lcom/facebook/imagepipeline/g/c;",
+            ">;>;"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VE:Lcom/facebook/imagepipeline/i/aj;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/l;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sc:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Sl:Lcom/facebook/common/g/g;
 
     invoke-direct {v1, v0}, Lcom/facebook/imagepipeline/i/l;-><init>(Lcom/facebook/common/g/g;)V
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Ja:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jj:Z
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UQ:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jd:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/b/m;->l(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/ax;
 
@@ -909,11 +909,11 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     const/4 v2, 0x1
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/b/n;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/i/aj;ZLcom/facebook/imagepipeline/k/d;)Lcom/facebook/imagepipeline/i/ao;
 
@@ -923,10 +923,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vv:Lcom/facebook/imagepipeline/i/aj;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VE:Lcom/facebook/imagepipeline/i/aj;
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vv:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VE:Lcom/facebook/imagepipeline/i/aj;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -961,9 +961,9 @@
 
     new-array v0, v0, [Lcom/facebook/imagepipeline/i/av;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/m;->iW()Lcom/facebook/imagepipeline/i/y;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/b/m;->iZ()Lcom/facebook/imagepipeline/i/y;
 
     move-result-object v1
 
@@ -993,9 +993,9 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->e(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/m;
 
@@ -1005,7 +1005,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 .end method
@@ -1024,27 +1024,27 @@
         }
     .end annotation
 
-    sget-boolean v0, Lcom/facebook/common/k/c;->Ja:Z
+    sget-boolean v0, Lcom/facebook/common/k/c;->Jj:Z
 
     if-eqz v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UG:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UQ:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/facebook/common/k/c;->Jd:Lcom/facebook/common/k/b;
+    sget-object v0, Lcom/facebook/common/k/c;->Jm:Lcom/facebook/common/k/b;
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->l(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/ax;
 
     move-result-object p1
 
     :cond_1
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->Uy:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->UH:Z
 
     if-eqz v0, :cond_2
 
@@ -1053,13 +1053,13 @@
     move-result-object p1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->j(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/r;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->i(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/q;
 
@@ -1082,19 +1082,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->US:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/b/n;->Vb:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->h(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/ag;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->g(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/p;
 
@@ -1103,20 +1103,20 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->g(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/p;
 
     move-result-object p1
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->f(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/o;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 .end method
@@ -1137,25 +1137,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->d(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/h;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->c(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/g;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Ui:Lcom/facebook/imagepipeline/i/as;
 
     invoke-static {p1, v0}, Lcom/facebook/imagepipeline/b/m;->a(Lcom/facebook/imagepipeline/i/aj;Lcom/facebook/imagepipeline/i/as;)Lcom/facebook/imagepipeline/i/ar;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/b/m;->b(Lcom/facebook/imagepipeline/i/aj;)Lcom/facebook/imagepipeline/i/f;
 
@@ -1181,17 +1181,17 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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;->ZX:I
+    iget p1, p1, Lcom/facebook/imagepipeline/request/b;->aag:I
 
     if-eqz p1, :cond_2
 
@@ -1249,55 +1249,55 @@
     throw p1
 
     :pswitch_0
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jc()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jf()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :pswitch_1
     :try_start_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jf()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->ji()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :pswitch_2
     :try_start_2
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jd()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jg()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :pswitch_3
     :try_start_3
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->je()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jh()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :pswitch_4
     :try_start_4
-    iget-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vl:Landroid/content/ContentResolver;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/b/n;->Vu:Landroid/content/ContentResolver;
 
     invoke-virtual {p1, v0}, Landroid/content/ContentResolver;->getType(Landroid/net/Uri;)Ljava/lang/String;
 
@@ -1309,68 +1309,68 @@
 
     if-eqz p1, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->ja()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jd()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :cond_1
     :try_start_5
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jb()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->je()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :pswitch_5
     :try_start_6
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->iZ()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jc()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :pswitch_6
     :try_start_7
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->ja()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->jd()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :cond_2
     :try_start_8
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->iX()Lcom/facebook/imagepipeline/i/aj;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/b/n;->ja()Lcom/facebook/imagepipeline/i/aj;
 
     move-result-object p1
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-object p1
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 
@@ -1407,7 +1407,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VG: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/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/ai;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->PE:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/b/m;->PN:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Qp:Lcom/facebook/imagepipeline/b/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Qy:Lcom/facebook/imagepipeline/b/f;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iF()Ljava/util/concurrent/Executor;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/b/f;->iI()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
     invoke-direct {v1, p1, v2, v0}, Lcom/facebook/imagepipeline/i/ai;-><init>(Lcom/facebook/imagepipeline/i/aj;Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;Ljava/util/concurrent/Executor;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v2, Lcom/facebook/imagepipeline/i/ah;
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->TU:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/b/m;->Ud:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/b/m;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     invoke-direct {v2, v3, v0, v1}, Lcom/facebook/imagepipeline/i/ah;-><init>(Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/imagepipeline/cache/f;Lcom/facebook/imagepipeline/i/aj;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vx:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VG: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/n;->Vx:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VG: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/n;->Vz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VI: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/n;->Vd:Lcom/facebook/imagepipeline/b/m;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vm:Lcom/facebook/imagepipeline/b/m;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/i;
 
-    iget v2, v0, Lcom/facebook/imagepipeline/b/m;->UM:I
+    iget v2, v0, Lcom/facebook/imagepipeline/b/m;->UW:I
 
-    iget v3, v0, Lcom/facebook/imagepipeline/b/m;->UN:I
+    iget v3, v0, Lcom/facebook/imagepipeline/b/m;->UX:I
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/m;->UO:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/b/m;->UY:Z
 
     invoke-direct {v1, p1, v2, v3, v0}, Lcom/facebook/imagepipeline/i/i;-><init>(Lcom/facebook/imagepipeline/i/aj;IIZ)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->Vz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/b/n;->VI: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/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali
index eb1aa9828a..2963e599b8 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/a.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final RY:Lcom/facebook/imagepipeline/memory/d;
+.field private final Sh:Lcom/facebook/imagepipeline/memory/d;
 
-.field private final RZ:Lcom/facebook/imagepipeline/b/a;
+.field private final Si:Lcom/facebook/imagepipeline/b/a;
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Si:Lcom/facebook/imagepipeline/b/a;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/memory/d;->get(I)Ljava/lang/Object;
 
@@ -75,9 +75,9 @@
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/graphics/Bitmap;->reconfigure(IILandroid/graphics/Bitmap$Config;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Si:Lcom/facebook/imagepipeline/b/a;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/a;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     invoke-virtual {p1, v0, p2}, Lcom/facebook/imagepipeline/b/a;->b(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 0a38602e5d..024818533f 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 Sa:[B
+.field private static final Sj:[B
 
-.field private static final Sb:[B
+.field private static final Sk:[B
 
 
 # instance fields
-.field private final Sc:Lcom/facebook/common/g/g;
+.field private final Sl: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;->Sa:[B
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->Sj:[B
 
     const/16 v0, 0x1cf
 
@@ -31,7 +31,7 @@
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->Sb:[B
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/b;->Sk:[B
 
     return-void
 
@@ -590,7 +590,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->Sc:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->Sl: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;->Sc:Lcom/facebook/common/g/g;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/bitmaps/b;->Sl:Lcom/facebook/common/g/g;
 
-    sget-object v2, Lcom/facebook/imagepipeline/bitmaps/b;->Sa:[B
+    sget-object v2, Lcom/facebook/imagepipeline/bitmaps/b;->Sj:[B
 
     array-length v2, v2
 
-    sget-object v3, Lcom/facebook/imagepipeline/bitmaps/b;->Sb:[B
+    sget-object v3, Lcom/facebook/imagepipeline/bitmaps/b;->Sk:[B
 
     array-length v3, v3
 
@@ -629,7 +629,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->Sa:[B
+    sget-object v1, Lcom/facebook/imagepipeline/bitmaps/b;->Sj:[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;->Sb:[B
+    sget-object p1, Lcom/facebook/imagepipeline/bitmaps/b;->Sk:[B
 
     invoke-virtual {v0, p1}, Lcom/facebook/common/g/i;->write([B)V
 
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gn()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gq()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 be3076e729..b1cfbf864b 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;->il()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->io()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 95b712b906..9fcee80edc 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 Sd:Lcom/facebook/imagepipeline/bitmaps/b;
+.field private final Sm:Lcom/facebook/imagepipeline/bitmaps/b;
 
-.field private final Se:Lcom/facebook/imagepipeline/memory/o;
+.field private final Sn:Lcom/facebook/imagepipeline/memory/o;
 
 
 # direct methods
@@ -18,11 +18,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ad;->jP()Lcom/facebook/imagepipeline/memory/o;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/memory/ad;->jS()Lcom/facebook/imagepipeline/memory/o;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     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;->Sd:Lcom/facebook/imagepipeline/bitmaps/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sm: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;->Sd:Lcom/facebook/imagepipeline/bitmaps/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sm: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/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
-    iget v1, v0, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iget v1, v0, Lcom/facebook/imagepipeline/g/e;->Wg: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;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/bitmaps/d;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     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 379e1f7643..f5e93aec35 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/bitmaps/e.smali
@@ -8,13 +8,13 @@
 
 
 # instance fields
-.field private final RZ:Lcom/facebook/imagepipeline/b/a;
+.field private final Si:Lcom/facebook/imagepipeline/b/a;
 
-.field private final Sd:Lcom/facebook/imagepipeline/bitmaps/b;
+.field private final Sm:Lcom/facebook/imagepipeline/bitmaps/b;
 
-.field private final Sf:Lcom/facebook/imagepipeline/platform/f;
+.field private final So:Lcom/facebook/imagepipeline/platform/f;
 
-.field private Sg:Z
+.field private Sp:Z
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sd:Lcom/facebook/imagepipeline/bitmaps/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sm:Lcom/facebook/imagepipeline/bitmaps/b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sf:Lcom/facebook/imagepipeline/platform/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->So:Lcom/facebook/imagepipeline/platform/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/bitmaps/e;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Si:Lcom/facebook/imagepipeline/b/a;
 
     return-void
 .end method
@@ -59,13 +59,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Si:Lcom/facebook/imagepipeline/b/a;
 
     invoke-static {p1, p2, p3}, Landroid/graphics/Bitmap;->createBitmap(IILandroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->il()Lcom/facebook/imagepipeline/bitmaps/g;
+    invoke-static {}, Lcom/facebook/imagepipeline/bitmaps/g;->io()Lcom/facebook/imagepipeline/bitmaps/g;
 
     move-result-object p2
 
@@ -91,7 +91,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sg:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sp:Z
 
     if-eqz v0, :cond_0
 
@@ -102,7 +102,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sd:Lcom/facebook/imagepipeline/bitmaps/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sm:Lcom/facebook/imagepipeline/bitmaps/b;
 
     int-to-short v1, p1
 
@@ -117,14 +117,14 @@
 
     invoke-direct {v1, v0}, Lcom/facebook/imagepipeline/g/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
 
-    sget-object v2, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/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;->Sf:Lcom/facebook/imagepipeline/platform/f;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/bitmaps/e;->So:Lcom/facebook/imagepipeline/platform/f;
 
     invoke-virtual {v0}, Lcom/facebook/common/references/CloseableReference;->get()Ljava/lang/Object;
 
@@ -156,7 +156,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;->Sg:Z
+    iput-boolean v4, p0, Lcom/facebook/imagepipeline/bitmaps/e;->Sp: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 10a7cc682f..4e0457b7cb 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/ad;->jN()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()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 9f46a2ef74..6d85205d28 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 Sh:Lcom/facebook/imagepipeline/bitmaps/g;
+.field private static Sq:Lcom/facebook/imagepipeline/bitmaps/g;
 
 
 # direct methods
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static il()Lcom/facebook/imagepipeline/bitmaps/g;
+.method public static io()Lcom/facebook/imagepipeline/bitmaps/g;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sh:Lcom/facebook/imagepipeline/bitmaps/g;
+    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sq: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;->Sh:Lcom/facebook/imagepipeline/bitmaps/g;
+    sput-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sq:Lcom/facebook/imagepipeline/bitmaps/g;
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sh:Lcom/facebook/imagepipeline/bitmaps/g;
+    sget-object v0, Lcom/facebook/imagepipeline/bitmaps/g;->Sq: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 ef26f2c162..b96ab97598 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/cache/MemoryCacheParams.smali
@@ -4,17 +4,17 @@
 
 
 # instance fields
-.field public final SX:I
+.field public final Tg:I
 
-.field public final SY:I
+.field public final Th:I
 
-.field public final SZ:I
+.field public final Ti:I
 
-.field public final Ta:I
+.field public final Tj:I
 
-.field public final Tb:I
+.field public final Tk:I
 
-.field public final Tc:J
+.field public final Tl:J
 
 
 # direct methods
@@ -51,17 +51,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SX:I
+    iput p1, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tg:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SY:I
+    iput p2, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Th:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->SZ:I
+    iput p3, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ti:I
 
-    iput p4, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Ta:I
+    iput p4, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tj:I
 
-    iput p5, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tb:I
+    iput p5, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tk:I
 
-    iput-wide p6, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tc:J
+    iput-wide p6, p0, Lcom/facebook/imagepipeline/cache/MemoryCacheParams;->Tl:J
 
     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 b6d0bd2d86..7f88df6593 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/g/c;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->fF()I
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/c;->fI()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 85f4d3c588..6d87f2616d 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 Si:Lcom/facebook/imagepipeline/cache/m;
+.field final synthetic Sr: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;->Si:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/b$1;->Sr: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 18f3fc222a..27e31caf94 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 SA:Lcom/facebook/imagepipeline/g/e;
+.field final synthetic SH:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Sy:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic SI:Lcom/facebook/imagepipeline/cache/e;
 
-.field final synthetic Sz:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SJ:Lcom/facebook/imagepipeline/g/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SI:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$2;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SH:Lcom/facebook/cache/common/CacheKey;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SA:Lcom/facebook/imagepipeline/g/e;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,58 +46,58 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SI:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SH:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SA:Lcom/facebook/imagepipeline/g/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/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/g/e;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SI: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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SH:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SA:Lcom/facebook/imagepipeline/g/e;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {v0, v1, v2}, Lcom/facebook/imagepipeline/cache/s;->b(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SA:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SI: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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/cache/e$2;->SH:Lcom/facebook/cache/common/CacheKey;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SA:Lcom/facebook/imagepipeline/g/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {v1, v2, v3}, Lcom/facebook/imagepipeline/cache/s;->b(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)Z
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SA:Lcom/facebook/imagepipeline/g/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$2;->SJ:Lcom/facebook/imagepipeline/g/e;
 
     invoke-static {v1}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
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 bb48902a08..2efae2e044 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 Sy:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic SH:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Sz:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SI: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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$3;->SI:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$3;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$3;->SH:Lcom/facebook/cache/common/CacheKey;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -54,31 +54,31 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->SI: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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->SH: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;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$3;->SI: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;->Sy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$3;->SH:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v0, v1}, Lcom/facebook/cache/disk/h;->e(Lcom/facebook/cache/common/CacheKey;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     const/4 v0, 0x0
 
@@ -87,7 +87,7 @@
     :catchall_0
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
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 0f39668f18..906d16b6d8 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 SB:Lcom/facebook/imagepipeline/g/e;
+.field final synthetic SI:Lcom/facebook/imagepipeline/cache/e;
 
-.field final synthetic Sz:Lcom/facebook/imagepipeline/cache/e;
+.field final synthetic SK:Lcom/facebook/imagepipeline/g/e;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/cache/e;Lcom/facebook/imagepipeline/g/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$4;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/e$4;->SI:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$4;->SB:Lcom/facebook/imagepipeline/g/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/e$4;->SK:Lcom/facebook/imagepipeline/g/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,13 +46,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$4;->Sz:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/e$4;->SI: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;->SB:Lcom/facebook/imagepipeline/g/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/cache/e$4;->SK:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->getInputStream()Ljava/io/InputStream;
 
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 6bd3e1439a..addee4cc29 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 SM:Lcom/facebook/imagepipeline/cache/t;
+.field final synthetic SW:Lcom/facebook/imagepipeline/cache/t;
 
-.field final synthetic SN:Lcom/facebook/imagepipeline/cache/h;
+.field final synthetic SX: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;->SN:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$1;->SX:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$1;->SM:Lcom/facebook/imagepipeline/cache/t;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$1;->SW: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;->SM:Lcom/facebook/imagepipeline/cache/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$1;->SW:Lcom/facebook/imagepipeline/cache/t;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SQ:Lcom/facebook/common/references/CloseableReference;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/cache/h$b;->SZ: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 81a287a450..49a40dc0a7 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 SN:Lcom/facebook/imagepipeline/cache/h;
+.field final synthetic SX:Lcom/facebook/imagepipeline/cache/h;
 
-.field final synthetic SO:Lcom/facebook/imagepipeline/cache/h$b;
+.field final synthetic SY: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;->SN:Lcom/facebook/imagepipeline/cache/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->SX:Lcom/facebook/imagepipeline/cache/h;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$2;->SO:Lcom/facebook/imagepipeline/cache/h$b;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/h$2;->SY: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;->SN:Lcom/facebook/imagepipeline/cache/h;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/cache/h$2;->SX:Lcom/facebook/imagepipeline/cache/h;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$2;->SO:Lcom/facebook/imagepipeline/cache/h$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/h$2;->SY: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 16c84f92b8..9f6d669423 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 SU:Lcom/facebook/imagepipeline/cache/i;
+.field private static Td:Lcom/facebook/imagepipeline/cache/i;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized is()Lcom/facebook/imagepipeline/cache/i;
+.method public static declared-synchronized iv()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;->SU:Lcom/facebook/imagepipeline/cache/i;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->Td: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;->SU:Lcom/facebook/imagepipeline/cache/i;
+    sput-object v1, Lcom/facebook/imagepipeline/cache/i;->Td:Lcom/facebook/imagepipeline/cache/i;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->SU:Lcom/facebook/imagepipeline/cache/i;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/i;->Td: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;->ZW:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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;->ZW:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v3, p1, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v3, p1, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->Sv: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;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/request/b;->Zz: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;->ZW:Landroid/net/Uri;
+    iget-object v1, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget-object v5, p1, Lcom/facebook/imagepipeline/request/b;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v5, p1, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v6, p1, Lcom/facebook/imagepipeline/request/b;->Sm:Lcom/facebook/imagepipeline/a/b;
+    iget-object v6, p1, Lcom/facebook/imagepipeline/request/b;->Sv: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 14f3ffd8c7..ee0daf46ad 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 Si:Lcom/facebook/imagepipeline/cache/m;
+.field final synthetic Sr: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;->Si:Lcom/facebook/imagepipeline/cache/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/l$1;->Sr: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 c612ad1205..ba32c50806 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 SV:Lcom/facebook/imagepipeline/cache/o;
+.field private final Te: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 SW:Lcom/facebook/imagepipeline/cache/p;
+.field private final Tf: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;->SV:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/cache/n;->Te:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/n;->SW:Lcom/facebook/imagepipeline/cache/p;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/cache/n;->Tf:Lcom/facebook/imagepipeline/cache/p;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->SV:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Te:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/cache/o;->D(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->SV:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Te: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;->SV:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/cache/n;->Te: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 cf543fad44..dd0755bac7 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 Td:Lcom/facebook/imagepipeline/cache/r;
+.field private static Tm:Lcom/facebook/imagepipeline/cache/r;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized it()Lcom/facebook/imagepipeline/cache/r;
+.method public static declared-synchronized iw()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;->Td:Lcom/facebook/imagepipeline/cache/r;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->Tm: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;->Td:Lcom/facebook/imagepipeline/cache/r;
+    sput-object v1, Lcom/facebook/imagepipeline/cache/r;->Tm:Lcom/facebook/imagepipeline/cache/r;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->Td:Lcom/facebook/imagepipeline/cache/r;
+    sget-object v1, Lcom/facebook/imagepipeline/cache/r;->Tm: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/e/b$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/e/b$1.smali
index 19474dc5df..8e189030a6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/e/b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/e/b$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic VG:Lcom/facebook/imagepipeline/e/b;
+.field final synthetic VP:Lcom/facebook/imagepipeline/e/b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/e/b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b$1;->VG:Lcom/facebook/imagepipeline/e/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,15 +37,15 @@
 .method public final a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
     .locals 3
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VG:Lcom/facebook/imagepipeline/e/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/e/b;->b(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/d;
 
@@ -54,11 +54,11 @@
     return-object p1
 
     :cond_0
-    sget-object v1, Lcom/facebook/e/b;->QR:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->Ra:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VG:Lcom/facebook/imagepipeline/e/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getWidth()I
 
@@ -74,15 +74,15 @@
 
     if-eq v1, v2, :cond_2
 
-    iget-boolean v1, p4, Lcom/facebook/imagepipeline/a/b;->Tm:Z
+    iget-boolean v1, p4, Lcom/facebook/imagepipeline/a/b;->Tv:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/e/b;->VC:Lcom/facebook/imagepipeline/e/c;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/e/b;->VL:Lcom/facebook/imagepipeline/e/c;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VC:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VL:Lcom/facebook/imagepipeline/e/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/e/c;->a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
 
@@ -107,13 +107,13 @@
     throw p2
 
     :cond_3
-    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VG:Lcom/facebook/imagepipeline/e/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VD:Lcom/facebook/imagepipeline/e/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/e/b;->VM:Lcom/facebook/imagepipeline/e/c;
 
     invoke-interface {v0, p1, p2, p3, p4}, Lcom/facebook/imagepipeline/e/c;->a(Lcom/facebook/imagepipeline/g/e;ILcom/facebook/imagepipeline/g/h;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/c;
 
@@ -122,11 +122,11 @@
     return-object p1
 
     :cond_4
-    sget-object p2, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object p2, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-eq v0, p2, :cond_5
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/e/b$1;->VG:Lcom/facebook/imagepipeline/e/b;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/e/b$1;->VP:Lcom/facebook/imagepipeline/e/b;
 
     invoke-virtual {p2, p1, p4}, Lcom/facebook/imagepipeline/e/b;->a(Lcom/facebook/imagepipeline/g/e;Lcom/facebook/imagepipeline/a/b;)Lcom/facebook/imagepipeline/g/d;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/e/d.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/e/d.smali
index 560ff70824..3f73e3003b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/e/d.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/e/d.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final VH:Ljava/util/Map;
+.field public final VQ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field public final VI:Ljava/util/List;
+.field public final VR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/e/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/e/f.smali
index e542205d0d..5bef2546b7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/e/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/e/f.smali
@@ -4,21 +4,21 @@
 
 
 # instance fields
-.field private final Ip:Lcom/facebook/common/g/a;
+.field private final Iy:Lcom/facebook/common/g/a;
 
-.field private VJ:I
+.field private VS:I
 
-.field private VK:I
+.field private VT:I
 
-.field private VL:I
+.field private VU:I
 
-.field private VM:I
+.field private VV:I
 
-.field public VN:I
+.field public VW:I
 
-.field public VO:I
+.field public VX:I
 
-.field public VP:Z
+.field public VY:Z
 
 
 # direct methods
@@ -33,21 +33,21 @@
 
     check-cast p1, Lcom/facebook/common/g/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/e/f;->Ip:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/f;->Iy:Lcom/facebook/common/g/a;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VK:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VT:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VM:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VX:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VN:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     return-void
 .end method
@@ -55,20 +55,20 @@
 .method private ae(I)V
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VM:I
+    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
 
     if-lez v0, :cond_0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VO:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VX:I
 
     :cond_0
-    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VM:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
 
     add-int/lit8 v0, p1, 0x1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/e/f;->VM:I
+    iput v0, p0, Lcom/facebook/imagepipeline/e/f;->VV:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VN:I
+    iput p1, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
 
     return-void
 .end method
@@ -76,7 +76,7 @@
 .method private e(Ljava/io/InputStream;)Z
     .locals 11
 
-    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VN:I
+    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
 
     :goto_0
     const/4 v1, 0x0
@@ -86,7 +86,7 @@
     const/4 v3, 0x1
 
     :try_start_0
-    iget v4, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iget v4, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     if-eq v4, v2, :cond_11
 
@@ -98,24 +98,24 @@
 
     if-eq v4, v5, :cond_11
 
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
     add-int/2addr v5, v3
 
-    iput v5, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iput v5, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/e/f;->VP:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/e/f;->VY:Z
 
     if-eqz v5, :cond_0
 
-    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
-    iput-boolean v1, p0, Lcom/facebook/imagepipeline/e/f;->VP:Z
+    iput-boolean v1, p0, Lcom/facebook/imagepipeline/e/f;->VY:Z
 
     return v1
 
     :cond_0
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     const/16 v6, 0xff
 
@@ -146,7 +146,7 @@
     goto/16 :goto_2
 
     :cond_1
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VK:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VT: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/e/f;->VL:I
+    iget v6, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
     add-int/2addr v6, v5
 
-    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_2
-    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v6, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_3
     if-ne v4, v6, :cond_4
 
-    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_4
     if-nez v4, :cond_5
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
@@ -192,15 +192,15 @@
 
     if-ne v4, v5, :cond_6
 
-    iput-boolean v3, p0, Lcom/facebook/imagepipeline/e/f;->VP:Z
+    iput-boolean v3, p0, Lcom/facebook/imagepipeline/e/f;->VY:Z
 
-    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iget v5, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
     sub-int/2addr v5, v8
 
     invoke-direct {p0, v5}, Lcom/facebook/imagepipeline/e/f;->ae(I)V
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
@@ -209,7 +209,7 @@
 
     if-ne v4, v6, :cond_7
 
-    iget v6, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iget v6, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
     sub-int/2addr v6, v8
 
@@ -241,47 +241,47 @@
     :goto_1
     if-eqz v5, :cond_a
 
-    iput v10, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v10, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_a
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_b
     if-ne v4, v6, :cond_10
 
-    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v9, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_c
     if-ne v4, v7, :cond_d
 
-    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v8, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_d
-    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_e
     if-ne v4, v6, :cond_f
 
-    iput v3, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v3, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     goto :goto_2
 
     :cond_f
-    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iput v2, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     :cond_10
     :goto_2
-    iput v4, p0, Lcom/facebook/imagepipeline/e/f;->VK:I
+    iput v4, p0, Lcom/facebook/imagepipeline/e/f;->VT: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/n;->d(Ljava/lang/Throwable;)Ljava/lang/RuntimeException;
 
     :cond_11
-    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     if-eq p1, v2, :cond_12
 
-    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VN:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VW:I
 
     if-eq p1, v0, :cond_12
 
@@ -312,7 +312,7 @@
 .method public final a(Lcom/facebook/imagepipeline/g/e;)Z
     .locals 4
 
-    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VJ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/e/f;->VS:I
 
     const/4 v1, 0x0
 
@@ -327,7 +327,7 @@
 
     move-result v0
 
-    iget v2, p0, Lcom/facebook/imagepipeline/e/f;->VL:I
+    iget v2, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
     if-gt v0, v2, :cond_1
 
@@ -340,7 +340,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/e/f;->Ip:Lcom/facebook/common/g/a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/e/f;->Iy:Lcom/facebook/common/g/a;
 
     const/16 v3, 0x4000
 
@@ -350,12 +350,12 @@
 
     check-cast v2, [B
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/e/f;->Ip:Lcom/facebook/common/g/a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/e/f;->Iy: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/e/f;->VL:I
+    iget p1, p0, Lcom/facebook/imagepipeline/e/f;->VU:I
 
     int-to-long v2, p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$a.smali
index 8db7de335c..1df6953c32 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$a.smali
@@ -36,7 +36,7 @@
 
 
 # virtual methods
-.method public final jh()Ljava/util/List;
+.method public final jk()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$b.smali
index 4759e9f0e0..a4fe34a5ca 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/e/g$b.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract jh()Ljava/util/List;
+.method public abstract jk()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/e/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/e/g.smali
index 65f8ec980c..c386acbe7b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/e/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/e/g.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private final VQ:Lcom/facebook/imagepipeline/e/g$b;
+.field private final VZ:Lcom/facebook/imagepipeline/e/g$b;
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/e/g$b;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/e/g;->VQ:Lcom/facebook/imagepipeline/e/g$b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/e/g;->VZ:Lcom/facebook/imagepipeline/e/g$b;
 
     return-void
 .end method
@@ -55,9 +55,9 @@
 .method public final ac(I)I
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/e/g;->VQ:Lcom/facebook/imagepipeline/e/g$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/e/g;->VZ:Lcom/facebook/imagepipeline/e/g$b;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/e/g$b;->jh()Ljava/util/List;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/e/g$b;->jk()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/g/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/g/a.smali
index 8050ea20ec..c46a9f4db5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/g/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/g/a.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private VR:Lcom/facebook/imagepipeline/animated/a/e;
+.field private Wa:Lcom/facebook/imagepipeline/animated/a/e;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/g/c;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/g/a;->Wa: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/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa: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/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/facebook/imagepipeline/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iput-object v1, p0, Lcom/facebook/imagepipeline/g/a;->Wa: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 fF()I
+.method public final declared-synchronized fI()I
     .locals 1
 
     monitor-enter p0
@@ -82,11 +82,11 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fF()I
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->fI()I
 
     move-result v0
     :try_end_1
@@ -126,9 +126,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->RB: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/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->Rs:Lcom/facebook/imagepipeline/animated/a/c;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/animated/a/e;->RB:Lcom/facebook/imagepipeline/animated/a/c;
 
     invoke-interface {v0}, Lcom/facebook/imagepipeline/animated/a/c;->getWidth()I
 
@@ -198,7 +198,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -238,13 +238,13 @@
     return v0
 .end method
 
-.method public final declared-synchronized ji()Lcom/facebook/imagepipeline/animated/a/e;
+.method public final declared-synchronized jl()Lcom/facebook/imagepipeline/animated/a/e;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->VR:Lcom/facebook/imagepipeline/animated/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/g/a;->Wa:Lcom/facebook/imagepipeline/animated/a/e;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/g/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/g/g.smali
index 6ce27e6d17..88809cffc7 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/g/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/g/g.smali
@@ -7,15 +7,15 @@
 
 
 # static fields
-.field public static final Wa:Lcom/facebook/imagepipeline/g/h;
+.field public static final Wj:Lcom/facebook/imagepipeline/g/h;
 
 
 # instance fields
-.field Wb:I
+.field Wk:I
 
-.field Wc:Z
+.field Wl:Z
 
-.field Wd:Z
+.field Wm:Z
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/g/g;->Wa:Lcom/facebook/imagepipeline/g/h;
+    sput-object v0, Lcom/facebook/imagepipeline/g/g;->Wj:Lcom/facebook/imagepipeline/g/h;
 
     return-void
 .end method
@@ -40,11 +40,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/g/g;->Wb:I
+    iput p1, p0, Lcom/facebook/imagepipeline/g/g;->Wk:I
 
-    iput-boolean p2, p0, Lcom/facebook/imagepipeline/g/g;->Wc:Z
+    iput-boolean p2, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/g/g;->Wd:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
 
     return-void
 .end method
@@ -82,21 +82,21 @@
     :cond_1
     check-cast p1, Lcom/facebook/imagepipeline/g/g;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/g/g;->Wb:I
+    iget v1, p0, Lcom/facebook/imagepipeline/g/g;->Wk:I
 
-    iget v3, p1, Lcom/facebook/imagepipeline/g/g;->Wb:I
+    iget v3, p1, Lcom/facebook/imagepipeline/g/g;->Wk:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wc:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
 
-    iget-boolean v3, p1, Lcom/facebook/imagepipeline/g/g;->Wc:Z
+    iget-boolean v3, p1, Lcom/facebook/imagepipeline/g/g;->Wl:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wd:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/g/g;->Wd:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/g/g;->Wm:Z
 
     if-ne v1, p1, :cond_2
 
@@ -109,9 +109,9 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wb:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wk:I
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wc:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
 
     const/4 v2, 0x0
 
@@ -127,7 +127,7 @@
     :goto_0
     xor-int/2addr v0, v1
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wd:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
 
     if-eqz v1, :cond_1
 
@@ -139,26 +139,26 @@
     return v0
 .end method
 
-.method public final jx()I
+.method public final jA()I
     .locals 1
 
-    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wb:I
+    iget v0, p0, Lcom/facebook/imagepipeline/g/g;->Wk:I
 
     return v0
 .end method
 
-.method public final jy()Z
+.method public final jB()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wc:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wl:Z
 
     return v0
 .end method
 
-.method public final jz()Z
+.method public final jC()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wd:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/g/g;->Wm:Z
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/g/h.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/g/h.smali
index 1d1d440cea..33d736a1f9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/g/h.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/g/h.smali
@@ -4,11 +4,11 @@
 
 
 # virtual methods
-.method public abstract jx()I
+.method public abstract jA()I
 .end method
 
-.method public abstract jy()Z
+.method public abstract jB()Z
 .end method
 
-.method public abstract jz()Z
+.method public abstract jC()Z
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/a$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/a$a.smali
index 562c7184ed..8c3213c56f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/a$a.smali
@@ -57,7 +57,7 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/4 v0, 0x0
 
@@ -72,10 +72,10 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->ju()V
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jx()V
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/a.smali
index 08b007ff38..4560b4c4d6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/a.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/a;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/a;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/a;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/a;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/a$a;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/aa.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/aa.smali
index 81f9aac2e0..df23a8a798 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/aa.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/aa.smali
@@ -24,7 +24,7 @@
 
     new-instance v0, Ljava/io/FileInputStream;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kD()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kG()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;->kD()Ljava/io/File;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/request/b;->kG()Ljava/io/File;
 
     move-result-object p1
 
@@ -51,7 +51,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalFileFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ab.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ab.smali
index 7395caaf89..25528b6ada 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ab.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ab.smali
@@ -86,7 +86,7 @@
 .method private static f(Lcom/facebook/imagepipeline/request/b;)I
     .locals 1
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-virtual {p0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -136,7 +136,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalResourceFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ac$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ac$2.smali
index d78259ea47..19f5bc6326 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ac$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ac$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic YU:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic Zd:Lcom/facebook/imagepipeline/i/aq;
 
-.field final synthetic YW:Lcom/facebook/imagepipeline/i/ac;
+.field final synthetic Zf:Lcom/facebook/imagepipeline/i/ac;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ac;Lcom/facebook/imagepipeline/i/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac$2;->YW:Lcom/facebook/imagepipeline/i/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ac$2;->Zf:Lcom/facebook/imagepipeline/i/ac;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac$2;->YU:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ac$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$2;->YU:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ac$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aq;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$1.smali
index 13409a2763..4129680684 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Zf:Landroid/util/Pair;
+.field final synthetic Zo:Landroid/util/Pair;
 
-.field final synthetic Zg:Lcom/facebook/imagepipeline/i/ad$a;
+.field final synthetic Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ad$a;Landroid/util/Pair;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zf:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zo:Landroid/util/Pair;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,19 +35,19 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 7
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zf:Landroid/util/Pair;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zo: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/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
     move-object v4, v2
 
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ad$a;->ks()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/i/ad$a;->kz()Ljava/util/List;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v5}, Lcom/facebook/imagepipeline/i/ad$a;->ku()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
 
     move-result-object v5
 
@@ -123,7 +123,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/d;->kd()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/i/d;->kg()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/i/ad$a$1;->Zf:Landroid/util/Pair;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zo:Landroid/util/Pair;
 
     iget-object v0, v0, Landroid/util/Pair;->first:Ljava/lang/Object;
 
     check-cast v0, Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     :cond_3
     return-void
@@ -154,12 +154,12 @@
     throw v1
 .end method
 
-.method public final kf()V
+.method public final ki()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->ks()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kv()Ljava/util/List;
 
     move-result-object v0
 
@@ -168,12 +168,12 @@
     return-void
 .end method
 
-.method public final kg()V
+.method public final kj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->ku()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kx()Ljava/util/List;
 
     move-result-object v0
 
@@ -182,12 +182,12 @@
     return-void
 .end method
 
-.method public final kh()V
+.method public final kk()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$1;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kw()Ljava/util/List;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->kz()Ljava/util/List;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$a.smali
index c1f5a0310e..fc6fac2b7b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad$a$a.smali
@@ -22,14 +22,14 @@
 
 
 # instance fields
-.field final synthetic Zg:Lcom/facebook/imagepipeline/i/ad$a;
+.field final synthetic Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/i/ad$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/b;-><init>()V
 
@@ -52,22 +52,22 @@
     check-cast p1, Ljava/io/Closeable;
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/ad$a;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/facebook/imagepipeline/i/ad$a;->a(Lcom/facebook/imagepipeline/i/ad$a$a;Ljava/io/Closeable;I)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
@@ -76,16 +76,16 @@
     .locals 4
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/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/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/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/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zh: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/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v2}, Ljava/util/concurrent/CopyOnWriteArraySet;->clear()V
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Ze:Lcom/facebook/imagepipeline/i/ad;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zn:Lcom/facebook/imagepipeline/i/ad;
 
     iget-object v3, v0, Lcom/facebook/imagepipeline/i/ad$a;->mKey:Ljava/lang/Object;
 
     invoke-virtual {v2, v3, v0}, Lcom/facebook/imagepipeline/i/ad;->a(Ljava/lang/Object;Lcom/facebook/imagepipeline/i/ad$a;)V
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/i/ad$a;->d(Ljava/io/Closeable;)V
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
     monitor-exit v0
     :try_end_1
@@ -165,7 +165,7 @@
 
     :cond_1
     :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -185,7 +185,7 @@
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     goto :goto_3
 
@@ -196,20 +196,20 @@
     goto :goto_2
 .end method
 
-.method protected final jg()V
+.method protected final jj()V
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/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/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
 
     if-eq v1, p0, :cond_0
 
@@ -220,27 +220,27 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zc:Lcom/facebook/imagepipeline/i/d;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zl:Lcom/facebook/imagepipeline/i/d;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi:Ljava/io/Closeable;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/i/ad$a;->d(Ljava/io/Closeable;)V
 
-    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->YZ:Ljava/io/Closeable;
+    iput-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zi: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/i/ad$a;->kr()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ad$a;->ku()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -260,7 +260,7 @@
     :catchall_1
     move-exception v0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw v0
 .end method
@@ -269,16 +269,16 @@
     .locals 3
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zg:Lcom/facebook/imagepipeline/i/ad$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad$a$a;->Zp:Lcom/facebook/imagepipeline/i/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/i/ad$a;->Zd:Lcom/facebook/imagepipeline/i/ad$a$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zm:Lcom/facebook/imagepipeline/i/ad$a$a;
 
     if-eq v1, p0, :cond_0
 
@@ -287,9 +287,9 @@
     goto :goto_1
 
     :cond_0
-    iput p1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Za:F
+    iput p1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zj:F
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->YY:Ljava/util/concurrent/CopyOnWriteArraySet;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/ad$a;->Zh:Ljava/util/concurrent/CopyOnWriteArraySet;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CopyOnWriteArraySet;->iterator()Ljava/util/Iterator;
 
@@ -342,7 +342,7 @@
 
     :cond_1
     :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -362,7 +362,7 @@
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     goto :goto_3
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad.smali
index 10245bc0d3..46a5b293ef 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ad.smali
@@ -28,7 +28,7 @@
 
 
 # instance fields
-.field final XF:Lcom/facebook/imagepipeline/i/aj;
+.field final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final YX:Ljava/util/Map;
+.field final Zg: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/i/ad;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance p1, Ljava/util/HashMap;
 
     invoke-direct {p1}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad;->YX:Ljava/util/Map;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ad;->Zg:Ljava/util/Map;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, p0, p1}, Lcom/facebook/imagepipeline/i/ad$a;-><init>(Lcom/facebook/imagepipeline/i/ad;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad;->YX:Ljava/util/Map;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ad;->Zg: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/i/ad;->YX:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad;->Zg:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -168,7 +168,7 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-virtual {p0, p2}, Lcom/facebook/imagepipeline/i/ad;->a(Lcom/facebook/imagepipeline/i/ak;)Ljava/lang/Object;
 
@@ -208,12 +208,12 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/ad$a;->kr()V
+    invoke-virtual {v2}, Lcom/facebook/imagepipeline/i/ad$a;->ku()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :cond_2
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -233,7 +233,7 @@
     :catchall_1
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     goto :goto_1
 
@@ -257,7 +257,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad;->YX:Ljava/util/Map;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ad;->Zg: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/i/ad;->YX:Ljava/util/Map;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/ad;->Zg: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/i/ae$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ae$1.smali
index 2ad001fd2a..7a549c2f2c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ae$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ae$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic Zh:Lcom/facebook/imagepipeline/i/s;
+.field final synthetic Zq:Lcom/facebook/imagepipeline/i/s;
 
-.field final synthetic Zi:Lcom/facebook/imagepipeline/i/ae;
+.field final synthetic Zr:Lcom/facebook/imagepipeline/i/ae;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ae;Lcom/facebook/imagepipeline/i/s;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zi:Lcom/facebook/imagepipeline/i/ae;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zr:Lcom/facebook/imagepipeline/i/ae;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zh:Lcom/facebook/imagepipeline/i/s;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,19 +46,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zi:Lcom/facebook/imagepipeline/i/ae;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zr:Lcom/facebook/imagepipeline/i/ae;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zh:Lcom/facebook/imagepipeline/i/s;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
 
-    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ae;->Sc:Lcom/facebook/common/g/g;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/i/ae;->Sl:Lcom/facebook/common/g/g;
 
-    invoke-interface {v2}, Lcom/facebook/common/g/g;->gm()Lcom/facebook/common/g/i;
+    invoke-interface {v2}, Lcom/facebook/common/g/g;->gp()Lcom/facebook/common/g/i;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ae;->Ip:Lcom/facebook/common/g/a;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
 
     const/16 v4, 0x4000
 
@@ -92,15 +92,15 @@
 
     move-result-wide v6
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result v4
 
     if-eqz v4, :cond_1
 
-    iget-wide v8, v1, Lcom/facebook/imagepipeline/i/s;->Yo:J
+    iget-wide v8, v1, Lcom/facebook/imagepipeline/i/s;->Yx:J
 
     sub-long v8, v6, v8
 
@@ -110,9 +110,9 @@
 
     if-ltz v4, :cond_1
 
-    iput-wide v6, v1, Lcom/facebook/imagepipeline/i/s;->Yo:J
+    iput-wide v6, v1, Lcom/facebook/imagepipeline/i/s;->Yx:J
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v4
 
@@ -124,11 +124,11 @@
 
     invoke-interface {v4, v6, v5, v7}, Lcom/facebook/imagepipeline/i/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget v4, v1, Lcom/facebook/imagepipeline/i/s;->Yp:I
+    iget v4, v1, Lcom/facebook/imagepipeline/i/s;->Yy:I
 
-    iget-object v5, v1, Lcom/facebook/imagepipeline/i/s;->Yq:Lcom/facebook/imagepipeline/a/a;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/i/s;->Yz:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/i/s;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-static {v2, v4, v5, v6}, Lcom/facebook/imagepipeline/i/ae;->a(Lcom/facebook/common/g/i;ILcom/facebook/imagepipeline/a/a;Lcom/facebook/imagepipeline/i/k;)V
 
@@ -160,14 +160,14 @@
 
     sub-float/2addr v5, v4
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v4, v5}, Lcom/facebook/imagepipeline/i/k;->o(F)V
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, v0, Lcom/facebook/imagepipeline/i/ae;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/i/ae;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     invoke-virtual {v2}, Lcom/facebook/common/g/i;->size()I
 
@@ -177,7 +177,7 @@
 
     move-result p1
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v4
 
@@ -196,14 +196,14 @@
     goto :goto_1
 
     :cond_3
-    iget-object v4, v0, Lcom/facebook/imagepipeline/i/ae;->Uq:Lcom/facebook/imagepipeline/i/af;
+    iget-object v4, v0, Lcom/facebook/imagepipeline/i/ae;->Uz:Lcom/facebook/imagepipeline/i/af;
 
     invoke-interface {v4, v1, p1}, Lcom/facebook/imagepipeline/i/af;->a(Lcom/facebook/imagepipeline/i/s;I)Ljava/util/Map;
 
     move-result-object p1
 
     :goto_1
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v4
 
@@ -221,32 +221,32 @@
 
     invoke-interface {v4, p1, v5, v6}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget p1, v1, Lcom/facebook/imagepipeline/i/s;->Yp:I
+    iget p1, v1, Lcom/facebook/imagepipeline/i/s;->Yy:I
 
     or-int/2addr p1, v6
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yq:Lcom/facebook/imagepipeline/a/a;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yz:Lcom/facebook/imagepipeline/a/a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/s;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-static {v2, p1, v4, v1}, Lcom/facebook/imagepipeline/i/ae;->a(Lcom/facebook/common/g/i;ILcom/facebook/imagepipeline/a/a;Lcom/facebook/imagepipeline/i/k;)V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object p1, v0, Lcom/facebook/imagepipeline/i/ae;->Ip:Lcom/facebook/common/g/a;
+    iget-object p1, v0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
 
     invoke-interface {p1, v3}, Lcom/facebook/common/g/a;->r(Ljava/lang/Object;)V
 
     invoke-virtual {v2}, Lcom/facebook/common/g/i;->close()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ae;->Ip:Lcom/facebook/common/g/a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ae;->Iy:Lcom/facebook/common/g/a;
 
     invoke-interface {v0, v3}, Lcom/facebook/common/g/a;->r(Ljava/lang/Object;)V
 
@@ -261,12 +261,12 @@
     goto :goto_2
 .end method
 
-.method public final gd()V
+.method public final gg()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zh:Lcom/facebook/imagepipeline/i/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v1
 
@@ -280,9 +280,9 @@
 
     invoke-interface {v1, v2, v3, v4}, Lcom/facebook/imagepipeline/i/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/s;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     return-void
 .end method
@@ -290,9 +290,9 @@
 .method public final i(Ljava/lang/Throwable;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zh:Lcom/facebook/imagepipeline/i/s;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ae$1;->Zq:Lcom/facebook/imagepipeline/i/s;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v1
 
@@ -306,7 +306,7 @@
 
     invoke-interface {v1, v2, v3, p1, v4}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/s;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v1
 
@@ -318,7 +318,7 @@
 
     invoke-interface {v1, v2, v3, v4}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/s;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/s;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/af$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/af$a.smali
index e08e891690..d1b57c6545 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/af$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/af$a.smali
@@ -23,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract gd()V
+.method public abstract gg()V
 .end method
 
 .method public abstract i(Ljava/lang/Throwable;)V
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$1.smali
index c5d9c8c916..e5b517d21a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$1.smali
@@ -28,34 +28,34 @@
 
 
 # instance fields
-.field final synthetic Yc:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic Yl:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Yh:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic Yq:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic Yi:Ljava/lang/String;
+.field final synthetic Yr:Ljava/lang/String;
 
-.field final synthetic Yj:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic Zj:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic Zs:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic Zk:Lcom/facebook/imagepipeline/i/ag;
+.field final synthetic Zt:Lcom/facebook/imagepipeline/i/ag;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ag;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;Lcom/facebook/cache/common/CacheKey;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zk:Lcom/facebook/imagepipeline/i/ag;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zt:Lcom/facebook/imagepipeline/i/ag;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yi:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zj:Lcom/facebook/cache/common/CacheKey;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs: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/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
 
     invoke-interface {p1, v0, v4, v3}, Lcom/facebook/imagepipeline/i/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     goto/16 :goto_4
 
@@ -133,9 +133,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
 
     invoke-virtual {p1}, La/h;->p()Ljava/lang/Exception;
 
@@ -143,13 +143,13 @@
 
     invoke-interface {v0, v1, v4, p1, v3}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zk:Lcom/facebook/imagepipeline/i/ag;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zt:Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zj:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {p1, v0, v1, v2, v3}, Lcom/facebook/imagepipeline/i/ag;->a(Lcom/facebook/imagepipeline/i/ag;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
 
@@ -164,9 +164,9 @@
 
     if-eqz p1, :cond_8
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yi:Ljava/lang/String;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/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/g/e;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object v5, p1, Lcom/facebook/imagepipeline/g/e;->Wi:Lcom/facebook/imagepipeline/a/a;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getSize()I
 
     move-result v0
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v6}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v6}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v6
 
-    iget-object v7, v6, Lcom/facebook/imagepipeline/request/b;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iget-object v7, v6, Lcom/facebook/imagepipeline/request/b;->Wi:Lcom/facebook/imagepipeline/a/a;
 
     if-eqz v7, :cond_5
 
-    iget v8, v5, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iget v8, v5, Lcom/facebook/imagepipeline/a/a;->To:I
 
-    iget v9, v7, Lcom/facebook/imagepipeline/a/a;->Tf:I
+    iget v9, v7, Lcom/facebook/imagepipeline/a/a;->To:I
 
     if-gt v8, v9, :cond_5
 
-    iget v5, v5, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iget v5, v5, Lcom/facebook/imagepipeline/a/a;->Tp:I
 
-    iget v7, v7, Lcom/facebook/imagepipeline/a/a;->Tg:I
+    iget v7, v7, Lcom/facebook/imagepipeline/a/a;->Tp: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/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
 
     invoke-interface {v0, v1, v4, v2}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
     const/16 v1, 0x9
 
@@ -253,7 +253,7 @@
     goto :goto_4
 
     :cond_6
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
     const/16 v5, 0x8
 
@@ -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;->VZ:Lcom/facebook/imagepipeline/a/a;
+    iput-object v1, v4, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->Wi:Lcom/facebook/imagepipeline/a/a;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
     new-instance v1, Lcom/facebook/imagepipeline/i/ap;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-direct {v1, v0, v2}, Lcom/facebook/imagepipeline/i/ap;-><init>(Lcom/facebook/imagepipeline/request/b;Lcom/facebook/imagepipeline/i/ak;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zk:Lcom/facebook/imagepipeline/i/ag;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zt:Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zj:Lcom/facebook/cache/common/CacheKey;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {v0, v2, v1, v4, p1}, Lcom/facebook/imagepipeline/i/ag;->a(Lcom/facebook/imagepipeline/i/ag;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
 
     goto :goto_4
 
     :cond_8
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yi:Ljava/lang/String;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yr:Ljava/lang/String;
 
     invoke-static {v0, v2, v1, v1}, Lcom/facebook/imagepipeline/i/ag;->a(Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;ZI)Ljava/util/Map;
 
@@ -311,13 +311,13 @@
 
     invoke-interface {v0, v2, v4, v1}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zk:Lcom/facebook/imagepipeline/i/ag;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zt:Lcom/facebook/imagepipeline/i/ag;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ag$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ag$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zj:Lcom/facebook/cache/common/CacheKey;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ag$1;->Zs:Lcom/facebook/cache/common/CacheKey;
 
     invoke-static {v0, v1, v2, v4, p1}, Lcom/facebook/imagepipeline/i/ag;->a(Lcom/facebook/imagepipeline/i/ag;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$2.smali
index 6676f84925..39849e0860 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ag$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic Zk:Lcom/facebook/imagepipeline/i/ag;
+.field final synthetic Zt:Lcom/facebook/imagepipeline/i/ag;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ag;Ljava/util/concurrent/atomic/AtomicBoolean;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag$2;->Zk:Lcom/facebook/imagepipeline/i/ag;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ag$2;->Zt:Lcom/facebook/imagepipeline/i/ag;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$2;->Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ag$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$2;->Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ag$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah$a.smali
index 473767db67..f6298dba86 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah$a.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private final Hy:Lcom/facebook/cache/common/CacheKey;
+.field private final HH:Lcom/facebook/cache/common/CacheKey;
 
-.field private final JW:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kf: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 Zn:Z
+.field private final Zw:Z
 
-.field private final Zo:Z
+.field private final Zx:Z
 
 
 # direct methods
@@ -66,13 +66,13 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah$a;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah$a;->HH:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zn:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zw:Z
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ah$a;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/ah$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zo:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zx:Z
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -108,7 +108,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zn:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zw:Z
 
     if-eqz v1, :cond_2
 
@@ -119,13 +119,13 @@
 
     :cond_3
     :goto_0
-    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zo:Z
+    iget-boolean v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Zx:Z
 
     if-eqz v1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah$a;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->Hy:Lcom/facebook/cache/common/CacheKey;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ah$a;->HH: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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
     invoke-interface {v1, v2}, Lcom/facebook/imagepipeline/i/k;->o(F)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     if-eqz v0, :cond_5
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah.smali
index f6a98e4675..a4d57635c3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ah.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final JW:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kf: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 TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -70,11 +70,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ah;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ah;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ah;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ah;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ah;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
@@ -103,15 +103,15 @@
 
     move-result-object v1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/facebook/imagepipeline/request/b;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v4, v2, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     if-eqz v4, :cond_4
 
@@ -128,13 +128,13 @@
 
     invoke-interface {v0, v1, v5}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ah;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ah;->Uh: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/i/ah;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ah;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v2, v9}, Lcom/facebook/imagepipeline/cache/o;->D(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -178,15 +178,15 @@
     :cond_2
     instance-of v10, v4, Lcom/facebook/imagepipeline/request/d;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    iget-boolean v12, v2, Lcom/facebook/imagepipeline/request/b;->Ym:Z
+    iget-boolean v12, v2, Lcom/facebook/imagepipeline/request/b;->Yv:Z
 
     new-instance v2, Lcom/facebook/imagepipeline/i/ah$a;
 
-    iget-object v11, p0, Lcom/facebook/imagepipeline/i/ah;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v11, p0, Lcom/facebook/imagepipeline/i/ah;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     move-object v7, v2
 
@@ -209,7 +209,7 @@
     :cond_3
     invoke-interface {v0, v1, v5, v6}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ah;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ah;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {p1, v2, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
@@ -217,7 +217,7 @@
 
     :cond_4
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ah;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$1.smali
index 367d7b240b..4da59d3b47 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Zv:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZE:Lcom/facebook/imagepipeline/i/ai;
 
-.field final synthetic Zw:Lcom/facebook/imagepipeline/i/ai$a;
+.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ai$a;Lcom/facebook/imagepipeline/i/ai;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->Zv:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZE:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,12 +35,12 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$1;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$a;->kA()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$a;->kD()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$2.smali
index 165901c6c1..b0f6bfa86a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$a$2.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/i/ai$a;->ky()V
+    value = Lcom/facebook/imagepipeline/i/ai$a;->kB()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic Zw:Lcom/facebook/imagepipeline/i/ai$a;
+.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ai$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/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/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/i/ai$a;->YC:I
+    iget v2, v2, Lcom/facebook/imagepipeline/i/ai$a;->YL:I
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
     const/4 v4, 0x0
 
-    iput-object v4, v3, Lcom/facebook/imagepipeline/i/ai$a;->Zr:Lcom/facebook/common/references/CloseableReference;
+    iput-object v4, v3, Lcom/facebook/imagepipeline/i/ai$a;->ZA:Lcom/facebook/common/references/CloseableReference;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
     const/4 v5, 0x0
 
-    iput-boolean v5, v3, Lcom/facebook/imagepipeline/i/ai$a;->Zs:Z
+    iput-boolean v5, v3, Lcom/facebook/imagepipeline/i/ai$a;->ZB: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/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/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/i/ai$a;->Zp:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Ko:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx: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/i/ai$a;->Zp:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Ko:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zp:Lcom/facebook/imagepipeline/i/am;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Ko:Ljava/lang/String;
+    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     invoke-static {v8, v9, v10}, Lcom/facebook/imagepipeline/i/ai$a;->a(Lcom/facebook/imagepipeline/i/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/i/ai$a;->Zp:Lcom/facebook/imagepipeline/i/am;
+    iget-object v3, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Ko:Ljava/lang/String;
+    iget-object v6, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
 
     const-string v7, "PostprocessorProducer"
 
-    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zp:Lcom/facebook/imagepipeline/i/am;
+    iget-object v8, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zy:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Ko:Ljava/lang/String;
+    iget-object v9, v0, Lcom/facebook/imagepipeline/i/ai$a;->Kx:Ljava/lang/String;
 
-    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v10, v0, Lcom/facebook/imagepipeline/i/ai$a;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     invoke-static {v8, v9, v10}, Lcom/facebook/imagepipeline/i/ai$a;->a(Lcom/facebook/imagepipeline/i/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/i/ai$a$2;->Zw:Lcom/facebook/imagepipeline/i/ai$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ai$a$2;->ZF:Lcom/facebook/imagepipeline/i/ai$a;
 
     monitor-enter v1
 
     :try_start_7
-    iput-boolean v5, v1, Lcom/facebook/imagepipeline/i/ai$a;->Zt:Z
+    iput-boolean v5, v1, Lcom/facebook/imagepipeline/i/ai$a;->ZC:Z
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kz()Z
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kC()Z
 
     move-result v0
 
@@ -223,7 +223,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->ky()V
+    invoke-virtual {v1}, Lcom/facebook/imagepipeline/i/ai$a;->kB()V
 
     :cond_2
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$b$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$b$1.smali
index 83ca0df385..26e90ef16c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$b$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$b$1.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Zv:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZE:Lcom/facebook/imagepipeline/i/ai;
 
-.field final synthetic Zx:Lcom/facebook/imagepipeline/i/ai$b;
+.field final synthetic ZG:Lcom/facebook/imagepipeline/i/ai$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ai$b;Lcom/facebook/imagepipeline/i/ai;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->Zx:Lcom/facebook/imagepipeline/i/ai$b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZG:Lcom/facebook/imagepipeline/i/ai$b;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->Zv:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZE:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,22 +35,22 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->Zx:Lcom/facebook/imagepipeline/i/ai$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZG:Lcom/facebook/imagepipeline/i/ai$b;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$b;->gD()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/ai$b;->gG()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->Zx:Lcom/facebook/imagepipeline/i/ai$b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai$b$1;->ZG:Lcom/facebook/imagepipeline/i/ai$b;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$c.smali
index b89f9abc03..f8b87a9b74 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai$c.smali
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic Zu:Lcom/facebook/imagepipeline/i/ai;
+.field final synthetic ZD:Lcom/facebook/imagepipeline/i/ai;
 
 
 # direct methods
 .method private constructor <init>(Lcom/facebook/imagepipeline/i/ai;Lcom/facebook/imagepipeline/i/ai$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$c;->Zu:Lcom/facebook/imagepipeline/i/ai;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai$c;->ZD:Lcom/facebook/imagepipeline/i/ai;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
@@ -62,7 +62,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai.smali
index 9104ff605b..d5bab57e14 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ai.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field final Ry:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+.field final RH:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -67,9 +67,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ai;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai;->Ry:Lcom/facebook/imagepipeline/bitmaps/PlatformBitmapFactory;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ai;->RH: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/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Zq:Lcom/facebook/imagepipeline/request/c;
+    iget-object v7, v0, Lcom/facebook/imagepipeline/request/b;->Zz:Lcom/facebook/imagepipeline/request/c;
 
     new-instance v8, Lcom/facebook/imagepipeline/i/ai$a;
 
@@ -146,7 +146,7 @@
     invoke-direct {p1, p0, v8, v0}, Lcom/facebook/imagepipeline/i/ai$c;-><init>(Lcom/facebook/imagepipeline/i/ai;Lcom/facebook/imagepipeline/i/ai$a;B)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ai;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/al.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/al.smali
index 71edd54ae4..3c8ebd19b6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/al.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/al.smali
@@ -4,14 +4,14 @@
 
 
 # virtual methods
-.method public abstract ke()V
-.end method
-
-.method public abstract kf()V
-.end method
-
-.method public abstract kg()V
-.end method
-
 .method public abstract kh()V
 .end method
+
+.method public abstract ki()V
+.end method
+
+.method public abstract kj()V
+.end method
+
+.method public abstract kk()V
+.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/an.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/an.smali
index 98cc64a388..05639af2b9 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/an.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/an.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final Vl:Landroid/content/ContentResolver;
+.field private final Vu:Landroid/content/ContentResolver;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/i/z;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/an;->Vl:Landroid/content/ContentResolver;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/an;->Vu:Landroid/content/ContentResolver;
 
     return-void
 .end method
@@ -28,9 +28,9 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/an;->Vl:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/an;->Vu:Landroid/content/ContentResolver;
 
     invoke-virtual {v0, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
 
@@ -45,7 +45,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "QualifiedResourceFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$1.smali
index 048e74f178..3fefced8d0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$1.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ZA:Lcom/facebook/imagepipeline/i/ao;
+.field final synthetic ZJ:Lcom/facebook/imagepipeline/i/ao;
 
-.field final synthetic ZB:Lcom/facebook/imagepipeline/i/ao$a;
+.field final synthetic ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ao$a;Lcom/facebook/imagepipeline/i/ao;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZA:Lcom/facebook/imagepipeline/i/ao;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZJ:Lcom/facebook/imagepipeline/i/ao;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -43,17 +43,17 @@
 
     const-string v0, "x"
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Uu:Lcom/facebook/imagepipeline/k/d;
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/ao$a$1;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-boolean v4, v4, Lcom/facebook/imagepipeline/i/ao$a;->Zy:Z
+    iget-boolean v4, v4, Lcom/facebook/imagepipeline/i/ao$a;->ZH:Z
 
     invoke-interface {v2, v3, v4}, Lcom/facebook/imagepipeline/k/d;->createImageTranscoder(Lcom/facebook/e/c;Z)Lcom/facebook/imagepipeline/k/c;
 
@@ -65,13 +65,13 @@
 
     check-cast v2, Lcom/facebook/imagepipeline/k/c;
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -81,26 +81,26 @@
 
     invoke-interface {v3, v4, v9}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v10
 
-    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->Zz:Lcom/facebook/imagepipeline/i/ao;
+    iget-object v3, v1, Lcom/facebook/imagepipeline/i/ao$a;->ZI:Lcom/facebook/imagepipeline/i/ao;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ao;->Sc:Lcom/facebook/common/g/g;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/i/ao;->Sl:Lcom/facebook/common/g/g;
 
-    invoke-interface {v3}, Lcom/facebook/common/g/g;->gm()Lcom/facebook/common/g/i;
+    invoke-interface {v3}, Lcom/facebook/common/g/g;->gp()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;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v6, v10, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v7, v10, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v7, v10, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     const/16 v3, 0x55
 
@@ -118,25 +118,25 @@
 
     move-result-object v3
 
-    iget v4, v3, Lcom/facebook/imagepipeline/k/b;->aap:I
+    iget v4, v3, Lcom/facebook/imagepipeline/k/b;->aay:I
 
     const/4 v5, 0x2
 
     if-eq v4, v5, :cond_3
 
-    iget-object v4, v10, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v4, v10, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     invoke-interface {v2}, Lcom/facebook/imagepipeline/k/c;->getIdentifier()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v5, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v5, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v5}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v5}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v6, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v6}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -205,7 +205,7 @@
 
     const-string v6, "Image format"
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object p1
 
@@ -225,9 +225,9 @@
 
     const-string p1, "queueTime"
 
-    iget-object v0, v1, Lcom/facebook/imagepipeline/i/ao$a;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kn()J
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kq()J
 
     move-result-wide v5
 
@@ -256,7 +256,7 @@
     move-object v12, p1
 
     :goto_1
-    invoke-virtual {v11}, Lcom/facebook/common/g/i;->gn()Lcom/facebook/common/g/f;
+    invoke-virtual {v11}, Lcom/facebook/common/g/i;->gq()Lcom/facebook/common/g/f;
 
     move-result-object p1
 
@@ -272,22 +272,22 @@
 
     invoke-direct {v0, p1}, Lcom/facebook/imagepipeline/g/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
 
-    sget-object v2, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
-    iput-object v2, v0, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v2, v0, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->ju()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/g/e;->jx()V
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v2
 
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -295,7 +295,7 @@
 
     invoke-interface {v2, v4, v9, v12}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget v2, v3, Lcom/facebook/imagepipeline/k/b;->aap:I
+    iget v2, v3, Lcom/facebook/imagepipeline/k/b;->aay:I
 
     const/4 v3, 0x1
 
@@ -304,7 +304,7 @@
     or-int/lit8 p2, p2, 0x10
 
     :cond_2
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v2, v0, p2}, Lcom/facebook/imagepipeline/i/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/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, v1, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
@@ -384,7 +384,7 @@
 
     if-eqz p2, :cond_4
 
-    iget-object p2, v1, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p2, v1, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {p2, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
     :try_end_7
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$2.smali
index f276900ae9..e9e9bc9679 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao$a$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic Yj:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic ZA:Lcom/facebook/imagepipeline/i/ao;
+.field final synthetic ZJ:Lcom/facebook/imagepipeline/i/ao;
 
-.field final synthetic ZB:Lcom/facebook/imagepipeline/i/ao$a;
+.field final synthetic ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ao$a;Lcom/facebook/imagepipeline/i/ao;Lcom/facebook/imagepipeline/i/k;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZA:Lcom/facebook/imagepipeline/i/ao;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZJ:Lcom/facebook/imagepipeline/i/ao;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Ys:Lcom/facebook/imagepipeline/i/k;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -39,46 +39,46 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kk()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kn()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/facebook/imagepipeline/i/ao$a;->XL:Z
+    iput-boolean v1, v0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     return-void
 .end method
 
-.method public final kg()V
+.method public final kj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZB:Lcom/facebook/imagepipeline/i/ao$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao$a$2;->ZK:Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ao$a;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kl()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->ko()Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao.smali
index 77e0d86ca3..71e07b544a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ao.smali
@@ -24,11 +24,11 @@
 
 
 # instance fields
-.field final Sc:Lcom/facebook/common/g/g;
+.field final Sl:Lcom/facebook/common/g/g;
 
-.field private final Ul:Lcom/facebook/imagepipeline/k/d;
+.field private final Uu:Lcom/facebook/imagepipeline/k/d;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final Zy:Z
+.field private final ZH: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/i/ao;->Sc:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->Sl: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/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->XO:Lcom/facebook/imagepipeline/i/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/k/d;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ao;->Uu:Lcom/facebook/imagepipeline/k/d;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao;->Zy:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/ao;->ZH:Z
 
     return-void
 .end method
@@ -113,13 +113,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ao;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v7, Lcom/facebook/imagepipeline/i/ao$a;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao;->Zy:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/ao;->ZH:Z
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ao;->Ul:Lcom/facebook/imagepipeline/k/d;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/ao;->Uu:Lcom/facebook/imagepipeline/k/d;
 
     move-object v1, v7
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ap.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ap.smali
index 165f805f4a..7782e2365f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ap.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ap.smali
@@ -11,27 +11,27 @@
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v3
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object v5
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v6
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result v7
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/a/d;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ke()Lcom/facebook/imagepipeline/a/d;
 
     move-result-object v8
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar$2.smali
index b1b3c84653..a02035b277 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic ZF:Lcom/facebook/imagepipeline/i/ar;
+.field final synthetic ZO:Lcom/facebook/imagepipeline/i/ar;
 
-.field final synthetic ZG:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic ZP:Lcom/facebook/imagepipeline/i/aq;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ar;Lcom/facebook/imagepipeline/i/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZF:Lcom/facebook/imagepipeline/i/ar;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZO:Lcom/facebook/imagepipeline/i/ar;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZG:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZP:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,18 +35,18 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZG:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZP:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aq;->cancel()V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZF:Lcom/facebook/imagepipeline/i/ar;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZO:Lcom/facebook/imagepipeline/i/ar;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ar;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ar;->Ui:Lcom/facebook/imagepipeline/i/as;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZG:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ar$2;->ZP:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-virtual {v0, v1}, Lcom/facebook/imagepipeline/i/as;->e(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar.smali
index e5f09ade81..c3aa7d1c47 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ar.smali
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field final TZ:Lcom/facebook/imagepipeline/i/as;
+.field final Ui:Lcom/facebook/imagepipeline/i/as;
 
-.field final XF:Lcom/facebook/imagepipeline/i/aj;
+.field final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -53,9 +53,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ar;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/ar;->Ui:Lcom/facebook/imagepipeline/i/as;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v6
 
@@ -108,7 +108,7 @@
 
     invoke-interface {p2, p1}, Lcom/facebook/imagepipeline/i/ak;->a(Lcom/facebook/imagepipeline/i/al;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar;->TZ:Lcom/facebook/imagepipeline/i/as;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/ar;->Ui:Lcom/facebook/imagepipeline/i/as;
 
     invoke-virtual {p1, v10}, Lcom/facebook/imagepipeline/i/as;->d(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/as.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/as.smali
index e103aba27e..934c4850b5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/as.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/as.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private ZH:Z
+.field private ZQ:Z
 
-.field private final ZI:Ljava/util/Deque;
+.field private final ZR: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/i/as;->ZH:Z
+    iput-boolean v0, p0, Lcom/facebook/imagepipeline/i/as;->ZQ: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/i/as;->ZI:Ljava/util/Deque;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/as;->ZR:Ljava/util/Deque;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/as;->ZH:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/as;->ZQ:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/as;->ZI:Ljava/util/Deque;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/as;->ZR: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/i/as;->ZI:Ljava/util/Deque;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/as;->ZR: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/i/at$a$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a$1.smali
index a6f24f85b9..a5b81a0a13 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a$1.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/facebook/imagepipeline/i/at$a;->kB()V
+    value = Lcom/facebook/imagepipeline/i/at$a;->kE()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic ZN:Landroid/util/Pair;
+.field final synthetic ZW:Landroid/util/Pair;
 
-.field final synthetic ZO:Lcom/facebook/imagepipeline/i/at$a;
+.field final synthetic ZX:Lcom/facebook/imagepipeline/i/at$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/at$a;Landroid/util/Pair;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZO:Lcom/facebook/imagepipeline/i/at$a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZX:Lcom/facebook/imagepipeline/i/at$a;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZN:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZW: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/i/at$a$1;->ZO:Lcom/facebook/imagepipeline/i/at$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZX:Lcom/facebook/imagepipeline/i/at$a;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/at$a;->ZM:Lcom/facebook/imagepipeline/i/at;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZN:Landroid/util/Pair;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZW:Landroid/util/Pair;
 
     iget-object v1, v1, Landroid/util/Pair;->first:Ljava/lang/Object;
 
     check-cast v1, Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZN:Landroid/util/Pair;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/at$a$1;->ZW:Landroid/util/Pair;
 
     iget-object v2, v2, Landroid/util/Pair;->second:Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a.smali
index 173336f56b..b274cec11a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/at$a.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field final synthetic ZM:Lcom/facebook/imagepipeline/i/at;
+.field final synthetic ZV:Lcom/facebook/imagepipeline/i/at;
 
 
 # direct methods
@@ -36,7 +36,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZM:Lcom/facebook/imagepipeline/i/at;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
@@ -51,17 +51,17 @@
     return-void
 .end method
 
-.method private kB()V
+.method private kE()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZM:Lcom/facebook/imagepipeline/i/at;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZM:Lcom/facebook/imagepipeline/i/at;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/at;->ZL:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/at;->ZU: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/i/at$a;->ZM:Lcom/facebook/imagepipeline/i/at;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
 
     invoke-static {v2}, Lcom/facebook/imagepipeline/i/at;->a(Lcom/facebook/imagepipeline/i/at;)I
 
@@ -82,7 +82,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZM:Lcom/facebook/imagepipeline/i/at;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at$a;->ZV:Lcom/facebook/imagepipeline/i/at;
 
     iget-object v0, v0, Lcom/facebook/imagepipeline/i/at;->mExecutor:Ljava/util/concurrent/Executor;
 
@@ -116,7 +116,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -126,7 +126,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kE()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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kE()V
 
     return-void
 .end method
 
-.method protected final jg()V
+.method protected final jj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kB()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/at$a;->kE()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/at.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/at.smali
index ec7e12d44d..819ddbfced 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/at.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/at.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -35,11 +35,11 @@
     .end annotation
 .end field
 
-.field private final ZJ:I
+.field private final ZS:I
 
-.field private ZK:I
+.field private ZT:I
 
-.field final ZL:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final ZU: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/i/at;->ZJ:I
+    iput v0, p0, Lcom/facebook/imagepipeline/i/at;->ZS: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/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance p1, Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-direct {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at;->ZL:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/at;->ZU:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/at;->ZK:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
 
     return-void
 .end method
@@ -105,11 +105,11 @@
 .method static synthetic a(Lcom/facebook/imagepipeline/i/at;)I
     .locals 2
 
-    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZK:I
+    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
 
     add-int/lit8 v1, v0, -0x1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/i/at;->ZK:I
+    iput v1, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
 
     return v0
 .end method
@@ -128,7 +128,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
@@ -143,15 +143,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZK:I
+    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/i/at;->ZJ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/i/at;->ZS:I
 
     const/4 v2, 0x1
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->ZL:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->ZU: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/i/at;->ZK:I
+    iget v0, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lcom/facebook/imagepipeline/i/at;->ZK:I
+    iput v0, p0, Lcom/facebook/imagepipeline/i/at;->ZT:I
 
     const/4 v2, 0x0
 
@@ -205,7 +205,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
@@ -219,7 +219,7 @@
 
     invoke-interface {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/at;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/at$a;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/au$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/au$a.smali
index e5f7a9e02d..100226b02f 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/au$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/au$a.smali
@@ -24,13 +24,13 @@
 
 
 # instance fields
-.field private final Sk:Lcom/facebook/imagepipeline/a/e;
+.field private final St:Lcom/facebook/imagepipeline/a/e;
 
-.field private final XU:Lcom/facebook/imagepipeline/i/ak;
+.field private final Yd:Lcom/facebook/imagepipeline/i/ak;
 
-.field private final ZQ:I
+.field private final ZZ:I
 
-.field final synthetic ZR:Lcom/facebook/imagepipeline/i/au;
+.field final synthetic aaa:Lcom/facebook/imagepipeline/i/au;
 
 
 # direct methods
@@ -47,23 +47,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZR:Lcom/facebook/imagepipeline/i/au;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->aaa:Lcom/facebook/imagepipeline/i/au;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/au$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/i/au$a;->ZQ:I
+    iput p4, p0, Lcom/facebook/imagepipeline/i/au$a;->ZZ:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->St: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/i/au$a;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au$a;->St:Lcom/facebook/imagepipeline/a/e;
 
     invoke-static {p1, v0}, Lcom/facebook/imagepipeline/i/aw;->a(Lcom/facebook/imagepipeline/g/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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -107,17 +107,17 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZR:Lcom/facebook/imagepipeline/i/au;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au$a;->aaa:Lcom/facebook/imagepipeline/i/au;
 
-    iget p2, p0, Lcom/facebook/imagepipeline/i/au$a;->ZQ:I
+    iget p2, p0, Lcom/facebook/imagepipeline/i/au$a;->ZZ:I
 
     const/4 v0, 0x1
 
     add-int/2addr p2, v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/au$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-virtual {p1, p2, v1, v2}, Lcom/facebook/imagepipeline/i/au;->a(ILcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)Z
 
@@ -125,7 +125,7 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/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/i/au$a;->ZR:Lcom/facebook/imagepipeline/i/au;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au$a;->aaa:Lcom/facebook/imagepipeline/i/au;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/i/au$a;->ZZ:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/au$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/au$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/i/au;->a(ILcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)Z
 
@@ -154,7 +154,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/i/k;->i(Ljava/lang/Throwable;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/au.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/au.smali
index 1188a55a1b..ce856e3f17 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/au.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/au.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final ZP:[Lcom/facebook/imagepipeline/i/av;
+.field private final ZY:[Lcom/facebook/imagepipeline/i/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -56,9 +56,9 @@
 
     check-cast p1, [Lcom/facebook/imagepipeline/i/av;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZP:[Lcom/facebook/imagepipeline/i/av;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZY:[Lcom/facebook/imagepipeline/i/av;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZP:[Lcom/facebook/imagepipeline/i/av;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/au;->ZY:[Lcom/facebook/imagepipeline/i/av;
 
     array-length p1, p1
 
@@ -129,7 +129,7 @@
     .locals 2
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au;->ZP:[Lcom/facebook/imagepipeline/i/av;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au;->ZY:[Lcom/facebook/imagepipeline/i/av;
 
     array-length v1, v0
 
@@ -171,11 +171,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     const/4 v1, 0x1
 
@@ -215,11 +215,11 @@
         }
     .end annotation
 
-    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p3}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     invoke-direct {p0, p1, v0}, Lcom/facebook/imagepipeline/i/au;->a(ILcom/facebook/imagepipeline/a/e;)I
 
@@ -234,7 +234,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au;->ZP:[Lcom/facebook/imagepipeline/i/av;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/au;->ZY:[Lcom/facebook/imagepipeline/i/av;
 
     aget-object v0, v0, p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/aw.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/aw.smali
index b1868753f9..940b27465b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/aw.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/aw.smali
@@ -81,7 +81,7 @@
     return p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->jp()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/g/e;->js()I
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax$1.smali
index 08471e7c11..3c68f63ecb 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax$1.smali
@@ -23,25 +23,25 @@
 
 
 # instance fields
-.field final synthetic ZS:Lcom/facebook/imagepipeline/g/e;
+.field final synthetic aab:Lcom/facebook/imagepipeline/g/e;
 
-.field final synthetic ZT:Lcom/facebook/imagepipeline/i/ax;
+.field final synthetic aac:Lcom/facebook/imagepipeline/i/ax;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/ax;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/imagepipeline/g/e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZT:Lcom/facebook/imagepipeline/i/ax;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax$1;->aac:Lcom/facebook/imagepipeline/i/ax;
 
-    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZS:Lcom/facebook/imagepipeline/g/e;
+    iput-object p6, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
 
     invoke-direct {p0, p2, p3, p4, p5}, Lcom/facebook/imagepipeline/i/aq;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Ljava/lang/String;)V
 
     return-void
 .end method
 
-.method private kC()Lcom/facebook/imagepipeline/g/e;
+.method private kF()Lcom/facebook/imagepipeline/g/e;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -49,16 +49,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZT:Lcom/facebook/imagepipeline/i/ax;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->aac:Lcom/facebook/imagepipeline/i/ax;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ax;->Sc:Lcom/facebook/common/g/g;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/ax;->Sl:Lcom/facebook/common/g/g;
 
-    invoke-interface {v0}, Lcom/facebook/common/g/g;->gm()Lcom/facebook/common/g/i;
+    invoke-interface {v0}, Lcom/facebook/common/g/g;->gp()Lcom/facebook/common/g/i;
 
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZS:Lcom/facebook/imagepipeline/g/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {v1}, Lcom/facebook/imagepipeline/g/e;->getInputStream()Ljava/io/InputStream;
 
@@ -68,22 +68,22 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     if-eq v3, v4, :cond_3
 
-    sget-object v4, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
 
     if-ne v3, v4, :cond_0
 
     goto :goto_1
 
     :cond_0
-    sget-object v4, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     if-eq v3, v4, :cond_2
 
-    sget-object v4, Lcom/facebook/e/b;->QX:Lcom/facebook/e/c;
+    sget-object v4, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
 
     if-ne v3, v4, :cond_1
 
@@ -100,32 +100,32 @@
 
     :cond_2
     :goto_0
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jV()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jY()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/e/b;->QQ:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QZ:Lcom/facebook/e/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     goto :goto_2
 
     :cond_3
     :goto_1
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jV()Lcom/facebook/imagepipeline/nativecode/e;
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/f;->jY()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/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v2, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
-    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->VW:Lcom/facebook/e/c;
+    iput-object v2, v1, Lcom/facebook/imagepipeline/g/e;->Wf:Lcom/facebook/e/c;
 
     :goto_2
-    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gn()Lcom/facebook/common/g/f;
+    invoke-virtual {v0}, Lcom/facebook/common/g/i;->gq()Lcom/facebook/common/g/f;
 
     move-result-object v1
 
@@ -140,7 +140,7 @@
 
     invoke-direct {v2, v1}, Lcom/facebook/imagepipeline/g/e;-><init>(Lcom/facebook/common/references/CloseableReference;)V
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZS:Lcom/facebook/imagepipeline/g/e;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
 
     invoke-virtual {v2, v3}, Lcom/facebook/imagepipeline/g/e;->c(Lcom/facebook/imagepipeline/g/e;)V
     :try_end_1
@@ -175,14 +175,14 @@
 
 
 # virtual methods
-.method public final gd()V
+.method public final gg()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZS:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-super {p0}, Lcom/facebook/imagepipeline/i/aq;->gd()V
+    invoke-super {p0}, Lcom/facebook/imagepipeline/i/aq;->gg()V
 
     return-void
 .end method
@@ -195,7 +195,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ax$1;->kC()Lcom/facebook/imagepipeline/g/e;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/i/ax$1;->kF()Lcom/facebook/imagepipeline/g/e;
 
     move-result-object v0
 
@@ -215,7 +215,7 @@
 .method public final onFailure(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZS:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
@@ -229,7 +229,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/g/e;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->ZS:Lcom/facebook/imagepipeline/g/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax$1;->aab:Lcom/facebook/imagepipeline/g/e;
 
     invoke-static {v0}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax.smali
index e2872c02e4..ef07a80dab 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/ax.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field final Sc:Lcom/facebook/common/g/g;
+.field final Sl:Lcom/facebook/common/g/g;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -69,7 +69,7 @@
 
     check-cast p1, Lcom/facebook/common/g/g;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax;->Sc:Lcom/facebook/common/g/g;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax;->Sl: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/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/ax;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/ax;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/ax$a;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/e.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/e.smali
index 43c43c52b6..cd1369e661 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/e.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/e.smali
@@ -17,26 +17,26 @@
 
 
 # virtual methods
-.method public ke()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public kf()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public kg()V
-    .locals 0
-
-    return-void
-.end method
-
 .method public kh()V
     .locals 0
 
     return-void
 .end method
+
+.method public ki()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public kj()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public kk()V
+    .locals 0
+
+    return-void
+.end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/f.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/f.smali
index 9cc9b466b6..6a3229a757 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/f.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/f.smali
@@ -49,7 +49,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "BitmapMemoryCacheGetProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/g.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/g.smali
index fcee5ee429..c73ef5f435 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/g.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/g.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field private final TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/ad;-><init>(Lcom/facebook/imagepipeline/i/aj;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/g;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/g;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     return-void
 .end method
@@ -38,13 +38,13 @@
 .method protected final synthetic a(Lcom/facebook/imagepipeline/i/ak;)Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/g;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/g;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -52,7 +52,7 @@
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/h$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/h$1.smali
index 6950173900..7404417478 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/h$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/h$1.smali
@@ -27,22 +27,22 @@
 
 
 # instance fields
-.field final synthetic XM:Lcom/facebook/cache/common/CacheKey;
+.field final synthetic XV:Lcom/facebook/cache/common/CacheKey;
 
-.field final synthetic XN:Z
+.field final synthetic XW:Z
 
-.field final synthetic XO:Lcom/facebook/imagepipeline/i/h;
+.field final synthetic XX:Lcom/facebook/imagepipeline/i/h;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/h;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/cache/common/CacheKey;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/h$1;->XO:Lcom/facebook/imagepipeline/i/h;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/h$1;->XX:Lcom/facebook/imagepipeline/i/h;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h$1;->XM:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h$1;->XV:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/h$1;->XN:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/h$1;->XW:Z
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
@@ -57,7 +57,7 @@
     check-cast p1, Lcom/facebook/common/references/CloseableReference;
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p2}, Lcom/facebook/imagepipeline/i/h$1;->ay(I)Z
 
@@ -69,14 +69,14 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {p1, v1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_2
 
     :cond_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -107,11 +107,11 @@
     :cond_2
     if-nez v0, :cond_5
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XO:Lcom/facebook/imagepipeline/i/h;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XX:Lcom/facebook/imagepipeline/i/h;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/i/h;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/i/h;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/i/h$1;->XM:Lcom/facebook/cache/common/CacheKey;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/h$1;->XV:Lcom/facebook/cache/common/CacheKey;
 
     invoke-interface {v2, v3}, Lcom/facebook/imagepipeline/cache/o;->D(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -128,7 +128,7 @@
 
     check-cast v3, Lcom/facebook/imagepipeline/g/c;
 
-    invoke-virtual {v3}, Lcom/facebook/imagepipeline/g/c;->jk()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v3}, Lcom/facebook/imagepipeline/g/c;->jn()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v3
 
@@ -138,21 +138,21 @@
 
     check-cast v4, Lcom/facebook/imagepipeline/g/c;
 
-    invoke-virtual {v4}, Lcom/facebook/imagepipeline/g/c;->jk()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v4}, Lcom/facebook/imagepipeline/g/c;->jn()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v4
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jz()Z
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jC()Z
 
     move-result v5
 
     if-nez v5, :cond_4
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jx()I
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/g/h;->jA()I
 
     move-result v4
 
-    invoke-interface {v3}, Lcom/facebook/imagepipeline/g/h;->jx()I
+    invoke-interface {v3}, Lcom/facebook/imagepipeline/g/h;->jA()I
 
     move-result v3
     :try_end_2
@@ -173,7 +173,7 @@
     :cond_4
     :goto_0
     :try_start_4
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {p1, v2, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_4
@@ -184,7 +184,7 @@
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -198,15 +198,15 @@
 
     :cond_5
     :goto_1
-    iget-boolean v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XN:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XW:Z
 
     if-eqz v2, :cond_6
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/h$1;->XO:Lcom/facebook/imagepipeline/i/h;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/h$1;->XX:Lcom/facebook/imagepipeline/i/h;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/h;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/h;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XM:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/h$1;->XV: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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/high16 v2, 0x3f800000    # 1.0f
 
     invoke-interface {v0, v2}, Lcom/facebook/imagepipeline/i/k;->o(F)V
 
     :cond_7
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     if-eqz v1, :cond_8
 
@@ -241,7 +241,7 @@
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -255,20 +255,20 @@
 
     :cond_9
     :goto_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_9
     .catchall {:try_start_9 .. :try_end_9} :catchall_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/h.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/h.smali
index e9f91d7ee7..190492613c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/h.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/h.smali
@@ -19,7 +19,7 @@
 
 
 # instance fields
-.field final JW:Lcom/facebook/imagepipeline/cache/o;
+.field final Kf: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 TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -64,11 +64,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/h;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/h;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/h;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/h;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/h;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -115,9 +115,9 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v0
 
@@ -125,27 +125,27 @@
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-interface {v0, v1, v2}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v2
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/h;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/h;->Uh: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/i/h;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/i/h;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v3, v2}, Lcom/facebook/imagepipeline/cache/o;->D(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -170,17 +170,17 @@
 
     check-cast v8, Lcom/facebook/imagepipeline/g/c;
 
-    invoke-virtual {v8}, Lcom/facebook/imagepipeline/g/c;->jk()Lcom/facebook/imagepipeline/g/h;
+    invoke-virtual {v8}, Lcom/facebook/imagepipeline/g/c;->jn()Lcom/facebook/imagepipeline/g/h;
 
     move-result-object v8
 
-    invoke-interface {v8}, Lcom/facebook/imagepipeline/g/h;->jz()Z
+    invoke-interface {v8}, Lcom/facebook/imagepipeline/g/h;->jC()Z
 
     move-result v8
 
     if-eqz v8, :cond_1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
 
     move-result-object v9
 
@@ -204,7 +204,7 @@
     :goto_0
     invoke-interface {v0, v1, v9, v10}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
 
     move-result-object v9
 
@@ -233,19 +233,19 @@
 
     if-eqz v8, :cond_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_3
     :try_start_2
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()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;->aak:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v8, Lcom/facebook/imagepipeline/request/b$b;->aat:Lcom/facebook/imagepipeline/request/b$b;
 
     iget v8, v8, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
     :try_end_2
@@ -256,7 +256,7 @@
     if-lt v3, v8, :cond_5
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
 
     move-result-object p2
 
@@ -278,7 +278,7 @@
     :goto_2
     invoke-interface {v0, v1, p2, v2}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
 
     move-result-object p2
 
@@ -288,23 +288,23 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_5
     :try_start_4
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-boolean v3, v3, Lcom/facebook/imagepipeline/request/b;->Ym:Z
+    iget-boolean v3, v3, Lcom/facebook/imagepipeline/request/b;->Yv:Z
 
     invoke-virtual {p0, p1, v2, v3}, Lcom/facebook/imagepipeline/i/h;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/cache/common/CacheKey;Z)Lcom/facebook/imagepipeline/i/k;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->ki()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/i/h;->kl()Ljava/lang/String;
 
     move-result-object v2
 
@@ -321,29 +321,29 @@
     :cond_6
     invoke-interface {v0, v1, v2, v7}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/h;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/h;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
 
-.method protected ki()Ljava/lang/String;
+.method protected kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "BitmapMemoryCacheProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/i$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/i$a.smali
index 23496ff1eb..88ffdcc742 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/i$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/i$a.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private final XP:I
+.field private final XY:I
 
-.field private final XQ:I
+.field private final XZ:I
 
 
 # direct methods
@@ -47,9 +47,9 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/i$a;->XP:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/i$a;->XY:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/i$a;->XQ:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/i$a;->XZ:I
 
     return-void
 .end method
@@ -109,11 +109,11 @@
 
     mul-int v1, v1, v2
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XP:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XY:I
 
     if-lt v1, v2, :cond_2
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XQ:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/i$a;->XZ:I
 
     if-gt v1, v2, :cond_2
 
@@ -121,7 +121,7 @@
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/i.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/i.smali
index ccde341fe2..f53589fb04 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/i.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/i.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -36,11 +36,11 @@
     .end annotation
 .end field
 
-.field private final XP:I
+.field private final XY:I
 
-.field private final XQ:I
+.field private final XZ:I
 
-.field private final XR:Z
+.field private final Ya:Z
 
 
 # direct methods
@@ -76,13 +76,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/i;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/i;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/i;->XP:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/i;->XY:I
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/i;->XQ:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/i;->XZ:I
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/i;->XR:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/i;->Ya:Z
 
     return-void
 .end method
@@ -103,30 +103,30 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Z
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kd()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/i;->XR:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/i;->Ya:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/i;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/i$a;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/i;->XP:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/i;->XY:I
 
-    iget v3, p0, Lcom/facebook/imagepipeline/i/i;->XQ:I
+    iget v3, p0, Lcom/facebook/imagepipeline/i/i;->XZ:I
 
     invoke-direct {v1, p1, v2, v3}, Lcom/facebook/imagepipeline/i/i$a;-><init>(Lcom/facebook/imagepipeline/i/k;II)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/j$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/j$a.smali
index ce8123618f..d0c63bbc7a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/j$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/j$a.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field private XU:Lcom/facebook/imagepipeline/i/ak;
+.field private Yd:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic XV:Lcom/facebook/imagepipeline/i/j;
+.field final synthetic Ye:Lcom/facebook/imagepipeline/i/j;
 
 
 # direct methods
@@ -43,11 +43,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->XV:Lcom/facebook/imagepipeline/i/j;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ye:Lcom/facebook/imagepipeline/i/j;
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/j$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/j$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     return-void
 .end method
@@ -67,9 +67,9 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/g/e;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()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;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v2, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
     invoke-static {p1, v2}, Lcom/facebook/imagepipeline/i/aw;->a(Lcom/facebook/imagepipeline/g/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;->ZZ:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->aai:Z
 
     if-eqz v0, :cond_2
 
@@ -96,7 +96,7 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -117,13 +117,13 @@
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->XV:Lcom/facebook/imagepipeline/i/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ye:Lcom/facebook/imagepipeline/i/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->XT:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->Yc:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/j$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {p1, p2, v0}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
@@ -134,13 +134,13 @@
 .method protected final h(Ljava/lang/Throwable;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->XV:Lcom/facebook/imagepipeline/i/j;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j$a;->Ye:Lcom/facebook/imagepipeline/i/j;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->XT:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/j;->Yc:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/j$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/j$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/j.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/j.smali
index 485e724008..42dbdcae6a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/j.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/j.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final XS:Lcom/facebook/imagepipeline/i/aj;
+.field private final Yb:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field final XT:Lcom/facebook/imagepipeline/i/aj;
+.field final Yc:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -62,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j;->XS:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/j;->Yb:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/j;->XT:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/j;->Yc:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, p0, p1, p2, v1}, Lcom/facebook/imagepipeline/i/j$a;-><init>(Lcom/facebook/imagepipeline/i/j;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;B)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j;->XS:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/j;->Yb:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/l.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/l.smali
index dbc97241b3..081e58109b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/l.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/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;->fY()Lcom/facebook/common/b/a;
+    invoke-static {}, Lcom/facebook/common/b/a;->gb()Lcom/facebook/common/b/a;
 
     move-result-object v0
 
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/request/b;->aaf: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 ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "DataFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$a.smali
index 3e438b6b5b..9364b34cfc 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic XX:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
 
 
 # direct methods
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$a;->XX:Lcom/facebook/imagepipeline/i/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$a;->Yg:Lcom/facebook/imagepipeline/i/m;
 
     invoke-direct/range {p0 .. p5}, Lcom/facebook/imagepipeline/i/m$c;-><init>(Lcom/facebook/imagepipeline/i/m;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;ZI)V
 
@@ -92,7 +92,7 @@
     return p1
 .end method
 
-.method protected final jk()Lcom/facebook/imagepipeline/g/h;
+.method protected final jn()Lcom/facebook/imagepipeline/g/h;
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$b.smali
index e6fed9ac53..50a22605d6 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$b.smali
@@ -15,13 +15,13 @@
 
 
 # instance fields
-.field private final Ut:Lcom/facebook/imagepipeline/e/e;
+.field private final UC:Lcom/facebook/imagepipeline/e/e;
 
-.field final synthetic XX:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yg:Lcom/facebook/imagepipeline/i/m;
 
-.field private final XY:Lcom/facebook/imagepipeline/e/f;
+.field private final Yh:Lcom/facebook/imagepipeline/e/f;
 
-.field private XZ:I
+.field private Yi:I
 
 
 # direct methods
@@ -41,7 +41,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->XX:Lcom/facebook/imagepipeline/i/m;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yg:Lcom/facebook/imagepipeline/i/m;
 
     move-object v0, p0
 
@@ -63,7 +63,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/e/f;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->XY:Lcom/facebook/imagepipeline/e/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/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/e/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->UC:Lcom/facebook/imagepipeline/e/e;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/m$b;->XZ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi:I
 
     return-void
 .end method
@@ -121,15 +121,15 @@
 
     if-eqz p2, :cond_4
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object p2
 
-    sget-object v1, Lcom/facebook/e/b;->QP:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
 
     if-ne p2, v1, :cond_4
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$b;->XY:Lcom/facebook/imagepipeline/e/f;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
 
     invoke-virtual {p2, p1}, Lcom/facebook/imagepipeline/e/f;->a(Lcom/facebook/imagepipeline/g/e;)Z
 
@@ -147,11 +147,11 @@
 
     :cond_1
     :try_start_1
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->XY:Lcom/facebook/imagepipeline/e/f;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VN:I
+    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VW:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/i/m$b;->XZ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi: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/i/m$b;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/m$b;->XZ:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi:I
 
     invoke-interface {v1, v2}, Lcom/facebook/imagepipeline/e/e;->ac(I)I
 
@@ -173,9 +173,9 @@
 
     if-ge p1, v1, :cond_3
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->XY:Lcom/facebook/imagepipeline/e/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/e/f;->VP:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/e/f;->VY: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/i/m$b;->XZ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yi:I
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -207,21 +207,21 @@
 .method protected final g(Lcom/facebook/imagepipeline/g/e;)I
     .locals 0
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->XY:Lcom/facebook/imagepipeline/e/f;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
 
-    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VO:I
+    iget p1, p1, Lcom/facebook/imagepipeline/e/f;->VX:I
 
     return p1
 .end method
 
-.method protected final jk()Lcom/facebook/imagepipeline/g/h;
+.method protected final jn()Lcom/facebook/imagepipeline/g/h;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$b;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$b;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->XY:Lcom/facebook/imagepipeline/e/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$b;->Yh:Lcom/facebook/imagepipeline/e/f;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/e/f;->VN:I
+    iget v1, v1, Lcom/facebook/imagepipeline/e/f;->VW:I
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/e/e;->ad(I)Lcom/facebook/imagepipeline/g/h;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$1.smali
index 7f2aea1c34..7755bc9e30 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$1.smali
@@ -18,26 +18,26 @@
 
 
 # instance fields
-.field final synthetic Yb:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yk:Lcom/facebook/imagepipeline/i/m;
 
-.field final synthetic Yc:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic Yl:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Yd:I
+.field final synthetic Ym:I
 
-.field final synthetic Ye:Lcom/facebook/imagepipeline/i/m$c;
+.field final synthetic Yn:Lcom/facebook/imagepipeline/i/m$c;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/m$c;Lcom/facebook/imagepipeline/i/m;Lcom/facebook/imagepipeline/i/ak;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yb:Lcom/facebook/imagepipeline/i/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yk:Lcom/facebook/imagepipeline/i/m;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
-    iput p4, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yd:I
+    iput p4, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ym:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,11 +51,11 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->XX:Lcom/facebook/imagepipeline/i/m;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/i/m;->Uh:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/i/m;->Uq:Z
 
     if-nez v0, :cond_0
 
@@ -68,21 +68,21 @@
     if-nez v0, :cond_2
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m$c;->XX:Lcom/facebook/imagepipeline/i/m;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/i/m$c;->Yg:Lcom/facebook/imagepipeline/i/m;
 
-    iget-boolean v1, v1, Lcom/facebook/imagepipeline/i/m;->XW:Z
+    iget-boolean v1, v1, Lcom/facebook/imagepipeline/i/m;->Yf:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->aaf: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;->Sl:Lcom/facebook/imagepipeline/a/f;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/request/b;->Su:Lcom/facebook/imagepipeline/a/f;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->Sk:Lcom/facebook/imagepipeline/a/e;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->St:Lcom/facebook/imagepipeline/a/e;
 
-    iget v2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yd:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ym:I
 
     invoke-static {v1, v0, p1, v2}, Lcom/facebook/imagepipeline/k/a;->a(Lcom/facebook/imagepipeline/a/f;Lcom/facebook/imagepipeline/a/e;Lcom/facebook/imagepipeline/g/e;I)I
 
     move-result v0
 
-    iput v0, p1, Lcom/facebook/imagepipeline/g/e;->VX:I
+    iput v0, p1, Lcom/facebook/imagepipeline/g/e;->Wg:I
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$1;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
     invoke-static {v0, p1, p2}, Lcom/facebook/imagepipeline/i/m$c;->a(Lcom/facebook/imagepipeline/i/m$c;Lcom/facebook/imagepipeline/g/e;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$2.smali
index a25a9edbf4..dddf4b622e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m$c$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic Yb:Lcom/facebook/imagepipeline/i/m;
+.field final synthetic Yk:Lcom/facebook/imagepipeline/i/m;
 
-.field final synthetic Ye:Lcom/facebook/imagepipeline/i/m$c;
+.field final synthetic Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-.field final synthetic Yf:Z
+.field final synthetic Yo:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/m$c;Lcom/facebook/imagepipeline/i/m;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yb:Lcom/facebook/imagepipeline/i/m;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yk:Lcom/facebook/imagepipeline/i/m;
 
-    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yf:Z
+    iput-boolean p3, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yo:Z
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -39,39 +39,39 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yf:Z
+    iget-boolean v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yo:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/m$c;->kj()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/m$c;->km()V
 
     :cond_0
     return-void
 .end method
 
-.method public final kg()V
+.method public final kj()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kc()Z
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->kf()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Ye:Lcom/facebook/imagepipeline/i/m$c;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m$c$2;->Yn:Lcom/facebook/imagepipeline/i/m$c;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Ya:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/m$c;->Yj:Lcom/facebook/imagepipeline/i/u;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kl()Z
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->ko()Z
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m.smali
index 0adfeb1d95..5f7efb5ba4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/m.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/m.smali
@@ -27,21 +27,21 @@
 
 
 # instance fields
-.field private final Ip:Lcom/facebook/common/g/a;
+.field private final Iy:Lcom/facebook/common/g/a;
 
-.field final RZ:Lcom/facebook/imagepipeline/b/a;
+.field final Si:Lcom/facebook/imagepipeline/b/a;
 
-.field private final UI:Z
+.field private final UC:Lcom/facebook/imagepipeline/e/e;
 
-.field private final UQ:I
+.field private final US:Z
 
-.field final Uh:Z
+.field private final UZ:I
 
-.field final Uk:Lcom/facebook/imagepipeline/e/c;
+.field final Uq:Z
 
-.field private final Ut:Lcom/facebook/imagepipeline/e/e;
+.field final Ut:Lcom/facebook/imagepipeline/e/c;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field final XW:Z
+.field final Yf:Z
 
 .field final mExecutor:Ljava/util/concurrent/Executor;
 
@@ -83,7 +83,7 @@
 
     check-cast p1, Lcom/facebook/common/g/a;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Ip:Lcom/facebook/common/g/a;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Iy:Lcom/facebook/common/g/a;
 
     invoke-static {p2}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -99,7 +99,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/e/c;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Uk:Lcom/facebook/imagepipeline/e/c;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Ut:Lcom/facebook/imagepipeline/e/c;
 
     invoke-static {p4}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -107,11 +107,11 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/e/e;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/m;->Uh:Z
+    iput-boolean p5, p0, Lcom/facebook/imagepipeline/i/m;->Uq:Z
 
-    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/m;->XW:Z
+    iput-boolean p6, p0, Lcom/facebook/imagepipeline/i/m;->Yf:Z
 
     invoke-static {p8}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -119,13 +119,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/aj;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/m;->UI:Z
+    iput-boolean p7, p0, Lcom/facebook/imagepipeline/i/m;->US:Z
 
-    iput p9, p0, Lcom/facebook/imagepipeline/i/m;->UQ:I
+    iput p9, p0, Lcom/facebook/imagepipeline/i/m;->UZ:I
 
-    iput-object p10, p0, Lcom/facebook/imagepipeline/i/m;->RZ:Lcom/facebook/imagepipeline/b/a;
+    iput-object p10, p0, Lcom/facebook/imagepipeline/i/m;->Si:Lcom/facebook/imagepipeline/b/a;
 
     return-void
 .end method
@@ -147,13 +147,13 @@
     .end annotation
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-static {v0}, Lcom/facebook/common/j/f;->c(Landroid/net/Uri;)Z
 
@@ -163,9 +163,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/i/m$a;
 
-    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/m;->UI:Z
+    iget-boolean v5, p0, Lcom/facebook/imagepipeline/i/m;->US:Z
 
-    iget v6, p0, Lcom/facebook/imagepipeline/i/m;->UQ:I
+    iget v6, p0, Lcom/facebook/imagepipeline/i/m;->UZ:I
 
     move-object v1, v0
 
@@ -182,17 +182,17 @@
     :cond_0
     new-instance v4, Lcom/facebook/imagepipeline/e/f;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m;->Ip:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/m;->Iy:Lcom/facebook/common/g/a;
 
     invoke-direct {v4, v0}, Lcom/facebook/imagepipeline/e/f;-><init>(Lcom/facebook/common/g/a;)V
 
     new-instance v8, Lcom/facebook/imagepipeline/i/m$b;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/m;->Ut:Lcom/facebook/imagepipeline/e/e;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/m;->UC:Lcom/facebook/imagepipeline/e/e;
 
-    iget-boolean v6, p0, Lcom/facebook/imagepipeline/i/m;->UI:Z
+    iget-boolean v6, p0, Lcom/facebook/imagepipeline/i/m;->US:Z
 
-    iget v7, p0, Lcom/facebook/imagepipeline/i/m;->UQ:I
+    iget v7, p0, Lcom/facebook/imagepipeline/i/m;->UZ:I
 
     move-object v0, v8
 
@@ -207,20 +207,20 @@
     move-object v0, v8
 
     :goto_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/m;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$1.smali
index 3def96049c..24945f7e6a 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$1.smali
@@ -28,30 +28,30 @@
 
 
 # instance fields
-.field final synthetic Yc:Lcom/facebook/imagepipeline/i/ak;
+.field final synthetic Yl:Lcom/facebook/imagepipeline/i/ak;
 
-.field final synthetic Yh:Lcom/facebook/imagepipeline/i/am;
+.field final synthetic Yq:Lcom/facebook/imagepipeline/i/am;
 
-.field final synthetic Yi:Ljava/lang/String;
+.field final synthetic Yr:Ljava/lang/String;
 
-.field final synthetic Yj:Lcom/facebook/imagepipeline/i/k;
+.field final synthetic Ys:Lcom/facebook/imagepipeline/i/k;
 
-.field final synthetic Yk:Lcom/facebook/imagepipeline/i/o;
+.field final synthetic Yt:Lcom/facebook/imagepipeline/i/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/o;Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yk:Lcom/facebook/imagepipeline/i/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yt:Lcom/facebook/imagepipeline/i/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o$1;->Yi:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/o$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/o$1;->Yl:Lcom/facebook/imagepipeline/i/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/i/o$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
 
     invoke-interface {p1, v0, v4, v3}, Lcom/facebook/imagepipeline/i/am;->b(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->gd()V
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/k;->gg()V
 
     goto :goto_2
 
@@ -129,9 +129,9 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
 
     invoke-virtual {p1}, La/h;->p()Ljava/lang/Exception;
 
@@ -139,13 +139,13 @@
 
     invoke-interface {v0, v1, v4, p1, v3}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yk:Lcom/facebook/imagepipeline/i/o;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yt:Lcom/facebook/imagepipeline/i/o;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
@@ -160,9 +160,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
 
     invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->getSize()I
 
@@ -174,19 +174,19 @@
 
     invoke-interface {v0, v1, v4, v5}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
 
     invoke-interface {v0, v1, v4, v2}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
     const/high16 v1, 0x3f800000    # 1.0f
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/i/k;->o(F)V
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, v2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -195,9 +195,9 @@
     goto :goto_2
 
     :cond_4
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yh:Lcom/facebook/imagepipeline/i/am;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yq:Lcom/facebook/imagepipeline/i/am;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yr:Ljava/lang/String;
 
     invoke-static {p1, v0, v1, v1}, Lcom/facebook/imagepipeline/i/o;->a(Lcom/facebook/imagepipeline/i/am;Ljava/lang/String;ZI)Ljava/util/Map;
 
@@ -205,13 +205,13 @@
 
     invoke-interface {p1, v0, v4, v1}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yk:Lcom/facebook/imagepipeline/i/o;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yt:Lcom/facebook/imagepipeline/i/o;
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/o;->XO:Lcom/facebook/imagepipeline/i/aj;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Yj:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$1;->Ys:Lcom/facebook/imagepipeline/i/k;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yc:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/o$1;->Yl:Lcom/facebook/imagepipeline/i/ak;
 
     invoke-interface {p1, v0, v1}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$2.smali
index fc94921e6f..b33d4d01bf 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/o$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic Yk:Lcom/facebook/imagepipeline/i/o;
+.field final synthetic Yt:Lcom/facebook/imagepipeline/i/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/o;Ljava/util/concurrent/atomic/AtomicBoolean;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o$2;->Yk:Lcom/facebook/imagepipeline/i/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/o$2;->Yt:Lcom/facebook/imagepipeline/i/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$2;->Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/o$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$2;->Sx:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/o$2;->SG:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/p$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/p$a.smali
index d9a2666fdf..8351176320 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/p$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/p$a.smali
@@ -24,13 +24,13 @@
 
 
 # instance fields
-.field private final TX:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vn:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final XU:Lcom/facebook/imagepipeline/i/ak;
+.field private final Yd:Lcom/facebook/imagepipeline/i/ak;
 
 
 # direct methods
@@ -52,13 +52,13 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p$a;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p$a;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p$a;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p5, p0, Lcom/facebook/imagepipeline/i/p$a;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p5, p0, Lcom/facebook/imagepipeline/i/p$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     return-void
 .end method
@@ -92,52 +92,52 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/p$a;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/p$a;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/p$a;->XU:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/p$a;->Yd:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {v2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     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;->ZV:Lcom/facebook/imagepipeline/request/b$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/request/b;->aae:Lcom/facebook/imagepipeline/request/b$a;
 
-    sget-object v2, Lcom/facebook/imagepipeline/request/b$a;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v2, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p$a;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
     invoke-virtual {v0, v1, p1}, Lcom/facebook/imagepipeline/cache/e;->a(Lcom/facebook/cache/common/CacheKey;Lcom/facebook/imagepipeline/g/e;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
@@ -145,7 +145,7 @@
 
     :cond_2
     :goto_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/p.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/p.smali
index 8e49ba7072..f146892fd1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/p.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/p.smali
@@ -24,13 +24,13 @@
 
 
 # instance fields
-.field private final TX:Lcom/facebook/imagepipeline/cache/e;
+.field private final Ug:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final Vn:Lcom/facebook/imagepipeline/cache/e;
+.field private final Vw:Lcom/facebook/imagepipeline/cache/e;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -58,13 +58,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/p;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/p;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/p;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/p;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p4, p0, Lcom/facebook/imagepipeline/i/p;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -84,13 +84,13 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()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;->aai:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aar: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/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->aab:Z
+    iget-boolean v0, v0, Lcom/facebook/imagepipeline/request/b;->aak:Z
 
     if-eqz v0, :cond_1
 
     new-instance v0, Lcom/facebook/imagepipeline/i/p$a;
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/p;->Vn:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/p;->Vw:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v5, p0, Lcom/facebook/imagepipeline/i/p;->TX:Lcom/facebook/imagepipeline/cache/e;
+    iget-object v5, p0, Lcom/facebook/imagepipeline/i/p;->Ug:Lcom/facebook/imagepipeline/cache/e;
 
-    iget-object v6, p0, Lcom/facebook/imagepipeline/i/p;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v6, p0, Lcom/facebook/imagepipeline/i/p;->Uh: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/i/p;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/p;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/q.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/q.smali
index fe231268fd..5388592156 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/q.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/q.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private final TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {p0, p2}, Lcom/facebook/imagepipeline/i/ad;-><init>(Lcom/facebook/imagepipeline/i/aj;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/q;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/q;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
     return-void
 .end method
@@ -37,19 +37,19 @@
 .method protected final synthetic a(Lcom/facebook/imagepipeline/i/ak;)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/q;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/q;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v1
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     invoke-interface {v0, v1}, Lcom/facebook/imagepipeline/cache/f;->a(Lcom/facebook/imagepipeline/request/b;)Lcom/facebook/cache/common/CacheKey;
 
     move-result-object v0
 
-    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p1}, Lcom/facebook/imagepipeline/i/ak;->kc()Lcom/facebook/imagepipeline/request/b$b;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/r$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/r$a.smali
index 1ad9fc991f..118e7d8c6c 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/r$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/r$a.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final JW:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kf: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 Yl:Lcom/facebook/cache/common/CacheKey;
+.field private final Yu:Lcom/facebook/cache/common/CacheKey;
 
-.field private final Ym:Z
+.field private final Yv:Z
 
 
 # direct methods
@@ -60,11 +60,11 @@
 
     invoke-direct {p0, p1}, Lcom/facebook/imagepipeline/i/n;-><init>(Lcom/facebook/imagepipeline/i/k;)V
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r$a;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r$a;->Yl:Lcom/facebook/cache/common/CacheKey;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r$a;->Yu:Lcom/facebook/cache/common/CacheKey;
 
-    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/r$a;->Ym:Z
+    iput-boolean p4, p0, Lcom/facebook/imagepipeline/i/r$a;->Yv:Z
 
     return-void
 .end method
@@ -77,7 +77,7 @@
     check-cast p1, Lcom/facebook/imagepipeline/g/e;
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-static {p2}, Lcom/facebook/imagepipeline/i/r$a;->az(I)Z
 
@@ -93,18 +93,18 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jo()Lcom/facebook/e/c;
+    invoke-virtual {p1}, Lcom/facebook/imagepipeline/g/e;->jr()Lcom/facebook/e/c;
 
     move-result-object v0
 
-    sget-object v1, Lcom/facebook/e/c;->Ra:Lcom/facebook/e/c;
+    sget-object v1, Lcom/facebook/e/c;->Rj:Lcom/facebook/e/c;
 
     if-ne v0, v1, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->VU:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/g/e;->Wd: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/i/r$a;->Ym:Z
+    iget-boolean v2, p0, Lcom/facebook/imagepipeline/i/r$a;->Yv:Z
 
     if-eqz v2, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/r$a;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/r$a;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/r$a;->Yl:Lcom/facebook/cache/common/CacheKey;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/r$a;->Yu: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/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     const/high16 v1, 0x3f800000    # 1.0f
 
     invoke-interface {p1, v1}, Lcom/facebook/imagepipeline/i/k;->o(F)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {p1, v0, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_5
@@ -171,7 +171,7 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -198,33 +198,33 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_3
     :goto_0
     :try_start_8
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yg:Lcom/facebook/imagepipeline/i/k;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/n;->Yp:Lcom/facebook/imagepipeline/i/k;
 
     invoke-interface {v0, p1, p2}, Lcom/facebook/imagepipeline/i/k;->b(Ljava/lang/Object;I)V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_3
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :catchall_3
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/r.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/r.smali
index 927e069dc4..fb0d1d005e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/r.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/r.smali
@@ -24,7 +24,7 @@
 
 
 # instance fields
-.field private final JW:Lcom/facebook/imagepipeline/cache/o;
+.field private final Kf: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 TY:Lcom/facebook/imagepipeline/cache/f;
+.field private final Uh:Lcom/facebook/imagepipeline/cache/f;
 
-.field private final XF:Lcom/facebook/imagepipeline/i/aj;
+.field private final XO:Lcom/facebook/imagepipeline/i/aj;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/i/aj<",
@@ -67,11 +67,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/r;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/r;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/r;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/r;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     return-void
 .end method
@@ -94,31 +94,31 @@
     const-string v0, "EncodedMemoryCacheProducer"
 
     :try_start_0
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->getId()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jY()Lcom/facebook/imagepipeline/i/am;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kb()Lcom/facebook/imagepipeline/i/am;
 
     move-result-object v2
 
     invoke-interface {v2, v1, v0}, Lcom/facebook/imagepipeline/i/am;->y(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/facebook/imagepipeline/i/r;->TY:Lcom/facebook/imagepipeline/cache/f;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/r;->Uh:Lcom/facebook/imagepipeline/cache/f;
 
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hk()Ljava/lang/Object;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->hn()Ljava/lang/Object;
 
     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/i/r;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v4, p0, Lcom/facebook/imagepipeline/i/r;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-interface {v4, v3}, Lcom/facebook/imagepipeline/cache/o;->D(Ljava/lang/Object;)Lcom/facebook/common/references/CloseableReference;
 
@@ -177,7 +177,7 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -190,13 +190,13 @@
     throw p1
 
     :cond_1
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jZ()Lcom/facebook/imagepipeline/request/b$b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->kc()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;->aaj:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v9, Lcom/facebook/imagepipeline/request/b$b;->aas:Lcom/facebook/imagepipeline/request/b$b;
 
     iget v9, v9, Lcom/facebook/imagepipeline/request/b$b;->mValue:I
     :try_end_5
@@ -238,21 +238,21 @@
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
     :cond_3
     :try_start_8
-    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {p2}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v5
 
-    iget-boolean v5, v5, Lcom/facebook/imagepipeline/request/b;->Ym:Z
+    iget-boolean v5, v5, Lcom/facebook/imagepipeline/request/b;->Yv:Z
 
     new-instance v8, Lcom/facebook/imagepipeline/i/r$a;
 
-    iget-object v9, p0, Lcom/facebook/imagepipeline/i/r;->JW:Lcom/facebook/imagepipeline/cache/o;
+    iget-object v9, p0, Lcom/facebook/imagepipeline/i/r;->Kf:Lcom/facebook/imagepipeline/cache/o;
 
     invoke-direct {v8, p1, v9, v3, v5}, Lcom/facebook/imagepipeline/i/r$a;-><init>(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/cache/o;Lcom/facebook/cache/common/CacheKey;Z)V
 
@@ -269,7 +269,7 @@
     :cond_4
     invoke-interface {v2, v1, v0, v7}, Lcom/facebook/imagepipeline/i/am;->a(Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/i/r;->XF:Lcom/facebook/imagepipeline/i/aj;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/r;->XO:Lcom/facebook/imagepipeline/i/aj;
 
     invoke-interface {p1, v8, p2}, Lcom/facebook/imagepipeline/i/aj;->a(Lcom/facebook/imagepipeline/i/k;Lcom/facebook/imagepipeline/i/ak;)V
     :try_end_8
@@ -280,7 +280,7 @@
     :try_end_9
     .catchall {:try_start_9 .. :try_end_9} :catchall_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 
@@ -297,7 +297,7 @@
     :catchall_2
     move-exception p1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     throw p1
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$1.smali
index d9b83f70f5..ed176860dd 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$1.smali
@@ -18,22 +18,22 @@
 
 
 # instance fields
-.field final synthetic Yr:Lcom/facebook/imagepipeline/i/t$a;
+.field final synthetic YA:Lcom/facebook/imagepipeline/i/t$a;
 
-.field final synthetic Ys:Lcom/facebook/imagepipeline/i/af$a;
+.field final synthetic YB:Lcom/facebook/imagepipeline/i/af$a;
 
-.field final synthetic Yt:Lcom/facebook/imagepipeline/i/t;
+.field final synthetic YC:Lcom/facebook/imagepipeline/i/t;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/t;Lcom/facebook/imagepipeline/i/t$a;Lcom/facebook/imagepipeline/i/af$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t$1;->Yt:Lcom/facebook/imagepipeline/i/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t$1;->YC:Lcom/facebook/imagepipeline/i/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$1;->Yr:Lcom/facebook/imagepipeline/i/t$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$1;->YA:Lcom/facebook/imagepipeline/i/t$a;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$1;->Ys:Lcom/facebook/imagepipeline/i/af$a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$1;->YB:Lcom/facebook/imagepipeline/i/af$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,22 +45,22 @@
 .method public final run()V
     .locals 13
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$1;->Yt:Lcom/facebook/imagepipeline/i/t;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$1;->YC:Lcom/facebook/imagepipeline/i/t;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/t$1;->Yr:Lcom/facebook/imagepipeline/i/t$a;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/t$1;->YA:Lcom/facebook/imagepipeline/i/t$a;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/i/t$1;->Ys:Lcom/facebook/imagepipeline/i/af$a;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/i/t$1;->YB:Lcom/facebook/imagepipeline/i/af$a;
 
     const/4 v3, 0x0
 
     :try_start_0
-    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iget-object v4, v1, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
-    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->jX()Lcom/facebook/imagepipeline/request/b;
+    invoke-interface {v4}, Lcom/facebook/imagepipeline/i/ak;->ka()Lcom/facebook/imagepipeline/request/b;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object v4, v4, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     const/4 v5, 0x5
 
@@ -75,7 +75,7 @@
 
     check-cast v6, Ljava/net/HttpURLConnection;
 
-    iget v7, v0, Lcom/facebook/imagepipeline/i/t;->UD:I
+    iget v7, v0, Lcom/facebook/imagepipeline/i/t;->UM:I
 
     invoke-virtual {v6, v7}, Ljava/net/HttpURLConnection;->setConnectTimeout(I)V
 
@@ -109,13 +109,13 @@
     if-eqz v8, :cond_3
 
     :try_start_1
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/t;->KI:Lcom/facebook/common/time/b;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/t;->KR:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v4
 
-    iput-wide v4, v1, Lcom/facebook/imagepipeline/i/t$a;->Yw:J
+    iput-wide v4, v1, Lcom/facebook/imagepipeline/i/t$a;->YF:J
 
     if-eqz v6, :cond_1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$2.smali
index 588ea5e765..7e91e276b1 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$2.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic Ys:Lcom/facebook/imagepipeline/i/af$a;
+.field final synthetic YB:Lcom/facebook/imagepipeline/i/af$a;
 
-.field final synthetic Yt:Lcom/facebook/imagepipeline/i/t;
+.field final synthetic YC:Lcom/facebook/imagepipeline/i/t;
 
-.field final synthetic Yu:Ljava/util/concurrent/Future;
+.field final synthetic YD:Ljava/util/concurrent/Future;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/t;Ljava/util/concurrent/Future;Lcom/facebook/imagepipeline/i/af$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t$2;->Yt:Lcom/facebook/imagepipeline/i/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t$2;->YC:Lcom/facebook/imagepipeline/i/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$2;->Yu:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/t$2;->YD:Ljava/util/concurrent/Future;
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$2;->Ys:Lcom/facebook/imagepipeline/i/af$a;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/t$2;->YB:Lcom/facebook/imagepipeline/i/af$a;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->Yu:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->YD:Ljava/util/concurrent/Future;
 
     const/4 v1, 0x0
 
@@ -52,9 +52,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->Ys:Lcom/facebook/imagepipeline/i/af$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t$2;->YB:Lcom/facebook/imagepipeline/i/af$a;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/af$a;->gd()V
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/i/af$a;->gg()V
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$a.smali
index 102964629c..ec93a9315e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field Yv:J
+.field YE:J
 
-.field Yw:J
+.field YF:J
 
-.field Yx:J
+.field YG:J
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t.smali
index 65df3ff0c0..860745bbaa 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/t.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/t.smali
@@ -20,11 +20,11 @@
 
 
 # instance fields
-.field final KI:Lcom/facebook/common/time/b;
+.field final KR:Lcom/facebook/common/time/b;
 
-.field private final PR:Ljava/util/concurrent/ExecutorService;
+.field private final Qb:Ljava/util/concurrent/ExecutorService;
 
-.field UD:I
+.field UM:I
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/i/t;-><init>(Lcom/facebook/common/time/b;)V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/t;->UD:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/t;->UM:I
 
     return-void
 .end method
@@ -65,9 +65,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/i/t;->PR:Ljava/util/concurrent/ExecutorService;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/i/t;->Qb:Ljava/util/concurrent/ExecutorService;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t;->KI:Lcom/facebook/common/time/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/t;->KR:Lcom/facebook/common/time/b;
 
     return-void
 .end method
@@ -99,9 +99,9 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashMap;-><init>(I)V
 
-    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->Yw:J
+    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->YF:J
 
-    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->Yv:J
+    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YE:J
 
     sub-long/2addr v1, v3
 
@@ -113,9 +113,9 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->Yx:J
+    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->YG:J
 
-    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->Yw:J
+    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YF:J
 
     sub-long/2addr v1, v3
 
@@ -127,9 +127,9 @@
 
     invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->Yx:J
+    iget-wide v1, p1, Lcom/facebook/imagepipeline/i/t$a;->YG:J
 
-    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->Yv:J
+    iget-wide v3, p1, Lcom/facebook/imagepipeline/i/t$a;->YE:J
 
     sub-long/2addr v1, v3
 
@@ -157,13 +157,13 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/t$a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->KI:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->KR:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iput-wide v0, p1, Lcom/facebook/imagepipeline/i/t$a;->Yx:J
+    iput-wide v0, p1, Lcom/facebook/imagepipeline/i/t$a;->YG:J
 
     return-void
 .end method
@@ -173,15 +173,15 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/i/t$a;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->KI:Lcom/facebook/common/time/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->KR:Lcom/facebook/common/time/b;
 
     invoke-interface {v0}, Lcom/facebook/common/time/b;->now()J
 
     move-result-wide v0
 
-    iput-wide v0, p1, Lcom/facebook/imagepipeline/i/t$a;->Yv:J
+    iput-wide v0, p1, Lcom/facebook/imagepipeline/i/t$a;->YE:J
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->PR:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/t;->Qb:Ljava/util/concurrent/ExecutorService;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/t$1;
 
@@ -191,7 +191,7 @@
 
     move-result-object v0
 
-    iget-object p1, p1, Lcom/facebook/imagepipeline/i/s;->Yn:Lcom/facebook/imagepipeline/i/ak;
+    iget-object p1, p1, Lcom/facebook/imagepipeline/i/s;->Yw:Lcom/facebook/imagepipeline/i/ak;
 
     new-instance v1, Lcom/facebook/imagepipeline/i/t$2;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$1.smali
index 8ba45ef80c..38f2e00fab 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$1.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic YG:Lcom/facebook/imagepipeline/i/u;
+.field final synthetic YP:Lcom/facebook/imagepipeline/i/u;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/u;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u$1;->YG:Lcom/facebook/imagepipeline/i/u;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u$1;->YP:Lcom/facebook/imagepipeline/i/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/i/u$1;->YG:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/u$1;->YP:Lcom/facebook/imagepipeline/i/u;
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
 
@@ -48,7 +48,7 @@
     :try_start_0
     iget-object v3, v0, Lcom/facebook/imagepipeline/i/u;->mEncodedImage:Lcom/facebook/imagepipeline/g/e;
 
-    iget v4, v0, Lcom/facebook/imagepipeline/i/u;->YC:I
+    iget v4, v0, Lcom/facebook/imagepipeline/i/u;->YL:I
 
     const/4 v5, 0x0
 
@@ -56,13 +56,13 @@
 
     const/4 v5, 0x0
 
-    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YC:I
+    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YL:I
 
-    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YL:I
+    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YU:I
 
-    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iput v5, v0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
-    iput-wide v1, v0, Lcom/facebook/imagepipeline/i/u;->YF:J
+    iput-wide v1, v0, Lcom/facebook/imagepipeline/i/u;->YO:J
 
     monitor-exit v0
     :try_end_0
@@ -75,7 +75,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/facebook/imagepipeline/i/u;->Yy:Lcom/facebook/imagepipeline/i/u$a;
+    iget-object v1, v0, Lcom/facebook/imagepipeline/i/u;->YH:Lcom/facebook/imagepipeline/i/u$a;
 
     invoke-interface {v1, v3, v4}, Lcom/facebook/imagepipeline/i/u$a;->b(Lcom/facebook/imagepipeline/g/e;I)V
     :try_end_1
@@ -84,7 +84,7 @@
     :cond_0
     invoke-static {v3}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->km()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kp()V
 
     return-void
 
@@ -93,7 +93,7 @@
 
     invoke-static {v3}, Lcom/facebook/imagepipeline/g/e;->e(Lcom/facebook/imagepipeline/g/e;)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->km()V
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/u;->kp()V
 
     throw v1
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$2.smali
index 82b13b801d..2dad0728a4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$2.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic YG:Lcom/facebook/imagepipeline/i/u;
+.field final synthetic YP:Lcom/facebook/imagepipeline/i/u;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/u;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u$2;->YG:Lcom/facebook/imagepipeline/i/u;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u$2;->YP:Lcom/facebook/imagepipeline/i/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/i/u$2;->YG:Lcom/facebook/imagepipeline/i/u;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/u$2;->YP:Lcom/facebook/imagepipeline/i/u;
 
     iget-object v1, v0, Lcom/facebook/imagepipeline/i/u;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/i/u;->Yz:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/i/u;->YI: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/i/u$3.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$3.smali
index a78c6de4c4..453809b925 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$3.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$3.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field static final synthetic YH:[I
+.field static final synthetic YQ:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/u$c;->kp()[I
+    invoke-static {}, Lcom/facebook/imagepipeline/i/u$c;->ks()[I
 
     move-result-object v0
 
@@ -30,14 +30,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/u$3;->YH:[I
+    sput-object v0, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YH:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YJ:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YS:I
 
     sub-int/2addr v2, v0
 
@@ -47,9 +47,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YH:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YK:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YT:I
 
     sub-int/2addr v2, v0
 
@@ -61,9 +61,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YH:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YL:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YU:I
 
     sub-int/2addr v2, v0
 
@@ -75,9 +75,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YH:[I
+    sget-object v1, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YM:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YV:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$b.smali
index 3cc86ce9c0..8d64d1dd37 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$b.smali
@@ -15,14 +15,14 @@
 
 
 # static fields
-.field private static YI:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static YR:Ljava/util/concurrent/ScheduledExecutorService;
 
 
 # direct methods
-.method static ko()Ljava/util/concurrent/ScheduledExecutorService;
+.method static kr()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YI:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YR:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez v0, :cond_0
 
@@ -30,10 +30,10 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/u$b;->YI:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lcom/facebook/imagepipeline/i/u$b;->YR:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YI:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/facebook/imagepipeline/i/u$b;->YR:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$c.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$c.smali
index f86d53fe46..b06d933708 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$c.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u$c.smali
@@ -23,15 +23,15 @@
 
 
 # static fields
-.field public static final YJ:I = 0x1
+.field public static final YS:I = 0x1
 
-.field public static final YK:I = 0x2
+.field public static final YT:I = 0x2
 
-.field public static final YL:I = 0x3
+.field public static final YU:I = 0x3
 
-.field public static final YM:I = 0x4
+.field public static final YV:I = 0x4
 
-.field private static final synthetic YN:[I
+.field private static final synthetic YW:[I
 
 
 # direct methods
@@ -42,39 +42,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YJ:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YS:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YK:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YT:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YL:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YU:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YM:I
+    sget v1, Lcom/facebook/imagepipeline/i/u$c;->YV:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/i/u$c;->YN:[I
+    sput-object v0, Lcom/facebook/imagepipeline/i/u$c;->YW:[I
 
     return-void
 .end method
 
-.method public static kp()[I
+.method public static ks()[I
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/i/u$c;->YN:[I
+    sget-object v0, Lcom/facebook/imagepipeline/i/u$c;->YW:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u.smali
index 03c242789b..ed620ee2d5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/u.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/u.smali
@@ -14,21 +14,21 @@
 
 
 # instance fields
-.field private final YA:Ljava/lang/Runnable;
+.field final YH:Lcom/facebook/imagepipeline/i/u$a;
 
-.field private final YB:I
+.field final YI:Ljava/lang/Runnable;
 
-.field YC:I
+.field private final YJ:Ljava/lang/Runnable;
 
-.field YD:I
+.field private final YK:I
 
-.field YE:J
+.field YL:I
 
-.field YF:J
+.field YM:I
 
-.field final Yy:Lcom/facebook/imagepipeline/i/u$a;
+.field YN:J
 
-.field final Yz:Ljava/lang/Runnable;
+.field YO:J
 
 .field mEncodedImage:Lcom/facebook/imagepipeline/g/e;
 
@@ -43,21 +43,21 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->mExecutor:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/u;->Yy:Lcom/facebook/imagepipeline/i/u$a;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/u;->YH:Lcom/facebook/imagepipeline/i/u$a;
 
-    iput p3, p0, Lcom/facebook/imagepipeline/i/u;->YB:I
+    iput p3, p0, Lcom/facebook/imagepipeline/i/u;->YK:I
 
     new-instance p1, Lcom/facebook/imagepipeline/i/u$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/i/u$1;-><init>(Lcom/facebook/imagepipeline/i/u;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->Yz:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YI:Ljava/lang/Runnable;
 
     new-instance p1, Lcom/facebook/imagepipeline/i/u$2;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/i/u$2;-><init>(Lcom/facebook/imagepipeline/i/u;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YA:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YJ:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
@@ -65,17 +65,17 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YC:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YL:I
 
-    sget p1, Lcom/facebook/imagepipeline/i/u$c;->YJ:I
+    sget p1, Lcom/facebook/imagepipeline/i/u$c;->YS:I
 
-    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iput p1, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YE:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
 
-    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YF:J
+    iput-wide p1, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
 
     return-void
 .end method
@@ -126,11 +126,11 @@
 
     if-lez v2, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/i/u$b;->ko()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lcom/facebook/imagepipeline/i/u$b;->kr()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/u;->YA:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/u;->YJ: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/i/u;->YA:Ljava/lang/Runnable;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/i/u;->YJ:Ljava/lang/Runnable;
 
     invoke-interface {p1}, Ljava/lang/Runnable;->run()V
 
@@ -173,7 +173,7 @@
 
     iput-object p1, p0, Lcom/facebook/imagepipeline/i/u;->mEncodedImage:Lcom/facebook/imagepipeline/g/e;
 
-    iput p2, p0, Lcom/facebook/imagepipeline/i/u;->YC:I
+    iput p2, p0, Lcom/facebook/imagepipeline/i/u;->YL:I
 
     monitor-exit p0
     :try_end_0
@@ -196,7 +196,7 @@
     throw p1
 .end method
 
-.method public final kk()V
+.method public final kn()V
     .locals 2
 
     monitor-enter p0
@@ -210,7 +210,7 @@
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/i/u;->YC:I
+    iput v1, p0, Lcom/facebook/imagepipeline/i/u;->YL:I
 
     monitor-exit p0
     :try_end_0
@@ -231,7 +231,7 @@
     throw v0
 .end method
 
-.method public final kl()Z
+.method public final ko()Z
     .locals 8
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -243,7 +243,7 @@
     :try_start_0
     iget-object v2, p0, Lcom/facebook/imagepipeline/i/u;->mEncodedImage:Lcom/facebook/imagepipeline/g/e;
 
-    iget v3, p0, Lcom/facebook/imagepipeline/i/u;->YC:I
+    iget v3, p0, Lcom/facebook/imagepipeline/i/u;->YL:I
 
     invoke-static {v2, v3}, Lcom/facebook/imagepipeline/i/u;->d(Lcom/facebook/imagepipeline/g/e;I)Z
 
@@ -258,9 +258,9 @@
     return v3
 
     :cond_0
-    sget-object v2, Lcom/facebook/imagepipeline/i/u$3;->YH:[I
+    sget-object v2, Lcom/facebook/imagepipeline/i/u$3;->YQ:[I
 
-    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
     const/4 v5, 0x1
 
@@ -281,9 +281,9 @@
     goto :goto_0
 
     :cond_1
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YM:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YV:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
     :cond_2
     :goto_0
@@ -292,9 +292,9 @@
     goto :goto_1
 
     :cond_3
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YF:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
 
-    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YB:I
+    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YK:I
 
     int-to-long v6, v4
 
@@ -304,11 +304,11 @@
 
     move-result-wide v6
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YE:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
 
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YK:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YT:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
     const/4 v3, 0x1
 
@@ -337,7 +337,7 @@
     throw v0
 .end method
 
-.method final km()V
+.method final kp()V
     .locals 6
 
     invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
@@ -347,15 +347,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget v2, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iget v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
-    sget v3, Lcom/facebook/imagepipeline/i/u$c;->YM:I
+    sget v3, Lcom/facebook/imagepipeline/i/u$c;->YV:I
 
     if-ne v2, v3, :cond_0
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YF:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
 
-    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YB:I
+    iget v4, p0, Lcom/facebook/imagepipeline/i/u;->YK:I
 
     int-to-long v4, v4
 
@@ -367,18 +367,18 @@
 
     const/4 v4, 0x1
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YE:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
 
-    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YK:I
+    sget v5, Lcom/facebook/imagepipeline/i/u$c;->YT:I
 
-    iput v5, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iput v5, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
     goto :goto_0
 
     :cond_0
-    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YJ:I
+    sget v2, Lcom/facebook/imagepipeline/i/u$c;->YS:I
 
-    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YD:I
+    iput v2, p0, Lcom/facebook/imagepipeline/i/u;->YM:I
 
     const-wide/16 v2, 0x0
 
@@ -409,15 +409,15 @@
     throw v0
 .end method
 
-.method public final declared-synchronized kn()J
+.method public final declared-synchronized kq()J
     .locals 4
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YF:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/i/u;->YO:J
 
-    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YE:J
+    iget-wide v2, p0, Lcom/facebook/imagepipeline/i/u;->YN:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/v.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/v.smali
index ee8d104d8d..a3621df799 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/v.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/v.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final Vm:Landroid/content/res/AssetManager;
+.field private final Vv:Landroid/content/res/AssetManager;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/imagepipeline/i/z;-><init>(Ljava/util/concurrent/Executor;Lcom/facebook/common/g/g;)V
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/i/v;->Vm:Landroid/content/res/AssetManager;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/i/v;->Vv:Landroid/content/res/AssetManager;
 
     return-void
 .end method
@@ -24,7 +24,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/facebook/imagepipeline/i/v;->Vm:Landroid/content/res/AssetManager;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/i/v;->Vv:Landroid/content/res/AssetManager;
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/i/v;->e(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
 
@@ -86,7 +86,7 @@
 .method private static e(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
     .locals 1
 
-    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->ZW:Landroid/net/Uri;
+    iget-object p0, p0, Lcom/facebook/imagepipeline/request/b;->aaf:Landroid/net/Uri;
 
     invoke-virtual {p0}, Landroid/net/Uri;->getPath()Ljava/lang/String;
 
@@ -111,7 +111,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/v;->Vm:Landroid/content/res/AssetManager;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/v;->Vv:Landroid/content/res/AssetManager;
 
     invoke-static {p1}, Lcom/facebook/imagepipeline/i/v;->e(Lcom/facebook/imagepipeline/request/b;)Ljava/lang/String;
 
@@ -134,7 +134,7 @@
     return-object p1
 .end method
 
-.method protected final ki()Ljava/lang/String;
+.method protected final kl()Ljava/lang/String;
     .locals 1
 
     const-string v0, "LocalAssetFetchProducer"
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/y$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/y$2.smali
index 8a190a4d6a..6fef5ec7f2 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/y$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/y$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic YT:Lcom/facebook/imagepipeline/i/y;
+.field final synthetic Zc:Lcom/facebook/imagepipeline/i/y;
 
-.field final synthetic YU:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic Zd:Lcom/facebook/imagepipeline/i/aq;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/y;Lcom/facebook/imagepipeline/i/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/y$2;->YT:Lcom/facebook/imagepipeline/i/y;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/y$2;->Zc:Lcom/facebook/imagepipeline/i/y;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y$2;->YU:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/y$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y$2;->YU:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/y$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aq;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/i/z$2.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/i/z$2.smali
index a310b4876e..0316d18ce5 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/i/z$2.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/i/z$2.smali
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic YU:Lcom/facebook/imagepipeline/i/aq;
+.field final synthetic Zd:Lcom/facebook/imagepipeline/i/aq;
 
-.field final synthetic YV:Lcom/facebook/imagepipeline/i/z;
+.field final synthetic Ze:Lcom/facebook/imagepipeline/i/z;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/i/z;Lcom/facebook/imagepipeline/i/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/i/z$2;->YV:Lcom/facebook/imagepipeline/i/z;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/i/z$2;->Ze:Lcom/facebook/imagepipeline/i/z;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z$2;->YU:Lcom/facebook/imagepipeline/i/aq;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/i/z$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/i/e;-><init>()V
 
@@ -35,10 +35,10 @@
 
 
 # virtual methods
-.method public final ke()V
+.method public final kh()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$2;->YU:Lcom/facebook/imagepipeline/i/aq;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/i/z$2;->Zd:Lcom/facebook/imagepipeline/i/aq;
 
     invoke-virtual {v0}, Lcom/facebook/imagepipeline/i/aq;->cancel()V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/k/b.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/k/b.smali
index 4b9056e91f..bcbce02030 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/k/b.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/k/b.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final aap:I
+.field public final aay:I
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/k/b;->aap:I
+    iput p1, p0, Lcom/facebook/imagepipeline/k/b;->aay:I
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/facebook/imagepipeline/k/b;->aap:I
+    iget v1, p0, Lcom/facebook/imagepipeline/k/b;->aay:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/k/h.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/k/h.smali
index ce3f45cb5a..995e7a749e 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/k/h.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/k/h.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final UQ:I
+.field private final UZ:I
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/facebook/imagepipeline/k/h;->UQ:I
+    iput p1, p0, Lcom/facebook/imagepipeline/k/h;->UZ:I
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 
     new-instance p1, Lcom/facebook/imagepipeline/k/g;
 
-    iget v0, p0, Lcom/facebook/imagepipeline/k/h;->UQ:I
+    iget v0, p0, Lcom/facebook/imagepipeline/k/h;->UZ:I
 
     invoke-direct {p1, p2, v0}, Lcom/facebook/imagepipeline/k/g;-><init>(ZI)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/l/a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/l/a.smali
index 082013b1f2..d3214d51e0 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/l/a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/l/a.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract kH()Z
+.method public abstract kK()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 ff1f07a2bf..d2bac5e76f 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 Wm:I
+.field Wv: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;->Wm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     add-int/2addr v0, p1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 .method public final an(I)V
     .locals 3
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     const/4 v1, 0x1
 
@@ -68,7 +68,7 @@
 
     sub-int/2addr v0, p1
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     return-void
 
@@ -85,7 +85,7 @@
 
     aput-object p1, v0, v2
 
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wm:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/a$a;->Wv:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/aa.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/aa.smali
index d793791250..1aa90aeff2 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/aa.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/aa.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field private WW:Ljava/util/LinkedList;
+.field private Xf: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/aa;->WW:Ljava/util/LinkedList;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/aa;->Xf:Ljava/util/LinkedList;
 
     return-void
 .end method
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->WW:Ljava/util/LinkedList;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->Xf:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->poll()Ljava/lang/Object;
 
@@ -73,28 +73,28 @@
 
     invoke-direct {v1, p1}, Ljava/lang/ref/SoftReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v1, v0, Lcom/facebook/common/references/a;->Iw:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->IF: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;->Ix:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->IG: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;->Iy:Ljava/lang/ref/SoftReference;
+    iput-object v1, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/aa;->Ww:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/aa;->WF:Ljava/util/Queue;
 
     invoke-interface {p1, v0}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
     return-void
 .end method
 
-.method public final jG()Ljava/lang/Object;
+.method public final jJ()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -102,7 +102,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->Ww:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/aa;->WF: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;->Iw:Ljava/lang/ref/SoftReference;
+    iget-object v1, v0, Lcom/facebook/common/references/a;->IF: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;->Iw:Ljava/lang/ref/SoftReference;
+    iget-object v1, v0, Lcom/facebook/common/references/a;->IF: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;->Iw:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IF:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Iw:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IF:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->Iw:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->IF:Ljava/lang/ref/SoftReference;
 
     :cond_1
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Ix:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Ix:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->Ix:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->IG:Ljava/lang/ref/SoftReference;
 
     :cond_2
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Iy:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v0, Lcom/facebook/common/references/a;->Iy:Ljava/lang/ref/SoftReference;
+    iget-object v3, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
 
     invoke-virtual {v3}, Ljava/lang/ref/SoftReference;->clear()V
 
-    iput-object v2, v0, Lcom/facebook/common/references/a;->Iy:Ljava/lang/ref/SoftReference;
+    iput-object v2, v0, Lcom/facebook/common/references/a;->IH:Ljava/lang/ref/SoftReference;
 
     :cond_3
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/aa;->WW:Ljava/util/LinkedList;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/aa;->Xf: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/memory/ac$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac$a.smali
index 091a5a6671..3c82b42be4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac$a.smali
@@ -15,29 +15,29 @@
 
 
 # instance fields
-.field Uo:Lcom/facebook/common/g/b;
+.field Ux:Lcom/facebook/common/g/b;
 
-.field WX:Lcom/facebook/imagepipeline/memory/ae;
+.field Xg:Lcom/facebook/imagepipeline/memory/ae;
 
-.field WY:Lcom/facebook/imagepipeline/memory/af;
+.field Xh:Lcom/facebook/imagepipeline/memory/af;
 
-.field WZ:Lcom/facebook/imagepipeline/memory/ae;
+.field Xi:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xa:Lcom/facebook/imagepipeline/memory/ae;
+.field Xj:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xb:Lcom/facebook/imagepipeline/memory/af;
+.field Xk:Lcom/facebook/imagepipeline/memory/af;
 
-.field Xc:Lcom/facebook/imagepipeline/memory/ae;
+.field Xl:Lcom/facebook/imagepipeline/memory/ae;
 
-.field Xd:Lcom/facebook/imagepipeline/memory/af;
+.field Xm:Lcom/facebook/imagepipeline/memory/af;
 
-.field Xe:Ljava/lang/String;
+.field Xn:Ljava/lang/String;
 
-.field Xf:I
+.field Xo:I
 
-.field Xg:I
+.field Xp:I
 
-.field Xh:Z
+.field Xq:Z
 
 
 # direct methods
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 1bcbf5b80d..b552626181 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ac.smali
@@ -12,29 +12,29 @@
 
 
 # instance fields
-.field final Uo:Lcom/facebook/common/g/b;
+.field final Ux:Lcom/facebook/common/g/b;
 
-.field final WX:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xg:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final WY:Lcom/facebook/imagepipeline/memory/af;
+.field final Xh:Lcom/facebook/imagepipeline/memory/af;
 
-.field final WZ:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xi:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xa:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xj:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xb:Lcom/facebook/imagepipeline/memory/af;
+.field final Xk:Lcom/facebook/imagepipeline/memory/af;
 
-.field final Xc:Lcom/facebook/imagepipeline/memory/ae;
+.field final Xl:Lcom/facebook/imagepipeline/memory/ae;
 
-.field final Xd:Lcom/facebook/imagepipeline/memory/af;
+.field final Xm:Lcom/facebook/imagepipeline/memory/af;
 
-.field final Xe:Ljava/lang/String;
+.field final Xn:Ljava/lang/String;
 
-.field final Xf:I
+.field final Xo:I
 
-.field final Xg:I
+.field final Xp:I
 
-.field final Xh:Z
+.field final Xq:Z
 
 
 # direct methods
@@ -43,73 +43,73 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->WX:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jK()Lcom/facebook/imagepipeline/memory/ae;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jN()Lcom/facebook/imagepipeline/memory/ae;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->WX:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_0
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->WX:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xg:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->WY:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh:Lcom/facebook/imagepipeline/memory/af;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jM()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->WY:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh:Lcom/facebook/imagepipeline/memory/af;
 
     :goto_1
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->WY:Lcom/facebook/imagepipeline/memory/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/af;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->WZ:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xi:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->jK()Lcom/facebook/imagepipeline/memory/ae;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/l;->jN()Lcom/facebook/imagepipeline/memory/ae;
 
     move-result-object v0
 
     goto :goto_2
 
     :cond_2
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->WZ:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xi:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_2
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->WZ:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Uo:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Ux:Lcom/facebook/common/g/b;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/facebook/common/g/c;->gi()Lcom/facebook/common/g/c;
+    invoke-static {}, Lcom/facebook/common/g/c;->gl()Lcom/facebook/common/g/c;
 
     move-result-object v0
 
     goto :goto_3
 
     :cond_3
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Uo:Lcom/facebook/common/g/b;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Ux:Lcom/facebook/common/g/b;
 
     :goto_3
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xa:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xj:Lcom/facebook/imagepipeline/memory/ae;
 
     const/high16 v1, 0x100000
 
@@ -235,28 +235,28 @@
     goto :goto_6
 
     :cond_7
-    iget-object v4, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xa:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v4, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xj:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_6
-    iput-object v4, p0, Lcom/facebook/imagepipeline/memory/ac;->Xa:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v4, p0, Lcom/facebook/imagepipeline/memory/ac;->Xj:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xb:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xk:Lcom/facebook/imagepipeline/memory/af;
 
     if-nez v0, :cond_8
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jM()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v0
 
     goto :goto_7
 
     :cond_8
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xb:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xk:Lcom/facebook/imagepipeline/memory/af;
 
     :goto_7
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xb:Lcom/facebook/imagepipeline/memory/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xk:Lcom/facebook/imagepipeline/memory/af;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xc:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xl:Lcom/facebook/imagepipeline/memory/ae;
 
     if-nez v0, :cond_9
 
@@ -275,28 +275,28 @@
     goto :goto_8
 
     :cond_9
-    iget-object v2, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xc:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xl:Lcom/facebook/imagepipeline/memory/ae;
 
     :goto_8
-    iput-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->Xc:Lcom/facebook/imagepipeline/memory/ae;
+    iput-object v2, p0, Lcom/facebook/imagepipeline/memory/ac;->Xl:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xd:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xm:Lcom/facebook/imagepipeline/memory/af;
 
     if-nez v0, :cond_a
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jM()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v0
 
     goto :goto_9
 
     :cond_a
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xd:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xm:Lcom/facebook/imagepipeline/memory/af;
 
     :goto_9
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xd:Lcom/facebook/imagepipeline/memory/af;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xm:Lcom/facebook/imagepipeline/memory/af;
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xe:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xn: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/ac$a;->Xe:Ljava/lang/String;
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xn:Ljava/lang/String;
 
     :goto_a
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xe:Ljava/lang/String;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xn:Ljava/lang/String;
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xf:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xo:I
 
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xf:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xo:I
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xp:I
 
     if-lez v0, :cond_c
 
-    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xg:I
+    iget v0, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xp:I
 
     goto :goto_b
 
@@ -326,13 +326,13 @@
     const/high16 v0, 0x400000
 
     :goto_b
-    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xg:I
+    iput v0, p0, Lcom/facebook/imagepipeline/memory/ac;->Xp:I
 
-    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xh:Z
+    iget-boolean p1, p1, Lcom/facebook/imagepipeline/memory/ac$a;->Xq:Z
 
-    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/ac;->Xh:Z
+    iput-boolean p1, p0, Lcom/facebook/imagepipeline/memory/ac;->Xq:Z
 
-    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kF()Z
+    invoke-static {}, Lcom/facebook/imagepipeline/j/b;->kI()Z
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ad.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ad.smali
index 37a2b28cc8..4551ab4811 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ad.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/ad.smali
@@ -4,21 +4,21 @@
 
 
 # instance fields
-.field private RY:Lcom/facebook/imagepipeline/memory/d;
+.field private SB:Lcom/facebook/common/g/j;
 
-.field private Sc:Lcom/facebook/common/g/g;
+.field private Sh:Lcom/facebook/imagepipeline/memory/d;
 
-.field private Se:Lcom/facebook/imagepipeline/memory/o;
+.field private Sl:Lcom/facebook/common/g/g;
 
-.field private Ss:Lcom/facebook/common/g/j;
+.field private Sn:Lcom/facebook/imagepipeline/memory/o;
 
-.field private final Xi:Lcom/facebook/imagepipeline/memory/ac;
+.field private final Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-.field private Xj:Lcom/facebook/imagepipeline/memory/j;
+.field private Xs:Lcom/facebook/imagepipeline/memory/j;
 
-.field private Xk:Lcom/facebook/imagepipeline/memory/y;
+.field private Xt:Lcom/facebook/imagepipeline/memory/y;
 
-.field private Xl:Lcom/facebook/common/g/a;
+.field private Xu:Lcom/facebook/common/g/a;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/memory/ac;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
     return-void
 .end method
@@ -47,7 +47,7 @@
 
     if-ne p1, v0, :cond_0
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ad;->jO()Lcom/facebook/imagepipeline/memory/j;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ad;->jR()Lcom/facebook/imagepipeline/memory/j;
 
     move-result-object p1
 
@@ -63,71 +63,71 @@
     throw p1
 
     :cond_1
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ad;->jR()Lcom/facebook/imagepipeline/memory/y;
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/ad;->jU()Lcom/facebook/imagepipeline/memory/y;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method private jO()Lcom/facebook/imagepipeline/memory/j;
+.method private jR()Lcom/facebook/imagepipeline/memory/j;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xj:Lcom/facebook/imagepipeline/memory/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xs: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/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xa:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xj:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xb:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xk:Lcom/facebook/imagepipeline/memory/af;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/j;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xj:Lcom/facebook/imagepipeline/memory/j;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xs:Lcom/facebook/imagepipeline/memory/j;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xj:Lcom/facebook/imagepipeline/memory/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xs:Lcom/facebook/imagepipeline/memory/j;
 
     return-object v0
 .end method
 
-.method private jR()Lcom/facebook/imagepipeline/memory/y;
+.method private jU()Lcom/facebook/imagepipeline/memory/y;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xk:Lcom/facebook/imagepipeline/memory/y;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xt:Lcom/facebook/imagepipeline/memory/y;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/y;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xa:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xj:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xb:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xk:Lcom/facebook/imagepipeline/memory/af;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/y;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xk:Lcom/facebook/imagepipeline/memory/y;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xt:Lcom/facebook/imagepipeline/memory/y;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xk:Lcom/facebook/imagepipeline/memory/y;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xt:Lcom/facebook/imagepipeline/memory/y;
 
     return-object v0
 .end method
@@ -137,7 +137,7 @@
 .method public final aw(I)Lcom/facebook/common/g/g;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sc:Lcom/facebook/common/g/g;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sl: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/ad;->jS()Lcom/facebook/common/g/j;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jV()Lcom/facebook/common/g/j;
 
     move-result-object v1
 
     invoke-direct {v0, p1, v1}, Lcom/facebook/imagepipeline/memory/w;-><init>(Lcom/facebook/imagepipeline/memory/t;Lcom/facebook/common/g/j;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sc:Lcom/facebook/common/g/g;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sl:Lcom/facebook/common/g/g;
 
     :cond_0
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Sc:Lcom/facebook/common/g/g;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/ad;->Sl:Lcom/facebook/common/g/g;
 
     return-object p1
 .end method
 
-.method public final jN()Lcom/facebook/imagepipeline/memory/d;
+.method public final jQ()Lcom/facebook/imagepipeline/memory/d;
     .locals 6
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xe:Ljava/lang/String;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xn:Ljava/lang/String;
 
     const/4 v1, -0x1
 
@@ -263,63 +263,63 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/h;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->WX:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xg:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->WY:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/af;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/h;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh: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/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jK()Lcom/facebook/imagepipeline/memory/ae;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/k;->jN()Lcom/facebook/imagepipeline/memory/ae;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->WY:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xh:Lcom/facebook/imagepipeline/memory/af;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/h;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     goto :goto_1
 
     :cond_2
     new-instance v0, Lcom/facebook/imagepipeline/memory/q;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Xf:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Xo:I
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xg:I
+    iget v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xp:I
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jM()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v3
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/q;-><init>(IILcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     goto :goto_1
 
@@ -328,7 +328,7 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/n;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     goto :goto_1
 
@@ -337,11 +337,11 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/m;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     :cond_5
     :goto_1
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->RY:Lcom/facebook/imagepipeline/memory/d;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sh:Lcom/facebook/imagepipeline/memory/d;
 
     return-object v0
 
@@ -357,95 +357,95 @@
     .end sparse-switch
 .end method
 
-.method public final jP()Lcom/facebook/imagepipeline/memory/o;
+.method public final jS()Lcom/facebook/imagepipeline/memory/o;
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/o;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->WZ:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/ae;
 
     invoke-direct {v0, v1, v2}, Lcom/facebook/imagepipeline/memory/o;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     return-object v0
 .end method
 
-.method public final jQ()I
+.method public final jT()I
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->WZ:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/ac;->Xi:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->Xs:I
+    iget v0, v0, Lcom/facebook/imagepipeline/memory/ae;->XB:I
 
     return v0
 .end method
 
-.method public final jS()Lcom/facebook/common/g/j;
+.method public final jV()Lcom/facebook/common/g/j;
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Ss:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->SB: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/ad;->jT()Lcom/facebook/common/g/a;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jW()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/ad;->Ss:Lcom/facebook/common/g/j;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->SB:Lcom/facebook/common/g/j;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Ss:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->SB:Lcom/facebook/common/g/j;
 
     return-object v0
 .end method
 
-.method public final jT()Lcom/facebook/common/g/a;
+.method public final jW()Lcom/facebook/common/g/a;
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xl:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xu:Lcom/facebook/common/g/a;
 
     if-nez v0, :cond_0
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/p;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Uo:Lcom/facebook/common/g/b;
+    iget-object v1, v1, Lcom/facebook/imagepipeline/memory/ac;->Ux:Lcom/facebook/common/g/b;
 
-    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v2, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xc:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v2, v2, Lcom/facebook/imagepipeline/memory/ac;->Xl:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xi:Lcom/facebook/imagepipeline/memory/ac;
+    iget-object v3, p0, Lcom/facebook/imagepipeline/memory/ad;->Xr:Lcom/facebook/imagepipeline/memory/ac;
 
-    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xd:Lcom/facebook/imagepipeline/memory/af;
+    iget-object v3, v3, Lcom/facebook/imagepipeline/memory/ac;->Xm:Lcom/facebook/imagepipeline/memory/af;
 
     invoke-direct {v0, v1, v2, v3}, Lcom/facebook/imagepipeline/memory/p;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xl:Lcom/facebook/common/g/a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xu:Lcom/facebook/common/g/a;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xl:Lcom/facebook/common/g/a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/ad;->Xu: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 6136bc87d6..786f630127 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 Wq:Lcom/facebook/imagepipeline/memory/b;
+.field final synthetic Wz: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;->Wq:Lcom/facebook/imagepipeline/memory/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b$1;->Wz: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;->Wq:Lcom/facebook/imagepipeline/memory/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/b$1;->Wz: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 e35fa81e23..d7aae54df9 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 Hq:J
+.field private Hz:J
 
-.field private final Wn:I
+.field private final Ww:I
 
-.field private final Wo:I
+.field private final Wx:I
 
-.field public final Wp:Lcom/facebook/common/references/b;
+.field public final Wy: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;->Wn:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/b;->Ww:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/b;->Wo:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/b;->Wx: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;->Wp:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/b;->Wy: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;->Wn:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/b;->Ww:I
 
     if-ge v0, v1, :cond_1
 
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
 
     int-to-long v2, p1
 
     add-long/2addr v0, v2
 
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->Wo:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->Wx: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;->Hq:J
+    iget-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Hq:J
+    iput-wide v4, p0, Lcom/facebook/imagepipeline/memory/b;->Hz: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;->Hq:J
+    iget-wide v5, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
 
     cmp-long v0, v3, v5
 
@@ -197,7 +197,7 @@
 
     aput-object p1, v6, v1
 
-    iget-wide v7, p0, Lcom/facebook/imagepipeline/memory/b;->Hq:J
+    iget-wide v7, p0, Lcom/facebook/imagepipeline/memory/b;->Hz: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;->Hq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
 
     sub-long/2addr v0, v3
 
-    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hq:J
+    iput-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
 
     iget p1, p0, Lcom/facebook/imagepipeline/memory/b;->mCount:I
 
@@ -247,13 +247,13 @@
     throw p1
 .end method
 
-.method public final declared-synchronized fO()J
+.method public final declared-synchronized fR()J
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hq:J
+    iget-wide v0, p0, Lcom/facebook/imagepipeline/memory/b;->Hz:J
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -297,7 +297,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Wo:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Wx:I
     :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 jE()I
+.method public final declared-synchronized jH()I
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Wn:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/b;->Ww: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 8d0120feab..b7d1f89fe5 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,11 +13,11 @@
     .end annotation
 .end field
 
-.field public static final Wr:I
+.field public static final WA:I
 
-.field private static Ws:I
+.field private static WB:I
 
-.field private static volatile Wt:Lcom/facebook/imagepipeline/memory/b;
+.field private static volatile WC: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imagepipeline/memory/c;->GI: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;->Wr:I
+    sput v1, Lcom/facebook/imagepipeline/memory/c;->WA:I
 
     const/16 v0, 0x180
 
-    sput v0, Lcom/facebook/imagepipeline/memory/c;->Ws:I
+    sput v0, Lcom/facebook/imagepipeline/memory/c;->WB:I
 
     return-void
 .end method
@@ -79,10 +79,10 @@
     return-void
 .end method
 
-.method public static jF()Lcom/facebook/imagepipeline/memory/b;
+.method public static jI()Lcom/facebook/imagepipeline/memory/b;
     .locals 4
 
-    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->Wt:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->WC: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;->Wt:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/c;->WC: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;->Ws:I
+    sget v2, Lcom/facebook/imagepipeline/memory/c;->WB:I
 
-    sget v3, Lcom/facebook/imagepipeline/memory/c;->Wr:I
+    sget v3, Lcom/facebook/imagepipeline/memory/c;->WA:I
 
     invoke-direct {v1, v2, v3}, Lcom/facebook/imagepipeline/memory/b;-><init>(II)V
 
-    sput-object v1, Lcom/facebook/imagepipeline/memory/c;->Wt:Lcom/facebook/imagepipeline/memory/b;
+    sput-object v1, Lcom/facebook/imagepipeline/memory/c;->WC: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;->Wt:Lcom/facebook/imagepipeline/memory/b;
+    sget-object v0, Lcom/facebook/imagepipeline/memory/c;->WC: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 4945c6dead..04bd5bb408 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 WH:Landroid/util/SparseIntArray;
+.field private static final WQ: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;->WH:Landroid/util/SparseIntArray;
+    sput-object v0, Lcom/facebook/imagepipeline/memory/k;->WQ:Landroid/util/SparseIntArray;
 
     return-void
 .end method
 
-.method public static jK()Lcom/facebook/imagepipeline/memory/ae;
+.method public static jN()Lcom/facebook/imagepipeline/memory/ae;
     .locals 5
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/ae;
@@ -57,7 +57,7 @@
     div-int/lit8 v2, v2, 0x2
 
     :goto_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/k;->WH:Landroid/util/SparseIntArray;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/k;->WQ: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 7cf4ed1693..6e7a9f2f51 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 WI:I
+.field public static final WR:I
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result v0
 
-    sput v0, Lcom/facebook/imagepipeline/memory/l;->WI:I
+    sput v0, Lcom/facebook/imagepipeline/memory/l;->WR:I
 
     return-void
 .end method
@@ -48,12 +48,12 @@
     return-object v0
 .end method
 
-.method public static jK()Lcom/facebook/imagepipeline/memory/ae;
+.method public static jN()Lcom/facebook/imagepipeline/memory/ae;
     .locals 8
 
     new-instance v7, Lcom/facebook/imagepipeline/memory/ae;
 
-    sget v0, Lcom/facebook/imagepipeline/memory/l;->WI:I
+    sget v0, Lcom/facebook/imagepipeline/memory/l;->WR:I
 
     const/high16 v1, 0x400000
 
@@ -63,7 +63,7 @@
 
     move-result-object v3
 
-    sget v6, Lcom/facebook/imagepipeline/memory/l;->WI:I
+    sget v6, Lcom/facebook/imagepipeline/memory/l;->WR:I
 
     const/high16 v4, 0x20000
 
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 9c06cf18ca..8e6e79e515 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/n.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final Wh:Ljava/util/Set;
+.field private final Wq:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -24,11 +24,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/facebook/common/d/k;->gg()Ljava/util/Set;
+    invoke-static {}, Lcom/facebook/common/d/k;->gj()Ljava/util/Set;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wh:Ljava/util/Set;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wq:Ljava/util/Set;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wh:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wq:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -74,7 +74,7 @@
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wh:Ljava/util/Set;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/n;->Wq:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$1.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$1.smali
index 910df9e3ed..f15c7591f3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$1.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$1.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic WK:Lcom/facebook/imagepipeline/memory/o;
+.field final synthetic WU:Lcom/facebook/imagepipeline/memory/o;
 
 
 # direct methods
 .method constructor <init>(Lcom/facebook/imagepipeline/memory/o;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/o$1;->WK:Lcom/facebook/imagepipeline/memory/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/o$1;->WU:Lcom/facebook/imagepipeline/memory/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,9 +47,9 @@
 
     check-cast p1, [B
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o$1;->WK:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o$1;->WU:Lcom/facebook/imagepipeline/memory/o;
 
-    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/o;->WJ:Lcom/facebook/imagepipeline/memory/o$a;
+    iget-object v0, v0, Lcom/facebook/imagepipeline/memory/o;->WT:Lcom/facebook/imagepipeline/memory/o$a;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/o$a;->r(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$a.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$a.smali
index 1b024573a9..99c13d8d91 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$a.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o$a.smali
@@ -37,9 +37,9 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/aa;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/o$a;->Wf:Lcom/facebook/imagepipeline/memory/ae;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/o$a;->Wo:Lcom/facebook/imagepipeline/memory/ae;
 
-    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->Xs:I
+    iget v1, v1, Lcom/facebook/imagepipeline/memory/ae;->XB:I
 
     invoke-direct {v0, p1, v1}, Lcom/facebook/imagepipeline/memory/aa;-><init>(II)V
 
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 c570046c2c..15d413d6e4 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/o.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private final Ij:Lcom/facebook/common/references/b;
+.field private final Is: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 WJ:Lcom/facebook/imagepipeline/memory/o$a;
+.field final WT:Lcom/facebook/imagepipeline/memory/o$a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget v0, p2, Lcom/facebook/imagepipeline/memory/ae;->Xs:I
+    iget v0, p2, Lcom/facebook/imagepipeline/memory/ae;->XB:I
 
     if-lez v0, :cond_0
 
@@ -46,19 +46,19 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/o$a;
 
-    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jM()Lcom/facebook/imagepipeline/memory/z;
+    invoke-static {}, Lcom/facebook/imagepipeline/memory/z;->jP()Lcom/facebook/imagepipeline/memory/z;
 
     move-result-object v1
 
     invoke-direct {v0, p1, p2, v1}, Lcom/facebook/imagepipeline/memory/o$a;-><init>(Lcom/facebook/common/g/b;Lcom/facebook/imagepipeline/memory/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WJ:Lcom/facebook/imagepipeline/memory/o$a;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WT:Lcom/facebook/imagepipeline/memory/o$a;
 
     new-instance p1, Lcom/facebook/imagepipeline/memory/o$1;
 
     invoke-direct {p1, p0}, Lcom/facebook/imagepipeline/memory/o$1;-><init>(Lcom/facebook/imagepipeline/memory/o;)V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/o;->Ij:Lcom/facebook/common/references/b;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/o;->Is:Lcom/facebook/common/references/b;
 
     return-void
 .end method
@@ -75,13 +75,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WJ:Lcom/facebook/imagepipeline/memory/o$a;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->WT:Lcom/facebook/imagepipeline/memory/o$a;
 
     invoke-virtual {v0, p1}, Lcom/facebook/imagepipeline/memory/o$a;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->Ij:Lcom/facebook/common/references/b;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/o;->Is: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/p.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali
index 9cb729aee6..e4f6559501 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/p.smali
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field private final WL:[I
+.field private final WV:[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/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ae;->Xo:Landroid/util/SparseIntArray;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ae;->Xx: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/p;->WL:[I
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/p;->WV:[I
 
     const/4 p2, 0x0
 
@@ -45,7 +45,7 @@
 
     if-ge p2, p3, :cond_0
 
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/p;->WL:[I
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/p;->WV:[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/p;->WL:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/p;->WV:[I
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/q.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/q.smali
index 011dfb5a3f..f26fa76671 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/q.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/q.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private UQ:I
+.field private UZ:I
 
-.field protected final WM:Lcom/facebook/imagepipeline/memory/ab;
+.field protected final WW:Lcom/facebook/imagepipeline/memory/ab;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/facebook/imagepipeline/memory/ab<",
@@ -19,11 +19,11 @@
     .end annotation
 .end field
 
-.field private final WN:I
+.field private final WX:I
 
-.field private WO:I
+.field private WY:I
 
-.field private final Wl:Lcom/facebook/imagepipeline/memory/af;
+.field private final Wu:Lcom/facebook/imagepipeline/memory/af;
 
 
 # direct methods
@@ -36,13 +36,13 @@
 
     invoke-direct {v0}, Lcom/facebook/imagepipeline/memory/e;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WN:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WX:I
 
-    iput p2, p0, Lcom/facebook/imagepipeline/memory/q;->UQ:I
+    iput p2, p0, Lcom/facebook/imagepipeline/memory/q;->UZ:I
 
-    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/q;->Wl:Lcom/facebook/imagepipeline/memory/af;
+    iput-object p3, p0, Lcom/facebook/imagepipeline/memory/q;->Wu:Lcom/facebook/imagepipeline/memory/af;
 
     return-void
 .end method
@@ -54,13 +54,13 @@
 
     :goto_0
     :try_start_0
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
 
     if-le v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
-    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/ab;->jG()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/facebook/imagepipeline/memory/ab;->jJ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -68,17 +68,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
     invoke-interface {v1, v0}, Lcom/facebook/imagepipeline/memory/ab;->J(Ljava/lang/Object;)I
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WY: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/q;->WO:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WN:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WX:I
 
     if-le v0, v1, :cond_0
 
-    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WN:I
+    iget v0, p0, Lcom/facebook/imagepipeline/memory/q;->WX:I
 
     invoke-direct {p0, v0}, Lcom/facebook/imagepipeline/memory/q;->at(I)V
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/memory/ab;->get(I)Ljava/lang/Object;
 
@@ -130,17 +130,17 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
     invoke-interface {p1, v0}, Lcom/facebook/imagepipeline/memory/ab;->J(Ljava/lang/Object;)I
 
     move-result p1
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
 
     sub-int/2addr v1, p1
 
-    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iput v1, p0, Lcom/facebook/imagepipeline/memory/q;->WY: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/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
     invoke-interface {v0, p1}, Lcom/facebook/imagepipeline/memory/ab;->J(Ljava/lang/Object;)I
 
     move-result v0
 
-    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->UQ:I
+    iget v1, p0, Lcom/facebook/imagepipeline/memory/q;->UZ:I
 
     if-gt v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WM:Lcom/facebook/imagepipeline/memory/ab;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/q;->WW:Lcom/facebook/imagepipeline/memory/ab;
 
     invoke-interface {v1, p1}, Lcom/facebook/imagepipeline/memory/ab;->I(Ljava/lang/Object;)V
 
     monitor-enter p0
 
     :try_start_0
-    iget p1, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iget p1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WO:I
+    iput p1, p0, Lcom/facebook/imagepipeline/memory/q;->WY:I
 
     monitor-exit p0
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/t.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/t.smali
index 14c7b5fa9a..1d57197b97 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/t.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/t.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field final WL:[I
+.field final WV:[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/ae;Lcom/facebook/imagepipeline/memory/af;)V
 
-    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ae;->Xo:Landroid/util/SparseIntArray;
+    iget-object p1, p2, Lcom/facebook/imagepipeline/memory/ae;->Xx: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/t;->WL:[I
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/t;->WV:[I
 
     const/4 p2, 0x0
 
     :goto_0
-    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/t;->WL:[I
+    iget-object p3, p0, Lcom/facebook/imagepipeline/memory/t;->WV:[I
 
     array-length v0, p3
 
@@ -122,7 +122,7 @@
 
     if-lez p1, :cond_2
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/t;->WL:[I
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/t;->WV:[I
 
     array-length v1, v0
 
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 73a7509c84..865267b7c3 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/w.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/w.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final Ss:Lcom/facebook/common/g/j;
+.field private final SB:Lcom/facebook/common/g/j;
 
-.field private final WT:Lcom/facebook/imagepipeline/memory/t;
+.field private final Xc:Lcom/facebook/imagepipeline/memory/t;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
-    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/w;->Ss:Lcom/facebook/common/g/j;
+    iput-object p2, p0, Lcom/facebook/imagepipeline/memory/w;->SB:Lcom/facebook/common/g/j;
 
     return-void
 .end method
@@ -33,11 +33,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->Ss:Lcom/facebook/common/g/j;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/w;->SB: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 {p2}, Lcom/facebook/imagepipeline/memory/x;->jL()Lcom/facebook/imagepipeline/memory/v;
+    invoke-virtual {p2}, Lcom/facebook/imagepipeline/memory/x;->jO()Lcom/facebook/imagepipeline/memory/v;
 
     move-result-object p1
 
@@ -54,7 +54,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     invoke-direct {v0, v1, p2}, Lcom/facebook/imagepipeline/memory/x;-><init>(Lcom/facebook/imagepipeline/memory/t;I)V
 
@@ -87,7 +87,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/memory/x;-><init>(Lcom/facebook/imagepipeline/memory/t;)V
 
@@ -115,7 +115,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     array-length v2, p1
 
@@ -128,7 +128,7 @@
 
     invoke-virtual {v0, p1, v1, v2}, Lcom/facebook/imagepipeline/memory/x;->write([BII)V
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/x;->jL()Lcom/facebook/imagepipeline/memory/v;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/memory/x;->jO()Lcom/facebook/imagepipeline/memory/v;
 
     move-result-object p1
     :try_end_0
@@ -169,7 +169,7 @@
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     invoke-direct {v0, v1, p1}, Lcom/facebook/imagepipeline/memory/x;-><init>(Lcom/facebook/imagepipeline/memory/t;I)V
 
@@ -216,12 +216,12 @@
     return-object p1
 .end method
 
-.method public final synthetic gm()Lcom/facebook/common/g/i;
+.method public final synthetic gp()Lcom/facebook/common/g/i;
     .locals 2
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/x;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/w;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     invoke-direct {v0, v1}, Lcom/facebook/imagepipeline/memory/x;-><init>(Lcom/facebook/imagepipeline/memory/t;)V
 
diff --git a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/x.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/x.smali
index f00a09306e..2f3db25e04 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/x.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/x.smali
@@ -12,7 +12,7 @@
 
 
 # instance fields
-.field private WR:Lcom/facebook/common/references/CloseableReference;
+.field private Xb: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 WT:Lcom/facebook/imagepipeline/memory/t;
+.field private final Xc:Lcom/facebook/imagepipeline/memory/t;
 
 .field private mCount:I
 
@@ -31,7 +31,7 @@
 .method public constructor <init>(Lcom/facebook/imagepipeline/memory/t;)V
     .locals 2
 
-    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/t;->WL:[I
+    iget-object v0, p1, Lcom/facebook/imagepipeline/memory/t;->WV:[I
 
     const/4 v1, 0x0
 
@@ -67,31 +67,31 @@
 
     check-cast p1, Lcom/facebook/imagepipeline/memory/t;
 
-    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     iput v0, p0, Lcom/facebook/imagepipeline/memory/x;->mCount:I
 
-    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     invoke-virtual {p1, p2}, Lcom/facebook/imagepipeline/memory/t;->get(I)Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/facebook/imagepipeline/memory/x;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object p2, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     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/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     return-void
 .end method
 
-.method private gt()V
+.method private gw()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb: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/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb: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/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     const/4 v0, -0x1
 
@@ -131,24 +131,24 @@
     return-void
 .end method
 
-.method public final synthetic gn()Lcom/facebook/common/g/f;
+.method public final synthetic gq()Lcom/facebook/common/g/f;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/x;->jL()Lcom/facebook/imagepipeline/memory/v;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/x;->jO()Lcom/facebook/imagepipeline/memory/v;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final jL()Lcom/facebook/imagepipeline/memory/v;
+.method public final jO()Lcom/facebook/imagepipeline/memory/v;
     .locals 3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gw()V
 
     new-instance v0, Lcom/facebook/imagepipeline/memory/v;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     iget v2, p0, Lcom/facebook/imagepipeline/memory/x;->mCount:I
 
@@ -206,15 +206,15 @@
 
     if-gt v0, v1, :cond_1
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gw()V
 
     iget v0, p0, Lcom/facebook/imagepipeline/memory/x;->mCount:I
 
     add-int/2addr v0, p3
 
-    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gt()V
+    invoke-direct {p0}, Lcom/facebook/imagepipeline/memory/x;->gw()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb: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/x;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     invoke-virtual {v1, v0}, Lcom/facebook/imagepipeline/memory/t;->get(I)Ljava/lang/Object;
 
@@ -236,7 +236,7 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/memory/s;
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb: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/s;->a(Lcom/facebook/imagepipeline/memory/s;I)V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     invoke-virtual {v1}, Lcom/facebook/common/references/CloseableReference;->close()V
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->WT:Lcom/facebook/imagepipeline/memory/t;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/memory/x;->Xc:Lcom/facebook/imagepipeline/memory/t;
 
     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/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iput-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb:Lcom/facebook/common/references/CloseableReference;
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->WR:Lcom/facebook/common/references/CloseableReference;
+    iget-object v0, p0, Lcom/facebook/imagepipeline/memory/x;->Xb: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/z.smali b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali
index 0bd508629d..029290f84b 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/memory/z.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static WV:Lcom/facebook/imagepipeline/memory/z;
+.field private static Xe:Lcom/facebook/imagepipeline/memory/z;
 
 
 # direct methods
@@ -25,7 +25,7 @@
     return-void
 .end method
 
-.method public static declared-synchronized jM()Lcom/facebook/imagepipeline/memory/z;
+.method public static declared-synchronized jP()Lcom/facebook/imagepipeline/memory/z;
     .locals 2
 
     const-class v0, Lcom/facebook/imagepipeline/memory/z;
@@ -33,7 +33,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->WV:Lcom/facebook/imagepipeline/memory/z;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->Xe:Lcom/facebook/imagepipeline/memory/z;
 
     if-nez v1, :cond_0
 
@@ -41,10 +41,10 @@
 
     invoke-direct {v1}, Lcom/facebook/imagepipeline/memory/z;-><init>()V
 
-    sput-object v1, Lcom/facebook/imagepipeline/memory/z;->WV:Lcom/facebook/imagepipeline/memory/z;
+    sput-object v1, Lcom/facebook/imagepipeline/memory/z;->Xe:Lcom/facebook/imagepipeline/memory/z;
 
     :cond_0
-    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->WV:Lcom/facebook/imagepipeline/memory/z;
+    sget-object v1, Lcom/facebook/imagepipeline/memory/z;->Xe:Lcom/facebook/imagepipeline/memory/z;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
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 74fc9c97cf..9ed030cee3 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;->jU()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/a;->jX()V
 
     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 37437b46f3..26240aa646 100644
--- a/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
+++ b/com.discord/smali_classes2/com/facebook/imagepipeline/nativecode/WebpTranscoderImpl.smali
@@ -41,7 +41,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()V
 
     invoke-static {p1}, Lcom/facebook/common/d/i;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -70,7 +70,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fA()V
+    invoke-static {}, Lcom/facebook/imagepipeline/nativecode/d;->fD()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/e/c;)Z
     .locals 2
 
-    sget-object v0, Lcom/facebook/e/b;->QU:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rd:Lcom/facebook/e/c;
 
     const/4 v1, 0x0
 
@@ -112,22 +112,22 @@
     return v1
 
     :cond_1
-    sget-object v0, Lcom/facebook/e/b;->QV:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Re:Lcom/facebook/e/c;
 
     if-eq p1, v0, :cond_4
 
-    sget-object v0, Lcom/facebook/e/b;->QW:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rf:Lcom/facebook/e/c;
 
     if-eq p1, v0, :cond_4
 
-    sget-object v0, Lcom/facebook/e/b;->QX:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rg:Lcom/facebook/e/c;
 
     if-ne p1, v0, :cond_2
 
     goto :goto_0
 
     :cond_2
-    sget-object v0, Lcom/facebook/e/b;->QY:Lcom/facebook/e/c;
+    sget-object v0, Lcom/facebook/e/b;->Rh:Lcom/facebook/e/c;
 
     if-ne p1, v0, :cond_3
 
@@ -144,7 +144,7 @@
 
     :cond_4
     :goto_0
-    sget-boolean p1, Lcom/facebook/common/k/c;->Jc:Z
+    sget-boolean p1, Lcom/facebook/common/k/c;->Jl: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 5b09195981..34d8e432ae 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 Xv:Ljava/util/List;
+.field public static final XE:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -27,12 +27,12 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/a;->Xv:Ljava/util/List;
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/a;->XE:Ljava/util/List;
 
     return-void
 .end method
 
-.method public static jU()V
+.method public static jX()V
     .locals 1
 
     const-string v0, "imagepipeline"
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 baa48f9c09..6abc0aa871 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 FY:Z
+.field private static Gh:Z
 
 
 # direct methods
-.method public static declared-synchronized fA()V
+.method public static declared-synchronized fD()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;->FY:Z
+    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Gh:Z
 
     if-nez v1, :cond_1
 
@@ -45,7 +45,7 @@
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->FY:Z
+    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/c;->Gh: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 c575cad330..0b3be7dfb0 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 FY:Z
+.field private static Gh:Z
 
 
 # direct methods
-.method public static declared-synchronized fA()V
+.method public static declared-synchronized fD()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;->FY:Z
+    sget-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Gh:Z
 
     if-nez v1, :cond_1
 
@@ -45,7 +45,7 @@
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->FY:Z
+    sput-boolean v1, Lcom/facebook/imagepipeline/nativecode/d;->Gh:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
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 897522e0a5..d4d8686f59 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 public static XA:Z = false
+.field private static XI:Lcom/facebook/imagepipeline/nativecode/e; = null
 
-.field private static Xz:Lcom/facebook/imagepipeline/nativecode/e;
+.field public static XJ:Z = false
 
 
 # direct methods
@@ -26,11 +26,11 @@
 
     check-cast v0, Lcom/facebook/imagepipeline/nativecode/e;
 
-    sput-object v0, Lcom/facebook/imagepipeline/nativecode/f;->Xz:Lcom/facebook/imagepipeline/nativecode/e;
+    sput-object v0, Lcom/facebook/imagepipeline/nativecode/f;->XI:Lcom/facebook/imagepipeline/nativecode/e;
 
     const/4 v0, 0x1
 
-    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->XA:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->XJ: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;->XA:Z
+    sput-boolean v0, Lcom/facebook/imagepipeline/nativecode/f;->XJ:Z
 
     return-void
 .end method
 
-.method public static jV()Lcom/facebook/imagepipeline/nativecode/e;
+.method public static jY()Lcom/facebook/imagepipeline/nativecode/e;
     .locals 1
 
-    sget-object v0, Lcom/facebook/imagepipeline/nativecode/f;->Xz:Lcom/facebook/imagepipeline/nativecode/e;
+    sget-object v0, Lcom/facebook/imagepipeline/nativecode/f;->XI: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 a4080618ff..5ee702d906 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 Se:Lcom/facebook/imagepipeline/memory/o;
+.field private final Sn:Lcom/facebook/imagepipeline/memory/o;
 
 
 # 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;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iput-object p1, p0, Lcom/facebook/imagepipeline/platform/d;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lcom/facebook/imagepipeline/platform/d;->Xt:[B
+    sget-object v0, Lcom/facebook/imagepipeline/platform/d;->XC:[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;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     add-int/lit8 v3, p2, 0x2
 
@@ -154,7 +154,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->Se:Lcom/facebook/imagepipeline/memory/o;
+    iget-object v1, p0, Lcom/facebook/imagepipeline/platform/d;->Sn:Lcom/facebook/imagepipeline/memory/o;
 
     invoke-virtual {v1, v0}, Lcom/facebook/imagepipeline/memory/o;->as(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 9d95a93fb1..45b8606d83 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/ad;->jQ()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jT()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/platform/e;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jN()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()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/ad;->jQ()I
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jT()I
 
     move-result p1
 
     new-instance v0, Lcom/facebook/imagepipeline/platform/a;
 
-    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jN()Lcom/facebook/imagepipeline/memory/d;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jQ()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/ad;->jP()Lcom/facebook/imagepipeline/memory/o;
+    invoke-virtual {p0}, Lcom/facebook/imagepipeline/memory/ad;->jS()Lcom/facebook/imagepipeline/memory/o;
 
     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 22a24f49ce..496008d597 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 aae:Lcom/facebook/imagepipeline/request/b$a;
+.field public static final enum aan:Lcom/facebook/imagepipeline/request/b$a;
 
-.field public static final enum aaf:Lcom/facebook/imagepipeline/request/b$a;
+.field public static final enum aao:Lcom/facebook/imagepipeline/request/b$a;
 
-.field private static final synthetic aag:[Lcom/facebook/imagepipeline/request/b$a;
+.field private static final synthetic aap:[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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aan: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;->aaf:Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aao: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;->aae:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v3, Lcom/facebook/imagepipeline/request/b$a;->aan:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aaf:Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$a;->aao:Lcom/facebook/imagepipeline/request/b$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aag:[Lcom/facebook/imagepipeline/request/b$a;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$a;->aap:[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;->aag:[Lcom/facebook/imagepipeline/request/b$a;
+    sget-object v0, Lcom/facebook/imagepipeline/request/b$a;->aap:[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 487541c83f..c0052e8e18 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 aah:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aaq:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum aai:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aar:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum aaj:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aas:Lcom/facebook/imagepipeline/request/b$b;
 
-.field public static final enum aak:Lcom/facebook/imagepipeline/request/b$b;
+.field public static final enum aat:Lcom/facebook/imagepipeline/request/b$b;
 
-.field private static final synthetic aal:[Lcom/facebook/imagepipeline/request/b$b;
+.field private static final synthetic aau:[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;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aaq: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;->aai:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aar: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;->aaj:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aas: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;->aak:Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aat: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;->aah:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v5, Lcom/facebook/imagepipeline/request/b$b;->aaq:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aai:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aar:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aaj:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aas:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aak:Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v1, Lcom/facebook/imagepipeline/request/b$b;->aat:Lcom/facebook/imagepipeline/request/b$b;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aal:[Lcom/facebook/imagepipeline/request/b$b;
+    sput-object v0, Lcom/facebook/imagepipeline/request/b$b;->aau:[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;->aal:[Lcom/facebook/imagepipeline/request/b$b;
+    sget-object v0, Lcom/facebook/imagepipeline/request/b$b;->aau:[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 b72b844739..950c3711bf 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 aat:[I
+.field static final synthetic aaC:[I
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/facebook/imageutils/a$1;->aat:[I
+    sput-object v0, Lcom/facebook/imageutils/a$1;->aaC:[I
 
     :try_start_0
-    sget-object v0, Lcom/facebook/imageutils/a$1;->aat:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[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;->aat:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[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;->aat:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[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;->aat:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[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;->aat:[I
+    sget-object v0, Lcom/facebook/imageutils/a$1;->aaC:[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 0388a02d8e..d1f1fd3a7d 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 aav:I
+.field aaE:I
 
-.field aaw:I
+.field aaF: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 70f18c6760..80a74bd222 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 Gz:Ljava/lang/Class;
+.field private static final GI: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/imageutils/e;->GI:Ljava/lang/Class;
 
     return-void
 .end method
@@ -117,23 +117,23 @@
 
     move-result v5
 
-    iput v5, v0, Lcom/facebook/imageutils/e$a;->aav:I
+    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
 
     add-int/lit8 p1, p1, -0x4
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aav:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
 
     const v6, 0x49492a00    # 823968.0f
 
     if-eq v5, v6, :cond_1
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aav:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
 
     const v7, 0x4d4d002a    # 2.14958752E8f
 
     if-eq v5, v7, :cond_1
 
-    sget-object p1, Lcom/facebook/imageutils/e;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/imageutils/e;->GI: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;->aav:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaE:I
 
     if-ne v5, v6, :cond_2
 
@@ -162,22 +162,22 @@
 
     move-result v5
 
-    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaw:I
+    iput v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
 
     add-int/lit8 p1, p1, -0x4
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaw:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
 
     if-lt v5, v4, :cond_3
 
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaw:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaF:I
 
     sub-int/2addr v5, v4
 
     if-le v5, p1, :cond_4
 
     :cond_3
-    sget-object p1, Lcom/facebook/imageutils/e;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/imageutils/e;->GI:Ljava/lang/Class;
 
     const-string v5, "Invalid offset"
 
@@ -187,7 +187,7 @@
 
     :cond_4
     :goto_2
-    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaw:I
+    iget v5, v0, Lcom/facebook/imageutils/e$a;->aaF: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 2e79cb468c..169226494a 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 kK()V
+.method public abstract kN()V
 .end method
 
-.method public abstract kL()V
+.method public abstract kO()V
 .end method
 
-.method public abstract kM()V
+.method public abstract kP()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 337ca43dd6..a37c50eda8 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 final aaA:[I
+.field public aaG:Z
 
-.field public final aaB:[F
+.field public aaH:I
 
-.field public final aaC:[F
+.field public aaI:I
 
-.field public final aaD:[F
+.field public final aaJ:[I
 
-.field public final aaE:[F
+.field public final aaK:[F
 
-.field public aaF:Lcom/facebook/samples/a/a$a;
+.field public final aaL:[F
 
-.field public aax:Z
+.field public final aaM:[F
 
-.field public aay:I
+.field public final aaN:[F
 
-.field public aaz:I
+.field public aaO: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;->aaA:[I
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaJ:[I
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaB:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaK:[F
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaC:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaL:[F
 
     new-array v1, v0, [F
 
-    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaD:[F
+    iput-object v1, p0, Lcom/facebook/samples/a/a;->aaM:[F
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaE:[F
+    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaN:[F
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaF:Lcom/facebook/samples/a/a$a;
+    iput-object v0, p0, Lcom/facebook/samples/a/a;->aaO: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 kI()V
+.method public final kL()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aax:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaF:Lcom/facebook/samples/a/a$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kK()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kN()V
 
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aax:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
 
     :cond_1
     return-void
 .end method
 
-.method public final kJ()V
+.method public final kM()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aax:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aax:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
 
-    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaF:Lcom/facebook/samples/a/a$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kM()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/a$a;->kP()V
 
     :cond_0
     return-void
@@ -118,16 +118,16 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aax:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/a/a;->aaG:Z
 
-    iput v0, p0, Lcom/facebook/samples/a/a;->aay:I
+    iput v0, p0, Lcom/facebook/samples/a/a;->aaH:I
 
     :goto_0
     const/4 v1, 0x2
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/samples/a/a;->aaA:[I
+    iget-object v1, p0, Lcom/facebook/samples/a/a;->aaJ:[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 499692344a..122226894a 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 kO()V
+.method public abstract kR()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 f0f2e3e05c..f5a7544d76 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 aaG:Lcom/facebook/samples/a/a;
+.field public final aaP:Lcom/facebook/samples/a/a;
 
-.field public aaH:Lcom/facebook/samples/a/b$a;
+.field public aaQ: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;->aaH:Lcom/facebook/samples/a/b$a;
+    iput-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
 
-    iput-object p1, p0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iput-object p1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object p1, p0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object p1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iput-object p0, p1, Lcom/facebook/samples/a/a;->aaF:Lcom/facebook/samples/a/a$a;
+    iput-object p0, p1, Lcom/facebook/samples/a/a;->aaO: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaK:[F
 
-    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aay:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaH: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v0, v0, Lcom/facebook/samples/a/a;->aaL:[F
 
-    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v1, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aay:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaH:I
 
     invoke-static {v0, v1}, Lcom/facebook/samples/a/b;->a([FI)F
 
@@ -110,10 +110,10 @@
     return v0
 .end method
 
-.method public final kK()V
+.method public final kN()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaH:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
@@ -123,10 +123,10 @@
     return-void
 .end method
 
-.method public final kL()V
+.method public final kO()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaH:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
@@ -136,29 +136,29 @@
     return-void
 .end method
 
-.method public final kM()V
+.method public final kP()V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaH:Lcom/facebook/samples/a/b$a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaQ:Lcom/facebook/samples/a/b$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->kO()V
+    invoke-interface {v0}, Lcom/facebook/samples/a/b$a;->kR()V
 
     :cond_0
     return-void
 .end method
 
-.method public final kN()V
+.method public final kQ()V
     .locals 4
 
-    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v0, p0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-boolean v1, v0, Lcom/facebook/samples/a/a;->aax:Z
+    iget-boolean v1, v0, Lcom/facebook/samples/a/a;->aaG:Z
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kJ()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kM()V
 
     const/4 v1, 0x0
 
@@ -167,17 +167,17 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaK:[F
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaM:[F
 
     aget v3, v3, v1
 
     aput v3, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaL:[F
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaN:[F
 
     aget v3, v3, v1
 
@@ -188,7 +188,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kI()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kL()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 1723ede5b5..bd984ce066 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 abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field final synthetic abD: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;->abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->abD: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;->abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->abD: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;->abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$1;->abD: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 baaa0f66aa..a552ef4a69 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 abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field final synthetic abD: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;->abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final h(Landroid/graphics/Matrix;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->abu:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView$2;->abD:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
     invoke-virtual {v0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->h(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 7198423f45..77f2c376d7 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -29,25 +29,25 @@
 
 
 # instance fields
-.field private final LG:Lcom/facebook/drawee/controller/ControllerListener;
+.field private final LP:Lcom/facebook/drawee/controller/ControllerListener;
 
-.field private final aaZ:Landroid/graphics/RectF;
+.field private abA:Z
 
-.field private final aba:Landroid/graphics/RectF;
+.field private final abB:Lcom/facebook/samples/zoomable/f$a;
 
-.field private abn:Z
+.field private final abC:Lcom/facebook/samples/zoomable/e;
 
-.field private abo:Lcom/facebook/drawee/d/a;
+.field private final abi:Landroid/graphics/RectF;
 
-.field private abp:Lcom/facebook/samples/zoomable/f;
+.field private final abj:Landroid/graphics/RectF;
 
-.field private abq:Landroid/view/GestureDetector;
+.field private abw:Z
 
-.field private abr:Z
+.field private abx:Lcom/facebook/drawee/d/a;
 
-.field private final abs:Lcom/facebook/samples/zoomable/f$a;
+.field private aby:Lcom/facebook/samples/zoomable/f;
 
-.field private final abt:Lcom/facebook/samples/zoomable/e;
+.field private abz:Landroid/view/GestureDetector;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->GI:Ljava/lang/Class;
 
     return-void
 .end method
@@ -68,41 +68,41 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abn:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->aaZ:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi:Landroid/graphics/RectF;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abr:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA: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;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LP: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;->abs:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB: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;->abt:Lcom/facebook/samples/zoomable/e;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abC: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;->abn:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->aaZ:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi:Landroid/graphics/RectF;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abr:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA: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;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LP: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;->abs:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB: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;->abt:Lcom/facebook/samples/zoomable/e;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abC:Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -170,41 +170,41 @@
 
     const/4 p3, 0x0
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abn:Z
+    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     new-instance p3, Landroid/graphics/RectF;
 
     invoke-direct {p3}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->aaZ:Landroid/graphics/RectF;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi:Landroid/graphics/RectF;
 
     const/4 p3, 0x1
 
-    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abr:Z
+    iput-boolean p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA: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;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LP: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;->abs:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB: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;->abt:Lcom/facebook/samples/zoomable/e;
+    iput-object p3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abC:Lcom/facebook/samples/zoomable/e;
 
     invoke-direct {p0, p1, p2}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->d(Landroid/content/Context;Landroid/util/AttributeSet;)V
 
@@ -220,41 +220,41 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abn:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     new-instance p1, Landroid/graphics/RectF;
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->aaZ:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi:Landroid/graphics/RectF;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abr:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA: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;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LP: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;->abs:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB: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;->abt:Lcom/facebook/samples/zoomable/e;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abC: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;->abo:Lcom/facebook/drawee/d/a;
+    iput-object p2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->kX()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->la()V
 
-    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object p0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
     const/4 v0, 0x0
 
@@ -359,7 +359,7 @@
 
     check-cast p1, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LP:Lcom/facebook/drawee/controller/ControllerListener;
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/controller/AbstractDraweeController;->b(Lcom/facebook/drawee/controller/ControllerListener;)V
 
@@ -378,7 +378,7 @@
 
     invoke-direct {v1, v0}, Lcom/facebook/drawee/generic/a;-><init>(Landroid/content/res/Resources;)V
 
-    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Of:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v0, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oo:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-virtual {v1, v0}, Lcom/facebook/drawee/generic/a;->b(Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)Lcom/facebook/drawee/generic/a;
 
@@ -386,11 +386,11 @@
 
     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;->Ov:F
+    iget p1, v0, Lcom/facebook/drawee/generic/a;->OE:F
 
     invoke-virtual {p0, p1}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->setAspectRatio(F)V
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->hM()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
+    invoke-virtual {v0}, Lcom/facebook/drawee/generic/a;->hP()Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
     move-result-object p1
 
@@ -408,7 +408,7 @@
 
     check-cast p1, Lcom/facebook/drawee/controller/AbstractDraweeController;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LG:Lcom/facebook/drawee/controller/ControllerListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->LP: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;->Or:Lcom/facebook/drawee/drawable/g;
+    iget-object v0, v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->OA: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;->kR()Lcom/facebook/samples/zoomable/b;
+    invoke-static {}, Lcom/facebook/samples/zoomable/b;->kU()Lcom/facebook/samples/zoomable/b;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB: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;->abt:Lcom/facebook/samples/zoomable/e;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abC: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;->abq:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abz:Landroid/view/GestureDetector;
 
     return-void
 .end method
 
-.method private kX()V
+.method private la()V
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aaZ:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi: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;->aaZ:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abi:Landroid/graphics/RectF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aba:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abj: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v0}, Lcom/facebook/samples/zoomable/f;->computeVerticalScrollRange()I
 
@@ -614,7 +614,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->GI:Ljava/lang/Class;
 
     return-object v0
 .end method
@@ -622,7 +622,7 @@
 .method public getZoomableController()Lcom/facebook/samples/zoomable/f;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
     return-object v0
 .end method
@@ -646,13 +646,13 @@
 
     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;->abo:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx:Lcom/facebook/drawee/d/a;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kT()F
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kW()F
 
     move-result p1
 
@@ -662,7 +662,7 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abo:Lcom/facebook/drawee/d/a;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abx:Lcom/facebook/drawee/d/a;
 
     const/4 v0, 0x0
 
@@ -681,9 +681,9 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->kV()Landroid/graphics/Matrix;
+    invoke-interface {v1}, Lcom/facebook/samples/zoomable/f;->kY()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;->kX()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->la()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;->abq:Landroid/view/GestureDetector;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abz: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;->abn:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
     invoke-interface {v1, p1}, Lcom/facebook/samples/zoomable/f;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
@@ -805,26 +805,26 @@
 
     if-eqz v1, :cond_5
 
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abr:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kP()Z
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kS()Z
 
     move-result p1
 
     if-eqz p1, :cond_3
 
     :cond_2
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abr:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA:Z
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kU()Z
+    invoke-interface {p1}, Lcom/facebook/samples/zoomable/f;->kX()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;->abq:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abz:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abr:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abA: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abn:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abw: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;->abq:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abz: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;->abt:Lcom/facebook/samples/zoomable/e;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abC:Lcom/facebook/samples/zoomable/e;
 
-    iput-object p1, v0, Lcom/facebook/samples/zoomable/e;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object p1, v0, Lcom/facebook/samples/zoomable/e;->abv: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby: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;->abp:Lcom/facebook/samples/zoomable/f;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abp:Lcom/facebook/samples/zoomable/f;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->aby:Lcom/facebook/samples/zoomable/f;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abs:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/ZoomableDraweeView;->abB: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 2259ed8d0c..eb7be72a0b 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 aaI:Z
+.field aaR:Z
 
-.field final aaJ:[F
+.field final aaS:[F
 
-.field final aaK:[F
+.field final aaT:[F
 
-.field final aaL:[F
+.field final aaU:[F
 
-.field private final aaM:Landroid/graphics/Matrix;
+.field private final aaV:Landroid/graphics/Matrix;
 
-.field final aaN:Landroid/graphics/Matrix;
+.field final aaW:Landroid/graphics/Matrix;
 
 
 # direct methods
@@ -27,27 +27,27 @@
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaJ:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaS:[F
 
     new-array v0, p1, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaK:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaT:[F
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaL:[F
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaU:[F
 
     new-instance p1, Landroid/graphics/Matrix;
 
     invoke-direct {p1}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaM:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaV: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;->aaN:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaW: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;->kQ()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kT()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaW:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
     invoke-super {p0, p1}, Lcom/facebook/samples/zoomable/c;->f(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->kN()V
+    invoke-virtual {p1}, Lcom/facebook/samples/a/b;->kQ()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;->aaM:Landroid/graphics/Matrix;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/a;->aaV: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;->aaM:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/a;->aaV: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;->kQ()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kT()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;->aaI:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->aaR: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;->aaI:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaR:Z
 
     if-eqz v0, :cond_1
 
@@ -235,14 +235,14 @@
     .end annotation
 .end method
 
-.method public final kP()Z
+.method public final kS()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaI:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaR:Z
 
     if-nez v0, :cond_0
 
-    invoke-super {p0}, Lcom/facebook/samples/zoomable/c;->kP()Z
+    invoke-super {p0}, Lcom/facebook/samples/zoomable/c;->kS()Z
 
     move-result v0
 
@@ -258,7 +258,7 @@
     return v0
 .end method
 
-.method protected abstract kQ()V
+.method protected abstract kT()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;->kQ()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/a;->kT()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaN:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaW:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaM:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/a;->aaV: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 5922b16d8d..d29d8cba29 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 aaO:Lcom/facebook/samples/zoomable/b;
+.field final synthetic aaX: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;->aaO:Lcom/facebook/samples/zoomable/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->aaX: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;->aaO:Lcom/facebook/samples/zoomable/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$1;->aaX:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->aaN:Landroid/graphics/Matrix;
+    iget-object v1, v0, Lcom/facebook/samples/zoomable/a;->aaW: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;->aaL:[F
+    iget-object v3, v0, Lcom/facebook/samples/zoomable/a;->aaU:[F
 
     const/high16 v4, 0x3f800000    # 1.0f
 
     sub-float/2addr v4, p1
 
-    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaJ:[F
+    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaS:[F
 
     aget v5, v5, v2
 
     mul-float v4, v4, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaK:[F
+    iget-object v5, v0, Lcom/facebook/samples/zoomable/a;->aaT:[F
 
     aget v5, v5, v2
 
@@ -85,13 +85,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, v0, Lcom/facebook/samples/zoomable/a;->aaL:[F
+    iget-object p1, v0, Lcom/facebook/samples/zoomable/a;->aaU:[F
 
     invoke-virtual {v1, p1}, Landroid/graphics/Matrix;->setValues([F)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->aaO:Lcom/facebook/samples/zoomable/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/b$1;->aaX:Lcom/facebook/samples/zoomable/b;
 
-    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->aaN:Landroid/graphics/Matrix;
+    iget-object v0, p1, Lcom/facebook/samples/zoomable/a;->aaW: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 1d464e31ae..cc4bc1057a 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 aaO:Lcom/facebook/samples/zoomable/b;
+.field final synthetic aaX:Lcom/facebook/samples/zoomable/b;
 
-.field final synthetic aaP:Ljava/lang/Runnable;
+.field final synthetic aaY:Ljava/lang/Runnable;
 
 
 # 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;->aaO:Lcom/facebook/samples/zoomable/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/b$2;->aaX:Lcom/facebook/samples/zoomable/b;
 
-    iput-object p2, p0, Lcom/facebook/samples/zoomable/b$2;->aaP:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/facebook/samples/zoomable/b$2;->aaY:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
     return-void
 .end method
 
-.method private kS()V
+.method private kV()V
     .locals 2
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->aaP:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->aaY: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;->aaO:Lcom/facebook/samples/zoomable/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/b$2;->aaX:Lcom/facebook/samples/zoomable/b;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->aaI:Z
+    iput-boolean v1, v0, Lcom/facebook/samples/zoomable/a;->aaR:Z
 
-    iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iget-object v0, v0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kN()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kQ()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;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/b;->GI: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;->kS()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->kV()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;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/b;->GI: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;->kS()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/b$2;->kV()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 cbed47d41c..5b705e0978 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 Gz:Ljava/lang/Class;
+.field static final GI: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;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/b;->GI:Ljava/lang/Class;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     return-void
 .end method
 
-.method public static kR()Lcom/facebook/samples/zoomable/b;
+.method public static kU()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;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->GI: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;->kQ()V
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->kT()V
 
     const/4 v0, 0x1
 
@@ -124,27 +124,27 @@
     :goto_0
     invoke-static {v1}, Lcom/facebook/common/d/i;->checkArgument(Z)V
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->aaI:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/a;->aaR: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;->aaI:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaR: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;
 
-    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->kV()Landroid/graphics/Matrix;
+    invoke-virtual {p0}, Lcom/facebook/samples/zoomable/b;->kY()Landroid/graphics/Matrix;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/facebook/samples/zoomable/a;->aaJ:[F
+    iget-object p3, p0, Lcom/facebook/samples/zoomable/a;->aaS:[F
 
     invoke-virtual {p2, p3}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object p2, p0, Lcom/facebook/samples/zoomable/a;->aaK:[F
+    iget-object p2, p0, Lcom/facebook/samples/zoomable/a;->aaT:[F
 
     invoke-virtual {p1, p2}, Landroid/graphics/Matrix;->getValues([F)V
 
@@ -181,22 +181,22 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/facebook/samples/zoomable/b;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->GI:Ljava/lang/Class;
 
     return-object v0
 .end method
 
-.method public final kQ()V
+.method public final kT()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaI:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/a;->aaR:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/facebook/samples/zoomable/b;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/b;->GI: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 c8dfc1be77..92867e1d9f 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 Gz:Ljava/lang/Class;
+.field private static final GI:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -17,43 +17,43 @@
     .end annotation
 .end field
 
-.field private static final aaQ:Landroid/graphics/RectF;
+.field private static final aaZ:Landroid/graphics/RectF;
 
 
 # instance fields
-.field private final Nz:Landroid/graphics/RectF;
+.field private final NI:Landroid/graphics/RectF;
 
-.field aaR:Lcom/facebook/samples/a/b;
+.field aba:Lcom/facebook/samples/a/b;
 
-.field private aaS:Lcom/facebook/samples/zoomable/f$a;
+.field private abb:Lcom/facebook/samples/zoomable/f$a;
 
-.field private aaT:Z
+.field private abc:Z
 
-.field private aaU:Z
+.field private abd:Z
 
-.field private aaV:Z
+.field private abe:Z
 
-.field private aaW:Z
+.field private abf:Z
 
-.field aaX:F
+.field abg:F
 
-.field aaY:F
+.field abh:F
 
-.field private final aaZ:Landroid/graphics/RectF;
+.field private final abi:Landroid/graphics/RectF;
 
-.field private final aba:Landroid/graphics/RectF;
+.field private final abj:Landroid/graphics/RectF;
 
-.field private final abb:Landroid/graphics/RectF;
+.field private final abk:Landroid/graphics/RectF;
 
-.field private final abc:Landroid/graphics/Matrix;
+.field private final abl:Landroid/graphics/Matrix;
 
-.field private final abd:Landroid/graphics/Matrix;
+.field private final abm:Landroid/graphics/Matrix;
 
-.field private final abe:Landroid/graphics/Matrix;
+.field private final abn:Landroid/graphics/Matrix;
 
-.field private final abf:[F
+.field private final abo:[F
 
-.field private abg:Z
+.field private abp:Z
 
 
 # direct methods
@@ -62,7 +62,7 @@
 
     const-class v0, Lcom/facebook/samples/zoomable/c;
 
-    sput-object v0, Lcom/facebook/samples/zoomable/c;->Gz:Ljava/lang/Class;
+    sput-object v0, Lcom/facebook/samples/zoomable/c;->GI: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;->aaQ:Landroid/graphics/RectF;
+    sput-object v0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
 
     return-void
 .end method
@@ -84,81 +84,81 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaS:Lcom/facebook/samples/zoomable/f$a;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abb:Lcom/facebook/samples/zoomable/f$a;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaT:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaU:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Z
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaV:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abe:Z
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaW:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abf:Z
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/c;->aaX:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/c;->abg:F
 
     const/high16 v0, 0x40000000    # 2.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/c;->aaY:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/c;->abh:F
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->aba:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->abb:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abk: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;->abc:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abl: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;->abd:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm: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;->abe:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abn:Landroid/graphics/Matrix;
 
     const/16 v0, 0x9
 
     new-array v0, v0, [F
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abf:[F
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
 
     new-instance v0, Landroid/graphics/RectF;
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->Nz:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/c;->NI:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    iput-object p0, p1, Lcom/facebook/samples/a/b;->aaH:Lcom/facebook/samples/a/b$a;
+    iput-object p0, p1, Lcom/facebook/samples/a/b;->aaQ: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;->aba:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
@@ -316,9 +316,9 @@
 
     move-result p4
 
-    iget v1, p0, Lcom/facebook/samples/zoomable/c;->aaX:F
+    iget v1, p0, Lcom/facebook/samples/zoomable/c;->abg:F
 
-    iget v2, p0, Lcom/facebook/samples/zoomable/c;->aaY:F
+    iget v2, p0, Lcom/facebook/samples/zoomable/c;->abh:F
 
     invoke-static {p4, v1, v2}, Lcom/facebook/samples/zoomable/c;->b(FFF)F
 
@@ -356,9 +356,9 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->NI:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->aba:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v2}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -378,15 +378,15 @@
 
     iget v5, v0, Landroid/graphics/RectF;->right:F
 
-    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
-    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     iget v7, v7, Landroid/graphics/RectF;->right:F
 
-    iget-object v8, p0, Lcom/facebook/samples/zoomable/c;->aba:Landroid/graphics/RectF;
+    iget-object v8, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
 
     invoke-virtual {v8}, Landroid/graphics/RectF;->centerX()F
 
@@ -414,15 +414,15 @@
 
     iget v0, v0, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v5, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
-    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->aba:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
 
     invoke-virtual {v7}, Landroid/graphics/RectF;->centerY()F
 
@@ -475,11 +475,11 @@
 .method private g(Landroid/graphics/Matrix;)F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abf:[F
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abf:[F
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
 
     const/4 v0, 0x0
 
@@ -488,26 +488,26 @@
     return p1
 .end method
 
-.method private kW()V
+.method private kZ()V
     .locals 3
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abb:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->aba:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aaS:Lcom/facebook/samples/zoomable/f$a;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abb:Lcom/facebook/samples/zoomable/f$a;
 
     if-eqz v0, :cond_0
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->aaT:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
     invoke-interface {v0, v1}, Lcom/facebook/samples/zoomable/f$a;->h(Landroid/graphics/Matrix;)V
 
@@ -537,13 +537,13 @@
 .method public a(FLandroid/graphics/PointF;Landroid/graphics/PointF;)V
     .locals 8
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI: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;->abd:Landroid/graphics/Matrix;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/c;->abm: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;->kW()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()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;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/c;->GI: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;->abc:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abl:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abb:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->left:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->abb:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->top:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->abb:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->right:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->abb:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abk:Landroid/graphics/RectF;
 
     iget p1, p1, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->abg:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abp: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;->aaS:Lcom/facebook/samples/zoomable/f$a;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/c;->abb: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;->abf:[F
+    iget-object p5, p0, Lcom/facebook/samples/zoomable/c;->abo:[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;->abf:[F
+    iget-object v6, p0, Lcom/facebook/samples/zoomable/c;->abo:[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;->abd:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abn:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v0}, Landroid/graphics/Matrix;->invert(Landroid/graphics/Matrix;)Z
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abe:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abn:Landroid/graphics/Matrix;
 
     const/4 v2, 0x0
 
@@ -764,13 +764,13 @@
 
     aget v0, v6, v7
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->aba:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->Gz:Ljava/lang/Class;
+    sget-object p1, Lcom/facebook/samples/zoomable/c;->GI: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;->abd:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abc:Landroid/graphics/Matrix;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abl:Landroid/graphics/Matrix;
 
     invoke-virtual {p1, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->aaU:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->abd:Z
 
     const/4 v2, 0x2
 
@@ -841,9 +841,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aay:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaH: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaK:[F
 
     aget v1, v1, v3
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaK:[F
 
     aget v5, v5, v4
 
     sub-float/2addr v1, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaL:[F
 
     aget v5, v5, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaL:[F
 
     aget v6, v6, v4
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaM:[F
 
     aget v6, v6, v3
 
-    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaM:[F
 
     aget v7, v7, v4
 
     sub-float/2addr v6, v7
 
-    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v7, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v7, v7, Lcom/facebook/samples/a/a;->aaN:[F
 
     aget v7, v7, v3
 
-    iget-object v8, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v8, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v8, v8, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v8, v8, Lcom/facebook/samples/a/a;->aaN:[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;->aaV:Z
+    iget-boolean v1, p0, Lcom/facebook/samples/zoomable/c;->abe:Z
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v1, v1, Lcom/facebook/samples/a/a;->aay:I
+    iget v1, v1, Lcom/facebook/samples/a/a;->aaH: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v1, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v1, v1, Lcom/facebook/samples/a/a;->aaK:[F
 
     aget v1, v1, v3
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaK:[F
 
     aget v2, v2, v4
 
     sub-float/2addr v1, v2
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaL:[F
 
     aget v2, v2, v3
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaL:[F
 
     aget v5, v5, v4
 
     sub-float/2addr v2, v5
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaM:[F
 
     aget v5, v5, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaM:[F
 
     aget v6, v6, v4
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaN:[F
 
     aget v3, v6, v3
 
-    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v6, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v6, v6, Lcom/facebook/samples/a/a;->aaN:[F
 
     aget v6, v6, v4
 
@@ -1067,29 +1067,29 @@
 
     or-int/2addr v1, v4
 
-    iget-boolean v2, p0, Lcom/facebook/samples/zoomable/c;->aaW:Z
+    iget-boolean v2, p0, Lcom/facebook/samples/zoomable/c;->abf:Z
 
     if-eqz v2, :cond_4
 
-    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v2, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v2, v2, Lcom/facebook/samples/a/a;->aaM:[F
 
-    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v4, v4, Lcom/facebook/samples/a/a;->aay:I
+    iget v4, v4, Lcom/facebook/samples/a/a;->aaH: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaK:[F
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v5, v5, Lcom/facebook/samples/a/a;->aay:I
+    iget v5, v5, Lcom/facebook/samples/a/a;->aaH: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v4, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v4, v4, Lcom/facebook/samples/a/a;->aaN:[F
 
-    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v5, v5, Lcom/facebook/samples/a/a;->aay:I
+    iget v5, v5, Lcom/facebook/samples/a/a;->aaH: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;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v5, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v5, v5, Lcom/facebook/samples/a/a;->aaL:[F
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
-    iget v0, v0, Lcom/facebook/samples/a/a;->aay:I
+    iget v0, v0, Lcom/facebook/samples/a/a;->aaH: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;->kW()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()V
 
     if-eqz p1, :cond_5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kN()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/b;->kQ()V
 
     :cond_5
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abg:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abp: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;->aba:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abj: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;->aba:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abj:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kW()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()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;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abb:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk: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;->abb:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abk: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;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi: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;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abb:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abk: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;->abb:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abk: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;->aaZ:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abi:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
@@ -1272,17 +1272,17 @@
 .method public final f(Landroid/graphics/Matrix;)V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI: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;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kW()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()V
 
     return-void
 .end method
@@ -1290,15 +1290,15 @@
 .method public final isEnabled()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->aaT:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
 
     return v0
 .end method
 
-.method public final kO()V
+.method public final kR()V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI:Ljava/lang/Class;
 
     const-string v1, "onGestureEnd"
 
@@ -1307,16 +1307,16 @@
     return-void
 .end method
 
-.method public kP()Z
+.method public kS()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
-    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abf:[F
+    iget-object v1, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
 
     invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->getValues([F)V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abf:[F
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
 
     const/4 v1, 0x0
 
@@ -1351,7 +1351,7 @@
 
     if-ge v0, v2, :cond_1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abf:[F
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/c;->abo:[F
 
     aget v2, v2, v0
 
@@ -1378,10 +1378,10 @@
     return v0
 .end method
 
-.method public final kT()F
+.method public final kW()F
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
     invoke-direct {p0, v0}, Lcom/facebook/samples/zoomable/c;->g(Landroid/graphics/Matrix;)F
 
@@ -1390,18 +1390,18 @@
     return v0
 .end method
 
-.method public final kU()Z
+.method public final kX()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abg:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abp:Z
 
     return v0
 .end method
 
-.method public final kV()Landroid/graphics/Matrix;
+.method public final kY()Landroid/graphics/Matrix;
     .locals 1
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
     return-object v0
 .end method
@@ -1409,7 +1409,7 @@
 .method public final onTouchEvent(Landroid/view/MotionEvent;)Z
     .locals 10
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI:Ljava/lang/Class;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getAction()I
 
@@ -1423,15 +1423,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;->aaT:Z
+    iget-boolean v0, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_e
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aaR:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I
 
@@ -1464,9 +1464,9 @@
     goto/16 :goto_5
 
     :cond_0
-    iput v1, v0, Lcom/facebook/samples/a/a;->aaz:I
+    iput v1, v0, Lcom/facebook/samples/a/a;->aaI:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kJ()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kM()V
 
     invoke-virtual {v0}, Lcom/facebook/samples/a/a;->reset()V
 
@@ -1476,7 +1476,7 @@
     :goto_0
     if-ge v1, v4, :cond_3
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaA:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaJ:[I
 
     aget v2, v2, v1
 
@@ -1486,7 +1486,7 @@
 
     if-eq v2, v5, :cond_2
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaM:[F
 
     invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getX(I)F
 
@@ -1494,7 +1494,7 @@
 
     aput v7, v3, v1
 
-    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v3, v0, Lcom/facebook/samples/a/a;->aaN:[F
 
     invoke-virtual {p1, v2}, Landroid/view/MotionEvent;->getY(I)F
 
@@ -1508,28 +1508,28 @@
     goto :goto_0
 
     :cond_3
-    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aax:Z
+    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aaG:Z
 
     if-nez p1, :cond_4
 
-    iget p1, v0, Lcom/facebook/samples/a/a;->aay:I
+    iget p1, v0, Lcom/facebook/samples/a/a;->aaH:I
 
     if-lez p1, :cond_4
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kI()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kL()V
 
     :cond_4
-    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aax:Z
+    iget-boolean p1, v0, Lcom/facebook/samples/a/a;->aaG:Z
 
     if-eqz p1, :cond_d
 
-    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaF:Lcom/facebook/samples/a/a$a;
+    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
 
     if-eqz p1, :cond_d
 
-    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaF:Lcom/facebook/samples/a/a$a;
+    iget-object p1, v0, Lcom/facebook/samples/a/a;->aaO:Lcom/facebook/samples/a/a$a;
 
-    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->kL()V
+    invoke-interface {p1}, Lcom/facebook/samples/a/a$a;->kO()V
 
     goto :goto_5
 
@@ -1550,11 +1550,11 @@
     add-int/lit8 v2, v2, -0x1
 
     :cond_7
-    iput v2, v0, Lcom/facebook/samples/a/a;->aaz:I
+    iput v2, v0, Lcom/facebook/samples/a/a;->aaI:I
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kJ()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kM()V
 
-    iput v1, v0, Lcom/facebook/samples/a/a;->aay:I
+    iput v1, v0, Lcom/facebook/samples/a/a;->aaH:I
 
     :goto_1
     if-ge v1, v4, :cond_c
@@ -1596,14 +1596,14 @@
     :goto_3
     if-ne v7, v5, :cond_b
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaA:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaJ:[I
 
     aput v5, v2, v1
 
     goto :goto_4
 
     :cond_b
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaA:[I
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaJ:[I
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getPointerId(I)I
 
@@ -1611,9 +1611,9 @@
 
     aput v8, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaD:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaM:[F
 
-    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaB:[F
+    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaK:[F
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getX(I)F
 
@@ -1623,9 +1623,9 @@
 
     aput v9, v2, v1
 
-    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaE:[F
+    iget-object v2, v0, Lcom/facebook/samples/a/a;->aaN:[F
 
-    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaC:[F
+    iget-object v8, v0, Lcom/facebook/samples/a/a;->aaL:[F
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getY(I)F
 
@@ -1635,11 +1635,11 @@
 
     aput v7, v2, v1
 
-    iget v2, v0, Lcom/facebook/samples/a/a;->aay:I
+    iget v2, v0, Lcom/facebook/samples/a/a;->aaH:I
 
     add-int/2addr v2, v6
 
-    iput v2, v0, Lcom/facebook/samples/a/a;->aay:I
+    iput v2, v0, Lcom/facebook/samples/a/a;->aaH:I
 
     :goto_4
     add-int/lit8 v1, v1, 0x1
@@ -1647,11 +1647,11 @@
     goto :goto_1
 
     :cond_c
-    iget p1, v0, Lcom/facebook/samples/a/a;->aay:I
+    iget p1, v0, Lcom/facebook/samples/a/a;->aaH:I
 
     if-lez p1, :cond_d
 
-    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kI()V
+    invoke-virtual {v0}, Lcom/facebook/samples/a/a;->kL()V
 
     :cond_d
     :goto_5
@@ -1664,27 +1664,27 @@
 .method public reset()V
     .locals 2
 
-    sget-object v0, Lcom/facebook/samples/zoomable/c;->Gz:Ljava/lang/Class;
+    sget-object v0, Lcom/facebook/samples/zoomable/c;->GI: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;->aaR:Lcom/facebook/samples/a/b;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->aba:Lcom/facebook/samples/a/b;
 
-    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaG:Lcom/facebook/samples/a/a;
+    iget-object v0, v0, Lcom/facebook/samples/a/b;->aaP:Lcom/facebook/samples/a/a;
 
     invoke-virtual {v0}, Lcom/facebook/samples/a/a;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abc:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abl:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abd:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/c;->abm:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kW()V
+    invoke-direct {p0}, Lcom/facebook/samples/zoomable/c;->kZ()V
 
     return-void
 .end method
@@ -1692,7 +1692,7 @@
 .method public final setEnabled(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->aaT:Z
+    iput-boolean p1, p0, Lcom/facebook/samples/zoomable/c;->abc:Z
 
     if-nez p1, :cond_0
 
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 99a50b7311..e12b0a281b 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 abh:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+.field private final abq:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
 
-.field private final abi:Landroid/graphics/PointF;
+.field private final abr:Landroid/graphics/PointF;
 
-.field private final abj:Landroid/graphics/PointF;
+.field private final abs:Landroid/graphics/PointF;
 
-.field private abk:F
+.field private abt:F
 
-.field private abl:Z
+.field private abu:Z
 
 
 # direct methods
@@ -25,23 +25,23 @@
 
     invoke-direct {v0}, Landroid/graphics/PointF;-><init>()V
 
-    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->abi:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->abr: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;->abj:Landroid/graphics/PointF;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/facebook/samples/zoomable/d;->abk:F
+    iput v0, p0, Lcom/facebook/samples/zoomable/d;->abt:F
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->abl:Z
+    iput-boolean v0, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
 
-    iput-object p1, p0, Lcom/facebook/samples/zoomable/d;->abh:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iput-object p1, p0, Lcom/facebook/samples/zoomable/d;->abq: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;->abi:Landroid/graphics/PointF;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->abr: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;->abk:F
+    iget p1, p0, Lcom/facebook/samples/zoomable/d;->abt:F
 
     div-float/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget p1, p0, Lcom/facebook/samples/zoomable/d;->abk:F
+    iget p1, p0, Lcom/facebook/samples/zoomable/d;->abt: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;->abh:Lcom/facebook/samples/zoomable/ZoomableDraweeView;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/d;->abq: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;->abl:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
 
     if-nez p1, :cond_2
 
     iget p1, v4, Landroid/graphics/PointF;->x:F
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abi:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abr: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;->abi:Landroid/graphics/PointF;
+    iget-object v5, p0, Lcom/facebook/samples/zoomable/d;->abr: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;->abl:Z
+    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
 
-    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abl:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
 
     if-eqz p1, :cond_8
 
@@ -197,16 +197,16 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abj:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abi:Landroid/graphics/PointF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abr: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;->abl:Z
+    iget-boolean p1, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
 
     if-eqz p1, :cond_5
 
@@ -214,20 +214,20 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abj:Landroid/graphics/PointF;
+    iget-object v2, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
 
-    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abi:Landroid/graphics/PointF;
+    iget-object v3, p0, Lcom/facebook/samples/zoomable/d;->abr: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;->aaY:F
+    iget v2, v1, Lcom/facebook/samples/zoomable/c;->abh:F
 
-    iget p1, v1, Lcom/facebook/samples/zoomable/c;->aaX:F
+    iget p1, v1, Lcom/facebook/samples/zoomable/c;->abg:F
 
-    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kT()F
+    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kW()F
 
     move-result v5
 
@@ -255,24 +255,24 @@
     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;->abl:Z
+    iput-boolean v7, p0, Lcom/facebook/samples/zoomable/d;->abu:Z
 
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abi:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abr:Landroid/graphics/PointF;
 
     invoke-virtual {p1, v4}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abj:Landroid/graphics/PointF;
+    iget-object p1, p0, Lcom/facebook/samples/zoomable/d;->abs:Landroid/graphics/PointF;
 
     invoke-virtual {p1, v3}, Landroid/graphics/PointF;->set(Landroid/graphics/PointF;)V
 
-    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kT()F
+    invoke-virtual {v1}, Lcom/facebook/samples/zoomable/a;->kW()F
 
     move-result p1
 
-    iput p1, p0, Lcom/facebook/samples/zoomable/d;->abk:F
+    iput p1, p0, Lcom/facebook/samples/zoomable/d;->abt: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 821d45718b..9cdb78ccbe 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 abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+.field abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iput-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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;->abm:Landroid/view/GestureDetector$SimpleOnGestureListener;
+    iget-object v0, p0, Lcom/facebook/samples/zoomable/e;->abv: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 93597e035a..cced9cbfd4 100644
--- a/com.discord/smali_classes2/com/facebook/samples/zoomable/f.smali
+++ b/com.discord/smali_classes2/com/facebook/samples/zoomable/f.smali
@@ -42,16 +42,16 @@
 .method public abstract isEnabled()Z
 .end method
 
-.method public abstract kP()Z
+.method public abstract kS()Z
 .end method
 
-.method public abstract kT()F
+.method public abstract kW()F
 .end method
 
-.method public abstract kU()Z
+.method public abstract kX()Z
 .end method
 
-.method public abstract kV()Landroid/graphics/Matrix;
+.method public abstract kY()Landroid/graphics/Matrix;
 .end method
 
 .method public abstract onTouchEvent(Landroid/view/MotionEvent;)Z
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 d401a3a37b..632b9996fb 100644
--- a/com.discord/smali_classes2/com/facebook/soloader/SoLoader$1.smali
+++ b/com.discord/smali_classes2/com/facebook/soloader/SoLoader$1.smali
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field final synthetic abX:Z
+.field final synthetic acg:Z
 
-.field final synthetic abY:Ljava/lang/String;
+.field final synthetic ach:Ljava/lang/String;
 
-.field final synthetic abZ:Ljava/lang/String;
+.field final synthetic aci:Ljava/lang/String;
 
-.field final synthetic aca:Ljava/lang/Runtime;
+.field final synthetic acj:Ljava/lang/Runtime;
 
-.field final synthetic acb:Ljava/lang/reflect/Method;
+.field final synthetic acl: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;->abX:Z
+    iput-boolean p1, p0, Lcom/facebook/soloader/SoLoader$1;->acg:Z
 
-    iput-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->abY:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->ach:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/facebook/soloader/SoLoader$1;->abZ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/facebook/soloader/SoLoader$1;->aci:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/facebook/soloader/SoLoader$1;->aca:Ljava/lang/Runtime;
+    iput-object p4, p0, Lcom/facebook/soloader/SoLoader$1;->acj:Ljava/lang/Runtime;
 
-    iput-object p5, p0, Lcom/facebook/soloader/SoLoader$1;->acb:Ljava/lang/reflect/Method;
+    iput-object p5, p0, Lcom/facebook/soloader/SoLoader$1;->acl:Ljava/lang/reflect/Method;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -178,7 +178,7 @@
 .method public final g(Ljava/lang/String;I)V
     .locals 8
 
-    iget-boolean v0, p0, Lcom/facebook/soloader/SoLoader$1;->abX:Z
+    iget-boolean v0, p0, Lcom/facebook/soloader/SoLoader$1;->acg: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;->abY:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->ach:Ljava/lang/String;
 
     goto :goto_1
 
     :cond_1
-    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->abZ:Ljava/lang/String;
+    iget-object p2, p0, Lcom/facebook/soloader/SoLoader$1;->aci:Ljava/lang/String;
 
     :goto_1
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/facebook/soloader/SoLoader$1;->aca:Ljava/lang/Runtime;
+    iget-object v3, p0, Lcom/facebook/soloader/SoLoader$1;->acj: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;->acb:Ljava/lang/reflect/Method;
+    iget-object v4, p0, Lcom/facebook/soloader/SoLoader$1;->acl:Ljava/lang/reflect/Method;
 
-    iget-object v5, p0, Lcom/facebook/soloader/SoLoader$1;->aca:Ljava/lang/Runtime;
+    iget-object v5, p0, Lcom/facebook/soloader/SoLoader$1;->acj:Ljava/lang/Runtime;
 
     const/4 v6, 0x3
 
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 4e22577a90..dbe39f2f34 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 lh()Ljava/lang/String;
+.method public static lk()Ljava/lang/String;
     .locals 5
 
     const-class v0, Lcom/facebook/soloader/SoLoader;
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 ac20b621ae..60970403d2 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 abv:Ljava/io/File;
+.field private abE:Ljava/io/File;
 
-.field final synthetic abw:Lcom/facebook/soloader/a;
+.field final synthetic abF:Lcom/facebook/soloader/a;
 
 .field private final mFlags:I
 
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/facebook/soloader/a$a;->abw:Lcom/facebook/soloader/a;
+    iput-object p1, p0, Lcom/facebook/soloader/a$a;->abF: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;->abv:Ljava/io/File;
+    iput-object p2, p0, Lcom/facebook/soloader/a$a;->abE: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;->abw:Lcom/facebook/soloader/a;
+    iget-object v1, p0, Lcom/facebook/soloader/a$a;->abF:Lcom/facebook/soloader/a;
 
-    iget-object v1, v1, Lcom/facebook/soloader/a;->acc:Ljava/lang/String;
+    iget-object v1, v1, Lcom/facebook/soloader/a;->acm: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;->abw:Lcom/facebook/soloader/a;
+    iget-object p1, p0, Lcom/facebook/soloader/a$a;->abF:Lcom/facebook/soloader/a;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/facebook/soloader/a;->acc:Ljava/lang/String;
+    iput-object v0, p1, Lcom/facebook/soloader/a;->acm: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;->abv:Ljava/io/File;
+    iget-object v4, p0, Lcom/facebook/soloader/a$a;->abE: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 b2eb1f05a4..644806cf0e 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 kY()Lcom/facebook/soloader/k$e;
+.method protected final lb()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 kZ()[B
+.method protected final lc()[B
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/a;->abz:Ljava/io/File;
+    iget-object v0, p0, Lcom/facebook/soloader/a;->abI: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 473593ab21..e12fe8e5d2 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 abx:Lcom/facebook/soloader/c;
+.field private abG: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;->abx:Lcom/facebook/soloader/c;
+    iput-object p1, p0, Lcom/facebook/soloader/b;->abG:Lcom/facebook/soloader/c;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->abx:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abG: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;->abx:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abG:Lcom/facebook/soloader/c;
 
     invoke-virtual {v0, p1}, Lcom/facebook/soloader/c;->aF(I)V
 
     return-void
 .end method
 
-.method public final la()Z
+.method public final ld()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;->abx:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abG:Lcom/facebook/soloader/c;
 
-    iget-object v0, v0, Lcom/facebook/soloader/c;->aby:Ljava/io/File;
+    iget-object v0, v0, Lcom/facebook/soloader/c;->abH: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;->abx:Lcom/facebook/soloader/c;
+    iput-object v0, p0, Lcom/facebook/soloader/b;->abG:Lcom/facebook/soloader/c;
 
-    iget-object v0, p0, Lcom/facebook/soloader/b;->abx:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abG: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;->abx:Lcom/facebook/soloader/c;
+    iget-object v0, p0, Lcom/facebook/soloader/b;->abG: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 b2e953ff31..8cb9c810d4 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 abB:Ljava/util/zip/ZipEntry;
+.field final abK:Ljava/util/zip/ZipEntry;
 
-.field final abC:I
+.field final abL: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;->abB:Ljava/util/zip/ZipEntry;
+    iput-object p2, p0, Lcom/facebook/soloader/e$a;->abK:Ljava/util/zip/ZipEntry;
 
-    iput p3, p0, Lcom/facebook/soloader/e$a;->abC:I
+    iput p3, p0, Lcom/facebook/soloader/e$a;->abL: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 e568e8cdea..5a3dca1ead 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 abH:I
+.field private abQ:I
 
-.field final synthetic abI:Lcom/facebook/soloader/e$b;
+.field final synthetic abR: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;->abI:Lcom/facebook/soloader/e$b;
+    iput-object p1, p0, Lcom/facebook/soloader/e$b$a;->abR: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;->abI:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->lb()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->le()[Lcom/facebook/soloader/e$a;
 
-    iget v0, p0, Lcom/facebook/soloader/e$b$a;->abH:I
+    iget v0, p0, Lcom/facebook/soloader/e$b$a;->abQ:I
 
-    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abI:Lcom/facebook/soloader/e$b;
+    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
 
-    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abD:[Lcom/facebook/soloader/e$a;
+    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
 
     array-length v1, v1
 
@@ -68,7 +68,7 @@
     return v0
 .end method
 
-.method public final le()Lcom/facebook/soloader/k$c;
+.method public final lh()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;->abI:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
 
-    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->lb()[Lcom/facebook/soloader/e$a;
+    invoke-virtual {v0}, Lcom/facebook/soloader/e$b;->le()[Lcom/facebook/soloader/e$a;
 
-    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abI:Lcom/facebook/soloader/e$b;
+    iget-object v0, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
 
-    iget-object v0, v0, Lcom/facebook/soloader/e$b;->abD:[Lcom/facebook/soloader/e$a;
+    iget-object v0, v0, Lcom/facebook/soloader/e$b;->abM:[Lcom/facebook/soloader/e$a;
 
-    iget v1, p0, Lcom/facebook/soloader/e$b$a;->abH:I
+    iget v1, p0, Lcom/facebook/soloader/e$b$a;->abQ:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lcom/facebook/soloader/e$b$a;->abH:I
+    iput v2, p0, Lcom/facebook/soloader/e$b$a;->abQ:I
 
     aget-object v0, v0, v1
 
-    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abI:Lcom/facebook/soloader/e$b;
+    iget-object v1, p0, Lcom/facebook/soloader/e$b$a;->abR:Lcom/facebook/soloader/e$b;
 
-    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abE:Ljava/util/zip/ZipFile;
+    iget-object v1, v1, Lcom/facebook/soloader/e$b;->abN:Ljava/util/zip/ZipFile;
 
-    iget-object v2, v0, Lcom/facebook/soloader/e$a;->abB:Ljava/util/zip/ZipEntry;
+    iget-object v2, v0, Lcom/facebook/soloader/e$a;->abK: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 1696afc9f1..006a0d81c8 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 abA:Ljava/lang/String;
+.field protected final abI:Ljava/io/File;
 
-.field protected final abz:Ljava/io/File;
+.field protected final abJ: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;->abz:Ljava/io/File;
+    iput-object p3, p0, Lcom/facebook/soloader/e;->abI:Ljava/io/File;
 
-    iput-object p4, p0, Lcom/facebook/soloader/e;->abA:Ljava/lang/String;
+    iput-object p4, p0, Lcom/facebook/soloader/e;->abJ:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected kY()Lcom/facebook/soloader/k$e;
+.method protected lb()Lcom/facebook/soloader/k$e;
     .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 dee1fbf5e4..73a273e87a 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 acf:Ljava/io/File;
+.field final synthetic acp:Ljava/io/File;
 
-.field final synthetic acg:[B
+.field final synthetic acq:[B
 
-.field final synthetic ach:Lcom/facebook/soloader/k$b;
+.field final synthetic acr:Lcom/facebook/soloader/k$b;
 
-.field final synthetic aci:Ljava/io/File;
+.field final synthetic acs:Ljava/io/File;
 
-.field final synthetic acj:Lcom/facebook/soloader/f;
+.field final synthetic act:Lcom/facebook/soloader/f;
 
-.field final synthetic acl:Lcom/facebook/soloader/k;
+.field final synthetic acu: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;->acl:Lcom/facebook/soloader/k;
+    iput-object p1, p0, Lcom/facebook/soloader/k$1;->acu:Lcom/facebook/soloader/k;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$1;->acf:Ljava/io/File;
+    iput-object p2, p0, Lcom/facebook/soloader/k$1;->acp:Ljava/io/File;
 
-    iput-object p3, p0, Lcom/facebook/soloader/k$1;->acg:[B
+    iput-object p3, p0, Lcom/facebook/soloader/k$1;->acq:[B
 
-    iput-object p4, p0, Lcom/facebook/soloader/k$1;->ach:Lcom/facebook/soloader/k$b;
+    iput-object p4, p0, Lcom/facebook/soloader/k$1;->acr:Lcom/facebook/soloader/k$b;
 
-    iput-object p5, p0, Lcom/facebook/soloader/k$1;->aci:Ljava/io/File;
+    iput-object p5, p0, Lcom/facebook/soloader/k$1;->acs:Ljava/io/File;
 
-    iput-object p6, p0, Lcom/facebook/soloader/k$1;->acj:Lcom/facebook/soloader/f;
+    iput-object p6, p0, Lcom/facebook/soloader/k$1;->act: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;->acf:Ljava/io/File;
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->acp: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;->acg:[B
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->acq:[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;->acl:Lcom/facebook/soloader/k;
+    iget-object v5, p0, Lcom/facebook/soloader/k$1;->acu:Lcom/facebook/soloader/k;
 
-    iget-object v5, v5, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v5, v5, Lcom/facebook/soloader/k;->abH: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;->ach:Lcom/facebook/soloader/k$b;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->acr: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;->acl:Lcom/facebook/soloader/k;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->acu:Lcom/facebook/soloader/k;
 
-    iget-object v1, v1, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v1, v1, Lcom/facebook/soloader/k;->abH:Ljava/io/File;
 
     invoke-static {v1}, Lcom/facebook/soloader/SysUtil;->s(Ljava/io/File;)V
 
-    iget-object v1, p0, Lcom/facebook/soloader/k$1;->aci:Ljava/io/File;
+    iget-object v1, p0, Lcom/facebook/soloader/k$1;->acs: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;->acl:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/k$1;->acu:Lcom/facebook/soloader/k;
 
-    iget-object v2, v2, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v2, v2, Lcom/facebook/soloader/k;->abH: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;->acj:Lcom/facebook/soloader/f;
+    iget-object v0, p0, Lcom/facebook/soloader/k$1;->act: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;->acl:Lcom/facebook/soloader/k;
+    iget-object v2, p0, Lcom/facebook/soloader/k$1;->acu:Lcom/facebook/soloader/k;
 
-    iget-object v2, v2, Lcom/facebook/soloader/k;->aby:Ljava/io/File;
+    iget-object v2, v2, Lcom/facebook/soloader/k;->abH: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;->acj:Lcom/facebook/soloader/f;
+    iget-object v0, p0, Lcom/facebook/soloader/k$1;->act: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 e662a9d34b..03760ecda5 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 acm:Ljava/lang/String;
+.field public final acv: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;->acm:Ljava/lang/String;
+    iput-object p2, p0, Lcom/facebook/soloader/k$a;->acv: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 7262da8e9b..02ed7a9260 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 acn:[Lcom/facebook/soloader/k$a;
+.field public final acw:[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;->acn:[Lcom/facebook/soloader/k$a;
+    iput-object p1, p0, Lcom/facebook/soloader/k$b;->acw:[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;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v0, p0, Lcom/facebook/soloader/k$b;->acw:[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;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v1, p0, Lcom/facebook/soloader/k$b;->acw:[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;->acn:[Lcom/facebook/soloader/k$a;
+    iget-object v1, p0, Lcom/facebook/soloader/k$b;->acw:[Lcom/facebook/soloader/k$a;
 
     aget-object v1, v1, v0
 
-    iget-object v1, v1, Lcom/facebook/soloader/k$a;->acm:Ljava/lang/String;
+    iget-object v1, v1, Lcom/facebook/soloader/k$a;->acv: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 548cdb0a67..8fc6e4af68 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 aco:Lcom/facebook/soloader/k$a;
+.field public final acx:Lcom/facebook/soloader/k$a;
 
-.field public final acp:Ljava/io/InputStream;
+.field public final acy: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;->aco:Lcom/facebook/soloader/k$a;
+    iput-object p1, p0, Lcom/facebook/soloader/k$c;->acx:Lcom/facebook/soloader/k$a;
 
-    iput-object p2, p0, Lcom/facebook/soloader/k$c;->acp:Ljava/io/InputStream;
+    iput-object p2, p0, Lcom/facebook/soloader/k$c;->acy:Ljava/io/InputStream;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/facebook/soloader/k$c;->acp:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/facebook/soloader/k$c;->acy: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 f1f160288b..040adee104 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 le()Lcom/facebook/soloader/k$c;
+.method public abstract lh()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 f8dd4bf282..c3ab3c096c 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 acu:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+.field private acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-.field private acv:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+.field private acE: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;->acu:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    iput-object p2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acv:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iput-object p2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acE:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
 
-    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acu:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acD:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
 
-    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->li()Ljava/util/List;
+    invoke-interface {p2}, Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;->ll()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;->acu:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acD: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;->bqt:J
+    iget-wide v4, v3, Lokhttp3/l;->bqD:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -110,13 +110,13 @@
     goto :goto_0
 
     :cond_2
-    iget-boolean v4, v3, Lokhttp3/l;->bqy:Z
+    iget-boolean v4, v3, Lokhttp3/l;->bqI:Z
 
     if-eqz v4, :cond_3
 
-    iget-object v4, p1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->bqE: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;->bqW:Ljava/lang/String;
+    iget-object v4, p1, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v5, v3, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v5, v3, Lokhttp3/l;->bqE:Ljava/lang/String;
 
     invoke-static {v4, v5}, Lokhttp3/l;->af(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -150,11 +150,11 @@
     goto :goto_3
 
     :cond_5
-    iget-boolean v4, v3, Lokhttp3/l;->bqv:Z
+    iget-boolean v4, v3, Lokhttp3/l;->bqF:Z
 
     if-eqz v4, :cond_6
 
-    invoke-virtual {p1}, Lokhttp3/s;->Fl()Z
+    invoke-virtual {p1}, Lokhttp3/s;->Fo()Z
 
     move-result v4
 
@@ -173,7 +173,7 @@
     goto :goto_0
 
     :cond_7
-    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acv:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iget-object p1, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acE: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;->acu:Lcom/franmontiel/persistentcookiejar/cache/CookieCache;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acD: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;->acv:Lcom/franmontiel/persistentcookiejar/persistence/CookiePersistor;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/PersistentCookieJar;->acE: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;->bqx:Z
+    iget-boolean v3, v2, Lokhttp3/l;->bqH:Z
 
     if-eqz v3, :cond_0
 
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 a41b3754c0..ccf43e4741 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 acw:Lokhttp3/l;
+.field acF: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;->acw:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->name:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acw:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->bqE:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acw:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-object v2, v2, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/l;->bqE: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;->acw:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
     iget-object v0, v0, Lokhttp3/l;->path:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acw:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v0, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqv:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqF:Z
 
-    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acw:Lokhttp3/l;
+    iget-object v2, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v2, v2, Lokhttp3/l;->bqv:Z
+    iget-boolean v2, v2, Lokhttp3/l;->bqF:Z
 
     if-ne v0, v2, :cond_1
 
-    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acw:Lokhttp3/l;
+    iget-object p1, p1, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean p1, p1, Lokhttp3/l;->bqy:Z
+    iget-boolean p1, p1, Lokhttp3/l;->bqI:Z
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqy:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqI: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;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-object v1, v1, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v1, v1, Lokhttp3/l;->bqE: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;->acw:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bqv:Z
+    iget-boolean v1, v1, Lokhttp3/l;->bqF: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;->acw:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v1, v1, Lokhttp3/l;->bqy:Z
+    iget-boolean v1, v1, Lokhttp3/l;->bqI: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 e3606ff96e..0a6f69cf59 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 acy:Ljava/util/Iterator;
+.field private acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,14 +37,14 @@
     .end annotation
 .end field
 
-.field final synthetic acz:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+.field final synthetic acI: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;->acz:Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acI: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;->acy:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acH: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;->acw:Lokhttp3/l;
+    iget-object v0, v0, Lcom/franmontiel/persistentcookiejar/cache/IdentifiableCookie;->acF: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache$SetCookieCacheIterator;->acH: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 589b55d7ad..d2e2240add 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 acx:Ljava/util/Set;
+.field private acG: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;->acx:Ljava/util/Set;
+    iput-object v0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acG: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;->acx:Ljava/util/Set;
+    iget-object p0, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acG: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;->acx:Ljava/util/Set;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acG:Ljava/util/Set;
 
     invoke-interface {v1, v0}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acx:Ljava/util/Set;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/cache/SetCookieCache;->acG: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 bfad410117..5b580f1ce8 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 li()Ljava/util/List;
+.method public abstract ll()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 e34919301f..99575c6952 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 acA:J = 0x0L
+.field private static acJ:J = 0x0L
 
 .field private static final serialVersionUID:J = -0x77442f0b309f5e9eL
 
 
 # instance fields
-.field private transient acw:Lokhttp3/l;
+.field private transient acF:Lokhttp3/l;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     const-wide/16 v0, -0x1
 
-    sput-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acA:J
+    sput-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acJ:J
 
     return-void
 .end method
@@ -120,7 +120,7 @@
 
     check-cast p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;
 
-    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF: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;->acA:J
+    sget-wide v3, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acJ:J
 
     const/4 v5, 0x1
 
@@ -372,9 +372,9 @@
     move-wide v1, v3
 
     :cond_1
-    iput-wide v1, v0, Lokhttp3/l$a;->bqt:J
+    iput-wide v1, v0, Lokhttp3/l$a;->bqD:J
 
-    iput-boolean v5, v0, Lokhttp3/l$a;->bqx:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bqH: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;->bqv:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bqF: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;->bqw:Z
+    iput-boolean v5, v0, Lokhttp3/l$a;->bqG: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;->acw:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
     return-void
 
@@ -492,63 +492,63 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqx:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqH:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
-    iget-wide v0, v0, Lokhttp3/l;->bqt:J
+    iget-wide v0, v0, Lokhttp3/l;->bqD:J
 
     goto :goto_0
 
     :cond_0
-    sget-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acA:J
+    sget-wide v0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acJ:J
 
     :goto_0
     invoke-virtual {p1, v0, v1}, Ljava/io/ObjectOutputStream;->writeLong(J)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
-    iget-object v0, v0, Lokhttp3/l;->bqu:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/l;->bqE:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeObject(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF: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;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqv:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqF:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqw:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqG:Z
 
     invoke-virtual {p1, v0}, Ljava/io/ObjectOutputStream;->writeBoolean(Z)V
 
-    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acw:Lokhttp3/l;
+    iget-object v0, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF:Lokhttp3/l;
 
-    iget-boolean v0, v0, Lokhttp3/l;->bqy:Z
+    iget-boolean v0, v0, Lokhttp3/l;->bqI: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;->acw:Lokhttp3/l;
+    iput-object p1, p0, Lcom/franmontiel/persistentcookiejar/persistence/SerializableCookie;->acF: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 85c4cf10cf..3137a1c164 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;->bqv:Z
+    iget-boolean v1, p0, Lokhttp3/l;->bqF: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;->bqu:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/l;->bqE: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 li()Ljava/util/List;
+.method public final ll()Ljava/util/List;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 07d04725c0..da9943feea 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexItem.smali
@@ -28,16 +28,7 @@
 .method public abstract getWidth()I
 .end method
 
-.method public abstract lk()F
-.end method
-
-.method public abstract ll()F
-.end method
-
-.method public abstract lm()I
-.end method
-
-.method public abstract ln()Z
+.method public abstract ln()F
 .end method
 
 .method public abstract lo()F
@@ -46,11 +37,20 @@
 .method public abstract lp()I
 .end method
 
-.method public abstract lq()I
+.method public abstract lq()Z
 .end method
 
-.method public abstract lr()I
+.method public abstract lr()F
 .end method
 
 .method public abstract ls()I
 .end method
+
+.method public abstract lt()I
+.end method
+
+.method public abstract lu()I
+.end method
+
+.method public abstract lv()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 a79fb54312..787061f95c 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 adj:I
+.field private ads:I
 
-.field private adk:F
+.field private adt:F
 
-.field private adl:F
+.field private adu:F
 
-.field private adm:I
+.field private adv:I
 
-.field private adn:F
+.field private adw:F
 
-.field private ado:Z
+.field private adx:Z
 
 .field private mMaxHeight:I
 
@@ -71,23 +71,23 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     const/4 v3, -0x1
 
-    iput v3, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput v3, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     const/high16 v4, -0x40800000    # -1.0f
 
-    iput v4, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput v4, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
 
     const v5, 0xffffff
 
@@ -107,7 +107,7 @@
 
     move-result p2
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads: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;->adk:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt: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;->adl:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu: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;->adm:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv: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;->adn:F
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw: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;->ado:Z
+    iput-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx: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;->adj:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     const/4 v2, 0x0
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     const/high16 v2, 0x3f800000    # 1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     const/4 v2, -0x1
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     const/high16 v2, -0x40800000    # -1.0f
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
 
     const v2, 0xffffff
 
@@ -225,31 +225,31 @@
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v2
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw: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;->ado:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx: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;->adj:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
 
     const p1, 0xffffff
 
@@ -366,23 +366,23 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
 
     const p1, 0xffffff
 
@@ -400,23 +400,23 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw: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;->adj:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
-    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iget v0, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw: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;->ado:Z
+    iget-boolean p1, p1, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx:Z
 
-    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:Z
+    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx: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;->adj:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     return v0
 .end method
@@ -533,34 +533,10 @@
     return v0
 .end method
 
-.method public final lk()F
+.method public final ln()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
-
-    return v0
-.end method
-
-.method public final ll()F
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
-
-    return v0
-.end method
-
-.method public final lm()I
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
-
-    return v0
-.end method
-
-.method public final ln()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ado:Z
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     return v0
 .end method
@@ -568,7 +544,7 @@
 .method public final lo()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     return v0
 .end method
@@ -576,12 +552,36 @@
 .method public final lp()I
     .locals 1
 
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
+
+    return v0
+.end method
+
+.method public final lq()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx:Z
+
+    return v0
+.end method
+
+.method public final lr()F
+    .locals 1
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw:F
+
+    return v0
+.end method
+
+.method public final ls()I
+    .locals 1
+
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->leftMargin:I
 
     return v0
 .end method
 
-.method public final lq()I
+.method public final lt()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->topMargin:I
@@ -589,7 +589,7 @@
     return v0
 .end method
 
-.method public final lr()I
+.method public final lu()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->rightMargin:I
@@ -597,7 +597,7 @@
     return v0
 .end method
 
-.method public final ls()I
+.method public final lv()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->bottomMargin:I
@@ -608,23 +608,23 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adj:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->ads:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adk:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adt:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adl:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adu:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adm:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adv:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adn:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adw: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;->ado:Z
+    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayout$LayoutParams;->adx: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 368b1e5254..99a31665b3 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 acQ:Ljava/util/List;
+.field private acZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,35 +25,35 @@
     .end annotation
 .end field
 
-.field private acT:I
-
-.field private acU:I
-
-.field private acV:I
-
-.field private acW:I
-
-.field private acX:I
-
-.field private acY:Landroid/graphics/drawable/Drawable;
-
-.field private acZ:Landroid/graphics/drawable/Drawable;
-
-.field private ada:I
-
-.field private adb:I
-
 .field private adc:I
 
 .field private ade:I
 
-.field private adf:[I
+.field private adf:I
 
-.field private adg:Landroid/util/SparseIntArray;
+.field private adg:I
 
-.field private adh:Lcom/google/android/flexbox/c;
+.field private adh:I
 
-.field private adi:Lcom/google/android/flexbox/c$a;
+.field private adi:Landroid/graphics/drawable/Drawable;
+
+.field private adj:Landroid/graphics/drawable/Drawable;
+
+.field private adk:I
+
+.field private adl:I
+
+.field private adm:I
+
+.field private adn:I
+
+.field private ado:[I
+
+.field private adp:Landroid/util/SparseIntArray;
+
+.field private adq:Lcom/google/android/flexbox/c;
+
+.field private adr: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;->adh:Lcom/google/android/flexbox/c;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->acQ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->adi:Lcom/google/android/flexbox/c$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr: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;->acT:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->acU:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acV:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->acW:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->acX:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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;->adb:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk: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;->adb:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->ada:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk: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;->acZ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->acZ:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acK:I
+    iget v7, v5, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v7, v6
 
@@ -584,14 +584,14 @@
 
     sub-int/2addr v7, v10
 
-    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->acD:I
+    iget v11, v5, Lcom/google/android/flexbox/b;->acM: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;->adb:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     and-int/lit8 v7, v7, 0x4
 
@@ -618,7 +618,7 @@
 
     sub-int/2addr v7, v8
 
-    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->acD:I
+    iget v9, v5, Lcom/google/android/flexbox/b;->acM: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;->adc:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     sub-int/2addr v6, v7
 
@@ -675,7 +675,7 @@
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk: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;->adc:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     sub-int/2addr v5, v6
 
@@ -733,7 +733,7 @@
 
     move-result v5
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->adc:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     sub-int/2addr v5, v10
 
     add-int/2addr v8, v10
 
     :cond_0
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->acV:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
 
     const/4 v15, 0x4
 
@@ -793,13 +793,13 @@
 
     if-ne v10, v15, :cond_2
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lt()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v7
 
     if-eqz v7, :cond_1
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acK: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;->acV:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->lt()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v7
 
@@ -869,7 +869,7 @@
     const/high16 v7, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v12, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acK: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;->acB:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v10, v4, v10
 
@@ -900,7 +900,7 @@
 
     int-to-float v7, v7
 
-    iget v14, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v14, v4, v14
 
@@ -913,7 +913,7 @@
     goto :goto_4
 
     :cond_6
-    iget v7, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v7, v4, v7
 
@@ -921,7 +921,7 @@
 
     int-to-float v10, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v7, v1
 
@@ -952,7 +952,7 @@
 
     if-ge v14, v12, :cond_10
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v12, v14
 
@@ -996,7 +996,7 @@
 
     if-eqz v12, :cond_8
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     int-to-float v13, v12
 
@@ -1028,7 +1028,7 @@
 
     if-ne v14, v10, :cond_9
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     const/16 v16, 0x4
 
@@ -1036,7 +1036,7 @@
 
     if-lez v10, :cond_a
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     move/from16 v21, v10
 
@@ -1049,7 +1049,7 @@
     const/16 v21, 0x0
 
     :goto_8
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->acU:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
 
     const/4 v12, 0x2
 
@@ -1057,7 +1057,7 @@
 
     if-eqz p1, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->acD:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->acM:I
 
     add-int/2addr v8, v1
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->acM:I
 
     sub-int/2addr v5, v1
 
@@ -1373,7 +1373,7 @@
 
     sub-int/2addr v5, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->ade:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     add-int/2addr v5, v10
 
     sub-int/2addr v8, v10
 
     :cond_0
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->acV:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
 
     const/4 v15, 0x4
 
@@ -1433,13 +1433,13 @@
 
     if-ne v10, v15, :cond_2
 
-    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lt()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v10
 
     if-eqz v10, :cond_1
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acK: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;->acV:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->lt()I
+    invoke-virtual {v9}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v7
 
@@ -1509,7 +1509,7 @@
     const/high16 v7, 0x3f800000    # 1.0f
 
     :goto_2
-    iget v10, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acK: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;->acB:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v10, v6, v10
 
@@ -1546,7 +1546,7 @@
 
     int-to-float v7, v7
 
-    iget v10, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v10, v6, v10
 
@@ -1559,7 +1559,7 @@
     goto :goto_4
 
     :cond_6
-    iget v7, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v7, v6, v7
 
@@ -1567,7 +1567,7 @@
 
     int-to-float v12, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v7, v1
 
@@ -1598,7 +1598,7 @@
 
     if-ge v7, v11, :cond_10
 
-    iget v11, v9, Lcom/google/android/flexbox/b;->acK:I
+    iget v11, v9, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v11, v7
 
@@ -1642,7 +1642,7 @@
 
     if-eqz v11, :cond_8
 
-    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v11, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     int-to-float v13, v11
 
@@ -1672,7 +1672,7 @@
 
     if-ne v7, v10, :cond_9
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     const/16 v16, 0x4
 
@@ -1680,7 +1680,7 @@
 
     if-lez v10, :cond_a
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     move/from16 v23, v10
 
@@ -1697,7 +1697,7 @@
 
     if-eqz p2, :cond_b
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->acD:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acM:I
 
     add-int/2addr v5, v7
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acM:I
 
     sub-int/2addr v8, v7
 
@@ -1971,7 +1971,7 @@
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ado:[I
 
     array-length v1, v0
 
@@ -2002,7 +2002,7 @@
 
     if-ltz p1, :cond_7
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/2addr p1, v1
 
@@ -2039,7 +2039,7 @@
     return v0
 
     :cond_2
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     and-int/2addr p1, v1
 
@@ -2051,13 +2051,13 @@
     return v0
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2069,7 +2069,7 @@
     return v0
 
     :cond_6
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->acQ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->lt()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v2
 
@@ -2126,7 +2126,7 @@
 
     if-ltz p1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->lt()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v2
 
@@ -2172,13 +2172,13 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
     if-eqz p1, :cond_4
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/lit8 p1, p1, 0x4
 
@@ -2190,7 +2190,7 @@
     return v0
 
     :cond_4
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->acY:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi: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;->adc:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->acY:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi: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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acK:I
+    iget v7, v5, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v7, v6
 
@@ -2330,14 +2330,14 @@
 
     sub-int/2addr v7, v10
 
-    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v10, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->acD:I
+    iget v11, v5, Lcom/google/android/flexbox/b;->acM: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;->ada:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/lit8 v7, v7, 0x4
 
@@ -2364,7 +2364,7 @@
 
     sub-int/2addr v7, v8
 
-    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v8, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm: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;->acD:I
+    iget v9, v5, Lcom/google/android/flexbox/b;->acM: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;->ade:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     sub-int/2addr v6, v7
 
@@ -2421,7 +2421,7 @@
 
     if-eqz v6, :cond_8
 
-    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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;->ade:I
+    iget v6, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     sub-int/2addr v5, v6
 
@@ -2452,14 +2452,14 @@
     return-void
 .end method
 
-.method private lv()V
+.method private ly()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr: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;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acQ:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->acW:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     const/4 v2, 0x3
 
     if-ne v0, v2, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acK:I
+    iget v5, v2, Lcom/google/android/flexbox/b;->acT: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;->acU:I
+    iget v7, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
 
     const/4 v8, 0x2
 
     if-eq v7, v8, :cond_0
 
-    iget v7, v2, Lcom/google/android/flexbox/b;->acH:I
+    iget v7, v2, Lcom/google/android/flexbox/b;->acQ: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;->acH:I
+    iget v7, v2, Lcom/google/android/flexbox/b;->acQ: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;->acD:I
+    iput v4, v2, Lcom/google/android/flexbox/b;->acM:I
 
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->getPaddingTop()I
 
@@ -2675,15 +2675,15 @@
 
     invoke-virtual {v0, p1, p2, v2}, Lcom/google/android/flexbox/c;->f(III)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v0, v1}, Lcom/google/android/flexbox/c;->aK(I)V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget v1, v1, Lcom/google/android/flexbox/c$a;->acR:I
+    iget v1, v1, Lcom/google/android/flexbox/c$a;->ada:I
 
     invoke-direct {p0, v0, p1, p2, v1}, Lcom/google/android/flexbox/FlexboxLayout;->a(IIII)V
 
@@ -2703,13 +2703,13 @@
 
     if-eqz p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     and-int/2addr p1, v0
 
@@ -2721,7 +2721,7 @@
     return p2
 
     :cond_1
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/2addr p1, v0
 
@@ -2733,13 +2733,13 @@
     return p2
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2751,7 +2751,7 @@
     return p2
 
     :cond_5
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/lit8 p1, p1, 0x2
 
@@ -2807,7 +2807,7 @@
 .method public final a(Landroid/view/View;II)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
@@ -2821,18 +2821,18 @@
 
     if-eqz p1, :cond_0
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     add-int/2addr v0, p1
 
     :cond_0
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     and-int/lit8 p1, p1, 0x4
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     goto :goto_0
 
@@ -2843,18 +2843,18 @@
 
     if-eqz p1, :cond_2
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     add-int/2addr v0, p1
 
     :cond_2
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/lit8 p1, p1, 0x4
 
     if-lez p1, :cond_3
 
-    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     :goto_0
     add-int/2addr v0, p1
@@ -2863,6 +2863,12 @@
     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
 
@@ -2872,46 +2878,46 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
     return-void
 
     :cond_0
-    iget p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acL: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     and-int/lit8 v0, v0, 0x4
 
     if-lez v0, :cond_1
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acB:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acB:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acC:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acL:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acC:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acL:I
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     and-int/lit8 v0, v0, 0x4
 
     if-lez v0, :cond_1
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acB:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acB:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v0, p1, Lcom/google/android/flexbox/b;->acC:I
+    iget v0, p1, Lcom/google/android/flexbox/b;->acL:I
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     add-int/2addr v0, v1
 
-    iput v0, p1, Lcom/google/android/flexbox/b;->acC:I
+    iput v0, p1, Lcom/google/android/flexbox/b;->acL: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;->adg:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp: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;->adg:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp: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;->adf:[I
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ado:[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;->acX:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     return v0
 .end method
@@ -3125,7 +3125,7 @@
 .method public getAlignItems()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acW:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->acY:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi: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;->acZ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj: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;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
     return v0
 .end method
@@ -3177,7 +3177,7 @@
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->lt()I
+    invoke-virtual {v2}, Lcom/google/android/flexbox/b;->lw()I
 
     move-result v3
 
@@ -3230,7 +3230,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
 
     return v0
 .end method
@@ -3246,7 +3246,7 @@
 .method public getJustifyContent()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
 
     return v0
 .end method
@@ -3254,7 +3254,7 @@
 .method public getLargestMainSize()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acB:I
+    iget v2, v2, Lcom/google/android/flexbox/b;->acK: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;->ada:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     return v0
 .end method
@@ -3298,7 +3298,7 @@
 .method public getShowDividerVertical()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     return v0
 .end method
@@ -3306,7 +3306,7 @@
 .method public getSumOfCrossSize()I
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result v4
 
     if-eqz v4, :cond_0
 
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     goto :goto_1
 
     :cond_0
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lm()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     goto :goto_2
 
     :cond_2
-    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iget v4, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     :goto_2
     add-int/2addr v2, v4
 
     :cond_3
-    iget v3, v3, Lcom/google/android/flexbox/b;->acD:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->acM:I
 
     add-int/2addr v2, v3
 
@@ -3393,10 +3393,10 @@
     return p1
 .end method
 
-.method public final lj()Z
+.method public final lm()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->acZ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     if-nez v0, :cond_1
 
@@ -3445,7 +3445,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
     const/4 v2, 0x2
 
@@ -3471,7 +3471,7 @@
     const/4 v3, 0x1
 
     :cond_3
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acU:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acU:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
 
     if-ne v1, v2, :cond_d
 
@@ -3555,7 +3555,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
     const/4 v2, 0x0
 
@@ -3578,7 +3578,7 @@
     const/4 v2, 0x1
 
     :cond_0
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acT:I
+    iget v2, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->adg:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp: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;->adg:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp:Landroid/util/SparseIntArray;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:Landroid/util/SparseIntArray;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adp: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;->adf:[I
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ado:[I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr: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;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acQ:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acQ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/flexbox/c;->q(II)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adq:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->lu()V
+    invoke-virtual {v0}, Lcom/google/android/flexbox/c;->lx()V
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget v1, v1, Lcom/google/android/flexbox/c$a;->acR:I
+    iget v1, v1, Lcom/google/android/flexbox/c$a;->ada: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;->acX:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acX:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adh: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;->acW:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acW:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adg: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;->acY:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acY:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adi:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -3914,17 +3914,17 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adm:I
 
     :goto_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lv()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ly()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;->acZ:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:Landroid/graphics/drawable/Drawable;
 
     if-ne p1, v0, :cond_0
 
     return-void
 
     :cond_0
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adj:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
@@ -3949,17 +3949,17 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adn:I
 
     :goto_0
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->lv()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayout;->ly()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;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acT:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adc: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;->acQ:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acZ: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;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acU:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ade: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;->acV:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->acV:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adf: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;->ada:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk:I
 
     if-eq p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->ada:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adk: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;->adb:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl:I
 
     if-eq p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adb:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayout;->adl: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 16b05396c9..a91c2690e9 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 adk:F
+.field private adt:F
 
-.field private adl:F
+.field private adu:F
 
-.field private adm:I
+.field private adv:I
 
-.field private adn:F
+.field private adw:F
 
-.field private ado:Z
+.field private adx:Z
 
 .field private mMaxHeight:I
 
@@ -71,19 +71,19 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adk:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adl:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adm:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adn:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
 
     const v0, 0xffffff
 
@@ -101,19 +101,19 @@
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adk:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
 
     const/high16 p1, 0x3f800000    # 1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adl:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adm:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
 
     const/high16 p1, -0x40800000    # -1.0f
 
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adn:F
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
 
     const p1, 0xffffff
 
@@ -133,19 +133,19 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adk:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adl:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adm:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
 
     const/high16 v0, -0x40800000    # -1.0f
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adn:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
 
     const v0, 0xffffff
 
@@ -157,25 +157,25 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adk:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adl:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adm:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adn:F
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw: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;->ado:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adx:Z
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
 
@@ -322,34 +322,10 @@
     return v0
 .end method
 
-.method public final lk()F
+.method public final ln()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adk:F
-
-    return v0
-.end method
-
-.method public final ll()F
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adl:F
-
-    return v0
-.end method
-
-.method public final lm()I
-    .locals 1
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adm:I
-
-    return v0
-.end method
-
-.method public final ln()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->ado:Z
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
 
     return v0
 .end method
@@ -357,7 +333,7 @@
 .method public final lo()F
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adn:F
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
 
     return v0
 .end method
@@ -365,12 +341,36 @@
 .method public final lp()I
     .locals 1
 
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
+
+    return v0
+.end method
+
+.method public final lq()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adx:Z
+
+    return v0
+.end method
+
+.method public final lr()F
+    .locals 1
+
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw:F
+
+    return v0
+.end method
+
+.method public final ls()I
+    .locals 1
+
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->leftMargin:I
 
     return v0
 .end method
 
-.method public final lq()I
+.method public final lt()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->topMargin:I
@@ -378,7 +378,7 @@
     return v0
 .end method
 
-.method public final lr()I
+.method public final lu()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->rightMargin:I
@@ -386,7 +386,7 @@
     return v0
 .end method
 
-.method public final ls()I
+.method public final lv()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->bottomMargin:I
@@ -397,19 +397,19 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 0
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adk:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adt:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adl:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adu:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adm:I
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adv:I
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeInt(I)V
 
-    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adn:F
+    iget p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adw: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;->ado:Z
+    iget-boolean p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$LayoutParams;->adx: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 bcc9161dff..6b1d1d4f89 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 adA:I
+.field private adJ:I
 
-.field private adB:I
+.field private adK:I
 
-.field private adC:Z
+.field private adL:Z
 
-.field final synthetic adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+.field final synthetic adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adB:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adK: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;->adA:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adC:Z
+    iput-boolean p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adL:Z
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->acN:[I
+    iget-object v0, v0, Lcom/google/android/flexbox/c;->acW:[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;->adA:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adA:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ:I
 
     if-le p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adA:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ: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;->acK:I
+    iget p1, p1, Lcom/google/android/flexbox/b;->acT: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;->adA:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ: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;->adC:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adL:Z
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {v1}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v1
 
@@ -308,7 +308,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adB:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adK: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;->adA:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM:Lcom/google/android/flexbox/FlexboxLayoutManager;
 
-    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adM: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;->adC:Z
+    iput-boolean v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adL: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;->adB:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adK: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;->adA:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adJ: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;->adB:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adK: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;->adC:Z
+    iget-boolean v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->adL: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 4faf417a44..976c24f33e 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 adA:I
+.field adJ:I
 
-.field adE:Z
+.field adN: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;->adA:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     add-int/lit8 v1, v0, 0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ: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;->adA:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     add-int/lit8 v1, v0, -0x1
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ: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;->adA:I
+    iget v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ: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 ed05c4b22a..41e5f6eef0 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/FlexboxLayoutManager.smali
@@ -21,11 +21,11 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final adp:Landroid/graphics/Rect;
+.field private static final ady:Landroid/graphics/Rect;
 
 
 # instance fields
-.field private acQ:Ljava/util/List;
+.field private acZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -35,33 +35,19 @@
     .end annotation
 .end field
 
-.field private acT:I
+.field private adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-.field private acU:I
+.field private adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-.field private acV:I
+.field private adC:Landroidx/recyclerview/widget/OrientationHelper;
 
-.field private acW:I
+.field private adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
-.field private final adh:Lcom/google/android/flexbox/c;
+.field private adE:I
 
-.field private adi:Lcom/google/android/flexbox/c$a;
+.field private adF:I
 
-.field private adq:Z
-
-.field private adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
-
-.field private ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
-
-.field private adt:Landroidx/recyclerview/widget/OrientationHelper;
-
-.field private adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
-
-.field private adv:I
-
-.field private adw:I
-
-.field private adx:Landroid/util/SparseArray;
+.field private adG:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -71,9 +57,23 @@
     .end annotation
 .end field
 
-.field private ady:Landroid/view/View;
+.field private adH:Landroid/view/View;
 
-.field private adz:I
+.field private adI:I
+
+.field private adc:I
+
+.field private ade:I
+
+.field private adf:I
+
+.field private adg:I
+
+.field private final adq:Lcom/google/android/flexbox/c;
+
+.field private adr:Lcom/google/android/flexbox/c$a;
+
+.field private adz:Z
 
 .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;->adp:Landroid/graphics/Rect;
+    sput-object v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->acQ:Ljava/util/List;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adv:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE:I
 
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:I
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF:I
 
     new-instance v1, Landroid/util/SparseArray;
 
     invoke-direct {v1}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Landroid/util/SparseArray;
+    iput-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
 
-    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:I
+    iput p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI: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;->adi:Lcom/google/android/flexbox/c$a;
+    iput-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr: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;->lw()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()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;->acQ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adv:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE:I
 
-    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:I
+    iput v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF:I
 
     new-instance v2, Landroid/util/SparseArray;
 
     invoke-direct {v2}, Landroid/util/SparseArray;-><init>()V
 
-    iput-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Landroid/util/SparseArray;
+    iput-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG:Landroid/util/SparseArray;
 
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI: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;->adi:Lcom/google/android/flexbox/c$a;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr: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;->lw()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()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;->ly()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adE:Z
+    iput-boolean v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adN:Z
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -353,11 +353,11 @@
 
     invoke-direct {p0, v2, v3}, Lcom/google/android/flexbox/FlexboxLayoutManager;->u(II)V
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->lj()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v6
 
@@ -448,7 +448,7 @@
     :goto_0
     if-gtz v5, :cond_3
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->acQ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adA:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     if-ltz v10, :cond_4
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ: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;->acQ:Ljava/util/List;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
-    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iget v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ: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;->acK:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acT:I
 
     iput v10, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mPosition:I
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v10
 
@@ -541,7 +541,7 @@
 
     if-ne v15, v7, :cond_5
 
-    iget v7, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v7, v9, Lcom/google/android/flexbox/b;->acM: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;->acV:I
+    iget v14, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adf:I
 
     if-eqz v14, :cond_c
 
@@ -574,7 +574,7 @@
 
     if-eqz v4, :cond_6
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acK: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;->acV:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adf: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;->acB:I
+    iget v14, v9, Lcom/google/android/flexbox/b;->acK: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;->acB:I
+    iget v10, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v10, v13, v10
 
@@ -677,7 +677,7 @@
 
     int-to-float v4, v4
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v13, v12
 
@@ -690,7 +690,7 @@
     goto :goto_5
 
     :cond_b
-    iget v4, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v13, v4
 
@@ -698,7 +698,7 @@
 
     int-to-float v4, v13
 
-    iget v12, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v12, v9, Lcom/google/android/flexbox/b;->acK: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v13, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adp:Landroid/graphics/Rect;
+    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->adp:Landroid/graphics/Rect;
+    sget-object v14, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v12, v12, Lcom/google/android/flexbox/c;->acO:[J
+    iget-object v12, v12, Lcom/google/android/flexbox/c;->acX:[J
 
     aget-wide v21, v12, v10
 
@@ -861,7 +861,7 @@
 
     if-eqz v12, :cond_f
 
-    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adA:I
+    iget v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:I
+    iput v3, v2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
-    iget v3, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->acM: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;->acD:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acM: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;->acD:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acM: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;->acD:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->acM: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;->acU:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
 
     return p0
 .end method
@@ -1153,11 +1153,11 @@
 
     if-ne v6, v7, :cond_0
 
-    iget v6, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->acM:I
 
     sub-int/2addr v4, v6
 
-    iget v6, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->acM: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;->acV:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adf:I
 
     const/4 v5, 0x0
 
@@ -1196,7 +1196,7 @@
 
     if-eqz v4, :cond_1
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acK: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;->acV:I
+    iget v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adf: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;->acB:I
+    iget v6, v9, Lcom/google/android/flexbox/b;->acK: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;->acB:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v4, v3, v4
 
@@ -1299,7 +1299,7 @@
 
     int-to-float v2, v2
 
-    iget v4, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v3, v4
 
@@ -1312,7 +1312,7 @@
     goto :goto_2
 
     :cond_6
-    iget v4, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v4, v9, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v3, v4
 
@@ -1320,7 +1320,7 @@
 
     int-to-float v2, v3
 
-    iget v3, v9, Lcom/google/android/flexbox/b;->acB:I
+    iget v3, v9, Lcom/google/android/flexbox/b;->acK: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->acO:[J
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->acX:[J
 
     aget-wide v16, v4, v7
 
@@ -1449,7 +1449,7 @@
 
     if-ne v1, v5, :cond_9
 
-    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->adp:Landroid/graphics/Rect;
+    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->adp:Landroid/graphics/Rect;
+    sget-object v1, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->adq:Z
+    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:Z
 
     if-eqz v1, :cond_a
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adq:Z
+    iget-boolean v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:Z
 
     if-eqz v1, :cond_c
 
-    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adA:I
+    iget v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
-    iget-object v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v2, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:I
+    iput v1, v10, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
-    iget v1, v9, Lcom/google/android/flexbox/b;->acD:I
+    iget v1, v9, Lcom/google/android/flexbox/b;->acM: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()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;->adE:Z
+    iget-boolean v0, p2, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adN:Z
 
     if-nez v0, :cond_0
 
@@ -1843,19 +1843,19 @@
 
     if-eqz p3, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lx()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lA()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result p3
 
@@ -1865,7 +1865,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:I
+    iput v1, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     if-eqz p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v2}, Lcom/google/android/flexbox/c;->aM(I)V
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v2}, Lcom/google/android/flexbox/c;->aL(I)V
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v2}, Lcom/google/android/flexbox/c;->aN(I)V
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v2, v2, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v2, v2, Lcom/google/android/flexbox/c;->acW:[I
 
     array-length v2, v2
 
@@ -2036,7 +2036,7 @@
     return-void
 
     :cond_1
-    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result p1
 
@@ -2134,9 +2134,9 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v2, v2, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v2, v2, Lcom/google/android/flexbox/c;->acW:[I
 
     aget v1, v2, v1
 
@@ -2147,7 +2147,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[I
 
     aget v0, v1, v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->ly()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->acT:I
+    iget p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -2490,9 +2490,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v3, v3, Lcom/google/android/flexbox/c;->acW:[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;->acQ:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->lx()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lA()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result p3
 
@@ -2609,9 +2609,9 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:I
+    iput v0, p3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     if-eqz p2, :cond_2
 
@@ -2697,7 +2697,7 @@
 
     if-lez p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -2821,9 +2821,9 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v3, v3, Lcom/google/android/flexbox/c;->acW:[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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acK:I
+    iget v6, v3, Lcom/google/android/flexbox/b;->acT: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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -3115,7 +3115,7 @@
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ly()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
 
     invoke-direct {p0, v0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->aT(I)Landroid/view/View;
 
@@ -3234,9 +3234,9 @@
 
     move-result v0
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->acW:[I
 
     aget p1, v4, p1
 
@@ -3249,9 +3249,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[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;->adh:Lcom/google/android/flexbox/c;
+    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->acQ:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     return-object p0
 .end method
@@ -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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()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;->ly()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
 
     invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
@@ -3826,31 +3826,10 @@
     return v1
 .end method
 
-.method private lw()V
-    .locals 2
-
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acW:I
-
-    const/4 v1, 0x4
-
-    if-eq v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
-
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()V
-
-    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acW:I
-
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
-
-    :cond_0
-    return-void
-.end method
-
-.method private lx()V
+.method private lA()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -3868,7 +3847,7 @@
     move-result v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     if-eqz v0, :cond_2
 
@@ -3893,7 +3872,7 @@
     return-void
 .end method
 
-.method private ly()V
+.method private lB()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->mOrientationHelper:Landroidx/recyclerview/widget/OrientationHelper;
@@ -3903,13 +3882,13 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
 
     if-eqz v0, :cond_2
 
@@ -3923,12 +3902,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 
     :cond_1
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
 
     if-nez v0, :cond_2
 
@@ -3942,7 +3921,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
 
     return-void
 
@@ -3957,7 +3936,27 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
+
+    return-void
+.end method
+
+.method private lC()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->clear()V
+
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+
+    const/4 v1, 0x0
+
+    invoke-static {v0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
 
     return-void
 .end method
@@ -3965,20 +3964,21 @@
 .method private lz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adg:I
 
-    invoke-interface {v0}, Ljava/util/List;->clear()V
+    const/4 v1, 0x4
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    if-eq v0, v1, :cond_0
 
-    invoke-static {v0}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->b(Lcom/google/android/flexbox/FlexboxLayoutManager$a;)V
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->removeAllViews()V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lC()V
 
-    const/4 v1, 0x0
+    iput v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adg:I
 
-    invoke-static {v0, v1}, Lcom/google/android/flexbox/FlexboxLayoutManager$a;->d(Lcom/google/android/flexbox/FlexboxLayoutManager$a;I)I
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
+    :cond_0
     return-void
 .end method
 
@@ -4001,21 +4001,21 @@
 .method private setFlexDirection(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc: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;->acT:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc: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;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
 
-    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lz()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lC()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;->acU:I
+    iget p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade: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;->lz()V
+    invoke-direct {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lC()V
 
     :cond_0
-    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acU:I
+    iput v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade: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;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
 
     invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->requestLayout()V
 
@@ -4109,11 +4109,11 @@
 .method private u(II)V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -4173,7 +4173,7 @@
 
     move-result-object p1
 
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v8, v8, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v8, v8, Lcom/google/android/flexbox/c;->acW:[I
 
     aget v8, v8, v7
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v7, v7, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v7, v7, Lcom/google/android/flexbox/c;->acW:[I
 
     array-length v7, v7
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iput v6, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iput v6, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     goto :goto_1
 
     :cond_1
-    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v7, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v8, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v8, v8, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v8, v8, Lcom/google/android/flexbox/c;->acW:[I
 
-    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:I
+    iput v8, v7, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     :goto_1
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v5, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     if-eq p1, v6, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adA:I
+    iget p1, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->acQ:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     move v5, v1
 
@@ -4390,15 +4390,15 @@
     goto :goto_3
 
     :cond_5
-    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v4, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->acQ:Ljava/util/List;
+    iget-object v9, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v1, v1, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v1, v1, Lcom/google/android/flexbox/c;->acW:[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;->acQ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v6, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adA:I
+    iput v1, v0, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     if-eqz v5, :cond_b
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
     iget v0, p1, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->mScrollingOffset:I
 
@@ -4653,7 +4653,7 @@
 .method public final a(Landroid/view/View;II)I
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()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;->adG: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;->adp:Landroid/graphics/Rect;
+    sget-object p2, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result p2
 
@@ -4707,17 +4717,17 @@
 
     add-int/2addr p2, p1
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
     return-void
 
@@ -4732,17 +4742,17 @@
 
     add-int/2addr p2, p1
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acB:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acK:I
 
-    iget p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iget p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
     add-int/2addr p1, p2
 
-    iput p1, p4, Lcom/google/android/flexbox/b;->acC:I
+    iput p1, p4, Lcom/google/android/flexbox/b;->acL:I
 
     return-void
 .end method
@@ -4756,7 +4766,7 @@
 .method public final aG(I)Landroid/view/View;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG: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;->adx: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -4833,7 +4833,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -4868,7 +4868,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -5073,7 +5073,7 @@
 .method public getAlignItems()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acW:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adg:I
 
     return v0
 .end method
@@ -5081,7 +5081,7 @@
 .method public getFlexDirection()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc:I
 
     return v0
 .end method
@@ -5109,7 +5109,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acU:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade:I
 
     return v0
 .end method
@@ -5125,7 +5125,7 @@
 .method public getLargestMainSize()I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acB:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->acK: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;->acQ:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acQ:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->acD:I
+    iget v3, v3, Lcom/google/android/flexbox/b;->acM: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -5241,10 +5241,10 @@
     goto :goto_0
 .end method
 
-.method public final lj()Z
+.method public final lm()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acT:I
+    iget v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc:I
 
     const/4 v1, 0x1
 
@@ -5283,7 +5283,7 @@
 
     check-cast p1, Landroid/view/View;
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ady:Landroid/view/View;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adH:Landroid/view/View;
 
     return-void
 .end method
@@ -5391,7 +5391,7 @@
 
     move-result v4
 
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acT:I
+    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adc: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;->adq:Z
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->acU:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade: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;->adq:Z
+    iput-boolean v8, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->acU:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade: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;->adq:Z
+    iput-boolean v7, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->acU:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade: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;->adq:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz: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;->acU:I
+    iget v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ade: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;->adq:Z
+    iput-boolean v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:Z
 
     :goto_6
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ly()V
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lB()V
 
     invoke-direct/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->ensureLayoutState()V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v4, v3}, Lcom/google/android/flexbox/c;->aM(I)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v4, v3}, Lcom/google/android/flexbox/c;->aL(I)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v4, v3}, Lcom/google/android/flexbox/c;->aN(I)V
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iput-boolean v7, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adE:Z
+    iput-boolean v7, v4, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adN:Z
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
 
     if-eqz v4, :cond_24
 
     :cond_e
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v9, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v10, v10, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v10, v10, Lcom/google/android/flexbox/c;->acW:[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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->lj()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->lj()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v12
 
     if-eqz v12, :cond_28
 
-    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adv:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adw:I
+    iget v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v12, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adv:I
+    iput v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adE:I
 
-    iput v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adw:I
+    iput v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adF:I
 
-    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:I
+    iget v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->clear()V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr: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;->lj()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v3
 
     if-eqz v3, :cond_2c
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     move v12, v4
 
@@ -6225,17 +6225,17 @@
     goto :goto_16
 
     :cond_2c
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acQ:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
 
-    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v4, v9}, Lcom/google/android/flexbox/c;->q(II)V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->lu()V
+    invoke-virtual {v3}, Lcom/google/android/flexbox/c;->lx()V
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v4, v4, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v4, v4, Lcom/google/android/flexbox/c;->acW:[I
 
-    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
 
-    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adA:I
+    iput v4, v3, Lcom/google/android/flexbox/FlexboxLayoutManager$b;->adJ:I
 
     goto/16 :goto_19
 
     :cond_2d
-    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adz:I
+    iget v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
 
     if-eq v5, v6, :cond_2e
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr: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;->lj()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v6
 
     if-eqz v6, :cond_30
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     move v12, v4
 
@@ -6362,17 +6362,17 @@
     goto :goto_18
 
     :cond_2f
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v6, v3}, Lcom/google/android/flexbox/c;->aN(I)V
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
     const/4 v15, 0x0
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     move v12, v4
 
@@ -6385,7 +6385,7 @@
     goto :goto_18
 
     :cond_30
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
     move v12, v9
 
@@ -6424,17 +6424,17 @@
     goto :goto_18
 
     :cond_31
-    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v6, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v6, v3}, Lcom/google/android/flexbox/c;->aN(I)V
 
-    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v10, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
-    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v11, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
     const/4 v15, 0x0
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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;->adi:Lcom/google/android/flexbox/c$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adr:Lcom/google/android/flexbox/c$a;
 
-    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acQ:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
 
-    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iput-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ:Ljava/util/List;
 
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq: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;->adh:Lcom/google/android/flexbox/c;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adq:Lcom/google/android/flexbox/c;
 
     invoke-virtual {v3, v5}, Lcom/google/android/flexbox/c;->aK(I)V
 
     :cond_32
     :goto_19
-    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v4, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->adr:Lcom/google/android/flexbox/FlexboxLayoutManager$b;
+    iget-object v3, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adA: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object v5, v0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->adz:I
+    iput p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adI:I
 
-    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adx:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG: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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object v0, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -6671,7 +6671,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC: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;->adu:Lcom/google/android/flexbox/FlexboxLayoutManager$SavedState;
+    iget-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adD: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;->lj()Z
+    invoke-virtual {p0}, Lcom/google/android/flexbox/FlexboxLayoutManager;->lm()Z
 
     move-result v0
 
@@ -6735,7 +6735,7 @@
 
     move-result p1
 
-    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adx:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adG: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;->ads:Lcom/google/android/flexbox/FlexboxLayoutManager$a;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adB: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;->adt:Landroidx/recyclerview/widget/OrientationHelper;
+    iget-object p2, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->adC:Landroidx/recyclerview/widget/OrientationHelper;
 
     neg-int p3, p1
 
@@ -6776,7 +6776,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acQ:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/flexbox/FlexboxLayoutManager;->acZ: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 d45bb8b9ab..178d5189a4 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
@@ -96,9 +96,9 @@
         0x7f04013b
         0x7f040142
         0x7f040209
-        0x7f040301
         0x7f040302
         0x7f040303
+        0x7f040304
     .end array-data
 
     :array_1
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 5427b7ffba..8c7538fabe 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 aH(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 lj()Z
+.method public abstract lm()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 3769a0b7e5..2ae74bdab3 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 acB:I
+.field acK:I
 
-.field acC:I
+.field acL:I
 
-.field acD:I
+.field acM:I
 
-.field acE:I
+.field acN:I
 
-.field acF:F
+.field acO:F
 
-.field acG:F
+.field acP:F
 
-.field acH:I
+.field acQ:I
 
-.field acI:I
+.field acR:I
 
-.field acJ:Ljava/util/List;
+.field acS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field acK:I
+.field acT: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;->acJ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/b;->acS:Ljava/util/List;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     move-result v2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v3
 
@@ -109,7 +109,7 @@
 
     move-result v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v2
 
@@ -129,7 +129,7 @@
 
     move-result p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v1
 
@@ -149,7 +149,7 @@
 
     move-result p1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p3
 
@@ -166,12 +166,12 @@
     return-void
 .end method
 
-.method public final lt()I
+.method public final lw()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/flexbox/b;->mItemCount:I
 
-    iget v1, p0, Lcom/google/android/flexbox/b;->acE:I
+    iget v1, p0, Lcom/google/android/flexbox/b;->acN: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 1d517207d9..f3ab9ab91f 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 acQ:Ljava/util/List;
+.field acZ:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field acR:I
+.field ada:I
 
 
 # direct methods
@@ -44,11 +44,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/flexbox/c$a;->acQ:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/flexbox/c$a;->acR:I
+    iput v0, p0, Lcom/google/android/flexbox/c$a;->ada:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/flexbox/c$b.smali b/com.discord/smali_classes2/com/google/android/flexbox/c$b.smali
index 2e7dd51cc3..2b3cae31b1 100644
--- a/com.discord/smali_classes2/com/google/android/flexbox/c$b.smali
+++ b/com.discord/smali_classes2/com/google/android/flexbox/c$b.smali
@@ -27,7 +27,7 @@
 
 
 # instance fields
-.field acS:I
+.field adb:I
 
 .field index:I
 
@@ -56,9 +56,9 @@
 
     check-cast p1, Lcom/google/android/flexbox/c$b;
 
-    iget v0, p0, Lcom/google/android/flexbox/c$b;->acS:I
+    iget v0, p0, Lcom/google/android/flexbox/c$b;->adb:I
 
-    iget v1, p1, Lcom/google/android/flexbox/c$b;->acS:I
+    iget v1, p1, Lcom/google/android/flexbox/c$b;->adb:I
 
     if-eq v0, v1, :cond_0
 
@@ -85,7 +85,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/google/android/flexbox/c$b;->acS:I
+    iget v1, p0, Lcom/google/android/flexbox/c$b;->adb:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
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 2f49e6cf57..fa139e651f 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 acL:Lcom/google/android/flexbox/a;
+.field private final acU:Lcom/google/android/flexbox/a;
 
-.field private acM:[Z
+.field private acV:[Z
 
-.field acN:[I
+.field acW:[I
 
-.field acO:[J
+.field acX:[J
 
-.field private acP:[J
+.field private acY:[J
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingTop()I
 
@@ -73,7 +73,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingEnd()I
 
@@ -82,7 +82,7 @@
     return p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingBottom()I
 
@@ -96,7 +96,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingTop()I
 
@@ -105,7 +105,7 @@
     return p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {p1}, Lcom/google/android/flexbox/a;->getPaddingStart()I
 
@@ -119,7 +119,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acU: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;->lp()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lu()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;->acD:I
+    iput p1, v0, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-interface {p0}, Ljava/util/List;->size()I
 
@@ -334,7 +334,7 @@
 .method private a(IIILandroid/view/View;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acO:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acX:[J
 
     if-eqz v0, :cond_0
 
@@ -345,7 +345,7 @@
     aput-wide p2, v0, p1
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acY:[J
 
     if-eqz p2, :cond_1
 
@@ -381,7 +381,7 @@
     move/from16 v4, p6
 
     :goto_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->acF:F
+    iget v5, v1, Lcom/google/android/flexbox/b;->acO:F
 
     const/4 v6, 0x0
 
@@ -389,36 +389,36 @@
 
     if-lez v5, :cond_14
 
-    iget v5, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->acK:I
 
     if-ge v2, v5, :cond_0
 
     goto/16 :goto_b
 
     :cond_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int v7, v2, v7
 
     int-to-float v7, v7
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acF:F
+    iget v8, v1, Lcom/google/android/flexbox/b;->acO:F
 
     div-float/2addr v7, v8
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acC:I
+    iget v8, v1, Lcom/google/android/flexbox/b;->acL:I
 
     add-int v8, p5, v8
 
-    iput v8, v1, Lcom/google/android/flexbox/b;->acB:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->acK:I
 
     if-nez v4, :cond_1
 
     const/high16 v4, -0x80000000
 
-    iput v4, v1, Lcom/google/android/flexbox/b;->acD:I
+    iput v4, v1, Lcom/google/android/flexbox/b;->acM: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;->acK:I
+    iget v11, v1, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v11, v4
 
-    iget-object v12, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v12, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v12, v11}, Lcom/google/android/flexbox/a;->aH(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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acU: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;->acP:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acY:[J
 
     if-eqz v15, :cond_3
 
@@ -498,7 +498,7 @@
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acY:[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;->acM:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aget-boolean v3, v3, v11
 
     if-nez v3, :cond_9
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v3
 
@@ -527,7 +527,7 @@
 
     int-to-float v3, v14
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v6
 
@@ -562,19 +562,19 @@
 
     move-result v6
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acM:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aput-boolean v7, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acF:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acO:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v7
 
     sub-float/2addr v3, v7
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acF:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acO:F
 
     const/4 v8, 0x1
 
@@ -621,7 +621,7 @@
 
     :cond_8
     :goto_3
-    iget v3, v1, Lcom/google/android/flexbox/b;->acI:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acR: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU: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;->lp()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v3
 
     add-int/2addr v15, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v3
 
     add-int/2addr v15, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -681,15 +681,15 @@
 
     move-result v3
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v10
 
     add-int/2addr v14, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v10
 
@@ -697,7 +697,7 @@
 
     add-int/2addr v6, v14
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->acB:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->acK:I
 
     move/from16 v14, p2
 
@@ -713,7 +713,7 @@
 
     move-result v3
 
-    iget-object v6, v0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v6, v0, Lcom/google/android/flexbox/c;->acY:[J
 
     if-eqz v6, :cond_b
 
@@ -726,7 +726,7 @@
 
     move-result v6
 
-    iget-object v14, v0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acY:[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;->acM:[Z
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aget-boolean v14, v14, v11
 
     if-nez v14, :cond_11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v14
 
@@ -755,7 +755,7 @@
 
     int-to-float v3, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v6
 
@@ -790,19 +790,19 @@
 
     move-result v6
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acM:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aput-boolean v14, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acF:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acO:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v8
 
     sub-float/2addr v3, v8
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acF:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acO:F
 
     const/4 v8, 0x1
 
@@ -849,7 +849,7 @@
 
     :cond_10
     :goto_7
-    iget v3, v1, Lcom/google/android/flexbox/b;->acI:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acR: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU: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;->lq()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v3
 
     add-int v16, v16, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v3
 
     add-int v16, v16, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -913,15 +913,15 @@
 
     move-result v3
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v10
 
     add-int/2addr v15, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v10
 
@@ -929,16 +929,16 @@
 
     add-int/2addr v6, v15
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->acB:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->acK:I
 
     :goto_9
-    iget v6, v1, Lcom/google/android/flexbox/b;->acD:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-static {v6, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v6
 
-    iput v6, v1, Lcom/google/android/flexbox/b;->acD:I
+    iput v6, v1, Lcom/google/android/flexbox/b;->acM:I
 
     move v10, v3
 
@@ -969,7 +969,7 @@
 
     if-eqz v8, :cond_14
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acK: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acI:I
+    iput p4, p2, Lcom/google/android/flexbox/b;->acR:I
 
-    iget-object p4, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p4, p0, Lcom/google/android/flexbox/c;->acU: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;->lt()I
+    invoke-virtual {p2}, Lcom/google/android/flexbox/b;->lw()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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->ln()Z
+    invoke-interface {p6}, Lcom/google/android/flexbox/FlexItem;->lq()Z
 
     move-result p6
 
@@ -1169,7 +1169,7 @@
     return v1
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {p2, p1, p7, p8}, Lcom/google/android/flexbox/a;->a(Landroid/view/View;II)I
 
@@ -1234,7 +1234,7 @@
 
     iget v2, v1, Lcom/google/android/flexbox/c$b;->index:I
 
-    iget v1, v1, Lcom/google/android/flexbox/c$b;->acS:I
+    iget v1, v1, Lcom/google/android/flexbox/c$b;->adb:I
 
     invoke-virtual {p2, v2, v1}, Landroid/util/SparseIntArray;->append(II)V
 
@@ -1268,7 +1268,7 @@
     :goto_0
     if-ge v2, p1, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v2}, Lcom/google/android/flexbox/a;->aG(I)Landroid/view/View;
 
@@ -1288,7 +1288,7 @@
 
     move-result v3
 
-    iput v3, v4, Lcom/google/android/flexbox/c$b;->acS:I
+    iput v3, v4, Lcom/google/android/flexbox/c$b;->adb:I
 
     iput v2, v4, Lcom/google/android/flexbox/c$b;->index:I
 
@@ -1305,7 +1305,7 @@
 .method private aJ(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acM:[Z
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acV:[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;->acM:[Z
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acV:[Z
 
     return-void
 
@@ -1338,7 +1338,7 @@
     :cond_2
     new-array p1, p1, [Z
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acM:[Z
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acV:[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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acU: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;->lq()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v2
 
     add-int/2addr v1, v2
 
-    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {p2}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v2
 
@@ -1489,9 +1489,9 @@
     move/from16 v4, p6
 
     :goto_0
-    iget v5, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v5, v1, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acG:F
+    iget v6, v1, Lcom/google/android/flexbox/b;->acP:F
 
     const/4 v7, 0x0
 
@@ -1499,34 +1499,34 @@
 
     if-lez v6, :cond_14
 
-    iget v6, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
 
     if-le v2, v6, :cond_0
 
     goto/16 :goto_9
 
     :cond_0
-    iget v6, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v6, v1, Lcom/google/android/flexbox/b;->acK:I
 
     sub-int/2addr v6, v2
 
     int-to-float v6, v6
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acG:F
+    iget v8, v1, Lcom/google/android/flexbox/b;->acP:F
 
     div-float/2addr v6, v8
 
-    iget v8, v1, Lcom/google/android/flexbox/b;->acC:I
+    iget v8, v1, Lcom/google/android/flexbox/b;->acL:I
 
     add-int v8, p5, v8
 
-    iput v8, v1, Lcom/google/android/flexbox/b;->acB:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->acK:I
 
     if-nez v4, :cond_1
 
     const/high16 v4, -0x80000000
 
-    iput v4, v1, Lcom/google/android/flexbox/b;->acD:I
+    iput v4, v1, Lcom/google/android/flexbox/b;->acM: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;->acK:I
+    iget v11, v1, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v11, v4
 
-    iget-object v12, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v12, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v12, v11}, Lcom/google/android/flexbox/a;->aH(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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v14, v0, Lcom/google/android/flexbox/c;->acU: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;->acP:[J
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acY:[J
 
     if-eqz v15, :cond_3
 
@@ -1608,7 +1608,7 @@
 
     move-result v15
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acY:[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;->acM:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aget-boolean v3, v3, v11
 
     if-nez v3, :cond_9
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v3
 
@@ -1637,7 +1637,7 @@
 
     int-to-float v3, v14
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v7
 
@@ -1672,19 +1672,19 @@
 
     move-result v7
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acM:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aput-boolean v8, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acG:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acP:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v8
 
     sub-float/2addr v3, v8
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acG:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acP:F
 
     const/4 v8, 0x1
 
@@ -1723,7 +1723,7 @@
     move/from16 v8, v22
 
     :goto_3
-    iget v3, v1, Lcom/google/android/flexbox/b;->acI:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acR: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU: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;->lp()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v3
 
     add-int/2addr v15, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v3
 
     add-int/2addr v15, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -1782,15 +1782,15 @@
 
     move-result v3
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acK:I
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v8
 
     add-int/2addr v14, v8
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v8
 
@@ -1798,7 +1798,7 @@
 
     add-int/2addr v7, v14
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->acB:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->acK:I
 
     move/from16 v14, p2
 
@@ -1814,7 +1814,7 @@
 
     move-result v3
 
-    iget-object v7, v0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->acY:[J
 
     if-eqz v7, :cond_b
 
@@ -1827,7 +1827,7 @@
 
     move-result v7
 
-    iget-object v8, v0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->acY:[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;->acM:[Z
+    iget-object v8, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aget-boolean v8, v8, v11
 
     if-nez v8, :cond_11
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v8
 
@@ -1856,7 +1856,7 @@
 
     int-to-float v3, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v7
 
@@ -1891,19 +1891,19 @@
 
     move-result v7
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acM:[Z
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acV:[Z
 
     aput-boolean v8, v3, v11
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acG:F
+    iget v3, v1, Lcom/google/android/flexbox/b;->acP:F
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v15
 
     sub-float/2addr v3, v15
 
-    iput v3, v1, Lcom/google/android/flexbox/b;->acG:F
+    iput v3, v1, Lcom/google/android/flexbox/b;->acP:F
 
     const/16 v22, 0x1
 
@@ -1939,7 +1939,7 @@
 
     :cond_10
     :goto_5
-    iget v3, v1, Lcom/google/android/flexbox/b;->acI:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acR: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU: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;->lq()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v3
 
     add-int v16, v16, v3
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v3
 
     add-int v16, v16, v3
 
-    iget-object v3, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v3, v12}, Lcom/google/android/flexbox/a;->h(Landroid/view/View;)I
 
@@ -2005,15 +2005,15 @@
 
     move-result v3
 
-    iget v7, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acK:I
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v10
 
     add-int/2addr v15, v10
 
-    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v13}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v10
 
@@ -2021,16 +2021,16 @@
 
     add-int/2addr v7, v15
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->acB:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->acK:I
 
     :goto_7
-    iget v7, v1, Lcom/google/android/flexbox/b;->acD:I
+    iget v7, v1, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-static {v7, v3}, Ljava/lang/Math;->max(II)I
 
     move-result v7
 
-    iput v7, v1, Lcom/google/android/flexbox/b;->acD:I
+    iput v7, v1, Lcom/google/android/flexbox/b;->acM:I
 
     move v10, v3
 
@@ -2063,7 +2063,7 @@
 
     if-eqz v22, :cond_14
 
-    iget v3, v1, Lcom/google/android/flexbox/b;->acB:I
+    iget v3, v1, Lcom/google/android/flexbox/b;->acK: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;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU: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;->acP:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acY:[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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU: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;->lp()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p0
 
@@ -2188,19 +2188,19 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v1
 
     sub-int/2addr p2, v1
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU: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;->acP:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acY:[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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU: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;->lr()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p0
 
@@ -2289,14 +2289,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p0
 
@@ -2308,14 +2308,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p0
 
     return p0
 
     :cond_0
-    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {p0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result p0
 
@@ -2373,13 +2373,13 @@
 
     check-cast v0, Lcom/google/android/flexbox/FlexItem;
 
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU: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;->lm()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v2
 
@@ -2387,12 +2387,12 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lm()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v1
 
     :cond_0
-    iget v2, p2, Lcom/google/android/flexbox/b;->acD:I
+    iget v2, p2, Lcom/google/android/flexbox/b;->acM:I
 
     const/4 v3, 0x2
 
@@ -2415,7 +2415,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU: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;->acH:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->acQ: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;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v0
 
@@ -2448,7 +2448,7 @@
     return-void
 
     :cond_2
-    iget p2, p2, Lcom/google/android/flexbox/b;->acH:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->acQ: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;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v0
 
@@ -2485,13 +2485,13 @@
 
     sub-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
     add-int/2addr v2, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p2
 
@@ -2499,7 +2499,7 @@
 
     div-int/2addr v2, v3
 
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU: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;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p6
 
     sub-int/2addr p2, p6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p6
 
@@ -2575,7 +2575,7 @@
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
@@ -2589,7 +2589,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
@@ -2600,7 +2600,7 @@
     return-void
 
     :cond_7
-    iget-object p2, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU: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;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result p2
 
@@ -2625,13 +2625,13 @@
     return-void
 
     :cond_8
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lv()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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU: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;->lm()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v2
 
@@ -2665,12 +2665,12 @@
 
     if-eq v2, v3, :cond_0
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lm()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v1
 
     :cond_0
-    iget p2, p2, Lcom/google/android/flexbox/b;->acD:I
+    iget p2, p2, Lcom/google/android/flexbox/b;->acM:I
 
     if-eqz v1, :cond_5
 
@@ -2750,7 +2750,7 @@
 
     sub-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result p3
 
@@ -2764,7 +2764,7 @@
 
     sub-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result p2
 
@@ -2783,7 +2783,7 @@
 
     add-int/2addr p4, p3
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p3
 
@@ -2797,7 +2797,7 @@
 
     add-int/2addr p6, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p2
 
@@ -2810,13 +2810,13 @@
     :cond_5
     if-nez p3, :cond_6
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p2
 
     add-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lp()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result p2
 
@@ -2827,13 +2827,13 @@
     return-void
 
     :cond_6
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result p2
 
     sub-int/2addr p4, p2
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v0}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result p2
 
@@ -2891,9 +2891,9 @@
 
     move/from16 v13, p6
 
-    iget-object v0, v9, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
-    invoke-interface {v0}, Lcom/google/android/flexbox/a;->lj()Z
+    invoke-interface {v0}, Lcom/google/android/flexbox/a;->lm()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;->acQ:Ljava/util/List;
+    iput-object v7, v10, Lcom/google/android/flexbox/c$a;->acZ:Ljava/util/List;
 
     const/4 v6, -0x1
 
@@ -2955,13 +2955,13 @@
 
     move/from16 v6, p5
 
-    iput v6, v3, Lcom/google/android/flexbox/b;->acK:I
+    iput v6, v3, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v2, v1
 
-    iput v2, v3, Lcom/google/android/flexbox/b;->acB:I
+    iput v2, v3, Lcom/google/android/flexbox/b;->acK:I
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v5, v9, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v5, v6}, Lcom/google/android/flexbox/a;->aH(I)Landroid/view/View;
 
@@ -3009,13 +3009,13 @@
 
     if-ne v4, v10, :cond_4
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->acE:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acN:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v3, Lcom/google/android/flexbox/b;->acE:I
+    iput v4, v3, Lcom/google/android/flexbox/b;->acN: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;->lm()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v4
 
@@ -3070,7 +3070,7 @@
 
     if-ne v4, v1, :cond_5
 
-    iget-object v1, v3, Lcom/google/android/flexbox/b;->acJ:Ljava/util/List;
+    iget-object v1, v3, Lcom/google/android/flexbox/b;->acS: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;->lo()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lr()F
 
     move-result v4
 
@@ -3099,7 +3099,7 @@
 
     int-to-float v1, v8
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lo()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lr()F
 
     move-result v4
 
@@ -3112,7 +3112,7 @@
     :cond_6
     if-eqz v14, :cond_7
 
-    iget-object v4, v9, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v7, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU: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;->acB:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acK: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;->lt()I
+    invoke-virtual/range {v23 .. v23}, Lcom/google/android/flexbox/b;->lw()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;->acD:I
+    iget v0, v3, Lcom/google/android/flexbox/b;->acM: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v9, Lcom/google/android/flexbox/c;->acU: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;->lq()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ls()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v3
 
@@ -3415,13 +3415,13 @@
 
     if-ne v1, v3, :cond_b
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acU: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;->lp()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ls()I
 
     move-result v4
 
     add-int/2addr v3, v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lr()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lu()I
 
     move-result v4
 
@@ -3467,9 +3467,9 @@
 
     move/from16 v2, v28
 
-    iput v2, v3, Lcom/google/android/flexbox/b;->acB:I
+    iput v2, v3, Lcom/google/android/flexbox/b;->acK:I
 
-    iput v6, v3, Lcom/google/android/flexbox/b;->acK:I
+    iput v6, v3, Lcom/google/android/flexbox/b;->acT:I
 
     move v11, v0
 
@@ -3499,7 +3499,7 @@
     move/from16 v0, v21
 
     :goto_8
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acW:[I
 
     if-eqz v1, :cond_d
 
@@ -3510,7 +3510,7 @@
     aput v4, v1, v6
 
     :cond_d
-    iget v1, v3, Lcom/google/android/flexbox/b;->acB:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acK: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;->acB:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acK:I
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->acF:F
+    iget v1, v3, Lcom/google/android/flexbox/b;->acO:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lk()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ln()F
 
     move-result v4
 
     add-float/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acF:F
+    iput v1, v3, Lcom/google/android/flexbox/b;->acO:F
 
-    iget v1, v3, Lcom/google/android/flexbox/b;->acG:F
+    iget v1, v3, Lcom/google/android/flexbox/b;->acP:F
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->ll()F
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lo()F
 
     move-result v4
 
     add-float/2addr v1, v4
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acG:F
+    iput v1, v3, Lcom/google/android/flexbox/b;->acP:F
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v4, v9, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-static {v1, v0}, Ljava/lang/Math;->max(II)I
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acD:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acM:I
 
     if-eqz v14, :cond_f
 
-    iget-object v1, v9, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v9, Lcom/google/android/flexbox/c;->acU: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;->acH:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acQ:I
 
     invoke-virtual {v13}, Landroid/view/View;->getBaseline()I
 
     move-result v4
 
-    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lq()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lt()I
 
     move-result v7
 
@@ -3620,12 +3620,12 @@
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acH:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acQ:I
 
     goto :goto_9
 
     :cond_e
-    iget v1, v3, Lcom/google/android/flexbox/b;->acH:I
+    iget v1, v3, Lcom/google/android/flexbox/b;->acQ: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;->ls()I
+    invoke-interface {v10}, Lcom/google/android/flexbox/FlexItem;->lv()I
 
     move-result v7
 
@@ -3647,7 +3647,7 @@
 
     move-result v1
 
-    iput v1, v3, Lcom/google/android/flexbox/b;->acH:I
+    iput v1, v3, Lcom/google/android/flexbox/b;->acQ: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;->acD:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acM:I
 
     add-int/2addr v11, v4
 
@@ -3700,7 +3700,7 @@
 
     if-nez v22, :cond_12
 
-    iget v4, v3, Lcom/google/android/flexbox/b;->acD:I
+    iget v4, v3, Lcom/google/android/flexbox/b;->acM: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;->acR:I
+    iput v4, v0, Lcom/google/android/flexbox/c$a;->ada:I
 
     return-void
 .end method
@@ -3813,7 +3813,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acW:[I
 
     aget v0, v0, p2
 
@@ -3840,7 +3840,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acW:[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;->acO:[J
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acX:[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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v0}, Lcom/google/android/flexbox/a;->getFlexItemCount()I
 
@@ -3909,12 +3909,12 @@
 
     move-result p1
 
-    iput p1, v2, Lcom/google/android/flexbox/c$b;->acS:I
+    iput p1, v2, Lcom/google/android/flexbox/c$b;->adb:I
 
     goto :goto_0
 
     :cond_0
-    iput v3, v2, Lcom/google/android/flexbox/c$b;->acS:I
+    iput v3, v2, Lcom/google/android/flexbox/c$b;->adb:I
 
     :goto_0
     const/4 p1, -0x1
@@ -3926,7 +3926,7 @@
     goto :goto_2
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v2, v0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v2, v0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU: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;->acN:[I
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acW:[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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v3, v0, Lcom/google/android/flexbox/c;->acU: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;->acK:I
+    iget v14, v11, Lcom/google/android/flexbox/b;->acT:I
 
     add-int/2addr v14, v13
 
-    iget-object v15, v0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v15, v0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v15, v14}, Lcom/google/android/flexbox/a;->aH(I)Landroid/view/View;
 
@@ -4087,7 +4087,7 @@
 
     check-cast v5, Lcom/google/android/flexbox/FlexItem;
 
-    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->lm()I
+    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v9
 
@@ -4095,7 +4095,7 @@
 
     if-eq v9, v6, :cond_2
 
-    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->lm()I
+    invoke-interface {v5}, Lcom/google/android/flexbox/FlexItem;->lp()I
 
     move-result v5
 
@@ -4133,14 +4133,14 @@
 
     :cond_4
     :goto_3
-    iget v5, v11, Lcom/google/android/flexbox/b;->acD:I
+    iget v5, v11, Lcom/google/android/flexbox/b;->acM: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;->acD:I
+    iget v5, v11, Lcom/google/android/flexbox/b;->acM: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, v0, Lcom/google/android/flexbox/c;->acU: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;->acJ:Ljava/util/List;
+    iget-object v5, v3, Lcom/google/android/flexbox/b;->acS: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v7, v0, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iget v11, v3, Lcom/google/android/flexbox/b;->acM: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;->acD:I
+    iget v11, v3, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I
 
@@ -4274,7 +4274,7 @@
 .method final aL(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acY:[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;->acP:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acY:[J
 
     return-void
 
@@ -4305,13 +4305,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acP:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acY:[J
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acP:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acY:[J
 
     :cond_3
     return-void
@@ -4320,7 +4320,7 @@
 .method final aM(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acO:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acX:[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;->acO:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acX:[J
 
     return-void
 
@@ -4351,13 +4351,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acO:[J
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acX:[J
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acO:[J
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acX:[J
 
     :cond_3
     return-void
@@ -4366,7 +4366,7 @@
 .method final aN(I)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acW:[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;->acN:[I
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acW:[I
 
     return-void
 
@@ -4397,13 +4397,13 @@
     move p1, v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acN:[I
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acW:[I
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([II)[I
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/flexbox/c;->acN:[I
+    iput-object p1, p0, Lcom/google/android/flexbox/c;->acW:[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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v4, p0, Lcom/google/android/flexbox/c;->acU:Lcom/google/android/flexbox/a;
 
     invoke-interface {v4, v3}, Lcom/google/android/flexbox/a;->aG(I)Landroid/view/View;
 
@@ -4596,7 +4596,7 @@
 .method final e(III)V
     .locals 11
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->aJ(I)V
 
-    iget-object v0, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v1, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v2, p0, Lcom/google/android/flexbox/c;->acU: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;->acN:[I
+    iget-object v3, p0, Lcom/google/android/flexbox/c;->acW:[I
 
     if-eqz v3, :cond_6
 
     aget v2, v3, p3
 
     :cond_6
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acU: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;->acB:I
+    iget v2, v5, Lcom/google/android/flexbox/b;->acK: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object v0, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iput p2, p1, Lcom/google/android/flexbox/b;->acM:I
 
     return-void
 
@@ -4927,7 +4927,7 @@
 
     if-lt p3, v2, :cond_14
 
-    iget-object p3, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iget v2, v1, Lcom/google/android/flexbox/b;->acM:I
 
     int-to-float v2, v2
 
@@ -5035,7 +5035,7 @@
 
     :cond_7
     :goto_3
-    iput v8, v1, Lcom/google/android/flexbox/b;->acD:I
+    iput v8, v1, Lcom/google/android/flexbox/b;->acM: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iput p2, p3, Lcom/google/android/flexbox/b;->acM: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p2, p0, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iput v1, v8, Lcom/google/android/flexbox/b;->acM:I
 
     const/4 v1, 0x0
 
@@ -5185,10 +5185,10 @@
 
     move-result v9
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->acD:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->acM:I
 
     :goto_6
-    iget v9, v8, Lcom/google/android/flexbox/b;->acD:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->acM:I
 
     int-to-float v9, v9
 
@@ -5200,11 +5200,11 @@
 
     if-lez v9, :cond_e
 
-    iget v9, v8, Lcom/google/android/flexbox/b;->acD:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->acM:I
 
     add-int/2addr v9, v3
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->acD:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->acM:I
 
     sub-float/2addr v1, v7
 
@@ -5215,11 +5215,11 @@
 
     if-gez v9, :cond_f
 
-    iget v9, v8, Lcom/google/android/flexbox/b;->acD:I
+    iget v9, v8, Lcom/google/android/flexbox/b;->acM:I
 
     sub-int/2addr v9, v3
 
-    iput v9, v8, Lcom/google/android/flexbox/b;->acD:I
+    iput v9, v8, Lcom/google/android/flexbox/b;->acM:I
 
     add-float/2addr v1, v7
 
@@ -5233,14 +5233,14 @@
     goto :goto_5
 
     :cond_11
-    iget-object p1, p0, Lcom/google/android/flexbox/c;->acL:Lcom/google/android/flexbox/a;
+    iget-object p1, p0, Lcom/google/android/flexbox/c;->acU: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;->acL:Lcom/google/android/flexbox/a;
+    iget-object p3, p0, Lcom/google/android/flexbox/c;->acU: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;->acD:I
+    iput p2, p1, Lcom/google/android/flexbox/b;->acM:I
 
     invoke-interface {v0, v5, p1}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
@@ -5266,7 +5266,7 @@
     return-void
 .end method
 
-.method final lu()V
+.method final lx()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 e8fda00913..f9beb51a9d 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 amA:Ljava/lang/Object;
+.field private final amJ: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;->amA:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/a/b;->amJ:Ljava/lang/Object;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     check-cast p0, Lcom/google/android/gms/a/b;
 
-    iget-object p0, p0, Lcom/google/android/gms/a/b;->amA:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/a/b;->amJ: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 eedd864a3e..c9df1b4243 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 adF:Ljava/lang/ref/WeakReference;
+.field private adO:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -24,11 +24,11 @@
     .end annotation
 .end field
 
-.field private adG:J
+.field private adP:J
 
-.field adH:Ljava/util/concurrent/CountDownLatch;
+.field adQ:Ljava/util/concurrent/CountDownLatch;
 
-.field adI:Z
+.field adR: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;->adF:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adO:Ljava/lang/ref/WeakReference;
 
-    iput-wide p2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adG:J
+    iput-wide p2, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adP: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;->adH:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adQ:Ljava/util/concurrent/CountDownLatch;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adI:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adR: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;->adF:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adO: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;->adI:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adR: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;->adH:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adQ:Ljava/util/concurrent/CountDownLatch;
 
-    iget-wide v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adG:J
+    iget-wide v1, p0, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$a;->adP: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 9f676dbd76..5345422e91 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 adJ:Ljava/util/Map;
+.field private final synthetic adS: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;->adJ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/a;->adS: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;->adJ:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/ads/identifier/a;->adS: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 7c0f9ddc78..292cf7078a 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 adK:Landroid/content/SharedPreferences;
+.field private adT: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;->adK:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -50,7 +50,7 @@
 
     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;->adK:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     return-void
 .end method
@@ -63,14 +63,14 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adK:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     if-nez v1, :cond_0
 
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adK:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     invoke-interface {v1, p1, v0}, Landroid/content/SharedPreferences;->getFloat(Ljava/lang/String;F)F
 
@@ -98,14 +98,14 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adK:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     if-nez v1, :cond_0
 
     return v0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adK:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     invoke-interface {v1, p1, v0}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
@@ -131,14 +131,14 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adK:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     if-nez v0, :cond_0
 
     return-object p2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adK:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/ads/identifier/b;->adT:Landroid/content/SharedPreferences;
 
     invoke-interface {v0, p1, p2}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
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 009320cee7..1307e5bf14 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 adL:Lcom/google/android/gms/internal/gtm/bk;
+.field private adU: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 lA()Lcom/google/android/gms/internal/gtm/bk;
+.method private final lD()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;->adL:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adU: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;->adL:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adU:Lcom/google/android/gms/internal/gtm/bk;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adL:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsJobService;->adU: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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lD()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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lD()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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lD()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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsJobService;->lD()Lcom/google/android/gms/internal/gtm/bk;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/bk;->arl: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->om()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 c1aaaf8117..6a9e7b702f 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 adM:Lcom/google/android/gms/internal/gtm/bj;
+.field private adV: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;->adM:Lcom/google/android/gms/internal/gtm/bj;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->adV: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;->adM:Lcom/google/android/gms/internal/gtm/bj;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsReceiver;->adV: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 cb9d98c3f4..5a39a0f64e 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 adL:Lcom/google/android/gms/internal/gtm/bk;
+.field private adU: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 lA()Lcom/google/android/gms/internal/gtm/bk;
+.method private final lD()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;->adL:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adU: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;->adL:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adU:Lcom/google/android/gms/internal/gtm/bk;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adL:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/AnalyticsService;->adU: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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lD()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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lD()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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lD()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;->lA()Lcom/google/android/gms/internal/gtm/bk;
+    invoke-direct {p0}, Lcom/google/android/gms/analytics/AnalyticsService;->lD()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 b82e9fb866..58e5e37ff7 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 adN:Ljava/lang/Boolean;
+.field private static adW: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;->adN:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/analytics/a;->adW: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;->adN:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/analytics/a;->adW: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -101,7 +101,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oL()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()I
 
     move-result p2
 
@@ -141,7 +141,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p1
 
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 a6afd3f7cb..b68c4ced28 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 adT:Ljava/util/Map;
+.field private aed:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/a/a;->adT:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/a/a;->aed:Ljava/util/Map;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/a/a;->adT:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/a;->aed: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;->adT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/a/a;->aed: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 27866edc96..bb00f7ed94 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 adT:Ljava/util/Map;
+.field private aed:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public final lD()Ljava/util/Map;
+.method public final lG()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;->adT:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->aed: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;->adT:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/b;->aed: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 d53701b76a..a00531df17 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 adT:Ljava/util/Map;
+.field private aed:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/a/c;->adT:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/a/c;->aed:Ljava/util/Map;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/a/c;->adT:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/a/c;->aed: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;->adT:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/a/c;->aed: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 82e24af9eb..963170c289 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 adO:Ljava/util/List;
+.field private static adX:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -15,9 +15,9 @@
 
 
 # instance fields
-.field public adP:Z
+.field public adY:Z
 
-.field private adQ:Ljava/util/Set;
+.field private adZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -27,9 +27,9 @@
     .end annotation
 .end field
 
-.field public adR:Z
+.field public aea:Z
 
-.field volatile adS:Z
+.field volatile aeb:Z
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/analytics/b;->adO:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/analytics/b;->adX: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;->adQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/b;->adZ:Ljava/util/Set;
 
     return-void
 .end method
 
-.method public static lB()V
+.method public static lE()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;->adO:Ljava/util/List;
+    sget-object v1, Lcom/google/android/gms/analytics/b;->adX:Ljava/util/List;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/analytics/b;->adO:Ljava/util/List;
+    sget-object v1, Lcom/google/android/gms/analytics/b;->adX: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;->adO:Ljava/util/List;
+    sput-object v1, Lcom/google/android/gms/analytics/b;->adX: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;->adP:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/b;->adY:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/analytics/c.smali b/com.discord/smali_classes2/com/google/android/gms/analytics/c.smali
index c666939711..0f453df6c3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/analytics/c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/analytics/c.smali
@@ -8,7 +8,7 @@
 
 
 # virtual methods
-.method public abstract lC()I
+.method public abstract lF()I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end method
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 a565c1c9d7..2c092db4ee 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 adU:Lcom/google/android/gms/internal/gtm/m;
+.field public final aee:Lcom/google/android/gms/internal/gtm/m;
 
-.field public adV:Z
+.field public aef: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;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->aem: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;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/d;->aee: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;->aov:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoE: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;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ol()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oo()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oE()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aov:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/analytics/d;->adV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/d;->aef:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asd:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -81,25 +81,25 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/d;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aox: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;->aoo:Lcom/google/android/gms/internal/gtm/d;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aox:Lcom/google/android/gms/internal/gtm/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nS()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nV()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asd:Ljava/lang/String;
+    iput-object v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nR()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/d;->nU()Z
 
     move-result v0
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->ase:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
 
     :cond_1
     return-void
@@ -114,9 +114,9 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/l;->aeo:Lcom/google/android/gms/analytics/j;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
 
-    iget-object v1, v1, Lcom/google/android/gms/analytics/j;->aem:Ljava/util/List;
+    iget-object v1, v1, Lcom/google/android/gms/analytics/j;->aev: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;->lF()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->lI()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;->aeo:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->aem:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->aev:Ljava/util/List;
 
     new-instance v1, Lcom/google/android/gms/analytics/e;
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/d;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/d;->aee: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 lE()Lcom/google/android/gms/analytics/j;
+.method public final lH()Lcom/google/android/gms/analytics/j;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aeo:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lG()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/x;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/m;->aoy: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;->aop:Lcom/google/android/gms/internal/gtm/x;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aoy:Lcom/google/android/gms/internal/gtm/x;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/x;->ou()Lcom/google/android/gms/internal/gtm/by;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/x;->ox()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;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/internal/gtm/aq;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aoz:Lcom/google/android/gms/internal/gtm/aq;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/aq;->oX()Lcom/google/android/gms/internal/gtm/cd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/aq;->pa()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;->lI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->lL()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 4be24df1ec..7f305284e8 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 adW:Ljava/text/DecimalFormat;
+.field private static aeg:Ljava/text/DecimalFormat;
 
 
 # instance fields
-.field private final adU:Lcom/google/android/gms/internal/gtm/m;
+.field private final aee:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final adX:Ljava/lang/String;
+.field private final aeh:Ljava/lang/String;
 
-.field private final adY:Landroid/net/Uri;
+.field private final aei:Landroid/net/Uri;
 
 
 # direct methods
@@ -35,17 +35,17 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/e;->adX:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/analytics/e;->adX:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/analytics/e;->aM(Ljava/lang/String;)Landroid/net/Uri;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->adY:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/e;->aei: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;->adW:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/google/android/gms/analytics/e;->aeg: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;->adW:Ljava/text/DecimalFormat;
+    sput-object v0, Lcom/google/android/gms/analytics/e;->aeg:Ljava/text/DecimalFormat;
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/analytics/e;->adW:Ljava/text/DecimalFormat;
+    sget-object v0, Lcom/google/android/gms/analytics/e;->aeg:Ljava/text/DecimalFormat;
 
     invoke-virtual {v0, p0, p1}, Ljava/text/DecimalFormat;->format(D)Ljava/lang/String;
 
@@ -225,7 +225,7 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cc;->aoz:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
 
     invoke-static {v1}, Ljava/util/Collections;->unmodifiableMap(Ljava/util/Map;)Ljava/util/Map;
 
@@ -350,49 +350,49 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     const-string v3, "t"
 
     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;->aov:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aoE: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;->asc:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asl:Ljava/lang/String;
 
     const-string v3, "uid"
 
     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;->asf:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aso:Ljava/lang/String;
 
     const-string v3, "sc"
 
     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;->ash:D
+    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asq: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;->asg:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asp: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;->asd:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asm: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;->ase:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/internal/gtm/ch;->asn: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;->anA:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/a;->anJ: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;->anB:I
+    iget v3, v1, Lcom/google/android/gms/internal/gtm/a;->anK: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;->anE:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/a;->anN:Ljava/lang/String;
 
     const-string v3, "dr"
 
@@ -440,13 +440,13 @@
 
     if-eqz v1, :cond_9
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->arW:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->asf:Ljava/lang/String;
 
     const-string v4, "ec"
 
     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;->arX:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/internal/gtm/cf;->asg:Ljava/lang/String;
 
     const-string v4, "ea"
 
@@ -458,7 +458,7 @@
 
     invoke-static {v0, v4, v3}, Lcom/google/android/gms/analytics/e;->c(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/cf;->arY:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/cf;->ash:J
 
     long-to-double v3, v3
 
@@ -485,53 +485,53 @@
 
     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;->arC:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arD:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arE:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->arF:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arO: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;->apm:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->apw: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;->arG:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arP: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;->arH:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arQ: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;->arI:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/bz;->arR:Ljava/lang/String;
 
     const-string v5, "dclid"
 
     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/bz;->arJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bz;->arS:Ljava/lang/String;
 
     const-string v4, "aclid"
 
@@ -548,13 +548,13 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/cg;->arZ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/cg;->asi:Ljava/lang/String;
 
     const-string v5, "exd"
 
     invoke-static {v0, v5, v4}, 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/cg;->asa:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/internal/gtm/cg;->asj:Z
 
     const-string v4, "exf"
 
@@ -571,19 +571,19 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->anH:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->anQ:Ljava/lang/String;
 
     const-string v5, "sn"
 
     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;->anI:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/b;->anR: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;->anJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/b;->anS: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;->anK:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/c;->anT: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;->anL:J
+    iget-wide v4, v1, Lcom/google/android/gms/internal/gtm/c;->anU:J
 
     long-to-double v4, v4
 
@@ -620,7 +620,7 @@
 
     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/c;->anM:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/c;->anV:Ljava/lang/String;
 
     const-string v4, "utl"
 
@@ -637,7 +637,7 @@
 
     if-eqz v1, :cond_f
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ca;->arK:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ca;->arT: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;->arL:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/cb;->arU: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;->arV:Lcom/google/android/gms/analytics/a/b;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->ase: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;->lD()Ljava/util/Map;
+    invoke-virtual {v2}, Lcom/google/android/gms/analytics/a/b;->lG()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;->arT:Ljava/util/List;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->asc:Ljava/util/List;
 
     invoke-static {v2}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -908,7 +908,7 @@
     goto :goto_5
 
     :cond_14
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->arS:Ljava/util/List;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ce;->asb:Ljava/util/List;
 
     invoke-static {v2}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -950,7 +950,7 @@
     goto :goto_6
 
     :cond_15
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ce;->arU:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ce;->asd:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1113,13 +1113,13 @@
 
     if-eqz v1, :cond_1b
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arM:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arV: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;->arN:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arW: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;->arO:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arX:I
 
-    iget v3, v1, Lcom/google/android/gms/internal/gtm/cd;->arP:I
+    iget v3, v1, Lcom/google/android/gms/internal/gtm/cd;->arY: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;->arQ:I
+    iget v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arZ:I
 
-    iget v1, v1, Lcom/google/android/gms/internal/gtm/cd;->arR:I
+    iget v1, v1, Lcom/google/android/gms/internal/gtm/cd;->asa: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;->ary:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arH: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;->arA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arJ: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;->arB:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arK: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;->arz:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/by;->arI: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 v0, p1, Lcom/google/android/gms/analytics/j;->aee:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/analytics/j;->aen:Z
 
     const-string v1, "Can\'t deliver not submitted measurement"
 
@@ -1226,7 +1226,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->lG()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p1}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
@@ -1238,7 +1238,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/gtm/ch;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1246,9 +1246,9 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p1
 
@@ -1263,7 +1263,7 @@
     return-void
 
     :cond_0
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aov:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1271,9 +1271,9 @@
 
     if-eqz v2, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p1
 
@@ -1288,22 +1288,22 @@
     return-void
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->on()Lcom/google/android/gms/analytics/b;
 
     move-result-object v2
 
-    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->adS:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->aeb:Z
 
     if-eqz v2, :cond_2
 
     return-void
 
     :cond_2
-    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ash:D
+    iget-wide v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asq:D
 
-    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/ch;->aov:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
 
     invoke-static {v2, v3, v4}, Lcom/google/android/gms/internal/gtm/bq;->a(DLjava/lang/String;)Z
 
@@ -1332,25 +1332,25 @@
 
     invoke-interface {v0, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/l;->aoc:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/l;->aol:Ljava/lang/String;
 
     const-string v3, "_v"
 
     invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->adX:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
 
     const-string v3, "tid"
 
     invoke-interface {v0, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/e;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->ok()Lcom/google/android/gms/analytics/b;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->on()Lcom/google/android/gms/analytics/b;
 
     move-result-object v2
 
-    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->adR:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/analytics/b;->aea:Z
 
     if-eqz v2, :cond_6
 
@@ -1428,7 +1428,7 @@
 
     invoke-direct {v7}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asc:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asl:Ljava/lang/String;
 
     const-string v3, "uid"
 
@@ -1444,25 +1444,25 @@
 
     if-eqz v2, :cond_7
 
-    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->ary:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
 
     const-string v4, "an"
 
     invoke-static {v7, v4, v3}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arA:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arJ:Ljava/lang/String;
 
     const-string v4, "aid"
 
     invoke-static {v7, v4, v3}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arz:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
 
     const-string v4, "av"
 
     invoke-static {v7, v4, v3}, Lcom/google/android/gms/internal/gtm/bq;->d(Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/by;->arB:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/by;->arK:Ljava/lang/String;
 
     const-string v3, "aiid"
 
@@ -1471,11 +1471,11 @@
     :cond_7
     new-instance v8, Lcom/google/android/gms/internal/gtm/p;
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aov:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->adX:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/analytics/e;->aeh:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ch;->asd:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1489,7 +1489,7 @@
 
     invoke-direct/range {v1 .. v7}, Lcom/google/android/gms/internal/gtm/p;-><init>(Ljava/lang/String;Ljava/lang/String;ZJLjava/util/Map;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v1
 
@@ -1507,17 +1507,17 @@
 
     new-instance v1, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v2
 
-    iget-wide v3, p1, Lcom/google/android/gms/analytics/j;->aef:J
+    iget-wide v3, p1, Lcom/google/android/gms/analytics/j;->aeo:J
 
     invoke-direct {v1, v2, v0, v3, v4}, Lcom/google/android/gms/internal/gtm/az;-><init>(Lcom/google/android/gms/internal/gtm/j;Ljava/util/Map;J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p1
 
@@ -1526,10 +1526,10 @@
     return-void
 .end method
 
-.method public final lF()Landroid/net/Uri;
+.method public final lI()Landroid/net/Uri;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/e;->adY:Landroid/net/Uri;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/e;->aei: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 9a94b2b752..f8490de060 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 adZ:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final synthetic aej: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;->adZ:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/f;->aej: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;->adZ:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/f;->aej: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 a5d04e6a2a..02b53c9632 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 adY:Landroid/net/Uri;
+.field private static final aei:Landroid/net/Uri;
 
 
 # instance fields
-.field private final aea:Landroid/util/LogPrinter;
+.field private final aek:Landroid/util/LogPrinter;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/analytics/h;->adY:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/analytics/h;->aei: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;->aea:Landroid/util/LogPrinter;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/h;->aek: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;->ael:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->aeu: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;->aea:Landroid/util/LogPrinter;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/h;->aek:Landroid/util/LogPrinter;
 
     invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
@@ -138,10 +138,10 @@
     return-void
 .end method
 
-.method public final lF()Landroid/net/Uri;
+.method public final lI()Landroid/net/Uri;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/analytics/h;->adY:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/analytics/h;->aei: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 be357fa8ed..7e67541a74 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,25 +3,25 @@
 
 
 # instance fields
-.field final aeb:Lcom/google/android/gms/analytics/l;
+.field final ael:Lcom/google/android/gms/analytics/l;
 
-.field private final aed:Lcom/google/android/gms/common/util/e;
+.field private final aem:Lcom/google/android/gms/common/util/e;
 
-.field aee:Z
+.field aen:Z
 
-.field aef:J
+.field aeo:J
 
-.field public aeg:J
+.field public aep:J
 
-.field private aeh:J
+.field private aeq:J
 
-.field private aei:J
+.field private aer:J
 
-.field private aej:J
+.field private aes:J
 
-.field aek:Z
+.field aet:Z
 
-.field final ael:Ljava/util/Map;
+.field final aeu:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final aem:Ljava/util/List;
+.field final aev:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -52,45 +52,45 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->aeb:Lcom/google/android/gms/analytics/l;
+    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aeb:Lcom/google/android/gms/analytics/l;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
 
-    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p1, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aed:Lcom/google/android/gms/common/util/e;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aef:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aeo:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aef:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aeo:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aeg:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aep:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aeg:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aep:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aeh:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aeq:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aeh:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aeq:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aei:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aer:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aei:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aer:J
 
-    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aej:J
+    iget-wide v0, p1, Lcom/google/android/gms/analytics/j;->aes:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aej:J
+    iput-wide v0, p0, Lcom/google/android/gms/analytics/j;->aes:J
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->aem:Ljava/util/List;
+    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->aev: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;->aem:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aev:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashMap;
 
-    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->ael:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/analytics/j;->aeu: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;->ael:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/j;->aeu:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->ael:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/analytics/j;->aeu: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;->ael:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/j;->aeu: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;->aeb:Lcom/google/android/gms/analytics/l;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/j;->aed:Lcom/google/android/gms/common/util/e;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
 
     const-wide/32 p1, 0x1b7740
 
-    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aei:J
+    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aer:J
 
     const-wide p1, 0xb43e9400L
 
-    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aej:J
+    iput-wide p1, p0, Lcom/google/android/gms/analytics/j;->aes: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;->ael:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->aeu: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;->aem:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/j;->aev:Ljava/util/List;
 
     return-void
 .end method
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->ael:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeu:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -339,7 +339,7 @@
     return-object p1
 .end method
 
-.method public final lG()Lcom/google/android/gms/analytics/j;
+.method public final lJ()Lcom/google/android/gms/analytics/j;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/analytics/j;
@@ -349,34 +349,34 @@
     return-object v0
 .end method
 
-.method public final lH()V
+.method public final lK()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeb:Lcom/google/android/gms/analytics/l;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/l;->aen:Lcom/google/android/gms/analytics/m;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/l;->aew:Lcom/google/android/gms/analytics/m;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aek:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aet:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aee:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/analytics/j;->aen:Z
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->lG()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
 
     move-result-object v1
 
-    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aem:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v2
 
-    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aeh:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aeq:J
 
-    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->aeg:J
+    iget-wide v2, v1, Lcom/google/android/gms/analytics/j;->aep:J
 
     const-wide/16 v4, 0x0
 
@@ -384,25 +384,25 @@
 
     if-eqz v6, :cond_0
 
-    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aef:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aeo:J
 
     goto :goto_0
 
     :cond_0
-    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v1, Lcom/google/android/gms/analytics/j;->aem: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;->aef:J
+    iput-wide v2, v1, Lcom/google/android/gms/analytics/j;->aeo:J
 
     :goto_0
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->aee:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/analytics/j;->aen:Z
 
-    iget-object v2, v0, Lcom/google/android/gms/analytics/m;->aeu:Lcom/google/android/gms/analytics/m$a;
+    iget-object v2, v0, Lcom/google/android/gms/analytics/m;->aeD:Lcom/google/android/gms/analytics/m$a;
 
     new-instance v3, Lcom/google/android/gms/analytics/n;
 
@@ -443,7 +443,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->ael:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aeu: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;->ael:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/j;->aeu: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 11e6fb83a2..b6686bbe61 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 aen:Lcom/google/android/gms/analytics/m;
+.field final aew:Lcom/google/android/gms/analytics/m;
 
-.field protected final aeo:Lcom/google/android/gms/analytics/j;
+.field protected final aex:Lcom/google/android/gms/analytics/j;
 
-.field private final aep:Ljava/util/List;
+.field private final aey: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;->aen:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aew: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;->aep:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aey: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;->aek:Z
+    iput-boolean p2, p1, Lcom/google/android/gms/analytics/j;->aet:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aeo:Lcom/google/android/gms/analytics/j;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
 
     return-void
 .end method
@@ -66,24 +66,24 @@
     return-void
 .end method
 
-.method public lE()Lcom/google/android/gms/analytics/j;
+.method public lH()Lcom/google/android/gms/analytics/j;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aeo:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aex:Lcom/google/android/gms/analytics/j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lG()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lJ()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->lI()V
+    invoke-virtual {p0}, Lcom/google/android/gms/analytics/l;->lL()V
 
     return-object v0
 .end method
 
-.method protected final lI()V
+.method protected final lL()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aep:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/l;->aey: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 370cdf1597..85a156dcea 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 aex:Lcom/google/android/gms/analytics/m;
+.field final synthetic aeG: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;->aex:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m$a;->aeG: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 4004cd0d97..2bd1e3fa82 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 aey:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final aeH: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;->aey:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/android/gms/analytics/m$b;->aeH: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;->aey:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/analytics/m$b;->aeH: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 7dcf66eccd..a6974c8b1c 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 aeq:Lcom/google/android/gms/analytics/m;
+.field private static volatile aez:Lcom/google/android/gms/analytics/m;
 
 
 # instance fields
-.field public final aer:Landroid/content/Context;
+.field public final aeA:Landroid/content/Context;
 
-.field private final aes:Ljava/util/List;
+.field private final aeB:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -29,13 +29,13 @@
     .end annotation
 .end field
 
-.field private final aet:Lcom/google/android/gms/analytics/h;
+.field private final aeC:Lcom/google/android/gms/analytics/h;
 
-.field final aeu:Lcom/google/android/gms/analytics/m$a;
+.field final aeD:Lcom/google/android/gms/analytics/m$a;
 
-.field private volatile aev:Lcom/google/android/gms/internal/gtm/by;
+.field private volatile aeE:Lcom/google/android/gms/internal/gtm/by;
 
-.field public aew:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field public aeF: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;->aer:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->aeu:Lcom/google/android/gms/analytics/m$a;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aeD: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;->aes:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aeB: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;->aet:Lcom/google/android/gms/analytics/h;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/m;->aeC: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;->aeq:Lcom/google/android/gms/analytics/m;
+    sget-object v0, Lcom/google/android/gms/analytics/m;->aez: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;->aeq:Lcom/google/android/gms/analytics/m;
+    sget-object v1, Lcom/google/android/gms/analytics/m;->aez: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;->aeq:Lcom/google/android/gms/analytics/m;
+    sput-object v1, Lcom/google/android/gms/analytics/m;->aez: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;->aeq:Lcom/google/android/gms/analytics/m;
+    sget-object p0, Lcom/google/android/gms/analytics/m;->aez: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;->aes:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->aeB: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;->aew:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object p0, p0, Lcom/google/android/gms/analytics/m;->aeF:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     return-object p0
 .end method
@@ -141,13 +141,13 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aW(Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/analytics/j;->aee:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/analytics/j;->aen: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;->aem:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/j;->aev: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;->lF()Landroid/net/Uri;
+    invoke-interface {v2}, Lcom/google/android/gms/analytics/p;->lI()Landroid/net/Uri;
 
     move-result-object v3
 
@@ -197,7 +197,7 @@
     return-void
 .end method
 
-.method public static lK()V
+.method public static lN()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;->aeu:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeD: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;->aeu:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeD: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 lJ()Lcom/google/android/gms/internal/gtm/by;
+.method public final lM()Lcom/google/android/gms/internal/gtm/by;
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeE: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;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeE: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;->aer:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->aer:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->arA:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->arJ: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;->arB:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->arK: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;->aer:Landroid/content/Context;
+    iget-object v4, p0, Lcom/google/android/gms/analytics/m;->aeA: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;->ary:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
 
-    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->arz:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/analytics/m;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iput-object v0, p0, Lcom/google/android/gms/analytics/m;->aeE: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;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/m;->aeE: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 6072d488dd..e9f261029e 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 aex:Lcom/google/android/gms/analytics/m;
+.field private final synthetic aeG:Lcom/google/android/gms/analytics/m;
 
-.field private final synthetic aez:Lcom/google/android/gms/analytics/j;
+.field private final synthetic aeI: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;->aex:Lcom/google/android/gms/analytics/m;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/n;->aeG:Lcom/google/android/gms/analytics/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/analytics/n;->aez:Lcom/google/android/gms/analytics/j;
+    iput-object p2, p0, Lcom/google/android/gms/analytics/n;->aeI: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;->aez:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->aeI:Lcom/google/android/gms/analytics/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->aeb:Lcom/google/android/gms/analytics/l;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/j;->ael:Lcom/google/android/gms/analytics/l;
 
-    iget-object v1, p0, Lcom/google/android/gms/analytics/n;->aez:Lcom/google/android/gms/analytics/j;
+    iget-object v1, p0, Lcom/google/android/gms/analytics/n;->aeI: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;->aex:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->aeG: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;->aez:Lcom/google/android/gms/analytics/j;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/n;->aeI: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 da25204c39..de065414b6 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 aeA:Lcom/google/android/gms/analytics/m$a;
+.field private final synthetic aeJ: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;->aeA:Lcom/google/android/gms/analytics/m$a;
+    iput-object p1, p0, Lcom/google/android/gms/analytics/o;->aeJ: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;->aeA:Lcom/google/android/gms/analytics/m$a;
+    iget-object v0, p0, Lcom/google/android/gms/analytics/o;->aeJ:Lcom/google/android/gms/analytics/m$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m$a;->aex:Lcom/google/android/gms/analytics/m;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m$a;->aeG: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 85bf763820..1459c5c3da 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 lF()Landroid/net/Uri;
+.method public abstract lI()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 47413e8a09..e21df7326c 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 aeB:Lcom/google/android/gms/appinvite/PreviewActivity;
+.field private final synthetic aeK: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;->aeB:Lcom/google/android/gms/appinvite/PreviewActivity;
+    iput-object p1, p0, Lcom/google/android/gms/appinvite/a;->aeK: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;->aeB:Lcom/google/android/gms/appinvite/PreviewActivity;
+    iget-object p1, p0, Lcom/google/android/gms/appinvite/a;->aeK: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 a3924a38d5..3b0420839b 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,27 +16,27 @@
     .end annotation
 .end field
 
-.field private static aeC:Lcom/google/android/gms/common/util/e;
+.field private static aeL:Lcom/google/android/gms/common/util/e;
 
 
 # instance fields
-.field private final aeD:I
+.field private final aeM:I
 
-.field private aeE:Ljava/lang/String;
+.field private aeN:Ljava/lang/String;
 
-.field public aeF:Ljava/lang/String;
+.field public aeO:Ljava/lang/String;
 
-.field private aeG:Ljava/lang/String;
+.field private aeP:Ljava/lang/String;
 
-.field private aeH:Landroid/net/Uri;
+.field private aeQ:Landroid/net/Uri;
 
-.field private aeI:Ljava/lang/String;
+.field private aeR:Ljava/lang/String;
 
-.field private aeJ:J
+.field private aeS:J
 
-.field private aeK:Ljava/lang/String;
+.field private aeT:Ljava/lang/String;
 
-.field private aeL:Ljava/util/List;
+.field private aeU:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -46,11 +46,11 @@
     .end annotation
 .end field
 
-.field private aeM:Ljava/lang/String;
+.field private aeV:Ljava/lang/String;
 
-.field private aeN:Ljava/lang/String;
+.field private aeW:Ljava/lang/String;
 
-.field private aeO:Ljava/util/Set;
+.field private aeX: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;->nq()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeC:Lcom/google/android/gms/common/util/e;
+    sput-object v0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeL:Lcom/google/android/gms/common/util/e;
 
     return-void
 .end method
@@ -110,31 +110,31 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeX:Ljava/util/Set;
 
-    iput p1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeM: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;->aeE:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeN:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeF:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeG:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeH:Landroid/net/Uri;
+    iput-object p6, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeQ:Landroid/net/Uri;
 
-    iput-object p7, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeI:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeR:Ljava/lang/String;
 
-    iput-wide p8, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeJ:J
+    iput-wide p8, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeS:J
 
-    iput-object p10, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeK:Ljava/lang/String;
+    iput-object p10, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT:Ljava/lang/String;
 
-    iput-object p11, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeL:Ljava/util/List;
+    iput-object p11, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeU:Ljava/util/List;
 
-    iput-object p12, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeM:Ljava/lang/String;
+    iput-object p12, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeV:Ljava/lang/String;
 
-    iput-object p13, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeN:Ljava/lang/String;
+    iput-object p13, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeW:Ljava/lang/String;
 
     return-void
 .end method
@@ -280,7 +280,7 @@
 
     if-nez v2, :cond_3
 
-    sget-object v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeC:Lcom/google/android/gms/common/util/e;
+    sget-object v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeL:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -343,7 +343,7 @@
 
     move-result-object v0
 
-    iput-object v0, v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeI:Ljava/lang/String;
+    iput-object v0, v2, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeR: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;->aeK:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeK:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT: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;->lL()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lO()Ljava/util/Set;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lL()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lO()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;->aeK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT: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;->lL()Ljava/util/Set;
+    invoke-virtual {p0}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lO()Ljava/util/Set;
 
     move-result-object v1
 
@@ -427,7 +427,7 @@
     return v0
 .end method
 
-.method public final lL()Ljava/util/Set;
+.method public final lO()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;->aeL:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeU: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;->aeO:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeX:Ljava/util/Set;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z
 
@@ -460,7 +460,7 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeM:I
 
     const/4 v2, 0x1
 
@@ -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;->aeE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeN: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;->aeF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO: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;->aeG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeP: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;->aeH:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeQ: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;->aeI:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeR: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;->aeJ:J
+    iget-wide v1, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeS: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;->aeK:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeT: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;->aeL:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeU: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;->aeM:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeV: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;->aeN:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeW: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 d0ee9baf7f..14259f74aa 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 aLe:Lcom/google/android/gms/common/c;
+.field private static final aLn:Lcom/google/android/gms/common/c;
 
-.field private static aLf:Ljava/lang/reflect/Method;
+.field private static aLo: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;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/b/a;->aLe:Lcom/google/android/gms/common/c;
+    sput-object v0, Lcom/google/android/gms/b/a;->aLn: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;->aLf:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/b/a;->aLo: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;->aLf:Ljava/lang/reflect/Method;
+    sget-object v3, Lcom/google/android/gms/b/a;->aLo: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;->aLf:Ljava/lang/reflect/Method;
+    sput-object v3, Lcom/google/android/gms/b/a;->aLo:Ljava/lang/reflect/Method;
 
     :cond_1
-    sget-object v3, Lcom/google/android/gms/b/a;->aLf:Ljava/lang/reflect/Method;
+    sget-object v3, Lcom/google/android/gms/b/a;->aLo: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;->amL:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amU: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;->amO:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amX: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 292888622b..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 = 0x7f0800a1
+.field public static final common_full_open_on_phone:I = 0x7f0800a2
 
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a2
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800a3
 
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800a3
+.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 = 0x7f0800a4
+.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 = 0x7f0800a5
+.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 = 0x7f0800a6
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800a7
 
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a7
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800a8
 
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800a8
+.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 = 0x7f0800a9
+.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 = 0x7f0800aa
+.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 = 0x7f0800ab
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800ac
 
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800ac
+.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 = 0x7f0800ad
+.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 = 0x7f0800ae
+.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 = 0x7f0800af
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800b0
 
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800b0
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800b1
 
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800b1
+.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 = 0x7f0800b2
+.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 = 0x7f0800b3
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800b4
 
-.field public static final googleg_disabled_color_18:I = 0x7f0801b0
+.field public static final googleg_disabled_color_18:I = 0x7f0801bb
 
-.field public static final googleg_standard_color_18:I = 0x7f0801b1
+.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 76302bff90..a6da452d18 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 = 0x7f12040b
+.field public static final common_google_play_services_enable_button:I = 0x7f120430
 
-.field public static final common_google_play_services_enable_text:I = 0x7f12040c
+.field public static final common_google_play_services_enable_text:I = 0x7f120431
 
-.field public static final common_google_play_services_enable_title:I = 0x7f12040d
+.field public static final common_google_play_services_enable_title:I = 0x7f120432
 
-.field public static final common_google_play_services_install_button:I = 0x7f12040e
+.field public static final common_google_play_services_install_button:I = 0x7f120433
 
-.field public static final common_google_play_services_install_text:I = 0x7f12040f
+.field public static final common_google_play_services_install_text:I = 0x7f120434
 
-.field public static final common_google_play_services_install_title:I = 0x7f120410
+.field public static final common_google_play_services_install_title:I = 0x7f120435
 
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120411
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120436
 
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120412
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120437
 
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120414
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120439
 
-.field public static final common_google_play_services_update_button:I = 0x7f120415
+.field public static final common_google_play_services_update_button:I = 0x7f12043a
 
-.field public static final common_google_play_services_update_text:I = 0x7f120416
+.field public static final common_google_play_services_update_text:I = 0x7f12043b
 
-.field public static final common_google_play_services_update_title:I = 0x7f120417
+.field public static final common_google_play_services_update_title:I = 0x7f12043c
 
-.field public static final common_google_play_services_updating_text:I = 0x7f120418
+.field public static final common_google_play_services_updating_text:I = 0x7f12043d
 
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120419
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12043e
 
-.field public static final common_open_on_phone:I = 0x7f12041a
+.field public static final common_open_on_phone:I = 0x7f12043f
 
-.field public static final common_signin_button_text:I = 0x7f12041b
+.field public static final common_signin_button_text:I = 0x7f120440
 
-.field public static final common_signin_button_text_long:I = 0x7f12041c
+.field public static final common_signin_button_text_long:I = 0x7f120441
 
 
 # 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 2a53caf976..c5640f7dce 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,11 +13,11 @@
     .end annotation
 .end field
 
-.field public static final aeU:Lcom/google/android/gms/common/ConnectionResult;
+.field public static final afd:Lcom/google/android/gms/common/ConnectionResult;
 
 
 # instance fields
-.field public final aeV:Landroid/app/PendingIntent;
+.field public final afe:Landroid/app/PendingIntent;
 
 .field private final zzg:I
 
@@ -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;->aeU:Lcom/google/android/gms/common/ConnectionResult;
+    sput-object v0, Lcom/google/android/gms/common/ConnectionResult;->afd:Lcom/google/android/gms/common/ConnectionResult;
 
     new-instance v0, Lcom/google/android/gms/common/j;
 
@@ -68,7 +68,7 @@
 
     iput p2, p0, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iput-object p3, p0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     iput-object p4, p0, Lcom/google/android/gms/common/ConnectionResult;->zzj:Ljava/lang/String;
 
@@ -316,9 +316,9 @@
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v3, p1, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -359,7 +359,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     const/4 v2, 0x1
 
@@ -378,14 +378,14 @@
     return v0
 .end method
 
-.method public final lM()Z
+.method public final lP()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     if-eqz v0, :cond_0
 
@@ -399,7 +399,7 @@
     return v0
 .end method
 
-.method public final lN()Z
+.method public final lQ()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
@@ -435,7 +435,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     const-string v2, "resolution"
 
@@ -479,7 +479,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/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
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 c05514d880..275f8c3784 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,7 +15,7 @@
 
 
 # instance fields
-.field private final aeX:I
+.field private final afg:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
@@ -45,7 +45,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/common/Feature;->aeX:I
+    iput p2, p0, Lcom/google/android/gms/common/Feature;->afg:I
 
     iput-wide p3, p0, Lcom/google/android/gms/common/Feature;->zzl:J
 
@@ -87,11 +87,11 @@
     if-nez v0, :cond_2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lO()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lR()J
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->lO()J
+    invoke-virtual {p1}, Lcom/google/android/gms/common/Feature;->lR()J
 
     move-result-wide v4
 
@@ -120,7 +120,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lO()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lR()J
 
     move-result-wide v1
 
@@ -139,7 +139,7 @@
     return v0
 .end method
 
-.method public final lO()J
+.method public final lR()J
     .locals 5
 
     iget-wide v0, p0, Lcom/google/android/gms/common/Feature;->zzl:J
@@ -150,7 +150,7 @@
 
     if-nez v4, :cond_0
 
-    iget v0, p0, Lcom/google/android/gms/common/Feature;->aeX:I
+    iget v0, p0, Lcom/google/android/gms/common/Feature;->afg:I
 
     int-to-long v0, v0
 
@@ -173,7 +173,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lO()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lR()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;->aeX:I
+    iget v0, p0, Lcom/google/android/gms/common/Feature;->afg: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;->lO()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/Feature;->lR()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 8318696657..10ea84128b 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 afa:Landroid/content/Context;
+.field private final afj:Landroid/content/Context;
 
-.field private final synthetic afb:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private final synthetic afl: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;->afb:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afl: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;->afa:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afj: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;->afb:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object p1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afa:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afj: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;->afb:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/GoogleApiAvailability;->aY(I)Z
 
@@ -106,9 +106,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afb:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afl:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afa:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability$a;->afj: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 41de255e88..7aece9c560 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 aeY:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private static final afh:Lcom/google/android/gms/common/GoogleApiAvailability;
 
 .field private static final mLock:Ljava/lang/Object;
 
 
 # instance fields
-.field private aeZ:Ljava/lang/String;
+.field private afi: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;->aeY:Lcom/google/android/gms/common/GoogleApiAvailability;
+    sput-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->afh: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;->ns()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nv()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;->lQ()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->lT()Ljava/lang/String;
 
     move-result-object p3
 
@@ -478,15 +478,15 @@
     return-void
 .end method
 
-.method public static lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+.method public static lS()Lcom/google/android/gms/common/GoogleApiAvailability;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->aeY:Lcom/google/android/gms/common/GoogleApiAvailability;
+    sget-object v0, Lcom/google/android/gms/common/GoogleApiAvailability;->afh:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     return-object v0
 .end method
 
-.method private final lQ()Ljava/lang/String;
+.method private final lT()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;->aeZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/GoogleApiAvailability;->afi: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;->lM()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->lP()Z
 
     move-result v0
 
@@ -602,7 +602,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v0, p2, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
     goto :goto_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 429972e745..c92ed6d437 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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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 3f3af7ffd2..a9c623dbe9 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 = 0x7f120413
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120438
 
 
 # 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 41b6162ad9..412923c79a 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,7 +6,7 @@
 
 
 # instance fields
-.field public final aeT:Ljava/util/concurrent/BlockingQueue;
+.field public final afc:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/a;->aeT:Ljava/util/concurrent/BlockingQueue;
+    iput-object v0, p0, Lcom/google/android/gms/common/a;->afc: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;->aeT:Ljava/util/concurrent/BlockingQueue;
+    iget-object p1, p0, Lcom/google/android/gms/common/a;->afc: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 47b5b7eb83..3461fff2be 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 aip:Lcom/google/android/gms/common/a/a$a;
+.field private static aiy:Lcom/google/android/gms/common/a/a$a;
 
-.field private static aiq:I
+.field private static aiz:I
 
 .field private static final sLock:Ljava/lang/Object;
 
 
 # instance fields
-.field protected final air:Ljava/lang/Object;
+.field protected final aiA:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private ais:Ljava/lang/Object;
+.field private aiB: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;->aip:Lcom/google/android/gms/common/a/a$a;
+    sput-object v0, Lcom/google/android/gms/common/a/a;->aiy:Lcom/google/android/gms/common/a/a$a;
 
     const/4 v0, 0x0
 
-    sput v0, Lcom/google/android/gms/common/a/a;->aiq:I
+    sput v0, Lcom/google/android/gms/common/a/a;->aiz:I
 
     return-void
 .end method
@@ -82,11 +82,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/a/a;->ais:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/a/a;->aiB: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;->air:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/common/a/a;->aiA: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 27bcfba720..d0b0ac2412 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 aft:I
+.field private afC:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aft:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC:I
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 
     move-result p1
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aft:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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;->mp()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d;->ms()V
 
     goto :goto_0
 
@@ -140,7 +140,7 @@
 
     if-ne p1, v1, :cond_3
 
-    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aft:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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;->aft:I
+    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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;->aft:I
+    iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC:I
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->aft:I
+    iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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;->aft:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->aft:I
+    iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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;->aft:I
+    iget v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->afC: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 f5ef58da31..c9136735e3 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,7 +18,7 @@
 
 
 # instance fields
-.field private final afw:Ljava/lang/String;
+.field private final afF:Ljava/lang/String;
 
 .field private final zzg:I
 
@@ -47,7 +47,7 @@
 
     iput p1, p0, Lcom/google/android/gms/common/api/Scope;->zzg:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/Scope;->afw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/Scope;->afF: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;->afw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afF:Ljava/lang/String;
 
     check-cast p1, Lcom/google/android/gms/common/api/Scope;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/Scope;->afw:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/Scope;->afF: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;->afw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afF: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;->afw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afF:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -131,7 +131,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/common/api/Scope;->afw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Scope;->afF: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 65014a1840..6747d12eb5 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,23 +17,23 @@
     .end annotation
 .end field
 
-.field public static final afA:Lcom/google/android/gms/common/api/Status;
+.field public static final afG:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afB:Lcom/google/android/gms/common/api/Status;
+.field public static final afH:Lcom/google/android/gms/common/api/Status;
 
-.field private static final afC:Lcom/google/android/gms/common/api/Status;
+.field public static final afI:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afD:Lcom/google/android/gms/common/api/Status;
+.field public static final afJ:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afx:Lcom/google/android/gms/common/api/Status;
+.field public static final afK:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afy:Lcom/google/android/gms/common/api/Status;
+.field private static final afL:Lcom/google/android/gms/common/api/Status;
 
-.field public static final afz:Lcom/google/android/gms/common/api/Status;
+.field public static final afM:Lcom/google/android/gms/common/api/Status;
 
 
 # instance fields
-.field private final aeV:Landroid/app/PendingIntent;
+.field private final afe:Landroid/app/PendingIntent;
 
 .field private final zzg:I
 
@@ -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;->afx:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afG: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;->afy:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afH: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;->afz:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afI: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;->afA:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afJ: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;->afB:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afK: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;->afC:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afL: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;->afD:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/Status;->afM:Lcom/google/android/gms/common/api/Status;
 
     new-instance v0, Lcom/google/android/gms/common/api/u;
 
@@ -132,7 +132,7 @@
 
     iput-object p3, p0, Lcom/google/android/gms/common/api/Status;->zzj:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
     return-void
 .end method
@@ -197,9 +197,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -248,7 +248,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
@@ -261,10 +261,10 @@
     return v0
 .end method
 
-.method public final lM()Z
+.method public final lP()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
     if-eqz v0, :cond_0
 
@@ -278,7 +278,7 @@
     return v0
 .end method
 
-.method public final lN()Z
+.method public final lQ()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/common/api/Status;->zzh:I
@@ -295,7 +295,7 @@
     return v0
 .end method
 
-.method public final ml()Lcom/google/android/gms/common/api/Status;
+.method public final mo()Lcom/google/android/gms/common/api/Status;
     .locals 0
 
     return-object p0
@@ -328,7 +328,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
     const-string v2, "resolution"
 
@@ -364,7 +364,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/common/api/Status;->aeV:Landroid/app/PendingIntent;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/Status;->afe:Landroid/app/PendingIntent;
 
     const/4 v2, 0x3
 
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 5ee1198ed8..73eb986356 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 lS()Landroid/accounts/Account;
+.method public abstract lV()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 f3837d2d16..69230653c7 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 lT()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.method public abstract lW()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 374ddada3a..11309cc021 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
@@ -41,20 +41,20 @@
 .method public abstract isConnected()Z
 .end method
 
-.method public abstract lU()Z
+.method public abstract lX()Z
 .end method
 
-.method public abstract lV()Z
+.method public abstract lY()Z
 .end method
 
-.method public abstract lW()Z
+.method public abstract lZ()Z
 .end method
 
-.method public abstract lX()Ljava/lang/String;
+.method public abstract ma()Ljava/lang/String;
 .end method
 
-.method public abstract lY()I
+.method public abstract mb()I
 .end method
 
-.method public abstract lZ()[Lcom/google/android/gms/common/Feature;
+.method public abstract mc()[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 72ef7ba8dc..45805fdd10 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 ma()Ljava/lang/String;
+.method public abstract md()Ljava/lang/String;
 .end method
 
-.method public abstract mb()Ljava/lang/String;
+.method public abstract me()Ljava/lang/String;
 .end method
 
-.method public abstract mc()Landroid/os/IInterface;
+.method public abstract mf()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 8ef71f3cbc..1f2329d00d 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,7 @@
 
 
 # instance fields
-.field public final afe:Lcom/google/android/gms/common/api/a$a;
+.field public final afo:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field private final aff:Lcom/google/android/gms/common/api/a$i;
+.field private final afp:Lcom/google/android/gms/common/api/a$i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$i<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field public final afg:Lcom/google/android/gms/common/api/a$g;
+.field public final afq:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field private final afh:Lcom/google/android/gms/common/api/a$j;
+.field private final afr:Lcom/google/android/gms/common/api/a$j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$j<",
@@ -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;->afe:Lcom/google/android/gms/common/api/a$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/a;->afo:Lcom/google/android/gms/common/api/a$a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->aff:Lcom/google/android/gms/common/api/a$i;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afp:Lcom/google/android/gms/common/api/a$i;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/a;->afg:Lcom/google/android/gms/common/api/a$g;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/a;->afq:Lcom/google/android/gms/common/api/a$g;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afh:Lcom/google/android/gms/common/api/a$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/a;->afr: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/f.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/f.smali
index 0c560d6651..c3e13aeee3 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
@@ -79,7 +79,7 @@
 
     check-cast v4, Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/common/ConnectionResult;->lQ()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;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/aw;->afs: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/h$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/h$a$a.smali
index 673b609d0f..cc67b2fa01 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/h$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/h$a$a.smali
@@ -14,9 +14,9 @@
 
 
 # instance fields
-.field afm:Landroid/os/Looper;
+.field afv:Landroid/os/Looper;
 
-.field afo:Lcom/google/android/gms/common/api/internal/k;
+.field afx:Lcom/google/android/gms/common/api/internal/k;
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
 
 # virtual methods
-.method public final mf()Lcom/google/android/gms/common/api/h$a;
+.method public final mi()Lcom/google/android/gms/common/api/h$a;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afx: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/h$a$a;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afx:Lcom/google/android/gms/common/api/internal/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afm:Landroid/os/Looper;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afv: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/h$a$a;->afm:Landroid/os/Looper;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/h$a$a;->afv:Landroid/os/Looper;
 
     :cond_1
     new-instance v0, Lcom/google/android/gms/common/api/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/h$a$a;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h$a$a;->afx:Lcom/google/android/gms/common/api/internal/k;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/h$a$a;->afm:Landroid/os/Looper;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/h$a$a;->afv:Landroid/os/Looper;
 
     const/4 v3, 0x0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/h$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/h$a.smali
index b802e28030..a91620f98c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/h$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/h$a.smali
@@ -20,13 +20,13 @@
 
 
 # static fields
-.field public static final afq:Lcom/google/android/gms/common/api/h$a;
+.field public static final afz:Lcom/google/android/gms/common/api/h$a;
 
 
 # instance fields
-.field public final afr:Lcom/google/android/gms/common/api/internal/k;
+.field public final afA:Lcom/google/android/gms/common/api/internal/k;
 
-.field public final afs:Landroid/os/Looper;
+.field public final afB:Landroid/os/Looper;
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/h$a$a;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mf()Lcom/google/android/gms/common/api/h$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mi()Lcom/google/android/gms/common/api/h$a;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/api/h$a;->afq:Lcom/google/android/gms/common/api/h$a;
+    sput-object v0, Lcom/google/android/gms/common/api/h$a;->afz:Lcom/google/android/gms/common/api/h$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/h$a;->afr:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h$a;->afA:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h$a;->afs:Landroid/os/Looper;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h$a;->afB:Landroid/os/Looper;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/h.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/h.smali
index adba4370fe..ac8afd510a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/h.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field public final afi:Lcom/google/android/gms/common/api/a;
+.field public final afs: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 public final afj:Lcom/google/android/gms/common/api/a$d;
+.field public final aft: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 afl:Lcom/google/android/gms/common/api/internal/aw;
+.field public final afu: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 afm:Landroid/os/Looper;
+.field public final afv:Landroid/os/Looper;
 
-.field public final afn:Lcom/google/android/gms/common/api/i;
+.field public final afw:Lcom/google/android/gms/common/api/i;
 
-.field private final afo:Lcom/google/android/gms/common/api/internal/k;
+.field private final afx:Lcom/google/android/gms/common/api/internal/k;
 
-.field protected final afp:Lcom/google/android/gms/common/api/internal/d;
+.field protected final afy:Lcom/google/android/gms/common/api/internal/d;
 
 .field public final mContext:Landroid/content/Context;
 
@@ -93,29 +93,29 @@
 
     iput-object v0, p0, Lcom/google/android/gms/common/api/h;->mContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afi:Lcom/google/android/gms/common/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afs:Landroid/os/Looper;
+    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afB:Landroid/os/Looper;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afm:Landroid/os/Looper;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->aft: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/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afu: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/h;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afn:Lcom/google/android/gms/common/api/i;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afw:Lcom/google/android/gms/common/api/i;
 
     iget-object p2, p0, Lcom/google/android/gms/common/api/h;->mContext:Landroid/content/Context;
 
@@ -123,11 +123,11 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/api/internal/d;->agj:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p2, Lcom/google/android/gms/common/api/internal/d;->ags: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/h;->mId:I
 
-    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afr:Lcom/google/android/gms/common/api/internal/k;
+    iget-object p2, p4, Lcom/google/android/gms/common/api/h$a;->afA:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afx: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/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object p3, p0, Lcom/google/android/gms/common/api/h;->afu: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/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afy: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/h;)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/h$a$a;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p3, v0, Lcom/google/android/gms/common/api/h$a$a;->afx: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/h$a$a;->afm:Landroid/os/Looper;
+    iput-object p3, v0, Lcom/google/android/gms/common/api/h$a$a;->afv:Landroid/os/Looper;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mf()Lcom/google/android/gms/common/api/h$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/h$a$a;->mi()Lcom/google/android/gms/common/api/h$a;
 
     move-result-object p3
 
@@ -237,31 +237,31 @@
 
     iput-object p1, p0, Lcom/google/android/gms/common/api/h;->mContext:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afi:Lcom/google/android/gms/common/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afs:Landroid/os/Looper;
+    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afB:Landroid/os/Looper;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afm:Landroid/os/Looper;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/h;->aft: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/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afu: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/h;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afn:Lcom/google/android/gms/common/api/i;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afw:Lcom/google/android/gms/common/api/i;
 
     iget-object p1, p0, Lcom/google/android/gms/common/api/h;->mContext:Landroid/content/Context;
 
@@ -269,11 +269,11 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d;->agj:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d;->ags: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/h;->mId:I
 
-    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afr:Lcom/google/android/gms/common/api/internal/k;
+    iget-object p1, p3, Lcom/google/android/gms/common/api/h$a;->afA:Lcom/google/android/gms/common/api/internal/k;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/h;->afx:Lcom/google/android/gms/common/api/internal/k;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/h;->afy: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/h;)V
 
@@ -308,13 +308,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agh:Z
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afK:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -340,9 +340,9 @@
     const/4 v0, 0x1
 
     :goto_1
-    iput-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agh:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
     new-instance v2, Lcom/google/android/gms/common/api/internal/as;
 
@@ -356,7 +356,7 @@
 
     new-instance v5, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -390,7 +390,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/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
     new-instance v1, Lcom/google/android/gms/tasks/h;
 
@@ -406,7 +406,7 @@
 
     new-instance v4, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -422,7 +422,7 @@
 
     invoke-virtual {p1, v0}, Landroid/os/Handler;->sendMessage(Landroid/os/Message;)Z
 
-    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -451,23 +451,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;->agT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p2, Lcom/google/android/gms/common/api/internal/m;->agZ: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;->agT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
 
-    iget-object v1, p2, Lcom/google/android/gms/common/api/internal/m;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/internal/m;->agZ: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
 
@@ -477,7 +477,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/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
     new-instance v1, Lcom/google/android/gms/tasks/h;
 
@@ -497,7 +497,7 @@
 
     new-instance v3, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -513,7 +513,7 @@
 
     invoke-virtual {p1, p2}, Landroid/os/Handler;->sendMessage(Landroid/os/Message;)Z
 
-    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -538,9 +538,9 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/h;->afo:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/h;->afx:Lcom/google/android/gms/common/api/internal/k;
 
     new-instance v3, Lcom/google/android/gms/common/api/internal/au;
 
@@ -554,7 +554,7 @@
 
     new-instance v4, Lcom/google/android/gms/common/api/internal/ae;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agt:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -570,7 +570,7 @@
 
     invoke-virtual {p1, v1}, Landroid/os/Handler;->sendMessage(Landroid/os/Message;)Z
 
-    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -592,7 +592,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afm:Landroid/os/Looper;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
 
     const-string v1, "Listener must not be null"
 
@@ -613,7 +613,7 @@
     return-object v1
 .end method
 
-.method public final md()Lcom/google/android/gms/common/api/a$d;
+.method public final mg()Lcom/google/android/gms/common/api/a$d;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -621,19 +621,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
     return-object v0
 .end method
 
-.method public me()Lcom/google/android/gms/common/internal/d$a;
+.method public mh()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/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
     instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$b;
 
@@ -641,19 +641,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;->lT()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->lW()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;->aeF:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO: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;->aeF:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->aeO:Ljava/lang/String;
 
     const-string v3, "com.google"
 
@@ -662,7 +662,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
     instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$a;
 
@@ -670,7 +670,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;->lS()Landroid/accounts/Account;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$a;->lV()Landroid/accounts/Account;
 
     move-result-object v2
 
@@ -680,9 +680,9 @@
     const/4 v2, 0x0
 
     :goto_0
-    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajq:Landroid/accounts/Account;
+    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajz:Landroid/accounts/Account;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
     instance-of v2, v1, Lcom/google/android/gms/common/api/a$d$b;
 
@@ -690,13 +690,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;->lT()Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$d$b;->lW()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;->lL()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;->lO()Ljava/util/Set;
 
     move-result-object v1
 
@@ -708,7 +708,7 @@
     move-result-object v1
 
     :goto_1
-    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajB:Landroidx/collection/ArraySet;
+    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajK:Landroidx/collection/ArraySet;
 
     if-nez v2, :cond_3
 
@@ -716,10 +716,10 @@
 
     invoke-direct {v2}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajB:Landroidx/collection/ArraySet;
+    iput-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajK:Landroidx/collection/ArraySet;
 
     :cond_3
-    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajB:Landroidx/collection/ArraySet;
+    iget-object v2, v0, Lcom/google/android/gms/common/internal/d$a;->ajK:Landroidx/collection/ArraySet;
 
     invoke-virtual {v2, v1}, Landroidx/collection/ArraySet;->addAll(Ljava/util/Collection;)Z
 
@@ -733,7 +733,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ajx:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ajG:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/common/api/h;->mContext:Landroid/content/Context;
 
@@ -741,7 +741,7 @@
 
     move-result-object v1
 
-    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ajw:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d$a;->ajF:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/i$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/i$a.smali
index 70f9f88b3b..3afadfcb74 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/i$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/i$a.smali
@@ -14,8 +14,8 @@
 
 
 # virtual methods
-.method public abstract mj()V
+.method public abstract mm()V
 .end method
 
-.method public abstract mk()V
+.method public abstract mn()V
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/i.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/i.smali
index a5c7a8cbf0..a6c094707c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/i.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field private static final afu:Ljava/util/Set;
+.field private static final afD: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/i;->afu:Ljava/util/Set;
+    sput-object v0, Lcom/google/android/gms/common/api/i;->afD:Ljava/util/Set;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
     throw p1
 .end method
 
-.method public mg()Landroid/os/Looper;
+.method public mj()Landroid/os/Looper;
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -81,7 +81,7 @@
     throw v0
 .end method
 
-.method public mh()V
+.method public mk()V
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -91,7 +91,7 @@
     throw v0
 .end method
 
-.method public mi()V
+.method public ml()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 cc830b42e1..9759d4bd3a 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;->afA:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->afJ: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 5b000776a3..d350d4b9d6 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 afZ:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private final synthetic agi: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;->afZ:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->agi: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;->afZ:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult$b;->agi: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/n;
 
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 266268c2c7..2bc503dcc6 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 afK:Ljava/lang/ThreadLocal;
+.field public static final afT:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -34,9 +34,9 @@
 
 
 # instance fields
-.field private final afL:Ljava/lang/Object;
+.field private final afU:Ljava/lang/Object;
 
-.field private final afM:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+.field private final afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/BasePendingResult$a<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field private final afN:Ljava/lang/ref/WeakReference;
+.field private final afW:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -55,9 +55,9 @@
     .end annotation
 .end field
 
-.field private final afO:Ljava/util/concurrent/CountDownLatch;
+.field private final afX:Ljava/util/concurrent/CountDownLatch;
 
-.field private final afP:Ljava/util/ArrayList;
+.field private final afY:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -67,7 +67,7 @@
     .end annotation
 .end field
 
-.field private afQ:Lcom/google/android/gms/common/api/o;
+.field private afZ:Lcom/google/android/gms/common/api/o;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/o<",
@@ -76,7 +76,7 @@
     .end annotation
 .end field
 
-.field private final afR:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aga:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -86,7 +86,7 @@
     .end annotation
 .end field
 
-.field private afS:Lcom/google/android/gms/common/api/n;
+.field private agb:Lcom/google/android/gms/common/api/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TR;"
@@ -94,15 +94,15 @@
     .end annotation
 .end field
 
-.field private volatile afT:Z
+.field private volatile agc:Z
 
-.field private afU:Z
+.field private agd:Z
 
-.field private afV:Z
+.field private age:Z
 
-.field private afW:Lcom/google/android/gms/common/internal/l;
+.field private agf:Lcom/google/android/gms/common/internal/l;
 
-.field private volatile afX:Lcom/google/android/gms/common/api/internal/an;
+.field private volatile agg:Lcom/google/android/gms/common/api/internal/an;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/an<",
@@ -111,7 +111,7 @@
     .end annotation
 .end field
 
-.field public afY:Z
+.field public agh:Z
 
 .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;->afK:Ljava/lang/ThreadLocal;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->afL:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU: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;->afO:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX: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;->afP:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->afR:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aga:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agh: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;->afM:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV: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;->afN:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afW: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;->afL:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     new-instance v0, Ljava/util/concurrent/CountDownLatch;
 
@@ -212,27 +212,27 @@
 
     invoke-direct {v0, v1}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afO:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX: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;->afP:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY: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;->afR:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aga:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agh:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mg()Landroid/os/Looper;
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mj()Landroid/os/Looper;
 
     move-result-object v0
 
@@ -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;->afM:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV: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;->afN:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afW: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/n;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS:Lcom/google/android/gms/common/api/n;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
 
     return-object p0
 .end method
@@ -281,7 +281,7 @@
 .method private isReady()Z
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afO:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->getCount()J
 
@@ -303,7 +303,7 @@
     return v0
 .end method
 
-.method private final mo()Lcom/google/android/gms/common/api/n;
+.method private final mr()Lcom/google/android/gms/common/api/n;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -311,12 +311,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
 
     const/4 v2, 0x1
 
@@ -342,21 +342,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;->afS:Lcom/google/android/gms/common/api/n;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
 
     const/4 v3, 0x0
 
-    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS:Lcom/google/android/gms/common/api/n;
+    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
 
-    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Lcom/google/android/gms/common/api/o;
+    iput-object v3, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc: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;->afR:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->aga:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, v3}, Ljava/util/concurrent/atomic/AtomicReference;->getAndSet(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -385,7 +385,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
 
     const/4 v1, 0x1
 
@@ -395,7 +395,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;->afX:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agg:Lcom/google/android/gms/common/api/internal/an;
 
     if-nez v0, :cond_0
 
@@ -410,7 +410,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;->afO:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Ljava/util/concurrent/CountDownLatch;
 
     const-wide/16 v1, 0x0
 
@@ -420,7 +420,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->afA:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->afJ: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
@@ -429,7 +429,7 @@
     goto :goto_1
 
     :catch_0
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->afy:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->afH: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
 
@@ -443,7 +443,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;->mo()Lcom/google/android/gms/common/api/n;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mr()Lcom/google/android/gms/common/api/n;
 
     move-result-object p1
 
@@ -459,7 +459,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;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -477,7 +477,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Ljava/util/ArrayList;
 
     invoke-virtual {v1, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -506,12 +506,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
 
     const/4 v2, 0x1
 
@@ -531,7 +531,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;->afX:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agg:Lcom/google/android/gms/common/api/internal/an;
 
     if-nez v1, :cond_1
 
@@ -562,9 +562,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afM:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mo()Lcom/google/android/gms/common/api/n;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mr()Lcom/google/android/gms/common/api/n;
 
     move-result-object v2
 
@@ -573,7 +573,7 @@
     goto :goto_2
 
     :cond_3
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Lcom/google/android/gms/common/api/o;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
 
     :goto_2
     monitor-exit v0
@@ -598,16 +598,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->age:Z
 
     if-nez v1, :cond_6
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
 
     if-nez v1, :cond_6
 
@@ -635,7 +635,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;->afT:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agc:Z
 
     if-nez v1, :cond_1
 
@@ -649,38 +649,38 @@
 
     invoke-static {v2, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS:Lcom/google/android/gms/common/api/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afW:Lcom/google/android/gms/common/internal/l;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agf:Lcom/google/android/gms/common/internal/l;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afO:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afX:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS:Lcom/google/android/gms/common/api/n;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/n;->ml()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/n;->mo()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mStatus:Lcom/google/android/gms/common/api/Status;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd:Z
 
     if-eqz v1, :cond_2
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Lcom/google/android/gms/common/api/o;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
 
     goto :goto_2
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Lcom/google/android/gms/common/api/o;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afS:Lcom/google/android/gms/common/api/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agb:Lcom/google/android/gms/common/api/n;
 
     instance-of p1, p1, Lcom/google/android/gms/common/api/k;
 
@@ -695,17 +695,17 @@
     goto :goto_2
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afM:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
     const/4 v1, 0x2
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/common/api/internal/BasePendingResult$a;->removeMessages(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afM:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Lcom/google/android/gms/common/api/internal/BasePendingResult$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afQ:Lcom/google/android/gms/common/api/o;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afZ:Lcom/google/android/gms/common/api/o;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mo()Lcom/google/android/gms/common/api/n;
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/BasePendingResult;->mr()Lcom/google/android/gms/common/api/n;
 
     move-result-object v2
 
@@ -713,7 +713,7 @@
 
     :cond_4
     :goto_2
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Ljava/util/ArrayList;
 
     check-cast p1, Ljava/util/ArrayList;
 
@@ -739,7 +739,7 @@
     goto :goto_3
 
     :cond_5
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afP:Ljava/util/ArrayList;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afY:Ljava/util/ArrayList;
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->clear()V
 
@@ -771,7 +771,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;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -790,7 +790,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->age:Z
 
     :cond_0
     monitor-exit v0
@@ -820,12 +820,12 @@
 .method public final isCanceled()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afU:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->agd: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 b11d659c66..251ef76575 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 agN:Lcom/google/android/gms/common/api/internal/g;
+.field protected final agW:Lcom/google/android/gms/common/api/internal/g;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->agW:Lcom/google/android/gms/common/api/internal/g;
 
     return-void
 .end method
@@ -24,13 +24,13 @@
 
     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;->agM:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agV: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;->agM:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agV:Ljava/lang/Object;
 
     check-cast p0, Landroidx/fragment/app/FragmentActivity;
 
@@ -41,13 +41,13 @@
     return-object p0
 
     :cond_0
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agM:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agV: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;->agM:Ljava/lang/Object;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/f;->agV:Ljava/lang/Object;
 
     check-cast p0, Landroid/app/Activity;
 
@@ -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;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/LifecycleCallback;->agW:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->mD()Landroid/app/Activity;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/internal/g;->mG()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 04f9e4aea2..62a5518324 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 ahk:Lcom/google/android/gms/common/api/h;
+.field private final aht:Lcom/google/android/gms/common/api/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/h<",
@@ -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;->ahk:Lcom/google/android/gms/common/api/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aa;->aht:Lcom/google/android/gms/common/api/h;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->ahk:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->aht:Lcom/google/android/gms/common/api/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/common/api/h;->a(Lcom/google/android/gms/common/api/internal/c$a;)Lcom/google/android/gms/common/api/internal/c$a;
 
@@ -69,23 +69,23 @@
     return-object p1
 .end method
 
-.method public final mg()Landroid/os/Looper;
+.method public final mj()Landroid/os/Looper;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->ahk:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aa;->aht:Lcom/google/android/gms/common/api/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/h;->afm:Landroid/os/Looper;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/h;->afv:Landroid/os/Looper;
 
     return-object v0
 .end method
 
-.method public final mh()V
+.method public final mk()V
     .locals 0
 
     return-void
 .end method
 
-.method public final mi()V
+.method public final ml()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 6d093a896a..551d527960 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 ahl:Lcom/google/android/gms/common/api/internal/ac;
+.field private final ahu: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;->ahl:Lcom/google/android/gms/common/api/internal/ac;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->ahu: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;->ahl:Lcom/google/android/gms/common/api/internal/ac;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ab;->ahu:Lcom/google/android/gms/common/api/internal/ac;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ac;->mJ()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/ac;->mM()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 537b4c3a9e..94152d6021 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 mJ()V
+.method public abstract mM()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 2d70dd0a26..bbc2781e60 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 ahm:Lcom/google/android/gms/tasks/h;
+.field public ahv: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;->ahm:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ad;->agW:Lcom/google/android/gms/common/api/internal/g;
 
     const-string v0, "GmsAvailabilityHelper"
 
@@ -54,9 +54,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->ahm:Lcom/google/android/gms/tasks/h;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
-    iget-object p0, p0, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p0, p0, Lcom/google/android/gms/tasks/h;->aLU: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;->ahm:Lcom/google/android/gms/tasks/h;
+    iput-object p0, v0, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
     :cond_0
     return-object v0
@@ -86,7 +86,7 @@
 .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;->ahm:Lcom/google/android/gms/tasks/h;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
     new-instance v0, Lcom/google/android/gms/common/api/Status;
 
@@ -94,7 +94,7 @@
 
     iget-object v2, p1, Lcom/google/android/gms/common/ConnectionResult;->zzj:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object p1, p1, Lcom/google/android/gms/common/ConnectionResult;->afe: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 mp()V
+.method protected final ms()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->aia:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ad;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ad;->agW:Lcom/google/android/gms/common/api/internal/g;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->mD()Landroid/app/Activity;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/internal/g;->mG()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;->ahm:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/tasks/h;->c(Ljava/lang/Object;)V
 
     return-void
 
     :cond_0
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ad;->ahm:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ad;->ahv:Lcom/google/android/gms/tasks/h;
 
-    iget-object v2, v2, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object v2, v2, Lcom/google/android/gms/tasks/h;->aLU: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;->ahm:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ad;->ahv: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 39ed419305..fdcd352e69 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 ahn:Lcom/google/android/gms/common/api/internal/t;
+.field public final ahw:Lcom/google/android/gms/common/api/internal/t;
 
-.field public final aho:I
+.field public final ahx:I
 
-.field public final ahp:Lcom/google/android/gms/common/api/h;
+.field public final ahy:Lcom/google/android/gms/common/api/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/h<",
@@ -32,11 +32,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ae;->ahn:Lcom/google/android/gms/common/api/internal/t;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ae;->ahw:Lcom/google/android/gms/common/api/internal/t;
 
-    iput p2, p0, Lcom/google/android/gms/common/api/internal/ae;->aho:I
+    iput p2, p0, Lcom/google/android/gms/common/api/internal/ae;->ahx:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/ae;->ahp:Lcom/google/android/gms/common/api/h;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
 
     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 fdcb524629..da9b634d1d 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,20 +3,20 @@
 
 
 # instance fields
-.field public final ahq:Lcom/google/android/gms/common/api/internal/j;
+.field public final ahA:Lcom/google/android/gms/common/api/internal/m;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lcom/google/android/gms/common/api/internal/j<",
+            "Lcom/google/android/gms/common/api/internal/m<",
             "Lcom/google/android/gms/common/api/a$b;",
             "*>;"
         }
     .end annotation
 .end field
 
-.field public final ahr:Lcom/google/android/gms/common/api/internal/m;
+.field public final ahz:Lcom/google/android/gms/common/api/internal/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lcom/google/android/gms/common/api/internal/m<",
+            "Lcom/google/android/gms/common/api/internal/j<",
             "Lcom/google/android/gms/common/api/a$b;",
             "*>;"
         }
@@ -41,9 +41,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/af;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/af;->ahr:Lcom/google/android/gms/common/api/internal/m;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/af;->ahA: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 ac434b477a..9c5096ba1e 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 ahs:Ljava/util/concurrent/ExecutorService;
+.field private static final ahB: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;->ahs:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lcom/google/android/gms/common/api/internal/ah;->ahB:Ljava/util/concurrent/ExecutorService;
 
     return-void
 .end method
 
-.method public static mK()Ljava/util/concurrent/ExecutorService;
+.method public static mN()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/ah;->ahs:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/ah;->ahB: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 8783a6d112..7dad1ccff4 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 aht:Lcom/google/android/gms/common/api/a$a;
+.field private static ahC: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 afe:Lcom/google/android/gms/common/api/a$a;
+.field private final afo: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 ahu:Ljava/util/Set;
+.field private ahD:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -43,11 +43,11 @@
     .end annotation
 .end field
 
-.field private ahv:Lcom/google/android/gms/common/internal/d;
+.field private ahE:Lcom/google/android/gms/common/internal/d;
 
-.field ahw:Lcom/google/android/gms/signin/e;
+.field ahF:Lcom/google/android/gms/signin/e;
 
-.field private ahx:Lcom/google/android/gms/common/api/internal/am;
+.field private ahG: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;->aLw:Lcom/google/android/gms/common/api/a$a;
+    sget-object v0, Lcom/google/android/gms/signin/b;->aLF:Lcom/google/android/gms/common/api/a$a;
 
-    sput-object v0, Lcom/google/android/gms/common/api/internal/aj;->aht:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aj;->ahC: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;->aht:Lcom/google/android/gms/common/api/a$a;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/aj;->ahC: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;->ahv:Lcom/google/android/gms/common/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajr:Ljava/util/Set;
+    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajA:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahu:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahD:Ljava/util/Set;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/aj;->afe:Lcom/google/android/gms/common/api/a$a;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/aj;->afo: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;->ahx:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG: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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p1, Lcom/google/android/gms/signin/internal/zaj;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object p1, p1, Lcom/google/android/gms/signin/internal/zaj;->aLu:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iget-object p1, p1, Lcom/google/android/gms/signin/internal/zaj;->aLD:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-    iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lQ()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;->ahx:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG: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;->ahx:Lcom/google/android/gms/common/api/internal/am;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG:Lcom/google/android/gms/common/api/internal/am;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akg:Landroid/os/IBinder;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp:Landroid/os/IBinder;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/k$a;->b(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;->ahu:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahD: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;->ahx:Lcom/google/android/gms/common/api/internal/am;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG: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;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF: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;->ahx:Lcom/google/android/gms/common/api/internal/am;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG: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;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF: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;->ahv:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahE: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;->ajA:Ljava/lang/Integer;
+    iput-object v1, v0, Lcom/google/android/gms/common/internal/d;->ajJ:Ljava/lang/Integer;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/aj;->afe:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/aj;->afo: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;->ahv:Lcom/google/android/gms/common/internal/d;
+    iget-object v5, p0, Lcom/google/android/gms/common/api/internal/aj;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v6, v5, Lcom/google/android/gms/common/internal/d;->ajy:Lcom/google/android/gms/signin/a;
+    iget-object v6, v5, Lcom/google/android/gms/common/internal/d;->ajH: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;->ahw:Lcom/google/android/gms/signin/e;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF:Lcom/google/android/gms/signin/e;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahx:Lcom/google/android/gms/common/api/internal/am;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahG:Lcom/google/android/gms/common/api/internal/am;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahu:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahD: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;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF: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 mj()V
+.method public final mm()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF: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 mk()V
+.method public final mn()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/aj;->ahF: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 1d5ef598f3..ce9f707e90 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 ahy:Lcom/google/android/gms/common/api/internal/aj;
+.field private final synthetic ahH: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;->ahy:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ak;->ahH: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;->ahy:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ak;->ahH: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 ded9297542..a18f25e9f8 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 ahy:Lcom/google/android/gms/common/api/internal/aj;
+.field private final synthetic ahH:Lcom/google/android/gms/common/api/internal/aj;
 
-.field private final synthetic ahz:Lcom/google/android/gms/signin/internal/zaj;
+.field private final synthetic ahI: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;->ahy:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/al;->ahH:Lcom/google/android/gms/common/api/internal/aj;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/al;->ahz:Lcom/google/android/gms/signin/internal/zaj;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/al;->ahI: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;->ahy:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/al;->ahH:Lcom/google/android/gms/common/api/internal/aj;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/al;->ahz:Lcom/google/android/gms/signin/internal/zaj;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/al;->ahI: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 1fd06be683..cc4ea7c11e 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,9 @@
 
 
 # instance fields
-.field final afL:Ljava/lang/Object;
+.field final afU:Ljava/lang/Object;
 
-.field final afN:Ljava/lang/ref/WeakReference;
+.field final afW:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field ahA:Lcom/google/android/gms/common/api/q;
+.field ahJ:Lcom/google/android/gms/common/api/q;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/q<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field ahB:Lcom/google/android/gms/common/api/internal/an;
+.field ahK: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 ahC:Lcom/google/android/gms/common/api/p;
+.field volatile ahL:Lcom/google/android/gms/common/api/p;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/p<",
@@ -63,7 +63,7 @@
     .end annotation
 .end field
 
-.field ahD:Lcom/google/android/gms/common/api/j;
+.field ahM:Lcom/google/android/gms/common/api/j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/j<",
@@ -72,9 +72,9 @@
     .end annotation
 .end field
 
-.field ahE:Lcom/google/android/gms/common/api/Status;
+.field ahN:Lcom/google/android/gms/common/api/Status;
 
-.field final ahF:Lcom/google/android/gms/common/api/internal/ap;
+.field final ahO: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 ahG:Z
+.field ahP:Z
 
 
 # direct methods
-.method private final mL()Z
+.method private final mO()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afN:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afW: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/i;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahC:Lcom/google/android/gms/common/api/p;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
 
     if-eqz v1, :cond_0
 
@@ -123,26 +123,26 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->ml()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->mo()Lcom/google/android/gms/common/api/Status;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->lN()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/Status;->lQ()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahA:Lcom/google/android/gms/common/api/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/ah;->mK()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/ah;->mN()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;->mL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->mO()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahC:Lcom/google/android/gms/common/api/p;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->ml()Lcom/google/android/gms/common/api/Status;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/n;->mo()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;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahE:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahN:Lcom/google/android/gms/common/api/Status;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahE:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahN: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;->afL:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/an;->afU:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahA:Lcom/google/android/gms/common/api/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
 
     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;->ahB:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/an;->ahK: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;->mL()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/an;->mO()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahC:Lcom/google/android/gms/common/api/p;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
 
     :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 4a86ee5a33..fda73bcf5e 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 ahH:Lcom/google/android/gms/common/api/n;
+.field private final synthetic ahQ:Lcom/google/android/gms/common/api/n;
 
-.field private final synthetic ahI:Lcom/google/android/gms/common/api/internal/an;
+.field private final synthetic ahR: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/n;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahH:Lcom/google/android/gms/common/api/n;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahQ:Lcom/google/android/gms/common/api/n;
 
     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;->afK:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->ahA:Lcom/google/android/gms/common/api/q;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/q;->mm()Lcom/google/android/gms/common/api/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/q;->mp()Lcom/google/android/gms/common/api/j;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahO:Lcom/google/android/gms/common/api/internal/ap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahO: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;->afK:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afN:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afW: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/i;->mi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/i;->ml()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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahO:Lcom/google/android/gms/common/api/internal/ap;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahF:Lcom/google/android/gms/common/api/internal/ap;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahO: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;->afK:Ljava/lang/ThreadLocal;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afN:Ljava/lang/ref/WeakReference;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afW: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/i;->mi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/i;->ml()V
 
     :cond_1
     return-void
 
     :goto_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afK:Ljava/lang/ThreadLocal;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/BasePendingResult;->afT: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ao;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->afN:Ljava/lang/ref/WeakReference;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->afW: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/i;->mi()V
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/i;->ml()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 691a1cd8c0..9b54e9d06b 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 ahI:Lcom/google/android/gms/common/api/internal/an;
+.field private final synthetic ahR:Lcom/google/android/gms/common/api/internal/an;
 
 
 # virtual methods
@@ -88,18 +88,18 @@
 
     check-cast p1, Lcom/google/android/gms/common/api/j;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ap;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ap;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afL:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/an;->afU: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ap;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/an;->ahB:Lcom/google/android/gms/common/api/internal/an;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/an;->ahK: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ap;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahB:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/an;->ahK: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;->ahI:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ap;->ahR:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahB:Lcom/google/android/gms/common/api/internal/an;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/an;->ahK:Lcom/google/android/gms/common/api/internal/an;
 
-    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/an;->afL:Ljava/lang/Object;
+    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/an;->afU: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;->ahD:Lcom/google/android/gms/common/api/j;
+    iput-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahM:Lcom/google/android/gms/common/api/j;
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahA:Lcom/google/android/gms/common/api/q;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
 
     if-nez p1, :cond_5
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahC:Lcom/google/android/gms/common/api/p;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahL:Lcom/google/android/gms/common/api/p;
 
     if-eqz p1, :cond_8
 
     :cond_5
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afN:Ljava/lang/ref/WeakReference;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->afW: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/i;
 
-    iget-boolean v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahG:Z
+    iget-boolean v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahP:Z
 
     if-nez v4, :cond_6
 
-    iget-object v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahA:Lcom/google/android/gms/common/api/q;
+    iget-object v4, v2, Lcom/google/android/gms/common/api/internal/an;->ahJ:Lcom/google/android/gms/common/api/q;
 
     if-eqz v4, :cond_6
 
     if-eqz p1, :cond_6
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mh()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/i;->mk()V
 
-    iput-boolean v1, v2, Lcom/google/android/gms/common/api/internal/an;->ahG:Z
+    iput-boolean v1, v2, Lcom/google/android/gms/common/api/internal/an;->ahP:Z
 
     :cond_6
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahE:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahN:Lcom/google/android/gms/common/api/Status;
 
     if-eqz p1, :cond_7
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahE:Lcom/google/android/gms/common/api/Status;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahN: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;->ahD:Lcom/google/android/gms/common/api/j;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahM:Lcom/google/android/gms/common/api/j;
 
     if-eqz p1, :cond_8
 
-    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahD:Lcom/google/android/gms/common/api/j;
+    iget-object p1, v2, Lcom/google/android/gms/common/api/internal/an;->ahM:Lcom/google/android/gms/common/api/j;
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/common/api/j;->a(Lcom/google/android/gms/common/api/o;)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 6871e9124d..726b9eaf4c 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 ahJ:Lcom/google/android/gms/common/api/Status;
+.field public static final ahS:Lcom/google/android/gms/common/api/Status;
 
-.field private static final ahK:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private static final ahT:[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;->ahJ:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahS: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;->ahK:[Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahT:[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 f307f0b39d..f7db95caa1 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 ahL:Lcom/google/android/gms/tasks/h;
+.field protected final ahU: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;->ahL:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ar;->ahU: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;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->ahU: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;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ar;->ahU:Lcom/google/android/gms/tasks/h;
 
     new-instance v1, Lcom/google/android/gms/common/api/e;
 
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 44e9ca2da9..313be2b2b2 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 ahM:Lcom/google/android/gms/common/api/internal/c$a;
+.field private final ahV: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;->ahM:Lcom/google/android/gms/common/api/internal/c$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/as;->ahV: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;->ahM:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->agY:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->ahh: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;->ahM:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->ahV:Lcom/google/android/gms/common/api/internal/c$a;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->ahM:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/as;->ahV: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;->ahM:Lcom/google/android/gms/common/api/internal/c$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/as;->ahV: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 089de3ef5d..20a30fc8ea 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 ahN:Lcom/google/android/gms/common/api/internal/j;
+.field private final ahW: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 ahO:Lcom/google/android/gms/common/api/internal/m;
+.field private final ahX: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;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/at;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->ahr:Lcom/google/android/gms/common/api/internal/m;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->ahA:Lcom/google/android/gms/common/api/internal/m;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahO:Lcom/google/android/gms/common/api/internal/m;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahX: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;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->agU:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahd:[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;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->agV:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahe:Z
 
     return p1
 .end method
@@ -129,35 +129,35 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->ahU: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;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->agT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->agv:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->agT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->ahN:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/at;->ahW:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/at;->ahO:Lcom/google/android/gms/common/api/internal/m;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/at;->ahX: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 e963f56bb5..57f91c7364 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,7 +14,7 @@
 
 
 # instance fields
-.field private final ahL:Lcom/google/android/gms/tasks/h;
+.field private final ahU:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field private final ahP:Lcom/google/android/gms/common/api/internal/l;
+.field private final ahY:Lcom/google/android/gms/common/api/internal/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/l<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final ahQ:Lcom/google/android/gms/common/api/internal/k;
+.field private final ahZ:Lcom/google/android/gms/common/api/internal/k;
 
 
 # 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;->ahL:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/tasks/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/au;->ahP:Lcom/google/android/gms/common/api/internal/l;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/au;->ahY:Lcom/google/android/gms/common/api/internal/l;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/au;->ahQ:Lcom/google/android/gms/common/api/internal/k;
+    iput-object p4, p0, Lcom/google/android/gms/common/api/internal/au;->ahZ: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;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->agZ:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/n;->ahi: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;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p2, v0, Lcom/google/android/gms/tasks/h;->aLU: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;->ahP:Lcom/google/android/gms/common/api/internal/l;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahY:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->ahU: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;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahU: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;->ahP:Lcom/google/android/gms/common/api/internal/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->ahY:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/l;->agW:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/l;->ahf:[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;->ahP:Lcom/google/android/gms/common/api/internal/l;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/au;->ahY:Lcom/google/android/gms/common/api/internal/l;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/l;->agX:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/l;->ahg: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;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/au;->ahU:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->ahQ:Lcom/google/android/gms/common/api/internal/k;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/au;->ahZ: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 a8d2212e46..dba535c4a6 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 ahR:Lcom/google/android/gms/common/api/internal/h$a;
+.field private final aia: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;->ahR:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->aia: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;->agv:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->ahR:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->aia: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;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->agU:[Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahd:[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;->agv:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->ahR:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/av;->aia: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;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->agV:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahe: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;->agv:Ljava/util/Map;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/av;->ahR:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/av;->aia: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;->ahr:Lcom/google/android/gms/common/api/internal/m;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/af;->ahA:Lcom/google/android/gms/common/api/internal/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/av;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/av;->ahU: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;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->agT:Lcom/google/android/gms/common/api/internal/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/gms/common/api/internal/h;->agP:Ljava/lang/Object;
+    iput-object v0, p1, Lcom/google/android/gms/common/api/internal/h;->agY:Ljava/lang/Object;
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->ahL:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/av;->ahU: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;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/tasks/ac;->b(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 d333dd6c08..96b4c26eea 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 afi:Lcom/google/android/gms/common/api/a;
+.field public final afs: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 afj:Lcom/google/android/gms/common/api/a$d;
+.field private final aft: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 ahS:Z
+.field private final aib:Z
 
-.field private final ahT:I
+.field private final aic:I
 
 
 # direct methods
@@ -51,21 +51,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/aw;->ahS:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/aw;->aib:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aw;->afi:Lcom/google/android/gms/common/api/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/aw;->afs:Lcom/google/android/gms/common/api/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->afj:Lcom/google/android/gms/common/api/a$d;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->aft: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;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->afs:Lcom/google/android/gms/common/api/a;
 
     aput-object p2, p1, v0
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/aw;->aft: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;->ahT:I
+    iput p1, p0, Lcom/google/android/gms/common/api/internal/aw;->aic: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;->ahS:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/api/internal/aw;->aib:Z
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p1, Lcom/google/android/gms/common/api/internal/aw;->ahS:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/common/api/internal/aw;->aib:Z
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->afs:Lcom/google/android/gms/common/api/a;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/aw;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/aw;->afs: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;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/aw;->aft:Lcom/google/android/gms/common/api/a$d;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/aw;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/aw;->aft: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;->ahT:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/aw;->aic: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 2720922a72..b0fd3a359d 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 ahU:Landroidx/collection/ArrayMap;
+.field private final aid:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field private final ahV:Lcom/google/android/gms/tasks/h;
+.field private final aie: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 ahW:I
+.field private aif:I
 
-.field private ahX:Z
+.field private aig: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;->ahU:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ax;->aid: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;->ahW:I
+    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aif:I
 
     const/4 p3, 0x1
 
     sub-int/2addr p1, p3
 
-    iput p1, p0, Lcom/google/android/gms/common/api/internal/ax;->ahW:I
+    iput p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aif:I
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
 
     move-result p1
 
     if-nez p1, :cond_0
 
-    iput-boolean p3, p0, Lcom/google/android/gms/common/api/internal/ax;->ahX:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/common/api/internal/ax;->aig:Z
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->ahW:I
+    iget p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aif:I
 
     if-nez p1, :cond_2
 
-    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/ax;->ahX:Z
+    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aig:Z
 
     if-eqz p1, :cond_1
 
@@ -98,16 +98,16 @@
 
     invoke-direct {p1, p2}, Lcom/google/android/gms/common/api/f;-><init>(Landroidx/collection/ArrayMap;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->ahV:Lcom/google/android/gms/tasks/h;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->aie: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;->ahV:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ax;->aie:Lcom/google/android/gms/tasks/h;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->ahU:Landroidx/collection/ArrayMap;
+    iget-object p2, p0, Lcom/google/android/gms/common/api/internal/ax;->aid:Landroidx/collection/ArrayMap;
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/tasks/h;->c(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 3f6ef88ce5..86aa5ec18d 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 ahY:Ljava/util/concurrent/atomic/AtomicReference;
+.field protected final aih: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 ahZ:Landroid/os/Handler;
+.field private final aii:Landroid/os/Handler;
 
-.field protected final aia:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field protected final aij: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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->ahZ:Landroid/os/Handler;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aii:Landroid/os/Handler;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ay;->aia:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ay;->aij: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;->aib:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/az;->aik: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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->ahZ:Landroid/os/Handler;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aii: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 mM()V
+.method protected final mP()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->mp()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->ms()V
 
     return-void
 .end method
 
-.method protected abstract mp()V
+.method protected abstract ms()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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->aia:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->getActivity()Landroid/app/Activity;
 
@@ -177,7 +177,7 @@
     return-void
 
     :cond_2
-    iget-object p2, v0, Lcom/google/android/gms/common/api/internal/az;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p2, v0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
     iget p2, p2, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
@@ -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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->mM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->mP()V
 
     return-void
 
     :cond_8
     if-eqz v0, :cond_9
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/az;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget p2, v0, Lcom/google/android/gms/common/api/internal/az;->aib:I
+    iget p2, v0, Lcom/google/android/gms/common/api/internal/az;->aik: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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->mM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/ay;->mP()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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aih: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;->ahY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ay;->aih:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -367,13 +367,13 @@
 
     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;->aib:I
+    iget v1, v0, Lcom/google/android/gms/common/api/internal/az;->aik: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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
     iget v1, v1, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
@@ -381,9 +381,9 @@
 
     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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->aeV:Landroid/app/PendingIntent;
+    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->afe: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 3b9e6eab7f..362ff77648 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 aib:I
+.field final aik:I
 
-.field final aic:Lcom/google/android/gms/common/ConnectionResult;
+.field final ail: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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput p2, p0, Lcom/google/android/gms/common/api/internal/az;->aib:I
+    iput p2, p0, Lcom/google/android/gms/common/api/internal/az;->aik:I
 
     return-void
 .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 5f9f199790..18aa2e5dec 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 afE:Lcom/google/android/gms/common/api/internal/b;
+.field private static final afN:Lcom/google/android/gms/common/api/internal/b;
 
 
 # instance fields
-.field final afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final afO:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final afP:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final afH:Ljava/util/ArrayList;
+.field private final afQ:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private afI:Z
+.field private afR: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;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/b;->afN:Lcom/google/android/gms/common/api/internal/b;
 
     return-void
 .end method
@@ -58,23 +58,23 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afO: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;->afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afP: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;->afH:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/b;->afQ:Ljava/util/ArrayList;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/b;->afI:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/b;->afR:Z
 
     return-void
 .end method
@@ -82,12 +82,12 @@
 .method private final E(Z)V
     .locals 5
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afH:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afQ:Ljava/util/ArrayList;
 
     check-cast v1, Ljava/util/ArrayList;
 
@@ -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;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afN:Lcom/google/android/gms/common/api/internal/b;
 
-    iget-boolean v1, v1, Lcom/google/android/gms/common/api/internal/b;->afI:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/common/api/internal/b;->afR:Z
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/b;->afN:Lcom/google/android/gms/common/api/internal/b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/api/internal/b;->afI:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/api/internal/b;->afR:Z
 
     :cond_0
     monitor-exit v0
@@ -176,10 +176,10 @@
     throw p0
 .end method
 
-.method public static mn()Lcom/google/android/gms/common/api/internal/b;
+.method public static mq()Lcom/google/android/gms/common/api/internal/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afE:Lcom/google/android/gms/common/api/internal/b;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/b;->afN: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;->afH:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afQ: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;->afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 p2, 0x0
 
@@ -225,7 +225,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/b;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -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;->afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v0, 0x0
 
@@ -262,7 +262,7 @@
 
     move-result p1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/b;->afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/b;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -311,7 +311,7 @@
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afO:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const/4 v0, 0x0
 
@@ -323,7 +323,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/b;->afP:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {p1, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
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 49683f35d0..089d345be0 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 private final aid:Lcom/google/android/gms/common/api/internal/az;
+.field private final aim:Lcom/google/android/gms/common/api/internal/az;
 
-.field final synthetic aie:Lcom/google/android/gms/common/api/internal/ay;
+.field final synthetic ain: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;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->aid:Lcom/google/android/gms/common/api/internal/az;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/ba;->aim: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;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->aid:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->aim:Lcom/google/android/gms/common/api/internal/az;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/az;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lM()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lP()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->agW:Lcom/google/android/gms/common/api/internal/g;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->aeV:Landroid/app/PendingIntent;
+    iget-object v0, v0, Lcom/google/android/gms/common/ConnectionResult;->afe:Landroid/app/PendingIntent;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->aid:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->aim:Lcom/google/android/gms/common/api/internal/az;
 
-    iget v3, v3, Lcom/google/android/gms/common/api/internal/az;->aib:I
+    iget v3, v3, Lcom/google/android/gms/common/api/internal/az;->aik:I
 
     const/4 v4, 0x0
 
@@ -77,9 +77,9 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aia:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     iget v2, v0, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
@@ -89,23 +89,23 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aia:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/ay;->aij:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/ay;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v3, v3, Lcom/google/android/gms/common/api/internal/ay;->agW:Lcom/google/android/gms/common/api/internal/g;
 
     iget v0, v0, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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
 
@@ -118,19 +118,19 @@
 
     if-ne v1, v2, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain: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;->mJ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/ac;->mM()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;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->aid:Lcom/google/android/gms/common/api/internal/az;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/ba;->aim:Lcom/google/android/gms/common/api/internal/az;
 
-    iget v2, v2, Lcom/google/android/gms/common/api/internal/az;->aib:I
+    iget v2, v2, Lcom/google/android/gms/common/api/internal/az;->aik: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 c3f3ff0ad2..7b6f6d20d5 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 aif:Landroid/app/Dialog;
+.field private final synthetic aio:Landroid/app/Dialog;
 
-.field private final synthetic aig:Lcom/google/android/gms/common/api/internal/ba;
+.field private final synthetic aip: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;->aig:Lcom/google/android/gms/common/api/internal/ba;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bb;->aip:Lcom/google/android/gms/common/api/internal/ba;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bb;->aif:Landroid/app/Dialog;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bb;->aio: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 mJ()V
+.method public final mM()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aig:Lcom/google/android/gms/common/api/internal/ba;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aip:Lcom/google/android/gms/common/api/internal/ba;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->aie:Lcom/google/android/gms/common/api/internal/ay;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/ba;->ain:Lcom/google/android/gms/common/api/internal/ay;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->mM()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/ay;->mP()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aif:Landroid/app/Dialog;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aio: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;->aif:Landroid/app/Dialog;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bb;->aio: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 4054a39beb..063c584cee 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 aih:Ljava/util/WeakHashMap;
+.field private static aiq:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private aii:Ljava/util/Map;
+.field private air:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private aij:I
+.field private ais:I
 
-.field private aik:Landroid/os/Bundle;
+.field private ait: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;->aih:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/be;->aiq: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;->aii:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais: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;->aij:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
 
     return p0
 .end method
@@ -78,7 +78,7 @@
 .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;->aik:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/be;->ait:Landroid/os/Bundle;
 
     return-object p0
 .end method
@@ -88,7 +88,7 @@
 
     const-string v0, "LifecycleFragmentImpl"
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/be;->aih:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/be;->aiq: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;->aih:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/be;->aiq: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aij:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais: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;->aii:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->air:Ljava/util/Map;
 
     invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -304,7 +304,7 @@
     return-void
 .end method
 
-.method public final mD()Landroid/app/Activity;
+.method public final mG()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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->aik:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/be;->ait:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/be;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/be;->air: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 7be7bfb553..35115f1264 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 ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+.field private final synthetic aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-.field private final synthetic aim:Ljava/lang/String;
+.field private final synthetic aiv:Ljava/lang/String;
 
-.field private final synthetic ain:Lcom/google/android/gms/common/api/internal/be;
+.field private final synthetic aiw: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw:Lcom/google/android/gms/common/api/internal/be;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bf;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bf;->aim:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bf;->aiv: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->aim:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bf;->aiv: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu: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;->ain:Lcom/google/android/gms/common/api/internal/be;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiw: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bf;->aiu: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 54d1bd6ca6..a28e4e0f5f 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 aih:Ljava/util/WeakHashMap;
+.field private static aiq:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private aii:Ljava/util/Map;
+.field private air:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,9 +31,9 @@
     .end annotation
 .end field
 
-.field private aij:I
+.field private ais:I
 
-.field private aik:Landroid/os/Bundle;
+.field private ait: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;->aih:Ljava/util/WeakHashMap;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/bg;->aiq: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;->aii:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais: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;->aij:I
+    iget p0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
 
     return p0
 .end method
@@ -80,7 +80,7 @@
 
     const-string v0, "SupportLifecycleFragmentImpl"
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/bg;->aih:Ljava/util/WeakHashMap;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/bg;->aiq: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;->aih:Ljava/util/WeakHashMap;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/bg;->aiq: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;->aik:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/bg;->ait: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aij:I
+    iget v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais: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;->aii:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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 mD()Landroid/app/Activity;
+.method public final synthetic mG()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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->aik:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bg;->ait:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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;->aij:I
+    iput v0, p0, Lcom/google/android/gms/common/api/internal/bg;->ais:I
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->aii:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bg;->air: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 bb83cd5a25..11afd41c37 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 ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+.field private final synthetic aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-.field private final synthetic aim:Ljava/lang/String;
+.field private final synthetic aiv:Ljava/lang/String;
 
-.field private final synthetic aio:Lcom/google/android/gms/common/api/internal/bg;
+.field private final synthetic aix: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/bh;->aix:Lcom/google/android/gms/common/api/internal/bg;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bh;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bh;->aim:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/bh;->aiv: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->aim:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/bh;->aiv: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu: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;->aio:Lcom/google/android/gms/common/api/internal/bg;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aix: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;->ail:Lcom/google/android/gms/common/api/internal/LifecycleCallback;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/bh;->aiu: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 cdfe0edabb..6fc575fe7a 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 afJ:Lcom/google/android/gms/common/api/a$c;
+.field private final afS:Lcom/google/android/gms/common/api/a$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$c<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final afi:Lcom/google/android/gms/common/api/a;
+.field private final afs:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -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;->afg:Lcom/google/android/gms/common/api/a$g;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->afq:Lcom/google/android/gms/common/api/a$g;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->afg:Lcom/google/android/gms/common/api/a$g;
+    iget-object p2, p1, Lcom/google/android/gms/common/api/a;->afq:Lcom/google/android/gms/common/api/a$g;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/c$a;->afJ:Lcom/google/android/gms/common/api/a$c;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/c$a;->afS:Lcom/google/android/gms/common/api/a$c;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/c$a;->afi:Lcom/google/android/gms/common/api/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/c$a;->afs: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;->akj:Lcom/google/android/gms/common/api/a$h;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/s;->aks: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;->lN()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lQ()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 84b9621ac7..bba12488f1 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,25 +31,9 @@
 
 
 # instance fields
-.field private agA:Lcom/google/android/gms/common/ConnectionResult;
+.field private final agA:Lcom/google/android/gms/common/api/a$b;
 
-.field final synthetic agB:Lcom/google/android/gms/common/api/internal/d;
-
-.field private final agp:Ljava/util/Queue;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Queue<",
-            "Lcom/google/android/gms/common/api/internal/t;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final agq:Lcom/google/android/gms/common/api/a$f;
-
-.field private final agr:Lcom/google/android/gms/common/api/a$b;
-
-.field private final ags:Lcom/google/android/gms/common/api/internal/aw;
+.field private final agB:Lcom/google/android/gms/common/api/internal/aw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/aw<",
@@ -58,9 +42,9 @@
     .end annotation
 .end field
 
-.field private final agt:Lcom/google/android/gms/common/api/internal/n;
+.field private final agC:Lcom/google/android/gms/common/api/internal/n;
 
-.field final agu:Ljava/util/Set;
+.field final agD:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -70,7 +54,7 @@
     .end annotation
 .end field
 
-.field final agv:Ljava/util/Map;
+.field final agE:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -82,13 +66,13 @@
     .end annotation
 .end field
 
-.field final agw:I
+.field final agF:I
 
-.field private final agx:Lcom/google/android/gms/common/api/internal/aj;
+.field private final agG:Lcom/google/android/gms/common/api/internal/aj;
 
-.field agy:Z
+.field agH:Z
 
-.field final agz:Ljava/util/List;
+.field final agI:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -98,6 +82,22 @@
     .end annotation
 .end field
 
+.field private agJ:Lcom/google/android/gms/common/ConnectionResult;
+
+.field final synthetic agK:Lcom/google/android/gms/common/api/internal/d;
+
+.field private final agy:Ljava/util/Queue;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Queue<",
+            "Lcom/google/android/gms/common/api/internal/t;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final agz:Lcom/google/android/gms/common/api/a$f;
+
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/common/api/internal/d;Lcom/google/android/gms/common/api/h;)V
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agp:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy: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;->agu:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD: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;->agv:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agz:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agI:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ: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;
 
@@ -150,17 +150,17 @@
 
     move-result-object v4
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/api/h;->me()Lcom/google/android/gms/common/internal/d$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/common/api/h;->mh()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d$a;->mW()Lcom/google/android/gms/common/internal/d;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/d$a;->mZ()Lcom/google/android/gms/common/internal/d;
 
     move-result-object v5
 
-    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afs:Lcom/google/android/gms/common/api/a;
 
-    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afe:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afo:Lcom/google/android/gms/common/api/a$a;
 
     if-eqz v2, :cond_0
 
@@ -176,11 +176,11 @@
 
     invoke-static {v2, v3}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afe:Lcom/google/android/gms/common/api/a$a;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/a;->afo:Lcom/google/android/gms/common/api/a$a;
 
     iget-object v3, p2, Lcom/google/android/gms/common/api/h;->mContext:Landroid/content/Context;
 
-    iget-object v6, p2, Lcom/google/android/gms/common/api/h;->afj:Lcom/google/android/gms/common/api/a$d;
+    iget-object v6, p2, Lcom/google/android/gms/common/api/h;->aft:Lcom/google/android/gms/common/api/a$d;
 
     move-object v7, p0
 
@@ -190,9 +190,9 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     instance-of v2, v1, Lcom/google/android/gms/common/internal/s;
 
@@ -200,33 +200,33 @@
 
     check-cast v1, Lcom/google/android/gms/common/internal/s;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/internal/s;->akj:Lcom/google/android/gms/common/api/a$h;
+    iget-object v1, v1, Lcom/google/android/gms/common/internal/s;->aks:Lcom/google/android/gms/common/api/a$h;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agr:Lcom/google/android/gms/common/api/a$b;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/api/a$b;
 
     goto :goto_1
 
     :cond_1
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agr:Lcom/google/android/gms/common/api/a$b;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/api/a$b;
 
     :goto_1
-    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p2, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/aw;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agt:Lcom/google/android/gms/common/api/internal/n;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC:Lcom/google/android/gms/common/api/internal/n;
 
     iget v1, p2, Lcom/google/android/gms/common/api/h;->mId:I
 
-    iput v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agw:I
+    iput v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lV()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lY()Z
 
     move-result v1
 
@@ -242,22 +242,22 @@
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/aj;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/api/h;->me()Lcom/google/android/gms/common/internal/d$a;
+    invoke-virtual {p2}, Lcom/google/android/gms/common/api/h;->mh()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/common/internal/d$a;->mW()Lcom/google/android/gms/common/internal/d;
+    invoke-virtual {p2}, Lcom/google/android/gms/common/internal/d$a;->mZ()Lcom/google/android/gms/common/internal/d;
 
     move-result-object p2
 
     invoke-direct {v1, v0, p1, p2}, Lcom/google/android/gms/common/api/internal/aj;-><init>(Landroid/content/Context;Landroid/os/Handler;Lcom/google/android/gms/common/internal/d;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/aj;
 
     return-void
 
     :cond_2
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx:Lcom/google/android/gms/common/api/internal/aj;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG:Lcom/google/android/gms/common/api/internal/aj;
 
     return-void
 .end method
@@ -276,9 +276,9 @@
     goto :goto_3
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lZ()[Lcom/google/android/gms/common/Feature;
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->mc()[Lcom/google/android/gms/common/Feature;
 
     move-result-object v1
 
@@ -306,7 +306,7 @@
 
     iget-object v7, v6, Lcom/google/android/gms/common/Feature;->name:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->lO()J
+    invoke-virtual {v6}, Lcom/google/android/gms/common/Feature;->lR()J
 
     move-result-wide v8
 
@@ -348,7 +348,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->lO()J
+    invoke-virtual {v4}, Lcom/google/android/gms/common/Feature;->lR()J
 
     move-result-wide v7
 
@@ -375,7 +375,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;->ms()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mv()V
 
     return-void
 .end method
@@ -383,14 +383,14 @@
 .method private final b(Lcom/google/android/gms/common/ConnectionResult;)Z
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->mq()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->mt()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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -398,13 +398,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/aw;
 
     invoke-interface {v1, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -412,13 +412,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agw:I
+    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/common/api/internal/ay;->c(Lcom/google/android/gms/common/ConnectionResult;I)V
 
@@ -488,11 +488,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;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agI:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I
 
@@ -502,7 +502,7 @@
 
     if-ltz v0, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agI:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -510,7 +510,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -518,13 +518,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -534,7 +534,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
 
@@ -545,17 +545,17 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agI: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -565,7 +565,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
 
@@ -573,13 +573,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -591,7 +591,7 @@
 
     move-result-object p1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
 
@@ -613,9 +613,9 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
 
-    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agw:I
+    iget v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
 
     invoke-virtual {v0, p1, v2}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/ConnectionResult;I)Z
 
@@ -636,7 +636,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;->agu:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -657,7 +657,7 @@
 
     const/4 v2, 0x0
 
-    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->aeU:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->afd: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
 
@@ -665,21 +665,21 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->lX()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->ma()Ljava/lang/String;
 
     move-result-object v2
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agu:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agD:Ljava/util/Set;
 
     invoke-interface {p1}, Ljava/util/Set;->clear()V
 
@@ -689,9 +689,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;->agt:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lV()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->lY()Z
 
     move-result v1
 
@@ -705,27 +705,71 @@
     return-void
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mk()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mn()V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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 ms()V
+.method private final mC()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mw()V
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
 
-    sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->aeU:Lcom/google/android/gms/common/ConnectionResult;
+    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;->agB: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;->agK: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;->agK: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;->agB: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;->agK: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
+
+    move-result-wide v2
+
+    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
+
+    return-void
+.end method
+
+.method private final mv()V
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
+
+    sget-object v0, Lcom/google/android/gms/common/ConnectionResult;->afd: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;->my()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -748,9 +792,9 @@
 
     check-cast v1, Lcom/google/android/gms/common/api/internal/af;
 
-    iget-object v2, v1, Lcom/google/android/gms/common/api/internal/af;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v2, v1, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/j;->agU:[Lcom/google/android/gms/common/Feature;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/j;->ahd:[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 +808,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/af;->ahq:Lcom/google/android/gms/common/api/internal/j;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/af;->ahz:Lcom/google/android/gms/common/api/internal/j;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agr:Lcom/google/android/gms/common/api/a$b;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/api/a$b;
 
     new-instance v3, Lcom/google/android/gms/tasks/h;
 
@@ -785,60 +829,16 @@
     goto :goto_0
 
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mk()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mn()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->mu()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mx()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
-
-    return-void
-.end method
-
-.method private final mz()V
-    .locals 4
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->ags: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;->agB: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;->agB: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;->ags: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;->agB: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
-
-    move-result-wide v2
-
-    invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->sendMessageDelayed(Landroid/os/Message;J)Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mC()V
 
     return-void
 .end method
@@ -848,7 +848,7 @@
 .method final F(Z)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -858,7 +858,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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -868,7 +868,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->size()I
 
@@ -876,9 +876,9 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agt:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mH()Z
 
     move-result v0
 
@@ -886,13 +886,13 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mC()V
 
     :cond_0
     return v1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {p1}, Lcom/google/android/gms/common/api/a$f;->disconnect()V
 
@@ -907,7 +907,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -917,28 +917,28 @@
 
     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;->agx:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/aj;->ahF:Lcom/google/android/gms/signin/e;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/aj;->ahw:Lcom/google/android/gms/signin/e;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/aj;->ahF: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;->mw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->ajV:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->ake:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
 
@@ -950,7 +950,7 @@
 
     if-ne v0, v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->mr()Lcom/google/android/gms/common/api/Status;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/d;->mu()Lcom/google/android/gms/common/api/Status;
 
     move-result-object p1
 
@@ -959,7 +959,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agp:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
 
@@ -967,7 +967,7 @@
 
     if-eqz v0, :cond_2
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ:Lcom/google/android/gms/common/ConnectionResult;
 
     return-void
 
@@ -981,9 +981,9 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
 
-    iget v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agw:I
+    iget v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
 
     invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/common/api/internal/d;->a(Lcom/google/android/gms/common/ConnectionResult;I)Z
 
@@ -999,20 +999,20 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
 
     :cond_4
-    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Z
+    iget-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1020,13 +1020,13 @@
 
     const/16 v1, 0x9
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
 
@@ -1041,9 +1041,9 @@
 
     const/16 v0, 0x11
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/aw;->afi:Lcom/google/android/gms/common/api/a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/aw;->afs:Lcom/google/android/gms/common/api/a;
 
     iget-object v1, v1, Lcom/google/android/gms/common/api/a;->mName:Ljava/lang/String;
 
@@ -1086,7 +1086,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;->agz:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agI:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
 
@@ -1094,7 +1094,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1104,7 +1104,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1114,11 +1114,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;->agD:Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agM: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;->agp:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->size()I
 
@@ -1126,7 +1126,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agp:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -1190,7 +1190,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;->agp:Ljava/util/Queue;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {v4, v3}, Ljava/util/Queue;->remove(Ljava/lang/Object;)Z
 
@@ -1209,7 +1209,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1219,7 +1219,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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1233,33 +1233,33 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mC()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agp:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy: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;->agp:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy: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;->agA:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ:Lcom/google/android/gms/common/ConnectionResult;
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->lM()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->lP()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ: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
 
@@ -1274,7 +1274,7 @@
 .method public final connect()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1284,7 +1284,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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1292,9 +1292,9 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lU()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lX()Z
 
     move-result v0
 
@@ -1303,19 +1303,19 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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
 
@@ -1336,28 +1336,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lV()Z
+    invoke-interface {v1}, Lcom/google/android/gms/common/api/a$f;->lY()Z
 
     move-result v1
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agx:Lcom/google/android/gms/common/api/internal/aj;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agG: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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
 
@@ -1369,7 +1369,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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1379,7 +1379,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;->agp:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -1403,33 +1403,90 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agp:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->clear()V
 
     return-void
 .end method
 
-.method public final lV()Z
+.method public final lY()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lV()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lY()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final mj()V
+.method public final mA()Lcom/google/android/gms/common/ConnectionResult;
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
+
+    const-string v1, "Must be called on the handler thread"
+
+    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;->agJ:Lcom/google/android/gms/common/ConnectionResult;
+
+    return-object v0
+.end method
+
+.method final mB()V
+    .locals 3
+
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
+
+    const/16 v1, 0xb
+
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agK: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
+
+    const/16 v1, 0x9
+
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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;->agH:Z
+
+    :cond_0
+    return-void
+.end method
+
+.method public final mm()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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1441,12 +1498,12 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->ms()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mv()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1461,14 +1518,14 @@
     return-void
 .end method
 
-.method public final mk()V
+.method public final mn()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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1480,12 +1537,12 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mt()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mw()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1500,32 +1557,32 @@
     return-void
 .end method
 
-.method final mt()V
+.method final mw()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mw()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agt:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mG()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mJ()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/aw;
 
     const/16 v3, 0x9
 
@@ -1533,7 +1590,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
 
@@ -1541,19 +1598,19 @@
 
     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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/aw;
 
     const/16 v3, 0xb
 
@@ -1561,7 +1618,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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
 
@@ -1569,25 +1626,25 @@
 
     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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->ajV:Landroid/util/SparseIntArray;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/j;->ake:Landroid/util/SparseIntArray;
 
     invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
 
     return-void
 .end method
 
-.method final mu()V
+.method final mx()V
     .locals 5
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agp:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
@@ -1611,7 +1668,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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v4}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1625,7 +1682,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agp:Ljava/util/Queue;
+    iget-object v4, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Ljava/util/Queue;
 
     invoke-interface {v4, v3}, Ljava/util/Queue;->remove(Ljava/lang/Object;)Z
 
@@ -1635,10 +1692,10 @@
     return-void
 .end method
 
-.method public final mv()V
+.method public final my()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1648,21 +1705,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;->aga:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agj: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;->agt:Lcom/google/android/gms/common/api/internal/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agC:Lcom/google/android/gms/common/api/internal/n;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/n;->mI()V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agv:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE: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;->agv:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$a;->agE:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -1708,7 +1765,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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->isConnected()Z
 
@@ -1716,7 +1773,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/x;
 
@@ -1728,10 +1785,10 @@
     return-void
 .end method
 
-.method public final mw()V
+.method public final mz()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;
 
@@ -1743,64 +1800,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agA:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agJ:Lcom/google/android/gms/common/ConnectionResult;
 
     return-void
 .end method
-
-.method public final mx()Lcom/google/android/gms/common/ConnectionResult;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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
-
-    const-string v1, "Must be called on the handler thread"
-
-    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;->agA:Lcom/google/android/gms/common/ConnectionResult;
-
-    return-object v0
-.end method
-
-.method final my()V
-    .locals 3
-
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agy:Z
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$a;->agB: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
-
-    const/16 v1, 0xb
-
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags: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;->agB: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
-
-    const/16 v1, 0x9
-
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$a;->ags: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;->agy:Z
-
-    :cond_0
-    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 a1762f2add..713b1403ad 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 agC:Lcom/google/android/gms/common/api/internal/aw;
+.field final agL: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 agD:Lcom/google/android/gms/common/Feature;
+.field final agM: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;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agL:Lcom/google/android/gms/common/api/internal/aw;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$b;->agD:Lcom/google/android/gms/common/Feature;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$b;->agM: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;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agL:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v2, p1, Lcom/google/android/gms/common/api/internal/d$b;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v2, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agD:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agM:Lcom/google/android/gms/common/Feature;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agD:Lcom/google/android/gms/common/Feature;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agM: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;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agD:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agM: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;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agD:Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$b;->agM: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 f28e53e59f..2df335efc3 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,11 +18,20 @@
 
 
 # instance fields
-.field final synthetic agB:Lcom/google/android/gms/common/api/internal/d;
+.field final agB: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 private agE:Lcom/google/android/gms/common/internal/k;
+.field final synthetic agK:Lcom/google/android/gms/common/api/internal/d;
 
-.field private agF:Ljava/util/Set;
+.field private agN:Lcom/google/android/gms/common/internal/k;
+
+.field private agO:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,18 +41,9 @@
     .end annotation
 .end field
 
-.field agG:Z
+.field agP:Z
 
-.field final agq:Lcom/google/android/gms/common/api/a$f;
-
-.field final ags: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 agz:Lcom/google/android/gms/common/api/a$f;
 
 
 # direct methods
@@ -58,23 +58,23 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK: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;->agE:Lcom/google/android/gms/common/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agN:Lcom/google/android/gms/common/internal/k;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agF:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agO:Ljava/util/Set;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agP:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agq:Lcom/google/android/gms/common/api/a$f;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d$c;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d$c;->agB: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;->agE:Lcom/google/android/gms/common/internal/k;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agN:Lcom/google/android/gms/common/internal/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agF:Ljava/util/Set;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agO:Ljava/util/Set;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->mA()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/internal/d$c;->mD()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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agK: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;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agB: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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 mA()V
+.method final mD()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agP:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agE:Lcom/google/android/gms/common/internal/k;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d$c;->agN: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d$c;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agF:Ljava/util/Set;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d$c;->agO: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 5f42764b79..6467b84fed 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,33 +16,33 @@
 
 
 # static fields
-.field public static final aga:Lcom/google/android/gms/common/api/Status;
+.field public static final agj:Lcom/google/android/gms/common/api/Status;
 
-.field private static final agb:Lcom/google/android/gms/common/api/Status;
+.field private static final agk:Lcom/google/android/gms/common/api/Status;
 
-.field private static agf:Lcom/google/android/gms/common/api/internal/d;
+.field private static ago:Lcom/google/android/gms/common/api/internal/d;
 
 .field static final lock:Ljava/lang/Object;
 
 
 # instance fields
-.field private agc:J
+.field private agl:J
 
-.field private agd:J
+.field private agm:J
 
-.field private age:J
+.field private agn:J
 
-.field private final agg:Landroid/content/Context;
+.field private final agp:Landroid/content/Context;
 
-.field private final agh:Lcom/google/android/gms/common/GoogleApiAvailability;
+.field private final agq:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-.field private final agi:Lcom/google/android/gms/common/internal/j;
+.field private final agr:Lcom/google/android/gms/common/internal/j;
 
-.field public final agj:Ljava/util/concurrent/atomic/AtomicInteger;
+.field public final ags:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field public final agk:Ljava/util/concurrent/atomic/AtomicInteger;
+.field public final agt:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final agl:Ljava/util/Map;
+.field private final agu:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,9 +54,9 @@
     .end annotation
 .end field
 
-.field agm:Lcom/google/android/gms/common/api/internal/q;
+.field agv:Lcom/google/android/gms/common/api/internal/q;
 
-.field final agn:Ljava/util/Set;
+.field final agw:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -66,7 +66,7 @@
     .end annotation
 .end field
 
-.field private final ago:Ljava/util/Set;
+.field private final agx:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -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;->aga:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->agj: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;->agb:Lcom/google/android/gms/common/api/Status;
+    sput-object v0, Lcom/google/android/gms/common/api/internal/d;->agk: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;->agc:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agl:J
 
     const-wide/32 v0, 0x1d4c0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agd:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agm:J
 
     const-wide/16 v0, 0x2710
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->age:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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;->agj:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->ags: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;->agk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agt: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;->agl:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agm:Lcom/google/android/gms/common/api/internal/q;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agv: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;->agn:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agw: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;->ago:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agx:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agg:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->agh:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iput-object p3, p0, Lcom/google/android/gms/common/api/internal/d;->agq: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;->agi:Lcom/google/android/gms/common/internal/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agr: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;->agf:Lcom/google/android/gms/common/api/internal/d;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->ago: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;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->agf:Lcom/google/android/gms/common/api/internal/d;
+    sput-object v2, Lcom/google/android/gms/common/api/internal/d;->ago:Lcom/google/android/gms/common/api/internal/d;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/common/api/internal/d;->agf:Lcom/google/android/gms/common/api/internal/d;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/d;->ago: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;->agg:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agp:Landroid/content/Context;
 
     return-object p0
 .end method
@@ -281,9 +281,9 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/h;->afu:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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/h;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agl:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->lV()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/api/internal/d$a;->lY()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->ago:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agx: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;->agc:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agl: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;->agd:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agm: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;->agi:Lcom/google/android/gms/common/internal/j;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agr: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;->agm:Lcom/google/android/gms/common/api/internal/q;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agv: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;->agn:Ljava/util/Set;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agw: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;->age:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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;->agl:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
     return-object p0
 .end method
 
-.method static synthetic mq()Ljava/lang/Object;
+.method static synthetic mt()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 mr()Lcom/google/android/gms/common/api/Status;
+.method static synthetic mu()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agb:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agk: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;->agm:Lcom/google/android/gms/common/api/internal/q;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agv: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;->agm:Lcom/google/android/gms/common/api/internal/q;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agv:Lcom/google/android/gms/common/api/internal/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agn:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agw: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;->agn:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agw:Ljava/util/Set;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/q;->ahd:Landroidx/collection/ArraySet;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/q;->ahm: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;->agh:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agg:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agC:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$b;->agL: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;->agz:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agI: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;->agy:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
 
     if-nez p1, :cond_e
 
-    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, v0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->mu()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mx()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;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/r;->agB:Lcom/google/android/gms/common/api/internal/aw;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->ahe:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->ahn: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;->agl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
     invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -653,7 +653,7 @@
 
     move-result v0
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->ahe:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/r;->ahn: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
 
@@ -689,7 +689,7 @@
     goto/16 :goto_6
 
     :pswitch_4
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agy:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agH:Z
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->my()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/d$a;->mB()V
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agh:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agK:Lcom/google/android/gms/common/api/internal/d;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agg:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d;->agp: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->ago:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agx: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;->agl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->mv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->my()V
 
     goto :goto_1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->ago:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agx: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agy:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/common/api/internal/d$a;->agH: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;->agg:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->agg:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agp: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;->mn()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->mq()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;->mn()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->mq()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p1
 
-    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->afP: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;->afG:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/b;->afP: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;->afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/b;->afO: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;->afF:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/b;->afO: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;->age:J
+    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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;->agl:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agw:I
+    iget v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->agF:I
 
     if-ne v3, v0, :cond_5
 
@@ -972,7 +972,7 @@
 
     const/16 v1, 0x11
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d;->agh:Lcom/google/android/gms/common/GoogleApiAvailability;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/d;->agq:Lcom/google/android/gms/common/GoogleApiAvailability;
 
     iget v4, p1, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
@@ -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;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahp:Lcom/google/android/gms/common/api/h;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afu: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;->ahp:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p1, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/api/internal/d;->b(Lcom/google/android/gms/common/api/h;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agl:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/d;->agu:Ljava/util/Map;
 
-    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahp:Lcom/google/android/gms/common/api/h;
+    iget-object v1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahy:Lcom/google/android/gms/common/api/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afl:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/h;->afu: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;->lV()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->lY()Z
 
     move-result v1
 
     if-eqz v1, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agk:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/d;->agt: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;->aho:I
+    iget v2, p1, Lcom/google/android/gms/common/api/internal/ae;->ahx:I
 
     if-eq v1, v2, :cond_9
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahn:Lcom/google/android/gms/common/api/internal/t;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahw:Lcom/google/android/gms/common/api/internal/t;
 
-    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->aga:Lcom/google/android/gms/common/api/Status;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/d;->agj: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;->mv()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->my()V
 
     goto/16 :goto_6
 
     :cond_9
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahn:Lcom/google/android/gms/common/api/internal/t;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/ae;->ahw: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;->agl:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->mw()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mz()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;->agl:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v3, v2, Lcom/google/android/gms/common/api/internal/d$a;->agz: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;->aeU:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v3, Lcom/google/android/gms/common/ConnectionResult;->afd:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v2, v2, Lcom/google/android/gms/common/api/internal/d$a;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->lX()Ljava/lang/String;
+    invoke-interface {v2}, Lcom/google/android/gms/common/api/a$f;->ma()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;->mx()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->mA()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;->mx()Lcom/google/android/gms/common/ConnectionResult;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/internal/d$a;->mA()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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->agK: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;->agu:Ljava/util/Set;
+    iget-object v1, v2, Lcom/google/android/gms/common/api/internal/d$a;->agD: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;->age:J
+    iput-wide v1, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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;->agl:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/d;->agu: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;->age:J
+    iget-wide v3, p0, Lcom/google/android/gms/common/api/internal/d;->agn: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 mp()V
+.method public final ms()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 7c2e82782a..5ff01102d0 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 agH:Lcom/google/android/gms/common/api/internal/e;
+.field private static agQ:Lcom/google/android/gms/common/api/internal/e;
 
 .field private static final sLock:Ljava/lang/Object;
 
 
 # instance fields
-.field private final agI:Ljava/lang/String;
+.field private final agR:Ljava/lang/String;
 
-.field private final agJ:Lcom/google/android/gms/common/api/Status;
+.field private final agS:Lcom/google/android/gms/common/api/Status;
 
-.field private final agK:Z
+.field private final agT:Z
 
-.field private final agL:Z
+.field private final agU: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;->agL:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/e;->agU:Z
 
     goto :goto_1
 
     :cond_1
-    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/e;->agL:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/common/api/internal/e;->agU:Z
 
     :goto_1
-    iput-boolean v3, p0, Lcom/google/android/gms/common/api/internal/e;->agK:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/common/api/internal/e;->agT: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;->agJ:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agS:Lcom/google/android/gms/common/api/Status;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agI:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agR:Ljava/lang/String;
 
     return-void
 
     :cond_3
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/e;->agI:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/e;->agR:Ljava/lang/String;
 
-    sget-object p1, Lcom/google/android/gms/common/api/Status;->afx:Lcom/google/android/gms/common/api/Status;
+    sget-object p1, Lcom/google/android/gms/common/api/Status;->afG:Lcom/google/android/gms/common/api/Status;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agJ:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/e;->agS: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;->agH:Lcom/google/android/gms/common/api/internal/e;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->agQ: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;->agH:Lcom/google/android/gms/common/api/internal/e;
+    sput-object v1, Lcom/google/android/gms/common/api/internal/e;->agQ:Lcom/google/android/gms/common/api/internal/e;
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agH:Lcom/google/android/gms/common/api/internal/e;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agQ:Lcom/google/android/gms/common/api/internal/e;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/e;->agJ:Lcom/google/android/gms/common/api/Status;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/e;->agS:Lcom/google/android/gms/common/api/Status;
 
     monitor-exit v0
 
@@ -187,11 +187,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->agH:Lcom/google/android/gms/common/api/internal/e;
+    sget-object v1, Lcom/google/android/gms/common/api/internal/e;->agQ:Lcom/google/android/gms/common/api/internal/e;
 
     if-eqz v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agH:Lcom/google/android/gms/common/api/internal/e;
+    sget-object p0, Lcom/google/android/gms/common/api/internal/e;->agQ:Lcom/google/android/gms/common/api/internal/e;
 
     monitor-exit v0
 
@@ -242,7 +242,7 @@
     throw p0
 .end method
 
-.method public static mB()Ljava/lang/String;
+.method public static mE()Ljava/lang/String;
     .locals 1
 
     const-string v0, "getGoogleAppId"
@@ -251,12 +251,12 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/e;->agI:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/e;->agR:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static mC()Z
+.method public static mF()Z
     .locals 1
 
     const-string v0, "isMeasurementExplicitlyDisabled"
@@ -265,7 +265,7 @@
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lcom/google/android/gms/common/api/internal/e;->agL:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/common/api/internal/e;->agU: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 881557fc54..5d39458d9b 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 agM:Ljava/lang/Object;
+.field final agV: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;->agM:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/f;->agV: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 339e85ef19..0c53d3289d 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 mD()Landroid/app/Activity;
+.method public abstract mG()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 9683e1026a..f8936c3545 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 agP:Ljava/lang/Object;
+.field private final agY:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "T",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final agR:Ljava/lang/String;
+.field private final aha: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;->agP:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agY:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/h$a;->agR:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/h$a;->aha: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;->agP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agY:Ljava/lang/Object;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/h$a;->agP:Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/common/api/internal/h$a;->agY:Ljava/lang/Object;
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->agR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->aha:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h$a;->agR:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h$a;->aha: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;->agP:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$a;->agY: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;->agR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h$a;->aha: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 9d07bbeaa9..f789d49f8b 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 agS:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic ahb: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;->agS:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h$c;->ahb: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;->agS:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h$c;->ahb: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;->agP:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/h;->agY: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 ec367efd65..ee4ca8d487 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 agO:Lcom/google/android/gms/common/api/internal/h$c;
+.field private final agX: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 agP:Ljava/lang/Object;
+.field volatile agY:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "T",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field public final agQ:Lcom/google/android/gms/common/api/internal/h$a;
+.field public final agZ: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;->agO:Lcom/google/android/gms/common/api/internal/h$c;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->agX:Lcom/google/android/gms/common/api/internal/h$c;
 
     const-string p1, "Listener must not be null"
 
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->agP:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->agY:Ljava/lang/Object;
 
     new-instance p1, Lcom/google/android/gms/common/api/internal/h$a;
 
@@ -89,7 +89,7 @@
 
     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;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->agO:Lcom/google/android/gms/common/api/internal/h$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->agX: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;->agO:Lcom/google/android/gms/common/api/internal/h$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/h;->agX: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 3e7c4f997f..877ba149ab 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 agT:Lcom/google/android/gms/common/api/internal/h;
+.field public final ahc: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 agU:[Lcom/google/android/gms/common/Feature;
+.field final ahd:[Lcom/google/android/gms/common/Feature;
 
-.field final agV:Z
+.field final ahe: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;->agT:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->ahc:Lcom/google/android/gms/common/api/internal/h;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->agU:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/j;->ahd:[Lcom/google/android/gms/common/Feature;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/j;->agV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/api/internal/j;->ahe: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 a42b937168..1fd79efa1e 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 agW:[Lcom/google/android/gms/common/Feature;
+.field final ahf:[Lcom/google/android/gms/common/Feature;
 
-.field final agX:Z
+.field final ahg:Z
 
 
 # direct methods
@@ -31,11 +31,11 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/l;->agW:[Lcom/google/android/gms/common/Feature;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/l;->ahf:[Lcom/google/android/gms/common/Feature;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/l;->agX:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/api/internal/l;->ahg: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 dd482b089a..168df15c8a 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 agQ:Lcom/google/android/gms/common/api/internal/h$a;
+.field public final agZ: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;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/m;->agZ: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 07751bd767..db6cff1794 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 agY:Ljava/util/Map;
+.field final ahh:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field final agZ:Ljava/util/Map;
+.field final ahi: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;->agY:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahh: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;->agZ:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahi: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;->agY:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahh: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;->agY:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->ahh: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;->agZ:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/n;->ahi: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;->agZ:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/n;->ahi:Ljava/util/Map;
 
     invoke-direct {v0, v3}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -221,10 +221,10 @@
 
 
 # virtual methods
-.method final mE()Z
+.method final mH()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->agY:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahh: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;->agZ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/n;->ahi:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -254,10 +254,10 @@
     return v0
 .end method
 
-.method public final mF()V
+.method public final mI()V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->aga:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/d;->agj:Lcom/google/android/gms/common/api/Status;
 
     const/4 v1, 0x0
 
@@ -266,10 +266,10 @@
     return-void
 .end method
 
-.method public final mG()V
+.method public final mJ()V
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahJ:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/internal/aq;->ahS: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 814fad4322..490f60fef5 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 aha:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+.field private final synthetic ahj:Lcom/google/android/gms/common/api/internal/BasePendingResult;
 
-.field private final synthetic ahb:Lcom/google/android/gms/common/api/internal/n;
+.field private final synthetic ahk: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;->ahb:Lcom/google/android/gms/common/api/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->ahk:Lcom/google/android/gms/common/api/internal/n;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/o;->aha:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/o;->ahj: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;->ahb:Lcom/google/android/gms/common/api/internal/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/o;->ahk:Lcom/google/android/gms/common/api/internal/n;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->agY:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->ahh:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->aha:Lcom/google/android/gms/common/api/internal/BasePendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/o;->ahj: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 64bc5cb960..eff5e04de1 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 ahb:Lcom/google/android/gms/common/api/internal/n;
+.field private final synthetic ahk:Lcom/google/android/gms/common/api/internal/n;
 
-.field private final synthetic ahc:Lcom/google/android/gms/tasks/h;
+.field private final synthetic ahl: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;->ahb:Lcom/google/android/gms/common/api/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->ahk:Lcom/google/android/gms/common/api/internal/n;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/p;->ahc:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/p;->ahl: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;->ahb:Lcom/google/android/gms/common/api/internal/n;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/p;->ahk:Lcom/google/android/gms/common/api/internal/n;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->agZ:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/n;->ahi:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/p;->ahc:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/p;->ahl: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 2f903afeca..dd3cd6e44b 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 afp:Lcom/google/android/gms/common/api/internal/d;
+.field private afy:Lcom/google/android/gms/common/api/internal/d;
 
-.field final ahd:Landroidx/collection/ArraySet;
+.field final ahm: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;->ahd:Landroidx/collection/ArraySet;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->ahm:Landroidx/collection/ArraySet;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->agN:Lcom/google/android/gms/common/api/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/common/api/internal/q;->agW:Lcom/google/android/gms/common/api/internal/g;
 
     const-string v0, "ConnectionlessLifecycleHelper"
 
@@ -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;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, v0, Lcom/google/android/gms/common/api/internal/q;->afy: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;->ahd:Landroidx/collection/ArraySet;
+    iget-object p0, v0, Lcom/google/android/gms/common/api/internal/q;->ahm: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 mH()V
+.method private final mK()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->ahd:Landroidx/collection/ArraySet;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->ahm: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;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afy: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;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afy: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 mp()V
+.method protected final ms()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afy:Lcom/google/android/gms/common/api/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->mp()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d;->ms()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;->mH()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->mK()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;->mH()V
+    invoke-direct {p0}, Lcom/google/android/gms/common/api/internal/q;->mK()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;->afp:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/q;->afy: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;->agm:Lcom/google/android/gms/common/api/internal/q;
+    iget-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->agv: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;->agm:Lcom/google/android/gms/common/api/internal/q;
+    iput-object v2, v0, Lcom/google/android/gms/common/api/internal/d;->agv:Lcom/google/android/gms/common/api/internal/q;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agn:Ljava/util/Set;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d;->agw: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 e5997fffe0..109dd80633 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,7 +3,7 @@
 
 
 # instance fields
-.field final ags:Lcom/google/android/gms/common/api/internal/aw;
+.field final agB:Lcom/google/android/gms/common/api/internal/aw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/aw<",
@@ -12,7 +12,7 @@
     .end annotation
 .end field
 
-.field final ahe:Lcom/google/android/gms/tasks/h;
+.field final ahn:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
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 338fff8af4..908368d5e6 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 ahf:Ljava/lang/String;
+.field private final aho:Ljava/lang/String;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/api/i;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/s;->ahf:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/s;->aho: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 20056202f2..527bed01d5 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 agB:Lcom/google/android/gms/common/api/internal/d;
+.field private final synthetic agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/u;->agK:Lcom/google/android/gms/common/api/internal/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -25,13 +25,13 @@
 .method public final E(Z)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/u;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/u;->agK: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;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/u;->agK: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 dc854433bd..5d2451b41c 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 ahg:Lcom/google/android/gms/common/api/internal/d$a;
+.field private final synthetic ahp: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;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/v;->ahp: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;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/v;->ahp: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 0c32fde261..a61c9c3885 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 ahg:Lcom/google/android/gms/common/api/internal/d$a;
+.field private final synthetic ahp: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;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/w;->ahp: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;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/w;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mt()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$a;->mw()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 604f2347ef..bd2e00045a 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 ahg:Lcom/google/android/gms/common/api/internal/d$a;
+.field final synthetic ahp: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;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/x;->ahp: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 mI()V
+.method public final mL()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/x;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/x;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->agK: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 84cd0d165a..efda847bf9 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 ahh:Lcom/google/android/gms/common/api/internal/x;
+.field private final synthetic ahq: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;->ahh:Lcom/google/android/gms/common/api/internal/x;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/y;->ahq: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;->ahh:Lcom/google/android/gms/common/api/internal/x;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/y;->ahq:Lcom/google/android/gms/common/api/internal/x;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/x;->ahg:Lcom/google/android/gms/common/api/internal/d$a;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/x;->ahp:Lcom/google/android/gms/common/api/internal/d$a;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$a;->agz: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 5d4bb77da6..53e7a2dd9d 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 ahi:Lcom/google/android/gms/common/ConnectionResult;
+.field private final synthetic ahr:Lcom/google/android/gms/common/ConnectionResult;
 
-.field private final synthetic ahj:Lcom/google/android/gms/common/api/internal/d$c;
+.field private final synthetic ahs: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;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iput-object p1, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/z;->ahi:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p2, p0, Lcom/google/android/gms/common/api/internal/z;->ahr: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;->ahi:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahr:Lcom/google/android/gms/common/ConnectionResult;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lN()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahs: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;->agG:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/common/api/internal/d$c;->agP:Z
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agz:Lcom/google/android/gms/common/api/a$f;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lV()Z
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$f;->lY()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->mA()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/internal/d$c;->mD()V
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agq:Lcom/google/android/gms/common/api/a$f;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agz: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;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agK: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;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->agB: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;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agB:Lcom/google/android/gms/common/api/internal/d;
+    iget-object v0, v0, Lcom/google/android/gms/common/api/internal/d$c;->agK: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;->ahj:Lcom/google/android/gms/common/api/internal/d$c;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->ahs:Lcom/google/android/gms/common/api/internal/d$c;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->ags:Lcom/google/android/gms/common/api/internal/aw;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/d$c;->agB: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;->ahi:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/z;->ahr: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/m.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/m.smali
index 2e53a83a55..641c32c63d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/m.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/m.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public afv:Lcom/google/android/gms/common/api/n;
+.field public afE:Lcom/google/android/gms/common/api/n;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
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 1395c440b8..ec40c5fa63 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
@@ -3,5 +3,5 @@
 
 
 # virtual methods
-.method public abstract ml()Lcom/google/android/gms/common/api/Status;
+.method public abstract mo()Lcom/google/android/gms/common/api/Status;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/api/q.smali b/com.discord/smali_classes2/com/google/android/gms/common/api/q.smali
index 19967e5744..a708103d9c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/api/q.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/api/q.smali
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public abstract mm()Lcom/google/android/gms/common/api/j;
+.method public abstract mp()Lcom/google/android/gms/common/api/j;
     .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 952d7ef4ce..dc712159dc 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 aeW:Landroid/content/DialogInterface$OnCancelListener;
+.field private aff: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;->aeW:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object v0, p0, Lcom/google/android/gms/common/b;->aff: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;->aeW:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object p1, v0, Lcom/google/android/gms/common/b;->aff: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;->aeW:Landroid/content/DialogInterface$OnCancelListener;
+    iget-object v0, p0, Lcom/google/android/gms/common/b;->aff:Landroid/content/DialogInterface$OnCancelListener;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/b/a$a.smali b/com.discord/smali_classes2/com/google/android/gms/common/b/a$a.smali
index 78e8b892e2..f3adf23941 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/b/a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/b/a$a.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract ng()Ljava/util/concurrent/ScheduledExecutorService;
+.method public abstract nj()Ljava/util/concurrent/ScheduledExecutorService;
 .end method
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 78d0f31869..1d6f5d49f1 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 akP:Lcom/google/android/gms/common/b/a$a;
+.field private static akY:Lcom/google/android/gms/common/b/a$a;
 
 
 # direct methods
-.method public static declared-synchronized nf()Lcom/google/android/gms/common/b/a$a;
+.method public static declared-synchronized ni()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;->akP:Lcom/google/android/gms/common/b/a$a;
+    sget-object v1, Lcom/google/android/gms/common/b/a;->akY: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;->akP:Lcom/google/android/gms/common/b/a$a;
+    sput-object v1, Lcom/google/android/gms/common/b/a;->akY:Lcom/google/android/gms/common/b/a$a;
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/common/b/a;->akP:Lcom/google/android/gms/common/b/a$a;
+    sget-object v1, Lcom/google/android/gms/common/b/a;->akY: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/b/b.smali b/com.discord/smali_classes2/com/google/android/gms/common/b/b.smali
index 3fc47f79dd..bcb2641649 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/b/b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/b/b.smali
@@ -16,7 +16,7 @@
 
 
 # virtual methods
-.method public final ng()Ljava/util/concurrent/ScheduledExecutorService;
+.method public final nj()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 1
 
     invoke-static {}, Ljava/util/concurrent/Executors;->newSingleThreadScheduledExecutor()Ljava/util/concurrent/ScheduledExecutorService;
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 857bf7f5ba..fcc3d439d4 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 afc:Lcom/google/android/gms/common/c;
+.field private static final afm: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;->afc:Lcom/google/android/gms/common/c;
+    sput-object v0, Lcom/google/android/gms/common/c;->afm:Lcom/google/android/gms/common/c;
 
     return-void
 .end method
@@ -132,10 +132,10 @@
     return p0
 .end method
 
-.method public static lR()Lcom/google/android/gms/common/c;
+.method public static lU()Lcom/google/android/gms/common/c;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/c;->afc:Lcom/google/android/gms/common/c;
+    sget-object v0, Lcom/google/android/gms/common/c;->afm:Lcom/google/android/gms/common/c;
 
     return-object v0
 .end method
@@ -202,7 +202,7 @@
 
     if-eqz p2, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/internal/ai;->nc()Landroid/content/Intent;
+    invoke-static {}, Lcom/google/android/gms/common/internal/ai;->nf()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 c94a9ddd7d..cd295c1f62 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 amg:Landroid/content/Context;
+.field private static amp:Landroid/content/Context;
 
-.field private static amh:Ljava/lang/Boolean;
+.field private static amq:Ljava/lang/Boolean;
 
 
 # direct methods
@@ -21,19 +21,19 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->amg:Landroid/content/Context;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->amp:Landroid/content/Context;
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->amh:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->amq:Ljava/lang/Boolean;
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/common/c/a;->amg:Landroid/content/Context;
+    sget-object v2, Lcom/google/android/gms/common/c/a;->amp:Landroid/content/Context;
 
     if-ne v2, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/common/c/a;->amh:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/c/a;->amq: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;->amh:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/common/c/a;->amq: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;->amh:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->amq: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;->amh:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->amq: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;->amh:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/c/a;->amq:Ljava/lang/Boolean;
 
     :goto_0
-    sput-object v1, Lcom/google/android/gms/common/c/a;->amg:Landroid/content/Context;
+    sput-object v1, Lcom/google/android/gms/common/c/a;->amp:Landroid/content/Context;
 
-    sget-object p0, Lcom/google/android/gms/common/c/a;->amh:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/c/a;->amq: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 f51d16b201..c045df4a86 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 ami:Landroid/content/Context;
+.field public final amr:Landroid/content/Context;
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     const-string v3, "appops"
 
@@ -63,7 +63,7 @@
     return v2
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -106,7 +106,7 @@
 .method public final bc(Ljava/lang/String;)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     invoke-virtual {v0, p1}, Landroid/content/Context;->checkCallingOrSelfPermission(Ljava/lang/String;)I
 
@@ -123,13 +123,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr: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;->ami:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->amr:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -156,7 +156,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr: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;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr: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 nC()Z
+.method public final nF()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;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr: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;->ami:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/b;->amr: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;->ami:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/common/c/b;->amr: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 d21e614d57..fb3350b085 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 amk:Lcom/google/android/gms/common/c/c;
+.field private static amt:Lcom/google/android/gms/common/c/c;
 
 
 # instance fields
-.field private amj:Lcom/google/android/gms/common/c/b;
+.field private ams: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;->amk:Lcom/google/android/gms/common/c/c;
+    sput-object v0, Lcom/google/android/gms/common/c/c;->amt: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;->amj:Lcom/google/android/gms/common/c/b;
+    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->ams: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;->amj:Lcom/google/android/gms/common/c/b;
+    iget-object v0, p0, Lcom/google/android/gms/common/c/c;->ams: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;->amj:Lcom/google/android/gms/common/c/b;
+    iput-object v0, p0, Lcom/google/android/gms/common/c/c;->ams:Lcom/google/android/gms/common/c/b;
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/common/c/c;->amj:Lcom/google/android/gms/common/c/b;
+    iget-object p1, p0, Lcom/google/android/gms/common/c/c;->ams: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;->amk:Lcom/google/android/gms/common/c/c;
+    sget-object v0, Lcom/google/android/gms/common/c/c;->amt: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 926e9dbf08..25586294c9 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,7 +14,9 @@
 
 
 # instance fields
-.field private final aiD:Ljava/util/ArrayList;
+.field private final aiD:[Ljava/lang/String;
+
+.field private final aiM:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -26,9 +28,9 @@
     .end annotation
 .end field
 
-.field private final aiE:Ljava/lang/String;
+.field private final aiN:Ljava/lang/String;
 
-.field private final aiF:Ljava/util/HashMap;
+.field private final aiO:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -39,11 +41,9 @@
     .end annotation
 .end field
 
-.field private aiG:Z
+.field private aiP:Z
 
-.field private aiH:Ljava/lang/String;
-
-.field private final aiu:[Ljava/lang/String;
+.field private aiQ: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;->aiu:[Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiD:[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;->aiD:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiM:Ljava/util/ArrayList;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiN: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;->aiF:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiO:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiG:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiP:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiH:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/data/DataHolder$a;->aiQ: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 d9d05545cd..bed890a488 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 aiC:Lcom/google/android/gms/common/data/DataHolder$a;
+.field private static final aiL:Lcom/google/android/gms/common/data/DataHolder$a;
 
 
 # instance fields
-.field aiA:I
+.field private final aiC:I
 
-.field private aiB:Z
+.field final aiD:[Ljava/lang/String;
 
-.field private final ait:I
+.field aiE:Landroid/os/Bundle;
 
-.field final aiu:[Ljava/lang/String;
+.field final aiF:[Landroid/database/CursorWindow;
 
-.field aiv:Landroid/os/Bundle;
+.field private final aiG:I
 
-.field final aiw:[Landroid/database/CursorWindow;
+.field private final aiH:Landroid/os/Bundle;
 
-.field private final aix:I
+.field aiI:[I
 
-.field private final aiy:Landroid/os/Bundle;
+.field aiJ:I
 
-.field aiz:[I
+.field private aiK: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;->aiC:Lcom/google/android/gms/common/data/DataHolder$a;
+    sput-object v0, Lcom/google/android/gms/common/data/DataHolder;->aiL: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;->aiB:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiK:Z
 
-    iput p1, p0, Lcom/google/android/gms/common/data/DataHolder;->ait:I
+    iput p1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiC:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/data/DataHolder;->aiu:[Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/data/DataHolder;->aiD:[Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiw:[Landroid/database/CursorWindow;
+    iput-object p3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
 
-    iput p4, p0, Lcom/google/android/gms/common/data/DataHolder;->aix:I
+    iput p4, p0, Lcom/google/android/gms/common/data/DataHolder;->aiG:I
 
-    iput-object p5, p0, Lcom/google/android/gms/common/data/DataHolder;->aiy:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/common/data/DataHolder;->aiH: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;->aiw:[Landroid/database/CursorWindow;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
 
     array-length v1, v1
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiw:[Landroid/database/CursorWindow;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[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;->aiB:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiK:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiw:[Landroid/database/CursorWindow;
+    iget-object v0, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[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;->aiu:[Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/data/DataHolder;->aiD:[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;->aiw:[Landroid/database/CursorWindow;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiF:[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;->aix:I
+    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiG: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;->aiy:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiH: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;->ait:I
+    iget v3, p0, Lcom/google/android/gms/common/data/DataHolder;->aiC: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 7f8e981ae8..44b6e08cef 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;->aiv:Landroid/os/Bundle;
+    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiE:Landroid/os/Bundle;
 
     const/4 v0, 0x0
 
     :goto_1
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiu:[Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiD:[Ljava/lang/String;
 
     array-length v1, v1
 
     if-ge v0, v1, :cond_7
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiv:Landroid/os/Bundle;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiE:Landroid/os/Bundle;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->aiu:[Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->aiD:[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;->aiw:[Landroid/database/CursorWindow;
+    iget-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
 
     array-length v0, v0
 
     new-array v0, v0, [I
 
-    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiz:[I
+    iput-object v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiI:[I
 
     const/4 v0, 0x0
 
     :goto_2
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiw:[Landroid/database/CursorWindow;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF:[Landroid/database/CursorWindow;
 
     array-length v1, v1
 
     if-ge v2, v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiz:[I
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiI:[I
 
     aput v0, v1, v2
 
-    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiw:[Landroid/database/CursorWindow;
+    iget-object v1, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF:[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;->aiw:[Landroid/database/CursorWindow;
+    iget-object v3, p1, Lcom/google/android/gms/common/data/DataHolder;->aiF:[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;->aiA:I
+    iput v0, p1, Lcom/google/android/gms/common/data/DataHolder;->aiJ: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 9539ffffab..a7910f466c 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;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->alI:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alR: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;->alI:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/common/util/h;->alR:Ljava/lang/Boolean;
 
     :cond_5
-    sget-object v0, Lcom/google/android/gms/common/util/h;->alI:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alR: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;->nr()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()Z
 
     move-result v0
 
@@ -800,7 +800,7 @@
 
     move-result v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nt()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nw()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 16652c2683..79c1ced1cf 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 aeW:Landroid/content/DialogInterface$OnCancelListener;
+.field private aff: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;->aeW:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object v0, p0, Lcom/google/android/gms/common/h;->aff: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;->aeW:Landroid/content/DialogInterface$OnCancelListener;
+    iput-object p1, v0, Lcom/google/android/gms/common/h;->aff: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;->aeW:Landroid/content/DialogInterface$OnCancelListener;
+    iget-object v0, p0, Lcom/google/android/gms/common/h;->aff: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 eca9710667..decc4c2c50 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,23 +15,23 @@
 
 
 # instance fields
-.field private final ajD:I
+.field private final ajM:I
 
-.field private ajE:I
+.field private ajN:I
 
-.field ajF:Landroid/os/IBinder;
+.field ajO:Landroid/os/IBinder;
 
-.field ajG:[Lcom/google/android/gms/common/api/Scope;
+.field ajP:[Lcom/google/android/gms/common/api/Scope;
 
-.field ajH:Landroid/os/Bundle;
+.field ajQ:Landroid/os/Bundle;
 
-.field ajI:Landroid/accounts/Account;
+.field ajR:Landroid/accounts/Account;
 
-.field ajJ:[Lcom/google/android/gms/common/Feature;
+.field ajS:[Lcom/google/android/gms/common/Feature;
 
-.field ajK:[Lcom/google/android/gms/common/Feature;
+.field ajT:[Lcom/google/android/gms/common/Feature;
 
-.field private ajL:Z
+.field private ajU: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;->ajE:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN:I
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajD:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM:I
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajL:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajU: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;->ajD:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM:I
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajE:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN:I
 
     const-string p2, "com.google.android.gms"
 
@@ -117,25 +117,25 @@
     move-result-object p1
 
     :cond_1
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajI:Landroid/accounts/Account;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajR:Landroid/accounts/Account;
 
     goto :goto_1
 
     :cond_2
-    iput-object p5, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajF:Landroid/os/IBinder;
+    iput-object p5, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajO:Landroid/os/IBinder;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajI:Landroid/accounts/Account;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajR:Landroid/accounts/Account;
 
     :goto_1
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajG:[Lcom/google/android/gms/common/api/Scope;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[Lcom/google/android/gms/common/api/Scope;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajH:Landroid/os/Bundle;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ:Landroid/os/Bundle;
 
-    iput-object p9, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajJ:[Lcom/google/android/gms/common/Feature;
+    iput-object p9, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajS:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p10, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajK:[Lcom/google/android/gms/common/Feature;
+    iput-object p10, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajT:[Lcom/google/android/gms/common/Feature;
 
-    iput-boolean p11, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajL:Z
+    iput-boolean p11, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajU:Z
 
     return-void
 .end method
@@ -157,13 +157,13 @@
 
     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;->ajD:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajM: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;->ajE:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajN:I
 
     const/4 v2, 0x3
 
@@ -175,43 +175,43 @@
 
     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;->ajF:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajO: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;->ajG:[Lcom/google/android/gms/common/api/Scope;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[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;->ajH:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ: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;->ajI:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajR: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;->ajJ:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajS:[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;->ajK:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajT:[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;->ajL:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajU: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 880bb9858d..693afd6d60 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 ait:I
+.field private final aiC:I
 
-.field private final ajq:Landroid/accounts/Account;
+.field private final ajz:Landroid/accounts/Account;
 
-.field private final ake:I
+.field private final akn:I
 
-.field private final akf:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+.field private final ako:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
 
 
 # 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;->ait:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiC:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ajq:Landroid/accounts/Account;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ajz:Landroid/accounts/Account;
 
-    iput p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ake:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akn:I
 
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akf:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ako: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;->ait:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->aiC: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;->ajq:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ajz: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;->ake:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->akn: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;->akf:Lcom/google/android/gms/auth/api/signin/GoogleSignInAccount;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountRequest;->ako: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 c36efbcae3..13d1f135bb 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 public aic:Lcom/google/android/gms/common/ConnectionResult;
+.field private final aiC:I
 
-.field private final ait:I
+.field public ail:Lcom/google/android/gms/common/ConnectionResult;
 
-.field public akg:Landroid/os/IBinder;
+.field public akp:Landroid/os/IBinder;
 
-.field private akh:Z
+.field private akq:Z
 
-.field private aki:Z
+.field private akr: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;->ait:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akg:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp:Landroid/os/IBinder;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akh:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akq:Z
 
-    iput-boolean p5, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aki:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akr: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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp:Landroid/os/IBinder;
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/k$a;->b(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;->akg:Landroid/os/IBinder;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp:Landroid/os/IBinder;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/k$a;->b(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;->ait:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->aiC: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;->akg:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akp: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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->ail: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;->akh:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akq: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;->aki:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/common/internal/ResolveAccountResponse;->akr: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 dfec1aaa6d..8a869e1aee 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;->lS()Landroid/accounts/Account;
+    invoke-interface {p0}, Lcom/google/android/gms/common/internal/k;->lV()Landroid/accounts/Account;
 
     move-result-object p0
     :try_end_0
@@ -68,7 +68,7 @@
     throw p1
 .end method
 
-.method public final lS()Landroid/accounts/Account;
+.method public final lV()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 8cedeef163..d628600558 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 akq:Lcom/google/android/gms/common/api/j;
+.field private final synthetic akA:Lcom/google/android/gms/tasks/h;
 
-.field private final synthetic akr:Lcom/google/android/gms/tasks/h;
+.field private final synthetic akB:Lcom/google/android/gms/common/internal/q$a;
 
-.field private final synthetic aks:Lcom/google/android/gms/common/internal/q$a;
+.field private final synthetic akC:Lcom/google/android/gms/common/internal/q$b;
 
-.field private final synthetic akt:Lcom/google/android/gms/common/internal/q$b;
+.field private final synthetic akz:Lcom/google/android/gms/common/api/j;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/j;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;->akq:Lcom/google/android/gms/common/api/j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/aa;->akz:Lcom/google/android/gms/common/api/j;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/aa;->akr:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/aa;->akA:Lcom/google/android/gms/tasks/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/aa;->aks:Lcom/google/android/gms/common/internal/q$a;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/aa;->akB:Lcom/google/android/gms/common/internal/q$a;
 
-    iput-object p4, p0, Lcom/google/android/gms/common/internal/aa;->akt:Lcom/google/android/gms/common/internal/q$b;
+    iput-object p4, p0, Lcom/google/android/gms/common/internal/aa;->akC: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;->lN()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lQ()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->akq:Lcom/google/android/gms/common/api/j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/aa;->akz:Lcom/google/android/gms/common/api/j;
 
     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;->akr:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->akA:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->aks:Lcom/google/android/gms/common/internal/q$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->akB:Lcom/google/android/gms/common/internal/q$a;
 
     invoke-interface {v1, p1}, Lcom/google/android/gms/common/internal/q$a;->d(Lcom/google/android/gms/common/api/n;)Ljava/lang/Object;
 
@@ -64,9 +64,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->akr:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/aa;->akA:Lcom/google/android/gms/tasks/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->akt:Lcom/google/android/gms/common/internal/q$b;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/aa;->akC: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/e;
 
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 a947d584da..3b28024e50 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 aku:Lcom/google/android/gms/common/api/m;
+.field private final synthetic akD:Lcom/google/android/gms/common/api/m;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/m;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ab;->aku:Lcom/google/android/gms/common/api/m;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ab;->akD:Lcom/google/android/gms/common/api/m;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -35,9 +35,9 @@
 .method public final synthetic d(Lcom/google/android/gms/common/api/n;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ab;->aku:Lcom/google/android/gms/common/api/m;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ab;->akD:Lcom/google/android/gms/common/api/m;
 
-    iput-object p1, v0, Lcom/google/android/gms/common/api/m;->afv:Lcom/google/android/gms/common/api/n;
+    iput-object p1, v0, Lcom/google/android/gms/common/api/m;->afE:Lcom/google/android/gms/common/api/n;
 
     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 705ffd37af..ad99218dd8 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,11 +6,7 @@
 
 
 # instance fields
-.field private final akA:J
-
-.field private final akB:J
-
-.field private final akx:Ljava/util/HashMap;
+.field private final akG:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -21,9 +17,13 @@
     .end annotation
 .end field
 
-.field private final aky:Landroid/content/Context;
+.field private final akH:Landroid/content/Context;
 
-.field private final akz:Lcom/google/android/gms/common/stats/a;
+.field private final akI:Lcom/google/android/gms/common/stats/a;
+
+.field private final akJ:J
+
+.field private final akK: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;->akx:Ljava/util/HashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->aky:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akH: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;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/ag;->akz:Lcom/google/android/gms/common/stats/a;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ag;->akI:Lcom/google/android/gms/common/stats/a;
 
     const-wide/16 v0, 0x1388
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akA:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akJ:J
 
     const-wide/32 v0, 0x493e0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akB:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akK: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;->akx:Ljava/util/HashMap;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->aky:Landroid/content/Context;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->akH: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;->akz:Lcom/google/android/gms/common/stats/a;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/ag;->akI: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;->akB:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/internal/ag;->akK: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;->akx:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG:Ljava/util/HashMap;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akx:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->akC:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/android/gms/common/internal/ah;->akL: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;->nb()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/ah;->ne()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;->akA:J
+    iget-wide v1, p0, Lcom/google/android/gms/common/internal/ag;->akJ: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;->akx:Ljava/util/HashMap;
+    iget-object p3, p0, Lcom/google/android/gms/common/internal/ag;->akG:Ljava/util/HashMap;
 
     monitor-enter p3
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akx:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->na()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->nd()V
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->akx:Ljava/util/HashMap;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->na()V
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/ah;->nd()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;->akE:Landroid/os/IBinder;
+    iget-object v1, v0, Lcom/google/android/gms/common/internal/ah;->akN: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;->akD:Z
+    iget-boolean p1, v0, Lcom/google/android/gms/common/internal/ah;->akM:Z
 
     monitor-exit p3
 
@@ -395,7 +395,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akx:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->akx:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->ajP:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/h$a;->ajY: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;->akx:Ljava/util/HashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->akx:Ljava/util/HashMap;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/ag;->akG: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;->nb()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/ah;->ne()Z
 
     move-result v4
 
     if-eqz v4, :cond_6
 
-    iget-boolean v4, v3, Lcom/google/android/gms/common/internal/ah;->akD:Z
+    iget-boolean v4, v3, Lcom/google/android/gms/common/internal/ah;->akM:Z
 
     if-eqz v4, :cond_5
 
-    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v5, v3, Lcom/google/android/gms/common/internal/ah;->akO: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v4, v3, Lcom/google/android/gms/common/internal/ah;->akP:Lcom/google/android/gms/common/internal/ag;
 
-    iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->aky:Landroid/content/Context;
+    iget-object v4, v4, Lcom/google/android/gms/common/internal/ag;->akH: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;->akD:Z
+    iput-boolean v1, v3, Lcom/google/android/gms/common/internal/ah;->akM: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;->akx:Ljava/util/HashMap;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ag;->akG: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 fbd9f9ba1f..f9ccfb4e5b 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 akC:Ljava/util/Set;
+.field final akL:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -16,13 +16,13 @@
     .end annotation
 .end field
 
-.field akD:Z
+.field akM:Z
 
-.field akE:Landroid/os/IBinder;
+.field akN:Landroid/os/IBinder;
 
-.field final akF:Lcom/google/android/gms/common/internal/h$a;
+.field final akO:Lcom/google/android/gms/common/internal/h$a;
 
-.field final synthetic akG:Lcom/google/android/gms/common/internal/ag;
+.field final synthetic akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->akO: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;->akC:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akO:Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->mY()Landroid/content/Intent;
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/h$a;->nb()Landroid/content/Intent;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akC:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akC:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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 na()V
+.method public final nd()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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akO:Lcom/google/android/gms/common/internal/h$a;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->mY()Landroid/content/Intent;
+    invoke-virtual {v1}, Lcom/google/android/gms/common/internal/h$a;->nb()Landroid/content/Intent;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akO:Lcom/google/android/gms/common/internal/h$a;
 
-    iget v2, v2, Lcom/google/android/gms/common/internal/h$a;->ajQ:I
+    iget v2, v2, Lcom/google/android/gms/common/internal/h$a;->ajZ: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;->akD:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->akM:Z
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->akD:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/ah;->akM:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akO: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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 nb()Z
+.method public final ne()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akC:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/ah;->akO: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;->akE:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/ah;->akN: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;->akC:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akG:Lcom/google/android/gms/common/internal/ag;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akP: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;->akF:Lcom/google/android/gms/common/internal/h$a;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/ah;->akO: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;->akE:Landroid/os/IBinder;
+    iput-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akN: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;->akC:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/ah;->akL: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 392f1682fb..ae611b39cd 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 akH:Landroid/net/Uri;
+.field private static final akQ:Landroid/net/Uri;
 
-.field private static final akI:Landroid/net/Uri;
+.field private static final akR:Landroid/net/Uri;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akH:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akQ:Landroid/net/Uri;
 
     invoke-virtual {v0}, Landroid/net/Uri;->buildUpon()Landroid/net/Uri$Builder;
 
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akI:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/common/internal/ai;->akR:Landroid/net/Uri;
 
     return-void
 .end method
@@ -120,7 +120,7 @@
     return-object v0
 .end method
 
-.method public static nc()Landroid/content/Intent;
+.method public static nf()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 21f79b384f..5d71a4d32e 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,13 +3,13 @@
 
 
 # instance fields
-.field final ajQ:I
+.field final ajZ:I
 
-.field final akJ:Ljava/lang/String;
+.field final akS:Ljava/lang/String;
 
-.field final akK:Ljava/lang/String;
+.field final akT:Ljava/lang/String;
 
-.field private final akL:Z
+.field private final akU:Z
 
 
 # direct methods
@@ -18,17 +18,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/aj;->akJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/aj;->akL:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/aj;->akU:Z
 
     const/16 p1, 0x81
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/aj;->ajQ:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/aj;->ajZ: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 3f5f574cc4..46090a975d 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 nd()Lcom/google/android/gms/a/a;
+.method public abstract ng()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 ne()I
+.method public abstract nh()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 f48acc7d7f..00747d899a 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;->ne()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->nh()I
 
     move-result p1
 
@@ -82,7 +82,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->nd()Lcom/google/android/gms/a/a;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/al;->ng()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 851ec5bcf3..ff47c3c8d2 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 nd()Lcom/google/android/gms/a/a;
+.method public final ng()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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
     return-object v1
 .end method
 
-.method public final ne()I
+.method public final nh()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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()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 23a3c35960..db743b28c5 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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()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 18b613ade7..2d19992d45 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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()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 3b6c402b37..85604be6a2 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 akM:Z
+.field private static akV:Z
 
-.field private static akN:Ljava/lang/String;
+.field private static akW:Ljava/lang/String;
 
-.field private static akO:I
+.field private static akX:I
 
 .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;->akN:Ljava/lang/String;
+    sget-object p0, Lcom/google/android/gms/common/internal/ar;->akW: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;->akO:I
+    sget p0, Lcom/google/android/gms/common/internal/ar;->akX: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;->akM:Z
+    sget-boolean v1, Lcom/google/android/gms/common/internal/ar;->akV: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;->akM:Z
+    sput-boolean v1, Lcom/google/android/gms/common/internal/ar;->akV: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;->akN:Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/common/internal/ar;->akW: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;->akO:I
+    sput p0, Lcom/google/android/gms/common/internal/ar;->akX: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 2e9aff7875..0d2f848872 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/e;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->lM()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/api/Status;->lP()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 667f70724e..e7fe11320a 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 mj()V
+.method public abstract mm()V
 .end method
 
-.method public abstract mk()V
+.method public abstract mn()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 29b322722e..ec7f71d674 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 aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ajr: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;->lN()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/ConnectionResult;->lQ()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$d;->ajr:Lcom/google/android/gms/common/internal/c;
 
     const/4 v0, 0x0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c;->mS()Ljava/util/Set;
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c;->mV()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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$d;->ajr: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 cdb6e5d8f1..6ca01c4b4c 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 mI()V
+.method public abstract mL()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 85658bb0ed..7780e75683 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,26 +22,26 @@
 
 
 # instance fields
-.field private final synthetic aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajj:I
+.field private final ajs:I
 
-.field private final ajk:Landroid/os/Bundle;
+.field private final ajt:Landroid/os/Bundle;
 
 
 # direct methods
 .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;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajr:Lcom/google/android/gms/common/internal/c;
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/common/internal/c$h;-><init>(Lcom/google/android/gms/common/internal/c;Ljava/lang/Object;)V
 
-    iput p2, p0, Lcom/google/android/gms/common/internal/c$f;->ajj:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$f;->ajs:I
 
-    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$f;->ajk:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$f;->ajt:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -57,14 +57,14 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajr: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
 
     return-void
 
     :cond_0
-    iget p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajj:I
+    iget p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajs:I
 
     const/4 v1, 0x0
 
@@ -74,11 +74,11 @@
 
     if-eq p1, v2, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajr: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;->ajk:Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajt:Landroid/os/Bundle;
 
     if-eqz p1, :cond_1
 
@@ -95,7 +95,7 @@
     :cond_1
     new-instance p1, Lcom/google/android/gms/common/ConnectionResult;
 
-    iget v0, p0, Lcom/google/android/gms/common/internal/c$f;->ajj:I
+    iget v0, p0, Lcom/google/android/gms/common/internal/c$f;->ajs:I
 
     invoke-direct {p1, v0, v1}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
 
@@ -104,7 +104,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->ma()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->md()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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$f;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->mb()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/common/internal/c;->me()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;->mU()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c$f;->mX()Z
 
     move-result p1
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$f;->ajr: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 mU()Z
+.method protected abstract mX()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 49a22cbb03..7bec6a7161 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 aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -127,9 +127,9 @@
     if-ne v0, v3, :cond_3
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/c;->lU()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/internal/c;->lX()Z
 
     move-result v0
 
@@ -148,7 +148,7 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iget-object p1, p1, Lcom/google/android/gms/common/internal/c;->ajd: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->mk()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->mn()V
 
     :cond_b
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->bb(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$g;->ajr: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;->mV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/common/internal/c$h;->mY()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 7ec4150197..795c161f5e 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 aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr:Lcom/google/android/gms/common/internal/c;
 
-.field private ajl:Ljava/lang/Object;
+.field private aju:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private ajm:Z
+.field private ajv:Z
 
 
 # direct methods
@@ -48,15 +48,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$h;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajr: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;->ajl:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/c$h;->aju:Ljava/lang/Object;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajm:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/internal/c$h;->ajv:Z
 
     return-void
 .end method
@@ -73,15 +73,15 @@
     .end annotation
 .end method
 
-.method public final mV()V
+.method public final mY()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajl:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->aju:Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/common/internal/c$h;->ajm:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/common/internal/c$h;->ajv: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;->ajm:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajv: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;->ajl:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->aju: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$h;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c$h;->ajr: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 f5f4aca186..6d4b5afca6 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 ajn:Lcom/google/android/gms/common/internal/c;
+.field private ajw:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajo:I
+.field private final ajx: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;->ajn:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->ajw:Lcom/google/android/gms/common/internal/c;
 
-    iput p2, p0, Lcom/google/android/gms/common/internal/c$i;->ajo:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$i;->ajx: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;->ajn:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajw: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;->ajn:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajw:Lcom/google/android/gms/common/internal/c;
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/c$i;->ajo:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c$i;->ajx: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;->ajn:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$i;->ajw: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;->ajn:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajw: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;->ajn:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$i;->ajw: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;->akv:Landroid/os/Bundle;
+    iget-object p3, p3, Lcom/google/android/gms/common/internal/zzb;->akE: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 492ef6225d..a937c308f0 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 aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajo:I
+.field private final ajx: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->ajo:I
+    iput p2, p0, Lcom/google/android/gms/common/internal/c$j;->ajx: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajr:Lcom/google/android/gms/common/internal/c;
 
     if-nez p2, :cond_1
 
@@ -99,11 +99,11 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajr:Lcom/google/android/gms/common/internal/c;
 
     const/4 p2, 0x0
 
-    iget v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajo:I
+    iget v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajx:I
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/gms/common/internal/c;->w(II)V
 
@@ -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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$j;->ajr: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;->ajo:I
+    iget v2, p0, Lcom/google/android/gms/common/internal/c$j;->ajx: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 e09d6bc94a..52fcd20d5d 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 aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr:Lcom/google/android/gms/common/internal/c;
 
-.field private final ajp:Landroid/os/IBinder;
+.field private final ajy: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->ajp:Landroid/os/IBinder;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/c$k;->ajy: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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 mU()Z
+.method protected final mX()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;->ajp:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajy: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->mb()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->me()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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c$k;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->mb()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/common/internal/c;->me()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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajp:Landroid/os/IBinder;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajy:Landroid/os/IBinder;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/common/internal/c;->a(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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$k;->ajr: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;->mj()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/internal/c$a;->mm()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 31414a7fc0..01bb80fe36 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 aji:Lcom/google/android/gms/common/internal/c;
+.field private final synthetic ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c$l;->ajr: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd: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;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajr: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 mU()Z
+.method protected final mX()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->aji:Lcom/google/android/gms/common/internal/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c$l;->ajr:Lcom/google/android/gms/common/internal/c;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
 
-    sget-object v1, Lcom/google/android/gms/common/ConnectionResult;->aeU:Lcom/google/android/gms/common/ConnectionResult;
+    sget-object v1, Lcom/google/android/gms/common/ConnectionResult;->afd: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 8206067f8a..d763fe62c9 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,37 +31,37 @@
 
 
 # static fields
-.field private static final aiI:[Lcom/google/android/gms/common/Feature;
+.field private static final aiR:[Lcom/google/android/gms/common/Feature;
 
-.field public static final ajh:[Ljava/lang/String;
+.field public static final ajq:[Ljava/lang/String;
 
 
 # instance fields
-.field private aiJ:I
+.field private aiS:I
 
-.field private aiK:J
+.field private aiT:J
 
-.field private aiL:J
+.field private aiU:J
 
-.field private aiM:I
+.field private aiV:I
 
-.field private aiN:J
+.field private aiW:J
 
-.field private aiO:Lcom/google/android/gms/common/internal/aj;
+.field private aiX:Lcom/google/android/gms/common/internal/aj;
 
-.field private final aiP:Landroid/os/Looper;
+.field private final aiY:Landroid/os/Looper;
 
-.field private final aiQ:Lcom/google/android/gms/common/internal/h;
+.field private final aiZ:Lcom/google/android/gms/common/internal/h;
 
-.field private final aiR:Lcom/google/android/gms/common/c;
+.field private final aja:Lcom/google/android/gms/common/c;
 
-.field private final aiS:Ljava/lang/Object;
+.field private final ajb:Ljava/lang/Object;
 
-.field private aiT:Lcom/google/android/gms/common/internal/n;
+.field private ajc:Lcom/google/android/gms/common/internal/n;
 
-.field protected aiU:Lcom/google/android/gms/common/internal/c$c;
+.field protected ajd:Lcom/google/android/gms/common/internal/c$c;
 
-.field private aiV:Landroid/os/IInterface;
+.field private aje:Landroid/os/IInterface;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -69,7 +69,7 @@
     .end annotation
 .end field
 
-.field private final aiW:Ljava/util/ArrayList;
+.field private final ajf:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -79,7 +79,7 @@
     .end annotation
 .end field
 
-.field private aiX:Lcom/google/android/gms/common/internal/c$j;
+.field private ajg:Lcom/google/android/gms/common/internal/c$j;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/internal/c$j;"
@@ -87,23 +87,23 @@
     .end annotation
 .end field
 
-.field private aiY:I
+.field private ajh:I
 
-.field private final aiZ:Lcom/google/android/gms/common/internal/c$a;
+.field private final aji:Lcom/google/android/gms/common/internal/c$a;
 
-.field private final aja:Lcom/google/android/gms/common/internal/c$b;
+.field private final ajj:Lcom/google/android/gms/common/internal/c$b;
 
-.field private final ajb:I
+.field private final ajk:I
 
-.field private final ajc:Ljava/lang/String;
+.field private final ajl:Ljava/lang/String;
 
-.field private ajd:Lcom/google/android/gms/common/ConnectionResult;
+.field private ajm:Lcom/google/android/gms/common/ConnectionResult;
 
-.field private aje:Z
+.field private ajn:Z
 
-.field private volatile ajf:Lcom/google/android/gms/common/internal/zzb;
+.field private volatile ajo:Lcom/google/android/gms/common/internal/zzb;
 
-.field protected ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+.field protected ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private 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;->aiI:[Lcom/google/android/gms/common/Feature;
+    sput-object v1, Lcom/google/android/gms/common/internal/c;->aiR:[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;->ajh:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/common/internal/c;->ajq:[Ljava/lang/String;
 
     return-void
 .end method
@@ -148,7 +148,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->aiS:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajb: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;->aiW:Ljava/util/ArrayList;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajf:Ljava/util/ArrayList;
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/c;->aiY:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajm:Lcom/google/android/gms/common/ConnectionResult;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->aje:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ajn:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajf:Lcom/google/android/gms/common/internal/zzb;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajo: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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajp: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;->aiP:Landroid/os/Looper;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiY: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;->aiQ:Lcom/google/android/gms/common/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiZ: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;->aiR:Lcom/google/android/gms/common/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aja: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;->ajb:I
+    iput p5, p0, Lcom/google/android/gms/common/internal/c;->ajk:I
 
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/c;->aiZ:Lcom/google/android/gms/common/internal/c$a;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/c;->aji:Lcom/google/android/gms/common/internal/c$a;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/c;->aja:Lcom/google/android/gms/common/internal/c$b;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/c;->ajj:Lcom/google/android/gms/common/internal/c$b;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/c;->ajc:Ljava/lang/String;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/c;->ajl: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;->ajd:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajm: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;->aiT:Lcom/google/android/gms/common/internal/n;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajc: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;->aiY:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiV:Landroid/os/IInterface;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/c;->aje:Landroid/os/IInterface;
 
     if-eq p1, v1, :cond_6
 
@@ -374,23 +374,23 @@
     goto/16 :goto_3
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX: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;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akJ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)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;->aiQ:Lcom/google/android/gms/common/internal/h;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->aiZ:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
+    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajQ:I
+    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajZ:I
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mN()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajp: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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajp: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;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajg: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;->ma()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->md()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;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiQ:Lcom/google/android/gms/common/internal/h;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiZ:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akJ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget v1, v1, Lcom/google/android/gms/common/internal/aj;->ajQ:I
+    iget v1, v1, Lcom/google/android/gms/common/internal/aj;->ajZ:I
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mN()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
@@ -517,13 +517,13 @@
 
     const-string p1, "GmsClient"
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akJ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -569,7 +569,7 @@
 
     const/16 p1, 0x10
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -580,27 +580,27 @@
     goto :goto_3
 
     :cond_6
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
 
     if-eqz p1, :cond_7
 
-    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->aiQ:Lcom/google/android/gms/common/internal/h;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->aiZ:Lcom/google/android/gms/common/internal/h;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/common/internal/aj;->akS:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
+    iget-object v6, p1, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
 
-    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajQ:I
+    iget v7, p1, Lcom/google/android/gms/common/internal/aj;->ajZ:I
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/c;->ajg:Lcom/google/android/gms/common/internal/c$j;
 
-    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mN()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mQ()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;->aiX:Lcom/google/android/gms/common/internal/c$j;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajg: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;->mP()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mS()Z
 
     move-result v0
 
@@ -639,7 +639,7 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->aje:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/common/internal/c;->ajn: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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajp: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;->ajf:Lcom/google/android/gms/common/internal/zzb;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajo: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;->aiY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh: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;->aiS:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajb: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;->mT()Z
+    invoke-direct {p0}, Lcom/google/android/gms/common/internal/c;->mW()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;->aje:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/common/internal/c;->ajn: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;->ajd:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajm: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;->aiZ:Lcom/google/android/gms/common/internal/c$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->aji: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;->aiW:Ljava/util/ArrayList;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajf: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;->aja:Lcom/google/android/gms/common/internal/c$b;
+    iget-object p0, p0, Lcom/google/android/gms/common/internal/c;->ajj:Lcom/google/android/gms/common/internal/c$b;
 
     return-object p0
 .end method
 
-.method private final mN()Ljava/lang/String;
+.method private final mQ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajc:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajl:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -815,7 +815,7 @@
     return-object v0
 .end method
 
-.method private final mP()Z
+.method private final mS()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;->aiY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
     const/4 v2, 0x3
 
@@ -851,10 +851,10 @@
     throw v1
 .end method
 
-.method private final mT()Z
+.method private final mW()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/c;->aje:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/internal/c;->ajn:Z
 
     const/4 v1, 0x0
 
@@ -863,7 +863,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mb()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->me()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;->mb()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->me()Ljava/lang/String;
 
     move-result-object v0
 
@@ -950,7 +950,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiL:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiU:J
 
     return-void
 .end method
@@ -960,13 +960,13 @@
 
     iget p1, p1, Lcom/google/android/gms/common/ConnectionResult;->zzh:I
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/c;->aiM:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->aiV:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiN:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiW:J
 
     return-void
 .end method
@@ -982,7 +982,7 @@
 
     check-cast p1, Lcom/google/android/gms/common/internal/c$c;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajd:Lcom/google/android/gms/common/internal/c$c;
 
     const/4 p1, 0x2
 
@@ -996,7 +996,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;->mI()V
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/c$e;->mL()V
 
     return-void
 .end method
@@ -1013,13 +1013,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mQ()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mT()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;->ajb:I
+    iget v2, p0, Lcom/google/android/gms/common/internal/c;->ajk:I
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/common/internal/GetServiceRequest;-><init>(I)V
 
@@ -1031,7 +1031,7 @@
 
     iput-object v2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->zzy:Ljava/lang/String;
 
-    iput-object v0, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajH:Landroid/os/Bundle;
+    iput-object v0, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajQ:Landroid/os/Bundle;
 
     if-eqz p2, :cond_0
 
@@ -1047,22 +1047,22 @@
 
     check-cast p2, [Lcom/google/android/gms/common/api/Scope;
 
-    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajG:[Lcom/google/android/gms/common/api/Scope;
+    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajP:[Lcom/google/android/gms/common/api/Scope;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lV()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lY()Z
 
     move-result p2
 
     if-eqz p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lS()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lV()Landroid/accounts/Account;
 
     move-result-object p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lS()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->lV()Landroid/accounts/Account;
 
     move-result-object p2
 
@@ -1078,7 +1078,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;->ajI:Landroid/accounts/Account;
+    iput-object p2, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajR:Landroid/accounts/Account;
 
     if-eqz p1, :cond_2
 
@@ -1086,17 +1086,17 @@
 
     move-result-object p1
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajF:Landroid/os/IBinder;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajO:Landroid/os/IBinder;
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/common/internal/c;->aiI:[Lcom/google/android/gms/common/Feature;
+    sget-object p1, Lcom/google/android/gms/common/internal/c;->aiR:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajJ:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajS:[Lcom/google/android/gms/common/Feature;
 
-    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajK:[Lcom/google/android/gms/common/Feature;
+    iput-object p1, v1, Lcom/google/android/gms/common/internal/GetServiceRequest;->ajT:[Lcom/google/android/gms/common/Feature;
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->aiS:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/c;->ajb:Ljava/lang/Object;
 
     monitor-enter p1
     :try_end_0
@@ -1106,15 +1106,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;->aiT:Lcom/google/android/gms/common/internal/n;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/n;
 
     if-eqz p2, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/n;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajc: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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1170,7 +1170,7 @@
 
     const/16 p1, 0x8
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {p2}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1200,7 +1200,7 @@
 
     const/4 p2, 0x6
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1220,13 +1220,13 @@
 .method public bb(I)V
     .locals 2
 
-    iput p1, p0, Lcom/google/android/gms/common/internal/c;->aiJ:I
+    iput p1, p0, Lcom/google/android/gms/common/internal/c;->aiS:I
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiK:J
+    iput-wide v0, p0, Lcom/google/android/gms/common/internal/c;->aiT: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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajp: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;->aiW:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajf:Ljava/util/ArrayList;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiW:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajf: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;->aiW:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/c;->ajf: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;->aiW:Ljava/util/ArrayList;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajf: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;->aiS:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajb:Ljava/lang/Object;
 
     monitor-enter v1
 
     const/4 v0, 0x0
 
     :try_start_1
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiT:Lcom/google/android/gms/common/internal/n;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajc:Lcom/google/android/gms/common/internal/n;
 
     monitor-exit v1
     :try_end_1
@@ -1339,7 +1339,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->aiY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
     const/4 v2, 0x4
 
@@ -1367,7 +1367,7 @@
     throw v1
 .end method
 
-.method public lS()Landroid/accounts/Account;
+.method public lV()Landroid/accounts/Account;
     .locals 1
 
     const/4 v0, 0x0
@@ -1375,7 +1375,7 @@
     return-object v0
 .end method
 
-.method public final lU()Z
+.method public final lX()Z
     .locals 3
 
     iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->mLock:Ljava/lang/Object;
@@ -1383,13 +1383,13 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->aiY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
     const/4 v2, 0x2
 
     if-eq v1, v2, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->aiY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
     const/4 v2, 0x3
 
@@ -1421,7 +1421,7 @@
     throw v1
 .end method
 
-.method public lV()Z
+.method public lY()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1429,7 +1429,7 @@
     return v0
 .end method
 
-.method public lW()Z
+.method public lZ()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -1437,66 +1437,14 @@
     return v0
 .end method
 
-.method public final lX()Ljava/lang/String;
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->isConnected()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiO:Lcom/google/android/gms/common/internal/aj;
-
-    if-eqz v0, :cond_0
-
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akK:Ljava/lang/String;
-
-    return-object v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/RuntimeException;
-
-    const-string v1, "Failed to connect when checking package"
-
-    invoke-direct {v0, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public lY()I
-    .locals 1
-
-    sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
-
-    return v0
-.end method
-
-.method public final lZ()[Lcom/google/android/gms/common/Feature;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajf:Lcom/google/android/gms/common/internal/zzb;
-
-    if-nez v0, :cond_0
-
-    const/4 v0, 0x0
-
-    return-object v0
-
-    :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/zzb;->akw:[Lcom/google/android/gms/common/Feature;
-
-    return-object v0
-.end method
-
-.method public final mO()V
+.method public final mR()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiR:Lcom/google/android/gms/common/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aja: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;->lY()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->mb()I
 
     move-result v2
 
@@ -1524,13 +1472,13 @@
 
     check-cast v1, Lcom/google/android/gms/common/internal/c$c;
 
-    iput-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiU:Lcom/google/android/gms/common/internal/c$c;
+    iput-object v1, p0, Lcom/google/android/gms/common/internal/c;->ajd: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;->ajg:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/c;->ajp:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v4}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -1554,7 +1502,7 @@
     return-void
 .end method
 
-.method public mQ()Landroid/os/Bundle;
+.method public mT()Landroid/os/Bundle;
     .locals 1
 
     new-instance v0, Landroid/os/Bundle;
@@ -1564,7 +1512,7 @@
     return-object v0
 .end method
 
-.method public final mR()Landroid/os/IInterface;
+.method public final mU()Landroid/os/IInterface;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1583,7 +1531,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget v1, p0, Lcom/google/android/gms/common/internal/c;->aiY:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/c;->ajh:I
 
     const/4 v2, 0x5
 
@@ -1595,7 +1543,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aiV:Landroid/os/IInterface;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aje:Landroid/os/IInterface;
 
     if-eqz v1, :cond_0
 
@@ -1611,7 +1559,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;->aiV:Landroid/os/IInterface;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/c;->aje:Landroid/os/IInterface;
 
     monitor-exit v0
 
@@ -1643,7 +1591,7 @@
     throw v1
 .end method
 
-.method protected mS()Ljava/util/Set;
+.method protected mV()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1659,10 +1607,62 @@
     return-object v0
 .end method
 
-.method protected abstract ma()Ljava/lang/String;
+.method public final ma()Ljava/lang/String;
+    .locals 2
+
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/c;->isConnected()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->aiX:Lcom/google/android/gms/common/internal/aj;
+
+    if-eqz v0, :cond_0
+
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/aj;->akT:Ljava/lang/String;
+
+    return-object v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/RuntimeException;
+
+    const-string v1, "Failed to connect when checking package"
+
+    invoke-direct {v0, v1}, Ljava/lang/RuntimeException;-><init>(Ljava/lang/String;)V
+
+    throw v0
 .end method
 
-.method protected abstract mb()Ljava/lang/String;
+.method public mb()I
+    .locals 1
+
+    sget v0, Lcom/google/android/gms/common/c;->GOOGLE_PLAY_SERVICES_VERSION_CODE:I
+
+    return v0
+.end method
+
+.method public final mc()[Lcom/google/android/gms/common/Feature;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/c;->ajo:Lcom/google/android/gms/common/internal/zzb;
+
+    if-nez v0, :cond_0
+
+    const/4 v0, 0x0
+
+    return-object v0
+
+    :cond_0
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/zzb;->akF:[Lcom/google/android/gms/common/Feature;
+
+    return-object v0
+.end method
+
+.method protected abstract md()Ljava/lang/String;
+.end method
+
+.method protected abstract me()Ljava/lang/String;
 .end method
 
 .method protected final w(II)V
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 4284511e44..464f6c065a 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,19 +14,7 @@
 
 
 # instance fields
-.field public ajB:Landroidx/collection/ArraySet;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Landroidx/collection/ArraySet<",
-            "Lcom/google/android/gms/common/api/Scope;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public ajq:Landroid/accounts/Account;
-
-.field private ajt:Ljava/util/Map;
+.field private ajC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -38,17 +26,29 @@
     .end annotation
 .end field
 
-.field private aju:I
+.field private ajD:I
 
-.field private ajv:Landroid/view/View;
+.field private ajE:Landroid/view/View;
 
-.field public ajw:Ljava/lang/String;
+.field public ajF:Ljava/lang/String;
 
-.field public ajx:Ljava/lang/String;
+.field public ajG:Ljava/lang/String;
 
-.field private ajy:Lcom/google/android/gms/signin/a;
+.field private ajH:Lcom/google/android/gms/signin/a;
 
-.field private ajz:Z
+.field private ajI:Z
+
+.field public ajK:Landroidx/collection/ArraySet;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Landroidx/collection/ArraySet<",
+            "Lcom/google/android/gms/common/api/Scope;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public ajz:Landroid/accounts/Account;
 
 
 # direct methods
@@ -59,39 +59,39 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/common/internal/d$a;->aju:I
+    iput v0, p0, Lcom/google/android/gms/common/internal/d$a;->ajD:I
 
-    sget-object v0, Lcom/google/android/gms/signin/a;->aLg:Lcom/google/android/gms/signin/a;
+    sget-object v0, Lcom/google/android/gms/signin/a;->aLp:Lcom/google/android/gms/signin/a;
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/d$a;->ajy:Lcom/google/android/gms/signin/a;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/d$a;->ajH:Lcom/google/android/gms/signin/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final mW()Lcom/google/android/gms/common/internal/d;
+.method public final mZ()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;->ajq:Landroid/accounts/Account;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/d$a;->ajz:Landroid/accounts/Account;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/d$a;->ajB:Landroidx/collection/ArraySet;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/d$a;->ajK:Landroidx/collection/ArraySet;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/internal/d$a;->ajt:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/d$a;->ajC:Ljava/util/Map;
 
-    iget v4, p0, Lcom/google/android/gms/common/internal/d$a;->aju:I
+    iget v4, p0, Lcom/google/android/gms/common/internal/d$a;->ajD:I
 
-    iget-object v5, p0, Lcom/google/android/gms/common/internal/d$a;->ajv:Landroid/view/View;
+    iget-object v5, p0, Lcom/google/android/gms/common/internal/d$a;->ajE:Landroid/view/View;
 
-    iget-object v6, p0, Lcom/google/android/gms/common/internal/d$a;->ajw:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/common/internal/d$a;->ajF:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/common/internal/d$a;->ajx:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/android/gms/common/internal/d$a;->ajG:Ljava/lang/String;
 
-    iget-object v8, p0, Lcom/google/android/gms/common/internal/d$a;->ajy:Lcom/google/android/gms/signin/a;
+    iget-object v8, p0, Lcom/google/android/gms/common/internal/d$a;->ajH:Lcom/google/android/gms/signin/a;
 
-    iget-boolean v9, p0, Lcom/google/android/gms/common/internal/d$a;->ajz:Z
+    iget-boolean v9, p0, Lcom/google/android/gms/common/internal/d$a;->ajI: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 8d850a1a8f..660ec17edd 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 ahu:Ljava/util/Set;
+.field public final ahD: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 eb62a99bf1..87da7ff733 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,11 +12,7 @@
 
 
 # instance fields
-.field public ajA:Ljava/lang/Integer;
-
-.field public final ajq:Landroid/accounts/Account;
-
-.field public final ajr:Ljava/util/Set;
+.field public final ajA:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -26,7 +22,7 @@
     .end annotation
 .end field
 
-.field final ajs:Ljava/util/Set;
+.field final ajB:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -36,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final ajt:Ljava/util/Map;
+.field private final ajC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -48,17 +44,21 @@
     .end annotation
 .end field
 
-.field private final aju:I
+.field private final ajD:I
 
-.field private final ajv:Landroid/view/View;
+.field private final ajE:Landroid/view/View;
 
-.field public final ajw:Ljava/lang/String;
+.field public final ajF:Ljava/lang/String;
 
-.field final ajx:Ljava/lang/String;
+.field final ajG:Ljava/lang/String;
 
-.field public final ajy:Lcom/google/android/gms/signin/a;
+.field public final ajH:Lcom/google/android/gms/signin/a;
 
-.field private final ajz:Z
+.field private final ajI:Z
+
+.field public ajJ:Ljava/lang/Integer;
+
+.field public final ajz:Landroid/accounts/Account;
 
 
 # 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;->ajq:Landroid/accounts/Account;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ajz: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;->ajr:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ajA: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;->ajt:Ljava/util/Map;
+    iput-object p3, p0, Lcom/google/android/gms/common/internal/d;->ajC:Ljava/util/Map;
 
-    iput-object p5, p0, Lcom/google/android/gms/common/internal/d;->ajv:Landroid/view/View;
+    iput-object p5, p0, Lcom/google/android/gms/common/internal/d;->ajE:Landroid/view/View;
 
-    iput p4, p0, Lcom/google/android/gms/common/internal/d;->aju:I
+    iput p4, p0, Lcom/google/android/gms/common/internal/d;->ajD:I
 
-    iput-object p6, p0, Lcom/google/android/gms/common/internal/d;->ajw:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/common/internal/d;->ajx:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/common/internal/d;->ajG:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/common/internal/d;->ajy:Lcom/google/android/gms/signin/a;
+    iput-object p8, p0, Lcom/google/android/gms/common/internal/d;->ajH:Lcom/google/android/gms/signin/a;
 
-    iput-boolean p9, p0, Lcom/google/android/gms/common/internal/d;->ajz:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/common/internal/d;->ajI:Z
 
     new-instance p1, Ljava/util/HashSet;
 
-    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ajr:Ljava/util/Set;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ajA: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;->ajt:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/d;->ajC: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;->ahu:Ljava/util/Set;
+    iget-object p3, p3, Lcom/google/android/gms/common/internal/d$b;->ahD: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;->ajs:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/d;->ajB: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 fd30bc68b8..6c81034e4e 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 ajC:Landroidx/collection/SimpleArrayMap;
+.field private static final ajL: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;->ajC:Landroidx/collection/SimpleArrayMap;
+    sput-object v0, Lcom/google/android/gms/common/internal/e;->ajL:Landroidx/collection/SimpleArrayMap;
 
     return-void
 .end method
@@ -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;->ajC:Landroidx/collection/SimpleArrayMap;
+    sget-object v0, Lcom/google/android/gms/common/internal/e;->ajL:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/internal/e;->ajC:Landroidx/collection/SimpleArrayMap;
+    sget-object v1, Lcom/google/android/gms/common/internal/e;->ajL: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;->ajC:Landroidx/collection/SimpleArrayMap;
+    sget-object v1, Lcom/google/android/gms/common/internal/e;->ajL: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 b23652a467..fbdb5985d7 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 mX()V
+.method protected abstract na()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;->mX()V
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/f;->na()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 f61819ba74..e0f7b48ebf 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 ahu:Ljava/util/Set;
+.field private final ahD:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final ahv:Lcom/google/android/gms/common/internal/d;
+.field private final ahE:Lcom/google/android/gms/common/internal/d;
 
-.field private final ajq:Landroid/accounts/Account;
+.field private final ajz:Landroid/accounts/Account;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->ajx:Ljava/lang/String;
+    iget-object v8, v10, Lcom/google/android/gms/common/internal/d;->ajG: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;->ahv:Lcom/google/android/gms/common/internal/d;
+    iput-object v10, v9, Lcom/google/android/gms/common/internal/g;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajq:Landroid/accounts/Account;
+    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajz:Landroid/accounts/Account;
 
-    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ajq:Landroid/accounts/Account;
+    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ajz:Landroid/accounts/Account;
 
-    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajs:Ljava/util/Set;
+    iget-object v0, v10, Lcom/google/android/gms/common/internal/d;->ajB:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -177,32 +177,22 @@
     throw v0
 
     :cond_3
-    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ahu:Ljava/util/Set;
+    iput-object v0, v9, Lcom/google/android/gms/common/internal/g;->ahD:Ljava/util/Set;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final lS()Landroid/accounts/Account;
+.method public final lV()Landroid/accounts/Account;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ajq:Landroid/accounts/Account;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ajz:Landroid/accounts/Account;
 
     return-object v0
 .end method
 
-.method public lY()I
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/c;->lY()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method protected final mS()Ljava/util/Set;
+.method protected final mV()Ljava/util/Set;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -213,7 +203,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ahu:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/g;->ahD:Ljava/util/Set;
 
     return-object v0
 .end method
+
+.method public mb()I
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/c;->mb()I
+
+    move-result v0
+
+    return v0
+.end method
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 9c4c1f8153..168da002ca 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 ajO:Ljava/lang/String;
+.field private final ajX:Ljava/lang/String;
 
-.field final ajP:Ljava/lang/String;
+.field final ajY:Ljava/lang/String;
 
-.field final ajQ:I
+.field final ajZ:I
 
 .field final mComponentName:Landroid/content/ComponentName;
 
@@ -33,19 +33,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ajO:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ajX:Ljava/lang/String;
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ajP:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/h$a;->ajY: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;->ajQ:I
+    iput p3, p0, Lcom/google/android/gms/common/internal/h$a;->ajZ: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;->ajO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajX:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajO:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajX: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;->ajP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajY:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajP:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/common/internal/h$a;->ajY: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;->ajQ:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajZ:I
 
-    iget p1, p1, Lcom/google/android/gms/common/internal/h$a;->ajQ:I
+    iget p1, p1, Lcom/google/android/gms/common/internal/h$a;->ajZ: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;->ajO:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajX:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajP:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajY: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;->ajQ:I
+    iget v1, p0, Lcom/google/android/gms/common/internal/h$a;->ajZ:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -157,10 +157,10 @@
     return v0
 .end method
 
-.method public final mY()Landroid/content/Intent;
+.method public final nb()Landroid/content/Intent;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajX: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;->ajP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajY: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;->ajO:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/h$a;->ajX: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 a33858ac98..7ad0709363 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 ajM:Ljava/lang/Object;
+.field private static final ajV:Ljava/lang/Object;
 
-.field private static ajN:Lcom/google/android/gms/common/internal/h;
+.field private static ajW: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;->ajM:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/internal/h;->ajV: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;->ajM:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/internal/h;->ajV:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/internal/h;->ajN:Lcom/google/android/gms/common/internal/h;
+    sget-object v1, Lcom/google/android/gms/common/internal/h;->ajW: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;->ajN:Lcom/google/android/gms/common/internal/h;
+    sput-object v1, Lcom/google/android/gms/common/internal/h;->ajW: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;->ajN:Lcom/google/android/gms/common/internal/h;
+    sget-object p0, Lcom/google/android/gms/common/internal/h;->ajW: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 ef2c04cd26..e339dd4c8e 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 ajR:I = 0xf
+.field private static final aka:I = 0xf
 
-.field private static final ajS:Ljava/lang/String;
+.field private static final akb:Ljava/lang/String;
 
 
 # instance fields
-.field private final ajT:Ljava/lang/String;
+.field private final akc:Ljava/lang/String;
 
-.field private final ajU:Ljava/lang/String;
+.field private final akd: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;->ajT:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->akc:Ljava/lang/String;
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
@@ -76,12 +76,12 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->ajU:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/i;->akd:Ljava/lang/String;
 
     return-void
 
     :cond_1
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/i;->ajU:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/i;->akd:Ljava/lang/String;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 .method final aS(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->ajU:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->akd:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
@@ -108,7 +108,7 @@
 .method public final bc(I)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->ajT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/i;->akc: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 ec71098fc2..71a3f7f515 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 ajV:Landroid/util/SparseIntArray;
+.field public final ake:Landroid/util/SparseIntArray;
 
-.field private ajW:Lcom/google/android/gms/common/c;
+.field private akf:Lcom/google/android/gms/common/c;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lP()Lcom/google/android/gms/common/GoogleApiAvailability;
+    invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->lS()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;->ajV:Landroid/util/SparseIntArray;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/j;->ake: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;->ajW:Lcom/google/android/gms/common/c;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/j;->akf: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;->lW()Z
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lZ()Z
 
     move-result v0
 
@@ -59,11 +59,11 @@
     return v1
 
     :cond_0
-    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->lY()I
+    invoke-interface {p2}, Lcom/google/android/gms/common/api/a$f;->mb()I
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->ajV:Landroid/util/SparseIntArray;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->ake: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;->ajV:Landroid/util/SparseIntArray;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->ake: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;->ajV:Landroid/util/SparseIntArray;
+    iget-object v4, p0, Lcom/google/android/gms/common/internal/j;->ake: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;->ajV:Landroid/util/SparseIntArray;
+    iget-object v5, p0, Lcom/google/android/gms/common/internal/j;->ake: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;->ajW:Lcom/google/android/gms/common/c;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/j;->akf: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;->ajV:Landroid/util/SparseIntArray;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/j;->ake: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 30a1233d6e..cf2c6c5002 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 lS()Landroid/accounts/Account;
+.method public final lV()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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()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 d4bf7ba483..5da2a74b88 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;->lS()Landroid/accounts/Account;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/internal/k$a;->lV()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 392af0221a..85e52e0164 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 lS()Landroid/accounts/Account;
+.method public abstract lV()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 35056ba2a6..551308f0b4 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 ajX:Landroid/os/IBinder;
+.field private final akg: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;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/n$a$a;->akg: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;->ajX:Landroid/os/IBinder;
+    iget-object p2, p0, Lcom/google/android/gms/common/internal/n$a$a;->akg: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;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/n$a$a;->akg: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 c4f0439404..3606dcb829 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 ajY:Lcom/google/android/gms/common/internal/i;
+.field private static final akh:Lcom/google/android/gms/common/internal/i;
 
-.field private static ajZ:Lcom/google/android/gms/common/internal/o;
+.field private static aki:Lcom/google/android/gms/common/internal/o;
 
 
 # instance fields
-.field private aka:Ljava/util/concurrent/ConcurrentHashMap;
+.field private akj: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;->ajY:Lcom/google/android/gms/common/internal/i;
+    sput-object v0, Lcom/google/android/gms/common/internal/o;->akh: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;->ajZ:Lcom/google/android/gms/common/internal/o;
+    sput-object v0, Lcom/google/android/gms/common/internal/o;->aki:Lcom/google/android/gms/common/internal/o;
 
     return-void
 .end method
@@ -53,15 +53,15 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/common/internal/o;->aka:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/common/internal/o;->akj:Ljava/util/concurrent/ConcurrentHashMap;
 
     return-void
 .end method
 
-.method public static mZ()Lcom/google/android/gms/common/internal/o;
+.method public static nc()Lcom/google/android/gms/common/internal/o;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/internal/o;->ajZ:Lcom/google/android/gms/common/internal/o;
+    sget-object v0, Lcom/google/android/gms/common/internal/o;->aki:Lcom/google/android/gms/common/internal/o;
 
     return-object v0
 .end method
@@ -79,7 +79,7 @@
 
     invoke-static {p1, v2}, Lcom/google/android/gms/common/internal/r;->j(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/internal/o;->aka:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v2, p0, Lcom/google/android/gms/common/internal/o;->akj: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;->aka:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->akj: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;->ajY:Lcom/google/android/gms/common/internal/i;
+    sget-object v2, Lcom/google/android/gms/common/internal/o;->akh:Lcom/google/android/gms/common/internal/i;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -192,7 +192,7 @@
     goto :goto_2
 
     :cond_1
-    sget-object v2, Lcom/google/android/gms/common/internal/o;->ajY:Lcom/google/android/gms/common/internal/i;
+    sget-object v2, Lcom/google/android/gms/common/internal/o;->akh:Lcom/google/android/gms/common/internal/i;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -235,7 +235,7 @@
     :catch_0
     move-exception v2
 
-    sget-object v5, Lcom/google/android/gms/common/internal/o;->ajY:Lcom/google/android/gms/common/internal/i;
+    sget-object v5, Lcom/google/android/gms/common/internal/o;->akh:Lcom/google/android/gms/common/internal/i;
 
     invoke-static {p1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -277,7 +277,7 @@
     :goto_2
     if-nez v4, :cond_6
 
-    sget-object v0, Lcom/google/android/gms/common/internal/o;->ajY:Lcom/google/android/gms/common/internal/i;
+    sget-object v0, Lcom/google/android/gms/common/internal/o;->akh:Lcom/google/android/gms/common/internal/i;
 
     const/4 v2, 0x3
 
@@ -299,7 +299,7 @@
     const-string v4, "UNKNOWN"
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->aka:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/o;->akj: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 518e373db7..fe608a17ea 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 akb:Ljava/util/List;
+.field private final akk:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final akc:Ljava/lang/Object;
+.field private final akl: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;->akc:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->akl: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;->akb:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/p$a;->akk:Ljava/util/List;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method public final i(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;->akb:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/p$a;->akk: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;->akc:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->akl: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;->akb:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/p$a;->akk: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;->akb:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/common/internal/p$a;->akk: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 5dc8d2f44b..54b3723f4e 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 akd:Lcom/google/android/gms/common/internal/q$b;
+.field private static final akm: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;->akd:Lcom/google/android/gms/common/internal/q$b;
+    sput-object v0, Lcom/google/android/gms/common/internal/q;->akm: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/m;)V
 
-    sget-object p1, Lcom/google/android/gms/common/internal/q;->akd:Lcom/google/android/gms/common/internal/q$b;
+    sget-object p1, Lcom/google/android/gms/common/internal/q;->akm: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/j;->a(Lcom/google/android/gms/common/api/j$a;)V
 
-    iget-object p0, v1, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p0, v1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     return-object p0
 .end method
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 b1d3bc4bfa..2f74fdeb37 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 akj:Lcom/google/android/gms/common/api/a$h;
+.field public final aks: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;->akj:Lcom/google/android/gms/common/api/a$h;
+    iget-object p1, p0, Lcom/google/android/gms/common/internal/s;->aks:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->mc()Landroid/os/IInterface;
+    invoke-interface {p1}, Lcom/google/android/gms/common/api/a$h;->mf()Landroid/os/IInterface;
 
     move-result-object p1
 
     return-object p1
 .end method
 
-.method public final lY()I
+.method public final mb()I
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->lY()I
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->mb()I
 
     move-result v0
 
     return v0
 .end method
 
-.method protected final ma()Ljava/lang/String;
+.method protected final md()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->akj:Lcom/google/android/gms/common/api/a$h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aks:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->ma()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->md()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final mb()Ljava/lang/String;
+.method protected final me()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->akj:Lcom/google/android/gms/common/api/a$h;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/s;->aks:Lcom/google/android/gms/common/api/a$h;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->mb()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/a$h;->me()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 1739104a60..b7c5fcf920 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 akm:Landroid/content/Intent;
+.field private final synthetic akv: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;->akm:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/u;->akv: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 mX()V
+.method public final na()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->akm:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/u;->akv: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 83b9f0920d..5076308ed7 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 akm:Landroid/content/Intent;
+.field private final synthetic akv: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;->akm:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/v;->akv: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 mX()V
+.method public final na()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->akm:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/v;->akv: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 e762dc72a1..9b5e38ea98 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 akm:Landroid/content/Intent;
+.field private final synthetic akv:Landroid/content/Intent;
 
-.field private final synthetic akn:Lcom/google/android/gms/common/api/internal/g;
+.field private final synthetic akw: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;->akm:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/w;->akv:Landroid/content/Intent;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/w;->akn:Lcom/google/android/gms/common/api/internal/g;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/w;->akw:Lcom/google/android/gms/common/api/internal/g;
 
     const/4 p1, 0x2
 
@@ -29,14 +29,14 @@
 
 
 # virtual methods
-.method public final mX()V
+.method public final na()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->akm:Landroid/content/Intent;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/w;->akv:Landroid/content/Intent;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/common/internal/w;->akn:Lcom/google/android/gms/common/api/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/w;->akw: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 1ba3f044dd..051f6888f5 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 ako:Lcom/google/android/gms/common/api/i$a;
+.field private final synthetic akx:Lcom/google/android/gms/common/api/i$a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/i$a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/x;->ako:Lcom/google/android/gms/common/api/i$a;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/x;->akx:Lcom/google/android/gms/common/api/i$a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,22 +22,22 @@
 
 
 # virtual methods
-.method public final mj()V
+.method public final mm()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->ako:Lcom/google/android/gms/common/api/i$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->akx:Lcom/google/android/gms/common/api/i$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mj()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mm()V
 
     return-void
 .end method
 
-.method public final mk()V
+.method public final mn()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->ako:Lcom/google/android/gms/common/api/i$a;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/x;->akx:Lcom/google/android/gms/common/api/i$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mk()V
+    invoke-interface {v0}, Lcom/google/android/gms/common/api/i$a;->mn()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 8e038dfeff..40a1b2f68b 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 akp:Lcom/google/android/gms/common/api/i$b;
+.field private final synthetic aky:Lcom/google/android/gms/common/api/i$b;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/common/api/i$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/common/internal/y;->akp:Lcom/google/android/gms/common/api/i$b;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/y;->aky:Lcom/google/android/gms/common/api/i$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;->akp:Lcom/google/android/gms/common/api/i$b;
+    iget-object v0, p0, Lcom/google/android/gms/common/internal/y;->aky:Lcom/google/android/gms/common/api/i$b;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/common/api/i$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 5dd1098105..6c68dbe4f8 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 akv:Landroid/os/Bundle;
+.field akE:Landroid/os/Bundle;
 
-.field akw:[Lcom/google/android/gms/common/Feature;
+.field akF:[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;->akv:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/common/internal/zzb;->akE:Landroid/os/Bundle;
 
-    iput-object p2, p0, Lcom/google/android/gms/common/internal/zzb;->akw:[Lcom/google/android/gms/common/Feature;
+    iput-object p2, p0, Lcom/google/android/gms/common/internal/zzb;->akF:[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;->akv:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->akE: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;->akw:[Lcom/google/android/gms/common/Feature;
+    iget-object v1, p0, Lcom/google/android/gms/common/internal/zzb;->akF:[Lcom/google/android/gms/common/Feature;
 
     const/4 v2, 0x2
 
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 e6018c8423..8e82bebd0e 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,9 +6,9 @@
 
 
 # instance fields
-.field private final amo:Z
+.field private final amx:Z
 
-.field private final amp:Lcom/google/android/gms/common/n;
+.field private final amy:Lcom/google/android/gms/common/n;
 
 .field private final zzr:Ljava/lang/String;
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lcom/google/android/gms/common/m;->amo:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/common/m;->amx:Z
 
     iput-object p2, p0, Lcom/google/android/gms/common/m;->zzr:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/common/m;->amp:Lcom/google/android/gms/common/n;
+    iput-object p3, p0, Lcom/google/android/gms/common/m;->amy: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;->amo:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/m;->amx:Z
 
     iget-object v1, p0, Lcom/google/android/gms/common/m;->zzr:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/m;->amp:Lcom/google/android/gms/common/n;
+    iget-object v2, p0, Lcom/google/android/gms/common/m;->amy: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 4531113b5d..dd83b5fc0f 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
@@ -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;->ne()I
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->nh()I
 
     move-result v1
 
@@ -93,7 +93,7 @@
     return v0
 
     :cond_1
-    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->nd()Lcom/google/android/gms/a/a;
+    invoke-interface {p1}, Lcom/google/android/gms/common/internal/ak;->ng()Lcom/google/android/gms/a/a;
 
     move-result-object p1
 
@@ -108,7 +108,7 @@
 
     check-cast p1, [B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nD()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nG()[B
 
     move-result-object v1
 
@@ -142,13 +142,13 @@
     return v0
 .end method
 
-.method abstract nD()[B
+.method abstract nG()[B
 .end method
 
-.method public final nd()Lcom/google/android/gms/a/a;
+.method public final ng()Lcom/google/android/gms/a/a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nD()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/n;->nG()[B
 
     move-result-object v0
 
@@ -159,7 +159,7 @@
     return-object v0
 .end method
 
-.method public final ne()I
+.method public final nh()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 4e60b4ec7c..86aee1062b 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 amq:[B
+.field private final amz:[B
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/common/n;-><init>([B)V
 
-    iput-object p1, p0, Lcom/google/android/gms/common/o;->amq:[B
+    iput-object p1, p0, Lcom/google/android/gms/common/o;->amz:[B
 
     return-void
 .end method
 
 
 # virtual methods
-.method final nD()[B
+.method final nG()[B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/o;->amq:[B
+    iget-object v0, p0, Lcom/google/android/gms/common/o;->amz:[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 cfb5e5c1ee..8869c0a43d 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 ams:Ljava/lang/ref/WeakReference;
+.field private static final amB:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private amr:Ljava/lang/ref/WeakReference;
+.field private amA: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;->ams:Ljava/lang/ref/WeakReference;
+    sput-object v0, Lcom/google/android/gms/common/p;->amB:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
@@ -44,22 +44,22 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/common/n;-><init>([B)V
 
-    sget-object p1, Lcom/google/android/gms/common/p;->ams:Ljava/lang/ref/WeakReference;
+    sget-object p1, Lcom/google/android/gms/common/p;->amB:Ljava/lang/ref/WeakReference;
 
-    iput-object p1, p0, Lcom/google/android/gms/common/p;->amr:Ljava/lang/ref/WeakReference;
+    iput-object p1, p0, Lcom/google/android/gms/common/p;->amA:Ljava/lang/ref/WeakReference;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final nD()[B
+.method final nG()[B
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/p;->amr:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/gms/common/p;->amA: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;->nE()[B
+    invoke-virtual {p0}, Lcom/google/android/gms/common/p;->nH()[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;->amr:Ljava/lang/ref/WeakReference;
+    iput-object v1, p0, Lcom/google/android/gms/common/p;->amA:Ljava/lang/ref/WeakReference;
 
     :cond_0
     monitor-exit p0
@@ -94,5 +94,5 @@
     throw v0
 .end method
 
-.method protected abstract nE()[B
+.method protected abstract nH()[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 5293008bd6..1b645e55fe 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 amt:[Lcom/google/android/gms/common/n;
+.field static final amC:[Lcom/google/android/gms/common/n;
 
 
 # direct methods
@@ -42,7 +42,7 @@
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/common/q;->amt:[Lcom/google/android/gms/common/n;
+    sput-object v0, Lcom/google/android/gms/common/q;->amC:[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 95f1e5a61c..d6b7728b4b 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,7 +13,7 @@
 
 
 # virtual methods
-.method protected final nE()[B
+.method protected final nH()[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"
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 5a4cd4f140..81a48f6c77 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
@@ -16,34 +16,34 @@
 
 
 # virtual methods
-.method public abstract ni()J
+.method public abstract nl()J
 .end method
 
-.method public abstract nj()I
+.method public abstract nm()I
 .end method
 
-.method public abstract nk()J
+.method public abstract nn()J
 .end method
 
-.method public abstract nl()Ljava/lang/String;
+.method public abstract no()Ljava/lang/String;
 .end method
 
 .method public toString()Ljava/lang/String;
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->ni()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nl()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nm()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nk()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nn()J
 
     move-result-wide v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nl()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->no()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 aad1e6044c..0a230fc7da 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,21 +15,29 @@
 
 
 # instance fields
-.field private final aeD:I
+.field private final aeM:I
 
-.field private final alf:J
+.field private final alA:F
 
-.field private alg:I
+.field private final alB:J
 
-.field private final alh:Ljava/lang/String;
+.field private final alC:Z
 
-.field private final ali:Ljava/lang/String;
+.field private alD:J
 
-.field private final alj:Ljava/lang/String;
+.field private final alp:J
 
-.field private final alk:I
+.field private alq:I
 
-.field private final alm:Ljava/util/List;
+.field private final alr:Ljava/lang/String;
+
+.field private final als:Ljava/lang/String;
+
+.field private final alt:Ljava/lang/String;
+
+.field private final alu:I
+
+.field private final alv:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -39,21 +47,13 @@
     .end annotation
 .end field
 
-.field private final aln:Ljava/lang/String;
+.field private final alw:Ljava/lang/String;
 
-.field private final alo:J
+.field private final alx:J
 
-.field private alp:I
+.field private aly:I
 
-.field private final alq:Ljava/lang/String;
-
-.field private final alr:F
-
-.field private final als:J
-
-.field private final alt:Z
-
-.field private alu:J
+.field private final alz:Ljava/lang/String;
 
 
 # direct methods
@@ -95,67 +95,67 @@
 
     move v1, p1
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeD:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeM:I
 
     move-wide v1, p2
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alf:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp:J
 
     move v1, p4
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alg:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:I
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alh:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:Ljava/lang/String;
 
     move-object v1, p12
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ali:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als:Ljava/lang/String;
 
     move-object/from16 v1, p17
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alj:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt:Ljava/lang/String;
 
     move v1, p6
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alk:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:I
 
     const-wide/16 v1, -0x1
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alD:J
 
     move-object v1, p7
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alm:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv:Ljava/util/List;
 
     move-object v1, p8
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aln:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alw:Ljava/lang/String;
 
     move-wide v1, p9
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alo:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alx:J
 
     move v1, p11
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp:I
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly:I
 
     move-object/from16 v1, p13
 
-    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alz:Ljava/lang/String;
 
     move/from16 v1, p14
 
-    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:F
+    iput v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alA:F
 
     move-wide/from16 v1, p15
 
-    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als:J
+    iput-wide v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alB:J
 
     move/from16 v1, p18
 
-    iput-boolean v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alC:Z
 
     return-void
 .end method
@@ -219,38 +219,38 @@
 
 
 # virtual methods
-.method public final ni()J
+.method public final nl()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alf:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alp:J
 
     return-wide v0
 .end method
 
-.method public final nj()I
+.method public final nm()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alg:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alq:I
 
     return v0
 .end method
 
-.method public final nk()J
+.method public final nn()J
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alD:J
 
     return-wide v0
 .end method
 
-.method public final nl()Ljava/lang/String;
+.method public final no()Ljava/lang/String;
     .locals 11
 
-    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alk:I
+    iget v1, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu:I
 
-    iget-object v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alm:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv: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;->alp:I
+    iget v4, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly:I
 
-    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->ali:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als: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;->alq:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alz:Ljava/lang/String;
 
     if-nez v6, :cond_2
 
     move-object v6, v3
 
     :cond_2
-    iget v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr:F
+    iget v7, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alA:F
 
-    iget-object v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alj:Ljava/lang/String;
+    iget-object v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt: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;->alt:Z
+    iget-boolean v8, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alC:Z
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -406,13 +406,13 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeD:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aeM:I
 
     const/4 v1, 0x1
 
     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/stats/StatsEvent;->ni()J
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nl()J
 
     move-result-wide v0
 
@@ -420,37 +420,37 @@
 
     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;->alh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alr: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;->alk:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alu: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;->alm:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alv: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;->alo:J
+    iget-wide v2, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alx: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;->ali:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->als:Ljava/lang/String;
 
     const/16 v2, 0xa
 
     invoke-static {p1, v2, v0}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/common/stats/StatsEvent;->nm()I
 
     move-result v0
 
@@ -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;->aln:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alw: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;->alq:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alz: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;->alp:I
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->aly: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;->alr:F
+    iget v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alA: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;->als:J
+    iget-wide v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alB: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;->alj:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alt: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;->alt:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/common/stats/WakeLockEvent;->alC: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 f806857f33..15d62db204 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 ajM:Ljava/lang/Object;
+.field private static final ajV:Ljava/lang/Object;
 
-.field private static volatile akQ:Lcom/google/android/gms/common/stats/a;
+.field private static volatile akZ:Lcom/google/android/gms/common/stats/a;
 
-.field private static akR:Z
+.field private static ala:Z
 
 
 # instance fields
-.field private final akS:Ljava/util/List;
+.field private final alb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -21,7 +21,7 @@
     .end annotation
 .end field
 
-.field private final akT:Ljava/util/List;
+.field private final alc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final akU:Ljava/util/List;
+.field private final ald:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final akV:Ljava/util/List;
+.field private final ale: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;->ajM:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/common/stats/a;->ajV:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/common/stats/a;->akR:Z
+    sput-boolean v0, Lcom/google/android/gms/common/stats/a;->ala: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;->akS:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->alb: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;->akT:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->alc: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;->akU:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ald: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;->akV:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/common/stats/a;->ale:Ljava/util/List;
 
     return-void
 .end method
@@ -160,19 +160,19 @@
     return p0
 .end method
 
-.method public static nh()Lcom/google/android/gms/common/stats/a;
+.method public static nk()Lcom/google/android/gms/common/stats/a;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->akQ:Lcom/google/android/gms/common/stats/a;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->akZ:Lcom/google/android/gms/common/stats/a;
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajM:Ljava/lang/Object;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->ajV:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/common/stats/a;->akQ:Lcom/google/android/gms/common/stats/a;
+    sget-object v1, Lcom/google/android/gms/common/stats/a;->akZ: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;->akQ:Lcom/google/android/gms/common/stats/a;
+    sput-object v1, Lcom/google/android/gms/common/stats/a;->akZ: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;->akQ:Lcom/google/android/gms/common/stats/a;
+    sget-object v0, Lcom/google/android/gms/common/stats/a;->akZ: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 c3ea025079..470bd0d3c8 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
@@ -3,23 +3,23 @@
 
 
 # static fields
-.field public static final akW:Landroid/content/ComponentName;
+.field public static final alf:Landroid/content/ComponentName;
 
-.field private static akX:I
+.field private static alg:I
 
-.field private static akY:I
+.field private static alh:I
 
-.field private static akZ:I
+.field private static ali:I
 
-.field private static ala:I
+.field private static alj:I
 
-.field private static alb:I
+.field private static alk:I
 
-.field private static alc:I
+.field private static alm:I
 
-.field private static ald:I
+.field private static aln:I
 
-.field private static ale:I
+.field private static alo:I
 
 
 # direct methods
@@ -34,37 +34,37 @@
 
     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;->akW:Landroid/content/ComponentName;
+    sput-object v0, Lcom/google/android/gms/common/stats/b;->alf:Landroid/content/ComponentName;
 
     const/4 v0, 0x0
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->akX:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->alg:I
 
     const/4 v0, 0x1
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->akY:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->alh:I
 
     const/4 v1, 0x2
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->akZ:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->ali:I
 
     const/4 v1, 0x4
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ala:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->alj:I
 
     const/16 v1, 0x8
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->alb:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->alk:I
 
     const/16 v1, 0x10
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->alc:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->alm:I
 
     const/16 v1, 0x20
 
-    sput v1, Lcom/google/android/gms/common/stats/b;->ald:I
+    sput v1, Lcom/google/android/gms/common/stats/b;->aln:I
 
-    sput v0, Lcom/google/android/gms/common/stats/b;->ale:I
+    sput v0, Lcom/google/android/gms/common/stats/b;->alo: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 a356587419..33072f6cc4 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 alv:Lcom/google/android/gms/common/stats/d;
+.field private static alE:Lcom/google/android/gms/common/stats/d;
 
-.field private static alw:Ljava/lang/Boolean;
+.field private static alF:Ljava/lang/Boolean;
 
-.field private static alx:Z
+.field private static alG: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;->alv:Lcom/google/android/gms/common/stats/d;
+    sput-object v0, Lcom/google/android/gms/common/stats/d;->alE:Lcom/google/android/gms/common/stats/d;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/common/stats/d;->alx:Z
+    sput-boolean v0, Lcom/google/android/gms/common/stats/d;->alG:Z
 
     return-void
 .end method
@@ -43,7 +43,7 @@
 
     invoke-direct {v0}, Landroid/content/Intent;-><init>()V
 
-    sget-object v1, Lcom/google/android/gms/common/stats/b;->akW:Landroid/content/ComponentName;
+    sget-object v1, Lcom/google/android/gms/common/stats/b;->alf:Landroid/content/ComponentName;
 
     invoke-virtual {v0, v1}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
@@ -91,7 +91,7 @@
 
     move/from16 v3, p2
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->nn()Z
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->nq()Z
 
     move-result v0
 
@@ -255,27 +255,27 @@
     return-void
 .end method
 
-.method public static nm()Lcom/google/android/gms/common/stats/d;
+.method public static np()Lcom/google/android/gms/common/stats/d;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->alv:Lcom/google/android/gms/common/stats/d;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->alE:Lcom/google/android/gms/common/stats/d;
 
     return-object v0
 .end method
 
-.method private static nn()Z
+.method private static nq()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->alw:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->alF:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object v0, Lcom/google/android/gms/common/stats/d;->alw:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/common/stats/d;->alF:Ljava/lang/Boolean;
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/common/stats/d;->alw:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/stats/d;->alF:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
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 1a1c7bf0ed..cf0b7bf687 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,7 +13,7 @@
 
 
 # virtual methods
-.method protected final nE()[B
+.method protected final nH()[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"
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 bce9eb16aa..cbe1c45998 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 aly:I = -0x1
+.field private static volatile alH:I = -0x1
 
 
 # direct methods
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 865806aae0..6519a8b4e3 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 alZ:Ljava/util/concurrent/ThreadFactory;
+.field private final ami: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;->alZ:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/a;->ami: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;->alZ:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/a;->ami: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 b7e0788830..550fbb0160 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 alZ:Ljava/util/concurrent/ThreadFactory;
+.field private final ami:Ljava/util/concurrent/ThreadFactory;
 
-.field private final ama:Ljava/lang/String;
+.field private final amj:Ljava/lang/String;
 
-.field private final amb:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final amk: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;->amb:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->amk: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;->alZ:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lcom/google/android/gms/common/util/a/b;->ami: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;->ama:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/common/util/a/b;->amj: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;->alZ:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->ami: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;->ama:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/b;->amj:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/util/a/b;->amb:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/common/util/a/b;->amk: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 35812e06b8..eb77561473 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 amc:Ljava/lang/Runnable;
+.field private final aml: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;->amc:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/common/util/a/c;->aml: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;->amc:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/google/android/gms/common/util/a/c;->aml:Ljava/lang/Runnable;
 
     invoke-interface {v0}, Ljava/lang/Runnable;->run()V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/common/util/e.smali b/com.discord/smali_classes2/com/google/android/gms/common/util/e.smali
index 665f3bce36..089dc3a2b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/common/util/e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/common/util/e.smali
@@ -6,8 +6,8 @@
 .method public abstract currentTimeMillis()J
 .end method
 
-.method public abstract no()J
+.method public abstract nr()J
 .end method
 
-.method public abstract np()J
+.method public abstract ns()J
 .end method
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 343933e2be..a6f1f3031f 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 alA:Landroid/os/DropBoxManager; = null
+.field private static final alI:[Ljava/lang/String;
 
-.field private static alB:Z = false
+.field private static alJ:Landroid/os/DropBoxManager; = null
 
-.field private static alC:I = -0x1
+.field private static alK:Z = false
 
-.field private static alD:I
+.field private static alL:I = -0x1
 
-.field private static alE:I
+.field private static alM:I
 
-.field private static final alz:[Ljava/lang/String;
+.field private static alN:I
 
 
 # direct methods
@@ -54,7 +54,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/common/util/f;->alz:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/common/util/f;->alI:[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 592e9c4a53..5394d7ea18 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 alF:Lcom/google/android/gms/common/util/g;
+.field private static final alO: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;->alF:Lcom/google/android/gms/common/util/g;
+    sput-object v0, Lcom/google/android/gms/common/util/g;->alO:Lcom/google/android/gms/common/util/g;
 
     return-void
 .end method
@@ -30,10 +30,10 @@
     return-void
 .end method
 
-.method public static nq()Lcom/google/android/gms/common/util/e;
+.method public static nt()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/common/util/g;->alF:Lcom/google/android/gms/common/util/g;
+    sget-object v0, Lcom/google/android/gms/common/util/g;->alO:Lcom/google/android/gms/common/util/g;
 
     return-object v0
 .end method
@@ -50,7 +50,7 @@
     return-wide v0
 .end method
 
-.method public final no()J
+.method public final nr()J
     .locals 2
 
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
@@ -60,7 +60,7 @@
     return-wide v0
 .end method
 
-.method public final np()J
+.method public final ns()J
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
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 7b9ddce1c6..b7768f7eb1 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 alG:Ljava/lang/Boolean;
+.field private static alP:Ljava/lang/Boolean;
 
-.field private static alH:Ljava/lang/Boolean;
+.field private static alQ:Ljava/lang/Boolean;
 
-.field public static alI:Ljava/lang/Boolean;
+.field public static alR: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;->alG:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alP:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->ns()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nv()Z
 
     move-result v0
 
@@ -48,10 +48,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/util/h;->alG:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/util/h;->alP:Ljava/lang/Boolean;
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/common/util/h;->alG:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/util/h;->alP: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;->alH:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/common/util/h;->alQ:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nt()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nw()Z
 
     move-result v0
 
@@ -135,10 +135,10 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/common/util/h;->alH:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/common/util/h;->alQ:Ljava/lang/Boolean;
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/common/util/h;->alH:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/common/util/h;->alQ: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 ee0104a7e1..8a3def881c 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 alJ:[C
+.field private static final alS:[C
 
-.field private static final alK:[C
+.field private static final alT:[C
 
 
 # direct methods
@@ -18,13 +18,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/google/android/gms/common/util/i;->alJ:[C
+    sput-object v1, Lcom/google/android/gms/common/util/i;->alS:[C
 
     new-array v0, v0, [C
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lcom/google/android/gms/common/util/i;->alK:[C
+    sput-object v0, Lcom/google/android/gms/common/util/i;->alT:[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;->alJ:[C
+    sget-object v3, Lcom/google/android/gms/common/util/i;->alS:[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;->alJ:[C
+    sget-object v3, Lcom/google/android/gms/common/util/i;->alS:[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;->alK:[C
+    sget-object v5, Lcom/google/android/gms/common/util/i;->alT:[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 bbf370842b..c429193a99 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 alL:Ljava/util/regex/Pattern;
+.field private static final alU:Ljava/util/regex/Pattern;
 
-.field private static final alM:Ljava/util/regex/Pattern;
+.field private static final alV:Ljava/util/regex/Pattern;
 
-.field private static final alN:Ljava/util/regex/Pattern;
+.field private static final alW:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -20,7 +20,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/j;->alL:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->alU: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;->alM:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->alV: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;->alN:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/j;->alW: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 8b8016c972..74858ee49b 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 nr()Z
+.method public static nu()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -79,7 +79,7 @@
     return v0
 .end method
 
-.method public static ns()Z
+.method public static nv()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method public static nt()Z
+.method public static nw()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 61eadcba8f..b1e19246b4 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 alQ:Ljava/util/regex/Pattern;
+.field private static final alZ:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/n;->alQ:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/common/util/n;->alZ:Ljava/util/regex/Pattern;
 
     return-void
 .end method
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 a899b01988..c7ed28f908 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 alR:I
+.field private static final ama:I
 
-.field private static final alS:Ljava/lang/reflect/Method;
+.field private static final amb:Ljava/lang/reflect/Method;
 
-.field private static final alT:Ljava/lang/reflect/Method;
+.field private static final amc:Ljava/lang/reflect/Method;
 
-.field private static final alU:Ljava/lang/reflect/Method;
+.field private static final amd:Ljava/lang/reflect/Method;
 
-.field private static final alV:Ljava/lang/reflect/Method;
+.field private static final ame:Ljava/lang/reflect/Method;
 
-.field private static final alW:Ljava/lang/reflect/Method;
+.field private static final amf:Ljava/lang/reflect/Method;
 
-.field private static final alX:Ljava/lang/reflect/Method;
+.field private static final amg:Ljava/lang/reflect/Method;
 
-.field private static final alY:Ljava/lang/reflect/Method;
+.field private static final amh:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -28,49 +28,49 @@
 
     move-result v0
 
-    sput v0, Lcom/google/android/gms/common/util/p;->alR:I
-
-    invoke-static {}, Lcom/google/android/gms/common/util/p;->nv()Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alS:Ljava/lang/reflect/Method;
-
-    invoke-static {}, Lcom/google/android/gms/common/util/p;->nw()Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alT:Ljava/lang/reflect/Method;
-
-    invoke-static {}, Lcom/google/android/gms/common/util/p;->nx()Ljava/lang/reflect/Method;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alU:Ljava/lang/reflect/Method;
+    sput v0, Lcom/google/android/gms/common/util/p;->ama:I
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->ny()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alV:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amb:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->nz()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alW:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amc:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->nA()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alX:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amd:Ljava/lang/reflect/Method;
 
     invoke-static {}, Lcom/google/android/gms/common/util/p;->nB()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/common/util/p;->alY:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/common/util/p;->ame:Ljava/lang/reflect/Method;
+
+    invoke-static {}, Lcom/google/android/gms/common/util/p;->nC()Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amf:Ljava/lang/reflect/Method;
+
+    invoke-static {}, Lcom/google/android/gms/common/util/p;->nD()Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amg:Ljava/lang/reflect/Method;
+
+    invoke-static {}, Lcom/google/android/gms/common/util/p;->nE()Ljava/lang/reflect/Method;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/common/util/p;->amh: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;->ami:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/common/c/b;->amr: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;->alU:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/common/util/p;->amd: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;->alT:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/common/util/p;->amc: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;->alT:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/common/util/p;->amc: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;->alS:Ljava/lang/reflect/Method;
+    sget-object p1, Lcom/google/android/gms/common/util/p;->amb: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;->alW:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/common/util/p;->amf:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
@@ -464,7 +464,107 @@
     return-object v1
 .end method
 
-.method private static final nA()Ljava/lang/reflect/Method;
+.method private static nA()Ljava/lang/reflect/Method;
+    .locals 3
+
+    :try_start_0
+    const-class v0, Landroid/os/WorkSource;
+
+    const-string v1, "size"
+
+    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
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method private static nB()Ljava/lang/reflect/Method;
+    .locals 5
+
+    :try_start_0
+    const-class v0, Landroid/os/WorkSource;
+
+    const-string v1, "get"
+
+    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
+    const/4 v0, 0x0
+
+    :goto_0
+    return-object v0
+.end method
+
+.method private static nC()Ljava/lang/reflect/Method;
+    .locals 5
+
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()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 nD()Ljava/lang/reflect/Method;
     .locals 3
 
     invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
@@ -506,7 +606,7 @@
     return-object v0
 .end method
 
-.method private static final nB()Ljava/lang/reflect/Method;
+.method private static final nE()Ljava/lang/reflect/Method;
     .locals 5
 
     invoke-static {}, Lcom/google/android/gms/common/util/l;->isAtLeastP()Z
@@ -564,7 +664,7 @@
     return-object v0
 .end method
 
-.method private static nv()Ljava/lang/reflect/Method;
+.method private static ny()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -597,10 +697,10 @@
     return-object v0
 .end method
 
-.method private static nw()Ljava/lang/reflect/Method;
+.method private static nz()Ljava/lang/reflect/Method;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nr()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nu()Z
 
     move-result v0
 
@@ -642,103 +742,3 @@
     :goto_0
     return-object v0
 .end method
-
-.method private static nx()Ljava/lang/reflect/Method;
-    .locals 3
-
-    :try_start_0
-    const-class v0, Landroid/os/WorkSource;
-
-    const-string v1, "size"
-
-    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
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method private static ny()Ljava/lang/reflect/Method;
-    .locals 5
-
-    :try_start_0
-    const-class v0, Landroid/os/WorkSource;
-
-    const-string v1, "get"
-
-    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
-    const/4 v0, 0x0
-
-    :goto_0
-    return-object v0
-.end method
-
-.method private static nz()Ljava/lang/reflect/Method;
-    .locals 5
-
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nr()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
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 62e7349bd8..0a934bb1b2 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 amd:J
+.field private static amm:J
 
-.field private static ame:F
+.field private static amn: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;->ame:F
+    sput v0, Lcom/google/android/gms/common/util/q;->amn:F
 
     return-void
 .end method
@@ -98,7 +98,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->ns()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nv()Z
 
     move-result v0
 
@@ -142,7 +142,7 @@
 
     move-result-wide v1
 
-    sget-wide v3, Lcom/google/android/gms/common/util/q;->amd:J
+    sget-wide v3, Lcom/google/android/gms/common/util/q;->amm:J
 
     sub-long/2addr v1, v3
 
@@ -152,7 +152,7 @@
 
     if-gez v5, :cond_0
 
-    sget v1, Lcom/google/android/gms/common/util/q;->ame:F
+    sget v1, Lcom/google/android/gms/common/util/q;->amn: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;->ame:F
+    sget p0, Lcom/google/android/gms/common/util/q;->amn: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;->ame:F
+    sput v1, Lcom/google/android/gms/common/util/q;->amn:F
 
     :cond_1
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
     move-result-wide v1
 
-    sput-wide v1, Lcom/google/android/gms/common/util/q;->amd:J
+    sput-wide v1, Lcom/google/android/gms/common/util/q;->amm:J
 
-    sget p0, Lcom/google/android/gms/common/util/q;->ame:F
+    sget p0, Lcom/google/android/gms/common/util/q;->amn: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 385efaf073..19c28999ac 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 amf:Ljava/util/regex/Pattern;
+.field private static amo: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 d2ada0bd49..725eae0254 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 amz:Ljava/util/concurrent/Callable;
+.field private final amI: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;->amz:Ljava/util/concurrent/Callable;
+    iput-object p1, p0, Lcom/google/android/gms/common/w;->amI:Ljava/util/concurrent/Callable;
 
     return-void
 .end method
@@ -47,11 +47,11 @@
 
 
 # virtual methods
-.method final nG()Ljava/lang/String;
+.method final nJ()Ljava/lang/String;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/common/w;->amz:Ljava/util/concurrent/Callable;
+    iget-object v0, p0, Lcom/google/android/gms/common/w;->amI: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 8c0cab1963..67a13b50a2 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 amP:I
+.field public amY:I
 
-.field public amQ:I
+.field public amZ:I
 
-.field public amR:I
+.field public ana:I
 
 
 # direct methods
@@ -29,11 +29,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 357fc57948..912aeb3663 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 amS:Landroid/database/Cursor;
+.field public anb: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 22e34e7e26..0fddbed091 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 amT:I
+.field private final anc:I
 
-.field private final amU:I
+.field private final and: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;->amT:I
+    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->anc:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->amU:I
+    iput p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->and: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;->amT:I
+    iget p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule$d;->anc: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 a9febfdb2e..328618a9dd 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,17 @@
 
 
 # static fields
-.field private static amB:Ljava/lang/Boolean; = null
+.field private static amK:Ljava/lang/Boolean; = null
 
-.field private static amC:Lcom/google/android/gms/dynamite/i; = null
+.field private static amL:Lcom/google/android/gms/dynamite/i; = null
 
-.field private static amD:Lcom/google/android/gms/dynamite/k; = null
+.field private static amM:Lcom/google/android/gms/dynamite/k; = null
 
-.field private static amE:Ljava/lang/String; = null
+.field private static amN:Ljava/lang/String; = null
 
-.field private static amF:I = -0x1
+.field private static amO:I = -0x1
 
-.field private static final amG:Ljava/lang/ThreadLocal;
+.field private static final amP:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -35,23 +35,23 @@
     .end annotation
 .end field
 
-.field private static final amH:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+.field private static final amQ:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
 
-.field public static final amI:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final amR:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final amJ:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final amS:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final amK:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final amT:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final amL:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final amU:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field public static final amM:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field public static final amV:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
-.field private static final amN:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+.field private static final amW:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
 
 # instance fields
-.field public final amO:Landroid/content/Context;
+.field public final amX: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;->amG:Ljava/lang/ThreadLocal;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amH:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amQ: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;->amI:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amR: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;->amJ:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amS: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;->amK:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amT: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;->amL:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amU: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;->amM:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amV: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;->amN:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sput-object v0, Lcom/google/android/gms/dynamite/DynamiteModule;->amW: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;->amO:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amX: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;->amB:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amK: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;->amE:Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amN:Ljava/lang/String;
 
     if-eqz v5, :cond_4
 
-    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amE:Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amN: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;->amE:Ljava/lang/String;
+    sget-object v6, Lcom/google/android/gms/dynamite/DynamiteModule;->amN: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;->amB:Ljava/lang/Boolean;
+    sput-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amK: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;->amB:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amK: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;->amG:Ljava/lang/ThreadLocal;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amG:Ljava/lang/ThreadLocal;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amH:Lcom/google/android/gms/dynamite/DynamiteModule$b$a;
+    sget-object v5, Lcom/google/android/gms/dynamite/DynamiteModule;->amQ: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;->amP:I
+    iget v6, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget v7, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget v7, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ: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;->amR:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     if-eqz v0, :cond_9
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     const/4 v6, -0x1
 
     if-ne v0, v6, :cond_0
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-eqz v0, :cond_9
 
     :cond_0
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     const/4 v7, 0x1
 
     if-ne v0, v7, :cond_1
 
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-eqz v0, :cond_9
 
     :cond_1
-    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     if-eqz p1, :cond_2
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amG:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amR:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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;->amQ:I
+    iget v0, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ: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;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_4
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amG:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amP:I
+    iget v1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY: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;->amP:I
+    iget v5, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY: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;->amR:I
+    iget p1, p1, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     if-eqz p1, :cond_6
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_6
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amG:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amR:I
+    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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;->amP:I
+    iget p1, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget p2, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p2, v5, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ: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;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     if-eqz p1, :cond_a
 
-    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amS:Landroid/database/Cursor;
+    iget-object p1, v3, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     invoke-interface {p1}, Landroid/database/Cursor;->close()V
 
     :cond_a
-    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amG:Ljava/lang/ThreadLocal;
+    sget-object p1, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amB:Ljava/lang/Boolean;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amK: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;->nI()I
+    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->nL()I
 
     move-result v2
 
@@ -1100,7 +1100,7 @@
     move-object p0, v1
 
     :goto_0
-    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amD:Lcom/google/android/gms/dynamite/k;
+    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amM: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;->amC:Lcom/google/android/gms/dynamite/i;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amL:Lcom/google/android/gms/dynamite/i;
 
     if-eqz v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amC:Lcom/google/android/gms/dynamite/i;
+    sget-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amL:Lcom/google/android/gms/dynamite/i;
 
     monitor-exit v0
 
     return-object p0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/common/c;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()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;->amC:Lcom/google/android/gms/dynamite/i;
+    sput-object p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amL: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;->nI()I
+    invoke-interface {v1}, Lcom/google/android/gms/dynamite/i;->nL()I
 
     move-result v3
 
@@ -1435,7 +1435,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amD:Lcom/google/android/gms/dynamite/k;
+    sget-object v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amM: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;->amG:Ljava/lang/ThreadLocal;
+    sget-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amS:Landroid/database/Cursor;
+    iget-object v3, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb: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;->amS:Landroid/database/Cursor;
+    iget-object v2, v2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     const/4 v3, 0x0
 
     invoke-static {v3}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
-    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->nH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/dynamite/DynamiteModule;->nK()Ljava/lang/Boolean;
 
     move-result-object v3
 
@@ -1682,7 +1682,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amE:Ljava/lang/String;
+    sput-object v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amN:Ljava/lang/String;
 
     const-string v2, "loaderVersion"
 
@@ -1696,7 +1696,7 @@
 
     move-result v2
 
-    sput v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amF:I
+    sput v2, Lcom/google/android/gms/dynamite/DynamiteModule;->amO: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;->amG:Ljava/lang/ThreadLocal;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amP: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;->amS:Landroid/database/Cursor;
+    iget-object v2, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb:Landroid/database/Cursor;
 
     if-nez v2, :cond_2
 
-    iput-object p0, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->amS:Landroid/database/Cursor;
+    iput-object p0, p2, Lcom/google/android/gms/dynamite/DynamiteModule$c;->anb: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 nH()Ljava/lang/Boolean;
+.method private static nK()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;->amF:I
+    sget v1, Lcom/google/android/gms/dynamite/DynamiteModule;->amO:I
 
     const/4 v2, 0x2
 
@@ -2136,7 +2136,7 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amO:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/dynamite/DynamiteModule;->amX: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 717cb83577..0de07c477f 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;->amQ:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iget v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-eqz v2, :cond_0
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_0
 
@@ -49,15 +49,15 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-eqz p1, :cond_1
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 2bc129e845..590b8397b8 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;->amP:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-eqz v1, :cond_0
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_0
 
@@ -51,13 +51,13 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-eqz p1, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 51a948896d..ed633da610 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;->amP:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     const/4 v1, 0x1
 
@@ -40,37 +40,37 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-nez p1, :cond_0
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_0
 
     :cond_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-lt p1, p2, :cond_1
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_0
 
     :cond_1
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 92621669eb..e46fee93f7 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;->amP:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     const/4 v2, 0x0
 
@@ -46,7 +46,7 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     goto :goto_0
 
@@ -55,36 +55,36 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     :goto_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-nez p1, :cond_1
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-nez p1, :cond_1
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_1
 
     :cond_1
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-lt p1, p2, :cond_2
 
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_1
 
     :cond_2
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 ee15dfcacb..66771cf02c 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;->amP:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     const/4 v1, 0x1
 
@@ -40,37 +40,37 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-nez p1, :cond_0
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_0
 
     :cond_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-lt p1, p2, :cond_1
 
-    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_0
 
     :cond_1
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 eb4ba0b2c4..db251be328 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;->amP:I
+    iput v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
-    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget v1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     const/4 v2, 0x0
 
@@ -46,7 +46,7 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     goto :goto_0
 
@@ -55,36 +55,36 @@
 
     move-result p1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     :goto_0
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-nez p1, :cond_1
 
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
     if-nez p1, :cond_1
 
-    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_1
 
     :cond_1
-    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amQ:I
+    iget p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amZ:I
 
-    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amP:I
+    iget p2, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amY:I
 
     if-lt p1, p2, :cond_2
 
-    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput v3, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana:I
 
     goto :goto_1
 
     :cond_2
     const/4 p1, -0x1
 
-    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->amR:I
+    iput p1, v0, Lcom/google/android/gms/dynamite/DynamiteModule$b$b;->ana: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 896cd3ddfa..497d441d24 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 nI()I
+.method public abstract nL()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 27eb98464e..06767fa297 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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -158,7 +158,7 @@
     return-object p2
 .end method
 
-.method public final nI()I
+.method public final nL()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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()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 13759a5033..0dd2e80717 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;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/c/a;->nQ()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 9dcc923f29..04b70e7938 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 ajX:Landroid/os/IBinder;
+.field private final akg:Landroid/os/IBinder;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane: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;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/a/a;->akg:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/a/a;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/a/a;->ane: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;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->akg: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;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/a/a;->akg:Landroid/os/IBinder;
 
     return-object v0
 .end method
 
-.method protected final nJ()Landroid/os/Parcel;
+.method protected final nM()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;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/a/a;->ane: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 741132e81a..90049cd2ac 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 amW:Lcom/google/android/gms/internal/a/d;
+.field private static anf: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 d9accd4ca8..5685acecfc 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 amX:Ljava/lang/ClassLoader;
+.field private static final ang:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/a/c;->amX:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/a/c;->ang: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 2deb33e84e..9cf7ce3f1f 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 nK()Z
+.method public abstract nN()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
@@ -22,7 +22,7 @@
     .end annotation
 .end method
 
-.method public abstract nL()Z
+.method public abstract nO()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 119b7b2f5c..333440d428 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -45,7 +45,7 @@
     return-object v1
 .end method
 
-.method public final nK()Z
+.method public final nN()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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -74,7 +74,7 @@
     return v1
 .end method
 
-.method public final nL()Z
+.method public final nO()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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/a/a;->nM()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 4c292abbd5..cbb11b058c 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 private final amY:Landroid/os/IBinder;
+.field private final anh:Landroid/os/IBinder;
 
-.field private final amZ:Ljava/lang/String;
+.field private final ani: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;->amY:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/b/a;->anh:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/b/a;->amZ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/b/a;->ani: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;->amY:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/b/a;->anh: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/b/a;->amY:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/b/a;->anh:Landroid/os/IBinder;
 
     const/16 v2, 0xc
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method public final nM()Landroid/os/Parcel;
+.method public final nP()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/b/a;->amZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/b/a;->ani: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/b/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/b/b.smali
index e178e4b511..a8cd19f720 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 ana:Lcom/google/android/gms/internal/b/d;
+.field private static anj: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 6c409c9ec2..6d823c5fad 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 anb:Ljava/lang/ClassLoader;
+.field private static final ank:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/b/c;->anb:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/b/c;->ank: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 c90599cd58..64c19196cb 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 anc:Lcom/google/android/gms/internal/b/f;
+.field private static volatile anl: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 be8d190cce..98101c5b67 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 ajX:Landroid/os/IBinder;
+.field private final akg:Landroid/os/IBinder;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane: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;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/c/a;->akg:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/c/a;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/c/a;->ane: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;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/c/a;->akg: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;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->akg: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;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->akg:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -122,14 +122,14 @@
     throw p1
 .end method
 
-.method public final nN()Landroid/os/Parcel;
+.method public final nQ()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;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/c/a;->ane: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 4a9faa0eec..f4fd27885d 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 and:Lcom/google/android/gms/internal/c/d;
+.field private static anm: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 7ba8d3e96f..05a3652c21 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 amX:Ljava/lang/ClassLoader;
+.field private static final ang:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/c/c;->amX:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/c/c;->ang: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 5e8a7c12f1..a56042fe39 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 ane:Lcom/google/android/gms/internal/c/f;
+.field private static volatile ann: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 7ce43083d9..b4d219c03e 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 anf:Lcom/google/android/gms/internal/d/c;
+.field private static ano: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 063fb2140a..b50dcc5528 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 private final ang:Landroid/os/IBinder;
+.field private final anp:Landroid/os/IBinder;
 
-.field private final anh:Ljava/lang/String;
+.field private final anq: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;->ang:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/d/b;->anp:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/d/b;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/d/b;->anq: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;->ang:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/d/b;->anp: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/d/b;->ang:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/d/b;->anp:Landroid/os/IBinder;
 
     const/4 v2, 0x1
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method public final nN()Landroid/os/Parcel;
+.method public final nQ()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/d/b;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/d/b;->anq: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/d/d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/d/d.smali
index 476c22e4b9..59fb6c3853 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 amX:Ljava/lang/ClassLoader;
+.field private static final ang:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/d/d;->amX:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/d/d;->ang: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 b1b5cf7a3f..06d9f6c0f1 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 ani:Lcom/google/android/gms/internal/e/b;
+.field private static final anr:Lcom/google/android/gms/internal/e/b;
 
-.field private static volatile anj:Lcom/google/android/gms/internal/e/b;
+.field private static volatile ans: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;->ani:Lcom/google/android/gms/internal/e/b;
+    sput-object v0, Lcom/google/android/gms/internal/e/a;->anr:Lcom/google/android/gms/internal/e/b;
 
-    sput-object v0, Lcom/google/android/gms/internal/e/a;->anj:Lcom/google/android/gms/internal/e/b;
+    sput-object v0, Lcom/google/android/gms/internal/e/a;->ans:Lcom/google/android/gms/internal/e/b;
 
     return-void
 .end method
 
-.method public static nO()Lcom/google/android/gms/internal/e/b;
+.method public static nR()Lcom/google/android/gms/internal/e/b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/e/a;->anj:Lcom/google/android/gms/internal/e/b;
+    sget-object v0, Lcom/google/android/gms/internal/e/a;->ans: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 1c16e56e68..8d849af6f3 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 ank:Lcom/google/android/gms/internal/e/g;
+.field private static volatile ant: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 a368f36ffb..d33dac40e8 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 anl:I = 0x1
+.field private static final enum anu:I = 0x1
 
-.field private static final synthetic anm:[I
+.field private static final synthetic anv:[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;->anm:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/e;->anv:[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 a747065848..66f3fc706d 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 ann:Ljava/io/OutputStream;
+.field private static final anw: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;->ann:Ljava/io/OutputStream;
+    sput-object v0, Lcom/google/android/gms/internal/e/i;->anw: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 cce1a3acd5..f01c3a10d8 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 anp:J
+.field private any:J
 
-.field private anq:J
+.field private anz:J
 
 
 # direct methods
@@ -17,13 +17,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anz:J
 
     invoke-static {p1}, Lcom/google/android/gms/internal/e/f;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
     const-wide/32 v0, 0x100001
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anp:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anz: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;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/e/k;->any:J
 
     const-wide/16 v3, 0x1
 
     sub-long/2addr v1, v3
 
-    iput-wide v1, p0, Lcom/google/android/gms/internal/e/k;->anp:J
+    iput-wide v1, p0, Lcom/google/android/gms/internal/e/k;->any:J
 
     :cond_1
     return v0
@@ -134,7 +134,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anp:J
+    iget-wide p2, p0, Lcom/google/android/gms/internal/e/k;->any:J
 
     int-to-long v0, p1
 
     sub-long/2addr p2, v0
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/e/k;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anq:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anz: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;->anq:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anz:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any: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;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/e/k;->any: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 6352c4b724..d1fef23b16 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
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field private static final anl:I
+.field private static final anA:Lcom/google/android/gms/internal/e/o;
 
-.field private static final anr:Lcom/google/android/gms/internal/e/o;
+.field private static final anu:I
 
 
 # direct methods
@@ -24,7 +24,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/e/l;->nP()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/e/l;->nS()Ljava/lang/Integer;
 
     move-result-object v1
     :try_end_0
@@ -131,7 +131,7 @@
     invoke-direct {v2}, Lcom/google/android/gms/internal/e/l$a;-><init>()V
 
     :goto_1
-    sput-object v2, Lcom/google/android/gms/internal/e/l;->anr:Lcom/google/android/gms/internal/e/o;
+    sput-object v2, Lcom/google/android/gms/internal/e/l;->anA:Lcom/google/android/gms/internal/e/o;
 
     if-nez v1, :cond_2
 
@@ -143,7 +143,7 @@
     move-result v0
 
     :goto_2
-    sput v0, Lcom/google/android/gms/internal/e/l;->anl:I
+    sput v0, Lcom/google/android/gms/internal/e/l;->anu: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/l;->anr:Lcom/google/android/gms/internal/e/o;
+    sget-object v0, Lcom/google/android/gms/internal/e/l;->anA:Lcom/google/android/gms/internal/e/o;
 
     invoke-virtual {v0, p0, p1}, Lcom/google/android/gms/internal/e/o;->a(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
 
     return-void
 .end method
 
-.method private static nP()Ljava/lang/Integer;
+.method private static nS()Ljava/lang/Integer;
     .locals 4
 
     const/4 v0, 0x0
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 3107e7936f..936da6de65 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
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final anm:[I
+.field private static final anB:[B
 
-.field private static final ans:[B
+.field private static final anC:[I
 
-.field private static final ant:[I
+.field private static final anD:[I
 
-.field private static final anu:[I
+.field private static anE:[I
 
-.field private static anv:[I
+.field private static final anv:[I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/google/android/gms/internal/e/m;->ans:[B
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anB:[B
 
     const/16 v0, 0xa
 
@@ -33,13 +33,13 @@
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lcom/google/android/gms/internal/e/m;->ant:[I
+    sput-object v1, Lcom/google/android/gms/internal/e/m;->anC:[I
 
     new-array v0, v0, [I
 
     fill-array-data v0, :array_2
 
-    sput-object v0, Lcom/google/android/gms/internal/e/m;->anm:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anv:[I
 
     const/16 v0, 0xd
 
@@ -47,7 +47,7 @@
 
     fill-array-data v0, :array_3
 
-    sput-object v0, Lcom/google/android/gms/internal/e/m;->anu:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anD:[I
 
     const/16 v0, 0x11
 
@@ -55,7 +55,7 @@
 
     fill-array-data v0, :array_4
 
-    sput-object v0, Lcom/google/android/gms/internal/e/m;->anv:[I
+    sput-object v0, Lcom/google/android/gms/internal/e/m;->anE:[I
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/e/n.smali b/com.discord/smali_classes2/com/google/android/gms/internal/e/n.smali
index 676bb14fd1..ab115305ce 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/e/n.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/e/n.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final anw:Ljava/util/concurrent/ConcurrentHashMap;
+.field private final anF: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 anx:Ljava/lang/ref/ReferenceQueue;
+.field private final anG: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/n;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/n;->anF: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/n;->anx:Ljava/lang/ref/ReferenceQueue;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/n;->anG:Ljava/lang/ref/ReferenceQueue;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/e/n;->anx:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/n;->anG: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/n;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anF: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/n;->anx:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/n;->anG: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/q;-><init>(Ljava/lang/Throwable;Ljava/lang/ref/ReferenceQueue;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anF: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/n;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/e/n;->anF:Ljava/util/concurrent/ConcurrentHashMap;
 
     new-instance v2, Lcom/google/android/gms/internal/e/q;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/e/n;->anx:Ljava/lang/ref/ReferenceQueue;
+    iget-object v3, p0, Lcom/google/android/gms/internal/e/n;->anG:Ljava/lang/ref/ReferenceQueue;
 
     invoke-direct {v2, p1, v3}, Lcom/google/android/gms/internal/e/q;-><init>(Ljava/lang/Throwable;Ljava/lang/ref/ReferenceQueue;)V
 
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 89b2cdb7c2..298b6c04a8 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 @@
 
 
 # static fields
-.field private static final any:[Ljava/lang/Throwable;
+.field private static final anH:[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/o;->any:[Ljava/lang/Throwable;
+    sput-object v0, Lcom/google/android/gms/internal/e/o;->anH:[Ljava/lang/Throwable;
 
     return-void
 .end method
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 ea29db7b90..dda57ac8d7 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 anz:Lcom/google/android/gms/internal/e/n;
+.field private final anI:Lcom/google/android/gms/internal/e/n;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/e/n;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/e/p;->anz:Lcom/google/android/gms/internal/e/n;
+    iput-object v0, p0, Lcom/google/android/gms/internal/e/p;->anI:Lcom/google/android/gms/internal/e/n;
 
     return-void
 .end method
@@ -31,7 +31,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/e/p;->anz:Lcom/google/android/gms/internal/e/n;
+    iget-object v0, p0, Lcom/google/android/gms/internal/e/p;->anI:Lcom/google/android/gms/internal/e/n;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/e/n;->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 cb94dd4614..27670a2fd0 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 private final ajX:Landroid/os/IBinder;
+.field private final akg:Landroid/os/IBinder;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane: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;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/a;->akg:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/a;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/a;->ane: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;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/a;->akg: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/f/a;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/f/a;->akg:Landroid/os/IBinder;
 
     const/4 v2, 0x6
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method protected final nJ()Landroid/os/Parcel;
+.method protected final nM()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/f/a;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/f/a;->ane: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/f/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/f/b.smali
index e31adcc72a..fafa6897af 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 aBu:Lcom/google/android/gms/internal/f/d;
+.field private static aBD: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 772e77a76d..cfaf6ba6cc 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 amX:Ljava/lang/ClassLoader;
+.field private static final ang:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/f/c;->amX:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/f/c;->ang: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 29b4b33102..340e894886 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,41 +23,6 @@
     throw p1
 .end method
 
-.method public final uJ()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final uK()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 uL()V
-    .locals 1
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
 .method public final uM()V
     .locals 1
 
@@ -70,6 +35,11 @@
 
 .method public final uN()V
     .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
 
@@ -107,3 +77,33 @@
 
     throw v0
 .end method
+
+.method public final uR()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final uS()V
+    .locals 1
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final uT()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 b58a27ca44..718d78c0a4 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/i;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLa:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLj: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/i;)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 df5a22465b..006f735835 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,30 +14,6 @@
     .end annotation
 .end method
 
-.method public abstract uJ()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract uK()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
-.method public abstract uL()V
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-.end method
-
 .method public abstract uM()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -77,3 +53,27 @@
         }
     .end annotation
 .end method
+
+.method public abstract uR()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract uS()V
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+.end method
+
+.method public abstract uT()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 80f8eab8e9..6c81433a68 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;->uP()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uS()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;->uO()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uR()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;->uQ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uT()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;->uN()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uQ()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;->uM()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uP()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;->uL()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uO()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;->uK()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uN()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;->uJ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/h;->uM()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 d3dec6ccf2..ad7093fac8 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
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/f/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
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 5299267667..e210b6e101 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 aBv:Lcom/google/android/gms/internal/f/g;
+.field protected aBE: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;->aBv:Lcom/google/android/gms/internal/f/g;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$a;->aBE: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 28220d9831..d924433013 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 aBw:Lcom/google/android/gms/common/api/Status;
+.field private final aBF:Lcom/google/android/gms/common/api/Status;
 
-.field private final aBx:Lcom/google/android/gms/safetynet/zzf;
+.field private final aBG: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;->aBw:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/k$b;->aBF:Lcom/google/android/gms/common/api/Status;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/f/k$b;->aBx:Lcom/google/android/gms/safetynet/zzf;
+    iput-object p2, p0, Lcom/google/android/gms/internal/f/k$b;->aBG:Lcom/google/android/gms/safetynet/zzf;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ml()Lcom/google/android/gms/common/api/Status;
+.method public final mo()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBw:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBF:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 .end method
 
-.method public final uR()Ljava/lang/String;
+.method public final uU()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBx:Lcom/google/android/gms/safetynet/zzf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/k$b;->aBG:Lcom/google/android/gms/safetynet/zzf;
 
     if-nez v0, :cond_0
 
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 43ef7b1886..009abe479f 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
@@ -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;->aBv:Lcom/google/android/gms/internal/f/g;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/l;->aBE:Lcom/google/android/gms/internal/f/g;
 
     iget-object v1, p0, Lcom/google/android/gms/internal/f/l;->zzac:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/f/n;->mU()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 d068143327..0cdedb2781 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 aBy:Lcom/google/android/gms/internal/f/k$a;
+.field private final synthetic aBH: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;->aBy:Lcom/google/android/gms/internal/f/k$a;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/m;->aBH: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;->aBy:Lcom/google/android/gms/internal/f/k$a;
+    iget-object v0, p0, Lcom/google/android/gms/internal/f/m;->aBH: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 550d4d5aa6..357e97e612 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 aBz:Landroid/content/Context;
+.field private final aBI: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/i$a;Lcom/google/android/gms/common/api/i$b;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/f/n;->aBz:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/f/n;->aBI:Landroid/content/Context;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
     return-object v0
 .end method
 
-.method public final lY()I
+.method public final mb()I
     .locals 1
 
     const v0, 0xba2840
@@ -83,7 +83,7 @@
     return v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final md()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 mb()Ljava/lang/String;
+.method public final me()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 64688c3906..a9171f3480 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 anA:Ljava/lang/String;
+.field public anJ:Ljava/lang/String;
 
-.field public anB:I
+.field public anK:I
 
-.field private anC:I
+.field private anL:I
 
-.field private anD:Ljava/lang/String;
+.field private anM:Ljava/lang/String;
 
-.field public anE:Ljava/lang/String;
+.field public anN:Ljava/lang/String;
 
-.field private anF:Z
+.field private anO:Z
 
-.field private anG:Z
+.field private anP:Z
 
 
 # direct methods
@@ -95,11 +95,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->bd(I)I
 
-    iput p1, p0, Lcom/google/android/gms/internal/gtm/a;->anB:I
+    iput p1, p0, Lcom/google/android/gms/internal/gtm/a;->anK:I
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/a;->anG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/a;->anP: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;->anA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anJ: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;->anA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anJ:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anA:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anJ:Ljava/lang/String;
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anB:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anK:I
 
     if-eqz v0, :cond_1
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anB:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anK:I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anC:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/a;->anL:I
 
     if-eqz v0, :cond_2
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anC:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/a;->anL:I
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anM: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;->anD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anM:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anD:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anM:Ljava/lang/String;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anN: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;->anE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/a;->anN: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;->anE:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anN:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_4
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anE:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/a;->anN:Ljava/lang/String;
 
     :cond_5
     :goto_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anF:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anO:Z
 
     if-eqz v0, :cond_6
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anF:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anO:Z
 
     :cond_6
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/a;->anP:Z
 
     if-eqz v0, :cond_7
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anG:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/a;->anP: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;->anA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->anJ: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;->anF:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->anO: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;->anG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/a;->anP: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;->anB:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->anK: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;->anC:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/a;->anL: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;->anD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->anM: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;->anE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/a;->anN: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 97231da30c..2df63cb4c5 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 apb:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/aa;->apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/aa;->apl: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 76ef62c6ee..13f5f78c69 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 apb:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ab;->apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ab;->apl:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->ov()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oy()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 c3749945c9..f5aeab229d 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 apb:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ac;->apl:Lcom/google/android/gms/internal/gtm/y;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -22,12 +22,12 @@
 
 
 # virtual methods
-.method public final oD()V
+.method public final oG()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ac;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ac;->apl:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oB()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 d02f6b6126..e88e32fab6 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 apc:Lcom/google/android/gms/internal/gtm/ad;
+.field public static final enum apm:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum apd:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum apn:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum ape:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum apo:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum apf:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum apq:Lcom/google/android/gms/internal/gtm/ad;
 
-.field public static final enum apg:Lcom/google/android/gms/internal/gtm/ad;
+.field public static final enum apr:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final enum aph:Lcom/google/android/gms/internal/gtm/ad;
+.field private static final enum aps:Lcom/google/android/gms/internal/gtm/ad;
 
-.field private static final synthetic apj:[Lcom/google/android/gms/internal/gtm/ad;
+.field private static final synthetic apt:[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;->apc:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apm: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;->apd:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apn: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;->ape:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apo: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;->apf:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apq: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;->apg:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apr: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;->aph:Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->aps: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;->apc:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->apm:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apd:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apn:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->ape:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apo:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apf:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apq:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apg:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->apr:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->aph:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ad;->aps:Lcom/google/android/gms/internal/gtm/ad;
 
     aput-object v1, v0, v6
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apj:[Lcom/google/android/gms/internal/gtm/ad;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ad;->apt:[Lcom/google/android/gms/internal/gtm/ad;
 
     return-void
 .end method
@@ -149,7 +149,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apd:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apn: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;->ape:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apo: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;->apf:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apq: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;->apg:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apr: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;->aph:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->aps:Lcom/google/android/gms/internal/gtm/ad;
 
     return-object p0
 
     :cond_4
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apc:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ad;->apm: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;->apj:[Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/ad;->apt:[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 1f9d89ec72..60f9f05528 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,9 @@
 
 
 # instance fields
-.field private volatile aov:Ljava/lang/String;
+.field private volatile aoE:Ljava/lang/String;
 
-.field private apk:Ljava/util/concurrent/Future;
+.field private apu:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -398,25 +398,25 @@
 
 
 # virtual methods
-.method protected final nQ()V
+.method protected final nT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final oE()Ljava/lang/String;
+.method public final oH()Ljava/lang/String;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -428,17 +428,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apk:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apu:Ljava/util/concurrent/Future;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apk:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apu: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;->apk:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apu:Ljava/util/concurrent/Future;
 
     invoke-interface {v0}, Ljava/util/concurrent/Future;->get()Ljava/lang/Object;
 
@@ -446,7 +446,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE: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
@@ -464,7 +464,7 @@
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     goto :goto_0
 
@@ -477,30 +477,30 @@
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
     const-string v0, "0"
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     :cond_1
     const-string v0, "Loaded clientId"
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apk:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apu:Ljava/util/concurrent/Future;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
     monitor-exit p0
 
@@ -516,7 +516,7 @@
     throw v0
 .end method
 
-.method final oF()Ljava/lang/String;
+.method final oI()Ljava/lang/String;
     .locals 2
 
     monitor-enter p0
@@ -524,9 +524,9 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aov:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->aoE:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -538,13 +538,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apk:Ljava/util/concurrent/Future;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ae;->apu: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;->oE()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
 
     move-result-object v0
 
@@ -561,14 +561,14 @@
     throw v0
 .end method
 
-.method final oG()Ljava/lang/String;
+.method final oJ()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aeA:Landroid/content/Context;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/gtm/ae;->ac(Landroid/content/Context;)Ljava/lang/String;
 
@@ -576,7 +576,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ae;->oK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -584,7 +584,7 @@
     return-object v0
 .end method
 
-.method final oH()Ljava/lang/String;
+.method final oK()Ljava/lang/String;
     .locals 3
 
     const-string v0, "0"
@@ -604,11 +604,11 @@
     move-result-object v1
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/analytics/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/analytics/m;->aeA: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 07fb97ee83..a4bd723a6a 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 apl:Lcom/google/android/gms/internal/gtm/ae;
+.field private final synthetic apv: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;->apl:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/af;->apv: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;->apl:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/af;->apv:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oG()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oJ()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 03f9ff3d83..12e4c1ea38 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 apl:Lcom/google/android/gms/internal/gtm/ae;
+.field private final synthetic apv: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;->apl:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ag;->apv: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;->apl:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ag;->apv:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ae;->oK()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 d45c56a3cb..25530f6551 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 apo:Lcom/google/android/gms/internal/gtm/ai;
+.field private static final synthetic apA:[Lcom/google/android/gms/internal/gtm/ai;
 
-.field public static final enum apq:Lcom/google/android/gms/internal/gtm/ai;
+.field private static final enum apy:Lcom/google/android/gms/internal/gtm/ai;
 
-.field private static final synthetic apr:[Lcom/google/android/gms/internal/gtm/ai;
+.field public static final enum apz: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;->apo:Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apy: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;->apq:Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apz: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;->apo:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/ai;->apy:Lcom/google/android/gms/internal/gtm/ai;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/ai;->apq:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/ai;->apz:Lcom/google/android/gms/internal/gtm/ai;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apr:[Lcom/google/android/gms/internal/gtm/ai;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/ai;->apA:[Lcom/google/android/gms/internal/gtm/ai;
 
     return-void
 .end method
@@ -85,12 +85,12 @@
 
     if-eqz p0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apq:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apz:Lcom/google/android/gms/internal/gtm/ai;
 
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apo:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/ai;->apy: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;->apr:[Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/ai;->apA:[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 725abc6e7f..54b7904a66 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 aps:Lcom/google/android/gms/internal/gtm/al;
+.field private apB: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;->aps:Lcom/google/android/gms/internal/gtm/al;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/ak;->apB: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;->aps:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ak;->apB:Lcom/google/android/gms/internal/gtm/al;
 
     invoke-interface {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/al;->D(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;->aps:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->apB: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;->aps:Lcom/google/android/gms/internal/gtm/al;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/ak;->apB:Lcom/google/android/gms/internal/gtm/al;
 
     invoke-interface {v3, v0, v2}, Lcom/google/android/gms/internal/gtm/al;->k(Ljava/lang/String;I)V
     :try_end_4
@@ -301,9 +301,9 @@
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ak;->aps:Lcom/google/android/gms/internal/gtm/al;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ak;->apB:Lcom/google/android/gms/internal/gtm/al;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/al;->oI()Lcom/google/android/gms/internal/gtm/aj;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/al;->oL()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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoe:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aon: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 22494015cd..efa89f2ca9 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
@@ -23,7 +23,7 @@
 .method public abstract k(Ljava/lang/String;I)V
 .end method
 
-.method public abstract oI()Lcom/google/android/gms/internal/gtm/aj;
+.method public abstract oL()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 3f36f200c1..f3bafc68d3 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 adU:Lcom/google/android/gms/internal/gtm/m;
+.field private final aee:Lcom/google/android/gms/internal/gtm/m;
 
-.field private volatile apt:Ljava/lang/Boolean;
+.field private volatile apC:Ljava/lang/Boolean;
 
-.field private apu:Ljava/lang/String;
+.field private apD:Ljava/lang/String;
 
-.field private apv:Ljava/util/Set;
+.field private apE: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;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/am;->aee:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
 
-.method public static oK()Z
+.method public static oN()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apF:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apO:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Boolean;
 
@@ -49,12 +49,76 @@
     return v0
 .end method
 
-.method public static oL()I
+.method public static oO()I
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aql:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static oP()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apW:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    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 static oQ()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apZ:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    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 static oR()I
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqb:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Integer;
+
+    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public static oS()I
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqc:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -65,112 +129,48 @@
     return v0
 .end method
 
-.method public static oM()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apN:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    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 static oN()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apQ:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    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 static oO()I
+.method public static oT()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apS:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqe:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static oP()I
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apT:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Integer;
-
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public static oQ()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apV:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static oR()Ljava/lang/String;
+.method public static oU()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apU:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqd:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static oS()Ljava/lang/String;
+.method public static oV()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apW:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqf:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public static oU()J
+.method public static oX()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqk:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqt:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -183,29 +183,29 @@
 
 
 # virtual methods
-.method public final oJ()Z
+.method public final oM()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apt:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC: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;->apt:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA: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;->nu()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->nx()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;->apt:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apt:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apt:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -259,20 +259,20 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apt:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apt:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC: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;->apt:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -296,7 +296,7 @@
 
     :cond_5
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apt:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apC:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -305,7 +305,7 @@
     return v0
 .end method
 
-.method public final oT()Ljava/util/Set;
+.method public final oW()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;->aqf:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqo:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apv:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apE:Ljava/util/Set;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apu:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/am;->apD: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;->apu:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apD:Ljava/lang/String;
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/am;->apv:Ljava/util/Set;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/am;->apE:Ljava/util/Set;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apv:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/am;->apE: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 12d910f225..d5e481843a 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 apw:I
+.field private apF:I
 
 
 # direct methods
@@ -17,17 +17,17 @@
 
     const/4 v0, 0x2
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/an;->apw:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/an;->apF:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final lC()I
+.method public final lF()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/an;->apw:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/an;->apF: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 ec8714afa0..9f4570779b 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 aoa:Lcom/google/android/gms/internal/gtm/m;
+.field private final aoj:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final apx:Ljava/lang/Runnable;
+.field private final apG:Ljava/lang/Runnable;
 
-.field private volatile apy:J
+.field private volatile apH: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj: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;->apx:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ao;->apG: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj: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;->apy:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA: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;->apy:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH: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;->apx:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apG:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
     return-void
 .end method
 
-.method public final oV()J
+.method public final oY()J
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apy:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem: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;->apy:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ao;->apH:J
 
     sub-long/2addr v0, v2
 
@@ -156,10 +156,10 @@
     return-wide v0
 .end method
 
-.method public final oW()Z
+.method public final oZ()Z
     .locals 5
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apy:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem: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;->apy:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/ao;->apH: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;->apx:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apG: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -234,7 +234,7 @@
 .method public final w(J)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ao;->oW()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ao;->oZ()Z
 
     move-result v0
 
@@ -254,15 +254,15 @@
     return-void
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aem: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;->apy:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/ao;->apH: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;->apx:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apG: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;->apx:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ao;->apG: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ao;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()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 6fd10b03fc..05adb344ba 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 apz:Lcom/google/android/gms/internal/gtm/ao;
+.field private final synthetic apI: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;->apz:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ap;->apI: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;->apz:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->apI: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;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()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;->apz:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->apI:Lcom/google/android/gms/internal/gtm/ao;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oW()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oZ()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ap;->apz:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ap;->apI: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;->apz:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ap;->apI: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 0893d66a01..ea7dea7f19 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,22 +13,22 @@
 
 
 # virtual methods
-.method protected final nQ()V
+.method protected final nT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final oX()Lcom/google/android/gms/internal/gtm/cd;
+.method public final pa()Lcom/google/android/gms/internal/gtm/cd;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/analytics/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
 
@@ -50,15 +50,15 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arM:Ljava/lang/String;
+    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arV:Ljava/lang/String;
 
     iget v2, v0, Landroid/util/DisplayMetrics;->widthPixels:I
 
-    iput v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arO:I
+    iput v2, v1, Lcom/google/android/gms/internal/gtm/cd;->arX:I
 
     iget v0, v0, Landroid/util/DisplayMetrics;->heightPixels:I
 
-    iput v0, v1, Lcom/google/android/gms/internal/gtm/cd;->arP:I
+    iput v0, v1, Lcom/google/android/gms/internal/gtm/cd;->arY: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 bdd2bd0bf5..03af7acfe5 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 apA:Z
+.field apJ:Z
 
-.field apB:Z
+.field apK:Z
 
-.field private final apC:Landroid/app/AlarmManager;
+.field private final apL:Landroid/app/AlarmManager;
 
-.field private apD:Ljava/lang/Integer;
+.field private apM:Ljava/lang/Integer;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/gtm/k;-><init>(Lcom/google/android/gms/internal/gtm/m;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     const-string v0, "alarm"
 
@@ -30,17 +30,17 @@
 
     check-cast p1, Landroid/app/AlarmManager;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ar;->apC:Landroid/app/AlarmManager;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ar;->apL:Landroid/app/AlarmManager;
 
     return-void
 .end method
 
-.method private final oZ()Landroid/app/PendingIntent;
+.method private final pc()Landroid/app/PendingIntent;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     new-instance v1, Landroid/content/Intent;
 
@@ -67,18 +67,18 @@
     return-object v0
 .end method
 
-.method private final pa()I
+.method private final pd()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apD:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apM:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
     const-string v0, "analytics"
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -116,10 +116,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apD:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apM:Ljava/lang/Integer;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apD:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apM:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -135,11 +135,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apB:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apK:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apC:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apL:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->oZ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pc()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -151,9 +151,9 @@
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     const-string v1, "jobscheduler"
 
@@ -163,7 +163,7 @@
 
     check-cast v0, Landroid/app/job/JobScheduler;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pa()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pd()I
 
     move-result v1
 
@@ -181,13 +181,13 @@
     return-void
 .end method
 
-.method protected final nQ()V
+.method protected final nT()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;->oN()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()J
 
     move-result-wide v0
 
@@ -197,9 +197,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -229,7 +229,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apA:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apJ: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 oY()V
+.method public final pb()V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apA:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apJ: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;->oN()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()J
 
     move-result-wide v6
 
@@ -261,11 +261,11 @@
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/ar;->cancel()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
@@ -273,11 +273,11 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apB:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ar;->apK:Z
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqv:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqE:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Boolean;
 
@@ -293,9 +293,9 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     new-instance v2, Landroid/content/ComponentName;
 
@@ -303,7 +303,7 @@
 
     invoke-direct {v2, v1, v3}, Landroid/content/ComponentName;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pa()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pd()I
 
     move-result v3
 
@@ -360,11 +360,11 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ar;->apC:Landroid/app/AlarmManager;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/ar;->apL:Landroid/app/AlarmManager;
 
     const/4 v3, 0x2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->oZ()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/ar;->pc()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 9fd792cf7c..fdc91696fe 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 oD()V
+.method public abstract oG()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 110243a38e..9fe632ee1d 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,7 +3,7 @@
 
 
 # static fields
-.field private static apE:Lcom/google/android/gms/internal/gtm/av;
+.field private static apN:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field public static apF:Lcom/google/android/gms/internal/gtm/av;
+.field public static apO:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field public static apG:Lcom/google/android/gms/internal/gtm/av;
+.field public static apP:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private static apH:Lcom/google/android/gms/internal/gtm/av;
+.field private static apQ:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private static apI:Lcom/google/android/gms/internal/gtm/av;
+.field private static apR:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -53,96 +53,6 @@
     .end annotation
 .end field
 
-.field public static apJ: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 apK: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 apL: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 apM: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 apN: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 apO: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 apP: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 apQ: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 apR: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 apS:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -153,7 +63,7 @@
     .end annotation
 .end field
 
-.field public static apT:Lcom/google/android/gms/internal/gtm/av;
+.field private static apT:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -167,7 +77,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -177,7 +87,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -187,27 +97,27 @@
     .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 apX:Lcom/google/android/gms/internal/gtm/av;
+.field private static apX: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 apY:Lcom/google/android/gms/internal/gtm/av;
+.field private static apY: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
@@ -217,7 +127,57 @@
     .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 aqA: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 aqB: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 aqC: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 aqD: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 aqE: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
@@ -227,13 +187,13 @@
     .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 aqb:Lcom/google/android/gms/internal/gtm/av;
+.field public static aqb:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -257,7 +217,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -267,7 +227,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -287,17 +247,17 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
-.field private static aqh:Lcom/google/android/gms/internal/gtm/av;
+.field public static aqh: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
@@ -307,33 +267,13 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
 .end field
 
 .field public static aqj: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 aqk: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 aql:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -343,7 +283,27 @@
     .end annotation
 .end field
 
-.field private static aqm:Lcom/google/android/gms/internal/gtm/av;
+.field private static aqk: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 aql: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 aqm:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -357,7 +317,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -367,7 +327,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -377,7 +337,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -393,11 +353,11 @@
     .end annotation
 .end field
 
-.field private static aqr:Lcom/google/android/gms/internal/gtm/av;
+.field public static aqr: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
@@ -407,7 +367,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -423,7 +383,37 @@
     .end annotation
 .end field
 
-.field public static aqu:Lcom/google/android/gms/internal/gtm/av;
+.field private static aqu: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 aqv: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 aqw: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 aqx:Lcom/google/android/gms/internal/gtm/av;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/gtm/av<",
@@ -433,11 +423,21 @@
     .end annotation
 .end field
 
-.field public static aqv:Lcom/google/android/gms/internal/gtm/av;
+.field public static aqy: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/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aqz: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
@@ -456,7 +456,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apE:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apN: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;->apF:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apO: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;->apG:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apP: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;->apH:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apQ: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;->apI:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apR: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;->apJ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->apS: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;->apK:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apT: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;->apL:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apU: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;->apM:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v5, Lcom/google/android/gms/internal/gtm/au;->apV: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;->apN:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->apW: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;->apO:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apX: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;->apP:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->apY: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;->apQ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->apZ: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;->apR:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqa: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;->apS:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqb: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;->apT:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqc: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;->apU:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqd: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;->apV:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqe: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;->apW:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqf: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;->apX:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqg: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;->apY:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqh:Lcom/google/android/gms/internal/gtm/av;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/ad;->apg:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/ad;->apr: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;->apg:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/ad;->apr: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;->apZ:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqi:Lcom/google/android/gms/internal/gtm/av;
 
-    sget-object v2, Lcom/google/android/gms/internal/gtm/ai;->apq:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/ai;->apz: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;->aqa:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqj: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;->aqb:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqk: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;->aqc:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aql: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;->aqd:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v2, Lcom/google/android/gms/internal/gtm/au;->aqm: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;->aqe:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqn: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;->aqf:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqo: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;->aqg:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqp: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;->aqh:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqq: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;->aqi:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqr: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;->aqj:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqs: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;->aqk:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqt: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;->aql:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqu: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;->aqm:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqv: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;->aqn:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqw: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;->aqo:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqx: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;->aqp:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqy: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;->aqq:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqz: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;->aqr:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v7, Lcom/google/android/gms/internal/gtm/au;->aqA: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;->aqs:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v3, Lcom/google/android/gms/internal/gtm/au;->aqB: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;->aqt:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqC: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;->aqu:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v1, Lcom/google/android/gms/internal/gtm/au;->aqD: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;->aqv:Lcom/google/android/gms/internal/gtm/av;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/au;->aqE: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 ec367ce087..9755377796 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 aqw:Ljava/lang/Object;
+.field final aqF:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final aqx:Lcom/google/android/gms/common/a/a;
+.field private final aqG: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;->aqx:Lcom/google/android/gms/common/a/a;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/av;->aqG:Lcom/google/android/gms/common/a/a;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/av;->aqF: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 f31cf55065..529c3df8cd 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 aoa:Lcom/google/android/gms/internal/gtm/m;
+.field private final aoj:Lcom/google/android/gms/internal/gtm/m;
 
-.field private final aqy:Lcom/google/android/gms/internal/gtm/ay;
+.field private final aqH: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj: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;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
     return-void
 .end method
@@ -52,9 +52,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqz:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqI:Ljava/lang/String;
 
     return-void
 
@@ -67,9 +67,9 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqA:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqJ:Ljava/lang/String;
 
     return-void
 
@@ -82,16 +82,16 @@
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqB:Ljava/lang/String;
+    iput-object p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqK:Ljava/lang/String;
 
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -113,16 +113,16 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqD:I
+    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqM:I
 
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -144,16 +144,16 @@
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
-    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqC:I
+    iput p2, p1, Lcom/google/android/gms/internal/gtm/ay;->aqL:I
 
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/ax;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -164,10 +164,10 @@
     return-void
 .end method
 
-.method public final synthetic oI()Lcom/google/android/gms/internal/gtm/aj;
+.method public final synthetic oL()Lcom/google/android/gms/internal/gtm/aj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ax;->aqy:Lcom/google/android/gms/internal/gtm/ay;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ax;->aqH:Lcom/google/android/gms/internal/gtm/ay;
 
     return-object v0
 .end method
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 c65ec89941..457288c191 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 aqA:Ljava/lang/String;
+.field public aqI:Ljava/lang/String;
 
-.field public aqB:Ljava/lang/String;
+.field public aqJ:Ljava/lang/String;
 
-.field public aqC:I
+.field public aqK:Ljava/lang/String;
 
-.field public aqD:I
+.field public aqL:I
 
-.field public aqz:Ljava/lang/String;
+.field public aqM:I
 
 
 # direct methods
@@ -25,9 +25,9 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqC:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqL:I
 
-    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqD:I
+    iput v0, p0, Lcom/google/android/gms/internal/gtm/ay;->aqM: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 17f7668142..52a4d93a50 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 aoz:Ljava/util/Map;
+.field final aoI:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field final aqE:Ljava/util/List;
+.field final aqN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,15 +24,15 @@
     .end annotation
 .end field
 
-.field final aqF:J
+.field final aqO:J
 
-.field final aqG:J
+.field final aqP:J
 
-.field final aqH:I
+.field final aqQ:I
 
-.field final aqI:Z
+.field final aqR:Z
 
-.field private final aqJ:Ljava/lang/String;
+.field private final aqS: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;->aqG:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/az;->aqP:J
 
-    iput-boolean p5, p0, Lcom/google/android/gms/internal/gtm/az;->aqI:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
-    iput-wide p6, p0, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iput-wide p6, p0, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
-    iput p8, p0, Lcom/google/android/gms/internal/gtm/az;->aqH:I
+    iput p8, p0, Lcom/google/android/gms/internal/gtm/az;->aqQ: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;->aqE:Ljava/util/List;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->aqN: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;->apm:Ljava/lang/String;
+    iget-object p6, p5, Lcom/google/android/gms/internal/gtm/zzbk;->apw: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;->aqJ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/az;->aqS: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;->aqJ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqS: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;->aqJ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqS: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;->aqJ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqS: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;->aqJ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aqS: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;->aoz:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/az;->aoI:Ljava/util/Map;
 
     return-void
 .end method
@@ -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;->aoz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/az;->aoI: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;->aqG:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqP: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;->aqF:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aqF:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqO: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;->aqH:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqQ: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;->aqH:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/az;->aqQ: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;->aoz:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/az;->aoI: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;->aoz:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/az;->aoI: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 18e7d87f8c..95ed0b3dfb 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,11 +13,11 @@
 
 
 # instance fields
-.field public anH:Ljava/lang/String;
+.field public anQ:Ljava/lang/String;
 
-.field public anI:Ljava/lang/String;
+.field public anR:Ljava/lang/String;
 
-.field public anJ:Ljava/lang/String;
+.field public anS:Ljava/lang/String;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/b;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anQ: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/b;->anH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anQ:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anH:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anQ:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anR: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;->anI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anR:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anI:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anR:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anS: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;->anJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/b;->anS:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anJ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/b;->anS:Ljava/lang/String;
 
     :cond_2
     return-void
@@ -85,19 +85,19 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anQ:Ljava/lang/String;
 
     const-string v2, "network"
 
     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;->anI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anR: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;->anJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/b;->anS: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 2cbccb3d58..725a28089a 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
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bx;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bx;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
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 4dfba93066..8056b8908c 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 aqK:Lcom/google/android/gms/analytics/c;
+.field private static volatile aqT: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;->aqK:Lcom/google/android/gms/analytics/c;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqT:Lcom/google/android/gms/analytics/c;
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public static p(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bd;->pb()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bd;->pe()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;->aqK:Lcom/google/android/gms/analytics/c;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqT:Lcom/google/android/gms/analytics/c;
 
     const/4 v1, 0x1
 
@@ -46,9 +46,9 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqK:Lcom/google/android/gms/analytics/c;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bc;->aqT:Lcom/google/android/gms/analytics/c;
 
-    invoke-interface {v0}, Lcom/google/android/gms/analytics/c;->lC()I
+    invoke-interface {v0}, Lcom/google/android/gms/analytics/c;->lF()I
 
     move-result v0
 
@@ -104,9 +104,9 @@
     move-result-object p0
 
     :cond_2
-    sget-object p1, Lcom/google/android/gms/internal/gtm/au;->apG:Lcom/google/android/gms/internal/gtm/av;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/au;->apP:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/av;->aqF: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 4671ee8ea4..e964d91b0e 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 aqL:Lcom/google/android/gms/internal/gtm/bd;
+.field private static aqU:Lcom/google/android/gms/internal/gtm/bd;
 
 
 # direct methods
@@ -193,10 +193,10 @@
     return-object v1
 .end method
 
-.method public static pb()Lcom/google/android/gms/internal/gtm/bd;
+.method public static pe()Lcom/google/android/gms/internal/gtm/bd;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bd;->aqL:Lcom/google/android/gms/internal/gtm/bd;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bd;->aqU:Lcom/google/android/gms/internal/gtm/bd;
 
     return-object v0
 .end method
@@ -269,11 +269,11 @@
     const/16 p1, 0x8
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aof:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/am;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/am;->oJ()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/am;->oM()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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aol:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/bh;
 
     if-eqz p3, :cond_5
 
-    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aol:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/m;->aou: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;->aol:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/m;->aou: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;->aqY:Lcom/google/android/gms/internal/gtm/bi;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/bh;->arh:Lcom/google/android/gms/internal/gtm/bi;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->po()J
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pr()J
 
     move-result-wide p3
 
@@ -408,7 +408,7 @@
 
     if-nez p5, :cond_6
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pm()V
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pp()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;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pq()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pt()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;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p3, p2, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object p3, p3, Lcom/google/android/gms/internal/gtm/bh;->are: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;->pr()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pu()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;->pq()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pt()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;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object p5, p2, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object p5, p5, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object p5, p5, Lcom/google/android/gms/internal/gtm/bh;->are: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;->pr()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pu()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;->pq()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/bi;->pt()Ljava/lang/String;
 
     move-result-object p1
 
@@ -667,7 +667,7 @@
     return-void
 .end method
 
-.method protected final nQ()V
+.method protected final nT()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;->aqL:Lcom/google/android/gms/internal/gtm/bd;
+    sput-object p0, Lcom/google/android/gms/internal/gtm/bd;->aqU: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 fc8ec2a316..f78058265a 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 aqM:Ljava/lang/String;
+.field static final aqV:Ljava/lang/String;
 
 
 # instance fields
-.field final aoa:Lcom/google/android/gms/internal/gtm/m;
+.field final aoj:Lcom/google/android/gms/internal/gtm/m;
 
-.field private aqN:Z
+.field private aqW:Z
 
-.field private aqO:Z
+.field private aqX:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/be;->aqM:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/be;->aqV: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
 
-.method private final pd()V
+.method private final pg()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     return-void
 .end method
 
-.method private final pe()Z
+.method private final ph()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     const-string v1, "connectivity"
 
@@ -101,13 +101,13 @@
 .method public final isConnected()Z
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqW:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -116,7 +116,7 @@
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqO:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
 
     return v0
 .end method
@@ -124,15 +124,15 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pd()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pg()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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -148,19 +148,19 @@
 
     if-eqz v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pe()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->ph()Z
 
     move-result p1
 
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/be;->aqO:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
 
     if-eq p2, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/be;->aqO:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p2
 
@@ -172,9 +172,9 @@
 
     invoke-virtual {p2, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p2, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -196,7 +196,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object p1, Lcom/google/android/gms/internal/gtm/be;->aqM:Ljava/lang/String;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/be;->aqV:Ljava/lang/String;
 
     invoke-virtual {p2, p1}, Landroid/content/Intent;->hasExtra(Ljava/lang/String;)Z
 
@@ -204,9 +204,9 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object p1
 
@@ -214,15 +214,15 @@
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/e;->nW()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/e;->nZ()V
 
     :cond_2
     return-void
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p2
 
@@ -233,21 +233,21 @@
     return-void
 .end method
 
-.method public final pc()V
+.method public final pf()V
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pd()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->pg()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqW:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     new-instance v1, Landroid/content/IntentFilter;
 
@@ -271,19 +271,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;->pe()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/be;->ph()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqO:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/be;->aqO:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -295,7 +295,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqW:Z
 
     return-void
 .end method
@@ -303,16 +303,16 @@
 .method public final unregister()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqN:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqW:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -322,13 +322,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqN:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqW:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqO:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/be;->aqX:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->om()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 fe0c976234..e67e3df389 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 aqR:[B
+.field private static final ara:[B
 
 
 # instance fields
-.field private final aqP:Ljava/lang/String;
+.field private final aqY:Ljava/lang/String;
 
-.field private final aqQ:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aqZ: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;->aqR:[B
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bf;->ara:[B
 
     return-void
 .end method
@@ -84,15 +84,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqP:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqY:Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aem: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;->aqQ:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqZ: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;->og()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->oj()Z
 
     move-result v1
 
@@ -134,9 +134,9 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -174,11 +174,11 @@
 
     if-ne p2, v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->nZ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->oc()V
 
     :cond_1
     const-string v2, "POST status"
@@ -361,11 +361,11 @@
 
     if-ne p1, v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/e;->nZ()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/e;->oc()V
 
     :cond_0
     const-string v1, "GET status"
@@ -431,9 +431,9 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -506,7 +506,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;->og()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->oj()Z
 
     move-result v3
 
@@ -591,11 +591,11 @@
 
     if-ne p2, v2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->nZ()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/e;->oc()V
 
     :cond_3
     const-string v2, "POST status"
@@ -740,17 +740,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;->aqI:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
     const-string v0, "?"
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -803,11 +803,11 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()Ljava/lang/String;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
 
     move-result-object v1
 
@@ -985,9 +985,9 @@
 
     invoke-virtual {p1, v0}, Ljava/net/HttpURLConnection;->setDefaultUseCaches(Z)V
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqi:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqr:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -997,9 +997,9 @@
 
     invoke-virtual {p1, v1}, Ljava/net/HttpURLConnection;->setConnectTimeout(I)V
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqj:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqs:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Integer;
 
@@ -1011,7 +1011,7 @@
 
     invoke-virtual {p1, v0}, Ljava/net/HttpURLConnection;->setInstanceFollowRedirects(Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqY:Ljava/lang/String;
 
     const-string v1, "User-Agent"
 
@@ -1036,11 +1036,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;->aqI:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
     if-eqz p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1048,7 +1048,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1079,7 +1079,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1087,7 +1087,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oV()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1136,10 +1136,10 @@
     return-object p1
 .end method
 
-.method private final pf()Ljava/net/URL;
+.method private final pi()Ljava/net/URL;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1147,9 +1147,9 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->apX:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqg:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/String;
 
@@ -1198,10 +1198,10 @@
     return-object v0
 .end method
 
-.method static synthetic pg()[B
+.method static synthetic pj()[B
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bf;->aqR:[B
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bf;->ara:[B
 
     return-object v0
 .end method
@@ -1218,7 +1218,7 @@
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
     :try_start_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoz:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoI:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -1302,7 +1302,7 @@
     goto :goto_0
 
     :cond_1
-    iget-wide v1, p1, Lcom/google/android/gms/internal/gtm/az;->aqG:J
+    iget-wide v1, p1, Lcom/google/android/gms/internal/gtm/az;->aqP:J
 
     invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -1310,15 +1310,15 @@
 
     invoke-static {v0, v5, v1}, Lcom/google/android/gms/internal/gtm/bf;->a(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v1
 
-    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aqG:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aqP:J
 
     sub-long/2addr v1, v5
 
@@ -1355,7 +1355,7 @@
     goto :goto_1
 
     :cond_2
-    iget-wide p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide p1, p1, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -1399,17 +1399,17 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aof:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oW()Ljava/util/Set;
 
     move-result-object v0
 
@@ -1423,11 +1423,11 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqQ:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqZ:Lcom/google/android/gms/internal/gtm/bp;
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqg:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqp:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/Integer;
 
@@ -1450,9 +1450,9 @@
     goto :goto_1
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apZ:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqi:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -1460,7 +1460,7 @@
 
     move-result-object v0
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/ad;->apc:Lcom/google/android/gms/internal/gtm/ad;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/ad;->apm:Lcom/google/android/gms/internal/gtm/ad;
 
     if-eq v0, v3, :cond_1
 
@@ -1472,9 +1472,9 @@
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqa:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqj:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/String;
 
@@ -1482,7 +1482,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/internal/gtm/ai;->apq:Lcom/google/android/gms/internal/gtm/ai;
+    sget-object v4, Lcom/google/android/gms/internal/gtm/ai;->apz:Lcom/google/android/gms/internal/gtm/ai;
 
     if-ne v3, v4, :cond_3
 
@@ -1561,7 +1561,7 @@
 
     if-eqz v5, :cond_4
 
-    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1572,14 +1572,14 @@
     goto :goto_3
 
     :cond_4
-    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->aqS:I
+    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->arb:I
 
     if-nez p1, :cond_5
 
     return-object v2
 
     :cond_5
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bf;->pf()Ljava/net/URL;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bf;->pi()Ljava/net/URL;
 
     move-result-object p1
 
@@ -1594,7 +1594,7 @@
     :cond_6
     if-eqz v0, :cond_7
 
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->arc:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
 
@@ -1607,7 +1607,7 @@
     goto :goto_4
 
     :cond_7
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/bg;->arc:Ljava/io/ByteArrayOutputStream;
 
     invoke-virtual {v0}, Ljava/io/ByteArrayOutputStream;->toByteArray()[B
 
@@ -1620,7 +1620,7 @@
     :goto_4
     if-ne v4, p1, :cond_8
 
-    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->aqS:I
+    iget p1, v1, Lcom/google/android/gms/internal/gtm/bg;->arb:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1641,11 +1641,11 @@
 
     invoke-virtual {p0, v1, v0}, 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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aof:Lcom/google/android/gms/internal/gtm/am;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/am;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/am;->oW()Ljava/util/Set;
 
     move-result-object v0
 
@@ -1663,7 +1663,7 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bf;->aqQ:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bf;->aqZ:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
@@ -1703,7 +1703,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;->aqI:Z
+    iget-boolean v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
     xor-int/2addr v5, v2
 
@@ -1713,9 +1713,9 @@
 
     if-nez v5, :cond_c
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v5
 
@@ -1733,9 +1733,9 @@
 
     move-result v6
 
-    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->apY:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aqh:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v7, Ljava/lang/Integer;
 
@@ -1780,9 +1780,9 @@
 
     if-nez v5, :cond_10
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v5
 
@@ -1799,9 +1799,9 @@
 
     array-length v6, v5
 
-    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aqd:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v7, Lcom/google/android/gms/internal/gtm/au;->aqm:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v7, Ljava/lang/Integer;
 
@@ -1811,9 +1811,9 @@
 
     if-le v6, v7, :cond_11
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v5, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v5
 
@@ -1848,7 +1848,7 @@
     :goto_9
     if-eqz v5, :cond_13
 
-    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v5, v3, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1860,7 +1860,7 @@
 
     move-result v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()I
 
     move-result v5
 
@@ -1870,10 +1870,10 @@
     return-object v0
 .end method
 
-.method protected final nQ()V
+.method protected final nT()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqP:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bf;->aqY:Ljava/lang/String;
 
     const-string v1, "Network initialized. User agent"
 
@@ -1882,16 +1882,16 @@
     return-void
 .end method
 
-.method public final pe()Z
+.method public final ph()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     const-string v1, "connectivity"
 
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 9638248f6e..d4711cb76f 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 aqS:I
+.field arb:I
 
-.field aqT:Ljava/io/ByteArrayOutputStream;
+.field arc:Ljava/io/ByteArrayOutputStream;
 
-.field private final synthetic aqU:Lcom/google/android/gms/internal/gtm/bf;
+.field private final synthetic ard: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;->aqU:Lcom/google/android/gms/internal/gtm/bf;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->ard: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;->aqT:Ljava/io/ByteArrayOutputStream;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arc: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;->aqS:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/bg;->arb:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()I
 
     move-result v2
 
@@ -51,7 +51,7 @@
     return v3
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqU:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard: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;->aqU:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard:Lcom/google/android/gms/internal/gtm/bf;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()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;->oL()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()I
 
     move-result v4
 
     if-le v2, v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqU:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard:Lcom/google/android/gms/internal/gtm/bf;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()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;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arc: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;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arc: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;->aqe:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/au;->aqn:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/av;->aqF: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;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arc: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;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arc:Ljava/io/ByteArrayOutputStream;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->pg()[B
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bf;->pj()[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;->aqT:Ljava/io/ByteArrayOutputStream;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arc: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;->aqS:I
+    iget p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arb:I
 
     add-int/2addr p1, v1
 
-    iput p1, p0, Lcom/google/android/gms/internal/gtm/bg;->aqS:I
+    iput p1, p0, Lcom/google/android/gms/internal/gtm/bg;->arb:I
 
     return v1
 
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->aqU:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bg;->ard: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 7d1faf7189..57bc5306e0 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 aqV:Landroid/content/SharedPreferences;
+.field are:Landroid/content/SharedPreferences;
 
-.field private aqW:J
+.field private arf:J
 
-.field private aqX:J
+.field private arg:J
 
-.field final aqY:Lcom/google/android/gms/internal/gtm/bi;
+.field final arh:Lcom/google/android/gms/internal/gtm/bi;
 
 
 # direct methods
@@ -20,13 +20,13 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqX:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg:J
 
     new-instance p1, Lcom/google/android/gms/internal/gtm/bi;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqt:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqC:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Long;
 
@@ -44,7 +44,7 @@
 
     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;->aqY:Lcom/google/android/gms/internal/gtm/bi;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bh;->arh:Lcom/google/android/gms/internal/gtm/bi;
 
     return-void
 .end method
@@ -54,11 +54,11 @@
 .method public final bv(Ljava/lang/String;)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -94,12 +94,12 @@
     return-void
 .end method
 
-.method protected final nQ()V
+.method protected final nT()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     const-string v1, "com.google.android.gms.analytics.prefs"
 
@@ -109,19 +109,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
     return-void
 .end method
 
-.method public final ph()J
+.method public final pk()J
     .locals 6
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqW:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arf: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;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
     const-string v1, "first_run"
 
@@ -141,20 +141,20 @@
 
     if-eqz v0, :cond_0
 
-    iput-wide v4, p0, Lcom/google/android/gms/internal/gtm/bh;->aqW:J
+    iput-wide v4, p0, Lcom/google/android/gms/internal/gtm/bh;->arf:J
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -173,25 +173,25 @@
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
 
     :cond_1
-    iput-wide v2, p0, Lcom/google/android/gms/internal/gtm/bh;->aqW:J
+    iput-wide v2, p0, Lcom/google/android/gms/internal/gtm/bh;->arf:J
 
     :cond_2
     :goto_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqW:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arf:J
 
     return-wide v0
 .end method
 
-.method public final pi()Lcom/google/android/gms/internal/gtm/bp;
+.method public final pl()Lcom/google/android/gms/internal/gtm/bp;
     .locals 4
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bh;->ph()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bh;->pk()J
 
     move-result-wide v2
 
@@ -200,14 +200,14 @@
     return-object v0
 .end method
 
-.method public final pj()J
+.method public final pm()J
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqX:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg: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;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
     const-wide/16 v1, 0x0
 
@@ -225,30 +225,30 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqX:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg:J
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqX:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg:J
 
     return-wide v0
 .end method
 
-.method public final pk()V
+.method public final pn()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bh;->are: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;->aqX:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bh;->arg:J
 
     return-void
 .end method
 
-.method public final pl()Ljava/lang/String;
+.method public final po()Ljava/lang/String;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bh;->are: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 635185ce7b..047a36be40 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 aqZ:J
+.field private final ari:J
 
-.field final synthetic ara:Lcom/google/android/gms/internal/gtm/bh;
+.field final synthetic arj:Lcom/google/android/gms/internal/gtm/bh;
 
 .field private final name:Ljava/lang/String;
 
@@ -14,7 +14,7 @@
 .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;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -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;->aqZ:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/gtm/bi;->ari:J
 
     return-void
 .end method
@@ -51,7 +51,7 @@
     return-void
 .end method
 
-.method private final pp()Ljava/lang/String;
+.method private final ps()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->name:Ljava/lang/String;
@@ -71,40 +71,40 @@
 
 
 # virtual methods
-.method final pm()V
+.method final pp()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bi;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/bh;->are: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;->pq()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pt()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;->pr()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pu()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;->pp()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->ps()Ljava/lang/String;
 
     move-result-object v3
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method public final pn()Landroid/util/Pair;
+.method public final pq()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;->po()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pr()J
 
     move-result-wide v0
 
@@ -142,11 +142,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/bi;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v4}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -159,7 +159,7 @@
     move-result-wide v0
 
     :goto_0
-    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/bi;->aqZ:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/gtm/bi;->ari:J
 
     const/4 v6, 0x0
 
@@ -178,16 +178,16 @@
 
     if-lez v7, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pm()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pp()V
 
     return-object v6
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pr()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pu()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;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pq()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pt()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;->pm()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/bi;->pp()V
 
     if-eqz v0, :cond_4
 
@@ -233,14 +233,14 @@
     return-object v6
 .end method
 
-.method final po()J
+.method final pr()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->ara:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bi;->arj:Lcom/google/android/gms/internal/gtm/bh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->aqV:Landroid/content/SharedPreferences;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bh;->are:Landroid/content/SharedPreferences;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->pp()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/bi;->ps()Ljava/lang/String;
 
     move-result-object v1
 
@@ -253,7 +253,7 @@
     return-wide v0
 .end method
 
-.method final pq()Ljava/lang/String;
+.method final pt()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 pr()Ljava/lang/String;
+.method final pu()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 160d6fe47f..4a39efd6ae 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 adN:Ljava/lang/Boolean;
+.field private static adW:Ljava/lang/Boolean;
 
-.field static arb:Lcom/google/android/gms/stats/a;
+.field static ark: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;->adN:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bj;->adW: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;->adN:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bj;->adW: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -139,7 +139,7 @@
 
     :cond_1
     :try_start_1
-    sget-object p1, Lcom/google/android/gms/internal/gtm/bj;->arb:Lcom/google/android/gms/stats/a;
+    sget-object p1, Lcom/google/android/gms/internal/gtm/bj;->ark:Lcom/google/android/gms/stats/a;
 
     if-nez p1, :cond_2
 
@@ -149,14 +149,14 @@
 
     invoke-direct {p1, p0, v1}, Lcom/google/android/gms/stats/a;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    sput-object p1, Lcom/google/android/gms/internal/gtm/bj;->arb:Lcom/google/android/gms/stats/a;
+    sput-object p1, Lcom/google/android/gms/internal/gtm/bj;->ark:Lcom/google/android/gms/stats/a;
 
     const/4 p0, 0x0
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/stats/a;->Q(Z)V
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/gtm/bj;->arb:Lcom/google/android/gms/stats/a;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/bj;->ark:Lcom/google/android/gms/stats/a;
 
     const-wide/16 v3, 0x3e8
 
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 25167fcc3b..29016eeb76 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 ard:Ljava/lang/Boolean;
+.field private static arm:Ljava/lang/Boolean;
 
 
 # instance fields
-.field public final arc:Landroid/content/Context;
+.field public final arl: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;->arc:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bk;->arl: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;->ard:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bk;->arm: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;->ard:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bk;->arm:Ljava/lang/Boolean;
 
     return p0
 .end method
@@ -99,11 +99,11 @@
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/gtm/bj;->arb:Lcom/google/android/gms/stats/a;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bj;->ark:Lcom/google/android/gms/stats/a;
 
     if-eqz v1, :cond_0
 
-    iget-object v2, v1, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v2, v1, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v2}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -134,13 +134,13 @@
     nop
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arl: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -188,13 +188,13 @@
 .method public final g(Ljava/lang/Runnable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arl: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;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
@@ -210,13 +210,13 @@
 .method public final onCreate()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arl: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -230,13 +230,13 @@
 .method public final onDestroy()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bk;->arl: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
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 14deb63bb1..fade2d2d2f 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 are:Lcom/google/android/gms/internal/gtm/bk;
+.field private final arn:Lcom/google/android/gms/internal/gtm/bk;
 
-.field private final arf:I
+.field private final aro:I
 
-.field private final arg:Lcom/google/android/gms/internal/gtm/bd;
+.field private final arp: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;->are:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bl;->arn:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput p2, p0, Lcom/google/android/gms/internal/gtm/bl;->arf:I
+    iput p2, p0, Lcom/google/android/gms/internal/gtm/bl;->aro:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bl;->arg:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bl;->arp: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;->are:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bl;->arn:Lcom/google/android/gms/internal/gtm/bk;
 
-    iget v1, p0, Lcom/google/android/gms/internal/gtm/bl;->arf:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/bl;->aro:I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bl;->arg:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bl;->arp:Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arl: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/bm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/bm.smali
index c773892175..95a49b7064 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 are:Lcom/google/android/gms/internal/gtm/bk;
+.field private final arn:Lcom/google/android/gms/internal/gtm/bk;
 
-.field private final arh:Lcom/google/android/gms/internal/gtm/bd;
+.field private final arq:Lcom/google/android/gms/internal/gtm/bd;
 
-.field private final ari:Landroid/app/job/JobParameters;
+.field private final arr: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;->are:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bm;->arn:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bm;->arh:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bm;->arq:Lcom/google/android/gms/internal/gtm/bd;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bm;->ari:Landroid/app/job/JobParameters;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/bm;->arr: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;->are:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bm;->arn:Lcom/google/android/gms/internal/gtm/bk;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bm;->arh:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bm;->arq:Lcom/google/android/gms/internal/gtm/bd;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bm;->ari:Landroid/app/job/JobParameters;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/bm;->arr:Landroid/app/job/JobParameters;
 
     const-string v3, "AnalyticsJobService processed last dispatch request"
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arc:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/bk;->arl: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 0f5d9b0d46..5c2b0cff5a 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 arj:Ljava/lang/Runnable;
+.field private final synthetic ars:Ljava/lang/Runnable;
 
-.field private final synthetic ark:Lcom/google/android/gms/internal/gtm/bk;
+.field private final synthetic art: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;->ark:Lcom/google/android/gms/internal/gtm/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bn;->art:Lcom/google/android/gms/internal/gtm/bk;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bn;->arj:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bn;->ars:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,14 +26,14 @@
 
 
 # virtual methods
-.method public final oD()V
+.method public final oG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bn;->ark:Lcom/google/android/gms/internal/gtm/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bn;->art: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;->arj:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bn;->ars: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 4ce373be17..4207e4343d 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,9 +3,9 @@
 
 
 # instance fields
-.field private final aed:Lcom/google/android/gms/common/util/e;
+.field private final aem:Lcom/google/android/gms/common/util/e;
 
-.field sM:J
+.field sL:J
 
 
 # direct methods
@@ -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;->aed:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->aem:Lcom/google/android/gms/common/util/e;
 
     return-void
 .end method
@@ -28,9 +28,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/bp;->aed:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bp;->aem:Lcom/google/android/gms/common/util/e;
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/gtm/bp;->sM:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
 
     return-void
 .end method
@@ -40,13 +40,13 @@
 .method public final start()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aem:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sM:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
 
     return-void
 .end method
@@ -54,7 +54,7 @@
 .method public final x(J)Z
     .locals 6
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sM:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
 
     const/4 v2, 0x1
 
@@ -67,13 +67,13 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bp;->aem:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/gtm/bp;->sM:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
 
     sub-long/2addr v0, v3
 
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 0cb9302965..51cd9875bb 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 arl:[C
+.field private static final aru:[C
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bq;->arl:[C
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bq;->aru:[C
 
     return-void
 
@@ -110,7 +110,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arF:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arO: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;->arD:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arC:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arE:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->apm:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->apw: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;->arG:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arP: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;->arH:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arQ: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;->arI:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arR:Ljava/lang/String;
 
     const-string v0, "aclid"
 
@@ -200,7 +200,7 @@
 
     check-cast p0, Ljava/lang/String;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/gtm/bz;->arJ:Ljava/lang/String;
+    iput-object p0, p1, Lcom/google/android/gms/internal/gtm/bz;->arS:Ljava/lang/String;
 
     return-object p1
 
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 3f22ce1e8e..2e2befd716 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 aqA:Ljava/lang/String;
+.field private aqI:Ljava/lang/String;
 
-.field protected aqC:I
+.field private aqJ:Ljava/lang/String;
 
-.field private aqz:Ljava/lang/String;
+.field protected aqL:I
 
-.field private arm:I
+.field private arv:I
 
-.field protected arn:Z
+.field protected arw:Z
 
-.field private aro:Z
+.field private arx:Z
 
-.field private arp:Z
+.field private ary:Z
 
 
 # direct methods
@@ -29,12 +29,12 @@
 
 
 # virtual methods
-.method protected final nQ()V
+.method protected final nT()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     :try_start_0
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
@@ -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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj: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
 
@@ -104,7 +104,7 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqz:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqI: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;->aqz:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqI:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqz:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqI:Ljava/lang/String;
 
     const-string v4, "XML config - app name"
 
     invoke-virtual {p0, v4, v1}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqA:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqJ: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;->aqA:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqJ:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqA:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqJ:Ljava/lang/String;
 
     const-string v4, "XML config - app version"
 
     invoke-virtual {p0, v4, v1}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_4
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqB:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqK: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;->aqB:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqK: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;->arm:I
+    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->arv: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;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_a
-    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqC:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqL: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;->aqC:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqL:I
 
-    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqC:I
+    iput v1, p0, Lcom/google/android/gms/internal/gtm/br;->aqL:I
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->arn:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->arw: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;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_c
-    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqD:I
+    iget v1, v0, Lcom/google/android/gms/internal/gtm/ay;->aqM:I
 
     if-eq v1, v4, :cond_e
 
-    iget v0, v0, Lcom/google/android/gms/internal/gtm/ay;->aqD:I
+    iget v0, v0, Lcom/google/android/gms/internal/gtm/ay;->aqM:I
 
     if-ne v0, v3, :cond_d
 
     const/4 v2, 0x1
 
     :cond_d
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/br;->arp:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/br;->ary:Z
 
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->aro:Z
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/br;->arx:Z
 
     invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -302,52 +302,52 @@
     return-void
 .end method
 
-.method public final ps()Ljava/lang/String;
+.method public final pv()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqJ:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final pt()Ljava/lang/String;
+.method public final pw()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/br;->aqI:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final pu()Z
+.method public final px()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final pv()Z
+.method public final py()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->aro:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->arx:Z
 
     return v0
 .end method
 
-.method public final pw()Z
+.method public final pz()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->arp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/br;->ary: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 80b8c8efcb..af72b36eb6 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 arr:Ljava/lang/reflect/Method;
+.field private static final arA:Ljava/lang/reflect/Method;
 
-.field private static final ars:Ljava/lang/reflect/Method;
+.field private static final arB:Ljava/lang/reflect/Method;
 
-.field private static volatile art:Lcom/google/android/gms/internal/gtm/bu;
+.field private static volatile arC:Lcom/google/android/gms/internal/gtm/bu;
 
 
 # instance fields
-.field private final arq:Landroid/app/job/JobScheduler;
+.field private final arz:Landroid/app/job/JobScheduler;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->px()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pA()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arr:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arA:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->py()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pB()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->ars:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arB:Ljava/lang/reflect/Method;
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bt;->aru:Lcom/google/android/gms/internal/gtm/bu;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bt;->arD:Lcom/google/android/gms/internal/gtm/bu;
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->art:Lcom/google/android/gms/internal/gtm/bu;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bs;->arC: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;->arq:Landroid/app/job/JobScheduler;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bs;->arz: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;->arr:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->arA:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bs;->arq:Landroid/app/job/JobScheduler;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bs;->arz: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;->arq:Landroid/app/job/JobScheduler;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/bs;->arz: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;->arr:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->arA:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->art:Lcom/google/android/gms/internal/gtm/bu;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/bs;->arC:Lcom/google/android/gms/internal/gtm/bu;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/gtm/bu;->pB()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/gtm/bu;->pE()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;->pz()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pC()I
 
     move-result v0
 
@@ -176,15 +176,7 @@
     return p0
 .end method
 
-.method static final synthetic pA()Z
-    .locals 1
-
-    const/4 v0, 0x0
-
-    return v0
-.end method
-
-.method private static px()Ljava/lang/reflect/Method;
+.method private static pA()Ljava/lang/reflect/Method;
     .locals 5
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -257,7 +249,7 @@
     return-object v0
 .end method
 
-.method private static py()Ljava/lang/reflect/Method;
+.method private static pB()Ljava/lang/reflect/Method;
     .locals 3
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -302,10 +294,10 @@
     return-object v1
 .end method
 
-.method private static pz()I
+.method private static pC()I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->ars:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/bs;->arB:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -357,3 +349,11 @@
     :cond_0
     return v1
 .end method
+
+.method static final synthetic pD()Z
+    .locals 1
+
+    const/4 v0, 0x0
+
+    return v0
+.end method
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 10ac359f5c..7f8cf6a0bd 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 aru:Lcom/google/android/gms/internal/gtm/bu;
+.field static final arD: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;->aru:Lcom/google/android/gms/internal/gtm/bu;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/bt;->arD:Lcom/google/android/gms/internal/gtm/bu;
 
     return-void
 .end method
@@ -32,10 +32,10 @@
 
 
 # virtual methods
-.method public final pB()Z
+.method public final pE()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pA()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/bs;->pD()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 8f431b1807..2187078a89 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 pB()Z
+.method public abstract pE()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 603e67661e..0963746d17 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 arv:Lcom/google/android/gms/internal/gtm/bw;
+.field private static volatile arE: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 d653dccfa1..fc3a804d72 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 private final arw:Landroid/os/IBinder;
+.field private final arF:Landroid/os/IBinder;
 
-.field private final arx:Ljava/lang/String;
+.field private final arG: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;->arw:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/bx;->arF:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->arx:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/bx;->arG: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;->arw:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bx;->arF: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/gtm/bx;->arw:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bx;->arF:Landroid/os/IBinder;
 
     const/4 v2, 0x1
 
@@ -75,14 +75,14 @@
     throw v1
 .end method
 
-.method protected final nJ()Landroid/os/Parcel;
+.method protected final nM()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/gtm/bx;->arx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bx;->arG: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/gtm/by.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/by.smali
index 20fe21100b..435ddc073a 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 arA:Ljava/lang/String;
+.field public arH:Ljava/lang/String;
 
-.field public arB:Ljava/lang/String;
+.field public arI:Ljava/lang/String;
 
-.field public ary:Ljava/lang/String;
+.field public arJ:Ljava/lang/String;
 
-.field public arz:Ljava/lang/String;
+.field public arK: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;->ary:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arH: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;->ary:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->ary:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arI: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;->arz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arz:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arJ: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;->arA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arJ:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arA:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arJ:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arB:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arK: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;->arB:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/by;->arK:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arB:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/by;->arK: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;->ary:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arH: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;->arz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arI: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;->arA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arJ: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;->arB:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/by;->arK: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 eb33b84bd9..341a14365c 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,23 +13,23 @@
 
 
 # instance fields
-.field public apm:Ljava/lang/String;
+.field public apw:Ljava/lang/String;
 
-.field public arC:Ljava/lang/String;
+.field public arL:Ljava/lang/String;
 
-.field public arD:Ljava/lang/String;
+.field public arM:Ljava/lang/String;
 
-.field public arE:Ljava/lang/String;
+.field public arN:Ljava/lang/String;
 
-.field public arF:Ljava/lang/String;
+.field public arO:Ljava/lang/String;
 
-.field public arG:Ljava/lang/String;
+.field public arP:Ljava/lang/String;
 
-.field public arH:Ljava/lang/String;
+.field public arQ:Ljava/lang/String;
 
-.field public arI:Ljava/lang/String;
+.field public arR:Ljava/lang/String;
 
-.field public arJ:Ljava/lang/String;
+.field public arS: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;->arC:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arC:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arL:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arC:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arL:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arM:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arD:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arM:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->arE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arN:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arE:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arN:Ljava/lang/String;
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arO: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;->arF:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arO:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arF:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arO:Ljava/lang/String;
 
     :cond_4
-    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;->apw: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;->apm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->apw: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;->apw:Ljava/lang/String;
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arG:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arP: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;->arG:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arP:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arG:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arP:Ljava/lang/String;
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arQ: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;->arH:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arQ:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arH:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arQ:Ljava/lang/String;
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arR:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -162,12 +162,12 @@
 
     if-nez v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arR:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arI:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arR:Ljava/lang/String;
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arS:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -175,9 +175,9 @@
 
     if-nez v0, :cond_9
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/bz;->arS:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arJ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/bz;->arS:Ljava/lang/String;
 
     :cond_9
     return-void
@@ -196,55 +196,55 @@
 
     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;->arC:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arL: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;->arD:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arM: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;->arE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arN: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;->arF:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arO: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;->apm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->apw: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;->arG:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arP: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;->arH:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arQ: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;->arI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arR:Ljava/lang/String;
 
     const-string v2, "dclid"
 
     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;->arJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/bz;->arS:Ljava/lang/String;
 
     const-string v2, "aclid"
 
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 0f38951057..aab812d109 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,11 +13,11 @@
 
 
 # instance fields
-.field public anK:Ljava/lang/String;
+.field public anT:Ljava/lang/String;
 
-.field public anL:J
+.field public anU:J
 
-.field public anM:Ljava/lang/String;
+.field public anV:Ljava/lang/String;
 
 .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;->anK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anT: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;->anK:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anT:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anK:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anT:Ljava/lang/String;
 
     :cond_0
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/c;->anL:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/c;->anU: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;->anL:J
+    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/c;->anU:J
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->mCategory:Ljava/lang/String;
@@ -75,7 +75,7 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->mCategory:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anV: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/c;->anM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/c;->anV:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/c;->anV:Ljava/lang/String;
 
     :cond_3
     return-void
@@ -98,13 +98,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->anK:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->anT: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;->anL:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/c;->anU:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -120,7 +120,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/c;->anM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/c;->anV:Ljava/lang/String;
 
     const-string v2, "label"
 
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 8d01ca90a8..501b19a6eb 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 arK:Ljava/util/Map;
+.field public arT: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;->arK:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->arT: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;->arK:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/ca;->arT:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->arK:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ca;->arT: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;->arK:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ca;->arT: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 339bf8e411..80888fdc39 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 arL:Ljava/util/Map;
+.field public arU: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;->arL:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->arU: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;->arL:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cb;->arU:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->arL:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cb;->arU: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;->arL:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cb;->arU: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 91e4431171..1759e31e2f 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 aoz:Ljava/util/Map;
+.field public final aoI: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;->aoz:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->j(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
 
     invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -82,9 +82,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;->aoz:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
 
     invoke-interface {p1, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
 
@@ -94,7 +94,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoz:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cc;->aoI:Ljava/util/Map;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/cc;->P(Ljava/lang/Object;)Ljava/lang/String;
 
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 d4b9383a54..108bf3ca17 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 arM:Ljava/lang/String;
+.field public arV:Ljava/lang/String;
 
-.field public arN:I
+.field public arW:I
 
-.field public arO:I
+.field public arX:I
 
-.field public arP:I
+.field public arY:I
 
-.field public arQ:I
+.field public arZ:I
 
-.field public arR:I
+.field public asa: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;->arN:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arW:I
 
     if-eqz v0, :cond_0
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arN:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arW:I
 
     :cond_0
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arO:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arX:I
 
     if-eqz v0, :cond_1
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arO:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arX:I
 
     :cond_1
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arP:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arY:I
 
     if-eqz v0, :cond_2
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arP:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arY:I
 
     :cond_2
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arQ:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arZ:I
 
     if-eqz v0, :cond_3
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arQ:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arZ:I
 
     :cond_3
-    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arR:I
+    iget v0, p0, Lcom/google/android/gms/internal/gtm/cd;->asa:I
 
     if-eqz v0, :cond_4
 
-    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arR:I
+    iput v0, p1, Lcom/google/android/gms/internal/gtm/cd;->asa:I
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arV: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;->arM:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cd;->arV:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arM:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cd;->arV: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;->arM:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arV: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;->arN:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arW: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;->arO:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arX: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;->arP:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arY: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;->arQ:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->arZ: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;->arR:I
+    iget v1, p0, Lcom/google/android/gms/internal/gtm/cd;->asa: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 a633f2f103..1737629f8e 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 arS:Ljava/util/List;
+.field public final asb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -23,7 +23,7 @@
     .end annotation
 .end field
 
-.field public final arT:Ljava/util/List;
+.field public final asc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field public final arU:Ljava/util/Map;
+.field public final asd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -45,7 +45,7 @@
     .end annotation
 .end field
 
-.field public arV:Lcom/google/android/gms/analytics/a/b;
+.field public ase: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;->arS:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->asb: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;->arT:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->asc: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;->arU:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arS:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->asb:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arS:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asb: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;->arT:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->asc:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->arT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asc: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;->arU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arU:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arU:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arU:Ljava/util/Map;
+    iget-object v5, p1, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arV:Lcom/google/android/gms/analytics/a/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ce;->ase:Lcom/google/android/gms/analytics/a/b;
 
     if-eqz v0, :cond_5
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->arV:Lcom/google/android/gms/analytics/a/b;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ce;->ase: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;->arS:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asb: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;->arS:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asb: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;->arT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asc: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;->arT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asc: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;->arU:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arU:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->asd: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;->arV:Lcom/google/android/gms/analytics/a/b;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ce;->ase: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 2d3e6f451c..6f6078aa4e 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,11 +13,11 @@
 
 
 # instance fields
-.field public arW:Ljava/lang/String;
+.field public asf:Ljava/lang/String;
 
-.field public arX:Ljava/lang/String;
+.field public asg:Ljava/lang/String;
 
-.field public arY:J
+.field public ash:J
 
 .field public label:Ljava/lang/String;
 
@@ -38,7 +38,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/cf;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->arW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asf: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/cf;->arW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asf:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->arW:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asf:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->arX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asg: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;->arX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->asg:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->arX:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->asg:Ljava/lang/String;
 
     :cond_1
     iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cf;->label:Ljava/lang/String;
@@ -77,7 +77,7 @@
     iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cf;->label:Ljava/lang/String;
 
     :cond_2
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/cf;->arY:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/cf;->ash:J
 
     const-wide/16 v2, 0x0
 
@@ -85,7 +85,7 @@
 
     if-eqz v4, :cond_3
 
-    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/cf;->arY:J
+    iput-wide v0, p1, Lcom/google/android/gms/internal/gtm/cf;->ash:J
 
     :cond_3
     return-void
@@ -98,13 +98,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->arW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->asf:Ljava/lang/String;
 
     const-string v2, "category"
 
     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;->arX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cf;->asg:Ljava/lang/String;
 
     const-string v2, "action"
 
@@ -116,7 +116,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/cf;->arY:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/cf;->ash: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/cg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/gtm/cg.smali
index fcc38e8dd7..9b4c82dd61 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,9 +13,9 @@
 
 
 # instance fields
-.field public arZ:Ljava/lang/String;
+.field public asi:Ljava/lang/String;
 
-.field public asa:Z
+.field public asj:Z
 
 
 # direct methods
@@ -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;->arZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->asi:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -42,16 +42,16 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->arZ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/cg;->asi:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cg;->arZ:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/cg;->asi:Ljava/lang/String;
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/cg;->asa:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/cg;->asj:Z
 
     if-eqz v0, :cond_1
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/cg;->asa:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/cg;->asj:Z
 
     :cond_1
     return-void
@@ -64,13 +64,13 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cg;->arZ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/cg;->asi:Ljava/lang/String;
 
     const-string v2, "description"
 
     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/cg;->asa:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/cg;->asj:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
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 14b8faae16..5bb454ee1c 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,21 +13,21 @@
 
 
 # instance fields
-.field public aov:Ljava/lang/String;
+.field public aoE:Ljava/lang/String;
 
-.field public asb:Ljava/lang/String;
+.field public ask:Ljava/lang/String;
 
-.field public asc:Ljava/lang/String;
+.field public asl:Ljava/lang/String;
 
-.field public asd:Ljava/lang/String;
+.field public asm:Ljava/lang/String;
 
-.field public ase:Z
+.field public asn:Z
 
-.field public asf:Ljava/lang/String;
+.field public aso:Ljava/lang/String;
 
-.field public asg:Z
+.field public asp:Z
 
-.field public ash:D
+.field public asq:D
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/gtm/ch;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -54,12 +54,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aov:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aoE: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;->aov:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aov:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aoE:Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asc:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asl: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;->asc:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asl:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asc:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asl:Ljava/lang/String;
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -93,21 +93,21 @@
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asd:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asm:Ljava/lang/String;
 
     :cond_3
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->ase:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_4
 
-    iput-boolean v1, p1, Lcom/google/android/gms/internal/gtm/ch;->ase:Z
+    iput-boolean v1, p1, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aso:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -115,19 +115,19 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asf:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/ch;->aso:Ljava/lang/String;
 
-    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asf:Ljava/lang/String;
+    iput-object v0, p1, Lcom/google/android/gms/internal/gtm/ch;->aso:Ljava/lang/String;
 
     :cond_5
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asg:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/ch;->asp:Z
 
     if-eqz v0, :cond_6
 
-    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asg:Z
+    iput-boolean v0, p1, Lcom/google/android/gms/internal/gtm/ch;->asp:Z
 
     :cond_6
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ch;->ash:D
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/ch;->asq: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;->ash:D
+    iput-wide v2, p1, Lcom/google/android/gms/internal/gtm/ch;->asq:D
 
     :cond_8
     return-void
@@ -168,31 +168,31 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     const-string v2, "hitType"
 
     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;->aov:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aoE: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;->asc:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asl: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;->asd:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asm: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;->ase:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asn:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -202,13 +202,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/ch;->asf:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/ch;->aso:Ljava/lang/String;
 
     const-string v2, "sessionControl"
 
     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;->asg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asp: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;->ash:D
+    iget-wide v1, p0, Lcom/google/android/gms/internal/gtm/ch;->asq: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 0124f40eeb..4cac243f11 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 anN:Z
+.field private static anW:Z
 
 
 # instance fields
-.field private anO:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.field private anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
-.field private final anP:Lcom/google/android/gms/internal/gtm/bp;
+.field private final anY:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private anQ:Ljava/lang/String;
+.field private anZ:Ljava/lang/String;
 
-.field private anR:Z
+.field private aoa:Z
 
-.field private final anS:Ljava/lang/Object;
+.field private final aob:Ljava/lang/Object;
 
 
 # direct methods
@@ -26,21 +26,21 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/d;->anR:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/d;->aoa: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;->anS:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->aob:Ljava/lang/Object;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aem: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;->anP:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anY:Lcom/google/android/gms/internal/gtm/bp;
 
     return-void
 .end method
@@ -73,35 +73,35 @@
     return v2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oi()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/ae;->oE()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/ae;->oH()Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/d;->anS:Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/d;->aob:Ljava/lang/Object;
 
     monitor-enter v3
 
     :try_start_0
-    iget-boolean v4, p0, Lcom/google/android/gms/internal/gtm/d;->anR:Z
+    iget-boolean v4, p0, Lcom/google/android/gms/internal/gtm/d;->aoa:Z
 
     if-nez v4, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nV()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nY()Ljava/lang/String;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
 
-    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/d;->anR:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/internal/gtm/d;->aoa:Z
 
     goto :goto_4
 
     :cond_2
-    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/d;->anQ:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
 
     invoke-static {v4}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -190,7 +190,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
 
     :cond_7
     :goto_4
@@ -239,7 +239,7 @@
     return p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
 
     invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -252,7 +252,7 @@
     return v2
 
     :cond_a
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anQ:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -264,11 +264,11 @@
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oi()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/ae;->oF()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/ae;->oI()Ljava/lang/String;
 
     move-result-object v1
 
@@ -384,9 +384,9 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     const-string v2, "gaClientIdData"
 
@@ -402,7 +402,7 @@
 
     invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/d;->anZ:Ljava/lang/String;
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -420,13 +420,13 @@
     return v0
 .end method
 
-.method private final declared-synchronized nT()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final declared-synchronized nW()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;->anP:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anY:Lcom/google/android/gms/internal/gtm/bp;
 
     const-wide/16 v1, 0x3e8
 
@@ -436,15 +436,15 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anP:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anY: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;->nU()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nX()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/d;->anO:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/d;->anX: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
 
@@ -452,7 +452,7 @@
 
     if-eqz v1, :cond_0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anO:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     goto :goto_0
 
@@ -469,11 +469,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;->anO:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anO:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/d;->anX:Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -489,13 +489,13 @@
     throw v0
 .end method
 
-.method private final nU()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+.method private final nX()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA: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;
 
@@ -509,13 +509,13 @@
     :catch_0
     move-exception v0
 
-    sget-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anN:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anW:Z
 
     if-nez v1, :cond_0
 
     const/4 v1, 0x1
 
-    sput-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anN:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/gtm/d;->anW:Z
 
     const-string v1, "Error getting advertiser id"
 
@@ -536,7 +536,7 @@
     return-object v0
 .end method
 
-.method private final nV()Ljava/lang/String;
+.method private final nY()Ljava/lang/String;
     .locals 7
 
     const-string v0, "gaClientIdData"
@@ -544,9 +544,9 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->openFileInput(Ljava/lang/String;)Ljava/io/FileInputStream;
 
@@ -574,9 +574,9 @@
 
     invoke-virtual {v2}, Ljava/io/FileInputStream;->close()V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->deleteFile(Ljava/lang/String;)Z
 
@@ -627,9 +627,9 @@
 
     invoke-virtual {p0, v3, v2}, Lcom/google/android/gms/internal/gtm/j;->n(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v2, v0}, Landroid/content/Context;->deleteFile(Ljava/lang/String;)Z
 
@@ -640,18 +640,18 @@
 
 
 # virtual methods
-.method protected final nQ()V
+.method protected final nT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final nR()Z
+.method public final nU()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nT()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nW()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
 
     move-result-object v0
 
@@ -673,12 +673,12 @@
     return v1
 .end method
 
-.method public final nS()Ljava/lang/String;
+.method public final nV()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nT()Lcom/google/android/gms/ads/identifier/AdvertisingIdClient$Info;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/d;->nW()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 031d4d193c..e368dfbdf0 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 anT:Lcom/google/android/gms/internal/gtm/y;
+.field final aoc: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;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc: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;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc: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;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/e;->aoc: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,9 +57,9 @@
 .method public final a(Lcom/google/android/gms/internal/gtm/as;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -77,13 +77,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/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     const-string v0, "Hit delivery requested"
 
     invoke-virtual {p0, v0, p1}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -103,7 +103,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/common/internal/r;->j(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -116,24 +116,24 @@
     return-void
 .end method
 
-.method protected final nQ()V
+.method protected final nT()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
     return-void
 .end method
 
-.method public final nW()V
+.method public final nZ()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bj;->C(Landroid/content/Context;)Z
 
@@ -173,18 +173,18 @@
     return-void
 .end method
 
-.method public final nX()V
+.method public final oa()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     const-string v1, "Service disconnected"
 
@@ -193,26 +193,26 @@
     return-void
 .end method
 
-.method final nY()V
+.method final ob()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->ob()V
 
     return-void
 .end method
 
-.method final nZ()V
+.method final oc()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->nZ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oc()V
 
     return-void
 .end method
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 b2d579a9ef..105e56274e 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 anU:Z
+.field private final synthetic aod:Z
 
-.field private final synthetic anV:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoe: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/f;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/gtm/f;->anU:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/gtm/f;->aod: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/f;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/y;->oB()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 8baa23da22..7d31ee3c76 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,22 +6,22 @@
 
 
 # instance fields
-.field private final synthetic anV:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoe:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic anW:Ljava/lang/String;
+.field private final synthetic aof:Ljava/lang/String;
 
-.field private final synthetic anX:Ljava/lang/Runnable;
+.field private final synthetic aog:Ljava/lang/Runnable;
 
 
 # direct methods
 .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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/g;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/g;->anW:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/g;->aof:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/g;->anX:Ljava/lang/Runnable;
+    iput-object p3, p0, Lcom/google/android/gms/internal/gtm/g;->aog: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/g;->anW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/g;->aof:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/gtm/y;->bs(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->anX:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/g;->aog: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 f1ac044309..e5fa634399 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 anV:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoe:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic anY:Lcom/google/android/gms/internal/gtm/az;
+.field private final synthetic aoh: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/h;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/h;->anY:Lcom/google/android/gms/internal/gtm/az;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/h;->aoh: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/h;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/h;->anY:Lcom/google/android/gms/internal/gtm/az;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/h;->aoh: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 38af12c310..c47e5ca464 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 anV:Lcom/google/android/gms/internal/gtm/e;
+.field private final synthetic aoe:Lcom/google/android/gms/internal/gtm/e;
 
-.field private final synthetic anZ:Lcom/google/android/gms/internal/gtm/as;
+.field private final synthetic aoi: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/i;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/i;->anZ:Lcom/google/android/gms/internal/gtm/as;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/i;->aoi: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;->anV:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/i;->aoe:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/e;->aoc:Lcom/google/android/gms/internal/gtm/y;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/i;->anZ:Lcom/google/android/gms/internal/gtm/as;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/i;->aoi: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 9932e0dbf6..93ad61ade1 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 public final aoa:Lcom/google/android/gms/internal/gtm/m;
+.field public final aoj: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
     return-void
 .end method
@@ -79,11 +79,11 @@
 .method private 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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aog:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
 
     goto :goto_0
 
@@ -95,9 +95,9 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apG:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apP:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -134,9 +134,9 @@
     return-void
 
     :cond_3
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apG:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apP:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -239,12 +239,12 @@
     return-object p0
 .end method
 
-.method public static og()Z
+.method public static oj()Z
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apG:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apP:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/String;
 
@@ -579,76 +579,76 @@
     return-void
 .end method
 
-.method protected final oa()Lcom/google/android/gms/analytics/m;
+.method protected final od()Lcom/google/android/gms/analytics/m;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final ob()Lcom/google/android/gms/internal/gtm/e;
+.method public final oe()Lcom/google/android/gms/internal/gtm/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final oc()Lcom/google/android/gms/internal/gtm/ar;
+.method protected final of()Lcom/google/android/gms/internal/gtm/ar;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aoj:Lcom/google/android/gms/internal/gtm/ar;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aos: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;->aoj:Lcom/google/android/gms/internal/gtm/ar;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aos:Lcom/google/android/gms/internal/gtm/ar;
 
     return-object v0
 .end method
 
-.method protected final od()Lcom/google/android/gms/internal/gtm/br;
+.method protected final og()Lcom/google/android/gms/internal/gtm/br;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->og()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method protected final oe()Lcom/google/android/gms/internal/gtm/bh;
+.method protected final oh()Lcom/google/android/gms/internal/gtm/bh;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aol:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v1, v0, Lcom/google/android/gms/internal/gtm/m;->aou: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;->aol:Lcom/google/android/gms/internal/gtm/bh;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aou:Lcom/google/android/gms/internal/gtm/bh;
 
     return-object v0
 .end method
 
-.method protected final of()Lcom/google/android/gms/internal/gtm/ae;
+.method protected final oi()Lcom/google/android/gms/internal/gtm/ae;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ol()Lcom/google/android/gms/internal/gtm/ae;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oo()Lcom/google/android/gms/internal/gtm/ae;
 
     move-result-object v0
 
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 b9a5368bd3..48305a3bc1 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 aob:Z
+.field private aok: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;->aob:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->aok:Z
 
     if-eqz v0, :cond_0
 
@@ -34,10 +34,10 @@
     return v0
 .end method
 
-.method protected abstract nQ()V
+.method protected abstract nT()V
 .end method
 
-.method protected final oh()V
+.method protected final ok()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 oi()V
+.method public final ol()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nQ()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->nT()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->aob:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/k;->aok: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 bded88fafa..3080e7fecd 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 aoc:Ljava/lang/String;
+.field public static final aol: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;->aoc:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/l;->aol: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 1b62ea5b3a..a389dbbe07 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 aod:Lcom/google/android/gms/internal/gtm/m;
+.field private static volatile aom:Lcom/google/android/gms/internal/gtm/m;
 
 
 # instance fields
-.field public final aed:Lcom/google/android/gms/common/util/e;
+.field final aeA:Landroid/content/Context;
 
-.field final aer:Landroid/content/Context;
+.field public final aem:Lcom/google/android/gms/common/util/e;
 
-.field final aoe:Landroid/content/Context;
+.field final aon:Landroid/content/Context;
 
-.field final aof:Lcom/google/android/gms/internal/gtm/am;
+.field final aoo:Lcom/google/android/gms/internal/gtm/am;
 
-.field final aog:Lcom/google/android/gms/internal/gtm/bd;
+.field final aop:Lcom/google/android/gms/internal/gtm/bd;
 
-.field private final aoh:Lcom/google/android/gms/analytics/m;
+.field private final aoq:Lcom/google/android/gms/analytics/m;
 
-.field private final aoi:Lcom/google/android/gms/internal/gtm/e;
+.field private final aor:Lcom/google/android/gms/internal/gtm/e;
 
-.field final aoj:Lcom/google/android/gms/internal/gtm/ar;
+.field final aos:Lcom/google/android/gms/internal/gtm/ar;
 
-.field private final aok:Lcom/google/android/gms/internal/gtm/br;
+.field private final aot:Lcom/google/android/gms/internal/gtm/br;
 
-.field final aol:Lcom/google/android/gms/internal/gtm/bh;
+.field final aou:Lcom/google/android/gms/internal/gtm/bh;
 
-.field private final aom:Lcom/google/android/gms/analytics/b;
+.field private final aov:Lcom/google/android/gms/analytics/b;
 
-.field private final aon:Lcom/google/android/gms/internal/gtm/ae;
+.field private final aow:Lcom/google/android/gms/internal/gtm/ae;
 
-.field public final aoo:Lcom/google/android/gms/internal/gtm/d;
+.field public final aox:Lcom/google/android/gms/internal/gtm/d;
 
-.field public final aop:Lcom/google/android/gms/internal/gtm/x;
+.field public final aoy:Lcom/google/android/gms/internal/gtm/x;
 
-.field public final aoq:Lcom/google/android/gms/internal/gtm/aq;
+.field public final aoz: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;->aos:Landroid/content/Context;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/o;->aoB: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;->aot:Landroid/content/Context;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/o;->aoC: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;->aer:Landroid/content/Context;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aoe:Landroid/content/Context;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aon:Landroid/content/Context;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nq()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aem: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;->aof:Lcom/google/android/gms/internal/gtm/am;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aoo: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;->oi()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aog:Lcom/google/android/gms/internal/gtm/bd;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v1
 
@@ -118,17 +118,17 @@
 
     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;->oi()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aol:Lcom/google/android/gms/internal/gtm/bh;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aou: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;->oi()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aok:Lcom/google/android/gms/internal/gtm/br;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aot: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;->aew:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object v5, v0, Lcom/google/android/gms/analytics/m;->aeF:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoh:Lcom/google/android/gms/analytics/m;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoq: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;->oi()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aon:Lcom/google/android/gms/internal/gtm/ae;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aow:Lcom/google/android/gms/internal/gtm/ae;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/m;->aoo:Lcom/google/android/gms/internal/gtm/d;
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/m;->aox:Lcom/google/android/gms/internal/gtm/d;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v3, p0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/x;
+    iput-object v3, p0, Lcom/google/android/gms/internal/gtm/m;->aoy:Lcom/google/android/gms/internal/gtm/x;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v4, p0, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/internal/gtm/aq;
+    iput-object v4, p0, Lcom/google/android/gms/internal/gtm/m;->aoz: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;->oi()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aoj:Lcom/google/android/gms/internal/gtm/ar;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/m;->aos:Lcom/google/android/gms/internal/gtm/ar;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aoi:Lcom/google/android/gms/internal/gtm/e;
+    iput-object v1, p0, Lcom/google/android/gms/internal/gtm/m;->aor:Lcom/google/android/gms/internal/gtm/e;
 
-    iget-object p1, v0, Lcom/google/android/gms/analytics/d;->adU:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, v0, Lcom/google/android/gms/analytics/d;->aee:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/m;->og()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pu()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->px()Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pv()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->py()Z
 
     move-result v2
 
     if-eqz v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pw()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pz()Z
 
     move-result v2
 
-    iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->adR:Z
+    iput-boolean v2, v0, Lcom/google/android/gms/analytics/b;->aea:Z
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->pu()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/br;->px()Z
 
     const/4 p1, 0x1
 
-    iput-boolean p1, v0, Lcom/google/android/gms/analytics/b;->adP:Z
+    iput-boolean p1, v0, Lcom/google/android/gms/analytics/b;->adY:Z
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/analytics/b;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aov:Lcom/google/android/gms/analytics/b;
 
-    iget-object p1, v1, Lcom/google/android/gms/internal/gtm/e;->anT:Lcom/google/android/gms/internal/gtm/y;
+    iget-object p1, v1, Lcom/google/android/gms/internal/gtm/e;->aoc: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;->aod:Lcom/google/android/gms/internal/gtm/m;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/internal/gtm/m;
 
     if-nez v0, :cond_1
 
@@ -262,15 +262,15 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/gtm/m;->aod:Lcom/google/android/gms/internal/gtm/m;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/internal/gtm/m;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nq()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v2
 
@@ -282,19 +282,19 @@
 
     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;->aod:Lcom/google/android/gms/internal/gtm/m;
+    sput-object p0, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/b;->lB()V
+    invoke-static {}, Lcom/google/android/gms/analytics/b;->lE()V
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v4
 
     sub-long/2addr v4, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqu:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqD:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF: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;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object p0
 
@@ -338,69 +338,69 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/internal/gtm/m;->aod:Lcom/google/android/gms/internal/gtm/m;
+    sget-object p0, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/internal/gtm/m;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final oa()Lcom/google/android/gms/analytics/m;
+.method public final od()Lcom/google/android/gms/analytics/m;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoh:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoq: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;->aoh:Lcom/google/android/gms/analytics/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoq:Lcom/google/android/gms/analytics/m;
 
     return-object v0
 .end method
 
-.method public final ob()Lcom/google/android/gms/internal/gtm/e;
+.method public final oe()Lcom/google/android/gms/internal/gtm/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aoi:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor: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;->aoi:Lcom/google/android/gms/internal/gtm/e;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aor:Lcom/google/android/gms/internal/gtm/e;
 
     return-object v0
 .end method
 
-.method public final od()Lcom/google/android/gms/internal/gtm/br;
+.method public final og()Lcom/google/android/gms/internal/gtm/br;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aok:Lcom/google/android/gms/internal/gtm/br;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aot: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;->aok:Lcom/google/android/gms/internal/gtm/br;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aot:Lcom/google/android/gms/internal/gtm/br;
 
     return-object v0
 .end method
 
-.method public final oj()Lcom/google/android/gms/internal/gtm/bd;
+.method public final om()Lcom/google/android/gms/internal/gtm/bd;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aog:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aop: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;->aog:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aop:Lcom/google/android/gms/internal/gtm/bd;
 
     return-object v0
 .end method
 
-.method public final ok()Lcom/google/android/gms/analytics/b;
+.method public final on()Lcom/google/android/gms/analytics/b;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aom:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aov: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;->aom:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aov:Lcom/google/android/gms/analytics/b;
 
     invoke-virtual {v0}, Lcom/google/android/gms/analytics/b;->isInitialized()Z
 
@@ -410,19 +410,19 @@
 
     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;->aom:Lcom/google/android/gms/analytics/b;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aov:Lcom/google/android/gms/analytics/b;
 
     return-object v0
 .end method
 
-.method public final ol()Lcom/google/android/gms/internal/gtm/ae;
+.method public final oo()Lcom/google/android/gms/internal/gtm/ae;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aon:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aow: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;->aon:Lcom/google/android/gms/internal/gtm/ae;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/m;->aow: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 1e8b89e06e..2696b7f486 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 aor:Lcom/google/android/gms/internal/gtm/m;
+.field private final synthetic aoA: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;->aor:Lcom/google/android/gms/internal/gtm/m;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->aoA: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;->aor:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/n;->aoA:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aog:Lcom/google/android/gms/internal/gtm/bd;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aop: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 ee2d6b5398..d79a7a34c0 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 aos:Landroid/content/Context;
+.field final aoB:Landroid/content/Context;
 
-.field final aot:Landroid/content/Context;
+.field final aoC: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;->aos:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->aoB:Landroid/content/Context;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->aot:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/o;->aoC: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 64832d7f9e..ea8ff5a74f 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 aou:J
+.field final aoD:J
 
-.field final aov:Ljava/lang/String;
+.field final aoE:Ljava/lang/String;
 
-.field final aow:Ljava/lang/String;
+.field final aoF:Ljava/lang/String;
 
-.field final aox:Z
+.field final aoG:Z
 
-.field aoy:J
+.field aoH:J
 
-.field final aoz:Ljava/util/Map;
+.field final aoI:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -49,15 +49,15 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/p;->aou:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aov:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/p;->aow:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/p;->aoF:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/gtm/p;->aox:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/gtm/p;->aoG:Z
 
-    iput-wide p4, p0, Lcom/google/android/gms/internal/gtm/p;->aoy:J
+    iput-wide p4, p0, Lcom/google/android/gms/internal/gtm/p;->aoH: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;->aoz:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoI:Ljava/util/Map;
 
     return-void
 
@@ -74,7 +74,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoz:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/p;->aoI: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 b96e1089ca..7ab6167895 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 aoA:Lcom/google/android/gms/internal/gtm/s;
+.field final aoJ:Lcom/google/android/gms/internal/gtm/s;
 
-.field aoB:Lcom/google/android/gms/internal/gtm/ba;
+.field aoK:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private final aoC:Lcom/google/android/gms/internal/gtm/ao;
+.field private final aoL:Lcom/google/android/gms/internal/gtm/ao;
 
-.field private final aoD:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aoM: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;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/m;->aem: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;->aoD:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoM: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;->aoA:Lcom/google/android/gms/internal/gtm/s;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoJ: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;->aoC:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoL: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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -69,11 +69,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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
     const/4 v6, 0x0
 
@@ -82,18 +82,18 @@
     return v6
 
     :cond_0
-    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/az;->aqI:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
 
     move-result-object v1
 
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()Ljava/lang/String;
 
     move-result-object v1
 
@@ -105,13 +105,13 @@
     move-result-object v5
 
     :try_start_0
-    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoz:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoI:Ljava/util/Map;
 
-    iget-wide v2, p1, Lcom/google/android/gms/internal/gtm/az;->aqG:J
+    iget-wide v2, p1, Lcom/google/android/gms/internal/gtm/az;->aqP: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-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->om()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->op()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -130,18 +130,18 @@
 .method public final disconnect()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/q;->aoA:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/q;->aoJ: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
@@ -154,32 +154,32 @@
     nop
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK: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;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->nX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->oa()V
 
     :cond_0
     return-void
 .end method
 
-.method public final eC()Z
+.method public final eE()Z
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
     const/4 v1, 0x1
 
@@ -188,17 +188,17 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoA:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoJ:Lcom/google/android/gms/internal/gtm/s;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/s;->on()Lcom/google/android/gms/internal/gtm/ba;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/s;->oq()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;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->om()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/q;->op()V
 
     return v1
 
@@ -211,11 +211,11 @@
 .method public final isConnected()Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
     if-eqz v0, :cond_0
 
@@ -229,24 +229,24 @@
     return v0
 .end method
 
-.method protected final nQ()V
+.method protected final nT()V
     .locals 0
 
     return-void
 .end method
 
-.method final om()V
+.method final op()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoD:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoM: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;->aoC:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/q;->aoL:Lcom/google/android/gms/internal/gtm/ao;
 
-    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqo:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->aqx:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
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 f5ed0357ff..632db857e1 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 aoE:Lcom/google/android/gms/internal/gtm/q;
+.field private final synthetic aoN: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;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/r;->aoN: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;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/r;->aoN: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 56d306f450..e3df0cdec4 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 aoE:Lcom/google/android/gms/internal/gtm/q;
+.field final synthetic aoN:Lcom/google/android/gms/internal/gtm/q;
 
-.field private volatile aoF:Lcom/google/android/gms/internal/gtm/ba;
+.field private volatile aoO:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private volatile aoG:Z
+.field private volatile aoP: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;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,143 +26,6 @@
 
 
 # virtual methods
-.method public final on()Lcom/google/android/gms/internal/gtm/ba;
-    .locals 5
-
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
-
-    new-instance v0, Landroid/content/Intent;
-
-    const-string v1, "com.google.android.gms.analytics.service.START"
-
-    invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
-
-    new-instance v1, Landroid/content/ComponentName;
-
-    const-string v2, "com.google.android.gms"
-
-    const-string v3, "com.google.android.gms.analytics.service.AnalyticsService"
-
-    invoke-direct {v1, v2, v3}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
-
-    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;->aoE:Lcom/google/android/gms/internal/gtm/q;
-
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
-
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
-
-    invoke-virtual {v1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
-
-    move-result-object v2
-
-    const-string v3, "app_package_name"
-
-    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;->nh()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;->aoF:Lcom/google/android/gms/internal/gtm/ba;
-
-    const/4 v3, 0x1
-
-    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoG:Z
-
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
-
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/q;->aoA:Lcom/google/android/gms/internal/gtm/s;
-
-    const/16 v4, 0x81
-
-    invoke-static {v1, v0, v3, v4}, Lcom/google/android/gms/common/stats/a;->b(Landroid/content/Context;Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
-
-    move-result v0
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
-
-    const-string v3, "Bind to service requested"
-
-    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
-    move-result-object v4
-
-    invoke-virtual {v1, v3, v4}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_0
-
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoG:Z
-
-    monitor-exit p0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    return-object v2
-
-    :cond_0
-    :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqp:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v3
-
-    invoke-virtual {p0, v3, v4}, Ljava/lang/Object;->wait(J)V
-    :try_end_1
-    .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_0
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    goto :goto_0
-
-    :catch_0
-    :try_start_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoE: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;->bm(Ljava/lang/String;)V
-
-    :goto_0
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoG:Z
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoF:Lcom/google/android/gms/internal/gtm/ba;
-
-    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->aoF:Lcom/google/android/gms/internal/gtm/ba;
-
-    if-nez v0, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoE: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;->bn(Ljava/lang/String;)V
-
-    :cond_1
-    monitor-exit p0
-
-    return-object v0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit p0
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    throw v0
-.end method
-
 .method public final onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
     .locals 2
 
@@ -175,7 +38,7 @@
     if-nez p2, :cond_0
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
     const-string p2, "Service connected with null binder"
 
@@ -241,7 +104,7 @@
     move-object p1, v0
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "Bound to IAnalyticsService interface"
 
@@ -250,7 +113,7 @@
     goto :goto_2
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v1, "Got binder with a wrong descriptor"
 
@@ -263,7 +126,7 @@
 
     :catch_0
     :try_start_3
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
     const-string v0, "Service connect failed to get IAnalyticsService"
 
@@ -275,17 +138,17 @@
     if-nez p1, :cond_4
 
     :try_start_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/q;->aoA:Lcom/google/android/gms/internal/gtm/s;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/q;->aoJ: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 +159,21 @@
 
     :cond_4
     :try_start_5
-    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoG:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
 
     if-nez p2, :cond_5
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN: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;->bm(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object p2, p2, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object p2
 
@@ -323,7 +186,7 @@
     goto :goto_3
 
     :cond_5
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoF:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/s;->aoO:Lcom/google/android/gms/internal/gtm/ba;
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
@@ -358,11 +221,11 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
@@ -374,3 +237,140 @@
 
     return-void
 .end method
+
+.method public final oq()Lcom/google/android/gms/internal/gtm/ba;
+    .locals 5
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+
+    new-instance v0, Landroid/content/Intent;
+
+    const-string v1, "com.google.android.gms.analytics.service.START"
+
+    invoke-direct {v0, v1}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
+
+    new-instance v1, Landroid/content/ComponentName;
+
+    const-string v2, "com.google.android.gms"
+
+    const-string v3, "com.google.android.gms.analytics.service.AnalyticsService"
+
+    invoke-direct {v1, v2, v3}, Landroid/content/ComponentName;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+
+    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;->aoN:Lcom/google/android/gms/internal/gtm/q;
+
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
+
+    invoke-virtual {v1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "app_package_name"
+
+    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;->nk()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;->aoO:Lcom/google/android/gms/internal/gtm/ba;
+
+    const/4 v3, 0x1
+
+    iput-boolean v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
+
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/q;->aoJ:Lcom/google/android/gms/internal/gtm/s;
+
+    const/16 v4, 0x81
+
+    invoke-static {v1, v0, v3, v4}, Lcom/google/android/gms/common/stats/a;->b(Landroid/content/Context;Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
+
+    move-result v0
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
+
+    const-string v3, "Bind to service requested"
+
+    invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v4
+
+    invoke-virtual {v1, v3, v4}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
+
+    const/4 v1, 0x0
+
+    if-nez v0, :cond_0
+
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
+
+    monitor-exit p0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    return-object v2
+
+    :cond_0
+    :try_start_1
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqy:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v3
+
+    invoke-virtual {p0, v3, v4}, Ljava/lang/Object;->wait(J)V
+    :try_end_1
+    .catch Ljava/lang/InterruptedException; {:try_start_1 .. :try_end_1} :catch_0
+    .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+    goto :goto_0
+
+    :catch_0
+    :try_start_2
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoN: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;->bm(Ljava/lang/String;)V
+
+    :goto_0
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoP:Z
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/s;->aoO:Lcom/google/android/gms/internal/gtm/ba;
+
+    iput-object v2, p0, Lcom/google/android/gms/internal/gtm/s;->aoO:Lcom/google/android/gms/internal/gtm/ba;
+
+    if-nez v0, :cond_1
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/s;->aoN: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;->bn(Ljava/lang/String;)V
+
+    :cond_1
+    monitor-exit p0
+
+    return-object v0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit p0
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    throw v0
+.end method
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 b85484e3f0..8cee597638 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 aoH:Lcom/google/android/gms/internal/gtm/ba;
+.field private final synthetic aoQ:Lcom/google/android/gms/internal/gtm/ba;
 
-.field private final synthetic aoI:Lcom/google/android/gms/internal/gtm/s;
+.field private final synthetic aoR: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;->aoI:Lcom/google/android/gms/internal/gtm/s;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/t;->aoR:Lcom/google/android/gms/internal/gtm/s;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/t;->aoH:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/t;->aoQ: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;->aoI:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoR:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -39,33 +39,33 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoI:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoR:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoN: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;->bk(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoI:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/t;->aoR:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/t;->aoH:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/t;->aoQ:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iput-object v1, v0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v1, v0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->om()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->op()V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->nY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->ob()V
 
     :cond_0
     return-void
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 8cdb08f753..0aad31f776 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
@@ -6,18 +6,18 @@
 
 
 # instance fields
-.field private final synthetic aoI:Lcom/google/android/gms/internal/gtm/s;
+.field private final synthetic aoR:Lcom/google/android/gms/internal/gtm/s;
 
-.field private final synthetic aoJ:Landroid/content/ComponentName;
+.field private final synthetic aoS:Landroid/content/ComponentName;
 
 
 # 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;->aoI:Lcom/google/android/gms/internal/gtm/s;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/u;->aoR:Lcom/google/android/gms/internal/gtm/s;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/u;->aoJ:Landroid/content/ComponentName;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/u;->aoS:Landroid/content/ComponentName;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,33 +29,33 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/u;->aoI:Lcom/google/android/gms/internal/gtm/s;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/u;->aoR:Lcom/google/android/gms/internal/gtm/s;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoE:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/s;->aoN:Lcom/google/android/gms/internal/gtm/q;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/u;->aoJ:Landroid/content/ComponentName;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/u;->aoS:Landroid/content/ComponentName;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iget-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
     if-eqz v2, :cond_0
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoB:Lcom/google/android/gms/internal/gtm/ba;
+    iput-object v2, v0, Lcom/google/android/gms/internal/gtm/q;->aoK:Lcom/google/android/gms/internal/gtm/ba;
 
     const-string v2, "Disconnected from device AnalyticsService"
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->ob()Lcom/google/android/gms/internal/gtm/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oe()Lcom/google/android/gms/internal/gtm/e;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->nX()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/e;->oa()V
 
     :cond_0
     return-void
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 9742c8cea0..fa083d523b 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 aoK:Ljava/lang/String;
+.field private static final aoT:Ljava/lang/String;
 
-.field private static final aoL:Ljava/lang/String;
+.field private static final aoU:Ljava/lang/String;
 
 
 # instance fields
-.field private final aoM:Lcom/google/android/gms/internal/gtm/w;
+.field private final aoV:Lcom/google/android/gms/internal/gtm/w;
 
-.field private final aoN:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aoW:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private final aoO:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aoX:Lcom/google/android/gms/internal/gtm/bp;
 
 
 # direct methods
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->aoK:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->aoT:Ljava/lang/String;
 
     new-array v0, v5, [Ljava/lang/Object;
 
@@ -83,7 +83,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->aoL:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/gtm/v;->aoU:Ljava/lang/String;
 
     return-void
 .end method
@@ -95,33 +95,33 @@
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem: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/v;->aoN:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoW:Lcom/google/android/gms/internal/gtm/bp;
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aem: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/v;->aoO:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoX: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;->aer:Landroid/content/Context;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/m;->aeA: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;->aoM:Lcom/google/android/gms/internal/gtm/w;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoV:Lcom/google/android/gms/internal/gtm/w;
 
     return-void
 .end method
@@ -201,7 +201,7 @@
 .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;->aoO:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/v;->aoX:Lcom/google/android/gms/internal/gtm/bp;
 
     return-object p0
 .end method
@@ -454,12 +454,12 @@
     return-object p1
 .end method
 
-.method private final oo()J
+.method private final or()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     const-string v0, "SELECT COUNT(*) FROM hits2"
 
@@ -470,7 +470,7 @@
     return-wide v0
 .end method
 
-.method static synthetic os()Ljava/lang/String;
+.method static synthetic ov()Ljava/lang/String;
     .locals 1
 
     const-string v0, "google_analytics_v4.db"
@@ -478,10 +478,10 @@
     return-object v0
 .end method
 
-.method static synthetic ot()Ljava/lang/String;
+.method static synthetic ow()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoK:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoT:Ljava/lang/String;
 
     return-object v0
 .end method
@@ -499,9 +499,9 @@
 
     const-string v0, "hit_id"
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     const-wide/16 v1, 0x0
 
@@ -661,9 +661,9 @@
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()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;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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;->aoz:Ljava/util/Map;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/az;->aoI: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()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;->apJ:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v1, Lcom/google/android/gms/internal/gtm/au;->apS:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/av;->aqF: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;->oo()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->or()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;->aqG:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/gtm/az;->aqP: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;->aqH:I
+    iget v0, p1, Lcom/google/android/gms/internal/gtm/az;->aqQ: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;->aqI:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
     if-eqz v0, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oT()Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()Ljava/lang/String;
 
     move-result-object v0
 
@@ -971,7 +971,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoM:Lcom/google/android/gms/internal/gtm/w;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoV: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;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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;->aoM:Lcom/google/android/gms/internal/gtm/w;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoV: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;->oo()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/v;->or()J
 
     move-result-wide v0
 
@@ -1073,9 +1073,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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
 
@@ -1222,20 +1222,20 @@
     goto :goto_1
 .end method
 
-.method protected final nQ()V
+.method protected final nT()V
     .locals 0
 
     return-void
 .end method
 
-.method public final op()I
+.method public final os()I
     .locals 6
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoN:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoW:Lcom/google/android/gms/internal/gtm/bp;
 
     const-wide/32 v1, 0x5265c00
 
@@ -1250,7 +1250,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoN:Lcom/google/android/gms/internal/gtm/bp;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/v;->aoW:Lcom/google/android/gms/internal/gtm/bp;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
@@ -1262,9 +1262,9 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v2, v2, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -1303,14 +1303,14 @@
     return v0
 .end method
 
-.method public final oq()J
+.method public final ot()J
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoL:Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/v;->aoU:Ljava/lang/String;
 
     const/4 v1, 0x0
 
@@ -1321,7 +1321,7 @@
     return-wide v0
 .end method
 
-.method public final or()Ljava/util/List;
+.method public final ou()Ljava/util/List;
     .locals 23
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1334,9 +1334,9 @@
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1377,9 +1377,9 @@
 
     aput-object v0, v4, v10
 
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apL:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->apU:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v0, Ljava/lang/Integer;
 
@@ -1591,7 +1591,7 @@
 .method public final setTransactionSuccessful()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1850,9 +1850,9 @@
 .method public final u(J)V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()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 32be0dd877..6b82efdf13 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 aoP:Lcom/google/android/gms/internal/gtm/v;
+.field private final synthetic aoY: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;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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,21 +234,21 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bp;->start()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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;->bn(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->os()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->ov()Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoY:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-virtual {v1, v0}, Landroid/content/Context;->getDatabasePath(Ljava/lang/String;)Ljava/io/File;
 
@@ -261,7 +261,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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;
 
@@ -269,7 +269,7 @@
 
     const-wide/16 v2, 0x0
 
-    iput-wide v2, v1, Lcom/google/android/gms/internal/gtm/bp;->sM:J
+    iput-wide v2, v1, Lcom/google/android/gms/internal/gtm/bp;->sL:J
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_1
 
@@ -278,7 +278,7 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoP:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/w;->aoY: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;->ot()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/v;->ow()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 1eb33adaff..f5a170fa63 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 aev:Lcom/google/android/gms/internal/gtm/by;
+.field private final aeE:Lcom/google/android/gms/internal/gtm/by;
 
 
 # direct methods
@@ -16,63 +16,63 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/gtm/by;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/x;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final nQ()V
+.method protected final nT()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/analytics/m;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->lJ()Lcom/google/android/gms/internal/gtm/by;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/m;->lM()Lcom/google/android/gms/internal/gtm/by;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aeE: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
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/internal/gtm/br;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->og()Lcom/google/android/gms/internal/gtm/br;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pt()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pw()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/x;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
 
-    iput-object v1, v2, Lcom/google/android/gms/internal/gtm/by;->ary:Ljava/lang/String;
+    iput-object v1, v2, Lcom/google/android/gms/internal/gtm/by;->arH:Ljava/lang/String;
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->ps()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/br;->pv()Ljava/lang/String;
 
     move-result-object v0
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/x;->aeE:Lcom/google/android/gms/internal/gtm/by;
 
-    iput-object v0, v1, Lcom/google/android/gms/internal/gtm/by;->arz:Ljava/lang/String;
+    iput-object v0, v1, Lcom/google/android/gms/internal/gtm/by;->arI:Ljava/lang/String;
 
     :cond_1
     return-void
 .end method
 
-.method public final ou()Lcom/google/android/gms/internal/gtm/by;
+.method public final ox()Lcom/google/android/gms/internal/gtm/by;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/x;->aev:Lcom/google/android/gms/internal/gtm/by;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/x;->aeE: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 3c2c683c85..93d079ac80 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,27 +3,27 @@
 
 
 # instance fields
-.field private aoQ:Z
+.field private aoZ:Z
 
-.field private final aoR:Lcom/google/android/gms/internal/gtm/v;
+.field private final apa:Lcom/google/android/gms/internal/gtm/v;
 
-.field private final aoS:Lcom/google/android/gms/internal/gtm/bf;
+.field private final apb:Lcom/google/android/gms/internal/gtm/bf;
 
-.field private final aoT:Lcom/google/android/gms/internal/gtm/be;
+.field private final apc:Lcom/google/android/gms/internal/gtm/be;
 
-.field private final aoU:Lcom/google/android/gms/internal/gtm/q;
+.field private final apd:Lcom/google/android/gms/internal/gtm/q;
 
-.field private aoV:J
+.field private ape:J
 
-.field private final aoW:Lcom/google/android/gms/internal/gtm/ao;
+.field private final apf:Lcom/google/android/gms/internal/gtm/ao;
 
-.field private final aoX:Lcom/google/android/gms/internal/gtm/ao;
+.field private final apg:Lcom/google/android/gms/internal/gtm/ao;
 
-.field private final aoY:Lcom/google/android/gms/internal/gtm/bp;
+.field private final aph:Lcom/google/android/gms/internal/gtm/bp;
 
-.field private aoZ:J
+.field private apj:J
 
-.field private apa:Z
+.field private apk:Z
 
 
 # direct methods
@@ -36,53 +36,53 @@
 
     const-wide/high16 v0, -0x8000000000000000L
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoV:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ape:J
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/be;
 
     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;->aoT:Lcom/google/android/gms/internal/gtm/be;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apc: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoS:Lcom/google/android/gms/internal/gtm/bf;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apb: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;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
 
     new-instance p2, Lcom/google/android/gms/internal/gtm/bp;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     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;->aoY:Lcom/google/android/gms/internal/gtm/bp;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->aph: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;->aoW:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apf: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;->aoX:Lcom/google/android/gms/internal/gtm/ao;
+    iput-object p2, p0, Lcom/google/android/gms/internal/gtm/y;->apg: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;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj: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;->aow:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/gtm/p;->aoF:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/analytics/d;->aL(Ljava/lang/String;)V
 
-    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/p;->aox:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/internal/gtm/p;->aoG:Z
 
-    iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->adV:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/analytics/d;->aef:Z
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->lE()Lcom/google/android/gms/analytics/j;
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/l;->lH()Lcom/google/android/gms/analytics/j;
 
     move-result-object v0
 
@@ -122,11 +122,11 @@
 
     const-string v2, "data"
 
-    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asb:Ljava/lang/String;
+    iput-object v2, v1, Lcom/google/android/gms/internal/gtm/ch;->ask:Ljava/lang/String;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asg:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/internal/gtm/ch;->asp: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;->aoz:Ljava/util/Map;
+    iget-object v4, p1, Lcom/google/android/gms/internal/gtm/p;->aoI: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;->ary:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arH: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;->arz:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arI: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;->arA:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arJ: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;->arB:Ljava/lang/String;
+    iput-object v5, v3, Lcom/google/android/gms/internal/gtm/by;->arK: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;->asc:Ljava/lang/String;
+    iput-object v5, v1, Lcom/google/android/gms/internal/gtm/ch;->asl: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;->aow:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/gtm/p;->aoF: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;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->ph()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pk()J
 
     move-result-wide p1
 
-    iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->aeg:J
+    iput-wide p1, v0, Lcom/google/android/gms/analytics/j;->aep:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lH()V
+    invoke-virtual {v0}, Lcom/google/android/gms/analytics/j;->lK()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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->op()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->os()I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()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;->n(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/y;->aoX:Lcom/google/android/gms/internal/gtm/ao;
+    iget-object p0, p0, Lcom/google/android/gms/internal/gtm/y;->apg:Lcom/google/android/gms/internal/gtm/ao;
 
     const-wide/32 v0, 0x5265c00
 
@@ -318,9 +318,9 @@
 .method private final br(Ljava/lang/String;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/common/c/c;->Y(Landroid/content/Context;)Lcom/google/android/gms/common/c/b;
 
@@ -342,236 +342,20 @@
     return p1
 .end method
 
-.method private final oA()V
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/ao;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oW()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    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;->bj(Ljava/lang/String;)V
-
-    :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW: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;->oc()Lcom/google/android/gms/internal/gtm/ar;
-
-    move-result-object v0
-
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apB:Z
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ar;->cancel()V
-
-    :cond_1
-    return-void
-.end method
-
-.method private final oB()J
-    .locals 5
-
-    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoV: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;->apM:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Long;
-
-    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/internal/gtm/br;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->oh()V
-
-    iget-boolean v2, v2, Lcom/google/android/gms/internal/gtm/br;->arn:Z
-
-    if-eqz v2, :cond_1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()Lcom/google/android/gms/internal/gtm/br;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
-
-    iget v0, v0, Lcom/google/android/gms/internal/gtm/br;->aqC: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 oC()V
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
-
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Z
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoU: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;->oy()V
-
-    return-void
-.end method
-
-.method private final oq()J
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
-
-    :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->oq()J
-
-    move-result-wide v0
-    :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-wide v0
-
-    :catch_0
-    move-exception v0
-
-    const-string v1, "Failed to get min/max hit times from local store"
-
-    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
-
-    const-wide/16 v0, 0x0
-
-    return-wide v0
-.end method
-
-.method private final ow()V
-    .locals 3
-
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oK()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    return-void
-
-    :cond_2
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqs:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw: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/y;->aoY:Lcom/google/android/gms/internal/gtm/bp;
-
-    invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/bp;->x(J)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoY: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;->bj(Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->eC()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    const-string v0, "Connected to service"
-
-    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoY:Lcom/google/android/gms/internal/gtm/bp;
-
-    const-wide/16 v1, 0x0
-
-    iput-wide v1, v0, Lcom/google/android/gms/internal/gtm/bp;->sM:J
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->nY()V
-
-    :cond_3
-    return-void
-.end method
-
-.method private final ox()Z
+.method private final oA()Z
     .locals 12
 
     const-string v0, "Failed to commit local dispatch transaction"
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
     const-string v1, "Dispatching a batch of local hits"
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -579,9 +363,9 @@
 
     xor-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoS:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bf;->pe()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bf;->ph()Z
 
     move-result v2
 
@@ -600,11 +384,11 @@
     return v3
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()I
 
     move-result v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oS()I
 
     move-result v2
 
@@ -622,7 +406,7 @@
 
     :goto_0
     :try_start_0
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->beginTransaction()V
 
@@ -631,7 +415,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7, v1, v2}, Lcom/google/android/gms/internal/gtm/v;->t(J)Ljava/util/List;
 
@@ -647,17 +431,17 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_2
@@ -670,7 +454,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
@@ -709,7 +493,7 @@
 
     check-cast v9, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-wide v9, v9, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v9, v9, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     cmp-long v11, v9, v5
 
@@ -731,16 +515,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;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_5
@@ -753,13 +537,13 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
     :cond_3
     :try_start_6
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -784,7 +568,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->apd: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
 
@@ -792,7 +576,7 @@
 
     if-eqz v9, :cond_4
 
-    iget-wide v9, v8, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v9, v8, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-static {v5, v6, v9, v10}, Ljava/lang/Math;->max(JJ)J
 
@@ -807,13 +591,13 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v9, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v10, v8, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v10, v8, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-virtual {v9, v10, v11}, Lcom/google/android/gms/internal/gtm/v;->u(J)V
 
-    iget-wide v8, v8, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v8, v8, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -834,16 +618,16 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_9
@@ -856,21 +640,21 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
     :cond_4
     :try_start_a
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoS:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/bf;->pe()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/gtm/bf;->ph()Z
 
     move-result v8
 
     if-eqz v8, :cond_6
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoS:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
 
     invoke-virtual {v8, v7}, Lcom/google/android/gms/internal/gtm/bf;->n(Ljava/util/List;)Ljava/util/List;
 
@@ -907,7 +691,7 @@
 
     :cond_5
     :try_start_b
-    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v8, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v8, v7}, Lcom/google/android/gms/internal/gtm/v;->m(Ljava/util/List;)V
 
@@ -926,16 +710,16 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_d
@@ -948,7 +732,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
@@ -964,11 +748,11 @@
     if-eqz v7, :cond_7
 
     :try_start_f
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_f
@@ -981,17 +765,17 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
     :cond_7
     :try_start_10
-    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v7, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_10
@@ -1004,7 +788,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
@@ -1016,16 +800,16 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->n(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_12
@@ -1038,7 +822,7 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 
@@ -1046,11 +830,11 @@
     move-exception v1
 
     :try_start_13
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_13
@@ -1063,30 +847,30 @@
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return v3
 .end method
 
-.method private final oz()V
+.method private final oC()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oc()Lcom/google/android/gms/internal/gtm/ar;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->of()Lcom/google/android/gms/internal/gtm/ar;
 
     move-result-object v0
 
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apA:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apJ:Z
 
     if-nez v1, :cond_0
 
     return-void
 
     :cond_0
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apB:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apK:Z
 
     if-nez v1, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oq()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ot()J
 
     move-result-wide v1
 
@@ -1096,9 +880,9 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v3, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v3}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -1110,9 +894,9 @@
 
     move-result-wide v1
 
-    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->apR:Lcom/google/android/gms/internal/gtm/av;
+    sget-object v3, Lcom/google/android/gms/internal/gtm/au;->aqa:Lcom/google/android/gms/internal/gtm/av;
 
-    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
 
     check-cast v3, Ljava/lang/Long;
 
@@ -1124,7 +908,7 @@
 
     if-gtz v5, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oN()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oQ()J
 
     move-result-wide v1
 
@@ -1136,12 +920,228 @@
 
     invoke-virtual {p0, v2, v1}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ar;->oY()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ar;->pb()V
 
     :cond_1
     return-void
 .end method
 
+.method private final oD()V
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oZ()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    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;->bj(Ljava/lang/String;)V
+
+    :cond_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf: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;->of()Lcom/google/android/gms/internal/gtm/ar;
+
+    move-result-object v0
+
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/gtm/ar;->apK:Z
+
+    if-eqz v1, :cond_1
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ar;->cancel()V
+
+    :cond_1
+    return-void
+.end method
+
+.method private final oE()J
+    .locals 5
+
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->ape: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;->apV:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Long;
+
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->og()Lcom/google/android/gms/internal/gtm/br;
+
+    move-result-object v2
+
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+
+    iget-boolean v2, v2, Lcom/google/android/gms/internal/gtm/br;->arw:Z
+
+    if-eqz v2, :cond_1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->og()Lcom/google/android/gms/internal/gtm/br;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+
+    iget v0, v0, Lcom/google/android/gms/internal/gtm/br;->aqL: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 oF()V
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apk:Z
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd: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;->oB()V
+
+    return-void
+.end method
+
+.method private final ot()J
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+
+    :try_start_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->ot()J
+
+    move-result-wide v0
+    :try_end_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-wide v0
+
+    :catch_0
+    move-exception v0
+
+    const-string v1, "Failed to get min/max hit times from local store"
+
+    invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
+
+    const-wide/16 v0, 0x0
+
+    return-wide v0
+.end method
+
+.method private final oz()V
+    .locals 3
+
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apk:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oN()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    return-void
+
+    :cond_2
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqB:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF: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/y;->aph:Lcom/google/android/gms/internal/gtm/bp;
+
+    invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/bp;->x(J)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aph: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;->bj(Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->eE()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    const-string v0, "Connected to service"
+
+    invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bj(Ljava/lang/String;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aph:Lcom/google/android/gms/internal/gtm/bp;
+
+    const-wide/16 v1, 0x0
+
+    iput-wide v1, v0, Lcom/google/android/gms/internal/gtm/bp;->sL:J
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->ob()V
+
+    :cond_3
+    return-void
+.end method
+
 
 # virtual methods
 .method public final a(Lcom/google/android/gms/internal/gtm/az;)V
@@ -1149,11 +1149,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;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apk:Z
 
     if-eqz v0, :cond_0
 
@@ -1186,13 +1186,13 @@
     goto :goto_1
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->aqY:Lcom/google/android/gms/internal/gtm/bi;
+    iget-object v1, v1, Lcom/google/android/gms/internal/gtm/bh;->arh:Lcom/google/android/gms/internal/gtm/bi;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bi;->pn()Landroid/util/Pair;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bi;->pq()Landroid/util/Pair;
 
     move-result-object v1
 
@@ -1251,7 +1251,7 @@
 
     new-instance v4, Ljava/util/HashMap;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/gtm/az;->aoz:Ljava/util/Map;
+    iget-object v2, p1, Lcom/google/android/gms/internal/gtm/az;->aoI:Ljava/util/Map;
 
     invoke-direct {v4, v2}, Ljava/util/HashMap;-><init>(Ljava/util/Map;)V
 
@@ -1259,15 +1259,15 @@
 
     new-instance v0, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aqG:J
+    iget-wide v5, p1, Lcom/google/android/gms/internal/gtm/az;->aqP:J
 
-    iget-boolean v7, p1, Lcom/google/android/gms/internal/gtm/az;->aqI:Z
+    iget-boolean v7, p1, Lcom/google/android/gms/internal/gtm/az;->aqR:Z
 
-    iget-wide v8, p1, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v8, p1, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
-    iget v10, p1, Lcom/google/android/gms/internal/gtm/az;->aqH:I
+    iget v10, p1, Lcom/google/android/gms/internal/gtm/az;->aqQ:I
 
-    iget-object v11, p1, Lcom/google/android/gms/internal/gtm/az;->aqE:Ljava/util/List;
+    iget-object v11, p1, Lcom/google/android/gms/internal/gtm/az;->aqN:Ljava/util/List;
 
     move-object v2, v0
 
@@ -1278,9 +1278,9 @@
     move-object p1, v0
 
     :goto_1
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ow()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd: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
 
@@ -1296,11 +1296,11 @@
 
     :cond_3
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa: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;->oy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -1313,9 +1313,9 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -1329,17 +1329,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;->aoZ:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->apj:J
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pj()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pm()J
 
     move-result-wide v2
 
@@ -1349,9 +1349,9 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v4, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v4, v4, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v4}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -1377,35 +1377,35 @@
 
     invoke-virtual {p0, v3, v2}, 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;->ow()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ox()Z
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pk()V
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/bh;->pn()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oD()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oG()V
 
     :cond_1
-    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/gtm/y;->apj:J
 
     cmp-long v4, v2, v0
 
     if-eqz v4, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoT:Lcom/google/android/gms/internal/gtm/be;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apc:Lcom/google/android/gms/internal/gtm/be;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/be;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/be;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     new-instance v1, Landroid/content/Intent;
 
@@ -1419,7 +1419,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;->aqM:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/gtm/be;->aqV:Ljava/lang/String;
 
     const/4 v3, 0x1
 
@@ -1441,17 +1441,17 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pk()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pn()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     if-eqz p1, :cond_3
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oD()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/gtm/as;->oG()V
 
     :cond_3
     return-void
@@ -1460,23 +1460,23 @@
 .method protected final b(Lcom/google/android/gms/internal/gtm/p;)V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/p;->aow:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/internal/gtm/p;->aoF:Ljava/lang/String;
 
     const-string v1, "Sending first hit to property"
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pi()Lcom/google/android/gms/internal/gtm/bp;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pl()Lcom/google/android/gms/internal/gtm/bp;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oX()J
 
     move-result-wide v1
 
@@ -1489,11 +1489,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->po()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1506,9 +1506,9 @@
     return-void
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v1, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v1
 
@@ -1530,11 +1530,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->oj()Lcom/google/android/gms/internal/gtm/bd;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/m;->om()Lcom/google/android/gms/internal/gtm/bd;
 
     move-result-object v0
 
@@ -1551,11 +1551,11 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bh;->pl()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/gtm/bh;->po()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1585,21 +1585,21 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v1
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/gtm/bh;->bv(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pi()Lcom/google/android/gms/internal/gtm/bp;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/bh;->pl()Lcom/google/android/gms/internal/gtm/bp;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oU()J
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oX()J
 
     move-result-wide v1
 
@@ -1620,9 +1620,9 @@
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/internal/gtm/j;->l(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object p1, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/v;->or()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/gtm/v;->ou()Ljava/util/List;
 
     move-result-object p1
 
@@ -1664,28 +1664,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;->oh()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
     const-wide/16 v4, -0x1
 
     :try_start_0
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->apa: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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aou:J
+    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
 
-    iget-object v9, v0, Lcom/google/android/gms/internal/gtm/p;->aov:Ljava/lang/String;
+    iget-object v9, v0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/lang/String;
 
     invoke-static {v9}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
     invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/v;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -1724,13 +1724,13 @@
     invoke-virtual {v6, v10, v9}, Lcom/google/android/gms/internal/gtm/j;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v9, v0, Lcom/google/android/gms/internal/gtm/p;->aou:J
+    iget-wide v9, v0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/gtm/p;->aov:Ljava/lang/String;
+    iget-object v11, v0, Lcom/google/android/gms/internal/gtm/p;->aoE:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->aow:Ljava/lang/String;
+    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->aoF: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
 
@@ -1740,21 +1740,21 @@
 
     add-long/2addr v11, v9
 
-    iput-wide v11, v0, Lcom/google/android/gms/internal/gtm/p;->aoy:J
+    iput-wide v11, v0, Lcom/google/android/gms/internal/gtm/p;->aoH:J
 
-    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v6, v1, Lcom/google/android/gms/internal/gtm/y;->apa: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;->oh()V
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()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;->aoz:Ljava/util/Map;
+    iget-object v12, v0, Lcom/google/android/gms/internal/gtm/p;->aoI:Ljava/util/Map;
 
     invoke-static {v12}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1819,7 +1819,7 @@
 
     const-string v14, "app_uid"
 
-    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aou:J
+    iget-wide v7, v0, Lcom/google/android/gms/internal/gtm/p;->aoD:J
 
     invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1829,19 +1829,19 @@
 
     const-string v7, "cid"
 
-    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->aov:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->aoE: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;->aow:Ljava/lang/String;
+    iget-object v8, v0, Lcom/google/android/gms/internal/gtm/p;->aoF: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;->aox:Z
+    iget-boolean v8, v0, Lcom/google/android/gms/internal/gtm/p;->aoG:Z
 
     if-eqz v8, :cond_3
 
@@ -1861,7 +1861,7 @@
 
     const-string v7, "hits_count"
 
-    iget-wide v14, v0, Lcom/google/android/gms/internal/gtm/p;->aoy:J
+    iget-wide v14, v0, Lcom/google/android/gms/internal/gtm/p;->aoH:J
 
     invoke-static {v14, v15}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -1908,7 +1908,7 @@
 
     :cond_4
     :goto_2
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->setTransactionSuccessful()V
     :try_end_2
@@ -1916,7 +1916,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_3
@@ -1950,7 +1950,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_5
@@ -1968,7 +1968,7 @@
 
     :goto_5
     :try_start_6
-    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, v1, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->endTransaction()V
     :try_end_6
@@ -1991,34 +1991,230 @@
     goto :goto_7
 .end method
 
-.method protected final nQ()V
+.method protected final nT()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoS:Lcom/google/android/gms/internal/gtm/bf;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apb:Lcom/google/android/gms/internal/gtm/bf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->oi()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/k;->ol()V
 
     return-void
 .end method
 
-.method protected final nY()V
+.method public final oB()V
+    .locals 8
+
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apk:Z
+
+    const/4 v1, 0x1
+
+    const-wide/16 v2, 0x0
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oE()J
+
+    move-result-wide v4
+
+    cmp-long v0, v4, v2
+
+    if-lez v0, :cond_0
+
+    const/4 v0, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    :goto_0
+    if-nez v0, :cond_1
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apc: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;->oD()V
+
+    return-void
+
+    :cond_1
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apc: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;->oD()V
+
+    return-void
+
+    :cond_2
+    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqw:Lcom/google/android/gms/internal/gtm/av;
+
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqF:Ljava/lang/Object;
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    if-nez v0, :cond_3
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apc:Lcom/google/android/gms/internal/gtm/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->pf()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apc:Lcom/google/android/gms/internal/gtm/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->isConnected()Z
+
+    move-result v1
+
+    :cond_3
+    if-eqz v1, :cond_7
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oC()V
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oE()J
+
+    move-result-wide v0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/bh;->pm()J
+
+    move-result-wide v4
+
+    cmp-long v6, v4, v2
+
+    if-eqz v6, :cond_5
+
+    iget-object v6, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
+
+    iget-object v6, v6, Lcom/google/android/gms/internal/gtm/m;->aem:Lcom/google/android/gms/common/util/e;
+
+    invoke-interface {v6}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
+
+    move-result-wide v6
+
+    sub-long/2addr v6, v4
+
+    invoke-static {v6, v7}, Ljava/lang/Math;->abs(J)J
+
+    move-result-wide v4
+
+    sub-long v4, v0, v4
+
+    cmp-long v6, v4, v2
+
+    if-lez v6, :cond_4
+
+    goto :goto_1
+
+    :cond_4
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v4
+
+    goto :goto_1
+
+    :cond_5
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oP()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->min(JJ)J
+
+    move-result-wide v4
+
+    :goto_1
+    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v0
+
+    const-string v1, "Dispatch scheduled (ms)"
+
+    invoke-virtual {p0, v1, v0}, 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/y;->apf:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oZ()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_6
+
+    const-wide/16 v0, 0x1
+
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ao;->oY()J
+
+    move-result-wide v2
+
+    add-long/2addr v4, v2
+
+    invoke-static {v0, v1, v4, v5}, Ljava/lang/Math;->max(JJ)J
+
+    move-result-wide v0
+
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/ao;->w(J)V
+
+    return-void
+
+    :cond_6
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apf:Lcom/google/android/gms/internal/gtm/ao;
+
+    invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/internal/gtm/ao;->v(J)V
+
+    return-void
+
+    :cond_7
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oC()V
+
+    return-void
+.end method
+
+.method protected final ob()V
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oK()Z
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oN()Z
 
     move-result v0
 
@@ -2029,7 +2225,7 @@
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apd:Lcom/google/android/gms/internal/gtm/q;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/q;->isConnected()Z
 
@@ -2044,7 +2240,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2058,9 +2254,9 @@
 
     :cond_2
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oO()I
+    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oR()I
 
     move-result v1
 
@@ -2076,7 +2272,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
     :try_end_0
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_1
 
@@ -2098,7 +2294,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/gtm/az;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoU:Lcom/google/android/gms/internal/gtm/q;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apd: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
 
@@ -2106,7 +2302,7 @@
 
     if-nez v2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return-void
 
@@ -2114,9 +2310,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;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/az;->aqF:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/gtm/az;->aqO:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/internal/gtm/v;->u(J)V
     :try_end_1
@@ -2131,7 +2327,7 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     return-void
 
@@ -2142,40 +2338,40 @@
 
     invoke-virtual {p0, v1, v0}, Lcom/google/android/gms/internal/gtm/j;->o(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oD()V
 
     :cond_5
     return-void
 .end method
 
-.method final nZ()V
+.method final oc()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aem: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/y;->aoZ:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/gtm/y;->apj:J
 
     return-void
 .end method
 
-.method protected final ov()V
+.method protected final oy()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
+    invoke-static {}, Lcom/google/android/gms/analytics/m;->lN()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bj;->C(Landroid/content/Context;)Z
 
@@ -2213,11 +2409,11 @@
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oh()Lcom/google/android/gms/internal/gtm/bh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->ph()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/bh;->pk()J
 
     const-string v0, "android.permission.ACCESS_NETWORK_STATE"
 
@@ -2231,7 +2427,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bn(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oC()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oF()V
 
     :cond_3
     const-string v0, "android.permission.INTERNET"
@@ -2246,12 +2442,12 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bn(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oC()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oF()V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/j;->aoj:Lcom/google/android/gms/internal/gtm/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aer:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/m;->aeA:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/gtm/bk;->ad(Landroid/content/Context;)Z
 
@@ -2271,11 +2467,11 @@
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/gtm/j;->bm(Ljava/lang/String;)V
 
     :goto_1
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apk:Z
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Lcom/google/android/gms/internal/gtm/v;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
 
@@ -2283,206 +2479,10 @@
 
     if-nez v0, :cond_6
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->ow()V
-
-    :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oy()V
-
-    return-void
-.end method
-
-.method public final oy()V
-    .locals 8
-
-    invoke-static {}, Lcom/google/android/gms/analytics/m;->lK()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->apa:Z
-
-    const/4 v1, 0x1
-
-    const-wide/16 v2, 0x0
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()J
-
-    move-result-wide v4
-
-    cmp-long v0, v4, v2
-
-    if-lez v0, :cond_0
-
-    const/4 v0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    if-nez v0, :cond_1
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoT: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;->oA()V
-
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoR:Lcom/google/android/gms/internal/gtm/v;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/v;->isEmpty()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_2
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoT: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;->oA()V
-
-    return-void
-
-    :cond_2
-    sget-object v0, Lcom/google/android/gms/internal/gtm/au;->aqn:Lcom/google/android/gms/internal/gtm/av;
-
-    iget-object v0, v0, Lcom/google/android/gms/internal/gtm/av;->aqw:Ljava/lang/Object;
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    if-nez v0, :cond_3
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoT:Lcom/google/android/gms/internal/gtm/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->pc()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoT:Lcom/google/android/gms/internal/gtm/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/be;->isConnected()Z
-
-    move-result v1
-
-    :cond_3
-    if-eqz v1, :cond_7
-
     invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()J
-
-    move-result-wide v0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oe()Lcom/google/android/gms/internal/gtm/bh;
-
-    move-result-object v4
-
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/gtm/bh;->pj()J
-
-    move-result-wide v4
-
-    cmp-long v6, v4, v2
-
-    if-eqz v6, :cond_5
-
-    iget-object v6, p0, Lcom/google/android/gms/internal/gtm/j;->aoa:Lcom/google/android/gms/internal/gtm/m;
-
-    iget-object v6, v6, Lcom/google/android/gms/internal/gtm/m;->aed:Lcom/google/android/gms/common/util/e;
-
-    invoke-interface {v6}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
-
-    move-result-wide v6
-
-    sub-long/2addr v6, v4
-
-    invoke-static {v6, v7}, Ljava/lang/Math;->abs(J)J
-
-    move-result-wide v4
-
-    sub-long v4, v0, v4
-
-    cmp-long v6, v4, v2
-
-    if-lez v6, :cond_4
-
-    goto :goto_1
-
-    :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oM()J
-
-    move-result-wide v2
-
-    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    goto :goto_1
-
-    :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/gtm/am;->oM()J
-
-    move-result-wide v2
-
-    invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->min(JJ)J
-
-    move-result-wide v4
-
-    :goto_1
-    invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v0
-
-    const-string v1, "Dispatch scheduled (ms)"
-
-    invoke-virtual {p0, v1, v0}, 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/y;->aoW:Lcom/google/android/gms/internal/gtm/ao;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/gtm/ao;->oW()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_6
-
-    const-wide/16 v0, 0x1
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/ao;
-
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/gtm/ao;->oV()J
-
-    move-result-wide v2
-
-    add-long/2addr v4, v2
-
-    invoke-static {v0, v1, v4, v5}, Ljava/lang/Math;->max(JJ)J
-
-    move-result-wide v0
-
-    iget-object v2, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/ao;
-
-    invoke-virtual {v2, v0, v1}, Lcom/google/android/gms/internal/gtm/ao;->w(J)V
-
-    return-void
-
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoW:Lcom/google/android/gms/internal/gtm/ao;
-
-    invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/internal/gtm/ao;->v(J)V
-
-    return-void
-
-    :cond_7
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oA()V
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/gtm/y;->oz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/y;->oB()V
 
     return-void
 .end method
@@ -2490,9 +2490,9 @@
 .method final start()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->oh()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/k;->ok()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoQ:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Z
 
     const/4 v1, 0x1
 
@@ -2502,9 +2502,9 @@
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/Object;)V
 
-    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoQ:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/internal/gtm/y;->aoZ:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->oa()Lcom/google/android/gms/analytics/m;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/gtm/j;->od()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 f777ca149c..5e546ae05f 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 apb:Lcom/google/android/gms/internal/gtm/y;
+.field private final synthetic apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iput-object p1, p0, Lcom/google/android/gms/internal/gtm/z;->apl: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;->apb:Lcom/google/android/gms/internal/gtm/y;
+    iget-object v0, p0, Lcom/google/android/gms/internal/gtm/z;->apl: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 b2b83778dd..aaff233777 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,9 +21,9 @@
 
 
 # instance fields
-.field apm:Ljava/lang/String;
+.field apw:Ljava/lang/String;
 
-.field private apn:Ljava/lang/String;
+.field private apx:Ljava/lang/String;
 
 .field value:Ljava/lang/String;
 
@@ -62,13 +62,13 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apm:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apw:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apn:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apx:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
 
@@ -96,11 +96,11 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apm:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apw:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apn:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/gtm/zzbk;->apx: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 c6f80ade50..0d801e44e3 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
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final ajX:Landroid/os/IBinder;
+.field private final akg:Landroid/os/IBinder;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/a;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/a;->akg:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/a;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/a;->ane:Ljava/lang/String;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 .method public asBinder()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/a;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/a;->akg:Landroid/os/IBinder;
 
     return-object v0
 .end method
@@ -48,7 +48,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->akg:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -97,7 +97,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->akg:Landroid/os/IBinder;
 
     const/4 v2, 0x0
 
@@ -123,14 +123,14 @@
     throw p1
 .end method
 
-.method public final pC()Landroid/os/Parcel;
+.method public final pF()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/a;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/a;->ane: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/aa.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aa.smali
index 1b6ae30ffb..0af2a3254c 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
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aa;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aa;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aa;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aa;->asx:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -34,21 +34,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aa;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aa;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aa;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aa;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/aa;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/aa;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->onActivityDestroyed(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 47a3a9b04a..e237ed18aa 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
@@ -4,24 +4,24 @@
 
 
 # instance fields
-.field private final synthetic asE:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asE:Lcom/google/android/gms/internal/measurement/it;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asN:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic asv:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ab;->asE:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ab;->asN:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ab;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ab;->asx:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/ab;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/ab;->asE:Lcom/google/android/gms/internal/measurement/it;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -38,23 +38,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ab;->asE:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ab;->asN:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ab;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ab;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ab;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/ab;->asE:Lcom/google/android/gms/internal/measurement/it;
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/ab;->anq:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/ab;->anz:J
 
     invoke-interface {v0, v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/kv;->onActivitySaveInstanceState(Lcom/google/android/gms/a/a;Lcom/google/android/gms/internal/measurement/lv;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a$a.smali
index 2e83cd08d5..6435ebdcc7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$a;->pF()Lcom/google/android/gms/internal/measurement/ac$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$a;->pI()Lcom/google/android/gms/internal/measurement/ac$a;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ac$b$a;)Lcom/google/android/gms/internal/measurement/ac$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$a;
 
@@ -67,9 +67,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ac$e$a;)Lcom/google/android/gms/internal/measurement/ac$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$a;
 
@@ -81,7 +81,7 @@
 .method public final bj(I)Lcom/google/android/gms/internal/measurement/ac$e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$a;
 
@@ -99,7 +99,7 @@
 .method public final bk(I)Lcom/google/android/gms/internal/measurement/ac$b;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$a;
 
@@ -114,10 +114,10 @@
     return-object p1
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$a;
 
@@ -130,10 +130,10 @@
     return v0
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$a;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a.smali
index e45c1d6b5f..3bf236fa79 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$a.smali
@@ -99,13 +99,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -119,7 +119,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -136,7 +136,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ac$a;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -154,7 +154,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$a;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -171,7 +171,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ac$a;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -184,7 +184,7 @@
     return-void
 .end method
 
-.method static synthetic pF()Lcom/google/android/gms/internal/measurement/ac$a;
+.method static synthetic pI()Lcom/google/android/gms/internal/measurement/ac$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$a;->zzi:Lcom/google/android/gms/internal/measurement/ac$a;
@@ -197,7 +197,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v1, 0x1
 
@@ -359,7 +359,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$a;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b$a.smali
index 9e95cae2e6..4513840c84 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$b;->pK()Lcom/google/android/gms/internal/measurement/ac$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$b;->pN()Lcom/google/android/gms/internal/measurement/ac$b;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ac$c;)Lcom/google/android/gms/internal/measurement/ac$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$b;
 
@@ -67,7 +67,7 @@
 .method public final bl(I)Lcom/google/android/gms/internal/measurement/ac$c;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$b;
 
@@ -85,9 +85,9 @@
 .method public final bz(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ac$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$b;
 
@@ -96,10 +96,10 @@
     return-object p0
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$b;
 
@@ -112,10 +112,10 @@
     return v0
 .end method
 
-.method public final pL()Ljava/lang/String;
+.method public final pO()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b.smali
index 1288b081e7..c270c5fc0c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$b.smali
@@ -101,7 +101,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b;->zze:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -117,7 +117,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -169,12 +169,12 @@
     throw p0
 .end method
 
-.method public static pJ()Lcom/google/android/gms/internal/measurement/ac$b$a;
+.method public static pM()Lcom/google/android/gms/internal/measurement/ac$b$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$b;->zzl:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
     return-object v0
 .end method
 
-.method static synthetic pK()Lcom/google/android/gms/internal/measurement/ac$b;
+.method static synthetic pN()Lcom/google/android/gms/internal/measurement/ac$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$b;->zzl:Lcom/google/android/gms/internal/measurement/ac$b;
@@ -196,7 +196,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v1, 0x1
 
@@ -370,7 +370,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$b;->zzc:I
@@ -389,14 +389,14 @@
     return v0
 .end method
 
-.method public final pI()Lcom/google/android/gms/internal/measurement/ac$d;
+.method public final pL()Lcom/google/android/gms/internal/measurement/ac$d;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$b;->zzh:Lcom/google/android/gms/internal/measurement/ac$d;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pV()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c$a.smali
index 213ca5a37b..b932c45a5d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$c;->pT()Lcom/google/android/gms/internal/measurement/ac$c;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final bA(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ac$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$c;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c.smali
index 86aef1e625..b27aaf5a6d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$c.smali
@@ -111,7 +111,7 @@
     throw p0
 .end method
 
-.method public static pP()Lcom/google/android/gms/internal/measurement/ac$c;
+.method public static pS()Lcom/google/android/gms/internal/measurement/ac$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$c;->zzh:Lcom/google/android/gms/internal/measurement/ac$c;
@@ -119,7 +119,7 @@
     return-object v0
 .end method
 
-.method static synthetic pQ()Lcom/google/android/gms/internal/measurement/ac$c;
+.method static synthetic pT()Lcom/google/android/gms/internal/measurement/ac$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$c;->zzh:Lcom/google/android/gms/internal/measurement/ac$c;
@@ -132,7 +132,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v1, 0x1
 
@@ -276,7 +276,7 @@
     .end packed-switch
 .end method
 
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$c;->zzc:I
@@ -295,7 +295,7 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$c;->zzc:I
@@ -314,14 +314,14 @@
     return v0
 .end method
 
-.method public final pM()Lcom/google/android/gms/internal/measurement/ac$f;
+.method public final pP()Lcom/google/android/gms/internal/measurement/ac$f;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$c;->zzd:Lcom/google/android/gms/internal/measurement/ac$f;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f;->qa()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f;->qd()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object v0
 
@@ -329,14 +329,14 @@
     return-object v0
 .end method
 
-.method public final pN()Lcom/google/android/gms/internal/measurement/ac$d;
+.method public final pQ()Lcom/google/android/gms/internal/measurement/ac$d;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$c;->zze:Lcom/google/android/gms/internal/measurement/ac$d;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pS()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pV()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v0
 
@@ -344,7 +344,7 @@
     return-object v0
 .end method
 
-.method public final pO()Z
+.method public final pR()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$c;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$a.smali
index ed4d6d460a..6f2827a422 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$a.smali
@@ -27,17 +27,17 @@
 
 
 # static fields
-.field public static final enum asG:Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field public static final enum asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
-.field public static final enum asH:Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field public static final enum asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
-.field public static final enum asI:Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field public static final enum asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
-.field public static final enum asJ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field public static final enum asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
-.field public static final enum asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field public static final enum asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
-.field private static final asL:Lcom/google/android/gms/internal/measurement/ea;
+.field private static final asU:Lcom/google/android/gms/internal/measurement/ea;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/ea<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic asM:[Lcom/google/android/gms/internal/measurement/ac$d$a;
+.field private static final synthetic asV:[Lcom/google/android/gms/internal/measurement/ac$d$a;
 
 
 # instance fields
@@ -66,7 +66,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/internal/measurement/ac$d$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asG:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$d$a;
 
@@ -76,7 +76,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lcom/google/android/gms/internal/measurement/ac$d$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asH:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$d$a;
 
@@ -86,7 +86,7 @@
 
     invoke-direct {v0, v4, v3, v3}, Lcom/google/android/gms/internal/measurement/ac$d$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asI:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$d$a;
 
@@ -96,7 +96,7 @@
 
     invoke-direct {v0, v5, v4, v4}, Lcom/google/android/gms/internal/measurement/ac$d$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asJ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$d$a;
 
@@ -106,39 +106,39 @@
 
     invoke-direct {v0, v6, v5, v5}, Lcom/google/android/gms/internal/measurement/ac$d$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/ac$d$a;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ac$d$a;->asG:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asH:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asI:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asJ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asM:[Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asV:[Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/af;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/af;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asL:Lcom/google/android/gms/internal/measurement/ea;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asU:Lcom/google/android/gms/internal/measurement/ea;
 
     return-void
 .end method
@@ -184,35 +184,35 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asJ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     return-object p0
 
     :cond_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asI:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     return-object p0
 
     :cond_3
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asH:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     return-object p0
 
     :cond_4
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asG:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     return-object p0
 .end method
 
-.method public static pU()Lcom/google/android/gms/internal/measurement/ed;
+.method public static pX()Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ae;->asX:Lcom/google/android/gms/internal/measurement/ed;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ae;->atg:Lcom/google/android/gms/internal/measurement/ed;
 
     return-object v0
 .end method
@@ -220,7 +220,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ac$d$a;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asM:[Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asV:[Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ac$d$a;->clone()Ljava/lang/Object;
 
@@ -233,7 +233,7 @@
 
 
 # virtual methods
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$d$a;->zzg:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$b.smali
index 06c82a6263..92b98d7d0e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d$b.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pT()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d;->pW()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d.smali
index 6c0c0d1377..988f5636ff 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$d.smali
@@ -95,7 +95,7 @@
     return-void
 .end method
 
-.method public static pS()Lcom/google/android/gms/internal/measurement/ac$d;
+.method public static pV()Lcom/google/android/gms/internal/measurement/ac$d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d;->zzi:Lcom/google/android/gms/internal/measurement/ac$d;
@@ -103,7 +103,7 @@
     return-object v0
 .end method
 
-.method static synthetic pT()Lcom/google/android/gms/internal/measurement/ac$d;
+.method static synthetic pW()Lcom/google/android/gms/internal/measurement/ac$d;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d;->zzi:Lcom/google/android/gms/internal/measurement/ac$d;
@@ -116,7 +116,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v1, 0x1
 
@@ -206,7 +206,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d$a;->pU()Lcom/google/android/gms/internal/measurement/ed;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$d$a;->pX()Lcom/google/android/gms/internal/measurement/ed;
 
     move-result-object v1
 
@@ -274,7 +274,7 @@
     .end packed-switch
 .end method
 
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$d;->zzc:I
@@ -293,7 +293,7 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$d;->zzc:I
@@ -312,7 +312,7 @@
     return v0
 .end method
 
-.method public final pR()Lcom/google/android/gms/internal/measurement/ac$d$a;
+.method public final pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$d;->zzd:I
@@ -323,7 +323,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asG:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     :cond_0
     return-object v0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e$a.smali
index 29f4da6f8b..96ecfbd0d7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$e;->pX()Lcom/google/android/gms/internal/measurement/ac$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$e;->qa()Lcom/google/android/gms/internal/measurement/ac$e;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final bB(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ac$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ac$e;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e.smali
index 32b2af6c97..e787911e03 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$e.smali
@@ -115,12 +115,12 @@
     throw p0
 .end method
 
-.method public static pW()Lcom/google/android/gms/internal/measurement/ac$e$a;
+.method public static pZ()Lcom/google/android/gms/internal/measurement/ac$e$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$e;->zzj:Lcom/google/android/gms/internal/measurement/ac$e;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -129,7 +129,7 @@
     return-object v0
 .end method
 
-.method static synthetic pX()Lcom/google/android/gms/internal/measurement/ac$e;
+.method static synthetic qa()Lcom/google/android/gms/internal/measurement/ac$e;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$e;->zzj:Lcom/google/android/gms/internal/measurement/ac$e;
@@ -142,7 +142,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v1, 0x1
 
@@ -298,7 +298,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$e;->zzc:I
@@ -317,14 +317,14 @@
     return v0
 .end method
 
-.method public final pV()Lcom/google/android/gms/internal/measurement/ac$c;
+.method public final pY()Lcom/google/android/gms/internal/measurement/ac$c;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$e;->zzf:Lcom/google/android/gms/internal/measurement/ac$c;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$c;->pP()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$c;->pS()Lcom/google/android/gms/internal/measurement/ac$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$a.smali
index f244561174..bd4c91698b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f;->qe()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$b.smali
index e2b0be280a..8a974a905c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f$b.smali
@@ -27,21 +27,21 @@
 
 
 # static fields
-.field public static final enum asN:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field public static final enum asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field public static final enum asP:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field public static final enum asQ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field public static final enum asR:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field public static final enum asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum atb:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field public static final enum asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field public static final enum atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-.field private static final asU:Lcom/google/android/gms/internal/measurement/ea;
+.field private static final atd:Lcom/google/android/gms/internal/measurement/ea;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/ea<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic asV:[Lcom/google/android/gms/internal/measurement/ac$f$b;
+.field private static final synthetic ate:[Lcom/google/android/gms/internal/measurement/ac$f$b;
 
 
 # instance fields
@@ -70,7 +70,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asN:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$f$b;
 
@@ -80,7 +80,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$f$b;
 
@@ -90,7 +90,7 @@
 
     invoke-direct {v0, v4, v3, v3}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asP:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$f$b;
 
@@ -100,7 +100,7 @@
 
     invoke-direct {v0, v5, v4, v4}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asQ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$f$b;
 
@@ -110,7 +110,7 @@
 
     invoke-direct {v0, v6, v5, v5}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asR:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$f$b;
 
@@ -120,7 +120,7 @@
 
     invoke-direct {v0, v7, v6, v6}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->atb:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ac$f$b;
 
@@ -130,47 +130,47 @@
 
     invoke-direct {v0, v8, v7, v7}, Lcom/google/android/gms/internal/measurement/ac$f$b;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     const/4 v0, 0x7
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/ac$f$b;
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/ac$f$b;->asN:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asP:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asQ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asR:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atb:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asV:[Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->ate:[Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ag;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ag;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asU:Lcom/google/android/gms/internal/measurement/ea;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->atd:Lcom/google/android/gms/internal/measurement/ea;
 
     return-void
 .end method
@@ -200,37 +200,37 @@
     return-object p0
 
     :pswitch_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->atb:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asR:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
     :pswitch_3
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asQ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
     :pswitch_4
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asP:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
     :pswitch_5
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
     :pswitch_6
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asN:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     return-object p0
 
@@ -246,10 +246,10 @@
     .end packed-switch
 .end method
 
-.method public static pU()Lcom/google/android/gms/internal/measurement/ed;
+.method public static pX()Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ai;->asX:Lcom/google/android/gms/internal/measurement/ed;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ai;->atg:Lcom/google/android/gms/internal/measurement/ed;
 
     return-object v0
 .end method
@@ -257,7 +257,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ac$f$b;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asV:[Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->ate:[Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ac$f$b;->clone()Ljava/lang/Object;
 
@@ -270,7 +270,7 @@
 
 
 # virtual methods
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$f$b;->zzi:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f.smali
index e61087d9eb..a5affee3f4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ac$f.smali
@@ -94,7 +94,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$f;->zze:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -103,7 +103,7 @@
     return-void
 .end method
 
-.method public static qa()Lcom/google/android/gms/internal/measurement/ac$f;
+.method public static qd()Lcom/google/android/gms/internal/measurement/ac$f;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f;->zzh:Lcom/google/android/gms/internal/measurement/ac$f;
@@ -111,7 +111,7 @@
     return-object v0
 .end method
 
-.method static synthetic qb()Lcom/google/android/gms/internal/measurement/ac$f;
+.method static synthetic qe()Lcom/google/android/gms/internal/measurement/ac$f;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f;->zzh:Lcom/google/android/gms/internal/measurement/ac$f;
@@ -124,7 +124,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v1, 0x1
 
@@ -214,7 +214,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f$b;->pU()Lcom/google/android/gms/internal/measurement/ed;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$f$b;->pX()Lcom/google/android/gms/internal/measurement/ed;
 
     move-result-object v1
 
@@ -274,7 +274,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$f;->zzc:I
@@ -293,7 +293,7 @@
     return v0
 .end method
 
-.method public final pY()Lcom/google/android/gms/internal/measurement/ac$f$b;
+.method public final qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ac$f;->zzd:I
@@ -304,13 +304,13 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asN:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     :cond_0
     return-object v0
 .end method
 
-.method public final pZ()I
+.method public final qc()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ac$f;->zzg:Lcom/google/android/gms/internal/measurement/ee;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad.smali
index 4c4874e0a5..ddd6d4d2b2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ad.smali
@@ -4,14 +4,14 @@
 
 
 # static fields
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->sZ()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->tc()[I
 
     move-result-object v0
 
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzd:I
 
@@ -36,7 +36,7 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zze:I
 
@@ -50,7 +50,7 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzc:I
 
@@ -64,7 +64,7 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzf:I
 
@@ -78,7 +78,7 @@
 
     :catch_3
     :try_start_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzg:I
 
@@ -92,7 +92,7 @@
 
     :catch_4
     :try_start_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zza:I
 
@@ -106,9 +106,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ad;->atf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anl:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ae.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ae.smali
index 82033f4bfe..a356eb1009 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ae.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ae.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final asX:Lcom/google/android/gms/internal/measurement/ed;
+.field static final atg:Lcom/google/android/gms/internal/measurement/ed;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ae;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ae;->asX:Lcom/google/android/gms/internal/measurement/ed;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ae;->atg:Lcom/google/android/gms/internal/measurement/ed;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a$a.smali
index 0b65fee75e..862448da47 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$a;->qc()Lcom/google/android/gms/internal/measurement/ah$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$a;->qf()Lcom/google/android/gms/internal/measurement/ah$a;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final bC(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ah$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$a;
 
@@ -64,10 +64,10 @@
     return-object p0
 .end method
 
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$a;
 
@@ -76,10 +76,10 @@
     return v0
 .end method
 
-.method public final pL()Ljava/lang/String;
+.method public final pO()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$a;
 
@@ -88,10 +88,10 @@
     return-object v0
 .end method
 
-.method public final qd()Z
+.method public final qg()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$a;
 
@@ -111,10 +111,10 @@
     return v0
 .end method
 
-.method public final qe()I
+.method public final qh()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$a;
 
@@ -126,7 +126,7 @@
 .method public final zzb()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$a;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a.smali
index 1fdaf86046..eda70b8f26 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$a.smali
@@ -111,7 +111,7 @@
     throw p0
 .end method
 
-.method static synthetic qc()Lcom/google/android/gms/internal/measurement/ah$a;
+.method static synthetic qf()Lcom/google/android/gms/internal/measurement/ah$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ah$a;->zzh:Lcom/google/android/gms/internal/measurement/ah$a;
@@ -124,7 +124,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b$a.smali
index f8771a8337..0eb5b41464 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qh()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qk()Lcom/google/android/gms/internal/measurement/ah$b;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ah$a$a;)Lcom/google/android/gms/internal/measurement/ah$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$b;
 
@@ -67,7 +67,7 @@
 .method public final bp(I)Lcom/google/android/gms/internal/measurement/ah$a;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$b;
 
@@ -82,10 +82,10 @@
     return-object p1
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$b;
 
@@ -98,7 +98,7 @@
     return v0
 .end method
 
-.method public final qi()Ljava/util/List;
+.method public final ql()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,7 +109,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$b;
 
@@ -122,12 +122,12 @@
     return-object v0
 .end method
 
-.method public final qj()Lcom/google/android/gms/internal/measurement/ah$b$a;
+.method public final qm()Lcom/google/android/gms/internal/measurement/ah$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b.smali
index 760e609dca..76bae0a463 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$b.smali
@@ -117,19 +117,19 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b;->zze:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ah$b;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v1
 
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/ah$b;->zzh:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v1
 
@@ -143,7 +143,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ah$b;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -157,7 +157,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ah$b;->zzh:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -174,7 +174,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ah$b;->zzh:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -187,12 +187,12 @@
     return-void
 .end method
 
-.method public static qf()Lcom/google/android/gms/internal/measurement/ah$b$a;
+.method public static qi()Lcom/google/android/gms/internal/measurement/ah$b$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ah$b;->zzl:Lcom/google/android/gms/internal/measurement/ah$b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -201,7 +201,7 @@
     return-object v0
 .end method
 
-.method public static qg()Lcom/google/android/gms/internal/measurement/ah$b;
+.method public static qj()Lcom/google/android/gms/internal/measurement/ah$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ah$b;->zzl:Lcom/google/android/gms/internal/measurement/ah$b;
@@ -209,7 +209,7 @@
     return-object v0
 .end method
 
-.method static synthetic qh()Lcom/google/android/gms/internal/measurement/ah$b;
+.method static synthetic qk()Lcom/google/android/gms/internal/measurement/ah$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ah$b;->zzl:Lcom/google/android/gms/internal/measurement/ah$b;
@@ -222,7 +222,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     const/4 v1, 0x1
 
@@ -408,7 +408,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ah$b;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c$a.smali
index 9118bec52c..eaa10d98c7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$c;->qk()Lcom/google/android/gms/internal/measurement/ah$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$c;->qn()Lcom/google/android/gms/internal/measurement/ah$c;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c.smali
index 32266b77c8..11fc75c438 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ah$c.smali
@@ -86,7 +86,7 @@
     return-void
 .end method
 
-.method static synthetic qk()Lcom/google/android/gms/internal/measurement/ah$c;
+.method static synthetic qn()Lcom/google/android/gms/internal/measurement/ah$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ah$c;->zzf:Lcom/google/android/gms/internal/measurement/ah$c;
@@ -99,7 +99,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     const/4 v1, 0x1
 
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 3312ebf7e6..e72c2e4358 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final asX:Lcom/google/android/gms/internal/measurement/ed;
+.field static final atg:Lcom/google/android/gms/internal/measurement/ed;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ai;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ai;->asX:Lcom/google/android/gms/internal/measurement/ed;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ai;->atg:Lcom/google/android/gms/internal/measurement/ed;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj.smali
index cae730cf31..069337816a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/aj.smali
@@ -4,14 +4,14 @@
 
 
 # static fields
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->sZ()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->tc()[I
 
     move-result-object v0
 
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzd:I
 
@@ -36,7 +36,7 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zze:I
 
@@ -50,7 +50,7 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzc:I
 
@@ -64,7 +64,7 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzf:I
 
@@ -78,7 +78,7 @@
 
     :catch_3
     :try_start_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzg:I
 
@@ -92,7 +92,7 @@
 
     :catch_4
     :try_start_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zza:I
 
@@ -106,9 +106,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aj;->atf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anl:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a$a.smali
index 1d9846f5e0..565c38bd3c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()Lcom/google/android/gms/internal/measurement/ak$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qr()Lcom/google/android/gms/internal/measurement/ak$a;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final G(Z)Lcom/google/android/gms/internal/measurement/ak$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$a;
 
@@ -67,9 +67,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$i$a;)Lcom/google/android/gms/internal/measurement/ak$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$a;
 
@@ -81,9 +81,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$i;)Lcom/google/android/gms/internal/measurement/ak$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$a;
 
@@ -95,9 +95,9 @@
 .method public final bq(I)Lcom/google/android/gms/internal/measurement/ak$a$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$a;
 
@@ -106,10 +106,10 @@
     return-object p0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$a;
 
@@ -129,14 +129,14 @@
     return v0
 .end method
 
-.method public final qp()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public final qs()Lcom/google/android/gms/internal/measurement/ak$i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a;->qm()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a;->qp()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a.smali
index a01f4c9689..b472a1e895 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$a.smali
@@ -101,7 +101,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$a;Lcom/google/android/gms/internal/measurement/ak$i$a;)V
     .locals 0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -157,12 +157,12 @@
     return-void
 .end method
 
-.method public static qn()Lcom/google/android/gms/internal/measurement/ak$a$a;
+.method public static qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$a;->zzh:Lcom/google/android/gms/internal/measurement/ak$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
     return-object v0
 .end method
 
-.method static synthetic qo()Lcom/google/android/gms/internal/measurement/ak$a;
+.method static synthetic qr()Lcom/google/android/gms/internal/measurement/ak$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$a;->zzh:Lcom/google/android/gms/internal/measurement/ak$a;
@@ -184,7 +184,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -328,14 +328,14 @@
     .end packed-switch
 .end method
 
-.method public final ql()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public final qo()Lcom/google/android/gms/internal/measurement/ak$i;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a;->zze:Lcom/google/android/gms/internal/measurement/ak$i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->ri()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v0
 
@@ -343,14 +343,14 @@
     return-object v0
 .end method
 
-.method public final qm()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public final qp()Lcom/google/android/gms/internal/measurement/ak$i;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$a;->zzf:Lcom/google/android/gms/internal/measurement/ak$i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->ri()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b$a.smali
index 4adc0188dd..67069ed9d2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$b;->qr()Lcom/google/android/gms/internal/measurement/ak$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$b;->qu()Lcom/google/android/gms/internal/measurement/ak$b;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final br(I)Lcom/google/android/gms/internal/measurement/ak$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$b;
 
@@ -67,9 +67,9 @@
 .method public final y(J)Lcom/google/android/gms/internal/measurement/ak$b$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$b$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$b;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b.smali
index 47f12d381b..b0e43bade2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$b.smali
@@ -108,12 +108,12 @@
     return-void
 .end method
 
-.method public static qq()Lcom/google/android/gms/internal/measurement/ak$b$a;
+.method public static qt()Lcom/google/android/gms/internal/measurement/ak$b$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$b;->zzf:Lcom/google/android/gms/internal/measurement/ak$b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -122,7 +122,7 @@
     return-object v0
 .end method
 
-.method static synthetic qr()Lcom/google/android/gms/internal/measurement/ak$b;
+.method static synthetic qu()Lcom/google/android/gms/internal/measurement/ak$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$b;->zzf:Lcom/google/android/gms/internal/measurement/ak$b;
@@ -135,7 +135,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -267,7 +267,7 @@
     .end packed-switch
 .end method
 
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$b;->zzc:I
@@ -286,7 +286,7 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$b;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c$a.smali
index 11deed57a6..773505563a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qu()Lcom/google/android/gms/internal/measurement/ak$c;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qx()Lcom/google/android/gms/internal/measurement/ak$c;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final A(J)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -67,9 +67,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ak$e$a;)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -81,9 +81,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ak$e;)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -95,9 +95,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$e$a;)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -109,9 +109,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$e;)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -123,9 +123,9 @@
 .method public final bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -137,7 +137,7 @@
 .method public final bs(I)Lcom/google/android/gms/internal/measurement/ak$e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -155,9 +155,9 @@
 .method public final bt(I)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -166,35 +166,59 @@
     return-object p0
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$c;->pH()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$c;->pK()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qd()Z
-    .locals 1
+.method public final qA()J
+    .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$c;->qd()Z
+    iget-wide v0, v0, Lcom/google/android/gms/internal/measurement/ak$c;->zzf:J
+
+    return-wide v0
+.end method
+
+.method public final qB()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
+
+    iget-wide v0, v0, Lcom/google/android/gms/internal/measurement/ak$c;->zzg:J
+
+    return-wide v0
+.end method
+
+.method public final qg()Z
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$c;->qg()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qv()Ljava/util/List;
+.method public final qy()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -205,7 +229,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -218,10 +242,10 @@
     return-object v0
 .end method
 
-.method public final qw()Ljava/lang/String;
+.method public final qz()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
@@ -230,36 +254,12 @@
     return-object v0
 .end method
 
-.method public final qx()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
-
-    iget-wide v0, v0, Lcom/google/android/gms/internal/measurement/ak$c;->zzf:J
-
-    return-wide v0
-.end method
-
-.method public final qy()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
-
-    iget-wide v0, v0, Lcom/google/android/gms/internal/measurement/ak$c;->zzg:J
-
-    return-wide v0
-.end method
-
 .method public final z(J)Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c.smali
index ee0e32bdf6..4c814c8d9f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$c.smali
@@ -91,7 +91,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -107,7 +107,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$c;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qs()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qv()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -119,11 +119,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$c;ILcom/google/android/gms/internal/measurement/ak$e$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qs()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qv()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -141,7 +141,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qs()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qv()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -174,11 +174,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$c;Lcom/google/android/gms/internal/measurement/ak$e$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qs()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qv()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -196,7 +196,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qs()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$c;->qv()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -249,12 +249,12 @@
     return-void
 .end method
 
-.method private final qs()V
+.method private final qv()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -272,12 +272,12 @@
     return-void
 .end method
 
-.method public static qt()Lcom/google/android/gms/internal/measurement/ak$c$a;
+.method public static qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$c;->zzi:Lcom/google/android/gms/internal/measurement/ak$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -286,7 +286,7 @@
     return-object v0
 .end method
 
-.method static synthetic qu()Lcom/google/android/gms/internal/measurement/ak$c;
+.method static synthetic qx()Lcom/google/android/gms/internal/measurement/ak$c;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$c;->zzi:Lcom/google/android/gms/internal/measurement/ak$c;
@@ -299,7 +299,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -455,7 +455,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
@@ -467,7 +467,7 @@
     return v0
 .end method
 
-.method public final qd()Z
+.method public final qg()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$c;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d$a.smali
index 4ba84e63d1..b7b2f71c17 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qA()Lcom/google/android/gms/internal/measurement/ak$d;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qD()Lcom/google/android/gms/internal/measurement/ak$d;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final B(J)Lcom/google/android/gms/internal/measurement/ak$d$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$d;
 
@@ -67,9 +67,9 @@
 .method public final bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$d$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$d$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$d;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d.smali
index 33716cb10f..7be33240f2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$d.smali
@@ -121,20 +121,12 @@
     throw p0
 .end method
 
-.method static synthetic qA()Lcom/google/android/gms/internal/measurement/ak$d;
+.method public static qC()Lcom/google/android/gms/internal/measurement/ak$d$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$d;->zzf:Lcom/google/android/gms/internal/measurement/ak$d;
 
-    return-object v0
-.end method
-
-.method public static qz()Lcom/google/android/gms/internal/measurement/ak$d$a;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak$d;->zzf:Lcom/google/android/gms/internal/measurement/ak$d;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -143,12 +135,20 @@
     return-object v0
 .end method
 
+.method static synthetic qD()Lcom/google/android/gms/internal/measurement/ak$d;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak$d;->zzf:Lcom/google/android/gms/internal/measurement/ak$d;
+
+    return-object v0
+.end method
+
 
 # virtual methods
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e$a.smali
index b59eed57c5..eafb8bbb87 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qD()Lcom/google/android/gms/internal/measurement/ak$e;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qG()Lcom/google/android/gms/internal/measurement/ak$e;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final C(J)Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -67,9 +67,9 @@
 .method public final b(D)Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -81,9 +81,9 @@
 .method public final bF(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -95,9 +95,9 @@
 .method public final bG(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -106,12 +106,12 @@
     return-object p0
 .end method
 
-.method public final qE()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public final qH()Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -120,12 +120,12 @@
     return-object p0
 .end method
 
-.method public final qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public final qI()Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -134,12 +134,12 @@
     return-object p0
 .end method
 
-.method public final qG()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public final qJ()Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$e$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$e;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e.smali
index 5a30412184..3bc49a54cf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$e.smali
@@ -216,12 +216,12 @@
     return-void
 .end method
 
-.method public static qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+.method public static qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$e;->zzi:Lcom/google/android/gms/internal/measurement/ak$e;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -230,7 +230,7 @@
     return-object v0
 .end method
 
-.method static synthetic qD()Lcom/google/android/gms/internal/measurement/ak$e;
+.method static synthetic qG()Lcom/google/android/gms/internal/measurement/ak$e;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$e;->zzi:Lcom/google/android/gms/internal/measurement/ak$e;
@@ -243,7 +243,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -391,7 +391,7 @@
     .end packed-switch
 .end method
 
-.method public final qB()Z
+.method public final qE()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$e;->zzc:I
@@ -410,7 +410,7 @@
     return v0
 .end method
 
-.method public final qd()Z
+.method public final qg()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$e;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f$a.smali
index 3fa7b19f40..cbb9564cf8 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qI()Lcom/google/android/gms/internal/measurement/ak$f;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qL()Lcom/google/android/gms/internal/measurement/ak$f;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$g$a;)Lcom/google/android/gms/internal/measurement/ak$f$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$f;
 
@@ -64,10 +64,10 @@
     return-object p0
 .end method
 
-.method public final qJ()Lcom/google/android/gms/internal/measurement/ak$g;
+.method public final qM()Lcom/google/android/gms/internal/measurement/ak$g;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$f;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f.smali
index 230a045b4c..e907e153dc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$f.smali
@@ -81,7 +81,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -95,7 +95,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$f;->zzc:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -112,7 +112,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$f;->zzc:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -125,12 +125,12 @@
     return-void
 .end method
 
-.method public static qH()Lcom/google/android/gms/internal/measurement/ak$f$a;
+.method public static qK()Lcom/google/android/gms/internal/measurement/ak$f$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$f;->zzd:Lcom/google/android/gms/internal/measurement/ak$f;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -139,7 +139,7 @@
     return-object v0
 .end method
 
-.method static synthetic qI()Lcom/google/android/gms/internal/measurement/ak$f;
+.method static synthetic qL()Lcom/google/android/gms/internal/measurement/ak$f;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$f;->zzd:Lcom/google/android/gms/internal/measurement/ak$f;
@@ -152,7 +152,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g$a.smali
index e11f867da4..40671054d6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()Lcom/google/android/gms/internal/measurement/ak$g;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qR()Lcom/google/android/gms/internal/measurement/ak$g;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final D(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -67,9 +67,9 @@
 .method public final E(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -81,9 +81,9 @@
 .method public final F(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -95,9 +95,9 @@
 .method public final G(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -109,9 +109,9 @@
 .method public final H(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -123,9 +123,9 @@
 .method public final H(Z)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -137,9 +137,9 @@
 .method public final I(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -151,9 +151,9 @@
 .method public final I(Z)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -165,9 +165,9 @@
 .method public final J(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -181,9 +181,9 @@
 .method public final K(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -195,9 +195,9 @@
 .method public final L(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -209,9 +209,9 @@
 .method public final M(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -223,9 +223,9 @@
 .method public final N(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -237,9 +237,9 @@
 .method public final O(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -251,9 +251,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ak$c$a;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -265,9 +265,9 @@
 .method public final a(ILcom/google/android/gms/internal/measurement/ak$k;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -279,9 +279,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$c$a;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -293,9 +293,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$h$b;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -307,9 +307,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$k$a;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -321,9 +321,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$k;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -345,9 +345,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -359,9 +359,9 @@
 .method public final bA(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -373,9 +373,9 @@
 .method public final bB(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -387,9 +387,9 @@
 .method public final bH(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -401,9 +401,9 @@
 .method public final bI(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -415,9 +415,9 @@
 .method public final bJ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -429,9 +429,9 @@
 .method public final bK(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -443,9 +443,9 @@
 .method public final bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -457,9 +457,9 @@
 .method public final bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -471,9 +471,9 @@
 .method public final bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -485,9 +485,9 @@
 .method public final bO(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -499,9 +499,9 @@
 .method public final bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -513,9 +513,9 @@
 .method public final bQ(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -527,9 +527,9 @@
 .method public final bR(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -541,9 +541,9 @@
 .method public final bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -555,9 +555,9 @@
 .method public final bT(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -569,9 +569,9 @@
 .method public final bU(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -583,7 +583,7 @@
 .method public final bu(I)Lcom/google/android/gms/internal/measurement/ak$c;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -601,9 +601,9 @@
 .method public final bv(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -615,7 +615,7 @@
 .method public final bw(I)Lcom/google/android/gms/internal/measurement/ak$k;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -633,9 +633,9 @@
 .method public final bx(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -647,9 +647,9 @@
 .method public final by(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -661,9 +661,9 @@
 .method public final bz(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -685,9 +685,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -709,9 +709,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -733,9 +733,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -744,10 +744,10 @@
     return-object p0
 .end method
 
-.method public final mN()Ljava/lang/String;
+.method public final mQ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -756,10 +756,10 @@
     return-object v0
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -772,12 +772,24 @@
     return v0
 .end method
 
-.method public final qP()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qB()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
+
+    iget-wide v0, v0, Lcom/google/android/gms/internal/measurement/ak$g;->zzi:J
+
+    return-wide v0
+.end method
+
+.method public final qS()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -786,12 +798,12 @@
     return-object p0
 .end method
 
-.method public final qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -800,7 +812,7 @@
     return-object p0
 .end method
 
-.method public final qR()Ljava/util/List;
+.method public final qU()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -811,7 +823,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -824,10 +836,10 @@
     return-object v0
 .end method
 
-.method public final qS()J
+.method public final qV()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -836,12 +848,12 @@
     return-wide v0
 .end method
 
-.method public final qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qW()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -850,12 +862,12 @@
     return-object p0
 .end method
 
-.method public final qU()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qX()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -864,12 +876,12 @@
     return-object p0
 .end method
 
-.method public final qV()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qY()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -878,10 +890,10 @@
     return-object p0
 .end method
 
-.method public final qW()Ljava/lang/String;
+.method public final qZ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -890,52 +902,10 @@
     return-object v0
 .end method
 
-.method public final qX()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public final qh()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ak$g;->f(Lcom/google/android/gms/internal/measurement/ak$g;)V
-
-    return-object p0
-.end method
-
-.method public final qY()Lcom/google/android/gms/internal/measurement/ak$g$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ak$g;->g(Lcom/google/android/gms/internal/measurement/ak$g;)V
-
-    return-object p0
-.end method
-
-.method public final qZ()Lcom/google/android/gms/internal/measurement/ak$g$a;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ak$g;->h(Lcom/google/android/gms/internal/measurement/ak$g;)V
-
-    return-object p0
-.end method
-
-.method public final qe()I
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -948,7 +918,7 @@
     return v0
 .end method
 
-.method public final qv()Ljava/util/List;
+.method public final qy()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -959,7 +929,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
@@ -972,14 +942,44 @@
     return-object v0
 .end method
 
-.method public final qy()J
-    .locals 2
+.method public final ra()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
 
-    iget-wide v0, v0, Lcom/google/android/gms/internal/measurement/ak$g;->zzi:J
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ak$g;->f(Lcom/google/android/gms/internal/measurement/ak$g;)V
 
-    return-wide v0
+    return-object p0
+.end method
+
+.method public final rb()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ak$g;->g(Lcom/google/android/gms/internal/measurement/ak$g;)V
+
+    return-object p0
+.end method
+
+.method public final rc()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ak$g;
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/ak$g;->h(Lcom/google/android/gms/internal/measurement/ak$g;)V
+
+    return-object p0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g.smali
index 0d269b8e0c..f91694a7c4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$g.smali
@@ -185,13 +185,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -221,7 +221,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzac:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v1
 
@@ -237,7 +237,7 @@
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzap:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dz;->tc()Lcom/google/android/gms/internal/measurement/dz;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dz;->tf()Lcom/google/android/gms/internal/measurement/dz;
 
     move-result-object v1
 
@@ -267,7 +267,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$g;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qK()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -279,11 +279,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$g;ILcom/google/android/gms/internal/measurement/ak$c$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qK()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p2
 
@@ -301,7 +301,7 @@
 
     if-eqz p2, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -334,11 +334,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$g;Lcom/google/android/gms/internal/measurement/ak$c$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qK()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -354,7 +354,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$g;Lcom/google/android/gms/internal/measurement/ak$h$b;)V
     .locals 0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -376,11 +376,11 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$g;Lcom/google/android/gms/internal/measurement/ak$k$a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -398,7 +398,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -417,7 +417,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$g;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qK()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -468,7 +468,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/ak$g;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -480,7 +480,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/ak$g;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -506,7 +506,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/ak$g;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qL()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$g;->qO()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -603,7 +603,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzae:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -699,7 +699,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzar:Lcom/google/android/gms/internal/measurement/ec;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ec;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ec;->pH()Z
 
     move-result v0
 
@@ -834,7 +834,7 @@
 .method static synthetic f(Lcom/google/android/gms/internal/measurement/ak$g;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -1212,12 +1212,12 @@
     throw p0
 .end method
 
-.method private final qK()V
+.method private final qN()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -1235,12 +1235,12 @@
     return-void
 .end method
 
-.method private final qL()V
+.method private final qO()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzg:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -1258,12 +1258,12 @@
     return-void
 .end method
 
-.method public static qN()Lcom/google/android/gms/internal/measurement/ak$g$a;
+.method public static qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$g;->zzav:Lcom/google/android/gms/internal/measurement/ak$g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -1272,7 +1272,7 @@
     return-object v0
 .end method
 
-.method static synthetic qO()Lcom/google/android/gms/internal/measurement/ak$g;
+.method static synthetic qR()Lcom/google/android/gms/internal/measurement/ak$g;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$g;->zzav:Lcom/google/android/gms/internal/measurement/ak$g;
@@ -1285,7 +1285,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -1687,7 +1687,7 @@
     .end packed-switch
 .end method
 
-.method public final mP()Z
+.method public final mS()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzc:I
@@ -1706,7 +1706,7 @@
     return v0
 .end method
 
-.method public final qM()Z
+.method public final qP()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$g;->zzd:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$a.smali
index f01b91a3a8..9a40c38561 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$a.smali
@@ -27,11 +27,11 @@
 
 
 # static fields
-.field private static final enum asY:Lcom/google/android/gms/internal/measurement/ak$h$a;
+.field private static final enum ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
-.field private static final enum asZ:Lcom/google/android/gms/internal/measurement/ak$h$a;
+.field private static final enum ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
-.field private static final ata:Lcom/google/android/gms/internal/measurement/ea;
+.field private static final atj:Lcom/google/android/gms/internal/measurement/ea;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/ea<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic atb:[Lcom/google/android/gms/internal/measurement/ak$h$a;
+.field private static final synthetic atk:[Lcom/google/android/gms/internal/measurement/ak$h$a;
 
 
 # instance fields
@@ -62,7 +62,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/internal/measurement/ak$h$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->asY:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ak$h$a;
 
@@ -72,25 +72,25 @@
 
     invoke-direct {v0, v4, v2, v3}, Lcom/google/android/gms/internal/measurement/ak$h$a;-><init>(Ljava/lang/String;II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->asZ:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     new-array v0, v3, [Lcom/google/android/gms/internal/measurement/ak$h$a;
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ak$h$a;->asY:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ak$h$a;->ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     aput-object v3, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ak$h$a;->asZ:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ak$h$a;->ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atb:[Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atk:[Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/an;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/an;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ata:Lcom/google/android/gms/internal/measurement/ea;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atj:Lcom/google/android/gms/internal/measurement/ea;
 
     return-void
 .end method
@@ -126,20 +126,20 @@
     return-object p0
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->asZ:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ati:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->asY:Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->ath:Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     return-object p0
 .end method
 
-.method public static pU()Lcom/google/android/gms/internal/measurement/ed;
+.method public static pX()Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/am;->asX:Lcom/google/android/gms/internal/measurement/ed;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/am;->atg:Lcom/google/android/gms/internal/measurement/ed;
 
     return-object v0
 .end method
@@ -147,7 +147,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ak$h$a;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atb:[Lcom/google/android/gms/internal/measurement/ak$h$a;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ak$h$a;->atk:[Lcom/google/android/gms/internal/measurement/ak$h$a;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ak$h$a;->clone()Ljava/lang/Object;
 
@@ -160,7 +160,7 @@
 
 
 # virtual methods
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$h$a;->zzd:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$b.smali
index 61650d6fbb..89ed8a3539 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h$b.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h;->rb()Lcom/google/android/gms/internal/measurement/ak$h;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h;->re()Lcom/google/android/gms/internal/measurement/ak$h;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/ak$d$a;)Lcom/google/android/gms/internal/measurement/ak$h$b;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$h$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$h$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$h;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h.smali
index dfb803fd96..139caed46e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$h.smali
@@ -90,7 +90,7 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/ak$h;->zzd:I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -104,7 +104,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$h;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -121,7 +121,7 @@
     :cond_0
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$h;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object p1
 
@@ -134,12 +134,12 @@
     return-void
 .end method
 
-.method public static ra()Lcom/google/android/gms/internal/measurement/ak$h$b;
+.method public static rd()Lcom/google/android/gms/internal/measurement/ak$h$b;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$h;->zzf:Lcom/google/android/gms/internal/measurement/ak$h;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -148,7 +148,7 @@
     return-object v0
 .end method
 
-.method static synthetic rb()Lcom/google/android/gms/internal/measurement/ak$h;
+.method static synthetic re()Lcom/google/android/gms/internal/measurement/ak$h;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$h;->zzf:Lcom/google/android/gms/internal/measurement/ak$h;
@@ -161,7 +161,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -251,7 +251,7 @@
 
     const/4 v0, 0x2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h$a;->pU()Lcom/google/android/gms/internal/measurement/ed;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h$a;->pX()Lcom/google/android/gms/internal/measurement/ed;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i$a.smali
index bf608d5826..3982779a21 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rg()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rj()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final bD(I)Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -67,9 +67,9 @@
 .method public final bE(I)Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -91,9 +91,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -115,9 +115,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -139,9 +139,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -163,9 +163,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -174,12 +174,12 @@
     return-object p0
 .end method
 
-.method public final rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
+.method public final rk()Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
@@ -188,12 +188,12 @@
     return-object p0
 .end method
 
-.method public final ri()Lcom/google/android/gms/internal/measurement/ak$i$a;
+.method public final rl()Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$i;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i.smali
index d9cfad54cf..dd58c0d2fb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$i.smali
@@ -95,25 +95,25 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->ts()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tv()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzc:Lcom/google/android/gms/internal/measurement/ef;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->ts()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tv()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzd:Lcom/google/android/gms/internal/measurement/ef;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
     iput-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tJ()Lcom/google/android/gms/internal/measurement/fv;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fv;->tM()Lcom/google/android/gms/internal/measurement/fv;
 
     move-result-object v0
 
@@ -125,7 +125,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$i;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->rd()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->rg()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -139,7 +139,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzc:Lcom/google/android/gms/internal/measurement/ef;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pH()Z
 
     move-result v0
 
@@ -164,7 +164,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/ak$i;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->ts()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tv()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
@@ -176,7 +176,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/ak$i;I)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->mV()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->mY()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -190,7 +190,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzd:Lcom/google/android/gms/internal/measurement/ef;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pH()Z
 
     move-result v0
 
@@ -215,7 +215,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/ak$i;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->ts()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tv()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
@@ -227,7 +227,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/ak$i;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->rd()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->rg()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -239,7 +239,7 @@
 .method static synthetic d(Lcom/google/android/gms/internal/measurement/ak$i;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->mV()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$i;->mY()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
@@ -248,12 +248,12 @@
     return-void
 .end method
 
-.method private final mV()V
+.method private final mY()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzf:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -271,12 +271,12 @@
     return-void
 .end method
 
-.method private final rd()V
+.method private final rg()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zze:Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v0
 
@@ -294,12 +294,12 @@
     return-void
 .end method
 
-.method public static re()Lcom/google/android/gms/internal/measurement/ak$i$a;
+.method public static rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$i;->zzg:Lcom/google/android/gms/internal/measurement/ak$i;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -308,7 +308,7 @@
     return-object v0
 .end method
 
-.method public static rf()Lcom/google/android/gms/internal/measurement/ak$i;
+.method public static ri()Lcom/google/android/gms/internal/measurement/ak$i;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$i;->zzg:Lcom/google/android/gms/internal/measurement/ak$i;
@@ -316,7 +316,7 @@
     return-object v0
 .end method
 
-.method static synthetic rg()Lcom/google/android/gms/internal/measurement/ak$i;
+.method static synthetic rj()Lcom/google/android/gms/internal/measurement/ak$i;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$i;->zzg:Lcom/google/android/gms/internal/measurement/ak$i;
@@ -329,7 +329,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -477,7 +477,7 @@
     .end packed-switch
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzc:Lcom/google/android/gms/internal/measurement/ef;
@@ -489,7 +489,7 @@
     return v0
 .end method
 
-.method public final pZ()I
+.method public final qc()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zzf:Lcom/google/android/gms/internal/measurement/ee;
@@ -501,7 +501,7 @@
     return v0
 .end method
 
-.method public final rc()I
+.method public final rf()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$i;->zze:Lcom/google/android/gms/internal/measurement/ee;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j$a.smali
index a0cd4d19c1..1c21ebf4b4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()Lcom/google/android/gms/internal/measurement/ak$j;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rp()Lcom/google/android/gms/internal/measurement/ak$j;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final P(J)Lcom/google/android/gms/internal/measurement/ak$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$j;
 
@@ -67,9 +67,9 @@
 .method public final bG(I)Lcom/google/android/gms/internal/measurement/ak$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$j;
 
@@ -91,9 +91,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$j;
 
@@ -102,12 +102,12 @@
     return-object p0
 .end method
 
-.method public final rn()Lcom/google/android/gms/internal/measurement/ak$j$a;
+.method public final rq()Lcom/google/android/gms/internal/measurement/ak$j$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$j;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j.smali
index a911a4be0f..546a6b2a21 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$j.smali
@@ -77,7 +77,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->ts()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tv()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$j;)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->ts()Lcom/google/android/gms/internal/measurement/eu;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eu;->tv()Lcom/google/android/gms/internal/measurement/eu;
 
     move-result-object v0
 
@@ -115,7 +115,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$j;J)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$j;->rk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$j;->rn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$j;->zze:Lcom/google/android/gms/internal/measurement/ef;
 
@@ -127,7 +127,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/ak$j;Ljava/lang/Iterable;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$j;->rk()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ak$j;->rn()V
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ak$j;->zze:Lcom/google/android/gms/internal/measurement/ef;
 
@@ -136,12 +136,12 @@
     return-void
 .end method
 
-.method private final rk()V
+.method private final rn()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j;->zze:Lcom/google/android/gms/internal/measurement/ef;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ef;->pH()Z
 
     move-result v0
 
@@ -159,12 +159,12 @@
     return-void
 .end method
 
-.method public static rl()Lcom/google/android/gms/internal/measurement/ak$j$a;
+.method public static ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$j;->zzf:Lcom/google/android/gms/internal/measurement/ak$j;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -173,7 +173,7 @@
     return-object v0
 .end method
 
-.method static synthetic rm()Lcom/google/android/gms/internal/measurement/ak$j;
+.method static synthetic rp()Lcom/google/android/gms/internal/measurement/ak$j;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$j;->zzf:Lcom/google/android/gms/internal/measurement/ak$j;
@@ -198,7 +198,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -330,7 +330,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$j;->zzc:I
@@ -349,7 +349,7 @@
     return v0
 .end method
 
-.method public final rj()I
+.method public final rm()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$j;->zze:Lcom/google/android/gms/internal/measurement/ef;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k$a.smali
index 10fef7ba37..91a03afdb6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k$a.smali
@@ -31,7 +31,7 @@
 .method private constructor <init>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rq()Lcom/google/android/gms/internal/measurement/ak$k;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rt()Lcom/google/android/gms/internal/measurement/ak$k;
 
     move-result-object v0
 
@@ -53,9 +53,9 @@
 .method public final Q(J)Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -67,9 +67,9 @@
 .method public final R(J)Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -81,9 +81,9 @@
 .method public final bV(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -95,9 +95,9 @@
 .method public final bW(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -109,9 +109,9 @@
 .method public final c(D)Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -120,12 +120,12 @@
     return-object p0
 .end method
 
-.method public final rr()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public final ru()Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -134,12 +134,12 @@
     return-object p0
 .end method
 
-.method public final rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public final rv()Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
@@ -148,12 +148,12 @@
     return-object p0
 .end method
 
-.method public final rt()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public final rw()Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ak$k$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$k;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k.smali
index c3f204362b..79a7651a67 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ak$k.smali
@@ -232,12 +232,12 @@
     return-void
 .end method
 
-.method public static rp()Lcom/google/android/gms/internal/measurement/ak$k$a;
+.method public static rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$k;->zzj:Lcom/google/android/gms/internal/measurement/ak$k;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sN()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sQ()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -246,7 +246,7 @@
     return-object v0
 .end method
 
-.method static synthetic rq()Lcom/google/android/gms/internal/measurement/ak$k;
+.method static synthetic rt()Lcom/google/android/gms/internal/measurement/ak$k;
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/ak$k;->zzj:Lcom/google/android/gms/internal/measurement/ak$k;
@@ -259,7 +259,7 @@
 .method protected final bi(I)Ljava/lang/Object;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v1, 0x1
 
@@ -415,7 +415,7 @@
     .end packed-switch
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$k;->zzc:I
@@ -434,7 +434,7 @@
     return v0
 .end method
 
-.method public final qB()Z
+.method public final qE()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$k;->zzc:I
@@ -453,7 +453,7 @@
     return v0
 .end method
 
-.method public final ro()Z
+.method public final rr()Z
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/ak$k;->zzc:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al.smali
index 4fddb9183b..cb03540d10 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/al.smali
@@ -4,14 +4,14 @@
 
 
 # static fields
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->sZ()[I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dw$d;->tc()[I
 
     move-result-object v0
 
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzd:I
 
@@ -36,7 +36,7 @@
 
     :catch_0
     :try_start_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zze:I
 
@@ -50,7 +50,7 @@
 
     :catch_1
     :try_start_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzc:I
 
@@ -64,7 +64,7 @@
 
     :catch_2
     :try_start_3
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzf:I
 
@@ -78,7 +78,7 @@
 
     :catch_3
     :try_start_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zzg:I
 
@@ -92,7 +92,7 @@
 
     :catch_4
     :try_start_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
     sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->zza:I
 
@@ -106,9 +106,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->asW:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/al;->atf:[I
 
-    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anl:I
+    sget v2, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
 
     sub-int/2addr v2, v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/am.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/am.smali
index 967046dd63..bd0fb076d2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/am.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/am.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final asX:Lcom/google/android/gms/internal/measurement/ed;
+.field static final atg:Lcom/google/android/gms/internal/measurement/ed;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/am;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/am;->asX:Lcom/google/android/gms/internal/measurement/ed;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/am;->atg:Lcom/google/android/gms/internal/measurement/ed;
 
     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 f15e5b96c9..a8e7322589 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
@@ -19,7 +19,7 @@
 .method public final onChange(Z)V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ap;->ru()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ap;->rx()Ljava/util/concurrent/atomic/AtomicBoolean;
 
     move-result-object p1
 
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 3e44f05d76..353984df74 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
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field public static final atc:Landroid/net/Uri;
+.field public static final atl:Landroid/net/Uri;
 
-.field private static final atd:Landroid/net/Uri;
+.field private static final atm:Landroid/net/Uri;
 
-.field public static final ate:Ljava/util/regex/Pattern;
+.field public static final atn:Ljava/util/regex/Pattern;
 
-.field public static final atf:Ljava/util/regex/Pattern;
+.field public static final ato:Ljava/util/regex/Pattern;
 
-.field private static final atg:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private static final atp:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private static ath:Ljava/util/HashMap;
+.field private static atq:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private static final ati:Ljava/util/HashMap;
+.field private static final atr:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private static final atj:Ljava/util/HashMap;
+.field private static final ats:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field private static final atk:Ljava/util/HashMap;
+.field private static final att:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -58,7 +58,7 @@
     .end annotation
 .end field
 
-.field private static final atl:Ljava/util/HashMap;
+.field private static final atu:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -69,11 +69,11 @@
     .end annotation
 .end field
 
-.field private static atm:Ljava/lang/Object;
+.field private static atv:Ljava/lang/Object;
 
-.field private static atn:Z
+.field private static atw:Z
 
-.field private static ato:[Ljava/lang/String;
+.field private static atx:[Ljava/lang/String;
 
 
 # direct methods
@@ -86,7 +86,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atc:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atl:Landroid/net/Uri;
 
     const-string v0, "content://com.google.android.gsf.gservices/prefix"
 
@@ -94,7 +94,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atd:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atm:Landroid/net/Uri;
 
     const/4 v0, 0x2
 
@@ -104,7 +104,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->ate:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atn:Ljava/util/regex/Pattern;
 
     const-string v1, "^(0|false|f|off|no|n)$"
 
@@ -112,43 +112,43 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atf:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->ato: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/ap;->atg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atp: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/ap;->ati:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atr: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/ap;->atj:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->ats: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/ap;->atk:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->att: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/ap;->atl:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atu:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->ato:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ap;->atx:[Ljava/lang/String;
 
     return-void
 .end method
@@ -169,7 +169,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     const/4 v2, 0x1
 
@@ -177,7 +177,7 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -185,17 +185,17 @@
 
     invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atq: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/ap;->atm:Ljava/lang/Object;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atv:Ljava/lang/Object;
 
-    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->atn:Z
+    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->atw:Z
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atc:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atl:Landroid/net/Uri;
 
     new-instance v4, Lcom/google/android/gms/internal/measurement/ao;
 
@@ -206,7 +206,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v1, v3}, Ljava/util/concurrent/atomic/AtomicBoolean;->getAndSet(Z)Z
 
@@ -214,23 +214,23 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ati:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atr:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atj:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ats:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atk:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->att:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atl:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atu:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->clear()V
 
@@ -238,15 +238,15 @@
 
     invoke-direct {v1}, Ljava/lang/Object;-><init>()V
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm:Ljava/lang/Object;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ap;->atv:Ljava/lang/Object;
 
-    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->atn:Z
+    sput-boolean v3, Lcom/google/android/gms/internal/measurement/ap;->atw:Z
 
     :cond_1
     :goto_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atv:Ljava/lang/Object;
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {v4, p1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -256,7 +256,7 @@
 
     if-eqz v4, :cond_3
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
     return-object p0
 
     :cond_3
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->ato:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ap;->atx:[Ljava/lang/String;
 
     array-length v6, v4
 
@@ -294,11 +294,11 @@
 
     if-eqz v8, :cond_7
 
-    sget-boolean v1, Lcom/google/android/gms/internal/measurement/ap;->atn:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/measurement/ap;->atw:Z
 
     if-eqz v1, :cond_4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {v1}, Ljava/util/HashMap;->isEmpty()Z
 
@@ -307,9 +307,9 @@
     if-eqz v1, :cond_6
 
     :cond_4
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ato:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atx:[Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-static {p0, v1}, Lcom/google/android/gms/internal/measurement/ap;->a(Landroid/content/ContentResolver;[Ljava/lang/String;)Ljava/util/Map;
 
@@ -317,9 +317,9 @@
 
     invoke-virtual {v3, p0}, Ljava/util/HashMap;->putAll(Ljava/util/Map;)V
 
-    sput-boolean v2, Lcom/google/android/gms/internal/measurement/ap;->atn:Z
+    sput-boolean v2, Lcom/google/android/gms/internal/measurement/ap;->atw:Z
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z
 
@@ -327,7 +327,7 @@
 
     if-eqz p0, :cond_6
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -362,7 +362,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/ap;->atc:Landroid/net/Uri;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/ap;->atl:Landroid/net/Uri;
 
     const/4 v8, 0x0
 
@@ -487,7 +487,7 @@
         }
     .end annotation
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atd:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm:Landroid/net/Uri;
 
     const/4 v2, 0x0
 
@@ -565,11 +565,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atm:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atv:Ljava/lang/Object;
 
     if-ne p0, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->ath:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/ap;->atq:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1, p2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -588,10 +588,10 @@
     throw p0
 .end method
 
-.method static synthetic ru()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic rx()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->atg:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ap;->atp:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object v0
 .end method
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 956c15f49f..42a125b02e 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
@@ -7,7 +7,9 @@
 
 
 # static fields
-.field private static final atp:Ljava/util/Map;
+.field private static final atE:[Ljava/lang/String;
+
+.field private static final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -18,19 +20,15 @@
     .end annotation
 .end field
 
-.field private static final atv:[Ljava/lang/String;
-
 
 # instance fields
-.field final asr:Ljava/lang/Object;
+.field final asA:Ljava/lang/Object;
 
-.field private final atq:Landroid/content/ContentResolver;
+.field private final atA:Landroid/net/Uri;
 
-.field private final atr:Landroid/net/Uri;
+.field private final atB:Landroid/database/ContentObserver;
 
-.field private final ats:Landroid/database/ContentObserver;
-
-.field volatile att:Ljava/util/Map;
+.field volatile atC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,7 +39,7 @@
     .end annotation
 .end field
 
-.field final atu:Ljava/util/List;
+.field final atD:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -51,6 +49,8 @@
     .end annotation
 .end field
 
+.field private final atz:Landroid/content/ContentResolver;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -60,7 +60,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/aq;->atp:Ljava/util/Map;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/aq;->aty:Ljava/util/Map;
 
     const/4 v0, 0x2
 
@@ -78,7 +78,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/aq;->atv:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/aq;->atE:[Ljava/lang/String;
 
     return-void
 .end method
@@ -92,25 +92,25 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/measurement/as;-><init>(Lcom/google/android/gms/internal/measurement/aq;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ats:Landroid/database/ContentObserver;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atB:Landroid/database/ContentObserver;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->asr:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->asA: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/aq;->atu:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atD:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aq;->atq:Landroid/content/ContentResolver;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/aq;->atz:Landroid/content/ContentResolver;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aq;->atr:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/aq;->atA:Landroid/net/Uri;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->ats:Landroid/database/ContentObserver;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atB:Landroid/database/ContentObserver;
 
     const/4 v1, 0x0
 
@@ -127,7 +127,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->atp:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->aty:Ljava/util/Map;
 
     invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -148,7 +148,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :try_start_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/aq;->atp:Ljava/util/Map;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/aq;->aty:Ljava/util/Map;
 
     invoke-interface {p0, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_2
@@ -175,7 +175,71 @@
     throw p0
 .end method
 
-.method private final rw()Ljava/util/Map;
+.method static declared-synchronized rA()V
+    .locals 4
+
+    const-class v0, Lcom/google/android/gms/internal/measurement/aq;
+
+    monitor-enter v0
+
+    :try_start_0
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->aty:Ljava/util/Map;
+
+    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :goto_0
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/google/android/gms/internal/measurement/aq;
+
+    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/aq;->atz:Landroid/content/ContentResolver;
+
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/aq;->atB:Landroid/database/ContentObserver;
+
+    invoke-virtual {v3, v2}, Landroid/content/ContentResolver;->unregisterContentObserver(Landroid/database/ContentObserver;)V
+
+    goto :goto_0
+
+    :cond_0
+    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->aty:Ljava/util/Map;
+
+    invoke-interface {v1}, Ljava/util/Map;->clear()V
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit v0
+
+    return-void
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+
+    goto :goto_2
+
+    :goto_1
+    throw v1
+
+    :goto_2
+    goto :goto_1
+.end method
+
+.method private final rz()Ljava/util/Map;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -238,76 +302,12 @@
     throw v1
 .end method
 
-.method static declared-synchronized rx()V
-    .locals 4
-
-    const-class v0, Lcom/google/android/gms/internal/measurement/aq;
-
-    monitor-enter v0
-
-    :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->atp:Ljava/util/Map;
-
-    invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/google/android/gms/internal/measurement/aq;
-
-    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/aq;->atq:Landroid/content/ContentResolver;
-
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/aq;->ats:Landroid/database/ContentObserver;
-
-    invoke-virtual {v3, v2}, Landroid/content/ContentResolver;->unregisterContentObserver(Landroid/database/ContentObserver;)V
-
-    goto :goto_0
-
-    :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/aq;->atp:Ljava/util/Map;
-
-    invoke-interface {v1}, Ljava/util/Map;->clear()V
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit v0
-
-    return-void
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-
-    goto :goto_2
-
-    :goto_1
-    throw v1
-
-    :goto_2
-    goto :goto_1
-.end method
-
 
 # virtual methods
 .method public final synthetic bX(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/aq;->rv()Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/aq;->ry()Ljava/util/Map;
 
     move-result-object v0
 
@@ -320,73 +320,14 @@
     return-object p1
 .end method
 
-.method public final rv()Ljava/util/Map;
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()",
-            "Ljava/util/Map<",
-            "Ljava/lang/String;",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->att:Ljava/util/Map;
-
-    if-nez v0, :cond_1
-
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->asr:Ljava/lang/Object;
-
-    monitor-enter v1
-
-    :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->att:Ljava/util/Map;
-
-    if-nez v0, :cond_0
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/aq;->rw()Ljava/util/Map;
-
-    move-result-object v0
-
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->att:Ljava/util/Map;
-
-    :cond_0
-    monitor-exit v1
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v0
-
-    monitor-exit v1
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v0
-
-    :cond_1
-    :goto_0
-    if-eqz v0, :cond_2
-
-    return-object v0
-
-    :cond_2
-    invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method final synthetic ry()Ljava/util/Map;
+.method final synthetic rB()Ljava/util/Map;
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atq:Landroid/content/ContentResolver;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atz:Landroid/content/ContentResolver;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->atr:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->atA:Landroid/net/Uri;
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/aq;->atv:[Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/aq;->atE:[Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -486,3 +427,62 @@
     :goto_2
     goto :goto_1
 .end method
+
+.method public final ry()Ljava/util/Map;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Ljava/util/Map<",
+            "Ljava/lang/String;",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atC:Ljava/util/Map;
+
+    if-nez v0, :cond_1
+
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/aq;->asA:Ljava/lang/Object;
+
+    monitor-enter v1
+
+    :try_start_0
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atC:Ljava/util/Map;
+
+    if-nez v0, :cond_0
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/aq;->rz()Ljava/util/Map;
+
+    move-result-object v0
+
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/aq;->atC:Ljava/util/Map;
+
+    :cond_0
+    monitor-exit v1
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v0
+
+    monitor-exit v1
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v0
+
+    :cond_1
+    :goto_0
+    if-eqz v0, :cond_2
+
+    return-object v0
+
+    :cond_2
+    invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
+
+    move-result-object v0
+
+    return-object v0
+.end method
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 bbedbf1d05..03345111c4 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
@@ -4,28 +4,28 @@
 
 
 # static fields
-.field private static asy:Z
+.field private static asH:Z
 
-.field private static atw:Landroid/os/UserManager;
+.field private static atF:Landroid/os/UserManager;
 
-.field private static volatile atx:Z
+.field private static volatile atG:Z
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pH()Z
 
     move-result v0
 
     xor-int/lit8 v0, v0, 0x1
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atx:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atG:Z
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->asy:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->asH:Z
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 .method public static C(Landroid/content/Context;)Z
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pH()Z
 
     move-result v0
 
@@ -83,7 +83,7 @@
 
     if-gt v1, v2, :cond_3
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atw:Landroid/os/UserManager;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
 
     if-nez v2, :cond_0
 
@@ -95,10 +95,10 @@
 
     check-cast v2, Landroid/os/UserManager;
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/ar;->atw:Landroid/os/UserManager;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
 
     :cond_0
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atw:Landroid/os/UserManager;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
 
     if-nez v2, :cond_1
 
@@ -138,7 +138,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/ar;->atw:Landroid/os/UserManager;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
 
     add-int/lit8 v1, v1, 0x1
 
@@ -148,7 +148,7 @@
     :goto_1
     if-eqz v4, :cond_4
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/ar;->atw:Landroid/os/UserManager;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/ar;->atF:Landroid/os/UserManager;
 
     :cond_4
     return v4
@@ -157,7 +157,7 @@
 .method private static af(Landroid/content/Context;)Z
     .locals 3
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atx:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ar;->atG:Z
 
     const/4 v1, 0x1
 
@@ -171,7 +171,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-boolean v2, Lcom/google/android/gms/internal/measurement/ar;->atx:Z
+    sget-boolean v2, Lcom/google/android/gms/internal/measurement/ar;->atG:Z
 
     if-eqz v2, :cond_1
 
@@ -186,7 +186,7 @@
 
     if-eqz p0, :cond_2
 
-    sput-boolean p0, Lcom/google/android/gms/internal/measurement/ar;->atx:Z
+    sput-boolean p0, Lcom/google/android/gms/internal/measurement/ar;->atG:Z
 
     :cond_2
     monitor-exit v0
@@ -203,7 +203,7 @@
     throw p0
 .end method
 
-.method public static pE()Z
+.method public static pH()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/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali
index 63c06b62bf..2f5ccdae5c 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aty:Lcom/google/android/gms/internal/measurement/aq;
+.field private final synthetic atH:Lcom/google/android/gms/internal/measurement/aq;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/aq;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/as;->aty:Lcom/google/android/gms/internal/measurement/aq;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/as;->atH:Lcom/google/android/gms/internal/measurement/aq;
 
     const/4 p1, 0x0
 
@@ -25,16 +25,16 @@
 .method public final onChange(Z)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/as;->aty:Lcom/google/android/gms/internal/measurement/aq;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/as;->atH:Lcom/google/android/gms/internal/measurement/aq;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->asr:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->asA:Ljava/lang/Object;
 
     monitor-enter v0
 
     const/4 v1, 0x0
 
     :try_start_0
-    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->att:Ljava/util/Map;
+    iput-object v1, p1, Lcom/google/android/gms/internal/measurement/aq;->atC:Ljava/util/Map;
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/be;->zza()V
 
@@ -45,7 +45,7 @@
     monitor-enter p1
 
     :try_start_1
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->atu:Ljava/util/List;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/aq;->atD: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/at.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/at.smali
index 1244fa6581..1967a43443 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/at.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/at.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static atz:Lcom/google/android/gms/internal/measurement/ct;
+.field private static atI:Lcom/google/android/gms/internal/measurement/ct;
 
 
 # direct methods
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 6aa7f41887..04e5eaa589 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aty:Lcom/google/android/gms/internal/measurement/aq;
+.field private final atH:Lcom/google/android/gms/internal/measurement/aq;
 
 
 # direct methods
@@ -16,19 +16,19 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->aty:Lcom/google/android/gms/internal/measurement/aq;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/au;->atH:Lcom/google/android/gms/internal/measurement/aq;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->aty:Lcom/google/android/gms/internal/measurement/aq;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/au;->atH:Lcom/google/android/gms/internal/measurement/aq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/aq;->ry()Ljava/util/Map;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/aq;->rB()Ljava/util/Map;
 
     move-result-object v0
 
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 132dc6cf5a..f9914f6571 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
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract rz()Ljava/lang/Object;
+.method public abstract rC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TV;"
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 706715a12d..3027ff58a4 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
@@ -17,7 +17,7 @@
     .end annotation
 
     :try_start_0
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/aw;->rz()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/aw;->rC()Ljava/lang/Object;
 
     move-result-object p0
     :try_end_0
@@ -31,7 +31,7 @@
     move-result-wide v0
 
     :try_start_1
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/aw;->rz()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/aw;->rC()Ljava/lang/Object;
 
     move-result-object p0
     :try_end_1
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 be02a8532a..abbfdbca46 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
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
-.field private final atA:Lcom/google/android/gms/internal/measurement/az;
+.field private final atJ:Lcom/google/android/gms/internal/measurement/az;
 
 
 # direct methods
@@ -18,23 +18,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ay;->atA:Lcom/google/android/gms/internal/measurement/az;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ay;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ay;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/ay;->ane:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ay;->atA:Lcom/google/android/gms/internal/measurement/az;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ay;->atJ:Lcom/google/android/gms/internal/measurement/az;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ay;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/ay;->ane:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/az;->atB:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/az;->atK: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/b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/b.smali
index e86c9c21dd..7125cf6fba 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asi:Landroid/content/Context;
+.field private final synthetic asr:Landroid/content/Context;
 
-.field private final synthetic asj:Landroid/os/Bundle;
+.field private final synthetic ass:Landroid/os/Bundle;
 
-.field private final synthetic ask:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic ast:Lcom/google/android/gms/internal/measurement/me;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -19,15 +19,15 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;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/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/b;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/b;->anq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/b;->zzd:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/b;->asi:Landroid/content/Context;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/b;->asj:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/b;->ass:Landroid/os/Bundle;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -44,7 +44,7 @@
     const/4 v1, 0x1
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v3, Ljava/util/ArrayList;
 
@@ -52,7 +52,7 @@
 
     invoke-static {v2, v3}, Lcom/google/android/gms/internal/measurement/me;->a(Lcom/google/android/gms/internal/measurement/me;Ljava/util/List;)Ljava/util/List;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->anh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->anq:Ljava/lang/String;
 
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->zzd:Ljava/lang/String;
 
@@ -66,9 +66,9 @@
 
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->zzd:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->anh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->anq:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/me;->b(Lcom/google/android/gms/internal/measurement/me;)Ljava/lang/String;
 
@@ -90,11 +90,11 @@
     move-object v11, v10
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->asi:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/me;->am(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->uH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->uK()Ljava/lang/Boolean;
 
     move-result-object v2
 
@@ -118,11 +118,11 @@
     const/4 v2, 0x1
 
     :goto_2
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/b;->asi:Landroid/content/Context;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
 
     invoke-virtual {v4, v5, v2}, Lcom/google/android/gms/internal/measurement/me;->a(Landroid/content/Context;Z)Lcom/google/android/gms/internal/measurement/kv;
 
@@ -130,7 +130,7 @@
 
     invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/me;->a(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/kv;)Lcom/google/android/gms/internal/measurement/kv;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
@@ -138,7 +138,7 @@
 
     if-nez v3, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/me;->b(Lcom/google/android/gms/internal/measurement/me;)Ljava/lang/String;
 
@@ -151,13 +151,13 @@
     return-void
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asi:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/me;->O(Landroid/content/Context;)I
 
     move-result v3
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->asi:Landroid/content/Context;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
 
     invoke-static {v4}, Lcom/google/android/gms/internal/measurement/me;->an(Landroid/content/Context;)I
 
@@ -206,25 +206,25 @@
 
     int-to-long v6, v2
 
-    iget-object v12, p0, Lcom/google/android/gms/internal/measurement/b;->asj:Landroid/os/Bundle;
+    iget-object v12, p0, Lcom/google/android/gms/internal/measurement/b;->ass:Landroid/os/Bundle;
 
     move-object v3, v13
 
     invoke-direct/range {v3 .. v12}, Lcom/google/android/gms/internal/measurement/zzv;-><init>(JJZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asi:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->asr:Landroid/content/Context;
 
     invoke-static {v3}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v3
 
-    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/b;->anp:J
+    iget-wide v4, p0, Lcom/google/android/gms/internal/measurement/b;->any:J
 
     invoke-interface {v2, v3, v13, v4, v5}, Lcom/google/android/gms/internal/measurement/kv;->initialize(Lcom/google/android/gms/a/a;Lcom/google/android/gms/internal/measurement/zzv;J)V
     :try_end_0
@@ -235,7 +235,7 @@
     :catch_0
     move-exception v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/b;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v3, v2, v1, v0}, Lcom/google/android/gms/internal/measurement/me;->a(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/Exception;ZZ)V
 
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 2b8b5ba286..f7c57d9ee2 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static volatile atD:Lcom/google/android/gms/internal/measurement/br;
+.field private static volatile atM:Lcom/google/android/gms/internal/measurement/br;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/br<",
@@ -14,24 +14,24 @@
     .end annotation
 .end field
 
-.field private static final atE:Ljava/lang/Object;
+.field private static final atN:Ljava/lang/Object;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rE()Lcom/google/android/gms/internal/measurement/br;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rH()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atE:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bc;->atN:Ljava/lang/Object;
 
     return-void
 .end method
@@ -117,17 +117,17 @@
     return v1
 
     :cond_0
-    sget-object p1, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/br;->pE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/br;->pH()Z
 
     move-result p1
 
     if-eqz p1, :cond_1
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rD()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -140,22 +140,22 @@
     return p0
 
     :cond_1
-    sget-object p1, Lcom/google/android/gms/internal/measurement/bc;->atE:Ljava/lang/Object;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/bc;->atN:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rD()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -237,15 +237,15 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
     monitor-exit p1
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atD:Lcom/google/android/gms/internal/measurement/br;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bc;->atM:Lcom/google/android/gms/internal/measurement/br;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rD()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
 
     move-result-object p0
 
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 07b36ab0fc..01b23dea96 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
@@ -66,7 +66,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rE()Lcom/google/android/gms/internal/measurement/br;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rH()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object p0
     :try_end_2
@@ -87,7 +87,7 @@
 
     invoke-static {v1, v2, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rE()Lcom/google/android/gms/internal/measurement/br;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/br;->rH()Lcom/google/android/gms/internal/measurement/br;
 
     move-result-object p0
     :try_end_3
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 83c1402de1..414dfa6736 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
@@ -15,11 +15,11 @@
 
 
 # static fields
-.field private static asy:Z
+.field private static asH:Z
 
-.field private static atB:Landroid/content/Context;
+.field private static atK:Landroid/content/Context;
 
-.field private static atF:Lcom/google/android/gms/internal/measurement/bs;
+.field private static atO:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -29,13 +29,13 @@
     .end annotation
 .end field
 
-.field private static final atH:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final atQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private static final zza:Ljava/lang/Object;
 
 
 # instance fields
-.field private final ast:Ljava/lang/Object;
+.field private final asC:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field private final atG:Lcom/google/android/gms/internal/measurement/bk;
+.field private final atP:Lcom/google/android/gms/internal/measurement/bk;
 
 .field private final zzf:Ljava/lang/String;
 
@@ -70,17 +70,17 @@
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     const/4 v0, 0x0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/be;->asy:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/be;->asH: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/be;->atH:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/be;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -102,15 +102,15 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/be;->zzi:I
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/bk;->atK:Landroid/net/Uri;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
 
     if-eqz v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/be;->zzf:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/be;->ast:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/be;->asC:Ljava/lang/Object;
 
     return-void
 
@@ -152,21 +152,21 @@
     move-object p0, v1
 
     :goto_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     if-eq v1, p0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/aq;->rx()V
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/aq;->rA()V
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/bn;->zza()V
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/az;->zza()V
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atH:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     sget-object p0, Lcom/google/android/gms/internal/measurement/bh;->zza:Lcom/google/android/gms/internal/measurement/bs;
 
@@ -174,7 +174,7 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/be;->atF:Lcom/google/android/gms/internal/measurement/bs;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/be;->atO:Lcom/google/android/gms/internal/measurement/bs;
 
     :cond_1
     monitor-exit v0
@@ -291,14 +291,14 @@
     return-object v0
 .end method
 
-.method static final synthetic rC()Lcom/google/android/gms/internal/measurement/ba;
+.method static final synthetic rF()Lcom/google/android/gms/internal/measurement/ba;
     .locals 6
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/bd;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/bd;-><init>()V
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     sget-object v1, Landroid/os/Build;->TYPE:Ljava/lang/String;
 
@@ -378,7 +378,7 @@
     :goto_0
     if-eqz v5, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pH()Z
 
     move-result v1
 
@@ -403,13 +403,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->pH()Z
 
     move-result v1
 
     if-eqz v1, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->rD()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/br;->rG()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -434,7 +434,7 @@
 .method static zza()V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atH:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -453,10 +453,10 @@
     .end annotation
 .end method
 
-.method public final rA()Ljava/lang/String;
+.method public final rD()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/bk;->zzd:Ljava/lang/String;
 
@@ -467,7 +467,7 @@
     return-object v0
 .end method
 
-.method public final rB()Ljava/lang/Object;
+.method public final rE()Ljava/lang/Object;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -475,7 +475,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atH:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/be;->atQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -492,29 +492,29 @@
 
     if-ge v1, v0, :cond_10
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     if-eqz v1, :cond_f
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atF:Lcom/google/android/gms/internal/measurement/bs;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atO:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v1
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ba;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atK:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/bk;->zzd:Ljava/lang/String;
 
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/be;->zzf:Ljava/lang/String;
 
-    iget-object v5, v1, Lcom/google/android/gms/internal/measurement/ba;->atp:Ljava/util/Map;
+    iget-object v5, v1, Lcom/google/android/gms/internal/measurement/ba;->aty:Ljava/util/Map;
 
     const/4 v6, 0x0
 
@@ -533,7 +533,7 @@
 
     move-result-object v2
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ba;->atp:Ljava/util/Map;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ba;->aty:Ljava/util/Map;
 
     invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -591,7 +591,7 @@
     goto/16 :goto_7
 
     :cond_5
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/az;->ag(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/az;
 
@@ -607,7 +607,7 @@
 
     if-eqz v1, :cond_6
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ap;->ate:Ljava/util/regex/Pattern;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ap;->atn:Ljava/util/regex/Pattern;
 
     invoke-virtual {v2, v1}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -629,17 +629,17 @@
     :goto_3
     if-nez v1, :cond_9
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bk;->atK:Landroid/net/Uri;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
 
     if-eqz v1, :cond_8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atK:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
 
     invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/bc;->a(Landroid/content/Context;Landroid/net/Uri;)Z
 
@@ -647,15 +647,15 @@
 
     if-eqz v1, :cond_7
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atK:Landroid/net/Uri;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->atT:Landroid/net/Uri;
 
     invoke-static {v1, v2}, Lcom/google/android/gms/internal/measurement/aq;->c(Landroid/content/ContentResolver;Landroid/net/Uri;)Lcom/google/android/gms/internal/measurement/aq;
 
@@ -669,7 +669,7 @@
     goto :goto_4
 
     :cond_8
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/bn;->ai(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/bn;
 
@@ -678,7 +678,7 @@
     :goto_4
     if-eqz v1, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/be;->rA()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/be;->rD()Ljava/lang/String;
 
     move-result-object v2
 
@@ -709,7 +709,7 @@
 
     const-string v2, "Bypass reading Phenotype values for flag: "
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/be;->rA()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/be;->rD()Ljava/lang/String;
 
     move-result-object v3
 
@@ -748,15 +748,15 @@
     goto :goto_7
 
     :cond_c
-    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atB:Landroid/content/Context;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/be;->atK:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/az;->ag(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/az;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atG:Lcom/google/android/gms/internal/measurement/bk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/be;->atP:Lcom/google/android/gms/internal/measurement/bk;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->anh:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bk;->anq:Ljava/lang/String;
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/internal/measurement/be;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -780,7 +780,7 @@
     goto :goto_7
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->ast:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->asC:Ljava/lang/Object;
 
     :goto_7
     iput-object v1, p0, Lcom/google/android/gms/internal/measurement/be;->zzj:Ljava/lang/Object;
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 79450f756a..437337220a 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final atI:Landroidx/collection/ArrayMap;
+.field private static final atR:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -24,7 +24,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->atI:Landroidx/collection/ArrayMap;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bf;->atR:Landroidx/collection/ArrayMap;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->atI:Landroidx/collection/ArrayMap;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bf;->atR:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v1, p0}, Landroidx/collection/ArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -81,7 +81,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/bf;->atI:Landroidx/collection/ArrayMap;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/bf;->atR:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v2, p0, v1}, Landroidx/collection/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
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 fac72f7e96..7db30bd711 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
@@ -59,7 +59,7 @@
 
     :catch_0
     :cond_1
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rA()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rD()Ljava/lang/String;
 
     move-result-object v0
 
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 c4cc6df64e..7794bf924d 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
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/be;->rC()Lcom/google/android/gms/internal/measurement/ba;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/be;->rF()Lcom/google/android/gms/internal/measurement/ba;
 
     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 bb9c29a9d9..cf6c106f5f 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
@@ -76,7 +76,7 @@
 
     :catch_0
     :cond_2
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rA()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rD()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bj.smali
index 94bb1fbadb..da111e4ecf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bj.smali
@@ -46,7 +46,7 @@
 
     check-cast v0, Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ate:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atn:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -63,7 +63,7 @@
     return-object p1
 
     :cond_1
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->atf:Ljava/util/regex/Pattern;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ap;->ato:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -80,7 +80,7 @@
     return-object p1
 
     :cond_2
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rA()Ljava/lang/String;
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/be;->rD()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali
index 0535dee185..47645774f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final atM:Lcom/google/android/gms/internal/measurement/bn;
+.field private final atV:Lcom/google/android/gms/internal/measurement/bn;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->atM:Lcom/google/android/gms/internal/measurement/bn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->atV:Lcom/google/android/gms/internal/measurement/bn;
 
     return-void
 .end method
@@ -26,16 +26,16 @@
 .method public final onSharedPreferenceChanged(Landroid/content/SharedPreferences;Ljava/lang/String;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->atM:Lcom/google/android/gms/internal/measurement/bn;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bm;->atV:Lcom/google/android/gms/internal/measurement/bn;
 
-    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->atP:Ljava/lang/Object;
+    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->atY:Ljava/lang/Object;
 
     monitor-enter p2
 
     const/4 v0, 0x0
 
     :try_start_0
-    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/bn;->atQ:Ljava/util/Map;
+    iput-object v0, p1, Lcom/google/android/gms/internal/measurement/bn;->atZ:Ljava/util/Map;
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/be;->zza()V
 
@@ -46,7 +46,7 @@
     monitor-enter p1
 
     :try_start_1
-    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->atR:Ljava/util/List;
+    iget-object p2, p1, Lcom/google/android/gms/internal/measurement/bn;->aua: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/bn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bn.smali
index 3075b7bccb..1356edcc2f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bn.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final atp:Ljava/util/Map;
+.field private static final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -20,13 +20,13 @@
 
 
 # instance fields
-.field private final atN:Landroid/content/SharedPreferences;
+.field private final atW:Landroid/content/SharedPreferences;
 
-.field private final atO:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+.field private final atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 
-.field final atP:Ljava/lang/Object;
+.field final atY:Ljava/lang/Object;
 
-.field volatile atQ:Ljava/util/Map;
+.field volatile atZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final atR:Ljava/util/List;
+.field final aua:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -55,7 +55,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bn;->atp:Ljava/util/Map;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bn;->aty:Ljava/util/Map;
 
     return-void
 .end method
@@ -69,25 +69,25 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/internal/measurement/bm;-><init>(Lcom/google/android/gms/internal/measurement/bn;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atO:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atX: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/bn;->atP:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atY: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/bn;->atR:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->aua:Ljava/util/List;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->atN:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->atW:Landroid/content/SharedPreferences;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->atN:Landroid/content/SharedPreferences;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/bn;->atW:Landroid/content/SharedPreferences;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atO:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 
     invoke-interface {p1, v0}, Landroid/content/SharedPreferences;->registerOnSharedPreferenceChangeListener(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V
 
@@ -97,7 +97,7 @@
 .method static ai(Landroid/content/Context;)Lcom/google/android/gms/internal/measurement/bn;
     .locals 5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pH()Z
 
     move-result v0
 
@@ -133,7 +133,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v2, Lcom/google/android/gms/internal/measurement/bn;->atp:Ljava/util/Map;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/bn;->aty:Ljava/util/Map;
 
     invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -155,7 +155,7 @@
 
     if-eqz v3, :cond_3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ar;->pH()Z
 
     move-result v3
 
@@ -186,7 +186,7 @@
     :goto_1
     invoke-direct {v2, p0}, Lcom/google/android/gms/internal/measurement/bn;-><init>(Landroid/content/SharedPreferences;)V
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/bn;->atp:Ljava/util/Map;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/bn;->aty:Ljava/util/Map;
 
     invoke-interface {p0, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -213,7 +213,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bn;->atp:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bn;->aty:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
 
@@ -236,16 +236,16 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/bn;
 
-    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/bn;->atN:Landroid/content/SharedPreferences;
+    iget-object v3, v2, Lcom/google/android/gms/internal/measurement/bn;->atW:Landroid/content/SharedPreferences;
 
-    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bn;->atO:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
+    iget-object v2, v2, Lcom/google/android/gms/internal/measurement/bn;->atX:Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;
 
     invoke-interface {v3, v2}, Landroid/content/SharedPreferences;->unregisterOnSharedPreferenceChangeListener(Landroid/content/SharedPreferences$OnSharedPreferenceChangeListener;)V
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/bn;->atp:Ljava/util/Map;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/bn;->aty:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->clear()V
     :try_end_0
@@ -274,26 +274,26 @@
 .method public final bX(Ljava/lang/String;)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atZ:Ljava/util/Map;
 
     if-nez v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bn;->atP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/bn;->atY:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atZ:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atN:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atW: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/bn;->atQ:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/bn;->atZ:Ljava/util/Map;
 
     :cond_0
     monitor-exit v1
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 9e2ded436f..c9b99a76d8 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final any:[Ljava/lang/Throwable;
+.field private static final anH:[Ljava/lang/Throwable;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     new-array v0, v0, [Ljava/lang/Throwable;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/bz;->any:[Ljava/lang/Throwable;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/bz;->anH:[Ljava/lang/Throwable;
 
     return-void
 .end method
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 eac97081f4..f59f161565 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/c;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/c;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/c;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/c;->anq:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -32,15 +32,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/c;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/c;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/c;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/c;->anq:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/c;->anp:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/c;->any:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->setUserId(Ljava/lang/String;J)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 bc654170f9..e0376fa921 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
@@ -12,9 +12,9 @@
 
 
 # static fields
-.field private static final anl:I
+.field private static final anu:I
 
-.field private static final atT:Lcom/google/android/gms/internal/measurement/bz;
+.field private static final auc:Lcom/google/android/gms/internal/measurement/bz;
 
 
 # direct methods
@@ -24,7 +24,7 @@
     const/4 v0, 0x1
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ca;->nP()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ca;->nS()Ljava/lang/Integer;
 
     move-result-object v1
     :try_end_0
@@ -131,7 +131,7 @@
     invoke-direct {v2}, Lcom/google/android/gms/internal/measurement/ca$a;-><init>()V
 
     :goto_1
-    sput-object v2, Lcom/google/android/gms/internal/measurement/ca;->atT:Lcom/google/android/gms/internal/measurement/bz;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/ca;->auc:Lcom/google/android/gms/internal/measurement/bz;
 
     if-nez v1, :cond_2
 
@@ -143,7 +143,7 @@
     move-result v0
 
     :goto_2
-    sput v0, Lcom/google/android/gms/internal/measurement/ca;->anl:I
+    sput v0, Lcom/google/android/gms/internal/measurement/ca;->anu: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/measurement/ca;->atT:Lcom/google/android/gms/internal/measurement/bz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ca;->auc:Lcom/google/android/gms/internal/measurement/bz;
 
     invoke-virtual {v0, p0, p1}, Lcom/google/android/gms/internal/measurement/bz;->a(Ljava/lang/Throwable;Ljava/lang/Throwable;)V
 
     return-void
 .end method
 
-.method private static nP()Ljava/lang/Integer;
+.method private static nS()Ljava/lang/Integer;
     .locals 4
 
     const/4 v0, 0x0
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 524e4a4779..847bc9016f 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final anw:Ljava/util/concurrent/ConcurrentHashMap;
+.field private final anF: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 anx:Ljava/lang/ref/ReferenceQueue;
+.field private final anG: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/measurement/cc;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anF: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/measurement/cc;->anx:Ljava/lang/ref/ReferenceQueue;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anG:Ljava/lang/ref/ReferenceQueue;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anx:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anG: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/measurement/cc;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anF: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/measurement/cc;->anx:Ljava/lang/ref/ReferenceQueue;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cc;->anG: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/measurement/cb;-><init>(Ljava/lang/Throwable;Ljava/lang/ref/ReferenceQueue;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anF: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/measurement/cc;->anw:Ljava/util/concurrent/ConcurrentHashMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cc;->anF:Ljava/util/concurrent/ConcurrentHashMap;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/cb;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cc;->anx:Ljava/lang/ref/ReferenceQueue;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/cc;->anG:Ljava/lang/ref/ReferenceQueue;
 
     invoke-direct {v2, p1, v3}, Lcom/google/android/gms/internal/measurement/cb;-><init>(Ljava/lang/Throwable;Ljava/lang/ref/ReferenceQueue;)V
 
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 8c9a389ff0..462bebb3bc 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final atU:Lcom/google/android/gms/internal/measurement/cc;
+.field private final aud:Lcom/google/android/gms/internal/measurement/cc;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/cc;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cd;->atU:Lcom/google/android/gms/internal/measurement/cc;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cd;->aud:Lcom/google/android/gms/internal/measurement/cc;
 
     return-void
 .end method
@@ -31,7 +31,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cd;->atU:Lcom/google/android/gms/internal/measurement/cc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cd;->aud:Lcom/google/android/gms/internal/measurement/cc;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/cc;->k(Ljava/lang/Throwable;)Ljava/util/List;
 
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 7a53155715..222ecc82b0 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
@@ -65,7 +65,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/en;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/en;->qi()Ljava/util/List;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/en;->ql()Ljava/util/List;
 
     move-result-object p0
 
@@ -282,11 +282,11 @@
     throw p1
 .end method
 
-.method public final rF()Lcom/google/android/gms/internal/measurement/cn;
+.method public final rI()Lcom/google/android/gms/internal/measurement/cn;
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sQ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sT()I
 
     move-result v0
 
@@ -294,11 +294,11 @@
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cw;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/cw;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cf;->a(Lcom/google/android/gms/internal/measurement/df;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cw;->rM()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cw;->rP()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v0
     :try_end_0
@@ -366,11 +366,11 @@
     throw v1
 .end method
 
-.method public final rG()[B
+.method public final rJ()[B
     .locals 6
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sQ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->sT()I
 
     move-result v0
 
@@ -382,7 +382,7 @@
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/internal/measurement/cf;->a(Lcom/google/android/gms/internal/measurement/df;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/df;->pD()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/df;->pG()V
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -448,7 +448,7 @@
     throw v1
 .end method
 
-.method rH()I
+.method rK()I
     .locals 1
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cg.smali
index 13a79727a4..58f70405cc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cg.smali
@@ -170,7 +170,7 @@
 .method public final synthetic a(Lcom/google/android/gms/internal/measurement/fg;)Lcom/google/android/gms/internal/measurement/ff;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->sT()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->sW()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -227,7 +227,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->rI()Lcom/google/android/gms/internal/measurement/cg;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->rL()Lcom/google/android/gms/internal/measurement/cg;
 
     move-result-object v0
 
@@ -253,7 +253,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object p2
 
@@ -306,7 +306,7 @@
     return-object p1
 .end method
 
-.method public abstract rI()Lcom/google/android/gms/internal/measurement/cg;
+.method public abstract rL()Lcom/google/android/gms/internal/measurement/cg;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TBuilderType;"
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 aa48177214..b8df9b6348 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
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->add(ILjava/lang/Object;)V
 
@@ -62,7 +62,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->add(Ljava/lang/Object;)Z
 
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1, p2}, Ljava/util/AbstractList;->addAll(ILjava/util/Collection;)Z
 
@@ -100,7 +100,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->addAll(Ljava/util/Collection;)Z
 
@@ -112,7 +112,7 @@
 .method public clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0}, Ljava/util/AbstractList;->clear()V
 
@@ -228,7 +228,7 @@
     return v1
 .end method
 
-.method public pE()Z
+.method public pH()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ch;->zza:Z
@@ -236,7 +236,24 @@
     return v0
 .end method
 
-.method public final rJ()V
+.method protected final rA()V
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ch;->zza:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final rM()V
     .locals 1
 
     const/4 v0, 0x0
@@ -254,7 +271,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(I)Ljava/lang/Object;
 
@@ -266,7 +283,7 @@
 .method public remove(Ljava/lang/Object;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->remove(Ljava/lang/Object;)Z
 
@@ -285,7 +302,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->removeAll(Ljava/util/Collection;)Z
 
@@ -304,7 +321,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-super {p0, p1}, Ljava/util/AbstractList;->retainAll(Ljava/util/Collection;)Z
 
@@ -313,23 +330,6 @@
     return p1
 .end method
 
-.method protected final rx()V
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/ch;->zza:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
-
-    throw v0
-.end method
-
 .method public set(ILjava/lang/Object;)Ljava/lang/Object;
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
@@ -338,7 +338,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()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/ci.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ci.smali
index d161d2b487..55a3f770f1 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
@@ -20,18 +20,18 @@
 
 
 # static fields
-.field private static final atV:Lcom/google/android/gms/internal/measurement/di;
+.field private static final aue:Lcom/google/android/gms/internal/measurement/di;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ci;->atV:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ci;->aue:Lcom/google/android/gms/internal/measurement/di;
 
     return-void
 .end method
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 3a8a29038c..bc25f96fa3 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
@@ -41,7 +41,7 @@
     return p2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -79,7 +79,7 @@
     return p2
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -109,7 +109,7 @@
     return p0
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -216,14 +216,14 @@
     return p2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
     throw p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v6
 
@@ -279,7 +279,7 @@
     return p2
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -302,7 +302,7 @@
 
     if-nez p3, :cond_6
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-virtual {p4, p0, p1}, Lcom/google/android/gms/internal/measurement/gq;->c(ILjava/lang/Object;)V
 
@@ -321,14 +321,14 @@
     return p2
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
     throw p0
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -354,7 +354,7 @@
 
     move-result p1
 
-    iget-wide p2, p5, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide p2, p5, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -365,7 +365,7 @@
     return p1
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -547,7 +547,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fk;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fk;->rz()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fk;->rC()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -605,7 +605,7 @@
 
     if-gt p2, p3, :cond_1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fw;->rz()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fw;->rC()Ljava/lang/Object;
 
     move-result-object p3
 
@@ -630,7 +630,7 @@
     return p2
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -705,7 +705,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -733,7 +733,7 @@
 
     if-ltz p1, :cond_0
 
-    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     return v0
 
@@ -784,7 +784,7 @@
     goto :goto_0
 
     :cond_1
-    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iput-wide v1, p2, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     return p1
 .end method
@@ -816,7 +816,7 @@
     :cond_0
     new-instance v1, Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v1, p0, p1, v0, v2}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -827,7 +827,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -870,7 +870,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -941,7 +941,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     iput-object p0, p2, Lcom/google/android/gms/internal/measurement/cm;->zzc:Ljava/lang/Object;
 
@@ -959,14 +959,14 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
     throw p0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ck.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ck.smali
index 560eb609b0..a88c170a91 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ck.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ck.smali
@@ -4,7 +4,9 @@
 
 
 # static fields
-.field private static final atW:Ljava/lang/Class;
+.field private static final atG:Z
+
+.field private static final auf:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,8 +15,6 @@
     .end annotation
 .end field
 
-.field private static final atx:Z
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -26,7 +26,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ck;->atW:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ck;->auf:Ljava/lang/Class;
 
     const-string v0, "org.robolectric.Robolectric"
 
@@ -44,7 +44,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atx:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atG:Z
 
     return-void
 .end method
@@ -78,14 +78,14 @@
     return-object p0
 .end method
 
-.method static pE()Z
+.method static pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->atW:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->auf:Ljava/lang/Class;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atx:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/ck;->atG:Z
 
     if-nez v0, :cond_0
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method static rK()Ljava/lang/Class;
+.method static rN()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,7 +109,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->atW:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ck;->auf:Ljava/lang/Class;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cl.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cl.smali
index 5e4a335ec3..b28a1bc827 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cl.smali
@@ -24,11 +24,11 @@
 
 
 # static fields
-.field private static final atX:Lcom/google/android/gms/internal/measurement/cl;
+.field private static final aug:Lcom/google/android/gms/internal/measurement/cl;
 
 
 # instance fields
-.field private atY:[Z
+.field private auh:[Z
 
 .field private zzc:I
 
@@ -45,9 +45,9 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/cl;-><init>([ZI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cl;->atX:Lcom/google/android/gms/internal/measurement/cl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cl;->aug:Lcom/google/android/gms/internal/measurement/cl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/cl;->zzc:I
 
@@ -142,7 +142,7 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-ltz p1, :cond_1
 
@@ -150,7 +150,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     array-length v2, v1
 
@@ -177,7 +177,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/cl;->atY:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     add-int/lit8 v2, p1, 0x1
 
@@ -187,10 +187,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/cl;->atY:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aput-boolean p2, v0, p1
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -284,7 +284,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     array-length v2, v0
 
@@ -294,12 +294,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/cl;->zzc:I
 
@@ -336,7 +336,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/cl;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([ZI)[Z
 
@@ -390,7 +390,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     const/4 v1, 0x0
 
@@ -399,7 +399,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aget-boolean v2, v2, v1
 
@@ -423,7 +423,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cl;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aget-boolean p1, v0, p1
 
@@ -448,7 +448,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aget-boolean v2, v2, v1
 
@@ -469,11 +469,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cl;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aget-boolean v1, v0, p1
 
@@ -514,7 +514,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     const/4 v0, 0x0
 
@@ -525,7 +525,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aget-boolean v2, v2, v1
 
@@ -539,7 +539,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     add-int/lit8 v0, v1, 0x1
 
@@ -579,11 +579,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/cl;->zzc:I
 
@@ -626,11 +626,11 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/cl;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     aget-boolean v1, v0, p1
 
@@ -654,11 +654,11 @@
 .method public final zza(Z)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cl;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     array-length v2, v1
 
@@ -676,10 +676,10 @@
 
     invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->atY:[Z
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cl;->auh:[Z
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/cl;->zzc:I
 
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 4cec2bbc6a..647178b44c 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
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public anq:J
+.field public anz:J
 
-.field public final atZ:Lcom/google/android/gms/internal/measurement/di;
+.field public final aui:Lcom/google/android/gms/internal/measurement/di;
 
 .field public zza:I
 
@@ -19,11 +19,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cm;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     return-void
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cn.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cn.smali
index f38c4592fa..ff24941128 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cn.smali
@@ -20,11 +20,11 @@
 
 
 # static fields
-.field public static final aua:Lcom/google/android/gms/internal/measurement/cn;
+.field public static final auj:Lcom/google/android/gms/internal/measurement/cn;
 
-.field private static final aub:Lcom/google/android/gms/internal/measurement/cu;
+.field private static final auk:Lcom/google/android/gms/internal/measurement/cu;
 
-.field private static final auc:Ljava/util/Comparator;
+.field private static final aul:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -49,9 +49,9 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/cy;-><init>([B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v0
 
@@ -71,13 +71,13 @@
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/cr;-><init>(B)V
 
     :goto_0
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->aub:Lcom/google/android/gms/internal/measurement/cu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->auk:Lcom/google/android/gms/internal/measurement/cu;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/cp;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/cp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->auc:Ljava/util/Comparator;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/cn;->aul:Ljava/util/Comparator;
 
     return-void
 .end method
@@ -113,7 +113,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/cy;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/cn;->aub:Lcom/google/android/gms/internal/measurement/cu;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/cn;->auk:Lcom/google/android/gms/internal/measurement/cu;
 
     invoke-interface {v1, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/cu;->d([BII)[B
 
@@ -141,7 +141,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/cy;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-virtual {p0, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -301,7 +301,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -330,18 +330,18 @@
     return-object v0
 .end method
 
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
 
-.method public final rA()Ljava/lang/String;
+.method public final rD()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v1
 
@@ -359,7 +359,7 @@
     return-object v0
 .end method
 
-.method protected final rj()I
+.method protected final rm()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cn;->zzc:I
@@ -386,7 +386,7 @@
 
     aput-object v1, v0, v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cp.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cp.smali
index 143c700f4e..8a246e7f5b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cp.smali
@@ -60,7 +60,7 @@
 
     if-eqz v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/cx;->rL()B
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/cx;->rO()B
 
     move-result v2
 
@@ -68,7 +68,7 @@
 
     move-result v2
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/cx;->rL()B
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/cx;->rO()B
 
     move-result v3
 
@@ -85,11 +85,11 @@
     return v2
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result p1
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result p2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cq.smali
index 04fb316de7..60b7e0d2d4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cq.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final anl:I
+.field private final anu:I
 
-.field private final synthetic aud:Lcom/google/android/gms/internal/measurement/cn;
+.field private final synthetic aum:Lcom/google/android/gms/internal/measurement/cn;
 
 .field private zza:I
 
@@ -15,7 +15,7 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/cn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cq;->aud:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cq;->aum:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cs;-><init>()V
 
@@ -23,13 +23,13 @@
 
     iput p1, p0, Lcom/google/android/gms/internal/measurement/cq;->zza:I
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cq;->aud:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/cq;->aum:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result p1
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/cq;->anl:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/cq;->anu:I
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cq;->zza:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cq;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cq;->anu:I
 
     if-ge v0, v1, :cond_0
 
@@ -55,12 +55,12 @@
     return v0
 .end method
 
-.method public final rL()B
+.method public final rO()B
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cq;->zza:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/cq;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/cq;->anu:I
 
     if-ge v0, v1, :cond_0
 
@@ -68,7 +68,7 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/measurement/cq;->zza:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aud:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cq;->aum:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/cn;->bM(I)B
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cs.smali
index a58f9c629c..e0dbfd2072 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cs.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/cs.smali
@@ -20,7 +20,7 @@
 .method public synthetic next()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cs;->rL()B
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cs;->rO()B
 
     move-result v0
 
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 b49607888b..2832f94ea3 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
@@ -33,7 +33,7 @@
 .method public final bL(I)B
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -124,7 +124,7 @@
     return p1
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cv;->zzd:I
@@ -132,7 +132,7 @@
     return v0
 .end method
 
-.method protected final qe()I
+.method protected final qh()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/cv;->zzc:I
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 f2ed92970f..30c19ac01e 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aue:Lcom/google/android/gms/internal/measurement/df;
+.field final aun:Lcom/google/android/gms/internal/measurement/df;
 
 .field private final zzb:[B
 
@@ -25,7 +25,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/cw;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     return-void
 .end method
@@ -40,12 +40,12 @@
 
 
 # virtual methods
-.method public final rM()Lcom/google/android/gms/internal/measurement/cn;
+.method public final rP()Lcom/google/android/gms/internal/measurement/cn;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cw;->aun:Lcom/google/android/gms/internal/measurement/df;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/df;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/df;->pG()V
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/cy;
 
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 bcfafa57b6..1fb780d632 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
@@ -18,5 +18,5 @@
 
 
 # virtual methods
-.method public abstract rL()B
+.method public abstract rO()B
 .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 54df6e3902..31b57e5959 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
@@ -36,11 +36,11 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v3
 
@@ -59,11 +59,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v2
 
@@ -75,13 +75,13 @@
 .method final a(Lcom/google/android/gms/internal/measurement/cn;I)Z
     .locals 5
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
     if-gt p2, v0, :cond_4
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -97,17 +97,17 @@
 
     iget-object v1, p1, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result v2
 
     add-int/2addr v2, p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result p1
 
@@ -154,7 +154,7 @@
     :cond_3
     new-instance v0, Ljava/lang/IllegalArgumentException;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result p1
 
@@ -187,7 +187,7 @@
     :cond_4
     new-instance p1, Ljava/lang/IllegalArgumentException;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -243,7 +243,7 @@
 .method public final bN(I)Lcom/google/android/gms/internal/measurement/cn;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -255,7 +255,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     return-object p1
 
@@ -264,7 +264,7 @@
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result v2
 
@@ -292,7 +292,7 @@
     return v2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v1
 
@@ -300,7 +300,7 @@
 
     check-cast v3, Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v3
 
@@ -309,7 +309,7 @@
     return v2
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v1
 
@@ -324,11 +324,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/cy;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->rj()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->rm()I
 
     move-result v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->rj()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->rm()I
 
     move-result v1
 
@@ -341,7 +341,7 @@
     return v2
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -359,16 +359,16 @@
     return p1
 .end method
 
-.method public final nL()Z
+.method public final nO()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result v0
 
     iget-object v1, p0, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v2
 
@@ -381,7 +381,7 @@
     return v0
 .end method
 
-.method public pG()I
+.method public pJ()I
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
@@ -391,7 +391,7 @@
     return v0
 .end method
 
-.method protected qe()I
+.method protected qh()I
     .locals 1
 
     const/4 v0, 0x0
@@ -404,7 +404,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/cy;->zzb:[B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cy;->qh()I
 
     move-result v1
 
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 611b15b3ec..ac85215445 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asm:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asv:Lcom/google/android/gms/internal/measurement/it;
 
-.field private final synthetic asn:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asw:Lcom/google/android/gms/internal/measurement/me;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -17,13 +17,13 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/d;->asn:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/d;->asw:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/d;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/d;->anq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/d;->zzd:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/d;->asm:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/d;->asv:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -32,10 +32,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->asm:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->asv:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -52,17 +52,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->asn:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/d;->asw:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/d;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/d;->anq:Ljava/lang/String;
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/d;->zzd:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/d;->asm:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/d;->asv:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->getConditionalUserProperties(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/lv;)V
 
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 6ca097b6e4..c3c989c1c5 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
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field anl:I
+.field anu:I
 
-.field auf:Lcom/google/android/gms/internal/measurement/de;
+.field auo:Lcom/google/android/gms/internal/measurement/de;
 
 .field zza:I
 
@@ -23,7 +23,7 @@
 
     const/16 v0, 0x64
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/da;->anl:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/da;->anu:I
 
     const v0, 0x7fffffff
 
@@ -129,7 +129,7 @@
     .end annotation
 .end method
 
-.method public abstract mN()Ljava/lang/String;
+.method public abstract mQ()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -137,7 +137,7 @@
     .end annotation
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -145,7 +145,7 @@
     .end annotation
 .end method
 
-.method public abstract pZ()I
+.method public abstract qA()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -153,7 +153,7 @@
     .end annotation
 .end method
 
-.method public abstract qS()J
+.method public abstract qV()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -161,7 +161,7 @@
     .end annotation
 .end method
 
-.method public abstract qx()J
+.method public abstract qc()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -169,7 +169,7 @@
     .end annotation
 .end method
 
-.method public abstract rN()D
+.method public abstract rQ()D
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -177,7 +177,7 @@
     .end annotation
 .end method
 
-.method public abstract rO()F
+.method public abstract rR()F
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -185,7 +185,7 @@
     .end annotation
 .end method
 
-.method public abstract rP()J
+.method public abstract rS()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -193,7 +193,7 @@
     .end annotation
 .end method
 
-.method public abstract rQ()Z
+.method public abstract rT()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -201,7 +201,7 @@
     .end annotation
 .end method
 
-.method public abstract rR()Ljava/lang/String;
+.method public abstract rU()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -209,7 +209,7 @@
     .end annotation
 .end method
 
-.method public abstract rS()Lcom/google/android/gms/internal/measurement/cn;
+.method public abstract rV()Lcom/google/android/gms/internal/measurement/cn;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -217,31 +217,7 @@
     .end annotation
 .end method
 
-.method public abstract rT()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rU()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rV()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rW()J
+.method public abstract rW()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -257,7 +233,7 @@
     .end annotation
 .end method
 
-.method public abstract rY()J
+.method public abstract rY()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -265,7 +241,7 @@
     .end annotation
 .end method
 
-.method abstract rZ()J
+.method public abstract rZ()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -273,7 +249,7 @@
     .end annotation
 .end method
 
-.method public abstract rc()I
+.method public abstract rf()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -281,7 +257,7 @@
     .end annotation
 .end method
 
-.method public abstract sa()Z
+.method public abstract sa()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -289,5 +265,29 @@
     .end annotation
 .end method
 
-.method public abstract sb()I
+.method public abstract sb()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method abstract sc()J
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract sd()Z
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract se()I
 .end method
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 33971d71e1..b3c6d4885c 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private aeX:I
+.field private afg:I
 
-.field private final aug:[B
+.field private final aup:[B
 
-.field private auh:I
+.field private auq:I
 
 .field private final zze:Z
 
@@ -41,9 +41,9 @@
 
     const p4, 0x7fffffff
 
-    iput p4, p0, Lcom/google/android/gms/internal/measurement/dc;->aeX:I
+    iput p4, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     add-int/2addr p3, p2
 
@@ -87,21 +87,21 @@
     :cond_0
     if-gez p1, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 .end method
 
-.method private final sc()I
+.method private final sf()I
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -115,7 +115,7 @@
 
     if-eq v1, v0, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     add-int/lit8 v3, v0, 0x1
 
@@ -235,7 +235,7 @@
     return v0
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sc()J
 
     move-result-wide v0
 
@@ -244,7 +244,7 @@
     return v1
 .end method
 
-.method private final sd()J
+.method private final sg()J
     .locals 11
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -258,7 +258,7 @@
 
     if-eq v1, v0, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     add-int/lit8 v3, v0, 0x1
 
@@ -474,14 +474,14 @@
     return-wide v3
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sc()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method private final se()I
+.method private final sh()I
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -499,7 +499,7 @@
 
     if-lt v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     add-int/lit8 v2, v0, 0x4
 
@@ -542,14 +542,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final sf()J
+.method private final si()J
     .locals 9
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -567,7 +567,7 @@
 
     if-lt v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     add-int/lit8 v3, v0, 0x8
 
@@ -680,14 +680,14 @@
     return-wide v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method private final sg()V
+.method private final sj()V
     .locals 3
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->zzf:I
@@ -704,7 +704,7 @@
 
     sub-int v1, v0, v1
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/dc;->aeX:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
 
     if-le v1, v2, :cond_0
 
@@ -728,7 +728,7 @@
     return-void
 .end method
 
-.method private final sh()B
+.method private final sk()B
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -742,7 +742,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     add-int/lit8 v2, v0, 0x1
 
@@ -753,7 +753,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
@@ -770,14 +770,14 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auh:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
 
     if-ne v0, p1, :cond_0
 
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -823,7 +823,7 @@
     return v2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -833,7 +833,7 @@
     return v1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
@@ -857,7 +857,7 @@
     return v2
 
     :cond_4
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result p1
 
@@ -886,7 +886,7 @@
     :goto_0
     if-ge v1, v0, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     iget v3, p0, Lcom/google/android/gms/internal/measurement/dc;->zzh:I
 
@@ -903,7 +903,7 @@
     goto :goto_0
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -913,7 +913,7 @@
     :goto_1
     if-ge v1, v0, :cond_a
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sk()B
 
     move-result p1
 
@@ -927,7 +927,7 @@
     return v2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -943,9 +943,9 @@
 .method public final bR(I)V
     .locals 0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aeX:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sj()V
 
     return-void
 .end method
@@ -960,38 +960,38 @@
 
     if-ltz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
     add-int/2addr p1, v0
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aeX:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
 
     if-gt p1, v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->aeX:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/dc;->afg:I
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sj()V
 
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 .end method
 
-.method public final mN()Ljava/lang/String;
+.method public final mQ()Ljava/lang/String;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -999,7 +999,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
@@ -1015,9 +1015,9 @@
 
     new-instance v1, Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v1, v3, v2, v0, v4}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -1039,21 +1039,21 @@
     :cond_1
     if-gez v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1061,7 +1061,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -1069,18 +1069,18 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auh:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
 
     return v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auh:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auh:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->auq:I
 
     ushr-int/lit8 v1, v0, 0x3
 
@@ -1089,14 +1089,44 @@
     return v0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final pZ()I
+.method public final qA()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final qV()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->si()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final qc()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1104,14 +1134,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qS()J
+.method public final rQ()D
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1119,37 +1149,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final qx()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rN()D
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->si()J
 
     move-result-wide v0
 
@@ -1160,7 +1160,7 @@
     return-wide v0
 .end method
 
-.method public final rO()F
+.method public final rR()F
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1168,7 +1168,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()I
 
     move-result v0
 
@@ -1179,7 +1179,7 @@
     return v0
 .end method
 
-.method public final rP()J
+.method public final rS()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1187,14 +1187,14 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final rQ()Z
+.method public final rT()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1202,7 +1202,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()J
 
     move-result-wide v0
 
@@ -1222,7 +1222,7 @@
     return v0
 .end method
 
-.method public final rR()Ljava/lang/String;
+.method public final rU()Ljava/lang/String;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1230,7 +1230,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
@@ -1244,7 +1244,7 @@
 
     if-gt v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/gx;->g([BII)Ljava/lang/String;
 
@@ -1268,21 +1268,21 @@
     :cond_1
     if-gtz v0, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rS()Lcom/google/android/gms/internal/measurement/cn;
+.method public final rV()Lcom/google/android/gms/internal/measurement/cn;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1290,7 +1290,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
@@ -1304,7 +1304,7 @@
 
     if-gt v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     invoke-static {v1, v2, v0}, Lcom/google/android/gms/internal/measurement/cn;->b([BII)Lcom/google/android/gms/internal/measurement/cn;
 
@@ -1321,7 +1321,7 @@
     :cond_0
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     return-object v0
 
@@ -1340,7 +1340,7 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/dc;->zzh:I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aug:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dc;->aup:[B
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dc;->zzh:I
 
@@ -1365,21 +1365,21 @@
     return-object v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
     throw v0
 .end method
 
-.method public final rT()I
+.method public final rW()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1387,58 +1387,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final rU()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rV()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->se()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rW()J
-    .locals 2
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
 .method public final rX()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
@@ -1447,7 +1402,67 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final rY()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final rZ()J
+    .locals 2
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->si()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.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/dc;->sf()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final sa()I
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sf()I
 
     move-result v0
 
@@ -1458,7 +1473,7 @@
     return v0
 .end method
 
-.method public final rY()J
+.method public final sb()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1466,7 +1481,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sd()J
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sg()J
 
     move-result-wide v0
 
@@ -1477,7 +1492,7 @@
     return-wide v0
 .end method
 
-.method final rZ()J
+.method final sc()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1494,7 +1509,7 @@
 
     if-ge v2, v3, :cond_1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sh()B
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sk()B
 
     move-result v3
 
@@ -1518,7 +1533,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tf()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
@@ -1531,22 +1546,7 @@
     goto :goto_1
 .end method
 
-.method public final rc()I
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dc;->sc()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final sa()Z
+.method public final sd()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1570,7 +1570,7 @@
     return v0
 .end method
 
-.method public final sb()I
+.method public final se()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dc;->zzh:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dd.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dd.smali
index 41b8f27421..b0f3bbddbf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dd.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axC:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -38,9 +38,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axP:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -54,9 +54,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awp:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -70,9 +70,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axR:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -86,9 +86,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axB:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -102,9 +102,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axA:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -118,9 +118,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axx:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -134,9 +134,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -150,9 +150,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awq:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -166,9 +166,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axF:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axO:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -182,9 +182,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axS:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -198,9 +198,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -214,9 +214,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axU:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -230,9 +230,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axV:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -246,9 +246,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axD:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -262,9 +262,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axQ:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -278,9 +278,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
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 6d24b09c67..4a457299cb 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
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private anl:I
+.field private anu:I
 
-.field private final aui:Lcom/google/android/gms/internal/measurement/da;
+.field private final aur:Lcom/google/android/gms/internal/measurement/da;
 
 .field private zzc:I
 
@@ -34,11 +34,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/da;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/da;->auf:Lcom/google/android/gms/internal/measurement/de;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/da;->auo:Lcom/google/android/gms/internal/measurement/de;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dd;->atf:[I
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -82,7 +82,7 @@
     throw p1
 
     :pswitch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qy()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qB()J
 
     move-result-wide p1
 
@@ -93,7 +93,7 @@
     return-object p1
 
     :pswitch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rV()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rY()I
 
     move-result p1
 
@@ -104,14 +104,14 @@
     return-object p1
 
     :pswitch_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sm()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sp()Ljava/lang/String;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sq()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->st()J
 
     move-result-wide p1
 
@@ -122,7 +122,7 @@
     return-object p1
 
     :pswitch_4
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sp()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->ss()I
 
     move-result p1
 
@@ -133,7 +133,7 @@
     return-object p1
 
     :pswitch_5
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rY()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sb()J
 
     move-result-wide p1
 
@@ -144,7 +144,7 @@
     return-object p1
 
     :pswitch_6
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->rX()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sa()I
 
     move-result p1
 
@@ -159,7 +159,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object p1
 
@@ -174,7 +174,7 @@
     return-object p1
 
     :pswitch_8
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qS()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qV()J
 
     move-result-wide p1
 
@@ -185,7 +185,7 @@
     return-object p1
 
     :pswitch_9
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->pZ()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qc()I
 
     move-result p1
 
@@ -196,7 +196,7 @@
     return-object p1
 
     :pswitch_a
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sj()F
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sm()F
 
     move-result p1
 
@@ -207,7 +207,7 @@
     return-object p1
 
     :pswitch_b
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sk()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()J
 
     move-result-wide p1
 
@@ -218,17 +218,6 @@
     return-object p1
 
     :pswitch_c
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sl()I
-
-    move-result p1
-
-    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object p1
-
-    return-object p1
-
-    :pswitch_d
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->so()I
 
     move-result p1
@@ -239,8 +228,19 @@
 
     return-object p1
 
+    :pswitch_d
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sr()I
+
+    move-result p1
+
+    invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object p1
+
+    return-object p1
+
     :pswitch_e
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->si()D
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sl()D
 
     move-result-wide p1
 
@@ -251,14 +251,14 @@
     return-object p1
 
     :pswitch_f
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object p1
 
     return-object p1
 
     :pswitch_10
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->mP()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->mS()Z
 
     move-result p1
 
@@ -307,7 +307,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -326,15 +326,15 @@
     check-cast v0, Lcom/google/android/gms/internal/measurement/en;
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object p1
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/en;->a(Lcom/google/android/gms/internal/measurement/cn;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -343,13 +343,13 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, p2, :cond_0
 
@@ -360,23 +360,23 @@
     :cond_2
     if-eqz p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sm()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sp()Ljava/lang/String;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qW()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->qZ()Ljava/lang/String;
 
     move-result-object v0
 
     :goto_0
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -385,13 +385,13 @@
     return-void
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_2
 
@@ -400,7 +400,7 @@
     return-void
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -428,7 +428,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -450,7 +450,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -465,7 +465,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -474,7 +474,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -489,9 +489,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -500,7 +500,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -527,33 +527,33 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     iget v1, v1, Lcom/google/android/gms/internal/measurement/da;->zza:I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    iget v2, v2, Lcom/google/android/gms/internal/measurement/da;->anl:I
+    iget v2, v2, Lcom/google/android/gms/internal/measurement/da;->anu:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/da;->bf(I)I
 
     move-result v0
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fw;->rz()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fw;->rC()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     iget v3, v2, Lcom/google/android/gms/internal/measurement/da;->zza:I
 
@@ -565,13 +565,13 @@
 
     invoke-interface {p1, v1}, Lcom/google/android/gms/internal/measurement/fw;->ae(Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     const/4 p2, 0x0
 
     invoke-virtual {p1, p2}, Lcom/google/android/gms/internal/measurement/da;->bP(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     iget p2, p1, Lcom/google/android/gms/internal/measurement/da;->zza:I
 
@@ -579,7 +579,7 @@
 
     iput p2, p1, Lcom/google/android/gms/internal/measurement/da;->zza:I
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/internal/measurement/da;->bR(I)V
 
@@ -617,7 +617,7 @@
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->zzc:I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     ushr-int/lit8 v1, v1, 0x3
 
@@ -628,7 +628,7 @@
     iput v1, p0, Lcom/google/android/gms/internal/measurement/de;->zzc:I
 
     :try_start_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fw;->rz()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fw;->rC()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -636,7 +636,7 @@
 
     invoke-interface {p1, v1}, Lcom/google/android/gms/internal/measurement/fw;->ae(Ljava/lang/Object;)V
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     iget p2, p0, Lcom/google/android/gms/internal/measurement/de;->zzc:I
     :try_end_0
@@ -650,7 +650,7 @@
 
     :cond_0
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -697,7 +697,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -706,17 +706,17 @@
     if-ne p1, v1, :cond_2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rV()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rY()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -725,13 +725,13 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_0
 
@@ -740,41 +740,41 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/de;->bH(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rV()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rY()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -783,7 +783,7 @@
     return-void
 
     :cond_5
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -792,9 +792,9 @@
     if-ne v0, v1, :cond_8
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rV()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()I
 
     move-result v0
 
@@ -804,9 +804,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -815,13 +815,13 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_6
 
@@ -830,33 +830,33 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/de;->bH(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rV()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()I
 
     move-result v0
 
@@ -866,9 +866,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -906,7 +906,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -914,34 +914,34 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/de;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -950,24 +950,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -976,13 +976,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -991,7 +991,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -999,26 +999,26 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/de;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
 
     move-result-wide v2
 
@@ -1028,9 +1028,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -1039,16 +1039,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
 
     move-result-wide v0
 
@@ -1058,9 +1058,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -1069,13 +1069,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -1111,7 +1111,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -1119,32 +1119,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rX()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -1155,24 +1155,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rX()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -1181,13 +1181,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -1196,7 +1196,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -1204,24 +1204,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()I
 
     move-result v0
 
@@ -1231,9 +1231,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -1244,16 +1244,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()I
 
     move-result v0
 
@@ -1263,9 +1263,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -1274,13 +1274,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -1316,7 +1316,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -1324,32 +1324,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rY()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -1360,24 +1360,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rY()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -1386,13 +1386,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -1401,7 +1401,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -1409,24 +1409,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()J
 
     move-result-wide v2
 
@@ -1436,9 +1436,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -1449,16 +1449,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()J
 
     move-result-wide v0
 
@@ -1468,9 +1468,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -1479,13 +1479,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -1547,7 +1547,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v1, v0, 0x7
 
@@ -1562,9 +1562,9 @@
 
     invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v1
 
@@ -1577,9 +1577,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v1
 
@@ -1592,7 +1592,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -1633,25 +1633,25 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/da;->bf(I)I
 
     move-result v1
 
-    iget-object v2, p2, Lcom/google/android/gms/internal/measurement/ex;->atE:Ljava/lang/Object;
+    iget-object v2, p2, Lcom/google/android/gms/internal/measurement/ex;->atN:Ljava/lang/Object;
 
-    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/ex;->atP:Ljava/lang/Object;
+    iget-object v3, p2, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
 
     :goto_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->pJ()I
 
     move-result v4
 
@@ -1659,9 +1659,9 @@
 
     if-eq v4, v5, :cond_4
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v5
     :try_end_0
@@ -1678,7 +1678,7 @@
     if-eq v4, v0, :cond_1
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->nL()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->nO()Z
 
     move-result v4
 
@@ -1694,9 +1694,9 @@
     throw v4
 
     :cond_1
-    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awq:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
 
-    iget-object v5, p2, Lcom/google/android/gms/internal/measurement/ex;->atP:Ljava/lang/Object;
+    iget-object v5, p2, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
 
     invoke-virtual {v5}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -1709,7 +1709,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awp:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p2, Lcom/google/android/gms/internal/measurement/ex;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     const/4 v5, 0x0
 
@@ -1724,7 +1724,7 @@
 
     :catch_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->nL()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->nO()Z
 
     move-result v4
 
@@ -1744,7 +1744,7 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/da;->bR(I)V
 
@@ -1753,7 +1753,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {p2, v1}, Lcom/google/android/gms/internal/measurement/da;->bR(I)V
 
@@ -1819,7 +1819,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v1, v0, 0x7
 
@@ -1834,9 +1834,9 @@
 
     invoke-interface {p1, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v1
 
@@ -1849,9 +1849,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v1
 
@@ -1864,7 +1864,7 @@
     return-void
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -1906,7 +1906,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dg;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -1914,34 +1914,34 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/de;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rN()D
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/dg;->d(D)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -1950,24 +1950,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rN()D
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/dg;->d(D)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -1976,13 +1976,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -1991,7 +1991,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -1999,26 +1999,26 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/de;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rN()D
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
 
     move-result-wide v2
 
@@ -2028,9 +2028,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -2039,16 +2039,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rN()D
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
 
     move-result-wide v0
 
@@ -2058,9 +2058,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -2069,13 +2069,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -2084,7 +2084,7 @@
     return-void
 .end method
 
-.method public final mP()Z
+.method public final mS()Z
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2096,16 +2096,16 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final nL()Z
+.method public final nO()Z
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2113,15 +2113,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->zzc:I
 
@@ -2130,7 +2130,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/da;->bQ(I)Z
 
@@ -2174,7 +2174,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dv;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -2183,17 +2183,17 @@
     if-ne p1, v1, :cond_2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rO()F
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rR()F
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dv;->r(F)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -2202,13 +2202,13 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_0
 
@@ -2217,41 +2217,41 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/de;->bH(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rO()F
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rR()F
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dv;->r(F)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -2260,7 +2260,7 @@
     return-void
 
     :cond_5
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -2269,9 +2269,9 @@
     if-ne v0, v1, :cond_8
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rO()F
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()F
 
     move-result v0
 
@@ -2281,9 +2281,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -2292,13 +2292,13 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_6
 
@@ -2307,33 +2307,33 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/de;->bH(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rO()F
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()F
 
     move-result v0
 
@@ -2343,9 +2343,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -2381,7 +2381,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -2389,32 +2389,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rP()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rS()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -2425,24 +2425,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rP()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rS()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -2451,13 +2451,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -2466,7 +2466,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -2474,24 +2474,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rP()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()J
 
     move-result-wide v2
 
@@ -2501,9 +2501,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -2514,16 +2514,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rP()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()J
 
     move-result-wide v0
 
@@ -2533,9 +2533,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -2544,13 +2544,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -2559,7 +2559,7 @@
     return-void
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2571,7 +2571,7 @@
 
     if-eqz v0, :cond_0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     const/4 v0, 0x0
 
@@ -2580,16 +2580,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iput v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     :goto_0
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eqz v0, :cond_2
 
@@ -2611,31 +2611,10 @@
     return v0
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
-
-    return v0
-.end method
-
-.method public final pZ()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/de;->bP(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rc()I
-
-    move-result v0
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     return v0
 .end method
@@ -2667,7 +2646,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -2675,32 +2654,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qx()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qA()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -2711,24 +2690,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qx()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qA()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -2737,13 +2716,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -2752,7 +2731,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -2760,24 +2739,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qx()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qA()J
 
     move-result-wide v2
 
@@ -2787,9 +2766,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -2800,16 +2779,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qx()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qA()J
 
     move-result-wide v0
 
@@ -2819,9 +2798,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -2830,13 +2809,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -2845,7 +2824,7 @@
     return-void
 .end method
 
-.method public final qS()J
+.method public final qB()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2857,16 +2836,37 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qx()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final qW()Ljava/lang/String;
+.method public final qV()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/de;->bP(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qA()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final qZ()Ljava/lang/String;
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -2878,17 +2878,17 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->mN()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->mQ()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final qy()J
-    .locals 2
+.method public final qc()I
+    .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -2899,13 +2899,13 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rP()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rf()I
 
-    move-result-wide v0
+    move-result v0
 
-    return-wide v0
+    return v0
 .end method
 
 .method public final r(Ljava/util/List;)V
@@ -2935,7 +2935,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -2943,32 +2943,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rf()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -2979,24 +2979,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rc()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rf()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -3005,13 +3005,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -3020,7 +3020,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -3028,24 +3028,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rf()I
 
     move-result v0
 
@@ -3055,9 +3055,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -3068,16 +3068,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rc()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rf()I
 
     move-result v0
 
@@ -3087,9 +3087,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -3098,13 +3098,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -3113,7 +3113,7 @@
     return-void
 .end method
 
-.method public final rV()I
+.method public final rY()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3125,57 +3125,15 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final rX()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/de;->bP(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rV()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final rY()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/de;->bP(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
 .method public final s(Ljava/util/List;)V
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
@@ -3205,7 +3163,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -3213,34 +3171,34 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/de;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qV()J
 
     move-result-wide v2
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -3249,24 +3207,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qS()J
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qV()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -3275,13 +3233,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -3290,7 +3248,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -3298,26 +3256,26 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/de;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qV()J
 
     move-result-wide v2
 
@@ -3327,9 +3285,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -3338,16 +3296,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qV()J
 
     move-result-wide v0
 
@@ -3357,9 +3315,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -3368,13 +3326,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -3383,28 +3341,7 @@
     return-void
 .end method
 
-.method public final si()D
-    .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/de;->bP(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rN()D
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final sj()F
+.method public final sa()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3416,16 +3353,16 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rO()F
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final sk()J
+.method public final sb()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3437,16 +3374,37 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rZ()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final sl()I
+.method public final sl()D
+    .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/de;->bP(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()D
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final sm()F
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3458,55 +3416,34 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pZ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()F
 
     move-result v0
 
     return v0
 .end method
 
-.method public final sm()Ljava/lang/String;
-    .locals 1
+.method public final sn()J
+    .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
         }
     .end annotation
 
-    const/4 v0, 0x2
+    const/4 v0, 0x1
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rR()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qV()J
 
-    move-result-object v0
+    move-result-wide v0
 
-    return-object v0
-.end method
-
-.method public final sn()Lcom/google/android/gms/internal/measurement/cn;
-    .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/de;->bP(I)V
-
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rS()Lcom/google/android/gms/internal/measurement/cn;
-
-    move-result-object v0
-
-    return-object v0
+    return-wide v0
 .end method
 
 .method public final so()I
@@ -3517,20 +3454,62 @@
         }
     .end annotation
 
-    const/4 v0, 0x0
+    const/4 v0, 0x5
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qc()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final sp()I
+.method public final sp()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/de;->bP(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final sq()Lcom/google/android/gms/internal/measurement/cn;
+    .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/de;->bP(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rV()Lcom/google/android/gms/internal/measurement/cn;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final sr()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3542,7 +3521,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()I
 
@@ -3551,7 +3530,28 @@
     return v0
 .end method
 
-.method public final sq()J
+.method public final ss()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/de;->bP(I)V
+
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final st()J
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -3563,9 +3563,9 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/de;->bP(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rY()J
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()J
 
     move-result-wide v0
 
@@ -3601,7 +3601,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -3610,17 +3610,17 @@
     if-ne p1, v1, :cond_2
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pZ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qc()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -3629,13 +3629,13 @@
     return-void
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_0
 
@@ -3644,41 +3644,41 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/de;->bH(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int v3, v1, p1
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pZ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->qc()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -3687,7 +3687,7 @@
     return-void
 
     :cond_5
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -3696,9 +3696,9 @@
     if-ne v0, v1, :cond_8
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pZ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qc()I
 
     move-result v0
 
@@ -3708,9 +3708,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -3719,13 +3719,13 @@
     return-void
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_6
 
@@ -3734,33 +3734,33 @@
     return-void
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/de;->bH(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_a
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pZ()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->qc()I
 
     move-result v0
 
@@ -3770,9 +3770,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -3808,7 +3808,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/cl;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -3816,32 +3816,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/cl;->zza(Z)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -3852,24 +3852,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rQ()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/cl;->zza(Z)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -3878,13 +3878,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -3893,7 +3893,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -3901,24 +3901,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
 
     move-result v0
 
@@ -3928,9 +3928,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -3941,16 +3941,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rQ()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()Z
 
     move-result v0
 
@@ -3960,9 +3960,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -3971,13 +3971,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -4051,7 +4051,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -4060,15 +4060,15 @@
     if-ne v0, v1, :cond_2
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/de;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     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/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -4077,13 +4077,13 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_0
 
@@ -4092,7 +4092,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -4132,7 +4132,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -4140,32 +4140,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -4176,24 +4176,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -4202,13 +4202,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -4217,7 +4217,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -4225,24 +4225,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
@@ -4252,9 +4252,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -4265,16 +4265,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
@@ -4284,9 +4284,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -4295,13 +4295,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
@@ -4337,7 +4337,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget p1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 p1, p1, 0x7
 
@@ -4345,32 +4345,32 @@
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rX()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result p1
 
@@ -4381,24 +4381,24 @@
     return-void
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rU()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->rX()I
 
     move-result p1
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dz;->bR(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result p1
 
@@ -4407,13 +4407,13 @@
     return-void
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result p1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq p1, v1, :cond_2
 
@@ -4422,7 +4422,7 @@
     return-void
 
     :cond_4
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     and-int/lit8 v0, v0, 0x7
 
@@ -4430,24 +4430,24 @@
 
     if-ne v0, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rT()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rW()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v1
 
     add-int/2addr v1, v0
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()I
 
     move-result v0
 
@@ -4457,9 +4457,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sb()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->se()I
 
     move-result v0
 
@@ -4470,16 +4470,16 @@
     return-void
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rU()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->rX()I
 
     move-result v0
 
@@ -4489,9 +4489,9 @@
 
     invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sa()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->sd()Z
 
     move-result v0
 
@@ -4500,13 +4500,13 @@
     return-void
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aui:Lcom/google/android/gms/internal/measurement/da;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/de;->aur:Lcom/google/android/gms/internal/measurement/da;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/da;->pJ()I
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/de;->anu:I
 
     if-eq v0, v1, :cond_7
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df$b.smali
index 244cf5cf04..dead2b3aeb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/df$b.smali
@@ -224,7 +224,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nO()Z
 
     move-result v0
 
@@ -236,7 +236,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
 
     move-result v0
 
@@ -661,7 +661,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/cf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rH()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rK()I
 
     move-result v0
 
@@ -678,7 +678,7 @@
     :cond_0
     invoke-virtual {p0, v0}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/df$b;->auk:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/df$b;->aut:Lcom/google/android/gms/internal/measurement/dh;
 
     invoke-interface {p3, p2, p1}, Lcom/google/android/gms/internal/measurement/fw;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hk;)V
 
@@ -693,7 +693,7 @@
         }
     .end annotation
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
@@ -743,7 +743,7 @@
 
     iget v3, p0, Lcom/google/android/gms/internal/measurement/df$b;->zze:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
 
     move-result v4
 
@@ -774,7 +774,7 @@
 
     iget v2, p0, Lcom/google/android/gms/internal/measurement/df$b;->zze:I
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
 
     move-result v3
 
@@ -843,7 +843,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fg;->sQ()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/fg;->sT()I
 
     move-result v0
 
@@ -862,19 +862,19 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->nO()Z
 
     move-result v0
 
     if-eqz v0, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v0
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
 
     move-result v0
 
@@ -1460,7 +1460,7 @@
     return-void
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/df$b;->zzd:I
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 d0c198b89c..4a5a26aaea 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
@@ -13,13 +13,13 @@
 
 
 # static fields
-.field private static final asy:Z
+.field private static final asH:Z
 
-.field private static final auj:Ljava/util/logging/Logger;
+.field private static final aus:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field auk:Lcom/google/android/gms/internal/measurement/dh;
+.field aut:Lcom/google/android/gms/internal/measurement/dh;
 
 
 # direct methods
@@ -36,13 +36,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/df;->auj:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/df;->aus:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pH()Z
 
     move-result v0
 
-    sput-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asy:Z
+    sput-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asH:Z
 
     return-void
 .end method
@@ -264,7 +264,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->pH()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->pK()I
 
     move-result p1
 
@@ -282,7 +282,7 @@
 .method public static a(Lcom/google/android/gms/internal/measurement/el;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/el;->pH()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/el;->pK()I
 
     move-result p0
 
@@ -300,7 +300,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/cf;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->rH()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cf;->rK()I
 
     move-result v0
 
@@ -411,7 +411,7 @@
 .method public static b(Lcom/google/android/gms/internal/measurement/cn;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result p0
 
@@ -529,7 +529,7 @@
 
     move-result p0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result p1
 
@@ -559,7 +559,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/cf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rH()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rK()I
 
     move-result v0
 
@@ -582,7 +582,7 @@
 .method public static c(Lcom/google/android/gms/internal/measurement/fg;)I
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sQ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sT()I
 
     move-result p0
 
@@ -701,7 +701,7 @@
     goto :goto_0
 
     :catch_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-virtual {p0, v0}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -806,7 +806,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sQ()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sT()I
 
     move-result p0
 
@@ -871,10 +871,10 @@
     return p0
 .end method
 
-.method static synthetic nL()Z
+.method static synthetic nO()Z
     .locals 1
 
-    sget-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asy:Z
+    sget-boolean v0, Lcom/google/android/gms/internal/measurement/df;->asH:Z
 
     return v0
 .end method
@@ -905,26 +905,10 @@
     return v0
 .end method
 
-.method public static sr()I
+.method public static sA()I
     .locals 1
 
-    const/4 v0, 0x4
-
-    return v0
-.end method
-
-.method public static ss()I
-    .locals 1
-
-    const/4 v0, 0x4
-
-    return v0
-.end method
-
-.method public static st()I
-    .locals 1
-
-    const/16 v0, 0x8
+    const/4 v0, 0x1
 
     return v0
 .end method
@@ -932,7 +916,7 @@
 .method public static su()I
     .locals 1
 
-    const/16 v0, 0x8
+    const/4 v0, 0x4
 
     return v0
 .end method
@@ -956,7 +940,23 @@
 .method public static sx()I
     .locals 1
 
-    const/4 v0, 0x1
+    const/16 v0, 0x8
+
+    return v0
+.end method
+
+.method public static sy()I
+    .locals 1
+
+    const/4 v0, 0x4
+
+    return v0
+.end method
+
+.method public static sz()I
+    .locals 1
+
+    const/16 v0, 0x8
 
     return v0
 .end method
@@ -1086,7 +1086,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/df;->auj:Ljava/util/logging/Logger;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/df;->aus:Ljava/util/logging/Logger;
 
     sget-object v1, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
@@ -1100,7 +1100,7 @@
 
     invoke-virtual/range {v0 .. v5}, Ljava/util/logging/Logger;->logp(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    sget-object p2, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -1301,10 +1301,10 @@
     .end annotation
 .end method
 
-.method public final pD()V
+.method public final pG()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/df;->pJ()I
 
     move-result v0
 
@@ -1322,7 +1322,7 @@
     throw v0
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
 
 .method public final r(F)V
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 e926e9e026..f30440bded 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
@@ -24,11 +24,11 @@
 
 
 # static fields
-.field private static final aul:Lcom/google/android/gms/internal/measurement/dg;
+.field private static final auu:Lcom/google/android/gms/internal/measurement/dg;
 
 
 # instance fields
-.field private aum:[D
+.field private auv:[D
 
 .field private zzc:I
 
@@ -45,9 +45,9 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/dg;-><init>([DI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dg;->aul:Lcom/google/android/gms/internal/measurement/dg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dg;->auu:Lcom/google/android/gms/internal/measurement/dg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/dg;->zzc:I
 
@@ -142,7 +142,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-ltz p1, :cond_1
 
@@ -150,7 +150,7 @@
 
     if-gt p1, p2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     array-length v3, v2
 
@@ -177,7 +177,7 @@
 
     invoke-static {v2, v3, p2, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     add-int/lit8 v3, p1, 0x1
 
@@ -187,10 +187,10 @@
 
     invoke-static {v2, p1, p2, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aput-wide v0, p2, p1
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -284,7 +284,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     array-length v2, v0
 
@@ -294,12 +294,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/dg;->zzc:I
 
@@ -336,7 +336,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dg;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([DI)[D
 
@@ -359,11 +359,11 @@
 .method public final d(D)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dg;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     array-length v2, v1
 
@@ -381,10 +381,10 @@
 
     invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dg;->zzc:I
 
@@ -431,7 +431,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     const/4 v1, 0x0
 
@@ -440,7 +440,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aget-wide v4, v2, v1
 
@@ -474,7 +474,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dg;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aget-wide v1, v0, p1
 
@@ -497,7 +497,7 @@
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aget-wide v3, v2, v1
 
@@ -524,11 +524,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dg;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aget-wide v1, v0, p1
 
@@ -569,7 +569,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     const/4 v0, 0x0
 
@@ -580,7 +580,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aget-wide v3, v2, v1
 
@@ -594,7 +594,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     add-int/lit8 v0, v1, 0x1
 
@@ -634,11 +634,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dg;->zzc:I
 
@@ -681,11 +681,11 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dg;->bI(I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->aum:[D
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/dg;->auv:[D
 
     aget-wide v2, p2, p1
 
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 3803207880..dc516d2675 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aue:Lcom/google/android/gms/internal/measurement/df;
+.field private final aun:Lcom/google/android/gms/internal/measurement/df;
 
 
 # direct methods
@@ -24,11 +24,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/df;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
-    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/df;->auk:Lcom/google/android/gms/internal/measurement/dh;
+    iput-object p0, p1, Lcom/google/android/gms/internal/measurement/df;->aut:Lcom/google/android/gms/internal/measurement/dh;
 
     return-void
 .end method
@@ -43,7 +43,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->z(II)V
 
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->C(II)V
 
@@ -73,7 +73,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->A(II)V
 
@@ -88,7 +88,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->B(II)V
 
@@ -103,7 +103,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/df;->a(ID)V
 
@@ -118,7 +118,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->a(ILcom/google/android/gms/internal/measurement/cn;)V
 
@@ -168,13 +168,13 @@
 
     check-cast v0, Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v2, 0x2
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/internal/measurement/df;->y(II)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -190,7 +190,7 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -216,7 +216,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/fg;
 
@@ -267,7 +267,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     check-cast v2, Ljava/lang/String;
 
@@ -276,7 +276,7 @@
     goto :goto_1
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/cn;
 
@@ -298,7 +298,7 @@
 
     if-ge v1, v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -378,7 +378,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -416,7 +416,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -427,7 +427,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -456,7 +456,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -486,7 +486,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->b(IF)V
 
@@ -501,7 +501,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/fg;
 
@@ -509,7 +509,7 @@
 
     invoke-virtual {v0, p1, v1}, Lcom/google/android/gms/internal/measurement/df;->y(II)V
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/df;->auk:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/df;->aut:Lcom/google/android/gms/internal/measurement/dh;
 
     invoke-interface {p3, p2, v1}, Lcom/google/android/gms/internal/measurement/fw;->a(Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hk;)V
 
@@ -546,7 +546,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -626,7 +626,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -651,7 +651,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sr()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->su()I
 
     move-result v1
 
@@ -662,7 +662,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -673,7 +673,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -702,7 +702,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -732,7 +732,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x4
 
@@ -749,7 +749,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x3
 
@@ -766,7 +766,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/df;->c(IJ)V
 
@@ -785,7 +785,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/cn;
 
@@ -794,7 +794,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/fg;
 
@@ -811,7 +811,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->c(ILjava/lang/String;)V
 
@@ -839,7 +839,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -877,7 +877,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -888,7 +888,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -917,7 +917,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -947,7 +947,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/df;->e(IJ)V
 
@@ -975,7 +975,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1013,7 +1013,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1024,7 +1024,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1053,7 +1053,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1083,7 +1083,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->d(IZ)V
 
@@ -1098,7 +1098,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/df;->c(IJ)V
 
@@ -1126,7 +1126,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1151,7 +1151,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->st()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sw()I
 
     move-result v1
 
@@ -1162,7 +1162,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1173,7 +1173,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1202,7 +1202,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1245,7 +1245,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1270,7 +1270,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sy()I
 
     move-result v1
 
@@ -1281,7 +1281,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1292,7 +1292,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1321,7 +1321,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1364,7 +1364,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1389,7 +1389,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sw()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sz()I
 
     move-result v1
 
@@ -1400,7 +1400,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1411,7 +1411,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1440,7 +1440,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1483,7 +1483,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1521,7 +1521,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1532,7 +1532,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1561,7 +1561,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1591,7 +1591,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/df;->e(IJ)V
 
@@ -1619,7 +1619,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1644,7 +1644,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sx()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sA()I
 
     move-result v1
 
@@ -1655,7 +1655,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1666,7 +1666,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1695,7 +1695,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1725,7 +1725,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/df;->d(IJ)V
 
@@ -1753,7 +1753,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1791,7 +1791,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1802,7 +1802,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1831,7 +1831,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1874,7 +1874,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -1899,7 +1899,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->ss()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sv()I
 
     move-result v1
 
@@ -1910,7 +1910,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -1921,7 +1921,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1950,7 +1950,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -1993,7 +1993,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -2018,7 +2018,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->su()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sx()I
 
     move-result v1
 
@@ -2029,7 +2029,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -2040,7 +2040,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2069,7 +2069,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2112,7 +2112,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -2150,7 +2150,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -2161,7 +2161,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2190,7 +2190,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2233,7 +2233,7 @@
 
     if-eqz p3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     const/4 v1, 0x2
 
@@ -2271,7 +2271,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {p1, p3}, Lcom/google/android/gms/internal/measurement/df;->bI(I)V
 
@@ -2282,7 +2282,7 @@
 
     if-ge v0, p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2311,7 +2311,7 @@
 
     if-ge v0, p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-interface {p2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2333,10 +2333,10 @@
     return-void
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
-    sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->auh:I
+    sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
 
     return v0
 .end method
@@ -2349,7 +2349,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->C(II)V
 
@@ -2364,7 +2364,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dh;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/df;->z(II)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di$a.smali
index 35639fc0e2..04a0d9af9c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/di$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final anl:I
+.field private final anu:I
 
 .field private final zza:Ljava/lang/Object;
 
@@ -28,7 +28,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/di$a;->zza:Ljava/lang/Object;
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/di$a;->anl:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/di$a;->anu:I
 
     return-void
 .end method
@@ -55,9 +55,9 @@
 
     if-ne v0, v2, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/di$a;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/di$a;->anu:I
 
-    iget p1, p1, Lcom/google/android/gms/internal/measurement/di$a;->anl:I
+    iget p1, p1, Lcom/google/android/gms/internal/measurement/di$a;->anu:I
 
     if-ne v0, p1, :cond_1
 
@@ -82,7 +82,7 @@
 
     mul-int v0, v0, v1
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/di$a;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/di$a;->anu:I
 
     add-int/2addr v0, v1
 
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 2f3d17f1a1..7224c2db20 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
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field private static volatile atZ:Lcom/google/android/gms/internal/measurement/di; = null
+.field private static atG:Z = true
 
-.field private static atx:Z = true
+.field private static volatile aui:Lcom/google/android/gms/internal/measurement/di; = null
 
-.field private static final aun:Ljava/lang/Class;
+.field private static final auw:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,15 +25,15 @@
     .end annotation
 .end field
 
-.field private static volatile auo:Lcom/google/android/gms/internal/measurement/di; = null
+.field private static volatile aux:Lcom/google/android/gms/internal/measurement/di; = null
 
-.field private static final aup:Lcom/google/android/gms/internal/measurement/di;
+.field private static final auy:Lcom/google/android/gms/internal/measurement/di;
 
 .field private static volatile zza:Z = false
 
 
 # instance fields
-.field private final auq:Ljava/util/Map;
+.field private final auz:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -49,11 +49,11 @@
 .method static constructor <clinit>()V
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sy()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sB()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->aun:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->auw:Ljava/lang/Class;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/di;
 
@@ -61,7 +61,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/di;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->aup:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->auy:Lcom/google/android/gms/internal/measurement/di;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/di;->auq:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/di;->auz:Ljava/util/Map;
 
     return-void
 .end method
@@ -89,53 +89,12 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/di;->auq:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/di;->auz:Ljava/util/Map;
 
     return-void
 .end method
 
-.method public static sA()Lcom/google/android/gms/internal/measurement/di;
-    .locals 2
-
-    const-class v0, Lcom/google/android/gms/internal/measurement/di;
-
-    sget-object v1, Lcom/google/android/gms/internal/measurement/di;->auo:Lcom/google/android/gms/internal/measurement/di;
-
-    if-nez v1, :cond_1
-
-    monitor-enter v0
-
-    :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/di;->auo:Lcom/google/android/gms/internal/measurement/di;
-
-    if-nez v1, :cond_0
-
-    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/du;->o(Ljava/lang/Class;)Lcom/google/android/gms/internal/measurement/di;
-
-    move-result-object v1
-
-    sput-object v1, Lcom/google/android/gms/internal/measurement/di;->auo:Lcom/google/android/gms/internal/measurement/di;
-
-    :cond_0
-    monitor-exit v0
-
-    goto :goto_0
-
-    :catchall_0
-    move-exception v1
-
-    monitor-exit v0
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    throw v1
-
-    :cond_1
-    :goto_0
-    return-object v1
-.end method
-
-.method private static sy()Ljava/lang/Class;
+.method private static sB()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,10 +121,10 @@
     return-object v0
 .end method
 
-.method public static sz()Lcom/google/android/gms/internal/measurement/di;
+.method public static sC()Lcom/google/android/gms/internal/measurement/di;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     if-nez v0, :cond_1
 
@@ -174,13 +133,13 @@
     monitor-enter v1
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->aup:Lcom/google/android/gms/internal/measurement/di;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/di;->auy:Lcom/google/android/gms/internal/measurement/di;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/di;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     :cond_0
     monitor-exit v1
@@ -201,6 +160,47 @@
     return-object v0
 .end method
 
+.method public static sD()Lcom/google/android/gms/internal/measurement/di;
+    .locals 2
+
+    const-class v0, Lcom/google/android/gms/internal/measurement/di;
+
+    sget-object v1, Lcom/google/android/gms/internal/measurement/di;->aux:Lcom/google/android/gms/internal/measurement/di;
+
+    if-nez v1, :cond_1
+
+    monitor-enter v0
+
+    :try_start_0
+    sget-object v1, Lcom/google/android/gms/internal/measurement/di;->aux:Lcom/google/android/gms/internal/measurement/di;
+
+    if-nez v1, :cond_0
+
+    invoke-static {v0}, Lcom/google/android/gms/internal/measurement/du;->o(Ljava/lang/Class;)Lcom/google/android/gms/internal/measurement/di;
+
+    move-result-object v1
+
+    sput-object v1, Lcom/google/android/gms/internal/measurement/di;->aux:Lcom/google/android/gms/internal/measurement/di;
+
+    :cond_0
+    monitor-exit v0
+
+    goto :goto_0
+
+    :catchall_0
+    move-exception v1
+
+    monitor-exit v0
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    throw v1
+
+    :cond_1
+    :goto_0
+    return-object v1
+.end method
+
 
 # virtual methods
 .method public final a(Lcom/google/android/gms/internal/measurement/fg;I)Lcom/google/android/gms/internal/measurement/dw$e;
@@ -215,7 +215,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/di;->auq:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/di;->auz:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/di$a;
 
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 a908777866..9a043ac89d 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
@@ -84,7 +84,7 @@
 .method abstract e(Lcom/google/android/gms/internal/measurement/fg;)Z
 .end method
 
-.method abstract sB()Ljava/lang/Object;
+.method abstract sE()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "<UT:",
@@ -102,7 +102,7 @@
     .end annotation
 .end method
 
-.method abstract sC()V
+.method abstract sF()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
@@ -116,7 +116,7 @@
     .end annotation
 .end method
 
-.method abstract sD()V
+.method abstract sG()V
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()V"
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 58e8b966f7..c222d460fc 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aur:Lcom/google/android/gms/internal/measurement/dk;
+.field private static final auA:Lcom/google/android/gms/internal/measurement/dk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dk<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final aus:Lcom/google/android/gms/internal/measurement/dk;
+.field private static final auB:Lcom/google/android/gms/internal/measurement/dk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dk<",
@@ -31,18 +31,18 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/dm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->aur:Lcom/google/android/gms/internal/measurement/dk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->auA:Lcom/google/android/gms/internal/measurement/dk;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sE()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sH()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->aus:Lcom/google/android/gms/internal/measurement/dk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dl;->auB:Lcom/google/android/gms/internal/measurement/dk;
 
     return-void
 .end method
 
-.method private static sE()Lcom/google/android/gms/internal/measurement/dk;
+.method private static sH()Lcom/google/android/gms/internal/measurement/dk;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method static sF()Lcom/google/android/gms/internal/measurement/dk;
+.method static sI()Lcom/google/android/gms/internal/measurement/dk;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,12 +95,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->aur:Lcom/google/android/gms/internal/measurement/dk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->auA:Lcom/google/android/gms/internal/measurement/dk;
 
     return-object v0
 .end method
 
-.method static sG()Lcom/google/android/gms/internal/measurement/dk;
+.method static sJ()Lcom/google/android/gms/internal/measurement/dk;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->aus:Lcom/google/android/gms/internal/measurement/dk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dl;->auB:Lcom/google/android/gms/internal/measurement/dk;
 
     if-eqz v0, :cond_0
 
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 cb84acef3b..41d90c9b4b 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
@@ -88,7 +88,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dw$c;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$c;->sH()Lcom/google/android/gms/internal/measurement/do;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$c;->sK()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object p1
 
@@ -102,7 +102,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->pD()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->pG()V
 
     return-void
 .end method
@@ -140,7 +140,7 @@
     return p1
 .end method
 
-.method final sB()Ljava/lang/Object;
+.method final sE()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -165,7 +165,7 @@
     throw v0
 .end method
 
-.method final sC()V
+.method final sF()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -186,7 +186,7 @@
     throw v0
 .end method
 
-.method final sD()V
+.method final sG()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 56832bad74..5f864938a7 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
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field static final synthetic ant:[I
+.field static final synthetic anC:[I
 
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
@@ -21,14 +21,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/he;->awp:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -42,9 +42,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/he;->axx:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -58,9 +58,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/he;->awq:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -74,9 +74,9 @@
     const/4 v3, 0x4
 
     :try_start_3
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/he;->axy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -90,9 +90,9 @@
     const/4 v4, 0x5
 
     :try_start_4
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/he;->axz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -106,9 +106,9 @@
     const/4 v5, 0x6
 
     :try_start_5
-    sget-object v6, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v6, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/he;->axA:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -122,9 +122,9 @@
     const/4 v6, 0x7
 
     :try_start_6
-    sget-object v7, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v7, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/he;->axB:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -138,9 +138,9 @@
     const/16 v7, 0x8
 
     :try_start_7
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/he;->axC:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -154,9 +154,9 @@
     const/16 v8, 0x9
 
     :try_start_8
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axE:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axN:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -168,9 +168,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axF:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axO:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -184,9 +184,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axD:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -200,9 +200,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axP:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -216,9 +216,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axQ:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -232,9 +232,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axS:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -248,9 +248,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -264,9 +264,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axU:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -280,9 +280,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axV:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -296,9 +296,9 @@
 
     :catch_10
     :try_start_11
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/he;->axR:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -319,12 +319,12 @@
 
     new-array v9, v9, [I
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sput-object v9, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
     :try_start_12
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -336,9 +336,9 @@
 
     :catch_12
     :try_start_13
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -350,9 +350,9 @@
 
     :catch_13
     :try_start_14
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axQ:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axZ:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -364,9 +364,9 @@
 
     :catch_14
     :try_start_15
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axR:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aya:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -378,9 +378,9 @@
 
     :catch_15
     :try_start_16
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axS:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayb:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -392,9 +392,9 @@
 
     :catch_16
     :try_start_17
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayc:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -406,9 +406,9 @@
 
     :catch_17
     :try_start_18
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayd:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -420,9 +420,9 @@
 
     :catch_18
     :try_start_19
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axV:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aye:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
@@ -434,9 +434,9 @@
 
     :catch_19
     :try_start_1a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/hh;->ordinal()I
 
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 b4e3178df9..3aa67cbcc2 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
@@ -15,15 +15,15 @@
 
 
 # static fields
-.field private static final auu:Lcom/google/android/gms/internal/measurement/do;
+.field private static final auD:Lcom/google/android/gms/internal/measurement/do;
 
 
 # instance fields
-.field asy:Z
+.field asH:Z
 
-.field atx:Z
+.field atG:Z
 
-.field final aut:Lcom/google/android/gms/internal/measurement/gb;
+.field final auC:Lcom/google/android/gms/internal/measurement/gb;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gb<",
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/do;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auu:Lcom/google/android/gms/internal/measurement/do;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/do;->auD:Lcom/google/android/gms/internal/measurement/do;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     return-void
 .end method
@@ -77,7 +77,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/do;-><init>(Lcom/google/android/gms/internal/measurement/gb;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pG()V
 
     return-void
 .end method
@@ -96,9 +96,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/do;->pG()V
 
     return-void
 .end method
@@ -112,7 +112,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fl;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fl;->tC()Lcom/google/android/gms/internal/measurement/fl;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fl;->tF()Lcom/google/android/gms/internal/measurement/fl;
 
     move-result-object p0
 
@@ -148,11 +148,11 @@
 
     move-result p1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axE:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axN:Lcom/google/android/gms/internal/measurement/he;
 
     if-ne p0, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->tb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->te()Z
 
     shl-int/lit8 p1, p1, 0x1
 
@@ -175,7 +175,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gb;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -185,7 +185,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tl()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tp()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -201,11 +201,11 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axE:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axN:Lcom/google/android/gms/internal/measurement/he;
 
     if-ne p1, v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->tb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dy;->te()Z
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/fg;
 
@@ -226,7 +226,7 @@
 
     invoke-virtual {p0, p2, v0}, Lcom/google/android/gms/internal/measurement/df;->y(II)V
 
-    sget-object p2, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object p2, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -245,7 +245,7 @@
 
     check-cast p3, Lcom/google/android/gms/internal/measurement/eb;
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/eb;->pG()I
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/eb;->pJ()I
 
     move-result p1
 
@@ -495,7 +495,7 @@
         }
     .end annotation
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v0
 
@@ -532,7 +532,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sJ()Lcom/google/android/gms/internal/measurement/he;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sM()Lcom/google/android/gms/internal/measurement/he;
 
     move-result-object v4
 
@@ -555,7 +555,7 @@
     throw p1
 
     :cond_2
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sJ()Lcom/google/android/gms/internal/measurement/he;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/dq;->sM()Lcom/google/android/gms/internal/measurement/he;
 
     move-result-object v0
 
@@ -568,10 +568,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->asH:Z
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/gb;->a(Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -583,7 +583,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->atf:[I
 
     iget-object p0, p0, Lcom/google/android/gms/internal/measurement/he;->zzs:Lcom/google/android/gms/internal/measurement/hh;
 
@@ -714,21 +714,21 @@
         }
     .end annotation
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->sJ()Lcom/google/android/gms/internal/measurement/he;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->sM()Lcom/google/android/gms/internal/measurement/he;
 
     move-result-object v0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pG()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
 
     move-result v1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v2
 
     if-eqz v2, :cond_3
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pO()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pR()Z
 
     move-result p0
 
@@ -816,7 +816,7 @@
 .method private static b(Lcom/google/android/gms/internal/measurement/he;Ljava/lang/Object;)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->ant:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dn;->anC:[I
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -841,7 +841,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/eb;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/eb;->pG()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/eb;->pJ()I
 
     move-result p0
 
@@ -895,7 +895,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->su()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sx()I
 
     move-result p0
 
@@ -906,7 +906,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->ss()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sv()I
 
     move-result p0
 
@@ -1005,7 +1005,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sx()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sA()I
 
     move-result p0
 
@@ -1016,7 +1016,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sr()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->su()I
 
     move-result p0
 
@@ -1027,7 +1027,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->st()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sw()I
 
     move-result p0
 
@@ -1077,7 +1077,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sv()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sy()I
 
     move-result p0
 
@@ -1088,7 +1088,7 @@
 
     invoke-virtual {p1}, Ljava/lang/Double;->doubleValue()D
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sw()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/df;->sz()I
 
     move-result p0
 
@@ -1137,17 +1137,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sK()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sN()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v3, 0x1
 
     if-ne v1, v2, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v0
 
@@ -1178,7 +1178,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sR()Z
 
     move-result v0
 
@@ -1197,7 +1197,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sO()Z
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sR()Z
 
     move-result p0
 
@@ -1247,21 +1247,21 @@
 
     move-result-object v1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sK()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sN()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     if-ne v2, v3, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->pO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->pR()Z
 
     move-result v2
 
@@ -1277,7 +1277,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pG()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
 
     move-result p0
 
@@ -1296,7 +1296,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pG()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
 
     move-result p0
 
@@ -1316,7 +1316,7 @@
     return p0
 .end method
 
-.method public static sH()Lcom/google/android/gms/internal/measurement/do;
+.method public static sK()Lcom/google/android/gms/internal/measurement/do;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1328,7 +1328,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->auu:Lcom/google/android/gms/internal/measurement/do;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/do;->auD:Lcom/google/android/gms/internal/measurement/do;
 
     return-object v0
 .end method
@@ -1350,15 +1350,15 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v2
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/gb;->ct(I)Ljava/util/Map$Entry;
 
@@ -1381,9 +1381,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tP()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1419,9 +1419,9 @@
     goto :goto_1
 
     :cond_1
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/do;->asy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/do;->asH:Z
 
-    iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asy:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asH:Z
 
     return-object v0
 .end method
@@ -1452,12 +1452,12 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tl()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tp()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
     :cond_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v1
 
@@ -1504,18 +1504,18 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/gb;->a(Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 
     :cond_3
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sK()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sN()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     if-ne v1, v2, :cond_6
 
@@ -1525,7 +1525,7 @@
 
     if-nez v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1540,7 +1540,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sM()Lcom/google/android/gms/internal/measurement/fl;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sP()Lcom/google/android/gms/internal/measurement/fl;
 
     move-result-object p1
 
@@ -1549,25 +1549,25 @@
     :cond_5
     check-cast v1, Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fg;->sR()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fg;->sU()Lcom/google/android/gms/internal/measurement/ff;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sL()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/dq;->sO()Lcom/google/android/gms/internal/measurement/ff;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ff;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ff;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v1, v0, p1}, Lcom/google/android/gms/internal/measurement/gb;->a(Ljava/lang/Comparable;Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
 
     :cond_6
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1599,9 +1599,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/measurement/do;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gb;->equals(Ljava/lang/Object;)Z
 
@@ -1613,7 +1613,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->hashCode()I
 
@@ -1622,28 +1622,28 @@
     return v0
 .end method
 
-.method public final pD()V
+.method public final pG()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atG:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->zza()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->atG:Z
 
     return-void
 .end method
 
-.method public final qB()Z
+.method public final qE()Z
     .locals 3
 
     const/4 v0, 0x0
@@ -1651,15 +1651,15 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v2
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/gb;->ct(I)Ljava/util/Map$Entry;
 
@@ -1679,9 +1679,9 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tP()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -1716,7 +1716,7 @@
     return v0
 .end method
 
-.method public final sI()Ljava/util/Iterator;
+.method public final sL()Ljava/util/Iterator;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1729,13 +1729,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/do;->asH:Z
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/em;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->entrySet()Ljava/util/Set;
 
@@ -1750,7 +1750,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->entrySet()Ljava/util/Set;
 
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 d15cfb0237..1113fcb4b8 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
@@ -14,14 +14,6 @@
 
 
 # static fields
-.field private static final enum auA:Lcom/google/android/gms/internal/measurement/dp;
-
-.field private static final enum auB:Lcom/google/android/gms/internal/measurement/dp;
-
-.field private static final enum auC:Lcom/google/android/gms/internal/measurement/dp;
-
-.field private static final enum auD:Lcom/google/android/gms/internal/measurement/dp;
-
 .field private static final enum auE:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum auF:Lcom/google/android/gms/internal/measurement/dp;
@@ -66,15 +58,17 @@
 
 .field private static final enum auZ:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum auv:Lcom/google/android/gms/internal/measurement/dp;
+.field public static final enum avA:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum auw:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final enum avB:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum aux:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final enum avC:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum auy:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final avD:[Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum auz:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final avE:[Ljava/lang/reflect/Type;
+
+.field private static final synthetic avF:[Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum ava:Lcom/google/android/gms/internal/measurement/dp;
 
@@ -84,7 +78,7 @@
 
 .field private static final enum avd:Lcom/google/android/gms/internal/measurement/dp;
 
-.field public static final enum ave:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final enum ave:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum avf:Lcom/google/android/gms/internal/measurement/dp;
 
@@ -102,7 +96,7 @@
 
 .field private static final enum avm:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final enum avn:Lcom/google/android/gms/internal/measurement/dp;
+.field public static final enum avn:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum avo:Lcom/google/android/gms/internal/measurement/dp;
 
@@ -110,17 +104,23 @@
 
 .field private static final enum avq:Lcom/google/android/gms/internal/measurement/dp;
 
-.field public static final enum avr:Lcom/google/android/gms/internal/measurement/dp;
+.field private static final enum avr:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum avs:Lcom/google/android/gms/internal/measurement/dp;
 
 .field private static final enum avt:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final avu:[Lcom/google/android/gms/internal/measurement/dp;
+.field private static final enum avu:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final avv:[Ljava/lang/reflect/Type;
+.field private static final enum avv:Lcom/google/android/gms/internal/measurement/dp;
 
-.field private static final synthetic avw:[Lcom/google/android/gms/internal/measurement/dp;
+.field private static final enum avw:Lcom/google/android/gms/internal/measurement/dp;
+
+.field private static final enum avx:Lcom/google/android/gms/internal/measurement/dp;
+
+.field private static final enum avy:Lcom/google/android/gms/internal/measurement/dp;
+
+.field private static final enum avz:Lcom/google/android/gms/internal/measurement/dp;
 
 
 # instance fields
@@ -148,9 +148,9 @@
 
     new-instance v6, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ej;->avT:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v1, "DOUBLE"
 
@@ -162,13 +162,13 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v6, Lcom/google/android/gms/internal/measurement/dp;->auv:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/dp;->auE:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avS:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "FLOAT"
 
@@ -180,13 +180,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auw:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auF:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "INT64"
 
@@ -198,13 +198,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->aux:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auG:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "UINT64"
 
@@ -216,13 +216,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auy:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auH:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "INT32"
 
@@ -234,13 +234,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auz:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auI:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "FIXED64"
 
@@ -252,13 +252,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auA:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auJ:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "FIXED32"
 
@@ -270,13 +270,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auB:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auK:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avU:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awd:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "BOOL"
 
@@ -288,13 +288,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auC:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auL:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avV:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awe:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "STRING"
 
@@ -306,13 +306,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auD:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auM:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "MESSAGE"
 
@@ -324,13 +324,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auE:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auN:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awf:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "BYTES"
 
@@ -342,13 +342,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auF:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auO:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "UINT32"
 
@@ -360,13 +360,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auG:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auP:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avX:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awg:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "ENUM"
 
@@ -378,13 +378,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auH:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auQ:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "SFIXED32"
 
@@ -396,13 +396,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auI:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auR:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "SFIXED64"
 
@@ -414,13 +414,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auJ:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auS:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "SINT32"
 
@@ -432,13 +432,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)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;->auT:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "SINT64"
 
@@ -450,13 +450,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auL:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auU:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "GROUP"
 
@@ -468,13 +468,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auM:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auV:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avT:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "DOUBLE_LIST"
 
@@ -486,13 +486,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auN:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auW:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avS:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "FLOAT_LIST"
 
@@ -504,13 +504,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auO:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auX:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "INT64_LIST"
 
@@ -522,13 +522,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auP:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auY:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "UINT64_LIST"
 
@@ -540,13 +540,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auQ:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auZ:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "INT32_LIST"
 
@@ -558,13 +558,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auR:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->ava:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "FIXED64_LIST"
 
@@ -576,13 +576,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auS:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avb:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "FIXED32_LIST"
 
@@ -594,13 +594,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auT: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;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avU:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awd:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "BOOL_LIST"
 
@@ -612,13 +612,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auU:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avd:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avV:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awe:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "STRING_LIST"
 
@@ -630,13 +630,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auV:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->ave:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "MESSAGE_LIST"
 
@@ -648,13 +648,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auW:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avf:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avW:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awf:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "BYTES_LIST"
 
@@ -666,13 +666,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auX:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avg:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "UINT32_LIST"
 
@@ -684,13 +684,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auY:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avh:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avX:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awg:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "ENUM_LIST"
 
@@ -702,13 +702,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->auZ:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avi:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "SFIXED32_LIST"
 
@@ -720,13 +720,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->ava:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avj:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "SFIXED64_LIST"
 
@@ -738,13 +738,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avb:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avk:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "SINT32_LIST"
 
@@ -756,13 +756,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avc:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avl:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "SINT64_LIST"
 
@@ -774,13 +774,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avd:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avm:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avT:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "DOUBLE_LIST_PACKED"
 
@@ -792,13 +792,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->ave:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avS:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "FLOAT_LIST_PACKED"
 
@@ -810,13 +810,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avf:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avo:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "INT64_LIST_PACKED"
 
@@ -828,13 +828,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avg:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avp:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "UINT64_LIST_PACKED"
 
@@ -846,13 +846,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avh:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avq:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "INT32_LIST_PACKED"
 
@@ -864,13 +864,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avi:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avr:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "FIXED64_LIST_PACKED"
 
@@ -882,13 +882,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avj:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avs:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "FIXED32_LIST_PACKED"
 
@@ -900,13 +900,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avk:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avt:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avU:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awd:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "BOOL_LIST_PACKED"
 
@@ -918,13 +918,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avl:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avu:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "UINT32_LIST_PACKED"
 
@@ -936,13 +936,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avm:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avv:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avX:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awg:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "ENUM_LIST_PACKED"
 
@@ -954,13 +954,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avw:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "SFIXED32_LIST_PACKED"
 
@@ -972,13 +972,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avo:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avx:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "SFIXED64_LIST_PACKED"
 
@@ -990,13 +990,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avp:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avy:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "SINT32_LIST_PACKED"
 
@@ -1008,13 +1008,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avq:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avz:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "SINT64_LIST_PACKED"
 
@@ -1026,13 +1026,13 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avr:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avA:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v8, "GROUP_LIST"
 
@@ -1044,13 +1044,13 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avs:Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avB:Lcom/google/android/gms/internal/measurement/dp;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avA:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avJ:Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avP:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
 
     const-string v2, "MAP"
 
@@ -1062,323 +1062,323 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/dp;-><init>(Ljava/lang/String;IILcom/google/android/gms/internal/measurement/dr;Lcom/google/android/gms/internal/measurement/ej;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avt: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;
 
     const/16 v0, 0x33
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/dp;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auv:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auE:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auw:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auF:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x1
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->aux:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auG:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x2
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auy:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auH:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x3
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auz:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auI:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x4
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auA:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auJ:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x5
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auB:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auK:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x6
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auC:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auL:Lcom/google/android/gms/internal/measurement/dp;
 
     const/4 v3, 0x7
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auD:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auM:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x8
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auE:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auN:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x9
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auF:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auO:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0xa
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auG:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auP:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0xb
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auH:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auQ:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0xc
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auI:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auR:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0xd
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auJ:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auS:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0xe
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auK:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auT:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0xf
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auL:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auU:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x10
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auM:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auV:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x11
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auN:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auW:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x12
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auO:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auX:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x13
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auP:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auY:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x14
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auQ:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auZ:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x15
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auR:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->ava:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x16
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auS:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avb:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x17
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auT:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avc:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x18
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auU:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avd:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x19
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auV:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->ave:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x1a
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auW:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avf:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x1b
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auX:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avg:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x1c
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auY:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avh:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x1d
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->auZ:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avi:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x1e
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->ava:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avj:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x1f
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avb:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avk:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x20
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avc:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avl:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x21
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avd:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avm:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x22
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->ave:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x23
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avf:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avo:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x24
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avg:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avp:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x25
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avh:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avq:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x26
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avi:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avr:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x27
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avj:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avs:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x28
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avk:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avt:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x29
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avl:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avu:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x2a
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avm:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avv:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x2b
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avw:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x2c
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avo:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avx:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x2d
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avp:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avy:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x2e
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avq:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avz:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x2f
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avr:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avA:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x30
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avs:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avB:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x31
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avt:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dp;->avC:Lcom/google/android/gms/internal/measurement/dp;
 
     const/16 v3, 0x32
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avw:[Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avF:[Lcom/google/android/gms/internal/measurement/dp;
 
     new-array v0, v2, [Ljava/lang/reflect/Type;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avv:[Ljava/lang/reflect/Type;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dp;->avE:[Ljava/lang/reflect/Type;
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/dp;->values()[Lcom/google/android/gms/internal/measurement/dp;
 
@@ -1388,7 +1388,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/dp;
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/dp;->avu:[Lcom/google/android/gms/internal/measurement/dp;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/dp;->avD:[Lcom/google/android/gms/internal/measurement/dp;
 
     array-length v1, v0
 
@@ -1397,7 +1397,7 @@
 
     aget-object v3, v0, v2
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dp;->avu:[Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dp;->avD:[Lcom/google/android/gms/internal/measurement/dp;
 
     iget v5, v3, Lcom/google/android/gms/internal/measurement/dp;->zzba:I
 
@@ -1430,7 +1430,7 @@
 
     iput-object p5, p0, Lcom/google/android/gms/internal/measurement/dp;->zzaz:Lcom/google/android/gms/internal/measurement/ej;
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/dt;->asW:[I
+    sget-object p1, Lcom/google/android/gms/internal/measurement/dt;->atf:[I
 
     invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/dr;->ordinal()I
 
@@ -1467,11 +1467,11 @@
     :goto_0
     const/4 p1, 0x0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
     if-ne p4, v0, :cond_2
 
-    sget-object p4, Lcom/google/android/gms/internal/measurement/dt;->ant:[I
+    sget-object p4, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
 
     invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/ej;->ordinal()I
 
@@ -1498,7 +1498,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/dp;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dp;->avw:[Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dp;->avF:[Lcom/google/android/gms/internal/measurement/dp;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/dp;->clone()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 a4cbc95be3..e0a9e539ac 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
@@ -20,23 +20,23 @@
 
 
 # virtual methods
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
 
-.method public abstract pO()Z
+.method public abstract pR()Z
 .end method
 
-.method public abstract qd()Z
+.method public abstract qg()Z
 .end method
 
-.method public abstract sJ()Lcom/google/android/gms/internal/measurement/he;
+.method public abstract sM()Lcom/google/android/gms/internal/measurement/he;
 .end method
 
-.method public abstract sK()Lcom/google/android/gms/internal/measurement/hh;
+.method public abstract sN()Lcom/google/android/gms/internal/measurement/hh;
 .end method
 
-.method public abstract sL()Lcom/google/android/gms/internal/measurement/ff;
+.method public abstract sO()Lcom/google/android/gms/internal/measurement/ff;
 .end method
 
-.method public abstract sM()Lcom/google/android/gms/internal/measurement/fl;
+.method public abstract sP()Lcom/google/android/gms/internal/measurement/fl;
 .end method
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 7131fe27f9..e2b4457949 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
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final enum avA:Lcom/google/android/gms/internal/measurement/dr;
+.field public static final enum avG:Lcom/google/android/gms/internal/measurement/dr;
 
-.field private static final synthetic avB:[Lcom/google/android/gms/internal/measurement/dr;
+.field public static final enum avH:Lcom/google/android/gms/internal/measurement/dr;
 
-.field public static final enum avx:Lcom/google/android/gms/internal/measurement/dr;
+.field public static final enum avI:Lcom/google/android/gms/internal/measurement/dr;
 
-.field public static final enum avy:Lcom/google/android/gms/internal/measurement/dr;
+.field public static final enum avJ:Lcom/google/android/gms/internal/measurement/dr;
 
-.field public static final enum avz:Lcom/google/android/gms/internal/measurement/dr;
+.field private static final synthetic avK:[Lcom/google/android/gms/internal/measurement/dr;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v2, v1, v1}, Lcom/google/android/gms/internal/measurement/dr;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dr;
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v0, v3, v2, v2}, Lcom/google/android/gms/internal/measurement/dr;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dr;
 
@@ -61,7 +61,7 @@
 
     invoke-direct {v0, v4, v3, v2}, Lcom/google/android/gms/internal/measurement/dr;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dr;
 
@@ -71,29 +71,29 @@
 
     invoke-direct {v0, v5, v4, v1}, Lcom/google/android/gms/internal/measurement/dr;-><init>(Ljava/lang/String;IZ)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avA:Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avJ:Lcom/google/android/gms/internal/measurement/dr;
 
     const/4 v0, 0x4
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/dr;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avz:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avI:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avA:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avJ:Lcom/google/android/gms/internal/measurement/dr;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avB:[Lcom/google/android/gms/internal/measurement/dr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dr;->avK:[Lcom/google/android/gms/internal/measurement/dr;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/dr;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dr;->avB:[Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dr;->avK:[Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/dr;->clone()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 6b441d5482..e99b6ff208 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
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dt.smali
index 35bded478d..25ce40656c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dt.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field static final synthetic ant:[I
+.field static final synthetic anC:[I
 
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
@@ -21,14 +21,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dt;->ant:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dt;->ant:[I
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->avW:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->awf:Lcom/google/android/gms/internal/measurement/ej;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ej;->ordinal()I
 
@@ -42,9 +42,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/internal/measurement/dt;->ant:[I
+    sget-object v2, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ej;->ordinal()I
 
@@ -58,9 +58,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->ant:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->anC:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ej;->avV:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ej;->awe:Lcom/google/android/gms/internal/measurement/ej;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ej;->ordinal()I
 
@@ -79,12 +79,12 @@
 
     new-array v3, v3, [I
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/dt;->asW:[I
+    sput-object v3, Lcom/google/android/gms/internal/measurement/dt;->atf:[I
 
     :try_start_3
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->asW:[I
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dt;->atf:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avA:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/dr;->avJ:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dr;->ordinal()I
 
@@ -96,9 +96,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dt;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dt;->atf:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/dr;->avy:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/dr;->avH:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dr;->ordinal()I
 
@@ -110,9 +110,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dt;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dt;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avx:Lcom/google/android/gms/internal/measurement/dr;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dr;->avG:Lcom/google/android/gms/internal/measurement/dr;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dr;->ordinal()I
 
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 0d0c76a482..d5e63b8aa2 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
@@ -15,9 +15,9 @@
 
 
 # static fields
-.field private static amV:Ljava/lang/String;
+.field private static ane:Ljava/lang/String;
 
-.field private static final ano:Ljava/util/logging/Logger;
+.field private static final anx:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -34,11 +34,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->ano:Ljava/util/logging/Logger;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->anx:Ljava/util/logging/Logger;
 
     const-string v0, "com.google.protobuf.BlazeGeneratedExtensionRegistryLiteLoader"
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->amV:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/du;->ane:Ljava/lang/String;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/du;->amV:Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/du;->ane:Ljava/lang/String;
 
     goto :goto_0
 
@@ -156,7 +156,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/du;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/du;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v2
 
@@ -233,7 +233,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/du;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/du;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/du;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v2
 
@@ -252,7 +252,7 @@
 
     move-object v10, v2
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/du;->ano:Ljava/util/logging/Logger;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/du;->anx:Ljava/util/logging/Logger;
 
     sget-object v6, Ljava/util/logging/Level;->SEVERE:Ljava/util/logging/Level;
 
@@ -399,7 +399,7 @@
 
 
 # virtual methods
-.method protected abstract sz()Lcom/google/android/gms/internal/measurement/di;
+.method protected abstract sC()Lcom/google/android/gms/internal/measurement/di;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dv.smali
index fb16df06a3..2839c3f0c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dv.smali
@@ -24,11 +24,11 @@
 
 
 # static fields
-.field private static final avC:Lcom/google/android/gms/internal/measurement/dv;
+.field private static final avL:Lcom/google/android/gms/internal/measurement/dv;
 
 
 # instance fields
-.field private avD:[F
+.field private avM:[F
 
 .field private zzc:I
 
@@ -45,9 +45,9 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/dv;-><init>([FI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dv;->avC:Lcom/google/android/gms/internal/measurement/dv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dv;->avL:Lcom/google/android/gms/internal/measurement/dv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/dv;->zzc:I
 
@@ -142,7 +142,7 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-ltz p1, :cond_1
 
@@ -150,7 +150,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     array-length v2, v1
 
@@ -177,7 +177,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/dv;->avD:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     add-int/lit8 v2, p1, 0x1
 
@@ -187,10 +187,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/dv;->avD:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aput p2, v0, p1
 
@@ -248,7 +248,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -284,7 +284,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     array-length v2, v0
 
@@ -294,12 +294,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/dv;->zzc:I
 
@@ -336,7 +336,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dv;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([FI)[F
 
@@ -390,7 +390,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     const/4 v1, 0x0
 
@@ -399,7 +399,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aget v2, v2, v1
 
@@ -431,7 +431,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dv;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aget p1, v0, p1
 
@@ -456,7 +456,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aget v2, v2, v1
 
@@ -477,11 +477,11 @@
 .method public final r(F)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dv;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     array-length v2, v1
 
@@ -499,10 +499,10 @@
 
     invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dv;->zzc:I
 
@@ -518,11 +518,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dv;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aget v1, v0, p1
 
@@ -563,7 +563,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     const/4 v0, 0x0
 
@@ -574,7 +574,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aget v2, v2, v1
 
@@ -588,7 +588,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     add-int/lit8 v0, v1, 0x1
 
@@ -628,11 +628,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dv;->zzc:I
 
@@ -675,11 +675,11 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dv;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avD:[F
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dv;->avM:[F
 
     aget v1, v0, p1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$a.smali
index 0be9ba7b4c..d95f0ea038 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$a.smali
@@ -25,7 +25,7 @@
 
 
 # instance fields
-.field private final avE:Lcom/google/android/gms/internal/measurement/dw;
+.field private final avN:Lcom/google/android/gms/internal/measurement/dw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -45,7 +45,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ci;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$a;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$a;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$b.smali
index 3939a50b62..85f9572842 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$b.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private asy:Z
+.field private asH:Z
 
-.field protected avE:Lcom/google/android/gms/internal/measurement/dw;
+.field protected avN:Lcom/google/android/gms/internal/measurement/dw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TMessageType;"
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final avF:Lcom/google/android/gms/internal/measurement/dw;
+.field private final avO:Lcom/google/android/gms/internal/measurement/dw;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TMessageType;"
@@ -57,7 +57,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cg;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avF:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avO:Lcom/google/android/gms/internal/measurement/dw;
 
     sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->zzd:I
 
@@ -67,11 +67,11 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/dw;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asy:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
 
     return-void
 .end method
@@ -84,7 +84,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -114,26 +114,26 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/fr;->an(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/fw;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/da;->auf:Lcom/google/android/gms/internal/measurement/de;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/da;->auo:Lcom/google/android/gms/internal/measurement/de;
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/da;->auf:Lcom/google/android/gms/internal/measurement/de;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/da;->auo:Lcom/google/android/gms/internal/measurement/de;
 
     goto :goto_0
 
@@ -190,20 +190,20 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/internal/measurement/fr;->an(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/fw;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 v5, 0x0
 
@@ -235,7 +235,7 @@
     throw p2
 
     :catch_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -247,7 +247,7 @@
     throw p1
 .end method
 
-.method private sV()Lcom/google/android/gms/internal/measurement/dw;
+.method private sY()Lcom/google/android/gms/internal/measurement/dw;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -255,18 +255,18 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v1
 
@@ -278,9 +278,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     return-object v0
 .end method
@@ -337,9 +337,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sU()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sX()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     invoke-static {v0, p1}, Lcom/google/android/gms/internal/measurement/dw$b;->a(Lcom/google/android/gms/internal/measurement/dw;Lcom/google/android/gms/internal/measurement/dw;)V
 
@@ -354,7 +354,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avF:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avO:Lcom/google/android/gms/internal/measurement/dw;
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dw;
 
@@ -366,7 +366,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dw$b;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object v1
 
@@ -385,7 +385,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
@@ -396,7 +396,7 @@
     return-object p1
 .end method
 
-.method public final synthetic rI()Lcom/google/android/gms/internal/measurement/cg;
+.method public final synthetic rL()Lcom/google/android/gms/internal/measurement/cg;
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cg;->clone()Ljava/lang/Object;
@@ -408,10 +408,10 @@
     return-object v0
 .end method
 
-.method public final sO()Z
+.method public final sR()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 v1, 0x0
 
@@ -422,22 +422,22 @@
     return v0
 .end method
 
-.method public final synthetic sT()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic sW()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avF:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avO:Lcom/google/android/gms/internal/measurement/dw;
 
     return-object v0
 .end method
 
-.method protected final sU()V
+.method protected final sX()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->zzd:I
 
@@ -447,21 +447,21 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dw;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/dw$b;->a(Lcom/google/android/gms/internal/measurement/dw;Lcom/google/android/gms/internal/measurement/dw;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avE:Lcom/google/android/gms/internal/measurement/dw;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->avN:Lcom/google/android/gms/internal/measurement/dw;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/dw$b;->asH:Z
 
     :cond_0
     return-void
 .end method
 
-.method public final sW()Lcom/google/android/gms/internal/measurement/dw;
+.method public final sZ()Lcom/google/android/gms/internal/measurement/dw;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -469,13 +469,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sO()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sR()Z
 
     move-result v1
 
@@ -491,20 +491,20 @@
     throw v0
 .end method
 
-.method public final synthetic sX()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic ta()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sV()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final synthetic sY()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic tb()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sW()Lcom/google/android/gms/internal/measurement/dw;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/dw$b;->sZ()Lcom/google/android/gms/internal/measurement/dw;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$c.smali
index e331e5bf82..e9a163d5b1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$c.smali
@@ -48,7 +48,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/dw;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/do;->sH()Lcom/google/android/gms/internal/measurement/do;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/do;->sK()Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v0
 
@@ -59,7 +59,7 @@
 
 
 # virtual methods
-.method final sH()Lcom/google/android/gms/internal/measurement/do;
+.method final sK()Lcom/google/android/gms/internal/measurement/do;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -72,7 +72,7 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw$c;->zzc:Lcom/google/android/gms/internal/measurement/do;
 
-    iget-boolean v0, v0, Lcom/google/android/gms/internal/measurement/do;->atx:Z
+    iget-boolean v0, v0, Lcom/google/android/gms/internal/measurement/do;->atG:Z
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$d.smali
index d0c05144ac..49bf8d749c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dw$d.smali
@@ -21,17 +21,17 @@
 
 
 # static fields
-.field public static final enum aeX:I = 0x2
+.field public static final enum afg:I = 0x2
 
-.field public static final enum anl:I = 0x2
+.field public static final enum anu:I = 0x2
 
-.field public static final enum auh:I = 0x1
+.field public static final enum auq:I = 0x1
 
-.field private static final synthetic avG:[I
+.field private static final synthetic avP:[I
 
-.field private static final synthetic avH:[I
+.field private static final synthetic avQ:[I
 
-.field private static final synthetic avI:[I
+.field private static final synthetic avR:[I
 
 .field public static final enum zza:I = 0x1
 
@@ -64,7 +64,7 @@
 
     aput v1, v0, v2
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->anl:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
 
     const/4 v3, 0x1
 
@@ -100,7 +100,7 @@
 
     aput v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avG:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avP:[I
 
     new-array v0, v4, [I
 
@@ -112,27 +112,27 @@
 
     aput v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avH:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avQ:[I
 
     new-array v0, v4, [I
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auh:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
 
     aput v1, v0, v2
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->aeX:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afg:I
 
     aput v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avI:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avR:[I
 
     return-void
 .end method
 
-.method public static sZ()[I
+.method public static tc()[I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avG:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dw$d;->avP:[I
 
     invoke-virtual {v0}, [I->clone()Ljava/lang/Object;
 
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 6cda17dbe9..f41c6728ba 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
@@ -64,7 +64,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/cf;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tW()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tZ()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v0
 
@@ -259,7 +259,7 @@
     return p0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -273,7 +273,7 @@
 
     if-eqz p1, :cond_2
 
-    sget p1, Lcom/google/android/gms/internal/measurement/dw$d;->anl:I
+    sget p1, Lcom/google/android/gms/internal/measurement/dw$d;->anu:I
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/internal/measurement/dw;->bi(I)Ljava/lang/Object;
 
@@ -387,7 +387,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -395,11 +395,11 @@
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/df;->auk:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/df;->aut:Lcom/google/android/gms/internal/measurement/dh;
 
     if-eqz v1, :cond_0
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/df;->auk:Lcom/google/android/gms/internal/measurement/dh;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/df;->aut:Lcom/google/android/gms/internal/measurement/dh;
 
     goto :goto_0
 
@@ -460,7 +460,7 @@
     return p1
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -489,7 +489,7 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -508,7 +508,7 @@
     return v0
 .end method
 
-.method final rH()I
+.method final rK()I
     .locals 1
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dw;->zzc:I
@@ -516,7 +516,7 @@
     return v0
 .end method
 
-.method protected final sN()Lcom/google/android/gms/internal/measurement/dw$b;
+.method protected final sQ()Lcom/google/android/gms/internal/measurement/dw$b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -539,7 +539,7 @@
     return-object v0
 .end method
 
-.method public final sO()Z
+.method public final sR()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -551,7 +551,7 @@
     return v0
 .end method
 
-.method public final sP()Lcom/google/android/gms/internal/measurement/dw$b;
+.method public final sS()Lcom/google/android/gms/internal/measurement/dw$b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -572,7 +572,7 @@
     return-object v0
 .end method
 
-.method public final sQ()I
+.method public final sT()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dw;->zzc:I
@@ -581,7 +581,7 @@
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
@@ -601,7 +601,7 @@
     return v0
 .end method
 
-.method public final synthetic sR()Lcom/google/android/gms/internal/measurement/ff;
+.method public final synthetic sU()Lcom/google/android/gms/internal/measurement/ff;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->zze:I
@@ -617,7 +617,7 @@
     return-object v0
 .end method
 
-.method public final synthetic sS()Lcom/google/android/gms/internal/measurement/ff;
+.method public final synthetic sV()Lcom/google/android/gms/internal/measurement/ff;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->zze:I
@@ -631,7 +631,7 @@
     return-object v0
 .end method
 
-.method public final synthetic sT()Lcom/google/android/gms/internal/measurement/fg;
+.method public final synthetic sW()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
     sget v0, Lcom/google/android/gms/internal/measurement/dw$d;->zzf:I
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dx.smali
index c6c742820d..184f9e85ed 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dx.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final avJ:Lcom/google/android/gms/internal/measurement/dx;
+.field private static final avS:Lcom/google/android/gms/internal/measurement/dx;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/dx;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dx;->avJ:Lcom/google/android/gms/internal/measurement/dx;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dx;->avS:Lcom/google/android/gms/internal/measurement/dx;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static ta()Lcom/google/android/gms/internal/measurement/dx;
+.method public static td()Lcom/google/android/gms/internal/measurement/dx;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dx;->avJ:Lcom/google/android/gms/internal/measurement/dx;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dx;->avS:Lcom/google/android/gms/internal/measurement/dx;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dy.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dy.smali
index 50a693ba8d..30dd8989b7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/dy.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field static final avK:Ljava/nio/charset/Charset;
+.field static final avT:Ljava/nio/charset/Charset;
 
-.field private static final avL:Ljava/nio/charset/Charset;
+.field private static final avU:Ljava/nio/charset/Charset;
 
-.field private static final avM:Ljava/nio/ByteBuffer;
+.field private static final avV:Ljava/nio/ByteBuffer;
 
-.field private static final avN:Lcom/google/android/gms/internal/measurement/da;
+.field private static final avW:Lcom/google/android/gms/internal/measurement/da;
 
 .field public static final zzb:[B
 
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     const-string v0, "ISO-8859-1"
 
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avL:Ljava/nio/charset/Charset;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avU:Ljava/nio/charset/Charset;
 
     const/4 v0, 0x0
 
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avM:Ljava/nio/ByteBuffer;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avV:Ljava/nio/ByteBuffer;
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/dy;->zzb:[B
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avN:Lcom/google/android/gms/internal/measurement/da;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dy;->avW:Lcom/google/android/gms/internal/measurement/da;
 
     return-void
 .end method
@@ -166,7 +166,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sR()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fg;->sU()Lcom/google/android/gms/internal/measurement/ff;
 
     move-result-object p0
 
@@ -176,7 +176,7 @@
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ff;->sX()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/ff;->ta()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p0
 
@@ -198,7 +198,7 @@
 
     new-instance v0, Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v0, p0, v1}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
@@ -224,7 +224,7 @@
     return p0
 .end method
 
-.method static tb()Z
+.method static te()Z
     .locals 1
 
     const/4 v0, 0x0
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 c6273f5935..735aa62f0f 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
@@ -22,11 +22,11 @@
 
 
 # static fields
-.field private static final avO:Lcom/google/android/gms/internal/measurement/dz;
+.field private static final avX:Lcom/google/android/gms/internal/measurement/dz;
 
 
 # instance fields
-.field private ant:[I
+.field private anC:[I
 
 .field private zzc:I
 
@@ -43,9 +43,9 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/dz;-><init>([II)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/dz;->avO:Lcom/google/android/gms/internal/measurement/dz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/dz;->avX:Lcom/google/android/gms/internal/measurement/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/dz;->zzc:I
 
@@ -129,10 +129,10 @@
     return-object p1
 .end method
 
-.method public static tc()Lcom/google/android/gms/internal/measurement/dz;
+.method public static tf()Lcom/google/android/gms/internal/measurement/dz;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/dz;->avO:Lcom/google/android/gms/internal/measurement/dz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/dz;->avX:Lcom/google/android/gms/internal/measurement/dz;
 
     return-object v0
 .end method
@@ -148,7 +148,7 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-ltz p1, :cond_1
 
@@ -156,7 +156,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     array-length v2, v1
 
@@ -183,7 +183,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/dz;->ant:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     add-int/lit8 v2, p1, 0x1
 
@@ -193,10 +193,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/dz;->ant:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aput p2, v0, p1
 
@@ -254,7 +254,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -290,7 +290,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     array-length v2, v0
 
@@ -300,12 +300,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/dz;->zzc:I
 
@@ -346,11 +346,11 @@
 .method public final bR(I)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/dz;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     array-length v2, v1
 
@@ -368,10 +368,10 @@
 
     invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dz;->zzc:I
 
@@ -389,7 +389,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dz;->ci(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aget p1, v0, p1
 
@@ -405,7 +405,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/dz;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([II)[I
 
@@ -459,7 +459,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     const/4 v1, 0x0
 
@@ -468,7 +468,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aget v2, v2, v1
 
@@ -515,7 +515,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aget v2, v2, v1
 
@@ -532,11 +532,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dz;->ci(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aget v1, v0, p1
 
@@ -577,7 +577,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     const/4 v0, 0x0
 
@@ -588,7 +588,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aget v2, v2, v1
 
@@ -602,7 +602,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     add-int/lit8 v0, v1, 0x1
 
@@ -642,11 +642,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/dz;->zzc:I
 
@@ -689,11 +689,11 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/dz;->ci(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->ant:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dz;->anC:[I
 
     aget v1, v0, p1
 
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 e449024c27..40fb168123 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
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final synthetic asn:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asw:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -17,9 +17,9 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/e;->asn:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/e;->asw:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/e;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/e;->asx:Landroid/app/Activity;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/e;->zzd:Ljava/lang/String;
 
@@ -40,13 +40,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->asn:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->asw:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->aso:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/e;->asx:Landroid/app/Activity;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
@@ -56,7 +56,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/e;->zze:Ljava/lang/String;
 
-    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/e;->anp:J
+    iget-wide v5, p0, Lcom/google/android/gms/internal/measurement/e;->any:J
 
     invoke-interface/range {v1 .. v6}, Lcom/google/android/gms/internal/measurement/kv;->setCurrentScreen(Lcom/google/android/gms/a/a;Ljava/lang/String;Ljava/lang/String;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eb.smali
index c93fd82b33..99a0aa91d9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eb.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
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 eb51bb59e7..b390ce42d1 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
@@ -32,8 +32,8 @@
     .end annotation
 .end method
 
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
-.method public abstract rJ()V
+.method public abstract rM()V
 .end method
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 9fa65799c0..af3818e564 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
@@ -20,7 +20,7 @@
     return-void
 .end method
 
-.method static td()Lcom/google/android/gms/internal/measurement/eh;
+.method static tg()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
@@ -32,7 +32,7 @@
     return-object v0
 .end method
 
-.method static te()Lcom/google/android/gms/internal/measurement/eh;
+.method static th()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
@@ -44,7 +44,7 @@
     return-object v0
 .end method
 
-.method static tf()Lcom/google/android/gms/internal/measurement/eh;
+.method static ti()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
@@ -56,7 +56,7 @@
     return-object v0
 .end method
 
-.method static tg()Lcom/google/android/gms/internal/measurement/eh;
+.method static tj()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
@@ -68,7 +68,7 @@
     return-object v0
 .end method
 
-.method static th()Lcom/google/android/gms/internal/measurement/eh;
+.method static tk()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
@@ -80,7 +80,7 @@
     return-object v0
 .end method
 
-.method static ti()Lcom/google/android/gms/internal/measurement/eg;
+.method static tl()Lcom/google/android/gms/internal/measurement/eg;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eg;
@@ -92,7 +92,7 @@
     return-object v0
 .end method
 
-.method static tj()Lcom/google/android/gms/internal/measurement/eh;
+.method static tm()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
@@ -104,7 +104,7 @@
     return-object v0
 .end method
 
-.method static tk()Lcom/google/android/gms/internal/measurement/eh;
+.method static tn()Lcom/google/android/gms/internal/measurement/eh;
     .locals 2
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eh;
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 eee390fcbd..0cbf9fce56 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
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static tl()Lcom/google/android/gms/internal/measurement/fg;
+.method public static tp()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
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 d24bb12770..ba697a5bd9 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
@@ -14,27 +14,27 @@
 
 
 # static fields
-.field public static final enum avP:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avQ:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avR:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avS:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avT:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avU:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avV:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avW:Lcom/google/android/gms/internal/measurement/ej;
-
-.field public static final enum avX:Lcom/google/android/gms/internal/measurement/ej;
-
 .field public static final enum avY:Lcom/google/android/gms/internal/measurement/ej;
 
-.field private static final synthetic avZ:[Lcom/google/android/gms/internal/measurement/ej;
+.field public static final enum avZ:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awa:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awb:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awc:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awd:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awe:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awf:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awg:Lcom/google/android/gms/internal/measurement/ej;
+
+.field public static final enum awh:Lcom/google/android/gms/internal/measurement/ej;
+
+.field private static final synthetic awi:[Lcom/google/android/gms/internal/measurement/ej;
 
 
 # instance fields
@@ -79,7 +79,7 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v6, Lcom/google/android/gms/internal/measurement/ej;->avP:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -101,7 +101,7 @@
 
     invoke-direct/range {v7 .. v12}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-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/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -123,7 +123,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -145,7 +145,7 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avS:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -167,7 +167,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avT:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -185,7 +185,7 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avU:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awd:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -203,7 +203,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avV:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awe:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -211,7 +211,7 @@
 
     const-class v12, Lcom/google/android/gms/internal/measurement/cn;
 
-    sget-object v13, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v13, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     const-string v9, "BYTE_STRING"
 
@@ -221,7 +221,7 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avW:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awf:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -239,7 +239,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avX:Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awg:Lcom/google/android/gms/internal/measurement/ej;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/ej;
 
@@ -257,71 +257,71 @@
 
     invoke-direct/range {v8 .. v13}, Lcom/google/android/gms/internal/measurement/ej;-><init>(Ljava/lang/String;ILjava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;)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;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     const/16 v0, 0xa
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/ej;
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->avP:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
 
     aput-object v2, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avQ:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avZ:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avR:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awa:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avS:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awb:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avT:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awc:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avU:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awd:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avV:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awe:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avW:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awf:Lcom/google/android/gms/internal/measurement/ej;
 
     const/4 v2, 0x7
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avX:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awg:Lcom/google/android/gms/internal/measurement/ej;
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->avY:Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ej;->awh:Lcom/google/android/gms/internal/measurement/ej;
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->avZ:[Lcom/google/android/gms/internal/measurement/ej;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ej;->awi:[Lcom/google/android/gms/internal/measurement/ej;
 
     return-void
 .end method
@@ -354,7 +354,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/ej;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ej;->avZ:[Lcom/google/android/gms/internal/measurement/ej;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ej;->awi:[Lcom/google/android/gms/internal/measurement/ej;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/ej;->clone()Ljava/lang/Object;
 
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 f714f13c10..00efd18173 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
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field awa:Ljava/util/Map$Entry;
+.field awj:Ljava/util/Map$Entry;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map$Entry<",
@@ -49,7 +49,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ek;->awa:Ljava/util/Map$Entry;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ek;->awj:Ljava/util/Map$Entry;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awa:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awj:Ljava/util/Map$Entry;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -84,7 +84,7 @@
 .method public final getValue()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awa:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awj:Ljava/util/Map$Entry;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -99,7 +99,7 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tl()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ei;->tp()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -113,7 +113,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awa:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ek;->awj:Ljava/util/Map$Entry;
 
     invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -123,15 +123,15 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/fg;
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/el;->awb:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/el;->awk:Lcom/google/android/gms/internal/measurement/cn;
 
-    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object v2, v0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
-    iput-object p1, v0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p1, v0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     return-object v1
 
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 e1c46b0356..3348dd8b0d 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
@@ -4,26 +4,26 @@
 
 
 # static fields
-.field private static final atV:Lcom/google/android/gms/internal/measurement/di;
+.field private static final aue:Lcom/google/android/gms/internal/measurement/di;
 
 
 # instance fields
-.field awb:Lcom/google/android/gms/internal/measurement/cn;
+.field awk:Lcom/google/android/gms/internal/measurement/cn;
 
-.field volatile awc:Lcom/google/android/gms/internal/measurement/fg;
+.field volatile awl:Lcom/google/android/gms/internal/measurement/fg;
 
-.field volatile awd:Lcom/google/android/gms/internal/measurement/cn;
+.field volatile awm:Lcom/google/android/gms/internal/measurement/cn;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/el;->atV:Lcom/google/android/gms/internal/measurement/di;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/el;->aue:Lcom/google/android/gms/internal/measurement/di;
 
     return-void
 .end method
@@ -39,14 +39,14 @@
 .method private final f(Lcom/google/android/gms/internal/measurement/fg;)Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     if-eqz v0, :cond_0
 
@@ -58,11 +58,11 @@
 
     :cond_0
     :try_start_1
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
     :try_end_1
     .catch Lcom/google/android/gms/internal/measurement/eh; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -71,11 +71,11 @@
 
     :catch_0
     :try_start_2
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
-    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     :goto_0
     monitor-exit p0
@@ -93,7 +93,7 @@
 
     :cond_1
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     return-object p1
 .end method
@@ -121,19 +121,19 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/internal/measurement/el;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     if-nez v0, :cond_2
 
     if-nez v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/el;->tm()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/el;->tq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->tm()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/el;->tq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object p1
 
@@ -157,7 +157,7 @@
     :cond_3
     if-eqz v0, :cond_4
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sT()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sW()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -172,7 +172,7 @@
     return p1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fg;->sT()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fg;->sW()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -195,29 +195,29 @@
     return v0
 .end method
 
-.method public final pH()I
+.method public final pK()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sQ()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sT()I
 
     move-result v0
 
@@ -229,14 +229,14 @@
     return v0
 .end method
 
-.method public final tm()Lcom/google/android/gms/internal/measurement/cn;
+.method public final tq()Lcom/google/android/gms/internal/measurement/cn;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     return-object v0
 
@@ -244,38 +244,38 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     monitor-exit p0
 
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
     if-nez v0, :cond_2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awc:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awl:Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->rF()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->rI()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awd:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/el;->awm:Lcom/google/android/gms/internal/measurement/cn;
 
     monitor-exit p0
 
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 2a3c454a1e..b816944496 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
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field private awe:Ljava/util/Iterator;
+.field private awn:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/em;->awe:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/em;->awn: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/internal/measurement/em;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awn:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -74,7 +74,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awn:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -105,7 +105,7 @@
 .method public final remove()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/em;->awn:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->remove()V
 
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 d4ae24dfb4..1a2d5b6c30 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
@@ -13,7 +13,7 @@
 .method public abstract cm(I)Ljava/lang/Object;
 .end method
 
-.method public abstract qi()Ljava/util/List;
+.method public abstract ql()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -23,5 +23,5 @@
     .end annotation
 .end method
 
-.method public abstract tn()Lcom/google/android/gms/internal/measurement/en;
+.method public abstract tr()Lcom/google/android/gms/internal/measurement/en;
 .end method
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 7ad42a87fa..7e08ffd60f 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
@@ -20,13 +20,13 @@
 
 
 # static fields
-.field private static final awf:Lcom/google/android/gms/internal/measurement/eo;
+.field private static final awo:Lcom/google/android/gms/internal/measurement/eo;
 
-.field private static final awg:Lcom/google/android/gms/internal/measurement/en;
+.field private static final awp:Lcom/google/android/gms/internal/measurement/en;
 
 
 # instance fields
-.field private final awh:Ljava/util/List;
+.field private final awq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,13 +45,13 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/eo;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awf:Lcom/google/android/gms/internal/measurement/eo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awo:Lcom/google/android/gms/internal/measurement/eo;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/eo;->awf:Lcom/google/android/gms/internal/measurement/eo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/eo;->awo:Lcom/google/android/gms/internal/measurement/eo;
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awg:Lcom/google/android/gms/internal/measurement/en;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eo;->awp:Lcom/google/android/gms/internal/measurement/en;
 
     return-void
 .end method
@@ -91,7 +91,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     return-void
 .end method
@@ -114,7 +114,7 @@
 
     check-cast p0, Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->rA()Ljava/lang/String;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/cn;->rD()Ljava/lang/String;
 
     move-result-object p0
 
@@ -135,9 +135,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/cn;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -155,9 +155,9 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
@@ -182,7 +182,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     instance-of v0, p2, Lcom/google/android/gms/internal/measurement/en;
 
@@ -190,12 +190,12 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/en;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/en;->qi()Ljava/util/List;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/en;->ql()Ljava/util/List;
 
     move-result-object p2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->addAll(ILjava/util/Collection;)Z
 
@@ -246,7 +246,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
@@ -267,9 +267,9 @@
 .method public final clear()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -285,7 +285,7 @@
 .method public final cm(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -307,7 +307,7 @@
 .method public final synthetic get(I)Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -328,17 +328,17 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->rA()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->rD()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->nL()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->nO()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1, v1}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -358,7 +358,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1, v1}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -376,17 +376,17 @@
     return v0
 .end method
 
-.method public final bridge synthetic pE()Z
+.method public final bridge synthetic pH()Z
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ch;->pE()Z
+    invoke-super {p0}, Lcom/google/android/gms/internal/measurement/ch;->pH()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public final qi()Ljava/util/List;
+.method public final ql()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -396,7 +396,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-static {v0}, Ljava/util/Collections;->unmodifiableList(Ljava/util/List;)Ljava/util/List;
 
@@ -408,9 +408,9 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -464,9 +464,9 @@
 
     check-cast p2, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0, p1, p2}, Ljava/util/List;->set(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -482,7 +482,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eo;->awq:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -491,10 +491,10 @@
     return v0
 .end method
 
-.method public final tn()Lcom/google/android/gms/internal/measurement/en;
+.method public final tr()Lcom/google/android/gms/internal/measurement/en;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->pE()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->pH()Z
 
     move-result v0
 
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 dcaeea16d9..331f0f3b80 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
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final awi:Lcom/google/android/gms/internal/measurement/ep;
+.field private static final awr:Lcom/google/android/gms/internal/measurement/ep;
 
-.field private static final awj:Lcom/google/android/gms/internal/measurement/ep;
+.field private static final aws:Lcom/google/android/gms/internal/measurement/ep;
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/es;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ep;->awi:Lcom/google/android/gms/internal/measurement/ep;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ep;->awr:Lcom/google/android/gms/internal/measurement/ep;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eq;
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/eq;-><init>(B)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ep;->awj:Lcom/google/android/gms/internal/measurement/ep;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ep;->aws:Lcom/google/android/gms/internal/measurement/ep;
 
     return-void
 .end method
@@ -46,18 +46,18 @@
     return-void
 .end method
 
-.method static tp()Lcom/google/android/gms/internal/measurement/ep;
+.method static ts()Lcom/google/android/gms/internal/measurement/ep;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->awi:Lcom/google/android/gms/internal/measurement/ep;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->awr:Lcom/google/android/gms/internal/measurement/ep;
 
     return-object v0
 .end method
 
-.method static tq()Lcom/google/android/gms/internal/measurement/ep;
+.method static tt()Lcom/google/android/gms/internal/measurement/ep;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->awj:Lcom/google/android/gms/internal/measurement/ep;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ep;->aws:Lcom/google/android/gms/internal/measurement/ep;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eq.smali
index fef00ba8d4..6345972005 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/eq.smali
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v1
 
@@ -130,7 +130,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v3
 
@@ -163,7 +163,7 @@
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ee;->rJ()V
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ee;->rM()V
 
     return-void
 .end method
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 beb1eb03cc..aaeea487b7 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final atW:Ljava/lang/Class;
+.field private static final auf:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -30,7 +30,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/es;->atW:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/es;->auf:Ljava/lang/Class;
 
     return-void
 .end method
@@ -119,7 +119,7 @@
     goto :goto_2
 
     :cond_2
-    sget-object v1, Lcom/google/android/gms/internal/measurement/es;->atW:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/es;->auf:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -186,7 +186,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v2
 
@@ -324,14 +324,14 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/en;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->tn()Lcom/google/android/gms/internal/measurement/en;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->tr()Lcom/google/android/gms/internal/measurement/en;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/es;->atW:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/es;->auf:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -356,13 +356,13 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result p1
 
     if-eqz p1, :cond_2
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->rJ()V
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->rM()V
 
     :cond_2
     return-void
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 70680467f8..a5ce997fc6 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
@@ -7,11 +7,11 @@
 
 
 # static fields
-.field private static final awl:Lcom/google/android/gms/internal/measurement/fd;
+.field private static final awu:Lcom/google/android/gms/internal/measurement/fd;
 
 
 # instance fields
-.field private final awk:Lcom/google/android/gms/internal/measurement/fd;
+.field private final awt:Lcom/google/android/gms/internal/measurement/fd;
 
 
 # direct methods
@@ -22,7 +22,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ew;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/et;->awl:Lcom/google/android/gms/internal/measurement/fd;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/et;->awu:Lcom/google/android/gms/internal/measurement/fd;
 
     return-void
 .end method
@@ -36,7 +36,7 @@
 
     new-array v1, v1, [Lcom/google/android/gms/internal/measurement/fd;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dx;->ta()Lcom/google/android/gms/internal/measurement/dx;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dx;->td()Lcom/google/android/gms/internal/measurement/dx;
 
     move-result-object v2
 
@@ -44,7 +44,7 @@
 
     aput-object v2, v1, v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/et;->tr()Lcom/google/android/gms/internal/measurement/fd;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/et;->tu()Lcom/google/android/gms/internal/measurement/fd;
 
     move-result-object v2
 
@@ -72,7 +72,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/fd;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/et;->awk:Lcom/google/android/gms/internal/measurement/fd;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/et;->awt:Lcom/google/android/gms/internal/measurement/fd;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/fe;)Z
     .locals 1
 
-    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fe;->pG()I
+    invoke-interface {p0}, Lcom/google/android/gms/internal/measurement/fe;->pJ()I
 
     move-result p0
 
@@ -98,7 +98,7 @@
     return p0
 .end method
 
-.method private static tr()Lcom/google/android/gms/internal/measurement/fd;
+.method private static tu()Lcom/google/android/gms/internal/measurement/fd;
     .locals 4
 
     :try_start_0
@@ -133,7 +133,7 @@
     return-object v0
 
     :catch_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/et;->awl:Lcom/google/android/gms/internal/measurement/fd;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/et;->awu:Lcom/google/android/gms/internal/measurement/fd;
 
     return-object v0
 .end method
@@ -156,7 +156,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/fy;->t(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/et;->awk:Lcom/google/android/gms/internal/measurement/fd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/et;->awt:Lcom/google/android/gms/internal/measurement/fd;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/fd;->r(Ljava/lang/Class;)Lcom/google/android/gms/internal/measurement/fe;
 
@@ -176,15 +176,15 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tM()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tP()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sF()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sI()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tB()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tE()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -195,15 +195,15 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tK()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tN()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object p1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sG()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sJ()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v0
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tB()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/fe;->tE()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -228,23 +228,23 @@
 
     if-eqz p1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tE()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tH()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tq()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tt()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tM()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tP()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sF()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sI()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tz()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tC()Lcom/google/android/gms/internal/measurement/ez;
 
     move-result-object v6
 
@@ -255,21 +255,21 @@
     return-object p1
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tE()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tH()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tq()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tt()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tM()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tP()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tz()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tC()Lcom/google/android/gms/internal/measurement/ez;
 
     move-result-object v6
 
@@ -286,23 +286,23 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tD()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tG()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tp()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->ts()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tK()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tN()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object v4
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sG()Lcom/google/android/gms/internal/measurement/dk;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/dl;->sJ()Lcom/google/android/gms/internal/measurement/dk;
 
     move-result-object v5
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ty()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tB()Lcom/google/android/gms/internal/measurement/ez;
 
     move-result-object v6
 
@@ -313,21 +313,21 @@
     return-object p1
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tD()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tG()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->tp()Lcom/google/android/gms/internal/measurement/ep;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ep;->ts()Lcom/google/android/gms/internal/measurement/ep;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tL()Lcom/google/android/gms/internal/measurement/gn;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tO()Lcom/google/android/gms/internal/measurement/gn;
 
     move-result-object v4
 
     const/4 v5, 0x0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->ty()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tB()Lcom/google/android/gms/internal/measurement/ez;
 
     move-result-object v6
 
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 8d414941e1..0fae049f10 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
@@ -22,11 +22,11 @@
 
 
 # static fields
-.field private static final awm:Lcom/google/android/gms/internal/measurement/eu;
+.field private static final awv:Lcom/google/android/gms/internal/measurement/eu;
 
 
 # instance fields
-.field private awn:[J
+.field private aww:[J
 
 .field private zzc:I
 
@@ -43,9 +43,9 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/eu;-><init>([JI)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/eu;->awm:Lcom/google/android/gms/internal/measurement/eu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/eu;->awv:Lcom/google/android/gms/internal/measurement/eu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
     return-void
 .end method
@@ -69,7 +69,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/eu;->zzc:I
 
@@ -129,10 +129,10 @@
     return-object p1
 .end method
 
-.method public static ts()Lcom/google/android/gms/internal/measurement/eu;
+.method public static tv()Lcom/google/android/gms/internal/measurement/eu;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/eu;->awm:Lcom/google/android/gms/internal/measurement/eu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/eu;->awv:Lcom/google/android/gms/internal/measurement/eu;
 
     return-object v0
 .end method
@@ -142,11 +142,11 @@
 .method public final T(J)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/eu;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     array-length v2, v1
 
@@ -164,10 +164,10 @@
 
     invoke-static {v1, v3, v2, v3, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iput-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/eu;->zzc:I
 
@@ -189,7 +189,7 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-ltz p1, :cond_1
 
@@ -197,7 +197,7 @@
 
     if-gt p1, p2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     array-length v3, v2
 
@@ -224,7 +224,7 @@
 
     invoke-static {v2, v3, p2, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     add-int/lit8 v3, p1, 0x1
 
@@ -234,10 +234,10 @@
 
     invoke-static {v2, p1, p2, v3, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aput-wide v0, p2, p1
 
@@ -295,7 +295,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -331,7 +331,7 @@
 
     add-int/2addr v3, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     array-length v2, v0
 
@@ -341,12 +341,12 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     :cond_2
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     iget v4, p0, Lcom/google/android/gms/internal/measurement/eu;->zzc:I
 
@@ -389,7 +389,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/eu;->bR(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aget-wide v1, v0, p1
 
@@ -405,7 +405,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/eu;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->copyOf([JI)[J
 
@@ -459,7 +459,7 @@
     return v3
 
     :cond_2
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     const/4 v1, 0x0
 
@@ -468,7 +468,7 @@
 
     if-ge v1, v2, :cond_4
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aget-wide v4, v2, v1
 
@@ -517,7 +517,7 @@
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aget-wide v3, v2, v1
 
@@ -538,11 +538,11 @@
 .method public final synthetic remove(I)Ljava/lang/Object;
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/eu;->bR(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aget-wide v1, v0, p1
 
@@ -583,7 +583,7 @@
 .method public final remove(Ljava/lang/Object;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     const/4 v0, 0x0
 
@@ -594,7 +594,7 @@
 
     if-ge v1, v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aget-wide v3, v2, v1
 
@@ -608,7 +608,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     add-int/lit8 v0, v1, 0x1
 
@@ -648,11 +648,11 @@
 .method protected final removeRange(II)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-lt p2, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/eu;->zzc:I
 
@@ -695,11 +695,11 @@
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/eu;->bR(I)V
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->awn:[J
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/eu;->aww:[J
 
     aget-wide v2, p2, p1
 
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 c608e3391b..6dd332c0e7 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private awo:[Lcom/google/android/gms/internal/measurement/fd;
+.field private awx:[Lcom/google/android/gms/internal/measurement/fd;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ev;->awo:[Lcom/google/android/gms/internal/measurement/fd;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ev;->awx:[Lcom/google/android/gms/internal/measurement/fd;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->awo:[Lcom/google/android/gms/internal/measurement/fd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->awx:[Lcom/google/android/gms/internal/measurement/fd;
 
     array-length v1, v0
 
@@ -76,7 +76,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->awo:[Lcom/google/android/gms/internal/measurement/fd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ev;->awx:[Lcom/google/android/gms/internal/measurement/fd;
 
     array-length v1, v0
 
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 d679c8a151..f1bb7aa8f8 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
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field public final atE:Ljava/lang/Object;
+.field public final atN:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TK;"
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field public final atP:Ljava/lang/Object;
+.field public final atY:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -33,6 +33,6 @@
     .end annotation
 .end field
 
-.field public final awp:Lcom/google/android/gms/internal/measurement/he;
+.field public final awy:Lcom/google/android/gms/internal/measurement/he;
 
-.field public final awq:Lcom/google/android/gms/internal/measurement/he;
+.field public final awz:Lcom/google/android/gms/internal/measurement/he;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ey.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ey.smali
index 73771efe8f..badeeb46a0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ey.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ey.smali
@@ -31,7 +31,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ex;->awp:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ex;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     const/4 v1, 0x1
 
@@ -39,7 +39,7 @@
 
     move-result p1
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ex;->awq:Lcom/google/android/gms/internal/measurement/he;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     const/4 v0, 0x2
 
@@ -73,13 +73,13 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->awp:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     const/4 v1, 0x1
 
     invoke-static {p0, v0, v1, p2}, Lcom/google/android/gms/internal/measurement/do;->a(Lcom/google/android/gms/internal/measurement/df;Lcom/google/android/gms/internal/measurement/he;ILjava/lang/Object;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ex;->awq:Lcom/google/android/gms/internal/measurement/he;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     const/4 p2, 0x2
 
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 0ebfe3f8e7..a94c5b2f9e 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
@@ -40,10 +40,10 @@
 .method public abstract e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 .end method
 
-.method public abstract tt()Ljava/lang/Object;
+.method public abstract tw()Ljava/lang/Object;
 .end method
 
-.method public abstract tu()Lcom/google/android/gms/internal/measurement/ex;
+.method public abstract tx()Lcom/google/android/gms/internal/measurement/ex;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
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 12d0cac2dd..4226457206 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/f;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/f;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/f;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/f;->anq:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -32,15 +32,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/f;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/f;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/f;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/f;->anq:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/f;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/f;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->beginAdUnitExposure(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 4c6521f5fb..c7a6a2ad5d 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
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field private static final awr:Lcom/google/android/gms/internal/measurement/fa;
+.field private static final awA:Lcom/google/android/gms/internal/measurement/fa;
 
 
 # instance fields
@@ -33,7 +33,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fa;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fa;->awr:Lcom/google/android/gms/internal/measurement/fa;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fa;->awA:Lcom/google/android/gms/internal/measurement/fa;
 
     const/4 v1, 0x0
 
@@ -107,7 +107,7 @@
     throw p0
 .end method
 
-.method public static tv()Lcom/google/android/gms/internal/measurement/fa;
+.method public static ty()Lcom/google/android/gms/internal/measurement/fa;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -121,7 +121,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fa;->awr:Lcom/google/android/gms/internal/measurement/fa;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fa;->awA:Lcom/google/android/gms/internal/measurement/fa;
 
     return-object v0
 .end method
@@ -131,7 +131,7 @@
 .method public final clear()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tA()V
 
     invoke-super {p0}, Ljava/util/LinkedHashMap;->clear()V
 
@@ -346,7 +346,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tA()V
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/dy;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -369,7 +369,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tA()V
 
     invoke-interface {p1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -416,7 +416,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/fa;->tA()V
 
     invoke-super {p0, p1}, Ljava/util/LinkedHashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -425,7 +425,24 @@
     return-object p1
 .end method
 
-.method public final tw()Lcom/google/android/gms/internal/measurement/fa;
+.method final tA()V
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fa;->zza:Z
+
+    if-eqz v0, :cond_0
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-direct {v0}, Ljava/lang/UnsupportedOperationException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final tz()Lcom/google/android/gms/internal/measurement/fa;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -454,20 +471,3 @@
 
     return-object v0
 .end method
-
-.method final tx()V
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fa;->zza:Z
-
-    if-eqz v0, :cond_0
-
-    return-void
-
-    :cond_0
-    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/measurement/fb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fb.smali
index d899f13134..2c4a7d64b5 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
@@ -4,31 +4,47 @@
 
 
 # static fields
-.field private static final aws:Lcom/google/android/gms/internal/measurement/ez;
+.field private static final awB:Lcom/google/android/gms/internal/measurement/ez;
 
-.field private static final awt:Lcom/google/android/gms/internal/measurement/ez;
+.field private static final awC:Lcom/google/android/gms/internal/measurement/ez;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tA()Lcom/google/android/gms/internal/measurement/ez;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fb;->tD()Lcom/google/android/gms/internal/measurement/ez;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->aws:Lcom/google/android/gms/internal/measurement/ez;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->awB:Lcom/google/android/gms/internal/measurement/ez;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/fc;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->awt:Lcom/google/android/gms/internal/measurement/ez;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fb;->awC:Lcom/google/android/gms/internal/measurement/ez;
 
     return-void
 .end method
 
-.method private static tA()Lcom/google/android/gms/internal/measurement/ez;
+.method static tB()Lcom/google/android/gms/internal/measurement/ez;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fb;->awB:Lcom/google/android/gms/internal/measurement/ez;
+
+    return-object v0
+.end method
+
+.method static tC()Lcom/google/android/gms/internal/measurement/ez;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fb;->awC:Lcom/google/android/gms/internal/measurement/ez;
+
+    return-object v0
+.end method
+
+.method private static tD()Lcom/google/android/gms/internal/measurement/ez;
     .locals 3
 
     :try_start_0
@@ -63,19 +79,3 @@
 
     return-object v0
 .end method
-
-.method static ty()Lcom/google/android/gms/internal/measurement/ez;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fb;->aws:Lcom/google/android/gms/internal/measurement/ez;
-
-    return-object v0
-.end method
-
-.method static tz()Lcom/google/android/gms/internal/measurement/ez;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fb;->awt:Lcom/google/android/gms/internal/measurement/ez;
-
-    return-object v0
-.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 5b37be0376..91ce0a0fc3 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
@@ -151,12 +151,12 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->tw()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->tz()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object p1
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->tx()V
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/fa;->tA()V
 
     invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/fa;->isEmpty()Z
 
@@ -170,21 +170,21 @@
     return-object p1
 .end method
 
-.method public final tt()Ljava/lang/Object;
+.method public final tw()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fa;->tv()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fa;->ty()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fa;->tw()Lcom/google/android/gms/internal/measurement/fa;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fa;->tz()Lcom/google/android/gms/internal/measurement/fa;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final tu()Lcom/google/android/gms/internal/measurement/ex;
+.method public final tx()Lcom/google/android/gms/internal/measurement/ex;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 897e09c4ad..3867fa3726 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
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
 
-.method public abstract tB()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract tE()Lcom/google/android/gms/internal/measurement/fg;
 .end method
 
 .method public abstract zzb()Z
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 e238a2dced..651f9d64f8 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
@@ -27,8 +27,8 @@
     .end annotation
 .end method
 
-.method public abstract sX()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract ta()Lcom/google/android/gms/internal/measurement/fg;
 .end method
 
-.method public abstract sY()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract tb()Lcom/google/android/gms/internal/measurement/fg;
 .end method
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 93253060e0..d6f3bad7c9 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
@@ -15,14 +15,14 @@
     .end annotation
 .end method
 
-.method public abstract rF()Lcom/google/android/gms/internal/measurement/cn;
+.method public abstract rI()Lcom/google/android/gms/internal/measurement/cn;
 .end method
 
-.method public abstract sQ()I
+.method public abstract sT()I
 .end method
 
-.method public abstract sR()Lcom/google/android/gms/internal/measurement/ff;
+.method public abstract sU()Lcom/google/android/gms/internal/measurement/ff;
 .end method
 
-.method public abstract sS()Lcom/google/android/gms/internal/measurement/ff;
+.method public abstract sV()Lcom/google/android/gms/internal/measurement/ff;
 .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 5aa12a6588..a3d7151e75 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
@@ -618,7 +618,7 @@
 
     if-eqz v7, :cond_13
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-virtual {v11, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -635,7 +635,7 @@
 
     check-cast v7, Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/fg;->sT()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/fg;->sW()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v7
 
@@ -707,7 +707,7 @@
 
     iget-object v3, v3, Lcom/google/android/gms/internal/measurement/dw$c;->zzc:Lcom/google/android/gms/internal/measurement/do;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->sI()Ljava/util/Iterator;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->sL()Ljava/util/Iterator;
 
     move-result-object v3
 
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 9022ce5199..07e40b7464 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
@@ -4,8 +4,8 @@
 
 
 # virtual methods
-.method public abstract sO()Z
+.method public abstract sR()Z
 .end method
 
-.method public abstract sT()Lcom/google/android/gms/internal/measurement/fg;
+.method public abstract sW()Lcom/google/android/gms/internal/measurement/fg;
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fj.smali
index c5666d34de..6093c8b03a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fj.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
@@ -19,12 +19,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
     :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axC:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -38,9 +38,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axP:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -54,9 +54,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awp:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -70,9 +70,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axB:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -86,9 +86,9 @@
 
     :catch_3
     :try_start_4
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axS:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -102,9 +102,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axA:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -118,9 +118,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -134,9 +134,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axx:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -150,9 +150,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axR:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -166,9 +166,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -182,9 +182,9 @@
 
     :catch_9
     :try_start_a
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axQ:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -198,9 +198,9 @@
 
     :catch_a
     :try_start_b
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awq:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -214,9 +214,9 @@
 
     :catch_b
     :try_start_c
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -230,9 +230,9 @@
 
     :catch_c
     :try_start_d
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axF:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axO:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -246,9 +246,9 @@
 
     :catch_d
     :try_start_e
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axU:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -262,9 +262,9 @@
 
     :catch_e
     :try_start_f
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axV:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -278,9 +278,9 @@
 
     :catch_f
     :try_start_10
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axD:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fk.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fk.smali
index 3379284a02..42b891ecfb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fk.smali
@@ -20,19 +20,29 @@
 
 
 # static fields
-.field private static final asW:[I
+.field private static final atf:[I
 
-.field private static final awu:Lsun/misc/Unsafe;
+.field private static final awD:Lsun/misc/Unsafe;
 
 
 # instance fields
-.field private final anm:[I
+.field private final anv:[I
 
-.field private final avG:[I
+.field private final avP:[I
 
-.field private final awA:Lcom/google/android/gms/internal/measurement/ep;
+.field private final awE:[Ljava/lang/Object;
 
-.field private final awB:Lcom/google/android/gms/internal/measurement/gn;
+.field private final awF:Lcom/google/android/gms/internal/measurement/fg;
+
+.field private final awG:I
+
+.field private final awH:I
+
+.field private final awI:Lcom/google/android/gms/internal/measurement/fo;
+
+.field private final awJ:Lcom/google/android/gms/internal/measurement/ep;
+
+.field private final awK:Lcom/google/android/gms/internal/measurement/gn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gn<",
@@ -41,7 +51,7 @@
     .end annotation
 .end field
 
-.field private final awC:Lcom/google/android/gms/internal/measurement/dk;
+.field private final awL:Lcom/google/android/gms/internal/measurement/dk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dk<",
@@ -50,17 +60,7 @@
     .end annotation
 .end field
 
-.field private final awD:Lcom/google/android/gms/internal/measurement/ez;
-
-.field private final awv:[Ljava/lang/Object;
-
-.field private final aww:Lcom/google/android/gms/internal/measurement/fg;
-
-.field private final awx:I
-
-.field private final awy:I
-
-.field private final awz:Lcom/google/android/gms/internal/measurement/fo;
+.field private final awM:Lcom/google/android/gms/internal/measurement/ez;
 
 .field private final zze:I
 
@@ -83,13 +83,13 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->asW:[I
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->atf:[I
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->tY()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->ub()Lsun/misc/Unsafe;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     return-void
 .end method
@@ -116,9 +116,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awv:[Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
 
     iput p3, p0, Lcom/google/android/gms/internal/measurement/fk;->zze:I
 
@@ -152,23 +152,23 @@
 
     iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fk;->zzk:Z
 
-    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iput-object p7, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
-    iput p8, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iput p8, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
-    iput p9, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iput p9, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
-    iput-object p10, p0, Lcom/google/android/gms/internal/measurement/fk;->awz:Lcom/google/android/gms/internal/measurement/fo;
+    iput-object p10, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/fo;
 
-    iput-object p11, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iput-object p11, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
-    iput-object p12, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iput-object p12, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
-    iput-object p13, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iput-object p13, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/fk;->aww:Lcom/google/android/gms/internal/measurement/fg;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/fg;
 
-    iput-object p14, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iput-object p14, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     return-void
 .end method
@@ -199,7 +199,7 @@
 .method private final J(II)I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v0, v0
 
@@ -216,7 +216,7 @@
 
     mul-int/lit8 v2, v1, 0x3
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v3, v3, v2
 
@@ -303,9 +303,9 @@
 
     move-object/from16 v11, p13
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 v13, v6, 0x2
 
@@ -394,7 +394,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v3, v4}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -580,7 +580,7 @@
     goto :goto_4
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -590,7 +590,7 @@
     :goto_4
     new-instance v5, Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v5, v3, v2, v4, v6}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -610,7 +610,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     const-wide/16 v5, 0x0
 
@@ -690,7 +690,7 @@
 
     move-result v2
 
-    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v3, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -809,7 +809,7 @@
 
     move-object/from16 v7, p14
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     invoke-virtual {v11, v1, v9, v10}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -817,7 +817,7 @@
 
     check-cast v11, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v11}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v11}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v12
 
@@ -843,7 +843,7 @@
 
     move-result-object v11
 
-    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v12, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     invoke-virtual {v12, v1, v9, v10, v11}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -944,7 +944,7 @@
 
     move-result v1
 
-    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v4, v5}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -960,7 +960,7 @@
     goto/16 :goto_1e
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -975,7 +975,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v8, v9}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -998,7 +998,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v8, v9}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -1044,7 +1044,7 @@
     goto/16 :goto_1e
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1125,7 +1125,7 @@
 
     iget-object v3, v1, Lcom/google/android/gms/internal/measurement/dw;->zzb:Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tW()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tZ()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v4
 
@@ -1138,7 +1138,7 @@
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     move/from16 v6, p6
 
@@ -1177,7 +1177,7 @@
 
     if-nez v4, :cond_b
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-interface {v11, v4}, Lcom/google/android/gms/internal/measurement/ee;->add(Ljava/lang/Object;)Z
 
@@ -1220,7 +1220,7 @@
 
     if-nez v4, :cond_c
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-interface {v11, v4}, Lcom/google/android/gms/internal/measurement/ee;->add(Ljava/lang/Object;)Z
 
@@ -1236,28 +1236,28 @@
     goto :goto_8
 
     :cond_d
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_e
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_f
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_10
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1320,7 +1320,7 @@
     :cond_11
     new-instance v8, Ljava/lang/String;
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v8, v3, v4, v6, v9}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -1357,7 +1357,7 @@
     :cond_12
     new-instance v8, Ljava/lang/String;
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v8, v3, v4, v6, v9}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -1366,14 +1366,14 @@
     goto :goto_a
 
     :cond_13
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_14
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1405,7 +1405,7 @@
 
     new-instance v9, Ljava/lang/String;
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v9, v3, v4, v6, v10}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -1450,7 +1450,7 @@
 
     new-instance v9, Ljava/lang/String;
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/dy;->avK:Ljava/nio/charset/Charset;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/dy;->avT:Ljava/nio/charset/Charset;
 
     invoke-direct {v9, v3, v4, v6, v10}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -1459,28 +1459,28 @@
     goto :goto_c
 
     :cond_18
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_19
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_1a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
     throw v1
 
     :cond_1b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->te()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1508,7 +1508,7 @@
 
     move-result v2
 
-    iget-wide v5, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v5, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     cmp-long v8, v5, v14
 
@@ -1532,7 +1532,7 @@
     goto/16 :goto_7
 
     :cond_1e
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1547,7 +1547,7 @@
 
     move-result v4
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     cmp-long v6, v8, v14
 
@@ -1578,7 +1578,7 @@
 
     move-result v4
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     cmp-long v6, v8, v14
 
@@ -1628,7 +1628,7 @@
     goto/16 :goto_1e
 
     :cond_23
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1698,7 +1698,7 @@
     goto/16 :goto_1e
 
     :cond_26
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1784,7 +1784,7 @@
 
     move-result v1
 
-    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v4, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-virtual {v11, v4, v5}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
@@ -1796,7 +1796,7 @@
     goto/16 :goto_1e
 
     :cond_2a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1811,7 +1811,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-virtual {v11, v8, v9}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
@@ -1830,7 +1830,7 @@
 
     move-result v1
 
-    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-virtual {v11, v8, v9}, Lcom/google/android/gms/internal/measurement/eu;->T(J)V
 
@@ -1868,7 +1868,7 @@
     goto :goto_1e
 
     :cond_2d
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -1938,7 +1938,7 @@
     goto :goto_1e
 
     :cond_30
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v1
 
@@ -2041,7 +2041,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     invoke-direct {p0, p5}, Lcom/google/android/gms/internal/measurement/fk;->cm(I)Ljava/lang/Object;
 
@@ -2049,7 +2049,7 @@
 
     move-result-object p5
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v1, p5}, Lcom/google/android/gms/internal/measurement/ez;->W(Ljava/lang/Object;)Z
 
@@ -2057,13 +2057,13 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->tt()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/android/gms/internal/measurement/ez;->tw()Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v2, v1, p5}, Lcom/google/android/gms/internal/measurement/ez;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2072,13 +2072,13 @@
     move-object p5, v1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ez;->tu()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object p1
 
-    iget-object p6, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object p6, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {p6, p5}, Lcom/google/android/gms/internal/measurement/ez;->af(Ljava/lang/Object;)Ljava/util/Map;
 
@@ -2098,9 +2098,9 @@
 
     add-int/2addr p6, p3
 
-    iget-object p7, p1, Lcom/google/android/gms/internal/measurement/ex;->atE:Ljava/lang/Object;
+    iget-object p7, p1, Lcom/google/android/gms/internal/measurement/ex;->atN:Ljava/lang/Object;
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->atP:Ljava/lang/Object;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
 
     :goto_0
     if-ge p3, p6, :cond_5
@@ -2135,15 +2135,15 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ex;->awq:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     iget v1, v1, Lcom/google/android/gms/internal/measurement/he;->zzt:I
 
     if-ne v3, v1, :cond_4
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ex;->awq:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
 
-    iget-object p3, p1, Lcom/google/android/gms/internal/measurement/ex;->atP:Ljava/lang/Object;
+    iget-object p3, p1, Lcom/google/android/gms/internal/measurement/ex;->atY:Ljava/lang/Object;
 
     invoke-virtual {p3}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -2164,13 +2164,13 @@
     goto :goto_0
 
     :cond_3
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ex;->awp:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/ex;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     iget v1, v1, Lcom/google/android/gms/internal/measurement/he;->zzt:I
 
     if-ne v3, v1, :cond_4
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ex;->awp:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/ex;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     const/4 v5, 0x0
 
@@ -2204,14 +2204,14 @@
     return p6
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 
     :cond_7
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->td()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tg()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -2243,7 +2243,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->asW:[I
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fj;->atf:[I
 
     invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/he;->ordinal()I
 
@@ -2273,7 +2273,7 @@
 
     move-result p0
 
-    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {p1, p2}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -2307,7 +2307,7 @@
     goto/16 :goto_3
 
     :pswitch_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object p3
 
@@ -2326,7 +2326,7 @@
 
     move-result p0
 
-    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -2421,7 +2421,7 @@
 
     move-result p0
 
-    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide p1, p5, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     const-wide/16 p3, 0x0
 
@@ -2499,7 +2499,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/fu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fu;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/fu;->pJ()I
 
     move-result v1
 
@@ -2517,7 +2517,7 @@
     const/4 v11, 0x0
 
     :goto_0
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/fu;->amV:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/fu;->ane:Ljava/lang/String;
 
     invoke-virtual {v1}, Ljava/lang/String;->length()I
 
@@ -2617,7 +2617,7 @@
     :goto_4
     if-nez v9, :cond_5
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->asW:[I
+    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->atf:[I
 
     move-object v15, v8
 
@@ -3028,9 +3028,9 @@
     move/from16 v12, v35
 
     :goto_12
-    sget-object v6, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fu;->awO:[Ljava/lang/Object;
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fu;->awX:[Ljava/lang/Object;
 
     iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fu;->zza:Lcom/google/android/gms/internal/measurement/fg;
 
@@ -3853,11 +3853,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fk;->cm(I)Ljava/lang/Object;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ez;->tu()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object p1
 
@@ -3901,7 +3901,7 @@
 
     if-nez p5, :cond_1
 
-    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/gn;->rz()Ljava/lang/Object;
+    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/gn;->rC()Ljava/lang/Object;
 
     move-result-object p5
 
@@ -3922,7 +3922,7 @@
 
     move-result-object v1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cw;->aue:Lcom/google/android/gms/internal/measurement/df;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/cw;->aun:Lcom/google/android/gms/internal/measurement/df;
 
     :try_start_0
     invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
@@ -3937,7 +3937,7 @@
     :try_end_0
     .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cw;->rM()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cw;->rP()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v0
 
@@ -3976,7 +3976,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v3, v0, p2
 
@@ -4008,7 +4008,7 @@
     return-object p3
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/ez;->af(Ljava/lang/Object;)Ljava/util/Map;
 
@@ -4131,15 +4131,15 @@
 
     if-eqz p3, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-direct {p0, p4}, Lcom/google/android/gms/internal/measurement/fk;->cm(I)Ljava/lang/Object;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ez;->tu()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object p4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v0, p3}, Lcom/google/android/gms/internal/measurement/ez;->ag(Ljava/lang/Object;)Ljava/util/Map;
 
@@ -4171,7 +4171,7 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->sm()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->sp()Ljava/lang/String;
 
     move-result-object p2
 
@@ -4188,7 +4188,7 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->qW()Ljava/lang/String;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->qZ()Ljava/lang/String;
 
     move-result-object p2
 
@@ -4201,7 +4201,7 @@
 
     int-to-long v0, p2
 
-    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p3}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object p2
 
@@ -4364,13 +4364,13 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/dw;->zzb:Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tW()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tZ()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v0
 
@@ -4429,13 +4429,13 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v3
 
-    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v5, v3, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/gb;->isEmpty()Z
 
@@ -4443,7 +4443,7 @@
 
     if-nez v5, :cond_0
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->sI()Ljava/util/Iterator;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/do;->sL()Ljava/util/Iterator;
 
     move-result-object v3
 
@@ -4463,11 +4463,11 @@
     :goto_0
     const/4 v6, -0x1
 
-    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v7, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v7, v7
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     move-object v10, v5
 
@@ -4482,7 +4482,7 @@
 
     move-result v12
 
-    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v13, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v14, v13, v5
 
@@ -4546,7 +4546,7 @@
     :goto_3
     if-eqz v10, :cond_4
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v4, v10}, Lcom/google/android/gms/internal/measurement/dk;->a(Ljava/util/Map$Entry;)I
 
@@ -4554,7 +4554,7 @@
 
     if-gt v4, v14, :cond_4
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v4, v10}, Lcom/google/android/gms/internal/measurement/dk;->b(Ljava/util/Map$Entry;)V
 
@@ -4882,7 +4882,7 @@
     goto/16 :goto_4
 
     :pswitch_13
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -4901,7 +4901,7 @@
     goto/16 :goto_4
 
     :pswitch_14
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -4920,7 +4920,7 @@
     :pswitch_15
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -4937,7 +4937,7 @@
     :pswitch_16
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -4954,7 +4954,7 @@
     :pswitch_17
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -4971,7 +4971,7 @@
     :pswitch_18
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -4988,7 +4988,7 @@
     :pswitch_19
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5005,7 +5005,7 @@
     :pswitch_1a
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5022,7 +5022,7 @@
     :pswitch_1b
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5039,7 +5039,7 @@
     :pswitch_1c
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5056,7 +5056,7 @@
     :pswitch_1d
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5073,7 +5073,7 @@
     :pswitch_1e
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5090,7 +5090,7 @@
     :pswitch_1f
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5107,7 +5107,7 @@
     :pswitch_20
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5124,7 +5124,7 @@
     :pswitch_21
     const/4 v14, 0x1
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5139,7 +5139,7 @@
     goto/16 :goto_4
 
     :pswitch_22
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5158,7 +5158,7 @@
     :pswitch_23
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5175,7 +5175,7 @@
     :pswitch_24
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5192,7 +5192,7 @@
     :pswitch_25
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5209,7 +5209,7 @@
     :pswitch_26
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5226,7 +5226,7 @@
     :pswitch_27
     const/4 v14, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5241,7 +5241,7 @@
     goto/16 :goto_4
 
     :pswitch_28
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5256,7 +5256,7 @@
     goto/16 :goto_4
 
     :pswitch_29
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5275,7 +5275,7 @@
     goto/16 :goto_4
 
     :pswitch_2a
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5290,7 +5290,7 @@
     goto/16 :goto_4
 
     :pswitch_2b
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5309,7 +5309,7 @@
     :pswitch_2c
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5326,7 +5326,7 @@
     :pswitch_2d
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5343,7 +5343,7 @@
     :pswitch_2e
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5360,7 +5360,7 @@
     :pswitch_2f
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5377,7 +5377,7 @@
     :pswitch_30
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5394,7 +5394,7 @@
     :pswitch_31
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5411,7 +5411,7 @@
     :pswitch_32
     const/4 v15, 0x0
 
-    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v5
 
@@ -5717,7 +5717,7 @@
     :goto_6
     if-eqz v4, :cond_9
 
-    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v5, v0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v5, v4}, Lcom/google/android/gms/internal/measurement/dk;->b(Ljava/util/Map$Entry;)V
 
@@ -5741,7 +5741,7 @@
     goto :goto_6
 
     :cond_9
-    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v3, v0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v3, v1, v2}, Lcom/google/android/gms/internal/measurement/fk;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hk;)V
 
@@ -5835,7 +5835,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v1, v1, p3
 
@@ -5890,7 +5890,7 @@
 .method private final bS(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 p1, p1, 0x2
 
@@ -5955,7 +5955,7 @@
 .method private final cm(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awv:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
 
     div-int/lit8 p1, p1, 0x3
 
@@ -5973,7 +5973,7 @@
 
     shl-int/lit8 p1, p1, 0x1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awv:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
 
     aget-object v0, v0, p1
 
@@ -5984,11 +5984,11 @@
     return-object v0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awv:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
 
     add-int/lit8 v2, p1, 0x1
 
@@ -6000,7 +6000,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awv:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
 
     aput-object v0, v1, p1
 
@@ -6010,7 +6010,7 @@
 .method private final cp(I)Lcom/google/android/gms/internal/measurement/ed;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awv:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awE:[Ljava/lang/Object;
 
     div-int/lit8 p1, p1, 0x3
 
@@ -6028,7 +6028,7 @@
 .method private final cq(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 p1, p1, 0x1
 
@@ -6318,7 +6318,7 @@
     return v2
 
     :pswitch_7
-    sget-object p2, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/internal/measurement/gu;->o(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -6374,7 +6374,7 @@
 
     if-eqz p2, :cond_c
 
-    sget-object p2, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object p2, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-virtual {p2, p1}, Lcom/google/android/gms/internal/measurement/cn;->equals(Ljava/lang/Object;)Z
 
@@ -6737,7 +6737,7 @@
 
     move-object/from16 v9, p6
 
-    sget-object v10, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v10, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     const/16 v16, 0x0
 
@@ -6827,7 +6827,7 @@
     goto/16 :goto_16
 
     :cond_2
-    iget-object v1, v15, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v1, v15, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 v18, v2, 0x1
 
@@ -7025,7 +7025,7 @@
 
     move-result v13
 
-    iget-wide v0, v5, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v0, v5, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -7306,7 +7306,7 @@
 
     move/from16 p3, v0
 
-    iget-wide v0, v13, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v0, v13, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     const-wide/16 v19, 0x0
 
@@ -7476,7 +7476,7 @@
 
     move-result v7
 
-    iget-wide v4, v13, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v4, v13, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     move-object v0, v10
 
@@ -7639,7 +7639,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v1
 
@@ -7948,17 +7948,17 @@
 
     move-object/from16 v9, p6
 
-    iget-object v0, v9, Lcom/google/android/gms/internal/measurement/cm;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v0, v9, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sz()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sC()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v1
 
     if-eq v0, v1, :cond_1c
 
-    iget-object v0, v8, Lcom/google/android/gms/internal/measurement/fk;->aww:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v0, v8, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/fg;
 
-    iget-object v1, v9, Lcom/google/android/gms/internal/measurement/cm;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v1, v9, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     move/from16 v10, v24
 
@@ -8005,7 +8005,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/dw$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$c;->sH()Lcom/google/android/gms/internal/measurement/do;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$c;->sK()Lcom/google/android/gms/internal/measurement/do;
 
     new-instance v0, Ljava/lang/NoSuchMethodError;
 
@@ -8129,18 +8129,18 @@
     :cond_20
     const/4 v0, 0x0
 
-    iget v1, v8, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget v1, v8, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_1b
-    iget v4, v8, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget v4, v8, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge v1, v4, :cond_21
 
-    iget-object v4, v8, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object v4, v8, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget v4, v4, v1
 
-    iget-object v5, v8, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v5, v8, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-direct {v8, v11, v4, v0, v5}, Lcom/google/android/gms/internal/measurement/fk;->a(Ljava/lang/Object;ILjava/lang/Object;Lcom/google/android/gms/internal/measurement/gn;)Ljava/lang/Object;
 
@@ -8155,7 +8155,7 @@
     :cond_21
     if-eqz v0, :cond_22
 
-    iget-object v1, v8, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v1, v8, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v1, v11, v0}, Lcom/google/android/gms/internal/measurement/gn;->g(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -8169,7 +8169,7 @@
     goto :goto_1c
 
     :cond_23
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
@@ -8186,7 +8186,7 @@
     return v2
 
     :cond_25
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
@@ -8240,9 +8240,9 @@
 
     if-eqz p3, :cond_1d
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     const/4 v2, 0x0
 
@@ -8253,7 +8253,7 @@
     :cond_0
     :goto_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pJ()I
 
     move-result v5
 
@@ -8269,14 +8269,14 @@
 
     if-ne v5, v6, :cond_3
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_1
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge p2, p3, :cond_1
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget p3, p3, p2
 
@@ -8307,7 +8307,7 @@
     goto :goto_2
 
     :cond_4
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->aww:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/fg;
 
     invoke-virtual {v1, p3, v6, v5}, Lcom/google/android/gms/internal/measurement/dk;->a(Lcom/google/android/gms/internal/measurement/di;Lcom/google/android/gms/internal/measurement/fg;I)Ljava/lang/Object;
 
@@ -8323,7 +8323,7 @@
     move-result-object v4
 
     :cond_5
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sB()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sE()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -8345,14 +8345,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_3
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge p2, p3, :cond_8
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget p3, p3, p2
 
@@ -8393,7 +8393,7 @@
     if-nez v3, :cond_15
 
     :try_start_3
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gn;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gn;->rC()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -8423,7 +8423,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->st()J
 
     move-result-wide v9
 
@@ -8442,7 +8442,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->ss()I
 
     move-result v9
 
@@ -8461,7 +8461,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sb()J
 
     move-result-wide v9
 
@@ -8480,7 +8480,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rX()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sa()I
 
     move-result v9
 
@@ -8495,7 +8495,7 @@
     goto/16 :goto_0
 
     :pswitch_5
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sr()I
 
     move-result v8
 
@@ -8541,7 +8541,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rV()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
 
     move-result v9
 
@@ -8560,7 +8560,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v9
 
@@ -8635,7 +8635,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->mP()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->mS()Z
 
     move-result v9
 
@@ -8654,7 +8654,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
 
     move-result v9
 
@@ -8673,7 +8673,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sk()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()J
 
     move-result-wide v9
 
@@ -8692,7 +8692,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pZ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qc()I
 
     move-result v9
 
@@ -8711,7 +8711,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qy()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qB()J
 
     move-result-wide v9
 
@@ -8730,7 +8730,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qS()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qV()J
 
     move-result-wide v9
 
@@ -8749,7 +8749,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sj()F
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()F
 
     move-result v9
 
@@ -8768,7 +8768,7 @@
 
     int-to-long v7, v7
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->si()D
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()D
 
     move-result-wide v9
 
@@ -8799,9 +8799,9 @@
 
     if-nez v7, :cond_e
 
-    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/ez;->tt()Ljava/lang/Object;
+    invoke-interface {v7}, Lcom/google/android/gms/internal/measurement/ez;->tw()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -8810,7 +8810,7 @@
     goto :goto_6
 
     :cond_e
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v8, v7}, Lcom/google/android/gms/internal/measurement/ez;->W(Ljava/lang/Object;)Z
 
@@ -8818,13 +8818,13 @@
 
     if-eqz v8, :cond_f
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/ez;->tt()Ljava/lang/Object;
+    invoke-interface {v8}, Lcom/google/android/gms/internal/measurement/ez;->tw()Ljava/lang/Object;
 
     move-result-object v8
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v9, v8, v7}, Lcom/google/android/gms/internal/measurement/ez;->e(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -8834,15 +8834,15 @@
 
     :cond_f
     :goto_6
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v5, v7}, Lcom/google/android/gms/internal/measurement/ez;->af(Ljava/lang/Object;)Ljava/util/Map;
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/ez;->tu()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v6}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object v6
 
@@ -8859,7 +8859,7 @@
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     invoke-virtual {v6, p1, v7, v8}, Lcom/google/android/gms/internal/measurement/ep;->a(Ljava/lang/Object;J)Ljava/util/List;
 
@@ -8870,7 +8870,7 @@
     goto/16 :goto_0
 
     :pswitch_14
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8885,7 +8885,7 @@
     goto/16 :goto_0
 
     :pswitch_15
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8900,7 +8900,7 @@
     goto/16 :goto_0
 
     :pswitch_16
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8915,7 +8915,7 @@
     goto/16 :goto_0
 
     :pswitch_17
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8930,7 +8930,7 @@
     goto/16 :goto_0
 
     :pswitch_18
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int/2addr v7, v9
 
@@ -8953,7 +8953,7 @@
     goto/16 :goto_0
 
     :pswitch_19
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8968,7 +8968,7 @@
     goto/16 :goto_0
 
     :pswitch_1a
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8983,7 +8983,7 @@
     goto/16 :goto_0
 
     :pswitch_1b
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -8998,7 +8998,7 @@
     goto/16 :goto_0
 
     :pswitch_1c
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9013,7 +9013,7 @@
     goto/16 :goto_0
 
     :pswitch_1d
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9028,7 +9028,7 @@
     goto/16 :goto_0
 
     :pswitch_1e
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9043,7 +9043,7 @@
     goto/16 :goto_0
 
     :pswitch_1f
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9058,7 +9058,7 @@
     goto/16 :goto_0
 
     :pswitch_20
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9073,7 +9073,7 @@
     goto/16 :goto_0
 
     :pswitch_21
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9088,7 +9088,7 @@
     goto/16 :goto_0
 
     :pswitch_22
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9103,7 +9103,7 @@
     goto/16 :goto_0
 
     :pswitch_23
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9118,7 +9118,7 @@
     goto/16 :goto_0
 
     :pswitch_24
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9133,7 +9133,7 @@
     goto/16 :goto_0
 
     :pswitch_25
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9148,7 +9148,7 @@
     goto/16 :goto_0
 
     :pswitch_26
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int/2addr v7, v9
 
@@ -9171,7 +9171,7 @@
     goto/16 :goto_0
 
     :pswitch_27
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9186,7 +9186,7 @@
     goto/16 :goto_0
 
     :pswitch_28
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9209,7 +9209,7 @@
 
     int-to-long v6, v6
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     invoke-virtual {v8, p1, v6, v7}, Lcom/google/android/gms/internal/measurement/ep;->a(Ljava/lang/Object;J)Ljava/util/List;
 
@@ -9226,7 +9226,7 @@
 
     if-eqz v5, :cond_10
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9241,7 +9241,7 @@
     goto/16 :goto_0
 
     :cond_10
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9256,7 +9256,7 @@
     goto/16 :goto_0
 
     :pswitch_2b
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9271,7 +9271,7 @@
     goto/16 :goto_0
 
     :pswitch_2c
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9286,7 +9286,7 @@
     goto/16 :goto_0
 
     :pswitch_2d
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9301,7 +9301,7 @@
     goto/16 :goto_0
 
     :pswitch_2e
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9316,7 +9316,7 @@
     goto/16 :goto_0
 
     :pswitch_2f
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9331,7 +9331,7 @@
     goto/16 :goto_0
 
     :pswitch_30
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9346,7 +9346,7 @@
     goto/16 :goto_0
 
     :pswitch_31
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9361,7 +9361,7 @@
     goto/16 :goto_0
 
     :pswitch_32
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     and-int v6, v7, v9
 
@@ -9430,7 +9430,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->st()J
 
     move-result-wide v9
 
@@ -9445,7 +9445,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sp()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->ss()I
 
     move-result v5
 
@@ -9460,7 +9460,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sb()J
 
     move-result-wide v9
 
@@ -9475,7 +9475,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rX()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sa()I
 
     move-result v5
 
@@ -9486,7 +9486,7 @@
     goto/16 :goto_0
 
     :pswitch_38
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sr()I
 
     move-result v8
 
@@ -9528,7 +9528,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rV()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
 
     move-result v5
 
@@ -9543,7 +9543,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v5
 
@@ -9615,7 +9615,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->mP()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->mS()Z
 
     move-result v5
 
@@ -9630,7 +9630,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
 
     move-result v5
 
@@ -9645,7 +9645,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sk()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()J
 
     move-result-wide v9
 
@@ -9660,7 +9660,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pZ()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qc()I
 
     move-result v5
 
@@ -9675,7 +9675,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qy()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qB()J
 
     move-result-wide v9
 
@@ -9690,7 +9690,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qS()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qV()J
 
     move-result-wide v9
 
@@ -9705,7 +9705,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sj()F
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sm()F
 
     move-result v5
 
@@ -9720,7 +9720,7 @@
 
     int-to-long v7, v5
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->si()D
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()D
 
     move-result-wide v9
 
@@ -9741,14 +9741,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_9
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge p2, p3, :cond_16
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget p3, p3, p2
 
@@ -9785,14 +9785,14 @@
 
     if-nez v5, :cond_0
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_a
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge p2, p3, :cond_19
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget p3, p3, p2
 
@@ -9815,14 +9815,14 @@
     :catchall_0
     move-exception p2
 
-    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget p3, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_b
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge p3, v1, :cond_1b
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget v1, v1, p3
 
@@ -9947,11 +9947,11 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pJ()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->aeX:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afg:I
 
     const/high16 v2, 0xff00000
 
@@ -9965,7 +9965,7 @@
 
     if-ne v0, v1, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fk;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hk;)V
 
@@ -9973,13 +9973,13 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->isEmpty()Z
 
@@ -9987,15 +9987,15 @@
 
     if-nez v1, :cond_1
 
-    iget-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asy:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/internal/measurement/do;->asH:Z
 
     if-eqz v1, :cond_0
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/em;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tQ()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tT()Ljava/util/Set;
 
     move-result-object v0
 
@@ -10010,9 +10010,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tQ()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->tT()Ljava/util/Set;
 
     move-result-object v0
 
@@ -10035,7 +10035,7 @@
     move-object v1, v0
 
     :goto_1
-    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v7, v7
 
@@ -10048,14 +10048,14 @@
 
     move-result v8
 
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
     :goto_3
     if-eqz v1, :cond_3
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v10, v1}, Lcom/google/android/gms/internal/measurement/dk;->a(Ljava/util/Map$Entry;)I
 
@@ -10063,7 +10063,7 @@
 
     if-le v10, v9, :cond_3
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v10, v1}, Lcom/google/android/gms/internal/measurement/dk;->b(Ljava/util/Map$Entry;)V
 
@@ -10461,7 +10461,7 @@
     goto/16 :goto_4
 
     :pswitch_13
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10484,7 +10484,7 @@
     goto/16 :goto_4
 
     :pswitch_14
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10503,7 +10503,7 @@
     goto/16 :goto_4
 
     :pswitch_15
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10522,7 +10522,7 @@
     goto/16 :goto_4
 
     :pswitch_16
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10541,7 +10541,7 @@
     goto/16 :goto_4
 
     :pswitch_17
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10560,7 +10560,7 @@
     goto/16 :goto_4
 
     :pswitch_18
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10579,7 +10579,7 @@
     goto/16 :goto_4
 
     :pswitch_19
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10598,7 +10598,7 @@
     goto/16 :goto_4
 
     :pswitch_1a
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10617,7 +10617,7 @@
     goto/16 :goto_4
 
     :pswitch_1b
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10636,7 +10636,7 @@
     goto/16 :goto_4
 
     :pswitch_1c
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10655,7 +10655,7 @@
     goto/16 :goto_4
 
     :pswitch_1d
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10674,7 +10674,7 @@
     goto/16 :goto_4
 
     :pswitch_1e
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10693,7 +10693,7 @@
     goto/16 :goto_4
 
     :pswitch_1f
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10712,7 +10712,7 @@
     goto/16 :goto_4
 
     :pswitch_20
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10731,7 +10731,7 @@
     goto/16 :goto_4
 
     :pswitch_21
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10750,7 +10750,7 @@
     goto/16 :goto_4
 
     :pswitch_22
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10769,7 +10769,7 @@
     goto/16 :goto_4
 
     :pswitch_23
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10788,7 +10788,7 @@
     goto/16 :goto_4
 
     :pswitch_24
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10807,7 +10807,7 @@
     goto/16 :goto_4
 
     :pswitch_25
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10826,7 +10826,7 @@
     goto/16 :goto_4
 
     :pswitch_26
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10845,7 +10845,7 @@
     goto/16 :goto_4
 
     :pswitch_27
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10864,7 +10864,7 @@
     goto/16 :goto_4
 
     :pswitch_28
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10883,7 +10883,7 @@
     goto/16 :goto_4
 
     :pswitch_29
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10906,7 +10906,7 @@
     goto/16 :goto_4
 
     :pswitch_2a
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10925,7 +10925,7 @@
     goto/16 :goto_4
 
     :pswitch_2b
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10944,7 +10944,7 @@
     goto/16 :goto_4
 
     :pswitch_2c
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10963,7 +10963,7 @@
     goto/16 :goto_4
 
     :pswitch_2d
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -10982,7 +10982,7 @@
     goto/16 :goto_4
 
     :pswitch_2e
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -11001,7 +11001,7 @@
     goto/16 :goto_4
 
     :pswitch_2f
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -11020,7 +11020,7 @@
     goto/16 :goto_4
 
     :pswitch_30
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -11039,7 +11039,7 @@
     goto/16 :goto_4
 
     :pswitch_31
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -11058,7 +11058,7 @@
     goto/16 :goto_4
 
     :pswitch_32
-    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v9, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v9, v9, v7
 
@@ -11436,7 +11436,7 @@
     :goto_5
     if-eqz v1, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/dk;->b(Ljava/util/Map$Entry;)V
 
@@ -11473,13 +11473,13 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, v0, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->isEmpty()Z
 
@@ -11487,7 +11487,7 @@
 
     if-nez v1, :cond_9
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/do;->sI()Ljava/util/Iterator;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/do;->sL()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -11505,7 +11505,7 @@
     move-object v1, v0
 
     :goto_6
-    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v7, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v7, v7
 
@@ -11520,14 +11520,14 @@
 
     move-result v9
 
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
     :goto_8
     if-eqz v8, :cond_b
 
-    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v11, v8}, Lcom/google/android/gms/internal/measurement/dk;->a(Ljava/util/Map$Entry;)I
 
@@ -11535,7 +11535,7 @@
 
     if-gt v11, v10, :cond_b
 
-    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v11, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v11, v8}, Lcom/google/android/gms/internal/measurement/dk;->b(Ljava/util/Map$Entry;)V
 
@@ -11933,7 +11933,7 @@
     goto/16 :goto_9
 
     :pswitch_58
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -11956,7 +11956,7 @@
     goto/16 :goto_9
 
     :pswitch_59
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -11975,7 +11975,7 @@
     goto/16 :goto_9
 
     :pswitch_5a
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -11994,7 +11994,7 @@
     goto/16 :goto_9
 
     :pswitch_5b
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12013,7 +12013,7 @@
     goto/16 :goto_9
 
     :pswitch_5c
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12032,7 +12032,7 @@
     goto/16 :goto_9
 
     :pswitch_5d
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12051,7 +12051,7 @@
     goto/16 :goto_9
 
     :pswitch_5e
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12070,7 +12070,7 @@
     goto/16 :goto_9
 
     :pswitch_5f
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12089,7 +12089,7 @@
     goto/16 :goto_9
 
     :pswitch_60
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12108,7 +12108,7 @@
     goto/16 :goto_9
 
     :pswitch_61
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12127,7 +12127,7 @@
     goto/16 :goto_9
 
     :pswitch_62
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12146,7 +12146,7 @@
     goto/16 :goto_9
 
     :pswitch_63
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12165,7 +12165,7 @@
     goto/16 :goto_9
 
     :pswitch_64
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12184,7 +12184,7 @@
     goto/16 :goto_9
 
     :pswitch_65
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12203,7 +12203,7 @@
     goto/16 :goto_9
 
     :pswitch_66
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12222,7 +12222,7 @@
     goto/16 :goto_9
 
     :pswitch_67
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12241,7 +12241,7 @@
     goto/16 :goto_9
 
     :pswitch_68
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12260,7 +12260,7 @@
     goto/16 :goto_9
 
     :pswitch_69
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12279,7 +12279,7 @@
     goto/16 :goto_9
 
     :pswitch_6a
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12298,7 +12298,7 @@
     goto/16 :goto_9
 
     :pswitch_6b
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12317,7 +12317,7 @@
     goto/16 :goto_9
 
     :pswitch_6c
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12336,7 +12336,7 @@
     goto/16 :goto_9
 
     :pswitch_6d
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12355,7 +12355,7 @@
     goto/16 :goto_9
 
     :pswitch_6e
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12378,7 +12378,7 @@
     goto/16 :goto_9
 
     :pswitch_6f
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12397,7 +12397,7 @@
     goto/16 :goto_9
 
     :pswitch_70
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12416,7 +12416,7 @@
     goto/16 :goto_9
 
     :pswitch_71
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12435,7 +12435,7 @@
     goto/16 :goto_9
 
     :pswitch_72
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12454,7 +12454,7 @@
     goto/16 :goto_9
 
     :pswitch_73
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12473,7 +12473,7 @@
     goto/16 :goto_9
 
     :pswitch_74
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12492,7 +12492,7 @@
     goto/16 :goto_9
 
     :pswitch_75
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12511,7 +12511,7 @@
     goto/16 :goto_9
 
     :pswitch_76
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12530,7 +12530,7 @@
     goto/16 :goto_9
 
     :pswitch_77
-    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v1
 
@@ -12908,7 +12908,7 @@
     :goto_a
     if-eqz v8, :cond_f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v1, v8}, Lcom/google/android/gms/internal/measurement/dk;->b(Ljava/util/Map$Entry;)V
 
@@ -12934,7 +12934,7 @@
     goto :goto_a
 
     :cond_f
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fk;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;Lcom/google/android/gms/internal/measurement/hk;)V
 
@@ -13124,7 +13124,7 @@
 
     if-eqz v0, :cond_12
 
-    sget-object v9, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v9, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     const/4 v10, -0x1
 
@@ -13200,7 +13200,7 @@
     goto/16 :goto_e
 
     :cond_2
-    iget-object v0, v15, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, v15, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 v1, v4, 0x1
 
@@ -13239,7 +13239,7 @@
 
     move-wide/from16 v19, v1
 
-    iget-wide v0, v11, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v0, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     invoke-static {v0, v1}, Lcom/google/android/gms/internal/measurement/da;->S(J)J
 
@@ -13386,7 +13386,7 @@
 
     move-result v1
 
-    iget-wide v5, v11, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v5, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     const-wide/16 v19, 0x0
 
@@ -13477,7 +13477,7 @@
 
     move-result v6
 
-    iget-wide v4, v11, Lcom/google/android/gms/internal/measurement/cm;->anq:J
+    iget-wide v4, v11, Lcom/google/android/gms/internal/measurement/cm;->anz:J
 
     move-object v0, v9
 
@@ -13556,7 +13556,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ee;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ee;->pH()Z
 
     move-result v3
 
@@ -13823,7 +13823,7 @@
     return-void
 
     :cond_11
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object v0
 
@@ -13882,14 +13882,14 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awy:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awH:I
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget v1, v1, v0
 
@@ -13909,7 +13909,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-interface {v4, v3}, Lcom/google/android/gms/internal/measurement/ez;->ah(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -13923,16 +13923,16 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     array-length v0, v0
 
     :goto_1
     if-ge v1, v0, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget v3, v3, v1
 
@@ -13945,7 +13945,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->aq(Ljava/lang/Object;)V
 
@@ -13953,7 +13953,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ae(Ljava/lang/Object;)V
 
@@ -13969,7 +13969,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v0, v0
 
@@ -13984,7 +13984,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v1
 
@@ -14588,7 +14588,7 @@
     :cond_2
     mul-int/lit8 v2, v2, 0x35
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -14606,7 +14606,7 @@
 
     mul-int/lit8 v2, v2, 0x35
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
@@ -14719,14 +14719,14 @@
 
     if-eqz v2, :cond_13
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     const/4 v6, 0x0
 
     const/4 v7, 0x0
 
     :goto_0
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v8, v8
 
@@ -14740,7 +14740,7 @@
 
     ushr-int/lit8 v9, v9, 0x14
 
-    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v10, v10, v6
 
@@ -14748,19 +14748,19 @@
 
     int-to-long v11, v8
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->ave:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
 
     iget v8, v8, Lcom/google/android/gms/internal/measurement/dp;->zzba:I
 
     if-lt v9, v8, :cond_0
 
-    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->avr:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v8, Lcom/google/android/gms/internal/measurement/dp;->avA:Lcom/google/android/gms/internal/measurement/dp;
 
     iget v8, v8, Lcom/google/android/gms/internal/measurement/dp;->zzba:I
 
     if-gt v9, v8, :cond_0
 
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 v13, v6, 0x2
 
@@ -15084,7 +15084,7 @@
     goto/16 :goto_3
 
     :pswitch_12
-    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v8, v0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-static {v1, v11, v12}, Lcom/google/android/gms/internal/measurement/gu;->o(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -16072,7 +16072,7 @@
     goto/16 :goto_0
 
     :cond_12
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/fk;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;)I
 
@@ -16083,7 +16083,7 @@
     return v7
 
     :cond_13
-    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     const/4 v6, -0x1
 
@@ -16096,7 +16096,7 @@
     const/4 v9, 0x0
 
     :goto_5
-    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v10, v10
 
@@ -16106,7 +16106,7 @@
 
     move-result v10
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v12, v11, v6
 
@@ -16153,19 +16153,19 @@
 
     if-eqz v11, :cond_16
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->ave:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->avn:Lcom/google/android/gms/internal/measurement/dp;
 
     iget v11, v11, Lcom/google/android/gms/internal/measurement/dp;->zzba:I
 
     if-lt v13, v11, :cond_16
 
-    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->avr:Lcom/google/android/gms/internal/measurement/dp;
+    sget-object v11, Lcom/google/android/gms/internal/measurement/dp;->avA:Lcom/google/android/gms/internal/measurement/dp;
 
     iget v11, v11, Lcom/google/android/gms/internal/measurement/dp;->zzba:I
 
     if-gt v13, v11, :cond_16
 
-    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v11, v0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 v14, v6, 0x2
 
@@ -16496,7 +16496,7 @@
     goto/16 :goto_a
 
     :pswitch_57
-    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v10, v0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-virtual {v2, v1, v3, v4}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -17490,7 +17490,7 @@
     goto/16 :goto_5
 
     :cond_28
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v2, v1}, Lcom/google/android/gms/internal/measurement/fk;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;)I
 
@@ -17502,7 +17502,7 @@
 
     if-eqz v2, :cond_2b
 
-    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v2, v0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
@@ -17511,15 +17511,15 @@
     const/4 v2, 0x0
 
     :goto_c
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v3
 
     if-ge v5, v3, :cond_29
 
-    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, v1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v3, v5}, Lcom/google/android/gms/internal/measurement/gb;->ct(I)Ljava/util/Map$Entry;
 
@@ -17546,9 +17546,9 @@
     goto :goto_c
 
     :cond_29
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tP()Ljava/lang/Iterable;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
 
     move-result-object v1
 
@@ -17759,17 +17759,17 @@
     const/4 v3, 0x0
 
     :goto_0
-    iget v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awx:I
+    iget v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awG:I
 
     const/4 v5, 0x1
 
     if-ge v1, v4, :cond_e
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->avG:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->avP:[I
 
     aget v4, v4, v1
 
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v6, v6, v4
 
@@ -17783,7 +17783,7 @@
 
     if-nez v8, :cond_0
 
-    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v8, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     add-int/lit8 v10, v4, 0x2
 
@@ -17797,7 +17797,7 @@
 
     if-eq v10, v2, :cond_1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awu:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/fk;->awD:Lsun/misc/Unsafe;
 
     int-to-long v11, v10
 
@@ -17878,7 +17878,7 @@
     goto/16 :goto_5
 
     :cond_4
-    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     and-int/2addr v7, v9
 
@@ -17900,17 +17900,17 @@
 
     invoke-direct {p0, v4}, Lcom/google/android/gms/internal/measurement/fk;->cm(I)Ljava/lang/Object;
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
-    invoke-interface {v4}, Lcom/google/android/gms/internal/measurement/ez;->tu()Lcom/google/android/gms/internal/measurement/ex;
+    invoke-interface {v4}, Lcom/google/android/gms/internal/measurement/ez;->tx()Lcom/google/android/gms/internal/measurement/ex;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/internal/measurement/ex;->awq:Lcom/google/android/gms/internal/measurement/he;
+    iget-object v4, v4, Lcom/google/android/gms/internal/measurement/ex;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/he;->zzs:Lcom/google/android/gms/internal/measurement/hh;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     if-ne v4, v7, :cond_7
 
@@ -17937,7 +17937,7 @@
 
     if-nez v4, :cond_6
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     move-result-object v4
 
@@ -18067,13 +18067,13 @@
 
     if-eqz v1, :cond_f
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->qB()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->qE()Z
 
     move-result p1
 
@@ -18093,7 +18093,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v0, v0
 
@@ -18591,13 +18591,13 @@
     goto/16 :goto_0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v2, p2}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -18616,13 +18616,13 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
@@ -18724,7 +18724,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     array-length v1, v1
 
@@ -18740,7 +18740,7 @@
 
     int-to-long v2, v2
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anm:[I
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/fk;->anv:[I
 
     aget v4, v4, v0
 
@@ -18799,14 +18799,14 @@
     goto/16 :goto_1
 
     :pswitch_4
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awD:Lcom/google/android/gms/internal/measurement/ez;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awM:Lcom/google/android/gms/internal/measurement/ez;
 
     invoke-static {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/measurement/fy;->a(Lcom/google/android/gms/internal/measurement/ez;Ljava/lang/Object;Ljava/lang/Object;J)V
 
     goto/16 :goto_1
 
     :pswitch_5
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awA:Lcom/google/android/gms/internal/measurement/ep;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awJ:Lcom/google/android/gms/internal/measurement/ep;
 
     invoke-virtual {v1, p1, p2, v2, v3}, Lcom/google/android/gms/internal/measurement/ep;->a(Ljava/lang/Object;Ljava/lang/Object;J)V
 
@@ -19103,7 +19103,7 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awB:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awK:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fy;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -19111,7 +19111,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awC:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awL:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fy;->a(Lcom/google/android/gms/internal/measurement/dk;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -19205,7 +19205,7 @@
     .end packed-switch
 .end method
 
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -19213,9 +19213,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awz:Lcom/google/android/gms/internal/measurement/fo;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fk;->awI:Lcom/google/android/gms/internal/measurement/fo;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->aww:Lcom/google/android/gms/internal/measurement/fg;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fk;->awF:Lcom/google/android/gms/internal/measurement/fg;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/fo;->U(Ljava/lang/Object;)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 8210b64295..46e99bed94 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
@@ -8,5 +8,5 @@
 
 
 # virtual methods
-.method public abstract tC()Lcom/google/android/gms/internal/measurement/fl;
+.method public abstract tF()Lcom/google/android/gms/internal/measurement/fl;
 .end method
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 29ee5e3ce2..b744a3393e 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
@@ -20,9 +20,9 @@
 
 
 # instance fields
-.field private final asy:Z
+.field private final asH:Z
 
-.field private final awE:Lcom/google/android/gms/internal/measurement/gn;
+.field private final awN:Lcom/google/android/gms/internal/measurement/gn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gn<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final awF:Lcom/google/android/gms/internal/measurement/dk;
+.field private final awO:Lcom/google/android/gms/internal/measurement/dk;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/dk<",
@@ -60,15 +60,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/internal/measurement/dk;->e(Lcom/google/android/gms/internal/measurement/fg;)Z
 
     move-result p1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fm;->asy:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/fm;->asH:Z
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fm;->zza:Lcom/google/android/gms/internal/measurement/fg;
 
@@ -119,9 +119,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ap(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -131,7 +131,7 @@
 
     :cond_0
     :try_start_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pJ()I
 
     move-result v3
     :try_end_0
@@ -147,7 +147,7 @@
 
     :cond_1
     :try_start_1
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
 
     move-result v3
 
@@ -171,7 +171,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sF()V
 
     goto :goto_1
 
@@ -183,7 +183,7 @@
     goto :goto_2
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nL()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nO()Z
 
     move-result v3
 
@@ -198,13 +198,13 @@
 
     :cond_5
     :goto_0
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pJ()I
 
     move-result v7
 
     if-eq v7, v4, :cond_9
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
 
     move-result v7
 
@@ -212,7 +212,7 @@
 
     if-ne v7, v8, :cond_6
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rV()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->rY()I
 
     move-result v3
 
@@ -231,26 +231,26 @@
 
     if-eqz v5, :cond_7
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sF()V
 
     goto :goto_0
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v6
 
     goto :goto_0
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nL()Z
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->nO()Z
 
     move-result v7
 
     if-nez v7, :cond_5
 
     :cond_9
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
 
     move-result v4
 
@@ -262,7 +262,7 @@
 
     if-eqz v5, :cond_a
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sD()V
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dk;->sG()V
 
     goto :goto_1
 
@@ -284,7 +284,7 @@
 
     :cond_c
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p2
 
@@ -322,13 +322,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/do;->sI()Ljava/util/Iterator;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/do;->sL()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -351,21 +351,21 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->sK()Lcom/google/android/gms/internal/measurement/hh;
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->sN()Lcom/google/android/gms/internal/measurement/hh;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     if-ne v3, v4, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pO()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pR()Z
 
     move-result v3
 
@@ -375,13 +375,13 @@
 
     if-eqz v3, :cond_0
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pG()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
 
     move-result v2
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ek;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ek;->awa:Ljava/util/Map$Entry;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/ek;->awj:Ljava/util/Map$Entry;
 
     invoke-interface {v1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -389,7 +389,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/el;->tm()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/el;->tq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object v1
 
@@ -398,7 +398,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pG()I
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->pJ()I
 
     move-result v2
 
@@ -420,7 +420,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -453,13 +453,13 @@
 
     iget-object v1, v0, Lcom/google/android/gms/internal/measurement/dw;->zzb:Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tW()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tZ()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v2
 
     if-ne v1, v2, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v1
 
@@ -468,7 +468,7 @@
     :cond_0
     check-cast p1, Lcom/google/android/gms/internal/measurement/dw$c;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$c;->sH()Lcom/google/android/gms/internal/measurement/do;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$c;->sK()Lcom/google/android/gms/internal/measurement/do;
 
     const/4 p1, 0x0
 
@@ -493,9 +493,9 @@
 
     if-ne p3, v3, :cond_2
 
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
-    iget-object v0, p5, Lcom/google/android/gms/internal/measurement/cm;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v0, p5, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/fm;->zza:Lcom/google/android/gms/internal/measurement/fg;
 
@@ -526,7 +526,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     new-instance p1, Ljava/lang/NoSuchMethodError;
 
@@ -583,7 +583,7 @@
     goto :goto_1
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tG()Lcom/google/android/gms/internal/measurement/fr;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fr;->tJ()Lcom/google/android/gms/internal/measurement/fr;
 
     new-instance p1, Ljava/lang/NoSuchMethodError;
 
@@ -600,9 +600,9 @@
 
     iget p3, p5, Lcom/google/android/gms/internal/measurement/cm;->zza:I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
-    iget-object v5, p5, Lcom/google/android/gms/internal/measurement/cm;->atZ:Lcom/google/android/gms/internal/measurement/di;
+    iget-object v5, p5, Lcom/google/android/gms/internal/measurement/cm;->aui:Lcom/google/android/gms/internal/measurement/di;
 
     iget-object v6, p0, Lcom/google/android/gms/internal/measurement/fm;->zza:Lcom/google/android/gms/internal/measurement/fg;
 
@@ -646,7 +646,7 @@
     return-void
 
     :cond_b
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tj()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tm()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -667,11 +667,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->aq(Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ae(Ljava/lang/Object;)V
 
@@ -686,7 +686,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -696,11 +696,11 @@
 
     move-result v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/fm;->asy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/fm;->asH:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v1, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
@@ -726,7 +726,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -740,11 +740,11 @@
 
     add-int/2addr v0, v1
 
-    iget-boolean v2, p0, Lcom/google/android/gms/internal/measurement/fm;->asy:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/internal/measurement/fm;->asH:Z
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v2, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
@@ -753,15 +753,15 @@
     const/4 v2, 0x0
 
     :goto_0
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v3
 
     if-ge v1, v3, :cond_0
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/internal/measurement/gb;->ct(I)Ljava/util/Map$Entry;
 
@@ -778,9 +778,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tP()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -824,13 +824,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->qB()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/do;->qE()Z
 
     move-result p1
 
@@ -845,13 +845,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-virtual {v1, p2}, Lcom/google/android/gms/internal/measurement/gn;->ao(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -868,17 +868,17 @@
     return p1
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fm;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fm;->asH:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-virtual {v0, p2}, Lcom/google/android/gms/internal/measurement/dk;->ac(Ljava/lang/Object;)Lcom/google/android/gms/internal/measurement/do;
 
@@ -904,15 +904,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fy;->a(Lcom/google/android/gms/internal/measurement/gn;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fm;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/fm;->asH:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awF:Lcom/google/android/gms/internal/measurement/dk;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->awO:Lcom/google/android/gms/internal/measurement/dk;
 
     invoke-static {v0, p1, p2}, Lcom/google/android/gms/internal/measurement/fy;->a(Lcom/google/android/gms/internal/measurement/dk;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -920,7 +920,7 @@
     return-void
 .end method
 
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -930,11 +930,11 @@
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fm;->zza:Lcom/google/android/gms/internal/measurement/fg;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sS()Lcom/google/android/gms/internal/measurement/ff;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/fg;->sV()Lcom/google/android/gms/internal/measurement/ff;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ff;->sX()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ff;->ta()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fq.smali
index 96486b7fde..e5596371be 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fq.smali
@@ -4,47 +4,47 @@
 
 
 # static fields
-.field private static final awG:Lcom/google/android/gms/internal/measurement/fo;
+.field private static final awP:Lcom/google/android/gms/internal/measurement/fo;
 
-.field private static final awH:Lcom/google/android/gms/internal/measurement/fo;
+.field private static final awQ:Lcom/google/android/gms/internal/measurement/fo;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tF()Lcom/google/android/gms/internal/measurement/fo;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fq;->tI()Lcom/google/android/gms/internal/measurement/fo;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awG:Lcom/google/android/gms/internal/measurement/fo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awP:Lcom/google/android/gms/internal/measurement/fo;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/fn;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awH:Lcom/google/android/gms/internal/measurement/fo;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fq;->awQ:Lcom/google/android/gms/internal/measurement/fo;
 
     return-void
 .end method
 
-.method static tD()Lcom/google/android/gms/internal/measurement/fo;
+.method static tG()Lcom/google/android/gms/internal/measurement/fo;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awG:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awP:Lcom/google/android/gms/internal/measurement/fo;
 
     return-object v0
 .end method
 
-.method static tE()Lcom/google/android/gms/internal/measurement/fo;
+.method static tH()Lcom/google/android/gms/internal/measurement/fo;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awH:Lcom/google/android/gms/internal/measurement/fo;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fq;->awQ:Lcom/google/android/gms/internal/measurement/fo;
 
     return-object v0
 .end method
 
-.method private static tF()Lcom/google/android/gms/internal/measurement/fo;
+.method private static tI()Lcom/google/android/gms/internal/measurement/fo;
     .locals 3
 
     :try_start_0
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 db58067c11..42cc1dc754 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
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final awI:Lcom/google/android/gms/internal/measurement/fr;
+.field private static final awR:Lcom/google/android/gms/internal/measurement/fr;
 
 
 # instance fields
-.field private final awJ:Lcom/google/android/gms/internal/measurement/fz;
+.field private final awS:Lcom/google/android/gms/internal/measurement/fz;
 
-.field private final awK:Ljava/util/concurrent/ConcurrentMap;
+.field private final awT:Ljava/util/concurrent/ConcurrentMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentMap<",
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/fr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fr;->awI:Lcom/google/android/gms/internal/measurement/fr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fr;->awR:Lcom/google/android/gms/internal/measurement/fr;
 
     return-void
 .end method
@@ -45,21 +45,21 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awK:Ljava/util/concurrent/ConcurrentMap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awT:Ljava/util/concurrent/ConcurrentMap;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/et;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/et;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awJ:Lcom/google/android/gms/internal/measurement/fz;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awS:Lcom/google/android/gms/internal/measurement/fz;
 
     return-void
 .end method
 
-.method public static tG()Lcom/google/android/gms/internal/measurement/fr;
+.method public static tJ()Lcom/google/android/gms/internal/measurement/fr;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fr;->awI:Lcom/google/android/gms/internal/measurement/fr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fr;->awR:Lcom/google/android/gms/internal/measurement/fr;
 
     return-object v0
 .end method
@@ -107,7 +107,7 @@
 
     invoke-static {p1, v0}, Lcom/google/android/gms/internal/measurement/dy;->d(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->awK:Ljava/util/concurrent/ConcurrentMap;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->awT:Ljava/util/concurrent/ConcurrentMap;
 
     invoke-interface {v1, p1}, Ljava/util/concurrent/ConcurrentMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -117,7 +117,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->awJ:Lcom/google/android/gms/internal/measurement/fz;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fr;->awS:Lcom/google/android/gms/internal/measurement/fz;
 
     invoke-interface {v1, p1}, Lcom/google/android/gms/internal/measurement/fz;->s(Ljava/lang/Class;)Lcom/google/android/gms/internal/measurement/fw;
 
@@ -129,7 +129,7 @@
 
     invoke-static {v1, v0}, Lcom/google/android/gms/internal/measurement/dy;->d(Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awK:Ljava/util/concurrent/ConcurrentMap;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fr;->awT: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/fs.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fs.smali
index e1af503aeb..efdb885eb6 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
@@ -4,30 +4,30 @@
 
 
 # static fields
-.field private static final awM:Ljava/lang/reflect/Method;
+.field private static final awV:Ljava/lang/reflect/Method;
 
-.field private static final awN:Ljava/lang/reflect/Method;
+.field private static final awW:Ljava/lang/reflect/Method;
 
 
 # instance fields
-.field private final awL:Landroid/app/job/JobScheduler;
+.field private final awU:Landroid/app/job/JobScheduler;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tH()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tK()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awM:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awV:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tI()Ljava/lang/reflect/Method;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->tL()Ljava/lang/reflect/Method;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awN:Ljava/lang/reflect/Method;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fs;->awW:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fs;->awL:Landroid/app/job/JobScheduler;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fs;->awU:Landroid/app/job/JobScheduler;
 
     return-void
 .end method
@@ -45,12 +45,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/fs;->awM:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awV:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fs;->awL:Landroid/app/job/JobScheduler;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fs;->awU:Landroid/app/job/JobScheduler;
 
     const/4 v2, 0x4
 
@@ -105,7 +105,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/fs;->awL:Landroid/app/job/JobScheduler;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/fs;->awU:Landroid/app/job/JobScheduler;
 
     invoke-virtual {p2, p1}, Landroid/app/job/JobScheduler;->schedule(Landroid/app/job/JobInfo;)I
 
@@ -125,7 +125,7 @@
 
     check-cast v0, Landroid/app/job/JobScheduler;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/fs;->awM:Ljava/lang/reflect/Method;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/fs;->awV:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_1
 
@@ -144,7 +144,7 @@
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/internal/measurement/fs;-><init>(Landroid/app/job/JobScheduler;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->ne()I
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fs;->nh()I
 
     move-result v0
 
@@ -163,10 +163,10 @@
     return p0
 .end method
 
-.method private static ne()I
+.method private static nh()I
     .locals 4
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awN:Ljava/lang/reflect/Method;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fs;->awW:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
@@ -219,7 +219,7 @@
     return v1
 .end method
 
-.method private static tH()Ljava/lang/reflect/Method;
+.method private static tK()Ljava/lang/reflect/Method;
     .locals 5
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -292,7 +292,7 @@
     return-object v0
 .end method
 
-.method private static tI()Ljava/lang/reflect/Method;
+.method private static tL()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/fu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu.smali
index 7fd4cb96f4..5efddcb234 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/fu.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field final amV:Ljava/lang/String;
+.field final ane:Ljava/lang/String;
 
-.field final awO:[Ljava/lang/Object;
+.field final awX:[Ljava/lang/Object;
 
 .field final zza:Lcom/google/android/gms/internal/measurement/fg;
 
@@ -24,9 +24,9 @@
 
     iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fu;->zza:Lcom/google/android/gms/internal/measurement/fg;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fu;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/fu;->ane:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fu;->awO:[Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/fu;->awX:[Ljava/lang/Object;
 
     const/4 p1, 0x0
 
@@ -82,7 +82,7 @@
 
 
 # virtual methods
-.method public final pG()I
+.method public final pJ()I
     .locals 2
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fu;->zzd:I
@@ -103,7 +103,7 @@
     return v0
 .end method
 
-.method public final tB()Lcom/google/android/gms/internal/measurement/fg;
+.method public final tE()Lcom/google/android/gms/internal/measurement/fg;
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fu;->zza:Lcom/google/android/gms/internal/measurement/fg;
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 8566769e35..5a08093d6e 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
@@ -20,7 +20,7 @@
 
 
 # static fields
-.field private static final awP:Lcom/google/android/gms/internal/measurement/fv;
+.field private static final awY:Lcom/google/android/gms/internal/measurement/fv;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/fv<",
@@ -32,7 +32,7 @@
 
 
 # instance fields
-.field private awQ:[Ljava/lang/Object;
+.field private awZ:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -55,9 +55,9 @@
 
     invoke-direct {v0, v2, v1}, Lcom/google/android/gms/internal/measurement/fv;-><init>([Ljava/lang/Object;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fv;->awP:Lcom/google/android/gms/internal/measurement/fv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fv;->awY:Lcom/google/android/gms/internal/measurement/fv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rJ()V
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ch;->rM()V
 
     return-void
 .end method
@@ -86,7 +86,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/ch;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     iput p2, p0, Lcom/google/android/gms/internal/measurement/fv;->zzc:I
 
@@ -146,7 +146,7 @@
     return-object p1
 .end method
 
-.method public static tJ()Lcom/google/android/gms/internal/measurement/fv;
+.method public static tM()Lcom/google/android/gms/internal/measurement/fv;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fv;->awP:Lcom/google/android/gms/internal/measurement/fv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fv;->awY:Lcom/google/android/gms/internal/measurement/fv;
 
     return-object v0
 .end method
@@ -173,7 +173,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     if-ltz p1, :cond_1
 
@@ -181,7 +181,7 @@
 
     if-gt p1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -208,7 +208,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/fv;->awQ:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     add-int/lit8 v2, p1, 0x1
 
@@ -218,10 +218,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/fv;->awQ:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     aput-object p2, v0, p1
 
@@ -259,11 +259,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/fv;->zzc:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -281,10 +281,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/fv;->zzc:I
 
@@ -310,7 +310,7 @@
 
     if-lt p1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     invoke-static {v0, p1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object;
 
@@ -342,7 +342,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fv;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     aget-object p1, v0, p1
 
@@ -357,11 +357,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fv;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     aget-object v1, v0, p1
 
@@ -403,11 +403,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ch;->rA()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/fv;->bI(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awQ:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/fv;->awZ:[Ljava/lang/Object;
 
     aget-object v1, v0, p1
 
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 bfb5079888..39ed68b1ee 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
@@ -112,7 +112,7 @@
     .end annotation
 .end method
 
-.method public abstract rz()Ljava/lang/Object;
+.method public abstract rC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
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 f5d06b1711..579dfee3fd 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
@@ -203,7 +203,7 @@
     .end annotation
 .end method
 
-.method public abstract mP()Z
+.method public abstract mS()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -211,7 +211,7 @@
     .end annotation
 .end method
 
-.method public abstract nL()Z
+.method public abstract nO()Z
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -253,7 +253,7 @@
     .end annotation
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -261,15 +261,7 @@
     .end annotation
 .end method
 
-.method public abstract pH()I
-.end method
-
-.method public abstract pZ()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
+.method public abstract pK()I
 .end method
 
 .method public abstract q(Ljava/util/List;)V
@@ -289,7 +281,7 @@
     .end annotation
 .end method
 
-.method public abstract qS()J
+.method public abstract qB()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -297,7 +289,7 @@
     .end annotation
 .end method
 
-.method public abstract qW()Ljava/lang/String;
+.method public abstract qV()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -305,7 +297,15 @@
     .end annotation
 .end method
 
-.method public abstract qy()J
+.method public abstract qZ()Ljava/lang/String;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract qc()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -330,23 +330,7 @@
     .end annotation
 .end method
 
-.method public abstract rV()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rX()I
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract rY()J
+.method public abstract rY()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -371,7 +355,7 @@
     .end annotation
 .end method
 
-.method public abstract si()D
+.method public abstract sa()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -379,7 +363,7 @@
     .end annotation
 .end method
 
-.method public abstract sj()F
+.method public abstract sb()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -387,7 +371,7 @@
     .end annotation
 .end method
 
-.method public abstract sk()J
+.method public abstract sl()D
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -395,7 +379,7 @@
     .end annotation
 .end method
 
-.method public abstract sl()I
+.method public abstract sm()F
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -403,15 +387,7 @@
     .end annotation
 .end method
 
-.method public abstract sm()Ljava/lang/String;
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Ljava/io/IOException;
-        }
-    .end annotation
-.end method
-
-.method public abstract sn()Lcom/google/android/gms/internal/measurement/cn;
+.method public abstract sn()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -427,7 +403,7 @@
     .end annotation
 .end method
 
-.method public abstract sp()I
+.method public abstract sp()Ljava/lang/String;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -435,7 +411,31 @@
     .end annotation
 .end method
 
-.method public abstract sq()J
+.method public abstract sq()Lcom/google/android/gms/internal/measurement/cn;
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract sr()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract ss()I
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Ljava/io/IOException;
+        }
+    .end annotation
+.end method
+
+.method public abstract st()J
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
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 e338a4ae37..c2a014145f 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final atW:Ljava/lang/Class;
+.field private static final auf:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private static final awE:Lcom/google/android/gms/internal/measurement/gn;
+.field private static final awN:Lcom/google/android/gms/internal/measurement/gn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gn<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private static final awR:Lcom/google/android/gms/internal/measurement/gn;
+.field private static final axa:Lcom/google/android/gms/internal/measurement/gn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gn<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private static final awS:Lcom/google/android/gms/internal/measurement/gn;
+.field private static final axb:Lcom/google/android/gms/internal/measurement/gn;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gn<",
@@ -45,11 +45,11 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tN()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tQ()Ljava/lang/Class;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->atW:Ljava/lang/Class;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->auf:Ljava/lang/Class;
 
     const/4 v0, 0x0
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     const/4 v0, 0x1
 
@@ -65,13 +65,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/gn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->axa:Lcom/google/android/gms/internal/measurement/gn;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gp;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->awS:Lcom/google/android/gms/internal/measurement/gn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/fy;->axb:Lcom/google/android/gms/internal/measurement/gn;
 
     return-void
 .end method
@@ -628,7 +628,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tO()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/fy;->tR()Ljava/lang/Class;
 
     move-result-object v1
 
@@ -744,7 +744,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/gn;->rz()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/gn;->rC()Ljava/lang/Object;
 
     move-result-object p2
 
@@ -1008,7 +1008,7 @@
 
     move-result-object p2
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->isEmpty()Z
 
@@ -1023,15 +1023,15 @@
     const/4 p1, 0x0
 
     :goto_0
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v0
 
     if-ge p1, v0, :cond_0
 
-    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p2, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/gb;->ct(I)Ljava/util/Map$Entry;
 
@@ -1044,9 +1044,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/do;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/do;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tP()Ljava/lang/Iterable;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
 
     move-result-object p1
 
@@ -2329,7 +2329,7 @@
 
     if-nez v0, :cond_1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->atW:Ljava/lang/Class;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->auf:Ljava/lang/Class;
 
     if-eqz v0, :cond_1
 
@@ -2355,7 +2355,7 @@
     return-void
 .end method
 
-.method public static tK()Lcom/google/android/gms/internal/measurement/gn;
+.method public static tN()Lcom/google/android/gms/internal/measurement/gn;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2365,12 +2365,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awE:Lcom/google/android/gms/internal/measurement/gn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awN:Lcom/google/android/gms/internal/measurement/gn;
 
     return-object v0
 .end method
 
-.method public static tL()Lcom/google/android/gms/internal/measurement/gn;
+.method public static tO()Lcom/google/android/gms/internal/measurement/gn;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2380,12 +2380,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awR:Lcom/google/android/gms/internal/measurement/gn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->axa:Lcom/google/android/gms/internal/measurement/gn;
 
     return-object v0
 .end method
 
-.method public static tM()Lcom/google/android/gms/internal/measurement/gn;
+.method public static tP()Lcom/google/android/gms/internal/measurement/gn;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2395,12 +2395,12 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->awS:Lcom/google/android/gms/internal/measurement/gn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/fy;->axb:Lcom/google/android/gms/internal/measurement/gn;
 
     return-object v0
 .end method
 
-.method private static tN()Ljava/lang/Class;
+.method private static tQ()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2427,7 +2427,7 @@
     return-object v0
 .end method
 
-.method private static tO()Ljava/lang/Class;
+.method private static tR()Ljava/lang/Class;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
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 9624a8dd8f..ba49d209ab 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/g;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/g;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/g;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/g;->anq:Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -32,15 +32,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/g;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/g;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/g;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/g;->anq:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/g;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->endAdUnitExposure(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 4bfdfbfec9..4beed609da 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
@@ -39,7 +39,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v1
 
@@ -55,7 +55,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v2
 
@@ -79,7 +79,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->tP()Ljava/lang/Iterable;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/lang/Iterable;
 
     move-result-object v0
 
@@ -107,7 +107,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/dq;
 
-    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qd()Z
+    invoke-interface {v2}, Lcom/google/android/gms/internal/measurement/dq;->qg()Z
 
     move-result v2
 
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 2ae8a00018..4c2373be3b 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
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private att:Ljava/util/Map;
+.field private atC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private awT:Ljava/util/List;
+.field private axc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private awU:Ljava/util/Map;
+.field private axd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -46,9 +46,9 @@
     .end annotation
 .end field
 
-.field private awV:Z
+.field private axe:Z
 
-.field private volatile awW:Lcom/google/android/gms/internal/measurement/gi;
+.field private volatile axf:Lcom/google/android/gms/internal/measurement/gi;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gi;"
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field private volatile awX:Lcom/google/android/gms/internal/measurement/gc;
+.field private volatile axg:Lcom/google/android/gms/internal/measurement/gc;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/gc;"
@@ -79,19 +79,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc: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/gb;->awU:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->axd: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/gb;->att:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->atC:Ljava/util/Map;
 
     return-void
 .end method
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -122,7 +122,7 @@
 
     if-ltz v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -163,7 +163,7 @@
 
     div-int/lit8 v2, v2, 0x2
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v3, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -218,7 +218,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/gb;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
     return-void
 .end method
@@ -226,7 +226,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     return-object p0
 .end method
@@ -234,7 +234,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/Map;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     return-object p0
 .end method
@@ -268,9 +268,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -282,7 +282,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -290,7 +290,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tV()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/gg;
 
@@ -325,15 +325,15 @@
 .method static synthetic d(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/Map;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->att:Ljava/util/Map;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gb;->atC:Ljava/util/Map;
 
     return-object p0
 .end method
 
-.method private final tR()V
+.method private final tU()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axe:Z
 
     if-nez v0, :cond_0
 
@@ -347,7 +347,7 @@
     throw v0
 .end method
 
-.method private final tS()Ljava/util/SortedMap;
+.method private final tV()Ljava/util/SortedMap;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -357,9 +357,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -367,7 +367,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     instance-of v0, v0, Ljava/util/TreeMap;
 
@@ -377,9 +377,9 @@
 
     invoke-direct {v0}, Ljava/util/TreeMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     check-cast v0, Ljava/util/TreeMap;
 
@@ -387,10 +387,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->att:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->atC:Ljava/util/Map;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     check-cast v0, Ljava/util/SortedMap;
 
@@ -407,7 +407,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/gb;->a(Ljava/lang/Comparable;)I
 
@@ -415,7 +415,7 @@
 
     if-ltz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -430,9 +430,9 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->isEmpty()Z
 
@@ -440,7 +440,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     instance-of v1, v1, Ljava/util/ArrayList;
 
@@ -452,7 +452,7 @@
 
     invoke-direct {v1, v2}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iput-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     :cond_1
     add-int/lit8 v0, v0, 0x1
@@ -463,7 +463,7 @@
 
     if-lt v0, v1, :cond_2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tV()Ljava/util/SortedMap;
 
     move-result-object v0
 
@@ -474,7 +474,7 @@
     return-object p1
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->size()I
 
@@ -484,7 +484,7 @@
 
     if-ne v1, v2, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     add-int/lit8 v2, v2, -0x1
 
@@ -494,7 +494,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/gg;
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tS()Ljava/util/SortedMap;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tV()Ljava/util/SortedMap;
 
     move-result-object v2
 
@@ -511,7 +511,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/gb;->awT:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/gg;
 
@@ -527,9 +527,9 @@
 .method public clear()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
 
@@ -537,12 +537,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -550,7 +550,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
@@ -569,7 +569,7 @@
 
     if-gez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -601,7 +601,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -623,7 +623,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awW:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axf:Lcom/google/android/gms/internal/measurement/gi;
 
     if-nez v0, :cond_0
 
@@ -633,10 +633,10 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/gms/internal/measurement/gi;-><init>(Lcom/google/android/gms/internal/measurement/gb;B)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awW:Lcom/google/android/gms/internal/measurement/gi;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axf:Lcom/google/android/gms/internal/measurement/gi;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awW:Lcom/google/android/gms/internal/measurement/gi;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axf:Lcom/google/android/gms/internal/measurement/gi;
 
     return-object v0
 .end method
@@ -679,11 +679,11 @@
     return v3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v4
 
@@ -733,9 +733,9 @@
     :cond_5
     if-eq v2, v1, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->equals(Ljava/lang/Object;)Z
 
@@ -765,7 +765,7 @@
 
     if-ltz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -780,7 +780,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -792,7 +792,7 @@
 .method public hashCode()I
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->ne()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gb;->nh()I
 
     move-result v0
 
@@ -803,7 +803,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -822,7 +822,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->size()I
 
@@ -830,7 +830,7 @@
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->hashCode()I
 
@@ -842,10 +842,10 @@
     return v2
 .end method
 
-.method public final ne()I
+.method public final nh()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -876,7 +876,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tR()V
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gb;->tU()V
 
     check-cast p1, Ljava/lang/Comparable;
 
@@ -893,7 +893,7 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -906,7 +906,7 @@
     return-object p1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -918,13 +918,13 @@
 .method public size()I
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axc:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->size()I
 
@@ -935,7 +935,7 @@
     return v0
 .end method
 
-.method public final tP()Ljava/lang/Iterable;
+.method public final tS()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -946,7 +946,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -954,14 +954,14 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gf;->tU()Ljava/lang/Iterable;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gf;->tX()Ljava/lang/Iterable;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -970,7 +970,7 @@
     return-object v0
 .end method
 
-.method final tQ()Ljava/util/Set;
+.method final tT()Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -981,7 +981,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awX:Lcom/google/android/gms/internal/measurement/gc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axg:Lcom/google/android/gms/internal/measurement/gc;
 
     if-nez v0, :cond_0
 
@@ -991,10 +991,10 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/gms/internal/measurement/gc;-><init>(Lcom/google/android/gms/internal/measurement/gb;B)V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awX:Lcom/google/android/gms/internal/measurement/gc;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axg:Lcom/google/android/gms/internal/measurement/gc;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awX:Lcom/google/android/gms/internal/measurement/gc;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axg:Lcom/google/android/gms/internal/measurement/gc;
 
     return-object v0
 .end method
@@ -1002,11 +1002,11 @@
 .method public zza()V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axe:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -1021,16 +1021,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd: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/gb;->awU:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axd:Ljava/util/Map;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->att:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->atC:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -1045,18 +1045,18 @@
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->att:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->atC: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/gb;->att:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gb;->atC:Ljava/util/Map;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axe:Z
 
     :cond_2
     return-void
@@ -1065,7 +1065,7 @@
 .method public final zzb()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gb;->axe:Z
 
     return v0
 .end method
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 271f761864..1f28c25b77 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
@@ -12,14 +12,14 @@
 
 
 # instance fields
-.field private final synthetic aut:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic auC:Lcom/google/android/gms/internal/measurement/gb;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/gb;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gc;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gc;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     const/4 v0, 0x0
 
@@ -51,7 +51,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gd;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gc;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gc;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     const/4 v2, 0x0
 
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 f7b42b37a3..f453d156cb 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
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private awY:Ljava/util/Iterator;
+.field private axh:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final synthetic awZ:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic axi:Lcom/google/android/gms/internal/measurement/gb;
 
 .field private zza:I
 
@@ -37,11 +37,11 @@
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/gb;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gd;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
@@ -64,7 +64,7 @@
     return-void
 .end method
 
-.method private final tT()Ljava/util/Iterator;
+.method private final tW()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -75,11 +75,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awY:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axh:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->d(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/Map;
 
@@ -93,10 +93,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awY:Ljava/util/Iterator;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axh:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awY:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axh:Ljava/util/Iterator;
 
     return-object v0
 .end method
@@ -110,7 +110,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gd;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gd;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
@@ -123,7 +123,7 @@
     if-le v0, v1, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tW()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -147,7 +147,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 2
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tW()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -157,7 +157,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gd;->tW()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -170,7 +170,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gd;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gf.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gf.smali
index e9bbb7498d..08ee324a37 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gf.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gf.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final awe:Ljava/util/Iterator;
+.field private static final awn:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final axa:Ljava/lang/Iterable;
+.field private static final axj:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -33,18 +33,18 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ge;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gf;->awe:Ljava/util/Iterator;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gf;->awn:Ljava/util/Iterator;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gh;
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/gh;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gf;->axa:Ljava/lang/Iterable;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gf;->axj:Ljava/lang/Iterable;
 
     return-void
 .end method
 
-.method static tU()Ljava/lang/Iterable;
+.method static tX()Ljava/lang/Iterable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -56,15 +56,15 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->axa:Ljava/lang/Iterable;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->axj:Ljava/lang/Iterable;
 
     return-object v0
 .end method
 
-.method static synthetic tV()Ljava/util/Iterator;
+.method static synthetic tY()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->awe:Ljava/util/Iterator;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gf;->awn:Ljava/util/Iterator;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gg.smali
index 8a1e2f2401..9fb4ae189e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gg.smali
@@ -21,7 +21,7 @@
 
 
 # instance fields
-.field private atE:Ljava/lang/Object;
+.field private atN:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final synthetic awZ:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic axi:Lcom/google/android/gms/internal/measurement/gb;
 
-.field private final axb:Ljava/lang/Comparable;
+.field private final axk:Ljava/lang/Comparable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TK;"
@@ -49,13 +49,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gg;->axb:Ljava/lang/Comparable;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gg;->axk:Ljava/lang/Comparable;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
     return-void
 .end method
@@ -156,7 +156,7 @@
     :cond_1
     check-cast p1, Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->axb:Ljava/lang/Comparable;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->axk:Ljava/lang/Comparable;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -168,7 +168,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
 
@@ -189,7 +189,7 @@
 .method public final synthetic getKey()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axb:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axk:Ljava/lang/Comparable;
 
     return-object v0
 .end method
@@ -202,7 +202,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -210,7 +210,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axb:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axk:Ljava/lang/Comparable;
 
     const/4 v1, 0x0
 
@@ -226,7 +226,7 @@
     move-result v0
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
     if-nez v2, :cond_1
 
@@ -251,13 +251,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->awZ:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axi:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->a(Lcom/google/android/gms/internal/measurement/gb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -265,13 +265,13 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axb:Ljava/lang/Comparable;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gg;->axk:Ljava/lang/Comparable;
 
     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/internal/measurement/gg;->atE:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gg;->atN:Ljava/lang/Object;
 
     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/measurement/gh.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gh.smali
index dd27359059..6b64dbeec7 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
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gf;->tV()Ljava/util/Iterator;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gf;->tY()Ljava/util/Iterator;
 
     move-result-object v0
 
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 e2fc139500..245d141136 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
@@ -14,14 +14,14 @@
 
 
 # instance fields
-.field private final synthetic aut:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic auC:Lcom/google/android/gms/internal/measurement/gb;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/gb;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-direct {p0}, Ljava/util/AbstractSet;-><init>()V
 
@@ -49,7 +49,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -76,7 +76,7 @@
 .method public clear()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->clear()V
 
@@ -88,7 +88,7 @@
 
     check-cast p1, Ljava/util/Map$Entry;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -139,7 +139,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gj;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     const/4 v2, 0x0
 
@@ -159,7 +159,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-interface {p1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -180,7 +180,7 @@
 .method public size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->aut:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gi;->auC:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/gb;->size()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gj.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gj.smali
index 5023410ec8..61c579a93a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gj.smali
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private atx:Z
+.field private atG:Z
 
-.field private axc:Ljava/util/Iterator;
+.field private axl:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final synthetic axd:Lcom/google/android/gms/internal/measurement/gb;
+.field private final synthetic axm:Lcom/google/android/gms/internal/measurement/gb;
 
 .field private zza:I
 
@@ -39,7 +39,7 @@
 .method private constructor <init>(Lcom/google/android/gms/internal/measurement/gb;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -58,7 +58,7 @@
     return-void
 .end method
 
-.method private final tT()Ljava/util/Iterator;
+.method private final tW()Ljava/util/Iterator;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -69,11 +69,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axc:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axl:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->c(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/Map;
 
@@ -87,10 +87,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axc:Ljava/util/Iterator;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axl:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axc:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axl:Ljava/util/Iterator;
 
     return-object v0
 .end method
@@ -106,7 +106,7 @@
 
     add-int/2addr v0, v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
@@ -118,7 +118,7 @@
 
     if-lt v0, v2, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->c(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/Map;
 
@@ -130,7 +130,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tW()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -157,7 +157,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atG:Z
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/gj;->zza:I
 
@@ -165,7 +165,7 @@
 
     iput v1, p0, Lcom/google/android/gms/internal/measurement/gj;->zza:I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
@@ -177,7 +177,7 @@
 
     if-ge v1, v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
@@ -194,7 +194,7 @@
     return-object v0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tW()Ljava/util/Iterator;
 
     move-result-object v0
 
@@ -210,21 +210,21 @@
 .method public final remove()V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atG:Z
 
     if-eqz v0, :cond_1
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/gj;->atG:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gb;->a(Lcom/google/android/gms/internal/measurement/gb;)V
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/gj;->zza:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/gb;->b(Lcom/google/android/gms/internal/measurement/gb;)Ljava/util/List;
 
@@ -236,7 +236,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axd:Lcom/google/android/gms/internal/measurement/gb;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gj;->axm:Lcom/google/android/gms/internal/measurement/gb;
 
     iget v1, p0, Lcom/google/android/gms/internal/measurement/gj;->zza:I
 
@@ -249,7 +249,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tT()Ljava/util/Iterator;
+    invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/gj;->tW()Ljava/util/Iterator;
 
     move-result-object v0
 
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 ddb52b3e79..3a4589f8b7 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
@@ -13,7 +13,7 @@
 
     new-instance p0, Ljava/lang/StringBuilder;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pG()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pJ()I
 
     move-result v1
 
@@ -22,7 +22,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pG()I
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/gl;->pJ()I
 
     move-result v2
 
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 eef6e9f9e3..f6cb5b63a5 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
@@ -7,5 +7,5 @@
 .method public abstract bL(I)B
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
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 6b39c49170..101c1146e8 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
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final synthetic aua:Lcom/google/android/gms/internal/measurement/cn;
+.field private final synthetic auj:Lcom/google/android/gms/internal/measurement/cn;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/cn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gm;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,7 +26,7 @@
 .method public final bL(I)B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/cn;->bL(I)B
 
@@ -35,12 +35,12 @@
     return p1
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gm;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pG()I
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cn;->pJ()I
 
     move-result v0
 
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 ff5e397656..8baf82d9fe 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
@@ -93,7 +93,7 @@
         }
     .end annotation
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
 
     move-result v0
 
@@ -123,7 +123,7 @@
 
     if-ne v0, v3, :cond_0
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sl()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->so()I
 
     move-result p2
 
@@ -132,7 +132,7 @@
     return v2
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -144,7 +144,7 @@
     return p1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gn;->rz()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/gn;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -153,7 +153,7 @@
     or-int/2addr v3, v4
 
     :cond_3
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pJ()I
 
     move-result v4
 
@@ -168,7 +168,7 @@
     if-nez v4, :cond_3
 
     :cond_4
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pH()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->pK()I
 
     move-result p2
 
@@ -183,14 +183,14 @@
     return v2
 
     :cond_5
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->th()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
     throw p1
 
     :cond_6
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()Lcom/google/android/gms/internal/measurement/cn;
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sq()Lcom/google/android/gms/internal/measurement/cn;
 
     move-result-object p2
 
@@ -199,7 +199,7 @@
     return v2
 
     :cond_7
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sk()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->sn()J
 
     move-result-wide v3
 
@@ -208,7 +208,7 @@
     return v2
 
     :cond_8
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qS()J
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/fx;->qV()J
 
     move-result-wide v3
 
@@ -316,7 +316,7 @@
     .end annotation
 .end method
 
-.method abstract rz()Ljava/lang/Object;
+.method abstract rC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TB;"
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 0a36c87786..2fd6249e7e 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
@@ -127,13 +127,13 @@
 
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/dw;->zzb:Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tW()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tZ()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v1
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v0
 
@@ -176,17 +176,17 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-ge v0, v2, :cond_1
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v2, v2, v0
 
     ushr-int/lit8 v2, v2, 0x3
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v3, v3, v0
 
@@ -213,7 +213,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gq;->qe()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/gq;->qh()I
 
     move-result p1
 
@@ -248,28 +248,28 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pJ()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->aeX:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->afg:I
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v0, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     add-int/lit8 v0, v0, -0x1
 
     :goto_0
     if-ltz v0, :cond_0
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v1, v1, v0
 
     ushr-int/lit8 v1, v1, 0x3
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -286,17 +286,17 @@
     const/4 v0, 0x0
 
     :goto_1
-    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-ge v0, v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v1, v1, v0
 
     ushr-int/lit8 v1, v1, 0x3
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -355,7 +355,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tW()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tZ()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v0
 
@@ -375,10 +375,10 @@
     return-object p1
 .end method
 
-.method final synthetic rz()Ljava/lang/Object;
+.method final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->tX()Lcom/google/android/gms/internal/measurement/gq;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gq;->ua()Lcom/google/android/gms/internal/measurement/gq;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gq.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gq.smali
index 6852d864bc..e58e389462 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gq.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final axe:Lcom/google/android/gms/internal/measurement/gq;
+.field private static final axn:Lcom/google/android/gms/internal/measurement/gq;
 
 
 # instance fields
-.field anl:I
+.field anu:I
 
-.field anm:[I
+.field anv:[I
 
-.field awv:[Ljava/lang/Object;
+.field awE:[Ljava/lang/Object;
 
 .field zze:I
 
@@ -33,7 +33,7 @@
 
     invoke-direct {v0, v1, v2, v3, v1}, Lcom/google/android/gms/internal/measurement/gq;-><init>(I[I[Ljava/lang/Object;Z)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gq;->axe:Lcom/google/android/gms/internal/measurement/gq;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gq;->axn:Lcom/google/android/gms/internal/measurement/gq;
 
     return-void
 .end method
@@ -65,11 +65,11 @@
 
     iput v0, p0, Lcom/google/android/gms/internal/measurement/gq;->zze:I
 
-    iput p1, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iput p1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/gq;->zzf:Z
 
@@ -79,39 +79,39 @@
 .method static a(Lcom/google/android/gms/internal/measurement/gq;Lcom/google/android/gms/internal/measurement/gq;)Lcom/google/android/gms/internal/measurement/gq;
     .locals 6
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
-    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v1, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[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/gq;->anm:[I
+    iget-object v2, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
-    iget v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     const/4 v5, 0x0
 
     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/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[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/gq;->awv:[Ljava/lang/Object;
+    iget-object v3, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
-    iget p0, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget p0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
-    iget p1, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget p1, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     invoke-static {v3, v5, v2, p0, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V
 
@@ -167,7 +167,7 @@
     :cond_0
     new-instance p0, Ljava/lang/RuntimeException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object p1
 
@@ -176,11 +176,11 @@
     throw p0
 
     :cond_1
-    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pG()I
+    invoke-interface {p2}, Lcom/google/android/gms/internal/measurement/hk;->pJ()I
 
     move-result p0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auh:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
 
     if-ne p0, v1, :cond_2
 
@@ -235,15 +235,15 @@
     return-void
 .end method
 
-.method public static tW()Lcom/google/android/gms/internal/measurement/gq;
+.method public static tZ()Lcom/google/android/gms/internal/measurement/gq;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gq;->axe:Lcom/google/android/gms/internal/measurement/gq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gq;->axn:Lcom/google/android/gms/internal/measurement/gq;
 
     return-object v0
 .end method
 
-.method static tX()Lcom/google/android/gms/internal/measurement/gq;
+.method static ua()Lcom/google/android/gms/internal/measurement/gq;
     .locals 1
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/gq;
@@ -263,33 +263,33 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hk;->pG()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/hk;->pJ()I
 
     move-result v0
 
-    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auh:I
+    sget v1, Lcom/google/android/gms/internal/measurement/dw$d;->auq:I
 
     if-ne v0, v1, :cond_2
 
     const/4 v0, 0x0
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -303,18 +303,18 @@
     return-void
 
     :cond_2
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     add-int/lit8 v0, v0, -0x1
 
     :goto_1
     if-ltz v0, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v1, v1, v0
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -334,11 +334,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-ge v0, v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v1, v1, v0
 
@@ -348,7 +348,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -369,9 +369,9 @@
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     array-length v1, v1
 
@@ -389,40 +389,40 @@
     shr-int/lit8 v0, v0, 0x1
 
     :goto_0
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     add-int/2addr v1, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[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/gq;->anm:[I
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[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/gq;->awv:[Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
-    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     aput p1, v0, v1
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aput-object p2, p1, v1
 
     add-int/lit8 v1, v1, 0x1
 
-    iput v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iput v1, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     return-void
 
@@ -460,15 +460,15 @@
     :cond_2
     check-cast p1, Lcom/google/android/gms/internal/measurement/gq;
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
-    iget v3, p1, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v3, p1, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-ne v2, v3, :cond_8
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v4, p1, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     const/4 v5, 0x0
 
@@ -496,11 +496,11 @@
     :goto_1
     if-eqz v2, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
-    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v3, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     const/4 v4, 0x0
 
@@ -545,13 +545,13 @@
 .method public final hashCode()I
     .locals 8
 
-    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     add-int/lit16 v1, v0, 0x20f
 
     mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     const/4 v3, 0x0
 
@@ -579,9 +579,9 @@
 
     mul-int/lit8 v1, v1, 0x1f
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     :goto_1
     if-ge v3, v2, :cond_1
@@ -606,7 +606,7 @@
     return v1
 .end method
 
-.method public final qe()I
+.method public final qh()I
     .locals 6
 
     iget v0, p0, Lcom/google/android/gms/internal/measurement/gq;->zze:I
@@ -623,11 +623,11 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anl:I
+    iget v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anu:I
 
     if-ge v0, v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anm:[I
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->anv:[I
 
     aget v2, v2, v0
 
@@ -653,7 +653,7 @@
 
     if-ne v2, v4, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -670,7 +670,7 @@
     :cond_1
     new-instance v0, Ljava/lang/IllegalStateException;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->ti()Lcom/google/android/gms/internal/measurement/eg;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tl()Lcom/google/android/gms/internal/measurement/eg;
 
     move-result-object v1
 
@@ -685,13 +685,13 @@
 
     shl-int/2addr v2, v4
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v3, v3, v0
 
     check-cast v3, Lcom/google/android/gms/internal/measurement/gq;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gq;->qe()I
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/gq;->qh()I
 
     move-result v3
 
@@ -700,7 +700,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -713,7 +713,7 @@
     goto :goto_1
 
     :cond_4
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
@@ -728,7 +728,7 @@
     goto :goto_1
 
     :cond_5
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awv:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/gq;->awE:[Ljava/lang/Object;
 
     aget-object v2, v2, v0
 
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 4c4327f82e..cc4f4e9629 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
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final synthetic anl:I
+.field private final synthetic anu:I
 
-.field private axf:Ljava/util/ListIterator;
+.field private axo:Ljava/util/ListIterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ListIterator<",
@@ -30,32 +30,32 @@
     .end annotation
 .end field
 
-.field private final synthetic axg:Lcom/google/android/gms/internal/measurement/gt;
+.field private final synthetic axp:Lcom/google/android/gms/internal/measurement/gt;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/gt;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axg:Lcom/google/android/gms/internal/measurement/gt;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axp:Lcom/google/android/gms/internal/measurement/gt;
 
-    iput p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anl:I
+    iput p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anu:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axg:Lcom/google/android/gms/internal/measurement/gt;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axp:Lcom/google/android/gms/internal/measurement/gt;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gt;->a(Lcom/google/android/gms/internal/measurement/gt;)Lcom/google/android/gms/internal/measurement/en;
 
     move-result-object p1
 
-    iget p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anl:I
+    iget p2, p0, Lcom/google/android/gms/internal/measurement/gr;->anu:I
 
     invoke-interface {p1, p2}, Lcom/google/android/gms/internal/measurement/en;->listIterator(I)Ljava/util/ListIterator;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->hasNext()Z
 
@@ -87,7 +87,7 @@
 .method public final hasPrevious()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->hasPrevious()Z
 
@@ -99,7 +99,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->next()Ljava/lang/Object;
 
@@ -113,7 +113,7 @@
 .method public final nextIndex()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->nextIndex()I
 
@@ -125,7 +125,7 @@
 .method public final synthetic previous()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->previous()Ljava/lang/Object;
 
@@ -139,7 +139,7 @@
 .method public final previousIndex()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axf:Ljava/util/ListIterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gr;->axo:Ljava/util/ListIterator;
 
     invoke-interface {v0}, Ljava/util/ListIterator;->previousIndex()I
 
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 a0502fc2e6..68737746ff 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
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field private final axh:Lcom/google/android/gms/internal/measurement/en;
+.field private final axq:Lcom/google/android/gms/internal/measurement/en;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gt;->axh:Lcom/google/android/gms/internal/measurement/en;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gt;->axq:Lcom/google/android/gms/internal/measurement/en;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/gt;)Lcom/google/android/gms/internal/measurement/en;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gt;->axh:Lcom/google/android/gms/internal/measurement/en;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/gt;->axq:Lcom/google/android/gms/internal/measurement/en;
 
     return-object p0
 .end method
@@ -57,7 +57,7 @@
 .method public final cm(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axh:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axq:Lcom/google/android/gms/internal/measurement/en;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/en;->cm(I)Ljava/lang/Object;
 
@@ -69,7 +69,7 @@
 .method public final synthetic get(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axh:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axq:Lcom/google/android/gms/internal/measurement/en;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/internal/measurement/en;->get(I)Ljava/lang/Object;
 
@@ -116,7 +116,7 @@
     return-object v0
 .end method
 
-.method public final qi()Ljava/util/List;
+.method public final ql()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -126,9 +126,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axh:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axq:Lcom/google/android/gms/internal/measurement/en;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->qi()Ljava/util/List;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->ql()Ljava/util/List;
 
     move-result-object v0
 
@@ -138,7 +138,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axh:Lcom/google/android/gms/internal/measurement/en;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gt;->axq:Lcom/google/android/gms/internal/measurement/en;
 
     invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/en;->size()I
 
@@ -147,7 +147,7 @@
     return v0
 .end method
 
-.method public final tn()Lcom/google/android/gms/internal/measurement/en;
+.method public final tr()Lcom/google/android/gms/internal/measurement/en;
     .locals 0
 
     return-object p0
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$b.smali
index e1d7cc222c..3c0035ffca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$b.smali
@@ -28,7 +28,7 @@
 .method public final a(Ljava/lang/Object;JD)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     move-object v1, p1
 
@@ -44,7 +44,7 @@
 .method public final a(Ljava/lang/Object;JF)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putFloat(Ljava/lang/Object;JF)V
 
@@ -54,7 +54,7 @@
 .method public final a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putBoolean(Ljava/lang/Object;JZ)V
 
@@ -64,7 +64,7 @@
 .method public final c(Ljava/lang/Object;JB)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putByte(Ljava/lang/Object;JB)V
 
@@ -74,7 +74,7 @@
 .method public final f(Ljava/lang/Object;J)F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getFloat(Ljava/lang/Object;J)F
 
@@ -86,7 +86,7 @@
 .method public final v(Ljava/lang/Object;J)B
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getByte(Ljava/lang/Object;J)B
 
@@ -98,7 +98,7 @@
 .method public final w(Ljava/lang/Object;J)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getBoolean(Ljava/lang/Object;J)Z
 
@@ -110,7 +110,7 @@
 .method public final x(Ljava/lang/Object;J)D
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$b;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getDouble(Ljava/lang/Object;J)D
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$d.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$d.smali
index 01ad0b9a3b..9d40e4aae1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$d.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu$d.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field axu:Lsun/misc/Unsafe;
+.field axD:Lsun/misc/Unsafe;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     return-void
 .end method
@@ -40,7 +40,7 @@
 .method public final a(Ljava/lang/Object;JJ)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     move-object v1, p1
 
@@ -59,7 +59,7 @@
 .method public final b(Ljava/lang/Object;JI)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Lsun/misc/Unsafe;->putInt(Ljava/lang/Object;JI)V
 
@@ -84,7 +84,7 @@
 .method public final y(Ljava/lang/Object;J)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p1, p2, p3}, Lsun/misc/Unsafe;->getInt(Ljava/lang/Object;J)I
 
@@ -96,7 +96,7 @@
 .method public final z(Ljava/lang/Object;J)J
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gu$d;->axD: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/gu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gu.smali
index 4f855c5bc3..cfd6d30222 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
@@ -15,13 +15,19 @@
 
 
 # static fields
-.field private static final adG:J
+.field private static final adP:J
 
-.field private static final auj:Ljava/util/logging/Logger;
+.field private static final aus:Ljava/util/logging/Logger;
 
-.field private static final axi:Lsun/misc/Unsafe;
+.field private static final axA:J
 
-.field private static final axj:Ljava/lang/Class;
+.field private static final axB:J
+
+.field private static final axC:I
+
+.field private static final axr:Lsun/misc/Unsafe;
+
+.field private static final axs:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -30,25 +36,19 @@
     .end annotation
 .end field
 
-.field private static final axk:Lcom/google/android/gms/internal/measurement/gu$d;
+.field private static final axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
-.field private static final axl:J
+.field private static final axu:J
 
-.field private static final axm:J
+.field private static final axv:J
 
-.field private static final axn:J
+.field private static final axw:J
 
-.field private static final axo:J
+.field private static final axx:J
 
-.field private static final axp:J
+.field private static final axy:J
 
-.field private static final axq:J
-
-.field private static final axr:J
-
-.field private static final axs:J
-
-.field private static final axt:I
+.field private static final axz:J
 
 .field static final zza:Z
 
@@ -95,19 +95,19 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->auj:Ljava/util/logging/Logger;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->aus:Ljava/util/logging/Logger;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->tY()Lsun/misc/Unsafe;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->ub()Lsun/misc/Unsafe;
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->rK()Ljava/lang/Class;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->rN()Ljava/lang/Class;
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axj:Ljava/lang/Class;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/gu;->axs:Ljava/lang/Class;
 
     sget-object v5, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
 
@@ -125,7 +125,7 @@
 
     sput-boolean v5, Lcom/google/android/gms/internal/measurement/gu;->zzf:Z
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
     const/4 v6, 0x0
 
@@ -134,7 +134,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v5
 
@@ -146,7 +146,7 @@
 
     new-instance v6, Lcom/google/android/gms/internal/measurement/gu$c;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
     invoke-direct {v6, v5}, Lcom/google/android/gms/internal/measurement/gu$c;-><init>(Lsun/misc/Unsafe;)V
 
@@ -159,7 +159,7 @@
 
     new-instance v6, Lcom/google/android/gms/internal/measurement/gu$a;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
     invoke-direct {v6, v5}, Lcom/google/android/gms/internal/measurement/gu$a;-><init>(Lsun/misc/Unsafe;)V
 
@@ -168,21 +168,21 @@
     :cond_2
     new-instance v6, Lcom/google/android/gms/internal/measurement/gu$b;
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
     invoke-direct {v6, v5}, Lcom/google/android/gms/internal/measurement/gu$b;-><init>(Lsun/misc/Unsafe;)V
 
     :cond_3
     :goto_0
-    sput-object v6, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sput-object v6, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pR()Z
 
     move-result v5
 
     sput-boolean v5, Lcom/google/android/gms/internal/measurement/gu;->zzh:Z
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->qg()Z
 
     move-result v5
 
@@ -220,7 +220,7 @@
 
     int-to-long v4, v4
 
-    sput-wide v4, Lcom/google/android/gms/internal/measurement/gu;->axl:J
+    sput-wide v4, Lcom/google/android/gms/internal/measurement/gu;->axu:J
 
     invoke-static {v3}, Lcom/google/android/gms/internal/measurement/gu;->w(Ljava/lang/Class;)I
 
@@ -228,7 +228,7 @@
 
     int-to-long v3, v3
 
-    sput-wide v3, Lcom/google/android/gms/internal/measurement/gu;->adG:J
+    sput-wide v3, Lcom/google/android/gms/internal/measurement/gu;->adP:J
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/gu;->v(Ljava/lang/Class;)I
 
@@ -236,7 +236,7 @@
 
     int-to-long v3, v3
 
-    sput-wide v3, Lcom/google/android/gms/internal/measurement/gu;->axm:J
+    sput-wide v3, Lcom/google/android/gms/internal/measurement/gu;->axv:J
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/gu;->w(Ljava/lang/Class;)I
 
@@ -244,7 +244,7 @@
 
     int-to-long v2, v2
 
-    sput-wide v2, Lcom/google/android/gms/internal/measurement/gu;->axn:J
+    sput-wide v2, Lcom/google/android/gms/internal/measurement/gu;->axw:J
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/gu;->v(Ljava/lang/Class;)I
 
@@ -252,7 +252,7 @@
 
     int-to-long v2, v2
 
-    sput-wide v2, Lcom/google/android/gms/internal/measurement/gu;->axo:J
+    sput-wide v2, Lcom/google/android/gms/internal/measurement/gu;->axx:J
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/gu;->w(Ljava/lang/Class;)I
 
@@ -260,7 +260,7 @@
 
     int-to-long v1, v1
 
-    sput-wide v1, Lcom/google/android/gms/internal/measurement/gu;->axp:J
+    sput-wide v1, Lcom/google/android/gms/internal/measurement/gu;->axy:J
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gu;->v(Ljava/lang/Class;)I
 
@@ -268,7 +268,7 @@
 
     int-to-long v1, v1
 
-    sput-wide v1, Lcom/google/android/gms/internal/measurement/gu;->axq:J
+    sput-wide v1, Lcom/google/android/gms/internal/measurement/gu;->axz:J
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/gu;->w(Ljava/lang/Class;)I
 
@@ -276,7 +276,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->axr:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->axA:J
 
     const-class v0, [Ljava/lang/Object;
 
@@ -298,20 +298,20 @@
 
     sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->zzv:J
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->tZ()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->uc()Ljava/lang/reflect/Field;
 
     move-result-object v0
 
     if-eqz v0, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     if-nez v1, :cond_4
 
     goto :goto_1
 
     :cond_4
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0}, Lsun/misc/Unsafe;->objectFieldOffset(Ljava/lang/reflect/Field;)J
 
@@ -324,7 +324,7 @@
     const-wide/16 v0, -0x1
 
     :goto_2
-    sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->axs:J
+    sput-wide v0, Lcom/google/android/gms/internal/measurement/gu;->axB:J
 
     sget-wide v0, Lcom/google/android/gms/internal/measurement/gu;->zzj:J
 
@@ -334,7 +334,7 @@
 
     long-to-int v1, v0
 
-    sput v1, Lcom/google/android/gms/internal/measurement/gu;->axt:I
+    sput v1, Lcom/google/android/gms/internal/measurement/gu;->axC:I
 
     invoke-static {}, Ljava/nio/ByteOrder;->nativeOrder()Ljava/nio/ByteOrder;
 
@@ -368,7 +368,7 @@
 .method static a([BJ)B
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     sget-wide v1, Lcom/google/android/gms/internal/measurement/gu;->zzj:J
 
@@ -422,7 +422,7 @@
 .method static a(Ljava/lang/Object;JD)V
     .locals 6
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     move-object v1, p0
 
@@ -438,7 +438,7 @@
 .method static a(Ljava/lang/Object;JF)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/gu$d;->a(Ljava/lang/Object;JF)V
 
@@ -448,7 +448,7 @@
 .method static a(Ljava/lang/Object;JJ)V
     .locals 6
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     move-object v1, p0
 
@@ -464,9 +464,9 @@
 .method static a(Ljava/lang/Object;JLjava/lang/Object;)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -476,7 +476,7 @@
 .method static a(Ljava/lang/Object;JZ)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/gu$d;->a(Ljava/lang/Object;JZ)V
 
@@ -486,7 +486,7 @@
 .method static a([BJB)V
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     sget-wide v1, Lcom/google/android/gms/internal/measurement/gu;->zzj:J
 
@@ -536,7 +536,7 @@
 .method static b(Ljava/lang/Object;JI)V
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/gu$d;->b(Ljava/lang/Object;JI)V
 
@@ -611,7 +611,7 @@
 .method static j(Ljava/lang/Object;J)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu$d;->y(Ljava/lang/Object;J)I
 
@@ -623,7 +623,7 @@
 .method static k(Ljava/lang/Object;J)J
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu$d;->z(Ljava/lang/Object;J)J
 
@@ -635,7 +635,7 @@
 .method static l(Ljava/lang/Object;J)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu$d;->w(Ljava/lang/Object;J)Z
 
@@ -647,7 +647,7 @@
 .method static m(Ljava/lang/Object;J)F
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu$d;->f(Ljava/lang/Object;J)F
 
@@ -659,7 +659,7 @@
 .method static n(Ljava/lang/Object;J)D
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu$d;->x(Ljava/lang/Object;J)D
 
@@ -671,9 +671,9 @@
 .method static o(Ljava/lang/Object;J)Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0, p1, p2}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -714,7 +714,7 @@
     return p0
 .end method
 
-.method static pE()Z
+.method static pH()Z
     .locals 1
 
     sget-boolean v0, Lcom/google/android/gms/internal/measurement/gu;->zzi:Z
@@ -722,14 +722,14 @@
     return v0
 .end method
 
-.method private static pO()Z
+.method private static pR()Z
     .locals 9
 
     const-string v0, "copyMemory"
 
     const-string v1, "getLong"
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
     const/4 v3, 0x0
 
@@ -769,7 +769,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/gu;->tZ()Ljava/lang/reflect/Field;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->uc()Ljava/lang/reflect/Field;
 
     move-result-object v6
 
@@ -778,7 +778,7 @@
     return v3
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v6
 
@@ -910,7 +910,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->auj:Ljava/util/logging/Logger;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->aus:Ljava/util/logging/Logger;
 
     sget-object v2, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
@@ -979,10 +979,10 @@
     return p0
 .end method
 
-.method private static qd()Z
+.method private static qg()Z
     .locals 8
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
 
     const/4 v1, 0x0
 
@@ -1128,7 +1128,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/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v2
 
@@ -1272,7 +1272,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->auj:Ljava/util/logging/Logger;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/gu;->aus:Ljava/util/logging/Logger;
 
     sget-object v3, Ljava/util/logging/Level;->WARNING:Ljava/util/logging/Level;
 
@@ -1352,7 +1352,59 @@
     return p0
 .end method
 
-.method static tY()Lsun/misc/Unsafe;
+.method static u(Ljava/lang/Class;)Ljava/lang/Object;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;)TT;"
+        }
+    .end annotation
+
+    :try_start_0
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axr:Lsun/misc/Unsafe;
+
+    invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->allocateInstance(Ljava/lang/Class;)Ljava/lang/Object;
+
+    move-result-object p0
+    :try_end_0
+    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
+
+    return-object p0
+
+    :catch_0
+    move-exception p0
+
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-direct {v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
+.end method
+
+.method static synthetic u(Ljava/lang/Object;J)Z
+    .locals 0
+
+    invoke-static {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu;->q(Ljava/lang/Object;J)B
+
+    move-result p0
+
+    if-eqz p0, :cond_0
+
+    const/4 p0, 0x1
+
+    return p0
+
+    :cond_0
+    const/4 p0, 0x0
+
+    return p0
+.end method
+
+.method static ub()Lsun/misc/Unsafe;
     .locals 1
 
     :try_start_0
@@ -1377,10 +1429,10 @@
     return-object v0
 .end method
 
-.method private static tZ()Ljava/lang/reflect/Field;
+.method private static uc()Ljava/lang/reflect/Field;
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v0
 
@@ -1425,58 +1477,6 @@
     return-object v0
 .end method
 
-.method static u(Ljava/lang/Class;)Ljava/lang/Object;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Class<",
-            "TT;>;)TT;"
-        }
-    .end annotation
-
-    :try_start_0
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axi:Lsun/misc/Unsafe;
-
-    invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->allocateInstance(Ljava/lang/Class;)Ljava/lang/Object;
-
-    move-result-object p0
-    :try_end_0
-    .catch Ljava/lang/InstantiationException; {:try_start_0 .. :try_end_0} :catch_0
-
-    return-object p0
-
-    :catch_0
-    move-exception p0
-
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/Throwable;)V
-
-    throw v0
-.end method
-
-.method static synthetic u(Ljava/lang/Object;J)Z
-    .locals 0
-
-    invoke-static {p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gu;->q(Ljava/lang/Object;J)B
-
-    move-result p0
-
-    if-eqz p0, :cond_0
-
-    const/4 p0, 0x1
-
-    return p0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    return p0
-.end method
-
 .method private static v(Ljava/lang/Class;)I
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
@@ -1491,9 +1491,9 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->arrayBaseOffset(Ljava/lang/Class;)I
 
@@ -1521,9 +1521,9 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axk:Lcom/google/android/gms/internal/measurement/gu$d;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gu;->axt:Lcom/google/android/gms/internal/measurement/gu$d;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axu:Lsun/misc/Unsafe;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/gu$d;->axD:Lsun/misc/Unsafe;
 
     invoke-virtual {v0, p0}, Lsun/misc/Unsafe;->arrayIndexScale(Ljava/lang/Class;)I
 
@@ -1549,7 +1549,7 @@
 
     const-class v0, [B
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v1
 
@@ -1561,7 +1561,7 @@
 
     :cond_0
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axj:Ljava/lang/Class;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/gu;->axs:Ljava/lang/Class;
 
     const-string v3, "peekLong"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gv.smali
index 0331b940d8..0bb1544b31 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gv.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field private awe:Ljava/util/Iterator;
+.field private awn:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -28,18 +28,18 @@
     .end annotation
 .end field
 
-.field private final synthetic axv:Lcom/google/android/gms/internal/measurement/gt;
+.field private final synthetic axE:Lcom/google/android/gms/internal/measurement/gt;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/gt;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->axv:Lcom/google/android/gms/internal/measurement/gt;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->axE:Lcom/google/android/gms/internal/measurement/gt;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->axv:Lcom/google/android/gms/internal/measurement/gt;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->axE:Lcom/google/android/gms/internal/measurement/gt;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/gt;->a(Lcom/google/android/gms/internal/measurement/gt;)Lcom/google/android/gms/internal/measurement/en;
 
@@ -49,7 +49,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->awe:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/gv;->awn:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gv;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gv;->awn:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -71,7 +71,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gv;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/gv;->awn: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/gx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/gx.smali
index 7a4a5e31c4..b2622913fc 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
@@ -4,14 +4,14 @@
 
 
 # static fields
-.field private static final axw:Lcom/google/android/gms/internal/measurement/gy;
+.field private static final axF:Lcom/google/android/gms/internal/measurement/gy;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/gu;->pH()Z
 
     move-result v0
 
@@ -33,7 +33,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ck;->pH()Z
 
     move-result v0
 
@@ -51,7 +51,7 @@
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hb;-><init>()V
 
     :goto_1
-    sput-object v0, Lcom/google/android/gms/internal/measurement/gx;->axw:Lcom/google/android/gms/internal/measurement/gy;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/gx;->axF:Lcom/google/android/gms/internal/measurement/gy;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 .method static a(Ljava/lang/CharSequence;[BII)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axw:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axF:Lcom/google/android/gms/internal/measurement/gy;
 
     invoke-virtual {v0, p0, p1, p2, p3}, Lcom/google/android/gms/internal/measurement/gy;->a(Ljava/lang/CharSequence;[BII)I
 
@@ -283,7 +283,7 @@
 .method public static f([BII)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axw:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axF:Lcom/google/android/gms/internal/measurement/gy;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gy;->f([BII)Z
 
@@ -300,7 +300,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axw:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axF:Lcom/google/android/gms/internal/measurement/gy;
 
     invoke-virtual {v0, p0, p1, p2}, Lcom/google/android/gms/internal/measurement/gy;->g([BII)Ljava/lang/String;
 
@@ -410,7 +410,7 @@
 .method public static q([B)Z
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axw:Lcom/google/android/gms/internal/measurement/gy;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/gx;->axF:Lcom/google/android/gms/internal/measurement/gy;
 
     array-length v1, p0
 
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 1f65e0868a..2e55a8afc5 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
@@ -85,7 +85,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -149,7 +149,7 @@
     return-void
 
     :cond_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
@@ -189,7 +189,7 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p0
 
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 913061534b..665cb84f52 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/h;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/h;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/h;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/h;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -24,10 +24,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -44,13 +44,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/h;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/h;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/h;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/kv;->getCachedAppInstanceId(Lcom/google/android/gms/internal/measurement/lv;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hb.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hb.smali
index 1e099e8e74..6d22322ecd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hb.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hb.smali
@@ -453,7 +453,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -489,7 +489,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -535,7 +535,7 @@
     goto :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
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 77aec86bfc..9b9f398d88 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
@@ -631,7 +631,7 @@
     goto :goto_2
 
     :cond_6
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -675,7 +675,7 @@
     goto :goto_2
 
     :cond_8
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
@@ -733,7 +733,7 @@
     goto/16 :goto_2
 
     :cond_a
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tk()Lcom/google/android/gms/internal/measurement/eh;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/eh;->tn()Lcom/google/android/gms/internal/measurement/eh;
 
     move-result-object p1
 
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 4c43b4807f..cbd7f572b5 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
@@ -14,21 +14,9 @@
 
 
 # static fields
-.field public static final enum awp:Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum awy:Lcom/google/android/gms/internal/measurement/he;
 
-.field public static final enum awq:Lcom/google/android/gms/internal/measurement/he;
-
-.field public static final enum axA:Lcom/google/android/gms/internal/measurement/he;
-
-.field public static final enum axB:Lcom/google/android/gms/internal/measurement/he;
-
-.field public static final enum axC:Lcom/google/android/gms/internal/measurement/he;
-
-.field public static final enum axD:Lcom/google/android/gms/internal/measurement/he;
-
-.field public static final enum axE:Lcom/google/android/gms/internal/measurement/he;
-
-.field public static final enum axF:Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum awz:Lcom/google/android/gms/internal/measurement/he;
 
 .field public static final enum axG:Lcom/google/android/gms/internal/measurement/he;
 
@@ -44,13 +32,25 @@
 
 .field public static final enum axM:Lcom/google/android/gms/internal/measurement/he;
 
-.field private static final synthetic axN:[Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum axN:Lcom/google/android/gms/internal/measurement/he;
 
-.field public static final enum axx:Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum axO:Lcom/google/android/gms/internal/measurement/he;
 
-.field public static final enum axy:Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum axP:Lcom/google/android/gms/internal/measurement/he;
 
-.field public static final enum axz:Lcom/google/android/gms/internal/measurement/he;
+.field public static final enum axQ:Lcom/google/android/gms/internal/measurement/he;
+
+.field public static final enum axR:Lcom/google/android/gms/internal/measurement/he;
+
+.field public static final enum axS:Lcom/google/android/gms/internal/measurement/he;
+
+.field public static final enum axT:Lcom/google/android/gms/internal/measurement/he;
+
+.field public static final enum axU:Lcom/google/android/gms/internal/measurement/he;
+
+.field public static final enum axV:Lcom/google/android/gms/internal/measurement/he;
+
+.field private static final synthetic axW:[Lcom/google/android/gms/internal/measurement/he;
 
 
 # instance fields
@@ -65,7 +65,7 @@
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axR:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aya:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v2, 0x1
 
@@ -75,11 +75,11 @@
 
     invoke-direct {v0, v4, v3, v1, v2}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->awp:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axQ:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axZ:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v4, 0x5
 
@@ -87,11 +87,11 @@
 
     invoke-direct {v0, v5, v2, v1, v4}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axx:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v5, 0x2
 
@@ -99,11 +99,11 @@
 
     invoke-direct {v0, v6, v5, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->awq:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v6, 0x3
 
@@ -111,11 +111,11 @@
 
     invoke-direct {v0, v7, v6, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axy:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v7, 0x4
 
@@ -123,21 +123,21 @@
 
     invoke-direct {v0, v8, v7, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axz:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     const-string v8, "FIXED64"
 
     invoke-direct {v0, v8, v4, v1, v2}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axA:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v8, 0x6
 
@@ -145,11 +145,11 @@
 
     invoke-direct {v0, v9, v8, v1, v4}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axB:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axS:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayb:Lcom/google/android/gms/internal/measurement/hh;
 
     const/4 v9, 0x7
 
@@ -157,51 +157,51 @@
 
     invoke-direct {v0, v10, v9, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axC:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hd;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayc:Lcom/google/android/gms/internal/measurement/hh;
 
     const-string v10, "STRING"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/hd;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hh;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axD:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hg;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     const-string v10, "GROUP"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/hg;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hh;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axE:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axN:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hf;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     const-string v10, "MESSAGE"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/hf;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hh;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axF:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axO:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hi;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayd:Lcom/google/android/gms/internal/measurement/hh;
 
     const-string v10, "BYTES"
 
     invoke-direct {v0, v10, v1}, Lcom/google/android/gms/internal/measurement/hi;-><init>(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/hh;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axP:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v10, 0xc
 
@@ -209,11 +209,11 @@
 
     invoke-direct {v0, v11, v10, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axQ:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axV:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aye:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v11, 0xd
 
@@ -221,11 +221,11 @@
 
     invoke-direct {v0, v12, v11, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axR:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v12, 0xe
 
@@ -233,11 +233,11 @@
 
     invoke-direct {v0, v13, v12, v1, v4}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axS:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v13, 0xf
 
@@ -245,11 +245,11 @@
 
     invoke-direct {v0, v14, v13, v1, v2}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v14, 0x10
 
@@ -257,11 +257,11 @@
 
     invoke-direct {v0, v15, v14, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axU:Lcom/google/android/gms/internal/measurement/he;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v15, 0x11
 
@@ -269,95 +269,95 @@
 
     invoke-direct {v0, v14, v15, v1, v3}, Lcom/google/android/gms/internal/measurement/he;-><init>(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/hh;I)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axV:Lcom/google/android/gms/internal/measurement/he;
 
     const/16 v0, 0x12
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/he;
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awp:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awy:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axx:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awq:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->awz:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axy:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axz:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axA:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axB:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axC:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axD:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
 
     const/16 v2, 0x8
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axE:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axN:Lcom/google/android/gms/internal/measurement/he;
 
     const/16 v2, 0x9
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axF:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axO:Lcom/google/android/gms/internal/measurement/he;
 
     const/16 v2, 0xa
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axG:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axP:Lcom/google/android/gms/internal/measurement/he;
 
     const/16 v2, 0xb
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axH:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axQ:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axI:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axR:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v11
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axJ:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axS:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v12
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axK:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axT:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v13
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axL:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axU:Lcom/google/android/gms/internal/measurement/he;
 
     const/16 v2, 0x10
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axM:Lcom/google/android/gms/internal/measurement/he;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/he;->axV:Lcom/google/android/gms/internal/measurement/he;
 
     aput-object v1, v0, v15
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axN:[Lcom/google/android/gms/internal/measurement/he;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/he;->axW:[Lcom/google/android/gms/internal/measurement/he;
 
     return-void
 .end method
@@ -392,7 +392,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/he;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axN:[Lcom/google/android/gms/internal/measurement/he;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/he;->axW:[Lcom/google/android/gms/internal/measurement/he;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/he;->clone()Ljava/lang/Object;
 
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 789199d806..558bc651b4 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
@@ -14,25 +14,25 @@
 
 
 # static fields
-.field public static final enum axO:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum axX:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axP:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum axY:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axQ:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum axZ:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axR:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum aya:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axS:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum ayb:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axT:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum ayc:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axU:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum ayd:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axV:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum aye:Lcom/google/android/gms/internal/measurement/hh;
 
-.field public static final enum axW:Lcom/google/android/gms/internal/measurement/hh;
+.field public static final enum ayf:Lcom/google/android/gms/internal/measurement/hh;
 
-.field private static final synthetic axX:[Lcom/google/android/gms/internal/measurement/hh;
+.field private static final synthetic ayg:[Lcom/google/android/gms/internal/measurement/hh;
 
 
 # instance fields
@@ -55,7 +55,7 @@
 
     invoke-direct {v0, v3, v1, v2}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v4, v3, v2}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -87,7 +87,7 @@
 
     invoke-direct {v0, v5, v4, v2}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axQ:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axZ:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -103,7 +103,7 @@
 
     invoke-direct {v0, v6, v5, v2}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axR:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->aya:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -115,7 +115,7 @@
 
     invoke-direct {v0, v7, v6, v2}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axS:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayb:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -127,11 +127,11 @@
 
     invoke-direct {v0, v7, v2, v8}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axT:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayc:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->aua:Lcom/google/android/gms/internal/measurement/cn;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/cn;->auj:Lcom/google/android/gms/internal/measurement/cn;
 
     const/4 v8, 0x6
 
@@ -139,7 +139,7 @@
 
     invoke-direct {v0, v9, v8, v7}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayd:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -151,7 +151,7 @@
 
     invoke-direct {v0, v10, v9, v7}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axV:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->aye:Lcom/google/android/gms/internal/measurement/hh;
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/hh;
 
@@ -161,49 +161,49 @@
 
     invoke-direct {v0, v11, v10, v7}, Lcom/google/android/gms/internal/measurement/hh;-><init>(Ljava/lang/String;ILjava/lang/Object;)V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     const/16 v0, 0x9
 
     new-array v0, v0, [Lcom/google/android/gms/internal/measurement/hh;
 
-    sget-object v7, Lcom/google/android/gms/internal/measurement/hh;->axO:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/hh;->axX:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axP:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axY:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axQ:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axZ:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axR:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aya:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axS:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayb:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axT:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayc:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axU:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayd:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axV:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->aye:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->axW:Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/hh;->ayf:Lcom/google/android/gms/internal/measurement/hh;
 
     aput-object v1, v0, v10
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->axX:[Lcom/google/android/gms/internal/measurement/hh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayg:[Lcom/google/android/gms/internal/measurement/hh;
 
     return-void
 .end method
@@ -228,7 +228,7 @@
 .method public static values()[Lcom/google/android/gms/internal/measurement/hh;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hh;->axX:[Lcom/google/android/gms/internal/measurement/hh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hh;->ayg:[Lcom/google/android/gms/internal/measurement/hh;
 
     invoke-virtual {v0}, [Lcom/google/android/gms/internal/measurement/hh;->clone()Ljava/lang/Object;
 
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 880906c6da..665d446f02 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static axY:Lcom/google/android/gms/internal/measurement/hj;
+.field private static ayh:Lcom/google/android/gms/internal/measurement/hj;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hj;->axY:Lcom/google/android/gms/internal/measurement/hj;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hj;->ayh:Lcom/google/android/gms/internal/measurement/hj;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hj;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hj;->axY:Lcom/google/android/gms/internal/measurement/hj;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hj;->ayh:Lcom/google/android/gms/internal/measurement/hj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hj;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hj;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hm;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hm;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hm;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hj;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 eb977befff..2d1ed1ae96 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
@@ -498,7 +498,7 @@
     .end annotation
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
 .end method
 
 .method public abstract y(II)V
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 80b3cd48f5..246d1f2b48 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hl;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hl;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hl;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hl;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 3bbbddf773..d9654ba768 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .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 c55c18fd96..a0ddf6f51f 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 f6d93fbda9..8b2ca4261e 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayb:Lcom/google/android/gms/internal/measurement/ho;
+.field private static ayk:Lcom/google/android/gms/internal/measurement/ho;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ho;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ho;->ayb:Lcom/google/android/gms/internal/measurement/ho;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ho;->ayk:Lcom/google/android/gms/internal/measurement/ho;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ho;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ho;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ho;->ayb:Lcom/google/android/gms/internal/measurement/ho;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ho;->ayk:Lcom/google/android/gms/internal/measurement/ho;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ho;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ho;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hn;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hn;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hn;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ho;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 2817ad0a76..e4cfabfc0d 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayc:Lcom/google/android/gms/internal/measurement/hp;
+.field private static ayl:Lcom/google/android/gms/internal/measurement/hp;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hp;->ayc:Lcom/google/android/gms/internal/measurement/hp;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hp;->ayl:Lcom/google/android/gms/internal/measurement/hp;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hp;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hp;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hp;->ayc:Lcom/google/android/gms/internal/measurement/hp;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hp;->ayl:Lcom/google/android/gms/internal/measurement/hp;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hp;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ht;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ht;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ht;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hp;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hp;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 e2247dff3b..7f38468f86 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hq;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hq;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hq;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hr.smali
index 3eea671c3d..e146b80bae 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/hr.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hr;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hr;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hr;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hr;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 24ac67ce4b..9d63a76e4c 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static volatile ayd:Lcom/google/android/gms/internal/measurement/gs;
+.field private static volatile aym:Lcom/google/android/gms/internal/measurement/gs;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ht.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ht.smali
index 87019c8631..e79427ae45 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ht.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ht.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()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 d2da13c277..a4c0acae41 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 96b61864e5..77387389e6 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static aye:Lcom/google/android/gms/internal/measurement/hv;
+.field private static ayn:Lcom/google/android/gms/internal/measurement/hv;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hv;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hv;->aye:Lcom/google/android/gms/internal/measurement/hv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayn:Lcom/google/android/gms/internal/measurement/hv;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hv;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hv;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hv;->aye:Lcom/google/android/gms/internal/measurement/hv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hv;->ayn:Lcom/google/android/gms/internal/measurement/hv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hv;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hv;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hu;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hu;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hu;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hv;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hv;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 a5997e1a56..c3e7ed09c0 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayf:Lcom/google/android/gms/internal/measurement/hw;
+.field private static ayo:Lcom/google/android/gms/internal/measurement/hw;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/hw;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayf:Lcom/google/android/gms/internal/measurement/hw;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayo:Lcom/google/android/gms/internal/measurement/hw;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hw;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/hw;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayf:Lcom/google/android/gms/internal/measurement/hw;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hw;->ayo:Lcom/google/android/gms/internal/measurement/hw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hw;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/hw;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/hz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hz;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/hz;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hw;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/hw;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 d497bed2a4..8d8d735a80 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/hx;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/hx;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.id.app_launch.event_ordering_fix"
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -75,12 +75,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hx;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hx;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 bc725c9b53..b2fb4d9161 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/hy;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/hy;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/hy;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/hy;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 d50858a604..4ce82510c0 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()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 92813ffbbe..1d45d8ca35 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/i;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/i;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/i;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/i;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -24,10 +24,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -44,13 +44,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/i;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/i;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/i;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/kv;->getGmpAppId(Lcom/google/android/gms/internal/measurement/lv;)V
 
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 9e2dd4fa4e..a7abae37b8 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
@@ -4,52 +4,49 @@
 
 
 # virtual methods
-.method public abstract nk()J
+.method public abstract nn()J
 .end method
 
-.method public abstract qS()J
+.method public abstract qB()J
 .end method
 
-.method public abstract qw()Ljava/lang/String;
+.method public abstract qV()J
 .end method
 
-.method public abstract qy()J
+.method public abstract qz()Ljava/lang/String;
 .end method
 
-.method public abstract rZ()J
+.method public abstract sc()J
 .end method
 
-.method public abstract sd()J
+.method public abstract sg()J
 .end method
 
-.method public abstract sf()J
+.method public abstract si()J
 .end method
 
-.method public abstract sk()J
+.method public abstract sn()J
 .end method
 
-.method public abstract sq()J
+.method public abstract st()J
 .end method
 
-.method public abstract ua()J
+.method public abstract uA()Ljava/lang/String;
 .end method
 
-.method public abstract ub()J
+.method public abstract uB()J
 .end method
 
-.method public abstract uc()Ljava/lang/String;
-.end method
-
-.method public abstract ud()Ljava/lang/String;
+.method public abstract ud()J
 .end method
 
 .method public abstract ue()J
 .end method
 
-.method public abstract uf()J
+.method public abstract uf()Ljava/lang/String;
 .end method
 
-.method public abstract ug()J
+.method public abstract ug()Ljava/lang/String;
 .end method
 
 .method public abstract uh()J
@@ -100,8 +97,11 @@
 .method public abstract uw()J
 .end method
 
-.method public abstract ux()Ljava/lang/String;
+.method public abstract ux()J
 .end method
 
 .method public abstract uy()J
 .end method
+
+.method public abstract uz()J
+.end method
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 1b47aa0f13..7e3caaff04 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayh:Lcom/google/android/gms/internal/measurement/ib;
+.field private static ayq:Lcom/google/android/gms/internal/measurement/ib;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ib;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
     return-void
 .end method
@@ -79,107 +79,53 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ib;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ib;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nk()J
+.method public static nn()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sq()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->st()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static qS()J
+.method public static qV()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qy()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qB()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static rW()J
+.method public static rZ()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uk()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static rY()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ul()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static sd()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->um()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static sf()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -192,246 +138,66 @@
     return-wide v0
 .end method
 
-.method public static sk()J
+.method public static sb()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ue()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uo()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static sq()J
+.method public static sg()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->rZ()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->up()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uA()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ud()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static uB()J
+.method public static si()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uw()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uq()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uC()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ux()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static uD()J
+.method public static sn()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uy()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static ub()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ua()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static uc()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qw()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static ud()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uc()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public static ue()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qS()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static uf()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sk()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static ug()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uf()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static uh()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ug()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static ui()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -444,12 +210,210 @@
     return-wide v0
 .end method
 
+.method public static st()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sc()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static uC()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ue()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static uD()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ug()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static uE()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uz()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static uF()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uA()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static uG()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uB()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static ue()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ud()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static uf()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qz()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static ug()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uf()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public static uh()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->qV()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static ui()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sn()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
 .method public static uj()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -465,9 +429,9 @@
 .method public static uk()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -480,18 +444,36 @@
     return-wide v0
 .end method
 
-.method public static um()J
+.method public static ul()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->nk()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uk()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static um()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ul()J
 
     move-result-wide v0
 
@@ -501,33 +483,15 @@
 .method public static un()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sd()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public static uo()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
-
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sf()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->um()J
 
     move-result-wide v0
 
@@ -537,15 +501,15 @@
 .method public static up()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uo()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->nn()J
 
     move-result-wide v0
 
@@ -555,15 +519,15 @@
 .method public static uq()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->up()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->sg()J
 
     move-result-wide v0
 
@@ -573,15 +537,15 @@
 .method public static ur()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uq()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->si()J
 
     move-result-wide v0
 
@@ -591,9 +555,9 @@
 .method public static us()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -609,9 +573,9 @@
 .method public static ut()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -627,9 +591,9 @@
 .method public static uu()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -645,9 +609,9 @@
 .method public static uv()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -663,9 +627,9 @@
 .method public static uw()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -678,18 +642,54 @@
     return-wide v0
 .end method
 
-.method public static uz()J
+.method public static ux()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayh:Lcom/google/android/gms/internal/measurement/ib;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ub()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uw()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static uy()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->ux()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public static uz()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ib;->ayq:Lcom/google/android/gms/internal/measurement/ib;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ib;->rC()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/android/gms/internal/measurement/ia;
+
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ia;->uy()J
 
     move-result-wide v0
 
@@ -698,12 +698,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ib;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 6ef2ae346a..f6c35529cb 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayi:Lcom/google/android/gms/internal/measurement/ic;
+.field private static ayr:Lcom/google/android/gms/internal/measurement/ic;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ic;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayi:Lcom/google/android/gms/internal/measurement/ic;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayr:Lcom/google/android/gms/internal/measurement/ic;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ic;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ic;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayi:Lcom/google/android/gms/internal/measurement/ic;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayr:Lcom/google/android/gms/internal/measurement/ic;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,9 +105,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayi:Lcom/google/android/gms/internal/measurement/ic;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ic;->ayr:Lcom/google/android/gms/internal/measurement/ic;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ic;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ic;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ic;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 958feecd0c..88109509f2 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
@@ -81,7 +81,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -161,7 +161,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -177,7 +177,7 @@
     .end annotation
 .end field
 
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayR:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -187,7 +187,77 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayS:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayT:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayU:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayV:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayW:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayX:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayY:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayZ:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -198,56 +268,6 @@
 .end field
 
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayk:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayl:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final aym:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayn:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayo:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -267,31 +287,11 @@
     .end annotation
 .end field
 
-.field private static final ayq:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayr:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ays:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -301,7 +301,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -311,7 +311,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -351,7 +351,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -390,7 +390,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-wide/32 v3, 0x5265c00
 
@@ -400,7 +400,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.log_tag"
 
@@ -410,7 +410,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.config.url_authority"
 
@@ -420,7 +420,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.config.url_scheme"
 
@@ -430,7 +430,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayl:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
     const-wide/16 v5, 0x3e8
 
@@ -440,7 +440,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->aym:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->ayv:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v7, "measurement.lifetimevalue.max_currency_tracked"
 
@@ -450,7 +450,7 @@
 
     move-result-object v7
 
-    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->ayn:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v7, Lcom/google/android/gms/internal/measurement/id;->ayw:Lcom/google/android/gms/internal/measurement/be;
 
     const-wide/32 v7, 0x186a0
 
@@ -460,7 +460,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayo:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayx:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v9, "measurement.experiment.max_ids"
 
@@ -470,7 +470,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayy:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v9, "measurement.audience.filter_result_max_count"
 
@@ -480,7 +480,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayq:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayz:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v9, "measurement.alarm_manager.minimum_interval"
 
@@ -490,7 +490,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayr:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/be;
 
     const-wide/16 v9, 0x1f4
 
@@ -500,7 +500,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayB:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.monitoring.sample_period_millis"
 
@@ -508,7 +508,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayC:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.upload.realtime_upload_interval"
 
@@ -516,7 +516,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/id;->ayu:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/id;->ayD:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.upload.refresh_blacklisted_config_interval"
 
@@ -526,7 +526,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/id;->ayv:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/id;->ayE:Lcom/google/android/gms/internal/measurement/be;
 
     const-wide/32 v1, 0x36ee80
 
@@ -536,7 +536,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayw:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayF:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.service_client.idle_disconnect_millis"
 
@@ -546,7 +546,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayx:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayG:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.log_tag.service"
 
@@ -556,7 +556,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayy:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayH:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.upload.stale_data_deletion_interval"
 
@@ -564,7 +564,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayz:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayI:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.backoff_period"
 
@@ -574,7 +574,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayJ:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.initial_upload_delay_time"
 
@@ -584,7 +584,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayB:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayK:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.interval"
 
@@ -592,7 +592,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayC:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayL:Lcom/google/android/gms/internal/measurement/be;
 
     const-wide/32 v3, 0x10000
 
@@ -602,7 +602,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayD:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayM:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.upload.max_bundles"
 
@@ -612,7 +612,7 @@
 
     move-result-object v11
 
-    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayE:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v11, Lcom/google/android/gms/internal/measurement/id;->ayN:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v11, "measurement.upload.max_conversions_per_day"
 
@@ -620,7 +620,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayF:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayO:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v9, "measurement.upload.max_error_events_per_day"
 
@@ -628,7 +628,7 @@
 
     move-result-object v9
 
-    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayG:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v9, Lcom/google/android/gms/internal/measurement/id;->ayP:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v9, "measurement.upload.max_events_per_bundle"
 
@@ -636,7 +636,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayH:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayQ:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.upload.max_events_per_day"
 
@@ -644,7 +644,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayI:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayR:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.upload.max_public_events_per_day"
 
@@ -654,7 +654,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayJ:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayS:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.upload.max_queue_time"
 
@@ -664,7 +664,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayK:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayT:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.upload.max_realtime_events_per_day"
 
@@ -674,7 +674,7 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayL:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v5, Lcom/google/android/gms/internal/measurement/id;->ayU:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v5, "measurement.upload.max_batch_size"
 
@@ -682,7 +682,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayM:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayV:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.retry_count"
 
@@ -692,7 +692,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayN:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayW:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.retry_time"
 
@@ -702,7 +702,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayO:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayX:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.url"
 
@@ -712,7 +712,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayP:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/id;->ayY:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.upload.window_interval"
 
@@ -720,7 +720,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/id;->ayQ:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/id;->ayZ:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -735,12 +735,12 @@
 
 
 # virtual methods
-.method public final nk()J
+.method public final nn()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayB:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayK:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -753,12 +753,12 @@
     return-wide v0
 .end method
 
-.method public final qS()J
+.method public final qB()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayn:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayv:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -771,26 +771,166 @@
     return-wide v0
 .end method
 
-.method public final qw()Ljava/lang/String;
+.method public final qV()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayw:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 qz()Ljava/lang/String;
     .locals 1
 
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ays:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final sc()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayI:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 sg()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayM:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 si()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayO:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 sn()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayy:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 st()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayJ:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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()Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayY:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final uB()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayZ:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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/id;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final qy()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->aym:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -803,166 +943,12 @@
     return-wide v0
 .end method
 
-.method public final rZ()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayz:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 sd()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayD:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 sf()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayF:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 sk()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayp:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 sq()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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/id;->aya:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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/id;->ayg:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayk:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final ud()Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayl:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
 .method public final ue()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayo:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -975,48 +961,40 @@
     return-wide v0
 .end method
 
-.method public final uf()J
-    .locals 2
+.method public final uf()Ljava/lang/String;
+    .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayq:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     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 ug()J
-    .locals 2
+.method public final ug()Ljava/lang/String;
+    .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayr:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     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 uh()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ays:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayx:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1032,9 +1010,9 @@
 .method public final ui()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayt:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayz:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1050,9 +1028,9 @@
 .method public final uj()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayu:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayA:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1068,9 +1046,9 @@
 .method public final uk()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayv:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayB:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1086,9 +1064,9 @@
 .method public final ul()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayx:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayC:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1104,9 +1082,9 @@
 .method public final um()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayC:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayD:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1124,7 +1102,7 @@
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayE:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1142,7 +1120,7 @@
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayG:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1158,9 +1136,9 @@
 .method public final up()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayH:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayL:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1176,9 +1154,9 @@
 .method public final uq()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayI:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayN:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1194,9 +1172,9 @@
 .method public final ur()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayJ:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayP:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1212,9 +1190,9 @@
 .method public final us()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayK:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayQ:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1230,9 +1208,9 @@
 .method public final ut()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayL:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayR:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1248,9 +1226,9 @@
 .method public final uu()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayM:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayS:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1266,9 +1244,9 @@
 .method public final uv()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayN:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayT:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1284,9 +1262,9 @@
 .method public final uw()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayO:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayU:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1299,26 +1277,48 @@
     return-wide v0
 .end method
 
-.method public final ux()Ljava/lang/String;
-    .locals 1
+.method public final ux()J
+    .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayP:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayV:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
-    check-cast v0, Ljava/lang/String;
+    check-cast v0, Ljava/lang/Long;
 
-    return-object v0
+    invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
 .end method
 
 .method public final uy()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayQ:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayW:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 uz()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/id;->ayX:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 38a2a96241..78a687e001 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ie;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ie;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.id.service.disable_install_state_reporting"
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ie;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ie;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ie;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ie;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 6dba0baa98..5e8f740d55 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 32e9fd7706..7fdbf4245b 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayR:Lcom/google/android/gms/internal/measurement/ih;
+.field private static aza:Lcom/google/android/gms/internal/measurement/ih;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ih;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayR:Lcom/google/android/gms/internal/measurement/ih;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ih;->aza:Lcom/google/android/gms/internal/measurement/ih;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ih;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ih;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->ayR:Lcom/google/android/gms/internal/measurement/ih;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ih;->aza:Lcom/google/android/gms/internal/measurement/ih;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ih;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ig;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ig;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ig;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ih;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 87979f9a10..e5d5d29da1 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayS:Lcom/google/android/gms/internal/measurement/ii;
+.field private static azb:Lcom/google/android/gms/internal/measurement/ii;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ii;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayS:Lcom/google/android/gms/internal/measurement/ii;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ii;->azb:Lcom/google/android/gms/internal/measurement/ii;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ii;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ii;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ii;->ayS:Lcom/google/android/gms/internal/measurement/ii;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ii;->azb:Lcom/google/android/gms/internal/measurement/ii;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ii;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ii;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/il;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/il;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/il;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ii;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ii;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 f3546110b0..12c8087841 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ij;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ij;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 e8042954a4..1b0172c5ce 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ik;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ik;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ik;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ik;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 bb27b0600d..0b95c2a40e 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()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 b7d157d238..def2ce1ae7 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 3bc61fcebf..2a2ef88e27 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayT:Lcom/google/android/gms/internal/measurement/in;
+.field private static azc:Lcom/google/android/gms/internal/measurement/in;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/in;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/in;->ayT:Lcom/google/android/gms/internal/measurement/in;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/in;->azc:Lcom/google/android/gms/internal/measurement/in;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/in;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/in;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/in;->ayT:Lcom/google/android/gms/internal/measurement/in;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/in;->azc:Lcom/google/android/gms/internal/measurement/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/in;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/in;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/im;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/im;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/im;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/in;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/in;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 e68b6162f0..248f095725 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayU:Lcom/google/android/gms/internal/measurement/io;
+.field private static azd:Lcom/google/android/gms/internal/measurement/io;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/io;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/io;->ayU:Lcom/google/android/gms/internal/measurement/io;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/io;->azd:Lcom/google/android/gms/internal/measurement/io;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/io;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/io;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->ayU:Lcom/google/android/gms/internal/measurement/io;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azd:Lcom/google/android/gms/internal/measurement/io;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->ayU:Lcom/google/android/gms/internal/measurement/io;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azd:Lcom/google/android/gms/internal/measurement/io;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ir;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->nO()Z
 
     move-result v0
 
@@ -123,15 +123,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->ayU:Lcom/google/android/gms/internal/measurement/io;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/io;->azd:Lcom/google/android/gms/internal/measurement/io;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/io;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ir;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ir;->pH()Z
 
     move-result v0
 
@@ -140,12 +140,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/io;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/io;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 6f81a67bee..529b1bbd29 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/ip;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.id.upload_dsid_enabled"
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -75,12 +75,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ip;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 c9b090aa40..6c52dadfc6 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
@@ -7,26 +7,6 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +17,27 @@
     .end annotation
 .end field
 
-.field private static final ayk:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayt:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -70,7 +70,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/iq;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iq;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.collection.init_params_control_enabled"
 
@@ -80,7 +80,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/iq;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/iq;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.sdk.dynamite.use_dynamite2"
 
@@ -88,7 +88,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/iq;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/iq;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.id.sdk.dynamite.use_dynamite"
 
@@ -98,7 +98,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -113,12 +113,12 @@
 
 
 # virtual methods
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ays:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -131,12 +131,12 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -152,9 +152,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iq;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 b583fb714b..da054f6241 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
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
 .method public abstract zzb()Z
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 8b452ae7fe..e0a2c80fb0 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 7852417da8..85e64786a0 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
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private atx:Z
+.field private atG:Z
 
-.field private final ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aze:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -138,19 +138,19 @@
 .method public final ac(J)Landroid/os/Bundle;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/it;->atx:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/it;->atG: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/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1, p1, p2}, Ljava/lang/Object;->wait(J)V
     :try_end_1
@@ -169,7 +169,7 @@
 
     :cond_0
     :goto_0
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -194,23 +194,23 @@
 .method public final b(Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aze: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/it;->atx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/measurement/it;->atG: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/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/it;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {p1}, Ljava/lang/Object;->notify()V
 
@@ -221,7 +221,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/it;->aze: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/iu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iu.smali
index c806f784aa..0ca5c79d2c 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/iu.smali
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayW:Lcom/google/android/gms/internal/measurement/iu;
+.field private static azf:Lcom/google/android/gms/internal/measurement/iu;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/iu;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iu;->ayW:Lcom/google/android/gms/internal/measurement/iu;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iu;->azf:Lcom/google/android/gms/internal/measurement/iu;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iu;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iu;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iu;->ayW:Lcom/google/android/gms/internal/measurement/iu;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iu;->azf:Lcom/google/android/gms/internal/measurement/iu;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iu;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iu;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/is;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/is;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/is;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iu;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iu;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 bf38e37b76..b0049ffb1c 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayX:Lcom/google/android/gms/internal/measurement/iv;
+.field private static azg:Lcom/google/android/gms/internal/measurement/iv;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/iv;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iv;->ayX:Lcom/google/android/gms/internal/measurement/iv;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iv;->azg:Lcom/google/android/gms/internal/measurement/iv;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iv;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/iv;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->ayX:Lcom/google/android/gms/internal/measurement/iv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azg:Lcom/google/android/gms/internal/measurement/iv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,9 +105,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->ayX:Lcom/google/android/gms/internal/measurement/iv;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iv;->azg:Lcom/google/android/gms/internal/measurement/iv;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/iv;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iv;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/iv;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 fecae7f1d7..bb18c40ddb 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/iw;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/iw;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 e92346bed6..d6e1e78f20 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ix;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ix;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -58,9 +58,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ix;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ix;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 a6bf360c5e..a4a161011e 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 6867d86da8..b52efcb3b8 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/j;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/j;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/j;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/j;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -24,10 +24,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -44,13 +44,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/j;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/j;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/j;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/kv;->getCurrentScreenName(Lcom/google/android/gms/internal/measurement/lv;)V
 
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 761d0419e1..369acbab14 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayY:Lcom/google/android/gms/internal/measurement/ja;
+.field private static azh:Lcom/google/android/gms/internal/measurement/ja;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ja;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ja;->ayY:Lcom/google/android/gms/internal/measurement/ja;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ja;->azh:Lcom/google/android/gms/internal/measurement/ja;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ja;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ja;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ja;->ayY:Lcom/google/android/gms/internal/measurement/ja;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ja;->azh:Lcom/google/android/gms/internal/measurement/ja;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ja;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ja;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/iz;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iz;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/iz;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ja;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ja;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 b22bc3e7d3..b0f4986801 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static ayZ:Lcom/google/android/gms/internal/measurement/jb;
+.field private static azi:Lcom/google/android/gms/internal/measurement/jb;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jb;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jb;->ayZ:Lcom/google/android/gms/internal/measurement/jb;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jb;->azi:Lcom/google/android/gms/internal/measurement/jb;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jb;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jb;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->ayZ:Lcom/google/android/gms/internal/measurement/jb;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->azi:Lcom/google/android/gms/internal/measurement/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,9 +105,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->ayZ:Lcom/google/android/gms/internal/measurement/jb;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jb;->azi:Lcom/google/android/gms/internal/measurement/jb;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jb;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jb;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jb;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 95eb81b066..4550de12c2 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jc;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jc;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jc;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 49b2aadb5a..5ba94476b2 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/jd;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/jd;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.id.service.fix_gmp_version"
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jd;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jd;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -78,9 +78,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jd;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jd;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 a4cfaa1605..a2377ea6da 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static aza:Lcom/google/android/gms/internal/measurement/jg;
+.field private static azj:Lcom/google/android/gms/internal/measurement/jg;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jg;->aza:Lcom/google/android/gms/internal/measurement/jg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jg;->azj:Lcom/google/android/gms/internal/measurement/jg;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jg;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jg;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->aza:Lcom/google/android/gms/internal/measurement/jg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azj:Lcom/google/android/gms/internal/measurement/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,9 +105,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->aza:Lcom/google/android/gms/internal/measurement/jg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jg;->azj:Lcom/google/android/gms/internal/measurement/jg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jg;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jg;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jg;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 6a65497e09..d562e4778e 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azb:Lcom/google/android/gms/internal/measurement/jh;
+.field private static azk:Lcom/google/android/gms/internal/measurement/jh;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jh;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jh;->azb:Lcom/google/android/gms/internal/measurement/jh;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jh;->azk:Lcom/google/android/gms/internal/measurement/jh;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jh;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jh;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azb:Lcom/google/android/gms/internal/measurement/jh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azk:Lcom/google/android/gms/internal/measurement/jh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azb:Lcom/google/android/gms/internal/measurement/jh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azk:Lcom/google/android/gms/internal/measurement/jh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jk;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jk;->nO()Z
 
     move-result v0
 
@@ -123,9 +123,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azb:Lcom/google/android/gms/internal/measurement/jh;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jh;->azk:Lcom/google/android/gms/internal/measurement/jh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jh;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -134,12 +134,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jh;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jh;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 8dfe0c9c7c..d73004d052 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ji;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ji;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -58,9 +58,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ji;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ji;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 9ce379d0a1..b1bc0bf4aa 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jj;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jj;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.client.sessions.start_session_before_view_screen"
 
@@ -58,7 +58,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -73,12 +73,12 @@
 
 
 # virtual methods
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -94,9 +94,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jj;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 81a7808ebe..73f2b10c15 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
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
 .method public abstract zzb()Z
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 719931016e..3045cdc9fb 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
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
 .method public abstract zzb()Z
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 7501ad9f8a..aeeda9b1dc 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azc:Lcom/google/android/gms/internal/measurement/jm;
+.field private static azl:Lcom/google/android/gms/internal/measurement/jm;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jm;->azc:Lcom/google/android/gms/internal/measurement/jm;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jm;->azl:Lcom/google/android/gms/internal/measurement/jm;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jm;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jm;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azc:Lcom/google/android/gms/internal/measurement/jm;
+    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;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,15 +105,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jm;->azc:Lcom/google/android/gms/internal/measurement/jm;
+    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;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jm;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jl;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jl;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jl;->pH()Z
 
     move-result v0
 
@@ -122,12 +122,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jm;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jm;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 53ac495248..45dd92246c 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azd:Lcom/google/android/gms/internal/measurement/jn;
+.field private static azm:Lcom/google/android/gms/internal/measurement/jn;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jn;->azd:Lcom/google/android/gms/internal/measurement/jn;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jn;->azm:Lcom/google/android/gms/internal/measurement/jn;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jn;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jn;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jn;->azd:Lcom/google/android/gms/internal/measurement/jn;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jn;->azm:Lcom/google/android/gms/internal/measurement/jn;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jn;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jn;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jq;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jq;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jn;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jn;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 75a51068cd..10820938ed 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/jo;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
 
@@ -58,7 +58,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -73,12 +73,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -94,9 +94,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jo;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 fc0ed04539..69c1887918 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jp;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jp;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jp;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jp;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 865dba7dc8..cf8d683f24 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 0cf9f29ba7..ff167756ca 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static aze:Lcom/google/android/gms/internal/measurement/js;
+.field private static azn:Lcom/google/android/gms/internal/measurement/js;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/js;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/js;->aze:Lcom/google/android/gms/internal/measurement/js;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/js;->azn:Lcom/google/android/gms/internal/measurement/js;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/js;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/js;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->aze:Lcom/google/android/gms/internal/measurement/js;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->azn:Lcom/google/android/gms/internal/measurement/js;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,9 +105,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->aze:Lcom/google/android/gms/internal/measurement/js;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/js;->azn:Lcom/google/android/gms/internal/measurement/js;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/js;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/js;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/js;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 8dba57cecd..9f80e8358d 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azf:Lcom/google/android/gms/internal/measurement/jt;
+.field private static azo:Lcom/google/android/gms/internal/measurement/jt;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jt;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jt;->azf:Lcom/google/android/gms/internal/measurement/jt;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jt;->azo:Lcom/google/android/gms/internal/measurement/jt;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jt;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jt;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->azf:Lcom/google/android/gms/internal/measurement/jt;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jt;->azo:Lcom/google/android/gms/internal/measurement/jt;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jt;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jt;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jx;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jx;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jt;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jt;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 bc4f19ca0d..1fb1978a11 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jv;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jv;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -58,9 +58,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jv;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jv;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 80255fbb14..9ac798a517 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jw;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jw;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jw;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jw;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 5e178d4201..e4b3dcf5e5 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()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 c3f44cee8e..b0d2ed2edb 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
@@ -4,13 +4,13 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pO()Z
+.method public abstract pR()Z
 .end method
 
-.method public abstract qd()Z
+.method public abstract qg()Z
 .end method
 
 .method public abstract zzb()Z
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 0cf3b1bc2d..e329f31ab9 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azg:Lcom/google/android/gms/internal/measurement/jz;
+.field private static azp:Lcom/google/android/gms/internal/measurement/jz;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/jz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/jz;->azg:Lcom/google/android/gms/internal/measurement/jz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jz;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/jz;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azg:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,54 +102,54 @@
     return v0
 .end method
 
-.method public static pO()Z
+.method public static pR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azg:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->qd()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->qg()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qB()Z
+.method public static qE()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azg:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->pO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->pR()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azg:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/jy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/jy;->nO()Z
 
     move-result v0
 
@@ -159,9 +159,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azg:Lcom/google/android/gms/internal/measurement/jz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/jz;->azp:Lcom/google/android/gms/internal/measurement/jz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/jz;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -170,12 +170,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jz;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/jz;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 335b2d79d8..6598f5677e 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/k;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/k;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/k;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/k;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -24,10 +24,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -44,13 +44,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/k;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/k;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/k;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/kv;->generateEventId(Lcom/google/android/gms/internal/measurement/lv;)V
 
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 23db34240d..80b4385fff 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azh:Lcom/google/android/gms/internal/measurement/ka;
+.field private static azq:Lcom/google/android/gms/internal/measurement/ka;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ka;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ka;->azh:Lcom/google/android/gms/internal/measurement/ka;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ka;->azq:Lcom/google/android/gms/internal/measurement/ka;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ka;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ka;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azh:Lcom/google/android/gms/internal/measurement/ka;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azq:Lcom/google/android/gms/internal/measurement/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azh:Lcom/google/android/gms/internal/measurement/ka;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azq:Lcom/google/android/gms/internal/measurement/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kd;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->nO()Z
 
     move-result v0
 
@@ -123,15 +123,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azh:Lcom/google/android/gms/internal/measurement/ka;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ka;->azq:Lcom/google/android/gms/internal/measurement/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ka;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kd;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kd;->pH()Z
 
     move-result v0
 
@@ -140,12 +140,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ka;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ka;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 ac9fa09cfa..1c7dba1031 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
@@ -7,26 +7,6 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +17,27 @@
     .end annotation
 .end field
 
-.field private static final ayk:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayt:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -70,7 +70,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.sdk.collection.last_deep_link_referrer_campaign"
 
@@ -78,7 +78,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kb;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.sdk.collection.last_gclid_from_referrer"
 
@@ -86,7 +86,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kb;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.sdk.collection.worker_thread_referrer"
 
@@ -96,7 +96,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -111,12 +111,12 @@
 
 
 # virtual methods
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -129,12 +129,12 @@
     return v0
 .end method
 
-.method public final pO()Z
+.method public final pR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -147,12 +147,12 @@
     return v0
 .end method
 
-.method public final qd()Z
+.method public final qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ays:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -168,9 +168,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kb;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 0012b96d0b..855e2ee5b5 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
@@ -7,26 +7,6 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,6 +17,26 @@
     .end annotation
 .end field
 
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -60,7 +60,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.lifecycle.app_backgrounded_tracking"
 
@@ -68,7 +68,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kc;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.lifecycle.app_in_background_parameter"
 
@@ -76,7 +76,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kc;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -91,12 +91,12 @@
 
 
 # virtual methods
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ays:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -109,12 +109,12 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -130,9 +130,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kc;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 1dbf2ae4f6..112bd58c5d 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
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
 .method public abstract zzb()Z
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 d69845ea5b..bd433fe921 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
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
 .method public abstract zzb()Z
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 bad6036f87..48528da208 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azi:Lcom/google/android/gms/internal/measurement/kf;
+.field private static azr:Lcom/google/android/gms/internal/measurement/kf;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kf;->azi:Lcom/google/android/gms/internal/measurement/kf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kf;->azr:Lcom/google/android/gms/internal/measurement/kf;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kf;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kf;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azi:Lcom/google/android/gms/internal/measurement/kf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azr:Lcom/google/android/gms/internal/measurement/kf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,15 +105,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azi:Lcom/google/android/gms/internal/measurement/kf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kf;->azr:Lcom/google/android/gms/internal/measurement/kf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kf;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ke;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ke;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ke;->pH()Z
 
     move-result v0
 
@@ -122,12 +122,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kf;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kf;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 a9b67928bb..e15261913d 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azj:Lcom/google/android/gms/internal/measurement/kg;
+.field private static azs:Lcom/google/android/gms/internal/measurement/kg;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kg;->azj:Lcom/google/android/gms/internal/measurement/kg;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kg;->azs:Lcom/google/android/gms/internal/measurement/kg;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kg;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kg;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kg;->azj:Lcom/google/android/gms/internal/measurement/kg;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kg;->azs:Lcom/google/android/gms/internal/measurement/kg;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kg;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kg;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kj;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kj;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kj;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kg;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kg;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 8ad9b5ee1f..27b5f437e5 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -50,7 +50,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/kh;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/kh;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.personalized_ads_property_translation_enabled"
 
@@ -58,7 +58,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -73,12 +73,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -94,9 +94,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kh;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 c4721eb32d..be5ad9b926 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ki;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ki;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ki;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ki;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 decf927372..e10aa4569f 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()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 f221863e12..065b481d4a 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
@@ -4,17 +4,17 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
-.method public abstract rN()D
+.method public abstract rQ()D
 .end method
 
-.method public abstract rP()J
+.method public abstract rS()J
 .end method
 
-.method public abstract ud()Ljava/lang/String;
+.method public abstract uC()J
 .end method
 
-.method public abstract uz()J
+.method public abstract ug()Ljava/lang/String;
 .end method
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 4f468719d2..442255092b 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azk:Lcom/google/android/gms/internal/measurement/kl;
+.field private static azt:Lcom/google/android/gms/internal/measurement/kl;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kl;->azk:Lcom/google/android/gms/internal/measurement/kl;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
 
     return-void
 .end method
@@ -79,77 +79,77 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kl;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kl;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static qx()J
+.method public static qA()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azk:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->rP()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->rS()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static rP()J
+.method public static rS()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azk:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->uz()J
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->uC()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public static uA()Ljava/lang/String;
+.method public static uD()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azk:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->ud()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->ug()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public static uE()D
+.method public static uH()D
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azk:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->rN()D
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->rQ()D
 
     move-result-wide v0
 
@@ -159,15 +159,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azk:Lcom/google/android/gms/internal/measurement/kl;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kl;->azt:Lcom/google/android/gms/internal/measurement/kl;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kl;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kk;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kk;->pH()Z
 
     move-result v0
 
@@ -176,12 +176,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kl;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kl;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 cfe7c95071..7179b0846f 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azl:Lcom/google/android/gms/internal/measurement/km;
+.field private static azu:Lcom/google/android/gms/internal/measurement/km;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/km;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/km;->azl:Lcom/google/android/gms/internal/measurement/km;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/km;->azu:Lcom/google/android/gms/internal/measurement/km;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/km;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/km;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/km;->azl:Lcom/google/android/gms/internal/measurement/km;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/km;->azu:Lcom/google/android/gms/internal/measurement/km;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/km;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/km;->rC()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;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kp;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/km;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/km;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 cb01d4699b..4b5c96c000 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private static final ayk:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayt:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field private static final ayl:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayu:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -80,7 +80,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.test.double_flag"
 
@@ -88,7 +88,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.test.int_flag"
 
@@ -98,7 +98,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.test.long_flag"
 
@@ -108,7 +108,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/kn;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v1, "measurement.test.string_flag"
 
@@ -118,7 +118,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayl:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -133,12 +133,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -151,12 +151,12 @@
     return v0
 .end method
 
-.method public final rN()D
+.method public final rQ()D
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -169,12 +169,12 @@
     return-wide v0
 .end method
 
-.method public final rP()J
+.method public final rS()J
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -187,12 +187,30 @@
     return-wide v0
 .end method
 
-.method public final ud()Ljava/lang/String;
+.method public final uC()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ays:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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()Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayl:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -200,21 +218,3 @@
 
     return-object v0
 .end method
-
-.method public final uz()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kn;->ayj:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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
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 d0ab4bd153..858acce107 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ko;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ko;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ko;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ko;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 f72ea2cf90..60ae8f9045 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()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 2245dc513d..1fb9e88d8e 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 97f6614c46..9ac2966cf4 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azm:Lcom/google/android/gms/internal/measurement/kr;
+.field private static azv:Lcom/google/android/gms/internal/measurement/kr;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kr;->azm:Lcom/google/android/gms/internal/measurement/kr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kr;->azv:Lcom/google/android/gms/internal/measurement/kr;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kr;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kr;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->azm:Lcom/google/android/gms/internal/measurement/kr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kr;->azv:Lcom/google/android/gms/internal/measurement/kr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kr;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kr;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kq;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kq;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kq;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kr;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kr;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 e5d162a6ef..bcb5d3a8cb 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azn:Lcom/google/android/gms/internal/measurement/ks;
+.field private static azw:Lcom/google/android/gms/internal/measurement/ks;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ks;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ks;->azn:Lcom/google/android/gms/internal/measurement/ks;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ks;->azw:Lcom/google/android/gms/internal/measurement/ks;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ks;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ks;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->azn:Lcom/google/android/gms/internal/measurement/ks;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ks;->azw:Lcom/google/android/gms/internal/measurement/ks;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ks;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ks;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kw;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kw;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ks;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ks;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 a712cca254..70888b1995 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kt;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kt;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 949fd6b336..96ca33f595 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ku;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ku;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ku;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ku;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 334df2ae04..8b31b5f33d 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 e11045f535..844c68e1fb 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 a57ed16097..d7c062c90e 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azo:Lcom/google/android/gms/internal/measurement/ky;
+.field private static azx:Lcom/google/android/gms/internal/measurement/ky;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ky;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ky;->azo:Lcom/google/android/gms/internal/measurement/ky;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ky;->azx:Lcom/google/android/gms/internal/measurement/ky;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ky;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ky;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->azo:Lcom/google/android/gms/internal/measurement/ky;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ky;->azx:Lcom/google/android/gms/internal/measurement/ky;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ky;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/kx;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kx;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/kx;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ky;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ky;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 97480e7fbf..1aa31152bf 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azp:Lcom/google/android/gms/internal/measurement/kz;
+.field private static azy:Lcom/google/android/gms/internal/measurement/kz;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/kz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kz;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/kz;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,126 +102,126 @@
     return v0
 .end method
 
-.method public static pO()Z
+.method public static pR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->qd()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->qg()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qB()Z
+.method public static qE()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->pO()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->pR()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->nO()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static rQ()Z
+.method public static rT()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->ro()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->rr()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static ro()Z
+.method public static rr()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->uF()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->uI()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uF()Z
+.method public static uI()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->qB()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->qE()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static uG()Z
+.method public static uJ()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lc;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->rQ()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lc;->rT()Z
 
     move-result v0
 
@@ -231,9 +231,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azp:Lcom/google/android/gms/internal/measurement/kz;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/kz;->azy:Lcom/google/android/gms/internal/measurement/kz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/kz;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -242,12 +242,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kz;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/kz;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 317dda46b2..1062c8c7f4 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic ask:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic ast:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asq:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asz:Lcom/google/android/gms/internal/measurement/it;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -19,15 +19,15 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/l;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/l;->ast:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/l;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/l;->anq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/l;->zzd:Ljava/lang/String;
 
     iput-boolean p4, p0, Lcom/google/android/gms/internal/measurement/l;->zze:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/l;->asq:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/l;->asz:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -36,10 +36,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->asq:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->asz:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -56,19 +56,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/l;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/l;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/l;->anq:Ljava/lang/String;
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/l;->zzd:Ljava/lang/String;
 
     iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/l;->zze:Z
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/l;->asq:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v4, p0, Lcom/google/android/gms/internal/measurement/l;->asz:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/kv;->getUserProperties(Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/internal/measurement/lv;)V
 
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 8981a6ae3d..70f74fac4c 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/la;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/la;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/la;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 30be231fd4..6ea743c1cb 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
@@ -7,26 +7,6 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +17,7 @@
     .end annotation
 .end field
 
-.field private static final ayk:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -47,7 +27,7 @@
     .end annotation
 .end field
 
-.field private static final ayl:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -57,7 +37,7 @@
     .end annotation
 .end field
 
-.field private static final aym:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayt:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -67,7 +47,27 @@
     .end annotation
 .end field
 
-.field private static final ayn:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayu:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayv:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayw:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -77,7 +77,7 @@
     .end annotation
 .end field
 
-.field private static final ayo:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayx:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -87,7 +87,7 @@
     .end annotation
 .end field
 
-.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayy:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -120,7 +120,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.audience.session_scoped_user_engagement"
 
@@ -128,7 +128,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const/4 v2, 0x1
 
@@ -138,7 +138,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/internal/measurement/lb;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v3, Lcom/google/android/gms/internal/measurement/lb;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v3, "measurement.service.audience.scoped_engagement_removal_when_session_expired"
 
@@ -146,7 +146,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.audience.session_scoped_event_aggregates"
 
@@ -154,7 +154,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayl:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.audience.use_bundle_timestamp_for_property_filters"
 
@@ -162,7 +162,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->aym:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayv:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.id.scoped_audience_filters"
 
@@ -172,7 +172,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayn:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayw:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.audience.not_prepend_timestamps_for_sequence_session_scoped_filters"
 
@@ -180,7 +180,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayo:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lb;->ayx:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.audience.remove_disabled_session_scoped_user_engagement"
 
@@ -188,7 +188,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayp:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayy:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -203,84 +203,12 @@
 
 
 # virtual methods
-.method public final nL()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayg:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 pO()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayk:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 qB()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayl:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 qd()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayj:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 rQ()Z
+.method public final nO()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -293,12 +221,12 @@
     return v0
 .end method
 
-.method public final ro()Z
+.method public final pR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayo:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -311,12 +239,84 @@
     return v0
 .end method
 
-.method public final uF()Z
+.method public final qE()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->aym:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayu:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 qg()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ays:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 rT()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayy:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 rr()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayx:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 uI()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayv:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -332,9 +332,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lb;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 0a0a6bf111..5e5d577130 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
@@ -4,25 +4,25 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pO()Z
+.method public abstract pR()Z
 .end method
 
-.method public abstract qB()Z
+.method public abstract qE()Z
 .end method
 
-.method public abstract qd()Z
+.method public abstract qg()Z
 .end method
 
-.method public abstract rQ()Z
+.method public abstract rT()Z
 .end method
 
-.method public abstract ro()Z
+.method public abstract rr()Z
 .end method
 
-.method public abstract uF()Z
+.method public abstract uI()Z
 .end method
 
 .method public abstract zzb()Z
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 bd240d7213..78a7eabb4d 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
@@ -4,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
 .method public abstract zzb()Z
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 0722caf64e..73bf69d5dd 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azq:Lcom/google/android/gms/internal/measurement/le;
+.field private static azz:Lcom/google/android/gms/internal/measurement/le;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/le;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/le;->azq:Lcom/google/android/gms/internal/measurement/le;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/le;->azz:Lcom/google/android/gms/internal/measurement/le;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/le;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/le;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azq:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azz:Lcom/google/android/gms/internal/measurement/le;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,18 +102,18 @@
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azq:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azz:Lcom/google/android/gms/internal/measurement/le;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ld;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ld;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ld;->nO()Z
 
     move-result v0
 
@@ -123,15 +123,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azq:Lcom/google/android/gms/internal/measurement/le;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/le;->azz:Lcom/google/android/gms/internal/measurement/le;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/le;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ld;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ld;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/ld;->pH()Z
 
     move-result v0
 
@@ -140,12 +140,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/le;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/le;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 d436a2cef8..c30b69026b 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azr:Lcom/google/android/gms/internal/measurement/lf;
+.field private static azA:Lcom/google/android/gms/internal/measurement/lf;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/lf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lf;->azr:Lcom/google/android/gms/internal/measurement/lf;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lf;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lf;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azr:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -102,36 +102,36 @@
     return v0
 .end method
 
-.method public static pO()Z
+.method public static pR()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azr:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/li;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->qd()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->qg()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public static qd()Z
+.method public static qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azr:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/li;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->nL()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->nO()Z
 
     move-result v0
 
@@ -141,15 +141,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azr:Lcom/google/android/gms/internal/measurement/lf;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lf;->azA:Lcom/google/android/gms/internal/measurement/lf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lf;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/li;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/li;->pH()Z
 
     move-result v0
 
@@ -158,12 +158,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lf;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lf;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
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 af7d46775c..8a58087933 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
@@ -7,26 +7,6 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,6 +17,26 @@
     .end annotation
 .end field
 
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -60,7 +60,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.sessions.session_number_enabled"
 
@@ -68,7 +68,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lg;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
 
@@ -76,7 +76,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lg;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -91,12 +91,12 @@
 
 
 # virtual methods
-.method public final nL()Z
+.method public final nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ays:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -109,12 +109,12 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -130,9 +130,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lg;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 6ec37b99ee..816c336ef9 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
@@ -7,26 +7,6 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private static final ayg:Lcom/google/android/gms/internal/measurement/be;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/internal/measurement/be<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 .field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -37,7 +17,27 @@
     .end annotation
 .end field
 
-.field private static final ayk:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayp:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ays:Lcom/google/android/gms/internal/measurement/be;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/internal/measurement/be<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static final ayt:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -70,7 +70,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.client.sessions.immediate_start_enabled_foreground"
 
@@ -78,7 +78,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
 
@@ -86,7 +86,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ayj:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/lh;->ays:Lcom/google/android/gms/internal/measurement/be;
 
     const-string v2, "measurement.client.sessions.session_id_enabled"
 
@@ -94,7 +94,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayk:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -109,12 +109,30 @@
 
 
 # virtual methods
-.method public final nL()Z
+.method public final nO()Z
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ays:Lcom/google/android/gms/internal/measurement/be;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()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 pH()Z
     .locals 1
 
     sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -127,30 +145,12 @@
     return v0
 .end method
 
-.method public final pE()Z
+.method public final qg()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayt:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()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 qd()Z
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayk:Lcom/google/android/gms/internal/measurement/be;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -166,9 +166,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayg:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lh;->ayp:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
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 57a1bda5f0..a9cc45180f 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
@@ -4,13 +4,13 @@
 
 
 # virtual methods
-.method public abstract nL()Z
+.method public abstract nO()Z
 .end method
 
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
 
-.method public abstract qd()Z
+.method public abstract qg()Z
 .end method
 
 .method public abstract zzb()Z
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 f2c32ca038..9d258a301f 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azs:Lcom/google/android/gms/internal/measurement/lk;
+.field private static azB:Lcom/google/android/gms/internal/measurement/lk;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/lk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lk;->azs:Lcom/google/android/gms/internal/measurement/lk;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lk;->azB:Lcom/google/android/gms/internal/measurement/lk;
 
     return-void
 .end method
@@ -79,17 +79,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lk;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lk;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
 
-.method public static nL()Z
+.method public static nO()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azs:Lcom/google/android/gms/internal/measurement/lk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azB:Lcom/google/android/gms/internal/measurement/lk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -105,9 +105,9 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azs:Lcom/google/android/gms/internal/measurement/lk;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lk;->azB:Lcom/google/android/gms/internal/measurement/lk;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lk;->rC()Ljava/lang/Object;
 
     const/4 v0, 0x1
 
@@ -116,12 +116,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lk;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lk;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ll.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ll.smali
index 23d1c4f999..c151ff8066 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ll.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ll.smali
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azt:Lcom/google/android/gms/internal/measurement/ll;
+.field private static azC:Lcom/google/android/gms/internal/measurement/ll;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/ll;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ll;->azt:Lcom/google/android/gms/internal/measurement/ll;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ll;->azC:Lcom/google/android/gms/internal/measurement/ll;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ll;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/ll;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ll;->azt:Lcom/google/android/gms/internal/measurement/ll;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ll;->azC:Lcom/google/android/gms/internal/measurement/ll;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ll;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ll;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lo;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lo;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lo;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ll;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/ll;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lm.smali
index 04392b628b..6b8ea8b9eb 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lm.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lm;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lm;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -58,9 +58,9 @@
 .method public final zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lm;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lm;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ln.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ln.smali
index 8fee31a352..df3534eebf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ln.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ln.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ln;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ln;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ln;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ln;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lo.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lo.smali
index f18d4da8c8..1fef7be0ad 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lo.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 bbfec19f14..490e44b3c6 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
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 0a1e15d82e..31f930c71c 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
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azu:Lcom/google/android/gms/internal/measurement/lq;
+.field private static azD:Lcom/google/android/gms/internal/measurement/lq;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/lq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lq;->azu:Lcom/google/android/gms/internal/measurement/lq;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lq;->azD:Lcom/google/android/gms/internal/measurement/lq;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lq;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lq;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lq;->azu:Lcom/google/android/gms/internal/measurement/lq;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lq;->azD:Lcom/google/android/gms/internal/measurement/lq;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lq;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lq;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lp;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lp;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lp;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lq;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lq;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lr.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lr.smali
index 276bcd9035..503b48edb2 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lr.smali
@@ -18,11 +18,11 @@
 
 
 # static fields
-.field private static azv:Lcom/google/android/gms/internal/measurement/lr;
+.field private static azE:Lcom/google/android/gms/internal/measurement/lr;
 
 
 # instance fields
-.field private final axZ:Lcom/google/android/gms/internal/measurement/bs;
+.field private final ayi:Lcom/google/android/gms/internal/measurement/bs;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/bs<",
@@ -41,7 +41,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/lr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lr;->azv:Lcom/google/android/gms/internal/measurement/lr;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lr;->azE:Lcom/google/android/gms/internal/measurement/lr;
 
     return-void
 .end method
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lr;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/lr;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
     return-void
 .end method
@@ -87,15 +87,15 @@
 .method public static zzb()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lr;->azv:Lcom/google/android/gms/internal/measurement/lr;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lr;->azE:Lcom/google/android/gms/internal/measurement/lr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lr;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/lr;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/lu;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lu;->pE()Z
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/lu;->pH()Z
 
     move-result v0
 
@@ -104,12 +104,12 @@
 
 
 # virtual methods
-.method public final synthetic rz()Ljava/lang/Object;
+.method public final synthetic rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lr;->axZ:Lcom/google/android/gms/internal/measurement/bs;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/lr;->ayi:Lcom/google/android/gms/internal/measurement/bs;
 
-    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rz()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/android/gms/internal/measurement/bs;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ls.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ls.smali
index 8ff88d6e27..11b133a374 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ls.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ls.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/ls;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/ls;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/ls;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/ls;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lt.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lt.smali
index 8e93c867ac..a83dbc72f7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lt.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final aya:Lcom/google/android/gms/internal/measurement/be;
+.field private static final ayj:Lcom/google/android/gms/internal/measurement/be;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/internal/measurement/be<",
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/lt;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/lt;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/lt;->aya:Lcom/google/android/gms/internal/measurement/be;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/lt;->ayj:Lcom/google/android/gms/internal/measurement/be;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rB()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/be;->rE()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lu.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lu.smali
index 037f697ff3..fda8fefd2a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lu.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lu.smali
@@ -4,5 +4,5 @@
 
 
 # virtual methods
-.method public abstract pE()Z
+.method public abstract pH()Z
 .end method
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 e82cd270d1..311a0866ce 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
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -98,7 +98,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -119,7 +119,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -140,7 +140,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -161,7 +161,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -186,7 +186,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -207,7 +207,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -228,7 +228,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -249,7 +249,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -272,7 +272,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -295,7 +295,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -322,7 +322,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -343,7 +343,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -368,7 +368,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -389,7 +389,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -420,7 +420,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -449,7 +449,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -478,7 +478,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -503,7 +503,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -526,7 +526,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -549,7 +549,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -572,7 +572,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -597,7 +597,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -620,7 +620,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -643,7 +643,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -668,7 +668,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -689,7 +689,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -710,7 +710,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -733,7 +733,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -760,7 +760,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -781,7 +781,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -802,7 +802,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -823,7 +823,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -846,7 +846,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -867,7 +867,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -888,7 +888,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -911,7 +911,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -940,7 +940,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lx.smali
index 8e2e0116d0..8c34df4425 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lx.smali
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lz.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lz.smali
index 90a97c988d..eb3c4486b5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/lz.smali
@@ -40,7 +40,7 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lz;->pG()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/lz;->pJ()I
 
     move-result p1
 
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 d9357ef3e9..21b7743ed9 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asp:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asy:Lcom/google/android/gms/internal/measurement/it;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/m;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/m;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/m;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -24,10 +24,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -44,13 +44,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/m;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/m;->asp:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/m;->asy:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/kv;->getCurrentScreenClass(Lcom/google/android/gms/internal/measurement/lv;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ma.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ma.smali
index 226e868904..4b233d1b60 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ma.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ma.smali
@@ -15,7 +15,7 @@
     .end annotation
 .end method
 
-.method public abstract pG()I
+.method public abstract pJ()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Landroid/os/RemoteException;
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mc.smali
index 5ca03fb06c..0c3ca38857 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mc.smali
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -46,7 +46,7 @@
     return-void
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$a.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$a.smali
index 10776cfecf..da12453a23 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$a.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field final anp:J
+.field final any:J
 
-.field final anq:J
+.field final anz:J
 
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final asH:Z
 
-.field private final asy:Z
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
@@ -41,34 +41,34 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;Z)V
     .locals 2
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/me;->azy:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p1, Lcom/google/android/gms/internal/measurement/me;->azH: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/measurement/me$a;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->any:J
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me;->azy:Lcom/google/android/gms/common/util/e;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me;->azH:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->anz:J
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/me$a;->asy:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/me$a;->asH:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected pD()V
+.method protected pG()V
     .locals 0
 
     return-void
@@ -77,7 +77,7 @@
 .method public run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$a;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->a(Lcom/google/android/gms/internal/measurement/me;)Z
 
@@ -85,7 +85,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/me$a;->pD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/me$a;->pG()V
 
     return-void
 
@@ -100,15 +100,15 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$a;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 v2, 0x0
 
-    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/me$a;->asy:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/internal/measurement/me$a;->asH:Z
 
     invoke-static {v1, v0, v2, v3}, Lcom/google/android/gms/internal/measurement/me;->a(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/Exception;ZZ)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/me$a;->pD()V
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/me$a;->pG()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$b.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$b.smali
index ff71aad52e..8e1c13b394 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$b.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$b.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final azI:Lcom/google/android/gms/measurement/internal/gd;
+.field private final azR:Lcom/google/android/gms/measurement/internal/gd;
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/internal/measurement/lz;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$b;->azI:Lcom/google/android/gms/measurement/internal/gd;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$b;->azR:Lcom/google/android/gms/measurement/internal/gd;
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public final a(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;J)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azI:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azR:Lcom/google/android/gms/measurement/internal/gd;
 
     move-object v1, p1
 
@@ -49,10 +49,10 @@
     return-void
 .end method
 
-.method public final pG()I
+.method public final pJ()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azI:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$b;->azR:Lcom/google/android/gms/measurement/internal/gd;
 
     invoke-static {v0}, Ljava/lang/System;->identityHashCode(Ljava/lang/Object;)I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$c.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$c.smali
index f7dc9a105a..9b2ded1328 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$c.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me$c.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic azJ:Lcom/google/android/gms/internal/measurement/me;
+.field final synthetic azS:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final onActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/v;
 
@@ -51,7 +51,7 @@
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/aa;
 
@@ -65,7 +65,7 @@
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/z;
 
@@ -79,7 +79,7 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/w;
 
@@ -97,7 +97,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/internal/measurement/it;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v2, Lcom/google/android/gms/internal/measurement/ab;
 
@@ -122,7 +122,7 @@
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/x;
 
@@ -136,7 +136,7 @@
 .method public final onActivityStopped(Landroid/app/Activity;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/y;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me.smali
index 1777939ad2..830c78e249 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/me.smali
@@ -14,19 +14,19 @@
 
 
 # static fields
-.field private static azB:Ljava/lang/Boolean; = null
+.field private static volatile azG:Lcom/google/android/gms/internal/measurement/me; = null
 
-.field private static azC:Ljava/lang/Boolean; = null
+.field private static azK:Ljava/lang/Boolean; = null
 
-.field private static azD:Ljava/lang/Boolean; = null
+.field private static azL:Ljava/lang/Boolean; = null
 
-.field private static azE:Ljava/lang/String; = "use_dynamite_api"
+.field private static azM:Ljava/lang/Boolean; = null
 
-.field private static azF:Z = false
+.field private static azN:Ljava/lang/String; = "use_dynamite_api"
 
-.field private static azG:Z = false
+.field private static azO:Z = false
 
-.field private static volatile azx:Lcom/google/android/gms/internal/measurement/me; = null
+.field private static azP:Z = false
 
 .field private static zzj:Z = false
 
@@ -34,11 +34,11 @@
 
 
 # instance fields
-.field private adI:Z
+.field private adR:Z
 
-.field private final anh:Ljava/lang/String;
+.field private final anq:Ljava/lang/String;
 
-.field private atR:Ljava/util/List;
+.field private aua:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -50,13 +50,13 @@
     .end annotation
 .end field
 
-.field private final azA:Lcom/google/android/gms/measurement/api/a;
+.field protected final azH:Lcom/google/android/gms/common/util/e;
 
-.field private azH:Lcom/google/android/gms/internal/measurement/kv;
+.field private final azI:Ljava/util/concurrent/ExecutorService;
 
-.field protected final azy:Lcom/google/android/gms/common/util/e;
+.field private final azJ:Lcom/google/android/gms/measurement/api/a;
 
-.field private final azz:Ljava/util/concurrent/ExecutorService;
+.field private azQ:Lcom/google/android/gms/internal/measurement/kv;
 
 .field private zzg:I
 
@@ -77,13 +77,13 @@
 
     const-string p2, "FA"
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nq()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azy:Lcom/google/android/gms/common/util/e;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azH:Lcom/google/android/gms/common/util/e;
 
     new-instance p2, Ljava/util/concurrent/ThreadPoolExecutor;
 
@@ -103,13 +103,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/me;->azz:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azI: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/me;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azA:Lcom/google/android/gms/measurement/api/a;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->azJ:Lcom/google/android/gms/measurement/api/a;
 
     invoke-static {p1}, Lcom/google/android/gms/internal/measurement/me;->ak(Landroid/content/Context;)Z
 
@@ -119,7 +119,7 @@
 
     if-eqz p2, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->mP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->mS()Z
 
     move-result p2
 
@@ -143,9 +143,9 @@
 
     iput-object p4, p0, Lcom/google/android/gms/internal/measurement/me;->zzq:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/measurement/me;->adI:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/measurement/me;->adR:Z
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anh:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anq: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."
 
@@ -196,7 +196,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anh:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
 
     const-string p2, "Unable to register lifecycle notifications. Application null."
 
@@ -221,7 +221,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->mP()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/me;->mS()Z
 
     move-result p0
 
@@ -262,7 +262,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/internal/measurement/kv;)Lcom/google/android/gms/internal/measurement/kv;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->azH:Lcom/google/android/gms/internal/measurement/kv;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->azQ:Lcom/google/android/gms/internal/measurement/kv;
 
     return-object p1
 .end method
@@ -272,7 +272,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/me;->azx:Lcom/google/android/gms/internal/measurement/me;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/me;->azG:Lcom/google/android/gms/internal/measurement/me;
 
     if-nez v0, :cond_1
 
@@ -281,7 +281,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azx:Lcom/google/android/gms/internal/measurement/me;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azG:Lcom/google/android/gms/internal/measurement/me;
 
     if-nez v1, :cond_0
 
@@ -301,7 +301,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/internal/measurement/me;-><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/me;->azx:Lcom/google/android/gms/internal/measurement/me;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azG:Lcom/google/android/gms/internal/measurement/me;
 
     :cond_0
     monitor-exit v0
@@ -319,7 +319,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azx:Lcom/google/android/gms/internal/measurement/me;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azG:Lcom/google/android/gms/internal/measurement/me;
 
     return-object p0
 .end method
@@ -327,7 +327,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/me;Ljava/util/List;)Ljava/util/List;
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->atR:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/me;->aua:Ljava/util/List;
 
     return-object p1
 .end method
@@ -351,15 +351,15 @@
 .method private final a(Ljava/lang/Exception;ZZ)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adI:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adR:Z
 
     or-int/2addr v0, p2
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adI:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/measurement/me;->adR:Z
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anh:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
 
     const-string p3, "Data collection startup failed. No data will be collected."
 
@@ -375,7 +375,7 @@
     invoke-direct {p0, p2, p1}, Lcom/google/android/gms/internal/measurement/me;->q(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/me;->anh:Ljava/lang/String;
+    iget-object p3, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
 
     invoke-static {p3, p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
@@ -385,7 +385,7 @@
 .method static synthetic a(Lcom/google/android/gms/internal/measurement/me;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lcom/google/android/gms/internal/measurement/me;->adI:Z
+    iget-boolean p0, p0, Lcom/google/android/gms/internal/measurement/me;->adR:Z
 
     return p0
 .end method
@@ -468,7 +468,7 @@
 
     sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/me;->azD:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/me;->azM:Ljava/lang/Boolean;
 
     goto :goto_0
 
@@ -483,12 +483,12 @@
 
     sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object v2, Lcom/google/android/gms/internal/measurement/me;->azD:Ljava/lang/Boolean;
+    sput-object v2, Lcom/google/android/gms/internal/measurement/me;->azM:Ljava/lang/Boolean;
 
     goto :goto_0
 
     :cond_2
-    sput-object v0, Lcom/google/android/gms/internal/measurement/me;->azD:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/me;->azM:Ljava/lang/Boolean;
     :try_end_1
     .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -516,7 +516,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/me;->azD:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/me;->azM:Ljava/lang/Boolean;
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
@@ -529,11 +529,11 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     :goto_2
-    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azD:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azM:Ljava/lang/Boolean;
 
     if-nez p0, :cond_3
 
-    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azB:Ljava/lang/Boolean;
+    sget-object p0, Lcom/google/android/gms/internal/measurement/me;->azK:Ljava/lang/Boolean;
 
     :cond_3
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
@@ -578,7 +578,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;->mB()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mE()Ljava/lang/String;
 
     move-result-object p0
     :try_end_0
@@ -603,11 +603,11 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azB:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azK:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azC:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
@@ -633,11 +633,11 @@
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azB:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azK:Ljava/lang/Boolean;
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azC:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
     :try_end_2
     .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
@@ -659,7 +659,7 @@
 
     move-result-object p0
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azE:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azN:Ljava/lang/String;
 
     invoke-interface {p0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
@@ -669,7 +669,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azB:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azK:Ljava/lang/Boolean;
 
     sget-object v1, Lcom/google/android/gms/internal/measurement/me;->zzm:Ljava/lang/String;
 
@@ -681,13 +681,13 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azC:Ljava/lang/Boolean;
+    sput-object v1, Lcom/google/android/gms/internal/measurement/me;->azL: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/me;->azE:Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/me;->azN:Ljava/lang/String;
 
     invoke-interface {p0, v1}, Landroid/content/SharedPreferences$Editor;->remove(Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
@@ -719,11 +719,11 @@
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azB:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azK:Ljava/lang/Boolean;
 
     sget-object p0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azC:Ljava/lang/Boolean;
+    sput-object p0, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
 
     :goto_0
     monitor-exit v0
@@ -761,7 +761,7 @@
 .method static synthetic b(Lcom/google/android/gms/internal/measurement/me;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->anh:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->anq:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -769,7 +769,7 @@
 .method static synthetic c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->azH:Lcom/google/android/gms/internal/measurement/kv;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->azQ:Lcom/google/android/gms/internal/measurement/kv;
 
     return-object p0
 .end method
@@ -777,12 +777,12 @@
 .method static synthetic d(Lcom/google/android/gms/internal/measurement/me;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->atR:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/android/gms/internal/measurement/me;->aua:Ljava/util/List;
 
     return-object p0
 .end method
 
-.method private static mP()Z
+.method private static mS()Z
     .locals 1
 
     :try_start_0
@@ -861,10 +861,10 @@
     return-void
 .end method
 
-.method static synthetic uH()Ljava/lang/Boolean;
+.method static synthetic uK()Ljava/lang/Boolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/me;->azC:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/me;->azL:Ljava/lang/Boolean;
 
     return-object v0
 .end method
@@ -877,12 +877,12 @@
     if-eqz p2, :cond_0
 
     :try_start_0
-    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amM:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amV:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     goto :goto_0
 
     :cond_0
-    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amJ:Lcom/google/android/gms/dynamite/DynamiteModule$b;
+    sget-object p2, Lcom/google/android/gms/dynamite/DynamiteModule;->amS:Lcom/google/android/gms/dynamite/DynamiteModule$b;
 
     :goto_0
     const-string v0, "com.google.android.gms.measurement.dynamite"
@@ -922,7 +922,7 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/me$a;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me;->azz:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/me;->azI:Ljava/util/concurrent/ExecutorService;
 
     invoke-interface {v0, p1}, Ljava/util/concurrent/ExecutorService;->execute(Ljava/lang/Runnable;)V
 
@@ -969,7 +969,7 @@
     return-void
 .end method
 
-.method public final qx()J
+.method public final qA()J
     .locals 5
 
     new-instance v0, Lcom/google/android/gms/internal/measurement/it;
@@ -1004,7 +1004,7 @@
 
     move-result-wide v1
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/me;->azy:Lcom/google/android/gms/common/util/e;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/me;->azH: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/mg.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mg.smali
index 245350b032..64b18471f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/mg.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asn:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asw:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic azK:Landroid/os/Bundle;
+.field private final synthetic azT:Landroid/os/Bundle;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -17,13 +17,13 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/mg;->asn:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/mg;->asw:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/mg;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/mg;->anq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/mg;->zzd:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/mg;->azK:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/mg;->azT:Landroid/os/Bundle;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -40,17 +40,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/mg;->asn:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/mg;->asw:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/mg;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/mg;->anq:Ljava/lang/String;
 
     iget-object v2, p0, Lcom/google/android/gms/internal/measurement/mg;->zzd:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/mg;->azK:Landroid/os/Bundle;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/mg;->azT:Landroid/os/Bundle;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->clearConditionalUserProperty(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
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 608e5d6365..8f967ba3a7 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final synthetic asr:Ljava/lang/Object;
+.field private final synthetic asA:Ljava/lang/Object;
 
-.field private final synthetic ass:Ljava/lang/Object;
+.field private final synthetic asB:Ljava/lang/Object;
 
-.field private final synthetic ast:Ljava/lang/Object;
+.field private final synthetic asC:Ljava/lang/Object;
 
-.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asD:Lcom/google/android/gms/internal/measurement/me;
 
 .field private final synthetic zzc:I
 
@@ -21,7 +21,7 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/n;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/n;->asD:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 v0, 0x5
 
@@ -29,13 +29,13 @@
 
     iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->zzd:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/n;->asr:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/n;->asA:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->ass:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->asB:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->ast:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/n;->asC:Ljava/lang/Object;
 
     const/4 p2, 0x0
 
@@ -54,7 +54,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asu:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asD:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
@@ -64,19 +64,19 @@
 
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/n;->zzd:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asr:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asA:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v4
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->ass:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asB:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v5
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->ast:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/n;->asC:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
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 e96f765437..03ded6b724 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
@@ -4,22 +4,22 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic asv:Lcom/google/android/gms/internal/measurement/it;
+.field private final synthetic asE:Lcom/google/android/gms/internal/measurement/it;
 
-.field private final synthetic asw:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/it;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/o;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/o;->asF:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/o;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/o;->anq:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/o;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/o;->asE:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -28,10 +28,10 @@
 
 
 # virtual methods
-.method protected final pD()V
+.method protected final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asE:Lcom/google/android/gms/internal/measurement/it;
 
     const/4 v1, 0x0
 
@@ -48,15 +48,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asw:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/o;->asF:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/o;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/o;->anq:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/o;->asv:Lcom/google/android/gms/internal/measurement/it;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/o;->asE:Lcom/google/android/gms/internal/measurement/it;
 
     invoke-interface {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/kv;->getMaxUserProperties(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/lv;)V
 
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 fe2084fc72..f4e07cf4e2 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asG:Lcom/google/android/gms/measurement/internal/gd;
 
-.field private final synthetic asx:Lcom/google/android/gms/measurement/internal/gd;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Lcom/google/android/gms/measurement/internal/gd;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/p;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/p;->asx:Lcom/google/android/gms/measurement/internal/gd;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/p;->asG:Lcom/google/android/gms/measurement/internal/gd;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -35,7 +35,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/me;->d(Lcom/google/android/gms/internal/measurement/me;)Ljava/util/List;
 
@@ -47,9 +47,9 @@
 
     if-ge v0, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asx:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asG:Lcom/google/android/gms/measurement/internal/gd;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/p;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v2}, Lcom/google/android/gms/internal/measurement/me;->d(Lcom/google/android/gms/internal/measurement/me;)Ljava/util/List;
 
@@ -69,7 +69,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/p;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->b(Lcom/google/android/gms/internal/measurement/me;)Ljava/lang/String;
 
@@ -89,11 +89,11 @@
     :cond_1
     new-instance v0, Lcom/google/android/gms/internal/measurement/me$b;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asx:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asG:Lcom/google/android/gms/measurement/internal/gd;
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/me$b;-><init>(Lcom/google/android/gms/measurement/internal/gd;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/me;->d(Lcom/google/android/gms/internal/measurement/me;)Ljava/util/List;
 
@@ -101,13 +101,13 @@
 
     new-instance v2, Landroid/util/Pair;
 
-    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/p;->asx:Lcom/google/android/gms/measurement/internal/gd;
+    iget-object v3, p0, Lcom/google/android/gms/internal/measurement/p;->asG:Lcom/google/android/gms/measurement/internal/gd;
 
     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;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/p;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
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 393aaeb09d..4a220c6c49 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asH:Z
 
-.field private final synthetic asy:Z
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/q;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/q;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/q;->asy:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/internal/measurement/q;->asH:Z
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -32,13 +32,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/q;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/q;->asy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/measurement/q;->asH:Z
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/internal/measurement/kv;->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 b0138acb4d..8e07b794b2 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic ask:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asA:Ljava/lang/Object;
 
-.field private final synthetic asr:Ljava/lang/Object;
+.field private final synthetic ast:Lcom/google/android/gms/internal/measurement/me;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -19,13 +19,13 @@
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/r;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/r;->ast:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/r;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/r;->anq:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/r;->zzd:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/r;->asr:Ljava/lang/Object;
+    iput-object p4, p0, Lcom/google/android/gms/internal/measurement/r;->asA:Ljava/lang/Object;
 
     const/4 p2, 0x1
 
@@ -46,17 +46,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->ask:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->ast:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/r;->anh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/r;->anq:Ljava/lang/String;
 
     iget-object v3, p0, Lcom/google/android/gms/internal/measurement/r;->zzd:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->asr:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/r;->asA:Ljava/lang/Object;
 
     invoke-static {v0}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
@@ -64,7 +64,7 @@
 
     iget-boolean v5, p0, Lcom/google/android/gms/internal/measurement/r;->zzf:Z
 
-    iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/r;->anp:J
+    iget-wide v6, p0, Lcom/google/android/gms/internal/measurement/r;->any:J
 
     invoke-interface/range {v1 .. v7}, Lcom/google/android/gms/internal/measurement/kv;->setUserProperty(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/a/a;ZJ)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 3c1c84d285..73304df468 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final asz:Ljava/lang/ClassLoader;
+.field private static final asI:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/measurement/s;->asz:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/measurement/s;->asI:Ljava/lang/ClassLoader;
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 .method public static f(Landroid/os/Parcel;)Ljava/util/HashMap;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/measurement/s;->asz:Ljava/lang/ClassLoader;
+    sget-object v0, Lcom/google/android/gms/internal/measurement/s;->asI: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/t.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/t.smali
index de1fbf603c..52d93327f6 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final synthetic asA:Ljava/lang/Long;
+.field private final synthetic asJ:Ljava/lang/Long;
 
-.field private final synthetic asB:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asK:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final synthetic asj:Landroid/os/Bundle;
+.field private final synthetic ass:Landroid/os/Bundle;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -23,17 +23,17 @@
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;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/t;->asB:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/t;->asK:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/t;->asA:Ljava/lang/Long;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/t;->asJ:Ljava/lang/Long;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/measurement/t;->zzd:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/android/gms/internal/measurement/t;->zze:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/t;->asj:Landroid/os/Bundle;
+    iput-object p5, p0, Lcom/google/android/gms/internal/measurement/t;->ass:Landroid/os/Bundle;
 
     iput-boolean p6, p0, Lcom/google/android/gms/internal/measurement/t;->zzg:Z
 
@@ -56,11 +56,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->asA:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->asJ:Ljava/lang/Long;
 
     if-nez v0, :cond_0
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/t;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/t;->any:J
 
     goto :goto_0
 
@@ -72,7 +72,7 @@
     :goto_0
     move-wide v8, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->asB:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/t;->asK:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
@@ -82,7 +82,7 @@
 
     iget-object v4, p0, Lcom/google/android/gms/internal/measurement/t;->zze:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/t;->asj:Landroid/os/Bundle;
+    iget-object v5, p0, Lcom/google/android/gms/internal/measurement/t;->ass:Landroid/os/Bundle;
 
     iget-boolean v6, p0, Lcom/google/android/gms/internal/measurement/t;->zzg:Z
 
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 ac826cea7a..7f9cbdd962 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic asC:Landroid/os/Bundle;
+.field private final synthetic asL:Landroid/os/Bundle;
 
-.field private final synthetic asl:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic asu:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/internal/measurement/me;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/u;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/u;->asu:Lcom/google/android/gms/internal/measurement/me;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/u;->asC:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/u;->asL:Landroid/os/Bundle;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -32,15 +32,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->asl:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/u;->asu:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/u;->asC:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/u;->asL:Landroid/os/Bundle;
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/u;->anp:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/u;->any:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->setConditionalUserProperty(Landroid/os/Bundle;J)V
 
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 c7b5dcac0d..728b0927f9 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
@@ -4,24 +4,24 @@
 
 
 # instance fields
-.field private final synthetic asD:Landroid/os/Bundle;
+.field private final synthetic asM:Landroid/os/Bundle;
 
-.field private final synthetic asE:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asN:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/v;->asE:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/v;->asN:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/v;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/v;->asx:Landroid/app/Activity;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/v;->asD:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/android/gms/internal/measurement/v;->asM:Landroid/os/Bundle;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -38,23 +38,23 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/v;->asE:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/v;->asN:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/v;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/v;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/v;->asD:Landroid/os/Bundle;
+    iget-object v2, p0, Lcom/google/android/gms/internal/measurement/v;->asM:Landroid/os/Bundle;
 
-    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/v;->anq:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/measurement/v;->anz:J
 
     invoke-interface {v0, v1, v2, v3, v4}, Lcom/google/android/gms/internal/measurement/kv;->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/w.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/w.smali
index a550ce2984..f122cc3b0e 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
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/w;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/w;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/w;->asx:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -34,21 +34,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/w;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/w;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/w;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/w;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/w;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/w;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->onActivityResumed(Lcom/google/android/gms/a/a;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 84a3e47f1c..b164af83bf 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
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/x;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/x;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/x;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/x;->asx:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -34,21 +34,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/x;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/x;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/x;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/x;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/x;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->onActivityStarted(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 b7a10cd2d9..f093fe6da7 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
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/y;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/y;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/y;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/y;->asx:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -34,21 +34,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/y;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/y;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/y;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/y;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/y;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/y;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->onActivityStopped(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 6d0ce4b360..d2edd2e42a 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
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private final synthetic asF:Lcom/google/android/gms/internal/measurement/me$c;
+.field private final synthetic asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-.field private final synthetic aso:Landroid/app/Activity;
+.field private final synthetic asx:Landroid/app/Activity;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me$c;Landroid/app/Activity;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iput-object p1, p0, Lcom/google/android/gms/internal/measurement/z;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->aso:Landroid/app/Activity;
+    iput-object p2, p0, Lcom/google/android/gms/internal/measurement/z;->asx:Landroid/app/Activity;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/internal/measurement/me$a;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
@@ -34,21 +34,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/z;->asF:Lcom/google/android/gms/internal/measurement/me$c;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/z;->asO:Lcom/google/android/gms/internal/measurement/me$c;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, v0, Lcom/google/android/gms/internal/measurement/me$c;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/measurement/me;->c(Lcom/google/android/gms/internal/measurement/me;)Lcom/google/android/gms/internal/measurement/kv;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/z;->aso:Landroid/app/Activity;
+    iget-object v1, p0, Lcom/google/android/gms/internal/measurement/z;->asx:Landroid/app/Activity;
 
     invoke-static {v1}, Lcom/google/android/gms/a/b;->T(Ljava/lang/Object;)Lcom/google/android/gms/a/a;
 
     move-result-object v1
 
-    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/z;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/internal/measurement/z;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/internal/measurement/kv;->onActivityPaused(Lcom/google/android/gms/a/a;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzv.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzv.smali
index 215173a711..910a4282b9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/zzv.smali
@@ -16,13 +16,13 @@
 
 
 # instance fields
-.field public final anp:J
+.field public final any:J
 
-.field public final anq:J
+.field public final anz:J
 
-.field public final asy:Z
+.field public final asH:Z
 
-.field public final azw:Landroid/os/Bundle;
+.field public final azF:Landroid/os/Bundle;
 
 .field public final zzd:Ljava/lang/String;
 
@@ -49,11 +49,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/zzv;->anp:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/measurement/zzv;->any:J
 
-    iput-wide p3, p0, Lcom/google/android/gms/internal/measurement/zzv;->anq:J
+    iput-wide p3, p0, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
 
-    iput-boolean p5, p0, Lcom/google/android/gms/internal/measurement/zzv;->asy:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/internal/measurement/zzv;->asH:Z
 
     iput-object p6, p0, Lcom/google/android/gms/internal/measurement/zzv;->zzd:Ljava/lang/String;
 
@@ -61,7 +61,7 @@
 
     iput-object p8, p0, Lcom/google/android/gms/internal/measurement/zzv;->zzf:Ljava/lang/String;
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iput-object p9, p0, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -77,19 +77,19 @@
 
     move-result p2
 
-    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->any: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/zzv;->anq:J
+    iget-wide v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->anz: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/zzv;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->asH:Z
 
     const/4 v1, 0x3
 
@@ -113,7 +113,7 @@
 
     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/zzv;->azw:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/internal/measurement/zzv;->azF: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 0d6da4ef6e..0a4f80d0fe 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 private final ajX:Landroid/os/IBinder;
+.field private final akg:Landroid/os/IBinder;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane: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;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/a;->akg:Landroid/os/IBinder;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/a;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/a;->ane: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;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->akg: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;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/a;->akg:Landroid/os/IBinder;
 
     const/4 v1, 0x0
 
@@ -78,7 +78,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->ajX:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->akg:Landroid/os/IBinder;
 
     const/16 v2, 0x7db
 
@@ -106,14 +106,14 @@
     throw v1
 .end method
 
-.method public final nJ()Landroid/os/Parcel;
+.method public final nM()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;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/a;->ane: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 6805103630..920eb3bfc0 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
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 4f3aa16fae..c58456ce16 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 lY()I
+.method public final mb()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final md()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 mb()Ljava/lang/String;
+.method public final me()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 c6e9c4148b..3c9ef0a6d1 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 aAr:Ljava/util/concurrent/ExecutorService;
+.field private final aAA:Ljava/util/concurrent/ExecutorService;
 
-.field private volatile aAs:Ljava/io/InputStream;
+.field private volatile aAB:Ljava/io/InputStream;
 
-.field private volatile aAt:Z
+.field private volatile aAC:Z
 
 
 # direct methods
@@ -20,15 +20,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAr:Ljava/util/concurrent/ExecutorService;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAA:Ljava/util/concurrent/ExecutorService;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAs:Ljava/io/InputStream;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAB:Ljava/io/InputStream;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAt:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAC:Z
 
     return-void
 .end method
@@ -40,13 +40,13 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAt:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAC:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAr:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAA: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;->aAs:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ap;->aAB: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 7351e9cff2..fdddec298d 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;->aAv:Landroid/os/ParcelFileDescriptor;
+    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE: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;->aAw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF: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;->akA:J
+    iget-wide v6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->aAv:Landroid/os/ParcelFileDescriptor;
+    iget-object p0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE: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;->aAu:[B
+    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[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 e50f184bf5..3c4f630716 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field public static final aAn: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 aAf:Lcom/google/android/gms/common/api/a$a;
+.field public static final aAo: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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aAn: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/as;->aAo: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 6581fac1a6..a7b1de838c 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,13 @@
 
 
 # static fields
-.field private static final aAG:Landroid/os/ParcelUuid;
+.field private static final aAP:Landroid/os/ParcelUuid;
 
 
 # instance fields
-.field private final aAH:I
+.field private final aAQ:I
 
-.field private final aAI:Ljava/util/List;
+.field private final aAR:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field private final aAJ:Landroid/util/SparseArray;
+.field private final aAS:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final aAK:Ljava/util/Map;
+.field private final aAT:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -38,11 +38,11 @@
     .end annotation
 .end field
 
-.field private final aAL:I
+.field private final aAU:I
 
-.field private final aAM:Ljava/lang/String;
+.field private final aAV:Ljava/lang/String;
 
-.field private final aAN:[B
+.field private final aAW:[B
 
 
 # direct methods
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/au;->aAG:Landroid/os/ParcelUuid;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/au;->aAP: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;->aAI:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/au;->aAR:Ljava/util/List;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/au;->aAJ:Landroid/util/SparseArray;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/au;->aAS:Landroid/util/SparseArray;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/au;->aAK:Ljava/util/Map;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/au;->aAT:Ljava/util/Map;
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/au;->aAM:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/au;->aAV:Ljava/lang/String;
 
-    iput p4, p0, Lcom/google/android/gms/internal/nearby/au;->aAH:I
+    iput p4, p0, Lcom/google/android/gms/internal/nearby/au;->aAQ:I
 
-    iput p5, p0, Lcom/google/android/gms/internal/nearby/au;->aAL:I
+    iput p5, p0, Lcom/google/android/gms/internal/nearby/au;->aAU:I
 
-    iput-object p7, p0, Lcom/google/android/gms/internal/nearby/au;->aAN:[B
+    iput-object p7, p0, Lcom/google/android/gms/internal/nearby/au;->aAW:[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;->aAG:Landroid/os/ParcelUuid;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aAP: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;->aAG:Landroid/os/ParcelUuid;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/au;->aAP: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;->aAN:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aAW:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/au;->aAN:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/au;->aAW:[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;->aAN:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/au;->aAW:[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;->aAH:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/au;->aAQ:I
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/au;->aAI:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/au;->aAR: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;->aAJ:Landroid/util/SparseArray;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/au;->aAS: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;->aAK:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/au;->aAT: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;->aAL:I
+    iget v3, p0, Lcom/google/android/gms/internal/nearby/au;->aAU:I
 
-    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/au;->aAM:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/internal/nearby/au;->aAV: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 e820ca73cb..ad14069ccc 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 aAV:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBe: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;->aAV:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ax;->aBe:Lcom/google/android/gms/common/api/internal/h;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp: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
 
@@ -84,7 +84,7 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp: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
 
@@ -97,9 +97,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq: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
 
@@ -112,9 +112,9 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
 
     invoke-virtual {p1, v1, v2}, Lcom/google/android/gms/nearby/messages/MessageListener;->onBleSignalChanged(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/BleSignal;)V
 
@@ -160,7 +160,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ax;->aAV:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ax;->aBe: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 2d5a151e09..a003656678 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 aAW:Ljava/util/List;
+.field private final synthetic aBf: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;->aAW:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ay;->aBf: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;->aAW:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ay;->aBf: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 42cf2ff166..549265a058 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 aAV:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBe: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 aAX:Z
+.field private aBg:Z
 
 
 # direct methods
@@ -34,9 +34,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aAX:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBg:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/az;->aAV:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/az;->aBe: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;->aAX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBg:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/az;->aAV:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/az;->aBe: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;->aAX:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/az;->aBg: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 477566e1e7..def630cda6 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 azL:Lcom/google/android/gms/internal/nearby/zzeh;
+.field private final synthetic azU: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;->azL:Lcom/google/android/gms/internal/nearby/zzeh;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/b;->azU: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;->azL:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/b;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzeh;->aAi:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/b;->azL:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/b;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
 
     iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzeh;->zzr:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/b;->azL:Lcom/google/android/gms/internal/nearby/zzeh;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/b;->azU:Lcom/google/android/gms/internal/nearby/zzeh;
 
-    iget-boolean v2, v2, Lcom/google/android/gms/internal/nearby/zzeh;->aAj:Z
+    iget-boolean v2, v2, Lcom/google/android/gms/internal/nearby/zzeh;->aAs: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 336887a723..2044037bf2 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 azN:Lcom/google/android/gms/common/api/Status;
+.field private final synthetic azW: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;->azN:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/ba;->azW: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;->azN:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azW:Lcom/google/android/gms/common/api/Status;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lN()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lQ()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azN:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azW:Lcom/google/android/gms/common/api/Status;
 
     invoke-interface {p1, v0}, Lcom/google/android/gms/common/api/internal/c$b;->c(Ljava/lang/Object;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azN:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/ba;->azW: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 c9fe395e18..3def164c30 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 aAV:Lcom/google/android/gms/common/api/internal/h;
+.field private final aBe: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;->aAV:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bd;->aBe: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;->aAV:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bd;->aBe: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 9d63ea9d75..97ec0ec311 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 aAY:Z
+.field private final synthetic aBh:Z
 
 
 # direct methods
 .method constructor <init>(Z)V
     .locals 0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/be;->aAY:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/internal/nearby/be;->aBh: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;->aAY:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/be;->aBh: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 aff8dd2679..49d9724f9b 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
@@ -3,17 +3,17 @@
 
 
 # static fields
-.field private static final aAZ:Landroid/net/Uri;
+.field private static final aBi:Landroid/net/Uri;
 
-.field private static final aBa:Landroid/net/Uri;
+.field private static final aBj:Landroid/net/Uri;
 
-.field private static final aBb:Ljava/util/regex/Pattern;
+.field private static final aBk:Ljava/util/regex/Pattern;
 
-.field private static final aBc:Ljava/util/regex/Pattern;
+.field private static final aBl:Ljava/util/regex/Pattern;
 
-.field private static final aBd:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private static final aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private static aBe:Ljava/util/HashMap;
+.field private static aBn:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private static final aBf:Ljava/util/HashMap;
+.field private static final aBo:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private static final aBg:Ljava/util/HashMap;
+.field private static final aBp:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field private static final aBh:Ljava/util/HashMap;
+.field private static final aBq:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -57,7 +57,7 @@
     .end annotation
 .end field
 
-.field private static final aBi:Ljava/util/HashMap;
+.field private static final aBr:Ljava/util/HashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashMap<",
@@ -68,11 +68,11 @@
     .end annotation
 .end field
 
-.field private static aBj:Ljava/lang/Object;
+.field private static aBs:Ljava/lang/Object;
 
-.field private static aBk:Z
+.field private static aBt:Z
 
-.field private static aBl:[Ljava/lang/String;
+.field private static aBu:[Ljava/lang/String;
 
 
 # direct methods
@@ -85,7 +85,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aAZ:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi:Landroid/net/Uri;
 
     const-string v0, "content://com.google.android.gsf.gservices/prefix"
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBa:Landroid/net/Uri;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBb:Ljava/util/regex/Pattern;
+    sput-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBk: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;->aBc:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBl: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;->aBd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBm: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;->aBf:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBo: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;->aBg:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBp: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;->aBh:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBq: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;->aBi:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBr:Ljava/util/HashMap;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBl:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBu:[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;->aBj:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBs:Ljava/lang/Object;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBe:Ljava/util/HashMap;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBe:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBl:[Ljava/lang/String;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBu:[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;->aBk:Z
+    sget-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBt:Z
 
     if-eqz v1, :cond_2
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBe:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBl:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBu:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBe:Ljava/util/HashMap;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBk:Z
+    sput-boolean v7, Lcom/google/android/gms/internal/nearby/bg;->aBt:Z
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBe:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBe:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
 
     invoke-virtual {p0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -351,7 +351,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
-    sget-object v9, Lcom/google/android/gms/internal/nearby/bg;->aAZ:Landroid/net/Uri;
+    sget-object v9, Lcom/google/android/gms/internal/nearby/bg;->aBi:Landroid/net/Uri;
 
     const/4 v10, 0x0
 
@@ -472,7 +472,7 @@
         }
     .end annotation
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBa:Landroid/net/Uri;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBj: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;->aBj:Ljava/lang/Object;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBs:Ljava/lang/Object;
 
     if-ne p0, v1, :cond_0
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBe:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBf:Ljava/util/HashMap;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/bg;->aBo: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;->aBb:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aBk: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;->aBc:Ljava/util/regex/Pattern;
+    sget-object v3, Lcom/google/android/gms/internal/nearby/bg;->aBl: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;->aBf:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBo: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;->aBj:Ljava/lang/Object;
+    sget-object v4, Lcom/google/android/gms/internal/nearby/bg;->aBs: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;->aBe:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBe:Ljava/util/HashMap;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V
 
@@ -731,17 +731,17 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBe:Ljava/util/HashMap;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBn: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;->aBj:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBs:Ljava/lang/Object;
 
-    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBk:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBt:Z
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aAZ:Landroid/net/Uri;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBi:Landroid/net/Uri;
 
     const/4 v1, 0x1
 
@@ -754,7 +754,7 @@
     return-void
 
     :cond_0
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBm: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;->aBe:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBn:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBf:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBo:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBg:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBp:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBh:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBq:Ljava/util/HashMap;
 
     invoke-virtual {p0}, Ljava/util/HashMap;->clear()V
 
-    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBi:Ljava/util/HashMap;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBr: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;->aBj:Ljava/lang/Object;
+    sput-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBs:Ljava/lang/Object;
 
-    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBk:Z
+    sput-boolean v1, Lcom/google/android/gms/internal/nearby/bg;->aBt: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;->aBj:Ljava/lang/Object;
+    sget-object p0, Lcom/google/android/gms/internal/nearby/bg;->aBs:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -820,10 +820,10 @@
     throw p0
 .end method
 
-.method static synthetic uI()Ljava/util/concurrent/atomic/AtomicBoolean;
+.method static synthetic uL()Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    sget-object v0, Lcom/google/android/gms/internal/nearby/bg;->aBm: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 3a114faf08..28e1fb0723 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;->uI()Ljava/util/concurrent/atomic/AtomicBoolean;
+    invoke-static {}, Lcom/google/android/gms/internal/nearby/bg;->uL()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 d7c4b0b1aa..4f1db04ec0 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 aBm:Lcom/google/android/gms/internal/nearby/zzu;
+.field final aBv: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;->aBm:Lcom/google/android/gms/internal/nearby/zzu;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bk;->aBv: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 75a8e86508..f9d3ff4ec7 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,11 @@
 
 
 # instance fields
-.field private final aBn:J
+.field private aBA:Lcom/google/android/gms/internal/nearby/ap;
 
-.field private final aBo:Ljava/util/Set;
+.field private final aBw:J
+
+.field private final aBx:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -25,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final aBp:Ljava/util/Set;
+.field private final aBy:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -35,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final aBq:Ljava/util/Set;
+.field private final aBz:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -45,8 +47,6 @@
     .end annotation
 .end field
 
-.field private aBr:Lcom/google/android/gms/internal/nearby/ap;
-
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/os/Looper;Lcom/google/android/gms/common/internal/d;Lcom/google/android/gms/common/api/i$a;Lcom/google/android/gms/common/api/i$b;)V
@@ -72,19 +72,19 @@
 
     invoke-direct {p1}, Landroidx/collection/ArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBo:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBx: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;->aBp:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBy: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;->aBq:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBz: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;->aBn:J
+    iput-wide p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBw: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;->aBo:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBx: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;->aBp:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBy: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;->aBq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBz: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;->aBo:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBx:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBp:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBy:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBq:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBz:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBr:Lcom/google/android/gms/internal/nearby/ap;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBA: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;->aBr:Lcom/google/android/gms/internal/nearby/ap;
+    iput-object v0, p0, Lcom/google/android/gms/internal/nearby/bm;->aBA:Lcom/google/android/gms/internal/nearby/ap;
 
     :cond_3
     return-void
@@ -416,7 +416,7 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/internal/nearby/ap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBr:Lcom/google/android/gms/internal/nearby/ap;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBA: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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->mU()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;->aBm:Lcom/google/android/gms/internal/nearby/zzu;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/bk;->aBv: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,7 +482,7 @@
     return-void
 .end method
 
-.method public final lW()Z
+.method public final lZ()Z
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/bm;->getContext()Landroid/content/Context;
@@ -496,22 +496,14 @@
     return v0
 .end method
 
-.method public final lY()I
-    .locals 1
-
-    const v0, 0xbdfcb8
-
-    return v0
-.end method
-
-.method public final mQ()Landroid/os/Bundle;
+.method public final mT()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;->aBn:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/bm;->aBw:J
 
     const-string v3, "clientId"
 
@@ -520,7 +512,15 @@
     return-object v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final mb()I
+    .locals 1
+
+    const v0, 0xbdfcb8
+
+    return v0
+.end method
+
+.method public final md()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.connection.service.START"
@@ -528,7 +528,7 @@
     return-object v0
 .end method
 
-.method public final mb()Ljava/lang/String;
+.method public final me()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 2978d7a707..d9f81c3b1d 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,27 +3,7 @@
 
 
 # instance fields
-.field private final aBs:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final aBt:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final azR:Lcom/google/android/gms/common/api/internal/h;
+.field private final aAa:Lcom/google/android/gms/common/api/internal/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/internal/h<",
@@ -33,12 +13,32 @@
     .end annotation
 .end field
 
+.field private final aBB:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final aBC:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # virtual methods
 .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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aAa: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;->aBs:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBB:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAg:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAp: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aAa:Lcom/google/android/gms/common/api/internal/h;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/b;
 
@@ -72,32 +72,32 @@
 .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;->aBs:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBB:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAg:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
 
     invoke-interface {v0, v1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
-    iget v0, p1, Lcom/google/android/gms/internal/nearby/zzen;->ajj:I
+    iget v0, p1, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
 
     invoke-static {v0}, Lcom/google/android/gms/internal/nearby/bm;->cx(I)Lcom/google/android/gms/common/api/Status;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lN()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/api/Status;->lQ()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aBt:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aBC:Ljava/util/Set;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAg:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/bn;->aAa: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;->aBt:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBC:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAg:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAp: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aAa: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;->aBs:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBB: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->aAa: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;->aBs:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBB:Ljava/util/Set;
 
     invoke-interface {v0}, Ljava/util/Set;->clear()V
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBt:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBC: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/bn;->aAa: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;->aBt:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/bn;->aBC: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 0e3ddcedd0..b44624cdd9 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 azM:Lcom/google/android/gms/internal/nearby/zzen;
+.field private final synthetic azV:Lcom/google/android/gms/internal/nearby/zzen;
 
-.field private final synthetic azN:Lcom/google/android/gms/common/api/Status;
+.field private final synthetic azW: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;->azM:Lcom/google/android/gms/internal/nearby/zzen;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/c;->azV:Lcom/google/android/gms/internal/nearby/zzen;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/c;->azN:Lcom/google/android/gms/common/api/Status;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/c;->azW: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;->azN:Lcom/google/android/gms/common/api/Status;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/c;->azW: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 ccde778a8c..e19f385ee4 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 azO:Lcom/google/android/gms/internal/nearby/zzep;
+.field private final synthetic azX: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;->azO:Lcom/google/android/gms/internal/nearby/zzep;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/d;->azX: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 2b8f0ac437..87eed4af9a 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 azP:Lcom/google/android/gms/internal/nearby/zzef;
+.field private final synthetic azY: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;->azP:Lcom/google/android/gms/internal/nearby/zzef;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/e;->azY:Lcom/google/android/gms/internal/nearby/zzef;
 
     const/4 p1, 0x0
 
@@ -36,9 +36,9 @@
 
     new-instance p1, Lcom/google/android/gms/nearby/connection/f;
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/e;->azP:Lcom/google/android/gms/internal/nearby/zzef;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/e;->azY:Lcom/google/android/gms/internal/nearby/zzef;
 
-    iget v0, v0, Lcom/google/android/gms/internal/nearby/zzef;->aAh:I
+    iget v0, v0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/nearby/connection/f;-><init>(I)V
 
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 bb5202287f..9951fd38e9 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 azQ:Ljava/lang/String;
+.field private final synthetic azZ: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;->azQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/f;->azZ: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 c5a789c872..5beaf83094 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 azQ:Ljava/lang/String;
+.field private final synthetic azZ: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;->azQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/g;->azZ: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 3de9770793..76058212f1 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 azR:Lcom/google/android/gms/common/api/internal/h;
+.field private final aAa: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 azS:Ljava/util/Set;
+.field private final aAb: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;->azS:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aAb:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAb:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAk: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aAa: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;->azS:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aAb:Ljava/util/Set;
 
-    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAb:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAk: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aAa: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;->azS:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aAb: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;->azR:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/h;->aAa: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;->azS:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/h;->aAb: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 695ee3421a..72836024f2 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 azT:Lcom/google/android/gms/internal/nearby/zzer;
+.field private final synthetic aAc: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;->azT:Lcom/google/android/gms/internal/nearby/zzer;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
 
     const/4 p1, 0x0
 
@@ -34,9 +34,9 @@
 .method public final synthetic Q(Ljava/lang/Object;)V
     .locals 2
 
-    iget-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->azT:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object p1, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAb:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAk: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;->azT:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAl:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->azT:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, v1, Lcom/google/android/gms/internal/nearby/zzer;->aAv: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;->azT:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/i;->aAc:Lcom/google/android/gms/internal/nearby/zzer;
 
-    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAl:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->azT:Lcom/google/android/gms/internal/nearby/zzer;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/i;->aAc: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 39ad410fa5..bae1306976 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 azU:Lcom/google/android/gms/internal/nearby/zzet;
+.field private final synthetic aAd: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;->azU:Lcom/google/android/gms/internal/nearby/zzet;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/j;->aAd: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 68be2fb661..2953c88a1c 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 azQ:Ljava/lang/String;
+.field private final synthetic azZ: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;->azQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/k;->azZ: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 633db04209..0a2901c99c 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 azV:Lcom/google/android/gms/common/api/internal/h;
+.field private final aAe: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 azW:Ljava/util/Map;
+.field private final aAf: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;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->azW:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aAf:Ljava/util/Map;
 
     new-instance v2, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAg:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAp:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v4, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v6, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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;->azV:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/m;->aAe: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;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy: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;->azW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAf:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAg:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAc:J
+    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy: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;->azW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAf:Ljava/util/Map;
 
     new-instance v1, Lcom/google/android/gms/internal/nearby/q;
 
-    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAg:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAc:J
+    iget-wide v3, v3, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->azV:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAe: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;->azW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAf: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;->aAb:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/internal/nearby/q;->aAk: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;->azV:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v3, p0, Lcom/google/android/gms/internal/nearby/m;->aAe: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;->azW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/m;->aAf: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 6deae336b6..62b9a81556 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 azX:Lcom/google/android/gms/internal/nearby/zzev;
+.field private final synthetic aAg:Lcom/google/android/gms/internal/nearby/zzev;
 
-.field private final synthetic azY:Lcom/google/android/gms/nearby/connection/e;
+.field private final synthetic aAh: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;->azX:Lcom/google/android/gms/internal/nearby/zzev;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/n;->aAg:Lcom/google/android/gms/internal/nearby/zzev;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/n;->azY:Lcom/google/android/gms/nearby/connection/e;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/n;->aAh: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 fb8fedfc3c..8dd8926ebb 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 azZ:Lcom/google/android/gms/internal/nearby/zzex;
+.field private final synthetic aAi: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;->azZ:Lcom/google/android/gms/internal/nearby/zzex;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/o;->aAi: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 725ae5e040..500f835ea2 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 aAa:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field private final synthetic aAj:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-.field private final synthetic azQ:Ljava/lang/String;
+.field private final synthetic azZ:Ljava/lang/String;
 
 
 # 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;->azQ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/p;->azZ:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/p;->aAa:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/p;->aAj: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;->aAa:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/p;->aAj: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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 8732154d47..f9b72db3d2 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 final aAb:Ljava/lang/String;
+.field final aAk:Ljava/lang/String;
 
-.field private final aAc:J
+.field private final aAl: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;->aAb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/q;->aAk:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/internal/nearby/q;->aAc:J
+    iput-wide p2, p0, Lcom/google/android/gms/internal/nearby/q;->aAl: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;->aAb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAk:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/q;->aAb:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/q;->aAk: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;->aAc:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/q;->aAl: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;->aAc:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/q;->aAl: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;->aAb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAk:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAc:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/q;->aAl: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 d9dab9a92f..15b6d427cb 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 aAd:Lcom/google/android/gms/internal/nearby/v;
+.field private static aAm: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 fa1ca57e1e..7d60437759 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 amX:Ljava/lang/ClassLoader;
+.field private static final ang:Ljava/lang/ClassLoader;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/s;->amX:Ljava/lang/ClassLoader;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/s;->ang: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 6af234daa8..256d3703f6 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field public static final aAn: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 aAf:Lcom/google/android/gms/common/api/a$a;
+.field public static final aAo: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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aAn: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/t;->aAo: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 04f35ebcb3..bed55694c5 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,9 +15,9 @@
 
 
 # instance fields
-.field aAg:Ljava/lang/String;
+.field aAp:Ljava/lang/String;
 
-.field aAh:I
+.field aAq:I
 
 
 # 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/zzef;->aAg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAp:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAh:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
 
     return-void
 .end method
@@ -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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAg:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAp:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -83,13 +83,13 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAh:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAh:I
+    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -114,13 +114,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAp:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAh:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -146,13 +146,13 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAp: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 v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAh:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzef;->aAq:I
 
     const/4 v1, 0x2
 
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 7fb5f5a9d8..00a612adac 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,13 +15,13 @@
 
 
 # instance fields
-.field aAg:Ljava/lang/String;
+.field aAp:Ljava/lang/String;
 
-.field aAi:Ljava/lang/String;
+.field aAr:Ljava/lang/String;
 
-.field aAj:Z
+.field aAs:Z
 
-.field private aAk:[B
+.field private aAt:[B
 
 .field zzr:Ljava/lang/String;
 
@@ -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;->aAg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAi:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
 
     iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzeh;->zzr:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAj:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAs:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAk:[B
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAg:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAp: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;->aAi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAi:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAr: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;->aAj:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAs: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;->aAj:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAs: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;->aAk:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAk:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[B
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -156,13 +156,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAi:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
 
     const/4 v2, 0x1
 
@@ -174,7 +174,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAj:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAs: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;->aAk:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -214,13 +214,13 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAp: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;->aAi:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAr:Ljava/lang/String;
 
     const/4 v1, 0x2
 
@@ -232,13 +232,13 @@
 
     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;->aAj:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAs: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;->aAk:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzeh;->aAt:[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 d85b4e032d..fbf395f95b 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,11 +15,11 @@
 
 
 # instance fields
-.field aAg:Ljava/lang/String;
+.field aAp:Ljava/lang/String;
 
-.field private aAk:[B
+.field private aAt:[B
 
-.field ajj:I
+.field ajs:I
 
 
 # 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/zzen;->aAg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajj:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAk:[B
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAg:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/common/internal/p;->equal(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -87,13 +87,13 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajj:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1
 
-    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->ajj:I
+    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -105,9 +105,9 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAk:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAk:[B
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[B
 
     invoke-static {v1, p1}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -128,13 +128,13 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajj:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajs:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -144,7 +144,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAk:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -174,19 +174,19 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAp: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 v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajj:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->ajs: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-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAk:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzen;->aAt:[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 5a50f39935..daafa1d66f 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 aAg:Ljava/lang/String;
+.field aAp: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;->aAg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAp: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;->aAg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAp:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAg:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzep;->aAp: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAp: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;->aAg:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzep;->aAp: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 c39e9b3c3e..b259d23132 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 aAb:Ljava/lang/String;
+.field aAk:Ljava/lang/String;
 
-.field aAl:Ljava/lang/String;
+.field aAu:Ljava/lang/String;
 
-.field aAm:Landroid/bluetooth/BluetoothDevice;
+.field aAv: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;->aAb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAk:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAl:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAu: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;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAv: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;->aAb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAk:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAb:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAk: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;->aAl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAu:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAl:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAu: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;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAv:Landroid/bluetooth/BluetoothDevice;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzer;->aAv: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;->aAb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAk:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAu: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;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAv: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;->aAb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAk: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;->aAl:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAu: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;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzer;->aAv: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 8abaace301..011ca8e06b 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 aAb:Ljava/lang/String;
+.field aAk: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;->aAb:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAk: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;->aAb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAk:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAb:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzet;->aAk: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;->aAb:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAk: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;->aAb:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzet;->aAk: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 60bffd4bd7..474142149f 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 aAg:Ljava/lang/String;
+.field aAp:Ljava/lang/String;
 
-.field aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+.field aAw:Lcom/google/android/gms/internal/nearby/zzfh;
 
-.field private aAo:Z
+.field private aAx: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;->aAg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAp:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAo:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAx: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAg:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAp: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;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAw:Lcom/google/android/gms/internal/nearby/zzfh;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->aAo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAx: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;->aAo:Z
+    iget-boolean p1, p1, Lcom/google/android/gms/internal/nearby/zzev;->aAx: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAp:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->aAo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAx: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAp: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;->aAn:Lcom/google/android/gms/internal/nearby/zzfh;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAw: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;->aAo:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/internal/nearby/zzev;->aAx: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 b43fb7afe8..93a591dde7 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 aAg:Ljava/lang/String;
+.field aAp:Ljava/lang/String;
 
-.field aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field aAy: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;->aAg:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAy: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAg:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp: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;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAy:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzex;->aAy: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAy: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;->aAg:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAp: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;->aAp:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzex;->aAy: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 4bcf8088fd..6cba777688 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 aAq:I
+.field private aAz: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;->aAq:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAz: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;->aAq:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAz: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;->aAq:I
+    iget p1, p1, Lcom/google/android/gms/internal/nearby/zzfd;->aAz: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;->aAq:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAz: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;->aAq:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzfd;->aAz: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 4492b5a8ca..3f31217a8a 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 aAu:[B
+.field aAD:[B
 
-.field aAv:Landroid/os/ParcelFileDescriptor;
+.field aAE:Landroid/os/ParcelFileDescriptor;
 
-.field aAw:Ljava/lang/String;
+.field aAF:Ljava/lang/String;
 
-.field private aAx:Landroid/os/ParcelFileDescriptor;
+.field private aAG:Landroid/os/ParcelFileDescriptor;
 
-.field akA:J
+.field akJ:J
 
 .field id:J
 
@@ -50,7 +50,7 @@
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akA:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->akA:J
+    iput-wide v0, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->aAu:[B
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAv:Landroid/os/ParcelFileDescriptor;
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE:Landroid/os/ParcelFileDescriptor;
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAw:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF:Ljava/lang/String;
 
-    iput-wide p7, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akA:J
+    iput-wide p7, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ:J
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAx:Landroid/os/ParcelFileDescriptor;
+    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAG: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;->aAu:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAu:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[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;->aAv:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE:Landroid/os/ParcelFileDescriptor;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAv:Landroid/os/ParcelFileDescriptor;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAE: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;->aAw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAw:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAF: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;->akA:J
+    iget-wide v3, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->akA:J
+    iget-wide v3, p1, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->aAx:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAG:Landroid/os/ParcelFileDescriptor;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAx:Landroid/os/ParcelFileDescriptor;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzfh;->aAG: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;->aAu:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[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;->aAv:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE:Landroid/os/ParcelFileDescriptor;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akA:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->aAx:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAG: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;->aAu:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAD:[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;->aAv:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAE: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;->aAw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAF: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;->akA:J
+    iget-wide v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->akJ: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;->aAx:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzfh;->aAG: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 c0135b58c6..8bc0a51b97 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 aAA:Landroid/os/ParcelUuid;
+.field private final aAH:I
 
-.field private final aAB:Landroid/os/ParcelUuid;
+.field private final aAI:Landroid/os/ParcelUuid;
 
-.field private final aAC:[B
+.field private final aAJ:Landroid/os/ParcelUuid;
 
-.field private final aAD:[B
+.field private final aAK:Landroid/os/ParcelUuid;
 
-.field private final aAE:[B
+.field private final aAL:[B
 
-.field private final aAF:[B
+.field private final aAM:[B
 
-.field private final aAy:I
+.field private final aAN:[B
 
-.field private final aAz:Landroid/os/ParcelUuid;
+.field private final aAO:[B
 
-.field private final alC:I
+.field private final alL: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;->aAy:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH:I
 
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAz:Landroid/os/ParcelUuid;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:Landroid/os/ParcelUuid;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAA:Landroid/os/ParcelUuid;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:Landroid/os/ParcelUuid;
 
-    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAB:Landroid/os/ParcelUuid;
+    iput-object p4, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:Landroid/os/ParcelUuid;
 
-    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAC:[B
+    iput-object p5, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[B
 
-    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAD:[B
+    iput-object p6, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[B
 
-    iput p7, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alC:I
+    iput p7, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alL:I
 
-    iput-object p8, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAE:[B
+    iput-object p8, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[B
 
-    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAF:[B
+    iput-object p9, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[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;->alC:I
+    iget v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alL:I
 
-    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->alC:I
+    iget v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->alL:I
 
     if-ne v2, v3, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAE:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAE:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[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;->aAF:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAF:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[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;->aAB:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:Landroid/os/ParcelUuid;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAB:Landroid/os/ParcelUuid;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAK: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;->aAC:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAC:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[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;->aAD:[B
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAD:[B
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[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;->aAz:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:Landroid/os/ParcelUuid;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAz:Landroid/os/ParcelUuid;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAI: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;->aAA:Landroid/os/ParcelUuid;
+    iget-object v2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:Landroid/os/ParcelUuid;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAA:Landroid/os/ParcelUuid;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ: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;->alC:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alL: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;->aAE:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[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;->aAF:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[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;->aAB:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAC:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[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;->aAD:[B
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[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;->aAz:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x6
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAA:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ:Landroid/os/ParcelUuid;
 
     const/4 v2, 0x7
 
@@ -294,55 +294,55 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAy:I
+    iget v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAH: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;->aAz:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAI: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;->aAA:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAJ: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;->aAB:Landroid/os/ParcelUuid;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAK: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;->aAC:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAL:[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;->aAD:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAM:[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;->alC:I
+    iget p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->alL: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;->aAE:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAN:[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;->aAF:[B
+    iget-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgp;->aAO:[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 1497e0ef92..ab859b08b7 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 aAO:Ljava/lang/String;
+.field private static final aAX:Ljava/lang/String;
 
-.field public static final aAP:Lcom/google/android/gms/internal/nearby/zzgs;
+.field public static final aAY:Lcom/google/android/gms/internal/nearby/zzgs;
 
 
 # instance fields
-.field private final aAQ:Ljava/lang/String;
+.field private final aAH:I
 
-.field private final aAR:Ljava/lang/String;
+.field private final aAZ:Ljava/lang/String;
 
-.field private final aAy:I
+.field private final aBa:Ljava/lang/String;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     const/4 v0, 0x0
 
-    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aAO:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aAX: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;->aAP:Lcom/google/android/gms/internal/nearby/zzgs;
+    sput-object v0, Lcom/google/android/gms/internal/nearby/zzgs;->aAY: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;->aAy:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAH:I
 
     if-nez p2, :cond_0
 
     const-string p2, ""
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAQ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAR:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa: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;->aAQ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aAQ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ: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;->aAR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aAR:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/internal/nearby/zzgs;->aBa: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;->aAQ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa: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;->aAQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAR:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa: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;->aAQ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAZ: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;->aAR:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aBa: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;->aAy:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgs;->aAH: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 392e5aa78f..36c03f2500 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 aAS:I
+.field private final aAH:I
 
-.field private final aAT:[B
+.field private final aBb:I
 
-.field private final aAU:Z
+.field private final aBc:[B
 
-.field private final aAy:I
+.field private final aBd:Z
 
 
 # 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;->aAy:I
+    iput p1, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAH:I
 
-    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAS:I
+    iput p2, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBb:I
 
-    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAT:[B
+    iput-object p3, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBc:[B
 
-    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAU:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBd:Z
 
     return-void
 .end method
@@ -64,25 +64,25 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAS:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBb: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;->aAT:[B
+    iget-object v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBc:[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;->aAU:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aBd: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;->aAy:I
+    iget v0, p0, Lcom/google/android/gms/internal/nearby/zzgu;->aAH: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 d071bc443b..930b09c036 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
@@ -17,15 +17,15 @@
 
 
 # static fields
-.field private static volatile aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+.field private static volatile aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
 
 # instance fields
-.field public final aBB:Lcom/google/android/gms/measurement/internal/ey;
+.field public final aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field public final aBC:Lcom/google/android/gms/measurement/internal/gy;
+.field public final aBL:Lcom/google/android/gms/measurement/internal/gy;
 
-.field public final awV:Z
+.field public final axe:Z
 
 
 # direct methods
@@ -36,15 +36,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;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     return-void
 .end method
@@ -56,15 +56,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;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method private static ao(Landroid/content/Context;)Lcom/google/android/gms/measurement/AppMeasurement;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v0, :cond_2
 
@@ -81,7 +81,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v1, :cond_1
 
@@ -97,7 +97,7 @@
 
     invoke-direct {p0, v2}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/gy;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     goto :goto_0
 
@@ -110,7 +110,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    sput-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     :cond_1
     :goto_0
@@ -129,7 +129,7 @@
 
     :cond_2
     :goto_1
-    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     return-object p0
 .end method
@@ -137,7 +137,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;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v0, :cond_2
 
@@ -146,7 +146,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     if-nez v1, :cond_1
 
@@ -160,7 +160,7 @@
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/gy;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     goto :goto_0
 
@@ -173,7 +173,7 @@
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/AppMeasurement;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    sput-object p1, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sput-object p1, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     :cond_1
     :goto_0
@@ -192,7 +192,7 @@
 
     :cond_2
     :goto_1
-    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBA:Lcom/google/android/gms/measurement/AppMeasurement;
+    sget-object p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBJ:Lcom/google/android/gms/measurement/AppMeasurement;
 
     return-object p0
 .end method
@@ -271,30 +271,30 @@
 .method public beginAdUnitExposure(Ljava/lang/String;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gy;->aL(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
@@ -306,20 +306,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;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gy;->c(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -331,13 +331,13 @@
 .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;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -362,30 +362,30 @@
 .method public endAdUnitExposure(Ljava/lang/String;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gy;->cz(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
@@ -397,26 +397,26 @@
 .method public generateEventId()J
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qx()J
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qA()J
 
     move-result-wide v0
 
     return-wide v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
 
     move-result-wide v0
 
@@ -426,26 +426,26 @@
 .method public getAppInstanceId()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qw()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->qz()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xH()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -466,11 +466,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/gy;->T(Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
 
@@ -479,9 +479,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -554,13 +554,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -639,26 +639,26 @@
 .method public getCurrentScreenClass()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->rA()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->rD()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yu()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yx()Ljava/lang/String;
 
     move-result-object v0
 
@@ -668,26 +668,26 @@
 .method public getCurrentScreenName()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->pL()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->pO()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uC()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uF()Ljava/lang/String;
 
     move-result-object v0
 
@@ -697,26 +697,26 @@
 .method public getGmpAppId()Ljava/lang/String;
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->uc()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/gy;->uf()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yv()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yy()Ljava/lang/String;
 
     move-result-object v0
 
@@ -726,11 +726,11 @@
 .method public getMaxUserProperties(Ljava/lang/String;)I
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gy;->cE(Ljava/lang/String;)I
 
@@ -739,9 +739,9 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -765,11 +765,11 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gy;->b(Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/Map;
 
@@ -778,9 +778,9 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -809,13 +809,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -842,20 +842,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;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gy;->b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -867,20 +867,20 @@
 .method public registerOnMeasurementEventListener(Lcom/google/android/gms/measurement/AppMeasurement$OnEventListener;)V
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1}, Lcom/google/android/gms/measurement/internal/gy;->a(Lcom/google/android/gms/measurement/internal/gd;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -894,11 +894,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;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;->a(Lcom/google/android/gms/measurement/AppMeasurement$ConditionalUserProperty;)Landroid/os/Bundle;
 
@@ -909,9 +909,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -919,7 +919,7 @@
 
     move-result-object p1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -937,13 +937,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;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -967,7 +967,7 @@
 
     invoke-direct {v1, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()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 718641a018..50546dc9cb 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private aBD:Lcom/google/android/gms/measurement/internal/eo;
+.field private aBM:Lcom/google/android/gms/measurement/internal/eo;
 
 
 # direct methods
@@ -30,7 +30,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBD:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
 
     if-nez v0, :cond_0
 
@@ -38,17 +38,17 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/eo;-><init>(Lcom/google/android/gms/measurement/internal/et;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBD:Lcom/google/android/gms/measurement/internal/eo;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBD:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementInstallReferrerReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/eo;->b(Landroid/content/Context;Landroid/content/Intent;)V
 
     return-void
 .end method
 
-.method public final uS()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final uV()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 a04fc8681e..e2d8742a82 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private aBE:Lcom/google/android/gms/measurement/internal/ik;
+.field private aBN:Lcom/google/android/gms/measurement/internal/ik;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/ik<",
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method private final uT()Lcom/google/android/gms/measurement/internal/ik;
+.method private final uW()Lcom/google/android/gms/measurement/internal/ik;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
     if-nez v0, :cond_0
 
@@ -46,10 +46,10 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/ik;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementJobService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
     return-object v0
 .end method
@@ -87,7 +87,7 @@
 
     invoke-super {p0}, Landroid/app/job/JobService;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
@@ -99,11 +99,11 @@
 .method public final onDestroy()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pG()V
 
     invoke-super {p0}, Landroid/app/job/JobService;->onDestroy()V
 
@@ -113,7 +113,7 @@
 .method public final onRebind(Landroid/content/Intent;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
@@ -125,11 +125,11 @@
 .method public final onStartJob(Landroid/app/job/JobParameters;)Z
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     const/4 v2, 0x0
 
@@ -137,7 +137,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
@@ -151,9 +151,9 @@
 
     move-result-object v3
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Local AppMeasurementJobService called. action"
 
@@ -190,7 +190,7 @@
 .method public final onUnbind(Landroid/content/Intent;)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementJobService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     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 cbf1241a11..7a373ae22b 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private aBD:Lcom/google/android/gms/measurement/internal/eo;
+.field private aBM:Lcom/google/android/gms/measurement/internal/eo;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBD:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
 
     if-nez v0, :cond_0
 
@@ -40,17 +40,17 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/eo;-><init>(Lcom/google/android/gms/measurement/internal/et;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBD:Lcom/google/android/gms/measurement/internal/eo;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBD:Lcom/google/android/gms/measurement/internal/eo;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementReceiver;->aBM:Lcom/google/android/gms/measurement/internal/eo;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/eo;->b(Landroid/content/Context;Landroid/content/Intent;)V
 
     return-void
 .end method
 
-.method public final uS()Landroid/content/BroadcastReceiver$PendingResult;
+.method public final uV()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 2d96dfee05..c71a9ffd30 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private aBE:Lcom/google/android/gms/measurement/internal/ik;
+.field private aBN:Lcom/google/android/gms/measurement/internal/ik;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/ik<",
@@ -27,7 +27,7 @@
     return-void
 .end method
 
-.method private final uT()Lcom/google/android/gms/measurement/internal/ik;
+.method private final uW()Lcom/google/android/gms/measurement/internal/ik;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
     if-nez v0, :cond_0
 
@@ -46,10 +46,10 @@
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/ik;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/AppMeasurementService;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
     return-object v0
 .end method
@@ -87,7 +87,7 @@
 .method public final onBind(Landroid/content/Intent;)Landroid/os/IBinder;
     .locals 3
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
@@ -95,11 +95,11 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "onBind called with null intent"
 
@@ -122,7 +122,7 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/fe;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->aq(Landroid/content/Context;)Lcom/google/android/gms/measurement/internal/jf;
 
@@ -133,11 +133,11 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "onBind received unknown action"
 
@@ -151,7 +151,7 @@
 
     invoke-super {p0}, Landroid/app/Service;->onCreate()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
@@ -163,11 +163,11 @@
 .method public final onDestroy()V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->pG()V
 
     invoke-super {p0}, Landroid/app/Service;->onDestroy()V
 
@@ -177,7 +177,7 @@
 .method public final onRebind(Landroid/content/Intent;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object v0
 
@@ -189,11 +189,11 @@
 .method public final onStartCommand(Landroid/content/Intent;II)I
     .locals 5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     move-result-object p2
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -201,13 +201,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
     if-nez p1, :cond_0
 
-    iget-object p1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "AppMeasurementService started with null intent"
 
@@ -220,9 +220,9 @@
 
     move-result-object v2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -256,7 +256,7 @@
 .method public final onUnbind(Landroid/content/Intent;)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uT()Lcom/google/android/gms/measurement/internal/ik;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/AppMeasurementService;->uW()Lcom/google/android/gms/measurement/internal/ik;
 
     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 3840ea220b..fc8f74b0e9 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final azJ:Lcom/google/android/gms/internal/measurement/me;
+.field private final azS:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/api/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/api/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     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 4b131e0352..52b9d90104 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
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field private aBH:Lcom/google/android/gms/internal/measurement/ma;
+.field private aBQ:Lcom/google/android/gms/internal/measurement/ma;
 
-.field private final synthetic aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBR: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/ma;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBR: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;->aBH:Lcom/google/android/gms/internal/measurement/ma;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
     .locals 6
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBH:Lcom/google/android/gms/internal/measurement/ma;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
 
     move-object v1, p1
 
@@ -61,15 +61,15 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Event interceptor 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 a5fa554929..d8af6741d1 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
@@ -18,20 +18,20 @@
 
 
 # instance fields
-.field private aBH:Lcom/google/android/gms/internal/measurement/ma;
+.field private aBQ:Lcom/google/android/gms/internal/measurement/ma;
 
-.field private final synthetic aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBR: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/ma;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBR: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;->aBH:Lcom/google/android/gms/internal/measurement/ma;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
 
     return-void
 .end method
@@ -42,7 +42,7 @@
     .locals 6
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBH:Lcom/google/android/gms/internal/measurement/ma;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBQ:Lcom/google/android/gms/internal/measurement/ma;
 
     move-object v1, p1
 
@@ -61,15 +61,15 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Event listener 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 4344ce95db..1f29c44c2e 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
@@ -13,9 +13,9 @@
 
 
 # instance fields
-.field aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private aBG:Ljava/util/Map;
+.field private aBP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,13 +35,13 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     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;->aBG:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBP:Ljava/util/Map;
 
     return-void
 .end method
@@ -49,9 +49,9 @@
 .method private final a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -63,7 +63,7 @@
 .method private final zza()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     if-eqz v0, :cond_0
 
@@ -91,9 +91,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -112,9 +112,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -133,9 +133,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
@@ -154,19 +154,19 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qS()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
@@ -185,9 +185,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -210,13 +210,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xH()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xK()Ljava/lang/String;
 
     move-result-object v0
 
@@ -235,9 +235,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -260,13 +260,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yu()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yx()Ljava/lang/String;
 
     move-result-object v0
 
@@ -285,13 +285,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uC()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->uF()Ljava/lang/String;
 
     move-result-object v0
 
@@ -310,13 +310,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yv()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yy()Ljava/lang/String;
 
     move-result-object v0
 
@@ -335,15 +335,15 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p1
 
@@ -385,15 +385,15 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -401,7 +401,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -427,15 +427,15 @@
     return-void
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -443,7 +443,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -468,15 +468,15 @@
     return-void
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -484,7 +484,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -522,13 +522,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning double value to wrapper"
 
@@ -537,15 +537,15 @@
     return-void
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -553,7 +553,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -578,15 +578,15 @@
     return-void
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -594,7 +594,7 @@
 
     invoke-direct {v1}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -625,9 +625,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -679,7 +679,7 @@
 
     check-cast p1, Landroid/content/Context;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     if-nez p3, :cond_0
 
@@ -687,16 +687,16 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 
     :cond_0
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Attempting to initialize multiple times"
 
@@ -715,9 +715,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -742,9 +742,9 @@
 
     move-object v0, p0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v2
 
@@ -809,9 +809,9 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/zzan;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzam;Ljava/lang/String;J)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p2
 
@@ -876,9 +876,9 @@
     :goto_2
     move-object v8, v0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
@@ -905,23 +905,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p3, :cond_0
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p4
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -945,23 +945,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -985,23 +985,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1025,23 +1025,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1065,13 +1065,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     new-instance p4, Landroid/os/Bundle;
 
@@ -1079,13 +1079,13 @@
 
     if-eqz p3, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1106,13 +1106,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Error returning bundle value to wrapper"
 
@@ -1131,23 +1131,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1171,23 +1171,23 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-eqz p2, :cond_0
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xC()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/gf;->xF()V
 
     invoke-static {p1}, Lcom/google/android/gms/a/b;->a(Lcom/google/android/gms/a/a;)Ljava/lang/Object;
 
@@ -1228,9 +1228,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBP:Ljava/util/Map;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pG()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pJ()I
 
     move-result v1
 
@@ -1250,9 +1250,9 @@
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;-><init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ma;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBG:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBP:Ljava/util/Map;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pG()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pJ()I
 
     move-result p1
 
@@ -1263,9 +1263,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;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p1
 
@@ -1284,9 +1284,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -1294,7 +1294,7 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/gf;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -1319,13 +1319,13 @@
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Conditional user property must not be null"
 
@@ -1334,9 +1334,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -1355,9 +1355,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object p4
 
@@ -1382,9 +1382,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -1403,9 +1403,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -1413,9 +1413,9 @@
 
     invoke-direct {v1, p0, p1}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$a;-><init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ma;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
@@ -1451,9 +1451,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
@@ -1472,13 +1472,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -1501,13 +1501,13 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -1530,9 +1530,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v1
 
@@ -1565,9 +1565,9 @@
 
     move-result-object v3
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -1594,9 +1594,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBP:Ljava/util/Map;
 
-    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pG()I
+    invoke-interface {p1}, Lcom/google/android/gms/internal/measurement/ma;->pJ()I
 
     move-result v1
 
@@ -1617,9 +1617,9 @@
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService$b;-><init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/ma;)V
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     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 f0626d51a9..d1d4e1c3c8 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aBJ:Lcom/google/android/gms/measurement/internal/z;
+.field private final synthetic aBS:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final synthetic anq:J
+.field private final synthetic anz:J
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/z;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aBJ:Lcom/google/android/gms/measurement/internal/z;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/a;->aBS:Lcom/google/android/gms/measurement/internal/z;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/a;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/a;->atS:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/a;->anq:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/a;->anz:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,17 +34,17 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aBJ:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/a;->aBS:Lcom/google/android/gms/measurement/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/a;->atS:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/a;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/a;->anz:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-interface {v4}, Ljava/util/Map;->isEmpty()Z
 
@@ -52,10 +52,10 @@
 
     if-eqz v4, :cond_0
 
-    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/z;->aBL:J
+    iput-wide v2, v0, Lcom/google/android/gms/measurement/internal/z;->aBU:J
 
     :cond_0
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -67,7 +67,7 @@
 
     if-eqz v4, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
 
@@ -84,7 +84,7 @@
     return-void
 
     :cond_1
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-interface {v4}, Ljava/util/Map;->size()I
 
@@ -94,11 +94,11 @@
 
     if-lt v4, v6, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Too many ads visible"
 
@@ -107,7 +107,7 @@
     return-void
 
     :cond_2
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -115,7 +115,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/z;->atp:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aty: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/aa.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aa.smali
index 55c6829e2c..4fcf2a003d 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aa;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aa;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aa;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wY()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xb()Ljava/lang/Integer;
 
     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 da1c213b72..af44ce0ad0 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ab;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ab;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ab;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wV()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wY()Ljava/lang/Long;
 
     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 c1ade401dd..a3f3c5e0b5 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ac;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ac;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ac;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wW()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wZ()Ljava/lang/String;
 
     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 c4c62fef93..335d793784 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ad;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ad;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ad;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wU()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wX()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 73e16d51df..df3778fb00 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ae;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xm()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xp()Ljava/lang/String;
 
     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 077429dbf2..115a171761 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/af;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/af;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/af;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wS()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wV()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 54c54f7133..6106c929ae 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ag;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ag;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ag;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wT()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wW()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 156468e66c..e810b1a5e8 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ah;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ah;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ah;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wQ()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wT()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 3f87770b1c..c4c6a90314 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ai;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ai;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ai;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wR()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wU()Ljava/lang/Long;
 
     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 a745aa6586..93c087ea7d 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wO()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wR()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 e2b319055a..08f87958a9 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ak;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ak;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ak;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wP()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wS()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 a7c414d40d..63c11f7c48 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/al;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/al;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/al;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wM()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wP()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 190e3d3b6d..0df961374e 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/am;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/am;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/am;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wN()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wQ()Ljava/lang/Long;
 
     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 5aaa09769b..be5596b4e4 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/an;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/an;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/an;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xl()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xo()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 05f475f768..f04fccd4ce 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ao;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ao;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ao;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wL()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wO()Ljava/lang/Long;
 
     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 3536277a81..901dd29752 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ap;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ap;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ap;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wJ()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wM()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 effc7950af..efe4231a76 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aq;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wK()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wN()Ljava/lang/Integer;
 
     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 f612e10ff9..5179b856c4 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ar;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ar;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ar;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wH()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wK()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 266c9a8db6..f89477614b 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/as;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/as;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/as;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wI()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wL()Ljava/lang/Integer;
 
     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 82c6f4837b..e411987bf8 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/at;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/at;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/at;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wF()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wI()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 498677af2d..fc0851d6d5 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/au;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/au;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/au;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wG()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wJ()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 9eee4e24f7..3af87c5fe6 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/av;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/av;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/av;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wD()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wG()Ljava/lang/Long;
 
     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 d930519d4d..d33e014a9d 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/aw;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wE()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wH()Ljava/lang/String;
 
     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 46c46a2bf7..7817edfbfa 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ax;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ax;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ax;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wB()Ljava/lang/Double;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wE()Ljava/lang/Double;
 
     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 e98972a891..2a5a3f0356 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ay;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ay;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ay;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wC()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wF()Ljava/lang/Integer;
 
     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 efbbbcc99e..5d7eac42a7 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/az;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/az;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/az;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wA()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wD()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 9dd35a1f53..1226a346aa 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,7 +7,7 @@
 
 
 # static fields
-.field static final aBK:Lcom/google/android/gms/measurement/internal/kc;
+.field static final aBT:Lcom/google/android/gms/measurement/internal/kc;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/b;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/b;->aBK:Lcom/google/android/gms/measurement/internal/kc;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/b;->aBT:Lcom/google/android/gms/measurement/internal/kc;
 
     return-void
 .end method
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 4b7c8e054a..1cb06f5dde 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aEi:Lcom/google/android/gms/measurement/internal/z;
+.field private final synthetic aEr:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final synthetic anp:J
+.field private final synthetic any:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/z;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ba;->aEi:Lcom/google/android/gms/measurement/internal/z;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ba;->aEr:Lcom/google/android/gms/measurement/internal/z;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ba;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ba;->any:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ba;->aEi:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ba;->aEr:Lcom/google/android/gms/measurement/internal/z;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ba;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ba;->any:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/z;->U(J)V
 
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 70ee696e5f..13ad3682cd 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bb;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bb;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bb;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xk()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xn()Ljava/lang/Long;
 
     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 433a2cc169..4bb4988163 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bc;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bc;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wy()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wB()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 537d1b8fd3..0babc6a876 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bd;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bd;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wz()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wC()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 ff67c266c4..ca7583ec3b 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/be;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/be;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/be;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->ww()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wz()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 b16d163aca..117fba6ad7 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bf;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bf;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wx()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wA()Ljava/lang/Boolean;
 
     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 b82c6644a9..69f9fce5f6 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bg;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wu()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wx()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 a2692d2266..546631df11 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bh;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bh;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bh;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wv()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wy()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 c144c0dcd7..b47c327092 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bi;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bi;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bi;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->ws()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wv()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 9c76772788..54d52391f2 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wt()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->ww()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 68144126b9..6117edfa4c 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bk;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bk;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xj()Ljava/lang/Long;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xm()Ljava/lang/Long;
 
     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 babded38bd..d175bd357a 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bl;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wr()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wu()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 8022871fb6..15dd019a42 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bm;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bm;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wp()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->ws()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 1517cfcb9c..8b98e9c536 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bn;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bn;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wq()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wt()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 9ee2f43fd4..7a40bb965c 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bo;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bo;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bo;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wn()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wq()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 bab95d2ebc..c3c31cd560 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bp;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bp;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wo()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wr()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 ec5ee617da..fc1d44bf03 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bq;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wl()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wo()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 085a94988d..28525cc8ac 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/br;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/br;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/br;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wm()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wp()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 a387a6f0ee..1efd3605e6 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bs;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bs;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bs;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wj()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wm()Ljava/lang/Boolean;
 
     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 649025074a..97ae442811 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bt;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bt;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bt;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wk()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wn()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 012129a7f4..f087e75237 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bu;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bu;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bu;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wh()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wk()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 7589304435..ec551bf8c3 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bv;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bv;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bv;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wi()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wl()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 9c75b2f5c9..795ecec293 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bw;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bw;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->nH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->nK()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 c84da98af9..573b77670d 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bx;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bx;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bx;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xi()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xl()Ljava/lang/String;
 
     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 f5c99533a6..e3f58110ce 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/by;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/by;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/by;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wf()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wi()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 e220eecccf..e2f86313c0 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/bz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/bz;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/bz;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wg()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wj()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 cf2ccfff61..3d981a5738 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field aBL:J
+.field aBU:J
 
-.field anp:J
+.field any:J
 
-.field anq:J
+.field anz:J
 
 .field zzd:J
 
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 8f64610a08..f377e3101b 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ca;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ca;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ca;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wd()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wg()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 fd49b61c92..f1681ac154 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aBJ:Lcom/google/android/gms/measurement/internal/z;
+.field private final synthetic aBS:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final synthetic anq:J
+.field private final synthetic anz:J
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/z;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/cb;->aBJ:Lcom/google/android/gms/measurement/internal/z;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/cb;->aBS:Lcom/google/android/gms/measurement/internal/z;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/cb;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/cb;->atS:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/cb;->anq:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/cb;->anz:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,17 +34,17 @@
 .method public final run()V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aBJ:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/cb;->aBS:Lcom/google/android/gms/measurement/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cb;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/cb;->atS:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/cb;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/cb;->anz:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {v1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -54,11 +54,11 @@
 
     if-eqz v4, :cond_4
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/hh;->yx()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v5
 
@@ -70,11 +70,11 @@
 
     if-nez v4, :cond_3
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aBP: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/z;->atp:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-interface {v4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -84,11 +84,11 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "First ad unit exposure time was never set"
 
@@ -103,14 +103,14 @@
 
     sub-long v6, v2, v6
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/z;->aty: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/z;->a(Ljava/lang/String;JLcom/google/android/gms/measurement/internal/hi;)V
 
     :goto_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
@@ -118,7 +118,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/z;->aBL:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/z;->aBU:J
 
     const-wide/16 v8, 0x0
 
@@ -126,11 +126,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "First ad exposure time was never set"
 
@@ -139,19 +139,19 @@
     return-void
 
     :cond_1
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/z;->aBL:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/z;->aBU:J
 
     sub-long/2addr v2, v6
 
     invoke-virtual {v0, v2, v3, v5}, Lcom/google/android/gms/measurement/internal/z;->a(JLcom/google/android/gms/measurement/internal/hi;)V
 
-    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/z;->aBL:J
+    iput-wide v8, v0, Lcom/google/android/gms/measurement/internal/z;->aBU:J
 
     :cond_2
     return-void
 
     :cond_3
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/z;->aBP:Ljava/util/Map;
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -162,11 +162,11 @@
     return-void
 
     :cond_4
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Call to endAdUnitExposure for unknown ad unit id"
 
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 6b2f5efb19..71d740cd28 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cc;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cc;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cc;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->we()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wh()Ljava/lang/Boolean;
 
     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 0097db30af..27fb87c305 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cd;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cd;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wb()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->we()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 7fd0137d9d..401f3d08f3 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ce;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ce;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ce;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wc()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wf()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 312964ca38..5b8b679042 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cf;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cf;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cf;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vZ()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wc()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 6eba4097a6..56c3ff3582 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cg;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wa()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wd()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 f7498f4b43..e90361da50 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ch;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ch;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ch;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xh()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xk()Ljava/lang/String;
 
     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 07c03aba59..dca9745f1b 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ci;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ci;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ci;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vY()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wb()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 893b328feb..730c3ec9e9 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vW()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vZ()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 646e96fdb9..e77c483e64 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ck;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ck;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ck;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vX()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wa()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 c9804680db..949f0bfb34 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cl;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vU()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vX()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 7e7cab64dc..fb6137ddd3 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cm;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cm;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cm;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vV()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vY()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 5b9ea72434..363e1e01c0 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cn;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cn;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cn;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vS()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vV()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 aa0bd01a0a..7784910db1 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/co;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/co;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/co;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vT()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vW()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 2cd4e33f90..d08fa622f0 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cp;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cp;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cp;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vQ()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vT()Ljava/lang/Boolean;
 
     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 438fb983e5..9bf895814c 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cq;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cq;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vR()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vU()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 bad5d088c5..c07eff74bf 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cr;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cr;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cr;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vO()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vR()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 0bb52dc3c6..ffb7181554 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cs;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cs;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cs;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vP()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vS()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 9187e7670f..6c4841fbe1 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/ct;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ct;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ct;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vN()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vQ()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 bec22c8011..b1620ef676 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cu;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cu;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cu;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xg()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xj()Ljava/lang/Integer;
 
     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 bda2648194..37d3348a2a 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cv;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cv;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cv;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vL()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vO()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cw.smali
index 9409bbc72a..ea6e3750c4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cw.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cw;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cw;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vM()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vP()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cx.smali
index fb1851f20a..bb63bcf532 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cx.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cx;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cx;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cx;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vJ()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vM()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cy.smali
index 3703205b9f..60c30cba51 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/cy.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cy;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cy;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cy;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vK()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vN()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 5fc8900f04..3f9a0711dd 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/cz;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/cz;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/cz;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->uH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->uK()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 bf2159f9a1..e8e53dbe6b 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
@@ -4,27 +4,27 @@
 
 
 # static fields
-.field private static final aBM:[Ljava/lang/String;
+.field private static final aBV:[Ljava/lang/String;
 
-.field private static final aBN:[Ljava/lang/String;
+.field private static final aBW:[Ljava/lang/String;
 
-.field private static final aBO:[Ljava/lang/String;
+.field private static final aBX:[Ljava/lang/String;
 
-.field private static final aBP:[Ljava/lang/String;
+.field private static final aBY:[Ljava/lang/String;
 
-.field private static final aBQ:[Ljava/lang/String;
+.field private static final aBZ:[Ljava/lang/String;
 
-.field private static final aBR:[Ljava/lang/String;
+.field private static final aCa:[Ljava/lang/String;
 
-.field private static final aBS:[Ljava/lang/String;
+.field private static final aCb:[Ljava/lang/String;
 
-.field private static final atv:[Ljava/lang/String;
+.field private static final atE:[Ljava/lang/String;
 
 
 # instance fields
-.field private final aBT:Lcom/google/android/gms/measurement/internal/e;
+.field private final aCc:Lcom/google/android/gms/measurement/internal/e;
 
-.field private final aBU:Lcom/google/android/gms/measurement/internal/ix;
+.field private final aCd:Lcom/google/android/gms/measurement/internal/ix;
 
 
 # direct methods
@@ -107,7 +107,7 @@
 
     aput-object v14, v1, v13
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBM:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBV:[Ljava/lang/String;
 
     new-array v1, v4, [Ljava/lang/String;
 
@@ -119,7 +119,7 @@
 
     aput-object v14, v1, v3
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBN:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBW:[Ljava/lang/String;
 
     const/16 v1, 0x34
 
@@ -411,7 +411,7 @@
 
     aput-object v7, v1, v0
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBO:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/d;->aBX:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -423,7 +423,7 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBP:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBY:[Ljava/lang/String;
 
     new-array v0, v6, [Ljava/lang/String;
 
@@ -443,7 +443,7 @@
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBQ:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBZ:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -455,7 +455,7 @@
 
     aput-object v5, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBR:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aCa:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -465,7 +465,7 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->atv:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->atE:[Ljava/lang/String;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -477,7 +477,7 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aBS:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/d;->aCb:[Ljava/lang/String;
 
     return-void
 .end method
@@ -489,17 +489,17 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ix;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     invoke-direct {p1, v0}, Lcom/google/android/gms/measurement/internal/ix;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aBU:Lcom/google/android/gms/measurement/internal/ix;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aCd:Lcom/google/android/gms/measurement/internal/ix;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/e;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -507,7 +507,7 @@
 
     invoke-direct {p1, p0, v0, v1}, Lcom/google/android/gms/measurement/internal/e;-><init>(Lcom/google/android/gms/measurement/internal/d;Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aBT:Lcom/google/android/gms/measurement/internal/e;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/d;->aCc:Lcom/google/android/gms/measurement/internal/e;
 
     return-void
 .end method
@@ -515,7 +515,7 @@
 .method private final a(Ljava/lang/String;[Ljava/lang/String;J)J
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -565,11 +565,11 @@
     move-exception p2
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p4, "Database error"
 
@@ -591,7 +591,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/d;)Lcom/google/android/gms/measurement/internal/ix;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/d;->aBU:Lcom/google/android/gms/measurement/internal/ix;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/d;->aCd:Lcom/google/android/gms/measurement/internal/ix;
 
     return-object p0
 .end method
@@ -623,11 +623,11 @@
 
     if-eq v0, p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -640,11 +640,11 @@
     return-object v1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Loaded invalid blob type value, ignoring it"
 
@@ -682,11 +682,11 @@
     return-object p1
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Loaded invalid null value from database"
 
@@ -747,9 +747,9 @@
 .method private final a(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ac$b;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -767,11 +767,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -781,7 +781,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result v3
 
@@ -805,7 +805,7 @@
     return v1
 
     :cond_1
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v0
 
@@ -825,7 +825,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/ac$b;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result p2
 
@@ -853,11 +853,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/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p2, p1, v4}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -905,7 +905,7 @@
     invoke-virtual {v3, p2, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object p2
 
@@ -923,11 +923,11 @@
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to insert event filter (got -1). appId"
 
@@ -945,11 +945,11 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -965,9 +965,9 @@
 .method private final a(Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ac$e;)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -985,11 +985,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -999,7 +999,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result v3
 
@@ -1023,7 +1023,7 @@
     return v1
 
     :cond_1
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v0
 
@@ -1043,7 +1043,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/ac$e;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result p2
 
@@ -1071,11 +1071,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/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p2, p1, v4}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1123,7 +1123,7 @@
     invoke-virtual {v3, p2, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object p2
 
@@ -1141,11 +1141,11 @@
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to insert property filter (got -1). appId"
 
@@ -1165,11 +1165,11 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1185,7 +1185,7 @@
 .method private final b(Ljava/lang/String;[Ljava/lang/String;)J
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -1240,11 +1240,11 @@
     move-exception p2
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Database error"
 
@@ -1277,11 +1277,11 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -1302,11 +1302,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/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aCV:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDe:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, p1, v6}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -1468,11 +1468,11 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1485,10 +1485,10 @@
     return v1
 .end method
 
-.method private final vb()Z
+.method private final ve()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1505,34 +1505,10 @@
     return v0
 .end method
 
-.method static synthetic vc()[Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBM:[Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method static synthetic vd()[Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBN:[Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method static synthetic ve()[Ljava/lang/String;
-    .locals 1
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBO:[Ljava/lang/String;
-
-    return-object v0
-.end method
-
 .method static synthetic vf()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBQ:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBV:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1540,7 +1516,7 @@
 .method static synthetic vg()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBP:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBW:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1548,7 +1524,7 @@
 .method static synthetic vh()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBR:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBX:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1556,7 +1532,7 @@
 .method static synthetic vi()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->atv:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBZ:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1564,7 +1540,31 @@
 .method static synthetic vj()[Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBS:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aBY:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method static synthetic vk()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aCa:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method static synthetic vl()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->atE:[Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method static synthetic vm()[Ljava/lang/String;
+    .locals 1
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/d;->aCb:[Ljava/lang/String;
 
     return-object v0
 .end method
@@ -1582,15 +1582,15 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v15, v1}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1666,7 +1666,7 @@
     const/16 v18, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v19
 
@@ -1911,11 +1911,11 @@
 
     if-eqz v1, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Got multiple records for event aggregates, expected one. appId"
 
@@ -1969,11 +1969,11 @@
 
     :goto_6
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error querying events. appId"
 
@@ -1981,7 +1981,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2021,12 +2021,12 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -2050,11 +2050,11 @@
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Deleted user attribute rows"
 
@@ -2071,17 +2071,17 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
@@ -2105,14 +2105,14 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v9, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v10
 
@@ -2214,11 +2214,11 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Got multiple records for user property, expected one. appId"
 
@@ -2276,11 +2276,11 @@
 
     :goto_0
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error querying user property. appId"
 
@@ -2288,7 +2288,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2328,14 +2328,14 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v8, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v9
 
@@ -2503,7 +2503,7 @@
 
     move-result-wide v26
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v1
 
@@ -2527,7 +2527,7 @@
 
     move-result-wide v12
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
@@ -2557,7 +2557,7 @@
 
     move-result-wide v29
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
@@ -2605,11 +2605,11 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Got multiple records for conditional property, expected one"
 
@@ -2617,7 +2617,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2675,11 +2675,11 @@
 
     :goto_1
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error querying conditional property"
 
@@ -2687,7 +2687,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2725,14 +2725,14 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -2761,17 +2761,17 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
@@ -2802,9 +2802,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -2814,7 +2814,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -2899,7 +2899,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$b;->pJ()Lcom/google/android/gms/internal/measurement/ac$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$b;->pM()Lcom/google/android/gms/internal/measurement/ac$b$a;
 
     move-result-object v2
 
@@ -2909,7 +2909,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ac$b$a;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -2956,11 +2956,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to merge filter. appId"
 
@@ -3006,11 +3006,11 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Database error querying filters. appId"
 
@@ -3063,9 +3063,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -3075,7 +3075,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -3160,7 +3160,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$e;->pW()Lcom/google/android/gms/internal/measurement/ac$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ac$e;->pZ()Lcom/google/android/gms/internal/measurement/ac$e$a;
 
     move-result-object v2
 
@@ -3170,7 +3170,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ac$e$a;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -3217,11 +3217,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to merge filter"
 
@@ -3267,11 +3267,11 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Database error querying filters. appId"
 
@@ -3319,11 +3319,11 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v3
 
@@ -3426,11 +3426,11 @@
 
     if-nez v14, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Failed to insert column (got -1). appId"
 
@@ -3484,11 +3484,11 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Failed to update column (got 0). appId"
 
@@ -3543,11 +3543,11 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Error inserting column. appId"
 
@@ -3590,9 +3590,9 @@
 
     invoke-static/range {p3 .. p3}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v6, 0x1
 
@@ -3607,7 +3607,7 @@
     invoke-direct {v9}, Lcom/google/android/gms/measurement/internal/c;-><init>()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v15
 
@@ -3677,11 +3677,11 @@
 
     if-nez v11, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Not updating daily counts, app is not known. appId"
 
@@ -3715,7 +3715,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anq:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anz:J
 
     const/4 v6, 0x2
 
@@ -3723,7 +3723,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anp:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
 
     const/4 v6, 0x3
 
@@ -3731,7 +3731,7 @@
 
     move-result-wide v11
 
-    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->aBL:J
+    iput-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
 
     const/4 v6, 0x4
 
@@ -3754,29 +3754,29 @@
 
     if-eqz p4, :cond_3
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anq:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anz:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anq:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anz:J
 
     :cond_3
     if-eqz p5, :cond_4
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anp:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->anp:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
 
     :cond_4
     if-eqz p6, :cond_5
 
-    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBL:J
+    iget-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
 
     add-long/2addr v13, v11
 
-    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBL:J
+    iput-wide v13, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
 
     :cond_5
     if-eqz p7, :cond_6
@@ -3807,7 +3807,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/c;->anp:J
+    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->any:J
 
     invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3815,7 +3815,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/c;->anq:J
+    iget-wide v11, v9, Lcom/google/android/gms/measurement/internal/c;->anz:J
 
     invoke-static {v11, v12}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3823,7 +3823,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/c;->aBL:J
+    iget-wide v3, v9, Lcom/google/android/gms/measurement/internal/c;->aBU:J
 
     invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3884,11 +3884,11 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error updating daily counts. appId"
 
@@ -3926,15 +3926,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/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v1, Landroid/content/ContentValues;
 
     invoke-direct {v1}, Landroid/content/ContentValues;-><init>()V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v2
 
@@ -3942,7 +3942,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/fb;->uc()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uf()Ljava/lang/String;
 
     move-result-object v2
 
@@ -3950,7 +3950,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/fb;->ud()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v2
 
@@ -3958,7 +3958,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/fb;->xU()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->xX()Ljava/lang/String;
 
     move-result-object v2
 
@@ -3966,7 +3966,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/fb;->rZ()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->sc()J
 
     move-result-wide v2
 
@@ -3978,7 +3978,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/fb;->uf()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
 
     move-result-wide v2
 
@@ -3990,7 +3990,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/fb;->ug()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v2
 
@@ -4002,7 +4002,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/fb;->qW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4010,7 +4010,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/fb;->yq()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4018,7 +4018,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/fb;->uk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->un()J
 
     move-result-wide v2
 
@@ -4030,7 +4030,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/fb;->rW()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
 
     move-result-wide v2
 
@@ -4042,7 +4042,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/fb;->nb()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
 
     move-result v2
 
@@ -4054,15 +4054,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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGl:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGu:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4072,15 +4072,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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGm:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGv:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4090,13 +4090,13 @@
 
     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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->zzz:J
 
@@ -4108,15 +4108,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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aFZ:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGi:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4126,7 +4126,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/fb;->sq()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->st()J
 
     move-result-wide v2
 
@@ -4138,7 +4138,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/fb;->nk()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->nn()J
 
     move-result-wide v2
 
@@ -4150,7 +4150,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/fb;->ui()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v2
 
@@ -4162,7 +4162,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/fb;->yp()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4170,15 +4170,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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aEW:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aFf:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4188,15 +4188,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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGn:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/fb;->aGw:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4206,7 +4206,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/fb;->xJ()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->xM()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4214,7 +4214,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/fb;->ut()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uw()J
 
     move-result-wide v2
 
@@ -4226,7 +4226,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/fb;->xG()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v2
 
@@ -4238,7 +4238,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/fb;->yo()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
 
     move-result v2
 
@@ -4250,7 +4250,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/fb;->uA()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4258,7 +4258,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/fb;->ul()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
 
     move-result-wide v2
 
@@ -4270,13 +4270,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/fb;->yr()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
 
     move-result-object v2
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
 
     move-result-object v2
 
@@ -4286,13 +4286,13 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v3
 
@@ -4303,7 +4303,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
 
     move-result-object v2
 
@@ -4321,15 +4321,15 @@
     :goto_0
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4337,7 +4337,7 @@
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->vl()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->vo()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4347,7 +4347,7 @@
 
     :cond_2
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v2
 
@@ -4359,7 +4359,7 @@
 
     const/4 v5, 0x0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v6
 
@@ -4391,15 +4391,15 @@
 
     if-nez v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to insert/update app (got -1). appId"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v2
 
@@ -4417,13 +4417,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object p1
 
@@ -4443,27 +4443,27 @@
 
     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/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()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/k;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
     const-string v2, "app_id"
 
     invoke-virtual {v0, v2, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
     const-string v2, "name"
 
     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/k;->aBL:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -4503,31 +4503,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/k;->aCd:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->aCm: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/k;->aCe:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->aCn: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/k;->aCf:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->aCo: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/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4546,13 +4546,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/k;->azD:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -4577,7 +4577,7 @@
     invoke-virtual {v0, v3, v1}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -4595,15 +4595,15 @@
 
     if-nez v4, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to insert/update event aggregates (got -1). appId"
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -4619,13 +4619,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -4643,13 +4643,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/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/d;->L(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/jn;
 
@@ -4659,7 +4659,7 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jm;->cF(Ljava/lang/String;)Z
 
@@ -4673,7 +4673,7 @@
 
     new-array v0, v1, [Ljava/lang/String;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
@@ -4690,13 +4690,13 @@
     return v4
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v5, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4708,7 +4708,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     const-string v7, "_npa"
 
@@ -4720,11 +4720,11 @@
 
     new-array v0, v5, [Ljava/lang/String;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->amV:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
 
     aput-object v5, v0, v1
 
@@ -4741,11 +4741,11 @@
     :cond_1
     new-array v0, v5, [Ljava/lang/String;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
     aput-object v5, v0, v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->amV:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
 
     aput-object v5, v0, v1
 
@@ -4764,19 +4764,19 @@
 
     invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->atS: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/jn;->amV:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->ane: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/jn;->anh:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     const-string v3, "name"
 
@@ -4792,14 +4792,14 @@
 
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Long;)V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     const-string v3, "value"
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/measurement/internal/d;->a(Landroid/content/ContentValues;Ljava/lang/String;Ljava/lang/Object;)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v2
 
@@ -4819,15 +4819,15 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to insert/update user property (got -1). appId"
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -4842,13 +4842,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jn;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -4866,17 +4866,17 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/l;JZ)Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()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/l;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     move-result-object v0
 
@@ -4886,7 +4886,7 @@
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->iterator()Ljava/util/Iterator;
 
@@ -4905,7 +4905,7 @@
 
     check-cast v2, Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v3
 
@@ -4913,13 +4913,13 @@
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v4, v2}, Lcom/google/android/gms/measurement/internal/zzam;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v4
 
@@ -4930,7 +4930,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -4938,21 +4938,21 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ak$c;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -4972,19 +4972,19 @@
 
     invoke-direct {v1}, Landroid/content/ContentValues;-><init>()V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     const-string v3, "app_id"
 
     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/l;->amV:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     const-string v3, "name"
 
     invoke-virtual {v1, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -5017,7 +5017,7 @@
     const/4 p2, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object p3
 
@@ -5035,15 +5035,15 @@
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p4, "Failed to insert raw event (got -1). appId"
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -5063,13 +5063,13 @@
     :catch_0
     move-exception p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -5087,15 +5087,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/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/d;->L(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/jn;
 
@@ -5107,7 +5107,7 @@
 
     new-array v0, v1, [Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     const/4 v3, 0x0
 
@@ -5132,29 +5132,29 @@
 
     invoke-direct {v0}, Landroid/content/ContentValues;-><init>()V
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS: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/zzv;->amV:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->ane: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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     const-string v3, "name"
 
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -5188,9 +5188,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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Parcelable;)[B
 
@@ -5210,9 +5210,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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Parcelable;)[B
 
@@ -5222,9 +5222,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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -5244,9 +5244,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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Parcelable;)[B
 
@@ -5257,7 +5257,7 @@
     invoke-virtual {v0, v3, v2}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v2
 
@@ -5277,15 +5277,15 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to insert/update conditional user property (got -1)"
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -5300,13 +5300,13 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -5324,9 +5324,9 @@
 .method public final a(Ljava/lang/String;Ljava/lang/Long;JLcom/google/android/gms/internal/measurement/ak$c;)Z
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     invoke-static {p5}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -5334,17 +5334,17 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {p5}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object p5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v1
 
@@ -5389,7 +5389,7 @@
     const/4 p2, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object p3
 
@@ -5409,11 +5409,11 @@
 
     if-nez p5, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p4, "Failed to insert complex main event (got -1). appId"
 
@@ -5435,11 +5435,11 @@
     :catch_0
     move-exception p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -5455,14 +5455,14 @@
 .method public final ab(J)Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -5494,11 +5494,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "No expired configs for apps with pending events"
 
@@ -5549,11 +5549,11 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error selecting expired configs"
 
@@ -5595,14 +5595,14 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -5638,11 +5638,11 @@
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Main event not found"
 
@@ -5676,7 +5676,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     move-result-object v4
 
@@ -5686,7 +5686,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/ak$c$a;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v2
 
@@ -5717,11 +5717,11 @@
     move-exception v2
 
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Failed to merge main event. appId, eventId"
 
@@ -5760,11 +5760,11 @@
 
     :goto_0
     :try_start_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error selecting main event"
 
@@ -5808,9 +5808,9 @@
 
     move/from16 v1, p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v2, 0x1
 
@@ -5845,7 +5845,7 @@
     const/4 v4, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v5
 
@@ -5930,7 +5930,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v9
 
@@ -5960,7 +5960,7 @@
 
     :cond_5
     :try_start_4
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v9
 
@@ -5992,7 +5992,7 @@
 
     add-int/2addr v6, v0
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -6015,11 +6015,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Failed to merge queued bundle. appId"
 
@@ -6034,11 +6034,11 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Failed to unzip queued bundle. appId"
 
@@ -6077,11 +6077,11 @@
     move-exception v0
 
     :try_start_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error querying bundles. appId"
 
@@ -6134,16 +6134,16 @@
         }
     .end annotation
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v2
 
@@ -6296,11 +6296,11 @@
 
     if-lt v3, v4, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Read more than the max allowed conditional properties, ignoring extra"
 
@@ -6355,7 +6355,7 @@
 
     move-result-wide v25
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v4
 
@@ -6379,7 +6379,7 @@
 
     move-result-wide v27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v4
 
@@ -6411,7 +6411,7 @@
 
     move-result-wide v31
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v4
 
@@ -6525,11 +6525,11 @@
 
     :goto_3
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Error querying conditional user property value"
 
@@ -6588,28 +6588,28 @@
 
     const-string v3, "property_filters"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v4
 
     invoke-virtual {v4}, Landroid/database/sqlite/SQLiteDatabase;->beginTransaction()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v5
 
@@ -6647,25 +6647,25 @@
 
     check-cast v5, Lcom/google/android/gms/internal/measurement/ac$a;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ac$a;->pE()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ac$a;->pH()Z
 
     move-result v7
 
     if-nez v7, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "Audience with no ID. appId"
 
@@ -6699,17 +6699,17 @@
 
     check-cast v10, Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result v10
 
     if-nez v10, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Event filter with no ID. Audience definition ignored. appId, audienceId"
 
@@ -6745,17 +6745,17 @@
 
     check-cast v10, Lcom/google/android/gms/internal/measurement/ac$e;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result v10
 
     if-nez v10, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Property filter with no ID. Audience definition ignored. appId, audienceId"
 
@@ -6837,13 +6837,13 @@
     :cond_9
     if-nez v9, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v5
 
@@ -6897,7 +6897,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ac$a;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$a;->pE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$a;->pH()Z
 
     move-result v2
 
@@ -6947,9 +6947,9 @@
 .method public final c(Lcom/google/android/gms/internal/measurement/ak$g;Z)Z
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -6957,15 +6957,15 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g;->mP()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g;->mS()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/d;->uY()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->vb()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -6975,7 +6975,7 @@
 
     iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/ak$g;->zzj:J
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uj()J
 
     move-result-wide v4
 
@@ -6987,7 +6987,7 @@
 
     iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/ak$g;->zzj:J
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uj()J
 
     move-result-wide v4
 
@@ -6998,11 +6998,11 @@
     if-lez v6, :cond_1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v3, p1, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -7025,14 +7025,14 @@
     invoke-virtual {v2, v4, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v0
 
     const/4 v1, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v2
 
@@ -7042,11 +7042,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/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     array-length v3, v0
 
@@ -7090,7 +7090,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/ak$g;->qM()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g;->qP()Z
 
     move-result p2
 
@@ -7108,7 +7108,7 @@
 
     :cond_2
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object p2
 
@@ -7126,11 +7126,11 @@
 
     if-nez p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Failed to insert bundle (got -1). appId"
 
@@ -7154,11 +7154,11 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -7175,11 +7175,11 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -7209,9 +7209,9 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -7220,7 +7220,7 @@
     const/4 v1, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v2
 
@@ -7325,11 +7325,11 @@
 
     if-nez v21, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Read invalid user property value, ignoring it. appId"
 
@@ -7406,11 +7406,11 @@
 
     :goto_1
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Error querying user properties. appId"
 
@@ -7454,14 +7454,14 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v2, 0x0
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v3
 
@@ -7709,9 +7709,9 @@
     move-object/from16 v5, p0
 
     :try_start_3
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/d;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/d;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-direct {v4, v6, v1}, Lcom/google/android/gms/measurement/internal/fb;-><init>(Lcom/google/android/gms/measurement/internal/ey;Ljava/lang/String;)V
 
@@ -7817,17 +7817,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGl:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:J
 
     cmp-long v10, v8, v6
 
@@ -7843,9 +7843,9 @@
     :goto_2
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGl:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGu:J
 
     const/16 v0, 0xc
 
@@ -7853,17 +7853,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGm:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGv:J
 
     cmp-long v10, v8, v6
 
@@ -7879,9 +7879,9 @@
     :goto_3
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGm:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGv:J
 
     const/16 v0, 0xd
 
@@ -7889,15 +7889,15 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->zzz:J
 
@@ -7915,7 +7915,7 @@
     :goto_4
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->zzz:J
 
@@ -7925,17 +7925,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aFZ:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGi:J
 
     cmp-long v10, v8, v6
 
@@ -7951,9 +7951,9 @@
     :goto_5
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aFZ:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGi:J
 
     const/16 v0, 0xf
 
@@ -8007,17 +8007,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aEW:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aFf:J
 
     cmp-long v10, v8, v6
 
@@ -8033,9 +8033,9 @@
     :goto_7
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aEW:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aFf:J
 
     const/16 v0, 0x14
 
@@ -8043,17 +8043,17 @@
 
     move-result-wide v6
 
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGn:J
+    iget-wide v8, v4, Lcom/google/android/gms/measurement/internal/fb;->aGw:J
 
     cmp-long v10, v8, v6
 
@@ -8069,9 +8069,9 @@
     :goto_8
     or-int/2addr v0, v8
 
-    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGn:J
+    iput-wide v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGw:J
 
     const/16 v0, 0x15
 
@@ -8209,15 +8209,15 @@
 
     move-result-object v0
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGk:Ljava/util/List;
+    iget-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGt:Ljava/util/List;
 
     invoke-static {v6, v0}, Lcom/google/android/gms/measurement/internal/jm;->c(Ljava/util/List;Ljava/util/List;)Z
 
@@ -8225,7 +8225,7 @@
 
     if-nez v6, :cond_12
 
-    iput-boolean v12, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v12, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     if-eqz v0, :cond_11
 
@@ -8239,16 +8239,16 @@
     move-object v6, v2
 
     :goto_f
-    iput-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGk:Ljava/util/List;
+    iput-object v6, v4, Lcom/google/android/gms/measurement/internal/fb;->aGt:Ljava/util/List;
 
     :cond_12
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -8265,15 +8265,15 @@
     invoke-virtual {v4, v0}, Lcom/google/android/gms/measurement/internal/fb;->cs(Ljava/lang/String;)V
 
     :cond_13
-    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v4, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v11, v4, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     invoke-interface {v3}, Landroid/database/Cursor;->moveToNext()Z
 
@@ -8281,11 +8281,11 @@
 
     if-eqz v0, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Got multiple records for app, expected one. appId"
 
@@ -8343,11 +8343,11 @@
 
     :goto_10
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Error querying app. appId"
 
@@ -8383,20 +8383,20 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -8445,11 +8445,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -8469,14 +8469,14 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -8552,11 +8552,11 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Got multiple records for app config, expected one. appId"
 
@@ -8596,11 +8596,11 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Error querying remote config. appId"
 
@@ -8646,9 +8646,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -8656,7 +8656,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -8779,11 +8779,11 @@
 
     :goto_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Database error querying scoped filters. appId"
 
@@ -8834,13 +8834,13 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -8920,7 +8920,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->re()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
 
     move-result-object v4
 
@@ -8930,7 +8930,7 @@
 
     check-cast v3, Lcom/google/android/gms/internal/measurement/ak$i$a;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -8954,11 +8954,11 @@
     :catch_0
     move-exception v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Failed to merge filter results. appId, audienceId, error"
 
@@ -9008,11 +9008,11 @@
 
     :goto_1
     :try_start_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Database error querying filter results. appId"
 
@@ -9090,9 +9090,9 @@
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9182,7 +9182,7 @@
 
     check-cast v16, [Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v12
 
@@ -9261,11 +9261,11 @@
 
     if-lt v4, v6, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Read more than the max allowed user properties, ignoring excess"
 
@@ -9308,11 +9308,11 @@
     if-nez v15, :cond_5
 
     :try_start_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "(2)Read invalid user property value, ignoring it"
 
@@ -9475,11 +9475,11 @@
 
     :goto_7
     :try_start_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "(2)Error querying user properties"
 
@@ -9536,9 +9536,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -9602,7 +9602,7 @@
 
     invoke-interface {v3, v2, p1}, Ljava/util/List;->add(ILjava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v4
 
@@ -9743,11 +9743,11 @@
 
     :goto_1
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Database error querying filters. appId"
 
@@ -9801,9 +9801,9 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v0, Ljava/util/ArrayList;
 
@@ -9886,9 +9886,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -9896,11 +9896,11 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v1
 
@@ -9931,7 +9931,7 @@
     invoke-virtual {v3, v4, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -9950,11 +9950,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object p1, p1, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -9980,9 +9980,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -9992,7 +9992,7 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->bd(I)I
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->vb()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->ve()Z
 
     move-result v0
 
@@ -10075,11 +10075,11 @@
 
     if-lez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "The number of upload retries exceeds the limit. Will remain unchanged."
 
@@ -10087,7 +10087,7 @@
 
     :cond_1
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10128,11 +10128,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Error incrementing retry count. error"
 
@@ -10141,7 +10141,7 @@
     return-void
 .end method
 
-.method public final mP()Z
+.method public final mS()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from queue where has_realtime = 1"
@@ -10168,7 +10168,7 @@
     return v0
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -10176,7 +10176,7 @@
     return v0
 .end method
 
-.method public final sd()J
+.method public final sg()J
     .locals 4
 
     const-string v0, "select max(bundle_end_timestamp) from queue"
@@ -10192,12 +10192,12 @@
     return-wide v0
 .end method
 
-.method public final tR()V
+.method public final tU()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10206,12 +10206,12 @@
     return-void
 .end method
 
-.method public final uU()V
+.method public final uX()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10220,12 +10220,12 @@
     return-void
 .end method
 
-.method public final uV()V
+.method public final uY()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10234,13 +10234,13 @@
     return-void
 .end method
 
-.method final uW()Landroid/database/sqlite/SQLiteDatabase;
+.method final uZ()Landroid/database/sqlite/SQLiteDatabase;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aBT:Lcom/google/android/gms/measurement/internal/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/d;->aCc:Lcom/google/android/gms/measurement/internal/e;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/e;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -10253,11 +10253,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error opening database"
 
@@ -10266,10 +10266,115 @@
     throw v0
 .end method
 
-.method public final uX()Ljava/lang/String;
+.method public final uq()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/d;->a(Ljava/lang/String;[Ljava/lang/String;J)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final us()J
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    const-wide/16 v0, -0x1
+
+    const/4 v2, 0x0
+
+    :try_start_0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
+
+    move-result-object v3
+
+    const-string v4, "select rowid from raw_events order by rowid desc limit 1;"
+
+    invoke-virtual {v3, v4, v2}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
+
+    move-result-object v2
+
+    invoke-interface {v2}, Landroid/database/Cursor;->moveToFirst()Z
+
+    move-result v3
+    :try_end_0
+    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    if-nez v3, :cond_1
+
+    if-eqz v2, :cond_0
+
+    invoke-interface {v2}, Landroid/database/Cursor;->close()V
+
+    :cond_0
+    return-wide v0
+
+    :cond_1
+    const/4 v3, 0x0
+
+    :try_start_1
+    invoke-interface {v2, v3}, Landroid/database/Cursor;->getLong(I)J
+
+    move-result-wide v0
+    :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
+
+    if-eqz v2, :cond_2
+
+    invoke-interface {v2}, Landroid/database/Cursor;->close()V
+
+    :cond_2
+    return-wide v0
+
+    :catchall_0
+    move-exception v0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v3
+
+    :try_start_2
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+
+    move-result-object v4
+
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+
+    const-string v5, "Error querying raw events"
+
+    invoke-virtual {v4, v5, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
+    :try_end_2
+    .catchall {:try_start_2 .. :try_end_2} :catchall_0
+
+    if-eqz v2, :cond_3
+
+    invoke-interface {v2}, Landroid/database/Cursor;->close()V
+
+    :cond_3
+    return-wide v0
+
+    :goto_0
+    if-eqz v2, :cond_4
+
+    invoke-interface {v2}, Landroid/database/Cursor;->close()V
+
+    :cond_4
+    throw v0
+.end method
+
+.method public final va()Ljava/lang/String;
+    .locals 6
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10339,11 +10444,11 @@
 
     :goto_0
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Database error getting next bundle app id"
 
@@ -10370,14 +10475,14 @@
     throw v1
 .end method
 
-.method final uY()V
+.method final vb()V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->vb()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->ve()Z
 
     move-result v0
 
@@ -10386,21 +10491,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEQ:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
-    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v2}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v2
 
@@ -10410,7 +10515,7 @@
 
     move-result-wide v0
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCO:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCX:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v5, 0x0
 
@@ -10428,25 +10533,25 @@
 
     if-lez v6, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEQ:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->vb()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/d;->ve()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -10456,7 +10561,7 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -10472,7 +10577,7 @@
 
     const/4 v2, 0x1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uj()J
 
     move-result-wide v3
 
@@ -10492,11 +10597,11 @@
 
     if-lez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -10510,7 +10615,7 @@
     return-void
 .end method
 
-.method public final uZ()Z
+.method public final vc()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events"
@@ -10537,112 +10642,7 @@
     return v0
 .end method
 
-.method public final un()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/d;->a(Ljava/lang/String;[Ljava/lang/String;J)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final up()J
-    .locals 6
-
-    const-wide/16 v0, -0x1
-
-    const/4 v2, 0x0
-
-    :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
-
-    move-result-object v3
-
-    const-string v4, "select rowid from raw_events order by rowid desc limit 1;"
-
-    invoke-virtual {v3, v4, v2}, Landroid/database/sqlite/SQLiteDatabase;->rawQuery(Ljava/lang/String;[Ljava/lang/String;)Landroid/database/Cursor;
-
-    move-result-object v2
-
-    invoke-interface {v2}, Landroid/database/Cursor;->moveToFirst()Z
-
-    move-result v3
-    :try_end_0
-    .catch Landroid/database/sqlite/SQLiteException; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    if-nez v3, :cond_1
-
-    if-eqz v2, :cond_0
-
-    invoke-interface {v2}, Landroid/database/Cursor;->close()V
-
-    :cond_0
-    return-wide v0
-
-    :cond_1
-    const/4 v3, 0x0
-
-    :try_start_1
-    invoke-interface {v2, v3}, Landroid/database/Cursor;->getLong(I)J
-
-    move-result-wide v0
-    :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
-
-    if-eqz v2, :cond_2
-
-    invoke-interface {v2}, Landroid/database/Cursor;->close()V
-
-    :cond_2
-    return-wide v0
-
-    :catchall_0
-    move-exception v0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v3
-
-    :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
-
-    move-result-object v4
-
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
-
-    const-string v5, "Error querying raw events"
-
-    invoke-virtual {v4, v5, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
-    :try_end_2
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    if-eqz v2, :cond_3
-
-    invoke-interface {v2}, Landroid/database/Cursor;->close()V
-
-    :cond_3
-    return-wide v0
-
-    :goto_0
-    if-eqz v2, :cond_4
-
-    invoke-interface {v2}, Landroid/database/Cursor;->close()V
-
-    :cond_4
-    throw v0
-.end method
-
-.method public final va()Z
+.method public final vd()Z
     .locals 5
 
     const-string v0, "select count(1) > 0 from raw_events where realtime = 1"
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 f8f43ab08d..76bf26bdf1 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/da;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/da;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/da;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vI()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vL()Ljava/lang/Boolean;
 
     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 69d1948bfc..ff60a99c3e 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/db;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/db;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/db;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vG()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vJ()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 1c39e3cde0..db1b858f71 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
@@ -13,58 +13,23 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/ec;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dc;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGd:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGd:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract va()Z
+.method protected abstract vd()Z
 .end method
 
-.method public final xA()V
-    .locals 2
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGB:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yn()V
-
-    const/4 v0, 0x1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Can\'t initialize twice"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method protected xB()V
-    .locals 0
-
-    return-void
-.end method
-
-.method final xx()Z
+.method final xA()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
@@ -81,10 +46,10 @@
     return v0
 .end method
 
-.method protected final xy()V
+.method protected final xB()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xA()Z
 
     move-result v0
 
@@ -102,22 +67,22 @@
     throw v0
 .end method
 
-.method public final xz()V
+.method public final xC()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->va()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->vd()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
 
     const/4 v0, 0x1
 
@@ -135,3 +100,38 @@
 
     throw v0
 .end method
+
+.method public final xD()V
+    .locals 2
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xE()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dc;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
+
+    const/4 v0, 0x1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dc;->zza:Z
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Can\'t initialize twice"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method protected xE()V
+    .locals 0
+
+    return-void
+.end method
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 5f101eaa68..740c532420 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/dd;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dd;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vH()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vK()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 c13ccbc440..4807e73758 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/de;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/de;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/de;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xf()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xi()Ljava/lang/Integer;
 
     move-result-object v0
 
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 5ec3a5aac1..e1fb22d60e 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/df;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/df;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vF()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vI()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 574895a8ff..d57ecfbcec 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/dg;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dg;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vD()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vG()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 07ea569f33..283f0d14d9 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/dh;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dh;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dh;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vE()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vH()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 b5e0427308..5d16ac45c5 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/di;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/di;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/di;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vB()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vE()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 cb2c935509..7813694350 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/dj;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vC()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vF()Ljava/lang/Boolean;
 
     move-result-object v0
 
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 7d854fb006..6fb8798e63 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/dk;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dk;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dk;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vz()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vC()Ljava/lang/Boolean;
 
     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 46c468c8ee..edd55c07d3 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/dl;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dl;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vA()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->vD()Ljava/lang/Boolean;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dm.smali
index 9aa66a613e..ba7d870ea7 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dm.smali
@@ -15,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract rz()Ljava/lang/Object;
+.method public abstract rC()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TV;"
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 56f3b15a6c..f393237ac6 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
@@ -15,11 +15,11 @@
 
 
 # static fields
-.field private static final ass:Ljava/lang/Object;
+.field private static final asB:Ljava/lang/Object;
 
 
 # instance fields
-.field private final aEj:Lcom/google/android/gms/measurement/internal/dm;
+.field private final aEs:Lcom/google/android/gms/measurement/internal/dm;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/dm<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field private final asr:Ljava/lang/Object;
+.field private final asA:Ljava/lang/Object;
 
-.field private volatile ast:Ljava/lang/Object;
+.field private volatile asC:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -38,9 +38,9 @@
     .end annotation
 .end field
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
-.field private final atP:Ljava/lang/Object;
+.field private final atY:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -73,7 +73,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/do;->ass:Ljava/lang/Object;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/do;->asB:Ljava/lang/Object;
 
     return-void
 .end method
@@ -96,21 +96,21 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asr:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asA:Ljava/lang/Object;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->ast:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asC:Ljava/lang/Object;
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->zzh:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/do;->zzc:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/do;->atP:Ljava/lang/Object;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/do;->atY:Ljava/lang/Object;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/do;->aEj:Lcom/google/android/gms/measurement/internal/dm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/do;->aEs:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -133,12 +133,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asr:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/do;->asA:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/do;->ast:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/do;->asC:Ljava/lang/Object;
 
     monitor-exit v0
     :try_end_0
@@ -149,7 +149,7 @@
     return-object p1
 
     :cond_0
-    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
 
     if-nez p1, :cond_1
 
@@ -158,14 +158,14 @@
     return-object p1
 
     :cond_1
-    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/do;->ass:Ljava/lang/Object;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/do;->asB:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v0
 
@@ -188,18 +188,18 @@
     return-object v0
 
     :cond_3
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v0
 
     if-nez v0, :cond_8
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xp()Ljava/util/List;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xs()Ljava/util/List;
 
     move-result-object v0
 
@@ -220,7 +220,7 @@
 
     check-cast v1, Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/do;->ass:Ljava/lang/Object;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/do;->asB:Ljava/lang/Object;
 
     monitor-enter v2
     :try_end_2
@@ -228,7 +228,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v3
     :try_end_3
@@ -239,13 +239,13 @@
     const/4 v3, 0x0
 
     :try_start_4
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEj:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEs:Lcom/google/android/gms/measurement/internal/dm;
 
     if-eqz v4, :cond_4
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEj:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/do;->aEs:Lcom/google/android/gms/measurement/internal/dm;
 
-    invoke-interface {v4}, Lcom/google/android/gms/measurement/internal/dm;->rz()Ljava/lang/Object;
+    invoke-interface {v4}, Lcom/google/android/gms/measurement/internal/dm;->rC()Ljava/lang/Object;
 
     move-result-object v4
 
@@ -304,11 +304,11 @@
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->aEj:Lcom/google/android/gms/measurement/internal/dm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->aEs:Lcom/google/android/gms/measurement/internal/dm;
 
     if-nez p1, :cond_7
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->zzc:Ljava/lang/Object;
 
@@ -316,7 +316,7 @@
 
     :cond_7
     :try_start_8
-    invoke-interface {p1}, Lcom/google/android/gms/measurement/internal/dm;->rz()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/android/gms/measurement/internal/dm;->rC()Ljava/lang/Object;
 
     move-result-object p1
     :try_end_8
@@ -326,7 +326,7 @@
     return-object p1
 
     :catch_2
-    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->zzc:Ljava/lang/Object;
 
@@ -337,7 +337,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/o;->e(Ljava/lang/Exception;)V
 
-    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sget-object p1, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
 
     iget-object p1, p0, Lcom/google/android/gms/measurement/internal/do;->zzc:Ljava/lang/Object;
 
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 7c48d54f6a..755d9ba54a 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
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -84,7 +84,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -132,7 +132,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -183,7 +183,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -220,7 +220,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -247,7 +247,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -295,7 +295,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -318,7 +318,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -339,7 +339,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -362,7 +362,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -393,7 +393,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -414,7 +414,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -435,7 +435,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -477,7 +477,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -512,7 +512,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pC()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/a;->pF()Landroid/os/Parcel;
 
     move-result-object v0
 
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 7ef64ada27..938c0b607e 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
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final aEk:Lcom/google/android/gms/measurement/internal/du;
+.field private final aEt:Lcom/google/android/gms/measurement/internal/du;
 
-.field private atx:Z
+.field private atG:Z
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/du;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -25,7 +25,7 @@
 
     invoke-direct {p1, p0, v0, v1}, Lcom/google/android/gms/measurement/internal/du;-><init>(Lcom/google/android/gms/measurement/internal/dr;Landroid/content/Context;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->aEk:Lcom/google/android/gms/measurement/internal/du;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dr;->aEt:Lcom/google/android/gms/measurement/internal/du;
 
     return-void
 .end method
@@ -110,7 +110,7 @@
     throw p0
 .end method
 
-.method private final xF()Landroid/database/sqlite/SQLiteDatabase;
+.method private final xI()Landroid/database/sqlite/SQLiteDatabase;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -118,7 +118,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
 
     const/4 v1, 0x0
 
@@ -127,7 +127,7 @@
     return-object v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aEk:Lcom/google/android/gms/measurement/internal/du;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dr;->aEt:Lcom/google/android/gms/measurement/internal/du;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/du;->getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
 
@@ -137,7 +137,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
 
     return-object v1
 
@@ -145,10 +145,10 @@
     return-object v0
 .end method
 
-.method private final xG()Z
+.method private final xJ()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -174,9 +174,9 @@
 
     const-string v2, "Error writing entry to local database"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
 
     const/4 v3, 0x0
 
@@ -217,7 +217,7 @@
     const/4 v9, 0x1
 
     :try_start_0
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xF()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xI()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v10
     :try_end_0
@@ -229,7 +229,7 @@
     if-nez v10, :cond_2
 
     :try_start_1
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atG: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
@@ -320,11 +320,11 @@
     if-ltz v16, :cond_4
 
     :try_start_4
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Data loss, local db full"
 
@@ -356,11 +356,11 @@
 
     if-eqz v5, :cond_4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Different delete count than expected in local db. expected, received, difference"
 
@@ -479,17 +479,17 @@
     invoke-virtual {v8}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
@@ -546,17 +546,17 @@
 
     :goto_5
     :try_start_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     const/4 v3, 0x1
 
-    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v3, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_4
 
@@ -598,11 +598,11 @@
     throw v0
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to write entry to local database"
 
@@ -613,15 +613,25 @@
     return v2
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
 
     return-void
 .end method
 
-.method protected final va()Z
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vd()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -629,121 +639,111 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final xC()V
+.method public final xF()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xF()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xI()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -759,11 +759,11 @@
 
     if-lez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Reset local analytics data. records"
 
@@ -781,11 +781,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error resetting local analytics data. error"
 
@@ -794,7 +794,7 @@
     return-void
 .end method
 
-.method public final xD()Ljava/util/List;
+.method public final xG()Ljava/util/List;
     .locals 24
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -809,9 +809,9 @@
 
     const-string v2, "Error reading entries from local database"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iget-boolean v0, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
 
     const/4 v3, 0x0
 
@@ -824,7 +824,7 @@
 
     invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xG()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xJ()Z
 
     move-result v0
 
@@ -847,7 +847,7 @@
     const/4 v9, 0x1
 
     :try_start_0
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xF()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dr;->xI()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v15
     :try_end_0
@@ -859,7 +859,7 @@
     if-nez v15, :cond_3
 
     :try_start_1
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atG: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
@@ -891,11 +891,11 @@
     :try_start_2
     invoke-virtual {v15}, Landroid/database/sqlite/SQLiteDatabase;->beginTransaction()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDY:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v10}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1147,11 +1147,11 @@
 
     :catch_3
     :try_start_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v13, "Failed to load event from local database"
 
@@ -1224,11 +1224,11 @@
 
     :catch_4
     :try_start_f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
     :try_end_f
@@ -1298,11 +1298,11 @@
 
     :catch_5
     :try_start_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v12, v13}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
     :try_end_13
@@ -1328,11 +1328,11 @@
     :cond_9
     if-ne v11, v0, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v12, "Skipping app launch break"
 
@@ -1341,11 +1341,11 @@
     goto/16 :goto_2
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v12, "Unknown record type in local database"
 
@@ -1376,11 +1376,11 @@
 
     if-ge v0, v5, :cond_c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Fewer entries removed from local database than expected"
 
@@ -1511,15 +1511,15 @@
     invoke-virtual {v3}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     :cond_f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v5, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
     :try_end_15
     .catchall {:try_start_15 .. :try_end_15} :catchall_6
 
@@ -1583,15 +1583,15 @@
 
     :goto_d
     :try_start_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v5, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v9, v1, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
     :try_end_17
     .catchall {:try_start_17 .. :try_end_17} :catchall_8
 
@@ -1635,11 +1635,11 @@
     throw v0
 
     :cond_16
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to read events from database in reasonable time"
 
@@ -1650,14 +1650,14 @@
     return-object v2
 .end method
 
-.method public final xE()Z
+.method public final xH()Z
     .locals 11
 
     const-string v0, "Error deleting app launch break from local database"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
 
     const/4 v2, 0x0
 
@@ -1666,7 +1666,7 @@
     return v2
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xG()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xJ()Z
 
     move-result v1
 
@@ -1689,13 +1689,13 @@
     const/4 v6, 0x1
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xF()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dr;->xI()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v5
 
     if-nez v5, :cond_3
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atG: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
@@ -1765,15 +1765,15 @@
     invoke-virtual {v5}, Landroid/database/sqlite/SQLiteDatabase;->endTransaction()V
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v8, v0, v7}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -1803,15 +1803,15 @@
     move-exception v7
 
     :try_start_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v8, v0, v7}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atx:Z
+    iput-boolean v6, p0, Lcom/google/android/gms/measurement/internal/dr;->atG:Z
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
@@ -1834,11 +1834,11 @@
     throw v0
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Error deleting app launch break from local database in reasonable time"
 
@@ -1847,70 +1847,70 @@
     return v2
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
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 9871b3e4c9..74b59abd01 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field aEl:Ljava/util/List;
+.field aEu:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,15 +14,15 @@
     .end annotation
 .end field
 
-.field private aEm:Ljava/lang/String;
+.field private aEv:Ljava/lang/String;
 
-.field private amV:Ljava/lang/String;
+.field private ane:Ljava/lang/String;
 
-.field private atJ:Ljava/lang/String;
+.field private atS:Ljava/lang/String;
 
-.field private auh:I
+.field private auq:I
 
-.field private azE:Ljava/lang/String;
+.field private azN:Ljava/lang/String;
 
 .field private zzc:I
 
@@ -50,16 +50,16 @@
     return-void
 .end method
 
-.method private final xH()Ljava/lang/String;
+.method private final xK()Ljava/lang/String;
     .locals 7
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/lk;->zzb()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEi:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -69,11 +69,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Disabled IID for tests."
 
@@ -83,7 +83,7 @@
 
     :cond_0
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -123,7 +123,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v4
 
@@ -162,11 +162,11 @@
     return-object v0
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to retrieve Firebase Instance Id"
 
@@ -175,11 +175,11 @@
     return-object v1
 
     :catch_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEv:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to obtain Firebase Analytics instance"
 
@@ -196,37 +196,37 @@
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     new-instance v30, Lcom/google/android/gms/measurement/internal/zzm;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ds;->amV:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ds;->ane:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xO()I
 
     move-result v1
 
     int-to-long v5, v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     iget-object v7, v0, Lcom/google/android/gms/measurement/internal/ds;->zzd:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/ds;->zzf:J
 
@@ -236,17 +236,17 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v9
 
@@ -263,27 +263,27 @@
     :cond_0
     iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/ds;->zzf:J
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-boolean v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aAj:Z
+    iget-boolean v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aAs:Z
 
     const/4 v8, 0x1
 
     xor-int/lit8 v15, v1, 0x1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v1
 
@@ -294,26 +294,26 @@
     goto :goto_0
 
     :cond_1
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xH()Ljava/lang/String;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xK()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/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     iget-wide v8, v0, Lcom/google/android/gms/measurement/internal/ds;->zzg:J
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v10
 
@@ -331,7 +331,7 @@
 
     if-nez v11, :cond_2
 
-    iget-wide v10, v1, Lcom/google/android/gms/measurement/internal/ey;->aGf:J
+    iget-wide v10, v1, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
 
     move-wide/from16 v19, v8
 
@@ -342,7 +342,7 @@
     :cond_2
     move-wide/from16 v19, v8
 
-    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/ey;->aGf:J
+    iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
 
     invoke-virtual {v10}, Ljava/lang/Long;->longValue()J
 
@@ -355,15 +355,15 @@
     move-wide/from16 v21, v8
 
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xM()I
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xP()I
 
     move-result v23
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uH()Ljava/lang/Boolean;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uK()Ljava/lang/Boolean;
 
     move-result-object v1
 
@@ -371,7 +371,7 @@
 
     move-result v24
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
@@ -403,13 +403,13 @@
     const/16 v25, 0x1
 
     :goto_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -419,19 +419,19 @@
 
     move-result v26
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v8, v9}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -439,7 +439,7 @@
 
     if-eqz v1, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
@@ -473,15 +473,15 @@
     :goto_4
     iget-wide v10, v0, Lcom/google/android/gms/measurement/internal/ds;->zzh:J
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v8, v9}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -489,7 +489,7 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aEl:Ljava/util/List;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->aEu:Ljava/util/List;
 
     move-object/from16 v29, v1
 
@@ -501,15 +501,15 @@
     :goto_5
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v8
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v8, v9}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -517,7 +517,7 @@
 
     if-eqz v1, :cond_7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ds;->zzm:Ljava/lang/String;
 
@@ -574,15 +574,25 @@
     return-object v30
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
 
     return-void
 .end method
 
-.method protected final va()Z
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vd()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -590,118 +600,108 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final xB()V
+.method protected final xE()V
     .locals 13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -709,7 +709,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -729,11 +729,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -759,11 +759,11 @@
     goto :goto_0
 
     :catch_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -794,7 +794,7 @@
     :cond_3
     :goto_1
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v7
 
@@ -852,11 +852,11 @@
     move-object v7, v2
 
     :goto_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -871,11 +871,11 @@
     move-object v2, v7
 
     :goto_4
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atJ:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atS:Ljava/lang/String;
 
     iput-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->zzd:Ljava/lang/String;
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->amV:Ljava/lang/String;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->ane:Ljava/lang/String;
 
     iput v6, p0, Lcom/google/android/gms/measurement/internal/ds;->zzc:I
 
@@ -885,9 +885,9 @@
 
     iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/ds;->zzf:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v2
 
@@ -899,7 +899,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->lN()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/common/api/Status;->lQ()Z
 
     move-result v8
 
@@ -913,9 +913,9 @@
     const/4 v8, 0x0
 
     :goto_5
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {v9}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -925,7 +925,7 @@
 
     if-nez v9, :cond_6
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->zzd:Ljava/lang/String;
 
@@ -949,11 +949,11 @@
 
     if-nez v2, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "GoogleService failed to initialize (no status)"
 
@@ -962,11 +962,11 @@
     goto :goto_7
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     iget v11, v2, Lcom/google/android/gms/common/api/Status;->zzh:I
 
@@ -984,27 +984,27 @@
     :goto_7
     if-eqz v8, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->vH()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->vK()Ljava/lang/Boolean;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ka;->ro()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
 
     move-result v8
 
     if-eqz v8, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1012,11 +1012,11 @@
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Collection disabled with firebase_analytics_collection_deactivated=1"
 
@@ -1033,9 +1033,9 @@
 
     if-nez v8, :cond_a
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1043,11 +1043,11 @@
 
     if-eqz v2, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Collection disabled with firebase_analytics_collection_enabled=0"
 
@@ -1058,17 +1058,17 @@
     :cond_a
     if-nez v2, :cond_b
 
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mC()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mF()Z
 
     move-result v2
 
     if-eqz v2, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Collection disabled with google_app_measurement_enable=0"
 
@@ -1077,11 +1077,11 @@
     goto :goto_8
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Collection enabled"
 
@@ -1096,19 +1096,19 @@
     const/4 v2, 0x0
 
     :goto_9
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aEm:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->aEv:Ljava/lang/String;
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azE:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
 
     iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->zzm:Ljava/lang/String;
 
     iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/ds;->zzg:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {v5}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1116,7 +1116,7 @@
 
     if-nez v5, :cond_d
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->zzd:Ljava/lang/String;
 
@@ -1126,15 +1126,15 @@
 
     if-eqz v5, :cond_d
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
-    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->azE:Ljava/lang/String;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
 
     :cond_d
     :try_start_3
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mB()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mE()Ljava/lang/String;
 
     move-result-object v5
 
@@ -1152,15 +1152,15 @@
     move-object v6, v5
 
     :goto_a
-    iput-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEm:Ljava/lang/String;
+    iput-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEv:Ljava/lang/String;
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v8, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v8, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v0, v8}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1175,7 +1175,7 @@
     :try_start_4
     new-instance v6, Lcom/google/android/gms/common/internal/t;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v9
 
@@ -1218,7 +1218,7 @@
 
     move-result-object v3
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azE:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
 
     goto :goto_c
 
@@ -1231,7 +1231,7 @@
 
     new-instance v3, Lcom/google/android/gms/common/internal/t;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v5
 
@@ -1241,23 +1241,23 @@
 
     move-result-object v3
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azE:Ljava/lang/String;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
 
     :cond_12
     :goto_c
     if-eqz v2, :cond_13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "App package, google app id"
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->atJ:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ds;->atS:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEm:Ljava/lang/String;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ds;->aEv:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v5, v6}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
     :try_end_4
@@ -1268,11 +1268,11 @@
     :catch_3
     move-exception v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1286,15 +1286,15 @@
     :goto_d
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEl:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEu:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->atJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ds;->atS:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1302,9 +1302,9 @@
 
     if-eqz v0, :cond_17
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
@@ -1322,11 +1322,11 @@
 
     if-nez v2, :cond_14
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Safelisted event list cannot be empty. Ignoring"
 
@@ -1355,7 +1355,7 @@
 
     check-cast v3, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v5
 
@@ -1373,7 +1373,7 @@
     :goto_f
     if-eqz v7, :cond_17
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEl:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEu:Ljava/util/List;
 
     :cond_17
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
@@ -1384,7 +1384,7 @@
 
     if-eqz v1, :cond_18
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1392,135 +1392,135 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/gms/measurement/internal/ds;->auh:I
+    iput v0, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
 
     return-void
 
     :cond_18
-    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->auh:I
+    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
 
     return-void
 
     :cond_19
-    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->auh:I
+    iput v4, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
 
     return-void
 .end method
 
-.method final xI()Ljava/lang/String;
+.method final xL()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->atS:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final xJ()Ljava/lang/String;
+.method final xM()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->aEv:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final xK()Ljava/lang/String;
+.method final xN()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->azE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ds;->azN:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method final xL()I
+.method final xO()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     iget v0, p0, Lcom/google/android/gms/measurement/internal/ds;->zzc:I
 
     return v0
 .end method
 
-.method final xM()I
+.method final xP()I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/ds;->auh:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/ds;->auq:I
 
     return v0
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
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 00507f67c6..905eb20445 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aEn:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aEw:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field private static final aEo:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aEx: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 static final ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aze:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -46,19 +46,19 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->aze: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/dt;->aEn:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->aEw: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/dt;->aEo:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/dt;->aEx:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -209,7 +209,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -222,7 +222,7 @@
     return-object p1
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object p1
 
@@ -233,14 +233,14 @@
     return-object p1
 .end method
 
-.method private final uF()Z
+.method private final uI()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -248,9 +248,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dt;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
@@ -284,7 +284,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -305,7 +305,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/l;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -313,7 +313,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/l;->amV:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -325,7 +325,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/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/dt;->b(Lcom/google/android/gms/measurement/internal/zzam;)Ljava/lang/String;
 
@@ -354,7 +354,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -375,7 +375,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/zzan;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -383,7 +383,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/zzan;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {p0, v1}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -395,7 +395,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/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/dt;->b(Lcom/google/android/gms/measurement/internal/zzam;)Ljava/lang/String;
 
@@ -420,7 +420,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -462,11 +462,11 @@
     return-object p1
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBM:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBV:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEo:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEx:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/String;
 
@@ -485,7 +485,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -494,11 +494,11 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBM:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBV:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/String;
 
@@ -517,7 +517,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -613,7 +613,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uF()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dt;->uI()Z
 
     move-result v0
 
@@ -622,11 +622,11 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBM:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBV:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGL:[Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEn:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/dt;->aEw:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {p1, v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->a(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/String;
 
@@ -635,7 +635,7 @@
     return-object p1
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -643,116 +643,116 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ka;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
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 03fa53452d..978c73d1de 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aEp:Lcom/google/android/gms/measurement/internal/dr;
+.field private final synthetic aEy:Lcom/google/android/gms/measurement/internal/dr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dr;Landroid/content/Context;Ljava/lang/String;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
     const/4 p1, 0x0
 
@@ -43,13 +43,13 @@
     return-object v0
 
     :catch_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Opening the local database failed, dropping and recreating it"
 
@@ -57,9 +57,9 @@
 
     const-string v0, "google_app_measurement_local.db"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -73,13 +73,13 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to delete corrupted local db file"
 
@@ -98,13 +98,13 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to open local database. Events will bypass local storage"
 
@@ -123,9 +123,9 @@
 .method public final onCreate(Landroid/database/sqlite/SQLiteDatabase;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
@@ -180,9 +180,9 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEp:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/du;->aEy:Lcom/google/android/gms/measurement/internal/dr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
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 0a2101d16e..29337e7a5d 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
@@ -4,29 +4,29 @@
 
 
 # instance fields
-.field aEq:C
+.field public final aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-.field public final aEr:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEB:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEs:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEC:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEt:Lcom/google/android/gms/measurement/internal/dx;
+.field public final aED:Lcom/google/android/gms/measurement/internal/dx;
 
-.field public final aEu:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEE:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEv:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEF:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEw:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEG:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEx:Lcom/google/android/gms/measurement/internal/dx;
+.field final aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-.field final aEy:Lcom/google/android/gms/measurement/internal/dx;
+.field public final aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-.field public final aEz:Lcom/google/android/gms/measurement/internal/dx;
+.field aEz:C
 
-.field private anh:Ljava/lang/String;
+.field private anq:Ljava/lang/String;
 
-.field anq:J
+.field anz:J
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     const/4 p1, 0x0
 
-    iput-char p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEq:C
+    iput-char p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anz:J
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
@@ -49,7 +49,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
@@ -57,13 +57,13 @@
 
     invoke-direct {v0, p0, v1, v2, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEs:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEB:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-direct {v0, p0, v1, p1, v2}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
@@ -71,19 +71,19 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-direct {v0, p0, v1, v2, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEv:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-direct {v0, p0, v1, p1, v2}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
@@ -91,7 +91,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
@@ -99,7 +99,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/dx;
 
@@ -107,7 +107,7 @@
 
     invoke-direct {v0, p0, v1, p1, p1}, Lcom/google/android/gms/measurement/internal/dx;-><init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     return-void
 .end method
@@ -472,7 +472,7 @@
 
     check-cast p1, Lcom/google/android/gms/measurement/internal/ea;
 
-    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/ea;->atJ:Ljava/lang/String;
+    iget-object p0, p1, Lcom/google/android/gms/measurement/internal/ea;->atS:Ljava/lang/String;
 
     return-object p0
 
@@ -542,40 +542,40 @@
     return-object p0
 .end method
 
-.method private final xK()Ljava/lang/String;
+.method private final xN()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->zze:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->zze:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anh:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ud()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()Ljava/lang/String;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anh:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dv;->anq:Ljava/lang/String;
 
     monitor-exit p0
 
@@ -621,9 +621,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/dv;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/dv;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->aFJ:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
 
     const/4 p3, 0x6
 
@@ -636,7 +636,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ft;->va()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
 
     move-result v1
 
@@ -693,7 +693,7 @@
 .method protected final bo(I)Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dv;->xK()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dv;->xN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -707,7 +707,7 @@
 .method protected final c(ILjava/lang/String;)V
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dv;->xK()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/dv;->xN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -716,7 +716,7 @@
     return-void
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -724,140 +724,140 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final xN()Ljava/lang/String;
+.method public final xQ()Ljava/lang/String;
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEM:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Lcom/google/android/gms/measurement/internal/el;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uz()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uC()J
 
     move-result-wide v1
 
@@ -867,16 +867,16 @@
 
     if-nez v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pG()V
 
     move-wide v1, v3
 
     goto :goto_0
 
     :cond_0
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
@@ -915,36 +915,36 @@
 
     if-lez v9, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pG()V
 
     goto :goto_1
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->anh:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->anq: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/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v2
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->amV:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/el;->ane: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/el;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pG()V
 
     if-eqz v1, :cond_4
 
@@ -967,12 +967,12 @@
 
     :cond_4
     :goto_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/eh;->aEK:Landroid/util/Pair;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/eh;->aET:Landroid/util/Pair;
 
     :goto_3
     if-eqz v0, :cond_6
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/eh;->aEK:Landroid/util/Pair;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/eh;->aET:Landroid/util/Pair;
 
     if-ne v0, v1, :cond_5
 
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 8ac5d7a38d..a4391d0a91 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
@@ -56,7 +56,7 @@
     return-object v0
 .end method
 
-.method public final lY()I
+.method public final mb()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -64,7 +64,7 @@
     return v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final md()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.measurement.START"
@@ -72,7 +72,7 @@
     return-object v0
 .end method
 
-.method public final mb()Ljava/lang/String;
+.method public final me()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/dx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dx.smali
index 09631ecb2f..a8dd5e9ae3 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final synthetic aEA:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aEJ:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final asy:Z
+.field private final asH:Z
 
-.field private final atx:Z
+.field private final atG:Z
 
 .field private final zza:I
 
@@ -17,15 +17,15 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dv;IZZ)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aEA:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dx;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     iput p2, p0, Lcom/google/android/gms/measurement/internal/dx;->zza:I
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dx;->atx:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/dx;->atG:Z
 
-    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/dx;->asy:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
 
     return-void
 .end method
@@ -35,13 +35,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/dx;->aEA:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dx;->zza:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atG:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asy:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
 
     const/4 v7, 0x0
 
@@ -59,13 +59,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/dx;->aEA:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dx;->zza:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atG:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asy:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
 
     move-object v4, p1
 
@@ -83,13 +83,13 @@
 .method public final aL(Ljava/lang/String;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEA:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dx;->zza:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atG:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asy:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
 
     const/4 v5, 0x0
 
@@ -107,13 +107,13 @@
 .method public final k(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEA:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dx;->aEJ:Lcom/google/android/gms/measurement/internal/dv;
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dx;->zza:I
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/dx;->atG:Z
 
-    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asy:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/dx;->asH:Z
 
     const/4 v6, 0x0
 
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 bfe2ebcb80..2500dc5590 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final synthetic aEB:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic asr:Ljava/lang/Object;
+.field private final synthetic asA:Ljava/lang/Object;
 
-.field private final synthetic atP:Ljava/lang/Object;
+.field private final synthetic atY:Ljava/lang/Object;
 
 .field private final synthetic zza:I
 
@@ -24,17 +24,17 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/dv;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/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
     iput p2, p0, Lcom/google/android/gms/measurement/internal/dy;->zza:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dy;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/dy;->ane:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/android/gms/measurement/internal/dy;->zzc:Ljava/lang/Object;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dy;->atP:Ljava/lang/Object;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/dy;->atY:Ljava/lang/Object;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dy;->asr:Ljava/lang/Object;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/dy;->asA:Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,21 +46,21 @@
 .method public final run()V
     .locals 14
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->va()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
     const/4 v1, 0x6
 
@@ -71,48 +71,48 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-char v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEq:C
+    iget-char v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uF()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->uI()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const/16 v2, 0x43
 
-    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEq:C
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const/16 v2, 0x63
 
-    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEq:C
+    iput-char v2, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
 
     :cond_2
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/dv;->anq:J
+    iget-wide v1, v1, Lcom/google/android/gms/measurement/internal/dv;->anz:J
 
     const-wide/16 v3, 0x0
 
@@ -120,13 +120,13 @@
 
     if-gez v5, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     const-wide/16 v5, 0x471a
 
-    iput-wide v5, v1, Lcom/google/android/gms/measurement/internal/dv;->anq:J
+    iput-wide v5, v1, Lcom/google/android/gms/measurement/internal/dv;->anz:J
 
     :cond_3
     iget v1, p0, Lcom/google/android/gms/measurement/internal/dy;->zza:I
@@ -137,21 +137,21 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-char v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEq:C
+    iget-char v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:C
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dy;->aEB:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/dy;->aEK:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/dv;->anq:J
+    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/dv;->anz:J
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/dy;->amV:Ljava/lang/String;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/dy;->ane:Ljava/lang/String;
 
     iget-object v8, p0, Lcom/google/android/gms/measurement/internal/dy;->zzc:Ljava/lang/Object;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/dy;->atP:Ljava/lang/Object;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/dy;->atY:Ljava/lang/Object;
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/dy;->asr:Ljava/lang/Object;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/dy;->asA:Ljava/lang/Object;
 
     const/4 v11, 0x1
 
@@ -203,20 +203,20 @@
 
     if-le v2, v6, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dy;->ane: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/eh;->aEM:Lcom/google/android/gms/measurement/internal/el;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Lcom/google/android/gms/measurement/internal/el;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uz()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->uC()J
 
     move-result-wide v6
 
@@ -224,7 +224,7 @@
 
     if-nez v2, :cond_5
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pD()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/el;->pG()V
 
     :cond_5
     if-nez v1, :cond_6
@@ -232,13 +232,13 @@
     const-string v1, ""
 
     :cond_6
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v2
 
-    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/el;->amV:Ljava/lang/String;
+    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/el;->ane:Ljava/lang/String;
 
     invoke-interface {v2, v6, v3, v4}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J
 
@@ -250,7 +250,7 @@
 
     if-gtz v2, :cond_7
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
@@ -260,11 +260,11 @@
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->anh:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->anq: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/el;->amV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/el;->ane:Ljava/lang/String;
 
     invoke-interface {v2, v0, v8, v9}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
@@ -273,13 +273,13 @@
     return-void
 
     :cond_7
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->yP()Ljava/security/SecureRandom;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
 
     move-result-object v2
 
@@ -302,7 +302,7 @@
     const/4 v5, 0x1
 
     :cond_8
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
@@ -314,12 +314,12 @@
 
     if-eqz v5, :cond_9
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->anh:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/el;->anq: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/el;->amV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/el;->ane: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/dz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/dz.smali
index 7460e3a446..bbbbbd119b 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aEC:Ljavax/net/ssl/SSLSocketFactory;
+.field final aEL:Ljavax/net/ssl/SSLSocketFactory;
 
 
 # direct methods
@@ -29,7 +29,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dz;->aEC:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/dz;->aEL:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
 
 # virtual methods
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -111,12 +111,12 @@
     return v0
 .end method
 
-.method public final qB()Z
+.method public final qE()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -159,156 +159,156 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
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 f190454029..cf60c92a8f 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aBV:Lcom/google/android/gms/measurement/internal/d;
+.field private final synthetic aCe:Lcom/google/android/gms/measurement/internal/d;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/d;Landroid/content/Context;Ljava/lang/String;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
     const/4 p1, 0x0
 
@@ -27,13 +27,13 @@
 .method public final getWritableDatabase()Landroid/database/sqlite/SQLiteDatabase;
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/d;)Lcom/google/android/gms/measurement/internal/ix;
 
     move-result-object v0
 
-    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/ix;->anq:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/ix;->anz:J
 
     const/4 v3, 0x1
 
@@ -46,13 +46,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ix;->azy:Lcom/google/android/gms/common/util/e;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ix;->azH:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
-    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/ix;->anq:J
+    iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/ix;->anz:J
 
     sub-long/2addr v1, v6
 
@@ -80,7 +80,7 @@
     return-object v0
 
     :catch_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/d;)Lcom/google/android/gms/measurement/internal/ix;
 
@@ -88,13 +88,13 @@
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ix;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Opening the database failed, dropping and recreating it"
 
@@ -102,9 +102,9 @@
 
     const-string v0, "google_app_measurement.db"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -118,13 +118,13 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to delete corrupted db file"
 
@@ -136,13 +136,13 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/d;)Lcom/google/android/gms/measurement/internal/ix;
 
     move-result-object v1
 
-    iput-wide v4, v1, Lcom/google/android/gms/measurement/internal/ix;->anq:J
+    iput-wide v4, v1, Lcom/google/android/gms/measurement/internal/ix;->anz:J
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_1
 
@@ -151,13 +151,13 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to open freshly created database"
 
@@ -178,9 +178,9 @@
 .method public final onCreate(Landroid/database/sqlite/SQLiteDatabase;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
@@ -198,13 +198,13 @@
 .method public final onOpen(Landroid/database/sqlite/SQLiteDatabase;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vc()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vf()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -218,9 +218,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
@@ -234,13 +234,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vd()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vg()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -252,13 +252,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->ve()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vh()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -270,13 +270,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vf()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vi()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -288,9 +288,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
@@ -304,13 +304,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vg()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vj()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -322,13 +322,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vh()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vk()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -340,13 +340,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vi()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vl()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -358,9 +358,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
@@ -374,13 +374,13 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vj()[Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/d;->vm()[Ljava/lang/String;
 
     move-result-object v6
 
@@ -392,9 +392,9 @@
 
     invoke-static/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/h;->a(Lcom/google/android/gms/measurement/internal/dv;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/e;->aBV:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/e;->aCe:Lcom/google/android/gms/measurement/internal/d;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
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 fe70acf39e..a4e6bed763 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ea;->atS:Ljava/lang/String;
 
     return-void
 .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 850a658f89..05a20df466 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
@@ -19,112 +19,112 @@
 
 
 # virtual methods
-.method public rx()V
+.method public rA()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
 
     return-void
 .end method
 
-.method public vn()V
+.method public vq()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     return-void
 .end method
 
-.method public xq()Lcom/google/android/gms/measurement/internal/z;
+.method public xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xw()Lcom/google/android/gms/measurement/internal/in;
+.method public xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ec;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
@@ -134,7 +134,7 @@
 .method public zza()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yp()V
 
     return-void
 .end method
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 a61b77386f..c0ed4bcd79 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aED:Ljava/net/URL;
+.field private final aEM:Ljava/net/URL;
 
-.field private final aEE:Lcom/google/android/gms/measurement/internal/eb;
+.field private final aEN:Lcom/google/android/gms/measurement/internal/eb;
 
-.field private final synthetic aEF:Lcom/google/android/gms/measurement/internal/dz;
+.field private final synthetic aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-.field private final atQ:Ljava/util/Map;
+.field private final atZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,15 +57,15 @@
 
     invoke-static {p6}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ed;->aED:Ljava/net/URL;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ed;->aEM:Ljava/net/URL;
 
     iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ed;->zzb:[B
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEE:Lcom/google/android/gms/measurement/internal/eb;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEN:Lcom/google/android/gms/measurement/internal/eb;
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ed;->zzd:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ed;->atQ:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ed;->atZ:Ljava/util/Map;
 
     return-void
 .end method
@@ -77,18 +77,18 @@
 
     const-string v0, "Error closing HTTP compressed POST connection output stream. appId"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->rx()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
 
     const/4 v1, 0x0
 
     const/4 v2, 0x0
 
     :try_start_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ed;->aED:Ljava/net/URL;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ed;->aEM:Ljava/net/URL;
 
     invoke-virtual {v4}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
 
@@ -98,7 +98,7 @@
 
     if-eqz v5, :cond_4
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/dz;->aEC:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/dz;->aEL:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v5, :cond_0
 
@@ -110,7 +110,7 @@
 
     check-cast v5, Ljavax/net/ssl/HttpsURLConnection;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dz;->aEC:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dz;->aEL:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v5, v3}, Ljavax/net/ssl/HttpsURLConnection;->setSSLSocketFactory(Ljavax/net/ssl/SSLSocketFactory;)V
 
@@ -139,11 +139,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_4
 
     :try_start_1
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atQ:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atZ:Ljava/util/Map;
 
     if-eqz v5, :cond_1
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atQ:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->atZ:Ljava/util/Map;
 
     invoke-interface {v5}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -187,9 +187,9 @@
 
     if-eqz v5, :cond_2
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v5
 
@@ -199,13 +199,13 @@
 
     move-result-object v5
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "Uploading data. size"
 
@@ -301,9 +301,9 @@
     invoke-virtual {v3}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -311,7 +311,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->zzd:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/ed;->aEE:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/ed;->aEN:Lcom/google/android/gms/measurement/internal/eb;
 
     const/4 v9, 0x0
 
@@ -421,13 +421,13 @@
     :catch_4
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->zzd:Ljava/lang/String;
 
@@ -444,9 +444,9 @@
     invoke-virtual {v3}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -454,7 +454,7 @@
 
     iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->zzd:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/ed;->aEE:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/ed;->aEN:Lcom/google/android/gms/measurement/internal/eb;
 
     const/4 v9, 0x0
 
@@ -494,13 +494,13 @@
     :catch_6
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ed;->zzd:Ljava/lang/String;
 
@@ -517,9 +517,9 @@
     invoke-virtual {v3}, Ljava/net/HttpURLConnection;->disconnect()V
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEF:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ed;->aEO:Lcom/google/android/gms/measurement/internal/dz;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -527,7 +527,7 @@
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ed;->zzd:Ljava/lang/String;
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEE:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ed;->aEN:Lcom/google/android/gms/measurement/internal/eb;
 
     const/4 v9, 0x0
 
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 7a76f439a8..1fc545334d 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aEG:Lcom/google/android/gms/measurement/internal/eb;
+.field private final aEP:Lcom/google/android/gms/measurement/internal/eb;
 
-.field private final aEH:Ljava/lang/Throwable;
+.field private final aEQ:Ljava/lang/Throwable;
 
-.field private final anl:I
+.field private final anu:I
 
-.field private final att:Ljava/util/Map;
+.field private final atC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final aug:[B
+.field private final aup:[B
 
 .field private final zze:Ljava/lang/String;
 
@@ -53,17 +53,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/ee;->aEG:Lcom/google/android/gms/measurement/internal/eb;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ee;->aEP:Lcom/google/android/gms/measurement/internal/eb;
 
-    iput p3, p0, Lcom/google/android/gms/measurement/internal/ee;->anl:I
+    iput p3, p0, Lcom/google/android/gms/measurement/internal/ee;->anu:I
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ee;->aEH:Ljava/lang/Throwable;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ee;->aEQ:Ljava/lang/Throwable;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ee;->aug:[B
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ee;->aup:[B
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ee;->zze:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ee;->att:Ljava/util/Map;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ee;->atC:Ljava/util/Map;
 
     return-void
 .end method
@@ -81,17 +81,17 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aEG:Lcom/google/android/gms/measurement/internal/eb;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ee;->aEP:Lcom/google/android/gms/measurement/internal/eb;
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ee;->zze:Ljava/lang/String;
 
-    iget v2, p0, Lcom/google/android/gms/measurement/internal/ee;->anl:I
+    iget v2, p0, Lcom/google/android/gms/measurement/internal/ee;->anu:I
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ee;->aEH:Ljava/lang/Throwable;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ee;->aEQ:Ljava/lang/Throwable;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ee;->aug:[B
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ee;->aup:[B
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ee;->att:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ee;->atC:Ljava/util/Map;
 
     invoke-interface/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/eb;->a(Ljava/lang/String;ILjava/lang/Throwable;[BLjava/util/Map;)V
 
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 73285713ad..83409c663d 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final synthetic aEI:Lcom/google/android/gms/measurement/internal/eg;
+.field private final synthetic aER:Lcom/google/android/gms/measurement/internal/eg;
 
 .field private final synthetic zza:Z
 
@@ -16,7 +16,7 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/eg;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aEI:Lcom/google/android/gms/measurement/internal/eg;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ef;->aER:Lcom/google/android/gms/measurement/internal/eg;
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/ef;->zza:Z
 
@@ -30,13 +30,13 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ef;->aEI:Lcom/google/android/gms/measurement/internal/eg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ef;->aER:Lcom/google/android/gms/measurement/internal/eg;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eg;->a(Lcom/google/android/gms/measurement/internal/eg;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eg.smali
index 731a8e0c38..a5136834cd 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eg.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/eg.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final atJ:Ljava/lang/String;
+.field private static final atS:Ljava/lang/String;
 
 
 # instance fields
-.field private final aEJ:Lcom/google/android/gms/measurement/internal/jf;
+.field private final aES:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private asy:Z
+.field private asH:Z
 
-.field private awV:Z
+.field private axe:Z
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/eg;->atJ:Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/eg;->atS:Ljava/lang/String;
 
     return-void
 .end method
@@ -37,7 +37,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/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/eg;)Lcom/google/android/gms/measurement/internal/jf;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
     return-object p0
 .end method
@@ -55,21 +55,21 @@
 .method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yF()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/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "NetworkBroadcastReceiver received action"
 
@@ -83,25 +83,25 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qB()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
 
     move-result p1
 
-    iget-boolean p2, p0, Lcom/google/android/gms/measurement/internal/eg;->awV:Z
+    iget-boolean p2, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
 
     if-eq p2, p1, :cond_0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/eg;->awV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p2
 
@@ -115,13 +115,13 @@
     return-void
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "NetworkBroadcastReceiver received unknown action"
 
@@ -130,43 +130,43 @@
     return-void
 .end method
 
-.method public final pD()V
+.method public final pG()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asH:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Unregistering connectivity change receiver"
 
@@ -174,13 +174,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asH:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->awV:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -194,13 +194,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to unregister the network broadcast receiver"
 
@@ -212,28 +212,28 @@
 .method public final zza()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asH:Z
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -245,27 +245,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/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dz;->qB()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->awV:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eg;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eg;->awV:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eg;->axe:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -277,7 +277,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eg;->asH:Z
 
     return-void
 .end method
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 71bb4b8ddc..7369fccc21 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final aEK:Landroid/util/Pair;
+.field static final aET:Landroid/util/Pair;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/Pair<",
@@ -17,57 +17,57 @@
 
 
 # instance fields
-.field public aAj:Z
+.field public aAs:Z
 
-.field aEL:Landroid/content/SharedPreferences;
+.field aEU:Landroid/content/SharedPreferences;
 
-.field public aEM:Lcom/google/android/gms/measurement/internal/el;
+.field public aEV:Lcom/google/android/gms/measurement/internal/el;
 
-.field public final aEN:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aEO:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aEP:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aEQ:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aER:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aES:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aET:Lcom/google/android/gms/measurement/internal/ei;
-
-.field public final aEU:Lcom/google/android/gms/measurement/internal/ek;
-
-.field private aEV:Ljava/lang/String;
-
-.field private aEW:J
+.field public final aEW:Lcom/google/android/gms/measurement/internal/ei;
 
 .field public final aEX:Lcom/google/android/gms/measurement/internal/ei;
 
 .field public final aEY:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aEZ:Lcom/google/android/gms/measurement/internal/ej;
+.field public final aEZ:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFa:Lcom/google/android/gms/measurement/internal/ek;
+.field public final aFa:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFb:Lcom/google/android/gms/measurement/internal/ej;
+.field public final aFb:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFc:Lcom/google/android/gms/measurement/internal/ej;
+.field public final aFc:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFd:Lcom/google/android/gms/measurement/internal/ei;
+.field public final aFd:Lcom/google/android/gms/measurement/internal/ek;
 
-.field public final aFe:Lcom/google/android/gms/measurement/internal/ei;
+.field private aFe:Ljava/lang/String;
 
-.field public aFf:Lcom/google/android/gms/measurement/internal/ej;
+.field private aFf:J
 
-.field public aFg:Lcom/google/android/gms/measurement/internal/ej;
+.field public final aFg:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public aFh:Lcom/google/android/gms/measurement/internal/ei;
+.field public final aFh:Lcom/google/android/gms/measurement/internal/ei;
 
-.field public final aFi:Lcom/google/android/gms/measurement/internal/ek;
+.field public final aFi:Lcom/google/android/gms/measurement/internal/ej;
 
-.field private amv:Z
+.field public final aFj:Lcom/google/android/gms/measurement/internal/ek;
+
+.field public final aFk:Lcom/google/android/gms/measurement/internal/ej;
+
+.field public final aFl:Lcom/google/android/gms/measurement/internal/ej;
+
+.field public final aFm:Lcom/google/android/gms/measurement/internal/ei;
+
+.field public final aFn:Lcom/google/android/gms/measurement/internal/ei;
+
+.field public aFo:Lcom/google/android/gms/measurement/internal/ej;
+
+.field public aFp:Lcom/google/android/gms/measurement/internal/ej;
+
+.field public aFq:Lcom/google/android/gms/measurement/internal/ei;
+
+.field public final aFr:Lcom/google/android/gms/measurement/internal/ek;
+
+.field private amE:Z
 
 
 # direct methods
@@ -86,7 +86,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/eh;->aEK:Landroid/util/Pair;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/eh;->aET:Landroid/util/Pair;
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -112,7 +112,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEO:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -120,7 +120,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEP:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -128,7 +128,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEQ:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -138,7 +138,7 @@
 
     invoke-direct {p1, p0, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -148,7 +148,7 @@
 
     invoke-direct {p1, p0, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ej;
 
@@ -158,7 +158,7 @@
 
     invoke-direct {p1, p0, v2, v3}, Lcom/google/android/gms/measurement/internal/ej;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -166,7 +166,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -174,7 +174,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ek;
 
@@ -182,7 +182,7 @@
 
     invoke-direct {p1, p0, v2}, Lcom/google/android/gms/measurement/internal/ek;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ej;
 
@@ -192,7 +192,7 @@
 
     invoke-direct {p1, p0, v3, v2}, Lcom/google/android/gms/measurement/internal/ej;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFk:Lcom/google/android/gms/measurement/internal/ej;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ej;
 
@@ -200,7 +200,7 @@
 
     invoke-direct {p1, p0, v3, v2}, Lcom/google/android/gms/measurement/internal/ej;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFl:Lcom/google/android/gms/measurement/internal/ej;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -208,7 +208,7 @@
 
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aER:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -216,7 +216,7 @@
 
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -224,7 +224,7 @@
 
     invoke-direct {p1, p0, v3, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aET:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ek;
 
@@ -232,7 +232,7 @@
 
     invoke-direct {p1, p0, v3}, Lcom/google/android/gms/measurement/internal/ek;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ek;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ej;
 
@@ -240,7 +240,7 @@
 
     invoke-direct {p1, p0, v3, v2}, Lcom/google/android/gms/measurement/internal/ej;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFf:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFo:Lcom/google/android/gms/measurement/internal/ej;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ej;
 
@@ -248,7 +248,7 @@
 
     invoke-direct {p1, p0, v3, v2}, Lcom/google/android/gms/measurement/internal/ej;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;Z)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ej;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFp:Lcom/google/android/gms/measurement/internal/ej;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ei;
 
@@ -256,7 +256,7 @@
 
     invoke-direct {p1, p0, v2, v0, v1}, Lcom/google/android/gms/measurement/internal/ei;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFq:Lcom/google/android/gms/measurement/internal/ei;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ek;
 
@@ -264,7 +264,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ek;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
     return-void
 .end method
@@ -272,7 +272,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object p0
 
@@ -284,13 +284,13 @@
 .method final L(Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -300,7 +300,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -320,9 +320,9 @@
 .method final M(Z)Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -338,13 +338,13 @@
 .method final N(Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -354,7 +354,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -374,17 +374,17 @@
 .method final ae(J)Z
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v0
 
     sub-long/2addr p1, v0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v0
 
@@ -405,7 +405,7 @@
 .method final cp(Ljava/lang/String;)Ljava/lang/String;
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/eh;->cq(Ljava/lang/String;)Landroid/util/Pair;
 
@@ -415,7 +415,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yQ()Ljava/security/MessageDigest;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yT()Ljava/security/MessageDigest;
 
     move-result-object v0
 
@@ -473,21 +473,21 @@
 
     const-string v0, ""
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
 
     if-eqz v3, :cond_0
 
-    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/eh;->aEW:J
+    iget-wide v4, p0, Lcom/google/android/gms/measurement/internal/eh;->aFf:J
 
     cmp-long v6, v1, v4
 
@@ -495,7 +495,7 @@
 
     new-instance p1, Landroid/util/Pair;
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->amv:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->amE:Z
 
     invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -506,11 +506,11 @@
     return-object p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCr:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCA:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, p1, v4}, Lcom/google/android/gms/measurement/internal/ka;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)J
 
@@ -518,14 +518,14 @@
 
     add-long/2addr v1, v3
 
-    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEW:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFf:J
 
     const/4 p1, 0x1
 
     invoke-static {p1}, Lcom/google/android/gms/ads/identifier/AdvertisingIdClient;->setShouldSkipGmsCoreVersionCheck(Z)V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object p1
 
@@ -539,20 +539,20 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe: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/eh;->amv:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/eh;->amE:Z
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
 
     if-nez p1, :cond_2
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -561,17 +561,17 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Unable to get advertising id"
 
     invoke-virtual {v1, v2, p1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
 
     :cond_2
     :goto_0
@@ -581,9 +581,9 @@
 
     new-instance p1, Landroid/util/Pair;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Ljava/lang/String;
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eh;->amv:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/eh;->amE:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -597,9 +597,9 @@
 .method final cr(Ljava/lang/String;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -619,9 +619,9 @@
 .method final cs(Ljava/lang/String;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -638,12 +638,12 @@
     return-void
 .end method
 
-.method protected final nl()Ljava/lang/String;
+.method protected final no()Ljava/lang/String;
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -655,11 +655,11 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     sget-object v2, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -675,7 +675,7 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v3
 
@@ -691,7 +691,7 @@
     return-object v0
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -699,12 +699,12 @@
     return v0
 .end method
 
-.method final vH()Ljava/lang/Boolean;
+.method final vK()Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -721,7 +721,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -738,12 +738,12 @@
     return-object v0
 .end method
 
-.method final vI()Ljava/lang/Boolean;
+.method final vL()Ljava/lang/Boolean;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -755,7 +755,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -777,12 +777,12 @@
     return-object v0
 .end method
 
-.method final vl()Ljava/lang/String;
+.method final vo()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -797,10 +797,10 @@
     return-object v0
 .end method
 
-.method protected final xS()V
+.method protected final xV()V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -812,9 +812,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEL:Landroid/content/SharedPreferences;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEU:Landroid/content/SharedPreferences;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEL:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEU:Landroid/content/SharedPreferences;
 
     const-string v2, "has_been_opened"
 
@@ -822,13 +822,13 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAj:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAs:Z
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAj:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aAs:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEL:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEU:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -845,7 +845,7 @@
 
     const-wide/16 v1, 0x0
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aCB:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v4, 0x0
 
@@ -873,29 +873,29 @@
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/el;-><init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;JB)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEM:Lcom/google/android/gms/measurement/internal/el;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEV:Lcom/google/android/gms/measurement/internal/el;
 
     return-void
 .end method
 
-.method final xT()Landroid/content/SharedPreferences;
+.method final xW()Landroid/content/SharedPreferences;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEL:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eh;->aEU:Landroid/content/SharedPreferences;
 
     return-object v0
 .end method
 
-.method final xU()Ljava/lang/String;
+.method final xX()Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -910,26 +910,26 @@
     return-object v0
 .end method
 
-.method final xV()V
+.method final xY()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Clearing collection preferences."
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDv:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -937,11 +937,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->vI()Ljava/lang/Boolean;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->vL()Ljava/lang/Boolean;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v1
 
@@ -965,7 +965,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
@@ -984,7 +984,7 @@
     move-result v1
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -1007,13 +1007,13 @@
 .method final zza(Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -1023,7 +1023,7 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xT()Landroid/content/SharedPreferences;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/eh;->xW()Landroid/content/SharedPreferences;
 
     move-result-object v0
 
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 e40d259273..3f8ff5e7b9 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final synthetic aFj:Lcom/google/android/gms/measurement/internal/eh;
+.field private final synthetic aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private final anq:J
+.field private final anz:J
 
-.field private asy:Z
+.field private asH:Z
 
-.field private final atJ:Ljava/lang/String;
+.field private final atS:Ljava/lang/String;
 
 .field private zzd:J
 
@@ -19,15 +19,15 @@
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ei;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ei;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ei;->atS:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ei;->anq:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/ei;->anz:J
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method public final T(J)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
@@ -47,7 +47,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->atS:Ljava/lang/String;
 
     invoke-interface {v0, v1, p1, p2}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
@@ -58,26 +58,26 @@
     return-void
 .end method
 
-.method public final ua()J
+.method public final ud()J
     .locals 4
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asH:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ei;->asH:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ei;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ei;->atS:Ljava/lang/String;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ei;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ei;->anz:J
 
     invoke-interface {v0, v1, v2, v3}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J
 
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 a19f389b81..f673cde5ff 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
@@ -4,65 +4,65 @@
 
 
 # instance fields
-.field private final synthetic aFj:Lcom/google/android/gms/measurement/internal/eh;
+.field private final synthetic aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private asy:Z
+.field private asH:Z
 
-.field private final atJ:Ljava/lang/String;
+.field private final atG:Z
 
-.field private final atx:Z
+.field private final atS:Ljava/lang/String;
 
-.field private awV:Z
+.field private axe:Z
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ej;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ej;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ej;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ej;->atS:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ej;->atx:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ej;->atG:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final pE()Z
+.method public final pH()Z
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asH:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->asH:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ej;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ej;->atS:Ljava/lang/String;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ej;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/ej;->atG:Z
 
     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->awV:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->axe:Z
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->awV:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ej;->axe:Z
 
     return v0
 .end method
@@ -70,7 +70,7 @@
 .method public final zza(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ej;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
@@ -80,13 +80,13 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ej;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ej;->atS:Ljava/lang/String;
 
     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences$Editor;->apply()V
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ej;->awV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ej;->axe:Z
 
     return-void
 .end method
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 6b89d459dd..7225bebf6d 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field private final synthetic aFj:Lcom/google/android/gms/measurement/internal/eh;
+.field private final synthetic aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
-.field private asy:Z
+.field private asH:Z
 
-.field private final atJ:Ljava/lang/String;
+.field private final atS:Ljava/lang/String;
 
 .field private zzd:Ljava/lang/String;
 
@@ -19,17 +19,17 @@
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ek;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ek;->atS:Ljava/lang/String;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->amV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ek;->ane:Ljava/lang/String;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
@@ -60,7 +60,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->atS:Ljava/lang/String;
 
     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
 
@@ -71,24 +71,24 @@
     return-void
 .end method
 
-.method public final pL()Ljava/lang/String;
+.method public final pO()Ljava/lang/String;
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asH:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asy:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ek;->asH:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ek;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ek;->atS:Ljava/lang/String;
 
     const/4 v2, 0x0
 
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 3017691100..57d6e52f59 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field final synthetic aFj:Lcom/google/android/gms/measurement/internal/eh;
+.field final synthetic aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-.field final amV:Ljava/lang/String;
+.field final ane:Ljava/lang/String;
 
-.field final anh:Ljava/lang/String;
+.field final anq:Ljava/lang/String;
 
-.field private final atJ:Ljava/lang/String;
+.field private final atS:Ljava/lang/String;
 
 .field final zzd:J
 
@@ -19,7 +19,7 @@
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/eh;Ljava/lang/String;J)V
     .locals 2
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->atS:Ljava/lang/String;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -63,7 +63,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->amV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->ane:Ljava/lang/String;
 
     invoke-static {p2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -75,7 +75,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->anh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/el;->anq:Ljava/lang/String;
 
     iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/el;->zzd:J
 
@@ -92,16 +92,16 @@
 
 
 # virtual methods
-.method final pD()V
+.method final pG()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -109,7 +109,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
@@ -119,15 +119,15 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->ane: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/el;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->anq: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/el;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/el;->atS:Ljava/lang/String;
 
     invoke-interface {v2, v3, v0, v1}, Landroid/content/SharedPreferences$Editor;->putLong(Ljava/lang/String;J)Landroid/content/SharedPreferences$Editor;
 
@@ -136,16 +136,16 @@
     return-void
 .end method
 
-.method final uz()J
+.method final uC()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFj:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/el;->aFs:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eh;->a(Lcom/google/android/gms/measurement/internal/eh;)Landroid/content/SharedPreferences;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/el;->atS:Ljava/lang/String;
 
     const-wide/16 v2, 0x0
 
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 d67ad2954d..1be01e9842 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
@@ -7,20 +7,20 @@
 
 
 # instance fields
-.field final synthetic aFk:Lcom/google/android/gms/measurement/internal/en;
+.field final synthetic aFt:Lcom/google/android/gms/measurement/internal/en;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/en;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->ane:Ljava/lang/String;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/em;)Ljava/lang/String;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/em;->amV:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/em;->ane:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -40,15 +40,15 @@
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Install Referrer connection returned with null binder"
 
@@ -64,15 +64,15 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Install Referrer Service implementation was not found"
 
@@ -81,25 +81,25 @@
     return-void
 
     :cond_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Install Referrer Service connected"
 
     invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p2
 
@@ -116,15 +116,15 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Exception occurred while calling Install Referrer API"
 
@@ -136,15 +136,15 @@
 .method public final onServiceDisconnected(Landroid/content/ComponentName;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Install Referrer Service disconnected"
 
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 edd5d1b20a..6783c64a19 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field final aBO:Lcom/google/android/gms/measurement/internal/ey;
 
 
 # direct methods
@@ -13,20 +13,20 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
 
-.method private final pE()Z
+.method private final pH()Z
     .locals 4
 
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -36,13 +36,13 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to retrieve Package Manager to check Play Store compatibility"
 
@@ -75,13 +75,13 @@
     :catch_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to retrieve Play Store version"
 
@@ -95,25 +95,25 @@
 .method final a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/bt;)Landroid/os/Bundle;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     const/4 v0, 0x0
 
     if-nez p2, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Attempting to use Install Referrer Service while it is not initialized"
 
@@ -137,13 +137,13 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Install Referrer Service returned a null response"
 
@@ -159,13 +159,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
@@ -192,27 +192,27 @@
     goto/16 :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pE()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pH()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Install Referrer Reporter is not available"
 
@@ -221,13 +221,13 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Install Referrer Reporter is initializing"
 
@@ -237,13 +237,13 @@
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/em;-><init>(Lcom/google/android/gms/measurement/internal/en;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     new-instance p1, Landroid/content/Intent;
 
@@ -261,9 +261,9 @@
 
     invoke-virtual {p1, v1}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -273,13 +273,13 @@
 
     if-nez v1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Failed to obtain Package Manager to verify binding conditions"
 
@@ -328,7 +328,7 @@
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pE()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/en;->pH()Z
 
     move-result v1
 
@@ -339,11 +339,11 @@
     invoke-direct {v1, p1}, Landroid/content/Intent;-><init>(Landroid/content/Intent;)V
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object p1
 
@@ -353,13 +353,13 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Install Referrer Service is"
 
@@ -382,13 +382,13 @@
     :catch_0
     move-exception p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
@@ -401,13 +401,13 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Play Store missing or incompatible. Version 8.3.73 or later required"
 
@@ -417,13 +417,13 @@
     return-void
 
     :cond_6
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Play Service for fetching Install Referrer is unavailable on device"
 
@@ -433,13 +433,13 @@
 
     :cond_7
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Install Referrer Reporter was called with invalid app package name"
 
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 f8338c31db..6fd32bde41 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aFl:Lcom/google/android/gms/measurement/internal/et;
+.field private final aFu:Lcom/google/android/gms/measurement/internal/et;
 
 
 # direct methods
@@ -15,7 +15,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/eo;->aFl:Lcom/google/android/gms/measurement/internal/et;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eo;->aFu:Lcom/google/android/gms/measurement/internal/et;
 
     return-void
 .end method
@@ -75,13 +75,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
     if-nez p2, :cond_0
 
-    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Receiver called with null intent"
 
@@ -90,13 +90,13 @@
     return-void
 
     :cond_0
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     invoke-virtual {p2}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Local receiver got"
 
@@ -122,13 +122,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/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Starting wakeful intent."
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aFl:Lcom/google/android/gms/measurement/internal/et;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aFu:Lcom/google/android/gms/measurement/internal/et;
 
     invoke-interface {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/et;->a(Landroid/content/Context;Landroid/content/Intent;)V
 
@@ -144,7 +144,7 @@
     if-eqz v0, :cond_8
 
     :try_start_0
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -161,16 +161,16 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Install Referrer Reporter encountered a problem"
 
     invoke-virtual {v1, v3, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aFl:Lcom/google/android/gms/measurement/internal/et;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eo;->aFu:Lcom/google/android/gms/measurement/internal/et;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/et;->uS()Landroid/content/BroadcastReceiver$PendingResult;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/et;->uV()Landroid/content/BroadcastReceiver$PendingResult;
 
     move-result-object v8
 
@@ -182,7 +182,7 @@
 
     if-nez v0, :cond_3
 
-    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Install referrer extras are null"
 
@@ -196,7 +196,7 @@
     return-void
 
     :cond_3
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Install referrer extras are"
 
@@ -237,7 +237,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
@@ -247,7 +247,7 @@
 
     if-nez v5, :cond_6
 
-    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, v7, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "No campaign defined in install referrer broadcast"
 
@@ -276,14 +276,14 @@
 
     if-nez p2, :cond_7
 
-    iget-object p2, v7, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Install referrer is missing timestamp"
 
     invoke-virtual {p2, v0}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_7
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p2
 
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 b347ef142b..9a556b6c58 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aFm:Lcom/google/android/gms/internal/measurement/bt;
+.field private final synthetic aFv:Lcom/google/android/gms/internal/measurement/bt;
 
-.field private final synthetic aFn:Landroid/content/ServiceConnection;
+.field private final synthetic aFw:Landroid/content/ServiceConnection;
 
-.field private final synthetic aFo:Lcom/google/android/gms/measurement/internal/em;
+.field private final synthetic aFx:Lcom/google/android/gms/measurement/internal/em;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/em;Lcom/google/android/gms/internal/measurement/bt;Landroid/content/ServiceConnection;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFo:Lcom/google/android/gms/measurement/internal/em;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFx:Lcom/google/android/gms/measurement/internal/em;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFm:Lcom/google/android/gms/internal/measurement/bt;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFv:Lcom/google/android/gms/internal/measurement/bt;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFn:Landroid/content/ServiceConnection;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFw:Landroid/content/ServiceConnection;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,31 +34,31 @@
 .method public final run()V
     .locals 13
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aFo:Lcom/google/android/gms/measurement/internal/em;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ep;->aFx:Lcom/google/android/gms/measurement/internal/em;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/em;->aFk:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/em;->aFt:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFo:Lcom/google/android/gms/measurement/internal/em;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ep;->aFx:Lcom/google/android/gms/measurement/internal/em;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/em;->a(Lcom/google/android/gms/measurement/internal/em;)Ljava/lang/String;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFm:Lcom/google/android/gms/internal/measurement/bt;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ep;->aFv:Lcom/google/android/gms/internal/measurement/bt;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFn:Landroid/content/ServiceConnection;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ep;->aFw:Landroid/content/ServiceConnection;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/en;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/bt;)Landroid/os/Bundle;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     if-eqz v1, :cond_9
 
@@ -78,13 +78,13 @@
 
     if-nez v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Service response is missing Install Referrer install timestamp"
 
@@ -110,21 +110,21 @@
     goto/16 :goto_2
 
     :cond_1
-    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "InstallReferrer API result"
 
     invoke-virtual {v10, v11, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v10
 
@@ -162,13 +162,13 @@
 
     if-nez v2, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "No campaign params defined in install referrer result"
 
@@ -223,13 +223,13 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Install Referrer is missing click timestamp for ad campaign"
 
@@ -243,15 +243,15 @@
     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/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aET:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v4
 
@@ -259,17 +259,17 @@
 
     if-nez v1, :cond_7
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Campaign has already been logged"
 
@@ -278,27 +278,27 @@
     goto :goto_3
 
     :cond_7
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aET:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v1, v6, v7}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "referrer API"
 
@@ -310,9 +310,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/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v1
 
@@ -326,13 +326,13 @@
 
     :cond_8
     :goto_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "No referrer defined in install referrer response"
 
@@ -342,11 +342,11 @@
     :goto_3
     if-eqz v3, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
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 e248a0c83a..3c87452955 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
@@ -7,34 +7,34 @@
 
 
 # instance fields
-.field private final synthetic aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field private final synthetic aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private final synthetic aFp:Landroid/content/Context;
+.field private final synthetic aFA:Landroid/content/BroadcastReceiver$PendingResult;
 
-.field private final synthetic aFq:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aFy:Landroid/content/Context;
 
-.field private final synthetic aFr:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final synthetic aFz:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final synthetic anq:J
+.field private final synthetic anz:J
 
-.field private final synthetic asC:Landroid/os/Bundle;
+.field private final synthetic asL:Landroid/os/Bundle;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ey;JLandroid/os/Bundle;Landroid/content/Context;Lcom/google/android/gms/measurement/internal/dv;Landroid/content/BroadcastReceiver$PendingResult;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eq;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/eq;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/eq;->anq:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/eq;->anz:J
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/eq;->asC:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/eq;->asL:Landroid/os/Bundle;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/eq;->aFp:Landroid/content/Context;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/eq;->aFy:Landroid/content/Context;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/eq;->aFq:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/eq;->aFz:Lcom/google/android/gms/measurement/internal/dv;
 
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/eq;->aFr:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/eq;->aFA:Landroid/content/BroadcastReceiver$PendingResult;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,19 +46,19 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/eq;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/eq;->anz:J
 
     const-wide/16 v4, 0x0
 
@@ -84,14 +84,14 @@
 
     if-lez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->asC:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->asL: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/eq;->asC:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->asL:Landroid/os/Bundle;
 
     const-string v1, "_cis"
 
@@ -99,7 +99,7 @@
 
     invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFp:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFy:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -107,11 +107,11 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eq;->asC:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/eq;->asL:Landroid/os/Bundle;
 
     const-string v2, "auto"
 
@@ -119,15 +119,15 @@
 
     invoke-virtual {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/gf;->b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFq:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFz:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Install campaign recorded"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFr:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/eq;->aFA:Landroid/content/BroadcastReceiver$PendingResult;
 
     if-eqz v0, :cond_3
 
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 f121e41335..fe475a41fd 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field private final synthetic aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private final synthetic aFs:Lcom/google/android/gms/measurement/internal/dv;
+.field private final synthetic aFB:Lcom/google/android/gms/measurement/internal/dv;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ey;Lcom/google/android/gms/measurement/internal/dv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/er;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/er;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/er;->aFs:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/er;->aFB:Lcom/google/android/gms/measurement/internal/dv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,15 +30,15 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aFs:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aFB:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Install Referrer Reporter is null"
 
@@ -47,13 +47,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/er;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/en;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v1
 
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 17dc11591d..88c188bfa6 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
@@ -7,13 +7,13 @@
 
 
 # static fields
-.field private static anl:I = 0xffff
+.field private static anu:I = 0xffff
 
 .field private static zzc:I = 0x2
 
 
 # instance fields
-.field private final aFt:Ljava/util/Map;
+.field private final aFC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final aFu:Ljava/util/Map;
+.field private final aFD:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field private final atQ:Ljava/util/Map;
+.field private final atC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field private final att:Ljava/util/Map;
+.field private final atZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -63,7 +63,7 @@
     .end annotation
 .end field
 
-.field private final auq:Ljava/util/Map;
+.field private final auz:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -110,31 +110,31 @@
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->atQ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->atZ: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/es;->att:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->atC: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/es;->auq:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->auz: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/es;->aFu:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aFD: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/es;->aFt:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/es;->aFC:Ljava/util/Map;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
     const/4 v3, 0x0
 
     :goto_0
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ah$b$a;->pG()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ah$b$a;->pJ()I
 
     move-result v4
 
@@ -169,7 +169,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v4
 
@@ -177,7 +177,7 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/ah$a$a;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
 
     move-result-object v5
 
@@ -187,11 +187,11 @@
 
     if-eqz v5, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "EventConfig contained null event name"
 
@@ -200,7 +200,7 @@
     goto :goto_2
 
     :cond_0
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
 
     move-result-object v5
 
@@ -221,7 +221,7 @@
     invoke-virtual {p2, v3, v4}, Lcom/google/android/gms/internal/measurement/ah$b$a;->a(ILcom/google/android/gms/internal/measurement/ah$a$a;)Lcom/google/android/gms/internal/measurement/ah$b$a;
 
     :cond_1
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
 
     move-result-object v5
 
@@ -235,11 +235,11 @@
 
     invoke-interface {v0, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->nL()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->nO()Z
 
     move-result v6
 
@@ -249,13 +249,13 @@
 
     invoke-interface {v1, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qd()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qg()Z
 
     move-result v5
 
     if-eqz v5, :cond_4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qe()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
 
     move-result v5
 
@@ -263,22 +263,22 @@
 
     if-lt v5, v6, :cond_3
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qe()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
 
     move-result v5
 
-    sget v6, Lcom/google/android/gms/measurement/internal/es;->anl:I
+    sget v6, Lcom/google/android/gms/measurement/internal/es;->anu:I
 
     if-le v5, v6, :cond_2
 
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qe()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
 
     move-result v4
 
@@ -292,17 +292,17 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pL()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->pO()Ljava/lang/String;
 
     move-result-object v6
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qe()I
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ah$a$a;->qh()I
 
     move-result v4
 
@@ -321,15 +321,15 @@
     goto/16 :goto_0
 
     :cond_5
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->atQ:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->atZ: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/es;->att:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->atC: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/es;->aFt:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/es;->aFC:Ljava/util/Map;
 
     invoke-interface {p2, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -343,7 +343,7 @@
 
     if-nez p2, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qg()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qj()Lcom/google/android/gms/internal/measurement/ah$b;
 
     move-result-object p1
 
@@ -351,7 +351,7 @@
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qf()Lcom/google/android/gms/internal/measurement/ah$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qi()Lcom/google/android/gms/internal/measurement/ah$b$a;
 
     move-result-object v1
 
@@ -361,7 +361,7 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/ah$b$a;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p2
 
@@ -369,15 +369,15 @@
 
     check-cast p2, Lcom/google/android/gms/internal/measurement/ah$b;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Parsed config. version, gmp_app_id"
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ah$b;->pE()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ah$b;->pH()Z
 
     move-result v3
 
@@ -426,11 +426,11 @@
     :catch_0
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -438,7 +438,7 @@
 
     invoke-virtual {v1, v0, p1, p2}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qg()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qj()Lcom/google/android/gms/internal/measurement/ah$b;
 
     move-result-object p1
 
@@ -447,11 +447,11 @@
     :catch_1
     move-exception p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -459,7 +459,7 @@
 
     invoke-virtual {v1, v0, p1, p2}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qg()Lcom/google/android/gms/internal/measurement/ah$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ah$b;->qj()Lcom/google/android/gms/internal/measurement/ah$b;
 
     move-result-object p1
 
@@ -520,13 +520,13 @@
 .method private final ct(Ljava/lang/String;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auq:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -534,7 +534,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
@@ -550,23 +550,23 @@
 
     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/es;->atQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atZ: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/es;->att:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atC: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/es;->auq:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auz: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/es;->aFu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFD: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/es;->aFt:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFC:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -577,7 +577,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -589,7 +589,7 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/es;->zzd:Ljava/util/Map;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -603,9 +603,9 @@
 
     invoke-interface {v2, p1, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/es;->auq:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -615,7 +615,7 @@
 
     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/es;->aFu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFD:Ljava/util/Map;
 
     invoke-interface {v0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -628,7 +628,7 @@
 .method final G(Ljava/lang/String;Ljava/lang/String;)Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/es;->ct(Ljava/lang/String;)V
 
@@ -645,7 +645,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->att:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atC:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -681,7 +681,7 @@
 .method public final I(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/es;->ct(Ljava/lang/String;)V
 
@@ -712,7 +712,7 @@
 .method final R(Ljava/lang/String;Ljava/lang/String;)Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/es;->ct(Ljava/lang/String;)V
 
@@ -748,7 +748,7 @@
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->atZ:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -784,11 +784,11 @@
 .method final S(Ljava/lang/String;Ljava/lang/String;)I
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/es;->ct(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFt:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFC:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -828,9 +828,9 @@
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -838,7 +838,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -857,9 +857,9 @@
     :cond_0
     invoke-direct {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/es;->a(Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ah$b$a;)V
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->auq:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v5
 
@@ -869,7 +869,7 @@
 
     invoke-interface {v0, v2, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->aFu:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->aFD:Ljava/util/Map;
 
     move-object/from16 v5, p3
 
@@ -877,7 +877,7 @@
 
     iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->zzd:Ljava/util/Map;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v5
 
@@ -891,13 +891,13 @@
 
     invoke-interface {v0, v2, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xS()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     new-instance v5, Ljava/util/ArrayList;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ah$b$a;->qi()Ljava/util/List;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ah$b$a;->ql()Ljava/util/List;
 
     move-result-object v6
 
@@ -922,7 +922,7 @@
 
     check-cast v7, Lcom/google/android/gms/internal/measurement/ac$a;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v7
 
@@ -930,7 +930,7 @@
 
     check-cast v7, Lcom/google/android/gms/internal/measurement/ac$a$a;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pH()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pK()I
 
     move-result v9
 
@@ -941,7 +941,7 @@
     const/4 v7, 0x0
 
     :goto_1
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pH()I
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pK()I
 
     move-result v10
 
@@ -951,7 +951,7 @@
 
     move-result-object v10
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v10
 
@@ -967,7 +967,7 @@
 
     check-cast v11, Lcom/google/android/gms/internal/measurement/ac$b$a;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b$a;->pL()Ljava/lang/String;
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b$a;->pO()Ljava/lang/String;
 
     move-result-object v12
 
@@ -992,7 +992,7 @@
     const/4 v12, 0x0
 
     :goto_3
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b$a;->pH()I
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/ac$b$a;->pK()I
 
     move-result v14
 
@@ -1010,7 +1010,7 @@
 
     if-eqz v15, :cond_2
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v13
 
@@ -1022,7 +1022,7 @@
 
     move-result-object v13
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v13
 
@@ -1046,7 +1046,7 @@
 
     move-result-object v9
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v10
 
@@ -1065,7 +1065,7 @@
     move-object v7, v9
 
     :cond_6
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pG()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pJ()I
 
     move-result v8
 
@@ -1076,7 +1076,7 @@
     const/4 v7, 0x0
 
     :goto_4
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pG()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$a$a;->pJ()I
 
     move-result v9
 
@@ -1094,7 +1094,7 @@
 
     if-eqz v10, :cond_7
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v9
 
@@ -1110,7 +1110,7 @@
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -1131,16 +1131,16 @@
     goto/16 :goto_0
 
     :cond_9
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     invoke-virtual {v0, v2, v5}, Lcom/google/android/gms/measurement/internal/d;->c(Ljava/lang/String;Ljava/util/List;)V
 
     :try_start_0
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ah$b$a;->qj()Lcom/google/android/gms/internal/measurement/ah$b$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ah$b$a;->qm()Lcom/google/android/gms/internal/measurement/ah$b$a;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -1148,7 +1148,7 @@
 
     check-cast v0, Lcom/google/android/gms/internal/measurement/ah$b;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v0
     :try_end_0
@@ -1159,11 +1159,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1176,15 +1176,15 @@
     move-object/from16 v0, p2
 
     :goto_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v6, Landroid/content/ContentValues;
 
@@ -1195,7 +1195,7 @@
     invoke-virtual {v6, v7, v0}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
     :try_start_1
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -1219,11 +1219,11 @@
 
     if-nez v0, :cond_a
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Failed to update remote config (got 0). appId"
 
@@ -1240,11 +1240,11 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1256,9 +1256,9 @@
 
     :cond_a
     :goto_6
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->auq:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -1274,9 +1274,9 @@
 .method protected final cp(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFD:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1290,9 +1290,9 @@
 .method protected final cr(Ljava/lang/String;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFu:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->aFD:Ljava/util/Map;
 
     const/4 v1, 0x0
 
@@ -1304,9 +1304,9 @@
 .method final cs(Ljava/lang/String;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auq:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1316,15 +1316,15 @@
 .method protected final cu(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ah$b;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/es;->ct(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auq:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/es;->auz:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1338,7 +1338,7 @@
 .method final cv(Ljava/lang/String;)Z
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-virtual {p0, p1}, Lcom/google/android/gms/measurement/internal/es;->cu(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ah$b;
 
@@ -1383,11 +1383,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1439,7 +1439,7 @@
     return p1
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -1447,156 +1447,156 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
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 428c07135f..85a9f87ad8 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
@@ -7,5 +7,5 @@
 .method public abstract a(Landroid/content/Context;Landroid/content/Intent;)V
 .end method
 
-.method public abstract uS()Landroid/content/BroadcastReceiver$PendingResult;
+.method public abstract uV()Landroid/content/BroadcastReceiver$PendingResult;
 .end method
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 74ae8ce825..23603e4fd8 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
@@ -4,19 +4,15 @@
 
 
 # static fields
-.field private static final aFC:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final aFL:Ljava/util/concurrent/atomic/AtomicLong;
 
 
 # instance fields
-.field private final aFA:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private aFE:Lcom/google/android/gms/measurement/internal/ez;
 
-.field private final aFB:Ljava/util/concurrent/Semaphore;
+.field private aFF:Lcom/google/android/gms/measurement/internal/ez;
 
-.field private aFv:Lcom/google/android/gms/measurement/internal/ez;
-
-.field private aFw:Lcom/google/android/gms/measurement/internal/ez;
-
-.field private final aFx:Ljava/util/concurrent/PriorityBlockingQueue;
+.field private final aFG:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -26,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final aFy:Ljava/util/concurrent/BlockingQueue;
+.field private final aFH:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -36,9 +32,13 @@
     .end annotation
 .end field
 
-.field private final aFz:Ljava/lang/Thread$UncaughtExceptionHandler;
+.field private final aFI:Ljava/lang/Thread$UncaughtExceptionHandler;
 
-.field private final ast:Ljava/lang/Object;
+.field private final aFJ:Ljava/lang/Thread$UncaughtExceptionHandler;
+
+.field private final aFK:Ljava/util/concurrent/Semaphore;
+
+.field private final asC:Ljava/lang/Object;
 
 .field private volatile zzi:Z
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFC:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFL:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->ast:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->asC:Ljava/lang/Object;
 
     new-instance p1, Ljava/util/concurrent/Semaphore;
 
@@ -75,19 +75,19 @@
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/Semaphore;-><init>(I)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFK: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/ev;->aFx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG: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/ev;->aFy:Ljava/util/concurrent/BlockingQueue;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFH:Ljava/util/concurrent/BlockingQueue;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ex;
 
@@ -95,7 +95,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ex;-><init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFz:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFI:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/ex;
 
@@ -103,7 +103,7 @@
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/ex;-><init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFJ:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ev;)Ljava/util/concurrent/Semaphore;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFB:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFK:Ljava/util/concurrent/Semaphore;
 
     return-object p0
 .end method
@@ -126,16 +126,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->ast:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->asC:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG: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/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     if-nez p1, :cond_0
 
@@ -143,26 +143,26 @@
 
     const-string v1, "Measurement Worker"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ev;->aFx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-direct {p1, p0, v1, v2}, Lcom/google/android/gms/measurement/internal/ez;-><init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/String;Ljava/util/concurrent/BlockingQueue;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFz:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFI:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/ez;->setUncaughtExceptionHandler(Ljava/lang/Thread$UncaughtExceptionHandler;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ez;->start()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ez;->zza()V
 
@@ -192,7 +192,7 @@
 .method static synthetic c(Lcom/google/android/gms/measurement/internal/ev;)Ljava/lang/Object;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->ast:Ljava/lang/Object;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->asC:Ljava/lang/Object;
 
     return-object p0
 .end method
@@ -200,7 +200,7 @@
 .method static synthetic d(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     return-object p0
 .end method
@@ -210,7 +210,7 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     return-object v0
 .end method
@@ -218,7 +218,7 @@
 .method static synthetic f(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
     return-object p0
 .end method
@@ -228,15 +228,15 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
     return-object v0
 .end method
 
-.method static synthetic xW()Ljava/util/concurrent/atomic/AtomicLong;
+.method static synthetic xZ()Ljava/util/concurrent/atomic/AtomicLong;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFC:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ev;->aFL:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-object v0
 .end method
@@ -261,7 +261,7 @@
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -288,11 +288,11 @@
 
     if-nez p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Timed out waiting for "
 
@@ -325,11 +325,11 @@
 
     :catch_0
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Interrupted waiting for "
 
@@ -393,7 +393,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -409,11 +409,11 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFG:Ljava/util/concurrent/PriorityBlockingQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/PriorityBlockingQueue;->isEmpty()Z
 
@@ -421,11 +421,11 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Callable skipped the worker queue."
 
@@ -463,7 +463,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -479,7 +479,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne p1, v1, :cond_0
 
@@ -502,7 +502,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -525,7 +525,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -535,16 +535,16 @@
 
     invoke-direct {v0, p0, p1, v1}, Lcom/google/android/gms/measurement/internal/ew;-><init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->ast:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ev;->asC:Ljava/lang/Object;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFy:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFH: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/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
     if-nez v0, :cond_0
 
@@ -552,26 +552,26 @@
 
     const-string v1, "Measurement Network"
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ev;->aFy:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ev;->aFH:Ljava/util/concurrent/BlockingQueue;
 
     invoke-direct {v0, p0, v1, v2}, Lcom/google/android/gms/measurement/internal/ez;-><init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/String;Ljava/util/concurrent/BlockingQueue;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFA:Ljava/lang/Thread$UncaughtExceptionHandler;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFJ:Ljava/lang/Thread$UncaughtExceptionHandler;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ez;->setUncaughtExceptionHandler(Ljava/lang/Thread$UncaughtExceptionHandler;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ez;->start()V
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ez;->zza()V
 
@@ -590,7 +590,7 @@
     throw v0
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -598,14 +598,14 @@
     return v0
 .end method
 
-.method public final rx()V
+.method public final rA()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/ev;->aFw:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFF:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne v0, v1, :cond_0
 
@@ -621,14 +621,14 @@
     throw v0
 .end method
 
-.method public final uF()Z
+.method public final uI()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/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne v0, v1, :cond_0
 
@@ -642,14 +642,24 @@
     return v0
 .end method
 
-.method public final vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final vq()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/ev;->aFv:Lcom/google/android/gms/measurement/internal/ez;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ev;->aFE:Lcom/google/android/gms/measurement/internal/ez;
 
     if-ne v0, v1, :cond_0
 
@@ -665,100 +675,90 @@
     throw v0
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ka;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
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 c6dfdee454..cf72a52952 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
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field private final synthetic aFD:Lcom/google/android/gms/measurement/internal/ev;
+.field private final synthetic aFM:Lcom/google/android/gms/measurement/internal/ev;
 
-.field private final anh:Ljava/lang/String;
+.field private final anq:Ljava/lang/String;
 
-.field private final anq:J
+.field private final anz:J
 
 .field final zza:Z
 
@@ -35,7 +35,7 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/Runnable;Ljava/lang/String;)V
     .locals 3
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFD:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFM:Lcom/google/android/gms/measurement/internal/ev;
 
     const/4 v0, 0x0
 
@@ -43,7 +43,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/ev;->xW()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ev;->xZ()Ljava/util/concurrent/atomic/AtomicLong;
 
     move-result-object p2
 
@@ -51,15 +51,15 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ew;->anh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:Ljava/lang/String;
 
     const/4 p2, 0x0
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/ew;->zza:Z
 
-    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -67,11 +67,11 @@
 
     if-nez v2, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Tasks index overflow"
 
@@ -93,13 +93,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFD:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFM:Lcom/google/android/gms/measurement/internal/ev;
 
     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/ev;->xW()Ljava/util/concurrent/atomic/AtomicLong;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ev;->xZ()Ljava/util/concurrent/atomic/AtomicLong;
 
     move-result-object p2
 
@@ -107,13 +107,13 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ew;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:Ljava/lang/String;
 
     iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/ew;->zza:Z
 
-    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iget-wide p2, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
     const-wide v0, 0x7fffffffffffffffL
 
@@ -121,11 +121,11 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Tasks index overflow"
 
@@ -160,9 +160,9 @@
     return v2
 
     :cond_1
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
-    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iget-wide v4, p1, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
     cmp-long p1, v0, v4
 
@@ -178,15 +178,15 @@
     return v2
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFD:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ew;->aFM:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEs:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEB:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/ew;->anz:J
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -204,15 +204,15 @@
 .method protected final setException(Ljava/lang/Throwable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aFD:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ew;->aFM:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ew;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ew;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
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 2507c8ce37..36fde33b5b 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aFE:Lcom/google/android/gms/measurement/internal/ev;
+.field private final synthetic aFN:Lcom/google/android/gms/measurement/internal/ev;
 
-.field private final atJ:Ljava/lang/String;
+.field private final atS:Ljava/lang/String;
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/ev;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aFE:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aFN:Lcom/google/android/gms/measurement/internal/ev;
 
     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/ex;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ex;->atS:Ljava/lang/String;
 
     return-void
 .end method
@@ -35,15 +35,15 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aFE:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ex;->aFN:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ex;->atS:Ljava/lang/String;
 
     invoke-virtual {p1, v0, p2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_0
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 b3fca2c6ff..0d6a004fb2 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
@@ -7,67 +7,67 @@
 
 
 # static fields
-.field private static volatile aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field private static volatile aBO:Lcom/google/android/gms/measurement/internal/ey;
 
 
 # instance fields
-.field private final aFF:Lcom/google/android/gms/measurement/internal/jz;
+.field private final aFO:Lcom/google/android/gms/measurement/internal/jz;
 
-.field final aFG:Lcom/google/android/gms/measurement/internal/ka;
+.field final aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-.field private final aFH:Lcom/google/android/gms/measurement/internal/eh;
+.field private final aFQ:Lcom/google/android/gms/measurement/internal/eh;
 
-.field final aFI:Lcom/google/android/gms/measurement/internal/dv;
+.field final aFR:Lcom/google/android/gms/measurement/internal/dv;
 
-.field final aFJ:Lcom/google/android/gms/measurement/internal/ev;
+.field final aFS:Lcom/google/android/gms/measurement/internal/ev;
 
-.field private final aFK:Lcom/google/android/gms/measurement/internal/in;
+.field private final aFT:Lcom/google/android/gms/measurement/internal/in;
 
-.field private final aFL:Lcom/google/android/gms/measurement/internal/jm;
+.field private final aFU:Lcom/google/android/gms/measurement/internal/jm;
 
-.field private final aFM:Lcom/google/android/gms/measurement/internal/dt;
+.field private final aFV:Lcom/google/android/gms/measurement/internal/dt;
 
-.field private final aFN:Lcom/google/android/gms/common/util/e;
+.field private final aFW:Lcom/google/android/gms/common/util/e;
 
-.field private final aFO:Lcom/google/android/gms/measurement/internal/hh;
+.field private final aFX:Lcom/google/android/gms/measurement/internal/hh;
 
-.field private final aFP:Lcom/google/android/gms/measurement/internal/gf;
+.field private final aFY:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final aFQ:Lcom/google/android/gms/measurement/internal/z;
+.field private final aFZ:Lcom/google/android/gms/measurement/internal/z;
 
-.field private final aFR:Lcom/google/android/gms/measurement/internal/hc;
+.field private final aGa:Lcom/google/android/gms/measurement/internal/hc;
 
-.field private aFS:Lcom/google/android/gms/measurement/internal/dr;
+.field private aGb:Lcom/google/android/gms/measurement/internal/dr;
 
-.field private aFT:Lcom/google/android/gms/measurement/internal/hm;
+.field private aGc:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private aFU:Lcom/google/android/gms/measurement/internal/i;
+.field private aGd:Lcom/google/android/gms/measurement/internal/i;
 
-.field private aFV:Lcom/google/android/gms/measurement/internal/ds;
+.field private aGe:Lcom/google/android/gms/measurement/internal/ds;
 
-.field aFW:Lcom/google/android/gms/measurement/internal/en;
+.field aGf:Lcom/google/android/gms/measurement/internal/en;
 
-.field private aFX:Z
+.field private aGg:Z
 
-.field private aFY:Ljava/lang/Boolean;
+.field private aGh:Ljava/lang/Boolean;
 
-.field private aFZ:J
+.field private aGi:J
 
-.field private volatile aGa:Ljava/lang/Boolean;
+.field private volatile aGj:Ljava/lang/Boolean;
 
-.field private aGb:Ljava/lang/Boolean;
+.field private aGk:Ljava/lang/Boolean;
 
-.field private aGc:Ljava/lang/Boolean;
+.field private aGl:Ljava/lang/Boolean;
 
-.field aGd:I
+.field aGm:I
 
-.field private aGe:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private aGn:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final aGf:J
+.field final aGo:J
 
-.field final anh:Ljava/lang/String;
+.field final anq:Ljava/lang/String;
 
-.field private final atB:Landroid/content/Context;
+.field private final atK:Landroid/content/Context;
 
 .field final zzd:Ljava/lang/String;
 
@@ -84,13 +84,13 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGg: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/ey;->aGe:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -98,21 +98,21 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/measurement/internal/jz;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFF:Lcom/google/android/gms/measurement/internal/jz;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFF:Lcom/google/android/gms/measurement/internal/jz;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/jz;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/o;->a(Lcom/google/android/gms/measurement/internal/jz;)V
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGD:Landroid/content/Context;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGM:Landroid/content/Context;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->amV:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->ane:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->anq:Ljava/lang/String;
 
     iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->zzd:Ljava/lang/String;
 
@@ -124,19 +124,19 @@
 
     iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/ey;->zzf:Z
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aCb:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aCk:Ljava/lang/Boolean;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGE:Lcom/google/android/gms/internal/measurement/zzv;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
 
     if-eqz v1, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     const-string v3, "measurementEnabled"
 
@@ -150,10 +150,10 @@
 
     check-cast v2, Ljava/lang/Boolean;
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Ljava/lang/Boolean;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGk:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object v1, v1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     const-string v2, "measurementDeactivated"
 
@@ -167,120 +167,120 @@
 
     check-cast v1, Ljava/lang/Boolean;
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Ljava/lang/Boolean;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGl:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
     invoke-static {v1}, Lcom/google/android/gms/internal/measurement/be;->Z(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nq()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/common/util/e;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW: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/ey;->aGf:J
+    iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/ka;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/ka;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/eh;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFH:Lcom/google/android/gms/measurement/internal/eh;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/dv;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/dv;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFI:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/jm;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/jm;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/dt;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM:Lcom/google/android/gms/measurement/internal/dt;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/dt;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/z;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/z;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/z;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:Lcom/google/android/gms/measurement/internal/z;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/hh;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/hh;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/hh;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Lcom/google/android/gms/measurement/internal/hh;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/gf;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/gf;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/in;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/in;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFK:Lcom/google/android/gms/measurement/internal/in;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/in;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/hc;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/hc;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/hc;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/hc;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/internal/ev;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFJ:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGE:Lcom/google/android/gms/internal/measurement/zzv;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
 
     const/4 v2, 0x1
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGE:Lcom/google/android/gms/internal/measurement/zzv;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
 
-    iget-wide v3, v1, Lcom/google/android/gms/internal/measurement/zzv;->anq:J
+    iget-wide v3, v1, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
 
     const-wide/16 v5, 0x0
 
@@ -298,7 +298,7 @@
     :goto_0
     xor-int/2addr v1, v2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
     invoke-virtual {v2}, Landroid/content/Context;->getApplicationContext()Landroid/content/Context;
 
@@ -308,11 +308,11 @@
 
     if-eqz v2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v3
 
@@ -324,7 +324,7 @@
 
     if-eqz v3, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v3
 
@@ -334,7 +334,7 @@
 
     check-cast v3, Landroid/app/Application;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     if-nez v4, :cond_3
 
@@ -342,24 +342,24 @@
 
     invoke-direct {v4, v2, v0}, Lcom/google/android/gms/measurement/internal/gw;-><init>(Lcom/google/android/gms/measurement/internal/gf;B)V
 
-    iput-object v4, v2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object v4, v2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     :cond_3
     if-eqz v1, :cond_5
 
-    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v3, v0}, Landroid/app/Application;->unregisterActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, v2, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v3, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Registered activity lifecycle callback"
 
@@ -368,11 +368,11 @@
     goto :goto_1
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Application context is not an Application"
 
@@ -380,7 +380,7 @@
 
     :cond_5
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFJ:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/fa;
 
@@ -407,11 +407,11 @@
     :cond_0
     new-instance v0, Lcom/google/android/gms/internal/measurement/zzv;
 
-    iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/zzv;->anp:J
+    iget-wide v2, p1, Lcom/google/android/gms/internal/measurement/zzv;->any:J
 
-    iget-wide v4, p1, Lcom/google/android/gms/internal/measurement/zzv;->anq:J
+    iget-wide v4, p1, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
 
-    iget-boolean v6, p1, Lcom/google/android/gms/internal/measurement/zzv;->asy:Z
+    iget-boolean v6, p1, Lcom/google/android/gms/internal/measurement/zzv;->asH:Z
 
     iget-object v7, p1, Lcom/google/android/gms/internal/measurement/zzv;->zzd:Ljava/lang/String;
 
@@ -419,7 +419,7 @@
 
     const/4 v9, 0x0
 
-    iget-object v10, p1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object v10, p1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     move-object v1, v0
 
@@ -436,7 +436,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/ey;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ey;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     if-nez v0, :cond_3
 
@@ -445,7 +445,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ey;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ey;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     if-nez v1, :cond_2
 
@@ -457,7 +457,7 @@
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/ey;-><init>(Lcom/google/android/gms/measurement/internal/gb;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     :cond_2
     monitor-exit v0
@@ -476,11 +476,11 @@
     :cond_3
     if-eqz p1, :cond_4
 
-    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     if-eqz p0, :cond_4
 
-    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object p0, p1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     const-string v0, "dataCollectionDefaultEnabled"
 
@@ -490,9 +490,9 @@
 
     if-eqz p0, :cond_4
 
-    sget-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     const-string v0, "dataCollectionDefaultEnabled"
 
@@ -504,7 +504,7 @@
 
     :cond_4
     :goto_0
-    sget-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/ey;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     return-object p0
 .end method
@@ -514,7 +514,7 @@
 
     if-eqz p0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xA()Z
 
     move-result v0
 
@@ -574,21 +574,21 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/ey;Lcom/google/android/gms/measurement/internal/gb;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ud()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->ug()Ljava/lang/String;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/i;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/i;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->xC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ft;->xF()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/i;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Lcom/google/android/gms/measurement/internal/i;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ds;
 
@@ -596,49 +596,49 @@
 
     invoke-direct {v0, p0, v1, v2}, Lcom/google/android/gms/measurement/internal/ds;-><init>(Lcom/google/android/gms/measurement/internal/ey;J)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/ds;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/dr;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/dr;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/dr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/dr;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/hm;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/hm;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xz()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xC()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/jm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->ys()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->yv()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFH:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->ys()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ft;->yv()V
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/en;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/en;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/measurement/internal/en;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xA()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dc;->xD()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-wide/16 v1, 0x471a
 
@@ -650,21 +650,21 @@
 
     invoke-virtual {p1, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     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/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -672,7 +672,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -682,11 +682,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Faster debug mode event logging enabled. To disable, run:\n  adb shell setprop debug.firebase.analytics.app .none."
 
@@ -699,11 +699,11 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "To enable faster debug mode event logging run:\n  adb shell setprop debug.firebase.analytics.app "
 
@@ -732,19 +732,19 @@
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Debug-level message logging enabled"
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:I
+    iget p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -752,19 +752,19 @@
 
     if-eq p1, v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGm: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/ey;->aGe:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
 
@@ -781,7 +781,7 @@
     :cond_3
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGg:Z
 
     return-void
 .end method
@@ -791,7 +791,7 @@
 
     if-eqz p0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->va()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
 
     move-result v0
 
@@ -895,22 +895,22 @@
     return-object p0
 .end method
 
-.method private final yd()Lcom/google/android/gms/measurement/internal/hc;
+.method private final yg()Lcom/google/android/gms/measurement/internal/hc;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/hc;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/ft;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Lcom/google/android/gms/measurement/internal/hc;
 
     return-object v0
 .end method
 
-.method private final yj()V
+.method private final ym()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGg:Z
 
     if-eqz v0, :cond_0
 
@@ -926,7 +926,7 @@
     throw v0
 .end method
 
-.method static ym()V
+.method static yp()V
     .locals 2
 
     new-instance v0, Ljava/lang/IllegalStateException;
@@ -976,11 +976,11 @@
     :goto_0
     if-nez v4, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -993,11 +993,11 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFp:Lcom/google/android/gms/measurement/internal/ej;
 
     invoke-virtual {p1, v2}, Lcom/google/android/gms/measurement/internal/ej;->zza(Z)V
 
@@ -1005,11 +1005,11 @@
 
     if-nez p1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Deferred Deep Link response empty."
 
@@ -1051,11 +1051,11 @@
 
     if-eqz p2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Deferred Deep Link is empty."
 
@@ -1064,7 +1064,7 @@
     return-void
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
@@ -1074,7 +1074,7 @@
 
     if-nez v1, :cond_5
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object p2
 
@@ -1112,11 +1112,11 @@
     :goto_1
     if-nez v2, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Deferred Deep Link validation failed. gclid, deep link"
 
@@ -1137,7 +1137,7 @@
 
     invoke-virtual {p2, p3, v0}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/gf;
 
     const-string v0, "auto"
 
@@ -1145,7 +1145,7 @@
 
     invoke-virtual {p3, v0, v1, p2}, Lcom/google/android/gms/measurement/internal/gf;->b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
@@ -1167,7 +1167,7 @@
 
     invoke-direct {p1, p3}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object p2
 
@@ -1181,11 +1181,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to parse the Deferred Deep Link response. exception"
 
@@ -1194,30 +1194,30 @@
     return-void
 .end method
 
-.method public final lB()V
+.method public final lE()V
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/hc;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hc;
 
     move-result-object v0
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/ft;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
@@ -1225,9 +1225,9 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->uH()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->uK()Ljava/lang/Boolean;
 
     move-result-object v2
 
@@ -1260,21 +1260,21 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/hc;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hc;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hc;->uF()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hc;->uI()Z
 
     move-result v2
 
     if-nez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Network is not available for Deferred Deep Link request. Skipping"
 
@@ -1283,15 +1283,15 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     const-wide/16 v3, 0x471a
 
@@ -1301,13 +1301,13 @@
 
     check-cast v5, Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFq:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v6
 
@@ -1325,7 +1325,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/hc;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/hc;
 
     move-result-object v2
 
@@ -1333,15 +1333,15 @@
 
     invoke-direct {v3, p0}, Lcom/google/android/gms/measurement/internal/fc;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xE()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/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v4
 
@@ -1355,11 +1355,11 @@
 
     :cond_2
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "ADID unavailable to retrieve Deferred Deep Link. Skipping"
 
@@ -1368,178 +1368,178 @@
     return-void
 .end method
 
-.method public final vp()Lcom/google/android/gms/common/util/e;
+.method public final vA()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/jz;
 
     return-object v0
 .end method
 
-.method public final vq()Landroid/content/Context;
+.method public final vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
 
     return-object v0
 .end method
 
-.method public final vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final vt()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFJ:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
+
+    return-object v0
+.end method
+
+.method public final vw()Lcom/google/android/gms/measurement/internal/ev;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/ft;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFJ:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/ev;
 
     return-object v0
 .end method
 
-.method public final vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFI:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/ft;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFI:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
 
     return-object v0
 .end method
 
-.method public final vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final ya()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFF:Lcom/google/android/gms/measurement/internal/jz;
-
-    return-object v0
-.end method
-
-.method public final xX()Lcom/google/android/gms/measurement/internal/eh;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFH:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/fu;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFH:Lcom/google/android/gms/measurement/internal/eh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/eh;
 
     return-object v0
 .end method
 
-.method public final xY()Lcom/google/android/gms/measurement/internal/in;
+.method public final yb()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFK:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/in;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/dc;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFK:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/in;
 
     return-object v0
 .end method
 
-.method public final xZ()Lcom/google/android/gms/measurement/internal/gf;
+.method public final yc()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/dc;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Lcom/google/android/gms/measurement/internal/gf;
 
     return-object v0
 .end method
 
-.method public final ya()Lcom/google/android/gms/measurement/internal/jm;
+.method public final yd()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/jm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/fu;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFL:Lcom/google/android/gms/measurement/internal/jm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/jm;
 
     return-object v0
 .end method
 
-.method public final yb()Lcom/google/android/gms/measurement/internal/dt;
+.method public final ye()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/dt;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/fu;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFM:Lcom/google/android/gms/measurement/internal/dt;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/dt;
 
     return-object v0
 .end method
 
-.method public final yc()Lcom/google/android/gms/measurement/internal/dr;
+.method public final yf()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/dr;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/dc;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFS:Lcom/google/android/gms/measurement/internal/dr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Lcom/google/android/gms/measurement/internal/dr;
 
     return-object v0
 .end method
 
-.method public final ye()Lcom/google/android/gms/measurement/internal/hh;
+.method public final yh()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Lcom/google/android/gms/measurement/internal/hh;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/dc;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFO:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFX:Lcom/google/android/gms/measurement/internal/hh;
 
     return-object v0
 .end method
 
-.method public final yf()Lcom/google/android/gms/measurement/internal/hm;
+.method public final yi()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/dc;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
 
     return-object v0
 .end method
 
-.method public final yg()Lcom/google/android/gms/measurement/internal/i;
+.method public final yj()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/i;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Lcom/google/android/gms/measurement/internal/i;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/ft;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFU:Lcom/google/android/gms/measurement/internal/i;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGd:Lcom/google/android/gms/measurement/internal/i;
 
     return-object v0
 .end method
 
-.method public final yh()Lcom/google/android/gms/measurement/internal/ds;
+.method public final yk()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/dc;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFV:Lcom/google/android/gms/measurement/internal/ds;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Lcom/google/android/gms/measurement/internal/ds;
 
     return-object v0
 .end method
 
-.method public final yi()Lcom/google/android/gms/measurement/internal/z;
+.method public final yl()Lcom/google/android/gms/measurement/internal/z;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFQ:Lcom/google/android/gms/measurement/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:Lcom/google/android/gms/measurement/internal/z;
 
     if-eqz v0, :cond_0
 
@@ -1555,14 +1555,14 @@
     throw v0
 .end method
 
-.method public final yk()Z
+.method public final yn()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1580,20 +1580,20 @@
     return v0
 .end method
 
-.method public final yl()Z
+.method public final yo()Z
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yj()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDv:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1605,9 +1605,9 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
 
     move-result v0
 
@@ -1616,7 +1616,7 @@
     return v2
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGl:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_1
 
@@ -1629,11 +1629,11 @@
     return v2
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vI()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vL()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1646,9 +1646,9 @@
     return v0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vH()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vK()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1661,7 +1661,7 @@
     return v0
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGb:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGk:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_4
 
@@ -1672,7 +1672,7 @@
     return v0
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mC()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mF()Z
 
     move-result v0
 
@@ -1681,9 +1681,9 @@
     return v2
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDq:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDz:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1691,11 +1691,11 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1707,9 +1707,9 @@
     return v1
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->ro()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
 
     move-result v0
 
@@ -1718,9 +1718,9 @@
     return v2
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vH()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vK()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1733,7 +1733,7 @@
     goto :goto_0
 
     :cond_9
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mC()Z
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mF()Z
 
     move-result v0
 
@@ -1741,11 +1741,11 @@
 
     if-eqz v0, :cond_a
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_a
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDq:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDz:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v2, 0x0
 
@@ -1761,7 +1761,7 @@
 
     if-eqz v1, :cond_a
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1769,7 +1769,7 @@
 
     :cond_a
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
@@ -1780,32 +1780,32 @@
     return v0
 .end method
 
-.method final yn()V
+.method final yq()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGe:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGn:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
     return-void
 .end method
 
-.method protected final yo()Z
+.method protected final yr()Z
     .locals 6
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->yj()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:J
 
     const-wide/16 v3, 0x0
 
@@ -1821,13 +1821,13 @@
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:J
 
     sub-long/2addr v0, v2
 
@@ -1842,15 +1842,15 @@
     if-lez v4, :cond_5
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFZ:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGi:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -1866,7 +1866,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -1878,27 +1878,27 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK: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;->nC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->nF()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eo;->C(Landroid/content/Context;)Z
 
@@ -1906,7 +1906,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jm;->ar(Landroid/content/Context;)Z
 
@@ -1927,9 +1927,9 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1937,23 +1937,23 @@
 
     if-eqz v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v4
 
@@ -1963,11 +1963,11 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1988,10 +1988,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh:Ljava/lang/Boolean;
 
     :cond_5
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFY:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGh:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -2003,19 +2003,19 @@
 .method protected final zza()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v0
 
@@ -2025,13 +2025,13 @@
 
     if-nez v4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFN:Lcom/google/android/gms/common/util/e;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/common/util/e;
 
     invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->currentTimeMillis()J
 
@@ -2040,13 +2040,13 @@
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v0
 
@@ -2054,13 +2054,13 @@
 
     if-nez v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -2070,30 +2070,30 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
 
     move-result v0
 
     if-nez v0, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
     if-eqz v0, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -2105,18 +2105,18 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "App is missing INTERNET permission"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -2128,38 +2128,38 @@
 
     if-nez v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "App is missing ACCESS_NETWORK_STATE permission"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK: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;->nC()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/common/c/b;->nF()Z
 
     move-result v0
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
 
     move-result v0
 
     if-nez v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/eo;->C(Landroid/content/Context;)Z
 
@@ -2167,18 +2167,18 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "AppMeasurementReceiver not registered/enabled"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->atK:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jm;->ar(Landroid/content/Context;)Z
 
@@ -2186,22 +2186,22 @@
 
     if-nez v0, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "AppMeasurementService not registered/enabled"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Uploading is not possible. App measurement disabled"
 
@@ -2210,11 +2210,11 @@
     goto/16 :goto_0
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2226,11 +2226,11 @@
 
     if-eqz v0, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2241,37 +2241,37 @@
     if-nez v0, :cond_9
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/eh;->vl()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/eh;->vo()Ljava/lang/String;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/eh;->xU()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/eh;->xX()Ljava/lang/String;
 
     move-result-object v4
 
@@ -2281,95 +2281,95 @@
 
     if-eqz v0, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Rechecking which service to use due to a GMP App Id change"
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->xV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->xY()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->xC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dr;->xF()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lE()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFT:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aGc:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGf:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/ey;->aGo:J
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ek;->aL(Ljava/lang/String;)V
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/eh;->cr(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v2
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/eh;->cs(Ljava/lang/String;)V
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object v2
 
@@ -2377,9 +2377,9 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->zzb()Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2387,23 +2387,23 @@
 
     if-eqz v0, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->xx()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->xA()Z
 
     move-result v0
 
     if-nez v0, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2413,30 +2413,30 @@
 
     if-nez v0, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Remote config removed with active feature rollouts"
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ek;->aL(Ljava/lang/String;)V
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xJ()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2446,11 +2446,11 @@
 
     if-eqz v0, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xK()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xN()Ljava/lang/String;
 
     move-result-object v0
 
@@ -2461,15 +2461,15 @@
     if-nez v0, :cond_f
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEL:Landroid/content/SharedPreferences;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEU:Landroid/content/SharedPreferences;
 
     const-string v2, "deferred_analytics_collection"
 
@@ -2479,15 +2479,15 @@
 
     if-nez v1, :cond_c
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->ro()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
 
     move-result v1
 
     if-nez v1, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
@@ -2498,32 +2498,32 @@
     :cond_c
     if-eqz v0, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yt()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/gf;->yw()V
 
     :cond_d
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
@@ -2535,23 +2535,23 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->zzb()Z
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDy:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2559,19 +2559,19 @@
 
     if-eqz v1, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -2585,13 +2585,13 @@
 
     if-eqz v1, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
     const/4 v2, 0x1
 
@@ -2615,21 +2615,21 @@
 
     if-ne v1, v2, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Detected application was in foreground"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -2642,7 +2642,7 @@
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/iv;->c(JZ)V
 
     :cond_e
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
@@ -2654,15 +2654,15 @@
 
     :cond_f
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFk:Lcom/google/android/gms/measurement/internal/ej;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDK:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2670,15 +2670,15 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ej;->zza(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFc:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFl:Lcom/google/android/gms/measurement/internal/ej;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDL:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2696,7 +2696,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGa:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ey;->aGj:Ljava/lang/Boolean;
 
     return-void
 .end method
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 fc42693d4b..bc26caa49d 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aGg:Ljava/util/concurrent/BlockingQueue;
+.field private final aGp:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private final synthetic aGh:Lcom/google/android/gms/measurement/internal/ev;
+.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/ev;
 
 .field private final zza:Ljava/lang/Object;
 
@@ -32,7 +32,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-direct {p0}, Ljava/lang/Thread;-><init>()V
 
@@ -46,7 +46,7 @@
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ez;->zza:Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ez;->aGg:Ljava/util/concurrent/BlockingQueue;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ez;->aGp:Ljava/util/concurrent/BlockingQueue;
 
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/ez;->setName(Ljava/lang/String;)V
 
@@ -56,13 +56,13 @@
 .method private final a(Ljava/lang/InterruptedException;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ez;->getName()Ljava/lang/String;
 
@@ -94,7 +94,7 @@
     if-nez v0, :cond_0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->a(Lcom/google/android/gms/measurement/internal/ev;)Ljava/util/concurrent/Semaphore;
 
@@ -126,7 +126,7 @@
     move-result v0
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGg:Ljava/util/concurrent/BlockingQueue;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGp:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v1}, Ljava/util/concurrent/BlockingQueue;->poll()Ljava/lang/Object;
 
@@ -162,7 +162,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_3
 
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGg:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGp:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v2}, Ljava/util/concurrent/BlockingQueue;->peek()Ljava/lang/Object;
 
@@ -170,7 +170,7 @@
 
     if-nez v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->b(Lcom/google/android/gms/measurement/internal/ev;)Z
 
@@ -205,7 +205,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_2
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->c(Lcom/google/android/gms/measurement/internal/ev;)Ljava/lang/Object;
 
@@ -216,7 +216,7 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_3
 
     :try_start_6
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGg:Ljava/util/concurrent/BlockingQueue;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGp:Ljava/util/concurrent/BlockingQueue;
 
     invoke-interface {v2}, Ljava/util/concurrent/BlockingQueue;->peek()Ljava/lang/Object;
 
@@ -228,7 +228,7 @@
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/ev;->c(Lcom/google/android/gms/measurement/internal/ev;)Ljava/lang/Object;
 
@@ -237,7 +237,7 @@
     monitor-enter v0
 
     :try_start_7
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->a(Lcom/google/android/gms/measurement/internal/ev;)Ljava/util/concurrent/Semaphore;
 
@@ -245,7 +245,7 @@
 
     invoke-virtual {v1}, Ljava/util/concurrent/Semaphore;->release()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->c(Lcom/google/android/gms/measurement/internal/ev;)Ljava/lang/Object;
 
@@ -253,7 +253,7 @@
 
     invoke-virtual {v1}, Ljava/lang/Object;->notifyAll()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->d(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
@@ -261,14 +261,14 @@
 
     if-ne p0, v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->e(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->f(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
@@ -276,20 +276,20 @@
 
     if-ne p0, v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->g(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
     goto :goto_4
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Current scheduler thread is neither worker nor network"
 
@@ -343,7 +343,7 @@
     :catchall_3
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ev;->c(Lcom/google/android/gms/measurement/internal/ev;)Ljava/lang/Object;
 
@@ -352,7 +352,7 @@
     monitor-enter v1
 
     :try_start_c
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->a(Lcom/google/android/gms/measurement/internal/ev;)Ljava/util/concurrent/Semaphore;
 
@@ -360,7 +360,7 @@
 
     invoke-virtual {v2}, Ljava/util/concurrent/Semaphore;->release()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->c(Lcom/google/android/gms/measurement/internal/ev;)Ljava/lang/Object;
 
@@ -368,7 +368,7 @@
 
     invoke-virtual {v2}, Ljava/lang/Object;->notifyAll()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->d(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
@@ -376,7 +376,7 @@
 
     if-eq p0, v2, :cond_8
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->f(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
@@ -384,20 +384,20 @@
 
     if-ne p0, v2, :cond_7
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->g(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
     goto :goto_5
 
     :cond_7
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Current scheduler thread is neither worker nor network"
 
@@ -406,7 +406,7 @@
     goto :goto_5
 
     :cond_8
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGh:Lcom/google/android/gms/measurement/internal/ev;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ez;->aGq:Lcom/google/android/gms/measurement/internal/ev;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/ev;->e(Lcom/google/android/gms/measurement/internal/ev;)Lcom/google/android/gms/measurement/internal/ez;
 
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 677d0ec24f..657f12aa3e 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aBB:Lcom/google/android/gms/measurement/internal/ey;
+.field private final synthetic aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private final synthetic aGi:Lcom/google/android/gms/measurement/internal/gb;
+.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/gb;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ey;Lcom/google/android/gms/measurement/internal/gb;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fa;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fa;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fa;->aGi:Lcom/google/android/gms/measurement/internal/gb;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fa;->aGr:Lcom/google/android/gms/measurement/internal/gb;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,13 +30,13 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fa;->aGi:Lcom/google/android/gms/measurement/internal/gb;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fa;->aGr:Lcom/google/android/gms/measurement/internal/gb;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/ey;->a(Lcom/google/android/gms/measurement/internal/ey;Lcom/google/android/gms/measurement/internal/gb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fa;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->zza()V
 
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 af12aa4818..21008b0170 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
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field private aAc:J
+.field private aAl:J
 
-.field final aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field final aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-.field aEW:J
+.field aFf:J
 
-.field aFZ:J
+.field aGi:J
 
-.field private aGf:J
+.field private aGo:J
 
-.field private aGj:Ljava/lang/Boolean;
+.field private aGs:Ljava/lang/Boolean;
 
-.field aGk:Ljava/util/List;
+.field aGt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,31 +26,31 @@
     .end annotation
 .end field
 
-.field aGl:J
+.field aGu:J
 
-.field aGm:J
+.field aGv:J
 
-.field aGn:J
+.field aGw:J
 
-.field aGo:Ljava/lang/String;
+.field aGx:Ljava/lang/String;
 
-.field aGp:Z
+.field aGy:Z
 
-.field private adG:J
+.field private adP:J
 
-.field private final amV:Ljava/lang/String;
+.field private amx:Z
 
-.field private amo:Z
+.field private final ane:Ljava/lang/String;
 
-.field private anh:Ljava/lang/String;
+.field private anq:Ljava/lang/String;
 
-.field private axl:J
+.field private axu:J
 
-.field private axn:J
+.field private axw:J
 
-.field private azE:Ljava/lang/String;
+.field private azN:Ljava/lang/String;
 
-.field private azG:Z
+.field private azP:Z
 
 .field private zzd:Ljava/lang/String;
 
@@ -89,17 +89,17 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fb;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fb;->ane:Ljava/lang/String;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     return-void
 .end method
@@ -109,17 +109,17 @@
 .method public final L(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->amo:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->amx:Z
 
     if-eq v1, p1, :cond_0
 
@@ -133,9 +133,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->amo:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->amx:Z
 
     return-void
 .end method
@@ -143,15 +143,15 @@
 .method public final O(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzr:Z
 
@@ -167,7 +167,7 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzr:Z
 
@@ -177,15 +177,15 @@
 .method public final T(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzh:J
 
@@ -203,7 +203,7 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzh:J
 
@@ -213,15 +213,15 @@
 .method public final U(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzi:J
 
@@ -239,7 +239,7 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzi:J
 
@@ -249,15 +249,15 @@
 .method public final V(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzk:J
 
@@ -275,7 +275,7 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzk:J
 
@@ -285,17 +285,17 @@
 .method public final aL(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->anq:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/jm;->V(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -305,9 +305,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->anh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->anq:Ljava/lang/String;
 
     return-void
 .end method
@@ -315,17 +315,17 @@
 .method public final af(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axl:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axu:J
 
     cmp-long v3, v1, p1
 
@@ -341,9 +341,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axl:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axu:J
 
     return-void
 .end method
@@ -351,15 +351,15 @@
 .method public final ag(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzu:J
 
@@ -377,7 +377,7 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzu:J
 
@@ -407,15 +407,15 @@
     :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/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
@@ -431,7 +431,7 @@
     :goto_1
     or-int/2addr v0, v2
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
@@ -441,17 +441,17 @@
 .method public final ai(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axn:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->axw:J
 
     cmp-long v3, v1, p1
 
@@ -467,9 +467,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axn:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->axw:J
 
     return-void
 .end method
@@ -477,17 +477,17 @@
 .method public final c(Ljava/lang/Boolean;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGj:Ljava/lang/Boolean;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGs:Ljava/lang/Boolean;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/jm;->b(Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
 
@@ -497,9 +497,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGj:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGs:Ljava/lang/Boolean;
 
     return-void
 .end method
@@ -507,15 +507,15 @@
 .method public final cA(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zze:Ljava/lang/String;
 
@@ -527,7 +527,7 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zze:Ljava/lang/String;
 
@@ -537,15 +537,15 @@
 .method public final cB(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzf:Ljava/lang/String;
 
@@ -557,7 +557,7 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzf:Ljava/lang/String;
 
@@ -567,15 +567,15 @@
 .method public final cC(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzj:Ljava/lang/String;
 
@@ -587,7 +587,7 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzj:Ljava/lang/String;
 
@@ -597,17 +597,17 @@
 .method public final cD(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azE:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azN:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/jm;->V(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -617,9 +617,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azE:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azN:Ljava/lang/String;
 
     return-void
 .end method
@@ -627,13 +627,13 @@
 .method public final cr(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -644,7 +644,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzs:Ljava/lang/String;
 
@@ -656,7 +656,7 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzs:Ljava/lang/String;
 
@@ -666,13 +666,13 @@
 .method public final cs(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -683,7 +683,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzw:Ljava/lang/String;
 
@@ -695,7 +695,7 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzw:Ljava/lang/String;
 
@@ -705,17 +705,17 @@
 .method public final ct(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
 
     invoke-static {v1, p1}, Lcom/google/android/gms/measurement/internal/jm;->V(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -725,9 +725,9 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
 
     return-void
 .end method
@@ -735,13 +735,13 @@
 .method public final cz(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -752,7 +752,7 @@
     const/4 p1, 0x0
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzd:Ljava/lang/String;
 
@@ -764,137 +764,137 @@
 
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fb;->zzd:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public final nb()Z
+.method public final ne()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azP:Z
 
     return v0
 .end method
 
-.method public final nk()J
+.method public final nn()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGf:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:J
 
     return-wide v0
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     return v0
 .end method
 
-.method public final qW()Ljava/lang/String;
+.method public final qZ()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzj:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final qw()Ljava/lang/String;
+.method public final qz()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->ane:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final rW()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->adG:J
-
-    return-wide v0
-.end method
-
 .method public final rZ()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->adP:J
+
+    return-wide v0
+.end method
+
+.method public final sc()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
     return-wide v0
 .end method
 
-.method public final sq()J
+.method public final st()J
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aAc:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aAl:J
 
     return-wide v0
 .end method
@@ -902,17 +902,17 @@
 .method public final u(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->adG:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->adP:J
 
     cmp-long v3, v1, p1
 
@@ -928,39 +928,203 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->adG:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->adP:J
 
     return-void
 .end method
 
-.method public final uA()Ljava/lang/String;
+.method public final uD()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzs:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final uY()V
-    .locals 5
+.method public final uf()Ljava/lang/String;
+    .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->anq:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final ug()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzd:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public final ui()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzh:J
+
+    return-wide v0
+.end method
+
+.method public final uj()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzi:J
+
+    return-wide v0
+.end method
+
+.method public final ul()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzk:J
+
+    return-wide v0
+.end method
+
+.method public final un()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->axu:J
+
+    return-wide v0
+.end method
+
+.method public final uo()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzu:J
+
+    return-wide v0
+.end method
+
+.method public final uw()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->axw:J
+
+    return-wide v0
+.end method
+
+.method public final v(J)V
+    .locals 4
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aAl:J
+
+    cmp-long v3, v1, p1
+
+    if-eqz v3, :cond_0
+
+    const/4 v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v1, 0x0
+
+    :goto_0
+    or-int/2addr v0, v1
+
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
+
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aAl:J
+
+    return-void
+.end method
+
+.method public final vb()V
+    .locals 5
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
@@ -974,15 +1138,15 @@
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fb;->ane:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -997,187 +1161,23 @@
     :cond_0
     const/4 v2, 0x1
 
-    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzg:J
 
     return-void
 .end method
 
-.method public final uc()Ljava/lang/String;
+.method public final vo()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->anh:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final ud()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzd:Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public final uf()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzh:J
-
-    return-wide v0
-.end method
-
-.method public final ug()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzi:J
-
-    return-wide v0
-.end method
-
-.method public final ui()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzk:J
-
-    return-wide v0
-.end method
-
-.method public final uk()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->axl:J
-
-    return-wide v0
-.end method
-
-.method public final ul()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzu:J
-
-    return-wide v0
-.end method
-
-.method public final ut()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/fb;->axn:J
-
-    return-wide v0
-.end method
-
-.method public final v(J)V
-    .locals 4
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
-
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aAc:J
-
-    cmp-long v3, v1, p1
-
-    if-eqz v3, :cond_0
-
-    const/4 v1, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v1, 0x0
-
-    :goto_0
-    or-int/2addr v0, v1
-
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
-
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aAc:J
-
-    return-void
-.end method
-
-.method public final vl()Ljava/lang/String;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzw:Ljava/lang/String;
 
@@ -1187,17 +1187,17 @@
 .method public final w(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGf:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:J
 
     cmp-long v3, v1, p1
 
@@ -1213,126 +1213,126 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGf:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:J
 
     return-void
 .end method
 
-.method public final wf()Ljava/lang/Boolean;
+.method public final wi()Ljava/lang/Boolean;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGj:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGs:Ljava/lang/Boolean;
 
     return-object v0
 .end method
 
-.method public final xG()Z
+.method public final xJ()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->amo:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->amx:Z
 
     return v0
 .end method
 
-.method public final xJ()Ljava/lang/String;
+.method public final xM()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGo:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final xU()Ljava/lang/String;
+.method public final xX()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zze:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yo()Z
+.method public final yr()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzr:Z
 
     return v0
 .end method
 
-.method public final yp()Ljava/lang/String;
+.method public final ys()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->zzf:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yq()Ljava/lang/String;
+.method public final yt()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azE:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->azN:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public final yr()Ljava/util/List;
+.method public final yu()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -1343,15 +1343,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGk:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGt:Ljava/util/List;
 
     return-object v0
 .end method
@@ -1359,17 +1359,17 @@
 .method public final zza(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azG:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/fb;->azP:Z
 
     if-eq v1, p1, :cond_0
 
@@ -1383,9 +1383,9 @@
     :goto_0
     or-int/2addr v0, v1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGp:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/fb;->aGy:Z
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azG:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/fb;->azP:Z
 
     return-void
 .end method
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 cc859fd1b8..bd6a05768b 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aBF:Lcom/google/android/gms/measurement/internal/ey;
+.field private final aBO:Lcom/google/android/gms/measurement/internal/ey;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fc;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fc;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final a(ILjava/lang/Throwable;[B)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fc;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-virtual {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/ey;->a(ILjava/lang/Throwable;[B)V
 
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 c44bc62b44..0a66912679 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fd;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fd;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fd;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fd;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,31 +30,31 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fd;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fd;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fd;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
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 76c4779f1e..e12aa1d3e9 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final aGs:Lcom/google/android/gms/measurement/internal/jf;
+.field final aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private aGt:Ljava/lang/Boolean;
+.field private aGC:Ljava/lang/Boolean;
 
-.field private anh:Ljava/lang/String;
+.field private anq:Ljava/lang/String;
 
 
 # direct methods
@@ -29,11 +29,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/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     return-object p0
 .end method
@@ -51,21 +51,21 @@
 
     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/zzm;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const/4 v1, 0x0
 
     invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/fe;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzr:Ljava/lang/String;
 
@@ -90,13 +90,13 @@
     if-eqz p2, :cond_3
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGt:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGC: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/fe;->anh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
 
     invoke-virtual {p2, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -104,9 +104,9 @@
 
     if-nez p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vq()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
 
     move-result-object p2
 
@@ -120,9 +120,9 @@
 
     if-nez p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vq()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
 
     move-result-object p2
 
@@ -156,10 +156,10 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGt:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGC:Ljava/lang/Boolean;
 
     :cond_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGt:Ljava/lang/Boolean;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGC:Ljava/lang/Boolean;
 
     invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -168,13 +168,13 @@
     if-nez p2, :cond_5
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anh:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
 
     if-nez p2, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vq()Landroid/content/Context;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
 
     move-result-object p2
 
@@ -188,10 +188,10 @@
 
     if-eqz p2, :cond_4
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anh:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->anq:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -224,13 +224,13 @@
     :catch_0
     move-exception p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -243,13 +243,13 @@
     throw p2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Measurement Service called without app package"
 
@@ -267,13 +267,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/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uF()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uI()Z
 
     move-result v0
 
@@ -284,9 +284,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -312,9 +312,9 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fe;->e(Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -361,7 +361,7 @@
 
     if-nez p2, :cond_1
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/measurement/internal/jm;->cv(Ljava/lang/String;)Z
 
@@ -393,15 +393,15 @@
     move-exception p2
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -433,9 +433,9 @@
 
     invoke-direct {p0, p3}, Lcom/google/android/gms/measurement/internal/fe;->e(Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -468,13 +468,13 @@
     move-exception p1
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to get conditional user properties"
 
@@ -506,9 +506,9 @@
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/fe;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -555,7 +555,7 @@
 
     if-nez p4, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/jm;->cv(Ljava/lang/String;)Z
 
@@ -587,13 +587,13 @@
     move-exception p2
 
     :goto_1
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -628,9 +628,9 @@
 
     invoke-direct {p0, p4}, Lcom/google/android/gms/measurement/internal/fe;->e(Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -677,7 +677,7 @@
 
     if-nez p3, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/jm;->cv(Ljava/lang/String;)Z
 
@@ -709,15 +709,15 @@
     move-exception p1
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p3, p4, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object p3, p4, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -829,7 +829,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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -839,9 +839,9 @@
 
     invoke-direct {v0, p1}, Lcom/google/android/gms/measurement/internal/zzv;-><init>(Lcom/google/android/gms/measurement/internal/zzv;)V
 
-    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/fr;
 
@@ -863,23 +863,23 @@
 
     invoke-direct {p0, p2, v0}, Lcom/google/android/gms/measurement/internal/fe;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -889,13 +889,13 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->np()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->ns()J
 
     move-result-wide v0
 
@@ -903,9 +903,9 @@
 
     div-long/2addr v0, v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v4
 
@@ -926,13 +926,13 @@
 
     if-nez v4, :cond_0
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Log and bundle returned null. appId"
 
@@ -947,37 +947,37 @@
     new-array v4, v4, [B
 
     :cond_0
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jf;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jf;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
-    invoke-interface {v5}, Lcom/google/android/gms/common/util/e;->np()J
+    invoke-interface {v5}, Lcom/google/android/gms/common/util/e;->ns()J
 
     move-result-wide v5
 
     div-long/2addr v5, v2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Log and bundle processed. event, size, time_ms"
 
-    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v7, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v7
 
-    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -1011,27 +1011,27 @@
     move-exception v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, p1}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -1065,11 +1065,11 @@
 
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     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/zzv;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     const/4 v1, 0x1
 
@@ -1093,7 +1093,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fe;->e(Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/jf;->g(Lcom/google/android/gms/measurement/internal/zzm;)Ljava/lang/String;
 
@@ -1121,9 +1121,9 @@
 
     invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/fe;->e(Ljava/lang/String;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -1156,13 +1156,13 @@
     move-exception p1
 
     :goto_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to get conditional user properties"
 
@@ -1178,7 +1178,7 @@
 .method public final d(Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 2
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const/4 v1, 0x0
 
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 adb15bce23..934e4d5bde 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
@@ -19,26 +19,26 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGu:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzm;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ff;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ff;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ff;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ff;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ff;->anq:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,31 +55,31 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ff;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ff;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ff;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ff;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ff;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ff;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->d(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/fg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fg.smali
index 3053765dd1..1fe7d657de 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fg;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fg;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,33 +30,33 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jf;->co(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzm;
 
@@ -70,15 +70,15 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fg;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fg;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/jf;->co(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzm;
 
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 0132e54f94..2419dbd905 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
@@ -19,26 +19,26 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGu:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzm;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fh;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fh;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fh;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fh;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fh;->anq:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,31 +55,31 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fh;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fh;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fh;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fh;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fh;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fh;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->e(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/fi.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fi.smali
index b74dc32e84..4c1eeb53ee 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fi.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fi.smali
@@ -19,26 +19,26 @@
 
 
 # instance fields
-.field private final synthetic aGu:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fi;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fi;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fi;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fi;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fi;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fi;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fi;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fi;->anq:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,29 +55,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fi;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fi;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fi;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fi;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fi;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fi;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fi;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->d(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/fj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fj.smali
index be2806692e..5031697aec 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fj;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fj;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fj;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fj;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,21 +30,21 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fj;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fj;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fj;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/zzm;)V
 
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 193f37f495..5b65d07edf 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
@@ -19,26 +19,26 @@
 
 
 # instance fields
-.field private final synthetic aGu:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fk;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fk;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fk;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fk;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fk;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fk;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fk;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fk;->anq:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -55,29 +55,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGu:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fk;->aGD:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fk;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fk;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fk;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fk;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fk;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/fk;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->e(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/fl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fl.smali
index 069d0e20e7..06b6376d75 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fl;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fl;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fl;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fl;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fl;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fl;->ane:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,23 +34,23 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fl;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fl;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fl;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fl;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fl;->ane:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fm.smali
index 44c8e8a15d..6b3d7273f6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fm.smali
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGy:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzan;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fm;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fm;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,13 +34,13 @@
 .method public final run()V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fm;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fm;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v4, "_cmp"
 
@@ -52,13 +52,13 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v3}, Landroid/os/Bundle;->size()I
 
@@ -69,7 +69,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     const-string v5, "_cis"
 
@@ -100,13 +100,13 @@
     if-eqz v3, :cond_2
 
     :cond_1
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/ka;->cN(Ljava/lang/String;)Z
 
@@ -120,13 +120,13 @@
     :goto_0
     if-eqz v4, :cond_3
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fe;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/fe;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzan;->toString()Ljava/lang/String;
 
@@ -138,9 +138,9 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     iget-wide v8, v1, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -156,21 +156,21 @@
     move-object v0, v1
 
     :goto_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fm;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fm;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v1, v0, v2}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/zzan;Lcom/google/android/gms/measurement/internal/zzm;)V
 
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 ea6d899c98..3888aafda9 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGy:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzkj;
+.field private final synthetic aGI:Lcom/google/android/gms/measurement/internal/zzkj;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGz:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fn;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fn;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,46 +34,46 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGz:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGz:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fn;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGz:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fn;->aGI:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fn;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
 
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 8be5563df3..3810b0162e 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
@@ -17,22 +17,22 @@
 
 
 # instance fields
-.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fo;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fo;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fo;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fo;->ane:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,29 +49,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fo;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIg:Lcom/google/android/gms/measurement/internal/hg;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Lcom/google/android/gms/measurement/internal/hg;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIg:Lcom/google/android/gms/measurement/internal/hg;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Lcom/google/android/gms/measurement/internal/hg;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fo;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fo;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fo;->ane:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/hg;->a(Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)[B
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fp.smali
index 56ab5858d6..a72d1e9c28 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fp.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fp;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fp;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fp;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fp;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,21 +30,21 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fp;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fp;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fp;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzm;)V
 
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 cdbd2ac1a5..e207012ff8 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
@@ -19,18 +19,18 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGr:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fq;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,27 +47,27 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGr:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fq;->aGA:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/d;->ce(Ljava/lang/String;)Ljava/util/List;
 
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 e207ede93c..69fa501ce8 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGv:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aGx:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic aGy:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Lcom/google/android/gms/measurement/internal/zzv;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fr;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fr;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,48 +34,48 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzv;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGx:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fr;->aGG:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGv:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fr;->aGE:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fr;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/zzv;Lcom/google/android/gms/measurement/internal/zzm;)V
 
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 ab8618188e..8206c6b530 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final synthetic aGA:Lcom/google/android/gms/measurement/internal/fe;
+.field private final synthetic aGJ:Lcom/google/android/gms/measurement/internal/fe;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 .field private final synthetic zzd:J
 
@@ -22,13 +22,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/fe;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fs;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fs;->aGJ:Lcom/google/android/gms/measurement/internal/fe;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fs;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/fs;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fs;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/fs;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fs;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/fs;->anq:Ljava/lang/String;
 
     iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/fs;->zzd:J
 
@@ -42,23 +42,23 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->atS:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGJ:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fs;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/fs;->ane:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -69,25 +69,25 @@
     :cond_0
     new-instance v1, Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->anh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->anq:Ljava/lang/String;
 
     iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/fs;->zzd:J
 
     invoke-direct {v1, v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/hi;-><init>(Ljava/lang/String;Ljava/lang/String;J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGA:Lcom/google/android/gms/measurement/internal/fe;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fs;->aGJ:Lcom/google/android/gms/measurement/internal/fe;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/fe;->a(Lcom/google/android/gms/measurement/internal/fe;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/fs;->ane:Ljava/lang/String;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/hh;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/hi;)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 b8e728a923..2b6957f46d 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
@@ -13,23 +13,23 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fu;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ft;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGd:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGd:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/ey;->aGm:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract pO()Z
+.method protected abstract pR()Z
 .end method
 
-.method final va()Z
+.method final vd()Z
     .locals 1
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ft;->zza:Z
@@ -46,10 +46,10 @@
     return v0
 .end method
 
-.method protected final xB()V
+.method protected final xE()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->va()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
 
     move-result v0
 
@@ -67,22 +67,22 @@
     throw v0
 .end method
 
-.method public final xC()V
+.method public final xF()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ft;->zza:Z
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->pO()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->pR()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
 
     const/4 v0, 0x1
 
@@ -101,24 +101,24 @@
     throw v0
 .end method
 
-.method protected xS()V
+.method protected xV()V
     .locals 0
 
     return-void
 .end method
 
-.method public final ys()V
+.method public final yv()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ft;->zza:Z
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xS()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xV()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ft;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yq()V
 
     const/4 v0, 0x1
 
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 69aabe490a..5d5a31e92e 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field protected final aGB:Lcom/google/android/gms/measurement/internal/ey;
+.field protected final aGK:Lcom/google/android/gms/measurement/internal/ey;
 
 
 # direct methods
@@ -18,155 +18,155 @@
 
     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/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public rx()V
+.method public rA()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
 
     return-void
 .end method
 
-.method public vn()V
+.method public vA()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    return-object v0
+.end method
+
+.method public vq()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     return-void
 .end method
 
-.method public vo()Lcom/google/android/gms/measurement/internal/i;
+.method public vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vp()Lcom/google/android/gms/common/util/e;
+.method public vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vq()Landroid/content/Context;
+.method public vt()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
-
-    return-object v0
-.end method
-
-.method public vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/fu;->aGB:Lcom/google/android/gms/measurement/internal/ey;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
     return-object v0
 .end method
@@ -174,7 +174,7 @@
 .method public zza()V
     .locals 0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yp()V
 
     return-void
 .end method
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 dd7ef0ebfd..02b61089ed 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
@@ -4,17 +4,17 @@
 
 
 # virtual methods
-.method public abstract vp()Lcom/google/android/gms/common/util/e;
+.method public abstract vA()Lcom/google/android/gms/measurement/internal/jz;
 .end method
 
-.method public abstract vq()Landroid/content/Context;
+.method public abstract vs()Lcom/google/android/gms/common/util/e;
 .end method
 
-.method public abstract vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public abstract vt()Landroid/content/Context;
 .end method
 
-.method public abstract vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public abstract vw()Lcom/google/android/gms/measurement/internal/ev;
 .end method
 
-.method public abstract vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public abstract vx()Lcom/google/android/gms/measurement/internal/dv;
 .end method
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 b3d2e2e1a5..bec6a323e6 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
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final aBM:[Ljava/lang/String;
+.field public static final aBV:[Ljava/lang/String;
 
-.field public static final aGC:[Ljava/lang/String;
+.field public static final aGL:[Ljava/lang/String;
 
 
 # direct methods
@@ -347,7 +347,7 @@
 
     aput-object v17, v1, v16
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGC:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fx;->aGL:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -653,7 +653,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBM:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fx;->aBV:[Ljava/lang/String;
 
     return-void
 .end method
@@ -661,9 +661,9 @@
 .method public static bZ(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aGC:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fx;->aGL:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aBM:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fx;->aBV:[Ljava/lang/String;
 
     invoke-static {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/hf;->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/fy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/fy.smali
index 133635e8cb..eba5733da1 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
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final aBM:[Ljava/lang/String;
+.field public static final aBV:[Ljava/lang/String;
 
-.field public static final aGC:[Ljava/lang/String;
+.field public static final aGL:[Ljava/lang/String;
 
 
 # direct methods
@@ -197,7 +197,7 @@
 
     aput-object v17, v1, v16
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGC:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -353,7 +353,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBM:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/fy;->aBV:[Ljava/lang/String;
 
     return-void
 .end method
@@ -361,9 +361,9 @@
 .method public static cp(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aGC:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aBM:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aBV:[Ljava/lang/String;
 
     invoke-static {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/hf;->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/g.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/g.smali
index 2497b3f87e..10e972a65f 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
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static volatile aBX:Landroid/os/Handler;
+.field private static volatile aCg:Landroid/os/Handler;
 
 
 # instance fields
-.field private final aBW:Lcom/google/android/gms/measurement/internal/fw;
+.field private final aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-.field private final aBY:Ljava/lang/Runnable;
+.field private final aCh:Ljava/lang/Runnable;
 
 .field private volatile zzd:J
 
@@ -23,13 +23,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/g;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/g;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/j;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/j;-><init>(Lcom/google/android/gms/measurement/internal/g;Lcom/google/android/gms/measurement/internal/fw;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aBY:Ljava/lang/Runnable;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aCh:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -44,14 +44,14 @@
     return-wide v0
 .end method
 
-.method private final vk()Landroid/os/Handler;
+.method private final vn()Landroid/os/Handler;
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aBX:Landroid/os/Handler;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aBX:Landroid/os/Handler;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
 
     return-object v0
 
@@ -61,15 +61,15 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aBX:Landroid/os/Handler;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
 
     if-nez v1, :cond_1
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/hs;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/g;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v2}, Lcom/google/android/gms/measurement/internal/fw;->vq()Landroid/content/Context;
+    invoke-interface {v2}, Lcom/google/android/gms/measurement/internal/fw;->vt()Landroid/content/Context;
 
     move-result-object v2
 
@@ -79,10 +79,10 @@
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/internal/measurement/hs;-><init>(Landroid/os/Looper;)V
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/g;->aBX:Landroid/os/Handler;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
 
     :cond_1
-    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aBX:Landroid/os/Handler;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/g;->aCg:Landroid/os/Handler;
 
     monitor-exit v0
 
@@ -103,7 +103,7 @@
 .method public final T(J)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
     const-wide/16 v0, 0x0
 
@@ -111,9 +111,9 @@
 
     if-ltz v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -123,11 +123,11 @@
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/g;->zzd:J
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/g;->vk()Landroid/os/Handler;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/g;->vn()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aBY:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aCh:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1, p1, p2}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
 
@@ -135,13 +135,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/g;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -155,18 +155,18 @@
     return-void
 .end method
 
-.method final rx()V
+.method final rA()V
     .locals 2
 
     const-wide/16 v0, 0x0
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/g;->zzd:J
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/g;->vk()Landroid/os/Handler;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/g;->vn()Landroid/os/Handler;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aBY:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/g;->aCh:Ljava/lang/Runnable;
 
     invoke-virtual {v0, v1}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
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 497d3a94bc..a34eb8f72c 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
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field public static final aBM:[Ljava/lang/String;
+.field public static final aBV:[Ljava/lang/String;
 
-.field public static final aGC:[Ljava/lang/String;
+.field public static final aGL:[Ljava/lang/String;
 
 
 # direct methods
@@ -101,7 +101,7 @@
 
     aput-object v16, v1, v15
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGC:[Ljava/lang/String;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/lang/String;
 
@@ -161,7 +161,7 @@
 
     aput-object v1, v0, v15
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBM:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ga;->aBV:[Ljava/lang/String;
 
     return-void
 .end method
@@ -169,9 +169,9 @@
 .method public static bZ(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aGC:[Ljava/lang/String;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aBM:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aBV:[Ljava/lang/String;
 
     invoke-static {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/hf;->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/gb.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gb.smali
index 5ac85be18d..9e74a203d2 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
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field aCb:Ljava/lang/Boolean;
+.field aCk:Ljava/lang/Boolean;
 
-.field final aGD:Landroid/content/Context;
+.field final aGM:Landroid/content/Context;
 
-.field aGE:Lcom/google/android/gms/internal/measurement/zzv;
+.field aGN:Lcom/google/android/gms/internal/measurement/zzv;
 
-.field amV:Ljava/lang/String;
+.field ane:Ljava/lang/String;
 
-.field anh:Ljava/lang/String;
+.field anq:Ljava/lang/String;
 
 .field zzd:Ljava/lang/String;
 
@@ -39,37 +39,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/gb;->aGD:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aGM:Landroid/content/Context;
 
     if-eqz p2, :cond_0
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gb;->aGE:Lcom/google/android/gms/internal/measurement/zzv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gb;->aGN:Lcom/google/android/gms/internal/measurement/zzv;
 
     iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->zzf:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->amV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->ane:Ljava/lang/String;
 
     iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->zze:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->anh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->anq:Ljava/lang/String;
 
     iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->zzd:Ljava/lang/String;
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->zzd:Ljava/lang/String;
 
-    iget-boolean p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->asy:Z
+    iget-boolean p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->asH:Z
 
     iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gb;->zzh:Z
 
-    iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/zzv;->anq:J
+    iget-wide v1, p2, Lcom/google/android/gms/internal/measurement/zzv;->anz:J
 
     iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/gb;->zzf:J
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azw:Landroid/os/Bundle;
+    iget-object p1, p2, Lcom/google/android/gms/internal/measurement/zzv;->azF:Landroid/os/Bundle;
 
     const-string p2, "dataCollectionDefaultEnabled"
 
@@ -81,7 +81,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aCb:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gb;->aCk:Ljava/lang/Boolean;
 
     :cond_0
     return-void
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 5900d8b0f2..17add65ffb 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
@@ -7,26 +7,26 @@
 
 
 # instance fields
-.field private final synthetic aGF:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aGG:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGP:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lv;Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGH:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gc;->aGG:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gc;->aGP:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gc;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gc;->anq:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,19 +38,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gc;->aGH:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gc;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGG:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gc;->aGP:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gc;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gc;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/internal/measurement/lv;Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)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 a1c406e236..b600f57e80 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aGI:Lcom/google/android/gms/measurement/internal/gf;
+.field private final aGR:Lcom/google/android/gms/measurement/internal/gf;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ge;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ge;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     return-void
 .end method
@@ -26,27 +26,27 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ge;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ge;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFp:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Deferred Deep Link already retrieved. Not fetching again."
 
@@ -55,21 +55,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFq:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFq:Lcom/google/android/gms/measurement/internal/ei;
 
     const-wide/16 v4, 0x1
 
@@ -83,21 +83,21 @@
 
     if-ltz v5, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Permanently failed to retrieve Deferred Deep Link. Reached maximum retries."
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFp:Lcom/google/android/gms/measurement/internal/ej;
 
     const/4 v1, 0x1
 
@@ -106,9 +106,9 @@
     return-void
 
     :cond_1
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->lB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->lE()V
 
     return-void
 .end method
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 be4f984ac3..1584bdcaf5 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field protected aGJ:Lcom/google/android/gms/measurement/internal/gw;
+.field protected aGS:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private aGK:Lcom/google/android/gms/measurement/internal/fz;
+.field private aGT:Lcom/google/android/gms/measurement/internal/fz;
 
-.field private final aGL:Ljava/util/Set;
+.field private final aGU:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -18,7 +18,7 @@
     .end annotation
 .end field
 
-.field private final aGM:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final aGV:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field protected atx:Z
+.field protected atG:Z
 
 .field private zze:Z
 
@@ -43,17 +43,17 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/CopyOnWriteArraySet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGL:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGU:Ljava/util/Set;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gf;->atx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/gf;->atG: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/gf;->aGM:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGV:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/gf;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/gf;->lH()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/gf;->lK()V
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     const-string v1, "app_id"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -105,19 +105,19 @@
 
     move-object/from16 v5, p0
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v6
 
     if-nez v6, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Conditional property not sent since collection is disabled"
 
@@ -151,7 +151,7 @@
     invoke-direct/range {v6 .. v11}, Lcom/google/android/gms/measurement/internal/zzkj;-><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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v13
 
@@ -181,7 +181,7 @@
 
     move-result-object v17
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v18
 
@@ -211,7 +211,7 @@
 
     move-result-object v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v18
 
@@ -287,7 +287,7 @@
 
     invoke-direct/range {v6 .. v20}, Lcom/google/android/gms/measurement/internal/zzv;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzkj;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzan;JLcom/google/android/gms/measurement/internal/zzan;JLcom/google/android/gms/measurement/internal/zzan;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
@@ -300,15 +300,15 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/gf;Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -318,13 +318,13 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/eh;->L(Z)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/gf;->lH()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/gf;->lK()V
 
     return-void
 .end method
@@ -336,7 +336,7 @@
 
     move-result-object v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v11
 
@@ -370,7 +370,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/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -406,9 +406,9 @@
 
     const-string v3, "app_id"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -422,19 +422,19 @@
 
     move-object/from16 v5, p0
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v6
 
     if-nez v6, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Conditional property not cleared since collection is disabled"
 
@@ -460,7 +460,7 @@
     invoke-direct/range {v6 .. v11}, Lcom/google/android/gms/measurement/internal/zzkj;-><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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v13
 
@@ -544,7 +544,7 @@
 
     invoke-direct/range {v6 .. v20}, Lcom/google/android/gms/measurement/internal/zzv;-><init>(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzkj;JZLjava/lang/String;Lcom/google/android/gms/measurement/internal/zzan;JLcom/google/android/gms/measurement/internal/zzan;JLcom/google/android/gms/measurement/internal/zzan;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
@@ -554,22 +554,22 @@
     return-void
 .end method
 
-.method private final lH()V
+.method private final lK()V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDu:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDD:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -577,15 +577,15 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object v0
 
@@ -601,7 +601,7 @@
 
     const/4 v5, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -640,7 +640,7 @@
 
     move-result-object v5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -658,48 +658,48 @@
 
     :cond_2
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gf;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Recording app launch after enabling measurement for the first time (FE)"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gf;->yt()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/gf;->yw()V
 
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Updating Scion state (FE)"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ys()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yv()V
 
     return-void
 .end method
@@ -709,9 +709,9 @@
 .method public final L(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -745,11 +745,11 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Package name should be null when calling setConditionalUserProperty"
 
@@ -766,13 +766,13 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/fz;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
 
     if-eq p1, v0, :cond_1
 
@@ -791,7 +791,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/gf;->aGK:Lcom/google/android/gms/measurement/internal/fz;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
 
     return-void
 .end method
@@ -799,11 +799,11 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/gd;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()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/gf;->aGL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGU:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -811,11 +811,11 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "OnEventListener already registered"
 
@@ -828,11 +828,11 @@
 .method final a(Ljava/lang/String;Ljava/lang/String;JLandroid/os/Bundle;)V
     .locals 11
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     move-object v10, p0
 
-    iget-object v0, v10, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v0, v10, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
 
     if-eqz v0, :cond_1
 
@@ -898,23 +898,23 @@
 
     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/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
     if-nez v0, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Event not sent since app measurement is disabled"
 
@@ -923,19 +923,19 @@
     return-void
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -943,11 +943,11 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aEl:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ds;->aEu:Ljava/util/List;
 
     if-eqz v0, :cond_1
 
@@ -957,11 +957,11 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Dropping non-safelisted event. event name, origin"
 
@@ -983,7 +983,7 @@
     iput-boolean v9, v7, Lcom/google/android/gms/measurement/internal/gf;->zze:Z
 
     :try_start_0
-    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ey;->zzf:Z
     :try_end_0
@@ -994,7 +994,7 @@
     if-nez v0, :cond_2
 
     :try_start_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1031,7 +1031,7 @@
 
     new-array v1, v9, [Ljava/lang/Object;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v2
 
@@ -1048,11 +1048,11 @@
     move-exception v0
 
     :try_start_3
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to invoke Tag Manager\'s initialize() method"
 
@@ -1063,11 +1063,11 @@
     goto :goto_1
 
     :catch_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Tag Manager is not found and thus will not be used"
 
@@ -1075,19 +1075,19 @@
 
     :cond_3
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDQ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1115,7 +1115,7 @@
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -1140,7 +1140,7 @@
 
     if-eqz p8, :cond_9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v3, "_iap"
 
@@ -1150,9 +1150,9 @@
 
     if-nez v3, :cond_9
 
-    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -1170,7 +1170,7 @@
     goto :goto_3
 
     :cond_5
-    sget-object v5, Lcom/google/android/gms/measurement/internal/fy;->aGC:[Ljava/lang/String;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
 
     invoke-virtual {v3, v4, v5, v15}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -1197,13 +1197,13 @@
     :goto_3
     if-eqz v3, :cond_9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -1215,9 +1215,9 @@
 
     invoke-virtual {v2, v5, v4}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v2, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {v15, v1, v9}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -1237,9 +1237,9 @@
     const/4 v2, 0x0
 
     :goto_4
-    iget-object v4, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v4
 
@@ -1248,13 +1248,13 @@
     return-void
 
     :cond_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/hh;->yx()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v3
 
@@ -1268,7 +1268,7 @@
 
     if-nez v5, :cond_a
 
-    iput-boolean v9, v3, Lcom/google/android/gms/measurement/internal/hi;->awV:Z
+    iput-boolean v9, v3, Lcom/google/android/gms/measurement/internal/hi;->axe:Z
 
     :cond_a
     if-eqz p6, :cond_b
@@ -1297,7 +1297,7 @@
 
     if-eqz p6, :cond_c
 
-    iget-object v6, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v6, v7, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
 
     if-eqz v6, :cond_c
 
@@ -1305,13 +1305,13 @@
 
     if-nez v17, :cond_c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v1
 
@@ -1319,7 +1319,7 @@
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
@@ -1331,7 +1331,7 @@
 
     invoke-virtual {v0, v3, v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v1, v7, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
 
     move-object/from16 v2, p1
 
@@ -1346,9 +1346,9 @@
     return-void
 
     :cond_c
-    iget-object v5, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
 
     move-result v5
 
@@ -1357,7 +1357,7 @@
     return-void
 
     :cond_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v5
 
@@ -1367,13 +1367,13 @@
 
     if-eqz v5, :cond_f
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
@@ -1385,7 +1385,7 @@
 
     invoke-virtual {v2, v4, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {v15, v1, v9}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -1405,9 +1405,9 @@
     const/4 v2, 0x0
 
     :goto_6
-    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v7, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -1444,7 +1444,7 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
@@ -1534,7 +1534,7 @@
     move-object v14, v10
 
     :goto_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
@@ -1550,13 +1550,13 @@
 
     if-eqz v1, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hh;->yx()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v1
 
@@ -1568,15 +1568,15 @@
 
     if-eqz v1, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
     move-object v6, v5
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->ub()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/it;->ue()J
 
     move-result-wide v4
 
@@ -1584,7 +1584,7 @@
 
     if-lez v1, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
@@ -1599,11 +1599,11 @@
     :goto_a
     invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->zzb()Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v4}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1627,7 +1627,7 @@
 
     if-eqz v1, :cond_17
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
@@ -1653,13 +1653,13 @@
     move-result-object v4
 
     :goto_b
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object v5
 
@@ -1669,11 +1669,11 @@
 
     if-eqz v5, :cond_16
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Not logging duplicate session_start_with_rollout event"
 
@@ -1684,11 +1684,11 @@
     goto :goto_c
 
     :cond_16
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v1, v4}, Lcom/google/android/gms/measurement/internal/ek;->aL(Ljava/lang/String;)V
 
@@ -1706,17 +1706,17 @@
 
     if-eqz v1, :cond_18
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1737,11 +1737,11 @@
 
     invoke-interface {v11, v15}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->yP()Ljava/security/SecureRandom;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
 
     move-result-object v1
 
@@ -1749,19 +1749,19 @@
 
     move-result-wide v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v18
 
-    invoke-virtual/range {v18 .. v18}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual/range {v18 .. v18}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v9
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDl:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDu:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v9, v10}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1769,13 +1769,13 @@
 
     if-eqz v1, :cond_1b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v9
 
@@ -1785,7 +1785,7 @@
 
     if-lez v1, :cond_1b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
@@ -1795,41 +1795,41 @@
 
     if-eqz v1, :cond_1b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFf:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFo:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
 
     move-result v1
 
     if-eqz v1, :cond_1b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Current session is expired, remove the session number, ID, and engagement time"
 
     invoke-virtual {v1, v9}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v9
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v9
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDh:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDq:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v9, v10}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1839,7 +1839,7 @@
 
     const/4 v9, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1875,19 +1875,19 @@
     move-object v10, v6
 
     :goto_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDi:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDr:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1897,7 +1897,7 @@
 
     const/4 v4, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1916,19 +1916,19 @@
     :cond_1a
     invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->zzb()Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDJ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDS:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1938,7 +1938,7 @@
 
     const/4 v4, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1963,15 +1963,15 @@
 
     :cond_1c
     :goto_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1995,11 +1995,11 @@
 
     if-nez v5, :cond_1d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "EXTEND_SESSION param attached: initiate a new session or extend the current active session"
 
@@ -2009,13 +2009,13 @@
 
     move-object/from16 v6, p2
 
-    iget-object v1, v5, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v5, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xY()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
     move-wide/from16 v3, p3
 
@@ -2068,7 +2068,7 @@
 
     move-result-object v18
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-object/from16 p5, v1
 
@@ -2099,7 +2099,7 @@
 
     invoke-static {v14, v9, v15}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hi;Landroid/os/Bundle;Z)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v19
 
@@ -2315,7 +2315,7 @@
 
     if-eqz p7, :cond_24
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -2326,13 +2326,13 @@
     :cond_24
     move-object v9, v1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
@@ -2340,7 +2340,7 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2372,7 +2372,7 @@
 
     invoke-direct/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/zzan;-><init>(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzam;Ljava/lang/String;J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v1
 
@@ -2382,7 +2382,7 @@
 
     if-nez v17, :cond_25
 
-    iget-object v1, v13, Lcom/google/android/gms/measurement/internal/gf;->aGL:Ljava/util/Set;
+    iget-object v1, v13, Lcom/google/android/gms/measurement/internal/gf;->aGU:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -2433,13 +2433,13 @@
 
     move-object v14, v6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yx()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v0
 
@@ -2453,7 +2453,7 @@
 
     if-eqz v0, :cond_27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
@@ -2498,7 +2498,7 @@
 
     if-eqz p5, :cond_3
 
-    iget-object v2, v9, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v2, v9, Lcom/google/android/gms/measurement/internal/gf;->aGT:Lcom/google/android/gms/measurement/internal/fz;
 
     if-eqz v2, :cond_3
 
@@ -2544,23 +2544,23 @@
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDu:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDD:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2620,11 +2620,11 @@
 
     move-result-object p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
 
     move-object v4, p2
 
@@ -2650,11 +2650,11 @@
     :cond_2
     if-nez p3, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFj:Lcom/google/android/gms/measurement/internal/ek;
 
     const-string v0, "unset"
 
@@ -2673,19 +2673,19 @@
     move-object v6, p3
 
     :goto_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result p2
 
     if-nez p2, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "User property not set since app measurement is disabled"
 
@@ -2694,9 +2694,9 @@
     return-void
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
 
     move-result p2
 
@@ -2705,13 +2705,13 @@
     return-void
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p3
 
@@ -2733,7 +2733,7 @@
 
     invoke-direct/range {v2 .. v7}, Lcom/google/android/gms/measurement/internal/zzkj;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object p1
 
@@ -2760,7 +2760,7 @@
 
     if-eqz p4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p1
 
@@ -2771,7 +2771,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p4
 
@@ -2786,7 +2786,7 @@
     goto :goto_0
 
     :cond_2
-    sget-object v4, Lcom/google/android/gms/measurement/internal/ga;->aGC:[Ljava/lang/String;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
 
     invoke-virtual {p4, v3, v4, p2}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -2817,7 +2817,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -2830,9 +2830,9 @@
     move-result v0
 
     :cond_5
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
@@ -2843,7 +2843,7 @@
     :cond_6
     if-eqz p3, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p1
 
@@ -2853,7 +2853,7 @@
 
     if-eqz p1, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {p2, v2, v3}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;IZ)Ljava/lang/String;
 
@@ -2877,9 +2877,9 @@
     move-result v0
 
     :cond_8
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p3
 
@@ -2888,7 +2888,7 @@
     return-void
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {p2, p3}, Lcom/google/android/gms/measurement/internal/jm;->t(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -2924,7 +2924,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/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2964,7 +2964,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/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
@@ -2980,7 +2980,7 @@
 .method final aL(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGM:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGV:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
@@ -3003,21 +3003,21 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uF()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uI()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Cannot get user properties from analytics worker thread"
 
@@ -3030,17 +3030,17 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Cannot get user properties from main thread"
 
@@ -3060,9 +3060,9 @@
     monitor-enter v7
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v8
 
@@ -3102,11 +3102,11 @@
     move-exception p1
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Interrupted waiting for get user properties"
 
@@ -3125,11 +3125,11 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Timed out waiting for handle get user properties"
 
@@ -3167,9 +3167,9 @@
 
     check-cast p3, Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object p4, p3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p4, p3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object p3
 
@@ -3318,7 +3318,7 @@
 
     move-result-object p3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -3328,13 +3328,13 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p3
 
@@ -3349,7 +3349,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
@@ -3359,13 +3359,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
@@ -3380,7 +3380,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {p2, p3}, Lcom/google/android/gms/measurement/internal/jm;->t(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3388,13 +3388,13 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
@@ -3438,13 +3438,13 @@
     if-gez p3, :cond_4
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p3
 
@@ -3478,7 +3478,7 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p2
 
@@ -3492,13 +3492,13 @@
 
     :cond_6
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p3
 
@@ -3520,11 +3520,11 @@
 .method public final b(Lcom/google/android/gms/measurement/internal/gd;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()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/gf;->aGL:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGU:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
 
@@ -3532,11 +3532,11 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "OnEventListener had not been registered"
 
@@ -3549,7 +3549,7 @@
 .method public final b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -3577,7 +3577,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/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -3603,9 +3603,9 @@
 .method final c(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -3651,11 +3651,11 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uF()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ev;->uI()Z
 
     move-result v0
 
@@ -3663,11 +3663,11 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Cannot get conditional user properties from analytics worker thread"
 
@@ -3680,17 +3680,17 @@
     return-object p1
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Cannot get conditional user properties from main thread"
 
@@ -3710,9 +3710,9 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -3750,11 +3750,11 @@
     move-exception p2
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Interrupted waiting for get conditional user properties"
 
@@ -3773,11 +3773,11 @@
 
     if-nez p2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Timed out waiting for get conditional user properties"
 
@@ -3807,28 +3807,28 @@
     throw p1
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
 
     return-void
 .end method
 
-.method public final uC()Ljava/lang/String;
+.method public final uF()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     return-object v0
 
@@ -3838,7 +3838,17 @@
     return-object v0
 .end method
 
-.method protected final va()Z
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vd()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -3846,118 +3856,108 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final xC()V
+.method public final xF()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -3969,7 +3969,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -3979,7 +3979,7 @@
 
     check-cast v0, Landroid/app/Application;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGJ:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGS:Lcom/google/android/gms/measurement/internal/gw;
 
     invoke-virtual {v0, v1}, Landroid/app/Application;->unregisterActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
 
@@ -3987,10 +3987,10 @@
     return-void
 .end method
 
-.method public final xH()Ljava/lang/String;
+.method public final xK()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGM:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGV:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -4001,86 +4001,86 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final yt()V
+.method public final yw()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
 
     move-result v0
 
@@ -4089,21 +4089,21 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDX:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4113,11 +4113,11 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v2, "google_analytics_deferred_deep_link_enabled"
 
@@ -4143,17 +4143,17 @@
     :goto_0
     if-eqz v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Deferred Deep Link feature enabled."
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -4164,19 +4164,19 @@
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ev;->f(Ljava/lang/Runnable;)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yp()V
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gf;->atx:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->nl()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->no()Ljava/lang/String;
 
     move-result-object v0
 
@@ -4186,11 +4186,11 @@
 
     if-nez v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     sget-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -4218,20 +4218,20 @@
     return-void
 .end method
 
-.method public final yu()Ljava/lang/String;
+.method public final yx()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
     return-object v0
 
@@ -4241,24 +4241,24 @@
     return-object v0
 .end method
 
-.method public final yv()Ljava/lang/String;
+.method public final yy()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     return-object v0
 
     :cond_0
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mB()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/e;->mE()Ljava/lang/String;
 
     move-result-object v0
     :try_end_0
@@ -4269,13 +4269,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "getGoogleAppId failed with exception"
 
@@ -4297,9 +4297,9 @@
 .method public final zza(Z)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
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 90345397d9..183bd24058 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
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final synthetic aBL:J
+.field private final synthetic aBU:J
 
-.field private final synthetic aGN:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGW:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic asD:Landroid/os/Bundle;
+.field private final synthetic asM:Landroid/os/Bundle;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 .field private final synthetic zze:Z
 
@@ -30,15 +30,15 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;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/gg;->aGN:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gg;->aGW:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gg;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gg;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gg;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gg;->ane:Ljava/lang/String;
 
-    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/gg;->aBL:J
+    iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/gg;->aBU:J
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/gg;->asD:Landroid/os/Bundle;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/gg;->asM:Landroid/os/Bundle;
 
     iput-boolean p7, p0, Lcom/google/android/gms/measurement/internal/gg;->zze:Z
 
@@ -60,15 +60,15 @@
 .method public final run()V
     .locals 10
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gg;->aGN:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gg;->aGW:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gg;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gg;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gg;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gg;->ane:Ljava/lang/String;
 
-    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/gg;->aBL:J
+    iget-wide v3, p0, Lcom/google/android/gms/measurement/internal/gg;->aBU:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gg;->asD:Landroid/os/Bundle;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/gg;->asM:Landroid/os/Bundle;
 
     iget-boolean v6, p0, Lcom/google/android/gms/measurement/internal/gg;->zze:Z
 
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 cca261a7e5..af4dbc0cad 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gh;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gh;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gh;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gh;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,30 +30,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gh;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gh;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gh;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCX:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDg:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -68,7 +68,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gh;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -79,7 +79,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gh;->aze: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/gi.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gi.smali
index 417ae63e5f..45e9f41616 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
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final synthetic aGP:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGY:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 .field private final synthetic zzc:Ljava/lang/Object;
 
@@ -22,11 +22,11 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gi;->aGP:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gi;->aGY:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gi;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gi;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gi;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gi;->ane:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gi;->zzc:Ljava/lang/Object;
 
@@ -42,11 +42,11 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aGP:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gi;->aGY:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gi;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gi;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gi;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gi;->ane:Ljava/lang/String;
 
     iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gi;->zzc:Ljava/lang/Object;
 
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 9617542904..bc2f19f172 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic anp:J
+.field private final synthetic any:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gj;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gj;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gj;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gj;->any:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,53 +30,53 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gj;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gj;->any:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Resetting analytics data (FE)"
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/it;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
     const-wide/16 v4, 0x0
 
-    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iget-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iget-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anq:J
+    iput-wide v4, v3, Lcom/google/android/gms/measurement/internal/it;->anz:J
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v4
 
@@ -86,22 +86,22 @@
 
     if-eqz v3, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aES:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFb:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v3, v1, v2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object v1
 
@@ -111,34 +111,34 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
     const/4 v2, 0x0
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ek;->aL(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->ro()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ka;->rr()Z
 
     move-result v2
 
     if-nez v2, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
@@ -147,19 +147,19 @@
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/eh;->N(Z)V
 
     :cond_2
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yy()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yB()V
 
     xor-int/lit8 v1, v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/gf;->atx:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/gf;->atG:Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gj;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
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 198edf344e..c1f6849c63 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aCi:Landroid/os/Bundle;
+.field private final synthetic aCr:Landroid/os/Bundle;
 
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gk;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gk;->aCi:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gk;->aCr:Landroid/os/Bundle;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gk;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gk;->aCi:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gk;->aCr:Landroid/os/Bundle;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/gf;->a(Lcom/google/android/gms/measurement/internal/gf;Landroid/os/Bundle;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gl.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gl.smali
index 66b2e59848..d5992ec029 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gl.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gl.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic aGQ:Lcom/google/android/gms/measurement/internal/fz;
+.field private final synthetic aGZ:Lcom/google/android/gms/measurement/internal/fz;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Lcom/google/android/gms/measurement/internal/fz;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gl;->aGQ:Lcom/google/android/gms/measurement/internal/fz;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gl;->aGZ:Lcom/google/android/gms/measurement/internal/fz;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gl;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gl;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGQ:Lcom/google/android/gms/measurement/internal/fz;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gl;->aGZ:Lcom/google/android/gms/measurement/internal/fz;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/gf;->a(Lcom/google/android/gms/measurement/internal/fz;)V
 
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 fe3d81e9e7..62e4d227ea 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final synthetic aGP:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGY:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -22,13 +22,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;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/gm;->aGP:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gm;->aGY:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gm;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gm;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gm;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gm;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gm;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gm;->anq:Ljava/lang/String;
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/gm;->zzd:Ljava/lang/String;
 
@@ -42,19 +42,19 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gm;->aGP:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gm;->aGY:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gm;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gm;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gm;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gm;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gm;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gm;->anq:Ljava/lang/String;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gm;->zzd:Ljava/lang/String;
 
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 35b0fd6e35..418619998b 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aCi:Landroid/os/Bundle;
+.field private final synthetic aCr:Landroid/os/Bundle;
 
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Landroid/os/Bundle;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gn;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gn;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gn;->aCi:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gn;->aCr:Landroid/os/Bundle;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gn;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gn;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gn;->aCi:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gn;->aCr:Landroid/os/Bundle;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/gf;->b(Lcom/google/android/gms/measurement/internal/gf;Landroid/os/Bundle;)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 93bb03cebc..e648598d6c 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final synthetic aGR:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aHa:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -24,13 +24,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;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/go;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/go;->aHa:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/go;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/go;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/go;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/go;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/go;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/go;->anq:Ljava/lang/String;
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/go;->zzd:Ljava/lang/String;
 
@@ -46,19 +46,19 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aGR:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/go;->aHa:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/go;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/go;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/go;->ane:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/go;->anh:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/go;->anq:Ljava/lang/String;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/go;->zzd:Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gp.smali
index 19bb236ddf..340b52935e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gp.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gp;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gp;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gp;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gp;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,30 +30,30 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gp;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gp;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gp;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gp;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCY:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDh:Lcom/google/android/gms/measurement/internal/do;
 
     if-nez v3, :cond_0
 
@@ -68,9 +68,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v5, v4, Lcom/google/android/gms/measurement/internal/do;->atJ:Ljava/lang/String;
+    iget-object v5, v4, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
 
     invoke-interface {v2, v3, v5}, Lcom/google/android/gms/measurement/internal/kc;->I(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -88,7 +88,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gp;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -99,7 +99,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gp;->aze: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/gq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gq.smali
index 7068898ed1..c6ebe618e6 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gq;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gq;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gq;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gq;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,30 +30,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gq;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gq;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gq;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gq;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDa:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDj:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -68,7 +68,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gq;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -79,7 +79,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gq;->aze: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/gr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gr.smali
index e1cd32239f..bbc4f04d95 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gr;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gr;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,30 +30,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gr;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gr;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gr;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCZ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDi:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)J
 
@@ -68,7 +68,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gr;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -79,7 +79,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gr;->aze: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/gs.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gs.smali
index 482a22b948..0cd800f1a9 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
 .field private final synthetic zza:Z
 
@@ -16,7 +16,7 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gs;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gs;->zza:Z
 
@@ -30,7 +30,7 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gs;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gs;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
     iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gs;->zza:Z
 
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 33ca2cdb15..e2b001fbca 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Ljava/util/concurrent/atomic/AtomicReference;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gt;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gt;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/gt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,30 +30,30 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gt;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gt;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDb:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDk:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->c(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)D
 
@@ -68,7 +68,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gt;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -79,7 +79,7 @@
     :catchall_0
     move-exception v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gt;->aze: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/gu.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gu.smali
index df5498f17d..cdba7ecee4 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic anp:J
+.field private final synthetic any:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gu;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gu;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gu;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gu;->any:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,27 +30,27 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->any:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gu;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gu;->any: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/gv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gv.smali
index 8d8ab469ac..60dc0c70a7 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
 .field private final synthetic zza:Z
 
@@ -16,7 +16,7 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gv;->zza:Z
 
@@ -30,25 +30,25 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yk()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yn()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/gv;->zza:Z
 
@@ -58,15 +58,15 @@
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gv;->zza:Z
 
@@ -79,44 +79,44 @@
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v1
 
     if-eq v1, v0, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yk()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yn()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_2
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/gf;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/gv;->zza:Z
 
@@ -133,7 +133,7 @@
     invoke-virtual {v1, v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gv;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/gf;->a(Lcom/google/android/gms/measurement/internal/gf;)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 3bbbb44331..809ef638ce 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
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final synthetic aGI:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGR:Lcom/google/android/gms/measurement/internal/gf;
 
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/gf;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -47,13 +47,13 @@
     move-object/from16 v2, p4
 
     :try_start_0
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDQ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -76,13 +76,13 @@
     if-nez v3, :cond_1
 
     :try_start_1
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aDS:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v11}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -90,13 +90,13 @@
 
     if-nez v3, :cond_1
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aDR:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v11}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -114,9 +114,9 @@
 
     :cond_1
     :goto_1
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -153,11 +153,11 @@
 
     if-nez v11, :cond_3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
@@ -217,9 +217,9 @@
     if-eqz p1, :cond_7
 
     :try_start_2
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v14
 
@@ -235,13 +235,13 @@
 
     invoke-virtual {v14, v6, v15}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDQ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v15}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -282,7 +282,7 @@
     invoke-virtual {v14, v6, v9}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_6
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-virtual {v6, v0, v13, v14}, Lcom/google/android/gms/measurement/internal/gf;->b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
@@ -293,13 +293,13 @@
 
     :cond_8
     :goto_4
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDS:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -312,13 +312,13 @@
     if-eqz v6, :cond_a
 
     :try_start_3
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDR:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v15}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -343,7 +343,7 @@
     if-nez v6, :cond_a
 
     :cond_9
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     const-string v14, "_lgclid"
 
@@ -363,25 +363,25 @@
     return-void
 
     :cond_b
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v14, "Activity created with referrer"
 
     invoke-virtual {v6, v14, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDR:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v14}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -396,27 +396,27 @@
     if-eqz v3, :cond_c
 
     :try_start_4
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-virtual {v2, v0, v13, v3}, Lcom/google/android/gms/measurement/internal/gf;->b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     goto :goto_5
 
     :cond_c
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Referrer does not contain valid parameters"
 
     invoke-virtual {v0, v3, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_5
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     const/4 v2, 0x0
 
@@ -474,13 +474,13 @@
     :goto_6
     if-nez v11, :cond_10
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v0, v4}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
@@ -493,7 +493,7 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
     invoke-virtual {v0, v9, v14, v2}, Lcom/google/android/gms/measurement/internal/gf;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V
     :try_end_4
@@ -505,13 +505,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Throwable caught in handleReferrerForOnActivityCreated"
 
@@ -526,13 +526,13 @@
     .locals 8
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "onActivityCreated"
 
@@ -547,9 +547,9 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -574,9 +574,9 @@
     goto :goto_3
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jm;->c(Landroid/content/Intent;)Z
 
@@ -616,7 +616,7 @@
     :goto_1
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->zzb()Z
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDT:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEc:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v1, 0x0
 
@@ -632,9 +632,9 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -657,9 +657,9 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -669,9 +669,9 @@
 
     :cond_5
     :goto_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -688,13 +688,13 @@
     move-exception v0
 
     :try_start_2
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Throwable caught in onActivityCreated"
 
@@ -702,9 +702,9 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -713,9 +713,9 @@
     return-void
 
     :goto_4
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v1
 
@@ -727,9 +727,9 @@
 .method public final onActivityDestroyed(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -743,9 +743,9 @@
 .method public final onActivityPaused(Landroid/app/Activity;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -753,15 +753,15 @@
 
     move-result-object p1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -771,21 +771,21 @@
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ev;->f(Ljava/lang/Runnable;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -803,7 +803,7 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->zzb()Z
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDo:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDx:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v1, 0x0
 
@@ -819,17 +819,17 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->xC()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->xF()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -838,21 +838,21 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/hh;->f(Landroid/app/Activity;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/in;->xC()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/in;->xF()V
 
     return-void
 .end method
@@ -860,9 +860,9 @@
 .method public final onActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGI:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gw;->aGR:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
@@ -882,19 +882,19 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/hi;->aBU: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/hi;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/hi;->atS: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/hi;->amV:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
     const-string v1, "referrer_name"
 
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 c23c808851..5b43cfcfe6 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGO:Lcom/google/android/gms/measurement/internal/gf;
+.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-.field private final synthetic anp:J
+.field private final synthetic any:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gf;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gx;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gx;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gx;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/gx;->any:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,27 +30,27 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFh:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->any:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aGO:Lcom/google/android/gms/measurement/internal/gf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gx;->aGX:Lcom/google/android/gms/measurement/internal/gf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/gx;->any: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/gy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/gy.smali
index 0060478488..54c959ed0d 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
@@ -60,17 +60,17 @@
 .method public abstract cz(Ljava/lang/String;)V
 .end method
 
-.method public abstract pL()Ljava/lang/String;
+.method public abstract pO()Ljava/lang/String;
 .end method
 
-.method public abstract qw()Ljava/lang/String;
+.method public abstract qA()J
 .end method
 
-.method public abstract qx()J
+.method public abstract qz()Ljava/lang/String;
 .end method
 
-.method public abstract rA()Ljava/lang/String;
+.method public abstract rD()Ljava/lang/String;
 .end method
 
-.method public abstract uc()Ljava/lang/String;
+.method public abstract uf()Ljava/lang/String;
 .end method
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 8f095cc412..32837e4625 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
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final synthetic aGS:Lcom/google/android/gms/measurement/internal/gw;
+.field private final synthetic aHb:Lcom/google/android/gms/measurement/internal/gw;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic atK:Landroid/net/Uri;
+.field private final synthetic atT:Landroid/net/Uri;
 
 .field private final synthetic zza:Z
 
@@ -22,13 +22,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/gw;ZLandroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gz;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/gz;->aHb:Lcom/google/android/gms/measurement/internal/gw;
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/gz;->zza:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gz;->atK:Landroid/net/Uri;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/gz;->atT:Landroid/net/Uri;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gz;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/gz;->anq:Ljava/lang/String;
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/gz;->zzd:Ljava/lang/String;
 
@@ -42,13 +42,13 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aGS:Lcom/google/android/gms/measurement/internal/gw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/gz;->aHb:Lcom/google/android/gms/measurement/internal/gw;
 
     iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/gz;->zza:Z
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gz;->atK:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/gz;->atT:Landroid/net/Uri;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gz;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/gz;->anq:Ljava/lang/String;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/gz;->zzd:Ljava/lang/String;
 
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 1e6bafc603..1f728a514a 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
@@ -25,7 +25,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to turn off database read permission"
 
@@ -38,7 +38,7 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to turn off database write permission"
 
@@ -53,7 +53,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to turn on database read permission for owner"
 
@@ -66,7 +66,7 @@
 
     if-nez p1, :cond_3
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p1, "Failed to turn on database write permission for owner"
 
@@ -221,7 +221,7 @@
 
     if-nez p1, :cond_5
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p4, "Table has extra columns. table, columns"
 
@@ -251,7 +251,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/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to verify columns on table that was just created"
 
@@ -334,7 +334,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error querying for table"
 
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 8a543223b9..bd601ebe13 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aGF:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hb;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hb;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hb;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hb;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,15 +30,15 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hb;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hb;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/internal/measurement/lv;)V
 
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 46b413d0d5..c21cdbd2bf 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aGT:Ljavax/net/ssl/SSLSocketFactory;
+.field final aHc:Ljavax/net/ssl/SSLSocketFactory;
 
 
 # direct methods
@@ -29,7 +29,7 @@
     const/4 p1, 0x0
 
     :goto_0
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hc;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hc;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
 
 # virtual methods
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -111,20 +111,20 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
 
     return-void
 .end method
 
-.method public final uF()Z
+.method public final uI()Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -167,108 +167,108 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ka;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
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 f44dfad794..032ea56dc7 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
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final aGU:Lcom/google/android/gms/measurement/internal/he;
+.field private final aHd:Lcom/google/android/gms/measurement/internal/he;
 
-.field private final aGV:Ljava/lang/Exception;
+.field private final aHe:Ljava/lang/Exception;
 
-.field private final anl:I
+.field private final anu:I
 
-.field private final atQ:Ljava/util/Map;
+.field private final atZ:Ljava/util/Map;
 
-.field private final aug:[B
+.field private final aup:[B
 
 
 # direct methods
@@ -24,15 +24,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hd;->aGU:Lcom/google/android/gms/measurement/internal/he;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hd;->aHd:Lcom/google/android/gms/measurement/internal/he;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/hd;->anl:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/hd;->anu:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hd;->aGV:Ljava/lang/Exception;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hd;->aHe:Ljava/lang/Exception;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hd;->aug:[B
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hd;->aup:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hd;->atQ:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hd;->atZ:Ljava/util/Map;
 
     return-void
 .end method
@@ -42,15 +42,15 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hd;->aGU:Lcom/google/android/gms/measurement/internal/he;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hd;->aHd:Lcom/google/android/gms/measurement/internal/he;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/hd;->anl:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/hd;->anu:I
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aGV:Ljava/lang/Exception;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hd;->aHe:Ljava/lang/Exception;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aug:[B
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hd;->aup:[B
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/he;->aGW:Lcom/google/android/gms/measurement/internal/ha;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/he;->aHf:Lcom/google/android/gms/measurement/internal/ha;
 
     invoke-interface {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ha;->a(ILjava/lang/Throwable;[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 3b69177a46..293dc370e3 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aED:Ljava/net/URL;
+.field private final aEM:Ljava/net/URL;
 
-.field final aGW:Lcom/google/android/gms/measurement/internal/ha;
+.field final aHf:Lcom/google/android/gms/measurement/internal/ha;
 
-.field private final synthetic aGX:Lcom/google/android/gms/measurement/internal/hc;
+.field private final synthetic aHg:Lcom/google/android/gms/measurement/internal/hc;
 
-.field private final atQ:Ljava/util/Map;
+.field private final atZ:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->aGX:Lcom/google/android/gms/measurement/internal/hc;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->aHg:Lcom/google/android/gms/measurement/internal/hc;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,17 +52,17 @@
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/he;->aED:Ljava/net/URL;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/he;->aEM:Ljava/net/URL;
 
     const/4 p1, 0x0
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->zzb:[B
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/he;->aGW:Lcom/google/android/gms/measurement/internal/ha;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/he;->aHf:Lcom/google/android/gms/measurement/internal/ha;
 
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/he;->zzd:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->atQ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/he;->atZ:Ljava/util/Map;
 
     return-void
 .end method
@@ -82,9 +82,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aGX:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aHg:Lcom/google/android/gms/measurement/internal/hc;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -114,18 +114,18 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aGX:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/he;->aHg:Lcom/google/android/gms/measurement/internal/hc;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
 
     const/4 v0, 0x0
 
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/he;->aGX:Lcom/google/android/gms/measurement/internal/hc;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/he;->aHg:Lcom/google/android/gms/measurement/internal/hc;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->aED:Ljava/net/URL;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->aEM:Ljava/net/URL;
 
     invoke-virtual {v3}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
 
@@ -135,7 +135,7 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/hc;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/hc;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     if-eqz v4, :cond_0
 
@@ -147,7 +147,7 @@
 
     check-cast v4, Ljavax/net/ssl/HttpsURLConnection;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hc;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hc;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v4, v2}, Ljavax/net/ssl/HttpsURLConnection;->setSSLSocketFactory(Ljavax/net/ssl/SSLSocketFactory;)V
 
@@ -176,11 +176,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atQ:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atZ:Ljava/util/Map;
 
     if-eqz v3, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atQ:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/he;->atZ: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/hg.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hg.smali
index e893e81202..f4783d8639 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
@@ -12,7 +12,7 @@
     return-void
 .end method
 
-.method private static yw()Ljava/lang/String;
+.method private static yz()Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/SecurityException;
@@ -37,19 +37,19 @@
 
     const-string v2, "_r"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->ym()V
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ey;->yp()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;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDy:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDH:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v12, v4}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -59,11 +59,11 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Generating ScionPayload disabled. packageName"
 
@@ -74,7 +74,7 @@
     return-object v0
 
     :cond_0
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v5, "_iap"
 
@@ -86,7 +86,7 @@
 
     if-nez v3, :cond_1
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v5, "_iapx"
 
@@ -96,13 +96,13 @@
 
     if-nez v3, :cond_1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v3, "Generating a payload for this event is not available. package_name, event_name"
 
@@ -111,18 +111,18 @@
     return-object v13
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qH()Lcom/google/android/gms/internal/measurement/ak$f$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qK()Lcom/google/android/gms/internal/measurement/ak$f$a;
 
     move-result-object v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
@@ -132,11 +132,11 @@
 
     if-nez v15, :cond_2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Log and bundle not available. package_name"
 
@@ -146,27 +146,27 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-object v0
 
     :cond_2
     :try_start_1
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->nb()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
 
     move-result v3
 
     if-nez v3, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Log and bundle disabled. package_name"
 
@@ -176,21 +176,21 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-object v0
 
     :cond_3
     :try_start_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qP()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v3
 
@@ -200,7 +200,7 @@
 
     move-result-object v11
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v3
 
@@ -210,14 +210,14 @@
 
     if-nez v3, :cond_4
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_4
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
 
     move-result-object v3
 
@@ -227,14 +227,14 @@
 
     if-nez v3, :cond_5
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_5
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v3
 
@@ -244,14 +244,14 @@
 
     if-nez v3, :cond_6
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_6
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v5
 
@@ -261,7 +261,7 @@
 
     if-eqz v3, :cond_7
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v5
 
@@ -270,7 +270,7 @@
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bA(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_7
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uk()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->un()J
 
     move-result-wide v5
 
@@ -278,13 +278,13 @@
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
 
     move-result-wide v5
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->N(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v3
 
@@ -294,7 +294,7 @@
 
     if-nez v3, :cond_8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v3
 
@@ -303,7 +303,7 @@
     goto :goto_0
 
     :cond_8
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v3
 
@@ -313,7 +313,7 @@
 
     if-nez v3, :cond_9
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v3
 
@@ -321,31 +321,31 @@
 
     :cond_9
     :goto_0
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->rW()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
 
     move-result-wide v5
 
     invoke-virtual {v11, v5, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->K(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/hg;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/hg;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v3
 
     if-eqz v3, :cond_a
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uZ()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->vc()Z
 
     move-result v3
 
     if-eqz v3, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v3
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v5
 
@@ -355,7 +355,7 @@
 
     if-eqz v3, :cond_a
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     invoke-static {v13}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -363,14 +363,14 @@
 
     if-nez v3, :cond_a
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qY()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->rb()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v5
 
@@ -378,7 +378,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xG()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v5
 
@@ -403,7 +403,7 @@
 
     invoke-static {v5, v6}, Ljava/lang/Long;->toString(J)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/hg;->yw()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/hg;->yz()Ljava/lang/String;
 
     move-result-object v5
 
@@ -432,11 +432,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Resettable device id encryption failed"
 
@@ -450,22 +450,22 @@
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-object v0
 
     :cond_b
     :goto_1
     :try_start_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     sget-object v3, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
@@ -473,11 +473,11 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     sget-object v5, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -485,11 +485,11 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->qy()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->qB()J
 
     move-result-wide v5
 
@@ -499,11 +499,11 @@
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->vl()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/i;->vo()Ljava/lang/String;
 
     move-result-object v5
 
@@ -512,13 +512,13 @@
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :try_start_6
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uc()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uf()Ljava/lang/String;
 
     iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->toString(J)Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/hg;->yw()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/hg;->yz()Ljava/lang/String;
 
     move-result-object v3
 
@@ -528,7 +528,7 @@
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v3
 
@@ -538,18 +538,18 @@
 
     if-nez v3, :cond_c
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v3
 
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_c
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
@@ -576,7 +576,7 @@
 
     const-string v8, "_lte"
 
-    iget-object v9, v7, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v9, v7, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v8, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -594,7 +594,7 @@
 
     if-eqz v7, :cond_f
 
-    iget-object v6, v7, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v6, v7, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     if-nez v6, :cond_10
 
@@ -605,7 +605,7 @@
 
     const-string v19, "_lte"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v7
 
@@ -625,18 +625,18 @@
 
     invoke-interface {v5, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
     invoke-virtual {v7, v6}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/jn;)Z
 
     :cond_10
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v6
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v3, v7}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -646,41 +646,41 @@
 
     if-eqz v3, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Checking account type status for ad personalization signals"
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/i;->uG()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/i;->uJ()Z
 
     move-result v8
 
     if-eqz v8, :cond_13
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xG()Z
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v9
 
     if-eqz v9, :cond_13
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xU()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v9
 
@@ -690,11 +690,11 @@
 
     if-eqz v9, :cond_13
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v10, "Turning off ad personalization due to account type"
 
@@ -719,7 +719,7 @@
 
     const-string v4, "_npa"
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v4, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -744,7 +744,7 @@
 
     const-string v19, "_npa"
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -780,7 +780,7 @@
 
     if-ge v4, v8, :cond_14
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rp()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     move-result-object v8
 
@@ -790,7 +790,7 @@
 
     check-cast v9, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/internal/measurement/ak$k$a;->bV(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$k$a;
 
@@ -808,7 +808,7 @@
 
     move-result-object v8
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v9
 
@@ -818,11 +818,11 @@
 
     check-cast v10, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v9, v8, v10}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$k$a;Ljava/lang/Object;)V
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v8
 
@@ -843,9 +843,9 @@
 
     invoke-virtual {v11, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->c(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v9
 
@@ -853,11 +853,11 @@
 
     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/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Marking in-app purchase as real-time"
 
@@ -867,15 +867,15 @@
 
     const-string v3, "_o"
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anq: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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
@@ -885,7 +885,7 @@
 
     if-eqz v3, :cond_15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -897,7 +897,7 @@
 
     invoke-virtual {v3, v9, v4, v5}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -908,11 +908,11 @@
     invoke-virtual {v3, v9, v2, v4}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_15
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, v12, v3}, Lcom/google/android/gms/measurement/internal/d;->J(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/k;
 
@@ -922,7 +922,7 @@
 
     new-instance v16, Lcom/google/android/gms/measurement/internal/k;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-wide/16 v5, 0x0
 
@@ -964,7 +964,7 @@
     move-wide/from16 v16, v3
 
     :goto_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
@@ -972,11 +972,11 @@
 
     new-instance v10, Lcom/google/android/gms/measurement/internal/l;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/hg;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/hg;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
-    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v6, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -996,17 +996,17 @@
 
     invoke-direct/range {v2 .. v11}, Lcom/google/android/gms/measurement/internal/l;-><init>(Lcom/google/android/gms/measurement/internal/ey;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJLandroid/os/Bundle;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     move-result-object v2
 
-    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide v3, v1, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/internal/measurement/ak$c$a;->z(J)Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/internal/measurement/ak$c$a;->bD(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$c$a;
 
@@ -1018,7 +1018,7 @@
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->iterator()Ljava/util/Iterator;
 
@@ -1037,7 +1037,7 @@
 
     check-cast v4, Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v5
 
@@ -1045,13 +1045,13 @@
 
     move-result-object v5
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v6, v4}, Lcom/google/android/gms/measurement/internal/zzam;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v6
 
@@ -1066,21 +1066,21 @@
 
     move-result-object v1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h;->ra()Lcom/google/android/gms/internal/measurement/ak$h$b;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$h;->rd()Lcom/google/android/gms/internal/measurement/ak$h$b;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qz()Lcom/google/android/gms/internal/measurement/ak$d$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$d;->qC()Lcom/google/android/gms/internal/measurement/ak$d$a;
 
     move-result-object v4
 
-    iget-wide v5, v13, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v5, v13, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/internal/measurement/ak$d$a;->B(J)Lcom/google/android/gms/internal/measurement/ak$d$a;
 
     move-result-object v4
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v4, v0}, Lcom/google/android/gms/internal/measurement/ak$d$a;->bE(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$d$a;
 
@@ -1092,11 +1092,11 @@
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->a(Lcom/google/android/gms/internal/measurement/ak$h$b;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xP()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xS()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1104,11 +1104,11 @@
 
     move-result-object v3
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qR()Ljava/util/List;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qU()Ljava/util/List;
 
     move-result-object v4
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v5
 
@@ -1122,13 +1122,13 @@
 
     invoke-virtual {v12, v0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->d(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qd()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qg()Z
 
     move-result v0
 
     if-eqz v0, :cond_18
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v0
 
@@ -1136,14 +1136,14 @@
 
     move-result-object v0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->F(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_18
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ug()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v0
 
@@ -1154,7 +1154,7 @@
     invoke-virtual {v12, v0, v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->H(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_19
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uf()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
 
     move-result-wide v2
 
@@ -1175,9 +1175,9 @@
 
     :cond_1b
     :goto_8
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->uY()V
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->vb()V
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fb;->sc()J
 
     move-result-wide v0
 
@@ -1187,7 +1187,7 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     const-wide/16 v1, 0x471a
 
@@ -1195,7 +1195,7 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1213,44 +1213,44 @@
 
     invoke-virtual {v14, v12}, Lcom/google/android/gms/internal/measurement/ak$f$a;->a(Lcom/google/android/gms/internal/measurement/ak$g$a;)Lcom/google/android/gms/internal/measurement/ak$f$a;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()J
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qB()J
 
     move-result-wide v0
 
     invoke-virtual {v15, v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->T(J)V
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()J
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qV()J
 
     move-result-wide v0
 
     invoke-virtual {v15, v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->U(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     invoke-virtual {v0, v15}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/fb;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     :try_start_8
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -1258,7 +1258,7 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ak$f;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v1
 
@@ -1273,11 +1273,11 @@
     :catch_1
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1295,11 +1295,11 @@
     move-exception v0
 
     :try_start_9
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "app instance id encryption failed"
 
@@ -1315,22 +1315,22 @@
     :try_end_9
     .catchall {:try_start_9 .. :try_end_9} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-object v0
 
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     goto :goto_a
 
@@ -1341,7 +1341,7 @@
     goto :goto_9
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
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 efe6610ea5..89d40c6064 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field protected aGY:Lcom/google/android/gms/measurement/internal/hi;
+.field protected aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-.field volatile aGZ:Lcom/google/android/gms/measurement/internal/hi;
+.field volatile aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-.field aHa:Lcom/google/android/gms/measurement/internal/hi;
+.field aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private aHb:Lcom/google/android/gms/measurement/internal/hi;
+.field private aHk:Lcom/google/android/gms/measurement/internal/hi;
 
 .field final zzd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
@@ -44,25 +44,25 @@
 .method private final a(Landroid/app/Activity;Lcom/google/android/gms/measurement/internal/hi;Z)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     :goto_0
-    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
     if-nez v1, :cond_1
 
     new-instance v1, Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -76,20 +76,20 @@
 
     move-result-object p1
 
-    iget-wide v3, p2, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iget-wide v3, p2, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
     invoke-direct {v1, v2, p1, v3, v4}, Lcom/google/android/gms/measurement/internal/hi;-><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/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
@@ -105,25 +105,25 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/hh;Lcom/google/android/gms/measurement/internal/hi;Z)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/z;->T(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object p0
 
-    iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/hi;->awV:Z
+    iget-boolean v0, p1, Lcom/google/android/gms/measurement/internal/hi;->axe:Z
 
     invoke-virtual {p0, v0, p2}, Lcom/google/android/gms/measurement/internal/in;->c(ZZ)Z
 
@@ -133,7 +133,7 @@
 
     const/4 p0, 0x0
 
-    iput-boolean p0, p1, Lcom/google/android/gms/measurement/internal/hi;->awV:Z
+    iput-boolean p0, p1, Lcom/google/android/gms/measurement/internal/hi;->axe:Z
 
     :cond_0
     return-void
@@ -161,11 +161,11 @@
     if-eqz p2, :cond_2
 
     :cond_0
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     invoke-virtual {p1, v1, p2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
@@ -175,11 +175,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/hi;->amV:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->ane: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/hi;->aBL:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
     invoke-virtual {p1, v0, v1, v2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
@@ -298,15 +298,15 @@
 .method public final a(Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "setCurrentScreen cannot be called while no activity active"
 
@@ -323,11 +323,11 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "setCurrentScreen must be called with an activity in the activity lifecycle"
 
@@ -351,17 +351,17 @@
     move-result-object p3
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hi;->ane: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/hh;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hh;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     invoke-static {v1, p2}, Lcom/google/android/gms/measurement/internal/jm;->V(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -371,11 +371,11 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "setCurrentScreen cannot be called with the same class and name"
 
@@ -401,11 +401,11 @@
     if-le v1, v0, :cond_5
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p2}, Ljava/lang/String;->length()I
 
@@ -437,11 +437,11 @@
     if-le v1, v0, :cond_7
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p3}, Ljava/lang/String;->length()I
 
@@ -458,11 +458,11 @@
     return-void
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     if-nez p2, :cond_8
 
@@ -480,11 +480,11 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->qS()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
 
     move-result-wide v1
 
@@ -504,7 +504,7 @@
 .method public final a(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/hi;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     monitor-enter p0
 
@@ -526,7 +526,7 @@
     :cond_0
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hh;->zzf:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aHb:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hh;->aHk:Lcom/google/android/gms/measurement/internal/hi;
 
     :cond_1
     monitor-exit p0
@@ -574,11 +574,11 @@
 
     const/4 v2, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jm;->qS()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jm;->qV()J
 
     move-result-wide v3
 
@@ -605,19 +605,19 @@
 
     invoke-direct {p0, p1, v0, v1}, Lcom/google/android/gms/measurement/internal/hh;->a(Landroid/app/Activity;Lcom/google/android/gms/measurement/internal/hi;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -630,15 +630,25 @@
     return-void
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
 
     return-void
 .end method
 
-.method protected final va()Z
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vd()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -646,192 +656,182 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
+.method public final yA()Lcom/google/android/gms/measurement/internal/hi;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    move-result-object v0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    return-object v0
-.end method
-
-.method public final yx()Lcom/google/android/gms/measurement/internal/hi;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     return-object v0
 .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 aa08cd5ab0..6c57822a24 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field public final aBL:J
+.field public final aBU:J
 
-.field public final amV:Ljava/lang/String;
+.field public final ane:Ljava/lang/String;
 
-.field public final atJ:Ljava/lang/String;
+.field public final atS:Ljava/lang/String;
 
-.field awV:Z
+.field axe:Z
 
 
 # direct methods
@@ -19,15 +19,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hi;->awV:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hi;->axe:Z
 
     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 864e5814e2..e7e2052b58 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGY:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHc:Lcom/google/android/gms/measurement/internal/hh;
+.field private final synthetic aHl:Lcom/google/android/gms/measurement/internal/hh;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hh;Lcom/google/android/gms/measurement/internal/hi;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hj;->aHc:Lcom/google/android/gms/measurement/internal/hh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hj;->aHl:Lcom/google/android/gms/measurement/internal/hh;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hj;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,21 +30,21 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aHc:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aHl:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hj;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hj;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     const/4 v2, 0x0
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hh;Lcom/google/android/gms/measurement/internal/hi;Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aHc:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hj;->aHl:Lcom/google/android/gms/measurement/internal/hh;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
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 632fc35e59..848afe72b8 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
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final synthetic aGZ:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHa:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHd:Lcom/google/android/gms/measurement/internal/hh;
+.field private final synthetic aHm:Lcom/google/android/gms/measurement/internal/hh;
 
 .field private final synthetic zza:Z
 
@@ -20,13 +20,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hh;ZLcom/google/android/gms/measurement/internal/hi;Lcom/google/android/gms/measurement/internal/hi;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hk;->zza:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,19 +38,19 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
@@ -68,9 +68,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_0
 
@@ -84,9 +84,9 @@
     :goto_0
     if-eqz v0, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-static {v3, v4, v2}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hh;Lcom/google/android/gms/measurement/internal/hi;Z)V
 
@@ -97,15 +97,15 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-static {v0, v3, v2}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hh;Lcom/google/android/gms/measurement/internal/hi;Z)V
 
@@ -114,27 +114,27 @@
 
     :cond_3
     :goto_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v3, :cond_4
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iget-wide v5, v5, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
     cmp-long v7, v3, v5
 
     if-nez v7, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
     invoke-static {v3, v4}, Lcom/google/android/gms/measurement/internal/jm;->V(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -142,13 +142,13 @@
 
     if-eqz v3, :cond_4
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     invoke-static {v3, v4}, Lcom/google/android/gms/measurement/internal/jm;->V(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -166,57 +166,57 @@
 
     invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-static {v3, v1, v2}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hi;Landroid/os/Bundle;Z)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
     if-eqz v2, :cond_7
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     if-eqz v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
     const-string v3, "_pn"
 
     invoke-virtual {v1, v3, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_6
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
     const-string v3, "_pc"
 
     invoke-virtual {v1, v3, v2}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aGZ:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHi:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iget-wide v2, v2, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
     const-string v4, "_pi"
 
     invoke-virtual {v1, v4, v2, v3}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_7
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v3
 
@@ -228,15 +228,15 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->ub()J
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/it;->ue()J
 
     move-result-wide v2
 
@@ -246,18 +246,18 @@
 
     if-lez v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;J)V
 
     :cond_8
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -268,17 +268,17 @@
     invoke-virtual {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/gf;->c(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_9
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHd:Lcom/google/android/gms/measurement/internal/hh;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hk;->aHm:Lcom/google/android/gms/measurement/internal/hh;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hh;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHa:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hk;->aHj:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/hi;)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 bf14cc41fb..587b2a04e8 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aHe:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hl;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hl;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/fw;)V
 
@@ -23,27 +23,27 @@
 .method public final zza()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hl;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yl()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Inactivity, disconnecting from the service"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lB()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->lE()V
 
     :cond_0
     return-void
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 11a3341ce2..fe01b312b0 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
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field volatile aBZ:Ljava/lang/Boolean;
+.field volatile aCi:Ljava/lang/Boolean;
 
-.field final aHf:Lcom/google/android/gms/measurement/internal/ie;
+.field final aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-.field aHg:Lcom/google/android/gms/measurement/internal/dn;
+.field aHp:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private final aHh:Lcom/google/android/gms/measurement/internal/g;
+.field private final aHq:Lcom/google/android/gms/measurement/internal/g;
 
-.field private final aHi:Lcom/google/android/gms/measurement/internal/ix;
+.field private final aHr:Lcom/google/android/gms/measurement/internal/ix;
 
-.field private final aHj:Lcom/google/android/gms/measurement/internal/g;
+.field private final aHs:Lcom/google/android/gms/measurement/internal/g;
 
-.field private final atR:Ljava/util/List;
+.field private final aua:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,35 +37,35 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atR:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ix;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/measurement/internal/ix;-><init>(Lcom/google/android/gms/common/util/e;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHi:Lcom/google/android/gms/measurement/internal/ix;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHr:Lcom/google/android/gms/measurement/internal/ix;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/ie;-><init>(Lcom/google/android/gms/measurement/internal/hm;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/hl;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/hl;-><init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/fw;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHh:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHq:Lcom/google/android/gms/measurement/internal/g;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/hv;
 
     invoke-direct {v0, p0, p1}, Lcom/google/android/gms/measurement/internal/hv;-><init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/fw;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHj:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHs:Lcom/google/android/gms/measurement/internal/g;
 
     return-void
 .end method
@@ -73,19 +73,19 @@
 .method private final P(Z)Lcom/google/android/gms/measurement/internal/zzm;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dv;->xN()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dv;->xQ()Ljava/lang/String;
 
     move-result-object p1
 
@@ -105,29 +105,29 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/hm;Landroid/content/ComponentName;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Disconnected from device MeasurementService"
 
     invoke-virtual {v0, v1, p1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yq()V
 
     :cond_0
     return-void
@@ -141,9 +141,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yl()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
 
     move-result v0
 
@@ -154,7 +154,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atR:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -168,11 +168,11 @@
 
     if-ltz v4, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Discarding data. Max runnable queue size reached"
 
@@ -181,17 +181,17 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atR:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua: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/hm;->aHj:Lcom/google/android/gms/measurement/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHs:Lcom/google/android/gms/measurement/internal/g;
 
     const-wide/32 v0, 0xea60
 
     invoke-virtual {p1, v0, v1}, Lcom/google/android/gms/measurement/internal/g;->T(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yq()V
 
     return-void
 .end method
@@ -201,9 +201,9 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -223,31 +223,31 @@
 .method public final a(Lcom/google/android/gms/internal/measurement/lv;Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yU()I
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Not bundling data. Service unavailable or out of date"
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p2
 
@@ -272,9 +272,9 @@
 .method protected final a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;Ljava/lang/String;)V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -304,9 +304,9 @@
 .method protected final a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 8
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -338,15 +338,15 @@
 .method protected final a(Lcom/google/android/gms/measurement/internal/dn;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()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/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yz()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yC()V
 
     return-void
 .end method
@@ -354,9 +354,9 @@
 .method final a(Lcom/google/android/gms/measurement/internal/dn;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -377,11 +377,11 @@
 
     invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->xD()Ljava/util/List;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/dr;->xG()Ljava/util/List;
 
     move-result-object v4
 
@@ -441,11 +441,11 @@
     :catch_0
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Failed to send event to the service"
 
@@ -470,11 +470,11 @@
     :catch_1
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Failed to send attribute to the service"
 
@@ -499,11 +499,11 @@
     :catch_2
     move-exception v7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Failed to send conditional property to the service"
 
@@ -512,11 +512,11 @@
     goto :goto_2
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Discarding data. Unrecognized parcel type."
 
@@ -538,9 +538,9 @@
 .method protected final a(Lcom/google/android/gms/measurement/internal/hi;)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ht;
 
@@ -554,11 +554,11 @@
 .method protected final a(Lcom/google/android/gms/measurement/internal/zzkj;)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
@@ -584,11 +584,11 @@
 
     if-le v1, v5, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "User property too long for local database. Sending directly to service"
 
@@ -626,9 +626,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -661,9 +661,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -708,9 +708,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x0
 
@@ -746,11 +746,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/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
@@ -774,11 +774,11 @@
 
     if-le v1, v4, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Event is too long for local database. Sending event directly to service"
 
@@ -826,17 +826,17 @@
 
     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/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Parcelable;)[B
 
@@ -848,11 +848,11 @@
 
     if-le v2, v3, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Conditional user property too long for local database. Sending directly to service"
 
@@ -899,20 +899,20 @@
     return-void
 .end method
 
-.method public final lB()V
+.method public final lE()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->isConnected()Z
 
@@ -920,32 +920,32 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->lU()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->lX()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->disconnect()V
 
     :cond_1
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     :try_start_0
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-static {v0, v2}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_0
@@ -953,20 +953,30 @@
     .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     return-void
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
 
     return-void
 .end method
 
-.method protected final va()Z
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vd()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -974,196 +984,292 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
-    .locals 1
+.method protected final yB()V
+    .locals 2
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
+
+    const/4 v0, 0x0
+
+    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/hm;->P(Z)Lcom/google/android/gms/measurement/internal/zzm;
 
     move-result-object v0
 
-    return-object v0
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xF()V
+
+    new-instance v1, Lcom/google/android/gms/measurement/internal/hp;
+
+    invoke-direct {v1, p0, v0}, Lcom/google/android/gms/measurement/internal/hp;-><init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzm;)V
+
+    invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/hm;->f(Ljava/lang/Runnable;)V
+
+    return-void
 .end method
 
-.method final yj()V
+.method final yC()V
+    .locals 4
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
+
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
+
+    invoke-interface {v1}, Ljava/util/List;->size()I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    const-string v2, "Processing queued up service tasks"
+
+    invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+    move-result-object v0
+
+    :goto_0
+    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Ljava/lang/Runnable;
+
+    :try_start_0
+    invoke-interface {v1}, Ljava/lang/Runnable;->run()V
+    :try_end_0
+    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+    goto :goto_0
+
+    :catch_0
+    move-exception v1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+
+    move-result-object v2
+
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
+
+    const-string v3, "Task exception while flushing queue"
+
+    invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
+
+    goto :goto_0
+
+    :cond_0
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aua:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->clear()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHs:Lcom/google/android/gms/measurement/internal/g;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
+
+    return-void
+.end method
+
+.method final ym()V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHi:Lcom/google/android/gms/measurement/internal/ix;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHr:Lcom/google/android/gms/measurement/internal/ix;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ix;->zza()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHh:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHq:Lcom/google/android/gms/measurement/internal/g;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDf:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v2, 0x0
 
@@ -1182,14 +1288,14 @@
     return-void
 .end method
 
-.method public final yl()Z
+.method public final yo()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-eqz v0, :cond_0
 
@@ -1203,12 +1309,12 @@
     return v0
 .end method
 
-.method protected final ym()V
+.method protected final yp()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x1
 
@@ -1216,11 +1322,11 @@
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDY:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -1228,7 +1334,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v2
 
@@ -1250,14 +1356,14 @@
     return-void
 .end method
 
-.method final yn()V
+.method final yq()V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yl()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
 
     move-result v0
 
@@ -1266,7 +1372,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
 
     const/4 v1, 0x0
 
@@ -1274,15 +1380,15 @@
 
     if-nez v0, :cond_e
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vH()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vK()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1299,13 +1405,13 @@
     goto/16 :goto_6
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xM()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xP()I
 
     move-result v0
 
@@ -1320,21 +1426,21 @@
     goto/16 :goto_5
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Checking service availability"
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yR()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->yU()I
 
     move-result v0
 
@@ -1358,11 +1464,11 @@
 
     if-eq v0, v3, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1382,11 +1488,11 @@
     goto :goto_5
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service updating"
 
@@ -1395,11 +1501,11 @@
     goto :goto_0
 
     :cond_5
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service invalid"
 
@@ -1408,11 +1514,11 @@
     goto :goto_2
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service disabled"
 
@@ -1421,21 +1527,21 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service container out of date"
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->sl()I
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jm;->so()I
 
     move-result v0
 
@@ -1446,11 +1552,11 @@
     goto :goto_4
 
     :cond_8
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vH()Ljava/lang/Boolean;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/eh;->vK()Ljava/lang/Boolean;
 
     move-result-object v0
 
@@ -1468,11 +1574,11 @@
     goto :goto_3
 
     :cond_a
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service missing"
 
@@ -1484,11 +1590,11 @@
     goto/16 :goto_1
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Service available"
 
@@ -1499,21 +1605,21 @@
     :goto_5
     if-nez v0, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
 
     move-result v4
 
     if-eqz v4, :cond_c
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "No way to upload. Consider using the full version of Analytics"
 
@@ -1524,7 +1630,7 @@
     :cond_c
     if-eqz v3, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
@@ -1536,10 +1642,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aBZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
 
     :cond_e
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1547,32 +1653,32 @@
 
     if-eqz v0, :cond_12
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v3, v0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iget-boolean v3, v0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
     if-eqz v3, :cond_f
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Connection attempt already in progress"
 
@@ -1583,19 +1689,19 @@
     return-void
 
     :cond_f
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     if-eqz v3, :cond_11
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dw;->lU()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dw;->lX()Z
 
     move-result v3
 
     if-nez v3, :cond_10
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dw;->isConnected()Z
 
@@ -1604,13 +1710,13 @@
     if-eqz v3, :cond_11
 
     :cond_10
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Already awaiting connection attempt"
 
@@ -1629,25 +1735,25 @@
 
     invoke-direct {v3, v1, v4, v0, v0}, Lcom/google/android/gms/measurement/internal/dw;-><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/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v3, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Connecting to remote service"
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->mO()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dw;->mR()V
 
     monitor-exit v0
 
@@ -1663,19 +1769,19 @@
     throw v1
 
     :cond_12
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->va()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->vd()Z
 
     move-result v0
 
     if-nez v0, :cond_16
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1687,7 +1793,7 @@
 
     invoke-direct {v3}, Landroid/content/Intent;-><init>()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v4
 
@@ -1724,11 +1830,11 @@
 
     new-instance v1, Landroid/content/ComponentName;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v4, "com.google.android.gms.measurement.AppMeasurementService"
 
@@ -1736,34 +1842,34 @@
 
     invoke-virtual {v0, v1}, Landroid/content/Intent;->setComponent(Landroid/content/ComponentName;)Landroid/content/Intent;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
     monitor-enter v1
 
     :try_start_1
-    iget-boolean v4, v1, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iget-boolean v4, v1, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
     if-eqz v4, :cond_14
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Connection attempt already in progress"
 
@@ -1774,23 +1880,23 @@
     return-void
 
     :cond_14
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Using local app measurement service"
 
     invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iput-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean v2, v1, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
     const/16 v4, 0x81
 
@@ -1810,11 +1916,11 @@
     throw v0
 
     :cond_15
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Unable to use remote or local measurement implementation. Please register the AppMeasurementService service in the app manifest"
 
@@ -1824,12 +1930,12 @@
     return-void
 .end method
 
-.method protected final ys()V
+.method protected final yv()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
     const/4 v0, 0x1
 
@@ -1846,112 +1952,6 @@
     return-void
 .end method
 
-.method protected final yy()V
-    .locals 2
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
-
-    const/4 v0, 0x0
-
-    invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/hm;->P(Z)Lcom/google/android/gms/measurement/internal/zzm;
-
-    move-result-object v0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xC()V
-
-    new-instance v1, Lcom/google/android/gms/measurement/internal/hp;
-
-    invoke-direct {v1, p0, v0}, Lcom/google/android/gms/measurement/internal/hp;-><init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzm;)V
-
-    invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/hm;->f(Ljava/lang/Runnable;)V
-
-    return-void
-.end method
-
-.method final yz()V
-    .locals 4
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
-
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hm;->atR:Ljava/util/List;
-
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v1
-
-    const-string v2, "Processing queued up service tasks"
-
-    invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atR:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
-    move-result-object v0
-
-    :goto_0
-    invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_0
-
-    invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Ljava/lang/Runnable;
-
-    :try_start_0
-    invoke-interface {v1}, Ljava/lang/Runnable;->run()V
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
-
-    move-result-object v2
-
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
-
-    const-string v3, "Task exception while flushing queue"
-
-    invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
-
-    goto :goto_0
-
-    :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->atR:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->clear()V
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hm;->aHj:Lcom/google/android/gms/measurement/internal/g;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rx()V
-
-    return-void
-.end method
-
 .method public final bridge synthetic zza()V
     .locals 0
 
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 b4c6b506e5..bf582d2f75 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
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final synthetic aHk:Lcom/google/android/gms/measurement/internal/zzkj;
+.field private final synthetic aHt:Lcom/google/android/gms/measurement/internal/zzkj;
 
-.field private final synthetic aHl:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHm:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHv:Lcom/google/android/gms/measurement/internal/hm;
 
 .field private final synthetic zza:Z
 
@@ -20,13 +20,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;ZLcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hn;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hn;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
     iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hn;->zza:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHk:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHt:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hn;->aHl:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hn;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,19 +38,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Discarding data. Failed to set user attribute"
 
@@ -59,7 +59,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hn;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
     iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hn;->zza:Z
 
@@ -70,16 +70,16 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hn;->aHk:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hn;->aHt:Lcom/google/android/gms/measurement/internal/zzkj;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHl:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hn;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/dn;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hn;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
 
     return-void
 .end method
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 a742548914..cddcd05809 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGy:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Ljava/util/concurrent/atomic/AtomicReference;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,24 +34,24 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to get app instance id"
 
@@ -61,7 +61,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -73,9 +73,9 @@
 
     :cond_0
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ho;->aGH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v1, v3}, Lcom/google/android/gms/measurement/internal/dn;->c(Lcom/google/android/gms/measurement/internal/zzm;)Ljava/lang/String;
 
@@ -83,7 +83,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/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -93,34 +93,34 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v2
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/gf;->aL(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/ek;->aL(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->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/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
@@ -137,13 +137,13 @@
     move-exception v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to get app instance id"
 
@@ -152,7 +152,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ho;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -162,7 +162,7 @@
     return-void
 
     :goto_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ho;->aze: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/hp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hp.smali
index 47674a914c..8cfb5b64de 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHo:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hp;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hp;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hp;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hp;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,19 +30,19 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to reset data on the service; null service"
 
@@ -52,7 +52,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/dn;->d(Lcom/google/android/gms/measurement/internal/zzm;)V
     :try_end_0
@@ -63,22 +63,22 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hp;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to reset data on the service"
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hp;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
 
     return-void
 .end method
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 291ccdf545..9698f1774a 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic atx:Z
+.field private final synthetic atG:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzm;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hq;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hq;->atx:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hq;->atG:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,19 +34,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Discarding data. Failed to send app launch"
 
@@ -56,34 +56,34 @@
 
     :cond_0
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/dn;->a(Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hq;->atx:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/hq;->atG:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dr;->xH()Z
 
     :cond_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hq;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hq;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/dn;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -92,13 +92,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hq;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to send app launch to the service"
 
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 5f8aece9ad..ac751bf5e4 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
@@ -7,22 +7,22 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHp:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHy:Lcom/google/android/gms/internal/measurement/lv;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzm;Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hr;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hr;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHp:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,32 +39,32 @@
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->aL(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/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHp:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;)V
 
@@ -72,7 +72,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v2, v3}, Lcom/google/android/gms/measurement/internal/dn;->c(Lcom/google/android/gms/measurement/internal/zzm;)Ljava/lang/String;
 
@@ -80,39 +80,39 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v2
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/gf;->aL(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aEU:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ek;
 
     invoke-virtual {v2, v1}, Lcom/google/android/gms/measurement/internal/ek;->aL(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->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/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHp:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;)V
 
@@ -127,38 +127,38 @@
     move-exception v2
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v3, v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(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/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHp:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHn:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hr;->aHw:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHp:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hr;->aHy:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;)V
 
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 62c7fe7e18..036ef7b720 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
@@ -7,26 +7,26 @@
 
 
 # instance fields
-.field private final synthetic aGw:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic aHm:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHq:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHz:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hs;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hs;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hs;->aHq:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -41,19 +41,19 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Discarding data. Failed to send event to service to bundle"
 
@@ -62,13 +62,13 @@
     .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/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHq:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;[B)V
 
@@ -76,28 +76,28 @@
 
     :cond_0
     :try_start_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGw:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aGF:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->ane:Ljava/lang/String;
 
     invoke-interface {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/dn;->a(Lcom/google/android/gms/measurement/internal/zzan;Ljava/lang/String;)[B
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->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/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHq:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;[B)V
 
@@ -112,13 +112,13 @@
     move-exception v1
 
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to send event to the service to bundle"
 
@@ -126,26 +126,26 @@
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHq:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;[B)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHm:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hs;->aHv:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->aHq:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hs;->aHz:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v2, v3, v0}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;[B)V
 
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 c1685fc30c..4d0c9a24fb 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGY:Lcom/google/android/gms/measurement/internal/hi;
+.field private final synthetic aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-.field private final synthetic aHo:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/hi;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ht;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,19 +30,19 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to send current screen to service"
 
@@ -52,7 +52,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
     if-nez v0, :cond_1
 
@@ -62,9 +62,9 @@
 
     const/4 v5, 0x0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -77,21 +77,21 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/hi;->aBL:J
+    iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/hi;->aBU:J
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/hi;->atJ:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/hi;->atS:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aGY:Lcom/google/android/gms/measurement/internal/hi;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHh:Lcom/google/android/gms/measurement/internal/hi;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/hi;->amV:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/hi;->ane:Ljava/lang/String;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -102,9 +102,9 @@
     invoke-interface/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/dn;->a(JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -113,13 +113,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ht;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ht;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to send current screen to the service"
 
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 a04f199587..02091b7eb4 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHo:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hu;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hu;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hu;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hu;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,19 +30,19 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to send measurementEnabled to service"
 
@@ -52,13 +52,13 @@
 
     :cond_0
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hu;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hu;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/dn;->b(Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hu;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -67,13 +67,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hu;->aHo:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hu;->aHx:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to send measurementEnabled to the service"
 
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 0ae992189c..6aa8706154 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aHe:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Lcom/google/android/gms/measurement/internal/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hv;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hv;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/fw;)V
 
@@ -23,13 +23,13 @@
 .method public final zza()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hv;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Tasks have been queued for a long time"
 
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 01a1c0c36e..45eadb91e5 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
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final synthetic aHr:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aHA:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHt:Lcom/google/android/gms/measurement/internal/zzv;
+.field private final synthetic aHC:Lcom/google/android/gms/measurement/internal/zzv;
 
-.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic atx:Z
+.field private final synthetic atG:Z
 
 .field private final synthetic zza:Z
 
@@ -24,19 +24,19 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;ZLcom/google/android/gms/measurement/internal/zzv;Lcom/google/android/gms/measurement/internal/zzm;Lcom/google/android/gms/measurement/internal/zzv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
     const/4 p1, 0x1
 
     iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hw;->zza:Z
 
-    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hw;->atx:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/measurement/internal/hw;->atG:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHr:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hw;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hw;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hw;->aHt:Lcom/google/android/gms/measurement/internal/zzv;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hw;->aHC:Lcom/google/android/gms/measurement/internal/zzv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -48,19 +48,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Discarding data. Failed to send conditional user property to service"
 
@@ -73,9 +73,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hw;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hw;->atG:Z
 
     if-eqz v2, :cond_1
 
@@ -84,10 +84,10 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHr:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hw;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/dn;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzm;)V
 
@@ -95,9 +95,9 @@
 
     :cond_2
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHt:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHC:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -105,16 +105,16 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHr:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hw;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dn;->a(Lcom/google/android/gms/measurement/internal/zzv;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHr:Lcom/google/android/gms/measurement/internal/zzv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHA:Lcom/google/android/gms/measurement/internal/zzv;
 
     invoke-interface {v0, v1}, Lcom/google/android/gms/measurement/internal/dn;->b(Lcom/google/android/gms/measurement/internal/zzv;)V
     :try_end_0
@@ -125,22 +125,22 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to send conditional user property to the service"
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hw;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
 
     return-void
 .end method
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 b0656ac47d..a871b83918 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHv:Lcom/google/android/gms/measurement/internal/zzan;
+.field private final synthetic aHE:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field private final synthetic atx:Z
+.field private final synthetic atG:Z
 
 .field private final synthetic zza:Z
 
@@ -24,17 +24,17 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;ZZLcom/google/android/gms/measurement/internal/zzan;Lcom/google/android/gms/measurement/internal/zzm;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
     const/4 p1, 0x1
 
     iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/hx;->zza:Z
 
-    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hx;->atx:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/measurement/internal/hx;->atG:Z
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hx;->aHv:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hx;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hx;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hx;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
     iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hx;->zze:Ljava/lang/String;
 
@@ -48,19 +48,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Discarding data. Failed to send event to service"
 
@@ -73,9 +73,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hx;->atx:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/hx;->atG:Z
 
     if-eqz v2, :cond_1
 
@@ -84,10 +84,10 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHv:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
 
     :goto_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v1, v0, v2, v3}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/dn;Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;Lcom/google/android/gms/measurement/internal/zzm;)V
 
@@ -103,26 +103,26 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHv:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/dn;->a(Lcom/google/android/gms/measurement/internal/zzan;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     goto :goto_1
 
     :cond_3
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHv:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHE:Lcom/google/android/gms/measurement/internal/zzan;
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hx;->zze:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dv;->xN()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/dv;->xQ()Ljava/lang/String;
 
     move-result-object v3
 
@@ -135,22 +135,22 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to send event to the service"
 
     invoke-virtual {v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hx;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->ym()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hy.smali
index 611fce8bb4..bbbe72ab8d 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/hy.smali
@@ -7,30 +7,30 @@
 
 
 # instance fields
-.field private final synthetic aHl:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHF:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aHw:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHx:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzm;Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hy;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hy;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hy;->aHl:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hy;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHw:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,36 +49,36 @@
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/dx;->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/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHw:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/util/ArrayList;)V
 
@@ -86,11 +86,11 @@
 
     :cond_0
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHl:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->aHu:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dn;->a(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzm;)Ljava/util/List;
 
@@ -100,20 +100,20 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->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/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHw:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/util/ArrayList;)V
 
@@ -128,42 +128,42 @@
     move-exception v2
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->atJ:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hy;->atS:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->amV:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hy;->ane:Ljava/lang/String;
 
     invoke-virtual {v3, v0, v4, v5, v2}, Lcom/google/android/gms/measurement/internal/dx;->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/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHw:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/util/ArrayList;)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHx:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hy;->aHG:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHw:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hy;->aHF:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/util/ArrayList;)V
 
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 b4ff8374ac..eb949ea4bf 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
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHy:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHH:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -24,17 +24,17 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hz;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hz;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/hz;->zzd:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hz;->aHy:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/hz;->aHH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,40 +46,40 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to get conditional properties"
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anh:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->zzd:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -91,7 +91,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -103,7 +103,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -111,13 +111,13 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->zzd:Ljava/lang/String;
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->aHy:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->aHH:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v1, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dn;->a(Ljava/lang/String;Ljava/lang/String;Lcom/google/android/gms/measurement/internal/zzm;)Ljava/util/List;
 
@@ -128,11 +128,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anh:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->zzd:Ljava/lang/String;
 
@@ -143,15 +143,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/hz;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->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/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
@@ -168,27 +168,27 @@
     move-exception v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to get conditional properties"
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/hz;->ane:Ljava/lang/String;
 
     invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->anh:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/hz;->anq:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v5, v1}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -199,7 +199,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/hz;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -209,7 +209,7 @@
     return-void
 
     :goto_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/hz;->aze: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/i.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/i.smali
index ee4219e373..933ed6a978 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/i.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/i.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private aBZ:Ljava/lang/Boolean;
+.field private aCi:Ljava/lang/Boolean;
 
-.field private aCa:Landroid/accounts/AccountManager;
+.field private aCj:Landroid/accounts/AccountManager;
 
-.field private aCb:Ljava/lang/Boolean;
+.field private aCk:Ljava/lang/Boolean;
 
-.field private amV:Ljava/lang/String;
+.field private ane:Ljava/lang/String;
 
-.field private anp:J
+.field private any:J
 
 .field zzf:J
 
@@ -31,15 +31,15 @@
 .method public final C(Landroid/content/Context;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCi:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aBZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCi:Ljava/lang/Boolean;
 
     :try_start_0
     invoke-virtual {p1}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
@@ -56,13 +56,13 @@
 
     sget-object p1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/i;->aBZ:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/i;->aCi: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/i;->aBZ:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/i;->aCi:Ljava/lang/Boolean;
 
     invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -71,7 +71,7 @@
     return p1
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 4
 
     invoke-static {}, Ljava/util/Calendar;->getInstance()Ljava/util/Calendar;
@@ -102,7 +102,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->any:J
 
     invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
 
@@ -164,39 +164,39 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->amV:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->ane:Ljava/lang/String;
 
     const/4 v0, 0x0
 
     return v0
 .end method
 
-.method public final qy()J
+.method public final qB()J
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/i;->any:J
 
     return-wide v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
 
     return-void
 .end method
 
-.method final uG()Z
+.method final uJ()Z
     .locals 9
 
     const-string v0, "com.google"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -216,10 +216,10 @@
 
     if-lez v8, :cond_0
 
-    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iput-object v5, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     if-eqz v3, :cond_1
 
@@ -230,7 +230,7 @@
     return v0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v3
 
@@ -244,11 +244,11 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEv:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEE:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Permission error checking for dasher/unicorn accounts"
 
@@ -258,16 +258,16 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     return v4
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCa:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCj:Landroid/accounts/AccountManager;
 
     if-nez v3, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v3
 
@@ -275,11 +275,11 @@
 
     move-result-object v3
 
-    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCa:Landroid/accounts/AccountManager;
+    iput-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCj:Landroid/accounts/AccountManager;
 
     :cond_3
     :try_start_0
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCa:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCj:Landroid/accounts/AccountManager;
 
     const/4 v6, 0x1
 
@@ -307,14 +307,14 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/i;->zzf:J
 
     return v6
 
     :cond_4
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCa:Landroid/accounts/AccountManager;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/i;->aCj:Landroid/accounts/AccountManager;
 
     new-array v7, v6, [Ljava/lang/String;
 
@@ -340,7 +340,7 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     iput-wide v1, p0, Lcom/google/android/gms/measurement/internal/i;->zzf:J
     :try_end_0
@@ -364,11 +364,11 @@
     move-exception v0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEs:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEB:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Exception checking account types"
 
@@ -379,29 +379,39 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     return v4
 .end method
 
-.method public final vl()Ljava/lang/String;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->amV:Ljava/lang/String;
+    move-result-object v0
 
     return-object v0
 .end method
 
-.method final vm()V
+.method public final vo()Ljava/lang/String;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->ane:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method final vp()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCb:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/i;->aCk:Ljava/lang/Boolean;
 
     const-wide/16 v0, 0x0
 
@@ -410,108 +420,98 @@
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ka;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
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 559de93e0a..d68a2f566d 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
@@ -7,34 +7,34 @@
 
 
 # instance fields
-.field private final synthetic aHs:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHu:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic aHz:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aHI:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic asy:Z
+.field private final synthetic asH:Z
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzm;Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ia;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ia;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ia;->ane:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/ia;->asy:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/measurement/internal/ia;->asH:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ia;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ia;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -53,36 +53,36 @@
     invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v2, :cond_0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v0, v3, v4}, Lcom/google/android/gms/measurement/internal/dx;->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/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Landroid/os/Bundle;)V
 
@@ -90,13 +90,13 @@
 
     :cond_0
     :try_start_1
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->ane:Ljava/lang/String;
 
-    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/ia;->asy:Z
+    iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/ia;->asH:Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHs:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ia;->aHB:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v2, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dn;->a(Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzm;)Ljava/util/List;
 
@@ -106,20 +106,20 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hm;->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/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Landroid/os/Bundle;)V
 
@@ -134,40 +134,40 @@
     move-exception v2
 
     :try_start_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->atJ:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ia;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v0, v4, v2}, Lcom/google/android/gms/measurement/internal/dx;->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/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Landroid/os/Bundle;)V
 
     return-void
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHu:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ia;->aHD:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHz:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ia;->aHI:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-virtual {v2, v3, v1}, Lcom/google/android/gms/measurement/internal/jm;->a(Lcom/google/android/gms/internal/measurement/lv;Landroid/os/Bundle;)V
 
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 7a35c208f9..f1005adca3 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
@@ -7,26 +7,26 @@
 
 
 # instance fields
-.field private final synthetic aGF:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aGH:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGH:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ib;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ib;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ib;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ib;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ib;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ib;->anq:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,19 +38,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ib;->aGH:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ib;->aGQ:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ib;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ib;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ib;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ib;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ib;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;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 8f4607f6f6..b5aced7add 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
@@ -7,15 +7,15 @@
 
 
 # instance fields
-.field private final synthetic aHA:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aHJ:Lcom/google/android/gms/measurement/internal/zzm;
 
-.field private final synthetic aHB:Lcom/google/android/gms/measurement/internal/hm;
+.field private final synthetic aHK:Lcom/google/android/gms/measurement/internal/hm;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic ayV:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final synthetic aze:Ljava/util/concurrent/atomic/AtomicReference;
 
 .field private final synthetic zzd:Ljava/lang/String;
 
@@ -26,19 +26,19 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/hm;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHB:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ic;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ic;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/ic;->zzd:Ljava/lang/String;
 
     iput-boolean p6, p0, Lcom/google/android/gms/measurement/internal/ic;->zze:Z
 
-    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/ic;->aHA:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p7, p0, Lcom/google/android/gms/measurement/internal/ic;->aHJ:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,40 +50,40 @@
 .method public final run()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHB:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHB:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to get user properties"
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anh:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ic;->zzd:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -95,7 +95,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -107,7 +107,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
 
     invoke-static {v2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -115,15 +115,15 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
 
     iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->zzd:Ljava/lang/String;
 
     iget-boolean v5, p0, Lcom/google/android/gms/measurement/internal/ic;->zze:Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ic;->aHA:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/ic;->aHJ:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-interface {v1, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dn;->a(Ljava/lang/String;Ljava/lang/String;ZLcom/google/android/gms/measurement/internal/zzm;)Ljava/util/List;
 
@@ -134,11 +134,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anh:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
 
     iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ic;->zzd:Ljava/lang/String;
 
@@ -151,15 +151,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/ic;->aHB:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yj()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->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/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
     :try_end_3
@@ -176,27 +176,27 @@
     move-exception v1
 
     :try_start_4
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aHB:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aHK:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to get user properties"
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/ic;->ane:Ljava/lang/String;
 
     invoke-static {v4}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ic;->anh:Ljava/lang/String;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/ic;->anq:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v5, v1}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -207,7 +207,7 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
     :try_start_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ic;->aze:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v1}, Ljava/lang/Object;->notify()V
 
@@ -217,7 +217,7 @@
     return-void
 
     :goto_2
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->ayV:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ic;->aze: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/id.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/id.smali
index ad3df41895..f9db187a11 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aHC:Lcom/google/android/gms/measurement/internal/dn;
+.field private final synthetic aHL:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHM: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/dn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/id;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/id;->aHC:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/id;->aHL:Lcom/google/android/gms/measurement/internal/dn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,44 +30,44 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/id;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ie;->a(Lcom/google/android/gms/measurement/internal/ie;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Connected to service"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/id;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/id;->aHC:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/id;->aHL:Lcom/google/android/gms/measurement/internal/dn;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/dn;)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 a91050306c..6eb0be8b69 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
@@ -9,18 +9,18 @@
 
 
 # instance fields
-.field volatile aHE:Lcom/google/android/gms/measurement/internal/dw;
+.field volatile aHN:Lcom/google/android/gms/measurement/internal/dw;
 
-.field final synthetic aHe:Lcom/google/android/gms/measurement/internal/hm;
+.field final synthetic aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-.field volatile atx:Z
+.field volatile atG:Z
 
 
 # direct methods
 .method protected constructor <init>(Lcom/google/android/gms/measurement/internal/hm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -32,7 +32,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
     return v0
 .end method
@@ -46,25 +46,25 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/hm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFI:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
 
     const/4 v2, 0x0
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFI:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->va()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ft;->vd()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFI:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFR:Lcom/google/android/gms/measurement/internal/dv;
 
     goto :goto_0
 
@@ -74,7 +74,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Service connection failed"
 
@@ -86,17 +86,17 @@
     const/4 p1, 0x0
 
     :try_start_0
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     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/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
@@ -119,7 +119,7 @@
     throw p1
 .end method
 
-.method public final mj()V
+.method public final mm()V
     .locals 3
 
     const-string v0, "MeasurementServiceConnection.onConnected"
@@ -129,17 +129,17 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dw;->mR()Landroid/os/IInterface;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dw;->mU()Landroid/os/IInterface;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/dn;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -164,11 +164,11 @@
     const/4 v0, 0x0
 
     :try_start_1
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHE:Lcom/google/android/gms/measurement/internal/dw;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHN:Lcom/google/android/gms/measurement/internal/dw;
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
     :goto_0
     monitor-exit p0
@@ -183,28 +183,28 @@
     throw v0
 .end method
 
-.method public final mk()V
+.method public final mn()V
     .locals 2
 
     const-string v0, "MeasurementServiceConnection.onConnectionSuspended"
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Service connection suspended"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -231,15 +231,15 @@
     if-nez p2, :cond_0
 
     :try_start_0
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atG:Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Service connected with null binder"
 
@@ -300,13 +300,13 @@
     move-object v0, v1
 
     :goto_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Bound to IMeasurementService interface"
 
@@ -315,13 +315,13 @@
     goto :goto_2
 
     :cond_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Got binder with a wrong descriptor"
 
@@ -334,13 +334,13 @@
 
     :catch_0
     :try_start_2
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Service connect failed to get IMeasurementService"
 
@@ -349,22 +349,22 @@
     :goto_2
     if-nez v0, :cond_4
 
-    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atx:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/measurement/internal/ie;->atG: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;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/hm;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/hm;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-static {p1, p2}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
     :try_end_3
@@ -375,9 +375,9 @@
 
     :cond_4
     :try_start_4
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p1
 
@@ -408,21 +408,21 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aV(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Service disconnected"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     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 987749d860..dc5c9fcf33 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aHC:Lcom/google/android/gms/measurement/internal/dn;
+.field private final synthetic aHL:Lcom/google/android/gms/measurement/internal/dn;
 
-.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHM: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/dn;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/if;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/if;->aHC:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/if;->aHL:Lcom/google/android/gms/measurement/internal/dn;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,44 +30,44 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/if;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/ie;->a(Lcom/google/android/gms/measurement/internal/ie;)Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yl()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/hm;->yo()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Connected to remote service"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/if;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/if;->aHC:Lcom/google/android/gms/measurement/internal/dn;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/if;->aHL:Lcom/google/android/gms/measurement/internal/dn;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/dn;)V
 
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 7c65e07934..1ca42fc0eb 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aHD:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-.field private final synthetic aHF:Landroid/content/ComponentName;
+.field private final synthetic aHO:Landroid/content/ComponentName;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ie;Landroid/content/ComponentName;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ig;->aHF:Landroid/content/ComponentName;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ig;->aHO:Landroid/content/ComponentName;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,11 +30,11 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aHD:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ig;->aHM:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHF:Landroid/content/ComponentName;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ig;->aHO:Landroid/content/ComponentName;
 
     invoke-static {v0, v1}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/measurement/internal/hm;Landroid/content/ComponentName;)V
 
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 1949cdeed2..b087c307c3 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
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final synthetic aHf:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHo:Lcom/google/android/gms/measurement/internal/ie;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ie;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ih;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ih;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,19 +26,19 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHg:Lcom/google/android/gms/measurement/internal/dn;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/hm;->aHp:Lcom/google/android/gms/measurement/internal/dn;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ih;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hm;->yC()V
 
     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 e7ba579f02..c8774087f3 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
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final synthetic aHf:Lcom/google/android/gms/measurement/internal/ie;
+.field private final synthetic aHo:Lcom/google/android/gms/measurement/internal/ie;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ie;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ii;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,25 +26,25 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ii;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
     new-instance v1, Landroid/content/ComponentName;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ii;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aHf:Lcom/google/android/gms/measurement/internal/ie;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ii;->aHo:Lcom/google/android/gms/measurement/internal/ie;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ie;->aHe:Lcom/google/android/gms/measurement/internal/hm;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ie;->aHn:Lcom/google/android/gms/measurement/internal/hm;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v3, "com.google.android.gms.measurement.AppMeasurementService"
 
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 9f3dea1841..24b06e1200 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
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aBE:Lcom/google/android/gms/measurement/internal/ik;
+.field private final aBN:Lcom/google/android/gms/measurement/internal/ik;
 
-.field private final aHG:Lcom/google/android/gms/measurement/internal/dv;
+.field private final aHP:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final aHH:Landroid/content/Intent;
+.field private final aHQ:Landroid/content/Intent;
 
-.field private final anl:I
+.field private final anu:I
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ij;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ij;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/ij;->anl:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/ij;->anu:I
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHG:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHP:Lcom/google/android/gms/measurement/internal/dv;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ij;->aHH:Landroid/content/Intent;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/ij;->aHQ:Landroid/content/Intent;
 
     return-void
 .end method
@@ -38,15 +38,15 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ij;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ij;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/ij;->anl:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/ij;->anu:I
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ij;->aHG:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ij;->aHP:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHH:Landroid/content/Intent;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/ij;->aHQ:Landroid/content/Intent;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     check-cast v4, Lcom/google/android/gms/measurement/internal/io;
 
@@ -56,7 +56,7 @@
 
     if-eqz v4, :cond_0
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -66,17 +66,17 @@
 
     invoke-virtual {v2, v4, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Completed wakeful intent."
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/io;
 
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 7620c93421..0f08a3adfa 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
@@ -17,7 +17,7 @@
 
 
 # instance fields
-.field public final aGD:Landroid/content/Context;
+.field public final aGM:Landroid/content/Context;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -39,7 +39,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/ik;->aGD:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     return-void
 .end method
@@ -49,13 +49,13 @@
 .method public final f(Ljava/lang/Runnable;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->aq(Landroid/content/Context;)Lcom/google/android/gms/measurement/internal/jf;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -68,10 +68,10 @@
     return-void
 .end method
 
-.method public final pD()V
+.method public final pG()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -79,13 +79,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Local AppMeasurementService is shutting down"
 
@@ -94,10 +94,10 @@
     return-void
 .end method
 
-.method public final yA()Lcom/google/android/gms/measurement/internal/dv;
+.method public final yD()Lcom/google/android/gms/measurement/internal/dv;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -105,7 +105,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
@@ -115,7 +115,7 @@
 .method public final zza()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     const/4 v1, 0x0
 
@@ -123,13 +123,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Local AppMeasurementService is starting up"
 
@@ -145,11 +145,11 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "onUnbind called with null intent"
 
@@ -162,11 +162,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "onUnbind called for intent. action"
 
@@ -180,11 +180,11 @@
 
     if-nez p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "onRebind called with null intent"
 
@@ -197,11 +197,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yA()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ik;->yD()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "onRebind called. action"
 
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 0f6cb4f2c8..a8c519f2d1 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aGs:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aHI:Ljava/lang/Runnable;
+.field private final synthetic aHR:Ljava/lang/Runnable;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jf;Ljava/lang/Runnable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/il;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/il;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/il;->aHI:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/il;->aHR:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,17 +30,17 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->mY()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/il;->aHI:Ljava/lang/Runnable;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/il;->aHR:Ljava/lang/Runnable;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Ljava/util/List;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/util/List;
 
     if-nez v2, :cond_0
 
@@ -48,16 +48,16 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Ljava/util/List;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/util/List;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/jf;->aIs: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/il;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/il;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qs()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
 
     return-void
 .end method
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 e27b1782d9..00c9852b67 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
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aBE:Lcom/google/android/gms/measurement/internal/ik;
+.field private final aBN:Lcom/google/android/gms/measurement/internal/ik;
 
-.field private final aFs:Lcom/google/android/gms/measurement/internal/dv;
+.field private final aFB:Lcom/google/android/gms/measurement/internal/dv;
 
-.field private final aHJ:Landroid/app/job/JobParameters;
+.field private final aHS:Landroid/app/job/JobParameters;
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/im;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/im;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/im;->aFs:Lcom/google/android/gms/measurement/internal/dv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/im;->aFB:Lcom/google/android/gms/measurement/internal/dv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/im;->aHJ:Landroid/app/job/JobParameters;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/im;->aHS:Landroid/app/job/JobParameters;
 
     return-void
 .end method
@@ -34,19 +34,19 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aBE:Lcom/google/android/gms/measurement/internal/ik;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/im;->aBN:Lcom/google/android/gms/measurement/internal/ik;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/im;->aFs:Lcom/google/android/gms/measurement/internal/dv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/im;->aFB:Lcom/google/android/gms/measurement/internal/dv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/im;->aHJ:Landroid/app/job/JobParameters;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/im;->aHS:Landroid/app/job/JobParameters;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "AppMeasurementJobService processed last upload request."
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGD:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ik;->aGM:Landroid/content/Context;
 
     check-cast v0, Lcom/google/android/gms/measurement/internal/io;
 
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 d55bea516f..4f2966ddbc 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field aHK:Landroid/os/Handler;
+.field aHT:Landroid/os/Handler;
 
-.field protected aHL:Lcom/google/android/gms/measurement/internal/iv;
+.field protected aHU:Lcom/google/android/gms/measurement/internal/iv;
 
-.field protected aHM:Lcom/google/android/gms/measurement/internal/it;
+.field protected aHV:Lcom/google/android/gms/measurement/internal/it;
 
-.field private aHN:Lcom/google/android/gms/measurement/internal/is;
+.field private aHW:Lcom/google/android/gms/measurement/internal/is;
 
 
 # direct methods
@@ -23,19 +23,19 @@
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/iv;-><init>(Lcom/google/android/gms/measurement/internal/in;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/it;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/it;-><init>(Lcom/google/android/gms/measurement/internal/in;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/is;
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/is;-><init>(Lcom/google/android/gms/measurement/internal/in;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHN:Lcom/google/android/gms/measurement/internal/is;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/in;->aHW:Lcom/google/android/gms/measurement/internal/is;
 
     return-void
 .end method
@@ -43,15 +43,15 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/in;J)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->ys()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->yv()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -61,19 +61,19 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHN:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHW:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDX:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -81,34 +81,34 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHK:Landroid/os/Handler;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHI:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHR:Ljava/lang/Runnable;
 
     invoke-virtual {v1, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
-    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iget-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iget-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anq:J
+    iput-wide p1, v0, Lcom/google/android/gms/measurement/internal/it;->anz:J
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/iv;->yB()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/iv;->yE()V
 
     return-void
 .end method
@@ -116,15 +116,15 @@
 .method static synthetic b(Lcom/google/android/gms/measurement/internal/in;J)V
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->ys()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/in;->yv()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -134,15 +134,15 @@
 
     invoke-virtual {v0, v2, v1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHN:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHW:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDX:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -150,24 +150,24 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHK:Landroid/os/Handler;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHI:Ljava/lang/Runnable;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHR:Ljava/lang/Runnable;
 
     const-wide/16 v2, 0x7d0
 
     invoke-virtual {v1, v0, v2, v3}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
-    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
     const-wide/16 v3, 0x0
 
@@ -175,27 +175,27 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v2
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
     sub-long/2addr p1, v4
 
@@ -204,25 +204,25 @@
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_1
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/in;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object p2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDl:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDu:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p1, p2, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -230,13 +230,13 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFf:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/eh;->aFo:Lcom/google/android/gms/measurement/internal/ej;
 
     const/4 p1, 0x1
 
@@ -251,7 +251,7 @@
 .method public final c(ZZ)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHM:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHV:Lcom/google/android/gms/measurement/internal/it;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/it;->c(ZZ)Z
 
@@ -260,15 +260,25 @@
     return p1
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->rA()V
 
     return-void
 .end method
 
-.method protected final va()Z
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected final vd()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -276,126 +286,116 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final xC()V
+.method protected final xF()V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v2
 
@@ -408,82 +408,82 @@
     return-void
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xv()Lcom/google/android/gms/measurement/internal/dr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/dc;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final ys()V
+.method final yv()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHK:Landroid/os/Handler;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
 
     if-nez v0, :cond_0
 
@@ -495,7 +495,7 @@
 
     invoke-direct {v0, v1}, Lcom/google/android/gms/internal/measurement/hs;-><init>(Landroid/os/Looper;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHK:Landroid/os/Handler;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/in;->aHT:Landroid/os/Handler;
 
     :cond_0
     return-void
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 9bdec09b65..7c29304e6a 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aHO:Lcom/google/android/gms/measurement/internal/in;
+.field private final synthetic aHX:Lcom/google/android/gms/measurement/internal/in;
 
-.field private final synthetic anp:J
+.field private final synthetic any:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/in;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ip;->aHO:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ip;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ip;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/ip;->any:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ip;->aHO:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ip;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ip;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/ip;->any:J
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/in;->b(Lcom/google/android/gms/measurement/internal/in;J)V
 
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 fd21a6d415..72e887c4c5 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aHO:Lcom/google/android/gms/measurement/internal/in;
+.field private final synthetic aHX:Lcom/google/android/gms/measurement/internal/in;
 
-.field private final synthetic anp:J
+.field private final synthetic any:J
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/in;J)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iq;->aHO:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iq;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/iq;->anp:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/iq;->any:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iq;->aHO:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iq;->aHX:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/iq;->anp:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/iq;->any:J
 
     invoke-static {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/in;->a(Lcom/google/android/gms/measurement/internal/in;J)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ir.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ir.smali
index 60cf6b5c12..5015afbcaf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ir.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ir.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aHP:Lcom/google/android/gms/measurement/internal/is;
+.field private final aHY:Lcom/google/android/gms/measurement/internal/is;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ir;->aHP:Lcom/google/android/gms/measurement/internal/is;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ir;->aHY:Lcom/google/android/gms/measurement/internal/is;
 
     return-void
 .end method
@@ -26,11 +26,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ir;->aHP:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ir;->aHY:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
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 1974c89df4..caac441ce5 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
@@ -4,16 +4,16 @@
 
 
 # instance fields
-.field final aHI:Ljava/lang/Runnable;
+.field final aHR:Ljava/lang/Runnable;
 
-.field final synthetic aHQ:Lcom/google/android/gms/measurement/internal/in;
+.field final synthetic aHZ:Lcom/google/android/gms/measurement/internal/in;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/in;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -21,7 +21,7 @@
 
     invoke-direct {p1, p0}, Lcom/google/android/gms/measurement/internal/ir;-><init>(Lcom/google/android/gms/measurement/internal/is;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aHI:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/is;->aHR:Ljava/lang/Runnable;
 
     return-void
 .end method
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 1cfb92916e..5fb7c21827 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
@@ -4,46 +4,46 @@
 
 
 # instance fields
-.field final aHR:Lcom/google/android/gms/measurement/internal/g;
+.field final aIa:Lcom/google/android/gms/measurement/internal/g;
 
-.field final synthetic aHS:Lcom/google/android/gms/measurement/internal/in;
+.field final synthetic aIb:Lcom/google/android/gms/measurement/internal/in;
 
-.field anp:J
+.field any:J
 
-.field anq:J
+.field anz:J
 
 
 # direct methods
 .method public constructor <init>(Lcom/google/android/gms/measurement/internal/in;)V
     .locals 2
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/iw;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-direct {v0, p0, v1}, Lcom/google/android/gms/measurement/internal/iw;-><init>(Lcom/google/android/gms/measurement/internal/it;Lcom/google/android/gms/measurement/internal/fw;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anz:J
 
     return-void
 .end method
@@ -51,27 +51,27 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/it;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     const/4 v0, 0x0
 
     invoke-virtual {p0, v0, v0}, Lcom/google/android/gms/measurement/internal/it;->c(ZZ)Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p0
 
-    invoke-interface {p0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {p0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
@@ -85,35 +85,35 @@
 .method public final c(ZZ)Z
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xy()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/dc;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -123,7 +123,7 @@
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
     sub-long v2, v0, v2
 
@@ -135,13 +135,13 @@
 
     if-gez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -156,23 +156,23 @@
     return p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {p1, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -190,13 +190,13 @@
 
     invoke-virtual {p1, v4, v2, v3}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hh;->yx()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v2
 
@@ -204,19 +204,19 @@
 
     invoke-static {v2, p1, v3}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hi;Landroid/os/Bundle;Z)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v4
 
@@ -226,23 +226,23 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDs:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v4, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -252,7 +252,7 @@
 
     if-nez p2, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->ub()J
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->ue()J
 
     goto :goto_0
 
@@ -268,27 +268,27 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->ub()J
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/it;->ue()J
 
     :cond_3
     :goto_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDs:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v4, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -299,9 +299,9 @@
     if-nez p2, :cond_5
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p2
 
@@ -312,27 +312,27 @@
     invoke-virtual {p2, v2, v4, p1}, Lcom/google/android/gms/measurement/internal/gf;->b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
 
     :cond_5
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anp:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->any:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/it;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
     const-wide/16 v0, 0x0
 
     const-wide/32 v4, 0x36ee80
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v6
 
@@ -347,24 +347,24 @@
     return v3
 .end method
 
-.method final ub()J
+.method final ue()J
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aHS:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/it;->aIb:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->anq:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/it;->anz:J
 
     sub-long v2, v0, v2
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/it;->anz:J
 
     return-wide v2
 .end method
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 48f80265ee..fb1d214d95 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
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aHP:Lcom/google/android/gms/measurement/internal/is;
+.field private final aHY:Lcom/google/android/gms/measurement/internal/is;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iu;->aHP:Lcom/google/android/gms/measurement/internal/is;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iu;->aHY:Lcom/google/android/gms/measurement/internal/is;
 
     return-void
 .end method
@@ -26,27 +26,27 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aHP:Lcom/google/android/gms/measurement/internal/is;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iu;->aHY:Lcom/google/android/gms/measurement/internal/is;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Application backgrounded"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/is;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
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 84cdc6e8da..8d46c9f1f9 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
@@ -4,28 +4,28 @@
 
 
 # instance fields
-.field private final aCc:Lcom/google/android/gms/measurement/internal/g;
+.field private final aCl:Lcom/google/android/gms/measurement/internal/g;
 
-.field final synthetic aHQ:Lcom/google/android/gms/measurement/internal/in;
+.field final synthetic aHZ:Lcom/google/android/gms/measurement/internal/in;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/in;)V
     .locals 1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/iy;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-direct {p1, p0, v0}, Lcom/google/android/gms/measurement/internal/iy;-><init>(Lcom/google/android/gms/measurement/internal/iv;Lcom/google/android/gms/measurement/internal/fw;)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iv;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
     return-void
 .end method
@@ -35,17 +35,17 @@
 .method final b(JZ)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->ys()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/in;->yv()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
@@ -55,25 +55,25 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
     const/4 v1, 0x1
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ej;->zza(Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
     const-wide/16 v1, 0x0
 
@@ -82,19 +82,19 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
@@ -104,26 +104,26 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
 
     move-result v0
 
@@ -138,29 +138,29 @@
 .method final c(JZ)V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->zzb()Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDy:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -168,11 +168,11 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
@@ -181,34 +181,34 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -220,19 +220,19 @@
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
@@ -251,9 +251,9 @@
     move-result-object v0
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v1
 
@@ -267,13 +267,13 @@
 
     invoke-virtual/range {v1 .. v6}, Lcom/google/android/gms/measurement/internal/gf;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;J)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
     const/4 v2, 0x0
 
@@ -283,19 +283,19 @@
 
     invoke-direct {v8}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
@@ -314,13 +314,13 @@
     invoke-virtual {v8, v2, v0, v1}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDY:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEh:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -337,9 +337,9 @@
     invoke-virtual {v8, p3, v0, v1}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_4
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v3
 
@@ -353,13 +353,13 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->zzb()Z
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p3, v0}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -367,15 +367,15 @@
 
     if-eqz p3, :cond_5
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ek;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFr:Lcom/google/android/gms/measurement/internal/ek;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->pL()Ljava/lang/String;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ek;->pO()Ljava/lang/String;
 
     move-result-object p3
 
@@ -393,9 +393,9 @@
 
     invoke-virtual {v6, v0, p3}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v1
 
@@ -410,23 +410,23 @@
     :cond_5
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->zzb()Z
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDy:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p3, v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -434,13 +434,13 @@
 
     if-nez p3, :cond_6
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFd:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/eh;->aFm:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {p3, p1, p2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
@@ -448,18 +448,18 @@
     return-void
 .end method
 
-.method final yB()V
+.method final yE()V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/in;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v0
 
@@ -468,23 +468,23 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDl:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDu:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -494,30 +494,30 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFf:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFo:Lcom/google/android/gms/measurement/internal/ej;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ej;->zza(Z)V
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xI()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()Ljava/lang/String;
 
     move-result-object v2
 
@@ -527,9 +527,9 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -542,19 +542,19 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -570,66 +570,66 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
     const/4 v3, 0x1
 
     invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/ej;->zza(Z)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aEZ:Lcom/google/android/gms/measurement/internal/ej;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/eh;->aFi:Lcom/google/android/gms/measurement/internal/ej;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ej;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iv;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/eh;->aFg:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v3
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFe:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/eh;->aFn:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v5
 
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 5cfccd12eb..bda1194f01 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aHT:Lcom/google/android/gms/measurement/internal/it;
+.field private final synthetic aIc:Lcom/google/android/gms/measurement/internal/it;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/it;Lcom/google/android/gms/measurement/internal/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iw;->aHT:Lcom/google/android/gms/measurement/internal/it;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iw;->aIc:Lcom/google/android/gms/measurement/internal/it;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/fw;)V
 
@@ -23,7 +23,7 @@
 .method public final zza()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iw;->aHT:Lcom/google/android/gms/measurement/internal/it;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iw;->aIc:Lcom/google/android/gms/measurement/internal/it;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/it;->a(Lcom/google/android/gms/measurement/internal/it;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ix.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ix.smali
index f369367217..f694ef76d3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ix.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ix.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field anq:J
+.field anz:J
 
-.field final azy:Lcom/google/android/gms/common/util/e;
+.field final azH:Lcom/google/android/gms/common/util/e;
 
 
 # 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/ix;->azy:Lcom/google/android/gms/common/util/e;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ix;->azH:Lcom/google/android/gms/common/util/e;
 
     return-void
 .end method
@@ -27,13 +27,13 @@
 .method public final zza()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ix;->azy:Lcom/google/android/gms/common/util/e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ix;->azH:Lcom/google/android/gms/common/util/e;
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ix;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/ix;->anz:J
 
     return-void
 .end method
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 4ca0b34f3c..f07f4c7c14 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
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aHL:Lcom/google/android/gms/measurement/internal/iv;
+.field private final synthetic aHU:Lcom/google/android/gms/measurement/internal/iv;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/iv;Lcom/google/android/gms/measurement/internal/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iy;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iy;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/fw;)V
 
@@ -23,15 +23,15 @@
 .method public final zza()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iy;->aHL:Lcom/google/android/gms/measurement/internal/iv;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iy;->aHU:Lcom/google/android/gms/measurement/internal/iv;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHQ:Lcom/google/android/gms/measurement/internal/in;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/iv;->aHZ:Lcom/google/android/gms/measurement/internal/in;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
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 669795d2b2..e91b51d049 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
@@ -4,18 +4,18 @@
 
 
 # instance fields
-.field private final synthetic aGs:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aHU:Lcom/google/android/gms/measurement/internal/ja;
+.field private final synthetic aId:Lcom/google/android/gms/measurement/internal/ja;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/ja;Lcom/google/android/gms/measurement/internal/fw;Lcom/google/android/gms/measurement/internal/jf;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iz;->aHU:Lcom/google/android/gms/measurement/internal/ja;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/iz;->aId:Lcom/google/android/gms/measurement/internal/ja;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iz;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/iz;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     invoke-direct {p0, p2}, Lcom/google/android/gms/measurement/internal/g;-><init>(Lcom/google/android/gms/measurement/internal/fw;)V
 
@@ -27,25 +27,25 @@
 .method public final zza()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aHU:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aId:Lcom/google/android/gms/measurement/internal/ja;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ja;->tR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aHU:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aId:Lcom/google/android/gms/measurement/internal/ja;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Starting upload from DelayedRunnable"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/iz;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qs()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
 
     return-void
 .end method
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 8837d84e20..b7b5a425af 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aBW:Lcom/google/android/gms/measurement/internal/fw;
+.field private final synthetic aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-.field private final synthetic aCc:Lcom/google/android/gms/measurement/internal/g;
+.field private final synthetic aCl:Lcom/google/android/gms/measurement/internal/g;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/g;Lcom/google/android/gms/measurement/internal/fw;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/j;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/j;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/j;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/j;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,19 +30,19 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aBW:Lcom/google/android/gms/measurement/internal/fw;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCf:Lcom/google/android/gms/measurement/internal/fw;
 
-    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-interface {v0}, Lcom/google/android/gms/measurement/internal/fw;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -51,19 +51,19 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->zzb()Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/j;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/j;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/g;->a(Lcom/google/android/gms/measurement/internal/g;)J
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCc:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/j;->aCl:Lcom/google/android/gms/measurement/internal/g;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->zza()V
 
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 f1173506dd..29a70c5429 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
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final aHR:Lcom/google/android/gms/measurement/internal/g;
+.field private final aIa:Lcom/google/android/gms/measurement/internal/g;
 
-.field private final aHV:Landroid/app/AlarmManager;
+.field private final aIe:Landroid/app/AlarmManager;
 
-.field private aHW:Ljava/lang/Integer;
+.field private aIf:Ljava/lang/Integer;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/jb;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -29,29 +29,29 @@
 
     check-cast v0, Landroid/app/AlarmManager;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHV:Landroid/app/AlarmManager;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIe:Landroid/app/AlarmManager;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/iz;
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-direct {v0, p0, v1, p1}, Lcom/google/android/gms/measurement/internal/iz;-><init>(Lcom/google/android/gms/measurement/internal/ja;Lcom/google/android/gms/measurement/internal/fw;Lcom/google/android/gms/measurement/internal/jf;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
     return-void
 .end method
 
-.method private final sc()I
+.method private final sf()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIf:Ljava/lang/Integer;
 
     if-nez v0, :cond_1
 
     const-string v0, "measurement"
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -91,10 +91,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIf:Ljava/lang/Integer;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHW:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIf:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -103,10 +103,10 @@
     return v0
 .end method
 
-.method private final yC()V
+.method private final yF()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -118,15 +118,15 @@
 
     check-cast v0, Landroid/app/job/JobScheduler;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->sf()I
 
     move-result v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -141,10 +141,10 @@
     return-void
 .end method
 
-.method private final yD()Landroid/app/PendingIntent;
+.method private final yG()Landroid/app/PendingIntent;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -178,11 +178,11 @@
 .method public final T(J)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -192,11 +192,11 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Receiver not registered/enabled"
 
@@ -209,24 +209,24 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Service not registered/enabled"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ja;->tR()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v0}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v0
 
@@ -234,7 +234,7 @@
 
     const-wide/16 v0, 0x0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCN:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCW:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v3, 0x0
 
@@ -256,7 +256,7 @@
 
     if-gez v2, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
     invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->zzb()Z
 
@@ -264,22 +264,22 @@
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Scheduling upload with DelayedRunnable"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/measurement/internal/g;->T(J)V
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -287,17 +287,17 @@
 
     if-lt v0, v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Scheduling upload with JobScheduler"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -307,7 +307,7 @@
 
     invoke-direct {v1, v0, v2}, Landroid/content/ComponentName;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->sc()I
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->sf()I
 
     move-result v2
 
@@ -345,11 +345,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -368,21 +368,21 @@
     return-void
 
     :cond_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Scheduling upload with AlarmManager"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ja;->aHV:Landroid/app/AlarmManager;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/ja;->aIe:Landroid/app/AlarmManager;
 
     const/4 v0, 0x2
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCI:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCR:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -398,7 +398,7 @@
 
     move-result-wide v6
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yD()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yG()Landroid/app/PendingIntent;
 
     move-result-object v8
 
@@ -409,12 +409,12 @@
     return-void
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHV:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIe:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yD()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yG()Landroid/app/PendingIntent;
 
     move-result-object v1
 
@@ -426,7 +426,7 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yC()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yF()V
 
     :cond_0
     const/4 v0, 0x0
@@ -434,30 +434,30 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
 
     return-void
 .end method
 
-.method public final tR()V
+.method public final tU()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aHV:Landroid/app/AlarmManager;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIe:Landroid/app/AlarmManager;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yD()Landroid/app/PendingIntent;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yG()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/ja;->aHR:Lcom/google/android/gms/measurement/internal/g;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ja;->aIa:Lcom/google/android/gms/measurement/internal/g;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rx()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/g;->rA()V
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -465,154 +465,154 @@
 
     if-lt v0, v1, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yC()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ja;->yF()V
 
     :cond_0
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/es;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
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 ce54ab2b2a..b772837f40 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private atx:Z
+.field private atG:Z
 
 
 # direct methods
@@ -13,26 +13,59 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/jd;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jb;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jb;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIk:I
+    iget v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIk:I
+    iput v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract pO()Z
+.method protected abstract pR()Z
 .end method
 
-.method final yE()Z
+.method public final yC()V
+    .locals 3
+
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atG:Z
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->pR()Z
+
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aGB:Lcom/google/android/gms/measurement/internal/jf;
+
+    iget v1, v0, Lcom/google/android/gms/measurement/internal/jf;->zzq:I
+
+    const/4 v2, 0x1
+
+    add-int/2addr v1, v2
+
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/jf;->zzq:I
+
+    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/jb;->atG:Z
+
+    return-void
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    const-string v1, "Can\'t initialize twice"
+
+    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method final yH()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atx:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atG:Z
 
     if-eqz v0, :cond_0
 
@@ -46,10 +79,10 @@
     return v0
 .end method
 
-.method protected final yF()V
+.method protected final yI()V
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yE()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yH()Z
 
     move-result v0
 
@@ -66,36 +99,3 @@
 
     throw v0
 .end method
-
-.method public final yz()V
-    .locals 3
-
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jb;->atx:Z
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->pO()Z
-
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jb;->aGs:Lcom/google/android/gms/measurement/internal/jf;
-
-    iget v1, v0, Lcom/google/android/gms/measurement/internal/jf;->zzq:I
-
-    const/4 v2, 0x1
-
-    add-int/2addr v1, v2
-
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/jf;->zzq:I
-
-    iput-boolean v2, p0, Lcom/google/android/gms/measurement/internal/jb;->atx:Z
-
-    return-void
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    const-string v1, "Can\'t initialize twice"
-
-    invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jc.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jc.smali
index 0b17795efa..e051453eda 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jc.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jc.smali
@@ -7,30 +7,30 @@
 
 
 # instance fields
-.field private final synthetic aGF:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-.field private final synthetic aHX:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aIg:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic amV:Ljava/lang/String;
+.field private final synthetic ane:Ljava/lang/String;
 
-.field private final synthetic anh:Ljava/lang/String;
+.field private final synthetic anq:Ljava/lang/String;
 
-.field private final synthetic awV:Z
+.field private final synthetic axe:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jc;->aHX:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jc;->aIg:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jc;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jc;->amV:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jc;->ane:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jc;->anh:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jc;->anq:Ljava/lang/String;
 
-    iput-boolean p5, p0, Lcom/google/android/gms/measurement/internal/jc;->awV:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/measurement/internal/jc;->axe:Z
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,21 +42,21 @@
 .method public final run()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jc;->aHX:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jc;->aIg:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jc;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jc;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jc;->amV:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jc;->ane:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jc;->anh:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jc;->anq:Ljava/lang/String;
 
-    iget-boolean v4, p0, Lcom/google/android/gms/measurement/internal/jc;->awV:Z
+    iget-boolean v4, p0, Lcom/google/android/gms/measurement/internal/jc;->axe:Z
 
     invoke-virtual {v0, v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/hm;->a(Lcom/google/android/gms/internal/measurement/lv;Ljava/lang/String;Ljava/lang/String;Z)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jd.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jd.smali
index f7f5ca5e45..90acf9791a 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jd.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jd.smali
@@ -7,68 +7,68 @@
 
 
 # instance fields
-.field protected final aGs:Lcom/google/android/gms/measurement/internal/jf;
+.field protected final aGB:Lcom/google/android/gms/measurement/internal/jf;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jf;)V
     .locals 1
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/fu;-><init>(Lcom/google/android/gms/measurement/internal/ey;)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/jd;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public xO()Lcom/google/android/gms/measurement/internal/jj;
+.method public xR()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xP()Lcom/google/android/gms/measurement/internal/jr;
+.method public xS()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yO()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xQ()Lcom/google/android/gms/measurement/internal/d;
+.method public xT()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public xR()Lcom/google/android/gms/measurement/internal/es;
+.method public xU()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jd;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
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 a66d642f66..d30e6b83b9 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aEJ:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aES:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aHY:Lcom/google/android/gms/measurement/internal/jk;
+.field private final synthetic aIh:Lcom/google/android/gms/measurement/internal/jk;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jf;Lcom/google/android/gms/measurement/internal/jk;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/je;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/je;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/je;->aHY:Lcom/google/android/gms/measurement/internal/jk;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/je;->aIh:Lcom/google/android/gms/measurement/internal/jk;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,35 +30,35 @@
 .method public final run()V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/je;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/je;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/je;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/je;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->vb()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v1
 
@@ -68,17 +68,17 @@
 
     if-nez v5, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -89,7 +89,7 @@
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf$a.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf$a.smali
index 6df3dbcde5..97d34abfaf 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf$a.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jf$a.smali
@@ -18,25 +18,25 @@
 
 
 # instance fields
-.field aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+.field private final synthetic aIA:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aIr:Lcom/google/android/gms/measurement/internal/jf;
+.field aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
-.field awT:Ljava/util/List;
+.field awq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Ljava/lang/Long;",
+            "Lcom/google/android/gms/internal/measurement/ak$c;",
             ">;"
         }
     .end annotation
 .end field
 
-.field awh:Ljava/util/List;
+.field axc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
-            "Lcom/google/android/gms/internal/measurement/ak$c;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -49,7 +49,7 @@
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/jf;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->aIr:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->aIA:Lcom/google/android/gms/measurement/internal/jf;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -89,7 +89,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/jf$a;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -97,10 +97,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awT:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->axc:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -108,10 +108,10 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awT:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->axc:Ljava/util/List;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -121,7 +121,7 @@
 
     if-lez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -146,7 +146,7 @@
     :cond_2
     iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/jf$a;->zzd:J
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/dw;->sQ()I
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/dw;->sT()I
 
     move-result v0
 
@@ -154,7 +154,7 @@
 
     add-long/2addr v2, v4
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCy:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCH:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v4, 0x0
 
@@ -183,11 +183,11 @@
     :cond_3
     iput-wide v2, p0, Lcom/google/android/gms/measurement/internal/jf$a;->zzd:J
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq: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/jf$a;->awT:Ljava/util/List;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf$a;->axc:Ljava/util/List;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -195,13 +195,13 @@
 
     invoke-interface {p3, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    sget-object p2, Lcom/google/android/gms/measurement/internal/o;->aCz:Lcom/google/android/gms/measurement/internal/do;
+    sget-object p2, Lcom/google/android/gms/measurement/internal/o;->aCI:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p2, v4}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -232,7 +232,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/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     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 b3bf7166c0..696b99b2cc 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
@@ -15,35 +15,35 @@
 
 
 # static fields
-.field private static volatile aGs:Lcom/google/android/gms/measurement/internal/jf;
+.field private static volatile aGB:Lcom/google/android/gms/measurement/internal/jf;
 
 
 # instance fields
-.field private aAj:Z
+.field private aAs:Z
 
-.field private aGm:J
+.field private aGv:J
 
-.field private aHZ:Lcom/google/android/gms/measurement/internal/es;
+.field private aIi:Lcom/google/android/gms/measurement/internal/es;
 
-.field private aIa:Lcom/google/android/gms/measurement/internal/dz;
+.field private aIj:Lcom/google/android/gms/measurement/internal/dz;
 
-.field private aIb:Lcom/google/android/gms/measurement/internal/d;
+.field private aIk:Lcom/google/android/gms/measurement/internal/d;
 
-.field private aIc:Lcom/google/android/gms/measurement/internal/eg;
+.field private aIl:Lcom/google/android/gms/measurement/internal/eg;
 
-.field private aId:Lcom/google/android/gms/measurement/internal/ja;
+.field private aIm:Lcom/google/android/gms/measurement/internal/ja;
 
-.field private aIe:Lcom/google/android/gms/measurement/internal/jr;
+.field private aIn:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private final aIf:Lcom/google/android/gms/measurement/internal/jj;
+.field private final aIo:Lcom/google/android/gms/measurement/internal/jj;
 
-.field aIg:Lcom/google/android/gms/measurement/internal/hg;
+.field aIp:Lcom/google/android/gms/measurement/internal/hg;
 
-.field final aIh:Lcom/google/android/gms/measurement/internal/ey;
+.field final aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private aIi:Z
+.field private aIr:Z
 
-.field aIj:Ljava/util/List;
+.field aIs:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -53,15 +53,15 @@
     .end annotation
 .end field
 
-.field aIk:I
+.field aIt:I
 
-.field private aIl:Z
+.field private aIu:Z
 
-.field private aIm:Ljava/nio/channels/FileLock;
+.field private aIv:Ljava/nio/channels/FileLock;
 
-.field private aIn:Ljava/nio/channels/FileChannel;
+.field private aIw:Ljava/nio/channels/FileChannel;
 
-.field private aIo:Ljava/util/List;
+.field private aIx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field private aIp:Ljava/util/List;
+.field private aIy:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -81,9 +81,9 @@
     .end annotation
 .end field
 
-.field private adG:J
+.field private adP:J
 
-.field private atn:Z
+.field private atw:Z
 
 .field private zzk:Z
 
@@ -114,7 +114,7 @@
 
     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/jk;->aGD:Landroid/content/Context;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/jk;->aGM:Landroid/content/Context;
 
     const/4 v0, 0x0
 
@@ -122,39 +122,39 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aGm:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/jj;
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/internal/jj;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIf:Lcom/google/android/gms/measurement/internal/jj;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Lcom/google/android/gms/measurement/internal/jj;
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/dz;
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/internal/dz;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIa:Lcom/google/android/gms/measurement/internal/dz;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Lcom/google/android/gms/measurement/internal/dz;
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/es;
 
     invoke-direct {p2, p0}, Lcom/google/android/gms/measurement/internal/es;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aHZ:Lcom/google/android/gms/measurement/internal/es;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object p2
 
@@ -176,19 +176,19 @@
 
     new-instance p2, Lcom/google/android/gms/measurement/internal/fb;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-direct {p2, v1, v2}, Lcom/google/android/gms/measurement/internal/fb;-><init>(Lcom/google/android/gms/measurement/internal/ey;Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rR()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
 
     move-result-object v1
 
@@ -202,7 +202,7 @@
     goto :goto_1
 
     :cond_0
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xU()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xX()Ljava/lang/String;
 
     move-result-object v1
 
@@ -214,13 +214,13 @@
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->cA(Ljava/lang/String;)V
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p3
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jm;->rR()Ljava/lang/String;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
 
     move-result-object p3
 
@@ -232,9 +232,9 @@
     const/4 p3, 0x0
 
     :goto_1
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v2
 
@@ -244,7 +244,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->cz(Ljava/lang/String;)V
 
@@ -253,7 +253,7 @@
     :cond_2
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzr:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v2
 
@@ -272,15 +272,15 @@
     :cond_3
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -288,9 +288,9 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->vl()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->vo()Ljava/lang/String;
 
     move-result-object v2
 
@@ -300,14 +300,14 @@
 
     if-nez v1, :cond_4
 
-    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->cs(Ljava/lang/String;)V
 
     const/4 p3, 0x1
 
     :cond_4
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -315,9 +315,9 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v2
 
@@ -327,7 +327,7 @@
 
     if-nez v1, :cond_5
 
-    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->cB(Ljava/lang/String;)V
 
@@ -344,7 +344,7 @@
 
     iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zze:J
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uk()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->un()J
 
     move-result-wide v5
 
@@ -359,7 +359,7 @@
     const/4 p3, 0x1
 
     :cond_6
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -367,9 +367,9 @@
 
     if-nez v1, :cond_7
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -379,7 +379,7 @@
 
     if-nez v1, :cond_7
 
-    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->cC(Ljava/lang/String;)V
 
@@ -388,7 +388,7 @@
     :cond_7
     iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzj:J
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v5
 
@@ -409,7 +409,7 @@
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzd:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
 
     move-result-object v2
 
@@ -428,7 +428,7 @@
     :cond_9
     iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzf:J
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->rW()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
 
     move-result-wide v5
 
@@ -445,7 +445,7 @@
     :cond_a
     iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzh:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->nb()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
 
     move-result v2
 
@@ -468,7 +468,7 @@
 
     iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzg:Ljava/lang/String;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xM()Ljava/lang/String;
 
     move-result-object v2
 
@@ -487,7 +487,7 @@
     :cond_c
     iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzl:J
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ut()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uw()J
 
     move-result-wide v5
 
@@ -502,43 +502,43 @@
     const/4 p3, 0x1
 
     :cond_d
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xG()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_e
 
-    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->L(Z)V
 
     const/4 p3, 0x1
 
     :cond_e
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yo()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
 
     move-result v2
 
     if-eq v1, v2, :cond_f
 
-    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iget-boolean p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->O(Z)V
 
     const/4 p3, 0x1
 
     :cond_f
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -546,30 +546,30 @@
 
     if-eqz v1, :cond_10
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->wf()Ljava/lang/Boolean;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->wi()Ljava/lang/Boolean;
 
     move-result-object v2
 
     if-eq v1, v2, :cond_10
 
-    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object p3, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/measurement/internal/fb;->c(Ljava/lang/Boolean;)V
 
     const/4 p3, 0x1
 
     :cond_10
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     cmp-long v5, v1, v3
 
     if-eqz v5, :cond_11
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
 
     move-result-wide v3
 
@@ -577,7 +577,7 @@
 
     if-eqz v5, :cond_11
 
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     invoke-virtual {p2, v1, v2}, Lcom/google/android/gms/measurement/internal/fb;->ag(J)V
 
@@ -586,7 +586,7 @@
     :cond_11
     if-eqz p3, :cond_12
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
@@ -613,13 +613,13 @@
 
     if-nez v3, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "PackageManager is null, can not log app install information"
 
@@ -638,13 +638,13 @@
     goto :goto_0
 
     :catch_0
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -726,15 +726,15 @@
     const/high16 v1, -0x80000000
 
     :goto_2
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-wide/16 v8, 0x0
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
     invoke-virtual {v3, v2}, Lcom/google/android/gms/measurement/internal/ka;->cM(Ljava/lang/String;)Z
 
@@ -756,9 +756,9 @@
 
     const-wide/16 v10, 0x471a
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
@@ -786,11 +786,11 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -843,13 +843,13 @@
     return-object v30
 
     :catch_1
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -865,7 +865,7 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/ak$c$a;ILjava/lang/String;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qv()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()Ljava/util/List;
 
     move-result-object v0
 
@@ -902,7 +902,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v0
 
@@ -916,7 +916,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -924,7 +924,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ak$e;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v0
 
@@ -938,7 +938,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p2
 
@@ -958,7 +958,7 @@
 .method private static a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;)V
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qv()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()Ljava/util/List;
 
     move-result-object v0
 
@@ -1011,11 +1011,11 @@
     const-string v0, "_lte"
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1025,7 +1025,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     if-nez v2, :cond_1
 
@@ -1034,13 +1034,13 @@
     :cond_1
     new-instance v8, Lcom/google/android/gms/measurement/internal/jn;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -1048,7 +1048,7 @@
 
     move-result-wide v5
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
@@ -1076,13 +1076,13 @@
     :goto_1
     new-instance v8, Lcom/google/android/gms/measurement/internal/jn;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -1103,7 +1103,7 @@
     invoke-direct/range {v1 .. v7}, Lcom/google/android/gms/measurement/internal/jn;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
     :goto_2
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rp()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     move-result-object v1
 
@@ -1111,9 +1111,9 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -1125,7 +1125,7 @@
 
     move-result-object v1
 
-    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v2, v8, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     check-cast v2, Ljava/lang/Long;
 
@@ -1137,7 +1137,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -1169,7 +1169,7 @@
 
     if-lez p1, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
@@ -1185,15 +1185,15 @@
     const-string p1, "lifetime"
 
     :goto_3
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p3, v8, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object p3, v8, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     const-string p4, "Updated engagement user property. scope, value"
 
@@ -1206,9 +1206,9 @@
 .method private final a(Lcom/google/android/gms/measurement/internal/fb;)V
     .locals 11
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1218,7 +1218,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1228,7 +1228,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1251,7 +1251,7 @@
 
     invoke-direct {v0}, Landroid/net/Uri$Builder;-><init>()V
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1261,12 +1261,12 @@
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v1
 
     :cond_1
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCu:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aCD:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v3, 0x0
 
@@ -1280,7 +1280,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aCE:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v4, v3}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1320,7 +1320,7 @@
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uc()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->uf()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1357,27 +1357,27 @@
 
     invoke-direct {v7, v0}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Fetching remote configuration"
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v4
 
     invoke-virtual {v1, v2, v4}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1385,11 +1385,11 @@
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v4
 
@@ -1420,11 +1420,11 @@
 
     iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v5
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v6
 
@@ -1432,15 +1432,15 @@
 
     invoke-direct {v10, p0}, Lcom/google/android/gms/measurement/internal/jg;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jb;->yI()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/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v1
 
@@ -1459,15 +1459,15 @@
     return-void
 
     :catch_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1487,7 +1487,7 @@
 
     if-eqz p0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yE()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jb;->yH()Z
 
     move-result v0
 
@@ -1547,75 +1547,75 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/jf;)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/d;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/d;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIb:Lcom/google/android/gms/measurement/internal/d;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk:Lcom/google/android/gms/measurement/internal/d;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aHZ:Lcom/google/android/gms/measurement/internal/es;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/jr;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/jr;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Lcom/google/android/gms/measurement/internal/jr;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/hg;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/hg;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIg:Lcom/google/android/gms/measurement/internal/hg;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Lcom/google/android/gms/measurement/internal/hg;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/ja;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/ja;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yz()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yC()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aId:Lcom/google/android/gms/measurement/internal/ja;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ja;
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/eg;
 
     invoke-direct {v0, p0}, Lcom/google/android/gms/measurement/internal/eg;-><init>(Lcom/google/android/gms/measurement/internal/jf;)V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIc:Lcom/google/android/gms/measurement/internal/eg;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Lcom/google/android/gms/measurement/internal/eg;
 
-    iget v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
 
     iget v1, p0, Lcom/google/android/gms/measurement/internal/jf;->zzq:I
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk:I
+    iget v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIt:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1642,7 +1642,7 @@
 .method private final a(ILjava/nio/channels/FileChannel;)Z
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
     const/4 v0, 0x0
 
@@ -1688,13 +1688,13 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Error writing to channel. Bytes written"
 
@@ -1716,13 +1716,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to write to channel"
 
@@ -1732,13 +1732,13 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Bad channel to read from"
 
@@ -1750,7 +1750,7 @@
 .method private final a(Lcom/google/android/gms/internal/measurement/ak$c$a;Lcom/google/android/gms/internal/measurement/ak$c$a;)Z
     .locals 4
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1762,9 +1762,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -1790,9 +1790,9 @@
     iget-object v0, v0, Lcom/google/android/gms/internal/measurement/ak$e;->zze:Ljava/lang/String;
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v2
 
@@ -1839,11 +1839,11 @@
 
     move-object/from16 v1, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
     new-instance v2, Lcom/google/android/gms/measurement/internal/jf$a;
@@ -1852,17 +1852,17 @@
 
     invoke-direct {v2, v1, v3}, Lcom/google/android/gms/measurement/internal/jf$a;-><init>(Lcom/google/android/gms/measurement/internal/jf;B)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    iget-wide v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aGm:J
+    iget-wide v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aGv: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/fu;->vn()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_7
 
@@ -1875,7 +1875,7 @@
     const/4 v12, 0x1
 
     :try_start_1
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v15
 
@@ -2206,11 +2206,11 @@
 
     if-nez v9, :cond_7
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Raw event metadata record is missing. appId"
 
@@ -2242,7 +2242,7 @@
     .catchall {:try_start_11 .. :try_end_11} :catchall_5
 
     :try_start_12
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v13
 
@@ -2252,7 +2252,7 @@
 
     check-cast v9, Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v9}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -2271,11 +2271,11 @@
 
     if-eqz v13, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v13
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v14, "Get multiple raw event metadata records, expected one. appId"
 
@@ -2380,11 +2380,11 @@
 
     if-nez v6, :cond_a
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "Raw event data disappeared while in transaction. appId"
 
@@ -2422,7 +2422,7 @@
     .catchall {:try_start_16 .. :try_end_16} :catchall_1
 
     :try_start_17
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qt()Lcom/google/android/gms/internal/measurement/ak$c$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$c;->qw()Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     move-result-object v8
 
@@ -2451,7 +2451,7 @@
 
     invoke-virtual {v9, v13, v14}, Lcom/google/android/gms/internal/measurement/ak$c$a;->z(J)Lcom/google/android/gms/internal/measurement/ak$c$a;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v8
 
@@ -2483,11 +2483,11 @@
     move-object v6, v0
 
     :try_start_1a
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Data loss. Failed to merge raw event. appId"
 
@@ -2538,11 +2538,11 @@
     move-object v5, v0
 
     :try_start_1c
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "Data loss. Failed to merge raw event metadata. appId"
 
@@ -2623,11 +2623,11 @@
 
     :goto_9
     :try_start_1e
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Data loss. Error selecting raw event. appId"
 
@@ -2646,11 +2646,11 @@
 
     :cond_c
     :goto_a
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     if-eqz v4, :cond_e
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     invoke-interface {v4}, Ljava/util/List;->isEmpty()Z
 
@@ -2672,9 +2672,9 @@
     :goto_c
     if-nez v4, :cond_76
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v4
 
@@ -2682,19 +2682,19 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDs:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2717,7 +2717,7 @@
     const/16 v17, 0x0
 
     :goto_d
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     invoke-interface {v8}, Ljava/util/List;->size()I
 
@@ -2734,7 +2734,7 @@
     if-ge v9, v8, :cond_3a
 
     :try_start_20
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
     invoke-interface {v8, v9}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -2742,7 +2742,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/measurement/ak$c;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v8
 
@@ -2750,17 +2750,17 @@
 
     check-cast v8, Lcom/google/android/gms/internal/measurement/ak$c$a;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
     move/from16 v25, v11
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v11
 
@@ -2775,17 +2775,17 @@
     if-eqz v3, :cond_12
 
     :try_start_21
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v10, "Dropping blacklisted raw event. appId"
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -2793,15 +2793,15 @@
 
     move-result-object v11
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v12
 
     move/from16 v26, v15
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v15
 
@@ -2811,11 +2811,11 @@
 
     invoke-virtual {v3, v10, v11, v12}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -2825,11 +2825,11 @@
 
     if-nez v3, :cond_10
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -2853,7 +2853,7 @@
     :goto_f
     if-nez v3, :cond_11
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v3
 
@@ -2863,9 +2863,9 @@
 
     if-nez v3, :cond_11
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
@@ -2873,7 +2873,7 @@
 
     const-string v10, "_ev"
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v8
 
@@ -2901,15 +2901,15 @@
     :cond_12
     move/from16 v26, v15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v15
 
@@ -2924,9 +2924,9 @@
     if-nez v3, :cond_19
 
     :try_start_22
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v15
 
@@ -3040,7 +3040,7 @@
     const/4 v14, 0x0
 
     :goto_14
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pH()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pK()I
 
     move-result v15
     :try_end_22
@@ -3069,7 +3069,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v5
 
@@ -3085,7 +3085,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v5
 
@@ -3120,7 +3120,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v5
 
@@ -3136,7 +3136,7 @@
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v5
 
@@ -3165,25 +3165,25 @@
 
     if-eqz v3, :cond_1d
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v13, "Marking event as conversion"
 
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v15
 
     move-object/from16 v31, v12
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v12
 
@@ -3193,7 +3193,7 @@
 
     invoke-virtual {v9, v13, v12}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v9
 
@@ -3217,23 +3217,23 @@
     :goto_16
     if-nez v14, :cond_1e
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v12, "Marking event as real-time"
 
-    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v13}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v14
 
@@ -3243,7 +3243,7 @@
 
     invoke-virtual {v9, v12, v13}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v9
 
@@ -3260,15 +3260,15 @@
     invoke-virtual {v8, v9}, Lcom/google/android/gms/internal/measurement/ak$c$a;->a(Lcom/google/android/gms/internal/measurement/ak$e$a;)Lcom/google/android/gms/internal/measurement/ak$c$a;
 
     :cond_1e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v32
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->un()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
 
     move-result-wide v33
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v9, v9, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -3290,11 +3290,11 @@
 
     iget-wide v12, v9, Lcom/google/android/gms/measurement/internal/c;->zze:J
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v14, v14, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -3316,7 +3316,7 @@
     const/16 v25, 0x1
 
     :goto_17
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v5
 
@@ -3328,15 +3328,15 @@
 
     if-eqz v3, :cond_25
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v32
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->un()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
 
     move-result-wide v33
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -3356,17 +3356,17 @@
 
     move-result-object v5
 
-    iget-wide v12, v5, Lcom/google/android/gms/measurement/internal/c;->aBL:J
+    iget-wide v12, v5, Lcom/google/android/gms/measurement/internal/c;->aBU:J
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v9, v9, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aCD:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aCM:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v5, v9, v14}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -3378,17 +3378,17 @@
 
     if-lez v5, :cond_25
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Too many conversions. Not logging as conversion. appId"
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v12, v12, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -3407,7 +3407,7 @@
     const/4 v13, -0x1
 
     :goto_18
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pH()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pK()I
 
     move-result v14
 
@@ -3425,7 +3425,7 @@
 
     if-eqz v15, :cond_20
 
-    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v14}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v12
 
@@ -3484,7 +3484,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v4
 
@@ -3497,17 +3497,17 @@
     goto :goto_1a
 
     :cond_24
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Did not find conversion parameter. appId"
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v9, v9, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -3523,7 +3523,7 @@
 
     new-instance v3, Ljava/util/ArrayList;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qv()Ljava/util/List;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()Ljava/util/List;
 
     move-result-object v4
 
@@ -3598,7 +3598,7 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/ak$e;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result v4
 
@@ -3610,19 +3610,19 @@
 
     check-cast v4, Lcom/google/android/gms/internal/measurement/ak$e;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$e;->qB()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
 
     move-result v4
 
     if-nez v4, :cond_29
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Value must be specified with a numeric type."
 
@@ -3710,13 +3710,13 @@
     :goto_1f
     if-eqz v3, :cond_30
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Value parameter discarded. You must also supply a 3-letter ISO_4217 currency code in the currency parameter."
 
@@ -3743,15 +3743,15 @@
 
     :cond_30
     :goto_21
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDr:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDA:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v5, v9}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -3759,7 +3759,7 @@
 
     if-eqz v3, :cond_35
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v3
 
@@ -3769,9 +3769,9 @@
 
     if-eqz v3, :cond_32
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -3789,11 +3789,11 @@
 
     if-eqz v17, :cond_31
 
-    invoke-virtual/range {v17 .. v17}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual/range {v17 .. v17}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v15
 
@@ -3853,7 +3853,7 @@
 
     const-string v3, "_vs"
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v9
 
@@ -3863,9 +3863,9 @@
 
     if-eqz v3, :cond_34
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -3883,11 +3883,11 @@
 
     if-eqz v16, :cond_33
 
-    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v17
 
@@ -3931,15 +3931,15 @@
     :cond_34
     move-object/from16 v9, v31
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    sget-object v13, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v13, Lcom/google/android/gms/measurement/internal/o;->aEj:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v11, v13}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -3949,7 +3949,7 @@
 
     const-string v3, "_ab"
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v11
 
@@ -3959,9 +3959,9 @@
 
     if-eqz v3, :cond_36
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -3977,11 +3977,11 @@
 
     if-eqz v16, :cond_36
 
-    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v13
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v23
 
@@ -4022,7 +4022,7 @@
     :goto_24
     if-nez v30, :cond_39
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v3
 
@@ -4032,23 +4032,23 @@
 
     if-eqz v3, :cond_39
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pH()I
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->pK()I
 
     move-result v3
 
     if-nez v3, :cond_37
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Engagement event does not contain any parameters. appId"
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -4061,9 +4061,9 @@
     goto :goto_25
 
     :cond_37
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -4079,17 +4079,17 @@
 
     if-nez v3, :cond_38
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Engagement event does not include duration. appId"
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -4115,9 +4115,9 @@
     move-wide/from16 v13, v28
 
     :goto_26
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awh:Ljava/util/List;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jf$a;->awq:Ljava/util/List;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -4186,7 +4186,7 @@
 
     if-eqz v7, :cond_3b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v7, "_fr"
 
@@ -4205,7 +4205,7 @@
     goto :goto_2a
 
     :cond_3b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     invoke-static {v6, v9}, Lcom/google/android/gms/measurement/internal/jj;->b(Lcom/google/android/gms/internal/measurement/ak$c;Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$e;
 
@@ -4213,7 +4213,7 @@
 
     if-eqz v6, :cond_3d
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result v7
 
@@ -4265,15 +4265,15 @@
 
     invoke-direct {v1, v5, v13, v14, v3}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/internal/measurement/ak$g$a;JZ)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDH:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDQ:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v4, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4286,7 +4286,7 @@
     if-eqz v3, :cond_45
 
     :try_start_24
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qv()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()Ljava/util/List;
 
     move-result-object v3
 
@@ -4327,11 +4327,11 @@
     :goto_2b
     if-eqz v3, :cond_42
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v6
 
@@ -4340,15 +4340,15 @@
     :cond_42
     invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->zzb()Z
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v6
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDI:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDR:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v6, v7}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4382,17 +4382,17 @@
 
     invoke-virtual {v5, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bx(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Session engagement user property is in the bundle without session ID. appId"
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -4412,15 +4412,15 @@
     goto :goto_2d
 
     :cond_45
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v6
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDK:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDT:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v6, v7}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4428,11 +4428,11 @@
 
     if-eqz v3, :cond_46
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v6
 
@@ -4440,15 +4440,15 @@
 
     :cond_46
     :goto_2d
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v4, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4456,25 +4456,25 @@
 
     if-eqz v3, :cond_49
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Checking account type status for ad personalization signals"
 
     invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xU()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v4
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v6
 
@@ -4484,11 +4484,11 @@
 
     if-eqz v4, :cond_49
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v6
 
@@ -4498,33 +4498,33 @@
 
     if-eqz v4, :cond_49
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fb;->xG()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v4
 
     if-eqz v4, :cond_49
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/i;->uG()Z
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/i;->uJ()Z
 
     move-result v4
 
     if-eqz v4, :cond_49
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Turning off ad personalization due to account type"
 
     invoke-virtual {v4, v6}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rp()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     move-result-object v4
 
@@ -4534,11 +4534,11 @@
 
     move-result-object v4
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/i;->zzf:J
 
@@ -4552,7 +4552,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -4563,7 +4563,7 @@
     const/4 v4, 0x0
 
     :goto_2e
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qe()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qh()I
 
     move-result v6
 
@@ -4603,15 +4603,15 @@
     invoke-virtual {v5, v3}, Lcom/google/android/gms/internal/measurement/ak$g$a;->a(Lcom/google/android/gms/internal/measurement/ak$k;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_49
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDV:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v4, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -4622,29 +4622,29 @@
     invoke-static {v5}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/internal/measurement/ak$g$a;)V
 
     :cond_4a
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qX()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->ra()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v3
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qR()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qU()Ljava/util/List;
 
     move-result-object v6
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qv()Ljava/util/List;
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()Ljava/util/List;
 
     move-result-object v7
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()J
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qB()J
 
     move-result-wide v8
 
     invoke-static {v4}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yO()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v10
 
@@ -4658,17 +4658,17 @@
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/internal/measurement/ak$g$a;->d(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
     const-string v6, "1"
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
     const-string v7, "measurement.event_sampling_enabled"
 
@@ -4693,20 +4693,20 @@
 
     invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jm;->yP()Ljava/security/SecureRandom;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
 
     move-result-object v6
 
     const/4 v7, 0x0
 
     :goto_30
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pH()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pK()I
 
     move-result v8
 
@@ -4716,7 +4716,7 @@
 
     move-result-object v8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v8
 
@@ -4724,7 +4724,7 @@
 
     check-cast v8, Lcom/google/android/gms/internal/measurement/ak$c$a;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v9
 
@@ -4739,9 +4739,9 @@
     if-eqz v9, :cond_4f
 
     :try_start_26
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -4765,11 +4765,11 @@
 
     if-nez v10, :cond_4b
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v10
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v11, v11, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -4780,11 +4780,11 @@
     invoke-interface {v3, v9, v10}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_4b
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     if-nez v9, :cond_4e
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     invoke-virtual {v9}, Ljava/lang/Long;->longValue()J
 
@@ -4796,20 +4796,20 @@
 
     if-lez v9, :cond_4c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v9, "_sr"
 
-    iget-object v11, v10, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v11, v10, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     invoke-static {v8, v9, v11}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_4c
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     if-eqz v9, :cond_4d
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     invoke-virtual {v9}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -4817,7 +4817,7 @@
 
     if-eqz v9, :cond_4d
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v9, "_efs"
 
@@ -4830,7 +4830,7 @@
     invoke-static {v8, v9, v12}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_4d
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -4856,11 +4856,11 @@
 
     :cond_4f
     :try_start_27
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v9
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -4868,11 +4868,11 @@
 
     move-result-wide v9
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v11
 
@@ -4880,7 +4880,7 @@
 
     move-result-wide v11
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v13
 
@@ -4969,15 +4969,15 @@
     :goto_33
     if-nez v9, :cond_54
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v9
 
-    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v10, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v10, v10, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v13
 
@@ -4993,17 +4993,17 @@
     :goto_34
     if-gtz v9, :cond_55
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Sample rate must be positive. event, rate"
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v12
 
@@ -5013,7 +5013,7 @@
 
     invoke-virtual {v10, v11, v12, v9}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -5031,7 +5031,7 @@
 
     :cond_55
     :try_start_29
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v10
 
@@ -5046,15 +5046,15 @@
     if-nez v10, :cond_57
 
     :try_start_2a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v10
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v13, v13, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v14
 
@@ -5064,35 +5064,35 @@
 
     if-nez v10, :cond_57
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v13, "Event being bundled has no eventAggregate. appId, eventName"
 
-    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v14, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v14, v14, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v15
 
     invoke-virtual {v10, v13, v14, v15}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v13, v13, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v10, v13, v14}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -5102,11 +5102,11 @@
 
     new-instance v10, Lcom/google/android/gms/measurement/internal/k;
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v13, v13, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v28
 
@@ -5116,7 +5116,7 @@
 
     const-wide/16 v33, 0x1
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v35
 
@@ -5141,11 +5141,11 @@
     :cond_56
     new-instance v10, Lcom/google/android/gms/measurement/internal/k;
 
-    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v13, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v13, v13, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v45
 
@@ -5153,7 +5153,7 @@
 
     const-wide/16 v48, 0x1
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v50
 
@@ -5168,9 +5168,9 @@
     :cond_57
     :goto_35
     :try_start_2b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v13
 
@@ -5207,7 +5207,7 @@
     if-ne v9, v15, :cond_5b
 
     :try_start_2c
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -5223,15 +5223,15 @@
 
     if-eqz v9, :cond_5a
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     if-nez v9, :cond_59
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     if-nez v9, :cond_59
 
-    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v9, v10, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     if-eqz v9, :cond_5a
 
@@ -5242,7 +5242,7 @@
 
     move-result-object v10
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v9
 
@@ -5266,7 +5266,7 @@
     if-nez v15, :cond_5d
 
     :try_start_2e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v13, "_sr"
 
@@ -5282,7 +5282,7 @@
 
     invoke-static {v8, v13, v9}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v9
 
@@ -5309,11 +5309,11 @@
     move-result-object v10
 
     :cond_5c
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v13
 
@@ -5339,17 +5339,17 @@
     move-object v15, v6
 
     :try_start_2f
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
     move-object/from16 v16, v15
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDf:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDo:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v5, v6, v15}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -5357,14 +5357,14 @@
 
     if-eqz v5, :cond_60
 
-    iget-object v5, v10, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iget-object v5, v10, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
     :try_end_2f
     .catchall {:try_start_2f .. :try_end_2f} :catchall_4
 
     if-eqz v5, :cond_5e
 
     :try_start_30
-    iget-object v5, v10, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iget-object v5, v10, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
 
     invoke-virtual {v5}, Ljava/lang/Long;->longValue()J
 
@@ -5378,11 +5378,11 @@
 
     :cond_5e
     :try_start_31
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qB()J
 
     move-result-wide v5
 
@@ -5414,7 +5414,7 @@
 
     iget-wide v1, v10, Lcom/google/android/gms/measurement/internal/k;->zzg:J
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v5
 
@@ -5435,7 +5435,7 @@
     :goto_39
     if-eqz v1, :cond_62
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v1, "_efs"
 
@@ -5447,7 +5447,7 @@
 
     invoke-static {v8, v1, v2}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v1, "_sr"
 
@@ -5459,7 +5459,7 @@
 
     invoke-static {v8, v1, v2}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -5488,11 +5488,11 @@
     move-result-object v10
 
     :cond_61
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v1
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qx()J
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qA()J
 
     move-result-wide v5
 
@@ -5511,7 +5511,7 @@
 
     if-eqz v1, :cond_63
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v1
 
@@ -5552,13 +5552,13 @@
 
     move-result v2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pH()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pK()I
 
     move-result v5
 
     if-ge v2, v5, :cond_65
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v2
 
@@ -5586,7 +5586,7 @@
 
     check-cast v3, Ljava/util/Map$Entry;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
@@ -5618,15 +5618,15 @@
     move-object/from16 v2, p0
 
     :try_start_32
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDV:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v4, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -5639,11 +5639,11 @@
     :cond_68
     move-object v3, v15
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v4, v4, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
@@ -5653,17 +5653,17 @@
 
     if-nez v5, :cond_69
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Bundling raw events w/o app info. appId"
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v7, v7, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -5676,13 +5676,13 @@
     goto :goto_42
 
     :cond_69
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pH()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pK()I
 
     move-result v6
 
     if-lez v6, :cond_6e
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->ug()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->uj()J
 
     move-result-wide v6
 
@@ -5697,10 +5697,10 @@
     goto :goto_3e
 
     :cond_6a
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qU()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qX()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :goto_3e
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->uf()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
 
     move-result-wide v8
 
@@ -5725,12 +5725,12 @@
     goto :goto_40
 
     :cond_6c
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qT()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qW()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :goto_40
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->uY()V
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->vb()V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/fb;->sc()J
 
     move-result-wide v6
 
@@ -5738,27 +5738,27 @@
 
     invoke-virtual {v1, v7}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bz(I)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qB()J
 
     move-result-wide v6
 
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/fb;->T(J)V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()J
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qV()J
 
     move-result-wide v6
 
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/fb;->U(J)V
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aGo:Ljava/lang/String;
+    iget-object v6, v5, Lcom/google/android/gms/measurement/internal/fb;->aGx:Ljava/lang/String;
 
     const/4 v7, 0x0
 
@@ -5771,10 +5771,10 @@
     goto :goto_41
 
     :cond_6d
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qV()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qY()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :goto_41
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
@@ -5782,21 +5782,21 @@
 
     :cond_6e
     :goto_42
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pH()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pK()I
 
     move-result v5
 
     if-lez v5, :cond_72
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v5
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v6, v6, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -5806,7 +5806,7 @@
 
     if-eqz v5, :cond_70
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ah$b;->pE()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ah$b;->pH()Z
 
     move-result v6
 
@@ -5823,7 +5823,7 @@
 
     :cond_70
     :goto_43
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ak$g;->zzac:Ljava/lang/String;
 
@@ -5840,17 +5840,17 @@
     goto :goto_44
 
     :cond_71
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Did not find measurement config or missing version info. appId"
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIq:Lcom/google/android/gms/internal/measurement/ak$g;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/jf$a;->aIz:Lcom/google/android/gms/internal/measurement/ak$g;
 
     iget-object v7, v7, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
@@ -5861,11 +5861,11 @@
     invoke-virtual {v5, v6, v7}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_44
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v1
 
@@ -5878,17 +5878,17 @@
     invoke-virtual {v5, v1, v11}, Lcom/google/android/gms/measurement/internal/d;->c(Lcom/google/android/gms/internal/measurement/ak$g;Z)Z
 
     :cond_72
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jf$a;->awT:Ljava/util/List;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jf$a;->axc:Ljava/util/List;
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     new-instance v5, Ljava/lang/StringBuilder;
 
@@ -5933,7 +5933,7 @@
 
     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v6
 
@@ -5955,11 +5955,11 @@
 
     if-eq v5, v6, :cond_75
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Deleted fewer rows from raw events table than expected"
 
@@ -5978,11 +5978,11 @@
     invoke-virtual {v1, v6, v5, v3}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_75
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v3
     :try_end_32
@@ -6016,11 +6016,11 @@
     move-object v3, v0
 
     :try_start_34
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Failed to remove unused event metadata. appId"
 
@@ -6031,19 +6031,19 @@
     invoke-virtual {v1, v5, v4, v3}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_46
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_34
     .catchall {:try_start_34 .. :try_end_34} :catchall_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     const/4 v1, 0x1
 
@@ -6053,19 +6053,19 @@
     move-object v2, v1
 
     :try_start_35
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_35
     .catchall {:try_start_35 .. :try_end_35} :catchall_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     const/4 v1, 0x0
 
@@ -6102,11 +6102,11 @@
     :goto_48
     move-object v1, v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     goto :goto_4a
 
@@ -6128,7 +6128,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/jf;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/jf;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     if-nez v0, :cond_1
 
@@ -6137,7 +6137,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/jf;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/jf;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     if-nez v1, :cond_0
 
@@ -6149,7 +6149,7 @@
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/measurement/internal/jf;-><init>(Lcom/google/android/gms/measurement/internal/jk;)V
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/jf;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/jf;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     :cond_0
     monitor-exit v0
@@ -6167,7 +6167,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/measurement/internal/jf;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/jf;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     return-object p0
 .end method
@@ -6175,7 +6175,7 @@
 .method private final b(Ljava/nio/channels/FileChannel;)I
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
     const/4 v0, 0x0
 
@@ -6211,13 +6211,13 @@
 
     if-eq p1, v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Unexpected data length. Bytes read"
 
@@ -6244,13 +6244,13 @@
     :catch_0
     move-exception p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to read from channel"
 
@@ -6261,13 +6261,13 @@
 
     :cond_3
     :goto_1
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Bad channel to read from"
 
@@ -6280,7 +6280,7 @@
     .locals 6
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v0
 
@@ -6292,9 +6292,9 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -6302,7 +6302,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v1
 
@@ -6312,7 +6312,7 @@
 
     iget v0, v0, Landroid/content/pm/PackageInfo;->versionCode:I
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v1
 
@@ -6327,9 +6327,9 @@
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -6337,7 +6337,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v1
 
@@ -6347,13 +6347,13 @@
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v1
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object p1
 
@@ -6383,7 +6383,7 @@
 .method private final b(Lcom/google/android/gms/internal/measurement/ak$c$a;Lcom/google/android/gms/internal/measurement/ak$c$a;)V
     .locals 9
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qz()Ljava/lang/String;
 
     move-result-object v0
 
@@ -6395,9 +6395,9 @@
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -6411,7 +6411,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result v2
 
@@ -6430,9 +6430,9 @@
     :cond_0
     iget-wide v2, v0, Lcom/google/android/gms/internal/measurement/ak$e;->zzf:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v0
 
@@ -6457,7 +6457,7 @@
     add-long/2addr v2, v4
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -6465,7 +6465,7 @@
 
     invoke-static {p2, v1, v0}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     const-wide/16 v0, 0x1
 
@@ -6498,7 +6498,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pH()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->pK()I
 
     move-result v1
 
@@ -6510,7 +6510,7 @@
 
     iget-wide v2, v1, Lcom/google/android/gms/internal/measurement/ak$c;->zzf:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qy()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qB()J
 
     move-result-wide v4
 
@@ -6525,7 +6525,7 @@
     :cond_0
     iget-wide v2, v1, Lcom/google/android/gms/internal/measurement/ak$c;->zzf:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()J
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qV()J
 
     move-result-wide v4
 
@@ -6559,7 +6559,7 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -6567,13 +6567,13 @@
 
     move-result-wide v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v15, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v15, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v7
 
@@ -6595,11 +6595,11 @@
     return-void
 
     :cond_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v7
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v15, v8}, Lcom/google/android/gms/measurement/internal/es;->R(Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -6617,25 +6617,25 @@
 
     if-eqz v7, :cond_6
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v4
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v5
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v5, v6}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -6645,7 +6645,7 @@
 
     invoke-virtual {v3, v6, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
@@ -6655,7 +6655,7 @@
 
     if-nez v3, :cond_3
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v3
 
@@ -6674,7 +6674,7 @@
     :goto_0
     if-nez v17, :cond_4
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v13, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -6682,22 +6682,22 @@
 
     if-nez v3, :cond_4
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
     const/16 v4, 0xb
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v4, v14, v2, v12}, Lcom/google/android/gms/measurement/internal/jm;->b(ILjava/lang/String;Ljava/lang/String;I)V
 
     :cond_4
     if-eqz v17, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
@@ -6707,11 +6707,11 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->nk()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->nn()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->sq()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->st()J
 
     move-result-wide v5
 
@@ -6719,9 +6719,9 @@
 
     move-result-wide v3
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v5
 
@@ -6735,7 +6735,7 @@
 
     move-result-wide v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCP:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCY:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v5, v11}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -6751,13 +6751,13 @@
 
     if-lez v7, :cond_5
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Fetching config for blacklisted app"
 
@@ -6769,9 +6769,9 @@
     return-void
 
     :cond_6
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
@@ -6783,17 +6783,17 @@
 
     if-eqz v7, :cond_7
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v8
 
@@ -6806,18 +6806,18 @@
     invoke-virtual {v7, v9, v8}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
     invoke-virtual {v1, v3}, Lcom/google/android/gms/measurement/internal/jf;->f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
 
     const-string v7, "_iap"
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -6830,7 +6830,7 @@
     if-nez v7, :cond_9
 
     :try_start_1
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v8, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -6851,7 +6851,7 @@
 
     :cond_9
     :goto_1
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     const-string v9, "currency"
 
@@ -6859,7 +6859,7 @@
 
     move-result-object v7
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v8, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -6872,7 +6872,7 @@
     if-eqz v8, :cond_c
 
     :try_start_2
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzam;->cm(Ljava/lang/String;)Ljava/lang/Double;
 
@@ -6892,7 +6892,7 @@
 
     if-nez v8, :cond_a
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzam;->cl(Ljava/lang/String;)Ljava/lang/Long;
 
@@ -6931,13 +6931,13 @@
     goto :goto_2
 
     :cond_b
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Data lost. Currency value is too big. appId"
 
@@ -6960,7 +6960,7 @@
     goto/16 :goto_8
 
     :cond_c
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v8, v9}, Lcom/google/android/gms/measurement/internal/zzam;->cl(Ljava/lang/String;)Ljava/lang/Long;
 
@@ -7017,7 +7017,7 @@
     :goto_3
     move-object v10, v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
@@ -7027,7 +7027,7 @@
 
     if-eqz v7, :cond_f
 
-    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     instance-of v11, v11, Ljava/lang/Long;
 
@@ -7036,7 +7036,7 @@
     goto :goto_4
 
     :cond_e
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     check-cast v7, Ljava/lang/Long;
 
@@ -7046,11 +7046,11 @@
 
     new-instance v21, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v7
 
@@ -7100,15 +7100,15 @@
 
     const/4 v6, 0x0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCU:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDd:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v11, v15, v12}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -7118,14 +7118,14 @@
 
     invoke-static {v15}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
     :try_start_4
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v12
 
@@ -7160,11 +7160,11 @@
     move-object v5, v0
 
     :try_start_5
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Error pruning currencies. appId"
 
@@ -7177,11 +7177,11 @@
     :goto_5
     new-instance v5, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v7
 
@@ -7206,7 +7206,7 @@
     invoke-direct/range {v7 .. v13}, Lcom/google/android/gms/measurement/internal/jn;-><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/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
@@ -7216,13 +7216,13 @@
 
     if-nez v7, :cond_11
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Too many unique user properties are set. Ignoring user property. appId"
 
@@ -7230,25 +7230,25 @@
 
     move-result-object v9
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v10
 
-    iget-object v11, v5, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v11, v5, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v10, v11}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v10
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v7, v8, v9, v10, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v5
 
@@ -7274,32 +7274,32 @@
     :goto_8
     if-nez v12, :cond_12
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :cond_12
     :goto_9
     :try_start_6
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-static {v5}, Lcom/google/android/gms/measurement/internal/jm;->cF(Ljava/lang/String;)Z
 
     move-result v5
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     move-object/from16 v8, v26
 
@@ -7307,11 +7307,11 @@
 
     move-result v16
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->un()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
 
     move-result-wide v8
 
@@ -7337,9 +7337,9 @@
 
     move-result-object v7
 
-    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->anq:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->anz:J
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCA:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCJ:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v11, 0x0
 
@@ -7373,13 +7373,13 @@
 
     if-nez v2, :cond_13
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Data loss. Too many events logged. appId, count"
 
@@ -7387,7 +7387,7 @@
 
     move-result-object v4
 
-    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/c;->anq:J
+    iget-wide v5, v7, Lcom/google/android/gms/measurement/internal/c;->anz:J
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7396,19 +7396,19 @@
     invoke-virtual {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_13
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
@@ -7416,9 +7416,9 @@
     if-eqz v5, :cond_16
 
     :try_start_7
-    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->anp:J
+    iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->any:J
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCC:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCL:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v13, 0x0
 
@@ -7448,13 +7448,13 @@
 
     if-nez v5, :cond_15
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v4, "Data loss. Too many public events logged. appId, count"
 
@@ -7462,7 +7462,7 @@
 
     move-result-object v5
 
-    iget-wide v7, v7, Lcom/google/android/gms/measurement/internal/c;->anp:J
+    iget-wide v7, v7, Lcom/google/android/gms/measurement/internal/c;->any:J
 
     invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -7471,33 +7471,33 @@
     invoke-virtual {v3, v4, v5, v7}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_15
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v3
 
     const/16 v4, 0x10
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const/4 v5, 0x0
 
     invoke-virtual {v3, v4, v6, v2, v5}, Lcom/google/android/gms/measurement/internal/jm;->b(ILjava/lang/String;Ljava/lang/String;I)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_7
     .catchall {:try_start_7 .. :try_end_7} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
@@ -7507,13 +7507,13 @@
     :try_start_8
     iget-wide v8, v7, Lcom/google/android/gms/measurement/internal/c;->zzd:J
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCB:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCK:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v10, v11}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -7545,13 +7545,13 @@
 
     if-nez v2, :cond_17
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Too many error events logged. appId, count"
 
@@ -7568,45 +7568,45 @@
     invoke-virtual {v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :cond_18
     :try_start_9
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v7
 
     const-string v8, "_o"
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     invoke-virtual {v7, v6, v8, v9}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v7
 
@@ -7623,9 +7623,9 @@
     if-eqz v7, :cond_19
 
     :try_start_a
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v7
 
@@ -7639,9 +7639,9 @@
 
     invoke-virtual {v7, v6, v8, v11}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v7
 
@@ -7652,7 +7652,7 @@
     invoke-virtual {v7, v6, v13, v8}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_19
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v4, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -7665,11 +7665,11 @@
     if-eqz v7, :cond_1a
 
     :try_start_b
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v9}, Lcom/google/android/gms/measurement/internal/ka;->cP(Ljava/lang/String;)Z
 
@@ -7677,11 +7677,11 @@
 
     if-eqz v7, :cond_1a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v9, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v9, v8}, Lcom/google/android/gms/measurement/internal/d;->L(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/jn;
 
@@ -7689,24 +7689,24 @@
 
     if-eqz v7, :cond_1a
 
-    iget-object v9, v7, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v9, v7, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     instance-of v9, v9, Ljava/lang/Long;
 
     if-eqz v9, :cond_1a
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v9
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v9, v6, v8, v7}, Lcom/google/android/gms/measurement/internal/jm;->a(Landroid/os/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_1a
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-virtual {v4, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -7714,13 +7714,13 @@
 
     if-eqz v4, :cond_1b
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDn:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v9, Lcom/google/android/gms/measurement/internal/o;->aDw:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v4, v7, v9}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -7728,11 +7728,11 @@
 
     if-eqz v4, :cond_1b
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v4, v7}, Lcom/google/android/gms/measurement/internal/ka;->cP(Ljava/lang/String;)Z
 
@@ -7747,7 +7747,7 @@
     invoke-virtual {v1, v4, v3}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     :cond_1b
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
@@ -7759,13 +7759,13 @@
 
     if-lez v4, :cond_1c
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v9, "Data lost. Too many events stored on disk, deleted. appId"
 
@@ -7782,11 +7782,11 @@
     :cond_1c
     new-instance v4, Lcom/google/android/gms/measurement/internal/l;
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     iget-wide v14, v2, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -7808,11 +7808,11 @@
 
     invoke-direct/range {v7 .. v16}, Lcom/google/android/gms/measurement/internal/l;-><init>(Lcom/google/android/gms/measurement/internal/ey;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJLandroid/os/Bundle;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-virtual {v6, v2, v7}, Lcom/google/android/gms/measurement/internal/d;->J(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/k;
 
@@ -7820,7 +7820,7 @@
 
     if-nez v6, :cond_1e
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
@@ -7836,13 +7836,13 @@
 
     if-eqz v5, :cond_1d
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Too many event names used, ignoring event. appId, name, supported count"
 
@@ -7850,13 +7850,13 @@
 
     move-result-object v2
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v6
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-virtual {v6, v4}, Lcom/google/android/gms/measurement/internal/dt;->bZ(Ljava/lang/String;)Ljava/lang/String;
 
@@ -7870,9 +7870,9 @@
 
     invoke-virtual {v3, v5, v2, v4, v6}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
@@ -7886,11 +7886,11 @@
     :try_end_b
     .catchall {:try_start_b .. :try_end_b} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
@@ -7900,13 +7900,13 @@
     :try_start_c
     new-instance v6, Lcom/google/android/gms/measurement/internal/k;
 
-    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v9, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     const-wide/16 v10, 0x0
 
     const-wide/16 v12, 0x0
 
-    iget-wide v14, v4, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide v14, v4, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     move-object v7, v6
 
@@ -7919,7 +7919,7 @@
     :cond_1e
     const/4 v5, 0x0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-wide v7, v6, Lcom/google/android/gms/measurement/internal/k;->zzf:J
 
@@ -7927,34 +7927,34 @@
 
     move-result-object v4
 
-    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide v7, v4, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     invoke-virtual {v6, v7, v8}, Lcom/google/android/gms/measurement/internal/k;->ad(J)Lcom/google/android/gms/measurement/internal/k;
 
     move-result-object v6
 
     :goto_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/k;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()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/l;->atJ:Ljava/lang/String;
+    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v2, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -7962,11 +7962,11 @@
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->checkArgument(Z)V
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qN()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$g;->qQ()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qP()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qS()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     move-result-object v2
 
@@ -7976,7 +7976,7 @@
 
     move-result-object v2
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -7984,7 +7984,7 @@
 
     if-nez v6, :cond_1f
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bM(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
@@ -8002,7 +8002,7 @@
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bL(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_20
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -8010,7 +8010,7 @@
 
     if-nez v6, :cond_21
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bN(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
@@ -8034,7 +8034,7 @@
 
     invoke-virtual {v2, v6, v7}, Lcom/google/android/gms/internal/measurement/ak$g$a;->I(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -8042,16 +8042,16 @@
 
     if-nez v6, :cond_23
 
-    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bR(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_23
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDA:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDJ:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -8059,7 +8059,7 @@
 
     if-eqz v6, :cond_24
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qZ()Ljava/lang/String;
 
     move-result-object v6
 
@@ -8111,17 +8111,17 @@
     invoke-virtual {v2, v6, v7}, Lcom/google/android/gms/internal/measurement/ak$g$a;->K(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_26
-    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     invoke-virtual {v2, v6, v7}, Lcom/google/android/gms/internal/measurement/ak$g$a;->N(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDx:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v7, v10}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -8129,11 +8129,11 @@
 
     if-eqz v6, :cond_27
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jj;->yO()Ljava/util/List;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jj;->yR()Ljava/util/List;
 
     move-result-object v6
 
@@ -8142,13 +8142,13 @@
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->e(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_27
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/eh;->cq(Ljava/lang/String;)Landroid/util/Pair;
 
@@ -8164,7 +8164,7 @@
 
     if-nez v7, :cond_28
 
-    iget-boolean v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iget-boolean v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
     if-eqz v7, :cond_2b
 
@@ -8191,15 +8191,15 @@
     goto :goto_d
 
     :cond_28
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v7
 
@@ -8209,13 +8209,13 @@
 
     if-nez v6, :cond_2b
 
-    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iget-boolean v6, v3, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
     if-eqz v6, :cond_2b
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v6
 
@@ -8231,17 +8231,17 @@
 
     if-nez v6, :cond_29
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "null secure ID. appId"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v10
 
@@ -8262,17 +8262,17 @@
 
     if-eqz v7, :cond_2a
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v10, "empty secure ID. appId"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v11
 
@@ -8288,13 +8288,13 @@
 
     :cond_2b
     :goto_d
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     sget-object v6, Landroid/os/Build;->MODEL:Ljava/lang/String;
 
@@ -8302,13 +8302,13 @@
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
     sget-object v7, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
 
@@ -8316,13 +8316,13 @@
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->qy()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->qB()J
 
     move-result-wide v10
 
@@ -8332,13 +8332,13 @@
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->vl()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/i;->vo()Ljava/lang/String;
 
     move-result-object v7
 
@@ -8350,21 +8350,21 @@
 
     invoke-virtual {v6, v10, v11}, Lcom/google/android/gms/internal/measurement/ak$g$a;->M(J)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yl()Z
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
 
     move-result v6
 
     if-eqz v6, :cond_2c
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uZ()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->vc()Z
 
     move-result v6
 
     if-eqz v6, :cond_2c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -8374,14 +8374,14 @@
 
     if-nez v6, :cond_2c
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qY()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->rb()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_2c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/d;->cf(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/fb;
 
@@ -8391,39 +8391,39 @@
 
     new-instance v6, Lcom/google/android/gms/measurement/internal/fb;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-direct {v6, v7, v10}, Lcom/google/android/gms/measurement/internal/fb;-><init>(Lcom/google/android/gms/measurement/internal/ey;Ljava/lang/String;)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v7
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jm;->rR()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
 
     move-result-object v7
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/fb;->aL(Ljava/lang/String;)V
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/fb;->cB(Ljava/lang/String;)V
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/fb;->cz(Ljava/lang/String;)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v7
 
-    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v10}, Lcom/google/android/gms/measurement/internal/eh;->cp(Ljava/lang/String;)Ljava/lang/String;
 
@@ -8437,7 +8437,7 @@
 
     invoke-virtual {v6, v8, v9}, Lcom/google/android/gms/measurement/internal/fb;->U(J)V
 
-    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v7, v3, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/fb;->cC(Ljava/lang/String;)V
 
@@ -8465,18 +8465,18 @@
 
     invoke-virtual {v6, v10, v11}, Lcom/google/android/gms/measurement/internal/fb;->ai(J)V
 
-    iget-wide v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v10, v3, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     invoke-virtual {v6, v10, v11}, Lcom/google/android/gms/measurement/internal/fb;->ag(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
     invoke-virtual {v7, v6}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/fb;)V
 
     :cond_2d
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->uc()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->uf()Ljava/lang/String;
 
     move-result-object v7
 
@@ -8486,14 +8486,14 @@
 
     if-nez v7, :cond_2e
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->uc()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->uf()Ljava/lang/String;
 
     move-result-object v7
 
     invoke-virtual {v2, v7}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bP(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_2e
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v7
 
@@ -8503,18 +8503,18 @@
 
     if-nez v7, :cond_2f
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v6
 
     invoke-virtual {v2, v6}, Lcom/google/android/gms/internal/measurement/ak$g$a;->bS(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_2f
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v6, v3}, Lcom/google/android/gms/measurement/internal/d;->ce(Ljava/lang/String;)Ljava/util/List;
 
@@ -8529,7 +8529,7 @@
 
     if-ge v6, v7, :cond_30
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rp()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$k;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     move-result-object v7
 
@@ -8539,7 +8539,7 @@
 
     check-cast v10, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v7, v10}, Lcom/google/android/gms/internal/measurement/ak$k$a;->bV(Ljava/lang/String;)Lcom/google/android/gms/internal/measurement/ak$k$a;
 
@@ -8557,7 +8557,7 @@
 
     move-result-object v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v10
 
@@ -8567,7 +8567,7 @@
 
     check-cast v11, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v10, v7, v11}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ak$k$a;Ljava/lang/Object;)V
 
@@ -8581,11 +8581,11 @@
 
     :cond_30
     :try_start_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v6
 
@@ -8601,15 +8601,15 @@
     .catchall {:try_start_d .. :try_end_d} :catchall_0
 
     :try_start_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v7, :cond_33
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/zzam;->iterator()Ljava/util/Iterator;
 
@@ -8647,27 +8647,27 @@
     goto :goto_f
 
     :cond_32
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v7
 
-    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
-    iget-object v11, v4, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v11, v4, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-virtual {v7, v10, v11}, Lcom/google/android/gms/measurement/internal/es;->G(Ljava/lang/String;Ljava/lang/String;)Z
 
     move-result v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v26
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->un()J
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uq()J
 
     move-result-wide v27
 
-    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v10, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     const/16 v30, 0x0
 
@@ -8689,11 +8689,11 @@
 
     iget-wide v10, v10, Lcom/google/android/gms/measurement/internal/c;->zze:J
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v12, v4, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v12, v4, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v12}, Lcom/google/android/gms/measurement/internal/ka;->cJ(Ljava/lang/String;)I
 
@@ -8715,7 +8715,7 @@
 
     if-eqz v2, :cond_34
 
-    iput-wide v8, v1, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iput-wide v8, v1, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     goto :goto_12
 
@@ -8724,17 +8724,17 @@
 
     move-object v3, v0
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Data loss. Failed to insert raw event metadata. appId"
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mN()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g$a;->mQ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -8746,15 +8746,15 @@
 
     :cond_34
     :goto_12
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
@@ -8766,19 +8766,19 @@
 
     if-eqz v2, :cond_35
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Event recorded"
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v5
 
@@ -8791,21 +8791,21 @@
     .catchall {:try_start_e .. :try_end_e} :catchall_0
 
     :cond_35
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
@@ -8836,11 +8836,11 @@
 
     move-object v2, v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     goto :goto_14
 
@@ -8851,57 +8851,12 @@
     goto :goto_13
 .end method
 
-.method private final uZ()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uZ()Z
-
-    move-result v0
-
-    if-nez v0, :cond_1
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_1
-    :goto_0
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method private final un()J
+.method private final uq()J
     .locals 8
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -8909,19 +8864,19 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xB()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ft;->xE()V
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/eh;->aER:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v3
 
@@ -8933,11 +8888,11 @@
 
     const-wide/16 v3, 0x1
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jm;->yP()Ljava/security/SecureRandom;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
 
     move-result-object v5
 
@@ -8951,7 +8906,7 @@
 
     add-long/2addr v3, v5
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aER:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/eh;->aFa:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
@@ -8975,39 +8930,84 @@
     return-wide v0
 .end method
 
-.method private final xB()V
+.method private final vc()Z
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->vc()Z
+
+    move-result v0
+
+    if-nez v0, :cond_1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->va()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_1
+    :goto_0
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method private final xE()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
     if-nez v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAj:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAs:Z
 
     if-nez v0, :cond_3
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
     if-eqz v0, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Stopping uploading service(s)"
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -9036,7 +9036,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIs:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -9044,13 +9044,13 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     iget-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
@@ -9058,13 +9058,13 @@
 
     move-result-object v1
 
-    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aAj:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aAs: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/jf;->aIl:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
     invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -9077,10 +9077,10 @@
     return-void
 .end method
 
-.method private final yJ()Lcom/google/android/gms/measurement/internal/eg;
+.method private final yM()Lcom/google/android/gms/measurement/internal/eg;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIc:Lcom/google/android/gms/measurement/internal/eg;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Lcom/google/android/gms/measurement/internal/eg;
 
     if-eqz v0, :cond_0
 
@@ -9096,26 +9096,26 @@
     throw v0
 .end method
 
-.method private final yK()Lcom/google/android/gms/measurement/internal/ja;
+.method private final yN()Lcom/google/android/gms/measurement/internal/ja;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aId:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ja;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aId:Lcom/google/android/gms/measurement/internal/ja;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Lcom/google/android/gms/measurement/internal/ja;
 
     return-object v0
 .end method
 
-.method private final yN()Z
+.method private final yQ()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->atn:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->atw:Z
 
     if-eqz v0, :cond_0
 
@@ -9129,16 +9129,16 @@
     return v0
 .end method
 
-.method private final yl()Z
+.method private final yo()Z
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDU:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEd:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -9150,7 +9150,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIv:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_0
 
@@ -9160,22 +9160,22 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -9200,40 +9200,40 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Ljava/nio/channels/FileChannel;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIw:Ljava/nio/channels/FileChannel;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Ljava/nio/channels/FileChannel;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIw: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/jf;->aIm:Ljava/nio/channels/FileLock;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIv:Ljava/nio/channels/FileLock;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIm:Ljava/nio/channels/FileLock;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIv:Ljava/nio/channels/FileLock;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
     return v1
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Storage concurrent data access panic"
 
@@ -9248,13 +9248,13 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Storage lock already acquired"
 
@@ -9265,13 +9265,13 @@
     :catch_1
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to access storage lock file"
 
@@ -9282,13 +9282,13 @@
     :catch_2
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to acquire storage lock"
 
@@ -9313,19 +9313,19 @@
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     iget-wide v11, v0, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v4
 
@@ -9347,11 +9347,11 @@
     return-void
 
     :cond_1
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v4, v3, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -9359,13 +9359,13 @@
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIz:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIz:Ljava/util/List;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-interface {v4, v5}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -9373,9 +9373,9 @@
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v4
 
@@ -9387,13 +9387,13 @@
 
     new-instance v5, Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     new-instance v15, Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-direct {v15, v4}, Lcom/google/android/gms/measurement/internal/zzam;-><init>(Landroid/os/Bundle;)V
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -9410,17 +9410,17 @@
     goto :goto_0
 
     :cond_2
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     const-string v5, "Dropping non-safelisted event. appId, event name, origin"
 
@@ -9430,22 +9430,22 @@
 
     :cond_3
     :goto_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const/4 v5, 0x2
 
@@ -9459,11 +9459,11 @@
 
     if-gez v8, :cond_4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Invalid time querying timed out conditional properties"
 
@@ -9521,60 +9521,60 @@
 
     if-eqz v8, :cond_5
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v10, "User property timed out"
 
-    iget-object v15, v8, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v15, v8, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v14
 
-    iget-object v13, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v13, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v14, v13}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v13
 
-    iget-object v14, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v14, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v14
 
     invoke-virtual {v9, v10, v15, v13, v14}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v9, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v9, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v9, :cond_6
 
     new-instance v9, Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v10, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     invoke-direct {v9, v10, v11, v12}, Lcom/google/android/gms/measurement/internal/zzan;-><init>(Lcom/google/android/gms/measurement/internal/zzan;J)V
 
     invoke-direct {v1, v9, v2}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzan;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     :cond_6
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v9
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v9, v3, v8}, Lcom/google/android/gms/measurement/internal/d;->N(Ljava/lang/String;Ljava/lang/String;)I
 
@@ -9585,25 +9585,25 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_8
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Invalid time querying expired conditional properties"
 
@@ -9673,66 +9673,66 @@
 
     if-eqz v9, :cond_9
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v13, "User property expired"
 
-    iget-object v14, v9, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v14, v9, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v15
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v15, v5}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v15, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v15, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v15
 
     invoke-virtual {v10, v13, v14, v5, v15}, Lcom/google/android/gms/measurement/internal/dx;->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/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    iget-object v10, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v10, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v5, v3, v10}, Lcom/google/android/gms/measurement/internal/d;->K(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v5, :cond_a
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     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/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v5, v3, v9}, Lcom/google/android/gms/measurement/internal/d;->N(Ljava/lang/String;Ljava/lang/String;)I
 
@@ -9769,29 +9769,29 @@
     goto :goto_5
 
     :cond_c
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v5}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     cmp-long v8, v11, v6
 
     if-gez v8, :cond_d
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "Invalid time querying triggered conditional properties"
 
@@ -9799,7 +9799,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -9879,17 +9879,17 @@
 
     if-eqz v15, :cond_e
 
-    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     new-instance v10, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v5, v15, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v5, v15, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v7, v4, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v16
 
@@ -9903,7 +9903,7 @@
 
     invoke-direct/range {v4 .. v10}, Lcom/google/android/gms/measurement/internal/jn;-><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/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
@@ -9913,75 +9913,75 @@
 
     if-eqz v4, :cond_f
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "User property triggered"
 
-    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v7
 
-    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
-    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v4, v5, v6, v7, v8}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     goto :goto_8
 
     :cond_f
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Too many active user properties, ignoring"
 
-    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v6, v15, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v6}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v7
 
-    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v7
 
-    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v8, v13, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v4, v5, v6, v7, v8}, Lcom/google/android/gms/measurement/internal/dx;->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/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v4, :cond_10
 
-    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     invoke-interface {v14, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -9990,13 +9990,13 @@
 
     invoke-direct {v4, v13}, Lcom/google/android/gms/measurement/internal/zzkj;-><init>(Lcom/google/android/gms/measurement/internal/jn;)V
 
-    iput-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     const/4 v4, 0x1
 
     iput-boolean v4, v15, Lcom/google/android/gms/measurement/internal/zzv;->zze:Z
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
@@ -10037,30 +10037,30 @@
     goto :goto_9
 
     :cond_12
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     goto :goto_b
 
@@ -10074,11 +10074,11 @@
 .method final a(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 12
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -10106,13 +10106,13 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jm;->cE(Ljava/lang/String;)I
 
@@ -10128,30 +10128,30 @@
 
     if-eqz v0, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-static {p2, v3, v2}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;IZ)Ljava/lang/String;
 
     move-result-object p2
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     if-eqz v2, :cond_2
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {p1}, Ljava/lang/String;->length()I
 
     move-result v4
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p1
 
@@ -10160,15 +10160,15 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v6
 
@@ -10178,17 +10178,17 @@
 
     if-eqz v0, :cond_6
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-static {p2, v3, v2}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;IZ)Ljava/lang/String;
 
     move-result-object p2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -10212,9 +10212,9 @@
     move-result v4
 
     :cond_5
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p1
 
@@ -10223,13 +10223,13 @@
     return-void
 
     :cond_6
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -10242,7 +10242,7 @@
     return-void
 
     :cond_7
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     const-string v2, "_sid"
 
@@ -10252,11 +10252,11 @@
 
     if-eqz v1, :cond_b
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->cP(Ljava/lang/String;)Z
 
@@ -10264,17 +10264,17 @@
 
     if-eqz v1, :cond_b
 
-    iget-wide v7, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v7, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
     iget-object v10, p1, Lcom/google/android/gms/measurement/internal/zzkj;->zze:Ljava/lang/String;
 
     const-wide/16 v1, 0x0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const-string v6, "_sno"
 
@@ -10284,13 +10284,13 @@
 
     if-eqz v3, :cond_8
 
-    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v5, v3, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     instance-of v5, v5, Ljava/lang/Long;
 
     if-eqz v5, :cond_8
 
-    iget-object v1, v3, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v1, v3, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     check-cast v1, Ljava/lang/Long;
 
@@ -10303,28 +10303,28 @@
     :cond_8
     if-eqz v3, :cond_9
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     const-string v6, "Retrieved last session number from database does not contain a valid (long) value"
 
     invoke-virtual {v5, v6, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_9
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDm:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDv:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v5, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -10332,11 +10332,11 @@
 
     if-eqz v3, :cond_a
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v3
 
-    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v5, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const-string v6, "_s"
 
@@ -10346,15 +10346,15 @@
 
     if-eqz v3, :cond_a
 
-    iget-wide v1, v3, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v1, v3, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -10387,13 +10387,13 @@
     :cond_b
     new-instance v1, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v6, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v6, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     iget-object v7, p1, Lcom/google/android/gms/measurement/internal/zzkj;->zze:Ljava/lang/String;
 
-    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v8, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iget-wide v9, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v9, p1, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
     move-object v5, v1
 
@@ -10401,21 +10401,21 @@
 
     invoke-direct/range {v5 .. v11}, Lcom/google/android/gms/measurement/internal/jn;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -10425,16 +10425,16 @@
 
     invoke-virtual {p1, v3, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/jf;->f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
@@ -10442,72 +10442,72 @@
 
     move-result p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
 
     if-eqz p1, :cond_c
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "User property set"
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {p1, p2, v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_c
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Too many unique user properties are set. Ignoring user property"
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {p1, p2, v0, v1}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p1
 
@@ -10520,22 +10520,22 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :goto_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
 .end method
@@ -10545,7 +10545,7 @@
 
     const-string v0, "app_id=?"
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
 
     if-eqz v1, :cond_0
 
@@ -10553,29 +10553,29 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Ljava/util/List;
+    iput-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIy:Ljava/util/List;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIy:Ljava/util/List;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx: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/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v2}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     :try_start_0
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v3
 
@@ -10661,11 +10661,11 @@
 
     if-lez v6, :cond_1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Reset analytics data. app, records"
 
@@ -10682,11 +10682,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -10700,11 +10700,11 @@
     :goto_0
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jb;->zzb()Z
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aEk:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -10721,27 +10721,27 @@
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v2
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     iget-boolean v5, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzh:Z
 
-    iget-boolean v6, p1, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iget-boolean v6, p1, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
-    iget-boolean v7, p1, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iget-boolean v7, p1, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
-    iget-wide v8, p1, Lcom/google/android/gms/measurement/internal/zzm;->axl:J
+    iget-wide v8, p1, Lcom/google/android/gms/measurement/internal/zzm;->axu:J
 
     iget-object v10, p1, Lcom/google/android/gms/measurement/internal/zzm;->zzr:Ljava/lang/String;
 
-    iget-object v11, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iget-object v11, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
     move-object v1, p0
 
@@ -10764,29 +10764,29 @@
 
     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/zzv;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->ane: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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -10822,22 +10822,22 @@
 
     iput-boolean p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->zze:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->M(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzv;
 
@@ -10845,9 +10845,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -10855,33 +10855,33 @@
 
     if-nez v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     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/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -10894,9 +10894,9 @@
 
     if-eqz v3, :cond_3
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
     iget-wide v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->zzd:J
 
@@ -10910,9 +10910,9 @@
 
     iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->zzf:Ljava/lang/String;
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     iget-boolean v2, v1, Lcom/google/android/gms/measurement/internal/zzv;->zze:Z
 
@@ -10920,21 +10920,21 @@
 
     new-instance v2, Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v5, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v7
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     iget-object v8, v1, Lcom/google/android/gms/measurement/internal/zzkj;->zze:Ljava/lang/String;
 
@@ -10942,7 +10942,7 @@
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/zzkj;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     goto :goto_0
 
@@ -10957,19 +10957,19 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->zzd:J
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v7
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     iget-object v8, v1, Lcom/google/android/gms/measurement/internal/zzkj;->zze:Ljava/lang/String;
 
@@ -10977,7 +10977,7 @@
 
     invoke-direct/range {v3 .. v8}, Lcom/google/android/gms/measurement/internal/zzkj;-><init>(Ljava/lang/String;JLjava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     iput-boolean v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->zze:Z
 
@@ -10989,19 +10989,19 @@
 
     if-eqz v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     new-instance v9, Lcom/google/android/gms/measurement/internal/jn;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iget-wide v6, v1, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v6, v1, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v8
 
@@ -11009,7 +11009,7 @@
 
     invoke-direct/range {v2 .. v8}, Lcom/google/android/gms/measurement/internal/jn;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JLjava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
@@ -11019,79 +11019,79 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "User property updated immediately"
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     goto :goto_1
 
     :cond_5
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "(2)Too many active user properties, ignoring"
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v4
 
-    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v5, v9, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     invoke-virtual {v1, v2, v3, v4, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_1
     if-eqz p1, :cond_6
 
-    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object p1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz p1, :cond_6
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     iget-wide v2, v0, Lcom/google/android/gms/measurement/internal/zzv;->zzd:J
 
@@ -11100,7 +11100,7 @@
     invoke-direct {p0, p1, p2}, Lcom/google/android/gms/measurement/internal/jf;->b(Lcom/google/android/gms/measurement/internal/zzan;Lcom/google/android/gms/measurement/internal/zzm;)V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
@@ -11110,35 +11110,35 @@
 
     if-eqz p1, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Conditional property added"
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -11147,69 +11147,69 @@
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Too many conditional properties, ignoring"
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v0
 
     invoke-virtual {p1, p2, v1, v2, v0}, Lcom/google/android/gms/measurement/internal/dx;->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/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
 .end method
@@ -11231,9 +11231,9 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -11245,13 +11245,13 @@
     new-array p4, v0, [B
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "onConfigFetched. Response size"
 
@@ -11263,16 +11263,16 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
@@ -11307,13 +11307,13 @@
     :goto_0
     if-nez v1, :cond_3
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "App does not exist in onConfigFetched. appId"
 
@@ -11335,9 +11335,9 @@
     goto :goto_2
 
     :cond_4
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p4
 
@@ -11347,19 +11347,19 @@
 
     invoke-virtual {v1, p4, p5}, Lcom/google/android/gms/measurement/internal/fb;->w(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p4
 
     invoke-virtual {p4, v1}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/fb;)V
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p5, "Fetching config failed. code, error"
 
@@ -11369,23 +11369,23 @@
 
     invoke-virtual {p4, p5, v1, p3}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object p3
 
     invoke-virtual {p3, p1}, Lcom/google/android/gms/measurement/internal/es;->cr(Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEO:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p3
 
@@ -11412,17 +11412,17 @@
     :goto_1
     if-eqz v4, :cond_7
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEP:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
@@ -11433,7 +11433,7 @@
     invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
     goto/16 :goto_7
 
@@ -11484,7 +11484,7 @@
     goto :goto_5
 
     :cond_b
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object p3
 
@@ -11497,24 +11497,24 @@
     if-nez p3, :cond_d
 
     :try_start_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :cond_c
     :goto_5
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object p5
 
@@ -11524,7 +11524,7 @@
 
     if-nez p5, :cond_d
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object p5
 
@@ -11537,25 +11537,25 @@
     if-nez p3, :cond_d
 
     :try_start_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :cond_d
     :try_start_5
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p3
 
@@ -11565,7 +11565,7 @@
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/fb;->v(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p3
 
@@ -11573,13 +11573,13 @@
 
     if-ne p2, v5, :cond_e
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Config not found. Using empty config. appId"
 
@@ -11588,13 +11588,13 @@
     goto :goto_6
 
     :cond_e
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Successfully fetched config. Got network response. code, size"
 
@@ -11611,50 +11611,50 @@
     invoke-virtual {p1, p3, p2, p4}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :goto_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qB()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
 
     move-result p1
 
     if-eqz p1, :cond_f
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->uZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->vc()Z
 
     move-result p1
 
     if-eqz p1, :cond_f
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
 
     goto :goto_7
 
     :cond_f
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
     :goto_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_5
     .catchall {:try_start_5 .. :try_end_5} :catchall_0
 
     :try_start_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_1
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
@@ -11662,11 +11662,11 @@
     move-exception p1
 
     :try_start_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
     :try_end_7
@@ -11677,7 +11677,7 @@
 
     iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->zzr:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     throw p1
 .end method
@@ -11685,9 +11685,9 @@
 .method final b(ILjava/lang/Throwable;[B)V
     .locals 9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
     const/4 v0, 0x0
 
@@ -11697,11 +11697,11 @@
     new-array p3, v0, [B
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
@@ -11719,17 +11719,17 @@
     if-nez p2, :cond_6
 
     :try_start_1
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v3
 
@@ -11739,27 +11739,27 @@
 
     invoke-virtual {p2, v5, v6}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEO:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
     const-wide/16 v5, 0x0
 
     invoke-virtual {p2, v5, v6}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Successful upload. Got network response. code, size"
 
@@ -11775,11 +11775,11 @@
 
     invoke-virtual {p2, v3, p1, p3}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->tU()V
     :try_end_1
     .catch Landroid/database/sqlite/SQLiteException; {:try_start_1 .. :try_end_1} :catch_2
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
@@ -11805,7 +11805,7 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p3
 
@@ -11813,11 +11813,11 @@
 
     move-result-wide v7
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v1
 
@@ -11861,11 +11861,11 @@
     move-exception v1
 
     :try_start_5
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to delete a bundle in a queue table"
 
@@ -11880,11 +11880,11 @@
     move-exception p3
 
     :try_start_6
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIy:Ljava/util/List;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIy:Ljava/util/List;
 
     invoke-interface {v1, p2}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -11898,63 +11898,63 @@
     throw p3
 
     :cond_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_6
     .catchall {:try_start_6 .. :try_end_6} :catchall_0
 
     :try_start_7
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
-    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIp:Ljava/util/List;
+    iput-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIy:Ljava/util/List;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qB()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->uZ()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->vc()Z
 
     move-result p1
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qs()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->qv()V
 
     goto :goto_1
 
     :cond_5
     const-wide/16 p1, -0x1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aGm:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
     :goto_1
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     goto/16 :goto_3
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
     :try_end_7
@@ -11965,41 +11965,41 @@
     move-exception p1
 
     :try_start_8
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Database error while trying to delete uploaded bundles"
 
     invoke-virtual {p2, p3, p1}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {p1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Disable upload, time"
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -12010,13 +12010,13 @@
     goto :goto_3
 
     :cond_6
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Network upload failed. Will retry later. code, error"
 
@@ -12026,17 +12026,17 @@
 
     invoke-virtual {p3, v2, v3, p2}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEO:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p3
 
@@ -12063,17 +12063,17 @@
     :goto_2
     if-eqz v4, :cond_9
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEP:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object p2
 
@@ -12084,29 +12084,29 @@
     invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_9
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/measurement/internal/d;->m(Ljava/util/List;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()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/jf;->aAj:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAj:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAs:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     goto :goto_5
 
@@ -12126,7 +12126,7 @@
 
     move-object/from16 v3, p2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
@@ -12136,7 +12136,7 @@
 
     if-eqz v2, :cond_4
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v4
 
@@ -12155,7 +12155,7 @@
 
     if-nez v4, :cond_1
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v5, "_ui"
 
@@ -12165,13 +12165,13 @@
 
     if-nez v4, :cond_2
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -12190,13 +12190,13 @@
 
     if-nez v4, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p2 .. p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -12212,41 +12212,41 @@
     :goto_0
     new-instance v15, Lcom/google/android/gms/measurement/internal/zzm;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v6
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uk()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->un()J
 
     move-result-wide v9
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->rW()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
 
     move-result-wide v11
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->nb()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
 
     move-result v14
 
     const/16 v16, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v17
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ut()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uw()J
 
     move-result-wide v18
 
@@ -12254,43 +12254,43 @@
 
     const/16 v22, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->xG()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v23
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yo()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
 
     move-result v24
 
     const/16 v25, 0x0
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v26
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->wf()Ljava/lang/Boolean;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->wi()Ljava/lang/Boolean;
 
     move-result-object v27
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
 
     move-result-wide v28
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yr()Ljava/util/List;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
 
     move-result-object v30
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    iget-object v13, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v13, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v13, v3, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -12298,7 +12298,7 @@
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->vl()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fb;->vo()Ljava/lang/String;
 
     move-result-object v0
 
@@ -12354,13 +12354,13 @@
 
     :cond_4
     :goto_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "No app data available; dropping event"
 
@@ -12374,11 +12374,11 @@
 .method final b(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -12406,13 +12406,13 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -12424,7 +12424,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     const-string v3, "_npa"
 
@@ -12434,17 +12434,17 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Falling back to manifest metadata value for ad personalization"
 
@@ -12452,9 +12452,9 @@
 
     new-instance p1, Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -12462,7 +12462,7 @@
 
     move-result-wide v3
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -12495,21 +12495,21 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -12517,46 +12517,46 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/jf;->f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, p2, v2}, Lcom/google/android/gms/measurement/internal/d;->K(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -12566,41 +12566,41 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
 
     :cond_4
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v3
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -12608,46 +12608,46 @@
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_1
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/jf;->f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, p2, v2}, Lcom/google/android/gms/measurement/internal/d;->K(Ljava/lang/String;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uX()V
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -12657,22 +12657,22 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
 .end method
@@ -12692,17 +12692,17 @@
 
     const-string v0, "app_id=?"
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()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/zzm;->atJ:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v6}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v6}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -12721,11 +12721,11 @@
     return-void
 
     :cond_0
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v6, v7}, Lcom/google/android/gms/measurement/internal/d;->cf(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/fb;
 
@@ -12735,7 +12735,7 @@
 
     if-eqz v6, :cond_1
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v9
 
@@ -12745,7 +12745,7 @@
 
     if-eqz v9, :cond_1
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v9}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -12755,17 +12755,17 @@
 
     invoke-virtual {v6, v7, v8}, Lcom/google/android/gms/measurement/internal/fb;->v(J)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v9
 
     invoke-virtual {v9, v6}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/fb;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yG()Lcom/google/android/gms/measurement/internal/es;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v6
 
-    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v6, v9}, Lcom/google/android/gms/measurement/internal/es;->cs(Ljava/lang/String;)V
 
@@ -12779,15 +12779,15 @@
     return-void
 
     :cond_2
-    iget-wide v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->axl:J
+    iget-wide v9, v2, Lcom/google/android/gms/measurement/internal/zzm;->axu:J
 
     cmp-long v6, v9, v7
 
     if-nez v6, :cond_3
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v6
 
@@ -12796,13 +12796,13 @@
     move-result-wide v9
 
     :cond_3
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v11, v12}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -12810,16 +12810,16 @@
 
     if-eqz v6, :cond_4
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yg()Lcom/google/android/gms/measurement/internal/i;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->yj()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v6
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/i;->vm()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/i;->vp()V
 
     :cond_4
-    iget v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->awy:I
+    iget v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->awH:I
 
     const/4 v15, 0x0
 
@@ -12829,15 +12829,15 @@
 
     if-eq v6, v13, :cond_5
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -12854,20 +12854,20 @@
     const/4 v6, 0x0
 
     :cond_5
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v11, v12, v14}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -12875,11 +12875,11 @@
 
     if-eqz v11, :cond_a
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const-string v14, "_npa"
 
@@ -12891,7 +12891,7 @@
 
     const-string v11, "auto"
 
-    iget-object v12, v14, Lcom/google/android/gms/measurement/internal/jn;->amV:Ljava/lang/String;
+    iget-object v12, v14, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
 
     invoke-virtual {v11, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -12900,7 +12900,7 @@
     if-eqz v11, :cond_a
 
     :cond_6
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     if-eqz v11, :cond_9
 
@@ -12908,7 +12908,7 @@
 
     const-string v16, "_npa"
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     invoke-virtual {v11}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -12952,9 +12952,9 @@
 
     if-eqz v8, :cond_8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
-    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iget-object v11, v7, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
     invoke-virtual {v8, v11}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -13001,11 +13001,11 @@
 
     :cond_b
     :goto_1
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v8, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v8}, Lcom/google/android/gms/measurement/internal/d;->cf(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/fb;
 
@@ -13013,19 +13013,19 @@
 
     if-eqz v7, :cond_d
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v12
 
     iget-object v13, v2, Lcom/google/android/gms/measurement/internal/zzm;->zzr:Ljava/lang/String;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v14
 
@@ -13035,17 +13035,17 @@
 
     if-eqz v11, :cond_d
 
-    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v11, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v11
 
-    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v11, v11, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v12, "New GMP App Id passed in. Removing cached database data. appId"
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v13
 
@@ -13055,24 +13055,24 @@
 
     invoke-virtual {v11, v12, v13}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v7
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {v7}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v12
 
@@ -13160,11 +13160,11 @@
 
     if-lez v14, :cond_c
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "Deleted application data. app, records"
 
@@ -13191,11 +13191,11 @@
 
     :goto_2
     :try_start_3
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Error deleting application data. appId, error"
 
@@ -13217,7 +13217,7 @@
     :goto_4
     if-eqz v7, :cond_11
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v11
 
@@ -13227,7 +13227,7 @@
 
     if-eqz v0, :cond_e
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v11
 
@@ -13250,7 +13250,7 @@
     const/4 v0, 0x0
 
     :goto_5
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v3
 
@@ -13258,17 +13258,17 @@
 
     if-nez v11, :cond_10
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v3
 
     if-eqz v3, :cond_10
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v3
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -13294,7 +13294,7 @@
 
     const-string v3, "_pv"
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v4
 
@@ -13333,11 +13333,11 @@
 
     if-nez v6, :cond_13
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const-string v7, "_f"
 
@@ -13352,11 +13352,11 @@
 
     if-ne v6, v3, :cond_14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const-string v7, "_v"
 
@@ -13419,11 +13419,11 @@
 
     invoke-virtual {v1, v6, v2}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/ka;->cN(Ljava/lang/String;)Z
 
@@ -13431,20 +13431,20 @@
 
     if-eqz v6, :cond_15
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFW:Lcom/google/android/gms/measurement/internal/en;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aGf:Lcom/google/android/gms/measurement/internal/en;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v6, v11}, Lcom/google/android/gms/measurement/internal/en;->aL(Ljava/lang/String;)V
 
     :cond_15
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
     new-instance v6, Landroid/os/Bundle;
 
@@ -13470,11 +13470,11 @@
 
     invoke-virtual {v6, v7, v11, v12}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v11, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v11}, Lcom/google/android/gms/measurement/internal/ka;->bi(Ljava/lang/String;)Z
 
@@ -13487,24 +13487,24 @@
     invoke-virtual {v6, v4, v11, v12}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_16
-    iget-boolean v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->amo:Z
+    iget-boolean v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
 
     if-eqz v7, :cond_17
 
     invoke-virtual {v6, v0, v11, v12}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_17
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v7}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     const-string v11, "first_open_count"
 
@@ -13512,9 +13512,9 @@
 
     move-result-wide v13
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -13524,17 +13524,17 @@
 
     if-nez v0, :cond_19
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "PackageManager is null, first open report might be inaccurate. appId"
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v5}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -13556,9 +13556,9 @@
 
     :cond_19
     :try_start_5
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -13566,7 +13566,7 @@
 
     move-result-object v0
 
-    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v7, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const/4 v11, 0x0
 
@@ -13583,17 +13583,17 @@
     move-exception v0
 
     :try_start_6
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Package info is null, first open report might be inaccurate. appId"
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -13624,11 +13624,11 @@
 
     if-eqz v0, :cond_1c
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aEc:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aEl:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v7}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -13704,9 +13704,9 @@
 
     :goto_e
     :try_start_7
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -13714,7 +13714,7 @@
 
     move-result-object v0
 
-    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v5, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     const/4 v11, 0x0
 
@@ -13731,17 +13731,17 @@
     move-exception v0
 
     :try_start_8
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Application info is null, first open report might be inaccurate. appId"
 
-    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v12, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v12}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -13836,9 +13836,9 @@
 
     invoke-virtual {v1, v5, v2}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/zzkj;Lcom/google/android/gms/measurement/internal/zzm;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
     new-instance v5, Landroid/os/Bundle;
 
@@ -13850,11 +13850,11 @@
 
     invoke-virtual {v5, v3, v11, v12}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v6, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v6}, Lcom/google/android/gms/measurement/internal/ka;->bi(Ljava/lang/String;)Z
 
@@ -13867,7 +13867,7 @@
     invoke-virtual {v5, v4, v6, v7}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_22
-    iget-boolean v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->amo:Z
+    iget-boolean v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
 
     if-eqz v3, :cond_23
 
@@ -13894,13 +13894,13 @@
 
     :cond_24
     :goto_11
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDs:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v3, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -13916,11 +13916,11 @@
 
     invoke-virtual {v0, v4, v5, v6}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v4, v2, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->bi(Ljava/lang/String;)Z
 
@@ -13984,30 +13984,30 @@
 
     :cond_27
     :goto_12
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_8
     .catchall {:try_start_8 .. :try_end_8} :catchall_0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     goto :goto_14
 
@@ -14023,25 +14023,25 @@
 
     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/zzv;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v0, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -14069,24 +14069,24 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tR()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/d;->tU()V
 
     :try_start_0
     invoke-virtual {p0, p2}, Lcom/google/android/gms/measurement/internal/jf;->f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/d;->M(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/zzv;
 
@@ -14094,27 +14094,27 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Removing conditional user property"
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v4, v5}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -14122,15 +14122,15 @@
 
     invoke-virtual {v1, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->N(Ljava/lang/String;Ljava/lang/String;)I
 
@@ -14138,57 +14138,57 @@
 
     if-eqz v1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/d;->K(Ljava/lang/String;Ljava/lang/String;)V
 
     :cond_2
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v1, :cond_5
 
     const/4 v1, 0x0
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v2, :cond_3
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v1
 
     :cond_3
     move-object v3, v1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
-    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v5, v0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     iget-wide v6, p1, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -14211,31 +14211,31 @@
     goto :goto_0
 
     :cond_4
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Conditional user property doesn\'t exist"
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, p1}, Lcom/google/android/gms/measurement/internal/dt;->bY(Ljava/lang/String;)Ljava/lang/String;
 
@@ -14245,30 +14245,30 @@
 
     :cond_5
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uU()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uX()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uV()V
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/d;->uY()V
 
     throw p1
 .end method
@@ -14280,7 +14280,7 @@
 
     move-object/from16 v2, p1
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v1
 
@@ -14292,7 +14292,7 @@
 
     if-eqz v1, :cond_3
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v4
 
@@ -14317,13 +14317,13 @@
 
     if-nez v4, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static/range {p1 .. p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -14338,41 +14338,41 @@
     :cond_1
     new-instance v30, Lcom/google/android/gms/measurement/internal/zzm;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ud()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ug()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qW()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->qZ()Ljava/lang/String;
 
     move-result-object v5
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ui()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
 
     move-result-wide v6
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yq()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yt()Ljava/lang/String;
 
     move-result-object v8
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uk()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->un()J
 
     move-result-wide v9
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->rW()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->rZ()J
 
     move-result-wide v11
 
     const/4 v13, 0x0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->nb()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ne()Z
 
     move-result v14
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yp()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ys()Ljava/lang/String;
 
     move-result-object v16
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ut()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uw()J
 
     move-result-wide v17
 
@@ -14380,39 +14380,39 @@
 
     const/16 v21, 0x0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->xG()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->xJ()Z
 
     move-result v22
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yo()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Z
 
     move-result v23
 
     const/16 v24, 0x0
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uA()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uD()Ljava/lang/String;
 
     move-result-object v25
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->wf()Ljava/lang/Boolean;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->wi()Ljava/lang/Boolean;
 
     move-result-object v26
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->ul()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->uo()J
 
     move-result-wide v27
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yr()Ljava/util/List;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->yu()Ljava/util/List;
 
     move-result-object v29
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v15, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v2, v15}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -14420,7 +14420,7 @@
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->vl()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fb;->vo()Ljava/lang/String;
 
     move-result-object v1
 
@@ -14484,13 +14484,13 @@
 
     :cond_3
     :goto_1
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "No app data available; dropping"
 
@@ -14504,33 +14504,33 @@
 .method final f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()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/zzm;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {v0}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/d;->cf(Ljava/lang/String;)Lcom/google/android/gms/measurement/internal/fb;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/eh;->cp(Ljava/lang/String;)Ljava/lang/String;
 
@@ -14538,7 +14538,7 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->zzb()Z
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aEn:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v3, 0x0
 
@@ -14558,19 +14558,19 @@
 
     new-instance v0, Lcom/google/android/gms/measurement/internal/fb;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-direct {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/fb;-><init>(Lcom/google/android/gms/measurement/internal/ey;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->rR()Ljava/lang/String;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
 
     move-result-object v2
 
@@ -14581,7 +14581,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->xU()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->xX()Ljava/lang/String;
 
     move-result-object v2
 
@@ -14593,13 +14593,13 @@
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->cA(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rR()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/jm;->rU()Ljava/lang/String;
 
     move-result-object v1
 
@@ -14607,7 +14607,7 @@
 
     :cond_1
     :goto_0
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->cz(Ljava/lang/String;)V
 
@@ -14617,15 +14617,15 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->zzb()Z
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->qw()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->qz()Ljava/lang/String;
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -14633,12 +14633,12 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->cs(Ljava/lang/String;)V
 
     :cond_2
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -14646,7 +14646,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->cB(Ljava/lang/String;)V
 
@@ -14664,7 +14664,7 @@
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/fb;->af(J)V
 
     :cond_4
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -14672,7 +14672,7 @@
 
     if-nez v1, :cond_5
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->cC(Ljava/lang/String;)V
 
@@ -14715,21 +14715,21 @@
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/fb;->ai(J)V
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->L(Z)V
 
-    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iget-boolean v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->O(Z)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -14737,22 +14737,22 @@
 
     if-eqz v1, :cond_8
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/fb;->c(Ljava/lang/Boolean;)V
 
     :cond_8
-    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v1, p1, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/fb;->ag(J)V
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->pH()Z
 
     move-result p1
 
     if-eqz p1, :cond_9
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object p1
 
@@ -14772,9 +14772,9 @@
 .method final g(Lcom/google/android/gms/measurement/internal/zzm;)Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -14817,15 +14817,15 @@
     move-exception v0
 
     :goto_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -14840,30 +14840,30 @@
     return-object p1
 .end method
 
-.method final mV()V
+.method final mY()V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIr:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_3
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIr:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDw:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -14871,46 +14871,46 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->yQ()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->yl()Z
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->yo()Z
 
     move-result v0
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Ljava/nio/channels/FileChannel;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIw:Ljava/nio/channels/FileChannel;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/measurement/internal/jf;->b(Ljava/nio/channels/FileChannel;)I
 
     move-result v0
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yk()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xL()I
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ds;->xO()I
 
     move-result v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
     if-le v0, v2, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -14929,7 +14929,7 @@
     :cond_1
     if-ge v0, v2, :cond_3
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Ljava/nio/channels/FileChannel;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIw:Ljava/nio/channels/FileChannel;
 
     invoke-direct {p0, v2, v3}, Lcom/google/android/gms/measurement/internal/jf;->a(ILjava/nio/channels/FileChannel;)Z
 
@@ -14937,13 +14937,13 @@
 
     if-eqz v3, :cond_2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -14960,13 +14960,13 @@
     goto :goto_0
 
     :cond_2
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -14982,15 +14982,15 @@
 
     :cond_3
     :goto_0
-    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->atn:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->atw:Z
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDw:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -14998,61 +14998,61 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEx:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEG:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "This instance being marked as an uploader"
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->atn:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->atw:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
 
     :cond_4
     return-void
 .end method
 
-.method final qs()V
+.method final qv()V
     .locals 15
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
     const/4 v1, 0x0
 
     :try_start_0
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yf()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yi()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aBZ:Ljava/lang/Boolean;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/hm;->aCi:Ljava/lang/Boolean;
 
     if-nez v2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Upload data called on the client side before use of service was decided"
 
@@ -15060,9 +15060,9 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
@@ -15074,13 +15074,13 @@
 
     if-eqz v2, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Upload called in the client side when service should be used"
 
@@ -15088,15 +15088,15 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :cond_1
     :try_start_2
-    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     const-wide/16 v4, 0x0
 
@@ -15104,21 +15104,21 @@
 
     if-lez v6, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :cond_2
     :try_start_3
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
 
     if-eqz v2, :cond_3
 
@@ -15132,13 +15132,13 @@
     :goto_0
     if-eqz v2, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Uploading requested multiple times"
 
@@ -15146,51 +15146,51 @@
     :try_end_3
     .catchall {:try_start_3 .. :try_end_3} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :cond_4
     :try_start_4
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dz;->qB()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
 
     move-result v2
 
     if-nez v2, :cond_5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Network not connected, ignoring upload request"
 
     invoke-virtual {v0, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sg()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->sj()V
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :cond_5
     :try_start_5
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -15198,7 +15198,7 @@
 
     move-result-wide v2
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->um()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->up()J
 
     move-result-wide v6
 
@@ -15206,15 +15206,15 @@
 
     invoke-direct {p0, v6, v7}, Lcom/google/android/gms/measurement/internal/jf;->aj(J)Z
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v6
 
@@ -15222,13 +15222,13 @@
 
     if-eqz v8, :cond_6
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Uploading events. Elapsed time since last upload attempt (ms)"
 
@@ -15245,11 +15245,11 @@
     invoke-virtual {v4, v5, v6}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->uX()Ljava/lang/String;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/d;->va()Ljava/lang/String;
 
     move-result-object v4
 
@@ -15261,38 +15261,38 @@
 
     if-nez v5, :cond_14
 
-    iget-wide v8, p0, Lcom/google/android/gms/measurement/internal/jf;->aGm:J
+    iget-wide v8, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
 
     cmp-long v5, v8, v6
 
     if-nez v5, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->up()J
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->us()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aGm:J
+    iput-wide v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
 
     :cond_7
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aCw:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aCF:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v5, v4, v6}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
     move-result v5
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aCx:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aCG:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v6, v4, v7}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -15302,7 +15302,7 @@
 
     move-result v6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
@@ -15405,7 +15405,7 @@
 
     :cond_b
     :goto_3
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qH()Lcom/google/android/gms/internal/measurement/ak$f$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$f;->qK()Lcom/google/android/gms/internal/measurement/ak$f$a;
 
     move-result-object v6
 
@@ -15421,15 +15421,15 @@
 
     invoke-direct {v9, v10}, Ljava/util/ArrayList;-><init>(I)V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->uZ()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->vc()Z
 
     move-result v10
 
     if-eqz v10, :cond_c
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
     invoke-virtual {v10, v4}, Lcom/google/android/gms/measurement/internal/ka;->cH(Ljava/lang/String;)Z
 
@@ -15460,7 +15460,7 @@
 
     check-cast v12, Lcom/google/android/gms/internal/measurement/ak$g;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v12
 
@@ -15490,22 +15490,22 @@
 
     move-result-object v13
 
-    iget-object v14, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v14, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     invoke-virtual {v13, v1}, Lcom/google/android/gms/internal/measurement/ak$g$a;->I(Z)Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     if-nez v10, :cond_d
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qZ()Lcom/google/android/gms/internal/measurement/ak$g$a;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/ak$g$a;->rc()Lcom/google/android/gms/internal/measurement/ak$g$a;
 
     :cond_d
-    iget-object v13, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v13, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v13, v13, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDz:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v14, Lcom/google/android/gms/measurement/internal/o;->aDI:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v13, v4, v14}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -15513,7 +15513,7 @@
 
     if-eqz v13, :cond_e
 
-    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v12}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v13
 
@@ -15521,11 +15521,11 @@
 
     check-cast v13, Lcom/google/android/gms/internal/measurement/ak$g;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v13
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v14
 
@@ -15543,9 +15543,9 @@
     goto :goto_5
 
     :cond_f
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
@@ -15557,11 +15557,11 @@
 
     if-eqz v5, :cond_10
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v5
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v10
 
@@ -15579,9 +15579,9 @@
     move-object v5, v8
 
     :goto_6
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v10
 
@@ -15589,11 +15589,11 @@
 
     check-cast v10, Lcom/google/android/gms/internal/measurement/ak$f;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {v10}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v10
 
-    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v11, Lcom/google/android/gms/measurement/internal/o;->aCP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v11, v8}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15626,17 +15626,17 @@
     :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/jf;->aIo:Ljava/util/List;
+    iget-object v11, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
 
     if-eqz v11, :cond_12
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Set uploading progress before finishing the previous upload"
 
@@ -15649,16 +15649,16 @@
 
     invoke-direct {v11, v9}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iput-object v11, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Ljava/util/List;
+    iput-object v11, p0, Lcom/google/android/gms/measurement/internal/jf;->aIx:Ljava/util/List;
 
     :goto_8
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v9
 
-    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/eh;->aEO:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v9, v9, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
     invoke-virtual {v9, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
@@ -15666,20 +15666,20 @@
 
     if-lez v7, :cond_13
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$f$a;->qJ()Lcom/google/android/gms/internal/measurement/ak$g;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$f$a;->qM()Lcom/google/android/gms/internal/measurement/ak$g;
 
     move-result-object v2
 
     iget-object v2, v2, Lcom/google/android/gms/internal/measurement/ak$g;->zzs:Ljava/lang/String;
 
     :cond_13
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Uploading data. app, uncompressed size, data"
 
@@ -15691,9 +15691,9 @@
 
     invoke-virtual {v3, v6, v2, v7, v5}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAj:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aAs:Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v6
 
@@ -15701,9 +15701,9 @@
 
     invoke-direct {v11, p0, v4}, Lcom/google/android/gms/measurement/internal/jh;-><init>(Lcom/google/android/gms/measurement/internal/jf;Ljava/lang/String;)V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
     invoke-static {v8}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -15711,7 +15711,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/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -15738,13 +15738,13 @@
 
     :catch_0
     :try_start_7
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to parse upload URL. Not uploading. appId"
 
@@ -15757,13 +15757,13 @@
     goto :goto_9
 
     :cond_14
-    iput-wide v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aGm:J
+    iput-wide v6, p0, Lcom/google/android/gms/measurement/internal/jf;->aGv:J
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->um()J
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/ka;->up()J
 
     move-result-wide v4
 
@@ -15779,7 +15779,7 @@
 
     if-nez v2, :cond_15
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
@@ -15795,18 +15795,18 @@
 
     :cond_15
     :goto_9
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIl:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/measurement/internal/jf;->aIu:Z
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jf;->xE()V
 
     goto :goto_b
 
@@ -15817,26 +15817,26 @@
     goto :goto_a
 .end method
 
-.method final sg()V
+.method final sj()V
     .locals 21
 
     move-object/from16 v0, p0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xy()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->xB()V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yC()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yF()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yQ()Z
 
     move-result v1
 
     if-nez v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDw:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -15847,7 +15847,7 @@
     return-void
 
     :cond_0
-    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iget-wide v1, v0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     const-wide/16 v3, 0x0
 
@@ -15855,19 +15855,19 @@
 
     if-lez v5, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
-    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->no()J
+    invoke-interface {v1}, Lcom/google/android/gms/common/util/e;->nr()J
 
     move-result-wide v1
 
     const-wide/32 v5, 0x36ee80
 
-    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     sub-long/2addr v1, v7
 
@@ -15881,13 +15881,13 @@
 
     if-lez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -15897,33 +15897,33 @@
 
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pD()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
 
     return-void
 
     :cond_1
-    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/jf;->adG:J
+    iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/jf;->adP:J
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yo()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yr()Z
 
     move-result v1
 
     if-eqz v1, :cond_12
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->uZ()Z
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->vc()Z
 
     move-result v1
 
@@ -15932,9 +15932,9 @@
     goto/16 :goto_6
 
     :cond_3
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -15942,7 +15942,7 @@
 
     move-result-wide v1
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCQ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCZ:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v6, 0x0
 
@@ -15960,21 +15960,21 @@
 
     move-result-wide v7
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->va()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->vd()Z
 
     move-result v5
 
     if-nez v5, :cond_5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->mP()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/d;->mS()Z
 
     move-result v5
 
@@ -15994,11 +15994,11 @@
     :goto_1
     if-eqz v5, :cond_7
 
-    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v10, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFG:Lcom/google/android/gms/measurement/internal/ka;
+    iget-object v10, v10, Lcom/google/android/gms/measurement/internal/ey;->aFP:Lcom/google/android/gms/measurement/internal/ka;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ka;->yT()Ljava/lang/String;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/ka;->yW()Ljava/lang/String;
 
     move-result-object v10
 
@@ -16016,7 +16016,7 @@
 
     if-nez v10, :cond_6
 
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCL:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCU:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v10, v6}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -16035,7 +16035,7 @@
     goto :goto_2
 
     :cond_6
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCK:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCT:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v10, v6}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -16054,7 +16054,7 @@
     goto :goto_2
 
     :cond_7
-    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCJ:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v10, Lcom/google/android/gms/measurement/internal/o;->aCS:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v10, v6}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -16071,47 +16071,47 @@
     move-result-wide v10
 
     :goto_2
-    iget-object v12, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v12, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v12
 
-    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v14
 
-    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/eh;->aEO:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/eh;->aEX:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v14
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v16
 
     move-wide/from16 v17, v10
 
-    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/measurement/internal/d;->sd()J
+    invoke-virtual/range {v16 .. v16}, Lcom/google/android/gms/measurement/internal/d;->sg()J
 
     move-result-wide v9
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yI()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yL()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
     move-wide/from16 v19, v7
 
-    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->un()J
+    invoke-virtual {v11}, Lcom/google/android/gms/measurement/internal/d;->uq()J
 
     move-result-wide v6
 
@@ -16172,7 +16172,7 @@
     add-long v10, v10, v17
 
     :cond_a
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v5
 
@@ -16205,7 +16205,7 @@
     :goto_4
     const/16 v6, 0x14
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aCS:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDb:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v10, 0x0
 
@@ -16235,7 +16235,7 @@
 
     shl-long/2addr v6, v5
 
-    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aCR:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v12, Lcom/google/android/gms/measurement/internal/o;->aDa:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v12, v10}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -16272,83 +16272,83 @@
 
     if-nez v1, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Next upload time is 0"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pD()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
 
     return-void
 
     :cond_e
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yH()Lcom/google/android/gms/measurement/internal/dz;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/dz;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dz;->qB()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/dz;->qE()Z
 
     move-result v1
 
     if-nez v1, :cond_f
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "No network"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
     invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->zza()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
 
     return-void
 
     :cond_f
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEP:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEY:Lcom/google/android/gms/measurement/internal/ei;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ua()J
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ei;->ud()J
 
     move-result-wide v1
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCH:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aCQ:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v6, 0x0
 
@@ -16366,7 +16366,7 @@
 
     move-result-wide v5
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yP()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v7
 
@@ -16383,15 +16383,15 @@
     move-result-wide v8
 
     :cond_10
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pD()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v1
 
@@ -16405,7 +16405,7 @@
 
     if-gtz v1, :cond_11
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCM:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCV:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v2, 0x0
 
@@ -16423,17 +16423,17 @@
 
     move-result-wide v8
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xX()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEN:Lcom/google/android/gms/measurement/internal/ei;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/eh;->aEW:Lcom/google/android/gms/measurement/internal/ei;
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v2
 
@@ -16444,13 +16444,13 @@
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ei;->T(J)V
 
     :cond_11
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -16460,7 +16460,7 @@
 
     invoke-virtual {v1, v3, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
@@ -16470,108 +16470,108 @@
 
     :cond_12
     :goto_6
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Nothing to upload or uploading impossible"
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yJ()Lcom/google/android/gms/measurement/internal/eg;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yM()Lcom/google/android/gms/measurement/internal/eg;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pD()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/eg;->pG()V
 
-    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yK()Lcom/google/android/gms/measurement/internal/ja;
+    invoke-direct/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/jf;->yN()Lcom/google/android/gms/measurement/internal/ja;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tR()V
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ja;->tU()V
 
     return-void
 .end method
 
-.method public final vp()Lcom/google/android/gms/common/util/e;
+.method public final vA()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vq()Landroid/content/Context;
+.method public final vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final vt()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final xy()V
+.method final xB()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIh:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIq:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     return-void
 .end method
 
-.method final yC()V
+.method final yF()V
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/jf;->zzk:Z
@@ -16590,62 +16590,62 @@
     throw v0
 .end method
 
-.method public final yG()Lcom/google/android/gms/measurement/internal/es;
+.method public final yJ()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aHZ:Lcom/google/android/gms/measurement/internal/es;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aHZ:Lcom/google/android/gms/measurement/internal/es;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIi:Lcom/google/android/gms/measurement/internal/es;
 
     return-object v0
 .end method
 
-.method public final yH()Lcom/google/android/gms/measurement/internal/dz;
+.method public final yK()Lcom/google/android/gms/measurement/internal/dz;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIa:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Lcom/google/android/gms/measurement/internal/dz;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIa:Lcom/google/android/gms/measurement/internal/dz;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIj:Lcom/google/android/gms/measurement/internal/dz;
 
     return-object v0
 .end method
 
-.method public final yI()Lcom/google/android/gms/measurement/internal/d;
+.method public final yL()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIb:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk:Lcom/google/android/gms/measurement/internal/d;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIb:Lcom/google/android/gms/measurement/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIk:Lcom/google/android/gms/measurement/internal/d;
 
     return-object v0
 .end method
 
-.method public final yL()Lcom/google/android/gms/measurement/internal/jr;
+.method public final yO()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Lcom/google/android/gms/measurement/internal/jr;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIe:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIn:Lcom/google/android/gms/measurement/internal/jr;
 
     return-object v0
 .end method
 
-.method public final yM()Lcom/google/android/gms/measurement/internal/jj;
+.method public final yP()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIf:Lcom/google/android/gms/measurement/internal/jj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Lcom/google/android/gms/measurement/internal/jj;
 
     invoke-static {v0}, Lcom/google/android/gms/measurement/internal/jf;->a(Lcom/google/android/gms/measurement/internal/jb;)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIf:Lcom/google/android/gms/measurement/internal/jj;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jf;->aIo:Lcom/google/android/gms/measurement/internal/jj;
 
     return-object v0
 .end method
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 c6d8009317..16334f0037 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
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final synthetic aGs:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aGB:Lcom/google/android/gms/measurement/internal/jf;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jf;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jg;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jg;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jg;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
     move-object v1, p1
 
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 495947237b..aef64da2a3 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
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aEJ:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aES:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic atJ:Ljava/lang/String;
+.field private final synthetic atS:Ljava/lang/String;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jf;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jh;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jh;->atS:Ljava/lang/String;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jh;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
     invoke-virtual {p1, p2, p3, p4}, Lcom/google/android/gms/measurement/internal/jf;->b(ILjava/lang/Throwable;[B)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ji.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ji.smali
index dcdee5fd2a..83cdbd0c2b 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ji.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ji.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field private final synthetic aEJ:Lcom/google/android/gms/measurement/internal/jf;
+.field private final synthetic aES:Lcom/google/android/gms/measurement/internal/jf;
 
-.field private final synthetic aGq:Lcom/google/android/gms/measurement/internal/zzm;
+.field private final synthetic aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jf;Lcom/google/android/gms/measurement/internal/zzm;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ji;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/ji;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ji;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/ji;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,9 +46,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ji;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ji;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ji;->aGq:Lcom/google/android/gms/measurement/internal/zzm;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ji;->aGz:Lcom/google/android/gms/measurement/internal/zzm;
 
     invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/jf;->f(Lcom/google/android/gms/measurement/internal/zzm;)Lcom/google/android/gms/measurement/internal/fb;
 
@@ -56,13 +56,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ji;->aEJ:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ji;->aES:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "App info was null when attempting to get app instance id"
 
@@ -73,7 +73,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->uc()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fb;->uf()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jj.smali
index 5e69bc9787..420176644f 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jj.smali
@@ -25,7 +25,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qe()I
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$g$a;->qh()I
 
     move-result v2
 
@@ -70,7 +70,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sA()Lcom/google/android/gms/internal/measurement/di;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/di;->sD()Lcom/google/android/gms/internal/measurement/di;
 
     move-result-object v0
 
@@ -213,7 +213,7 @@
 .method static a(Lcom/google/android/gms/internal/measurement/ak$c$a;Ljava/lang/String;Ljava/lang/Object;)V
     .locals 4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qv()Ljava/util/List;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$c$a;->qy()Ljava/util/List;
 
     move-result-object v0
 
@@ -251,7 +251,7 @@
     const/4 v1, -0x1
 
     :goto_1
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qC()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$e;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v0
 
@@ -318,7 +318,7 @@
 
     invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pR()Z
 
     move-result v0
 
@@ -335,7 +335,7 @@
     invoke-static {p1, p2, v1, v0}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
@@ -351,7 +351,7 @@
 
     add-int/lit8 v0, p2, 0x1
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pM()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pP()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object v1
 
@@ -369,13 +369,13 @@
 
     invoke-virtual {p1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->pE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->pH()Z
 
     move-result v3
 
     if-eqz v3, :cond_2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->pY()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     move-result-object v3
 
@@ -421,7 +421,7 @@
     invoke-static {p1, v0, v4, v3}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_4
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f;->qc()I
 
     move-result v3
 
@@ -475,7 +475,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/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object p3
 
@@ -506,13 +506,13 @@
 
     invoke-virtual {p0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pH()Z
 
     move-result p2
 
     if-eqz p2, :cond_1
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pR()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     move-result-object p2
 
@@ -525,7 +525,7 @@
     invoke-static {p0, p1, v0, p2}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->nL()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$d;->nO()Z
 
     move-result p2
 
@@ -674,7 +674,7 @@
     invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :cond_3
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->pH()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->pK()I
 
     move-result p1
 
@@ -724,7 +724,7 @@
     invoke-virtual {p0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
     :cond_6
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->rc()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()I
 
     move-result p1
 
@@ -768,7 +768,7 @@
     invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_7
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$b;->pE()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$b;->pH()Z
 
     move-result v6
 
@@ -792,7 +792,7 @@
 
     invoke-virtual {p0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$b;->nL()Z
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$b;->nO()Z
 
     move-result v6
 
@@ -820,7 +820,7 @@
     invoke-virtual {p0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_b
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->pZ()I
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$i;->qc()I
 
     move-result p1
 
@@ -860,7 +860,7 @@
     invoke-virtual {p0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     :cond_c
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j;->pE()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j;->pH()Z
 
     move-result p2
 
@@ -1055,7 +1055,7 @@
     return-object p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result p1
 
@@ -1070,7 +1070,7 @@
     return-object p0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qB()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
 
     move-result p1
 
@@ -1175,11 +1175,11 @@
 
     :catch_0
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Failed to load parcelable from buffer"
 
@@ -1215,7 +1215,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result v1
 
@@ -1234,7 +1234,7 @@
     invoke-static {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v1
 
@@ -1269,7 +1269,7 @@
     invoke-static {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$b;->pI()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$b;->pL()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v1
 
@@ -1340,7 +1340,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result v1
 
@@ -1359,7 +1359,7 @@
     invoke-static {v0, v2, v3, v1}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v1
 
@@ -1396,7 +1396,7 @@
     :cond_2
     const/4 v1, 0x1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$e;->pV()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$e;->pY()Lcom/google/android/gms/internal/measurement/ac$c;
 
     move-result-object p1
 
@@ -1760,7 +1760,7 @@
     invoke-static {v1, v4, v8, v5}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_13
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g;->mP()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g;->mS()Z
 
     move-result v5
 
@@ -2030,7 +2030,7 @@
     invoke-static {v1, v4, v8, v5}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_22
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g;->qM()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$g;->qP()Z
 
     move-result v5
 
@@ -2087,7 +2087,7 @@
 
     invoke-virtual {v1, v14}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->pE()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->pH()Z
 
     move-result v14
 
@@ -2109,7 +2109,7 @@
 
     invoke-static {v1, v7, v15, v14}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v14
 
@@ -2125,7 +2125,7 @@
 
     invoke-static {v1, v7, v10, v14}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->qB()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->qE()Z
 
     move-result v14
 
@@ -2145,7 +2145,7 @@
     :goto_13
     invoke-static {v1, v7, v9, v14}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->ro()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$k;->rr()Z
 
     move-result v14
 
@@ -2256,7 +2256,7 @@
     invoke-static {v1, v7, v15, v14}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_2d
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$a;->ql()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v14
 
@@ -2264,7 +2264,7 @@
 
     invoke-static {v1, v15, v14}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;Ljava/lang/String;Lcom/google/android/gms/internal/measurement/ak$i;)V
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$a;->qm()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$a;->qp()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v13
 
@@ -2309,7 +2309,7 @@
 
     invoke-virtual {v1, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v13
 
@@ -2321,7 +2321,7 @@
 
     invoke-static {v1, v7, v11, v13}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$c;->qd()Z
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$c;->qg()Z
 
     move-result v13
 
@@ -2392,7 +2392,7 @@
     invoke-static {v1, v7, v14, v13}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
     :cond_34
-    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$c;->pH()I
+    invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ak$c;->pK()I
 
     move-result v13
 
@@ -2430,7 +2430,7 @@
 
     invoke-virtual {v1, v15}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v15
 
@@ -2446,7 +2446,7 @@
 
     invoke-static {v1, v14, v10, v6}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result v6
 
@@ -2468,7 +2468,7 @@
     :goto_1c
     invoke-static {v1, v14, v9, v4}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Object;)V
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$e;->qB()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
 
     move-result v4
 
@@ -2531,15 +2531,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/ak$e$a;->qE()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qH()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qF()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qI()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qG()Lcom/google/android/gms/internal/measurement/ak$e$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e$a;->qJ()Lcom/google/android/gms/internal/measurement/ak$e$a;
 
     instance-of v0, p2, Ljava/lang/String;
 
@@ -2582,11 +2582,11 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Ignoring invalid (type) event param value"
 
@@ -2600,15 +2600,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/ak$k$a;->rr()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$k$a;->ru()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$k$a;->rs()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$k$a;->rv()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$k$a;->rt()Lcom/google/android/gms/internal/measurement/ak$k$a;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$k$a;->rw()Lcom/google/android/gms/internal/measurement/ak$k$a;
 
     instance-of v0, p2, Ljava/lang/String;
 
@@ -2651,11 +2651,11 @@
     return-void
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Ignoring invalid (type) user attribute value"
 
@@ -2708,11 +2708,11 @@
 
     if-gez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Ignoring negative bit index to be cleared"
 
@@ -2733,11 +2733,11 @@
 
     if-lt v1, v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -2847,11 +2847,11 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ic;->zzb()Z
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEd:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aEm:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->a(Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2861,7 +2861,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -2880,7 +2880,7 @@
     return v0
 
     :cond_0
-    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object p1, p2, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -2896,7 +2896,7 @@
 
     if-eqz p1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     return v0
 
@@ -2919,7 +2919,7 @@
 
     if-lez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -2951,7 +2951,7 @@
     return p1
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -2959,10 +2959,10 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->rA()V
 
     return-void
 .end method
@@ -2972,23 +2972,23 @@
 
     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/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yQ()Ljava/security/MessageDigest;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yT()Ljava/security/MessageDigest;
 
     move-result-object v0
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Failed to get MD5"
 
@@ -3010,108 +3010,108 @@
     return-wide v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vw()Lcom/google/android/gms/measurement/internal/ka;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
@@ -3172,11 +3172,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to ungzip content"
 
@@ -3225,11 +3225,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Failed to gzip content"
 
@@ -3238,47 +3238,47 @@
     throw p1
 .end method
 
-.method public final bridge synthetic xO()Lcom/google/android/gms/measurement/internal/jj;
+.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/jj;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xP()Lcom/google/android/gms/measurement/internal/jr;
+.method public final bridge synthetic xS()Lcom/google/android/gms/measurement/internal/jr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xP()Lcom/google/android/gms/measurement/internal/jr;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xS()Lcom/google/android/gms/measurement/internal/jr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xQ()Lcom/google/android/gms/measurement/internal/d;
+.method public final bridge synthetic xT()Lcom/google/android/gms/measurement/internal/d;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xR()Lcom/google/android/gms/measurement/internal/es;
+.method public final bridge synthetic xU()Lcom/google/android/gms/measurement/internal/es;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xR()Lcom/google/android/gms/measurement/internal/es;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/jb;->xU()Lcom/google/android/gms/measurement/internal/es;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method final yO()Ljava/util/List;
+.method final yR()Ljava/util/List;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -3289,9 +3289,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jj;->aGs:Lcom/google/android/gms/measurement/internal/jf;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jj;->aGB:Lcom/google/android/gms/measurement/internal/jf;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jf;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -3316,7 +3316,7 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDc:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDl:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v3, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3389,11 +3389,11 @@
 
     if-lt v4, v3, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v4
 
-    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v4, v4, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v5, "Too many experiment IDs. Number of IDs"
 
@@ -3414,11 +3414,11 @@
     :catch_0
     move-exception v4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v5
 
-    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v5, v5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Experiment ID NumberFormatException"
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jk.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jk.smali
index abfcb410fb..7eaa45bf53 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jk.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jk.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aGD:Landroid/content/Context;
+.field final aGM:Landroid/content/Context;
 
 
 # direct methods
@@ -21,7 +21,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/jk;->aGD:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jk;->aGM:Landroid/content/Context;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jm.smali
index e29e0feaa7..5a8c9acca1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jm.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static final aGC:[Ljava/lang/String;
+.field private static final aGL:[Ljava/lang/String;
 
 
 # instance fields
-.field private aIu:Ljava/security/SecureRandom;
+.field private aID:Ljava/security/SecureRandom;
 
-.field private final aIv:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private aIw:Ljava/lang/Integer;
+.field private aIF:Ljava/lang/Integer;
 
 .field private zzd:I
 
@@ -43,7 +43,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/jm;->aGC:[Ljava/lang/String;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/jm;->aGL:[Ljava/lang/String;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIw:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIF:Ljava/lang/Integer;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {p1, v0, v1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>(J)V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIv:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->zzd:Ljava/lang/String;
 
@@ -120,13 +120,13 @@
     goto :goto_0
 
     :cond_2
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
     if-eqz v2, :cond_3
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
     invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
 
@@ -137,13 +137,13 @@
     goto :goto_0
 
     :cond_3
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     if-eqz v2, :cond_1
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     invoke-virtual {v1}, Ljava/lang/Double;->doubleValue()D
 
@@ -211,13 +211,13 @@
 
     invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
     const-string v4, "app_id"
 
     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/zzv;->amV:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
     const-string v4, "origin"
 
@@ -229,17 +229,17 @@
 
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     const-string v4, "name"
 
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rz()Ljava/lang/Object;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzkj;->rC()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -262,29 +262,29 @@
     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/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v4, "timed_out_event_name"
 
     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/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v3
 
@@ -299,29 +299,29 @@
 
     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/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v4, "triggered_event_name"
 
     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/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v3
 
@@ -330,9 +330,9 @@
     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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v3, v3, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
     const-string v5, "triggered_timestamp"
 
@@ -344,29 +344,29 @@
 
     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/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     if-eqz v3, :cond_4
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
     const-string v4, "expired_event_name"
 
     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/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     if-eqz v3, :cond_4
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -767,11 +767,11 @@
 
     if-nez v1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p5}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -819,11 +819,11 @@
 
     if-nez v1, :cond_7
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p5}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -857,11 +857,11 @@
 
     if-le p5, p3, :cond_b
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p4}, Ljava/lang/String;->length()I
 
@@ -1581,11 +1581,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Package name not found"
 
@@ -1596,11 +1596,11 @@
     :catch_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error obtaining certificate"
 
@@ -1793,7 +1793,7 @@
     return-wide v3
 .end method
 
-.method static yQ()Ljava/security/MessageDigest;
+.method static yT()Ljava/security/MessageDigest;
     .locals 2
 
     const/4 v0, 0x0
@@ -1847,9 +1847,9 @@
 
     if-nez p2, :cond_2
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1857,11 +1857,11 @@
 
     if-eqz p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1887,11 +1887,11 @@
 
     if-nez p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1909,9 +1909,9 @@
     return p1
 
     :cond_3
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ey;->anh:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/ey;->anq:Ljava/lang/String;
 
     invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -1919,11 +1919,11 @@
 
     if-eqz p1, :cond_4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Missing google_app_id. Firebase Analytics disabled. See https://goo.gl/NAOOOI"
 
@@ -1940,11 +1940,11 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Name is required and can\'t be null. Type"
 
@@ -1959,11 +1959,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Name is required and can\'t be empty. Type"
 
@@ -1986,11 +1986,11 @@
 
     if-eq v1, v3, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Name must start with a letter or _ (underscore). Type, name"
 
@@ -2022,11 +2022,11 @@
 
     if-nez v5, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Name must consist of letters, digits or _ (underscores). Type, name"
 
@@ -2056,11 +2056,11 @@
 
     if-nez p2, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Name is required and can\'t be null. Type"
 
@@ -2075,11 +2075,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Name is required and can\'t be empty. Type"
 
@@ -2098,11 +2098,11 @@
 
     if-nez v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Name must start with a letter. Type, name"
 
@@ -2136,11 +2136,11 @@
 
     if-nez v4, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Name must consist of letters, digits or _ (underscores). Type, name"
 
@@ -2203,13 +2203,13 @@
 
     if-nez v3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2263,11 +2263,11 @@
 
     invoke-direct {v11, v8}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDD:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDM:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v7, v1}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2441,7 +2441,7 @@
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     if-eqz p6, :cond_d
 
@@ -2475,11 +2475,11 @@
 
     if-le v0, v1, :cond_c
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2510,11 +2510,11 @@
     goto :goto_a
 
     :cond_d
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDd:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aDm:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v7, v1}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2659,13 +2659,13 @@
 
     move-result-object v0
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v2
 
@@ -2675,7 +2675,7 @@
 
     move-result-object v2
 
-    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual/range {p0 .. p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
@@ -2784,13 +2784,13 @@
     return-object p3
 
     :cond_2
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p3
 
@@ -2839,7 +2839,7 @@
 
     aput-object v3, v2, v4
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->sl()I
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->so()I
 
     move-result v3
 
@@ -2873,7 +2873,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object p2
 
@@ -2916,11 +2916,11 @@
     move-exception p1
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-virtual {p1}, Ljava/lang/Exception;->getMessage()Ljava/lang/String;
 
@@ -2958,11 +2958,11 @@
 
     if-eqz v5, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -3049,13 +3049,13 @@
     const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEw:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEF:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
@@ -3092,13 +3092,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning int value to wrapper"
 
@@ -3128,13 +3128,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Error returning long value to wrapper"
 
@@ -3156,13 +3156,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning bundle value to wrapper"
 
@@ -3192,13 +3192,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning string value to wrapper"
 
@@ -3237,13 +3237,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning bundle list to wrapper"
 
@@ -3273,13 +3273,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning boolean value to wrapper"
 
@@ -3309,13 +3309,13 @@
     :catch_0
     move-exception p1
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Error returning byte array to wrapper"
 
@@ -3330,7 +3330,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -3367,11 +3367,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Failed to persist Deferred Deep Link. exception"
 
@@ -3387,11 +3387,11 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Name is required and can\'t be null. Type"
 
@@ -3402,7 +3402,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/jm;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/jm;->aGL:[Ljava/lang/String;
 
     array-length v2, v1
 
@@ -3436,11 +3436,11 @@
     :goto_1
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Name starts with reserved prefix. Type, name"
 
@@ -3483,11 +3483,11 @@
     :goto_3
     if-eqz p2, :cond_6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Name is reserved. Type, name"
 
@@ -3543,13 +3543,13 @@
     invoke-virtual {v0, p3, p1, p2}, Landroid/os/Bundle;->putLong(Ljava/lang/String;J)V
 
     :cond_2
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jm;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p1
 
@@ -3569,11 +3569,11 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p3, "Name is required and can\'t be null. Type"
 
@@ -3592,11 +3592,11 @@
 
     if-le v1, p2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEt:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEC:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -3630,7 +3630,7 @@
     return v2
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ga;->aGL:[Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1, p1}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -3662,9 +3662,9 @@
 .method final cH(Ljava/lang/String;)Z
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -3683,11 +3683,11 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEy:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEH:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Permission not granted"
 
@@ -3712,15 +3712,15 @@
     return p1
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->yT()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ka;->yW()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     invoke-virtual {v0, p1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -3745,7 +3745,7 @@
     return v2
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/fy;->aGL:[Ljava/lang/String;
 
     invoke-virtual {p0, v0, v1, p1}, Lcom/google/android/gms/measurement/internal/jm;->a(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Z
 
@@ -3777,7 +3777,7 @@
 .method final o(Landroid/content/Context;Ljava/lang/String;)J
     .locals 6
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -3787,7 +3787,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yQ()Ljava/security/MessageDigest;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jm;->yT()Ljava/security/MessageDigest;
 
     move-result-object v1
 
@@ -3797,11 +3797,11 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Could not get MD5 instance"
 
@@ -3823,7 +3823,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object p2
 
@@ -3868,11 +3868,11 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Could not get signatures"
 
@@ -3885,11 +3885,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Package name not found"
 
@@ -3902,7 +3902,7 @@
     return-wide v2
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -3910,10 +3910,10 @@
     return v0
 .end method
 
-.method public final qS()J
+.method public final qV()J
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIv:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -3925,7 +3925,7 @@
 
     if-nez v4, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIv:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
     monitor-enter v0
 
@@ -3936,7 +3936,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v4
 
@@ -3976,12 +3976,12 @@
     throw v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIv:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIv:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-wide/16 v2, -0x1
 
@@ -3989,7 +3989,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/jm;->aIv:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->getAndIncrement()J
 
@@ -4009,14 +4009,22 @@
     throw v1
 .end method
 
-.method final rR()Ljava/lang/String;
+.method public final bridge synthetic rA()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rA()V
+
+    return-void
+.end method
+
+.method final rU()Ljava/lang/String;
     .locals 5
 
     const/16 v0, 0x10
 
     new-array v0, v0, [B
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->yP()Ljava/security/SecureRandom;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/jm;->yS()Ljava/security/SecureRandom;
 
     move-result-object v1
 
@@ -4045,14 +4053,6 @@
     return-object v0
 .end method
 
-.method public final bridge synthetic rx()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->rx()V
-
-    return-void
-.end method
-
 .method final s(Ljava/lang/String;Ljava/lang/Object;)I
     .locals 7
 
@@ -4335,11 +4335,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Install referrer url isn\'t a hierarchical URI"
 
@@ -4348,16 +4348,16 @@
     return-object v0
 .end method
 
-.method public final sl()I
+.method public final so()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIw:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIF:Ljava/lang/Integer;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -4371,10 +4371,10 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIw:Ljava/lang/Integer;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIF:Ljava/lang/Integer;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIw:Ljava/lang/Integer;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIF:Ljava/lang/Integer;
 
     invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
 
@@ -4383,164 +4383,119 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ft;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected final xS()V
-    .locals 6
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
-
-    new-instance v0, Ljava/security/SecureRandom;
-
-    invoke-direct {v0}, Ljava/security/SecureRandom;-><init>()V
-
-    invoke-virtual {v0}, Ljava/security/SecureRandom;->nextLong()J
-
-    move-result-wide v1
-
-    const-wide/16 v3, 0x0
-
-    cmp-long v5, v1, v3
-
-    if-nez v5, :cond_0
-
-    invoke-virtual {v0}, Ljava/security/SecureRandom;->nextLong()J
-
-    move-result-wide v1
-
-    cmp-long v0, v1, v3
-
-    if-nez v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
-
-    move-result-object v0
-
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
-
-    const-string v3, "Utils falling back to Random for random id"
-
-    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
-
-    :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIv: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 xx()Z
+.method public final xA()Z
     .locals 2
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -4564,12 +4519,57 @@
     return v0
 .end method
 
-.method final yP()Ljava/security/SecureRandom;
+.method protected final xV()V
+    .locals 6
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
+
+    new-instance v0, Ljava/security/SecureRandom;
+
+    invoke-direct {v0}, Ljava/security/SecureRandom;-><init>()V
+
+    invoke-virtual {v0}, Ljava/security/SecureRandom;->nextLong()J
+
+    move-result-wide v1
+
+    const-wide/16 v3, 0x0
+
+    cmp-long v5, v1, v3
+
+    if-nez v5, :cond_0
+
+    invoke-virtual {v0}, Ljava/security/SecureRandom;->nextLong()J
+
+    move-result-wide v1
+
+    cmp-long v0, v1, v3
+
+    if-nez v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
+
+    move-result-object v0
+
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
+
+    const-string v3, "Utils falling back to Random for random id"
+
+    invoke-virtual {v0, v3}, Lcom/google/android/gms/measurement/internal/dx;->aL(Ljava/lang/String;)V
+
+    :cond_0
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIE:Ljava/util/concurrent/atomic/AtomicLong;
+
+    invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicLong;->set(J)V
+
+    return-void
+.end method
+
+.method final yS()Ljava/security/SecureRandom;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIu:Ljava/security/SecureRandom;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aID:Ljava/security/SecureRandom;
 
     if-nez v0, :cond_0
 
@@ -4577,22 +4577,22 @@
 
     invoke-direct {v0}, Ljava/security/SecureRandom;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIu:Ljava/security/SecureRandom;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aID:Ljava/security/SecureRandom;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aIu:Ljava/security/SecureRandom;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jm;->aID:Ljava/security/SecureRandom;
 
     return-object v0
 .end method
 
-.method public final yR()I
+.method public final yU()I
     .locals 3
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jn.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jn.smali
index 7614a01e1f..3e73a75389 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jn.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jn.smali
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field final amV:Ljava/lang/String;
+.field final ane:Ljava/lang/String;
 
-.field final anh:Ljava/lang/String;
+.field final anq:Ljava/lang/String;
 
-.field final asr:Ljava/lang/Object;
+.field final asA:Ljava/lang/Object;
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
 .field final zzd:J
 
@@ -27,15 +27,15 @@
 
     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/jn;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jn;->atS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jn;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/jn;->zzd:J
 
-    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iput-object p6, p0, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jo.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jo.smali
index adde1601c6..f8a81c36a4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jo.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jo.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aIx:Ljavax/net/ssl/SSLSocket;
+.field private final aIG:Ljavax/net/ssl/SSLSocket;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Ljavax/net/ssl/SSLSocket;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     return-void
 .end method
@@ -23,7 +23,7 @@
 .method public final addHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->addHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
 
@@ -38,7 +38,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->bind(Ljava/net/SocketAddress;)V
 
@@ -56,7 +56,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->close()V
     :try_end_0
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->connect(Ljava/net/SocketAddress;)V
 
@@ -97,7 +97,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocket;->connect(Ljava/net/SocketAddress;I)V
 
@@ -107,7 +107,7 @@
 .method public final equals(Ljava/lang/Object;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
 
@@ -119,7 +119,7 @@
 .method public final getChannel()Ljava/nio/channels/SocketChannel;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getChannel()Ljava/nio/channels/SocketChannel;
 
@@ -131,7 +131,7 @@
 .method public final getEnableSessionCreation()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnableSessionCreation()Z
 
@@ -143,7 +143,7 @@
 .method public final getEnabledCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnabledCipherSuites()[Ljava/lang/String;
 
@@ -155,7 +155,7 @@
 .method public final getEnabledProtocols()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
@@ -167,7 +167,7 @@
 .method public final getInetAddress()Ljava/net/InetAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getInetAddress()Ljava/net/InetAddress;
 
@@ -184,7 +184,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getInputStream()Ljava/io/InputStream;
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getKeepAlive()Z
 
@@ -213,7 +213,7 @@
 .method public final getLocalAddress()Ljava/net/InetAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getLocalAddress()Ljava/net/InetAddress;
 
@@ -225,7 +225,7 @@
 .method public final getLocalPort()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getLocalPort()I
 
@@ -237,7 +237,7 @@
 .method public final getLocalSocketAddress()Ljava/net/SocketAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getLocalSocketAddress()Ljava/net/SocketAddress;
 
@@ -249,7 +249,7 @@
 .method public final getNeedClientAuth()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getNeedClientAuth()Z
 
@@ -266,7 +266,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getOOBInline()Z
 
@@ -283,7 +283,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getOutputStream()Ljava/io/OutputStream;
 
@@ -295,7 +295,7 @@
 .method public final getPort()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getPort()I
 
@@ -315,7 +315,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getReceiveBufferSize()I
 
@@ -338,7 +338,7 @@
 .method public final getRemoteSocketAddress()Ljava/net/SocketAddress;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getRemoteSocketAddress()Ljava/net/SocketAddress;
 
@@ -355,7 +355,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getReuseAddress()Z
 
@@ -375,7 +375,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSendBufferSize()I
 
@@ -398,7 +398,7 @@
 .method public final getSession()Ljavax/net/ssl/SSLSession;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSession()Ljavax/net/ssl/SSLSession;
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSoLinger()I
 
@@ -435,7 +435,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSoTimeout()I
 
@@ -458,7 +458,7 @@
 .method public final getSupportedCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSupportedCipherSuites()[Ljava/lang/String;
 
@@ -470,7 +470,7 @@
 .method public final getSupportedProtocols()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getSupportedProtocols()[Ljava/lang/String;
 
@@ -487,7 +487,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getTcpNoDelay()Z
 
@@ -504,7 +504,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getTrafficClass()I
 
@@ -516,7 +516,7 @@
 .method public final getUseClientMode()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getUseClientMode()Z
 
@@ -528,7 +528,7 @@
 .method public final getWantClientAuth()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getWantClientAuth()Z
 
@@ -540,7 +540,7 @@
 .method public final isBound()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isBound()Z
 
@@ -552,7 +552,7 @@
 .method public final isClosed()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isClosed()Z
 
@@ -564,7 +564,7 @@
 .method public final isConnected()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isConnected()Z
 
@@ -576,7 +576,7 @@
 .method public final isInputShutdown()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isInputShutdown()Z
 
@@ -588,7 +588,7 @@
 .method public final isOutputShutdown()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->isOutputShutdown()Z
 
@@ -600,7 +600,7 @@
 .method public final removeHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->removeHandshakeCompletedListener(Ljavax/net/ssl/HandshakeCompletedListener;)V
 
@@ -615,7 +615,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->sendUrgentData(I)V
 
@@ -625,7 +625,7 @@
 .method public final setEnableSessionCreation(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setEnableSessionCreation(Z)V
 
@@ -635,7 +635,7 @@
 .method public final setEnabledCipherSuites([Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setEnabledCipherSuites([Ljava/lang/String;)V
 
@@ -661,7 +661,7 @@
 
     new-instance p1, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->getEnabledProtocols()[Ljava/lang/String;
 
@@ -697,7 +697,7 @@
     check-cast p1, [Ljava/lang/String;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setEnabledProtocols([Ljava/lang/String;)V
 
@@ -712,7 +712,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setKeepAlive(Z)V
 
@@ -722,7 +722,7 @@
 .method public final setNeedClientAuth(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setNeedClientAuth(Z)V
 
@@ -737,7 +737,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setOOBInline(Z)V
 
@@ -747,7 +747,7 @@
 .method public final setPerformancePreferences(III)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1, p2, p3}, Ljavax/net/ssl/SSLSocket;->setPerformancePreferences(III)V
 
@@ -765,7 +765,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setReceiveBufferSize(I)V
     :try_end_0
@@ -791,7 +791,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setReuseAddress(Z)V
 
@@ -809,7 +809,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setSendBufferSize(I)V
     :try_end_0
@@ -835,7 +835,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocket;->setSoLinger(ZI)V
 
@@ -853,7 +853,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setSoTimeout(I)V
     :try_end_0
@@ -879,7 +879,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setTcpNoDelay(Z)V
 
@@ -894,7 +894,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setTrafficClass(I)V
 
@@ -904,7 +904,7 @@
 .method public final setUseClientMode(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setUseClientMode(Z)V
 
@@ -914,7 +914,7 @@
 .method public final setWantClientAuth(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0, p1}, Ljavax/net/ssl/SSLSocket;->setWantClientAuth(Z)V
 
@@ -929,7 +929,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->shutdownInput()V
 
@@ -944,7 +944,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->shutdownOutput()V
 
@@ -959,7 +959,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG:Ljavax/net/ssl/SSLSocket;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocket;->startHandshake()V
 
@@ -969,7 +969,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIx:Ljavax/net/ssl/SSLSocket;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jo;->aIG: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/jp.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jp.smali
index 421b6564e3..dcd209fec4 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jp.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jp.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aGT:Ljavax/net/ssl/SSLSocketFactory;
+.field private final aHc:Ljavax/net/ssl/SSLSocketFactory;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {p0}, Ljavax/net/ssl/SSLSocketFactory;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocketFactory;->createSocket()Ljava/net/Socket;
 
@@ -73,7 +73,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/lang/String;I)Ljava/net/Socket;
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc: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;
 
@@ -119,7 +119,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0, p1, p2}, Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/InetAddress;I)Ljava/net/Socket;
 
@@ -142,7 +142,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc: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;
 
@@ -165,7 +165,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc: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;
 
@@ -183,7 +183,7 @@
 .method public final getDefaultCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc:Ljavax/net/ssl/SSLSocketFactory;
 
     invoke-virtual {v0}, Ljavax/net/ssl/SSLSocketFactory;->getDefaultCipherSuites()[Ljava/lang/String;
 
@@ -195,7 +195,7 @@
 .method public final getSupportedCipherSuites()[Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aGT:Ljavax/net/ssl/SSLSocketFactory;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jp;->aHc: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/jq.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jq.smali
index fb4526389e..8ac1732cdc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jq.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jq.smali
@@ -7,18 +7,18 @@
 
 
 # instance fields
-.field private final synthetic aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+.field private final synthetic aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-.field private final synthetic aGF:Lcom/google/android/gms/internal/measurement/lv;
+.field private final synthetic aGO:Lcom/google/android/gms/internal/measurement/lv;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;Lcom/google/android/gms/internal/measurement/lv;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jq;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jq;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jq;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jq;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -30,21 +30,21 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jq;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jq;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jq;->aGF:Lcom/google/android/gms/internal/measurement/lv;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jq;->aGO:Lcom/google/android/gms/internal/measurement/lv;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jq;->aBI:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jq;->aBR:Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBF:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/AppMeasurementDynamiteService;->aBO:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yk()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/ey;->yn()Z
 
     move-result v2
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jr.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jr.smali
index 6a1071a39d..c727beb5c3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jr.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jr.smali
@@ -51,7 +51,7 @@
     return-object p1
 .end method
 
-.method protected final pO()Z
+.method protected final pR()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jt.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jt.smali
index 28fb50a988..b304173407 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jt.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jt.smali
@@ -4,28 +4,15 @@
 
 
 # instance fields
-.field private aIB:Lcom/google/android/gms/internal/measurement/ak$a;
+.field private aIK:Lcom/google/android/gms/internal/measurement/ak$a;
 
-.field aIC:Ljava/util/BitSet;
+.field aIL:Ljava/util/BitSet;
 
-.field private aID:Ljava/util/BitSet;
+.field private aIM:Ljava/util/BitSet;
 
-.field private final synthetic aIe:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIn:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private atJ:Ljava/lang/String;
-
-.field private atQ:Ljava/util/Map;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Map<",
-            "Ljava/lang/Integer;",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private att:Ljava/util/Map;
+.field private atC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -37,18 +24,31 @@
     .end annotation
 .end field
 
+.field private atS:Ljava/lang/String;
+
+.field private atZ:Ljava/util/Map;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Map<",
+            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method private constructor <init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIe:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIn:Lcom/google/android/gms/measurement/internal/jr;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jt;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jt;->atS:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qn()Lcom/google/android/gms/internal/measurement/ak$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
 
     move-result-object p1
 
@@ -58,7 +58,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -66,31 +66,31 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ak$a;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIB:Lcom/google/android/gms/internal/measurement/ak$a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIK:Lcom/google/android/gms/internal/measurement/ak$a;
 
     new-instance p1, Ljava/util/BitSet;
 
     invoke-direct {p1}, Ljava/util/BitSet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIC:Ljava/util/BitSet;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
 
     new-instance p1, Ljava/util/BitSet;
 
     invoke-direct {p1}, Ljava/util/BitSet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aID:Ljava/util/BitSet;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIM:Ljava/util/BitSet;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ: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/jt;->att:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
 
     return-void
 .end method
@@ -158,13 +158,13 @@
 
     check-cast v1, Lcom/google/android/gms/internal/measurement/ak$j;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->pE()Z
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->pH()Z
 
     move-result v2
 
     if-eqz v2, :cond_1
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rj()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()I
 
     move-result v2
 
@@ -176,7 +176,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rj()I
+    invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ak$j;->rm()I
 
     move-result v3
 
@@ -212,7 +212,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/ak$j;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j;->pE()Z
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j;->pH()Z
 
     move-result v3
 
@@ -276,7 +276,7 @@
 
     invoke-interface {v4, v3}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v2
 
@@ -284,7 +284,7 @@
 
     check-cast v2, Lcom/google/android/gms/internal/measurement/ak$j$a;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j$a;->rn()Lcom/google/android/gms/internal/measurement/ak$j$a;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ak$j$a;->rq()Lcom/google/android/gms/internal/measurement/ak$j$a;
 
     move-result-object v2
 
@@ -292,7 +292,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v2
 
@@ -329,7 +329,7 @@
 
     check-cast p2, Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rl()Lcom/google/android/gms/internal/measurement/ak$j$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
 
     move-result-object v1
 
@@ -355,7 +355,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p2
 
@@ -371,7 +371,7 @@
     return-object v0
 .end method
 
-.method private final qv()Ljava/util/List;
+.method private final qy()Ljava/util/List;
     .locals 6
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -382,7 +382,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
 
     if-nez v0, :cond_0
 
@@ -399,7 +399,7 @@
 
     invoke-direct {v1, v0}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -426,7 +426,7 @@
 
     move-result v2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$b;->qq()Lcom/google/android/gms/internal/measurement/ak$b$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$b;->qt()Lcom/google/android/gms/internal/measurement/ak$b$a;
 
     move-result-object v3
 
@@ -434,7 +434,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -454,7 +454,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v2
 
@@ -484,18 +484,18 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->aIB:Lcom/google/android/gms/internal/measurement/ak$a;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jt;->aIK:Lcom/google/android/gms/internal/measurement/ak$a;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qn()Lcom/google/android/gms/internal/measurement/ak$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
 
     move-result-object v0
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v0
 
@@ -506,11 +506,11 @@
     :goto_0
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ak$a$a;->bq(I)Lcom/google/android/gms/internal/measurement/ak$a$a;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->re()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIC:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/util/BitSet;)Ljava/util/List;
 
@@ -520,7 +520,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aID:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIM:Ljava/util/BitSet;
 
     invoke-static {v1}, Lcom/google/android/gms/measurement/internal/jj;->a(Ljava/util/BitSet;)Ljava/util/List;
 
@@ -530,13 +530,13 @@
 
     move-result-object p1
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jt;->qv()Ljava/util/List;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jt;->qy()Ljava/util/List;
 
     move-result-object v1
 
     invoke-virtual {p1, v1}, Lcom/google/android/gms/internal/measurement/ak$i$a;->h(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/ak$i$a;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->att:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
 
     if-nez v1, :cond_1
 
@@ -555,7 +555,7 @@
 
     invoke-direct {v2, v1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->att:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -578,7 +578,7 @@
 
     check-cast v3, Ljava/lang/Integer;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->rl()Lcom/google/android/gms/internal/measurement/ak$j$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$j;->ro()Lcom/google/android/gms/internal/measurement/ak$j$a;
 
     move-result-object v4
 
@@ -590,7 +590,7 @@
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jt;->att:Ljava/util/Map;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
 
     invoke-interface {v5, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -628,7 +628,7 @@
     goto :goto_2
 
     :cond_2
-    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v3
 
@@ -644,7 +644,7 @@
     move-object v1, v2
 
     :goto_3
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a$a;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a$a;->pH()Z
 
     move-result v2
 
@@ -652,15 +652,15 @@
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->zzb()Z
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jt;->aIe:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jt;->aIn:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jt;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jt;->atS:Ljava/lang/String;
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDM:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/o;->aDV:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v4}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -671,7 +671,7 @@
     if-nez p2, :cond_5
 
     :cond_4
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a$a;->qp()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$a$a;->qs()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object p2
 
@@ -686,7 +686,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/ak$a$a;->a(Lcom/google/android/gms/internal/measurement/ak$i$a;)Lcom/google/android/gms/internal/measurement/ak$a$a;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -712,13 +712,13 @@
         }
     .end annotation
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jt;->aIC:Ljava/util/BitSet;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jt;->aID:Ljava/util/BitSet;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/jt;->aIM:Ljava/util/BitSet;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->re()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$i;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
 
     move-result-object p4
 
@@ -738,13 +738,13 @@
 
     move-result-object p2
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jt;->qv()Ljava/util/List;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/jt;->qy()Ljava/util/List;
 
     move-result-object p3
 
     invoke-virtual {p2, p3}, Lcom/google/android/gms/internal/measurement/ak$i$a;->h(Ljava/lang/Iterable;)Lcom/google/android/gms/internal/measurement/ak$i$a;
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qn()Lcom/google/android/gms/internal/measurement/ak$a$a;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ak$a;->qq()Lcom/google/android/gms/internal/measurement/ak$a$a;
 
     move-result-object p3
 
@@ -762,7 +762,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object p1
 
@@ -770,7 +770,7 @@
 
     check-cast p1, Lcom/google/android/gms/internal/measurement/ak$a;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIB:Lcom/google/android/gms/internal/measurement/ak$a;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIK:Lcom/google/android/gms/internal/measurement/ak$a;
 
     return-void
 .end method
@@ -778,17 +778,17 @@
 .method final a(Lcom/google/android/gms/measurement/internal/jy;)V
     .locals 8
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jy;->pG()I
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/jy;->pJ()I
 
     move-result v0
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aBZ:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aCi:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aID:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIM:Ljava/util/BitSet;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aBZ:Ljava/lang/Boolean;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aCi:Ljava/lang/Boolean;
 
     invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -797,13 +797,13 @@
     invoke-virtual {v1, v0, v2}, Ljava/util/BitSet;->set(IZ)V
 
     :cond_0
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIJ:Ljava/lang/Boolean;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIS:Ljava/lang/Boolean;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIC:Ljava/util/BitSet;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
 
-    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aIJ:Ljava/lang/Boolean;
+    iget-object v2, p1, Lcom/google/android/gms/measurement/internal/jy;->aIS:Ljava/lang/Boolean;
 
     invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -812,13 +812,13 @@
     invoke-virtual {v1, v0, v2}, Ljava/util/BitSet;->set(IZ)V
 
     :cond_1
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIK:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIT:Ljava/lang/Long;
 
     const-wide/16 v2, 0x3e8
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -830,7 +830,7 @@
 
     check-cast v1, Ljava/lang/Long;
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/jy;->aIK:Ljava/lang/Long;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/jy;->aIT:Ljava/lang/Long;
 
     invoke-virtual {v4}, Ljava/lang/Long;->longValue()J
 
@@ -849,7 +849,7 @@
     if-lez v1, :cond_3
 
     :cond_2
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atQ:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atZ:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -862,11 +862,11 @@
     invoke-interface {v1, v6, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_3
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIL:Ljava/lang/Long;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIU:Ljava/lang/Long;
 
     if-eqz v1, :cond_5
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->att:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -884,7 +884,7 @@
 
     invoke-direct {v1}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jt;->att:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jt;->atC:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -893,7 +893,7 @@
     invoke-interface {v4, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_4
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIL:Ljava/lang/Long;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jy;->aIU:Ljava/lang/Long;
 
     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ju.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ju.smali
index 939e29b6a3..d52529f71e 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ju.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ju.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field static final synthetic ant:[I
+.field static final synthetic anC:[I
 
-.field static final synthetic asW:[I
+.field static final synthetic atf:[I
 
 
 # direct methods
@@ -21,14 +21,14 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/ju;->ant:[I
+    sput-object v0, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->ant:[I
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asH:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asQ:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     invoke-virtual {v2}, Lcom/google/android/gms/internal/measurement/ac$d$a;->ordinal()I
 
@@ -42,9 +42,9 @@
     const/4 v1, 0x2
 
     :try_start_1
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ju;->ant:[I
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
 
-    sget-object v3, Lcom/google/android/gms/internal/measurement/ac$d$a;->asI:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v3, Lcom/google/android/gms/internal/measurement/ac$d$a;->asR:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ac$d$a;->ordinal()I
 
@@ -58,9 +58,9 @@
     const/4 v2, 0x3
 
     :try_start_2
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ju;->ant:[I
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$d$a;->asJ:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$d$a;->asS:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ac$d$a;->ordinal()I
 
@@ -74,9 +74,9 @@
     const/4 v3, 0x4
 
     :try_start_3
-    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->ant:[I
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ac$d$a;->ordinal()I
 
@@ -95,12 +95,12 @@
 
     new-array v4, v4, [I
 
-    sput-object v4, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sput-object v4, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
     :try_start_4
-    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
-    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v5, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v5}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
@@ -112,9 +112,9 @@
 
     :catch_4
     :try_start_5
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
-    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$f$b;->asP:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v4, Lcom/google/android/gms/internal/measurement/ac$f$b;->asY:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v4}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
@@ -126,9 +126,9 @@
 
     :catch_5
     :try_start_6
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asQ:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asZ:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
@@ -140,9 +140,9 @@
 
     :catch_6
     :try_start_7
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asR:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->ata:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
@@ -154,9 +154,9 @@
 
     :catch_7
     :try_start_8
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asS:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atb:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
@@ -170,9 +170,9 @@
 
     :catch_8
     :try_start_9
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     invoke-virtual {v1}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jv.smali
index 3251a606bf..804134aaf1 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jv.smali
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+.field private aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
-.field private final synthetic aIF:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIO:Lcom/google/android/gms/measurement/internal/jr;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ac$b;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
     invoke-direct {p0, p2, p3}, Lcom/google/android/gms/measurement/internal/jy;-><init>(Ljava/lang/String;I)V
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     return-void
 .end method
@@ -39,29 +39,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->atS:Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->atJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->atS:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -71,7 +71,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget-boolean v1, v1, Lcom/google/android/gms/internal/measurement/ac$b;->zzk:Z
 
@@ -80,9 +80,9 @@
     iget-wide p4, p6, Lcom/google/android/gms/measurement/internal/k;->zze:J
 
     :cond_0
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p6
 
@@ -96,29 +96,29 @@
 
     if-eqz p6, :cond_2
 
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p6
 
-    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget v2, p0, Lcom/google/android/gms/measurement/internal/jv;->anl:I
+    iget v2, p0, Lcom/google/android/gms/measurement/internal/jv;->anu:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {v3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result v3
 
     if-eqz v3, :cond_1
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget v3, v3, Lcom/google/android/gms/internal/measurement/ac$b;->zzd:I
 
@@ -132,13 +132,13 @@
     move-object v3, v1
 
     :goto_0
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v4
 
-    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v5, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget-object v5, v5, Lcom/google/android/gms/internal/measurement/ac$b;->zze:Ljava/lang/String;
 
@@ -150,21 +150,21 @@
 
     invoke-virtual {p6, v5, v2, v3, v4}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p6
 
-    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p6, p6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     invoke-virtual {v2, v3}, Lcom/google/android/gms/measurement/internal/jj;->a(Lcom/google/android/gms/internal/measurement/ac$b;)Ljava/lang/String;
 
@@ -175,9 +175,9 @@
     invoke-virtual {p6, v3, v2}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :cond_2
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {p6}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result p6
 
@@ -185,7 +185,7 @@
 
     if-eqz p6, :cond_2b
 
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget p6, p6, Lcom/google/android/gms/internal/measurement/ac$b;->zzd:I
 
@@ -196,11 +196,11 @@
     goto/16 :goto_e
 
     :cond_3
-    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p6, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget-boolean p6, p6, Lcom/google/android/gms/internal/measurement/ac$b;->zzi:Z
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget-boolean v3, v3, Lcom/google/android/gms/internal/measurement/ac$b;->zzj:Z
 
@@ -208,7 +208,7 @@
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget-boolean v0, v0, Lcom/google/android/gms/internal/measurement/ac$b;->zzk:Z
 
@@ -244,29 +244,29 @@
 
     if-nez p6, :cond_8
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget p2, p0, Lcom/google/android/gms/measurement/internal/jv;->anl:I
+    iget p2, p0, Lcom/google/android/gms/measurement/internal/jv;->anu:I
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result p3
 
     if-eqz p3, :cond_7
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget p3, p3, Lcom/google/android/gms/internal/measurement/ac$b;->zzd:I
 
@@ -282,7 +282,7 @@
     return v2
 
     :cond_8
-    iget-object p7, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p7, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget v0, p7, Lcom/google/android/gms/internal/measurement/ac$b;->zzc:I
 
@@ -300,7 +300,7 @@
     :goto_4
     if-eqz v0, :cond_b
 
-    invoke-virtual {p7}, Lcom/google/android/gms/internal/measurement/ac$b;->pI()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p7}, Lcom/google/android/gms/internal/measurement/ac$b;->pL()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v0
 
@@ -355,17 +355,17 @@
 
     if-eqz v5, :cond_c
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -417,7 +417,7 @@
 
     if-eqz v5, :cond_e
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result v5
 
@@ -425,7 +425,7 @@
 
     iget-object v5, v0, Lcom/google/android/gms/internal/measurement/ak$e;->zzd:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qd()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qg()Z
 
     move-result v6
 
@@ -448,7 +448,7 @@
     goto :goto_6
 
     :cond_10
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qB()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
 
     move-result v5
 
@@ -456,7 +456,7 @@
 
     iget-object v5, v0, Lcom/google/android/gms/internal/measurement/ak$e;->zzd:Ljava/lang/String;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qB()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ak$e;->qE()Z
 
     move-result v6
 
@@ -494,17 +494,17 @@
     goto :goto_6
 
     :cond_13
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -512,9 +512,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -550,7 +550,7 @@
 
     check-cast p4, Lcom/google/android/gms/internal/measurement/ac$c;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pO()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pR()Z
 
     move-result p7
 
@@ -576,17 +576,17 @@
 
     if-eqz v5, :cond_17
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -609,23 +609,23 @@
 
     if-eqz v6, :cond_1a
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nL()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
 
     move-result v6
 
     if-nez v6, :cond_18
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -633,9 +633,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -656,7 +656,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object p4
 
@@ -684,23 +684,23 @@
 
     if-eqz v6, :cond_1d
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nL()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
 
     move-result v6
 
     if-nez v6, :cond_1b
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -708,9 +708,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -731,7 +731,7 @@
 
     move-result-wide v5
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object p4
 
@@ -759,7 +759,7 @@
 
     if-eqz v6, :cond_22
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pE()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pH()Z
 
     move-result v6
 
@@ -767,13 +767,13 @@
 
     check-cast v5, Ljava/lang/String;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pM()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pP()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object p4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
@@ -784,7 +784,7 @@
     goto :goto_a
 
     :cond_1e
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nL()Z
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
 
     move-result v6
 
@@ -798,7 +798,7 @@
 
     if-eqz v6, :cond_20
 
-    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {p4}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object p4
 
@@ -823,17 +823,17 @@
     goto/16 :goto_b
 
     :cond_20
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -841,9 +841,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -858,17 +858,17 @@
     goto :goto_b
 
     :cond_21
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -876,9 +876,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -895,17 +895,17 @@
     :cond_22
     if-nez v5, :cond_23
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -913,9 +913,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -932,17 +932,17 @@
     goto :goto_b
 
     :cond_23
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -950,9 +950,9 @@
 
     move-result-object p2
 
-    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p4, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p4}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p4
 
@@ -970,13 +970,13 @@
     sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
     :goto_b
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     if-nez v1, :cond_25
 
@@ -999,7 +999,7 @@
     :cond_26
     sget-object p2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aBZ:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aCi:Ljava/lang/Boolean;
 
     invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1012,11 +1012,11 @@
     :cond_27
     sget-object p2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIJ:Ljava/lang/Boolean;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->aIS:Ljava/lang/Boolean;
 
     if-eqz p6, :cond_2a
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c;->qd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ak$c;->qg()Z
 
     move-result p2
 
@@ -1033,7 +1033,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIL:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIU:Ljava/lang/Long;
 
     goto :goto_d
 
@@ -1044,7 +1044,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIK:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIT:Ljava/lang/Long;
 
     :cond_2a
     :goto_d
@@ -1052,29 +1052,29 @@
 
     :cond_2b
     :goto_e
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jv;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->atJ:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/jv;->atS:Ljava/lang/String;
 
     invoke-static {p2}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$b;->pH()Z
 
     move-result p3
 
     if-eqz p3, :cond_2c
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget p3, p3, Lcom/google/android/gms/internal/measurement/ac$b;->zzd:I
 
@@ -1094,10 +1094,10 @@
     return v2
 .end method
 
-.method final pG()I
+.method final pJ()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIE:Lcom/google/android/gms/internal/measurement/ac$b;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jv;->aIN:Lcom/google/android/gms/internal/measurement/ac$b;
 
     iget v0, v0, Lcom/google/android/gms/internal/measurement/ac$b;->zzd:I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jw.smali
index a3b2ceed87..95574f2ed9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jw.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jw.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private aIG:Ljava/util/Set;
+.field private aIP:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,11 +14,11 @@
     .end annotation
 .end field
 
-.field private final synthetic aIH:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private atJ:Ljava/lang/String;
+.field private atS:Ljava/lang/String;
 
-.field private awU:Ljava/util/Map;
+.field private axd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -34,7 +34,7 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,15 +42,15 @@
 
     invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIG:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIP:Ljava/util/Set;
 
     new-instance p1, Landroidx/collection/ArrayMap;
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method private final K(II)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -75,7 +75,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -87,7 +87,7 @@
 
     check-cast p1, Lcom/google/android/gms/measurement/internal/jt;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jt;->aIC:Ljava/util/BitSet;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/jt;->aIL:Ljava/util/BitSet;
 
     invoke-virtual {p1, p2}, Ljava/util/BitSet;->get(I)Z
 
@@ -99,7 +99,7 @@
 .method private final cy(I)Lcom/google/android/gms/measurement/internal/jt;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -111,7 +111,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -128,15 +128,15 @@
     :cond_0
     new-instance v0, Lcom/google/android/gms/measurement/internal/jt;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     const/4 v3, 0x0
 
     invoke-direct {v0, v1, v2, v3}, Lcom/google/android/gms/measurement/internal/jt;-><init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;B)V
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -170,15 +170,15 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -190,15 +190,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v4, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v4, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -242,29 +242,29 @@
     const/4 v4, 0x0
 
     :goto_0
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v5, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
     move-result v5
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v7, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v6, v7}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -274,17 +274,17 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {v7}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -301,7 +301,7 @@
     invoke-virtual {v0, v9, v8}, Landroid/content/ContentValues;->put(Ljava/lang/String;Ljava/lang/Integer;)V
 
     :try_start_0
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v8
 
@@ -322,11 +322,11 @@
     :catch_0
     move-exception v0
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v7}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -338,13 +338,13 @@
 
     :cond_3
     :goto_1
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v0
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-virtual {v0, v6}, Lcom/google/android/gms/measurement/internal/d;->cj(Ljava/lang/String;)Ljava/util/Map;
 
@@ -373,9 +373,9 @@
 
     if-eqz v4, :cond_c
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-static {v9}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
@@ -391,7 +391,7 @@
 
     if-nez v11, :cond_d
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v11
 
@@ -456,7 +456,7 @@
     goto/16 :goto_5
 
     :cond_6
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v15
 
@@ -472,7 +472,7 @@
 
     if-nez v15, :cond_5
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dw;->sP()Lcom/google/android/gms/internal/measurement/dw$b;
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/dw;->sS()Lcom/google/android/gms/internal/measurement/dw$b;
 
     move-result-object v15
 
@@ -480,7 +480,7 @@
 
     check-cast v15, Lcom/google/android/gms/internal/measurement/ak$i$a;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/internal/measurement/ak$i$a;->ri()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-virtual {v15}, Lcom/google/android/gms/internal/measurement/ak$i$a;->rl()Lcom/google/android/gms/internal/measurement/ak$i$a;
 
     move-result-object v15
 
@@ -488,7 +488,7 @@
 
     move-result-object v6
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v15
 
@@ -498,7 +498,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$i$a;->rh()Lcom/google/android/gms/internal/measurement/ak$i$a;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$i$a;->rk()Lcom/google/android/gms/internal/measurement/ak$i$a;
 
     move-result-object v15
 
@@ -507,7 +507,7 @@
     const/4 v3, 0x0
 
     :goto_3
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$i;->rc()I
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()I
 
     move-result v15
 
@@ -544,7 +544,7 @@
     const/4 v3, 0x0
 
     :goto_4
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$i;->pZ()I
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$i;->qc()I
 
     move-result v15
 
@@ -582,7 +582,7 @@
 
     move-result-object v3
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->sY()Lcom/google/android/gms/internal/measurement/fg;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/dw$b;->tb()Lcom/google/android/gms/internal/measurement/fg;
 
     move-result-object v6
 
@@ -656,7 +656,7 @@
 
     if-eqz v7, :cond_11
 
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$i;->rc()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$i;->rf()I
 
     move-result v12
 
@@ -684,7 +684,7 @@
 
     check-cast v13, Lcom/google/android/gms/internal/measurement/ak$b;
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->pE()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->pH()Z
 
     move-result v14
 
@@ -696,7 +696,7 @@
 
     move-result-object v14
 
-    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->nL()Z
+    invoke-virtual {v13}, Lcom/google/android/gms/internal/measurement/ak$b;->nO()Z
 
     move-result v15
 
@@ -741,7 +741,7 @@
     const/4 v2, 0x0
 
     :goto_c
-    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$i;->pH()I
+    invoke-virtual {v7}, Lcom/google/android/gms/internal/measurement/ak$i;->pK()I
 
     move-result v3
 
@@ -757,13 +757,13 @@
 
     if-eqz v3, :cond_12
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -879,9 +879,9 @@
 
     iget-object v13, v11, Lcom/google/android/gms/internal/measurement/ak$c;->zzd:Lcom/google/android/gms/internal/measurement/ee;
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v14, "_eid"
 
@@ -925,9 +925,9 @@
 
     if-eqz v6, :cond_22
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     const-string v6, "_en"
 
@@ -943,13 +943,13 @@
 
     if-eqz v7, :cond_19
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v7, "Extra parameter without an event name. eventId"
 
@@ -990,13 +990,13 @@
 
     :cond_1b
     :goto_13
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v12, v15}, Lcom/google/android/gms/measurement/internal/d;->b(Ljava/lang/String;Ljava/lang/Long;)Landroid/util/Pair;
 
@@ -1023,9 +1023,9 @@
 
     move-result-wide v9
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     invoke-static {v0, v14}, Lcom/google/android/gms/measurement/internal/jj;->c(Lcom/google/android/gms/internal/measurement/ak$c;Ljava/lang/String;)Ljava/lang/Object;
 
@@ -1046,28 +1046,28 @@
 
     if-gtz v0, :cond_1d
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v12
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v14
 
-    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v14, v14, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v15, "Clearing complex main event info. appId"
 
     invoke-virtual {v14, v15, v0}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :try_start_1
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v14
 
@@ -1120,11 +1120,11 @@
     const/16 v16, 0x0
 
     :goto_16
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v12, "Error clearing complex main event"
 
@@ -1141,13 +1141,13 @@
 
     const/16 v16, 0x0
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v18
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     move-object/from16 v19, v0
 
@@ -1184,9 +1184,9 @@
 
     check-cast v12, Lcom/google/android/gms/internal/measurement/ak$e;
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     iget-object v14, v12, Lcom/google/android/gms/internal/measurement/ak$e;->zzd:Ljava/lang/String;
 
@@ -1214,13 +1214,13 @@
     goto :goto_19
 
     :cond_20
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v8, "No unique parameters in main event. eventName"
 
@@ -1243,13 +1243,13 @@
 
     const/16 v16, 0x0
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v7
 
-    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v7, v7, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v11, "Extra parameter without existing main event. eventName, eventId"
 
@@ -1269,9 +1269,9 @@
 
     if-eqz v17, :cond_25
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     const-wide/16 v6, 0x0
 
@@ -1303,13 +1303,13 @@
 
     if-gtz v0, :cond_24
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v10, "Complex event with zero extra param count. eventName"
 
@@ -1318,13 +1318,13 @@
     goto :goto_1d
 
     :cond_24
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v17
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     move-object/from16 v18, v0
 
@@ -1350,21 +1350,21 @@
     const-wide/16 v6, 0x0
 
     :goto_1f
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v5
 
-    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v6, Lcom/google/android/gms/measurement/internal/o;->aDP:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v5, v15, v6}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
     move-result v5
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v6
 
@@ -1376,17 +1376,17 @@
 
     if-nez v6, :cond_27
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v15}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v7
 
-    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v14}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v14
 
@@ -1468,15 +1468,15 @@
 
     move-object/from16 v28, v0
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
     move-object/from16 v29, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
     move-object/from16 v30, v5
 
-    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     add-long v31, v14, v26
 
@@ -1496,19 +1496,19 @@
 
     move-wide/from16 v39, v14
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
 
     move-object/from16 v41, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     move-object/from16 v42, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     move-object/from16 v43, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     move-object/from16 v44, v5
 
@@ -1521,15 +1521,15 @@
 
     move-object/from16 v46, v0
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
     move-object/from16 v47, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
     move-object/from16 v48, v5
 
-    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v14, v6, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     add-long v49, v14, v26
 
@@ -1549,34 +1549,34 @@
 
     move-wide/from16 v57, v14
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
 
     move-object/from16 v59, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     move-object/from16 v60, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     move-object/from16 v61, v5
 
-    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v5, v6, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     move-object/from16 v62, v5
 
     invoke-direct/range {v46 .. v62}, Lcom/google/android/gms/measurement/internal/k;-><init>(Ljava/lang/String;Ljava/lang/String;JJJJJLjava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;)V
 
     :goto_20
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v5}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v5
 
     invoke-virtual {v5, v0}, Lcom/google/android/gms/measurement/internal/d;->a(Lcom/google/android/gms/measurement/internal/k;)V
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     invoke-interface {v3, v12}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1586,13 +1586,13 @@
 
     if-nez v7, :cond_2a
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v14, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-virtual {v7, v14, v12}, Lcom/google/android/gms/measurement/internal/d;->O(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
 
@@ -1635,7 +1635,7 @@
 
     move-object/from16 v25, v3
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIG:Ljava/util/Set;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIP:Ljava/util/Set;
 
     move-object/from16 v26, v8
 
@@ -1649,13 +1649,13 @@
 
     if-eqz v3, :cond_2b
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v3}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v3
 
-    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v3, v3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v15}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1705,11 +1705,11 @@
 
     move-object/from16 v28, v7
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
     move-wide/from16 v29, v9
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-direct {v3, v7, v9, v15, v8}, Lcom/google/android/gms/measurement/internal/jv;-><init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ac$b;)V
 
@@ -1756,7 +1756,7 @@
 
     if-nez v8, :cond_2d
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIG:Ljava/util/Set;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->aIP:Ljava/util/Set;
 
     invoke-static {v15}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1834,13 +1834,13 @@
 
     if-nez v8, :cond_31
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v8
 
-    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v9, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-virtual {v8, v9, v7}, Lcom/google/android/gms/measurement/internal/d;->P(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Map;
 
@@ -1881,7 +1881,7 @@
 
     move-result v9
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->aIG:Ljava/util/Set;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->aIP:Ljava/util/Set;
 
     invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1893,13 +1893,13 @@
 
     if-eqz v10, :cond_32
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v6}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1939,9 +1939,9 @@
 
     check-cast v11, Lcom/google/android/gms/internal/measurement/ac$e;
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
@@ -1953,19 +1953,19 @@
 
     if-eqz v12, :cond_34
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v12
 
-    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v12, v12, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v13
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result v14
 
@@ -1983,9 +1983,9 @@
     const/4 v14, 0x0
 
     :goto_26
-    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v15, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v15}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v15
 
@@ -2001,17 +2001,17 @@
 
     invoke-virtual {v12, v15, v13, v14, v2}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/jd;->xO()Lcom/google/android/gms/measurement/internal/jj;
+    invoke-virtual {v12}, Lcom/google/android/gms/measurement/internal/jd;->xR()Lcom/google/android/gms/measurement/internal/jj;
 
     move-result-object v12
 
@@ -2029,7 +2029,7 @@
     move-object/from16 v17, v2
 
     :goto_27
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result v2
 
@@ -2046,9 +2046,9 @@
     :cond_35
     new-instance v2, Lcom/google/android/gms/measurement/internal/jx;
 
-    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v12, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v13, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-direct {v2, v12, v13, v9, v11}, Lcom/google/android/gms/measurement/internal/jx;-><init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ac$e;)V
 
@@ -2078,21 +2078,21 @@
     :goto_28
     move-object/from16 v12, p3
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v10, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-static {v10}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
     move-result-object v10
 
-    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {v11}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result v13
 
@@ -2130,7 +2130,7 @@
     :goto_2a
     if-nez v11, :cond_39
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIG:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIP:Ljava/util/Set;
 
     invoke-static {v9}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2149,15 +2149,15 @@
     goto/16 :goto_23
 
     :cond_3b
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDL:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/o;->aDU:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v2, v3, v5}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -2169,13 +2169,13 @@
 
     if-eqz v2, :cond_3c
 
-    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v2, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v2}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v2
 
-    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v3, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
     invoke-virtual {v2, v3, v0}, Lcom/google/android/gms/measurement/internal/d;->d(Ljava/lang/String;Ljava/util/List;)Ljava/util/Map;
 
@@ -2186,13 +2186,13 @@
 
     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v0, v1, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
     move-result-object v0
 
-    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->aIG:Ljava/util/Set;
+    iget-object v5, v1, Lcom/google/android/gms/measurement/internal/jw;->aIP:Ljava/util/Set;
 
     invoke-interface {v0, v5}, Ljava/util/Set;->removeAll(Ljava/util/Collection;)Z
 
@@ -2218,7 +2218,7 @@
 
     move-result v0
 
-    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->awU:Ljava/util/Map;
+    iget-object v6, v1, Lcom/google/android/gms/measurement/internal/jw;->axd:Ljava/util/Map;
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -2246,27 +2246,27 @@
 
     invoke-interface {v2, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIH:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v7, v1, Lcom/google/android/gms/measurement/internal/jw;->aIQ:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xQ()Lcom/google/android/gms/measurement/internal/d;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jd;->xT()Lcom/google/android/gms/measurement/internal/d;
 
     move-result-object v7
 
-    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->atJ:Ljava/lang/String;
+    iget-object v8, v1, Lcom/google/android/gms/measurement/internal/jw;->atS:Ljava/lang/String;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$a;->ql()Lcom/google/android/gms/internal/measurement/ak$i;
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/ak$a;->qo()Lcom/google/android/gms/internal/measurement/ak$i;
 
     move-result-object v6
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yF()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/jb;->yI()V
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     invoke-static {v8}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
     invoke-static {v6}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/cf;->rG()[B
+    invoke-virtual {v6}, Lcom/google/android/gms/internal/measurement/cf;->rJ()[B
 
     move-result-object v6
 
@@ -2291,7 +2291,7 @@
     invoke-virtual {v9, v0, v6}, Landroid/content/ContentValues;->put(Ljava/lang/String;[B)V
 
     :try_start_4
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->uW()Landroid/database/sqlite/SQLiteDatabase;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/d;->uZ()Landroid/database/sqlite/SQLiteDatabase;
 
     move-result-object v0
 
@@ -2314,11 +2314,11 @@
 
     if-nez v0, :cond_3d
 
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v6, "Failed to insert filter results (got -1). appId"
 
@@ -2343,11 +2343,11 @@
     const/4 v11, 0x0
 
     :goto_2c
-    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v7}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v6
 
-    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v6, v6, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {v8}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jx.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jx.smali
index 6d1e4c4cd3..c0340ae2f3 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jx.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jx.smali
@@ -4,20 +4,20 @@
 
 
 # instance fields
-.field private final synthetic aIF:Lcom/google/android/gms/measurement/internal/jr;
+.field private final synthetic aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-.field private aII:Lcom/google/android/gms/internal/measurement/ac$e;
+.field private aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jr;Ljava/lang/String;ILcom/google/android/gms/internal/measurement/ac$e;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
     invoke-direct {p0, p2, p3}, Lcom/google/android/gms/measurement/internal/jy;-><init>(Ljava/lang/String;I)V
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     return-void
 .end method
@@ -27,39 +27,39 @@
 .method final a(Ljava/lang/Long;Lcom/google/android/gms/internal/measurement/ak$k;Z)Z
     .locals 12
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->atS:Ljava/lang/String;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/o;->aDO:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->atJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->atS:Ljava/lang/String;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDL:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/o;->aDU:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {v1, v2, v3}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     iget-boolean v2, v2, Lcom/google/android/gms/internal/measurement/ac$e;->zzg:Z
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     iget-boolean v3, v3, Lcom/google/android/gms/internal/measurement/ac$e;->zzh:Z
 
@@ -69,7 +69,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v6, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     iget-boolean v6, v6, Lcom/google/android/gms/internal/measurement/ac$e;->zzi:Z
 
@@ -107,29 +107,29 @@
 
     if-nez v2, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget p2, p0, Lcom/google/android/gms/measurement/internal/jx;->anl:I
+    iget p2, p0, Lcom/google/android/gms/measurement/internal/jx;->anu:I
 
     invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
-    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pE()Z
+    invoke-virtual {p3}, Lcom/google/android/gms/internal/measurement/ac$e;->pH()Z
 
     move-result p3
 
     if-eqz p3, :cond_3
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     iget p3, p3, Lcom/google/android/gms/internal/measurement/ac$e;->zzd:I
 
@@ -145,37 +145,37 @@
     return v5
 
     :cond_4
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$e;->pV()Lcom/google/android/gms/internal/measurement/ac$c;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$e;->pY()Lcom/google/android/gms/internal/measurement/ac$c;
 
     move-result-object v8
 
     iget-boolean v9, v8, Lcom/google/android/gms/internal/measurement/ac$c;->zzf:Z
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->qB()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->qE()Z
 
     move-result v10
 
     if-eqz v10, :cond_6
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nL()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
 
     move-result v10
 
     if-nez v10, :cond_5
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v9
 
@@ -194,7 +194,7 @@
     :cond_5
     iget-wide v10, p2, Lcom/google/android/gms/internal/measurement/ak$k;->zzg:J
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v7
 
@@ -209,29 +209,29 @@
     goto/16 :goto_4
 
     :cond_6
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->ro()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->rr()Z
 
     move-result v10
 
     if-eqz v10, :cond_8
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nL()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
 
     move-result v10
 
     if-nez v10, :cond_7
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v9
 
@@ -250,7 +250,7 @@
     :cond_7
     iget-wide v10, p2, Lcom/google/android/gms/internal/measurement/ak$k;->zzi:D
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v7
 
@@ -281,29 +281,29 @@
     :goto_3
     if-eqz v10, :cond_d
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pE()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pH()Z
 
     move-result v10
 
     if-nez v10, :cond_c
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nL()Z
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->nO()Z
 
     move-result v10
 
     if-nez v10, :cond_a
 
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v9
 
@@ -330,7 +330,7 @@
 
     iget-object v7, p2, Lcom/google/android/gms/internal/measurement/ak$k;->zzf:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pN()Lcom/google/android/gms/internal/measurement/ac$d;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pQ()Lcom/google/android/gms/internal/measurement/ac$d;
 
     move-result-object v8
 
@@ -345,17 +345,17 @@
     goto :goto_4
 
     :cond_b
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v9
 
@@ -376,13 +376,13 @@
     :cond_c
     iget-object v7, p2, Lcom/google/android/gms/internal/measurement/ak$k;->zzf:Ljava/lang/String;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pM()Lcom/google/android/gms/internal/measurement/ac$f;
+    invoke-virtual {v8}, Lcom/google/android/gms/internal/measurement/ac$c;->pP()Lcom/google/android/gms/internal/measurement/ac$f;
 
     move-result-object v8
 
-    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v10, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v10}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v10
 
@@ -397,17 +397,17 @@
     goto :goto_4
 
     :cond_d
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {v9}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v9
 
@@ -422,13 +422,13 @@
     invoke-virtual {v8, v10, v9}, Lcom/google/android/gms/measurement/internal/dx;->k(Ljava/lang/String;Ljava/lang/Object;)V
 
     :goto_4
-    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIF:Lcom/google/android/gms/measurement/internal/jr;
+    iget-object v8, p0, Lcom/google/android/gms/measurement/internal/jx;->aIO:Lcom/google/android/gms/measurement/internal/jr;
 
-    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v8}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v8
 
-    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v8, v8, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     if-nez v7, :cond_e
 
@@ -451,7 +451,7 @@
     :cond_f
     sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    iput-object v4, p0, Lcom/google/android/gms/measurement/internal/jx;->aBZ:Ljava/lang/Boolean;
+    iput-object v4, p0, Lcom/google/android/gms/measurement/internal/jx;->aCi:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_10
 
@@ -468,14 +468,14 @@
     :cond_10
     if-eqz p3, :cond_11
 
-    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object p3, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     iget-boolean p3, p3, Lcom/google/android/gms/internal/measurement/ac$e;->zzg:Z
 
     if-eqz p3, :cond_12
 
     :cond_11
-    iput-object v7, p0, Lcom/google/android/gms/measurement/internal/jx;->aIJ:Ljava/lang/Boolean;
+    iput-object v7, p0, Lcom/google/android/gms/measurement/internal/jx;->aIS:Ljava/lang/Boolean;
 
     :cond_12
     invoke-virtual {v7}, Ljava/lang/Boolean;->booleanValue()Z
@@ -486,7 +486,7 @@
 
     if-eqz v2, :cond_16
 
-    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->pE()Z
+    invoke-virtual {p2}, Lcom/google/android/gms/internal/measurement/ak$k;->pH()Z
 
     move-result p3
 
@@ -512,7 +512,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIL:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIU:Ljava/lang/Long;
 
     goto :goto_6
 
@@ -521,17 +521,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIK:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jx;->aIT:Ljava/lang/Long;
 
     :cond_16
     :goto_6
     return v5
 .end method
 
-.method final pG()I
+.method final pJ()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aII:Lcom/google/android/gms/internal/measurement/ac$e;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/jx;->aIR:Lcom/google/android/gms/internal/measurement/ac$e;
 
     iget v0, v0, Lcom/google/android/gms/internal/measurement/ac$e;->zzd:I
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jy.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jy.smali
index a00f61895d..b0f06c50f0 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jy.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jy.smali
@@ -4,17 +4,17 @@
 
 
 # instance fields
-.field aBZ:Ljava/lang/Boolean;
+.field aCi:Ljava/lang/Boolean;
 
-.field aIJ:Ljava/lang/Boolean;
+.field aIS:Ljava/lang/Boolean;
 
-.field aIK:Ljava/lang/Long;
+.field aIT:Ljava/lang/Long;
 
-.field aIL:Ljava/lang/Long;
+.field aIU:Ljava/lang/Long;
 
-.field anl:I
+.field anu:I
 
-.field atJ:Ljava/lang/String;
+.field atS:Ljava/lang/String;
 
 
 # direct methods
@@ -23,9 +23,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jy;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/jy;->atS:Ljava/lang/String;
 
-    iput p2, p0, Lcom/google/android/gms/measurement/internal/jy;->anl:I
+    iput p2, p0, Lcom/google/android/gms/measurement/internal/jy;->anu:I
 
     return-void
 .end method
@@ -170,7 +170,7 @@
     return-object v0
 
     :cond_0
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-ne p1, v1, :cond_2
 
@@ -193,7 +193,7 @@
     :cond_3
     if-nez p2, :cond_5
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-ne p1, v1, :cond_4
 
@@ -208,7 +208,7 @@
 
     :cond_5
     :goto_0
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->asW:[I
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ju;->atf:[I
 
     invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f$b;->ordinal()I
 
@@ -312,7 +312,7 @@
 
     if-eqz p6, :cond_7
 
-    iget-object p0, p6, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p0, p6, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p1, "Invalid regular expression in REGEXP audience filter. expression"
 
@@ -344,32 +344,32 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pH()Z
 
     move-result v1
 
     if-eqz v1, :cond_b
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pY()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$f$b;->asN:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$f$b;->asW:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-ne v1, v2, :cond_1
 
     goto/16 :goto_7
 
     :cond_1
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pY()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-ne v1, v2, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qc()I
 
     move-result v1
 
@@ -397,7 +397,7 @@
     return-object v0
 
     :cond_4
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pY()Lcom/google/android/gms/internal/measurement/ac$f$b;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qb()Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     move-result-object v3
 
@@ -405,11 +405,11 @@
 
     if-nez v4, :cond_6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-eq v3, v1, :cond_6
 
-    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asT:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object v1, Lcom/google/android/gms/internal/measurement/ac$f$b;->atc:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-ne v3, v1, :cond_5
 
@@ -433,7 +433,7 @@
     :goto_2
     move-object v5, v1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->pZ()I
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$f;->qc()I
 
     move-result v1
 
@@ -497,7 +497,7 @@
     goto :goto_3
 
     :goto_5
-    sget-object p1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asO:Lcom/google/android/gms/internal/measurement/ac$f$b;
+    sget-object p1, Lcom/google/android/gms/internal/measurement/ac$f$b;->asX:Lcom/google/android/gms/internal/measurement/ac$f$b;
 
     if-ne v3, p1, :cond_a
 
@@ -529,7 +529,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/ac$d;->pE()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pH()Z
 
     move-result v0
 
@@ -537,22 +537,22 @@
 
     if-eqz v0, :cond_17
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pR()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asG:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asP:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     if-ne v0, v2, :cond_0
 
     goto/16 :goto_5
 
     :cond_0
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pR()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v2, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     const/4 v3, 0x4
 
@@ -617,15 +617,15 @@
     return-object v1
 
     :cond_6
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pR()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pR()Lcom/google/android/gms/internal/measurement/ac$d$a;
+    invoke-virtual {p1}, Lcom/google/android/gms/internal/measurement/ac$d;->pU()Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     move-result-object v2
 
-    sget-object v6, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v6, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     if-ne v2, v6, :cond_9
 
@@ -700,7 +700,7 @@
     move-object v6, p1
 
     :goto_4
-    sget-object v7, Lcom/google/android/gms/internal/measurement/ac$d$a;->asK:Lcom/google/android/gms/internal/measurement/ac$d$a;
+    sget-object v7, Lcom/google/android/gms/internal/measurement/ac$d$a;->asT:Lcom/google/android/gms/internal/measurement/ac$d$a;
 
     if-ne v0, v7, :cond_b
 
@@ -712,7 +712,7 @@
     if-eqz v2, :cond_17
 
     :cond_c
-    sget-object v7, Lcom/google/android/gms/measurement/internal/ju;->ant:[I
+    sget-object v7, Lcom/google/android/gms/measurement/internal/ju;->anC:[I
 
     invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/ac$d$a;->ordinal()I
 
@@ -874,5 +874,5 @@
 
 
 # virtual methods
-.method abstract pG()I
+.method abstract pJ()I
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jz.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jz.smali
index 0cf1640f3d..2d1442fe66 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jz.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/jz.smali
@@ -20,7 +20,7 @@
     return-void
 .end method
 
-.method public static pE()Z
+.method public static pH()Z
     .locals 2
 
     invoke-static {}, Landroid/os/Looper;->myLooper()Landroid/os/Looper;
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/k.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/k.smali
index e16117ec3f..3195d611f5 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/k.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/k.smali
@@ -4,19 +4,19 @@
 
 
 # instance fields
-.field final aBL:J
+.field final aBU:J
 
-.field final aCd:Ljava/lang/Long;
+.field final aCm:Ljava/lang/Long;
 
-.field final aCe:Ljava/lang/Long;
+.field final aCn:Ljava/lang/Long;
 
-.field final aCf:Ljava/lang/Long;
+.field final aCo:Ljava/lang/Long;
 
-.field final amV:Ljava/lang/String;
+.field final ane:Ljava/lang/String;
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
-.field final azD:Ljava/lang/Boolean;
+.field final azM:Ljava/lang/Boolean;
 
 .field final zzd:J
 
@@ -141,13 +141,13 @@
 
     move-object v9, p1
 
-    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
     move-object/from16 v9, p2
 
-    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iput-object v9, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     iput-wide v3, v0, Lcom/google/android/gms/measurement/internal/k;->zzd:J
 
@@ -161,19 +161,19 @@
 
     move-object/from16 v1, p13
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     move-object/from16 v1, p15
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     move-object/from16 v1, p16
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     return-void
 .end method
@@ -207,11 +207,11 @@
 
     move-object v2, v1
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iget-object v4, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
-    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v5, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     iget-wide v7, v0, Lcom/google/android/gms/measurement/internal/k;->zzd:J
 
@@ -221,7 +221,7 @@
 
     iget-wide v13, v0, Lcom/google/android/gms/measurement/internal/k;->zzg:J
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
 
     move-object/from16 v16, p1
 
@@ -243,11 +243,11 @@
 
     move-object/from16 v1, v18
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/k;->zzd:J
 
@@ -255,17 +255,17 @@
 
     iget-wide v12, v0, Lcom/google/android/gms/measurement/internal/k;->zzg:J
 
-    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/k;->aCd:Ljava/lang/Long;
+    iget-object v14, v0, Lcom/google/android/gms/measurement/internal/k;->aCm:Ljava/lang/Long;
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     move-object/from16 p1, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     move-object/from16 v16, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     move-object/from16 v17, v1
 
@@ -287,11 +287,11 @@
 
     move-object/from16 v1, v18
 
-    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/k;->atJ:Ljava/lang/String;
+    iget-object v2, v0, Lcom/google/android/gms/measurement/internal/k;->atS:Ljava/lang/String;
 
-    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->amV:Ljava/lang/String;
+    iget-object v3, v0, Lcom/google/android/gms/measurement/internal/k;->ane:Ljava/lang/String;
 
-    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBL:J
+    iget-wide v4, v0, Lcom/google/android/gms/measurement/internal/k;->aBU:J
 
     iget-wide v6, v0, Lcom/google/android/gms/measurement/internal/k;->zzd:J
 
@@ -303,15 +303,15 @@
 
     move-result-object v14
 
-    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCe:Ljava/lang/Long;
+    iget-object v15, v0, Lcom/google/android/gms/measurement/internal/k;->aCn:Ljava/lang/Long;
 
     move-object/from16 p1, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCf:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->aCo:Ljava/lang/Long;
 
     move-object/from16 v16, v1
 
-    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azD:Ljava/lang/Boolean;
+    iget-object v1, v0, Lcom/google/android/gms/measurement/internal/k;->azM:Ljava/lang/Boolean;
 
     move-object/from16 v17, v1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ka.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ka.smali
index 74e7c5250a..05277b9b83 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ka.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/ka.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private aBZ:Ljava/lang/Boolean;
+.field private aCi:Ljava/lang/Boolean;
 
-.field private aIQ:Ljava/lang/Boolean;
+.field private aIZ:Ljava/lang/Boolean;
 
-.field aIR:Lcom/google/android/gms/measurement/internal/kc;
+.field aJa:Lcom/google/android/gms/measurement/internal/kc;
 
 
 # direct methods
@@ -17,19 +17,75 @@
 
     invoke-direct {p0, p1}, Lcom/google/android/gms/measurement/internal/fu;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/b;->aBK:Lcom/google/android/gms/measurement/internal/kc;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/b;->aBT:Lcom/google/android/gms/measurement/internal/kc;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/o;->a(Lcom/google/android/gms/measurement/internal/ey;)V
 
     return-void
 .end method
 
-.method public static uZ()Z
+.method static ug()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCp:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCz:Lcom/google/android/gms/measurement/internal/do;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public static uj()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDc:Lcom/google/android/gms/measurement/internal/do;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)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 static up()J
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCC:Lcom/google/android/gms/measurement/internal/do;
+
+    const/4 v1, 0x0
+
+    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)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 static vc()Z
+    .locals 2
+
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCy:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v1, 0x0
 
@@ -46,69 +102,13 @@
     return v0
 .end method
 
-.method static ud()Ljava/lang/String;
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCq:Lcom/google/android/gms/measurement/internal/do;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/lang/String;
-
-    return-object v0
-.end method
-
-.method public static ug()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCT:Lcom/google/android/gms/measurement/internal/do;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)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 static um()J
-    .locals 2
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCt:Lcom/google/android/gms/measurement/internal/do;
-
-    const/4 v1, 0x0
-
-    invoke-virtual {v0, v1}, Lcom/google/android/gms/measurement/internal/do;->U(Ljava/lang/Object;)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 private final yS()Landroid/os/Bundle;
+.method private final yV()Landroid/os/Bundle;
     .locals 4
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -118,11 +118,11 @@
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to load metadata: PackageManager is null"
 
@@ -131,7 +131,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v1
 
@@ -139,7 +139,7 @@
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v2
 
@@ -155,11 +155,11 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v1
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to load metadata: ApplicationInfo is null"
 
@@ -177,11 +177,11 @@
     :catch_0
     move-exception v1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v2, v2, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v3, "Failed to load metadata: Package name not found"
 
@@ -248,11 +248,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "SystemProperties.get() threw an exception"
 
@@ -263,11 +263,11 @@
     :catch_1
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Could not access SystemProperties.get()"
 
@@ -278,11 +278,11 @@
     :catch_2
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Could not find SystemProperties.get() method"
 
@@ -293,11 +293,11 @@
     :catch_3
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Could not find SystemProperties class"
 
@@ -336,9 +336,9 @@
     return-wide p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atJ:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/kc;->I(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -449,9 +449,9 @@
     return p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atJ:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/kc;->I(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -516,7 +516,7 @@
 .method final bi(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDr:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDA:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -554,9 +554,9 @@
     return-wide p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atJ:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/kc;->I(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -621,7 +621,7 @@
 .method public final cH(Ljava/lang/String;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
     const-string v1, "gaia_collection_enabled"
 
@@ -641,7 +641,7 @@
 .method public final cJ(Ljava/lang/String;)I
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCE:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCN:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->b(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)I
 
@@ -655,7 +655,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ka;->yS()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ka;->yV()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -663,11 +663,11 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Failed to load metadata: Metadata bundle is null"
 
@@ -711,7 +711,7 @@
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ka;->yS()Landroid/os/Bundle;
+    invoke-direct {p0}, Lcom/google/android/gms/measurement/internal/ka;->yV()Landroid/os/Bundle;
 
     move-result-object v0
 
@@ -719,11 +719,11 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v0, "Failed to load metadata: Metadata bundle is null"
 
@@ -759,7 +759,7 @@
 
     :cond_2
     :try_start_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -791,11 +791,11 @@
     :catch_0
     move-exception p1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v2, "Failed to load string array from metadata: resource not found"
 
@@ -807,7 +807,7 @@
 .method final cM(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDe:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDn:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -819,7 +819,7 @@
 .method final cN(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDg:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDp:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -831,7 +831,7 @@
 .method final cO(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDh:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDq:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -843,7 +843,7 @@
 .method final cP(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDi:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDr:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -855,7 +855,7 @@
 .method final cQ(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDj:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDs:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -867,7 +867,7 @@
 .method final cR(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDk:Lcom/google/android/gms/measurement/internal/do;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aDt:Lcom/google/android/gms/measurement/internal/do;
 
     invoke-virtual {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/ka;->d(Ljava/lang/String;Lcom/google/android/gms/measurement/internal/do;)Z
 
@@ -905,9 +905,9 @@
     return p1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aIR:Lcom/google/android/gms/measurement/internal/kc;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/ka;->aJa:Lcom/google/android/gms/measurement/internal/kc;
 
-    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atJ:Ljava/lang/String;
+    iget-object v2, p2, Lcom/google/android/gms/measurement/internal/do;->atS:Ljava/lang/String;
 
     invoke-interface {v1, p1, v2}, Lcom/google/android/gms/measurement/internal/kc;->I(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -953,10 +953,18 @@
     return p1
 .end method
 
-.method public final ro()Z
+.method public final bridge synthetic rA()V
+    .locals 0
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->rA()V
+
+    return-void
+.end method
+
+.method public final rr()Z
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v0, "firebase_analytics_collection_deactivated"
 
@@ -982,29 +990,21 @@
     return v0
 .end method
 
-.method public final bridge synthetic rx()V
-    .locals 0
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->rx()V
-
-    return-void
-.end method
-
-.method public final uF()Z
+.method public final uI()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
 
     if-nez v0, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
@@ -1012,7 +1012,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lcom/google/android/gms/common/util/m;->nu()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->nx()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1040,22 +1040,22 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aBZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi: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/ka;->aBZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "My process not in the list of running processes"
 
@@ -1077,7 +1077,7 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aCi:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1086,7 +1086,7 @@
     return v0
 .end method
 
-.method public final uH()Ljava/lang/Boolean;
+.method public final uK()Ljava/lang/Boolean;
     .locals 1
 
     const-string v0, "google_analytics_adid_collection_enabled"
@@ -1122,10 +1122,20 @@
     return-object v0
 .end method
 
-.method public final vH()Ljava/lang/Boolean;
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final vK()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vA()Lcom/google/android/gms/measurement/internal/jz;
 
     const-string v0, "firebase_analytics_collection_enabled"
 
@@ -1136,10 +1146,10 @@
     return-object v0
 .end method
 
-.method final va()Z
+.method final vd()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIQ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIZ:Ljava/lang/Boolean;
 
     if-nez v0, :cond_0
 
@@ -1149,18 +1159,18 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIQ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIZ:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIQ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIZ: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/ka;->aIQ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIZ:Ljava/lang/Boolean;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIQ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aIZ:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -1168,7 +1178,7 @@
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aGB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/ka;->aGK:Lcom/google/android/gms/measurement/internal/ey;
 
     iget-boolean v0, v0, Lcom/google/android/gms/measurement/internal/ey;->zzf:Z
 
@@ -1188,115 +1198,105 @@
     return v0
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/jz;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final yT()Ljava/lang/String;
+.method public final yW()Ljava/lang/String;
     .locals 2
 
     const-string v0, "debug.firebase.analytics.app"
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 beec33f87e..e3490e5353 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
@@ -4,13 +4,13 @@
 
 
 # instance fields
-.field final aBL:J
+.field final aBU:J
 
-.field final aCg:Lcom/google/android/gms/measurement/internal/zzam;
+.field final aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
-.field final amV:Ljava/lang/String;
+.field final ane:Ljava/lang/String;
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
 .field final zzd:J
 
@@ -27,9 +27,9 @@
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -42,7 +42,7 @@
     :cond_0
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/l;->zzf:Ljava/lang/String;
 
-    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     iput-wide p7, p0, Lcom/google/android/gms/measurement/internal/l;->zzd:J
 
@@ -54,17 +54,17 @@
 
     if-eqz p2, :cond_1
 
-    iget-wide p6, p0, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide p6, p0, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     cmp-long p2, p4, p6
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p2
 
-    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p2, p2, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -110,11 +110,11 @@
 
     if-nez p4, :cond_2
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p4
 
-    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p4, p4, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p5, "Param name can\'t be null"
 
@@ -125,7 +125,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     invoke-virtual {p2, p4}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -137,13 +137,13 @@
 
     if-nez p5, :cond_3
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p5
 
-    iget-object p5, p5, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p5, p5, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yb()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object p6
 
@@ -160,7 +160,7 @@
     goto :goto_0
 
     :cond_3
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->ya()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->yd()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object p6
 
@@ -185,7 +185,7 @@
     invoke-direct {p1, p2}, Lcom/google/android/gms/measurement/internal/zzam;-><init>(Landroid/os/Bundle;)V
 
     :goto_1
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     return-void
 .end method
@@ -201,9 +201,9 @@
 
     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/l;->atJ:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -216,7 +216,7 @@
     :cond_0
     iput-object p2, p0, Lcom/google/android/gms/measurement/internal/l;->zzf:Ljava/lang/String;
 
-    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iput-wide p5, p0, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     iput-wide p7, p0, Lcom/google/android/gms/measurement/internal/l;->zzd:J
 
@@ -228,17 +228,17 @@
 
     if-eqz p2, :cond_1
 
-    iget-wide p7, p0, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide p7, p0, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
     cmp-long p2, p5, p7
 
     if-lez p2, :cond_1
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p3}, Lcom/google/android/gms/measurement/internal/dv;->bX(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -253,7 +253,7 @@
     invoke-virtual {p1, p4, p2, p3}, Lcom/google/android/gms/measurement/internal/dx;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
 
     :cond_1
-    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     return-void
 .end method
@@ -267,13 +267,13 @@
 
     iget-object v2, p0, Lcom/google/android/gms/measurement/internal/l;->zzf:Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
-    iget-wide v5, p0, Lcom/google/android/gms/measurement/internal/l;->aBL:J
+    iget-wide v5, p0, Lcom/google/android/gms/measurement/internal/l;->aBU:J
 
-    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v9, p0, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     move-object v0, v10
 
@@ -289,11 +289,11 @@
 .method public final toString()Ljava/lang/String;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/l;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/l;->atS:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/l;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/l;->ane:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/l;->aCg:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/l;->aCp:Lcom/google/android/gms/measurement/internal/zzam;
 
     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/m.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/m.smali
index 4b8b5486b8..599d271224 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
@@ -18,9 +18,9 @@
 
 
 # instance fields
-.field private final synthetic aCh:Lcom/google/android/gms/measurement/internal/zzam;
+.field private final synthetic aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-.field private awe:Ljava/util/Iterator;
+.field private awn:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -35,11 +35,11 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/zzam;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-static {p1}, Lcom/google/android/gms/measurement/internal/zzam;->a(Lcom/google/android/gms/measurement/internal/zzam;)Landroid/os/Bundle;
 
@@ -53,7 +53,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->awe:Ljava/util/Iterator;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/m;->awn:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 .method public final hasNext()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->awn:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -75,7 +75,7 @@
 .method public final synthetic next()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->awe:Ljava/util/Iterator;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/m;->awn: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/o.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/o.smali
index 3ff15c4836..425a04e200 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
@@ -8,7 +8,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -18,7 +18,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -28,7 +28,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -38,7 +38,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -48,7 +48,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -68,7 +68,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -78,7 +78,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -88,7 +88,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -98,7 +98,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -108,7 +108,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -118,7 +118,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -128,7 +128,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -138,7 +138,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -148,7 +148,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -158,7 +158,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -188,7 +188,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -208,7 +208,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -218,7 +218,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -238,7 +238,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -248,7 +248,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -264,9 +264,9 @@
     .end annotation
 .end field
 
-.field static aCj:Lcom/google/android/gms/measurement/internal/jz;
+.field static aCs:Lcom/google/android/gms/measurement/internal/jz;
 
-.field private static aCk:Ljava/util/List;
+.field private static aCt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -276,7 +276,7 @@
     .end annotation
 .end field
 
-.field private static aCl:Ljava/util/Set;
+.field private static aCu:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -286,105 +286,15 @@
     .end annotation
 .end field
 
-.field private static volatile aCm:Lcom/google/android/gms/measurement/internal/ey;
+.field private static volatile aCv:Lcom/google/android/gms/measurement/internal/ey;
 
-.field private static aCn:Ljava/lang/Boolean;
-
-.field public static aCo:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCp:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCq:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCr:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCs:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCt:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Long;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCu:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCv:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/String;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static aCw:Lcom/google/android/gms/measurement/internal/do;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private static aCw:Ljava/lang/Boolean;
 
 .field public static aCx:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -394,7 +304,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
@@ -404,7 +314,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -540,7 +450,7 @@
     .end annotation
 .end field
 
-.field private static aDN:Lcom/google/android/gms/measurement/internal/do;
+.field public static aDN:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -630,7 +540,7 @@
     .end annotation
 .end field
 
-.field public static aDW:Lcom/google/android/gms/measurement/internal/do;
+.field private static aDW:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -674,7 +584,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -684,7 +594,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Double;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -694,7 +604,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Integer;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -704,7 +614,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -714,7 +624,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -724,7 +634,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -744,7 +654,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/String;",
             ">;"
         }
     .end annotation
@@ -754,7 +664,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Long;",
             ">;"
         }
     .end annotation
@@ -764,7 +674,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -774,7 +684,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Double;",
             ">;"
         }
     .end annotation
@@ -784,7 +694,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
-            "Ljava/lang/Boolean;",
+            "Ljava/lang/Integer;",
             ">;"
         }
     .end annotation
@@ -980,7 +890,7 @@
     .end annotation
 .end field
 
-.field private static aEf:Lcom/google/android/gms/measurement/internal/do;
+.field public static aEf:Lcom/google/android/gms/measurement/internal/do;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/measurement/internal/do<",
@@ -1000,6 +910,96 @@
     .end annotation
 .end field
 
+.field public static aEh:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEi:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEj:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEk:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEl:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEm:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEn:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private static aEo:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public static aEp:Lcom/google/android/gms/measurement/internal/do;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/google/android/gms/measurement/internal/do<",
+            "Ljava/lang/Boolean;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -1013,7 +1013,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCk:Ljava/util/List;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCt:Ljava/util/List;
 
     new-instance v0, Ljava/util/HashSet;
 
@@ -1023,11 +1023,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCl:Ljava/util/Set;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCu:Ljava/util/Set;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/r;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/r;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.log_androidId_enabled"
 
@@ -1035,11 +1035,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCo:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCx:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/q;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/q;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload_dsid_enabled"
 
@@ -1047,9 +1047,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCp:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCy:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/ae;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v1, "measurement.log_tag"
 
@@ -1061,7 +1061,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCq:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCz:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/16 v0, 0x2710
 
@@ -1069,7 +1069,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/an;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/an;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.ad_id_cache_time"
 
@@ -1077,7 +1077,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lcom/google/android/gms/measurement/internal/o;->aCr:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v1, Lcom/google/android/gms/measurement/internal/o;->aCA:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/32 v1, 0x5265c00
 
@@ -1085,7 +1085,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/bb;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/bb;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.monitoring.sample_period_millis"
 
@@ -1093,7 +1093,7 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v2, Lcom/google/android/gms/measurement/internal/o;->aCB:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/32 v2, 0x36ee80
 
@@ -1101,7 +1101,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/bk;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/bk;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v4, "measurement.config.cache_time"
 
@@ -1109,9 +1109,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCt:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCC:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/bx;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/bx;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v4, "measurement.config.url_scheme"
 
@@ -1121,9 +1121,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCu:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCD:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ch;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ch;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v4, "measurement.config.url_authority"
 
@@ -1133,7 +1133,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCE:Lcom/google/android/gms/measurement/internal/do;
 
     const/16 v3, 0x64
 
@@ -1141,7 +1141,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/cu;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/cu;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v5, "measurement.upload.max_bundles"
 
@@ -1149,7 +1149,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCw:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCF:Lcom/google/android/gms/measurement/internal/do;
 
     const/high16 v3, 0x10000
 
@@ -1157,7 +1157,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/de;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/de;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v5, "measurement.upload.max_batch_size"
 
@@ -1165,9 +1165,9 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/google/android/gms/measurement/internal/o;->aCx:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v4, Lcom/google/android/gms/measurement/internal/o;->aCG:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/t;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/t;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v5, "measurement.upload.max_bundle_size"
 
@@ -1175,7 +1175,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCy:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCH:Lcom/google/android/gms/measurement/internal/do;
 
     const/16 v3, 0x3e8
 
@@ -1183,7 +1183,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/s;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/s;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v5, "measurement.upload.max_events_per_bundle"
 
@@ -1191,7 +1191,7 @@
 
     move-result-object v4
 
-    sput-object v4, Lcom/google/android/gms/measurement/internal/o;->aCz:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v4, Lcom/google/android/gms/measurement/internal/o;->aCI:Lcom/google/android/gms/measurement/internal/do;
 
     const v4, 0x186a0
 
@@ -1199,7 +1199,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/v;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/v;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v6, "measurement.upload.max_events_per_day"
 
@@ -1207,9 +1207,9 @@
 
     move-result-object v5
 
-    sput-object v5, Lcom/google/android/gms/measurement/internal/o;->aCA:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v5, Lcom/google/android/gms/measurement/internal/o;->aCJ:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/u;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/u;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v6, "measurement.upload.max_error_events_per_day"
 
@@ -1217,7 +1217,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCB:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCK:Lcom/google/android/gms/measurement/internal/do;
 
     const v3, 0xc350
 
@@ -1225,7 +1225,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/x;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/x;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v6, "measurement.upload.max_public_events_per_day"
 
@@ -1233,7 +1233,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCC:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCL:Lcom/google/android/gms/measurement/internal/do;
 
     const/16 v3, 0x1f4
 
@@ -1241,7 +1241,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/w;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/w;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v6, "measurement.upload.max_conversions_per_day"
 
@@ -1249,7 +1249,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCD:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCM:Lcom/google/android/gms/measurement/internal/do;
 
     const/16 v3, 0xa
 
@@ -1257,7 +1257,7 @@
 
     move-result-object v3
 
-    sget-object v5, Lcom/google/android/gms/measurement/internal/aa;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v5, Lcom/google/android/gms/measurement/internal/aa;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v6, "measurement.upload.max_realtime_events_per_day"
 
@@ -1265,9 +1265,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCE:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCN:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/y;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/y;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v5, "measurement.store.max_stored_events_per_app"
 
@@ -1275,9 +1275,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCF:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCO:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ac;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ac;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v4, "measurement.upload.url"
 
@@ -1287,7 +1287,7 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCG:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCP:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/32 v3, 0x2932e00
 
@@ -1295,7 +1295,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lcom/google/android/gms/measurement/internal/ab;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v4, Lcom/google/android/gms/measurement/internal/ab;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v5, "measurement.upload.backoff_period"
 
@@ -1303,9 +1303,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCH:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCQ:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ad;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ad;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v4, "measurement.upload.window_interval"
 
@@ -1313,9 +1313,9 @@
 
     move-result-object v3
 
-    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCI:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v3, Lcom/google/android/gms/measurement/internal/o;->aCR:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v3, Lcom/google/android/gms/measurement/internal/ag;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v3, Lcom/google/android/gms/measurement/internal/ag;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v4, "measurement.upload.interval"
 
@@ -1323,9 +1323,9 @@
 
     move-result-object v2
 
-    sput-object v2, Lcom/google/android/gms/measurement/internal/o;->aCJ:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v2, Lcom/google/android/gms/measurement/internal/o;->aCS:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/af;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/af;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.upload.realtime_upload_interval"
 
@@ -1333,7 +1333,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCK:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCT:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/16 v2, 0x3e8
 
@@ -1341,7 +1341,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ai;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ai;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.upload.debug_upload_interval"
 
@@ -1349,7 +1349,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCL:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCU:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/16 v2, 0x1f4
 
@@ -1357,7 +1357,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ah;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ah;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.upload.minimum_delay"
 
@@ -1365,7 +1365,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCM:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCV:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/32 v2, 0xea60
 
@@ -1373,7 +1373,7 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/ak;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/ak;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.alarm_manager.minimum_interval"
 
@@ -1381,9 +1381,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCN:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCW:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/aj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.stale_data_deletion_interval"
 
@@ -1391,7 +1391,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCO:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCX:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/32 v0, 0x240c8400
 
@@ -1399,7 +1399,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/am;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/am;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.refresh_blacklisted_config_interval"
 
@@ -1407,7 +1407,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCP:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCY:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/16 v0, 0x3a98
 
@@ -1415,7 +1415,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/al;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/al;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.initial_upload_delay_time"
 
@@ -1423,7 +1423,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCQ:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCZ:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/32 v0, 0x1b7740
 
@@ -1431,7 +1431,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ao;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ao;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.retry_time"
 
@@ -1439,7 +1439,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCR:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDa:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v0, 0x6
 
@@ -1447,7 +1447,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/aq;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/aq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.retry_count"
 
@@ -1455,7 +1455,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCS:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDb:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide v0, 0x90321000L
 
@@ -1463,7 +1463,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ap;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ap;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.max_queue_time"
 
@@ -1471,7 +1471,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCT:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDc:Lcom/google/android/gms/measurement/internal/do;
 
     const/4 v0, 0x4
 
@@ -1479,7 +1479,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/as;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/as;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.lifetimevalue.max_currency_tracked"
 
@@ -1487,7 +1487,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCU:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDd:Lcom/google/android/gms/measurement/internal/do;
 
     const/16 v0, 0xc8
 
@@ -1495,7 +1495,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ar;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ar;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.audience.filter_result_max_count"
 
@@ -1503,7 +1503,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCV:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDe:Lcom/google/android/gms/measurement/internal/do;
 
     const-wide/16 v0, 0x1388
 
@@ -1511,7 +1511,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/au;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/au;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.service_client.idle_disconnect_millis"
 
@@ -1519,137 +1519,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCW:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/at;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.test.boolean_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCX:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v1, "measurement.test.string_flag"
-
-    const-string v2, "---"
-
-    invoke-static {v1, v2, v2, v0}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCY:Lcom/google/android/gms/measurement/internal/do;
-
-    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/av;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.test.long_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCZ:Lcom/google/android/gms/measurement/internal/do;
-
-    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/ay;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.test.int_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDa:Lcom/google/android/gms/measurement/internal/do;
-
-    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/ax;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.test.double_flag"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDb:Lcom/google/android/gms/measurement/internal/do;
-
-    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;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.experiment.max_ids"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDc:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bd;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.validation.internal_limits_internal_event_params"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDd:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bc;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.reset_analytics.persist_time"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDe:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bf;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.sampling.time_zone_offset_enabled"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDf:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/be;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/at;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.referrer.enable_logging_install_referrer_cmp_from_apk"
+    const-string v2, "measurement.test.boolean_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1657,23 +1533,27 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDg:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/aw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bh;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    const-string v1, "measurement.test.string_flag"
 
-    const-string v2, "measurement.client.sessions.session_id_enabled"
+    const-string v2, "---"
 
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+    invoke-static {v1, v2, v2, v0}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
     move-result-object v0
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDh:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    const-wide/16 v0, -0x1
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bg;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    const-string v2, "measurement.service.sessions.session_number_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/av;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.test.long_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1681,11 +1561,15 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDi:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    const/4 v0, -0x2
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const-string v2, "measurement.client.sessions.immediate_start_enabled_foreground"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ay;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.test.int_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1693,11 +1577,15 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDj:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    const-wide/high16 v0, -0x3ff8000000000000L    # -3.0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bi;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    invoke-static {v0, v1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
-    const-string v2, "measurement.client.sessions.background_sessions_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ax;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.test.double_flag"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1705,11 +1593,15 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDk:Lcom/google/android/gms/measurement/internal/do;
 
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+    const/16 v0, 0x32
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bl;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
-    const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
+    move-result-object v0
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/az;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.experiment.max_ids"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1717,11 +1609,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDl:Lcom/google/android/gms/measurement/internal/do;
 
-    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/bn;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
+    const-string v2, "measurement.validation.internal_limits_internal_event_params"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1731,9 +1623,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bm;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bc;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.sessions.remove_disabled_session_number"
+    const-string v2, "measurement.reset_analytics.persist_time"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1741,11 +1633,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDn:Lcom/google/android/gms/measurement/internal/do;
 
-    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/bp;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bf;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.start_session_before_view_screen"
+    const-string v2, "measurement.sampling.time_zone_offset_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1753,11 +1645,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDo:Lcom/google/android/gms/measurement/internal/do;
 
-    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/bo;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/be;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.sessions.check_on_startup"
+    const-string v2, "measurement.referrer.enable_logging_install_referrer_cmp_from_apk"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1767,9 +1659,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/br;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bh;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.firebase_global_collection_flag_enabled"
+    const-string v2, "measurement.client.sessions.session_id_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1777,11 +1669,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDq:Lcom/google/android/gms/measurement/internal/do;
 
-    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/bq;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.efficient_engagement_reporting_enabled"
+    const-string v2, "measurement.service.sessions.session_number_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1789,11 +1681,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDr:Lcom/google/android/gms/measurement/internal/do;
 
-    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/bt;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
+    const-string v2, "measurement.client.sessions.immediate_start_enabled_foreground"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1803,9 +1695,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bs;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bi;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.personalized_ads_signals_collection_enabled"
+    const-string v2, "measurement.client.sessions.background_sessions_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1815,9 +1707,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bv;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.personalized_ads_property_translation_enabled"
+    const-string v2, "measurement.client.sessions.remove_expired_session_properties_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1827,9 +1719,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bu;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bn;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.collection.init_params_control_enabled"
+    const-string v2, "measurement.service.sessions.session_number_backfill_enabled"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1839,9 +1731,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bw;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bm;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.upload.disable_is_uploader"
+    const-string v2, "measurement.service.sessions.remove_disabled_session_number"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1851,9 +1743,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/bz;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bp;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.experiment.enable_experiment_reporting"
+    const-string v2, "measurement.client.sessions.start_session_before_view_screen"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -1863,7 +1755,115 @@
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/by;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bo;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.client.sessions.check_on_startup"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDy:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/br;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.collection.firebase_global_collection_flag_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDz:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.collection.efficient_engagement_reporting_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDA:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bt;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.collection.redundant_engagement_removal_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bs;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.personalized_ads_signals_collection_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bv;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.personalized_ads_property_translation_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDD:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bu;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.collection.init_params_control_enabled"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.upload.disable_is_uploader"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/bz;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.experiment.enable_experiment_reporting"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/by;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.collection.log_event_and_bundle_v2"
 
@@ -1871,7 +1871,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDy:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDH:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -1883,121 +1883,13 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDz:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cc;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.module.collection.conditionally_omit_admob_app_id"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDA:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ca;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.sdk.dynamite.use_dynamite2"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDB:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ce;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.sdk.dynamite.allow_remote_dynamite"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDC:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cd;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.sdk.collection.validate_param_names_alphabetical"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDD:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cg;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.collection.event_safelist"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDE:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cf;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.service.audience.scoped_filters_v27"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDF:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ci;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.service.audience.session_scoped_event_aggregates"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDG:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/ck;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.service.audience.session_scoped_user_engagement"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDH:Lcom/google/android/gms/measurement/internal/do;
-
-    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
-
-    const-string v2, "measurement.service.audience.scoped_engagement_removal_when_session_expired"
-
-    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
-
-    move-result-object v0
-
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDI:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cm;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cc;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.client.audience.scoped_engagement_removal_when_session_expired"
+    const-string v2, "measurement.module.collection.conditionally_omit_admob_app_id"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2007,9 +1899,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cl;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ca;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.remove_disabled_session_scoped_user_engagement"
+    const-string v2, "measurement.sdk.dynamite.use_dynamite2"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2019,9 +1911,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/co;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ce;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.use_bundle_timestamp_for_property_filters"
+    const-string v2, "measurement.sdk.dynamite.allow_remote_dynamite"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2031,9 +1923,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cn;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.not_prepend_timestamps_for_sequence_session_scoped_filters"
+    const-string v2, "measurement.sdk.collection.validate_param_names_alphabetical"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2041,11 +1933,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDM:Lcom/google/android/gms/measurement/internal/do;
 
-    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/cq;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.service.audience.invalidate_config_cache_after_app_unisntall"
+    const-string v2, "measurement.collection.event_safelist"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2053,11 +1945,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDN:Lcom/google/android/gms/measurement/internal/do;
 
-    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/cp;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cf;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.retrieve_deeplink_from_bow_2"
+    const-string v2, "measurement.service.audience.scoped_filters_v27"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2067,9 +1959,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cs;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ci;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.app_launch.event_ordering_fix"
+    const-string v2, "measurement.service.audience.session_scoped_event_aggregates"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2079,9 +1971,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cr;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ck;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.last_deep_link_referrer"
+    const-string v2, "measurement.service.audience.session_scoped_user_engagement"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2089,11 +1981,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDQ:Lcom/google/android/gms/measurement/internal/do;
 
-    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/ct;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.last_deep_link_referrer_campaign"
+    const-string v2, "measurement.service.audience.scoped_engagement_removal_when_session_expired"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2101,11 +1993,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDR:Lcom/google/android/gms/measurement/internal/do;
 
-    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/cw;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cm;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.last_gclid_from_referrer"
+    const-string v2, "measurement.client.audience.scoped_engagement_removal_when_session_expired"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2113,11 +2005,11 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDS:Lcom/google/android/gms/measurement/internal/do;
 
-    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/cv;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.sdk.collection.worker_thread_referrer"
+    const-string v2, "measurement.service.audience.remove_disabled_session_scoped_user_engagement"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2127,9 +2019,9 @@
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cy;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/co;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
-    const-string v2, "measurement.upload.file_lock_state_check"
+    const-string v2, "measurement.service.audience.use_bundle_timestamp_for_property_filters"
 
     invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
 
@@ -2137,9 +2029,117 @@
 
     sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDU:Lcom/google/android/gms/measurement/internal/do;
 
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cn;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.service.audience.not_prepend_timestamps_for_sequence_session_scoped_filters"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDV:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cq;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.service.audience.invalidate_config_cache_after_app_unisntall"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cx;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cp;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.sdk.collection.retrieve_deeplink_from_bow_2"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDX:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cs;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.app_launch.event_ordering_fix"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDY:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cr;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.sdk.collection.last_deep_link_referrer"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/ct;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.sdk.collection.last_deep_link_referrer_campaign"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cw;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.sdk.collection.last_gclid_from_referrer"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cv;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.sdk.collection.worker_thread_referrer"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEc:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cy;->aEq:Lcom/google/android/gms/measurement/internal/dm;
+
+    const-string v2, "measurement.upload.file_lock_state_check"
+
+    invoke-static {v2, v0, v0, v1}, Lcom/google/android/gms/measurement/internal/o;->a(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;)Lcom/google/android/gms/measurement/internal/do;
+
+    move-result-object v0
+
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEd:Lcom/google/android/gms/measurement/internal/do;
+
+    sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cx;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.sampling.calculate_bundle_timestamp_before_sampling"
 
@@ -2147,7 +2147,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDV:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
@@ -2159,7 +2159,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lcom/google/android/gms/measurement/internal/da;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v2, Lcom/google/android/gms/measurement/internal/da;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v3, "measurement.ga.ga_app_id"
 
@@ -2167,11 +2167,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDW:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/cz;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/cz;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.lifecycle.app_backgrounded_tracking"
 
@@ -2179,11 +2179,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDX:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dd;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dd;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.lifecycle.app_in_background_parameter"
 
@@ -2191,11 +2191,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDY:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEh:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/db;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/db;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.integration.disable_firebase_instance_id"
 
@@ -2203,11 +2203,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aDZ:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEi:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/df;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/df;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.lifecycle.app_backgrounded_engagement"
 
@@ -2215,11 +2215,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEa:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEj:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dh;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dh;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.service.fix_gmp_version"
 
@@ -2227,11 +2227,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEb:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEk:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dg;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dg;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.collection.service.update_with_analytics_fix"
 
@@ -2239,11 +2239,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEc:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEl:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dj;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dj;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.service.disable_install_state_reporting"
 
@@ -2251,11 +2251,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEd:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEm:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/di;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/di;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.service.use_appinfo_modified"
 
@@ -2263,11 +2263,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEe:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEn:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dl;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dl;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.upload.dsid_reflection_failure_logging"
 
@@ -2275,11 +2275,11 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEf:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEo:Lcom/google/android/gms/measurement/internal/do;
 
     sget-object v0, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/dk;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/dk;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     const-string v2, "measurement.client.firebase_feature_rollout.v1.enable"
 
@@ -2287,7 +2287,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEg:Lcom/google/android/gms/measurement/internal/do;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aEp:Lcom/google/android/gms/measurement/internal/do;
 
     return-void
 .end method
@@ -2324,7 +2324,7 @@
 
     invoke-direct/range {v0 .. v5}, Lcom/google/android/gms/measurement/internal/do;-><init>(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Lcom/google/android/gms/measurement/internal/dm;B)V
 
-    sget-object p0, Lcom/google/android/gms/measurement/internal/o;->aCk:Ljava/util/List;
+    sget-object p0, Lcom/google/android/gms/measurement/internal/o;->aCt:Ljava/util/List;
 
     invoke-interface {p0, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -2334,7 +2334,7 @@
 .method static a(Lcom/google/android/gms/measurement/internal/ey;)V
     .locals 0
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/o;->aCm:Lcom/google/android/gms/measurement/internal/ey;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
@@ -2342,7 +2342,7 @@
 .method static a(Lcom/google/android/gms/measurement/internal/jz;)V
     .locals 0
 
-    sput-object p0, Lcom/google/android/gms/measurement/internal/o;->aCj:Lcom/google/android/gms/measurement/internal/jz;
+    sput-object p0, Lcom/google/android/gms/measurement/internal/o;->aCs:Lcom/google/android/gms/measurement/internal/jz;
 
     return-void
 .end method
@@ -2384,7 +2384,7 @@
     return-object p0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/aq;->rv()Ljava/util/Map;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/measurement/aq;->ry()Ljava/util/Map;
 
     move-result-object p0
 
@@ -2394,24 +2394,24 @@
 .method static e(Ljava/lang/Exception;)V
     .locals 3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCm:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/ey;
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCm:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vq()Landroid/content/Context;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vt()Landroid/content/Context;
 
     move-result-object v0
 
-    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCn:Ljava/lang/Boolean;
+    sget-object v1, Lcom/google/android/gms/measurement/internal/o;->aCw:Ljava/lang/Boolean;
 
     if-nez v1, :cond_2
 
-    invoke-static {}, Lcom/google/android/gms/common/c;->lR()Lcom/google/android/gms/common/c;
+    invoke-static {}, Lcom/google/android/gms/common/c;->lU()Lcom/google/android/gms/common/c;
 
     move-result-object v1
 
@@ -2435,10 +2435,10 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCn:Ljava/lang/Boolean;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/o;->aCw:Ljava/lang/Boolean;
 
     :cond_2
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCn:Ljava/lang/Boolean;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCw:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -2446,13 +2446,13 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCm:Lcom/google/android/gms/measurement/internal/ey;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCv:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string v1, "Got Exception on PhenotypeFlag.get on Play device"
 
@@ -2462,7 +2462,7 @@
     return-void
 .end method
 
-.method static final synthetic nH()Ljava/lang/Boolean;
+.method static final synthetic nK()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ih;->zzb()Z
@@ -2476,38 +2476,10 @@
     return-object v0
 .end method
 
-.method static final synthetic uH()Ljava/lang/Boolean;
+.method static final synthetic uK()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->nL()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 vA()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ii;->zzb()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 vB()Ljava/lang/Boolean;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->nO()Z
 
     move-result v0
 
@@ -2521,7 +2493,7 @@
 .method static final synthetic vC()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ic;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->nO()Z
 
     move-result v0
 
@@ -2535,7 +2507,7 @@
 .method static final synthetic vD()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lq;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ii;->zzb()Z
 
     move-result v0
 
@@ -2549,7 +2521,7 @@
 .method static final synthetic vE()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jb;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jg;->nO()Z
 
     move-result v0
 
@@ -2563,7 +2535,7 @@
 .method static final synthetic vF()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ic;->nO()Z
 
     move-result v0
 
@@ -2577,7 +2549,7 @@
 .method static final synthetic vG()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lk;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lq;->zzb()Z
 
     move-result v0
 
@@ -2591,7 +2563,7 @@
 .method static final synthetic vH()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jb;->nO()Z
 
     move-result v0
 
@@ -2605,7 +2577,7 @@
 .method static final synthetic vI()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->zzb()Z
 
     move-result v0
 
@@ -2619,7 +2591,7 @@
 .method static final synthetic vJ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hw;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lk;->nO()Z
 
     move-result v0
 
@@ -2633,7 +2605,7 @@
 .method static final synthetic vK()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lr;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ka;->qg()Z
 
     move-result v0
 
@@ -2647,7 +2619,7 @@
 .method static final synthetic vL()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qB()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/js;->nO()Z
 
     move-result v0
 
@@ -2661,7 +2633,7 @@
 .method static final synthetic vM()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->pO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hw;->zzb()Z
 
     move-result v0
 
@@ -2675,7 +2647,7 @@
 .method static final synthetic vN()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lr;->zzb()Z
 
     move-result v0
 
@@ -2689,7 +2661,7 @@
 .method static final synthetic vO()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qE()Z
 
     move-result v0
 
@@ -2703,7 +2675,7 @@
 .method static final synthetic vP()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hv;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->pR()Z
 
     move-result v0
 
@@ -2717,7 +2689,7 @@
 .method static final synthetic vQ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ll;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->qg()Z
 
     move-result v0
 
@@ -2731,7 +2703,7 @@
 .method static final synthetic vR()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ja;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jz;->nO()Z
 
     move-result v0
 
@@ -2745,7 +2717,7 @@
 .method static final synthetic vS()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rQ()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hv;->zzb()Z
 
     move-result v0
 
@@ -2759,7 +2731,7 @@
 .method static final synthetic vT()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->ro()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ll;->zzb()Z
 
     move-result v0
 
@@ -2773,7 +2745,7 @@
 .method static final synthetic vU()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uG()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ja;->zzb()Z
 
     move-result v0
 
@@ -2787,7 +2759,7 @@
 .method static final synthetic vV()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->pO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rT()Z
 
     move-result v0
 
@@ -2801,7 +2773,7 @@
 .method static final synthetic vW()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qB()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->rr()Z
 
     move-result v0
 
@@ -2815,7 +2787,7 @@
 .method static final synthetic vX()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uJ()Z
 
     move-result v0
 
@@ -2829,7 +2801,7 @@
 .method static final synthetic vY()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uF()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->pR()Z
 
     move-result v0
 
@@ -2843,7 +2815,7 @@
 .method static final synthetic vZ()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qE()Z
 
     move-result v0
 
@@ -2854,10 +2826,10 @@
     return-object v0
 .end method
 
-.method static final synthetic vz()Ljava/lang/Boolean;
+.method static final synthetic wA()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/iv;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->zzb()Z
 
     move-result v0
 
@@ -2868,10 +2840,38 @@
     return-object v0
 .end method
 
-.method static final synthetic wA()Ljava/lang/Integer;
+.method static final synthetic wB()Ljava/lang/Boolean;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ks;->zzb()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/kg;->zzb()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/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uf()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ui()J
 
     move-result-wide v0
 
@@ -2884,10 +2884,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wB()Ljava/lang/Double;
+.method static final synthetic wE()Ljava/lang/Double;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uE()D
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uH()D
 
     move-result-wide v0
 
@@ -2898,10 +2898,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wC()Ljava/lang/Integer;
+.method static final synthetic wF()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->rP()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->rS()J
 
     move-result-wide v0
 
@@ -2914,10 +2914,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wD()Ljava/lang/Long;
+.method static final synthetic wG()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->qx()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->qA()J
 
     move-result-wide v0
 
@@ -2928,17 +2928,17 @@
     return-object v0
 .end method
 
-.method static final synthetic wE()Ljava/lang/String;
+.method static final synthetic wH()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uA()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->uD()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic wF()Ljava/lang/Boolean;
+.method static final synthetic wI()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/kl;->zzb()Z
@@ -2952,56 +2952,10 @@
     return-object v0
 .end method
 
-.method static final synthetic wG()Ljava/lang/Long;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->rY()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 wH()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->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 wI()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ue()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 wJ()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ut()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sb()J
 
     move-result-wide v0
 
@@ -3015,7 +2969,7 @@
 .method static final synthetic wK()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uw()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uj()J
 
     move-result-wide v0
 
@@ -3028,14 +2982,16 @@
     return-object v0
 .end method
 
-.method static final synthetic wL()Ljava/lang/Long;
+.method static final synthetic wL()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uB()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uh()J
 
     move-result-wide v0
 
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
@@ -3045,7 +3001,7 @@
 .method static final synthetic wM()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->um()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uw()J
 
     move-result-wide v0
 
@@ -3056,14 +3012,16 @@
     return-object v0
 .end method
 
-.method static final synthetic wN()Ljava/lang/Long;
+.method static final synthetic wN()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->rW()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uz()J
 
     move-result-wide v0
 
-    invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+    long-to-int v1, v0
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v0
 
@@ -3073,7 +3031,7 @@
 .method static final synthetic wO()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sq()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uE()J
 
     move-result-wide v0
 
@@ -3087,7 +3045,7 @@
 .method static final synthetic wP()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uh()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->up()J
 
     move-result-wide v0
 
@@ -3101,7 +3059,7 @@
 .method static final synthetic wQ()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ui()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->rZ()J
 
     move-result-wide v0
 
@@ -3115,7 +3073,7 @@
 .method static final synthetic wR()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->qS()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->st()J
 
     move-result-wide v0
 
@@ -3143,7 +3101,7 @@
 .method static final synthetic wT()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sd()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ul()J
 
     move-result-wide v0
 
@@ -3157,7 +3115,7 @@
 .method static final synthetic wU()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uD()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->qV()J
 
     move-result-wide v0
 
@@ -3171,7 +3129,7 @@
 .method static final synthetic wV()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->nk()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->un()J
 
     move-result-wide v0
 
@@ -3182,58 +3140,52 @@
     return-object v0
 .end method
 
-.method static final synthetic wW()Ljava/lang/String;
+.method static final synthetic wW()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sg()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 wX()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uG()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/ib;->nn()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/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uC()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic wX()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sk()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 wY()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uu()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 wZ()Ljava/lang/Integer;
-    .locals 2
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uo()J
-
-    move-result-wide v0
-
-    long-to-int v1, v0
-
-    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uF()Ljava/lang/String;
 
     move-result-object v0
 
@@ -3243,7 +3195,7 @@
 .method static final synthetic wa()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/iu;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->qg()Z
 
     move-result v0
 
@@ -3257,7 +3209,7 @@
 .method static final synthetic wb()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hj;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->uI()Z
 
     move-result v0
 
@@ -3271,7 +3223,7 @@
 .method static final synthetic wc()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kz;->nO()Z
 
     move-result v0
 
@@ -3285,7 +3237,7 @@
 .method static final synthetic wd()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/iu;->zzb()Z
 
     move-result v0
 
@@ -3299,7 +3251,7 @@
 .method static final synthetic we()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/hp;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hj;->zzb()Z
 
     move-result v0
 
@@ -3313,7 +3265,7 @@
 .method static final synthetic wf()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/km;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->zzb()Z
 
     move-result v0
 
@@ -3327,7 +3279,7 @@
 .method static final synthetic wg()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->qg()Z
 
     move-result v0
 
@@ -3341,7 +3293,7 @@
 .method static final synthetic wh()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/hp;->zzb()Z
 
     move-result v0
 
@@ -3355,7 +3307,7 @@
 .method static final synthetic wi()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/km;->zzb()Z
 
     move-result v0
 
@@ -3369,7 +3321,7 @@
 .method static final synthetic wj()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kr;->zzb()Z
 
     move-result v0
 
@@ -3383,7 +3335,7 @@
 .method static final synthetic wk()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/io;->nO()Z
 
     move-result v0
 
@@ -3397,7 +3349,7 @@
 .method static final synthetic wl()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->nO()Z
 
     move-result v0
 
@@ -3411,7 +3363,7 @@
 .method static final synthetic wm()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/kf;->zzb()Z
 
     move-result v0
 
@@ -3425,7 +3377,7 @@
 .method static final synthetic wn()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->nO()Z
 
     move-result v0
 
@@ -3439,7 +3391,7 @@
 .method static final synthetic wo()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jm;->zzb()Z
 
     move-result v0
 
@@ -3453,7 +3405,7 @@
 .method static final synthetic wp()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jn;->zzb()Z
 
     move-result v0
 
@@ -3467,7 +3419,7 @@
 .method static final synthetic wq()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->nO()Z
 
     move-result v0
 
@@ -3481,7 +3433,7 @@
 .method static final synthetic wr()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->qd()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jh;->qg()Z
 
     move-result v0
 
@@ -3495,7 +3447,7 @@
 .method static final synthetic ws()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->zzb()Z
 
     move-result v0
 
@@ -3509,7 +3461,7 @@
 .method static final synthetic wt()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->qg()Z
 
     move-result v0
 
@@ -3523,7 +3475,7 @@
 .method static final synthetic wu()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->nL()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->qg()Z
 
     move-result v0
 
@@ -3537,7 +3489,7 @@
 .method static final synthetic wv()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->pO()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->zzb()Z
 
     move-result v0
 
@@ -3551,7 +3503,7 @@
 .method static final synthetic ww()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/jt;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->nO()Z
 
     move-result v0
 
@@ -3565,7 +3517,7 @@
 .method static final synthetic wx()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ky;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/le;->nO()Z
 
     move-result v0
 
@@ -3579,7 +3531,7 @@
 .method static final synthetic wy()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ks;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/lf;->pR()Z
 
     move-result v0
 
@@ -3593,7 +3545,7 @@
 .method static final synthetic wz()Ljava/lang/Boolean;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/kg;->zzb()Z
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/jt;->zzb()Z
 
     move-result v0
 
@@ -3607,7 +3559,7 @@
 .method static final synthetic xa()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->us()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sn()J
 
     move-result-wide v0
 
@@ -3623,7 +3575,7 @@
 .method static final synthetic xb()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->up()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ux()J
 
     move-result-wide v0
 
@@ -3655,7 +3607,7 @@
 .method static final synthetic xd()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uq()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uv()J
 
     move-result-wide v0
 
@@ -3671,7 +3623,7 @@
 .method static final synthetic xe()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->un()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->us()J
 
     move-result-wide v0
 
@@ -3687,7 +3639,7 @@
 .method static final synthetic xf()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uv()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uu()J
 
     move-result-wide v0
 
@@ -3703,7 +3655,7 @@
 .method static final synthetic xg()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->sf()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ut()J
 
     move-result-wide v0
 
@@ -3716,30 +3668,78 @@
     return-object v0
 .end method
 
-.method static final synthetic xh()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ud()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xi()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uA()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method static final synthetic xj()Ljava/lang/Long;
+.method static final synthetic xh()Ljava/lang/Integer;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uz()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uq()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 xi()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uy()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 xj()Ljava/lang/Integer;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->si()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 xk()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ug()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xl()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uD()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method static final synthetic xm()Ljava/lang/Long;
+    .locals 2
+
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uC()J
 
     move-result-wide v0
 
@@ -3750,10 +3750,10 @@
     return-object v0
 .end method
 
-.method static final synthetic xk()Ljava/lang/Long;
+.method static final synthetic xn()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uj()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->um()J
 
     move-result-wide v0
 
@@ -3764,10 +3764,10 @@
     return-object v0
 .end method
 
-.method static final synthetic xl()Ljava/lang/Long;
+.method static final synthetic xo()Ljava/lang/Long;
     .locals 2
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ub()J
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->ue()J
 
     move-result-wide v0
 
@@ -3778,17 +3778,17 @@
     return-object v0
 .end method
 
-.method static final synthetic xm()Ljava/lang/String;
+.method static final synthetic xp()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uc()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/internal/measurement/ib;->uf()Ljava/lang/String;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method static final synthetic xn()Ljava/lang/Boolean;
+.method static final synthetic xq()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/in;->zzb()Z
@@ -3802,7 +3802,7 @@
     return-object v0
 .end method
 
-.method static final synthetic xo()Ljava/lang/Boolean;
+.method static final synthetic xr()Ljava/lang/Boolean;
     .locals 1
 
     invoke-static {}, Lcom/google/android/gms/internal/measurement/ho;->zzb()Z
@@ -3816,10 +3816,10 @@
     return-object v0
 .end method
 
-.method static synthetic xp()Ljava/util/List;
+.method static synthetic xs()Ljava/util/List;
     .locals 1
 
-    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCk:Ljava/util/List;
+    sget-object v0, Lcom/google/android/gms/measurement/internal/o;->aCt:Ljava/util/List;
 
     return-object v0
 .end method
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 59924c95f2..7ca119c549 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/q;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/q;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/q;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xn()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xq()Ljava/lang/Boolean;
 
     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 e90d02cb9a..2ebb0ae382 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/r;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/r;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/r;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xo()Ljava/lang/Boolean;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xr()Ljava/lang/Boolean;
 
     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 a460f3c28c..5bc4b73db7 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/s;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/s;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/s;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xd()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xg()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 5fb3a577ee..2d41fa4ef8 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/t;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/t;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/t;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xe()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xh()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 2588cf0807..a87fc8508e 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/u;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/u;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/u;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xb()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xe()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 e0474ecee6..d2bc3756be 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/v;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/v;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/v;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xc()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xf()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 9c212f7bc9..78395540ac 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/w;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/w;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/w;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wZ()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xc()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 a8bbbacaf5..947dd276dd 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/x;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/x;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/x;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xa()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xd()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 e788cc834f..eb3d6e49bb 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aEh:Lcom/google/android/gms/measurement/internal/dm;
+.field static final aEq:Lcom/google/android/gms/measurement/internal/dm;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/measurement/internal/y;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/measurement/internal/y;->aEh:Lcom/google/android/gms/measurement/internal/dm;
+    sput-object v0, Lcom/google/android/gms/measurement/internal/y;->aEq:Lcom/google/android/gms/measurement/internal/dm;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->wX()Ljava/lang/Integer;
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/o;->xa()Ljava/lang/Integer;
 
     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 c15c8f7a9e..fa92cfa787 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
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aBG:Ljava/util/Map;
+.field final aBP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,9 +15,9 @@
     .end annotation
 .end field
 
-.field aBL:J
+.field aBU:J
 
-.field final atp:Ljava/util/Map;
+.field final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -39,13 +39,13 @@
 
     invoke-direct {p1}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->aBG:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->aBP: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/z;->atp:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     return-void
 .end method
@@ -55,15 +55,15 @@
 .method public final T(J)V
     .locals 5
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yx()Lcom/google/android/gms/measurement/internal/hi;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/hh;->yA()Lcom/google/android/gms/measurement/internal/hi;
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -86,7 +86,7 @@
 
     check-cast v2, Ljava/lang/String;
 
-    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-interface {v3, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -105,7 +105,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
@@ -113,7 +113,7 @@
 
     if-nez v1, :cond_1
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/z;->aBL:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/z;->aBU:J
 
     sub-long v1, p1, v1
 
@@ -128,7 +128,7 @@
 .method final U(J)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -151,7 +151,7 @@
 
     check-cast v1, Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -162,7 +162,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->atp:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/z;->aty:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z
 
@@ -170,7 +170,7 @@
 
     if-nez v0, :cond_1
 
-    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/z;->aBL:J
+    iput-wide p1, p0, Lcom/google/android/gms/measurement/internal/z;->aBU:J
 
     :cond_1
     return-void
@@ -181,11 +181,11 @@
 
     if-nez p3, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Not logging ad exposure. No active activity"
 
@@ -200,11 +200,11 @@
 
     if-gez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p3
 
-    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p3, p3, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -229,7 +229,7 @@
 
     invoke-static {p3, v0, p1}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hi;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p1
 
@@ -247,11 +247,11 @@
 
     if-nez p4, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Not logging ad unit exposure. No active activity"
 
@@ -266,11 +266,11 @@
 
     if-gez v2, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEz:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEI:Lcom/google/android/gms/measurement/internal/dx;
 
     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -299,7 +299,7 @@
 
     invoke-static {p4, v0, p1}, Lcom/google/android/gms/measurement/internal/hh;->a(Lcom/google/android/gms/measurement/internal/hi;Landroid/os/Bundle;Z)V
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object p1
 
@@ -326,7 +326,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -340,11 +340,11 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Ad unit id must be a non-empty string"
 
@@ -367,7 +367,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
@@ -381,11 +381,11 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/fu;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEr:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEA:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "Ad unit id must be a non-empty string"
 
@@ -394,186 +394,186 @@
     return-void
 .end method
 
-.method public final bridge synthetic rx()V
+.method public final bridge synthetic rA()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->rx()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->rA()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vn()V
+.method public final bridge synthetic vA()Lcom/google/android/gms/measurement/internal/jz;
+    .locals 1
+
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vA()Lcom/google/android/gms/measurement/internal/jz;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final bridge synthetic vq()V
     .locals 0
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vn()V
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vq()V
 
     return-void
 .end method
 
-.method public final bridge synthetic vo()Lcom/google/android/gms/measurement/internal/i;
+.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/i;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vo()Lcom/google/android/gms/measurement/internal/i;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vr()Lcom/google/android/gms/measurement/internal/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vp()Lcom/google/android/gms/common/util/e;
+.method public final bridge synthetic vs()Lcom/google/android/gms/common/util/e;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vp()Lcom/google/android/gms/common/util/e;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vs()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vq()Landroid/content/Context;
+.method public final bridge synthetic vt()Landroid/content/Context;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vq()Landroid/content/Context;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vt()Landroid/content/Context;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vr()Lcom/google/android/gms/measurement/internal/dt;
+.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dt;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vr()Lcom/google/android/gms/measurement/internal/dt;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vu()Lcom/google/android/gms/measurement/internal/dt;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vs()Lcom/google/android/gms/measurement/internal/jm;
+.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/jm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vs()Lcom/google/android/gms/measurement/internal/jm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vv()Lcom/google/android/gms/measurement/internal/jm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vt()Lcom/google/android/gms/measurement/internal/ev;
+.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ev;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vt()Lcom/google/android/gms/measurement/internal/ev;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vw()Lcom/google/android/gms/measurement/internal/ev;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vu()Lcom/google/android/gms/measurement/internal/dv;
+.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/dv;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vv()Lcom/google/android/gms/measurement/internal/eh;
+.method public final bridge synthetic vy()Lcom/google/android/gms/measurement/internal/eh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vv()Lcom/google/android/gms/measurement/internal/eh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vy()Lcom/google/android/gms/measurement/internal/eh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vw()Lcom/google/android/gms/measurement/internal/ka;
+.method public final bridge synthetic vz()Lcom/google/android/gms/measurement/internal/ka;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vw()Lcom/google/android/gms/measurement/internal/ka;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vz()Lcom/google/android/gms/measurement/internal/ka;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic vx()Lcom/google/android/gms/measurement/internal/jz;
+.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/z;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->vx()Lcom/google/android/gms/measurement/internal/jz;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/z;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xq()Lcom/google/android/gms/measurement/internal/z;
+.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/gf;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xq()Lcom/google/android/gms/measurement/internal/z;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xr()Lcom/google/android/gms/measurement/internal/gf;
+.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/ds;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xr()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/ds;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xs()Lcom/google/android/gms/measurement/internal/ds;
+.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/hm;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xs()Lcom/google/android/gms/measurement/internal/ds;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/hm;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xt()Lcom/google/android/gms/measurement/internal/hm;
+.method public final bridge synthetic xx()Lcom/google/android/gms/measurement/internal/hh;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xt()Lcom/google/android/gms/measurement/internal/hm;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xx()Lcom/google/android/gms/measurement/internal/hh;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xu()Lcom/google/android/gms/measurement/internal/hh;
+.method public final bridge synthetic xy()Lcom/google/android/gms/measurement/internal/dr;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xu()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xy()Lcom/google/android/gms/measurement/internal/dr;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final bridge synthetic xv()Lcom/google/android/gms/measurement/internal/dr;
+.method public final bridge synthetic xz()Lcom/google/android/gms/measurement/internal/in;
     .locals 1
 
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xv()Lcom/google/android/gms/measurement/internal/dr;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final bridge synthetic xw()Lcom/google/android/gms/measurement/internal/in;
-    .locals 1
-
-    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xw()Lcom/google/android/gms/measurement/internal/in;
+    invoke-super {p0}, Lcom/google/android/gms/measurement/internal/ec;->xz()Lcom/google/android/gms/measurement/internal/in;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzam.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzam.smali
index c9bf82dc9a..dd69c503c9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzam.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzam.smali
@@ -30,7 +30,7 @@
 
 
 # instance fields
-.field final aCi:Landroid/os/Bundle;
+.field final aCr:Landroid/os/Bundle;
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method static synthetic a(Lcom/google/android/gms/measurement/internal/zzam;)Landroid/os/Bundle;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object p0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     return-object p0
 .end method
@@ -69,7 +69,7 @@
 .method final bX(Ljava/lang/String;)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->get(Ljava/lang/String;)Ljava/lang/Object;
 
@@ -81,7 +81,7 @@
 .method final cl(Ljava/lang/String;)Ljava/lang/Long;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
@@ -97,7 +97,7 @@
 .method final cm(Ljava/lang/String;)Ljava/lang/Double;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->getDouble(Ljava/lang/String;)D
 
@@ -113,7 +113,7 @@
 .method final cn(Ljava/lang/String;)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
 
@@ -143,7 +143,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v0}, Landroid/os/Bundle;->toString()Ljava/lang/String;
 
@@ -152,12 +152,12 @@
     return-object v0
 .end method
 
-.method public final vy()Landroid/os/Bundle;
+.method public final vB()Landroid/os/Bundle;
     .locals 2
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCi:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzam;->aCr:Landroid/os/Bundle;
 
     invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
@@ -173,7 +173,7 @@
 
     move-result p2
 
-    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzam;->vy()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/android/gms/measurement/internal/zzam;->vB()Landroid/os/Bundle;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzan.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzan.smali
index bf02b6b497..e72a1433f9 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzan.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzan.smali
@@ -16,11 +16,11 @@
 
 
 # instance fields
-.field public final aCh:Lcom/google/android/gms/measurement/internal/zzam;
+.field public final aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-.field public final anh:Ljava/lang/String;
+.field public final anq:Ljava/lang/String;
 
-.field public final atJ:Ljava/lang/String;
+.field public final atS:Ljava/lang/String;
 
 .field public final zzd:J
 
@@ -45,17 +45,17 @@
 
     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/zzan;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -67,11 +67,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/zzan;->zzd:J
 
@@ -83,11 +83,11 @@
 .method public final toString()Ljava/lang/String;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atS:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v2, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     invoke-static {v2}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -161,19 +161,19 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->atS: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/measurement/internal/zzan;->aCh:Lcom/google/android/gms/measurement/internal/zzam;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzan;->aCq:Lcom/google/android/gms/measurement/internal/zzam;
 
     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/zzan;->anh:Ljava/lang/String;
+    iget-object p2, p0, Lcom/google/android/gms/measurement/internal/zzan;->anq:Ljava/lang/String;
 
     const/4 v1, 0x4
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzkj.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzkj.smali
index dbbde82992..b517441899 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzkj.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzkj.smali
@@ -16,15 +16,15 @@
 
 
 # instance fields
-.field private final aIs:Ljava/lang/Float;
+.field private final aIB:Ljava/lang/Float;
 
-.field public final aIt:Ljava/lang/Double;
+.field public final aIC:Ljava/lang/Double;
 
-.field public final anq:J
+.field public final anz:J
 
-.field public final asA:Ljava/lang/Long;
+.field public final asJ:Ljava/lang/Long;
 
-.field public final atJ:Ljava/lang/String;
+.field public final atS:Ljava/lang/String;
 
 .field public final zzd:Ljava/lang/String;
 
@@ -53,15 +53,15 @@
 
     iput p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzg:I
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iput-wide p3, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
-    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIs:Ljava/lang/Float;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
 
     const/4 p3, 0x1
 
@@ -78,12 +78,12 @@
     move-result-object p2
 
     :cond_0
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     goto :goto_0
 
     :cond_1
-    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p9, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     :goto_0
     iput-object p7, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzd:Ljava/lang/String;
@@ -96,13 +96,13 @@
 .method constructor <init>(Lcom/google/android/gms/measurement/internal/jn;)V
     .locals 6
 
-    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anh:Ljava/lang/String;
+    iget-object v1, p1, Lcom/google/android/gms/measurement/internal/jn;->anq:Ljava/lang/String;
 
     iget-wide v2, p1, Lcom/google/android/gms/measurement/internal/jn;->zzd:J
 
-    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/jn;->asr:Ljava/lang/Object;
+    iget-object v4, p1, Lcom/google/android/gms/measurement/internal/jn;->asA:Ljava/lang/Object;
 
-    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->amV:Ljava/lang/String;
+    iget-object v5, p1, Lcom/google/android/gms/measurement/internal/jn;->ane:Ljava/lang/String;
 
     move-object v0, p0
 
@@ -122,19 +122,19 @@
 
     iput v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzg:I
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIs:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzd:Ljava/lang/String;
 
@@ -154,9 +154,9 @@
 
     iput v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzg:I
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atS:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iput-wide p2, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz:J
 
     iput-object p5, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zze:Ljava/lang/String;
 
@@ -164,11 +164,11 @@
 
     if-nez p4, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIs:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzd:Ljava/lang/String;
 
@@ -181,11 +181,11 @@
 
     check-cast p4, Ljava/lang/Long;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIs:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzd:Ljava/lang/String;
 
@@ -196,11 +196,11 @@
 
     if-eqz p2, :cond_2
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIs:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     check-cast p4, Ljava/lang/String;
 
@@ -213,13 +213,13 @@
 
     if-eqz p2, :cond_3
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIs:Ljava/lang/Float;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIB:Ljava/lang/Float;
 
     check-cast p4, Ljava/lang/Double;
 
-    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iput-object p4, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzkj;->zzd:Ljava/lang/String;
 
@@ -237,17 +237,17 @@
 
 
 # virtual methods
-.method public final rz()Ljava/lang/Object;
+.method public final rC()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asA:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIt:Ljava/lang/Double;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     if-eqz v0, :cond_1
 
@@ -281,19 +281,19 @@
 
     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/measurement/internal/zzkj;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->atS: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-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anq:J
+    iget-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->anz: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/zzkj;->asA:Ljava/lang/Long;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->asJ:Ljava/lang/Long;
 
     const/16 v1, 0x8
 
@@ -322,7 +322,7 @@
 
     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/zzkj;->aIt:Ljava/lang/Double;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzkj;->aIC:Ljava/lang/Double;
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzm.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzm.smali
index 2b6583e139..d0ce57d259 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzm.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzm.smali
@@ -16,13 +16,11 @@
 
 
 # instance fields
-.field public final aEm:Ljava/lang/String;
+.field public final aEv:Ljava/lang/String;
 
-.field public final aIA:Ljava/lang/String;
+.field public final aIH:Ljava/lang/Boolean;
 
-.field public final aIy:Ljava/lang/Boolean;
-
-.field public final aIz:Ljava/util/List;
+.field public final aII:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,23 +30,25 @@
     .end annotation
 .end field
 
-.field public final adI:Z
+.field public final aIJ:Ljava/lang/String;
 
-.field public final amV:Ljava/lang/String;
+.field public final adR:Z
 
-.field public final amo:Z
+.field public final amx:Z
 
-.field public final anh:Ljava/lang/String;
+.field public final ane:Ljava/lang/String;
 
-.field public final atJ:Ljava/lang/String;
+.field public final anq:Ljava/lang/String;
 
-.field public final awy:I
+.field public final atS:Ljava/lang/String;
 
-.field public final axl:J
+.field public final awH:I
 
-.field public final axr:J
+.field public final axA:J
 
-.field public final azG:Z
+.field public final axu:J
+
+.field public final azP:Z
 
 .field public final zzd:Ljava/lang/String;
 
@@ -116,7 +116,7 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -132,11 +132,11 @@
     move-object v1, p2
 
     :goto_0
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     move-wide v1, p4
 
@@ -168,7 +168,7 @@
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     move-wide/from16 v1, p15
 
@@ -176,23 +176,23 @@
 
     move-wide/from16 v1, p17
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axl:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axu:J
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awy:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awH:I
 
     move/from16 v1, p20
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amo:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
 
     move-object/from16 v1, p23
 
@@ -200,19 +200,19 @@
 
     move-object/from16 v1, p24
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     move-object/from16 v1, p27
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIz:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
 
     move-object/from16 v1, p28
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -248,15 +248,15 @@
 
     move-object v1, p1
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->atS:Ljava/lang/String;
 
     move-object v1, p2
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->ane:Ljava/lang/String;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anh:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     move-wide v1, p12
 
@@ -288,7 +288,7 @@
 
     move-object/from16 v1, p14
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aEm:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     move-wide/from16 v1, p15
 
@@ -296,23 +296,23 @@
 
     move-wide/from16 v1, p17
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axl:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axu:J
 
     move/from16 v1, p19
 
-    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awy:I
+    iput v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->awH:I
 
     move/from16 v1, p20
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azG:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->azP:Z
 
     move/from16 v1, p21
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adI:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->adR:Z
 
     move/from16 v1, p22
 
-    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amo:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
 
     move-object/from16 v1, p23
 
@@ -320,19 +320,19 @@
 
     move-object/from16 v1, p24
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIy:Ljava/lang/Boolean;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     move-wide/from16 v1, p25
 
-    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iput-wide v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->axA:J
 
     move-object/from16 v1, p27
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIz:Ljava/util/List;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
 
     move-object/from16 v1, p28
 
-    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iput-object v1, v0, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
     return-void
 .end method
@@ -348,19 +348,19 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->atS: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/measurement/internal/zzm;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->ane: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/zzm;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->anq:Ljava/lang/String;
 
     const/4 v1, 0x4
 
@@ -408,7 +408,7 @@
 
     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/zzm;->aEm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->aEv:Ljava/lang/String;
 
     const/16 v2, 0xc
 
@@ -420,31 +420,31 @@
 
     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/zzm;->axl:J
+    iget-wide v2, p0, Lcom/google/android/gms/measurement/internal/zzm;->axu: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/zzm;->awy:I
+    iget v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->awH: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/zzm;->azG:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->azP: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/zzm;->adI:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->adR: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/zzm;->amo:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->amx:Z
 
     const/16 v2, 0x12
 
@@ -456,7 +456,7 @@
 
     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/zzm;->aIy:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/android/gms/measurement/internal/zzm;->aIH:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
@@ -473,19 +473,19 @@
     :cond_0
     const/16 v0, 0x16
 
-    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->axr:J
+    iget-wide v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->axA: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/zzm;->aIz:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->aII:Ljava/util/List;
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/util/List;)V
 
     const/16 v0, 0x18
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->aIA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzm;->aIJ:Ljava/lang/String;
 
     invoke-static {p1, v0, v1}, Lcom/google/android/gms/common/internal/safeparcel/b;->a(Landroid/os/Parcel;ILjava/lang/String;)V
 
diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzv.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzv.smali
index 0417290022..0c9daaf6a6 100644
--- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzv.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/zzv.smali
@@ -16,17 +16,17 @@
 
 
 # instance fields
-.field public aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+.field public aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-.field public aIN:Lcom/google/android/gms/measurement/internal/zzan;
+.field public aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field public aIO:Lcom/google/android/gms/measurement/internal/zzan;
+.field public aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field public aIP:Lcom/google/android/gms/measurement/internal/zzan;
+.field public aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-.field public amV:Ljava/lang/String;
+.field public ane:Ljava/lang/String;
 
-.field public atJ:Ljava/lang/String;
+.field public atS:Ljava/lang/String;
 
 .field public zzd:J
 
@@ -59,17 +59,17 @@
 
     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/zzv;->atJ:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->zzd:J
 
@@ -83,25 +83,25 @@
 
     iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzf:Ljava/lang/String;
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->zzh:J
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzh:J
 
-    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     iget-wide v0, p1, Lcom/google/android/gms/measurement/internal/zzv;->zzj:J
 
     iput-wide v0, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzj:J
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     return-void
 .end method
@@ -111,11 +111,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/internal/zzv;->atS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/measurement/internal/zzv;->ane:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iput-object p3, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     iput-wide p4, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzd:J
 
@@ -123,15 +123,15 @@
 
     iput-object p7, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzf:Ljava/lang/String;
 
-    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p8, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     iput-wide p9, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzh:J
 
-    iput-object p11, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p11, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     iput-wide p12, p0, Lcom/google/android/gms/measurement/internal/zzv;->zzj:J
 
-    iput-object p14, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iput-object p14, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     return-void
 .end method
@@ -147,19 +147,19 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->atS: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/measurement/internal/zzv;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->ane: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/zzv;->aIM:Lcom/google/android/gms/measurement/internal/zzkj;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIV:Lcom/google/android/gms/measurement/internal/zzkj;
 
     const/4 v2, 0x4
 
@@ -183,7 +183,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/measurement/internal/zzv;->aIN:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIW:Lcom/google/android/gms/measurement/internal/zzan;
 
     const/16 v2, 0x8
 
@@ -195,7 +195,7 @@
 
     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/zzv;->aIO:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIX:Lcom/google/android/gms/measurement/internal/zzan;
 
     const/16 v2, 0xa
 
@@ -207,7 +207,7 @@
 
     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/zzv;->aIP:Lcom/google/android/gms/measurement/internal/zzan;
+    iget-object v1, p0, Lcom/google/android/gms/measurement/internal/zzv;->aIY:Lcom/google/android/gms/measurement/internal/zzan;
 
     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 9f05cae992..9775be7557 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
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static volatile aIS:Lcom/google/android/gms/measurement/module/Analytics;
+.field private static volatile aJb:Lcom/google/android/gms/measurement/module/Analytics;
 
 
 # instance fields
-.field private final aBB:Lcom/google/android/gms/measurement/internal/ey;
+.field private final aBK:Lcom/google/android/gms/measurement/internal/ey;
 
 
 # direct methods
@@ -19,7 +19,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;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/android/gms/measurement/module/Analytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     return-void
 .end method
@@ -27,7 +27,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;->aIS:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object v0, Lcom/google/android/gms/measurement/module/Analytics;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
 
     if-nez v0, :cond_1
 
@@ -36,7 +36,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aIS:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
 
     if-nez v1, :cond_0
 
@@ -50,7 +50,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/android/gms/measurement/module/Analytics;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    sput-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aIS:Lcom/google/android/gms/measurement/module/Analytics;
+    sput-object v1, Lcom/google/android/gms/measurement/module/Analytics;->aJb:Lcom/google/android/gms/measurement/module/Analytics;
 
     :cond_0
     monitor-exit v0
@@ -68,7 +68,7 @@
 
     :cond_1
     :goto_0
-    sget-object p0, Lcom/google/android/gms/measurement/module/Analytics;->aIS:Lcom/google/android/gms/measurement/module/Analytics;
+    sget-object p0, Lcom/google/android/gms/measurement/module/Analytics;->aJb: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 d730db5c43..d22c7f9630 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,7 @@
 
 
 # static fields
-.field public static final aIT:Lcom/google/android/gms/common/api/a;
+.field public static final aJc:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -16,12 +16,12 @@
     .end annotation
 .end field
 
-.field public static final aIU:Lcom/google/android/gms/nearby/connection/c;
+.field public static final aJd:Lcom/google/android/gms/nearby/connection/c;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field public static final aIV:Lcom/google/android/gms/common/api/a;
+.field public static final aJe:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -34,14 +34,14 @@
     .end annotation
 .end field
 
-.field public static final aIW:Lcom/google/android/gms/nearby/messages/a;
+.field public static final aJf:Lcom/google/android/gms/nearby/messages/a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private static final aIX:Lcom/google/android/gms/nearby/messages/h;
+.field private static final aJg:Lcom/google/android/gms/nearby/messages/h;
 
-.field private static final aIY:Lcom/google/android/gms/common/api/a;
+.field private static final aJh:Lcom/google/android/gms/common/api/a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field private static final aIZ:Lcom/google/android/gms/internal/nearby/ae;
+.field private static final aJi:Lcom/google/android/gms/internal/nearby/ae;
 
 
 # direct methods
@@ -60,61 +60,61 @@
 
     new-instance v0, Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/internal/nearby/t;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/t;->aAo:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/t;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/t;->aAn: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;->aIT:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJc: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;->aIU:Lcom/google/android/gms/nearby/connection/c;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJd: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ae;->aAo:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/ae;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/ae;->aAn: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;->aIV:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJe:Lcom/google/android/gms/common/api/a;
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aKL:Lcom/google/android/gms/nearby/messages/internal/ae;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aKU:Lcom/google/android/gms/nearby/messages/internal/ae;
 
-    sput-object v0, Lcom/google/android/gms/nearby/a;->aIW:Lcom/google/android/gms/nearby/messages/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJf: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;->aIX:Lcom/google/android/gms/nearby/messages/h;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJg: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/as;->aAo:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/internal/nearby/as;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/internal/nearby/as;->aAn: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;->aIY:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJh: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;->aIZ:Lcom/google/android/gms/internal/nearby/ae;
+    sput-object v0, Lcom/google/android/gms/nearby/a;->aJi: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 9fb652c05d..236fc0fbb5 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 aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+.field public final aJr: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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;->aJi:Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate$a;->aJr: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 49ce684dca..832b9f364d 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 aAc:J
+.field public aAl:J
 
-.field private aGf:J
+.field private aGo:J
 
-.field private aJh:J
+.field private aJq: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;->aAc:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl:J
 
     iput p3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->status:I
 
-    iput-wide p4, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGf:J
+    iput-wide p4, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo:J
 
-    iput-wide p6, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJh:J
+    iput-wide p6, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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;->aAc:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aAc:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aGf:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo: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;->aGf:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo: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;->aJh:J
+    iput-wide p1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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;->aJh:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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;->aAc:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aAc:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aGf:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo: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;->aGf:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo: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;->aJh:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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;->aJh:J
+    iget-wide v3, p1, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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;->aAc:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aGf:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo: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;->aJh:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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;->aAc:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aAl: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;->aGf:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aGo: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;->aJh:J
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/connection/PayloadTransferUpdate;->aJq: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 2ee76f6e93..0305ce8fe9 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,7 +3,7 @@
 
 
 # instance fields
-.field private final aAj:Z
+.field private final aAs:Z
 
 .field private final zzq:Ljava/lang/String;
 
@@ -22,7 +22,7 @@
 
     iput-object p2, p0, Lcom/google/android/gms/nearby/connection/a;->zzr:Ljava/lang/String;
 
-    iput-boolean p3, p0, Lcom/google/android/gms/nearby/connection/a;->aAj:Z
+    iput-boolean p3, p0, Lcom/google/android/gms/nearby/connection/a;->aAs: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 b67cbd2310..2315712f92 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 aJa:Lcom/google/android/gms/common/api/Status;
+.field private final aJj: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;->aJa:Lcom/google/android/gms/common/api/Status;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/b;->aJj: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 2d8faa8a86..54d3241557 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 aAl:Ljava/lang/String;
+.field private final aAu:Ljava/lang/String;
 
-.field private final aAm:Landroid/bluetooth/BluetoothDevice;
+.field private final aAv: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;->aAl:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAu: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;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/d;->aAv: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;->aAl:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAu: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;->aAm:Landroid/bluetooth/BluetoothDevice;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/d;->aAv: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 5f43081db6..23fb898521 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 aJd:Ljava/io/File;
+.field private final aJm:Ljava/io/File;
 
-.field private final aJe:Landroid/os/ParcelFileDescriptor;
+.field private final aJn:Landroid/os/ParcelFileDescriptor;
 
-.field private final aJf:J
+.field private final aJo: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;->aJd:Ljava/io/File;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJm:Ljava/io/File;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJe:Landroid/os/ParcelFileDescriptor;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJn:Landroid/os/ParcelFileDescriptor;
 
-    iput-wide p3, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJf:J
+    iput-wide p3, p0, Lcom/google/android/gms/nearby/connection/e$a;->aJo: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 1e676403f7..1cc490b99a 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 aJe:Landroid/os/ParcelFileDescriptor;
+.field private final aJn:Landroid/os/ParcelFileDescriptor;
 
-.field private aJg:Ljava/io/InputStream;
+.field private aJp: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;->aJe:Landroid/os/ParcelFileDescriptor;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aJn:Landroid/os/ParcelFileDescriptor;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aJg:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/connection/e$b;->aJp: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 614f5661c8..21914949cb 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 aAu:[B
+.field private final aAD:[B
 
-.field private final aJb:Lcom/google/android/gms/nearby/connection/e$a;
+.field private final aJk:Lcom/google/android/gms/nearby/connection/e$a;
 
-.field private final aJc:Lcom/google/android/gms/nearby/connection/e$b;
+.field private final aJl: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;->aAu:[B
+    iput-object p4, p0, Lcom/google/android/gms/nearby/connection/e;->aAD:[B
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/connection/e;->aJb:Lcom/google/android/gms/nearby/connection/e$a;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/connection/e;->aJk:Lcom/google/android/gms/nearby/connection/e$a;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/connection/e;->aJc:Lcom/google/android/gms/nearby/connection/e$b;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/connection/e;->aJl:Lcom/google/android/gms/nearby/connection/e$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/f.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/f.smali
index e5ea2ef0cf..f95c9ce6ca 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/connection/f.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/connection/f.smali
@@ -3,7 +3,7 @@
 
 
 # instance fields
-.field private final aAh:I
+.field private final aAq:I
 
 
 # direct methods
@@ -12,7 +12,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/connection/f;->aAh:I
+    iput p1, p0, Lcom/google/android/gms/nearby/connection/f;->aAq:I
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/BleSignal.smali b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/BleSignal.smali
index dba0e972fa..942f5581dc 100644
--- a/com.discord/smali_classes2/com/google/android/gms/nearby/messages/BleSignal.smali
+++ b/com.discord/smali_classes2/com/google/android/gms/nearby/messages/BleSignal.smali
@@ -3,8 +3,8 @@
 
 
 # virtual methods
-.method public abstract yU()I
+.method public abstract yX()I
 .end method
 
-.method public abstract yV()I
+.method public abstract yY()I
 .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 f10d4a2df5..7f3731ea97 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 aJj:Lcom/google/android/gms/nearby/messages/Distance;
+.field public static final aJs: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;->aJj:Lcom/google/android/gms/nearby/messages/Distance;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Distance;->aJs:Lcom/google/android/gms/nearby/messages/Distance;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract yW()D
+.method public abstract yZ()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 ec012fef9d..aaa11a48b9 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,22 +16,22 @@
     .end annotation
 .end field
 
-.field private static final aJk:[Lcom/google/android/gms/internal/nearby/zzgs;
+.field private static final aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
 
 
 # instance fields
-.field public final aJl:[B
+.field public final aJu:[B
 
-.field private final aJm:Ljava/lang/String;
+.field private final aJv:Ljava/lang/String;
 
-.field private final aJn:[Lcom/google/android/gms/internal/nearby/zzgs;
+.field private final aJw:[Lcom/google/android/gms/internal/nearby/zzgs;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJo:J
+.field private final aJx:J
 
-.field private final aeD:I
+.field private final aeM:I
 
 .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;->aAP:Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object v1, Lcom/google/android/gms/internal/nearby/zzgs;->aAY: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;->aJk:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Message;->aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     return-void
 .end method
@@ -66,7 +66,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Message;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Message;->aeM:I
 
     invoke-static {p4}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -81,9 +81,9 @@
     const-string p3, ""
 
     :cond_0
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/Message;->aJm:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/Message;->aJv:Ljava/lang/String;
 
-    iput-wide p6, p0, Lcom/google/android/gms/nearby/messages/Message;->aJo:J
+    iput-wide p6, p0, Lcom/google/android/gms/nearby/messages/Message;->aJx:J
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -127,7 +127,7 @@
 
     invoke-static {p1, p3, v1}, Lcom/google/android/gms/common/internal/r;->a(ZLjava/lang/String;[Ljava/lang/Object;)V
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
     if-eqz p5, :cond_2
 
@@ -136,10 +136,10 @@
     if-nez p1, :cond_3
 
     :cond_2
-    sget-object p5, Lcom/google/android/gms/nearby/messages/Message;->aJk:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object p5, Lcom/google/android/gms/nearby/messages/Message;->aJt:[Lcom/google/android/gms/internal/nearby/zzgs;
 
     :cond_3
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/Message;->aJn:[Lcom/google/android/gms/internal/nearby/zzgs;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/Message;->aJw:[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;->aJk:[Lcom/google/android/gms/internal/nearby/zzgs;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Message;->aJt:[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;->aJm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJv:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJm:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJv:Ljava/lang/String;
 
     invoke-static {v1, v3}, Landroid/text/TextUtils;->equals(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Z
 
@@ -287,9 +287,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
     invoke-static {v1, v3}, Ljava/util/Arrays;->equals([B[B)Z
 
@@ -297,9 +297,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-wide v3, p0, Lcom/google/android/gms/nearby/messages/Message;->aJo:J
+    iget-wide v3, p0, Lcom/google/android/gms/nearby/messages/Message;->aJx:J
 
-    iget-wide v5, p1, Lcom/google/android/gms/nearby/messages/Message;->aJo:J
+    iget-wide v5, p1, Lcom/google/android/gms/nearby/messages/Message;->aJx: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;->aJm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJv:Ljava/lang/String;
 
     const/4 v2, 0x0
 
@@ -330,7 +330,7 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
     invoke-static {v1}, Ljava/util/Arrays;->hashCode([B)I
 
@@ -344,7 +344,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJo:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJx:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
@@ -364,11 +364,11 @@
 .method public toString()Ljava/lang/String;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->aJm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/Message;->aJv:Ljava/lang/String;
 
     iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->type:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
     if-nez v2, :cond_0
 
@@ -442,7 +442,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJl:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJu:[B
 
     const/4 v2, 0x1
 
@@ -454,25 +454,25 @@
 
     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;->aJm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJv: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;->aJn:[Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJw:[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;->aJo:J
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/Message;->aJx: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 p2, p0, Lcom/google/android/gms/nearby/messages/Message;->aeD:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/Message;->aeM:I
 
     const/16 v1, 0x3e8
 
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 eae62a01c7..2b5b69078e 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 aJr:Ljava/util/List;
+.field final aJA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,11 +24,11 @@
     .end annotation
 .end field
 
-.field aJs:Z
+.field aJB:Z
 
-.field aJu:I
+.field aJD:I
 
-.field final aJv:Ljava/util/Set;
+.field final aJE:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final aJw:Ljava/util/Set;
+.field final aJF: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;->aJv:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJE: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;->aJr:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJA: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;->aJw:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJF:Ljava/util/Set;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJu:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJD: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 1933264544..b80bc128c7 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,23 +21,13 @@
     .end annotation
 .end field
 
-.field public static final aJp:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field public static final aJy:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
 
 # instance fields
-.field private final aAy:I
+.field private final aAH:I
 
-.field private final aJq:Ljava/util/List;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/List<",
-            "Lcom/google/android/gms/nearby/messages/internal/zzad;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field private final aJr:Ljava/util/List;
+.field private final aJA:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -47,9 +37,9 @@
     .end annotation
 .end field
 
-.field private final aJs:Z
+.field private final aJB:Z
 
-.field private final aJt:Ljava/util/List;
+.field private final aJC:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -59,7 +49,17 @@
     .end annotation
 .end field
 
-.field private final aJu:I
+.field private final aJD:I
+
+.field private final aJz:Ljava/util/List;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/List<",
+            "Lcom/google/android/gms/nearby/messages/internal/zzad;",
+            ">;"
+        }
+    .end annotation
+.end field
 
 
 # direct methods
@@ -78,13 +78,13 @@
 
     const/4 v1, 0x1
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJs:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Z
 
-    iget-boolean v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJs:Z
+    iget-boolean v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Z
 
     if-nez v2, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJv:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJE: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;->aJv:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJE: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;->aJr:Ljava/util/List;
+    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJA:Ljava/util/List;
 
-    iget-boolean v6, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJs:Z
+    iget-boolean v6, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJB:Z
 
     new-instance v7, Ljava/util/ArrayList;
 
-    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJw:Ljava/util/Set;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJF: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;->aJu:I
+    iget v8, v0, Lcom/google/android/gms/nearby/messages/MessageFilter$a;->aJD: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;->aJp:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    sput-object v1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy: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;->aAy:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aAH: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;->aJq:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz:Ljava/util/List;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJs:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB: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;->aJr:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA: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;->aJt:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJC:Ljava/util/List;
 
-    iput p6, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJu:I
+    iput p6, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJD: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;->aJs:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB:Z
 
-    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJs:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJq:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJq:Ljava/util/List;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz: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;->aJr:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA:Ljava/util/List;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJr:Ljava/util/List;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA: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;->aJt:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJC:Ljava/util/List;
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJt:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJC: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;->aJq:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz:Ljava/util/List;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJr:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA:Ljava/util/List;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJs:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB: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;->aJt:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJC: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;->aJs:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB:Z
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJq:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz: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;->aJq:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJz: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;->aJr:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJA: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;->aJs:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJB: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;->aJt:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJC: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;->aJu:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJD: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;->aAy:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aAH: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 f018ae8235..05e42f175e 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 aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public aJD:Lcom/google/android/gms/nearby/messages/c;
+.field public aJM:Lcom/google/android/gms/nearby/messages/c;
 
 
 # direct methods
@@ -25,23 +25,23 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJE:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJN:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final yX()Lcom/google/android/gms/nearby/messages/PublishOptions;
+.method public final za()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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJD:Lcom/google/android/gms/nearby/messages/c;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->aJM: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 83648813b9..61f52447a1 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 aJB:Lcom/google/android/gms/nearby/messages/PublishOptions;
+.field public static final aJK:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
 
 # instance fields
-.field public final aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public final aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public final aJD:Lcom/google/android/gms/nearby/messages/c;
+.field public final aJM: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;->yX()Lcom/google/android/gms/nearby/messages/PublishOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/PublishOptions$a;->za()Lcom/google/android/gms/nearby/messages/PublishOptions;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJB:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJK: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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJD:Lcom/google/android/gms/nearby/messages/c;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJM: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 0850028a9d..9721c64223 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 aJL:I
+.field private aJU:I
 
-.field aJM:I
+.field aJV:I
 
-.field private aJN:I
+.field private aJW:I
 
-.field private aJO:I
+.field private aJX:I
 
-.field alp:I
+.field aly:I
 
 
 # direct methods
@@ -33,37 +33,37 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJL:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJU:I
 
     const/16 v0, 0x12c
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJM:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJV:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJN:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJW:I
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alp:I
+    iput v1, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly:I
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJO:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJX:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final yY()Lcom/google/android/gms/nearby/messages/Strategy;
+.method public final zb()Lcom/google/android/gms/nearby/messages/Strategy;
     .locals 11
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alp:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly:I
 
     const/4 v1, 0x2
 
     if-ne v0, v1, :cond_1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJN:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJW:I
 
     const/4 v1, 0x1
 
@@ -88,15 +88,15 @@
 
     const/4 v4, 0x0
 
-    iget v5, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJM:I
+    iget v5, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJV:I
 
-    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJN:I
+    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJW:I
 
     const/4 v7, 0x0
 
-    iget v8, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->alp:I
+    iget v8, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly:I
 
-    iget v9, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJL:I
+    iget v9, p0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJU: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 26a92fbe58..b02b1fca07 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,38 +21,38 @@
     .end annotation
 .end field
 
-.field public static final aJE:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public static final aJN:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public static final aJF:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public static final aJO:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private static final aJG:Lcom/google/android/gms/nearby/messages/Strategy;
+.field private static final aJP:Lcom/google/android/gms/nearby/messages/Strategy;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private final aAy:I
+.field private final aAH:I
 
-.field private final aJH:I
+.field private final aJQ:I
 
-.field private final aJI:Z
+.field private final aJR:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJJ:I
+.field private final aJS:I
 
-.field private final aJK:I
+.field private final aJT:I
 
-.field private final ale:I
+.field private final alo:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final alg:I
+.field private final alq:I
 
-.field public final alk:I
+.field public final alu:I
 
 
 # direct methods
@@ -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;->yY()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zb()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJE:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJN: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;->alp:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aly: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;->aJM:I
+    iput v2, v0, Lcom/google/android/gms/nearby/messages/Strategy$a;->aJV:I
 
-    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->yY()Lcom/google/android/gms/nearby/messages/Strategy;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Strategy$a;->zb()Lcom/google/android/gms/nearby/messages/Strategy;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJF:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJO:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJG:Lcom/google/android/gms/nearby/messages/Strategy;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJP: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;->aAy:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAH:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ale:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alo: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;->aJK:I
+    iput p7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
 
     goto :goto_1
 
@@ -152,30 +152,30 @@
     goto :goto_0
 
     :cond_1
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJK:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
 
     goto :goto_1
 
     :cond_2
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJK:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
 
     :goto_1
-    iput p4, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alg:I
+    iput p4, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
 
-    iput-boolean p5, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJI:Z
+    iput-boolean p5, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJR:Z
 
     if-eqz p5, :cond_3
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS:I
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJH:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
 
     goto :goto_2
 
     :cond_3
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJH:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ: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;->aJJ:I
+    iput p6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS:I
 
     goto :goto_2
 
     :cond_4
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS:I
 
     :goto_2
-    iput p8, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alk:I
+    iput p8, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alu: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;->aAy:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAH:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aAy:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aAH:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJK:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJK:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJH:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJH:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alg:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ: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;->alk:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alu:I
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alk:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/Strategy;->alu: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;->aAy:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAH:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJK:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJH:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJJ: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;->alk:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alu: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;->aJH:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ:I
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alg:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq: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;->aJJ:I
+    iget v6, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS: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;->aJK:I
+    iget v7, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT: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;->alk:I
+    iget v3, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alu:I
 
     if-eqz v3, :cond_b
 
@@ -588,49 +588,49 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->ale:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alo: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;->aJH:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJQ: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;->alg:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alq: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;->aJI:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJR: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;->aJJ:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJS: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;->aJK:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aJT: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;->alk:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->alu: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;->aAy:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/Strategy;->aAH: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 ea46703171..3474aeb3d1 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 public aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field private aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field private aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field private aJR:Lcom/google/android/gms/nearby/messages/e;
+.field private aKa:Lcom/google/android/gms/nearby/messages/e;
 
 
 # direct methods
@@ -27,29 +27,29 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJE:Lcom/google/android/gms/nearby/messages/Strategy;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/Strategy;->aJN:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    sget-object v0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJp:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/MessageFilter;->aJy:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final yZ()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.method public final zc()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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aJR:Lcom/google/android/gms/nearby/messages/e;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->aKa: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 898de9a5e6..27ad6de6b2 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 aJP:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.field public static final aJY:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
 
 # instance fields
-.field public final aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+.field public final aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-.field public final aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+.field public final aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-.field public final aJR:Lcom/google/android/gms/nearby/messages/e;
+.field public final aKa:Lcom/google/android/gms/nearby/messages/e;
 
-.field public final aJS:I
+.field public final aKb:I
 
-.field public final alt:Z
+.field public final alC: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;->yZ()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/SubscribeOptions$a;->zc()Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJP:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJY: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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJR:Lcom/google/android/gms/nearby/messages/e;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aKa:Lcom/google/android/gms/nearby/messages/e;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->alt:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->alC:Z
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJS:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aKb: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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJL: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;->aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJZ: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 b253bdbd93..ca3cf9831a 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 akY:I
+.field alh:I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/b$a;->akY:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/b$a;->alh:I
 
     return-void
 .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 9b9d8517be..b6c8d80fe1 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 aJA:Ljava/lang/String;
+.field public final aJG:Ljava/lang/String;
 
-.field public final aJx:Ljava/lang/String;
+.field public final aJH:Z
 
-.field public final aJy:Z
+.field public final aJI:Ljava/lang/String;
 
-.field public final aJz:Ljava/lang/String;
+.field public final aJJ:Ljava/lang/String;
 
-.field public final akY:I
+.field public final alh:I
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJx:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJG:Ljava/lang/String;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p0, Lcom/google/android/gms/nearby/messages/b;->aJy:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/nearby/messages/b;->aJH:Z
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/b$a;->akY:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/b$a;->alh:I
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/b;->akY:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/b;->alh:I
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJz:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJI:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJA:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/android/gms/nearby/messages/b;->aJJ:Ljava/lang/String;
 
     return-void
 .end method
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 73d68f5433..a55eaaae67 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,20 +18,20 @@
 
 
 # instance fields
-.field private final aJA:Ljava/lang/String;
+.field private final aJH:Z
 
-.field private final aJT:Ljava/lang/String;
+.field private final aJI:Ljava/lang/String;
 
-.field public final aJU:I
+.field private final aJJ:Ljava/lang/String;
+
+.field private final aKc:Ljava/lang/String;
+
+.field public final aKd:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJy:Z
-
-.field private final aJz:Ljava/lang/String;
-
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aeM:I
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -60,7 +60,7 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJA:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ: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;->aJT:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJy:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
 
-    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJU:I
+    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJz:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI: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;->aJA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJA:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->G(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;->aJT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJT:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->G(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;->aJy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
 
-    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJy:Z
+    iget-boolean v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJz:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
 
     invoke-static {v1, v3}, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->G(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;->aJU:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
 
-    iget p1, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJU:I
+    iget p1, p1, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd: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;->aJA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH: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;->aJz:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJU:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd: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;->aJA:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ:Ljava/lang/String;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJT:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc:Ljava/lang/String;
 
     const/4 v3, 0x1
 
     aput-object v2, v1, v3
 
-    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJy:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH: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;->aJz:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI:Ljava/lang/String;
 
     const/4 v3, 0x3
 
     aput-object v2, v1, v3
 
-    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJU:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd:I
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -403,37 +403,37 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aeD:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aeM: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/nearby/messages/internal/ClientAppContext;->aJA:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJJ: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;->aJT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKc: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;->aJy:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJH: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;->aJU:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aKd: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;->aJz:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;->aJI: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 e7fb3c0938..d11bb0920f 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,57 +18,57 @@
 
 
 # instance fields
-.field private final aJA:Ljava/lang/String;
+.field private final aJG:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJS:I
-
-.field private final aJU:I
-
-.field private final aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
-
-.field private final aJW:Lcom/google/android/gms/nearby/messages/Strategy;
-
-.field private final aJX:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aJY:Lcom/google/android/gms/nearby/messages/MessageFilter;
-
-.field private final aJZ:Landroid/app/PendingIntent;
-
-.field private final aJx:Ljava/lang/String;
+.field private final aJH:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJy:Z
+.field private final aJJ:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKa:I
+.field private final aKb:I
+
+.field private final aKd:I
+
+.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+
+.field private final aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+
+.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aKh:Lcom/google/android/gms/nearby/messages/MessageFilter;
+
+.field private final aKi:Landroid/app/PendingIntent;
+
+.field private final aKj:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKb:[B
+.field private final aKk:[B
 
-.field private final aKc:Z
+.field private final aKl:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKd:Lcom/google/android/gms/nearby/messages/internal/a;
+.field private final aKm:Lcom/google/android/gms/nearby/messages/internal/a;
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeD:I
+.field private final aeM:I
 
-.field private final alt:Z
+.field private final alC:Z
 
 
 # direct methods
@@ -105,7 +105,7 @@
 
     move v7, p1
 
-    iput v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeD:I
+    iput v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeM:I
 
     const/4 v7, 0x0
 
@@ -140,11 +140,11 @@
     move-object v1, v8
 
     :goto_0
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
 
     move-object v1, p3
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJW:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKf: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
 
     move-object v1, p5
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJY:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
     move-object/from16 v1, p6
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJZ:Landroid/app/PendingIntent;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi:Landroid/app/PendingIntent;
 
     move/from16 v1, p7
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKa:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKj:I
 
-    iput-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJx:Ljava/lang/String;
+    iput-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJG:Ljava/lang/String;
 
-    iput-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJA:Ljava/lang/String;
+    iput-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJJ:Ljava/lang/String;
 
     move-object/from16 v1, p10
 
-    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb:[B
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKk:[B
 
     move/from16 v1, p11
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKc:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKl: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;->aKd:Lcom/google/android/gms/nearby/messages/internal/a;
+    iput-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKm:Lcom/google/android/gms/nearby/messages/internal/a;
 
-    iput-boolean v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJy:Z
+    iput-boolean v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     move/from16 v1, p15
 
-    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->alt:Z
+    iput-boolean v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->alC:Z
 
     move/from16 v1, p16
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJS:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb:I
 
     move/from16 v1, p17
 
-    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJU:I
+    iput v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd: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;->aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe: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;->aJW:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v2, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKf: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v3, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKg: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;->aJY:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v4, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh: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;->aJZ:Landroid/app/PendingIntent;
+    iget-object v5, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi: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;->aKb:[B
+    iget-object v6, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKk:[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;->aKd:Lcom/google/android/gms/nearby/messages/internal/a;
+    iget-object v7, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKm: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;->aJy:Z
+    iget-boolean v8, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJH:Z
 
-    iget-object v9, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v9, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKn: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;->alt:Z
+    iget-boolean v10, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->alC:Z
 
-    iget-object v11, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJx:Ljava/lang/String;
+    iget-object v11, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJG:Ljava/lang/String;
 
-    iget-object v12, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJA:Ljava/lang/String;
+    iget-object v12, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJJ:Ljava/lang/String;
 
-    iget-boolean v13, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKc:Z
+    iget-boolean v13, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKl:Z
 
-    iget v14, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJU:I
+    iget v14, v0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd:I
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -629,13 +629,13 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aeM: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/nearby/messages/internal/SubscribeRequest;->aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKe: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;->aJW:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKf: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKg: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;->aJY:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKh: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;->aJZ:Landroid/app/PendingIntent;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKi: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;->aKa:I
+    iget v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKj: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;->aJx:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJG: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;->aJA:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJJ: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;->aKb:[B
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKk:[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;->aKc:Z
+    iget-boolean v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKl: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;->aKd:Lcom/google/android/gms/nearby/messages/internal/a;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKm: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;->aJy:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKn: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;->alt:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->alC: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;->aJS:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKb: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;->aJU:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/SubscribeRequest;->aKd: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 5d8022c58e..002437f462 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,19 +18,19 @@
 
 
 # instance fields
-.field private final aKf:I
+.field private final aKo:I
 
-.field public final aKg:Lcom/google/android/gms/nearby/messages/Message;
+.field public final aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-.field public final aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+.field public final aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-.field public final aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+.field public final aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-.field public final aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+.field public final aKs:Lcom/google/android/gms/internal/nearby/zzgs;
 
-.field private final aKk:[B
+.field private final aKt:[B
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aeM:I
 
     const/4 p1, 0x2
 
@@ -77,17 +77,17 @@
     move p1, p2
 
     :goto_0
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKf:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo:I
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
 
-    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk:[B
+    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[B
 
     return-void
 .end method
@@ -114,7 +114,7 @@
 .method public final cz(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKf:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo:I
 
     invoke-static {v0, p1}, Lcom/google/android/gms/nearby/messages/internal/Update;->K(II)Z
 
@@ -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;->aKf:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKf:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo:I
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp: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;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq:Lcom/google/android/gms/nearby/messages/internal/zze;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq: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;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr:Lcom/google/android/gms/nearby/messages/internal/zza;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr: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;->aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs:Lcom/google/android/gms/internal/nearby/zzgs;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs: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;->aKk:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[B
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKk:[B
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[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;->aKf:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp: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;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq: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;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr: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;->aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs: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;->aKk:[B
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp: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;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq: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;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v3, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr: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;->aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v4, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs: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;->aKk:[B
+    iget-object v5, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[B
 
     invoke-static {v5}, Lcom/google/android/gms/internal/nearby/au;->t([B)Lcom/google/android/gms/internal/nearby/au;
 
@@ -503,43 +503,43 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aeM: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/nearby/messages/internal/Update;->aKf:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKo: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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKp: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;->aKh:Lcom/google/android/gms/nearby/messages/internal/zze;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKq: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;->aKi:Lcom/google/android/gms/nearby/messages/internal/zza;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKr: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;->aKj:Lcom/google/android/gms/internal/nearby/zzgs;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKs: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;->aKk:[B
+    iget-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/Update;->aKt:[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 274a09120d..806a6fbde0 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 aKJ:Lcom/google/android/gms/internal/nearby/bc;
+.field private static final aKS: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 aKK:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKT: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;->aKJ:Lcom/google/android/gms/internal/nearby/bc;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/aa;->aKS: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;->aKK:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aKT: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;->aKK:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/aa;->aKT:Lcom/google/android/gms/common/api/internal/h;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->aKJ:Lcom/google/android/gms/internal/nearby/bc;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/aa;->aKS: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 02183ce5a8..5cd466fd97 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 aKJ:Lcom/google/android/gms/internal/nearby/bc;
+.field private static final aKS: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 aKK:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKT: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;->aKJ:Lcom/google/android/gms/internal/nearby/bc;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ac;->aKS: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;->aKK:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aKT: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;->aKK:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/ac;->aKT:Lcom/google/android/gms/common/api/internal/h;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->aKJ:Lcom/google/android/gms/internal/nearby/bc;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/ac;->aKS: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 5153067f8a..e883e02be3 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field public static final aAn: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 aAf:Lcom/google/android/gms/common/api/a$a;
+.field public static final aAo: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 aKL:Lcom/google/android/gms/nearby/messages/internal/ae;
+.field public static final aKU: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;->aKL:Lcom/google/android/gms/nearby/messages/internal/ae;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aKU: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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aAn: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ae;->aAo: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 65e5177e4e..228a86f94c 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAn: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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/ag;->aAn: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 614ef810b0..7899931a79 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -77,7 +77,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()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 82aafe3f87..60e2963c72 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()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 1769355f31..81c4ae15f6 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -47,7 +47,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -89,7 +89,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -110,7 +110,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()Landroid/os/Parcel;
 
     move-result-object v0
 
@@ -131,7 +131,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()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 41b1269982..6cfdc717a8 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()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 2d1a3244d1..93c5381a4d 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()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 23064da9be..5c043c74b5 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;->nJ()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/nearby/a;->nM()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 4538cffb5d..5f8dbeca85 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 aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-.field final aKn:Lcom/google/android/gms/internal/nearby/bf;
+.field final aKw: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 akY:I
+.field private final alh: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p2, p5, Lcom/google/android/gms/common/internal/d;->ajw:Ljava/lang/String;
+    iget-object p2, p5, Lcom/google/android/gms/common/internal/d;->ajF: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->akY:I
+    iget p2, p6, Lcom/google/android/gms/nearby/messages/b;->alh: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKn: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;->akY:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/f;->alh:I
 
     if-ne p3, p5, :cond_5
 
@@ -283,7 +283,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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
     iget-object v0, v0, Lcom/google/android/gms/internal/nearby/bf;->map:Ljava/util/Map;
 
@@ -368,7 +368,7 @@
     return-void
 .end method
 
-.method public final lW()Z
+.method public final lZ()Z
     .locals 1
 
     invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/f;->getContext()Landroid/content/Context;
@@ -382,28 +382,20 @@
     return v0
 .end method
 
-.method public final lY()I
-    .locals 1
-
-    const v0, 0xbdfcb8
-
-    return v0
-.end method
-
-.method public final mQ()Landroid/os/Bundle;
+.method public final mT()Landroid/os/Bundle;
     .locals 3
 
-    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->mQ()Landroid/os/Bundle;
+    invoke-super {p0}, Lcom/google/android/gms/common/internal/g;->mT()Landroid/os/Bundle;
 
     move-result-object v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->akY:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->alh: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/f;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     const-string v2, "ClientAppContext"
 
@@ -412,7 +404,15 @@
     return-object v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final mb()I
+    .locals 1
+
+    const v0, 0xbdfcb8
+
+    return v0
+.end method
+
+.method public final md()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START"
@@ -420,7 +420,7 @@
     return-object v0
 .end method
 
-.method public final mb()Ljava/lang/String;
+.method public final me()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 82d1cc8f67..ed2766c5bb 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 aKo:Landroid/app/Activity;
+.field private final aKx:Landroid/app/Activity;
 
-.field private final aKp:Lcom/google/android/gms/nearby/messages/internal/f;
+.field private final aKy: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;->aKo:Landroid/app/Activity;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKx:Landroid/app/Activity;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKp:Lcom/google/android/gms/nearby/messages/internal/f;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKy: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;->aKo:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKx: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;->aKo:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKx: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;->aKp:Lcom/google/android/gms/nearby/messages/internal/f;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/g;->aKy:Lcom/google/android/gms/nearby/messages/internal/f;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/nearby/messages/internal/f;->bT(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 d8aa9689d3..0902b49c10 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAn: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 aAf:Lcom/google/android/gms/common/api/a$a;
+.field private static final aAo: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 aIV:Lcom/google/android/gms/common/api/a;
+.field private static final aJe: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 aJU:I
+.field final aKd: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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aAn: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aAo: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/nearby/messages/internal/h;->aAo:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/h;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/nearby/messages/internal/h;->aAn: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;->aIV:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJe: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;->aIV:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJe:Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afq:Lcom/google/android/gms/common/api/h$a;
+    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afz:Lcom/google/android/gms/common/api/h$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/h$a;)V
 
     const/4 p2, 0x1
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/h;->aJU:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/h;->aKd: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;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p1, p1, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKP:Z
+    iput-boolean v1, p2, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKY:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/internal/nearby/bf;->at(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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLU: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKP:Z
+    iput-boolean p0, v0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKY:Z
 
-    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p2, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v2, p0, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object p0, p0, Lcom/google/android/gms/common/api/internal/h;->agZ:Lcom/google/android/gms/common/api/internal/h$a;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/internal/nearby/bf;->at(Ljava/lang/Object;)V
 
@@ -529,7 +529,7 @@
 
     move-result-object v0
 
-    iget-object v1, p2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJD:Lcom/google/android/gms/nearby/messages/c;
+    iget-object v1, p2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJM:Lcom/google/android/gms/nearby/messages/c;
 
     invoke-direct {p0, v1}, Lcom/google/android/gms/nearby/messages/internal/h;->aw(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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJL:Lcom/google/android/gms/nearby/messages/Strategy;
 
-    iget v0, v0, Lcom/google/android/gms/nearby/messages/Strategy;->alk:I
+    iget v0, v0, Lcom/google/android/gms/nearby/messages/Strategy;->alu: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;->aJR:Lcom/google/android/gms/nearby/messages/e;
+    iget-object v0, p2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aKa:Lcom/google/android/gms/nearby/messages/e;
 
     invoke-direct {p0, v0}, Lcom/google/android/gms/nearby/messages/internal/h;->aw(Ljava/lang/Object;)Lcom/google/android/gms/common/api/internal/h;
 
@@ -675,20 +675,20 @@
     return-object p1
 .end method
 
-.method public final me()Lcom/google/android/gms/common/internal/d$a;
+.method public final mh()Lcom/google/android/gms/common/internal/d$a;
     .locals 2
 
-    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->me()Lcom/google/android/gms/common/internal/d$a;
+    invoke-super {p0}, Lcom/google/android/gms/nearby/messages/MessagesClient;->mh()Lcom/google/android/gms/common/internal/d$a;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->md()Lcom/google/android/gms/common/api/a$d;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->mg()Lcom/google/android/gms/common/api/a$d;
 
     move-result-object v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->md()Lcom/google/android/gms/common/api/a$d;
+    invoke-virtual {p0}, Lcom/google/android/gms/nearby/messages/internal/h;->mg()Lcom/google/android/gms/common/api/a$d;
 
     :cond_0
     return-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 ccd18abf01..99ed4c0658 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 aKq:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aKA:Lcom/google/android/gms/nearby/messages/Message;
 
-.field private final aKr:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aKB:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-.field private final aKs:Lcom/google/android/gms/nearby/messages/internal/aa;
+.field private final aKC:Lcom/google/android/gms/nearby/messages/PublishOptions;
 
-.field private final aKt:Lcom/google/android/gms/nearby/messages/PublishOptions;
+.field private final aKz:Lcom/google/android/gms/nearby/messages/internal/h;
 
 
 # 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;->aKq:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKr:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKA:Lcom/google/android/gms/nearby/messages/Message;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKs:Lcom/google/android/gms/nearby/messages/internal/aa;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKB:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKt:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKC: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;->aKq:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKr:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKA:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object v6, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKs:Lcom/google/android/gms/nearby/messages/internal/aa;
+    iget-object v6, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKB:Lcom/google/android/gms/nearby/messages/internal/aa;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKt:Lcom/google/android/gms/nearby/messages/PublishOptions;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/i;->aKC: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;->aJU:I
+    iget v7, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aKd:I
 
     new-instance v0, Lcom/google/android/gms/nearby/messages/internal/zzbz;
 
-    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/PublishOptions;->aJL: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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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 cbd0281d8e..5b8c3b3b6f 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 aKu:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aKD: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;->aKu:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aKD: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;->aKu:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/j;->aKD: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 ca33b868ef..3eaae08187 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 aKq:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aKE:Lcom/google/android/gms/common/api/internal/h;
 
-.field private final aKv:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKF:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-.field private final aKw:Lcom/google/android/gms/nearby/messages/internal/ac;
+.field private final aKG:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
-.field private final aKx:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+.field private final aKz:Lcom/google/android/gms/nearby/messages/internal/h;
 
 
 # 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;->aKq:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKv:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKE:Lcom/google/android/gms/common/api/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKw:Lcom/google/android/gms/nearby/messages/internal/ac;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKF:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKx:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKG: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;->aKq:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKz:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKv:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKE:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v7, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKw:Lcom/google/android/gms/nearby/messages/internal/ac;
+    iget-object v7, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKF:Lcom/google/android/gms/nearby/messages/internal/ac;
 
-    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKx:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/k;->aKG:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 
-    iget v9, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aJU:I
+    iget v9, v0, Lcom/google/android/gms/nearby/messages/internal/h;->aKd:I
 
-    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v0, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v3, v1, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aKn:Lcom/google/android/gms/internal/nearby/bf;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/f;->aKw:Lcom/google/android/gms/internal/nearby/bf;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agZ: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;->aJC:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v4, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJL: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;->aJQ:Lcom/google/android/gms/nearby/messages/MessageFilter;
+    iget-object v6, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->aJZ:Lcom/google/android/gms/nearby/messages/MessageFilter;
 
-    iget-boolean v8, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->alt:Z
+    iget-boolean v8, v2, Lcom/google/android/gms/nearby/messages/SubscribeOptions;->alC: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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/android/gms/nearby/messages/internal/f;->mU()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 1106378e1c..6b32ae786a 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 aKy:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKH: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;->aKy:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aKH: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;->aKy:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/l;->aKH: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 39cb0bdf59..4d3e286030 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 aKy:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKH: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;->aKy:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aKH: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;->aKy:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/m;->aKH: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 b0d4c748c0..2cb0491d08 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 aKy:Lcom/google/android/gms/common/api/internal/h;
+.field private final aKH: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;->aKy:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aKH: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;->aKy:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/n;->aKH: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 5daf86e289..2a716b339b 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 aKz:I
+.field private final aKI:I
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aKz:I
+    iput v0, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aKI: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;->aKz:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/o;->aKI: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 a2517de03c..61eca1627f 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 aKA:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic aKJ:Lcom/google/android/gms/common/api/internal/h;
 
-.field private final synthetic aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKK: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKA:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKJ: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKA:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/q;->aKJ:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agZ: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 14f6f53d2a..d89147bc2d 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 aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKC:Lcom/google/android/gms/common/api/internal/h;
+.field private final synthetic aKL: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKC:Lcom/google/android/gms/common/api/internal/h;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKL: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKC:Lcom/google/android/gms/common/api/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/r;->aKL:Lcom/google/android/gms/common/api/internal/h;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agQ:Lcom/google/android/gms/common/api/internal/h$a;
+    iget-object v1, v1, Lcom/google/android/gms/common/api/internal/h;->agZ: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 23173642aa..bde7dbce19 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 aKD:Lcom/google/android/gms/tasks/h;
+.field private final synthetic aKM: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;->aKD:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKM: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;->aKD:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKM:Lcom/google/android/gms/tasks/h;
 
     new-instance v1, Lcom/google/android/gms/common/api/e;
 
@@ -50,7 +50,7 @@
 .method public final synthetic c(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKD:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/s;->aKM: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 a18d8c1f54..2a01f376a0 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 aKE:Lcom/google/android/gms/tasks/h;
+.field private final synthetic aKN: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;->aKE:Lcom/google/android/gms/tasks/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKN: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;->zd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zg()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKE:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKN:Lcom/google/android/gms/tasks/h;
 
     const/4 v0, 0x0
 
@@ -59,9 +59,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKE:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/t;->aKN:Lcom/google/android/gms/tasks/h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->ze()Ljava/lang/Exception;
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zh()Ljava/lang/Exception;
 
     move-result-object p1
 
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 eee00e4c67..12aa7642b6 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 aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKF:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aKO: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKF:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKO: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;->aKF:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKO:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/u;->aKK: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 0e1e713381..15089fd82b 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 aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKG:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aKP: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKG:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKP: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;->aKG:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKP:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/w;->aKK: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 bd870b18e3..c9c1c21973 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 aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final synthetic aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final synthetic aKH:Lcom/google/android/gms/nearby/messages/internal/z;
+.field private final synthetic aKQ: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;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKK:Lcom/google/android/gms/nearby/messages/internal/h;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKH:Lcom/google/android/gms/nearby/messages/internal/z;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKQ: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;->aKH:Lcom/google/android/gms/nearby/messages/internal/z;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKQ:Lcom/google/android/gms/nearby/messages/internal/z;
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKB:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/x;->aKK: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 b89034053b..e3c0a3e89b 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 aKI:Lcom/google/android/gms/nearby/messages/internal/h;
+.field private final aKR:Lcom/google/android/gms/nearby/messages/internal/h;
 
-.field private final aKo:Landroid/app/Activity;
+.field private final aKx:Landroid/app/Activity;
 
 
 # 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;->aKo:Landroid/app/Activity;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKx:Landroid/app/Activity;
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKI:Lcom/google/android/gms/nearby/messages/internal/h;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKR: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;->aKo:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKx: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;->aKo:Landroid/app/Activity;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKx:Landroid/app/Activity;
 
     if-ne p1, v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKI:Lcom/google/android/gms/nearby/messages/internal/h;
+    iget-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/y;->aKR: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 40ed523052..7416237d02 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,11 +18,11 @@
 
 
 # instance fields
-.field private final aKl:I
+.field private final aKu:I
 
-.field private final aKm:I
+.field private final aKv:I
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -43,9 +43,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aeM:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKl:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu: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;->aKm:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
 
     return-void
 .end method
@@ -89,17 +89,17 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/BleSignal;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKl:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu:I
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yU()I
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yX()I
 
     move-result v3
 
     if-ne v1, v3, :cond_2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKm:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yV()I
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/BleSignal;->yY()I
 
     move-result p1
 
@@ -118,7 +118,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKl:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -128,7 +128,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKm:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -148,9 +148,9 @@
 .method public final toString()Ljava/lang/String;
     .locals 4
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKl:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu:I
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKm:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -190,19 +190,19 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aeD:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aeM: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/internal/zza;->aKl:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu: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;->aKm:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
 
     const/4 v1, 0x3
 
@@ -213,18 +213,18 @@
     return-void
 .end method
 
-.method public final yU()I
+.method public final yX()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKl:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKu:I
 
     return v0
 .end method
 
-.method public final yV()I
+.method public final yY()I
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKm:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zza;->aKv:I
 
     return v0
 .end method
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 12dbd413c6..a948602588 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,9 +15,9 @@
 
 
 # instance fields
-.field private final aJm:Ljava/lang/String;
+.field private final aJv:Ljava/lang/String;
 
-.field private final aeD:I
+.field private final aeM:I
 
 .field private final type:Ljava/lang/String;
 
@@ -40,9 +40,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aeM:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJm:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv: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;->aJm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv:Ljava/lang/String;
 
-    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJm:Ljava/lang/String;
+    iget-object v3, p1, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv: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;->aJm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv: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;->aJm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv: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;->aJm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aJv:Ljava/lang/String;
 
     const/4 v1, 0x1
 
@@ -206,7 +206,7 @@
 
     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/nearby/messages/internal/zzad;->aeD:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzad;->aeM:I
 
     const/16 v1, 0x3e8
 
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 d1a35dbe08..abaa503293 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,9 +15,9 @@
 
 
 # instance fields
-.field private final aKg:Lcom/google/android/gms/nearby/messages/Message;
+.field private final aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aeM:I
 
     invoke-static {p2}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKp: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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
-    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object p1, p1, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKp: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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKp: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;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v0, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
     invoke-virtual {v0}, Lcom/google/android/gms/nearby/messages/Message;->toString()Ljava/lang/String;
 
@@ -166,13 +166,13 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKg:Lcom/google/android/gms/nearby/messages/Message;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aKp:Lcom/google/android/gms/nearby/messages/Message;
 
     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 p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aeD:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzaf;->aeM:I
 
     const/16 v1, 0x3e8
 
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 441409d7e9..894ab17aab 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,42 +15,42 @@
 
 
 # instance fields
-.field private final aJA:Ljava/lang/String;
+.field private final aJG:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJU:I
-
-.field private final aJW:Lcom/google/android/gms/nearby/messages/Strategy;
-
-.field private final aJX:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aJx:Ljava/lang/String;
+.field private final aJH:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJy:Z
+.field private final aJJ:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKM:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+.field private final aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-.field private final aKN:Lcom/google/android/gms/nearby/messages/internal/ay;
+.field private final aKW:Lcom/google/android/gms/nearby/messages/internal/ay;
 
-.field private final aKc:Z
+.field private final aKd:I
+
+.field private final aKf:Lcom/google/android/gms/nearby/messages/Strategy;
+
+.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aKl:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -71,11 +71,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeM:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKM:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJW:Lcom/google/android/gms/nearby/messages/Strategy;
+    iput-object p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKf: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJx:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJG:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJA:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJJ:Ljava/lang/String;
 
-    iput-boolean p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKc:Z
+    iput-boolean p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKl: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;->aKN:Lcom/google/android/gms/nearby/messages/internal/ay;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKW:Lcom/google/android/gms/nearby/messages/internal/ay;
 
-    iput-boolean p9, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJy:Z
+    iput-boolean p9, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iput p11, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJU:I
+    iput p11, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKd:I
 
     return-void
 .end method
@@ -202,25 +202,25 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aeM: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/nearby/messages/internal/zzbz;->aKM:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKV: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;->aJW:Lcom/google/android/gms/nearby/messages/Strategy;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKf: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKg: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;->aJx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJG: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;->aJA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJJ: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;->aKc:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKl: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;->aKN:Lcom/google/android/gms/nearby/messages/internal/ay;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKW: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;->aJy:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKn: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;->aJU:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzbz;->aKd: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 0fd40ba703..165c14449e 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,23 +15,23 @@
 
 
 # instance fields
-.field private final aJX:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private aJx:Ljava/lang/String;
+.field private aJG:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKO:Lcom/google/android/gms/nearby/messages/internal/bb;
+.field private final aKX:Lcom/google/android/gms/nearby/messages/internal/bb;
 
-.field public aKP:Z
+.field public aKY:Z
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aeM:I
 
     const/4 p1, 0x0
 
@@ -87,7 +87,7 @@
     move-object p2, v0
 
     :goto_0
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKg: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;->aKO:Lcom/google/android/gms/nearby/messages/internal/bb;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKX:Lcom/google/android/gms/nearby/messages/internal/bb;
 
-    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKP:Z
+    iput-boolean p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKY:Z
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJx:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJG: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     return-void
 .end method
@@ -166,13 +166,13 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aeM: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/nearby/messages/internal/zzcb;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKg: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;->aKO:Lcom/google/android/gms/nearby/messages/internal/bb;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKX: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;->aKP:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKY: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;->aJx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aJG: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcb;->aKn: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 42e166be33..c326925934 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,31 +15,31 @@
 
 
 # instance fields
-.field private final aJA:Ljava/lang/String;
+.field private final aJG:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJX:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aJx:Ljava/lang/String;
+.field private final aJH:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJy:Z
+.field private final aJJ:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKM:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+.field private final aKV:Lcom/google/android/gms/nearby/messages/internal/zzaf;
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -60,9 +60,9 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aeM:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKM:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKV: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJx:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJG:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJA:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJJ:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJy:Z
+    iput-boolean p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     return-void
 .end method
@@ -143,19 +143,19 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aeM: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/nearby/messages/internal/zzce;->aKM:Lcom/google/android/gms/nearby/messages/internal/zzaf;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKV: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKg: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;->aJx:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJG: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;->aJA:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJJ: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;->aJy:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzce;->aKn: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 59ea9ad078..0a665ffb69 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,38 +15,38 @@
 
 
 # instance fields
-.field private final aJA:Ljava/lang/String;
+.field private final aJG:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
-
-.field private final aJX:Lcom/google/android/gms/nearby/messages/internal/at;
-
-.field private final aJZ:Landroid/app/PendingIntent;
-
-.field private final aJx:Ljava/lang/String;
+.field private final aJH:Z
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aJy:Z
+.field private final aJJ:Ljava/lang/String;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKa:I
+.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/aq;
+
+.field private final aKg:Lcom/google/android/gms/nearby/messages/internal/at;
+
+.field private final aKi:Landroid/app/PendingIntent;
+
+.field private final aKj:I
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -67,7 +67,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aeM:I
 
     const/4 p1, 0x0
 
@@ -102,7 +102,7 @@
     move-object p2, v0
 
     :goto_0
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKe: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKg:Lcom/google/android/gms/nearby/messages/internal/at;
 
-    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJZ:Landroid/app/PendingIntent;
+    iput-object p4, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKi:Landroid/app/PendingIntent;
 
-    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKa:I
+    iput p5, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKj:I
 
-    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJx:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJG:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJA:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJJ:Ljava/lang/String;
 
-    iput-boolean p8, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJy:Z
+    iput-boolean p8, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
     return-void
 .end method
@@ -189,13 +189,13 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aeM: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/nearby/messages/internal/zzcg;->aJV:Lcom/google/android/gms/nearby/messages/internal/aq;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKe: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;->aJX:Lcom/google/android/gms/nearby/messages/internal/at;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKg: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;->aJZ:Landroid/app/PendingIntent;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKi: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;->aKa:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKj: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;->aJx:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJG: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;->aJA:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJJ: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;->aJy:Z
+    iget-boolean v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aJH: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;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v2, p0, Lcom/google/android/gms/nearby/messages/internal/zzcg;->aKn: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 78e2454093..9d0e4f1ab6 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,11 +18,11 @@
 
 
 # instance fields
-.field private final aKQ:I
+.field private final aKZ:I
 
-.field private final aKR:D
+.field private final aLa:D
 
-.field private final aeD:I
+.field private final aeM:I
 
 
 # direct methods
@@ -55,11 +55,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeM:I
 
-    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKQ:I
+    iput p2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
 
-    iput-wide p3, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKR:D
+    iput-wide p3, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa: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;->aKR:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa: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;->yW()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->yZ()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;->aKR:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa:D
 
-    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->yW()D
+    invoke-interface {p1}, Lcom/google/android/gms/nearby/messages/Distance;->yZ()D
 
     move-result-wide v2
 
@@ -138,9 +138,9 @@
     :cond_1
     check-cast p1, Lcom/google/android/gms/nearby/messages/internal/zze;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKQ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
 
-    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/zze;->aKQ:I
+    iget v3, p1, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
 
     if-ne v1, v3, :cond_2
 
@@ -163,7 +163,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKQ:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -173,7 +173,7 @@
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKR:D
+    iget-wide v1, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa: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;->aKR:D
+    iget-wide v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa:D
 
     invoke-static {v2, v3}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
 
@@ -209,7 +209,7 @@
 
     aput-object v2, v1, v3
 
-    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKQ:I
+    iget v2, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ:I
 
     const/4 v3, 0x1
 
@@ -243,19 +243,19 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeD:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aeM: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/internal/zze;->aKQ:I
+    iget v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKZ: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-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKR:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa:D
 
     const/4 v2, 0x3
 
@@ -270,10 +270,10 @@
     return-void
 .end method
 
-.method public final yW()D
+.method public final yZ()D
     .locals 2
 
-    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aKR:D
+    iget-wide v0, p0, Lcom/google/android/gms/nearby/messages/internal/zze;->aLa: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 0ec002a1a8..5dbae3574e 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,14 +15,14 @@
 
 
 # instance fields
-.field private final aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+.field private final aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private final aeD:I
+.field private final aeM:I
 
-.field private final alR:I
+.field private final ama:I
 
 
 # direct methods
@@ -55,11 +55,11 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeD:I
+    iput p1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeM:I
 
-    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iput-object p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aKn:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
 
-    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->alR:I
+    iput p3, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->ama:I
 
     return-void
 .end method
@@ -75,19 +75,19 @@
 
     move-result v0
 
-    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeD:I
+    iget v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aeM: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/nearby/messages/internal/zzj;->aKe:Lcom/google/android/gms/nearby/messages/internal/ClientAppContext;
+    iget-object v1, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->aKn: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;->alR:I
+    iget p2, p0, Lcom/google/android/gms/nearby/messages/internal/zzj;->ama: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 2d5b82a0c5..677aec9754 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 aKS:Ljava/lang/String;
+.field public final aLb:Ljava/lang/String;
 
-.field public final aKT:[B
+.field public final aLc:[B
 
-.field public final aKU:I
+.field public final aLd: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;->aKS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLb:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKT:[B
+    iput-object p2, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLc:[B
 
-    iput p3, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKU:I
+    iput p3, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLd:I
 
     return-void
 .end method
@@ -60,19 +60,19 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aKS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLb: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;->aKT:[B
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLc:[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;->aKU:I
+    iget v0, p0, Lcom/google/android/gms/safetynet/HarmfulAppsData;->aLd: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 ad3d5ff79d..99d15474eb 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,17 +17,17 @@
 
 
 # instance fields
-.field aKV:Lcom/google/android/gms/common/data/DataHolder;
+.field aLe:Lcom/google/android/gms/common/data/DataHolder;
 
-.field aKW:Landroid/os/ParcelFileDescriptor;
+.field aLf:Landroid/os/ParcelFileDescriptor;
 
-.field aKX:[B
+.field aLg:[B
 
-.field private aKY:[B
+.field private aLh:[B
 
-.field private aKZ:Ljava/io/File;
+.field private aLi:Ljava/io/File;
 
-.field axn:J
+.field axw:J
 
 .field zzm:Ljava/lang/String;
 
@@ -80,13 +80,13 @@
 
     iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->zzm:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aKV:Lcom/google/android/gms/common/data/DataHolder;
+    iput-object p2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLe:Lcom/google/android/gms/common/data/DataHolder;
 
-    iput-object p3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aKW:Landroid/os/ParcelFileDescriptor;
+    iput-object p3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLf:Landroid/os/ParcelFileDescriptor;
 
-    iput-wide p4, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->axn:J
+    iput-wide p4, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->axw:J
 
-    iput-object p6, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aKX:[B
+    iput-object p6, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLg:[B
 
     return-void
 .end method
@@ -103,10 +103,10 @@
     return-void
 .end method
 
-.method private final za()Ljava/io/FileOutputStream;
+.method private final zd()Ljava/io/FileOutputStream;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aKZ:Ljava/io/File;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLi: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;->aKW:Landroid/os/ParcelFileDescriptor;
+    iput-object v3, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLf: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;->aKW:Landroid/os/ParcelFileDescriptor;
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLf:Landroid/os/ParcelFileDescriptor;
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aKY:[B
+    iget-object v0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLh:[B
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->za()Ljava/io/FileOutputStream;
+    invoke-direct {p0}, Lcom/google/android/gms/safetynet/SafeBrowsingData;->zd()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;->aKY:[B
+    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLh:[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;->aKY:[B
+    iget-object v2, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLh:[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;->aKW:Landroid/os/ParcelFileDescriptor;
+    iput-object p1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLf: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 d0e2b775f5..3086013047 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
@@ -32,14 +32,14 @@
 
 
 # virtual methods
-.method public final uR()Ljava/lang/String;
+.method public final uU()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/common/api/m;->afv:Lcom/google/android/gms/common/api/n;
+    iget-object v0, p0, Lcom/google/android/gms/common/api/m;->afE:Lcom/google/android/gms/common/api/n;
 
     check-cast v0, Lcom/google/android/gms/safetynet/SafetyNetApi$a;
 
-    invoke-interface {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->uR()Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/android/gms/safetynet/SafetyNetApi$a;->uU()Ljava/lang/String;
 
     move-result-object v0
 
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 3c365d0c64..18e75f3d1e 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 uR()Ljava/lang/String;
+.method public abstract uU()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 96c05ceb17..6113bf0bac 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;->aLa:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/android/gms/safetynet/a;->aLj:Lcom/google/android/gms/common/api/a;
 
     new-instance v1, Lcom/google/android/gms/common/api/internal/a;
 
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 622f9c35b0..61ae51835f 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAn: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 aAf:Lcom/google/android/gms/common/api/a$a;
+.field private static final aAo: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 aLa:Lcom/google/android/gms/common/api/a;
+.field public static final aLj: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 aLb:Lcom/google/android/gms/safetynet/SafetyNetApi;
+.field public static final aLk:Lcom/google/android/gms/safetynet/SafetyNetApi;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
-.field private static final aLc:Lcom/google/android/gms/safetynet/i;
+.field private static final aLl:Lcom/google/android/gms/safetynet/i;
 
 
 # direct methods
@@ -53,37 +53,37 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/common/api/a$g;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/safetynet/a;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aAn: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aAo: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;->aAf:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/safetynet/a;->aAo:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/safetynet/a;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/safetynet/a;->aAn: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;->aLa:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aLj: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;->aLb:Lcom/google/android/gms/safetynet/SafetyNetApi;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aLk: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;->aLc:Lcom/google/android/gms/safetynet/i;
+    sput-object v0, Lcom/google/android/gms/safetynet/a;->aLl:Lcom/google/android/gms/safetynet/i;
 
     return-void
 .end method
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 6d6353d2d7..e749234179 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
@@ -40,25 +40,25 @@
 
     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;->aKV:Lcom/google/android/gms/common/data/DataHolder;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLe: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;->aKW:Landroid/os/ParcelFileDescriptor;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLf: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;->axn:J
+    iget-wide v1, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->axw: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;->aKX:[B
+    iget-object p0, p0, Lcom/google/android/gms/safetynet/SafeBrowsingData;->aLg:[B
 
     const/4 p2, 0x6
 
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 c01ddcbff1..97fdc732a3 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,7 +15,7 @@
 
 
 # instance fields
-.field public final aLd:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+.field public final aLm:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
 
 .field public final zzf:J
 
@@ -44,7 +44,7 @@
 
     iput-wide p1, p0, Lcom/google/android/gms/safetynet/zzd;->zzf:J
 
-    iput-object p3, p0, Lcom/google/android/gms/safetynet/zzd;->aLd:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+    iput-object p3, p0, Lcom/google/android/gms/safetynet/zzd;->aLm:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
 
     iput-boolean p5, p0, Lcom/google/android/gms/safetynet/zzd;->zzi:Z
 
@@ -79,7 +79,7 @@
 
     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;->aLd:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
+    iget-object v1, p0, Lcom/google/android/gms/safetynet/zzd;->aLm:[Lcom/google/android/gms/safetynet/HarmfulAppsData;
 
     const/4 v2, 0x3
 
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 6e38381527..63c26616b7 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 aeX:I
+.field private final afg:I
 
-.field private final atn:Z
+.field private final atw:Z
 
 
 # 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;->aeX:I
+    iput p1, p0, Lcom/google/android/gms/safetynet/zzh;->afg:I
 
-    iput-boolean p2, p0, Lcom/google/android/gms/safetynet/zzh;->atn:Z
+    iput-boolean p2, p0, Lcom/google/android/gms/safetynet/zzh;->atw:Z
 
     return-void
 .end method
@@ -56,13 +56,13 @@
 
     move-result p2
 
-    iget v0, p0, Lcom/google/android/gms/safetynet/zzh;->aeX:I
+    iget v0, p0, Lcom/google/android/gms/safetynet/zzh;->afg: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;->atn:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/safetynet/zzh;->atw: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 1c784ea3d6..7575976cb6 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 aLg:Lcom/google/android/gms/signin/a;
+.field public static final aLp:Lcom/google/android/gms/signin/a;
 
 
 # instance fields
-.field public final aLh:Z
+.field public final aLq:Z
 
-.field public final aLi:Z
+.field public final aLr:Z
 
-.field public final aLj:Ljava/lang/String;
+.field public final aLs:Ljava/lang/String;
 
-.field public final aLk:Z
+.field public final aLt:Z
 
-.field public final aLl:Ljava/lang/String;
+.field public final aLu:Ljava/lang/String;
 
-.field public final aLm:Z
+.field public final aLv:Z
 
-.field public final aLn:Ljava/lang/Long;
+.field public final aLw:Ljava/lang/Long;
 
-.field public final aLo:Ljava/lang/Long;
+.field public final aLx: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;->aLg:Lcom/google/android/gms/signin/a;
+    sput-object v0, Lcom/google/android/gms/signin/a;->aLp: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;->aLh:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLq:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLi:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLr:Z
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLj:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLs:Ljava/lang/String;
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLk:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLt:Z
 
-    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLm:Z
+    iput-boolean v0, p0, Lcom/google/android/gms/signin/a;->aLv:Z
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLl:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLu:Ljava/lang/String;
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLn:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLw:Ljava/lang/Long;
 
-    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLo:Ljava/lang/Long;
+    iput-object v1, p0, Lcom/google/android/gms/signin/a;->aLx: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 affe4d9b27..3cdedf91d3 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAn:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -13,27 +13,7 @@
     .end annotation
 .end field
 
-.field private static final aLA: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 public static final aLa: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 aLv:Lcom/google/android/gms/common/api/a$g;
+.field private static final aLE:Lcom/google/android/gms/common/api/a$g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$g<",
@@ -43,7 +23,7 @@
     .end annotation
 .end field
 
-.field public static final aLw:Lcom/google/android/gms/common/api/a$a;
+.field public static final aLF:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -54,7 +34,7 @@
     .end annotation
 .end field
 
-.field private static final aLx:Lcom/google/android/gms/common/api/a$a;
+.field private static final aLG:Lcom/google/android/gms/common/api/a$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/a$a<",
@@ -65,9 +45,29 @@
     .end annotation
 .end field
 
-.field private static final aLy:Lcom/google/android/gms/common/api/Scope;
+.field private static final aLH:Lcom/google/android/gms/common/api/Scope;
 
-.field private static final aLz:Lcom/google/android/gms/common/api/Scope;
+.field private static final aLI:Lcom/google/android/gms/common/api/Scope;
+
+.field private static final aLJ: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 public static final aLj: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
@@ -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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aAn: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;->aLv:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLE: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;->aLw:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLF: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;->aLx:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLG: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;->aLy:Lcom/google/android/gms/common/api/Scope;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLH: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;->aLz:Lcom/google/android/gms/common/api/Scope;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLI: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;->aLw:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/signin/b;->aLF:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/signin/b;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/signin/b;->aAn: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;->aLa:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLj: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;->aLx:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/android/gms/signin/b;->aLG:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/android/gms/signin/b;->aLv:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/android/gms/signin/b;->aLE: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;->aLA:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/android/gms/signin/b;->aLJ: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 08883e3306..64cb9ee25c 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;->aLg:Lcom/google/android/gms/signin/a;
+    sget-object p4, Lcom/google/android/gms/signin/a;->aLp: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 c9a220aa03..c464435d65 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 aLp:Z
+.field private final aLy:Z
 
-.field private final aLq:Landroid/os/Bundle;
+.field private final aLz:Landroid/os/Bundle;
 
-.field private final ahv:Lcom/google/android/gms/common/internal/d;
+.field private final ahE:Lcom/google/android/gms/common/internal/d;
 
-.field private ajA:Ljava/lang/Integer;
+.field private ajJ:Ljava/lang/Integer;
 
 
 # direct methods
@@ -48,15 +48,15 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/android/gms/signin/internal/a;->aLp:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/signin/internal/a;->aLy:Z
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/a;->ahv:Lcom/google/android/gms/common/internal/d;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iput-object p4, p0, Lcom/google/android/gms/signin/internal/a;->aLq:Landroid/os/Bundle;
+    iput-object p4, p0, Lcom/google/android/gms/signin/internal/a;->aLz:Landroid/os/Bundle;
 
-    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajA:Ljava/lang/Integer;
+    iget-object p1, p3, Lcom/google/android/gms/common/internal/d;->ajJ:Ljava/lang/Integer;
 
-    iput-object p1, p0, Lcom/google/android/gms/signin/internal/a;->ajA:Ljava/lang/Integer;
+    iput-object p1, p0, Lcom/google/android/gms/signin/internal/a;->ajJ: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/i$a;Lcom/google/android/gms/common/api/i$b;)V
     .locals 9
 
-    iget-object v0, p3, Lcom/google/android/gms/common/internal/d;->ajy:Lcom/google/android/gms/signin/a;
+    iget-object v0, p3, Lcom/google/android/gms/common/internal/d;->ajH:Lcom/google/android/gms/signin/a;
 
-    iget-object v1, p3, Lcom/google/android/gms/common/internal/d;->ajA:Ljava/lang/Integer;
+    iget-object v1, p3, Lcom/google/android/gms/common/internal/d;->ajJ: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;->ajq:Landroid/accounts/Account;
+    iget-object v2, p3, Lcom/google/android/gms/common/internal/d;->ajz: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;->aLh:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLq: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;->aLi:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLr: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;->aLj:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLs: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;->aLk:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLt: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;->aLl:Ljava/lang/String;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLu: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;->aLm:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/signin/a;->aLv: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;->aLn:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLw:Ljava/lang/Long;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLn:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLw: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;->aLo:Ljava/lang/Long;
+    iget-object v1, v0, Lcom/google/android/gms/signin/a;->aLx:Ljava/lang/Long;
 
     if-eqz v1, :cond_2
 
-    iget-object v0, v0, Lcom/google/android/gms/signin/a;->aLo:Ljava/lang/Long;
+    iget-object v0, v0, Lcom/google/android/gms/signin/a;->aLx:Ljava/lang/Long;
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -222,9 +222,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;->ahv:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, v0, Lcom/google/android/gms/common/internal/d;->ajq:Landroid/accounts/Account;
+    iget-object v1, v0, Lcom/google/android/gms/common/internal/d;->ajz:Landroid/accounts/Account;
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -233,7 +233,7 @@
     if-eqz v1, :cond_0
 
     :try_start_1
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajq:Landroid/accounts/Account;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajz:Landroid/accounts/Account;
 
     goto :goto_0
 
@@ -276,7 +276,7 @@
     :cond_1
     new-instance v2, Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
-    iget-object v3, p0, Lcom/google/android/gms/signin/internal/a;->ajA:Ljava/lang/Integer;
+    iget-object v3, p0, Lcom/google/android/gms/signin/internal/a;->ajJ:Ljava/lang/Integer;
 
     invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
 
@@ -284,7 +284,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;->mR()Landroid/os/IInterface;
+    invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->mU()Landroid/os/IInterface;
 
     move-result-object v0
 
@@ -340,28 +340,20 @@
     return-void
 .end method
 
-.method public final lV()Z
+.method public final lY()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->aLp:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/signin/internal/a;->aLy:Z
 
     return v0
 .end method
 
-.method public final lY()I
-    .locals 1
-
-    const v0, 0xbdfcb8
-
-    return v0
-.end method
-
-.method public final mQ()Landroid/os/Bundle;
+.method public final mT()Landroid/os/Bundle;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->ahv:Lcom/google/android/gms/common/internal/d;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajw:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/android/gms/common/internal/d;->ajF:Ljava/lang/String;
 
     invoke-virtual {p0}, Lcom/google/android/gms/signin/internal/a;->getContext()Landroid/content/Context;
 
@@ -377,23 +369,31 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aLq:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aLz:Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/android/gms/signin/internal/a;->ahv:Lcom/google/android/gms/common/internal/d;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/a;->ahE:Lcom/google/android/gms/common/internal/d;
 
-    iget-object v1, v1, Lcom/google/android/gms/common/internal/d;->ajw:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/android/gms/common/internal/d;->ajF: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;->aLq:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/android/gms/signin/internal/a;->aLz:Landroid/os/Bundle;
 
     return-object v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final mb()I
+    .locals 1
+
+    const v0, 0xbdfcb8
+
+    return v0
+.end method
+
+.method public final md()Ljava/lang/String;
     .locals 1
 
     const-string v0, "com.google.android.gms.signin.service.START"
@@ -401,7 +401,7 @@
     return-object v0
 .end method
 
-.method public final mb()Ljava/lang/String;
+.method public final me()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 ab87104293..d07f31c7ea 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
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/b/a;->nM()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/b/a;->nP()Landroid/os/Parcel;
 
     move-result-object v0
 
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 601adeacb0..4121f385d7 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 aLr:I
+.field private aLA:I
 
-.field private aLs:Landroid/content/Intent;
+.field private aLB:Landroid/content/Intent;
 
-.field private final ait:I
+.field private final aiC: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;->ait:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zaa;->aiC:I
 
-    iput p2, p0, Lcom/google/android/gms/signin/internal/zaa;->aLr:I
+    iput p2, p0, Lcom/google/android/gms/signin/internal/zaa;->aLA:I
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaa;->aLs:Landroid/content/Intent;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaa;->aLB:Landroid/content/Intent;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final ml()Lcom/google/android/gms/common/api/Status;
+.method public final mo()Lcom/google/android/gms/common/api/Status;
     .locals 1
 
-    iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->aLr:I
+    iget v0, p0, Lcom/google/android/gms/signin/internal/zaa;->aLA:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->afx:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->afG:Lcom/google/android/gms/common/api/Status;
 
     return-object v0
 
     :cond_0
-    sget-object v0, Lcom/google/android/gms/common/api/Status;->afB:Lcom/google/android/gms/common/api/Status;
+    sget-object v0, Lcom/google/android/gms/common/api/Status;->afK: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;->ait:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aiC: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;->aLr:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aLA: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;->aLs:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaa;->aLB: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 f24422fea6..2d305347ed 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 aLt:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+.field private final aLC:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
 
-.field private final ait:I
+.field private final aiC: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;->ait:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zah;->aiC:I
 
-    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zah;->aLt:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zah;->aLC: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;->ait:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zah;->aiC: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;->aLt:Lcom/google/android/gms/common/internal/ResolveAccountRequest;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zah;->aLC: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 ca9c8005a2..35c4de77bc 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 aLu:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+.field public final aLD:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
 
-.field public final aic:Lcom/google/android/gms/common/ConnectionResult;
+.field private final aiC:I
 
-.field private final ait:I
+.field public final ail:Lcom/google/android/gms/common/ConnectionResult;
 
 
 # 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;->ait:I
+    iput p1, p0, Lcom/google/android/gms/signin/internal/zaj;->aiC:I
 
-    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zaj;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iput-object p2, p0, Lcom/google/android/gms/signin/internal/zaj;->ail:Lcom/google/android/gms/common/ConnectionResult;
 
-    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaj;->aLu:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iput-object p3, p0, Lcom/google/android/gms/signin/internal/zaj;->aLD: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;->ait:I
+    iget v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aiC: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;->aic:Lcom/google/android/gms/common/ConnectionResult;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->ail: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;->aLu:Lcom/google/android/gms/common/internal/ResolveAccountResponse;
+    iget-object v1, p0, Lcom/google/android/gms/signin/internal/zaj;->aLD: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 898e3aa8d3..435726c713 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,19 +11,19 @@
 
 
 # static fields
-.field private static aLI:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static aLR:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static volatile aLJ:Lcom/google/android/gms/stats/a$a;
+.field private static volatile aLS:Lcom/google/android/gms/stats/a$a;
 
 
 # instance fields
-.field public final aLB:Landroid/os/PowerManager$WakeLock;
+.field public final aLK:Landroid/os/PowerManager$WakeLock;
 
-.field private aLC:Landroid/os/WorkSource;
+.field private aLL:Landroid/os/WorkSource;
 
-.field private final aLD:Landroid/content/Context;
+.field private final aLM:Landroid/content/Context;
 
-.field private final aLE:Ljava/util/Map;
+.field private final aLN:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aLF:Ljava/util/Set;
+.field private final aLO:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -45,9 +45,9 @@
     .end annotation
 .end field
 
-.field private aLG:I
+.field private aLP:I
 
-.field private aLH:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
 .field private final zza:Ljava/lang/Object;
 
@@ -70,7 +70,7 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/stats/b;-><init>()V
 
-    sput-object v0, Lcom/google/android/gms/stats/a;->aLJ:Lcom/google/android/gms/stats/a$a;
+    sput-object v0, Lcom/google/android/gms/stats/a;->aLS:Lcom/google/android/gms/stats/a$a;
 
     return-void
 .end method
@@ -110,7 +110,7 @@
 
     invoke-direct {p5}, Ljava/util/HashMap;-><init>()V
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLN: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;->aLF:Ljava/util/Set;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLO: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;->aLH:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     const-string p5, "WakeLock: context must not be null"
 
@@ -150,7 +150,7 @@
 
     move-result-object p5
 
-    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLD:Landroid/content/Context;
+    iput-object p5, p0, Lcom/google/android/gms/stats/a;->aLM:Landroid/content/Context;
 
     invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -210,7 +210,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iput-object p2, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-static {p1}, Lcom/google/android/gms/common/util/p;->T(Landroid/content/Context;)Z
 
@@ -233,13 +233,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aLC:Landroid/os/WorkSource;
+    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
 
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLC:Landroid/os/WorkSource;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
 
     if-eqz p1, :cond_4
 
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLD:Landroid/content/Context;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLM: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;->aLC:Landroid/os/WorkSource;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLL: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;->aLC:Landroid/os/WorkSource;
+    iput-object p1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
 
     :goto_2
-    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLC:Landroid/os/WorkSource;
+    iget-object p1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
 
     :try_start_0
-    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object p2, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {p2, p1}, Landroid/os/PowerManager$WakeLock;->setWorkSource(Landroid/os/WorkSource;)V
     :try_end_0
@@ -290,19 +290,19 @@
 
     :cond_4
     :goto_4
-    sget-object p1, Lcom/google/android/gms/stats/a;->aLI:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object p1, Lcom/google/android/gms/stats/a;->aLR:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez p1, :cond_5
 
-    invoke-static {}, Lcom/google/android/gms/common/b/a;->nf()Lcom/google/android/gms/common/b/a$a;
+    invoke-static {}, Lcom/google/android/gms/common/b/a;->ni()Lcom/google/android/gms/common/b/a$a;
 
     move-result-object p1
 
-    invoke-interface {p1}, Lcom/google/android/gms/common/b/a$a;->ng()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-interface {p1}, Lcom/google/android/gms/common/b/a$a;->nj()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object p1
 
-    sput-object p1, Lcom/google/android/gms/stats/a;->aLI:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object p1, Lcom/google/android/gms/stats/a;->aLR:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_5
     return-void
@@ -333,15 +333,15 @@
 .method static synthetic a(Lcom/google/android/gms/stats/a;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zb()V
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->ze()V
 
     return-void
 .end method
 
-.method private final zb()V
+.method private final ze()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -350,7 +350,7 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->release()V
     :try_end_0
@@ -390,7 +390,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;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -404,7 +404,7 @@
     return-void
 .end method
 
-.method private final zc()Ljava/lang/String;
+.method private final zf()Ljava/lang/String;
     .locals 2
 
     iget-boolean v0, p0, Lcom/google/android/gms/stats/a;->zzi:Z
@@ -437,7 +437,7 @@
 .method public final Q(Z)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0, p1}, Landroid/os/PowerManager$WakeLock;->setReferenceCounted(Z)V
 
@@ -449,11 +449,11 @@
 .method public final ak(J)V
     .locals 12
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLH:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
-    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zc()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zf()Ljava/lang/String;
 
     move-result-object v5
 
@@ -462,7 +462,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->isEmpty()Z
 
@@ -472,12 +472,12 @@
 
     if-eqz v1, :cond_0
 
-    iget v1, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     if-lez v1, :cond_1
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v1}, Landroid/os/PowerManager$WakeLock;->isHeld()Z
 
@@ -485,11 +485,11 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->clear()V
 
-    iput v2, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iput v2, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     :cond_1
     iget-boolean v1, p0, Lcom/google/android/gms/stats/a;->zzi:Z
@@ -498,7 +498,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/Map;
 
     invoke-interface {v1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -508,7 +508,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/Map;
 
     new-array v3, v11, [Ljava/lang/Integer;
 
@@ -547,16 +547,16 @@
 
     if-nez v1, :cond_5
 
-    iget v1, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     if-nez v1, :cond_5
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->nm()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->np()Lcom/google/android/gms/common/stats/d;
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLD:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLM:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-static {v2, v5}, Lcom/google/android/gms/common/stats/c;->a(Landroid/os/PowerManager$WakeLock;Ljava/lang/String;)Ljava/lang/String;
 
@@ -570,7 +570,7 @@
 
     iget v7, p0, Lcom/google/android/gms/stats/a;->zzd:I
 
-    iget-object v8, p0, Lcom/google/android/gms/stats/a;->aLC:Landroid/os/WorkSource;
+    iget-object v8, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
 
     invoke-static {v8}, Lcom/google/android/gms/common/util/p;->b(Landroid/os/WorkSource;)Ljava/util/List;
 
@@ -580,18 +580,18 @@
 
     invoke-static/range {v1 .. v10}, 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;->aLG:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     add-int/2addr v1, v11
 
-    iput v1, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iput v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     :cond_5
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-virtual {v0}, Landroid/os/PowerManager$WakeLock;->acquire()V
 
@@ -601,7 +601,7 @@
 
     if-lez v2, :cond_6
 
-    sget-object v0, Lcom/google/android/gms/stats/a;->aLI:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lcom/google/android/gms/stats/a;->aLR:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v1, Lcom/google/android/gms/stats/c;
 
@@ -628,7 +628,7 @@
 .method public final release()V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLH:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lcom/google/android/gms/stats/a;->aLQ:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->decrementAndGet()I
 
@@ -653,7 +653,7 @@
     invoke-static {v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zc()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zf()Ljava/lang/String;
 
     move-result-object v5
 
@@ -668,7 +668,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/Map;
 
     invoke-interface {v1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -691,7 +691,7 @@
 
     if-ne v3, v8, :cond_2
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLE:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLN:Ljava/util/Map;
 
     invoke-interface {v1, v5}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -722,16 +722,16 @@
 
     if-nez v1, :cond_5
 
-    iget v1, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     if-ne v1, v8, :cond_5
 
     :cond_4
-    invoke-static {}, Lcom/google/android/gms/common/stats/d;->nm()Lcom/google/android/gms/common/stats/d;
+    invoke-static {}, Lcom/google/android/gms/common/stats/d;->np()Lcom/google/android/gms/common/stats/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLD:Landroid/content/Context;
+    iget-object v2, p0, Lcom/google/android/gms/stats/a;->aLM:Landroid/content/Context;
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLK:Landroid/os/PowerManager$WakeLock;
 
     invoke-static {v1, v5}, Lcom/google/android/gms/common/stats/c;->a(Landroid/os/PowerManager$WakeLock;Ljava/lang/String;)Ljava/lang/String;
 
@@ -741,7 +741,7 @@
 
     iget v6, p0, Lcom/google/android/gms/stats/a;->zzd:I
 
-    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLC:Landroid/os/WorkSource;
+    iget-object v1, p0, Lcom/google/android/gms/stats/a;->aLL:Landroid/os/WorkSource;
 
     invoke-static {v1}, Lcom/google/android/gms/common/util/p;->b(Landroid/os/WorkSource;)Ljava/util/List;
 
@@ -749,18 +749,18 @@
 
     invoke-static/range {v2 .. v7}, Lcom/google/android/gms/common/stats/d;->a(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;)V
 
-    iget v1, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iget v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     sub-int/2addr v1, v8
 
-    iput v1, p0, Lcom/google/android/gms/stats/a;->aLG:I
+    iput v1, p0, Lcom/google/android/gms/stats/a;->aLP:I
 
     :cond_5
     monitor-exit v0
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->zb()V
+    invoke-direct {p0}, Lcom/google/android/gms/stats/a;->ze()V
 
     return-void
 
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 7c11df2ac0..9a3eb9b7c7 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 aLK:Lcom/google/android/gms/stats/a;
+.field private final synthetic aLT:Lcom/google/android/gms/stats/a;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/stats/a;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/android/gms/stats/c;->aLK:Lcom/google/android/gms/stats/a;
+    iput-object p1, p0, Lcom/google/android/gms/stats/c;->aLT: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;->aLK:Lcom/google/android/gms/stats/a;
+    iget-object v0, p0, Lcom/google/android/gms/stats/c;->aLT: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 5e07668d78..143fcefaad 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
@@ -266,8 +266,8 @@
     .end annotation
 .end method
 
-.method public abstract zd()Z
+.method public abstract zg()Z
 .end method
 
-.method public abstract ze()Ljava/lang/Exception;
+.method public abstract zh()Ljava/lang/Exception;
 .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 2bb3742fbe..4c346562c2 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 aMf:Ljava/util/Queue;
+.field private aMo:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private aMg:Z
+.field private aMp: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;->aMf:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMo: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;->aMf:Ljava/util/Queue;
+    iput-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMo:Ljava/util/Queue;
 
     :cond_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMf:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMo: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;->aMf:Ljava/util/Queue;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/aa;->aMo:Ljava/util/Queue;
 
     if-eqz v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aMg:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aMp: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;->aMg:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/aa;->aMp: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;->aMf:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/aa;->aMo: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;->aMg:Z
+    iput-boolean p1, p0, Lcom/google/android/gms/tasks/aa;->aMp: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 c1b3cdf603..c21b6cacc8 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,9 +15,9 @@
 
 
 # instance fields
-.field private aFX:Z
+.field private aGg:Z
 
-.field private final aMh:Lcom/google/android/gms/tasks/aa;
+.field private final aMq:Lcom/google/android/gms/tasks/aa;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/aa<",
@@ -26,9 +26,9 @@
     .end annotation
 .end field
 
-.field private volatile aMi:Z
+.field private volatile aMr:Z
 
-.field private aMj:Ljava/lang/Object;
+.field private aMs:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TTResult;"
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private aMk:Ljava/lang/Exception;
+.field private aMt:Ljava/lang/Exception;
 
 .field private final mLock:Ljava/lang/Object;
 
@@ -57,15 +57,15 @@
 
     invoke-direct {v0}, Lcom/google/android/gms/tasks/aa;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMh:Lcom/google/android/gms/tasks/aa;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     return-void
 .end method
 
-.method private final pD()V
+.method private final pG()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     const-string v1, "Task is not yet complete"
 
@@ -74,10 +74,10 @@
     return-void
 .end method
 
-.method private final rx()V
+.method private final rA()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     xor-int/lit8 v0, v0, 0x1
 
@@ -88,7 +88,7 @@
     return-void
 .end method
 
-.method private final tx()V
+.method private final tA()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -96,7 +96,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     if-nez v1, :cond_0
 
@@ -109,7 +109,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {v0, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -126,10 +126,10 @@
     throw v1
 .end method
 
-.method private final vn()V
+.method private final vq()V
     .locals 2
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMi:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMr:Z
 
     if-nez v0, :cond_0
 
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/android/gms/tasks/i;->aLM:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLV: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;->aLM:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLV: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;->aLM:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLV: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;->aLM:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLV: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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()V
 
     return-object v0
 .end method
@@ -276,7 +276,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()V
 
     return-object p0
 .end method
@@ -302,7 +302,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()V
 
     return-object p0
 .end method
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()V
 
     return-object p0
 .end method
@@ -354,7 +354,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMq: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;->tx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->tA()V
 
     return-object v0
 .end method
@@ -446,7 +446,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     if-eqz v1, :cond_0
 
@@ -459,15 +459,15 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMj:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMs: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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -497,19 +497,19 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->rx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->rA()V
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMj:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMs: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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -538,19 +538,19 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->rx()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->rA()V
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMt: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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -579,7 +579,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     if-eqz v1, :cond_0
 
@@ -592,15 +592,15 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
-    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMt: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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {p1, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -620,7 +620,7 @@
 .method public final isCanceled()Z
     .locals 1
 
-    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMi:Z
+    iget-boolean v0, p0, Lcom/google/android/gms/tasks/ac;->aMr:Z
 
     return v0
 .end method
@@ -633,7 +633,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     monitor-exit v0
 
@@ -662,15 +662,15 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pD()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pG()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vn()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vq()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMj:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMs:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -679,7 +679,7 @@
     :cond_0
     new-instance v1, Lcom/google/android/gms/tasks/f;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     invoke-direct {v1, v2}, Lcom/google/android/gms/tasks/f;-><init>(Ljava/lang/Throwable;)V
 
@@ -695,7 +695,7 @@
     throw v1
 .end method
 
-.method public final pE()Z
+.method public final pH()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -703,7 +703,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     if-eqz v1, :cond_0
 
@@ -716,15 +716,15 @@
     :cond_0
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
-    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMi:Z
+    iput-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMr: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;->aMh:Lcom/google/android/gms/tasks/aa;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->aMq:Lcom/google/android/gms/tasks/aa;
 
     invoke-virtual {v0, p0}, Lcom/google/android/gms/tasks/aa;->d(Lcom/google/android/gms/tasks/Task;)V
 
@@ -764,11 +764,11 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pD()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->pG()V
 
-    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vn()V
+    invoke-direct {p0}, Lcom/google/android/gms/tasks/ac;->vq()V
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     invoke-virtual {p1, v1}, Ljava/lang/Class;->isInstance(Ljava/lang/Object;)Z
 
@@ -776,11 +776,11 @@
 
     if-nez v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMj:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/ac;->aMs:Ljava/lang/Object;
 
     monitor-exit v0
 
@@ -789,14 +789,14 @@
     :cond_0
     new-instance p1, Lcom/google/android/gms/tasks/f;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt: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;->aMk:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     invoke-virtual {p1, v1}, Ljava/lang/Class;->cast(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -816,7 +816,7 @@
     throw p1
 .end method
 
-.method public final zd()Z
+.method public final zg()Z
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -824,15 +824,15 @@
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aFX:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aGg:Z
 
     if-eqz v1, :cond_0
 
-    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMi:Z
+    iget-boolean v1, p0, Lcom/google/android/gms/tasks/ac;->aMr:Z
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     if-nez v1, :cond_0
 
@@ -858,7 +858,7 @@
     throw v1
 .end method
 
-.method public final ze()Ljava/lang/Exception;
+.method public final zh()Ljava/lang/Exception;
     .locals 2
 
     iget-object v0, p0, Lcom/google/android/gms/tasks/ac;->mLock:Ljava/lang/Object;
@@ -866,7 +866,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMk:Ljava/lang/Exception;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ac;->aMt:Ljava/lang/Exception;
 
     monitor-exit v0
 
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 9b8e3ab0b6..27279e3ff8 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 aMl:Lcom/google/android/gms/tasks/ac;
+.field private final synthetic aMu: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;->aMl:Lcom/google/android/gms/tasks/ac;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/ad;->aMu: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;->aMl:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/ad;->aMu: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;->aMl:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/ad;->aMu: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 8eea23d169..aab4510675 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 aLL:Lcom/google/android/gms/tasks/ac;
+.field public final aLU: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;->aLL:Lcom/google/android/gms/tasks/ac;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->c(Ljava/lang/Object;)V
 
@@ -59,7 +59,7 @@
 .method public final f(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->f(Ljava/lang/Exception;)V
 
@@ -69,7 +69,7 @@
 .method public final g(Ljava/lang/Exception;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->g(Ljava/lang/Exception;)Z
 
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 3253406364..fba6b941c5 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 aLM:Ljava/util/concurrent/Executor;
+.field public static final aLV:Ljava/util/concurrent/Executor;
 
-.field static final aLN:Ljava/util/concurrent/Executor;
+.field static final aLW: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;->aLM:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/android/gms/tasks/i;->aLV: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;->aLN:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/android/gms/tasks/i;->aLW: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 d54b260d87..b5d3699c24 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 aLO:Ljava/util/concurrent/CountDownLatch;
+.field public final aLX: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;->aLO:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aLX: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;->aLO:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/j$a;->aLX: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;->aLO:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aLX: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;->aLO:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/j$a;->aLX: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 8ac95c92b9..c0f0aaee98 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
@@ -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;->aLO:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/j$a;->aLX: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLW: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLW: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/android/gms/tasks/i;->aLW: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;->zd()Z
+    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->zg()Z
 
     move-result v0
 
@@ -187,7 +187,7 @@
     :cond_1
     new-instance v0, Ljava/util/concurrent/ExecutionException;
 
-    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->ze()Ljava/lang/Exception;
+    invoke-virtual {p0}, Lcom/google/android/gms/tasks/Task;->zh()Ljava/lang/Exception;
 
     move-result-object p0
 
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 303973780b..603577fab6 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field final aLQ:Lcom/google/android/gms/tasks/a;
+.field final aLZ: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 aLR:Lcom/google/android/gms/tasks/ac;
+.field final aMa: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/k;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/k;->aLQ:Lcom/google/android/gms/tasks/a;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/k;->aLZ:Lcom/google/android/gms/tasks/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/k;->aLR:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/k;->aMa: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/k;->aLY: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 a36f6c730d..88120213d0 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 aLS:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aMb:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aLT:Lcom/google/android/gms/tasks/k;
+.field private final synthetic aMc: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;->aLT:Lcom/google/android/gms/tasks/k;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/l;->aLS:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/l;->aMb: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;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aMb: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;->aLT:Lcom/google/android/gms/tasks/k;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pH()Z
 
     return-void
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aLT:Lcom/google/android/gms/tasks/k;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aLQ:Lcom/google/android/gms/tasks/a;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/k;->aLZ:Lcom/google/android/gms/tasks/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aMb: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;->aLT:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v1, v0}, Lcom/google/android/gms/tasks/ac;->c(Ljava/lang/Object;)V
 
@@ -71,9 +71,9 @@
     :catch_0
     move-exception v0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aLT:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa: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;->aLT:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa: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;->aLT:Lcom/google/android/gms/tasks/k;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/l;->aMc:Lcom/google/android/gms/tasks/k;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/k;->aMa: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 eb3eb9ec76..b824be3b15 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field final aLQ:Lcom/google/android/gms/tasks/a;
+.field final aLZ: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 aLR:Lcom/google/android/gms/tasks/ac;
+.field final aMa: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/m;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/m;->aLQ:Lcom/google/android/gms/tasks/a;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/m;->aLZ:Lcom/google/android/gms/tasks/a;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/m;->aLR:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/m;->aMa: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aLY: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;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aMa:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pH()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;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aMa: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;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/m;->aMa:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->c(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 604b9fd138..0888374064 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 aLS:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aMb:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aLU:Lcom/google/android/gms/tasks/m;
+.field private final synthetic aMd: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;->aLU:Lcom/google/android/gms/tasks/m;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/n;->aLS:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/n;->aMb: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;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/m;->aLQ:Lcom/google/android/gms/tasks/a;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/m;->aLZ:Lcom/google/android/gms/tasks/a;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aMb: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;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/n;->aMd: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLW:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aMd: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLW:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aMd: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLW:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/n;->aMd: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;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aMa: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;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aMa: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;->aLU:Lcom/google/android/gms/tasks/m;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/n;->aMd:Lcom/google/android/gms/tasks/m;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/m;->aMa: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 03970f6c72..3d9639568b 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field aLV:Lcom/google/android/gms/tasks/b;
+.field aMe: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/o;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/o;->aLV:Lcom/google/android/gms/tasks/b;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/o;->aMe: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;->aLV:Lcom/google/android/gms/tasks/b;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/o;->aMe: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object p1, p0, Lcom/google/android/gms/tasks/o;->aLY: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 0c59c54367..4d9b102113 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 aLW:Lcom/google/android/gms/tasks/o;
+.field private final synthetic aMf: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;->aLW:Lcom/google/android/gms/tasks/o;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/p;->aMf: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;->aLW:Lcom/google/android/gms/tasks/o;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/p;->aMf: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;->aLW:Lcom/google/android/gms/tasks/o;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aMf:Lcom/google/android/gms/tasks/o;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aLV:Lcom/google/android/gms/tasks/b;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aMe:Lcom/google/android/gms/tasks/b;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aLW:Lcom/google/android/gms/tasks/o;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/p;->aMf:Lcom/google/android/gms/tasks/o;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aLV:Lcom/google/android/gms/tasks/b;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/o;->aMe: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 bba92fa96d..6537a527b4 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field aLX:Lcom/google/android/gms/tasks/c;
+.field aMg: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/q;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/q;->aLX:Lcom/google/android/gms/tasks/c;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/q;->aMg: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;->aLX:Lcom/google/android/gms/tasks/c;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/q;->aMg: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/q;->aLY: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 f93a083f8d..8439f86827 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 aLS:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aMb:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aLY:Lcom/google/android/gms/tasks/q;
+.field private final synthetic aMh: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;->aLY:Lcom/google/android/gms/tasks/q;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/s;->aMh:Lcom/google/android/gms/tasks/q;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/s;->aLS:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/s;->aMb: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;->aLY:Lcom/google/android/gms/tasks/q;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/s;->aMh: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;->aLY:Lcom/google/android/gms/tasks/q;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aMh:Lcom/google/android/gms/tasks/q;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aLX:Lcom/google/android/gms/tasks/c;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aMg:Lcom/google/android/gms/tasks/c;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aLY:Lcom/google/android/gms/tasks/q;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/s;->aMh:Lcom/google/android/gms/tasks/q;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aLX:Lcom/google/android/gms/tasks/c;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/q;->aMg:Lcom/google/android/gms/tasks/c;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/s;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/s;->aMb: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 9cfad0dc48..d2ed1ab37d 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field aLZ:Lcom/google/android/gms/tasks/d;
+.field aMi: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/t;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/t;->aLZ:Lcom/google/android/gms/tasks/d;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/t;->aMi: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;->zd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zg()Z
 
     move-result v0
 
@@ -74,7 +74,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/t;->aLZ:Lcom/google/android/gms/tasks/d;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/t;->aMi: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/t;->aLY: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 7bb038e6a5..86b7ad84e4 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 aLS:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aMb:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMa:Lcom/google/android/gms/tasks/t;
+.field private final synthetic aMj: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;->aMa:Lcom/google/android/gms/tasks/t;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/u;->aMj:Lcom/google/android/gms/tasks/t;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/u;->aLS:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/u;->aMb:Lcom/google/android/gms/tasks/Task;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -29,26 +29,26 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/u;->aMa:Lcom/google/android/gms/tasks/t;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/u;->aMj: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;->aMa:Lcom/google/android/gms/tasks/t;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aMj:Lcom/google/android/gms/tasks/t;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aLZ:Lcom/google/android/gms/tasks/d;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aMi:Lcom/google/android/gms/tasks/d;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aMa:Lcom/google/android/gms/tasks/t;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/u;->aMj:Lcom/google/android/gms/tasks/t;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aLZ:Lcom/google/android/gms/tasks/d;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/t;->aMi:Lcom/google/android/gms/tasks/d;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/u;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/u;->aMb:Lcom/google/android/gms/tasks/Task;
 
-    invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->ze()Ljava/lang/Exception;
+    invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->zh()Ljava/lang/Exception;
 
     move-result-object v2
 
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 1453324425..dbbeefcd89 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field aMb:Lcom/google/android/gms/tasks/e;
+.field aMk: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/v;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/v;->aMb:Lcom/google/android/gms/tasks/e;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/v;->aMk: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;->zd()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/tasks/Task;->zg()Z
 
     move-result v0
 
@@ -83,7 +83,7 @@
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/android/gms/tasks/v;->aMb:Lcom/google/android/gms/tasks/e;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/v;->aMk: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/v;->aLY: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 94ede8a527..ebaf914c90 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 aLS:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aMb:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMc:Lcom/google/android/gms/tasks/v;
+.field private final synthetic aMl: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;->aMc:Lcom/google/android/gms/tasks/v;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/w;->aMl:Lcom/google/android/gms/tasks/v;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/w;->aLS:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/w;->aMb: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;->aMc:Lcom/google/android/gms/tasks/v;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/w;->aMl: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;->aMc:Lcom/google/android/gms/tasks/v;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aMl:Lcom/google/android/gms/tasks/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMb:Lcom/google/android/gms/tasks/e;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMk:Lcom/google/android/gms/tasks/e;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aMc:Lcom/google/android/gms/tasks/v;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/w;->aMl:Lcom/google/android/gms/tasks/v;
 
-    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMb:Lcom/google/android/gms/tasks/e;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/v;->aMk:Lcom/google/android/gms/tasks/e;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/w;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/w;->aMb:Lcom/google/android/gms/tasks/Task;
 
     invoke-virtual {v2}, Lcom/google/android/gms/tasks/Task;->o()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 a5d05f689d..e9b46cb0a0 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 aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field private final aLR:Lcom/google/android/gms/tasks/ac;
+.field private final aMa: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 aMd:Lcom/google/android/gms/tasks/g;
+.field final aMm: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;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/x;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/x;->aMd:Lcom/google/android/gms/tasks/g;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/x;->aMm:Lcom/google/android/gms/tasks/g;
 
-    iput-object p3, p0, Lcom/google/android/gms/tasks/x;->aLR:Lcom/google/android/gms/tasks/ac;
+    iput-object p3, p0, Lcom/google/android/gms/tasks/x;->aMa: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;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aLY: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;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aMa:Lcom/google/android/gms/tasks/ac;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pE()Z
+    invoke-virtual {v0}, Lcom/google/android/gms/tasks/ac;->pH()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;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aMa: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;->aLR:Lcom/google/android/gms/tasks/ac;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/x;->aMa:Lcom/google/android/gms/tasks/ac;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/ac;->c(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 83a40bd0a6..a09316f8b7 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 aLS:Lcom/google/android/gms/tasks/Task;
+.field private final synthetic aMb:Lcom/google/android/gms/tasks/Task;
 
-.field private final synthetic aMe:Lcom/google/android/gms/tasks/x;
+.field private final synthetic aMn: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;->aMe:Lcom/google/android/gms/tasks/x;
+    iput-object p1, p0, Lcom/google/android/gms/tasks/y;->aMn:Lcom/google/android/gms/tasks/x;
 
-    iput-object p2, p0, Lcom/google/android/gms/tasks/y;->aLS:Lcom/google/android/gms/tasks/Task;
+    iput-object p2, p0, Lcom/google/android/gms/tasks/y;->aMb: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;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMn:Lcom/google/android/gms/tasks/x;
 
-    iget-object v0, v0, Lcom/google/android/gms/tasks/x;->aMd:Lcom/google/android/gms/tasks/g;
+    iget-object v0, v0, Lcom/google/android/gms/tasks/x;->aMm:Lcom/google/android/gms/tasks/g;
 
-    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aLS:Lcom/google/android/gms/tasks/Task;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMb:Lcom/google/android/gms/tasks/Task;
 
     invoke-virtual {v1}, Lcom/google/android/gms/tasks/Task;->o()Ljava/lang/Object;
 
@@ -50,7 +50,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLW:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLW:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aLN:Ljava/util/concurrent/Executor;
+    sget-object v1, Lcom/google/android/gms/tasks/i;->aLW:Ljava/util/concurrent/Executor;
 
-    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v2, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v0, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMn: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;->aMe:Lcom/google/android/gms/tasks/x;
+    iget-object v1, p0, Lcom/google/android/gms/tasks/y;->aMn: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 e1f9bd3d67..bd7925d4f2 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
@@ -569,405 +569,405 @@
 
 .field public static final layout_scrollInterpolator:I = 0x7f040253
 
-.field public static final liftOnScroll:I = 0x7f040258
+.field public static final liftOnScroll:I = 0x7f040259
 
-.field public static final lineHeight:I = 0x7f040259
+.field public static final lineHeight:I = 0x7f04025a
 
-.field public static final lineSpacing:I = 0x7f04025a
+.field public static final lineSpacing:I = 0x7f04025b
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
 
-.field public static final listDividerAlertDialog:I = 0x7f04025c
+.field public static final listDividerAlertDialog:I = 0x7f04025d
 
-.field public static final listItemLayout:I = 0x7f04025d
+.field public static final listItemLayout:I = 0x7f04025e
 
-.field public static final listLayout:I = 0x7f04025e
+.field public static final listLayout:I = 0x7f04025f
 
-.field public static final listMenuViewStyle:I = 0x7f04025f
+.field public static final listMenuViewStyle:I = 0x7f040260
 
-.field public static final listPopupWindowStyle:I = 0x7f040260
+.field public static final listPopupWindowStyle:I = 0x7f040261
 
-.field public static final listPreferredItemHeight:I = 0x7f040261
+.field public static final listPreferredItemHeight:I = 0x7f040262
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040262
+.field public static final listPreferredItemHeightLarge:I = 0x7f040263
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040263
+.field public static final listPreferredItemHeightSmall:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040265
+.field public static final listPreferredItemPaddingRight:I = 0x7f040266
 
-.field public static final logo:I = 0x7f040266
+.field public static final logo:I = 0x7f040267
 
-.field public static final logoDescription:I = 0x7f040267
+.field public static final logoDescription:I = 0x7f040268
 
-.field public static final materialButtonStyle:I = 0x7f040277
+.field public static final materialButtonStyle:I = 0x7f040278
 
-.field public static final materialCardViewStyle:I = 0x7f040278
+.field public static final materialCardViewStyle:I = 0x7f040279
 
-.field public static final maxActionInlineWidth:I = 0x7f040279
+.field public static final maxActionInlineWidth:I = 0x7f04027a
 
-.field public static final maxButtonHeight:I = 0x7f04027a
+.field public static final maxButtonHeight:I = 0x7f04027b
 
-.field public static final maxImageSize:I = 0x7f04027b
+.field public static final maxImageSize:I = 0x7f04027c
 
-.field public static final measureWithLargestChild:I = 0x7f04027d
+.field public static final measureWithLargestChild:I = 0x7f04027e
 
-.field public static final menu:I = 0x7f04027e
+.field public static final menu:I = 0x7f04027f
 
-.field public static final multiChoiceItemLayout:I = 0x7f04027f
+.field public static final multiChoiceItemLayout:I = 0x7f040280
 
-.field public static final navigationContentDescription:I = 0x7f040280
+.field public static final navigationContentDescription:I = 0x7f040281
 
-.field public static final navigationIcon:I = 0x7f040281
+.field public static final navigationIcon:I = 0x7f040282
 
-.field public static final navigationMode:I = 0x7f040282
+.field public static final navigationMode:I = 0x7f040283
 
-.field public static final navigationViewStyle:I = 0x7f040283
+.field public static final navigationViewStyle:I = 0x7f040284
 
-.field public static final numericModifiers:I = 0x7f040286
+.field public static final numericModifiers:I = 0x7f040287
 
-.field public static final overlapAnchor:I = 0x7f040287
+.field public static final overlapAnchor:I = 0x7f040288
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028b
+.field public static final paddingBottomNoButtons:I = 0x7f04028c
 
-.field public static final paddingEnd:I = 0x7f04028c
+.field public static final paddingEnd:I = 0x7f04028d
 
-.field public static final paddingStart:I = 0x7f04028d
+.field public static final paddingStart:I = 0x7f04028e
 
-.field public static final paddingTopNoTitle:I = 0x7f04028e
+.field public static final paddingTopNoTitle:I = 0x7f04028f
 
-.field public static final panelBackground:I = 0x7f04028f
+.field public static final panelBackground:I = 0x7f040290
 
-.field public static final panelMenuListTheme:I = 0x7f040290
+.field public static final panelMenuListTheme:I = 0x7f040291
 
-.field public static final panelMenuListWidth:I = 0x7f040291
+.field public static final panelMenuListWidth:I = 0x7f040292
 
-.field public static final passwordToggleContentDescription:I = 0x7f040292
+.field public static final passwordToggleContentDescription:I = 0x7f040293
 
-.field public static final passwordToggleDrawable:I = 0x7f040293
+.field public static final passwordToggleDrawable:I = 0x7f040294
 
-.field public static final passwordToggleEnabled:I = 0x7f040294
+.field public static final passwordToggleEnabled:I = 0x7f040295
 
-.field public static final passwordToggleTint:I = 0x7f040295
+.field public static final passwordToggleTint:I = 0x7f040296
 
-.field public static final passwordToggleTintMode:I = 0x7f040296
+.field public static final passwordToggleTintMode:I = 0x7f040297
 
-.field public static final popupMenuStyle:I = 0x7f040299
+.field public static final popupMenuStyle:I = 0x7f04029a
 
-.field public static final popupTheme:I = 0x7f04029a
+.field public static final popupTheme:I = 0x7f04029b
 
-.field public static final popupWindowStyle:I = 0x7f04029b
+.field public static final popupWindowStyle:I = 0x7f04029c
 
-.field public static final preserveIconSpacing:I = 0x7f04029c
+.field public static final preserveIconSpacing:I = 0x7f04029d
 
-.field public static final pressedTranslationZ:I = 0x7f04029e
+.field public static final pressedTranslationZ:I = 0x7f04029f
 
-.field public static final progressBarPadding:I = 0x7f0402c8
+.field public static final progressBarPadding:I = 0x7f0402c9
 
-.field public static final progressBarStyle:I = 0x7f0402c9
+.field public static final progressBarStyle:I = 0x7f0402ca
 
-.field public static final queryBackground:I = 0x7f0402cc
+.field public static final queryBackground:I = 0x7f0402cd
 
-.field public static final queryHint:I = 0x7f0402cd
+.field public static final queryHint:I = 0x7f0402ce
 
-.field public static final radioButtonStyle:I = 0x7f0402ce
+.field public static final radioButtonStyle:I = 0x7f0402cf
 
-.field public static final ratingBarStyle:I = 0x7f0402d1
+.field public static final ratingBarStyle:I = 0x7f0402d2
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d3
+.field public static final ratingBarStyleSmall:I = 0x7f0402d4
 
-.field public static final reverseLayout:I = 0x7f0402d6
+.field public static final reverseLayout:I = 0x7f0402d7
 
-.field public static final rippleColor:I = 0x7f0402d7
+.field public static final rippleColor:I = 0x7f0402d8
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f5
+.field public static final scrimAnimationDuration:I = 0x7f0402f6
 
-.field public static final scrimBackground:I = 0x7f0402f6
+.field public static final scrimBackground:I = 0x7f0402f7
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
 
-.field public static final searchHintIcon:I = 0x7f0402f8
+.field public static final searchHintIcon:I = 0x7f0402f9
 
-.field public static final searchIcon:I = 0x7f0402f9
+.field public static final searchIcon:I = 0x7f0402fa
 
-.field public static final searchViewStyle:I = 0x7f0402fa
+.field public static final searchViewStyle:I = 0x7f0402fb
 
-.field public static final seekBarStyle:I = 0x7f0402fc
+.field public static final seekBarStyle:I = 0x7f0402fd
 
-.field public static final selectableItemBackground:I = 0x7f0402fd
+.field public static final selectableItemBackground:I = 0x7f0402fe
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
 
-.field public static final showAsAction:I = 0x7f040300
+.field public static final showAsAction:I = 0x7f040301
 
-.field public static final showDividers:I = 0x7f040304
+.field public static final showDividers:I = 0x7f040305
 
-.field public static final showMotionSpec:I = 0x7f040305
+.field public static final showMotionSpec:I = 0x7f040306
 
-.field public static final showText:I = 0x7f040306
+.field public static final showText:I = 0x7f040307
 
-.field public static final showTitle:I = 0x7f040307
+.field public static final showTitle:I = 0x7f040308
 
-.field public static final singleChoiceItemLayout:I = 0x7f040308
+.field public static final singleChoiceItemLayout:I = 0x7f040309
 
-.field public static final singleLine:I = 0x7f040309
+.field public static final singleLine:I = 0x7f04030a
 
-.field public static final singleSelection:I = 0x7f04030a
+.field public static final singleSelection:I = 0x7f04030b
 
-.field public static final snackbarButtonStyle:I = 0x7f04030b
+.field public static final snackbarButtonStyle:I = 0x7f04030c
 
-.field public static final snackbarStyle:I = 0x7f04030c
+.field public static final snackbarStyle:I = 0x7f04030d
 
-.field public static final spanCount:I = 0x7f04030d
+.field public static final spanCount:I = 0x7f04030e
 
-.field public static final spinBars:I = 0x7f04030e
+.field public static final spinBars:I = 0x7f04030f
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
+.field public static final spinnerDropDownItemStyle:I = 0x7f040310
 
-.field public static final spinnerStyle:I = 0x7f040310
+.field public static final spinnerStyle:I = 0x7f040311
 
-.field public static final splitTrack:I = 0x7f040311
+.field public static final splitTrack:I = 0x7f040312
 
-.field public static final srcCompat:I = 0x7f040312
+.field public static final srcCompat:I = 0x7f040313
 
-.field public static final stackFromEnd:I = 0x7f040313
+.field public static final stackFromEnd:I = 0x7f040314
 
-.field public static final state_above_anchor:I = 0x7f040314
+.field public static final state_above_anchor:I = 0x7f040315
 
-.field public static final state_collapsed:I = 0x7f040315
+.field public static final state_collapsed:I = 0x7f040316
 
-.field public static final state_collapsible:I = 0x7f040316
+.field public static final state_collapsible:I = 0x7f040317
 
-.field public static final state_liftable:I = 0x7f040317
+.field public static final state_liftable:I = 0x7f040318
 
-.field public static final state_lifted:I = 0x7f040318
+.field public static final state_lifted:I = 0x7f040319
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final statusBarScrim:I = 0x7f04031a
+.field public static final statusBarScrim:I = 0x7f04031b
 
-.field public static final strokeColor:I = 0x7f04031e
+.field public static final strokeColor:I = 0x7f04031f
 
-.field public static final strokeWidth:I = 0x7f04031f
+.field public static final strokeWidth:I = 0x7f040320
 
-.field public static final subMenuArrow:I = 0x7f040320
+.field public static final subMenuArrow:I = 0x7f040321
 
-.field public static final submitBackground:I = 0x7f040321
+.field public static final submitBackground:I = 0x7f040322
 
-.field public static final subtitle:I = 0x7f040322
+.field public static final subtitle:I = 0x7f040323
 
-.field public static final subtitleTextAppearance:I = 0x7f040323
+.field public static final subtitleTextAppearance:I = 0x7f040324
 
-.field public static final subtitleTextColor:I = 0x7f040324
+.field public static final subtitleTextColor:I = 0x7f040325
 
-.field public static final subtitleTextStyle:I = 0x7f040325
+.field public static final subtitleTextStyle:I = 0x7f040326
 
-.field public static final suggestionRowLayout:I = 0x7f040326
+.field public static final suggestionRowLayout:I = 0x7f040327
 
-.field public static final switchMinWidth:I = 0x7f040327
+.field public static final switchMinWidth:I = 0x7f040328
 
-.field public static final switchPadding:I = 0x7f040328
+.field public static final switchPadding:I = 0x7f040329
 
-.field public static final switchStyle:I = 0x7f040329
+.field public static final switchStyle:I = 0x7f04032a
 
-.field public static final switchTextAppearance:I = 0x7f04032a
+.field public static final switchTextAppearance:I = 0x7f04032b
 
-.field public static final tabBackground:I = 0x7f04032b
+.field public static final tabBackground:I = 0x7f04032c
 
-.field public static final tabContentStart:I = 0x7f04032c
+.field public static final tabContentStart:I = 0x7f04032d
 
-.field public static final tabGravity:I = 0x7f04032d
+.field public static final tabGravity:I = 0x7f04032e
 
-.field public static final tabIconTint:I = 0x7f04032e
+.field public static final tabIconTint:I = 0x7f04032f
 
-.field public static final tabIconTintMode:I = 0x7f04032f
+.field public static final tabIconTintMode:I = 0x7f040330
 
-.field public static final tabIndicator:I = 0x7f040330
+.field public static final tabIndicator:I = 0x7f040331
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
 
-.field public static final tabIndicatorColor:I = 0x7f040332
+.field public static final tabIndicatorColor:I = 0x7f040333
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040333
+.field public static final tabIndicatorFullWidth:I = 0x7f040334
 
-.field public static final tabIndicatorGravity:I = 0x7f040334
+.field public static final tabIndicatorGravity:I = 0x7f040335
 
-.field public static final tabIndicatorHeight:I = 0x7f040335
+.field public static final tabIndicatorHeight:I = 0x7f040336
 
-.field public static final tabInlineLabel:I = 0x7f040336
+.field public static final tabInlineLabel:I = 0x7f040337
 
-.field public static final tabMaxWidth:I = 0x7f040337
+.field public static final tabMaxWidth:I = 0x7f040338
 
-.field public static final tabMinWidth:I = 0x7f040338
+.field public static final tabMinWidth:I = 0x7f040339
 
-.field public static final tabMode:I = 0x7f040339
+.field public static final tabMode:I = 0x7f04033a
 
-.field public static final tabPadding:I = 0x7f04033a
+.field public static final tabPadding:I = 0x7f04033b
 
-.field public static final tabPaddingBottom:I = 0x7f04033b
+.field public static final tabPaddingBottom:I = 0x7f04033c
 
-.field public static final tabPaddingEnd:I = 0x7f04033c
+.field public static final tabPaddingEnd:I = 0x7f04033d
 
-.field public static final tabPaddingStart:I = 0x7f04033d
+.field public static final tabPaddingStart:I = 0x7f04033e
 
-.field public static final tabPaddingTop:I = 0x7f04033e
+.field public static final tabPaddingTop:I = 0x7f04033f
 
-.field public static final tabRippleColor:I = 0x7f04033f
+.field public static final tabRippleColor:I = 0x7f040340
 
-.field public static final tabSelectedTextColor:I = 0x7f040340
+.field public static final tabSelectedTextColor:I = 0x7f040341
 
-.field public static final tabStyle:I = 0x7f040341
+.field public static final tabStyle:I = 0x7f040342
 
-.field public static final tabTextAppearance:I = 0x7f040342
+.field public static final tabTextAppearance:I = 0x7f040343
 
-.field public static final tabTextColor:I = 0x7f040343
+.field public static final tabTextColor:I = 0x7f040344
 
-.field public static final tabUnboundedRipple:I = 0x7f040344
+.field public static final tabUnboundedRipple:I = 0x7f040345
 
-.field public static final textAllCaps:I = 0x7f040348
+.field public static final textAllCaps:I = 0x7f040349
 
-.field public static final textAppearanceBody1:I = 0x7f040349
+.field public static final textAppearanceBody1:I = 0x7f04034a
 
-.field public static final textAppearanceBody2:I = 0x7f04034a
+.field public static final textAppearanceBody2:I = 0x7f04034b
 
-.field public static final textAppearanceButton:I = 0x7f04034b
+.field public static final textAppearanceButton:I = 0x7f04034c
 
-.field public static final textAppearanceCaption:I = 0x7f04034c
+.field public static final textAppearanceCaption:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034d
+.field public static final textAppearanceHeadline1:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034e
+.field public static final textAppearanceHeadline2:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline3:I = 0x7f04034f
+.field public static final textAppearanceHeadline3:I = 0x7f040350
 
-.field public static final textAppearanceHeadline4:I = 0x7f040350
+.field public static final textAppearanceHeadline4:I = 0x7f040351
 
-.field public static final textAppearanceHeadline5:I = 0x7f040351
+.field public static final textAppearanceHeadline5:I = 0x7f040352
 
-.field public static final textAppearanceHeadline6:I = 0x7f040352
+.field public static final textAppearanceHeadline6:I = 0x7f040353
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
 
-.field public static final textAppearanceListItem:I = 0x7f040354
+.field public static final textAppearanceListItem:I = 0x7f040355
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040355
+.field public static final textAppearanceListItemSecondary:I = 0x7f040356
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040356
+.field public static final textAppearanceListItemSmall:I = 0x7f040357
 
-.field public static final textAppearanceOverline:I = 0x7f040357
+.field public static final textAppearanceOverline:I = 0x7f040358
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035c
+.field public static final textAppearanceSubtitle1:I = 0x7f04035d
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035d
+.field public static final textAppearanceSubtitle2:I = 0x7f04035e
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035e
+.field public static final textColorAlertDialogListItem:I = 0x7f04035f
 
-.field public static final textColorSearchUrl:I = 0x7f04035f
+.field public static final textColorSearchUrl:I = 0x7f040360
 
-.field public static final textEndPadding:I = 0x7f040360
+.field public static final textEndPadding:I = 0x7f040361
 
-.field public static final textInputStyle:I = 0x7f040361
+.field public static final textInputStyle:I = 0x7f040362
 
-.field public static final textStartPadding:I = 0x7f040362
+.field public static final textStartPadding:I = 0x7f040363
 
-.field public static final theme:I = 0x7f040364
+.field public static final theme:I = 0x7f040365
 
-.field public static final thickness:I = 0x7f0403b5
+.field public static final thickness:I = 0x7f0403b6
 
-.field public static final thumbTextPadding:I = 0x7f0403b6
+.field public static final thumbTextPadding:I = 0x7f0403b7
 
-.field public static final thumbTint:I = 0x7f0403b7
+.field public static final thumbTint:I = 0x7f0403b8
 
-.field public static final thumbTintMode:I = 0x7f0403b8
+.field public static final thumbTintMode:I = 0x7f0403b9
 
-.field public static final tickMark:I = 0x7f0403b9
+.field public static final tickMark:I = 0x7f0403ba
 
-.field public static final tickMarkTint:I = 0x7f0403ba
+.field public static final tickMarkTint:I = 0x7f0403bb
 
-.field public static final tickMarkTintMode:I = 0x7f0403bb
+.field public static final tickMarkTintMode:I = 0x7f0403bc
 
-.field public static final tint:I = 0x7f0403bc
+.field public static final tint:I = 0x7f0403bd
 
-.field public static final tintMode:I = 0x7f0403bd
+.field public static final tintMode:I = 0x7f0403be
 
-.field public static final title:I = 0x7f0403be
+.field public static final title:I = 0x7f0403bf
 
-.field public static final titleEnabled:I = 0x7f0403bf
+.field public static final titleEnabled:I = 0x7f0403c0
 
-.field public static final titleMargin:I = 0x7f0403c0
+.field public static final titleMargin:I = 0x7f0403c1
 
-.field public static final titleMarginBottom:I = 0x7f0403c1
+.field public static final titleMarginBottom:I = 0x7f0403c2
 
-.field public static final titleMarginEnd:I = 0x7f0403c2
+.field public static final titleMarginEnd:I = 0x7f0403c3
 
-.field public static final titleMarginStart:I = 0x7f0403c3
+.field public static final titleMarginStart:I = 0x7f0403c4
 
-.field public static final titleMarginTop:I = 0x7f0403c4
+.field public static final titleMarginTop:I = 0x7f0403c5
 
-.field public static final titleMargins:I = 0x7f0403c5
+.field public static final titleMargins:I = 0x7f0403c6
 
-.field public static final titleTextAppearance:I = 0x7f0403c6
+.field public static final titleTextAppearance:I = 0x7f0403c7
 
-.field public static final titleTextColor:I = 0x7f0403c7
+.field public static final titleTextColor:I = 0x7f0403c8
 
-.field public static final titleTextStyle:I = 0x7f0403c8
+.field public static final titleTextStyle:I = 0x7f0403c9
 
-.field public static final toolbarId:I = 0x7f0403c9
+.field public static final toolbarId:I = 0x7f0403ca
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403ca
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
-.field public static final toolbarStyle:I = 0x7f0403cb
+.field public static final toolbarStyle:I = 0x7f0403cc
 
-.field public static final tooltipForegroundColor:I = 0x7f0403cc
+.field public static final tooltipForegroundColor:I = 0x7f0403cd
 
-.field public static final tooltipFrameBackground:I = 0x7f0403cd
+.field public static final tooltipFrameBackground:I = 0x7f0403ce
 
-.field public static final tooltipText:I = 0x7f0403ce
+.field public static final tooltipText:I = 0x7f0403cf
 
-.field public static final track:I = 0x7f0403cf
+.field public static final track:I = 0x7f0403d0
 
-.field public static final trackTint:I = 0x7f0403d0
+.field public static final trackTint:I = 0x7f0403d1
 
-.field public static final trackTintMode:I = 0x7f0403d1
+.field public static final trackTintMode:I = 0x7f0403d2
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
-.field public static final useCompatPadding:I = 0x7f0403e6
+.field public static final useCompatPadding:I = 0x7f0403e7
 
-.field public static final viewInflaterClass:I = 0x7f0403ed
+.field public static final viewInflaterClass:I = 0x7f0403ee
 
-.field public static final voiceIcon:I = 0x7f0403ee
+.field public static final voiceIcon:I = 0x7f0403ef
 
-.field public static final windowActionBar:I = 0x7f0403f0
+.field public static final windowActionBar:I = 0x7f0403f1
 
-.field public static final windowActionBarOverlay:I = 0x7f0403f1
+.field public static final windowActionBarOverlay:I = 0x7f0403f2
 
-.field public static final windowActionModeOverlay:I = 0x7f0403f2
+.field public static final windowActionModeOverlay:I = 0x7f0403f3
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403f3
+.field public static final windowFixedHeightMajor:I = 0x7f0403f4
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403f4
+.field public static final windowFixedHeightMinor:I = 0x7f0403f5
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403f5
+.field public static final windowFixedWidthMajor:I = 0x7f0403f6
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403f6
+.field public static final windowFixedWidthMinor:I = 0x7f0403f7
 
-.field public static final windowMinWidthMajor:I = 0x7f0403f7
+.field public static final windowMinWidthMajor:I = 0x7f0403f8
 
-.field public static final windowMinWidthMinor:I = 0x7f0403f8
+.field public static final windowMinWidthMinor:I = 0x7f0403f9
 
-.field public static final windowNoTitle:I = 0x7f0403f9
+.field public static final windowNoTitle:I = 0x7f0403fa
 
 
 # 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 27c6ff54f5..605f37b77e 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 = 0x7f06005b
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005c
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005d
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005e
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005f
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060060
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060061
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060066
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060067
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006c
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006d
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a7
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600aa
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ac
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
 
 # 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 6e866a583a..a9a22b08eb 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 = 0x7f0800b4
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b5
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b6
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b7
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b8
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b9
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
 
-.field public static final mtrl_snackbar_background:I = 0x7f080461
+.field public static final mtrl_snackbar_background:I = 0x7f08046f
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080462
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
 
-.field public static final navigation_empty_icon:I = 0x7f080463
+.field public static final navigation_empty_icon:I = 0x7f080471
 
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
 
 # 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 172dc94c00..61c30d3444 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,11 +57,11 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.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
 
@@ -73,251 +73,251 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final container:I = 0x7f0a0230
+.field public static final container:I = 0x7f0a0233
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a023a
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final design_bottom_sheet:I = 0x7f0a0256
+.field public static final design_bottom_sheet:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area:I = 0x7f0a0257
+.field public static final design_menu_item_action_area:I = 0x7f0a025a
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0258
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
 
-.field public static final design_menu_item_text:I = 0x7f0a0259
+.field public static final design_menu_item_text:I = 0x7f0a025c
 
-.field public static final design_navigation_view:I = 0x7f0a025a
+.field public static final design_navigation_view:I = 0x7f0a025d
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final fill:I = 0x7f0a02e0
+.field public static final fill:I = 0x7f0a02e4
 
-.field public static final filled:I = 0x7f0a02e3
+.field public static final filled:I = 0x7f0a02e7
 
-.field public static final fixed:I = 0x7f0a02e9
+.field public static final fixed:I = 0x7f0a02ed
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final ghost_view:I = 0x7f0a0312
+.field public static final ghost_view:I = 0x7f0a0316
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0405
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
 
-.field public static final labeled:I = 0x7f0a040c
+.field public static final labeled:I = 0x7f0a0414
 
-.field public static final largeLabel:I = 0x7f0a040d
+.field public static final largeLabel:I = 0x7f0a0415
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final masked:I = 0x7f0a0437
+.field public static final masked:I = 0x7f0a043f
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final mini:I = 0x7f0a0480
+.field public static final mini:I = 0x7f0a048a
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0481
+.field public static final mtrl_child_content_container:I = 0x7f0a048b
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0482
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final navigation_header_container:I = 0x7f0a0485
+.field public static final navigation_header_container:I = 0x7f0a048f
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final outline:I = 0x7f0a04c7
+.field public static final outline:I = 0x7f0a04d1
 
-.field public static final parallax:I = 0x7f0a04d6
+.field public static final parallax:I = 0x7f0a04e0
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final parent_matrix:I = 0x7f0a04d9
+.field public static final parent_matrix:I = 0x7f0a04e3
 
-.field public static final pin:I = 0x7f0a0515
+.field public static final pin:I = 0x7f0a0520
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final save_image_matrix:I = 0x7f0a05a3
+.field public static final save_image_matrix:I = 0x7f0a05b8
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05a4
+.field public static final save_non_transition_alpha:I = 0x7f0a05b9
 
-.field public static final save_scale_type:I = 0x7f0a05a5
+.field public static final save_scale_type:I = 0x7f0a05ba
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final scrollable:I = 0x7f0a05ad
+.field public static final scrollable:I = 0x7f0a05c2
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final selected:I = 0x7f0a05cb
+.field public static final selected:I = 0x7f0a05e0
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final smallLabel:I = 0x7f0a0708
+.field public static final smallLabel:I = 0x7f0a071d
 
-.field public static final snackbar_action:I = 0x7f0a0709
+.field public static final snackbar_action:I = 0x7f0a071e
 
-.field public static final snackbar_text:I = 0x7f0a070a
+.field public static final snackbar_text:I = 0x7f0a071f
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final stretch:I = 0x7f0a0730
+.field public static final stretch:I = 0x7f0a0754
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_input_password_toggle:I = 0x7f0a0751
+.field public static final text_input_password_toggle:I = 0x7f0a0775
 
-.field public static final textinput_counter:I = 0x7f0a0754
+.field public static final textinput_counter:I = 0x7f0a0778
 
-.field public static final textinput_error:I = 0x7f0a0755
+.field public static final textinput_error:I = 0x7f0a0779
 
-.field public static final textinput_helper_text:I = 0x7f0a0756
+.field public static final textinput_helper_text:I = 0x7f0a077a
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final touch_outside:I = 0x7f0a0764
+.field public static final touch_outside:I = 0x7f0a0788
 
-.field public static final transition_current_scene:I = 0x7f0a0765
+.field public static final transition_current_scene:I = 0x7f0a0789
 
-.field public static final transition_layout_save:I = 0x7f0a0766
+.field public static final transition_layout_save:I = 0x7f0a078a
 
-.field public static final transition_position:I = 0x7f0a0767
+.field public static final transition_position:I = 0x7f0a078b
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0768
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
 
-.field public static final transition_transform:I = 0x7f0a0769
+.field public static final transition_transform:I = 0x7f0a078d
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final unlabeled:I = 0x7f0a0776
+.field public static final unlabeled:I = 0x7f0a079a
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_offset_helper:I = 0x7f0a07ff
+.field public static final view_offset_helper:I = 0x7f0a082e
 
-.field public static final visible:I = 0x7f0a0802
+.field public static final visible:I = 0x7f0a0831
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
 
 # 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 d915fceddd..7ebf7c84b4 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
@@ -71,57 +71,57 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final design_bottom_navigation_item:I = 0x7f0d0023
+.field public static final design_bottom_navigation_item:I = 0x7f0d0024
 
-.field public static final design_bottom_sheet_dialog:I = 0x7f0d0024
+.field public static final design_bottom_sheet_dialog:I = 0x7f0d0025
 
-.field public static final design_layout_snackbar:I = 0x7f0d0025
+.field public static final design_layout_snackbar:I = 0x7f0d0026
 
-.field public static final design_layout_snackbar_include:I = 0x7f0d0026
+.field public static final design_layout_snackbar_include:I = 0x7f0d0027
 
-.field public static final design_layout_tab_icon:I = 0x7f0d0027
+.field public static final design_layout_tab_icon:I = 0x7f0d0028
 
-.field public static final design_layout_tab_text:I = 0x7f0d0028
+.field public static final design_layout_tab_text:I = 0x7f0d0029
 
-.field public static final design_menu_item_action_area:I = 0x7f0d0029
+.field public static final design_menu_item_action_area:I = 0x7f0d002a
 
-.field public static final design_navigation_item:I = 0x7f0d002a
+.field public static final design_navigation_item:I = 0x7f0d002b
 
-.field public static final design_navigation_item_header:I = 0x7f0d002b
+.field public static final design_navigation_item_header:I = 0x7f0d002c
 
-.field public static final design_navigation_item_separator:I = 0x7f0d002c
+.field public static final design_navigation_item_separator:I = 0x7f0d002d
 
-.field public static final design_navigation_item_subheader:I = 0x7f0d002d
+.field public static final design_navigation_item_subheader:I = 0x7f0d002e
 
-.field public static final design_navigation_menu:I = 0x7f0d002e
+.field public static final design_navigation_menu:I = 0x7f0d002f
 
-.field public static final design_navigation_menu_item:I = 0x7f0d002f
+.field public static final design_navigation_menu_item:I = 0x7f0d0030
 
-.field public static final design_text_input_password_icon:I = 0x7f0d0030
+.field public static final design_text_input_password_icon:I = 0x7f0d0031
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0043
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0044
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
 
 # 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 f3e95341dd..8fb423dd27 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
@@ -95,33 +95,33 @@
 
 .field public static final appbar_scrolling_view_behavior:I = 0x7f1200ed
 
-.field public static final bottom_sheet_behavior:I = 0x7f120340
+.field public static final bottom_sheet_behavior:I = 0x7f120365
 
-.field public static final character_counter_content_description:I = 0x7f1203cb
+.field public static final character_counter_content_description:I = 0x7f1203f0
 
-.field public static final character_counter_pattern:I = 0x7f1203cc
+.field public static final character_counter_pattern:I = 0x7f1203f1
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120933
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd8
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
 
-.field public static final password_toggle_content_description:I = 0x7f120d44
+.field public static final password_toggle_content_description:I = 0x7f120d77
 
-.field public static final path_password_eye:I = 0x7f120d47
+.field public static final path_password_eye:I = 0x7f120d7a
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d48
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d49
+.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
 
-.field public static final path_password_strike_through:I = 0x7f120d4a
+.field public static final path_password_strike_through:I = 0x7f120d7d
 
-.field public static final search_menu_title:I = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
 
 # 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 cdf3d8cd2e..99249cca00 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, 0x7f040314
+    const v5, 0x7f040315
 
     aput v5, v2, v3
 
@@ -1920,15 +1920,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -1937,8 +1937,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -1952,11 +1952,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -1966,15 +1966,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040258
+        0x7f040259
     .end array-data
 
     :array_5
     .array-data 4
-        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
+        0x7f040319
     .end array-data
 
     :array_6
@@ -1986,17 +1986,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_9
@@ -2021,8 +2021,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_b
@@ -2098,47 +2098,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -2148,6 +2147,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_c
@@ -2171,7 +2171,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_e
@@ -2231,10 +2231,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d7
-        0x7f040305
-        0x7f040360
-        0x7f040362
+        0x7f0402d8
+        0x7f040306
+        0x7f040361
+        0x7f040363
     .end array-data
 
     :array_11
@@ -2243,8 +2243,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
-        0x7f040309
         0x7f04030a
+        0x7f04030b
     .end array-data
 
     :array_12
@@ -2259,12 +2259,12 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f5
-        0x7f0402f7
-        0x7f04031a
-        0x7f0403be
+        0x7f0402f6
+        0x7f0402f8
+        0x7f04031b
         0x7f0403bf
-        0x7f0403c9
+        0x7f0403c0
+        0x7f0403ca
     .end array-data
 
     :array_13
@@ -2290,7 +2290,7 @@
     :array_16
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_17
@@ -2318,8 +2318,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_1a
@@ -2332,11 +2332,11 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027b
-        0x7f04029e
-        0x7f0402d7
-        0x7f040305
-        0x7f0403e6
+        0x7f04027c
+        0x7f04029f
+        0x7f0402d8
+        0x7f040306
+        0x7f0403e7
     .end array-data
 
     :array_1b
@@ -2344,7 +2344,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025a
+        0x7f04025b
     .end array-data
 
     :array_1c
@@ -2368,7 +2368,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_1e
@@ -2387,8 +2387,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_20
@@ -2420,15 +2420,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d7
-        0x7f04031e
+        0x7f0402d8
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_23
     .array-data 4
-        0x7f04031e
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_24
@@ -2445,13 +2445,12 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
-        0x7f040277
         0x7f040278
-        0x7f040283
-        0x7f0402f6
-        0x7f04030b
-        0x7f040341
-        0x7f040349
+        0x7f040279
+        0x7f040284
+        0x7f0402f7
+        0x7f04030c
+        0x7f040342
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -2461,10 +2460,11 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040357
-        0x7f04035c
+        0x7f040353
+        0x7f040358
         0x7f04035d
-        0x7f040361
+        0x7f04035e
+        0x7f040362
     .end array-data
 
     :array_25
@@ -2499,9 +2499,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_27
@@ -2513,8 +2513,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_28
@@ -2530,20 +2530,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_29
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_2a
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_2b
@@ -2556,9 +2556,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .end array-data
 
     :array_2c
@@ -2573,26 +2573,26 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_2d
     .array-data 4
-        0x7f04030b
         0x7f04030c
+        0x7f04030d
     .end array-data
 
     :array_2e
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f040279
+        0x7f04027a
     .end array-data
 
     :array_2f
@@ -2601,7 +2601,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_30
@@ -2609,17 +2609,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_31
@@ -2631,7 +2631,6 @@
 
     :array_32
     .array-data 4
-        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -2653,9 +2652,10 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040342
+        0x7f040341
         0x7f040343
         0x7f040344
+        0x7f040345
     .end array-data
 
     :array_33
@@ -2672,7 +2672,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_34
@@ -2700,11 +2700,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
-        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
+        0x7f040297
     .end array-data
 
     :array_35
@@ -2727,17 +2727,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -2745,15 +2744,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_37
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 458f6d2673..6d65b65fd5 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 aMm:Lcom/google/android/material/appbar/AppBarLayout;
+.field final synthetic aMv: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;->aMm:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aMv: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;->aMm:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$1;->aMv: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 a67ad603b5..09bbed97b3 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 aMn:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field final synthetic aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field final synthetic aMo:Lcom/google/android/material/appbar/AppBarLayout;
+.field final synthetic aMx:Lcom/google/android/material/appbar/AppBarLayout;
 
-.field final synthetic aMp:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+.field final synthetic aMy: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;->aMp:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iput-object p1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMy:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMn:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMo:Lcom/google/android/material/appbar/AppBarLayout;
+    iput-object p3, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMx: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;->aMp:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
+    iget-object v0, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMy:Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMn:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMw:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMo:Lcom/google/android/material/appbar/AppBarLayout;
+    iget-object v2, p0, Lcom/google/android/material/appbar/AppBarLayout$BaseBehavior$1;->aMx: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 584a388d01..6f1e740db1 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 aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$1;->aMz: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 b606ecbacd..4b4893c6f9 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 aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$2;->aMz: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 fa32b8cb0f..05a5784f57 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 aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+.field final synthetic aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iput-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v3, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v6, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v0, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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;->aMq:Lcom/google/android/material/appbar/CollapsingToolbarLayout;
+    iget-object p1, p0, Lcom/google/android/material/appbar/CollapsingToolbarLayout$a;->aMz: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 ce5b098a84..f8abfd772d 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;->aMu:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aMD:I
 
     sub-int/2addr v2, v0
 
@@ -1618,7 +1618,7 @@
 
     move-result-object p2
 
-    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->zf()V
+    invoke-virtual {p2}, Lcom/google/android/material/appbar/d;->zi()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 97f4db3389..3051f8f73c 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 aMr:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+.field private final aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-.field private final aMs:Landroid/view/View;
+.field private final aMB:Landroid/view/View;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TV;"
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field final synthetic aMt:Lcom/google/android/material/appbar/a;
+.field final synthetic aMC: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;->aMt:Lcom/google/android/material/appbar/a;
+    iput-object p1, p0, Lcom/google/android/material/appbar/a$a;->aMC: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;->aMr:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iput-object p2, p0, Lcom/google/android/material/appbar/a$a;->aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iput-object p3, p0, Lcom/google/android/material/appbar/a$a;->aMs:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/appbar/a$a;->aMB: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;->aMs:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMB:Landroid/view/View;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMt:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMC: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;->aMt:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMC: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;->aMt:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMC:Lcom/google/android/material/appbar/a;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMr:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMs:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMB: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;->aMs:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMB: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;->aMt:Lcom/google/android/material/appbar/a;
+    iget-object v0, p0, Lcom/google/android/material/appbar/a$a;->aMC:Lcom/google/android/material/appbar/a;
 
-    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMr:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+    iget-object v1, p0, Lcom/google/android/material/appbar/a$a;->aMA:Landroidx/coordinatorlayout/widget/CoordinatorLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMs:Landroid/view/View;
+    iget-object v2, p0, Lcom/google/android/material/appbar/a$a;->aMB: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 c9a1a5bc2e..9611c96ddd 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;->aMx:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aMG:I
 
     return v0
 
@@ -78,7 +78,7 @@
 
     if-eqz v0, :cond_0
 
-    iget v0, v0, Lcom/google/android/material/appbar/d;->aMw:I
+    iget v0, v0, Lcom/google/android/material/appbar/d;->aMF: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;->zf()V
+    invoke-virtual {p1}, Lcom/google/android/material/appbar/d;->zi()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 8bd0115c46..6b62ea4bf0 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 aMu:I
+.field aMD:I
 
-.field private aMv:I
+.field private aME:I
 
-.field aMw:I
+.field aMF:I
 
-.field aMx:I
+.field aMG:I
 
 .field private final view:Landroid/view/View;
 
@@ -26,18 +26,18 @@
     return-void
 .end method
 
-.method private zg()V
+.method private zj()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;->aMw:I
+    iget v1, p0, Lcom/google/android/material/appbar/d;->aMF:I
 
     invoke-virtual {v0}, Landroid/view/View;->getTop()I
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/appbar/d;->aMu:I
+    iget v3, p0, Lcom/google/android/material/appbar/d;->aMD: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;->aMx:I
+    iget v1, p0, Lcom/google/android/material/appbar/d;->aMG:I
 
     invoke-virtual {v0}, Landroid/view/View;->getLeft()I
 
     move-result v2
 
-    iget v3, p0, Lcom/google/android/material/appbar/d;->aMv:I
+    iget v3, p0, Lcom/google/android/material/appbar/d;->aME:I
 
     sub-int/2addr v2, v3
 
@@ -69,13 +69,13 @@
 .method public final setLeftAndRightOffset(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/appbar/d;->aMx:I
+    iget v0, p0, Lcom/google/android/material/appbar/d;->aMG:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/appbar/d;->aMx:I
+    iput p1, p0, Lcom/google/android/material/appbar/d;->aMG:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zg()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zj()V
 
     const/4 p1, 0x1
 
@@ -90,13 +90,13 @@
 .method public final setTopAndBottomOffset(I)Z
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/appbar/d;->aMw:I
+    iget v0, p0, Lcom/google/android/material/appbar/d;->aMF:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/appbar/d;->aMw:I
+    iput p1, p0, Lcom/google/android/material/appbar/d;->aMF:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zg()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zj()V
 
     const/4 p1, 0x1
 
@@ -108,7 +108,7 @@
     return p1
 .end method
 
-.method public final zf()V
+.method public final zi()V
     .locals 1
 
     iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
@@ -117,7 +117,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/appbar/d;->aMu:I
+    iput v0, p0, Lcom/google/android/material/appbar/d;->aMD:I
 
     iget-object v0, p0, Lcom/google/android/material/appbar/d;->view:Landroid/view/View;
 
@@ -125,9 +125,9 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/appbar/d;->aMv:I
+    iput v0, p0, Lcom/google/android/material/appbar/d;->aME:I
 
-    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zg()V
+    invoke-direct {p0}, Lcom/google/android/material/appbar/d;->zj()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 5c033f81c3..cefcce6193 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 aMy:[I
+.field private static final aMH:[I
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     aput v2, v0, v1
 
-    sput-object v0, Lcom/google/android/material/appbar/e;->aMy:[I
+    sput-object v0, Lcom/google/android/material/appbar/e;->aMH:[I
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 
     move-result-object v6
 
-    sget-object v2, Lcom/google/android/material/appbar/e;->aMy:[I
+    sget-object v2, Lcom/google/android/material/appbar/e;->aMH:[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 69b8b280fe..c43440dcbb 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 aMz:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+.field final synthetic aMI: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;->aMz:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aMI: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;->aMz:Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior;
+    iget-object p1, p0, Lcom/google/android/material/behavior/HideBottomViewOnScrollBehavior$1;->aMI: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 85064f1216..4a533d36b1 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 aMA:I
+.field private aMJ:I
 
-.field final synthetic aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.field final synthetic aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMA:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMA:I
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ:I
 
     goto :goto_2
 
     :cond_1
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMA:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMA:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMA:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMA:I
+    iget p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ:I
 
     goto :goto_2
 
     :cond_4
-    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMA:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMA:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMA:I
+    iput p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMA:I
+    iget p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p5, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMA:I
+    iget p4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v4, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMA:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMA:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ: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;->aMA:I
+    iget v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMJ:I
 
     :goto_4
-    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object p2, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$1;->aMK: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 9c4e2230a8..10c0fe828f 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 aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+.field final synthetic aMK:Lcom/google/android/material/behavior/SwipeDismissBehavior;
 
-.field private final aMC:Z
+.field private final aML: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iput-object p1, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMK: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;->aMC:Z
+    iput-boolean p3, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aML: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMK: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;->aMC:Z
+    iget-boolean v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aML:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMK: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;->aMB:Lcom/google/android/material/behavior/SwipeDismissBehavior;
+    iget-object v0, p0, Lcom/google/android/material/behavior/SwipeDismissBehavior$a;->aMK: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 98075d40f6..21b0e58ccb 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$1;->aMM: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 2c9754d3d0..3763cd16cf 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$2;->aMM: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 7f70100e1f..25b7252311 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$3;->aMM: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 4c6abdb35d..39d4871ab1 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-.field final synthetic aME:Landroidx/appcompat/widget/ActionMenuView;
+.field final synthetic aMN:Landroidx/appcompat/widget/ActionMenuView;
 
-.field final synthetic aMF:I
+.field final synthetic aMO:I
 
-.field final synthetic aMG:Z
+.field final synthetic aMP: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aME:Landroidx/appcompat/widget/ActionMenuView;
+    iput-object p2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMN:Landroidx/appcompat/widget/ActionMenuView;
 
-    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMF:I
+    iput p3, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMO:I
 
-    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMG:Z
+    iput-boolean p4, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMP: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMM:Lcom/google/android/material/bottomappbar/BottomAppBar;
 
-    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aME:Landroidx/appcompat/widget/ActionMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMN:Landroidx/appcompat/widget/ActionMenuView;
 
-    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMF:I
+    iget v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMO:I
 
-    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMG:Z
+    iget-boolean v2, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$4;->aMP: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 ea7630d983..9c70f0a1de 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$5;->aMM: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 1d96bbfacc..8a19664490 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v0, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$6;->aMM: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 0777f11616..25f02bc447 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 aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+.field final synthetic aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iput-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object p1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMM: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;->aMD:Lcom/google/android/material/bottomappbar/BottomAppBar;
+    iget-object v1, p0, Lcom/google/android/material/bottomappbar/BottomAppBar$7;->aMM: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 3217daa57a..7a38e1dba4 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 aMH:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+.field final synthetic aMQ: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;->aMH:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aMQ: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;->aMH:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iget-object v0, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aMQ: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;->aMH:Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationMenuView$1;->aMQ: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 decb433671..98c88b2f27 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 aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+.field final synthetic aMR: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;->aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMR: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;->aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMR: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;->aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object v1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMR: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;->aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMR: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;->aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMR: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;->aMI:Lcom/google/android/material/bottomnavigation/BottomNavigationView;
+    iget-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$1;->aMR: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 9cec8d7784..dd701f3ebb 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 aMJ:Landroid/os/Bundle;
+.field aMS:Landroid/os/Bundle;
 
 
 # direct methods
@@ -52,7 +52,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMJ:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMS: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;->aMJ:Landroid/os/Bundle;
+    iget-object p2, p0, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMS: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 33932bee31..913893ae28 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;->aMJ:Landroid/os/Bundle;
+    iget-object p1, p1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMS: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;->aMJ:Landroid/os/Bundle;
+    iput-object v0, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMS: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;->aMJ:Landroid/os/Bundle;
+    iget-object v2, v1, Lcom/google/android/material/bottomnavigation/BottomNavigationView$SavedState;->aMS: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 34d57d65cc..a3ef427658 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 aMK:Landroid/view/View;
+.field final synthetic aMT:Landroid/view/View;
 
-.field final synthetic aML:I
+.field final synthetic aMU:I
 
-.field final synthetic aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMK:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMT:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aML:I
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMU: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMK:Landroid/view/View;
+    iget-object v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMT:Landroid/view/View;
 
-    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aML:I
+    iget v2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$1;->aMU: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 b535d1304c..1e620602a0 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 aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v5, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v6, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object p2, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$2;->aMV: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 da2d276005..8faf7deb2c 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 aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+.field final synthetic aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-.field private final aMN:I
+.field private final aMW: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMV: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;->aMN:I
+    iput p3, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMW: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMV: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;->aMM:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMV:Lcom/google/android/material/bottomsheet/BottomSheetBehavior;
 
-    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMN:I
+    iget v1, p0, Lcom/google/android/material/bottomsheet/BottomSheetBehavior$a;->aMW: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 e1651cd934..d79c52a149 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 aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$1;->aMX: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 9527b1f8e8..4353f1e21c 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 aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object v0, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$2;->aMX: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 c437f5b10d..6bde2d23c2 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 aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$3;->aMX: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 854cc61a2c..31dbd02941 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 aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+.field final synthetic aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iput-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aMX: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;->aMO:Lcom/google/android/material/bottomsheet/BottomSheetDialog;
+    iget-object p1, p0, Lcom/google/android/material/bottomsheet/BottomSheetDialog$4;->aMX: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 1cef2ee599..42385c6d50 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
@@ -161,7 +161,7 @@
 
     move-result v1
 
-    iput v1, p2, Lcom/google/android/material/button/b;->aMR:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aNa:I
 
     sget v1, Lcom/google/android/material/R$styleable;->MaterialButton_android_insetRight:I
 
@@ -169,7 +169,7 @@
 
     move-result v1
 
-    iput v1, p2, Lcom/google/android/material/button/b;->aMS:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aNb:I
 
     sget v1, Lcom/google/android/material/R$styleable;->MaterialButton_android_insetTop:I
 
@@ -177,7 +177,7 @@
 
     move-result v1
 
-    iput v1, p2, Lcom/google/android/material/button/b;->aMT:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aNc:I
 
     sget v1, Lcom/google/android/material/R$styleable;->MaterialButton_android_insetBottom:I
 
@@ -185,7 +185,7 @@
 
     move-result v1
 
-    iput v1, p2, Lcom/google/android/material/button/b;->aMU:I
+    iput v1, p2, Lcom/google/android/material/button/b;->aNd:I
 
     sget v1, Lcom/google/android/material/R$styleable;->MaterialButton_cornerRadius:I
 
@@ -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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMV:Landroid/content/res/ColorStateList;
+    iput-object v1, p2, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
 
-    iget-object v1, p2, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMW:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aNf: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;->aMW:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aNf: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;->aMW:Landroid/graphics/Paint;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aNf:Landroid/graphics/Paint;
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aMV:Landroid/content/res/ColorStateList;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
 
     if-eqz v2, :cond_0
 
-    iget-object v2, p2, Lcom/google/android/material/button/b;->aMV:Landroid/content/res/ColorStateList;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
 
-    iget-object v3, p2, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v2, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v4, p2, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v5, p2, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
 
-    sget-boolean v7, Lcom/google/android/material/button/b;->aMP:Z
+    sget-boolean v7, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/android/material/button/b;->zi()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p2}, Lcom/google/android/material/button/b;->zl()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;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNg: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;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNg: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;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNg: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;->aMY:Landroid/graphics/drawable/Drawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNh: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;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNh: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;->aMZ:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v7, p2, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v7, p2, Lcom/google/android/material/button/b;->aMZ:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNi: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;->aMZ:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v7, p2, Lcom/google/android/material/button/b;->aNi: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;->aMZ:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aNi: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;->aNa:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p2, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
 
-    iget-object p3, p2, Lcom/google/android/material/button/b;->aNa:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
 
     iget-object v7, p2, Lcom/google/android/material/button/b;->rippleColor:Landroid/content/res/ColorStateList;
 
@@ -423,11 +423,11 @@
 
     new-array v7, v7, [Landroid/graphics/drawable/Drawable;
 
-    iget-object v8, p2, Lcom/google/android/material/button/b;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object v8, p2, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
 
     aput-object v8, v7, v6
 
-    iget-object v6, p2, Lcom/google/android/material/button/b;->aNa:Landroid/graphics/drawable/Drawable;
+    iget-object v6, p2, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
 
     aput-object v6, v7, v0
 
@@ -440,21 +440,21 @@
     :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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object p3, p2, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
 
-    iget v0, p2, Lcom/google/android/material/button/b;->aMR:I
+    iget v0, p2, Lcom/google/android/material/button/b;->aNa:I
 
     add-int/2addr v1, v0
 
-    iget v0, p2, Lcom/google/android/material/button/b;->aMT:I
+    iget v0, p2, Lcom/google/android/material/button/b;->aNc:I
 
     add-int/2addr v2, v0
 
-    iget v0, p2, Lcom/google/android/material/button/b;->aMS:I
+    iget v0, p2, Lcom/google/android/material/button/b;->aNb:I
 
     add-int/2addr v3, v0
 
-    iget p2, p2, Lcom/google/android/material/button/b;->aMU:I
+    iget p2, p2, Lcom/google/android/material/button/b;->aNd:I
 
     add-int/2addr v4, p2
 
@@ -497,7 +497,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, v0, Lcom/google/android/material/button/b;->aNe:Z
+    iget-boolean v0, v0, Lcom/google/android/material/button/b;->aNn: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;->aMV:Landroid/content/res/ColorStateList;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNe: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;->aMV:Landroid/content/res/ColorStateList;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNe: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;->eh:Landroid/graphics/Rect;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
 
-    iget-object v2, v0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v2, v0, Lcom/google/android/material/button/b;->aMZ: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;->eh:Landroid/graphics/Rect;
+    iget-object v2, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
 
     iget v2, v2, Landroid/graphics/Rect;->left:I
 
@@ -848,13 +848,13 @@
 
     add-float/2addr v2, v3
 
-    iget v3, v0, Lcom/google/android/material/button/b;->aMR:I
+    iget v3, v0, Lcom/google/android/material/button/b;->aNa:I
 
     int-to-float v3, v3
 
     add-float/2addr v2, v3
 
-    iget-object v3, v0, Lcom/google/android/material/button/b;->eh:Landroid/graphics/Rect;
+    iget-object v3, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
 
     iget v3, v3, Landroid/graphics/Rect;->top:I
 
@@ -868,13 +868,13 @@
 
     add-float/2addr v3, v5
 
-    iget v5, v0, Lcom/google/android/material/button/b;->aMT:I
+    iget v5, v0, Lcom/google/android/material/button/b;->aNc:I
 
     int-to-float v5, v5
 
     add-float/2addr v3, v5
 
-    iget-object v5, v0, Lcom/google/android/material/button/b;->eh:Landroid/graphics/Rect;
+    iget-object v5, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
 
     iget v5, v5, Landroid/graphics/Rect;->right:I
 
@@ -888,13 +888,13 @@
 
     sub-float/2addr v5, v6
 
-    iget v6, v0, Lcom/google/android/material/button/b;->aMS:I
+    iget v6, v0, Lcom/google/android/material/button/b;->aNb:I
 
     int-to-float v6, v6
 
     sub-float/2addr v5, v6
 
-    iget-object v6, v0, Lcom/google/android/material/button/b;->eh:Landroid/graphics/Rect;
+    iget-object v6, v0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
 
     iget v6, v6, Landroid/graphics/Rect;->bottom:I
 
@@ -908,7 +908,7 @@
 
     sub-float/2addr v6, v7
 
-    iget v7, v0, Lcom/google/android/material/button/b;->aMU:I
+    iget v7, v0, Lcom/google/android/material/button/b;->aNd:I
 
     int-to-float v7, v7
 
@@ -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;->aMW:Landroid/graphics/Paint;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNf:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v2, v1, v1, v0}, Landroid/graphics/Canvas;->drawRoundRect(Landroid/graphics/RectF;FFLandroid/graphics/Paint;)V
 
@@ -957,21 +957,21 @@
 
     sub-int/2addr p4, p2
 
-    iget-object p2, p1, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p2, p1, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p1, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object p2, p1, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
 
-    iget p3, p1, Lcom/google/android/material/button/b;->aMR:I
+    iget p3, p1, Lcom/google/android/material/button/b;->aNa:I
 
-    iget v0, p1, Lcom/google/android/material/button/b;->aMT:I
+    iget v0, p1, Lcom/google/android/material/button/b;->aNc:I
 
-    iget v1, p1, Lcom/google/android/material/button/b;->aMS:I
+    iget v1, p1, Lcom/google/android/material/button/b;->aNb:I
 
     sub-int/2addr p4, v1
 
-    iget p1, p1, Lcom/google/android/material/button/b;->aMU:I
+    iget p1, p1, Lcom/google/android/material/button/b;->aNd:I
 
     sub-int/2addr p5, p1
 
@@ -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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNk: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNg: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;->aNe:Z
+    iput-boolean v1, v0, Lcom/google/android/material/button/b;->aNn:Z
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     const v2, 0x3727c5ac    # 1.0E-5f
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNm: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     const/4 v3, 0x0
 
@@ -1281,7 +1281,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNk: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;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNl: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;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNm: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-nez v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNi:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v1, :cond_4
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMX:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNg: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;->aMZ:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNi: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aMZ: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;->aMP:Z
+    sget-boolean v1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aNa:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNj:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/button/b;->aNa:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/button/b;->aNj: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;->aMV:Landroid/content/res/ColorStateList;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
 
     if-eq v1, p1, :cond_1
 
-    iput-object p1, v0, Lcom/google/android/material/button/b;->aMV:Landroid/content/res/ColorStateList;
+    iput-object p1, v0, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
 
-    iget-object v1, v0, Lcom/google/android/material/button/b;->aMW:Landroid/graphics/Paint;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNf:Landroid/graphics/Paint;
 
     const/4 v2, 0x0
 
     if-eqz p1, :cond_0
 
-    iget-object v3, v0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v3, v0, Lcom/google/android/material/button/b;->aMZ: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;->zj()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zm()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;->aMW:Landroid/graphics/Paint;
+    iget-object v1, v0, Lcom/google/android/material/button/b;->aNf: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;->zj()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zm()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;->aMP:Z
+    sget-boolean p1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zh()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zk()V
 
     return-void
 
     :cond_0
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh:Landroid/graphics/drawable/Drawable;
 
     if-eqz p1, :cond_1
 
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh: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;->aMP:Z
+    sget-boolean p1, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zh()V
+    invoke-virtual {v0}, Lcom/google/android/material/button/b;->zk()V
 
     return-void
 
     :cond_0
-    iget-object p1, v0, Lcom/google/android/material/button/b;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh: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;->aMY:Landroid/graphics/drawable/Drawable;
+    iget-object p1, v0, Lcom/google/android/material/button/b;->aNh: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 056ecdb88d..0575b1a229 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,39 +4,39 @@
 
 
 # static fields
-.field static final aMP:Z
+.field static final aMY:Z
 
 
 # instance fields
-.field final aMQ:Lcom/google/android/material/button/MaterialButton;
+.field final aMZ:Lcom/google/android/material/button/MaterialButton;
 
-.field aMR:I
+.field aNa:I
 
-.field aMS:I
+.field aNb:I
 
-.field aMT:I
+.field aNc:I
 
-.field aMU:I
+.field aNd:I
 
-.field aMV:Landroid/content/res/ColorStateList;
+.field aNe:Landroid/content/res/ColorStateList;
 
-.field final aMW:Landroid/graphics/Paint;
+.field final aNf:Landroid/graphics/Paint;
 
-.field aMX:Landroid/graphics/drawable/GradientDrawable;
+.field aNg:Landroid/graphics/drawable/GradientDrawable;
 
-.field aMY:Landroid/graphics/drawable/Drawable;
+.field aNh:Landroid/graphics/drawable/Drawable;
 
-.field aMZ:Landroid/graphics/drawable/GradientDrawable;
+.field aNi:Landroid/graphics/drawable/GradientDrawable;
 
-.field aNa:Landroid/graphics/drawable/Drawable;
+.field aNj:Landroid/graphics/drawable/Drawable;
 
-.field aNb:Landroid/graphics/drawable/GradientDrawable;
+.field aNk:Landroid/graphics/drawable/GradientDrawable;
 
-.field aNc:Landroid/graphics/drawable/GradientDrawable;
+.field aNl:Landroid/graphics/drawable/GradientDrawable;
 
-.field aNd:Landroid/graphics/drawable/GradientDrawable;
+.field aNm:Landroid/graphics/drawable/GradientDrawable;
 
-.field aNe:Z
+.field aNn:Z
 
 .field backgroundTint:Landroid/content/res/ColorStateList;
 
@@ -44,7 +44,7 @@
 
 .field cornerRadius:I
 
-.field final eh:Landroid/graphics/Rect;
+.field final eg:Landroid/graphics/Rect;
 
 .field final rectF:Landroid/graphics/RectF;
 
@@ -71,7 +71,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lcom/google/android/material/button/b;->aMP:Z
+    sput-boolean v0, Lcom/google/android/material/button/b;->aMY: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;->aMW:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aNf: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;->eh:Landroid/graphics/Rect;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->eg:Landroid/graphics/Rect;
 
     new-instance v0, Landroid/graphics/RectF;
 
@@ -103,9 +103,9 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/android/material/button/b;->aNe:Z
+    iput-boolean v0, p0, Lcom/google/android/material/button/b;->aNn:Z
 
-    iput-object p1, p0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iput-object p1, p0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
 
     return-void
 .end method
@@ -117,13 +117,13 @@
 
     new-instance v6, Landroid/graphics/drawable/InsetDrawable;
 
-    iget v2, p0, Lcom/google/android/material/button/b;->aMR:I
+    iget v2, p0, Lcom/google/android/material/button/b;->aNa:I
 
-    iget v3, p0, Lcom/google/android/material/button/b;->aMT:I
+    iget v3, p0, Lcom/google/android/material/button/b;->aNc:I
 
-    iget v4, p0, Lcom/google/android/material/button/b;->aMS:I
+    iget v4, p0, Lcom/google/android/material/button/b;->aNb:I
 
-    iget v5, p0, Lcom/google/android/material/button/b;->aMU:I
+    iget v5, p0, Lcom/google/android/material/button/b;->aNd:I
 
     move-object v0, v6
 
@@ -134,10 +134,10 @@
     return-object v6
 .end method
 
-.method final zh()V
+.method final zk()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v0, :cond_0
 
@@ -149,7 +149,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v1, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-static {v1, v0}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
@@ -157,16 +157,16 @@
     return-void
 .end method
 
-.method final zi()Landroid/graphics/drawable/Drawable;
+.method final zl()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;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
     iget v1, p0, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -178,21 +178,21 @@
 
     invoke-virtual {v0, v1}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNk: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;->zh()V
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->zk()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;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v0, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
 
     iget v3, p0, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -202,17 +202,17 @@
 
     invoke-virtual {v0, v3}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNl: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;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNl: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;->aMV:Landroid/content/res/ColorStateList;
+    iget-object v5, p0, Lcom/google/android/material/button/b;->aNe:Landroid/content/res/ColorStateList;
 
     invoke-virtual {v0, v4, v5}, Landroid/graphics/drawable/GradientDrawable;->setStroke(ILandroid/content/res/ColorStateList;)V
 
@@ -222,11 +222,11 @@
 
     new-array v4, v4, [Landroid/graphics/drawable/Drawable;
 
-    iget-object v5, p0, Lcom/google/android/material/button/b;->aNb:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v5, p0, Lcom/google/android/material/button/b;->aNk:Landroid/graphics/drawable/GradientDrawable;
 
     aput-object v5, v4, v3
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
 
     const/4 v5, 0x1
 
@@ -242,9 +242,9 @@
 
     invoke-direct {v3}, Landroid/graphics/drawable/GradientDrawable;-><init>()V
 
-    iput-object v3, p0, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iput-object v3, p0, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
 
     iget v4, p0, Lcom/google/android/material/button/b;->cornerRadius:I
 
@@ -254,7 +254,7 @@
 
     invoke-virtual {v3, v4}, Landroid/graphics/drawable/GradientDrawable;->setCornerRadius(F)V
 
-    iget-object v2, p0, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/button/b;->aNm:Landroid/graphics/drawable/GradientDrawable;
 
     invoke-virtual {v2, v1}, Landroid/graphics/drawable/GradientDrawable;->setColor(I)V
 
@@ -266,27 +266,27 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lcom/google/android/material/button/b;->aNd:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v3, p0, Lcom/google/android/material/button/b;->aNm: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 zj()V
+.method final zm()V
     .locals 2
 
-    sget-boolean v0, Lcom/google/android/material/button/b;->aMP:Z
+    sget-boolean v0, Lcom/google/android/material/button/b;->aMY:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aNc:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aNl:Landroid/graphics/drawable/GradientDrawable;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
 
-    invoke-virtual {p0}, Lcom/google/android/material/button/b;->zi()Landroid/graphics/drawable/Drawable;
+    invoke-virtual {p0}, Lcom/google/android/material/button/b;->zl()Landroid/graphics/drawable/Drawable;
 
     move-result-object v1
 
@@ -295,11 +295,11 @@
     return-void
 
     :cond_0
-    sget-boolean v0, Lcom/google/android/material/button/b;->aMP:Z
+    sget-boolean v0, Lcom/google/android/material/button/b;->aMY:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/button/b;->aMQ:Lcom/google/android/material/button/MaterialButton;
+    iget-object v0, p0, Lcom/google/android/material/button/b;->aMZ:Lcom/google/android/material/button/MaterialButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/button/MaterialButton;->invalidate()V
 
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 fb68befc48..8c96115fe9 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;->zk()V
+    invoke-virtual {p2}, Lcom/google/android/material/card/a;->zn()V
 
-    invoke-virtual {p2}, Lcom/google/android/material/card/a;->zl()V
+    invoke-virtual {p2}, Lcom/google/android/material/card/a;->zo()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;->zk()V
+    invoke-virtual {p1}, Lcom/google/android/material/card/a;->zn()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;->zk()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zn()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;->zk()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zn()V
 
-    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zl()V
+    invoke-virtual {v0}, Lcom/google/android/material/card/a;->zo()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 4cd767fec5..b5570953ba 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 aNf:Lcom/google/android/material/card/MaterialCardView;
+.field private final aNo: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;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iput-object p1, p0, Lcom/google/android/material/card/a;->aNo: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;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v1, p0, Lcom/google/android/material/card/a;->aNo: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 zk()V
+.method final zn()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/card/a;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v0, p0, Lcom/google/android/material/card/a;->aNo:Lcom/google/android/material/card/MaterialCardView;
 
     invoke-direct {p0}, Lcom/google/android/material/card/a;->bL()Landroid/graphics/drawable/Drawable;
 
@@ -67,10 +67,10 @@
     return-void
 .end method
 
-.method final zl()V
+.method final zo()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/card/a;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v0, p0, Lcom/google/android/material/card/a;->aNo: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;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v1, p0, Lcom/google/android/material/card/a;->aNo: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;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v2, p0, Lcom/google/android/material/card/a;->aNo: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;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v3, p0, Lcom/google/android/material/card/a;->aNo: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;->aNf:Lcom/google/android/material/card/MaterialCardView;
+    iget-object v4, p0, Lcom/google/android/material/card/a;->aNo: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 4d319cf47b..cff1c74f2f 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 aNg:Lcom/google/android/material/chip/Chip;
+.field final synthetic aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$1;->aNp: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 ac5fb739b0..69522c50c6 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 aNg:Lcom/google/android/material/chip/Chip;
+.field final synthetic aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$2;->aNp: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 cbb374cc56..84d8d4ed2c 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 aNg:Lcom/google/android/material/chip/Chip;
+.field final synthetic aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iput-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v0, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object v1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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;->aNg:Lcom/google/android/material/chip/Chip;
+    iget-object p1, p0, Lcom/google/android/material/chip/Chip$a;->aNp: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 dd74bf5864..ac88f9ce0a 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 aNh:Lcom/google/android/material/chip/ChipDrawable;
+.field final synthetic aNq: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;->aNh:Lcom/google/android/material/chip/ChipDrawable;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNq: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;->aNh:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNq: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;->aNh:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNq: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;->aNh:Lcom/google/android/material/chip/ChipDrawable;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipDrawable$1;->aNq: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 f2b3984478..fbbea8c5ec 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 aNi:Lcom/google/android/material/chip/ChipGroup;
+.field final synthetic aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p2, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object p1, p0, Lcom/google/android/material/chip/ChipGroup$a;->aNr: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 c1f052c601..deef5ccf91 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 aNi:Lcom/google/android/material/chip/ChipGroup;
+.field final synthetic aNr:Lcom/google/android/material/chip/ChipGroup;
 
-.field private aNj:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+.field private aNs: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNr: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;->aNj:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iput-object p1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNs: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNr: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v1, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNr: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;->aNj:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNs: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;->aNi:Lcom/google/android/material/chip/ChipGroup;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNr: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;->aNj:Landroid/view/ViewGroup$OnHierarchyChangeListener;
+    iget-object v0, p0, Lcom/google/android/material/chip/ChipGroup$b;->aNs: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 a3393ab241..4b20df5ec6 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 aNk:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aNt: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;->aNk:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aNt: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;->aNk:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aNt: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;->aNk:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/circularreveal/CircularRevealCompat$1;->aNt: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 59d2dde581..8fd4978651 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 aNl:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+.field final synthetic aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-.field final synthetic aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field final synthetic aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNv:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNl:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -38,24 +38,24 @@
 
 
 # virtual methods
-.method public final zm()V
+.method public final zp()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNl:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNv: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 zn()V
+.method public final zq()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNl:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNu:Lcom/google/android/material/floatingactionbutton/FloatingActionButton$OnVisibilityChangedListener;
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$1;->aNv: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 3a22669fdb..8566ddbdd3 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 aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field final synthetic aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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;->aNm:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/FloatingActionButton$a;->aNv: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 97ee0b66ab..720410739e 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
@@ -296,7 +296,7 @@
 
     iput p3, p2, Lcom/google/android/material/floatingactionbutton/a;->maxImageSize:I
 
-    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->zo()V
+    invoke-virtual {p2}, Lcom/google/android/material/floatingactionbutton/a;->zr()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;->aNC:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL: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;->aNC:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Ljava/util/ArrayList;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL: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;->aNB:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK: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;->aNB:Ljava/util/ArrayList;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
 
     :cond_0
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK: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;->aNy:F
+    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
 
     return v0
 .end method
@@ -740,7 +740,7 @@
 
     move-result-object v0
 
-    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     return v0
 .end method
@@ -752,7 +752,7 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNx:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNG: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;->aNp:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
 
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zw()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zz()Z
 
     move-result v1
 
@@ -1008,11 +1008,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNr:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNA:Lcom/google/android/material/animation/MotionSpec;
 
     if-nez v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNr:Lcom/google/android/material/animation/MotionSpec;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNA:Lcom/google/android/material/animation/MotionSpec;
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNr:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNA: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;->aNC:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Ljava/util/ArrayList;
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->zn()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zq()V
 
     :cond_6
     return-void
@@ -1146,7 +1146,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zp()V
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zs()V
 
     return-void
 .end method
@@ -1160,13 +1160,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zs()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zv()Z
 
     move-result v1
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU: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;->aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     :cond_0
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU: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;->aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iget-object v2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU: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;->aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNU: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;->zr()V
+    invoke-virtual {v1}, Lcom/google/android/material/floatingactionbutton/a;->zu()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;->aNC:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL:Ljava/util/ArrayList;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNL: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;->aNB:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Ljava/util/ArrayList;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK: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;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aND: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;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     if-eqz v1, :cond_1
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNF: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;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
@@ -1691,7 +1691,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zo()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zr()V
 
     return-void
 .end method
@@ -1845,7 +1845,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zq()V
+    invoke-virtual {p1}, Lcom/google/android/material/floatingactionbutton/a;->zt()V
 
     :cond_0
     return-void
@@ -1888,16 +1888,16 @@
 
     if-nez v1, :cond_6
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
 
     if-eqz v1, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
 
     invoke-virtual {v1}, Landroid/animation/Animator;->cancel()V
 
     :cond_0
-    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zw()Z
+    invoke-virtual {v0}, Lcom/google/android/material/floatingactionbutton/a;->zz()Z
 
     move-result v1
 
@@ -1905,7 +1905,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getVisibility()I
 
@@ -1913,17 +1913,17 @@
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v1, v3}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setScaleX(F)V
 
@@ -1939,11 +1939,11 @@
     goto :goto_0
 
     :cond_2
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNq:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Lcom/google/android/material/animation/MotionSpec;
 
     if-nez v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNq:Lcom/google/android/material/animation/MotionSpec;
+    iput-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz:Lcom/google/android/material/animation/MotionSpec;
 
     :cond_3
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNq:Lcom/google/android/material/animation/MotionSpec;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNz: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;->aNB:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
 
     if-eqz p1, :cond_4
 
-    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Ljava/util/ArrayList;
+    iget-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Ljava/util/ArrayList;
 
     invoke-virtual {p1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator;
 
@@ -2004,21 +2004,21 @@
     return-void
 
     :cond_5
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p2, v2}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setScaleX(F)V
 
@@ -2026,7 +2026,7 @@
 
     if-eqz p1, :cond_6
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zm()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zp()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 deb3c4bcd2..2776b99b31 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 aNM:Z
+.field final synthetic aNV:Z
 
-.field final synthetic aNN:Lcom/google/android/material/floatingactionbutton/a$d;
+.field final synthetic aNW:Lcom/google/android/material/floatingactionbutton/a$d;
 
-.field final synthetic aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNM:Z
+    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV:Z
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNN:Lcom/google/android/material/floatingactionbutton/a$d;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNW: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNy: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNM:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV: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;->aNM:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV: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;->aNN:Lcom/google/android/material/floatingactionbutton/a$d;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNW:Lcom/google/android/material/floatingactionbutton/a$d;
 
     if-eqz p1, :cond_1
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zn()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zq()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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNM:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNV: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$1;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v1, 0x1
 
-    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
-    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy: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 2270424ea1..eecabc12b7 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 aNM:Z
+.field final synthetic aNV:Z
 
-.field final synthetic aNN:Lcom/google/android/material/floatingactionbutton/a$d;
+.field final synthetic aNW:Lcom/google/android/material/floatingactionbutton/a$d;
 
-.field final synthetic aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNM:Z
+    iput-boolean p2, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNV:Z
 
-    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNN:Lcom/google/android/material/floatingactionbutton/a$d;
+    iput-object p3, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNW: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iput v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/floatingactionbutton/a;->aNy:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNN:Lcom/google/android/material/floatingactionbutton/a$d;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNW:Lcom/google/android/material/floatingactionbutton/a$d;
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zm()V
+    invoke-interface {p1}, Lcom/google/android/material/floatingactionbutton/a$d;->zp()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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNM:Z
+    iget-boolean v1, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNV: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$2;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v1, 0x2
 
-    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iput v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
-    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNp:Landroid/animation/Animator;
+    iput-object p1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNy: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 bc5d6f2dc9..5946cb9a73 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 aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$3;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC: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;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     if-eqz v1, :cond_3
 
-    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, v0, Lcom/google/android/material/floatingactionbutton/a;->aNF: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 94985cef2d..2d88c1ea70 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 aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$a;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,7 +33,7 @@
 
 
 # virtual methods
-.method protected final zx()F
+.method protected final zA()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 b2a113b20a..b40caefe83 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 aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,16 +33,16 @@
 
 
 # virtual methods
-.method protected final zx()F
+.method protected final zA()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$b;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNy:F
+    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNH: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 17332b7258..b33116010c 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 aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,16 +33,16 @@
 
 
 # virtual methods
-.method protected final zx()F
+.method protected final zA()F
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a$c;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget v1, v1, Lcom/google/android/material/floatingactionbutton/a;->aNI: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 f22a742fcc..8d4796283f 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 zm()V
+.method public abstract zp()V
 .end method
 
-.method public abstract zn()V
+.method public abstract zq()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 97a0002c70..7ee2e3f13d 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 aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     const/4 v0, 0x0
 
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method protected final zx()F
+.method protected final zA()F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$e;->aNX: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 87681c54d5..c2cce4e47d 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 aNO:Lcom/google/android/material/floatingactionbutton/a;
+.field final synthetic aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-.field private aNP:Z
+.field private aNY:Z
 
-.field private aNQ:F
+.field private aNZ:F
 
-.field private aNR:F
+.field private aOa: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;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
     invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;-><init>()V
 
@@ -51,17 +51,17 @@
 .method public onAnimationEnd(Landroid/animation/Animator;)V
     .locals 1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p1, p1, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNR:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aOa: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;->aNP:Z
+    iput-boolean p1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNY:Z
 
     return-void
 .end method
@@ -69,38 +69,38 @@
 .method public onAnimationUpdate(Landroid/animation/ValueAnimator;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNP:Z
+    iget-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNY:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC: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;->aNQ:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNZ:F
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->zx()F
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a$f;->zA()F
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNR:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aOa:F
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNP:Z
+    iput-boolean v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNY:Z
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNO:Lcom/google/android/material/floatingactionbutton/a;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNX:Lcom/google/android/material/floatingactionbutton/a;
 
-    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, v0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNQ:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNZ:F
 
-    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aNR:F
+    iget v2, p0, Lcom/google/android/material/floatingactionbutton/a$f;->aOa:F
 
     sub-float/2addr v2, v1
 
@@ -117,5 +117,5 @@
     return-void
 .end method
 
-.method protected abstract zx()F
+.method protected abstract zA()F
 .end method
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 9cbb0861c0..f950ff661c 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
@@ -19,23 +19,41 @@
 # static fields
 .field static final EMPTY_STATE_SET:[I
 
-.field static final aND:[I
+.field static final aNM:[I
 
-.field static final aNE:[I
+.field static final aNN:[I
 
-.field static final aNF:[I
+.field static final aNO:[I
 
-.field static final aNG:[I
+.field static final aNP:[I
 
-.field static final aNH:[I
+.field static final aNQ:[I
 
-.field static final aNn:Landroid/animation/TimeInterpolator;
+.field static final aNw:Landroid/animation/TimeInterpolator;
 
 
 # instance fields
-.field aNA:F
+.field aNA:Lcom/google/android/material/animation/MotionSpec;
 
-.field aNB:Ljava/util/ArrayList;
+.field private final aNB:Lcom/google/android/material/internal/StateListAnimator;
+
+.field aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+
+.field aND:Landroid/graphics/drawable/Drawable;
+
+.field aNE:Landroid/graphics/drawable/Drawable;
+
+.field aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
+
+.field aNG:Landroid/graphics/drawable/Drawable;
+
+.field aNH:F
+
+.field aNI:F
+
+.field aNJ:F
+
+.field aNK:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -45,7 +63,7 @@
     .end annotation
 .end field
 
-.field aNC:Ljava/util/ArrayList;
+.field aNL:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -55,37 +73,19 @@
     .end annotation
 .end field
 
-.field final aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+.field final aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-.field final aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+.field final aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-.field private final aNK:Landroid/graphics/Matrix;
+.field private final aNT:Landroid/graphics/Matrix;
 
-.field aNL:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+.field aNU:Landroid/view/ViewTreeObserver$OnPreDrawListener;
 
-.field aNo:I
+.field aNx:I
 
-.field aNp:Landroid/animation/Animator;
+.field aNy:Landroid/animation/Animator;
 
-.field aNq:Lcom/google/android/material/animation/MotionSpec;
-
-.field aNr:Lcom/google/android/material/animation/MotionSpec;
-
-.field private final aNs:Lcom/google/android/material/internal/StateListAnimator;
-
-.field aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
-
-.field aNu:Landroid/graphics/drawable/Drawable;
-
-.field aNv:Landroid/graphics/drawable/Drawable;
-
-.field aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
-
-.field aNx:Landroid/graphics/drawable/Drawable;
-
-.field aNy:F
-
-.field aNz:F
+.field aNz:Lcom/google/android/material/animation/MotionSpec;
 
 .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;->aNn:Landroid/animation/TimeInterpolator;
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Landroid/animation/TimeInterpolator;
 
     const/4 v0, 0x2
 
@@ -118,7 +118,7 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aND:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNM:[I
 
     const/4 v1, 0x3
 
@@ -126,19 +126,19 @@
 
     fill-array-data v1, :array_1
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNE:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNN:[I
 
     new-array v1, v0, [I
 
     fill-array-data v1, :array_2
 
-    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNF:[I
+    sput-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNO:[I
 
     new-array v0, v0, [I
 
     fill-array-data v0, :array_3
 
-    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNG:[I
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNP:[I
 
     const/4 v0, 0x1
 
@@ -150,7 +150,7 @@
 
     aput v2, v0, v1
 
-    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNH:[I
+    sput-object v0, Lcom/google/android/material/floatingactionbutton/a;->aNQ:[I
 
     new-array v0, v1, [I
 
@@ -191,11 +191,11 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     const/high16 v0, 0x3f800000    # 1.0f
 
-    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA:F
+    iput v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:F
 
     new-instance v0, Landroid/graphics/Rect;
 
@@ -219,21 +219,21 @@
 
     invoke-direct {v0}, Landroid/graphics/Matrix;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Landroid/graphics/Matrix;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNT:Landroid/graphics/Matrix;
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNS: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;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aND:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNM:[I
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/a$c;
 
@@ -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;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNE:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNN:[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;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNF:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNO:[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;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNG:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNP:[I
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/a$b;
 
@@ -287,9 +287,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;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
-    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNH:[I
+    sget-object p2, Lcom/google/android/material/floatingactionbutton/a;->aNQ:[I
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/a$e;
 
@@ -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;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNn:Landroid/animation/TimeInterpolator;
+    sget-object v1, Lcom/google/android/material/floatingactionbutton/a;->aNw: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -440,7 +440,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v2, Landroid/view/View;->ALPHA:Landroid/util/Property;
 
@@ -466,7 +466,7 @@
 
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v1, Landroid/view/View;->SCALE_X:Landroid/util/Property;
 
@@ -488,7 +488,7 @@
 
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v2, Landroid/view/View;->SCALE_Y:Landroid/util/Property;
 
@@ -508,11 +508,11 @@
 
     invoke-interface {v0, p2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNT: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     new-instance p3, Lcom/google/android/material/animation/ImageMatrixProperty;
 
@@ -526,7 +526,7 @@
 
     new-instance v2, Landroid/graphics/Matrix;
 
-    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Landroid/graphics/Matrix;
+    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNT:Landroid/graphics/Matrix;
 
     invoke-direct {v2, v3}, Landroid/graphics/Matrix;-><init>(Landroid/graphics/Matrix;)V
 
@@ -558,13 +558,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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->zt()Lcom/google/android/material/internal/CircularBorderDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zw()Lcom/google/android/material/internal/CircularBorderDrawable;
 
     move-result-object v1
 
@@ -606,7 +606,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;->zu()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zx()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -614,20 +614,20 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND: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;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aND: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;->zu()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zx()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object p2
 
@@ -635,9 +635,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
 
     invoke-static {p3}, Lcom/google/android/material/ripple/RippleUtils;->convertToRippleDrawableColor(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList;
 
@@ -657,21 +657,21 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNF: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;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     aput-object p4, p1, v0
 
-    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object p4, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
 
     aput-object p4, p1, p2
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
 
     aput-object p2, p1, p3
 
@@ -680,15 +680,15 @@
     :cond_1
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     new-array p1, p3, [Landroid/graphics/drawable/Drawable;
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aND:Landroid/graphics/drawable/Drawable;
 
     aput-object p3, p1, v0
 
-    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
 
     aput-object p3, p1, p2
 
@@ -697,19 +697,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;->aNx:Landroid/graphics/drawable/Drawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNG:Landroid/graphics/drawable/Drawable;
 
     new-instance p1, Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR: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;->aNx:Landroid/graphics/drawable/Drawable;
+    iget-object v3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNG:Landroid/graphics/drawable/Drawable;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {p2}, Lcom/google/android/material/shadow/ShadowViewDelegate;->getRadius()F
 
@@ -717,7 +717,7 @@
 
     iget v5, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     add-float v6, v5, p2
 
@@ -725,15 +725,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;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC: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;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     invoke-interface {p1, p2}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -743,17 +743,17 @@
 .method c(FFF)V
     .locals 0
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     if-eqz p2, :cond_0
 
-    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget p3, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI: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;->zr()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zu()V
 
     :cond_0
     return-void
@@ -762,7 +762,7 @@
 .method d(Landroid/graphics/Rect;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNt:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNC:Lcom/google/android/material/shadow/ShadowDrawableWrapper;
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/shadow/ShadowDrawableWrapper;->getPadding(Landroid/graphics/Rect;)Z
 
@@ -778,7 +778,7 @@
 .method g([I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-virtual {v0, p1}, Lcom/google/android/material/internal/StateListAnimator;->setState([I)V
 
@@ -796,7 +796,7 @@
 .method final isOrWillBeHidden()Z
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getVisibility()I
 
@@ -808,7 +808,7 @@
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     if-ne v0, v2, :cond_0
 
@@ -818,7 +818,7 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     const/4 v3, 0x2
 
@@ -833,7 +833,7 @@
 .method final isOrWillBeShown()Z
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getVisibility()I
 
@@ -845,7 +845,7 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     const/4 v3, 0x2
 
@@ -857,7 +857,7 @@
     return v1
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNo:I
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNx:I
 
     if-eq v0, v2, :cond_2
 
@@ -870,19 +870,19 @@
 .method final s(F)V
     .locals 2
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
 
     cmpl-float v0, v0, p1
 
     if-eqz v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
 
@@ -903,9 +903,9 @@
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
 
@@ -916,7 +916,7 @@
 .method setRippleColor(Landroid/content/res/ColorStateList;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNE:Landroid/graphics/drawable/Drawable;
 
     if-eqz v0, :cond_0
 
@@ -933,19 +933,19 @@
 .method final t(F)V
     .locals 2
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     cmpl-float v0, v0, p1
 
     if-eqz v0, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     iget p1, p0, Lcom/google/android/material/floatingactionbutton/a;->elevation:F
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNy:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNH:F
 
-    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNz:F
+    iget v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:F
 
     invoke-virtual {p0, p1, v0, v1}, Lcom/google/android/material/floatingactionbutton/a;->c(FFF)V
 
@@ -956,46 +956,46 @@
 .method final u(F)V
     .locals 1
 
-    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA:F
+    iput p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:F
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNK:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNT: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setImageMatrix(Landroid/graphics/Matrix;)V
 
     return-void
 .end method
 
-.method final zo()V
+.method final zr()V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNA:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:F
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/floatingactionbutton/a;->u(F)V
 
     return-void
 .end method
 
-.method zp()V
+.method zs()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNs:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNB:Lcom/google/android/material/internal/StateListAnimator;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/StateListAnimator;->jumpToCurrentState()V
 
     return-void
 .end method
 
-.method zq()V
+.method zt()V
     .locals 0
 
     return-void
 .end method
 
-.method final zr()V
+.method final zu()V
     .locals 5
 
     iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->tmpRect:Landroid/graphics/Rect;
@@ -1004,7 +1004,7 @@
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/floatingactionbutton/a;->e(Landroid/graphics/Rect;)V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/a;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     iget v2, v0, Landroid/graphics/Rect;->left:I
 
@@ -1019,7 +1019,7 @@
     return-void
 .end method
 
-.method zs()Z
+.method zv()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -1027,7 +1027,7 @@
     return v0
 .end method
 
-.method zt()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method zw()Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/internal/CircularBorderDrawable;
@@ -1037,10 +1037,10 @@
     return-object v0
 .end method
 
-.method final zu()Landroid/graphics/drawable/GradientDrawable;
+.method final zx()Landroid/graphics/drawable/GradientDrawable;
     .locals 2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zv()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/a;->zy()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -1055,7 +1055,7 @@
     return-object v0
 .end method
 
-.method zv()Landroid/graphics/drawable/GradientDrawable;
+.method zy()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Landroid/graphics/drawable/GradientDrawable;
@@ -1065,10 +1065,10 @@
     return-object v0
 .end method
 
-.method final zw()Z
+.method final zz()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -1076,7 +1076,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/a;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isInEditMode()Z
 
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 657d0a3c3f..b0adbe18cd 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 aNS:Landroid/graphics/drawable/InsetDrawable;
+.field private aOb: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNn:Landroid/animation/TimeInterpolator;
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNw:Landroid/animation/TimeInterpolator;
 
     invoke-virtual {v0, p1}, Landroid/animation/AnimatorSet;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
@@ -89,7 +89,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;->zu()Landroid/graphics/drawable/GradientDrawable;
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zx()Landroid/graphics/drawable/GradientDrawable;
 
     move-result-object v0
 
@@ -97,15 +97,15 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNu:Landroid/graphics/drawable/Drawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aND:Landroid/graphics/drawable/Drawable;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aND: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;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aND:Landroid/graphics/drawable/Drawable;
 
     invoke-static {v0, p2}, Landroidx/core/graphics/drawable/DrawableCompat;->setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V
 
@@ -118,7 +118,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
 
     new-instance p1, Landroid/graphics/drawable/LayerDrawable;
 
@@ -128,13 +128,13 @@
 
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNF: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;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aND:Landroid/graphics/drawable/Drawable;
 
     aput-object v1, p4, v0
 
@@ -143,9 +143,9 @@
     goto :goto_0
 
     :cond_1
-    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNw:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNF:Lcom/google/android/material/internal/CircularBorderDrawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNu:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aND:Landroid/graphics/drawable/Drawable;
 
     :goto_0
     new-instance p4, Landroid/graphics/drawable/RippleDrawable;
@@ -156,15 +156,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;->aNv:Landroid/graphics/drawable/Drawable;
+    iput-object p4, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
 
-    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNx:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNG:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object p2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, p2}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -180,7 +180,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->refreshDrawableState()V
 
@@ -191,7 +191,7 @@
 
     invoke-direct {v0}, Landroid/animation/StateListAnimator;-><init>()V
 
-    sget-object v1, Lcom/google/android/material/floatingactionbutton/b;->aND:[I
+    sget-object v1, Lcom/google/android/material/floatingactionbutton/b;->aNM:[I
 
     invoke-direct {p0, p1, p3}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -199,7 +199,7 @@
 
     invoke-virtual {v0, v1, p3}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNE:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNN:[I
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -207,7 +207,7 @@
 
     invoke-virtual {v0, p3, v1}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNF:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNO:[I
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -215,7 +215,7 @@
 
     invoke-virtual {v0, p3, v1}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNG:[I
+    sget-object p3, Lcom/google/android/material/floatingactionbutton/b;->aNP:[I
 
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/floatingactionbutton/b;->c(FF)Landroid/animation/Animator;
 
@@ -231,7 +231,7 @@
 
     invoke-direct {p3}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     const/4 v2, 0x1
 
@@ -269,13 +269,13 @@
 
     if-gt p1, v1, :cond_1
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v7, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v7}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getTranslationZ()F
 
@@ -294,7 +294,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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     sget-object v1, Landroid/view/View;->TRANSLATION_Z:Landroid/util/Property;
 
@@ -324,11 +324,11 @@
 
     invoke-virtual {p2, p1}, Landroid/animation/AnimatorSet;->playSequentially([Landroid/animation/Animator;)V
 
-    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNn:Landroid/animation/TimeInterpolator;
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNw:Landroid/animation/TimeInterpolator;
 
     invoke-virtual {p2, p1}, Landroid/animation/AnimatorSet;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
-    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNH:[I
+    sget-object p1, Lcom/google/android/material/floatingactionbutton/b;->aNQ:[I
 
     invoke-virtual {v0, p1, p2}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
@@ -340,12 +340,12 @@
 
     invoke-virtual {v0, p1, p2}, Landroid/animation/StateListAnimator;->addState([ILandroid/animation/Animator;)V
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {p1}, Lcom/google/android/material/shadow/ShadowViewDelegate;->isCompatPaddingEnabled()Z
 
@@ -353,7 +353,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zr()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zu()V
 
     :cond_2
     return-void
@@ -362,7 +362,7 @@
 .method final d(Landroid/graphics/Rect;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->isCompatPaddingEnabled()Z
 
@@ -372,19 +372,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNz:F
+    iget v3, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:F
 
     add-float/2addr v2, v3
 
@@ -425,7 +425,7 @@
 .method final e(Landroid/graphics/Rect;)V
     .locals 7
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
     invoke-interface {v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->isCompatPaddingEnabled()Z
 
@@ -435,7 +435,7 @@
 
     new-instance v0, Landroid/graphics/drawable/InsetDrawable;
 
-    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object v2, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
 
     iget v3, p1, Landroid/graphics/Rect;->left:I
 
@@ -449,20 +449,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;->aNS:Landroid/graphics/drawable/InsetDrawable;
+    iput-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aOb:Landroid/graphics/drawable/InsetDrawable;
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Landroid/graphics/drawable/InsetDrawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aOb: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;->aNJ:Lcom/google/android/material/shadow/ShadowViewDelegate;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNS:Lcom/google/android/material/shadow/ShadowViewDelegate;
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
 
     invoke-interface {p1, v0}, Lcom/google/android/material/shadow/ShadowViewDelegate;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -478,7 +478,7 @@
 
     if-ne p1, v0, :cond_4
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isEnabled()Z
 
@@ -488,13 +488,13 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isPressed()Z
 
@@ -502,16 +502,16 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNz:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isFocused()Z
 
@@ -519,7 +519,7 @@
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->isHovered()Z
 
@@ -530,7 +530,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
@@ -538,20 +538,20 @@
 
     :cond_2
     :goto_0
-    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
-    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNy:F
+    iget v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNH: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR: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;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object p1, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {p1, v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->setTranslationZ(F)V
 
@@ -562,7 +562,7 @@
 .method public final getElevation()F
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNI:Lcom/google/android/material/internal/VisibilityAwareImageButton;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNR:Lcom/google/android/material/internal/VisibilityAwareImageButton;
 
     invoke-virtual {v0}, Lcom/google/android/material/internal/VisibilityAwareImageButton;->getElevation()F
 
@@ -574,13 +574,13 @@
 .method final setRippleColor(Landroid/content/res/ColorStateList;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE: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;->aNv:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/floatingactionbutton/b;->aNE:Landroid/graphics/drawable/Drawable;
 
     check-cast v0, Landroid/graphics/drawable/RippleDrawable;
 
@@ -598,21 +598,21 @@
     return-void
 .end method
 
-.method final zp()V
+.method final zs()V
     .locals 0
 
     return-void
 .end method
 
-.method final zq()V
+.method final zt()V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zr()V
+    invoke-virtual {p0}, Lcom/google/android/material/floatingactionbutton/b;->zu()V
 
     return-void
 .end method
 
-.method final zs()Z
+.method final zv()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -620,7 +620,7 @@
     return v0
 .end method
 
-.method final zt()Lcom/google/android/material/internal/CircularBorderDrawable;
+.method final zw()Lcom/google/android/material/internal/CircularBorderDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/internal/CircularBorderDrawableLollipop;
@@ -630,7 +630,7 @@
     return-object v0
 .end method
 
-.method final zv()Landroid/graphics/drawable/GradientDrawable;
+.method final zy()Landroid/graphics/drawable/GradientDrawable;
     .locals 1
 
     new-instance v0, Lcom/google/android/material/floatingactionbutton/b$a;
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 25cf81963c..47a4747167 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 aNT:Lcom/google/android/material/internal/CheckableImageButton;
+.field final synthetic aOc: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;->aNT:Lcom/google/android/material/internal/CheckableImageButton;
+    iput-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aOc: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;->aNT:Lcom/google/android/material/internal/CheckableImageButton;
+    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aOc: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;->aNT:Lcom/google/android/material/internal/CheckableImageButton;
+    iget-object p1, p0, Lcom/google/android/material/internal/CheckableImageButton$1;->aOc: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 9069c6ead8..71a60e7ace 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 aNU:Lcom/google/android/material/internal/CircularBorderDrawable;
+.field final synthetic aOd: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;->aNU:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iput-object p1, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aOd: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;->aNU:Lcom/google/android/material/internal/CircularBorderDrawable;
+    iget-object v0, p0, Lcom/google/android/material/internal/CircularBorderDrawable$a;->aOd: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 5c33b99e60..6a81c38056 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 aNV:Lcom/google/android/material/internal/NavigationMenuItemView;
+.field final synthetic aOe: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;->aNV:Lcom/google/android/material/internal/NavigationMenuItemView;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aOe: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;->aNV:Lcom/google/android/material/internal/NavigationMenuItemView;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuItemView$1;->aOe: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 9edf19054e..027ec93c43 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 aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+.field final synthetic aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$1;->aOf: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 033996c85b..ce10d03ddf 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 aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+.field final synthetic aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
-.field final aNX:Ljava/util/ArrayList;
+.field final aOg:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field aNY:Landroidx/appcompat/view/menu/MenuItemImpl;
+.field aOh: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;-><init>()V
 
@@ -52,9 +52,9 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
-    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zy()V
+    invoke-virtual {p0}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zB()V
 
     return-void
 .end method
@@ -65,7 +65,7 @@
     :goto_0
     if-ge p1, p2, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -90,7 +90,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -110,7 +110,7 @@
 .method public final getItemViewType(I)I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -142,7 +142,7 @@
 
     check-cast p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object p1, p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p1, p1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {p1}, Landroidx/appcompat/view/menu/MenuItemImpl;->hasSubMenu()Z
 
@@ -193,7 +193,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -217,7 +217,7 @@
 
     check-cast p1, Landroid/widget/TextView;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -225,7 +225,7 @@
 
     check-cast p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {p2}, Landroidx/appcompat/view/menu/MenuItemImpl;->getTitle()Ljava/lang/CharSequence;
 
@@ -240,45 +240,45 @@
 
     check-cast p1, Lcom/google/android/material/internal/NavigationMenuItemView;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->itemBackground:Landroid/graphics/drawable/Drawable;
 
@@ -298,7 +298,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;->aNX:Ljava/util/ArrayList;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -310,19 +310,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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     invoke-virtual {p1, p2, v1}, Lcom/google/android/material/internal/NavigationMenuItemView;->initialize(Landroidx/appcompat/view/menu/MenuItemImpl;I)V
 
@@ -353,7 +353,7 @@
     :cond_0
     new-instance p1, Lcom/google/android/material/internal/NavigationMenuPresenter$a;
 
-    iget-object p2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object p2, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object p2, p2, Lcom/google/android/material/internal/NavigationMenuPresenter;->headerLayout:Landroid/widget/LinearLayout;
 
@@ -364,7 +364,7 @@
     :cond_1
     new-instance p2, Lcom/google/android/material/internal/NavigationMenuPresenter$h;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->layoutInflater:Landroid/view/LayoutInflater;
 
@@ -375,7 +375,7 @@
     :cond_2
     new-instance p2, Lcom/google/android/material/internal/NavigationMenuPresenter$i;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter;->layoutInflater:Landroid/view/LayoutInflater;
 
@@ -386,11 +386,11 @@
     :cond_3
     new-instance p2, Lcom/google/android/material/internal/NavigationMenuPresenter$g;
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v1, v1, Lcom/google/android/material/internal/NavigationMenuPresenter;->onClickListener:Landroid/view/View$OnClickListener;
 
@@ -421,7 +421,7 @@
 .method public final setCheckedItem(Landroidx/appcompat/view/menu/MenuItemImpl;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNY:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eq v0, p1, :cond_2
 
@@ -434,7 +434,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNY:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v0, :cond_1
 
@@ -443,7 +443,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;->aNY:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     const/4 v0, 0x1
 
@@ -454,7 +454,7 @@
     return-void
 .end method
 
-.method final zy()V
+.method final zB()V
     .locals 16
 
     move-object/from16 v0, p0
@@ -470,11 +470,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;->aNX:Ljava/util/ArrayList;
+    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V
 
-    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v2, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     new-instance v3, Lcom/google/android/material/internal/NavigationMenuPresenter$c;
 
@@ -484,7 +484,7 @@
 
     const/4 v2, -0x1
 
-    iget-object v3, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v3, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v3, v3, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -509,7 +509,7 @@
     :goto_0
     if-ge v2, v3, :cond_f
 
-    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget-object v8, v8, Lcom/google/android/material/internal/NavigationMenuPresenter;->menu:Landroidx/appcompat/view/menu/MenuBuilder;
 
@@ -559,11 +559,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     new-instance v11, Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 
-    iget-object v12, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v12, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v12, v12, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
@@ -572,7 +572,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;->aNX:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     new-instance v11, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
@@ -580,7 +580,7 @@
 
     invoke-virtual {v10, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v10}, Ljava/util/ArrayList;->size()I
 
@@ -638,7 +638,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;->aNX:Ljava/util/ArrayList;
+    iget-object v15, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     new-instance v1, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
@@ -656,7 +656,7 @@
     :cond_8
     if-eqz v13, :cond_e
 
-    iget-object v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v1, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v1}, Ljava/util/ArrayList;->size()I
 
@@ -673,7 +673,7 @@
 
     if-eq v1, v5, :cond_c
 
-    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
@@ -697,15 +697,15 @@
 
     add-int/lit8 v7, v7, 0x1
 
-    iget-object v6, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v6, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     new-instance v9, Lcom/google/android/material/internal/NavigationMenuPresenter$e;
 
-    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v10, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf: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;->aNW:Lcom/google/android/material/internal/NavigationMenuPresenter;
+    iget-object v11, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOf:Lcom/google/android/material/internal/NavigationMenuPresenter;
 
     iget v11, v11, Lcom/google/android/material/internal/NavigationMenuPresenter;->paddingSeparator:I
 
@@ -727,7 +727,7 @@
 
     if-eqz v5, :cond_d
 
-    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v5, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v5}, Ljava/util/ArrayList;->size()I
 
@@ -745,7 +745,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;->aNX:Ljava/util/ArrayList;
+    iget-object v8, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v8, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -765,14 +765,14 @@
     return-void
 .end method
 
-.method public final zz()Landroid/os/Bundle;
+.method public final zC()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;->aNY:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOh:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v1, :cond_0
 
@@ -791,7 +791,7 @@
 
     const/4 v2, 0x0
 
-    iget-object v3, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v3, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v3}, Ljava/util/ArrayList;->size()I
 
@@ -800,7 +800,7 @@
     :goto_0
     if-ge v2, v3, :cond_3
 
-    iget-object v4, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aNX:Ljava/util/ArrayList;
+    iget-object v4, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg:Ljava/util/ArrayList;
 
     invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
 
@@ -814,7 +814,7 @@
 
     check-cast v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;
 
-    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi:Landroidx/appcompat/view/menu/MenuItemImpl;
 
     if-eqz v4, :cond_1
 
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 14eeb5bea8..c9b3f7049b 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 aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+.field final aOi: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;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iput-object p1, p0, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi: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 5f1ebce0bd..c168a165c7 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;->aNY:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v0, v0, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOh: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;->aNX:Ljava/util/ArrayList;
+    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg: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;->aNX:Ljava/util/ArrayList;
+    iget-object v6, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg: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;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v6, v6, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi: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;->zy()V
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zB()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;->aNX:Ljava/util/ArrayList;
+    iget-object v3, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg: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;->aNX:Ljava/util/ArrayList;
+    iget-object v4, v1, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->aOg: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;->aNZ:Landroidx/appcompat/view/menu/MenuItemImpl;
+    iget-object v4, v4, Lcom/google/android/material/internal/NavigationMenuPresenter$f;->aOi: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;->zz()Landroid/os/Bundle;
+    invoke-virtual {v1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zC()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;->zy()V
+    invoke-virtual {p1}, Lcom/google/android/material/internal/NavigationMenuPresenter$b;->zB()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 f4ed0efb46..c732f23381 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 aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+.field final synthetic aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iput-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object v0, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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;->aOa:Lcom/google/android/material/internal/ScrimInsetsFrameLayout;
+    iget-object p1, p0, Lcom/google/android/material/internal/ScrimInsetsFrameLayout$1;->aOj: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 d64d4f8c0e..ebb234107d 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 aOb:Lcom/google/android/material/internal/StateListAnimator;
+.field final synthetic aOk: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;->aOb:Lcom/google/android/material/internal/StateListAnimator;
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aOk: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;->aOb:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object v0, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aOk: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;->aOb:Lcom/google/android/material/internal/StateListAnimator;
+    iget-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$1;->aOk: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 2d5685adca..0bbb2056a4 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 aOc:[I
+.field final aOl:[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;->aOc:[I
+    iput-object p1, p0, Lcom/google/android/material/internal/StateListAnimator$a;->aOl:[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 8c5f705ae2..9ac0111b3e 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;->aOc:[I
+    iget-object v3, v2, Lcom/google/android/material/internal/StateListAnimator$a;->aOl:[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 a41c650108..e93400f027 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 aOd:Landroid/widget/TextView;
+.field final synthetic aOm:Landroid/widget/TextView;
 
-.field final synthetic aOe:Lcom/google/android/material/internal/TextScale;
+.field final synthetic aOn: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;->aOe:Lcom/google/android/material/internal/TextScale;
+    iput-object p1, p0, Lcom/google/android/material/internal/TextScale$1;->aOn:Lcom/google/android/material/internal/TextScale;
 
-    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$1;->aOd:Landroid/widget/TextView;
+    iput-object p2, p0, Lcom/google/android/material/internal/TextScale$1;->aOm: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;->aOd:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aOm:Landroid/widget/TextView;
 
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setScaleX(F)V
 
-    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aOd:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/internal/TextScale$1;->aOm: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 d801a6721e..ec5e4ae974 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 aOf:Lcom/google/android/material/navigation/NavigationView;
+.field final synthetic aOo: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;->aOf:Lcom/google/android/material/navigation/NavigationView;
+    iput-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aOo: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;->aOf:Lcom/google/android/material/navigation/NavigationView;
+    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aOo: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;->aOf:Lcom/google/android/material/navigation/NavigationView;
+    iget-object p1, p0, Lcom/google/android/material/navigation/NavigationView$1;->aOo: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 c3c93097b0..865a1bf948 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 aOg:Landroid/text/TextPaint;
+.field final synthetic aOp:Landroid/text/TextPaint;
 
-.field final synthetic aOh:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+.field final synthetic aOq:Landroidx/core/content/res/ResourcesCompat$FontCallback;
 
-.field final synthetic aOi:Lcom/google/android/material/resources/TextAppearance;
+.field final synthetic aOr: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;->aOi:Lcom/google/android/material/resources/TextAppearance;
+    iput-object p1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOr:Lcom/google/android/material/resources/TextAppearance;
 
-    iput-object p2, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOg:Landroid/text/TextPaint;
+    iput-object p2, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOp:Landroid/text/TextPaint;
 
-    iput-object p3, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOh:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iput-object p3, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOq: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;->aOi:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOr: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;->aOi:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOr: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;->aOh:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOq: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;->aOi:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOr: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;->aOi:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOr:Lcom/google/android/material/resources/TextAppearance;
 
-    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOg:Landroid/text/TextPaint;
+    iget-object v1, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOp: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;->aOi:Lcom/google/android/material/resources/TextAppearance;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOr: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;->aOh:Landroidx/core/content/res/ResourcesCompat$FontCallback;
+    iget-object v0, p0, Lcom/google/android/material/resources/TextAppearance$1;->aOq: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 a3f0787fa1..891183c0ac 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 aOj:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+.field final synthetic aOs: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;->aOj:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+    iput-object p1, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aOs: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;->aOj:Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper;
+    iget-object v0, p0, Lcom/google/android/material/shape/InterpolateOnScrollPositionChangeHelper$1;->aOs: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 d238ee4231..eb2fce7f2b 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$10;->aOu: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 62b3a1e756..e15c38566b 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 final synthetic aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-.field private aOm:I
+.field private aOv:I
 
-.field final synthetic aOo:I
+.field final synthetic aOx: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOo:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOx:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOo:I
+    iget p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOx:I
 
-    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOm:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOv: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOu: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;->aOm:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOv: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOu: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;->aOm:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$11;->aOv: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 feb26d378e..cc608b4395 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 aOk:I
+.field final synthetic aOt:I
 
-.field final synthetic aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOk:I
+    iput p2, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOt: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOk:I
+    iget v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOt: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$2;->aOu: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 b826107c69..3d1196d419 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 final synthetic aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
 
-.field private aOm:I
+.field private aOv: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOu: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;->aOm:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOv: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOu: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;->aOm:I
+    iget v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOv: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOu: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;->aOm:I
+    iput p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$3;->aOv: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 b3cec42549..df50e58e5f 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$4;->aOu: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 f714e3672e..5aa9ec3ba9 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$5;->aOu: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 517893e6e8..1cde13cca1 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$6;->aOu: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 6d8ff1b8df..c2451bc43b 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOu: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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOu: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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()Lcom/google/android/material/snackbar/a;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$7;->aOu: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 5cbb181c7a..90188e0630 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 aOn:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+.field final synthetic aOw: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;->aOn:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aOw: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;->aOn:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8$1;->aOw:Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;
 
-    iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object v0, v0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOu: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 8f3ff277c8..ccfda858ed 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$8;->aOu: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 6ff111ee2d..cc72826ee6 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 aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+.field final synthetic aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOu: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;->aOl:Lcom/google/android/material/snackbar/BaseTransientBottomBar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$9;->aOu: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 8e91634fa7..4e4e7bb2cb 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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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 e66fdc977c..c398972b98 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 aOp:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+.field final synthetic aOy: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;->aOp:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aOy: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;->aOp:Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/BaseTransientBottomBar$SnackbarBaseLayout$1;->aOy: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 5c703736cc..da24b29c08 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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC: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;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOD: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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zB()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zE()V
 
     :cond_0
     monitor-exit v2
@@ -784,7 +784,7 @@
 .method onViewShown()V
     .locals 3
 
-    invoke-static {}, Lcom/google/android/material/snackbar/a;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC: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;->zA()Lcom/google/android/material/snackbar/a;
+    invoke-static {}, Lcom/google/android/material/snackbar/a;->zD()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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOC: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOC: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC: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;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOD: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;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iput-object v4, v0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
 
     :goto_0
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v1, :cond_2
 
-    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iput-object v1, v0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
-    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zB()V
+    invoke-virtual {v0}, Lcom/google/android/material/snackbar/a;->zE()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 b8ee1d2530..e06e0620ad 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 aOq:Landroid/view/View$OnClickListener;
+.field final synthetic aOA:Lcom/google/android/material/snackbar/Snackbar;
 
-.field final synthetic aOr:Lcom/google/android/material/snackbar/Snackbar;
+.field final synthetic aOz:Landroid/view/View$OnClickListener;
 
 
 # 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;->aOr:Lcom/google/android/material/snackbar/Snackbar;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOA:Lcom/google/android/material/snackbar/Snackbar;
 
-    iput-object p2, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOq:Landroid/view/View$OnClickListener;
+    iput-object p2, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOz: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;->aOq:Landroid/view/View$OnClickListener;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOz: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;->aOr:Lcom/google/android/material/snackbar/Snackbar;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/Snackbar$1;->aOA: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 409ebd9d57..7ab9a4de9d 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 aOv:Lcom/google/android/material/snackbar/a;
+.field final synthetic aOE: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;->aOv:Lcom/google/android/material/snackbar/a;
+    iput-object p1, p0, Lcom/google/android/material/snackbar/a$1;->aOE: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;->aOv:Lcom/google/android/material/snackbar/a;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a$1;->aOE: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     if-eq v2, p1, :cond_1
 
-    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iget-object v2, v0, Lcom/google/android/material/snackbar/a;->aOD: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 b5eb515dd8..7a419f1628 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 aOw:Ljava/lang/ref/WeakReference;
+.field final aOF:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -25,10 +25,10 @@
     .end annotation
 .end field
 
-.field bP:Z
-
 .field duration:I
 
+.field paused:Z
+
 
 # direct methods
 .method constructor <init>(ILcom/google/android/material/snackbar/a$a;)V
@@ -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;->aOw:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aOF: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;->aOw:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a$b;->aOF: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 9b5ee19cb6..fd75502680 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 aOs:Lcom/google/android/material/snackbar/a;
+.field private static aOB:Lcom/google/android/material/snackbar/a;
 
 
 # instance fields
-.field aOt:Lcom/google/android/material/snackbar/a$b;
+.field aOC:Lcom/google/android/material/snackbar/a$b;
 
-.field aOu:Lcom/google/android/material/snackbar/a$b;
+.field aOD:Lcom/google/android/material/snackbar/a$b;
 
 .field final handler:Landroid/os/Handler;
 
@@ -55,10 +55,10 @@
     return-void
 .end method
 
-.method static zA()Lcom/google/android/material/snackbar/a;
+.method static zD()Lcom/google/android/material/snackbar/a;
     .locals 1
 
-    sget-object v0, Lcom/google/android/material/snackbar/a;->aOs:Lcom/google/android/material/snackbar/a;
+    sget-object v0, Lcom/google/android/material/snackbar/a;->aOB:Lcom/google/android/material/snackbar/a;
 
     if-nez v0, :cond_0
 
@@ -66,10 +66,10 @@
 
     invoke-direct {v0}, Lcom/google/android/material/snackbar/a;-><init>()V
 
-    sput-object v0, Lcom/google/android/material/snackbar/a;->aOs:Lcom/google/android/material/snackbar/a;
+    sput-object v0, Lcom/google/android/material/snackbar/a;->aOB:Lcom/google/android/material/snackbar/a;
 
     :cond_0
-    sget-object v0, Lcom/google/android/material/snackbar/a;->aOs:Lcom/google/android/material/snackbar/a;
+    sget-object v0, Lcom/google/android/material/snackbar/a;->aOB:Lcom/google/android/material/snackbar/a;
 
     return-object v0
 .end method
@@ -90,21 +90,21 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
-    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->bP: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->bP: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     invoke-virtual {p1, v1}, Landroid/os/Handler;->removeCallbacksAndMessages(Ljava/lang/Object;)V
 
@@ -178,7 +178,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;->aOw:Ljava/lang/ref/WeakReference;
+    iget-object v0, p1, Lcom/google/android/material/snackbar/a$b;->aOF:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -218,19 +218,19 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
-    iget-boolean p1, p1, Lcom/google/android/material/snackbar/a$b;->bP: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;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->bP:Z
+    iput-boolean v1, p1, Lcom/google/android/material/snackbar/a$b;->paused:Z
 
-    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object p1, p0, Lcom/google/android/material/snackbar/a;->aOC: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
 
@@ -324,7 +324,7 @@
 .method final e(Lcom/google/android/material/snackbar/a$a;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_0
 
@@ -347,7 +347,7 @@
 .method final f(Lcom/google/android/material/snackbar/a$a;)Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_0
 
@@ -367,22 +367,22 @@
     return p1
 .end method
 
-.method final zB()V
+.method final zE()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iget-object v0, p0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
 
     if-eqz v0, :cond_1
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOu:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOD:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iget-object v1, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
-    iget-object v1, v1, Lcom/google/android/material/snackbar/a$b;->aOw:Ljava/lang/ref/WeakReference;
+    iget-object v1, v1, Lcom/google/android/material/snackbar/a$b;->aOF:Ljava/lang/ref/WeakReference;
 
     invoke-virtual {v1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
 
@@ -397,7 +397,7 @@
     return-void
 
     :cond_0
-    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOt:Lcom/google/android/material/snackbar/a$b;
+    iput-object v0, p0, Lcom/google/android/material/snackbar/a;->aOC:Lcom/google/android/material/snackbar/a$b;
 
     :cond_1
     return-void
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 cf33bc9b3c..ec41909728 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 aOx:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$1;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$1;->aOG: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 c8abb190aa..b7e293e6a0 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 aOx:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOG:Lcom/google/android/material/tabs/TabLayout;
 
-.field aOy:Z
+.field aOH: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
-    iget-boolean p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOy:Z
+    iget-boolean p2, p0, Lcom/google/android/material/tabs/TabLayout$a;->aOH: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 da63a318b4..07bae99df5 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 aOx:Lcom/google/android/material/tabs/TabLayout;
+.field final synthetic aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$b;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$b;->aOG: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 0e3792c130..6174f29feb 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
@@ -18,30 +18,30 @@
 
 
 # instance fields
-.field final synthetic aOI:I
+.field final synthetic aOR:I
 
-.field final synthetic aOJ:I
+.field final synthetic aOS:I
 
-.field final synthetic aOK:I
+.field final synthetic aOT:I
 
-.field final synthetic aOL:I
+.field final synthetic aOU:I
 
-.field final synthetic aOM:Lcom/google/android/material/tabs/TabLayout$c;
+.field final synthetic aOV: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;->aOM:Lcom/google/android/material/tabs/TabLayout$c;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOI:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOR:I
 
-    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOJ:I
+    iput p3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOS:I
 
-    iput p4, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOK:I
+    iput p4, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOT:I
 
-    iput p5, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOL:I
+    iput p5, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOU:I
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,19 +57,19 @@
 
     move-result p1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOM:Lcom/google/android/material/tabs/TabLayout$c;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOI:I
+    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOR:I
 
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOJ:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOS: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;->aOK:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOT:I
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOL:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c$1;->aOU:I
 
     invoke-static {v2, v3, p1}, Lcom/google/android/material/animation/AnimationUtils;->lerp(IIF)I
 
diff --git a/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$2.smali b/com.discord/smali_classes2/com/google/android/material/tabs/TabLayout$c$2.smali
index 24246f58e1..05b1294f2f 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
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aOM:Lcom/google/android/material/tabs/TabLayout$c;
+.field final synthetic aOV:Lcom/google/android/material/tabs/TabLayout$c;
 
-.field final synthetic aON:I
+.field final synthetic aOW: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;->aOM:Lcom/google/android/material/tabs/TabLayout$c;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aON:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOW: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;->aOM:Lcom/google/android/material/tabs/TabLayout$c;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOV:Lcom/google/android/material/tabs/TabLayout$c;
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aON:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c$2;->aOW:I
 
-    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOC:I
+    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     const/4 v0, 0x0
 
-    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOD:F
+    iput v0, p1, Lcom/google/android/material/tabs/TabLayout$c;->aOM: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 da54441ae0..e4c43bed09 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,44 +15,44 @@
 
 
 # instance fields
-.field private final aOA:Landroid/graphics/Paint;
+.field final synthetic aOG:Lcom/google/android/material/tabs/TabLayout;
 
-.field private final aOB:Landroid/graphics/drawable/GradientDrawable;
+.field private aOI:I
 
-.field aOC:I
+.field private final aOJ:Landroid/graphics/Paint;
 
-.field aOD:F
+.field private final aOK:Landroid/graphics/drawable/GradientDrawable;
 
-.field private aOE:I
+.field aOL:I
 
-.field private aOF:I
+.field aOM:F
 
-.field private aOG:I
+.field private aON:I
 
-.field aOH:Landroid/animation/ValueAnimator;
+.field private aOO:I
 
-.field final synthetic aOx:Lcom/google/android/material/tabs/TabLayout;
+.field private aOP:I
 
-.field private aOz:I
+.field aOQ:Landroid/animation/ValueAnimator;
 
 
 # direct methods
 .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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;->aOC:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOE:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aON:I
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
 
     const/4 p1, 0x0
 
@@ -62,13 +62,13 @@
 
     invoke-direct {p1}, Landroid/graphics/Paint;-><init>()V
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOA:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ: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;->aOB:Landroid/graphics/drawable/GradientDrawable;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK: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;->zD()I
+    invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout$d;->zG()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v0, v2}, Lcom/google/android/material/tabs/TabLayout;->dpToPx(I)I
 
@@ -131,18 +131,18 @@
 .method final M(II)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
 
     if-ne p1, v0, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
 
     if-eq p2, v0, :cond_1
 
     :cond_0
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
 
-    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:I
+    iput p2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
@@ -153,7 +153,7 @@
 .method final N(II)V
     .locals 9
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     if-eqz v0, :cond_0
 
@@ -163,7 +163,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v0}, Landroid/animation/ValueAnimator;->cancel()V
 
@@ -174,7 +174,7 @@
 
     if-nez v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->zC()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->zF()V
 
     return-void
 
@@ -187,7 +187,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v3, v3, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorFullWidth:Z
 
@@ -199,7 +199,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -207,7 +207,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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -217,7 +217,7 @@
 
     float-to-int v1, v0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -232,9 +232,9 @@
 
     move v8, v2
 
-    iget v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF:I
+    iget v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
 
-    iget v7, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:I
+    iget v7, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
 
     if-ne v5, v6, :cond_3
 
@@ -245,7 +245,7 @@
 
     invoke-direct {v0}, Landroid/animation/ValueAnimator;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iput-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     sget-object v1, Lcom/google/android/material/animation/AnimationUtils;->FAST_OUT_SLOW_IN_INTERPOLATOR:Landroid/animation/TimeInterpolator;
 
@@ -296,7 +296,7 @@
 .method final cB(I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOA:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:Landroid/graphics/Paint;
 
     invoke-virtual {v0}, Landroid/graphics/Paint;->getColor()I
 
@@ -304,7 +304,7 @@
 
     if-eq v0, p1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOA:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:Landroid/graphics/Paint;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V
 
@@ -317,11 +317,11 @@
 .method final cC(I)V
     .locals 1
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOz:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOI:I
 
     if-eq v0, p1, :cond_0
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOz:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOI:I
 
     invoke-static {p0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
 
@@ -332,7 +332,7 @@
 .method public final draw(Landroid/graphics/Canvas;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabSelectedIndicator:Landroid/graphics/drawable/Drawable;
 
@@ -340,7 +340,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabSelectedIndicator:Landroid/graphics/drawable/Drawable;
 
@@ -354,14 +354,14 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOz:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOI:I
 
     if-ltz v2, :cond_1
 
     move v0, v2
 
     :cond_1
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorGravity:I
 
@@ -422,41 +422,41 @@
 
     :cond_5
     :goto_1
-    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF:I
+    iget v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
 
     if-ltz v2, :cond_9
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
 
     if-le v3, v2, :cond_9
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;->aOB:Landroid/graphics/drawable/GradientDrawable;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOK:Landroid/graphics/drawable/GradientDrawable;
 
     :goto_2
     invoke-static {v2}, Landroidx/core/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable;
 
     move-result-object v2
 
-    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOF:I
+    iget v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOO:I
 
-    iget v4, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:I
+    iget v4, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOP:I
 
     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;->aOA:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:Landroid/graphics/Paint;
 
     if-eqz v0, :cond_8
 
@@ -466,7 +466,7 @@
 
     if-ne v0, v1, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOA:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:Landroid/graphics/Paint;
 
     invoke-virtual {v0}, Landroid/graphics/Paint;->getColor()I
 
@@ -479,7 +479,7 @@
     goto :goto_3
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOA:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOJ:Landroid/graphics/Paint;
 
     invoke-virtual {v0}, Landroid/graphics/Paint;->getColor()I
 
@@ -502,7 +502,7 @@
 
     invoke-super/range {p0 .. p5}, Landroid/widget/LinearLayout;->onLayout(ZIIII)V
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     if-eqz p1, :cond_0
 
@@ -512,21 +512,21 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->cancel()V
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ: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;->aOC:I
+    iget p3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     const/high16 p4, 0x3f800000    # 1.0f
 
-    iget-object p5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object p5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     invoke-virtual {p5}, Landroid/animation/ValueAnimator;->getAnimatedFraction()F
 
@@ -547,7 +547,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->zC()V
+    invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->zF()V
 
     return-void
 .end method
@@ -568,7 +568,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->mode:I
 
@@ -576,7 +576,7 @@
 
     if-ne v0, v1, :cond_8
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabGravity:I
 
@@ -624,7 +624,7 @@
     return-void
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     const/16 v5, 0x10
 
@@ -689,7 +689,7 @@
     goto :goto_2
 
     :cond_7
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iput v2, v0, Lcom/google/android/material/tabs/TabLayout;->tabGravity:I
 
@@ -715,22 +715,22 @@
 
     if-ge v0, v1, :cond_0
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOE:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aON:I
 
     if-eq v0, p1, :cond_0
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->requestLayout()V
 
-    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOE:I
+    iput p1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aON:I
 
     :cond_0
     return-void
 .end method
 
-.method final zC()V
+.method final zF()V
     .locals 7
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     invoke-virtual {p0, v0}, Lcom/google/android/material/tabs/TabLayout$c;->getChildAt(I)Landroid/view/View;
 
@@ -752,7 +752,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v3, v3, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorFullWidth:Z
 
@@ -764,7 +764,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -772,7 +772,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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -782,7 +782,7 @@
 
     float-to-int v1, v0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -793,7 +793,7 @@
     float-to-int v2, v0
 
     :cond_0
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOD:F
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM:F
 
     const/4 v3, 0x0
 
@@ -801,7 +801,7 @@
 
     if-lez v0, :cond_3
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$c;->getChildCount()I
 
@@ -811,7 +811,7 @@
 
     if-ge v0, v3, :cond_3
 
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOC:I
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -827,7 +827,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v5, v5, Lcom/google/android/material/tabs/TabLayout;->tabIndicatorFullWidth:Z
 
@@ -839,7 +839,7 @@
 
     check-cast v0, Lcom/google/android/material/tabs/TabLayout$d;
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -847,7 +847,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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -857,7 +857,7 @@
 
     float-to-int v3, v0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOG: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;
 
@@ -868,7 +868,7 @@
     float-to-int v4, v0
 
     :cond_1
-    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOD:F
+    iget v0, p0, Lcom/google/android/material/tabs/TabLayout$c;->aOM:F
 
     int-to-float v3, v3
 
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 6f08a07af3..88a2f080e9 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 private aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+.field final synthetic aOG:Lcom/google/android/material/tabs/TabLayout;
 
-.field aOP:Landroid/widget/ImageView;
+.field private aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
-.field aOQ:Landroid/widget/TextView;
+.field aOY:Landroid/widget/ImageView;
 
-.field aOR:Landroid/widget/ImageView;
+.field aOZ:Landroid/widget/TextView;
 
-.field private aOS:Landroid/graphics/drawable/Drawable;
+.field aPa:Landroid/widget/ImageView;
 
-.field private aOT:I
+.field private aPb:Landroid/graphics/drawable/Drawable;
 
-.field final synthetic aOx:Lcom/google/android/material/tabs/TabLayout;
+.field private aPc: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOT:I
+    iput v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPc:I
 
     invoke-direct {p0, p2}, Lcom/google/android/material/tabs/TabLayout$d;->av(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;->aOS:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb: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;->aOS:Landroid/graphics/drawable/Drawable;
+    iget-object p0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {p0, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V
 
@@ -131,7 +131,7 @@
 .method private av(Landroid/content/Context;)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOS:Landroid/graphics/drawable/Drawable;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb:Landroid/graphics/drawable/Drawable;
 
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOS:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb: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;->aOS:Landroid/graphics/drawable/Drawable;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb: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;->aOS:Landroid/graphics/drawable/Drawable;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v4, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {p1}, Lcom/google/android/material/tabs/TabLayout;->invalidate()V
 
@@ -283,7 +283,7 @@
 .method final a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     const/4 v1, 0x0
 
@@ -295,7 +295,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->getIcon()Landroid/graphics/drawable/Drawable;
 
@@ -315,7 +315,7 @@
     move-object v0, v1
 
     :goto_0
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz v2, :cond_1
 
@@ -393,7 +393,7 @@
 
     if-nez v2, :cond_6
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v2, v3}, Lcom/google/android/material/tabs/TabLayout;->dpToPx(I)I
 
@@ -405,7 +405,7 @@
     const/4 v2, 0x0
 
     :goto_4
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-boolean v3, v3, Lcom/google/android/material/tabs/TabLayout;->inlineLabel:Z
 
@@ -442,7 +442,7 @@
 
     :cond_8
     :goto_5
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz p1, :cond_9
 
@@ -469,11 +469,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;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eq p1, v0, :cond_0
 
-    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iput-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$d;->update()V
 
@@ -490,7 +490,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOS:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb:Landroid/graphics/drawable/Drawable;
 
     const/4 v2, 0x0
 
@@ -502,7 +502,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOS:Landroid/graphics/drawable/Drawable;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPb:Landroid/graphics/drawable/Drawable;
 
     invoke-virtual {v1, v0}, Landroid/graphics/drawable/Drawable;->setState([I)Z
 
@@ -515,7 +515,7 @@
 
     invoke-virtual {p0}, Lcom/google/android/material/tabs/TabLayout$d;->invalidate()V
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout;->invalidate()V
 
@@ -566,7 +566,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     invoke-virtual {v2}, Lcom/google/android/material/tabs/TabLayout;->getTabMaxWidth()I
 
@@ -579,7 +579,7 @@
     if-le v0, v2, :cond_1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget p1, p1, Lcom/google/android/material/tabs/TabLayout;->tabMaxWidth:I
 
@@ -596,13 +596,13 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOT:I
+    iget v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPc:I
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOP:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
 
     const/4 v3, 0x1
 
@@ -629,7 +629,7 @@
 
     if-le v2, v3, :cond_3
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget v0, v0, Lcom/google/android/material/tabs/TabLayout;->tabTextMultiLineSize:F
 
@@ -662,7 +662,7 @@
     if-eq v1, v5, :cond_7
 
     :cond_4
-    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v5, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget v5, v5, Lcom/google/android/material/tabs/TabLayout;->mode:I
 
@@ -749,7 +749,7 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     if-eqz v1, :cond_1
 
@@ -760,7 +760,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;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     invoke-virtual {v0}, Lcom/google/android/material/tabs/TabLayout$Tab;->select()V
 
@@ -811,7 +811,7 @@
     invoke-virtual {v0, p1}, Landroid/widget/TextView;->setSelected(Z)V
 
     :cond_2
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOP:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
 
     if-eqz v0, :cond_3
 
@@ -831,7 +831,7 @@
 .method final update()V
     .locals 5
 
-    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOO:Lcom/google/android/material/tabs/TabLayout$Tab;
+    iget-object v0, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOX:Lcom/google/android/material/tabs/TabLayout$Tab;
 
     const/4 v1, 0x0
 
@@ -876,13 +876,13 @@
     invoke-virtual {v3, v4}, Landroid/widget/TextView;->setVisibility(I)V
 
     :cond_3
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOP:Landroid/widget/ImageView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY: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;->aOP:Landroid/widget/ImageView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
 
     invoke-virtual {v3, v1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V
 
@@ -895,9 +895,9 @@
 
     check-cast v3, Landroid/widget/TextView;
 
-    iput-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOQ:Landroid/widget/TextView;
+    iput-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
-    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOQ:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
     if-eqz v3, :cond_5
 
@@ -905,7 +905,7 @@
 
     move-result v3
 
-    iput v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT:I
+    iput v3, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPc:I
 
     :cond_5
     const v3, 0x1020006
@@ -916,7 +916,7 @@
 
     check-cast v2, Landroid/widget/ImageView;
 
-    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOR:Landroid/widget/ImageView;
+    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
 
     goto :goto_1
 
@@ -930,9 +930,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;->aOQ:Landroid/widget/TextView;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
-    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOR:Landroid/widget/ImageView;
+    iput-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
 
     :goto_1
     iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->customView:Landroid/view/View;
@@ -941,7 +941,7 @@
 
     if-nez v2, :cond_d
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOP:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
 
     if-nez v2, :cond_8
 
@@ -963,7 +963,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;->aOP:Landroid/widget/ImageView;
+    iput-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
 
     :cond_8
     if-eqz v0, :cond_9
@@ -989,19 +989,19 @@
     :cond_9
     if-eqz v1, :cond_a
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabIconTintMode:Landroid/graphics/PorterDuff$Mode;
 
@@ -1038,18 +1038,18 @@
 
     move-result v1
 
-    iput v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOT:I
+    iput v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPc: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v1, v1, Lcom/google/android/material/tabs/TabLayout;->tabTextColors:Landroid/content/res/ColorStateList;
 
@@ -1057,7 +1057,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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOG:Lcom/google/android/material/tabs/TabLayout;
 
     iget-object v2, v2, Lcom/google/android/material/tabs/TabLayout;->tabTextColors:Landroid/content/res/ColorStateList;
 
@@ -1066,25 +1066,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;->aOP:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY: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;->aOQ:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
     if-nez v1, :cond_e
 
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOR:Landroid/widget/ImageView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
 
     if-eqz v1, :cond_f
 
     :cond_e
-    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOQ:Landroid/widget/TextView;
+    iget-object v1, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOR:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aPa:Landroid/widget/ImageView;
 
     invoke-virtual {p0, v1, v2}, Lcom/google/android/material/tabs/TabLayout$d;->a(Landroid/widget/TextView;Landroid/widget/ImageView;)V
 
@@ -1125,7 +1125,7 @@
     return-void
 .end method
 
-.method final zD()I
+.method final zG()I
     .locals 9
 
     const/4 v0, 0x3
@@ -1138,7 +1138,7 @@
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOP:Landroid/widget/ImageView;
+    iget-object v2, p0, Lcom/google/android/material/tabs/TabLayout$d;->aOY:Landroid/widget/ImageView;
 
     const/4 v4, 0x1
 
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 0d057bc41f..74b1f785e7 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
@@ -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;->aOy:Z
+    iput-boolean p2, v0, Lcom/google/android/material/tabs/TabLayout$a;->aOH: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;->aOx:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOG: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;->aOQ:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOR:Landroid/widget/ImageView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aPa: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;->aOP:Landroid/widget/ImageView;
+    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOY: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;->aOQ:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOZ:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aOR:Landroid/widget/ImageView;
+    iget-object v2, v0, Lcom/google/android/material/tabs/TabLayout$d;->aPa: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;->aOH:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     if-eqz v1, :cond_1
 
-    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOH:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOQ: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;->aOH:Landroid/animation/ValueAnimator;
+    iget-object v1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOQ:Landroid/animation/ValueAnimator;
 
     invoke-virtual {v1}, Landroid/animation/ValueAnimator;->cancel()V
 
     :cond_1
-    iput p1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOC:I
+    iput p1, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOL:I
 
-    iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOD:F
+    iput p2, p4, Lcom/google/android/material/tabs/TabLayout$c;->aOM:F
 
-    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->zC()V
+    invoke-virtual {p4}, Lcom/google/android/material/tabs/TabLayout$c;->zF()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 046aa60bca..c5bb377ff5 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 aPr:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$1;->aPA: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 a3614fde18..ea1d704c66 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 aPr:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$2;->aPA: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 af338fa9d1..9e980e8acd 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 aPr:Lcom/google/android/material/textfield/TextInputLayout;
+.field final synthetic aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aPA: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;->aPr:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$3;->aPA: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 33b25c01df..b2fd0590d9 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 aPs:Ljava/lang/CharSequence;
+.field aPB:Ljava/lang/CharSequence;
 
-.field aPt:Z
+.field aPC:Z
 
 
 # direct methods
@@ -58,7 +58,7 @@
 
     check-cast p2, Ljava/lang/CharSequence;
 
-    iput-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPs:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB: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;->aPt:Z
+    iput-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPC: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;->aPs:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB: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;->aPs:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB: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;->aPt:Z
+    iget-boolean p2, p0, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPC: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 b4962e00a0..722187b876 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;->zE()Z
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/a;->zH()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;->zH()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->zK()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;->zI()Z
+    invoke-virtual {v3}, Lcom/google/android/material/textfield/b;->zL()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;->aPi:Landroid/widget/TextView;
+    iget-object v5, v4, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     if-eqz v5, :cond_4
 
-    iget-object v4, v4, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v4, v4, Lcom/google/android/material/textfield/b;->aPr: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;->zE()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/a;->zH()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;->aPh:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPg:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPp: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;->zJ()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zM()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;->zJ()I
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zM()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;->aPk:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPt: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;->aPj:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPs: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;->aPl:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPh:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPe:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
     const/4 v2, 0x2
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPj:Ljava/lang/CharSequence;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPs: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;->aPk:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPt: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;->aPs:Ljava/lang/CharSequence;
+    iget-object v0, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB: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;->aPt:Z
+    iget-boolean p1, p1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPC: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;->zI()Z
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zL()Z
 
     move-result v0
 
@@ -3266,12 +3266,12 @@
 
     move-result-object v0
 
-    iput-object v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPs:Ljava/lang/CharSequence;
+    iput-object v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPB: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;->aPt:Z
+    iput-boolean v0, v1, Lcom/google/android/material/textfield/TextInputLayout$SavedState;->aPC: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;->aPh:Z
+    iget-boolean v0, v0, Lcom/google/android/material/textfield/b;->aPq: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;->zG()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()V
 
-    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPg:Ljava/lang/CharSequence;
+    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPp:Ljava/lang/CharSequence;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
     if-eq v2, v1, :cond_2
 
-    iput v1, v0, Lcom/google/android/material/textfield/b;->aPf:I
+    iput v1, v0, Lcom/google/android/material/textfield/b;->aPo:I
 
     :cond_2
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPf:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
 
-    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPr: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;->zF()V
+    invoke-virtual {p1}, Lcom/google/android/material/textfield/b;->zI()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;->aPh:Z
+    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aPq:Z
 
     if-eq v1, p1, :cond_2
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zG()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()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;->aPi:Landroid/widget/TextView;
+    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr: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;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr: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;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr: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;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr: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;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr: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;->zF()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zI()V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPr: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;->aPi:Landroid/widget/TextView;
+    iput-object v1, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPg: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;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPg: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;->aPh:Z
+    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aPq: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;->aPi:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPr: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;->zG()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()V
 
-    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPj:Ljava/lang/CharSequence;
+    iput-object p1, v0, Lcom/google/android/material/textfield/b;->aPs:Ljava/lang/CharSequence;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     invoke-virtual {v1, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
     const/4 v2, 0x2
 
     if-eq v1, v2, :cond_2
 
-    iput v2, v0, Lcom/google/android/material/textfield/b;->aPf:I
+    iput v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
 
     :cond_2
-    iget v1, v0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v1, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPf:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
 
-    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v3, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPl:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPk:Z
+    iget-boolean v1, v0, Lcom/google/android/material/textfield/b;->aPt:Z
 
     if-eq v1, p1, :cond_3
 
-    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zG()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()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;->aPl:Landroid/widget/TextView;
+    iput-object v2, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPl:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPl:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPl:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu: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;->cF(I)V
 
-    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu: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;->zG()V
+    invoke-virtual {v0}, Lcom/google/android/material/textfield/b;->zJ()V
 
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
     const/4 v3, 0x2
 
@@ -4013,14 +4013,14 @@
 
     const/4 v2, 0x0
 
-    iput v2, v0, Lcom/google/android/material/textfield/b;->aPf:I
+    iput v2, v0, Lcom/google/android/material/textfield/b;->aPo:I
 
     :cond_2
-    iget v2, v0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v2, v0, Lcom/google/android/material/textfield/b;->aPn:I
 
-    iget v3, v0, Lcom/google/android/material/textfield/b;->aPf:I
+    iget v3, v0, Lcom/google/android/material/textfield/b;->aPo:I
 
-    iget-object v4, v0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v4, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPl:Landroid/widget/TextView;
+    iget-object v2, v0, Lcom/google/android/material/textfield/b;->aPu: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;->aPl:Landroid/widget/TextView;
+    iput-object v5, v0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
-    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPg: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;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPg: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;->aPk:Z
+    iput-boolean p1, v0, Lcom/google/android/material/textfield/b;->aPt: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;->aPi:Landroid/widget/TextView;
+    iget-object v1, v0, Lcom/google/android/material/textfield/b;->aPr: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;->aPl:Landroid/widget/TextView;
+    iget-object v0, v0, Lcom/google/android/material/textfield/b;->aPu: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;->zI()Z
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->zL()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;->zJ()I
+    invoke-virtual {v1}, Lcom/google/android/material/textfield/b;->zM()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;->zI()Z
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->zL()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;->zJ()I
+    invoke-virtual {v2}, Lcom/google/android/material/textfield/b;->zM()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 1c4d156f90..f0f148cb92 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 aOU:Landroid/graphics/Paint;
+.field private final aPd:Landroid/graphics/Paint;
 
-.field private final aOV:Landroid/graphics/RectF;
+.field private final aPe:Landroid/graphics/RectF;
 
-.field private aOW:I
+.field private aPf: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;->aOU:Landroid/graphics/Paint;
+    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aPd:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOU:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPd: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;->aOU:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPd: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;->aOU:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPd:Landroid/graphics/Paint;
 
     new-instance v1, Landroid/graphics/PorterDuffXfermode;
 
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iput-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 .method final b(FFFF)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
@@ -69,7 +69,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
@@ -77,7 +77,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->right:F
 
@@ -85,7 +85,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->bottom:F
 
@@ -94,7 +94,7 @@
     if-eqz v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     invoke-virtual {v0, p1, p2, p3, p4}, Landroid/graphics/RectF;->set(FFFF)V
 
@@ -156,7 +156,7 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/textfield/a;->aOW:I
+    iput v0, p0, Lcom/google/android/material/textfield/a;->aPf:I
 
     goto :goto_0
 
@@ -187,14 +187,14 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/google/android/material/textfield/a;->aOW:I
+    iput v0, p0, Lcom/google/android/material/textfield/a;->aPf: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;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/a;->aOU:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/google/android/material/textfield/a;->aPd:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Canvas;->drawRect(Landroid/graphics/RectF;Landroid/graphics/Paint;)V
 
@@ -206,7 +206,7 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lcom/google/android/material/textfield/a;->aOW:I
+    iget v0, p0, Lcom/google/android/material/textfield/a;->aPf:I
 
     invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->restoreToCount(I)V
 
@@ -214,10 +214,10 @@
     return-void
 .end method
 
-.method final zE()Z
+.method final zH()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aOV:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/google/android/material/textfield/a;->aPe:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->isEmpty()Z
 
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 755effcebf..6f6f8db4d8 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 aPm:I
+.field final synthetic aPv:I
 
-.field final synthetic aPn:Landroid/widget/TextView;
+.field final synthetic aPw:Landroid/widget/TextView;
 
-.field final synthetic aPo:I
+.field final synthetic aPx:I
 
-.field final synthetic aPp:Landroid/widget/TextView;
+.field final synthetic aPy:Landroid/widget/TextView;
 
-.field final synthetic aPq:Lcom/google/android/material/textfield/b;
+.field final synthetic aPz: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;->aPq:Lcom/google/android/material/textfield/b;
+    iput-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPz:Lcom/google/android/material/textfield/b;
 
-    iput p2, p0, Lcom/google/android/material/textfield/b$1;->aPm:I
+    iput p2, p0, Lcom/google/android/material/textfield/b$1;->aPv:I
 
-    iput-object p3, p0, Lcom/google/android/material/textfield/b$1;->aPn:Landroid/widget/TextView;
+    iput-object p3, p0, Lcom/google/android/material/textfield/b$1;->aPw:Landroid/widget/TextView;
 
-    iput p4, p0, Lcom/google/android/material/textfield/b$1;->aPo:I
+    iput p4, p0, Lcom/google/android/material/textfield/b$1;->aPx:I
 
-    iput-object p5, p0, Lcom/google/android/material/textfield/b$1;->aPp:Landroid/widget/TextView;
+    iput-object p5, p0, Lcom/google/android/material/textfield/b$1;->aPy: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;->aPq:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPz:Lcom/google/android/material/textfield/b;
 
-    iget v0, p0, Lcom/google/android/material/textfield/b$1;->aPm:I
+    iget v0, p0, Lcom/google/android/material/textfield/b$1;->aPv:I
 
-    iput v0, p1, Lcom/google/android/material/textfield/b;->aPe:I
+    iput v0, p1, Lcom/google/android/material/textfield/b;->aPn:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p1, Lcom/google/android/material/textfield/b;->aPc:Landroid/animation/Animator;
+    iput-object v0, p1, Lcom/google/android/material/textfield/b;->aPl:Landroid/animation/Animator;
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPn:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPw: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;->aPo:I
+    iget p1, p0, Lcom/google/android/material/textfield/b$1;->aPx:I
 
     const/4 v1, 0x1
 
     if-ne p1, v1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPq:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPz:Lcom/google/android/material/textfield/b;
 
-    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPq:Lcom/google/android/material/textfield/b;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPz:Lcom/google/android/material/textfield/b;
 
-    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object p1, p1, Lcom/google/android/material/textfield/b;->aPr: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;->aPp:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b$1;->aPy: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 f8632bff27..136abf81a2 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 aOX:Lcom/google/android/material/textfield/TextInputLayout;
+.field final aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
-.field private aOY:Landroid/widget/LinearLayout;
+.field private aPh:Landroid/widget/LinearLayout;
 
-.field private aOZ:I
+.field private aPi:I
 
-.field private aPa:Landroid/widget/FrameLayout;
+.field private aPj:Landroid/widget/FrameLayout;
 
-.field private aPb:I
+.field private aPk:I
 
-.field aPc:Landroid/animation/Animator;
+.field aPl:Landroid/animation/Animator;
 
-.field private final aPd:F
+.field private final aPm:F
 
-.field aPe:I
+.field aPn:I
 
-.field aPf:I
+.field aPo:I
 
-.field aPg:Ljava/lang/CharSequence;
+.field aPp:Ljava/lang/CharSequence;
 
-.field aPh:Z
+.field aPq:Z
 
-.field aPi:Landroid/widget/TextView;
+.field aPr:Landroid/widget/TextView;
 
-.field aPj:Ljava/lang/CharSequence;
+.field aPs:Ljava/lang/CharSequence;
 
-.field aPk:Z
+.field aPt:Z
 
-.field aPl:Landroid/widget/TextView;
+.field aPu: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;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iput-object p1, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     iget-object p1, p0, Lcom/google/android/material/textfield/b;->context:Landroid/content/Context;
 
@@ -71,7 +71,7 @@
 
     int-to-float p1, p1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aPd:F
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPm:F
 
     return-void
 .end method
@@ -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;->aPe:I
+    iput p2, p0, Lcom/google/android/material/textfield/b;->aPn:I
 
     return-void
 .end method
@@ -136,7 +136,7 @@
 
     new-array v1, v1, [F
 
-    iget v2, p0, Lcom/google/android/material/textfield/b;->aPd:F
+    iget v2, p0, Lcom/google/android/material/textfield/b;->aPm:F
 
     neg-float v2, v2
 
@@ -318,12 +318,12 @@
     return-object p1
 
     :cond_0
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     return-object p1
 
     :cond_1
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     return-object p1
 .end method
@@ -339,15 +339,15 @@
 
     invoke-direct {v7}, Landroid/animation/AnimatorSet;-><init>()V
 
-    iput-object v7, p0, Lcom/google/android/material/textfield/b;->aPc:Landroid/animation/Animator;
+    iput-object v7, p0, Lcom/google/android/material/textfield/b;->aPl: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;->aPk:Z
+    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aPt:Z
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     const/4 v4, 0x2
 
@@ -361,9 +361,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;->aPh:Z
+    iget-boolean v2, p0, Lcom/google/android/material/textfield/b;->aPq:Z
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     const/4 v4, 0x1
 
@@ -401,15 +401,15 @@
     invoke-direct {p0, p1, p2}, Lcom/google/android/material/textfield/b;->O(II)V
 
     :goto_0
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg: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;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg: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;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->updateTextInputBoxState()V
 
@@ -419,13 +419,13 @@
 .method final a(Landroid/widget/TextView;I)V
     .locals 6
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
     const/4 v1, 0x0
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPa:Landroid/widget/FrameLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
 
     if-nez v0, :cond_0
 
@@ -435,15 +435,15 @@
 
     invoke-direct {v0, v2}, Landroid/widget/LinearLayout;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
     invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setOrientation(I)V
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
     const/4 v3, -0x1
 
@@ -457,11 +457,11 @@
 
     invoke-direct {v0, v2}, Landroid/widget/FrameLayout;-><init>(Landroid/content/Context;)V
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPa:Landroid/widget/FrameLayout;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPa:Landroid/widget/FrameLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
 
     new-instance v5, Landroid/widget/FrameLayout$LayoutParams;
 
@@ -481,11 +481,11 @@
 
     invoke-direct {v2, v1, v1, v3}, Landroid/widget/LinearLayout$LayoutParams;-><init>(IIF)V
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPh: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;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -493,7 +493,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zH()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zK()V
 
     :cond_0
     invoke-static {p2}, Lcom/google/android/material/textfield/b;->cD(I)Z
@@ -502,37 +502,37 @@
 
     if-eqz v0, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPa:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPa:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
 
     invoke-virtual {p2, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aPb:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aPb:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh: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;->aOY:Landroid/widget/LinearLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
     invoke-virtual {p1, v1}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
-    iget p1, p0, Lcom/google/android/material/textfield/b;->aOZ:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aOZ:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
 
     return-void
 .end method
@@ -540,7 +540,7 @@
 .method final a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
     .locals 2
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-static {v0}, Landroidx/core/view/ViewCompat;->isLaidOut(Landroid/view/View;)Z
 
@@ -548,7 +548,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->isEnabled()Z
 
@@ -556,9 +556,9 @@
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPf:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPo:I
 
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aPn:I
 
     if-ne v0, v1, :cond_0
 
@@ -588,7 +588,7 @@
 .method final b(Landroid/widget/TextView;I)V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
     if-nez v0, :cond_0
 
@@ -601,41 +601,41 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPa:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPj:Landroid/widget/FrameLayout;
 
     if-eqz p2, :cond_1
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPb:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lcom/google/android/material/textfield/b;->aPb:I
+    iput v0, p0, Lcom/google/android/material/textfield/b;->aPk:I
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPb:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPk: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;->aPa:Landroid/widget/FrameLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPj: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;->aOY:Landroid/widget/LinearLayout;
+    iget-object p2, p0, Lcom/google/android/material/textfield/b;->aPh: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;->aOZ:I
+    iget p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lcom/google/android/material/textfield/b;->aOZ:I
+    iput p1, p0, Lcom/google/android/material/textfield/b;->aPi:I
 
-    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object p1, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
-    iget p2, p0, Lcom/google/android/material/textfield/b;->aOZ:I
+    iget p2, p0, Lcom/google/android/material/textfield/b;->aPi:I
 
     invoke-static {p1, p2}, Lcom/google/android/material/textfield/b;->a(Landroid/view/ViewGroup;I)V
 
@@ -647,7 +647,7 @@
 
     iput p1, p0, Lcom/google/android/material/textfield/b;->helperTextTextAppearance:I
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPl:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPu:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
@@ -662,11 +662,11 @@
 
     iput p1, p0, Lcom/google/android/material/textfield/b;->errorTextAppearance:I
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v1, v0, p1}, Lcom/google/android/material/textfield/TextInputLayout;->setTextAppearanceCompatWithErrorFallback(Landroid/widget/TextView;I)V
 
@@ -674,26 +674,26 @@
     return-void
 .end method
 
-.method final zF()V
+.method final zI()V
     .locals 4
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Ljava/lang/CharSequence;
+    iput-object v0, p0, Lcom/google/android/material/textfield/b;->aPp:Ljava/lang/CharSequence;
 
-    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zG()V
+    invoke-virtual {p0}, Lcom/google/android/material/textfield/b;->zJ()V
 
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aPn:I
 
     const/4 v2, 0x1
 
     if-ne v1, v2, :cond_1
 
-    iget-boolean v1, p0, Lcom/google/android/material/textfield/b;->aPk:Z
+    iget-boolean v1, p0, Lcom/google/android/material/textfield/b;->aPt:Z
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPj:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lcom/google/android/material/textfield/b;->aPs:Ljava/lang/CharSequence;
 
     invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -703,22 +703,22 @@
 
     const/4 v1, 0x2
 
-    iput v1, p0, Lcom/google/android/material/textfield/b;->aPf:I
+    iput v1, p0, Lcom/google/android/material/textfield/b;->aPo:I
 
     goto :goto_0
 
     :cond_0
     const/4 v1, 0x0
 
-    iput v1, p0, Lcom/google/android/material/textfield/b;->aPf:I
+    iput v1, p0, Lcom/google/android/material/textfield/b;->aPo:I
 
     :cond_1
     :goto_0
-    iget v1, p0, Lcom/google/android/material/textfield/b;->aPe:I
+    iget v1, p0, Lcom/google/android/material/textfield/b;->aPn:I
 
-    iget v2, p0, Lcom/google/android/material/textfield/b;->aPf:I
+    iget v2, p0, Lcom/google/android/material/textfield/b;->aPo:I
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     invoke-virtual {p0, v3, v0}, Lcom/google/android/material/textfield/b;->a(Landroid/widget/TextView;Ljava/lang/CharSequence;)Z
 
@@ -729,10 +729,10 @@
     return-void
 .end method
 
-.method final zG()V
+.method final zJ()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPc:Landroid/animation/Animator;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPl:Landroid/animation/Animator;
 
     if-eqz v0, :cond_0
 
@@ -742,16 +742,16 @@
     return-void
 .end method
 
-.method final zH()V
+.method final zK()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v0}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -769,9 +769,9 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aOY:Landroid/widget/LinearLayout;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPh:Landroid/widget/LinearLayout;
 
-    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v2, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v2}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -781,7 +781,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aOX:Lcom/google/android/material/textfield/TextInputLayout;
+    iget-object v3, p0, Lcom/google/android/material/textfield/b;->aPg:Lcom/google/android/material/textfield/TextInputLayout;
 
     invoke-virtual {v3}, Lcom/google/android/material/textfield/TextInputLayout;->getEditText()Landroid/widget/EditText;
 
@@ -797,20 +797,20 @@
     return-void
 .end method
 
-.method final zI()Z
+.method final zL()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/android/material/textfield/b;->aPf:I
+    iget v0, p0, Lcom/google/android/material/textfield/b;->aPo:I
 
     const/4 v1, 0x1
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPg:Ljava/lang/CharSequence;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPp:Ljava/lang/CharSequence;
 
     invoke-static {v0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -826,10 +826,10 @@
     return v0
 .end method
 
-.method final zJ()I
+.method final zM()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPi:Landroid/widget/TextView;
+    iget-object v0, p0, Lcom/google/android/material/textfield/b;->aPr:Landroid/widget/TextView;
 
     if-eqz v0, :cond_0
 
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 b4ba6ff790..3e8ef5bd33 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 aMK:Landroid/view/View;
+.field final synthetic aMT:Landroid/view/View;
 
-.field final synthetic aPu:I
+.field final synthetic aPD:I
 
-.field final synthetic aPv:Lcom/google/android/material/expandable/ExpandableWidget;
+.field final synthetic aPE:Lcom/google/android/material/expandable/ExpandableWidget;
 
-.field final synthetic aPw:Lcom/google/android/material/transformation/ExpandableBehavior;
+.field final synthetic aPF: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;->aPw:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPF:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMK:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMT:Landroid/view/View;
 
-    iput p3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPu:I
+    iput p3, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPD:I
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPv:Lcom/google/android/material/expandable/ExpandableWidget;
+    iput-object p4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPE: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;->aMK:Landroid/view/View;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMT: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;->aPw:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPF: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;->aPu:I
+    iget v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPD:I
 
     const/4 v2, 0x0
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPw:Lcom/google/android/material/transformation/ExpandableBehavior;
+    iget-object v0, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPF:Lcom/google/android/material/transformation/ExpandableBehavior;
 
-    iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPv:Lcom/google/android/material/expandable/ExpandableWidget;
+    iget-object v1, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aPE: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;->aMK:Landroid/view/View;
+    iget-object v4, p0, Lcom/google/android/material/transformation/ExpandableBehavior$1;->aMT: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 1634c967d5..03bb18731f 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 aPx:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+.field final synthetic aPG: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;->aPx:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aPG: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;->aPx:Lcom/google/android/material/transformation/ExpandableTransformationBehavior;
+    iget-object p1, p0, Lcom/google/android/material/transformation/ExpandableTransformationBehavior$1;->aPG: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 a3f6ef9b40..6e8b3342e6 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 aMK:Landroid/view/View;
+.field final synthetic aMT:Landroid/view/View;
 
-.field final synthetic aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPH:Z
 
-.field final synthetic aPy:Z
+.field final synthetic aPI:Landroid/view/View;
 
-.field final synthetic aPz:Landroid/view/View;
+.field final synthetic aPJ: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;->aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPy:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPH:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMK:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMT:Landroid/view/View;
 
-    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPz:Landroid/view/View;
+    iput-object p4, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPI: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;->aPy:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPH:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMT: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;->aPz:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPI: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;->aPz:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPI: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;->aPy:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPH:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aMT: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;->aPz:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPI: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;->aPz:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$1;->aPI: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 7085d9c8e7..24d57cf491 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 aMK:Landroid/view/View;
+.field final synthetic aMT:Landroid/view/View;
 
-.field final synthetic aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPJ: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;->aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aMK:Landroid/view/View;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aMT: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;->aMK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$2;->aMT: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 56aec77806..6690ef7c13 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 aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-.field final synthetic aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-.field final synthetic aPC:Landroid/graphics/drawable/Drawable;
+.field final synthetic aPL: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;->aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPC:Landroid/graphics/drawable/Drawable;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPL: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;->aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPK: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;->aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPK:Lcom/google/android/material/circularreveal/CircularRevealWidget;
 
-    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPC:Landroid/graphics/drawable/Drawable;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$3;->aPL: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 2709c54b2a..9eb1662b82 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 aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+.field final synthetic aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-.field final synthetic aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+.field final synthetic aPK: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;->aPA:Lcom/google/android/material/transformation/FabTransformationBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPJ:Lcom/google/android/material/transformation/FabTransformationBehavior;
 
-    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iput-object p2, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPK: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;->aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPK: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;->aPB:Lcom/google/android/material/circularreveal/CircularRevealWidget;
+    iget-object v0, p0, Lcom/google/android/material/transformation/FabTransformationBehavior$4;->aPK: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 5339898f5f..16058c58db 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 aMK:Landroid/view/View;
+.field final synthetic aMT:Landroid/view/View;
 
-.field final synthetic aPD:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
+.field final synthetic aPH:Z
 
-.field final synthetic aPy:Z
+.field final synthetic aPM: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;->aPD:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
+    iput-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPM:Lcom/google/android/material/transformation/FabTransformationScrimBehavior;
 
-    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPy:Z
+    iput-boolean p2, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPH:Z
 
-    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMK:Landroid/view/View;
+    iput-object p3, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMT: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;->aPy:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPH:Z
 
     if-nez p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMT: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;->aPy:Z
+    iget-boolean p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aPH:Z
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMK:Landroid/view/View;
+    iget-object p1, p0, Lcom/google/android/material/transformation/FabTransformationScrimBehavior$1;->aMT: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 5e1890cd01..aa4195718b 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 aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$a;->aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$a;->aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lcom/google/firebase/FirebaseApp$a;->aPZ: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;->mn()Lcom/google/android/gms/common/api/internal/b;
+    invoke-static {}, Lcom/google/android/gms/common/api/internal/b;->mq()Lcom/google/android/gms/common/api/internal/b;
 
     move-result-object p0
 
@@ -106,7 +106,7 @@
 .method public final E(Z)V
     .locals 4
 
-    invoke-static {}, Lcom/google/firebase/FirebaseApp;->zO()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/FirebaseApp;->zR()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;->aPG:Ljava/util/Map;
+    sget-object v2, Lcom/google/firebase/FirebaseApp;->aPP: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 1b914c409b..b305e4f873 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 aPR:Landroid/os/Handler;
+.field private static final aQa: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;->aPR:Landroid/os/Handler;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$b;->aQa: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;->aPR:Landroid/os/Handler;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$b;->aQa: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 378b672292..22ce8a0c19 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 aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lcom/google/firebase/FirebaseApp$c;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 .method static synthetic ay(Landroid/content/Context;)V
     .locals 3
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp$c;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lcom/google/firebase/FirebaseApp$c;->aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lcom/google/firebase/FirebaseApp$c;->aPZ: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;->zO()Ljava/lang/Object;
+    invoke-static {}, Lcom/google/firebase/FirebaseApp;->zR()Ljava/lang/Object;
 
     move-result-object p1
 
     monitor-enter p1
 
     :try_start_0
-    sget-object p2, Lcom/google/firebase/FirebaseApp;->aPG:Ljava/util/Map;
+    sget-object p2, Lcom/google/firebase/FirebaseApp;->aPP: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 b658945c23..842f383761 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 aPE:Ljava/lang/Object;
+.field private static final aPN:Ljava/lang/Object;
 
-.field private static final aPF:Ljava/util/concurrent/Executor;
+.field private static final aPO:Ljava/util/concurrent/Executor;
 
-.field static final aPG:Ljava/util/Map;
+.field static final aPP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -31,15 +31,15 @@
 
 
 # instance fields
-.field private final aPH:Lcom/google/firebase/c;
+.field private final aPQ:Lcom/google/firebase/c;
 
-.field private final aPI:Lcom/google/firebase/components/i;
+.field private final aPR:Lcom/google/firebase/components/i;
 
-.field private final aPJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final aPS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aPK:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final aPT:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final aPL:Lcom/google/firebase/components/s;
+.field private final aPU: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 aPM:Ljava/util/List;
+.field private final aPV:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field private final aPN:Ljava/util/List;
+.field private final aPW: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;->aPE:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aPN: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;->aPF:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aPO: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;->aPG:Ljava/util/Map;
+    sput-object v0, Lcom/google/firebase/FirebaseApp;->aPP: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;->aPJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPS: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;->aPK:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPT: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;->aPM:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPV: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;->aPN:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPW:Ljava/util/List;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -152,7 +152,7 @@
 
     check-cast p2, Lcom/google/firebase/c;
 
-    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aPH:Lcom/google/firebase/c;
+    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aPQ: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;->aQp:Lcom/google/firebase/components/f$b;
+    iget-object v0, p2, Lcom/google/firebase/components/f;->aQy:Lcom/google/firebase/components/f$b;
 
-    iget-object p2, p2, Lcom/google/firebase/components/f;->aQo:Ljava/lang/Object;
+    iget-object p2, p2, Lcom/google/firebase/components/f;->aQx:Ljava/lang/Object;
 
     invoke-interface {v0, p2}, Lcom/google/firebase/components/f$b;->aA(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;->aPF:Ljava/util/concurrent/Executor;
+    sget-object v2, Lcom/google/firebase/FirebaseApp;->aPO:Ljava/util/concurrent/Executor;
 
     const/4 v3, 0x6
 
@@ -240,7 +240,7 @@
 
     aput-object p3, v3, v1
 
-    invoke-static {}, Lcom/google/firebase/d/b;->Aq()Lcom/google/firebase/components/b;
+    invoke-static {}, Lcom/google/firebase/d/b;->At()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;->aPI:Lcom/google/firebase/components/i;
+    iput-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPR:Lcom/google/firebase/components/i;
 
     new-instance p2, Lcom/google/firebase/components/s;
 
@@ -260,7 +260,7 @@
 
     invoke-direct {p2, p3}, Lcom/google/firebase/components/s;-><init>(Lcom/google/firebase/b/a;)V
 
-    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aPL:Lcom/google/firebase/components/s;
+    iput-object p2, p0, Lcom/google/firebase/FirebaseApp;->aPU:Lcom/google/firebase/components/s;
 
     return-void
 .end method
@@ -288,12 +288,12 @@
     move-result-object p0
 
     :goto_0
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPN:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPG:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
 
     invoke-interface {v1, p2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -335,7 +335,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;->aPG:Ljava/util/Map;
+    sget-object p0, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
 
     invoke-interface {p0, p2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -343,7 +343,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-direct {v1}, Lcom/google/firebase/FirebaseApp;->zN()V
+    invoke-direct {v1}, Lcom/google/firebase/FirebaseApp;->zQ()V
 
     return-object v1
 
@@ -389,11 +389,11 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zK()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zN()Lcom/google/firebase/c;
 
     move-result-object v2
 
-    iget-object v2, v2, Lcom/google/firebase/c;->aPS:Ljava/lang/String;
+    iget-object v2, v2, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     invoke-static {}, Ljava/nio/charset/Charset;->defaultCharset()Ljava/nio/charset/Charset;
 
@@ -413,7 +413,7 @@
 
     move-result-object v1
 
-    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPI:Lcom/google/firebase/components/i;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPR:Lcom/google/firebase/components/i;
 
     const-class v2, Lcom/google/firebase/a/c;
 
@@ -431,7 +431,7 @@
 .method static synthetic a(Lcom/google/firebase/FirebaseApp;)V
     .locals 0
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zN()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zQ()V
 
     return-void
 .end method
@@ -445,7 +445,7 @@
 
     invoke-static {p1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPM:Ljava/util/List;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPV:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -469,12 +469,12 @@
 .method public static aw(Landroid/content/Context;)Lcom/google/firebase/FirebaseApp;
     .locals 3
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPN:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPG:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
 
     const-string v2, "[DEFAULT]"
 
@@ -535,7 +535,7 @@
 .method static synthetic b(Lcom/google/firebase/FirebaseApp;)Ljava/util/concurrent/atomic/AtomicBoolean;
     .locals 0
 
-    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lcom/google/firebase/FirebaseApp;->aPS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-object p0
 .end method
@@ -543,12 +543,12 @@
 .method public static getInstance()Lcom/google/firebase/FirebaseApp;
     .locals 4
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPN:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPG:Ljava/util/Map;
+    sget-object v1, Lcom/google/firebase/FirebaseApp;->aPP:Ljava/util/Map;
 
     const-string v2, "[DEFAULT]"
 
@@ -573,7 +573,7 @@
 
     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-static {}, Lcom/google/android/gms/common/util/m;->nu()Ljava/lang/String;
+    invoke-static {}, Lcom/google/android/gms/common/util/m;->nx()Ljava/lang/String;
 
     move-result-object v3
 
@@ -601,10 +601,10 @@
     throw v1
 .end method
 
-.method private zL()V
+.method private zO()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPK:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPT:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -619,7 +619,7 @@
     return-void
 .end method
 
-.method private zN()V
+.method private zQ()V
     .locals 2
 
     iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->applicationContext:Landroid/content/Context;
@@ -639,9 +639,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPI:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPR:Lcom/google/firebase/components/i;
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zM()Z
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zP()Z
 
     move-result v1
 
@@ -650,10 +650,10 @@
     return-void
 .end method
 
-.method static synthetic zO()Ljava/lang/Object;
+.method static synthetic zR()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/FirebaseApp;->aPN:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -690,7 +690,7 @@
 .method public final getApplicationContext()Landroid/content/Context;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zL()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
 
     iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->applicationContext:Landroid/content/Context;
 
@@ -700,7 +700,7 @@
 .method public final getName()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zL()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
 
     iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->name:Ljava/lang/String;
 
@@ -722,9 +722,9 @@
 .method public isDataCollectionDefaultEnabled()Z
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zL()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPL:Lcom/google/firebase/components/s;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPU:Lcom/google/firebase/components/s;
 
     invoke-virtual {v0}, Lcom/google/firebase/components/s;->get()Ljava/lang/Object;
 
@@ -732,7 +732,7 @@
 
     check-cast v0, Lcom/google/firebase/c/a;
 
-    iget-object v0, v0, Lcom/google/firebase/c/a;->aSn:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, v0, Lcom/google/firebase/c/a;->aSw:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -756,7 +756,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/FirebaseApp;->aPH:Lcom/google/firebase/c;
+    iget-object v1, p0, Lcom/google/firebase/FirebaseApp;->aPQ:Lcom/google/firebase/c;
 
     const-string v2, "options"
 
@@ -783,9 +783,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zL()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPI:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPR:Lcom/google/firebase/components/i;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/components/i;->z(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -794,17 +794,17 @@
     return-object p1
 .end method
 
-.method public final zK()Lcom/google/firebase/c;
+.method public final zN()Lcom/google/firebase/c;
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zL()V
+    invoke-direct {p0}, Lcom/google/firebase/FirebaseApp;->zO()V
 
-    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPH:Lcom/google/firebase/c;
+    iget-object v0, p0, Lcom/google/firebase/FirebaseApp;->aPQ:Lcom/google/firebase/c;
 
     return-object v0
 .end method
 
-.method public final zM()Z
+.method public final zP()Z
     .locals 2
 
     invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->getName()Ljava/lang/String;
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 4f1d911ce9..0f1c8b9921 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/FirebaseAnalytics.smali
@@ -4,17 +4,17 @@
 
 
 # static fields
-.field private static volatile aPY:Lcom/google/firebase/analytics/FirebaseAnalytics;
+.field private static volatile aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
 
 # instance fields
-.field public final aBB:Lcom/google/android/gms/measurement/internal/ey;
+.field public final aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-.field public final aPZ:Lcom/google/android/gms/internal/measurement/me;
+.field public final aQi:Lcom/google/android/gms/internal/measurement/me;
 
-.field private final ast:Ljava/lang/Object;
+.field private final asC:Ljava/lang/Object;
 
-.field public final awV:Z
+.field public final axe:Z
 
 
 # direct methods
@@ -27,19 +27,19 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPZ:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->awV:Z
+    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->ast:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->asC:Ljava/lang/Object;
 
     return-void
 .end method
@@ -51,21 +51,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;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPZ:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->awV:Z
+    iput-boolean p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->ast:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->asC:Ljava/lang/Object;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 .method public static getInstance(Landroid/content/Context;)Lcom/google/firebase/analytics/FirebaseAnalytics;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPY:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object v0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     if-nez v0, :cond_2
 
@@ -82,7 +82,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPY:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     if-nez v1, :cond_1
 
@@ -100,7 +100,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/firebase/analytics/FirebaseAnalytics;-><init>(Lcom/google/android/gms/internal/measurement/me;)V
 
-    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPY:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     goto :goto_0
 
@@ -115,7 +115,7 @@
 
     invoke-direct {v1, p0}, Lcom/google/firebase/analytics/FirebaseAnalytics;-><init>(Lcom/google/android/gms/measurement/internal/ey;)V
 
-    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPY:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sput-object v1, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     :cond_1
     :goto_0
@@ -134,7 +134,7 @@
 
     :cond_2
     :goto_1
-    sget-object p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPY:Lcom/google/firebase/analytics/FirebaseAnalytics;
+    sget-object p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQh:Lcom/google/firebase/analytics/FirebaseAnalytics;
 
     return-object p0
 .end method
@@ -174,20 +174,20 @@
 .method public final cS(Ljava/lang/String;)V
     .locals 3
 
-    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->awV:Z
+    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPZ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/internal/measurement/me;->aL(Ljava/lang/String;)V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v0
 
@@ -203,13 +203,13 @@
 .method public final getFirebaseInstanceId()Ljava/lang/String;
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xV()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xY()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qW()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qZ()Ljava/lang/String;
 
     move-result-object v0
 
@@ -219,11 +219,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;->awV:Z
+    iget-boolean v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->axe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aPZ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aQi:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/e;
 
@@ -234,19 +234,19 @@
     return-void
 
     :cond_0
-    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pE()Z
+    invoke-static {}, Lcom/google/android/gms/measurement/internal/jz;->pH()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object p1, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vu()Lcom/google/android/gms/measurement/internal/dv;
+    invoke-virtual {p1}, Lcom/google/android/gms/measurement/internal/ey;->vx()Lcom/google/android/gms/measurement/internal/dv;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aEu:Lcom/google/android/gms/measurement/internal/dx;
+    iget-object p1, p1, Lcom/google/android/gms/measurement/internal/dv;->aED:Lcom/google/android/gms/measurement/internal/dx;
 
     const-string p2, "setCurrentScreen must be called from the main thread"
 
@@ -255,9 +255,9 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, p0, Lcom/google/firebase/analytics/FirebaseAnalytics;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->ye()Lcom/google/android/gms/measurement/internal/hh;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yh()Lcom/google/android/gms/measurement/internal/hh;
 
     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 e81cb50af5..f86f9ef06a 100644
--- a/com.discord/smali_classes2/com/google/firebase/analytics/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/analytics/a.smali
@@ -7,14 +7,14 @@
 
 
 # instance fields
-.field private final synthetic azJ:Lcom/google/android/gms/internal/measurement/me;
+.field private final synthetic azS:Lcom/google/android/gms/internal/measurement/me;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/android/gms/internal/measurement/me;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iput-object p1, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -26,7 +26,7 @@
 .method public final L(Z)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/q;
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -90,7 +90,7 @@
 .method public final a(Lcom/google/android/gms/measurement/internal/gd;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -106,7 +106,7 @@
 .method public final aL(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/f;
 
@@ -132,7 +132,7 @@
         }
     .end annotation
 
-    iget-object v6, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v6, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v7, Lcom/google/android/gms/internal/measurement/it;
 
@@ -239,7 +239,7 @@
 .method public final b(Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/u;
 
@@ -253,7 +253,7 @@
 .method public final b(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     const/4 v1, 0x1
 
@@ -265,7 +265,7 @@
 .method public final c(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/mg;
 
@@ -279,7 +279,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;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v6, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v7, Lcom/google/android/gms/internal/measurement/r;
 
@@ -305,7 +305,7 @@
 .method public final cE(Ljava/lang/String;)I
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -348,7 +348,7 @@
 .method public final cz(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/g;
 
@@ -359,10 +359,10 @@
     return-void
 .end method
 
-.method public final pL()Ljava/lang/String;
+.method public final pO()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -383,10 +383,22 @@
     return-object v0
 .end method
 
-.method public final qw()Ljava/lang/String;
+.method public final qA()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
+
+    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/me;->qA()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final qz()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -407,22 +419,10 @@
     return-object v0
 .end method
 
-.method public final qx()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
-
-    invoke-virtual {v0}, Lcom/google/android/gms/internal/measurement/me;->qx()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final rA()Ljava/lang/String;
+.method public final rD()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
@@ -443,10 +443,10 @@
     return-object v0
 .end method
 
-.method public final uc()Ljava/lang/String;
+.method public final uf()Ljava/lang/String;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azJ:Lcom/google/android/gms/internal/measurement/me;
+    iget-object v0, p0, Lcom/google/firebase/analytics/a;->azS:Lcom/google/android/gms/internal/measurement/me;
 
     new-instance v1, Lcom/google/android/gms/internal/measurement/it;
 
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 73e4ee5b05..79753ef4b1 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
@@ -7,13 +7,13 @@
 
 
 # static fields
-.field private static volatile aQa:Lcom/google/firebase/analytics/connector/a;
+.field private static volatile aQj:Lcom/google/firebase/analytics/connector/a;
 
 
 # instance fields
-.field private final aQb:Lcom/google/android/gms/measurement/AppMeasurement;
+.field private final aQk:Lcom/google/android/gms/measurement/AppMeasurement;
 
-.field final atp:Ljava/util/Map;
+.field final aty:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -33,13 +33,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;->aQb:Lcom/google/android/gms/measurement/AppMeasurement;
+    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aQk: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;->atp:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/firebase/analytics/connector/b;->aty:Ljava/util/Map;
 
     return-void
 .end method
@@ -59,7 +59,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;->aQa:Lcom/google/firebase/analytics/connector/a;
+    sget-object v0, Lcom/google/firebase/analytics/connector/b;->aQj:Lcom/google/firebase/analytics/connector/a;
 
     if-nez v0, :cond_2
 
@@ -68,7 +68,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aQa:Lcom/google/firebase/analytics/connector/a;
+    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aQj:Lcom/google/firebase/analytics/connector/a;
 
     if-nez v1, :cond_1
 
@@ -78,7 +78,7 @@
 
     invoke-direct {v1, v2}, Landroid/os/Bundle;-><init>(I)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zM()Z
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zP()Z
 
     move-result v2
 
@@ -86,9 +86,9 @@
 
     const-class v2, Lcom/google/firebase/a;
 
-    sget-object v3, Lcom/google/firebase/analytics/connector/d;->aQh:Ljava/util/concurrent/Executor;
+    sget-object v3, Lcom/google/firebase/analytics/connector/d;->aQq:Ljava/util/concurrent/Executor;
 
-    sget-object v4, Lcom/google/firebase/analytics/connector/c;->aQg:Lcom/google/firebase/a/b;
+    sget-object v4, Lcom/google/firebase/analytics/connector/c;->aQp: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
 
@@ -109,7 +109,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;->aQa:Lcom/google/firebase/analytics/connector/a;
+    sput-object p0, Lcom/google/firebase/analytics/connector/b;->aQj:Lcom/google/firebase/analytics/connector/a;
 
     :cond_1
     monitor-exit v0
@@ -127,7 +127,7 @@
 
     :cond_2
     :goto_0
-    sget-object p0, Lcom/google/firebase/analytics/connector/b;->aQa:Lcom/google/firebase/analytics/connector/a;
+    sget-object p0, Lcom/google/firebase/analytics/connector/b;->aQj:Lcom/google/firebase/analytics/connector/a;
 
     return-object p0
 .end method
@@ -146,26 +146,26 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aQa:Lcom/google/firebase/analytics/connector/a;
+    sget-object v1, Lcom/google/firebase/analytics/connector/b;->aQj: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;->aQb:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v1, v1, Lcom/google/firebase/analytics/connector/b;->aQk:Lcom/google/android/gms/measurement/AppMeasurement;
 
-    iget-boolean v2, v1, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v2, v1, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v2, :cond_0
 
-    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v1, p0}, Lcom/google/android/gms/measurement/internal/gy;->L(Z)V
 
     goto :goto_0
 
     :cond_0
-    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v1, v1, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v1}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     move-result-object v1
 
@@ -225,7 +225,7 @@
     return-void
 
     :cond_3
-    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aQb:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aQk: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
 
@@ -253,24 +253,24 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aQb:Lcom/google/android/gms/measurement/AppMeasurement;
+    iget-object v0, p0, Lcom/google/firebase/analytics/connector/b;->aQk:Lcom/google/android/gms/measurement/AppMeasurement;
 
     invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->aU(Ljava/lang/String;)Ljava/lang/String;
 
-    iget-boolean v1, v0, Lcom/google/android/gms/measurement/AppMeasurement;->awV:Z
+    iget-boolean v1, v0, Lcom/google/android/gms/measurement/AppMeasurement;->axe:Z
 
     if-eqz v1, :cond_2
 
-    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBC:Lcom/google/android/gms/measurement/internal/gy;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBL:Lcom/google/android/gms/measurement/internal/gy;
 
     invoke-interface {v0, p1, p2, p3}, Lcom/google/android/gms/measurement/internal/gy;->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;->aBB:Lcom/google/android/gms/measurement/internal/ey;
+    iget-object v0, v0, Lcom/google/android/gms/measurement/AppMeasurement;->aBK:Lcom/google/android/gms/measurement/internal/ey;
 
-    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->xZ()Lcom/google/android/gms/measurement/internal/gf;
+    invoke-virtual {v0}, Lcom/google/android/gms/measurement/internal/ey;->yc()Lcom/google/android/gms/measurement/internal/gf;
 
     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 af0da9d203..d4fe95fb3c 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQg:Lcom/google/firebase/a/b;
+.field static final aQp:Lcom/google/firebase/a/b;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/analytics/connector/c;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/c;->aQg:Lcom/google/firebase/a/b;
+    sput-object v0, Lcom/google/firebase/analytics/connector/c;->aQp: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 7f9c435738..a7b1b5d249 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQh:Ljava/util/concurrent/Executor;
+.field static final aQq:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/analytics/connector/d;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/d;->aQh:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/analytics/connector/d;->aQq: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 8afcbd6634..30ab0c9217 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
@@ -68,7 +68,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/firebase/analytics/connector/internal/a;->aQc:Lcom/google/firebase/components/g;
+    sget-object v3, Lcom/google/firebase/analytics/connector/internal/a;->aQl: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;
 
@@ -78,7 +78,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zV()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 63402db8c7..32068ca9ee 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
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQc:Lcom/google/firebase/components/g;
+.field static final aQl:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/analytics/connector/internal/a;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/a;->aQc:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/a;->aQl: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 915285cd3a..02dc4cac9c 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
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aQd:Ljava/util/Set;
+.field private static final aQm:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field private static final aQe:Ljava/util/List;
+.field private static final aQn:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private static final aQf:Ljava/util/List;
+.field private static final aQo:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private static final atR:Ljava/util/List;
+.field private static final aua:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field private static final awT:Ljava/util/List;
+.field private static final awq:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -54,7 +54,7 @@
     .end annotation
 .end field
 
-.field private static final awh:Ljava/util/List;
+.field private static final axc:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -171,7 +171,7 @@
 
     invoke-direct {v0, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQd:Ljava/util/Set;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQm:Ljava/util/Set;
 
     new-array v0, v10, [Ljava/lang/String;
 
@@ -211,7 +211,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awT:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->axc:Ljava/util/List;
 
     new-array v0, v5, [Ljava/lang/String;
 
@@ -231,7 +231,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awh:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awq:Ljava/util/List;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -247,15 +247,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQe:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQn:Ljava/util/List;
 
     new-array v0, v4, [[Ljava/lang/String;
 
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aGC:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aGL:[Ljava/lang/String;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aBM:[Ljava/lang/String;
+    sget-object v1, Lcom/google/android/gms/measurement/AppMeasurement$a;->aBV:[Ljava/lang/String;
 
     aput-object v1, v0, v3
 
@@ -269,7 +269,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQf:Ljava/util/List;
+    sput-object v0, Lcom/google/firebase/analytics/connector/internal/b;->aQo:Ljava/util/List;
 
     new-array v0, v4, [Ljava/lang/String;
 
@@ -285,7 +285,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;->aua:Ljava/util/List;
 
     return-void
 .end method
@@ -350,7 +350,7 @@
     return v2
 
     :cond_3
-    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aQf:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aQo:Ljava/util/List;
 
     invoke-interface {p0, p1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -361,7 +361,7 @@
     return v3
 
     :cond_4
-    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->atR:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aua:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -420,7 +420,7 @@
 .method public static c(Ljava/lang/String;Landroid/os/Bundle;)Z
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awT:Ljava/util/List;
+    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->axc:Ljava/util/List;
 
     invoke-interface {v0, p0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -435,7 +435,7 @@
     :cond_0
     if-eqz p1, :cond_2
 
-    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aQe:Ljava/util/List;
+    sget-object p0, Lcom/google/firebase/analytics/connector/internal/b;->aQn:Ljava/util/List;
 
     invoke-interface {p0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -471,7 +471,7 @@
 .method public static cF(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awh:Ljava/util/List;
+    sget-object v0, Lcom/google/firebase/analytics/connector/internal/b;->awq:Ljava/util/List;
 
     invoke-interface {v0, p0}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -521,7 +521,7 @@
     return v1
 
     :cond_2
-    sget-object p1, Lcom/google/firebase/analytics/connector/internal/b;->aQe:Ljava/util/List;
+    sget-object p1, Lcom/google/firebase/analytics/connector/internal/b;->aQn:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/b.smali b/com.discord/smali_classes2/com/google/firebase/b.smali
index c088a2b1f5..b21d982b38 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 aPO:Lcom/google/firebase/FirebaseApp;
+.field private final aPX:Lcom/google/firebase/FirebaseApp;
 
-.field private final aPP:Landroid/content/Context;
+.field private final aPY: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;->aPO:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/b;->aPX:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/b;->aPP:Landroid/content/Context;
+    iput-object p2, p0, Lcom/google/firebase/b;->aPY: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;->aPO:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p0, Lcom/google/firebase/b;->aPX:Lcom/google/firebase/FirebaseApp;
 
-    iget-object v1, p0, Lcom/google/firebase/b;->aPP:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/b;->aPY: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 53d41721f3..0602225672 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 aPS:Ljava/lang/String;
+.field public final aQb:Ljava/lang/String;
 
-.field private final aPT:Ljava/lang/String;
+.field private final aQc:Ljava/lang/String;
 
-.field private final aPU:Ljava/lang/String;
+.field private final aQd:Ljava/lang/String;
 
-.field public final aPV:Ljava/lang/String;
+.field public final aQe:Ljava/lang/String;
 
-.field private final aPW:Ljava/lang/String;
+.field private final aQf:Ljava/lang/String;
 
-.field private final aPX:Ljava/lang/String;
+.field private final aQg:Ljava/lang/String;
 
-.field private final qw:Ljava/lang/String;
+.field private final qv:Ljava/lang/String;
 
 
 # direct methods
@@ -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;->aPS:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/c;->aPT:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
 
-    iput-object p4, p0, Lcom/google/firebase/c;->aPU:Ljava/lang/String;
+    iput-object p4, p0, Lcom/google/firebase/c;->aQd:Ljava/lang/String;
 
-    iput-object p5, p0, Lcom/google/firebase/c;->aPV:Ljava/lang/String;
+    iput-object p5, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/google/firebase/c;->aPW:Ljava/lang/String;
+    iput-object p6, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
+    iput-object p7, p0, Lcom/google/firebase/c;->aQg: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;->aPS:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aPS:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aQb: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;->qw:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->qw:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->qv: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;->aPT:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aPT:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aQc: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;->aPU:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aQd:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aPU:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aQd: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;->aPV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aPV:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aQe: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;->aPW:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
 
-    iget-object v2, p1, Lcom/google/firebase/c;->aPW:Ljava/lang/String;
+    iget-object v2, p1, Lcom/google/firebase/c;->aQf: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;->aPX:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/c;->aQg: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;->aPS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPU:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQd:Ljava/lang/String;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
 
     const/4 v2, 0x5
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQg:Ljava/lang/String;
 
     const/4 v2, 0x6
 
@@ -278,7 +278,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPS:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     const-string v2, "applicationId"
 
@@ -286,7 +286,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->qw:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->qv:Ljava/lang/String;
 
     const-string v2, "apiKey"
 
@@ -294,7 +294,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPT:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQc:Ljava/lang/String;
 
     const-string v2, "databaseUrl"
 
@@ -302,7 +302,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
 
     const-string v2, "gcmSenderId"
 
@@ -310,7 +310,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPW:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQf:Ljava/lang/String;
 
     const-string v2, "storageBucket"
 
@@ -318,7 +318,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/c;->aPX:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/c;->aQg: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 72c1026f5b..4b28e1eee6 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 aSm:Lcom/google/firebase/a/c;
+.field private final aSv:Lcom/google/firebase/a/c;
 
-.field public final aSn:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field public final aSw: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;->aSm:Lcom/google/firebase/a/c;
+    iput-object p3, p0, Lcom/google/firebase/c/a;->aSv:Lcom/google/firebase/a/c;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-direct {p0}, Lcom/google/firebase/c/a;->Ak()Z
+    invoke-direct {p0}, Lcom/google/firebase/c/a;->An()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;->aSn:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lcom/google/firebase/c/a;->aSw:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     return-void
 .end method
 
-.method private Ak()Z
+.method private An()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 56c49e4702..55b86093d8 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,7 @@
 
 
 # instance fields
-.field private final aQi:Ljava/util/Set;
+.field private final aQr:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final aQj:Ljava/util/Set;
+.field private final aQs:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -44,9 +44,9 @@
     .end annotation
 .end field
 
-.field private aQk:I
+.field private aQt:I
 
-.field private aQl:Lcom/google/firebase/components/g;
+.field private aQu:Lcom/google/firebase/components/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/g<",
@@ -55,7 +55,7 @@
     .end annotation
 .end field
 
-.field private aQm:Ljava/util/Set;
+.field private aQv:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -90,17 +90,17 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aQi:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aQr: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;->aQj:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/b$a;->aQs:Ljava/util/Set;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lcom/google/firebase/components/b$a;->aQk:I
+    iput v0, p0, Lcom/google/firebase/components/b$a;->aQt: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;->aQm:Ljava/util/Set;
+    iput-object v1, p0, Lcom/google/firebase/components/b$a;->aQv: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;->aQi:Ljava/util/Set;
+    iget-object v2, p0, Lcom/google/firebase/components/b$a;->aQr: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;->aQi:Ljava/util/Set;
+    iget-object p1, p0, Lcom/google/firebase/components/b$a;->aQr: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;->aQi:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQr:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -194,7 +194,7 @@
 
     check-cast p1, Lcom/google/firebase/components/g;
 
-    iput-object p1, p0, Lcom/google/firebase/components/b$a;->aQl:Lcom/google/firebase/components/g;
+    iput-object p1, p0, Lcom/google/firebase/components/b$a;->aQu:Lcom/google/firebase/components/g;
 
     return-object p0
 .end method
@@ -215,11 +215,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;->aQB:Ljava/lang/Class;
+    iget-object v0, p1, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
     invoke-direct {p0, v0}, Lcom/google/firebase/components/b$a;->C(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQj:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQs:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
 
@@ -236,7 +236,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lcom/google/firebase/components/b$a;->aQk:I
+    iget v0, p0, Lcom/google/firebase/components/b$a;->aQt:I
 
     if-nez v0, :cond_0
 
@@ -252,12 +252,12 @@
 
     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;->aQk:I
+    iput p1, p0, Lcom/google/firebase/components/b$a;->aQt:I
 
     return-object p0
 .end method
 
-.method public final zS()Lcom/google/firebase/components/b;
+.method public final zV()Lcom/google/firebase/components/b;
     .locals 10
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -267,7 +267,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQl:Lcom/google/firebase/components/g;
+    iget-object v0, p0, Lcom/google/firebase/components/b$a;->aQu:Lcom/google/firebase/components/g;
 
     if-eqz v0, :cond_0
 
@@ -287,23 +287,23 @@
 
     new-instance v3, Ljava/util/HashSet;
 
-    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aQi:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aQr: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;->aQj:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b$a;->aQs:Ljava/util/Set;
 
     invoke-direct {v4, v1}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 
-    iget v5, p0, Lcom/google/firebase/components/b$a;->aQk:I
+    iget v5, p0, Lcom/google/firebase/components/b$a;->aQt:I
 
     iget v6, p0, Lcom/google/firebase/components/b$a;->type:I
 
-    iget-object v7, p0, Lcom/google/firebase/components/b$a;->aQl:Lcom/google/firebase/components/g;
+    iget-object v7, p0, Lcom/google/firebase/components/b$a;->aQu:Lcom/google/firebase/components/g;
 
-    iget-object v8, p0, Lcom/google/firebase/components/b$a;->aQm:Ljava/util/Set;
+    iget-object v8, p0, Lcom/google/firebase/components/b$a;->aQv:Ljava/util/Set;
 
     const/4 v9, 0x0
 
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 93ff6feb4a..cf2c0ccdd4 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,7 @@
 
 
 # instance fields
-.field final aQi:Ljava/util/Set;
+.field final aQr:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final aQj:Ljava/util/Set;
+.field final aQs:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -41,9 +41,9 @@
     .end annotation
 .end field
 
-.field private final aQk:I
+.field private final aQt:I
 
-.field final aQl:Lcom/google/firebase/components/g;
+.field final aQu:Lcom/google/firebase/components/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/g<",
@@ -52,7 +52,7 @@
     .end annotation
 .end field
 
-.field final aQm:Ljava/util/Set;
+.field final aQv:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -91,25 +91,25 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/components/b;->aQi:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aQr: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;->aQj:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aQs:Ljava/util/Set;
 
-    iput p3, p0, Lcom/google/firebase/components/b;->aQk:I
+    iput p3, p0, Lcom/google/firebase/components/b;->aQt:I
 
     iput p4, p0, Lcom/google/firebase/components/b;->type:I
 
-    iput-object p5, p0, Lcom/google/firebase/components/b;->aQl:Lcom/google/firebase/components/g;
+    iput-object p5, p0, Lcom/google/firebase/components/b;->aQu: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;->aQm:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/b;->aQv:Ljava/util/Set;
 
     return-void
 .end method
@@ -205,7 +205,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->zV()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;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {p0}, Lcom/google/firebase/components/b$a;->zV()Lcom/google/firebase/components/b;
 
     move-result-object p0
 
@@ -261,7 +261,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/firebase/components/b;->aQi:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b;->aQr:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->toArray()[Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/firebase/components/b;->aQk:I
+    iget v1, p0, Lcom/google/firebase/components/b;->aQt:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -293,7 +293,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/firebase/components/b;->aQj:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/b;->aQs:Ljava/util/Set;
 
     invoke-interface {v1}, Ljava/util/Set;->toArray()[Ljava/lang/Object;
 
@@ -316,10 +316,10 @@
     return-object v0
 .end method
 
-.method public final zP()Z
+.method public final zS()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/firebase/components/b;->aQk:I
+    iget v0, p0, Lcom/google/firebase/components/b;->aQt:I
 
     const/4 v1, 0x1
 
@@ -333,10 +333,10 @@
     return v0
 .end method
 
-.method public final zQ()Z
+.method public final zT()Z
     .locals 2
 
-    iget v0, p0, Lcom/google/firebase/components/b;->aQk:I
+    iget v0, p0, Lcom/google/firebase/components/b;->aQt:I
 
     const/4 v1, 0x2
 
@@ -352,7 +352,7 @@
     return v0
 .end method
 
-.method public final zR()Z
+.method public final zU()Z
     .locals 1
 
     iget v0, p0, Lcom/google/firebase/components/b;->type:I
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 b74b5f55f1..2bd8cc6734 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 aQn:Ljava/lang/Object;
+.field private final aQw: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;->aQn:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/c;->aQw: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;->aQn:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/firebase/components/c;->aQw: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 cea8d5d885..7eff789491 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 aQn:Ljava/lang/Object;
+.field private final aQw: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;->aQn:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/d;->aQw: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;->aQn:Ljava/lang/Object;
+    iget-object p1, p0, Lcom/google/firebase/components/d;->aQw: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 b51b6981f4..4bd4e9074d 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 aQo:Ljava/lang/Object;
+.field public final aQx:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field public final aQp:Lcom/google/firebase/components/f$b;
+.field public final aQy: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;->aQo:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/google/firebase/components/f;->aQx:Ljava/lang/Object;
 
-    iput-object p2, p0, Lcom/google/firebase/components/f;->aQp:Lcom/google/firebase/components/f$b;
+    iput-object p2, p0, Lcom/google/firebase/components/f;->aQy: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 63c1c0a7c1..1e5e464fd5 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 aQq:Lcom/google/firebase/b/a;
+.field private static final aQz: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 aQr:Ljava/util/Map;
+.field private final aQA:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field private final aQs:Ljava/util/Map;
+.field private final aQB:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field private final aQt:Ljava/util/Map;
+.field private final aQC:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -54,18 +54,18 @@
     .end annotation
 .end field
 
-.field private final aQu:Lcom/google/firebase/components/q;
+.field private final aQD:Lcom/google/firebase/components/q;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lcom/google/firebase/components/l;->zV()Lcom/google/firebase/b/a;
+    invoke-static {}, Lcom/google/firebase/components/l;->zY()Lcom/google/firebase/b/a;
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/components/i;->aQq:Lcom/google/firebase/b/a;
+    sput-object v0, Lcom/google/firebase/components/i;->aQz: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;->aQr:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQA: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;->aQs:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQB: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;->aQt:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQC: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;->aQu:Lcom/google/firebase/components/q;
+    iput-object v0, p0, Lcom/google/firebase/components/i;->aQD: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;->aQu:Lcom/google/firebase/components/q;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQD:Lcom/google/firebase/components/q;
 
     const-class v1, Lcom/google/firebase/components/q;
 
@@ -195,16 +195,16 @@
 
     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;->aQr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQA: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;->zT()V
+    invoke-direct {p0}, Lcom/google/firebase/components/i;->zW()V
 
-    invoke-direct {p0}, Lcom/google/firebase/components/i;->zU()V
+    invoke-direct {p0}, Lcom/google/firebase/components/i;->zX()V
 
     return-void
 .end method
@@ -212,7 +212,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;->aQl:Lcom/google/firebase/components/g;
+    iget-object v0, p1, Lcom/google/firebase/components/b;->aQu:Lcom/google/firebase/components/g;
 
     new-instance v1, Lcom/google/firebase/components/u;
 
@@ -265,10 +265,10 @@
     return-object p0
 .end method
 
-.method private zT()V
+.method private zW()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aQr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQA:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -297,7 +297,7 @@
 
     check-cast v2, Lcom/google/firebase/components/b;
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zR()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zU()Z
 
     move-result v3
 
@@ -309,7 +309,7 @@
 
     check-cast v1, Lcom/google/firebase/components/s;
 
-    iget-object v2, v2, Lcom/google/firebase/components/b;->aQi:Ljava/util/Set;
+    iget-object v2, v2, Lcom/google/firebase/components/b;->aQr:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -328,14 +328,14 @@
 
     check-cast v3, Ljava/lang/Class;
 
-    iget-object v4, p0, Lcom/google/firebase/components/i;->aQs:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/firebase/components/i;->aQB: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;->aQr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQA:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
 
@@ -358,7 +358,7 @@
 
     check-cast v1, Lcom/google/firebase/components/b;
 
-    iget-object v2, v1, Lcom/google/firebase/components/b;->aQj:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/firebase/components/b;->aQs:Ljava/util/Set;
 
     invoke-interface {v2}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -396,9 +396,9 @@
     :goto_2
     if-eqz v4, :cond_3
 
-    iget-object v4, p0, Lcom/google/firebase/components/i;->aQs:Ljava/util/Map;
+    iget-object v4, p0, Lcom/google/firebase/components/i;->aQB:Ljava/util/Map;
 
-    iget-object v7, v3, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v7, v3, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
     invoke-interface {v4, v7}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
 
@@ -417,7 +417,7 @@
 
     aput-object v1, v2, v5
 
-    iget-object v1, v3, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v1, v3, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
     aput-object v1, v2, v6
 
@@ -435,14 +435,14 @@
     return-void
 .end method
 
-.method private zU()V
+.method private zX()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;->aQr:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/firebase/components/i;->aQA:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -471,7 +471,7 @@
 
     check-cast v3, Lcom/google/firebase/components/b;
 
-    invoke-virtual {v3}, Lcom/google/firebase/components/b;->zR()Z
+    invoke-virtual {v3}, Lcom/google/firebase/components/b;->zU()Z
 
     move-result v4
 
@@ -483,7 +483,7 @@
 
     check-cast v2, Lcom/google/firebase/components/s;
 
-    iget-object v3, v3, Lcom/google/firebase/components/b;->aQi:Ljava/util/Set;
+    iget-object v3, v3, Lcom/google/firebase/components/b;->aQr:Ljava/util/Set;
 
     invoke-interface {v3}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
 
@@ -553,7 +553,7 @@
 
     check-cast v2, Ljava/util/Set;
 
-    iget-object v3, p0, Lcom/google/firebase/components/i;->aQt:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/firebase/components/i;->aQC:Ljava/util/Map;
 
     invoke-interface {v1}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
 
@@ -607,7 +607,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;->aQs:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQB:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -633,7 +633,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aQt:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQC:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -646,7 +646,7 @@
     return-object p1
 
     :cond_0
-    sget-object p1, Lcom/google/firebase/components/i;->aQq:Lcom/google/firebase/b/a;
+    sget-object p1, Lcom/google/firebase/components/i;->aQz:Lcom/google/firebase/b/a;
 
     return-object p1
 .end method
@@ -654,7 +654,7 @@
 .method public final R(Z)V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/components/i;->aQr:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/i;->aQA:Ljava/util/Map;
 
     invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
 
@@ -690,13 +690,13 @@
 
     check-cast v1, Lcom/google/firebase/components/s;
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zP()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zS()Z
 
     move-result v3
 
     if-nez v3, :cond_1
 
-    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zQ()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zT()Z
 
     move-result v2
 
@@ -710,9 +710,9 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/google/firebase/components/i;->aQu:Lcom/google/firebase/components/q;
+    iget-object p1, p0, Lcom/google/firebase/components/i;->aQD:Lcom/google/firebase/components/q;
 
-    invoke-virtual {p1}, Lcom/google/firebase/components/q;->zX()V
+    invoke-virtual {p1}, Lcom/google/firebase/components/q;->Aa()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 4c18cc0abf..6dd3f333eb 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 aQv:Lcom/google/firebase/components/i;
+.field private final aQE:Lcom/google/firebase/components/i;
 
-.field private final aQw:Lcom/google/firebase/components/b;
+.field private final aQF: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;->aQv:Lcom/google/firebase/components/i;
+    iput-object p1, p0, Lcom/google/firebase/components/j;->aQE:Lcom/google/firebase/components/i;
 
-    iput-object p2, p0, Lcom/google/firebase/components/j;->aQw:Lcom/google/firebase/components/b;
+    iput-object p2, p0, Lcom/google/firebase/components/j;->aQF: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;->aQv:Lcom/google/firebase/components/i;
+    iget-object v0, p0, Lcom/google/firebase/components/j;->aQE:Lcom/google/firebase/components/i;
 
-    iget-object v1, p0, Lcom/google/firebase/components/j;->aQw:Lcom/google/firebase/components/b;
+    iget-object v1, p0, Lcom/google/firebase/components/j;->aQF: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 7fef627b34..fe962b7350 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 aQx:Ljava/util/Set;
+.field private final aQG: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;->aQx:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/k;->aQG: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;->aQx:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/k;->aQG: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 2440174f6a..ddd2917a1f 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 aQy:Lcom/google/firebase/components/l;
+.field private static final aQH: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;->aQy:Lcom/google/firebase/components/l;
+    sput-object v0, Lcom/google/firebase/components/l;->aQH:Lcom/google/firebase/components/l;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static zV()Lcom/google/firebase/b/a;
+.method public static zY()Lcom/google/firebase/b/a;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/components/l;->aQy:Lcom/google/firebase/components/l;
+    sget-object v0, Lcom/google/firebase/components/l;->aQH: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 65e29d34d8..70c4448d92 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,27 +15,7 @@
 
 
 # instance fields
-.field final aQA:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Lcom/google/firebase/components/m$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final aQj:Ljava/util/Set;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Set<",
-            "Lcom/google/firebase/components/m$a;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field final aQz:Lcom/google/firebase/components/b;
+.field final aQI:Lcom/google/firebase/components/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/components/b<",
@@ -44,6 +24,26 @@
     .end annotation
 .end field
 
+.field final aQJ:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/google/firebase/components/m$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field final aQs:Ljava/util/Set;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Set<",
+            "Lcom/google/firebase/components/m$a;",
+            ">;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/components/b;)V
@@ -62,15 +62,15 @@
 
     invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aQj:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aQs: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;->aQA:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/m$a;->aQJ:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/firebase/components/m$a;->aQz:Lcom/google/firebase/components/b;
+    iput-object p1, p0, Lcom/google/firebase/components/m$a;->aQI: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;->aQA:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/m$a;->aQJ: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 7fdf1d1887..d30bb20a41 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 aQB:Ljava/lang/Class;
+.field private final aQK:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field final aQC:Z
+.field final aQL: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;->aQB:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/firebase/components/m$b;->aQK:Ljava/lang/Class;
 
-    iput-boolean p2, p0, Lcom/google/firebase/components/m$b;->aQC:Z
+    iput-boolean p2, p0, Lcom/google/firebase/components/m$b;->aQL: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;->aQB:Ljava/lang/Class;
+    iget-object v0, p1, Lcom/google/firebase/components/m$b;->aQK:Ljava/lang/Class;
 
-    iget-object v2, p0, Lcom/google/firebase/components/m$b;->aQB:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/google/firebase/components/m$b;->aQK: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;->aQC:Z
+    iget-boolean p1, p1, Lcom/google/firebase/components/m$b;->aQL:Z
 
-    iget-boolean v0, p0, Lcom/google/firebase/components/m$b;->aQC:Z
+    iget-boolean v0, p0, Lcom/google/firebase/components/m$b;->aQL: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;->aQB:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/m$b;->aQK: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;->aQC:Z
+    iget-boolean v1, p0, Lcom/google/firebase/components/m$b;->aQL: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 7ede042beb..89e5f8f6d8 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;->aQi:Ljava/util/Set;
+    iget-object v5, v2, Lcom/google/firebase/components/b;->aQr: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;->zR()Z
+    invoke-virtual {v2}, Lcom/google/firebase/components/b;->zU()Z
 
     move-result v8
 
@@ -111,7 +111,7 @@
 
     if-nez v10, :cond_3
 
-    iget-boolean v7, v7, Lcom/google/firebase/components/m$b;->aQC:Z
+    iget-boolean v7, v7, Lcom/google/firebase/components/m$b;->aQL: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;->aQz:Lcom/google/firebase/components/b;
+    iget-object v5, v4, Lcom/google/firebase/components/m$a;->aQI:Lcom/google/firebase/components/b;
 
-    iget-object v5, v5, Lcom/google/firebase/components/b;->aQj:Ljava/util/Set;
+    iget-object v5, v5, Lcom/google/firebase/components/b;->aQs: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;->zW()Z
+    invoke-virtual {v6}, Lcom/google/firebase/components/n;->zZ()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;->aQB:Ljava/lang/Class;
+    iget-object v8, v6, Lcom/google/firebase/components/n;->aQK: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;->aQj:Ljava/util/Set;
+    iget-object v8, v4, Lcom/google/firebase/components/m$a;->aQs: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;->aQA:Ljava/util/Set;
+    iget-object v7, v7, Lcom/google/firebase/components/m$a;->aQJ: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;->aQj:Ljava/util/Set;
+    iget-object v4, v2, Lcom/google/firebase/components/m$a;->aQs: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;->aQA:Ljava/util/Set;
+    iget-object v6, v5, Lcom/google/firebase/components/m$a;->aQJ: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;->aQj:Ljava/util/Set;
+    iget-object v2, v1, Lcom/google/firebase/components/m$a;->aQs: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;->aQz:Lcom/google/firebase/components/b;
+    iget-object v1, v1, Lcom/google/firebase/components/m$a;->aQI: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 04f30015d2..da09a52274 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 aQB:Ljava/lang/Class;
+.field final aQK:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aQD:I
+.field private final aQM:I
 
 .field final type:I
 
@@ -39,13 +39,13 @@
 
     check-cast p1, Ljava/lang/Class;
 
-    iput-object p1, p0, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/firebase/components/n;->aQK: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;->aQD:I
+    iput p1, p0, Lcom/google/firebase/components/n;->aQM:I
 
     return-void
 .end method
@@ -83,9 +83,9 @@
 
     check-cast p1, Lcom/google/firebase/components/n;
 
-    iget-object v0, p0, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
-    iget-object v2, p1, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v2, p1, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
     if-ne v0, v2, :cond_0
 
@@ -95,9 +95,9 @@
 
     if-ne v0, v2, :cond_0
 
-    iget v0, p0, Lcom/google/firebase/components/n;->aQD:I
+    iget v0, p0, Lcom/google/firebase/components/n;->aQM:I
 
-    iget p1, p1, Lcom/google/firebase/components/n;->aQD:I
+    iget p1, p1, Lcom/google/firebase/components/n;->aQM:I
 
     if-ne v0, p1, :cond_0
 
@@ -112,7 +112,7 @@
 .method public final hashCode()I
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
@@ -130,7 +130,7 @@
 
     mul-int v0, v0, v1
 
-    iget v1, p0, Lcom/google/firebase/components/n;->aQD:I
+    iget v1, p0, Lcom/google/firebase/components/n;->aQM:I
 
     xor-int/2addr v0, v1
 
@@ -165,7 +165,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/firebase/components/n;->aQK:Ljava/lang/Class;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -200,7 +200,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lcom/google/firebase/components/n;->aQD:I
+    iget v1, p0, Lcom/google/firebase/components/n;->aQM:I
 
     if-nez v1, :cond_2
 
@@ -223,10 +223,10 @@
     return-object v0
 .end method
 
-.method public final zW()Z
+.method public final zZ()Z
     .locals 1
 
-    iget v0, p0, Lcom/google/firebase/components/n;->aQD:I
+    iget v0, p0, Lcom/google/firebase/components/n;->aQM:I
 
     if-nez v0, :cond_0
 
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 25f03e93c0..bc97eff549 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 aQE:Ljava/util/Map;
+.field private final aQN:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private aQF:Ljava/util/Queue;
+.field private aQO:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -34,7 +34,7 @@
     .end annotation
 .end field
 
-.field private final aQG:Ljava/util/concurrent/Executor;
+.field private final aQP: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;->aQE:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/components/q;->aQN: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;->aQF:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
 
-    iput-object p1, p0, Lcom/google/firebase/components/q;->aQG:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/firebase/components/q;->aQP: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;->aQF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO: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;->aQE:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQN:Ljava/util/Map;
 
     iget-object p1, p1, Lcom/google/firebase/a/a;->type:Ljava/lang/Class;
 
@@ -225,107 +225,21 @@
 
 
 # virtual methods
-.method public final a(Ljava/lang/Class;Lcom/google/firebase/a/b;)V
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Class<",
-            "TT;>;",
-            "Lcom/google/firebase/a/b<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQG: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
-
-    return-void
-.end method
-
-.method public final declared-synchronized a(Ljava/lang/Class;Ljava/util/concurrent/Executor;Lcom/google/firebase/a/b;)V
-    .locals 2
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "<T:",
-            "Ljava/lang/Object;",
-            ">(",
-            "Ljava/lang/Class<",
-            "TT;>;",
-            "Ljava/util/concurrent/Executor;",
-            "Lcom/google/firebase/a/b<",
-            "-TT;>;)V"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
-
-    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
-
-    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;->aQE:Ljava/util/Map;
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQE:Ljava/util/Map;
-
-    new-instance v1, Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-direct {v1}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
-
-    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;->aQE:Ljava/util/Map;
-
-    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Ljava/util/concurrent/ConcurrentHashMap;
-
-    invoke-virtual {p1, p3, p2}, Ljava/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    :try_end_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    monitor-exit p0
-
-    return-void
-
-    :catchall_0
-    move-exception p1
-
-    monitor-exit p0
-
-    throw p1
-.end method
-
-.method final zX()V
+.method final Aa()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/q;->aQF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
 
-    iput-object v1, p0, Lcom/google/firebase/components/q;->aQF:Ljava/util/Queue;
+    iput-object v1, p0, Lcom/google/firebase/components/q;->aQO:Ljava/util/Queue;
 
     goto :goto_0
 
@@ -379,3 +293,89 @@
     :goto_3
     goto :goto_2
 .end method
+
+.method public final a(Ljava/lang/Class;Lcom/google/firebase/a/b;)V
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;",
+            "Lcom/google/firebase/a/b<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQP: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
+
+    return-void
+.end method
+
+.method public final declared-synchronized a(Ljava/lang/Class;Ljava/util/concurrent/Executor;Lcom/google/firebase/a/b;)V
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/lang/Class<",
+            "TT;>;",
+            "Ljava/util/concurrent/Executor;",
+            "Lcom/google/firebase/a/b<",
+            "-TT;>;)V"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-static {p1}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    invoke-static {p3}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    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;->aQN:Ljava/util/Map;
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-nez v0, :cond_0
+
+    iget-object v0, p0, Lcom/google/firebase/components/q;->aQN:Ljava/util/Map;
+
+    new-instance v1, Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-direct {v1}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
+
+    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;->aQN:Ljava/util/Map;
+
+    invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object p1
+
+    check-cast p1, Ljava/util/concurrent/ConcurrentHashMap;
+
+    invoke-virtual {p1, p3, p2}, Ljava/util/concurrent/ConcurrentHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+    :try_end_0
+    .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+    monitor-exit p0
+
+    return-void
+
+    :catchall_0
+    move-exception p1
+
+    monitor-exit p0
+
+    throw p1
+.end method
diff --git a/com.discord/smali_classes2/com/google/firebase/components/r.smali b/com.discord/smali_classes2/com/google/firebase/components/r.smali
index 27586e5f7a..6327dbfbad 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 aQH:Ljava/util/Map$Entry;
+.field private final aQQ:Ljava/util/Map$Entry;
 
-.field private final aQI:Lcom/google/firebase/a/a;
+.field private final aQR: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;->aQH:Ljava/util/Map$Entry;
+    iput-object p1, p0, Lcom/google/firebase/components/r;->aQQ:Ljava/util/Map$Entry;
 
-    iput-object p2, p0, Lcom/google/firebase/components/r;->aQI:Lcom/google/firebase/a/a;
+    iput-object p2, p0, Lcom/google/firebase/components/r;->aQR: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;->aQH:Ljava/util/Map$Entry;
+    iget-object v0, p0, Lcom/google/firebase/components/r;->aQQ:Ljava/util/Map$Entry;
 
-    iget-object v1, p0, Lcom/google/firebase/components/r;->aQI:Lcom/google/firebase/a/a;
+    iget-object v1, p0, Lcom/google/firebase/components/r;->aQR: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 a114c80882..4b6da6d9fa 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 aQJ:Ljava/lang/Object;
+.field private static final aQS:Ljava/lang/Object;
 
 
 # instance fields
-.field private volatile aQK:Ljava/lang/Object;
+.field private volatile aQT:Ljava/lang/Object;
 
-.field private volatile aQL:Lcom/google/firebase/b/a;
+.field private volatile aQU: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;->aQJ:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/components/s;->aQS: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;->aQJ:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/components/s;->aQS:Ljava/lang/Object;
 
-    iput-object v0, p0, Lcom/google/firebase/components/s;->aQK:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
 
-    iput-object p1, p0, Lcom/google/firebase/components/s;->aQL:Lcom/google/firebase/b/a;
+    iput-object p1, p0, Lcom/google/firebase/components/s;->aQU:Lcom/google/firebase/b/a;
 
     return-void
 .end method
@@ -80,32 +80,32 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aQK:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/firebase/components/s;->aQJ:Ljava/lang/Object;
+    sget-object v1, Lcom/google/firebase/components/s;->aQS:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aQK:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
 
-    sget-object v1, Lcom/google/firebase/components/s;->aQJ:Ljava/lang/Object;
+    sget-object v1, Lcom/google/firebase/components/s;->aQS:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/s;->aQL:Lcom/google/firebase/b/a;
+    iget-object v0, p0, Lcom/google/firebase/components/s;->aQU: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;->aQK:Ljava/lang/Object;
+    iput-object v0, p0, Lcom/google/firebase/components/s;->aQT:Ljava/lang/Object;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lcom/google/firebase/components/s;->aQL:Lcom/google/firebase/b/a;
+    iput-object v1, p0, Lcom/google/firebase/components/s;->aQU: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 f9fafbd701..47267cfc4d 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,7 @@
 
 
 # instance fields
-.field private final aQQ:Ljava/util/Set;
+.field private final aQZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field private final aQS:Lcom/google/firebase/a/c;
+.field private final aRb:Lcom/google/firebase/a/c;
 
 
 # direct methods
@@ -47,9 +47,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/components/u$a;->aQQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/u$a;->aQZ:Ljava/util/Set;
 
-    iput-object p2, p0, Lcom/google/firebase/components/u$a;->aQS:Lcom/google/firebase/a/c;
+    iput-object p2, p0, Lcom/google/firebase/components/u$a;->aRb: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 403d5f4e8a..cc6ebf40a9 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,7 @@
 
 
 # instance fields
-.field private final aQM:Ljava/util/Set;
+.field private final aQV:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private final aQN:Ljava/util/Set;
+.field private final aQW:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final aQO:Ljava/util/Set;
+.field private final aQX:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final aQP:Ljava/util/Set;
+.field private final aQY:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -52,7 +52,7 @@
     .end annotation
 .end field
 
-.field private final aQQ:Ljava/util/Set;
+.field private final aQZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field private final aQR:Lcom/google/firebase/components/e;
+.field private final aRa:Lcom/google/firebase/components/e;
 
 
 # direct methods
@@ -96,7 +96,7 @@
 
     invoke-direct {v3}, Ljava/util/HashSet;-><init>()V
 
-    iget-object v4, p1, Lcom/google/firebase/components/b;->aQj:Ljava/util/Set;
+    iget-object v4, p1, Lcom/google/firebase/components/b;->aQs: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;->zW()Z
+    invoke-virtual {v5}, Lcom/google/firebase/components/n;->zZ()Z
 
     move-result v6
 
@@ -127,14 +127,14 @@
 
     if-eqz v6, :cond_0
 
-    iget-object v5, v5, Lcom/google/firebase/components/n;->aQB:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQK: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;->aQB:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQK: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;->aQB:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQK: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;->aQB:Ljava/lang/Class;
+    iget-object v5, v5, Lcom/google/firebase/components/n;->aQK: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;->aQm:Ljava/util/Set;
+    iget-object v4, p1, Lcom/google/firebase/components/b;->aQv: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;->aQM:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQV: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;->aQN:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQW: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;->aQO:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQX: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;->aQP:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/components/u;->aQY:Ljava/util/Set;
 
-    iget-object p1, p1, Lcom/google/firebase/components/b;->aQm:Ljava/util/Set;
+    iget-object p1, p1, Lcom/google/firebase/components/b;->aQv:Ljava/util/Set;
 
-    iput-object p1, p0, Lcom/google/firebase/components/u;->aQQ:Ljava/util/Set;
+    iput-object p1, p0, Lcom/google/firebase/components/u;->aQZ:Ljava/util/Set;
 
-    iput-object p2, p0, Lcom/google/firebase/components/u;->aQR:Lcom/google/firebase/components/e;
+    iput-object p2, p0, Lcom/google/firebase/components/u;->aRa:Lcom/google/firebase/components/e;
 
     return-void
 .end method
@@ -223,7 +223,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQO:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQX:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -231,7 +231,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQR:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aRa:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->A(Ljava/lang/Class;)Ljava/util/Set;
 
@@ -275,7 +275,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQN:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQW:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -283,7 +283,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQR:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aRa:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->D(Ljava/lang/Class;)Lcom/google/firebase/b/a;
 
@@ -328,7 +328,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQP:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQY:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -336,7 +336,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQR:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aRa:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->E(Ljava/lang/Class;)Lcom/google/firebase/b/a;
 
@@ -378,7 +378,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQM:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aQV:Ljava/util/Set;
 
     invoke-interface {v0, p1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
@@ -386,7 +386,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/components/u;->aQR:Lcom/google/firebase/components/e;
+    iget-object v0, p0, Lcom/google/firebase/components/u;->aRa:Lcom/google/firebase/components/e;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/components/e;->z(Ljava/lang/Class;)Ljava/lang/Object;
 
@@ -405,7 +405,7 @@
     :cond_0
     new-instance p1, Lcom/google/firebase/components/u$a;
 
-    iget-object v1, p0, Lcom/google/firebase/components/u;->aQQ:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/components/u;->aQZ:Ljava/util/Set;
 
     check-cast v0, Lcom/google/firebase/a/c;
 
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 807746d48d..17ba729cf1 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 aSy:Ljava/lang/String;
+.field private final aSH:Ljava/lang/String;
 
-.field private final aSz:Lcom/google/firebase/d/d;
+.field private final aSI:Lcom/google/firebase/d/d;
 
 
 # direct methods
@@ -32,14 +32,14 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/d/b;->aSy:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/d/b;->aSH:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/d/b;->aSz:Lcom/google/firebase/d/d;
+    iput-object p2, p0, Lcom/google/firebase/d/b;->aSI:Lcom/google/firebase/d/d;
 
     return-void
 .end method
 
-.method public static Aq()Lcom/google/firebase/components/b;
+.method public static At()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;->Ar()Lcom/google/firebase/components/g;
+    invoke-static {}, Lcom/google/firebase/d/c;->Au()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;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zV()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
@@ -94,7 +94,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lcom/google/firebase/d/d;->At()Lcom/google/firebase/d/d;
+    invoke-static {}, Lcom/google/firebase/d/d;->Aw()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;->Ap()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/d/e;->As()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;->aSz:Lcom/google/firebase/d/d;
+    iget-object v0, p0, Lcom/google/firebase/d/b;->aSI:Lcom/google/firebase/d/d;
 
-    invoke-virtual {v0}, Lcom/google/firebase/d/d;->As()Ljava/util/Set;
+    invoke-virtual {v0}, Lcom/google/firebase/d/d;->Av()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;->aSy:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/d/b;->aSH: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;->aSy:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/d/b;->aSH: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;->aSz:Lcom/google/firebase/d/d;
+    iget-object v1, p0, Lcom/google/firebase/d/b;->aSI:Lcom/google/firebase/d/d;
 
-    invoke-virtual {v1}, Lcom/google/firebase/d/d;->As()Ljava/util/Set;
+    invoke-virtual {v1}, Lcom/google/firebase/d/d;->Av()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 29dc8d73f8..d6ac9ae157 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 aSA:Lcom/google/firebase/d/c;
+.field private static final aSJ: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;->aSA:Lcom/google/firebase/d/c;
+    sput-object v0, Lcom/google/firebase/d/c;->aSJ:Lcom/google/firebase/d/c;
 
     return-void
 .end method
@@ -31,10 +31,10 @@
     return-void
 .end method
 
-.method public static Ar()Lcom/google/firebase/components/g;
+.method public static Au()Lcom/google/firebase/components/g;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/d/c;->aSA:Lcom/google/firebase/d/c;
+    sget-object v0, Lcom/google/firebase/d/c;->aSJ: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 ab9e7f9dfb..f58dc3f1c9 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 aSC:Lcom/google/firebase/d/d;
+.field private static volatile aSL:Lcom/google/firebase/d/d;
 
 
 # instance fields
-.field private final aSB:Ljava/util/Set;
+.field private final aSK: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;->aSB:Ljava/util/Set;
+    iput-object v0, p0, Lcom/google/firebase/d/d;->aSK:Ljava/util/Set;
 
     return-void
 .end method
 
-.method public static At()Lcom/google/firebase/d/d;
+.method public static Aw()Lcom/google/firebase/d/d;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/d/d;->aSC:Lcom/google/firebase/d/d;
+    sget-object v0, Lcom/google/firebase/d/d;->aSL: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;->aSC:Lcom/google/firebase/d/d;
+    sget-object v0, Lcom/google/firebase/d/d;->aSL: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;->aSC:Lcom/google/firebase/d/d;
+    sput-object v0, Lcom/google/firebase/d/d;->aSL:Lcom/google/firebase/d/d;
 
     :cond_0
     monitor-exit v1
@@ -77,7 +77,7 @@
 
 
 # virtual methods
-.method final As()Ljava/util/Set;
+.method final Av()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;->aSB:Ljava/util/Set;
+    iget-object v0, p0, Lcom/google/firebase/d/d;->aSK:Ljava/util/Set;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/d/d;->aSB:Ljava/util/Set;
+    iget-object v1, p0, Lcom/google/firebase/d/d;->aSK: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 70c765dfe6..0630ab5ee5 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 public final aQT:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+.field public final aRc: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;->aQT:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     return-void
 
     :cond_0
-    iget-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axl:J
+    iget-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
 
     const-wide/16 v2, 0x0
 
@@ -29,7 +29,7 @@
 
     if-nez v4, :cond_1
 
-    invoke-static {}, Lcom/google/android/gms/common/util/g;->nq()Lcom/google/android/gms/common/util/e;
+    invoke-static {}, Lcom/google/android/gms/common/util/g;->nt()Lcom/google/android/gms/common/util/e;
 
     move-result-object v0
 
@@ -37,10 +37,10 @@
 
     move-result-wide v0
 
-    iput-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axl:J
+    iput-wide v0, p1, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
 
     :cond_1
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aQT:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/PendingDynamicLinkData;->aRc:Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;
 
     return-void
 .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 362542dc40..1c04339af5 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 zY()Lcom/google/firebase/dynamiclinks/a;
+.method public static declared-synchronized Ab()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 738b865e0d..6125b5a7cb 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,15 +15,15 @@
 
 
 # instance fields
-.field public aEm:Ljava/lang/String;
+.field public aEv:Ljava/lang/String;
 
-.field private aLG:I
+.field private aLP:I
 
-.field private aQU:Landroid/os/Bundle;
+.field private aRd:Landroid/os/Bundle;
 
-.field private aQV:Landroid/net/Uri;
+.field private aRe:Landroid/net/Uri;
 
-.field public axl:J
+.field public axu:J
 
 .field private zzj:Ljava/lang/String;
 
@@ -48,29 +48,44 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axl:J
+    iput-wide v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQU:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRd:Landroid/os/Bundle;
 
     iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->zzj:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEm:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEv:Ljava/lang/String;
 
-    iput p3, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aLG:I
+    iput p3, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aLP:I
 
-    iput-wide p4, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axl:J
+    iput-wide p4, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu:J
 
-    iput-object p6, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQU:Landroid/os/Bundle;
+    iput-object p6, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRd:Landroid/os/Bundle;
 
-    iput-object p7, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQV:Landroid/net/Uri;
+    iput-object p7, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRe:Landroid/net/Uri;
 
     return-void
 .end method
 
 
 # virtual methods
+.method public final Ac()Landroid/os/Bundle;
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRd:Landroid/os/Bundle;
+
+    if-nez v0, :cond_0
+
+    new-instance v0, Landroid/os/Bundle;
+
+    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
+
+    :cond_0
+    return-object v0
+.end method
+
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 4
 
@@ -86,25 +101,25 @@
 
     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;->aEm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aEv: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;->aLG:I
+    iget v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aLP: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;->axl:J
+    iget-wide v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->axu: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;->zZ()Landroid/os/Bundle;
+    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->Ac()Landroid/os/Bundle;
 
     move-result-object v1
 
@@ -112,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;->aQV:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aRe:Landroid/net/Uri;
 
     const/4 v2, 0x6
 
@@ -122,18 +137,3 @@
 
     return-void
 .end method
-
-.method public final zZ()Landroid/os/Bundle;
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->aQU:Landroid/os/Bundle;
-
-    if-nez v0, :cond_0
-
-    new-instance v0, Landroid/os/Bundle;
-
-    invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
-
-    :cond_0
-    return-object v0
-.end method
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 8736262ccf..c3a086e370 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;->aQZ:Lcom/google/firebase/components/g;
+    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/f;->aRi: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;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zV()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 32f5303688..2ac46e8cf9 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 aAe:Lcom/google/android/gms/common/api/a$g;
+.field private static final aAn: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 aLa:Lcom/google/android/gms/common/api/a;
+.field private static final aLj: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 aQW:Lcom/google/android/gms/common/api/a$a;
+.field private static final aRf: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;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aAn: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;->aQW:Lcom/google/android/gms/common/api/a$a;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aRf: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;->aQW:Lcom/google/android/gms/common/api/a$a;
+    sget-object v1, Lcom/google/firebase/dynamiclinks/internal/c;->aRf:Lcom/google/android/gms/common/api/a$a;
 
-    sget-object v2, Lcom/google/firebase/dynamiclinks/internal/c;->aAe:Lcom/google/android/gms/common/api/a$g;
+    sget-object v2, Lcom/google/firebase/dynamiclinks/internal/c;->aAn: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;->aLa:Lcom/google/android/gms/common/api/a;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aLj: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;->aLa:Lcom/google/android/gms/common/api/a;
+    sget-object v0, Lcom/google/firebase/dynamiclinks/internal/c;->aLj:Lcom/google/android/gms/common/api/a;
 
-    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afq:Lcom/google/android/gms/common/api/h$a;
+    sget-object v1, Lcom/google/android/gms/common/api/h$a;->afz:Lcom/google/android/gms/common/api/h$a;
 
     invoke-direct {p0, p1, v0, v1}, Lcom/google/android/gms/common/api/h;-><init>(Landroid/content/Context;Lcom/google/android/gms/common/api/a;Lcom/google/android/gms/common/api/h$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 333f737bfe..67923c97dd 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 lY()I
+.method public final mb()I
     .locals 1
 
     const v0, 0xbdfcb8
@@ -77,7 +77,7 @@
     return v0
 .end method
 
-.method public final ma()Ljava/lang/String;
+.method public final md()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 mb()Ljava/lang/String;
+.method public final me()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 6a87f840de..18e62cee4b 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 aQX:Lcom/google/android/gms/common/api/h;
+.field private final aRg:Lcom/google/android/gms/common/api/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/common/api/h<",
@@ -13,7 +13,7 @@
     .end annotation
 .end field
 
-.field private final aQY:Lcom/google/firebase/analytics/connector/a;
+.field private final aRh: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;->aQX:Lcom/google/android/gms/common/api/h;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRg:Lcom/google/android/gms/common/api/h;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRh: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;->aQX:Lcom/google/android/gms/common/api/h;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRg:Lcom/google/android/gms/common/api/h;
 
     new-instance v1, Lcom/google/firebase/dynamiclinks/internal/j;
 
-    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/e;->aRh: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 f58ad50b3b..107f8e7090 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 aQZ:Lcom/google/firebase/components/g;
+.field static final aRi: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;->aQZ:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/dynamiclinks/internal/f;->aRi: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 15b8eba60e..e690c07d74 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 Aa()V
+.method public final Ad()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 2ee784996c..729e317cd5 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 aQY:Lcom/google/firebase/analytics/connector/a;
+.field private final aRh:Lcom/google/firebase/analytics/connector/a;
 
-.field private final aRa:Lcom/google/android/gms/tasks/h;
+.field private final aRj: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;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRh:Lcom/google/firebase/analytics/connector/a;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRa:Lcom/google/android/gms/tasks/h;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRj: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;->aRa:Lcom/google/android/gms/tasks/h;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRj:Lcom/google/android/gms/tasks/h;
 
-    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lN()Z
+    invoke-virtual {p1}, Lcom/google/android/gms/common/api/Status;->lQ()Z
 
     move-result v2
 
@@ -80,7 +80,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->zZ()Landroid/os/Bundle;
+    invoke-virtual {p2}, Lcom/google/firebase/dynamiclinks/internal/DynamicLinkData;->Ac()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;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRh: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;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iget-object v2, p0, Lcom/google/firebase/dynamiclinks/internal/h;->aRh: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 779969f7f9..e2ec0c9a91 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 Aa()V
+.method public abstract Ad()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 98a9692b05..cd09bf8a1b 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,7 +14,7 @@
 
 
 # instance fields
-.field private final aQY:Lcom/google/firebase/analytics/connector/a;
+.field private final aRh:Lcom/google/firebase/analytics/connector/a;
 
 .field private final zzj:Ljava/lang/String;
 
@@ -27,7 +27,7 @@
 
     iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/j;->zzj:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aRh: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;->aQY:Lcom/google/firebase/analytics/connector/a;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/j;->aRh: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;->zzj:Ljava/lang/String;
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/internal/d;->mR()Landroid/os/IInterface;
+    invoke-virtual {p1}, Lcom/google/firebase/dynamiclinks/internal/d;->mU()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 c30ac29217..ed76a77363 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;->Aa()V
+    invoke-virtual {p0}, Lcom/google/firebase/dynamiclinks/internal/l;->Ad()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 1a63d9597b..c3ffa0a702 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
@@ -26,7 +26,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lcom/google/android/gms/internal/d/b;->nN()Landroid/os/Parcel;
+    invoke-virtual {p0}, Lcom/google/android/gms/internal/d/b;->nQ()Landroid/os/Parcel;
 
     move-result-object v0
 
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 73fbb5455f..2d2dfcb6d1 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,7 +15,7 @@
 
 
 # instance fields
-.field private final aIo:Ljava/util/List;
+.field private final aIx:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field private final aRb:Landroid/net/Uri;
+.field private final aRk:Landroid/net/Uri;
 
-.field private final aRc:Landroid/net/Uri;
+.field private final aRl:Landroid/net/Uri;
 
 
 # direct methods
@@ -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;->aRb:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRk:Landroid/net/Uri;
 
-    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRc:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRl:Landroid/net/Uri;
 
-    iput-object p3, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aIo:Ljava/util/List;
+    iput-object p3, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aIx:Ljava/util/List;
 
     return-void
 .end method
@@ -78,19 +78,19 @@
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRb:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRk: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;->aRc:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aRl: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;->aIo:Ljava/util/List;
+    iget-object p2, p0, Lcom/google/firebase/dynamiclinks/internal/zzo;->aIx: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 6367eb112a..6353338f6d 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 aRd:Ljava/lang/String;
+.field private final aRm: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;->aRd:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aRm:Ljava/lang/String;
 
     return-void
 .end method
@@ -52,7 +52,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aRd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/dynamiclinks/internal/zzr;->aRm: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 63dea4325a..7f80fccf68 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,9 +15,9 @@
 
 
 # instance fields
-.field private final aRm:Lcom/google/firebase/a/d;
+.field private final aRv:Lcom/google/firebase/a/d;
 
-.field private aRn:Lcom/google/firebase/a/b;
+.field private aRw:Lcom/google/firebase/a/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/firebase/a/b<",
@@ -27,35 +27,35 @@
     .end annotation
 .end field
 
-.field private aRo:Ljava/lang/Boolean;
+.field private aRx:Ljava/lang/Boolean;
 
-.field final synthetic aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field final synthetic aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private atx:Z
+.field private atG:Z
 
-.field private awV:Z
+.field private axe:Z
 
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/iid/FirebaseInstanceId;Lcom/google/firebase/a/d;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRm:Lcom/google/firebase/a/d;
+    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRv:Lcom/google/firebase/a/d;
 
     return-void
 .end method
 
-.method private final declared-synchronized pD()V
+.method private final declared-synchronized pG()V
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->awV:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->axe:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -67,23 +67,23 @@
 
     :cond_0
     :try_start_1
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->qd()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->qg()Z
 
     move-result v0
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atx:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atG:Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->vB()Ljava/lang/Boolean;
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->vE()Ljava/lang/Boolean;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRo:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRo:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atx:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atG:Z
 
     if-eqz v0, :cond_1
 
@@ -91,20 +91,20 @@
 
     invoke-direct {v0, p0}, Lcom/google/firebase/iid/ao;-><init>(Lcom/google/firebase/iid/FirebaseInstanceId$a;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRn:Lcom/google/firebase/a/b;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRw:Lcom/google/firebase/a/b;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRm:Lcom/google/firebase/a/d;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRv:Lcom/google/firebase/a/d;
 
     const-class v1, Lcom/google/firebase/a;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRn:Lcom/google/firebase/a/b;
+    iget-object v2, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRw:Lcom/google/firebase/a/b;
 
     invoke-interface {v0, v1, v2}, Lcom/google/firebase/a/d;->a(Ljava/lang/Class;Lcom/google/firebase/a/b;)V
 
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->awV:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->axe:Z
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -120,7 +120,7 @@
     throw v0
 .end method
 
-.method private final qd()Z
+.method private final qg()Z
     .locals 4
 
     const/4 v0, 0x1
@@ -137,7 +137,7 @@
     :catch_0
     nop
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-static {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/FirebaseInstanceId;)Lcom/google/firebase/FirebaseApp;
 
@@ -181,12 +181,12 @@
     return v3
 .end method
 
-.method private final vB()Ljava/lang/Boolean;
+.method private final vE()Ljava/lang/Boolean;
     .locals 6
 
     const-string v0, "firebase_messaging_auto_init_enabled"
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-static {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/FirebaseInstanceId;)Lcom/google/firebase/FirebaseApp;
 
@@ -277,19 +277,19 @@
 
 
 # virtual methods
-.method final declared-synchronized pE()Z
+.method final declared-synchronized pH()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pD()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pG()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRo:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRo:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRx:Ljava/lang/Boolean;
 
     invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -303,11 +303,11 @@
 
     :cond_0
     :try_start_1
-    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atx:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->atG:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy: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 0b61152b57..dc464ef4a8 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 aRe:Lcom/google/firebase/iid/v;
+.field static aRn:Lcom/google/firebase/iid/v;
 
-.field private static aRf:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final anp:J
+.field private static final any:J
 
 
 # instance fields
-.field final aLP:Ljava/util/concurrent/Executor;
+.field final aLY:Ljava/util/concurrent/Executor;
 
-.field public final aRg:Lcom/google/firebase/FirebaseApp;
+.field public final aRp:Lcom/google/firebase/FirebaseApp;
 
-.field final aRh:Lcom/google/firebase/iid/j;
+.field final aRq:Lcom/google/firebase/iid/j;
 
-.field final aRi:Lcom/google/firebase/iid/ap;
+.field final aRr:Lcom/google/firebase/iid/ap;
 
-.field final aRj:Lcom/google/firebase/iid/o;
+.field final aRs:Lcom/google/firebase/iid/o;
 
-.field private final aRk:Lcom/google/firebase/iid/z;
+.field private final aRt:Lcom/google/firebase/iid/z;
 
-.field final aRl:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+.field final aRu: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;->anp:J
+    sput-wide v0, Lcom/google/firebase/iid/FirebaseInstanceId;->any:J
 
     return-void
 .end method
@@ -65,11 +65,11 @@
 
     invoke-direct {v2, v0}, Lcom/google/firebase/iid/j;-><init>(Landroid/content/Context;)V
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Ae()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Ah()Ljava/util/concurrent/Executor;
 
     move-result-object v3
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Ae()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Ah()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;->aRe:Lcom/google/firebase/iid/v;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
     if-nez v1, :cond_0
 
@@ -118,44 +118,44 @@
 
     invoke-direct {v1, v2}, Lcom/google/firebase/iid/v;-><init>(Landroid/content/Context;)V
 
-    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
     :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;->aRg:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRh:Lcom/google/firebase/iid/j;
+    iput-object p2, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
 
     new-instance v0, Lcom/google/firebase/iid/ap;
 
     invoke-direct {v0, p1, p2, p3, p6}, Lcom/google/firebase/iid/ap;-><init>(Lcom/google/firebase/FirebaseApp;Lcom/google/firebase/iid/j;Ljava/util/concurrent/Executor;Lcom/google/firebase/d/g;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRi:Lcom/google/firebase/iid/ap;
+    iput-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRr:Lcom/google/firebase/iid/ap;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLY:Ljava/util/concurrent/Executor;
 
     new-instance p1, Lcom/google/firebase/iid/z;
 
-    sget-object p2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sget-object p2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
     invoke-direct {p1, p2}, Lcom/google/firebase/iid/z;-><init>(Lcom/google/firebase/iid/v;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRk:Lcom/google/firebase/iid/z;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRt:Lcom/google/firebase/iid/z;
 
     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;->aRl:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     new-instance p1, Lcom/google/firebase/iid/o;
 
     invoke-direct {p1, p3}, Lcom/google/firebase/iid/o;-><init>(Ljava/util/concurrent/Executor;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRj:Lcom/google/firebase/iid/o;
+    iput-object p1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRs:Lcom/google/firebase/iid/o;
 
     new-instance p1, Lcom/google/firebase/iid/al;
 
@@ -185,7 +185,7 @@
     throw p1
 .end method
 
-.method public static Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+.method public static Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
     .locals 1
 
     invoke-static {}, Lcom/google/firebase/FirebaseApp;->getInstance()Lcom/google/firebase/FirebaseApp;
@@ -202,7 +202,7 @@
 .method static X(Ljava/lang/String;Ljava/lang/String;)Lcom/google/firebase/iid/u;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
     const-string v1, ""
 
@@ -216,7 +216,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;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object p0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
 
     return-object p0
 .end method
@@ -229,7 +229,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-nez v1, :cond_0
 
@@ -245,10 +245,10 @@
 
     invoke-direct {v1, v2, v3}, Ljava/util/concurrent/ScheduledThreadPoolExecutor;-><init>(ILjava/util/concurrent/ThreadFactory;)V
 
-    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     :cond_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
@@ -271,7 +271,7 @@
 .method static synthetic b(Lcom/google/firebase/iid/FirebaseInstanceId;)V
     .locals 0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xV()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xY()V
 
     return-void
 .end method
@@ -327,10 +327,10 @@
     return-object p0
 .end method
 
-.method public static qW()Ljava/lang/String;
+.method public static qZ()Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
     const-string v1, ""
 
@@ -338,12 +338,12 @@
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/firebase/iid/aw;->atJ:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method static qd()Z
+.method static qg()Z
     .locals 4
 
     const/4 v0, 0x3
@@ -382,7 +382,7 @@
     return v0
 .end method
 
-.method private final declared-synchronized yC()V
+.method private final declared-synchronized yF()V
     .locals 2
 
     monitor-enter p0
@@ -413,10 +413,10 @@
 
 
 # virtual methods
-.method final Ac()Lcom/google/firebase/iid/u;
+.method final Af()Lcom/google/firebase/iid/u;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
 
     invoke-static {v0}, Lcom/google/firebase/iid/j;->c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
 
@@ -447,7 +447,7 @@
 
     move-result-wide v0
 
-    sget-wide v3, Lcom/google/firebase/iid/FirebaseInstanceId;->anp:J
+    sget-wide v3, Lcom/google/firebase/iid/FirebaseInstanceId;->any:J
 
     invoke-static {v0, v1, v3, v4}, Ljava/lang/Math;->min(JJ)J
 
@@ -455,7 +455,7 @@
 
     new-instance v3, Lcom/google/firebase/iid/x;
 
-    iget-object v4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRk:Lcom/google/firebase/iid/z;
+    iget-object v4, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRt:Lcom/google/firebase/iid/z;
 
     invoke-direct {v3, p0, v4, v0, v1}, Lcom/google/firebase/iid/x;-><init>(Lcom/google/firebase/iid/FirebaseInstanceId;Lcom/google/firebase/iid/z;J)V
 
@@ -501,7 +501,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v1, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLY:Ljava/util/concurrent/Executor;
 
     new-instance v2, Lcom/google/firebase/iid/ak;
 
@@ -519,9 +519,9 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRh:Lcom/google/firebase/iid/j;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rA()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rD()Ljava/lang/String;
 
     move-result-object v0
 
@@ -610,7 +610,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->tx()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
 
     :cond_0
     check-cast v0, Ljava/io/IOException;
@@ -634,39 +634,39 @@
     throw v0
 .end method
 
-.method final rk()V
+.method final rn()V
     .locals 2
 
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
     const-string v1, ""
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/iid/v;->cr(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yC()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yF()V
 
     return-void
 .end method
 
-.method final declared-synchronized tx()V
+.method final declared-synchronized tA()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sget-object v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/v;->pD()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/v;->pG()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pE()Z
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yC()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yF()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -683,10 +683,10 @@
     throw v0
 .end method
 
-.method public final xV()V
+.method public final xY()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/u;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
 
     move-result-object v0
 
@@ -696,16 +696,16 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRk:Lcom/google/firebase/iid/z;
+    iget-object v0, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRt:Lcom/google/firebase/iid/z;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/z;->pE()Z
+    invoke-virtual {v0}, Lcom/google/firebase/iid/z;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yC()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->yF()V
 
     :cond_1
     return-void
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 3490fa44cf..d22238354b 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 aRq:Lcom/google/firebase/iid/ad;
+.field private static aRz:Lcom/google/firebase/iid/ad;
 
 
 # direct methods
@@ -74,7 +74,7 @@
     return p0
 
     :cond_2
-    invoke-static {}, Lcom/google/firebase/iid/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
@@ -282,21 +282,21 @@
 
     if-eqz p1, :cond_4
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->rk()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->rn()V
 
     goto :goto_1
 
     :cond_3
     :goto_0
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->tx()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
 
     :cond_4
     :goto_1
@@ -351,7 +351,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRq:Lcom/google/firebase/iid/ad;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRz:Lcom/google/firebase/iid/ad;
 
     if-nez v1, :cond_0
 
@@ -359,10 +359,10 @@
 
     invoke-direct {v1, p0, p1}, Lcom/google/firebase/iid/ad;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRq:Lcom/google/firebase/iid/ad;
+    sput-object v1, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRz:Lcom/google/firebase/iid/ad;
 
     :cond_0
-    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRq:Lcom/google/firebase/iid/ad;
+    sget-object p0, Lcom/google/firebase/iid/FirebaseInstanceIdReceiver;->aRz:Lcom/google/firebase/iid/ad;
     :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 958b0012b5..3bc63a993c 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 aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRy: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;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/Registrar$a;->aRy: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 3cd64400ad..b9223adf61 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/l;->aQc:Lcom/google/firebase/components/g;
+    sget-object v1, Lcom/google/firebase/iid/l;->aQl: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;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {v0}, Lcom/google/firebase/components/b$a;->zV()Lcom/google/firebase/components/b;
 
     move-result-object v0
 
@@ -104,13 +104,13 @@
 
     move-result-object v2
 
-    sget-object v3, Lcom/google/firebase/iid/m;->aQc:Lcom/google/firebase/components/g;
+    sget-object v3, Lcom/google/firebase/iid/m;->aQl: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;->zS()Lcom/google/firebase/components/b;
+    invoke-virtual {v2}, Lcom/google/firebase/components/b$a;->zV()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 78706b97ad..8b3b8f4439 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/a.smali
@@ -4,29 +4,29 @@
 
 
 # static fields
-.field private static final aQh:Ljava/util/concurrent/Executor;
+.field private static final aQq:Ljava/util/concurrent/Executor;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/iid/ah;->aQh:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/firebase/iid/ah;->aQq:Ljava/util/concurrent/Executor;
 
-    sput-object v0, Lcom/google/firebase/iid/a;->aQh:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/iid/a;->aQq:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
 
-.method static Ad()Ljava/util/concurrent/Executor;
+.method static Ag()Ljava/util/concurrent/Executor;
     .locals 1
 
-    sget-object v0, Lcom/google/firebase/iid/a;->aQh:Ljava/util/concurrent/Executor;
+    sget-object v0, Lcom/google/firebase/iid/a;->aQq:Ljava/util/concurrent/Executor;
 
     return-object v0
 .end method
 
-.method static Ae()Ljava/util/concurrent/Executor;
+.method static Ah()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/ai;->aRW:Ljava/util/concurrent/ThreadFactory;
+    sget-object v7, Lcom/google/firebase/iid/ai;->aSf:Ljava/util/concurrent/ThreadFactory;
 
     const/4 v1, 0x0
 
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 0baec1be03..3e6475dddd 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aa.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aRO:Lcom/google/firebase/iid/ag;
+.field private final aRX:Lcom/google/firebase/iid/ag;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aRO:Lcom/google/firebase/iid/ag;
+    iput-object p1, p0, Lcom/google/firebase/iid/aa;->aRX:Lcom/google/firebase/iid/ag;
 
     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/aa;->aRO:Lcom/google/firebase/iid/ag;
+    iget-object p1, p0, Lcom/google/firebase/iid/aa;->aRX:Lcom/google/firebase/iid/ag;
 
     invoke-virtual {p1}, Lcom/google/firebase/iid/ag;->zza()V
 
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 b10858d80a..d10b9fad9b 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ab.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ab.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field final aRP:Lcom/google/firebase/iid/ae;
+.field final aRY:Lcom/google/firebase/iid/ae;
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Landroid/os/Binder;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ab;->aRP:Lcom/google/firebase/iid/ae;
+    iput-object p1, p0, Lcom/google/firebase/iid/ab;->aRY:Lcom/google/firebase/iid/ae;
 
     return-void
 .end method
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 a107968614..d645c2ae6a 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ac.smali
@@ -4,7 +4,7 @@
 
 
 # direct methods
-.method public static Ai()Ljava/security/KeyPair;
+.method public static Al()Ljava/security/KeyPair;
     .locals 2
 
     :try_start_0
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 95d93a3841..22905543f7 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ad.smali
@@ -7,11 +7,13 @@
 
 
 # instance fields
-.field private final aGD:Landroid/content/Context;
+.field private final aGM:Landroid/content/Context;
 
-.field private final aRQ:Landroid/content/Intent;
+.field private final aRZ:Landroid/content/Intent;
 
-.field private final aRR:Ljava/util/Queue;
+.field private final aRo:Ljava/util/concurrent/ScheduledExecutorService;
+
+.field private final aSa:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -21,9 +23,7 @@
     .end annotation
 .end field
 
-.field private aRS:Lcom/google/firebase/iid/ab;
-
-.field private final aRf:Ljava/util/concurrent/ScheduledExecutorService;
+.field private aSb:Lcom/google/firebase/iid/ab;
 
 .field private zzf:Z
 
@@ -58,7 +58,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/ad;->aRR:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/iid/ad;->aSa:Ljava/util/Queue;
 
     const/4 v0, 0x0
 
@@ -68,13 +68,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ad;->aGD:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/ad;->aGM: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/ad;->aGD:Landroid/content/Context;
+    iget-object p2, p0, Lcom/google/firebase/iid/ad;->aGM: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/ad;->aRQ:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/firebase/iid/ad;->aRZ:Landroid/content/Intent;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ad;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p3, p0, Lcom/google/firebase/iid/ad;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
 
-.method private final pD()V
+.method private final pG()V
     .locals 1
 
     :goto_0
-    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSa: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/ad;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSa: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/ad;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSa: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/ad;->aRS:Lcom/google/firebase/iid/ab;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSb:Lcom/google/firebase/iid/ab;
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aRS:Lcom/google/firebase/iid/ab;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSb:Lcom/google/firebase/iid/ab;
 
     invoke-virtual {v0}, Lcom/google/firebase/iid/ab;->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/ad;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSa:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -201,7 +201,7 @@
 
     check-cast v0, Lcom/google/firebase/iid/ag;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRS:Lcom/google/firebase/iid/ab;
+    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aSb:Lcom/google/firebase/iid/ab;
 
     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/ab;->aRP:Lcom/google/firebase/iid/ae;
+    iget-object v2, v2, Lcom/google/firebase/iid/ab;->aRY:Lcom/google/firebase/iid/ae;
 
-    iget-object v3, v0, Lcom/google/firebase/iid/ag;->aRT:Landroid/content/Intent;
+    iget-object v3, v0, Lcom/google/firebase/iid/ag;->aSc:Landroid/content/Intent;
 
     invoke-interface {v2, v3}, Lcom/google/firebase/iid/ae;->e(Landroid/content/Intent;)Lcom/google/android/gms/tasks/Task;
 
     move-result-object v2
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Ad()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Ag()Ljava/util/concurrent/Executor;
 
     move-result-object v3
 
@@ -312,11 +312,11 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :try_start_1
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aGM:Landroid/content/Context;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRQ:Landroid/content/Intent;
+    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRZ:Landroid/content/Intent;
 
     const/16 v3, 0x41
 
@@ -359,7 +359,7 @@
     :goto_2
     iput-boolean v1, p0, Lcom/google/firebase/iid/ad;->zzf:Z
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/ad;->pD()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ad;->pG()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/ad;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ad;->aSa:Ljava/util/Queue;
 
     new-instance v1, Lcom/google/firebase/iid/ag;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v2, p0, Lcom/google/firebase/iid/ad;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-direct {v1, p1, p2, v2}, Lcom/google/firebase/iid/ag;-><init>(Landroid/content/Intent;Landroid/content/BroadcastReceiver$PendingResult;Ljava/util/concurrent/ScheduledExecutorService;)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/ad;->pD()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/ad;->pG()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/ab;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ad;->aRS:Lcom/google/firebase/iid/ab;
+    iput-object p2, p0, Lcom/google/firebase/iid/ad;->aSb:Lcom/google/firebase/iid/ab;
 
     invoke-direct {p0}, Lcom/google/firebase/iid/ad;->zza()V
     :try_end_1
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/af.smali b/com.discord/smali_classes2/com/google/firebase/iid/af.smali
index fa4b709daf..630a2ecdba 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/af.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/af.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aRO:Lcom/google/firebase/iid/ag;
+.field private final aRX:Lcom/google/firebase/iid/ag;
 
-.field private final aRQ:Landroid/content/Intent;
+.field private final aRZ: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/af;->aRO:Lcom/google/firebase/iid/ag;
+    iput-object p1, p0, Lcom/google/firebase/iid/af;->aRX:Lcom/google/firebase/iid/ag;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/af;->aRQ:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/iid/af;->aRZ: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/af;->aRO:Lcom/google/firebase/iid/ag;
+    iget-object v0, p0, Lcom/google/firebase/iid/af;->aRX:Lcom/google/firebase/iid/ag;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/af;->aRQ:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/iid/af;->aRZ:Landroid/content/Intent;
 
     invoke-virtual {v1}, Landroid/content/Intent;->getAction()Ljava/lang/String;
 
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 a6fd14b463..ef31474f92 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ag.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ag.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final aRT:Landroid/content/Intent;
+.field final aSc:Landroid/content/Intent;
 
-.field private final aRU:Landroid/content/BroadcastReceiver$PendingResult;
+.field private final aSd:Landroid/content/BroadcastReceiver$PendingResult;
 
-.field private final aRV:Ljava/util/concurrent/ScheduledFuture;
+.field private final aSe:Ljava/util/concurrent/ScheduledFuture;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ScheduledFuture<",
@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field private asy:Z
+.field private asH:Z
 
 
 # direct methods
@@ -28,11 +28,11 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asy:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asH:Z
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aRT:Landroid/content/Intent;
+    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aSc:Landroid/content/Intent;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ag;->aRU:Landroid/content/BroadcastReceiver$PendingResult;
+    iput-object p2, p0, Lcom/google/firebase/iid/ag;->aSd:Landroid/content/BroadcastReceiver$PendingResult;
 
     new-instance p2, Lcom/google/firebase/iid/af;
 
@@ -46,7 +46,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aRV:Ljava/util/concurrent/ScheduledFuture;
+    iput-object p1, p0, Lcom/google/firebase/iid/ag;->aSe: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/ag;->asy:Z
+    iget-boolean v0, p0, Lcom/google/firebase/iid/ag;->asH:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aRU:Landroid/content/BroadcastReceiver$PendingResult;
+    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aSd:Landroid/content/BroadcastReceiver$PendingResult;
 
     invoke-virtual {v0}, Landroid/content/BroadcastReceiver$PendingResult;->finish()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aRV:Ljava/util/concurrent/ScheduledFuture;
+    iget-object v0, p0, Lcom/google/firebase/iid/ag;->aSe:Ljava/util/concurrent/ScheduledFuture;
 
     const/4 v1, 0x0
 
@@ -75,7 +75,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asy:Z
+    iput-boolean v0, p0, Lcom/google/firebase/iid/ag;->asH:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
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 bfb0d901b9..68c8ca4441 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ah.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ah.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQh:Ljava/util/concurrent/Executor;
+.field static final aQq:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/ah;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/ah;->aQh:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/iid/ah;->aQq:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
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 2f76713aac..c95a6be2c1 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ai.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aRW:Ljava/util/concurrent/ThreadFactory;
+.field static final aSf:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/ai;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/ai;->aRW:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lcom/google/firebase/iid/ai;->aSf:Ljava/util/concurrent/ThreadFactory;
 
     return-void
 .end method
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 803d999ad1..86956e7dd6 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ak.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ak.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
-.field private final anh:Ljava/lang/String;
+.field private final anq: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/ak;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/ak;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ak;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ak;->ane:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ak;->anh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/ak;->anq: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/ak;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object p1, p0, Lcom/google/firebase/iid/ak;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ak;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/ak;->ane:Ljava/lang/String;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ak;->anh:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/ak;->anq:Ljava/lang/String;
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qW()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qZ()Ljava/lang/String;
 
     move-result-object v2
 
@@ -56,7 +56,7 @@
 
     new-instance p1, Lcom/google/firebase/iid/ay;
 
-    iget-object v0, v3, Lcom/google/firebase/iid/u;->atJ:Ljava/lang/String;
+    iget-object v0, v3, Lcom/google/firebase/iid/u;->atS:Ljava/lang/String;
 
     invoke-direct {p1, v2, v0}, Lcom/google/firebase/iid/ay;-><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;->aRj:Lcom/google/firebase/iid/o;
+    iget-object v3, p1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRs:Lcom/google/firebase/iid/o;
 
     new-instance v4, Lcom/google/firebase/iid/an;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/al.smali b/com.discord/smali_classes2/com/google/firebase/iid/al.smali
index 3336db9a21..7d4cafb8f3 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/al.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/al.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/al;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/al;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     return-void
 .end method
@@ -26,17 +26,17 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/al;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/al;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v1, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRl:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object v1, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRu:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pE()Z
+    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pH()Z
 
     move-result v1
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xV()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->xY()V
 
     :cond_0
     return-void
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 7328bf3bcc..f4e28b47d8 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 aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
-.field private final anh:Ljava/lang/String;
+.field private final anq:Ljava/lang/String;
 
 .field private final zzd:Ljava/lang/String;
 
@@ -22,11 +22,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/am;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/am;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/am;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/am;->ane:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/am;->anh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/am;->anq:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/firebase/iid/am;->zzd:Ljava/lang/String;
 
@@ -38,21 +38,21 @@
 .method public final ax(Ljava/lang/Object;)Lcom/google/android/gms/tasks/Task;
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/iid/am;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/am;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/am;->amV:Ljava/lang/String;
+    iget-object v3, p0, Lcom/google/firebase/iid/am;->ane:Ljava/lang/String;
 
-    iget-object v4, p0, Lcom/google/firebase/iid/am;->anh:Ljava/lang/String;
+    iget-object v4, p0, Lcom/google/firebase/iid/am;->anq:Ljava/lang/String;
 
     iget-object v7, p0, Lcom/google/firebase/iid/am;->zzd:Ljava/lang/String;
 
     check-cast p1, Ljava/lang/String;
 
-    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRe:Lcom/google/firebase/iid/v;
+    sget-object v1, Lcom/google/firebase/iid/FirebaseInstanceId;->aRn:Lcom/google/firebase/iid/v;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRh:Lcom/google/firebase/iid/j;
+    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rA()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rD()Ljava/lang/String;
 
     move-result-object v6
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/an.smali b/com.discord/smali_classes2/com/google/firebase/iid/an.smali
index c9f474a8d5..a5c5b03d68 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/an.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/an.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
-.field private final anh:Ljava/lang/String;
+.field private final anq:Ljava/lang/String;
 
 .field private final zzd:Ljava/lang/String;
 
@@ -22,11 +22,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/an;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/an;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/an;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/an;->ane:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/an;->anh:Ljava/lang/String;
+    iput-object p3, p0, Lcom/google/firebase/iid/an;->anq:Ljava/lang/String;
 
     iput-object p4, p0, Lcom/google/firebase/iid/an;->zzd:Ljava/lang/String;
 
@@ -35,18 +35,18 @@
 
 
 # virtual methods
-.method public final Af()Lcom/google/android/gms/tasks/Task;
+.method public final Ai()Lcom/google/android/gms/tasks/Task;
     .locals 7
 
-    iget-object v0, p0, Lcom/google/firebase/iid/an;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/an;->aRy:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/an;->amV:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/an;->ane:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/an;->anh:Ljava/lang/String;
+    iget-object v2, p0, Lcom/google/firebase/iid/an;->anq:Ljava/lang/String;
 
     iget-object v3, p0, Lcom/google/firebase/iid/an;->zzd:Ljava/lang/String;
 
-    iget-object v4, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRi:Lcom/google/firebase/iid/ap;
+    iget-object v4, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRr:Lcom/google/firebase/iid/ap;
 
     new-instance v5, Landroid/os/Bundle;
 
@@ -60,7 +60,7 @@
 
     move-result-object v4
 
-    iget-object v5, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v5, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aLY:Ljava/util/concurrent/Executor;
 
     new-instance v6, Lcom/google/firebase/iid/am;
 
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 1e406d6328..ebb9251230 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ao.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aRY:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+.field private final aSh: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/ao;->aRY:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iput-object p1, p0, Lcom/google/firebase/iid/ao;->aSh: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/ao;->aRY:Lcom/google/firebase/iid/FirebaseInstanceId$a;
+    iget-object p1, p0, Lcom/google/firebase/iid/ao;->aSh:Lcom/google/firebase/iid/FirebaseInstanceId$a;
 
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pE()Z
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId$a;->pH()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRp:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p1, Lcom/google/firebase/iid/FirebaseInstanceId$a;->aRy: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/ap.smali b/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
index f808fbe984..5981131f39 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ap.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private final aLP:Ljava/util/concurrent/Executor;
+.field private final aLY:Ljava/util/concurrent/Executor;
 
-.field private final aRZ:Lcom/google/firebase/FirebaseApp;
+.field private final aSi:Lcom/google/firebase/FirebaseApp;
 
-.field private final aSa:Lcom/google/firebase/iid/j;
+.field private final aSj:Lcom/google/firebase/iid/j;
 
-.field final aSb:Lcom/google/firebase/iid/p;
+.field final aSk:Lcom/google/firebase/iid/p;
 
-.field private final aSc:Lcom/google/firebase/d/g;
+.field private final aSl: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/ap;->aRZ:Lcom/google/firebase/FirebaseApp;
+    iput-object p1, p0, Lcom/google/firebase/iid/ap;->aSi:Lcom/google/firebase/FirebaseApp;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ap;->aSa:Lcom/google/firebase/iid/j;
+    iput-object p2, p0, Lcom/google/firebase/iid/ap;->aSj:Lcom/google/firebase/iid/j;
 
-    iput-object p4, p0, Lcom/google/firebase/iid/ap;->aSb:Lcom/google/firebase/iid/p;
+    iput-object p4, p0, Lcom/google/firebase/iid/ap;->aSk:Lcom/google/firebase/iid/p;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ap;->aLP:Ljava/util/concurrent/Executor;
+    iput-object p3, p0, Lcom/google/firebase/iid/ap;->aLY:Ljava/util/concurrent/Executor;
 
-    iput-object p5, p0, Lcom/google/firebase/iid/ap;->aSc:Lcom/google/firebase/d/g;
+    iput-object p5, p0, Lcom/google/firebase/iid/ap;->aSl:Lcom/google/firebase/d/g;
 
     return-void
 .end method
@@ -75,7 +75,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/a;->Ad()Ljava/util/concurrent/Executor;
+    invoke-static {}, Lcom/google/firebase/iid/a;->Ag()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/ap;->aRZ:Lcom/google/firebase/FirebaseApp;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSi:Lcom/google/firebase/FirebaseApp;
 
-    invoke-virtual {p1}, Lcom/google/firebase/FirebaseApp;->zK()Lcom/google/firebase/c;
+    invoke-virtual {p1}, Lcom/google/firebase/FirebaseApp;->zN()Lcom/google/firebase/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/firebase/c;->aPS:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/c;->aQb: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/ap;->aSa:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSj:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rj()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rm()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/ap;->aSa:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSj:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rA()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->rD()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/ap;->aSa:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSj:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->qw()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->qz()Ljava/lang/String;
 
     move-result-object p1
 
@@ -180,7 +180,7 @@
 
     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;->mZ()Lcom/google/android/gms/common/internal/o;
+    invoke-static {}, Lcom/google/android/gms/common/internal/o;->nc()Lcom/google/android/gms/common/internal/o;
 
     move-result-object p1
 
@@ -245,7 +245,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/ap;->aSc:Lcom/google/firebase/d/g;
+    iget-object p1, p0, Lcom/google/firebase/iid/ap;->aSl:Lcom/google/firebase/d/g;
 
     invoke-interface {p1}, Lcom/google/firebase/d/g;->getUserAgent()Ljava/lang/String;
 
@@ -259,7 +259,7 @@
 
     invoke-direct {p1}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iget-object p2, p0, Lcom/google/firebase/iid/ap;->aLP:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/google/firebase/iid/ap;->aLY:Ljava/util/concurrent/Executor;
 
     new-instance p3, Lcom/google/firebase/iid/ar;
 
@@ -267,7 +267,7 @@
 
     invoke-interface {p2, p3}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     return-object p1
 .end method
@@ -286,7 +286,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ap;->aLP:Ljava/util/concurrent/Executor;
+    iget-object v0, p0, Lcom/google/firebase/iid/ap;->aLY:Ljava/util/concurrent/Executor;
 
     new-instance v1, Lcom/google/firebase/iid/at;
 
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 f43919fb5c..406a3aa1ea 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ar.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aSd:Lcom/google/firebase/iid/ap;
+.field private final aSm:Lcom/google/firebase/iid/ap;
 
-.field private final aSe:Landroid/os/Bundle;
+.field private final aSn:Landroid/os/Bundle;
 
-.field private final aSf:Lcom/google/android/gms/tasks/h;
+.field private final aSo: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/ar;->aSd:Lcom/google/firebase/iid/ap;
+    iput-object p1, p0, Lcom/google/firebase/iid/ar;->aSm:Lcom/google/firebase/iid/ap;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ar;->aSe:Landroid/os/Bundle;
+    iput-object p2, p0, Lcom/google/firebase/iid/ar;->aSn:Landroid/os/Bundle;
 
-    iput-object p3, p0, Lcom/google/firebase/iid/ar;->aSf:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/firebase/iid/ar;->aSo: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/ar;->aSd:Lcom/google/firebase/iid/ap;
+    iget-object v0, p0, Lcom/google/firebase/iid/ar;->aSm:Lcom/google/firebase/iid/ap;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ar;->aSe:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/iid/ar;->aSn:Landroid/os/Bundle;
 
-    iget-object v2, p0, Lcom/google/firebase/iid/ar;->aSf:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/firebase/iid/ar;->aSo:Lcom/google/android/gms/tasks/h;
 
     :try_start_0
-    iget-object v0, v0, Lcom/google/firebase/iid/ap;->aSb:Lcom/google/firebase/iid/p;
+    iget-object v0, v0, Lcom/google/firebase/iid/ap;->aSk:Lcom/google/firebase/iid/p;
 
     invoke-virtual {v0, v1}, Lcom/google/firebase/iid/p;->a(Landroid/os/Bundle;)Landroid/os/Bundle;
 
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 e3ade07537..246c3a6de2 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/at.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/at.smali
@@ -19,14 +19,14 @@
 
 
 # instance fields
-.field private final synthetic aSd:Lcom/google/firebase/iid/ap;
+.field private final synthetic aSm:Lcom/google/firebase/iid/ap;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/iid/ap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/at;->aSd:Lcom/google/firebase/iid/ap;
+    iput-object p1, p0, Lcom/google/firebase/iid/at;->aSm:Lcom/google/firebase/iid/ap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
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 5372a44c8e..0a0bbb8bc6 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/au.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/au.smali
@@ -34,13 +34,13 @@
 
     invoke-direct {v2}, Ljava/util/Properties;-><init>()V
 
-    iget-object v3, p2, Lcom/google/firebase/iid/aw;->atJ:Ljava/lang/String;
+    iget-object v3, p2, Lcom/google/firebase/iid/aw;->atS: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/aw;->anq:J
+    iget-wide v3, p2, Lcom/google/firebase/iid/aw;->anz:J
 
     invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -376,7 +376,7 @@
 
     move-result-object v0
 
-    iget-object v1, p2, Lcom/google/firebase/iid/aw;->atJ:Ljava/lang/String;
+    iget-object v1, p2, Lcom/google/firebase/iid/aw;->atS: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/aw;->anq:J
+    iget-wide v0, p2, Lcom/google/firebase/iid/aw;->anz:J
 
     invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
 
@@ -720,7 +720,7 @@
 .method static q(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/aw;
     .locals 5
 
-    invoke-static {}, Lcom/google/firebase/iid/ac;->Ai()Ljava/security/KeyPair;
+    invoke-static {}, Lcom/google/firebase/iid/ac;->Al()Ljava/security/KeyPair;
 
     move-result-object v0
 
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 5c97b2a7c0..9826b9462e 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 private final ajX:Landroid/os/IBinder;
+.field private final akg: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/av;->ajX:Landroid/os/IBinder;
+    iput-object p1, p0, Lcom/google/firebase/iid/av;->akg: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/av;->ajX:Landroid/os/IBinder;
+    iget-object p1, p0, Lcom/google/firebase/iid/av;->akg: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/av;->ajX:Landroid/os/IBinder;
+    iget-object v0, p0, Lcom/google/firebase/iid/av;->akg:Landroid/os/IBinder;
 
     return-object v0
 .end method
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 e63ea7b5d4..67206f834e 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/aw.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/aw.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final anq:J
+.field final anz:J
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
 
 # direct methods
@@ -21,9 +21,9 @@
 
     check-cast p1, Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/aw;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
 
-    iput-wide p2, p0, Lcom/google/firebase/iid/aw;->anq:J
+    iput-wide p2, p0, Lcom/google/firebase/iid/aw;->anz:J
 
     return-void
 .end method
@@ -44,17 +44,17 @@
     :cond_0
     check-cast p1, Lcom/google/firebase/iid/aw;
 
-    iget-wide v2, p0, Lcom/google/firebase/iid/aw;->anq:J
+    iget-wide v2, p0, Lcom/google/firebase/iid/aw;->anz:J
 
-    iget-wide v4, p1, Lcom/google/firebase/iid/aw;->anq:J
+    iget-wide v4, p1, Lcom/google/firebase/iid/aw;->anz:J
 
     cmp-long v0, v2, v4
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/aw;->atJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/aw;->atJ:Ljava/lang/String;
+    iget-object p1, p1, Lcom/google/firebase/iid/aw;->atS: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/aw;->atJ:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/firebase/iid/aw;->atS:Ljava/lang/String;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    iget-wide v1, p0, Lcom/google/firebase/iid/aw;->anq:J
+    iget-wide v1, p0, Lcom/google/firebase/iid/aw;->anz:J
 
     invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
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 782ba50671..5a23902a80 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 amV:Ljava/lang/String;
+.field private final ane:Ljava/lang/String;
 
-.field private final atJ:Ljava/lang/String;
+.field private final atS: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/ay;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/ay;->atS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/ay;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/ay;->ane: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/ay;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/ay;->ane:Ljava/lang/String;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/az.smali b/com.discord/smali_classes2/com/google/firebase/iid/az.smali
index f162ef5911..88cdc4aabc 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/az.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/az.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static aSg:Lcom/google/firebase/iid/az;
+.field private static aSp:Lcom/google/firebase/iid/az;
 
 
 # instance fields
-.field final aRf:Ljava/util/concurrent/ScheduledExecutorService;
+.field final aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private aSh:Lcom/google/firebase/iid/ba;
+.field private aSq:Lcom/google/firebase/iid/ba;
 
-.field final atB:Landroid/content/Context;
+.field final atK:Landroid/content/Context;
 
 .field private zze:I
 
@@ -29,19 +29,19 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/firebase/iid/ba;-><init>(Lcom/google/firebase/iid/az;B)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/az;->aSh:Lcom/google/firebase/iid/ba;
+    iput-object v0, p0, Lcom/google/firebase/iid/az;->aSq:Lcom/google/firebase/iid/ba;
 
     const/4 v0, 0x1
 
     iput v0, p0, Lcom/google/firebase/iid/az;->zze:I
 
-    iput-object p2, p0, Lcom/google/firebase/iid/az;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p2, p0, Lcom/google/firebase/iid/az;->aRo: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/az;->atB:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
 
     return-void
 .end method
@@ -54,13 +54,13 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/az;->aSg:Lcom/google/firebase/iid/az;
+    sget-object v1, Lcom/google/firebase/iid/az;->aSp:Lcom/google/firebase/iid/az;
 
     if-nez v1, :cond_0
 
     new-instance v1, Lcom/google/firebase/iid/az;
 
-    invoke-static {}, Lcom/google/android/gms/internal/e/a;->nO()Lcom/google/android/gms/internal/e/b;
+    invoke-static {}, Lcom/google/android/gms/internal/e/a;->nR()Lcom/google/android/gms/internal/e/b;
 
     move-result-object v2
 
@@ -78,10 +78,10 @@
 
     invoke-direct {v1, p0, v2}, Lcom/google/firebase/iid/az;-><init>(Landroid/content/Context;Ljava/util/concurrent/ScheduledExecutorService;)V
 
-    sput-object v1, Lcom/google/firebase/iid/az;->aSg:Lcom/google/firebase/iid/az;
+    sput-object v1, Lcom/google/firebase/iid/az;->aSp:Lcom/google/firebase/iid/az;
 
     :cond_0
-    sget-object p0, Lcom/google/firebase/iid/az;->aSg:Lcom/google/firebase/iid/az;
+    sget-object p0, Lcom/google/firebase/iid/az;->aSp:Lcom/google/firebase/iid/az;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -159,7 +159,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/az;->aSh:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/az;->aSq:Lcom/google/firebase/iid/ba;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/ba;->b(Lcom/google/firebase/iid/i;)Z
 
@@ -173,16 +173,16 @@
 
     invoke-direct {v0, p0, v1}, Lcom/google/firebase/iid/ba;-><init>(Lcom/google/firebase/iid/az;B)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/az;->aSh:Lcom/google/firebase/iid/ba;
+    iput-object v0, p0, Lcom/google/firebase/iid/az;->aSq:Lcom/google/firebase/iid/ba;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/az;->aSh:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/az;->aSq:Lcom/google/firebase/iid/ba;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/ba;->b(Lcom/google/firebase/iid/i;)Z
 
     :cond_1
-    iget-object p1, p1, Lcom/google/firebase/iid/i;->aRv:Lcom/google/android/gms/tasks/h;
+    iget-object p1, p1, Lcom/google/firebase/iid/i;->aRE:Lcom/google/android/gms/tasks/h;
 
-    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, p1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -198,7 +198,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized pG()I
+.method public final declared-synchronized pJ()I
     .locals 2
 
     monitor-enter p0
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 1a5c1c7d68..c463b6111a 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 aRr:Lcom/google/firebase/iid/ba;
+.field private final aRA:Lcom/google/firebase/iid/ba;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/b;->aRr:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/b;->aRA:Lcom/google/firebase/iid/ba;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lcom/google/firebase/iid/b;->aRr:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/b;->aRA:Lcom/google/firebase/iid/ba;
 
     :goto_0
     monitor-enter v0
@@ -43,7 +43,7 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->isEmpty()Z
 
@@ -51,14 +51,14 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->pD()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->pG()V
 
     monitor-exit v0
 
     return-void
 
     :cond_1
-    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {v1}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -66,15 +66,15 @@
 
     check-cast v1, Lcom/google/firebase/iid/i;
 
-    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     iget v4, v1, Lcom/google/firebase/iid/i;->zza:I
 
     invoke-virtual {v3, v4, v1}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
 
-    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object v3, v3, Lcom/google/firebase/iid/az;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v3, v3, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v4, Lcom/google/firebase/iid/d;
 
@@ -133,11 +133,11 @@
     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/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object v3, v0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object v3, v3, Lcom/google/firebase/iid/az;->atB:Landroid/content/Context;
+    iget-object v3, v3, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
 
-    iget-object v4, v0, Lcom/google/firebase/iid/ba;->aSi:Landroid/os/Messenger;
+    iget-object v4, v0, Lcom/google/firebase/iid/ba;->aSr:Landroid/os/Messenger;
 
     invoke-static {}, Landroid/os/Message;->obtain()Landroid/os/Message;
 
@@ -157,7 +157,7 @@
 
     invoke-direct {v4}, Landroid/os/Bundle;-><init>()V
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/i;->pE()Z
+    invoke-virtual {v1}, Lcom/google/firebase/iid/i;->pH()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/i;->asD:Landroid/os/Bundle;
+    iget-object v1, v1, Lcom/google/firebase/iid/i;->asM: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/ba;->aSj:Lcom/google/firebase/iid/g;
+    iget-object v1, v0, Lcom/google/firebase/iid/ba;->aSs:Lcom/google/firebase/iid/g;
 
-    iget-object v3, v1, Lcom/google/firebase/iid/g;->aRt:Landroid/os/Messenger;
+    iget-object v3, v1, Lcom/google/firebase/iid/g;->aRC:Landroid/os/Messenger;
 
     if-eqz v3, :cond_3
 
-    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRt:Landroid/os/Messenger;
+    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRC: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/g;->aRu:Lcom/google/firebase/iid/zzf;
+    iget-object v3, v1, Lcom/google/firebase/iid/g;->aRD:Lcom/google/firebase/iid/zzf;
 
     if-eqz v3, :cond_4
 
-    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRu:Lcom/google/firebase/iid/zzf;
+    iget-object v1, v1, Lcom/google/firebase/iid/g;->aRD:Lcom/google/firebase/iid/zzf;
 
     invoke-virtual {v1, v5}, Lcom/google/firebase/iid/zzf;->a(Landroid/os/Message;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/ba.smali b/com.discord/smali_classes2/com/google/firebase/iid/ba.smali
index a72844f044..28b053fae7 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/ba.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/ba.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final aRR:Ljava/util/Queue;
+.field final aSa:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -17,11 +17,11 @@
     .end annotation
 .end field
 
-.field final aSi:Landroid/os/Messenger;
+.field final aSr:Landroid/os/Messenger;
 
-.field aSj:Lcom/google/firebase/iid/g;
+.field aSs:Lcom/google/firebase/iid/g;
 
-.field final aSk:Landroid/util/SparseArray;
+.field final aSt:Landroid/util/SparseArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroid/util/SparseArray<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic aSl:Lcom/google/firebase/iid/az;
+.field final synthetic aSu:Lcom/google/firebase/iid/az;
 
 .field zza:I
 
@@ -40,7 +40,7 @@
 .method private constructor <init>(Lcom/google/firebase/iid/az;)V
     .locals 3
 
-    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
     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/ba;->aSi:Landroid/os/Messenger;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSr: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/ba;->aRR:Ljava/util/Queue;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSa: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/ba;->aSk:Landroid/util/SparseArray;
+    iput-object p1, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     return-void
 .end method
@@ -163,7 +163,7 @@
 
     :cond_2
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -177,7 +177,7 @@
 
     :cond_3
     :try_start_2
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
     :try_end_2
@@ -189,7 +189,7 @@
 
     :cond_4
     :try_start_3
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->add(Ljava/lang/Object;)Z
 
@@ -234,11 +234,11 @@
 
     invoke-virtual {p1, v0}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->atB:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->atK: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
 
@@ -253,9 +253,9 @@
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v0, Lcom/google/firebase/iid/bb;
 
@@ -288,7 +288,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -318,7 +318,7 @@
 
     invoke-static {v1, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v1, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {v1, p1}, Landroid/util/SparseArray;->remove(I)V
 
@@ -332,7 +332,7 @@
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/i;->a(Lcom/google/firebase/iid/h;)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pD()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pG()V
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -474,11 +474,11 @@
     :cond_5
     iput v4, p0, Lcom/google/firebase/iid/ba;->zza:I
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->atB:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->atK:Landroid/content/Context;
 
     invoke-static {v0, p0}, Lcom/google/android/gms/common/stats/a;->a(Landroid/content/Context;Landroid/content/ServiceConnection;)V
 
@@ -486,7 +486,7 @@
 
     invoke-direct {v0, p1, p2}, Lcom/google/firebase/iid/h;-><init>(ILjava/lang/String;)V
 
-    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->iterator()Ljava/util/Iterator;
 
@@ -510,14 +510,14 @@
     goto :goto_1
 
     :cond_6
-    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSa: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/ba;->aSk:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {p2}, Landroid/util/SparseArray;->size()I
 
@@ -525,7 +525,7 @@
 
     if-ge p1, p2, :cond_7
 
-    iget-object p2, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object p2, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {p2, p1}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object;
 
@@ -540,7 +540,7 @@
     goto :goto_2
 
     :cond_7
-    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {p1}, Landroid/util/SparseArray;->clear()V
     :try_end_2
@@ -613,7 +613,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object v1, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {v1, v0}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object;
 
@@ -650,11 +650,11 @@
     return v2
 
     :cond_1
-    iget-object v3, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object v3, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {v3, v0}, Landroid/util/SparseArray;->remove(I)V
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pD()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/ba;->pG()V
 
     monitor-exit p0
     :try_end_0
@@ -721,9 +721,9 @@
     invoke-static {p1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v0, Lcom/google/firebase/iid/c;
 
@@ -752,9 +752,9 @@
     invoke-static {p1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_0
-    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object p1, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p1, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v0, Lcom/google/firebase/iid/e;
 
@@ -765,7 +765,7 @@
     return-void
 .end method
 
-.method final declared-synchronized pD()V
+.method final declared-synchronized pG()V
     .locals 2
 
     monitor-enter p0
@@ -777,7 +777,7 @@
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aRR:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSa:Ljava/util/Queue;
 
     invoke-interface {v0}, Ljava/util/Queue;->isEmpty()Z
 
@@ -785,7 +785,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSk:Landroid/util/SparseArray;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSt:Landroid/util/SparseArray;
 
     invoke-virtual {v0}, Landroid/util/SparseArray;->size()I
 
@@ -812,11 +812,11 @@
 
     iput v0, p0, Lcom/google/firebase/iid/ba;->zza:I
 
-    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nh()Lcom/google/android/gms/common/stats/a;
+    invoke-static {}, Lcom/google/android/gms/common/stats/a;->nk()Lcom/google/android/gms/common/stats/a;
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->atB:Landroid/content/Context;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->atK: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
@@ -835,7 +835,7 @@
     throw v0
 .end method
 
-.method final declared-synchronized rx()V
+.method final declared-synchronized rA()V
     .locals 2
 
     monitor-enter p0
@@ -869,9 +869,9 @@
 .method final zza()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSl:Lcom/google/firebase/iid/az;
+    iget-object v0, p0, Lcom/google/firebase/iid/ba;->aSu:Lcom/google/firebase/iid/az;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/az;->aRf:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, v0, Lcom/google/firebase/iid/az;->aRo:Ljava/util/concurrent/ScheduledExecutorService;
 
     new-instance v1, Lcom/google/firebase/iid/b;
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/bb.smali b/com.discord/smali_classes2/com/google/firebase/iid/bb.smali
index 2d9690c49f..c90f27bf09 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/bb.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/bb.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aRr:Lcom/google/firebase/iid/ba;
+.field private final aRA:Lcom/google/firebase/iid/ba;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/bb;->aRr:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/bb;->aRA:Lcom/google/firebase/iid/ba;
 
     return-void
 .end method
@@ -26,9 +26,9 @@
 .method public final run()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/bb;->aRr:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/bb;->aRA:Lcom/google/firebase/iid/ba;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->rx()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/ba;->rA()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/bc.smali b/com.discord/smali_classes2/com/google/firebase/iid/bc.smali
index fd923484d2..1e5f504abe 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/bc.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/bc.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aRr:Lcom/google/firebase/iid/ba;
+.field private final aRA:Lcom/google/firebase/iid/ba;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/bc;->aRr:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/bc;->aRA:Lcom/google/firebase/iid/ba;
 
     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/bc;->aRr:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/bc;->aRA:Lcom/google/firebase/iid/ba;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/iid/ba;->c(Landroid/os/Message;)Z
 
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 e9e6f90b05..13fda6e546 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/c.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/c.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aRr:Lcom/google/firebase/iid/ba;
+.field private final aRA:Lcom/google/firebase/iid/ba;
 
-.field private final ang:Landroid/os/IBinder;
+.field private final anp:Landroid/os/IBinder;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/c;->aRr:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/c;->aRA:Lcom/google/firebase/iid/ba;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/c;->ang:Landroid/os/IBinder;
+    iput-object p2, p0, Lcom/google/firebase/iid/c;->anp:Landroid/os/IBinder;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/google/firebase/iid/c;->aRr:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/c;->aRA:Lcom/google/firebase/iid/ba;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/c;->ang:Landroid/os/IBinder;
+    iget-object v1, p0, Lcom/google/firebase/iid/c;->anp:Landroid/os/IBinder;
 
     monitor-enter v0
 
@@ -57,7 +57,7 @@
 
     invoke-direct {v3, v1}, Lcom/google/firebase/iid/g;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v3, v0, Lcom/google/firebase/iid/ba;->aSj:Lcom/google/firebase/iid/g;
+    iput-object v3, v0, Lcom/google/firebase/iid/ba;->aSs:Lcom/google/firebase/iid/g;
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
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 1453cd79de..901169ffaf 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/d.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aRr:Lcom/google/firebase/iid/ba;
+.field private final aRA:Lcom/google/firebase/iid/ba;
 
-.field private final aRs:Lcom/google/firebase/iid/i;
+.field private final aRB:Lcom/google/firebase/iid/i;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/d;->aRr:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/d;->aRA:Lcom/google/firebase/iid/ba;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/d;->aRs:Lcom/google/firebase/iid/i;
+    iput-object p2, p0, Lcom/google/firebase/iid/d;->aRB:Lcom/google/firebase/iid/i;
 
     return-void
 .end method
@@ -30,9 +30,9 @@
 .method public final run()V
     .locals 2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/d;->aRr:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/d;->aRA:Lcom/google/firebase/iid/ba;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/d;->aRs:Lcom/google/firebase/iid/i;
+    iget-object v1, p0, Lcom/google/firebase/iid/d;->aRB:Lcom/google/firebase/iid/i;
 
     iget v1, v1, Lcom/google/firebase/iid/i;->zza:I
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/e.smali b/com.discord/smali_classes2/com/google/firebase/iid/e.smali
index 15bbf2898f..bc3f2d9aeb 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/e.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aRr:Lcom/google/firebase/iid/ba;
+.field private final aRA:Lcom/google/firebase/iid/ba;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/e;->aRr:Lcom/google/firebase/iid/ba;
+    iput-object p1, p0, Lcom/google/firebase/iid/e;->aRA:Lcom/google/firebase/iid/ba;
 
     return-void
 .end method
@@ -26,7 +26,7 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/e;->aRr:Lcom/google/firebase/iid/ba;
+    iget-object v0, p0, Lcom/google/firebase/iid/e;->aRA:Lcom/google/firebase/iid/ba;
 
     const/4 v1, 0x2
 
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 77cda4ba56..464565f124 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/f.smali
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method final pE()Z
+.method final pH()Z
     .locals 1
 
     const/4 v0, 0x1
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 0d8e79a543..e957a81f87 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/g.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field final aRt:Landroid/os/Messenger;
+.field final aRC:Landroid/os/Messenger;
 
-.field final aRu:Lcom/google/firebase/iid/zzf;
+.field final aRD:Lcom/google/firebase/iid/zzf;
 
 
 # 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/g;->aRt:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/g;->aRC:Landroid/os/Messenger;
 
-    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRu:Lcom/google/firebase/iid/zzf;
+    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRD:Lcom/google/firebase/iid/zzf;
 
     return-void
 
@@ -57,9 +57,9 @@
 
     invoke-direct {v0, p1}, Lcom/google/firebase/iid/zzf;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/g;->aRu:Lcom/google/firebase/iid/zzf;
+    iput-object v0, p0, Lcom/google/firebase/iid/g;->aRD:Lcom/google/firebase/iid/zzf;
 
-    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRt:Landroid/os/Messenger;
+    iput-object v2, p0, Lcom/google/firebase/iid/g;->aRC:Landroid/os/Messenger;
 
     return-void
 
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 6c29a2eee6..7054547dfb 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/i.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/i.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final aRv:Lcom/google/android/gms/tasks/h;
+.field final aRE:Lcom/google/android/gms/tasks/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/android/gms/tasks/h<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field final asD:Landroid/os/Bundle;
+.field final asM: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/i;->aRv:Lcom/google/android/gms/tasks/h;
+    iput-object v0, p0, Lcom/google/firebase/iid/i;->aRE:Lcom/google/android/gms/tasks/h;
 
     iput p1, p0, Lcom/google/firebase/iid/i;->zza:I
 
     iput p2, p0, Lcom/google/firebase/iid/i;->zzc:I
 
-    iput-object p3, p0, Lcom/google/firebase/iid/i;->asD:Landroid/os/Bundle;
+    iput-object p3, p0, Lcom/google/firebase/iid/i;->asM: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/i;->aRv:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/firebase/iid/i;->aRE:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/h;->c(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/i;->aRv:Lcom/google/android/gms/tasks/h;
+    iget-object v0, p0, Lcom/google/firebase/iid/i;->aRE:Lcom/google/android/gms/tasks/h;
 
     invoke-virtual {v0, p1}, Lcom/google/android/gms/tasks/h;->f(Ljava/lang/Exception;)V
 
@@ -204,7 +204,7 @@
 .method abstract b(Landroid/os/Bundle;)V
 .end method
 
-.method abstract pE()Z
+.method abstract pH()Z
 .end method
 
 .method public toString()Ljava/lang/String;
@@ -214,7 +214,7 @@
 
     iget v1, p0, Lcom/google/firebase/iid/i;->zza:I
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/i;->pE()Z
+    invoke-virtual {p0}, Lcom/google/firebase/iid/i;->pH()Z
 
     move-result v2
 
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 04169368f5..db031bfb50 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/j.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final aGD:Landroid/content/Context;
+.field private final aGM:Landroid/content/Context;
 
-.field private amV:Ljava/lang/String;
+.field private ane:Ljava/lang/String;
 
-.field private anh:Ljava/lang/String;
+.field private anq:Ljava/lang/String;
 
 .field private zzd:I
 
@@ -25,7 +25,7 @@
 
     iput v0, p0, Lcom/google/firebase/iid/j;->zze:I
 
-    iput-object p1, p0, Lcom/google/firebase/iid/j;->aGD:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/j;->aGM:Landroid/content/Context;
 
     return-void
 .end method
@@ -87,22 +87,22 @@
 .method public static c(Lcom/google/firebase/FirebaseApp;)Ljava/lang/String;
     .locals 3
 
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zK()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zN()Lcom/google/firebase/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lcom/google/firebase/c;->aPV:Ljava/lang/String;
+    iget-object v0, v0, Lcom/google/firebase/c;->aQe:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zK()Lcom/google/firebase/c;
+    invoke-virtual {p0}, Lcom/google/firebase/FirebaseApp;->zN()Lcom/google/firebase/c;
 
     move-result-object p0
 
-    iget-object p0, p0, Lcom/google/firebase/c;->aPS:Ljava/lang/String;
+    iget-object p0, p0, Lcom/google/firebase/c;->aQb:Ljava/lang/String;
 
     const-string v0, "1:"
 
@@ -152,7 +152,7 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGM:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
 
@@ -208,13 +208,13 @@
     return-object p1
 .end method
 
-.method private final declared-synchronized tx()V
+.method private final declared-synchronized tA()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGM:Landroid/content/Context;
 
     invoke-virtual {v0}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
@@ -232,11 +232,11 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lcom/google/firebase/iid/j;->amV:Ljava/lang/String;
+    iput-object v1, p0, Lcom/google/firebase/iid/j;->ane:Ljava/lang/String;
 
     iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/j;->anh:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/firebase/iid/j;->anq:Ljava/lang/String;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -255,7 +255,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized pG()I
+.method public final declared-synchronized pJ()I
     .locals 5
 
     monitor-enter p0
@@ -275,7 +275,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGD:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->aGM: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 qw()Ljava/lang/String;
+.method public final declared-synchronized qz()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->anq:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/j;->tx()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/j;->tA()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->anq: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 rA()Ljava/lang/String;
+.method public final declared-synchronized rD()Ljava/lang/String;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->ane:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/j;->tx()V
+    invoke-direct {p0}, Lcom/google/firebase/iid/j;->tA()V
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/j;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/j;->ane: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 rj()I
+.method public final declared-synchronized rm()I
     .locals 1
 
     monitor-enter p0
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 5ea5dc65b7..ba00556923 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/k.smali
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method final pE()Z
+.method final pH()Z
     .locals 1
 
     const/4 v0, 0x0
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 97cd266864..360dea6556 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/l.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQc:Lcom/google/firebase/components/g;
+.field static final aQl:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/l;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/l;->aQc:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/iid/l;->aQl:Lcom/google/firebase/components/g;
 
     return-void
 .end method
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 ed67b9d9b3..f1ff06b247 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/m.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQc:Lcom/google/firebase/components/g;
+.field static final aQl:Lcom/google/firebase/components/g;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/iid/m;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/m;->aQc:Lcom/google/firebase/components/g;
+    sput-object v0, Lcom/google/firebase/iid/m;->aQl:Lcom/google/firebase/components/g;
 
     return-void
 .end method
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 7af5d0e2dc..84734781c9 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/n.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aRw:Lcom/google/firebase/iid/o;
+.field private final aRF:Lcom/google/firebase/iid/o;
 
-.field private final aRx:Landroid/util/Pair;
+.field private final aRG: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/n;->aRw:Lcom/google/firebase/iid/o;
+    iput-object p1, p0, Lcom/google/firebase/iid/n;->aRF:Lcom/google/firebase/iid/o;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/n;->aRx:Landroid/util/Pair;
+    iput-object p2, p0, Lcom/google/firebase/iid/n;->aRG: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/n;->aRw:Lcom/google/firebase/iid/o;
+    iget-object v0, p0, Lcom/google/firebase/iid/n;->aRF:Lcom/google/firebase/iid/o;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/n;->aRx:Landroid/util/Pair;
+    iget-object v1, p0, Lcom/google/firebase/iid/n;->aRG:Landroid/util/Pair;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/iid/o;->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/o.smali b/com.discord/smali_classes2/com/google/firebase/iid/o.smali
index e124c27592..0e1c6db6cd 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/o.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/o.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aBG:Ljava/util/Map;
+.field private final aBP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -19,7 +19,7 @@
     .end annotation
 .end field
 
-.field private final aQh:Ljava/util/concurrent/Executor;
+.field private final aQq:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -32,9 +32,9 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/o;->aBG:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/iid/o;->aBP:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/o;->aQh:Ljava/util/concurrent/Executor;
+    iput-object p1, p0, Lcom/google/firebase/iid/o;->aQq: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/o;->aBG:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/firebase/iid/o;->aBP: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/o;->aBG:Ljava/util/Map;
+    iget-object p1, p0, Lcom/google/firebase/iid/o;->aBP: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/q;->Af()Lcom/google/android/gms/tasks/Task;
+    invoke-interface {p3}, Lcom/google/firebase/iid/q;->Ai()Lcom/google/android/gms/tasks/Task;
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/firebase/iid/o;->aQh:Ljava/util/concurrent/Executor;
+    iget-object p2, p0, Lcom/google/firebase/iid/o;->aQq:Ljava/util/concurrent/Executor;
 
     new-instance p3, Lcom/google/firebase/iid/n;
 
@@ -208,7 +208,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/google/firebase/iid/o;->aBG:Ljava/util/Map;
+    iget-object p2, p0, Lcom/google/firebase/iid/o;->aBP: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/p.smali b/com.discord/smali_classes2/com/google/firebase/iid/p.smali
index 6a0631c6b5..4c8af169f7 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/p.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/p.smali
@@ -4,23 +4,15 @@
 
 
 # static fields
-.field private static aRy:Landroid/app/PendingIntent;
+.field private static aRH:Landroid/app/PendingIntent;
 
 .field private static zza:I
 
 
 # instance fields
-.field private final aFp:Landroid/content/Context;
+.field private final aFy:Landroid/content/Context;
 
-.field private final aRA:Lcom/google/firebase/iid/j;
-
-.field private aRB:Landroid/os/Messenger;
-
-.field private aRC:Landroid/os/Messenger;
-
-.field private aRD:Lcom/google/firebase/iid/zzf;
-
-.field private final aRz:Landroidx/collection/SimpleArrayMap;
+.field private final aRI:Landroidx/collection/SimpleArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/SimpleArrayMap<",
@@ -32,6 +24,14 @@
     .end annotation
 .end field
 
+.field private final aRJ:Lcom/google/firebase/iid/j;
+
+.field private aRK:Landroid/os/Messenger;
+
+.field private aRL:Landroid/os/Messenger;
+
+.field private aRM:Lcom/google/firebase/iid/zzf;
+
 
 # direct methods
 .method static constructor <clinit>()V
@@ -49,11 +49,11 @@
 
     invoke-direct {v0}, Landroidx/collection/SimpleArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/p;->aFp:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/p;->aFy:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/p;->aRA:Lcom/google/firebase/iid/j;
+    iput-object p2, p0, Lcom/google/firebase/iid/p;->aRJ:Lcom/google/firebase/iid/j;
 
     new-instance p1, Landroid/os/Messenger;
 
@@ -67,7 +67,7 @@
 
     invoke-direct {p1, p2}, Landroid/os/Messenger;-><init>(Landroid/os/Handler;)V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/p;->aRB:Landroid/os/Messenger;
+    iput-object p1, p0, Lcom/google/firebase/iid/p;->aRK:Landroid/os/Messenger;
 
     return-void
 .end method
@@ -115,7 +115,7 @@
 
     check-cast v1, Lcom/google/firebase/iid/zzf;
 
-    iput-object v1, p0, Lcom/google/firebase/iid/p;->aRD:Lcom/google/firebase/iid/zzf;
+    iput-object v1, p0, Lcom/google/firebase/iid/p;->aRM:Lcom/google/firebase/iid/zzf;
 
     :cond_0
     instance-of v1, v0, Landroid/os/Messenger;
@@ -124,7 +124,7 @@
 
     check-cast v0, Landroid/os/Messenger;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRC:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/p;->aRL:Landroid/os/Messenger;
 
     :cond_1
     iget-object p1, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
@@ -391,7 +391,7 @@
     return-void
 
     :cond_d
-    iget-object v4, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v4, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v4
 
@@ -399,7 +399,7 @@
 
     :goto_4
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1}, Landroidx/collection/SimpleArrayMap;->size()I
 
@@ -407,7 +407,7 @@
 
     if-ge v0, v1, :cond_e
 
-    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1, v0}, Landroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
 
@@ -536,7 +536,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/p;->aRy:Landroid/app/PendingIntent;
+    sget-object v1, Lcom/google/firebase/iid/p;->aRH:Landroid/app/PendingIntent;
 
     if-nez v1, :cond_0
 
@@ -554,12 +554,12 @@
 
     move-result-object p0
 
-    sput-object p0, Lcom/google/firebase/iid/p;->aRy:Landroid/app/PendingIntent;
+    sput-object p0, Lcom/google/firebase/iid/p;->aRH:Landroid/app/PendingIntent;
 
     :cond_0
     const-string p0, "app"
 
-    sget-object v1, Lcom/google/firebase/iid/p;->aRy:Landroid/app/PendingIntent;
+    sget-object v1, Lcom/google/firebase/iid/p;->aRH:Landroid/app/PendingIntent;
 
     invoke-virtual {p1, p0, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
     :try_end_0
@@ -620,12 +620,12 @@
 .method private final d(Ljava/lang/String;Landroid/os/Bundle;)V
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v1, p1}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -692,7 +692,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lcom/google/firebase/iid/p;->pL()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/p;->pO()Ljava/lang/String;
 
     move-result-object v0
 
@@ -700,12 +700,12 @@
 
     invoke-direct {v1}, Lcom/google/android/gms/tasks/h;-><init>()V
 
-    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v3, v0, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -713,9 +713,9 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_3
 
-    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRA:Lcom/google/firebase/iid/j;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRJ:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pG()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pJ()I
 
     move-result v2
 
@@ -729,9 +729,9 @@
 
     invoke-virtual {v2, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRA:Lcom/google/firebase/iid/j;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRJ:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v3}, Lcom/google/firebase/iid/j;->pG()I
+    invoke-virtual {v3}, Lcom/google/firebase/iid/j;->pJ()I
 
     move-result v3
 
@@ -753,7 +753,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/p;->aFp:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFy:Landroid/content/Context;
 
     invoke-static {p1, v2}, Lcom/google/firebase/iid/p;->b(Landroid/content/Context;Landroid/content/Intent;)V
 
@@ -836,17 +836,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/p;->aRB:Landroid/os/Messenger;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRK: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/p;->aRC:Landroid/os/Messenger;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRL:Landroid/os/Messenger;
 
     if-nez v3, :cond_2
 
-    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRD:Lcom/google/firebase/iid/zzf;
+    iget-object v3, p0, Lcom/google/firebase/iid/p;->aRM:Lcom/google/firebase/iid/zzf;
 
     if-eqz v3, :cond_4
 
@@ -858,18 +858,18 @@
     iput-object v2, v3, Landroid/os/Message;->obj:Ljava/lang/Object;
 
     :try_start_1
-    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRC:Landroid/os/Messenger;
+    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRL:Landroid/os/Messenger;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRC:Landroid/os/Messenger;
+    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRL: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/p;->aRD:Lcom/google/firebase/iid/zzf;
+    iget-object v5, p0, Lcom/google/firebase/iid/p;->aRM:Lcom/google/firebase/iid/zzf;
 
     invoke-virtual {v5, v3}, Lcom/google/firebase/iid/zzf;->a(Landroid/os/Message;)V
     :try_end_1
@@ -895,28 +895,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/p;->aRA:Lcom/google/firebase/iid/j;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aRJ:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->pG()I
+    invoke-virtual {p1}, Lcom/google/firebase/iid/j;->pJ()I
 
     move-result p1
 
     if-ne p1, v4, :cond_5
 
-    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFp:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFy: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/p;->aFp:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/p;->aFy: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;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v1, Lcom/google/android/gms/tasks/h;->aLU:Lcom/google/android/gms/tasks/ac;
 
     const-wide/16 v1, 0x7530
 
@@ -933,12 +933,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/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
 
     :try_start_3
-    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v2, v0}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -988,12 +988,12 @@
     .catchall {:try_start_4 .. :try_end_4} :catchall_1
 
     :goto_2
-    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v1, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     monitor-enter v1
 
     :try_start_5
-    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRz:Landroidx/collection/SimpleArrayMap;
+    iget-object v2, p0, Lcom/google/firebase/iid/p;->aRI:Landroidx/collection/SimpleArrayMap;
 
     invoke-virtual {v2, v0}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1033,7 +1033,7 @@
     throw p1
 .end method
 
-.method private static declared-synchronized pL()Ljava/lang/String;
+.method private static declared-synchronized pO()Ljava/lang/String;
     .locals 3
 
     const-class v0, Lcom/google/firebase/iid/p;
@@ -1075,9 +1075,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/iid/p;->aRA:Lcom/google/firebase/iid/j;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aRJ:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rj()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/j;->rm()I
 
     move-result v0
 
@@ -1085,7 +1085,7 @@
 
     if-lt v0, v1, :cond_3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/p;->aFp:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/p;->aFy:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/firebase/iid/az;->aC(Landroid/content/Context;)Lcom/google/firebase/iid/az;
 
@@ -1093,7 +1093,7 @@
 
     new-instance v1, Lcom/google/firebase/iid/k;
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/az;->pG()I
+    invoke-virtual {v0}, Lcom/google/firebase/iid/az;->pJ()I
 
     move-result v2
 
@@ -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;->aLO:Ljava/util/concurrent/CountDownLatch;
+    iget-object v1, v1, Lcom/google/android/gms/tasks/j$a;->aLX:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v1}, Ljava/util/concurrent/CountDownLatch;->await()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 6fe2b3180d..e5b8e85e28 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/q.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/q.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract Af()Lcom/google/android/gms/tasks/Task;
+.method public abstract Ai()Lcom/google/android/gms/tasks/Task;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
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 1c8aaae1df..b0bf137b3c 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/s.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/s.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static aRE:Lcom/google/firebase/iid/s;
+.field private static aRN:Lcom/google/firebase/iid/s;
 
 
 # instance fields
-.field aBZ:Ljava/lang/Boolean;
+.field aCi:Ljava/lang/Boolean;
 
-.field aIJ:Ljava/lang/Boolean;
+.field aIS:Ljava/lang/Boolean;
 
-.field public final aRF:Ljava/util/Queue;
+.field public final aRO:Ljava/util/Queue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Queue<",
@@ -22,7 +22,7 @@
     .end annotation
 .end field
 
-.field private amV:Ljava/lang/String;
+.field private ane:Ljava/lang/String;
 
 
 # direct methods
@@ -33,22 +33,22 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/google/firebase/iid/s;->amV:Ljava/lang/String;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->ane:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/s;->aBZ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->aCi:Ljava/lang/Boolean;
 
-    iput-object v0, p0, Lcom/google/firebase/iid/s;->aIJ:Ljava/lang/Boolean;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->aIS: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/s;->aRF:Ljava/util/Queue;
+    iput-object v0, p0, Lcom/google/firebase/iid/s;->aRO:Ljava/util/Queue;
 
     return-void
 .end method
 
-.method public static declared-synchronized Ag()Lcom/google/firebase/iid/s;
+.method public static declared-synchronized Aj()Lcom/google/firebase/iid/s;
     .locals 2
 
     const-class v0, Lcom/google/firebase/iid/s;
@@ -56,7 +56,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/s;->aRE:Lcom/google/firebase/iid/s;
+    sget-object v1, Lcom/google/firebase/iid/s;->aRN:Lcom/google/firebase/iid/s;
 
     if-nez v1, :cond_0
 
@@ -64,10 +64,10 @@
 
     invoke-direct {v1}, Lcom/google/firebase/iid/s;-><init>()V
 
-    sput-object v1, Lcom/google/firebase/iid/s;->aRE:Lcom/google/firebase/iid/s;
+    sput-object v1, Lcom/google/firebase/iid/s;->aRN:Lcom/google/firebase/iid/s;
 
     :cond_0
-    sget-object v1, Lcom/google/firebase/iid/s;->aRE:Lcom/google/firebase/iid/s;
+    sget-object v1, Lcom/google/firebase/iid/s;->aRN:Lcom/google/firebase/iid/s;
     :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/s;->amV:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->ane:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->amV:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->ane: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/s;->amV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->ane: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/s;->amV:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->ane:Ljava/lang/String;
 
     :goto_1
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->amV:Ljava/lang/String;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->ane: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/s;->aBZ:Ljava/lang/Boolean;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aCi:Ljava/lang/Boolean;
 
     if-nez v0, :cond_1
 
@@ -461,10 +461,10 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/s;->aBZ:Ljava/lang/Boolean;
+    iput-object p1, p0, Lcom/google/firebase/iid/s;->aCi:Ljava/lang/Boolean;
 
     :cond_1
-    iget-object p1, p0, Lcom/google/firebase/iid/s;->aBZ:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->aCi: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/s;->aBZ:Ljava/lang/Boolean;
+    iget-object p1, p0, Lcom/google/firebase/iid/s;->aCi: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/s;->aRF:Ljava/util/Queue;
+    iget-object v0, p0, Lcom/google/firebase/iid/s;->aRO: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/t.smali b/com.discord/smali_classes2/com/google/firebase/iid/t.smali
index a4e2b5b0fd..b793d55ea9 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/t.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/t.smali
@@ -4,14 +4,14 @@
 
 
 # instance fields
-.field private final synthetic aRG:Lcom/google/firebase/iid/p;
+.field private final synthetic aRP:Lcom/google/firebase/iid/p;
 
 
 # direct methods
 .method constructor <init>(Lcom/google/firebase/iid/p;Landroid/os/Looper;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/firebase/iid/t;->aRG:Lcom/google/firebase/iid/p;
+    iput-object p1, p0, Lcom/google/firebase/iid/t;->aRP:Lcom/google/firebase/iid/p;
 
     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/t;->aRG:Lcom/google/firebase/iid/p;
+    iget-object v0, p0, Lcom/google/firebase/iid/t;->aRP:Lcom/google/firebase/iid/p;
 
     invoke-static {v0, p1}, Lcom/google/firebase/iid/p;->a(Lcom/google/firebase/iid/p;Landroid/os/Message;)V
 
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 ac8a6bfd13..7fa36efb12 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/u.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/u.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final anq:J
+.field private static final anz:J
 
 
 # instance fields
-.field private final anh:Ljava/lang/String;
+.field private final anq:Ljava/lang/String;
 
-.field final atJ:Ljava/lang/String;
+.field final atS:Ljava/lang/String;
 
 .field private final zzd:J
 
@@ -27,7 +27,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/google/firebase/iid/u;->anq:J
+    sput-wide v0, Lcom/google/firebase/iid/u;->anz:J
 
     return-void
 .end method
@@ -37,9 +37,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/u;->atJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/firebase/iid/u;->atS:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/u;->anh:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/iid/u;->anq:Ljava/lang/String;
 
     iput-wide p3, p0, Lcom/google/firebase/iid/u;->zzd:J
 
@@ -225,7 +225,7 @@
 
     iget-wide v2, p0, Lcom/google/firebase/iid/u;->zzd:J
 
-    sget-wide v4, Lcom/google/firebase/iid/u;->anq:J
+    sget-wide v4, Lcom/google/firebase/iid/u;->anz:J
 
     add-long/2addr v2, v4
 
@@ -233,7 +233,7 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/u;->anh:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/firebase/iid/u;->anq: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/v.smali b/com.discord/smali_classes2/com/google/firebase/iid/v.smali
index 513b9b82e6..d58858ef18 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/v.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/v.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final aRH:Landroid/content/SharedPreferences;
+.field private final aRQ:Landroid/content/SharedPreferences;
 
-.field private final aRI:Lcom/google/firebase/iid/au;
+.field private final aRR:Lcom/google/firebase/iid/au;
 
-.field private final atB:Landroid/content/Context;
+.field private final atK:Landroid/content/Context;
 
 .field private final zzd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
@@ -48,7 +48,7 @@
 
     iput-object v1, p0, Lcom/google/firebase/iid/v;->zzd:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/v;->atB:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/iid/v;->atK: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/v;->aRH:Landroid/content/SharedPreferences;
+    iput-object p1, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/v;->aRI:Lcom/google/firebase/iid/au;
+    iput-object p2, p0, Lcom/google/firebase/iid/v;->aRR:Lcom/google/firebase/iid/au;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/v;->atB:Landroid/content/Context;
+    iget-object p1, p0, Lcom/google/firebase/iid/v;->atK: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/v;->nL()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/v;->nO()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/v;->pD()V
+    invoke-virtual {p0}, Lcom/google/firebase/iid/v;->pG()V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->tx()V
+    invoke-virtual {p1}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()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 nL()Z
+.method private final declared-synchronized nO()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->getAll()Ljava/util/Map;
 
@@ -311,7 +311,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p5, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object p5, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     invoke-interface {p5}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -345,7 +345,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -397,9 +397,9 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRI:Lcom/google/firebase/iid/au;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRR:Lcom/google/firebase/iid/au;
 
-    iget-object v1, p0, Lcom/google/firebase/iid/v;->atB:Landroid/content/Context;
+    iget-object v1, p0, Lcom/google/firebase/iid/v;->atK:Landroid/content/Context;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/iid/au;->r(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/aw;
 
@@ -427,13 +427,13 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ab()Lcom/google/firebase/iid/FirebaseInstanceId;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ae()Lcom/google/firebase/iid/FirebaseInstanceId;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->tx()V
+    invoke-virtual {v0}, Lcom/google/firebase/iid/FirebaseInstanceId;->tA()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->atK:Landroid/content/Context;
 
     invoke-static {v0, p1}, Lcom/google/firebase/iid/au;->q(Landroid/content/Context;Ljava/lang/String;)Lcom/google/firebase/iid/aw;
 
@@ -474,13 +474,13 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ: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/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v1, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     invoke-interface {v1}, Landroid/content/SharedPreferences;->getAll()Ljava/util/Map;
 
@@ -547,7 +547,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     invoke-static {p1, p2, p3}, Lcom/google/firebase/iid/v;->g(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -577,7 +577,7 @@
     throw p1
 .end method
 
-.method public final declared-synchronized pD()V
+.method public final declared-synchronized pG()V
     .locals 6
 
     monitor-enter p0
@@ -587,7 +587,7 @@
 
     invoke-interface {v0}, Ljava/util/Map;->clear()V
 
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->atK:Landroid/content/Context;
 
     invoke-static {v0}, Lcom/google/firebase/iid/au;->aB(Landroid/content/Context;)Ljava/io/File;
 
@@ -626,7 +626,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
 
@@ -658,13 +658,13 @@
     goto :goto_1
 .end method
 
-.method public final declared-synchronized pL()Ljava/lang/String;
+.method public final declared-synchronized pO()Ljava/lang/String;
     .locals 3
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRH:Landroid/content/SharedPreferences;
+    iget-object v0, p0, Lcom/google/firebase/iid/v;->aRQ:Landroid/content/SharedPreferences;
 
     const-string v1, "topic_operation_queue"
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/x.smali b/com.discord/smali_classes2/com/google/firebase/iid/x.smali
index cda0597731..c372e06bea 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/x.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/x.smali
@@ -7,13 +7,13 @@
 
 
 # instance fields
-.field private final aLB:Landroid/os/PowerManager$WakeLock;
+.field private final aLK:Landroid/os/PowerManager$WakeLock;
 
-.field private final aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+.field private final aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-.field private final aRL:Lcom/google/firebase/iid/z;
+.field private final aRU:Lcom/google/firebase/iid/z;
 
-.field private final anp:J
+.field private final any:J
 
 
 # direct methods
@@ -22,13 +22,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iput-object p1, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iput-object p2, p0, Lcom/google/firebase/iid/x;->aRL:Lcom/google/firebase/iid/z;
+    iput-object p2, p0, Lcom/google/firebase/iid/x;->aRU:Lcom/google/firebase/iid/z;
 
-    iput-wide p3, p0, Lcom/google/firebase/iid/x;->anp:J
+    iput-wide p3, p0, Lcom/google/firebase/iid/x;->any:J
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object p1
 
@@ -48,9 +48,9 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iput-object p1, p0, Lcom/google/firebase/iid/x;->aLK:Landroid/os/PowerManager$WakeLock;
 
-    iget-object p1, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object p1, p0, Lcom/google/firebase/iid/x;->aLK:Landroid/os/PowerManager$WakeLock;
 
     const/4 p2, 0x0
 
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method private final nL()Z
+.method private final nO()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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v1, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/u;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v2, v1}, Lcom/google/firebase/iid/FirebaseInstanceId;->a(Lcom/google/firebase/iid/u;)Z
 
@@ -91,9 +91,9 @@
     const/4 v2, 0x0
 
     :try_start_0
-    iget-object v4, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v4, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v5, v4, Lcom/google/firebase/iid/FirebaseInstanceId;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object v5, v4, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp:Lcom/google/firebase/FirebaseApp;
 
     invoke-static {v5}, Lcom/google/firebase/iid/j;->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/u;->atJ:Ljava/lang/String;
+    iget-object v1, v1, Lcom/google/firebase/iid/u;->atS: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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v6, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v6, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object v6, v6, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp: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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v5, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v5, v5, Lcom/google/firebase/iid/FirebaseInstanceId;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object v5, v5, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp: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/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v4
 
@@ -357,12 +357,12 @@
 
 
 # virtual methods
-.method final Ah()Landroid/content/Context;
+.method final Ak()Landroid/content/Context;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRg:Lcom/google/firebase/FirebaseApp;
+    iget-object v0, v0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRp: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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v2
 
@@ -390,7 +390,7 @@
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/firebase/iid/x;->aLK: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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT: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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-object v2, v2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRh:Lcom/google/firebase/iid/j;
+    iget-object v2, v2, Lcom/google/firebase/iid/FirebaseInstanceId;->aRq:Lcom/google/firebase/iid/j;
 
-    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pG()I
+    invoke-virtual {v2}, Lcom/google/firebase/iid/j;->pJ()I
 
     move-result v2
 
@@ -424,18 +424,18 @@
     :goto_0
     if-nez v2, :cond_3
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT: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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v1
 
@@ -445,7 +445,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLK: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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v2
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v4
 
-    iget-object v5, v2, Lcom/google/firebase/iid/s;->aIJ:Ljava/lang/Boolean;
+    iget-object v5, v2, Lcom/google/firebase/iid/s;->aIS:Ljava/lang/Boolean;
 
     if-nez v5, :cond_5
 
@@ -484,10 +484,10 @@
 
     move-result-object v3
 
-    iput-object v3, v2, Lcom/google/firebase/iid/s;->aIJ:Ljava/lang/Boolean;
+    iput-object v3, v2, Lcom/google/firebase/iid/s;->aIS:Ljava/lang/Boolean;
 
     :cond_5
-    iget-object v3, v2, Lcom/google/firebase/iid/s;->aBZ:Ljava/lang/Boolean;
+    iget-object v3, v2, Lcom/google/firebase/iid/s;->aCi: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/s;->aIJ:Ljava/lang/Boolean;
+    iget-object v2, v2, Lcom/google/firebase/iid/s;->aIS:Ljava/lang/Boolean;
 
     invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -526,7 +526,7 @@
 
     invoke-direct {v2, p0}, Lcom/google/firebase/iid/w;-><init>(Lcom/google/firebase/iid/x;)V
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qd()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()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/w;->aRJ:Lcom/google/firebase/iid/x;
+    iget-object v4, v2, Lcom/google/firebase/iid/w;->aRS:Lcom/google/firebase/iid/x;
 
-    invoke-virtual {v4}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {v4}, Lcom/google/firebase/iid/x;->Ak()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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v1
 
@@ -568,7 +568,7 @@
 
     if-eqz v0, :cond_8
 
-    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLK: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/x;->nL()Z
+    invoke-direct {p0}, Lcom/google/firebase/iid/x;->nO()Z
 
     move-result v2
 
     if-eqz v2, :cond_a
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRL:Lcom/google/firebase/iid/z;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRU:Lcom/google/firebase/iid/z;
 
-    iget-object v3, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v3, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
     invoke-virtual {v2, v3}, Lcom/google/firebase/iid/z;->c(Lcom/google/firebase/iid/FirebaseInstanceId;)Z
 
@@ -593,16 +593,16 @@
 
     if-eqz v2, :cond_a
 
-    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT: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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v2, p0, Lcom/google/firebase/iid/x;->aRT:Lcom/google/firebase/iid/FirebaseInstanceId;
 
-    iget-wide v3, p0, Lcom/google/firebase/iid/x;->anp:J
+    iget-wide v3, p0, Lcom/google/firebase/iid/x;->any:J
 
     invoke-virtual {v2, v3, v4}, Lcom/google/firebase/iid/FirebaseInstanceId;->T(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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v1
 
@@ -624,7 +624,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLK: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/x;->aRK:Lcom/google/firebase/iid/FirebaseInstanceId;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aRT: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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v1
 
@@ -693,7 +693,7 @@
 
     if-eqz v0, :cond_b
 
-    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v0, p0, Lcom/google/firebase/iid/x;->aLK: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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object v1
 
-    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v2
 
@@ -715,7 +715,7 @@
 
     if-eqz v1, :cond_c
 
-    iget-object v1, p0, Lcom/google/firebase/iid/x;->aLB:Landroid/os/PowerManager$WakeLock;
+    iget-object v1, p0, Lcom/google/firebase/iid/x;->aLK: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/x;->Ah()Landroid/content/Context;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/x;->Ak()Landroid/content/Context;
 
     move-result-object v0
 
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 dd47a21a68..d5ca9860c7 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/y.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/y.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static aRM:Lcom/google/android/gms/stats/a;
+.field private static aRV:Lcom/google/android/gms/stats/a;
 
-.field private static final anp:J
+.field private static final any:J
 
-.field private static final atE:Ljava/lang/Object;
+.field private static final atN:Ljava/lang/Object;
 
 
 # direct methods
@@ -23,13 +23,13 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lcom/google/firebase/iid/y;->anp:J
+    sput-wide v0, Lcom/google/firebase/iid/y;->any:J
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/iid/y;->atE:Ljava/lang/Object;
+    sput-object v0, Lcom/google/firebase/iid/y;->atN:Ljava/lang/Object;
 
     return-void
 .end method
@@ -47,12 +47,12 @@
 .method public static b(Landroid/content/Intent;)V
     .locals 3
 
-    sget-object v0, Lcom/google/firebase/iid/y;->atE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/iid/y;->atN:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/y;->aRM:Lcom/google/android/gms/stats/a;
+    sget-object v1, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
 
     if-eqz v1, :cond_0
 
@@ -68,7 +68,7 @@
 
     invoke-static {p0, v2}, Lcom/google/firebase/iid/y;->a(Landroid/content/Intent;Z)V
 
-    sget-object p0, Lcom/google/firebase/iid/y;->aRM:Lcom/google/android/gms/stats/a;
+    sget-object p0, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
 
     invoke-virtual {p0}, Lcom/google/android/gms/stats/a;->release()V
 
@@ -90,12 +90,12 @@
 .method public static f(Landroid/content/Context;Landroid/content/Intent;)Landroid/content/ComponentName;
     .locals 4
 
-    sget-object v0, Lcom/google/firebase/iid/y;->atE:Ljava/lang/Object;
+    sget-object v0, Lcom/google/firebase/iid/y;->atN:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lcom/google/firebase/iid/y;->aRM:Lcom/google/android/gms/stats/a;
+    sget-object v1, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
 
     const/4 v2, 0x1
 
@@ -107,7 +107,7 @@
 
     invoke-direct {v1, p0, v3}, Lcom/google/android/gms/stats/a;-><init>(Landroid/content/Context;Ljava/lang/String;)V
 
-    sput-object v1, Lcom/google/firebase/iid/y;->aRM:Lcom/google/android/gms/stats/a;
+    sput-object v1, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
 
     invoke-virtual {v1, v2}, Lcom/google/android/gms/stats/a;->Q(Z)V
 
@@ -137,9 +137,9 @@
     :cond_1
     if-nez v1, :cond_2
 
-    sget-object p1, Lcom/google/firebase/iid/y;->aRM:Lcom/google/android/gms/stats/a;
+    sget-object p1, Lcom/google/firebase/iid/y;->aRV:Lcom/google/android/gms/stats/a;
 
-    sget-wide v1, Lcom/google/firebase/iid/y;->anp:J
+    sget-wide v1, Lcom/google/firebase/iid/y;->any:J
 
     invoke-virtual {p1, v1, v2}, Lcom/google/android/gms/stats/a;->ak(J)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 79769fccfc..53ad05f26b 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/z.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/z.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aBG:Ljava/util/Map;
+.field private final aBP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private final aRN:Lcom/google/firebase/iid/v;
+.field private final aRW:Lcom/google/firebase/iid/v;
 
 .field private zza:I
 
@@ -35,9 +35,9 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/z;->aBG:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/firebase/iid/z;->aBP:Ljava/util/Map;
 
-    iput-object p1, p0, Lcom/google/firebase/iid/z;->aRN:Lcom/google/firebase/iid/v;
+    iput-object p1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     :cond_3
     :try_start_1
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/u;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
 
     move-result-object v4
 
@@ -141,13 +141,13 @@
 
     if-nez v7, :cond_6
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qW()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qZ()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRi:Lcom/google/firebase/iid/ap;
+    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRr:Lcom/google/firebase/iid/ap;
 
-    iget-object v4, v4, Lcom/google/firebase/iid/u;->atJ:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/firebase/iid/u;->atS:Ljava/lang/String;
 
     new-instance v8, Landroid/os/Bundle;
 
@@ -219,7 +219,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;->qd()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()Z
 
     move-result p0
 
@@ -239,7 +239,7 @@
     throw p0
 
     :cond_7
-    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Ac()Lcom/google/firebase/iid/u;
+    invoke-virtual {p0}, Lcom/google/firebase/iid/FirebaseInstanceId;->Af()Lcom/google/firebase/iid/u;
 
     move-result-object v4
 
@@ -249,13 +249,13 @@
 
     if-nez v7, :cond_a
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qW()Ljava/lang/String;
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qZ()Ljava/lang/String;
 
     move-result-object v5
 
-    iget-object v4, v4, Lcom/google/firebase/iid/u;->atJ:Ljava/lang/String;
+    iget-object v4, v4, Lcom/google/firebase/iid/u;->atS:Ljava/lang/String;
 
-    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRi:Lcom/google/firebase/iid/ap;
+    iget-object v7, p0, Lcom/google/firebase/iid/FirebaseInstanceId;->aRr:Lcom/google/firebase/iid/ap;
 
     new-instance v8, Landroid/os/Bundle;
 
@@ -321,7 +321,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;->qd()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()Z
 
     move-result p0
 
@@ -436,16 +436,16 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRN:Lcom/google/firebase/iid/v;
+    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
 
     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/z;->aRN:Lcom/google/firebase/iid/v;
+    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pO()Ljava/lang/String;
 
     move-result-object v1
 
@@ -513,7 +513,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRN:Lcom/google/firebase/iid/v;
+    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
 
     invoke-virtual {v1, p1}, Lcom/google/firebase/iid/v;->aL(Ljava/lang/String;)V
 
@@ -560,17 +560,17 @@
     throw p1
 .end method
 
-.method private final rA()Ljava/lang/String;
+.method private final rD()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRN:Lcom/google/firebase/iid/v;
+    iget-object v0, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRN:Lcom/google/firebase/iid/v;
+    iget-object v1, p0, Lcom/google/firebase/iid/z;->aRW:Lcom/google/firebase/iid/v;
 
-    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pL()Ljava/lang/String;
+    invoke-virtual {v1}, Lcom/google/firebase/iid/v;->pO()Ljava/lang/String;
 
     move-result-object v1
 
@@ -639,7 +639,7 @@
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rA()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rD()Ljava/lang/String;
 
     move-result-object v0
 
@@ -647,7 +647,7 @@
 
     if-nez v0, :cond_2
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qd()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()Z
 
     move-result p1
 
@@ -683,7 +683,7 @@
     monitor-enter p0
 
     :try_start_1
-    iget-object v2, p0, Lcom/google/firebase/iid/z;->aBG:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/firebase/iid/z;->aBP:Ljava/util/Map;
 
     iget v3, p0, Lcom/google/firebase/iid/z;->zza:I
 
@@ -744,13 +744,13 @@
     goto :goto_1
 .end method
 
-.method final declared-synchronized pE()Z
+.method final declared-synchronized pH()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rA()Ljava/lang/String;
+    invoke-direct {p0}, Lcom/google/firebase/iid/z;->rD()Ljava/lang/String;
 
     move-result-object v0
     :try_end_0
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/zzf$a.smali b/com.discord/smali_classes2/com/google/firebase/iid/zzf$a.smali
index e17d57310b..bcc8f107ee 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/zzf$a.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/zzf$a.smali
@@ -51,7 +51,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qd()Z
+    invoke-static {}, Lcom/google/firebase/iid/FirebaseInstanceId;->qg()Z
 
     move-result p1
 
diff --git a/com.discord/smali_classes2/com/google/firebase/iid/zzf.smali b/com.discord/smali_classes2/com/google/firebase/iid/zzf.smali
index 177a6bfa2d..a694fc491f 100644
--- a/com.discord/smali_classes2/com/google/firebase/iid/zzf.smali
+++ b/com.discord/smali_classes2/com/google/firebase/iid/zzf.smali
@@ -27,9 +27,9 @@
 
 
 # instance fields
-.field private aRX:Lcom/google/firebase/iid/as;
+.field private aRC:Landroid/os/Messenger;
 
-.field private aRt:Landroid/os/Messenger;
+.field private aSg:Lcom/google/firebase/iid/as;
 
 
 # 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/zzf;->aRt:Landroid/os/Messenger;
+    iput-object v0, p0, Lcom/google/firebase/iid/zzf;->aRC:Landroid/os/Messenger;
 
     return-void
 
@@ -69,15 +69,15 @@
 
     invoke-direct {v0, p1}, Lcom/google/firebase/iid/av;-><init>(Landroid/os/IBinder;)V
 
-    iput-object v0, p0, Lcom/google/firebase/iid/zzf;->aRX:Lcom/google/firebase/iid/as;
+    iput-object v0, p0, Lcom/google/firebase/iid/zzf;->aSg:Lcom/google/firebase/iid/as;
 
     return-void
 .end method
 
-.method private final Aj()Landroid/os/IBinder;
+.method private final Am()Landroid/os/IBinder;
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRt:Landroid/os/Messenger;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRC: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/zzf;->aRX:Lcom/google/firebase/iid/as;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aSg:Lcom/google/firebase/iid/as;
 
     invoke-interface {v0}, Lcom/google/firebase/iid/as;->asBinder()Landroid/os/IBinder;
 
@@ -107,7 +107,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRt:Landroid/os/Messenger;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRC:Landroid/os/Messenger;
 
     if-eqz v0, :cond_0
 
@@ -116,7 +116,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aRX:Lcom/google/firebase/iid/as;
+    iget-object v0, p0, Lcom/google/firebase/iid/zzf;->aSg:Lcom/google/firebase/iid/as;
 
     invoke-interface {v0, p1}, Lcom/google/firebase/iid/as;->a(Landroid/os/Message;)V
 
@@ -142,13 +142,13 @@
 
     :cond_0
     :try_start_0
-    invoke-direct {p0}, Lcom/google/firebase/iid/zzf;->Aj()Landroid/os/IBinder;
+    invoke-direct {p0}, Lcom/google/firebase/iid/zzf;->Am()Landroid/os/IBinder;
 
     move-result-object v1
 
     check-cast p1, Lcom/google/firebase/iid/zzf;
 
-    invoke-direct {p1}, Lcom/google/firebase/iid/zzf;->Aj()Landroid/os/IBinder;
+    invoke-direct {p1}, Lcom/google/firebase/iid/zzf;->Am()Landroid/os/IBinder;
 
     move-result-object p1
 
@@ -167,7 +167,7 @@
 .method public hashCode()I
     .locals 1
 
-    invoke-direct {p0}, Lcom/google/firebase/iid/zzf;->Aj()Landroid/os/IBinder;
+    invoke-direct {p0}, Lcom/google/firebase/iid/zzf;->Am()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/zzf;->aRt:Landroid/os/Messenger;
+    iget-object p2, p0, Lcom/google/firebase/iid/zzf;->aRC:Landroid/os/Messenger;
 
     if-eqz p2, :cond_0
 
@@ -194,7 +194,7 @@
     return-void
 
     :cond_0
-    iget-object p2, p0, Lcom/google/firebase/iid/zzf;->aRX:Lcom/google/firebase/iid/as;
+    iget-object p2, p0, Lcom/google/firebase/iid/zzf;->aSg:Lcom/google/firebase/iid/as;
 
     invoke-interface {p2}, Lcom/google/firebase/iid/as;->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 e86df8135a..b3c5dd0e82 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/s;->Ag()Lcom/google/firebase/iid/s;
+    invoke-static {}, Lcom/google/firebase/iid/s;->Aj()Lcom/google/firebase/iid/s;
 
     move-result-object p1
 
-    iget-object p1, p1, Lcom/google/firebase/iid/s;->aRF:Ljava/util/Queue;
+    iget-object p1, p1, Lcom/google/firebase/iid/s;->aRO:Ljava/util/Queue;
 
     invoke-interface {p1}, Ljava/util/Queue;->poll()Ljava/lang/Object;
 
@@ -387,7 +387,7 @@
 
     new-instance v5, Lcom/google/firebase/iid/f;
 
-    invoke-virtual {v4}, Lcom/google/firebase/iid/az;->pG()I
+    invoke-virtual {v4}, Lcom/google/firebase/iid/az;->pJ()I
 
     move-result v6
 
@@ -690,7 +690,7 @@
     invoke-direct {v5, p0, v1, v4}, Lcom/google/firebase/messaging/g;-><init>(Landroid/content/Context;Lcom/google/firebase/messaging/n;Ljava/util/concurrent/Executor;)V
 
     :try_start_0
-    invoke-virtual {v5}, Lcom/google/firebase/messaging/g;->pE()Z
+    invoke-virtual {v5}, Lcom/google/firebase/messaging/g;->pH()Z
 
     move-result v1
     :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 b8c68442a0..5e6bddc214 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 public aBG:Ljava/util/Map;
+.field public aBP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field public aCi:Landroid/os/Bundle;
+.field public aCr:Landroid/os/Bundle;
 
 
 # direct methods
@@ -48,7 +48,7 @@
 
     invoke-direct {p0}, Lcom/google/android/gms/common/internal/safeparcel/AbstractSafeParcelable;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCi:Landroid/os/Bundle;
+    iput-object p1, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCr:Landroid/os/Bundle;
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     move-result p2
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/RemoteMessage;->aCr: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 a1df30f156..ba84d63873 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 aSo:Ljava/util/regex/Pattern;
+.field private static final aSx:Ljava/util/regex/Pattern;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/firebase/messaging/a;->aSo:Ljava/util/regex/Pattern;
+    sput-object v0, Lcom/google/firebase/messaging/a;->aSx: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 9ca9c8f900..027151db51 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/d.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field public final aSp:Landroidx/core/app/NotificationCompat$Builder;
+.field public final aSy:Landroidx/core/app/NotificationCompat$Builder;
 
-.field public final amV:Ljava/lang/String;
+.field public final ane:Ljava/lang/String;
 
 .field public final zzc:I
 
@@ -17,9 +17,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/d;->aSp:Landroidx/core/app/NotificationCompat$Builder;
+    iput-object p1, p0, Lcom/google/firebase/messaging/d;->aSy:Landroidx/core/app/NotificationCompat$Builder;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/d;->amV:Ljava/lang/String;
+    iput-object p2, p0, Lcom/google/firebase/messaging/d;->ane:Ljava/lang/String;
 
     const/4 p1, 0x0
 
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 4344566fbf..6b3de27d10 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/e.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/e.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final aSq:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private static final aSz:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {v0, v2}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
 
-    sput-object v0, Lcom/google/firebase/messaging/e;->aSq:Ljava/util/concurrent/atomic/AtomicInteger;
+    sput-object v0, Lcom/google/firebase/messaging/e;->aSz:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-void
 .end method
@@ -538,13 +538,13 @@
 
     invoke-virtual {v3, v2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent;
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ao()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ar()Landroid/os/Bundle;
 
     move-result-object v2
 
     invoke-virtual {v3, v2}, Landroid/content/Intent;->putExtras(Landroid/os/Bundle;)Landroid/content/Intent;
 
-    sget-object v2, Lcom/google/firebase/messaging/e;->aSq:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v2, Lcom/google/firebase/messaging/e;->aSz:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
@@ -568,7 +568,7 @@
 
     invoke-direct {v3, v4}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->zZ()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ac()Landroid/os/Bundle;
 
     move-result-object v4
 
@@ -607,7 +607,7 @@
 
     invoke-direct {v1, v2}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->zZ()Landroid/os/Bundle;
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ac()Landroid/os/Bundle;
 
     move-result-object v2
 
@@ -910,7 +910,7 @@
     invoke-virtual {v5, v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setWhen(J)Landroidx/core/app/NotificationCompat$Builder;
 
     :cond_1b
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Am()[J
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Ap()[J
 
     move-result-object p0
 
@@ -919,7 +919,7 @@
     invoke-virtual {v5, p0}, Landroidx/core/app/NotificationCompat$Builder;->setVibrate([J)Landroidx/core/app/NotificationCompat$Builder;
 
     :cond_1c
-    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->An()[I
+    invoke-virtual {p1}, Lcom/google/firebase/messaging/n;->Aq()[I
 
     move-result-object p0
 
@@ -1434,7 +1434,7 @@
 .method private static g(Landroid/content/Context;Landroid/content/Intent;)Landroid/app/PendingIntent;
     .locals 4
 
-    sget-object v0, Lcom/google/firebase/messaging/e;->aSq:Ljava/util/concurrent/atomic/AtomicInteger;
+    sget-object v0, Lcom/google/firebase/messaging/e;->aSz:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
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 6e0393d317..2623f0a08b 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/f.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/f.smali
@@ -21,7 +21,7 @@
 
     invoke-direct {p0}, Landroid/app/Service;-><init>()V
 
-    invoke-static {}, Lcom/google/android/gms/internal/e/a;->nO()Lcom/google/android/gms/internal/e/b;
+    invoke-static {}, Lcom/google/android/gms/internal/e/a;->nR()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;->aLL:Lcom/google/android/gms/tasks/ac;
+    iget-object p1, v0, Lcom/google/android/gms/tasks/h;->aLU: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/k;->aQh:Ljava/util/concurrent/Executor;
+    sget-object p3, Lcom/google/firebase/messaging/k;->aQq:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lcom/google/firebase/messaging/j;
 
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 e95de637e3..f9de9536d0 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/g.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/g.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private final aQh:Ljava/util/concurrent/Executor;
+.field private final aQq:Ljava/util/concurrent/Executor;
 
-.field private final aSr:Lcom/google/firebase/messaging/n;
+.field private final aSA:Lcom/google/firebase/messaging/n;
 
-.field private final atB:Landroid/content/Context;
+.field private final atK:Landroid/content/Context;
 
 
 # direct methods
@@ -17,21 +17,21 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p3, p0, Lcom/google/firebase/messaging/g;->aQh:Ljava/util/concurrent/Executor;
+    iput-object p3, p0, Lcom/google/firebase/messaging/g;->aQq:Ljava/util/concurrent/Executor;
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/g;->atB:Landroid/content/Context;
+    iput-object p1, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/g;->aSr:Lcom/google/firebase/messaging/n;
+    iput-object p2, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final pE()Z
+.method final pH()Z
     .locals 10
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSr:Lcom/google/firebase/messaging/n;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
 
     const-string v1, "gcm.n.noui"
 
@@ -46,7 +46,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
 
     const-string v2, "keyguard"
 
@@ -64,7 +64,7 @@
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lcom/google/android/gms/common/util/l;->nt()Z
+    invoke-static {}, Lcom/google/android/gms/common/util/l;->nw()Z
 
     move-result v0
 
@@ -79,7 +79,7 @@
 
     move-result v0
 
-    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atB:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
 
     const-string v4, "activity"
 
@@ -135,7 +135,7 @@
     return v2
 
     :cond_4
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSr:Lcom/google/firebase/messaging/n;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
 
     const-string v3, "gcm.n.image"
 
@@ -149,7 +149,7 @@
 
     if-eqz v0, :cond_5
 
-    iget-object v3, p0, Lcom/google/firebase/messaging/g;->aQh:Ljava/util/concurrent/Executor;
+    iget-object v3, p0, Lcom/google/firebase/messaging/g;->aQq:Ljava/util/concurrent/Executor;
 
     new-instance v4, Lcom/google/firebase/messaging/l;
 
@@ -173,25 +173,25 @@
 
     invoke-interface {v3, v6}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
-    iput-object v5, v0, Lcom/google/firebase/messaging/m;->aSu:Lcom/google/android/gms/tasks/Task;
+    iput-object v5, v0, Lcom/google/firebase/messaging/m;->aSD:Lcom/google/android/gms/tasks/Task;
 
     :cond_5
-    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atB:Landroid/content/Context;
+    iget-object v3, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
 
-    iget-object v4, p0, Lcom/google/firebase/messaging/g;->aSr:Lcom/google/firebase/messaging/n;
+    iget-object v4, p0, Lcom/google/firebase/messaging/g;->aSA:Lcom/google/firebase/messaging/n;
 
     invoke-static {v3, v4}, Lcom/google/firebase/messaging/e;->a(Landroid/content/Context;Lcom/google/firebase/messaging/n;)Lcom/google/firebase/messaging/d;
 
     move-result-object v3
 
-    iget-object v4, v3, Lcom/google/firebase/messaging/d;->aSp:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v4, v3, Lcom/google/firebase/messaging/d;->aSy:Landroidx/core/app/NotificationCompat$Builder;
 
     const-string v5, "FirebaseMessaging"
 
     if-eqz v0, :cond_6
 
     :try_start_0
-    iget-object v6, v0, Lcom/google/firebase/messaging/m;->aSu:Lcom/google/android/gms/tasks/Task;
+    iget-object v6, v0, Lcom/google/firebase/messaging/m;->aSD:Lcom/google/android/gms/tasks/Task;
 
     invoke-static {v6}, Lcom/google/android/gms/common/internal/r;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -309,7 +309,7 @@
     invoke-static {v5, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
     :cond_7
-    iget-object v0, p0, Lcom/google/firebase/messaging/g;->atB:Landroid/content/Context;
+    iget-object v0, p0, Lcom/google/firebase/messaging/g;->atK:Landroid/content/Context;
 
     const-string v4, "notification"
 
@@ -319,9 +319,9 @@
 
     check-cast v0, Landroid/app/NotificationManager;
 
-    iget-object v4, v3, Lcom/google/firebase/messaging/d;->amV:Ljava/lang/String;
+    iget-object v4, v3, Lcom/google/firebase/messaging/d;->ane:Ljava/lang/String;
 
-    iget-object v3, v3, Lcom/google/firebase/messaging/d;->aSp:Landroidx/core/app/NotificationCompat$Builder;
+    iget-object v3, v3, Lcom/google/firebase/messaging/d;->aSy: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/h.smali b/com.discord/smali_classes2/com/google/firebase/messaging/h.smali
index adb755b996..475140a9ce 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/h.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/h.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private final aRQ:Landroid/content/Intent;
+.field private final aRZ:Landroid/content/Intent;
 
-.field private final aSf:Lcom/google/android/gms/tasks/h;
+.field private final aSB:Lcom/google/firebase/messaging/f;
 
-.field private final aSs:Lcom/google/firebase/messaging/f;
+.field private final aSo: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/messaging/h;->aSs:Lcom/google/firebase/messaging/f;
+    iput-object p1, p0, Lcom/google/firebase/messaging/h;->aSB:Lcom/google/firebase/messaging/f;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/h;->aRQ:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/messaging/h;->aRZ:Landroid/content/Intent;
 
-    iput-object p3, p0, Lcom/google/firebase/messaging/h;->aSf:Lcom/google/android/gms/tasks/h;
+    iput-object p3, p0, Lcom/google/firebase/messaging/h;->aSo: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/h;->aSs:Lcom/google/firebase/messaging/f;
+    iget-object v0, p0, Lcom/google/firebase/messaging/h;->aSB:Lcom/google/firebase/messaging/f;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/h;->aRQ:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/messaging/h;->aRZ:Landroid/content/Intent;
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/h;->aSf:Lcom/google/android/gms/tasks/h;
+    iget-object v2, p0, Lcom/google/firebase/messaging/h;->aSo:Lcom/google/android/gms/tasks/h;
 
     const/4 v3, 0x0
 
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 4e54807985..f52ec72f17 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 @@
 
 
 # instance fields
-.field private final aSs:Lcom/google/firebase/messaging/f;
+.field private final aSB:Lcom/google/firebase/messaging/f;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/i;->aSs:Lcom/google/firebase/messaging/f;
+    iput-object p1, p0, Lcom/google/firebase/messaging/i;->aSB:Lcom/google/firebase/messaging/f;
 
     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/i;->aSs:Lcom/google/firebase/messaging/f;
+    iget-object v0, p0, Lcom/google/firebase/messaging/i;->aSB:Lcom/google/firebase/messaging/f;
 
     invoke-virtual {v0, p1}, Lcom/google/firebase/messaging/f;->zzd(Landroid/content/Intent;)Lcom/google/android/gms/tasks/Task;
 
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 66c1f00fe3..9dfaacefac 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/j.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/j.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final aRQ:Landroid/content/Intent;
+.field private final aRZ:Landroid/content/Intent;
 
-.field private final aSs:Lcom/google/firebase/messaging/f;
+.field private final aSB:Lcom/google/firebase/messaging/f;
 
 
 # direct methods
@@ -18,9 +18,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/j;->aSs:Lcom/google/firebase/messaging/f;
+    iput-object p1, p0, Lcom/google/firebase/messaging/j;->aSB:Lcom/google/firebase/messaging/f;
 
-    iput-object p2, p0, Lcom/google/firebase/messaging/j;->aRQ:Landroid/content/Intent;
+    iput-object p2, p0, Lcom/google/firebase/messaging/j;->aRZ: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/j;->aSs:Lcom/google/firebase/messaging/f;
+    iget-object v0, p0, Lcom/google/firebase/messaging/j;->aSB:Lcom/google/firebase/messaging/f;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/j;->aRQ:Landroid/content/Intent;
+    iget-object v1, p0, Lcom/google/firebase/messaging/j;->aRZ:Landroid/content/Intent;
 
     invoke-virtual {v0, v1, p1}, Lcom/google/firebase/messaging/f;->zza(Landroid/content/Intent;Lcom/google/android/gms/tasks/Task;)V
 
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 b1c49cdfe7..999f388f35 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/k.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/k.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field static final aQh:Ljava/util/concurrent/Executor;
+.field static final aQq:Ljava/util/concurrent/Executor;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lcom/google/firebase/messaging/k;-><init>()V
 
-    sput-object v0, Lcom/google/firebase/messaging/k;->aQh:Ljava/util/concurrent/Executor;
+    sput-object v0, Lcom/google/firebase/messaging/k;->aQq:Ljava/util/concurrent/Executor;
 
     return-void
 .end method
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 71bcedfe53..90ac542fa1 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/l.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/l.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final aSt:Lcom/google/firebase/messaging/m;
+.field private final aSC:Lcom/google/firebase/messaging/m;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/google/firebase/messaging/l;->aSt:Lcom/google/firebase/messaging/m;
+    iput-object p1, p0, Lcom/google/firebase/messaging/l;->aSC:Lcom/google/firebase/messaging/m;
 
     return-void
 .end method
@@ -26,9 +26,9 @@
 .method public final call()Ljava/lang/Object;
     .locals 5
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aSt:Lcom/google/firebase/messaging/m;
+    iget-object v0, p0, Lcom/google/firebase/messaging/l;->aSC:Lcom/google/firebase/messaging/m;
 
-    iget-object v1, v0, Lcom/google/firebase/messaging/m;->aED:Ljava/net/URL;
+    iget-object v1, v0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
 
     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -62,7 +62,7 @@
 
     invoke-static {v2, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    invoke-virtual {v0}, Lcom/google/firebase/messaging/m;->Al()[B
+    invoke-virtual {v0}, Lcom/google/firebase/messaging/m;->Ao()[B
 
     move-result-object v1
 
@@ -84,7 +84,7 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aED:Ljava/net/URL;
+    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -122,7 +122,7 @@
     :cond_1
     new-instance v1, Ljava/io/IOException;
 
-    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aED:Ljava/net/URL;
+    iget-object v0, v0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
 
     invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
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 5c0a1a23f7..3498366ee6 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/m.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/m.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field final aED:Ljava/net/URL;
+.field final aEM:Ljava/net/URL;
 
-.field aSu:Lcom/google/android/gms/tasks/Task;
+.field aSD: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 aSv:Ljava/io/InputStream;
+.field private volatile aSE: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/m;->aED:Ljava/net/URL;
+    iput-object p1, p0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
 
 # virtual methods
-.method final Al()[B
+.method final Ao()[B
     .locals 7
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aED:Ljava/net/URL;
+    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
 
     invoke-virtual {v0}, Ljava/net/URL;->openConnection()Ljava/net/URLConnection;
 
@@ -123,7 +123,7 @@
     move-result-object v0
 
     :try_start_0
-    iput-object v0, p0, Lcom/google/firebase/messaging/m;->aSv:Ljava/io/InputStream;
+    iput-object v0, p0, Lcom/google/firebase/messaging/m;->aSE:Ljava/io/InputStream;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/e/i;->s(Ljava/io/InputStream;)Ljava/io/InputStream;
 
@@ -152,7 +152,7 @@
 
     array-length v0, v1
 
-    iget-object v4, p0, Lcom/google/firebase/messaging/m;->aED:Ljava/net/URL;
+    iget-object v4, p0, Lcom/google/firebase/messaging/m;->aEM:Ljava/net/URL;
 
     invoke-static {v4}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
 
@@ -248,7 +248,7 @@
 .method public final close()V
     .locals 1
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aSv:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/google/firebase/messaging/m;->aSE:Ljava/io/InputStream;
 
     invoke-static {v0}, Lcom/google/android/gms/internal/e/j;->t(Ljava/io/InputStream;)V
 
diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/n.smali b/com.discord/smali_classes2/com/google/firebase/messaging/n.smali
index a9862a163b..a5fb6e8a27 100644
--- a/com.discord/smali_classes2/com/google/firebase/messaging/n.smali
+++ b/com.discord/smali_classes2/com/google/firebase/messaging/n.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final aCi:Landroid/os/Bundle;
+.field private final aCr:Landroid/os/Bundle;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0, p1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    iput-object v0, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
 
     return-void
 
@@ -497,7 +497,78 @@
 
 
 # virtual methods
-.method public final Am()[J
+.method public final Ac()Landroid/os/Bundle;
+    .locals 4
+
+    new-instance v0, Landroid/os/Bundle;
+
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
+
+    invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
+
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
+
+    invoke-virtual {v1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
+
+    move-result-object v1
+
+    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+    move-result-object v1
+
+    :cond_0
+    :goto_0
+    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+    move-result v2
+
+    if-eqz v2, :cond_3
+
+    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Ljava/lang/String;
+
+    const-string v3, "google.c.a."
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+    move-result v3
+
+    if-nez v3, :cond_2
+
+    const-string v3, "from"
+
+    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_1
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v3, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    :goto_1
+    const/4 v3, 0x1
+
+    :goto_2
+    if-nez v3, :cond_0
+
+    invoke-virtual {v0, v2}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
+
+    goto :goto_0
+
+    :cond_3
+    return-object v0
+.end method
+
+.method public final Ap()[J
     .locals 6
 
     const-string v0, "gcm.n.vibrate_timings"
@@ -600,7 +671,7 @@
     return-object v1
 .end method
 
-.method final An()[I
+.method final Aq()[I
     .locals 9
 
     const-string v0, ". Skipping setting LightSettings"
@@ -778,16 +849,16 @@
     return-object v4
 .end method
 
-.method public final Ao()Landroid/os/Bundle;
+.method public final Ar()Landroid/os/Bundle;
     .locals 4
 
     new-instance v0, Landroid/os/Bundle;
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
 
     invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
 
-    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
+    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
 
@@ -883,7 +954,7 @@
 .method public final bZ(Ljava/lang/String;)Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v0, p1}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
@@ -903,7 +974,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
+    iget-object v2, p0, Lcom/google/firebase/messaging/n;->aCr:Landroid/os/Bundle;
 
     invoke-virtual {v2, v1}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
@@ -1125,74 +1196,3 @@
 
     return-object p1
 .end method
-
-.method public final zZ()Landroid/os/Bundle;
-    .locals 4
-
-    new-instance v0, Landroid/os/Bundle;
-
-    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
-
-    invoke-direct {v0, v1}, Landroid/os/Bundle;-><init>(Landroid/os/Bundle;)V
-
-    iget-object v1, p0, Lcom/google/firebase/messaging/n;->aCi:Landroid/os/Bundle;
-
-    invoke-virtual {v1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
-
-    move-result-object v1
-
-    invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
-    move-result-object v1
-
-    :cond_0
-    :goto_0
-    invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
-    move-result v2
-
-    if-eqz v2, :cond_3
-
-    invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Ljava/lang/String;
-
-    const-string v3, "google.c.a."
-
-    invoke-virtual {v2, v3}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
-
-    move-result v3
-
-    if-nez v3, :cond_2
-
-    const-string v3, "from"
-
-    invoke-virtual {v2, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
-    move-result v3
-
-    if-eqz v3, :cond_1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v3, 0x0
-
-    goto :goto_2
-
-    :cond_2
-    :goto_1
-    const/4 v3, 0x1
-
-    :goto_2
-    if-nez v3, :cond_0
-
-    invoke-virtual {v0, v2}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
-
-    goto :goto_0
-
-    :cond_3
-    return-object v0
-.end method
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 9430803f87..d2aa2897ac 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 aSW:Lcom/google/gson/Gson;
+.field final synthetic aTf: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;->aSW:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/Gson$1;->aTf: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 d643f3b563..333c960d1f 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 aSW:Lcom/google/gson/Gson;
+.field final synthetic aTf: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;->aSW:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/Gson$2;->aTf: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 6b36c0292b..732084985a 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 aSX:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTg: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;->aSX:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/Gson$4;->aTg: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;->aSX:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$4;->aTg: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;->aSX:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$4;->aTg: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 577d2733b9..64964d2c0d 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 aSX:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTg: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;->aSX:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/Gson$5;->aTg: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;->aSX:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/Gson$5;->aTg: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;->aSX:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/Gson$5;->aTg: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 215a575388..f3377bc89b 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 aSY:Lcom/google/gson/TypeAdapter;
+.field aTh: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;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$a;->aTh:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
@@ -96,7 +96,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson$a;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/Gson$a;->aTh: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 a066453196..4aced40b3e 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 public static final aSM:Lcom/google/gson/reflect/TypeToken;
+.field public static final aSV:Lcom/google/gson/reflect/TypeToken;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/reflect/TypeToken<",
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field public final aSN:Ljava/lang/ThreadLocal;
+.field public final aSW:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field public final aSO:Ljava/util/Map;
+.field public final aSX:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -48,7 +48,7 @@
     .end annotation
 .end field
 
-.field public final aSP:Ljava/util/List;
+.field public final aSY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -58,17 +58,17 @@
     .end annotation
 .end field
 
-.field public final aSQ:Lcom/google/gson/internal/c;
+.field public final aSZ:Lcom/google/gson/internal/c;
 
-.field public final aSR:Lcom/google/gson/internal/d;
+.field public final aTa:Lcom/google/gson/internal/d;
 
-.field public final aSS:Lcom/google/gson/e;
+.field public final aTb:Lcom/google/gson/e;
 
-.field public final aST:Z
+.field public final aTc:Z
 
-.field public final aSU:Z
+.field public final aTd:Z
 
-.field public final aSV:Lcom/google/gson/internal/a/d;
+.field public final aTe:Lcom/google/gson/internal/a/d;
 
 .field public final htmlSafe:Z
 
@@ -87,7 +87,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/Gson;->aSM:Lcom/google/gson/reflect/TypeToken;
+    sput-object v0, Lcom/google/gson/Gson;->aSV: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;->aTy:Lcom/google/gson/internal/d;
+    sget-object v1, Lcom/google/gson/internal/d;->aTH:Lcom/google/gson/internal/d;
 
-    sget-object v2, Lcom/google/gson/d;->aSG:Lcom/google/gson/d;
+    sget-object v2, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
 
     move-result-object v3
 
-    sget-object v11, Lcom/google/gson/q;->aTn:Lcom/google/gson/q;
+    sget-object v11, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
@@ -164,31 +164,31 @@
 
     invoke-direct {p12}, Ljava/lang/ThreadLocal;-><init>()V
 
-    iput-object p12, p0, Lcom/google/gson/Gson;->aSN:Ljava/lang/ThreadLocal;
+    iput-object p12, p0, Lcom/google/gson/Gson;->aSW:Ljava/lang/ThreadLocal;
 
     new-instance p12, Ljava/util/concurrent/ConcurrentHashMap;
 
     invoke-direct {p12}, Ljava/util/concurrent/ConcurrentHashMap;-><init>()V
 
-    iput-object p12, p0, Lcom/google/gson/Gson;->aSO:Ljava/util/Map;
+    iput-object p12, p0, Lcom/google/gson/Gson;->aSX:Ljava/util/Map;
 
     new-instance p12, Lcom/google/gson/internal/c;
 
     invoke-direct {p12, p3}, Lcom/google/gson/internal/c;-><init>(Ljava/util/Map;)V
 
-    iput-object p12, p0, Lcom/google/gson/Gson;->aSQ:Lcom/google/gson/internal/c;
+    iput-object p12, p0, Lcom/google/gson/Gson;->aSZ:Lcom/google/gson/internal/c;
 
-    iput-object p1, p0, Lcom/google/gson/Gson;->aSR:Lcom/google/gson/internal/d;
+    iput-object p1, p0, Lcom/google/gson/Gson;->aTa:Lcom/google/gson/internal/d;
 
-    iput-object p2, p0, Lcom/google/gson/Gson;->aSS:Lcom/google/gson/e;
+    iput-object p2, p0, Lcom/google/gson/Gson;->aTb:Lcom/google/gson/e;
 
     iput-boolean p4, p0, Lcom/google/gson/Gson;->serializeNulls:Z
 
-    iput-boolean p6, p0, Lcom/google/gson/Gson;->aST:Z
+    iput-boolean p6, p0, Lcom/google/gson/Gson;->aTc:Z
 
     iput-boolean p7, p0, Lcom/google/gson/Gson;->htmlSafe:Z
 
-    iput-boolean p8, p0, Lcom/google/gson/Gson;->aSU:Z
+    iput-boolean p8, p0, Lcom/google/gson/Gson;->aTd:Z
 
     iput-boolean p9, p0, Lcom/google/gson/Gson;->lenient:Z
 
@@ -196,11 +196,11 @@
 
     invoke-direct {p3}, Ljava/util/ArrayList;-><init>()V
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVL:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVU: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;->aUc:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/h;->aUl:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -208,31 +208,31 @@
 
     invoke-interface {p3, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVq:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVz: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;->aUZ:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVi: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;->aUT:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVc: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;->aUV:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVe: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;->aUX:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVg:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/q;->aTn:Lcom/google/gson/q;
+    sget-object p4, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
 
     if-ne p11, p4, :cond_0
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVg:Lcom/google/gson/TypeAdapter;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVp:Lcom/google/gson/TypeAdapter;
 
     goto :goto_0
 
@@ -258,7 +258,7 @@
 
     if-eqz p10, :cond_1
 
-    sget-object p8, Lcom/google/gson/internal/a/n;->aVi:Lcom/google/gson/TypeAdapter;
+    sget-object p8, Lcom/google/gson/internal/a/n;->aVr:Lcom/google/gson/TypeAdapter;
 
     goto :goto_1
 
@@ -280,7 +280,7 @@
 
     if-eqz p10, :cond_2
 
-    sget-object p8, Lcom/google/gson/internal/a/n;->aVh:Lcom/google/gson/TypeAdapter;
+    sget-object p8, Lcom/google/gson/internal/a/n;->aVq:Lcom/google/gson/TypeAdapter;
 
     goto :goto_2
 
@@ -296,15 +296,15 @@
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVt: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;->aVk: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;->aVb: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;->aVd:Lcom/google/gson/r;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVm:Lcom/google/gson/r;
 
     invoke-interface {p3, p6}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -340,25 +340,25 @@
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVf:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVo: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;->aVm:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVv: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;->aVs:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVB: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;->aVu:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVD: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;->aVo:Lcom/google/gson/TypeAdapter;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVx: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;
 
@@ -368,7 +368,7 @@
 
     const-class p4, Ljava/math/BigInteger;
 
-    sget-object p6, Lcom/google/gson/internal/a/n;->aVp:Lcom/google/gson/TypeAdapter;
+    sget-object p6, Lcom/google/gson/internal/a/n;->aVy: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;
 
@@ -376,35 +376,7 @@
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/n;->aVw: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;->aVy: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;->aVC: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;->aVE: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;->aVJ: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;->aVA: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;->aUQ: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;->aUc:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVF:Lcom/google/gson/r;
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -412,29 +384,57 @@
 
     invoke-interface {p3, p4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    sget-object p4, Lcom/google/gson/internal/a/k;->aUc:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVL: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;->aUc:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVN: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;->aVF:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVS: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;->aUc:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVJ: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;->aUO:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aUZ: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;->aUl: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;->aVQ: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;->aUl: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;->aUl: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;->aVO: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;->aUl: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;->aUX: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aSZ:Lcom/google/gson/internal/c;
 
     invoke-direct {p4, p6}, Lcom/google/gson/internal/a/b;-><init>(Lcom/google/gson/internal/c;)V
 
@@ -442,7 +442,7 @@
 
     new-instance p4, Lcom/google/gson/internal/a/g;
 
-    iget-object p6, p0, Lcom/google/gson/Gson;->aSQ:Lcom/google/gson/internal/c;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aSZ:Lcom/google/gson/internal/c;
 
     invoke-direct {p4, p6, p5}, Lcom/google/gson/internal/a/g;-><init>(Lcom/google/gson/internal/c;Z)V
 
@@ -450,25 +450,25 @@
 
     new-instance p4, Lcom/google/gson/internal/a/d;
 
-    iget-object p5, p0, Lcom/google/gson/Gson;->aSQ:Lcom/google/gson/internal/c;
+    iget-object p5, p0, Lcom/google/gson/Gson;->aSZ: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;->aSV:Lcom/google/gson/internal/a/d;
+    iput-object p4, p0, Lcom/google/gson/Gson;->aTe:Lcom/google/gson/internal/a/d;
 
-    iget-object p4, p0, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/internal/a/d;
+    iget-object p4, p0, Lcom/google/gson/Gson;->aTe: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;->aVM:Lcom/google/gson/r;
+    sget-object p4, Lcom/google/gson/internal/a/n;->aVV: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object p5, p0, Lcom/google/gson/Gson;->aSZ:Lcom/google/gson/internal/c;
 
-    iget-object p6, p0, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/internal/a/d;
+    iget-object p6, p0, Lcom/google/gson/Gson;->aTe: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
 
@@ -478,7 +478,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/Gson;->aSP:Ljava/util/List;
+    iput-object p1, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
 
     return-void
 .end method
@@ -1081,7 +1081,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson;->aSP:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -1089,12 +1089,12 @@
 
     if-nez v0, :cond_0
 
-    iget-object p1, p0, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/internal/a/d;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aTe:Lcom/google/gson/internal/a/d;
 
     :cond_0
     const/4 v0, 0x0
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aSP:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
 
     invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1169,11 +1169,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/Gson;->aSO:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aSX:Ljava/util/Map;
 
     if-nez p1, :cond_0
 
-    sget-object v1, Lcom/google/gson/Gson;->aSM:Lcom/google/gson/reflect/TypeToken;
+    sget-object v1, Lcom/google/gson/Gson;->aSV:Lcom/google/gson/reflect/TypeToken;
 
     goto :goto_0
 
@@ -1192,7 +1192,7 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lcom/google/gson/Gson;->aSN:Ljava/lang/ThreadLocal;
+    iget-object v0, p0, Lcom/google/gson/Gson;->aSW:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -1208,7 +1208,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aSN:Ljava/lang/ThreadLocal;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSW:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
@@ -1233,7 +1233,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;->aSP:Ljava/util/List;
+    iget-object v3, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
 
     invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -1258,13 +1258,13 @@
 
     if-eqz v4, :cond_4
 
-    iget-object v3, v2, Lcom/google/gson/Gson$a;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v3, v2, Lcom/google/gson/Gson$a;->aTh:Lcom/google/gson/TypeAdapter;
 
     if-nez v3, :cond_6
 
-    iput-object v4, v2, Lcom/google/gson/Gson$a;->aSY:Lcom/google/gson/TypeAdapter;
+    iput-object v4, v2, Lcom/google/gson/Gson$a;->aTh:Lcom/google/gson/TypeAdapter;
 
-    iget-object v2, p0, Lcom/google/gson/Gson;->aSO:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/gson/Gson;->aSX:Ljava/util/Map;
 
     invoke-interface {v2, p1, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -1274,7 +1274,7 @@
 
     if-eqz v1, :cond_5
 
-    iget-object p1, p0, Lcom/google/gson/Gson;->aSN:Ljava/lang/ThreadLocal;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aSW:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1}, Ljava/lang/ThreadLocal;->remove()V
 
@@ -1315,7 +1315,7 @@
 
     if-eqz v1, :cond_8
 
-    iget-object p1, p0, Lcom/google/gson/Gson;->aSN:Ljava/lang/ThreadLocal;
+    iget-object p1, p0, Lcom/google/gson/Gson;->aSW:Ljava/lang/ThreadLocal;
 
     invoke-virtual {p1}, Ljava/lang/ThreadLocal;->remove()V
 
@@ -1351,7 +1351,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/Gson;->aST:Z
+    iget-boolean v0, p0, Lcom/google/gson/Gson;->aTc:Z
 
     if-eqz v0, :cond_0
 
@@ -1364,7 +1364,7 @@
 
     invoke-direct {v0, p1}, Lcom/google/gson/stream/JsonWriter;-><init>(Ljava/io/Writer;)V
 
-    iget-boolean p1, p0, Lcom/google/gson/Gson;->aSU:Z
+    iget-boolean p1, p0, Lcom/google/gson/Gson;->aTd:Z
 
     if-eqz p1, :cond_1
 
@@ -1494,7 +1494,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/gson/k;->aTk:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
 
     invoke-direct {p0, p1}, Lcom/google/gson/Gson;->a(Lcom/google/gson/JsonElement;)Ljava/lang/String;
 
@@ -1531,7 +1531,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aSP:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSY:Ljava/util/List;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1539,7 +1539,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lcom/google/gson/Gson;->aSQ:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/Gson;->aSZ: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 3ad8206ec7..654645a7c0 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 AA()D
+.method public AB()Ljava/lang/Number;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -32,7 +32,7 @@
     throw v0
 .end method
 
-.method public AB()J
+.method public AC()Ljava/lang/String;
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -50,7 +50,7 @@
     throw v0
 .end method
 
-.method public AC()I
+.method public AD()D
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -68,7 +68,7 @@
     throw v0
 .end method
 
-.method public AD()Z
+.method public AE()J
     .locals 2
 
     new-instance v0, Ljava/lang/UnsupportedOperationException;
@@ -86,7 +86,43 @@
     throw v0
 .end method
 
-.method public final AF()Lcom/google/gson/m;
+.method public AF()I
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public AG()Z
+    .locals 2
+
+    new-instance v0, Ljava/lang/UnsupportedOperationException;
+
+    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
+
+    throw v0
+.end method
+
+.method public final AI()Lcom/google/gson/m;
     .locals 3
 
     instance-of v0, p0, Lcom/google/gson/m;
@@ -117,42 +153,6 @@
     throw v0
 .end method
 
-.method public Ay()Ljava/lang/Number;
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
-.method public Az()Ljava/lang/String;
-    .locals 2
-
-    new-instance v0, Ljava/lang/UnsupportedOperationException;
-
-    invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-direct {v0, v1}, Ljava/lang/UnsupportedOperationException;-><init>(Ljava/lang/String;)V
-
-    throw v0
-.end method
-
 .method public toString()Ljava/lang/String;
     .locals 3
 
diff --git a/com.discord/smali_classes2/com/google/gson/JsonObject.smali b/com.discord/smali_classes2/com/google/gson/JsonObject.smali
index 87902de56a..5bb12dba11 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 aTl:Lcom/google/gson/internal/LinkedTreeMap;
+.field public final aTu: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;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object v0, p0, Lcom/google/gson/JsonObject;->aTu: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;->aTk:Lcom/google/gson/k;
+    sget-object p0, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
 
     return-object p0
 
@@ -55,10 +55,10 @@
 
     if-nez p2, :cond_0
 
-    sget-object p2, Lcom/google/gson/k;->aTk:Lcom/google/gson/k;
+    sget-object p2, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTu: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;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/JsonObject;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
 
-    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTu: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;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/JsonObject;->aTu: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 3b3cac4980..037130f932 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 aTq:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTz: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;->aTq:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/TypeAdapter$1;->aTz: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;->aTq:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aTz: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;->aTq:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/TypeAdapter$1;->aTz: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 d22b9fde2d..406efdce71 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;->aUl:Ljava/util/List;
+    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aUu: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;->aUn:Lcom/google/gson/JsonElement;
+    iget-object p1, v0, Lcom/google/gson/internal/a/f;->aUw: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;->aUl:Ljava/util/List;
+    iget-object v0, v0, Lcom/google/gson/internal/a/f;->aUu: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 abb30945e5..e11b346634 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 aSD:Ljava/lang/Class;
+.field private final aSM:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -25,9 +25,9 @@
     .end annotation
 .end field
 
-.field private final aSE:Ljava/text/DateFormat;
+.field private final aSN:Ljava/text/DateFormat;
 
-.field private final aSF:Ljava/text/DateFormat;
+.field private final aSO:Ljava/text/DateFormat;
 
 
 # direct methods
@@ -163,11 +163,11 @@
 
     :cond_1
     :goto_0
-    iput-object p1, p0, Lcom/google/gson/a;->aSD:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/a;->aSM:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/a;->aSE:Ljava/text/DateFormat;
+    iput-object p2, p0, Lcom/google/gson/a;->aSN:Ljava/text/DateFormat;
 
-    iput-object p3, p0, Lcom/google/gson/a;->aSF:Ljava/text/DateFormat;
+    iput-object p3, p0, Lcom/google/gson/a;->aSO:Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -175,12 +175,12 @@
 .method private dd(Ljava/lang/String;)Ljava/util/Date;
     .locals 3
 
-    iget-object v0, p0, Lcom/google/gson/a;->aSF:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/a;->aSO:Ljava/text/DateFormat;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/gson/a;->aSF:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSO: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;->aSE:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSN:Ljava/text/DateFormat;
 
     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
@@ -289,7 +289,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/google/gson/a;->aSD:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/a;->aSM: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;->aSF:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSO: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;->aSF:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/a;->aSO:Ljava/text/DateFormat;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/google/gson/a;->aSE:Ljava/text/DateFormat;
+    iget-object v1, p0, Lcom/google/gson/a;->aSN: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 7cec518d5b..4534c6fef4 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 Au()Z
+.method public abstract Ax()Z
 .end method
 
-.method public abstract Av()Z
+.method public abstract Ay()Z
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()Z"
diff --git a/com.discord/smali_classes2/com/google/gson/d.smali b/com.discord/smali_classes2/com/google/gson/d.smali
index 9b17cc3ea7..e4ffb3a280 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 aSG:Lcom/google/gson/d;
+.field public static final enum aSP:Lcom/google/gson/d;
 
-.field public static final enum aSH:Lcom/google/gson/d;
+.field public static final enum aSQ:Lcom/google/gson/d;
 
-.field public static final enum aSI:Lcom/google/gson/d;
+.field public static final enum aSR:Lcom/google/gson/d;
 
-.field public static final enum aSJ:Lcom/google/gson/d;
+.field public static final enum aSS:Lcom/google/gson/d;
 
-.field public static final enum aSK:Lcom/google/gson/d;
+.field public static final enum aST:Lcom/google/gson/d;
 
-.field private static final synthetic aSL:[Lcom/google/gson/d;
+.field private static final synthetic aSU:[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;->aSG:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSP: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;->aSH:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSQ: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;->aSI:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSR: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;->aSJ:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSS: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;->aSK:Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aST:Lcom/google/gson/d;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/google/gson/d;
 
-    sget-object v1, Lcom/google/gson/d;->aSG:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSH:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSQ:Lcom/google/gson/d;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSI:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSR:Lcom/google/gson/d;
 
     const/4 v2, 0x2
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSJ:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSS:Lcom/google/gson/d;
 
     const/4 v2, 0x3
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/d;->aSK:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aST:Lcom/google/gson/d;
 
     const/4 v2, 0x4
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/d;->aSL:[Lcom/google/gson/d;
+    sput-object v0, Lcom/google/gson/d;->aSU:[Lcom/google/gson/d;
 
     return-void
 .end method
@@ -292,7 +292,7 @@
 .method public static values()[Lcom/google/gson/d;
     .locals 1
 
-    sget-object v0, Lcom/google/gson/d;->aSL:[Lcom/google/gson/d;
+    sget-object v0, Lcom/google/gson/d;->aSU:[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 15c6618844..c73bd7c694 100644
--- a/com.discord/smali_classes2/com/google/gson/f.smali
+++ b/com.discord/smali_classes2/com/google/gson/f.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final aSP:Ljava/util/List;
+.field public final aSY:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,17 +14,17 @@
     .end annotation
 .end field
 
-.field private aSR:Lcom/google/gson/internal/d;
+.field private aTa:Lcom/google/gson/internal/d;
 
-.field private aST:Z
+.field private aTc:Z
 
-.field private aSU:Z
+.field private aTd:Z
 
-.field private aSZ:Lcom/google/gson/q;
+.field private aTi:Lcom/google/gson/q;
 
-.field public aTa:Lcom/google/gson/e;
+.field public aTj:Lcom/google/gson/e;
 
-.field private final aTb:Ljava/util/Map;
+.field private final aTk:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aTc:Ljava/util/List;
+.field private final aTl:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -45,17 +45,17 @@
     .end annotation
 .end field
 
-.field private aTd:Ljava/lang/String;
+.field private aTm:Ljava/lang/String;
 
-.field private aTe:I
+.field private aTn:I
 
-.field private aTf:I
+.field private aTo:I
 
-.field private aTg:Z
+.field private aTp:Z
 
-.field private aTh:Z
+.field private aTq:Z
 
-.field private aTi:Z
+.field private aTr: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;->aTy:Lcom/google/gson/internal/d;
+    sget-object v0, Lcom/google/gson/internal/d;->aTH:Lcom/google/gson/internal/d;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aSR:Lcom/google/gson/internal/d;
+    iput-object v0, p0, Lcom/google/gson/f;->aTa:Lcom/google/gson/internal/d;
 
-    sget-object v0, Lcom/google/gson/q;->aTn:Lcom/google/gson/q;
+    sget-object v0, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aSZ:Lcom/google/gson/q;
+    iput-object v0, p0, Lcom/google/gson/f;->aTi:Lcom/google/gson/q;
 
-    sget-object v0, Lcom/google/gson/d;->aSG:Lcom/google/gson/d;
+    sget-object v0, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
 
-    iput-object v0, p0, Lcom/google/gson/f;->aTa:Lcom/google/gson/e;
+    iput-object v0, p0, Lcom/google/gson/f;->aTj: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;->aTb:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/f;->aTk: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;->aSP:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/f;->aSY: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;->aTc:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/f;->aTl:Ljava/util/List;
 
     const/4 v0, 0x0
 
@@ -104,21 +104,21 @@
 
     const/4 v1, 0x2
 
-    iput v1, p0, Lcom/google/gson/f;->aTe:I
+    iput v1, p0, Lcom/google/gson/f;->aTn:I
 
-    iput v1, p0, Lcom/google/gson/f;->aTf:I
+    iput v1, p0, Lcom/google/gson/f;->aTo:I
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aTg:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aTp:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aTh:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aTq:Z
 
     const/4 v1, 0x1
 
-    iput-boolean v1, p0, Lcom/google/gson/f;->aTi:Z
+    iput-boolean v1, p0, Lcom/google/gson/f;->aTr:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aSU:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aTd:Z
 
-    iput-boolean v0, p0, Lcom/google/gson/f;->aST:Z
+    iput-boolean v0, p0, Lcom/google/gson/f;->aTc:Z
 
     iput-boolean v0, p0, Lcom/google/gson/f;->lenient:Z
 
@@ -234,18 +234,18 @@
 
 
 # virtual methods
-.method public final Aw()Lcom/google/gson/Gson;
+.method public final Az()Lcom/google/gson/Gson;
     .locals 14
 
     new-instance v12, Ljava/util/ArrayList;
 
-    iget-object v0, p0, Lcom/google/gson/f;->aSP:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/f;->aSY:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
     move-result v0
 
-    iget-object v1, p0, Lcom/google/gson/f;->aTc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/f;->aTl: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;->aSP:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/f;->aSY: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;->aTc:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/f;->aTl: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;->aTd:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/f;->aTm:Ljava/lang/String;
 
-    iget v1, p0, Lcom/google/gson/f;->aTe:I
+    iget v1, p0, Lcom/google/gson/f;->aTn:I
 
-    iget v2, p0, Lcom/google/gson/f;->aTf:I
+    iget v2, p0, Lcom/google/gson/f;->aTo: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;->aSR:Lcom/google/gson/internal/d;
+    iget-object v1, p0, Lcom/google/gson/f;->aTa:Lcom/google/gson/internal/d;
 
-    iget-object v2, p0, Lcom/google/gson/f;->aTa:Lcom/google/gson/e;
+    iget-object v2, p0, Lcom/google/gson/f;->aTj:Lcom/google/gson/e;
 
-    iget-object v3, p0, Lcom/google/gson/f;->aTb:Ljava/util/Map;
+    iget-object v3, p0, Lcom/google/gson/f;->aTk:Ljava/util/Map;
 
     iget-boolean v4, p0, Lcom/google/gson/f;->serializeNulls:Z
 
-    iget-boolean v5, p0, Lcom/google/gson/f;->aTg:Z
+    iget-boolean v5, p0, Lcom/google/gson/f;->aTp:Z
 
-    iget-boolean v6, p0, Lcom/google/gson/f;->aST:Z
+    iget-boolean v6, p0, Lcom/google/gson/f;->aTc:Z
 
-    iget-boolean v7, p0, Lcom/google/gson/f;->aTi:Z
+    iget-boolean v7, p0, Lcom/google/gson/f;->aTr:Z
 
-    iget-boolean v8, p0, Lcom/google/gson/f;->aSU:Z
+    iget-boolean v8, p0, Lcom/google/gson/f;->aTd:Z
 
     iget-boolean v9, p0, Lcom/google/gson/f;->lenient:Z
 
-    iget-boolean v10, p0, Lcom/google/gson/f;->aTh:Z
+    iget-boolean v10, p0, Lcom/google/gson/f;->aTq:Z
 
-    iget-object v11, p0, Lcom/google/gson/f;->aSZ:Lcom/google/gson/q;
+    iget-object v11, p0, Lcom/google/gson/f;->aTi: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 beffb46363..4e2a530ca1 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 Ax()Ljava/lang/Object;
+.method public abstract AA()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 335de98478..05520f26d8 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 aTj:Ljava/util/List;
+.field private final aTs: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;->aTj:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AA()D
+.method public final AB()Ljava/lang/Number;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs: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;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -69,155 +69,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AA()D
-
-    move-result-wide v0
-
-    return-wide v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final AB()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/gson/JsonElement;
-
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AB()J
-
-    move-result-wide v0
-
-    return-wide v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final AC()I
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/gson/JsonElement;
-
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AC()I
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final AD()Z
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/gson/JsonElement;
-
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AD()Z
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    new-instance v0, Ljava/lang/IllegalStateException;
-
-    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
-
-    throw v0
-.end method
-
-.method public final Ay()Ljava/lang/Number;
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    invoke-interface {v0}, Ljava/util/List;->size()I
-
-    move-result v0
-
-    const/4 v1, 0x1
-
-    if-ne v0, v1, :cond_0
-
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
-
-    const/4 v1, 0x0
-
-    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Lcom/google/gson/JsonElement;
-
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->Ay()Ljava/lang/Number;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AB()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -231,10 +83,10 @@
     throw v0
 .end method
 
-.method public final Az()Ljava/lang/String;
+.method public final AC()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -244,7 +96,7 @@
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
     const/4 v1, 0x0
 
@@ -254,7 +106,7 @@
 
     check-cast v0, Lcom/google/gson/JsonElement;
 
-    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->Az()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AC()Ljava/lang/String;
 
     move-result-object v0
 
@@ -268,15 +120,163 @@
     throw v0
 .end method
 
+.method public final AD()D
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/gson/JsonElement;
+
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AD()D
+
+    move-result-wide v0
+
+    return-wide v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final AE()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/gson/JsonElement;
+
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AE()J
+
+    move-result-wide v0
+
+    return-wide v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final AF()I
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/gson/JsonElement;
+
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AF()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
+
+    throw v0
+.end method
+
+.method public final AG()Z
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    invoke-interface {v0}, Ljava/util/List;->size()I
+
+    move-result v0
+
+    const/4 v1, 0x1
+
+    if-ne v0, v1, :cond_0
+
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
+
+    const/4 v1, 0x0
+
+    invoke-interface {v0, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/google/gson/JsonElement;
+
+    invoke-virtual {v0}, Lcom/google/gson/JsonElement;->AG()Z
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    new-instance v0, Ljava/lang/IllegalStateException;
+
+    invoke-direct {v0}, Ljava/lang/IllegalStateException;-><init>()V
+
+    throw v0
+.end method
+
 .method public final b(Lcom/google/gson/JsonElement;)V
     .locals 1
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lcom/google/gson/k;->aTk:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
@@ -294,9 +294,9 @@
 
     check-cast p1, Lcom/google/gson/h;
 
-    iget-object p1, p1, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object p1, p1, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs:Ljava/util/List;
 
     invoke-interface {p1, v0}, Ljava/util/List;->equals(Ljava/lang/Object;)Z
 
@@ -321,7 +321,7 @@
 .method public final hashCode()I
     .locals 1
 
-    iget-object v0, p0, Lcom/google/gson/h;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs: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;->aTj:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/h;->aTs: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 0eb5502abd..96dde6aa48 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 AE()Ljava/lang/Object;
+.method public abstract AH()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 2ca9eeeb41..4709419cce 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 aTL:Lcom/google/gson/internal/LinkedTreeMap$a;
+.field final synthetic aTU: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;->aTL:Lcom/google/gson/internal/LinkedTreeMap$a;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a$1;->aTU:Lcom/google/gson/internal/LinkedTreeMap$a;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$a;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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;->AO()Lcom/google/gson/internal/LinkedTreeMap$d;
+    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$a$1;->AR()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 781b602e91..ec9b506b18 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 aTK:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$a;->aTT: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 26ddd85eb9..0ed758e886 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 aTM:Lcom/google/gson/internal/LinkedTreeMap$b;
+.field final synthetic aTV: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;->aTM:Lcom/google/gson/internal/LinkedTreeMap$b;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b$1;->aTV:Lcom/google/gson/internal/LinkedTreeMap$b;
 
-    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$b;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT: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;->AO()Lcom/google/gson/internal/LinkedTreeMap$d;
+    invoke-virtual {p0}, Lcom/google/gson/internal/LinkedTreeMap$b$1;->AR()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 758023e91d..8f693df5e2 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 aTK:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0, p1}, Lcom/google/gson/internal/LinkedTreeMap;->aF(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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$b;->aTT: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 e7bb452fac..31cb37f0e1 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 aTK:Lcom/google/gson/internal/LinkedTreeMap;
+.field final synthetic aTT:Lcom/google/gson/internal/LinkedTreeMap;
 
-.field aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTW: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 aTO:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTX: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 aTP:I
+.field aTY:I
 
 
 # direct methods
 .method constructor <init>(Lcom/google/gson/internal/LinkedTreeMap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT: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;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTO:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget p1, p1, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:I
+    iput p1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTY:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final AO()Lcom/google/gson/internal/LinkedTreeMap$d;
+.method final AR()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;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT: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;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v1, v1, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iget v2, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:I
+    iget v2, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTY:I
 
     if-ne v1, v2, :cond_0
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTO:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTX: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;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT: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;->aTO:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v1, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT: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;->aTO:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTX:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTK:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTT:Lcom/google/gson/internal/LinkedTreeMap;
 
     iget v0, v0, Lcom/google/gson/internal/LinkedTreeMap;->modCount:I
 
-    iput v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTP:I
+    iput v0, p0, Lcom/google/gson/internal/LinkedTreeMap$c;->aTY: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 db1ed23a1d..d5216a923a 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 aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTW: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 aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aTZ: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 aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aUa: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 aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aUb: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 aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+.field aUc: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p3, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p4, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p4, p0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p4, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p4, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p0, p3, Lcom/google/gson/internal/LinkedTreeMap$d;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p0, p3, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc: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 9ce596e656..6c912f47d0 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 aTJ:Ljava/util/Comparator;
+.field private static final aTS: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;->aTJ:Ljava/util/Comparator;
+    sput-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aTS: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;->aTJ:Ljava/util/Comparator;
+    sget-object v0, Lcom/google/gson/internal/LinkedTreeMap;->aTS: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;->aTJ:Ljava/util/Comparator;
+    sget-object p1, Lcom/google/gson/internal/LinkedTreeMap;->aTS: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v2, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v2, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v2, :cond_0
 
-    iput-object p1, v2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     const/4 v1, 0x0
 
-    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz p2, :cond_0
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
     if-eqz v0, :cond_2
 
-    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-ne v1, p1, :cond_1
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 
     :cond_1
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     return-void
 
@@ -320,26 +320,26 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     if-eqz v3, :cond_0
 
-    iput-object p1, v3, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v3, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTJ:Ljava/util/Comparator;
+    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aTS: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_2
 
     :cond_3
-    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v5, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTJ:Ljava/util/Comparator;
+    sget-object v3, Lcom/google/gson/internal/LinkedTreeMap;->aTS: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v3, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     goto :goto_4
 
     :cond_a
-    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
 
     :cond_0
-    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v1, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ: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;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa: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;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iget-object v0, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, p2, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTQ:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object p2, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTZ:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTR:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUa: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;->aTS:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v3, p1, Lcom/google/gson/internal/LinkedTreeMap$d;->aUb: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;->aTT:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aUc:Lcom/google/gson/internal/LinkedTreeMap$d;
 
-    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTN:Lcom/google/gson/internal/LinkedTreeMap$d;
+    iput-object v0, v0, Lcom/google/gson/internal/LinkedTreeMap$d;->aTW: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 13fdf80d8c..96ed4f27bf 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;->aUM:Ljava/lang/reflect/Type;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aUV: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 618256e3ed..0263ad3faa 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 aUc:Lcom/google/gson/r;
+.field public static final aUl:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aUd:Lcom/google/gson/TypeAdapter;
+.field private final aUm: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;->aUc:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/a;->aUl: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;->aUd:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/a;->aUm: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;->aUd:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/a;->aUm: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;->aUd:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/a;->aUm: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 b3a440757c..10fab533ae 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 aVY:Ljava/util/TimeZone;
+.field private static final aWh:Ljava/util/TimeZone;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/a/a;->aVY:Ljava/util/TimeZone;
+    sput-object v0, Lcom/google/gson/internal/a/a/a;->aWh:Ljava/util/TimeZone;
 
     return-void
 .end method
@@ -276,7 +276,7 @@
 
     if-ne v14, v11, :cond_b
 
-    sget-object v10, Lcom/google/gson/internal/a/a/a;->aVY:Ljava/util/TimeZone;
+    sget-object v10, Lcom/google/gson/internal/a/a/a;->aWh:Ljava/util/TimeZone;
 
     add-int/2addr v15, v9
 
@@ -444,7 +444,7 @@
 
     :cond_12
     :goto_7
-    sget-object v10, Lcom/google/gson/internal/a/a/a;->aVY:Ljava/util/TimeZone;
+    sget-object v10, Lcom/google/gson/internal/a/a/a;->aWh: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 617daa4b01..e74fd31b7a 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 aUe:Lcom/google/gson/TypeAdapter;
+.field private final aUn: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 aUf:Lcom/google/gson/internal/g;
+.field private final aUo: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;->aUe:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/b$a;->aUn:Lcom/google/gson/TypeAdapter;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/b$a;->aUf:Lcom/google/gson/internal/g;
+    iput-object p4, p0, Lcom/google/gson/internal/a/b$a;->aUo: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;->aUf:Lcom/google/gson/internal/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/b$a;->aUo:Lcom/google/gson/internal/g;
 
-    invoke-interface {v0}, Lcom/google/gson/internal/g;->AL()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/internal/g;->AO()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;->aUe:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aUn: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;->aUe:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/b$a;->aUn: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 a279a63a90..9b2ea42633 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 aSQ:Lcom/google/gson/internal/c;
+.field private final aSZ: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;->aSQ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/b;->aSZ:Lcom/google/gson/internal/c;
 
     return-void
 .end method
@@ -46,9 +46,9 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object v2, p0, Lcom/google/gson/internal/a/b;->aSZ: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 d92da10ad4..b7423ed7ed 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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 dc6f8f9da6..8b9a8784ed 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 aUc:Lcom/google/gson/r;
+.field public static final aUl:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aSE:Ljava/text/DateFormat;
+.field private final aSN:Ljava/text/DateFormat;
 
-.field private final aSF:Ljava/text/DateFormat;
+.field private final aSO: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;->aUc:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/c;->aUl: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;->aSE:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aSN: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;->aSF:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/c;->aSO: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;->aSE:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSN:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p2}, Ljava/text/DateFormat;->format(Ljava/util/Date;)Ljava/lang/String;
 
@@ -111,7 +111,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSF:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSO: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;->aSE:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/c;->aSN:Ljava/text/DateFormat;
 
     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->parse(Ljava/lang/String;)Ljava/util/Date;
 
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 d04d186e23..26e922ea41 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 aSQ:Lcom/google/gson/internal/c;
+.field private final aSZ: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;->aSQ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/d;->aSZ: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;->AL()Ljava/lang/Object;
+    invoke-interface {p0}, Lcom/google/gson/internal/g;->AO()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;->AI()Z
+    invoke-interface {p3}, Lcom/google/gson/a/b;->AL()Z
 
     move-result p1
 
@@ -201,7 +201,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/internal/a/d;->aSZ: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 afca5b080a..f43146b708 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 aUg:Ljava/io/Reader;
+.field private static final aUp:Ljava/io/Reader;
 
-.field private static final aUh:Ljava/lang/Object;
+.field private static final aUq:Ljava/lang/Object;
 
 
 # instance fields
-.field private aUi:[Ljava/lang/Object;
+.field private aUr:[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;->aUg:Ljava/io/Reader;
+    sput-object v0, Lcom/google/gson/internal/a/e;->aUp: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;->aUh:Ljava/lang/Object;
+    sput-object v0, Lcom/google/gson/internal/a/e;->aUq: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;->aUg:Ljava/io/Reader;
+    sget-object v0, Lcom/google/gson/internal/a/e;->aUp: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;->aUi:[Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     const/4 v1, 0x0
 
@@ -68,10 +68,10 @@
     return-void
 .end method
 
-.method private AR()Ljava/lang/Object;
+.method private AU()Ljava/lang/Object;
     .locals 4
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUi:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -114,10 +114,10 @@
 
 
 # virtual methods
-.method public final AQ()Ljava/lang/Object;
+.method public final AT()Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUi:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -185,7 +185,7 @@
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aUi:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -219,14 +219,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;->aUi:[Ljava/lang/Object;
+    iput-object v2, p0, Lcom/google/gson/internal/a/e;->aUr:[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;->aUi:[Ljava/lang/Object;
+    iget-object v0, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -251,7 +251,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;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -288,13 +288,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;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/JsonObject;
 
-    iget-object v0, v0, Lcom/google/gson/JsonObject;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object v0, v0, Lcom/google/gson/JsonObject;->aTu:Lcom/google/gson/internal/LinkedTreeMap;
 
     invoke-virtual {v0}, Lcom/google/gson/internal/LinkedTreeMap;->entrySet()Ljava/util/Set;
 
@@ -321,13 +321,13 @@
 
     new-array v1, v0, [Ljava/lang/Object;
 
-    sget-object v2, Lcom/google/gson/internal/a/e;->aUh:Ljava/lang/Object;
+    sget-object v2, Lcom/google/gson/internal/a/e;->aUq:Ljava/lang/Object;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aUi:[Ljava/lang/Object;
+    iput-object v1, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     iput v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -346,9 +346,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;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -380,9 +380,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;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -418,7 +418,7 @@
 
     if-ge v1, v2, :cond_2
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/e;->aUi:[Ljava/lang/Object;
+    iget-object v2, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     aget-object v3, v2, v1
 
@@ -535,13 +535,13 @@
 
     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;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AD()Z
+    invoke-virtual {v0}, Lcom/google/gson/m;->AG()Z
 
     move-result v0
 
@@ -620,13 +620,13 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AA()D
+    invoke-virtual {v0}, Lcom/google/gson/m;->AD()D
 
     move-result-wide v0
 
@@ -669,7 +669,7 @@
 
     :cond_3
     :goto_1
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -746,17 +746,17 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AC()I
+    invoke-virtual {v0}, Lcom/google/gson/m;->AF()I
 
     move-result v0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     iget v1, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -833,17 +833,17 @@
 
     :cond_1
     :goto_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->AB()J
+    invoke-virtual {v0}, Lcom/google/gson/m;->AE()J
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -875,7 +875,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;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -922,7 +922,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;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     iget v0, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -999,13 +999,13 @@
 
     :cond_1
     :goto_0
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Lcom/google/gson/m;
 
-    invoke-virtual {v0}, Lcom/google/gson/m;->Az()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1045,7 +1045,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AQ()Ljava/lang/Object;
+    invoke-virtual {p0}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1053,7 +1053,7 @@
 
     if-eqz v1, :cond_4
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aUi:[Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/a/e;->aUr:[Ljava/lang/Object;
 
     iget v2, p0, Lcom/google/gson/internal/a/e;->stackSize:I
 
@@ -1172,7 +1172,7 @@
     return-object v0
 
     :cond_b
-    sget-object v1, Lcom/google/gson/internal/a/e;->aUh:Ljava/lang/Object;
+    sget-object v1, Lcom/google/gson/internal/a/e;->aUq:Ljava/lang/Object;
 
     if-ne v0, v1, :cond_c
 
@@ -1229,7 +1229,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AR()Ljava/lang/Object;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/e;->AU()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 4541380de1..8bbf2d7d81 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 aUj:Ljava/io/Writer;
+.field private static final aUs:Ljava/io/Writer;
 
-.field private static final aUk:Lcom/google/gson/m;
+.field private static final aUt:Lcom/google/gson/m;
 
 
 # instance fields
-.field public final aUl:Ljava/util/List;
+.field public final aUu:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -20,9 +20,9 @@
     .end annotation
 .end field
 
-.field private aUm:Ljava/lang/String;
+.field private aUv:Ljava/lang/String;
 
-.field public aUn:Lcom/google/gson/JsonElement;
+.field public aUw: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;->aUj:Ljava/io/Writer;
+    sput-object v0, Lcom/google/gson/internal/a/f;->aUs: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;->aUk:Lcom/google/gson/m;
+    sput-object v0, Lcom/google/gson/internal/a/f;->aUt: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;->aUj:Ljava/io/Writer;
+    sget-object v0, Lcom/google/gson/internal/a/f;->aUs: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;->aUl:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aUu:Ljava/util/List;
 
-    sget-object v0, Lcom/google/gson/k;->aTk:Lcom/google/gson/k;
+    sget-object v0, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
 
-    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aUn:Lcom/google/gson/JsonElement;
+    iput-object v0, p0, Lcom/google/gson/internal/a/f;->aUw:Lcom/google/gson/JsonElement;
 
     return-void
 .end method
 
-.method private AS()Lcom/google/gson/JsonElement;
+.method private AV()Lcom/google/gson/JsonElement;
     .locals 2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUv: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;->AS()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()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;->aUm:Ljava/lang/String;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aUv: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;->aUm:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aUv:Ljava/lang/String;
 
     return-void
 
     :cond_2
-    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUn:Lcom/google/gson/JsonElement;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aUw:Lcom/google/gson/JsonElement;
 
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AS()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()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;->aUl:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUl:Ljava/util/List;
+    iget-object v1, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu:Ljava/util/List;
 
-    sget-object v1, Lcom/google/gson/internal/a/f;->aUk:Lcom/google/gson/m;
+    sget-object v1, Lcom/google/gson/internal/a/f;->aUt: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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUv:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AS()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUv:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AS()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUl:Ljava/util/List;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUu: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;->aUm:Ljava/lang/String;
+    iget-object v0, p0, Lcom/google/gson/internal/a/f;->aUv:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AS()Lcom/google/gson/JsonElement;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/f;->AV()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;->aUm:Ljava/lang/String;
+    iput-object p1, p0, Lcom/google/gson/internal/a/f;->aUv:Ljava/lang/String;
 
     return-object p0
 
@@ -411,7 +411,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/k;->aTk:Lcom/google/gson/k;
+    sget-object v0, Lcom/google/gson/k;->aTt: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 23e20c5017..f00fa8d37b 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 aUf:Lcom/google/gson/internal/g;
+.field private final aUo: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 aUo:Lcom/google/gson/TypeAdapter;
+.field private final aUx: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 aUp:Lcom/google/gson/TypeAdapter;
+.field private final aUy: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 aUq:Lcom/google/gson/internal/a/g;
+.field final synthetic aUz: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;->aUq:Lcom/google/gson/internal/a/g;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aUz: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;->aUo:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aUx: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;->aUp:Lcom/google/gson/TypeAdapter;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g$a;->aUy:Lcom/google/gson/TypeAdapter;
 
-    iput-object p7, p0, Lcom/google/gson/internal/a/g$a;->aUf:Lcom/google/gson/internal/g;
+    iput-object p7, p0, Lcom/google/gson/internal/a/g$a;->aUo: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;->aUf:Lcom/google/gson/internal/g;
+    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aUo:Lcom/google/gson/internal/g;
 
-    invoke-interface {v1}, Lcom/google/gson/internal/g;->AL()Ljava/lang/Object;
+    invoke-interface {v1}, Lcom/google/gson/internal/g;->AO()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;->aUo:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aUx: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;->aUp:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aUy: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;->aUo:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aUx: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;->aUp:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/g$a;->aUy: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;->aUq:Lcom/google/gson/internal/a/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/g$a;->aUz:Lcom/google/gson/internal/a/g;
 
-    iget-boolean v0, v0, Lcom/google/gson/internal/a/g;->aTg:Z
+    iget-boolean v0, v0, Lcom/google/gson/internal/a/g;->aTp: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;->aUp:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/g$a;->aUy: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;->aUo:Lcom/google/gson/TypeAdapter;
+    iget-object v5, p0, Lcom/google/gson/internal/a/g$a;->aUx: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;->aUp:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aUy: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;->AF()Lcom/google/gson/m;
+    invoke-virtual {v3}, Lcom/google/gson/JsonElement;->AI()Lcom/google/gson/m;
 
     move-result-object v3
 
@@ -475,7 +475,7 @@
 
     if-eqz v4, :cond_8
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {v3}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object v3
 
@@ -492,7 +492,7 @@
 
     if-eqz v4, :cond_9
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->AD()Z
+    invoke-virtual {v3}, Lcom/google/gson/m;->AG()Z
 
     move-result v3
 
@@ -509,7 +509,7 @@
 
     if-eqz v4, :cond_a
 
-    invoke-virtual {v3}, Lcom/google/gson/m;->Az()Ljava/lang/String;
+    invoke-virtual {v3}, Lcom/google/gson/m;->AC()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;->aUp:Lcom/google/gson/TypeAdapter;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g$a;->aUy: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 1dd19245c4..8f1b9b0f5d 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 aSQ:Lcom/google/gson/internal/c;
+.field private final aSZ:Lcom/google/gson/internal/c;
 
-.field final aTg:Z
+.field final aTp: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;->aSQ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/g;->aSZ:Lcom/google/gson/internal/c;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/a/g;->aTg:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/a/g;->aTp:Z
 
     return-void
 .end method
@@ -50,9 +50,9 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aUS:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVb: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object v3, p0, Lcom/google/gson/internal/a/g;->aSZ: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 ed7dd49102..df2a479fd7 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;->aVZ:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 8984b1cf0f..e179698387 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 aUc:Lcom/google/gson/r;
+.field public static final aUl: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;->aUc:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/h;->aUl: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 dd283b2af9..20f740486e 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 aUr:Ljava/lang/reflect/Field;
+.field final synthetic aUA:Ljava/lang/reflect/Field;
 
-.field final synthetic aUs:Z
+.field final synthetic aUB:Z
 
-.field final synthetic aUt:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUC:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aUu:Lcom/google/gson/Gson;
+.field final synthetic aUD:Lcom/google/gson/Gson;
 
-.field final synthetic aUv:Lcom/google/gson/reflect/TypeToken;
+.field final synthetic aUE:Lcom/google/gson/reflect/TypeToken;
 
-.field final synthetic aUw:Z
+.field final synthetic aUF:Z
 
-.field final synthetic aUx:Lcom/google/gson/internal/a/i;
+.field final synthetic aUG: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;->aUx:Lcom/google/gson/internal/a/i;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i$1;->aUG:Lcom/google/gson/internal/a/i;
 
-    iput-object p5, p0, Lcom/google/gson/internal/a/i$1;->aUr:Ljava/lang/reflect/Field;
+    iput-object p5, p0, Lcom/google/gson/internal/a/i$1;->aUA:Ljava/lang/reflect/Field;
 
-    iput-boolean p6, p0, Lcom/google/gson/internal/a/i$1;->aUs:Z
+    iput-boolean p6, p0, Lcom/google/gson/internal/a/i$1;->aUB:Z
 
-    iput-object p7, p0, Lcom/google/gson/internal/a/i$1;->aUt:Lcom/google/gson/TypeAdapter;
+    iput-object p7, p0, Lcom/google/gson/internal/a/i$1;->aUC:Lcom/google/gson/TypeAdapter;
 
-    iput-object p8, p0, Lcom/google/gson/internal/a/i$1;->aUu:Lcom/google/gson/Gson;
+    iput-object p8, p0, Lcom/google/gson/internal/a/i$1;->aUD:Lcom/google/gson/Gson;
 
-    iput-object p9, p0, Lcom/google/gson/internal/a/i$1;->aUv:Lcom/google/gson/reflect/TypeToken;
+    iput-object p9, p0, Lcom/google/gson/internal/a/i$1;->aUE:Lcom/google/gson/reflect/TypeToken;
 
-    iput-boolean p10, p0, Lcom/google/gson/internal/a/i$1;->aUw:Z
+    iput-boolean p10, p0, Lcom/google/gson/internal/a/i$1;->aUF: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUC: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;->aUw:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aUF:Z
 
     if-nez v0, :cond_1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUr:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUA: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;->aUz:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aUI:Z
 
     const/4 v1, 0x0
 
@@ -103,7 +103,7 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUr:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUA: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;->aUr:Ljava/lang/reflect/Field;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUA: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;->aUs:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/i$1;->aUB:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$1;->aUC: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;->aUu:Lcom/google/gson/Gson;
+    iget-object v1, p0, Lcom/google/gson/internal/a/i$1;->aUD:Lcom/google/gson/Gson;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/i$1;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v2, p0, Lcom/google/gson/internal/a/i$1;->aUC:Lcom/google/gson/TypeAdapter;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/i$1;->aUv:Lcom/google/gson/reflect/TypeToken;
+    iget-object v3, p0, Lcom/google/gson/internal/a/i$1;->aUE:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->aUV: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 a630d51cec..74f3961ecd 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 aUf:Lcom/google/gson/internal/g;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/internal/g<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final aUy:Ljava/util/Map;
+.field private final aUH:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -45,6 +36,15 @@
     .end annotation
 .end field
 
+.field private final aUo: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;->aUf:Lcom/google/gson/internal/g;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i$a;->aUo:Lcom/google/gson/internal/g;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/i$a;->aUy:Ljava/util/Map;
+    iput-object p2, p0, Lcom/google/gson/internal/a/i$a;->aUH: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;->aUf:Lcom/google/gson/internal/g;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aUo:Lcom/google/gson/internal/g;
 
-    invoke-interface {v0}, Lcom/google/gson/internal/g;->AL()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/internal/g;->AO()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;->aUy:Ljava/util/Map;
+    iget-object v2, p0, Lcom/google/gson/internal/a/i$a;->aUH: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;->aUA:Z
+    iget-boolean v2, v1, Lcom/google/gson/internal/a/i$b;->aUJ: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;->aUy:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i$a;->aUH: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 f5fae6ab41..5c39a0236f 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 aUA:Z
+.field final aUI:Z
 
-.field final aUz:Z
+.field final aUJ: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;->aUz:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/a/i$b;->aUI:Z
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/a/i$b;->aUA:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/a/i$b;->aUJ: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 f0f6504101..aa3a602ce2 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 aSQ:Lcom/google/gson/internal/c;
+.field private final aSZ:Lcom/google/gson/internal/c;
 
-.field private final aSR:Lcom/google/gson/internal/d;
+.field private final aTa:Lcom/google/gson/internal/d;
 
-.field private final aSV:Lcom/google/gson/internal/a/d;
+.field private final aTe:Lcom/google/gson/internal/a/d;
 
-.field private final aTa:Lcom/google/gson/e;
+.field private final aTj: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;->aSQ:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/a/i;->aSZ:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/i;->aTa:Lcom/google/gson/e;
+    iput-object p2, p0, Lcom/google/gson/internal/a/i;->aTj:Lcom/google/gson/e;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/i;->aSR:Lcom/google/gson/internal/d;
+    iput-object p3, p0, Lcom/google/gson/internal/a/i;->aTa:Lcom/google/gson/internal/d;
 
-    iput-object p4, p0, Lcom/google/gson/internal/a/i;->aSV:Lcom/google/gson/internal/a/d;
+    iput-object p4, p0, Lcom/google/gson/internal/a/i;->aTe: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;->aUM:Ljava/lang/reflect/Type;
+    iget-object v14, v0, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aUM:Ljava/lang/reflect/Type;
+    iget-object v1, v10, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aVZ:Ljava/lang/Class;
+    iget-object v4, v9, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object v7, v11, Lcom/google/gson/internal/a/i;->aSZ: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;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aVZ:Ljava/lang/Class;
+    iget-object v15, v10, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aSR:Lcom/google/gson/internal/d;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aTa: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;->aTA:I
+    iget v1, v0, Lcom/google/gson/internal/d;->aTJ: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;->aTz:D
+    iget-wide v4, v0, Lcom/google/gson/internal/d;->aTI: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;->aTC:Z
+    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aTL:Z
 
     if-eqz v1, :cond_5
 
@@ -512,7 +512,7 @@
 
     if-eqz p2, :cond_4
 
-    invoke-interface {v1}, Lcom/google/gson/a/a;->AG()Z
+    invoke-interface {v1}, Lcom/google/gson/a/a;->AJ()Z
 
     move-result v1
 
@@ -521,7 +521,7 @@
     goto :goto_1
 
     :cond_4
-    invoke-interface {v1}, Lcom/google/gson/a/a;->AH()Z
+    invoke-interface {v1}, Lcom/google/gson/a/a;->AK()Z
 
     move-result v1
 
@@ -531,7 +531,7 @@
     goto :goto_0
 
     :cond_5
-    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aTB:Z
+    iget-boolean v1, v0, Lcom/google/gson/internal/d;->aTK: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;->aTD:Ljava/util/List;
+    iget-object p2, v0, Lcom/google/gson/internal/d;->aTM:Ljava/util/List;
 
     goto :goto_2
 
     :cond_8
-    iget-object p2, v0, Lcom/google/gson/internal/d;->aTE:Ljava/util/List;
+    iget-object p2, v0, Lcom/google/gson/internal/d;->aTN: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;->Au()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->Ax()Z
 
     move-result p2
 
@@ -641,7 +641,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aTa:Lcom/google/gson/e;
+    iget-object v0, p0, Lcom/google/gson/internal/a/i;->aTj: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;->AJ()[Ljava/lang/String;
+    invoke-interface {v0}, Lcom/google/gson/a/c;->AM()[Ljava/lang/String;
 
     move-result-object v0
 
@@ -719,7 +719,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aSQ:Lcom/google/gson/internal/c;
+    iget-object v1, p0, Lcom/google/gson/internal/a/i;->aSZ: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 31ea6b1052..ffa5ebf78b 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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 316dd1ac66..60d94a733f 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 aUc:Lcom/google/gson/r;
+.field public static final aUl:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aUB:Ljava/text/DateFormat;
+.field private final aUK: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;->aUc:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/j;->aUl: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;->aUB:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/j;->aUK: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;->aUB:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aUK: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;->aUB:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/j;->aUK: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 820577ba6b..7ddf90c679 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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 aef4d3d3e7..06fff93224 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 aUc:Lcom/google/gson/r;
+.field public static final aUl:Lcom/google/gson/r;
 
 
 # instance fields
-.field private final aUB:Ljava/text/DateFormat;
+.field private final aUK: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;->aUc:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/k;->aUl: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;->aUB:Ljava/text/DateFormat;
+    iput-object v0, p0, Lcom/google/gson/internal/a/k;->aUK: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;->aUB:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aUK: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;->aUB:Ljava/text/DateFormat;
+    iget-object v0, p0, Lcom/google/gson/internal/a/k;->aUK: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 7fec950899..4d754ac7ef 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 aUH:Lcom/google/gson/internal/a/l;
+.field final synthetic aUQ: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;->aUH:Lcom/google/gson/internal/a/l;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l$a;->aUQ: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 9abbf63e11..eb7ce84a27 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 aUC:Lcom/google/gson/o;
+.field private final aUL: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 aUD:Lcom/google/gson/i;
+.field private final aUM: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 aUI:Lcom/google/gson/reflect/TypeToken;
+.field private final aUR: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 aUJ:Z
+.field private final aUS:Z
 
-.field private final aUK:Ljava/lang/Class;
+.field private final aUT: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;->aUC:Lcom/google/gson/o;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUL: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;->aUD:Lcom/google/gson/i;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUM:Lcom/google/gson/i;
 
-    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUC:Lcom/google/gson/o;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUL:Lcom/google/gson/o;
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUD:Lcom/google/gson/i;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l$b;->aUM: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;->aUI:Lcom/google/gson/reflect/TypeToken;
+    iput-object p2, p0, Lcom/google/gson/internal/a/l$b;->aUR:Lcom/google/gson/reflect/TypeToken;
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/a/l$b;->aUJ:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/a/l$b;->aUS:Z
 
-    iput-object v1, p0, Lcom/google/gson/internal/a/l$b;->aUK:Ljava/lang/Class;
+    iput-object v1, p0, Lcom/google/gson/internal/a/l$b;->aUT:Ljava/lang/Class;
 
     return-void
 .end method
@@ -151,7 +151,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUI:Lcom/google/gson/reflect/TypeToken;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUR: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;->aUJ:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/a/l$b;->aUS:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUI:Lcom/google/gson/reflect/TypeToken;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUR:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, v0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aUK:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l$b;->aUT:Ljava/lang/Class;
 
-    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aUC:Lcom/google/gson/o;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l$b;->aUL:Lcom/google/gson/o;
 
-    iget-object v3, p0, Lcom/google/gson/internal/a/l$b;->aUD:Lcom/google/gson/i;
+    iget-object v3, p0, Lcom/google/gson/internal/a/l$b;->aUM: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 f2b2af3d8d..9b4dd34386 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 aSY:Lcom/google/gson/TypeAdapter;
+.field private aTh: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 aUC:Lcom/google/gson/o;
+.field private final aUL: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 aUD:Lcom/google/gson/i;
+.field private final aUM: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 aUE:Lcom/google/gson/reflect/TypeToken;
+.field private final aUN: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 aUF:Lcom/google/gson/r;
+.field private final aUO:Lcom/google/gson/r;
 
-.field private final aUG:Lcom/google/gson/internal/a/l$a;
+.field private final aUP: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;->aUG:Lcom/google/gson/internal/a/l$a;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aUP:Lcom/google/gson/internal/a/l$a;
 
-    iput-object p1, p0, Lcom/google/gson/internal/a/l;->aUC:Lcom/google/gson/o;
+    iput-object p1, p0, Lcom/google/gson/internal/a/l;->aUL:Lcom/google/gson/o;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/l;->aUD:Lcom/google/gson/i;
+    iput-object p2, p0, Lcom/google/gson/internal/a/l;->aUM: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;->aUE:Lcom/google/gson/reflect/TypeToken;
+    iput-object p4, p0, Lcom/google/gson/internal/a/l;->aUN:Lcom/google/gson/reflect/TypeToken;
 
-    iput-object p5, p0, Lcom/google/gson/internal/a/l;->aUF:Lcom/google/gson/r;
+    iput-object p5, p0, Lcom/google/gson/internal/a/l;->aUO:Lcom/google/gson/r;
 
     return-void
 .end method
 
-.method private AN()Lcom/google/gson/TypeAdapter;
+.method private AQ()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;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aTh: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;->aUF:Lcom/google/gson/r;
+    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aUO:Lcom/google/gson/r;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUE:Lcom/google/gson/reflect/TypeToken;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUN: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;->aSY:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/a/l;->aTh:Lcom/google/gson/TypeAdapter;
 
     return-object v0
 .end method
@@ -159,9 +159,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object v1, p0, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aUD:Lcom/google/gson/i;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aUM:Lcom/google/gson/i;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AN()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AQ()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;->aUD:Lcom/google/gson/i;
+    iget-object p1, p0, Lcom/google/gson/internal/a/l;->aUM:Lcom/google/gson/i;
 
-    invoke-interface {p1}, Lcom/google/gson/i;->AE()Ljava/lang/Object;
+    invoke-interface {p1}, Lcom/google/gson/i;->AH()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -251,11 +251,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aUC:Lcom/google/gson/o;
+    iget-object v0, p0, Lcom/google/gson/internal/a/l;->aUL:Lcom/google/gson/o;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AN()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/a/l;->AQ()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;->aUE:Lcom/google/gson/reflect/TypeToken;
+    iget-object v1, p0, Lcom/google/gson/internal/a/l;->aUN:Lcom/google/gson/reflect/TypeToken;
 
-    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v1, v1, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUG:Lcom/google/gson/internal/a/l$a;
+    iget-object v2, p0, Lcom/google/gson/internal/a/l;->aUP: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 2b5af2ef2f..08465d94ff 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 aSY:Lcom/google/gson/TypeAdapter;
+.field private final aTh: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 aUL:Lcom/google/gson/Gson;
+.field private final aUU:Lcom/google/gson/Gson;
 
-.field private final aUM:Ljava/lang/reflect/Type;
+.field private final aUV: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;->aUL:Lcom/google/gson/Gson;
+    iput-object p1, p0, Lcom/google/gson/internal/a/m;->aUU:Lcom/google/gson/Gson;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/m;->aSY:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/m;->aTh:Lcom/google/gson/TypeAdapter;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/m;->aUM:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/a/m;->aUV:Ljava/lang/reflect/Type;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aTh: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;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aTh:Lcom/google/gson/TypeAdapter;
 
-    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aUM:Ljava/lang/reflect/Type;
+    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aUV: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;->aUM:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/a/m;->aUV:Ljava/lang/reflect/Type;
 
     if-eq v1, v2, :cond_2
 
-    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aUL:Lcom/google/gson/Gson;
+    iget-object v0, p0, Lcom/google/gson/internal/a/m;->aUU: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;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/m;->aTh: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 32639e08bc..a5e70c6ae7 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 aVN:Lcom/google/gson/TypeAdapter;
+.field final synthetic aVW:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aVO:Lcom/google/gson/internal/a/n$19;
+.field final synthetic aVX: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;->aVO:Lcom/google/gson/internal/a/n$19;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$19$1;->aVX:Lcom/google/gson/internal/a/n$19;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$19$1;->aVN:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$19$1;->aVW: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;->aVN:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aVW: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;->aVN:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$19$1;->aVW: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 c1565cb852..53362c5355 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;->aVZ:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 fdedbbf389..a8624fee36 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;->AF()Lcom/google/gson/m;
+    invoke-virtual {p2}, Lcom/google/gson/JsonElement;->AI()Lcom/google/gson/m;
 
     move-result-object p2
 
@@ -62,7 +62,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p2}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p2}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object p2
 
@@ -77,7 +77,7 @@
 
     if-eqz v0, :cond_2
 
-    invoke-virtual {p2}, Lcom/google/gson/m;->AD()Z
+    invoke-virtual {p2}, Lcom/google/gson/m;->AG()Z
 
     move-result p2
 
@@ -86,7 +86,7 @@
     return-void
 
     :cond_2
-    invoke-virtual {p2}, Lcom/google/gson/m;->Az()Ljava/lang/String;
+    invoke-virtual {p2}, Lcom/google/gson/m;->AC()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;->aTl:Lcom/google/gson/internal/LinkedTreeMap;
+    iget-object p2, p2, Lcom/google/gson/JsonObject;->aTu: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;->aTk:Lcom/google/gson/k;
+    sget-object p1, Lcom/google/gson/k;->aTt: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 25f869be1a..6f4ab1c59c 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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 63c38133bc..f9eb0311d0 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 aUt:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUC: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$25;->aUC: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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$25;->aUC: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$25;->aUC: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 f03e9e3731..1129540aea 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 aUt:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUC:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aVP:Ljava/lang/Class;
+.field final synthetic aVY:Ljava/lang/Class;
 
-.field final synthetic aVQ:Ljava/lang/Class;
+.field final synthetic aVZ: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;->aVP:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$26;->aVY:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVQ:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVZ:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/n$26;->aUt:Lcom/google/gson/TypeAdapter;
+    iput-object p3, p0, Lcom/google/gson/internal/a/n$26;->aUC: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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVP:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVY:Ljava/lang/Class;
 
     if-eq p1, p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVQ:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$26;->aVZ: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$26;->aUC: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;->aVQ:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aVZ: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;->aVP:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aVY: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$26;->aUC: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 0df1caf7c1..e7a27642e5 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 aUt:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUC:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aVR:Ljava/lang/Class;
+.field final synthetic aWa:Ljava/lang/Class;
 
-.field final synthetic aVS:Ljava/lang/Class;
+.field final synthetic aWb: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;->aVR:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$27;->aWa:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$27;->aVS:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$27;->aWb:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/a/n$27;->aUt:Lcom/google/gson/TypeAdapter;
+    iput-object p3, p0, Lcom/google/gson/internal/a/n$27;->aUC: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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aVR:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aWa:Ljava/lang/Class;
 
     if-eq p1, p2, :cond_1
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aVS:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$27;->aWb: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object p1, p0, Lcom/google/gson/internal/a/n$27;->aUC: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;->aVR:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aWa: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;->aVS:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aWb: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$27;->aUC: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 e93120a672..a1653cdb7c 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 aVU:Ljava/lang/Class;
+.field final synthetic aWd:Ljava/lang/Class;
 
-.field final synthetic aVV:Lcom/google/gson/internal/a/n$28;
+.field final synthetic aWe: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;->aVV:Lcom/google/gson/internal/a/n$28;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$28$1;->aWe:Lcom/google/gson/internal/a/n$28;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$28$1;->aVU:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$28$1;->aWd: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;->aVV:Lcom/google/gson/internal/a/n$28;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aWe:Lcom/google/gson/internal/a/n$28;
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUC: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;->aVU:Ljava/lang/Class;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aWd: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;->aVU:Ljava/lang/Class;
+    iget-object v2, p0, Lcom/google/gson/internal/a/n$28$1;->aWd: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;->aVV:Lcom/google/gson/internal/a/n$28;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$28$1;->aWe:Lcom/google/gson/internal/a/n$28;
 
-    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v0, v0, Lcom/google/gson/internal/a/n$28;->aUC: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 d4b45af2d5..9e7ba9616f 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 aUt:Lcom/google/gson/TypeAdapter;
+.field final synthetic aUC:Lcom/google/gson/TypeAdapter;
 
-.field final synthetic aVT:Ljava/lang/Class;
+.field final synthetic aWc: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;->aVT:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/internal/a/n$28;->aWc:Ljava/lang/Class;
 
-    iput-object p2, p0, Lcom/google/gson/internal/a/n$28;->aUt:Lcom/google/gson/TypeAdapter;
+    iput-object p2, p0, Lcom/google/gson/internal/a/n$28;->aUC: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;->aVZ:Ljava/lang/Class;
+    iget-object p1, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
-    iget-object p2, p0, Lcom/google/gson/internal/a/n$28;->aVT:Ljava/lang/Class;
+    iget-object p2, p0, Lcom/google/gson/internal/a/n$28;->aWc: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;->aVT:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aWc: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;->aUt:Lcom/google/gson/TypeAdapter;
+    iget-object v1, p0, Lcom/google/gson/internal/a/n$28;->aUC: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 e0847a713e..ad04df2413 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 aVW:Ljava/util/Map;
+.field private final aWf:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final aVX:Ljava/util/Map;
+.field private final aWg: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;->aVW:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWf: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;->aVX:Ljava/util/Map;
+    iput-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWg: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;->AJ()[Ljava/lang/String;
+    invoke-interface {v6}, Lcom/google/gson/a/c;->AM()[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;->aVW:Ljava/util/Map;
+    iget-object v10, p0, Lcom/google/gson/internal/a/n$a;->aWf: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;->aVW:Ljava/util/Map;
+    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aWf: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;->aVX:Ljava/util/Map;
+    iget-object v6, p0, Lcom/google/gson/internal/a/n$a;->aWg: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;->aVW:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWf: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;->aVX:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/a/n$a;->aWg: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 f7a687b098..a19cfbbace 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,69 +12,11 @@
 
 
 # static fields
-.field public static final aUN:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Class;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aUO:Lcom/google/gson/r;
-
-.field public static final aUP:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/BitSet;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aUQ:Lcom/google/gson/r;
-
-.field public static final aUR: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 aUS: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 aUT:Lcom/google/gson/r;
-
-.field public static final aUU: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 aUV:Lcom/google/gson/r;
-
 .field public static final aUW:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/lang/Class;",
             ">;"
         }
     .end annotation
@@ -86,7 +28,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/util/BitSet;",
             ">;"
         }
     .end annotation
@@ -94,31 +36,39 @@
 
 .field public static final aUZ:Lcom/google/gson/r;
 
-.field public static final aVA:Lcom/google/gson/r;
-
-.field public static final aVB:Lcom/google/gson/TypeAdapter;
+.field public static final aVA:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/UUID;",
+            "Ljava/lang/StringBuilder;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVC:Lcom/google/gson/r;
+.field public static final aVB:Lcom/google/gson/r;
 
-.field public static final aVD:Lcom/google/gson/TypeAdapter;
+.field public static final aVC:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/Currency;",
+            "Ljava/lang/StringBuffer;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVE:Lcom/google/gson/r;
+.field public static final aVD:Lcom/google/gson/r;
+
+.field public static final aVE: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 aVF:Lcom/google/gson/r;
 
@@ -126,7 +76,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/Calendar;",
+            "Ljava/net/URI;",
             ">;"
         }
     .end annotation
@@ -138,7 +88,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/Locale;",
+            "Ljava/net/InetAddress;",
             ">;"
         }
     .end annotation
@@ -150,7 +100,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Lcom/google/gson/JsonElement;",
+            "Ljava/util/UUID;",
             ">;"
         }
     .end annotation
@@ -158,45 +108,81 @@
 
 .field public static final aVL:Lcom/google/gson/r;
 
-.field public static final aVM:Lcom/google/gson/r;
+.field public static final aVM: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 aVN:Lcom/google/gson/r;
+
+.field public static final aVO:Lcom/google/gson/r;
+
+.field public static final aVP: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 aVQ:Lcom/google/gson/r;
+
+.field public static final aVR: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 aVS:Lcom/google/gson/r;
+
+.field public static final aVT: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 aVU:Lcom/google/gson/r;
+
+.field public static final aVV:Lcom/google/gson/r;
 
 .field public static final aVa:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicInteger;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVb:Lcom/google/gson/r;
-
-.field public static final aVc:Lcom/google/gson/TypeAdapter;
+.field public static final aVb:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/util/concurrent/atomic/AtomicBoolean;",
+            "Ljava/lang/Boolean;",
             ">;"
         }
     .end annotation
 .end field
 
-.field public static final aVd:Lcom/google/gson/r;
+.field public static final aVc:Lcom/google/gson/r;
 
-.field public static final aVe: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 aVf:Lcom/google/gson/r;
-
-.field public static final aVg:Lcom/google/gson/TypeAdapter;
+.field public static final aVd:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -206,6 +192,20 @@
     .end annotation
 .end field
 
+.field public static final aVe:Lcom/google/gson/r;
+
+.field public static final aVf: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 aVg:Lcom/google/gson/r;
+
 .field public static final aVh:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -216,21 +216,13 @@
     .end annotation
 .end field
 
-.field public static final aVi: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 aVi:Lcom/google/gson/r;
 
 .field public static final aVj:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Number;",
+            "Ljava/util/concurrent/atomic/AtomicInteger;",
             ">;"
         }
     .end annotation
@@ -242,7 +234,7 @@
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/Character;",
+            "Ljava/util/concurrent/atomic/AtomicBoolean;",
             ">;"
         }
     .end annotation
@@ -251,6 +243,72 @@
 .field public static final aVm:Lcom/google/gson/r;
 
 .field public static final aVn: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 aVo:Lcom/google/gson/r;
+
+.field public static final aVp: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 aVq: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 aVr: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 aVs: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 aVt:Lcom/google/gson/r;
+
+.field public static final aVu: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 aVv:Lcom/google/gson/r;
+
+.field public static final aVw:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -260,7 +318,7 @@
     .end annotation
 .end field
 
-.field public static final aVo:Lcom/google/gson/TypeAdapter;
+.field public static final aVx:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -270,7 +328,7 @@
     .end annotation
 .end field
 
-.field public static final aVp:Lcom/google/gson/TypeAdapter;
+.field public static final aVy:Lcom/google/gson/TypeAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/google/gson/TypeAdapter<",
@@ -280,65 +338,7 @@
     .end annotation
 .end field
 
-.field public static final aVq:Lcom/google/gson/r;
-
-.field public static final aVr:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/lang/StringBuilder;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aVs:Lcom/google/gson/r;
-
-.field public static final aVt: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 aVu:Lcom/google/gson/r;
-
-.field public static final aVv: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 aVw:Lcom/google/gson/r;
-
-.field public static final aVx:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/URI;",
-            ">;"
-        }
-    .end annotation
-.end field
-
-.field public static final aVy:Lcom/google/gson/r;
-
-.field public static final aVz:Lcom/google/gson/TypeAdapter;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lcom/google/gson/TypeAdapter<",
-            "Ljava/net/InetAddress;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field public static final aVz:Lcom/google/gson/r;
 
 
 # direct methods
@@ -353,17 +353,17 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aUN:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUW:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/lang/Class;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aUN:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aUW: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;->aUO:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUX: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;->aUP:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUY:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/BitSet;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aUP:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aUY: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;->aUQ:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aUZ: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;->aUR:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVa: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;->aUS:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVb: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;->aUR:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVa: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;->aUT:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVc: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;->aUU:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVd: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;->aUU:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVd: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;->aUV:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVe: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;->aUW:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVf: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;->aUW:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVf: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;->aUX:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVg: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;->aUY:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVh: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;->aUY:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVh: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;->aUZ:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVi:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$34;
 
@@ -471,83 +471,9 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVa:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/util/concurrent/atomic/AtomicInteger;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVa: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;->aVb:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$35;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$35;-><init>()V
-
-    invoke-virtual {v0}, Lcom/google/gson/internal/a/n$35;->nullSafe()Lcom/google/gson/TypeAdapter;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVc:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/util/concurrent/atomic/AtomicBoolean;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVc: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;->aVd:Lcom/google/gson/r;
-
-    new-instance v0, Lcom/google/gson/internal/a/n$2;
-
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$2;-><init>()V
-
-    invoke-virtual {v0}, Lcom/google/gson/internal/a/n$2;->nullSafe()Lcom/google/gson/TypeAdapter;
-
-    move-result-object v0
-
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVe:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/util/concurrent/atomic/AtomicIntegerArray;
-
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVe: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;->aVf: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;->aVg: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;->aVh: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;->aVi: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;->aVj:Lcom/google/gson/TypeAdapter;
 
-    const-class v0, Ljava/lang/Number;
+    const-class v0, Ljava/util/concurrent/atomic/AtomicInteger;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aVj:Lcom/google/gson/TypeAdapter;
 
@@ -557,43 +483,37 @@
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVk:Lcom/google/gson/r;
 
-    new-instance v0, Lcom/google/gson/internal/a/n$7;
+    new-instance v0, Lcom/google/gson/internal/a/n$35;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$7;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$35;-><init>()V
+
+    invoke-virtual {v0}, Lcom/google/gson/internal/a/n$35;->nullSafe()Lcom/google/gson/TypeAdapter;
+
+    move-result-object v0
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVl:Lcom/google/gson/TypeAdapter;
 
-    sget-object v0, Ljava/lang/Character;->TYPE:Ljava/lang/Class;
+    const-class v0, Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    const-class v1, Ljava/lang/Character;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVl:Lcom/google/gson/TypeAdapter;
 
-    sget-object v2, Lcom/google/gson/internal/a/n;->aVl: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;
+    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;->aVm:Lcom/google/gson/r;
 
-    new-instance v0, Lcom/google/gson/internal/a/n$8;
+    new-instance v0, Lcom/google/gson/internal/a/n$2;
 
-    invoke-direct {v0}, Lcom/google/gson/internal/a/n$8;-><init>()V
+    invoke-direct {v0}, Lcom/google/gson/internal/a/n$2;-><init>()V
+
+    invoke-virtual {v0}, Lcom/google/gson/internal/a/n$2;->nullSafe()Lcom/google/gson/TypeAdapter;
+
+    move-result-object v0
 
     sput-object v0, Lcom/google/gson/internal/a/n;->aVn: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;->aVo: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;->aVp:Lcom/google/gson/TypeAdapter;
-
-    const-class v0, Ljava/lang/String;
+    const-class v0, Ljava/util/concurrent/atomic/AtomicIntegerArray;
 
     sget-object v1, Lcom/google/gson/internal/a/n;->aVn:Lcom/google/gson/TypeAdapter;
 
@@ -601,103 +521,183 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVq:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVo: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;->aVp: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;->aVq: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;->aVr: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;->aVs:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/Number;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVs: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;->aVt: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;->aVu: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;->aVu: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;->aVv: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;->aVw: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;->aVx: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;->aVy:Lcom/google/gson/TypeAdapter;
+
+    const-class v0, Ljava/lang/String;
+
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVw: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;->aVz: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;->aVr:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVA:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/lang/StringBuilder;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVr:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVA: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;->aVs:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVB: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;->aVt:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVC:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/lang/StringBuffer;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVt:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVC: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;->aVu:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVD: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;->aVv:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVE:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/net/URL;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVv:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVE: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;->aVw:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVF: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;->aVx:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVG:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/net/URI;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVx:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVG: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;->aVy:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVH: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;->aVz:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVI:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/net/InetAddress;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVz:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVI: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;->aVA:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVJ: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;->aVB:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVK:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/UUID;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVB:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVK: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;->aVC:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVL:Lcom/google/gson/r;
 
     new-instance v0, Lcom/google/gson/internal/a/n$18;
 
@@ -707,79 +707,79 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/google/gson/internal/a/n;->aVD:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVM:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Currency;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVD:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVM: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;->aVE:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVN: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;->aVF:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVO: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;->aVG:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVP: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;->aVG:Lcom/google/gson/TypeAdapter;
+    sget-object v2, Lcom/google/gson/internal/a/n;->aVP: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;->aVH:Lcom/google/gson/r;
+    sput-object v3, Lcom/google/gson/internal/a/n;->aVQ: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;->aVI:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVR:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Ljava/util/Locale;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVI:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVR: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;->aVJ:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVS: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;->aVK:Lcom/google/gson/TypeAdapter;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVT:Lcom/google/gson/TypeAdapter;
 
     const-class v0, Lcom/google/gson/JsonElement;
 
-    sget-object v1, Lcom/google/gson/internal/a/n;->aVK:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVT: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;->aVL:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVU: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;->aVM:Lcom/google/gson/r;
+    sput-object v0, Lcom/google/gson/internal/a/n;->aVV: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 a86c1ec3d1..c1e6d44477 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;->aTr:[Ljava/lang/reflect/Type;
+    sget-object v0, Lcom/google/gson/internal/b;->aTA:[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 a5018cd4cc..24f6b8f5a4 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 aTr:[Ljava/lang/reflect/Type;
+.field static final aTA:[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;->aTr:[Ljava/lang/reflect/Type;
+    sput-object v0, Lcom/google/gson/internal/b;->aTA:[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;->aTr:[Ljava/lang/reflect/Type;
+    sget-object p2, Lcom/google/gson/internal/b;->aTA:[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 0d4438c7c6..4925039dcf 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 aTs:Lcom/google/gson/g;
+.field final synthetic aTB:Lcom/google/gson/g;
 
-.field final synthetic aTt:Ljava/lang/reflect/Type;
+.field final synthetic aTC:Ljava/lang/reflect/Type;
 
-.field final synthetic aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$1;->aTD:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$1;->aTs:Lcom/google/gson/g;
+    iput-object p2, p0, Lcom/google/gson/internal/c$1;->aTB:Lcom/google/gson/g;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$1;->aTt:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$1;->aTC:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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;->aTs:Lcom/google/gson/g;
+    iget-object v0, p0, Lcom/google/gson/internal/c$1;->aTB:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->Ax()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->AA()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 8d77e1b18a..5a54900410 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 aTt:Ljava/lang/reflect/Type;
+.field final synthetic aTC:Ljava/lang/reflect/Type;
 
-.field final synthetic aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$10;->aTD:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$10;->aTt:Ljava/lang/reflect/Type;
+    iput-object p2, p0, Lcom/google/gson/internal/c$10;->aTC:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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;->aTt:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/internal/c$10;->aTC: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;->aTt:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aTC: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;->aTt:Ljava/lang/reflect/Type;
+    iget-object v2, p0, Lcom/google/gson/internal/c$10;->aTC: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 371320c654..8b3bd56aac 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$11;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 345240cf73..b9f2f29daf 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$12;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 9574d41ab8..1cb6b2e6e9 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$13;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 d0eadc1ecb..f3bfdf7d87 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$14;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 f14a9217e0..4c233dbe26 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$2;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 b984042743..35bc569657 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$3;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 a5d21c1dd1..33b27b8539 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$4;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 945116af7e..c783972e00 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$5;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 dd14fb9a43..c14e977c25 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 aTt:Ljava/lang/reflect/Type;
+.field final synthetic aTC:Ljava/lang/reflect/Type;
 
-.field final synthetic aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD:Lcom/google/gson/internal/c;
 
-.field private final aTv:Lcom/google/gson/internal/j;
+.field private final aTE:Lcom/google/gson/internal/j;
 
-.field final synthetic aTw:Ljava/lang/Class;
+.field final synthetic aTF: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aTD:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$6;->aTw:Ljava/lang/Class;
+    iput-object p2, p0, Lcom/google/gson/internal/c$6;->aTF:Ljava/lang/Class;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$6;->aTt:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$6;->aTC:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    invoke-static {}, Lcom/google/gson/internal/j;->AP()Lcom/google/gson/internal/j;
+    invoke-static {}, Lcom/google/gson/internal/j;->AS()Lcom/google/gson/internal/j;
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aTv:Lcom/google/gson/internal/j;
+    iput-object p1, p0, Lcom/google/gson/internal/c$6;->aTE:Lcom/google/gson/internal/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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;->aTv:Lcom/google/gson/internal/j;
+    iget-object v0, p0, Lcom/google/gson/internal/c$6;->aTE:Lcom/google/gson/internal/j;
 
-    iget-object v1, p0, Lcom/google/gson/internal/c$6;->aTw:Ljava/lang/Class;
+    iget-object v1, p0, Lcom/google/gson/internal/c$6;->aTF: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;->aTt:Ljava/lang/reflect/Type;
+    iget-object v3, p0, Lcom/google/gson/internal/c$6;->aTC: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 056ea44b44..8429a76307 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 aTt:Ljava/lang/reflect/Type;
+.field final synthetic aTC:Ljava/lang/reflect/Type;
 
-.field final synthetic aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD:Lcom/google/gson/internal/c;
 
-.field final synthetic aTx:Lcom/google/gson/g;
+.field final synthetic aTG: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$7;->aTD:Lcom/google/gson/internal/c;
 
-    iput-object p2, p0, Lcom/google/gson/internal/c$7;->aTx:Lcom/google/gson/g;
+    iput-object p2, p0, Lcom/google/gson/internal/c$7;->aTG:Lcom/google/gson/g;
 
-    iput-object p3, p0, Lcom/google/gson/internal/c$7;->aTt:Ljava/lang/reflect/Type;
+    iput-object p3, p0, Lcom/google/gson/internal/c$7;->aTC:Ljava/lang/reflect/Type;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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;->aTx:Lcom/google/gson/g;
+    iget-object v0, p0, Lcom/google/gson/internal/c$7;->aTG:Lcom/google/gson/g;
 
-    invoke-interface {v0}, Lcom/google/gson/g;->Ax()Ljava/lang/Object;
+    invoke-interface {v0}, Lcom/google/gson/g;->AA()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 70fbc68d03..e650b0f99d 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$8;->aTD: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 AL()Ljava/lang/Object;
+.method public final AO()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 e86590df1a..69753a7bec 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 aTu:Lcom/google/gson/internal/c;
+.field final synthetic aTD: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;->aTu:Lcom/google/gson/internal/c;
+    iput-object p1, p0, Lcom/google/gson/internal/c$9;->aTD:Lcom/google/gson/internal/c;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final AL()Ljava/lang/Object;
+.method public final AO()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 d30b3072b2..f69ed97c6f 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 aTb:Ljava/util/Map;
+.field private final aTk: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;->aTb:Ljava/util/Map;
+    iput-object p1, p0, Lcom/google/gson/internal/c;->aTk:Ljava/util/Map;
 
     return-void
 .end method
@@ -100,11 +100,11 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p1, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
-    iget-object v1, p0, Lcom/google/gson/internal/c;->aTb:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/gson/internal/c;->aTk: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;->aTb:Ljava/util/Map;
+    iget-object v1, p0, Lcom/google/gson/internal/c;->aTk: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;->aVZ:Ljava/lang/Class;
+    iget-object v2, v2, Lcom/google/gson/reflect/TypeToken;->aWi: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;->aTb:Ljava/util/Map;
+    iget-object v0, p0, Lcom/google/gson/internal/c;->aTk: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 17dbae036e..97d9a8fd4c 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 aSY:Lcom/google/gson/TypeAdapter;
+.field final synthetic aTO:Z
+
+.field final synthetic aTP:Z
+
+.field final synthetic aTQ:Lcom/google/gson/Gson;
+
+.field final synthetic aTR:Lcom/google/gson/internal/d;
+
+.field private aTh: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 aTF:Z
-
-.field final synthetic aTG:Z
-
-.field final synthetic aTH:Lcom/google/gson/Gson;
-
-.field final synthetic aTI: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;->aTI:Lcom/google/gson/internal/d;
+    iput-object p1, p0, Lcom/google/gson/internal/d$1;->aTR:Lcom/google/gson/internal/d;
 
-    iput-boolean p2, p0, Lcom/google/gson/internal/d$1;->aTF:Z
+    iput-boolean p2, p0, Lcom/google/gson/internal/d$1;->aTO:Z
 
-    iput-boolean p3, p0, Lcom/google/gson/internal/d$1;->aTG:Z
+    iput-boolean p3, p0, Lcom/google/gson/internal/d$1;->aTP:Z
 
-    iput-object p4, p0, Lcom/google/gson/internal/d$1;->aTH:Lcom/google/gson/Gson;
+    iput-object p4, p0, Lcom/google/gson/internal/d$1;->aTQ: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 AN()Lcom/google/gson/TypeAdapter;
+.method private AQ()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;->aSY:Lcom/google/gson/TypeAdapter;
+    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aTh:Lcom/google/gson/TypeAdapter;
 
     if-eqz v0, :cond_0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aTH:Lcom/google/gson/Gson;
+    iget-object v0, p0, Lcom/google/gson/internal/d$1;->aTQ:Lcom/google/gson/Gson;
 
-    iget-object v1, p0, Lcom/google/gson/internal/d$1;->aTI:Lcom/google/gson/internal/d;
+    iget-object v1, p0, Lcom/google/gson/internal/d$1;->aTR: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;->aSY:Lcom/google/gson/TypeAdapter;
+    iput-object v0, p0, Lcom/google/gson/internal/d$1;->aTh: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;->aTF:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aTO:Z
 
     if-eqz v0, :cond_0
 
@@ -122,7 +122,7 @@
     return-object p1
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AN()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AQ()Lcom/google/gson/TypeAdapter;
 
     move-result-object v0
 
@@ -149,7 +149,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aTG:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d$1;->aTP:Z
 
     if-eqz v0, :cond_0
 
@@ -158,7 +158,7 @@
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AN()Lcom/google/gson/TypeAdapter;
+    invoke-direct {p0}, Lcom/google/gson/internal/d$1;->AQ()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 66ed170c45..3b5dc8b7e1 100644
--- a/com.discord/smali_classes2/com/google/gson/internal/d.smali
+++ b/com.discord/smali_classes2/com/google/gson/internal/d.smali
@@ -8,17 +8,19 @@
 
 
 # static fields
-.field public static final aTy:Lcom/google/gson/internal/d;
+.field public static final aTH:Lcom/google/gson/internal/d;
 
 
 # instance fields
-.field public aTA:I
+.field public aTI:D
 
-.field public aTB:Z
+.field public aTJ:I
 
-.field public aTC:Z
+.field public aTK:Z
 
-.field public aTD:Ljava/util/List;
+.field public aTL:Z
+
+.field public aTM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,7 +30,7 @@
     .end annotation
 .end field
 
-.field public aTE:Ljava/util/List;
+.field public aTN:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -38,8 +40,6 @@
     .end annotation
 .end field
 
-.field public aTz:D
-
 
 # direct methods
 .method static constructor <clinit>()V
@@ -49,7 +49,7 @@
 
     invoke-direct {v0}, Lcom/google/gson/internal/d;-><init>()V
 
-    sput-object v0, Lcom/google/gson/internal/d;->aTy:Lcom/google/gson/internal/d;
+    sput-object v0, Lcom/google/gson/internal/d;->aTH: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;->aTz:D
+    iput-wide v0, p0, Lcom/google/gson/internal/d;->aTI:D
 
     const/16 v0, 0x88
 
-    iput v0, p0, Lcom/google/gson/internal/d;->aTA:I
+    iput v0, p0, Lcom/google/gson/internal/d;->aTJ:I
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/google/gson/internal/d;->aTB:Z
+    iput-boolean v0, p0, Lcom/google/gson/internal/d;->aTK:Z
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/internal/d;->aTD:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/d;->aTM: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;->aTE:Ljava/util/List;
+    iput-object v0, p0, Lcom/google/gson/internal/d;->aTN:Ljava/util/List;
 
     return-void
 .end method
 
-.method private AM()Lcom/google/gson/internal/d;
+.method private AP()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;->AK()D
+    invoke-interface {p1}, Lcom/google/gson/a/d;->AN()D
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTz:D
+    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTI:D
 
     cmpl-double p1, v0, v2
 
@@ -241,11 +241,11 @@
 
     if-eqz p1, :cond_0
 
-    invoke-interface {p1}, Lcom/google/gson/a/e;->AK()D
+    invoke-interface {p1}, Lcom/google/gson/a/e;->AN()D
 
     move-result-wide v0
 
-    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTz:D
+    iget-wide v2, p0, Lcom/google/gson/internal/d;->aTI:D
 
     cmpg-double p1, v0, v2
 
@@ -298,7 +298,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lcom/google/gson/internal/d;->aTz:D
+    iget-wide v0, p0, Lcom/google/gson/internal/d;->aTI:D
 
     const/4 v2, 0x1
 
@@ -333,7 +333,7 @@
     return v2
 
     :cond_0
-    iget-boolean v0, p0, Lcom/google/gson/internal/d;->aTB:Z
+    iget-boolean v0, p0, Lcom/google/gson/internal/d;->aTK: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;->aTD:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/gson/internal/d;->aTM:Ljava/util/List;
 
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lcom/google/gson/internal/d;->aTE:Ljava/util/List;
+    iget-object p1, p0, Lcom/google/gson/internal/d;->aTN: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;->Av()Z
+    invoke-interface {p2}, Lcom/google/gson/b;->Ay()Z
 
     move-result p2
 
@@ -404,7 +404,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lcom/google/gson/internal/d;->AM()Lcom/google/gson/internal/d;
+    invoke-direct {p0}, Lcom/google/gson/internal/d;->AP()Lcom/google/gson/internal/d;
 
     move-result-object v0
 
@@ -426,7 +426,7 @@
         }
     .end annotation
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi: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 31c8a71d13..a6dafcc0c7 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 AL()Ljava/lang/Object;
+.method public abstract AO()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 92efe339ba..7c2bba9cc5 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 aTU:Ljava/util/Map;
+.field private static final aUd:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field private static final aTV:Ljava/util/Map;
+.field private static final aUe: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;->aTU:Ljava/util/Map;
+    sput-object v0, Lcom/google/gson/internal/h;->aUd: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;->aTV:Ljava/util/Map;
+    sput-object v0, Lcom/google/gson/internal/h;->aUe:Ljava/util/Map;
 
     return-void
 .end method
@@ -126,7 +126,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/internal/h;->aTU:Ljava/util/Map;
+    sget-object v0, Lcom/google/gson/internal/h;->aUd: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;->aTU:Ljava/util/Map;
+    sget-object v0, Lcom/google/gson/internal/h;->aUd: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 dcc7159775..c9dbdd30fb 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 aTW:Ljava/lang/Appendable;
+.field private final aUf:Ljava/lang/Appendable;
 
-.field private final aTX:Lcom/google/gson/internal/i$a$a;
+.field private final aUg: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;->aTX:Lcom/google/gson/internal/i$a$a;
+    iput-object v0, p0, Lcom/google/gson/internal/i$a;->aUg:Lcom/google/gson/internal/i$a$a;
 
-    iput-object p1, p0, Lcom/google/gson/internal/i$a;->aTW:Ljava/lang/Appendable;
+    iput-object p1, p0, Lcom/google/gson/internal/i$a;->aUf:Ljava/lang/Appendable;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aTW:Ljava/lang/Appendable;
+    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aUf:Ljava/lang/Appendable;
 
     int-to-char p1, p1
 
@@ -82,11 +82,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aTX:Lcom/google/gson/internal/i$a$a;
+    iget-object v0, p0, Lcom/google/gson/internal/i$a;->aUg: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;->aTW:Ljava/lang/Appendable;
+    iget-object p1, p0, Lcom/google/gson/internal/i$a;->aUf: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 711baf93e6..eb4b1ea7e9 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;->aVK:Lcom/google/gson/TypeAdapter;
+    sget-object v1, Lcom/google/gson/internal/a/n;->aVT: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;->aTk:Lcom/google/gson/k;
+    sget-object p0, Lcom/google/gson/k;->aTt:Lcom/google/gson/k;
 
     return-object p0
 
@@ -125,7 +125,7 @@
         }
     .end annotation
 
-    sget-object v0, Lcom/google/gson/internal/a/n;->aVK:Lcom/google/gson/TypeAdapter;
+    sget-object v0, Lcom/google/gson/internal/a/n;->aVT: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 ed62aec9ae..da41979320 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;->AP()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AS()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aTY:Ljava/lang/reflect/Method;
+.field final synthetic aUh:Ljava/lang/reflect/Method;
 
-.field final synthetic aTZ:Ljava/lang/Object;
+.field final synthetic aUi: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;->aTY:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$1;->aUh:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lcom/google/gson/internal/j$1;->aTZ:Ljava/lang/Object;
+    iput-object p2, p0, Lcom/google/gson/internal/j$1;->aUi: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;->M(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/j$1;->aTY:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$1;->aUh:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lcom/google/gson/internal/j$1;->aTZ:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/google/gson/internal/j$1;->aUi: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 88774b5c77..d89ebec8fa 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;->AP()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AS()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic aUa:Ljava/lang/reflect/Method;
+.field final synthetic aUj:Ljava/lang/reflect/Method;
 
-.field final synthetic aUb:I
+.field final synthetic aUk:I
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/reflect/Method;I)V
     .locals 0
 
-    iput-object p1, p0, Lcom/google/gson/internal/j$2;->aUa:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$2;->aUj:Ljava/lang/reflect/Method;
 
-    iput p2, p0, Lcom/google/gson/internal/j$2;->aUb:I
+    iput p2, p0, Lcom/google/gson/internal/j$2;->aUk:I
 
     invoke-direct {p0}, Lcom/google/gson/internal/j;-><init>()V
 
@@ -55,7 +55,7 @@
 
     invoke-static {p1}, Lcom/google/gson/internal/j$2;->M(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/j$2;->aUa:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$2;->aUj: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;->aUb:I
+    iget p1, p0, Lcom/google/gson/internal/j$2;->aUk: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 ced668df41..0ecfed8adb 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;->AP()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AS()Lcom/google/gson/internal/j;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic aUa:Ljava/lang/reflect/Method;
+.field final synthetic aUj: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;->aUa:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lcom/google/gson/internal/j$3;->aUj: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;->M(Ljava/lang/Class;)V
 
-    iget-object v0, p0, Lcom/google/gson/internal/j$3;->aUa:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lcom/google/gson/internal/j$3;->aUj: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 9b6277c4ee..7a9593906f 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;->AP()Lcom/google/gson/internal/j;
+    value = Lcom/google/gson/internal/j;->AS()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 d863420c90..5d383aaa2f 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 AP()Lcom/google/gson/internal/j;
+.method public static AS()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 f5f65b95dc..01fa01f0ba 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 aTk:Lcom/google/gson/k;
+.field public static final aTt: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;->aTk:Lcom/google/gson/k;
+    sput-object v0, Lcom/google/gson/k;->aTt: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 54244e4c7c..f56af817a1 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 aTm:[Ljava/lang/Class;
+.field private static final aTv:[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;->aTm:[Ljava/lang/Class;
+    sput-object v0, Lcom/google/gson/m;->aTv:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -232,7 +232,7 @@
 
     move-result-object p0
 
-    sget-object v0, Lcom/google/gson/m;->aTm:[Ljava/lang/Class;
+    sget-object v0, Lcom/google/gson/m;->aTv:[Ljava/lang/Class;
 
     array-length v2, v0
 
@@ -315,129 +315,7 @@
 
 
 # virtual methods
-.method public final AA()D
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
-    instance-of v0, v0, Ljava/lang/Number;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Number;->doubleValue()D
-
-    move-result-wide v0
-
-    return-wide v0
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/Double;->parseDouble(Ljava/lang/String;)D
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final AB()J
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
-    instance-of v0, v0, Ljava/lang/Number;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
-
-    move-result-wide v0
-
-    return-wide v0
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
-.method public final AC()I
-    .locals 1
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
-    instance-of v0, v0, Ljava/lang/Number;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final AD()Z
-    .locals 2
-
-    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
-
-    instance-of v1, v0, Ljava/lang/Boolean;
-
-    if-eqz v1, :cond_0
-
-    check-cast v0, Ljava/lang/Boolean;
-
-    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
-
-    move-result v0
-
-    return v0
-
-    :cond_0
-    invoke-virtual {p0}, Lcom/google/gson/m;->Az()Ljava/lang/String;
-
-    move-result-object v0
-
-    invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final Ay()Ljava/lang/Number;
+.method public final AB()Ljava/lang/Number;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -460,7 +338,7 @@
     return-object v0
 .end method
 
-.method public final Az()Ljava/lang/String;
+.method public final AC()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
@@ -469,7 +347,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -498,6 +376,128 @@
     return-object v0
 .end method
 
+.method public final AD()D
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+
+    instance-of v0, v0, Ljava/lang/Number;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Number;->doubleValue()D
+
+    move-result-wide v0
+
+    return-wide v0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/Double;->parseDouble(Ljava/lang/String;)D
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final AE()J
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+
+    instance-of v0, v0, Ljava/lang/Number;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+
+    move-result-wide v0
+
+    return-wide v0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final AF()I
+    .locals 1
+
+    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+
+    instance-of v0, v0, Ljava/lang/Number;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/Integer;->parseInt(Ljava/lang/String;)I
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final AG()Z
+    .locals 2
+
+    iget-object v0, p0, Lcom/google/gson/m;->value:Ljava/lang/Object;
+
+    instance-of v1, v0, Ljava/lang/Boolean;
+
+    if-eqz v1, :cond_0
+
+    check-cast v0, Ljava/lang/Boolean;
+
+    invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+    move-result v0
+
+    return v0
+
+    :cond_0
+    invoke-virtual {p0}, Lcom/google/gson/m;->AC()Ljava/lang/String;
+
+    move-result-object v0
+
+    invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
+
+    move-result v0
+
+    return v0
+.end method
+
 .method public final equals(Ljava/lang/Object;)Z
     .locals 6
 
@@ -553,7 +553,7 @@
 
     if-eqz v2, :cond_5
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -561,7 +561,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -591,7 +591,7 @@
 
     if-eqz v2, :cond_8
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object v2
 
@@ -599,7 +599,7 @@
 
     move-result-wide v2
 
-    invoke-virtual {p1}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p1}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object p1
 
@@ -668,7 +668,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()Ljava/lang/Number;
 
     move-result-object v0
 
@@ -692,7 +692,7 @@
 
     if-eqz v2, :cond_2
 
-    invoke-virtual {p0}, Lcom/google/gson/m;->Ay()Ljava/lang/Number;
+    invoke-virtual {p0}, Lcom/google/gson/m;->AB()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 fa85c7613a..e085d04a11 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 aTn:Lcom/google/gson/q;
+.field public static final enum aTw:Lcom/google/gson/q;
 
-.field public static final enum aTo:Lcom/google/gson/q;
+.field public static final enum aTx:Lcom/google/gson/q;
 
-.field private static final synthetic aTp:[Lcom/google/gson/q;
+.field private static final synthetic aTy:[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;->aTn:Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aTw: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;->aTo:Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aTx:Lcom/google/gson/q;
 
     const/4 v0, 0x2
 
     new-array v0, v0, [Lcom/google/gson/q;
 
-    sget-object v1, Lcom/google/gson/q;->aTn:Lcom/google/gson/q;
+    sget-object v1, Lcom/google/gson/q;->aTw:Lcom/google/gson/q;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lcom/google/gson/q;->aTo:Lcom/google/gson/q;
+    sget-object v1, Lcom/google/gson/q;->aTx:Lcom/google/gson/q;
 
     const/4 v2, 0x1
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lcom/google/gson/q;->aTp:[Lcom/google/gson/q;
+    sput-object v0, Lcom/google/gson/q;->aTy:[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;->aTp:[Lcom/google/gson/q;
+    sget-object v0, Lcom/google/gson/q;->aTy:[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 4e9d9af2c7..4971b2c041 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,11 @@
 
 
 # instance fields
-.field public final aUM:Ljava/lang/reflect/Type;
+.field public final aUV:Ljava/lang/reflect/Type;
 
-.field public final aVZ:Ljava/lang/Class;
+.field final aW:I
+
+.field public final aWi:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -26,8 +28,6 @@
     .end annotation
 .end field
 
-.field final aW:I
-
 
 # direct methods
 .method protected constructor <init>()V
@@ -61,17 +61,17 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aVZ:Ljava/lang/Class;
+    iput-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
-    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aUM:Ljava/lang/reflect/Type;
+    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
-    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aVZ:Ljava/lang/Class;
+    iput-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
-    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object p1, p0, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV:Ljava/lang/reflect/Type;
 
     check-cast p1, Lcom/google/gson/reflect/TypeToken;
 
-    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aUM:Ljava/lang/reflect/Type;
+    iget-object p1, p1, Lcom/google/gson/reflect/TypeToken;->aUV: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;->aUM:Ljava/lang/reflect/Type;
+    iget-object v0, p0, Lcom/google/gson/reflect/TypeToken;->aUV: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 f35ba42d70..ec2a60c926 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;->AQ()Ljava/lang/Object;
+    invoke-virtual {p1}, Lcom/google/gson/internal/a/e;->AT()Ljava/lang/Object;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/jpegkit/Jpeg.smali b/com.discord/smali_classes2/com/jpegkit/Jpeg.smali
index c5dddc7c72..424e3b4649 100644
--- a/com.discord/smali_classes2/com/jpegkit/Jpeg.smali
+++ b/com.discord/smali_classes2/com/jpegkit/Jpeg.smali
@@ -17,11 +17,11 @@
     .end annotation
 .end field
 
-.field private static final aWa:Ljava/lang/Object;
+.field private static final aWj:Ljava/lang/Object;
 
 
 # instance fields
-.field private aWb:Ljava/nio/ByteBuffer;
+.field private aWk:Ljava/nio/ByteBuffer;
 
 
 # direct methods
@@ -32,7 +32,7 @@
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lcom/jpegkit/Jpeg;->aWa:Ljava/lang/Object;
+    sput-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
 
     const-string v0, "jpegkit"
 
@@ -60,7 +60,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lcom/jpegkit/Jpeg;->aWa:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
 
     monitor-enter v0
 
@@ -69,7 +69,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/jpegkit/Jpeg;->aWb:Ljava/nio/ByteBuffer;
+    iput-object p1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
 
     monitor-exit v0
 
@@ -117,15 +117,15 @@
 
 
 # virtual methods
-.method public final AT()[B
+.method public final AW()[B
     .locals 2
 
-    sget-object v0, Lcom/jpegkit/Jpeg;->aWa:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWb:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
 
     invoke-direct {p0, v1}, Lcom/jpegkit/Jpeg;->jniGetJpegBytes(Ljava/nio/ByteBuffer;)[B
 
@@ -148,12 +148,12 @@
 .method public final cH(I)V
     .locals 2
 
-    sget-object v0, Lcom/jpegkit/Jpeg;->aWa:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWb:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
 
     invoke-direct {p0, v1, p1}, Lcom/jpegkit/Jpeg;->jniRotate(Ljava/nio/ByteBuffer;I)V
 
@@ -182,12 +182,12 @@
 .method public final release()V
     .locals 2
 
-    sget-object v0, Lcom/jpegkit/Jpeg;->aWa:Ljava/lang/Object;
+    sget-object v0, Lcom/jpegkit/Jpeg;->aWj:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWb:Ljava/nio/ByteBuffer;
+    iget-object v1, p0, Lcom/jpegkit/Jpeg;->aWk:Ljava/nio/ByteBuffer;
 
     invoke-direct {p0, v1}, Lcom/jpegkit/Jpeg;->jniRelease(Ljava/nio/ByteBuffer;)V
 
@@ -208,7 +208,7 @@
 .method public writeToParcel(Landroid/os/Parcel;I)V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/jpegkit/Jpeg;->AT()[B
+    invoke-virtual {p0}, Lcom/jpegkit/Jpeg;->AW()[B
 
     move-result-object p2
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali b/com.discord/smali_classes2/com/lytefast/flexinput/FlexInputCoordinator.smali
index 4b7d10332d..61b22f0d11 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 AU()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public abstract AX()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 04ecb69991..bcf31db9a0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali
@@ -729,455 +729,455 @@
 
 .field public static final layout_scrollInterpolator:I = 0x7f040253
 
-.field public static final liftOnScroll:I = 0x7f040258
+.field public static final liftOnScroll:I = 0x7f040259
 
-.field public static final lineHeight:I = 0x7f040259
+.field public static final lineHeight:I = 0x7f04025a
 
-.field public static final lineSpacing:I = 0x7f04025a
+.field public static final lineSpacing:I = 0x7f04025b
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
 
-.field public static final listDividerAlertDialog:I = 0x7f04025c
+.field public static final listDividerAlertDialog:I = 0x7f04025d
 
-.field public static final listItemLayout:I = 0x7f04025d
+.field public static final listItemLayout:I = 0x7f04025e
 
-.field public static final listLayout:I = 0x7f04025e
+.field public static final listLayout:I = 0x7f04025f
 
-.field public static final listMenuViewStyle:I = 0x7f04025f
+.field public static final listMenuViewStyle:I = 0x7f040260
 
-.field public static final listPopupWindowStyle:I = 0x7f040260
+.field public static final listPopupWindowStyle:I = 0x7f040261
 
-.field public static final listPreferredItemHeight:I = 0x7f040261
+.field public static final listPreferredItemHeight:I = 0x7f040262
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040262
+.field public static final listPreferredItemHeightLarge:I = 0x7f040263
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040263
+.field public static final listPreferredItemHeightSmall:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040265
+.field public static final listPreferredItemPaddingRight:I = 0x7f040266
 
-.field public static final logo:I = 0x7f040266
+.field public static final logo:I = 0x7f040267
 
-.field public static final logoDescription:I = 0x7f040267
+.field public static final logoDescription:I = 0x7f040268
 
-.field public static final materialButtonStyle:I = 0x7f040277
+.field public static final materialButtonStyle:I = 0x7f040278
 
-.field public static final materialCardViewStyle:I = 0x7f040278
+.field public static final materialCardViewStyle:I = 0x7f040279
 
-.field public static final maxActionInlineWidth:I = 0x7f040279
+.field public static final maxActionInlineWidth:I = 0x7f04027a
 
-.field public static final maxButtonHeight:I = 0x7f04027a
+.field public static final maxButtonHeight:I = 0x7f04027b
 
-.field public static final maxImageSize:I = 0x7f04027b
+.field public static final maxImageSize:I = 0x7f04027c
 
-.field public static final measureWithLargestChild:I = 0x7f04027d
+.field public static final measureWithLargestChild:I = 0x7f04027e
 
-.field public static final menu:I = 0x7f04027e
+.field public static final menu:I = 0x7f04027f
 
-.field public static final multiChoiceItemLayout:I = 0x7f04027f
+.field public static final multiChoiceItemLayout:I = 0x7f040280
 
-.field public static final navigationContentDescription:I = 0x7f040280
+.field public static final navigationContentDescription:I = 0x7f040281
 
-.field public static final navigationIcon:I = 0x7f040281
+.field public static final navigationIcon:I = 0x7f040282
 
-.field public static final navigationMode:I = 0x7f040282
+.field public static final navigationMode:I = 0x7f040283
 
-.field public static final navigationViewStyle:I = 0x7f040283
+.field public static final navigationViewStyle:I = 0x7f040284
 
-.field public static final numericModifiers:I = 0x7f040286
+.field public static final numericModifiers:I = 0x7f040287
 
-.field public static final overlapAnchor:I = 0x7f040287
+.field public static final overlapAnchor:I = 0x7f040288
 
-.field public static final overlayImage:I = 0x7f040288
+.field public static final overlayImage:I = 0x7f040289
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028b
+.field public static final paddingBottomNoButtons:I = 0x7f04028c
 
-.field public static final paddingEnd:I = 0x7f04028c
+.field public static final paddingEnd:I = 0x7f04028d
 
-.field public static final paddingStart:I = 0x7f04028d
+.field public static final paddingStart:I = 0x7f04028e
 
-.field public static final paddingTopNoTitle:I = 0x7f04028e
+.field public static final paddingTopNoTitle:I = 0x7f04028f
 
-.field public static final panelBackground:I = 0x7f04028f
+.field public static final panelBackground:I = 0x7f040290
 
-.field public static final panelMenuListTheme:I = 0x7f040290
+.field public static final panelMenuListTheme:I = 0x7f040291
 
-.field public static final panelMenuListWidth:I = 0x7f040291
+.field public static final panelMenuListWidth:I = 0x7f040292
 
-.field public static final passwordToggleContentDescription:I = 0x7f040292
+.field public static final passwordToggleContentDescription:I = 0x7f040293
 
-.field public static final passwordToggleDrawable:I = 0x7f040293
+.field public static final passwordToggleDrawable:I = 0x7f040294
 
-.field public static final passwordToggleEnabled:I = 0x7f040294
+.field public static final passwordToggleEnabled:I = 0x7f040295
 
-.field public static final passwordToggleTint:I = 0x7f040295
+.field public static final passwordToggleTint:I = 0x7f040296
 
-.field public static final passwordToggleTintMode:I = 0x7f040296
+.field public static final passwordToggleTintMode:I = 0x7f040297
 
-.field public static final placeholderImage:I = 0x7f040297
+.field public static final placeholderImage:I = 0x7f040298
 
-.field public static final placeholderImageScaleType:I = 0x7f040298
+.field public static final placeholderImageScaleType:I = 0x7f040299
 
-.field public static final popupMenuStyle:I = 0x7f040299
+.field public static final popupMenuStyle:I = 0x7f04029a
 
-.field public static final popupTheme:I = 0x7f04029a
+.field public static final popupTheme:I = 0x7f04029b
 
-.field public static final popupWindowStyle:I = 0x7f04029b
+.field public static final popupWindowStyle:I = 0x7f04029c
 
-.field public static final preserveIconSpacing:I = 0x7f04029c
+.field public static final preserveIconSpacing:I = 0x7f04029d
 
-.field public static final pressedStateOverlayImage:I = 0x7f04029d
+.field public static final pressedStateOverlayImage:I = 0x7f04029e
 
-.field public static final pressedTranslationZ:I = 0x7f04029e
+.field public static final pressedTranslationZ:I = 0x7f04029f
 
-.field public static final previewBackground:I = 0x7f04029f
+.field public static final previewBackground:I = 0x7f0402a0
 
-.field public static final progressBarAutoRotateInterval:I = 0x7f0402c5
+.field public static final progressBarAutoRotateInterval:I = 0x7f0402c6
 
-.field public static final progressBarImage:I = 0x7f0402c6
+.field public static final progressBarImage:I = 0x7f0402c7
 
-.field public static final progressBarImageScaleType:I = 0x7f0402c7
+.field public static final progressBarImageScaleType:I = 0x7f0402c8
 
-.field public static final progressBarPadding:I = 0x7f0402c8
+.field public static final progressBarPadding:I = 0x7f0402c9
 
-.field public static final progressBarStyle:I = 0x7f0402c9
+.field public static final progressBarStyle:I = 0x7f0402ca
 
-.field public static final queryBackground:I = 0x7f0402cc
+.field public static final queryBackground:I = 0x7f0402cd
 
-.field public static final queryHint:I = 0x7f0402cd
+.field public static final queryHint:I = 0x7f0402ce
 
-.field public static final radioButtonStyle:I = 0x7f0402ce
+.field public static final radioButtonStyle:I = 0x7f0402cf
 
-.field public static final ratingBarStyle:I = 0x7f0402d1
+.field public static final ratingBarStyle:I = 0x7f0402d2
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d3
+.field public static final ratingBarStyleSmall:I = 0x7f0402d4
 
-.field public static final retryImage:I = 0x7f0402d4
+.field public static final retryImage:I = 0x7f0402d5
 
-.field public static final retryImageScaleType:I = 0x7f0402d5
+.field public static final retryImageScaleType:I = 0x7f0402d6
 
-.field public static final reverseLayout:I = 0x7f0402d6
+.field public static final reverseLayout:I = 0x7f0402d7
 
-.field public static final rippleColor:I = 0x7f0402d7
+.field public static final rippleColor:I = 0x7f0402d8
 
-.field public static final roundAsCircle:I = 0x7f0402d8
+.field public static final roundAsCircle:I = 0x7f0402d9
 
-.field public static final roundBottomEnd:I = 0x7f0402d9
+.field public static final roundBottomEnd:I = 0x7f0402da
 
-.field public static final roundBottomLeft:I = 0x7f0402da
+.field public static final roundBottomLeft:I = 0x7f0402db
 
-.field public static final roundBottomRight:I = 0x7f0402db
+.field public static final roundBottomRight:I = 0x7f0402dc
 
-.field public static final roundBottomStart:I = 0x7f0402dc
+.field public static final roundBottomStart:I = 0x7f0402dd
 
-.field public static final roundTopEnd:I = 0x7f0402dd
+.field public static final roundTopEnd:I = 0x7f0402de
 
-.field public static final roundTopLeft:I = 0x7f0402de
+.field public static final roundTopLeft:I = 0x7f0402df
 
-.field public static final roundTopRight:I = 0x7f0402df
+.field public static final roundTopRight:I = 0x7f0402e0
 
-.field public static final roundTopStart:I = 0x7f0402e0
+.field public static final roundTopStart:I = 0x7f0402e1
 
-.field public static final roundWithOverlayColor:I = 0x7f0402e1
+.field public static final roundWithOverlayColor:I = 0x7f0402e2
 
-.field public static final roundedCornerRadius:I = 0x7f0402e2
+.field public static final roundedCornerRadius:I = 0x7f0402e3
 
-.field public static final roundingBorderColor:I = 0x7f0402e3
+.field public static final roundingBorderColor:I = 0x7f0402e4
 
-.field public static final roundingBorderPadding:I = 0x7f0402e4
+.field public static final roundingBorderPadding:I = 0x7f0402e5
 
-.field public static final roundingBorderWidth:I = 0x7f0402e5
+.field public static final roundingBorderWidth:I = 0x7f0402e6
 
-.field public static final scrimAnimationDuration:I = 0x7f0402f5
+.field public static final scrimAnimationDuration:I = 0x7f0402f6
 
-.field public static final scrimBackground:I = 0x7f0402f6
+.field public static final scrimBackground:I = 0x7f0402f7
 
-.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f7
+.field public static final scrimVisibleHeightTrigger:I = 0x7f0402f8
 
-.field public static final searchHintIcon:I = 0x7f0402f8
+.field public static final searchHintIcon:I = 0x7f0402f9
 
-.field public static final searchIcon:I = 0x7f0402f9
+.field public static final searchIcon:I = 0x7f0402fa
 
-.field public static final searchViewStyle:I = 0x7f0402fa
+.field public static final searchViewStyle:I = 0x7f0402fb
 
-.field public static final seekBarStyle:I = 0x7f0402fc
+.field public static final seekBarStyle:I = 0x7f0402fd
 
-.field public static final selectableItemBackground:I = 0x7f0402fd
+.field public static final selectableItemBackground:I = 0x7f0402fe
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
 
-.field public static final showAsAction:I = 0x7f040300
+.field public static final showAsAction:I = 0x7f040301
 
-.field public static final showDividers:I = 0x7f040304
+.field public static final showDividers:I = 0x7f040305
 
-.field public static final showMotionSpec:I = 0x7f040305
+.field public static final showMotionSpec:I = 0x7f040306
 
-.field public static final showText:I = 0x7f040306
+.field public static final showText:I = 0x7f040307
 
-.field public static final showTitle:I = 0x7f040307
+.field public static final showTitle:I = 0x7f040308
 
-.field public static final singleChoiceItemLayout:I = 0x7f040308
+.field public static final singleChoiceItemLayout:I = 0x7f040309
 
-.field public static final singleLine:I = 0x7f040309
+.field public static final singleLine:I = 0x7f04030a
 
-.field public static final singleSelection:I = 0x7f04030a
+.field public static final singleSelection:I = 0x7f04030b
 
-.field public static final snackbarButtonStyle:I = 0x7f04030b
+.field public static final snackbarButtonStyle:I = 0x7f04030c
 
-.field public static final snackbarStyle:I = 0x7f04030c
+.field public static final snackbarStyle:I = 0x7f04030d
 
-.field public static final spanCount:I = 0x7f04030d
+.field public static final spanCount:I = 0x7f04030e
 
-.field public static final spinBars:I = 0x7f04030e
+.field public static final spinBars:I = 0x7f04030f
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
+.field public static final spinnerDropDownItemStyle:I = 0x7f040310
 
-.field public static final spinnerStyle:I = 0x7f040310
+.field public static final spinnerStyle:I = 0x7f040311
 
-.field public static final splitTrack:I = 0x7f040311
+.field public static final splitTrack:I = 0x7f040312
 
-.field public static final srcCompat:I = 0x7f040312
+.field public static final srcCompat:I = 0x7f040313
 
-.field public static final stackFromEnd:I = 0x7f040313
+.field public static final stackFromEnd:I = 0x7f040314
 
-.field public static final state_above_anchor:I = 0x7f040314
+.field public static final state_above_anchor:I = 0x7f040315
 
-.field public static final state_collapsed:I = 0x7f040315
+.field public static final state_collapsed:I = 0x7f040316
 
-.field public static final state_collapsible:I = 0x7f040316
+.field public static final state_collapsible:I = 0x7f040317
 
-.field public static final state_liftable:I = 0x7f040317
+.field public static final state_liftable:I = 0x7f040318
 
-.field public static final state_lifted:I = 0x7f040318
+.field public static final state_lifted:I = 0x7f040319
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final statusBarScrim:I = 0x7f04031a
+.field public static final statusBarScrim:I = 0x7f04031b
 
-.field public static final strokeColor:I = 0x7f04031e
+.field public static final strokeColor:I = 0x7f04031f
 
-.field public static final strokeWidth:I = 0x7f04031f
+.field public static final strokeWidth:I = 0x7f040320
 
-.field public static final subMenuArrow:I = 0x7f040320
+.field public static final subMenuArrow:I = 0x7f040321
 
-.field public static final submitBackground:I = 0x7f040321
+.field public static final submitBackground:I = 0x7f040322
 
-.field public static final subtitle:I = 0x7f040322
+.field public static final subtitle:I = 0x7f040323
 
-.field public static final subtitleTextAppearance:I = 0x7f040323
+.field public static final subtitleTextAppearance:I = 0x7f040324
 
-.field public static final subtitleTextColor:I = 0x7f040324
+.field public static final subtitleTextColor:I = 0x7f040325
 
-.field public static final subtitleTextStyle:I = 0x7f040325
+.field public static final subtitleTextStyle:I = 0x7f040326
 
-.field public static final suggestionRowLayout:I = 0x7f040326
+.field public static final suggestionRowLayout:I = 0x7f040327
 
-.field public static final switchMinWidth:I = 0x7f040327
+.field public static final switchMinWidth:I = 0x7f040328
 
-.field public static final switchPadding:I = 0x7f040328
+.field public static final switchPadding:I = 0x7f040329
 
-.field public static final switchStyle:I = 0x7f040329
+.field public static final switchStyle:I = 0x7f04032a
 
-.field public static final switchTextAppearance:I = 0x7f04032a
+.field public static final switchTextAppearance:I = 0x7f04032b
 
-.field public static final tabBackground:I = 0x7f04032b
+.field public static final tabBackground:I = 0x7f04032c
 
-.field public static final tabContentStart:I = 0x7f04032c
+.field public static final tabContentStart:I = 0x7f04032d
 
-.field public static final tabGravity:I = 0x7f04032d
+.field public static final tabGravity:I = 0x7f04032e
 
-.field public static final tabIconTint:I = 0x7f04032e
+.field public static final tabIconTint:I = 0x7f04032f
 
-.field public static final tabIconTintMode:I = 0x7f04032f
+.field public static final tabIconTintMode:I = 0x7f040330
 
-.field public static final tabIndicator:I = 0x7f040330
+.field public static final tabIndicator:I = 0x7f040331
 
-.field public static final tabIndicatorAnimationDuration:I = 0x7f040331
+.field public static final tabIndicatorAnimationDuration:I = 0x7f040332
 
-.field public static final tabIndicatorColor:I = 0x7f040332
+.field public static final tabIndicatorColor:I = 0x7f040333
 
-.field public static final tabIndicatorFullWidth:I = 0x7f040333
+.field public static final tabIndicatorFullWidth:I = 0x7f040334
 
-.field public static final tabIndicatorGravity:I = 0x7f040334
+.field public static final tabIndicatorGravity:I = 0x7f040335
 
-.field public static final tabIndicatorHeight:I = 0x7f040335
+.field public static final tabIndicatorHeight:I = 0x7f040336
 
-.field public static final tabInlineLabel:I = 0x7f040336
+.field public static final tabInlineLabel:I = 0x7f040337
 
-.field public static final tabMaxWidth:I = 0x7f040337
+.field public static final tabMaxWidth:I = 0x7f040338
 
-.field public static final tabMinWidth:I = 0x7f040338
+.field public static final tabMinWidth:I = 0x7f040339
 
-.field public static final tabMode:I = 0x7f040339
+.field public static final tabMode:I = 0x7f04033a
 
-.field public static final tabPadding:I = 0x7f04033a
+.field public static final tabPadding:I = 0x7f04033b
 
-.field public static final tabPaddingBottom:I = 0x7f04033b
+.field public static final tabPaddingBottom:I = 0x7f04033c
 
-.field public static final tabPaddingEnd:I = 0x7f04033c
+.field public static final tabPaddingEnd:I = 0x7f04033d
 
-.field public static final tabPaddingStart:I = 0x7f04033d
+.field public static final tabPaddingStart:I = 0x7f04033e
 
-.field public static final tabPaddingTop:I = 0x7f04033e
+.field public static final tabPaddingTop:I = 0x7f04033f
 
-.field public static final tabRippleColor:I = 0x7f04033f
+.field public static final tabRippleColor:I = 0x7f040340
 
-.field public static final tabSelectedTextColor:I = 0x7f040340
+.field public static final tabSelectedTextColor:I = 0x7f040341
 
-.field public static final tabStyle:I = 0x7f040341
+.field public static final tabStyle:I = 0x7f040342
 
-.field public static final tabTextAppearance:I = 0x7f040342
+.field public static final tabTextAppearance:I = 0x7f040343
 
-.field public static final tabTextColor:I = 0x7f040343
+.field public static final tabTextColor:I = 0x7f040344
 
-.field public static final tabUnboundedRipple:I = 0x7f040344
+.field public static final tabUnboundedRipple:I = 0x7f040345
 
-.field public static final textAllCaps:I = 0x7f040348
+.field public static final textAllCaps:I = 0x7f040349
 
-.field public static final textAppearanceBody1:I = 0x7f040349
+.field public static final textAppearanceBody1:I = 0x7f04034a
 
-.field public static final textAppearanceBody2:I = 0x7f04034a
+.field public static final textAppearanceBody2:I = 0x7f04034b
 
-.field public static final textAppearanceButton:I = 0x7f04034b
+.field public static final textAppearanceButton:I = 0x7f04034c
 
-.field public static final textAppearanceCaption:I = 0x7f04034c
+.field public static final textAppearanceCaption:I = 0x7f04034d
 
-.field public static final textAppearanceHeadline1:I = 0x7f04034d
+.field public static final textAppearanceHeadline1:I = 0x7f04034e
 
-.field public static final textAppearanceHeadline2:I = 0x7f04034e
+.field public static final textAppearanceHeadline2:I = 0x7f04034f
 
-.field public static final textAppearanceHeadline3:I = 0x7f04034f
+.field public static final textAppearanceHeadline3:I = 0x7f040350
 
-.field public static final textAppearanceHeadline4:I = 0x7f040350
+.field public static final textAppearanceHeadline4:I = 0x7f040351
 
-.field public static final textAppearanceHeadline5:I = 0x7f040351
+.field public static final textAppearanceHeadline5:I = 0x7f040352
 
-.field public static final textAppearanceHeadline6:I = 0x7f040352
+.field public static final textAppearanceHeadline6:I = 0x7f040353
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
 
-.field public static final textAppearanceListItem:I = 0x7f040354
+.field public static final textAppearanceListItem:I = 0x7f040355
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040355
+.field public static final textAppearanceListItemSecondary:I = 0x7f040356
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040356
+.field public static final textAppearanceListItemSmall:I = 0x7f040357
 
-.field public static final textAppearanceOverline:I = 0x7f040357
+.field public static final textAppearanceOverline:I = 0x7f040358
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
 
-.field public static final textAppearanceSubtitle1:I = 0x7f04035c
+.field public static final textAppearanceSubtitle1:I = 0x7f04035d
 
-.field public static final textAppearanceSubtitle2:I = 0x7f04035d
+.field public static final textAppearanceSubtitle2:I = 0x7f04035e
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035e
+.field public static final textColorAlertDialogListItem:I = 0x7f04035f
 
-.field public static final textColorSearchUrl:I = 0x7f04035f
+.field public static final textColorSearchUrl:I = 0x7f040360
 
-.field public static final textEndPadding:I = 0x7f040360
+.field public static final textEndPadding:I = 0x7f040361
 
-.field public static final textInputStyle:I = 0x7f040361
+.field public static final textInputStyle:I = 0x7f040362
 
-.field public static final textStartPadding:I = 0x7f040362
+.field public static final textStartPadding:I = 0x7f040363
 
-.field public static final theme:I = 0x7f040364
+.field public static final theme:I = 0x7f040365
 
-.field public static final thickness:I = 0x7f0403b5
+.field public static final thickness:I = 0x7f0403b6
 
-.field public static final thumbTextPadding:I = 0x7f0403b6
+.field public static final thumbTextPadding:I = 0x7f0403b7
 
-.field public static final thumbTint:I = 0x7f0403b7
+.field public static final thumbTint:I = 0x7f0403b8
 
-.field public static final thumbTintMode:I = 0x7f0403b8
+.field public static final thumbTintMode:I = 0x7f0403b9
 
-.field public static final tickMark:I = 0x7f0403b9
+.field public static final tickMark:I = 0x7f0403ba
 
-.field public static final tickMarkTint:I = 0x7f0403ba
+.field public static final tickMarkTint:I = 0x7f0403bb
 
-.field public static final tickMarkTintMode:I = 0x7f0403bb
+.field public static final tickMarkTintMode:I = 0x7f0403bc
 
-.field public static final tint:I = 0x7f0403bc
+.field public static final tint:I = 0x7f0403bd
 
-.field public static final tintMode:I = 0x7f0403bd
+.field public static final tintMode:I = 0x7f0403be
 
-.field public static final title:I = 0x7f0403be
+.field public static final title:I = 0x7f0403bf
 
-.field public static final titleEnabled:I = 0x7f0403bf
+.field public static final titleEnabled:I = 0x7f0403c0
 
-.field public static final titleMargin:I = 0x7f0403c0
+.field public static final titleMargin:I = 0x7f0403c1
 
-.field public static final titleMarginBottom:I = 0x7f0403c1
+.field public static final titleMarginBottom:I = 0x7f0403c2
 
-.field public static final titleMarginEnd:I = 0x7f0403c2
+.field public static final titleMarginEnd:I = 0x7f0403c3
 
-.field public static final titleMarginStart:I = 0x7f0403c3
+.field public static final titleMarginStart:I = 0x7f0403c4
 
-.field public static final titleMarginTop:I = 0x7f0403c4
+.field public static final titleMarginTop:I = 0x7f0403c5
 
-.field public static final titleMargins:I = 0x7f0403c5
+.field public static final titleMargins:I = 0x7f0403c6
 
-.field public static final titleTextAppearance:I = 0x7f0403c6
+.field public static final titleTextAppearance:I = 0x7f0403c7
 
-.field public static final titleTextColor:I = 0x7f0403c7
+.field public static final titleTextColor:I = 0x7f0403c8
 
-.field public static final titleTextStyle:I = 0x7f0403c8
+.field public static final titleTextStyle:I = 0x7f0403c9
 
-.field public static final toolbarId:I = 0x7f0403c9
+.field public static final toolbarId:I = 0x7f0403ca
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403ca
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
-.field public static final toolbarStyle:I = 0x7f0403cb
+.field public static final toolbarStyle:I = 0x7f0403cc
 
-.field public static final tooltipForegroundColor:I = 0x7f0403cc
+.field public static final tooltipForegroundColor:I = 0x7f0403cd
 
-.field public static final tooltipFrameBackground:I = 0x7f0403cd
+.field public static final tooltipFrameBackground:I = 0x7f0403ce
 
-.field public static final tooltipText:I = 0x7f0403ce
+.field public static final tooltipText:I = 0x7f0403cf
 
-.field public static final track:I = 0x7f0403cf
+.field public static final track:I = 0x7f0403d0
 
-.field public static final trackTint:I = 0x7f0403d0
+.field public static final trackTint:I = 0x7f0403d1
 
-.field public static final trackTintMode:I = 0x7f0403d1
+.field public static final trackTintMode:I = 0x7f0403d2
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
-.field public static final useCompatPadding:I = 0x7f0403e6
+.field public static final useCompatPadding:I = 0x7f0403e7
 
-.field public static final viewAspectRatio:I = 0x7f0403ec
+.field public static final viewAspectRatio:I = 0x7f0403ed
 
-.field public static final viewInflaterClass:I = 0x7f0403ed
+.field public static final viewInflaterClass:I = 0x7f0403ee
 
-.field public static final voiceIcon:I = 0x7f0403ee
+.field public static final voiceIcon:I = 0x7f0403ef
 
-.field public static final windowActionBar:I = 0x7f0403f0
+.field public static final windowActionBar:I = 0x7f0403f1
 
-.field public static final windowActionBarOverlay:I = 0x7f0403f1
+.field public static final windowActionBarOverlay:I = 0x7f0403f2
 
-.field public static final windowActionModeOverlay:I = 0x7f0403f2
+.field public static final windowActionModeOverlay:I = 0x7f0403f3
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403f3
+.field public static final windowFixedHeightMajor:I = 0x7f0403f4
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403f4
+.field public static final windowFixedHeightMinor:I = 0x7f0403f5
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403f5
+.field public static final windowFixedWidthMajor:I = 0x7f0403f6
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403f6
+.field public static final windowFixedWidthMinor:I = 0x7f0403f7
 
-.field public static final windowMinWidthMajor:I = 0x7f0403f7
+.field public static final windowMinWidthMajor:I = 0x7f0403f8
 
-.field public static final windowMinWidthMinor:I = 0x7f0403f8
+.field public static final windowMinWidthMinor:I = 0x7f0403f9
 
-.field public static final windowNoTitle:I = 0x7f0403f9
+.field public static final windowNoTitle:I = 0x7f0403fa
 
 
 # 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 ebc45bdf00..fa8f5d191a 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$c.smali
@@ -75,213 +75,213 @@
 
 .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 = 0x7f06005b
+.field public static final design_bottom_navigation_shadow_color:I = 0x7f06005c
 
-.field public static final design_default_color_primary:I = 0x7f06005c
+.field public static final design_default_color_primary:I = 0x7f06005d
 
-.field public static final design_default_color_primary_dark:I = 0x7f06005d
+.field public static final design_default_color_primary_dark:I = 0x7f06005e
 
-.field public static final design_error:I = 0x7f06005e
+.field public static final design_error:I = 0x7f06005f
 
-.field public static final design_fab_shadow_end_color:I = 0x7f06005f
+.field public static final design_fab_shadow_end_color:I = 0x7f060060
 
-.field public static final design_fab_shadow_mid_color:I = 0x7f060060
+.field public static final design_fab_shadow_mid_color:I = 0x7f060061
 
-.field public static final design_fab_shadow_start_color:I = 0x7f060061
+.field public static final design_fab_shadow_start_color:I = 0x7f060062
 
-.field public static final design_fab_stroke_end_inner_color:I = 0x7f060062
+.field public static final design_fab_stroke_end_inner_color:I = 0x7f060063
 
-.field public static final design_fab_stroke_end_outer_color:I = 0x7f060063
+.field public static final design_fab_stroke_end_outer_color:I = 0x7f060064
 
-.field public static final design_fab_stroke_top_inner_color:I = 0x7f060064
+.field public static final design_fab_stroke_top_inner_color:I = 0x7f060065
 
-.field public static final design_fab_stroke_top_outer_color:I = 0x7f060065
+.field public static final design_fab_stroke_top_outer_color:I = 0x7f060066
 
-.field public static final design_snackbar_background_color:I = 0x7f060066
+.field public static final design_snackbar_background_color:I = 0x7f060067
 
-.field public static final design_tint_password_toggle:I = 0x7f060067
+.field public static final design_tint_password_toggle:I = 0x7f060068
 
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006c
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006d
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final flexInputIconColor:I = 0x7f06006f
+.field public static final flexInputIconColor:I = 0x7f060070
 
-.field public static final flexInputIconColorActivated:I = 0x7f060070
+.field public static final flexInputIconColorActivated:I = 0x7f060071
 
-.field public static final flexInputIconColorDisabled:I = 0x7f060071
+.field public static final flexInputIconColorDisabled:I = 0x7f060072
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009d
+.field public static final mtrl_bottom_nav_colored_item_tint:I = 0x7f06009e
 
-.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009e
+.field public static final mtrl_bottom_nav_item_tint:I = 0x7f06009f
 
-.field public static final mtrl_btn_bg_color_disabled:I = 0x7f06009f
+.field public static final mtrl_btn_bg_color_disabled:I = 0x7f0600a0
 
-.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a0
+.field public static final mtrl_btn_bg_color_selector:I = 0x7f0600a1
 
-.field public static final mtrl_btn_ripple_color:I = 0x7f0600a1
+.field public static final mtrl_btn_ripple_color:I = 0x7f0600a2
 
-.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a2
+.field public static final mtrl_btn_stroke_color_selector:I = 0x7f0600a3
 
-.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a3
+.field public static final mtrl_btn_text_btn_ripple_color:I = 0x7f0600a4
 
-.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a4
+.field public static final mtrl_btn_text_color_disabled:I = 0x7f0600a5
 
-.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a5
+.field public static final mtrl_btn_text_color_selector:I = 0x7f0600a6
 
-.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a6
+.field public static final mtrl_btn_transparent_bg_color:I = 0x7f0600a7
 
-.field public static final mtrl_chip_background_color:I = 0x7f0600a7
+.field public static final mtrl_chip_background_color:I = 0x7f0600a8
 
-.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a8
+.field public static final mtrl_chip_close_icon_tint:I = 0x7f0600a9
 
-.field public static final mtrl_chip_ripple_color:I = 0x7f0600a9
+.field public static final mtrl_chip_ripple_color:I = 0x7f0600aa
 
-.field public static final mtrl_chip_text_color:I = 0x7f0600aa
+.field public static final mtrl_chip_text_color:I = 0x7f0600ab
 
-.field public static final mtrl_fab_ripple_color:I = 0x7f0600ab
+.field public static final mtrl_fab_ripple_color:I = 0x7f0600ac
 
-.field public static final mtrl_scrim_color:I = 0x7f0600ac
+.field public static final mtrl_scrim_color:I = 0x7f0600ad
 
-.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ad
+.field public static final mtrl_tabs_colored_ripple_color:I = 0x7f0600ae
 
-.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600ae
+.field public static final mtrl_tabs_icon_color_selector:I = 0x7f0600af
 
-.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600af
+.field public static final mtrl_tabs_icon_color_selector_colored:I = 0x7f0600b0
 
-.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b0
+.field public static final mtrl_tabs_legacy_text_color_selector:I = 0x7f0600b1
 
-.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b1
+.field public static final mtrl_tabs_ripple_color:I = 0x7f0600b2
 
-.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b2
+.field public static final mtrl_text_btn_text_color_selector:I = 0x7f0600b3
 
-.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b3
+.field public static final mtrl_textinput_default_box_stroke_color:I = 0x7f0600b4
 
-.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b4
+.field public static final mtrl_textinput_disabled_color:I = 0x7f0600b5
 
-.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b5
+.field public static final mtrl_textinput_filled_box_default_background_color:I = 0x7f0600b6
 
-.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b6
+.field public static final mtrl_textinput_hovered_box_stroke_color:I = 0x7f0600b7
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tab_color_selector:I = 0x7f060133
+.field public static final tab_color_selector:I = 0x7f060134
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
 
 # 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 34b0f3abab..f7c014379c 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.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 design_bottom_navigation_item_background:I = 0x7f0800b4
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800b5
 
-.field public static final design_fab_background:I = 0x7f0800b5
+.field public static final design_fab_background:I = 0x7f0800b6
 
-.field public static final design_ic_visibility:I = 0x7f0800b6
+.field public static final design_ic_visibility:I = 0x7f0800b7
 
-.field public static final design_ic_visibility_off:I = 0x7f0800b7
+.field public static final design_ic_visibility_off:I = 0x7f0800b8
 
-.field public static final design_password_eye:I = 0x7f0800b8
+.field public static final design_password_eye:I = 0x7f0800b9
 
-.field public static final design_snackbar_background:I = 0x7f0800b9
+.field public static final design_snackbar_background:I = 0x7f0800ba
 
-.field public static final file_item_selection_indicator_btn:I = 0x7f0801af
+.field public static final file_item_selection_indicator_btn:I = 0x7f0801ba
 
-.field public static final ic_add_24dp:I = 0x7f0801cb
+.field public static final ic_add_24dp:I = 0x7f0801d6
 
-.field public static final ic_add_a_photo_24dp:I = 0x7f0801cc
+.field public static final ic_add_a_photo_24dp:I = 0x7f0801d7
 
-.field public static final ic_arrow_back_24dp:I = 0x7f0801d8
+.field public static final ic_arrow_back_24dp:I = 0x7f0801e3
 
-.field public static final ic_attach_file_24dp:I = 0x7f0801df
+.field public static final ic_attach_file_24dp:I = 0x7f0801ea
 
-.field public static final ic_audio_24dp:I = 0x7f0801e2
+.field public static final ic_audio_24dp:I = 0x7f0801ed
 
-.field public static final ic_camera_front_white_24dp:I = 0x7f080213
+.field public static final ic_camera_front_white_24dp:I = 0x7f08021e
 
-.field public static final ic_camera_rear_white_24dp:I = 0x7f080214
+.field public static final ic_camera_rear_white_24dp:I = 0x7f08021f
 
-.field public static final ic_check_circle_24dp:I = 0x7f08022c
+.field public static final ic_check_circle_24dp:I = 0x7f080237
 
-.field public static final ic_clear_24dp:I = 0x7f080237
+.field public static final ic_clear_24dp:I = 0x7f080243
 
-.field public static final ic_done_activated_24dp:I = 0x7f080250
+.field public static final ic_done_activated_24dp:I = 0x7f08025c
 
-.field public static final ic_file_24dp:I = 0x7f080276
+.field public static final ic_file_24dp:I = 0x7f080282
 
-.field public static final ic_file_upload_24dp:I = 0x7f080285
+.field public static final ic_file_upload_24dp:I = 0x7f080291
 
-.field public static final ic_flash_auto_24dp:I = 0x7f08028a
+.field public static final ic_flash_auto_24dp:I = 0x7f080296
 
-.field public static final ic_flash_off_24dp:I = 0x7f08028b
+.field public static final ic_flash_off_24dp:I = 0x7f080297
 
-.field public static final ic_flash_on_24dp:I = 0x7f08028c
+.field public static final ic_flash_on_24dp:I = 0x7f080298
 
-.field public static final ic_gif_24dp:I = 0x7f080294
+.field public static final ic_gif_24dp:I = 0x7f0802a0
 
-.field public static final ic_image_24dp:I = 0x7f0802c6
+.field public static final ic_image_24dp:I = 0x7f0802d2
 
-.field public static final ic_insert_emoticon_24dp:I = 0x7f0802cf
+.field public static final ic_insert_emoticon_24dp:I = 0x7f0802db
 
-.field public static final ic_keyboard_24dp:I = 0x7f0802d5
+.field public static final ic_keyboard_24dp:I = 0x7f0802e1
 
-.field public static final ic_launch_24dp:I = 0x7f0802d6
+.field public static final ic_launch_24dp:I = 0x7f0802e2
 
-.field public static final ic_movie_24dp:I = 0x7f0802fb
+.field public static final ic_movie_24dp:I = 0x7f080307
 
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f0802fc
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080308
 
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f0802fd
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080309
 
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f0802fe
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08030a
 
-.field public static final ic_send_24dp:I = 0x7f080366
+.field public static final ic_send_24dp:I = 0x7f080372
 
-.field public static final ic_take_photo:I = 0x7f080387
+.field public static final ic_take_photo:I = 0x7f080394
 
-.field public static final mtrl_snackbar_background:I = 0x7f080461
+.field public static final mtrl_snackbar_background:I = 0x7f08046f
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080462
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080470
 
-.field public static final navigation_empty_icon:I = 0x7f080463
+.field public static final navigation_empty_icon:I = 0x7f080471
 
-.field public static final notification_action_background:I = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
 
 # 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 0f3e2c3cfa..0eecc4911c 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$e.smali
@@ -129,19 +129,19 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final attachment_clear_btn:I = 0x7f0a0080
+.field public static final attachment_clear_btn:I = 0x7f0a0081
 
-.field public static final attachment_preview_container:I = 0x7f0a0081
+.field public static final attachment_preview_container:I = 0x7f0a0082
 
-.field public static final attachment_preview_list:I = 0x7f0a0082
+.field public static final attachment_preview_list:I = 0x7f0a0083
 
-.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
 
@@ -165,347 +165,347 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final container:I = 0x7f0a0230
+.field public static final container:I = 0x7f0a0233
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final content_iv:I = 0x7f0a0233
+.field public static final content_iv:I = 0x7f0a0236
 
-.field public static final content_pager:I = 0x7f0a0234
+.field public static final content_pager:I = 0x7f0a0237
 
-.field public static final content_tabs:I = 0x7f0a0235
+.field public static final content_tabs:I = 0x7f0a0238
 
-.field public static final continuous:I = 0x7f0a0236
+.field public static final continuous:I = 0x7f0a0239
 
-.field public static final coordinator:I = 0x7f0a0237
+.field public static final coordinator:I = 0x7f0a023a
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final design_bottom_sheet:I = 0x7f0a0256
+.field public static final design_bottom_sheet:I = 0x7f0a0259
 
-.field public static final design_menu_item_action_area:I = 0x7f0a0257
+.field public static final design_menu_item_action_area:I = 0x7f0a025a
 
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a0258
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a025b
 
-.field public static final design_menu_item_text:I = 0x7f0a0259
+.field public static final design_menu_item_text:I = 0x7f0a025c
 
-.field public static final design_navigation_view:I = 0x7f0a025a
+.field public static final design_navigation_view:I = 0x7f0a025d
 
-.field public static final dialog_button:I = 0x7f0a025b
+.field public static final dialog_button:I = 0x7f0a025e
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final emoji_btn:I = 0x7f0a02b1
+.field public static final emoji_btn:I = 0x7f0a02b4
 
-.field public static final emoji_container:I = 0x7f0a02b2
+.field public static final emoji_container:I = 0x7f0a02b5
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final file_name_tv:I = 0x7f0a02de
+.field public static final file_name_tv:I = 0x7f0a02e2
 
-.field public static final file_subtitle_tv:I = 0x7f0a02df
+.field public static final file_subtitle_tv:I = 0x7f0a02e3
 
-.field public static final fill:I = 0x7f0a02e0
+.field public static final fill:I = 0x7f0a02e4
 
-.field public static final filled:I = 0x7f0a02e3
+.field public static final filled:I = 0x7f0a02e7
 
-.field public static final fitBottomStart:I = 0x7f0a02e4
+.field public static final fitBottomStart:I = 0x7f0a02e8
 
-.field public static final fitCenter:I = 0x7f0a02e5
+.field public static final fitCenter:I = 0x7f0a02e9
 
-.field public static final fitEnd:I = 0x7f0a02e6
+.field public static final fitEnd:I = 0x7f0a02ea
 
-.field public static final fitStart:I = 0x7f0a02e7
+.field public static final fitStart:I = 0x7f0a02eb
 
-.field public static final fitXY:I = 0x7f0a02e8
+.field public static final fitXY:I = 0x7f0a02ec
 
-.field public static final fixed:I = 0x7f0a02e9
+.field public static final fixed:I = 0x7f0a02ed
 
-.field public static final focusCrop:I = 0x7f0a02ec
+.field public static final focusCrop:I = 0x7f0a02f0
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final front:I = 0x7f0a0311
+.field public static final front:I = 0x7f0a0315
 
-.field public static final ghost_view:I = 0x7f0a0312
+.field public static final ghost_view:I = 0x7f0a0316
 
-.field public static final gone:I = 0x7f0a0324
+.field public static final gone:I = 0x7f0a032c
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final invisible:I = 0x7f0a03b2
+.field public static final invisible:I = 0x7f0a03ba
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final item_check_indicator:I = 0x7f0a03d3
+.field public static final item_check_indicator:I = 0x7f0a03db
 
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0405
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a040d
 
-.field public static final labeled:I = 0x7f0a040c
+.field public static final labeled:I = 0x7f0a0414
 
-.field public static final largeLabel:I = 0x7f0a040d
+.field public static final largeLabel:I = 0x7f0a0415
 
-.field public static final launch_btn:I = 0x7f0a040e
+.field public static final launch_btn:I = 0x7f0a0416
 
-.field public static final launch_camera_btn:I = 0x7f0a040f
+.field public static final launch_camera_btn:I = 0x7f0a0417
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final list:I = 0x7f0a0417
+.field public static final list:I = 0x7f0a041f
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final main_input_container:I = 0x7f0a041f
+.field public static final main_input_container:I = 0x7f0a0427
 
-.field public static final masked:I = 0x7f0a0437
+.field public static final masked:I = 0x7f0a043f
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final mini:I = 0x7f0a0480
+.field public static final mini:I = 0x7f0a048a
 
-.field public static final mtrl_child_content_container:I = 0x7f0a0481
+.field public static final mtrl_child_content_container:I = 0x7f0a048b
 
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a0482
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a048c
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final navigation_header_container:I = 0x7f0a0485
+.field public static final navigation_header_container:I = 0x7f0a048f
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final off:I = 0x7f0a04c4
+.field public static final off:I = 0x7f0a04ce
 
-.field public static final on:I = 0x7f0a04c6
+.field public static final on:I = 0x7f0a04d0
 
-.field public static final outline:I = 0x7f0a04c7
+.field public static final outline:I = 0x7f0a04d1
 
-.field public static final packed:I = 0x7f0a04d4
+.field public static final packed:I = 0x7f0a04de
 
-.field public static final page_tabs:I = 0x7f0a04d5
+.field public static final page_tabs:I = 0x7f0a04df
 
-.field public static final parallax:I = 0x7f0a04d6
+.field public static final parallax:I = 0x7f0a04e0
 
-.field public static final parent:I = 0x7f0a04d7
+.field public static final parent:I = 0x7f0a04e1
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final parent_matrix:I = 0x7f0a04d9
+.field public static final parent_matrix:I = 0x7f0a04e3
 
-.field public static final percent:I = 0x7f0a050a
+.field public static final percent:I = 0x7f0a0515
 
-.field public static final permissions_container:I = 0x7f0a0513
+.field public static final permissions_container:I = 0x7f0a051e
 
-.field public static final permissions_req_btn:I = 0x7f0a0514
+.field public static final permissions_req_btn:I = 0x7f0a051f
 
-.field public static final pin:I = 0x7f0a0515
+.field public static final pin:I = 0x7f0a0520
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final save_image_matrix:I = 0x7f0a05a3
+.field public static final save_image_matrix:I = 0x7f0a05b8
 
-.field public static final save_non_transition_alpha:I = 0x7f0a05a4
+.field public static final save_non_transition_alpha:I = 0x7f0a05b9
 
-.field public static final save_scale_type:I = 0x7f0a05a5
+.field public static final save_scale_type:I = 0x7f0a05ba
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final scrollable:I = 0x7f0a05ad
+.field public static final scrollable:I = 0x7f0a05c2
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final selected:I = 0x7f0a05cb
+.field public static final selected:I = 0x7f0a05e0
 
-.field public static final selection_indicator:I = 0x7f0a05cd
+.field public static final selection_indicator:I = 0x7f0a05e2
 
-.field public static final send_btn:I = 0x7f0a05ce
+.field public static final send_btn:I = 0x7f0a05e3
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final smallLabel:I = 0x7f0a0708
+.field public static final smallLabel:I = 0x7f0a071d
 
-.field public static final snackbar_action:I = 0x7f0a0709
+.field public static final snackbar_action:I = 0x7f0a071e
 
-.field public static final snackbar_text:I = 0x7f0a070a
+.field public static final snackbar_text:I = 0x7f0a071f
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final spread:I = 0x7f0a0712
+.field public static final spread:I = 0x7f0a072d
 
-.field public static final spread_inside:I = 0x7f0a0713
+.field public static final spread_inside:I = 0x7f0a072e
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final stretch:I = 0x7f0a0730
+.field public static final stretch:I = 0x7f0a0754
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final swipeRefreshLayout:I = 0x7f0a073b
+.field public static final swipeRefreshLayout:I = 0x7f0a075f
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_accessibility_actions:I = 0x7f0a073e
+.field public static final tag_accessibility_actions:I = 0x7f0a0762
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a073f
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0763
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0740
+.field public static final tag_accessibility_heading:I = 0x7f0a0764
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0741
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0765
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0742
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0766
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final take_photo_btn:I = 0x7f0a0746
+.field public static final take_photo_btn:I = 0x7f0a076a
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_input:I = 0x7f0a0750
+.field public static final text_input:I = 0x7f0a0774
 
-.field public static final text_input_password_toggle:I = 0x7f0a0751
+.field public static final text_input_password_toggle:I = 0x7f0a0775
 
-.field public static final textinput_counter:I = 0x7f0a0754
+.field public static final textinput_counter:I = 0x7f0a0778
 
-.field public static final textinput_error:I = 0x7f0a0755
+.field public static final textinput_error:I = 0x7f0a0779
 
-.field public static final textinput_helper_text:I = 0x7f0a0756
+.field public static final textinput_helper_text:I = 0x7f0a077a
 
-.field public static final thumb_iv:I = 0x7f0a0757
+.field public static final thumb_iv:I = 0x7f0a077b
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final torch:I = 0x7f0a0763
+.field public static final torch:I = 0x7f0a0787
 
-.field public static final touch_outside:I = 0x7f0a0764
+.field public static final touch_outside:I = 0x7f0a0788
 
-.field public static final transition_current_scene:I = 0x7f0a0765
+.field public static final transition_current_scene:I = 0x7f0a0789
 
-.field public static final transition_layout_save:I = 0x7f0a0766
+.field public static final transition_layout_save:I = 0x7f0a078a
 
-.field public static final transition_position:I = 0x7f0a0767
+.field public static final transition_position:I = 0x7f0a078b
 
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0768
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a078c
 
-.field public static final transition_transform:I = 0x7f0a0769
+.field public static final transition_transform:I = 0x7f0a078d
 
-.field public static final type_iv:I = 0x7f0a076d
+.field public static final type_iv:I = 0x7f0a0791
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final unlabeled:I = 0x7f0a0776
+.field public static final unlabeled:I = 0x7f0a079a
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_offset_helper:I = 0x7f0a07ff
+.field public static final view_offset_helper:I = 0x7f0a082e
 
-.field public static final view_pager:I = 0x7f0a0801
+.field public static final view_pager:I = 0x7f0a0830
 
-.field public static final visible:I = 0x7f0a0802
+.field public static final visible:I = 0x7f0a0831
 
-.field public static final wrap:I = 0x7f0a0850
+.field public static final wrap:I = 0x7f0a0880
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
 
 # 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 16312d1003..87c192b3ac 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$f.smali
@@ -71,81 +71,81 @@
 
 .field public static final abc_tooltip:I = 0x7f0d001b
 
-.field public static final custom_dialog:I = 0x7f0d0022
+.field public static final custom_dialog:I = 0x7f0d0023
 
-.field public static final design_bottom_navigation_item:I = 0x7f0d0023
+.field public static final design_bottom_navigation_item:I = 0x7f0d0024
 
-.field public static final design_bottom_sheet_dialog:I = 0x7f0d0024
+.field public static final design_bottom_sheet_dialog:I = 0x7f0d0025
 
-.field public static final design_layout_snackbar:I = 0x7f0d0025
+.field public static final design_layout_snackbar:I = 0x7f0d0026
 
-.field public static final design_layout_snackbar_include:I = 0x7f0d0026
+.field public static final design_layout_snackbar_include:I = 0x7f0d0027
 
-.field public static final design_layout_tab_icon:I = 0x7f0d0027
+.field public static final design_layout_tab_icon:I = 0x7f0d0028
 
-.field public static final design_layout_tab_text:I = 0x7f0d0028
+.field public static final design_layout_tab_text:I = 0x7f0d0029
 
-.field public static final design_menu_item_action_area:I = 0x7f0d0029
+.field public static final design_menu_item_action_area:I = 0x7f0d002a
 
-.field public static final design_navigation_item:I = 0x7f0d002a
+.field public static final design_navigation_item:I = 0x7f0d002b
 
-.field public static final design_navigation_item_header:I = 0x7f0d002b
+.field public static final design_navigation_item_header:I = 0x7f0d002c
 
-.field public static final design_navigation_item_separator:I = 0x7f0d002c
+.field public static final design_navigation_item_separator:I = 0x7f0d002d
 
-.field public static final design_navigation_item_subheader:I = 0x7f0d002d
+.field public static final design_navigation_item_subheader:I = 0x7f0d002e
 
-.field public static final design_navigation_menu:I = 0x7f0d002e
+.field public static final design_navigation_menu:I = 0x7f0d002f
 
-.field public static final design_navigation_menu_item:I = 0x7f0d002f
+.field public static final design_navigation_menu_item:I = 0x7f0d0030
 
-.field public static final design_text_input_password_icon:I = 0x7f0d0030
+.field public static final design_text_input_password_icon:I = 0x7f0d0031
 
-.field public static final dialog_add_content_pager_with_fab:I = 0x7f0d0031
+.field public static final dialog_add_content_pager_with_fab:I = 0x7f0d0032
 
-.field public static final flex_input_widget:I = 0x7f0d0036
+.field public static final flex_input_widget:I = 0x7f0d0037
 
-.field public static final fragment_camera:I = 0x7f0d0037
+.field public static final fragment_camera:I = 0x7f0d0038
 
-.field public static final fragment_paged_grid:I = 0x7f0d0038
+.field public static final fragment_paged_grid:I = 0x7f0d0039
 
-.field public static final fragment_recycler_view:I = 0x7f0d0039
+.field public static final fragment_recycler_view:I = 0x7f0d003a
 
-.field public static final item_permission_storage:I = 0x7f0d003c
+.field public static final item_permission_storage:I = 0x7f0d003e
 
-.field public static final mtrl_layout_snackbar:I = 0x7f0d0041
+.field public static final mtrl_layout_snackbar:I = 0x7f0d0043
 
-.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0042
+.field public static final mtrl_layout_snackbar_include:I = 0x7f0d0044
 
-.field public static final notification_action:I = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final view_attachment_preview_item:I = 0x7f0d0071
+.field public static final view_attachment_preview_item:I = 0x7f0d0075
 
-.field public static final view_camera_permissions:I = 0x7f0d0076
+.field public static final view_camera_permissions:I = 0x7f0d007a
 
-.field public static final view_emoji_item:I = 0x7f0d0082
+.field public static final view_emoji_item:I = 0x7f0d0087
 
-.field public static final view_file_item:I = 0x7f0d0083
+.field public static final view_file_item:I = 0x7f0d0088
 
-.field public static final view_grid_image:I = 0x7f0d0087
+.field public static final view_grid_image:I = 0x7f0d008d
 
 
 # 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 84e4b7ad98..a7b4eda963 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -99,71 +99,71 @@
 
 .field public static final appbar_scrolling_view_behavior:I = 0x7f1200ed
 
-.field public static final attachment_camera:I = 0x7f12026e
+.field public static final attachment_camera:I = 0x7f120270
 
-.field public static final attachment_files:I = 0x7f120271
+.field public static final attachment_files:I = 0x7f120273
 
-.field public static final attachment_photos:I = 0x7f120273
+.field public static final attachment_photos:I = 0x7f120275
 
-.field public static final attachments_keyboard:I = 0x7f120275
+.field public static final attachments_keyboard:I = 0x7f120277
 
-.field public static final bottom_sheet_behavior:I = 0x7f120340
+.field public static final bottom_sheet_behavior:I = 0x7f120365
 
-.field public static final camera_intent_result_error:I = 0x7f12036f
+.field public static final camera_intent_result_error:I = 0x7f120394
 
-.field public static final camera_permission_denied_msg:I = 0x7f120375
+.field public static final camera_permission_denied_msg:I = 0x7f12039a
 
-.field public static final camera_switched:I = 0x7f120378
+.field public static final camera_switched:I = 0x7f12039d
 
-.field public static final camera_unknown_error:I = 0x7f12037a
+.field public static final camera_unknown_error:I = 0x7f12039f
 
-.field public static final character_counter_content_description:I = 0x7f1203cb
+.field public static final character_counter_content_description:I = 0x7f1203f0
 
-.field public static final character_counter_pattern:I = 0x7f1203cc
+.field public static final character_counter_pattern:I = 0x7f1203f1
 
-.field public static final choose_an_application:I = 0x7f1203d8
+.field public static final choose_an_application:I = 0x7f1203fd
 
-.field public static final clear_attachments:I = 0x7f1203e0
+.field public static final clear_attachments:I = 0x7f120405
 
-.field public static final emoji_keyboard_toggle:I = 0x7f120584
+.field public static final emoji_keyboard_toggle:I = 0x7f1205a9
 
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205b3
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205d8
 
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205b4
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205d9
 
-.field public static final files_permission_reason_msg:I = 0x7f1205c0
+.field public static final files_permission_reason_msg:I = 0x7f1205e5
 
-.field public static final flash_auto:I = 0x7f1205c5
+.field public static final flash_auto:I = 0x7f1205ea
 
-.field public static final flash_off:I = 0x7f1205c6
+.field public static final flash_off:I = 0x7f1205eb
 
-.field public static final flash_on:I = 0x7f1205c7
+.field public static final flash_on:I = 0x7f1205ec
 
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120933
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120968
 
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120bd8
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c0a
 
-.field public static final password_toggle_content_description:I = 0x7f120d44
+.field public static final password_toggle_content_description:I = 0x7f120d77
 
-.field public static final path_password_eye:I = 0x7f120d47
+.field public static final path_password_eye:I = 0x7f120d7a
 
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120d48
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120d7b
 
-.field public static final path_password_eye_mask_visible:I = 0x7f120d49
+.field public static final path_password_eye_mask_visible:I = 0x7f120d7c
 
-.field public static final path_password_strike_through:I = 0x7f120d4a
+.field public static final path_password_strike_through:I = 0x7f120d7d
 
-.field public static final request_permission_msg:I = 0x7f120f43
+.field public static final request_permission_msg:I = 0x7f120fca
 
-.field public static final search_menu_title:I = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final selection_shrink_scale:I = 0x7f12102b
+.field public static final selection_shrink_scale:I = 0x7f1210b2
 
-.field public static final send_contents:I = 0x7f121036
+.field public static final send_contents:I = 0x7f1210bd
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
-.field public static final storage_permission_denied_msg:I = 0x7f1210ef
+.field public static final storage_permission_denied_msg:I = 0x7f121176
 
 
 # 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 e268c3d8d2..1e75040b78 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali
@@ -2378,7 +2378,7 @@
 
     new-array v5, v1, [I
 
-    const v6, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -2554,15 +2554,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -2571,8 +2571,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -2586,11 +2586,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -2624,15 +2624,15 @@
         0x1010540
         0x7f04011a
         0x7f040121
-        0x7f040258
+        0x7f040259
     .end array-data
 
     :array_8
     .array-data 4
-        0x7f040315
         0x7f040316
         0x7f040317
         0x7f040318
+        0x7f040319
     .end array-data
 
     :array_9
@@ -2644,17 +2644,17 @@
     :array_a
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_b
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_c
@@ -2679,8 +2679,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_e
@@ -2756,47 +2756,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -2806,6 +2805,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_f
@@ -2829,7 +2829,7 @@
         0x7f040207
         0x7f040208
         0x7f04020b
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_11
@@ -2902,10 +2902,10 @@
         0x7f040160
         0x7f0401d7
         0x7f0401db
-        0x7f0402d7
-        0x7f040305
-        0x7f040360
-        0x7f040362
+        0x7f0402d8
+        0x7f040306
+        0x7f040361
+        0x7f040363
     .end array-data
 
     :array_15
@@ -2914,8 +2914,8 @@
         0x7f0400a3
         0x7f0400a4
         0x7f0400a5
-        0x7f040309
         0x7f04030a
+        0x7f04030b
     .end array-data
 
     :array_16
@@ -2930,12 +2930,12 @@
         0x7f040126
         0x7f040127
         0x7f040128
-        0x7f0402f5
-        0x7f0402f7
-        0x7f04031a
-        0x7f0403be
+        0x7f0402f6
+        0x7f0402f8
+        0x7f04031b
         0x7f0403bf
-        0x7f0403c9
+        0x7f0403c0
+        0x7f0403ca
     .end array-data
 
     :array_17
@@ -3115,7 +3115,7 @@
     :array_1d
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_1e
@@ -3143,15 +3143,15 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_21
     .array-data 4
         0x7f040163
         0x7f040165
-        0x7f04029f
+        0x7f0402a0
     .end array-data
 
     :array_22
@@ -3164,11 +3164,11 @@
         0x7f04012e
         0x7f040160
         0x7f04016a
-        0x7f04027b
-        0x7f04029e
-        0x7f0402d7
-        0x7f040305
-        0x7f0403e6
+        0x7f04027c
+        0x7f04029f
+        0x7f0402d8
+        0x7f040306
+        0x7f0403e7
     .end array-data
 
     :array_23
@@ -3176,7 +3176,7 @@
         0x7f040139
         0x7f04013a
         0x7f040204
-        0x7f04025a
+        0x7f04025b
     .end array-data
 
     :array_24
@@ -3200,7 +3200,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_26
@@ -3217,16 +3217,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3240,7 +3239,8 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_28
@@ -3274,8 +3274,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_2b
@@ -3307,15 +3307,15 @@
         0x7f0401da
         0x7f0401dc
         0x7f0401dd
-        0x7f0402d7
-        0x7f04031e
+        0x7f0402d8
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2e
     .array-data 4
-        0x7f04031e
         0x7f04031f
+        0x7f040320
     .end array-data
 
     :array_2f
@@ -3332,13 +3332,12 @@
         0x7f0400c7
         0x7f040119
         0x7f040143
-        0x7f040277
         0x7f040278
-        0x7f040283
-        0x7f0402f6
-        0x7f04030b
-        0x7f040341
-        0x7f040349
+        0x7f040279
+        0x7f040284
+        0x7f0402f7
+        0x7f04030c
+        0x7f040342
         0x7f04034a
         0x7f04034b
         0x7f04034c
@@ -3348,10 +3347,11 @@
         0x7f040350
         0x7f040351
         0x7f040352
-        0x7f040357
-        0x7f04035c
+        0x7f040353
+        0x7f040358
         0x7f04035d
-        0x7f040361
+        0x7f04035e
+        0x7f040362
     .end array-data
 
     :array_30
@@ -3386,9 +3386,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_32
@@ -3400,8 +3400,8 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_33
@@ -3417,20 +3417,20 @@
         0x7f040202
         0x7f040205
         0x7f040208
-        0x7f04027e
+        0x7f04027f
     .end array-data
 
     :array_34
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_35
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_36
@@ -3443,9 +3443,9 @@
         0x7f040135
         0x7f040136
         0x7f04020e
-        0x7f0402d6
-        0x7f04030d
-        0x7f040313
+        0x7f0402d7
+        0x7f04030e
+        0x7f040314
     .end array-data
 
     :array_37
@@ -3460,13 +3460,13 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_38
@@ -3478,16 +3478,15 @@
         0x7f04012f
         0x7f040130
         0x7f040131
-        0x7f040288
-        0x7f040297
+        0x7f040289
         0x7f040298
-        0x7f04029d
-        0x7f0402c5
+        0x7f040299
+        0x7f04029e
         0x7f0402c6
         0x7f0402c7
-        0x7f0402d4
+        0x7f0402c8
         0x7f0402d5
-        0x7f0402d8
+        0x7f0402d6
         0x7f0402d9
         0x7f0402da
         0x7f0402db
@@ -3501,20 +3500,21 @@
         0x7f0402e3
         0x7f0402e4
         0x7f0402e5
-        0x7f0403ec
+        0x7f0402e6
+        0x7f0403ed
     .end array-data
 
     :array_39
     .array-data 4
-        0x7f04030b
         0x7f04030c
+        0x7f04030d
     .end array-data
 
     :array_3a
     .array-data 4
         0x101011f
         0x7f04011a
-        0x7f040279
+        0x7f04027a
     .end array-data
 
     :array_3b
@@ -3523,7 +3523,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_3c
@@ -3541,17 +3541,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_3e
@@ -3563,7 +3563,6 @@
 
     :array_3f
     .array-data 4
-        0x7f04032b
         0x7f04032c
         0x7f04032d
         0x7f04032e
@@ -3585,9 +3584,10 @@
         0x7f04033e
         0x7f04033f
         0x7f040340
-        0x7f040342
+        0x7f040341
         0x7f040343
         0x7f040344
+        0x7f040345
     .end array-data
 
     :array_40
@@ -3604,7 +3604,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_41
@@ -3632,11 +3632,11 @@
         0x7f040164
         0x7f040166
         0x7f040167
-        0x7f040292
         0x7f040293
         0x7f040294
         0x7f040295
         0x7f040296
+        0x7f040297
     .end array-data
 
     :array_42
@@ -3659,17 +3659,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -3677,15 +3676,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_44
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .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 bce5c507f0..786587127d 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 aWg:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+.field final synthetic aWp:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-.field final synthetic aWh:Lcom/lytefast/flexinput/model/Attachment;
+.field final synthetic aWq: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;->aWg:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWp:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWh:Lcom/lytefast/flexinput/model/Attachment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWq: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;->aWg:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWp:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWo:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWh:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a$a;->aWq: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 85fbbfac39..481d1656b4 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 aWf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+.field final synthetic aWo:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
 .field final draweeView:Lcom/facebook/drawee/view/SimpleDraweeView;
 
@@ -35,7 +35,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWo: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 e5ffb437ff..3096eb2353 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 aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field public final aWn: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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn: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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn: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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn: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;->aWf:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter$a;->aWo: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;->ix()Lcom/facebook/imagepipeline/a/f;
+    invoke-static {}, Lcom/facebook/imagepipeline/a/f;->iA()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;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v1
 
@@ -244,7 +244,7 @@
 
     check-cast v1, Lcom/facebook/drawee/backends/pipeline/e;
 
-    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kE()Lcom/facebook/imagepipeline/request/b;
+    invoke-virtual {v0}, Lcom/facebook/imagepipeline/request/ImageRequestBuilder;->kH()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;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hr()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 df31184bd6..b25ff18961 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 aWi:Landroid/view/View;
+.field final aWr:Landroid/view/View;
 
-.field final synthetic aWj:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+.field final synthetic aWs:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWj:Lcom/lytefast/flexinput/adapters/EmptyListAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWs: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/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWi:Landroid/view/View;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWr: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 6cbc4c1520..145d5ba661 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWi:Landroid/view/View;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/EmptyListAdapter$ViewHolder;->aWr: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 b3766bf030..815fe4aca6 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 aWl:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+.field final synthetic aWu: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;->aWl:Lcom/lytefast/flexinput/adapters/FileListAdapter$a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$b;->aWu: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 c26030b614..121d3e55d6 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 aWm:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+.field public static final aWv: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;->aWm:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/FileListAdapter$a.smali
index b71232d4d5..86468baf8b 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;->aWm:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$a$c;
 
     new-instance v0, Ljava/util/ArrayList;
 
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 9a8eef7a46..b941ee6d4e 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 aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+.field final synthetic aWE: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;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWE: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;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWE:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD: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;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWE: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;->aWv:Lcom/lytefast/flexinput/adapters/FileListAdapter$b;
+    iget-object v2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$1;->aWE: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 6a1909611c..9283ea779e 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 1d54db1fe3..b915d9d212 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,11 @@
 
 
 # instance fields
-.field private final aWn:Landroid/animation/AnimatorSet;
+.field aWA:Landroid/widget/TextView;
 
-.field private final aWo:Landroid/animation/AnimatorSet;
+.field aWB:Landroid/widget/TextView;
 
-.field aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
-
-.field aWq:Landroid/widget/ImageView;
-
-.field aWr:Landroid/widget/TextView;
-
-.field aWs:Landroid/widget/TextView;
-
-.field aWt:Lcom/lytefast/flexinput/model/Attachment;
+.field aWC:Lcom/lytefast/flexinput/model/Attachment;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/model/Attachment<",
@@ -38,7 +30,15 @@
     .end annotation
 .end field
 
-.field final synthetic aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+.field final synthetic aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+
+.field private final aWw:Landroid/animation/AnimatorSet;
+
+.field private final aWx:Landroid/animation/AnimatorSet;
+
+.field aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
+
+.field aWz:Landroid/widget/ImageView;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD: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;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy: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;->aWq:Landroid/widget/ImageView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWr:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWA: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;->aWs:Landroid/widget/TextView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWB: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;->aWn:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWn:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw:Landroid/animation/AnimatorSet;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy: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;->aWo:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWo:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx:Landroid/animation/AnimatorSet;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy: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;->aWt:Lcom/lytefast/flexinput/model/Attachment;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWC: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;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy: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;->aWn:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWw: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;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy: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;->aWo:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWx:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/FileListAdapter$b$a;->a(Landroid/animation/AnimatorSet;)V
 
@@ -268,7 +268,7 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-static {v0}, Lcom/lytefast/flexinput/adapters/FileListAdapter;->b(Lcom/lytefast/flexinput/adapters/FileListAdapter;)Landroid/content/ContentResolver;
 
@@ -347,7 +347,7 @@
 
     if-nez v12, :cond_1
 
-    iget-object v3, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v3, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-static {v3}, Lcom/lytefast/flexinput/adapters/FileListAdapter;->b(Lcom/lytefast/flexinput/adapters/FileListAdapter;)Landroid/content/ContentResolver;
 
@@ -362,7 +362,7 @@
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_1
-    iget-object v3, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v3, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     invoke-static {v3}, Lcom/lytefast/flexinput/adapters/FileListAdapter;->b(Lcom/lytefast/flexinput/adapters/FileListAdapter;)Landroid/content/ContentResolver;
 
@@ -426,13 +426,13 @@
 
     move-result-object v0
 
-    iget-object v4, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v4, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gN()Lcom/facebook/drawee/backends/pipeline/e;
+    invoke-static {}, Lcom/facebook/drawee/backends/pipeline/c;->gQ()Lcom/facebook/drawee/backends/pipeline/e;
 
     move-result-object v6
 
-    iget-object v7, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v7, v1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v7}, Lcom/facebook/drawee/view/SimpleDraweeView;->getController()Lcom/facebook/drawee/d/a;
 
@@ -454,13 +454,13 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hm()Lcom/facebook/drawee/controller/a;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hp()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;->ho()Lcom/facebook/drawee/controller/AbstractDraweeController;
+    invoke-virtual {v0}, Lcom/facebook/drawee/backends/pipeline/e;->hr()Lcom/facebook/drawee/controller/AbstractDraweeController;
 
     move-result-object v0
 
@@ -468,7 +468,7 @@
 
     invoke-virtual {v4, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setController(Lcom/facebook/drawee/d/a;)V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_4
     .catchall {:try_start_4 .. :try_end_4} :catchall_0
 
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 99d2281c68..ee2516442b 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 aWk:Ljava/util/List;
+.field private aWt:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -91,7 +91,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWk:Ljava/util/List;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWt: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;->aWk:Ljava/util/List;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWt:Ljava/util/List;
 
     return-void
 .end method
@@ -125,7 +125,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWk:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWt:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -143,7 +143,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWk:Ljava/util/List;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->aWt:Ljava/util/List;
 
     invoke-interface {v0, p2}, Ljava/util/List;->get(I)Ljava/lang/Object;
 
@@ -155,9 +155,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWt:Lcom/lytefast/flexinput/model/Attachment;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWC:Lcom/lytefast/flexinput/model/Attachment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWu:Lcom/lytefast/flexinput/adapters/FileListAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWD:Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/adapters/FileListAdapter;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
@@ -183,7 +183,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWr:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWA:Landroid/widget/TextView;
 
     invoke-virtual {p2}, Ljava/io/File;->getName()Ljava/lang/String;
 
@@ -193,7 +193,7 @@
 
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWs:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWB:Landroid/widget/TextView;
 
     invoke-static {p2}, Lcom/lytefast/flexinput/utils/b;->y(Ljava/io/File;)Ljava/lang/String;
 
@@ -206,18 +206,18 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWr:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWA: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;->aWs:Landroid/widget/TextView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWB: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;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v3, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->getContext()Landroid/content/Context;
 
@@ -225,7 +225,7 @@
 
     invoke-virtual {v2, v0, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->a(Landroid/net/Uri;Ljava/lang/Object;)V
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWq:Landroid/widget/ImageView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz:Landroid/widget/ImageView;
 
     const/16 v3, 0x8
 
@@ -327,13 +327,13 @@
     :goto_2
     if-nez v2, :cond_7
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v2, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-static {p2}, Landroid/net/Uri;->fromFile(Ljava/io/File;)Landroid/net/Uri;
 
     move-result-object v4
 
-    iget-object v5, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWp:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v5, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWy:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->getContext()Landroid/content/Context;
 
@@ -351,13 +351,13 @@
 
     if-eqz v4, :cond_5
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWq:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz:Landroid/widget/ImageView;
 
     sget v2, Lcom/lytefast/flexinput/R$d;->ic_image_24dp:I
 
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWq:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
@@ -374,13 +374,13 @@
 
     if-eqz v4, :cond_6
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWq:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz: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;->aWq:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
@@ -397,13 +397,13 @@
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWq:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz:Landroid/widget/ImageView;
 
     sget v2, Lcom/lytefast/flexinput/R$d;->ic_audio_24dp:I
 
     invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWq:Landroid/widget/ImageView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/FileListAdapter$b;->aWz:Landroid/widget/ImageView;
 
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a.smali
index 70fa47359e..f8a1c5be9c 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a.smali
@@ -117,7 +117,7 @@
 
     check-cast p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -178,11 +178,11 @@
     :cond_2
     iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
-    sget-object v3, Lcom/lytefast/flexinput/utils/d;->aXQ:Lcom/lytefast/flexinput/utils/d;
+    sget-object v3, Lcom/lytefast/flexinput/utils/d;->aXZ:Lcom/lytefast/flexinput/utils/d;
 
     iget-object v3, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
-    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-static {v3}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;)Landroid/content/ContentResolver;
 
@@ -190,15 +190,15 @@
 
     iget-object v5, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
-    iget-object v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iget v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWA:I
+    iget v5, v5, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWJ:I
 
     iget-object v6, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
-    iget-object v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iget v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWB:I
+    iget v6, v6, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWK:I
 
     iget-object v7, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
@@ -262,7 +262,7 @@
 
     const/4 v1, 0x0
 
-    invoke-static {}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AW()Landroid/graphics/drawable/Drawable;
+    invoke-static {}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AZ()Landroid/graphics/drawable/Drawable;
 
     move-result-object v3
 
@@ -284,7 +284,7 @@
 
     invoke-virtual {p1, v0}, Lcom/facebook/drawee/drawable/f;->K(I)V
 
-    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
     iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
@@ -330,7 +330,7 @@
 
     invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v2, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+    sget-object v2, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
     iget-object v2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
@@ -386,23 +386,23 @@
 
     check-cast v1, Landroid/graphics/drawable/Drawable;
 
-    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oj:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v2, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Os:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-virtual {v0, v1, v2}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->b(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
 
-    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hw()V
+    invoke-virtual {p1}, Lcom/facebook/drawee/drawable/f;->hz()V
 
     iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$a;->this$0:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;
 
     invoke-static {v0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;Lcom/facebook/drawee/drawable/f;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 
     :cond_4
     :goto_1
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b.smali
index 2873db23c0..ba399242f1 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b.smali
@@ -72,7 +72,7 @@
 
     invoke-virtual {p0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b;->a(Landroid/animation/AnimatorSet;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$b.smali
index 4f6e53bb1f..f47db917a5 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
@@ -18,27 +18,27 @@
 
 
 # instance fields
-.field final aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field final aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field private final aWF:Lcom/facebook/drawee/view/SimpleDraweeView;
+.field private final aWO:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-.field aWG:Lcom/lytefast/flexinput/model/Photo;
+.field aWP:Lcom/lytefast/flexinput/model/Photo;
 
-.field aWH:Lkotlinx/coroutines/Job;
+.field aWQ:Lkotlinx/coroutines/Job;
 
-.field private aWI:Landroid/graphics/Bitmap;
+.field private aWR:Landroid/graphics/Bitmap;
 
-.field private aWJ:Landroid/graphics/drawable/BitmapDrawable;
+.field private aWS:Landroid/graphics/drawable/BitmapDrawable;
 
-.field private aWK:Lcom/facebook/drawee/drawable/f;
+.field private aWT:Lcom/facebook/drawee/drawable/f;
 
-.field aWL:Landroid/os/CancellationSignal;
+.field aWU:Landroid/os/CancellationSignal;
 
-.field final synthetic aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field private final aWn:Landroid/animation/AnimatorSet;
+.field private final aWw:Landroid/animation/AnimatorSet;
 
-.field private final aWo:Landroid/animation/AnimatorSet;
+.field private final aWx:Landroid/animation/AnimatorSet;
 
 
 # direct methods
@@ -56,7 +56,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     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/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     sget p1, Lcom/lytefast/flexinput/R$e;->item_check_indicator:I
 
@@ -86,7 +86,7 @@
 
     check-cast p1, Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWF:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->itemView:Landroid/view/View;
 
@@ -96,7 +96,7 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getContext()Landroid/content/Context;
 
@@ -114,11 +114,11 @@
 
     check-cast p1, Landroid/animation/AnimatorSet;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWn:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWw:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWn:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWw:Landroid/animation/AnimatorSet;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, v1}, Landroid/animation/AnimatorSet;->setTarget(Ljava/lang/Object;)V
 
@@ -136,11 +136,11 @@
 
     check-cast p1, Landroid/animation/AnimatorSet;
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWo:Landroid/animation/AnimatorSet;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWx:Landroid/animation/AnimatorSet;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWo:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWx:Landroid/animation/AnimatorSet;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1, p2}, Landroid/animation/AnimatorSet;->setTarget(Ljava/lang/Object;)V
 
@@ -164,7 +164,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;)Landroid/graphics/Bitmap;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWI:Landroid/graphics/Bitmap;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Landroid/graphics/Bitmap;
 
     return-object p0
 .end method
@@ -172,7 +172,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;Landroid/graphics/Bitmap;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWI:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Landroid/graphics/Bitmap;
 
     return-void
 .end method
@@ -180,7 +180,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;Landroid/graphics/drawable/BitmapDrawable;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ:Landroid/graphics/drawable/BitmapDrawable;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWS:Landroid/graphics/drawable/BitmapDrawable;
 
     return-void
 .end method
@@ -188,7 +188,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;Lcom/facebook/drawee/drawable/f;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWK:Lcom/facebook/drawee/drawable/f;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWT:Lcom/facebook/drawee/drawable/f;
 
     return-void
 .end method
@@ -196,7 +196,7 @@
 .method public static final synthetic b(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;)Landroid/os/CancellationSignal;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWL:Landroid/os/CancellationSignal;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWU:Landroid/os/CancellationSignal;
 
     return-object p0
 .end method
@@ -204,7 +204,7 @@
 .method public static final synthetic c(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;)Landroid/graphics/drawable/BitmapDrawable;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ:Landroid/graphics/drawable/BitmapDrawable;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWS:Landroid/graphics/drawable/BitmapDrawable;
 
     return-object p0
 .end method
@@ -212,7 +212,7 @@
 .method public static final synthetic d(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;)Lcom/facebook/drawee/view/SimpleDraweeView;
     .locals 0
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     return-object p0
 .end method
@@ -222,29 +222,29 @@
 .method final clear()V
     .locals 3
 
-    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXI:Lcom/lytefast/flexinput/utils/a;
+    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXR:Lcom/lytefast/flexinput/utils/a;
 
-    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bj()Z
+    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bm()Z
 
     move-result v0
 
     if-eqz v0, :cond_7
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWH:Lkotlinx/coroutines/Job;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWQ:Lkotlinx/coroutines/Job;
 
     if-eqz v0, :cond_0
 
     invoke-interface {v0}, Lkotlinx/coroutines/Job;->cancel()V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWL:Landroid/os/CancellationSignal;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWU:Landroid/os/CancellationSignal;
 
     if-eqz v0, :cond_1
 
     invoke-virtual {v0}, Landroid/os/CancellationSignal;->cancel()V
 
     :cond_1
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ:Landroid/graphics/drawable/BitmapDrawable;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWS:Landroid/graphics/drawable/BitmapDrawable;
 
     if-eqz v0, :cond_2
 
@@ -259,18 +259,18 @@
     :cond_2
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWJ:Landroid/graphics/drawable/BitmapDrawable;
+    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWS:Landroid/graphics/drawable/BitmapDrawable;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWI:Landroid/graphics/Bitmap;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Landroid/graphics/Bitmap;
 
     if-eqz v1, :cond_3
 
     invoke-virtual {v1}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_3
-    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWI:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWR:Landroid/graphics/Bitmap;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWK:Lcom/facebook/drawee/drawable/f;
+    iget-object v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWT:Lcom/facebook/drawee/drawable/f;
 
     if-eqz v1, :cond_4
 
@@ -306,7 +306,7 @@
     invoke-virtual {v1}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_6
-    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWK:Lcom/facebook/drawee/drawable/f;
+    iput-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWT:Lcom/facebook/drawee/drawable/f;
 
     :cond_7
     return-void
@@ -331,13 +331,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWF:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO: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$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getScaleX()F
 
@@ -347,20 +347,20 @@
 
     if-nez p1, :cond_1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWn:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWw:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b;->a(Landroid/animation/AnimatorSet;)V
 
     return-void
 
     :cond_0
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWF:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWO: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$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getScaleX()F
 
@@ -370,7 +370,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWo:Landroid/animation/AnimatorSet;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWx:Landroid/animation/AnimatorSet;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b$b;->a(Landroid/animation/AnimatorSet;)V
 
@@ -385,13 +385,13 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->b(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;)Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     move-result-object p1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWG:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWP:Lcom/lytefast/flexinput/model/Photo;
 
     invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->getAdapterPosition()I
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$c.smali b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$c.smali
index 8474a8a444..040e8ea739 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$c.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter$c.smali
@@ -5,7 +5,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AV()V
+    value = Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AY()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field final synthetic aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
 
 # direct methods
@@ -27,7 +27,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-static {p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->a(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$c;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWV: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$c;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;->aWV: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 1de33dffcb..703d6203e7 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/adapters/PhotoCursorAdapter.smali
@@ -21,23 +21,23 @@
 
 
 # static fields
-.field private static aWC:Landroid/graphics/drawable/Drawable;
+.field private static aWL:Landroid/graphics/drawable/Drawable;
 
-.field public static final aWD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+.field public static final aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
 
 # instance fields
-.field final aWA:I
+.field private aWF:Landroid/database/Cursor;
 
-.field final aWB:I
+.field private aWG:I
 
-.field private aWw:Landroid/database/Cursor;
+.field private aWH:I
 
-.field private aWx:I
+.field private aWI:I
 
-.field private aWy:I
+.field final aWJ:I
 
-.field private aWz:I
+.field final aWK:I
 
 .field private final contentResolver:Landroid/content/ContentResolver;
 
@@ -63,7 +63,7 @@
 
     invoke-direct {v0, v1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;-><init>(B)V
 
-    sput-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWD:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$a;
 
     return-void
 .end method
@@ -93,9 +93,9 @@
 
     iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->contentResolver:Landroid/content/ContentResolver;
 
-    iput p3, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWA:I
+    iput p3, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWJ:I
 
-    iput p4, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWB:I
+    iput p4, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWK:I
 
     move-object p1, p0
 
@@ -114,10 +114,10 @@
     return-void
 .end method
 
-.method public static final synthetic AW()Landroid/graphics/drawable/Drawable;
+.method public static final synthetic AZ()Landroid/graphics/drawable/Drawable;
     .locals 1
 
-    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWC:Landroid/graphics/drawable/Drawable;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWL:Landroid/graphics/drawable/Drawable;
 
     return-object v0
 .end method
@@ -133,7 +133,7 @@
 .method public static final synthetic a(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;I)V
     .locals 0
 
-    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWx:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWG:I
 
     return-void
 .end method
@@ -141,7 +141,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;->aWw:Landroid/database/Cursor;
+    iput-object p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWF:Landroid/database/Cursor;
 
     return-void
 .end method
@@ -157,7 +157,7 @@
 .method public static final synthetic b(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;I)V
     .locals 0
 
-    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWy:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWH:I
 
     return-void
 .end method
@@ -165,7 +165,7 @@
 .method public static final synthetic c(Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;I)V
     .locals 0
 
-    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWz:I
+    iput p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWI:I
 
     return-void
 .end method
@@ -173,13 +173,13 @@
 .method private final cI(I)Lcom/lytefast/flexinput/model/Photo;
     .locals 7
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWw:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWF: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;->aWx:I
+    iget p1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWG:I
 
     invoke-interface {v0, p1}, Landroid/database/Cursor;->getLong(I)J
 
@@ -201,7 +201,7 @@
 
     invoke-static {v4, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWz:I
+    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWI:I
 
     invoke-interface {v0, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -222,7 +222,7 @@
     :cond_0
     move-object v5, v1
 
-    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWy:I
+    iget v1, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWH:I
 
     invoke-interface {v0, v1}, Landroid/database/Cursor;->getString(I)Ljava/lang/String;
 
@@ -242,7 +242,7 @@
 
 
 # virtual methods
-.method public final AV()V
+.method public final AY()V
     .locals 8
 
     new-instance v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$c;
@@ -291,7 +291,7 @@
 .method public final getItemCount()I
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWw:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWF:Landroid/database/Cursor;
 
     if-eqz v0, :cond_0
 
@@ -357,9 +357,9 @@
 
     check-cast v0, Landroid/graphics/drawable/Drawable;
 
-    sput-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWC:Landroid/graphics/drawable/Drawable;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWL:Landroid/graphics/drawable/Drawable;
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AV()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AY()V
 
     return-void
 .end method
@@ -377,11 +377,11 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWG:Lcom/lytefast/flexinput/model/Photo;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWP:Lcom/lytefast/flexinput/model/Photo;
 
-    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXI:Lcom/lytefast/flexinput/utils/a;
+    sget-object v0, Lcom/lytefast/flexinput/utils/a;->aXR:Lcom/lytefast/flexinput/utils/a;
 
-    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bj()Z
+    invoke-static {}, Lcom/lytefast/flexinput/utils/a;->Bm()Z
 
     move-result v0
 
@@ -391,7 +391,7 @@
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->clear()V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->getHierarchy()Lcom/facebook/drawee/d/b;
 
@@ -399,9 +399,9 @@
 
     check-cast v0, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;
 
-    sget-object v2, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWC:Landroid/graphics/drawable/Drawable;
+    sget-object v2, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWL:Landroid/graphics/drawable/Drawable;
 
-    sget-object v3, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oh:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
+    sget-object v3, Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;->Oq:Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;
 
     invoke-virtual {v0, v2, v3}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->b(Landroid/graphics/drawable/Drawable;Lcom/facebook/drawee/drawable/ScalingUtils$ScaleType;)V
 
@@ -409,13 +409,13 @@
 
     invoke-direct {v0}, Landroid/os/CancellationSignal;-><init>()V
 
-    iput-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWL:Landroid/os/CancellationSignal;
+    iput-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWU:Landroid/os/CancellationSignal;
 
-    sget-object v0, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v0, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v0, Lkotlinx/coroutines/CoroutineScope;
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DD()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/as;->DG()Lkotlinx/coroutines/bq;
 
     move-result-object v2
 
@@ -433,14 +433,14 @@
 
     move-result-object p2
 
-    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWH:Lkotlinx/coroutines/Job;
+    iput-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWQ:Lkotlinx/coroutines/Job;
 
     return-void
 
     :cond_0
     if-eqz p2, :cond_1
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->selectionCoordinator:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
@@ -456,7 +456,7 @@
 
     invoke-virtual {p1, v0, v1}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->d(ZZ)V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWM:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWV:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->contentResolver:Landroid/content/ContentResolver;
 
@@ -465,9 +465,9 @@
     move-result-object v1
 
     :cond_1
-    iget-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p2, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWE:Lcom/facebook/drawee/view/SimpleDraweeView;
+    iget-object p1, p1, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter$b;->aWN:Lcom/facebook/drawee/view/SimpleDraweeView;
 
     invoke-virtual {p1}, Lcom/facebook/drawee/view/SimpleDraweeView;->getContext()Landroid/content/Context;
 
@@ -594,7 +594,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWw:Landroid/database/Cursor;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->aWF: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 6330710935..bf5932fa00 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 aWd:Lcom/lytefast/flexinput/adapters/a$a;
+.field public static final aWm:Lcom/lytefast/flexinput/adapters/a$a;
 
 
 # instance fields
-.field public final aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+.field public final aWl:[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;->aWd:Lcom/lytefast/flexinput/adapters/a$a;
+    sput-object v0, Lcom/lytefast/flexinput/adapters/a;->aWm: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;->aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+    iput-object p2, p0, Lcom/lytefast/flexinput/adapters/a;->aWl:[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;->aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->aWl:[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;->aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/adapters/a;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
 
     aget-object p1, v0, p1
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$a.smali
index d248dd37ca..965f1bb125 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$a.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final aWX:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
+.field public static final aXg:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment$a;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$a;->aWX:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$a;->aXg:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$d.smali
index c93d0d1a35..57dab1a534 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$d.smali
@@ -29,7 +29,7 @@
 
 
 # static fields
-.field public static final aWY:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
+.field public static final aXh:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/fragment/CameraFragment$d;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->aWY:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->aXh:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
 
     return-void
 .end method
@@ -103,7 +103,7 @@
 
     invoke-virtual {p1}, Landroid/widget/Toast;->show()V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1$a.smali
index dc661c649f..7dc73a1721 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1$a.smali
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aXc:Ljava/io/File;
+.field final synthetic aXl:Ljava/io/File;
 
-.field final synthetic aXd:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
+.field final synthetic aXm:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
 
 
 # direct methods
 .method constructor <init>(Ljava/io/File;Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXc:Ljava/io/File;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXl:Ljava/io/File;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXd:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXm:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
 
     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$e$1$a;->aXd:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXm:Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aWZ:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$e;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -53,7 +53,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXc:Ljava/io/File;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;->aXl:Ljava/io/File;
 
     invoke-static {v1}, Lcom/lytefast/flexinput/utils/b;->x(Ljava/io/File;)Lcom/lytefast/flexinput/model/Attachment;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1.smali b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1.smali
index 8744f1798e..16e32b7400 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment$e$1.smali
@@ -20,24 +20,24 @@
 # instance fields
 .field final synthetic $context:Landroid/content/Context;
 
-.field final synthetic aWZ:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+.field final synthetic aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 
-.field final synthetic aXa:[B
+.field final synthetic aXj:[B
 
-.field final synthetic aXb:Lcom/camerakit/CameraKitView;
+.field final synthetic aXk:Lcom/camerakit/CameraKitView;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/CameraFragment$e;[BLandroid/content/Context;Lcom/camerakit/CameraKitView;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aWZ:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXa:[B
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXj:[B
 
     iput-object p3, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->$context:Landroid/content/Context;
 
-    iput-object p4, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXb:Lcom/camerakit/CameraKitView;
+    iput-object p4, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXk:Lcom/camerakit/CameraKitView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -49,7 +49,7 @@
 .method public final run()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aWZ:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXi:Lcom/lytefast/flexinput/fragment/CameraFragment$e;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$e;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -65,7 +65,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Bi()Ljava/io/File;
+    invoke-interface {v0}, Lcom/lytefast/flexinput/managers/FileManager;->Bl()Ljava/io/File;
 
     move-result-object v0
 
@@ -83,11 +83,11 @@
 
     check-cast v2, Ljava/io/FileOutputStream;
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXa:[B
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXj:[B
 
     invoke-virtual {v2, v3}, Ljava/io/FileOutputStream;->write([B)V
 
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -102,7 +102,7 @@
 
     invoke-static {v1, v0}, Lcom/lytefast/flexinput/fragment/CameraFragment$Companion;->a(Landroid/content/Context;Ljava/io/File;)V
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXb:Lcom/camerakit/CameraKitView;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1;->aXk:Lcom/camerakit/CameraKitView;
 
     new-instance v2, Lcom/lytefast/flexinput/fragment/CameraFragment$e$1$a;
 
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 5a955154d7..37f9ae3317 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;->Ba()V
+    value = Lcom/lytefast/flexinput/fragment/CameraFragment$j;->Bd()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+.field final synthetic aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
 
 
 # direct methods
 .method constructor <init>(Lcom/lytefast/flexinput/fragment/CameraFragment$j;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXe:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,7 +45,7 @@
 
     invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXe:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$j;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
@@ -55,7 +55,7 @@
 
     invoke-virtual {v0}, Lcom/camerakit/CameraKitView;->onStart()V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXe:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j$a;->aXn:Lcom/lytefast/flexinput/fragment/CameraFragment$j;
 
     iget-object v0, v0, Lcom/lytefast/flexinput/fragment/CameraFragment$j;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
 
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 c258cc9141..b106760c50 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 Ba()V
+.method public final Bd()V
     .locals 2
 
     iget-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment$j;->this$0:Lcom/lytefast/flexinput/fragment/CameraFragment;
@@ -59,7 +59,7 @@
     return-void
 .end method
 
-.method public final Bb()V
+.method public final Be()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 43c94b6296..eeb7f4b3f0 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/CameraFragment.smali
@@ -174,7 +174,7 @@
 
     invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/PermissionsFragment;-><init>()V
 
-    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->aWY:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
+    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$d;->aXh:Lcom/lytefast/flexinput/fragment/CameraFragment$d;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
@@ -192,7 +192,7 @@
 
     iput-object v0, p0, Lcom/lytefast/flexinput/fragment/CameraFragment;->isSingleCamera$delegate:Lkotlin/Lazy;
 
-    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$a;->aWX:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
+    sget-object v0, Lcom/lytefast/flexinput/fragment/CameraFragment$a;->aXg:Lcom/lytefast/flexinput/fragment/CameraFragment$a;
 
     check-cast v0, Lcom/camerakit/CameraKitView$ErrorListener;
 
@@ -573,7 +573,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Bi()Ljava/io/File;
+    invoke-interface {v1}, Lcom/lytefast/flexinput/managers/FileManager;->Bl()Ljava/io/File;
 
     move-result-object v2
 
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 002b2140cb..df29a8c8ad 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 aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+.field final synthetic aXo: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;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->aXo: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;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$a;->aXo: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 2bfed1beb5..da02b1abef 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;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy: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 cf1bc4c8f6..1f3a44b83b 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 aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+.field final synthetic aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,10 +39,10 @@
 
 
 # virtual methods
-.method public final Ba()V
+.method public final Bd()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo: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;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     new-instance v2, Lcom/lytefast/flexinput/adapters/FileListAdapter;
 
@@ -73,7 +73,7 @@
 
     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;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo:Lcom/lytefast/flexinput/fragment/FilesFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/FilesFragment;->getRecyclerView$flexinput_release()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -81,7 +81,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo: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;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo: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 Bb()V
+.method public final Be()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXf:Lcom/lytefast/flexinput/fragment/FilesFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FilesFragment$c;->aXo: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 d51cb52620..092a86fd6d 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/FilesFragment.smali
@@ -278,7 +278,7 @@
 
     if-eqz p3, :cond_3
 
-    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->AU()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p3
 
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 2b765dcfc0..2eb5c0a1a9 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 aXu:Landroid/util/AttributeSet;
+.field final synthetic aXD:Landroid/util/AttributeSet;
 
-.field final synthetic aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXE: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;->aXu:Landroid/util/AttributeSet;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXD: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;->aXu:Landroid/util/AttributeSet;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXD: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$1;->aXE: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 081612658b..b241a2d37e 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bd()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()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 e582eb6320..3000000e38 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bf()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bi()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz: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 b1aa37424f..9d801237cc 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$12;->aXE: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 a554415076..b11c8510ef 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$13;->aXE: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 4998c7e6b9..a2871808bb 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$14;->aXE: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;->Bf()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bi()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 57e2413e7b..a4290560c2 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$2;->aXE: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 e9e38c33db..b1012de79d 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
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXw:Landroidx/appcompat/widget/AppCompatEditText;
+.field final synthetic aXF:Landroidx/appcompat/widget/AppCompatEditText;
 
 
 # direct methods
 .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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->Bg()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bj()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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v1, v0}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bj()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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE: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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestLayout()V
 
-    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bj()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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXw:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$3;->aXF: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 7548f3258a..443918ac3e 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$4;->aXE: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 7bbfa75fbd..adfce02eb2 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXx:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXG: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXx:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXG: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;->aXx:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXG: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;->aXx:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXG: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;->aXx:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXG: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->requestFocus()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXj:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$5;->aXE: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 ef0ee66def..b32a7ac9a4 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-.field final synthetic aXy:Landroidx/fragment/app/DialogFragment;
+.field final synthetic aXH: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXy:Landroidx/fragment/app/DialogFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXH: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;->aXy:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXH: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;->aXy:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXH: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;->aXy:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXH: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;->aXy:Landroidx/fragment/app/DialogFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;->aXH: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;->Bg()Ljava/lang/String;
+    invoke-static {}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bj()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 b2085822a0..51dcd281a0 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;->Bh()V
+    value = Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Bk()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+.field final synthetic aXI: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;->aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI: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;->aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE: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;->aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v1, v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE: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;->aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE: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;->aXz:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7$1;->aXI:Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, v0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE: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 1fe25bcda4..c6d95253da 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     return-void
 .end method
 
-.method private Bh()V
+.method private Bk()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->aXE: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;->Bh()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Bk()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;->Bh()V
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;->Bk()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 8102b68f80..82ba02f972 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Be()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()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 2992e6beae..65c5750a7c 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 aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+.field final synthetic aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->aXE: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;->aXv:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;->aXE:Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXj:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->Bf()Z
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bi()Z
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
 
-    iget-object p1, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p1, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXj:Landroid/view/View;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->aXq:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/managers/a;->requestHide()V
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
 
     sget v1, Lcom/lytefast/flexinput/R$d;->ic_keyboard_24dp:I
 
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 48ad7a689f..87652d24c2 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,13 @@
 
 
 # instance fields
-.field protected aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+.field protected aWl:[Lcom/lytefast/flexinput/adapters/a$b;
 
-.field private aXg:Landroid/view/View;
+.field public aXA:Lcom/lytefast/flexinput/InputListener;
 
-.field private aXh:Landroid/view/View;
+.field protected aXB:Lcom/lytefast/flexinput/managers/FileManager;
 
-.field public aXi:Landroid/widget/LinearLayout;
-
-.field aXj:Landroid/view/View;
-
-.field private aXk:Landroidx/recyclerview/widget/RecyclerView;
-
-.field public aXl:Landroidx/appcompat/widget/AppCompatEditText;
-
-.field public aXm:Landroidx/appcompat/widget/AppCompatImageButton;
-
-.field private aXn:Landroidx/appcompat/widget/AppCompatImageButton;
-
-.field private aXo:Landroid/view/View;
-
-.field private aXp:Ljava/lang/Runnable;
-
-.field public aXq:Lcom/lytefast/flexinput/managers/a;
-
-.field public aXr:Lcom/lytefast/flexinput/InputListener;
-
-.field protected aXs:Lcom/lytefast/flexinput/managers/FileManager;
-
-.field protected aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+.field protected aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter<",
@@ -61,6 +39,28 @@
     .end annotation
 .end field
 
+.field private aXp:Landroid/view/View;
+
+.field private aXq:Landroid/view/View;
+
+.field public aXr:Landroid/widget/LinearLayout;
+
+.field aXs:Landroid/view/View;
+
+.field private aXt:Landroidx/recyclerview/widget/RecyclerView;
+
+.field public aXu:Landroidx/appcompat/widget/AppCompatEditText;
+
+.field public aXv:Landroidx/appcompat/widget/AppCompatImageButton;
+
+.field private aXw:Landroidx/appcompat/widget/AppCompatImageButton;
+
+.field private aXx:Landroid/view/View;
+
+.field private aXy:Ljava/lang/Runnable;
+
+.field public aXz:Lcom/lytefast/flexinput/managers/a;
+
 .field public isEnabled:Z
 
 
@@ -91,7 +91,7 @@
     return-void
 .end method
 
-.method static synthetic Bg()Ljava/lang/String;
+.method static synthetic Bj()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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXg:Landroid/view/View;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp: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;->aXg:Landroid/view/View;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp: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;->aXg:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp:Landroid/view/View;
 
-    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC: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;->aXi:Landroid/widget/LinearLayout;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr: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;->aXq:Lcom/lytefast/flexinput/managers/a;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method public final AU()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.method public final AX()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;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     return-object v0
 .end method
 
-.method public final Bc()[Lcom/lytefast/flexinput/adapters/a$b;
+.method public final Bf()[Lcom/lytefast/flexinput/adapters/a$b;
     .locals 5
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aWl:[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;->aWd:Lcom/lytefast/flexinput/adapters/a$a;
+    sget-object v0, Lcom/lytefast/flexinput/adapters/a;->aWm:Lcom/lytefast/flexinput/adapters/a$a;
 
     const/4 v0, 0x3
 
@@ -363,20 +363,20 @@
     return-object v0
 .end method
 
-.method public final Bd()V
+.method public final Bg()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Lcom/lytefast/flexinput/InputListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXA:Lcom/lytefast/flexinput/InputListener;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v2, v2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn: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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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;->Be()V
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bh()V
 
     :cond_0
     return-void
 .end method
 
-.method public final Be()V
+.method public final Bh()V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->clear()V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXg:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp: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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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 Bf()Z
+.method public final Bi()Z
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXj:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Landroid/view/View;
 
     invoke-virtual {v0}, Landroid/view/View;->isShown()Z
 
@@ -440,13 +440,13 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXj:Landroid/view/View;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs: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;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
 
     sget v2, Lcom/lytefast/flexinput/R$d;->ic_insert_emoticon_24dp:I
 
@@ -499,19 +499,19 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v1, v1, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn: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;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXk:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Landroidx/recyclerview/widget/RecyclerView;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->setAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
 
@@ -521,7 +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;->aXs:Lcom/lytefast/flexinput/managers/FileManager;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXB:Lcom/lytefast/flexinput/managers/FileManager;
 
     return-object p0
 .end method
@@ -529,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;->aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aWl:[Lcom/lytefast/flexinput/adapters/a$b;
 
     return-object p0
 .end method
@@ -537,7 +537,7 @@
 .method public final a(Landroid/text/Editable;)V
     .locals 2
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
 
     iget-boolean v1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->isEnabled:Z
 
@@ -549,7 +549,7 @@
 
     if-gtz p1, :cond_0
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     invoke-virtual {p1}, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->getItemCount()I
 
@@ -599,9 +599,9 @@
 
     invoke-direct {v1, v2}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;-><init>(B)V
 
-    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v3, v3, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v3, v1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->registerSelectionCoordinator(Lcom/lytefast/flexinput/utils/SelectionCoordinator;)V
 
@@ -609,7 +609,7 @@
 
     invoke-virtual {v1}, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->close()V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXk:Landroidx/recyclerview/widget/RecyclerView;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Landroidx/recyclerview/widget/RecyclerView;
 
     new-instance v1, Lcom/lytefast/flexinput/fragment/FlexInputFragment$6;
 
@@ -623,7 +623,7 @@
 .method public final getFileManager()Lcom/lytefast/flexinput/managers/FileManager;
     .locals 1
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Lcom/lytefast/flexinput/managers/FileManager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXB:Lcom/lytefast/flexinput/managers/FileManager;
 
     return-object v0
 .end method
@@ -647,7 +647,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXg:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp:Landroid/view/View;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->attachment_clear_btn:I
 
@@ -655,9 +655,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXh:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXh:Landroid/view/View;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Landroid/view/View;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$8;
 
@@ -673,7 +673,7 @@
 
     check-cast p2, Landroid/widget/LinearLayout;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXi:Landroid/widget/LinearLayout;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXr:Landroid/widget/LinearLayout;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->emoji_container:I
 
@@ -681,7 +681,7 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXj:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXs:Landroid/view/View;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->attachment_preview_list:I
 
@@ -691,7 +691,7 @@
 
     check-cast p2, Landroidx/recyclerview/widget/RecyclerView;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXk:Landroidx/recyclerview/widget/RecyclerView;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Landroidx/recyclerview/widget/RecyclerView;
 
     sget p2, Lcom/lytefast/flexinput/R$e;->text_input:I
 
@@ -701,9 +701,9 @@
 
     check-cast p2, Landroidx/appcompat/widget/AppCompatEditText;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-direct {p0, p2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->a(Landroidx/appcompat/widget/AppCompatEditText;)V
 
@@ -715,9 +715,9 @@
 
     check-cast p2, Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$9;
 
@@ -733,9 +733,9 @@
 
     check-cast p2, Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn:Landroidx/appcompat/widget/AppCompatImageButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$10;
 
@@ -749,9 +749,9 @@
 
     move-result-object p2
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo:Landroid/view/View;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx:Landroid/view/View;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo:Landroid/view/View;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx:Landroid/view/View;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$11;
 
@@ -763,23 +763,23 @@
 
     new-array p2, p2, [Landroid/view/View;
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXh:Landroid/view/View;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Landroid/view/View;
 
     aput-object p3, p2, v0
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXo:Landroid/view/View;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXx:Landroid/view/View;
 
     const/4 v1, 0x1
 
     aput-object p3, p2, v1
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv:Landroidx/appcompat/widget/AppCompatImageButton;
 
     const/4 v1, 0x2
 
     aput-object p3, p2, v1
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXn:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXw:Landroidx/appcompat/widget/AppCompatImageButton;
 
     const/4 v1, 0x3
 
@@ -827,18 +827,18 @@
 
     if-eqz p2, :cond_1
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXm:Landroidx/appcompat/widget/AppCompatImageButton;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXv: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;->aXp:Ljava/lang/Runnable;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Ljava/lang/Runnable;
 
     invoke-interface {p2}, Ljava/lang/Runnable;->run()V
 
     const/4 p2, 0x0
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXp:Ljava/lang/Runnable;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Ljava/lang/Runnable;
 
     new-instance p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
@@ -866,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;->aXp:Ljava/lang/Runnable;
+    iput-object p3, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXy:Ljava/lang/Runnable;
 
     new-instance p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
@@ -878,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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p1, p2, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     new-instance p3, Lcom/lytefast/flexinput/fragment/FlexInputFragment$7;
 
@@ -886,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;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
     return-void
 .end method
@@ -894,9 +894,9 @@
 .method public onPause()V
     .locals 1
 
-    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bf()Z
+    invoke-virtual {p0}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bi()Z
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXq:Lcom/lytefast/flexinput/managers/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXz:Lcom/lytefast/flexinput/managers/a;
 
     invoke-interface {v0}, Lcom/lytefast/flexinput/managers/a;->requestHide()V
 
@@ -910,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;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->getAttachments()Ljava/util/ArrayList;
 
@@ -922,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;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {v0}, Landroidx/appcompat/widget/AppCompatEditText;->getText()Landroid/text/Editable;
 
@@ -958,9 +958,9 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXt:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXC:Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;
 
-    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, v0, Lcom/lytefast/flexinput/adapters/AttachmentPreviewAdapter;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     invoke-virtual {v0, p1}, Lcom/lytefast/flexinput/utils/SelectionAggregator;->initFrom(Ljava/util/ArrayList;)Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
@@ -971,7 +971,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu:Landroidx/appcompat/widget/AppCompatEditText;
 
     invoke-virtual {p2, p1}, Landroidx/appcompat/widget/AppCompatEditText;->setText(Ljava/lang/CharSequence;)V
 
@@ -981,7 +981,7 @@
 
     if-nez p2, :cond_1
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXl:Landroidx/appcompat/widget/AppCompatEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->aXu: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 a99a31e18a..07ae1308aa 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 Ba()V
+.method public abstract Bd()V
 .end method
 
-.method public abstract Bb()V
+.method public abstract Be()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 0724fd7dfc..7207eb105d 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;->Ba()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bd()V
 
     goto :goto_0
 
     :cond_1
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bb()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Be()V
 
     :cond_2
     :goto_0
@@ -254,7 +254,7 @@
     return p1
 
     :cond_0
-    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Ba()V
+    invoke-interface {p1}, Lcom/lytefast/flexinput/fragment/PermissionsFragment$PermissionsResultCallback;->Bd()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 98bef8ea2d..f338408777 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 aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic aXK: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;->aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXK: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;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$a;->aXJ: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 4228f8265f..994eb2ddaf 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 aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic aXK: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;->aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXK: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;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     const/4 v1, 0x1
 
@@ -59,12 +59,12 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AV()V
+    invoke-virtual {v0}, Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;->AY()V
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$b;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getSwipeRefreshLayout$flexinput_release()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 22206abd2e..6fc7916606 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 aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+.field final synthetic aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
-.field final synthetic aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+.field final synthetic aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
 
 # direct methods
@@ -34,9 +34,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXJ:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,10 +45,10 @@
 
 
 # virtual methods
-.method public final Ba()V
+.method public final Bd()V
     .locals 4
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getRecyclerView$flexinput_release()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -61,7 +61,7 @@
     :cond_0
     new-instance v1, Landroidx/recyclerview/widget/GridLayoutManager;
 
-    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v2, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK: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;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getRecyclerView$flexinput_release()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -86,13 +86,13 @@
     invoke-static {}, Lkotlin/jvm/internal/l;->throwNpe()V
 
     :cond_1
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXA:Lcom/lytefast/flexinput/adapters/PhotoCursorAdapter;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXJ: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;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK:Lcom/lytefast/flexinput/fragment/PhotosFragment;
 
     invoke-virtual {v0}, Lcom/lytefast/flexinput/fragment/PhotosFragment;->getRecyclerView$flexinput_release()Landroidx/recyclerview/widget/RecyclerView;
 
@@ -108,10 +108,10 @@
     return-void
 .end method
 
-.method public final Bb()V
+.method public final Be()V
     .locals 3
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXB:Lcom/lytefast/flexinput/fragment/PhotosFragment;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/PhotosFragment$c;->aXK: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 fb0923227c..ca91a06a59 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/PhotosFragment.smali
@@ -171,7 +171,7 @@
 
     if-eqz p3, :cond_3
 
-    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->AU()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-interface {p3}, Lcom/lytefast/flexinput/FlexInputCoordinator;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p3
 
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 cd1e7602ce..3eeaf26b98 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;->AZ()V
+    value = Lcom/lytefast/flexinput/fragment/a;->Bc()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final synthetic aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aXe:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$b;->aXe: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 f105c7deb1..29ccaae9ab 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXe:Lcom/lytefast/flexinput/fragment/a;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -57,7 +57,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXe: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$c;->aXe: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 84a91fdf09..3d1581be93 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$d;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$d;->aXe: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 55093d3d79..8519afe153 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$e;->aXe: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;->AZ()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Bc()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 48d4e2fbb6..2419b8037d 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$f;->aXe:Lcom/lytefast/flexinput/fragment/a;
 
     new-instance v0, Landroid/content/Intent;
 
@@ -142,7 +142,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->AX()Ljava/util/List;
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Ba()Ljava/util/List;
 
     move-result-object v1
 
@@ -168,7 +168,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget v1, Lcom/lytefast/flexinput/fragment/a;->aWS:I
+    sget v1, Lcom/lytefast/flexinput/fragment/a;->aXb: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 deb8ffde47..891a24c03c 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
 
-.field final synthetic aWW:Landroidx/fragment/app/Fragment;
+.field final synthetic aXf: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXe:Lcom/lytefast/flexinput/fragment/a;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a$g;->aWW:Landroidx/fragment/app/Fragment;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXf: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXe:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->AZ()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Bc()V
 
-    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aWW:Landroidx/fragment/app/Fragment;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$g;->aXf:Landroidx/fragment/app/Fragment;
 
     check-cast p1, Lcom/lytefast/flexinput/fragment/FlexInputFragment;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bd()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bg()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 8b87bdb1e9..f9f25d9cdb 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$h;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$h;->aXe: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 16baf6b5ff..41f3d5077a 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object p1, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXe:Lcom/lytefast/flexinput/fragment/a;
 
-    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->AZ()V
+    invoke-virtual {p1}, Lcom/lytefast/flexinput/fragment/a;->Bc()V
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$i;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$i;->aXe: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 78fa6e2345..a27d366afd 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe:Lcom/lytefast/flexinput/fragment/a;
 
 
 # direct methods
@@ -30,7 +30,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$j;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$j;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$j;->aXe: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 a4541544f0..d6031e6e2f 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 aWV:Lcom/lytefast/flexinput/fragment/a;
+.field final synthetic aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iput-object p1, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXe: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;->aWV:Lcom/lytefast/flexinput/fragment/a;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a$k;->aXe: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 3614e29d69..a1ea5ab037 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/fragment/a.smali
@@ -13,26 +13,24 @@
 
 # static fields
 # The value of this static final field might be set in the static constructor
-.field static final aWS:I = 0x1750
+.field static final aXb:I = 0x1750
 
 # The value of this static final field might be set in the static constructor
-.field private static final aWT:Ljava/lang/String; = "com.google.android.apps.docs"
+.field private static final aXc:Ljava/lang/String; = "com.google.android.apps.docs"
 
-.field public static final aWU:Lcom/lytefast/flexinput/fragment/a$a;
+.field public static final aXd:Lcom/lytefast/flexinput/fragment/a$a;
 
 
 # instance fields
-.field private aWN:Landroidx/viewpager/widget/ViewPager;
+.field private aWW:Landroidx/viewpager/widget/ViewPager;
 
-.field private aWO:Lcom/google/android/material/tabs/TabLayout;
+.field private aWX:Lcom/google/android/material/tabs/TabLayout;
 
-.field private aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+.field private aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
-.field private aWQ:Landroid/widget/ImageView;
+.field private aWZ:Landroid/widget/ImageView;
 
-.field private final aWR:Lcom/lytefast/flexinput/fragment/a$c;
-
-.field private aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field private aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lcom/lytefast/flexinput/utils/SelectionAggregator<",
@@ -43,6 +41,8 @@
     .end annotation
 .end field
 
+.field private final aXa: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;->aWU:Lcom/lytefast/flexinput/fragment/a$a;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->aXd:Lcom/lytefast/flexinput/fragment/a$a;
 
     const/16 v0, 0x1750
 
-    sput v0, Lcom/lytefast/flexinput/fragment/a;->aWS:I
+    sput v0, Lcom/lytefast/flexinput/fragment/a;->aXb:I
 
     const-string v0, "com.google.android.apps.docs"
 
-    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->aWT:Ljava/lang/String;
+    sput-object v0, Lcom/lytefast/flexinput/fragment/a;->aXc: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;->aWR:Lcom/lytefast/flexinput/fragment/a$c;
+    iput-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aXa:Lcom/lytefast/flexinput/fragment/a$c;
 
     return-void
 .end method
 
-.method private final AY()Landroid/content/Intent;
+.method private final Bb()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;->aWT:Ljava/lang/String;
+    sget-object v7, Lcom/lytefast/flexinput/fragment/a;->aXc: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;->aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->aWN:Landroidx/viewpager/widget/ViewPager;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWn: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;->aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object p0, p0, Lcom/lytefast/flexinput/fragment/a;->aWY:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
 
     return-object p0
 .end method
 
 
 # virtual methods
-.method AX()Ljava/util/List;
+.method Ba()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;->aWT:Ljava/lang/String;
+    sget-object v4, Lcom/lytefast/flexinput/fragment/a;->aXc:Ljava/lang/String;
 
     invoke-static {v1, v4}, Lkotlin/jvm/internal/l;->areEqual(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;->AY()Landroid/content/Intent;
+    invoke-direct {p0}, Lcom/lytefast/flexinput/fragment/a;->Bb()Landroid/content/Intent;
 
     move-result-object v0
 
@@ -499,7 +499,7 @@
     return-object v0
 .end method
 
-.method public final AZ()V
+.method public final Bc()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;->aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWN:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWQ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWZ: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;->aWS:I
+    sget v0, Lcom/lytefast/flexinput/fragment/a;->aXb:I
 
     if-ne v0, p1, :cond_a
 
@@ -856,7 +856,7 @@
 
     check-cast p2, Landroidx/viewpager/widget/ViewPager;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWN:Landroidx/viewpager/widget/ViewPager;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->aWQ:Landroid/widget/ImageView;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWZ:Landroid/widget/ImageView;
 
-    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWQ:Landroid/widget/ImageView;
+    iget-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWZ: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;->Bc()[Lcom/lytefast/flexinput/adapters/a$b;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->Bf()[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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v3, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWc:[Lcom/lytefast/flexinput/adapters/a$b;
+    iget-object v4, p3, Lcom/lytefast/flexinput/adapters/a;->aWl:[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;->aWN:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWN:Landroidx/viewpager/widget/ViewPager;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->AU()Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    invoke-virtual {v2}, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->AX()Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     move-result-object p2
 
-    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aWR:Lcom/lytefast/flexinput/fragment/a$c;
+    iget-object p3, p0, Lcom/lytefast/flexinput/fragment/a;->aXa: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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p2, p0, Lcom/lytefast/flexinput/fragment/a;->aWn: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;->aWe:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWn:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
     if-eqz v0, :cond_0
 
-    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/a;->aWR:Lcom/lytefast/flexinput/fragment/a$c;
+    iget-object v1, p0, Lcom/lytefast/flexinput/fragment/a;->aXa: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;->aWP:Lcom/google/android/material/floatingactionbutton/FloatingActionButton;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWY: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;->aWO:Lcom/google/android/material/tabs/TabLayout;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWX: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;->aWN:Landroidx/viewpager/widget/ViewPager;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWW: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;->aWQ:Landroid/widget/ImageView;
+    iget-object v0, p0, Lcom/lytefast/flexinput/fragment/a;->aWZ: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 19cdc27269..20276af425 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 Bi()Ljava/io/File;
+.method public abstract Bl()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 7165e39b67..492054ef93 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 aXF:Lcom/lytefast/flexinput/managers/b$a;
+.field public static final aXO:Lcom/lytefast/flexinput/managers/b$a;
 
 
 # instance fields
-.field private final aXC:Ljava/lang/String;
+.field private final aXL:Ljava/lang/String;
 
-.field private final aXD:Ljava/lang/String;
+.field private final aXM:Ljava/lang/String;
 
-.field private final aXE:Ljava/lang/String;
+.field private final aXN: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;->aXF:Lcom/lytefast/flexinput/managers/b$a;
+    sput-object v0, Lcom/lytefast/flexinput/managers/b;->aXO: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;->aXC:Ljava/lang/String;
+    iput-object p1, p0, Lcom/lytefast/flexinput/managers/b;->aXL:Ljava/lang/String;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/managers/b;->aXD:Ljava/lang/String;
+    iput-object p2, p0, Lcom/lytefast/flexinput/managers/b;->aXM:Ljava/lang/String;
 
-    iput-object p3, p0, Lcom/lytefast/flexinput/managers/b;->aXE:Ljava/lang/String;
+    iput-object p3, p0, Lcom/lytefast/flexinput/managers/b;->aXN:Ljava/lang/String;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bi()Ljava/io/File;
+.method public final Bl()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;->aXE:Ljava/lang/String;
+    iget-object v2, p0, Lcom/lytefast/flexinput/managers/b;->aXN: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;->aXD:Ljava/lang/String;
+    iget-object v4, p0, Lcom/lytefast/flexinput/managers/b;->aXM: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/managers/b;->aXC:Ljava/lang/String;
+    iget-object v0, p0, Lcom/lytefast/flexinput/managers/b;->aXL: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 8d0e6c1420..c60746f117 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 aXH:Lcom/lytefast/flexinput/model/Photo;
+.field final synthetic aXQ: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;->aXH:Lcom/lytefast/flexinput/model/Photo;
+    iput-object p1, p0, Lcom/lytefast/flexinput/model/Photo$c;->aXQ: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;->aXH:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v1, p0, Lcom/lytefast/flexinput/model/Photo$c;->aXQ: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;->aXH:Lcom/lytefast/flexinput/model/Photo;
+    iget-object v2, p0, Lcom/lytefast/flexinput/model/Photo$c;->aXQ: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 e8e075bfba..86233821d9 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 aXG:Lcom/lytefast/flexinput/model/Photo$a;
+.field public static final aXP: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;->aXG:Lcom/lytefast/flexinput/model/Photo$a;
+    sput-object v0, Lcom/lytefast/flexinput/model/Photo;->aXP: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 ac8e3523b1..5bb5b53783 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 aXK:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+.field final synthetic aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-.field final synthetic aXL:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+.field final synthetic aXU:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
 
 # direct methods
@@ -42,9 +42,9 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXK:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXT:Lcom/lytefast/flexinput/utils/SelectionAggregator;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXL:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXU:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -62,7 +62,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXK:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXT: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXK:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXT: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;->aXK:Lcom/lytefast/flexinput/utils/SelectionAggregator;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXT: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;->aXL:Lcom/lytefast/flexinput/utils/SelectionCoordinator;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionAggregator$a;->aXU: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 c424ebc484..ecdc036e31 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/SelectionAggregator.smali
@@ -488,7 +488,7 @@
 
     new-instance v2, Ljava/util/ArrayList;
 
-    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v3}, Landroidx/collection/ArrayMap;->values()Ljava/util/Collection;
 
@@ -496,11 +496,11 @@
 
     invoke-direct {v2, v3}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v3, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW:Landroidx/collection/ArrayMap;
 
     invoke-virtual {v3}, Landroidx/collection/ArrayMap;->clear()V
 
-    iget-object v1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXM:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v1, v1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     if-eqz v1, :cond_0
 
@@ -806,7 +806,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXM:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v1, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     if-nez v1, :cond_3
 
@@ -835,7 +835,7 @@
     :cond_1
     if-eqz v1, :cond_0
 
-    iget-object v2, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v2, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW: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 fe0ce60ef1..8fe69765ad 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 aXP:Ljava/lang/Object;
+.field private final aXY: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;->aXP:Ljava/lang/Object;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXY: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;->aXP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXY:Ljava/lang/Object;
 
-    iget-object v3, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXP:Ljava/lang/Object;
+    iget-object v3, p1, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXY:Ljava/lang/Object;
 
     invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->areEqual(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;->aXP:Ljava/lang/Object;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXY: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;->aXP:Ljava/lang/Object;
+    iget-object v1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator$b;->aXY: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 04387097f5..b06f162b5a 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 aXM:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.field aXV: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 aXN:Landroidx/collection/ArrayMap;
+.field final aXW:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -43,7 +43,7 @@
     .end annotation
 .end field
 
-.field public aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+.field public aXX: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;->aXN:Landroidx/collection/ArrayMap;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW:Landroidx/collection/ArrayMap;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
 
     return-void
 .end method
@@ -131,7 +131,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXM:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXV:Landroidx/recyclerview/widget/RecyclerView$Adapter;
 
     return-object p0
 .end method
@@ -150,7 +150,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iput-object p1, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX: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;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW: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;->aXM:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXV: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;->aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX: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;->aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX: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;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW: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;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW:Landroidx/collection/ArrayMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -313,7 +313,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXN:Landroidx/collection/ArrayMap;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXW: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;->aXM:Landroidx/recyclerview/widget/RecyclerView$Adapter;
+    iget-object v0, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXV: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;->aXO:Lcom/lytefast/flexinput/utils/SelectionCoordinator$ItemSelectionListener;
+    iget-object p2, p0, Lcom/lytefast/flexinput/utils/SelectionCoordinator;->aXX: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 0d2b234c5d..ba860f19db 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 aXI:Lcom/lytefast/flexinput/utils/a;
+.field public static final aXR: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;->aXI:Lcom/lytefast/flexinput/utils/a;
+    sput-object v0, Lcom/lytefast/flexinput/utils/a;->aXR:Lcom/lytefast/flexinput/utils/a;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static Bj()Z
+.method public static Bm()Z
     .locals 2
 
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali
index 6540acba06..1eed87d8ff 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/b.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final aXJ:Lcom/lytefast/flexinput/utils/b;
+.field public static final aXS:Lcom/lytefast/flexinput/utils/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/utils/b;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/utils/b;->aXJ:Lcom/lytefast/flexinput/utils/b;
+    sput-object v0, Lcom/lytefast/flexinput/utils/b;->aXS:Lcom/lytefast/flexinput/utils/b;
 
     return-void
 .end method
@@ -136,7 +136,7 @@
 
     :cond_3
     :try_start_1
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/d$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/d$a.smali
index 71b548071d..5bdde0162a 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/d$a.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/d$a.smali
@@ -131,7 +131,7 @@
 
     check-cast p1, Lcom/lytefast/flexinput/utils/d$a;
 
-    sget-object p2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-virtual {p1, p2}, Lcom/lytefast/flexinput/utils/d$a;->invokeSuspend(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/utils/d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/utils/d.smali
index 1ed68f7f47..92255c4e5b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/utils/d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/utils/d.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final aXQ:Lcom/lytefast/flexinput/utils/d;
+.field public static final aXZ:Lcom/lytefast/flexinput/utils/d;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lcom/lytefast/flexinput/utils/d;-><init>()V
 
-    sput-object v0, Lcom/lytefast/flexinput/utils/d;->aXQ:Lcom/lytefast/flexinput/utils/d;
+    sput-object v0, Lcom/lytefast/flexinput/utils/d;->aXZ:Lcom/lytefast/flexinput/utils/d;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DE()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DH()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText$a.smali b/com.discord/smali_classes2/com/lytefast/flexinput/widget/FlexEditText$a.smali
index 5b239e28bd..a4b51ae872 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 aXR:Lcom/lytefast/flexinput/widget/FlexEditText;
+.field final synthetic aYa:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-.field final synthetic aXS:Landroid/view/inputmethod/EditorInfo;
+.field final synthetic aYb: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;->aXR:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iput-object p1, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aYa:Lcom/lytefast/flexinput/widget/FlexEditText;
 
-    iput-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aXS:Landroid/view/inputmethod/EditorInfo;
+    iput-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aYb: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;->aXR:Lcom/lytefast/flexinput/widget/FlexEditText;
+    iget-object p2, p0, Lcom/lytefast/flexinput/widget/FlexEditText$a;->aYa: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 147a9cf3b0..38f9c9c702 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;->aXX:Landroid/os/Bundle;
+    iget-object v1, p5, Lcom/yalantis/ucrop/a$a;->aYg: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;->aXX:Landroid/os/Bundle;
+    iget-object v2, p5, Lcom/yalantis/ucrop/a$a;->aYg: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;->aXW:Landroid/os/Bundle;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYf:Landroid/os/Bundle;
 
-    iget-object p5, p5, Lcom/yalantis/ucrop/a$a;->aXX:Landroid/os/Bundle;
+    iget-object p5, p5, Lcom/yalantis/ucrop/a$a;->aYg: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;->aXW:Landroid/os/Bundle;
+    iget-object p3, v2, Lcom/yalantis/ucrop/a;->aYf: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;->aXW:Landroid/os/Bundle;
+    iget-object p2, v2, Lcom/yalantis/ucrop/a;->aYf: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;->aXV:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYe: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;->aXV:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYe:Landroid/content/Intent;
 
-    iget-object p2, v2, Lcom/yalantis/ucrop/a;->aXW:Landroid/os/Bundle;
+    iget-object p2, v2, Lcom/yalantis/ucrop/a;->aYf: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;->aXV:Landroid/content/Intent;
+    iget-object p1, v2, Lcom/yalantis/ucrop/a;->aYe: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 f21cbeb81a..c41f887f7c 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
@@ -315,281 +315,281 @@
 
 .field public static final layout_keyline:I = 0x7f04024b
 
-.field public static final lineHeight:I = 0x7f040259
+.field public static final lineHeight:I = 0x7f04025a
 
-.field public static final listChoiceBackgroundIndicator:I = 0x7f04025b
+.field public static final listChoiceBackgroundIndicator:I = 0x7f04025c
 
-.field public static final listDividerAlertDialog:I = 0x7f04025c
+.field public static final listDividerAlertDialog:I = 0x7f04025d
 
-.field public static final listItemLayout:I = 0x7f04025d
+.field public static final listItemLayout:I = 0x7f04025e
 
-.field public static final listLayout:I = 0x7f04025e
+.field public static final listLayout:I = 0x7f04025f
 
-.field public static final listMenuViewStyle:I = 0x7f04025f
+.field public static final listMenuViewStyle:I = 0x7f040260
 
-.field public static final listPopupWindowStyle:I = 0x7f040260
+.field public static final listPopupWindowStyle:I = 0x7f040261
 
-.field public static final listPreferredItemHeight:I = 0x7f040261
+.field public static final listPreferredItemHeight:I = 0x7f040262
 
-.field public static final listPreferredItemHeightLarge:I = 0x7f040262
+.field public static final listPreferredItemHeightLarge:I = 0x7f040263
 
-.field public static final listPreferredItemHeightSmall:I = 0x7f040263
+.field public static final listPreferredItemHeightSmall:I = 0x7f040264
 
-.field public static final listPreferredItemPaddingLeft:I = 0x7f040264
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040265
 
-.field public static final listPreferredItemPaddingRight:I = 0x7f040265
+.field public static final listPreferredItemPaddingRight:I = 0x7f040266
 
-.field public static final logo:I = 0x7f040266
+.field public static final logo:I = 0x7f040267
 
-.field public static final logoDescription:I = 0x7f040267
+.field public static final logoDescription:I = 0x7f040268
 
-.field public static final maxButtonHeight:I = 0x7f04027a
+.field public static final maxButtonHeight:I = 0x7f04027b
 
-.field public static final measureWithLargestChild:I = 0x7f04027d
+.field public static final measureWithLargestChild:I = 0x7f04027e
 
-.field public static final multiChoiceItemLayout:I = 0x7f04027f
+.field public static final multiChoiceItemLayout:I = 0x7f040280
 
-.field public static final navigationContentDescription:I = 0x7f040280
+.field public static final navigationContentDescription:I = 0x7f040281
 
-.field public static final navigationIcon:I = 0x7f040281
+.field public static final navigationIcon:I = 0x7f040282
 
-.field public static final navigationMode:I = 0x7f040282
+.field public static final navigationMode:I = 0x7f040283
 
-.field public static final numericModifiers:I = 0x7f040286
+.field public static final numericModifiers:I = 0x7f040287
 
-.field public static final overlapAnchor:I = 0x7f040287
+.field public static final overlapAnchor:I = 0x7f040288
 
-.field public static final paddingBottomNoButtons:I = 0x7f04028b
+.field public static final paddingBottomNoButtons:I = 0x7f04028c
 
-.field public static final paddingEnd:I = 0x7f04028c
+.field public static final paddingEnd:I = 0x7f04028d
 
-.field public static final paddingStart:I = 0x7f04028d
+.field public static final paddingStart:I = 0x7f04028e
 
-.field public static final paddingTopNoTitle:I = 0x7f04028e
+.field public static final paddingTopNoTitle:I = 0x7f04028f
 
-.field public static final panelBackground:I = 0x7f04028f
+.field public static final panelBackground:I = 0x7f040290
 
-.field public static final panelMenuListTheme:I = 0x7f040290
+.field public static final panelMenuListTheme:I = 0x7f040291
 
-.field public static final panelMenuListWidth:I = 0x7f040291
+.field public static final panelMenuListWidth:I = 0x7f040292
 
-.field public static final popupMenuStyle:I = 0x7f040299
+.field public static final popupMenuStyle:I = 0x7f04029a
 
-.field public static final popupTheme:I = 0x7f04029a
+.field public static final popupTheme:I = 0x7f04029b
 
-.field public static final popupWindowStyle:I = 0x7f04029b
+.field public static final popupWindowStyle:I = 0x7f04029c
 
-.field public static final preserveIconSpacing:I = 0x7f04029c
+.field public static final preserveIconSpacing:I = 0x7f04029d
 
-.field public static final progressBarPadding:I = 0x7f0402c8
+.field public static final progressBarPadding:I = 0x7f0402c9
 
-.field public static final progressBarStyle:I = 0x7f0402c9
+.field public static final progressBarStyle:I = 0x7f0402ca
 
-.field public static final queryBackground:I = 0x7f0402cc
+.field public static final queryBackground:I = 0x7f0402cd
 
-.field public static final queryHint:I = 0x7f0402cd
+.field public static final queryHint:I = 0x7f0402ce
 
-.field public static final radioButtonStyle:I = 0x7f0402ce
+.field public static final radioButtonStyle:I = 0x7f0402cf
 
-.field public static final ratingBarStyle:I = 0x7f0402d1
+.field public static final ratingBarStyle:I = 0x7f0402d2
 
-.field public static final ratingBarStyleIndicator:I = 0x7f0402d2
+.field public static final ratingBarStyleIndicator:I = 0x7f0402d3
 
-.field public static final ratingBarStyleSmall:I = 0x7f0402d3
+.field public static final ratingBarStyleSmall:I = 0x7f0402d4
 
-.field public static final searchHintIcon:I = 0x7f0402f8
+.field public static final searchHintIcon:I = 0x7f0402f9
 
-.field public static final searchIcon:I = 0x7f0402f9
+.field public static final searchIcon:I = 0x7f0402fa
 
-.field public static final searchViewStyle:I = 0x7f0402fa
+.field public static final searchViewStyle:I = 0x7f0402fb
 
-.field public static final seekBarStyle:I = 0x7f0402fc
+.field public static final seekBarStyle:I = 0x7f0402fd
 
-.field public static final selectableItemBackground:I = 0x7f0402fd
+.field public static final selectableItemBackground:I = 0x7f0402fe
 
-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402fe
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ff
 
-.field public static final showAsAction:I = 0x7f040300
+.field public static final showAsAction:I = 0x7f040301
 
-.field public static final showDividers:I = 0x7f040304
+.field public static final showDividers:I = 0x7f040305
 
-.field public static final showText:I = 0x7f040306
+.field public static final showText:I = 0x7f040307
 
-.field public static final showTitle:I = 0x7f040307
+.field public static final showTitle:I = 0x7f040308
 
-.field public static final singleChoiceItemLayout:I = 0x7f040308
+.field public static final singleChoiceItemLayout:I = 0x7f040309
 
-.field public static final spinBars:I = 0x7f04030e
+.field public static final spinBars:I = 0x7f04030f
 
-.field public static final spinnerDropDownItemStyle:I = 0x7f04030f
+.field public static final spinnerDropDownItemStyle:I = 0x7f040310
 
-.field public static final spinnerStyle:I = 0x7f040310
+.field public static final spinnerStyle:I = 0x7f040311
 
-.field public static final splitTrack:I = 0x7f040311
+.field public static final splitTrack:I = 0x7f040312
 
-.field public static final srcCompat:I = 0x7f040312
+.field public static final srcCompat:I = 0x7f040313
 
-.field public static final state_above_anchor:I = 0x7f040314
+.field public static final state_above_anchor:I = 0x7f040315
 
-.field public static final statusBarBackground:I = 0x7f040319
+.field public static final statusBarBackground:I = 0x7f04031a
 
-.field public static final subMenuArrow:I = 0x7f040320
+.field public static final subMenuArrow:I = 0x7f040321
 
-.field public static final submitBackground:I = 0x7f040321
+.field public static final submitBackground:I = 0x7f040322
 
-.field public static final subtitle:I = 0x7f040322
+.field public static final subtitle:I = 0x7f040323
 
-.field public static final subtitleTextAppearance:I = 0x7f040323
+.field public static final subtitleTextAppearance:I = 0x7f040324
 
-.field public static final subtitleTextColor:I = 0x7f040324
+.field public static final subtitleTextColor:I = 0x7f040325
 
-.field public static final subtitleTextStyle:I = 0x7f040325
+.field public static final subtitleTextStyle:I = 0x7f040326
 
-.field public static final suggestionRowLayout:I = 0x7f040326
+.field public static final suggestionRowLayout:I = 0x7f040327
 
-.field public static final switchMinWidth:I = 0x7f040327
+.field public static final switchMinWidth:I = 0x7f040328
 
-.field public static final switchPadding:I = 0x7f040328
+.field public static final switchPadding:I = 0x7f040329
 
-.field public static final switchStyle:I = 0x7f040329
+.field public static final switchStyle:I = 0x7f04032a
 
-.field public static final switchTextAppearance:I = 0x7f04032a
+.field public static final switchTextAppearance:I = 0x7f04032b
 
-.field public static final textAllCaps:I = 0x7f040348
+.field public static final textAllCaps:I = 0x7f040349
 
-.field public static final textAppearanceLargePopupMenu:I = 0x7f040353
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040354
 
-.field public static final textAppearanceListItem:I = 0x7f040354
+.field public static final textAppearanceListItem:I = 0x7f040355
 
-.field public static final textAppearanceListItemSecondary:I = 0x7f040355
+.field public static final textAppearanceListItemSecondary:I = 0x7f040356
 
-.field public static final textAppearanceListItemSmall:I = 0x7f040356
+.field public static final textAppearanceListItemSmall:I = 0x7f040357
 
-.field public static final textAppearancePopupMenuHeader:I = 0x7f040358
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040359
 
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040359
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f04035a
 
-.field public static final textAppearanceSearchResultTitle:I = 0x7f04035a
+.field public static final textAppearanceSearchResultTitle:I = 0x7f04035b
 
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035b
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f04035c
 
-.field public static final textColorAlertDialogListItem:I = 0x7f04035e
+.field public static final textColorAlertDialogListItem:I = 0x7f04035f
 
-.field public static final textColorSearchUrl:I = 0x7f04035f
+.field public static final textColorSearchUrl:I = 0x7f040360
 
-.field public static final theme:I = 0x7f040364
+.field public static final theme:I = 0x7f040365
 
-.field public static final thickness:I = 0x7f0403b5
+.field public static final thickness:I = 0x7f0403b6
 
-.field public static final thumbTextPadding:I = 0x7f0403b6
+.field public static final thumbTextPadding:I = 0x7f0403b7
 
-.field public static final thumbTint:I = 0x7f0403b7
+.field public static final thumbTint:I = 0x7f0403b8
 
-.field public static final thumbTintMode:I = 0x7f0403b8
+.field public static final thumbTintMode:I = 0x7f0403b9
 
-.field public static final tickMark:I = 0x7f0403b9
+.field public static final tickMark:I = 0x7f0403ba
 
-.field public static final tickMarkTint:I = 0x7f0403ba
+.field public static final tickMarkTint:I = 0x7f0403bb
 
-.field public static final tickMarkTintMode:I = 0x7f0403bb
+.field public static final tickMarkTintMode:I = 0x7f0403bc
 
-.field public static final tint:I = 0x7f0403bc
+.field public static final tint:I = 0x7f0403bd
 
-.field public static final tintMode:I = 0x7f0403bd
+.field public static final tintMode:I = 0x7f0403be
 
-.field public static final title:I = 0x7f0403be
+.field public static final title:I = 0x7f0403bf
 
-.field public static final titleMargin:I = 0x7f0403c0
+.field public static final titleMargin:I = 0x7f0403c1
 
-.field public static final titleMarginBottom:I = 0x7f0403c1
+.field public static final titleMarginBottom:I = 0x7f0403c2
 
-.field public static final titleMarginEnd:I = 0x7f0403c2
+.field public static final titleMarginEnd:I = 0x7f0403c3
 
-.field public static final titleMarginStart:I = 0x7f0403c3
+.field public static final titleMarginStart:I = 0x7f0403c4
 
-.field public static final titleMarginTop:I = 0x7f0403c4
+.field public static final titleMarginTop:I = 0x7f0403c5
 
-.field public static final titleMargins:I = 0x7f0403c5
+.field public static final titleMargins:I = 0x7f0403c6
 
-.field public static final titleTextAppearance:I = 0x7f0403c6
+.field public static final titleTextAppearance:I = 0x7f0403c7
 
-.field public static final titleTextColor:I = 0x7f0403c7
+.field public static final titleTextColor:I = 0x7f0403c8
 
-.field public static final titleTextStyle:I = 0x7f0403c8
+.field public static final titleTextStyle:I = 0x7f0403c9
 
-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403ca
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403cb
 
-.field public static final toolbarStyle:I = 0x7f0403cb
+.field public static final toolbarStyle:I = 0x7f0403cc
 
-.field public static final tooltipForegroundColor:I = 0x7f0403cc
+.field public static final tooltipForegroundColor:I = 0x7f0403cd
 
-.field public static final tooltipFrameBackground:I = 0x7f0403cd
+.field public static final tooltipFrameBackground:I = 0x7f0403ce
 
-.field public static final tooltipText:I = 0x7f0403ce
+.field public static final tooltipText:I = 0x7f0403cf
 
-.field public static final track:I = 0x7f0403cf
+.field public static final track:I = 0x7f0403d0
 
-.field public static final trackTint:I = 0x7f0403d0
+.field public static final trackTint:I = 0x7f0403d1
 
-.field public static final trackTintMode:I = 0x7f0403d1
+.field public static final trackTintMode:I = 0x7f0403d2
 
-.field public static final ttcIndex:I = 0x7f0403d2
+.field public static final ttcIndex:I = 0x7f0403d3
 
-.field public static final ucrop_artv_ratio_title:I = 0x7f0403d6
+.field public static final ucrop_artv_ratio_title:I = 0x7f0403d7
 
-.field public static final ucrop_artv_ratio_x:I = 0x7f0403d7
+.field public static final ucrop_artv_ratio_x:I = 0x7f0403d8
 
-.field public static final ucrop_artv_ratio_y:I = 0x7f0403d8
+.field public static final ucrop_artv_ratio_y:I = 0x7f0403d9
 
-.field public static final ucrop_aspect_ratio_x:I = 0x7f0403d9
+.field public static final ucrop_aspect_ratio_x:I = 0x7f0403da
 
-.field public static final ucrop_aspect_ratio_y:I = 0x7f0403da
+.field public static final ucrop_aspect_ratio_y:I = 0x7f0403db
 
-.field public static final ucrop_circle_dimmed_layer:I = 0x7f0403db
+.field public static final ucrop_circle_dimmed_layer:I = 0x7f0403dc
 
-.field public static final ucrop_dimmed_color:I = 0x7f0403dc
+.field public static final ucrop_dimmed_color:I = 0x7f0403dd
 
-.field public static final ucrop_frame_color:I = 0x7f0403dd
+.field public static final ucrop_frame_color:I = 0x7f0403de
 
-.field public static final ucrop_frame_stroke_size:I = 0x7f0403de
+.field public static final ucrop_frame_stroke_size:I = 0x7f0403df
 
-.field public static final ucrop_grid_color:I = 0x7f0403df
+.field public static final ucrop_grid_color:I = 0x7f0403e0
 
-.field public static final ucrop_grid_column_count:I = 0x7f0403e0
+.field public static final ucrop_grid_column_count:I = 0x7f0403e1
 
-.field public static final ucrop_grid_row_count:I = 0x7f0403e1
+.field public static final ucrop_grid_row_count:I = 0x7f0403e2
 
-.field public static final ucrop_grid_stroke_size:I = 0x7f0403e2
+.field public static final ucrop_grid_stroke_size:I = 0x7f0403e3
 
-.field public static final ucrop_show_frame:I = 0x7f0403e3
+.field public static final ucrop_show_frame:I = 0x7f0403e4
 
-.field public static final ucrop_show_grid:I = 0x7f0403e4
+.field public static final ucrop_show_grid:I = 0x7f0403e5
 
-.field public static final ucrop_show_oval_crop_frame:I = 0x7f0403e5
+.field public static final ucrop_show_oval_crop_frame:I = 0x7f0403e6
 
-.field public static final viewInflaterClass:I = 0x7f0403ed
+.field public static final viewInflaterClass:I = 0x7f0403ee
 
-.field public static final voiceIcon:I = 0x7f0403ee
+.field public static final voiceIcon:I = 0x7f0403ef
 
-.field public static final windowActionBar:I = 0x7f0403f0
+.field public static final windowActionBar:I = 0x7f0403f1
 
-.field public static final windowActionBarOverlay:I = 0x7f0403f1
+.field public static final windowActionBarOverlay:I = 0x7f0403f2
 
-.field public static final windowActionModeOverlay:I = 0x7f0403f2
+.field public static final windowActionModeOverlay:I = 0x7f0403f3
 
-.field public static final windowFixedHeightMajor:I = 0x7f0403f3
+.field public static final windowFixedHeightMajor:I = 0x7f0403f4
 
-.field public static final windowFixedHeightMinor:I = 0x7f0403f4
+.field public static final windowFixedHeightMinor:I = 0x7f0403f5
 
-.field public static final windowFixedWidthMajor:I = 0x7f0403f5
+.field public static final windowFixedWidthMajor:I = 0x7f0403f6
 
-.field public static final windowFixedWidthMinor:I = 0x7f0403f6
+.field public static final windowFixedWidthMinor:I = 0x7f0403f7
 
-.field public static final windowMinWidthMajor:I = 0x7f0403f7
+.field public static final windowMinWidthMajor:I = 0x7f0403f8
 
-.field public static final windowMinWidthMinor:I = 0x7f0403f8
+.field public static final windowMinWidthMinor:I = 0x7f0403f9
 
-.field public static final windowNoTitle:I = 0x7f0403f9
+.field public static final windowNoTitle:I = 0x7f0403fa
 
 
 # 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 d514a8a01d..c6fd4f53c8 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 = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final error_color_material_dark:I = 0x7f06006c
+.field public static final error_color_material_dark:I = 0x7f06006d
 
-.field public static final error_color_material_light:I = 0x7f06006d
+.field public static final error_color_material_light:I = 0x7f06006e
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
-.field public static final ucrop_color_crop_background:I = 0x7f060139
+.field public static final ucrop_color_crop_background:I = 0x7f06013a
 
-.field public static final ucrop_color_default_crop_frame:I = 0x7f06013a
+.field public static final ucrop_color_default_crop_frame:I = 0x7f06013b
 
-.field public static final ucrop_color_default_crop_grid:I = 0x7f06013b
+.field public static final ucrop_color_default_crop_grid:I = 0x7f06013c
 
-.field public static final ucrop_color_default_dimmed:I = 0x7f06013c
+.field public static final ucrop_color_default_dimmed:I = 0x7f06013d
 
-.field public static final ucrop_color_default_logo:I = 0x7f06013d
+.field public static final ucrop_color_default_logo:I = 0x7f06013e
 
-.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013e
+.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013f
 
-.field public static final ucrop_color_statusbar:I = 0x7f06013f
+.field public static final ucrop_color_statusbar:I = 0x7f060140
 
-.field public static final ucrop_color_toolbar:I = 0x7f060140
+.field public static final ucrop_color_toolbar:I = 0x7f060141
 
-.field public static final ucrop_color_toolbar_widget:I = 0x7f060141
+.field public static final ucrop_color_toolbar_widget:I = 0x7f060142
 
-.field public static final ucrop_color_widget:I = 0x7f060142
+.field public static final ucrop_color_widget:I = 0x7f060143
 
-.field public static final ucrop_color_widget_active:I = 0x7f060143
+.field public static final ucrop_color_widget_active:I = 0x7f060144
 
-.field public static final ucrop_color_widget_background:I = 0x7f060144
+.field public static final ucrop_color_widget_background:I = 0x7f060145
 
-.field public static final ucrop_color_widget_text:I = 0x7f060145
+.field public static final ucrop_color_widget_text:I = 0x7f060146
 
-.field public static final ucrop_scale_text_view_selector:I = 0x7f060146
+.field public static final ucrop_scale_text_view_selector:I = 0x7f060147
 
 
 # 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 3a4eac5ca7..b1ab5b4243 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
-.field public static final ucrop_ic_angle:I = 0x7f08047a
+.field public static final ucrop_ic_angle:I = 0x7f080488
 
-.field public static final ucrop_ic_crop:I = 0x7f08047b
+.field public static final ucrop_ic_crop:I = 0x7f080489
 
-.field public static final ucrop_ic_cross:I = 0x7f08047c
+.field public static final ucrop_ic_cross:I = 0x7f08048a
 
-.field public static final ucrop_ic_done:I = 0x7f08047d
+.field public static final ucrop_ic_done:I = 0x7f08048b
 
-.field public static final ucrop_ic_next:I = 0x7f08047e
+.field public static final ucrop_ic_next:I = 0x7f08048c
 
-.field public static final ucrop_ic_reset:I = 0x7f08047f
+.field public static final ucrop_ic_reset:I = 0x7f08048d
 
-.field public static final ucrop_ic_rotate:I = 0x7f080480
+.field public static final ucrop_ic_rotate:I = 0x7f08048e
 
-.field public static final ucrop_ic_scale:I = 0x7f080481
+.field public static final ucrop_ic_scale:I = 0x7f08048f
 
-.field public static final ucrop_shadow_upside:I = 0x7f080482
+.field public static final ucrop_shadow_upside:I = 0x7f080490
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080483
+.field public static final ucrop_vector_ic_crop:I = 0x7f080491
 
-.field public static final ucrop_vector_loader:I = 0x7f080484
+.field public static final ucrop_vector_loader:I = 0x7f080492
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080485
+.field public static final ucrop_vector_loader_animated:I = 0x7f080493
 
 
 # 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 8d2d4a8378..fdc478ef9f 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,9 +57,9 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -69,215 +69,215 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final content:I = 0x7f0a0231
+.field public static final content:I = 0x7f0a0234
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final group_divider:I = 0x7f0a0325
+.field public static final group_divider:I = 0x7f0a032d
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final image_view_crop:I = 0x7f0a0394
+.field public static final image_view_crop:I = 0x7f0a039c
 
-.field public static final image_view_logo:I = 0x7f0a0395
+.field public static final image_view_logo:I = 0x7f0a039d
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a0396
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a039e
 
-.field public static final image_view_state_rotate:I = 0x7f0a0397
+.field public static final image_view_state_rotate:I = 0x7f0a039f
 
-.field public static final image_view_state_scale:I = 0x7f0a0398
+.field public static final image_view_state_scale:I = 0x7f0a03a0
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final layout_aspect_ratio:I = 0x7f0a0410
+.field public static final layout_aspect_ratio:I = 0x7f0a0418
 
-.field public static final layout_rotate_wheel:I = 0x7f0a0411
+.field public static final layout_rotate_wheel:I = 0x7f0a0419
 
-.field public static final layout_scale_wheel:I = 0x7f0a0412
+.field public static final layout_scale_wheel:I = 0x7f0a041a
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final menu_crop:I = 0x7f0a0456
+.field public static final menu_crop:I = 0x7f0a045e
 
-.field public static final menu_loader:I = 0x7f0a0462
+.field public static final menu_loader:I = 0x7f0a046a
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a05a0
+.field public static final rotate_scroll_wheel:I = 0x7f0a05b5
 
-.field public static final scale_scroll_wheel:I = 0x7f0a05a6
+.field public static final scale_scroll_wheel:I = 0x7f0a05bb
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final state_aspect_ratio:I = 0x7f0a071a
+.field public static final state_aspect_ratio:I = 0x7f0a0735
 
-.field public static final state_rotate:I = 0x7f0a071b
+.field public static final state_rotate:I = 0x7f0a0736
 
-.field public static final state_scale:I = 0x7f0a071c
+.field public static final state_scale:I = 0x7f0a0737
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0744
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0768
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0745
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0769
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_view_rotate:I = 0x7f0a0752
+.field public static final text_view_rotate:I = 0x7f0a0776
 
-.field public static final text_view_scale:I = 0x7f0a0753
+.field public static final text_view_scale:I = 0x7f0a0777
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final toolbar:I = 0x7f0a075d
+.field public static final toolbar:I = 0x7f0a0781
 
-.field public static final toolbar_title:I = 0x7f0a075f
+.field public static final toolbar_title:I = 0x7f0a0783
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final ucrop:I = 0x7f0a076e
+.field public static final ucrop:I = 0x7f0a0792
 
-.field public static final ucrop_frame:I = 0x7f0a076f
+.field public static final ucrop_frame:I = 0x7f0a0793
 
-.field public static final ucrop_photobox:I = 0x7f0a0770
+.field public static final ucrop_photobox:I = 0x7f0a0794
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_overlay:I = 0x7f0a0800
+.field public static final view_overlay:I = 0x7f0a082f
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
-.field public static final wrapper_controls:I = 0x7f0a0853
+.field public static final wrapper_controls:I = 0x7f0a0883
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0854
+.field public static final wrapper_reset_rotate:I = 0x7f0a0884
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0855
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a0885
 
-.field public static final wrapper_states:I = 0x7f0a0856
+.field public static final wrapper_states:I = 0x7f0a0886
 
 
 # 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 26325b9062..c4de6db695 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final ucrop_activity_photobox:I = 0x7f0d0061
+.field public static final ucrop_activity_photobox:I = 0x7f0d0064
 
-.field public static final ucrop_aspect_ratio:I = 0x7f0d0062
+.field public static final ucrop_aspect_ratio:I = 0x7f0d0065
 
-.field public static final ucrop_controls:I = 0x7f0d0063
+.field public static final ucrop_controls:I = 0x7f0d0066
 
-.field public static final ucrop_fragment_photobox:I = 0x7f0d0064
+.field public static final ucrop_fragment_photobox:I = 0x7f0d0067
 
-.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0065
+.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0068
 
-.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0066
+.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0069
 
-.field public static final ucrop_view:I = 0x7f0d0067
+.field public static final ucrop_view:I = 0x7f0d006a
 
 
 # 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 4f24f886c2..8c4f259a61 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 = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121214
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f12129c
 
-.field public static final ucrop_label_edit_photo:I = 0x7f121215
+.field public static final ucrop_label_edit_photo:I = 0x7f12129d
 
-.field public static final ucrop_label_original:I = 0x7f121216
+.field public static final ucrop_label_original:I = 0x7f12129e
 
-.field public static final ucrop_menu_crop:I = 0x7f121217
+.field public static final ucrop_menu_crop:I = 0x7f12129f
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121218
+.field public static final ucrop_mutate_exception_hint:I = 0x7f1212a0
 
 
 # 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 bb3d5b4b12..7cf5b6cd10 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, 0x7f040314
+    const v6, 0x7f040315
 
     aput v6, v5, v3
 
@@ -1320,15 +1320,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -1337,8 +1337,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -1352,11 +1352,11 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
@@ -1386,17 +1386,17 @@
     :array_7
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_8
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_9
@@ -1421,8 +1421,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_b
@@ -1498,47 +1498,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -1548,6 +1547,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_c
@@ -1567,7 +1567,7 @@
     :array_e
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_f
@@ -1589,8 +1589,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_11
@@ -1614,7 +1614,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_13
@@ -1648,8 +1648,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_16
@@ -1698,9 +1698,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_1a
@@ -1712,21 +1712,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_1b
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_1c
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_1d
@@ -1741,13 +1741,13 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_1e
@@ -1756,7 +1756,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_1f
@@ -1774,17 +1774,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_21
@@ -1801,7 +1801,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_22
@@ -1817,17 +1817,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1835,15 +1834,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_23
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .end array-data
 
     :array_24
@@ -1862,14 +1862,13 @@
 
     :array_26
     .array-data 4
-        0x7f0403d6
         0x7f0403d7
         0x7f0403d8
+        0x7f0403d9
     .end array-data
 
     :array_27
     .array-data 4
-        0x7f0403d9
         0x7f0403da
         0x7f0403db
         0x7f0403dc
@@ -1882,6 +1881,7 @@
         0x7f0403e3
         0x7f0403e4
         0x7f0403e5
+        0x7f0403e6
     .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 7eee1f93cf..314649b5a6 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 = 0x7f0402e6
+.field public static final sb_barBackgroundColor:I = 0x7f0402e7
 
-.field public static final sb_barColor:I = 0x7f0402e7
+.field public static final sb_barColor:I = 0x7f0402e8
 
-.field public static final sb_barControlColor:I = 0x7f0402e8
+.field public static final sb_barControlColor:I = 0x7f0402e9
 
-.field public static final sb_barControlRadius:I = 0x7f0402e9
+.field public static final sb_barControlRadius:I = 0x7f0402ea
 
-.field public static final sb_barControlShadowColor:I = 0x7f0402ea
+.field public static final sb_barControlShadowColor:I = 0x7f0402eb
 
-.field public static final sb_barControlShadowRadius:I = 0x7f0402eb
+.field public static final sb_barControlShadowRadius:I = 0x7f0402ec
 
-.field public static final sb_barHeight:I = 0x7f0402ec
+.field public static final sb_barHeight:I = 0x7f0402ed
 
-.field public static final sb_barInterval:I = 0x7f0402ed
+.field public static final sb_barInterval:I = 0x7f0402ee
 
-.field public static final sb_barOverlayColor:I = 0x7f0402ee
+.field public static final sb_barOverlayColor:I = 0x7f0402ef
 
-.field public static final sb_barOverlayValue:I = 0x7f0402ef
+.field public static final sb_barOverlayValue:I = 0x7f0402f0
 
-.field public static final sb_barTouchEnabled:I = 0x7f0402f0
+.field public static final sb_barTouchEnabled:I = 0x7f0402f1
 
-.field public static final sb_barValue:I = 0x7f0402f1
+.field public static final sb_barValue:I = 0x7f0402f2
 
-.field public static final sb_barValueMax:I = 0x7f0402f2
+.field public static final sb_barValueMax:I = 0x7f0402f3
 
-.field public static final sb_barValueMin:I = 0x7f0402f3
+.field public static final sb_barValueMin:I = 0x7f0402f4
 
 
 # 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 f8b1532548..a0940b3394 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,7 +62,6 @@
 
     :array_0
     .array-data 4
-        0x7f0402e6
         0x7f0402e7
         0x7f0402e8
         0x7f0402e9
@@ -76,6 +75,7 @@
         0x7f0402f1
         0x7f0402f2
         0x7f0402f3
+        0x7f0402f4
     .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 0f08786813..96e48ab7b5 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 = 0x7f060068
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060069
 
-.field public static final dim_foreground_disabled_material_light:I = 0x7f060069
+.field public static final dim_foreground_disabled_material_light:I = 0x7f06006a
 
-.field public static final dim_foreground_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_material_dark:I = 0x7f06006b
 
-.field public static final dim_foreground_material_light:I = 0x7f06006b
+.field public static final dim_foreground_material_light:I = 0x7f06006c
 
-.field public static final foreground_material_dark:I = 0x7f060072
+.field public static final foreground_material_dark:I = 0x7f060073
 
-.field public static final foreground_material_light:I = 0x7f060073
+.field public static final foreground_material_light:I = 0x7f060074
 
-.field public static final highlighted_text_material_dark:I = 0x7f060082
+.field public static final highlighted_text_material_dark:I = 0x7f060083
 
-.field public static final highlighted_text_material_light:I = 0x7f060083
+.field public static final highlighted_text_material_light:I = 0x7f060084
 
-.field public static final material_blue_grey_800:I = 0x7f060091
+.field public static final material_blue_grey_800:I = 0x7f060092
 
-.field public static final material_blue_grey_900:I = 0x7f060092
+.field public static final material_blue_grey_900:I = 0x7f060093
 
-.field public static final material_blue_grey_950:I = 0x7f060093
+.field public static final material_blue_grey_950:I = 0x7f060094
 
-.field public static final material_deep_teal_200:I = 0x7f060094
+.field public static final material_deep_teal_200:I = 0x7f060095
 
-.field public static final material_deep_teal_500:I = 0x7f060095
+.field public static final material_deep_teal_500:I = 0x7f060096
 
-.field public static final material_grey_100:I = 0x7f060096
+.field public static final material_grey_100:I = 0x7f060097
 
-.field public static final material_grey_300:I = 0x7f060097
+.field public static final material_grey_300:I = 0x7f060098
 
-.field public static final material_grey_50:I = 0x7f060098
+.field public static final material_grey_50:I = 0x7f060099
 
-.field public static final material_grey_600:I = 0x7f060099
+.field public static final material_grey_600:I = 0x7f06009a
 
-.field public static final material_grey_800:I = 0x7f06009a
+.field public static final material_grey_800:I = 0x7f06009b
 
-.field public static final material_grey_850:I = 0x7f06009b
+.field public static final material_grey_850:I = 0x7f06009c
 
-.field public static final material_grey_900:I = 0x7f06009c
+.field public static final material_grey_900:I = 0x7f06009d
 
-.field public static final notification_action_color_filter:I = 0x7f0600b7
+.field public static final notification_action_color_filter:I = 0x7f0600b8
 
-.field public static final notification_icon_bg_color:I = 0x7f0600b8
+.field public static final notification_icon_bg_color:I = 0x7f0600b9
 
-.field public static final primary_dark_material_dark:I = 0x7f0600da
+.field public static final primary_dark_material_dark:I = 0x7f0600db
 
-.field public static final primary_dark_material_light:I = 0x7f0600db
+.field public static final primary_dark_material_light:I = 0x7f0600dc
 
-.field public static final primary_material_dark:I = 0x7f0600eb
+.field public static final primary_material_dark:I = 0x7f0600ec
 
-.field public static final primary_material_light:I = 0x7f0600ec
+.field public static final primary_material_light:I = 0x7f0600ed
 
-.field public static final primary_text_default_material_dark:I = 0x7f0600ed
+.field public static final primary_text_default_material_dark:I = 0x7f0600ee
 
-.field public static final primary_text_default_material_light:I = 0x7f0600ee
+.field public static final primary_text_default_material_light:I = 0x7f0600ef
 
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600ef
+.field public static final primary_text_disabled_material_dark:I = 0x7f0600f0
 
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f0
+.field public static final primary_text_disabled_material_light:I = 0x7f0600f1
 
-.field public static final ripple_material_dark:I = 0x7f0600f9
+.field public static final ripple_material_dark:I = 0x7f0600fa
 
-.field public static final ripple_material_light:I = 0x7f0600fa
+.field public static final ripple_material_light:I = 0x7f0600fb
 
-.field public static final secondary_text_default_material_dark:I = 0x7f0600fb
+.field public static final secondary_text_default_material_dark:I = 0x7f0600fc
 
-.field public static final secondary_text_default_material_light:I = 0x7f0600fc
+.field public static final secondary_text_default_material_light:I = 0x7f0600fd
 
-.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fd
+.field public static final secondary_text_disabled_material_dark:I = 0x7f0600fe
 
-.field public static final secondary_text_disabled_material_light:I = 0x7f0600fe
+.field public static final secondary_text_disabled_material_light:I = 0x7f0600ff
 
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012d
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f06012e
 
-.field public static final switch_thumb_disabled_material_light:I = 0x7f06012e
+.field public static final switch_thumb_disabled_material_light:I = 0x7f06012f
 
-.field public static final switch_thumb_material_dark:I = 0x7f06012f
+.field public static final switch_thumb_material_dark:I = 0x7f060130
 
-.field public static final switch_thumb_material_light:I = 0x7f060130
+.field public static final switch_thumb_material_light:I = 0x7f060131
 
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060131
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060132
 
-.field public static final switch_thumb_normal_material_light:I = 0x7f060132
+.field public static final switch_thumb_normal_material_light:I = 0x7f060133
 
-.field public static final tooltip_background_dark:I = 0x7f060134
+.field public static final tooltip_background_dark:I = 0x7f060135
 
-.field public static final tooltip_background_light:I = 0x7f060135
+.field public static final tooltip_background_light:I = 0x7f060136
 
-.field public static final ucrop_color_crop_background:I = 0x7f060139
+.field public static final ucrop_color_crop_background:I = 0x7f06013a
 
-.field public static final ucrop_color_default_crop_frame:I = 0x7f06013a
+.field public static final ucrop_color_default_crop_frame:I = 0x7f06013b
 
-.field public static final ucrop_color_default_crop_grid:I = 0x7f06013b
+.field public static final ucrop_color_default_crop_grid:I = 0x7f06013c
 
-.field public static final ucrop_color_default_dimmed:I = 0x7f06013c
+.field public static final ucrop_color_default_dimmed:I = 0x7f06013d
 
-.field public static final ucrop_color_default_logo:I = 0x7f06013d
+.field public static final ucrop_color_default_logo:I = 0x7f06013e
 
-.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013e
+.field public static final ucrop_color_progress_wheel_line:I = 0x7f06013f
 
-.field public static final ucrop_color_statusbar:I = 0x7f06013f
+.field public static final ucrop_color_statusbar:I = 0x7f060140
 
-.field public static final ucrop_color_toolbar:I = 0x7f060140
+.field public static final ucrop_color_toolbar:I = 0x7f060141
 
-.field public static final ucrop_color_toolbar_widget:I = 0x7f060141
+.field public static final ucrop_color_toolbar_widget:I = 0x7f060142
 
-.field public static final ucrop_color_widget:I = 0x7f060142
+.field public static final ucrop_color_widget:I = 0x7f060143
 
-.field public static final ucrop_color_widget_active:I = 0x7f060143
+.field public static final ucrop_color_widget_active:I = 0x7f060144
 
-.field public static final ucrop_color_widget_background:I = 0x7f060144
+.field public static final ucrop_color_widget_background:I = 0x7f060145
 
-.field public static final ucrop_color_widget_text:I = 0x7f060145
+.field public static final ucrop_color_widget_text:I = 0x7f060146
 
-.field public static final ucrop_scale_text_view_selector:I = 0x7f060146
+.field public static final ucrop_scale_text_view_selector:I = 0x7f060147
 
 
 # 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 e799fe6afd..6832e63790 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 = 0x7f080464
+.field public static final notification_action_background:I = 0x7f080472
 
-.field public static final notification_bg:I = 0x7f080465
+.field public static final notification_bg:I = 0x7f080473
 
-.field public static final notification_bg_low:I = 0x7f080466
+.field public static final notification_bg_low:I = 0x7f080474
 
-.field public static final notification_bg_low_normal:I = 0x7f080467
+.field public static final notification_bg_low_normal:I = 0x7f080475
 
-.field public static final notification_bg_low_pressed:I = 0x7f080468
+.field public static final notification_bg_low_pressed:I = 0x7f080476
 
-.field public static final notification_bg_normal:I = 0x7f080469
+.field public static final notification_bg_normal:I = 0x7f080477
 
-.field public static final notification_bg_normal_pressed:I = 0x7f08046a
+.field public static final notification_bg_normal_pressed:I = 0x7f080478
 
-.field public static final notification_icon_background:I = 0x7f08046b
+.field public static final notification_icon_background:I = 0x7f080479
 
-.field public static final notification_template_icon_bg:I = 0x7f08046c
+.field public static final notification_template_icon_bg:I = 0x7f08047a
 
-.field public static final notification_template_icon_low_bg:I = 0x7f08046d
+.field public static final notification_template_icon_low_bg:I = 0x7f08047b
 
-.field public static final notification_tile_bg:I = 0x7f08046e
+.field public static final notification_tile_bg:I = 0x7f08047c
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08046f
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08047d
 
-.field public static final tooltip_frame_dark:I = 0x7f080477
+.field public static final tooltip_frame_dark:I = 0x7f080485
 
-.field public static final tooltip_frame_light:I = 0x7f080478
+.field public static final tooltip_frame_light:I = 0x7f080486
 
-.field public static final ucrop_ic_angle:I = 0x7f08047a
+.field public static final ucrop_ic_angle:I = 0x7f080488
 
-.field public static final ucrop_ic_crop:I = 0x7f08047b
+.field public static final ucrop_ic_crop:I = 0x7f080489
 
-.field public static final ucrop_ic_cross:I = 0x7f08047c
+.field public static final ucrop_ic_cross:I = 0x7f08048a
 
-.field public static final ucrop_ic_done:I = 0x7f08047d
+.field public static final ucrop_ic_done:I = 0x7f08048b
 
-.field public static final ucrop_ic_next:I = 0x7f08047e
+.field public static final ucrop_ic_next:I = 0x7f08048c
 
-.field public static final ucrop_ic_reset:I = 0x7f08047f
+.field public static final ucrop_ic_reset:I = 0x7f08048d
 
-.field public static final ucrop_ic_rotate:I = 0x7f080480
+.field public static final ucrop_ic_rotate:I = 0x7f08048e
 
-.field public static final ucrop_ic_scale:I = 0x7f080481
+.field public static final ucrop_ic_scale:I = 0x7f08048f
 
-.field public static final ucrop_shadow_upside:I = 0x7f080482
+.field public static final ucrop_shadow_upside:I = 0x7f080490
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080483
+.field public static final ucrop_vector_ic_crop:I = 0x7f080491
 
-.field public static final ucrop_vector_loader:I = 0x7f080484
+.field public static final ucrop_vector_loader:I = 0x7f080492
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080485
+.field public static final ucrop_vector_loader_animated:I = 0x7f080493
 
 
 # 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 bf5a9e439d..e6da8e3944 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$d.smali
@@ -57,9 +57,9 @@
 
 .field public static final alertTitle:I = 0x7f0a0060
 
-.field public static final async:I = 0x7f0a007f
+.field public static final async:I = 0x7f0a0080
 
-.field public static final blocking:I = 0x7f0a00cd
+.field public static final blocking:I = 0x7f0a00ce
 
 .field public static final bottom:I = 0x7f0a0105
 
@@ -69,207 +69,207 @@
 
 .field public static final chronometer:I = 0x7f0a0215
 
-.field public static final contentPanel:I = 0x7f0a0232
+.field public static final contentPanel:I = 0x7f0a0235
 
-.field public static final custom:I = 0x7f0a024f
+.field public static final custom:I = 0x7f0a0252
 
-.field public static final customPanel:I = 0x7f0a0250
+.field public static final customPanel:I = 0x7f0a0253
 
-.field public static final decor_content_parent:I = 0x7f0a0254
+.field public static final decor_content_parent:I = 0x7f0a0257
 
-.field public static final default_activity_button:I = 0x7f0a0255
+.field public static final default_activity_button:I = 0x7f0a0258
 
-.field public static final edit_query:I = 0x7f0a02ab
+.field public static final edit_query:I = 0x7f0a02ae
 
-.field public static final end:I = 0x7f0a02c6
+.field public static final end:I = 0x7f0a02c9
 
-.field public static final expand_activities_button:I = 0x7f0a02cb
+.field public static final expand_activities_button:I = 0x7f0a02ce
 
-.field public static final expanded_menu:I = 0x7f0a02cc
+.field public static final expanded_menu:I = 0x7f0a02cf
 
-.field public static final forever:I = 0x7f0a02ee
+.field public static final forever:I = 0x7f0a02f2
 
-.field public static final home:I = 0x7f0a038c
+.field public static final home:I = 0x7f0a0394
 
-.field public static final icon:I = 0x7f0a038e
+.field public static final icon:I = 0x7f0a0396
 
-.field public static final icon_group:I = 0x7f0a038f
+.field public static final icon_group:I = 0x7f0a0397
 
-.field public static final image:I = 0x7f0a0392
+.field public static final image:I = 0x7f0a039a
 
-.field public static final image_view_crop:I = 0x7f0a0394
+.field public static final image_view_crop:I = 0x7f0a039c
 
-.field public static final image_view_logo:I = 0x7f0a0395
+.field public static final image_view_logo:I = 0x7f0a039d
 
-.field public static final image_view_state_aspect_ratio:I = 0x7f0a0396
+.field public static final image_view_state_aspect_ratio:I = 0x7f0a039e
 
-.field public static final image_view_state_rotate:I = 0x7f0a0397
+.field public static final image_view_state_rotate:I = 0x7f0a039f
 
-.field public static final image_view_state_scale:I = 0x7f0a0398
+.field public static final image_view_state_scale:I = 0x7f0a03a0
 
-.field public static final info:I = 0x7f0a03a4
+.field public static final info:I = 0x7f0a03ac
 
-.field public static final italic:I = 0x7f0a03d1
+.field public static final italic:I = 0x7f0a03d9
 
-.field public static final layout_aspect_ratio:I = 0x7f0a0410
+.field public static final layout_aspect_ratio:I = 0x7f0a0418
 
-.field public static final layout_rotate_wheel:I = 0x7f0a0411
+.field public static final layout_rotate_wheel:I = 0x7f0a0419
 
-.field public static final layout_scale_wheel:I = 0x7f0a0412
+.field public static final layout_scale_wheel:I = 0x7f0a041a
 
-.field public static final left:I = 0x7f0a0413
+.field public static final left:I = 0x7f0a041b
 
-.field public static final line1:I = 0x7f0a0415
+.field public static final line1:I = 0x7f0a041d
 
-.field public static final line3:I = 0x7f0a0416
+.field public static final line3:I = 0x7f0a041e
 
-.field public static final listMode:I = 0x7f0a0418
+.field public static final listMode:I = 0x7f0a0420
 
-.field public static final list_item:I = 0x7f0a0419
+.field public static final list_item:I = 0x7f0a0421
 
-.field public static final menu_crop:I = 0x7f0a0456
+.field public static final menu_crop:I = 0x7f0a045e
 
-.field public static final menu_loader:I = 0x7f0a0462
+.field public static final menu_loader:I = 0x7f0a046a
 
-.field public static final message:I = 0x7f0a047b
+.field public static final message:I = 0x7f0a0485
 
-.field public static final multiply:I = 0x7f0a0483
+.field public static final multiply:I = 0x7f0a048d
 
-.field public static final none:I = 0x7f0a0498
+.field public static final none:I = 0x7f0a04a2
 
-.field public static final normal:I = 0x7f0a0499
+.field public static final normal:I = 0x7f0a04a3
 
-.field public static final notification_background:I = 0x7f0a04a3
+.field public static final notification_background:I = 0x7f0a04ad
 
-.field public static final notification_main_column:I = 0x7f0a04a4
+.field public static final notification_main_column:I = 0x7f0a04ae
 
-.field public static final notification_main_column_container:I = 0x7f0a04a5
+.field public static final notification_main_column_container:I = 0x7f0a04af
 
-.field public static final parentPanel:I = 0x7f0a04d8
+.field public static final parentPanel:I = 0x7f0a04e2
 
-.field public static final progress_circular:I = 0x7f0a0551
+.field public static final progress_circular:I = 0x7f0a055c
 
-.field public static final progress_horizontal:I = 0x7f0a0553
+.field public static final progress_horizontal:I = 0x7f0a055e
 
-.field public static final radio:I = 0x7f0a055e
+.field public static final radio:I = 0x7f0a0569
 
-.field public static final right:I = 0x7f0a0577
+.field public static final right:I = 0x7f0a058c
 
-.field public static final right_icon:I = 0x7f0a0578
+.field public static final right_icon:I = 0x7f0a058d
 
-.field public static final right_side:I = 0x7f0a0579
+.field public static final right_side:I = 0x7f0a058e
 
-.field public static final rotate_scroll_wheel:I = 0x7f0a05a0
+.field public static final rotate_scroll_wheel:I = 0x7f0a05b5
 
-.field public static final scale_scroll_wheel:I = 0x7f0a05a6
+.field public static final scale_scroll_wheel:I = 0x7f0a05bb
 
-.field public static final screen:I = 0x7f0a05a7
+.field public static final screen:I = 0x7f0a05bc
 
-.field public static final scrollIndicatorDown:I = 0x7f0a05a9
+.field public static final scrollIndicatorDown:I = 0x7f0a05be
 
-.field public static final scrollIndicatorUp:I = 0x7f0a05aa
+.field public static final scrollIndicatorUp:I = 0x7f0a05bf
 
-.field public static final scrollView:I = 0x7f0a05ab
+.field public static final scrollView:I = 0x7f0a05c0
 
-.field public static final search_badge:I = 0x7f0a05af
+.field public static final search_badge:I = 0x7f0a05c4
 
-.field public static final search_bar:I = 0x7f0a05b0
+.field public static final search_bar:I = 0x7f0a05c5
 
-.field public static final search_button:I = 0x7f0a05b1
+.field public static final search_button:I = 0x7f0a05c6
 
-.field public static final search_close_btn:I = 0x7f0a05b3
+.field public static final search_close_btn:I = 0x7f0a05c8
 
-.field public static final search_edit_frame:I = 0x7f0a05b4
+.field public static final search_edit_frame:I = 0x7f0a05c9
 
-.field public static final search_go_btn:I = 0x7f0a05b7
+.field public static final search_go_btn:I = 0x7f0a05cc
 
-.field public static final search_mag_icon:I = 0x7f0a05b9
+.field public static final search_mag_icon:I = 0x7f0a05ce
 
-.field public static final search_plate:I = 0x7f0a05ba
+.field public static final search_plate:I = 0x7f0a05cf
 
-.field public static final search_src_text:I = 0x7f0a05bd
+.field public static final search_src_text:I = 0x7f0a05d2
 
-.field public static final search_voice_btn:I = 0x7f0a05c9
+.field public static final search_voice_btn:I = 0x7f0a05de
 
-.field public static final select_dialog_listview:I = 0x7f0a05ca
+.field public static final select_dialog_listview:I = 0x7f0a05df
 
-.field public static final shortcut:I = 0x7f0a0704
+.field public static final shortcut:I = 0x7f0a0719
 
-.field public static final spacer:I = 0x7f0a0710
+.field public static final spacer:I = 0x7f0a0725
 
-.field public static final split_action_bar:I = 0x7f0a0711
+.field public static final split_action_bar:I = 0x7f0a072c
 
-.field public static final src_atop:I = 0x7f0a0714
+.field public static final src_atop:I = 0x7f0a072f
 
-.field public static final src_in:I = 0x7f0a0715
+.field public static final src_in:I = 0x7f0a0730
 
-.field public static final src_over:I = 0x7f0a0716
+.field public static final src_over:I = 0x7f0a0731
 
-.field public static final start:I = 0x7f0a0719
+.field public static final start:I = 0x7f0a0734
 
-.field public static final state_aspect_ratio:I = 0x7f0a071a
+.field public static final state_aspect_ratio:I = 0x7f0a0735
 
-.field public static final state_rotate:I = 0x7f0a071b
+.field public static final state_rotate:I = 0x7f0a0736
 
-.field public static final state_scale:I = 0x7f0a071c
+.field public static final state_scale:I = 0x7f0a0737
 
-.field public static final submenuarrow:I = 0x7f0a0731
+.field public static final submenuarrow:I = 0x7f0a0755
 
-.field public static final submit_area:I = 0x7f0a0732
+.field public static final submit_area:I = 0x7f0a0756
 
-.field public static final tabMode:I = 0x7f0a073d
+.field public static final tabMode:I = 0x7f0a0761
 
-.field public static final tag_transition_group:I = 0x7f0a0743
+.field public static final tag_transition_group:I = 0x7f0a0767
 
-.field public static final text:I = 0x7f0a074b
+.field public static final text:I = 0x7f0a076f
 
-.field public static final text2:I = 0x7f0a074c
+.field public static final text2:I = 0x7f0a0770
 
-.field public static final textSpacerNoButtons:I = 0x7f0a074d
+.field public static final textSpacerNoButtons:I = 0x7f0a0771
 
-.field public static final textSpacerNoTitle:I = 0x7f0a074e
+.field public static final textSpacerNoTitle:I = 0x7f0a0772
 
-.field public static final text_view_rotate:I = 0x7f0a0752
+.field public static final text_view_rotate:I = 0x7f0a0776
 
-.field public static final text_view_scale:I = 0x7f0a0753
+.field public static final text_view_scale:I = 0x7f0a0777
 
-.field public static final time:I = 0x7f0a0759
+.field public static final time:I = 0x7f0a077d
 
-.field public static final title:I = 0x7f0a075a
+.field public static final title:I = 0x7f0a077e
 
-.field public static final titleDividerNoCustom:I = 0x7f0a075b
+.field public static final titleDividerNoCustom:I = 0x7f0a077f
 
-.field public static final title_template:I = 0x7f0a075c
+.field public static final title_template:I = 0x7f0a0780
 
-.field public static final toolbar:I = 0x7f0a075d
+.field public static final toolbar:I = 0x7f0a0781
 
-.field public static final toolbar_title:I = 0x7f0a075f
+.field public static final toolbar_title:I = 0x7f0a0783
 
-.field public static final top:I = 0x7f0a0761
+.field public static final top:I = 0x7f0a0785
 
-.field public static final topPanel:I = 0x7f0a0762
+.field public static final topPanel:I = 0x7f0a0786
 
-.field public static final ucrop:I = 0x7f0a076e
+.field public static final ucrop:I = 0x7f0a0792
 
-.field public static final ucrop_frame:I = 0x7f0a076f
+.field public static final ucrop_frame:I = 0x7f0a0793
 
-.field public static final ucrop_photobox:I = 0x7f0a0770
+.field public static final ucrop_photobox:I = 0x7f0a0794
 
-.field public static final uniform:I = 0x7f0a0775
+.field public static final uniform:I = 0x7f0a0799
 
-.field public static final up:I = 0x7f0a0778
+.field public static final up:I = 0x7f0a079c
 
-.field public static final view_overlay:I = 0x7f0a0800
+.field public static final view_overlay:I = 0x7f0a082f
 
-.field public static final wrap_content:I = 0x7f0a0851
+.field public static final wrap_content:I = 0x7f0a0881
 
-.field public static final wrapper_controls:I = 0x7f0a0853
+.field public static final wrapper_controls:I = 0x7f0a0883
 
-.field public static final wrapper_reset_rotate:I = 0x7f0a0854
+.field public static final wrapper_reset_rotate:I = 0x7f0a0884
 
-.field public static final wrapper_rotate_by_angle:I = 0x7f0a0855
+.field public static final wrapper_rotate_by_angle:I = 0x7f0a0885
 
-.field public static final wrapper_states:I = 0x7f0a0856
+.field public static final wrapper_states:I = 0x7f0a0886
 
 
 # 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 9cb556ab6c..34725afd41 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 = 0x7f0d0043
+.field public static final notification_action:I = 0x7f0d0045
 
-.field public static final notification_action_tombstone:I = 0x7f0d0044
+.field public static final notification_action_tombstone:I = 0x7f0d0046
 
-.field public static final notification_template_custom_big:I = 0x7f0d0045
+.field public static final notification_template_custom_big:I = 0x7f0d0047
 
-.field public static final notification_template_icon_group:I = 0x7f0d0046
+.field public static final notification_template_icon_group:I = 0x7f0d0048
 
-.field public static final notification_template_part_chronometer:I = 0x7f0d0047
+.field public static final notification_template_part_chronometer:I = 0x7f0d0049
 
-.field public static final notification_template_part_time:I = 0x7f0d0048
+.field public static final notification_template_part_time:I = 0x7f0d004a
 
-.field public static final select_dialog_item_material:I = 0x7f0d0056
+.field public static final select_dialog_item_material:I = 0x7f0d0058
 
-.field public static final select_dialog_multichoice_material:I = 0x7f0d0057
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0059
 
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d0058
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d005a
 
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d005f
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0062
 
-.field public static final ucrop_activity_photobox:I = 0x7f0d0061
+.field public static final ucrop_activity_photobox:I = 0x7f0d0064
 
-.field public static final ucrop_aspect_ratio:I = 0x7f0d0062
+.field public static final ucrop_aspect_ratio:I = 0x7f0d0065
 
-.field public static final ucrop_controls:I = 0x7f0d0063
+.field public static final ucrop_controls:I = 0x7f0d0066
 
-.field public static final ucrop_fragment_photobox:I = 0x7f0d0064
+.field public static final ucrop_fragment_photobox:I = 0x7f0d0067
 
-.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0065
+.field public static final ucrop_layout_rotate_wheel:I = 0x7f0d0068
 
-.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0066
+.field public static final ucrop_layout_scale_wheel:I = 0x7f0d0069
 
-.field public static final ucrop_view:I = 0x7f0d0067
+.field public static final ucrop_view:I = 0x7f0d006a
 
 
 # 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 2e6b20cf9e..e8ef4de2ff 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 = 0x7f121011
+.field public static final search_menu_title:I = 0x7f121098
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1210de
+.field public static final status_bar_notification_info_overflow:I = 0x7f121165
 
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121214
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f12129c
 
-.field public static final ucrop_label_edit_photo:I = 0x7f121215
+.field public static final ucrop_label_edit_photo:I = 0x7f12129d
 
-.field public static final ucrop_label_original:I = 0x7f121216
+.field public static final ucrop_label_original:I = 0x7f12129e
 
-.field public static final ucrop_menu_crop:I = 0x7f121217
+.field public static final ucrop_menu_crop:I = 0x7f12129f
 
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121218
+.field public static final ucrop_mutate_exception_hint:I = 0x7f1212a0
 
 
 # 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 c865deffea..c7123240a9 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, 0x7f040314
+    const v2, 0x7f040315
 
     aput v2, v1, v3
 
@@ -1190,15 +1190,15 @@
         0x7f0401d6
         0x7f0401f9
         0x7f040203
-        0x7f040266
-        0x7f040282
-        0x7f04029a
-        0x7f0402c8
+        0x7f040267
+        0x7f040283
+        0x7f04029b
         0x7f0402c9
-        0x7f040322
-        0x7f040325
-        0x7f0403be
-        0x7f0403c8
+        0x7f0402ca
+        0x7f040323
+        0x7f040326
+        0x7f0403bf
+        0x7f0403c9
     .end array-data
 
     :array_1
@@ -1207,8 +1207,8 @@
         0x7f04004c
         0x7f0400b3
         0x7f04015c
-        0x7f040325
-        0x7f0403c8
+        0x7f040326
+        0x7f0403c9
     .end array-data
 
     :array_2
@@ -1222,27 +1222,27 @@
         0x10100f2
         0x7f040079
         0x7f04007a
-        0x7f04025d
         0x7f04025e
-        0x7f04027f
-        0x7f040307
+        0x7f04025f
+        0x7f040280
         0x7f040308
+        0x7f040309
     .end array-data
 
     :array_4
     .array-data 4
         0x1010119
-        0x7f040312
-        0x7f0403bc
+        0x7f040313
         0x7f0403bd
+        0x7f0403be
     .end array-data
 
     :array_5
     .array-data 4
         0x1010142
-        0x7f0403b9
         0x7f0403ba
         0x7f0403bb
+        0x7f0403bc
     .end array-data
 
     :array_6
@@ -1267,8 +1267,8 @@
         0x7f040138
         0x7f040145
         0x7f04020c
-        0x7f040259
-        0x7f040348
+        0x7f04025a
+        0x7f040349
     .end array-data
 
     :array_8
@@ -1344,47 +1344,46 @@
         0x7f040119
         0x7f040168
         0x7f0401e1
-        0x7f04025b
         0x7f04025c
-        0x7f04025f
+        0x7f04025d
         0x7f040260
         0x7f040261
         0x7f040262
         0x7f040263
         0x7f040264
         0x7f040265
-        0x7f04028f
+        0x7f040266
         0x7f040290
         0x7f040291
-        0x7f040299
-        0x7f04029b
-        0x7f0402ce
-        0x7f0402d1
+        0x7f040292
+        0x7f04029a
+        0x7f04029c
+        0x7f0402cf
         0x7f0402d2
         0x7f0402d3
-        0x7f0402fa
-        0x7f0402fc
+        0x7f0402d4
+        0x7f0402fb
         0x7f0402fd
         0x7f0402fe
-        0x7f04030f
+        0x7f0402ff
         0x7f040310
-        0x7f040329
-        0x7f040353
+        0x7f040311
+        0x7f04032a
         0x7f040354
         0x7f040355
         0x7f040356
-        0x7f040358
+        0x7f040357
         0x7f040359
         0x7f04035a
         0x7f04035b
-        0x7f04035e
+        0x7f04035c
         0x7f04035f
-        0x7f0403ca
+        0x7f040360
         0x7f0403cb
         0x7f0403cc
         0x7f0403cd
-        0x7f0403ed
-        0x7f0403f0
+        0x7f0403ce
+        0x7f0403ee
         0x7f0403f1
         0x7f0403f2
         0x7f0403f3
@@ -1394,6 +1393,7 @@
         0x7f0403f7
         0x7f0403f8
         0x7f0403f9
+        0x7f0403fa
     .end array-data
 
     :array_9
@@ -1413,7 +1413,7 @@
     :array_b
     .array-data 4
         0x7f04020a
-        0x7f040319
+        0x7f04031a
     .end array-data
 
     :array_c
@@ -1435,8 +1435,8 @@
         0x7f0400b8
         0x7f040112
         0x7f040150
-        0x7f04030e
-        0x7f0403b5
+        0x7f04030f
+        0x7f0403b6
     .end array-data
 
     :array_e
@@ -1460,7 +1460,7 @@
         0x7f04014c
         0x7f04014d
         0x7f04014e
-        0x7f0403d2
+        0x7f0403d3
     .end array-data
 
     :array_10
@@ -1472,8 +1472,8 @@
         0x1010128
         0x7f04010b
         0x7f040110
-        0x7f04027d
-        0x7f040304
+        0x7f04027e
+        0x7f040305
     .end array-data
 
     :array_11
@@ -1522,9 +1522,9 @@
         0x7f0400ce
         0x7f0401dc
         0x7f0401dd
-        0x7f040286
-        0x7f040300
-        0x7f0403ce
+        0x7f040287
+        0x7f040301
+        0x7f0403cf
     .end array-data
 
     :array_15
@@ -1536,21 +1536,21 @@
         0x101012f
         0x1010130
         0x1010131
-        0x7f04029c
-        0x7f040320
+        0x7f04029d
+        0x7f040321
     .end array-data
 
     :array_16
     .array-data 4
         0x1010176
         0x10102c9
-        0x7f040287
+        0x7f040288
     .end array-data
 
     :array_17
     .array-data 4
-        0x7f04028b
-        0x7f04028e
+        0x7f04028c
+        0x7f04028f
     .end array-data
 
     :array_18
@@ -1565,13 +1565,13 @@
         0x7f040155
         0x7f0401de
         0x7f04020d
-        0x7f0402cc
         0x7f0402cd
-        0x7f0402f8
+        0x7f0402ce
         0x7f0402f9
-        0x7f040321
-        0x7f040326
-        0x7f0403ee
+        0x7f0402fa
+        0x7f040322
+        0x7f040327
+        0x7f0403ef
     .end array-data
 
     :array_19
@@ -1580,7 +1580,7 @@
         0x1010176
         0x101017b
         0x1010262
-        0x7f04029a
+        0x7f04029b
     .end array-data
 
     :array_1a
@@ -1588,17 +1588,17 @@
         0x1010124
         0x1010125
         0x1010142
-        0x7f040306
-        0x7f040311
-        0x7f040327
+        0x7f040307
+        0x7f040312
         0x7f040328
-        0x7f04032a
-        0x7f0403b6
+        0x7f040329
+        0x7f04032b
         0x7f0403b7
         0x7f0403b8
-        0x7f0403cf
+        0x7f0403b9
         0x7f0403d0
         0x7f0403d1
+        0x7f0403d2
     .end array-data
 
     :array_1b
@@ -1615,7 +1615,7 @@
         0x1010164
         0x10103ac
         0x7f040145
-        0x7f040348
+        0x7f040349
     .end array-data
 
     :array_1c
@@ -1631,17 +1631,16 @@
         0x7f0400d2
         0x7f0400d3
         0x7f0400d4
-        0x7f040266
         0x7f040267
-        0x7f04027a
-        0x7f040280
+        0x7f040268
+        0x7f04027b
         0x7f040281
-        0x7f04029a
-        0x7f040322
+        0x7f040282
+        0x7f04029b
         0x7f040323
         0x7f040324
-        0x7f0403be
-        0x7f0403c0
+        0x7f040325
+        0x7f0403bf
         0x7f0403c1
         0x7f0403c2
         0x7f0403c3
@@ -1649,15 +1648,16 @@
         0x7f0403c5
         0x7f0403c6
         0x7f0403c7
+        0x7f0403c8
     .end array-data
 
     :array_1d
     .array-data 4
         0x1010000
         0x10100da
-        0x7f04028c
         0x7f04028d
-        0x7f040364
+        0x7f04028e
+        0x7f040365
     .end array-data
 
     :array_1e
@@ -1676,14 +1676,13 @@
 
     :array_20
     .array-data 4
-        0x7f0403d6
         0x7f0403d7
         0x7f0403d8
+        0x7f0403d9
     .end array-data
 
     :array_21
     .array-data 4
-        0x7f0403d9
         0x7f0403da
         0x7f0403db
         0x7f0403dc
@@ -1696,6 +1695,7 @@
         0x7f0403e3
         0x7f0403e4
         0x7f0403e5
+        0x7f0403e6
     .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 97dfa775e7..f1c2ec0dcb 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Bm()V
+.method public final Bp()V
     .locals 3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {v0}, Lcom/yalantis/ucrop/UCropActivity;->supportInvalidateOptionsMenu()V
 
@@ -89,11 +89,11 @@
 .method public final h(Ljava/lang/Exception;)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-virtual {p1}, Lcom/yalantis/ucrop/UCropActivity;->finish()V
 
@@ -103,7 +103,7 @@
 .method public final v(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0, p1}, Lcom/yalantis/ucrop/UCropActivity;->a(Lcom/yalantis/ucrop/UCropActivity;F)V
 
@@ -113,7 +113,7 @@
 .method public final w(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$1;->aYL: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 f72e7e9576..bf7a6800f4 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYL: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;->mV:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
 
     const/4 v4, 0x0
 
@@ -69,31 +69,31 @@
 
     if-eqz v3, :cond_0
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYE:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
-    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
 
-    iput v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYE:F
+    iput v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
-    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
 
-    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYE:F
+    iget v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
-    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iget v4, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
 
     div-float/2addr v3, v4
 
-    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
+    iput v3, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
 
     :cond_0
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Bz()V
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BC()V
 
     :cond_1
-    iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
+    iget v1, v1, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
 
     invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->setTargetAspectRatio(F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$2;->aYL: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 503cda9372..f55a1c54e5 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final A(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -52,10 +52,10 @@
     return-void
 .end method
 
-.method public final Bn()V
+.method public final Bq()V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -68,16 +68,16 @@
     return-void
 .end method
 
-.method public final Bo()V
+.method public final Br()V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$3;->aYL: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;->Bv()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->By()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 a09678d4fe..1246360c92 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$4;->aYL: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 d899110689..5b8a920a52 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$5;->aYL: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 497dc9b2b2..2ce8de3943 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -45,13 +45,13 @@
 
     if-lez v1, :cond_0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v2}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -61,7 +61,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v3}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -71,7 +71,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v4}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -89,13 +89,13 @@
 
     add-float/2addr v2, p1
 
-    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {p1}, Landroid/graphics/RectF;->centerX()F
 
     move-result p1
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerY()F
 
@@ -106,13 +106,13 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v2, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v2}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -122,7 +122,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v3, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v3}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -132,7 +132,7 @@
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v4, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v4}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -150,13 +150,13 @@
 
     add-float/2addr v2, p1
 
-    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object p1, v1, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {p1}, Landroid/graphics/RectF;->centerX()F
 
     move-result p1
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, v1, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerY()F
 
@@ -182,10 +182,10 @@
     return-void
 .end method
 
-.method public final Bn()V
+.method public final Bq()V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL:Lcom/yalantis/ucrop/UCropActivity;
 
     invoke-static {v0}, Lcom/yalantis/ucrop/UCropActivity;->d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
 
@@ -198,16 +198,16 @@
     return-void
 .end method
 
-.method public final Bo()V
+.method public final Br()V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$6;->aYL: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;->Bv()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->By()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 4e0aad7735..defc738a5c 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$7;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$7;->aYL: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 654317cb5a..7f3ce64cfa 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 aYC:Lcom/yalantis/ucrop/UCropActivity;
+.field final synthetic aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iput-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYL: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;->aYC:Lcom/yalantis/ucrop/UCropActivity;
+    iget-object p1, p0, Lcom/yalantis/ucrop/UCropActivity$8;->aYL: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 2af5368955..179042269a 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/UCropActivity.smali
@@ -4,55 +4,15 @@
 
 
 # static fields
-.field public static final aXY:Landroid/graphics/Bitmap$CompressFormat;
+.field public static final aYh:Landroid/graphics/Bitmap$CompressFormat;
 
 
 # instance fields
-.field private aXZ:Ljava/lang/String;
+.field private aYA:Landroid/view/ViewGroup;
 
-.field private aYA:Lcom/yalantis/ucrop/view/b$a;
+.field private aYB:Landroid/view/ViewGroup;
 
-.field private final aYB:Landroid/view/View$OnClickListener;
-
-.field private aYa:I
-
-.field private aYb:I
-
-.field private aYc:I
-
-.field private aYd:I
-
-.field private aYe:I
-
-.field private aYf:I
-
-.field private aYg:I
-
-.field private aYh:I
-
-.field private aYi:Z
-
-.field private aYj:Z
-
-.field private aYk:Lcom/yalantis/ucrop/view/UCropView;
-
-.field private aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
-
-.field private aYm:Lcom/yalantis/ucrop/view/OverlayView;
-
-.field private aYn:Landroid/view/ViewGroup;
-
-.field private aYo:Landroid/view/ViewGroup;
-
-.field private aYp:Landroid/view/ViewGroup;
-
-.field private aYq:Landroid/view/ViewGroup;
-
-.field private aYr:Landroid/view/ViewGroup;
-
-.field private aYs:Landroid/view/ViewGroup;
-
-.field private aYt:Ljava/util/List;
+.field private aYC:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -62,17 +22,57 @@
     .end annotation
 .end field
 
-.field private aYu:Landroid/widget/TextView;
+.field private aYD:Landroid/widget/TextView;
 
-.field private aYv:Landroid/widget/TextView;
+.field private aYE:Landroid/widget/TextView;
 
-.field private aYw:Landroid/view/View;
+.field private aYF:Landroid/view/View;
 
-.field private aYx:Landroid/graphics/Bitmap$CompressFormat;
+.field private aYG:Landroid/graphics/Bitmap$CompressFormat;
 
-.field private aYy:I
+.field private aYH:I
 
-.field private aYz:[I
+.field private aYI:[I
+
+.field private aYJ:Lcom/yalantis/ucrop/view/b$a;
+
+.field private final aYK:Landroid/view/View$OnClickListener;
+
+.field private aYi:Ljava/lang/String;
+
+.field private aYj:I
+
+.field private aYk:I
+
+.field private aYl:I
+
+.field private aYm:I
+
+.field private aYn:I
+
+.field private aYo:I
+
+.field private aYp:I
+
+.field private aYq:I
+
+.field private aYr:Z
+
+.field private aYs:Z
+
+.field private aYt:Lcom/yalantis/ucrop/view/UCropView;
+
+.field private aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
+
+.field private aYv:Lcom/yalantis/ucrop/view/OverlayView;
+
+.field private aYw:Landroid/view/ViewGroup;
+
+.field private aYx:Landroid/view/ViewGroup;
+
+.field private aYy:Landroid/view/ViewGroup;
+
+.field private aYz:Landroid/view/ViewGroup;
 
 
 # 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;->aXY:Landroid/graphics/Bitmap$CompressFormat;
+    sput-object v0, Lcom/yalantis/ucrop/UCropActivity;->aYh:Landroid/graphics/Bitmap$CompressFormat;
 
     return-void
 .end method
@@ -93,21 +93,21 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYj:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
 
     new-instance v0, Ljava/util/ArrayList;
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYt:Ljava/util/List;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYC:Ljava/util/List;
 
-    sget-object v0, Lcom/yalantis/ucrop/UCropActivity;->aXY:Landroid/graphics/Bitmap$CompressFormat;
+    sget-object v0, Lcom/yalantis/ucrop/UCropActivity;->aYh:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYG:Landroid/graphics/Bitmap$CompressFormat;
 
     const/16 v0, 0x5a
 
-    iput v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYy:I
+    iput v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYH:I
 
     const/4 v0, 0x3
 
@@ -115,19 +115,19 @@
 
     fill-array-data v0, :array_0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYz:[I
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYI:[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;->aYA:Lcom/yalantis/ucrop/view/b$a;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYJ: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;->aYB:Landroid/view/View$OnClickListener;
+    iput-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYK: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;->aYk:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYt: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;->aYu:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYD:Landroid/widget/TextView;
 
     if-eqz p0, :cond_0
 
@@ -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;->aYw:Landroid/view/View;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYv:Landroid/widget/TextView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYE:Landroid/widget/TextView;
 
     if-eqz p0, :cond_0
 
@@ -244,7 +244,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYj:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
 
     return v0
 .end method
@@ -252,14 +252,14 @@
 .method private cJ(I)V
     .locals 5
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYi:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYr:Z
 
     if-nez v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYn:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_aspect_ratio:I
 
@@ -279,7 +279,7 @@
     :goto_0
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYo:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_rotate:I
 
@@ -295,7 +295,7 @@
     :goto_1
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYp:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYy:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_scale:I
 
@@ -311,7 +311,7 @@
     :goto_2
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setSelected(Z)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYq:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYz:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_aspect_ratio:I
 
@@ -329,7 +329,7 @@
     :goto_3
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYr:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYA:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_rotate:I
 
@@ -345,7 +345,7 @@
     :goto_4
     invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setVisibility(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Landroid/view/ViewGroup;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYB:Landroid/view/ViewGroup;
 
     sget v1, Lcom/yalantis/ucrop/R$d;->state_scale:I
 
@@ -384,9 +384,9 @@
 .method private cK(I)V
     .locals 6
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYz:[I
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYI:[I
 
     aget v2, v1, p1
 
@@ -416,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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYz:[I
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYI:[I
 
     aget v2, v1, p1
 
@@ -442,7 +442,7 @@
 .method static synthetic d(Lcom/yalantis/ucrop/UCropActivity;)Lcom/yalantis/ucrop/view/GestureCropImageView;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     return-object p0
 .end method
@@ -450,7 +450,7 @@
 .method static synthetic e(Lcom/yalantis/ucrop/UCropActivity;)Ljava/util/List;
     .locals 0
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYt:Ljava/util/List;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYC: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->getCurrentAngle()F
 
@@ -468,7 +468,7 @@
 
     invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->C(F)V
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/high16 v1, 0x42b40000    # 90.0f
 
     invoke-virtual {v0, v1}, Lcom/yalantis/ucrop/view/GestureCropImageView;->C(F)V
 
-    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     const/4 v0, 0x1
 
@@ -544,7 +544,7 @@
 
     move-result v2
 
-    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYb:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk: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;->aYa:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYj: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;->aYc:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYd:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm: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;->aYf:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYo: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;->aYg:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYp:I
 
     const-string v2, "com.yalantis.ucrop.UcropToolbarTitleText"
 
@@ -614,9 +614,9 @@
 
     move-result-object v2
 
-    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aXZ:Ljava/lang/String;
+    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Ljava/lang/String;
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aXZ:Ljava/lang/String;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aXZ:Ljava/lang/String;
+    iput-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi: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;->aYh:I
+    iput v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq:I
 
     const/4 v2, 0x0
 
@@ -662,7 +662,7 @@
 
     xor-int/2addr v3, v4
 
-    iput-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Z
+    iput-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYe:I
+    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn:I
 
-    iget v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYb:I
+    iget v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk: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;->aYa:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYj:I
 
     invoke-virtual {v3, v5}, Landroidx/appcompat/widget/Toolbar;->setBackgroundColor(I)V
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYd:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm: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;->aYd:I
+    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm:I
 
     invoke-virtual {v5, v6}, Landroid/widget/TextView;->setTextColor(I)V
 
-    iget-object v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aXZ:Ljava/lang/String;
+    iget-object v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Ljava/lang/String;
 
     invoke-virtual {v5, v6}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYf:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYo: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;->aYd:I
+    iget v6, v1, Lcom/yalantis/ucrop/UCropActivity;->aYm: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;->aYk:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt:Lcom/yalantis/ucrop/view/UCropView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYk:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYt: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv:Lcom/yalantis/ucrop/view/OverlayView;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYA:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYJ: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;->aYh:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYq: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;->aYe:I
+    iget v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn:I
 
     invoke-virtual {v3, v5}, Landroid/view/View;->setBackgroundColor(I)V
 
-    iget-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYi:Z
+    iget-boolean v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr: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;->aYn:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYK: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;->aYo:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYo:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYK: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;->aYp:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy:Landroid/view/ViewGroup;
 
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYp:Landroid/view/ViewGroup;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy:Landroid/view/ViewGroup;
 
-    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB:Landroid/view/View$OnClickListener;
+    iget-object v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYK: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;->aYq:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYz: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;->aYr:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYA: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;->aYs:Landroid/view/ViewGroup;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYB: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;->aYc:I
+    iget v9, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYt:Ljava/util/List;
+    iget-object v9, v1, Lcom/yalantis/ucrop/UCropActivity;->aYC: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;->aYt:Ljava/util/List;
+    iget-object v7, v1, Lcom/yalantis/ucrop/UCropActivity;->aYC: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;->aYt:Ljava/util/List;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYC: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;->aYu:Landroid/widget/TextView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYD: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;->aYc:I
+    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYv:Landroid/widget/TextView;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYE: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;->aYc:I
+    iget v7, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYc:I
+    iget v13, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYc:I
+    iget v12, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aYc:I
+    iget v11, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl: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;->aXY:Landroid/graphics/Bitmap$CompressFormat;
+    sget-object v16, Lcom/yalantis/ucrop/UCropActivity;->aYh:Landroid/graphics/Bitmap$CompressFormat;
 
     :cond_9
     move-object/from16 v3, v16
 
-    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYG:Landroid/graphics/Bitmap$CompressFormat;
 
     const/16 v3, 0x5a
 
@@ -1324,7 +1324,7 @@
 
     move-result v3
 
-    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYy:I
+    iput v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYH: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;->aYz:[I
+    iput-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYI:[I
 
     :cond_a
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYm:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYv: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;->aYn:Landroid/view/ViewGroup;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYE:F
+    iget v8, v8, Lcom/yalantis/ucrop/model/AspectRatio;->aYN: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;->aYF:F
+    iget v5, v5, Lcom/yalantis/ucrop/model/AspectRatio;->aYO:F
 
     div-float/2addr v8, v5
 
@@ -1618,7 +1618,7 @@
     goto :goto_4
 
     :cond_d
-    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v5, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v3, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYu: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;->aYi:Z
+    iget-boolean v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYr:Z
 
     if-eqz v0, :cond_11
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYn:Landroid/view/ViewGroup;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/ViewGroup;
 
     invoke-virtual {v0}, Landroid/view/ViewGroup;->getVisibility()I
 
@@ -1739,7 +1739,7 @@
     invoke-direct {v1, v2}, Lcom/yalantis/ucrop/UCropActivity;->cK(I)V
 
     :goto_6
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/View;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYw:Landroid/view/View;
+    iput-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYw:Landroid/view/View;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF:Landroid/view/View;
 
     invoke-virtual {v2, v0}, Landroid/view/View;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
 
-    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYw:Landroid/view/View;
+    iget-object v0, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYw:Landroid/view/View;
+    iget-object v2, v1, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYd:I
+    iget v3, p0, Lcom/yalantis/ucrop/UCropActivity;->aYm: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;->aYg:I
+    iget v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYp: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;->aYd:I
+    iget v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYm: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;->aYw:Landroid/view/View;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYF: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;->aYj:Z
+    iput-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/UCropActivity;->supportInvalidateOptionsMenu()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYG:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget v2, p0, Lcom/yalantis/ucrop/UCropActivity;->aYy:I
+    iget v2, p0, Lcom/yalantis/ucrop/UCropActivity;->aYH: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;->aYj:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs:Z
 
     xor-int/lit8 v1, v1, 0x1
 
@@ -1970,7 +1970,7 @@
 
     move-result-object v0
 
-    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYj:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/UCropActivity;->aYs: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/UCropActivity;->aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->Bv()V
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->By()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 7f72b43150..789767f720 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 aXX:Landroid/os/Bundle;
+.field public final aYg:Landroid/os/Bundle;
 
 
 # direct methods
@@ -28,7 +28,7 @@
 
     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/a$a;->aXX:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a$a;->aYg: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 52ba26b3e4..5e8e5e3ff2 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 aXV:Landroid/content/Intent;
+.field public aYe:Landroid/content/Intent;
 
-.field public aXW:Landroid/os/Bundle;
+.field public aYf: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;->aXV:Landroid/content/Intent;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a;->aYe: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;->aXW:Landroid/os/Bundle;
+    iput-object v0, p0, Lcom/yalantis/ucrop/a;->aYf:Landroid/os/Bundle;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/a;->aXW:Landroid/os/Bundle;
+    iget-object v0, p0, Lcom/yalantis/ucrop/a;->aYf: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;->aXW:Landroid/os/Bundle;
+    iget-object p1, p0, Lcom/yalantis/ucrop/a;->aYf:Landroid/os/Bundle;
 
     const-string v0, "com.yalantis.ucrop.OutputUri"
 
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 ef4799c02e..a9101ac1a6 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/b/a.smali
@@ -16,25 +16,29 @@
 
 
 # instance fields
-.field private final aYG:I
+.field private final aYG:Landroid/graphics/Bitmap$CompressFormat;
 
 .field private final aYH:I
 
-.field private final aYI:Ljava/lang/String;
+.field private final aYP:I
 
-.field private final aYJ:Ljava/lang/String;
+.field private final aYQ:I
 
-.field private final aYK:Lcom/yalantis/ucrop/model/b;
+.field private final aYR:Ljava/lang/String;
 
-.field private final aYN:Landroid/graphics/RectF;
+.field private final aYS:Ljava/lang/String;
 
-.field private final aYO:Landroid/graphics/RectF;
+.field private final aYT:Lcom/yalantis/ucrop/model/b;
 
-.field private aYP:F
+.field private final aYW:Landroid/graphics/RectF;
 
-.field private aYQ:F
+.field private final aYX:Landroid/graphics/RectF;
 
-.field private final aYR:Ljava/lang/ref/WeakReference;
+.field private aYY:F
+
+.field private aYZ:F
+
+.field private final aZa:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -44,21 +48,17 @@
     .end annotation
 .end field
 
-.field private aYS:Landroid/graphics/Bitmap;
+.field private aZb:Landroid/graphics/Bitmap;
 
-.field private final aYT:Lcom/yalantis/ucrop/a/a;
+.field private final aZc:Lcom/yalantis/ucrop/a/a;
 
-.field private aYU:I
+.field private aZd:I
 
-.field private aYV:I
+.field private aZe:I
 
-.field private aYW:I
+.field private aZf:I
 
-.field private aYX:I
-
-.field private final aYx:Landroid/graphics/Bitmap$CompressFormat;
-
-.field private final aYy:I
+.field private aZg:I
 
 
 # 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;->aYR:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZa:Ljava/lang/ref/WeakReference;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
-    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYN:Landroid/graphics/RectF;
+    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYW:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
-    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYO:Landroid/graphics/RectF;
+    iget-object p1, p3, Lcom/yalantis/ucrop/model/c;->aYX:Landroid/graphics/RectF;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
 
-    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYP:F
+    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYY:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
-    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYQ:F
+    iget p1, p3, Lcom/yalantis/ucrop/model/c;->aYZ:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYQ:F
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYZ:F
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYG:I
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYP:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYG:I
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
+
+    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYQ:I
+
+    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
+
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
+
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
 
     iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYH:I
 
     iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYR:Ljava/lang/String;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYR:Ljava/lang/String;
 
-    iget p1, p4, Lcom/yalantis/ucrop/model/a;->aYy:I
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYS:Ljava/lang/String;
 
-    iput p1, p0, Lcom/yalantis/ucrop/b/a;->aYy:I
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYS:Ljava/lang/String;
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYI:Ljava/lang/String;
+    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYT:Lcom/yalantis/ucrop/model/b;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYI:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYT:Lcom/yalantis/ucrop/model/b;
 
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYJ:Ljava/lang/String;
-
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYJ:Ljava/lang/String;
-
-    iget-object p1, p4, Lcom/yalantis/ucrop/model/a;->aYK:Lcom/yalantis/ucrop/model/b;
-
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/a;->aYK:Lcom/yalantis/ucrop/model/b;
-
-    iput-object p5, p0, Lcom/yalantis/ucrop/b/a;->aYT:Lcom/yalantis/ucrop/a/a;
+    iput-object p5, p0, Lcom/yalantis/ucrop/b/a;->aZc:Lcom/yalantis/ucrop/a/a;
 
     return-void
 .end method
 
-.method private varargs Bp()Ljava/lang/Throwable;
+.method private varargs Bs()Ljava/lang/Throwable;
     .locals 12
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->aYO:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aYG:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
 
     const/4 v1, 0x0
 
     if-lez v0, :cond_5
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
 
     if-lez v0, :cond_5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v0, v2
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->height()F
 
     move-result v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v2, v3
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYG:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
 
     int-to-float v3, v3
 
@@ -211,7 +211,7 @@
 
     if-gtz v3, :cond_3
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYQ: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;->aYG:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
 
     int-to-float v3, v3
 
     div-float/2addr v3, v0
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
 
     int-to-float v0, v0
 
@@ -236,9 +236,9 @@
 
     move-result v0
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->aYS:Landroid/graphics/Bitmap;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->aYS:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     if-eq v3, v2, :cond_4
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     invoke-virtual {v3}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_4
-    iput-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iput-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v2, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iput v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     :cond_5
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYQ:F
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYZ: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;->aYQ:F
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYZ:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->aYS:Landroid/graphics/Bitmap;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->aYS:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     const/4 v3, 0x0
 
     const/4 v4, 0x0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     invoke-virtual {v0}, Landroid/graphics/Bitmap;->getWidth()I
 
     move-result v5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->aYS:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     if-eq v2, v0, :cond_6
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     invoke-virtual {v2}, Landroid/graphics/Bitmap;->recycle()V
 
     :cond_6
-    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
     :cond_7
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->left:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->left:F
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v0, v2
 
@@ -378,19 +378,19 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZf:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     iget v0, v0, Landroid/graphics/RectF;->top:F
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYX:Landroid/graphics/RectF;
 
     iget v2, v2, Landroid/graphics/RectF;->top:F
 
     sub-float/2addr v0, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v0, v2
 
@@ -398,15 +398,15 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aYX:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZg:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->width()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v0, v2
 
@@ -414,15 +414,15 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aYU:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->height()F
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYP:F
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYY:F
 
     div-float/2addr v0, v2
 
@@ -430,11 +430,11 @@
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aYV:I
+    iput v0, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
 
-    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aYU:I
+    iget v0, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aYV:I
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aZe: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;->aYG:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYP:I
 
     if-lez v3, :cond_8
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYH:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYQ:I
 
     if-gtz v3, :cond_9
 
     :cond_8
-    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYN:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->left:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aYN:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->top:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aYN:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->bottom:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aYN:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:Landroid/graphics/RectF;
 
     iget v3, v3, Landroid/graphics/RectF;->right:F
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYO:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYX: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;->aYI:Ljava/lang/String;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYR:Ljava/lang/String;
 
     invoke-direct {v1, v2}, Landroid/media/ExifInterface;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS:Landroid/graphics/Bitmap;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aZb:Landroid/graphics/Bitmap;
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZf:I
 
-    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aYX:I
+    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aZg:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYU:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aYV:I
+    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aZe: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;->aYR:Ljava/lang/ref/WeakReference;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/a;->aZa: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;->aYJ:Ljava/lang/String;
+    iget-object v5, p0, Lcom/yalantis/ucrop/b/a;->aYS: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;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYy:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYH: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;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYG: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;->aYU:I
+    iget v2, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYV:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZe:I
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYJ:Ljava/lang/String;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/a;->aYS: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;->aYI:Ljava/lang/String;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->aYR:Ljava/lang/String;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYJ:Ljava/lang/String;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/a;->aYS: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;->aYS:Landroid/graphics/Bitmap;
+    iput-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZb: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;->Bp()Ljava/lang/Throwable;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/a;->Bs()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;->aYT:Lcom/yalantis/ucrop/a/a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aZc: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;->aYJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/a;->aYS: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;->aYT:Lcom/yalantis/ucrop/a/a;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/a;->aZc:Lcom/yalantis/ucrop/a/a;
 
-    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aYW:I
+    iget v3, p0, Lcom/yalantis/ucrop/b/a;->aZf:I
 
-    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aYX:I
+    iget v4, p0, Lcom/yalantis/ucrop/b/a;->aZg:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aYU:I
+    iget v5, p0, Lcom/yalantis/ucrop/b/a;->aZd:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aYV:I
+    iget v6, p0, Lcom/yalantis/ucrop/b/a;->aZe: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 5ea9d7af05..939de6ceef 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 aYK:Lcom/yalantis/ucrop/model/b;
+.field aYT:Lcom/yalantis/ucrop/model/b;
 
-.field aZd:Landroid/graphics/Bitmap;
+.field aZm:Landroid/graphics/Bitmap;
 
-.field aZe:Ljava/lang/Exception;
+.field aZn:Ljava/lang/Exception;
 
 
 # direct methods
@@ -28,9 +28,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->aZd:Landroid/graphics/Bitmap;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->aZm:Landroid/graphics/Bitmap;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/b/b$a;->aYK:Lcom/yalantis/ucrop/model/b;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/b$a;->aYT: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;->aZe:Ljava/lang/Exception;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b$a;->aZn: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 d96309e74a..e3718a2524 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 aYY:Landroid/net/Uri;
+.field private aZh:Landroid/net/Uri;
 
-.field private aYZ:Landroid/net/Uri;
+.field private aZi:Landroid/net/Uri;
 
-.field private final aZa:I
+.field private final aZj:I
 
-.field private final aZb:I
+.field private final aZk:I
 
-.field private final aZc:Lcom/yalantis/ucrop/a/b;
+.field private final aZl: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;->aYY:Landroid/net/Uri;
+    iput-object p2, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/b/b;->aYZ:Landroid/net/Uri;
+    iput-object p3, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
 
-    iput p4, p0, Lcom/yalantis/ucrop/b/b;->aZa:I
+    iput p4, p0, Lcom/yalantis/ucrop/b/b;->aZj:I
 
-    iput p5, p0, Lcom/yalantis/ucrop/b/b;->aZb:I
+    iput p5, p0, Lcom/yalantis/ucrop/b/b;->aZk:I
 
-    iput-object p6, p0, Lcom/yalantis/ucrop/b/b;->aZc:Lcom/yalantis/ucrop/a/b;
+    iput-object p6, p0, Lcom/yalantis/ucrop/b/b;->aZl:Lcom/yalantis/ucrop/a/b;
 
     return-void
 .end method
 
-.method private varargs Bq()Lcom/yalantis/ucrop/b/b$a;
+.method private varargs Bt()Lcom/yalantis/ucrop/b/b$a;
     .locals 14
 
     const-string v0, "BitmapWorkerTask"
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aYY:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aYZ:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZi: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;->aYY:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh:Landroid/net/Uri;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aYZ:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
 
     const-string v5, "downloadFile"
 
@@ -286,7 +286,7 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object v1
 
@@ -294,16 +294,16 @@
 
     move-result-object v1
 
-    invoke-interface {v1}, Lokhttp3/e;->Fa()Lokhttp3/Response;
+    invoke-interface {v1}, Lokhttp3/e;->Fd()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;->bst:Lokhttp3/x;
+    iget-object v6, v1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
-    invoke-virtual {v6}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {v6}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v6
     :try_end_5
@@ -340,18 +340,18 @@
 
     if-eqz v1, :cond_7
 
-    iget-object v1, v1, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v1, v1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_7
-    iget-object v1, v5, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v1, v5, Lokhttp3/t;->brL:Lokhttp3/n;
 
     invoke-virtual {v1}, Lokhttp3/n;->cancelAll()V
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aYZ:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aYY:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aZa:I
+    iget v8, p0, Lcom/yalantis/ucrop/b/b;->aZj:I
 
-    iget v10, p0, Lcom/yalantis/ucrop/b/b;->aZb:I
+    iget v10, p0, Lcom/yalantis/ucrop/b/b;->aZk: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;->aYY:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYY:Landroid/net/Uri;
+    iget-object v4, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->bst:Lokhttp3/x;
+    iget-object v1, v1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-static {v1}, Lcom/yalantis/ucrop/c/a;->f(Ljava/io/Closeable;)V
 
     :cond_13
-    iget-object v1, v5, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v1, v5, Lokhttp3/t;->brL:Lokhttp3/n;
 
     invoke-virtual {v1}, Lokhttp3/n;->cancelAll()V
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aYZ:Landroid/net/Uri;
+    iget-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
 
-    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aYY:Landroid/net/Uri;
+    iput-object v1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYZ:Landroid/net/Uri;
+    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aYY:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYZ:Landroid/net/Uri;
+    iget-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZi:Landroid/net/Uri;
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aYY:Landroid/net/Uri;
+    iput-object p1, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->Bq()Lcom/yalantis/ucrop/b/b$a;
+    invoke-direct {p0}, Lcom/yalantis/ucrop/b/b;->Bt()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;->aZe:Ljava/lang/Exception;
+    iget-object v0, p1, Lcom/yalantis/ucrop/b/b$a;->aZn:Ljava/lang/Exception;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->aZc:Lcom/yalantis/ucrop/a/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->aZl:Lcom/yalantis/ucrop/a/b;
 
-    iget-object v1, p1, Lcom/yalantis/ucrop/b/b$a;->aZd:Landroid/graphics/Bitmap;
+    iget-object v1, p1, Lcom/yalantis/ucrop/b/b$a;->aZm:Landroid/graphics/Bitmap;
 
-    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aYK:Lcom/yalantis/ucrop/model/b;
+    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aYT:Lcom/yalantis/ucrop/model/b;
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aYY:Landroid/net/Uri;
+    iget-object v2, p0, Lcom/yalantis/ucrop/b/b;->aZh: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;->aYZ:Landroid/net/Uri;
+    iget-object v3, p0, Lcom/yalantis/ucrop/b/b;->aZi: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;->aZc:Lcom/yalantis/ucrop/a/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/b/b;->aZl:Lcom/yalantis/ucrop/a/b;
 
-    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aZe:Ljava/lang/Exception;
+    iget-object p1, p1, Lcom/yalantis/ucrop/b/b$a;->aZn: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 8810b8a3ee..06b1ac865e 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/c/a.smali
@@ -114,9 +114,9 @@
 
     invoke-direct {v1, p0}, Lcom/yalantis/ucrop/c/f;-><init>(Ljava/io/InputStream;)V
 
-    iget-object v2, v1, Lcom/yalantis/ucrop/c/f;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v2, v1, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Bt()I
+    invoke-interface {v2}, Lcom/yalantis/ucrop/c/f$b;->Bw()I
 
     move-result v2
 
@@ -160,7 +160,7 @@
     goto :goto_1
 
     :cond_2
-    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Bs()I
+    invoke-virtual {v1}, Lcom/yalantis/ucrop/c/f;->Bv()I
 
     move-result v2
 
@@ -181,7 +181,7 @@
     :cond_3
     new-array v3, v2, [B
 
-    iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v1, v1, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
 
     invoke-interface {v1, v3, v2}, Lcom/yalantis/ucrop/c/f$b;->l([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 1ecc2d27bc..ee8e7e57b2 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 Br()I
+.method public static Bu()I
     .locals 24
 
     const/4 v1, 0x0
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 63fe8d63fd..f5718be225 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 Bt()I
+.method public abstract Bw()I
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -23,7 +23,7 @@
     .end annotation
 .end method
 
-.method public abstract Bu()S
+.method public abstract Bx()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 639f20dd5e..f90efd0bb3 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 aZi:Ljava/io/InputStream;
+.field private final aZr: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;->aZi:Ljava/io/InputStream;
+    iput-object p1, p0, Lcom/yalantis/ucrop/c/f$c;->aZr:Ljava/io/InputStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bt()I
+.method public final Bw()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;->aZi:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->aZr: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;->aZi:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->aZr:Ljava/io/InputStream;
 
     invoke-virtual {v1}, Ljava/io/InputStream;->read()I
 
@@ -67,7 +67,7 @@
     return v0
 .end method
 
-.method public final Bu()S
+.method public final Bx()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;->aZi:Ljava/io/InputStream;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f$c;->aZr: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;->aZi:Ljava/io/InputStream;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f$c;->aZr: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;->aZi:Ljava/io/InputStream;
+    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->aZr: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;->aZi:Ljava/io/InputStream;
+    iget-object v4, p0, Lcom/yalantis/ucrop/c/f$c;->aZr: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 8b53a31838..b2f586ad8b 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 aZf:[B
+.field private static final aZo:[B
 
-.field private static final aZg:[I
+.field private static final aZp:[I
 
 
 # instance fields
-.field final aZh:Lcom/yalantis/ucrop/c/f$b;
+.field final aZq:Lcom/yalantis/ucrop/c/f$b;
 
 
 # direct methods
@@ -39,7 +39,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZf:[B
+    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZo:[B
 
     const/16 v0, 0xd
 
@@ -47,7 +47,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZg:[I
+    sput-object v0, Lcom/yalantis/ucrop/c/f;->aZp:[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;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iput-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
 
     return-void
 .end method
@@ -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;->aZg:[I
+    sget-object v9, Lcom/yalantis/ucrop/c/f;->aZp:[I
 
     aget v9, v9, v7
 
@@ -633,7 +633,7 @@
 .method static k([BI)Z
     .locals 4
 
-    sget-object v0, Lcom/yalantis/ucrop/c/f;->aZf:[B
+    sget-object v0, Lcom/yalantis/ucrop/c/f;->aZo:[B
 
     array-length v0, v0
 
@@ -654,7 +654,7 @@
     const/4 v0, 0x0
 
     :goto_1
-    sget-object v2, Lcom/yalantis/ucrop/c/f;->aZf:[B
+    sget-object v2, Lcom/yalantis/ucrop/c/f;->aZo:[B
 
     array-length v3, v2
 
@@ -682,7 +682,7 @@
 
 
 # virtual methods
-.method final Bs()I
+.method final Bv()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;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bu()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bx()S
 
     move-result v0
 
@@ -729,9 +729,9 @@
     return v3
 
     :cond_2
-    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bu()S
+    invoke-interface {v0}, Lcom/yalantis/ucrop/c/f$b;->Bx()S
 
     move-result v0
 
@@ -760,9 +760,9 @@
     return v3
 
     :cond_5
-    iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v1, p0, Lcom/yalantis/ucrop/c/f;->aZq:Lcom/yalantis/ucrop/c/f$b;
 
-    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Bt()I
+    invoke-interface {v1}, Lcom/yalantis/ucrop/c/f$b;->Bw()I
 
     move-result v1
 
@@ -772,7 +772,7 @@
 
     if-eq v0, v5, :cond_7
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/c/f;->aZh:Lcom/yalantis/ucrop/c/f$b;
+    iget-object v5, p0, Lcom/yalantis/ucrop/c/f;->aZq: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 1dd9880c33..e79c639e61 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 aZj:F
+.field public aZA:Lcom/yalantis/ucrop/c/h$a;
 
-.field public aZk:F
+.field public aZs:F
 
-.field public aZl:F
+.field public aZt:F
 
-.field public aZm:F
+.field public aZu:F
 
-.field public aZn:I
+.field public aZv:F
 
-.field public aZo:I
+.field public aZw:I
 
-.field public aZp:F
+.field public aZx:I
 
-.field public aZq:Z
+.field public aZy:F
 
-.field public aZr:Lcom/yalantis/ucrop/c/h$a;
+.field public aZz:Z
 
 
 # direct methods
@@ -38,13 +38,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/c/h;->aZr:Lcom/yalantis/ucrop/c/h$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/c/h;->aZA:Lcom/yalantis/ucrop/c/h$a;
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZn:I
+    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZw:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZo:I
+    iput p1, p0, Lcom/yalantis/ucrop/c/h;->aZx: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 9e8ed3bfe1..2cbf0e5841 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 aZs:I
+.field private aZB:I
 
 
 # direct methods
@@ -13,7 +13,7 @@
 
     invoke-direct {p0}, Landroid/graphics/drawable/StateListDrawable;-><init>()V
 
-    iput p2, p0, Lcom/yalantis/ucrop/c/i;->aZs:I
+    iput p2, p0, Lcom/yalantis/ucrop/c/i;->aZB:I
 
     const/4 p2, 0x1
 
@@ -72,7 +72,7 @@
     :cond_1
     if-eqz v2, :cond_2
 
-    iget v0, p0, Lcom/yalantis/ucrop/c/i;->aZs:I
+    iget v0, p0, Lcom/yalantis/ucrop/c/i;->aZB: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 fa7b16367c..e6c4481b09 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 aYD:Ljava/lang/String;
+.field public final aYM:Ljava/lang/String;
 
-.field public final aYE:F
+.field public final aYN:F
 
-.field public final aYF:F
+.field public final aYO:F
 
 
 # direct methods
@@ -48,19 +48,19 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYD:Ljava/lang/String;
+    iput-object v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYM:Ljava/lang/String;
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result v0
 
-    iput v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYE:F
+    iput v0, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
 
     invoke-virtual {p1}, Landroid/os/Parcel;->readFloat()F
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYF:F
+    iput p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYO: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;->aYD:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYM:Ljava/lang/String;
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYE:F
+    iput p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYF:F
+    iput p3, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYO: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;->aYD:Ljava/lang/String;
+    iget-object p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYM:Ljava/lang/String;
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
 
-    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYE:F
+    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
 
     invoke-virtual {p1, p2}, Landroid/os/Parcel;->writeFloat(F)V
 
-    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYF:F
+    iget p2, p0, Lcom/yalantis/ucrop/model/AspectRatio;->aYO: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 e3282537fe..d19b090976 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 aYG:I
+.field public aYG:Landroid/graphics/Bitmap$CompressFormat;
 
 .field public aYH:I
 
-.field public aYI:Ljava/lang/String;
+.field public aYP:I
 
-.field public aYJ:Ljava/lang/String;
+.field public aYQ:I
 
-.field public aYK:Lcom/yalantis/ucrop/model/b;
+.field public aYR:Ljava/lang/String;
 
-.field public aYx:Landroid/graphics/Bitmap$CompressFormat;
+.field public aYS:Ljava/lang/String;
 
-.field public aYy:I
+.field public aYT: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;->aYG:I
+    iput p1, p0, Lcom/yalantis/ucrop/model/a;->aYP:I
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/a;->aYH:I
+    iput p2, p0, Lcom/yalantis/ucrop/model/a;->aYQ:I
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/model/a;->aYx:Landroid/graphics/Bitmap$CompressFormat;
+    iput-object p3, p0, Lcom/yalantis/ucrop/model/a;->aYG:Landroid/graphics/Bitmap$CompressFormat;
 
-    iput p4, p0, Lcom/yalantis/ucrop/model/a;->aYy:I
+    iput p4, p0, Lcom/yalantis/ucrop/model/a;->aYH:I
 
-    iput-object p5, p0, Lcom/yalantis/ucrop/model/a;->aYI:Ljava/lang/String;
+    iput-object p5, p0, Lcom/yalantis/ucrop/model/a;->aYR:Ljava/lang/String;
 
-    iput-object p6, p0, Lcom/yalantis/ucrop/model/a;->aYJ:Ljava/lang/String;
+    iput-object p6, p0, Lcom/yalantis/ucrop/model/a;->aYS:Ljava/lang/String;
 
-    iput-object p7, p0, Lcom/yalantis/ucrop/model/a;->aYK:Lcom/yalantis/ucrop/model/b;
+    iput-object p7, p0, Lcom/yalantis/ucrop/model/a;->aYT: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 2832bde244..90e1122381 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 Nn:I
+.field private Nw:I
 
-.field private aYL:I
+.field private aYU:I
 
-.field private aYM:I
+.field private aYV:I
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lcom/yalantis/ucrop/model/b;->Nn:I
+    iput p1, p0, Lcom/yalantis/ucrop/model/b;->Nw:I
 
-    iput p2, p0, Lcom/yalantis/ucrop/model/b;->aYL:I
+    iput p2, p0, Lcom/yalantis/ucrop/model/b;->aYU:I
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/b;->aYM:I
+    iput p3, p0, Lcom/yalantis/ucrop/model/b;->aYV: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;->Nn:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->Nw:I
 
-    iget v3, p1, Lcom/yalantis/ucrop/model/b;->Nn:I
+    iget v3, p1, Lcom/yalantis/ucrop/model/b;->Nw:I
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYL:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYU:I
 
-    iget v3, p1, Lcom/yalantis/ucrop/model/b;->aYL:I
+    iget v3, p1, Lcom/yalantis/ucrop/model/b;->aYU:I
 
     if-eq v2, v3, :cond_3
 
     return v1
 
     :cond_3
-    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYM:I
+    iget v2, p0, Lcom/yalantis/ucrop/model/b;->aYV:I
 
-    iget p1, p1, Lcom/yalantis/ucrop/model/b;->aYM:I
+    iget p1, p1, Lcom/yalantis/ucrop/model/b;->aYV: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;->Nn:I
+    iget v0, p0, Lcom/yalantis/ucrop/model/b;->Nw:I
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYL:I
+    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYU:I
 
     add-int/2addr v0, v1
 
     mul-int/lit8 v0, v0, 0x1f
 
-    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYM:I
+    iget v1, p0, Lcom/yalantis/ucrop/model/b;->aYV: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 e7eef6167e..315f7ce7aa 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 aYN:Landroid/graphics/RectF;
+.field public aYW:Landroid/graphics/RectF;
 
-.field public aYO:Landroid/graphics/RectF;
+.field public aYX:Landroid/graphics/RectF;
 
-.field public aYP:F
+.field public aYY:F
 
-.field public aYQ:F
+.field public aYZ:F
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/model/c;->aYN:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/model/c;->aYW:Landroid/graphics/RectF;
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/model/c;->aYO:Landroid/graphics/RectF;
+    iput-object p2, p0, Lcom/yalantis/ucrop/model/c;->aYX:Landroid/graphics/RectF;
 
-    iput p3, p0, Lcom/yalantis/ucrop/model/c;->aYP:F
+    iput p3, p0, Lcom/yalantis/ucrop/model/c;->aYY:F
 
-    iput p4, p0, Lcom/yalantis/ucrop/model/c;->aYQ:F
+    iput p4, p0, Lcom/yalantis/ucrop/model/c;->aYZ: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 0a5ec74355..26e70d8f32 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 aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v8, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bab: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;->aZx:Ljava/lang/Runnable;
+    iput-object v9, v8, Lcom/yalantis/ucrop/view/a;->aZG: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$a;->bab: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 4c2dde41e7..fe8613f3f5 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 aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bab:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-    iget p1, p1, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iget p1, p1, Lcom/yalantis/ucrop/c/h;->aZy:F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$b;->bab: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 269c324945..2604d3fcee 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 aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field final synthetic bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bab: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;->aZS:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/GestureCropImageView$c;->bab: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 89a8ba6860..c7e780fb52 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 aZM:Landroid/view/ScaleGestureDetector;
+.field private aZV:Landroid/view/ScaleGestureDetector;
 
-.field private aZN:Lcom/yalantis/ucrop/c/h;
+.field private aZW:Lcom/yalantis/ucrop/c/h;
 
-.field private aZO:F
+.field private aZX:F
 
-.field private aZP:F
+.field private aZY:F
 
-.field private aZQ:Z
+.field private aZZ:Z
 
-.field private aZR:I
+.field private abe:Z
 
-.field private aaV:Z
+.field private baa:I
 
-.field private ok:Landroid/view/GestureDetector;
+.field private oj:Landroid/view/GestureDetector;
 
 
 # direct methods
@@ -39,13 +39,13 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZQ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZZ:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aaV:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe:Z
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
 
     return-void
 .end method
@@ -67,13 +67,13 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZQ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZZ:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aaV:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe:Z
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa: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;->aZO:F
+    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZX: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;->aZP:F
+    iget p0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZY:F
 
     return p0
 .end method
@@ -99,7 +99,7 @@
 .method public getDoubleTapScaleSteps()I
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa:I
 
     return v0
 .end method
@@ -123,7 +123,7 @@
 
     float-to-double v1, v1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR:I
+    iget v3, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa: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;->ok:Landroid/view/GestureDetector;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->oj: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;->aZM:Landroid/view/ScaleGestureDetector;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV: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;->aZN:Lcom/yalantis/ucrop/c/h;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW: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;->Bv()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/GestureCropImageView;->By()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;->aZO:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZX: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;->aZP:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZY:F
 
     :cond_1
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->ok:Landroid/view/GestureDetector;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->oj:Landroid/view/GestureDetector;
 
     invoke-virtual {v0, p1}, Landroid/view/GestureDetector;->onTouchEvent(Landroid/view/MotionEvent;)Z
 
-    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aaV:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZM:Landroid/view/ScaleGestureDetector;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZV: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;->aZQ:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZZ:Z
 
     if-eqz v0, :cond_c
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZN:Lcom/yalantis/ucrop/c/h;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZW: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;->aZo:I
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
 
     goto/16 :goto_1
 
@@ -306,13 +306,13 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZj:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZs:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZk:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZt:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionIndex()I
 
@@ -326,20 +326,20 @@
 
     move-result v1
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZo:I
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
-    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZq:Z
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
 
     goto/16 :goto_1
 
     :cond_5
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZn:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
 
     if-eq v3, v5, :cond_c
 
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZo:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
 
     if-eq v3, v5, :cond_c
 
@@ -347,52 +347,52 @@
 
     move-result v3
 
-    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZo:I
+    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
 
     if-le v3, v5, :cond_c
 
-    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZn:I
+    iget v3, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
 
     invoke-virtual {p1, v3}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v3
 
-    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZn:I
+    iget v5, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
 
     invoke-virtual {p1, v5}, Landroid/view/MotionEvent;->getY(I)F
 
     move-result v5
 
-    iget v6, v0, Lcom/yalantis/ucrop/c/h;->aZo:I
+    iget v6, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
 
     invoke-virtual {p1, v6}, Landroid/view/MotionEvent;->getX(I)F
 
     move-result v6
 
-    iget v7, v0, Lcom/yalantis/ucrop/c/h;->aZo:I
+    iget v7, v0, Lcom/yalantis/ucrop/c/h;->aZx:I
 
     invoke-virtual {p1, v7}, Landroid/view/MotionEvent;->getY(I)F
 
     move-result v7
 
-    iget-boolean v8, v0, Lcom/yalantis/ucrop/c/h;->aZq:Z
+    iget-boolean v8, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
 
     if-eqz v8, :cond_6
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
-    iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->aZq:Z
+    iput-boolean v1, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
 
     goto :goto_0
 
     :cond_6
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZj:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZs:F
 
-    iget v4, v0, Lcom/yalantis/ucrop/c/h;->aZk:F
+    iget v4, v0, Lcom/yalantis/ucrop/c/h;->aZt:F
 
-    iget v8, v0, Lcom/yalantis/ucrop/c/h;->aZl:F
+    iget v8, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iget v9, v0, Lcom/yalantis/ucrop/c/h;->aZm:F
+    iget v9, v0, Lcom/yalantis/ucrop/c/h;->aZv:F
 
     sub-float/2addr v4, v9
 
@@ -446,9 +446,9 @@
 
     sub-float/2addr v4, v1
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
     const/high16 v4, -0x3ccc0000    # -180.0f
 
@@ -456,16 +456,16 @@
 
     if-gez v1, :cond_7
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
     add-float/2addr v1, v8
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
     goto :goto_0
 
     :cond_7
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
     const/high16 v4, 0x43340000    # 180.0f
 
@@ -473,35 +473,35 @@
 
     if-lez v1, :cond_8
 
-    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iget v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
     sub-float/2addr v1, v8
 
-    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
     :cond_8
     :goto_0
-    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZr:Lcom/yalantis/ucrop/c/h$a;
+    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZA:Lcom/yalantis/ucrop/c/h$a;
 
     if-eqz v1, :cond_9
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZr:Lcom/yalantis/ucrop/c/h$a;
+    iget-object v1, v0, Lcom/yalantis/ucrop/c/h;->aZA: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;->aZj:F
+    iput v6, v0, Lcom/yalantis/ucrop/c/h;->aZs:F
 
-    iput v7, v0, Lcom/yalantis/ucrop/c/h;->aZk:F
+    iput v7, v0, Lcom/yalantis/ucrop/c/h;->aZt:F
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZl:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZm:F
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZv:F
 
     goto :goto_1
 
     :cond_a
-    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZn:I
+    iput v5, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
 
     goto :goto_1
 
@@ -510,13 +510,13 @@
 
     move-result v3
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZl:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZu:F
 
     invoke-virtual {p1}, Landroid/view/MotionEvent;->getY()F
 
     move-result v3
 
-    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZm:F
+    iput v3, v0, Lcom/yalantis/ucrop/c/h;->aZv: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;->aZn:I
+    iput v1, v0, Lcom/yalantis/ucrop/c/h;->aZw:I
 
-    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZp:F
+    iput v4, v0, Lcom/yalantis/ucrop/c/h;->aZy:F
 
-    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZq:Z
+    iput-boolean v2, v0, Lcom/yalantis/ucrop/c/h;->aZz:Z
 
     :cond_c
     :goto_1
@@ -551,7 +551,7 @@
 .method public setDoubleTapScaleSteps(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZR:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->baa: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;->aZQ:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->aZZ: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;->aaV:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/GestureCropImageView;->abe: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 2e81d405c7..b25826f31c 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 Nz:Landroid/graphics/RectF;
+.field private final NI:Landroid/graphics/RectF;
 
-.field private final aZT:Landroid/graphics/RectF;
+.field private aZC:F
 
-.field protected aZU:I
+.field private baA:Lcom/yalantis/ucrop/a/d;
 
-.field protected aZV:I
+.field private baB:Z
 
-.field protected aZW:[F
+.field private final bac:Landroid/graphics/RectF;
 
-.field protected aZX:[F
+.field protected bad:I
 
-.field aZY:I
+.field protected bae:I
 
-.field aZZ:I
+.field protected baf:[F
 
-.field private aZt:F
+.field protected bag:[F
 
-.field private baa:[F
+.field bah:I
 
-.field bab:Z
+.field bai:I
 
-.field bac:Z
+.field private baj:[F
 
-.field bad:Z
+.field bak:Z
 
-.field bae:I
+.field bal:Z
 
-.field private baf:Landroid/graphics/Path;
+.field bam:Z
 
-.field bag:Landroid/graphics/Paint;
+.field ban:I
 
-.field bah:Landroid/graphics/Paint;
+.field private bao:Landroid/graphics/Path;
 
-.field bai:Landroid/graphics/Paint;
+.field bap:Landroid/graphics/Paint;
 
-.field baj:Landroid/graphics/Paint;
+.field baq:Landroid/graphics/Paint;
 
-.field private bak:I
+.field bar:Landroid/graphics/Paint;
 
-.field private bal:F
+.field bas:Landroid/graphics/Paint;
 
-.field private bam:F
+.field private bat:I
 
-.field private ban:I
+.field private bau:F
 
-.field private bao:I
+.field private bav:F
 
-.field private bap:I
+.field private baw:I
 
-.field private baq:I
+.field private bax:I
 
-.field private bar:Lcom/yalantis/ucrop/a/d;
+.field private bay:I
 
-.field private bas:Z
+.field private baz:I
 
 
 # direct methods
@@ -91,23 +91,23 @@
 
     invoke-direct {p1}, Landroid/graphics/RectF;-><init>()V
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     new-instance p2, Landroid/graphics/Path;
 
     invoke-direct {p2}, Landroid/graphics/Path;-><init>()V
 
-    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:Landroid/graphics/Path;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao: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;->bag:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap: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;->bah:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq: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;->bai:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->baj:Landroid/graphics/Paint;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bas:Landroid/graphics/Paint;
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
 
     const/high16 p2, -0x40800000    # -1.0f
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bal:F
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam:F
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
 
     const/4 p2, -0x1
 
-    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baw: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;->bao:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bax: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;->bap:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bay: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;->baq:I
+    iput p2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baz:I
 
     sget p2, Landroid/os/Build$VERSION;->SDK_INT:I
 
@@ -197,54 +197,54 @@
     return-void
 .end method
 
-.method private By()V
+.method private BB()V
     .locals 5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZW:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZX:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bag:[F
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Path;
 
     invoke-virtual {v0}, Landroid/graphics/Path;->reset()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao:Landroid/graphics/Path;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerX()F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->centerY()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->width()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->bak:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat: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;->bar:Lcom/yalantis/ucrop/a/d;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baA: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;->bad:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baf:Landroid/graphics/Path;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bao: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;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->bae:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban: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;->bad:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerY()F
 
     move-result v1
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->bag:Landroid/graphics/Paint;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bap: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;->bac:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bal:Z
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     if-nez v0, :cond_3
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZY:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:I
 
     mul-int/lit8 v0, v0, 0x4
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZZ:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai: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;->baa:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     const/4 v0, 0x0
 
@@ -402,27 +402,27 @@
     const/4 v2, 0x0
 
     :goto_1
-    iget v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:I
+    iget v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:I
 
     const/high16 v4, 0x3f800000    # 1.0f
 
     if-ge v1, v3, :cond_2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v5, v2, 0x1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v6, v6, Landroid/graphics/RectF;->left:F
 
     aput v6, v3, v2
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v3, v5, 0x1
 
-    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZY:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah: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;->aZT:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->baa:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v4, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->right:F
 
     aput v5, v2, v3
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v3, v4, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
     move-result v5
 
-    iget v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:I
+    iget v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah: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;->aZT:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZZ:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:I
 
     if-ge v0, v1, :cond_3
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v3, v2, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZZ:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai: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;->aZT:Landroid/graphics/RectF;
+    iget-object v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->baa:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v2, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->top:F
 
     aput v5, v1, v3
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v3, v2, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->width()F
 
     move-result v5
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZZ:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai: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;->aZT:Landroid/graphics/RectF;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->baa:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     add-int/lit8 v2, v3, 0x1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->baa:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     if-eqz v0, :cond_4
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq: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;->bab:Z
+    iget-boolean v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak:Z
 
     if-eqz v0, :cond_5
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->bak:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
 
     if-eqz v0, :cond_6
 
     invoke-virtual {p1}, Landroid/graphics/Canvas;->save()I
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baz: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;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v0, v1}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baz: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;->Nz:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bas: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;->aZU:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad:I
 
     sub-int/2addr p4, p2
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZV:I
+    iput p4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae:I
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bas:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baB:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bas:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baB:Z
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZt:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZC: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;->aZT:Landroid/graphics/RectF;
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->bak:I
+    iget v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
 
     if-nez v1, :cond_0
 
@@ -770,7 +770,7 @@
 
     if-nez v4, :cond_7
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bao:I
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bax: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;->aZW:[F
+    iget-object v12, v0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     aget v12, v12, v4
 
@@ -797,7 +797,7 @@
 
     move-result-wide v12
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZW:[F
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baf:[F
 
     add-int/lit8 v17, v4, 0x1
 
@@ -831,13 +831,13 @@
     goto :goto_0
 
     :cond_2
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bak:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
 
     if-ne v2, v8, :cond_3
 
     if-gez v11, :cond_3
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->ban:I
+    iput v11, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
 
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw: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;->bal:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bam:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
 
     goto :goto_2
 
     :cond_5
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bal:F
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
     const/4 v4, 0x0
 
@@ -881,9 +881,9 @@
 
     if-gez v2, :cond_6
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bal:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
-    iput v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bam:F
+    iput v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
 
     :cond_6
     :goto_2
@@ -906,7 +906,7 @@
 
     if-ne v2, v8, :cond_15
 
-    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
+    iget v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
 
     if-eq v2, v7, :cond_15
 
@@ -962,13 +962,13 @@
 
     move-result v2
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     invoke-virtual {v3, v5}, Landroid/graphics/RectF;->set(Landroid/graphics/RectF;)V
 
-    iget v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
+    iget v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bal:F
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
     sub-float v4, v1, v4
 
-    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bam:F
+    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->aZT:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->Nz:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->By()V
+    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->BB()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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->top:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->left:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
-    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     iget v4, v4, Landroid/graphics/RectF;->right:F
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
+    iget v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bay: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;->Nz:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
     move-result v4
 
-    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bap:I
+    iget v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->bay: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;->aZT:Landroid/graphics/RectF;
+    iget-object v4, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac:Landroid/graphics/RectF;
 
     if-eqz v16, :cond_f
 
-    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->Nz:Landroid/graphics/RectF;
+    iget-object v5, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI: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;->Nz:Landroid/graphics/RectF;
+    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
     goto :goto_7
 
     :cond_10
-    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v6, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
     goto :goto_8
 
     :cond_11
-    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->Nz:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->NI:Landroid/graphics/RectF;
 
     goto :goto_9
 
     :cond_12
-    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v9, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->By()V
+    invoke-direct/range {p0 .. p0}, Lcom/yalantis/ucrop/view/OverlayView;->BB()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;->bal:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
-    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bam:F
+    iput v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
 
     return v8
 
@@ -1250,17 +1250,17 @@
 
     const/high16 v1, -0x40800000    # -1.0f
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bal:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bau:F
 
-    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bam:F
+    iput v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bav:F
 
-    iput v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
+    iput v7, v0, Lcom/yalantis/ucrop/view/OverlayView;->baw:I
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->bar:Lcom/yalantis/ucrop/a/d;
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/OverlayView;->baA:Lcom/yalantis/ucrop/a/d;
 
     if-eqz v1, :cond_16
 
-    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->bad:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->bai:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->bai:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->bah:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq: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;->aZZ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bai:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[F
 
     return-void
 .end method
@@ -1331,11 +1331,11 @@
 .method public setCropGridRowCount(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZY:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bah:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baa:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baj:[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;->bah:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->baq: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;->bae:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
 
     return-void
 .end method
@@ -1365,7 +1365,7 @@
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat:I
 
     return-void
 .end method
@@ -1373,7 +1373,7 @@
 .method public setFreestyleCropMode(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bat: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;->bar:Lcom/yalantis/ucrop/a/d;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baA: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;->bab:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bak: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;->bac:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bal:Z
 
     return-void
 .end method
@@ -1407,21 +1407,21 @@
 .method public setTargetAspectRatio(F)V
     .locals 6
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZt:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZC:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZU:I
+    iget p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad:I
 
     if-lez p1, :cond_2
 
     int-to-float v0, p1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZt:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZC:F
 
     div-float/2addr v0, v1
 
     float-to-int v0, v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZV:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae: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;->aZT:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZV:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/OverlayView;->bae: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;->aZT:Landroid/graphics/RectF;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->aZU:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/OverlayView;->bad: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;->bar:Lcom/yalantis/ucrop/a/d;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baA:Lcom/yalantis/ucrop/a/d;
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->aZT:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/OverlayView;->bac: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;->By()V
+    invoke-direct {p0}, Lcom/yalantis/ucrop/view/OverlayView;->BB()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;->bas:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/OverlayView;->baB: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 477812b7e5..e5ed3205ac 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 baD:Lcom/yalantis/ucrop/view/UCropView;
+.field final synthetic baM: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;->baD:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$1;->baM:Lcom/yalantis/ucrop/view/UCropView;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -37,7 +37,7 @@
 .method public final B(F)V
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$1;->baD:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$1;->baM: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 c8e203d964..fb81d4f250 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 baD:Lcom/yalantis/ucrop/view/UCropView;
+.field final synthetic baM: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;->baD:Lcom/yalantis/ucrop/view/UCropView;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/UCropView$2;->baM: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;->baD:Lcom/yalantis/ucrop/view/UCropView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView$2;->baM: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 461bc55711..585855c456 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 aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+.field private aYu:Lcom/yalantis/ucrop/view/GestureCropImageView;
 
-.field private final baC:Lcom/yalantis/ucrop/view/OverlayView;
+.field private final baL: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu: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;->baC:Lcom/yalantis/ucrop/view/OverlayView;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/UCropView;->baL: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;->baC:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->baL: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;->bad:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bam: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;->bae:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bag:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bap:Landroid/graphics/Paint;
 
-    iget v0, p2, Lcom/yalantis/ucrop/view/OverlayView;->bae:I
+    iget v0, p2, Lcom/yalantis/ucrop/view/OverlayView;->ban:I
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bag:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bap: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;->bag:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bap: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;->bai:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->bai:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bar:Landroid/graphics/Paint;
 
     invoke-virtual {v2, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bai:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bar: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;->baj:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->bas: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;->baj:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bas:Landroid/graphics/Paint;
 
     invoke-virtual {p3, v0}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->baj:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bas: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;->bab:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bak: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;->bah:Landroid/graphics/Paint;
+    iget-object v2, p2, Lcom/yalantis/ucrop/view/OverlayView;->baq: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;->bah:Landroid/graphics/Paint;
+    iget-object p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->baq: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;->aZY:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bah: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;->aZZ:I
+    iput p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bai: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;->bac:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/OverlayView;->bal:Z
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu: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;->aZt:F
+    iput p3, p2, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v0, p2, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iput v0, p2, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     :goto_1
     invoke-virtual {p1}, Landroid/content/res/TypedArray;->recycle()V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu: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;->baC:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/UCropView;->baL: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;->baC:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->baL: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu: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;->aYl:Lcom/yalantis/ucrop/view/GestureCropImageView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->aYu: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;->baC:Lcom/yalantis/ucrop/view/OverlayView;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/UCropView;->baL: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 3baaa6002e..6d1b50367a 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 aZB:Ljava/lang/ref/WeakReference;
+.field private final aZK: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 aZC:J
+.field private final aZL:J
 
-.field private final aZD:F
+.field private final aZM:F
 
-.field private final aZE:F
+.field private final aZN:F
 
-.field private final aZF:F
+.field private final aZO:F
 
-.field private final aZG:F
+.field private final aZP:F
 
-.field private final aZH:F
+.field private final aZQ:F
 
-.field private final aZI:F
+.field private final aZR:F
 
-.field private final aZJ:Z
+.field private final aZS: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;->aZB:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->aZK:Ljava/lang/ref/WeakReference;
 
-    iput-wide p2, p0, Lcom/yalantis/ucrop/view/a$a;->aZC:J
+    iput-wide p2, p0, Lcom/yalantis/ucrop/view/a$a;->aZL: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;->aZD:F
+    iput p4, p0, Lcom/yalantis/ucrop/view/a$a;->aZM:F
 
-    iput p5, p0, Lcom/yalantis/ucrop/view/a$a;->aZE:F
+    iput p5, p0, Lcom/yalantis/ucrop/view/a$a;->aZN:F
 
-    iput p6, p0, Lcom/yalantis/ucrop/view/a$a;->aZF:F
+    iput p6, p0, Lcom/yalantis/ucrop/view/a$a;->aZO:F
 
-    iput p7, p0, Lcom/yalantis/ucrop/view/a$a;->aZG:F
+    iput p7, p0, Lcom/yalantis/ucrop/view/a$a;->aZP:F
 
-    iput p8, p0, Lcom/yalantis/ucrop/view/a$a;->aZH:F
+    iput p8, p0, Lcom/yalantis/ucrop/view/a$a;->aZQ:F
 
-    iput p9, p0, Lcom/yalantis/ucrop/view/a$a;->aZI:F
+    iput p9, p0, Lcom/yalantis/ucrop/view/a$a;->aZR:F
 
-    iput-boolean p10, p0, Lcom/yalantis/ucrop/view/a$a;->aZJ:Z
+    iput-boolean p10, p0, Lcom/yalantis/ucrop/view/a$a;->aZS: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;->aZB:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$a;->aZK: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;->aZC:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZL: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;->aZF:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$a;->aZO:F
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZC:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
 
     long-to-float v3, v3
 
@@ -128,9 +128,9 @@
 
     move-result v2
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZG:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/a$a;->aZP:F
 
-    iget-wide v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZC:J
+    iget-wide v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
 
     long-to-float v4, v4
 
@@ -138,9 +138,9 @@
 
     move-result v3
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZI:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a$a;->aZR:F
 
-    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZC:J
+    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
 
     long-to-float v5, v5
 
@@ -148,7 +148,7 @@
 
     move-result v4
 
-    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZC:J
+    iget-wide v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZL:J
 
     long-to-float v5, v5
 
@@ -156,25 +156,25 @@
 
     if-gez v1, :cond_2
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->bau:[F
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->baD:[F
 
     const/4 v5, 0x0
 
     aget v1, v1, v5
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZD:F
+    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZM:F
 
     sub-float/2addr v1, v5
 
     sub-float/2addr v2, v1
 
-    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->bau:[F
+    iget-object v1, v0, Lcom/yalantis/ucrop/view/a;->baD:[F
 
     const/4 v5, 0x1
 
     aget v1, v1, v5
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZE:F
+    iget v5, p0, Lcom/yalantis/ucrop/view/a$a;->aZN: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;->aZJ:Z
+    iget-boolean v1, p0, Lcom/yalantis/ucrop/view/a$a;->aZS:Z
 
     if-nez v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a$a;->aZH:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a$a;->aZQ: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;->Bx()Z
+    invoke-virtual {v0}, Lcom/yalantis/ucrop/view/a;->BA()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 724b6802ef..16b648068b 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 aZB:Ljava/lang/ref/WeakReference;
+.field private final aZK: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 aZC:J
+.field private final aZL:J
 
-.field private final aZH:F
+.field private final aZQ:F
 
-.field private final aZI:F
+.field private final aZR:F
 
-.field private final aZK:F
+.field private final aZT:F
 
-.field private final aZL:F
+.field private final aZU: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;->aZB:Ljava/lang/ref/WeakReference;
+    iput-object p2, p0, Lcom/yalantis/ucrop/view/a$b;->aZK: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;->aZC:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:J
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/a$b;->aZH:F
+    iput p4, p0, Lcom/yalantis/ucrop/view/a$b;->aZQ:F
 
-    iput p5, p0, Lcom/yalantis/ucrop/view/a$b;->aZI:F
+    iput p5, p0, Lcom/yalantis/ucrop/view/a$b;->aZR:F
 
-    iput p6, p0, Lcom/yalantis/ucrop/view/a$b;->aZK:F
+    iput p6, p0, Lcom/yalantis/ucrop/view/a$b;->aZT:F
 
-    iput p7, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:F
+    iput p7, p0, Lcom/yalantis/ucrop/view/a$b;->aZU: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;->aZB:Ljava/lang/ref/WeakReference;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a$b;->aZK: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;->aZC:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZL: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;->aZI:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->aZR:F
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZC:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:J
 
     long-to-float v3, v3
 
@@ -118,7 +118,7 @@
 
     move-result v2
 
-    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZC:J
+    iget-wide v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:J
 
     long-to-float v3, v3
 
@@ -126,13 +126,13 @@
 
     if-gez v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a$b;->aZH:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a$b;->aZQ:F
 
     add-float/2addr v1, v2
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->aZK:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a$b;->aZT:F
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZL:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/a$b;->aZU: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 17c29c0b30..f8bcecdfc5 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 private aYG:I
+.field private aYP:I
 
-.field private aYH:I
+.field private aYQ:I
 
-.field public final aYN:Landroid/graphics/RectF;
+.field public final aYW:Landroid/graphics/RectF;
 
-.field private aZA:J
+.field aZC:F
 
-.field aZt:F
+.field private aZD:F
 
-.field private aZu:F
+.field private aZE:Lcom/yalantis/ucrop/a/c;
 
-.field private aZv:Lcom/yalantis/ucrop/a/c;
+.field private aZF:Ljava/lang/Runnable;
 
-.field private aZw:Ljava/lang/Runnable;
+.field aZG:Ljava/lang/Runnable;
 
-.field aZx:Ljava/lang/Runnable;
+.field private aZH:F
 
-.field private aZy:F
+.field private aZI:F
 
-.field private aZz:F
+.field private aZJ: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;->aYN:Landroid/graphics/RectF;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->aZu:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZx:Ljava/lang/Runnable;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZG:Ljava/lang/Runnable;
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYG:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYP:I
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYH:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYQ:I
 
     const-wide/16 p1, 0x1f4
 
-    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->aZA:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->aZJ: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;->aYN:Landroid/graphics/RectF;
+    iget-object p0, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {p2}, Landroid/graphics/RectF;->height()F
 
@@ -204,39 +204,51 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZz:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZI:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/a;->aZz:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/a;->aZI:F
 
-    iget p2, p0, Lcom/yalantis/ucrop/view/a;->aZu:F
+    iget p2, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
 
     mul-float p1, p1, p2
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZy:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZH:F
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Bv()V
+.method protected final BA()Z
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZw:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baC:[F
+
+    invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/a;->c([F)Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final By()V
+    .locals 1
+
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZF: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;->aZx:Ljava/lang/Runnable;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZG:Ljava/lang/Runnable;
 
     invoke-virtual {p0, v0}, Lcom/yalantis/ucrop/view/a;->removeCallbacks(Ljava/lang/Runnable;)Z
 
     return-void
 .end method
 
-.method protected final Bw()V
+.method protected final Bz()V
     .locals 8
 
-    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->Bw()V
+    invoke-super {p0}, Lcom/yalantis/ucrop/view/b;->Bz()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getDrawable()Landroid/graphics/drawable/Drawable;
 
@@ -259,7 +271,7 @@
 
     int-to-float v0, v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     const/4 v3, 0x0
 
@@ -269,40 +281,40 @@
 
     div-float v2, v1, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     :cond_1
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZU:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bad:I
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     div-float/2addr v2, v4
 
     float-to-int v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZV:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bae:I
 
     if-le v2, v4, :cond_2
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/a;->aZV:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/a;->bae:I
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     mul-float v2, v2, v4
 
     float-to-int v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZU:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bad:I
 
     sub-int/2addr v4, v2
 
     div-int/lit8 v4, v4, 0x2
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     int-to-float v6, v4
 
@@ -310,7 +322,7 @@
 
     int-to-float v2, v2
 
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZV:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bae:I
 
     int-to-float v4, v4
 
@@ -319,17 +331,17 @@
     goto :goto_0
 
     :cond_2
-    iget v4, p0, Lcom/yalantis/ucrop/view/a;->aZV:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/a;->bae:I
 
     sub-int/2addr v4, v2
 
     div-int/lit8 v4, v4, 0x2
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     int-to-float v6, v4
 
-    iget v7, p0, Lcom/yalantis/ucrop/view/a;->aZU:I
+    iget v7, p0, Lcom/yalantis/ucrop/view/a;->bad:I
 
     int-to-float v7, v7
 
@@ -342,19 +354,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;->aYN:Landroid/graphics/RectF;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v2}, Landroid/graphics/RectF;->width()F
 
     move-result v2
 
-    iget-object v3, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v3}, Landroid/graphics/RectF;->height()F
 
     move-result v3
 
-    iget-object v4, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v4}, Landroid/graphics/RectF;->width()F
 
@@ -362,7 +374,7 @@
 
     div-float/2addr v4, v1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v5}, Landroid/graphics/RectF;->height()F
 
@@ -382,7 +394,7 @@
 
     div-float/2addr v2, v1
 
-    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     iget v5, v5, Landroid/graphics/RectF;->left:F
 
@@ -394,42 +406,42 @@
 
     div-float/2addr v3, v1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v4, v4}, Landroid/graphics/Matrix;->postScale(FF)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, v2, v3}, Landroid/graphics/Matrix;->postTranslate(FF)Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baE: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;->aZv:Lcom/yalantis/ucrop/a/c;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZE:Lcom/yalantis/ucrop/a/c;
 
     if-eqz v0, :cond_3
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     invoke-interface {v0, v1}, Lcom/yalantis/ucrop/a/c;->B(F)V
 
     :cond_3
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getCurrentScale()F
 
@@ -437,7 +449,7 @@
 
     invoke-interface {v0, v1}, Lcom/yalantis/ucrop/view/b$a;->w(F)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->getCurrentAngle()F
 
@@ -449,28 +461,16 @@
     return-void
 .end method
 
-.method protected final Bx()Z
-    .locals 1
-
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->bat:[F
-
-    invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/a;->c([F)Z
-
-    move-result v0
-
-    return v0
-.end method
-
 .method public final C(F)V
     .locals 2
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v1}, Landroid/graphics/RectF;->centerY()F
 
@@ -486,7 +486,7 @@
 
     move-object v0, p0
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->Bv()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/a;->By()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;->aYN:Landroid/graphics/RectF;
+    iget-object v2, v0, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
-    iget-object v3, v0, Lcom/yalantis/ucrop/view/a;->bat:[F
+    iget-object v3, v0, Lcom/yalantis/ucrop/view/a;->baC:[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;->aYG:I
+    iget v8, v0, Lcom/yalantis/ucrop/view/a;->aYP:I
 
-    iget v9, v0, Lcom/yalantis/ucrop/view/a;->aYH:I
+    iget v9, v0, Lcom/yalantis/ucrop/view/a;->aYQ: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;->aZv:Lcom/yalantis/ucrop/a/c;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aZE: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;->aZy:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZH:F
 
     return v0
 .end method
@@ -655,7 +655,7 @@
 .method public getMinScale()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZz:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZI:F
 
     return v0
 .end method
@@ -663,7 +663,7 @@
 .method public getTargetAspectRatio()F
     .locals 1
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZC: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;->aZv:Lcom/yalantis/ucrop/a/c;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZE: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;->aZt:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/a;->aYW: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;->baA:Z
+    iget-boolean v0, v11, Lcom/yalantis/ucrop/view/a;->baJ:Z
 
     if-eqz v0, :cond_6
 
-    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->Bx()Z
+    invoke-virtual/range {p0 .. p0}, Lcom/yalantis/ucrop/view/a;->BA()Z
 
     move-result v0
 
     if-nez v0, :cond_6
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bau:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baD:[F
 
     const/4 v1, 0x0
 
     aget v4, v0, v1
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->bau:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baD:[F
 
     const/4 v2, 0x1
 
@@ -794,7 +794,7 @@
 
     move-result v8
 
-    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->aYW: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;->bat:[F
+    iget-object v6, v11, Lcom/yalantis/ucrop/view/a;->baC:[F
 
-    iget-object v7, v11, Lcom/yalantis/ucrop/view/a;->bat:[F
+    iget-object v7, v11, Lcom/yalantis/ucrop/view/a;->baC:[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;->bat:[F
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->baC:[F
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->bat:[F
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->baC:[F
 
     array-length v3, v3
 
@@ -868,7 +868,7 @@
 
     move-result-object v0
 
-    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v3, v11, Lcom/yalantis/ucrop/view/a;->aYW: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;->aYN:Landroid/graphics/RectF;
+    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->aYW: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;->bat:[F
+    iget-object v12, v11, Lcom/yalantis/ucrop/view/a;->baC:[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;->aZA:J
+    iget-wide v2, v11, Lcom/yalantis/ucrop/view/a;->aZJ: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;->aZw:Ljava/lang/Runnable;
+    iput-object v12, v11, Lcom/yalantis/ucrop/view/a;->aZF: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;->aYN:Landroid/graphics/RectF;
+    iget-object v0, v11, Lcom/yalantis/ucrop/view/a;->aYW:Landroid/graphics/RectF;
 
     invoke-virtual {v0}, Landroid/graphics/RectF;->centerX()F
 
     move-result v0
 
-    iget-object v1, v11, Lcom/yalantis/ucrop/view/a;->aYN:Landroid/graphics/RectF;
+    iget-object v1, v11, Lcom/yalantis/ucrop/view/a;->aYW: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;->aZA:J
+    iput-wide p1, p0, Lcom/yalantis/ucrop/view/a;->aZJ:J
 
     return-void
 
@@ -1225,7 +1225,7 @@
 .method public setMaxResultImageSizeX(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYG:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYP:I
 
     return-void
 .end method
@@ -1233,7 +1233,7 @@
 .method public setMaxResultImageSizeY(I)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYH:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aYQ:I
 
     return-void
 .end method
@@ -1241,7 +1241,7 @@
 .method public setMaxScaleMultiplier(F)V
     .locals 0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZu:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZD:F
 
     return-void
 .end method
@@ -1255,7 +1255,7 @@
 
     if-nez v0, :cond_0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     return-void
 
@@ -1280,19 +1280,19 @@
 
     div-float/2addr p1, v0
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     goto :goto_0
 
     :cond_1
-    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     :goto_0
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZv:Lcom/yalantis/ucrop/a/c;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/a;->aZE:Lcom/yalantis/ucrop/a/c;
 
     if-eqz p1, :cond_2
 
-    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZt:F
+    iget v0, p0, Lcom/yalantis/ucrop/view/a;->aZC:F
 
     invoke-interface {p1, v0}, Lcom/yalantis/ucrop/a/c;->B(F)V
 
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 6a070991b2..369de74015 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 baB:Lcom/yalantis/ucrop/view/b;
+.field final synthetic baK: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;->baB:Lcom/yalantis/ucrop/view/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b$1;->baK: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;->baB:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baK: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;->baB:Lcom/yalantis/ucrop/view/b;
+    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->baK: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;->baB:Lcom/yalantis/ucrop/view/b;
+    iget-object p3, p0, Lcom/yalantis/ucrop/view/b$1;->baK: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;->baB:Lcom/yalantis/ucrop/view/b;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b$1;->baK:Lcom/yalantis/ucrop/view/b;
 
     const/4 p3, 0x1
 
-    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->baz:Z
+    iput-boolean p3, p2, Lcom/yalantis/ucrop/view/b;->baI: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;->baB:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baK:Lcom/yalantis/ucrop/view/b;
 
-    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baB:Lcom/yalantis/ucrop/view/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b$1;->baK:Lcom/yalantis/ucrop/view/b;
 
-    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, v0, Lcom/yalantis/ucrop/view/b;->baF: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 01d97150b1..2ea17d5c9f 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,7 +15,7 @@
 
 
 # virtual methods
-.method public abstract Bm()V
+.method public abstract Bp()V
 .end method
 
 .method public abstract h(Ljava/lang/Exception;)V
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 a53009de09..149db4410f 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 UQ:I
+.field private UZ:I
 
-.field private aYI:Ljava/lang/String;
+.field private aYR:Ljava/lang/String;
 
-.field private aYJ:Ljava/lang/String;
+.field private aYS:Ljava/lang/String;
 
-.field private aYK:Lcom/yalantis/ucrop/model/b;
+.field private aYT:Lcom/yalantis/ucrop/model/b;
 
-.field protected aZU:I
+.field protected final baC:[F
 
-.field protected aZV:I
+.field protected final baD:[F
 
-.field protected baA:Z
+.field protected baE:Landroid/graphics/Matrix;
 
-.field protected final bat:[F
+.field protected baF:Lcom/yalantis/ucrop/view/b$a;
 
-.field protected final bau:[F
+.field private baG:[F
 
-.field protected bav:Landroid/graphics/Matrix;
+.field private baH:[F
 
-.field protected baw:Lcom/yalantis/ucrop/view/b$a;
+.field protected baI:Z
 
-.field private bax:[F
+.field protected baJ:Z
 
-.field private bay:[F
+.field protected bad:I
 
-.field protected baz:Z
+.field protected bae:I
 
 .field private final mMatrixValues:[F
 
@@ -73,13 +73,13 @@
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bat:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baC:[F
 
     const/4 p1, 0x2
 
     new-array p1, p1, [F
 
-    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->bau:[F
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baD:[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;->bav:Landroid/graphics/Matrix;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baz:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baI:Z
 
-    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baA:Z
+    iput-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baJ:Z
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/b;->UQ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/b;->UZ: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;->aYK:Lcom/yalantis/ucrop/model/b;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->aYT: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;->aYI:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->aYR: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;->aYJ:Ljava/lang/String;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->aYS:Ljava/lang/String;
 
     return-object p1
 .end method
@@ -220,7 +220,7 @@
 
 
 # virtual methods
-.method protected Bw()V
+.method protected Bz()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;->bax:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->baG:[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;->bay:[F
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/b;->baH:[F
 
-    iput-boolean v4, p0, Lcom/yalantis/ucrop/view/b;->baA:Z
+    iput-boolean v4, p0, Lcom/yalantis/ucrop/view/b;->baJ:Z
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz v0, :cond_1
 
-    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Bm()V
+    invoke-interface {v0}, Lcom/yalantis/ucrop/view/b$a;->Bp()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;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p2}, Landroid/graphics/Matrix;->postTranslate(FF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {p0, p1}, Lcom/yalantis/ucrop/view/b;->setImageMatrix(Landroid/graphics/Matrix;)V
 
@@ -343,19 +343,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE: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;->bav:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE: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;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/b;->getMatrixScale(Landroid/graphics/Matrix;)F
 
@@ -370,7 +370,7 @@
 .method public getCurrentAngle()F
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-direct {p0, v0}, Lcom/yalantis/ucrop/view/b;->i(Landroid/graphics/Matrix;)F
 
@@ -382,7 +382,7 @@
 .method public getCurrentScale()F
     .locals 1
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE: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;->aYK:Lcom/yalantis/ucrop/model/b;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->aYT: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;->aYI:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->aYR: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;->aYJ:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->aYS: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;->UQ:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/b;->UZ:I
 
     if-gtz v0, :cond_3
 
@@ -496,7 +496,7 @@
     move-result v0
 
     :cond_1
-    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Br()I
+    invoke-static {}, Lcom/yalantis/ucrop/c/c;->Bu()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;->UQ:I
+    iput v0, p0, Lcom/yalantis/ucrop/view/b;->UZ:I
 
     :cond_3
-    iget v0, p0, Lcom/yalantis/ucrop/view/b;->UQ:I
+    iget v0, p0, Lcom/yalantis/ucrop/view/b;->UZ:I
 
     return v0
 .end method
@@ -575,19 +575,19 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1, p2, p3}, Landroid/graphics/Matrix;->postRotate(FFF)Z
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE: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;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baF:Lcom/yalantis/ucrop/view/b$a;
 
     if-eqz p1, :cond_0
 
-    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object p2, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-direct {p0, p2}, Lcom/yalantis/ucrop/view/b;->i(Landroid/graphics/Matrix;)F
 
@@ -616,11 +616,11 @@
 
     if-nez p1, :cond_0
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baz:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baI:Z
 
     if-eqz p1, :cond_1
 
-    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baA:Z
+    iget-boolean p1, p0, Lcom/yalantis/ucrop/view/b;->baJ:Z
 
     if-nez p1, :cond_1
 
@@ -655,13 +655,13 @@
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lcom/yalantis/ucrop/view/b;->aZU:I
+    iput p3, p0, Lcom/yalantis/ucrop/view/b;->bad:I
 
     sub-int/2addr p4, p2
 
-    iput p4, p0, Lcom/yalantis/ucrop/view/b;->aZV:I
+    iput p4, p0, Lcom/yalantis/ucrop/view/b;->bae:I
 
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->Bw()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/b;->Bz()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;->bav:Landroid/graphics/Matrix;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
     invoke-virtual {v0, p1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bat:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baC:[F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->bax:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->baG:[F
 
     invoke-virtual {p1, v0, v1}, Landroid/graphics/Matrix;->mapPoints([F[F)V
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->bav:Landroid/graphics/Matrix;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/b;->baE:Landroid/graphics/Matrix;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->bau:[F
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/b;->baD:[F
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->bay:[F
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/b;->baH:[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;->UQ:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/b;->UZ: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;->baw:Lcom/yalantis/ucrop/view/b$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/b;->baF: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 c425066faa..0b3af39ec4 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 private aYD:Ljava/lang/String;
+.field private aYM:Ljava/lang/String;
 
-.field public aYE:F
+.field public aYN:F
 
-.field public aYF:F
+.field public aYO:F
 
-.field private final baE:Landroid/graphics/Rect;
+.field private final baN:Landroid/graphics/Rect;
 
-.field private baF:Landroid/graphics/Paint;
+.field private baO:Landroid/graphics/Paint;
 
-.field private baG:I
+.field private baP:I
 
-.field public mV:F
+.field public mU:F
 
 
 # direct methods
@@ -49,7 +49,7 @@
 
     invoke-direct {p3}, Landroid/graphics/Rect;-><init>()V
 
-    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baE:Landroid/graphics/Rect;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN: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;->baE:Landroid/graphics/Rect;
+    iput-object p3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN: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;->aYD:Ljava/lang/String;
+    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYM: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;->aYE:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN: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;->aYF:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYE:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
     cmpl-float v3, v1, v2
 
     if-eqz v3, :cond_1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO: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;->mV:F
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU: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;->baG:I
+    iput v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baP: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;->baF:Landroid/graphics/Paint;
+    iput-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baO:Landroid/graphics/Paint;
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baF:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baO: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;->Bz()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BC()V
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->getResources()Landroid/content/res/Resources;
 
@@ -193,7 +193,7 @@
 .method private cO(I)V
     .locals 7
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baF:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baO:Landroid/graphics/Paint;
 
     if-eqz v0, :cond_0
 
@@ -249,10 +249,10 @@
 
 
 # virtual methods
-.method public final Bz()V
+.method public final BC()V
     .locals 4
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYM: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;->aYD:Ljava/lang/String;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYM: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;->aYE:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
     float-to-int v3, v3
 
@@ -287,7 +287,7 @@
 
     const/4 v2, 0x1
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO: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;->baE:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN: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;->baE:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN:Landroid/graphics/Rect;
 
     iget v0, v0, Landroid/graphics/Rect;->right:I
 
-    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baE:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN: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;->baE:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baN:Landroid/graphics/Rect;
 
     iget v1, v1, Landroid/graphics/Rect;->bottom:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baG:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baP: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;->baF:Landroid/graphics/Paint;
+    iget-object v3, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->baO:Landroid/graphics/Paint;
 
     invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)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;->aYD:Ljava/lang/String;
+    iget-object v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYM:Ljava/lang/String;
 
-    iput-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYD:Ljava/lang/String;
+    iput-object v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYM:Ljava/lang/String;
 
-    iget v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYE:F
+    iget v0, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYN:F
 
-    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYE:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
-    iget p1, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYF:F
+    iget p1, p1, Lcom/yalantis/ucrop/model/AspectRatio;->aYO:F
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO:F
 
-    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYE:F
+    iget p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYN:F
 
     const/4 v0, 0x0
 
@@ -394,7 +394,7 @@
 
     if-eqz v1, :cond_1
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYF:F
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->aYO: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;->mV:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mV:F
+    iput v0, p0, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->mU:F
 
     :goto_1
-    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->Bz()V
+    invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/AspectRatioTextView;->BC()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 1540729287..3d9ba400a2 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
@@ -18,8 +18,8 @@
 .method public abstract A(F)V
 .end method
 
-.method public abstract Bn()V
+.method public abstract Bq()V
 .end method
 
-.method public abstract Bo()V
+.method public abstract Br()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 e74be33fa2..4a9561f34e 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 baE:Landroid/graphics/Rect;
+.field private final baN:Landroid/graphics/Rect;
 
-.field private baH:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+.field private baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
-.field private baI:F
+.field private baR:F
 
-.field private baJ:Landroid/graphics/Paint;
+.field private baS:Landroid/graphics/Paint;
 
-.field private baK:I
+.field private baT:I
 
-.field private baL:I
+.field private baU:I
 
-.field private baM:I
+.field private baV:I
 
-.field private baN:Z
+.field private baW:Z
 
-.field private baO:F
+.field private baX:F
 
-.field private baP:I
+.field private baY: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;->baE:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baP:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baY: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;->baK:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT: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;->baL:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU: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;->baM:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV: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;->baJ:Landroid/graphics/Paint;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Landroid/graphics/Paint;
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baJ:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS: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;->baJ:Landroid/graphics/Paint;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Landroid/graphics/Paint;
 
-    iget p2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baK:I
+    iget p2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT: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;->baE:Landroid/graphics/Rect;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baE:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baE:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN:Landroid/graphics/Rect;
 
     invoke-virtual {v0}, Landroid/graphics/Rect;->width()I
 
     move-result v0
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baK:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:I
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM:I
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV:I
 
     add-int v3, v1, v2
 
     div-int/2addr v0, v3
 
-    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:F
+    iget v3, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baX: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;->baJ:Landroid/graphics/Paint;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS: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;->baJ:Landroid/graphics/Paint;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS: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;->baJ:Landroid/graphics/Paint;
+    iget-object v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS: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;->baJ:Landroid/graphics/Paint;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS: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;->baE:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baK:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:I
 
-    iget v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM:I
+    iget v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV: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;->baE:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baL:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU: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;->baE:Landroid/graphics/Rect;
+    iget-object v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baK:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baT:I
 
-    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baM:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baV: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;->baE:Landroid/graphics/Rect;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baL:I
+    iget v4, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU: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;->baJ:Landroid/graphics/Paint;
+    iget-object v11, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS: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;->baJ:Landroid/graphics/Paint;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Landroid/graphics/Paint;
 
-    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baP:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baY:I
 
     invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V
 
-    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baE:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baE:Landroid/graphics/Rect;
+    iget-object v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baL:I
+    iget v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU: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;->baE:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baE:Landroid/graphics/Rect;
+    iget-object v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN: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;->baL:I
+    iget v5, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baU: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;->baJ:Landroid/graphics/Paint;
+    iget-object v6, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baS:Landroid/graphics/Paint;
 
     move-object v1, p1
 
@@ -449,7 +449,7 @@
 
     move-result v0
 
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baI:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR: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;->baN:Z
+    iget-boolean v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baW:Z
 
     if-nez v2, :cond_1
 
-    iput-boolean v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baN:Z
+    iput-boolean v1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baW:Z
 
-    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baH:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     if-eqz v2, :cond_1
 
-    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Bo()V
+    invoke-interface {v2}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Br()V
 
     :cond_1
-    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:F
+    iget v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baX:F
 
     sub-float/2addr v2, v0
 
-    iput v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baO:F
+    iput v2, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baX:F
 
     invoke-virtual {p0}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->postInvalidate()V
 
@@ -484,9 +484,9 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baI:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR:F
 
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baH:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
 
     if-eqz p1, :cond_4
 
@@ -497,15 +497,15 @@
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baH:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iget-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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;->baN:Z
+    iput-boolean v0, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baW:Z
 
-    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Bn()V
+    invoke-interface {p1}, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;->Bq()V
 
     goto :goto_0
 
@@ -514,7 +514,7 @@
 
     move-result p1
 
-    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baI:F
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baR: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;->baP:I
+    iput p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baY: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;->baH:Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView$a;
+    iput-object p1, p0, Lcom/yalantis/ucrop/view/widget/HorizontalProgressWheelView;->baQ: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 c49dd770cf..18bd153d1b 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 baT:Lio/fabric/sdk/android/a$b;
+.field final synthetic bbc:Lio/fabric/sdk/android/a$b;
 
-.field final synthetic baU:Lio/fabric/sdk/android/a$a;
+.field final synthetic bbd: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;->baU:Lio/fabric/sdk/android/a$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a$a$1;->bbd:Lio/fabric/sdk/android/a$a;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a$a$1;->baT:Lio/fabric/sdk/android/a$b;
+    iput-object p2, p0, Lio/fabric/sdk/android/a$a$1;->bbc: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;->baT:Lio/fabric/sdk/android/a$b;
+    iget-object p2, p0, Lio/fabric/sdk/android/a$a$1;->bbc: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;->baT:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->bbc: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;->baT:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->bbc: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;->baT:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->bbc: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;->baT:Lio/fabric/sdk/android/a$b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a$1;->bbc: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 0279bc6fad..fe10c098fa 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 baQ:Landroid/app/Application;
+.field private final baZ:Landroid/app/Application;
 
-.field private final baS:Ljava/util/Set;
+.field private final bbb: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;->baS:Ljava/util/Set;
+    iput-object v0, p0, Lio/fabric/sdk/android/a$a;->bbb:Ljava/util/Set;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a$a;->baQ:Landroid/app/Application;
+    iput-object p1, p0, Lio/fabric/sdk/android/a$a;->baZ: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;->baQ:Landroid/app/Application;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->baZ: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;->baQ:Landroid/app/Application;
+    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->baZ: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;->baS:Ljava/util/Set;
+    iget-object p1, p0, Lio/fabric/sdk/android/a$a;->bbb: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;->baS:Ljava/util/Set;
+    iget-object v0, p0, Lio/fabric/sdk/android/a$a;->bbb: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;->baQ:Landroid/app/Application;
+    iget-object v2, p0, Lio/fabric/sdk/android/a$a;->baZ: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 8055ea5e93..d183bd660a 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 baQ:Landroid/app/Application;
+.field private final baZ:Landroid/app/Application;
 
-.field private baR:Lio/fabric/sdk/android/a$a;
+.field private bba: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;->baQ:Landroid/app/Application;
+    iput-object p1, p0, Lio/fabric/sdk/android/a;->baZ: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;->baQ:Landroid/app/Application;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->baZ: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;->baR:Lio/fabric/sdk/android/a$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a;->bba:Lio/fabric/sdk/android/a$a;
 
     :cond_0
     return-void
@@ -52,10 +52,10 @@
 
 
 # virtual methods
-.method public final BA()V
+.method public final BD()V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a;->baR:Lio/fabric/sdk/android/a$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->bba: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;->baR:Lio/fabric/sdk/android/a$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a;->bba: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 038498811a..30f184c14c 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 bbB:Lio/fabric/sdk/android/a/a/c;
+.field private final bbK: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;->bbB:Lio/fabric/sdk/android/a/a/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/a/a;->bbK:Lio/fabric/sdk/android/a/a/c;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected abstract BM()Ljava/lang/Object;
+.method protected abstract BP()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;->BM()Ljava/lang/Object;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/a/a;->BP()Ljava/lang/Object;
 
     move-result-object v0
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbB:Lio/fabric/sdk/android/a/a/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbK:Lio/fabric/sdk/android/a/a/c;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbB:Lio/fabric/sdk/android/a/a/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/a/a;->bbK: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 760add4b59..5ad01af4f2 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 BM()Ljava/lang/Object;
+.method protected final BP()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 25554c4a38..78dfd9b945 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 bbC:Ljava/util/regex/Pattern;
+.field private static final bbL:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bbD:I
+.field private final bbM:I
 
-.field private final bbE:Ljava/lang/String;
+.field private final bbN:Ljava/lang/String;
 
-.field private final pB:Lio/fabric/sdk/android/a/e/e;
+.field private final pA:Lio/fabric/sdk/android/a/e/e;
 
-.field protected final py:Lio/fabric/sdk/android/i;
+.field protected final px:Lio/fabric/sdk/android/i;
 
 .field private final url:Ljava/lang/String;
 
@@ -31,7 +31,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/a;->bbC:Ljava/util/regex/Pattern;
+    sput-object v0, Lio/fabric/sdk/android/a/b/a;->bbL:Ljava/util/regex/Pattern;
 
     return-void
 .end method
@@ -45,11 +45,11 @@
 
     if-eqz p4, :cond_1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/a;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/a;->px:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bbE:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bbN:Ljava/lang/String;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->bbE:Ljava/lang/String;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->bbN:Ljava/lang/String;
 
     invoke-static {p1}, Lio/fabric/sdk/android/a/b/i;->Q(Ljava/lang/String;)Z
 
@@ -57,13 +57,13 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lio/fabric/sdk/android/a/b/a;->bbC:Ljava/util/regex/Pattern;
+    sget-object p1, Lio/fabric/sdk/android/a/b/a;->bbL: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;->bbE:Ljava/lang/String;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/b/a;->bbN: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;->pB:Lio/fabric/sdk/android/a/e/e;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/b/a;->pA:Lio/fabric/sdk/android/a/e/e;
 
-    iput p5, p0, Lio/fabric/sdk/android/a/b/a;->bbD:I
+    iput p5, p0, Lio/fabric/sdk/android/a/b/a;->bbM:I
 
     return-void
 
@@ -99,7 +99,7 @@
 
 
 # virtual methods
-.method protected final BN()Lio/fabric/sdk/android/a/e/d;
+.method protected final BQ()Lio/fabric/sdk/android/a/e/d;
     .locals 1
 
     invoke-static {}, Ljava/util/Collections;->emptyMap()Ljava/util/Map;
@@ -134,9 +134,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/a;->pB:Lio/fabric/sdk/android/a/e/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/a;->pA:Lio/fabric/sdk/android/a/e/e;
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/a;->bbD:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/a;->bbM:I
 
     iget-object v2, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
 
@@ -144,11 +144,11 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CH()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CK()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CG()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CJ()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object p1
 
@@ -158,7 +158,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/a;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/a;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->cc()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 d14cd44ee0..b143f4ea54 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 bbF:Ljava/lang/String;
+.field public final bbO:Ljava/lang/String;
 
-.field public final bbG:Z
+.field public final bbP: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;->bbF:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/b;->bbO:Ljava/lang/String;
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/b;->bbG:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/b;->bbP: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;->bbG:Z
+    iget-boolean v2, p0, Lio/fabric/sdk/android/a/b/b;->bbP:Z
 
-    iget-boolean v3, p1, Lio/fabric/sdk/android/a/b/b;->bbG:Z
+    iget-boolean v3, p1, Lio/fabric/sdk/android/a/b/b;->bbP:Z
 
     if-eq v2, v3, :cond_2
 
     return v1
 
     :cond_2
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bbF:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/b;->bbO:Ljava/lang/String;
 
-    iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bbF:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/b/b;->bbO: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;->bbF:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/b;->bbO: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;->bbG:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/b/b;->bbP: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 1028e02f24..7955013c7f 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 bbH:Lio/fabric/sdk/android/a/b/b;
+.field final synthetic bbQ:Lio/fabric/sdk/android/a/b/b;
 
-.field final synthetic bbI:Lio/fabric/sdk/android/a/b/c;
+.field final synthetic bbR: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;->bbI:Lio/fabric/sdk/android/a/b/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbR:Lio/fabric/sdk/android/a/b/c;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/c$1;->bbH:Lio/fabric/sdk/android/a/b/b;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/c$1;->bbQ:Lio/fabric/sdk/android/a/b/b;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
@@ -38,13 +38,13 @@
 .method public final dq()V
     .locals 4
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c$1;->bbI:Lio/fabric/sdk/android/a/b/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c$1;->bbR:Lio/fabric/sdk/android/a/b/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->BQ()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->BT()Lio/fabric/sdk/android/a/b/b;
 
     move-result-object v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbH:Lio/fabric/sdk/android/a/b/b;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbQ: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbI:Lio/fabric/sdk/android/a/b/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/c$1;->bbR: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 6ccde744d6..3017a7e815 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 tF:Lio/fabric/sdk/android/a/f/c;
+.field final tE: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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/c;->tE:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
 
-.method private BO()Lio/fabric/sdk/android/a/b/f;
+.method private BR()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 BP()Lio/fabric/sdk/android/a/b/f;
+.method private BS()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;->bbF:Ljava/lang/String;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/b/b;->bbO:Ljava/lang/String;
 
     invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
 
@@ -81,14 +81,14 @@
 
 
 # virtual methods
-.method final BQ()Lio/fabric/sdk/android/a/b/b;
+.method final BT()Lio/fabric/sdk/android/a/b/b;
     .locals 4
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->BO()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->BR()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BR()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BU()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;->BP()Lio/fabric/sdk/android/a/b/f;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/c;->BS()Lio/fabric/sdk/android/a/b/f;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BR()Lio/fabric/sdk/android/a/b/b;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/f;->BU()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/c;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v3
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/b/b;->bbF:Ljava/lang/String;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/b/b;->bbO: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;->bbG:Z
+    iget-boolean p1, p1, Lio/fabric/sdk/android/a/b/b;->bbP:Z
 
     invoke-interface {v2, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
 
@@ -184,9 +184,9 @@
     return-void
 
     :cond_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/c;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v0
 
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 ed4eea4d7e..2459961d61 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 BS()Ljava/lang/String;
+.method private BV()Ljava/lang/String;
     .locals 4
 
     :try_start_0
@@ -62,7 +62,7 @@
     return-object v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -227,7 +227,7 @@
     return v0
 
     :catch_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -242,7 +242,7 @@
 
 
 # virtual methods
-.method public final BR()Lio/fabric/sdk/android/a/b/b;
+.method public final BU()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;->BS()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/b/d;->BV()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 2f0d491437..4f8b34ffe4 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,9 @@
 
 
 # instance fields
-.field private bbJ:Z
+.field private bbS:Z
 
-.field private final bbK:Ljava/util/concurrent/LinkedBlockingQueue;
+.field private final bbT:Ljava/util/concurrent/LinkedBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/LinkedBlockingQueue<",
@@ -39,7 +39,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbJ:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbS: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;->bbK:Ljava/util/concurrent/LinkedBlockingQueue;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbT: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;->bbJ:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbS:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbJ:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbS:Z
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbK:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$a;->bbT: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;->bbK:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bbT: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;->bbK:Ljava/util/concurrent/LinkedBlockingQueue;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/e$a;->bbT: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 db6b82a069..37b59ab24a 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 bbL:Landroid/os/IBinder;
+.field private final bbU: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;->bbL:Landroid/os/IBinder;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/e$b;->bbU: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;->bbL:Landroid/os/IBinder;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/e$b;->bbU: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;->bbL:Landroid/os/IBinder;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/e$b;->bbU:Landroid/os/IBinder;
 
     const/4 v3, 0x1
 
@@ -93,7 +93,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbL:Landroid/os/IBinder;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/e$b;->bbU:Landroid/os/IBinder;
 
     const/4 v5, 0x2
 
@@ -177,7 +177,7 @@
 
     :catch_0
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 3ff81384c2..1577e1dc73 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 BR()Lio/fabric/sdk/android/a/b/b;
+.method public final BU()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v5
 
@@ -176,7 +176,7 @@
     throw v2
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 a1eea75826..7f316ab2b7 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 BR()Lio/fabric/sdk/android/a/b/b;
+.method public abstract BU()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 2a8ae2c6d1..a4d82beb95 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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BC()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->BF()Z
 
     move-result v1
 
@@ -270,7 +270,7 @@
 
     if-nez p1, :cond_3
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
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 30a45a3800..d2c67fb494 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 bbQ:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbR:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbS:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbT:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbU:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbV:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbW:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbX:Lio/fabric/sdk/android/a/b/i$a;
-
-.field public static final enum bbY:Lio/fabric/sdk/android/a/b/i$a;
-
 .field public static final enum bbZ:Lio/fabric/sdk/android/a/b/i$a;
 
-.field private static final bca:Ljava/util/Map;
+.field public static final enum bca:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bcb:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bcc:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bcd:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bce:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bcf:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bcg:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bch:Lio/fabric/sdk/android/a/b/i$a;
+
+.field public static final enum bci:Lio/fabric/sdk/android/a/b/i$a;
+
+.field private static final bcj: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 bcb:[Lio/fabric/sdk/android/a/b/i$a;
+.field private static final synthetic bck:[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;->bbQ:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bbZ: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;->bbR:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bca: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;->bbS:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcb: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;->bbT:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcc: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;->bbU:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcd: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;->bbV:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bce: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;->bbW:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcf: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;->bbX:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcg: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;->bbY:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bch: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;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bci: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;->bbQ:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v11, Lio/fabric/sdk/android/a/b/i$a;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v11, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbR:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bca:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbS:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcb:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbT:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcc:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbU:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcd:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbV:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bce:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbW:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcf:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbX:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcg:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbY:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bch:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bci:Lio/fabric/sdk/android/a/b/i$a;
 
     aput-object v1, v0, v10
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcb:[Lio/fabric/sdk/android/a/b/i$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bck:[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;->bca:Ljava/util/Map;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcj:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbW:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcf: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;->bca:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcj:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbV:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bce: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;->bca:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcj:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bci: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;->bca:Ljava/util/Map;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcj:Ljava/util/Map;
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbQ:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bbZ:Lio/fabric/sdk/android/a/b/i$a;
 
     const-string v2, "x86"
 
@@ -259,7 +259,7 @@
     return-void
 .end method
 
-.method static BV()Lio/fabric/sdk/android/a/b/i$a;
+.method static BY()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbX:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcg: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;->bca:Ljava/util/Map;
+    sget-object v1, Lio/fabric/sdk/android/a/b/i$a;->bcj: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;->bbX:Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bcg: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;->bcb:[Lio/fabric/sdk/android/a/b/i$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i$a;->bck:[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 f95bc75f56..8ce6d95f8b 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 bbM:Ljava/lang/Boolean;
+.field private static bbV:Ljava/lang/Boolean;
 
-.field private static final bbN:[C
+.field private static final bbW:[C
 
-.field private static bbO:J
+.field private static bbX:J
 
-.field public static final bbP:Ljava/util/Comparator;
+.field public static final bbY: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;->bbN:[C
+    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bbW:[C
 
     const-wide/16 v0, -0x1
 
-    sput-wide v0, Lio/fabric/sdk/android/a/b/i;->bbO:J
+    sput-wide v0, Lio/fabric/sdk/android/a/b/i;->bbX: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;->bbP:Ljava/util/Comparator;
+    sput-object v0, Lio/fabric/sdk/android/a/b/i;->bbY:Ljava/util/Comparator;
 
     return-void
 
@@ -76,10 +76,10 @@
     .end array-data
 .end method
 
-.method public static BT()I
+.method public static BW()I
     .locals 1
 
-    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->BV()Lio/fabric/sdk/android/a/b/i$a;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/i$a;->BY()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 BU()J
+.method public static declared-synchronized BX()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;->bbO:J
+    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bbX:J
 
     const-wide/16 v3, -0x1
 
@@ -192,7 +192,7 @@
     goto :goto_0
 
     :cond_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbO:J
+    sput-wide v1, Lio/fabric/sdk/android/a/b/i;->bbX:J
 
     :cond_4
-    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bbO:J
+    sget-wide v1, Lio/fabric/sdk/android/a/b/i;->bbX:J
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -375,7 +375,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -565,7 +565,7 @@
 .method private static aN(Landroid/content/Context;)Z
     .locals 2
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/i;->bbM:Ljava/lang/Boolean;
+    sget-object v0, Lio/fabric/sdk/android/a/b/i;->bbV: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;->bbM:Ljava/lang/Boolean;
+    sput-object p0, Lio/fabric/sdk/android/a/b/i;->bbV:Ljava/lang/Boolean;
 
     :cond_0
-    sget-object p0, Lio/fabric/sdk/android/a/b/i;->bbM:Ljava/lang/Boolean;
+    sget-object p0, Lio/fabric/sdk/android/a/b/i;->bbV:Ljava/lang/Boolean;
 
     invoke-virtual {p0}, Ljava/lang/Boolean;->booleanValue()Z
 
@@ -886,7 +886,7 @@
 
     :goto_1
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -971,7 +971,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1019,7 +1019,7 @@
 
     move-result-object p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -1270,7 +1270,7 @@
 
     :goto_1
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
@@ -1330,7 +1330,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -1792,7 +1792,7 @@
 
     if-eqz p0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbN:[C
+    sget-object v4, Lio/fabric/sdk/android/a/b/i;->bbW:[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 b91c541026..cabc238ca8 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 bcc:Ljava/lang/String;
+.field public final bcl: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;->bcc:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/j;->bcl: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 4256f373f0..ee6a408622 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 BW()J
+.method public abstract BZ()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 fb501e92ef..55da238283 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 bcd:Lio/fabric/sdk/android/a/b/l;
+.field private static bcm:Lio/fabric/sdk/android/a/b/l;
 
-.field private static bce:Ljava/lang/Object;
+.field private static bcn:Ljava/lang/Object;
 
 
 # instance fields
-.field private volatile bcf:Z
+.field private volatile bco:Z
 
-.field public volatile bcg:Z
+.field public volatile bcp:Z
 
-.field private final bch:Lio/fabric/sdk/android/a/b/p;
+.field private final bcq:Lio/fabric/sdk/android/a/b/p;
 
-.field private bci:Z
+.field private bcr: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;->bce:Ljava/lang/Object;
+    sput-object v0, Lio/fabric/sdk/android/a/b/l;->bcn: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;->bci:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcr: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;->bch:Lio/fabric/sdk/android/a/b/p;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/b/l;->bcq: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bcg:Z
+    iput-boolean v1, p0, Lio/fabric/sdk/android/a/b/l;->bcp:Z
 
-    iput-boolean v2, p0, Lio/fabric/sdk/android/a/b/l;->bcf:Z
+    iput-boolean v2, p0, Lio/fabric/sdk/android/a/b/l;->bco:Z
 
     invoke-static {p1}, Lio/fabric/sdk/android/a/b/i;->aW(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;->bci:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcr:Z
 
     return-void
 
@@ -179,12 +179,12 @@
 .method public static aY(Landroid/content/Context;)Lio/fabric/sdk/android/a/b/l;
     .locals 2
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/l;->bce:Ljava/lang/Object;
+    sget-object v0, Lio/fabric/sdk/android/a/b/l;->bcn:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/b/l;->bcd:Lio/fabric/sdk/android/a/b/l;
+    sget-object v1, Lio/fabric/sdk/android/a/b/l;->bcm: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;->bcd:Lio/fabric/sdk/android/a/b/l;
+    sput-object v1, Lio/fabric/sdk/android/a/b/l;->bcm:Lio/fabric/sdk/android/a/b/l;
 
     :cond_0
-    sget-object p0, Lio/fabric/sdk/android/a/b/l;->bcd:Lio/fabric/sdk/android/a/b/l;
+    sget-object p0, Lio/fabric/sdk/android/a/b/l;->bcm:Lio/fabric/sdk/android/a/b/l;
 
     monitor-exit v0
 
@@ -213,23 +213,23 @@
 
 
 # virtual methods
-.method public final BX()Z
+.method public final Ca()Z
     .locals 1
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bci:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcr:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcf:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bco:Z
 
     if-eqz v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcg:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/l;->bcp:Z
 
     return v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/l;->bch:Lio/fabric/sdk/android/a/b/p;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/l;->bcq: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 6fef885669..1fd1c5ff14 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 bcj:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bcs:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bck:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bct:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bcl:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bcu:Lio/fabric/sdk/android/a/b/m;
 
-.field public static final enum bcm:Lio/fabric/sdk/android/a/b/m;
+.field public static final enum bcv:Lio/fabric/sdk/android/a/b/m;
 
-.field private static final synthetic bcn:[Lio/fabric/sdk/android/a/b/m;
+.field private static final synthetic bcw:[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;->bcj:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcs: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;->bck:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bct: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;->bcl:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcu: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;->bcm:Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcv: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;->bcj:Lio/fabric/sdk/android/a/b/m;
+    sget-object v5, Lio/fabric/sdk/android/a/b/m;->bcs:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v5, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bck:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bct:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcl:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcu:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcm:Lio/fabric/sdk/android/a/b/m;
+    sget-object v1, Lio/fabric/sdk/android/a/b/m;->bcv:Lio/fabric/sdk/android/a/b/m;
 
     aput-object v1, v0, v4
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcn:[Lio/fabric/sdk/android/a/b/m;
+    sput-object v0, Lio/fabric/sdk/android/a/b/m;->bcw:[Lio/fabric/sdk/android/a/b/m;
 
     return-void
 .end method
@@ -124,19 +124,19 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcl:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcu: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;->bcm:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcv:Lio/fabric/sdk/android/a/b/m;
 
     return-object p0
 
     :cond_1
-    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcj:Lio/fabric/sdk/android/a/b/m;
+    sget-object p0, Lio/fabric/sdk/android/a/b/m;->bcs: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;->bcn:[Lio/fabric/sdk/android/a/b/m;
+    sget-object v0, Lio/fabric/sdk/android/a/b/m;->bcw:[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 5dff30307a..0a41978fda 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 bcq:Lio/fabric/sdk/android/a/b/o$1;
+.field final synthetic bcz:Lio/fabric/sdk/android/a/b/o$1;
 
-.field final synthetic rz:Ljava/lang/Runnable;
+.field final synthetic ry: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;->bcq:Lio/fabric/sdk/android/a/b/o$1;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1$1;->bcz:Lio/fabric/sdk/android/a/b/o$1;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1$1;->rz:Ljava/lang/Runnable;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1$1;->ry:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
@@ -38,7 +38,7 @@
 .method public final dq()V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$1$1;->rz:Ljava/lang/Runnable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$1$1;->ry: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 66dc3a0dfa..a6c074eede 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
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bco:Ljava/lang/String;
+.field final synthetic bcx:Ljava/lang/String;
 
-.field final synthetic bcp:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bcy: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;->bco:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$1;->bcx:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1;->bcp:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$1;->bcy: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;->bco:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bcx: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;->bcp:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$1;->bcy: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 089a522125..0468f61411 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 bcr:Ljava/lang/String;
+.field final synthetic bcA:Ljava/lang/String;
 
-.field final synthetic bcs:Ljava/util/concurrent/ExecutorService;
+.field final synthetic bcB:Ljava/util/concurrent/ExecutorService;
 
-.field final synthetic bct:J
+.field final synthetic bcC:J
 
-.field final synthetic bcu:Ljava/util/concurrent/TimeUnit;
+.field final synthetic bcD: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;->bcr:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcA:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcs:Ljava/util/concurrent/ExecutorService;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcB:Ljava/util/concurrent/ExecutorService;
 
     const-wide/16 p1, 0x2
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bct:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcC:J
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/b/o$2;->bcu:Ljava/util/concurrent/TimeUnit;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/b/o$2;->bcD:Ljava/util/concurrent/TimeUnit;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/b/h;-><init>()V
 
@@ -51,7 +51,7 @@
     const-string v0, "Fabric"
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bcr:Ljava/lang/String;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bcA: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;->bcs:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcB: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;->bcs:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcB:Ljava/util/concurrent/ExecutorService;
 
-    iget-wide v2, p0, Lio/fabric/sdk/android/a/b/o$2;->bct:J
+    iget-wide v2, p0, Lio/fabric/sdk/android/a/b/o$2;->bcC:J
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/b/o$2;->bcu:Ljava/util/concurrent/TimeUnit;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/o$2;->bcD: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bcr:Ljava/lang/String;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/o$2;->bcA: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;->bcs:Ljava/util/concurrent/ExecutorService;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/o$2;->bcB: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bcr:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/b/o$2;->bcA: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;->bcs:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/o$2;->bcB: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/q.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/q.smali
index 68f961165c..d50ddd2c85 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 bcv:Ljava/lang/reflect/Method;
+.field private final bcE:Ljava/lang/reflect/Method;
 
-.field private final bcw:Ljava/lang/Object;
+.field private final bcF: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;->bcw:Ljava/lang/Object;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/q;->bcF: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;->bcv:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/q;->bcE:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -85,7 +85,7 @@
     :catch_0
     move-exception p0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bcv:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/q;->bcE:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/q;->bcw:Ljava/lang/Object;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/q;->bcF: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 aa75cce448..eb1c96652c 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 bcH:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcQ:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bcI:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcR:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bcJ:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcS:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bcK:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcT:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bcL:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcU:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bcM:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcV:Lio/fabric/sdk/android/a/b/s$a;
 
-.field public static final enum bcN:Lio/fabric/sdk/android/a/b/s$a;
+.field public static final enum bcW:Lio/fabric/sdk/android/a/b/s$a;
 
-.field private static final synthetic bcO:[Lio/fabric/sdk/android/a/b/s$a;
+.field private static final synthetic bcX:[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;->bcH:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcQ: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;->bcI:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcR: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;->bcJ:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcS: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;->bcK:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcT: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;->bcL:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcU: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;->bcM:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcV: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;->bcN:Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcW: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;->bcH:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v8, Lio/fabric/sdk/android/a/b/s$a;->bcQ:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v8, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcI:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcR:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcJ:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcS:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcK:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcT:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcL:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcU:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcM:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcV:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcN:Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s$a;->bcW:Lio/fabric/sdk/android/a/b/s$a;
 
     aput-object v1, v0, v7
 
-    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcO:[Lio/fabric/sdk/android/a/b/s$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcX:[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;->bcO:[Lio/fabric/sdk/android/a/b/s$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/s$a;->bcX:[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 a62b128b7b..e48755f542 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 bcx:Ljava/util/regex/Pattern;
+.field private static final bcG:Ljava/util/regex/Pattern;
 
-.field private static final bcy:Ljava/lang/String;
+.field private static final bcH:Ljava/lang/String;
 
 
 # instance fields
-.field private final bbl:Ljava/lang/String;
+.field private final bbu:Ljava/lang/String;
 
-.field public final bbm:Ljava/lang/String;
+.field public final bbv:Ljava/lang/String;
 
-.field private final bcA:Lio/fabric/sdk/android/a/b/t;
+.field private final bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
-.field public final bcB:Z
+.field private final bcJ:Lio/fabric/sdk/android/a/b/t;
 
-.field public final bcC:Z
+.field public final bcK:Z
 
-.field bcD:Lio/fabric/sdk/android/a/b/c;
+.field public final bcL:Z
 
-.field bcE:Lio/fabric/sdk/android/a/b/b;
+.field bcM:Lio/fabric/sdk/android/a/b/c;
 
-.field bcF:Z
+.field bcN:Lio/fabric/sdk/android/a/b/b;
 
-.field bcG:Lio/fabric/sdk/android/a/b/r;
+.field bcO:Z
 
-.field private final bcz:Ljava/util/concurrent/locks/ReentrantLock;
+.field bcP:Lio/fabric/sdk/android/a/b/r;
 
-.field public final lf:Landroid/content/Context;
+.field public final le:Landroid/content/Context;
 
-.field private final po:Ljava/util/Collection;
+.field private final pn: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;->bcx:Ljava/util/regex/Pattern;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bcG: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;->bcy:Ljava/lang/String;
+    sput-object v0, Lio/fabric/sdk/android/a/b/s;->bcH: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;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcI: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;->lf:Landroid/content/Context;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bbm:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/b/s;->bbl:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/b/s;->bbu:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/b/s;->po:Ljava/util/Collection;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/b/s;->pn: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;->bcA:Lio/fabric/sdk/android/a/b/t;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcJ: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;->bcD:Lio/fabric/sdk/android/a/b/c;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcM: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;->bcG:Lio/fabric/sdk/android/a/b/r;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcP: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;->bcB:Z
+    iput-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bcK:Z
 
-    iget-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bcB:Z
+    iget-boolean p3, p0, Lio/fabric/sdk/android/a/b/s;->bcK:Z
 
     const-string p4, "Fabric"
 
     if-nez p3, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bcC:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bcL:Z
 
-    iget-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bcC:Z
+    iget-boolean p2, p0, Lio/fabric/sdk/android/a/b/s;->bcL:Z
 
     if-nez p2, :cond_1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p2
 
@@ -232,7 +232,7 @@
     throw p1
 .end method
 
-.method public static BZ()Ljava/lang/String;
+.method public static Cc()Ljava/lang/String;
     .locals 4
 
     sget-object v0, Ljava/util/Locale;->US:Ljava/util/Locale;
@@ -275,7 +275,7 @@
 
     const-string v0, "crashlytics.installation.id"
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
@@ -304,7 +304,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v1, Lio/fabric/sdk/android/a/b/s;->bcx:Ljava/util/regex/Pattern;
+    sget-object v1, Lio/fabric/sdk/android/a/b/s;->bcG:Ljava/util/regex/Pattern;
 
     invoke-virtual {v1, v2}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -338,7 +338,7 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
     :cond_1
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -347,7 +347,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -386,13 +386,13 @@
 .method private b(Landroid/content/SharedPreferences;)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/s;->BR()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/s;->BU()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;->bbF:Ljava/lang/String;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/b/b;->bbO: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 +405,7 @@
 
     const-string v0, "crashlytics.advertising.id"
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {v1}, Ljava/util/concurrent/locks/ReentrantLock;->lock()V
 
@@ -420,7 +420,7 @@
 
     :cond_0
     :goto_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p1}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -482,7 +482,7 @@
     :catchall_0
     move-exception p1
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcz:Ljava/util/concurrent/locks/ReentrantLock;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/b/s;->bcI:Ljava/util/concurrent/locks/ReentrantLock;
 
     invoke-virtual {p2}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V
 
@@ -498,7 +498,7 @@
 .method public static dk(Ljava/lang/String;)Ljava/lang/String;
     .locals 2
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/s;->bcy:Ljava/lang/String;
+    sget-object v0, Lio/fabric/sdk/android/a/b/s;->bcH:Ljava/lang/String;
 
     const-string v1, ""
 
@@ -511,21 +511,21 @@
 
 
 # virtual methods
-.method public declared-synchronized BR()Lio/fabric/sdk/android/a/b/b;
+.method public declared-synchronized BU()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;->bcF:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bcO:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcD:Lio/fabric/sdk/android/a/b/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcM:Lio/fabric/sdk/android/a/b/c;
 
-    iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v1, v0, Lio/fabric/sdk/android/a/b/c;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/f/c;->CP()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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v2, v0, Lio/fabric/sdk/android/a/b/c;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/f/c;->CP()Landroid/content/SharedPreferences;
 
     move-result-object v2
 
@@ -561,7 +561,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BQ()Lio/fabric/sdk/android/a/b/b;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/c;->BT()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;->bcE:Lio/fabric/sdk/android/a/b/b;
+    iput-object v3, p0, Lio/fabric/sdk/android/a/b/s;->bcN:Lio/fabric/sdk/android/a/b/b;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bcF:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/b/s;->bcO:Z
 
     :cond_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcE:Lio/fabric/sdk/android/a/b/b;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcN: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 BY()Ljava/lang/String;
+.method public final Cb()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bbl:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bbu:Ljava/lang/String;
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->lf:Landroid/content/Context;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
 
     invoke-static {v0}, Lio/fabric/sdk/android/a/b/i;->aJ(Landroid/content/Context;)Landroid/content/SharedPreferences;
 
@@ -653,12 +653,12 @@
     return-object v0
 .end method
 
-.method public final Ca()Ljava/lang/String;
+.method public final Cd()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcA:Lio/fabric/sdk/android/a/b/t;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/s;->bcJ:Lio/fabric/sdk/android/a/b/t;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->lf:Landroid/content/Context;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->le:Landroid/content/Context;
 
     invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/b/t;->bd(Landroid/content/Context;)Ljava/lang/String;
 
@@ -683,7 +683,7 @@
 
     invoke-direct {v0}, Ljava/util/HashMap;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->po:Ljava/util/Collection;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/s;->pn:Ljava/util/Collection;
 
     invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
 
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 95eb1a5e98..1fb043e049 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 bcR:Lio/fabric/sdk/android/a/b/t;
+.field final synthetic bda: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;->bcR:Lio/fabric/sdk/android/a/b/t;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/t$1;->bda: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 598e5a935d..0415b151b0 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 bcP:Lio/fabric/sdk/android/a/a/d;
+.field private final bcY: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 bcQ:Lio/fabric/sdk/android/a/a/b;
+.field private final bcZ: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;->bcP:Lio/fabric/sdk/android/a/a/d;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bcY: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;->bcQ:Lio/fabric/sdk/android/a/a/b;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/t;->bcZ: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;->bcQ:Lio/fabric/sdk/android/a/a/b;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/t;->bcZ:Lio/fabric/sdk/android/a/a/b;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/t;->bcP:Lio/fabric/sdk/android/a/a/d;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/t;->bcY: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 31c4283c5e..0f6fb3d8d4 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 bcY:Z
+.field bdh:Z
 
-.field final synthetic bcZ:Ljava/lang/StringBuilder;
+.field final synthetic bdi:Ljava/lang/StringBuilder;
 
-.field final synthetic bda:Lio/fabric/sdk/android/a/b/u;
+.field final synthetic bdj: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;->bda:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdj:Lio/fabric/sdk/android/a/b/u;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/b/u$1;->bcZ:Ljava/lang/StringBuilder;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/b/u$1;->bdi: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;->bcY:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdh:Z
 
     return-void
 .end method
@@ -52,25 +52,25 @@
         }
     .end annotation
 
-    iget-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bcY:Z
+    iget-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdh:Z
 
     if-eqz p1, :cond_0
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bcY:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdh:Z
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bcZ:Ljava/lang/StringBuilder;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdi: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;->bcZ:Ljava/lang/StringBuilder;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$1;->bdi: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 147bd5a0d0..fd82f2611b 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 bdb:Lio/fabric/sdk/android/a/b/u$a;
+.field static final bdk: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;->bdb:Lio/fabric/sdk/android/a/b/u$a;
+    sput-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdk: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 6ff87ab259..1e9e4ed550 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,18 +15,18 @@
 
 
 # instance fields
-.field final synthetic bda:Lio/fabric/sdk/android/a/b/u;
+.field final synthetic bdj:Lio/fabric/sdk/android/a/b/u;
+
+.field private bdl:I
 
 .field private position:I
 
-.field private remaining:I
-
 
 # direct methods
 .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;->bda:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdj:Lio/fabric/sdk/android/a/b/u;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -42,7 +42,7 @@
 
     iget p1, p2, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     return-void
 .end method
@@ -65,7 +65,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     if-nez v0, :cond_0
 
@@ -74,7 +74,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bda:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdj: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;->bda:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdj: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;->bda:Lio/fabric/sdk/android/a/b/u;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdj:Lio/fabric/sdk/android/a/b/u;
 
     iget v2, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
@@ -108,11 +108,11 @@
 
     iput v1, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iput v1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     return v0
 .end method
@@ -139,7 +139,7 @@
 
     if-gt p3, v0, :cond_2
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     if-lez v0, :cond_1
 
@@ -148,13 +148,13 @@
     move p3, v0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bda:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u$b;->bdj: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;->bda:Lio/fabric/sdk/android/a/b/u;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdj:Lio/fabric/sdk/android/a/b/u;
 
     iget p2, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
@@ -166,11 +166,11 @@
 
     iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->position:I
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     sub-int/2addr p1, p3
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->remaining:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u$b;->bdl:I
 
     return p3
 
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 9cb9efd13d..9c0528880c 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,19 +17,19 @@
 
 
 # static fields
-.field private static final bcS:Ljava/util/logging/Logger;
+.field private static final bdb:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field private final bcT:Ljava/io/RandomAccessFile;
+.field private final bdc:Ljava/io/RandomAccessFile;
 
-.field bcU:I
+.field bdd:I
 
-.field private bcV:I
+.field private bde:I
 
-.field private bcW:Lio/fabric/sdk/android/a/b/u$a;
+.field private bdf:Lio/fabric/sdk/android/a/b/u$a;
 
-.field private bcX:Lio/fabric/sdk/android/a/b/u$a;
+.field private bdg: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;->bcS:Ljava/util/logging/Logger;
+    sput-object v0, Lio/fabric/sdk/android/a/b/u;->bdb:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -172,13 +172,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcU:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     int-to-long v0, p1
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1}, Ljava/io/RandomAccessFile;->length()J
 
@@ -212,7 +212,7 @@
 
     move-result p1
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->buffer:[B
 
@@ -234,13 +234,13 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
 
     invoke-direct {p0, v0}, Lio/fabric/sdk/android/a/b/u;->cR(I)Lio/fabric/sdk/android/a/b/u$a;
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcU:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v1}, Ljava/io/RandomAccessFile;->length()J
 
@@ -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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     iget-object p2, p0, Lio/fabric/sdk/android/a/b/u;->buffer:[B
 
@@ -392,12 +392,12 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lio/fabric/sdk/android/a/b/u$a;->bdb:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object p1, Lio/fabric/sdk/android/a/b/u$a;->bdk:Lio/fabric/sdk/android/a/b/u$a;
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     int-to-long v1, p1
 
@@ -405,7 +405,7 @@
 
     new-instance v0, Lio/fabric/sdk/android/a/b/u$a;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v1}, Ljava/io/RandomAccessFile;->readInt()I
 
@@ -419,7 +419,7 @@
 .method private cS(I)I
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     if-ge p1, v0, :cond_0
 
@@ -443,9 +443,9 @@
 
     add-int/lit8 p1, p1, 0x4
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->Cb()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
 
     move-result v1
 
@@ -456,7 +456,7 @@
     return-void
 
     :cond_0
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     :cond_1
     add-int/2addr v0, v1
@@ -467,13 +467,13 @@
 
     invoke-direct {p0, v1}, Lio/fabric/sdk/android/a/b/u;->cU(I)V
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
@@ -483,19 +483,19 @@
 
     move-result p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcU:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     int-to-long v2, v0
 
@@ -532,19 +532,19 @@
 
     :cond_3
     :goto_0
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcU:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -552,9 +552,9 @@
 
     add-int/lit8 p1, p1, -0x10
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v2, v2, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -562,31 +562,31 @@
 
     new-instance v0, Lio/fabric/sdk/android/a/b/u$a;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
     goto :goto_1
 
     :cond_4
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcU:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     return-void
 .end method
@@ -599,13 +599,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1}, Ljava/io/RandomAccessFile;->getChannel()Ljava/nio/channels/FileChannel;
 
@@ -635,24 +635,24 @@
     :try_start_0
     invoke-direct {p0, v1, v0, v0, v0}, Lio/fabric/sdk/android/a/b/u;->b(IIII)V
 
-    iput v0, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iput v0, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdb:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdk:Lio/fabric/sdk/android/a/b/u$a;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
 
-    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdb:Lio/fabric/sdk/android/a/b/u$a;
+    sget-object v0, Lio/fabric/sdk/android/a/b/u$a;->bdk:Lio/fabric/sdk/android/a/b/u$a;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     if-le v0, v1, :cond_0
 
     invoke-direct {p0, v1}, Lio/fabric/sdk/android/a/b/u;->cU(I)V
 
     :cond_0
-    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iput v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -682,19 +682,19 @@
 
     add-int p3, p1, p4
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     const/4 v1, 0x0
 
     if-gt p3, v0, :cond_0
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, p2, v1, p4}, Ljava/io/RandomAccessFile;->write([BII)V
 
@@ -703,23 +703,23 @@
     :cond_0
     sub-int/2addr v0, p1
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     add-int/lit8 p3, v0, 0x0
 
@@ -768,17 +768,17 @@
 
     add-int v0, p1, p4
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     if-gt v0, v1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {p1, p2, p3, p4}, Ljava/io/RandomAccessFile;->readFully([BII)V
 
@@ -787,23 +787,23 @@
     :cond_0
     sub-int/2addr v1, p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc: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;->bcT:Ljava/io/RandomAccessFile;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     add-int/2addr p3, v1
 
@@ -917,10 +917,10 @@
 
 
 # virtual methods
-.method public final Cb()I
+.method public final Ce()I
     .locals 3
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     const/16 v1, 0x10
 
@@ -929,21 +929,21 @@
     return v1
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcU:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -1009,7 +1009,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     if-ge v0, v3, :cond_0
 
@@ -1073,7 +1073,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcT:Ljava/io/RandomAccessFile;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdc:Ljava/io/RandomAccessFile;
 
     invoke-virtual {v0}, Ljava/io/RandomAccessFile;->close()V
     :try_end_0
@@ -1097,7 +1097,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1171,13 +1171,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v4, v4, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
@@ -1215,14 +1215,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcU:I
+    iget p2, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
-    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -1230,19 +1230,19 @@
 
     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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v4, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
-    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iput p1, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     if-eqz v0, :cond_2
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -1286,7 +1286,7 @@
 
     if-nez v0, :cond_1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v0, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     const/4 v1, 0x1
 
@@ -1302,7 +1302,7 @@
 
     :cond_0
     :try_start_1
-    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v0, v0, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
@@ -1310,7 +1310,7 @@
 
     add-int/2addr v0, v2
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/b/u;->bdf:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v3, v3, Lio/fabric/sdk/android/a/b/u$a;->length:I
 
@@ -1332,29 +1332,29 @@
 
     move-result v2
 
-    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bcU:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
-    iget v4, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v4, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     sub-int/2addr v4, v1
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/b/u;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/b/u;->bdg:Lio/fabric/sdk/android/a/b/u$a;
 
     iget v5, v5, Lio/fabric/sdk/android/a/b/u$a;->position:I
 
     invoke-direct {p0, v3, v4, v0, v5}, Lio/fabric/sdk/android/a/b/u;->b(IIII)V
 
-    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iget v3, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     sub-int/2addr v3, v1
 
-    iput v3, p0, Lio/fabric/sdk/android/a/b/u;->bcV:I
+    iput v3, p0, Lio/fabric/sdk/android/a/b/u;->bde:I
 
     new-instance v1, Lio/fabric/sdk/android/a/b/u$a;
 
     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;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcU:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bdd:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -1413,7 +1413,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;->bcV:I
+    iget v1, p0, Lio/fabric/sdk/android/a/b/u;->bde: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;->bcW:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdf: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;->bcX:Lio/fabric/sdk/android/a/b/u$a;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/b/u;->bdg: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;->bcS:Ljava/util/logging/Logger;
+    sget-object v2, Lio/fabric/sdk/android/a/b/u;->bdb: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/w.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/b/w.smali
index cfdf07b0fb..e728d1879b 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 BW()J
+.method public final BZ()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 5e987e3714..9e043bfd85 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 pW:Ljava/lang/String;
+.field private final pV:Ljava/lang/String;
 
-.field private final sV:Z
+.field private final sU: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;->pW:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/b/x;->pV: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;->sV:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/b/x;->sU:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final declared-synchronized Cc()V
+.method public final declared-synchronized Cf()V
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sV:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sU: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 Cd()V
+.method public final declared-synchronized Cg()V
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sV:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/b/x;->sU: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;->pW:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/b/x;->pV: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 6c823527fd..3287debcc0 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 bdl:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bdv: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;->bdl:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$1;->bdv: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;->bdl:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/c/a$1;->bdv: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 5cbb3cd8c8..292b74a0a9 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 bdm:Lio/fabric/sdk/android/a/c/a;
+.field final synthetic bdw: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;->bdm:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$2;->bdw: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;->bdm:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bdw: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;->bdm:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$2;->bdw:Lio/fabric/sdk/android/a/c/a;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->BI()Ljava/lang/Object;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a;->BL()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 64c546f8af..381b33d3c4 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 bdm:Lio/fabric/sdk/android/a/c/a;
+.field final synthetic bdw: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;->bdm:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$3;->bdw: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;->bdm:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bdw: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;->bdm:Lio/fabric/sdk/android/a/c/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$3;->bdw: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 186c2ab1e8..387b002033 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 bdn:[I
+.field static final synthetic bdx:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 3
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Cg()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/c/a$d;->Cj()[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;->bdn:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/a$4;->bdx:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bdn:[I
+    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bdx:[I
 
-    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdv:I
+    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdF: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;->bdn:[I
+    sget-object v1, Lio/fabric/sdk/android/a/c/a$4;->bdx:[I
 
-    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdw:I
+    sget v2, Lio/fabric/sdk/android/a/c/a$d;->bdG: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 91cd079359..4e4b1a02d9 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 bdo:Lio/fabric/sdk/android/a/c/a;
+.field final bdy:Lio/fabric/sdk/android/a/c/a;
 
-.field final bdp:[Ljava/lang/Object;
+.field final bdz:[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;->bdo:Lio/fabric/sdk/android/a/c/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$a;->bdy:Lio/fabric/sdk/android/a/c/a;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$a;->bdp:[Ljava/lang/Object;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$a;->bdz:[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 27b91ad51e..2930cb0b11 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;->bdo:Lio/fabric/sdk/android/a/c/a;
+    iget-object p1, v0, Lio/fabric/sdk/android/a/c/a$a;->bdy:Lio/fabric/sdk/android/a/c/a;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a$a;->bdp:[Ljava/lang/Object;
+    iget-object v0, v0, Lio/fabric/sdk/android/a/c/a$a;->bdz:[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 a22fb06823..3cc4a37399 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 bds:Ljava/lang/Runnable;
+.field final synthetic bdC:Ljava/lang/Runnable;
 
-.field final synthetic bdt:Lio/fabric/sdk/android/a/c/a$c;
+.field final synthetic bdD: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;->bdt:Lio/fabric/sdk/android/a/c/a$c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdD:Lio/fabric/sdk/android/a/c/a$c;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bds:Ljava/lang/Runnable;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdC:Ljava/lang/Runnable;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -42,13 +42,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bds:Ljava/lang/Runnable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdC: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;->bdt:Lio/fabric/sdk/android/a/c/a$c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdD:Lio/fabric/sdk/android/a/c/a$c;
 
     invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/a$c;->scheduleNext()V
 
@@ -57,7 +57,7 @@
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdt:Lio/fabric/sdk/android/a/c/a$c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c$1;->bdD:Lio/fabric/sdk/android/a/c/a$c;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/a/c/a$c;->scheduleNext()V
 
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 a8b12a6112..c6e8073b87 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 bdq:Ljava/util/LinkedList;
+.field final bdA:Ljava/util/LinkedList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedList<",
@@ -28,7 +28,7 @@
     .end annotation
 .end field
 
-.field bdr:Ljava/lang/Runnable;
+.field bdB: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;->bdq:Ljava/util/LinkedList;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdA:Ljava/util/LinkedList;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdq:Ljava/util/LinkedList;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdA:Ljava/util/LinkedList;
 
     new-instance v1, Lio/fabric/sdk/android/a/c/a$c$1;
 
@@ -70,7 +70,7 @@
 
     invoke-virtual {v0, v1}, Ljava/util/LinkedList;->offer(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a$c;->bdr:Ljava/lang/Runnable;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a$c;->bdB:Ljava/lang/Runnable;
 
     if-nez p1, :cond_0
 
@@ -97,7 +97,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdq:Ljava/util/LinkedList;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdA:Ljava/util/LinkedList;
 
     invoke-virtual {v0}, Ljava/util/LinkedList;->poll()Ljava/lang/Object;
 
@@ -105,13 +105,13 @@
 
     check-cast v0, Ljava/lang/Runnable;
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdr:Ljava/lang/Runnable;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a$c;->bdB: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;->bdr:Ljava/lang/Runnable;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a$c;->bdB:Ljava/lang/Runnable;
 
     invoke-interface {v0, v1}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
     :try_end_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 5c495de7cf..d45841c14f 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 bdu:I = 0x1
+.field public static final bdE:I = 0x1
 
-.field public static final bdv:I = 0x2
+.field public static final bdF:I = 0x2
 
-.field public static final bdw:I = 0x3
+.field public static final bdG:I = 0x3
 
-.field private static final synthetic bdx:[I
+.field private static final synthetic bdH:[I
 
 
 # direct methods
@@ -40,33 +40,33 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdu:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdv:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdF:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdw:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdG:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdx:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdH:[I
 
     return-void
 .end method
 
-.method public static Cg()[I
+.method public static Cj()[I
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdx:[I
+    sget-object v0, Lio/fabric/sdk/android/a/c/a$d;->bdH:[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 220cff7243..95002d3693 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 bdy:[Ljava/lang/Object;
+.field bdI:[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 a28897f4f6..579f89dbe1 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
@@ -35,11 +35,11 @@
 
 .field public static final THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor;
 
-.field private static volatile aQG:Ljava/util/concurrent/Executor;
+.field private static volatile aQP:Ljava/util/concurrent/Executor;
 
-.field private static final bdc:Ljava/util/concurrent/ThreadFactory;
+.field private static final bdm:Ljava/util/concurrent/ThreadFactory;
 
-.field private static final bdd:Ljava/util/concurrent/BlockingQueue;
+.field private static final bdn:Ljava/util/concurrent/BlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/BlockingQueue<",
@@ -49,15 +49,15 @@
     .end annotation
 .end field
 
-.field public static final bde:Ljava/util/concurrent/Executor;
+.field public static final bdo:Ljava/util/concurrent/Executor;
 
-.field private static final bdf:Lio/fabric/sdk/android/a/c/a$b;
+.field private static final bdp:Lio/fabric/sdk/android/a/c/a$b;
 
 .field private static final k:I
 
 
 # instance fields
-.field private final bdg:Lio/fabric/sdk/android/a/c/a$e;
+.field private final bdq: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 bdh:Ljava/util/concurrent/FutureTask;
+.field private final bdr:Ljava/util/concurrent/FutureTask;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/FutureTask<",
@@ -75,11 +75,11 @@
     .end annotation
 .end field
 
-.field private volatile bdi:I
+.field private volatile bds:I
 
-.field private final bdj:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bdk:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bdu: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;->bdc:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdm: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;->bdd:Ljava/util/concurrent/BlockingQueue;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdn: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;->bdd:Ljava/util/concurrent/BlockingQueue;
+    sget-object v8, Lio/fabric/sdk/android/a/c/a;->bdn:Ljava/util/concurrent/BlockingQueue;
 
-    sget-object v9, Lio/fabric/sdk/android/a/c/a;->bdc:Ljava/util/concurrent/ThreadFactory;
+    sget-object v9, Lio/fabric/sdk/android/a/c/a;->bdm:Ljava/util/concurrent/ThreadFactory;
 
     const-wide/16 v5, 0x1
 
@@ -148,17 +148,17 @@
 
     invoke-direct {v0, v1}, Lio/fabric/sdk/android/a/c/a$c;-><init>(B)V
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bde:Ljava/util/concurrent/Executor;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdo:Ljava/util/concurrent/Executor;
 
     new-instance v0, Lio/fabric/sdk/android/a/c/a$b;
 
     invoke-direct {v0}, Lio/fabric/sdk/android/a/c/a$b;-><init>()V
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdf:Lio/fabric/sdk/android/a/c/a$b;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->bdp:Lio/fabric/sdk/android/a/c/a$b;
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bde:Ljava/util/concurrent/Executor;
+    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bdo:Ljava/util/concurrent/Executor;
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/a;->aQG:Ljava/util/concurrent/Executor;
+    sput-object v0, Lio/fabric/sdk/android/a/c/a;->aQP: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;->bdu:I
+    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bdi:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bds: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;->bdj:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdt: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;->bdk:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdu: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;->bdg:Lio/fabric/sdk/android/a/c/a$e;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdq: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;->bdg:Lio/fabric/sdk/android/a/c/a$e;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/c/a;->bdq: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;->bdh:Ljava/util/concurrent/FutureTask;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdr: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;->bdk:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/c/a;->bdu: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;->bdk:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdu: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;->bdj:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/c/a;->bdt: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;->BH()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->BK()V
 
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->BG()V
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->BJ()V
 
     :goto_0
-    sget p1, Lio/fabric/sdk/android/a/c/a$d;->bdw:I
+    sget p1, Lio/fabric/sdk/android/a/c/a$d;->bdG:I
 
-    iput p1, p0, Lio/fabric/sdk/android/a/c/a;->bdi:I
+    iput p1, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
 
     return-void
 .end method
@@ -270,7 +270,7 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bdf:Lio/fabric/sdk/android/a/c/a$b;
+    sget-object v0, Lio/fabric/sdk/android/a/c/a;->bdp: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 BG()V
+.method protected BJ()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -306,7 +306,7 @@
     return-void
 .end method
 
-.method protected BH()V
+.method protected BK()V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -317,7 +317,7 @@
     return-void
 .end method
 
-.method protected varargs abstract BI()Ljava/lang/Object;
+.method protected varargs abstract BL()Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TResult;"
@@ -325,24 +325,24 @@
     .end annotation
 .end method
 
-.method public final Ce()I
+.method public final Ch()I
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bdi:I
+    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
 
     return v0
 .end method
 
-.method public final Cf()Z
+.method public final Ci()Z
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdj:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdt: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;->bdh:Ljava/util/concurrent/FutureTask;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdr:Ljava/util/concurrent/FutureTask;
 
     invoke-virtual {v0, v1}, Ljava/util/concurrent/FutureTask;->cancel(Z)Z
 
@@ -363,15 +363,15 @@
         }
     .end annotation
 
-    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bdi:I
+    iget v0, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdu:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
 
     if-eq v0, v1, :cond_2
 
-    sget-object v0, Lio/fabric/sdk/android/a/c/a$4;->bdn:[I
+    sget-object v0, Lio/fabric/sdk/android/a/c/a$4;->bdx:[I
 
-    iget v1, p0, Lio/fabric/sdk/android/a/c/a;->bdi:I
+    iget v1, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
 
     const/4 v2, 0x1
 
@@ -407,17 +407,17 @@
 
     :cond_2
     :goto_0
-    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bdv:I
+    sget v0, Lio/fabric/sdk/android/a/c/a$d;->bdF:I
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bdi:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a;->bds:I
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/a;->onPreExecute()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdg:Lio/fabric/sdk/android/a/c/a$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdq:Lio/fabric/sdk/android/a/c/a$e;
 
-    iput-object p2, v0, Lio/fabric/sdk/android/a/c/a$e;->bdy:[Ljava/lang/Object;
+    iput-object p2, v0, Lio/fabric/sdk/android/a/c/a$e;->bdI:[Ljava/lang/Object;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/c/a;->bdh:Ljava/util/concurrent/FutureTask;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/c/a;->bdr:Ljava/util/concurrent/FutureTask;
 
     invoke-interface {p1, p2}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
@@ -427,7 +427,7 @@
 .method public final isCancelled()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdj:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/a;->bdt:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
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 de0ce92af1..786de85d70 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 bdM:I
+.field private final bdW: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;->bdM:I
+    iput p1, p0, Lio/fabric/sdk/android/a/c/a/b;->bdW: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 5ed61789f8..bdecbb989e 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 bdN:J
+.field private final bdX:J
 
-.field private final bdO:I
+.field private final bdY:I
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     const-wide/16 v0, 0x3e8
 
-    iput-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdN:J
+    iput-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdX:J
 
     const/16 v0, 0x8
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdO:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdY:I
 
     return-void
 .end method
@@ -34,11 +34,11 @@
 .method public final l(I)J
     .locals 6
 
-    iget-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdN:J
+    iget-wide v0, p0, Lio/fabric/sdk/android/a/c/a/c;->bdX:J
 
     long-to-double v0, v0
 
-    iget v2, p0, Lio/fabric/sdk/android/a/c/a/c;->bdO:I
+    iget v2, p0, Lio/fabric/sdk/android/a/c/a/c;->bdY: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 9ac8a82281..662783058b 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 bdP:Lio/fabric/sdk/android/a/c/a/d;
+.field public final bdZ:Lio/fabric/sdk/android/a/c/a/d;
 
-.field public final qo:Lio/fabric/sdk/android/a/c/a/a;
+.field public final qn: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;->qo:Lio/fabric/sdk/android/a/c/a/a;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/a/e;->qn:Lio/fabric/sdk/android/a/c/a/a;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/c/a/e;->bdP:Lio/fabric/sdk/android/a/c/a/d;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/c/a/e;->bdZ: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 48c6098d80..e2bcaa15d6 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 Ch()Ljava/util/Collection;
+.method public abstract Ck()Ljava/util/Collection;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -25,7 +25,7 @@
     .end annotation
 .end method
 
-.method public abstract Ci()Z
+.method public abstract Cl()Z
 .end method
 
 .method public abstract aK(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 90a75d51de..5e823aaaf5 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 Cj()Lio/fabric/sdk/android/a/c/b;
+.method private Cm()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 Ck()Lio/fabric/sdk/android/a/c/b;
+.method private Cn()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;->Ci()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Cl()Z
 
     move-result v1
 
@@ -305,7 +305,7 @@
 
 
 # virtual methods
-.method public final Cl()V
+.method public final Co()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;->Ci()Z
+    invoke-interface {v1}, Lio/fabric/sdk/android/a/c/b;->Cl()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;->Cj()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Cm()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;->Ck()Lio/fabric/sdk/android/a/c/b;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/c/c;->Cn()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 b87f782e48..c96027b2a2 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 bdA:I = 0x2
+.field public static final bdJ:I = 0x1
 
-.field public static final bdB:I = 0x3
+.field public static final bdK:I = 0x2
 
-.field public static final bdC:I = 0x4
+.field public static final bdL:I = 0x3
 
-.field private static final synthetic bdD:[I
+.field public static final bdM:I = 0x4
 
-.field public static final bdz:I = 0x1
+.field private static final synthetic bdN:[I
 
 
 # direct methods
@@ -33,31 +33,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdz:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdJ:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdA:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdK:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdB:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdL:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/c/e;->bdC:I
+    sget v1, Lio/fabric/sdk/android/a/c/e;->bdM:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/c/e;->bdD:[I
+    sput-object v0, Lio/fabric/sdk/android/a/c/e;->bdN:[I
 
     return-void
 .end method
@@ -87,7 +87,7 @@
     goto :goto_0
 
     :cond_0
-    sget p1, Lio/fabric/sdk/android/a/c/e;->bdA:I
+    sget p1, Lio/fabric/sdk/android/a/c/e;->bdK: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 7a5101aa63..254dbdfea3 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 bdG:Lio/fabric/sdk/android/a/c/f$a;
+.field final synthetic bdQ: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;->bdG:Lio/fabric/sdk/android/a/c/f$a;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bdQ:Lio/fabric/sdk/android/a/c/f$a;
 
     const/4 p1, 0x0
 
@@ -40,7 +40,7 @@
 
 
 # virtual methods
-.method public final Cm()Lio/fabric/sdk/android/a/c/b;
+.method public final Cp()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;->bdG:Lio/fabric/sdk/android/a/c/f$a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f$a$1;->bdQ: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 fd848c7f85..7670a5bf5e 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 bdF:Lio/fabric/sdk/android/a/c/f;
+.field private final bdP: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;->bdF:Lio/fabric/sdk/android/a/c/f;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/c/f$a;->bdP: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;->bdF:Lio/fabric/sdk/android/a/c/f;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/c/f$a;->bdP: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 863bb016a1..21996a3188 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 bdE:Lio/fabric/sdk/android/a/c/j;
+.field private final bdO: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;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ch()Ljava/util/Collection;
+.method public final Ck()Ljava/util/Collection;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -67,29 +67,29 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO: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;->Ch()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ck()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Ci()Z
+.method public final Cl()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO: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;->Ci()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Cl()Z
 
     move-result v0
 
@@ -99,7 +99,7 @@
 .method public final T(Z)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -113,15 +113,15 @@
 .method public final a(Lio/fabric/sdk/android/a/c/l;)V
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/f;->Ce()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/f;->Ch()I
 
     move-result v0
 
-    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdu:I
+    sget v1, Lio/fabric/sdk/android/a/c/a$d;->bdE:I
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -173,7 +173,7 @@
 .method public cT()I
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -197,7 +197,7 @@
 .method public final isFinished()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO:Lio/fabric/sdk/android/a/c/j;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/i;
 
@@ -213,7 +213,7 @@
 .method public final n(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdE:Lio/fabric/sdk/android/a/c/j;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/f;->bdO: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 4525fd7950..120902dda5 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 bdH:Ljava/lang/Object;
+.field final bdR:Ljava/lang/Object;
 
 
 # direct methods
@@ -46,7 +46,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bdH:Ljava/lang/Object;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bdR: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;->bdH:Ljava/lang/Object;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/c/h;->bdR:Ljava/lang/Object;
 
     return-void
 .end method
@@ -109,7 +109,7 @@
 
 
 # virtual methods
-.method public final Ch()Ljava/util/Collection;
+.method public final Ck()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;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()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;->Ch()Ljava/util/Collection;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Ck()Ljava/util/Collection;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Ci()Z
+.method public final Cl()Z
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()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;->Ci()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/c/b;->Cl()Z
 
     move-result v0
 
     return v0
 .end method
 
-.method public Cm()Lio/fabric/sdk/android/a/c/b;
+.method public Cp()Lio/fabric/sdk/android/a/c/b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -168,7 +168,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/h;->bdH:Ljava/lang/Object;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/h;->bdR:Ljava/lang/Object;
 
     check-cast v0, Lio/fabric/sdk/android/a/c/b;
 
@@ -178,7 +178,7 @@
 .method public final T(Z)V
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -196,7 +196,7 @@
 
     check-cast p1, Lio/fabric/sdk/android/a/c/l;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()Lio/fabric/sdk/android/a/c/b;
 
     move-result-object v0
 
@@ -212,7 +212,7 @@
 .method public final cT()I
     .locals 1
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()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;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()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;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()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;->Cm()Lio/fabric/sdk/android/a/c/b;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/h;->Cp()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 9e135af6c3..4a5453f975 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 bdI:Ljava/util/List;
+.field private final bdS:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -32,9 +32,9 @@
     .end annotation
 .end field
 
-.field private final bdJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bdT:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private final bdK:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bdU: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;->bdI:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdS: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;->bdJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdT: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;->bdK:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdU:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
@@ -111,7 +111,7 @@
 
 
 # virtual methods
-.method public final declared-synchronized Ch()Ljava/util/Collection;
+.method public final declared-synchronized Ck()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;->bdI:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdS: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 Ci()Z
+.method public final Cl()Z
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Ch()Ljava/util/Collection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/c/j;->Ck()Ljava/util/Collection;
 
     move-result-object v0
 
@@ -191,7 +191,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdT: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;->bdI:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdS:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
     :try_end_0
@@ -246,7 +246,7 @@
 .method public cT()I
     .locals 1
 
-    sget v0, Lio/fabric/sdk/android/a/c/e;->bdA:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bdK: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;->bdJ:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdT: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;->bdK:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/c/j;->bdU: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 647bb0d971..433b4ed66e 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 bdL:I
+.field private final bdV:I
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lio/fabric/sdk/android/a/c/k$a;->bdL:I
+    iput v0, p0, Lio/fabric/sdk/android/a/c/k$a;->bdV: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;->bdL:I
+    iget p1, p0, Lio/fabric/sdk/android/a/c/k$a;->bdV: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 9d9a04b2dc..afa0c025ed 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 Cn()Lio/fabric/sdk/android/a/c/k;
+.method public static Cq()Lio/fabric/sdk/android/a/c/k;
     .locals 7
 
     sget v1, Lio/fabric/sdk/android/a/c/k;->CORE_POOL_SIZE:I
@@ -137,7 +137,7 @@
 
     check-cast v0, Lio/fabric/sdk/android/a/c/c;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->Cl()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/c/c;->Co()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/d/b$1.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$1.smali
index 04a751e5f8..b59f02b9e6 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;->Cr()V
+    value = Lio/fabric/sdk/android/a/d/b;->Cu()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -27,14 +27,14 @@
 
 
 # instance fields
-.field final synthetic bdW:Lio/fabric/sdk/android/a/d/b;
+.field final synthetic beg: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;->bdW:Lio/fabric/sdk/android/a/d/b;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$1;->beg: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$a.smali b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$a.smali
index 3e358d4bf7..dfeed20d99 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$a.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/a/d/b$a.smali
@@ -17,7 +17,7 @@
 # instance fields
 .field final timestamp:J
 
-.field final uf:Ljava/io/File;
+.field final ue:Ljava/io/File;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$a;->uf:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/b$a;->ue:Ljava/io/File;
 
     iput-wide p2, p0, Lio/fabric/sdk/android/a/d/b$a;->timestamp:J
 
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 0807c98fcf..9c8efdd59d 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 bdQ:Lio/fabric/sdk/android/a/d/a;
+.field protected final bea: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 bdR:Lio/fabric/sdk/android/a/b/k;
+.field protected final beb:Lio/fabric/sdk/android/a/b/k;
 
-.field protected final bdS:Lio/fabric/sdk/android/a/d/c;
+.field protected final bec:Lio/fabric/sdk/android/a/d/c;
 
-.field private final bdT:I
+.field private final bed:I
 
-.field protected volatile bdU:J
+.field protected volatile bee:J
 
-.field protected final bdV:Ljava/util/List;
+.field protected final bef: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;->bdV:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bef: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;->bdQ:Lio/fabric/sdk/android/a/d/a;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/b;->bea:Lio/fabric/sdk/android/a/d/a;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/d/b;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/d/b;->beb:Lio/fabric/sdk/android/a/b/k;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/d/b;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/b;->beb:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->BW()J
+    invoke-interface {p1}, Lio/fabric/sdk/android/a/b/k;->BZ()J
 
     move-result-wide p1
 
-    iput-wide p1, p0, Lio/fabric/sdk/android/a/d/b;->bdU:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/d/b;->bee:J
 
     const/16 p1, 0x64
 
-    iput p1, p0, Lio/fabric/sdk/android/a/d/b;->bdT:I
+    iput p1, p0, Lio/fabric/sdk/android/a/d/b;->bed:I
 
     return-void
 .end method
 
-.method private Co()V
+.method private Cr()V
     .locals 3
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdV:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bef:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
@@ -192,7 +192,7 @@
 
 
 # virtual methods
-.method public final Cp()Ljava/util/List;
+.method public final Cs()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;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cu()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cx()Ljava/util/List;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Cq()V
+.method public final Ct()V
     .locals 2
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cv()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cy()Ljava/util/List;
 
     move-result-object v1
 
     invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/d/c;->T(Ljava/util/List;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cw()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cz()V
 
     return-void
 .end method
 
-.method public final Cr()V
+.method public final Cu()V
     .locals 8
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cv()Ljava/util/List;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cy()Ljava/util/List;
 
     move-result-object v0
 
@@ -365,7 +365,7 @@
 
     check-cast v3, Lio/fabric/sdk/android/a/d/b$a;
 
-    iget-object v3, v3, Lio/fabric/sdk/android/a/d/b$a;->uf:Ljava/io/File;
+    iget-object v3, v3, Lio/fabric/sdk/android/a/d/b$a;->ue:Ljava/io/File;
 
     invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -376,7 +376,7 @@
     if-ne v3, v2, :cond_2
 
     :cond_3
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
     invoke-interface {v1, v0}, Lio/fabric/sdk/android/a/d/c;->T(Ljava/util/List;)V
 
@@ -394,7 +394,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/d/c;->T(Ljava/util/List;)V
 
@@ -406,7 +406,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdV:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bef: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;->bdQ:Lio/fabric/sdk/android/a/d/a;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bea:Lio/fabric/sdk/android/a/d/a;
 
     invoke-interface {v0, p1}, Lio/fabric/sdk/android/a/d/a;->l(Ljava/lang/Object;)[B
 
@@ -436,7 +436,7 @@
 
     array-length v0, p1
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/d/b;->cs()I
 
@@ -456,9 +456,9 @@
 
     const/4 v3, 0x0
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v4}, Lio/fabric/sdk/android/a/d/c;->Cs()I
+    invoke-interface {v4}, Lio/fabric/sdk/android/a/d/c;->Cv()I
 
     move-result v4
 
@@ -501,7 +501,7 @@
     invoke-virtual {p0}, Lio/fabric/sdk/android/a/d/b;->co()Z
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec: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;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Ct()Z
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/d/c;->Cw()Z
 
     move-result v0
 
@@ -532,7 +532,7 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->bdS:Lio/fabric/sdk/android/a/d/c;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/d/b;->bec:Lio/fabric/sdk/android/a/d/c;
 
     invoke-interface {v3, v0}, Lio/fabric/sdk/android/a/d/c;->dm(Ljava/lang/String;)V
 
@@ -552,13 +552,13 @@
 
     invoke-static {v3, v0}, Lio/fabric/sdk/android/a/b/i;->w(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/b;->beb:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BW()J
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/b/k;->BZ()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lio/fabric/sdk/android/a/d/b;->bdU:J
+    iput-wide v2, p0, Lio/fabric/sdk/android/a/d/b;->bee:J
 
     goto :goto_0
 
@@ -566,7 +566,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Co()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/d/b;->Cr()V
 
     return v1
 .end method
@@ -577,7 +577,7 @@
 .method public cr()I
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/a/d/b;->bdT:I
+    iget v0, p0, Lio/fabric/sdk/android/a/d/b;->bed: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 f6f585bd77..b653223e9c 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 Cs()I
+.method public abstract Cv()I
 .end method
 
-.method public abstract Ct()Z
+.method public abstract Cw()Z
 .end method
 
-.method public abstract Cu()Ljava/util/List;
+.method public abstract Cx()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -21,7 +21,7 @@
     .end annotation
 .end method
 
-.method public abstract Cv()Ljava/util/List;
+.method public abstract Cy()Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -32,7 +32,7 @@
     .end annotation
 .end method
 
-.method public abstract Cw()V
+.method public abstract Cz()V
 .end method
 
 .method public abstract P(II)Z
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 698b0b872e..4519ab9ed6 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 bdX:Ljava/io/File;
+.field private final beh:Ljava/io/File;
 
-.field private final bdY:Ljava/lang/String;
+.field private final bei:Ljava/lang/String;
 
-.field private bdZ:Lio/fabric/sdk/android/a/b/u;
+.field private bej:Lio/fabric/sdk/android/a/b/u;
 
-.field private bea:Ljava/io/File;
+.field private bek:Ljava/io/File;
 
 .field private final context:Landroid/content/Context;
 
-.field private final tK:Ljava/io/File;
+.field private final tJ: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;->bdX:Ljava/io/File;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/h;->beh:Ljava/io/File;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/d/h;->bdY:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/d/h;->bei:Ljava/lang/String;
 
     new-instance p1, Ljava/io/File;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bdX:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->beh: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;->tK:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->tJ:Ljava/io/File;
 
     new-instance p1, Lio/fabric/sdk/android/a/b/u;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->tK:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->tJ: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;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
 
     new-instance p1, Ljava/io/File;
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->bdX:Ljava/io/File;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/d/h;->beh:Ljava/io/File;
 
-    iget-object p3, p0, Lio/fabric/sdk/android/a/d/h;->bdY:Ljava/lang/String;
+    iget-object p3, p0, Lio/fabric/sdk/android/a/d/h;->bei: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;->bea:Ljava/io/File;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bek:Ljava/io/File;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bea:Ljava/io/File;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bek: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;->bea:Ljava/io/File;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bek:Ljava/io/File;
 
     invoke-virtual {p1}, Ljava/io/File;->mkdirs()Z
 
@@ -96,22 +96,22 @@
     return-object v0
 .end method
 
-.method public final Cs()I
+.method public final Cv()I
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Cb()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
 
     move-result v0
 
     return v0
 .end method
 
-.method public final Ct()Z
+.method public final Cw()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
 
     invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->isEmpty()Z
 
@@ -120,7 +120,7 @@
     return v0
 .end method
 
-.method public final Cu()Ljava/util/List;
+.method public final Cx()Ljava/util/List;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -135,7 +135,7 @@
 
     invoke-direct {v0}, Ljava/util/ArrayList;-><init>()V
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/d/h;->bea:Ljava/io/File;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/d/h;->bek:Ljava/io/File;
 
     invoke-virtual {v1}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -166,7 +166,7 @@
     return-object v0
 .end method
 
-.method public final Cv()Ljava/util/List;
+.method public final Cy()Ljava/util/List;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -177,7 +177,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bea:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bek:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->listFiles()[Ljava/io/File;
 
@@ -190,18 +190,18 @@
     return-object v0
 .end method
 
-.method public final Cw()V
+.method public final Cz()V
     .locals 1
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej: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;->tK:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->tJ:Ljava/io/File;
 
     invoke-virtual {v0}, Ljava/io/File;->delete()Z
 
@@ -211,9 +211,9 @@
 .method public final P(II)Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Cb()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/u;->Ce()I
 
     move-result v0
 
@@ -303,15 +303,15 @@
 
     const-string v1, "Failed to close file input stream"
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->bej: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;->tK:Ljava/io/File;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/d/h;->tJ:Ljava/io/File;
 
     new-instance v3, Ljava/io/File;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/d/h;->bea:Ljava/io/File;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/d/h;->bek:Ljava/io/File;
 
     invoke-direct {v3, v4, p1}, Ljava/io/File;-><init>(Ljava/io/File;Ljava/lang/String;)V
 
@@ -345,11 +345,11 @@
 
     new-instance p1, Lio/fabric/sdk/android/a/b/u;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->tK:Ljava/io/File;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->tJ: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;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/d/h;->bej:Lio/fabric/sdk/android/a/b/u;
 
     return-void
 
@@ -381,7 +381,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bdZ:Lio/fabric/sdk/android/a/b/u;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/h;->bej: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 3ad7bfe233..4ad8686069 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 beb:Lio/fabric/sdk/android/a/d/e;
+.field private final bel: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;->beb:Lio/fabric/sdk/android/a/d/e;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/d/i;->bel: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;->u(Landroid/content/Context;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->beb:Lio/fabric/sdk/android/a/d/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->bel:Lio/fabric/sdk/android/a/d/e;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/d/e;->co()Z
 
@@ -45,7 +45,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->beb:Lio/fabric/sdk/android/a/d/e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/d/i;->bel:Lio/fabric/sdk/android/a/d/e;
 
     invoke-interface {v0}, Lio/fabric/sdk/android/a/d/e;->cp()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 9b4d64627e..3cfe465e74 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 bee:[I
+.field static final synthetic beo:[I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 4
 
-    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->CA()[I
+    invoke-static {}, Lio/fabric/sdk/android/a/e/c;->CD()[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;->bee:[I
+    sput-object v0, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
 
     const/4 v0, 0x1
 
     :try_start_0
-    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->bee:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bef:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bep: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;->bee:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->beg:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->beq: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;->bee:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->beh:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->ber: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;->bee:[I
+    sget-object v1, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
 
-    sget v2, Lio/fabric/sdk/android/a/e/c;->bei:I
+    sget v2, Lio/fabric/sdk/android/a/e/c;->bes: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 9f3d6f4d3b..5287cb308c 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 bbe:Lio/fabric/sdk/android/l;
+.field private final bbn:Lio/fabric/sdk/android/l;
 
-.field private bec:Lio/fabric/sdk/android/a/e/f;
+.field private bem:Lio/fabric/sdk/android/a/e/f;
 
-.field private bed:Z
+.field private ben: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;->bbe:Lio/fabric/sdk/android/l;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bbn:Lio/fabric/sdk/android/l;
 
     return-void
 .end method
 
-.method private declared-synchronized Cx()V
+.method private declared-synchronized CA()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;->bed:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->ben:Z
 
     const/4 v0, 0x0
 
@@ -69,7 +69,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized Cy()Ljavax/net/ssl/SSLSocketFactory;
+.method private declared-synchronized CB()Ljavax/net/ssl/SSLSocketFactory;
     .locals 1
 
     monitor-enter p0
@@ -79,11 +79,11 @@
 
     if-nez v0, :cond_0
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bed:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->ben:Z
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Cz()Ljavax/net/ssl/SSLSocketFactory;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->CC()Ljavax/net/ssl/SSLSocketFactory;
 
     move-result-object v0
 
@@ -106,7 +106,7 @@
     throw v0
 .end method
 
-.method private declared-synchronized Cz()Ljavax/net/ssl/SSLSocketFactory;
+.method private declared-synchronized CC()Ljavax/net/ssl/SSLSocketFactory;
     .locals 7
 
     monitor-enter p0
@@ -114,14 +114,14 @@
     const/4 v0, 0x1
 
     :try_start_0
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->bed:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/b;->ben: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;->bec:Lio/fabric/sdk/android/a/e/f;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bem:Lio/fabric/sdk/android/a/e/f;
 
     const-string v3, "TLS"
 
@@ -157,7 +157,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbe:Lio/fabric/sdk/android/l;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbn:Lio/fabric/sdk/android/l;
 
     const-string v3, "Fabric"
 
@@ -176,7 +176,7 @@
     move-exception v0
 
     :try_start_2
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbe:Lio/fabric/sdk/android/l;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/b;->bbn:Lio/fabric/sdk/android/l;
 
     const-string v3, "Fabric"
 
@@ -214,7 +214,7 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/b$1;->bee:[I
+    sget-object v0, Lio/fabric/sdk/android/a/e/b$1;->beo:[I
 
     const/4 v1, 0x1
 
@@ -295,17 +295,17 @@
     :goto_1
     if-eqz v1, :cond_5
 
-    iget-object p2, p0, Lio/fabric/sdk/android/a/e/b;->bec:Lio/fabric/sdk/android/a/e/f;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/b;->bem:Lio/fabric/sdk/android/a/e/f;
 
     if-eqz p2, :cond_5
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Cy()Ljavax/net/ssl/SSLSocketFactory;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->CB()Ljavax/net/ssl/SSLSocketFactory;
 
     move-result-object p2
 
     if-eqz p2, :cond_5
 
-    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->CF()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;->bec:Lio/fabric/sdk/android/a/e/f;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/b;->bem:Lio/fabric/sdk/android/a/e/f;
 
     if-eq v0, p1, :cond_0
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bec:Lio/fabric/sdk/android/a/e/f;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/b;->bem:Lio/fabric/sdk/android/a/e/f;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->Cx()V
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/b;->CA()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 3b46e6d487..9d3e431e21 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 bef:I = 0x1
+.field public static final bep:I = 0x1
 
-.field public static final beg:I = 0x2
+.field public static final beq:I = 0x2
 
-.field public static final beh:I = 0x3
+.field public static final ber:I = 0x3
 
-.field public static final bei:I = 0x4
+.field public static final bes:I = 0x4
 
-.field private static final synthetic bej:[I
+.field private static final synthetic bet:[I
 
 
 # direct methods
@@ -33,39 +33,39 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bef:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bep:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->beg:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->beq:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->beh:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->ber:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lio/fabric/sdk/android/a/e/c;->bei:I
+    sget v1, Lio/fabric/sdk/android/a/e/c;->bes:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/c;->bej:[I
+    sput-object v0, Lio/fabric/sdk/android/a/e/c;->bet:[I
 
     return-void
 .end method
 
-.method public static CA()[I
+.method public static CD()[I
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/c;->bej:[I
+    sget-object v0, Lio/fabric/sdk/android/a/e/c;->bet:[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 76cce62219..a4f1a0ebf2 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
@@ -23,22 +23,22 @@
 
 
 # instance fields
-.field final synthetic bev:Ljava/io/InputStream;
+.field final synthetic beF:Ljava/io/InputStream;
 
-.field final synthetic bew:Ljava/io/OutputStream;
+.field final synthetic beG:Ljava/io/OutputStream;
 
-.field final synthetic bex:Lio/fabric/sdk/android/a/e/d;
+.field final synthetic beH: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;->bex:Lio/fabric/sdk/android/a/e/d;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$1;->beH:Lio/fabric/sdk/android/a/e/d;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/e/d$1;->bev:Ljava/io/InputStream;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/e/d$1;->beF:Ljava/io/InputStream;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/e/d$1;->bew:Ljava/io/OutputStream;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/e/d$1;->beG: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;->bex:Lio/fabric/sdk/android/a/e/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->beH: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;->bev:Ljava/io/InputStream;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d$1;->beF: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;->bew:Ljava/io/OutputStream;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/d$1;->beG: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;->bex:Lio/fabric/sdk/android/a/e/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$1;->beH: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 cc627cbdc5..ab13352683 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 ber:Z
+.field private final beB:Z
 
-.field private final bey:Ljava/io/Closeable;
+.field private final beI: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;->bey:Ljava/io/Closeable;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$a;->beI:Ljava/io/Closeable;
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/e/d$a;->ber:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/e/d$a;->beB:Z
 
     return-void
 .end method
@@ -53,7 +53,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bey:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beI: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;->ber:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beB:Z
 
     if-eqz v0, :cond_1
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->bey:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beI: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;->bey:Ljava/io/Closeable;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$a;->beI: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 d4738fad00..8ba67641fd 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 bez:Lio/fabric/sdk/android/a/e/d$b;
+.field public static final beJ: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;->bez:Lio/fabric/sdk/android/a/e/d$b;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d$b;->beJ: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 7ecbb49741..31d3a2ae29 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 beA:Ljava/nio/charset/CharsetEncoder;
+.field private final beK:Ljava/nio/charset/CharsetEncoder;
 
 
 # direct methods
@@ -36,7 +36,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$e;->beA:Ljava/nio/charset/CharsetEncoder;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/d$e;->beK:Ljava/nio/charset/CharsetEncoder;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$e;->beA:Ljava/nio/charset/CharsetEncoder;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d$e;->beK: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 9ab8e5e438..fe04f412f9 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,29 +16,29 @@
 
 
 # static fields
-.field private static final bek:[Ljava/lang/String;
+.field private static final beu:[Ljava/lang/String;
 
-.field private static bel:Lio/fabric/sdk/android/a/e/d$b;
+.field private static bev:Lio/fabric/sdk/android/a/e/d$b;
 
 
 # instance fields
-.field private bem:Ljava/net/HttpURLConnection;
+.field private beA:Z
 
-.field public final ben:Ljava/net/URL;
+.field private beB:Z
 
-.field private final beo:Ljava/lang/String;
+.field private beC:Z
 
-.field private bep:Lio/fabric/sdk/android/a/e/d$e;
+.field private beD:Ljava/lang/String;
 
-.field private beq:Z
+.field private beE:I
 
-.field private ber:Z
+.field private bew:Ljava/net/HttpURLConnection;
 
-.field private bes:Z
+.field public final bex:Ljava/net/URL;
 
-.field private bet:Ljava/lang/String;
+.field private final bey:Ljava/lang/String;
 
-.field private beu:I
+.field private bez:Lio/fabric/sdk/android/a/e/d$e;
 
 .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;->bek:[Ljava/lang/String;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d;->beu:[Ljava/lang/String;
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/d$b;->bez:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d$b;->beJ:Lio/fabric/sdk/android/a/e/d$b;
 
-    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bel:Lio/fabric/sdk/android/a/e/d$b;
+    sput-object v0, Lio/fabric/sdk/android/a/e/d;->bev: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;->bem:Ljava/net/HttpURLConnection;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->ber:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beB:Z
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->bes:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beC:Z
 
     const/16 v0, 0x2000
 
@@ -95,11 +95,11 @@
 
     invoke-direct {v0, p1}, Ljava/net/URL;-><init>(Ljava/lang/String;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->ben:Ljava/net/URL;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bex:Ljava/net/URL;
     :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;->beo:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/e/d;->bey:Ljava/lang/String;
 
     return-void
 
@@ -113,17 +113,17 @@
     throw p2
 .end method
 
-.method private CB()Ljava/net/HttpURLConnection;
+.method private CE()Ljava/net/HttpURLConnection;
     .locals 7
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bet:Ljava/lang/String;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->beD:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bel:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bev:Lio/fabric/sdk/android/a/e/d$b;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->ben:Ljava/net/URL;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bex:Ljava/net/URL;
 
     new-instance v2, Ljava/net/Proxy;
 
@@ -131,9 +131,9 @@
 
     new-instance v4, Ljava/net/InetSocketAddress;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/a/e/d;->bet:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/e/d;->beD:Ljava/lang/String;
 
-    iget v6, p0, Lio/fabric/sdk/android/a/e/d;->beu:I
+    iget v6, p0, Lio/fabric/sdk/android/a/e/d;->beE:I
 
     invoke-direct {v4, v5, v6}, Ljava/net/InetSocketAddress;-><init>(Ljava/lang/String;I)V
 
@@ -146,16 +146,16 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bel:Lio/fabric/sdk/android/a/e/d$b;
+    sget-object v0, Lio/fabric/sdk/android/a/e/d;->bev:Lio/fabric/sdk/android/a/e/d$b;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->ben:Ljava/net/URL;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bex:Ljava/net/URL;
 
     invoke-interface {v0, v1}, Lio/fabric/sdk/android/a/e/d$b;->d(Ljava/net/URL;)Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
     :goto_0
-    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->beo:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bey:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->setRequestMethod(Ljava/lang/String;)V
     :try_end_0
@@ -173,7 +173,7 @@
     throw v1
 .end method
 
-.method private CF()Ljava/io/InputStream;
+.method private CI()Ljava/io/InputStream;
     .locals 3
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -181,7 +181,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CD()I
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CG()I
 
     move-result v0
 
@@ -190,7 +190,7 @@
     if-ge v0, v1, :cond_0
 
     :try_start_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -212,7 +212,7 @@
     throw v1
 
     :cond_0
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -223,7 +223,7 @@
     if-nez v0, :cond_1
 
     :try_start_1
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -246,7 +246,7 @@
 
     :cond_1
     :goto_0
-    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->bes:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->beC:Z
 
     if-eqz v1, :cond_3
 
@@ -290,7 +290,7 @@
     return-object v0
 .end method
 
-.method private CI()Lio/fabric/sdk/android/a/e/d;
+.method private CL()Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -298,14 +298,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez: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;->beq:Z
+    iget-boolean v1, p0, Lio/fabric/sdk/android/a/e/d;->beA:Z
 
     if-eqz v1, :cond_1
 
@@ -314,12 +314,12 @@
     invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d$e;->dr(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
 
     :cond_1
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->ber:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beB:Z
 
     if-eqz v0, :cond_2
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d$e;->close()V
     :try_end_0
@@ -328,7 +328,7 @@
     goto :goto_0
 
     :cond_2
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d$e;->close()V
 
@@ -336,12 +336,12 @@
     :goto_0
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     return-object p0
 .end method
 
-.method private CJ()Lio/fabric/sdk/android/a/e/d;
+.method private CM()Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -350,7 +350,7 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CI()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CL()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
     :try_end_0
@@ -368,7 +368,7 @@
     throw v1
 .end method
 
-.method private CK()Lio/fabric/sdk/android/a/e/d;
+.method private CN()Lio/fabric/sdk/android/a/e/d;
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -376,14 +376,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez: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;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -391,7 +391,7 @@
 
     invoke-virtual {v0, v1}, Ljava/net/HttpURLConnection;->setDoOutput(Z)V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     new-instance v1, Lio/fabric/sdk/android/a/e/d$e;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v2
 
@@ -421,12 +421,12 @@
 
     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;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iput-object v1, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     return-object p0
 .end method
 
-.method private CL()Lio/fabric/sdk/android/a/e/d;
+.method private CO()Lio/fabric/sdk/android/a/e/d;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -434,13 +434,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beq:Z
+    iget-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beA:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beq:Z
+    iput-boolean v0, p0, Lio/fabric/sdk/android/a/e/d;->beA:Z
 
     const-string v0, "multipart/form-data; boundary=00content0boundary00"
 
@@ -450,9 +450,9 @@
 
     move-result-object v0
 
-    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->CK()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {v0}, Lio/fabric/sdk/android/a/e/d;->CN()Lio/fabric/sdk/android/a/e/d;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     const-string v1, "--00content0boundary00\r\n"
 
@@ -461,7 +461,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     const-string v1, "\r\n--00content0boundary00\r\n"
 
@@ -1052,7 +1052,7 @@
 
     new-instance v6, Lio/fabric/sdk/android/a/e/d$1;
 
-    iget-boolean v3, p0, Lio/fabric/sdk/android/a/e/d;->ber:Z
+    iget-boolean v3, p0, Lio/fabric/sdk/android/a/e/d;->beB:Z
 
     move-object v0, v6
 
@@ -1119,9 +1119,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CJ()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CM()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()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;->CF()Ljava/io/InputStream;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CI()Ljava/io/InputStream;
 
     move-result-object v2
 
@@ -1218,9 +1218,9 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CK()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CN()Lio/fabric/sdk/android/a/e/d;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     invoke-interface {p1}, Ljava/lang/CharSequence;->toString()Ljava/lang/String;
 
@@ -1299,26 +1299,26 @@
 
 
 # virtual methods
-.method public final CC()Ljava/net/HttpURLConnection;
+.method public final CF()Ljava/net/HttpURLConnection;
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bem:Ljava/net/HttpURLConnection;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CB()Ljava/net/HttpURLConnection;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CE()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
-    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bem:Ljava/net/HttpURLConnection;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
 
     :cond_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bem:Ljava/net/HttpURLConnection;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/d;->bew:Ljava/net/HttpURLConnection;
 
     return-object v0
 .end method
 
-.method public final CD()I
+.method public final CG()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;->CI()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CL()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1351,7 +1351,7 @@
     throw v1
 .end method
 
-.method public final CE()Ljava/lang/String;
+.method public final CH()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -1378,10 +1378,10 @@
     return-object v0
 .end method
 
-.method public final CG()Lio/fabric/sdk/android/a/e/d;
+.method public final CJ()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1392,10 +1392,10 @@
     return-object p0
 .end method
 
-.method public final CH()Lio/fabric/sdk/android/a/e/d;
+.method public final CK()Lio/fabric/sdk/android/a/e/d;
     .locals 2
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1498,11 +1498,11 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CO()Lio/fabric/sdk/android/a/e/d;
 
     invoke-direct {p0, p1, p2, p3}, Lio/fabric/sdk/android/a/e/d;->i(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;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->bez: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;
     :try_end_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;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1569,9 +1569,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CJ()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CM()Lio/fabric/sdk/android/a/e/d;
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v0
 
@@ -1591,13 +1591,13 @@
     .end annotation
 
     :try_start_0
-    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CL()Lio/fabric/sdk/android/a/e/d;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/e/d;->CO()Lio/fabric/sdk/android/a/e/d;
 
     const/4 v0, 0x0
 
     invoke-direct {p0, p1, p2, v0}, Lio/fabric/sdk/android/a/e/d;->i(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;->bep:Lio/fabric/sdk/android/a/e/d$e;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/e/d;->bez:Lio/fabric/sdk/android/a/e/d$e;
 
     invoke-virtual {p1, p3}, Lio/fabric/sdk/android/a/e/d$e;->dr(Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d$e;
     :try_end_0
@@ -1622,7 +1622,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()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;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/e/d;->CF()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 9d009736d5..8ae8202cc4 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 beB:[Ljava/security/cert/X509Certificate;
+.field private static final beL:[Ljava/security/cert/X509Certificate;
 
 
 # instance fields
-.field private final beC:[Ljavax/net/ssl/TrustManager;
+.field private final beM:[Ljavax/net/ssl/TrustManager;
 
-.field private final beD:Lio/fabric/sdk/android/a/e/h;
+.field private final beN:Lio/fabric/sdk/android/a/e/h;
 
-.field private final beE:J
+.field private final beO:J
 
-.field private final beF:Ljava/util/List;
+.field private final beP:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -26,7 +26,7 @@
     .end annotation
 .end field
 
-.field private final beG:Ljava/util/Set;
+.field private final beQ: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;->beB:[Ljava/security/cert/X509Certificate;
+    sput-object v0, Lio/fabric/sdk/android/a/e/g;->beL:[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;->beF:Ljava/util/List;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beP: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;->beG:Ljava/util/Set;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beQ: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;->beC:[Ljavax/net/ssl/TrustManager;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beM:[Ljavax/net/ssl/TrustManager;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/g;->beD:Lio/fabric/sdk/android/a/e/h;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/g;->beN:Lio/fabric/sdk/android/a/e/h;
 
     const-wide/16 v0, -0x1
 
-    iput-wide v0, p0, Lio/fabric/sdk/android/a/e/g;->beE:J
+    iput-wide v0, p0, Lio/fabric/sdk/android/a/e/g;->beO:J
 
     invoke-interface {p2}, Lio/fabric/sdk/android/a/e/f;->da()[Ljava/lang/String;
 
@@ -96,7 +96,7 @@
 
     aget-object v1, p1, v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/a/e/g;->beF:Ljava/util/List;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/e/g;->beP:Ljava/util/List;
 
     invoke-static {v1}, Lio/fabric/sdk/android/a/e/g;->ds(Ljava/lang/String;)[B
 
@@ -139,7 +139,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beF:Ljava/util/List;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beP: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;->beH:Ljava/security/KeyStore;
+    iget-object p0, p0, Lio/fabric/sdk/android/a/e/h;->beR:Ljava/security/KeyStore;
 
     invoke-virtual {v0, p0}, Ljavax/net/ssl/TrustManagerFactory;->init(Ljava/security/KeyStore;)V
 
@@ -314,7 +314,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beG:Ljava/util/Set;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beQ: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;->beC:[Ljavax/net/ssl/TrustManager;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/g;->beM:[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;->beE:J
+    iget-wide v2, p0, Lio/fabric/sdk/android/a/e/g;->beO: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;->beE:J
+    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->beO:J
 
     sub-long/2addr v2, v4
 
@@ -371,7 +371,7 @@
 
     if-lez p2, :cond_2
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->beE:J
+    iget-wide v4, p0, Lio/fabric/sdk/android/a/e/g;->beO: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;->beD:Lio/fabric/sdk/android/a/e/h;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->beN: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;->beG:Ljava/util/Set;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/e/g;->beQ: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;->beB:[Ljava/security/cert/X509Certificate;
+    sget-object v0, Lio/fabric/sdk/android/a/e/g;->beL:[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 7be14bafac..ea9241e83c 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 beH:Ljava/security/KeyStore;
+.field final beR:Ljava/security/KeyStore;
 
-.field private final beI:Ljava/util/HashMap;
+.field private final beS: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;->beI:Ljava/util/HashMap;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/e/h;->beS:Ljava/util/HashMap;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/a/e/h;->beH:Ljava/security/KeyStore;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/e/h;->beR: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;->beI:Ljava/util/HashMap;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->beS: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;->beI:Ljava/util/HashMap;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/e/h;->beS: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 1df5488565..7ca3177859 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 beJ:Ljava/lang/String;
+.field private final beT:Ljava/lang/String;
 
-.field private final beK:Ljava/lang/String;
+.field private final beU: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;->beJ:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->beT: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;->beK:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/f/b;->beU:Ljava/lang/String;
 
     return-void
 
@@ -96,7 +96,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 2238f48513..87b02f8286 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,10 +4,10 @@
 
 
 # virtual methods
-.method public abstract CM()Landroid/content/SharedPreferences;
+.method public abstract CP()Landroid/content/SharedPreferences;
 .end method
 
-.method public abstract CN()Landroid/content/SharedPreferences$Editor;
+.method public abstract CQ()Landroid/content/SharedPreferences$Editor;
 .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 8c5020d387..ca2f10c8ad 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 beL:Ljava/lang/String;
+.field private final beV: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;->beL:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/f/d;->beV: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;->beL:Ljava/lang/String;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/f/d;->beV:Ljava/lang/String;
 
     const/4 v0, 0x0
 
@@ -72,7 +72,7 @@
 
 
 # virtual methods
-.method public final CM()Landroid/content/SharedPreferences;
+.method public final CP()Landroid/content/SharedPreferences;
     .locals 1
 
     iget-object v0, p0, Lio/fabric/sdk/android/a/f/d;->sharedPreferences:Landroid/content/SharedPreferences;
@@ -80,7 +80,7 @@
     return-object v0
 .end method
 
-.method public final CN()Landroid/content/SharedPreferences$Editor;
+.method public final CQ()Landroid/content/SharedPreferences$Editor;
     .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 9f41f1b2b8..cb675f7609 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;->beU:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfe: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;->beV:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bff: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;->beW:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfg: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;->beY:I
+    iget v1, p2, Lio/fabric/sdk/android/a/g/d;->bfi: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;->beZ:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfj: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;->bfa:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfk:Ljava/lang/String;
 
     const-string v3, "app[built_sdk_version]"
 
@@ -79,7 +79,7 @@
 
     move-result-object p1
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->beX:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfh:Ljava/lang/String;
 
     invoke-static {v1}, Lio/fabric/sdk/android/a/b/i;->Q(Ljava/lang/String;)Z
 
@@ -87,19 +87,19 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->beX:Ljava/lang/String;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfh:Ljava/lang/String;
 
     const-string v3, "app[instance_identifier]"
 
     invoke-virtual {p1, v3, v2, v1}, Lio/fabric/sdk/android/a/e/d;->j(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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v1, p2, Lio/fabric/sdk/android/a/g/d;->bfl: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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->px: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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v3, p2, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
-    iget v3, v3, Lio/fabric/sdk/android/a/g/n;->bfu:I
+    iget v3, v3, Lio/fabric/sdk/android/a/g/n;->bfE: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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p2, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
-    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acm:Ljava/lang/String;
+    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acv:Ljava/lang/String;
 
     invoke-virtual {p1, v3, v2, v4}, Lio/fabric/sdk/android/a/e/d;->j(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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->bfl: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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v5, p2, Lio/fabric/sdk/android/a/g/d;->bfl: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v7, p2, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
-    iget v7, v7, Lio/fabric/sdk/android/a/g/n;->bfu:I
+    iget v7, v7, Lio/fabric/sdk/android/a/g/n;->bfE: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;->bfc:Ljava/util/Collection;
+    iget-object v0, p2, Lio/fabric/sdk/android/a/g/d;->bfm:Ljava/util/Collection;
 
     if-eqz v0, :cond_2
 
-    iget-object p2, p2, Lio/fabric/sdk/android/a/g/d;->bfc:Ljava/util/Collection;
+    iget-object p2, p2, Lio/fabric/sdk/android/a/g/d;->bfm: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;->tt:Ljava/lang/String;
+    iget-object v5, v0, Lio/fabric/sdk/android/k;->ts:Ljava/lang/String;
 
     const/4 v6, 0x0
 
@@ -271,7 +271,7 @@
 
     move-result-object v1
 
-    iget-object v4, v0, Lio/fabric/sdk/android/k;->aSx:Ljava/lang/String;
+    iget-object v4, v0, Lio/fabric/sdk/android/k;->aSG:Ljava/lang/String;
 
     invoke-virtual {p1, v1, v2, v4}, Lio/fabric/sdk/android/a/e/d;->j(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
 
@@ -279,7 +279,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v4, v0, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
+    iget-object v4, v0, Lio/fabric/sdk/android/k;->ts: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;->bbu:Ljava/lang/String;
+    iget-object v0, v0, Lio/fabric/sdk/android/k;->bbD:Ljava/lang/String;
 
     invoke-virtual {p1, v1, v2, 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;
 
@@ -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;->BN()Lio/fabric/sdk/android/a/e/d;
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->BQ()Lio/fabric/sdk/android/a/e/d;
 
     move-result-object v0
 
-    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->qw:Ljava/lang/String;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->qv: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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/a;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->cc()Ljava/lang/String;
 
@@ -340,7 +340,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -364,11 +364,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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
     if-eqz v1, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -378,9 +378,9 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
-    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acm:Ljava/lang/String;
+    iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->acv:Ljava/lang/String;
 
     invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -390,7 +390,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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -400,7 +400,7 @@
 
     invoke-direct {v2, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
     iget v4, v4, Lio/fabric/sdk/android/a/g/n;->width:I
 
@@ -410,7 +410,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;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
     iget p1, p1, Lio/fabric/sdk/android/a/g/n;->height:I
 
@@ -423,11 +423,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;->CD()I
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CG()I
 
     move-result p1
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CC()Ljava/net/HttpURLConnection;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->CF()Ljava/net/HttpURLConnection;
 
     move-result-object v1
 
@@ -451,7 +451,7 @@
     const-string v1, "Update"
 
     :goto_0
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -479,7 +479,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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
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 db080b5c8f..eec5460481 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 beM:Ljava/lang/String;
+.field public final beW:Ljava/lang/String;
 
-.field public final beN:I
+.field public final beX:I
 
-.field public final beO:I
+.field public final beY:I
 
-.field public final beP:I
+.field public final beZ:I
 
-.field public final beQ:I
+.field public final bfa:I
 
-.field public final beR:Z
+.field public final bfb:Z
 
-.field public final beS:Z
+.field public final bfc:Z
 
-.field public final beT:Z
+.field public final bfd:Z
 
-.field public final pS:Z
+.field public final pR:Z
 
-.field public final qi:Z
+.field public final qh:Z
 
-.field public final qt:I
+.field public final qs:I
 
 
 # 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;->beM:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/b;->beW:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/b;->beN:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/b;->beX:I
 
-    iput p3, p0, Lio/fabric/sdk/android/a/g/b;->beO:I
+    iput p3, p0, Lio/fabric/sdk/android/a/g/b;->beY:I
 
-    iput p4, p0, Lio/fabric/sdk/android/a/g/b;->beP:I
+    iput p4, p0, Lio/fabric/sdk/android/a/g/b;->beZ:I
 
-    iput p5, p0, Lio/fabric/sdk/android/a/g/b;->beQ:I
+    iput p5, p0, Lio/fabric/sdk/android/a/g/b;->bfa:I
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/b;->beR:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/b;->bfb:Z
 
-    iput-boolean p7, p0, Lio/fabric/sdk/android/a/g/b;->qi:Z
+    iput-boolean p7, p0, Lio/fabric/sdk/android/a/g/b;->qh:Z
 
-    iput-boolean p8, p0, Lio/fabric/sdk/android/a/g/b;->beS:Z
+    iput-boolean p8, p0, Lio/fabric/sdk/android/a/g/b;->bfc:Z
 
-    iput-boolean p9, p0, Lio/fabric/sdk/android/a/g/b;->beT:Z
+    iput-boolean p9, p0, Lio/fabric/sdk/android/a/g/b;->bfd:Z
 
-    iput p10, p0, Lio/fabric/sdk/android/a/g/b;->qt:I
+    iput p10, p0, Lio/fabric/sdk/android/a/g/b;->qs:I
 
-    iput-boolean p11, p0, Lio/fabric/sdk/android/a/g/b;->pS:Z
+    iput-boolean p11, p0, Lio/fabric/sdk/android/a/g/b;->pR: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 d775505389..9ae7484a56 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 acm:Ljava/lang/String;
+.field public final acv: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;->acm:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/c;->acv: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 b761e622e4..eeca3e6a8e 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 beU:Ljava/lang/String;
+.field public final bfe:Ljava/lang/String;
 
-.field public final beV:Ljava/lang/String;
+.field public final bff:Ljava/lang/String;
 
-.field public final beW:Ljava/lang/String;
+.field public final bfg:Ljava/lang/String;
 
-.field public final beX:Ljava/lang/String;
+.field public final bfh:Ljava/lang/String;
 
-.field public final beY:I
+.field public final bfi:I
 
-.field public final beZ:Ljava/lang/String;
+.field public final bfj:Ljava/lang/String;
 
-.field public final bfa:Ljava/lang/String;
+.field public final bfk:Ljava/lang/String;
 
-.field public final bfb:Lio/fabric/sdk/android/a/g/n;
+.field public final bfl:Lio/fabric/sdk/android/a/g/n;
 
-.field public final bfc:Ljava/util/Collection;
+.field public final bfm: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 qw:Ljava/lang/String;
+.field public final qv: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;->qw:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/d;->qv:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/d;->beU:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/d;->bfe:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/d;->beV:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/d;->bff:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/d;->beW:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/d;->bfg:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/d;->beX:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/d;->bfh: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;->beY:I
+    iput p7, p0, Lio/fabric/sdk/android/a/g/d;->bfi:I
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/d;->beZ:Ljava/lang/String;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/d;->bfj:Ljava/lang/String;
 
-    iput-object p9, p0, Lio/fabric/sdk/android/a/g/d;->bfa:Ljava/lang/String;
+    iput-object p9, p0, Lio/fabric/sdk/android/a/g/d;->bfk:Ljava/lang/String;
 
-    iput-object p10, p0, Lio/fabric/sdk/android/a/g/d;->bfb:Lio/fabric/sdk/android/a/g/n;
+    iput-object p10, p0, Lio/fabric/sdk/android/a/g/d;->bfl:Lio/fabric/sdk/android/a/g/n;
 
-    iput-object p11, p0, Lio/fabric/sdk/android/a/g/d;->bfc:Ljava/util/Collection;
+    iput-object p11, p0, Lio/fabric/sdk/android/a/g/d;->bfm: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 c4bd61fe89..6babe6bab2 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,17 +4,17 @@
 
 
 # instance fields
-.field public final bfd:Ljava/lang/String;
+.field public final bfn:Ljava/lang/String;
 
-.field public final bfe:Ljava/lang/String;
+.field public final bfo:Ljava/lang/String;
 
-.field public final bff:Z
+.field public final bfp:Z
 
-.field public final bfg:Lio/fabric/sdk/android/a/g/c;
+.field public final bfq:Lio/fabric/sdk/android/a/g/c;
 
 .field public final status:Ljava/lang/String;
 
-.field public final tt:Ljava/lang/String;
+.field public final ts:Ljava/lang/String;
 
 .field public final url: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;->tt:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/e;->ts: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;->bfd:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/e;->bfn:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/e;->bfe:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/e;->bfo:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/e;->bff:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/e;->bfp:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/e;->bfg:Lio/fabric/sdk/android/a/g/c;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/e;->bfq: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 89655ca51a..803c0e871a 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 bfh:Ljava/lang/String;
+.field public final bfr:Ljava/lang/String;
 
-.field public final bfi:I
+.field public final bft: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;->bfh:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/f;->bfr:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/f;->bfi:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/f;->bft: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 8e9d5fcf00..68b9a17ab9 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 CO()Lorg/json/JSONObject;
+.method public abstract CR()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 63471e13a8..c8a9140591 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;->beg:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->beq: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 70c78ce5b3..ee14c0a994 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 py:Lio/fabric/sdk/android/i;
+.field private final px: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;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/i;->px:Lio/fabric/sdk/android/i;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final CO()Lorg/json/JSONObject;
+.method public final CR()Lorg/json/JSONObject;
     .locals 7
 
     const-string v0, "Error while closing settings cache file."
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->py:Lio/fabric/sdk/android/i;
+    iget-object v5, p0, Lio/fabric/sdk/android/a/g/i;->px: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->py:Lio/fabric/sdk/android/i;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/i;->px: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 d2ca3263cc..41b5b68ee1 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 bdR:Lio/fabric/sdk/android/a/b/k;
+.field private final beb:Lio/fabric/sdk/android/a/b/k;
 
-.field private final bfj:Lio/fabric/sdk/android/a/g/w;
+.field private final bfu:Lio/fabric/sdk/android/a/g/w;
 
-.field private final bfk:Lio/fabric/sdk/android/a/g/v;
+.field private final bfv:Lio/fabric/sdk/android/a/g/v;
 
-.field private final bfl:Lio/fabric/sdk/android/a/g/g;
+.field private final bfw:Lio/fabric/sdk/android/a/g/g;
 
-.field private final bfm:Lio/fabric/sdk/android/a/g/x;
+.field private final bfx:Lio/fabric/sdk/android/a/g/x;
 
-.field private final bfn:Lio/fabric/sdk/android/a/b/l;
+.field private final bfy:Lio/fabric/sdk/android/a/b/l;
 
-.field private final py:Lio/fabric/sdk/android/i;
+.field private final px:Lio/fabric/sdk/android/i;
 
-.field private final tF:Lio/fabric/sdk/android/a/f/c;
+.field private final tE: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;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->px:Lio/fabric/sdk/android/i;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/j;->bfj:Lio/fabric/sdk/android/a/g/w;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/j;->bfu:Lio/fabric/sdk/android/a/g/w;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/j;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/j;->beb:Lio/fabric/sdk/android/a/b/k;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/j;->bfk:Lio/fabric/sdk/android/a/g/v;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/j;->bfv:Lio/fabric/sdk/android/a/g/v;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/j;->bfl:Lio/fabric/sdk/android/a/g/g;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/j;->bfw:Lio/fabric/sdk/android/a/g/g;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/j;->bfm:Lio/fabric/sdk/android/a/g/x;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/j;->bfx:Lio/fabric/sdk/android/a/g/x;
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/j;->bfn:Lio/fabric/sdk/android/a/b/l;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/j;->bfy: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;->py:Lio/fabric/sdk/android/i;
+    iget-object p2, p0, Lio/fabric/sdk/android/a/g/j;->px: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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/j;->tE:Lio/fabric/sdk/android/a/f/c;
 
     return-void
 .end method
 
-.method private CQ()Ljava/lang/String;
+.method private CT()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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/a/g/j;->px: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;->bfM:Lio/fabric/sdk/android/a/g/r;
+    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bfW: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;->bfl:Lio/fabric/sdk/android/a/g/g;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->bfw:Lio/fabric/sdk/android/a/g/g;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/g/g;->CO()Lorg/json/JSONObject;
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/g/g;->CR()Lorg/json/JSONObject;
 
     move-result-object v2
 
     if-eqz v2, :cond_3
 
-    iget-object v3, p0, Lio/fabric/sdk/android/a/g/j;->bfk:Lio/fabric/sdk/android/a/g/v;
+    iget-object v3, p0, Lio/fabric/sdk/android/a/g/j;->bfv:Lio/fabric/sdk/android/a/g/v;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->beb: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;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iget-object v2, p0, Lio/fabric/sdk/android/a/g/j;->beb:Lio/fabric/sdk/android/a/b/k;
 
-    invoke-interface {v2}, Lio/fabric/sdk/android/a/b/k;->BW()J
+    invoke-interface {v2}, Lio/fabric/sdk/android/a/b/k;->BZ()J
 
     move-result-wide v4
 
-    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bfN:Lio/fabric/sdk/android/a/g/r;
+    sget-object v2, Lio/fabric/sdk/android/a/g/r;->bfX: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;->bfT:J
+    iget-wide v6, v3, Lio/fabric/sdk/android/a/g/t;->bgd:J
 
     cmp-long p1, v6, v4
 
@@ -150,7 +150,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -225,7 +225,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -254,10 +254,10 @@
 
 
 # virtual methods
-.method public final CP()Lio/fabric/sdk/android/a/g/t;
+.method public final CS()Lio/fabric/sdk/android/a/g/t;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bfL:Lio/fabric/sdk/android/a/g/r;
+    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bfV: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;->bfn:Lio/fabric/sdk/android/a/b/l;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfy:Lio/fabric/sdk/android/a/b/l;
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/l;->BX()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
 
     move-result v0
 
@@ -281,7 +281,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BC()Z
+    invoke-static {}, Lio/fabric/sdk/android/c;->BF()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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CM()Landroid/content/SharedPreferences;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CP()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;->CQ()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->CT()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;->bfm:Lio/fabric/sdk/android/a/g/x;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->bfx:Lio/fabric/sdk/android/a/g/x;
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfj:Lio/fabric/sdk/android/a/g/w;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfu: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;->bfk:Lio/fabric/sdk/android/a/g/v;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfv:Lio/fabric/sdk/android/a/g/v;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->bdR:Lio/fabric/sdk/android/a/b/k;
+    iget-object v4, p0, Lio/fabric/sdk/android/a/g/j;->beb: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;->bfl:Lio/fabric/sdk/android/a/g/g;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->bfw:Lio/fabric/sdk/android/a/g/g;
 
-    iget-wide v4, v2, Lio/fabric/sdk/android/a/g/t;->bfT:J
+    iget-wide v4, v2, Lio/fabric/sdk/android/a/g/t;->bgd:J
 
     invoke-interface {v0, v4, v5, p1}, Lio/fabric/sdk/android/a/g/g;->a(JLorg/json/JSONObject;)V
 
@@ -363,26 +363,26 @@
 
     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;->CQ()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/a/g/j;->CT()Ljava/lang/String;
 
     move-result-object p1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/j;->tE:Lio/fabric/sdk/android/a/f/c;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CN()Landroid/content/SharedPreferences$Editor;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/f/c;->CQ()Landroid/content/SharedPreferences$Editor;
 
     move-result-object v0
 
     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;->tF:Lio/fabric/sdk/android/a/f/c;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/j;->tE: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;->bfN:Lio/fabric/sdk/android/a/g/r;
+    sget-object p1, Lio/fabric/sdk/android/a/g/r;->bfX: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 438e9b3445..5da092c4c7 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;->bfW:Ljava/lang/String;
+    sget-object v4, Lio/fabric/sdk/android/a/g/u;->bgg: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;->BW()J
+    invoke-interface/range {p1 .. p1}, Lio/fabric/sdk/android/a/b/k;->BZ()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 96ffcae6a6..8ad02bc7f6 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;->bef:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->bep:I
 
     move-object v0, p0
 
@@ -61,7 +61,7 @@
     :catch_0
     move-exception v0
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -85,7 +85,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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -126,19 +126,19 @@
 
     const-string v5, "build_version"
 
-    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->beW:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bfg: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;->beV:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bff: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;->beY:I
+    iget v6, p1, Lio/fabric/sdk/android/a/g/w;->bfi:I
 
     invoke-static {v6}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
 
@@ -146,18 +146,18 @@
 
     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;->bga:Ljava/lang/String;
+    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bgk:Ljava/lang/String;
 
     if-eqz v5, :cond_0
 
     const-string v5, "icon_hash"
 
-    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bga:Ljava/lang/String;
+    iget-object v6, p1, Lio/fabric/sdk/android/a/g/w;->bgk: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;->bfZ:Ljava/lang/String;
+    iget-object v5, p1, Lio/fabric/sdk/android/a/g/w;->bgj:Ljava/lang/String;
 
     invoke-static {v5}, Lio/fabric/sdk/android/a/b/i;->Q(Ljava/lang/String;)Z
 
@@ -180,7 +180,7 @@
     :try_start_1
     const-string v6, "X-CRASHLYTICS-API-KEY"
 
-    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qw:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qv: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
 
@@ -192,7 +192,7 @@
 
     const-string v6, "X-CRASHLYTICS-API-CLIENT-VERSION"
 
-    iget-object v7, p0, Lio/fabric/sdk/android/a/g/l;->py:Lio/fabric/sdk/android/i;
+    iget-object v7, p0, Lio/fabric/sdk/android/a/g/l;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v7}, Lio/fabric/sdk/android/i;->cc()Ljava/lang/String;
 
@@ -208,29 +208,29 @@
 
     const-string v6, "X-CRASHLYTICS-DEVICE-MODEL"
 
-    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qY:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->qX: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;->bfX:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bgh: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;->bfY:Ljava/lang/String;
+    iget-object v7, p1, Lio/fabric/sdk/android/a/g/w;->bgi: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;->qU:Ljava/lang/String;
+    iget-object p1, p1, Lio/fabric/sdk/android/a/g/w;->qT: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -252,7 +252,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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -268,11 +268,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;->CD()I
+    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->CG()I
 
     move-result p1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -318,7 +318,7 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->CE()Ljava/lang/String;
+    invoke-virtual {v5}, Lio/fabric/sdk/android/a/e/d;->CH()Ljava/lang/String;
 
     move-result-object p1
 
@@ -331,7 +331,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -359,7 +359,7 @@
     :goto_2
     if-eqz v5, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -401,7 +401,7 @@
 
     :goto_4
     :try_start_2
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -413,7 +413,7 @@
 
     if-eqz v5, :cond_5
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object p1
 
@@ -433,7 +433,7 @@
     :goto_6
     if-eqz v5, :cond_6
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v3
 
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 c57713f4ef..8df6c677cc 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 bfo:Z
+.field public final bfA:Z
 
-.field public final bfp:Z
+.field public final bfB:Z
 
-.field public final bfq:Z
+.field public final bfC:Z
 
-.field public final bfr:Z
+.field public final bfD:Z
 
-.field public final bft:Z
+.field public final bfz: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;->bfo:Z
+    iput-boolean p1, p0, Lio/fabric/sdk/android/a/g/m;->bfz:Z
 
-    iput-boolean p2, p0, Lio/fabric/sdk/android/a/g/m;->bfp:Z
+    iput-boolean p2, p0, Lio/fabric/sdk/android/a/g/m;->bfA:Z
 
-    iput-boolean p3, p0, Lio/fabric/sdk/android/a/g/m;->bfq:Z
+    iput-boolean p3, p0, Lio/fabric/sdk/android/a/g/m;->bfB:Z
 
-    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/m;->bfr:Z
+    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/m;->bfC:Z
 
-    iput-boolean p5, p0, Lio/fabric/sdk/android/a/g/m;->bft:Z
+    iput-boolean p5, p0, Lio/fabric/sdk/android/a/g/m;->bfD: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 46db8406ff..c3fdbd5b03 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 acm:Ljava/lang/String;
+.field public final acv:Ljava/lang/String;
 
-.field public final bfu:I
+.field public final bfE: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;->acm:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/n;->acv:Ljava/lang/String;
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/n;->bfu:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/n;->bfE: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 2f6be06962..f3bc4f5d1f 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 bfv:Ljava/lang/String;
+.field public final bfF:Ljava/lang/String;
 
-.field public final bfw:Z
+.field public final bfG:Z
 
-.field public final bfx:Ljava/lang/String;
+.field public final bfH:Ljava/lang/String;
 
-.field public final bfy:Z
+.field public final bfI:Z
 
-.field public final bfz:Ljava/lang/String;
+.field public final bfJ: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;->bfv:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/o;->bfF:Ljava/lang/String;
 
-    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/o;->bfw:Z
+    iput-boolean p4, p0, Lio/fabric/sdk/android/a/g/o;->bfG:Z
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/o;->bfx:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/o;->bfH:Ljava/lang/String;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/o;->bfy:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/o;->bfI:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/o;->bfz:Ljava/lang/String;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/o;->bfJ: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 864d729dca..dd64fcdbbe 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 bfA:I
+.field public final bfK:I
 
-.field public final bfB:I
+.field public final bfL:I
 
-.field public final bfC:I
+.field public final bfM:I
 
-.field public final bfD:I
+.field public final bfN:I
 
-.field public final bfE:I
+.field public final bfO:I
 
-.field public final bfF:Z
+.field public final bfP:Z
 
-.field public final bfG:I
+.field public final bfQ: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;->bfA:I
+    iput p1, p0, Lio/fabric/sdk/android/a/g/p;->bfK:I
 
-    iput p2, p0, Lio/fabric/sdk/android/a/g/p;->bfB:I
+    iput p2, p0, Lio/fabric/sdk/android/a/g/p;->bfL:I
 
-    iput p3, p0, Lio/fabric/sdk/android/a/g/p;->bfC:I
+    iput p3, p0, Lio/fabric/sdk/android/a/g/p;->bfM:I
 
-    iput p4, p0, Lio/fabric/sdk/android/a/g/p;->bfD:I
+    iput p4, p0, Lio/fabric/sdk/android/a/g/p;->bfN:I
 
-    iput p5, p0, Lio/fabric/sdk/android/a/g/p;->bfE:I
+    iput p5, p0, Lio/fabric/sdk/android/a/g/p;->bfO:I
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/p;->bfF:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/a/g/p;->bfP:Z
 
-    iput p7, p0, Lio/fabric/sdk/android/a/g/p;->bfG:I
+    iput p7, p0, Lio/fabric/sdk/android/a/g/p;->bfQ: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 d00d69f130..ea387ff088 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 bfK:Lio/fabric/sdk/android/a/g/q;
+.field private static final bfU: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;->bfK:Lio/fabric/sdk/android/a/g/q;
+    sput-object v0, Lio/fabric/sdk/android/a/g/q$a;->bfU:Lio/fabric/sdk/android/a/g/q;
 
     return-void
 .end method
 
-.method public static synthetic CU()Lio/fabric/sdk/android/a/g/q;
+.method public static synthetic CX()Lio/fabric/sdk/android/a/g/q;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bfK:Lio/fabric/sdk/android/a/g/q;
+    sget-object v0, Lio/fabric/sdk/android/a/g/q$a;->bfU: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 b1d0fc2f53..cd3c268768 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 bfH:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bfR: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 bfI:Ljava/util/concurrent/CountDownLatch;
+.field private final bfS:Ljava/util/concurrent/CountDownLatch;
 
-.field private bfJ:Lio/fabric/sdk/android/a/g/s;
+.field private bfT: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;->bfH:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfR: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;->bfI:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfS: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;->bfH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfR: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;->bfI:Ljava/util/concurrent/CountDownLatch;
+    iget-object p1, p0, Lio/fabric/sdk/android/a/g/q;->bfS:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {p1}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
@@ -80,15 +80,15 @@
 
 
 # virtual methods
-.method public final CR()Lio/fabric/sdk/android/a/g/t;
+.method public final CU()Lio/fabric/sdk/android/a/g/t;
     .locals 3
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfI:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfS:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->await()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfH:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfR: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -116,15 +116,15 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized CS()Z
+.method public final declared-synchronized CV()Z
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfJ:Lio/fabric/sdk/android/a/g/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfT:Lio/fabric/sdk/android/a/g/s;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->CP()Lio/fabric/sdk/android/a/g/t;
+    invoke-interface {v0}, Lio/fabric/sdk/android/a/g/s;->CS()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 CT()Z
+.method public final declared-synchronized CW()Z
     .locals 5
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfJ:Lio/fabric/sdk/android/a/g/s;
+    iget-object v0, p0, Lio/fabric/sdk/android/a/g/q;->bfT:Lio/fabric/sdk/android/a/g/s;
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfM:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfW: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bfJ:Lio/fabric/sdk/android/a/g/s;
+    iget-object v2, v1, Lio/fabric/sdk/android/a/g/q;->bfT: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;->bbm:Ljava/lang/String;
+    iget-object v4, v3, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
 
     new-instance v5, Lio/fabric/sdk/android/a/b/g;
 
@@ -263,7 +263,7 @@
 
     move-result-object v12
 
-    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->Ca()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->Cd()Ljava/lang/String;
 
     move-result-object v5
 
@@ -305,7 +305,7 @@
 
     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;->BZ()Ljava/lang/String;
+    invoke-static {}, Lio/fabric/sdk/android/a/b/s;->Cc()Ljava/lang/String;
 
     move-result-object v13
 
@@ -321,7 +321,7 @@
 
     move-result-object v15
 
-    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->BY()Ljava/lang/String;
+    invoke-virtual/range {p2 .. p2}, Lio/fabric/sdk/android/a/b/s;->Cb()Ljava/lang/String;
 
     move-result-object v16
 
@@ -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;->bfJ:Lio/fabric/sdk/android/a/g/s;
+    iput-object v11, v1, Lio/fabric/sdk/android/a/g/q;->bfT: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 5cb80f8e9e..d0059a0d69 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 bfL:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bfV:Lio/fabric/sdk/android/a/g/r;
 
-.field public static final enum bfM:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bfW:Lio/fabric/sdk/android/a/g/r;
 
-.field public static final enum bfN:Lio/fabric/sdk/android/a/g/r;
+.field public static final enum bfX:Lio/fabric/sdk/android/a/g/r;
 
-.field private static final synthetic bfO:[Lio/fabric/sdk/android/a/g/r;
+.field private static final synthetic bfY:[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;->bfL:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfV: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;->bfM:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfW: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;->bfN:Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfX: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;->bfL:Lio/fabric/sdk/android/a/g/r;
+    sget-object v4, Lio/fabric/sdk/android/a/g/r;->bfV:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfM:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfW:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfN:Lio/fabric/sdk/android/a/g/r;
+    sget-object v1, Lio/fabric/sdk/android/a/g/r;->bfX:Lio/fabric/sdk/android/a/g/r;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfO:[Lio/fabric/sdk/android/a/g/r;
+    sput-object v0, Lio/fabric/sdk/android/a/g/r;->bfY:[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;->bfO:[Lio/fabric/sdk/android/a/g/r;
+    sget-object v0, Lio/fabric/sdk/android/a/g/r;->bfY:[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 63ba3814c9..3cccad7111 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 CP()Lio/fabric/sdk/android/a/g/t;
+.method public abstract CS()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 1df19b8520..0dd1df4efc 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 bfP:Lio/fabric/sdk/android/a/g/e;
+.field public final bfZ:Lio/fabric/sdk/android/a/g/e;
 
-.field public final bfQ:Lio/fabric/sdk/android/a/g/p;
+.field public final bga:Lio/fabric/sdk/android/a/g/p;
 
-.field public final bfR:Lio/fabric/sdk/android/a/g/m;
+.field public final bgb:Lio/fabric/sdk/android/a/g/m;
 
-.field public final bfS:Lio/fabric/sdk/android/a/g/f;
+.field public final bgc:Lio/fabric/sdk/android/a/g/f;
 
-.field public final bfT:J
+.field public final bgd:J
 
-.field public final bfU:I
+.field public final bge:I
 
-.field public final bfV:I
+.field public final bgf:I
 
-.field public final qv:Lio/fabric/sdk/android/a/g/b;
+.field public final qu:Lio/fabric/sdk/android/a/g/b;
 
-.field public final sH:Lio/fabric/sdk/android/a/g/o;
+.field public final sG: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;->bfT:J
+    iput-wide p1, p0, Lio/fabric/sdk/android/a/g/t;->bgd:J
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/t;->bfP:Lio/fabric/sdk/android/a/g/e;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/t;->bfZ:Lio/fabric/sdk/android/a/g/e;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/t;->bfQ:Lio/fabric/sdk/android/a/g/p;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/t;->bga:Lio/fabric/sdk/android/a/g/p;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/t;->sH:Lio/fabric/sdk/android/a/g/o;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/t;->sG:Lio/fabric/sdk/android/a/g/o;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/t;->bfR:Lio/fabric/sdk/android/a/g/m;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/t;->bgb:Lio/fabric/sdk/android/a/g/m;
 
-    iput p9, p0, Lio/fabric/sdk/android/a/g/t;->bfU:I
+    iput p9, p0, Lio/fabric/sdk/android/a/g/t;->bge:I
 
-    iput p10, p0, Lio/fabric/sdk/android/a/g/t;->bfV:I
+    iput p10, p0, Lio/fabric/sdk/android/a/g/t;->bgf:I
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/t;->qv:Lio/fabric/sdk/android/a/g/b;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/t;->qu:Lio/fabric/sdk/android/a/g/b;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/t;->bfS:Lio/fabric/sdk/android/a/g/f;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/t;->bgc: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 1471e18784..fc1debaeff 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 bfW:Ljava/lang/String;
+.field public static final bgg: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 e8231fdacd..cbb4c85df8 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 beV:Ljava/lang/String;
+.field public final bff:Ljava/lang/String;
 
-.field public final beW:Ljava/lang/String;
+.field public final bfg:Ljava/lang/String;
 
-.field public final beY:I
+.field public final bfi:I
 
-.field public final bfX:Ljava/lang/String;
+.field public final bgh:Ljava/lang/String;
 
-.field public final bfY:Ljava/lang/String;
+.field public final bgi:Ljava/lang/String;
 
-.field public final bfZ:Ljava/lang/String;
+.field public final bgj:Ljava/lang/String;
 
-.field public final bga:Ljava/lang/String;
+.field public final bgk:Ljava/lang/String;
 
-.field public final qU:Ljava/lang/String;
+.field public final qT:Ljava/lang/String;
 
-.field public final qY:Ljava/lang/String;
+.field public final qX:Ljava/lang/String;
 
-.field public final qw:Ljava/lang/String;
+.field public final qv: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;->qw:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/a/g/w;->qv:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/a/g/w;->qY:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/a/g/w;->qX:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/a/g/w;->bfX:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/a/g/w;->bgh:Ljava/lang/String;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/a/g/w;->bfY:Ljava/lang/String;
+    iput-object p4, p0, Lio/fabric/sdk/android/a/g/w;->bgi:Ljava/lang/String;
 
-    iput-object p5, p0, Lio/fabric/sdk/android/a/g/w;->qU:Ljava/lang/String;
+    iput-object p5, p0, Lio/fabric/sdk/android/a/g/w;->qT:Ljava/lang/String;
 
-    iput-object p6, p0, Lio/fabric/sdk/android/a/g/w;->bfZ:Ljava/lang/String;
+    iput-object p6, p0, Lio/fabric/sdk/android/a/g/w;->bgj:Ljava/lang/String;
 
-    iput-object p7, p0, Lio/fabric/sdk/android/a/g/w;->beV:Ljava/lang/String;
+    iput-object p7, p0, Lio/fabric/sdk/android/a/g/w;->bff:Ljava/lang/String;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/a/g/w;->beW:Ljava/lang/String;
+    iput-object p8, p0, Lio/fabric/sdk/android/a/g/w;->bfg:Ljava/lang/String;
 
-    iput p9, p0, Lio/fabric/sdk/android/a/g/w;->beY:I
+    iput p9, p0, Lio/fabric/sdk/android/a/g/w;->bfi:I
 
-    iput-object p10, p0, Lio/fabric/sdk/android/a/g/w;->bga:Ljava/lang/String;
+    iput-object p10, p0, Lio/fabric/sdk/android/a/g/w;->bgk: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 277dae1dd9..3ad561c99d 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;->beh:I
+    sget v5, Lio/fabric/sdk/android/a/e/c;->ber: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 1a810e0ff9..335f3089f4 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 baV:I
+.field private bbe:I
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     const/4 v0, 0x3
 
-    iput v0, p0, Lio/fabric/sdk/android/b;->baV:I
+    iput v0, p0, Lio/fabric/sdk/android/b;->bbe:I
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
     const/4 p1, 0x4
 
-    iput p1, p0, Lio/fabric/sdk/android/b;->baV:I
+    iput p1, p0, Lio/fabric/sdk/android/b;->bbe:I
 
     return-void
 .end method
@@ -128,7 +128,7 @@
 .method public final m(Ljava/lang/String;I)Z
     .locals 1
 
-    iget v0, p0, Lio/fabric/sdk/android/b;->baV:I
+    iget v0, p0, Lio/fabric/sdk/android/b;->bbe: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 9465ee1517..9a098ac660 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 bbg:Lio/fabric/sdk/android/c;
+.field final synthetic bbp: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;->bbg:Lio/fabric/sdk/android/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$1;->bbp:Lio/fabric/sdk/android/c;
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a$b;-><init>()V
 
@@ -34,7 +34,7 @@
 .method public final a(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbg:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbp:Lio/fabric/sdk/android/c;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
@@ -44,7 +44,7 @@
 .method public final onActivityResumed(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbg:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbp:Lio/fabric/sdk/android/c;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
@@ -54,7 +54,7 @@
 .method public final onActivityStarted(Landroid/app/Activity;)V
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbg:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$1;->bbp:Lio/fabric/sdk/android/c;
 
     invoke-virtual {v0, p1}, Lio/fabric/sdk/android/c;->h(Landroid/app/Activity;)Lio/fabric/sdk/android/c;
 
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 b6ac6ed4dc..8d34d1bda2 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 bbg:Lio/fabric/sdk/android/c;
+.field final synthetic bbp:Lio/fabric/sdk/android/c;
 
-.field final bbh:Ljava/util/concurrent/CountDownLatch;
+.field final bbq:Ljava/util/concurrent/CountDownLatch;
 
-.field final synthetic bbi:I
+.field final synthetic bbr: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;->bbg:Lio/fabric/sdk/android/c;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->bbp:Lio/fabric/sdk/android/c;
 
-    iput p2, p0, Lio/fabric/sdk/android/c$2;->bbi:I
+    iput p2, p0, Lio/fabric/sdk/android/c$2;->bbr: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;->bbi:I
+    iget p2, p0, Lio/fabric/sdk/android/c$2;->bbr:I
 
     invoke-direct {p1, p2}, Ljava/util/concurrent/CountDownLatch;-><init>(I)V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->bbh:Ljava/util/concurrent/CountDownLatch;
+    iput-object p1, p0, Lio/fabric/sdk/android/c$2;->bbq:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final BD()V
+.method public final BG()V
     .locals 5
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbh:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbq:Ljava/util/concurrent/CountDownLatch;
 
     invoke-virtual {v0}, Ljava/util/concurrent/CountDownLatch;->countDown()V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbh:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbq: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;->bbg:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbp: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;->bbg:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbp: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;->BD()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->BG()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;->bbg:Lio/fabric/sdk/android/c;
+    iget-object v0, p0, Lio/fabric/sdk/android/c$2;->bbp: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 46e868fd44..58fe24483a 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,7 +15,7 @@
 
 
 # instance fields
-.field baZ:Lio/fabric/sdk/android/f;
+.field bbi:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -25,17 +25,17 @@
     .end annotation
 .end field
 
-.field bbe:Lio/fabric/sdk/android/l;
+.field bbn:Lio/fabric/sdk/android/l;
 
-.field bbf:Z
+.field bbo:Z
 
-.field bbj:[Lio/fabric/sdk/android/i;
+.field bbs:[Lio/fabric/sdk/android/i;
 
-.field bbk:Lio/fabric/sdk/android/a/c/k;
+.field bbt:Lio/fabric/sdk/android/a/c/k;
 
-.field bbl:Ljava/lang/String;
+.field bbu:Ljava/lang/String;
 
-.field bbm:Ljava/lang/String;
+.field bbv: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 40cf903572..185477742d 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/c.smali
@@ -12,13 +12,13 @@
 
 
 # static fields
-.field static volatile baW:Lio/fabric/sdk/android/c;
+.field static volatile bbf:Lio/fabric/sdk/android/c;
 
-.field static final baX:Lio/fabric/sdk/android/l;
+.field static final bbg:Lio/fabric/sdk/android/l;
 
 
 # instance fields
-.field private final baY:Ljava/util/Map;
+.field private final bbh:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private final baZ:Lio/fabric/sdk/android/f;
+.field private final bbi:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final bba:Lio/fabric/sdk/android/f;
+.field private final bbj:Lio/fabric/sdk/android/f;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/f<",
@@ -51,9 +51,9 @@
     .end annotation
 .end field
 
-.field private bbb:Lio/fabric/sdk/android/a;
+.field private bbk:Lio/fabric/sdk/android/a;
 
-.field public bbc:Ljava/lang/ref/WeakReference;
+.field public bbl:Ljava/lang/ref/WeakReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ref/WeakReference<",
@@ -63,11 +63,11 @@
     .end annotation
 .end field
 
-.field private bbd:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private bbm:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bbe:Lio/fabric/sdk/android/l;
+.field final bbn:Lio/fabric/sdk/android/l;
 
-.field final bbf:Z
+.field final bbo:Z
 
 .field private final context:Landroid/content/Context;
 
@@ -75,7 +75,7 @@
 
 .field private final mainHandler:Landroid/os/Handler;
 
-.field private final rb:Lio/fabric/sdk/android/a/b/s;
+.field private final ra: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;->baX:Lio/fabric/sdk/android/l;
+    sput-object v0, Lio/fabric/sdk/android/c;->bbg: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;->baY:Ljava/util/Map;
+    iput-object p2, p0, Lio/fabric/sdk/android/c;->bbh: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;->bbe:Lio/fabric/sdk/android/l;
+    iput-object p5, p0, Lio/fabric/sdk/android/c;->bbn:Lio/fabric/sdk/android/l;
 
-    iput-boolean p6, p0, Lio/fabric/sdk/android/c;->bbf:Z
+    iput-boolean p6, p0, Lio/fabric/sdk/android/c;->bbo:Z
 
-    iput-object p7, p0, Lio/fabric/sdk/android/c;->baZ:Lio/fabric/sdk/android/f;
+    iput-object p7, p0, Lio/fabric/sdk/android/c;->bbi: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;->bbd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lio/fabric/sdk/android/c;->bbm: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;->bba:Lio/fabric/sdk/android/f;
+    iput-object p2, p0, Lio/fabric/sdk/android/c;->bbj:Lio/fabric/sdk/android/f;
 
-    iput-object p8, p0, Lio/fabric/sdk/android/c;->rb:Lio/fabric/sdk/android/a/b/s;
+    iput-object p8, p0, Lio/fabric/sdk/android/c;->ra: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;
 
     return-void
 .end method
 
-.method public static BB()Lio/fabric/sdk/android/l;
+.method public static BE()Lio/fabric/sdk/android/l;
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/c;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/c;->baX:Lio/fabric/sdk/android/l;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbg:Lio/fabric/sdk/android/l;
 
     return-object v0
 
     :cond_0
-    sget-object v0, Lio/fabric/sdk/android/c;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbe:Lio/fabric/sdk/android/l;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbn:Lio/fabric/sdk/android/l;
 
     return-object v0
 .end method
 
-.method public static BC()Z
+.method public static BF()Z
     .locals 1
 
-    sget-object v0, Lio/fabric/sdk/android/c;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf: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;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
 
-    iget-boolean v0, v0, Lio/fabric/sdk/android/c;->bbf:Z
+    iget-boolean v0, v0, Lio/fabric/sdk/android/c;->bbo:Z
 
     return v0
 .end method
@@ -208,13 +208,13 @@
         }
     .end annotation
 
-    sget-object v0, Lio/fabric/sdk/android/c;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lio/fabric/sdk/android/c;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf:Lio/fabric/sdk/android/c;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/c;->baY:Ljava/util/Map;
+    iget-object v0, v0, Lio/fabric/sdk/android/c;->bbh: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;->baW:Lio/fabric/sdk/android/c;
+    sget-object v0, Lio/fabric/sdk/android/c;->bbf: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;->baW:Lio/fabric/sdk/android/c;
+    sget-object v1, Lio/fabric/sdk/android/c;->bbf: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;->bbj:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbs:[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;->BX()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/a/b/l;->Ca()Z
 
     move-result p0
 
@@ -341,7 +341,7 @@
 
     if-nez v5, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbj:[Lio/fabric/sdk/android/i;
+    iput-object p1, v1, Lio/fabric/sdk/android/c$a;->bbs:[Lio/fabric/sdk/android/i;
 
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbk:Lio/fabric/sdk/android/a/c/k;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbt:Lio/fabric/sdk/android/a/c/k;
 
     if-nez p0, :cond_7
 
-    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Cn()Lio/fabric/sdk/android/a/c/k;
+    invoke-static {}, Lio/fabric/sdk/android/a/c/k;->Cq()Lio/fabric/sdk/android/a/c/k;
 
     move-result-object p0
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbk:Lio/fabric/sdk/android/a/c/k;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbt: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;->bbe:Lio/fabric/sdk/android/l;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbn:Lio/fabric/sdk/android/l;
 
     if-nez p0, :cond_a
 
-    iget-boolean p0, v1, Lio/fabric/sdk/android/c$a;->bbf:Z
+    iget-boolean p0, v1, Lio/fabric/sdk/android/c$a;->bbo: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;->bbe:Lio/fabric/sdk/android/l;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbn: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;->bbe:Lio/fabric/sdk/android/l;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbn:Lio/fabric/sdk/android/l;
 
     :cond_a
     :goto_3
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbm:Ljava/lang/String;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbv: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;->bbm:Ljava/lang/String;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbv:Ljava/lang/String;
 
     :cond_b
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->baZ:Lio/fabric/sdk/android/f;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbi:Lio/fabric/sdk/android/f;
 
     if-nez p0, :cond_c
 
-    sget-object p0, Lio/fabric/sdk/android/f;->bbq:Lio/fabric/sdk/android/f;
+    sget-object p0, Lio/fabric/sdk/android/f;->bbz:Lio/fabric/sdk/android/f;
 
-    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->baZ:Lio/fabric/sdk/android/f;
+    iput-object p0, v1, Lio/fabric/sdk/android/c$a;->bbi:Lio/fabric/sdk/android/f;
 
     :cond_c
-    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbj:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbs:[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;->bbj:[Lio/fabric/sdk/android/i;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbs:[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;->bbm:Ljava/lang/String;
+    iget-object p0, v1, Lio/fabric/sdk/android/c$a;->bbv:Ljava/lang/String;
 
-    iget-object p1, v1, Lio/fabric/sdk/android/c$a;->bbl:Ljava/lang/String;
+    iget-object p1, v1, Lio/fabric/sdk/android/c$a;->bbu: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;->bbk:Lio/fabric/sdk/android/a/c/k;
+    iget-object v6, v1, Lio/fabric/sdk/android/c$a;->bbt: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;->bbe:Lio/fabric/sdk/android/l;
+    iget-object v8, v1, Lio/fabric/sdk/android/c$a;->bbn:Lio/fabric/sdk/android/l;
 
-    iget-boolean v9, v1, Lio/fabric/sdk/android/c$a;->bbf:Z
+    iget-boolean v9, v1, Lio/fabric/sdk/android/c$a;->bbo:Z
 
-    iget-object v10, v1, Lio/fabric/sdk/android/c$a;->baZ:Lio/fabric/sdk/android/f;
+    iget-object v10, v1, Lio/fabric/sdk/android/c$a;->bbi: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;->baW:Lio/fabric/sdk/android/c;
+    sput-object p0, Lio/fabric/sdk/android/c;->bbf: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;->bbb:Lio/fabric/sdk/android/a;
+    iput-object p1, p0, Lio/fabric/sdk/android/c;->bbk:Lio/fabric/sdk/android/a;
 
-    iget-object p1, p0, Lio/fabric/sdk/android/c;->bbb:Lio/fabric/sdk/android/a;
+    iget-object p1, p0, Lio/fabric/sdk/android/c;->bbk: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;->baW:Lio/fabric/sdk/android/c;
+    sget-object p0, Lio/fabric/sdk/android/c;->bbf: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;->bbd:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p0, p0, Lio/fabric/sdk/android/c;->bbm: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;->bbt:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p1, Lio/fabric/sdk/android/i;->bbC: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;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v6, p1, Lio/fabric/sdk/android/i;->bbB:Lio/fabric/sdk/android/h;
 
-    iget-object v5, v5, Lio/fabric/sdk/android/i;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v5, v5, Lio/fabric/sdk/android/i;->bbB: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;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v4, p1, Lio/fabric/sdk/android/i;->bbB: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;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v3, v3, Lio/fabric/sdk/android/i;->bbB: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;->baY:Ljava/util/Map;
+    iget-object v1, p0, Lio/fabric/sdk/android/c;->bbh: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;->bbq:Lio/fabric/sdk/android/f;
+    sget-object v1, Lio/fabric/sdk/android/f;->bbz:Lio/fabric/sdk/android/f;
 
-    iget-object v3, p0, Lio/fabric/sdk/android/c;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v3, p0, Lio/fabric/sdk/android/c;->ra: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;->bba:Lio/fabric/sdk/android/f;
+    iget-object v4, p0, Lio/fabric/sdk/android/c;->bbj:Lio/fabric/sdk/android/f;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/c;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v5, p0, Lio/fabric/sdk/android/c;->ra: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v4, v1, Lio/fabric/sdk/android/i;->bbB:Lio/fabric/sdk/android/h;
 
-    iget-object v5, v2, Lio/fabric/sdk/android/m;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v5, v2, Lio/fabric/sdk/android/m;->bbB: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;->baY:Ljava/util/Map;
+    iget-object v4, p0, Lio/fabric/sdk/android/c;->bbh: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v0
 
@@ -947,7 +947,7 @@
 .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;->baZ:Lio/fabric/sdk/android/f;
+    iget-object p0, p0, Lio/fabric/sdk/android/c;->bbi:Lio/fabric/sdk/android/f;
 
     return-object p0
 .end method
@@ -961,7 +961,7 @@
 
     invoke-direct {v0, p1}, Ljava/lang/ref/WeakReference;-><init>(Ljava/lang/Object;)V
 
-    iput-object v0, p0, Lio/fabric/sdk/android/c;->bbc:Ljava/lang/ref/WeakReference;
+    iput-object v0, p0, Lio/fabric/sdk/android/c;->bbl: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 4c6aa28fde..f8aab24692 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 bbn:Ljava/lang/String;
+.field private final bbw:Ljava/lang/String;
 
-.field private final bbo:Ljava/lang/String;
+.field private final bbx: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;->bbo:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/d;->bbx:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/d;->bbn:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/d;->bbw:Ljava/lang/String;
 
     return-void
 .end method
@@ -33,7 +33,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbn:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbw: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;->bbn:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbw: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;->bbn:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbw: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;->bbn:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/d;->bbw: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;->bbn:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/d;->bbw: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;->bbo:Ljava/lang/String;
+    iget-object v1, p0, Lio/fabric/sdk/android/d;->bbx: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 52e2d6704e..09fae52665 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 bbp:Ljava/lang/String;
+.field final bby:Ljava/lang/String;
 
 
 # direct methods
@@ -29,12 +29,12 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/e;->bbp:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/e;->bby:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private static BE()Ljava/util/Map;
+.method private static BH()Ljava/util/Map;
     .locals 5
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -65,11 +65,11 @@
 
     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;->tt:Ljava/lang/String;
+    iget-object v2, v1, Lio/fabric/sdk/android/k;->ts: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -85,7 +85,7 @@
     return-object v0
 .end method
 
-.method private BF()Ljava/util/Map;
+.method private BI()Ljava/util/Map;
     .locals 8
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -109,7 +109,7 @@
 
     new-instance v1, Ljava/util/zip/ZipFile;
 
-    iget-object v2, p0, Lio/fabric/sdk/android/e;->bbp:Ljava/lang/String;
+    iget-object v2, p0, Lio/fabric/sdk/android/e;->bby:Ljava/lang/String;
 
     invoke-direct {v1, v2}, Ljava/util/zip/ZipFile;-><init>(Ljava/lang/String;)V
 
@@ -161,11 +161,11 @@
 
     if-eqz v3, :cond_0
 
-    iget-object v4, v3, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
+    iget-object v4, v3, Lio/fabric/sdk/android/k;->ts: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v4
 
@@ -175,13 +175,13 @@
 
     const/4 v6, 0x0
 
-    iget-object v7, v3, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
+    iget-object v7, v3, Lio/fabric/sdk/android/k;->ts:Ljava/lang/String;
 
     aput-object v7, v5, v6
 
     const/4 v6, 0x1
 
-    iget-object v3, v3, Lio/fabric/sdk/android/k;->aSx:Ljava/lang/String;
+    iget-object v3, v3, Lio/fabric/sdk/android/k;->aSG:Ljava/lang/String;
 
     aput-object v3, v5, v6
 
@@ -319,7 +319,7 @@
 
     :goto_0
     :try_start_3
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -373,19 +373,19 @@
 
     move-result-wide v1
 
-    invoke-static {}, Lio/fabric/sdk/android/e;->BE()Ljava/util/Map;
+    invoke-static {}, Lio/fabric/sdk/android/e;->BH()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;->BF()Ljava/util/Map;
+    invoke-direct {p0}, Lio/fabric/sdk/android/e;->BI()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 042cfd4bb3..9245654220 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 BD()V
+.method public final BG()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 1a85afe2cd..2bccee2949 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 bbq:Lio/fabric/sdk/android/f;
+.field public static final bbz: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;->bbq:Lio/fabric/sdk/android/f;
+    sput-object v0, Lio/fabric/sdk/android/f;->bbz:Lio/fabric/sdk/android/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract BD()V
+.method public abstract BG()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 65017d6d36..4402ab26ec 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 py:Lio/fabric/sdk/android/i;
+.field final px:Lio/fabric/sdk/android/i;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/i<",
@@ -41,7 +41,7 @@
 
     invoke-direct {p0}, Lio/fabric/sdk/android/a/c/f;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
+    iput-object p1, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
+    iget-object v2, p0, Lio/fabric/sdk/android/h;->px: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;->Cc()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cf()V
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final BG()V
+.method public final BJ()V
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -92,16 +92,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->baZ:Lio/fabric/sdk/android/f;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbi:Lio/fabric/sdk/android/f;
 
-    invoke-interface {v0}, Lio/fabric/sdk/android/f;->BD()V
+    invoke-interface {v0}, Lio/fabric/sdk/android/f;->BG()V
 
     return-void
 .end method
 
-.method public final BH()V
+.method public final BK()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;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->getIdentifier()Ljava/lang/String;
 
@@ -133,16 +133,16 @@
 
     invoke-direct {v1, v0}, Lio/fabric/sdk/android/g;-><init>(Ljava/lang/String;)V
 
-    iget-object v0, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
+    iget-object v0, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
 
-    iget-object v0, v0, Lio/fabric/sdk/android/i;->baZ:Lio/fabric/sdk/android/f;
+    iget-object v0, v0, Lio/fabric/sdk/android/i;->bbi: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 BI()Ljava/lang/Object;
+.method public final synthetic BL()Ljava/lang/Object;
     .locals 2
 
     const-string v0, "doInBackground"
@@ -157,7 +157,7 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->cf()Ljava/lang/Object;
 
@@ -169,7 +169,7 @@
     const/4 v1, 0x0
 
     :goto_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cd()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cg()V
 
     return-object v1
 .end method
@@ -177,7 +177,7 @@
 .method public final cT()I
     .locals 1
 
-    sget v0, Lio/fabric/sdk/android/a/c/e;->bdB:I
+    sget v0, Lio/fabric/sdk/android/a/c/e;->bdL:I
 
     return v0
 .end method
@@ -194,7 +194,7 @@
     move-result-object v0
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/h;->py:Lio/fabric/sdk/android/i;
+    iget-object v1, p0, Lio/fabric/sdk/android/h;->px:Lio/fabric/sdk/android/i;
 
     invoke-virtual {v1}, Lio/fabric/sdk/android/i;->ci()Z
 
@@ -204,11 +204,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;->Cd()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cg()V
 
     if-nez v1, :cond_0
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Cf()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Ci()Z
 
     :cond_0
     return-void
@@ -222,7 +222,7 @@
     move-exception v1
 
     :try_start_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -234,9 +234,9 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cd()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cg()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Cf()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Ci()Z
 
     return-void
 
@@ -249,9 +249,9 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
     :goto_0
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cd()V
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/b/x;->Cg()V
 
-    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Cf()Z
+    invoke-virtual {p0}, Lio/fabric/sdk/android/h;->Ci()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 451c1da61c..dccfc70ba3 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/i.smali
@@ -21,18 +21,9 @@
 
 
 # instance fields
-.field baZ:Lio/fabric/sdk/android/f;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lio/fabric/sdk/android/f<",
-            "TResult;>;"
-        }
-    .end annotation
-.end field
+.field public bbA:Lio/fabric/sdk/android/c;
 
-.field public bbr:Lio/fabric/sdk/android/c;
-
-.field public bbs:Lio/fabric/sdk/android/h;
+.field public bbB:Lio/fabric/sdk/android/h;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lio/fabric/sdk/android/h<",
@@ -41,11 +32,20 @@
     .end annotation
 .end field
 
-.field final bbt:Lio/fabric/sdk/android/a/c/d;
+.field final bbC:Lio/fabric/sdk/android/a/c/d;
+
+.field bbi:Lio/fabric/sdk/android/f;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lio/fabric/sdk/android/f<",
+            "TResult;>;"
+        }
+    .end annotation
+.end field
 
 .field public context:Landroid/content/Context;
 
-.field public rb:Lio/fabric/sdk/android/a/b/s;
+.field public ra: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;->bbs:Lio/fabric/sdk/android/h;
+    iput-object v0, p0, Lio/fabric/sdk/android/i;->bbB: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;->bbt:Lio/fabric/sdk/android/a/c/d;
+    iput-object v0, p0, Lio/fabric/sdk/android/i;->bbC:Lio/fabric/sdk/android/a/c/d;
 
     return-void
 .end method
 
-.method private BJ()Z
+.method private BM()Z
     .locals 1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbt:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbC: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;->BJ()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BM()Z
 
     move-result v0
 
@@ -105,7 +105,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbt:Lio/fabric/sdk/android/a/c/d;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbC: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;->bbr:Lio/fabric/sdk/android/c;
+    iput-object p2, p0, Lio/fabric/sdk/android/i;->bbA: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;->baZ:Lio/fabric/sdk/android/f;
+    iput-object p3, p0, Lio/fabric/sdk/android/i;->bbi:Lio/fabric/sdk/android/f;
 
-    iput-object p4, p0, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iput-object p4, p0, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
     return-void
 .end method
@@ -228,13 +228,13 @@
     return v2
 
     :cond_1
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BJ()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BM()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BJ()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BM()Z
 
     move-result v0
 
@@ -243,13 +243,13 @@
     return v1
 
     :cond_2
-    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BJ()Z
+    invoke-direct {p0}, Lio/fabric/sdk/android/i;->BM()Z
 
     move-result v0
 
     if-nez v0, :cond_3
 
-    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BJ()Z
+    invoke-direct {p1}, Lio/fabric/sdk/android/i;->BM()Z
 
     move-result p1
 
@@ -295,9 +295,9 @@
 .method final initialize()V
     .locals 5
 
-    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbs:Lio/fabric/sdk/android/h;
+    iget-object v0, p0, Lio/fabric/sdk/android/i;->bbB:Lio/fabric/sdk/android/h;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbr:Lio/fabric/sdk/android/c;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->bbA: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 9bd038c8f8..e4ab52e227 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/k.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field public final aSx:Ljava/lang/String;
+.field public final aSG:Ljava/lang/String;
 
-.field public final bbu:Ljava/lang/String;
+.field public final bbD:Ljava/lang/String;
 
-.field public final tt:Ljava/lang/String;
+.field public final ts:Ljava/lang/String;
 
 
 # direct methods
@@ -17,11 +17,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lio/fabric/sdk/android/k;->tt:Ljava/lang/String;
+    iput-object p1, p0, Lio/fabric/sdk/android/k;->ts:Ljava/lang/String;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/k;->aSx:Ljava/lang/String;
+    iput-object p2, p0, Lio/fabric/sdk/android/k;->aSG:Ljava/lang/String;
 
-    iput-object p3, p0, Lio/fabric/sdk/android/k;->bbu:Ljava/lang/String;
+    iput-object p3, p0, Lio/fabric/sdk/android/k;->bbD: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 5271b56bfe..be1d97e6e4 100644
--- a/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
+++ b/com.discord/smali_classes2/io/fabric/sdk/android/m.smali
@@ -14,25 +14,15 @@
 
 
 # instance fields
-.field private final bbA:Ljava/util/Collection;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/Collection<",
-            "Lio/fabric/sdk/android/i;",
-            ">;"
-        }
-    .end annotation
-.end field
+.field private bbE:Landroid/content/pm/PackageManager;
 
-.field private bbv:Landroid/content/pm/PackageManager;
+.field private bbF:Landroid/content/pm/PackageInfo;
 
-.field private bbw:Landroid/content/pm/PackageInfo;
+.field private bbG:Ljava/lang/String;
 
-.field private bbx:Ljava/lang/String;
+.field private bbH:Ljava/lang/String;
 
-.field private bby:Ljava/lang/String;
-
-.field private final bbz:Ljava/util/concurrent/Future;
+.field private final bbI:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -44,16 +34,26 @@
     .end annotation
 .end field
 
-.field private final pB:Lio/fabric/sdk/android/a/e/e;
+.field private final bbJ:Ljava/util/Collection;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/Collection<",
+            "Lio/fabric/sdk/android/i;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field private final pA:Lio/fabric/sdk/android/a/e/e;
 
 .field private packageName:Ljava/lang/String;
 
+.field private rb:Ljava/lang/String;
+
 .field private rc:Ljava/lang/String;
 
 .field private rd:Ljava/lang/String;
 
-.field private re:Ljava/lang/String;
-
 
 # direct methods
 .method public constructor <init>(Ljava/util/concurrent/Future;Ljava/util/Collection;)V
@@ -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;->pB:Lio/fabric/sdk/android/a/e/e;
+    iput-object v0, p0, Lio/fabric/sdk/android/m;->pA:Lio/fabric/sdk/android/a/e/e;
 
-    iput-object p1, p0, Lio/fabric/sdk/android/m;->bbz:Ljava/util/concurrent/Future;
+    iput-object p1, p0, Lio/fabric/sdk/android/m;->bbI:Ljava/util/concurrent/Future;
 
-    iput-object p2, p0, Lio/fabric/sdk/android/m;->bbA:Ljava/util/Collection;
+    iput-object p2, p0, Lio/fabric/sdk/android/m;->bbJ:Ljava/util/Collection;
 
     return-void
 .end method
 
-.method private BK()Lio/fabric/sdk/android/a/g/t;
+.method private BN()Lio/fabric/sdk/android/a/g/t;
     .locals 8
 
     :try_start_0
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    iget-object v2, p0, Lio/fabric/sdk/android/m;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v2, p0, Lio/fabric/sdk/android/m;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v3, p0, Lio/fabric/sdk/android/m;->pB:Lio/fabric/sdk/android/a/e/e;
+    iget-object v3, p0, Lio/fabric/sdk/android/m;->pA:Lio/fabric/sdk/android/a/e/e;
 
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->rb:Ljava/lang/String;
 
-    iget-object v5, p0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
+    iget-object v5, p0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BL()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BO()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;->CS()Z
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CV()Z
 
-    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CR()Lio/fabric/sdk/android/a/g/t;
+    invoke-virtual {v0}, Lio/fabric/sdk/android/a/g/q;->CU()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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v1
 
@@ -151,7 +151,7 @@
     return-object v0
 .end method
 
-.method private BL()Ljava/lang/String;
+.method private BO()Ljava/lang/String;
     .locals 2
 
     iget-object v0, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
@@ -206,7 +206,7 @@
 
     move-result-object v8
 
-    iget-object v1, v0, Lio/fabric/sdk/android/m;->re:Ljava/lang/String;
+    iget-object v1, v0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
 
     invoke-static {v1}, Lio/fabric/sdk/android/a/b/m;->di(Ljava/lang/String;)Lio/fabric/sdk/android/a/b/m;
 
@@ -214,19 +214,19 @@
 
     iget v10, v1, Lio/fabric/sdk/android/a/b/m;->id:I
 
-    iget-object v1, v0, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, v0, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    iget-object v5, v1, Lio/fabric/sdk/android/a/b/s;->bbm:Ljava/lang/String;
+    iget-object v5, v1, Lio/fabric/sdk/android/a/b/s;->bbv:Ljava/lang/String;
 
     new-instance v1, Lio/fabric/sdk/android/a/g/d;
 
-    iget-object v6, v0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
+    iget-object v6, v0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
 
-    iget-object v7, v0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
+    iget-object v7, v0, Lio/fabric/sdk/android/m;->rb:Ljava/lang/String;
 
-    iget-object v9, v0, Lio/fabric/sdk/android/m;->bbx:Ljava/lang/String;
+    iget-object v9, v0, Lio/fabric/sdk/android/m;->bbG:Ljava/lang/String;
 
-    iget-object v11, v0, Lio/fabric/sdk/android/m;->bby:Ljava/lang/String;
+    iget-object v11, v0, Lio/fabric/sdk/android/m;->bbH:Ljava/lang/String;
 
     const-string v12, "0"
 
@@ -325,7 +325,7 @@
 
     move-result-object v1
 
-    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BK()Lio/fabric/sdk/android/a/g/t;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BN()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;->bbz:Ljava/util/concurrent/Future;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->bbI:Ljava/util/concurrent/Future;
 
     if-eqz v4, :cond_0
 
-    iget-object v4, p0, Lio/fabric/sdk/android/m;->bbz:Ljava/util/concurrent/Future;
+    iget-object v4, p0, Lio/fabric/sdk/android/m;->bbI: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;->bbA:Ljava/util/Collection;
+    iget-object v5, p0, Lio/fabric/sdk/android/m;->bbJ: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;->bfP:Lio/fabric/sdk/android/a/g/e;
+    iget-object v2, v2, Lio/fabric/sdk/android/a/g/t;->bfZ: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;->BL()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BO()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;->pB:Lio/fabric/sdk/android/a/e/e;
+    iget-object v6, p0, Lio/fabric/sdk/android/m;->pA: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;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CT()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CW()Z
 
     move-result v0
 
     goto :goto_1
 
     :cond_1
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->CU()Lio/fabric/sdk/android/a/g/q;
+    invoke-static {}, Lio/fabric/sdk/android/a/g/q$a;->CX()Lio/fabric/sdk/android/a/g/q;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CT()Z
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/g/q;->CW()Z
 
     move-result v0
 
@@ -454,11 +454,11 @@
     goto :goto_2
 
     :cond_3
-    iget-boolean v6, v2, Lio/fabric/sdk/android/a/g/e;->bff:Z
+    iget-boolean v6, v2, Lio/fabric/sdk/android/a/g/e;->bfp:Z
 
     if-eqz v6, :cond_4
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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;->BL()Ljava/lang/String;
+    invoke-direct {p0}, Lio/fabric/sdk/android/m;->BO()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;->pB:Lio/fabric/sdk/android/a/e/e;
+    iget-object v7, p0, Lio/fabric/sdk/android/m;->pA: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;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()Lio/fabric/sdk/android/l;
 
     move-result-object v2
 
@@ -543,13 +543,13 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lio/fabric/sdk/android/i;->rb:Lio/fabric/sdk/android/a/b/s;
+    iget-object v1, p0, Lio/fabric/sdk/android/i;->ra:Lio/fabric/sdk/android/a/b/s;
 
-    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Ca()Ljava/lang/String;
+    invoke-virtual {v1}, Lio/fabric/sdk/android/a/b/s;->Cd()Ljava/lang/String;
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->re:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->rd:Ljava/lang/String;
 
     iget-object v1, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -557,7 +557,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbv:Landroid/content/pm/PackageManager;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbE:Landroid/content/pm/PackageManager;
 
     iget-object v1, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -567,7 +567,7 @@
 
     iput-object v1, p0, Lio/fabric/sdk/android/m;->packageName:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbv:Landroid/content/pm/PackageManager;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbE:Landroid/content/pm/PackageManager;
 
     iget-object v2, p0, Lio/fabric/sdk/android/m;->packageName:Ljava/lang/String;
 
@@ -575,9 +575,9 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbw:Landroid/content/pm/PackageInfo;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbF:Landroid/content/pm/PackageInfo;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbw:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbF:Landroid/content/pm/PackageInfo;
 
     iget v1, v1, Landroid/content/pm/PackageInfo;->versionCode:I
 
@@ -585,9 +585,9 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->rb:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbw:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbF:Landroid/content/pm/PackageInfo;
 
     iget-object v1, v1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String;
 
@@ -598,14 +598,14 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbw:Landroid/content/pm/PackageInfo;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbF: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;->rd:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->rc:Ljava/lang/String;
 
-    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbv:Landroid/content/pm/PackageManager;
+    iget-object v1, p0, Lio/fabric/sdk/android/m;->bbE:Landroid/content/pm/PackageManager;
 
     iget-object v2, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -621,7 +621,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbx:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbG:Ljava/lang/String;
 
     iget-object v1, p0, Lio/fabric/sdk/android/i;->context:Landroid/content/Context;
 
@@ -635,7 +635,7 @@
 
     move-result-object v1
 
-    iput-object v1, p0, Lio/fabric/sdk/android/m;->bby:Ljava/lang/String;
+    iput-object v1, p0, Lio/fabric/sdk/android/m;->bbH:Ljava/lang/String;
     :try_end_0
     .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
 
@@ -646,7 +646,7 @@
     :catch_0
     move-exception v1
 
-    invoke-static {}, Lio/fabric/sdk/android/c;->BB()Lio/fabric/sdk/android/l;
+    invoke-static {}, Lio/fabric/sdk/android/c;->BE()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 4b21dc8c25..85b728ff97 100644
--- a/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
+++ b/com.discord/smali_classes2/jp/wasabeef/fresco/a/a.smali
@@ -4,15 +4,15 @@
 
 
 # static fields
-.field private static bgb:I = 0x19
+.field private static bgl:I = 0x19
 
-.field private static bgc:I = 0x1
+.field private static bgm:I = 0x1
 
 
 # instance fields
-.field private bgd:I
+.field private bgn:I
 
-.field private bge:I
+.field private bgo: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;->bgc:I
+    sget v0, Ljp/wasabeef/fresco/a/a;->bgm:I
 
     const/16 v1, 0xa
 
@@ -49,9 +49,9 @@
 
     const/16 p1, 0xa
 
-    iput p1, p0, Ljp/wasabeef/fresco/a/a;->bgd:I
+    iput p1, p0, Ljp/wasabeef/fresco/a/a;->bgn:I
 
-    iput p3, p0, Ljp/wasabeef/fresco/a/a;->bge:I
+    iput p3, p0, Ljp/wasabeef/fresco/a/a;->bgo:I
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgd:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgn:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -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;->bge:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgo: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;->bge:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgo: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;->bge:I
+    iget v2, p0, Ljp/wasabeef/fresco/a/a;->bgo:I
 
     int-to-float v3, v2
 
@@ -166,7 +166,7 @@
     :try_start_0
     iget-object p2, p0, Ljp/wasabeef/fresco/a/a;->context:Landroid/content/Context;
 
-    iget v1, p0, Ljp/wasabeef/fresco/a/a;->bgd:I
+    iget v1, p0, Ljp/wasabeef/fresco/a/a;->bgn:I
 
     invoke-static {p2, v0, v1}, Ljp/wasabeef/fresco/a/a/b;->a(Landroid/content/Context;Landroid/graphics/Bitmap;I)Landroid/graphics/Bitmap;
 
@@ -178,7 +178,7 @@
 
     :catch_0
     :cond_0
-    iget p2, p0, Ljp/wasabeef/fresco/a/a;->bgd:I
+    iget p2, p0, Ljp/wasabeef/fresco/a/a;->bgn:I
 
     invoke-static {v0, p2}, Ljp/wasabeef/fresco/a/a/a;->a(Landroid/graphics/Bitmap;I)Landroid/graphics/Bitmap;
 
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 707c3d877a..4ce3a42f40 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 public bgg:Ljava/util/List;
+.field public bgq: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, Ljp/wasabeef/fresco/a/c$a;->bgg:Ljava/util/List;
+    iput-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bgq:Ljava/util/List;
 
     return-void
 .end method
@@ -46,7 +46,7 @@
 .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;->bgg:Ljava/util/List;
+    iget-object v0, p0, Ljp/wasabeef/fresco/a/c$a;->bgq: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 a20e07bb72..2c823f4a28 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 bgf:Ljava/util/List;
+.field private bgp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,7 +37,7 @@
 
     invoke-direct {p0}, Lcom/facebook/imagepipeline/request/a;-><init>()V
 
-    iput-object p1, p0, Ljp/wasabeef/fresco/a/c;->bgf:Ljava/util/List;
+    iput-object p1, p0, Ljp/wasabeef/fresco/a/c;->bgp:Ljava/util/List;
 
     return-void
 .end method
@@ -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;->bgf:Ljava/util/List;
+    iget-object p2, p0, Ljp/wasabeef/fresco/a/c;->bgp: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 c759827c3c..b35845d99d 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 bgF:Lkotlin/a/aa;
+.field public static final bgP: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;->bgF:Lkotlin/a/aa;
+    sput-object v0, Lkotlin/a/aa;->bgP: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;->bgF:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgP:Lkotlin/a/aa;
 
     return-object v0
 .end method
@@ -180,7 +180,7 @@
 .method public final iterator()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bgC:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgM: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 dfd5c85d4d..118968358f 100644
--- a/com.discord/smali_classes2/kotlin/a/ag.smali
+++ b/com.discord/smali_classes2/kotlin/a/ag.smali
@@ -18,7 +18,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/z;->bgE:Lkotlin/a/z;
+    sget-object v0, Lkotlin/a/z;->bgO: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 8b7aba3e51..315e8f3cd2 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 bgG:Ljava/util/List;
+.field private final bgQ: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;->bgG:Ljava/util/List;
+    iput-object p1, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->access$reversePositionIndex(Ljava/util/List;I)I
 
@@ -72,7 +72,7 @@
 .method public final clear()V
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->clear()V
 
@@ -87,7 +87,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->access$reverseElementIndex(Ljava/util/List;I)I
 
@@ -103,7 +103,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->size()I
 
@@ -120,7 +120,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->access$reverseElementIndex(Ljava/util/List;I)I
 
@@ -141,7 +141,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/ai;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/ai;->bgQ:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->access$reverseElementIndex(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 4536f3be0c..3efb0febc0 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 bgG:Ljava/util/List;
+.field private final bgQ: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;->bgG:Ljava/util/List;
+    iput-object p1, p0, Lkotlin/a/aj;->bgQ:Ljava/util/List;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/aj;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/aj;->bgQ:Ljava/util/List;
 
     invoke-static {p0, p1}, Lkotlin/a/u;->access$reverseElementIndex(Ljava/util/List;I)I
 
@@ -74,7 +74,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/aj;->bgG:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/a/aj;->bgQ: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 03aee5153a..761e4ef9d1 100644
--- a/com.discord/smali_classes2/kotlin/a/am.smali
+++ b/com.discord/smali_classes2/kotlin/a/am.smali
@@ -16,7 +16,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bgF:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgP:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
diff --git a/com.discord/smali_classes2/kotlin/a/an.smali b/com.discord/smali_classes2/kotlin/a/an.smali
index 84cade5537..42c5eb9446 100644
--- a/com.discord/smali_classes2/kotlin/a/an.smali
+++ b/com.discord/smali_classes2/kotlin/a/an.smali
@@ -104,6 +104,81 @@
     return-object v0
 .end method
 
+.method public static final plus(Ljava/util/Set;Ljava/lang/Iterable;)Ljava/util/Set;
+    .locals 2
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "<T:",
+            "Ljava/lang/Object;",
+            ">(",
+            "Ljava/util/Set<",
+            "+TT;>;",
+            "Ljava/lang/Iterable<",
+            "+TT;>;)",
+            "Ljava/util/Set<",
+            "TT;>;"
+        }
+    .end annotation
+
+    const-string v0, "$this$plus"
+
+    invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const-string v0, "elements"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {p1}, Lkotlin/a/m;->collectionSizeOrNull(Ljava/lang/Iterable;)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_0
+
+    check-cast v0, Ljava/lang/Number;
+
+    invoke-virtual {v0}, Ljava/lang/Number;->intValue()I
+
+    move-result v0
+
+    invoke-interface {p0}, Ljava/util/Set;->size()I
+
+    move-result v1
+
+    add-int/2addr v1, v0
+
+    goto :goto_0
+
+    :cond_0
+    invoke-interface {p0}, Ljava/util/Set;->size()I
+
+    move-result v0
+
+    mul-int/lit8 v1, v0, 0x2
+
+    :goto_0
+    invoke-static {v1}, Lkotlin/a/ad;->mapCapacity(I)I
+
+    move-result v0
+
+    new-instance v1, Ljava/util/LinkedHashSet;
+
+    invoke-direct {v1, v0}, Ljava/util/LinkedHashSet;-><init>(I)V
+
+    check-cast p0, Ljava/util/Collection;
+
+    invoke-virtual {v1, p0}, Ljava/util/LinkedHashSet;->addAll(Ljava/util/Collection;)Z
+
+    move-object p0, v1
+
+    check-cast p0, Ljava/util/Collection;
+
+    invoke-static {p0, p1}, Lkotlin/a/m;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z
+
+    check-cast v1, Ljava/util/Set;
+
+    return-object v1
+.end method
+
 .method public static final plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
diff --git a/com.discord/smali_classes2/kotlin/a/ap.smali b/com.discord/smali_classes2/kotlin/a/ap.smali
index 89d2ff590d..e64baaacf3 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 bgH:I
+.field public static final bgR:I
 
-.field public static final bgI:I
+.field public static final bgS:I
 
-.field public static final bgJ:I
+.field public static final bgT:I
 
-.field public static final bgK:I
+.field public static final bgU:I
 
-.field private static final synthetic bgL:[I
+.field private static final synthetic bgV:[I
 
 
 # direct methods
@@ -37,19 +37,19 @@
 
     const/4 v2, 0x1
 
-    sput v2, Lkotlin/a/ap;->bgH:I
+    sput v2, Lkotlin/a/ap;->bgR:I
 
     const/4 v2, 0x2
 
-    sput v2, Lkotlin/a/ap;->bgI:I
+    sput v2, Lkotlin/a/ap;->bgS:I
 
     const/4 v2, 0x3
 
-    sput v2, Lkotlin/a/ap;->bgJ:I
+    sput v2, Lkotlin/a/ap;->bgT:I
 
-    sput v0, Lkotlin/a/ap;->bgK:I
+    sput v0, Lkotlin/a/ap;->bgU:I
 
-    sput-object v1, Lkotlin/a/ap;->bgL:[I
+    sput-object v1, Lkotlin/a/ap;->bgV:[I
 
     return-void
 
@@ -65,7 +65,7 @@
 .method public static values$27e17860()[I
     .locals 1
 
-    sget-object v0, Lkotlin/a/ap;->bgL:[I
+    sget-object v0, Lkotlin/a/ap;->bgV:[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 a383ac6ecb..0b9817788a 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 private bgr:I
+.field private bgB:I
 
-.field private bgs:Ljava/lang/Object;
+.field private bgC:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -39,9 +39,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget v0, Lkotlin/a/ap;->bgI:I
+    sget v0, Lkotlin/a/ap;->bgS:I
 
-    iput v0, p0, Lkotlin/a/b;->bgr:I
+    iput v0, p0, Lkotlin/a/b;->bgB:I
 
     return-void
 .end method
@@ -56,11 +56,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/b;->bgs:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/b;->bgC:Ljava/lang/Object;
 
-    sget p1, Lkotlin/a/ap;->bgH:I
+    sget p1, Lkotlin/a/ap;->bgR:I
 
-    iput p1, p0, Lkotlin/a/b;->bgr:I
+    iput p1, p0, Lkotlin/a/b;->bgB:I
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 .method protected final done()V
     .locals 1
 
-    sget v0, Lkotlin/a/ap;->bgJ:I
+    sget v0, Lkotlin/a/ap;->bgT:I
 
-    iput v0, p0, Lkotlin/a/b;->bgr:I
+    iput v0, p0, Lkotlin/a/b;->bgB:I
 
     return-void
 .end method
@@ -81,9 +81,9 @@
 .method public hasNext()Z
     .locals 4
 
-    iget v0, p0, Lkotlin/a/b;->bgr:I
+    iget v0, p0, Lkotlin/a/b;->bgB:I
 
-    sget v1, Lkotlin/a/ap;->bgK:I
+    sget v1, Lkotlin/a/ap;->bgU:I
 
     const/4 v2, 0x0
 
@@ -101,7 +101,7 @@
     :goto_0
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lkotlin/a/b;->bgr:I
+    iget v0, p0, Lkotlin/a/b;->bgB:I
 
     sget-object v1, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
@@ -115,15 +115,15 @@
 
     if-eq v0, v1, :cond_2
 
-    sget v0, Lkotlin/a/ap;->bgK:I
+    sget v0, Lkotlin/a/ap;->bgU:I
 
-    iput v0, p0, Lkotlin/a/b;->bgr:I
+    iput v0, p0, Lkotlin/a/b;->bgB:I
 
     invoke-virtual {p0}, Lkotlin/a/b;->computeNext()V
 
-    iget v0, p0, Lkotlin/a/b;->bgr:I
+    iget v0, p0, Lkotlin/a/b;->bgB:I
 
-    sget v1, Lkotlin/a/ap;->bgH:I
+    sget v1, Lkotlin/a/ap;->bgR:I
 
     if-ne v0, v1, :cond_1
 
@@ -168,11 +168,11 @@
 
     if-eqz v0, :cond_0
 
-    sget v0, Lkotlin/a/ap;->bgI:I
+    sget v0, Lkotlin/a/ap;->bgS:I
 
-    iput v0, p0, Lkotlin/a/b;->bgr:I
+    iput v0, p0, Lkotlin/a/b;->bgB:I
 
-    iget-object v0, p0, Lkotlin/a/b;->bgs:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/b;->bgC: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 a3a399a57a..be4d25bd97 100644
--- a/com.discord/smali_classes2/kotlin/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/a/c.smali
@@ -20,7 +20,7 @@
 
     sput-object v0, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lkotlin/a/ap;->bgJ:I
+    sget v1, Lkotlin/a/ap;->bgT:I
 
     const/4 v2, 0x1
 
@@ -30,7 +30,7 @@
 
     sget-object v0, Lkotlin/a/c;->$EnumSwitchMapping$0:[I
 
-    sget v1, Lkotlin/a/ap;->bgH:I
+    sget v1, Lkotlin/a/ap;->bgR: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 169caa0612..738a5dffa8 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 bgu:Lkotlin/a/d;
+.field final synthetic bgE:Lkotlin/a/d;
 
 .field private index:I
 
@@ -42,7 +42,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/d$b;->bgu:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$b;->bgE:Lkotlin/a/d;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -64,7 +64,7 @@
 
     iget v0, p0, Lkotlin/a/d$b;->index:I
 
-    iget-object v1, p0, Lkotlin/a/d$b;->bgu:Lkotlin/a/d;
+    iget-object v1, p0, Lkotlin/a/d$b;->bgE:Lkotlin/a/d;
 
     invoke-virtual {v1}, Lkotlin/a/d;->size()I
 
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/a/d$b;->bgu:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$b;->bgE: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 e32435d93b..e303864169 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 bgu:Lkotlin/a/d;
+.field final synthetic bgE:Lkotlin/a/d;
 
 
 # direct methods
@@ -41,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/a/d$c;->bgu:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$c;->bgE:Lkotlin/a/d;
 
     invoke-direct {p0, p1}, Lkotlin/a/d$b;-><init>(Lkotlin/a/d;)V
 
-    sget-object v0, Lkotlin/a/d;->bgt:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
 
     invoke-virtual {p1}, Lkotlin/a/d;->size()I
 
@@ -120,7 +120,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/a/d$c;->bgu:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$c;->bgE:Lkotlin/a/d;
 
     invoke-virtual {p0}, Lkotlin/a/d$c;->getIndex()I
 
diff --git a/com.discord/smali_classes2/kotlin/a/d$d.smali b/com.discord/smali_classes2/kotlin/a/d$d.smali
index c041f041a1..f7ece10389 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 bgv:I
+.field private bgF:I
 
-.field private final bgw:Lkotlin/a/d;
+.field private final bgG:Lkotlin/a/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/a/d<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field private final bgx:I
+.field private final bgH:I
 
 
 # direct methods
@@ -60,15 +60,15 @@
 
     invoke-direct {p0}, Lkotlin/a/d;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/d$d;->bgw:Lkotlin/a/d;
+    iput-object p1, p0, Lkotlin/a/d$d;->bgG:Lkotlin/a/d;
 
-    iput p2, p0, Lkotlin/a/d$d;->bgx:I
+    iput p2, p0, Lkotlin/a/d$d;->bgH:I
 
-    sget-object p1, Lkotlin/a/d;->bgt:Lkotlin/a/d$a;
+    sget-object p1, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
 
-    iget p2, p0, Lkotlin/a/d$d;->bgx:I
+    iget p2, p0, Lkotlin/a/d$d;->bgH:I
 
-    iget-object v0, p0, Lkotlin/a/d$d;->bgw:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$d;->bgG:Lkotlin/a/d;
 
     invoke-virtual {v0}, Lkotlin/a/d;->size()I
 
@@ -76,11 +76,11 @@
 
     invoke-virtual {p1, p2, p3, v0}, Lkotlin/a/d$a;->checkRangeIndexes$kotlin_stdlib(III)V
 
-    iget p1, p0, Lkotlin/a/d$d;->bgx:I
+    iget p1, p0, Lkotlin/a/d$d;->bgH:I
 
     sub-int/2addr p3, p1
 
-    iput p3, p0, Lkotlin/a/d$d;->bgv:I
+    iput p3, p0, Lkotlin/a/d$d;->bgF:I
 
     return-void
 .end method
@@ -95,15 +95,15 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/d;->bgt:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
 
-    iget v1, p0, Lkotlin/a/d$d;->bgv:I
+    iget v1, p0, Lkotlin/a/d$d;->bgF:I
 
     invoke-virtual {v0, p1, v1}, Lkotlin/a/d$a;->checkElementIndex$kotlin_stdlib(II)V
 
-    iget-object v0, p0, Lkotlin/a/d$d;->bgw:Lkotlin/a/d;
+    iget-object v0, p0, Lkotlin/a/d$d;->bgG:Lkotlin/a/d;
 
-    iget v1, p0, Lkotlin/a/d$d;->bgx:I
+    iget v1, p0, Lkotlin/a/d$d;->bgH:I
 
     add-int/2addr v1, p1
 
@@ -117,7 +117,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget v0, p0, Lkotlin/a/d$d;->bgv:I
+    iget v0, p0, Lkotlin/a/d$d;->bgF: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 10e65d0e3e..11c99b6349 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 bgt:Lkotlin/a/d$a;
+.field public static final bgD:Lkotlin/a/d$a;
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/a/d$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/a/d;->bgt:Lkotlin/a/d$a;
+    sput-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
 
     return-void
 .end method
@@ -119,7 +119,7 @@
     return p1
 
     :cond_1
-    sget-object v0, Lkotlin/a/d;->bgt:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
 
     move-object v1, p0
 
@@ -145,7 +145,7 @@
 .method public hashCode()I
     .locals 2
 
-    sget-object v0, Lkotlin/a/d;->bgt:Lkotlin/a/d$a;
+    sget-object v0, Lkotlin/a/d;->bgD:Lkotlin/a/d$a;
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/kotlin/a/f.smali b/com.discord/smali_classes2/kotlin/a/f.smali
index dbc73f2ad2..94c8e6f684 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 bgy:[Ljava/lang/Object;
+.field private final bgI:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -30,7 +30,7 @@
     .end annotation
 .end field
 
-.field private final bgz:Z
+.field private final bgJ:Z
 
 
 # direct methods
@@ -48,9 +48,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/a/f;->bgy:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
 
-    iput-boolean p2, p0, Lkotlin/a/f;->bgz:Z
+    iput-boolean p2, p0, Lkotlin/a/f;->bgJ:Z
 
     return-void
 .end method
@@ -108,7 +108,7 @@
 .method public final contains(Ljava/lang/Object;)Z
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/f;->bgy:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
 
     invoke-static {v0, p1}, Lkotlin/a/g;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -179,7 +179,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/f;->bgy:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
 
     array-length v0, v0
 
@@ -189,7 +189,7 @@
 .method public final isEmpty()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlin/a/f;->bgy:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
 
     array-length v0, v0
 
@@ -215,7 +215,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/f;->bgy:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
 
     invoke-static {v0}, Lkotlin/jvm/internal/b;->iterator([Ljava/lang/Object;)Ljava/util/Iterator;
 
@@ -291,9 +291,9 @@
 .method public final toArray()[Ljava/lang/Object;
     .locals 2
 
-    iget-object v0, p0, Lkotlin/a/f;->bgy:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/f;->bgI:[Ljava/lang/Object;
 
-    iget-boolean v1, p0, Lkotlin/a/f;->bgz:Z
+    iget-boolean v1, p0, Lkotlin/a/f;->bgJ:Z
 
     invoke-static {v0, v1}, Lkotlin/a/m;->copyToArrayOfAny([Ljava/lang/Object;Z)[Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/a/k$a.smali b/com.discord/smali_classes2/kotlin/a/k$a.smali
index 2aa0175875..417d4c2088 100644
--- a/com.discord/smali_classes2/kotlin/a/k$a.smali
+++ b/com.discord/smali_classes2/kotlin/a/k$a.smali
@@ -26,14 +26,14 @@
 
 
 # instance fields
-.field final synthetic bgA:[Ljava/lang/Object;
+.field final synthetic bgK:[Ljava/lang/Object;
 
 
 # direct methods
 .method public constructor <init>([Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/a/k$a;->bgA:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlin/a/k$a;->bgK:[Ljava/lang/Object;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/a/k$a;->bgA:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/a/k$a;->bgK:[Ljava/lang/Object;
 
     invoke-static {v0}, Lkotlin/jvm/internal/b;->iterator([Ljava/lang/Object;)Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlin/a/w$a.smali b/com.discord/smali_classes2/kotlin/a/w$a.smali
index c56c57732e..c124870c1a 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 bgB:Ljava/lang/Iterable;
+.field final synthetic bgL:Ljava/lang/Iterable;
 
 
 # direct methods
 .method public constructor <init>(Ljava/lang/Iterable;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/a/w$a;->bgB:Ljava/lang/Iterable;
+    iput-object p1, p0, Lkotlin/a/w$a;->bgL: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;->bgB:Ljava/lang/Iterable;
+    iget-object v0, p0, Lkotlin/a/w$a;->bgL: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 011723ef6d..4783718118 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 bgC:Lkotlin/a/x;
+.field public static final bgM:Lkotlin/a/x;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlin/a/x;-><init>()V
 
-    sput-object v0, Lkotlin/a/x;->bgC:Lkotlin/a/x;
+    sput-object v0, Lkotlin/a/x;->bgM: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 611999ea6a..11c64e3684 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 bgD:Lkotlin/a/y;
+.field public static final bgN: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;->bgD:Lkotlin/a/y;
+    sput-object v0, Lkotlin/a/y;->bgN: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;->bgD:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bgN:Lkotlin/a/y;
 
     return-object v0
 .end method
@@ -276,7 +276,7 @@
 .method public final iterator()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bgC:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgM:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/Iterator;
 
@@ -319,7 +319,7 @@
 .method public final listIterator()Ljava/util/ListIterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bgC:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgM:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/ListIterator;
 
@@ -331,7 +331,7 @@
 
     if-nez p1, :cond_0
 
-    sget-object p1, Lkotlin/a/x;->bgC:Lkotlin/a/x;
+    sget-object p1, Lkotlin/a/x;->bgM: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 c99ea0df12..0837e4e533 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 bgE:Lkotlin/a/z;
+.field public static final bgO: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;->bgE:Lkotlin/a/z;
+    sput-object v0, Lkotlin/a/z;->bgO: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;->bgE:Lkotlin/a/z;
+    sget-object v0, Lkotlin/a/z;->bgO:Lkotlin/a/z;
 
     return-object v0
 .end method
@@ -170,7 +170,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bgF:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgP:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -188,7 +188,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/a/aa;->bgF:Lkotlin/a/aa;
+    sget-object v0, Lkotlin/a/aa;->bgP:Lkotlin/a/aa;
 
     check-cast v0, Ljava/util/Set;
 
@@ -206,7 +206,7 @@
 .method public final getValues()Ljava/util/Collection;
     .locals 1
 
-    sget-object v0, Lkotlin/a/y;->bgD:Lkotlin/a/y;
+    sget-object v0, Lkotlin/a/y;->bgN: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 678828c761..72555c4c12 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/c/b;->bhk:Lkotlin/c/a;
+    sget-object v0, Lkotlin/c/b;->bhu:Lkotlin/c/a;
 
     invoke-virtual {v0, p0, p1}, Lkotlin/c/a;->addSuppressed(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 3ce9581958..37ff26a3c2 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 bgM:[Lkotlin/jvm/functions/Function1;
+.field final synthetic bgW:[Lkotlin/jvm/functions/Function1;
 
 
 # direct methods
 .method constructor <init>([Lkotlin/jvm/functions/Function1;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/b/b$a;->bgM:[Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lkotlin/b/b$a;->bgW:[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;->bgM:[Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlin/b/b$a;->bgW:[Lkotlin/jvm/functions/Function1;
 
     invoke-static {p1, p2, v0}, Lkotlin/b/b;->access$compareValuesByImpl(Ljava/lang/Object;Ljava/lang/Object;[Lkotlin/jvm/functions/Function1;)I
 
diff --git a/com.discord/smali_classes2/kotlin/b/b$b.smali b/com.discord/smali_classes2/kotlin/b/b$b.smali
index 6a3c14fa50..aa268a9d20 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 bgN:Ljava/util/Comparator;
+.field final synthetic bgX:Ljava/util/Comparator;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/Comparator;Ljava/util/Comparator;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/b/b$b;->bgN:Ljava/util/Comparator;
+    iput-object p1, p0, Lkotlin/b/b$b;->bgX: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;->bgN:Ljava/util/Comparator;
+    iget-object v0, p0, Lkotlin/b/b$b;->bgX: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 2355796c2f..f1d4902ff7 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 bhi:Ljava/lang/reflect/Method;
+.field public static final bhs:Ljava/lang/reflect/Method;
 
-.field public static final bhj:Lkotlin/c/a$a;
+.field public static final bht: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;->bhj:Lkotlin/c/a$a;
+    sput-object v0, Lkotlin/c/a$a;->bht:Lkotlin/c/a$a;
 
     const-class v0, Ljava/lang/Throwable;
 
@@ -108,7 +108,7 @@
     const/4 v5, 0x0
 
     :goto_2
-    sput-object v5, Lkotlin/c/a$a;->bhi:Ljava/lang/reflect/Method;
+    sput-object v5, Lkotlin/c/a$a;->bhs: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 c768094c31..1fdb9d6daf 100644
--- a/com.discord/smali_classes2/kotlin/c/a.smali
+++ b/com.discord/smali_classes2/kotlin/c/a.smali
@@ -33,7 +33,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/c/a$a;->bhi:Ljava/lang/reflect/Method;
+    sget-object v0, Lkotlin/c/a$a;->bhs: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 34cd44237c..1eb4d2c1c9 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 bhk:Lkotlin/c/a;
+.field public static final bhu:Lkotlin/c/a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 11
 
-    invoke-static {}, Lkotlin/c/b;->CV()I
+    invoke-static {}, Lkotlin/c/b;->CY()I
 
     move-result v0
 
@@ -382,12 +382,12 @@
     invoke-direct {v6}, Lkotlin/c/a;-><init>()V
 
     :goto_4
-    sput-object v6, Lkotlin/c/b;->bhk:Lkotlin/c/a;
+    sput-object v6, Lkotlin/c/b;->bhu:Lkotlin/c/a;
 
     return-void
 .end method
 
-.method private static final CV()I
+.method private static final CY()I
     .locals 12
 
     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 ab082398ff..347f23e82f 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 bgS:Lkotlin/coroutines/CoroutineContext$a$a;
+.field public static final bhc: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;->bgS:Lkotlin/coroutines/CoroutineContext$a$a;
+    sput-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bhc:Lkotlin/coroutines/CoroutineContext$a$a;
 
     return-void
 .end method
@@ -90,7 +90,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     if-ne p1, v0, :cond_0
 
@@ -99,7 +99,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -120,7 +120,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -128,7 +128,7 @@
 
     move-result-object p1
 
-    sget-object v1, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v1, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     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 b889c2dee9..9706b139d7 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     if-ne p1, v0, :cond_0
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bgS:Lkotlin/coroutines/CoroutineContext$a$a;
+    sget-object v0, Lkotlin/coroutines/CoroutineContext$a$a;->bhc: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 a5f55ce90b..d25068023d 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$b$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/CoroutineContext$b$a.smali
@@ -115,7 +115,7 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object p0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     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 ecae7d964d..575147f25d 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 bgX:Lkotlin/coroutines/a/a;
+.field public static final enum bhh:Lkotlin/coroutines/a/a;
 
-.field public static final enum bgY:Lkotlin/coroutines/a/a;
+.field public static final enum bhi:Lkotlin/coroutines/a/a;
 
-.field public static final enum bgZ:Lkotlin/coroutines/a/a;
+.field public static final enum bhj:Lkotlin/coroutines/a/a;
 
-.field private static final synthetic bha:[Lkotlin/coroutines/a/a;
+.field private static final synthetic bhk:[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;->bgX:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bhh: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;->bgY:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bhi: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;->bgZ:Lkotlin/coroutines/a/a;
+    sput-object v1, Lkotlin/coroutines/a/a;->bhj:Lkotlin/coroutines/a/a;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/coroutines/a/a;->bha:[Lkotlin/coroutines/a/a;
+    sput-object v0, Lkotlin/coroutines/a/a;->bhk:[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;->bha:[Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bhk:[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 a43426f2aa..82db84936b 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/a/c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/a/c.smali
@@ -56,7 +56,7 @@
 
     move-result-object v5
 
-    sget-object p2, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object p2, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     const-string v0, "null cannot be cast to non-null type kotlin.coroutines.Continuation<kotlin.Any?>"
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/a/d.smali b/com.discord/smali_classes2/kotlin/coroutines/a/d.smali
index f180676893..16608701e8 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/a/d.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/a/d.smali
@@ -7,7 +7,7 @@
 .method public static final getCOROUTINE_SUSPENDED()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bgX:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bhh:Lkotlin/coroutines/a/a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/b$a.smali b/com.discord/smali_classes2/kotlin/coroutines/b$a.smali
index 3741d64f52..58325d419c 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 bgO:Lkotlin/coroutines/b$a$a;
+.field public static final bgY: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>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/coroutines/b$a;->bgO:Lkotlin/coroutines/b$a$a;
+    sput-object v0, Lkotlin/coroutines/b$a;->bgY: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/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v1, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     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 01342da18a..206d4bc62b 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 bgP:Lkotlin/coroutines/b$b;
+.field public static final bgZ: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;->bgP:Lkotlin/coroutines/b$b;
+    sput-object v0, Lkotlin/coroutines/b$b;->bgZ: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 5d82a1d50e..ccd300467d 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/b$c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/b$c.smali
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1, p2}, Lkotlin/coroutines/b$c;->invoke(Lkotlin/Unit;Lkotlin/coroutines/CoroutineContext$b;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 982b117f62..d8ba48b077 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;->bgo:Lkotlin/Unit;
+    sget-object v4, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     new-instance v5, Lkotlin/coroutines/b$c;
 
@@ -385,7 +385,7 @@
     return-object p1
 
     :cond_1
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     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;->bgP:Lkotlin/coroutines/b$b;
+    sget-object v1, Lkotlin/coroutines/b$b;->bgZ: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 8dc9c45670..c5c38841a6 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/c$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/c$a.smali
@@ -32,7 +32,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     if-ne p1, v0, :cond_1
 
@@ -73,11 +73,11 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     if-ne p1, v0, :cond_0
 
-    sget-object p0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object p0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     check-cast p0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/c$b.smali b/com.discord/smali_classes2/kotlin/coroutines/c$b.smali
index ce560a996b..38edc50fa3 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/c$b.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/c$b.smali
@@ -27,7 +27,7 @@
 
 
 # static fields
-.field static final synthetic bgR:Lkotlin/coroutines/c$b;
+.field static final synthetic bhb:Lkotlin/coroutines/c$b;
 
 
 # direct methods
@@ -38,7 +38,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/c$b;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/c$b;->bgR:Lkotlin/coroutines/c$b;
+    sput-object v0, Lkotlin/coroutines/c$b;->bhb:Lkotlin/coroutines/c$b;
 
     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 5697a76329..a5a81b81e2 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/c.smali
@@ -16,16 +16,16 @@
 
 
 # static fields
-.field public static final bgQ:Lkotlin/coroutines/c$b;
+.field public static final bha:Lkotlin/coroutines/c$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/c$b;->bgR:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c$b;->bhb:Lkotlin/coroutines/c$b;
 
-    sput-object v0, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sput-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     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 0a67a5fb95..dc216a3a10 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/d.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/d.smali
@@ -40,9 +40,9 @@
 
     move-result-object p0
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
-    sget-object p2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/e.smali b/com.discord/smali_classes2/kotlin/coroutines/e.smali
index 94e01bed35..42e359b299 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/e.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/e.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field public static final bgT:Lkotlin/coroutines/e;
+.field public static final bhd:Lkotlin/coroutines/e;
 
 .field private static final serialVersionUID:J
 
@@ -21,7 +21,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/e;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sput-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method private final readResolve()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/coroutines/f.smali b/com.discord/smali_classes2/kotlin/coroutines/f.smali
index 686bc045ba..59a5cf3aaa 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/f.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/f.smali
@@ -28,7 +28,7 @@
 
 
 # static fields
-.field private static final bgV:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater<",
@@ -40,14 +40,14 @@
     .end annotation
 .end field
 
-.field public static final bgW:Lkotlin/coroutines/f$a;
+.field public static final bhg:Lkotlin/coroutines/f$a;
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 .end field
 
 
 # instance fields
-.field private final bgU:Lkotlin/coroutines/Continuation;
+.field private final bhe:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -69,7 +69,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/coroutines/f$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/coroutines/f;->bgW:Lkotlin/coroutines/f$a;
+    sput-object v0, Lkotlin/coroutines/f;->bhg:Lkotlin/coroutines/f$a;
 
     const-class v0, Lkotlin/coroutines/f;
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlin/coroutines/f;->bgV:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -100,7 +100,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/a/a;->bgY:Lkotlin/coroutines/a/a;
+    sget-object v0, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
 
     invoke-direct {p0, p1, v0}, Lkotlin/coroutines/f;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V
 
@@ -125,7 +125,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/coroutines/f;->bgU:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lkotlin/coroutines/f;->bhe:Lkotlin/coroutines/Continuation;
 
     iput-object p2, p0, Lkotlin/coroutines/f;->result:Ljava/lang/Object;
 
@@ -137,7 +137,7 @@
 .method public final getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
     .locals 2
 
-    iget-object v0, p0, Lkotlin/coroutines/f;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlin/coroutines/f;->bhe:Lkotlin/coroutines/Continuation;
 
     instance-of v1, v0, Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
@@ -154,7 +154,7 @@
 .method public final getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlin/coroutines/f;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlin/coroutines/f;->bhe:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -168,13 +168,13 @@
 
     iget-object v0, p0, Lkotlin/coroutines/f;->result:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bgY:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/f;->bgV:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bgY:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
 
     invoke-static {}, Lkotlin/coroutines/a/b;->getCOROUTINE_SUSPENDED()Ljava/lang/Object;
 
@@ -196,7 +196,7 @@
     iget-object v0, p0, Lkotlin/coroutines/f;->result:Ljava/lang/Object;
 
     :cond_1
-    sget-object v1, Lkotlin/coroutines/a/a;->bgZ:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhj:Lkotlin/coroutines/a/a;
 
     if-ne v0, v1, :cond_2
 
@@ -235,13 +235,13 @@
     :cond_0
     iget-object v0, p0, Lkotlin/coroutines/f;->result:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bgY:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
 
     if-ne v0, v1, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/f;->bgV:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    sget-object v1, Lkotlin/coroutines/a/a;->bgY:Lkotlin/coroutines/a/a;
+    sget-object v1, Lkotlin/coroutines/a/a;->bhi:Lkotlin/coroutines/a/a;
 
     invoke-virtual {v0, p0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -258,13 +258,13 @@
 
     if-ne v0, v1, :cond_2
 
-    sget-object v0, Lkotlin/coroutines/f;->bgV:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlin/coroutines/f;->bhf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-static {}, Lkotlin/coroutines/a/b;->getCOROUTINE_SUSPENDED()Ljava/lang/Object;
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/coroutines/a/a;->bgZ:Lkotlin/coroutines/a/a;
+    sget-object v2, Lkotlin/coroutines/a/a;->bhj:Lkotlin/coroutines/a/a;
 
     invoke-virtual {v0, p0, v1, v2}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -272,7 +272,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/coroutines/f;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlin/coroutines/f;->bhe:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
@@ -305,7 +305,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlin/coroutines/f;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlin/coroutines/f;->bhe:Lkotlin/coroutines/Continuation;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
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 c4f15fa945..9d4fce5de9 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/a.smali
@@ -198,7 +198,7 @@
     return-void
 
     :cond_1
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -211,7 +211,7 @@
     :catchall_0
     move-exception p1
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(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 e4afcefe6b..42edaa0add 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 bhb:Lkotlin/coroutines/jvm/internal/b;
+.field public static final bhl: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;->bhb:Lkotlin/coroutines/jvm/internal/b;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/b;->bhl: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 e59842d0f7..82515c4c08 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/c.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/c.smali
@@ -100,7 +100,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -151,7 +151,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v2, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -169,7 +169,7 @@
     invoke-interface {v1, v0}, Lkotlin/coroutines/c;->releaseInterceptedContinuation(Lkotlin/coroutines/Continuation;)V
 
     :cond_1
-    sget-object v0, Lkotlin/coroutines/jvm/internal/b;->bhb:Lkotlin/coroutines/jvm/internal/b;
+    sget-object v0, Lkotlin/coroutines/jvm/internal/b;->bhl:Lkotlin/coroutines/jvm/internal/b;
 
     check-cast v0, Lkotlin/coroutines/Continuation;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/e.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/e.smali
index bd784173fc..b6c728ac0a 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/e.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/e.smali
@@ -116,7 +116,7 @@
     aget v1, v2, v1
 
     :goto_0
-    sget-object v2, Lkotlin/coroutines/jvm/internal/g;->bhe:Lkotlin/coroutines/jvm/internal/g;
+    sget-object v2, Lkotlin/coroutines/jvm/internal/g;->bho:Lkotlin/coroutines/jvm/internal/g;
 
     invoke-virtual {v2, p0}, Lkotlin/coroutines/jvm/internal/g;->getModuleName(Lkotlin/coroutines/jvm/internal/a;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g$a.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g$a.smali
index e710ed54a3..6980ed9e28 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g$a.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g$a.smali
@@ -15,11 +15,11 @@
 
 
 # instance fields
-.field public final bhf:Ljava/lang/reflect/Method;
+.field public final bhp:Ljava/lang/reflect/Method;
 
-.field public final bhg:Ljava/lang/reflect/Method;
+.field public final bhq:Ljava/lang/reflect/Method;
 
-.field public final bhh:Ljava/lang/reflect/Method;
+.field public final bhr: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/g$a;->bhf:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhp:Ljava/lang/reflect/Method;
 
-    iput-object p2, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhg:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhq:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhh:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lkotlin/coroutines/jvm/internal/g$a;->bhr:Ljava/lang/reflect/Method;
 
     return-void
 .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 e58dec3dff..79175ab640 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/g.smali
@@ -12,11 +12,11 @@
 
 
 # static fields
-.field private static final bhc:Lkotlin/coroutines/jvm/internal/g$a;
+.field private static final bhm:Lkotlin/coroutines/jvm/internal/g$a;
 
-.field public static bhd:Lkotlin/coroutines/jvm/internal/g$a;
+.field public static bhn:Lkotlin/coroutines/jvm/internal/g$a;
 
-.field public static final bhe:Lkotlin/coroutines/jvm/internal/g;
+.field public static final bho:Lkotlin/coroutines/jvm/internal/g;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lkotlin/coroutines/jvm/internal/g;-><init>()V
 
-    sput-object v0, Lkotlin/coroutines/jvm/internal/g;->bhe:Lkotlin/coroutines/jvm/internal/g;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/g;->bho:Lkotlin/coroutines/jvm/internal/g;
 
     new-instance v0, Lkotlin/coroutines/jvm/internal/g$a;
 
@@ -35,7 +35,7 @@
 
     invoke-direct {v0, v1, v1, v1}, Lkotlin/coroutines/jvm/internal/g$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 
-    sput-object v0, Lkotlin/coroutines/jvm/internal/g;->bhc:Lkotlin/coroutines/jvm/internal/g$a;
+    sput-object v0, Lkotlin/coroutines/jvm/internal/g;->bhm:Lkotlin/coroutines/jvm/internal/g$a;
 
     return-void
 .end method
@@ -112,16 +112,16 @@
 
     invoke-direct {v2, v0, v1, p0}, Lkotlin/coroutines/jvm/internal/g$a;-><init>(Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V
 
-    sput-object v2, Lkotlin/coroutines/jvm/internal/g;->bhd:Lkotlin/coroutines/jvm/internal/g$a;
+    sput-object v2, Lkotlin/coroutines/jvm/internal/g;->bhn:Lkotlin/coroutines/jvm/internal/g$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/g;->bhc:Lkotlin/coroutines/jvm/internal/g$a;
+    sget-object p0, Lkotlin/coroutines/jvm/internal/g;->bhm:Lkotlin/coroutines/jvm/internal/g$a;
 
-    sput-object p0, Lkotlin/coroutines/jvm/internal/g;->bhd:Lkotlin/coroutines/jvm/internal/g$a;
+    sput-object p0, Lkotlin/coroutines/jvm/internal/g;->bhn:Lkotlin/coroutines/jvm/internal/g$a;
 
     return-object p0
 .end method
@@ -135,7 +135,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/coroutines/jvm/internal/g;->bhd:Lkotlin/coroutines/jvm/internal/g$a;
+    sget-object v0, Lkotlin/coroutines/jvm/internal/g;->bhn:Lkotlin/coroutines/jvm/internal/g$a;
 
     if-nez v0, :cond_0
 
@@ -144,7 +144,7 @@
     move-result-object v0
 
     :cond_0
-    sget-object v1, Lkotlin/coroutines/jvm/internal/g;->bhc:Lkotlin/coroutines/jvm/internal/g$a;
+    sget-object v1, Lkotlin/coroutines/jvm/internal/g;->bhm:Lkotlin/coroutines/jvm/internal/g$a;
 
     const/4 v2, 0x0
 
@@ -153,7 +153,7 @@
     return-object v2
 
     :cond_1
-    iget-object v1, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhf:Ljava/lang/reflect/Method;
+    iget-object v1, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhp:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_6
 
@@ -174,7 +174,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v1, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhg:Ljava/lang/reflect/Method;
+    iget-object v1, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhq:Ljava/lang/reflect/Method;
 
     if-eqz v1, :cond_6
 
@@ -189,7 +189,7 @@
     goto :goto_1
 
     :cond_3
-    iget-object v0, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhh:Ljava/lang/reflect/Method;
+    iget-object v0, v0, Lkotlin/coroutines/jvm/internal/g$a;->bhr:Ljava/lang/reflect/Method;
 
     if-eqz v0, :cond_4
 
diff --git a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/h.smali b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/h.smali
index c00a92e820..c9d80ffa2d 100644
--- a/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/h.smali
+++ b/com.discord/smali_classes2/kotlin/coroutines/jvm/internal/h.smali
@@ -23,7 +23,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     if-ne p1, v0, :cond_0
 
@@ -63,7 +63,7 @@
 .method public getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlin/f/b.smali b/com.discord/smali_classes2/kotlin/f/b.smali
index 0b58548985..a549d353ba 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 bhG:Lkotlin/f/b$a;
+.field private final bhQ:Lkotlin/f/b$a;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lkotlin/f/b$a;-><init>()V
 
-    iput-object v0, p0, Lkotlin/f/b;->bhG:Lkotlin/f/b$a;
+    iput-object v0, p0, Lkotlin/f/b;->bhQ:Lkotlin/f/b$a;
 
     return-void
 .end method
@@ -27,7 +27,7 @@
 .method public final getImpl()Ljava/util/Random;
     .locals 2
 
-    iget-object v0, p0, Lkotlin/f/b;->bhG:Lkotlin/f/b$a;
+    iget-object v0, p0, Lkotlin/f/b;->bhQ: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 5c2138eef9..09cab924ea 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 bhK:Lkotlin/f/c$a;
+.field public static final bhU: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;->bhK:Lkotlin/f/c$a;
+    sput-object v0, Lkotlin/f/c$a;->bhU:Lkotlin/f/c$a;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 .method public final nextBits(I)I
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bhJ:Lkotlin/f/c$b;
+    sget-object v0, Lkotlin/f/c;->bhT:Lkotlin/f/c$b;
 
     invoke-virtual {v0, p1}, Lkotlin/f/c$b;->nextBits(I)I
 
diff --git a/com.discord/smali_classes2/kotlin/f/c.smali b/com.discord/smali_classes2/kotlin/f/c.smali
index a3ceafa32e..77b931b858 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 private static final bhH:Lkotlin/f/c;
+.field private static final bhR:Lkotlin/f/c;
 
-.field public static final bhI:Lkotlin/f/c$a;
+.field public static final bhS:Lkotlin/f/c$a;
 
-.field public static final bhJ:Lkotlin/f/c$b;
+.field public static final bhT:Lkotlin/f/c$b;
 
 
 # direct methods
@@ -30,19 +30,19 @@
 
     invoke-direct {v0, v1}, Lkotlin/f/c$b;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/f/c;->bhJ:Lkotlin/f/c$b;
+    sput-object v0, Lkotlin/f/c;->bhT:Lkotlin/f/c$b;
 
-    sget-object v0, Lkotlin/c/b;->bhk:Lkotlin/c/a;
+    sget-object v0, Lkotlin/c/b;->bhu:Lkotlin/c/a;
 
     invoke-virtual {v0}, Lkotlin/c/a;->defaultPlatformRandom()Lkotlin/f/c;
 
     move-result-object v0
 
-    sput-object v0, Lkotlin/f/c;->bhH:Lkotlin/f/c;
+    sput-object v0, Lkotlin/f/c;->bhR:Lkotlin/f/c;
 
-    sget-object v0, Lkotlin/f/c$a;->bhK:Lkotlin/f/c$a;
+    sget-object v0, Lkotlin/f/c$a;->bhU:Lkotlin/f/c$a;
 
-    sput-object v0, Lkotlin/f/c;->bhI:Lkotlin/f/c$a;
+    sput-object v0, Lkotlin/f/c;->bhS:Lkotlin/f/c$a;
 
     return-void
 .end method
@@ -58,7 +58,7 @@
 .method public static final synthetic access$getDefaultRandom$cp()Lkotlin/f/c;
     .locals 1
 
-    sget-object v0, Lkotlin/f/c;->bhH:Lkotlin/f/c;
+    sget-object v0, Lkotlin/f/c;->bhR:Lkotlin/f/c;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/f/e.smali b/com.discord/smali_classes2/kotlin/f/e.smali
index 0d691b7a1b..37b9e631cf 100644
--- a/com.discord/smali_classes2/kotlin/f/e.smali
+++ b/com.discord/smali_classes2/kotlin/f/e.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private bhL:I
+.field private bhV:I
 
-.field private bhM:I
+.field private bhW:I
 
-.field private bhN:I
+.field private bhX:I
 
 .field private v:I
 
@@ -53,13 +53,13 @@
 
     iput p2, p0, Lkotlin/f/e;->y:I
 
-    iput p3, p0, Lkotlin/f/e;->bhL:I
+    iput p3, p0, Lkotlin/f/e;->bhV:I
 
-    iput p4, p0, Lkotlin/f/e;->bhM:I
+    iput p4, p0, Lkotlin/f/e;->bhW:I
 
     iput p5, p0, Lkotlin/f/e;->v:I
 
-    iput p6, p0, Lkotlin/f/e;->bhN:I
+    iput p6, p0, Lkotlin/f/e;->bhX:I
 
     iget p1, p0, Lkotlin/f/e;->x:I
 
@@ -67,11 +67,11 @@
 
     or-int/2addr p1, p2
 
-    iget p2, p0, Lkotlin/f/e;->bhL:I
+    iget p2, p0, Lkotlin/f/e;->bhV:I
 
     or-int/2addr p1, p2
 
-    iget p2, p0, Lkotlin/f/e;->bhM:I
+    iget p2, p0, Lkotlin/f/e;->bhW:I
 
     or-int/2addr p1, p2
 
@@ -158,17 +158,17 @@
 
     iput v1, p0, Lkotlin/f/e;->x:I
 
-    iget v1, p0, Lkotlin/f/e;->bhL:I
+    iget v1, p0, Lkotlin/f/e;->bhV:I
 
     iput v1, p0, Lkotlin/f/e;->y:I
 
-    iget v1, p0, Lkotlin/f/e;->bhM:I
+    iget v1, p0, Lkotlin/f/e;->bhW:I
 
-    iput v1, p0, Lkotlin/f/e;->bhL:I
+    iput v1, p0, Lkotlin/f/e;->bhV:I
 
     iget v1, p0, Lkotlin/f/e;->v:I
 
-    iput v1, p0, Lkotlin/f/e;->bhM:I
+    iput v1, p0, Lkotlin/f/e;->bhW:I
 
     shl-int/lit8 v2, v0, 0x1
 
@@ -182,15 +182,15 @@
 
     iput v0, p0, Lkotlin/f/e;->v:I
 
-    iget v1, p0, Lkotlin/f/e;->bhN:I
+    iget v1, p0, Lkotlin/f/e;->bhX:I
 
     const v2, 0x587c5
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lkotlin/f/e;->bhN:I
+    iput v1, p0, Lkotlin/f/e;->bhX:I
 
-    iget v1, p0, Lkotlin/f/e;->bhN:I
+    iget v1, p0, Lkotlin/f/e;->bhX: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 9d06469f0f..5f8995e032 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;->bgh:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bgr: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;->bgi:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bgs: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;->bgj:Lkotlin/j;
+    sget-object v1, Lkotlin/j;->bgt: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 f1c1f7b39f..adbff32006 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 bgh:Lkotlin/j;
+.field public static final enum bgr:Lkotlin/j;
 
-.field public static final enum bgi:Lkotlin/j;
+.field public static final enum bgs:Lkotlin/j;
 
-.field public static final enum bgj:Lkotlin/j;
+.field public static final enum bgt:Lkotlin/j;
 
-.field private static final synthetic bgk:[Lkotlin/j;
+.field private static final synthetic bgu:[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;->bgh:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bgr: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;->bgi:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bgs: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;->bgj:Lkotlin/j;
+    sput-object v1, Lkotlin/j;->bgt:Lkotlin/j;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/j;->bgk:[Lkotlin/j;
+    sput-object v0, Lkotlin/j;->bgu:[Lkotlin/j;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 .method public static values()[Lkotlin/j;
     .locals 1
 
-    sget-object v0, Lkotlin/j;->bgk:[Lkotlin/j;
+    sget-object v0, Lkotlin/j;->bgu:[Lkotlin/j;
 
     invoke-virtual {v0}, [Lkotlin/j;->clone()Ljava/lang/Object;
 
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/aa.smali b/com.discord/smali_classes2/kotlin/jvm/internal/aa.smali
index 9d5e60e6ef..39e8557f32 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/aa.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/aa.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bhD:Ljava/util/ArrayList;
+.field private final bhN:Ljava/util/ArrayList;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/ArrayList<",
@@ -25,7 +25,7 @@
 
     invoke-direct {v0, p1}, Ljava/util/ArrayList;-><init>(I)V
 
-    iput-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iput-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 .method public final add(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -62,7 +62,7 @@
 
     if-lez v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -74,7 +74,7 @@
 
     invoke-virtual {v0, v1}, Ljava/util/ArrayList;->ensureCapacity(I)V
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-static {v0, p1}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
 
@@ -86,7 +86,7 @@
 
     if-eqz v0, :cond_3
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     check-cast p1, Ljava/util/Collection;
 
@@ -116,7 +116,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v1, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -139,7 +139,7 @@
 
     if-eqz v0, :cond_6
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -185,7 +185,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
 
@@ -197,7 +197,7 @@
 .method public final toArray([Ljava/lang/Object;)[Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhD:Ljava/util/ArrayList;
+    iget-object v0, p0, Lkotlin/jvm/internal/aa;->bhN:Ljava/util/ArrayList;
 
     invoke-virtual {v0, p1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object;
 
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 a269f3a365..e6dab49678 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 bhl:Lkotlin/jvm/internal/c$a;
+.field private static final bhv: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;->bhl:Lkotlin/jvm/internal/c$a;
+    sput-object v0, Lkotlin/jvm/internal/c$a;->bhv:Lkotlin/jvm/internal/c$a;
 
     return-void
 .end method
@@ -42,10 +42,10 @@
     return-void
 .end method
 
-.method static synthetic CW()Lkotlin/jvm/internal/c$a;
+.method static synthetic CZ()Lkotlin/jvm/internal/c$a;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/c$a;->bhl:Lkotlin/jvm/internal/c$a;
+    sget-object v0, Lkotlin/jvm/internal/c$a;->bhv:Lkotlin/jvm/internal/c$a;
 
     return-object v0
 .end method
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlin/jvm/internal/c$a;->bhl:Lkotlin/jvm/internal/c$a;
+    sget-object v0, Lkotlin/jvm/internal/c$a;->bhv:Lkotlin/jvm/internal/c$a;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/e.smali b/com.discord/smali_classes2/kotlin/jvm/internal/e.smali
index 21245ee60b..f4c4cc91c4 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 bhm:Ljava/lang/Class;
+.field private final bhw:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/jvm/internal/e;->bhm:Ljava/lang/Class;
+    iput-object p1, p0, Lkotlin/jvm/internal/e;->bhw:Ljava/lang/Class;
 
     return-void
 .end method
@@ -117,7 +117,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/jvm/internal/e;->bhm:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/e;->bhw:Ljava/lang/Class;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali
index b113c01929..9da21a61e8 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 bhn:[Ljava/lang/Object;
+.field private static final bhx:[Ljava/lang/Object;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lkotlin/jvm/internal/f;->bhn:[Ljava/lang/Object;
+    sput-object v0, Lkotlin/jvm/internal/f;->bhx:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object p0, Lkotlin/jvm/internal/f;->bhn:[Ljava/lang/Object;
+    sget-object p0, Lkotlin/jvm/internal/f;->bhx:[Ljava/lang/Object;
 
     return-object p0
 
@@ -56,7 +56,7 @@
 
     if-nez v1, :cond_1
 
-    sget-object p0, Lkotlin/jvm/internal/f;->bhn:[Ljava/lang/Object;
+    sget-object p0, Lkotlin/jvm/internal/f;->bhx:[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 893807fc7f..56f7312638 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/g.smali
@@ -5,21 +5,21 @@
 
 # static fields
 # The value of this static final field might be set in the static constructor
-.field private static final bho:D = 4.9E-324
+.field private static final bhA:D = Infinity
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhp:D = 1.7976931348623157E308
+.field private static final bhB:D = -Infinity
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhq:D = Infinity
+.field private static final bhC:D = NaN
+
+.field public static final bhD:Lkotlin/jvm/internal/g;
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhr:D = -Infinity
+.field private static final bhy:D = 4.9E-324
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhs:D = NaN
-
-.field public static final bht:Lkotlin/jvm/internal/g;
+.field private static final bhz:D = 1.7976931348623157E308
 
 
 # direct methods
@@ -30,27 +30,27 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/g;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/g;->bht:Lkotlin/jvm/internal/g;
+    sput-object v0, Lkotlin/jvm/internal/g;->bhD:Lkotlin/jvm/internal/g;
 
     const-wide/16 v0, 0x1
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bho:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhy:D
 
     const-wide v0, 0x7fefffffffffffffL    # Double.MAX_VALUE
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhp:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhz:D
 
     const-wide/high16 v0, 0x7ff0000000000000L    # Double.POSITIVE_INFINITY
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhq:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhA:D
 
     const-wide/high16 v0, -0x10000000000000L    # Double.NEGATIVE_INFINITY
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhr:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhB:D
 
     const-wide/high16 v0, 0x7ff8000000000000L    # Double.NaN
 
-    sput-wide v0, Lkotlin/jvm/internal/g;->bhs:D
+    sput-wide v0, Lkotlin/jvm/internal/g;->bhC:D
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 .method public final getNaN()D
     .locals 2
 
-    sget-wide v0, Lkotlin/jvm/internal/g;->bhs:D
+    sget-wide v0, Lkotlin/jvm/internal/g;->bhC:D
 
     return-wide v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/h.smali b/com.discord/smali_classes2/kotlin/jvm/internal/h.smali
index dca42d1bd3..a4b82060d1 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/h.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/h.smali
@@ -5,21 +5,21 @@
 
 # static fields
 # The value of this static final field might be set in the static constructor
-.field private static final bhu:F = 1.4E-45f
+.field private static final bhE:F = 1.4E-45f
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhv:F = 3.4028235E38f
+.field private static final bhF:F = 3.4028235E38f
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhw:F = Infinityf
+.field private static final bhG:F = Infinityf
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhx:F = -Infinityf
+.field private static final bhH:F = -Infinityf
 
 # The value of this static final field might be set in the static constructor
-.field private static final bhy:F = NaNf
+.field private static final bhI:F = NaNf
 
-.field public static final bhz:Lkotlin/jvm/internal/h;
+.field public static final bhJ:Lkotlin/jvm/internal/h;
 
 
 # direct methods
@@ -30,27 +30,27 @@
 
     invoke-direct {v0}, Lkotlin/jvm/internal/h;-><init>()V
 
-    sput-object v0, Lkotlin/jvm/internal/h;->bhz:Lkotlin/jvm/internal/h;
+    sput-object v0, Lkotlin/jvm/internal/h;->bhJ:Lkotlin/jvm/internal/h;
 
     const/4 v0, 0x1
 
-    sput v0, Lkotlin/jvm/internal/h;->bhu:F
+    sput v0, Lkotlin/jvm/internal/h;->bhE:F
 
     const v0, 0x7f7fffff    # Float.MAX_VALUE
 
-    sput v0, Lkotlin/jvm/internal/h;->bhv:F
+    sput v0, Lkotlin/jvm/internal/h;->bhF:F
 
     const/high16 v0, 0x7f800000    # Float.POSITIVE_INFINITY
 
-    sput v0, Lkotlin/jvm/internal/h;->bhw:F
+    sput v0, Lkotlin/jvm/internal/h;->bhG:F
 
     const/high16 v0, -0x800000    # Float.NEGATIVE_INFINITY
 
-    sput v0, Lkotlin/jvm/internal/h;->bhx:F
+    sput v0, Lkotlin/jvm/internal/h;->bhH:F
 
     const/high16 v0, 0x7fc00000    # Float.NaN
 
-    sput v0, Lkotlin/jvm/internal/h;->bhy:F
+    sput v0, Lkotlin/jvm/internal/h;->bhI:F
 
     return-void
 .end method
@@ -68,7 +68,7 @@
 .method public final getMAX_VALUE()F
     .locals 1
 
-    sget v0, Lkotlin/jvm/internal/h;->bhv:F
+    sget v0, Lkotlin/jvm/internal/h;->bhF:F
 
     return v0
 .end method
diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/s.smali b/com.discord/smali_classes2/kotlin/jvm/internal/s.smali
index b09298019a..9c0255f51b 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/s.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/s.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field private final bhA:Ljava/lang/String;
+.field private final bhK:Ljava/lang/String;
 
-.field private final bhm:Ljava/lang/Class;
+.field private final bhw:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -42,9 +42,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/jvm/internal/s;->bhm:Ljava/lang/Class;
+    iput-object p1, p0, Lkotlin/jvm/internal/s;->bhw:Ljava/lang/Class;
 
-    iput-object p2, p0, Lkotlin/jvm/internal/s;->bhA:Ljava/lang/String;
+    iput-object p2, p0, Lkotlin/jvm/internal/s;->bhK:Ljava/lang/String;
 
     return-void
 .end method
@@ -94,7 +94,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/jvm/internal/s;->bhm:Ljava/lang/Class;
+    iget-object v0, p0, Lkotlin/jvm/internal/s;->bhw:Ljava/lang/Class;
 
     return-object v0
 .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 495e37dec3..261bac8ac3 100644
--- a/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
+++ b/com.discord/smali_classes2/kotlin/jvm/internal/y.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bhB:Lkotlin/jvm/internal/z;
+.field private static final bhL:Lkotlin/jvm/internal/z;
 
-.field private static final bhC:[Lkotlin/reflect/b;
+.field private static final bhM:[Lkotlin/reflect/b;
 
 
 # direct methods
@@ -51,13 +51,13 @@
     invoke-direct {v0}, Lkotlin/jvm/internal/z;-><init>()V
 
     :goto_1
-    sput-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sput-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     const/4 v0, 0x0
 
     new-array v0, v0, [Lkotlin/reflect/b;
 
-    sput-object v0, Lkotlin/jvm/internal/y;->bhC:[Lkotlin/reflect/b;
+    sput-object v0, Lkotlin/jvm/internal/y;->bhM:[Lkotlin/reflect/b;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 .method public static function(Lkotlin/jvm/internal/j;)Lkotlin/reflect/KFunction;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->function(Lkotlin/jvm/internal/j;)Lkotlin/reflect/KFunction;
 
@@ -77,7 +77,7 @@
 .method public static getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
@@ -89,7 +89,7 @@
 .method public static getOrCreateKotlinPackage(Ljava/lang/Class;Ljava/lang/String;)Lkotlin/reflect/KDeclarationContainer;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0, p1}, Lkotlin/jvm/internal/z;->getOrCreateKotlinPackage(Ljava/lang/Class;Ljava/lang/String;)Lkotlin/reflect/KDeclarationContainer;
 
@@ -101,7 +101,7 @@
 .method public static mutableProperty0(Lkotlin/jvm/internal/o;)Lkotlin/reflect/KMutableProperty0;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->mutableProperty0(Lkotlin/jvm/internal/o;)Lkotlin/reflect/KMutableProperty0;
 
@@ -113,7 +113,7 @@
 .method public static mutableProperty1(Lkotlin/jvm/internal/q;)Lkotlin/reflect/c;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->mutableProperty1(Lkotlin/jvm/internal/q;)Lkotlin/reflect/c;
 
@@ -125,7 +125,7 @@
 .method public static property0(Lkotlin/jvm/internal/u;)Lkotlin/reflect/KProperty0;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->property0(Lkotlin/jvm/internal/u;)Lkotlin/reflect/KProperty0;
 
@@ -137,7 +137,7 @@
 .method public static property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d;
 
@@ -149,7 +149,7 @@
 .method public static renderLambdaToString(Lkotlin/jvm/internal/i;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->renderLambdaToString(Lkotlin/jvm/internal/i;)Ljava/lang/String;
 
@@ -161,7 +161,7 @@
 .method public static renderLambdaToString(Lkotlin/jvm/internal/m;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lkotlin/jvm/internal/y;->bhB:Lkotlin/jvm/internal/z;
+    sget-object v0, Lkotlin/jvm/internal/y;->bhL:Lkotlin/jvm/internal/z;
 
     invoke-virtual {v0, p0}, Lkotlin/jvm/internal/z;->renderLambdaToString(Lkotlin/jvm/internal/m;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlin/m.smali b/com.discord/smali_classes2/kotlin/m.smali
index dcf27173d8..87a3e7c7ab 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 bgl:Lkotlin/m$a;
+.field public static final bgv:Lkotlin/m$a;
 
 
 # instance fields
@@ -43,7 +43,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/m$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sput-object v0, Lkotlin/m;->bgv: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 fbddb76595..0cbb4bac20 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 bgm:Lkotlin/o$a;
+.field public static final bgw: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>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/o;->bgm:Lkotlin/o$a;
+    sput-object v0, Lkotlin/o;->bgw: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;->bgn:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgx:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/o;->_value:Ljava/lang/Object;
 
-    sget-object p1, Lkotlin/s;->bgn:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgx: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;->bgn:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgx: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;->bgn:Lkotlin/s;
+    sget-object v2, Lkotlin/s;->bgx: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;->bgn:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgx: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 ba9f354110..e845fa38fa 100644
--- a/com.discord/smali_classes2/kotlin/p.smali
+++ b/com.discord/smali_classes2/kotlin/p.smali
@@ -57,7 +57,7 @@
 
     iput-object p1, p0, Lkotlin/p;->initializer:Lkotlin/jvm/functions/Function0;
 
-    sget-object p1, Lkotlin/s;->bgn:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgx:Lkotlin/s;
 
     iput-object p1, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
@@ -112,7 +112,7 @@
 
     iget-object v0, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bgn:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgx:Lkotlin/s;
 
     if-eq v0, v1, :cond_0
 
@@ -126,7 +126,7 @@
     :try_start_0
     iget-object v1, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
-    sget-object v2, Lkotlin/s;->bgn:Lkotlin/s;
+    sget-object v2, Lkotlin/s;->bgx:Lkotlin/s;
 
     if-eq v1, v2, :cond_1
 
@@ -170,7 +170,7 @@
 
     iget-object v0, p0, Lkotlin/p;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bgn:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgx: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 e12cf7413c..5f79254c25 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 bhF:Lkotlin/properties/a;
+.field public static final bhP:Lkotlin/properties/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/properties/a;-><init>()V
 
-    sput-object v0, Lkotlin/properties/a;->bhF:Lkotlin/properties/a;
+    sput-object v0, Lkotlin/properties/a;->bhP: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 4dc5ff2bd5..55620e4e08 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 bhW:Lkotlin/reflect/KVisibility;
+.field public static final enum big:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bhX:Lkotlin/reflect/KVisibility;
+.field public static final enum bih:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bhY:Lkotlin/reflect/KVisibility;
+.field public static final enum bii:Lkotlin/reflect/KVisibility;
 
-.field public static final enum bhZ:Lkotlin/reflect/KVisibility;
+.field public static final enum bij:Lkotlin/reflect/KVisibility;
 
-.field private static final synthetic bia:[Lkotlin/reflect/KVisibility;
+.field private static final synthetic bik:[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;->bhW:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->big: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;->bhX:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bih: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;->bhY:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bii: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;->bhZ:Lkotlin/reflect/KVisibility;
+    sput-object v1, Lkotlin/reflect/KVisibility;->bij:Lkotlin/reflect/KVisibility;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/reflect/KVisibility;->bia:[Lkotlin/reflect/KVisibility;
+    sput-object v0, Lkotlin/reflect/KVisibility;->bik:[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;->bia:[Lkotlin/reflect/KVisibility;
+    sget-object v0, Lkotlin/reflect/KVisibility;->bik:[Lkotlin/reflect/KVisibility;
 
     invoke-virtual {v0}, [Lkotlin/reflect/KVisibility;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlin/s.smali b/com.discord/smali_classes2/kotlin/s.smali
index 618fafa945..2c8e240b9c 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 bgn:Lkotlin/s;
+.field public static final bgx:Lkotlin/s;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlin/s;-><init>()V
 
-    sput-object v0, Lkotlin/s;->bgn:Lkotlin/s;
+    sput-object v0, Lkotlin/s;->bgx: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 7abe1c4640..4f06da07d5 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 bib:Ljava/util/HashSet;
+.field private final bil:Ljava/util/HashSet;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/HashSet<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bic:Ljava/util/Iterator;
+.field private final bim:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field private final bid:Lkotlin/jvm/functions/Function1;
+.field private final bin:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -69,15 +69,15 @@
 
     invoke-direct {p0}, Lkotlin/a/b;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/a;->bic:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/a;->bim:Ljava/util/Iterator;
 
-    iput-object p2, p0, Lkotlin/sequences/a;->bid:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/a;->bin: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;->bib:Ljava/util/HashSet;
+    iput-object p1, p0, Lkotlin/sequences/a;->bil:Ljava/util/HashSet;
 
     return-void
 .end method
@@ -88,7 +88,7 @@
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/a;->bic:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/a;->bim: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;->bic:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/a;->bim:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/a;->bid:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lkotlin/sequences/a;->bin: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;->bib:Ljava/util/HashSet;
+    iget-object v2, p0, Lkotlin/sequences/a;->bil:Ljava/util/HashSet;
 
     invoke-virtual {v2, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/b.smali b/com.discord/smali_classes2/kotlin/sequences/b.smali
index 1f67092ec2..7337e5d92f 100644
--- a/com.discord/smali_classes2/kotlin/sequences/b.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/b.smali
@@ -22,7 +22,7 @@
 
 
 # instance fields
-.field private final bid:Lkotlin/jvm/functions/Function1;
+.field private final bin:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final bie:Lkotlin/sequences/Sequence;
+.field private final bio:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -64,9 +64,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/b;->bie:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/b;->bio:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/b;->bid:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/b;->bin: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;->bie:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/b;->bio:Lkotlin/sequences/Sequence;
 
     invoke-interface {v1}, Lkotlin/sequences/Sequence;->iterator()Ljava/util/Iterator;
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlin/sequences/b;->bid:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lkotlin/sequences/b;->bin: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 00e911195a..3c13dca106 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 acy:Ljava/util/Iterator;
+.field private final acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic big:Lkotlin/sequences/c;
+.field final synthetic biq:Lkotlin/sequences/c;
 
 .field private left:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/c$a;->big:Lkotlin/sequences/c;
+    iput-object p1, p0, Lkotlin/sequences/c$a;->biq: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;->acy:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/c$a;->acH:Ljava/util/Iterator;
 
     invoke-static {p1}, Lkotlin/sequences/c;->access$getCount$p(Lkotlin/sequences/c;)I
 
@@ -74,7 +74,7 @@
     return-void
 .end method
 
-.method private final CX()V
+.method private final Da()V
     .locals 1
 
     :goto_0
@@ -82,7 +82,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acH:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -111,9 +111,9 @@
 .method public final hasNext()Z
     .locals 1
 
-    invoke-direct {p0}, Lkotlin/sequences/c$a;->CX()V
+    invoke-direct {p0}, Lkotlin/sequences/c$a;->Da()V
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acH:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -130,9 +130,9 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/c$a;->CX()V
+    invoke-direct {p0}, Lkotlin/sequences/c$a;->Da()V
 
-    iget-object v0, p0, Lkotlin/sequences/c$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/c$a;->acH: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 40d032a3a0..eee2c1aef7 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 bif:Lkotlin/sequences/Sequence;
+.field private final bip: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;->bif:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/c;->bip:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/c;->count:I
 
@@ -115,7 +115,7 @@
 .method public static final synthetic access$getSequence$p(Lkotlin/sequences/c;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/c;->bif:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/c;->bip:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -153,7 +153,7 @@
     :cond_0
     new-instance p1, Lkotlin/sequences/c;
 
-    iget-object v1, p0, Lkotlin/sequences/c;->bif:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/c;->bip:Lkotlin/sequences/Sequence;
 
     invoke-direct {p1, v1, v0}, Lkotlin/sequences/c;-><init>(Lkotlin/sequences/Sequence;I)V
 
@@ -212,7 +212,7 @@
     :cond_0
     new-instance p1, Lkotlin/sequences/o;
 
-    iget-object v2, p0, Lkotlin/sequences/c;->bif:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/c;->bip: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/e.smali b/com.discord/smali_classes2/kotlin/sequences/e.smali
index 634b302ca7..4882cba272 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 bih:Lkotlin/sequences/e;
+.field public static final bir:Lkotlin/sequences/e;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlin/sequences/e;-><init>()V
 
-    sput-object v0, Lkotlin/sequences/e;->bih:Lkotlin/sequences/e;
+    sput-object v0, Lkotlin/sequences/e;->bir:Lkotlin/sequences/e;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 .method public final drop(I)Lkotlin/sequences/e;
     .locals 0
 
-    sget-object p1, Lkotlin/sequences/e;->bih:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->bir:Lkotlin/sequences/e;
 
     return-object p1
 .end method
@@ -57,7 +57,7 @@
 .method public final iterator()Ljava/util/Iterator;
     .locals 1
 
-    sget-object v0, Lkotlin/a/x;->bgC:Lkotlin/a/x;
+    sget-object v0, Lkotlin/a/x;->bgM:Lkotlin/a/x;
 
     check-cast v0, Ljava/util/Iterator;
 
@@ -79,7 +79,7 @@
 .method public final take(I)Lkotlin/sequences/e;
     .locals 0
 
-    sget-object p1, Lkotlin/sequences/e;->bih:Lkotlin/sequences/e;
+    sget-object p1, Lkotlin/sequences/e;->bir:Lkotlin/sequences/e;
 
     return-object p1
 .end method
diff --git a/com.discord/smali_classes2/kotlin/sequences/f$a.smali b/com.discord/smali_classes2/kotlin/sequences/f$a.smali
index b6c828b7e8..b52978a896 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 acy:Ljava/util/Iterator;
+.field private final acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,9 +37,9 @@
     .end annotation
 .end field
 
-.field private bik:I
+.field private biu:I
 
-.field private bil:Ljava/lang/Object;
+.field private biv:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field final synthetic bim:Lkotlin/sequences/f;
+.field final synthetic biw:Lkotlin/sequences/f;
 
 
 # direct methods
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/f$a;->bim:Lkotlin/sequences/f;
+    iput-object p1, p0, Lkotlin/sequences/f$a;->biw: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;->acy:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/f$a;->acH:Ljava/util/Iterator;
 
     const/4 p1, -0x1
 
-    iput p1, p0, Lkotlin/sequences/f$a;->bik:I
+    iput p1, p0, Lkotlin/sequences/f$a;->biu:I
 
     return-void
 .end method
 
-.method private final CY()V
+.method private final Db()V
     .locals 3
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/f$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->acH: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;->bim:Lkotlin/sequences/f;
+    iget-object v1, p0, Lkotlin/sequences/f$a;->biw:Lkotlin/sequences/f;
 
     invoke-static {v1}, Lkotlin/sequences/f;->access$getPredicate$p(Lkotlin/sequences/f;)Lkotlin/jvm/functions/Function1;
 
@@ -114,7 +114,7 @@
 
     move-result v1
 
-    iget-object v2, p0, Lkotlin/sequences/f$a;->bim:Lkotlin/sequences/f;
+    iget-object v2, p0, Lkotlin/sequences/f$a;->biw:Lkotlin/sequences/f;
 
     invoke-static {v2}, Lkotlin/sequences/f;->access$getSendWhen$p(Lkotlin/sequences/f;)Z
 
@@ -122,18 +122,18 @@
 
     if-ne v1, v2, :cond_0
 
-    iput-object v0, p0, Lkotlin/sequences/f$a;->bil:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/sequences/f$a;->biv:Ljava/lang/Object;
 
     const/4 v0, 0x1
 
-    iput v0, p0, Lkotlin/sequences/f$a;->bik:I
+    iput v0, p0, Lkotlin/sequences/f$a;->biu:I
 
     return-void
 
     :cond_1
     const/4 v0, 0x0
 
-    iput v0, p0, Lkotlin/sequences/f$a;->bik:I
+    iput v0, p0, Lkotlin/sequences/f$a;->biu:I
 
     return-void
 .end method
@@ -143,16 +143,16 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/f$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->CY()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->Db()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/f$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
 
     const/4 v1, 0x1
 
@@ -174,26 +174,26 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/sequences/f$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/f$a;->CY()V
+    invoke-direct {p0}, Lkotlin/sequences/f$a;->Db()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/f$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/f$a;->biu:I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/f$a;->bil:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/f$a;->biv:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lkotlin/sequences/f$a;->bil:Ljava/lang/Object;
+    iput-object v2, p0, Lkotlin/sequences/f$a;->biv:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlin/sequences/f$a;->bik:I
+    iput v1, p0, Lkotlin/sequences/f$a;->biu: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 56e14de50c..699177f761 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 bif:Lkotlin/sequences/Sequence;
+.field private final bip:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field private final bii:Z
+.field private final bis:Z
 
-.field private final bij:Lkotlin/jvm/functions/Function1;
+.field private final bit: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;->bif:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/f;->bip:Lkotlin/sequences/Sequence;
 
-    iput-boolean p2, p0, Lkotlin/sequences/f;->bii:Z
+    iput-boolean p2, p0, Lkotlin/sequences/f;->bis:Z
 
-    iput-object p3, p0, Lkotlin/sequences/f;->bij:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lkotlin/sequences/f;->bit:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 .method public static final synthetic access$getPredicate$p(Lkotlin/sequences/f;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/f;->bij:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/f;->bit:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -88,7 +88,7 @@
 .method public static final synthetic access$getSendWhen$p(Lkotlin/sequences/f;)Z
     .locals 0
 
-    iget-boolean p0, p0, Lkotlin/sequences/f;->bii:Z
+    iget-boolean p0, p0, Lkotlin/sequences/f;->bis:Z
 
     return p0
 .end method
@@ -96,7 +96,7 @@
 .method public static final synthetic access$getSequence$p(Lkotlin/sequences/f;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/f;->bif:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/f;->bip: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 7d9ed19f90..eb3c76edad 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 acy:Ljava/util/Iterator;
+.field private final acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,9 @@
     .end annotation
 .end field
 
-.field private bip:Ljava/util/Iterator;
+.field final synthetic biA:Lkotlin/sequences/g;
+
+.field private biz:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -46,8 +48,6 @@
     .end annotation
 .end field
 
-.field final synthetic biq:Lkotlin/sequences/g;
-
 
 # direct methods
 .method constructor <init>(Lkotlin/sequences/g;)V
@@ -58,7 +58,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/g$a;->biq:Lkotlin/sequences/g;
+    iput-object p1, p0, Lkotlin/sequences/g$a;->biA: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;->acy:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/g$a;->acH:Ljava/util/Iterator;
 
     return-void
 .end method
 
-.method private final CZ()Z
+.method private final Dc()Z
     .locals 4
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->bip:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
 
     if-eqz v0, :cond_0
 
@@ -90,16 +90,16 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlin/sequences/g$a;->bip:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/g$a;->bip:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->acH: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;->biq:Lkotlin/sequences/g;
+    iget-object v2, p0, Lkotlin/sequences/g$a;->biA:Lkotlin/sequences/g;
 
     invoke-static {v2}, Lkotlin/sequences/g;->access$getIterator$p(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v2
 
-    iget-object v3, p0, Lkotlin/sequences/g$a;->biq:Lkotlin/sequences/g;
+    iget-object v3, p0, Lkotlin/sequences/g$a;->biA:Lkotlin/sequences/g;
 
     invoke-static {v3}, Lkotlin/sequences/g;->access$getTransformer$p(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
 
@@ -146,7 +146,7 @@
 
     if-eqz v2, :cond_0
 
-    iput-object v0, p0, Lkotlin/sequences/g$a;->bip:Ljava/util/Iterator;
+    iput-object v0, p0, Lkotlin/sequences/g$a;->biz: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;->CZ()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Dc()Z
 
     move-result v0
 
@@ -172,13 +172,13 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/g$a;->CZ()Z
+    invoke-direct {p0}, Lkotlin/sequences/g$a;->Dc()Z
 
     move-result v0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lkotlin/sequences/g$a;->bip:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/g$a;->biz:Ljava/util/Iterator;
 
     if-nez v0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlin/sequences/g.smali b/com.discord/smali_classes2/kotlin/sequences/g.smali
index 2e0451bfe3..da02f9c93d 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 bif:Lkotlin/sequences/Sequence;
+.field private final bip:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -33,7 +33,7 @@
     .end annotation
 .end field
 
-.field private final bin:Lkotlin/jvm/functions/Function1;
+.field private final bix: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 bio:Lkotlin/jvm/functions/Function1;
+.field private final biy: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;->bif:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/g;->bip:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/g;->bin:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/g;->bix:Lkotlin/jvm/functions/Function1;
 
-    iput-object p3, p0, Lkotlin/sequences/g;->bio:Lkotlin/jvm/functions/Function1;
+    iput-object p3, p0, Lkotlin/sequences/g;->biy:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -97,7 +97,7 @@
 .method public static final synthetic access$getIterator$p(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/g;->bio:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/g;->biy:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -105,7 +105,7 @@
 .method public static final synthetic access$getSequence$p(Lkotlin/sequences/g;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/g;->bif:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/g;->bip:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -113,7 +113,7 @@
 .method public static final synthetic access$getTransformer$p(Lkotlin/sequences/g;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/g;->bin:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/g;->bix:Lkotlin/jvm/functions/Function1;
 
     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 b965fa0885..f128e712e9 100644
--- a/com.discord/smali_classes2/kotlin/sequences/h$a.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/h$a.smali
@@ -28,9 +28,11 @@
 
 
 # instance fields
-.field private bik:I
+.field final synthetic biD:Lkotlin/sequences/h;
 
-.field private bil:Ljava/lang/Object;
+.field private biu:I
+
+.field private biv:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -38,8 +40,6 @@
     .end annotation
 .end field
 
-.field final synthetic bit:Lkotlin/sequences/h;
-
 
 # direct methods
 .method constructor <init>(Lkotlin/sequences/h;)V
@@ -50,27 +50,27 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/h$a;->bit:Lkotlin/sequences/h;
+    iput-object p1, p0, Lkotlin/sequences/h$a;->biD:Lkotlin/sequences/h;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 p1, -0x2
 
-    iput p1, p0, Lkotlin/sequences/h$a;->bik:I
+    iput p1, p0, Lkotlin/sequences/h$a;->biu:I
 
     return-void
 .end method
 
-.method private final CY()V
+.method private final Db()V
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/h$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
 
     const/4 v1, -0x2
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->bit:Lkotlin/sequences/h;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biD:Lkotlin/sequences/h;
 
     invoke-static {v0}, Lkotlin/sequences/h;->access$getGetInitialValue$p(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function0;
 
@@ -83,13 +83,13 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lkotlin/sequences/h$a;->bit:Lkotlin/sequences/h;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biD:Lkotlin/sequences/h;
 
     invoke-static {v0}, Lkotlin/sequences/h;->access$getGetNextValue$p(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/h$a;->bil:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlin/sequences/h$a;->biv:Ljava/lang/Object;
 
     if-nez v1, :cond_1
 
@@ -101,9 +101,9 @@
     move-result-object v0
 
     :goto_0
-    iput-object v0, p0, Lkotlin/sequences/h$a;->bil:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlin/sequences/h$a;->biv:Ljava/lang/Object;
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->bil:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biv: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;->bik:I
+    iput v0, p0, Lkotlin/sequences/h$a;->biu:I
 
     return-void
 .end method
@@ -125,14 +125,14 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/sequences/h$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->CY()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->Db()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/h$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
 
     const/4 v1, 0x1
 
@@ -154,24 +154,24 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlin/sequences/h$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
 
     if-gez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlin/sequences/h$a;->CY()V
+    invoke-direct {p0}, Lkotlin/sequences/h$a;->Db()V
 
     :cond_0
-    iget v0, p0, Lkotlin/sequences/h$a;->bik:I
+    iget v0, p0, Lkotlin/sequences/h$a;->biu:I
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/sequences/h$a;->bil:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlin/sequences/h$a;->biv:Ljava/lang/Object;
 
     if-eqz v0, :cond_1
 
     const/4 v1, -0x1
 
-    iput v1, p0, Lkotlin/sequences/h$a;->bik:I
+    iput v1, p0, Lkotlin/sequences/h$a;->biu: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 51476bad2a..89661e86d9 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 bir:Lkotlin/jvm/functions/Function0;
+.field private final biB: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 bis:Lkotlin/jvm/functions/Function1;
+.field private final biC: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;->bir:Lkotlin/jvm/functions/Function0;
+    iput-object p1, p0, Lkotlin/sequences/h;->biB:Lkotlin/jvm/functions/Function0;
 
-    iput-object p2, p0, Lkotlin/sequences/h;->bis:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/h;->biC:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 .method public static final synthetic access$getGetInitialValue$p(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function0;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/h;->bir:Lkotlin/jvm/functions/Function0;
+    iget-object p0, p0, Lkotlin/sequences/h;->biB:Lkotlin/jvm/functions/Function0;
 
     return-object p0
 .end method
@@ -80,7 +80,7 @@
 .method public static final synthetic access$getGetNextValue$p(Lkotlin/sequences/h;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/h;->bis:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/h;->biC: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 328d3fed58..9b8dd4e0c1 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 biu:Lkotlin/sequences/l$a;
+.field public static final biE: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;->biu:Lkotlin/sequences/l$a;
+    sput-object v0, Lkotlin/sequences/l$a;->biE: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 8cacad65e4..84bdbed204 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 biv:Lkotlin/sequences/l$b;
+.field public static final biF: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;->biv:Lkotlin/sequences/l$b;
+    sput-object v0, Lkotlin/sequences/l$b;->biF: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 e11e34754b..badf6210a1 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 biw:Lkotlin/sequences/l$c;
+.field public static final biG: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;->biw:Lkotlin/sequences/l$c;
+    sput-object v0, Lkotlin/sequences/l$c;->biG: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 1451c8d6fb..3189a7d6a8 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 bix:Lkotlin/sequences/Sequence;
+.field final synthetic biH:Lkotlin/sequences/Sequence;
 
 
 # direct methods
 .method public constructor <init>(Lkotlin/sequences/Sequence;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlin/sequences/n$a;->bix:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$a;->biH: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;->bix:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$a;->biH: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 5b9a2f307a..d30d4cb23c 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 biy:Lkotlin/sequences/n$b;
+.field public static final biI: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;->biy:Lkotlin/sequences/n$b;
+    sput-object v0, Lkotlin/sequences/n$b;->biI: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 d6e150bd18..9dd4136ff0 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 biz:Lkotlin/sequences/n$c;
+.field public static final biJ: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;->biz:Lkotlin/sequences/n$c;
+    sput-object v0, Lkotlin/sequences/n$c;->biJ: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 f8cdf030a9..2580230d80 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 biA:Lkotlin/sequences/Sequence;
+.field final synthetic biK:Lkotlin/sequences/Sequence;
 
 
 # direct methods
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/n$d;->biA:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$d;->biK: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;->biA:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$d;->biK:Lkotlin/sequences/Sequence;
 
     invoke-static {v0}, Lkotlin/sequences/i;->toMutableList(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 fb0cad57d4..f61c9a8c49 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 biB:Lkotlin/sequences/Sequence;
+.field final synthetic biL:Lkotlin/sequences/Sequence;
 
 
 # direct methods
@@ -44,7 +44,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/n$e;->biB:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/n$e;->biL: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;->biB:Lkotlin/sequences/Sequence;
+    iget-object v0, p0, Lkotlin/sequences/n$e;->biL:Lkotlin/sequences/Sequence;
 
     invoke-static {v0}, Lkotlin/sequences/i;->toMutableList(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 8ecdb9009b..4882214c06 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 acy:Ljava/util/Iterator;
+.field private final acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biC:Lkotlin/sequences/o;
+.field final synthetic biM:Lkotlin/sequences/o;
 
 .field private position:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/o$a;->biC:Lkotlin/sequences/o;
+    iput-object p1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -63,18 +63,18 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlin/sequences/o$a;->acy:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/o$a;->acH:Ljava/util/Iterator;
 
     return-void
 .end method
 
-.method private final CX()V
+.method private final Da()V
     .locals 2
 
     :goto_0
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->biC:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
 
     invoke-static {v1}, Lkotlin/sequences/o;->access$getStartIndex$p(Lkotlin/sequences/o;)I
 
@@ -82,7 +82,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/o$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acH:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -111,11 +111,11 @@
 .method public final hasNext()Z
     .locals 2
 
-    invoke-direct {p0}, Lkotlin/sequences/o$a;->CX()V
+    invoke-direct {p0}, Lkotlin/sequences/o$a;->Da()V
 
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->biC:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
 
     invoke-static {v1}, Lkotlin/sequences/o;->access$getEndIndex$p(Lkotlin/sequences/o;)I
 
@@ -123,7 +123,7 @@
 
     if-ge v0, v1, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/o$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acH:Ljava/util/Iterator;
 
     invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
 
@@ -149,11 +149,11 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lkotlin/sequences/o$a;->CX()V
+    invoke-direct {p0}, Lkotlin/sequences/o$a;->Da()V
 
     iget v0, p0, Lkotlin/sequences/o$a;->position:I
 
-    iget-object v1, p0, Lkotlin/sequences/o$a;->biC:Lkotlin/sequences/o;
+    iget-object v1, p0, Lkotlin/sequences/o$a;->biM:Lkotlin/sequences/o;
 
     invoke-static {v1}, Lkotlin/sequences/o;->access$getEndIndex$p(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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/o$a;->acH: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 f6987b46ff..95e58edf2f 100644
--- a/com.discord/smali_classes2/kotlin/sequences/o.smali
+++ b/com.discord/smali_classes2/kotlin/sequences/o.smali
@@ -23,9 +23,9 @@
 
 
 # instance fields
-.field private final Bn:I
+.field private final Bo:I
 
-.field private final bif:Lkotlin/sequences/Sequence;
+.field private final bip:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -54,11 +54,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlin/sequences/o;->bif:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/o;->bip:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/o;->startIndex:I
 
-    iput p3, p0, Lkotlin/sequences/o;->Bn:I
+    iput p3, p0, Lkotlin/sequences/o;->Bo: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;->Bn:I
+    iget p1, p0, Lkotlin/sequences/o;->Bo:I
 
     if-ltz p1, :cond_1
 
@@ -92,7 +92,7 @@
     :goto_1
     if-eqz p1, :cond_4
 
-    iget p1, p0, Lkotlin/sequences/o;->Bn:I
+    iget p1, p0, Lkotlin/sequences/o;->Bo: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;->Bn:I
+    iget p2, p0, Lkotlin/sequences/o;->Bo: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;->Bn:I
+    iget p2, p0, Lkotlin/sequences/o;->Bo:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -201,7 +201,7 @@
 .method public static final synthetic access$getEndIndex$p(Lkotlin/sequences/o;)I
     .locals 0
 
-    iget p0, p0, Lkotlin/sequences/o;->Bn:I
+    iget p0, p0, Lkotlin/sequences/o;->Bo:I
 
     return p0
 .end method
@@ -209,7 +209,7 @@
 .method public static final synthetic access$getSequence$p(Lkotlin/sequences/o;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/o;->bif:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/o;->bip: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;->Bn:I
+    iget v0, p0, Lkotlin/sequences/o;->Bo:I
 
     iget v1, p0, Lkotlin/sequences/o;->startIndex:I
 
@@ -261,13 +261,13 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/o;
 
-    iget-object v1, p0, Lkotlin/sequences/o;->bif:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/o;->bip:Lkotlin/sequences/Sequence;
 
     iget v2, p0, Lkotlin/sequences/o;->startIndex:I
 
     add-int/2addr v2, p1
 
-    iget p1, p0, Lkotlin/sequences/o;->Bn:I
+    iget p1, p0, Lkotlin/sequences/o;->Bo:I
 
     invoke-direct {v0, v1, v2, p1}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
@@ -320,7 +320,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/o;
 
-    iget-object v1, p0, Lkotlin/sequences/o;->bif:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/o;->bip: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 f72d529584..0df02d80c4 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 acy:Ljava/util/Iterator;
+.field private final acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biD:Lkotlin/sequences/p;
+.field final synthetic biN:Lkotlin/sequences/p;
 
 .field private left:I
 
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/p$a;->biD:Lkotlin/sequences/p;
+    iput-object p1, p0, Lkotlin/sequences/p$a;->biN: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;->acy:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/p$a;->acH:Ljava/util/Iterator;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 
     if-lez v0, :cond_0
 
-    iget-object v0, p0, Lkotlin/sequences/p$a;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/p$a;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/p$a;->acH: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 175972e6f4..f7fd5fc198 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 bif:Lkotlin/sequences/Sequence;
+.field private final bip: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;->bif:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/p;->bip:Lkotlin/sequences/Sequence;
 
     iput p2, p0, Lkotlin/sequences/p;->count:I
 
@@ -115,7 +115,7 @@
 .method public static final synthetic access$getSequence$p(Lkotlin/sequences/p;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/p;->bif:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/p;->bip:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -145,7 +145,7 @@
     :cond_0
     new-instance v1, Lkotlin/sequences/o;
 
-    iget-object v2, p0, Lkotlin/sequences/p;->bif:Lkotlin/sequences/Sequence;
+    iget-object v2, p0, Lkotlin/sequences/p;->bip:Lkotlin/sequences/Sequence;
 
     invoke-direct {v1, v2, p1, v0}, Lkotlin/sequences/o;-><init>(Lkotlin/sequences/Sequence;II)V
 
@@ -196,7 +196,7 @@
     :cond_0
     new-instance v0, Lkotlin/sequences/p;
 
-    iget-object v1, p0, Lkotlin/sequences/p;->bif:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/p;->bip: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 9774c618c3..840b896f69 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 acy:Ljava/util/Iterator;
+.field private final acH:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final synthetic biE:Lkotlin/sequences/q;
+.field final synthetic biO:Lkotlin/sequences/q;
 
 
 # direct methods
@@ -49,7 +49,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/sequences/q$a;->biE:Lkotlin/sequences/q;
+    iput-object p1, p0, Lkotlin/sequences/q$a;->biO: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;->acy:Ljava/util/Iterator;
+    iput-object p1, p0, Lkotlin/sequences/q$a;->acH: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;->acy:Ljava/util/Iterator;
+    iget-object v0, p0, Lkotlin/sequences/q$a;->acH: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;->biE:Lkotlin/sequences/q;
+    iget-object v0, p0, Lkotlin/sequences/q$a;->biO:Lkotlin/sequences/q;
 
     invoke-static {v0}, Lkotlin/sequences/q;->access$getTransformer$p(Lkotlin/sequences/q;)Lkotlin/jvm/functions/Function1;
 
     move-result-object v0
 
-    iget-object v1, p0, Lkotlin/sequences/q$a;->acy:Ljava/util/Iterator;
+    iget-object v1, p0, Lkotlin/sequences/q$a;->acH: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 fc07567640..b4edb9cc3a 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 bif:Lkotlin/sequences/Sequence;
+.field private final bip:Lkotlin/sequences/Sequence;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/sequences/Sequence<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field private final bin:Lkotlin/jvm/functions/Function1;
+.field private final bix: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;->bif:Lkotlin/sequences/Sequence;
+    iput-object p1, p0, Lkotlin/sequences/q;->bip:Lkotlin/sequences/Sequence;
 
-    iput-object p2, p0, Lkotlin/sequences/q;->bin:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlin/sequences/q;->bix:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 .method public static final synthetic access$getSequence$p(Lkotlin/sequences/q;)Lkotlin/sequences/Sequence;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/q;->bif:Lkotlin/sequences/Sequence;
+    iget-object p0, p0, Lkotlin/sequences/q;->bip:Lkotlin/sequences/Sequence;
 
     return-object p0
 .end method
@@ -82,7 +82,7 @@
 .method public static final synthetic access$getTransformer$p(Lkotlin/sequences/q;)Lkotlin/jvm/functions/Function1;
     .locals 0
 
-    iget-object p0, p0, Lkotlin/sequences/q;->bin:Lkotlin/jvm/functions/Function1;
+    iget-object p0, p0, Lkotlin/sequences/q;->bix:Lkotlin/jvm/functions/Function1;
 
     return-object p0
 .end method
@@ -111,9 +111,9 @@
 
     new-instance v0, Lkotlin/sequences/g;
 
-    iget-object v1, p0, Lkotlin/sequences/q;->bif:Lkotlin/sequences/Sequence;
+    iget-object v1, p0, Lkotlin/sequences/q;->bip:Lkotlin/sequences/Sequence;
 
-    iget-object v2, p0, Lkotlin/sequences/q;->bin:Lkotlin/jvm/functions/Function1;
+    iget-object v2, p0, Lkotlin/sequences/q;->bix: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/Regex$b.smali b/com.discord/smali_classes2/kotlin/text/Regex$b.smali
index 85249d02d4..c2222696d8 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 biV:Lkotlin/text/Regex$b$a;
+.field public static final bjf: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>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/text/Regex$b;->biV:Lkotlin/text/Regex$b$a;
+    sput-object v0, Lkotlin/text/Regex$b;->bjf: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 462893668d..8a5ee8c53d 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 biW:Lkotlin/text/Regex$d;
+.field public static final bjg: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;->biW:Lkotlin/text/Regex$d;
+    sput-object v0, Lkotlin/text/Regex$d;->bjg:Lkotlin/text/Regex$d;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/text/Regex.smali b/com.discord/smali_classes2/kotlin/text/Regex.smali
index 7d414bf2a4..90c1fdce88 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 biU:Lkotlin/text/Regex$a;
+.field public static final bje:Lkotlin/text/Regex$a;
 
 
 # instance fields
@@ -44,7 +44,7 @@
 
     invoke-direct {v0, v1}, Lkotlin/text/Regex$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 
-    sput-object v0, Lkotlin/text/Regex;->biU:Lkotlin/text/Regex$a;
+    sput-object v0, Lkotlin/text/Regex;->bje:Lkotlin/text/Regex$a;
 
     return-void
 .end method
@@ -80,7 +80,7 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlin/text/Regex;->biU:Lkotlin/text/Regex$a;
+    sget-object v0, Lkotlin/text/Regex;->bje:Lkotlin/text/Regex$a;
 
     invoke-virtual {p2}, Lkotlin/text/k;->getValue()I
 
@@ -209,7 +209,7 @@
 
     check-cast v0, Lkotlin/jvm/functions/Function0;
 
-    sget-object p1, Lkotlin/text/Regex$d;->biW:Lkotlin/text/Regex$d;
+    sget-object p1, Lkotlin/text/Regex$d;->bjg: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 c039ea770e..633442c234 100644
--- a/com.discord/smali_classes2/kotlin/text/d.smali
+++ b/com.discord/smali_classes2/kotlin/text/d.smali
@@ -6,17 +6,17 @@
 # static fields
 .field public static final UTF_16:Ljava/nio/charset/Charset;
 
-.field public static final biF:Ljava/nio/charset/Charset;
+.field public static final biP:Ljava/nio/charset/Charset;
 
-.field public static final biG:Ljava/nio/charset/Charset;
+.field public static final biQ:Ljava/nio/charset/Charset;
 
-.field public static final biH:Ljava/nio/charset/Charset;
+.field public static final biR:Ljava/nio/charset/Charset;
 
-.field public static final biI:Ljava/nio/charset/Charset;
+.field public static final biS:Ljava/nio/charset/Charset;
 
-.field public static final biJ:Lkotlin/text/d;
+.field public static final biT:Lkotlin/text/d;
 
-.field public static final tx:Ljava/nio/charset/Charset;
+.field public static final tw:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lkotlin/text/d;-><init>()V
 
-    sput-object v0, Lkotlin/text/d;->biJ:Lkotlin/text/d;
+    sput-object v0, Lkotlin/text/d;->biT:Lkotlin/text/d;
 
     const-string v0, "UTF-8"
 
@@ -39,7 +39,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lkotlin/text/d;->tx:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->tw:Ljava/nio/charset/Charset;
 
     const-string v0, "UTF-16"
 
@@ -63,7 +63,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lkotlin/text/d;->biF:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biP:Ljava/nio/charset/Charset;
 
     const-string v0, "UTF-16LE"
 
@@ -75,7 +75,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lkotlin/text/d;->biG:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biQ:Ljava/nio/charset/Charset;
 
     const-string v0, "US-ASCII"
 
@@ -87,7 +87,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lkotlin/text/d;->biH:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biR:Ljava/nio/charset/Charset;
 
     const-string v0, "ISO-8859-1"
 
@@ -99,7 +99,7 @@
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sput-object v0, Lkotlin/text/d;->biI:Ljava/nio/charset/Charset;
+    sput-object v0, Lkotlin/text/d;->biS:Ljava/nio/charset/Charset;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlin/text/e$a.smali b/com.discord/smali_classes2/kotlin/text/e$a.smali
index 856a27e605..b5f534d71a 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 biM:I
+.field private biW:I
 
-.field private biN:I
+.field private biX:I
 
-.field private biO:Lkotlin/ranges/IntRange;
+.field private biY:Lkotlin/ranges/IntRange;
 
-.field private biP:I
+.field private biZ:I
 
-.field final synthetic biQ:Lkotlin/text/e;
+.field private biu:I
 
-.field private bik:I
+.field final synthetic bja:Lkotlin/text/e;
 
 
 # direct methods
@@ -51,13 +51,13 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iput-object p1, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lkotlin/text/e$a;->bik:I
+    iput v0, p0, Lkotlin/text/e$a;->biu:I
 
     invoke-static {p1}, Lkotlin/text/e;->access$getStartIndex$p(Lkotlin/text/e;)I
 
@@ -77,34 +77,34 @@
 
     move-result p1
 
-    iput p1, p0, Lkotlin/text/e$a;->biM:I
+    iput p1, p0, Lkotlin/text/e$a;->biW:I
 
-    iget p1, p0, Lkotlin/text/e$a;->biM:I
+    iget p1, p0, Lkotlin/text/e$a;->biW:I
 
-    iput p1, p0, Lkotlin/text/e$a;->biN:I
+    iput p1, p0, Lkotlin/text/e$a;->biX:I
 
     return-void
 .end method
 
-.method private final CY()V
+.method private final Db()V
     .locals 6
 
-    iget v0, p0, Lkotlin/text/e$a;->biN:I
+    iget v0, p0, Lkotlin/text/e$a;->biX:I
 
     const/4 v1, 0x0
 
     if-gez v0, :cond_0
 
-    iput v1, p0, Lkotlin/text/e$a;->bik:I
+    iput v1, p0, Lkotlin/text/e$a;->biu:I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lkotlin/text/e$a;->biO:Lkotlin/ranges/IntRange;
+    iput-object v0, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v0, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v0}, Lkotlin/text/e;->access$getLimit$p(Lkotlin/text/e;)I
 
@@ -116,15 +116,15 @@
 
     if-lez v0, :cond_1
 
-    iget v0, p0, Lkotlin/text/e$a;->biP:I
+    iget v0, p0, Lkotlin/text/e$a;->biZ:I
 
     add-int/2addr v0, v3
 
-    iput v0, p0, Lkotlin/text/e$a;->biP:I
+    iput v0, p0, Lkotlin/text/e$a;->biZ:I
 
-    iget v0, p0, Lkotlin/text/e$a;->biP:I
+    iget v0, p0, Lkotlin/text/e$a;->biZ:I
 
-    iget-object v4, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->access$getLimit$p(Lkotlin/text/e;)I
 
@@ -133,9 +133,9 @@
     if-ge v0, v4, :cond_2
 
     :cond_1
-    iget v0, p0, Lkotlin/text/e$a;->biN:I
+    iget v0, p0, Lkotlin/text/e$a;->biX:I
 
-    iget-object v4, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->access$getInput$p(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;->biM:I
+    iget v0, p0, Lkotlin/text/e$a;->biW:I
 
     new-instance v1, Lkotlin/ranges/IntRange;
 
-    iget-object v4, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->access$getInput$p(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;->biO:Lkotlin/ranges/IntRange;
+    iput-object v1, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
 
-    iput v2, p0, Lkotlin/text/e$a;->biN:I
+    iput v2, p0, Lkotlin/text/e$a;->biX:I
 
     goto :goto_0
 
     :cond_3
-    iget-object v0, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v0, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v0}, Lkotlin/text/e;->access$getGetNextMatch$p(Lkotlin/text/e;)Lkotlin/jvm/functions/Function2;
 
     move-result-object v0
 
-    iget-object v4, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->access$getInput$p(Lkotlin/text/e;)Ljava/lang/CharSequence;
 
     move-result-object v4
 
-    iget v5, p0, Lkotlin/text/e$a;->biN:I
+    iget v5, p0, Lkotlin/text/e$a;->biX: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;->biM:I
+    iget v0, p0, Lkotlin/text/e$a;->biW:I
 
     new-instance v1, Lkotlin/ranges/IntRange;
 
-    iget-object v4, p0, Lkotlin/text/e$a;->biQ:Lkotlin/text/e;
+    iget-object v4, p0, Lkotlin/text/e$a;->bja:Lkotlin/text/e;
 
     invoke-static {v4}, Lkotlin/text/e;->access$getInput$p(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;->biO:Lkotlin/ranges/IntRange;
+    iput-object v1, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
 
-    iput v2, p0, Lkotlin/text/e$a;->biN:I
+    iput v2, p0, Lkotlin/text/e$a;->biX:I
 
     goto :goto_0
 
@@ -240,19 +240,19 @@
 
     move-result v0
 
-    iget v4, p0, Lkotlin/text/e$a;->biM:I
+    iget v4, p0, Lkotlin/text/e$a;->biW:I
 
     invoke-static {v4, v2}, Lkotlin/ranges/c;->until(II)Lkotlin/ranges/IntRange;
 
     move-result-object v4
 
-    iput-object v4, p0, Lkotlin/text/e$a;->biO:Lkotlin/ranges/IntRange;
+    iput-object v4, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
 
     add-int/2addr v2, v0
 
-    iput v2, p0, Lkotlin/text/e$a;->biM:I
+    iput v2, p0, Lkotlin/text/e$a;->biW:I
 
-    iget v2, p0, Lkotlin/text/e$a;->biM:I
+    iget v2, p0, Lkotlin/text/e$a;->biW:I
 
     if-nez v0, :cond_5
 
@@ -261,10 +261,10 @@
     :cond_5
     add-int/2addr v2, v1
 
-    iput v2, p0, Lkotlin/text/e$a;->biN:I
+    iput v2, p0, Lkotlin/text/e$a;->biX:I
 
     :goto_0
-    iput v3, p0, Lkotlin/text/e$a;->bik:I
+    iput v3, p0, Lkotlin/text/e$a;->biu:I
 
     return-void
 .end method
@@ -274,16 +274,16 @@
 .method public final hasNext()Z
     .locals 2
 
-    iget v0, p0, Lkotlin/text/e$a;->bik:I
+    iget v0, p0, Lkotlin/text/e$a;->biu:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->CY()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->Db()V
 
     :cond_0
-    iget v0, p0, Lkotlin/text/e$a;->bik:I
+    iget v0, p0, Lkotlin/text/e$a;->biu:I
 
     const/4 v1, 0x1
 
@@ -310,28 +310,28 @@
 .method public final next()Lkotlin/ranges/IntRange;
     .locals 3
 
-    iget v0, p0, Lkotlin/text/e$a;->bik:I
+    iget v0, p0, Lkotlin/text/e$a;->biu:I
 
     const/4 v1, -0x1
 
     if-ne v0, v1, :cond_0
 
-    invoke-direct {p0}, Lkotlin/text/e$a;->CY()V
+    invoke-direct {p0}, Lkotlin/text/e$a;->Db()V
 
     :cond_0
-    iget v0, p0, Lkotlin/text/e$a;->bik:I
+    iget v0, p0, Lkotlin/text/e$a;->biu:I
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lkotlin/text/e$a;->biO:Lkotlin/ranges/IntRange;
+    iget-object v0, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
 
     if-eqz v0, :cond_1
 
     const/4 v2, 0x0
 
-    iput-object v2, p0, Lkotlin/text/e$a;->biO:Lkotlin/ranges/IntRange;
+    iput-object v2, p0, Lkotlin/text/e$a;->biY:Lkotlin/ranges/IntRange;
 
-    iput v1, p0, Lkotlin/text/e$a;->bik:I
+    iput v1, p0, Lkotlin/text/e$a;->biu: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 2cda1259d3..600d921a44 100644
--- a/com.discord/smali_classes2/kotlin/text/i$a.smali
+++ b/com.discord/smali_classes2/kotlin/text/i$a.smali
@@ -23,7 +23,7 @@
 
 
 # instance fields
-.field final synthetic biT:Lkotlin/text/i;
+.field final synthetic bjd:Lkotlin/text/i;
 
 
 # direct methods
@@ -35,7 +35,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/i$a;->biT:Lkotlin/text/i;
+    iput-object p1, p0, Lkotlin/text/i$a;->bjd:Lkotlin/text/i;
 
     invoke-direct {p0}, Lkotlin/a/d;-><init>()V
 
@@ -88,7 +88,7 @@
 .method public final get(I)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lkotlin/text/i$a;->biT:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$a;->bjd:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->access$getMatchResult$p(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
@@ -109,7 +109,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/text/i$a;->biT:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$a;->bjd:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->access$getMatchResult$p(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 9b458bcc8e..bdb14df339 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 biT:Lkotlin/text/i;
+.field final synthetic bjd:Lkotlin/text/i;
 
 
 # direct methods
@@ -39,7 +39,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlin/text/i$b;->biT:Lkotlin/text/i;
+    iput-object p1, p0, Lkotlin/text/i$b;->bjd:Lkotlin/text/i;
 
     invoke-direct {p0}, Lkotlin/a/a;-><init>()V
 
@@ -90,7 +90,7 @@
 .method public final get(I)Lkotlin/text/f;
     .locals 3
 
-    iget-object v0, p0, Lkotlin/text/i$b;->biT:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$b;->bjd:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->access$getMatchResult$p(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
@@ -112,7 +112,7 @@
 
     new-instance v1, Lkotlin/text/f;
 
-    iget-object v2, p0, Lkotlin/text/i$b;->biT:Lkotlin/text/i;
+    iget-object v2, p0, Lkotlin/text/i$b;->bjd:Lkotlin/text/i;
 
     invoke-static {v2}, Lkotlin/text/i;->access$getMatchResult$p(Lkotlin/text/i;)Ljava/util/regex/MatchResult;
 
@@ -139,7 +139,7 @@
 .method public final getSize()I
     .locals 1
 
-    iget-object v0, p0, Lkotlin/text/i$b;->biT:Lkotlin/text/i;
+    iget-object v0, p0, Lkotlin/text/i$b;->bjd:Lkotlin/text/i;
 
     invoke-static {v0}, Lkotlin/text/i;->access$getMatchResult$p(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 ce07dcd13a..21b640e9b8 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 biK:Ljava/lang/CharSequence;
+.field private final biU:Ljava/lang/CharSequence;
 
-.field private final biR:Lkotlin/text/g;
+.field private final bjb:Lkotlin/text/g;
 
-.field private biS:Ljava/util/List;
+.field private bjc: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;->biK:Ljava/lang/CharSequence;
+    iput-object p2, p0, Lkotlin/text/i;->biU: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;->biR:Lkotlin/text/g;
+    iput-object p1, p0, Lkotlin/text/i;->bjb:Lkotlin/text/g;
 
     return-void
 .end method
@@ -76,7 +76,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlin/text/i;->biS:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/text/i;->bjc:Ljava/util/List;
 
     if-nez v0, :cond_0
 
@@ -86,10 +86,10 @@
 
     check-cast v0, Ljava/util/List;
 
-    iput-object v0, p0, Lkotlin/text/i;->biS:Ljava/util/List;
+    iput-object v0, p0, Lkotlin/text/i;->bjc:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lkotlin/text/i;->biS:Ljava/util/List;
+    iget-object v0, p0, Lkotlin/text/i;->bjc:Ljava/util/List;
 
     if-nez v0, :cond_1
 
@@ -170,7 +170,7 @@
     :goto_0
     add-int/2addr v0, v1
 
-    iget-object v1, p0, Lkotlin/text/i;->biK:Ljava/lang/CharSequence;
+    iget-object v1, p0, Lkotlin/text/i;->biU:Ljava/lang/CharSequence;
 
     invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
 
@@ -184,7 +184,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lkotlin/text/i;->biK:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lkotlin/text/i;->biU:Ljava/lang/CharSequence;
 
     invoke-virtual {v1, v2}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;
 
@@ -194,7 +194,7 @@
 
     invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lkotlin/text/i;->biK:Ljava/lang/CharSequence;
+    iget-object v2, p0, Lkotlin/text/i;->biU:Ljava/lang/CharSequence;
 
     invoke-static {v1, v0, v2}, Lkotlin/text/j;->access$findNext(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Lkotlin/text/MatchResult;
 
diff --git a/com.discord/smali_classes2/kotlin/text/k.smali b/com.discord/smali_classes2/kotlin/text/k.smali
index f8e5b3d8f8..ba5a3f4567 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 biX:Lkotlin/text/k;
+.field public static final enum bjh:Lkotlin/text/k;
 
-.field public static final enum biY:Lkotlin/text/k;
+.field public static final enum bji:Lkotlin/text/k;
 
-.field public static final enum biZ:Lkotlin/text/k;
+.field public static final enum bjj:Lkotlin/text/k;
 
-.field public static final enum bja:Lkotlin/text/k;
+.field public static final enum bjk:Lkotlin/text/k;
 
-.field public static final enum bjb:Lkotlin/text/k;
+.field public static final enum bjl:Lkotlin/text/k;
 
-.field public static final enum bjc:Lkotlin/text/k;
+.field public static final enum bjm:Lkotlin/text/k;
 
-.field public static final enum bjd:Lkotlin/text/k;
+.field public static final enum bjn:Lkotlin/text/k;
 
-.field private static final synthetic bje:[Lkotlin/text/k;
+.field private static final synthetic bjo:[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;->biX:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjh: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;->biY:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bji: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;->biZ:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjj: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;->bja:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjk: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;->bjb:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjl: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;->bjc:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjm: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;->bjd:Lkotlin/text/k;
+    sput-object v1, Lkotlin/text/k;->bjn:Lkotlin/text/k;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlin/text/k;->bje:[Lkotlin/text/k;
+    sput-object v0, Lkotlin/text/k;->bjo:[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;->bje:[Lkotlin/text/k;
+    sget-object v0, Lkotlin/text/k;->bjo:[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 253a7db8fb..3d65aaac08 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;->bgn:Lkotlin/s;
+    sget-object p1, Lkotlin/s;->bgx: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;->bgn:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgx:Lkotlin/s;
 
     if-ne v0, v1, :cond_1
 
@@ -118,7 +118,7 @@
 
     iget-object v0, p0, Lkotlin/u;->_value:Ljava/lang/Object;
 
-    sget-object v1, Lkotlin/s;->bgn:Lkotlin/s;
+    sget-object v1, Lkotlin/s;->bgx: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 0a1a274d13..945255c4a7 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 bgp:Z
+.field public static final bgA:Lkotlin/v;
 
-.field public static final bgq:Lkotlin/v;
+.field public static final bgz:Z
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Lkotlin/v;-><init>()V
 
-    sput-object v0, Lkotlin/v;->bgq:Lkotlin/v;
+    sput-object v0, Lkotlin/v;->bgA:Lkotlin/v;
 
     invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -27,7 +27,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lkotlin/v;->bgp:Z
+    sput-boolean v0, Lkotlin/v;->bgz: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 b663d9660d..283c2731dd 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 bjB:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+.field static final synthetic bjL: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;->bjB:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bjL: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 213ff019e3..061919eb39 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 bjA:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+.field public static final bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bjB:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler$a;->bjL:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
-    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjA:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sput-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjK: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 89f77a8e55..93c8f9c184 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 Da()Lkotlin/coroutines/CoroutineContext;
+.method public abstract Dd()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 232b7ff1ad..d12c491421 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 bkt:Lkotlinx/coroutines/Job$b;
+.field static final synthetic bkD: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;->bkt:Lkotlinx/coroutines/Job$b;
+    sput-object v0, Lkotlinx/coroutines/Job$b;->bkD:Lkotlinx/coroutines/Job$b;
 
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjA:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjK: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 8ef13422c0..0efc7d5905 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/Job.smali
@@ -16,26 +16,26 @@
 
 
 # static fields
-.field public static final bks:Lkotlinx/coroutines/Job$b;
+.field public static final bkC:Lkotlinx/coroutines/Job$b;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/Job$b;->bkt:Lkotlinx/coroutines/Job$b;
+    sget-object v0, Lkotlinx/coroutines/Job$b;->bkD:Lkotlinx/coroutines/Job$b;
 
-    sput-object v0, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sput-object v0, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public abstract DS()Ljava/util/concurrent/CancellationException;
+.method public abstract DV()Ljava/util/concurrent/CancellationException;
 .end method
 
-.method public abstract DT()Z
+.method public abstract DW()Z
 .end method
 
 .method public abstract a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/at;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/a.smali b/com.discord/smali_classes2/kotlinx/coroutines/a.smali
index 75e61c1bd0..a683481ca5 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 bjg:Lkotlin/coroutines/CoroutineContext;
+.field private final bjq:Lkotlin/coroutines/CoroutineContext;
 
-.field protected final bjh:Lkotlin/coroutines/CoroutineContext;
+.field protected final bjr:Lkotlin/coroutines/CoroutineContext;
 
 
 # direct methods
@@ -39,9 +39,9 @@
 
     invoke-direct {p0, p2}, Lkotlinx/coroutines/bn;-><init>(Z)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/a;->bjh:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/a;->bjr:Lkotlin/coroutines/CoroutineContext;
 
-    iget-object p1, p0, Lkotlinx/coroutines/a;->bjh:Lkotlin/coroutines/CoroutineContext;
+    iget-object p1, p0, Lkotlinx/coroutines/a;->bjr:Lkotlin/coroutines/CoroutineContext;
 
     move-object p2, p0
 
@@ -51,27 +51,27 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/a;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Da()Lkotlin/coroutines/CoroutineContext;
+.method public final Dd()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
 
-.method public final Db()V
+.method public final De()V
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjh:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjr:Lkotlin/coroutines/CoroutineContext;
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -86,7 +86,7 @@
     return-void
 .end method
 
-.method public final Dc()V
+.method public final Df()V
     .locals 0
 
     invoke-virtual {p0}, Lkotlinx/coroutines/a;->onStart()V
@@ -94,7 +94,7 @@
     return-void
 .end method
 
-.method public Dd()I
+.method public Dg()I
     .locals 1
 
     const/4 v0, 0x0
@@ -102,10 +102,10 @@
     return v0
 .end method
 
-.method public final De()Ljava/lang/String;
+.method public final Dh()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     invoke-static {v0}, Lkotlinx/coroutines/aa;->a(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/String;
 
@@ -113,7 +113,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-super {p0}, Lkotlinx/coroutines/bn;->De()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/bn;->Dh()Ljava/lang/String;
 
     move-result-object v0
 
@@ -132,7 +132,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-super {p0}, Lkotlinx/coroutines/bn;->De()Ljava/lang/String;
+    invoke-super {p0}, Lkotlinx/coroutines/bn;->Dh()Ljava/lang/String;
 
     move-result-object v0
 
@@ -171,7 +171,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Db()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->De()V
 
     move-object v1, p0
 
@@ -264,7 +264,7 @@
 
     if-eq p2, p3, :cond_2
 
-    sget-object p3, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object p3, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p2}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -288,7 +288,7 @@
     :catchall_1
     move-exception p2
 
-    sget-object p3, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object p3, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p2}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -337,7 +337,7 @@
 .method public final getContext()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
@@ -365,7 +365,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/a;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/a;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     invoke-static {v0, p1}, Lkotlinx/coroutines/ad;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Throwable;)V
 
@@ -379,7 +379,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Dd()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Dg()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 49b375a785..d699d68a4d 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {p0, p1}, Lkotlinx/coroutines/aq;->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;->bgl:Lkotlin/m$a;
+    sget-object p1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p0}, Lkotlin/n;->createFailure(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 5393292456..63dce22845 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->Db()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->De()V
 
     :try_start_0
     move-object v0, p0
@@ -80,7 +80,7 @@
 
     if-eqz p1, :cond_2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/a;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/a;->DZ()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -102,7 +102,7 @@
 
     check-cast p0, Lkotlinx/coroutines/internal/t;
 
-    iget-object p0, p0, Lkotlinx/coroutines/internal/t;->blA:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/internal/t;->blK:Lkotlin/coroutines/Continuation;
 
     if-nez p0, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aa.smali b/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
index 2595dd8fde..16a65e08de 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aa.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bjy:Ljava/util/concurrent/atomic/AtomicLong;
+.field private static final bjI:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private static final bjz:Z
+.field private static final bjJ:Z
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/aa;->bjy:Ljava/util/concurrent/atomic/AtomicLong;
+    sput-object v0, Lkotlinx/coroutines/aa;->bjI:Ljava/util/concurrent/atomic/AtomicLong;
 
     const-string v0, "kotlinx.coroutines.scheduler"
 
@@ -80,7 +80,7 @@
     const/4 v0, 0x1
 
     :goto_1
-    sput-boolean v0, Lkotlinx/coroutines/aa;->bjz:Z
+    sput-boolean v0, Lkotlinx/coroutines/aa;->bjJ:Z
 
     return-void
 
@@ -114,14 +114,14 @@
     throw v1
 .end method
 
-.method public static final Dv()Lkotlinx/coroutines/ab;
+.method public static final Dy()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-boolean v0, Lkotlinx/coroutines/aa;->bjz:Z
+    sget-boolean v0, Lkotlinx/coroutines/aa;->bjJ:Z
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bmt:Lkotlinx/coroutines/b/c;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bmD:Lkotlinx/coroutines/b/c;
 
     :goto_0
     check-cast v0, Lkotlinx/coroutines/ab;
@@ -129,7 +129,7 @@
     return-object v0
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/r;->bjt:Lkotlinx/coroutines/r;
+    sget-object v0, Lkotlinx/coroutines/r;->bjD:Lkotlinx/coroutines/r;
 
     goto :goto_0
 .end method
@@ -150,7 +150,7 @@
     return-object v1
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ae;->bjD:Lkotlinx/coroutines/ae$a;
+    sget-object v0, Lkotlinx/coroutines/ae;->bjN:Lkotlinx/coroutines/ae$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -165,7 +165,7 @@
     return-object v1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/af;->bjE:Lkotlinx/coroutines/af$a;
+    sget-object v1, Lkotlinx/coroutines/af;->bjO:Lkotlinx/coroutines/af$a;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -217,7 +217,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->Da()Lkotlin/coroutines/CoroutineContext;
+    invoke-interface {p0}, Lkotlinx/coroutines/CoroutineScope;->Dd()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p0
 
@@ -231,7 +231,7 @@
 
     new-instance p1, Lkotlinx/coroutines/ae;
 
-    sget-object v0, Lkotlinx/coroutines/aa;->bjy:Ljava/util/concurrent/atomic/AtomicLong;
+    sget-object v0, Lkotlinx/coroutines/aa;->bjI: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/as;->DC()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
     if-eq p0, v0, :cond_1
 
-    sget-object v0, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -267,7 +267,7 @@
 
     if-nez p0, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/as;->DC()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/as;->DF()Lkotlinx/coroutines/ab;
 
     move-result-object p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ab.smali b/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
index 4a2cdd6a7f..8282c31445 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ab.smali
@@ -10,7 +10,7 @@
 .method public constructor <init>()V
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v0, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     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 167c54bbdc..f774d836b3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ac.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bjC:Ljava/util/List;
+.field private static final bjM: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/ac;->bjC:Ljava/util/List;
+    sput-object v0, Lkotlinx/coroutines/ac;->bjM:Ljava/util/List;
 
     return-void
 .end method
@@ -55,7 +55,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/ac;->bjC:Ljava/util/List;
+    sget-object v0, Lkotlinx/coroutines/ac;->bjM:Ljava/util/List;
 
     invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ad.smali b/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
index 1d41944c06..da7de600a3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ad.smali
@@ -45,7 +45,7 @@
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjA:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjK:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ae.smali b/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
index a61b5b0879..31b9460351 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ae.smali
@@ -24,7 +24,7 @@
 
 
 # static fields
-.field public static final bjD:Lkotlinx/coroutines/ae$a;
+.field public static final bjN:Lkotlinx/coroutines/ae$a;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/ae$a;-><init>(B)V
 
-    sput-object v0, Lkotlinx/coroutines/ae;->bjD:Lkotlinx/coroutines/ae$a;
+    sput-object v0, Lkotlinx/coroutines/ae;->bjN:Lkotlinx/coroutines/ae$a;
 
     return-void
 .end method
@@ -49,7 +49,7 @@
 .method public constructor <init>(J)V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ae;->bjD:Lkotlinx/coroutines/ae$a;
+    sget-object v0, Lkotlinx/coroutines/ae;->bjN:Lkotlinx/coroutines/ae$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -95,7 +95,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/af;->bjE:Lkotlinx/coroutines/af$a;
+    sget-object v0, Lkotlinx/coroutines/af;->bjO:Lkotlinx/coroutines/af$a;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/af.smali b/com.discord/smali_classes2/kotlinx/coroutines/af.smali
index bada23612d..d945c1b759 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/af.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/af.smali
@@ -12,7 +12,7 @@
 
 
 # static fields
-.field public static final bjE:Lkotlinx/coroutines/af$a;
+.field public static final bjO:Lkotlinx/coroutines/af$a;
 
 
 # instance fields
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/af$a;-><init>(B)V
 
-    sput-object v0, Lkotlinx/coroutines/af;->bjE:Lkotlinx/coroutines/af$a;
+    sput-object v0, Lkotlinx/coroutines/af;->bjO:Lkotlinx/coroutines/af$a;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ag.smali b/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
index 3bae03aa2c..791daba0e3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ag.smali
@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final enum bjF:Lkotlinx/coroutines/ag;
+.field public static final enum bjP:Lkotlinx/coroutines/ag;
 
-.field public static final enum bjG:Lkotlinx/coroutines/ag;
+.field public static final enum bjQ:Lkotlinx/coroutines/ag;
 
-.field public static final enum bjH:Lkotlinx/coroutines/ag;
+.field public static final enum bjR:Lkotlinx/coroutines/ag;
 
-.field public static final enum bjI:Lkotlinx/coroutines/ag;
+.field public static final enum bjS:Lkotlinx/coroutines/ag;
 
-.field private static final synthetic bjJ:[Lkotlinx/coroutines/ag;
+.field private static final synthetic bjT:[Lkotlinx/coroutines/ag;
 
 
 # direct methods
@@ -41,7 +41,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ag;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ag;->bjF:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjP:Lkotlinx/coroutines/ag;
 
     aput-object v1, v0, v2
 
@@ -53,7 +53,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ag;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ag;->bjG:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjQ:Lkotlinx/coroutines/ag;
 
     aput-object v1, v0, v2
 
@@ -65,7 +65,7 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ag;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ag;->bjH:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjR:Lkotlinx/coroutines/ag;
 
     aput-object v1, v0, v2
 
@@ -77,11 +77,11 @@
 
     invoke-direct {v1, v3, v2}, Lkotlinx/coroutines/ag;-><init>(Ljava/lang/String;I)V
 
-    sput-object v1, Lkotlinx/coroutines/ag;->bjI:Lkotlinx/coroutines/ag;
+    sput-object v1, Lkotlinx/coroutines/ag;->bjS:Lkotlinx/coroutines/ag;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/ag;->bjJ:[Lkotlinx/coroutines/ag;
+    sput-object v0, Lkotlinx/coroutines/ag;->bjT:[Lkotlinx/coroutines/ag;
 
     return-void
 .end method
@@ -116,7 +116,7 @@
 .method public static values()[Lkotlinx/coroutines/ag;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ag;->bjJ:[Lkotlinx/coroutines/ag;
+    sget-object v0, Lkotlinx/coroutines/ag;->bjT:[Lkotlinx/coroutines/ag;
 
     invoke-virtual {v0}, [Lkotlinx/coroutines/ag;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ah.smali b/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
index a51b19f246..108425d7df 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ah.smali
@@ -22,7 +22,7 @@
 
     sput-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjF:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjP:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -34,7 +34,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjH:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjR:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -46,7 +46,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjI:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjS:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -58,7 +58,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$0:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjG:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjQ:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -78,7 +78,7 @@
 
     sput-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjF:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjP:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -88,7 +88,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjH:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjR:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -98,7 +98,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjI:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjS:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
@@ -108,7 +108,7 @@
 
     sget-object v0, Lkotlinx/coroutines/ah;->$EnumSwitchMapping$1:[I
 
-    sget-object v1, Lkotlinx/coroutines/ag;->bjG:Lkotlinx/coroutines/ag;
+    sget-object v1, Lkotlinx/coroutines/ag;->bjQ:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v1}, Lkotlinx/coroutines/ag;->ordinal()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aj.smali b/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
index 5cce4acd19..66f60fd50a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aj.smali
@@ -6,7 +6,7 @@
 # static fields
 .field public static final DEBUG:Z
 
-.field public static final bjK:Z
+.field public static final bjU:Z
 
 
 # direct methods
@@ -115,7 +115,7 @@
     const/4 v1, 0x1
 
     :cond_4
-    sput-boolean v1, Lkotlinx/coroutines/aj;->bjK:Z
+    sput-boolean v1, Lkotlinx/coroutines/aj;->bjU:Z
 
     return-void
 
@@ -178,7 +178,7 @@
     const/16 v0, 0x40
 
     :try_start_0
-    sget-object v1, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     new-instance v1, Ljava/lang/StringBuilder;
 
@@ -209,7 +209,7 @@
     :catchall_0
     move-exception v1
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ak.smali b/com.discord/smali_classes2/kotlinx/coroutines/ak.smali
index f941b479e5..dc188d9a66 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ak.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ak.smali
@@ -9,9 +9,9 @@
 # static fields
 .field private static volatile _thread:Ljava/lang/Thread;
 
-.field private static final bjL:J
+.field private static final bjV:J
 
-.field public static final bjM:Lkotlinx/coroutines/ak;
+.field public static final bjW:Lkotlinx/coroutines/ak;
 
 .field private static volatile debugStatus:I
 
@@ -24,7 +24,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ak;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sput-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     invoke-static {v0}, Lkotlinx/coroutines/aw;->a(Lkotlinx/coroutines/aw;)V
 
@@ -61,7 +61,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/ak;->bjL:J
+    sput-wide v0, Lkotlinx/coroutines/ak;->bjV:J
 
     return-void
 .end method
@@ -74,34 +74,7 @@
     return-void
 .end method
 
-.method private static Dw()Z
-    .locals 2
-
-    sget v0, Lkotlinx/coroutines/ak;->debugStatus:I
-
-    const/4 v1, 0x2
-
-    if-eq v0, v1, :cond_1
-
-    const/4 v1, 0x3
-
-    if-ne v0, v1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    return v0
-
-    :cond_1
-    :goto_0
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
-.method private final declared-synchronized Dx()Ljava/lang/Thread;
+.method private final declared-synchronized DA()Ljava/lang/Thread;
     .locals 3
 
     monitor-enter p0
@@ -144,13 +117,13 @@
     throw v0
 .end method
 
-.method private final declared-synchronized Dy()Z
+.method private final declared-synchronized DB()Z
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/ak;->Dw()Z
+    invoke-static {}, Lkotlinx/coroutines/ak;->Dz()Z
 
     move-result v0
     :try_end_0
@@ -190,13 +163,13 @@
     throw v0
 .end method
 
-.method private final declared-synchronized Dz()V
+.method private final declared-synchronized DC()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    invoke-static {}, Lkotlinx/coroutines/ak;->Dw()Z
+    invoke-static {}, Lkotlinx/coroutines/ak;->Dz()Z
 
     move-result v0
     :try_end_0
@@ -214,7 +187,7 @@
     :try_start_1
     sput v0, Lkotlinx/coroutines/ak;->debugStatus:I
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DL()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DO()V
 
     move-object v0, p0
 
@@ -236,16 +209,43 @@
     throw v0
 .end method
 
+.method private static Dz()Z
+    .locals 2
+
+    sget v0, Lkotlinx/coroutines/ak;->debugStatus:I
+
+    const/4 v1, 0x2
+
+    if-eq v0, v1, :cond_1
+
+    const/4 v1, 0x3
+
+    if-ne v0, v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x0
+
+    return v0
+
+    :cond_1
+    :goto_0
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
 
 # virtual methods
-.method protected final Dh()Ljava/lang/Thread;
+.method protected final Dk()Ljava/lang/Thread;
     .locals 1
 
     sget-object v0, Lkotlinx/coroutines/ak;->_thread:Ljava/lang/Thread;
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dx()Ljava/lang/Thread;
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DA()Ljava/lang/Thread;
 
     move-result-object v0
 
@@ -256,7 +256,7 @@
 .method public final run()V
     .locals 12
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
     move-object v0, p0
 
@@ -264,12 +264,12 @@
 
     invoke-static {v0}, Lkotlinx/coroutines/ca;->c(Lkotlinx/coroutines/aw;)V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     const/4 v0, 0x0
 
     :try_start_0
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dy()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DB()Z
 
     move-result v1
     :try_end_0
@@ -279,9 +279,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ak;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dz()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DC()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ak;->isEmpty()Z
 
@@ -289,7 +289,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dh()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dk()Ljava/lang/Thread;
 
     :cond_0
     return-void
@@ -304,7 +304,7 @@
     :try_start_1
     invoke-static {}, Ljava/lang/Thread;->interrupted()Z
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DG()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->DJ()J
 
     move-result-wide v5
 
@@ -318,11 +318,11 @@
 
     if-nez v9, :cond_6
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v9
 
-    invoke-interface {v9}, Lkotlinx/coroutines/cc;->np()J
+    invoke-interface {v9}, Lkotlinx/coroutines/cc;->ns()J
 
     move-result-wide v9
 
@@ -330,7 +330,7 @@
 
     if-nez v11, :cond_3
 
-    sget-wide v3, Lkotlinx/coroutines/ak;->bjL:J
+    sget-wide v3, Lkotlinx/coroutines/ak;->bjV:J
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -345,9 +345,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ak;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dz()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DC()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ak;->isEmpty()Z
 
@@ -355,7 +355,7 @@
 
     if-nez v0, :cond_4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dh()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dk()Ljava/lang/Thread;
 
     :cond_4
     return-void
@@ -369,7 +369,7 @@
     goto :goto_1
 
     :cond_6
-    sget-wide v9, Lkotlinx/coroutines/ak;->bjL:J
+    sget-wide v9, Lkotlinx/coroutines/ak;->bjV:J
 
     invoke-static {v5, v6, v9, v10}, Lkotlin/ranges/c;->coerceAtMost(JJ)J
 
@@ -381,7 +381,7 @@
 
     if-lez v9, :cond_2
 
-    invoke-static {}, Lkotlinx/coroutines/ak;->Dw()Z
+    invoke-static {}, Lkotlinx/coroutines/ak;->Dz()Z
 
     move-result v7
     :try_end_2
@@ -391,9 +391,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ak;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dz()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DC()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ak;->isEmpty()Z
 
@@ -401,14 +401,14 @@
 
     if-nez v0, :cond_8
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dh()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dk()Ljava/lang/Thread;
 
     :cond_8
     return-void
 
     :cond_9
     :try_start_3
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v7
 
@@ -423,9 +423,9 @@
 
     sput-object v0, Lkotlinx/coroutines/ak;->_thread:Ljava/lang/Thread;
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ak;->Dz()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ak;->DC()V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ak;->isEmpty()Z
 
@@ -433,7 +433,7 @@
 
     if-nez v0, :cond_a
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dh()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ak;->Dk()Ljava/lang/Thread;
 
     :cond_a
     goto :goto_3
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/al.smali b/com.discord/smali_classes2/kotlinx/coroutines/al.smali
index fc00048afc..53039e0577 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/al.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/al.smali
@@ -4,26 +4,26 @@
 
 
 # static fields
-.field private static final bjN:Lkotlinx/coroutines/an;
+.field private static final bjX:Lkotlinx/coroutines/an;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     check-cast v0, Lkotlinx/coroutines/an;
 
-    sput-object v0, Lkotlinx/coroutines/al;->bjN:Lkotlinx/coroutines/an;
+    sput-object v0, Lkotlinx/coroutines/al;->bjX:Lkotlinx/coroutines/an;
 
     return-void
 .end method
 
-.method public static final DA()Lkotlinx/coroutines/an;
+.method public static final DD()Lkotlinx/coroutines/an;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/al;->bjN:Lkotlinx/coroutines/an;
+    sget-object v0, Lkotlinx/coroutines/al;->bjX:Lkotlinx/coroutines/an;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/am.smali b/com.discord/smali_classes2/kotlinx/coroutines/am.smali
index cf4e14d1c6..780d60ad56 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/am.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/am.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bjO:Lkotlinx/coroutines/am;
+.field public static final bjY:Lkotlinx/coroutines/am;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/am;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/am;->bjO:Lkotlinx/coroutines/am;
+    sput-object v0, Lkotlinx/coroutines/am;->bjY:Lkotlinx/coroutines/am;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
     return-object p1
 .end method
 
-.method public final np()J
+.method public final ns()J
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali b/com.discord/smali_classes2/kotlinx/coroutines/android/AndroidExceptionPreHandler.smali
index 19936d020f..3b1ec84bcd 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;->bjA:Lkotlinx/coroutines/CoroutineExceptionHandler$a;
+    sget-object v0, Lkotlinx/coroutines/CoroutineExceptionHandler;->bjK: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 7381abeb41..e6027fdd09 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 bkR:Lkotlinx/coroutines/k;
+.field final synthetic blb:Lkotlinx/coroutines/k;
 
 .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;->bkR:Lkotlinx/coroutines/k;
+    iput-object p2, p0, Lkotlinx/coroutines/android/a$a;->blb:Lkotlinx/coroutines/k;
 
     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;->bkR:Lkotlinx/coroutines/k;
+    iget-object v0, p0, Lkotlinx/coroutines/android/a$a;->blb:Lkotlinx/coroutines/k;
 
     iget-object v1, p0, Lkotlinx/coroutines/android/a$a;->this$0:Lkotlinx/coroutines/android/a;
 
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-interface {v0, v1, v2}, Lkotlinx/coroutines/k;->a(Lkotlinx/coroutines/ab;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 51013b3daa..8159b21dc7 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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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 83fae819d6..deff13ab91 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 bkP:Lkotlinx/coroutines/android/a;
+.field private final bkZ:Lkotlinx/coroutines/android/a;
 
-.field private final bkQ:Z
+.field private final bla: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;->bkQ:Z
+    iput-boolean p3, p0, Lkotlinx/coroutines/android/a;->bla:Z
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bkQ:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bla: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;->bkP:Lkotlinx/coroutines/android/a;
+    iput-object p1, p0, Lkotlinx/coroutines/android/a;->bkZ:Lkotlinx/coroutines/android/a;
 
     return-void
 .end method
@@ -160,7 +160,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bkQ:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/android/a;->bla:Z
 
     const/4 v0, 0x1
 
@@ -240,7 +240,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-boolean v1, p0, Lkotlinx/coroutines/android/a;->bkQ:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/android/a;->bla: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 bbd607f116..15c5dfa333 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 bkS:Lkotlinx/coroutines/android/b;
+.field public static final blc:Lkotlinx/coroutines/android/b;
 
 
 # direct methods
@@ -12,7 +12,7 @@
     .locals 3
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     new-instance v0, Lkotlinx/coroutines/android/a;
 
@@ -43,7 +43,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/n;->createFailure(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;->bkS:Lkotlinx/coroutines/android/b;
+    sput-object v0, Lkotlinx/coroutines/android/c;->blc: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 3680fb3290..19a7e1cead 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ao.smali
@@ -25,13 +25,13 @@
 # instance fields
 .field public _state:Ljava/lang/Object;
 
-.field private final bjP:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+.field private final bjZ:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
-.field public final bjQ:Ljava/lang/Object;
+.field public final bka:Ljava/lang/Object;
 
-.field public final bjR:Lkotlinx/coroutines/ab;
+.field public final bkb:Lkotlinx/coroutines/ab;
 
-.field public final bjS:Lkotlin/coroutines/Continuation;
+.field public final bkc:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -65,17 +65,17 @@
 
     invoke-direct {p0, v0}, Lkotlinx/coroutines/ar;-><init>(I)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iput-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
-    iput-object p2, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iput-object p2, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    invoke-static {}, Lkotlinx/coroutines/aq;->DB()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/aq;->DE()Lkotlinx/coroutines/internal/v;
 
     move-result-object p1
 
     iput-object p1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkc: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/ao;->bjP:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    iput-object p1, p0, Lkotlinx/coroutines/ao;->bjZ:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ao;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -96,19 +96,19 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/ao;->bka:Ljava/lang/Object;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Dj()Ljava/lang/Object;
+.method public final Dm()Ljava/lang/Object;
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/aq;->DB()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/aq;->DE()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -124,7 +124,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/aq;->DB()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/aq;->DE()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -148,7 +148,7 @@
     throw v0
 .end method
 
-.method public final Dn()Lkotlin/coroutines/Continuation;
+.method public final Dq()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/ao;->bjP:Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjZ: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/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bkc: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 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bkc: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/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object v2, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     invoke-virtual {v2, v0}, Lkotlinx/coroutines/ab;->b(Lkotlin/coroutines/CoroutineContext;)Z
 
@@ -218,9 +218,9 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/ao;->bjU:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bke:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     move-object v1, p0
 
@@ -231,13 +231,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ef()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DM()Z
 
     move-result v2
 
@@ -245,7 +245,7 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/ao;->bjU:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bke:I
 
     move-object p1, p0
 
@@ -269,7 +269,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iget-object v4, p0, Lkotlinx/coroutines/ao;->bka:Ljava/lang/Object;
 
     invoke-static {v3, v4}, 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 v5, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object v5, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v5, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -290,7 +290,7 @@
     invoke-static {v3, v4}, Lkotlinx/coroutines/internal/z;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V
 
     :cond_2
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DI()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DL()Z
 
     move-result p1
     :try_end_2
@@ -349,7 +349,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     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/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
     invoke-static {v1}, Lkotlinx/coroutines/aj;->a(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ap.smali b/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
index 9268205c58..c140d6320a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ap.smali
@@ -16,7 +16,7 @@
 
 
 # static fields
-.field static final bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/ap;->bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/ap;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 
 
 # virtual methods
-.method public final Dd()I
+.method public final Dg()I
     .locals 1
 
     const/4 v0, 0x0
@@ -110,7 +110,7 @@
     throw p1
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/ap;->bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/ap;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v3, 0x2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aq.smali b/com.discord/smali_classes2/kotlinx/coroutines/aq.smali
index c28dd8f4c7..c08dc2d13e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aq.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aq.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bjT:Lkotlinx/coroutines/internal/v;
+.field private static final bkd: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/aq;->bjT:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/aq;->bkd:Lkotlinx/coroutines/internal/v;
 
     return-void
 .end method
 
-.method public static final synthetic DB()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic DE()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/aq;->bjT:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/aq;->bkd:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
@@ -52,7 +52,7 @@
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
-    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ao;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -68,9 +68,9 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlinx/coroutines/ao;->bjU:I
+    iput v1, p0, Lkotlinx/coroutines/ao;->bke:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ao;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -83,13 +83,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ef()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DM()Z
 
     move-result v2
 
@@ -97,7 +97,7 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iput v1, p0, Lkotlinx/coroutines/ao;->bjU:I
+    iput v1, p0, Lkotlinx/coroutines/ao;->bke:I
 
     check-cast p0, Lkotlinx/coroutines/ar;
 
@@ -117,7 +117,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bkC: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;->DS()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v3}, Lkotlinx/coroutines/Job;->DV()Ljava/util/concurrent/CancellationException;
 
     move-result-object v3
 
     check-cast v3, Ljava/lang/Throwable;
 
-    sget-object v4, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v3}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -167,7 +167,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iget-object v4, p0, Lkotlinx/coroutines/ao;->bka:Ljava/lang/Object;
 
     invoke-static {v3, v4}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -176,9 +176,9 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    sget-object v5, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v5, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -186,7 +186,7 @@
 
     invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -204,7 +204,7 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DI()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DL()Z
 
     move-result p0
     :try_end_2
@@ -238,7 +238,7 @@
     throw p0
 
     :cond_4
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -277,7 +277,7 @@
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
-    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -287,7 +287,7 @@
 
     invoke-direct {v1, p1}, Lkotlinx/coroutines/t;-><init>(Ljava/lang/Throwable;)V
 
-    iget-object v2, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object v2, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     invoke-virtual {v2, v0}, Lkotlinx/coroutines/ab;->b(Lkotlin/coroutines/CoroutineContext;)Z
 
@@ -303,9 +303,9 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/ao;->bjU:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bke:I
 
-    iget-object p1, p0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object p1, p0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     check-cast p0, Ljava/lang/Runnable;
 
@@ -314,13 +314,13 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ef()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DM()Z
 
     move-result v2
 
@@ -328,7 +328,7 @@
 
     iput-object v1, p0, Lkotlinx/coroutines/ao;->_state:Ljava/lang/Object;
 
-    iput v3, p0, Lkotlinx/coroutines/ao;->bjU:I
+    iput v3, p0, Lkotlinx/coroutines/ao;->bke:I
 
     check-cast p0, Lkotlinx/coroutines/ar;
 
@@ -348,7 +348,7 @@
 
     move-result-object v2
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     check-cast v4, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -366,13 +366,13 @@
 
     if-nez v4, :cond_2
 
-    invoke-interface {v2}, Lkotlinx/coroutines/Job;->DS()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v2}, Lkotlinx/coroutines/Job;->DV()Ljava/util/concurrent/CancellationException;
 
     move-result-object v2
 
     check-cast v2, Ljava/lang/Throwable;
 
-    sget-object v4, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v4, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v2}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -398,7 +398,7 @@
 
     move-result-object v2
 
-    iget-object v4, p0, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iget-object v4, p0, Lkotlinx/coroutines/ao;->bka:Ljava/lang/Object;
 
     invoke-static {v2, v4}, Lkotlinx/coroutines/internal/z;->b(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -407,9 +407,9 @@
     .catchall {:try_start_0 .. :try_end_0} :catchall_1
 
     :try_start_1
-    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    sget-object v5, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v5, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -425,7 +425,7 @@
 
     invoke-interface {p0, p1}, Lkotlin/coroutines/Continuation;->resumeWith(Ljava/lang/Object;)V
 
-    sget-object p0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -443,7 +443,7 @@
 
     :cond_3
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DI()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DL()Z
 
     move-result p0
     :try_end_2
@@ -477,7 +477,7 @@
     throw p0
 
     :cond_4
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -512,7 +512,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dn()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dq()Lkotlin/coroutines/Continuation;
 
     move-result-object v0
 
@@ -544,7 +544,7 @@
 
     move-result v2
 
-    iget v3, p0, Lkotlinx/coroutines/ar;->bjU:I
+    iget v3, p0, Lkotlinx/coroutines/ar;->bke:I
 
     invoke-static {v3}, Lkotlinx/coroutines/bw;->cX(I)Z
 
@@ -556,7 +556,7 @@
 
     check-cast p1, Lkotlinx/coroutines/ao;
 
-    iget-object p1, p1, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object p1, p1, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
@@ -575,13 +575,13 @@
     return-void
 
     :cond_2
-    sget-object p1, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object p1, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ef()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DJ()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DM()Z
 
     move-result v0
 
@@ -595,7 +595,7 @@
     invoke-virtual {p1, v1}, Lkotlinx/coroutines/aw;->V(Z)V
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dn()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dq()Lkotlin/coroutines/Continuation;
 
     move-result-object v0
 
@@ -604,7 +604,7 @@
     invoke-static {p0, v0, v2}, Lkotlinx/coroutines/aq;->a(Lkotlinx/coroutines/ar;Lkotlin/coroutines/Continuation;I)V
 
     :cond_4
-    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DI()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/aw;->DL()Z
 
     move-result v0
     :try_end_0
@@ -665,7 +665,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dj()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dm()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -711,9 +711,9 @@
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
-    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -724,7 +724,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -763,9 +763,9 @@
 
     check-cast p0, Lkotlinx/coroutines/ao;
 
-    iget-object p0, p0, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1, p0}, Lkotlinx/coroutines/internal/u;->a(Ljava/lang/Throwable;Lkotlin/coroutines/Continuation;)Ljava/lang/Throwable;
 
@@ -784,7 +784,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv: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/ar.smali b/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
index d086ec6c03..e14d1d6525 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ar.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public bjU:I
+.field public bke:I
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/b/i;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/ar;->bjU:I
+    iput p1, p0, Lkotlinx/coroutines/ar;->bke:I
 
     return-void
 .end method
@@ -55,10 +55,10 @@
 
 
 # virtual methods
-.method public abstract Dj()Ljava/lang/Object;
+.method public abstract Dm()Ljava/lang/Object;
 .end method
 
-.method public abstract Dn()Lkotlin/coroutines/Continuation;
+.method public abstract Dq()Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()",
@@ -140,7 +140,7 @@
     :cond_3
     invoke-direct {p2, v0, p1}, Lkotlinx/coroutines/ai;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dn()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dq()Lkotlin/coroutines/Continuation;
 
     move-result-object p1
 
@@ -158,10 +158,10 @@
 .method public final run()V
     .locals 8
 
-    iget-object v0, p0, Lkotlinx/coroutines/ar;->bmD:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/ar;->bmN:Lkotlinx/coroutines/b/j;
 
     :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dn()Lkotlin/coroutines/Continuation;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dq()Lkotlin/coroutines/Continuation;
 
     move-result-object v1
 
@@ -169,13 +169,13 @@
 
     check-cast v1, Lkotlinx/coroutines/ao;
 
-    iget-object v2, v1, Lkotlinx/coroutines/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object v2, v1, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v2}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v3
 
-    iget v4, p0, Lkotlinx/coroutines/ar;->bjU:I
+    iget v4, p0, Lkotlinx/coroutines/ar;->bke:I
 
     invoke-static {v4}, Lkotlinx/coroutines/bw;->cX(I)Z
 
@@ -185,7 +185,7 @@
 
     if-eqz v4, :cond_0
 
-    sget-object v4, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v4, Lkotlinx/coroutines/Job;->bkC: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/ar;->Dj()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ar;->Dm()Ljava/lang/Object;
 
     move-result-object v6
 
-    iget-object v1, v1, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iget-object v1, v1, Lkotlinx/coroutines/ao;->bka: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;->DS()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v4}, Lkotlinx/coroutines/Job;->DV()Ljava/util/concurrent/CancellationException;
 
     move-result-object v4
 
@@ -232,7 +232,7 @@
 
     invoke-virtual {p0, v6, v7}, Lkotlinx/coroutines/ar;->a(Ljava/lang/Object;Ljava/lang/Throwable;)V
 
-    sget-object v6, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     check-cast v4, Ljava/lang/Throwable;
 
@@ -259,7 +259,7 @@
 
     if-eqz v4, :cond_2
 
-    sget-object v6, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgv: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;->bgl:Lkotlin/m$a;
+    sget-object v6, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v4}, Lkotlin/m;->constructor-impl(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;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy: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;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EU()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EX()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {v0}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -318,7 +318,7 @@
     :catchall_0
     move-exception v0
 
-    sget-object v1, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -360,11 +360,11 @@
     move-exception v1
 
     :try_start_5
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EU()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EX()V
 
-    sget-object v0, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-static {v0}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -377,7 +377,7 @@
     :catchall_3
     move-exception v0
 
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {v0}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/as.smali b/com.discord/smali_classes2/kotlinx/coroutines/as.smali
index 2d20dd652b..a47122411c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/as.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/as.smali
@@ -4,13 +4,13 @@
 
 
 # static fields
-.field private static final bjV:Lkotlinx/coroutines/ab;
+.field private static final bkf:Lkotlinx/coroutines/ab;
 
-.field private static final bjW:Lkotlinx/coroutines/ab;
+.field private static final bkg:Lkotlinx/coroutines/ab;
 
-.field private static final bjX:Lkotlinx/coroutines/ab;
+.field private static final bkh:Lkotlinx/coroutines/ab;
 
-.field public static final bjY:Lkotlinx/coroutines/as;
+.field public static final bki:Lkotlinx/coroutines/as;
 
 
 # direct methods
@@ -21,27 +21,27 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/as;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/as;->bjY:Lkotlinx/coroutines/as;
+    sput-object v0, Lkotlinx/coroutines/as;->bki:Lkotlinx/coroutines/as;
 
-    invoke-static {}, Lkotlinx/coroutines/aa;->Dv()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/aa;->Dy()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/as;->bjV:Lkotlinx/coroutines/ab;
+    sput-object v0, Lkotlinx/coroutines/as;->bkf:Lkotlinx/coroutines/ab;
 
-    sget-object v0, Lkotlinx/coroutines/ce;->bkO:Lkotlinx/coroutines/ce;
+    sget-object v0, Lkotlinx/coroutines/ce;->bkY:Lkotlinx/coroutines/ce;
 
     check-cast v0, Lkotlinx/coroutines/ab;
 
-    sput-object v0, Lkotlinx/coroutines/as;->bjW:Lkotlinx/coroutines/ab;
+    sput-object v0, Lkotlinx/coroutines/as;->bkg:Lkotlinx/coroutines/ab;
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bmt:Lkotlinx/coroutines/b/c;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bmD:Lkotlinx/coroutines/b/c;
 
-    invoke-static {}, Lkotlinx/coroutines/b/c;->DE()Lkotlinx/coroutines/ab;
+    invoke-static {}, Lkotlinx/coroutines/b/c;->DH()Lkotlinx/coroutines/ab;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/as;->bjX:Lkotlinx/coroutines/ab;
+    sput-object v0, Lkotlinx/coroutines/as;->bkh:Lkotlinx/coroutines/ab;
 
     return-void
 .end method
@@ -54,26 +54,26 @@
     return-void
 .end method
 
-.method public static final DC()Lkotlinx/coroutines/ab;
+.method public static final DF()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/as;->bjV:Lkotlinx/coroutines/ab;
+    sget-object v0, Lkotlinx/coroutines/as;->bkf:Lkotlinx/coroutines/ab;
 
     return-object v0
 .end method
 
-.method public static final DD()Lkotlinx/coroutines/bq;
+.method public static final DG()Lkotlinx/coroutines/bq;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/n;->blw:Lkotlinx/coroutines/bq;
+    sget-object v0, Lkotlinx/coroutines/internal/n;->blG:Lkotlinx/coroutines/bq;
 
     return-object v0
 .end method
 
-.method public static final DE()Lkotlinx/coroutines/ab;
+.method public static final DH()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/as;->bjX:Lkotlinx/coroutines/ab;
+    sget-object v0, Lkotlinx/coroutines/as;->bkh:Lkotlinx/coroutines/ab;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/au.smali b/com.discord/smali_classes2/kotlinx/coroutines/au.smali
index f2080745bf..6403653501 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/au.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/au.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bjZ:Lkotlinx/coroutines/at;
+.field private final bkj:Lkotlinx/coroutines/at;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/i;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/au;->bjZ:Lkotlinx/coroutines/at;
+    iput-object p1, p0, Lkotlinx/coroutines/au;->bkj:Lkotlinx/coroutines/at;
 
     return-void
 .end method
@@ -31,7 +31,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/au;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/au;->bjZ:Lkotlinx/coroutines/at;
+    iget-object p1, p0, Lkotlinx/coroutines/au;->bkj:Lkotlinx/coroutines/at;
 
     invoke-interface {p1}, Lkotlinx/coroutines/at;->dispose()V
 
@@ -55,7 +55,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/au;->bjZ:Lkotlinx/coroutines/at;
+    iget-object v1, p0, Lkotlinx/coroutines/au;->bkj:Lkotlinx/coroutines/at;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/av.smali b/com.discord/smali_classes2/kotlinx/coroutines/av.smali
index 46004464a1..18ddb624b2 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/av.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/av.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final bka:Z
+.field final bkk:Z
 
 
 # direct methods
@@ -16,14 +16,14 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/av;->bka:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/av;->bkk:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DF()Lkotlinx/coroutines/br;
+.method public final DI()Lkotlinx/coroutines/br;
     .locals 1
 
     const/4 v0, 0x0
@@ -34,7 +34,7 @@
 .method public final isActive()Z
     .locals 1
 
-    iget-boolean v0, p0, Lkotlinx/coroutines/av;->bka:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/av;->bkk: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/av;->bka:Z
+    iget-boolean v1, p0, Lkotlinx/coroutines/av;->bkk:Z
 
     if-eqz v1, :cond_0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/aw.smali b/com.discord/smali_classes2/kotlinx/coroutines/aw.smali
index a8507d4617..ebe9334c9c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/aw.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/aw.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field private bkb:J
+.field private bkl:J
 
-.field private bkc:Z
+.field private bkm:Z
 
-.field private bkd:Lkotlinx/coroutines/internal/b;
+.field private bkn:Lkotlinx/coroutines/internal/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/internal/b<",
@@ -65,10 +65,10 @@
 
 
 # virtual methods
-.method public DG()J
+.method public DJ()J
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DI()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DL()Z
 
     move-result v0
 
@@ -79,17 +79,17 @@
     return-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DH()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DK()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method protected DH()J
+.method protected DK()J
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkd:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
 
     const-wide v1, 0x7fffffffffffffffL
 
@@ -112,10 +112,10 @@
     return-wide v0
 .end method
 
-.method public final DI()Z
+.method public final DL()Z
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkd:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
 
     const/4 v1, 0x0
 
@@ -124,7 +124,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/b;->Ej()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/b;->Em()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -142,10 +142,10 @@
     return v0
 .end method
 
-.method public final DJ()Z
+.method public final DM()Z
     .locals 6
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkb:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
 
     const/4 v2, 0x1
 
@@ -165,10 +165,10 @@
     return v0
 .end method
 
-.method public final DK()Z
+.method public final DN()Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkd:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
 
     if-eqz v0, :cond_0
 
@@ -187,7 +187,7 @@
 .method public final V(Z)V
     .locals 4
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkb:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
 
     invoke-static {p1}, Lkotlinx/coroutines/aw;->U(Z)J
 
@@ -195,13 +195,13 @@
 
     add-long/2addr v0, v2
 
-    iput-wide v0, p0, Lkotlinx/coroutines/aw;->bkb:J
+    iput-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
 
     if-nez p1, :cond_0
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lkotlinx/coroutines/aw;->bkc:Z
+    iput-boolean p1, p0, Lkotlinx/coroutines/aw;->bkm:Z
 
     :cond_0
     return-void
@@ -210,7 +210,7 @@
 .method public final W(Z)V
     .locals 4
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkb:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
 
     invoke-static {p1}, Lkotlinx/coroutines/aw;->U(Z)J
 
@@ -218,9 +218,9 @@
 
     sub-long/2addr v0, v2
 
-    iput-wide v0, p0, Lkotlinx/coroutines/aw;->bkb:J
+    iput-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
 
-    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkb:J
+    iget-wide v0, p0, Lkotlinx/coroutines/aw;->bkl:J
 
     const-wide/16 v2, 0x0
 
@@ -245,7 +245,7 @@
     :goto_0
     if-eqz p1, :cond_3
 
-    iget-boolean p1, p0, Lkotlinx/coroutines/aw;->bkc:Z
+    iget-boolean p1, p0, Lkotlinx/coroutines/aw;->bkm:Z
 
     if-eqz p1, :cond_2
 
@@ -284,7 +284,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkd:Lkotlinx/coroutines/internal/b;
+    iget-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
 
     if-nez v0, :cond_0
 
@@ -292,7 +292,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/internal/b;-><init>()V
 
-    iput-object v0, p0, Lkotlinx/coroutines/aw;->bkd:Lkotlinx/coroutines/internal/b;
+    iput-object v0, p0, Lkotlinx/coroutines/aw;->bkn:Lkotlinx/coroutines/internal/b;
 
     :cond_0
     invoke-virtual {v0, p1}, Lkotlinx/coroutines/internal/b;->addLast(Ljava/lang/Object;)V
@@ -303,7 +303,7 @@
 .method protected isEmpty()Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DK()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/aw;->DN()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ax$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/ax$a.smali
index 1edcd48fc2..eeeb7046e0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ax$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ax$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field private final bkg:Lkotlinx/coroutines/k;
+.field private final bkq:Lkotlinx/coroutines/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/k<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final synthetic bkh:Lkotlinx/coroutines/ax;
+.field final synthetic bkr:Lkotlinx/coroutines/ax;
 
 
 # direct methods
@@ -45,13 +45,13 @@
 
     invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/ax$a;->bkh:Lkotlinx/coroutines/ax;
+    iput-object p1, p0, Lkotlinx/coroutines/ax$a;->bkr:Lkotlinx/coroutines/ax;
 
     invoke-direct {p0, p2, p3}, Lkotlinx/coroutines/ax$b;-><init>(J)V
 
-    iput-object p4, p0, Lkotlinx/coroutines/ax$a;->bkg:Lkotlinx/coroutines/k;
+    iput-object p4, p0, Lkotlinx/coroutines/ax$a;->bkq:Lkotlinx/coroutines/k;
 
-    iget-object p1, p0, Lkotlinx/coroutines/ax$a;->bkg:Lkotlinx/coroutines/k;
+    iget-object p1, p0, Lkotlinx/coroutines/ax$a;->bkq:Lkotlinx/coroutines/k;
 
     move-object p2, p0
 
@@ -83,11 +83,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/ax$a;->bkg:Lkotlinx/coroutines/k;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$a;->bkq:Lkotlinx/coroutines/k;
 
-    iget-object v1, p0, Lkotlinx/coroutines/ax$a;->bkh:Lkotlinx/coroutines/ax;
+    iget-object v1, p0, Lkotlinx/coroutines/ax$a;->bkr:Lkotlinx/coroutines/ax;
 
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-interface {v0, v1, v2}, Lkotlinx/coroutines/k;->a(Lkotlinx/coroutines/ab;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ax$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/ax$b.smali
index a8212f7a9e..14651b0fab 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ax$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ax$b.smali
@@ -33,9 +33,9 @@
 
 
 # instance fields
-.field private bki:Ljava/lang/Object;
+.field private bks:Ljava/lang/Object;
 
-.field public final bkj:J
+.field public final bkt:J
 
 .field private index:I
 
@@ -50,11 +50,11 @@
 
     iput v0, p0, Lkotlinx/coroutines/ax$b;->index:I
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v0
 
-    invoke-interface {v0}, Lkotlinx/coroutines/cc;->np()J
+    invoke-interface {v0}, Lkotlinx/coroutines/cc;->ns()J
 
     move-result-wide v0
 
@@ -64,14 +64,14 @@
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lkotlinx/coroutines/ax$b;->bkj:J
+    iput-wide v0, p0, Lkotlinx/coroutines/ax$b;->bkt:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DN()Lkotlinx/coroutines/internal/aa;
+.method public final DQ()Lkotlinx/coroutines/internal/aa;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bki:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
 
     instance-of v1, v0, Lkotlinx/coroutines/internal/aa;
 
@@ -119,9 +119,9 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bki:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DP()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DS()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
     :try_end_0
@@ -162,7 +162,7 @@
 
     invoke-static {v0, p2}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {v0}, Lkotlinx/coroutines/internal/ab;->DN()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {v0}, Lkotlinx/coroutines/internal/ab;->DQ()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;->blM:[Lkotlinx/coroutines/internal/ab;
+    iget-object p2, p1, Lkotlinx/coroutines/internal/aa;->blW:[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;->blM:[Lkotlinx/coroutines/internal/ab;
+    iput-object p2, p1, Lkotlinx/coroutines/internal/aa;->blW:[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;->blM:[Lkotlinx/coroutines/internal/ab;
+    iput-object v2, p1, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
 
     check-cast p2, [Lkotlinx/coroutines/internal/ab;
 
@@ -306,9 +306,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bki:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DP()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DS()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/ax$b;->bki:Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
 
     return-void
 
@@ -353,9 +353,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-wide v0, p0, Lkotlinx/coroutines/ax$b;->bkj:J
+    iget-wide v0, p0, Lkotlinx/coroutines/ax$b;->bkt:J
 
-    iget-wide v2, p1, Lkotlinx/coroutines/ax$b;->bkj:J
+    iget-wide v2, p1, Lkotlinx/coroutines/ax$b;->bkt:J
 
     sub-long/2addr v0, v2
 
@@ -390,9 +390,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bki:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DP()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DS()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/ay;->DP()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DS()Lkotlinx/coroutines/internal/v;
 
     move-result-object v0
 
-    iput-object v0, p0, Lkotlinx/coroutines/ax$b;->bki:Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/ax$b;->bks:Ljava/lang/Object;
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
@@ -469,7 +469,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-wide v1, p0, Lkotlinx/coroutines/ax$b;->bkj:J
+    iget-wide v1, p0, Lkotlinx/coroutines/ax$b;->bkt:J
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ax.smali b/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
index 9a7845f8bb..83b1f72648 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ax.smali
@@ -16,9 +16,9 @@
 
 
 # static fields
-.field private static final bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final bkf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bkp:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -43,7 +43,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-class v1, Ljava/lang/Object;
 
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/ax;->bkf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/ax;->bkp:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
     return-void
 .end method
 
-.method private final DM()V
+.method private final DP()V
     .locals 2
 
     :goto_0
@@ -82,7 +82,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EA()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->ED()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -93,7 +93,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object v1, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     invoke-virtual {v1, v0}, Lkotlinx/coroutines/ak;->a(Lkotlinx/coroutines/ax$b;)V
 
@@ -121,7 +121,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->Ez()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EC()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 
     check-cast v0, Lkotlinx/coroutines/ax;
 
-    sget-object v1, Lkotlinx/coroutines/ax;->bkf:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/ax;->bkp:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
@@ -214,7 +214,7 @@
 
     if-nez v0, :cond_2
 
-    sget-object v0, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
@@ -255,9 +255,9 @@
     return v2
 
     :cond_4
-    sget-object v1, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/internal/m;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v3}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -278,7 +278,7 @@
     throw p1
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -303,7 +303,7 @@
 
     invoke-virtual {v2, p1}, Lkotlinx/coroutines/internal/m;->bh(Ljava/lang/Object;)I
 
-    sget-object v3, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/ax;->bko: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
 
@@ -332,7 +332,7 @@
 .method private final unpark()V
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->Dh()Ljava/lang/Thread;
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->Dk()Ljava/lang/Thread;
 
     move-result-object v0
 
@@ -342,7 +342,7 @@
 
     if-eq v1, v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v1
 
@@ -354,16 +354,16 @@
 
 
 # virtual methods
-.method public final DG()J
+.method public final DJ()J
     .locals 15
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DI()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DL()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DH()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DK()J
 
     move-result-wide v0
 
@@ -388,11 +388,11 @@
 
     if-nez v5, :cond_5
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v5
 
-    invoke-interface {v5}, Lkotlinx/coroutines/cc;->np()J
+    invoke-interface {v5}, Lkotlinx/coroutines/cc;->ns()J
 
     move-result-wide v5
 
@@ -400,7 +400,7 @@
     monitor-enter v0
 
     :try_start_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EB()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EE()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v7
     :try_end_0
@@ -418,7 +418,7 @@
     :try_start_1
     check-cast v7, Lkotlinx/coroutines/ax$b;
 
-    iget-wide v8, v7, Lkotlinx/coroutines/ax$b;->bkj:J
+    iget-wide v8, v7, Lkotlinx/coroutines/ax$b;->bkt:J
 
     sub-long v8, v5, v8
 
@@ -508,7 +508,7 @@
 
     if-eqz v10, :cond_8
 
-    sget-object v6, Lkotlinx/coroutines/internal/m;->blu:Lkotlinx/coroutines/internal/v;
+    sget-object v6, Lkotlinx/coroutines/internal/m;->blE:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_8
 
@@ -589,9 +589,9 @@
 
     and-int v14, v6, v7
 
-    sget-object v6, Lkotlinx/coroutines/internal/m;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v7, Lkotlinx/coroutines/internal/m;->blv:Lkotlinx/coroutines/internal/m$a;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blF: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;->blu:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blE:Lkotlinx/coroutines/internal/v;
 
     if-eq v6, v7, :cond_e
 
@@ -652,9 +652,9 @@
     goto :goto_9
 
     :cond_e
-    sget-object v6, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v6, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v5}, Lkotlinx/coroutines/internal/m;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v5}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
 
     move-result-object v5
 
@@ -672,7 +672,7 @@
     throw v0
 
     :cond_10
-    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
 
     move-result-object v5
 
@@ -681,7 +681,7 @@
     goto :goto_9
 
     :cond_11
-    sget-object v5, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/ax;->bko: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/ax;->DH()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DK()J
 
     move-result-wide v0
 
@@ -723,10 +723,10 @@
     goto :goto_a
 .end method
 
-.method protected final DH()J
+.method protected final DK()J
     .locals 6
 
-    invoke-super {p0}, Lkotlinx/coroutines/aw;->DH()J
+    invoke-super {p0}, Lkotlinx/coroutines/aw;->DK()J
 
     move-result-wide v0
 
@@ -760,7 +760,7 @@
     return-wide v2
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -781,7 +781,7 @@
     return-wide v4
 
     :cond_4
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->Ez()Lkotlinx/coroutines/internal/ab;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/aa;->EC()Lkotlinx/coroutines/internal/ab;
 
     move-result-object v0
 
@@ -792,13 +792,13 @@
     return-wide v4
 
     :cond_5
-    iget-wide v0, v0, Lkotlinx/coroutines/ax$b;->bkj:J
+    iget-wide v0, v0, Lkotlinx/coroutines/ax$b;->bkt:J
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v4
 
-    invoke-interface {v4}, Lkotlinx/coroutines/cc;->np()J
+    invoke-interface {v4}, Lkotlinx/coroutines/cc;->ns()J
 
     move-result-wide v4
 
@@ -811,7 +811,7 @@
     return-wide v0
 .end method
 
-.method protected final DL()V
+.method protected final DO()V
     .locals 1
 
     const/4 v0, 0x0
@@ -823,7 +823,7 @@
     return-void
 .end method
 
-.method protected abstract Dh()Ljava/lang/Thread;
+.method protected abstract Dk()Ljava/lang/Thread;
 .end method
 
 .method public final a(JLkotlinx/coroutines/k;)V
@@ -911,7 +911,7 @@
     throw p1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     goto :goto_0
 
@@ -931,7 +931,7 @@
 .method protected final isEmpty()Z
     .locals 4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DK()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DN()Z
 
     move-result v0
 
@@ -979,7 +979,7 @@
     return v0
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -1012,7 +1012,7 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     goto :goto_0
 .end method
@@ -1020,9 +1020,9 @@
 .method protected final shutdown()V
     .locals 5
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Eh()V
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ek()V
 
     const/4 v0, 0x1
 
@@ -1030,7 +1030,7 @@
 
     iget-boolean v1, p0, Lkotlinx/coroutines/ax;->isCompleted:Z
 
-    sget-boolean v2, Lkotlin/v;->bgp:Z
+    sget-boolean v2, Lkotlin/v;->bgz:Z
 
     if-eqz v2, :cond_1
 
@@ -1055,11 +1055,11 @@
 
     if-nez v1, :cond_2
 
-    sget-object v1, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/ax;->bko:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const/4 v2, 0x0
 
-    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
 
     move-result-object v3
 
@@ -1078,12 +1078,12 @@
 
     check-cast v1, Lkotlinx/coroutines/internal/m;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->gD()Z
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->gG()Z
 
     goto :goto_1
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/ay;->DQ()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DT()Lkotlinx/coroutines/internal/v;
 
     move-result-object v2
 
@@ -1103,7 +1103,7 @@
 
     invoke-virtual {v2, v3}, Lkotlinx/coroutines/internal/m;->bh(Ljava/lang/Object;)I
 
-    sget-object v3, Lkotlinx/coroutines/ax;->bke:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/ax;->bko: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
 
@@ -1124,7 +1124,7 @@
 
     :cond_5
     :goto_1
-    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DG()J
+    invoke-virtual {p0}, Lkotlinx/coroutines/ax;->DJ()J
 
     move-result-wide v0
 
@@ -1134,7 +1134,7 @@
 
     if-lez v4, :cond_5
 
-    invoke-direct {p0}, Lkotlinx/coroutines/ax;->DM()V
+    invoke-direct {p0}, Lkotlinx/coroutines/ax;->DP()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ay.smali b/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
index f475fdb2f0..2727551ed3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ay.smali
@@ -4,9 +4,9 @@
 
 
 # static fields
-.field private static final bkk:Lkotlinx/coroutines/internal/v;
+.field private static final bku:Lkotlinx/coroutines/internal/v;
 
-.field private static final bkl:Lkotlinx/coroutines/internal/v;
+.field private static final bkv: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/ay;->bkk:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/ay;->bku: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/ay;->bkl:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/ay;->bkv:Lkotlinx/coroutines/internal/v;
 
     return-void
 .end method
 
-.method public static final DO()Lkotlinx/coroutines/aw;
+.method public static final DR()Lkotlinx/coroutines/aw;
     .locals 3
 
     new-instance v0, Lkotlinx/coroutines/d;
@@ -52,18 +52,18 @@
     return-object v0
 .end method
 
-.method public static final synthetic DP()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic DS()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ay;->bkk:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/ay;->bku:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
 
-.method public static final synthetic DQ()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic DT()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ay;->bkl:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/ay;->bkv:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b.smali b/com.discord/smali_classes2/kotlinx/coroutines/b.smali
index cdf72d55f0..bde819949c 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 bji:Lkotlinx/coroutines/b;
+.field public static final bjs:Lkotlinx/coroutines/b;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b;->bji:Lkotlinx/coroutines/b;
+    sput-object v0, Lkotlinx/coroutines/b;->bjs: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 b200685391..8cda2d1e92 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 bmg:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field final bmf:Lkotlinx/coroutines/b/o;
+.field final bmp:Lkotlinx/coroutines/b/o;
 
-.field private bmh:J
+.field private bmr:J
 
-.field private bmi:J
+.field private bms:J
 
-.field private bmj:I
+.field private bmt:I
 
-.field private bmk:I
+.field private bmu:I
 
-.field private bml:I
+.field private bmv:I
 
-.field final synthetic bmm:Lkotlinx/coroutines/b/a;
+.field final synthetic bmw:Lkotlinx/coroutines/b/a;
 
 .field volatile indexInArray:I
 
@@ -56,7 +56,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/a$b;->bmg:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/a$b;->bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmf:Lkotlinx/coroutines/b/o;
+    iput-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmq:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmA: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;->EL()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EO()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;->EK()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EN()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmj:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmt: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;->bmk:I
+    iput p1, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     return-void
 .end method
@@ -131,16 +131,16 @@
     return-void
 .end method
 
-.method private final EP()Z
+.method private final ES()Z
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmG:Lkotlinx/coroutines/b/l;
+    sget-object v1, Lkotlinx/coroutines/b/l;->bmQ: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw: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 ES()Lkotlinx/coroutines/b/i;
+.method private final EV()Lkotlinx/coroutines/b/i;
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->h(Lkotlinx/coroutines/b/a;)I
 
@@ -195,13 +195,13 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmF:Lkotlinx/coroutines/b/l;
+    sget-object v2, Lkotlinx/coroutines/b/l;->bmP: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/b/o;->EY()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v1}, Lkotlinx/coroutines/b/o;->Fb()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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->Ej()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/e;->Em()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -242,17 +242,17 @@
     return-object v0
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->ET()Lkotlinx/coroutines/b/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EW()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private final ET()Lkotlinx/coroutines/b/i;
+.method private final EW()Lkotlinx/coroutines/b/i;
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v0}, Lkotlinx/coroutines/b/a;->g(Lkotlinx/coroutines/b/a;)I
 
@@ -267,7 +267,7 @@
     return-object v1
 
     :cond_0
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bml:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmv:I
 
     if-nez v2, :cond_1
 
@@ -285,9 +285,9 @@
     const/4 v2, 0x1
 
     :cond_2
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bml:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmv:I
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    iget-object v0, v0, Lkotlinx/coroutines/b/a$b;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v0, v0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->EY()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Fb()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
@@ -334,11 +334,11 @@
 .method private final ap(J)Z
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->EP()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->ES()Z
 
     move-result v0
 
@@ -363,7 +363,7 @@
 
     invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v1}, Lkotlinx/coroutines/b/a;->a(Lkotlinx/coroutines/b/a;)Ljava/lang/String;
 
@@ -403,29 +403,29 @@
 .method private dd(I)I
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     shl-int/lit8 v1, v0, 0xd
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     shr-int/lit8 v1, v0, 0x11
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     shl-int/lit8 v1, v0, 0x5
 
     xor-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     add-int/lit8 v0, p1, -0x1
 
@@ -433,14 +433,14 @@
 
     if-nez v1, :cond_0
 
-    iget p1, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iget p1, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     and-int/2addr p1, v0
 
     return p1
 
     :cond_0
-    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmk:I
+    iget v0, p0, Lkotlinx/coroutines/b/a$b;->bmu:I
 
     const v1, 0x7fffffff
 
@@ -453,12 +453,12 @@
 
 
 # virtual methods
-.method public final EM()Z
+.method public final EP()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;->bmp:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmz:Lkotlinx/coroutines/b/a$c;
 
     if-ne v0, v1, :cond_0
 
@@ -472,7 +472,7 @@
     return v0
 .end method
 
-.method public final EN()Z
+.method public final EQ()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;->bmg:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/a$b;->bmq: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 EO()Z
+.method public final ER()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;->bmn:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmx: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmn:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmx: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 EQ()V
+.method public final ET()V
     .locals 1
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EK()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EN()I
 
     move-result v0
 
-    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmj:I
+    iput v0, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
 
     const/4 v0, 0x0
 
@@ -581,37 +581,37 @@
     return-void
 .end method
 
-.method public final ER()Lkotlinx/coroutines/b/i;
+.method public final EU()Lkotlinx/coroutines/b/i;
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->EO()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->ER()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->ES()Lkotlinx/coroutines/b/i;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->EV()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->EY()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/o;->Fb()Lkotlinx/coroutines/b/i;
 
     move-result-object v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmG:Lkotlinx/coroutines/b/l;
+    sget-object v1, Lkotlinx/coroutines/b/l;->bmQ: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;->bmn:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmx: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmB:Lkotlinx/coroutines/b/a$c;
 
     if-eq v3, v4, :cond_17
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->ER()Lkotlinx/coroutines/b/i;
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/a$b;->EU()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;->bmn:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmx: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;->EH()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EK()I
 
     move-result v3
 
@@ -712,7 +712,7 @@
 
     iput v3, p0, Lkotlinx/coroutines/b/a$b;->spins:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EI()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EL()I
 
     move-result v3
 
@@ -723,21 +723,21 @@
     goto/16 :goto_1
 
     :cond_1
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmj:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EJ()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EM()I
 
     move-result v3
 
     if-ge v2, v3, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmj:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
 
     mul-int/lit8 v2, v2, 0x3
 
     ushr-int/2addr v2, v0
 
-    invoke-static {}, Lkotlinx/coroutines/b/a;->EJ()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EM()I
 
     move-result v3
 
@@ -745,14 +745,14 @@
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmj:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
 
     :cond_2
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmp:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmz: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;->bmj:I
+    iget v2, p0, Lkotlinx/coroutines/b/a$b;->bmt:I
 
     int-to-long v2, v2
 
@@ -761,11 +761,11 @@
     goto/16 :goto_1
 
     :cond_3
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmp:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmz: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;->EP()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->ES()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;->bmh:J
+    iget-wide v2, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
 
     cmp-long v6, v2, v4
 
@@ -783,7 +783,7 @@
 
     move-result-wide v2
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmh:J
+    iput-wide v2, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
 
     :cond_4
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmh:J
+    iget-wide v6, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
 
     sub-long/2addr v2, v6
 
@@ -818,9 +818,9 @@
 
     if-ltz v6, :cond_b
 
-    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmh:J
+    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->EP()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a$b;->ES()Z
 
     move-result v3
     :try_end_2
@@ -881,7 +881,7 @@
 
     :cond_7
     :try_start_3
-    sget-object v3, Lkotlinx/coroutines/b/a$b;->bmg:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/a$b;->bmq:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {v3, p0, v1, v0}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
@@ -901,13 +901,13 @@
 
     invoke-direct {p0, v1}, Lkotlinx/coroutines/b/a$b;->dc(I)V
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->blT:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->bmd: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v4}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -934,7 +934,7 @@
     invoke-static {}, Lkotlin/jvm/internal/l;->throwNpe()V
 
     :cond_9
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v6}, Lkotlinx/coroutines/b/a;->f(Lkotlinx/coroutines/b/a;)[Lkotlinx/coroutines/b/a$b;
 
@@ -944,12 +944,12 @@
 
     invoke-direct {v4, v3}, Lkotlinx/coroutines/b/a$b;->dc(I)V
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bgo:Lkotlin/Unit;
+    sget-object v3, Lkotlin/Unit;->bgy: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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmB: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;->EW()Lkotlinx/coroutines/b/l;
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/i;->EZ()Lkotlinx/coroutines/b/l;
 
     move-result-object v6
 
     if-eqz v2, :cond_11
 
-    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmh:J
+    iput-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmr:J
 
-    iput v1, p0, Lkotlinx/coroutines/b/a$b;->bml:I
+    iput v1, p0, Lkotlinx/coroutines/b/a$b;->bmv:I
 
     iget-object v2, p0, Lkotlinx/coroutines/b/a$b;->state:Lkotlinx/coroutines/b/a$c;
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmp:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmz:Lkotlinx/coroutines/b/a$c;
 
     if-ne v2, v4, :cond_10
 
-    sget-object v2, Lkotlinx/coroutines/b/l;->bmG:Lkotlinx/coroutines/b/l;
+    sget-object v2, Lkotlinx/coroutines/b/l;->bmQ: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;->bgp:Z
+    sget-boolean v4, Lkotlin/v;->bgz:Z
 
     if-eqz v4, :cond_f
 
@@ -1034,15 +1034,15 @@
 
     :cond_f
     :goto_3
-    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmo:Lkotlinx/coroutines/b/a$c;
+    sget-object v2, Lkotlinx/coroutines/b/a$c;->bmy: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;->EK()I
+    invoke-static {}, Lkotlinx/coroutines/b/a;->EN()I
 
     move-result v2
 
-    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmj:I
+    iput v2, p0, Lkotlinx/coroutines/b/a$b;->bmt: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;->bmC:J
+    iget-wide v4, v3, Lkotlinx/coroutines/b/i;->bmM:J
 
-    sget-object v7, Lkotlinx/coroutines/b/l;->bmF:Lkotlinx/coroutines/b/l;
+    sget-object v7, Lkotlinx/coroutines/b/l;->bmP:Lkotlinx/coroutines/b/l;
 
     if-eq v6, v7, :cond_12
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
-    sget-object v5, Lkotlinx/coroutines/b/a;->blT:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->bmd: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;->bmo:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmy: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v7, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     invoke-static {v7}, Lkotlinx/coroutines/b/a;->b(Lkotlinx/coroutines/b/a;)Ljava/util/concurrent/Semaphore;
 
@@ -1091,25 +1091,25 @@
 
     if-eqz v7, :cond_13
 
-    sget-object v7, Lkotlinx/coroutines/b/m;->bmM:Lkotlinx/coroutines/b/n;
+    sget-object v7, Lkotlinx/coroutines/b/m;->bmW:Lkotlinx/coroutines/b/n;
 
-    invoke-virtual {v7}, Lkotlinx/coroutines/b/n;->np()J
+    invoke-virtual {v7}, Lkotlinx/coroutines/b/n;->ns()J
 
     move-result-wide v7
 
     sub-long v4, v7, v4
 
-    sget-wide v9, Lkotlinx/coroutines/b/m;->bmI:J
+    sget-wide v9, Lkotlinx/coroutines/b/m;->bmS:J
 
     cmp-long v11, v4, v9
 
     if-ltz v11, :cond_13
 
-    iget-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bmi:J
+    iget-wide v4, p0, Lkotlinx/coroutines/b/a$b;->bms:J
 
     sub-long v4, v7, v4
 
-    sget-wide v9, Lkotlinx/coroutines/b/m;->bmI:J
+    sget-wide v9, Lkotlinx/coroutines/b/m;->bmS:J
 
     const-wide/16 v11, 0x5
 
@@ -1119,9 +1119,9 @@
 
     if-ltz v11, :cond_13
 
-    iput-wide v7, p0, Lkotlinx/coroutines/b/a$b;->bmi:J
+    iput-wide v7, p0, Lkotlinx/coroutines/b/a$b;->bms:J
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a$b;->bmw: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;->bmF:Lkotlinx/coroutines/b/l;
+    sget-object v3, Lkotlinx/coroutines/b/l;->bmP:Lkotlinx/coroutines/b/l;
 
     if-eq v6, v3, :cond_0
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
-    sget-object v4, Lkotlinx/coroutines/b/a;->blT:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/b/a;->bmd: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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmB:Lkotlinx/coroutines/b/a$c;
 
     if-eq v3, v4, :cond_0
 
-    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmo:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmy: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;->bgp:Z
+    sget-boolean v5, Lkotlin/v;->bgz:Z
 
     if-eqz v5, :cond_16
 
@@ -1188,14 +1188,14 @@
 
     :cond_16
     :goto_6
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmq:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmA: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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmB: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 3ad781ee9c..383dc527b2 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 bmn:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmA:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmo:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmB:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmp:Lkotlinx/coroutines/b/a$c;
+.field private static final synthetic bmC:[Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmq:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmx:Lkotlinx/coroutines/b/a$c;
 
-.field public static final enum bmr:Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmy:Lkotlinx/coroutines/b/a$c;
 
-.field private static final synthetic bms:[Lkotlinx/coroutines/b/a$c;
+.field public static final enum bmz: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;->bmn:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmx: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;->bmo:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmy: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;->bmp:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmz: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;->bmq:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmA: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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sput-object v1, Lkotlinx/coroutines/b/a$c;->bmB:Lkotlinx/coroutines/b/a$c;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/b/a$c;->bms:[Lkotlinx/coroutines/b/a$c;
+    sput-object v0, Lkotlinx/coroutines/b/a$c;->bmC:[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;->bms:[Lkotlinx/coroutines/b/a$c;
+    sget-object v0, Lkotlinx/coroutines/b/a$c;->bmC:[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 ab1acdff68..293d2c7f2d 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 blR:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field private static final bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field static final blT:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field static final bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field private static final blU:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bme:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final blZ:I
+.field private static final bmj:I
 
-.field private static final bma:I
+.field private static final bmk:I
 
-.field private static final bmb:I
+.field private static final bml:I
 
-.field private static final bmc:I
+.field private static final bmm:I
 
-.field private static final bmd:Lkotlinx/coroutines/internal/v;
+.field private static final bmn:Lkotlinx/coroutines/internal/v;
 
-.field public static final bme:Lkotlinx/coroutines/b/a$a;
+.field public static final bmo:Lkotlinx/coroutines/b/a$a;
 
 
 # instance fields
 .field private volatile _isTerminated:I
 
-.field private final blP:Lkotlinx/coroutines/b/e;
+.field private final blZ:Lkotlinx/coroutines/b/e;
 
-.field private final blQ:Ljava/util/concurrent/Semaphore;
+.field private final bma:Ljava/util/concurrent/Semaphore;
 
-.field private final blS:[Lkotlinx/coroutines/b/a$b;
+.field private final bmc:[Lkotlinx/coroutines/b/a$b;
 
-.field private final blV:I
+.field private final bmf:I
 
-.field private final blW:I
+.field private final bmg:I
 
-.field private final blX:J
+.field private final bmh:J
 
-.field private final blY:Ljava/lang/String;
+.field private final bmi: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;->bme:Lkotlinx/coroutines/b/a$a;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bmo:Lkotlinx/coroutines/b/a$a;
 
     const/16 v1, 0x8
 
@@ -87,7 +87,7 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/a;->blZ:I
+    sput v3, Lkotlinx/coroutines/b/a;->bmj:I
 
     const-string v4, "kotlinx.coroutines.scheduler.yields"
 
@@ -97,7 +97,7 @@
 
     add-int/2addr v3, v1
 
-    sput v3, Lkotlinx/coroutines/b/a;->bma:I
+    sput v3, Lkotlinx/coroutines/b/a;->bmk: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;->bmb:I
+    sput v2, Lkotlinx/coroutines/b/a;->bml:I
 
-    sget-wide v1, Lkotlinx/coroutines/b/m;->bmI:J
+    sget-wide v1, Lkotlinx/coroutines/b/m;->bmS:J
 
     const-wide/16 v3, 0x4
 
@@ -123,7 +123,7 @@
 
     move-result-wide v1
 
-    sget v3, Lkotlinx/coroutines/b/a;->bmb:I
+    sget v3, Lkotlinx/coroutines/b/a;->bml:I
 
     int-to-long v3, v3
 
@@ -133,7 +133,7 @@
 
     long-to-int v2, v1
 
-    sput v2, Lkotlinx/coroutines/b/a;->bmc:I
+    sput v2, Lkotlinx/coroutines/b/a;->bmm: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;->bmd:Lkotlinx/coroutines/internal/v;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bmn:Lkotlinx/coroutines/internal/v;
 
     const-string v1, "parkedWorkersStack"
 
@@ -149,7 +149,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->blR:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bmb:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-string v1, "controlState"
 
@@ -157,7 +157,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/a;->blT:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/a;->bmd:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
     const-string v1, "_isTerminated"
 
@@ -165,7 +165,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/a;->blU:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/a;->bme: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;->blV:I
+    iput p1, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
-    iput p2, p0, Lkotlinx/coroutines/b/a;->blW:I
+    iput p2, p0, Lkotlinx/coroutines/b/a;->bmg:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/b/a;->blX:J
+    iput-wide p3, p0, Lkotlinx/coroutines/b/a;->bmh:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/b/a;->blY:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/b/a;->bmi:Ljava/lang/String;
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     const/4 p2, 0x1
 
@@ -205,9 +205,9 @@
     :goto_0
     if-eqz p1, :cond_7
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->blW:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmg:I
 
-    iget p4, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget p4, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     if-lt p1, p4, :cond_1
 
@@ -223,7 +223,7 @@
 
     if-eqz p1, :cond_6
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->blW:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmg:I
 
     const p5, 0x1ffffe
 
@@ -239,7 +239,7 @@
     :goto_2
     if-eqz p1, :cond_5
 
-    iget-wide p4, p0, Lkotlinx/coroutines/b/a;->blX:J
+    iget-wide p4, p0, Lkotlinx/coroutines/b/a;->bmh: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;->blP:Lkotlinx/coroutines/b/e;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
 
     new-instance p1, Ljava/util/concurrent/Semaphore;
 
-    iget p4, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget p4, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     invoke-direct {p1, p4, p3}, Ljava/util/concurrent/Semaphore;-><init>(IZ)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->blQ:Ljava/util/concurrent/Semaphore;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->bma:Ljava/util/concurrent/Semaphore;
 
     iput-wide v0, p0, Lkotlinx/coroutines/b/a;->parkedWorkersStack:J
 
-    iget p1, p0, Lkotlinx/coroutines/b/a;->blW:I
+    iget p1, p0, Lkotlinx/coroutines/b/a;->bmg:I
 
     add-int/2addr p1, p2
 
     new-array p1, p1, [Lkotlinx/coroutines/b/a$b;
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/a;->blS:[Lkotlinx/coroutines/b/a$b;
+    iput-object p1, p0, Lkotlinx/coroutines/b/a;->bmc:[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;->blX:J
+    iget-wide p2, p0, Lkotlinx/coroutines/b/a;->bmh: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;->blW:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bmg: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;->blW:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bmg: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;->blV:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bmf: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;->blV:I
+    iget p2, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -418,7 +418,7 @@
     throw p2
 .end method
 
-.method private final EC()Lkotlinx/coroutines/b/a$b;
+.method private final EF()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;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bmc:[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;->blR:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/a;->bmb: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;->bmd:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bmn: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 ED()V
+.method private final EG()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blQ:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bma: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;->EE()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()Z
 
     return-void
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EE()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()Z
 
     move-result v0
 
@@ -525,11 +525,11 @@
 
     sub-int/2addr v3, v1
 
-    iget v0, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget v0, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     if-ge v3, v0, :cond_3
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()I
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EI()I
 
     move-result v0
 
@@ -537,11 +537,11 @@
 
     if-ne v0, v1, :cond_2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     if-le v2, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()I
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EI()I
 
     :cond_2
     if-lez v0, :cond_3
@@ -549,16 +549,16 @@
     return-void
 
     :cond_3
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EE()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EH()Z
 
     return-void
 .end method
 
-.method private final EE()Z
+.method private final EH()Z
     .locals 3
 
     :cond_0
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EC()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EF()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;->EQ()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->ET()V
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EM()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EP()Z
 
     move-result v1
 
@@ -583,7 +583,7 @@
 
     if-eqz v1, :cond_0
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EN()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EQ()Z
 
     move-result v0
 
@@ -594,10 +594,10 @@
     return v0
 .end method
 
-.method private final EF()I
+.method private final EI()I
     .locals 10
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
 
     monitor-enter v0
 
@@ -638,7 +638,7 @@
 
     sub-int v1, v6, v2
 
-    iget v2, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bmf: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;->blW:I
+    iget v2, p0, Lkotlinx/coroutines/b/a;->bmg:I
 
     if-ge v6, v2, :cond_7
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/a;->blQ:Ljava/util/concurrent/Semaphore;
+    iget-object v2, p0, Lkotlinx/coroutines/b/a;->bma: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;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v7, p0, Lkotlinx/coroutines/b/a;->bmc:[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;->blT:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v8, Lkotlinx/coroutines/b/a;->bmd: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;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
 
     aput-object v7, v3, v2
     :try_end_2
@@ -777,7 +777,7 @@
     throw v1
 .end method
 
-.method private final EG()Lkotlinx/coroutines/b/a$b;
+.method private final EJ()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;->bmm:Lkotlinx/coroutines/b/a;
+    iget-object v1, v0, Lkotlinx/coroutines/b/a$b;->bmw:Lkotlinx/coroutines/b/a;
 
     move-object v3, p0
 
@@ -815,42 +815,42 @@
     return-object v2
 .end method
 
-.method public static final synthetic EH()I
-    .locals 1
-
-    sget v0, Lkotlinx/coroutines/b/a;->bma:I
-
-    return v0
-.end method
-
-.method public static final synthetic EI()I
-    .locals 1
-
-    sget v0, Lkotlinx/coroutines/b/a;->blZ:I
-
-    return v0
-.end method
-
-.method public static final synthetic EJ()I
-    .locals 1
-
-    sget v0, Lkotlinx/coroutines/b/a;->bmb:I
-
-    return v0
-.end method
-
 .method public static final synthetic EK()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/b/a;->bmc:I
+    sget v0, Lkotlinx/coroutines/b/a;->bmk:I
 
     return v0
 .end method
 
-.method public static final synthetic EL()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic EL()I
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/a;->bmd:Lkotlinx/coroutines/internal/v;
+    sget v0, Lkotlinx/coroutines/b/a;->bmj:I
+
+    return v0
+.end method
+
+.method public static final synthetic EM()I
+    .locals 1
+
+    sget v0, Lkotlinx/coroutines/b/a;->bml:I
+
+    return v0
+.end method
+
+.method public static final synthetic EN()I
+    .locals 1
+
+    sget v0, Lkotlinx/coroutines/b/a;->bmm:I
+
+    return v0
+.end method
+
+.method public static final synthetic EO()Lkotlinx/coroutines/internal/v;
+    .locals 1
+
+    sget-object v0, Lkotlinx/coroutines/b/a;->bmn: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;->bmd:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bmn: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;->blY:Ljava/lang/String;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bmi:Ljava/lang/String;
 
     return-object p0
 .end method
@@ -910,9 +910,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/b/m;->bmM:Lkotlinx/coroutines/b/n;
+    sget-object v0, Lkotlinx/coroutines/b/m;->bmW:Lkotlinx/coroutines/b/n;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/b/n;->np()J
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/n;->ns()J
 
     move-result-wide v0
 
@@ -922,9 +922,9 @@
 
     check-cast p0, Lkotlinx/coroutines/b/i;
 
-    iput-wide v0, p0, Lkotlinx/coroutines/b/i;->bmC:J
+    iput-wide v0, p0, Lkotlinx/coroutines/b/i;->bmM:J
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/i;->bmD:Lkotlinx/coroutines/b/j;
+    iput-object p1, p0, Lkotlinx/coroutines/b/i;->bmN: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;->bmB:Lkotlinx/coroutines/b/h;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bmL: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;->bmd:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bmn: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;->bgp:Z
+    sget-boolean v7, Lkotlin/v;->bgz:Z
 
     if-eqz v7, :cond_3
 
@@ -1011,13 +1011,13 @@
 
     :cond_3
     :goto_1
-    iget-object v6, p0, Lkotlinx/coroutines/b/a;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a;->bmc:[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;->blR:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bmb: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;->blR:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/b/a;->bmb: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/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     return-void
 
@@ -1133,14 +1133,14 @@
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_1
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     return-void
 
     :catchall_1
     move-exception p0
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     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;->blQ:Ljava/util/concurrent/Semaphore;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bma: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;->ED()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EG()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;->blX:J
+    iget-wide v0, p0, Lkotlinx/coroutines/b/a;->bmh: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;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->bmc:[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;->blV:I
+    iget p0, p0, Lkotlinx/coroutines/b/a;->bmf: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;->blP:Lkotlinx/coroutines/b/e;
+    iget-object p0, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
 
     return-object p0
 .end method
@@ -1263,13 +1263,13 @@
 
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     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;->EG()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EJ()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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmB:Lkotlinx/coroutines/b/a$c;
 
     if-ne v3, v4, :cond_1
 
     goto :goto_0
 
     :cond_1
-    invoke-virtual {p1}, Lkotlinx/coroutines/b/i;->EW()Lkotlinx/coroutines/b/l;
+    invoke-virtual {p1}, Lkotlinx/coroutines/b/i;->EZ()Lkotlinx/coroutines/b/l;
 
     move-result-object v3
 
-    sget-object v4, Lkotlinx/coroutines/b/l;->bmF:Lkotlinx/coroutines/b/l;
+    sget-object v4, Lkotlinx/coroutines/b/l;->bmP: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;->bmo:Lkotlinx/coroutines/b/a$c;
+    sget-object v4, Lkotlinx/coroutines/b/a$c;->bmy: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;->EO()Z
+    invoke-virtual {p2}, Lkotlinx/coroutines/b/a$b;->ER()Z
 
     move-result v3
 
@@ -1339,9 +1339,9 @@
     :goto_2
     if-eqz p3, :cond_5
 
-    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blP:Lkotlinx/coroutines/b/e;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blZ: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object p3, p2, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blP:Lkotlinx/coroutines/b/e;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blZ: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object p2, p2, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    invoke-virtual {p2}, Lkotlinx/coroutines/b/o;->EX()I
+    invoke-virtual {p2}, Lkotlinx/coroutines/b/o;->Fa()I
 
     move-result p2
 
-    sget p3, Lkotlinx/coroutines/b/m;->bmJ:I
+    sget p3, Lkotlinx/coroutines/b/m;->bmT:I
 
     if-gt p2, p3, :cond_6
 
@@ -1379,12 +1379,12 @@
 
     if-eq v1, v2, :cond_7
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->ED()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EG()V
 
     return-void
 
     :cond_7
-    iget-object p2, p0, Lkotlinx/coroutines/b/a;->blP:Lkotlinx/coroutines/b/e;
+    iget-object p2, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
 
     invoke-virtual {p2, p1}, Lkotlinx/coroutines/b/e;->bg(Ljava/lang/Object;)Z
 
@@ -1392,7 +1392,7 @@
 
     if-eqz p1, :cond_8
 
-    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->ED()V
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EG()V
 
     return-void
 
@@ -1403,7 +1403,7 @@
 
     invoke-direct {p2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object p3, p0, Lkotlinx/coroutines/b/a;->blY:Ljava/lang/String;
+    iget-object p3, p0, Lkotlinx/coroutines/b/a;->bmi: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;->blU:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/a;->bme: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;->EG()Lkotlinx/coroutines/b/a$b;
+    invoke-direct {p0}, Lkotlinx/coroutines/b/a;->EJ()Lkotlinx/coroutines/b/a$b;
 
     move-result-object v0
 
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
 
     monitor-enter v3
 
@@ -1466,7 +1466,7 @@
     const/4 v3, 0x1
 
     :goto_0
-    iget-object v4, p0, Lkotlinx/coroutines/b/a;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v4, p0, Lkotlinx/coroutines/b/a;->bmc:[Lkotlinx/coroutines/b/a$b;
 
     aget-object v4, v4, v3
 
@@ -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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v7, Lkotlinx/coroutines/b/a$c;->bmB: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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v4, v4, Lkotlinx/coroutines/b/a$b;->bmp:Lkotlinx/coroutines/b/o;
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/a;->blP:Lkotlinx/coroutines/b/e;
+    iget-object v6, p0, Lkotlinx/coroutines/b/a;->blZ: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;->blP:Lkotlinx/coroutines/b/e;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blZ: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;->ER()Lkotlinx/coroutines/b/i;
+    invoke-virtual {v0}, Lkotlinx/coroutines/b/a$b;->EU()Lkotlinx/coroutines/b/i;
 
     move-result-object v3
 
     if-nez v3, :cond_7
 
     :cond_6
-    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blP:Lkotlinx/coroutines/b/e;
+    iget-object v3, p0, Lkotlinx/coroutines/b/a;->blZ:Lkotlinx/coroutines/b/e;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->Ej()Ljava/lang/Object;
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/e;->Em()Ljava/lang/Object;
 
     move-result-object v3
 
@@ -1580,25 +1580,25 @@
 
     if-eqz v0, :cond_8
 
-    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v3, Lkotlinx/coroutines/b/a$c;->bmB: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;->blQ:Ljava/util/concurrent/Semaphore;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->bma:Ljava/util/concurrent/Semaphore;
 
     invoke-virtual {v0}, Ljava/util/concurrent/Semaphore;->availablePermits()I
 
     move-result v0
 
-    iget v3, p0, Lkotlinx/coroutines/b/a;->blV:I
+    iget v3, p0, Lkotlinx/coroutines/b/a;->bmf:I
 
     if-ne v0, v3, :cond_9
 
     const/4 v1, 0x1
 
     :cond_9
-    sget-boolean v0, Lkotlin/v;->bgp:Z
+    sget-boolean v0, Lkotlin/v;->bgz: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;->blS:[Lkotlinx/coroutines/b/a$b;
+    iget-object v1, p0, Lkotlinx/coroutines/b/a;->bmc:[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;->bmf:Lkotlinx/coroutines/b/o;
+    iget-object v11, v10, Lkotlinx/coroutines/b/a$b;->bmp: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;->EX()I
+    invoke-virtual {v11}, Lkotlinx/coroutines/b/o;->Fa()I
 
     move-result v11
 
@@ -1843,7 +1843,7 @@
 
     invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v10, p0, Lkotlinx/coroutines/b/a;->blY:Ljava/lang/String;
+    iget-object v10, p0, Lkotlinx/coroutines/b/a;->bmi: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;->blV:I
+    iget v10, p0, Lkotlinx/coroutines/b/a;->bmf: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;->blW:I
+    iget v10, p0, Lkotlinx/coroutines/b/a;->bmg: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;->blP:Lkotlinx/coroutines/b/e;
+    iget-object v0, p0, Lkotlinx/coroutines/b/a;->blZ: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 c52d674821..908e9a3acb 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;->bmp:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmz: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;->bmo:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmy: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;->bmn:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmx: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;->bmq:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmA: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;->bmr:Lkotlinx/coroutines/b/a$c;
+    sget-object v1, Lkotlinx/coroutines/b/a$c;->bmB: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 b0d9596004..9d769759d1 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 bjX:Lkotlinx/coroutines/ab;
+.field private static final bkh:Lkotlinx/coroutines/ab;
 
-.field public static final bmt:Lkotlinx/coroutines/b/c;
+.field public static final bmD:Lkotlinx/coroutines/b/c;
 
 
 # direct methods
@@ -17,9 +17,9 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/b/c;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/b/c;->bmt:Lkotlinx/coroutines/b/c;
+    sput-object v0, Lkotlinx/coroutines/b/c;->bmD:Lkotlinx/coroutines/b/c;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->Ey()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->EB()I
 
     move-result v1
 
@@ -48,13 +48,13 @@
 
     new-instance v2, Lkotlinx/coroutines/b/f;
 
-    sget-object v3, Lkotlinx/coroutines/b/l;->bmG:Lkotlinx/coroutines/b/l;
+    sget-object v3, Lkotlinx/coroutines/b/l;->bmQ: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/ab;
 
-    sput-object v2, Lkotlinx/coroutines/b/c;->bjX:Lkotlinx/coroutines/ab;
+    sput-object v2, Lkotlinx/coroutines/b/c;->bkh:Lkotlinx/coroutines/ab;
 
     return-void
 
@@ -90,10 +90,10 @@
     return-void
 .end method
 
-.method public static DE()Lkotlinx/coroutines/ab;
+.method public static DH()Lkotlinx/coroutines/ab;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/c;->bjX:Lkotlinx/coroutines/ab;
+    sget-object v0, Lkotlinx/coroutines/b/c;->bkh:Lkotlinx/coroutines/ab;
 
     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 ebf8cf65c0..fa362dd8f8 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 blV:I
+.field private bmE:Lkotlinx/coroutines/b/a;
 
-.field private final blW:I
+.field private final bmf:I
 
-.field private final blX:J
+.field private final bmg:I
 
-.field private final blY:Ljava/lang/String;
+.field private final bmh:J
 
-.field private bmu:Lkotlinx/coroutines/b/a;
+.field private final bmi:Ljava/lang/String;
 
 
 # direct methods
@@ -39,29 +39,29 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/az;-><init>()V
 
-    iput p1, p0, Lkotlinx/coroutines/b/d;->blV:I
+    iput p1, p0, Lkotlinx/coroutines/b/d;->bmf:I
 
-    iput p2, p0, Lkotlinx/coroutines/b/d;->blW:I
+    iput p2, p0, Lkotlinx/coroutines/b/d;->bmg:I
 
-    iput-wide p3, p0, Lkotlinx/coroutines/b/d;->blX:J
+    iput-wide p3, p0, Lkotlinx/coroutines/b/d;->bmh:J
 
-    iput-object p5, p0, Lkotlinx/coroutines/b/d;->blY:Ljava/lang/String;
+    iput-object p5, p0, Lkotlinx/coroutines/b/d;->bmi:Ljava/lang/String;
 
     new-instance p1, Lkotlinx/coroutines/b/a;
 
-    iget v2, p0, Lkotlinx/coroutines/b/d;->blV:I
+    iget v2, p0, Lkotlinx/coroutines/b/d;->bmf:I
 
-    iget v3, p0, Lkotlinx/coroutines/b/d;->blW:I
+    iget v3, p0, Lkotlinx/coroutines/b/d;->bmg:I
 
-    iget-wide v4, p0, Lkotlinx/coroutines/b/d;->blX:J
+    iget-wide v4, p0, Lkotlinx/coroutines/b/d;->bmh:J
 
-    iget-object v6, p0, Lkotlinx/coroutines/b/d;->blY:Ljava/lang/String;
+    iget-object v6, p0, Lkotlinx/coroutines/b/d;->bmi: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;->bmu:Lkotlinx/coroutines/b/a;
+    iput-object p1, p0, Lkotlinx/coroutines/b/d;->bmE:Lkotlinx/coroutines/b/a;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-wide v4, Lkotlinx/coroutines/b/m;->bmL:J
+    sget-wide v4, Lkotlinx/coroutines/b/m;->bmV:J
 
     move-object v1, p0
 
@@ -102,7 +102,7 @@
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmu:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmE: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/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     invoke-virtual {v0, p1, p2}, Lkotlinx/coroutines/ak;->a(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Runnable;)V
 
@@ -130,7 +130,7 @@
     invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmu:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmE: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/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object p3, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     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;->bmu:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmE:Lkotlinx/coroutines/b/a;
 
     invoke-virtual {v0}, Lkotlinx/coroutines/b/a;->close()V
 
@@ -165,7 +165,7 @@
 .method public final getExecutor()Ljava/util/concurrent/Executor;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmu:Lkotlinx/coroutines/b/a;
+    iget-object v0, p0, Lkotlinx/coroutines/b/d;->bmE:Lkotlinx/coroutines/b/a;
 
     check-cast v0, Ljava/util/concurrent/Executor;
 
@@ -189,7 +189,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/d;->bmu:Lkotlinx/coroutines/b/a;
+    iget-object v1, p0, Lkotlinx/coroutines/b/d;->bmE: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 793b3eb5b0..0f1df4b859 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;->blu:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blE:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_2
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/m;->blv:Lkotlinx/coroutines/internal/m$a;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blF: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;->EW()Lkotlinx/coroutines/b/l;
+    invoke-virtual {v1}, Lkotlinx/coroutines/b/i;->EZ()Lkotlinx/coroutines/b/l;
 
     move-result-object v1
 
@@ -151,9 +151,9 @@
 
     and-int v10, v1, v2
 
-    sget-object v1, Lkotlinx/coroutines/internal/m;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->blv:Lkotlinx/coroutines/internal/m$a;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->blF: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;->blu:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blE: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;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()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 48cba88de5..7adeb0242d 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 bmw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bmF: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 bmx:Lkotlinx/coroutines/b/d;
+.field private final bmH:Lkotlinx/coroutines/b/d;
 
-.field private final bmy:I
+.field private final bmI:I
 
-.field private final bmz:Lkotlinx/coroutines/b/l;
+.field private final bmJ:Lkotlinx/coroutines/b/l;
 
 .field private volatile inFlightTasks:I
 
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/f;->bmw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/f;->bmG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -61,17 +61,17 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/az;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bmx:Lkotlinx/coroutines/b/d;
+    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bmH:Lkotlinx/coroutines/b/d;
 
-    iput p2, p0, Lkotlinx/coroutines/b/f;->bmy:I
+    iput p2, p0, Lkotlinx/coroutines/b/f;->bmI:I
 
-    iput-object p3, p0, Lkotlinx/coroutines/b/f;->bmz:Lkotlinx/coroutines/b/l;
+    iput-object p3, p0, Lkotlinx/coroutines/b/f;->bmJ: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lkotlinx/coroutines/b/f;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     const/4 p1, 0x0
 
@@ -84,17 +84,17 @@
     .locals 2
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/b/f;->bmw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/f;->bmG: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;->bmy:I
+    iget v1, p0, Lkotlinx/coroutines/b/f;->bmI:I
 
     if-gt v0, v1, :cond_1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmx:Lkotlinx/coroutines/b/d;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmH:Lkotlinx/coroutines/b/d;
 
     move-object v1, p0
 
@@ -105,24 +105,24 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
 
-    sget-object p1, Lkotlinx/coroutines/b/f;->bmw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/f;->bmG: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;->bmy:I
+    iget v0, p0, Lkotlinx/coroutines/b/f;->bmI:I
 
     if-lt p1, v0, :cond_2
 
     return-void
 
     :cond_2
-    iget-object p1, p0, Lkotlinx/coroutines/b/f;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lkotlinx/coroutines/b/f;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-virtual {p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->poll()Ljava/lang/Object;
 
@@ -137,10 +137,10 @@
 
 
 # virtual methods
-.method public final EU()V
+.method public final EX()V
     .locals 4
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmF: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;->bmx:Lkotlinx/coroutines/b/d;
+    iget-object v2, p0, Lkotlinx/coroutines/b/f;->bmH:Lkotlinx/coroutines/b/d;
 
     move-object v3, p0
 
@@ -163,11 +163,11 @@
     return-void
 
     :cond_0
-    sget-object v0, Lkotlinx/coroutines/b/f;->bmw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/f;->bmG: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmF: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 EV()Lkotlinx/coroutines/b/l;
+.method public final EY()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmz:Lkotlinx/coroutines/b/l;
+    iget-object v0, p0, Lkotlinx/coroutines/b/f;->bmJ:Lkotlinx/coroutines/b/l;
 
     return-object v0
 .end method
@@ -270,7 +270,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/f;->bmx:Lkotlinx/coroutines/b/d;
+    iget-object v1, p0, Lkotlinx/coroutines/b/f;->bmH: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 08571c43fd..d69a875b76 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 bmA:Lkotlinx/coroutines/b/g;
+.field public static final bmK: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;->bmA:Lkotlinx/coroutines/b/g;
+    sput-object v0, Lkotlinx/coroutines/b/g;->bmK:Lkotlinx/coroutines/b/g;
 
     return-void
 .end method
@@ -30,7 +30,7 @@
 
 
 # virtual methods
-.method public final np()J
+.method public final ns()J
     .locals 2
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/h.smali
index c906a2d267..54762dde24 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 public static final bmB:Lkotlinx/coroutines/b/h;
+.field private static final bmJ:Lkotlinx/coroutines/b/l;
 
-.field private static final bmz:Lkotlinx/coroutines/b/l;
+.field public static final bmL: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;->bmB:Lkotlinx/coroutines/b/h;
+    sput-object v0, Lkotlinx/coroutines/b/h;->bmL:Lkotlinx/coroutines/b/h;
 
-    sget-object v0, Lkotlinx/coroutines/b/l;->bmF:Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/l;->bmP:Lkotlinx/coroutines/b/l;
 
-    sput-object v0, Lkotlinx/coroutines/b/h;->bmz:Lkotlinx/coroutines/b/l;
+    sput-object v0, Lkotlinx/coroutines/b/h;->bmJ:Lkotlinx/coroutines/b/l;
 
     return-void
 .end method
@@ -39,16 +39,16 @@
 
 
 # virtual methods
-.method public final EU()V
+.method public final EX()V
     .locals 0
 
     return-void
 .end method
 
-.method public final EV()Lkotlinx/coroutines/b/l;
+.method public final EY()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bmz:Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bmJ: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 cd933097f4..6fc2b08a1c 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 bmC:J
+.field public bmM:J
 
-.field public bmD:Lkotlinx/coroutines/b/j;
+.field public bmN:Lkotlinx/coroutines/b/j;
 
 
 # direct methods
 .method public constructor <init>()V
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/b/h;->bmB:Lkotlinx/coroutines/b/h;
+    sget-object v0, Lkotlinx/coroutines/b/h;->bmL: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;->bmC:J
+    iput-wide p1, p0, Lkotlinx/coroutines/b/i;->bmM:J
 
-    iput-object p3, p0, Lkotlinx/coroutines/b/i;->bmD:Lkotlinx/coroutines/b/j;
+    iput-object p3, p0, Lkotlinx/coroutines/b/i;->bmN:Lkotlinx/coroutines/b/j;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EW()Lkotlinx/coroutines/b/l;
+.method public final EZ()Lkotlinx/coroutines/b/l;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/b/i;->bmD:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/b/i;->bmN:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EV()Lkotlinx/coroutines/b/l;
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EY()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 701482e445..17e0e3dcc2 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 EU()V
+.method public abstract EX()V
 .end method
 
-.method public abstract EV()Lkotlinx/coroutines/b/l;
+.method public abstract EY()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 6417a52348..51106d4ff1 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 bmE:Ljava/lang/Runnable;
+.field public final bmO: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;->bmE:Ljava/lang/Runnable;
+    iput-object p1, p0, Lkotlinx/coroutines/b/k;->bmO:Ljava/lang/Runnable;
 
     return-void
 .end method
@@ -32,24 +32,24 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bmE:Ljava/lang/Runnable;
+    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bmO: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;->bmD:Lkotlinx/coroutines/b/j;
+    iget-object v0, p0, Lkotlinx/coroutines/b/k;->bmN:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EU()V
+    invoke-interface {v0}, Lkotlinx/coroutines/b/j;->EX()V
 
     return-void
 
     :catchall_0
     move-exception v0
 
-    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmD:Lkotlinx/coroutines/b/j;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmN:Lkotlinx/coroutines/b/j;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/b/j;->EU()V
+    invoke-interface {v1}, Lkotlinx/coroutines/b/j;->EX()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;->bmE:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmO:Ljava/lang/Runnable;
 
     invoke-static {v1}, Lkotlinx/coroutines/aj;->aU(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;->bmE:Ljava/lang/Runnable;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmO:Ljava/lang/Runnable;
 
     invoke-static {v1}, Lkotlinx/coroutines/aj;->aT(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;->bmC:J
+    iget-wide v2, p0, Lkotlinx/coroutines/b/k;->bmM: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;->bmD:Lkotlinx/coroutines/b/j;
+    iget-object v1, p0, Lkotlinx/coroutines/b/k;->bmN: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 b5550dbf2e..304994751b 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 bmF:Lkotlinx/coroutines/b/l;
+.field public static final enum bmP:Lkotlinx/coroutines/b/l;
 
-.field public static final enum bmG:Lkotlinx/coroutines/b/l;
+.field public static final enum bmQ:Lkotlinx/coroutines/b/l;
 
-.field private static final synthetic bmH:[Lkotlinx/coroutines/b/l;
+.field private static final synthetic bmR:[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;->bmF:Lkotlinx/coroutines/b/l;
+    sput-object v1, Lkotlinx/coroutines/b/l;->bmP: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;->bmG:Lkotlinx/coroutines/b/l;
+    sput-object v1, Lkotlinx/coroutines/b/l;->bmQ:Lkotlinx/coroutines/b/l;
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lkotlinx/coroutines/b/l;->bmH:[Lkotlinx/coroutines/b/l;
+    sput-object v0, Lkotlinx/coroutines/b/l;->bmR:[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;->bmH:[Lkotlinx/coroutines/b/l;
+    sget-object v0, Lkotlinx/coroutines/b/l;->bmR:[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 9724410848..0f0613ea87 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/m.smali
@@ -6,15 +6,15 @@
 # static fields
 .field public static final CORE_POOL_SIZE:I
 
-.field public static final bmI:J
+.field public static final bmS:J
 
-.field public static final bmJ:I
+.field public static final bmT:I
 
-.field public static final bmK:I
+.field public static final bmU:I
 
-.field public static final bmL:J
+.field public static final bmV:J
 
-.field public static bmM:Lkotlinx/coroutines/b/n;
+.field public static bmW:Lkotlinx/coroutines/b/n;
 
 .field public static final l:I
 
@@ -31,7 +31,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/b/m;->bmI:J
+    sput-wide v0, Lkotlinx/coroutines/b/m;->bmS:J
 
     const/4 v0, 0x4
 
@@ -47,7 +47,7 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/m;->bmJ:I
+    sput v3, Lkotlinx/coroutines/b/m;->bmT:I
 
     const-string v3, "kotlinx.coroutines.scheduler.blocking.parallelism"
 
@@ -59,9 +59,9 @@
 
     move-result v3
 
-    sput v3, Lkotlinx/coroutines/b/m;->bmK:I
+    sput v3, Lkotlinx/coroutines/b/m;->bmU:I
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->Ey()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->EB()I
 
     move-result v3
 
@@ -83,7 +83,7 @@
 
     sput v3, Lkotlinx/coroutines/b/m;->CORE_POOL_SIZE:I
 
-    invoke-static {}, Lkotlinx/coroutines/internal/x;->Ey()I
+    invoke-static {}, Lkotlinx/coroutines/internal/x;->EB()I
 
     move-result v3
 
@@ -119,13 +119,13 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lkotlinx/coroutines/b/m;->bmL:J
+    sput-wide v0, Lkotlinx/coroutines/b/m;->bmV:J
 
-    sget-object v0, Lkotlinx/coroutines/b/g;->bmA:Lkotlinx/coroutines/b/g;
+    sget-object v0, Lkotlinx/coroutines/b/g;->bmK:Lkotlinx/coroutines/b/g;
 
     check-cast v0, Lkotlinx/coroutines/b/n;
 
-    sput-object v0, Lkotlinx/coroutines/b/m;->bmM:Lkotlinx/coroutines/b/n;
+    sput-object v0, Lkotlinx/coroutines/b/m;->bmW:Lkotlinx/coroutines/b/n;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/b/n.smali b/com.discord/smali_classes2/kotlinx/coroutines/b/n.smali
index 64b0e88a80..5a9347f332 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/b/n.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/b/n.smali
@@ -14,5 +14,5 @@
 
 
 # virtual methods
-.method public abstract np()J
+.method public abstract ns()J
 .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 f7608cb413..f08174e508 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 bmO:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final bmP:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bmZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field static final bmQ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field static final bna:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
-.field private final bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final bmX: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;->bmO:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/o;->bmY:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     const-string v1, "producerIndex"
 
@@ -51,7 +51,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/b/o;->bmP:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/b/o;->bmZ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const-string v1, "consumerIndex"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/b/o;->bmQ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/b/o;->bna: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lkotlinx/coroutines/b/o;->bmX: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;->EX()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->Fa()I
 
     move-result v0
 
@@ -126,7 +126,7 @@
     :cond_1
     and-int/lit8 v3, v2, 0x7f
 
-    iget-object v5, p0, Lkotlinx/coroutines/b/o;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v5, p0, Lkotlinx/coroutines/b/o;->bmX: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;->bmQ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/b/o;->bna: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bmX: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;->bmC:J
+    iget-wide v2, v0, Lkotlinx/coroutines/b/i;->bmM:J
 
     sub-long/2addr p1, v2
 
-    sget-wide v2, Lkotlinx/coroutines/b/m;->bmI:J
+    sget-wide v2, Lkotlinx/coroutines/b/m;->bmS:J
 
     cmp-long v4, p1, v2
 
@@ -226,7 +226,7 @@
     return v1
 
     :cond_1
-    sget-object p1, Lkotlinx/coroutines/b/o;->bmO:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/o;->bmY: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;->EX()I
+    invoke-virtual {p0}, Lkotlinx/coroutines/b/o;->Fa()I
 
     move-result v0
 
@@ -266,7 +266,7 @@
 
     and-int/2addr v0, v2
 
-    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/b/o;->bmX: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/b/o;->bmX: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;->bmP:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/b/o;->bmZ: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 EX()I
+.method public final Fa()I
     .locals 2
 
     iget v0, p0, Lkotlinx/coroutines/b/o;->producerIndex:I
@@ -304,10 +304,10 @@
     return v0
 .end method
 
-.method public final EY()Lkotlinx/coroutines/b/i;
+.method public final Fb()Lkotlinx/coroutines/b/i;
     .locals 5
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bmO:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bmY: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bmX: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;->bmQ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/o;->bna: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bmX: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bmO:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bmY: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v3, Lkotlinx/coroutines/b/m;->bmM:Lkotlinx/coroutines/b/n;
+    sget-object v3, Lkotlinx/coroutines/b/m;->bmW:Lkotlinx/coroutines/b/n;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/b/n;->np()J
+    invoke-virtual {v3}, Lkotlinx/coroutines/b/n;->ns()J
 
     move-result-wide v3
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->EX()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Fa()I
 
     move-result v5
 
@@ -468,7 +468,7 @@
     :cond_2
     and-int/lit8 v11, v10, 0x7f
 
-    iget-object v13, v1, Lkotlinx/coroutines/b/o;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v13, v1, Lkotlinx/coroutines/b/o;->bmX: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;->bmC:J
+    iget-wide v13, v13, Lkotlinx/coroutines/b/i;->bmM:J
 
     sub-long v13, v3, v13
 
-    sget-wide v15, Lkotlinx/coroutines/b/m;->bmI:J
+    sget-wide v15, Lkotlinx/coroutines/b/m;->bmS:J
 
     cmp-long v17, v13, v15
 
     if-gez v17, :cond_5
 
-    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->EX()I
+    invoke-virtual/range {p1 .. p1}, Lkotlinx/coroutines/b/o;->Fa()I
 
     move-result v13
 
-    sget v14, Lkotlinx/coroutines/b/m;->bmJ:I
+    sget v14, Lkotlinx/coroutines/b/m;->bmT:I
 
     if-le v13, v14, :cond_4
 
@@ -516,7 +516,7 @@
     goto :goto_4
 
     :cond_6
-    sget-object v13, Lkotlinx/coroutines/b/o;->bmQ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v13, Lkotlinx/coroutines/b/o;->bna: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v10, v1, Lkotlinx/coroutines/b/o;->bmX: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/b/o;->bmO:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/b/o;->bmY: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lkotlinx/coroutines/b/o;->bmX: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;->bmQ:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/b/o;->bna: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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/b/o;->bmX: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 68d2e56b59..1336950087 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ba.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private bkm:Z
+.field private bkw:Z
 
 
 # direct methods
@@ -66,7 +66,7 @@
 
 
 # virtual methods
-.method public final DR()V
+.method public final DU()V
     .locals 1
 
     invoke-virtual {p0}, Lkotlinx/coroutines/ba;->getExecutor()Ljava/util/concurrent/Executor;
@@ -77,7 +77,7 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lkotlinx/coroutines/ba;->bkm:Z
+    iput-boolean v0, p0, Lkotlinx/coroutines/ba;->bkw:Z
 
     return-void
 .end method
@@ -98,7 +98,7 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-boolean v0, p0, Lkotlinx/coroutines/ba;->bkm:Z
+    iget-boolean v0, p0, Lkotlinx/coroutines/ba;->bkw:Z
 
     if-eqz v0, :cond_0
 
@@ -147,7 +147,7 @@
     return-void
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object v0, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     invoke-virtual {v0, p1, p2, p3}, Lkotlinx/coroutines/ak;->a(JLkotlinx/coroutines/k;)V
 
@@ -170,7 +170,7 @@
 
     move-result-object p1
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v0
 
@@ -185,9 +185,9 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
-    sget-object p1, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object p1, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     invoke-virtual {p1, p2}, Lkotlinx/coroutines/ak;->j(Ljava/lang/Runnable;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bb.smali b/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
index a08f52f46b..0bc8a69a90 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bb.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field public static final bkn:Lkotlinx/coroutines/bb;
+.field public static final bkx:Lkotlinx/coroutines/bb;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bb;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sput-object v0, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     return-void
 .end method
@@ -33,10 +33,10 @@
 
 
 # virtual methods
-.method public final Da()Lkotlin/coroutines/CoroutineContext;
+.method public final Dd()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    sget-object v0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object v0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bc.smali b/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
index 581780596a..06aa01dc60 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bc.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field final bko:Lkotlinx/coroutines/br;
+.field final bky:Lkotlinx/coroutines/br;
 
 
 # direct methods
@@ -20,17 +20,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bc;->bko:Lkotlinx/coroutines/br;
+    iput-object p1, p0, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final DF()Lkotlinx/coroutines/br;
+.method public final DI()Lkotlinx/coroutines/br;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bc;->bko:Lkotlinx/coroutines/br;
+    iget-object v0, p0, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
 
     return-object v0
 .end method
@@ -46,7 +46,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/bc;->bko:Lkotlinx/coroutines/br;
+    iget-object v0, p0, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
 
     const-string v1, "New"
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bd.smali b/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
index b38f9d3ef6..59a93db075 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bd.smali
@@ -4,7 +4,7 @@
 
 
 # virtual methods
-.method public abstract DF()Lkotlinx/coroutines/br;
+.method public abstract DI()Lkotlinx/coroutines/br;
 .end method
 
 .method public abstract isActive()Z
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/be.smali b/com.discord/smali_classes2/kotlinx/coroutines/be.smali
index 524726d13e..3436b3cea8 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/be.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/be.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bkp:Lkotlinx/coroutines/bd;
+.field public final bkz:Lkotlinx/coroutines/bd;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/be;->bkp:Lkotlinx/coroutines/bd;
+    iput-object p1, p0, Lkotlinx/coroutines/be;->bkz:Lkotlinx/coroutines/bd;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bf.smali b/com.discord/smali_classes2/kotlinx/coroutines/bf.smali
index 9f3d834a2b..2a64086685 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bf.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bf.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bkq:Lkotlin/jvm/functions/Function1;
+.field private final bkA:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -36,7 +36,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/i;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bf;->bkq:Lkotlin/jvm/functions/Function1;
+    iput-object p1, p0, Lkotlinx/coroutines/bf;->bkA:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bf;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/bf;->bkq:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bf;->bkA: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/bf;->bkq:Lkotlin/jvm/functions/Function1;
+    iget-object v1, p0, Lkotlinx/coroutines/bf;->bkA:Lkotlin/jvm/functions/Function1;
 
     invoke-static {v1}, Lkotlinx/coroutines/aj;->aU(Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bg.smali b/com.discord/smali_classes2/kotlinx/coroutines/bg.smali
index 94c70d7263..2df570fb04 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bg.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bg.smali
@@ -14,13 +14,13 @@
 
 
 # static fields
-.field private static final bkr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bkB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
 .field private volatile _invoked:I
 
-.field private final bkq:Lkotlin/jvm/functions/Function1;
+.field private final bkA: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/bg;->bkr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/bg;->bkB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -73,7 +73,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bj;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/bg;->bkq:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlinx/coroutines/bg;->bkA:Lkotlin/jvm/functions/Function1;
 
     const/4 p1, 0x0
 
@@ -91,7 +91,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bg;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/bg;->bkr:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bg;->bkB:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
@@ -111,7 +111,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotlinx/coroutines/bg;->bkq:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bg;->bkA: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/bh.smali b/com.discord/smali_classes2/kotlinx/coroutines/bh.smali
index 0ff330e4be..5e48f1ca2e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bh.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bh.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field private final bkq:Lkotlin/jvm/functions/Function1;
+.field private final bkA:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
@@ -51,7 +51,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bm;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/bh;->bkq:Lkotlin/jvm/functions/Function1;
+    iput-object p2, p0, Lkotlinx/coroutines/bh;->bkA:Lkotlin/jvm/functions/Function1;
 
     return-void
 .end method
@@ -65,7 +65,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bh;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/bh;->bkq:Lkotlin/jvm/functions/Function1;
+    iget-object v0, p0, Lkotlinx/coroutines/bh;->bkA: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/bi.smali b/com.discord/smali_classes2/kotlinx/coroutines/bi.smali
index 47945cc705..dc4c788352 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bi.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bi.smali
@@ -47,7 +47,7 @@
 
 
 # virtual methods
-.method public final synthetic Du()Ljava/lang/Throwable;
+.method public final synthetic Dx()Ljava/lang/Throwable;
     .locals 4
 
     sget-boolean v0, Lkotlinx/coroutines/aj;->DEBUG:Z
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bk.smali b/com.discord/smali_classes2/kotlinx/coroutines/bk.smali
index cafcc3de50..f918e1066e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bk.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bk.smali
@@ -21,7 +21,7 @@
 
 
 # virtual methods
-.method public final DU()Z
+.method public final DX()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -29,7 +29,7 @@
     return v0
 .end method
 
-.method protected final DV()Z
+.method protected final DY()Z
     .locals 1
 
     const/4 v0, 0x0
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bm.smali b/com.discord/smali_classes2/kotlinx/coroutines/bm.smali
index dca66faa4f..030188aa13 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bm.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bm.smali
@@ -52,7 +52,7 @@
 
 
 # virtual methods
-.method public final DF()Lkotlinx/coroutines/br;
+.method public final DI()Lkotlinx/coroutines/br;
     .locals 1
 
     const/4 v0, 0x0
@@ -74,7 +74,7 @@
     invoke-static {p0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :cond_0
-    invoke-virtual {v0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -84,9 +84,9 @@
 
     if-ne v1, p0, :cond_1
 
-    sget-object v2, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ed()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Eg()Lkotlinx/coroutines/av;
 
     move-result-object v3
 
@@ -106,13 +106,13 @@
 
     check-cast v1, Lkotlinx/coroutines/bd;
 
-    invoke-interface {v1}, Lkotlinx/coroutines/bd;->DF()Lkotlinx/coroutines/br;
+    invoke-interface {v1}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
 
     move-result-object v0
 
     if-eqz v0, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bm;->Em()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bm;->Ep()Z
 
     :cond_3
     return-void
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bn$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/bn$a.smali
index f0f31e9e3d..d816ff1fa0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bn$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bn$a.smali
@@ -23,13 +23,13 @@
 
 
 # instance fields
-.field private final bku:Lkotlinx/coroutines/bn;
+.field private final bkE:Lkotlinx/coroutines/bn;
 
-.field private final bkv:Lkotlinx/coroutines/bn$b;
+.field private final bkF:Lkotlinx/coroutines/bn$b;
 
-.field private final bkw:Lkotlinx/coroutines/p;
+.field private final bkG:Lkotlinx/coroutines/p;
 
-.field private final bkx:Ljava/lang/Object;
+.field private final bkH:Ljava/lang/Object;
 
 
 # direct methods
@@ -48,19 +48,19 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p3, Lkotlinx/coroutines/p;->bjq:Lkotlinx/coroutines/q;
+    iget-object v0, p3, Lkotlinx/coroutines/p;->bjA:Lkotlinx/coroutines/q;
 
     check-cast v0, Lkotlinx/coroutines/Job;
 
     invoke-direct {p0, v0}, Lkotlinx/coroutines/bm;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bn$a;->bku:Lkotlinx/coroutines/bn;
+    iput-object p1, p0, Lkotlinx/coroutines/bn$a;->bkE:Lkotlinx/coroutines/bn;
 
-    iput-object p2, p0, Lkotlinx/coroutines/bn$a;->bkv:Lkotlinx/coroutines/bn$b;
+    iput-object p2, p0, Lkotlinx/coroutines/bn$a;->bkF:Lkotlinx/coroutines/bn$b;
 
-    iput-object p3, p0, Lkotlinx/coroutines/bn$a;->bkw:Lkotlinx/coroutines/p;
+    iput-object p3, p0, Lkotlinx/coroutines/bn$a;->bkG:Lkotlinx/coroutines/p;
 
-    iput-object p4, p0, Lkotlinx/coroutines/bn$a;->bkx:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/bn$a;->bkH:Ljava/lang/Object;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/bn$a;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/bn$a;->bku:Lkotlinx/coroutines/bn;
+    iget-object p1, p0, Lkotlinx/coroutines/bn$a;->bkE:Lkotlinx/coroutines/bn;
 
-    iget-object v0, p0, Lkotlinx/coroutines/bn$a;->bkv:Lkotlinx/coroutines/bn$b;
+    iget-object v0, p0, Lkotlinx/coroutines/bn$a;->bkF:Lkotlinx/coroutines/bn$b;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkw:Lkotlinx/coroutines/p;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkG:Lkotlinx/coroutines/p;
 
-    iget-object v2, p0, Lkotlinx/coroutines/bn$a;->bkx:Ljava/lang/Object;
+    iget-object v2, p0, Lkotlinx/coroutines/bn$a;->bkH:Ljava/lang/Object;
 
     invoke-static {p1, v0, v1, v2}, Lkotlinx/coroutines/bn;->a(Lkotlinx/coroutines/bn;Lkotlinx/coroutines/bn$b;Lkotlinx/coroutines/p;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/bn$a;->bkw:Lkotlinx/coroutines/p;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkG:Lkotlinx/coroutines/p;
 
     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/bn$a;->bkx:Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$a;->bkH: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/bn$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/bn$b.smali
index e2999e7103..259eb24c24 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bn$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bn$b.smali
@@ -20,7 +20,7 @@
 # instance fields
 .field volatile _exceptionsHolder:Ljava/lang/Object;
 
-.field final bko:Lkotlinx/coroutines/br;
+.field final bky:Lkotlinx/coroutines/br;
 
 .field public volatile isCompleting:Z
 
@@ -37,7 +37,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bn$b;->bko:Lkotlinx/coroutines/br;
+    iput-object p1, p0, Lkotlinx/coroutines/bn$b;->bky:Lkotlinx/coroutines/br;
 
     const/4 p1, 0x0
 
@@ -48,7 +48,7 @@
     return-void
 .end method
 
-.method static Eb()Ljava/util/ArrayList;
+.method static Ee()Ljava/util/ArrayList;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -70,20 +70,20 @@
 
 
 # virtual methods
-.method public final DF()Lkotlinx/coroutines/br;
+.method public final DI()Lkotlinx/coroutines/br;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bn$b;->bko:Lkotlinx/coroutines/br;
+    iget-object v0, p0, Lkotlinx/coroutines/bn$b;->bky:Lkotlinx/coroutines/br;
 
     return-object v0
 .end method
 
-.method public final DZ()Z
+.method public final Ec()Z
     .locals 2
 
     iget-object v0, p0, Lkotlinx/coroutines/bn$b;->_exceptionsHolder:Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ec()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ef()Lkotlinx/coroutines/internal/v;
 
     move-result-object v1
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method public final Ea()Z
+.method public final Ed()Z
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/bn$b;->rootCause:Ljava/lang/Throwable;
@@ -142,7 +142,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn$b;->Ea()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn$b;->Ed()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/bn$b;->bko:Lkotlinx/coroutines/br;
+    iget-object v1, p0, Lkotlinx/coroutines/bn$b;->bky:Lkotlinx/coroutines/br;
 
     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/bn$b;->Eb()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ee()Ljava/util/ArrayList;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bn$c.smali b/com.discord/smali_classes2/kotlinx/coroutines/bn$c.smali
index b3d77c6ebf..b6504e0ec0 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bn$c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bn$c.smali
@@ -15,22 +15,22 @@
 
 
 # instance fields
-.field final synthetic bkA:Ljava/lang/Object;
+.field final synthetic bkI:Lkotlinx/coroutines/internal/k;
 
-.field final synthetic bky:Lkotlinx/coroutines/internal/k;
+.field final synthetic bkJ:Lkotlinx/coroutines/bn;
 
-.field final synthetic bkz:Lkotlinx/coroutines/bn;
+.field final synthetic bkK:Ljava/lang/Object;
 
 
 # direct methods
 .method public constructor <init>(Lkotlinx/coroutines/internal/k;Lkotlinx/coroutines/internal/k;Lkotlinx/coroutines/bn;Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/bn$c;->bky:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/bn$c;->bkI:Lkotlinx/coroutines/internal/k;
 
-    iput-object p3, p0, Lkotlinx/coroutines/bn$c;->bkz:Lkotlinx/coroutines/bn;
+    iput-object p3, p0, Lkotlinx/coroutines/bn$c;->bkJ:Lkotlinx/coroutines/bn;
 
-    iput-object p4, p0, Lkotlinx/coroutines/bn$c;->bkA:Ljava/lang/Object;
+    iput-object p4, p0, Lkotlinx/coroutines/bn$c;->bkK: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lkotlinx/coroutines/bn$c;->bkz:Lkotlinx/coroutines/bn;
+    iget-object p1, p0, Lkotlinx/coroutines/bn$c;->bkJ:Lkotlinx/coroutines/bn;
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object p1
 
-    iget-object v0, p0, Lkotlinx/coroutines/bn$c;->bkA:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/bn$c;->bkK:Ljava/lang/Object;
 
     if-ne p1, v0, :cond_0
 
@@ -73,7 +73,7 @@
     return-object p1
 
     :cond_1
-    invoke-static {}, Lkotlinx/coroutines/internal/j;->En()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/j;->Eq()Ljava/lang/Object;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bn.smali b/com.discord/smali_classes2/kotlinx/coroutines/bn.smali
index 94838cb278..f17496e391 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bn.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bn.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field static final bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -53,14 +53,14 @@
 
     if-eqz p1, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ed()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Eg()Lkotlinx/coroutines/av;
 
     move-result-object p1
 
     goto :goto_0
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ee()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Eh()Lkotlinx/coroutines/av;
 
     move-result-object p1
 
@@ -70,7 +70,7 @@
     return-void
 .end method
 
-.method private final DX()Lkotlinx/coroutines/bi;
+.method private final Ea()Lkotlinx/coroutines/bi;
     .locals 4
 
     new-instance v0, Lkotlinx/coroutines/bi;
@@ -110,13 +110,13 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ea()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ed()Z
 
     move-result p1
 
     if-eqz p1, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/bn;->DX()Lkotlinx/coroutines/bi;
+    invoke-direct {p0}, Lkotlinx/coroutines/bn;->Ea()Lkotlinx/coroutines/bi;
 
     move-result-object p1
 
@@ -341,7 +341,7 @@
 .method private final a(Lkotlinx/coroutines/bd;)Lkotlinx/coroutines/br;
     .locals 1
 
-    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DF()Lkotlinx/coroutines/br;
+    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
 
     move-result-object v0
 
@@ -401,7 +401,7 @@
     .locals 1
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -409,7 +409,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Er()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Eu()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -420,7 +420,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -428,7 +428,7 @@
 
     move-result-object p0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -552,7 +552,7 @@
 
     invoke-virtual {p1, v0}, Lkotlinx/coroutines/bm;->b(Lkotlinx/coroutines/internal/k;)Z
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -560,7 +560,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjx: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/bn;Lkotlinx/coroutines/bn$b;Lkotlinx/coroutines/p;Ljava/lang/Object;)V
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -627,7 +627,7 @@
 .method private final a(Lkotlinx/coroutines/br;Ljava/lang/Throwable;)V
     .locals 7
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Ep()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -705,11 +705,11 @@
 
     check-cast v1, Ljava/lang/Throwable;
 
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_1
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Eq()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Et()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;->Er()Ljava/lang/Object;
+    invoke-virtual {p2}, Lkotlinx/coroutines/internal/k;->Eu()Ljava/lang/Object;
 
     move-result-object p1
 
@@ -845,7 +845,7 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-static {p2}, Lkotlinx/coroutines/bo;->bd(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -896,7 +896,7 @@
 .method private final a(Lkotlinx/coroutines/bn$b;Ljava/lang/Object;I)Z
     .locals 5
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -916,7 +916,7 @@
     :goto_0
     if-eqz v0, :cond_13
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->DZ()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ec()Z
 
     move-result v0
 
@@ -952,13 +952,13 @@
     monitor-enter p1
 
     :try_start_0
-    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ea()Z
+    invoke-virtual {p1}, Lkotlinx/coroutines/bn$b;->Ed()Z
 
     iget-object v0, p1, Lkotlinx/coroutines/bn$b;->_exceptionsHolder:Ljava/lang/Object;
 
     if-nez v0, :cond_3
 
-    invoke-static {}, Lkotlinx/coroutines/bn$b;->Eb()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ee()Ljava/util/ArrayList;
 
     move-result-object v0
 
@@ -969,7 +969,7 @@
 
     if-eqz v4, :cond_4
 
-    invoke-static {}, Lkotlinx/coroutines/bn$b;->Eb()Ljava/util/ArrayList;
+    invoke-static {}, Lkotlinx/coroutines/bn$b;->Ee()Ljava/util/ArrayList;
 
     move-result-object v4
 
@@ -1009,7 +1009,7 @@
     invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
     :cond_6
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ec()Lkotlinx/coroutines/internal/v;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Ef()Lkotlinx/coroutines/internal/v;
 
     move-result-object v4
 
@@ -1071,7 +1071,7 @@
 
     check-cast v0, Lkotlinx/coroutines/t;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/t;->Dt()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/t;->Dw()Z
 
     goto :goto_4
 
@@ -1088,7 +1088,7 @@
     :goto_4
     invoke-virtual {p0, p2}, Lkotlinx/coroutines/bn;->aP(Ljava/lang/Object;)V
 
-    sget-object v0, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     invoke-static {p2}, Lkotlinx/coroutines/bo;->bd(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -1237,7 +1237,7 @@
     .locals 4
 
     :cond_0
-    iget-object v0, p2, Lkotlinx/coroutines/p;->bjq:Lkotlinx/coroutines/q;
+    iget-object v0, p2, Lkotlinx/coroutines/p;->bjA:Lkotlinx/coroutines/q;
 
     new-instance v1, Lkotlinx/coroutines/bn$a;
 
@@ -1255,7 +1255,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object v1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     if-eq v0, v1, :cond_1
 
@@ -1276,7 +1276,7 @@
 .method private final aW(Ljava/lang/Object;)Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DU()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DX()Z
 
     move-result v0
 
@@ -1304,7 +1304,7 @@
     .locals 4
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1402,7 +1402,7 @@
     return-object p1
 
     :cond_1
-    invoke-direct {p0}, Lkotlinx/coroutines/bn;->DX()Lkotlinx/coroutines/bi;
+    invoke-direct {p0}, Lkotlinx/coroutines/bn;->Ea()Lkotlinx/coroutines/bi;
 
     move-result-object p1
 
@@ -1415,7 +1415,7 @@
 
     check-cast p1, Lkotlinx/coroutines/bu;
 
-    invoke-interface {p1}, Lkotlinx/coroutines/bu;->DY()Ljava/lang/Throwable;
+    invoke-interface {p1}, Lkotlinx/coroutines/bu;->Eb()Ljava/lang/Throwable;
 
     move-result-object p1
 
@@ -1440,7 +1440,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -1459,7 +1459,7 @@
 
     check-cast v3, Lkotlinx/coroutines/bn$b;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/bn$b;->DZ()Z
+    invoke-virtual {v3}, Lkotlinx/coroutines/bn$b;->Ec()Z
 
     move-result v3
     :try_end_0
@@ -1477,7 +1477,7 @@
 
     check-cast v3, Lkotlinx/coroutines/bn$b;
 
-    invoke-virtual {v3}, Lkotlinx/coroutines/bn$b;->Ea()Z
+    invoke-virtual {v3}, Lkotlinx/coroutines/bn$b;->Ed()Z
 
     move-result v3
 
@@ -1524,7 +1524,7 @@
 
     check-cast v2, Lkotlinx/coroutines/bn$b;
 
-    iget-object v0, v2, Lkotlinx/coroutines/bn$b;->bko:Lkotlinx/coroutines/br;
+    iget-object v0, v2, Lkotlinx/coroutines/bn$b;->bky:Lkotlinx/coroutines/br;
 
     invoke-direct {p0, v0, p1}, Lkotlinx/coroutines/bn;->a(Lkotlinx/coroutines/br;Ljava/lang/Throwable;)V
 
@@ -1585,7 +1585,7 @@
 
     invoke-direct {v6, v2, v1}, Lkotlinx/coroutines/bn$b;-><init>(Lkotlinx/coroutines/br;Ljava/lang/Throwable;)V
 
-    sget-object v7, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/bn;->bjx: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
 
@@ -1770,7 +1770,7 @@
 
     invoke-interface {v0}, Lkotlinx/coroutines/o;->dispose()V
 
-    sget-object v0, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object v0, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast v0, Lkotlinx/coroutines/o;
 
@@ -1845,7 +1845,7 @@
     goto :goto_1
 
     :cond_3
-    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DF()Lkotlinx/coroutines/br;
+    invoke-interface {p1}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
 
     move-result-object p1
 
@@ -1863,7 +1863,7 @@
 .method private final b(Lkotlinx/coroutines/br;Ljava/lang/Throwable;)V
     .locals 7
 
-    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Ep()Ljava/lang/Object;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/i;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -1941,11 +1941,11 @@
 
     check-cast v1, Ljava/lang/Throwable;
 
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     :cond_1
     :goto_1
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Eq()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
 
     move-result-object v0
 
@@ -1986,7 +1986,7 @@
 
     check-cast p0, Lkotlinx/coroutines/bn$b;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn$b;->Ea()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn$b;->Ed()Z
 
     move-result v0
 
@@ -2145,7 +2145,7 @@
 
     if-eq v5, p1, :cond_8
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjx: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
 
@@ -2161,7 +2161,7 @@
 
     :cond_8
     :try_start_2
-    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->DZ()Z
+    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->Ec()Z
 
     move-result p1
 
@@ -2169,7 +2169,7 @@
 
     if-eqz p1, :cond_11
 
-    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->Ea()Z
+    invoke-virtual {v5}, Lkotlinx/coroutines/bn$b;->Ed()Z
 
     move-result p1
 
@@ -2206,7 +2206,7 @@
     move-object v1, v6
 
     :goto_2
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -2233,7 +2233,7 @@
 
     if-nez p1, :cond_e
 
-    invoke-interface {v0}, Lkotlinx/coroutines/bd;->DF()Lkotlinx/coroutines/br;
+    invoke-interface {v0}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
 
     move-result-object p1
 
@@ -2307,7 +2307,7 @@
     return v1
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Df()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Di()Z
 
     move-result v0
 
@@ -2336,10 +2336,10 @@
 
 
 # virtual methods
-.method public final DS()Ljava/util/concurrent/CancellationException;
+.method public final DV()Ljava/util/concurrent/CancellationException;
     .locals 4
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2477,11 +2477,11 @@
     throw v1
 .end method
 
-.method public final DT()Z
+.method public final DW()Z
     .locals 6
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2499,13 +2499,13 @@
 
     check-cast v1, Lkotlinx/coroutines/av;
 
-    iget-boolean v1, v1, Lkotlinx/coroutines/av;->bka:Z
+    iget-boolean v1, v1, Lkotlinx/coroutines/av;->bkk:Z
 
     if-nez v1, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/bo;->Ed()Lkotlinx/coroutines/av;
+    invoke-static {}, Lkotlinx/coroutines/bo;->Eg()Lkotlinx/coroutines/av;
 
     move-result-object v5
 
@@ -2518,7 +2518,7 @@
     goto :goto_2
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dc()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Df()V
 
     goto :goto_1
 
@@ -2527,13 +2527,13 @@
 
     if-eqz v1, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/bn;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     move-object v5, v0
 
     check-cast v5, Lkotlinx/coroutines/bc;
 
-    iget-object v5, v5, Lkotlinx/coroutines/bc;->bko:Lkotlinx/coroutines/br;
+    iget-object v5, v5, Lkotlinx/coroutines/bc;->bky:Lkotlinx/coroutines/br;
 
     invoke-virtual {v1, p0, v0, v5}, Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;->compareAndSet(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -2544,7 +2544,7 @@
     goto :goto_2
 
     :cond_2
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dc()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Df()V
 
     :goto_1
     const/4 v2, 0x1
@@ -2568,7 +2568,7 @@
     return v3
 .end method
 
-.method public DU()Z
+.method public DX()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -2576,7 +2576,7 @@
     return v0
 .end method
 
-.method protected DV()Z
+.method protected DY()Z
     .locals 1
 
     const/4 v0, 0x1
@@ -2584,7 +2584,7 @@
     return v0
 .end method
 
-.method public final DW()Ljava/lang/Object;
+.method public final DZ()Ljava/lang/Object;
     .locals 2
 
     :goto_0
@@ -2604,10 +2604,34 @@
     goto :goto_0
 .end method
 
-.method public final DY()Ljava/lang/Throwable;
+.method public Df()V
+    .locals 0
+
+    return-void
+.end method
+
+.method public Dh()Ljava/lang/String;
+    .locals 1
+
+    invoke-static {p0}, Lkotlinx/coroutines/aj;->aU(Ljava/lang/Object;)Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method protected Di()Z
+    .locals 1
+
+    const/4 v0, 0x1
+
+    return v0
+.end method
+
+.method public final Eb()Ljava/lang/Throwable;
     .locals 5
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -2646,7 +2670,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DV()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DY()Z
 
     move-result v2
 
@@ -2715,30 +2739,6 @@
     throw v1
 .end method
 
-.method public Dc()V
-    .locals 0
-
-    return-void
-.end method
-
-.method public De()Ljava/lang/String;
-    .locals 1
-
-    invoke-static {p0}, Lkotlinx/coroutines/aj;->aU(Ljava/lang/Object;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method protected Df()Z
-    .locals 1
-
-    const/4 v0, 0x1
-
-    return v0
-.end method
-
 .method public final a(ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/at;
     .locals 7
     .annotation system Ldalvik/annotation/Signature;
@@ -2763,7 +2763,7 @@
 
     :cond_0
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -2775,7 +2775,7 @@
 
     check-cast v3, Lkotlinx/coroutines/av;
 
-    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bka:Z
+    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bkk:Z
 
     if-eqz v4, :cond_2
 
@@ -2786,7 +2786,7 @@
     move-result-object v1
 
     :cond_1
-    sget-object v3, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/bn;->bjx: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
 
@@ -2803,7 +2803,7 @@
 
     invoke-direct {v2}, Lkotlinx/coroutines/br;-><init>()V
 
-    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bka:Z
+    iget-boolean v4, v3, Lkotlinx/coroutines/av;->bkk:Z
 
     if-eqz v4, :cond_3
 
@@ -2821,7 +2821,7 @@
     check-cast v2, Lkotlinx/coroutines/bd;
 
     :goto_1
-    sget-object v4, Lkotlinx/coroutines/bn;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v4, Lkotlinx/coroutines/bn;->bjx: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
 
@@ -2836,7 +2836,7 @@
 
     check-cast v3, Lkotlinx/coroutines/bd;
 
-    invoke-interface {v3}, Lkotlinx/coroutines/bd;->DF()Lkotlinx/coroutines/br;
+    invoke-interface {v3}, Lkotlinx/coroutines/bd;->DI()Lkotlinx/coroutines/br;
 
     move-result-object v3
 
@@ -2860,7 +2860,7 @@
     throw p1
 
     :cond_6
-    sget-object v4, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object v4, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast v4, Lkotlinx/coroutines/at;
 
@@ -2932,7 +2932,7 @@
     check-cast v4, Lkotlinx/coroutines/at;
 
     :cond_b
-    sget-object v6, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v6, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_0
 
@@ -2998,7 +2998,7 @@
     invoke-interface {p3, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_13
-    sget-object p1, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object p1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast p1, Lkotlinx/coroutines/at;
 
@@ -3093,7 +3093,7 @@
 
     if-nez p1, :cond_1
 
-    sget-object p1, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object p1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast p1, Lkotlinx/coroutines/o;
 
@@ -3102,7 +3102,7 @@
     return-void
 
     :cond_1
-    invoke-interface {p1}, Lkotlinx/coroutines/Job;->DT()Z
+    invoke-interface {p1}, Lkotlinx/coroutines/Job;->DW()Z
 
     move-object v0, p0
 
@@ -3122,7 +3122,7 @@
 
     invoke-interface {p1}, Lkotlinx/coroutines/o;->dispose()V
 
-    sget-object p1, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object p1, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast p1, Lkotlinx/coroutines/o;
 
@@ -3227,7 +3227,7 @@
         }
     .end annotation
 
-    sget-object v0, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v0, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     check-cast v0, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -3243,7 +3243,7 @@
 .method public isActive()Z
     .locals 2
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3301,7 +3301,7 @@
 .method public final k()Z
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3323,7 +3323,7 @@
     .locals 3
 
     :goto_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -3491,7 +3491,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DV()Z
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DY()Z
 
     move-result p1
 
@@ -3540,7 +3540,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->De()Ljava/lang/String;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->Dh()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/bn;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/bn;->DZ()Ljava/lang/Object;
 
     move-result-object v2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bo.smali b/com.discord/smali_classes2/kotlinx/coroutines/bo.smali
index 74b974d771..29f5a6de84 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bo.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bo.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final bkB:Lkotlinx/coroutines/internal/v;
+.field private static final bkL:Lkotlinx/coroutines/internal/v;
 
-.field private static final bkC:Lkotlinx/coroutines/av;
+.field private static final bkM:Lkotlinx/coroutines/av;
 
-.field private static final bkD:Lkotlinx/coroutines/av;
+.field private static final bkN:Lkotlinx/coroutines/av;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/internal/v;-><init>(Ljava/lang/String;)V
 
-    sput-object v0, Lkotlinx/coroutines/bo;->bkB:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/bo;->bkL:Lkotlinx/coroutines/internal/v;
 
     new-instance v0, Lkotlinx/coroutines/av;
 
@@ -29,7 +29,7 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/av;-><init>(Z)V
 
-    sput-object v0, Lkotlinx/coroutines/bo;->bkC:Lkotlinx/coroutines/av;
+    sput-object v0, Lkotlinx/coroutines/bo;->bkM:Lkotlinx/coroutines/av;
 
     new-instance v0, Lkotlinx/coroutines/av;
 
@@ -37,31 +37,31 @@
 
     invoke-direct {v0, v1}, Lkotlinx/coroutines/av;-><init>(Z)V
 
-    sput-object v0, Lkotlinx/coroutines/bo;->bkD:Lkotlinx/coroutines/av;
+    sput-object v0, Lkotlinx/coroutines/bo;->bkN:Lkotlinx/coroutines/av;
 
     return-void
 .end method
 
-.method public static final synthetic Ec()Lkotlinx/coroutines/internal/v;
+.method public static final synthetic Ef()Lkotlinx/coroutines/internal/v;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bkB:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/bo;->bkL:Lkotlinx/coroutines/internal/v;
 
     return-object v0
 .end method
 
-.method public static final synthetic Ed()Lkotlinx/coroutines/av;
+.method public static final synthetic Eg()Lkotlinx/coroutines/av;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bkD:Lkotlinx/coroutines/av;
+    sget-object v0, Lkotlinx/coroutines/bo;->bkN:Lkotlinx/coroutines/av;
 
     return-object v0
 .end method
 
-.method public static final synthetic Ee()Lkotlinx/coroutines/av;
+.method public static final synthetic Eh()Lkotlinx/coroutines/av;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/bo;->bkC:Lkotlinx/coroutines/av;
+    sget-object v0, Lkotlinx/coroutines/bo;->bkM:Lkotlinx/coroutines/av;
 
     return-object v0
 .end method
@@ -85,7 +85,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, v0, Lkotlinx/coroutines/be;->bkp:Lkotlinx/coroutines/bd;
+    iget-object v0, v0, Lkotlinx/coroutines/be;->bkz:Lkotlinx/coroutines/bd;
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bp.smali b/com.discord/smali_classes2/kotlinx/coroutines/bp.smali
index fd69640e5a..8f2e4ac9c3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bp.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bp.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private bkE:Lkotlin/jvm/functions/Function2;
+.field private bkO: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/by;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/bp;->bkE:Lkotlin/jvm/functions/Function2;
+    iput-object p2, p0, Lkotlinx/coroutines/bp;->bkO: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/bp;->bkE:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotlinx/coroutines/bp;->bkO:Lkotlin/jvm/functions/Function2;
 
     if-eqz v0, :cond_0
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lkotlinx/coroutines/bp;->bkE:Lkotlin/jvm/functions/Function2;
+    iput-object v1, p0, Lkotlinx/coroutines/bp;->bkO:Lkotlin/jvm/functions/Function2;
 
     move-object v1, p0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/br.smali b/com.discord/smali_classes2/kotlinx/coroutines/br.smali
index 99c1c013ee..c812a2136f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/br.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/br.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public final DF()Lkotlinx/coroutines/br;
+.method public final DI()Lkotlinx/coroutines/br;
     .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;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/i;->Es()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;->Eq()Lkotlinx/coroutines/internal/k;
+    invoke-virtual {p1}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
 
     move-result-object p1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bs.smali b/com.discord/smali_classes2/kotlinx/coroutines/bs.smali
index 904e0d6b82..6c028508c1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bs.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bs.smali
@@ -8,7 +8,7 @@
 
 
 # static fields
-.field public static final bkF:Lkotlinx/coroutines/bs;
+.field public static final bkP:Lkotlinx/coroutines/bs;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/bs;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sput-object v0, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bu.smali b/com.discord/smali_classes2/kotlinx/coroutines/bu.smali
index d2680f640f..79250ab498 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bu.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bu.smali
@@ -7,5 +7,5 @@
 
 
 # virtual methods
-.method public abstract DY()Ljava/lang/Throwable;
+.method public abstract Eb()Ljava/lang/Throwable;
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bv.smali b/com.discord/smali_classes2/kotlinx/coroutines/bv.smali
index 1d0603b5ca..20318074ca 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bv.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bv.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bkG:Lkotlinx/coroutines/cb;
+.field public final bkQ:Lkotlinx/coroutines/cb;
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {p0, p2, p3}, Ljava/lang/Thread;-><init>(Ljava/lang/Runnable;Ljava/lang/String;)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bv;->bkG:Lkotlinx/coroutines/cb;
+    iput-object p1, p0, Lkotlinx/coroutines/bv;->bkQ:Lkotlinx/coroutines/cb;
 
     const/4 p1, 0x1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bw.smali b/com.discord/smali_classes2/kotlinx/coroutines/bw.smali
index 3a508e5f57..59b66a4412 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bw.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bw.smali
@@ -70,16 +70,16 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bka: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/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    sget-object v1, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy: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;->bgl:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -196,16 +196,16 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lkotlinx/coroutines/ao;->bjQ:Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/ao;->bka: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/ao;->bjS:Lkotlin/coroutines/Continuation;
+    iget-object p0, p0, Lkotlinx/coroutines/ao;->bkc:Lkotlin/coroutines/Continuation;
 
-    sget-object v1, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v1, Lkotlin/m;->bgv: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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy: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;->bgl:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/bx.smali b/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
index a10d9536c0..0ad43c36fb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/bx.smali
@@ -7,9 +7,7 @@
 
 
 # instance fields
-.field private final bjR:Lkotlinx/coroutines/ab;
-
-.field private final bkH:Lkotlinx/coroutines/k;
+.field private final bkR:Lkotlinx/coroutines/k;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/k<",
@@ -19,6 +17,8 @@
     .end annotation
 .end field
 
+.field private final bkb:Lkotlinx/coroutines/ab;
+
 
 # direct methods
 .method public constructor <init>(Lkotlinx/coroutines/ab;Lkotlinx/coroutines/k;)V
@@ -44,9 +44,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/bx;->bjR:Lkotlinx/coroutines/ab;
+    iput-object p1, p0, Lkotlinx/coroutines/bx;->bkb:Lkotlinx/coroutines/ab;
 
-    iput-object p2, p0, Lkotlinx/coroutines/bx;->bkH:Lkotlinx/coroutines/k;
+    iput-object p2, p0, Lkotlinx/coroutines/bx;->bkR:Lkotlinx/coroutines/k;
 
     return-void
 .end method
@@ -56,11 +56,11 @@
 .method public final run()V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/bx;->bkH:Lkotlinx/coroutines/k;
+    iget-object v0, p0, Lkotlinx/coroutines/bx;->bkR:Lkotlinx/coroutines/k;
 
-    iget-object v1, p0, Lkotlinx/coroutines/bx;->bjR:Lkotlinx/coroutines/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/bx;->bkb:Lkotlinx/coroutines/ab;
 
-    sget-object v2, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v2, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     invoke-interface {v0, v1, v2}, Lkotlinx/coroutines/k;->a(Lkotlinx/coroutines/ab;Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/c.smali b/com.discord/smali_classes2/kotlinx/coroutines/c.smali
index 93e85c573e..1731885dc1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/c.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/c.smali
@@ -16,9 +16,9 @@
 
 
 # instance fields
-.field private final bjj:Ljava/lang/Thread;
+.field private final bjt:Ljava/lang/Thread;
 
-.field private final bjk:Lkotlinx/coroutines/aw;
+.field private final bju:Lkotlinx/coroutines/aw;
 
 
 # direct methods
@@ -37,16 +37,16 @@
 
     invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/a;-><init>(Lkotlin/coroutines/CoroutineContext;Z)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/c;->bjj:Ljava/lang/Thread;
+    iput-object p2, p0, Lkotlinx/coroutines/c;->bjt:Ljava/lang/Thread;
 
-    iput-object p3, p0, Lkotlinx/coroutines/c;->bjk:Lkotlinx/coroutines/aw;
+    iput-object p3, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
 
     return-void
 .end method
 
 
 # virtual methods
-.method protected final Df()Z
+.method protected final Di()Z
     .locals 1
 
     const/4 v0, 0x0
@@ -54,7 +54,7 @@
     return v0
 .end method
 
-.method public final Dg()Ljava/lang/Object;
+.method public final Dj()Ljava/lang/Object;
     .locals 3
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -62,10 +62,10 @@
         }
     .end annotation
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     :try_start_0
-    iget-object v0, p0, Lkotlinx/coroutines/c;->bjk:Lkotlinx/coroutines/aw;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
 
     if-eqz v0, :cond_0
 
@@ -82,11 +82,11 @@
 
     if-nez v0, :cond_6
 
-    iget-object v0, p0, Lkotlinx/coroutines/c;->bjk:Lkotlinx/coroutines/aw;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DG()J
+    invoke-virtual {v0}, Lkotlinx/coroutines/aw;->DJ()J
 
     move-result-wide v0
 
@@ -102,7 +102,7 @@
 
     if-nez v2, :cond_2
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v2
 
@@ -114,7 +114,7 @@
 
     :cond_2
     :try_start_2
-    iget-object v0, p0, Lkotlinx/coroutines/c;->bjk:Lkotlinx/coroutines/aw;
+    iget-object v0, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
 
     if-eqz v0, :cond_3
 
@@ -123,9 +123,9 @@
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
     :cond_3
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/c;->DW()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/c;->DZ()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -178,7 +178,7 @@
     move-exception v0
 
     :try_start_4
-    iget-object v1, p0, Lkotlinx/coroutines/c;->bjk:Lkotlinx/coroutines/aw;
+    iget-object v1, p0, Lkotlinx/coroutines/c;->bju:Lkotlinx/coroutines/aw;
 
     if-eqz v1, :cond_7
 
@@ -192,7 +192,7 @@
     :catchall_1
     move-exception v0
 
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     goto :goto_4
 
@@ -210,7 +210,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lkotlinx/coroutines/c;->bjj:Ljava/lang/Thread;
+    iget-object p2, p0, Lkotlinx/coroutines/c;->bjt:Ljava/lang/Thread;
 
     invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -220,7 +220,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lkotlinx/coroutines/c;->bjj:Ljava/lang/Thread;
+    iget-object p1, p0, Lkotlinx/coroutines/c;->bjt:Ljava/lang/Thread;
 
     invoke-static {p1}, Ljava/util/concurrent/locks/LockSupport;->unpark(Ljava/lang/Thread;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ca.smali b/com.discord/smali_classes2/kotlinx/coroutines/ca.smali
index 282616afa4..7d87a048a2 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ca.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ca.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bkI:Ljava/lang/ThreadLocal;
+.field private static final bkS:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field public static final bkJ:Lkotlinx/coroutines/ca;
+.field public static final bkT:Lkotlinx/coroutines/ca;
 
 
 # direct methods
@@ -25,13 +25,13 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ca;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sput-object v0, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
     new-instance v0, Ljava/lang/ThreadLocal;
 
     invoke-direct {v0}, Ljava/lang/ThreadLocal;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ca;->bkI:Ljava/lang/ThreadLocal;
+    sput-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
 
     return-void
 .end method
@@ -44,10 +44,10 @@
     return-void
 .end method
 
-.method public static Ef()Lkotlinx/coroutines/aw;
+.method public static Ei()Lkotlinx/coroutines/aw;
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkI:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkS: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/ay;->DO()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ay;->DR()Lkotlinx/coroutines/aw;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/ca;->bkI:Ljava/lang/ThreadLocal;
+    sget-object v1, Lkotlinx/coroutines/ca;->bkS: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 Eg()Lkotlinx/coroutines/aw;
+.method public static Ej()Lkotlinx/coroutines/aw;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkI:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object;
 
@@ -83,10 +83,10 @@
     return-object v0
 .end method
 
-.method public static Eh()V
+.method public static Ek()V
     .locals 2
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkI:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
 
     const/4 v1, 0x0
 
@@ -102,7 +102,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/ca;->bkI:Ljava/lang/ThreadLocal;
+    sget-object v0, Lkotlinx/coroutines/ca;->bkS:Ljava/lang/ThreadLocal;
 
     invoke-virtual {v0, p0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/cb$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/cb$a.smali
index ff35f8f37d..5ac026b81e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/cb$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/cb$a.smali
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bkM:Lkotlinx/coroutines/cb;
+.field final synthetic bkW:Lkotlinx/coroutines/cb;
 
 
 # direct methods
 .method constructor <init>(Lkotlinx/coroutines/cb;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/cb$a;->bkM:Lkotlinx/coroutines/cb;
+    iput-object p1, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -39,13 +39,13 @@
 
     new-instance v0, Lkotlinx/coroutines/bv;
 
-    iget-object v1, p0, Lkotlinx/coroutines/cb$a;->bkM:Lkotlinx/coroutines/cb;
+    iget-object v1, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
 
     const-string v2, "target"
 
     invoke-static {p1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v2, p0, Lkotlinx/coroutines/cb$a;->bkM:Lkotlinx/coroutines/cb;
+    iget-object v2, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
 
     invoke-static {v2}, Lkotlinx/coroutines/cb;->a(Lkotlinx/coroutines/cb;)I
 
@@ -55,7 +55,7 @@
 
     if-ne v2, v3, :cond_0
 
-    iget-object v2, p0, Lkotlinx/coroutines/cb$a;->bkM:Lkotlinx/coroutines/cb;
+    iget-object v2, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
 
     invoke-static {v2}, Lkotlinx/coroutines/cb;->b(Lkotlinx/coroutines/cb;)Ljava/lang/String;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v3, p0, Lkotlinx/coroutines/cb$a;->bkM:Lkotlinx/coroutines/cb;
+    iget-object v3, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
 
     invoke-static {v3}, Lkotlinx/coroutines/cb;->b(Lkotlinx/coroutines/cb;)Ljava/lang/String;
 
@@ -80,7 +80,7 @@
 
     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v3, p0, Lkotlinx/coroutines/cb$a;->bkM:Lkotlinx/coroutines/cb;
+    iget-object v3, p0, Lkotlinx/coroutines/cb$a;->bkW:Lkotlinx/coroutines/cb;
 
     invoke-static {v3}, Lkotlinx/coroutines/cb;->c(Lkotlinx/coroutines/cb;)Ljava/util/concurrent/atomic/AtomicInteger;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/cb.smali b/com.discord/smali_classes2/kotlinx/coroutines/cb.smali
index 866f0260b3..97ea21297a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/cb.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/cb.smali
@@ -4,9 +4,9 @@
 
 
 # instance fields
-.field private final bkK:Ljava/util/concurrent/atomic/AtomicInteger;
+.field private final bkU:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field private final bkL:I
+.field private final bkV:I
 
 .field private final executor:Ljava/util/concurrent/Executor;
 
@@ -25,7 +25,7 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lkotlinx/coroutines/cb;->bkL:I
+    iput p1, p0, Lkotlinx/coroutines/cb;->bkV:I
 
     iput-object p2, p0, Lkotlinx/coroutines/cb;->name:Ljava/lang/String;
 
@@ -33,9 +33,9 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/cb;->bkK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lkotlinx/coroutines/cb;->bkU:Ljava/util/concurrent/atomic/AtomicInteger;
 
-    iget p1, p0, Lkotlinx/coroutines/cb;->bkL:I
+    iget p1, p0, Lkotlinx/coroutines/cb;->bkV:I
 
     new-instance p2, Lkotlinx/coroutines/cb$a;
 
@@ -55,7 +55,7 @@
 
     iput-object p1, p0, Lkotlinx/coroutines/cb;->executor:Ljava/util/concurrent/Executor;
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/cb;->DR()V
+    invoke-virtual {p0}, Lkotlinx/coroutines/cb;->DU()V
 
     return-void
 .end method
@@ -63,7 +63,7 @@
 .method public static final synthetic a(Lkotlinx/coroutines/cb;)I
     .locals 0
 
-    iget p0, p0, Lkotlinx/coroutines/cb;->bkL:I
+    iget p0, p0, Lkotlinx/coroutines/cb;->bkV:I
 
     return p0
 .end method
@@ -79,7 +79,7 @@
 .method public static final synthetic c(Lkotlinx/coroutines/cb;)Ljava/util/concurrent/atomic/AtomicInteger;
     .locals 0
 
-    iget-object p0, p0, Lkotlinx/coroutines/cb;->bkK:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p0, p0, Lkotlinx/coroutines/cb;->bkU:Ljava/util/concurrent/atomic/AtomicInteger;
 
     return-object p0
 .end method
@@ -126,7 +126,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget v1, p0, Lkotlinx/coroutines/cb;->bkL:I
+    iget v1, p0, Lkotlinx/coroutines/cb;->bkV:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/cc.smali b/com.discord/smali_classes2/kotlinx/coroutines/cc.smali
index fae661736a..25a95a99b1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/cc.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/cc.smali
@@ -13,5 +13,5 @@
 .method public abstract i(Ljava/lang/Runnable;)Ljava/lang/Runnable;
 .end method
 
-.method public abstract np()J
+.method public abstract ns()J
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/cd.smali b/com.discord/smali_classes2/kotlinx/coroutines/cd.smali
index 6312789611..d3d6b133ce 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/cd.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/cd.smali
@@ -4,26 +4,26 @@
 
 
 # static fields
-.field private static bkN:Lkotlinx/coroutines/cc;
+.field private static bkX:Lkotlinx/coroutines/cc;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/am;->bjO:Lkotlinx/coroutines/am;
+    sget-object v0, Lkotlinx/coroutines/am;->bjY:Lkotlinx/coroutines/am;
 
     check-cast v0, Lkotlinx/coroutines/cc;
 
-    sput-object v0, Lkotlinx/coroutines/cd;->bkN:Lkotlinx/coroutines/cc;
+    sput-object v0, Lkotlinx/coroutines/cd;->bkX:Lkotlinx/coroutines/cc;
 
     return-void
 .end method
 
-.method public static final Ei()Lkotlinx/coroutines/cc;
+.method public static final El()Lkotlinx/coroutines/cc;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/cd;->bkN:Lkotlinx/coroutines/cc;
+    sget-object v0, Lkotlinx/coroutines/cd;->bkX:Lkotlinx/coroutines/cc;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/ce.smali b/com.discord/smali_classes2/kotlinx/coroutines/ce.smali
index ea25053dc2..c30fc0fe2b 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/ce.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/ce.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final bkO:Lkotlinx/coroutines/ce;
+.field public static final bkY:Lkotlinx/coroutines/ce;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/ce;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/ce;->bkO:Lkotlinx/coroutines/ce;
+    sput-object v0, Lkotlinx/coroutines/ce;->bkY:Lkotlinx/coroutines/ce;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/cf.smali b/com.discord/smali_classes2/kotlinx/coroutines/cf.smali
index b12331f7ca..933872bd5a 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/cf.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/cf.smali
@@ -42,7 +42,7 @@
 
 
 # virtual methods
-.method public final Dd()I
+.method public final Dg()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 328148a8b9..c786e81133 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/d.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/d.smali
@@ -24,7 +24,7 @@
 
 
 # virtual methods
-.method protected final Dh()Ljava/lang/Thread;
+.method protected final Dk()Ljava/lang/Thread;
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/d;->thread:Ljava/lang/Thread;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/e.smali b/com.discord/smali_classes2/kotlinx/coroutines/e.smali
index 72bf55d7c6..0ab48eac94 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/e.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/e.smali
@@ -40,7 +40,7 @@
 
     move-result-object v0
 
-    sget-object v1, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -52,13 +52,13 @@
 
     if-nez v1, :cond_0
 
-    sget-object v1, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v1, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Ef()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ei()Lkotlinx/coroutines/aw;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v2, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v2, Lkotlinx/coroutines/CoroutineScope;
 
@@ -77,13 +77,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/ca;->bkJ:Lkotlinx/coroutines/ca;
+    sget-object v1, Lkotlinx/coroutines/ca;->bkT:Lkotlinx/coroutines/ca;
 
-    invoke-static {}, Lkotlinx/coroutines/ca;->Eg()Lkotlinx/coroutines/aw;
+    invoke-static {}, Lkotlinx/coroutines/ca;->Ej()Lkotlinx/coroutines/aw;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/bb;->bkn:Lkotlinx/coroutines/bb;
+    sget-object v2, Lkotlinx/coroutines/bb;->bkx:Lkotlinx/coroutines/bb;
 
     check-cast v2, Lkotlinx/coroutines/CoroutineScope;
 
@@ -100,11 +100,11 @@
 
     invoke-direct {v2, p0, v0, v1}, Lkotlinx/coroutines/c;-><init>(Lkotlin/coroutines/CoroutineContext;Ljava/lang/Thread;Lkotlinx/coroutines/aw;)V
 
-    sget-object p0, Lkotlinx/coroutines/ag;->bjF:Lkotlinx/coroutines/ag;
+    sget-object p0, Lkotlinx/coroutines/ag;->bjP:Lkotlinx/coroutines/ag;
 
     invoke-virtual {v2, p0, v2, p1}, Lkotlinx/coroutines/c;->a(Lkotlinx/coroutines/ag;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)V
 
-    invoke-virtual {v2}, Lkotlinx/coroutines/c;->Dg()Ljava/lang/Object;
+    invoke-virtual {v2}, Lkotlinx/coroutines/c;->Dj()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -169,7 +169,7 @@
 
     check-cast p1, Lkotlinx/coroutines/ag;
 
-    sget-object v0, Lkotlinx/coroutines/ag;->bjG:Lkotlinx/coroutines/ag;
+    sget-object v0, Lkotlinx/coroutines/ag;->bjQ:Lkotlinx/coroutines/ag;
 
     const/4 v1, 0x1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/f.smali
index 7b983e0227..f327e105f3 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/f.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/f.smali
@@ -12,7 +12,7 @@
         }
     .end annotation
 
-    sget-object p0, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object p0, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     check-cast p0, Lkotlin/coroutines/CoroutineContext;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/g.smali b/com.discord/smali_classes2/kotlinx/coroutines/g.smali
index bea1a577c7..d2ce3a51b4 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/g.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/g.smali
@@ -38,7 +38,7 @@
 
     invoke-static {p0, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkC: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;->DS()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->DV()Ljava/util/concurrent/CancellationException;
 
     move-result-object p0
 
@@ -86,7 +86,7 @@
     goto/16 :goto_2
 
     :cond_2
-    sget-object v1, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v1, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -96,7 +96,7 @@
 
     check-cast v1, Lkotlin/coroutines/c;
 
-    sget-object v2, Lkotlin/coroutines/c;->bgQ:Lkotlin/coroutines/c$b;
+    sget-object v2, Lkotlin/coroutines/c;->bha:Lkotlin/coroutines/c$b;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -151,7 +151,7 @@
 
     invoke-direct {v0, p0, p2}, Lkotlinx/coroutines/ap;-><init>(Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/Continuation;)V
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/ap;->Db()V
+    invoke-virtual {v0}, Lkotlinx/coroutines/ap;->De()V
 
     move-object p0, v0
 
@@ -192,7 +192,7 @@
     throw p0
 
     :cond_6
-    sget-object p0, Lkotlinx/coroutines/ap;->bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object p0, Lkotlinx/coroutines/ap;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     invoke-virtual {p0, v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;->compareAndSet(Ljava/lang/Object;II)Z
 
@@ -210,7 +210,7 @@
     goto :goto_2
 
     :cond_7
-    invoke-virtual {v0}, Lkotlinx/coroutines/ap;->DW()Ljava/lang/Object;
+    invoke-virtual {v0}, Lkotlinx/coroutines/ap;->DZ()Ljava/lang/Object;
 
     move-result-object p0
 
@@ -255,7 +255,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p1, Lkotlin/coroutines/e;->bgT:Lkotlin/coroutines/e;
+    sget-object p1, Lkotlin/coroutines/e;->bhd:Lkotlin/coroutines/e;
 
     check-cast p1, Lkotlin/coroutines/CoroutineContext;
 
@@ -264,7 +264,7 @@
 
     if-eqz p4, :cond_1
 
-    sget-object p2, Lkotlinx/coroutines/ag;->bjF:Lkotlinx/coroutines/ag;
+    sget-object p2, Lkotlinx/coroutines/ag;->bjP:Lkotlinx/coroutines/ag;
 
     :cond_1
     invoke-static {p0, p1, p2, p3}, Lkotlinx/coroutines/e;->a(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/ag;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/h.smali b/com.discord/smali_classes2/kotlinx/coroutines/h.smali
index 63958ab137..fa5852b44c 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/h.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/h.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field private final bjl:Ljava/util/concurrent/Future;
+.field private final bjv:Ljava/util/concurrent/Future;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/Future<",
@@ -31,7 +31,7 @@
 
     invoke-direct {p0}, Lkotlinx/coroutines/i;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/h;->bjl:Ljava/util/concurrent/Future;
+    iput-object p1, p0, Lkotlinx/coroutines/h;->bjv:Ljava/util/concurrent/Future;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/h;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit;
 
     return-object p1
 .end method
@@ -53,7 +53,7 @@
 .method public final invoke(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object p1, p0, Lkotlinx/coroutines/h;->bjl:Ljava/util/concurrent/Future;
+    iget-object p1, p0, Lkotlinx/coroutines/h;->bjv:Ljava/util/concurrent/Future;
 
     const/4 v0, 0x0
 
@@ -71,7 +71,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/h;->bjl:Ljava/util/concurrent/Future;
+    iget-object v1, p0, Lkotlinx/coroutines/h;->bjv:Ljava/util/concurrent/Future;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/aa.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/aa.smali
index 8761762bc0..8052c8bb06 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 blM:[Lkotlinx/coroutines/internal/ab;
+.field public blW:[Lkotlinx/coroutines/internal/ab;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -52,7 +52,7 @@
     return-void
 
     :cond_0
-    iget-object v1, p0, Lkotlinx/coroutines/internal/aa;->blM:[Lkotlinx/coroutines/internal/ab;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v1, :cond_1
 
@@ -125,7 +125,7 @@
 .method private final swap(II)V
     .locals 3
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blM:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_0
 
@@ -159,7 +159,36 @@
 
 
 # virtual methods
-.method public final declared-synchronized EA()Lkotlinx/coroutines/internal/ab;
+.method public final declared-synchronized EC()Lkotlinx/coroutines/internal/ab;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()TT;"
+        }
+    .end annotation
+
+    monitor-enter p0
+
+    :try_start_0
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/aa;->EE()Lkotlinx/coroutines/internal/ab;
+
+    move-result-object v0
+    :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 ED()Lkotlinx/coroutines/internal/ab;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -201,7 +230,7 @@
     throw v0
 .end method
 
-.method public final EB()Lkotlinx/coroutines/internal/ab;
+.method public final EE()Lkotlinx/coroutines/internal/ab;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -209,7 +238,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blM:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
 
     if-eqz v0, :cond_0
 
@@ -225,35 +254,6 @@
     return-object v0
 .end method
 
-.method public final declared-synchronized Ez()Lkotlinx/coroutines/internal/ab;
-    .locals 1
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "()TT;"
-        }
-    .end annotation
-
-    monitor-enter p0
-
-    :try_start_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/aa;->EB()Lkotlinx/coroutines/internal/ab;
-
-    move-result-object v0
-    :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 a(Lkotlinx/coroutines/internal/ab;)Z
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
@@ -269,7 +269,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->DN()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->DQ()Lkotlinx/coroutines/internal/aa;
 
     move-result-object v0
     :try_end_0
@@ -360,7 +360,7 @@
 
     if-eqz v0, :cond_9
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blM:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_1
 
@@ -431,7 +431,7 @@
     invoke-static {}, Lkotlin/jvm/internal/l;->throwNpe()V
 
     :cond_6
-    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->DN()Lkotlinx/coroutines/internal/aa;
+    invoke-interface {p1}, Lkotlinx/coroutines/internal/ab;->DQ()Lkotlinx/coroutines/internal/aa;
 
     move-result-object v4
 
@@ -494,7 +494,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blM:[Lkotlinx/coroutines/internal/ab;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/aa;->blW:[Lkotlinx/coroutines/internal/ab;
 
     if-nez v0, :cond_1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/ab.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/ab.smali
index 0a725c2bc1..5af9121fc6 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 DN()Lkotlinx/coroutines/internal/aa;
+.method public abstract DQ()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 f30d4dd85c..632dcbc193 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 bjg:Lkotlin/coroutines/CoroutineContext;
+.field final bjq:Lkotlin/coroutines/CoroutineContext;
 
-.field blN:[Ljava/lang/Object;
+.field blX:[Ljava/lang/Object;
 
-.field blO:I
+.field blY:I
 
 
 # direct methods
@@ -21,11 +21,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     new-array p1, p2, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->blN:[Ljava/lang/Object;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/ac;->blX:[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 4db575166d..8682b7e8bc 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 bkT:[Ljava/lang/Object;
+.field private bld:[Ljava/lang/Object;
 
-.field private bkU:I
+.field private ble:I
 
-.field private bkV:I
+.field private blf:I
 
 
 # direct methods
@@ -32,15 +32,15 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    iput-object v0, p0, Lkotlinx/coroutines/internal/b;->bkT:[Ljava/lang/Object;
+    iput-object v0, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final Ek()V
+.method private final En()V
     .locals 6
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bkT:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
 
     array-length v1, v0
 
@@ -50,7 +50,7 @@
 
     array-length v3, v0
 
-    iget v4, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iget v4, p0, Lkotlinx/coroutines/internal/b;->ble: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;->bkT:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
 
-    iget v4, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iget v4, p0, Lkotlinx/coroutines/internal/b;->ble: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;->bkT:[Ljava/lang/Object;
+    iput-object v2, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
 
-    iput v5, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iput v5, p0, Lkotlinx/coroutines/internal/b;->ble:I
 
-    iput v1, p0, Lkotlinx/coroutines/internal/b;->bkV:I
+    iput v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Ej()Ljava/lang/Object;
+.method public final Em()Ljava/lang/Object;
     .locals 4
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -83,9 +83,9 @@
         }
     .end annotation
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->bkV:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
 
     const/4 v2, 0x0
 
@@ -94,7 +94,7 @@
     return-object v2
 
     :cond_0
-    iget-object v1, p0, Lkotlinx/coroutines/internal/b;->bkT:[Ljava/lang/Object;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
 
     aget-object v3, v1, v0
 
@@ -108,7 +108,7 @@
 
     and-int/2addr v0, v1
 
-    iput v0, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iput v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
 
     if-eqz v3, :cond_1
 
@@ -136,9 +136,9 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bkT:[Ljava/lang/Object;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/b;->bld:[Ljava/lang/Object;
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->bkV:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->blf:I
 
     aput-object p1, v0, v1
 
@@ -150,15 +150,15 @@
 
     and-int/2addr p1, v1
 
-    iput p1, p0, Lkotlinx/coroutines/internal/b;->bkV:I
+    iput p1, p0, Lkotlinx/coroutines/internal/b;->blf:I
 
-    iget p1, p0, Lkotlinx/coroutines/internal/b;->bkV:I
+    iget p1, p0, Lkotlinx/coroutines/internal/b;->blf:I
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
 
     if-ne p1, v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/b;->Ek()V
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/b;->En()V
 
     :cond_0
     return-void
@@ -167,9 +167,9 @@
 .method public final isEmpty()Z
     .locals 2
 
-    iget v0, p0, Lkotlinx/coroutines/internal/b;->bkU:I
+    iget v0, p0, Lkotlinx/coroutines/internal/b;->ble:I
 
-    iget v1, p0, Lkotlinx/coroutines/internal/b;->bkV:I
+    iget v1, p0, Lkotlinx/coroutines/internal/b;->blf: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 a3cf9d9654..bb8964c124 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 bkW:Ljava/lang/Object;
+.field private static final blg: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;->bkW:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/c;->blg:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final synthetic El()Ljava/lang/Object;
+.method public static final synthetic Eo()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/c;->bkW:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/internal/c;->blg: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 e38225dbaf..7b11483bac 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 bkX:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final blh:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/d;->bkX:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/d;->blh: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;->El()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Eo()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;->El()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Eo()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -81,7 +81,7 @@
 
     move-result-object v0
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->El()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Eo()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;->bkX:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/d;->blh:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/c;->El()Ljava/lang/Object;
+    invoke-static {}, Lkotlinx/coroutines/internal/c;->Eo()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 e8037bc879..24fb73351a 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 bkY:Ljava/lang/reflect/Method;
+.field private static final bli:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -38,7 +38,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-object v0, Lkotlinx/coroutines/internal/e;->bkY:Ljava/lang/reflect/Method;
+    sput-object v0, Lkotlinx/coroutines/internal/e;->bli:Ljava/lang/reflect/Method;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
     return v1
 
     :cond_1
-    sget-object v2, Lkotlinx/coroutines/internal/e;->bkY:Ljava/lang/reflect/Method;
+    sget-object v2, Lkotlinx/coroutines/internal/e;->bli:Ljava/lang/reflect/Method;
 
     if-nez v2, :cond_2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/f.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/f.smali
index 1e3ca5efd8..989f832671 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 bkZ:Lkotlin/coroutines/CoroutineContext;
+.field private final blj: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;->bkZ:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/f;->blj:Lkotlin/coroutines/CoroutineContext;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Da()Lkotlin/coroutines/CoroutineContext;
+.method public final Dd()Lkotlin/coroutines/CoroutineContext;
     .locals 1
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/f;->bkZ:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/f;->blj: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 1bdfc2bd78..81e7b9761c 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv: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;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(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 147bcdf367..e6a1466ea0 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv: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;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(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 16b02cb229..a115d82957 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv: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;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(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 00ff364996..37e125188f 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv: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;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(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 4334410436..10e0400bc6 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 bld:Lkotlinx/coroutines/internal/g$f;
+.field public static final bln: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;->bld:Lkotlinx/coroutines/internal/g$f;
+    sput-object v0, Lkotlinx/coroutines/internal/g$f;->bln: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 560c768e30..88b79cbcb6 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 ble:Lkotlinx/coroutines/internal/g$g;
+.field public static final blo: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;->ble:Lkotlinx/coroutines/internal/g$g;
+    sput-object v0, Lkotlinx/coroutines/internal/g$g;->blo: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 9c07b20dfc..53e34f4b83 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 bla:I
+.field private static final blk:I
 
-.field private static final blb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+.field private static final bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
-.field private static final blc:Ljava/util/WeakHashMap;
+.field private static final blm: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;->bla:I
+    sput v0, Lkotlinx/coroutines/internal/g;->blk: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;->blb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sput-object v0, Lkotlinx/coroutines/internal/g;->bll: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;->blc:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotlinx/coroutines/internal/g;->blm:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
     invoke-static {p0}, Lkotlin/jvm/a;->getKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b;
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     const/4 v0, 0x0
 
@@ -140,7 +140,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p0}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -194,11 +194,11 @@
     if-eqz v0, :cond_1
 
     :try_start_0
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     check-cast p0, Lkotlinx/coroutines/z;
 
-    invoke-interface {p0}, Lkotlinx/coroutines/z;->Du()Ljava/lang/Throwable;
+    invoke-interface {p0}, Lkotlinx/coroutines/z;->Dx()Ljava/lang/Throwable;
 
     move-result-object p0
 
@@ -213,7 +213,7 @@
     :catchall_0
     move-exception p0
 
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p0}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -238,7 +238,7 @@
     return-object p0
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/internal/g;->blb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -247,7 +247,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->lock()V
 
     :try_start_1
-    sget-object v2, Lkotlinx/coroutines/internal/g;->blc:Ljava/util/WeakHashMap;
+    sget-object v2, Lkotlinx/coroutines/internal/g;->blm:Ljava/util/WeakHashMap;
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -274,7 +274,7 @@
     return-object p0
 
     :cond_2
-    sget v0, Lkotlinx/coroutines/internal/g;->bla:I
+    sget v0, Lkotlinx/coroutines/internal/g;->blk:I
 
     invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
 
@@ -288,7 +288,7 @@
 
     if-eq v0, v2, :cond_7
 
-    sget-object v0, Lkotlinx/coroutines/internal/g;->blb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -329,7 +329,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
 
     :try_start_2
-    sget-object v5, Lkotlinx/coroutines/internal/g;->blc:Ljava/util/WeakHashMap;
+    sget-object v5, Lkotlinx/coroutines/internal/g;->blm:Ljava/util/WeakHashMap;
 
     check-cast v5, Ljava/util/Map;
 
@@ -337,11 +337,11 @@
 
     move-result-object p0
 
-    sget-object v6, Lkotlinx/coroutines/internal/g$f;->bld:Lkotlinx/coroutines/internal/g$f;
+    sget-object v6, Lkotlinx/coroutines/internal/g$f;->bln: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;->bgo:Lkotlin/Unit;
+    sget-object p0, Lkotlin/Unit;->bgy:Lkotlin/Unit;
     :try_end_2
     .catchall {:try_start_2 .. :try_end_2} :catchall_1
 
@@ -522,7 +522,7 @@
     if-eqz v2, :cond_8
 
     :cond_e
-    sget-object v0, Lkotlinx/coroutines/internal/g;->blb:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
+    sget-object v0, Lkotlinx/coroutines/internal/g;->bll:Ljava/util/concurrent/locks/ReentrantReadWriteLock;
 
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock;->readLock()Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;
 
@@ -563,7 +563,7 @@
     invoke-virtual {v0}, Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->lock()V
 
     :try_start_3
-    sget-object v6, Lkotlinx/coroutines/internal/g;->blc:Ljava/util/WeakHashMap;
+    sget-object v6, Lkotlinx/coroutines/internal/g;->blm:Ljava/util/WeakHashMap;
 
     check-cast v6, Ljava/util/Map;
 
@@ -573,7 +573,7 @@
 
     if-nez v2, :cond_11
 
-    sget-object v8, Lkotlinx/coroutines/internal/g$g;->ble:Lkotlinx/coroutines/internal/g$g;
+    sget-object v8, Lkotlinx/coroutines/internal/g$g;->blo:Lkotlinx/coroutines/internal/g$g;
 
     check-cast v8, Lkotlin/jvm/functions/Function1;
 
@@ -585,7 +585,7 @@
     :goto_9
     invoke-interface {v6, v7, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v6, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object v6, Lkotlin/Unit;->bgy: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 ad09bf5241..d4686a9b19 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 blf:Z
+.field private static final blp:Z
 
-.field public static final blg:Lkotlinx/coroutines/internal/h;
+.field public static final blq: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;->blg:Lkotlinx/coroutines/internal/h;
+    sput-object v0, Lkotlinx/coroutines/internal/h;->blq: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;->blf:Z
+    sput-boolean v0, Lkotlinx/coroutines/internal/h;->blp:Z
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-boolean v2, Lkotlinx/coroutines/internal/h;->blf:Z
+    sget-boolean v2, Lkotlinx/coroutines/internal/h;->blp: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 92555360b2..d45f0bb5b5 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 Em()Z
+.method public final Ep()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 6c9b5b3a29..3db0e4fd9a 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 blh:Ljava/lang/Object;
+.field private static final blr:Ljava/lang/Object;
 
-.field private static final bli:Ljava/lang/Object;
+.field private static final bls:Ljava/lang/Object;
 
-.field private static final blj:Ljava/lang/Object;
+.field private static final blt:Ljava/lang/Object;
 
-.field private static final blk:Ljava/lang/Object;
+.field private static final blu: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;->blh:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->blr: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;->bli:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->bls: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;->blj:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->blt: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;->blk:Ljava/lang/Object;
+    sput-object v0, Lkotlinx/coroutines/internal/j;->blu:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static final En()Ljava/lang/Object;
+.method public static final Eq()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lkotlinx/coroutines/internal/j;->blh:Ljava/lang/Object;
+    sget-object v0, Lkotlinx/coroutines/internal/j;->blr: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;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->blJ: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 55cb283f1c..2ec6024e74 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 blo:Lkotlinx/coroutines/internal/k;
+.field public bly:Lkotlinx/coroutines/internal/k;
 
-.field public final blp:Lkotlinx/coroutines/internal/k;
+.field public final blz: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;->blp:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/k$a;->blz: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;->blp:Lkotlinx/coroutines/internal/k;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->blz:Lkotlinx/coroutines/internal/k;
 
     goto :goto_1
 
     :cond_1
-    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->blo:Lkotlinx/coroutines/internal/k;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/k$a;->bly:Lkotlinx/coroutines/internal/k;
 
     :goto_1
     if-eqz v0, :cond_3
 
-    sget-object v1, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->blv: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,9 +86,9 @@
 
     if-eqz p2, :cond_3
 
-    iget-object p1, p0, Lkotlinx/coroutines/internal/k$a;->blp:Lkotlinx/coroutines/internal/k;
+    iget-object p1, p0, Lkotlinx/coroutines/internal/k$a;->blz:Lkotlinx/coroutines/internal/k;
 
-    iget-object p2, p0, Lkotlinx/coroutines/internal/k$a;->blo:Lkotlinx/coroutines/internal/k;
+    iget-object p2, p0, Lkotlinx/coroutines/internal/k$a;->bly:Lkotlinx/coroutines/internal/k;
 
     if-nez p2, :cond_2
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/k.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/k.smali
index ecc3c03f3a..78049ce33f 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 bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field static final blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field static final blw:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-.field private static final bln:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final blx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -41,7 +41,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/k;->blv: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;->blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/k;->blw: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;->bln:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/k;->blx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -82,7 +82,7 @@
     return-void
 .end method
 
-.method private final Eo()Lkotlinx/coroutines/internal/s;
+.method private final Er()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;->bln:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->blx: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 Es()Lkotlinx/coroutines/internal/k;
+.method private final Ev()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;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v0, v0, Lkotlinx/coroutines/internal/s;->blJ:Lkotlinx/coroutines/internal/k;
 
     return-object v0
 
@@ -126,7 +126,7 @@
 
     if-ne v0, v1, :cond_2
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Et()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Ew()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;->Eo()Lkotlinx/coroutines/internal/s;
+    invoke-direct {v1}, Lkotlinx/coroutines/internal/k;->Er()Lkotlinx/coroutines/internal/s;
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/internal/k;->blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/k;->blw: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 Et()Lkotlinx/coroutines/internal/k;
+.method private final Ew()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;->Ep()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -251,7 +251,7 @@
 
     if-nez v1, :cond_3
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -260,7 +260,7 @@
     goto :goto_0
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/k;->blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/k;->blw: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;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v1
 
@@ -332,13 +332,13 @@
 
     if-eqz v1, :cond_3
 
-    invoke-direct {p1}, Lkotlinx/coroutines/internal/k;->Es()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p1}, Lkotlinx/coroutines/internal/k;->Ev()Lkotlinx/coroutines/internal/k;
 
-    sget-object v3, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v2, Lkotlinx/coroutines/internal/s;
 
-    iget-object v2, v2, Lkotlinx/coroutines/internal/s;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v2, v2, Lkotlinx/coroutines/internal/s;->blJ: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;->blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/k;->blw: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 Em()Z
+.method public Ep()Z
     .locals 10
 
     :cond_0
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()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;->Eo()Lkotlinx/coroutines/internal/s;
+    invoke-direct {v3}, Lkotlinx/coroutines/internal/k;->Er()Lkotlinx/coroutines/internal/s;
 
     move-result-object v4
 
-    sget-object v5, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v5, Lkotlinx/coroutines/internal/k;->blv: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;->Es()Lkotlinx/coroutines/internal/k;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/k;->Ev()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;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v4, v4, Lkotlinx/coroutines/internal/s;->blJ:Lkotlinx/coroutines/internal/k;
 
     :cond_3
     :goto_1
-    invoke-virtual {v4}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {v4}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -494,14 +494,14 @@
 
     if-eqz v8, :cond_4
 
-    invoke-direct {v4}, Lkotlinx/coroutines/internal/k;->Es()Lkotlinx/coroutines/internal/k;
+    invoke-direct {v4}, Lkotlinx/coroutines/internal/k;->Ev()Lkotlinx/coroutines/internal/k;
 
     move-object v4, v7
 
     goto :goto_0
 
     :cond_4
-    invoke-virtual {v6}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {v6}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v7
 
@@ -511,13 +511,13 @@
 
     if-eqz v0, :cond_5
 
-    invoke-direct {v6}, Lkotlinx/coroutines/internal/k;->Es()Lkotlinx/coroutines/internal/k;
+    invoke-direct {v6}, Lkotlinx/coroutines/internal/k;->Ev()Lkotlinx/coroutines/internal/k;
 
-    sget-object v8, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v8, Lkotlinx/coroutines/internal/k;->blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     check-cast v7, Lkotlinx/coroutines/internal/s;
 
-    iget-object v7, v7, Lkotlinx/coroutines/internal/s;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v7, v7, Lkotlinx/coroutines/internal/s;->blJ: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;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v7, Lkotlinx/coroutines/internal/k;->blv: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 Ep()Ljava/lang/Object;
+.method public final Es()Ljava/lang/Object;
     .locals 2
 
     :goto_0
@@ -627,10 +627,10 @@
     goto :goto_0
 .end method
 
-.method public final Eq()Lkotlinx/coroutines/internal/k;
+.method public final Et()Lkotlinx/coroutines/internal/k;
     .locals 1
 
-    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -641,7 +641,7 @@
     return-object v0
 .end method
 
-.method public final Er()Ljava/lang/Object;
+.method public final Eu()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;->Ep()Ljava/lang/Object;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v2
 
@@ -708,17 +708,17 @@
 
     invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/k;->blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blw: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;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blv: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;->blo:Lkotlinx/coroutines/internal/k;
+    iput-object p2, p3, Lkotlinx/coroutines/internal/k$a;->bly:Lkotlinx/coroutines/internal/k;
 
-    sget-object p1, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object p1, Lkotlinx/coroutines/internal/k;->blv: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/k;->blm:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blw: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;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blv: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;->Ep()Ljava/lang/Object;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/k;->Es()Ljava/lang/Object;
 
     move-result-object v0
 
@@ -778,7 +778,7 @@
     return p1
 
     :cond_1
-    sget-object v0, Lkotlinx/coroutines/internal/k;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/k;->blv: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 a17812e260..96b65ab78a 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 blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final synthetic blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/l;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final Ej()Ljava/lang/Object;
+.method public final Em()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;->blu:Lkotlinx/coroutines/internal/v;
+    sget-object v7, Lkotlinx/coroutines/internal/m;->blE:Lkotlinx/coroutines/internal/v;
 
     goto/16 :goto_2
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/m;->blv:Lkotlinx/coroutines/internal/m$a;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blF: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;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-    sget-object v2, Lkotlinx/coroutines/internal/m;->blv:Lkotlinx/coroutines/internal/m$a;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->blF: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;->blu:Lkotlinx/coroutines/internal/v;
+    sget-object v1, Lkotlinx/coroutines/internal/m;->blE:Lkotlinx/coroutines/internal/v;
 
     if-eq v7, v1, :cond_7
 
     return-object v7
 
     :cond_7
-    sget-object v1, Lkotlinx/coroutines/internal/l;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
 
     move-result-object v2
 
@@ -278,9 +278,9 @@
     return p1
 
     :cond_1
-    sget-object v1, Lkotlinx/coroutines/internal/l;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()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;->gD()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->gG()Z
 
     move-result v1
 
@@ -309,9 +309,9 @@
     return-void
 
     :cond_0
-    sget-object v1, Lkotlinx/coroutines/internal/l;->blq:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/internal/l;->blA:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v0}, Lkotlinx/coroutines/internal/m;->Ex()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 da00512fb9..1339dc24bd 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 bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field public static final synthetic blB:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
 
-.field public static final synthetic blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+.field public static final blE:Lkotlinx/coroutines/internal/v;
 
-.field public static final blu:Lkotlinx/coroutines/internal/v;
+.field public static final blF:Lkotlinx/coroutines/internal/m$a;
 
-.field public static final blv:Lkotlinx/coroutines/internal/m$a;
+.field private static final blv:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -36,7 +36,7 @@
 
 .field public volatile synthetic _state$internal:J
 
-.field private final bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field private final blC: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 blt:Z
+.field private final blD: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;->blv:Lkotlinx/coroutines/internal/m$a;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->blF: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;->blu:Lkotlinx/coroutines/internal/v;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->blE: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;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/internal/m;->blv: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;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/internal/m;->blB: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;->blt:Z
+    iput-boolean p2, p0, Lkotlinx/coroutines/internal/m;->blD: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/m;->blC: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 Ev()J
+.method private final Ey()J
     .locals 9
 
     :cond_0
@@ -210,7 +210,7 @@
     :cond_1
     or-long v6, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/internal/m;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blB: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;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {p0}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
 
     move-result-object p0
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/internal/m;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blB: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object p1, p0, Lkotlinx/coroutines/internal/m;->blC: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;->bll:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blv: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;->blt:Z
+    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->blD: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v4, v0, Lkotlinx/coroutines/internal/m;->blC: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v6, p0, Lkotlinx/coroutines/internal/m;->blC: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object p0, p0, Lkotlinx/coroutines/internal/m;->blC: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;->blt:Z
+    iget-boolean p0, p0, Lkotlinx/coroutines/internal/m;->blD:Z
 
     return p0
 .end method
@@ -466,7 +466,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->blC: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/m;->blC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget v1, p0, Lkotlinx/coroutines/internal/m;->mask:I
 
@@ -504,7 +504,7 @@
 
 
 # virtual methods
-.method public final Eu()Lkotlinx/coroutines/internal/m;
+.method public final Ex()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;->Ev()J
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/m;->Ey()J
 
     move-result-wide v0
 
@@ -592,13 +592,13 @@
     return v6
 
     :cond_2
-    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->blt:Z
+    iget-boolean v2, p0, Lkotlinx/coroutines/internal/m;->blD:Z
 
     const v5, 0x3fffffff    # 1.9999999f
 
     if-nez v2, :cond_4
 
-    iget-object v2, p0, Lkotlinx/coroutines/internal/m;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v2, p0, Lkotlinx/coroutines/internal/m;->blC: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;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v2, Lkotlinx/coroutines/internal/m;->blB: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;->bls:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/m;->blC: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;->Eu()Lkotlinx/coroutines/internal/m;
+    invoke-virtual {v1}, Lkotlinx/coroutines/internal/m;->Ex()Lkotlinx/coroutines/internal/m;
 
     move-result-object v1
 
@@ -681,7 +681,7 @@
     return v9
 .end method
 
-.method public final gD()Z
+.method public final gG()Z
     .locals 10
 
     :cond_0
@@ -717,7 +717,7 @@
     :cond_2
     or-long v4, v2, v0
 
-    sget-object v0, Lkotlinx/coroutines/internal/m;->blr:Ljava/util/concurrent/atomic/AtomicLongFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/internal/m;->blB: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 5d297eced1..cb1a864eed 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 blw:Lkotlinx/coroutines/bq;
+.field public static final blG:Lkotlinx/coroutines/bq;
 
-.field public static final blx:Lkotlinx/coroutines/internal/n;
+.field public static final blH: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;->blx:Lkotlinx/coroutines/internal/n;
+    sput-object v0, Lkotlinx/coroutines/internal/n;->blH:Lkotlinx/coroutines/internal/n;
 
-    invoke-static {}, Lkotlinx/coroutines/internal/n;->Ew()Lkotlinx/coroutines/bq;
+    invoke-static {}, Lkotlinx/coroutines/internal/n;->Ez()Lkotlinx/coroutines/bq;
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/internal/n;->blw:Lkotlinx/coroutines/bq;
+    sput-object v0, Lkotlinx/coroutines/internal/n;->blG:Lkotlinx/coroutines/bq;
 
     return-void
 .end method
@@ -36,13 +36,13 @@
     return-void
 .end method
 
-.method private static Ew()Lkotlinx/coroutines/bq;
+.method private static Ez()Lkotlinx/coroutines/bq;
     .locals 7
 
     :try_start_0
     const-class v0, Lkotlinx/coroutines/internal/MainDispatcherFactory;
 
-    sget-object v1, Lkotlinx/coroutines/internal/h;->blg:Lkotlinx/coroutines/internal/h;
+    sget-object v1, Lkotlinx/coroutines/internal/h;->blq: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 cba5278990..a990a48514 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 bly:Ljava/lang/String;
+.field private final blI: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;->bly:Ljava/lang/String;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/p;->blI:Ljava/lang/String;
 
     return-void
 .end method
 
-.method private final Ex()Ljava/lang/Void;
+.method private final EA()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;->bly:Ljava/lang/String;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/p;->blI:Ljava/lang/String;
 
     if-eqz v1, :cond_0
 
@@ -105,7 +105,7 @@
 
     invoke-static {p3, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->Ex()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->EA()Ljava/lang/Void;
 
     const/4 p1, 0x0
 
@@ -123,7 +123,7 @@
 
     invoke-static {p2, p1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->Ex()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->EA()Ljava/lang/Void;
 
     const/4 p1, 0x0
 
@@ -137,7 +137,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->Ex()Ljava/lang/Void;
+    invoke-direct {p0}, Lkotlinx/coroutines/internal/p;->EA()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 78f6310f40..b47478fc29 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 blz:Lkotlinx/coroutines/internal/k;
+.field public final blJ: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;->blz:Lkotlinx/coroutines/internal/k;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/s;->blJ: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;->blz:Lkotlinx/coroutines/internal/k;
+    iget-object v1, p0, Lkotlinx/coroutines/internal/s;->blJ: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 bbe01b0afb..80430f7a50 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 blA:Lkotlin/coroutines/Continuation;
+.field public final blK: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;->blA:Lkotlin/coroutines/Continuation;
+    iput-object p2, p0, Lkotlinx/coroutines/internal/t;->blK:Lkotlin/coroutines/Continuation;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public Dd()I
+.method public Dg()I
     .locals 1
 
     const/4 v0, 0x2
@@ -69,7 +69,7 @@
     return v0
 .end method
 
-.method public final Df()Z
+.method public final Di()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;->blA:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blK: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;->blA:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blK: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;->blA:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blK:Lkotlin/coroutines/Continuation;
 
     const-string v7, "$this$resumeUninterceptedWithExceptionMode"
 
@@ -183,7 +183,7 @@
     move-result-object v1
 
     :try_start_0
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->bgl:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -239,7 +239,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/n;->createFailure(Ljava/lang/Throwable;)Ljava/lang/Object;
 
@@ -254,7 +254,7 @@
     return-void
 
     :cond_6
-    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blA:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/t;->blK:Lkotlin/coroutines/Continuation;
 
     const-string v7, "$this$resumeUninterceptedMode"
 
@@ -303,7 +303,7 @@
     move-result-object v1
 
     :try_start_1
-    sget-object v2, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(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;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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;->bgl:Lkotlin/m$a;
+    sget-object p2, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -351,7 +351,7 @@
 
     move-result-object p2
 
-    sget-object v0, Lkotlin/m;->bgl:Lkotlin/m$a;
+    sget-object v0, Lkotlin/m;->bgv:Lkotlin/m$a;
 
     invoke-static {p1}, Lkotlin/m;->constructor-impl(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 3724e43158..91396bc91c 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/aj;->bjK:Z
+    sget-boolean v0, Lkotlinx/coroutines/aj;->bjU:Z
 
     if-eqz v0, :cond_1
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/internal/v.smali b/com.discord/smali_classes2/kotlinx/coroutines/internal/v.smali
index 8ce29f8d8f..94bdbb975f 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 blB:Ljava/lang/String;
+.field private final blL: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;->blB:Ljava/lang/String;
+    iput-object p1, p0, Lkotlinx/coroutines/internal/v;->blL: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;->blB:Ljava/lang/String;
+    iget-object v0, p0, Lkotlinx/coroutines/internal/v;->blL: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 78eedb6dcc..4e0abf9ee3 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 blC:I
+.field private static final blM:I
 
 
 # direct methods
@@ -19,15 +19,15 @@
 
     move-result v0
 
-    sput v0, Lkotlinx/coroutines/internal/x;->blC:I
+    sput v0, Lkotlinx/coroutines/internal/x;->blM:I
 
     return-void
 .end method
 
-.method public static final Ey()I
+.method public static final EB()I
     .locals 1
 
-    sget v0, Lkotlinx/coroutines/internal/x;->blC:I
+    sget v0, Lkotlinx/coroutines/internal/x;->blM:I
 
     return v0
 .end method
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 eb09eb5501..543ed85852 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 blI:Lkotlinx/coroutines/internal/z$a;
+.field public static final blS: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;->blI:Lkotlinx/coroutines/internal/z$a;
+    sput-object v0, Lkotlinx/coroutines/internal/z$a;->blS: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 547ccd6c72..c4a7e1792e 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 blJ:Lkotlinx/coroutines/internal/z$b;
+.field public static final blT: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;->blJ:Lkotlinx/coroutines/internal/z$b;
+    sput-object v0, Lkotlinx/coroutines/internal/z$b;->blT: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 9d21f7bbee..3840593943 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 blK:Lkotlinx/coroutines/internal/z$c;
+.field public static final blU: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;->blK:Lkotlinx/coroutines/internal/z$c;
+    sput-object v0, Lkotlinx/coroutines/internal/z$c;->blU:Lkotlinx/coroutines/internal/z$c;
 
     return-void
 .end method
@@ -78,15 +78,15 @@
 
     check-cast p2, Lkotlinx/coroutines/bz;
 
-    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bjq:Lkotlin/coroutines/CoroutineContext;
 
-    iget-object v1, p1, Lkotlinx/coroutines/internal/ac;->blN:[Ljava/lang/Object;
+    iget-object v1, p1, Lkotlinx/coroutines/internal/ac;->blX:[Ljava/lang/Object;
 
-    iget v2, p1, Lkotlinx/coroutines/internal/ac;->blO:I
+    iget v2, p1, Lkotlinx/coroutines/internal/ac;->blY:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p1, Lkotlinx/coroutines/internal/ac;->blO:I
+    iput v3, p1, Lkotlinx/coroutines/internal/ac;->blY: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 ad8b92a49d..9cee858f53 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 blL:Lkotlinx/coroutines/internal/z$d;
+.field public static final blV: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;->blL:Lkotlinx/coroutines/internal/z$d;
+    sput-object v0, Lkotlinx/coroutines/internal/z$d;->blV:Lkotlinx/coroutines/internal/z$d;
 
     return-void
 .end method
@@ -78,19 +78,19 @@
 
     check-cast p2, Lkotlinx/coroutines/bz;
 
-    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     invoke-interface {p2, v0}, Lkotlinx/coroutines/bz;->c(Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object;
 
     move-result-object p2
 
-    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->blN:[Ljava/lang/Object;
+    iget-object v0, p1, Lkotlinx/coroutines/internal/ac;->blX:[Ljava/lang/Object;
 
-    iget v1, p1, Lkotlinx/coroutines/internal/ac;->blO:I
+    iget v1, p1, Lkotlinx/coroutines/internal/ac;->blY:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p1, Lkotlinx/coroutines/internal/ac;->blO:I
+    iput v2, p1, Lkotlinx/coroutines/internal/ac;->blY: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 e0e7102984..6d0de0d41f 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 blD:Lkotlinx/coroutines/internal/v;
+.field private static final blN:Lkotlinx/coroutines/internal/v;
 
-.field private static final blE:Lkotlin/jvm/functions/Function2;
+.field private static final blO: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 blF:Lkotlin/jvm/functions/Function2;
+.field private static final blP: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 blG:Lkotlin/jvm/functions/Function2;
+.field private static final blQ: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 blH:Lkotlin/jvm/functions/Function2;
+.field private static final blR: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;->blD:Lkotlinx/coroutines/internal/v;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blN:Lkotlinx/coroutines/internal/v;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$a;->blI:Lkotlinx/coroutines/internal/z$a;
+    sget-object v0, Lkotlinx/coroutines/internal/z$a;->blS:Lkotlinx/coroutines/internal/z$a;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blE:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blO:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$b;->blJ:Lkotlinx/coroutines/internal/z$b;
+    sget-object v0, Lkotlinx/coroutines/internal/z$b;->blT:Lkotlinx/coroutines/internal/z$b;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blF:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blP:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$d;->blL:Lkotlinx/coroutines/internal/z$d;
+    sget-object v0, Lkotlinx/coroutines/internal/z$d;->blV:Lkotlinx/coroutines/internal/z$d;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blG:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blQ:Lkotlin/jvm/functions/Function2;
 
-    sget-object v0, Lkotlinx/coroutines/internal/z$c;->blK:Lkotlinx/coroutines/internal/z$c;
+    sget-object v0, Lkotlinx/coroutines/internal/z$c;->blU:Lkotlinx/coroutines/internal/z$c;
 
     check-cast v0, Lkotlin/jvm/functions/Function2;
 
-    sput-object v0, Lkotlinx/coroutines/internal/z;->blH:Lkotlin/jvm/functions/Function2;
+    sput-object v0, Lkotlinx/coroutines/internal/z;->blR:Lkotlin/jvm/functions/Function2;
 
     return-void
 .end method
@@ -102,7 +102,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/internal/z;->blD:Lkotlinx/coroutines/internal/v;
+    sget-object v0, Lkotlinx/coroutines/internal/z;->blN: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;->blO:I
+    iput v1, v0, Lkotlinx/coroutines/internal/ac;->blY:I
 
-    sget-object v0, Lkotlinx/coroutines/internal/z;->blH:Lkotlin/jvm/functions/Function2;
+    sget-object v0, Lkotlinx/coroutines/internal/z;->blR: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;->blF:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/internal/z;->blP: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;->blD:Lkotlinx/coroutines/internal/v;
+    sget-object p0, Lkotlinx/coroutines/internal/z;->blN: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;->blG:Lkotlin/jvm/functions/Function2;
+    sget-object p1, Lkotlinx/coroutines/internal/z;->blQ: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;->blE:Lkotlin/jvm/functions/Function2;
+    sget-object v1, Lkotlinx/coroutines/internal/z;->blO:Lkotlin/jvm/functions/Function2;
 
     invoke-interface {p0, v0, v1}, Lkotlin/coroutines/CoroutineContext;->fold(Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/l.smali b/com.discord/smali_classes2/kotlinx/coroutines/l.smali
index 1d075b25ff..2460b6f5eb 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/l.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/l.smali
@@ -23,9 +23,9 @@
 
 
 # static fields
-.field private static final bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
-.field private static final bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+.field private static final bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
 
 # instance fields
@@ -33,7 +33,7 @@
 
 .field private volatile _state:Ljava/lang/Object;
 
-.field private final bgU:Lkotlin/coroutines/Continuation;
+.field private final bhe:Lkotlin/coroutines/Continuation;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/coroutines/Continuation<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final bjg:Lkotlin/coroutines/CoroutineContext;
+.field private final bjq:Lkotlin/coroutines/CoroutineContext;
 
 .field private volatile parentHandle:Lkotlinx/coroutines/at;
 
@@ -59,7 +59,7 @@
 
     move-result-object v1
 
-    sput-object v1, Lkotlinx/coroutines/l;->bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v1, Lkotlinx/coroutines/l;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const-class v1, Ljava/lang/Object;
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/l;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/l;->bjx:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
 
     return-void
 .end method
@@ -92,28 +92,28 @@
 
     invoke-direct {p0, v0}, Lkotlinx/coroutines/ar;-><init>(I)V
 
-    iput-object p1, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iput-object p1, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
 
-    iget-object p1, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object p1, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
 
     invoke-interface {p1}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object p1
 
-    iput-object p1, p0, Lkotlinx/coroutines/l;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iput-object p1, p0, Lkotlinx/coroutines/l;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     const/4 p1, 0x0
 
     iput p1, p0, Lkotlinx/coroutines/l;->_decision:I
 
-    sget-object p1, Lkotlinx/coroutines/b;->bji:Lkotlinx/coroutines/b;
+    sget-object p1, Lkotlinx/coroutines/b;->bjs:Lkotlinx/coroutines/b;
 
     iput-object p1, p0, Lkotlinx/coroutines/l;->_state:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private final Di()V
+.method private final Dl()V
     .locals 5
 
     invoke-direct {p0}, Lkotlinx/coroutines/l;->k()Z
@@ -125,13 +125,13 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
 
     invoke-interface {v0}, Lkotlin/coroutines/Continuation;->getContext()Lkotlin/coroutines/CoroutineContext;
 
     move-result-object v0
 
-    sget-object v1, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v1, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     check-cast v1, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -146,7 +146,7 @@
     return-void
 
     :cond_1
-    invoke-interface {v0}, Lkotlinx/coroutines/Job;->DT()Z
+    invoke-interface {v0}, Lkotlinx/coroutines/Job;->DW()Z
 
     new-instance v1, Lkotlinx/coroutines/n;
 
@@ -176,7 +176,7 @@
 
     invoke-interface {v0}, Lkotlinx/coroutines/at;->dispose()V
 
-    sget-object v0, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object v0, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast v0, Lkotlinx/coroutines/at;
 
@@ -186,7 +186,7 @@
     return-void
 .end method
 
-.method private final Dk()Z
+.method private final Dn()Z
     .locals 3
 
     :cond_0
@@ -218,7 +218,7 @@
     throw v0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/l;->bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/l;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v2, 0x1
 
@@ -231,7 +231,7 @@
     return v2
 .end method
 
-.method private final Dl()Z
+.method private final Do()Z
     .locals 4
 
     :cond_0
@@ -263,7 +263,7 @@
     throw v0
 
     :cond_2
-    sget-object v0, Lkotlinx/coroutines/l;->bjm:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/l;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v3, 0x2
 
@@ -276,7 +276,7 @@
     return v2
 .end method
 
-.method private final Dm()V
+.method private final Dp()V
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/l;->parentHandle:Lkotlinx/coroutines/at;
@@ -285,7 +285,7 @@
 
     invoke-interface {v0}, Lkotlinx/coroutines/at;->dispose()V
 
-    sget-object v0, Lkotlinx/coroutines/bs;->bkF:Lkotlinx/coroutines/bs;
+    sget-object v0, Lkotlinx/coroutines/bs;->bkP:Lkotlinx/coroutines/bs;
 
     check-cast v0, Lkotlinx/coroutines/at;
 
@@ -302,7 +302,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-interface {p0}, Lkotlinx/coroutines/Job;->DS()Ljava/util/concurrent/CancellationException;
+    invoke-interface {p0}, Lkotlinx/coroutines/Job;->DV()Ljava/util/concurrent/CancellationException;
 
     move-result-object p0
 
@@ -386,7 +386,7 @@
 .method private final cW(I)V
     .locals 1
 
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dl()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Do()Z
 
     move-result v0
 
@@ -411,7 +411,7 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v1, Lkotlinx/coroutines/l;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v1, Lkotlinx/coroutines/l;->bjx: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,7 +419,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dm()V
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dp()V
 
     invoke-direct {p0, p2}, Lkotlinx/coroutines/l;->cW(I)V
 
@@ -434,7 +434,7 @@
 
     check-cast v0, Lkotlinx/coroutines/m;
 
-    invoke-virtual {v0}, Lkotlinx/coroutines/m;->Do()Z
+    invoke-virtual {v0}, Lkotlinx/coroutines/m;->Dr()Z
 
     move-result v1
 
@@ -469,7 +469,7 @@
 
 
 # virtual methods
-.method public final Dj()Ljava/lang/Object;
+.method public final Dm()Ljava/lang/Object;
     .locals 1
 
     iget-object v0, p0, Lkotlinx/coroutines/l;->_state:Ljava/lang/Object;
@@ -477,7 +477,7 @@
     return-object v0
 .end method
 
-.method public final Dn()Lkotlin/coroutines/Continuation;
+.method public final Dq()Lkotlin/coroutines/Continuation;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -487,7 +487,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
 
     return-object v0
 .end method
@@ -506,7 +506,7 @@
     :try_start_0
     check-cast p1, Lkotlinx/coroutines/w;
 
-    iget-object p1, p1, Lkotlinx/coroutines/w;->bjx:Lkotlin/jvm/functions/Function1;
+    iget-object p1, p1, Lkotlinx/coroutines/w;->bjH: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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object v0, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
 
     instance-of v1, v0, Lkotlinx/coroutines/ao;
 
@@ -572,7 +572,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, v0, Lkotlinx/coroutines/ao;->bjR:Lkotlinx/coroutines/ab;
+    iget-object v2, v0, Lkotlinx/coroutines/ao;->bkb:Lkotlinx/coroutines/ab;
 
     :cond_1
     if-ne v2, p1, :cond_2
@@ -582,7 +582,7 @@
     goto :goto_0
 
     :cond_2
-    iget p1, p0, Lkotlinx/coroutines/l;->bjU:I
+    iget p1, p0, Lkotlinx/coroutines/l;->bke:I
 
     :goto_0
     invoke-direct {p0, p2, p1}, Lkotlinx/coroutines/l;->j(Ljava/lang/Object;I)Lkotlinx/coroutines/m;
@@ -628,7 +628,7 @@
 .method public getCallerFrame()Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;
     .locals 2
 
-    iget-object v0, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bhe: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/l;->bjg:Lkotlin/coroutines/CoroutineContext;
+    iget-object v0, p0, Lkotlinx/coroutines/l;->bjq:Lkotlin/coroutines/CoroutineContext;
 
     return-object v0
 .end method
@@ -708,7 +708,7 @@
 
     :cond_2
     :goto_1
-    sget-object v3, Lkotlinx/coroutines/l;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/l;->bjx: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
 
@@ -736,7 +736,7 @@
 
     check-cast v1, Lkotlinx/coroutines/m;
 
-    invoke-virtual {v1}, Lkotlinx/coroutines/m;->Dt()Z
+    invoke-virtual {v1}, Lkotlinx/coroutines/m;->Dw()Z
 
     move-result v1
 
@@ -798,9 +798,9 @@
 .method public final o()Ljava/lang/Object;
     .locals 3
 
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Di()V
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dl()V
 
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dk()Z
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dn()Z
 
     move-result v0
 
@@ -819,7 +819,7 @@
 
     if-nez v1, :cond_3
 
-    iget v1, p0, Lkotlinx/coroutines/l;->bjU:I
+    iget v1, p0, Lkotlinx/coroutines/l;->bke:I
 
     const/4 v2, 0x1
 
@@ -829,7 +829,7 @@
 
     move-result-object v1
 
-    sget-object v2, Lkotlinx/coroutines/Job;->bks:Lkotlinx/coroutines/Job$b;
+    sget-object v2, Lkotlinx/coroutines/Job;->bkC:Lkotlinx/coroutines/Job$b;
 
     check-cast v2, Lkotlin/coroutines/CoroutineContext$c;
 
@@ -850,7 +850,7 @@
     goto :goto_0
 
     :cond_1
-    invoke-interface {v1}, Lkotlinx/coroutines/Job;->DS()Ljava/util/concurrent/CancellationException;
+    invoke-interface {v1}, Lkotlinx/coroutines/Job;->DV()Ljava/util/concurrent/CancellationException;
 
     move-result-object v1
 
@@ -917,7 +917,7 @@
 
     invoke-direct {v1, v3, p1, v4}, Lkotlinx/coroutines/m;-><init>(Lkotlin/coroutines/Continuation;Ljava/lang/Throwable;Z)V
 
-    sget-object v3, Lkotlinx/coroutines/l;->bjn:Ljava/util/concurrent/atomic/AtomicReferenceFieldUpdater;
+    sget-object v3, Lkotlinx/coroutines/l;->bjx: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
 
@@ -963,7 +963,7 @@
 
     :cond_2
     :goto_0
-    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dm()V
+    invoke-direct {p0}, Lkotlinx/coroutines/l;->Dp()V
 
     invoke-direct {p0, v2}, Lkotlinx/coroutines/l;->cW(I)V
 
@@ -979,7 +979,7 @@
 
     move-result-object p1
 
-    iget v0, p0, Lkotlinx/coroutines/l;->bjU:I
+    iget v0, p0, Lkotlinx/coroutines/l;->bke:I
 
     invoke-direct {p0, p1, v0}, Lkotlinx/coroutines/l;->j(Ljava/lang/Object;I)Lkotlinx/coroutines/m;
 
@@ -995,7 +995,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lkotlinx/coroutines/l;->bgU:Lkotlin/coroutines/Continuation;
+    iget-object v1, p0, Lkotlinx/coroutines/l;->bhe:Lkotlin/coroutines/Continuation;
 
     invoke-static {v1}, Lkotlinx/coroutines/aj;->a(Lkotlin/coroutines/Continuation;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/m.smali b/com.discord/smali_classes2/kotlinx/coroutines/m.smali
index 02612a28cc..0314a31988 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/m.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/m.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bjo:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bjy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/m;->bjo:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/m;->bjy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -80,10 +80,10 @@
 
 
 # virtual methods
-.method public final Do()Z
+.method public final Dr()Z
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/m;->bjo:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/m;->bjy:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/n.smali b/com.discord/smali_classes2/kotlinx/coroutines/n.smali
index 3bf6a59040..d271453db1 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/n.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/n.smali
@@ -14,7 +14,7 @@
 
 
 # instance fields
-.field public final bjp:Lkotlinx/coroutines/l;
+.field public final bjz:Lkotlinx/coroutines/l;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlinx/coroutines/l<",
@@ -46,7 +46,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bj;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/n;->bjp:Lkotlinx/coroutines/l;
+    iput-object p2, p0, Lkotlinx/coroutines/n;->bjz:Lkotlinx/coroutines/l;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/n;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/n;->bjp:Lkotlinx/coroutines/l;
+    iget-object p1, p0, Lkotlinx/coroutines/n;->bjz:Lkotlinx/coroutines/l;
 
     iget-object v0, p0, Lkotlinx/coroutines/n;->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/n;->bjp:Lkotlinx/coroutines/l;
+    iget-object v1, p0, Lkotlinx/coroutines/n;->bjz:Lkotlinx/coroutines/l;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/p.smali b/com.discord/smali_classes2/kotlinx/coroutines/p.smali
index d7a6ae1d67..10414ab14f 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/p.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/p.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field public final bjq:Lkotlinx/coroutines/q;
+.field public final bjA:Lkotlinx/coroutines/q;
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     invoke-direct {p0, p1}, Lkotlinx/coroutines/bj;-><init>(Lkotlinx/coroutines/Job;)V
 
-    iput-object p2, p0, Lkotlinx/coroutines/p;->bjq:Lkotlinx/coroutines/q;
+    iput-object p2, p0, Lkotlinx/coroutines/p;->bjA:Lkotlinx/coroutines/q;
 
     return-void
 .end method
@@ -51,7 +51,7 @@
 
     invoke-virtual {p0, p1}, Lkotlinx/coroutines/p;->invoke(Ljava/lang/Throwable;)V
 
-    sget-object p1, Lkotlin/Unit;->bgo:Lkotlin/Unit;
+    sget-object p1, Lkotlin/Unit;->bgy: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/p;->bjq:Lkotlinx/coroutines/q;
+    iget-object p1, p0, Lkotlinx/coroutines/p;->bjA:Lkotlinx/coroutines/q;
 
     iget-object v0, p0, Lkotlinx/coroutines/p;->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/p;->bjq:Lkotlinx/coroutines/q;
+    iget-object v1, p0, Lkotlinx/coroutines/p;->bjA:Lkotlinx/coroutines/q;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/r$a.smali b/com.discord/smali_classes2/kotlinx/coroutines/r$a.smali
index 8d7384285b..cf5ed4fe65 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/r$a.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/r$a.smali
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lkotlinx/coroutines/r;->Dr()Ljava/util/concurrent/ExecutorService;
+    value = Lkotlinx/coroutines/r;->Du()Ljava/util/concurrent/ExecutorService;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,14 +18,14 @@
 
 
 # instance fields
-.field final synthetic bju:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final synthetic bjE:Ljava/util/concurrent/atomic/AtomicInteger;
 
 
 # direct methods
 .method constructor <init>(Ljava/util/concurrent/atomic/AtomicInteger;)V
     .locals 0
 
-    iput-object p1, p0, Lkotlinx/coroutines/r$a;->bju:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lkotlinx/coroutines/r$a;->bjE: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/r$a;->bju:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lkotlinx/coroutines/r$a;->bjE:Ljava/util/concurrent/atomic/AtomicInteger;
 
     invoke-virtual {v2}, Ljava/util/concurrent/atomic/AtomicInteger;->incrementAndGet()I
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/r$b.smali b/com.discord/smali_classes2/kotlinx/coroutines/r$b.smali
index 0dda332d70..5aa568ebb5 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/r$b.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/r$b.smali
@@ -18,7 +18,7 @@
 
 
 # static fields
-.field public static final bjv:Lkotlinx/coroutines/r$b;
+.field public static final bjF:Lkotlinx/coroutines/r$b;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/r$b;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/r$b;->bjv:Lkotlinx/coroutines/r$b;
+    sput-object v0, Lkotlinx/coroutines/r$b;->bjF:Lkotlinx/coroutines/r$b;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/r.smali b/com.discord/smali_classes2/kotlinx/coroutines/r.smali
index 1f3dd7d683..d2dc0d52c6 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/r.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/r.smali
@@ -4,11 +4,11 @@
 
 
 # static fields
-.field private static final bjr:I
+.field private static final bjB:I
 
-.field private static bjs:Z
+.field private static bjC:Z
 
-.field public static final bjt:Lkotlinx/coroutines/r;
+.field public static final bjD:Lkotlinx/coroutines/r;
 
 .field private static volatile pool:Ljava/util/concurrent/Executor;
 
@@ -21,7 +21,7 @@
 
     invoke-direct {v0}, Lkotlinx/coroutines/r;-><init>()V
 
-    sput-object v0, Lkotlinx/coroutines/r;->bjt:Lkotlinx/coroutines/r;
+    sput-object v0, Lkotlinx/coroutines/r;->bjD:Lkotlinx/coroutines/r;
 
     :try_start_0
     const-string v0, "kotlinx.coroutines.default.parallelism"
@@ -62,7 +62,7 @@
     move-result v0
 
     :goto_1
-    sput v0, Lkotlinx/coroutines/r;->bjr:I
+    sput v0, Lkotlinx/coroutines/r;->bjB:I
 
     return-void
 
@@ -98,10 +98,10 @@
     return-void
 .end method
 
-.method private static Dp()I
+.method private static Ds()I
     .locals 3
 
-    sget v0, Lkotlinx/coroutines/r;->bjr:I
+    sget v0, Lkotlinx/coroutines/r;->bjB:I
 
     invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -161,7 +161,7 @@
     return v0
 .end method
 
-.method private final Dq()Ljava/util/concurrent/ExecutorService;
+.method private final Dt()Ljava/util/concurrent/ExecutorService;
     .locals 6
 
     invoke-static {}, Ljava/lang/System;->getSecurityManager()Ljava/lang/SecurityManager;
@@ -170,7 +170,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lkotlinx/coroutines/r;->Dr()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/r;->Du()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -196,20 +196,20 @@
     :goto_0
     if-nez v1, :cond_1
 
-    invoke-static {}, Lkotlinx/coroutines/r;->Dr()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/r;->Du()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 
     :cond_1
-    sget-boolean v2, Lkotlinx/coroutines/r;->bjs:Z
+    sget-boolean v2, Lkotlinx/coroutines/r;->bjC:Z
 
     const/4 v3, 0x0
 
     if-nez v2, :cond_5
 
-    sget v2, Lkotlinx/coroutines/r;->bjr:I
+    sget v2, Lkotlinx/coroutines/r;->bjB:I
 
     if-gez v2, :cond_5
 
@@ -287,7 +287,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    invoke-static {}, Lkotlinx/coroutines/r;->Dp()I
+    invoke-static {}, Lkotlinx/coroutines/r;->Ds()I
 
     move-result v4
 
@@ -325,21 +325,21 @@
     return-object v0
 
     :cond_7
-    invoke-static {}, Lkotlinx/coroutines/r;->Dr()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lkotlinx/coroutines/r;->Du()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method private static Dr()Ljava/util/concurrent/ExecutorService;
+.method private static Du()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/r;->Dp()I
+    invoke-static {}, Lkotlinx/coroutines/r;->Ds()I
 
     move-result v1
 
@@ -360,7 +360,7 @@
     return-object v0
 .end method
 
-.method private final declared-synchronized Ds()Ljava/util/concurrent/Executor;
+.method private final declared-synchronized Dv()Ljava/util/concurrent/Executor;
     .locals 2
 
     monitor-enter p0
@@ -370,7 +370,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dq()Ljava/util/concurrent/ExecutorService;
+    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dt()Ljava/util/concurrent/ExecutorService;
 
     move-result-object v0
 
@@ -417,7 +417,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotlinx/coroutines/r$b;->bjv:Lkotlinx/coroutines/r$b;
+    sget-object v0, Lkotlinx/coroutines/r$b;->bjF:Lkotlinx/coroutines/r$b;
 
     check-cast v0, Ljava/lang/Runnable;
 
@@ -493,12 +493,12 @@
 
     if-nez p1, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/r;->Ds()Ljava/util/concurrent/Executor;
+    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dv()Ljava/util/concurrent/Executor;
 
     move-result-object p1
 
     :cond_0
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
     move-result-object v0
 
@@ -513,9 +513,9 @@
     return-void
 
     :catch_0
-    invoke-static {}, Lkotlinx/coroutines/cd;->Ei()Lkotlinx/coroutines/cc;
+    invoke-static {}, Lkotlinx/coroutines/cd;->El()Lkotlinx/coroutines/cc;
 
-    sget-object p1, Lkotlinx/coroutines/ak;->bjM:Lkotlinx/coroutines/ak;
+    sget-object p1, Lkotlinx/coroutines/ak;->bjW:Lkotlinx/coroutines/ak;
 
     invoke-virtual {p1, p2}, Lkotlinx/coroutines/ak;->j(Ljava/lang/Runnable;)V
 
@@ -547,7 +547,7 @@
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lkotlinx/coroutines/r;->Ds()Ljava/util/concurrent/Executor;
+    invoke-direct {p0}, Lkotlinx/coroutines/r;->Dv()Ljava/util/concurrent/Executor;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/t.smali b/com.discord/smali_classes2/kotlinx/coroutines/t.smali
index 7bd08a98c9..d5223d975d 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/t.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/t.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field private static final bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+.field private static final bjG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
 
 # instance fields
@@ -25,7 +25,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lkotlinx/coroutines/t;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sput-object v0, Lkotlinx/coroutines/t;->bjG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     return-void
 .end method
@@ -58,10 +58,10 @@
 
 
 # virtual methods
-.method public final Dt()Z
+.method public final Dw()Z
     .locals 3
 
-    sget-object v0, Lkotlinx/coroutines/t;->bjw:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
+    sget-object v0, Lkotlinx/coroutines/t;->bjG:Ljava/util/concurrent/atomic/AtomicIntegerFieldUpdater;
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/w.smali b/com.discord/smali_classes2/kotlinx/coroutines/w.smali
index bb3d6bafc1..cb7bc9e4ef 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/w.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/w.smali
@@ -4,7 +4,7 @@
 
 
 # instance fields
-.field public final bjx:Lkotlin/jvm/functions/Function1;
+.field public final bjH:Lkotlin/jvm/functions/Function1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lkotlin/jvm/functions/Function1<",
diff --git a/com.discord/smali_classes2/kotlinx/coroutines/z.smali b/com.discord/smali_classes2/kotlinx/coroutines/z.smali
index 4369a54ef1..959eebf42e 100644
--- a/com.discord/smali_classes2/kotlinx/coroutines/z.smali
+++ b/com.discord/smali_classes2/kotlinx/coroutines/z.smali
@@ -17,7 +17,7 @@
 
 
 # virtual methods
-.method public abstract Du()Ljava/lang/Throwable;
+.method public abstract Dx()Ljava/lang/Throwable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "()TT;"
diff --git a/com.discord/smali_classes2/kotterknife/a.smali b/com.discord/smali_classes2/kotterknife/a.smali
index af98414a92..648b1046a9 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 bmR:Lkotterknife/a;
+.field public static final bnb:Lkotterknife/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lkotterknife/a;-><init>()V
 
-    sput-object v0, Lkotterknife/a;->bmR:Lkotterknife/a;
+    sput-object v0, Lkotterknife/a;->bnb:Lkotterknife/a;
 
     return-void
 .end method
@@ -35,7 +35,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bmZ:Lkotterknife/d;
+    sget-object v0, Lkotterknife/d;->bnj:Lkotterknife/d;
 
     invoke-static {p0}, Lkotterknife/d;->bi(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 8ff9864a53..12e5fef97e 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 bmS:Lkotterknife/b$d;
+.field public static final bnc:Lkotterknife/b$d;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$d;-><init>()V
 
-    sput-object v0, Lkotterknife/b$d;->bmS:Lkotterknife/b$d;
+    sput-object v0, Lkotterknife/b$d;->bnc: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 22c8f098d4..c15894754e 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 bmT:Lkotterknife/b$e;
+.field public static final bnd:Lkotterknife/b$e;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$e;-><init>()V
 
-    sput-object v0, Lkotterknife/b$e;->bmT:Lkotterknife/b$e;
+    sput-object v0, Lkotterknife/b$e;->bnd: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 3637763976..369a3ceb84 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 bmU:Lkotterknife/b$f;
+.field public static final bne:Lkotterknife/b$f;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$f;-><init>()V
 
-    sput-object v0, Lkotterknife/b$f;->bmU:Lkotterknife/b$f;
+    sput-object v0, Lkotterknife/b$f;->bne: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 98c13e011f..991e6d5383 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 bmV:Lkotterknife/b$g;
+.field public static final bnf:Lkotterknife/b$g;
 
 
 # direct methods
@@ -40,7 +40,7 @@
 
     invoke-direct {v0}, Lkotterknife/b$g;-><init>()V
 
-    sput-object v0, Lkotterknife/b$g;->bmV:Lkotterknife/b$g;
+    sput-object v0, Lkotterknife/b$g;->bnf: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 af64bd38f6..3ad4761d0a 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$e;->bmT:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bnd:Lkotterknife/b$e;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -98,7 +98,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$e;->bmT:Lkotterknife/b$e;
+    sget-object p0, Lkotterknife/b$e;->bnd:Lkotterknife/b$e;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -135,7 +135,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bmU:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bne:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -167,7 +167,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$g;->bmV:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bnf:Lkotterknife/b$g;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -204,7 +204,7 @@
 
     invoke-static {p1, p0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$g;->bmV:Lkotterknife/b$g;
+    sget-object p0, Lkotterknife/b$g;->bnf:Lkotterknife/b$g;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -337,7 +337,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bmU:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bne:Lkotterknife/b$f;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -369,7 +369,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$d;->bmS:Lkotterknife/b$d;
+    sget-object p0, Lkotterknife/b$d;->bnc:Lkotterknife/b$d;
 
     check-cast p0, Lkotlin/jvm/functions/Function2;
 
@@ -401,7 +401,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object p0, Lkotterknife/b$f;->bmU:Lkotterknife/b$f;
+    sget-object p0, Lkotterknife/b$f;->bne: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 b9034b8f99..b211e46b31 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 bmX:Lkotterknife/c$a;
+.field public static final bnh:Lkotterknife/c$a;
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     invoke-direct {v0}, Lkotterknife/c$a;-><init>()V
 
-    sput-object v0, Lkotterknife/c$a;->bmX:Lkotterknife/c$a;
+    sput-object v0, Lkotterknife/c$a;->bnh: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 60baaf6fd3..246baded30 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 bmW:Lkotlin/jvm/functions/Function2;
+.field private final bng: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;->bmW:Lkotlin/jvm/functions/Function2;
+    iput-object p1, p0, Lkotterknife/c;->bng:Lkotlin/jvm/functions/Function2;
 
-    sget-object p1, Lkotterknife/c$a;->bmX:Lkotterknife/c$a;
+    sget-object p1, Lkotterknife/c$a;->bnh: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;->bmX:Lkotterknife/c$a;
+    sget-object v1, Lkotterknife/c$a;->bnh:Lkotterknife/c$a;
 
     invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lkotterknife/c;->bmW:Lkotlin/jvm/functions/Function2;
+    iget-object v0, p0, Lkotterknife/c;->bng: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;->bmZ:Lkotterknife/d;
+    sget-object p2, Lkotterknife/d;->bnj: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 743378e0e4..c1205f0795 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 bmY:Ljava/util/WeakHashMap;
+.field private static final bni:Ljava/util/WeakHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/WeakHashMap<",
@@ -16,7 +16,7 @@
     .end annotation
 .end field
 
-.field public static final bmZ:Lkotterknife/d;
+.field public static final bnj:Lkotterknife/d;
 
 
 # direct methods
@@ -27,13 +27,13 @@
 
     invoke-direct {v0}, Lkotterknife/d;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bmZ:Lkotterknife/d;
+    sput-object v0, Lkotterknife/d;->bnj:Lkotterknife/d;
 
     new-instance v0, Ljava/util/WeakHashMap;
 
     invoke-direct {v0}, Ljava/util/WeakHashMap;-><init>()V
 
-    sput-object v0, Lkotterknife/d;->bmY:Ljava/util/WeakHashMap;
+    sput-object v0, Lkotterknife/d;->bni:Ljava/util/WeakHashMap;
 
     return-void
 .end method
@@ -62,7 +62,7 @@
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bmY:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bni:Ljava/util/WeakHashMap;
 
     check-cast v0, Ljava/util/Map;
 
@@ -99,7 +99,7 @@
 
     invoke-static {p0, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    sget-object v0, Lkotterknife/d;->bmY:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bni: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;->bmX:Lkotterknife/c$a;
+    sget-object v2, Lkotterknife/c$a;->bnh:Lkotterknife/c$a;
 
     iput-object v2, v1, Lkotterknife/c;->value:Ljava/lang/Object;
 
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lkotterknife/d;->bmY:Ljava/util/WeakHashMap;
+    sget-object v0, Lkotterknife/d;->bni: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 d14e88521b..aa9b95926e 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 bqT:Ljava/util/List;
+.field final brd: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;->bqT:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fj()Lokhttp3/Headers;
+.method public final Fm()Lokhttp3/Headers;
     .locals 1
 
     new-instance v0, Lokhttp3/Headers;
@@ -72,11 +72,11 @@
 .method final ak(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/Headers$a;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/Headers$a;->bqT:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lokhttp3/Headers$a;->bqT:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
 
     invoke-virtual {p2}, Ljava/lang/String;->trim()Ljava/lang/String;
 
@@ -107,7 +107,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/Headers$a;->bqT:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->brd: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;->bqT:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->brd: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;->bqT:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->brd:Ljava/util/List;
 
     invoke-interface {v1, v0}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
-    iget-object v1, p0, Lokhttp3/Headers$a;->bqT:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/Headers$a;->brd: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 947d5f1b57..49fc2a3bfc 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 byl:I = 0x1
+.field public static final byv:I = 0x1
 
-.field public static final bym:I = 0x2
+.field public static final byw:I = 0x2
 
-.field public static final byn:I = 0x3
+.field public static final byx:I = 0x3
 
-.field public static final byo:I = 0x4
+.field public static final byy:I = 0x4
 
-.field private static final synthetic byp:[I
+.field private static final synthetic byz:[I
 
 
 # direct methods
@@ -42,31 +42,31 @@
 
     new-array v0, v0, [I
 
-    sget v1, Lokhttp3/a/a$a;->byl:I
+    sget v1, Lokhttp3/a/a$a;->byv:I
 
     const/4 v2, 0x0
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->bym:I
+    sget v1, Lokhttp3/a/a$a;->byw:I
 
     const/4 v2, 0x1
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->byn:I
+    sget v1, Lokhttp3/a/a$a;->byx:I
 
     const/4 v2, 0x2
 
     aput v1, v0, v2
 
-    sget v1, Lokhttp3/a/a$a;->byo:I
+    sget v1, Lokhttp3/a/a$a;->byy:I
 
     const/4 v2, 0x3
 
     aput v1, v0, v2
 
-    sput-object v0, Lokhttp3/a/a$a;->byp:[I
+    sput-object v0, Lokhttp3/a/a$a;->byz:[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 cc0deb4a7b..7f5e793a0f 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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()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 b808376a36..7c77ca0f35 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 byq:Lokhttp3/a/a$b;
+.field public static final byA: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;->byq:Lokhttp3/a/a$b;
+    sput-object v0, Lokhttp3/a/a$b;->byA: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 516c99db09..4de86252be 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 byh:Ljava/nio/charset/Charset;
+.field private static final byr:Ljava/nio/charset/Charset;
 
 
 # instance fields
-.field private final byi:Lokhttp3/a/a$b;
+.field private final bys:Lokhttp3/a/a$b;
 
-.field private volatile byj:Ljava/util/Set;
+.field private volatile byt:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field public volatile byk:I
+.field public volatile byu:I
 
 
 # direct methods
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/a/a;->byh:Ljava/nio/charset/Charset;
+    sput-object v0, Lokhttp3/a/a;->byr: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;->byq:Lokhttp3/a/a$b;
+    sget-object v0, Lokhttp3/a/a$b;->byA: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;->byj:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/a/a;->byt:Ljava/util/Set;
 
-    sget v0, Lokhttp3/a/a$a;->byl:I
+    sget v0, Lokhttp3/a/a$a;->byv:I
 
-    iput v0, p0, Lokhttp3/a/a;->byk:I
+    iput v0, p0, Lokhttp3/a/a;->byu:I
 
-    iput-object p1, p0, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iput-object p1, p0, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
 .method private a(Lokhttp3/Headers;I)V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/a/a;->byj:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/a/a;->byt:Ljava/util/Set;
 
     invoke-virtual {p1, p2}, Lokhttp3/Headers;->de(I)Ljava/lang/String;
 
@@ -105,7 +105,7 @@
     move-result-object v0
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v1, p0, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v2, Ljava/lang/StringBuilder;
 
@@ -177,7 +177,7 @@
 
     if-ge p0, v1, :cond_d
 
-    invoke-virtual {v7}, Lokio/c;->Hf()Z
+    invoke-virtual {v7}, Lokio/c;->Hi()Z
 
     move-result v1
 
@@ -454,13 +454,13 @@
 
     move-object/from16 v0, p1
 
-    iget v2, v1, Lokhttp3/a/a;->byk:I
+    iget v2, v1, Lokhttp3/a/a;->byu:I
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fu()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v3
 
-    sget v4, Lokhttp3/a/a$a;->byl:I
+    sget v4, Lokhttp3/a/a$a;->byv:I
 
     if-ne v2, v4, :cond_0
 
@@ -471,7 +471,7 @@
     return-object v0
 
     :cond_0
-    sget v4, Lokhttp3/a/a$a;->byo:I
+    sget v4, Lokhttp3/a/a$a;->byy:I
 
     const/4 v5, 0x1
 
@@ -487,7 +487,7 @@
     :goto_0
     if-nez v4, :cond_3
 
-    sget v7, Lokhttp3/a/a$a;->byn:I
+    sget v7, Lokhttp3/a/a$a;->byx:I
 
     if-ne v2, v7, :cond_2
 
@@ -503,7 +503,7 @@
     const/4 v2, 0x1
 
     :goto_2
-    iget-object v7, v3, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v7, v3, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     if-eqz v7, :cond_4
 
@@ -513,7 +513,7 @@
     const/4 v5, 0x0
 
     :goto_3
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fv()Lokhttp3/i;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fy()Lokhttp3/i;
 
     move-result-object v8
 
@@ -523,7 +523,7 @@
 
     invoke-direct {v9, v10}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v10, v3, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v10, v3, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -531,7 +531,7 @@
 
     invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v11, v3, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v11, v3, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-virtual {v9, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -545,7 +545,7 @@
 
     invoke-direct {v13, v11}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-interface {v8}, Lokhttp3/i;->Fb()Lokhttp3/u;
+    invoke-interface {v8}, Lokhttp3/i;->Fe()Lokhttp3/u;
 
     move-result-object v8
 
@@ -603,7 +603,7 @@
     move-object/from16 v16, v11
 
     :goto_5
-    iget-object v10, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v10, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     invoke-interface {v10, v8}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
@@ -621,7 +621,7 @@
 
     if-eqz v14, :cond_7
 
-    iget-object v14, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v14, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -650,7 +650,7 @@
 
     if-eqz v6, :cond_8
 
-    iget-object v6, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v6, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v14, Ljava/lang/StringBuilder;
 
@@ -671,9 +671,9 @@
     invoke-interface {v6, v10}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
     :cond_8
-    iget-object v6, v3, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v6, v3, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
-    iget-object v10, v6, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v10, v6, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v10, v10
 
@@ -721,7 +721,7 @@
     goto/16 :goto_7
 
     :cond_b
-    iget-object v5, v3, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v5, v3, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
     invoke-static {v5}, Lokhttp3/a/a;->d(Lokhttp3/Headers;)Z
 
@@ -729,13 +729,13 @@
 
     if-eqz v5, :cond_c
 
-    iget-object v5, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v7, Ljava/lang/StringBuilder;
 
     invoke-direct {v7, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -758,7 +758,7 @@
 
     invoke-virtual {v7, v5}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
-    sget-object v10, Lokhttp3/a/a;->byh:Ljava/nio/charset/Charset;
+    sget-object v10, Lokhttp3/a/a;->byr:Ljava/nio/charset/Charset;
 
     invoke-virtual {v7}, Lokhttp3/RequestBody;->contentType()Lokhttp3/MediaType;
 
@@ -766,14 +766,14 @@
 
     if-eqz v11, :cond_d
 
-    sget-object v10, Lokhttp3/a/a;->byh:Ljava/nio/charset/Charset;
+    sget-object v10, Lokhttp3/a/a;->byr: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;->byi:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     invoke-interface {v11, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
@@ -783,7 +783,7 @@
 
     if-eqz v11, :cond_e
 
-    iget-object v11, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v11, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     invoke-virtual {v5, v10}, Lokio/c;->c(Ljava/nio/charset/Charset;)Ljava/lang/String;
 
@@ -791,13 +791,13 @@
 
     invoke-interface {v11, v5}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v5, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v10, Ljava/lang/StringBuilder;
 
     invoke-direct {v10, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v10, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -820,13 +820,13 @@
     goto :goto_8
 
     :cond_e
-    iget-object v5, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v10, Ljava/lang/StringBuilder;
 
     invoke-direct {v10, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v10, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -852,13 +852,13 @@
 
     :cond_f
     :goto_7
-    iget-object v5, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v7, Ljava/lang/StringBuilder;
 
     invoke-direct {v7, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v6, v3, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v6, v3, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -893,7 +893,7 @@
 
     move-result-wide v5
 
-    iget-object v3, v0, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v3, v0, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
@@ -925,7 +925,7 @@
     const-string v7, "unknown-length"
 
     :goto_9
-    iget-object v14, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v14, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v15, Ljava/lang/StringBuilder;
 
@@ -977,9 +977,9 @@
 
     invoke-virtual {v15, v9}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v9, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v9, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v9, v9, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-virtual {v15, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -1029,9 +1029,9 @@
 
     if-eqz v2, :cond_1e
 
-    iget-object v2, v0, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v2, v0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
-    iget-object v5, v2, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v5, v2, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v5, v5
 
@@ -1060,7 +1060,7 @@
     goto/16 :goto_f
 
     :cond_15
-    iget-object v4, v0, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v4, v0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     invoke-static {v4}, Lokhttp3/a/a;->d(Lokhttp3/Headers;)Z
 
@@ -1068,7 +1068,7 @@
 
     if-eqz v4, :cond_16
 
-    iget-object v2, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP (encoded body omitted)"
 
@@ -1077,7 +1077,7 @@
     goto/16 :goto_10
 
     :cond_16
-    invoke-virtual {v3}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {v3}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v4
 
@@ -1085,7 +1085,7 @@
 
     invoke-interface {v4, v5, v6}, Lokio/d;->request(J)Z
 
-    invoke-interface {v4}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v4}, Lokio/d;->Hf()Lokio/c;
 
     move-result-object v4
 
@@ -1114,7 +1114,7 @@
     :try_start_1
     new-instance v6, Lokio/h;
 
-    invoke-virtual {v4}, Lokio/c;->Ho()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Hr()Lokio/c;
 
     move-result-object v4
 
@@ -1157,7 +1157,7 @@
     move-object v2, v5
 
     :goto_e
-    sget-object v5, Lokhttp3/a/a;->byh:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->byr:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentType()Lokhttp3/MediaType;
 
@@ -1165,7 +1165,7 @@
 
     if-eqz v3, :cond_19
 
-    sget-object v5, Lokhttp3/a/a;->byh:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/a/a;->byr:Ljava/nio/charset/Charset;
 
     invoke-virtual {v3, v5}, Lokhttp3/MediaType;->b(Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
 
@@ -1178,11 +1178,11 @@
 
     if-nez v3, :cond_1a
 
-    iget-object v2, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     invoke-interface {v2, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v2, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v3, Ljava/lang/StringBuilder;
 
@@ -1211,13 +1211,13 @@
 
     if-eqz v3, :cond_1b
 
-    iget-object v3, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     invoke-interface {v3, v12}, Lokhttp3/a/a$b;->log(Ljava/lang/String;)V
 
-    iget-object v3, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v3, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
-    invoke-virtual {v4}, Lokio/c;->Ho()Lokio/c;
+    invoke-virtual {v4}, Lokio/c;->Hr()Lokio/c;
 
     move-result-object v6
 
@@ -1232,7 +1232,7 @@
 
     if-eqz v2, :cond_1c
 
-    iget-object v5, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v5, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v6, Ljava/lang/StringBuilder;
 
@@ -1261,7 +1261,7 @@
     goto :goto_10
 
     :cond_1c
-    iget-object v2, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
@@ -1285,7 +1285,7 @@
 
     :cond_1d
     :goto_f
-    iget-object v2, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v2, v1, Lokhttp3/a/a;->bys:Lokhttp3/a/a$b;
 
     const-string v3, "<-- END HTTP"
 
@@ -1300,7 +1300,7 @@
 
     move-object v2, v0
 
-    iget-object v0, v1, Lokhttp3/a/a;->byi:Lokhttp3/a/a$b;
+    iget-object v0, v1, Lokhttp3/a/a;->bys: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 c1b75edaca..6608c1e0e7 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 bnk:Lokhttp3/b;
+.field public static final bnu:Lokhttp3/b;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/b$1;-><init>()V
 
-    sput-object v0, Lokhttp3/b;->bnk:Lokhttp3/b;
+    sput-object v0, Lokhttp3/b;->bnu: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 32f7a0827f..e6a0faddf2 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 bnl:Lokhttp3/internal/a/e;
+.field final bnv:Lokhttp3/internal/a/e;
 
-.field final bnm:Lokhttp3/internal/a/d;
+.field final bnw:Lokhttp3/internal/a/d;
 
 
 # virtual methods
@@ -22,7 +22,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/c;->bnm:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bnw: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;->bnm:Lokhttp3/internal/a/d;
+    iget-object v0, p0, Lokhttp3/c;->bnw: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 41a59e27f9..e2cae7e6e5 100644
--- a/com.discord/smali_classes2/okhttp3/d$a.smali
+++ b/com.discord/smali_classes2/okhttp3/d$a.smali
@@ -15,17 +15,17 @@
 
 
 # instance fields
-.field bnp:Z
+.field bnA:Z
 
-.field bnq:Z
+.field bnB:I
 
-.field bnr:I
+.field bnG:I
 
-.field bnw:I
+.field bnH:I
 
-.field bnx:I
+.field bnI:Z
 
-.field bny:Z
+.field bnJ:Z
 
 .field bnz:Z
 
@@ -40,18 +40,18 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/d$a;->bnr:I
+    iput v0, p0, Lokhttp3/d$a;->bnB:I
 
-    iput v0, p0, Lokhttp3/d$a;->bnw:I
+    iput v0, p0, Lokhttp3/d$a;->bnG:I
 
-    iput v0, p0, Lokhttp3/d$a;->bnx:I
+    iput v0, p0, Lokhttp3/d$a;->bnH:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final EZ()Lokhttp3/d;
+.method public final Fc()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 cec58d622d..f45ff446aa 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 beF:Ljava/util/List;
+.field final beP: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;->beF:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/g$a;->beP: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 a6c5e10994..f8a4177c45 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 bnE:Ljava/lang/String;
+.field final bnO:Ljava/lang/String;
 
-.field final bnF:Ljava/lang/String;
+.field final bnP:Ljava/lang/String;
 
-.field final bnG:Lokio/ByteString;
+.field final bnQ:Lokio/ByteString;
 
 .field final pattern:Ljava/lang/String;
 
@@ -44,9 +44,9 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/g$b;->bnF:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/g$b;->bnP:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/g$b;->bnF:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/g$b;->bnP: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;->bnG:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/g$b;->bnG:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/g$b;->bnQ: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;->bnF:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bnP: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;->bnG:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bnQ: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;->bnF:Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/g$b;->bnP:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokhttp3/g$b;->bnG:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/g$b;->bnQ:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hr()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hu()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 2e472f01d4..9c574b0b7a 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 aPG:Ljava/util/Map;
+.field private static final aPP:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -15,7 +15,7 @@
     .end annotation
 .end field
 
-.field static final bnH:Ljava/util/Comparator;
+.field static final bnR:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -25,26 +25,6 @@
     .end annotation
 .end field
 
-.field public static final bnI:Lokhttp3/h;
-
-.field public static final bnJ:Lokhttp3/h;
-
-.field public static final bnK:Lokhttp3/h;
-
-.field public static final bnL:Lokhttp3/h;
-
-.field public static final bnM:Lokhttp3/h;
-
-.field public static final bnN:Lokhttp3/h;
-
-.field public static final bnO:Lokhttp3/h;
-
-.field public static final bnP:Lokhttp3/h;
-
-.field public static final bnQ:Lokhttp3/h;
-
-.field public static final bnR:Lokhttp3/h;
-
 .field public static final bnS:Lokhttp3/h;
 
 .field public static final bnT:Lokhttp3/h;
@@ -211,6 +191,10 @@
 
 .field public static final bpX:Lokhttp3/h;
 
+.field public static final bpY:Lokhttp3/h;
+
+.field public static final bpZ:Lokhttp3/h;
+
 .field public static final bpa:Lokhttp3/h;
 
 .field public static final bpb:Lokhttp3/h;
@@ -263,6 +247,22 @@
 
 .field public static final bpz:Lokhttp3/h;
 
+.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;
+
 
 # instance fields
 .field final javaName:Ljava/lang/String;
@@ -276,13 +276,13 @@
 
     invoke-direct {v0}, Lokhttp3/h$1;-><init>()V
 
-    sput-object v0, Lokhttp3/h;->bnH:Ljava/util/Comparator;
+    sput-object v0, Lokhttp3/h;->bnR:Ljava/util/Comparator;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
     invoke-direct {v0}, Ljava/util/LinkedHashMap;-><init>()V
 
-    sput-object v0, Lokhttp3/h;->aPG:Ljava/util/Map;
+    sput-object v0, Lokhttp3/h;->aPP:Ljava/util/Map;
 
     const-string v0, "SSL_RSA_WITH_NULL_MD5"
 
@@ -290,7 +290,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnS:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_NULL_SHA"
 
@@ -298,7 +298,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnT:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_EXPORT_WITH_RC4_40_MD5"
 
@@ -306,7 +306,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnU:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_RC4_128_MD5"
 
@@ -314,7 +314,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnV:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_RC4_128_SHA"
 
@@ -322,7 +322,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnW:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -330,7 +330,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnX:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_DES_CBC_SHA"
 
@@ -338,7 +338,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnY:Lokhttp3/h;
 
     const-string v0, "SSL_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -346,7 +346,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bnZ:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -354,7 +354,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boa:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_DSS_WITH_DES_CBC_SHA"
 
@@ -362,7 +362,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bob:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
 
@@ -370,7 +370,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boc:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -378,7 +378,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bod:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_RSA_WITH_DES_CBC_SHA"
 
@@ -386,7 +386,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boe:Lokhttp3/h;
 
     const-string v0, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -394,7 +394,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bof:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
 
@@ -402,7 +402,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bog:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_WITH_RC4_128_MD5"
 
@@ -410,7 +410,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boh:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
 
@@ -418,7 +418,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boi:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_WITH_DES_CBC_SHA"
 
@@ -426,7 +426,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bnZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boj:Lokhttp3/h;
 
     const-string v0, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA"
 
@@ -434,7 +434,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bok:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_DES_CBC_SHA"
 
@@ -442,7 +442,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bob:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bol:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"
 
@@ -450,7 +450,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bom:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_RC4_128_SHA"
 
@@ -458,7 +458,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bod:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bon:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_DES_CBC_MD5"
 
@@ -466,7 +466,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boo:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"
 
@@ -474,7 +474,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bof:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bop:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_WITH_RC4_128_MD5"
 
@@ -482,7 +482,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bog:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boq:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"
 
@@ -490,7 +490,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boh:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bor:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"
 
@@ -498,7 +498,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boi:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bos:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
 
@@ -506,7 +506,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boj:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bou:Lokhttp3/h;
 
     const-string v0, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
 
@@ -514,7 +514,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bok:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bov:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA"
 
@@ -522,7 +522,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bol:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bow:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
 
@@ -530,7 +530,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bom:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->box:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
 
@@ -538,7 +538,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bon:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boy:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA"
 
@@ -546,7 +546,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boo:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boz:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA"
 
@@ -554,7 +554,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bop:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boA:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
 
@@ -562,7 +562,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boq:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boB:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
 
@@ -570,7 +570,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bor:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boC:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA"
 
@@ -578,7 +578,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bos:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boD:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_NULL_SHA256"
 
@@ -586,7 +586,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bou:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boE:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -594,7 +594,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bov:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boF:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_256_CBC_SHA256"
 
@@ -602,7 +602,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bow:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boG:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
 
@@ -610,7 +610,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->box:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boH:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
 
@@ -618,7 +618,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boy:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boI:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
 
@@ -626,7 +626,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boz:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boJ:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
 
@@ -634,7 +634,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boA:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boK:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -642,7 +642,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boB:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boL:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
 
@@ -650,7 +650,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boC:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boM:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
 
@@ -658,7 +658,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boD:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boN:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
 
@@ -666,7 +666,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boE:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boO:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
 
@@ -674,7 +674,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boF:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boP:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
 
@@ -682,7 +682,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boG:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boQ:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
 
@@ -690,7 +690,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boH:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boR:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
 
@@ -698,7 +698,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boS:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_RC4_128_SHA"
 
@@ -706,7 +706,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boT:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
 
@@ -714,7 +714,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boU:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_AES_128_CBC_SHA"
 
@@ -722,7 +722,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boV:Lokhttp3/h;
 
     const-string v0, "TLS_PSK_WITH_AES_256_CBC_SHA"
 
@@ -730,7 +730,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boW:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_SEED_CBC_SHA"
 
@@ -738,7 +738,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boX:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -746,7 +746,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boY:Lokhttp3/h;
 
     const-string v0, "TLS_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -754,7 +754,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->boZ:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -762,7 +762,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpa:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -770,7 +770,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpb:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
 
@@ -778,7 +778,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpc:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
 
@@ -786,7 +786,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpd:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
 
@@ -794,7 +794,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpe:Lokhttp3/h;
 
     const-string v0, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
 
@@ -802,7 +802,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpf:Lokhttp3/h;
 
     const-string v0, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
 
@@ -810,7 +810,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpg:Lokhttp3/h;
 
     const-string v0, "TLS_FALLBACK_SCSV"
 
@@ -818,7 +818,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bph:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_NULL_SHA"
 
@@ -826,7 +826,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boY:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpi:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"
 
@@ -834,7 +834,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->boZ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpj:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -842,7 +842,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpa:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpk:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"
 
@@ -850,7 +850,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpb:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpl:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"
 
@@ -858,7 +858,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpc:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpm:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
 
@@ -866,7 +866,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpd:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpn:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
 
@@ -874,7 +874,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpe:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpo:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -882,7 +882,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpf:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpp:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
 
@@ -890,7 +890,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpg:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpq:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
 
@@ -898,7 +898,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bph:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpr:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_NULL_SHA"
 
@@ -906,7 +906,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpi:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bps:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_RC4_128_SHA"
 
@@ -914,7 +914,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpj:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpt:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -922,7 +922,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpk:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpu:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"
 
@@ -930,7 +930,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpl:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpv:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"
 
@@ -938,7 +938,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpm:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpw:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_NULL_SHA"
 
@@ -946,7 +946,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpn:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpx:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
 
@@ -954,7 +954,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpo:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpy:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
 
@@ -962,7 +962,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpp:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpz:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
 
@@ -970,7 +970,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpq:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpA:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
 
@@ -978,7 +978,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpr:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpB:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_NULL_SHA"
 
@@ -986,7 +986,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bps:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpC:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_RC4_128_SHA"
 
@@ -994,7 +994,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpt:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpD:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
 
@@ -1002,7 +1002,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpu:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpE:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
 
@@ -1010,7 +1010,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpv:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpF:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
 
@@ -1018,7 +1018,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpw:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpG:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
 
@@ -1026,7 +1026,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpx:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpH:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
 
@@ -1034,7 +1034,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpy:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpI:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"
 
@@ -1042,7 +1042,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpz:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpJ:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"
 
@@ -1050,7 +1050,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpA:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpK:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -1058,7 +1058,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpB:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpL:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
 
@@ -1066,7 +1066,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpC:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpM:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"
 
@@ -1074,7 +1074,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpD:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpN:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"
 
@@ -1082,7 +1082,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpE:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpO:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
 
@@ -1090,7 +1090,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpF:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpP:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
 
@@ -1098,7 +1098,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpG:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpQ:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"
 
@@ -1106,7 +1106,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpH:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpR:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"
 
@@ -1114,7 +1114,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpI:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpS:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -1122,7 +1122,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpJ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpT:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -1130,7 +1130,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpK:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpU:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"
 
@@ -1138,7 +1138,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpL:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpV:Lokhttp3/h;
 
     const-string v0, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"
 
@@ -1146,7 +1146,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpM:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpW:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
 
@@ -1154,7 +1154,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpN:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpX:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
 
@@ -1162,7 +1162,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpO:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpY:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1170,7 +1170,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpP:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bpZ:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1178,7 +1178,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpQ:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqa:Lokhttp3/h;
 
     const-string v0, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1186,7 +1186,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpR:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqb:Lokhttp3/h;
 
     const-string v0, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
 
@@ -1194,7 +1194,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpS:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqc:Lokhttp3/h;
 
     const-string v0, "TLS_AES_128_GCM_SHA256"
 
@@ -1202,7 +1202,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpT:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqd:Lokhttp3/h;
 
     const-string v0, "TLS_AES_256_GCM_SHA384"
 
@@ -1210,7 +1210,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpU:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqe:Lokhttp3/h;
 
     const-string v0, "TLS_CHACHA20_POLY1305_SHA256"
 
@@ -1218,7 +1218,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpV:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqf:Lokhttp3/h;
 
     const-string v0, "TLS_AES_128_CCM_SHA256"
 
@@ -1226,7 +1226,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpW:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqg:Lokhttp3/h;
 
     const-string v0, "TLS_AES_256_CCM_8_SHA256"
 
@@ -1234,7 +1234,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/h;->bpX:Lokhttp3/h;
+    sput-object v0, Lokhttp3/h;->bqh:Lokhttp3/h;
 
     return-void
 .end method
@@ -1312,7 +1312,7 @@
     monitor-enter v0
 
     :try_start_0
-    sget-object v1, Lokhttp3/h;->aPG:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aPP: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;->aPG:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aPP: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;->aPG:Ljava/util/Map;
+    sget-object v2, Lokhttp3/h;->aPP:Ljava/util/Map;
 
     invoke-interface {v2, p0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
     :try_end_0
@@ -1422,7 +1422,7 @@
 
     invoke-direct {v0, p0}, Lokhttp3/h;-><init>(Ljava/lang/String;)V
 
-    sget-object v1, Lokhttp3/h;->aPG:Ljava/util/Map;
+    sget-object v1, Lokhttp3/h;->aPP: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 4e6a77033d..7fd253a0ef 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 btd:Z
+.field btn:Z
 
-.field final synthetic bte:Lokio/d;
+.field final synthetic bto:Lokio/d;
 
-.field final synthetic btf:Lokhttp3/internal/a/b;
+.field final synthetic btp:Lokhttp3/internal/a/b;
 
-.field final synthetic btg:Lokio/BufferedSink;
+.field final synthetic btq:Lokio/BufferedSink;
 
-.field final synthetic bth:Lokhttp3/internal/a/a;
+.field final synthetic btr: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;->bth:Lokhttp3/internal/a/a;
+    iput-object p1, p0, Lokhttp3/internal/a/a$1;->btr:Lokhttp3/internal/a/a;
 
-    iput-object p2, p0, Lokhttp3/internal/a/a$1;->bte:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/a/a$1;->bto:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/a/a$1;->btf:Lokhttp3/internal/a/b;
+    iput-object p3, p0, Lokhttp3/internal/a/a$1;->btp:Lokhttp3/internal/a/b;
 
-    iput-object p4, p0, Lokhttp3/internal/a/a$1;->btg:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/a/a$1;->btq: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;->bte:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/a/a$1;->bto: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;->btd:Z
+    iget-boolean p1, p0, Lokhttp3/internal/a/a$1;->btn:Z
 
     if-nez p1, :cond_0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btd:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/a$1;->btg:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->btq: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;->btg:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->btq:Lokio/BufferedSink;
 
-    invoke-interface {v0}, Lokio/BufferedSink;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/BufferedSink;->Hf()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;->btg:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/a$1;->btq:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->Hp()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Hs()Lokio/BufferedSink;
 
     return-wide p2
 
     :catch_0
     move-exception p1
 
-    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->btd:Z
+    iget-boolean p2, p0, Lokhttp3/internal/a/a$1;->btn:Z
 
     if-nez p2, :cond_2
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btd:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
 
     :cond_2
     throw p1
@@ -130,7 +130,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->btd:Z
+    iget-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
 
     if-nez v0, :cond_0
 
@@ -144,10 +144,10 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btd:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/a$1;->btn:Z
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bte:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bto: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;->bte:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/a/a$1;->bto: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 f5b716bc7b..1a1a895a22 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 btc:Lokhttp3/internal/a/e;
+.field final btm: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;->btc:Lokhttp3/internal/a/e;
+    iput-object p1, p0, Lokhttp3/internal/a/a;->btm: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;->bqS:[Ljava/lang/String;
+    iget-object v1, p0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -85,7 +85,7 @@
     if-nez v6, :cond_2
 
     :cond_1
-    sget-object v6, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v6, Lokhttp3/internal/a;->bsV: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;->bqS:[Ljava/lang/String;
+    iget-object p0, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length p0, p0
 
@@ -120,7 +120,7 @@
 
     if-eqz v3, :cond_4
 
-    sget-object v3, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v3, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
     invoke-virtual {p1, v2}, Lokhttp3/Headers;->df(I)Ljava/lang/String;
 
@@ -134,7 +134,7 @@
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object p0
 
@@ -146,19 +146,19 @@
 
     if-eqz p0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v0, p0, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {p0}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object p0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v0, p0, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    invoke-virtual {p0}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {p0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object p0
 
@@ -296,15 +296,15 @@
 
     move-object/from16 v1, p0
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->btc:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->btm:Lokhttp3/internal/a/e;
 
     const/4 v2, 0x0
 
     if-eqz v0, :cond_0
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fu()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->FW()Lokhttp3/Response;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->FZ()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -322,19 +322,19 @@
 
     new-instance v0, Lokhttp3/internal/a/c$a;
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fu()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()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;->bsv:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
     if-nez v4, :cond_1
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
     invoke-direct {v4, v5, v2}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
@@ -346,34 +346,34 @@
     goto/16 :goto_11
 
     :cond_1
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
-    iget-object v4, v4, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v4, v4, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    invoke-virtual {v4}, Lokhttp3/s;->Fl()Z
+    invoke-virtual {v4}, Lokhttp3/s;->Fo()Z
 
     move-result v4
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    iget-object v4, v4, Lokhttp3/Response;->bss:Lokhttp3/r;
+    iget-object v4, v4, Lokhttp3/Response;->bsC:Lokhttp3/r;
 
     if-nez v4, :cond_2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA: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;->bsv:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
     invoke-static {v4, v5}, Lokhttp3/internal/a/c;->a(Lokhttp3/Response;Lokhttp3/w;)Z
 
@@ -383,24 +383,24 @@
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA: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;->bsq:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v4}, Lokhttp3/w;->FJ()Lokhttp3/d;
+    invoke-virtual {v4}, Lokhttp3/w;->FM()Lokhttp3/d;
 
     move-result-object v4
 
-    iget-boolean v5, v4, Lokhttp3/d;->bnp:Z
+    iget-boolean v5, v4, Lokhttp3/d;->bnz:Z
 
     if-nez v5, :cond_1b
 
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
     const-string v6, "If-Modified-Since"
 
@@ -435,21 +435,21 @@
     goto/16 :goto_10
 
     :cond_6
-    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    invoke-virtual {v5}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {v5}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object v5
 
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     const-wide/16 v11, 0x0
 
     if-eqz v7, :cond_7
 
-    iget-wide v13, v0, Lokhttp3/internal/a/c$a;->btq:J
+    iget-wide v13, v0, Lokhttp3/internal/a/c$a;->btA:J
 
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
@@ -467,7 +467,7 @@
     move-wide v13, v11
 
     :goto_4
-    iget v7, v0, Lokhttp3/internal/a/c$a;->bts:I
+    iget v7, v0, Lokhttp3/internal/a/c$a;->btC:I
 
     const/4 v15, -0x1
 
@@ -475,7 +475,7 @@
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v0, Lokhttp3/internal/a/c$a;->bts:I
+    iget v8, v0, Lokhttp3/internal/a/c$a;->btC:I
 
     move-object/from16 v17, v3
 
@@ -495,15 +495,15 @@
     move-object/from16 v17, v3
 
     :goto_5
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btq:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btA:J
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btp:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btz:J
 
     sub-long/2addr v2, v7
 
-    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btj:J
+    iget-wide v7, v0, Lokhttp3/internal/a/c$a;->btt:J
 
-    iget-wide v10, v0, Lokhttp3/internal/a/c$a;->btq:J
+    iget-wide v10, v0, Lokhttp3/internal/a/c$a;->btA:J
 
     sub-long/2addr v7, v10
 
@@ -511,19 +511,19 @@
 
     add-long/2addr v13, v7
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v3, v2, Lokhttp3/d;->bnr:I
+    iget v3, v2, Lokhttp3/d;->bnB:I
 
     if-eq v3, v15, :cond_9
 
     sget-object v3, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v2, v2, Lokhttp3/d;->bnr:I
+    iget v2, v2, Lokhttp3/d;->bnB:I
 
     int-to-long v7, v2
 
@@ -540,15 +540,15 @@
     goto :goto_b
 
     :cond_9
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bto:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
 
     if-eqz v2, :cond_c
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     if-eqz v2, :cond_a
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
@@ -557,10 +557,10 @@
     goto :goto_8
 
     :cond_a
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btq:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btA:J
 
     :goto_8
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bto:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
 
     invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
@@ -582,17 +582,17 @@
     goto :goto_7
 
     :cond_c
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
 
     if-eqz v2, :cond_f
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    iget-object v2, v2, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v2, v2, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v2, v2, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object v3, v2, Lokhttp3/s;->bqY:Ljava/util/List;
+    iget-object v3, v2, Lokhttp3/s;->bri:Ljava/util/List;
 
     if-nez v3, :cond_d
 
@@ -605,7 +605,7 @@
 
     invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, v2, Lokhttp3/s;->bqY:Ljava/util/List;
+    iget-object v2, v2, Lokhttp3/s;->bri:Ljava/util/List;
 
     invoke-static {v3, v2}, Lokhttp3/s;->b(Ljava/lang/StringBuilder;Ljava/util/List;)V
 
@@ -616,11 +616,11 @@
     :goto_9
     if-nez v2, :cond_f
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     if-eqz v2, :cond_e
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     invoke-virtual {v2}, Ljava/util/Date;->getTime()J
 
@@ -629,10 +629,10 @@
     goto :goto_a
 
     :cond_e
-    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btp:J
+    iget-wide v2, v0, Lokhttp3/internal/a/c$a;->btz:J
 
     :goto_a
-    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btm:Ljava/util/Date;
+    iget-object v7, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
 
     invoke-virtual {v7}, Ljava/util/Date;->getTime()J
 
@@ -659,13 +659,13 @@
     move-wide v2, v11
 
     :goto_b
-    iget v7, v4, Lokhttp3/d;->bnr:I
+    iget v7, v4, Lokhttp3/d;->bnB:I
 
     if-eq v7, v15, :cond_11
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v4, Lokhttp3/d;->bnr:I
+    iget v8, v4, Lokhttp3/d;->bnB:I
 
     int-to-long v11, v8
 
@@ -678,13 +678,13 @@
     move-result-wide v2
 
     :cond_11
-    iget v7, v4, Lokhttp3/d;->bnx:I
+    iget v7, v4, Lokhttp3/d;->bnH:I
 
     if-eq v7, v15, :cond_12
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v8, v4, Lokhttp3/d;->bnx:I
+    iget v8, v4, Lokhttp3/d;->bnH:I
 
     int-to-long v10, v8
 
@@ -698,17 +698,17 @@
     const-wide/16 v11, 0x0
 
     :goto_c
-    iget-boolean v7, v5, Lokhttp3/d;->bnv:Z
+    iget-boolean v7, v5, Lokhttp3/d;->bnF:Z
 
     if-nez v7, :cond_13
 
-    iget v7, v4, Lokhttp3/d;->bnw:I
+    iget v7, v4, Lokhttp3/d;->bnG:I
 
     if-eq v7, v15, :cond_13
 
     sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
 
-    iget v4, v4, Lokhttp3/d;->bnw:I
+    iget v4, v4, Lokhttp3/d;->bnG:I
 
     move-object v10, v9
 
@@ -728,7 +728,7 @@
     const-wide/16 v18, 0x0
 
     :goto_d
-    iget-boolean v4, v5, Lokhttp3/d;->bnp:Z
+    iget-boolean v4, v5, Lokhttp3/d;->bnz:Z
 
     if-nez v4, :cond_17
 
@@ -740,9 +740,9 @@
 
     if-gez v4, :cond_17
 
-    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    invoke-virtual {v4}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v4
 
@@ -763,17 +763,17 @@
 
     if-lez v6, :cond_16
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FJ()Lokhttp3/d;
+    invoke-virtual {v2}, Lokhttp3/Response;->FM()Lokhttp3/d;
 
     move-result-object v2
 
-    iget v2, v2, Lokhttp3/d;->bnr:I
+    iget v2, v2, Lokhttp3/d;->bnB:I
 
     if-ne v2, v15, :cond_15
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bto:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
 
     if-nez v2, :cond_15
 
@@ -794,7 +794,7 @@
     :cond_16
     new-instance v2, Lokhttp3/internal/a/c;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v3
 
@@ -809,52 +809,52 @@
     goto :goto_11
 
     :cond_17
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btr:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btB:Ljava/lang/String;
 
     if-eqz v2, :cond_18
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btr:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btB:Ljava/lang/String;
 
     move-object v6, v10
 
     goto :goto_f
 
     :cond_18
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btm:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
 
     if-eqz v2, :cond_19
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btn:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btx:Ljava/lang/String;
 
     goto :goto_f
 
     :cond_19
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
     if-eqz v2, :cond_1a
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btl:Ljava/lang/String;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->btv:Ljava/lang/String;
 
     :goto_f
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
-    iget-object v3, v3, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v3, v3, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
-    invoke-virtual {v3}, Lokhttp3/Headers;->Fi()Lokhttp3/Headers$a;
+    invoke-virtual {v3}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
 
     move-result-object v3
 
-    sget-object v4, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v4, Lokhttp3/internal/a;->bsV: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;->bsq:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v2}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {v2}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object v2
 
-    invoke-virtual {v3}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v3}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -862,13 +862,13 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v2}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object v2
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iget-object v3, v0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
     invoke-direct {v4, v2, v3}, Lokhttp3/internal/a/c;-><init>(Lokhttp3/w;Lokhttp3/Response;)V
 
@@ -879,7 +879,7 @@
     :cond_1a
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
     const/4 v3, 0x0
 
@@ -895,22 +895,22 @@
 
     new-instance v4, Lokhttp3/internal/a/c;
 
-    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v2, v0, Lokhttp3/internal/a/c$a;->bsA: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;->bti:Lokhttp3/w;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->bts:Lokhttp3/w;
 
     if-eqz v2, :cond_1c
 
-    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v0}, Lokhttp3/w;->FJ()Lokhttp3/d;
+    invoke-virtual {v0}, Lokhttp3/w;->FM()Lokhttp3/d;
 
     move-result-object v0
 
-    iget-boolean v0, v0, Lokhttp3/d;->bny:Z
+    iget-boolean v0, v0, Lokhttp3/d;->bnI:Z
 
     if-eqz v0, :cond_1c
 
@@ -919,9 +919,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;->bti:Lokhttp3/w;
+    iget-object v0, v4, Lokhttp3/internal/a/c;->bts:Lokhttp3/w;
 
-    iget-object v2, v4, Lokhttp3/internal/a/c;->bsv:Lokhttp3/Response;
+    iget-object v2, v4, Lokhttp3/internal/a/c;->bsF:Lokhttp3/Response;
 
     if-eqz v17, :cond_1d
 
@@ -929,7 +929,7 @@
 
     move-object/from16 v3, v17
 
-    iget-object v4, v3, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v4, v3, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-static {v4}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -947,15 +947,15 @@
 
     invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
 
-    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fu()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v2
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object v2, v0, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    sget-object v2, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bsb:Lokhttp3/u;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iput-object v2, v0, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
 
     const/16 v2, 0x1f8
 
@@ -965,21 +965,21 @@
 
     iput-object v2, v0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    sget-object v2, Lokhttp3/internal/c;->bsN:Lokhttp3/x;
+    sget-object v2, Lokhttp3/internal/c;->bsX:Lokhttp3/x;
 
-    iput-object v2, v0, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v2, v0, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
     const-wide/16 v2, -0x1
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->bsx:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bsH:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v2
 
-    iput-wide v2, v0, Lokhttp3/Response$a;->bsy:J
+    iput-wide v2, v0, Lokhttp3/Response$a;->bsI:J
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -988,7 +988,7 @@
     :cond_1e
     if-nez v0, :cond_1f
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v0
 
@@ -1000,7 +1000,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -1020,7 +1020,7 @@
 
     if-eqz v3, :cond_20
 
-    iget-object v3, v3, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v3, v3, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -1033,13 +1033,13 @@
 
     if-ne v3, v5, :cond_21
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v3, v2, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
-    iget-object v5, v4, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v5, v4, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     invoke-static {v3, v5}, Lokhttp3/internal/a/a;->a(Lokhttp3/Headers;Lokhttp3/Headers;)Lokhttp3/Headers;
 
@@ -1049,13 +1049,13 @@
 
     move-result-object v0
 
-    iget-wide v5, v4, Lokhttp3/Response;->bsx:J
+    iget-wide v5, v4, Lokhttp3/Response;->bsH:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->bsx:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bsH:J
 
-    iget-wide v5, v4, Lokhttp3/Response;->bsy:J
+    iget-wide v5, v4, Lokhttp3/Response;->bsI:J
 
-    iput-wide v5, v0, Lokhttp3/Response$a;->bsy:J
+    iput-wide v5, v0, Lokhttp3/Response$a;->bsI:J
 
     invoke-static {v2}, Lokhttp3/internal/a/a;->d(Lokhttp3/Response;)Lokhttp3/Response;
 
@@ -1073,23 +1073,23 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v0
 
-    iget-object v2, v4, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v2, v4, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-virtual {v2}, Lokhttp3/x;->close()V
 
     return-object v0
 
     :cond_21
-    iget-object v3, v2, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-static {v3}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
     :cond_22
-    invoke-virtual {v4}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v4}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v3
 
@@ -1109,11 +1109,11 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, v1, Lokhttp3/internal/a/a;->btc:Lokhttp3/internal/a/e;
+    iget-object v3, v1, Lokhttp3/internal/a/a;->btm:Lokhttp3/internal/a/e;
 
     if-eqz v3, :cond_26
 
@@ -1129,9 +1129,9 @@
 
     if-eqz v3, :cond_25
 
-    iget-object v0, v1, Lokhttp3/internal/a/a;->btc:Lokhttp3/internal/a/e;
+    iget-object v0, v1, Lokhttp3/internal/a/a;->btm:Lokhttp3/internal/a/e;
 
-    invoke-interface {v0}, Lokhttp3/internal/a/e;->FX()Lokhttp3/internal/a/b;
+    invoke-interface {v0}, Lokhttp3/internal/a/e;->Ga()Lokhttp3/internal/a/b;
 
     move-result-object v0
 
@@ -1140,7 +1140,7 @@
     return-object v2
 
     :cond_23
-    invoke-interface {v0}, Lokhttp3/internal/a/b;->FS()Lokio/q;
+    invoke-interface {v0}, Lokhttp3/internal/a/b;->FV()Lokio/q;
 
     move-result-object v3
 
@@ -1149,9 +1149,9 @@
     return-object v2
 
     :cond_24
-    iget-object v4, v2, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v4, v2, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {v4}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v4
 
@@ -1169,13 +1169,13 @@
 
     move-result-object v0
 
-    iget-object v3, v2, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v3, v2, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     invoke-virtual {v3}, Lokhttp3/x;->contentLength()J
 
     move-result-wide v3
 
-    invoke-virtual {v2}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v2}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v2
 
@@ -1187,16 +1187,16 @@
 
     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;->bst:Lokhttp3/x;
+    iput-object v6, v2, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v0
 
     return-object v0
 
     :cond_25
-    iget-object v0, v0, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     const-string v3, "POST"
 
@@ -1244,7 +1244,7 @@
 
     if-eqz v3, :cond_27
 
-    iget-object v0, v3, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v0, v3, Lokhttp3/Response;->bsD: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 b9da648d06..15bf695897 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 FS()Lokio/q;
+.method public abstract FV()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 37dfea8ed1..4f7e4d7415 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 bsq:Lokhttp3/w;
+.field final bsA:Lokhttp3/w;
 
-.field final bsv:Lokhttp3/Response;
+.field final bsF:Lokhttp3/Response;
 
-.field final btj:J
+.field btA:J
 
-.field btk:Ljava/util/Date;
+.field btB:Ljava/lang/String;
 
-.field btl:Ljava/lang/String;
+.field btC:I
 
-.field btm:Ljava/util/Date;
+.field final btt:J
 
-.field btn:Ljava/lang/String;
+.field btu:Ljava/util/Date;
 
-.field bto:Ljava/util/Date;
+.field btv:Ljava/lang/String;
 
-.field btp:J
+.field btw:Ljava/util/Date;
 
-.field btq:J
+.field btx:Ljava/lang/String;
 
-.field btr:Ljava/lang/String;
+.field bty:Ljava/util/Date;
 
-.field bts:I
+.field btz:J
 
 
 # direct methods
@@ -48,29 +48,29 @@
 
     const/4 v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/a/c$a;->bts:I
+    iput v0, p0, Lokhttp3/internal/a/c$a;->btC:I
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btj:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btt:J
 
-    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bsq:Lokhttp3/w;
+    iput-object p3, p0, Lokhttp3/internal/a/c$a;->bsA:Lokhttp3/w;
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bsv:Lokhttp3/Response;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bsF:Lokhttp3/Response;
 
     if-eqz p4, :cond_5
 
-    iget-wide p1, p4, Lokhttp3/Response;->bsx:J
+    iget-wide p1, p4, Lokhttp3/Response;->bsH:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btp:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btz:J
 
-    iget-wide p1, p4, Lokhttp3/Response;->bsy:J
+    iget-wide p1, p4, Lokhttp3/Response;->bsI:J
 
-    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btq:J
+    iput-wide p1, p0, Lokhttp3/internal/a/c$a;->btA:J
 
-    iget-object p1, p4, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object p1, p4, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     const/4 p2, 0x0
 
-    iget-object p3, p1, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object p3, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length p3, p3
 
@@ -99,9 +99,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btk:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btu:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btl:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btv:Ljava/lang/String;
 
     goto :goto_1
 
@@ -118,7 +118,7 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bto:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->bty:Ljava/util/Date;
 
     goto :goto_1
 
@@ -135,9 +135,9 @@
 
     move-result-object p4
 
-    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btm:Ljava/util/Date;
+    iput-object p4, p0, Lokhttp3/internal/a/c$a;->btw:Ljava/util/Date;
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btn:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btx:Ljava/lang/String;
 
     goto :goto_1
 
@@ -150,7 +150,7 @@
 
     if-eqz v2, :cond_3
 
-    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btr:Ljava/lang/String;
+    iput-object v1, p0, Lokhttp3/internal/a/c$a;->btB:Ljava/lang/String;
 
     goto :goto_1
 
@@ -167,7 +167,7 @@
 
     move-result p4
 
-    iput p4, p0, Lokhttp3/internal/a/c$a;->bts:I
+    iput p4, p0, Lokhttp3/internal/a/c$a;->btC: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 af2d7f6396..c6266c30c7 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 btB:Lokhttp3/internal/a/d$b;
+.field final btL:Lokhttp3/internal/a/d$b;
 
-.field final synthetic btC:Lokhttp3/internal/a/d;
+.field final synthetic btM: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 a760efbba7..ea1062cd63 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 btD:[J
+.field final btN:[J
 
-.field final btE:[Ljava/io/File;
+.field final btO:[Ljava/io/File;
 
-.field final btF:[Ljava/io/File;
+.field final btP:[Ljava/io/File;
 
-.field btG:Z
+.field btQ:Z
 
-.field btH:Lokhttp3/internal/a/d$a;
+.field btR: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;->btD:[J
+    iget-object v0, p0, Lokhttp3/internal/a/d$b;->btN:[J
 
     array-length v1, v0
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/a/d.smali b/com.discord/smali_classes2/okhttp3/internal/a/d.smali
index cc9be0c55b..1720e65367 100644
--- a/com.discord/smali_classes2/okhttp3/internal/a/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/a/d.smali
@@ -19,23 +19,21 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field static final btt:Ljava/util/regex/Pattern;
+.field static final btD:Ljava/util/regex/Pattern;
 
 
 # instance fields
-.field private final bqa:Ljava/lang/Runnable;
+.field private final bqk:Ljava/lang/Runnable;
 
-.field btA:Z
+.field final btE:Lokhttp3/internal/f/a;
 
-.field final btu:Lokhttp3/internal/f/a;
+.field private btF:J
 
-.field private btv:J
+.field final btG:I
 
-.field final btw:I
+.field btH:Lokio/BufferedSink;
 
-.field btx:Lokio/BufferedSink;
-
-.field final bty:Ljava/util/LinkedHashMap;
+.field final btI:Ljava/util/LinkedHashMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/LinkedHashMap<",
@@ -46,7 +44,9 @@
     .end annotation
 .end field
 
-.field btz:I
+.field btJ:I
+
+.field btK:Z
 
 .field private final executor:Ljava/util/concurrent/Executor;
 
@@ -67,21 +67,21 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/a/d;->btt:Ljava/util/regex/Pattern;
+    sput-object v0, Lokhttp3/internal/a/d;->btD:Ljava/util/regex/Pattern;
 
     return-void
 .end method
 
-.method private FT()Z
+.method private FW()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/a/d;->btz:I
+    iget v0, p0, Lokhttp3/internal/a/d;->btJ:I
 
     const/16 v1, 0x7d0
 
     if-lt v0, v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/a/d;->bty:Ljava/util/LinkedHashMap;
+    iget-object v1, p0, Lokhttp3/internal/a/d;->btI:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v1}, Ljava/util/LinkedHashMap;->size()I
 
@@ -99,7 +99,7 @@
     return v0
 .end method
 
-.method private declared-synchronized FU()V
+.method private declared-synchronized FX()V
     .locals 2
 
     monitor-enter p0
@@ -137,7 +137,7 @@
     throw v0
 .end method
 
-.method private FV()V
+.method private FY()V
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -148,13 +148,13 @@
     :goto_0
     iget-wide v0, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-wide v2, p0, Lokhttp3/internal/a/d;->btv:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->btF:J
 
     cmp-long v4, v0, v2
 
     if-lez v4, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bty:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btI:Ljava/util/LinkedHashMap;
 
     invoke-virtual {v0}, Ljava/util/LinkedHashMap;->values()Ljava/util/Collection;
 
@@ -177,7 +177,7 @@
     :cond_0
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/a/d;->btA:Z
+    iput-boolean v0, p0, Lokhttp3/internal/a/d;->btK:Z
 
     return-void
 .end method
@@ -193,9 +193,9 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p1, Lokhttp3/internal/a/d$a;->btB:Lokhttp3/internal/a/d$b;
+    iget-object v0, p1, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
 
-    iget-object v1, v0, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v1, v0, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
     if-ne v1, p1, :cond_4
 
@@ -204,15 +204,15 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/a/d;->btw:I
+    iget v2, p0, Lokhttp3/internal/a/d;->btG:I
 
     if-ge v1, v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$b;->btF:[Ljava/io/File;
+    iget-object v2, v0, Lokhttp3/internal/a/d$b;->btP:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
-    iget-object v3, p0, Lokhttp3/internal/a/d;->btu:Lokhttp3/internal/f/a;
+    iget-object v3, p0, Lokhttp3/internal/a/d;->btE:Lokhttp3/internal/f/a;
 
     invoke-interface {v3, v2}, Lokhttp3/internal/f/a;->B(Ljava/io/File;)V
 
@@ -221,19 +221,19 @@
     goto :goto_0
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/a/d;->btz:I
+    iget v1, p0, Lokhttp3/internal/a/d;->btJ:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/a/d;->btz:I
+    iput v1, p0, Lokhttp3/internal/a/d;->btJ:I
 
     const/4 v1, 0x0
 
-    iput-object v1, v0, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iput-object v1, v0, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
-    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->btG:Z
+    iget-boolean v1, v0, Lokhttp3/internal/a/d$b;->btQ:Z
 
     or-int/2addr p1, v1
 
@@ -243,9 +243,9 @@
 
     if-eqz p1, :cond_1
 
-    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->btG:Z
+    iput-boolean v2, v0, Lokhttp3/internal/a/d$b;->btQ:Z
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     const-string v2, "CLEAN"
 
@@ -255,30 +255,30 @@
 
     invoke-interface {p1, v3}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH: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;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/a/d$b;->a(Lokio/BufferedSink;)V
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lokhttp3/internal/a/d;->bty:Ljava/util/LinkedHashMap;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btI: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;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     const-string v2, "REMOVE"
 
@@ -288,30 +288,30 @@
 
     invoke-interface {p1, v3}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH: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;
 
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
     :goto_1
-    iget-object p1, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/a/d;->btH: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;->btv:J
+    iget-wide v2, p0, Lokhttp3/internal/a/d;->btF:J
 
     cmp-long p1, v0, v2
 
     if-gtz p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->FT()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FW()Z
 
     move-result p1
 
@@ -320,7 +320,7 @@
     :cond_2
     iget-object p1, p0, Lokhttp3/internal/a/d;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bqa:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bqk:Ljava/lang/Runnable;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
     :try_end_0
@@ -363,37 +363,37 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
-    iget-object v2, v0, Lokhttp3/internal/a/d$a;->btB:Lokhttp3/internal/a/d$b;
+    iget-object v2, v0, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
 
-    iget-object v2, v2, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v2, v2, Lokhttp3/internal/a/d$b;->btR: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;->btC:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->btM:Lokhttp3/internal/a/d;
 
-    iget v3, v3, Lokhttp3/internal/a/d;->btw:I
+    iget v3, v3, Lokhttp3/internal/a/d;->btG:I
 
     if-ge v2, v3, :cond_0
 
     :try_start_0
-    iget-object v3, v0, Lokhttp3/internal/a/d$a;->btC:Lokhttp3/internal/a/d;
+    iget-object v3, v0, Lokhttp3/internal/a/d$a;->btM:Lokhttp3/internal/a/d;
 
-    iget-object v3, v3, Lokhttp3/internal/a/d;->btu:Lokhttp3/internal/f/a;
+    iget-object v3, v3, Lokhttp3/internal/a/d;->btE:Lokhttp3/internal/f/a;
 
-    iget-object v4, v0, Lokhttp3/internal/a/d$a;->btB:Lokhttp3/internal/a/d$b;
+    iget-object v4, v0, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btF:[Ljava/io/File;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btP:[Ljava/io/File;
 
     aget-object v4, v4, v2
 
@@ -407,21 +407,21 @@
     goto :goto_0
 
     :cond_0
-    iget-object v0, v0, Lokhttp3/internal/a/d$a;->btB:Lokhttp3/internal/a/d$b;
+    iget-object v0, v0, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iput-object v2, v0, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
     :cond_1
     :goto_1
-    iget v0, p0, Lokhttp3/internal/a/d;->btw:I
+    iget v0, p0, Lokhttp3/internal/a/d;->btG:I
 
     if-ge v1, v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btu:Lokhttp3/internal/f/a;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btE:Lokhttp3/internal/f/a;
 
-    iget-object v2, p1, Lokhttp3/internal/a/d$b;->btE:[Ljava/io/File;
+    iget-object v2, p1, Lokhttp3/internal/a/d$b;->btO:[Ljava/io/File;
 
     aget-object v2, v2, v1
 
@@ -429,7 +429,7 @@
 
     iget-wide v2, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btD:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btN:[J
 
     aget-wide v4, v0, v1
 
@@ -437,7 +437,7 @@
 
     iput-wide v2, p0, Lokhttp3/internal/a/d;->size:J
 
-    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btD:[J
+    iget-object v0, p1, Lokhttp3/internal/a/d$b;->btN:[J
 
     const-wide/16 v2, 0x0
 
@@ -448,15 +448,15 @@
     goto :goto_1
 
     :cond_2
-    iget v0, p0, Lokhttp3/internal/a/d;->btz:I
+    iget v0, p0, Lokhttp3/internal/a/d;->btJ:I
 
     const/4 v1, 0x1
 
     add-int/2addr v0, v1
 
-    iput v0, p0, Lokhttp3/internal/a/d;->btz:I
+    iput v0, p0, Lokhttp3/internal/a/d;->btJ:I
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     const-string v2, "REMOVE"
 
@@ -480,13 +480,13 @@
 
     invoke-interface {v0, v2}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bty:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btI: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;->FT()Z
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FW()Z
 
     move-result p1
 
@@ -494,7 +494,7 @@
 
     iget-object p1, p0, Lokhttp3/internal/a/d;->executor:Ljava/util/concurrent/Executor;
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bqa:Ljava/lang/Runnable;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->bqk:Ljava/lang/Runnable;
 
     invoke-interface {p1, v0}, Ljava/util/concurrent/Executor;->execute(Ljava/lang/Runnable;)V
 
@@ -550,13 +550,13 @@
     goto :goto_2
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/a/d;->bty:Ljava/util/LinkedHashMap;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btI: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;->bty:Ljava/util/LinkedHashMap;
+    iget-object v2, p0, Lokhttp3/internal/a/d;->btI: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;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v5, v4, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
     if-eqz v5, :cond_3
 
-    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v4, v4, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
-    iget-object v5, v4, Lokhttp3/internal/a/d$a;->btC:Lokhttp3/internal/a/d;
+    iget-object v5, v4, Lokhttp3/internal/a/d$a;->btM: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;->btB:Lokhttp3/internal/a/d$b;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->btL:Lokhttp3/internal/a/d$b;
 
-    iget-object v6, v6, Lokhttp3/internal/a/d$b;->btH:Lokhttp3/internal/a/d$a;
+    iget-object v6, v6, Lokhttp3/internal/a/d$b;->btR:Lokhttp3/internal/a/d$a;
 
     if-ne v6, v4, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/a/d$a;->btC:Lokhttp3/internal/a/d;
+    iget-object v6, v4, Lokhttp3/internal/a/d$a;->btM:Lokhttp3/internal/a/d;
 
     invoke-direct {v6, v4}, Lokhttp3/internal/a/d;->a(Lokhttp3/internal/a/d$a;)V
 
@@ -637,15 +637,15 @@
     goto :goto_0
 
     :cond_4
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->FV()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FY()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->close()V
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iput-object v0, p0, Lokhttp3/internal/a/d;->btH:Lokio/BufferedSink;
 
     iput-boolean v1, p0, Lokhttp3/internal/a/d;->w:Z
     :try_end_2
@@ -703,11 +703,11 @@
 
     :cond_0
     :try_start_1
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->FU()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FX()V
 
-    invoke-direct {p0}, Lokhttp3/internal/a/d;->FV()V
+    invoke-direct {p0}, Lokhttp3/internal/a/d;->FY()V
 
-    iget-object v0, p0, Lokhttp3/internal/a/d;->btx:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/a/d;->btH: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 d7dfdeaad3..7e8795228f 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 FW()Lokhttp3/Response;
+.method public abstract FZ()Lokhttp3/Response;
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract FX()Lokhttp3/internal/a/b;
+.method public abstract Ga()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 7fcd21ba1d..a754f7e3a7 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 brX:Lokhttp3/t;
+.field public final bsh:Lokhttp3/t;
 
 
 # direct methods
@@ -16,7 +16,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/b/a;->brX:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/b/a;->bsh:Lokhttp3/t;
 
     return-void
 .end method
@@ -35,11 +35,11 @@
 
     check-cast v0, Lokhttp3/internal/c/g;
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->bsq:Lokhttp3/w;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
 
-    iget-object v2, v0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/g;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
 
-    iget-object v3, v1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v3, v1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     const-string v4, "GET"
 
@@ -49,13 +49,13 @@
 
     xor-int/lit8 v3, v3, 0x1
 
-    iget-object v4, p0, Lokhttp3/internal/b/a;->brX:Lokhttp3/t;
+    iget-object v4, p0, Lokhttp3/internal/b/a;->bsh: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;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {v2}, Lokhttp3/internal/b/g;->Gg()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 f193b3e6f5..0f3d9b1bf7 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 bnf:Ljava/util/List;
+.field private final bnp:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -14,11 +14,11 @@
     .end annotation
 .end field
 
-.field private btI:I
+.field private btS:I
 
-.field btJ:Z
+.field btT:Z
 
-.field btK:Z
+.field btU:Z
 
 
 # direct methods
@@ -37,9 +37,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/b;->btI:I
+    iput v0, p0, Lokhttp3/internal/b/b;->btS:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/b;->bnf:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/b;->bnp: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;->btI:I
+    iget v0, p0, Lokhttp3/internal/b/b;->btS:I
 
     :goto_0
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bnf:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bnp: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;->bnf:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bnp: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;->btI:I
+    iget v0, p0, Lokhttp3/internal/b/b;->btS:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/b;->bnf:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/b;->bnp: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;->bnf:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bnp: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;->btI:I
+    iput v0, p0, Lokhttp3/internal/b/b;->btS:I
 
     goto :goto_1
 
@@ -143,11 +143,11 @@
 
     move-result v0
 
-    iput-boolean v0, p0, Lokhttp3/internal/b/b;->btJ:Z
+    iput-boolean v0, p0, Lokhttp3/internal/b/b;->btT:Z
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-boolean v1, p0, Lokhttp3/internal/b/b;->btK:Z
+    iget-boolean v1, p0, Lokhttp3/internal/b/b;->btU: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;->btK:Z
+    iget-boolean v2, p0, Lokhttp3/internal/b/b;->btU: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;->bnf:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/b;->bnp: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 a5e5453749..e71e6318cf 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 btV:Lokhttp3/internal/b/g;
+.field final synthetic buf:Lokhttp3/internal/b/g;
 
-.field final synthetic btW:Lokhttp3/internal/b/c;
+.field final synthetic bug: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;->btW:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/c$1;->bug:Lokhttp3/internal/b/c;
 
-    iput-object p4, p0, Lokhttp3/internal/b/c$1;->btV:Lokhttp3/internal/b/g;
+    iput-object p4, p0, Lokhttp3/internal/b/c$1;->buf:Lokhttp3/internal/b/g;
 
     const/4 p1, 0x1
 
@@ -45,9 +45,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/b/c$1;->btV:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/b/c$1;->buf:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gb()Lokhttp3/internal/c/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Ge()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 d8385623c5..04e6cc11e2 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 btX:Ljava/util/Set;
+.field private final buh: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;->btX:Ljava/util/Set;
+    iput-object v0, p0, Lokhttp3/internal/b/d;->buh: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;->btX:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->buh: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;->btX:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->buh: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;->btX:Ljava/util/Set;
+    iget-object v0, p0, Lokhttp3/internal/b/d;->buh: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 b22fe69db1..4c160a071f 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 bud:Ljava/util/List;
+.field final bun:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field bue:I
+.field buo:I
 
 
 # direct methods
@@ -44,9 +44,9 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/b/f$a;->bue:I
+    iput v0, p0, Lokhttp3/internal/b/f$a;->buo:I
 
-    iput-object p1, p0, Lokhttp3/internal/b/f$a;->bud:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f$a;->bun: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;->bue:I
+    iget v0, p0, Lokhttp3/internal/b/f$a;->buo:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f$a;->bud:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f$a;->bun: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 d32d77a21b..2214e551dc 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 bqc:Lokhttp3/internal/b/d;
+.field final bqm:Lokhttp3/internal/b/d;
 
-.field final bsD:Lokhttp3/a;
+.field final bsN:Lokhttp3/a;
 
-.field private final bsa:Lokhttp3/p;
+.field private final bsk:Lokhttp3/p;
 
-.field private final btY:Lokhttp3/e;
+.field private final bui:Lokhttp3/e;
 
-.field private btZ:Ljava/util/List;
+.field private buj:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -30,9 +30,9 @@
     .end annotation
 .end field
 
-.field private bua:I
+.field private buk:I
 
-.field private bub:Ljava/util/List;
+.field private bul:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field private final buc:Ljava/util/List;
+.field private final bum: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;->btZ:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->buj:Ljava/util/List;
 
     invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
 
     move-result-object v0
 
-    iput-object v0, p0, Lokhttp3/internal/b/f;->bub:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bul: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;->buc:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bum:Ljava/util/List;
 
-    iput-object p1, p0, Lokhttp3/internal/b/f;->bsD:Lokhttp3/a;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iput-object p2, p0, Lokhttp3/internal/b/f;->bqc:Lokhttp3/internal/b/d;
+    iput-object p2, p0, Lokhttp3/internal/b/f;->bqm:Lokhttp3/internal/b/d;
 
-    iput-object p3, p0, Lokhttp3/internal/b/f;->btY:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/f;->bui:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/f;->bsa:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/f;->bsk:Lokhttp3/p;
 
-    iget-object p2, p1, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object p2, p1, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/a;->bnh:Ljava/net/Proxy;
+    iget-object p1, p1, Lokhttp3/a;->bnr:Ljava/net/Proxy;
 
     const/4 p3, 0x0
 
@@ -100,11 +100,11 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/b/f;->bsD:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object p1, p1, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object p1, p1, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
-    invoke-virtual {p2}, Lokhttp3/s;->Fk()Ljava/net/URI;
+    invoke-virtual {p2}, Lokhttp3/s;->Fn()Ljava/net/URI;
 
     move-result-object p2
 
@@ -140,19 +140,19 @@
     move-result-object p1
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/b/f;->btZ:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/b/f;->buj:Ljava/util/List;
 
-    iput p3, p0, Lokhttp3/internal/b/f;->bua:I
+    iput p3, p0, Lokhttp3/internal/b/f;->buk:I
 
     return-void
 .end method
 
-.method private Ga()Z
+.method private Gd()Z
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/b/f;->bua:I
+    iget v0, p0, Lokhttp3/internal/b/f;->buk:I
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->btZ:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->buj: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;->bub:Ljava/util/List;
+    iput-object v0, p0, Lokhttp3/internal/b/f;->bul: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;->bsD:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v1, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, v0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->bsD:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v0, v0, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/a;->bnk: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;->bub:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bul:Ljava/util/List;
 
     invoke-static {v1, v0}, Ljava/net/InetSocketAddress;->createUnresolved(Ljava/lang/String;I)Ljava/net/InetSocketAddress;
 
@@ -300,9 +300,9 @@
     return-void
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/b/f;->bsD:Lokhttp3/a;
+    iget-object p1, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object p1, p1, Lokhttp3/a;->bnb:Lokhttp3/o;
+    iget-object p1, p1, Lokhttp3/a;->bnl:Lokhttp3/o;
 
     invoke-interface {p1, v1}, Lokhttp3/o;->dz(Ljava/lang/String;)Ljava/util/List;
 
@@ -329,7 +329,7 @@
 
     check-cast v3, Ljava/net/InetAddress;
 
-    iget-object v4, p0, Lokhttp3/internal/b/f;->bub:Ljava/util/List;
+    iget-object v4, p0, Lokhttp3/internal/b/f;->bul: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;->bsD:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bnb:Lokhttp3/o;
+    iget-object v2, v2, Lokhttp3/a;->bnl: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 FZ()Lokhttp3/internal/b/f$a;
+.method public final Gc()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;->Ga()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gd()Z
 
     move-result v1
 
     if-eqz v1, :cond_4
 
-    invoke-direct {p0}, Lokhttp3/internal/b/f;->Ga()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gd()Z
 
     move-result v1
 
     if-eqz v1, :cond_3
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->btZ:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->buj:Ljava/util/List;
 
-    iget v2, p0, Lokhttp3/internal/b/f;->bua:I
+    iget v2, p0, Lokhttp3/internal/b/f;->buk:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lokhttp3/internal/b/f;->bua:I
+    iput v3, p0, Lokhttp3/internal/b/f;->buk: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;->bub:Ljava/util/List;
+    iget-object v3, p0, Lokhttp3/internal/b/f;->bul: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;->bsD:Lokhttp3/a;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v6, p0, Lokhttp3/internal/b/f;->bub:Ljava/util/List;
+    iget-object v6, p0, Lokhttp3/internal/b/f;->bul: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;->bqc:Lokhttp3/internal/b/d;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bqm: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;->buc:Ljava/util/List;
+    iget-object v5, p0, Lokhttp3/internal/b/f;->bum: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;->bsD:Lokhttp3/a;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v2, v2, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v2, v2, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    iget-object v2, v2, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v2, v2, Lokhttp3/s;->brg: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;->btZ:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/b/f;->buj: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;->buc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bum:Ljava/util/List;
 
     invoke-interface {v0, v1}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/f;->buc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/b/f;->bum: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;->Ga()Z
+    invoke-direct {p0}, Lokhttp3/internal/b/f;->Gd()Z
 
     move-result v0
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/b/f;->buc:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/b/f;->bum: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 371de04f6f..1d69d91a0b 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 bug:Ljava/lang/Object;
+.field public final buq: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;->bug:Ljava/lang/Object;
+    iput-object p2, p0, Lokhttp3/internal/b/g$a;->buq: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 c4d2d2aa41..34ffa9c728 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 brH:Lokhttp3/j;
+.field public final brR:Lokhttp3/j;
 
-.field public final bsD:Lokhttp3/a;
+.field public final bsN:Lokhttp3/a;
 
-.field public final bsa:Lokhttp3/p;
+.field public final bsk:Lokhttp3/p;
 
-.field public btL:Lokhttp3/y;
+.field public btV:Lokhttp3/y;
 
-.field public final btY:Lokhttp3/e;
+.field public final bui:Lokhttp3/e;
 
-.field private buf:Lokhttp3/internal/b/f$a;
+.field private bup:Lokhttp3/internal/b/f$a;
 
-.field private final bug:Ljava/lang/Object;
+.field private final buq:Ljava/lang/Object;
 
-.field private final buh:Lokhttp3/internal/b/f;
+.field private final bur:Lokhttp3/internal/b/f;
 
-.field private bui:I
+.field private bus:I
 
-.field public buj:Lokhttp3/internal/b/c;
+.field public but:Lokhttp3/internal/b/c;
 
-.field private buk:Z
+.field private buu:Z
 
-.field private bul:Z
+.field private buv:Z
 
-.field public bum:Lokhttp3/internal/c/c;
+.field public buw: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;->brH:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
-    iput-object p2, p0, Lokhttp3/internal/b/g;->bsD:Lokhttp3/a;
+    iput-object p2, p0, Lokhttp3/internal/b/g;->bsN:Lokhttp3/a;
 
-    iput-object p3, p0, Lokhttp3/internal/b/g;->btY:Lokhttp3/e;
+    iput-object p3, p0, Lokhttp3/internal/b/g;->bui:Lokhttp3/e;
 
-    iput-object p4, p0, Lokhttp3/internal/b/g;->bsa:Lokhttp3/p;
+    iput-object p4, p0, Lokhttp3/internal/b/g;->bsk:Lokhttp3/p;
 
     new-instance p1, Lokhttp3/internal/b/f;
 
-    invoke-direct {p0}, Lokhttp3/internal/b/g;->Gc()Lokhttp3/internal/b/d;
+    invoke-direct {p0}, Lokhttp3/internal/b/g;->Gf()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;->buh:Lokhttp3/internal/b/f;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/b/f;
 
-    iput-object p5, p0, Lokhttp3/internal/b/g;->bug:Ljava/lang/Object;
+    iput-object p5, p0, Lokhttp3/internal/b/g;->buq:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method private Gc()Lokhttp3/internal/b/d;
+.method private Gf()Lokhttp3/internal/b/d;
     .locals 2
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->brR: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;->brH:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v2
 
@@ -113,15 +113,15 @@
 
     if-nez v0, :cond_11
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/c/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
 
     if-nez v0, :cond_10
 
-    iget-boolean v0, v1, Lokhttp3/internal/b/g;->bul:Z
+    iget-boolean v0, v1, Lokhttp3/internal/b/g;->buv:Z
 
     if-nez v0, :cond_f
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->but: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;->btQ:Z
+    iget-boolean v0, v0, Lokhttp3/internal/b/c;->bua:Z
 
     if-eqz v0, :cond_0
 
@@ -145,11 +145,11 @@
     move-object v0, v3
 
     :goto_0
-    iget-object v6, v1, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     goto :goto_1
 
@@ -159,19 +159,19 @@
     :goto_1
     if-nez v6, :cond_3
 
-    sget-object v7, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v7, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v8, v1, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v8, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
-    iget-object v9, v1, Lokhttp3/internal/b/g;->bsD:Lokhttp3/a;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->bsN: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;->buj:Lokhttp3/internal/b/c;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     if-eqz v7, :cond_2
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->but: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;->btL:Lokhttp3/y;
+    iget-object v7, v1, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
     goto :goto_2
 
@@ -204,7 +204,7 @@
     :cond_4
     if-nez v7, :cond_6
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->buf:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bup: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;->buh:Lokhttp3/internal/b/f;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/b/f;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/f;->FZ()Lokhttp3/internal/b/f$a;
+    invoke-virtual {v0}, Lokhttp3/internal/b/f;->Gc()Lokhttp3/internal/b/f$a;
 
     move-result-object v0
 
-    iput-object v0, v1, Lokhttp3/internal/b/g;->buf:Lokhttp3/internal/b/f$a;
+    iput-object v0, v1, Lokhttp3/internal/b/g;->bup: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;->brH:Lokhttp3/j;
+    iget-object v9, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v9
 
     :try_start_1
-    iget-boolean v2, v1, Lokhttp3/internal/b/g;->bul:Z
+    iget-boolean v2, v1, Lokhttp3/internal/b/g;->buv:Z
 
     if-nez v2, :cond_e
 
     if-eqz v0, :cond_8
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->buf:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bup:Lokhttp3/internal/b/f$a;
 
     new-instance v2, Ljava/util/ArrayList;
 
-    iget-object v0, v0, Lokhttp3/internal/b/f$a;->bud:Ljava/util/List;
+    iget-object v0, v0, Lokhttp3/internal/b/f$a;->bun: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;->bsL:Lokhttp3/internal/a;
+    sget-object v12, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v13, v1, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v13, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
-    iget-object v14, v1, Lokhttp3/internal/b/g;->bsD:Lokhttp3/a;
+    iget-object v14, v1, Lokhttp3/internal/b/g;->bsN: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;->buj:Lokhttp3/internal/b/c;
+    iget-object v12, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     if-eqz v12, :cond_7
 
-    iget-object v6, v1, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iput-object v11, v1, Lokhttp3/internal/b/g;->btL:Lokhttp3/y;
+    iput-object v11, v1, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
     const/4 v8, 0x1
 
@@ -296,7 +296,7 @@
 
     if-nez v7, :cond_a
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->buf:Lokhttp3/internal/b/f$a;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bup: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;->bud:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/b/f$a;->bun:Ljava/util/List;
 
-    iget v6, v0, Lokhttp3/internal/b/f$a;->bue:I
+    iget v6, v0, Lokhttp3/internal/b/f$a;->buo:I
 
     add-int/lit8 v7, v6, 0x1
 
-    iput v7, v0, Lokhttp3/internal/b/f$a;->bue:I
+    iput v7, v0, Lokhttp3/internal/b/f$a;->buo: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;->btL:Lokhttp3/y;
+    iput-object v7, v1, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
-    iput v5, v1, Lokhttp3/internal/b/g;->bui:I
+    iput v5, v1, Lokhttp3/internal/b/g;->bus:I
 
     new-instance v6, Lokhttp3/internal/b/c;
 
-    iget-object v0, v1, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->brR: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;->btY:Lokhttp3/e;
+    iget-object v0, v1, Lokhttp3/internal/b/g;->bui:Lokhttp3/e;
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->bsa:Lokhttp3/p;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->bsk: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;->Gc()Lokhttp3/internal/b/d;
+    invoke-direct/range {p0 .. p0}, Lokhttp3/internal/b/g;->Gf()Lokhttp3/internal/b/d;
 
     move-result-object v0
 
-    iget-object v2, v6, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v2, v6, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
     invoke-virtual {v0, v2}, Lokhttp3/internal/b/d;->b(Lokhttp3/y;)V
 
-    iget-object v2, v1, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v2, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_2
-    iput-boolean v4, v1, Lokhttp3/internal/b/g;->buk:Z
+    iput-boolean v4, v1, Lokhttp3/internal/b/g;->buu:Z
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->brR: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;->FY()Z
+    invoke-virtual {v6}, Lokhttp3/internal/b/c;->Gb()Z
 
     move-result v0
 
     if-eqz v0, :cond_d
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v3, v1, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v3, v1, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
-    iget-object v4, v1, Lokhttp3/internal/b/g;->bsD:Lokhttp3/a;
+    iget-object v4, v1, Lokhttp3/internal/b/g;->bsN: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;->buj:Lokhttp3/internal/b/c;
+    iget-object v6, v1, Lokhttp3/internal/b/g;->but: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;->brH:Lokhttp3/j;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v1
 
     :try_start_0
-    iget v2, v0, Lokhttp3/internal/b/c;->btR:I
+    iget v2, v0, Lokhttp3/internal/b/c;->bub:I
 
     if-nez v2, :cond_0
 
@@ -533,7 +533,7 @@
 
     if-nez v1, :cond_1
 
-    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Ge()V
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Gh()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;->btT:Ljava/util/List;
+    iget-object v0, p1, Lokhttp3/internal/b/c;->bud: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;->btT:Ljava/util/List;
+    iget-object v2, p1, Lokhttp3/internal/b/c;->bud: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;->btT:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
 
     invoke-interface {p1, v1}, Ljava/util/List;->remove(I)Ljava/lang/Object;
 
@@ -612,15 +612,15 @@
 
 
 # virtual methods
-.method public final Gb()Lokhttp3/internal/c/c;
+.method public final Ge()Lokhttp3/internal/c/c;
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
 
     monitor-exit v0
 
@@ -636,13 +636,13 @@
     throw v1
 .end method
 
-.method public final declared-synchronized Gd()Lokhttp3/internal/b/c;
+.method public final declared-synchronized Gg()Lokhttp3/internal/b/c;
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->but: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 Ge()V
+.method public final Gh()V
     .locals 3
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v0
 
@@ -693,14 +693,14 @@
     throw v1
 .end method
 
-.method public final Gf()Z
+.method public final Gi()Z
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->btL:Lokhttp3/y;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->buf:Lokhttp3/internal/b/f$a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bup: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;->buh:Lokhttp3/internal/b/f;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bur: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;->Fw()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fz()I
 
     move-result v1
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fx()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FA()I
 
     move-result v2
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fy()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FB()I
 
     move-result v3
 
-    iget v4, p1, Lokhttp3/t;->brP:I
+    iget v4, p1, Lokhttp3/t;->brZ:I
 
-    iget-boolean v5, p1, Lokhttp3/t;->brK:Z
+    iget-boolean v5, p1, Lokhttp3/t;->brU:Z
 
     move-object v0, p0
 
@@ -761,34 +761,34 @@
 
     move-result-object p3
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->btY:Lokhttp3/internal/e/g;
 
     if-eqz v0, :cond_0
 
     new-instance v0, Lokhttp3/internal/e/f;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->btO:Lokhttp3/internal/e/g;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->btY: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;->btN:Ljava/net/Socket;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fx()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FA()I
 
     move-result v1
 
     invoke-virtual {v0, v1}, Ljava/net/Socket;->setSoTimeout(I)V
 
-    iget-object v0, p3, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fx()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FA()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;->btP:Lokio/BufferedSink;
+    iget-object v0, p3, Lokhttp3/internal/b/c;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->Fy()I
+    invoke-interface {p2}, Lokhttp3/Interceptor$Chain;->FB()I
 
     move-result p2
 
@@ -816,21 +816,21 @@
 
     new-instance v0, Lokhttp3/internal/d/a;
 
-    iget-object p2, p3, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object p2, p3, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iget-object p3, p3, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iget-object p3, p3, Lokhttp3/internal/b/c;->btZ: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;->brH:Lokhttp3/j;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->brR: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;->bum:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->buw: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;->buj:Lokhttp3/internal/b/c;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     if-nez v0, :cond_0
 
-    iput-object p1, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iput-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iput-boolean p2, p0, Lokhttp3/internal/b/g;->buk:Z
+    iput-boolean p2, p0, Lokhttp3/internal/b/g;->buu:Z
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bud:Ljava/util/List;
 
     new-instance p2, Lokhttp3/internal/b/g$a;
 
-    iget-object v0, p0, Lokhttp3/internal/b/g;->bug:Ljava/lang/Object;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->buq: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;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v0
 
     if-eqz p2, :cond_3
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buw: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;->buj:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget v2, v1, Lokhttp3/internal/b/c;->btR:I
+    iget v2, v1, Lokhttp3/internal/b/c;->bub:I
 
     add-int/2addr v2, p2
 
-    iput v2, v1, Lokhttp3/internal/b/c;->btR:I
+    iput v2, v1, Lokhttp3/internal/b/c;->bub:I
 
     :cond_0
     const/4 v1, 0x0
@@ -932,9 +932,9 @@
 
     if-eqz p3, :cond_1
 
-    sget-object p1, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->btY:Lokhttp3/e;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bui: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;->bsL:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->btY:Lokhttp3/e;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->bui: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;->bum:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buw: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;->bum:Lokhttp3/internal/c/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->buw: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;->buj:Lokhttp3/internal/b/c;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     if-eqz p2, :cond_5
 
     if-eqz p1, :cond_2
 
-    iput-boolean p3, p2, Lokhttp3/internal/b/c;->btQ:Z
+    iput-boolean p3, p2, Lokhttp3/internal/b/c;->bua:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/c/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->buw: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;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget-boolean p1, p1, Lokhttp3/internal/b/c;->btQ:Z
+    iget-boolean p1, p1, Lokhttp3/internal/b/c;->bua:Z
 
     if-eqz p1, :cond_5
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->but: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;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btT:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bud: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;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     invoke-static {}, Ljava/lang/System;->nanoTime()J
 
     move-result-wide p2
 
-    iput-wide p2, p1, Lokhttp3/internal/b/c;->btU:J
+    iput-wide p2, p1, Lokhttp3/internal/b/c;->bue:J
 
-    sget-object p1, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object p2, p0, Lokhttp3/internal/b/g;->brH:Lokhttp3/j;
+    iget-object p2, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
-    iget-object p3, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object p3, p0, Lokhttp3/internal/b/g;->but: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;->buj:Lokhttp3/internal/b/c;
+    iget-object p1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btX:Ljava/net/Socket;
 
     goto :goto_0
 
@@ -1077,7 +1077,7 @@
     move-object p1, v0
 
     :goto_0
-    iput-object v0, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iput-object v0, p0, Lokhttp3/internal/b/g;->but: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;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brR: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;->buJ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
 
     if-ne p1, v1, :cond_0
 
-    iget p1, p0, Lokhttp3/internal/b/g;->bui:I
+    iget p1, p0, Lokhttp3/internal/b/g;->bus:I
 
     add-int/2addr p1, v4
 
-    iput p1, p0, Lokhttp3/internal/b/g;->bui:I
+    iput p1, p0, Lokhttp3/internal/b/g;->bus:I
 
-    iget p1, p0, Lokhttp3/internal/b/g;->bui:I
+    iget p1, p0, Lokhttp3/internal/b/g;->bus:I
 
     if-le p1, v4, :cond_6
 
     goto :goto_0
 
     :cond_0
-    sget-object v1, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     if-eq p1, v1, :cond_6
 
-    iput-object v2, p0, Lokhttp3/internal/b/g;->btL:Lokhttp3/y;
+    iput-object v2, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
     goto :goto_1
 
     :cond_1
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     if-eqz v1, :cond_6
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/c;->FY()Z
+    invoke-virtual {v1}, Lokhttp3/internal/b/c;->Gb()Z
 
     move-result v1
 
@@ -1153,23 +1153,23 @@
     if-eqz v1, :cond_6
 
     :cond_2
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
-    iget v1, v1, Lokhttp3/internal/b/c;->btR:I
+    iget v1, v1, Lokhttp3/internal/b/c;->bub:I
 
     if-nez v1, :cond_5
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->btL:Lokhttp3/y;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
     if-eqz v1, :cond_4
 
     if-eqz p1, :cond_4
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buh:Lokhttp3/internal/b/f;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bur:Lokhttp3/internal/b/f;
 
-    iget-object v5, p0, Lokhttp3/internal/b/g;->btL:Lokhttp3/y;
+    iget-object v5, p0, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
-    iget-object v6, v5, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v6, v5, Lokhttp3/y;->bnr: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;->bsD:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v6, v6, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object v6, v6, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
     if-eqz v6, :cond_3
 
-    iget-object v6, v1, Lokhttp3/internal/b/f;->bsD:Lokhttp3/a;
+    iget-object v6, v1, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v6, v6, Lokhttp3/a;->bng:Ljava/net/ProxySelector;
+    iget-object v6, v6, Lokhttp3/a;->bnq:Ljava/net/ProxySelector;
 
-    iget-object v7, v1, Lokhttp3/internal/b/f;->bsD:Lokhttp3/a;
+    iget-object v7, v1, Lokhttp3/internal/b/f;->bsN:Lokhttp3/a;
 
-    iget-object v7, v7, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v7, v7, Lokhttp3/a;->bnk:Lokhttp3/s;
 
-    invoke-virtual {v7}, Lokhttp3/s;->Fk()Ljava/net/URI;
+    invoke-virtual {v7}, Lokhttp3/s;->Fn()Ljava/net/URI;
 
     move-result-object v7
 
-    iget-object v8, v5, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v8, v5, Lokhttp3/y;->bnr: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;->bqc:Lokhttp3/internal/b/d;
+    iget-object p1, v1, Lokhttp3/internal/b/f;->bqm: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;->btL:Lokhttp3/y;
+    iput-object v2, p0, Lokhttp3/internal/b/g;->btV: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;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v0
 
     const/4 v1, 0x1
 
     :try_start_0
-    iput-boolean v1, p0, Lokhttp3/internal/b/g;->bul:Z
+    iput-boolean v1, p0, Lokhttp3/internal/b/g;->buv:Z
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->bum:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->buw:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/b/g;->but: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;->btM:Ljava/net/Socket;
+    iget-object v0, v2, Lokhttp3/internal/b/c;->btW: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;->brH:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->brR:Lokhttp3/j;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     const/4 v2, 0x1
 
@@ -1312,7 +1312,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/internal/b/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v3, p0, Lokhttp3/internal/b/g;->but:Lokhttp3/internal/b/c;
 
     const/4 v4, 0x0
 
@@ -1329,9 +1329,9 @@
 
     if-eqz v1, :cond_1
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
-    iget-object v1, p0, Lokhttp3/internal/b/g;->btY:Lokhttp3/e;
+    iget-object v1, p0, Lokhttp3/internal/b/g;->bui: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;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {p0}, Lokhttp3/internal/b/g;->Gg()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;->bsD:Lokhttp3/a;
+    iget-object v0, p0, Lokhttp3/internal/b/g;->bsN: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 444ad53df6..e04614954b 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 btb:Z
+.field final synthetic btl: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;->btb:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c$2;->btl: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;->btb:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c$2;->btl: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 f87bb158a1..d3963decea 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;->Fu()Lokhttp3/w;
+    invoke-interface {p1}, Lokhttp3/Interceptor$Chain;->Fx()Lokhttp3/w;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {v0}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object v1
 
-    iget-object v2, v0, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v2, v0, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     const-string v3, "Content-Type"
 
@@ -101,7 +101,7 @@
 
     if-nez v7, :cond_3
 
-    iget-object v7, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-static {v7, v8}, Lokhttp3/internal/c;->a(Lokhttp3/s;Z)Ljava/lang/String;
 
@@ -153,7 +153,7 @@
     :goto_1
     iget-object v7, p0, Lokhttp3/internal/c/a;->cookieJar:Lokhttp3/m;
 
-    iget-object v10, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v10, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-interface {v7, v10}, Lokhttp3/m;->a(Lokhttp3/s;)Ljava/util/List;
 
@@ -228,7 +228,7 @@
     invoke-virtual {v1, v7, v8}, Lokhttp3/w$a;->ao(Ljava/lang/String;Ljava/lang/String;)Lokhttp3/w$a;
 
     :cond_9
-    invoke-virtual {v1}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v1}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object v1
 
@@ -238,17 +238,17 @@
 
     iget-object v1, p0, Lokhttp3/internal/c/a;->cookieJar:Lokhttp3/m;
 
-    iget-object v7, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v7, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object v8, p1, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v8, p1, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     invoke-static {v1, v7, v8}, Lokhttp3/internal/c/e;->a(Lokhttp3/m;Lokhttp3/s;Lokhttp3/Headers;)V
 
-    invoke-virtual {p1}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {p1}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v1
 
-    iput-object v0, v1, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object v0, v1, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
     if-eqz v2, :cond_a
 
@@ -272,17 +272,17 @@
 
     new-instance v2, Lokio/h;
 
-    iget-object v7, p1, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v7, p1, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
-    invoke-virtual {v7}, Lokhttp3/x;->FN()Lokio/d;
+    invoke-virtual {v7}, Lokhttp3/x;->FQ()Lokio/d;
 
     move-result-object v7
 
     invoke-direct {v2, v7}, Lokio/h;-><init>(Lokio/r;)V
 
-    iget-object v7, p1, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object v7, p1, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
-    invoke-virtual {v7}, Lokhttp3/Headers;->Fi()Lokhttp3/Headers$a;
+    invoke-virtual {v7}, Lokhttp3/Headers;->Fl()Lokhttp3/Headers$a;
 
     move-result-object v7
 
@@ -294,7 +294,7 @@
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object v0
 
@@ -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;->bst:Lokhttp3/x;
+    iput-object v0, v1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
     :cond_a
-    invoke-virtual {v1}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v1}, Lokhttp3/Response$a;->FP()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 3ed1573342..4370fdb7cf 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 bun:J
+.field bux: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;->bun:J
+    iget-wide v0, p0, Lokhttp3/internal/c/b$a;->bux:J
 
     add-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->bun:J
+    iput-wide v0, p0, Lokhttp3/internal/c/b$a;->bux: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 61657f7d5c..e34666243c 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 bsc:Z
+.field private final bsm:Z
 
 
 # direct methods
@@ -24,7 +24,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-boolean p1, p0, Lokhttp3/internal/c/b;->bsc:Z
+    iput-boolean p1, p0, Lokhttp3/internal/c/b;->bsm:Z
 
     return-void
 .end method
@@ -41,15 +41,15 @@
 
     check-cast p1, Lokhttp3/internal/c/g;
 
-    iget-object v0, p1, Lokhttp3/internal/c/g;->buu:Lokhttp3/internal/c/c;
+    iget-object v0, p1, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
 
-    iget-object v1, p1, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/g;
+    iget-object v1, p1, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
 
-    iget-object v2, p1, Lokhttp3/internal/c/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v2, p1, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
 
     check-cast v2, Lokhttp3/internal/b/c;
 
-    iget-object p1, p1, Lokhttp3/internal/c/g;->bsq:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
@@ -57,7 +57,7 @@
 
     invoke-interface {v0, p1}, Lokhttp3/internal/c/c;->c(Lokhttp3/w;)V
 
-    iget-object v5, p1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v5, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-static {v5}, Lokhttp3/internal/c/f;->eb(Ljava/lang/String;)Z
 
@@ -67,7 +67,7 @@
 
     if-eqz v5, :cond_2
 
-    iget-object v5, p1, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     if-eqz v5, :cond_2
 
@@ -85,7 +85,7 @@
 
     if-eqz v5, :cond_0
 
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gg()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gj()V
 
     const/4 v5, 0x1
 
@@ -96,7 +96,7 @@
     :cond_0
     if-nez v6, :cond_1
 
-    iget-object v2, p1, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v2, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     invoke-virtual {v2}, Lokhttp3/RequestBody;->contentLength()J
 
@@ -114,7 +114,7 @@
 
     move-result-object v2
 
-    iget-object v5, p1, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v5, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     invoke-virtual {v5, v2}, Lokhttp3/RequestBody;->writeTo(Lokio/BufferedSink;)V
 
@@ -123,17 +123,17 @@
     goto :goto_0
 
     :cond_1
-    invoke-virtual {v2}, Lokhttp3/internal/b/c;->FY()Z
+    invoke-virtual {v2}, Lokhttp3/internal/b/c;->Gb()Z
 
     move-result v2
 
     if-nez v2, :cond_2
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Ge()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gh()V
 
     :cond_2
     :goto_0
-    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gh()V
+    invoke-interface {v0}, Lokhttp3/internal/c/c;->Gk()V
 
     const/4 v2, 0x0
 
@@ -144,25 +144,25 @@
     move-result-object v6
 
     :cond_3
-    iput-object p1, v6, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object p1, v6, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
 
     move-result-object v5
 
-    iget-object v5, v5, Lokhttp3/internal/b/c;->bss:Lokhttp3/r;
+    iget-object v5, v5, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
-    iput-object v5, v6, Lokhttp3/Response$a;->bss:Lokhttp3/r;
+    iput-object v5, v6, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
 
-    iput-wide v3, v6, Lokhttp3/Response$a;->bsx:J
+    iput-wide v3, v6, Lokhttp3/Response$a;->bsH:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v7
 
-    iput-wide v7, v6, Lokhttp3/Response$a;->bsy:J
+    iput-wide v7, v6, Lokhttp3/Response$a;->bsI:J
 
-    invoke-virtual {v6}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v6}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v5
 
@@ -176,32 +176,32 @@
 
     move-result-object v2
 
-    iput-object p1, v2, Lokhttp3/Response$a;->bsq:Lokhttp3/w;
+    iput-object p1, v2, Lokhttp3/Response$a;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->bss:Lokhttp3/r;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->bsC:Lokhttp3/r;
 
-    iput-object p1, v2, Lokhttp3/Response$a;->bss:Lokhttp3/r;
+    iput-object p1, v2, Lokhttp3/Response$a;->bsC:Lokhttp3/r;
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->bsx:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bsH:J
 
     invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
 
     move-result-wide v3
 
-    iput-wide v3, v2, Lokhttp3/Response$a;->bsy:J
+    iput-wide v3, v2, Lokhttp3/Response$a;->bsI:J
 
-    invoke-virtual {v2}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v5
 
     iget v6, v5, Lokhttp3/Response;->code:I
 
     :cond_4
-    iget-boolean p1, p0, Lokhttp3/internal/c/b;->bsc:Z
+    iget-boolean p1, p0, Lokhttp3/internal/c/b;->bsm:Z
 
     if-eqz p1, :cond_5
 
@@ -209,22 +209,22 @@
 
     if-ne v6, p1, :cond_5
 
-    invoke-virtual {v5}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object p1
 
-    sget-object v0, Lokhttp3/internal/c;->bsN:Lokhttp3/x;
+    sget-object v0, Lokhttp3/internal/c;->bsX:Lokhttp3/x;
 
-    iput-object v0, p1, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object p1
 
     goto :goto_1
 
     :cond_5
-    invoke-virtual {v5}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object p1
 
@@ -232,14 +232,14 @@
 
     move-result-object v0
 
-    iput-object v0, p1, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v0, p1, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    invoke-virtual {p1}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {p1}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object p1
 
     :goto_1
-    iget-object v0, p1, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v0, p1, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
     const-string v2, "Connection"
 
@@ -266,7 +266,7 @@
     if-eqz v0, :cond_7
 
     :cond_6
-    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Ge()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gh()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;->bst:Lokhttp3/x;
+    iget-object v0, p1, Lokhttp3/Response;->bsD: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;->bst:Lokhttp3/x;
+    iget-object p1, p1, Lokhttp3/Response;->bsD: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 39f1ec4f10..f5c71d9147 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 Gg()V
+.method public abstract Gj()V
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/IOException;
@@ -12,7 +12,7 @@
     .end annotation
 .end method
 
-.method public abstract Gh()V
+.method public abstract Gk()V
     .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 4bbbc9626f..7383c99dd8 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;->bsY:Ljava/util/TimeZone;
+    sget-object v1, Lokhttp3/internal/c;->bti: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 eb82eeb725..68885967ed 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/d.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/d.smali
@@ -4,7 +4,9 @@
 
 
 # static fields
-.field private static final buo:Ljava/lang/ThreadLocal;
+.field private static final buA:[Ljava/text/DateFormat;
+
+.field private static final buy:Ljava/lang/ThreadLocal;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/ThreadLocal<",
@@ -14,9 +16,7 @@
     .end annotation
 .end field
 
-.field private static final bup:[Ljava/lang/String;
-
-.field private static final buq:[Ljava/text/DateFormat;
+.field private static final buz:[Ljava/lang/String;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/c/d$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/c/d;->buo:Ljava/lang/ThreadLocal;
+    sput-object v0, Lokhttp3/internal/c/d;->buy:Ljava/lang/ThreadLocal;
 
     const/16 v0, 0xf
 
@@ -123,11 +123,11 @@
 
     aput-object v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/c/d;->bup:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/c/d;->buz:[Ljava/lang/String;
 
     new-array v0, v0, [Ljava/text/DateFormat;
 
-    sput-object v0, Lokhttp3/internal/c/d;->buq:[Ljava/text/DateFormat;
+    sput-object v0, Lokhttp3/internal/c/d;->buA:[Ljava/text/DateFormat;
 
     return-void
 .end method
@@ -135,7 +135,7 @@
 .method public static a(Ljava/util/Date;)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/c/d;->buo:Ljava/lang/ThreadLocal;
+    sget-object v0, Lokhttp3/internal/c/d;->buy: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;->buo:Ljava/lang/ThreadLocal;
+    sget-object v3, Lokhttp3/internal/c/d;->buy: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;->bup:[Ljava/lang/String;
+    sget-object v3, Lokhttp3/internal/c/d;->buz:[Ljava/lang/String;
 
     monitor-enter v3
 
     :try_start_0
-    sget-object v4, Lokhttp3/internal/c/d;->bup:[Ljava/lang/String;
+    sget-object v4, Lokhttp3/internal/c/d;->buz:[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;->buq:[Ljava/text/DateFormat;
+    sget-object v6, Lokhttp3/internal/c/d;->buA:[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;->bup:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/c/d;->buz:[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;->bsY:Ljava/util/TimeZone;
+    sget-object v7, Lokhttp3/internal/c;->bti:Ljava/util/TimeZone;
 
     invoke-virtual {v6, v7}, Ljava/text/DateFormat;->setTimeZone(Ljava/util/TimeZone;)V
 
-    sget-object v7, Lokhttp3/internal/c/d;->buq:[Ljava/text/DateFormat;
+    sget-object v7, Lokhttp3/internal/c/d;->buA:[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 ad129afb83..243f498d70 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 bur:Lokio/ByteString;
+.field private static final buB:Lokio/ByteString;
 
-.field private static final bus:Lokio/ByteString;
+.field private static final buC:Lokio/ByteString;
 
 
 # direct methods
@@ -19,7 +19,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->bur:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/c/e;->buB:Lokio/ByteString;
 
     const-string v0, "\t ,="
 
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/c/e;->bus:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/c/e;->buC: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;->bqz:Lokhttp3/m;
+    sget-object v0, Lokhttp3/m;->bqJ:Lokhttp3/m;
 
     if-ne p0, v0, :cond_0
 
@@ -114,7 +114,7 @@
 .method public static f(Lokhttp3/Response;)J
     .locals 2
 
-    iget-object p0, p0, Lokhttp3/Response;->brx:Lokhttp3/Headers;
+    iget-object p0, p0, Lokhttp3/Response;->brH:Lokhttp3/Headers;
 
     const-string v0, "Content-Length"
 
@@ -132,9 +132,9 @@
 .method public static g(Lokhttp3/Response;)Z
     .locals 8
 
-    iget-object v0, p0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     const-string v1, "HEAD"
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/c/g.smali b/com.discord/smali_classes2/okhttp3/internal/c/g.smali
index b844ec9fef..dedba8c9df 100644
--- a/com.discord/smali_classes2/okhttp3/internal/c/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/c/g.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final brC:Ljava/util/List;
+.field private final brM:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -17,25 +17,25 @@
     .end annotation
 .end field
 
-.field private final brM:I
+.field private final brW:I
 
-.field private final brN:I
+.field private final brX:I
 
-.field private final brO:I
+.field private final brY:I
 
-.field final bsa:Lokhttp3/p;
+.field public final bsA:Lokhttp3/w;
 
-.field public final bsq:Lokhttp3/w;
+.field final bsk:Lokhttp3/p;
 
-.field final btY:Lokhttp3/e;
+.field public final buD:Lokhttp3/internal/b/g;
 
-.field final buj:Lokhttp3/internal/b/c;
+.field final buE:Lokhttp3/internal/c/c;
 
-.field public final but:Lokhttp3/internal/b/g;
+.field private buF:I
 
-.field final buu:Lokhttp3/internal/c/c;
+.field final bui:Lokhttp3/e;
 
-.field private buv:I
+.field final but:Lokhttp3/internal/b/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;->brC:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/c/g;->brM:Ljava/util/List;
 
-    iput-object p4, p0, Lokhttp3/internal/c/g;->buj:Lokhttp3/internal/b/c;
+    iput-object p4, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
 
-    iput-object p2, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/c/g;->buu:Lokhttp3/internal/c/c;
+    iput-object p3, p0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
 
     iput p5, p0, Lokhttp3/internal/c/g;->index:I
 
-    iput-object p6, p0, Lokhttp3/internal/c/g;->bsq:Lokhttp3/w;
+    iput-object p6, p0, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
 
-    iput-object p7, p0, Lokhttp3/internal/c/g;->btY:Lokhttp3/e;
+    iput-object p7, p0, Lokhttp3/internal/c/g;->bui:Lokhttp3/e;
 
-    iput-object p8, p0, Lokhttp3/internal/c/g;->bsa:Lokhttp3/p;
+    iput-object p8, p0, Lokhttp3/internal/c/g;->bsk:Lokhttp3/p;
 
-    iput p9, p0, Lokhttp3/internal/c/g;->brM:I
+    iput p9, p0, Lokhttp3/internal/c/g;->brW:I
 
-    iput p10, p0, Lokhttp3/internal/c/g;->brN:I
+    iput p10, p0, Lokhttp3/internal/c/g;->brX:I
 
-    iput p11, p0, Lokhttp3/internal/c/g;->brO:I
+    iput p11, p0, Lokhttp3/internal/c/g;->brY:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Fu()Lokhttp3/w;
+.method public final FA()I
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->bsq:Lokhttp3/w;
-
-    return-object v0
-.end method
-
-.method public final Fv()Lokhttp3/i;
-    .locals 1
-
-    iget-object v0, p0, Lokhttp3/internal/c/g;->buj:Lokhttp3/internal/b/c;
-
-    return-object v0
-.end method
-
-.method public final Fw()I
-    .locals 1
-
-    iget v0, p0, Lokhttp3/internal/c/g;->brM:I
+    iget v0, p0, Lokhttp3/internal/c/g;->brX:I
 
     return v0
 .end method
 
-.method public final Fx()I
+.method public final FB()I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->brN:I
+    iget v0, p0, Lokhttp3/internal/c/g;->brY:I
 
     return v0
 .end method
 
-.method public final Fy()I
+.method public final Fx()Lokhttp3/w;
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/c/g;->brO:I
+    iget-object v0, p0, Lokhttp3/internal/c/g;->bsA:Lokhttp3/w;
+
+    return-object v0
+.end method
+
+.method public final Fy()Lokhttp3/i;
+    .locals 1
+
+    iget-object v0, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
+
+    return-object v0
+.end method
+
+.method public final Fz()I
+    .locals 1
+
+    iget v0, p0, Lokhttp3/internal/c/g;->brW: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;->brC:Ljava/util/List;
+    iget-object v2, v0, Lokhttp3/internal/c/g;->brM: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;->buv:I
+    iget v1, v0, Lokhttp3/internal/c/g;->buF:I
 
     const/4 v2, 0x1
 
     add-int/2addr v1, v2
 
-    iput v1, v0, Lokhttp3/internal/c/g;->buv:I
+    iput v1, v0, Lokhttp3/internal/c/g;->buF:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->buu:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
 
     const-string v3, "network interceptor "
 
     if-eqz v1, :cond_1
 
-    iget-object v1, v0, Lokhttp3/internal/c/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/c;
 
     move-object/from16 v10, p1
 
-    iget-object v4, v10, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v4, v10, Lokhttp3/w;->bnk: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;->brC:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->brM: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;->buu:Lokhttp3/internal/c/c;
+    iget-object v1, v0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
 
     const-string v15, " must call proceed() exactly once"
 
     if-eqz v1, :cond_3
 
-    iget v1, v0, Lokhttp3/internal/c/g;->buv:I
+    iget v1, v0, Lokhttp3/internal/c/g;->buF: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;->brC:Ljava/util/List;
+    iget-object v3, v0, Lokhttp3/internal/c/g;->brM: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;->brC:Ljava/util/List;
+    iget-object v5, v0, Lokhttp3/internal/c/g;->brM: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;->btY:Lokhttp3/e;
+    iget-object v11, v0, Lokhttp3/internal/c/g;->bui:Lokhttp3/e;
 
-    iget-object v12, v0, Lokhttp3/internal/c/g;->bsa:Lokhttp3/p;
+    iget-object v12, v0, Lokhttp3/internal/c/g;->bsk:Lokhttp3/p;
 
-    iget v13, v0, Lokhttp3/internal/c/g;->brM:I
+    iget v13, v0, Lokhttp3/internal/c/g;->brW:I
 
-    iget v14, v0, Lokhttp3/internal/c/g;->brN:I
+    iget v14, v0, Lokhttp3/internal/c/g;->brX:I
 
-    iget v8, v0, Lokhttp3/internal/c/g;->brO:I
+    iget v8, v0, Lokhttp3/internal/c/g;->brY: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;->brC:Ljava/util/List;
+    iget-object v4, v0, Lokhttp3/internal/c/g;->brM: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;->brC:Ljava/util/List;
+    iget-object v7, v0, Lokhttp3/internal/c/g;->brM: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;->buv:I
+    iget v1, v1, Lokhttp3/internal/c/g;->buF:I
 
     if-ne v1, v2, :cond_4
 
@@ -352,7 +352,7 @@
 
     if-eqz v5, :cond_7
 
-    iget-object v2, v5, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v2, v5, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     if-eqz v2, :cond_6
 
@@ -416,11 +416,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/c/g;->but:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/g;->buD:Lokhttp3/internal/b/g;
 
-    iget-object v1, p0, Lokhttp3/internal/c/g;->buu:Lokhttp3/internal/c/c;
+    iget-object v1, p0, Lokhttp3/internal/c/g;->buE:Lokhttp3/internal/c/c;
 
-    iget-object v2, p0, Lokhttp3/internal/c/g;->buj:Lokhttp3/internal/b/c;
+    iget-object v2, p0, Lokhttp3/internal/c/g;->but: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 3363c05444..a300bd7361 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;->Fo()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Fr()Ljava/lang/String;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lokhttp3/s;->Fq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokhttp3/s;->Ft()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 5de1559888..c121efa0d1 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 brX:Lokhttp3/t;
+.field private final bsh:Lokhttp3/t;
 
-.field private final bsc:Z
+.field private final bsm:Z
 
-.field public bug:Ljava/lang/Object;
+.field public volatile buD:Lokhttp3/internal/b/g;
 
-.field public volatile bul:Z
+.field public buq:Ljava/lang/Object;
 
-.field public volatile but:Lokhttp3/internal/b/g;
+.field public volatile buv:Z
 
 
 # direct methods
@@ -24,9 +24,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iput-boolean p2, p0, Lokhttp3/internal/c/j;->bsc:Z
+    iput-boolean p2, p0, Lokhttp3/internal/c/j;->bsm:Z
 
     return-void
 .end method
@@ -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;->brX:Lokhttp3/t;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-boolean v0, v0, Lokhttp3/t;->brK:Z
+    iget-boolean v0, v0, Lokhttp3/t;->brU:Z
 
     const/4 v1, 0x0
 
@@ -87,7 +87,7 @@
     :cond_0
     if-eqz p3, :cond_1
 
-    iget-object p4, p4, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object p4, p4, Lokhttp3/w;->brI: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;->Gf()Z
+    invoke-virtual {p2}, Lokhttp3/internal/b/g;->Gi()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;->bsq:Lokhttp3/w;
+    iget-object p0, p0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object p0, p0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object p0, p0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object v0, p0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, p0, Lokhttp3/s;->brg:Ljava/lang/String;
 
-    iget-object v1, p1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/s;->brg: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;->bqV:Ljava/lang/String;
+    iget-object p0, p0, Lokhttp3/s;->brf:Ljava/lang/String;
 
-    iget-object p1, p1, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->brf: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;->Fl()Z
+    invoke-virtual/range {p1 .. p1}, Lokhttp3/s;->Fo()Z
 
     move-result v2
 
@@ -232,17 +232,17 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
     iget-object v3, v2, Lokhttp3/t;->sslSocketFactory:Ljavax/net/ssl/SSLSocketFactory;
 
-    iget-object v2, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v2, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v2, v2, Lokhttp3/t;->bni:Ljavax/net/ssl/HostnameVerifier;
+    iget-object v2, v2, Lokhttp3/t;->bns:Ljavax/net/ssl/HostnameVerifier;
 
-    iget-object v4, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v4, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bnj:Lokhttp3/g;
+    iget-object v4, v4, Lokhttp3/t;->bnt:Lokhttp3/g;
 
     move-object v11, v2
 
@@ -262,37 +262,37 @@
     :goto_0
     new-instance v2, Lokhttp3/a;
 
-    iget-object v6, v1, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v6, v1, Lokhttp3/s;->brg:Ljava/lang/String;
 
     iget v7, v1, Lokhttp3/s;->port:I
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v8, v1, Lokhttp3/t;->bnb:Lokhttp3/o;
+    iget-object v8, v1, Lokhttp3/t;->bnl:Lokhttp3/o;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v9, v1, Lokhttp3/t;->bnc:Ljavax/net/SocketFactory;
+    iget-object v9, v1, Lokhttp3/t;->bnm:Ljavax/net/SocketFactory;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v13, v1, Lokhttp3/t;->bnd:Lokhttp3/b;
+    iget-object v13, v1, Lokhttp3/t;->bnn:Lokhttp3/b;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v14, v1, Lokhttp3/t;->bnh:Ljava/net/Proxy;
+    iget-object v14, v1, Lokhttp3/t;->bnr:Ljava/net/Proxy;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v15, v1, Lokhttp3/t;->bne:Ljava/util/List;
+    iget-object v15, v1, Lokhttp3/t;->bno:Ljava/util/List;
 
-    iget-object v1, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v1, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->bnf:Ljava/util/List;
+    iget-object v1, v1, Lokhttp3/t;->bnp:Ljava/util/List;
 
-    iget-object v3, v0, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v3, v0, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v3, v3, Lokhttp3/t;->bng:Ljava/net/ProxySelector;
+    iget-object v3, v3, Lokhttp3/t;->bnq:Ljava/net/ProxySelector;
 
     move-object v5, v2
 
@@ -312,9 +312,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/c/j;->bul:Z
+    iput-boolean v0, p0, Lokhttp3/internal/c/j;->buv:Z
 
-    iget-object v0, p0, Lokhttp3/internal/c/j;->but:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/c/j;->buD: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;->Fu()Lokhttp3/w;
+    invoke-interface/range {p1 .. p1}, Lokhttp3/Interceptor$Chain;->Fx()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;->btY:Lokhttp3/e;
+    iget-object v10, v3, Lokhttp3/internal/c/g;->bui:Lokhttp3/e;
 
-    iget-object v11, v3, Lokhttp3/internal/c/g;->bsa:Lokhttp3/p;
+    iget-object v11, v3, Lokhttp3/internal/c/g;->bsk:Lokhttp3/p;
 
     new-instance v12, Lokhttp3/internal/b/g;
 
-    iget-object v4, v1, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v5, v4, Lokhttp3/t;->brH:Lokhttp3/j;
+    iget-object v5, v4, Lokhttp3/t;->brR:Lokhttp3/j;
 
-    iget-object v4, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v4, v0, Lokhttp3/w;->bnk: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;->bug:Ljava/lang/Object;
+    iget-object v9, v1, Lokhttp3/internal/c/j;->buq: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;->but:Lokhttp3/internal/b/g;
+    iput-object v12, v1, Lokhttp3/internal/c/j;->buD: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;->bul:Z
+    iget-boolean v0, v1, Lokhttp3/internal/c/j;->buv:Z
 
     if-nez v0, :cond_1a
 
@@ -400,27 +400,27 @@
 
     if-eqz v5, :cond_1
 
-    invoke-virtual {v0}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v0}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v0
 
-    invoke-virtual {v5}, Lokhttp3/Response;->FL()Lokhttp3/Response$a;
+    invoke-virtual {v5}, Lokhttp3/Response;->FO()Lokhttp3/Response$a;
 
     move-result-object v4
 
-    iput-object v14, v4, Lokhttp3/Response$a;->bst:Lokhttp3/x;
+    iput-object v14, v4, Lokhttp3/Response$a;->bsD:Lokhttp3/x;
 
-    invoke-virtual {v4}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v4}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v4
 
-    iget-object v5, v4, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v5, v4, Lokhttp3/Response;->bsD:Lokhttp3/x;
 
     if-nez v5, :cond_0
 
-    iput-object v4, v0, Lokhttp3/Response$a;->bsw:Lokhttp3/Response;
+    iput-object v4, v0, Lokhttp3/Response$a;->bsG:Lokhttp3/Response;
 
-    invoke-virtual {v0}, Lokhttp3/Response$a;->FM()Lokhttp3/Response;
+    invoke-virtual {v0}, Lokhttp3/Response$a;->FP()Lokhttp3/Response;
 
     move-result-object v0
 
@@ -438,15 +438,15 @@
     :cond_1
     :goto_1
     :try_start_1
-    iget-object v4, v12, Lokhttp3/internal/b/g;->btL:Lokhttp3/y;
+    iget-object v4, v12, Lokhttp3/internal/b/g;->btV:Lokhttp3/y;
 
     if-eqz v0, :cond_16
 
     iget v5, v0, Lokhttp3/Response;->code:I
 
-    iget-object v8, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v8, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v8, v8, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v8, v8, Lokhttp3/w;->bsq:Ljava/lang/String;
     :try_end_1
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -482,25 +482,25 @@
 
     :cond_2
     :try_start_2
-    iget-object v5, v1, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v5, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-boolean v5, v5, Lokhttp3/t;->brK:Z
+    iget-boolean v5, v5, Lokhttp3/t;->brU:Z
 
     if-eqz v5, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v5, v5, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v5, v5, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     instance-of v5, v5, Lokhttp3/internal/c/l;
 
     if-nez v5, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bsw:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
     if-eqz v5, :cond_3
 
-    iget-object v5, v0, Lokhttp3/Response;->bsw:Lokhttp3/Response;
+    iget-object v5, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
     iget v5, v5, Lokhttp3/Response;->code:I
 
@@ -513,21 +513,21 @@
 
     if-gtz v4, :cond_10
 
-    iget-object v4, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
     goto :goto_3
 
     :cond_4
     if-eqz v4, :cond_5
 
-    iget-object v4, v4, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v4, v4, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
     goto :goto_2
 
     :cond_5
-    iget-object v4, v1, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v4, v4, Lokhttp3/t;->bnh:Ljava/net/Proxy;
+    iget-object v4, v4, Lokhttp3/t;->bnr: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;->bsw:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
     if-eqz v4, :cond_8
 
-    iget-object v4, v0, Lokhttp3/Response;->bsw:Lokhttp3/Response;
+    iget-object v4, v0, Lokhttp3/Response;->bsG:Lokhttp3/Response;
 
     iget v4, v4, Lokhttp3/Response;->code:I
 
@@ -569,7 +569,7 @@
 
     if-nez v4, :cond_10
 
-    iget-object v4, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v4, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
     :goto_3
     move-object v15, v4
@@ -593,9 +593,9 @@
 
     :cond_a
     :pswitch_0
-    iget-object v4, v1, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-boolean v4, v4, Lokhttp3/t;->brJ:Z
+    iget-boolean v4, v4, Lokhttp3/t;->brT:Z
 
     if-eqz v4, :cond_10
 
@@ -607,9 +607,9 @@
 
     if-eqz v4, :cond_10
 
-    iget-object v5, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v5, v5, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v5, v5, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-virtual {v5, v4}, Lokhttp3/s;->dF(Ljava/lang/String;)Lokhttp3/s;
 
@@ -617,13 +617,13 @@
 
     if-eqz v4, :cond_10
 
-    iget-object v5, v4, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object v5, v4, Lokhttp3/s;->brf:Ljava/lang/String;
 
-    iget-object v9, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v9, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v9, v9, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v9, v9, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object v9, v9, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object v9, v9, Lokhttp3/s;->brf:Ljava/lang/String;
 
     invoke-virtual {v5, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -631,16 +631,16 @@
 
     if-nez v5, :cond_b
 
-    iget-object v5, v1, Lokhttp3/internal/c/j;->brX:Lokhttp3/t;
+    iget-object v5, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-boolean v5, v5, Lokhttp3/t;->brI:Z
+    iget-boolean v5, v5, Lokhttp3/t;->brS:Z
 
     if-eqz v5, :cond_10
 
     :cond_b
-    iget-object v5, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v5, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    invoke-virtual {v5}, Lokhttp3/w;->FI()Lokhttp3/w$a;
+    invoke-virtual {v5}, Lokhttp3/w;->FL()Lokhttp3/w$a;
 
     move-result-object v5
 
@@ -669,9 +669,9 @@
     :cond_c
     if-eqz v9, :cond_d
 
-    iget-object v7, v0, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object v7, v0, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object v7, v7, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v7, v7, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     goto :goto_4
 
@@ -712,7 +712,7 @@
 
     move-result-object v4
 
-    invoke-virtual {v4}, Lokhttp3/w$a;->FK()Lokhttp3/w;
+    invoke-virtual {v4}, Lokhttp3/w$a;->FN()Lokhttp3/w;
 
     move-result-object v4
     :try_end_2
@@ -732,7 +732,7 @@
     return-object v0
 
     :cond_11
-    iget-object v4, v0, Lokhttp3/Response;->bst:Lokhttp3/x;
+    iget-object v4, v0, Lokhttp3/Response;->bsD: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;->bry:Lokhttp3/RequestBody;
+    iget-object v4, v15, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     instance-of v4, v4, Lokhttp3/internal/c/l;
 
     if-nez v4, :cond_14
 
-    iget-object v4, v15, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v4, v15, Lokhttp3/w;->bnk: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;->brX:Lokhttp3/t;
+    iget-object v4, v1, Lokhttp3/internal/c/j;->bsh:Lokhttp3/t;
 
-    iget-object v5, v4, Lokhttp3/t;->brH:Lokhttp3/j;
+    iget-object v5, v4, Lokhttp3/t;->brR:Lokhttp3/j;
 
-    iget-object v4, v15, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v4, v15, Lokhttp3/w;->bnk: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;->bug:Ljava/lang/Object;
+    iget-object v8, v1, Lokhttp3/internal/c/j;->buq: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;->but:Lokhttp3/internal/b/g;
+    iput-object v12, v1, Lokhttp3/internal/c/j;->buD:Lokhttp3/internal/b/g;
 
     goto :goto_8
 
     :cond_12
     move/from16 v17, v9
 
-    invoke-virtual {v12}, Lokhttp3/internal/b/g;->Gb()Lokhttp3/internal/c/c;
+    invoke-virtual {v12}, Lokhttp3/internal/b/g;->Ge()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 029ff04b82..278b5aa5b3 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 bsr:Lokhttp3/u;
+.field public final bsB: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;->bsr:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/c/k;->bsB:Lokhttp3/u;
 
     iput p2, p0, Lokhttp3/internal/c/k;->code:I
 
@@ -74,7 +74,7 @@
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     goto :goto_0
 
@@ -83,7 +83,7 @@
 
     if-ne v0, v5, :cond_1
 
-    sget-object v0, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsb:Lokhttp3/u;
 
     goto :goto_0
 
@@ -126,7 +126,7 @@
 
     if-eqz v0, :cond_7
 
-    sget-object v0, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsa: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;->bsr:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/c/k;->bsB:Lokhttp3/u;
 
-    sget-object v2, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v2, Lokhttp3/u;->bsa: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 bb2b6a46e4..6bba73f186 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 final synthetic buA:Lokhttp3/internal/d/a;
+.field protected final buI:Lokio/g;
 
-.field protected final buy:Lokio/g;
+.field protected buJ:J
 
-.field protected buz:J
+.field final synthetic buK:Lokhttp3/internal/d/a;
 
 .field protected w: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;->buA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->lZ:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->lY: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;->buy:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$a;->buI:Lokio/g;
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buz:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buJ:J
 
     return-void
 .end method
@@ -75,9 +75,9 @@
     .end annotation
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->lZ:Lokio/d;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->lY: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;->buz:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$a;->buJ:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buz:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$a;->buJ: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK: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;->buy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buI:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
 
     iput v1, v0, Lokhttp3/internal/d/a;->state:I
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->but:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->but:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
 
     xor-int/lit8 p1, p1, 0x1
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$a;->buA:Lokhttp3/internal/d/a;
+    iget-object v1, p0, Lokhttp3/internal/d/a$a;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buK: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;->buy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$a;->buI: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 24596b2c98..45be91b732 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 final synthetic buA:Lokhttp3/internal/d/a;
+.field private final buI:Lokio/g;
 
-.field private final buy:Lokio/g;
+.field final synthetic buK:Lokhttp3/internal/d/a;
 
 .field private w:Z
 
@@ -29,15 +29,15 @@
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ: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;->buy:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$b;->buI:Lokio/g;
 
     return-void
 .end method
@@ -79,19 +79,19 @@
     :try_start_1
     iput-boolean v0, p0, Lokhttp3/internal/d/a$b;->w:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     const-string v1, "0\r\n\r\n"
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->ej(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buI:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ: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;->buy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buI:Lokio/g;
 
     return-object v0
 .end method
@@ -183,29 +183,29 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0, p2, p3}, Lokio/BufferedSink;->aE(J)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     const-string v1, "\r\n"
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->ej(Ljava/lang/String;)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/d/a$b;->buA:Lokhttp3/internal/d/a;
+    iget-object p1, p0, Lokhttp3/internal/d/a$b;->buK:Lokhttp3/internal/d/a;
 
-    iget-object p1, p1, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object p1, p1, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {p1, v1}, Lokio/BufferedSink;->ej(Ljava/lang/String;)Lokio/BufferedSink;
 
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 d182f386aa..7ced78cdf5 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 bna:Lokhttp3/s;
+.field private final bnk:Lokhttp3/s;
 
-.field final synthetic buA:Lokhttp3/internal/d/a;
+.field final synthetic buK:Lokhttp3/internal/d/a;
 
-.field private buB:J
+.field private buL:J
 
-.field private buC:Z
+.field private buM:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;Lokhttp3/s;)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$c;->buA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$c;->buK: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;->buB:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->buL:J
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->buC:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$c;->buM:Z
 
-    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bna:Lokhttp3/s;
+    iput-object p2, p0, Lokhttp3/internal/d/a$c;->bnk:Lokhttp3/s;
 
     return-void
 .end method
@@ -67,7 +67,7 @@
 
     if-nez v2, :cond_8
 
-    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->buC:Z
+    iget-boolean v2, p0, Lokhttp3/internal/d/a$c;->buM:Z
 
     const-wide/16 v3, -0x1
 
@@ -76,7 +76,7 @@
     return-wide v3
 
     :cond_0
-    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buB:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buL: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;->buB:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buL:J
 
     cmp-long v7, v5, v3
 
     if-eqz v7, :cond_2
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->lZ:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->lY:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Hm()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Hp()Ljava/lang/String;
 
     :cond_2
     :try_start_0
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->lZ:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->lY:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Hk()J
+    invoke-interface {v5}, Lokio/d;->Hn()J
 
     move-result-wide v5
 
-    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->buB:J
+    iput-wide v5, p0, Lokhttp3/internal/d/a$c;->buL:J
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v5, v5, Lokhttp3/internal/d/a;->lZ:Lokio/d;
+    iget-object v5, v5, Lokhttp3/internal/d/a;->lY:Lokio/d;
 
-    invoke-interface {v5}, Lokio/d;->Hm()Ljava/lang/String;
+    invoke-interface {v5}, Lokio/d;->Hp()Ljava/lang/String;
 
     move-result-object v5
 
@@ -125,7 +125,7 @@
 
     move-result-object v5
 
-    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->buB:J
+    iget-wide v6, p0, Lokhttp3/internal/d/a$c;->buL: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;->buB:J
+    iget-wide v5, p0, Lokhttp3/internal/d/a$c;->buL:J
 
     cmp-long v7, v5, v0
 
     if-nez v7, :cond_4
 
-    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->buC:Z
+    iput-boolean v2, p0, Lokhttp3/internal/d/a$c;->buM:Z
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$c;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->brX:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->bsh:Lokhttp3/t;
 
     iget-object v0, v0, Lokhttp3/t;->cookieJar:Lokhttp3/m;
 
-    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bna:Lokhttp3/s;
+    iget-object v1, p0, Lokhttp3/internal/d/a$c;->bnk:Lokhttp3/s;
 
-    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buA:Lokhttp3/internal/d/a;
+    iget-object v5, p0, Lokhttp3/internal/d/a$c;->buK:Lokhttp3/internal/d/a;
 
-    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Gj()Lokhttp3/Headers;
+    invoke-virtual {v5}, Lokhttp3/internal/d/a;->Gm()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;->buC:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->buM:Z
 
     if-nez v0, :cond_5
 
     return-wide v3
 
     :cond_5
-    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buB:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buL: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;->buB:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buL:J
 
     sub-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->buB:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$c;->buL: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;->buB:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$c;->buL: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;->buC:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$c;->buM: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 5f9265aca4..602ac1d38a 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 final synthetic buA:Lokhttp3/internal/d/a;
+.field private final buI:Lokio/g;
 
-.field private buD:J
+.field final synthetic buK:Lokhttp3/internal/d/a;
 
-.field private final buy:Lokio/g;
+.field private buN:J
 
 .field private w: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;->buA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ: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;->buy:Lokio/g;
+    iput-object p1, p0, Lokhttp3/internal/d/a$d;->buI:Lokio/g;
 
-    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->buD:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$d;->buN:J
 
     return-void
 .end method
@@ -75,7 +75,7 @@
 
     iput-boolean v0, p0, Lokhttp3/internal/d/a$d;->w:Z
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buN:J
 
     const-wide/16 v2, 0x0
 
@@ -83,11 +83,11 @@
 
     if-gtz v4, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buI:Lokio/g;
 
     invoke-static {v0}, Lokhttp3/internal/d/a;->a(Lokio/g;)V
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buK: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;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ: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;->buy:Lokio/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buI: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;->buD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buN:J
 
     cmp-long v2, p2, v0
 
     if-gtz v2, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buA:Lokhttp3/internal/d/a;
+    iget-object v0, p0, Lokhttp3/internal/d/a$d;->buK:Lokhttp3/internal/d/a;
 
-    iget-object v0, v0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/BufferedSink;->write(Lokio/c;J)V
 
-    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$d;->buN:J
 
     sub-long/2addr v0, p2
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->buD:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a$d;->buN: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;->buD:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a$d;->buN: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 632445cdd8..46da952c89 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 buA:Lokhttp3/internal/d/a;
+.field final synthetic buK:Lokhttp3/internal/d/a;
 
-.field private buD:J
+.field private buN:J
 
 
 # direct methods
@@ -29,15 +29,15 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$e;->buA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$e;->buK: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;->buD:J
+    iput-wide p2, p0, Lokhttp3/internal/d/a$e;->buN:J
 
-    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->buD:J
+    iget-wide p1, p0, Lokhttp3/internal/d/a$e;->buN:J
 
     const-wide/16 v0, 0x0
 
@@ -75,7 +75,7 @@
 
     if-nez v2, :cond_3
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buD:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
 
     const-wide/16 v4, -0x1
 
@@ -98,13 +98,13 @@
 
     if-eqz p3, :cond_2
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buD:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
 
     sub-long/2addr v2, p1
 
-    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->buD:J
+    iput-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
 
-    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buD:J
+    iget-wide v2, p0, Lokhttp3/internal/d/a$e;->buN:J
 
     cmp-long p3, v2, v0
 
@@ -174,7 +174,7 @@
     return-void
 
     :cond_0
-    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->buD:J
+    iget-wide v0, p0, Lokhttp3/internal/d/a$e;->buN: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 196a227f61..60bc5ae82c 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 buA:Lokhttp3/internal/d/a;
+.field final synthetic buK:Lokhttp3/internal/d/a;
 
-.field private buE:Z
+.field private buO:Z
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/d/a;)V
     .locals 1
 
-    iput-object p1, p0, Lokhttp3/internal/d/a$f;->buA:Lokhttp3/internal/d/a;
+    iput-object p1, p0, Lokhttp3/internal/d/a$f;->buK: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;->buE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->buO:Z
 
     const-wide/16 v1, -0x1
 
@@ -72,7 +72,7 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->buE:Z
+    iput-boolean p1, p0, Lokhttp3/internal/d/a$f;->buO:Z
 
     const/4 p2, 0x0
 
@@ -125,7 +125,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->buE:Z
+    iget-boolean v0, p0, Lokhttp3/internal/d/a$f;->buO: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 aa840459cf..5c746dcfac 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 brX:Lokhttp3/t;
+.field final bsh:Lokhttp3/t;
 
-.field final btP:Lokio/BufferedSink;
+.field final btZ:Lokio/BufferedSink;
 
-.field final but:Lokhttp3/internal/b/g;
+.field final buD:Lokhttp3/internal/b/g;
 
-.field private bux:J
+.field private buH:J
 
-.field final lZ:Lokio/d;
+.field final lY:Lokio/d;
 
 .field state:I
 
@@ -45,20 +45,20 @@
 
     const-wide/32 v0, 0x40000
 
-    iput-wide v0, p0, Lokhttp3/internal/d/a;->bux:J
+    iput-wide v0, p0, Lokhttp3/internal/d/a;->buH:J
 
-    iput-object p1, p0, Lokhttp3/internal/d/a;->brX:Lokhttp3/t;
+    iput-object p1, p0, Lokhttp3/internal/d/a;->bsh:Lokhttp3/t;
 
-    iput-object p2, p0, Lokhttp3/internal/d/a;->but:Lokhttp3/internal/b/g;
+    iput-object p2, p0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
 
-    iput-object p3, p0, Lokhttp3/internal/d/a;->lZ:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/d/a;->lY:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     return-void
 .end method
 
-.method private Gi()Ljava/lang/String;
+.method private Gl()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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->lY:Lokio/d;
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->bux:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->buH:J
 
     invoke-interface {v0, v1, v2}, Lokio/d;->ay(J)Ljava/lang/String;
 
     move-result-object v0
 
-    iget-wide v1, p0, Lokhttp3/internal/d/a;->bux:J
+    iget-wide v1, p0, Lokhttp3/internal/d/a;->buH: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;->bux:J
+    iput-wide v1, p0, Lokhttp3/internal/d/a;->buH:J
 
     return-object v0
 .end method
@@ -92,17 +92,17 @@
 .method static a(Lokio/g;)V
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
 
-    sget-object v1, Lokio/s;->bzd:Lokio/s;
+    sget-object v1, Lokio/s;->bzn:Lokio/s;
 
     if-eqz v1, :cond_0
 
-    iput-object v1, p0, Lokio/g;->byK:Lokio/s;
+    iput-object v1, p0, Lokio/g;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HD()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HG()Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HC()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HF()Lokio/s;
 
     return-void
 
@@ -118,7 +118,7 @@
 
 
 # virtual methods
-.method public final Gg()V
+.method public final Gj()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -126,14 +126,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Gh()V
+.method public final Gk()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -141,14 +141,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
 
     return-void
 .end method
 
-.method public final Gj()Lokhttp3/Headers;
+.method public final Gm()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;->Gi()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Gl()Ljava/lang/String;
 
     move-result-object v1
 
@@ -171,14 +171,14 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v2, Lokhttp3/internal/a;->bsV: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;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object v0
 
@@ -229,7 +229,7 @@
     :cond_1
     :goto_0
     :try_start_0
-    invoke-direct {p0}, Lokhttp3/internal/d/a;->Gi()Ljava/lang/String;
+    invoke-direct {p0}, Lokhttp3/internal/d/a;->Gl()Ljava/lang/String;
 
     move-result-object v0
 
@@ -241,9 +241,9 @@
 
     invoke-direct {v2}, Lokhttp3/Response$a;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/internal/c/k;->bsr:Lokhttp3/u;
+    iget-object v3, v0, Lokhttp3/internal/c/k;->bsB:Lokhttp3/u;
 
-    iput-object v3, v2, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iput-object v3, v2, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
 
     iget v3, v0, Lokhttp3/internal/c/k;->code:I
 
@@ -253,7 +253,7 @@
 
     iput-object v3, v2, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Gj()Lokhttp3/Headers;
+    invoke-virtual {p0}, Lokhttp3/internal/d/a;->Gm()Lokhttp3/Headers;
 
     move-result-object v3
 
@@ -302,7 +302,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokhttp3/internal/d/a;->but:Lokhttp3/internal/b/g;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -431,7 +431,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0, p2}, Lokio/BufferedSink;->ej(Ljava/lang/String;)Lokio/BufferedSink;
 
@@ -443,7 +443,7 @@
 
     const/4 p2, 0x0
 
-    iget-object v1, p1, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v1, p1, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v1, v1
 
@@ -452,7 +452,7 @@
     :goto_0
     if-ge p2, v1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object v2, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-virtual {p1, p2}, Lokhttp3/Headers;->de(I)Ljava/lang/String;
 
@@ -483,7 +483,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/d/a;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/d/a;->btZ:Lokio/BufferedSink;
 
     invoke-interface {p1, v0}, Lokio/BufferedSink;->ej(Ljava/lang/String;)Lokio/BufferedSink;
 
@@ -575,15 +575,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/d/a;->but:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->btL:Lokhttp3/y;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v0, v0, Lokhttp3/y;->bnh:Ljava/net/Proxy;
+    iget-object v0, v0, Lokhttp3/y;->bnr:Ljava/net/Proxy;
 
     invoke-virtual {v0}, Ljava/net/Proxy;->type()Ljava/net/Proxy$Type;
 
@@ -593,7 +593,7 @@
 
     invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v2, p1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v2, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -601,9 +601,9 @@
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v2, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    invoke-virtual {v2}, Lokhttp3/s;->Fl()Z
+    invoke-virtual {v2}, Lokhttp3/s;->Fo()Z
 
     move-result v2
 
@@ -623,14 +623,14 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget-object v0, p1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bnk: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;->bna:Lokhttp3/s;
+    iget-object v0, p1, Lokhttp3/w;->bnk: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;->brx:Lokhttp3/Headers;
+    iget-object p1, p1, Lokhttp3/w;->brH: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;->but:Lokhttp3/internal/b/g;
+    iget-object v0, p0, Lokhttp3/internal/d/a;->buD:Lokhttp3/internal/b/g;
 
-    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {v0}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/b/c;->btM:Ljava/net/Socket;
+    iget-object v0, v0, Lokhttp3/internal/b/c;->btW:Ljava/net/Socket;
 
     invoke-static {v0}, Lokhttp3/internal/c;->a(Ljava/net/Socket;)V
 
@@ -732,9 +732,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object p1, p1, Lokhttp3/Response;->bsq:Lokhttp3/w;
+    iget-object p1, p1, Lokhttp3/Response;->bsA:Lokhttp3/w;
 
-    iget-object p1, p1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bnk: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;->but:Lokhttp3/internal/b/g;
+    iget-object v1, p0, Lokhttp3/internal/d/a;->buD: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;->Ge()V
+    invoke-virtual {v1}, Lokhttp3/internal/b/g;->Gh()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 86e660fa94..e796e0fe14 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 buF:Lokhttp3/internal/e/b;
-
-.field public static final enum buG:Lokhttp3/internal/e/b;
-
-.field public static final enum buH:Lokhttp3/internal/e/b;
-
-.field public static final enum buI:Lokhttp3/internal/e/b;
-
-.field public static final enum buJ:Lokhttp3/internal/e/b;
-
-.field public static final enum buK:Lokhttp3/internal/e/b;
-
-.field public static final enum buL:Lokhttp3/internal/e/b;
-
-.field public static final enum buM:Lokhttp3/internal/e/b;
-
-.field public static final enum buN:Lokhttp3/internal/e/b;
-
-.field public static final enum buO:Lokhttp3/internal/e/b;
-
 .field public static final enum buP:Lokhttp3/internal/e/b;
 
-.field private static final synthetic buQ:[Lokhttp3/internal/e/b;
+.field public static final enum buQ:Lokhttp3/internal/e/b;
+
+.field public static final enum buR:Lokhttp3/internal/e/b;
+
+.field public static final enum buS:Lokhttp3/internal/e/b;
+
+.field public static final enum buT:Lokhttp3/internal/e/b;
+
+.field public static final enum buU:Lokhttp3/internal/e/b;
+
+.field public static final enum buV:Lokhttp3/internal/e/b;
+
+.field public static final enum buW:Lokhttp3/internal/e/b;
+
+.field public static final enum buX:Lokhttp3/internal/e/b;
+
+.field public static final enum buY:Lokhttp3/internal/e/b;
+
+.field public static final enum buZ:Lokhttp3/internal/e/b;
+
+.field private static final synthetic bva:[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;->buF:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buP: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;->buG:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buQ: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;->buH:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buR: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;->buI:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buS: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;->buJ:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buT: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;->buK:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buU: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;->buL:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buV: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;->buM:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buW: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;->buN:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buX: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;->buO:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buY: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;->buP:Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->buZ:Lokhttp3/internal/e/b;
 
     new-array v0, v12, [Lokhttp3/internal/e/b;
 
-    sget-object v12, Lokhttp3/internal/e/b;->buF:Lokhttp3/internal/e/b;
+    sget-object v12, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
 
     aput-object v12, v0, v1
 
-    sget-object v1, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/internal/e/b;->buH:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buR:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/internal/e/b;->buI:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buS:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/internal/e/b;->buJ:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v7
 
-    sget-object v1, Lokhttp3/internal/e/b;->buL:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buV:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v9
 
-    sget-object v1, Lokhttp3/internal/e/b;->buM:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buW:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v6
 
-    sget-object v1, Lokhttp3/internal/e/b;->buN:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buX:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v8
 
-    sget-object v1, Lokhttp3/internal/e/b;->buO:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buY:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v10
 
-    sget-object v1, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buZ:Lokhttp3/internal/e/b;
 
     aput-object v1, v0, v11
 
-    sput-object v0, Lokhttp3/internal/e/b;->buQ:[Lokhttp3/internal/e/b;
+    sput-object v0, Lokhttp3/internal/e/b;->bva:[Lokhttp3/internal/e/b;
 
     return-void
 .end method
@@ -279,7 +279,7 @@
 .method public static values()[Lokhttp3/internal/e/b;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/b;->buQ:[Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->bva:[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 708eee0487..53fa61e2b8 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 buR:Lokio/ByteString;
+.field public static final bvb:Lokio/ByteString;
 
-.field public static final buS:Lokio/ByteString;
+.field public static final bvc:Lokio/ByteString;
 
-.field public static final buT:Lokio/ByteString;
+.field public static final bvd:Lokio/ByteString;
 
-.field public static final buU:Lokio/ByteString;
+.field public static final bve:Lokio/ByteString;
 
-.field public static final buV:Lokio/ByteString;
+.field public static final bvf:Lokio/ByteString;
 
-.field public static final buW:Lokio/ByteString;
+.field public static final bvg:Lokio/ByteString;
 
 
 # instance fields
-.field public final buX:Lokio/ByteString;
+.field public final bvh:Lokio/ByteString;
 
-.field public final buY:Lokio/ByteString;
+.field public final bvi:Lokio/ByteString;
 
-.field final buZ:I
+.field final bvj:I
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->buR:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bvb:Lokio/ByteString;
 
     const-string v0, ":status"
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v0, ":method"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->buT:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
     const-string v0, ":path"
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->buU:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bve:Lokio/ByteString;
 
     const-string v0, ":scheme"
 
@@ -75,7 +75,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->buV:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bvf:Lokio/ByteString;
 
     const-string v0, ":authority"
 
@@ -83,7 +83,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/c;->buW:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/c;->bvg:Lokio/ByteString;
 
     return-void
 .end method
@@ -121,9 +121,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iput-object p1, p0, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
-    iput-object p2, p0, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/e/c;->bvi: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;->buZ:I
+    iput p1, p0, Lokhttp3/internal/e/c;->bvj:I
 
     return-void
 .end method
@@ -155,9 +155,9 @@
 
     check-cast p1, Lokhttp3/internal/e/c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
-    iget-object v2, p1, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object v2, p1, Lokhttp3/internal/e/c;->bvh: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;->buY:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->bvi: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;->buX:Lokio/ByteString;
+    iget-object v0, p0, Lokhttp3/internal/e/c;->bvh: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;->buY:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->bvi: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;->buX:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v1
 
@@ -224,9 +224,9 @@
 
     aput-object v1, v0, v2
 
-    iget-object v1, p0, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object v1, p0, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Ht()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 0db7271957..5ee3f25b3a 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 bvc:Ljava/util/List;
+.field private final bvm:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,19 +25,19 @@
     .end annotation
 .end field
 
-.field private final bvd:I
+.field private final bvn:I
 
-.field private bve:I
+.field private bvo:I
 
-.field bvf:[Lokhttp3/internal/e/c;
+.field bvp:[Lokhttp3/internal/e/c;
 
-.field bvg:I
+.field bvq:I
 
-.field bvh:I
+.field bvr:I
 
-.field bvi:I
+.field bvs:I
 
-.field private final lZ:Lokio/d;
+.field private final lY: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;->bvc:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
 
     const/16 p1, 0x8
 
     new-array p1, p1, [Lokhttp3/internal/e/c;
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
-    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     array-length p1, p1
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvr:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
     const/16 p1, 0x1000
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvd:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bve:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvo:I
 
     invoke-static {p3}, Lokio/j;->b(Lokio/r;)Lokio/d;
 
     move-result-object p1
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
 
     return-void
 .end method
@@ -97,18 +97,18 @@
     return-void
 .end method
 
-.method private Gk()V
+.method private Gn()V
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bve:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->bvo:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
     if-ge v0, v1, :cond_1
 
     if-nez v0, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gl()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Go()V
 
     return-void
 
@@ -121,33 +121,33 @@
     return-void
 .end method
 
-.method private Gl()V
+.method private Go()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvp:[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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvr:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
     return-void
 .end method
 
-.method private Go()I
+.method private Gr()I
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -155,7 +155,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -166,7 +166,7 @@
     return v0
 .end method
 
-.method private Gp()Lokio/ByteString;
+.method private Gs()Lokio/ByteString;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -174,7 +174,7 @@
         }
     .end annotation
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Go()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gr()I
 
     move-result v0
 
@@ -200,11 +200,11 @@
 
     if-eqz v1, :cond_1
 
-    invoke-static {}, Lokhttp3/internal/e/k;->GF()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->GI()Lokhttp3/internal/e/k;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->lY: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;->lZ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
 
     int-to-long v2, v0
 
@@ -237,22 +237,22 @@
 .method private a(Lokhttp3/internal/e/c;)V
     .locals 6
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvc:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget v0, p1, Lokhttp3/internal/e/c;->buZ:I
+    iget v0, p1, Lokhttp3/internal/e/c;->bvj:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bve:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvo:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gl()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Go()V
 
     return-void
 
     :cond_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
     add-int/2addr v2, v0
 
@@ -260,11 +260,11 @@
 
     invoke-direct {p0, v2}, Lokhttp3/internal/e/d$a;->di(I)I
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvr:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v3, v2
 
@@ -284,38 +284,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$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bvr:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvr:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
     return-void
 .end method
@@ -327,44 +327,44 @@
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->buZ:I
+    iget v2, v2, Lokhttp3/internal/e/c;->bvj:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->buZ:I
+    iget v3, v3, Lokhttp3/internal/e/c;->bvj:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvi:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvs:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvr:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iput v2, p0, Lokhttp3/internal/e/d$a;->bvr: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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -383,15 +383,15 @@
 
     add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$a;->bvh:I
+    iget v3, p0, Lokhttp3/internal/e/d$a;->bvr: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;->bvg:I
+    iget p1, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iput p1, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     :cond_1
     return v0
@@ -400,7 +400,7 @@
 .method private dj(I)I
     .locals 1
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bvg:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->bvq:I
 
     add-int/lit8 v0, v0, 0x1
 
@@ -423,16 +423,16 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object p1, v0, p1
 
-    iget-object p1, p1, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
     return-object p1
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
@@ -444,7 +444,7 @@
 
     if-ltz v0, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvp:[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;->buX:Lokio/ByteString;
+    iget-object p1, p1, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
     return-object p1
 
@@ -483,7 +483,7 @@
 
     if-ltz p0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v0, Lokhttp3/internal/e/d;->bvk:[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;->Go()I
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gr()I
 
     move-result v0
 
@@ -547,7 +547,7 @@
 
 
 # virtual methods
-.method final Gm()V
+.method final Gp()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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Z
+    invoke-interface {v0}, Lokio/d;->Hi()Z
 
     move-result v0
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -594,18 +594,18 @@
 
     if-eqz v1, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v0, v1, v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvm: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;->bva:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
@@ -617,13 +617,13 @@
 
     if-ltz v1, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v3, v2
 
     if-ge v1, v3, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvc:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/e/d$a;->bvm: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;->Gp()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
 
     move-result-object v0
 
@@ -665,7 +665,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gp()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
 
     move-result-object v1
 
@@ -694,7 +694,7 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gp()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
 
     move-result-object v1
 
@@ -719,17 +719,17 @@
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$a;->bve:I
+    iput v0, p0, Lokhttp3/internal/e/d$a;->bvo:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$a;->bve:I
+    iget v0, p0, Lokhttp3/internal/e/d$a;->bvo:I
 
     if-ltz v0, :cond_5
 
-    iget v1, p0, Lokhttp3/internal/e/d$a;->bvd:I
+    iget v1, p0, Lokhttp3/internal/e/d$a;->bvn:I
 
     if-gt v0, v1, :cond_5
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gk()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gn()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;->bve:I
+    iget v2, p0, Lokhttp3/internal/e/d$a;->bvo:I
 
     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
@@ -776,11 +776,11 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gp()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvc:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvm: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;->Gp()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
 
     move-result-object v0
 
@@ -800,11 +800,11 @@
 
     move-result-object v0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gp()Lokio/ByteString;
+    invoke-direct {p0}, Lokhttp3/internal/e/d$a;->Gs()Lokio/ByteString;
 
     move-result-object v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvc:Ljava/util/List;
+    iget-object v2, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
 
     new-instance v3, Lokhttp3/internal/e/c;
 
@@ -827,7 +827,7 @@
     return-void
 .end method
 
-.method public final Gn()Ljava/util/List;
+.method public final Gq()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;->bvc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvm:Ljava/util/List;
 
     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvc:Ljava/util/List;
+    iget-object v1, p0, Lokhttp3/internal/e/d$a;->bvm: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 ab6560c544..746554fb4e 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 bvd:I
+.field bvn:I
 
-.field bve:I
+.field bvo:I
 
-.field bvf:[Lokhttp3/internal/e/c;
+.field bvp:[Lokhttp3/internal/e/c;
 
-.field bvg:I
+.field bvq:I
 
-.field bvh:I
+.field bvr:I
 
-.field bvi:I
+.field bvs:I
 
-.field private final bvj:Lokio/c;
+.field private final bvt:Lokio/c;
 
-.field private final bvk:Z
+.field private final bvu:Z
 
-.field private bvl:I
+.field private bvv:I
 
-.field private bvm:Z
+.field private bvw:Z
 
 
 # direct methods
@@ -54,15 +54,15 @@
 
     const p2, 0x7fffffff
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvl:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvv:I
 
     const/16 p2, 0x8
 
     new-array p2, p2, [Lokhttp3/internal/e/c;
 
-    iput-object p2, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iput-object p2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvp:[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;->bvg:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     const/4 p2, 0x0
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvr:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
     const/16 p2, 0x1000
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bvd:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
-    iput p2, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iput p2, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvk:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvu:Z
 
-    iput-object p1, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     return-void
 .end method
 
-.method private Gl()V
+.method private Go()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvp:[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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v0, v0
 
     add-int/lit8 v0, v0, -0x1
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvr:I
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
     return-void
 .end method
@@ -120,18 +120,18 @@
 .method private b(Lokhttp3/internal/e/c;)V
     .locals 6
 
-    iget v0, p1, Lokhttp3/internal/e/c;->buZ:I
+    iget v0, p1, Lokhttp3/internal/e/c;->bvj:I
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
     if-le v0, v1, :cond_0
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Gl()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Go()V
 
     return-void
 
     :cond_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
     add-int/2addr v2, v0
 
@@ -139,11 +139,11 @@
 
     invoke-direct {p0, v2}, Lokhttp3/internal/e/d$b;->di(I)I
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvr:I
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v2, v2
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
-    iput-object v1, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iput-object v1, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     :cond_1
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     add-int/lit8 v2, v1, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     aput-object p1, v2, v1
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvr:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvr:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
     return-void
 .end method
@@ -207,13 +207,13 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvk:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvu:Z
 
     const/16 v1, 0x7f
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lokhttp3/internal/e/k;->GF()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->GI()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;->GF()Lokhttp3/internal/e/k;
+    invoke-static {}, Lokhttp3/internal/e/k;->GI()Lokhttp3/internal/e/k;
 
     invoke-static {p1, v0}, Lokhttp3/internal/e/k;->a(Lokio/ByteString;Lokio/BufferedSink;)V
 
-    invoke-virtual {v0}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/c;->Gs()Lokio/ByteString;
 
     move-result-object p1
 
@@ -245,7 +245,7 @@
 
     invoke-direct {p0, v0, v1, v2}, Lokhttp3/internal/e/d$b;->k(III)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
@@ -260,7 +260,7 @@
 
     invoke-direct {p0, v0, v1, v2}, Lokhttp3/internal/e/d$b;->k(III)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
@@ -274,44 +274,44 @@
 
     if-lez p1, :cond_1
 
-    iget-object v1, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v1, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     array-length v1, v1
 
     add-int/lit8 v1, v1, -0x1
 
     :goto_0
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     if-lt v1, v2, :cond_0
 
     if-lez p1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v2, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     aget-object v2, v2, v1
 
-    iget v2, v2, Lokhttp3/internal/e/c;->buZ:I
+    iget v2, v2, Lokhttp3/internal/e/c;->bvj:I
 
     sub-int/2addr p1, v2
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
-    iget-object v3, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v3, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     aget-object v3, v3, v1
 
-    iget v3, v3, Lokhttp3/internal/e/c;->buZ:I
+    iget v3, v3, Lokhttp3/internal/e/c;->bvj:I
 
     sub-int/2addr v2, v3
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvr:I
 
     add-int/lit8 v2, v2, -0x1
 
-    iput v2, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iput v2, p0, Lokhttp3/internal/e/d$b;->bvr: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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     add-int/lit8 v2, v1, 0x1
 
@@ -330,13 +330,13 @@
 
     add-int/2addr v1, v0
 
-    iget v3, p0, Lokhttp3/internal/e/d$b;->bvh:I
+    iget v3, p0, Lokhttp3/internal/e/d$b;->bvr: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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object p1, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
-    iget v1, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iget v1, p0, Lokhttp3/internal/e/d$b;->bvq: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;->bvg:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     add-int/2addr p1, v0
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvg:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     :cond_1
     return v0
@@ -363,7 +363,7 @@
 
     if-ge p1, p2, :cond_0
 
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     or-int/2addr p1, p3
 
@@ -372,7 +372,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     or-int/2addr p3, p2
 
@@ -387,7 +387,7 @@
 
     and-int/lit8 p3, p1, 0x7f
 
-    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     or-int/2addr p2, p3
 
@@ -398,7 +398,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     invoke-virtual {p2, p1}, Lokio/c;->du(I)Lokio/c;
 
@@ -424,15 +424,15 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvm:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvw:Z
 
     const/4 v1, 0x0
 
     if-eqz v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvl:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
 
-    iget v2, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iget v2, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
     const/16 v3, 0x20
 
@@ -443,13 +443,13 @@
     invoke-direct {p0, v0, v4, v3}, Lokhttp3/internal/e/d$b;->k(III)V
 
     :cond_0
-    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->bvm:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/d$b;->bvw:Z
 
     const v0, 0x7fffffff
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvl:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
     invoke-direct {p0, v0, v4, v3}, Lokhttp3/internal/e/d$b;->k(III)V
 
@@ -469,15 +469,15 @@
 
     check-cast v3, Lokhttp3/internal/e/c;
 
-    iget-object v4, v3, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object v4, v3, Lokhttp3/internal/e/c;->bvh:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Hv()Lokio/ByteString;
+    invoke-virtual {v4}, Lokio/ByteString;->Hy()Lokio/ByteString;
 
     move-result-object v4
 
-    iget-object v5, v3, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object v5, v3, Lokhttp3/internal/e/c;->bvi:Lokio/ByteString;
 
-    sget-object v6, Lokhttp3/internal/e/d;->bvb:Ljava/util/Map;
+    sget-object v6, Lokhttp3/internal/e/d;->bvl: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;->bva:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     add-int/lit8 v10, v6, -0x1
 
     aget-object v9, v9, v10
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->bvi: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;->bva:[Lokhttp3/internal/e/c;
+    sget-object v9, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v9, v9, v6
 
-    iget-object v9, v9, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object v9, v9, Lokhttp3/internal/e/c;->bvi: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;->bvg:I
+    iget v10, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     add-int/2addr v10, v8
 
-    iget-object v8, p0, Lokhttp3/internal/e/d$b;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v8, p0, Lokhttp3/internal/e/d$b;->bvp:[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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->bvh: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;->bvf:[Lokhttp3/internal/e/c;
+    iget-object v11, p0, Lokhttp3/internal/e/d$b;->bvp:[Lokhttp3/internal/e/c;
 
     aget-object v11, v11, v10
 
-    iget-object v11, v11, Lokhttp3/internal/e/c;->buY:Lokio/ByteString;
+    iget-object v11, v11, Lokhttp3/internal/e/c;->bvi: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;->bvg:I
+    iget v6, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     sub-int/2addr v10, v6
 
-    sget-object v6, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v6, Lokhttp3/internal/e/d;->bvk:[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;->bvg:I
+    iget v9, p0, Lokhttp3/internal/e/d$b;->bvq:I
 
     sub-int v9, v10, v9
 
-    sget-object v11, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v11, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     array-length v11, v11
 
@@ -641,7 +641,7 @@
 
     if-ne v9, v7, :cond_9
 
-    iget-object v7, p0, Lokhttp3/internal/e/d$b;->bvj:Lokio/c;
+    iget-object v7, p0, Lokhttp3/internal/e/d$b;->bvt:Lokio/c;
 
     invoke-virtual {v7, v6}, Lokio/c;->du(I)Lokio/c;
 
@@ -654,7 +654,7 @@
     goto :goto_4
 
     :cond_9
-    sget-object v7, Lokhttp3/internal/e/c;->buR:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->bvb: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;->buW:Lokio/ByteString;
+    sget-object v7, Lokhttp3/internal/e/c;->bvg:Lokio/ByteString;
 
     invoke-virtual {v7, v4}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -699,7 +699,7 @@
 .method final dm(I)V
     .locals 1
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bvd:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvn:I
 
     const/16 v0, 0x4000
 
@@ -707,7 +707,7 @@
 
     move-result p1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
     if-ne v0, p1, :cond_0
 
@@ -716,30 +716,30 @@
     :cond_0
     if-ge p1, v0, :cond_1
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvl:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
 
     invoke-static {v0, p1}, Ljava/lang/Math;->min(II)I
 
     move-result v0
 
-    iput v0, p0, Lokhttp3/internal/e/d$b;->bvl:I
+    iput v0, p0, Lokhttp3/internal/e/d$b;->bvv:I
 
     :cond_1
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvm:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/d$b;->bvw:Z
 
-    iput p1, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iput p1, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
-    iget p1, p0, Lokhttp3/internal/e/d$b;->bve:I
+    iget p1, p0, Lokhttp3/internal/e/d$b;->bvo:I
 
-    iget v0, p0, Lokhttp3/internal/e/d$b;->bvi:I
+    iget v0, p0, Lokhttp3/internal/e/d$b;->bvs:I
 
     if-ge p1, v0, :cond_3
 
     if-nez p1, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Gl()V
+    invoke-direct {p0}, Lokhttp3/internal/e/d$b;->Go()V
 
     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 f518300cb1..0d14b502db 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 bva:[Lokhttp3/internal/e/c;
+.field static final bvk:[Lokhttp3/internal/e/c;
 
-.field static final bvb:Ljava/util/Map;
+.field static final bvl: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;->buW:Lokio/ByteString;
+    sget-object v2, Lokhttp3/internal/e/c;->bvg:Lokio/ByteString;
 
     const-string v3, ""
 
@@ -49,7 +49,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buT:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
     const-string v5, "GET"
 
@@ -61,7 +61,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buT:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
     const-string v5, "POST"
 
@@ -73,7 +73,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buU:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bve:Lokio/ByteString;
 
     const-string v5, "/"
 
@@ -85,7 +85,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buU:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bve: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;->buV:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvf:Lokio/ByteString;
 
     const-string v5, "http"
 
@@ -109,7 +109,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buV:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvf:Lokio/ByteString;
 
     const-string v5, "https"
 
@@ -121,7 +121,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "200"
 
@@ -133,7 +133,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "204"
 
@@ -145,7 +145,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "206"
 
@@ -157,7 +157,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "304"
 
@@ -169,7 +169,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "400"
 
@@ -181,7 +181,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "404"
 
@@ -193,7 +193,7 @@
 
     new-instance v1, Lokhttp3/internal/e/c;
 
-    sget-object v4, Lokhttp3/internal/e/c;->buS:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/c;->bvc:Lokio/ByteString;
 
     const-string v5, "500"
 
@@ -675,18 +675,18 @@
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sput-object v0, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     new-instance v0, Ljava/util/LinkedHashMap;
 
-    sget-object v1, Lokhttp3/internal/e/d;->bva:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvk:[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;->bva:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvk:[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;->buX:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->bvh: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;->bva:[Lokhttp3/internal/e/c;
+    sget-object v1, Lokhttp3/internal/e/d;->bvk:[Lokhttp3/internal/e/c;
 
     aget-object v1, v1, v2
 
-    iget-object v1, v1, Lokhttp3/internal/e/c;->buX:Lokio/ByteString;
+    iget-object v1, v1, Lokhttp3/internal/e/c;->bvh: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;->bvb:Ljava/util/Map;
+    sput-object v0, Lokhttp3/internal/e/d;->bvl: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;->Hq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Ht()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 badf04afc2..bbdde1379a 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 bvn:Lokio/ByteString;
+.field static final bvA:[Ljava/lang/String;
 
-.field private static final bvo:[Ljava/lang/String;
+.field static final bvx:Lokio/ByteString;
 
-.field static final bvp:[Ljava/lang/String;
+.field private static final bvy:[Ljava/lang/String;
 
-.field static final bvq:[Ljava/lang/String;
+.field static final bvz:[Ljava/lang/String;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvn:Lokio/ByteString;
+    sput-object v0, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
 
     const/16 v0, 0xa
 
@@ -89,24 +89,24 @@
 
     aput-object v8, v0, v7
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvo:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->bvy:[Ljava/lang/String;
 
     const/16 v0, 0x40
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     const/16 v0, 0x100
 
     new-array v0, v0, [Ljava/lang/String;
 
-    sput-object v0, Lokhttp3/internal/e/e;->bvq:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v7, Lokhttp3/internal/e/e;->bvq:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
 
     array-length v8, v7
 
@@ -141,7 +141,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v0, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     const-string v7, ""
 
@@ -168,7 +168,7 @@
 
     aget v8, v7, v0
 
-    sget-object v10, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->bvz:[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;->bvp:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     aget-object v8, v13, v8
 
@@ -195,7 +195,7 @@
     goto :goto_1
 
     :cond_1
-    sget-object v0, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     const-string v8, "END_HEADERS"
 
@@ -227,7 +227,7 @@
 
     aget v9, v7, v8
 
-    sget-object v10, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->bvz:[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;->bvp:[Ljava/lang/String;
+    sget-object v13, Lokhttp3/internal/e/e;->bvz:[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;->bvp:[Ljava/lang/String;
+    sget-object v14, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     aget-object v14, v14, v5
 
@@ -257,7 +257,7 @@
 
     aput-object v12, v10, v11
 
-    sget-object v10, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v10, Lokhttp3/internal/e/e;->bvz:[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;->bvp:[Ljava/lang/String;
+    sget-object v14, Lokhttp3/internal/e/e;->bvz:[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;->bvp:[Ljava/lang/String;
+    sget-object v9, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     aget-object v9, v9, v5
 
@@ -298,7 +298,7 @@
 
     :cond_3
     :goto_4
-    sget-object v0, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     array-length v2, v0
 
@@ -308,7 +308,7 @@
 
     if-nez v2, :cond_4
 
-    sget-object v2, Lokhttp3/internal/e/e;->bvq:[Ljava/lang/String;
+    sget-object v2, Lokhttp3/internal/e/e;->bvA:[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;->bvo:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/e/e;->bvy:[Ljava/lang/String;
 
     array-length v1, v0
 
@@ -404,7 +404,7 @@
 
     if-eq p3, v7, :cond_7
 
-    sget-object v7, Lokhttp3/internal/e/e;->bvp:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->bvz:[Ljava/lang/String;
 
     array-length v8, v7
 
@@ -415,7 +415,7 @@
     goto :goto_1
 
     :cond_2
-    sget-object v7, Lokhttp3/internal/e/e;->bvq:[Ljava/lang/String;
+    sget-object v7, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
 
     aget-object v7, v7, p4
 
@@ -466,14 +466,14 @@
     goto :goto_2
 
     :cond_6
-    sget-object p3, Lokhttp3/internal/e/e;->bvq:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->bvA:[Ljava/lang/String;
 
     aget-object p3, p3, p4
 
     goto :goto_2
 
     :cond_7
-    sget-object p3, Lokhttp3/internal/e/e;->bvq:[Ljava/lang/String;
+    sget-object p3, Lokhttp3/internal/e/e;->bvA:[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 065a167bb4..44a3e39010 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 buz:J
+.field buJ:J
 
-.field bvw:Z
+.field bvG:Z
 
-.field final synthetic bvx:Lokhttp3/internal/e/f;
+.field final synthetic bvH: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;->bvx:Lokhttp3/internal/e/f;
+    iput-object p1, p0, Lokhttp3/internal/e/f$a;->bvH: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;->bvw:Z
+    iput-boolean p1, p0, Lokhttp3/internal/e/f$a;->bvG:Z
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->buz:J
+    iput-wide p1, p0, Lokhttp3/internal/e/f$a;->buJ: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;->bvw:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/f$a;->bvG: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;->bvw:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/f$a;->bvG:Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/f$a;->bvx:Lokhttp3/internal/e/f;
+    iget-object v0, p0, Lokhttp3/internal/e/f$a;->bvH:Lokhttp3/internal/e/f;
 
-    iget-object v0, v0, Lokhttp3/internal/e/f;->but:Lokhttp3/internal/b/g;
+    iget-object v0, v0, Lokhttp3/internal/e/f;->buD:Lokhttp3/internal/b/g;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lokhttp3/internal/e/f$a;->bvx:Lokhttp3/internal/e/f;
+    iget-object v2, p0, Lokhttp3/internal/e/f$a;->bvH: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
-    invoke-virtual {p0}, Lokhttp3/internal/e/f$a;->Hy()Lokio/r;
+    invoke-virtual {p0}, Lokhttp3/internal/e/f$a;->HB()Lokio/r;
 
     move-result-object v0
 
@@ -93,11 +93,11 @@
 
     if-lez p3, :cond_0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->buz:J
+    iget-wide v0, p0, Lokhttp3/internal/e/f$a;->buJ:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->buz:J
+    iput-wide v0, p0, Lokhttp3/internal/e/f$a;->buJ: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 744b139900..16504ccedf 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 bvr:Ljava/util/List;
+.field private static final bvB:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private static final bvs:Ljava/util/List;
+.field private static final bvC:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -37,15 +37,15 @@
 
 
 # instance fields
-.field private final bsr:Lokhttp3/u;
+.field private final bsB:Lokhttp3/u;
 
-.field final but:Lokhttp3/internal/b/g;
+.field final buD:Lokhttp3/internal/b/g;
 
-.field private final bvt:Lokhttp3/Interceptor$Chain;
+.field private final bvD:Lokhttp3/Interceptor$Chain;
 
-.field private final bvu:Lokhttp3/internal/e/g;
+.field private final bvE:Lokhttp3/internal/e/g;
 
-.field private bvv:Lokhttp3/internal/e/i;
+.field private bvF:Lokhttp3/internal/e/i;
 
 
 # direct methods
@@ -132,7 +132,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->bvr:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->bvB:Ljava/util/List;
 
     const/16 v0, 0x8
 
@@ -160,7 +160,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/f;->bvs:Ljava/util/List;
+    sput-object v0, Lokhttp3/internal/e/f;->bvC: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;->bvt:Lokhttp3/Interceptor$Chain;
+    iput-object p2, p0, Lokhttp3/internal/e/f;->bvD:Lokhttp3/Interceptor$Chain;
 
-    iput-object p3, p0, Lokhttp3/internal/e/f;->but:Lokhttp3/internal/b/g;
+    iput-object p3, p0, Lokhttp3/internal/e/f;->buD:Lokhttp3/internal/b/g;
 
-    iput-object p4, p0, Lokhttp3/internal/e/f;->bvu:Lokhttp3/internal/e/g;
+    iput-object p4, p0, Lokhttp3/internal/e/f;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/t;->bne:Ljava/util/List;
+    iget-object p1, p1, Lokhttp3/t;->bno:Ljava/util/List;
 
-    sget-object p2, Lokhttp3/u;->brU:Lokhttp3/u;
+    sget-object p2, Lokhttp3/u;->bse: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;->brU:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->bse:Lokhttp3/u;
 
     goto :goto_0
 
     :cond_0
-    sget-object p1, Lokhttp3/u;->brT:Lokhttp3/u;
+    sget-object p1, Lokhttp3/u;->bsd:Lokhttp3/u;
 
     :goto_0
-    iput-object p1, p0, Lokhttp3/internal/e/f;->bsr:Lokhttp3/u;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->bsB:Lokhttp3/u;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gg()V
+.method public final Gj()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -209,16 +209,16 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
     return-void
 .end method
 
-.method public final Gh()V
+.method public final Gk()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -226,9 +226,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Gy()Lokio/q;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GB()Lokio/q;
 
     move-result-object v0
 
@@ -245,19 +245,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Gx()Lokhttp3/Headers;
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GA()Lokhttp3/Headers;
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/f;->bsr:Lokhttp3/u;
+    iget-object v1, p0, Lokhttp3/internal/e/f;->bsB:Lokhttp3/u;
 
     new-instance v2, Lokhttp3/Headers$a;
 
     invoke-direct {v2}, Lokhttp3/Headers$a;-><init>()V
 
-    iget-object v3, v0, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v3, v0, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v3, v3
 
@@ -305,7 +305,7 @@
     goto :goto_1
 
     :cond_0
-    sget-object v9, Lokhttp3/internal/e/f;->bvs:Ljava/util/List;
+    sget-object v9, Lokhttp3/internal/e/f;->bvC:Ljava/util/List;
 
     invoke-interface {v9, v7}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
 
@@ -313,7 +313,7 @@
 
     if-nez v9, :cond_1
 
-    sget-object v9, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v9, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
     invoke-virtual {v9, v2, v7, v8}, Lokhttp3/internal/a;->a(Lokhttp3/Headers$a;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -330,7 +330,7 @@
 
     invoke-direct {v0}, Lokhttp3/Response$a;-><init>()V
 
-    iput-object v1, v0, Lokhttp3/Response$a;->bsr:Lokhttp3/u;
+    iput-object v1, v0, Lokhttp3/Response$a;->bsB:Lokhttp3/u;
 
     iget v1, v6, Lokhttp3/internal/c/k;->code:I
 
@@ -340,7 +340,7 @@
 
     iput-object v1, v0, Lokhttp3/Response$a;->message:Ljava/lang/String;
 
-    invoke-virtual {v2}, Lokhttp3/Headers$a;->Fj()Lokhttp3/Headers;
+    invoke-virtual {v2}, Lokhttp3/Headers$a;->Fm()Lokhttp3/Headers;
 
     move-result-object v1
 
@@ -350,7 +350,7 @@
 
     if-eqz p1, :cond_3
 
-    sget-object p1, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object p1, Lokhttp3/internal/a;->bsV:Lokhttp3/internal/a;
 
     invoke-virtual {p1, v0}, Lokhttp3/internal/a;->a(Lokhttp3/Response$a;)I
 
@@ -384,9 +384,9 @@
 .method public final a(Lokhttp3/w;J)Lokio/q;
     .locals 0
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i;->Gy()Lokio/q;
+    invoke-virtual {p1}, Lokhttp3/internal/e/i;->GB()Lokio/q;
 
     move-result-object p1
 
@@ -401,14 +401,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
     return-void
 
     :cond_0
-    iget-object v0, p1, Lokhttp3/w;->bry:Lokhttp3/RequestBody;
+    iget-object v0, p1, Lokhttp3/w;->brI:Lokhttp3/RequestBody;
 
     const/4 v1, 0x0
 
@@ -422,11 +422,11 @@
     const/4 v0, 0x0
 
     :goto_0
-    iget-object v2, p1, Lokhttp3/w;->brx:Lokhttp3/Headers;
+    iget-object v2, p1, Lokhttp3/w;->brH:Lokhttp3/Headers;
 
     new-instance v3, Ljava/util/ArrayList;
 
-    iget-object v4, v2, Lokhttp3/Headers;->bqS:[Ljava/lang/String;
+    iget-object v4, v2, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length v4, v4
 
@@ -438,9 +438,9 @@
 
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->buT:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bvd:Lokio/ByteString;
 
-    iget-object v6, p1, Lokhttp3/w;->bsg:Ljava/lang/String;
+    iget-object v6, p1, Lokhttp3/w;->bsq:Ljava/lang/String;
 
     invoke-direct {v4, v5, v6}, Lokhttp3/internal/e/c;-><init>(Lokio/ByteString;Ljava/lang/String;)V
 
@@ -448,9 +448,9 @@
 
     new-instance v4, Lokhttp3/internal/e/c;
 
-    sget-object v5, Lokhttp3/internal/e/c;->buU:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bve:Lokio/ByteString;
 
-    iget-object v6, p1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v6, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
 
     invoke-static {v6}, Lokhttp3/internal/c/i;->d(Lokhttp3/s;)Ljava/lang/String;
 
@@ -470,7 +470,7 @@
 
     new-instance v5, Lokhttp3/internal/e/c;
 
-    sget-object v6, Lokhttp3/internal/e/c;->buW:Lokio/ByteString;
+    sget-object v6, Lokhttp3/internal/e/c;->bvg: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;->buV:Lokio/ByteString;
+    sget-object v5, Lokhttp3/internal/e/c;->bvf:Lokio/ByteString;
 
-    iget-object p1, p1, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object p1, p1, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object p1, p1, Lokhttp3/s;->bqV:Ljava/lang/String;
+    iget-object p1, p1, Lokhttp3/s;->brf: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;->bqS:[Ljava/lang/String;
+    iget-object p1, v2, Lokhttp3/Headers;->brc:[Ljava/lang/String;
 
     array-length p1, p1
 
@@ -512,9 +512,9 @@
 
     move-result-object v4
 
-    sget-object v5, Lokhttp3/internal/e/f;->bvr:Ljava/util/List;
+    sget-object v5, Lokhttp3/internal/e/f;->bvB:Ljava/util/List;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v6
 
@@ -540,21 +540,21 @@
     goto :goto_1
 
     :cond_4
-    iget-object p1, p0, Lokhttp3/internal/e/f;->bvu:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvE: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;->bvv:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    iget-object p1, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvt:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvD:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Fx()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->FA()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;->bvv:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvt:Lokhttp3/Interceptor$Chain;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvD:Lokhttp3/Interceptor$Chain;
 
-    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->Fy()I
+    invoke-interface {v0}, Lokhttp3/Interceptor$Chain;->FB()I
 
     move-result v0
 
@@ -586,11 +586,11 @@
 .method public final cancel()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
     if-eqz v0, :cond_0
 
-    sget-object v1, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     invoke-virtual {v0, v1}, Lokhttp3/internal/e/i;->c(Lokhttp3/internal/e/b;)V
 
@@ -618,9 +618,9 @@
 
     new-instance p1, Lokhttp3/internal/e/f$a;
 
-    iget-object v3, p0, Lokhttp3/internal/e/f;->bvv:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/f;->bvF:Lokhttp3/internal/e/i;
 
-    iget-object v3, v3, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object v3, v3, Lokhttp3/internal/e/i;->bwy: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 2f18cad65f..0b882f8523 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 bvQ:I
+.field final synthetic bwa:I
 
-.field final synthetic bvR:Lokhttp3/internal/e/b;
+.field final synthetic bwb:Lokhttp3/internal/e/b;
 
-.field final synthetic bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$1;->bwc:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$1;->bvQ:I
+    iput p4, p0, Lokhttp3/internal/e/g$1;->bwa:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$1;->bvR:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$1;->bwb: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->bwc:Lokhttp3/internal/e/g;
 
-    iget v1, p0, Lokhttp3/internal/e/g$1;->bvQ:I
+    iget v1, p0, Lokhttp3/internal/e/g$1;->bwa:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$1;->bvR:Lokhttp3/internal/e/b;
+    iget-object v2, p0, Lokhttp3/internal/e/g$1;->bwb: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$1;->bwc: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 d4a7e863ae..b68a3cb6d4 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 bvQ:I
+.field final synthetic bwa:I
 
-.field final synthetic bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc:Lokhttp3/internal/e/g;
 
-.field final synthetic bvT:J
+.field final synthetic bwd: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$2;->bwc:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$2;->bvQ:I
+    iput p4, p0, Lokhttp3/internal/e/g$2;->bwa:I
 
-    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->bvT:J
+    iput-wide p5, p0, Lokhttp3/internal/e/g$2;->bwd: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$2;->bvQ:I
+    iget v1, p0, Lokhttp3/internal/e/g$2;->bwa:I
 
-    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->bvT:J
+    iget-wide v2, p0, Lokhttp3/internal/e/g$2;->bwd:J
 
     invoke-virtual {v0, v1, v2, v3}, Lokhttp3/internal/e/j;->l(IJ)V
     :try_end_0
@@ -58,7 +58,7 @@
     return-void
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$2;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$2;->bwc: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 873e7462a0..5bc791655e 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 bvQ:I
+.field final synthetic bwa:I
 
-.field final synthetic bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc:Lokhttp3/internal/e/g;
 
-.field final synthetic bvU:Ljava/util/List;
+.field final synthetic bwe: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$3;->bwc:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$3;->bvQ:I
+    iput p4, p0, Lokhttp3/internal/e/g$3;->bwa:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$3;->bvU:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$3;->bwe: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$3;->bvQ:I
+    iget v1, p0, Lokhttp3/internal/e/g$3;->bwa:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->buU: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$3;->bwc: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$3;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$3;->bvQ:I
+    iget v2, p0, Lokhttp3/internal/e/g$3;->bwa: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 b934bb2bdc..1cd319c9e9 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 bvQ:I
+.field final synthetic bwa:I
 
-.field final synthetic bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc:Lokhttp3/internal/e/g;
 
-.field final synthetic bvU:Ljava/util/List;
+.field final synthetic bwe:Ljava/util/List;
 
-.field final synthetic bvV:Z
+.field final synthetic bwf: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$4;->bwc:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$4;->bvQ:I
+    iput p4, p0, Lokhttp3/internal/e/g$4;->bwa:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$4;->bvU:Ljava/util/List;
+    iput-object p5, p0, Lokhttp3/internal/e/g$4;->bwe:Ljava/util/List;
 
-    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->bvV:Z
+    iput-boolean p6, p0, Lokhttp3/internal/e/g$4;->bwf: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$4;->bvQ:I
+    iget v1, p0, Lokhttp3/internal/e/g$4;->bwa:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->buU: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$4;->bwc: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$4;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$4;->bvQ:I
+    iget v2, p0, Lokhttp3/internal/e/g$4;->bwa: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 0222bd30e6..5bdf9ffc49 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 bsm:I
+.field final synthetic bsw:I
 
-.field final synthetic bvQ:I
+.field final synthetic bwa:I
 
-.field final synthetic bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc:Lokhttp3/internal/e/g;
 
-.field final synthetic bvV:Z
+.field final synthetic bwf:Z
 
-.field final synthetic bvW:Lokio/c;
+.field final synthetic bwg: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$5;->bwc:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$5;->bvQ:I
+    iput p4, p0, Lokhttp3/internal/e/g$5;->bwa:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$5;->bvW:Lokio/c;
+    iput-object p5, p0, Lokhttp3/internal/e/g$5;->bwg:Lokio/c;
 
-    iput p6, p0, Lokhttp3/internal/e/g$5;->bsm:I
+    iput p6, p0, Lokhttp3/internal/e/g$5;->bsw:I
 
-    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->bvV:Z
+    iput-boolean p7, p0, Lokhttp3/internal/e/g$5;->bwf: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvG:Lokhttp3/internal/e/l;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/l;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bvW:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bwg:Lokio/c;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->bsm:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->bsw:I
 
     invoke-interface {v0, v1, v2}, Lokhttp3/internal/e/l;->a(Lokio/d;I)Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget v1, p0, Lokhttp3/internal/e/g$5;->bvQ:I
+    iget v1, p0, Lokhttp3/internal/e/g$5;->bwa:I
 
-    sget-object v2, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v2, Lokhttp3/internal/e/b;->buU: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$5;->bwc: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$5;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$5;->bvQ:I
+    iget v2, p0, Lokhttp3/internal/e/g$5;->bwa: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 1f8a670825..daea8ddd38 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 bvQ:I
+.field final synthetic bwa:I
 
-.field final synthetic bvR:Lokhttp3/internal/e/b;
+.field final synthetic bwb:Lokhttp3/internal/e/b;
 
-.field final synthetic bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$6;->bwc:Lokhttp3/internal/e/g;
 
-    iput p4, p0, Lokhttp3/internal/e/g$6;->bvQ:I
+    iput p4, p0, Lokhttp3/internal/e/g$6;->bwa:I
 
-    iput-object p5, p0, Lokhttp3/internal/e/g$6;->bvR:Lokhttp3/internal/e/b;
+    iput-object p5, p0, Lokhttp3/internal/e/g$6;->bwb: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$6;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$6;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$6;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
 
-    iget v2, p0, Lokhttp3/internal/e/g$6;->bvQ:I
+    iget v2, p0, Lokhttp3/internal/e/g$6;->bwa: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 a915fbef9d..e696812c5d 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 btN:Ljava/net/Socket;
+.field btX:Ljava/net/Socket;
 
-.field btP:Lokio/BufferedSink;
+.field btZ:Lokio/BufferedSink;
 
-.field public bvA:Lokhttp3/internal/e/g$b;
+.field bvJ:Z
 
-.field bvG:Lokhttp3/internal/e/l;
+.field public bvK:Lokhttp3/internal/e/g$b;
 
-.field public bvX:I
+.field bvQ:Lokhttp3/internal/e/l;
 
-.field bvz:Z
+.field public bwh:I
 
 .field hostname:Ljava/lang/String;
 
-.field lZ:Lokio/d;
+.field lY:Lokio/d;
 
 
 # direct methods
@@ -38,24 +38,24 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    sget-object v0, Lokhttp3/internal/e/g$b;->bvY:Lokhttp3/internal/e/g$b;
+    sget-object v0, Lokhttp3/internal/e/g$b;->bwi:Lokhttp3/internal/e/g$b;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvA:Lokhttp3/internal/e/g$b;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvK:Lokhttp3/internal/e/g$b;
 
-    sget-object v0, Lokhttp3/internal/e/l;->bwI:Lokhttp3/internal/e/l;
+    sget-object v0, Lokhttp3/internal/e/l;->bwS:Lokhttp3/internal/e/l;
 
-    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvG:Lokhttp3/internal/e/l;
+    iput-object v0, p0, Lokhttp3/internal/e/g$a;->bvQ:Lokhttp3/internal/e/l;
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->bvz:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g$a;->bvJ:Z
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Gu()Lokhttp3/internal/e/g;
+.method public final Gx()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;->btN:Ljava/net/Socket;
+    iput-object p1, p0, Lokhttp3/internal/e/g$a;->btX: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;->lZ:Lokio/d;
+    iput-object p3, p0, Lokhttp3/internal/e/g$a;->lY:Lokio/d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$a;->btP:Lokio/BufferedSink;
+    iput-object p4, p0, Lokhttp3/internal/e/g$a;->btZ: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 1a0796fa2e..8d3dee7bcb 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;->buJ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buT: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 82f9d7911e..3d89173ed5 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 bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc:Lokhttp3/internal/e/g;
 
-.field final bvZ:Z
+.field final bwj:Z
 
-.field final bwa:I
+.field final bwk:I
 
-.field final bwb:I
+.field final bwl:I
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/internal/e/g;ZII)V
     .locals 2
 
-    iput-object p1, p0, Lokhttp3/internal/e/g$c;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$c;->bwc: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;->bvZ:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/g$c;->bwj:Z
 
-    iput p3, p0, Lokhttp3/internal/e/g$c;->bwa:I
+    iput p3, p0, Lokhttp3/internal/e/g$c;->bwk:I
 
-    iput p4, p0, Lokhttp3/internal/e/g$c;->bwb:I
+    iput p4, p0, Lokhttp3/internal/e/g$c;->bwl: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$c;->bwc:Lokhttp3/internal/e/g;
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->bvZ:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g$c;->bwj:Z
 
-    iget v2, p0, Lokhttp3/internal/e/g$c;->bwa:I
+    iget v2, p0, Lokhttp3/internal/e/g$c;->bwk:I
 
-    iget v3, p0, Lokhttp3/internal/e/g$c;->bwb:I
+    iget v3, p0, Lokhttp3/internal/e/g$c;->bwl:I
 
     if-nez v1, :cond_0
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvH:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvR:Z
 
     const/4 v5, 0x1
 
-    iput-boolean v5, v0, Lokhttp3/internal/e/g;->bvH:Z
+    iput-boolean v5, v0, Lokhttp3/internal/e/g;->bvR:Z
 
     monitor-exit v0
     :try_end_0
@@ -99,7 +99,7 @@
 
     if-eqz v4, :cond_0
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gr()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gu()V
 
     return-void
 
@@ -115,7 +115,7 @@
 
     :cond_0
     :try_start_2
-    iget-object v4, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v4, v0, Lokhttp3/internal/e/g;->bvX: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;->Gr()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/g;->Gu()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 e04c6cae21..7a8ad3603c 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 bwd:Lokhttp3/internal/e/i;
+.field final synthetic bwn:Lokhttp3/internal/e/i;
 
-.field final synthetic bwe:Lokhttp3/internal/e/g$d;
+.field final synthetic bwo: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;->bwe:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$1;->bwo:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->bwd:Lokhttp3/internal/e/i;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$1;->bwn: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;->bwe:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->bwo:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvA:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->bwd:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$1;->bwn: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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()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;->bwe:Lokhttp3/internal/e/g$d;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d$1;->bwo:Lokhttp3/internal/e/g$d;
 
-    iget-object v4, v4, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v4, v4, Lokhttp3/internal/e/g$d;->bwc: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;->bwd:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$1;->bwn:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buQ: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 75234c99f9..6c3dddb10c 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 bwe:Lokhttp3/internal/e/g$d;
+.field final synthetic bwo: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;->bwe:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$2;->bwo: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;->bwe:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$2;->bwo:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvA:Lokhttp3/internal/e/g$b;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/g$b;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->bwe:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$2;->bwo:Lokhttp3/internal/e/g$d;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, v1, Lokhttp3/internal/e/g$d;->bwc: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 f2881885d2..26ff9cc1e8 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 bwe:Lokhttp3/internal/e/g$d;
+.field final synthetic bwo:Lokhttp3/internal/e/g$d;
 
-.field final synthetic bwf:Lokhttp3/internal/e/m;
+.field final synthetic bwp: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;->bwe:Lokhttp3/internal/e/g$d;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d$3;->bwo:Lokhttp3/internal/e/g$d;
 
-    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->bwf:Lokhttp3/internal/e/m;
+    iput-object p4, p0, Lokhttp3/internal/e/g$d$3;->bwp: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;->bwe:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->bwo:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->bwf:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d$3;->bwp: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;->bwe:Lokhttp3/internal/e/g$d;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d$3;->bwo:Lokhttp3/internal/e/g$d;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/g$d;->bwc: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 8b1a075721..609c9f551c 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 bvS:Lokhttp3/internal/e/g;
+.field final synthetic bwc:Lokhttp3/internal/e/g;
 
-.field final bwc:Lokhttp3/internal/e/h;
+.field final bwm: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;->bvS:Lokhttp3/internal/e/g;
+    iput-object p1, p0, Lokhttp3/internal/e/g$d;->bwc: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;->bwc:Lokhttp3/internal/e/h;
+    iput-object p2, p0, Lokhttp3/internal/e/g$d;->bwm:Lokhttp3/internal/e/h;
 
     return-void
 .end method
@@ -55,12 +55,12 @@
 
     invoke-virtual {p2}, Lokio/ByteString;->size()I
 
-    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter p2
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object v0, v0, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -68,7 +68,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object v1, v1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -84,11 +84,11 @@
 
     check-cast v0, [Lokhttp3/internal/e/i;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v1, Lokhttp3/internal/e/g;->bvD:Z
+    iput-boolean v2, v1, Lokhttp3/internal/e/g;->bvN:Z
 
     monitor-exit p2
     :try_end_0
@@ -107,17 +107,17 @@
 
     if-le v3, p1, :cond_0
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/i;->Gw()Z
+    invoke-virtual {v2}, Lokhttp3/internal/e/i;->Gz()Z
 
     move-result v3
 
     if-eqz v3, :cond_0
 
-    sget-object v3, Lokhttp3/internal/e/b;->buJ:Lokhttp3/internal/e/b;
+    sget-object v3, Lokhttp3/internal/e/b;->buT:Lokhttp3/internal/e/b;
 
     invoke-virtual {v2, v3}, Lokhttp3/internal/e/i;->e(Lokhttp3/internal/e/b;)V
 
-    iget-object v3, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget v2, v2, Lokhttp3/internal/e/i;->id:I
 
@@ -151,22 +151,22 @@
 .method public final a(Lokhttp3/internal/e/m;)V
     .locals 11
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v1, v1, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object v1, v1, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {v1}, Lokhttp3/internal/e/m;->GL()I
 
     move-result v1
 
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object v2, v2, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object v2, v2, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
     const/4 v3, 0x0
 
@@ -183,7 +183,7 @@
 
     if-eqz v5, :cond_0
 
-    iget-object v5, p1, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v5, p1, Lokhttp3/internal/e/m;->bwU:[I
 
     aget v5, v5, v4
 
@@ -200,7 +200,7 @@
     const/4 v2, 0x1
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-static {v4}, Lokhttp3/internal/e/g;->c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -212,7 +212,7 @@
 
     new-array v7, v2, [Ljava/lang/Object;
 
-    iget-object v8, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v8, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object v8, v8, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -227,11 +227,11 @@
 
     :catch_0
     :try_start_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-object p1, p1, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object p1, p1, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GL()I
 
     move-result p1
 
@@ -249,18 +249,18 @@
 
     int-to-long v8, p1
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-boolean p1, p1, Lokhttp3/internal/e/g;->bvM:Z
+    iget-boolean p1, p1, Lokhttp3/internal/e/g;->bvW:Z
 
     if-nez p1, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iput-boolean v2, p1, Lokhttp3/internal/e/g;->bvM:Z
+    iput-boolean v2, p1, Lokhttp3/internal/e/g;->bvW:Z
 
     :cond_2
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -270,7 +270,7 @@
 
     if-nez p1, :cond_4
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -278,7 +278,7 @@
 
     move-result-object p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object v1, v1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -303,7 +303,7 @@
 
     :cond_4
     :goto_1
-    invoke-static {}, Lokhttp3/internal/e/g;->Gt()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->Gw()Ljava/util/concurrent/ExecutorService;
 
     move-result-object p1
 
@@ -313,7 +313,7 @@
 
     new-array v2, v2, [Ljava/lang/Object;
 
-    iget-object v10, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v10, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object v10, v10, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -385,16 +385,16 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter p1
 
     :try_start_0
-    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bwc: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object p2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-virtual {p2}, Ljava/lang/Object;->notifyAll()V
 
@@ -413,7 +413,7 @@
 
     :cond_0
     :try_start_1
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-static {p1}, Lokhttp3/internal/e/g;->c(Lokhttp3/internal/e/g;)Ljava/util/concurrent/ScheduledExecutorService;
 
@@ -421,7 +421,7 @@
 
     new-instance v0, Lokhttp3/internal/e/g$c;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     const/4 v2, 0x1
 
@@ -458,7 +458,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     :try_start_0
     new-instance v11, Lokhttp3/internal/e/g$4;
@@ -497,12 +497,12 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-virtual {v4, p2}, Lokhttp3/internal/e/g;->dn(I)Lokhttp3/internal/e/i;
 
@@ -510,9 +510,9 @@
 
     if-nez v4, :cond_4
 
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-boolean v4, v4, Lokhttp3/internal/e/g;->bvD:Z
+    iget-boolean v4, v4, Lokhttp3/internal/e/g;->bvN:Z
 
     if-eqz v4, :cond_1
 
@@ -521,9 +521,9 @@
     return-void
 
     :cond_1
-    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v4, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget v4, v4, Lokhttp3/internal/e/g;->bvB:I
+    iget v4, v4, Lokhttp3/internal/e/g;->bvL:I
 
     if-gt p2, v4, :cond_2
 
@@ -534,9 +534,9 @@
     :cond_2
     rem-int/lit8 v4, p2, 0x2
 
-    iget-object v5, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v5, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget v5, v5, Lokhttp3/internal/e/g;->bvC:I
+    iget v5, v5, Lokhttp3/internal/e/g;->bvM:I
 
     rem-int/2addr v5, v3
 
@@ -553,7 +553,7 @@
 
     new-instance p3, Lokhttp3/internal/e/i;
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     const/4 v7, 0x0
 
@@ -565,11 +565,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;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iput p2, p1, Lokhttp3/internal/e/g;->bvB:I
+    iput p2, p1, Lokhttp3/internal/e/g;->bvL:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object p1, p1, Lokhttp3/internal/e/g;->streams:Ljava/util/Map;
 
@@ -579,7 +579,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;->Gt()Ljava/util/concurrent/ExecutorService;
+    invoke-static {}, Lokhttp3/internal/e/g;->Gw()Ljava/util/concurrent/ExecutorService;
 
     move-result-object p1
 
@@ -589,7 +589,7 @@
 
     new-array v3, v3, [Ljava/lang/Object;
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     iget-object v6, v6, Lokhttp3/internal/e/g;->hostname:Ljava/lang/String;
 
@@ -638,9 +638,9 @@
     monitor-enter v4
 
     :try_start_2
-    iput-boolean v2, v4, Lokhttp3/internal/e/i;->bwn:Z
+    iput-boolean v2, v4, Lokhttp3/internal/e/i;->bwx:Z
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->bwl:Ljava/util/Deque;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->bwv:Ljava/util/Deque;
 
     invoke-static {p3}, Lokhttp3/internal/c;->V(Ljava/util/List;)Lokhttp3/Headers;
 
@@ -660,7 +660,7 @@
 
     if-nez p2, :cond_7
 
-    iget-object p2, v4, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object p2, v4, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
     iget p3, v4, Lokhttp3/internal/e/i;->id:I
 
@@ -669,7 +669,7 @@
     :cond_7
     if-eqz p1, :cond_8
 
-    invoke-virtual {v4}, Lokhttp3/internal/e/i;->Gz()V
+    invoke-virtual {v4}, Lokhttp3/internal/e/i;->GC()V
 
     :cond_8
     return-void
@@ -709,7 +709,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     new-instance v6, Lokio/c;
 
@@ -791,7 +791,7 @@
     throw p1
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p2}, Lokhttp3/internal/e/g;->dn(I)Lokhttp3/internal/e/i;
 
@@ -799,13 +799,13 @@
 
     if-nez v0, :cond_2
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    sget-object v0, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buQ: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     int-to-long v0, p4
 
@@ -837,7 +837,7 @@
 
     :cond_4
     :goto_0
-    iget-object p2, v0, Lokhttp3/internal/e/i;->bwo:Lokhttp3/internal/e/i$b;
+    iget-object p2, v0, Lokhttp3/internal/e/i;->bwy:Lokhttp3/internal/e/i$b;
 
     int-to-long v1, p4
 
@@ -845,7 +845,7 @@
 
     if-eqz p1, :cond_5
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->Gz()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GC()V
 
     :cond_5
     return-void
@@ -860,7 +860,7 @@
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     new-instance v7, Lokhttp3/internal/e/g$6;
 
@@ -899,7 +899,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->do(I)Lokhttp3/internal/e/i;
 
@@ -916,14 +916,14 @@
 .method public final execute()V
     .locals 9
 
-    sget-object v0, Lokhttp3/internal/e/b;->buH:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buR:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buH:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buR:Lokhttp3/internal/e/b;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwm:Lokhttp3/internal/e/h;
 
-    iget-boolean v3, v2, Lokhttp3/internal/e/h;->bvz:Z
+    iget-boolean v3, v2, Lokhttp3/internal/e/h;->bvJ:Z
 
     const/4 v4, 0x1
 
@@ -951,9 +951,9 @@
     throw v2
 
     :cond_1
-    iget-object v2, v2, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v2, v2, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
-    sget-object v3, Lokhttp3/internal/e/e;->bvn:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
 
     invoke-virtual {v3}, Lokio/ByteString;->size()I
 
@@ -965,7 +965,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
     sget-object v6, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
 
@@ -975,13 +975,13 @@
 
     if-eqz v3, :cond_2
 
-    sget-object v3, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
     const-string v6, "<< CONNECTION %s"
 
     new-array v7, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Hx()Ljava/lang/String;
 
     move-result-object v8
 
@@ -994,7 +994,7 @@
     invoke-virtual {v3, v6}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_2
-    sget-object v3, Lokhttp3/internal/e/e;->bvn:Lokio/ByteString;
+    sget-object v3, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
 
     invoke-virtual {v3, v2}, Lokio/ByteString;->equals(Ljava/lang/Object;)Z
 
@@ -1004,7 +1004,7 @@
 
     :cond_3
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/h;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwm:Lokhttp3/internal/e/h;
 
     invoke-virtual {v2, v5, p0}, Lokhttp3/internal/e/h;->a(ZLokhttp3/internal/e/h$b;)Z
 
@@ -1012,15 +1012,15 @@
 
     if-nez v2, :cond_3
 
-    sget-object v0, Lokhttp3/internal/e/b;->buF:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwc: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
@@ -1028,7 +1028,7 @@
     .catch Ljava/io/IOException; {:try_start_1 .. :try_end_1} :catch_0
 
     :catch_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwm:Lokhttp3/internal/e/h;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -1040,7 +1040,7 @@
 
     new-array v4, v4, [Ljava/lang/Object;
 
-    invoke-virtual {v2}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v2
 
@@ -1062,14 +1062,14 @@
 
     :catch_1
     :try_start_3
-    sget-object v0, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buQ: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;->bvS:Lokhttp3/internal/e/g;
+    iget-object v2, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
     :try_end_4
     .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0
 
@@ -1077,14 +1077,14 @@
 
     :goto_2
     :try_start_5
-    iget-object v3, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v3, p0, Lokhttp3/internal/e/g$d;->bwc: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;->bwc:Lokhttp3/internal/e/h;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwm:Lokhttp3/internal/e/h;
 
     invoke-static {v0}, Lokhttp3/internal/c;->closeQuietly(Ljava/io/Closeable;)V
 
@@ -1102,20 +1102,20 @@
 
     if-nez p1, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
-    iget-wide v1, p1, Lokhttp3/internal/e/g;->bvJ:J
+    iget-wide v1, p1, Lokhttp3/internal/e/g;->bvT:J
 
     add-long/2addr v1, p2
 
-    iput-wide v1, p1, Lokhttp3/internal/e/g;->bvJ:J
+    iput-wide v1, p1, Lokhttp3/internal/e/g;->bvT:J
 
-    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object p1, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-virtual {p1}, Ljava/lang/Object;->notifyAll()V
 
@@ -1133,7 +1133,7 @@
     throw p1
 
     :cond_0
-    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v0, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1}, Lokhttp3/internal/e/g;->dn(I)Lokhttp3/internal/e/i;
 
@@ -1174,12 +1174,12 @@
         }
     .end annotation
 
-    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bvS:Lokhttp3/internal/e/g;
+    iget-object v6, p0, Lokhttp3/internal/e/g$d;->bwc:Lokhttp3/internal/e/g;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
 
     invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -1191,7 +1191,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object p2, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->buQ:Lokhttp3/internal/e/b;
 
     invoke-virtual {v6, p1, p2}, Lokhttp3/internal/e/g;->a(ILokhttp3/internal/e/b;)V
 
@@ -1200,7 +1200,7 @@
     return-void
 
     :cond_0
-    iget-object v0, v6, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iget-object v0, v6, Lokhttp3/internal/e/g;->bvZ: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 58670c83da..60409b7d40 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/g.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/g.smali
@@ -20,43 +20,45 @@
 # static fields
 .field static final synthetic $assertionsDisabled:Z
 
-.field private static final bvy:Ljava/util/concurrent/ExecutorService;
+.field private static final bvI:Ljava/util/concurrent/ExecutorService;
 
 
 # instance fields
-.field final btN:Ljava/net/Socket;
+.field final btX:Ljava/net/Socket;
 
-.field final bvA:Lokhttp3/internal/e/g$b;
+.field final bvJ:Z
 
-.field bvB:I
+.field final bvK:Lokhttp3/internal/e/g$b;
 
-.field bvC:I
+.field bvL:I
 
-.field bvD:Z
+.field bvM:I
 
-.field private final bvE:Ljava/util/concurrent/ScheduledExecutorService;
+.field bvN:Z
 
-.field private final bvF:Ljava/util/concurrent/ExecutorService;
+.field private final bvO:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field final bvG:Lokhttp3/internal/e/l;
+.field private final bvP:Ljava/util/concurrent/ExecutorService;
 
-.field bvH:Z
+.field final bvQ:Lokhttp3/internal/e/l;
 
-.field bvI:J
+.field bvR:Z
 
-.field bvJ:J
+.field bvS:J
 
-.field bvK:Lokhttp3/internal/e/m;
+.field bvT:J
 
-.field final bvL:Lokhttp3/internal/e/m;
+.field bvU:Lokhttp3/internal/e/m;
 
-.field bvM:Z
+.field final bvV:Lokhttp3/internal/e/m;
 
-.field final bvN:Lokhttp3/internal/e/j;
+.field bvW:Z
 
-.field final bvO:Lokhttp3/internal/e/g$d;
+.field final bvX:Lokhttp3/internal/e/j;
 
-.field final bvP:Ljava/util/Set;
+.field final bvY:Lokhttp3/internal/e/g$d;
+
+.field final bvZ:Ljava/util/Set;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Set<",
@@ -66,8 +68,6 @@
     .end annotation
 .end field
 
-.field final bvz:Z
-
 .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;->bvy:Ljava/util/concurrent/ExecutorService;
+    sput-object v8, Lokhttp3/internal/e/g;->bvI: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;->bvI:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->bvS: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;->bvK:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvU: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;->bvL:Lokhttp3/internal/e/m;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
     const/4 v2, 0x0
 
-    iput-boolean v2, v0, Lokhttp3/internal/e/g;->bvM:Z
+    iput-boolean v2, v0, Lokhttp3/internal/e/g;->bvW:Z
 
     new-instance v3, Ljava/util/LinkedHashSet;
 
     invoke-direct {v3}, Ljava/util/LinkedHashSet;-><init>()V
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->bvP:Ljava/util/Set;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvZ:Ljava/util/Set;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvG:Lokhttp3/internal/e/l;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvQ:Lokhttp3/internal/e/l;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->bvG:Lokhttp3/internal/e/l;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvQ:Lokhttp3/internal/e/l;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvz:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
 
-    iput-boolean v3, v0, Lokhttp3/internal/e/g;->bvz:Z
+    iput-boolean v3, v0, Lokhttp3/internal/e/g;->bvJ:Z
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvA:Lokhttp3/internal/e/g$b;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->bvK:Lokhttp3/internal/e/g$b;
 
-    iput-object v3, v0, Lokhttp3/internal/e/g;->bvA:Lokhttp3/internal/e/g$b;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/g$b;
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvz:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
 
     const/4 v4, 0x2
 
@@ -186,26 +186,26 @@
     const/4 v3, 0x2
 
     :goto_0
-    iput v3, v0, Lokhttp3/internal/e/g;->bvC:I
+    iput v3, v0, Lokhttp3/internal/e/g;->bvM:I
 
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvz:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
 
     if-eqz v3, :cond_1
 
-    iget v3, v0, Lokhttp3/internal/e/g;->bvC:I
+    iget v3, v0, Lokhttp3/internal/e/g;->bvM:I
 
     add-int/2addr v3, v4
 
-    iput v3, v0, Lokhttp3/internal/e/g;->bvC:I
+    iput v3, v0, Lokhttp3/internal/e/g;->bvM:I
 
     :cond_1
-    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvz:Z
+    iget-boolean v3, v1, Lokhttp3/internal/e/g$a;->bvJ:Z
 
     const/4 v4, 0x7
 
     if-eqz v3, :cond_2
 
-    iget-object v3, v0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/m;
+    iget-object v3, v0, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
 
     const/high16 v6, 0x1000000
 
@@ -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;->bvE:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->bvX:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bwh:I
 
     if-eqz v3, :cond_3
 
-    iget-object v6, v0, Lokhttp3/internal/e/g;->bvE:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v6, v0, Lokhttp3/internal/e/g;->bvO: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;->bvX:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bwh:I
 
     int-to-long v8, v3
 
-    iget v3, v1, Lokhttp3/internal/e/g$a;->bvX:I
+    iget v3, v1, Lokhttp3/internal/e/g$a;->bwh:I
 
     int-to-long v10, v3
 
@@ -295,15 +295,15 @@
 
     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;->bvF:Ljava/util/concurrent/ExecutorService;
+    iput-object v3, v0, Lokhttp3/internal/e/g;->bvP:Ljava/util/concurrent/ExecutorService;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
     const v3, 0xffff
 
     invoke-virtual {v2, v4, v3}, Lokhttp3/internal/e/m;->S(II)Lokhttp3/internal/e/m;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
     const/4 v3, 0x5
 
@@ -311,51 +311,51 @@
 
     invoke-virtual {v2, v3, v4}, Lokhttp3/internal/e/m;->S(II)Lokhttp3/internal/e/m;
 
-    iget-object v2, v0, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object v2, v0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {v2}, Lokhttp3/internal/e/m;->GL()I
 
     move-result v2
 
     int-to-long v2, v2
 
-    iput-wide v2, v0, Lokhttp3/internal/e/g;->bvJ:J
+    iput-wide v2, v0, Lokhttp3/internal/e/g;->bvT:J
 
-    iget-object v2, v1, Lokhttp3/internal/e/g$a;->btN:Ljava/net/Socket;
+    iget-object v2, v1, Lokhttp3/internal/e/g$a;->btX:Ljava/net/Socket;
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->btN:Ljava/net/Socket;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->btX:Ljava/net/Socket;
 
     new-instance v2, Lokhttp3/internal/e/j;
 
-    iget-object v3, v1, Lokhttp3/internal/e/g$a;->btP:Lokio/BufferedSink;
+    iget-object v3, v1, Lokhttp3/internal/e/g$a;->btZ:Lokio/BufferedSink;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvz:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvJ:Z
 
     invoke-direct {v2, v3, v4}, Lokhttp3/internal/e/j;-><init>(Lokio/BufferedSink;Z)V
 
-    iput-object v2, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvX: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;->lZ:Lokio/d;
+    iget-object v1, v1, Lokhttp3/internal/e/g$a;->lY:Lokio/d;
 
-    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvz:Z
+    iget-boolean v4, v0, Lokhttp3/internal/e/g;->bvJ: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;->bvO:Lokhttp3/internal/e/g$d;
+    iput-object v2, v0, Lokhttp3/internal/e/g;->bvY:Lokhttp3/internal/e/g$d;
 
     return-void
 .end method
 
-.method static synthetic Gt()Ljava/util/concurrent/ExecutorService;
+.method static synthetic Gw()Ljava/util/concurrent/ExecutorService;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/g;->bvy:Ljava/util/concurrent/ExecutorService;
+    sget-object v0, Lokhttp3/internal/e/g;->bvI:Ljava/util/concurrent/ExecutorService;
 
     return-object v0
 .end method
@@ -368,7 +368,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX: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;->bvD:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/g;->bvN: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;->bvD:Z
+    iput-boolean v1, p0, Lokhttp3/internal/e/g;->bvN:Z
 
-    iget v1, p0, Lokhttp3/internal/e/g;->bvB:I
+    iget v1, p0, Lokhttp3/internal/e/g;->bvL: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    sget-object v3, Lokhttp3/internal/c;->bsM:[B
+    sget-object v3, Lokhttp3/internal/c;->bsW:[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;->Gr()V
+    invoke-virtual {p0}, Lokhttp3/internal/e/g;->Gu()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;->bvE:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p0, p0, Lokhttp3/internal/e/g;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object p0
 .end method
@@ -460,7 +460,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/e/g;->bvH:Z
+    iput-boolean v0, p0, Lokhttp3/internal/e/g;->bvR:Z
 
     return v0
 .end method
@@ -486,21 +486,21 @@
 
 
 # virtual methods
-.method public final declared-synchronized Gq()I
+.method public final declared-synchronized Gt()I
     .locals 2
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvL:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvV:Lokhttp3/internal/e/m;
 
-    iget v1, v0, Lokhttp3/internal/e/m;->bwJ:I
+    iget v1, v0, Lokhttp3/internal/e/m;->bwT:I
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v0, v0, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v0, v0, Lokhttp3/internal/e/m;->bwU:[I
 
     const/4 v1, 0x4
 
@@ -527,11 +527,11 @@
     throw v0
 .end method
 
-.method final Gr()V
+.method final Gu()V
     .locals 1
 
     :try_start_0
-    sget-object v0, Lokhttp3/internal/e/b;->buG:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buQ: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 Gs()V
+.method public final Gv()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -549,19 +549,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/j;->GE()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/j;->GH()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget-object v1, p0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/m;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->bvU: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;->bvK:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GL()I
 
     move-result v0
 
@@ -569,7 +569,7 @@
 
     if-eq v0, v1, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v2, p0, Lokhttp3/internal/e/g;->bvX: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;->bvO:Lokhttp3/internal/e/g$d;
+    iget-object v1, p0, Lokhttp3/internal/e/g;->bvY: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;->bvE:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvO: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object p4, p0, Lokhttp3/internal/e/g;->bvX: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;->bvJ:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->bvT:J
 
     cmp-long v5, v3, v1
 
@@ -705,7 +705,7 @@
 
     :cond_2
     :try_start_1
-    iget-wide v3, p0, Lokhttp3/internal/e/g;->bvJ:J
+    iget-wide v3, p0, Lokhttp3/internal/e/g;->bvT: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object v3, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
-    iget v3, v3, Lokhttp3/internal/e/j;->bwz:I
+    iget v3, v3, Lokhttp3/internal/e/j;->bwJ:I
 
     invoke-static {v4, v3}, Ljava/lang/Math;->min(II)I
 
     move-result v3
 
-    iget-wide v4, p0, Lokhttp3/internal/e/g;->bvJ:J
+    iget-wide v4, p0, Lokhttp3/internal/e/g;->bvT:J
 
     int-to-long v6, v3
 
     sub-long/2addr v4, v6
 
-    iput-wide v4, p0, Lokhttp3/internal/e/g;->bvJ:J
+    iput-wide v4, p0, Lokhttp3/internal/e/g;->bvT:J
 
     monitor-exit p0
     :try_end_1
@@ -735,7 +735,7 @@
 
     sub-long/2addr p4, v6
 
-    iget-object v4, p0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v4, p0, Lokhttp3/internal/e/g;->bvX: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;->bvF:Ljava/util/concurrent/ExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvP: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bvX: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;->btN:Ljava/net/Socket;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->btX: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;->bvE:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bvO:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {p2}, Ljava/util/concurrent/ScheduledExecutorService;->shutdown()V
 
-    iget-object p2, p0, Lokhttp3/internal/e/g;->bvF:Ljava/util/concurrent/ExecutorService;
+    iget-object p2, p0, Lokhttp3/internal/e/g;->bvP: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;->bvI:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvS:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lokhttp3/internal/e/g;->bvI:J
+    iput-wide v0, p0, Lokhttp3/internal/e/g;->bvS:J
 
-    iget-wide p1, p0, Lokhttp3/internal/e/g;->bvI:J
+    iget-wide p1, p0, Lokhttp3/internal/e/g;->bvS:J
 
-    iget-object v0, p0, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/m;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {v0}, Lokhttp3/internal/e/m;->GL()I
 
     move-result v0
 
@@ -1004,13 +1004,13 @@
 
     const/4 p1, 0x0
 
-    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvI:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvS:J
 
     invoke-virtual {p0, p1, v0, v1}, Lokhttp3/internal/e/g;->k(IJ)V
 
     const-wide/16 p1, 0x0
 
-    iput-wide p1, p0, Lokhttp3/internal/e/g;->bvI:J
+    iput-wide p1, p0, Lokhttp3/internal/e/g;->bvS: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object v7, p0, Lokhttp3/internal/e/g;->bvX: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;->bvC:I
+    iget v0, p0, Lokhttp3/internal/e/g;->bvM:I
 
     const v1, 0x3fffffff    # 1.9999999f
 
     if-le v0, v1, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/b;->buJ:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buT: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;->bvD:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->bvN:Z
 
     if-nez v0, :cond_5
 
-    iget v8, p0, Lokhttp3/internal/e/g;->bvC:I
+    iget v8, p0, Lokhttp3/internal/e/g;->bvM:I
 
-    iget v0, p0, Lokhttp3/internal/e/g;->bvC:I
+    iget v0, p0, Lokhttp3/internal/e/g;->bvM:I
 
     add-int/lit8 v0, v0, 0x2
 
-    iput v0, p0, Lokhttp3/internal/e/g;->bvC:I
+    iput v0, p0, Lokhttp3/internal/e/g;->bvM: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;->bvJ:J
+    iget-wide v0, p0, Lokhttp3/internal/e/g;->bvT:J
 
     const-wide/16 v2, 0x0
 
@@ -1121,7 +1121,7 @@
 
     if-eqz p2, :cond_2
 
-    iget-wide v0, v9, Lokhttp3/internal/e/i;->bvJ:J
+    iget-wide v0, v9, Lokhttp3/internal/e/i;->bvT: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvX: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;->bvN:Lokhttp3/internal/e/j;
+    iget-object p1, p0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
     invoke-virtual {p1}, Lokhttp3/internal/e/j;->flush()V
 
@@ -1212,9 +1212,9 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/b;->buF:Lokhttp3/internal/e/b;
+    sget-object v0, Lokhttp3/internal/e/b;->buP:Lokhttp3/internal/e/b;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU:Lokhttp3/internal/e/b;
 
     invoke-virtual {p0, v0, v1}, Lokhttp3/internal/e/g;->a(Lokhttp3/internal/e/b;Lokhttp3/internal/e/b;)V
 
@@ -1293,7 +1293,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lokhttp3/internal/e/g;->bvD:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/g;->bvN: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;->bvE:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lokhttp3/internal/e/g;->bvO: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 f3c80a79f7..c2a547199f 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h$a.smali
@@ -18,13 +18,13 @@
 
 
 # instance fields
-.field bwi:B
+.field bws:B
 
-.field bwj:I
+.field bwt:I
 
-.field bwk:S
+.field bwu:S
 
-.field private final lZ:Lokio/d;
+.field private final lY:Lokio/d;
 
 .field left:I
 
@@ -37,7 +37,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h$a;->lZ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
 
     return-void
 .end method
@@ -59,9 +59,9 @@
 
     if-nez v0, :cond_4
 
-    iget-object v0, p0, Lokhttp3/internal/e/h$a;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
 
-    iget-short v3, p0, Lokhttp3/internal/e/h$a;->bwk:S
+    iget-short v3, p0, Lokhttp3/internal/e/h$a;->bwu:S
 
     int-to-long v3, v3
 
@@ -69,9 +69,9 @@
 
     const/4 v0, 0x0
 
-    iput-short v0, p0, Lokhttp3/internal/e/h$a;->bwk:S
+    iput-short v0, p0, Lokhttp3/internal/e/h$a;->bwu:S
 
-    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->bwi:B
+    iget-byte v3, p0, Lokhttp3/internal/e/h$a;->bws:B
 
     and-int/lit8 v3, v3, 0x4
 
@@ -80,9 +80,9 @@
     return-wide v1
 
     :cond_0
-    iget v1, p0, Lokhttp3/internal/e/h$a;->bwj:I
+    iget v1, p0, Lokhttp3/internal/e/h$a;->bwt:I
 
-    iget-object v2, p0, Lokhttp3/internal/e/h$a;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->lY: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;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/e/h$a;->lY: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;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readByte()B
 
@@ -112,9 +112,9 @@
 
     int-to-byte v3, v3
 
-    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->bwi:B
+    iput-byte v3, p0, Lokhttp3/internal/e/h$a;->bws:B
 
-    sget-object v3, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
     sget-object v4, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
 
@@ -126,13 +126,13 @@
 
     if-eqz v3, :cond_1
 
-    sget-object v3, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sget-object v3, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
-    iget v5, p0, Lokhttp3/internal/e/h$a;->bwj:I
+    iget v5, p0, Lokhttp3/internal/e/h$a;->bwt:I
 
     iget v6, p0, Lokhttp3/internal/e/h$a;->length:I
 
-    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->bwi:B
+    iget-byte v7, p0, Lokhttp3/internal/e/h$a;->bws: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;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lY: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;->bwj:I
+    iput v3, p0, Lokhttp3/internal/e/h$a;->bwt:I
 
     const/16 v3, 0x9
 
     if-ne v2, v3, :cond_3
 
-    iget v2, p0, Lokhttp3/internal/e/h$a;->bwj:I
+    iget v2, p0, Lokhttp3/internal/e/h$a;->bwt:I
 
     if-ne v2, v1, :cond_2
 
@@ -192,7 +192,7 @@
     throw p1
 
     :cond_4
-    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h$a;->lY: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h$a;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/e/h.smali b/com.discord/smali_classes2/okhttp3/internal/e/h.smali
index 18e0015c16..6f5a8f5c0d 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/h.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/h.smali
@@ -16,17 +16,17 @@
 
 
 # static fields
-.field static final HQ:Ljava/util/logging/Logger;
+.field static final HZ:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field final bvz:Z
+.field final bvJ:Z
 
-.field private final bwg:Lokhttp3/internal/e/h$a;
+.field private final bwq:Lokhttp3/internal/e/h$a;
 
-.field final bwh:Lokhttp3/internal/e/d$a;
+.field final bwr:Lokhttp3/internal/e/d$a;
 
-.field final lZ:Lokio/d;
+.field final lY:Lokio/d;
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sput-object v0, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -53,30 +53,30 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/h;->bvz:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/h;->bvJ:Z
 
     new-instance p1, Lokhttp3/internal/e/h$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/h$a;-><init>(Lokio/d;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/h;->bwg:Lokhttp3/internal/e/h$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bwq:Lokhttp3/internal/e/h$a;
 
     new-instance p1, Lokhttp3/internal/e/d$a;
 
-    iget-object p2, p0, Lokhttp3/internal/e/h;->bwg:Lokhttp3/internal/e/h$a;
+    iget-object p2, p0, Lokhttp3/internal/e/h;->bwq: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;->bwh:Lokhttp3/internal/e/d$a;
+    iput-object p1, p0, Lokhttp3/internal/e/h;->bwr:Lokhttp3/internal/e/d$a;
 
     return-void
 .end method
 
-.method private Gv()V
+.method private Gy()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -84,11 +84,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readInt()I
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -165,25 +165,25 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->bwg:Lokhttp3/internal/e/h$a;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->bwq: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;->bwk:S
+    iput-short p2, v0, Lokhttp3/internal/e/h$a;->bwu:S
 
-    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->bwi:B
+    iput-byte p3, v0, Lokhttp3/internal/e/h$a;->bws:B
 
-    iput p4, v0, Lokhttp3/internal/e/h$a;->bwj:I
+    iput p4, v0, Lokhttp3/internal/e/h$a;->bwt:I
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->bwh:Lokhttp3/internal/e/d$a;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bwr:Lokhttp3/internal/e/d$a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gm()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gp()V
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->bwh:Lokhttp3/internal/e/d$a;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->bwr:Lokhttp3/internal/e/d$a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gn()Ljava/util/List;
+    invoke-virtual {p1}, Lokhttp3/internal/e/d$a;->Gq()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;->lZ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v6}, Lokio/d;->readInt()I
 
@@ -319,7 +319,7 @@
 
     and-int/2addr v6, v7
 
-    sget-object v8, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sget-object v8, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
     sget-object v9, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
 
@@ -329,7 +329,7 @@
 
     if-eqz v8, :cond_2
 
-    sget-object v8, Lokhttp3/internal/e/h;->HQ:Ljava/util/logging/Logger;
+    sget-object v8, Lokhttp3/internal/e/h;->HZ:Ljava/util/logging/Logger;
 
     invoke-static {v2, v6, v1, v4, p1}, Lokhttp3/internal/e/e;->a(ZIIBB)Ljava/lang/String;
 
@@ -344,7 +344,7 @@
 
     packed-switch v4, :pswitch_data_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
     move-result p1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -436,11 +436,11 @@
 
     if-eqz v4, :cond_6
 
-    sget-object v0, Lokio/ByteString;->byH:Lokio/ByteString;
+    sget-object v0, Lokio/ByteString;->byR:Lokio/ByteString;
 
     if-lez v1, :cond_5
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     int-to-long v3, v1
 
@@ -503,13 +503,13 @@
 
     if-nez v6, :cond_a
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v1}, Lokio/d;->readInt()I
 
     move-result v1
 
-    iget-object v3, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -561,7 +561,7 @@
 
     if-eqz v3, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -572,7 +572,7 @@
     int-to-short v0, v0
 
     :cond_c
-    iget-object v3, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->readInt()I
 
@@ -641,7 +641,7 @@
     :goto_1
     if-ge v4, v1, :cond_18
 
-    iget-object v6, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v6, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v6}, Lokio/d;->readShort()S
 
@@ -651,7 +651,7 @@
 
     and-int/2addr v6, v7
 
-    iget-object v7, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v7, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v7}, Lokio/d;->readInt()I
 
@@ -786,7 +786,7 @@
 
     if-eqz v6, :cond_1c
 
-    iget-object p1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {p1}, Lokio/d;->readInt()I
 
@@ -852,7 +852,7 @@
 
     if-eqz v6, :cond_1e
 
-    invoke-direct {p0}, Lokhttp3/internal/e/h;->Gv()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Gy()V
 
     goto/16 :goto_6
 
@@ -903,7 +903,7 @@
 
     if-eqz v4, :cond_21
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -918,7 +918,7 @@
 
     if-eqz v4, :cond_22
 
-    invoke-direct {p0}, Lokhttp3/internal/e/h;->Gv()V
+    invoke-direct {p0}, Lokhttp3/internal/e/h;->Gy()V
 
     add-int/lit8 v1, v1, -0x5
 
@@ -979,7 +979,7 @@
 
     if-eqz v4, :cond_26
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readByte()B
 
@@ -994,11 +994,11 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v1, p0, Lokhttp3/internal/e/h;->lY: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;->lZ:Lokio/d;
+    iget-object p1, p0, Lokhttp3/internal/e/h;->lY:Lokio/d;
 
     int-to-long v0, v0
 
@@ -1075,7 +1075,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/e/h;->lY: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 944328269b..e4e63dcae5 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 bws:Lokio/c;
+.field private final bwC:Lokio/c;
 
-.field bwt:Z
+.field bwD:Z
 
-.field final synthetic bwu:Lokhttp3/internal/e/i;
+.field final synthetic bwE:Lokhttp3/internal/e/i;
 
 .field w:Z
 
@@ -43,7 +43,7 @@
 .method constructor <init>(Lokhttp3/internal/e/i;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -51,7 +51,7 @@
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bws:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$a;->bwC:Lokio/c;
 
     return-void
 .end method
@@ -64,14 +64,14 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bwB: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvJ:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvT:J
 
     const-wide/16 v3, 0x0
 
@@ -89,7 +89,7 @@
 
     if-gtz v5, :cond_0
 
-    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->bwt:Z
+    iget-boolean v1, p0, Lokhttp3/internal/e/i$a;->bwD:Z
 
     if-nez v1, :cond_0
 
@@ -97,15 +97,15 @@
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GC()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GF()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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GG()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GB()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GE()V
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvJ:J
+    iget-wide v1, v1, Lokhttp3/internal/e/i;->bvT:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$a;->bws:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$a;->bwC: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-wide v2, v1, Lokhttp3/internal/e/i;->bvJ:J
+    iget-wide v2, v1, Lokhttp3/internal/e/i;->bvT:J
 
     sub-long/2addr v2, v9
 
-    iput-wide v2, v1, Lokhttp3/internal/e/i;->bvJ:J
+    iput-wide v2, v1, Lokhttp3/internal/e/i;->bvT: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwB: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v5, v0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v5, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE: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;->bws:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bwC: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;->bws:Lokio/c;
+    iget-object v8, p0, Lokhttp3/internal/e/i$a;->bwC: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object p1, p1, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object p1, p1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {p1}, Lokhttp3/internal/e/i$c;->GG()V
 
     return-void
 
     :catchall_0
     move-exception p1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GG()V
 
     throw p1
 
@@ -213,11 +213,11 @@
     move-exception p1
 
     :try_start_4
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v1, v1, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object v1, v1, Lokhttp3/internal/e/i;->bwB:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i$c;->GG()V
 
     throw p1
 
@@ -247,7 +247,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwp:Lokhttp3/internal/e/i$a;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwz:Lokhttp3/internal/e/i$a;
 
-    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwt:Z
+    iget-boolean v0, v0, Lokhttp3/internal/e/i$a;->bwD:Z
 
     const/4 v1, 0x1
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bws:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwC: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;->bws:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwC:Lokio/c;
 
     iget-wide v2, v0, Lokio/c;->size:J
 
@@ -299,11 +299,11 @@
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v2, v0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v2, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$a;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX:Lokhttp3/internal/e/j;
 
     invoke-virtual {v0}, Lokhttp3/internal/e/j;->flush()V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GA()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GD()V
 
     return-void
 
@@ -376,21 +376,21 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v1, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GB()V
+    invoke-virtual {v1}, Lokhttp3/internal/e/i;->GE()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;->bws:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwC:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -404,11 +404,11 @@
 
     invoke-direct {p0, v0}, Lokhttp3/internal/e/i$a;->Z(Z)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v0, v0, Lokhttp3/internal/e/g;->bvN:Lokhttp3/internal/e/j;
+    iget-object v0, v0, Lokhttp3/internal/e/g;->bvX: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwr:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwB: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;->bws:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$a;->bwC: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;->bws:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/e/i$a;->bwC:Lokio/c;
 
     iget-wide p1, p1, Lokio/c;->size:J
 
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 30cd9ea17f..4779a8c80a 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 bwt:Z
+.field bwD:Z
 
-.field final synthetic bwu:Lokhttp3/internal/e/i;
+.field final synthetic bwE:Lokhttp3/internal/e/i;
 
-.field private final bwv:Lokio/c;
+.field private final bwF:Lokio/c;
 
-.field private final bww:Lokio/c;
+.field private final bwG:Lokio/c;
 
-.field private final bwx:J
+.field private final bwH:J
 
 .field w: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;->bwu:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwv:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwF:Lokio/c;
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bww:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
 
-    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->bwx:J
+    iput-wide p2, p0, Lokhttp3/internal/e/i$b;->bwH:J
 
     return-void
 .end method
@@ -71,9 +71,9 @@
 .method private as(J)V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
     invoke-virtual {v0, p1, p2}, Lokhttp3/internal/e/g;->as(J)V
 
@@ -102,27 +102,27 @@
 
     :cond_0
     :goto_0
-    iget-object v6, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v6, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
     monitor-enter v6
 
     :try_start_0
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwA: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE: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;->bww:Lokio/c;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwG: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;->bww:Lokio/c;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
 
-    iget-object v11, v1, Lokhttp3/internal/e/i$b;->bww:Lokio/c;
+    iget-object v11, v1, Lokhttp3/internal/e/i$b;->bwG: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvI:J
+    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvS:J
 
     add-long/2addr v14, v11
 
-    iput-wide v14, v8, Lokhttp3/internal/e/i;->bvI:J
+    iput-wide v14, v8, Lokhttp3/internal/e/i;->bvS:J
 
     if-nez v0, :cond_5
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvI:J
+    iget-wide v14, v8, Lokhttp3/internal/e/i;->bvS:J
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v8, v8, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v8, v8, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v8, v8, Lokhttp3/internal/e/g;->bvK:Lokhttp3/internal/e/m;
+    iget-object v8, v8, Lokhttp3/internal/e/g;->bvU:Lokhttp3/internal/e/m;
 
-    invoke-virtual {v8}, Lokhttp3/internal/e/m;->GI()I
+    invoke-virtual {v8}, Lokhttp3/internal/e/m;->GL()I
 
     move-result v8
 
@@ -241,47 +241,47 @@
 
     if-ltz v17, :cond_5
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v7, v7, Lokhttp3/internal/e/i;->bvu:Lokhttp3/internal/e/g;
+    iget-object v7, v7, Lokhttp3/internal/e/i;->bvE:Lokhttp3/internal/e/g;
 
-    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v8, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
     iget v8, v8, Lokhttp3/internal/e/i;->id:I
 
-    iget-object v14, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v14, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-wide v14, v14, Lokhttp3/internal/e/i;->bvI:J
+    iget-wide v14, v14, Lokhttp3/internal/e/i;->bvS:J
 
     invoke-virtual {v7, v8, v14, v15}, Lokhttp3/internal/e/g;->k(IJ)V
 
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iput-wide v4, v7, Lokhttp3/internal/e/i;->bvI:J
+    iput-wide v4, v7, Lokhttp3/internal/e/i;->bvS:J
 
     goto :goto_2
 
     :cond_3
     move-object/from16 v13, p1
 
-    iget-boolean v7, v1, Lokhttp3/internal/e/i$b;->bwt:Z
+    iget-boolean v7, v1, Lokhttp3/internal/e/i$b;->bwD:Z
 
     if-nez v7, :cond_4
 
     if-nez v0, :cond_4
 
-    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GC()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GF()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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i$c;->GG()V
 
     monitor-exit v6
 
@@ -297,11 +297,11 @@
     const/16 v16, 0x0
 
     :goto_3
-    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v7, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v7, v7, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
+    iget-object v7, v7, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v7}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {v7}, Lokhttp3/internal/e/i$c;->GG()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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v2, v1, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v2, v2, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
+    iget-object v2, v2, Lokhttp3/internal/e/i;->bwA:Lokhttp3/internal/e/i$c;
 
-    invoke-virtual {v2}, Lokhttp3/internal/e/i$c;->GD()V
+    invoke-virtual {v2}, Lokhttp3/internal/e/i$c;->GG()V
 
     throw v0
 
@@ -404,20 +404,20 @@
 
     if-lez v2, :cond_6
 
-    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_0
-    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->bwt:Z
+    iget-boolean v3, p0, Lokhttp3/internal/e/i$b;->bwD:Z
 
-    iget-object v4, p0, Lokhttp3/internal/e/i$b;->bww:Lokio/c;
+    iget-object v4, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
     add-long/2addr v4, p2
 
-    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->bwx:J
+    iget-wide v6, p0, Lokhttp3/internal/e/i$b;->bwH:J
 
     const/4 v8, 0x1
 
@@ -443,9 +443,9 @@
 
     invoke-interface {p1, p2, p3}, Lokio/d;->aB(J)V
 
-    iget-object p1, p0, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object p1, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    sget-object p2, Lokhttp3/internal/e/b;->buI:Lokhttp3/internal/e/b;
+    sget-object p2, Lokhttp3/internal/e/b;->buS: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;->bwv:Lokio/c;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwF: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v2, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
     monitor-enter v2
 
     :try_start_1
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bww:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwG: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;->bww:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bwv:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bwF: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
     monitor-enter v0
 
@@ -556,15 +556,15 @@
     :try_start_0
     iput-boolean v1, p0, Lokhttp3/internal/e/i$b;->w:Z
 
-    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bww:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bww:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwG:Lokio/c;
 
     invoke-virtual {v3}, Lokio/c;->clear()V
 
-    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v3, p0, Lokhttp3/internal/e/i$b;->bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v5, p0, Lokhttp3/internal/e/i$b;->bwE: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;->as(J)V
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GA()V
+    invoke-virtual {v0}, Lokhttp3/internal/e/i;->GD()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;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$b;->bwE:Lokhttp3/internal/e/i;
 
-    iget-object v0, v0, Lokhttp3/internal/e/i;->bwq:Lokhttp3/internal/e/i$c;
+    iget-object v0, v0, Lokhttp3/internal/e/i;->bwA: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 913f7bdece..34a375e446 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 bwu:Lokhttp3/internal/e/i;
+.field final synthetic bwE: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;->bwu:Lokhttp3/internal/e/i;
+    iput-object p1, p0, Lokhttp3/internal/e/i$c;->bwE:Lokhttp3/internal/e/i;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,19 +31,19 @@
 
 
 # virtual methods
-.method public final FE()V
+.method public final FH()V
     .locals 2
 
-    iget-object v0, p0, Lokhttp3/internal/e/i$c;->bwu:Lokhttp3/internal/e/i;
+    iget-object v0, p0, Lokhttp3/internal/e/i$c;->bwE:Lokhttp3/internal/e/i;
 
-    sget-object v1, Lokhttp3/internal/e/b;->buK:Lokhttp3/internal/e/b;
+    sget-object v1, Lokhttp3/internal/e/b;->buU: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 GD()V
+.method public final GG()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -51,7 +51,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->Ha()Z
+    invoke-virtual {p0}, Lokhttp3/internal/e/i$c;->Hd()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 f33835099f..7c1d71e6ac 100644
--- a/com.discord/smali_classes2/okhttp3/internal/e/j.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/e/j.smali
@@ -7,19 +7,19 @@
 
 
 # static fields
-.field private static final HQ:Ljava/util/logging/Logger;
+.field private static final HZ:Ljava/util/logging/Logger;
 
 
 # instance fields
-.field private final btP:Lokio/BufferedSink;
+.field private final btZ:Lokio/BufferedSink;
 
-.field private final bvz:Z
+.field private final bvJ:Z
 
-.field final bwA:Lokhttp3/internal/e/d$b;
+.field private final bwI:Lokio/c;
 
-.field private final bwy:Lokio/c;
+.field bwJ:I
 
-.field bwz:I
+.field final bwK:Lokhttp3/internal/e/d$b;
 
 .field private w:Z
 
@@ -38,7 +38,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokhttp3/internal/e/j;->HQ:Ljava/util/logging/Logger;
+    sput-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
 
     return-void
 .end method
@@ -48,27 +48,27 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
-    iput-boolean p2, p0, Lokhttp3/internal/e/j;->bvz:Z
+    iput-boolean p2, p0, Lokhttp3/internal/e/j;->bvJ:Z
 
     new-instance p1, Lokio/c;
 
     invoke-direct {p1}, Lokio/c;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bwy:Lokio/c;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
 
     new-instance p1, Lokhttp3/internal/e/d$b;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->bwy:Lokio/c;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
 
     invoke-direct {p1, p2}, Lokhttp3/internal/e/d$b;-><init>(Lokio/c;)V
 
-    iput-object p1, p0, Lokhttp3/internal/e/j;->bwA:Lokhttp3/internal/e/d$b;
+    iput-object p1, p0, Lokhttp3/internal/e/j;->bwK:Lokhttp3/internal/e/d$b;
 
     const/16 p1, 0x4000
 
-    iput p1, p0, Lokhttp3/internal/e/j;->bwz:I
+    iput p1, p0, Lokhttp3/internal/e/j;->bwJ:I
 
     return-void
 .end method
@@ -81,7 +81,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/internal/e/j;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
 
     sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
 
@@ -93,7 +93,7 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lokhttp3/internal/e/j;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
 
     invoke-static {v1, p1, p2, p3, p4}, Lokhttp3/internal/e/e;->a(ZIIBB)Ljava/lang/String;
 
@@ -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;->bwz:I
+    iget v0, p0, Lokhttp3/internal/e/j;->bwJ:I
 
     const/4 v2, 0x1
 
@@ -114,23 +114,23 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-static {v0, p2}, Lokhttp3/internal/e/j;->a(Lokio/BufferedSink;I)V
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     and-int/lit16 p3, p3, 0xff
 
     invoke-interface {p2, p3}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     and-int/lit16 p3, p4, 0xff
 
     invoke-interface {p2, p3}, Lokio/BufferedSink;->dA(I)Lokio/BufferedSink;
 
-    iget-object p2, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p2, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     const p3, 0x7fffffff
 
@@ -225,7 +225,7 @@
 
     if-lez v2, :cond_1
 
-    iget v2, p0, Lokhttp3/internal/e/j;->bwz:I
+    iget v2, p0, Lokhttp3/internal/e/j;->bwJ: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;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
-    iget-object v1, p0, Lokhttp3/internal/e/j;->bwy:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/e/j;->bwI: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 GE()V
+.method public final declared-synchronized GH()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;->bvz:Z
+    iget-boolean v0, p0, Lokhttp3/internal/e/j;->bvJ:Z
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
@@ -296,7 +296,7 @@
 
     :cond_0
     :try_start_1
-    sget-object v0, Lokhttp3/internal/e/j;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
 
     sget-object v1, Ljava/util/logging/Level;->FINE:Ljava/util/logging/Level;
 
@@ -306,7 +306,7 @@
 
     if-eqz v0, :cond_1
 
-    sget-object v0, Lokhttp3/internal/e/j;->HQ:Ljava/util/logging/Logger;
+    sget-object v0, Lokhttp3/internal/e/j;->HZ:Ljava/util/logging/Logger;
 
     const-string v1, ">> CONNECTION %s"
 
@@ -316,9 +316,9 @@
 
     const/4 v3, 0x0
 
-    sget-object v4, Lokhttp3/internal/e/e;->bvn:Lokio/ByteString;
+    sget-object v4, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
 
-    invoke-virtual {v4}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {v4}, Lokio/ByteString;->Hx()Ljava/lang/String;
 
     move-result-object v4
 
@@ -331,17 +331,17 @@
     invoke-virtual {v0, v1}, Ljava/util/logging/Logger;->fine(Ljava/lang/String;)V
 
     :cond_1
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
-    sget-object v1, Lokhttp3/internal/e/e;->bvn:Lokio/ByteString;
+    sget-object v1, Lokhttp3/internal/e/e;->bvx:Lokio/ByteString;
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hw()[B
+    invoke-virtual {v1}, Lokio/ByteString;->Hz()[B
 
     move-result-object v1
 
     invoke-interface {v0, v1}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0}, Lokio/BufferedSink;->flush()V
     :try_end_1
@@ -402,11 +402,11 @@
 
     invoke-direct {p0, v2, v0, v1, v2}, Lokhttp3/internal/e/j;->a(IIBB)V
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v0, p1}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     iget p2, p2, Lokhttp3/internal/e/b;->httpCode:I
 
@@ -416,12 +416,12 @@
 
     if-lez p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->E([B)Lokio/BufferedSink;
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-interface {p1, p2}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     int-to-long v0, p4
 
@@ -602,24 +602,24 @@
 
     if-nez v0, :cond_2
 
-    iget v0, p0, Lokhttp3/internal/e/j;->bwz:I
+    iget v0, p0, Lokhttp3/internal/e/j;->bwJ:I
 
-    iget v1, p1, Lokhttp3/internal/e/m;->bwJ:I
+    iget v1, p1, Lokhttp3/internal/e/m;->bwT:I
 
     and-int/lit8 v1, v1, 0x20
 
     if-eqz v1, :cond_0
 
-    iget-object v0, p1, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v0, p1, Lokhttp3/internal/e/m;->bwU:[I
 
     const/4 v1, 0x5
 
     aget v0, v0, v1
 
     :cond_0
-    iput v0, p0, Lokhttp3/internal/e/j;->bwz:I
+    iput v0, p0, Lokhttp3/internal/e/j;->bwJ:I
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GH()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GK()I
 
     move-result v0
 
@@ -627,9 +627,9 @@
 
     if-eq v0, v1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->bwA:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwK:Lokhttp3/internal/e/d$b;
 
-    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GH()I
+    invoke-virtual {p1}, Lokhttp3/internal/e/m;->GK()I
 
     move-result p1
 
@@ -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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ: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;->bwA:Lokhttp3/internal/e/d$b;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->bwK:Lokhttp3/internal/e/d$b;
 
     invoke-virtual {v0, p3}, Lokhttp3/internal/e/d$b;->W(Ljava/util/List;)V
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->bwy:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->bwI:Lokio/c;
 
     iget-wide v0, p3, Lokio/c;->size:J
 
-    iget p3, p0, Lokhttp3/internal/e/j;->bwz:I
+    iget p3, p0, Lokhttp3/internal/e/j;->bwJ: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
-    iget-object p3, p0, Lokhttp3/internal/e/j;->bwy:Lokio/c;
+    iget-object p3, p0, Lokhttp3/internal/e/j;->bwI: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     iget p2, p2, Lokhttp3/internal/e/b;->httpCode:I
 
     invoke-interface {p1, p2}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ: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;->bwJ:I
+    iget v0, p1, Lokhttp3/internal/e/m;->bwT:I
 
     invoke-static {v0}, Ljava/lang/Integer;->bitCount(I)I
 
@@ -926,13 +926,13 @@
     move v0, v2
 
     :goto_1
-    iget-object v3, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v3, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     invoke-interface {v3, v0}, Lokio/BufferedSink;->dz(I)Lokio/BufferedSink;
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
-    iget-object v3, p1, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v3, p1, Lokhttp3/internal/e/m;->bwU:[I
 
     aget v3, v3, v2
 
@@ -944,7 +944,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ: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;->w:Z
 
-    iget-object v0, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ: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;->btP:Lokio/BufferedSink;
+    iget-object v0, p0, Lokhttp3/internal/e/j;->btZ: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ:Lokio/BufferedSink;
 
     long-to-int p3, p2
 
     invoke-interface {p1, p3}, Lokio/BufferedSink;->dy(I)Lokio/BufferedSink;
 
-    iget-object p1, p0, Lokhttp3/internal/e/j;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/e/j;->btZ: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 be2602baed..ba9f4f4a19 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 bwF:[Lokhttp3/internal/e/k$a;
+.field final bwP:[Lokhttp3/internal/e/k$a;
 
-.field final bwG:I
+.field final bwQ:I
 
-.field final bwH:I
+.field final bwR: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;->bwF:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->bwG:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->bwQ:I
 
-    iput v0, p0, Lokhttp3/internal/e/k$a;->bwH:I
+    iput v0, p0, Lokhttp3/internal/e/k$a;->bwR:I
 
     return-void
 .end method
@@ -50,9 +50,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bwF:[Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
-    iput p1, p0, Lokhttp3/internal/e/k$a;->bwG:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->bwQ: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;->bwH:I
+    iput p1, p0, Lokhttp3/internal/e/k$a;->bwR: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 88a3d17427..e2e504aaa1 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 bwB:[I
+.field private static final bwL:[I
 
-.field private static final bwC:[B
+.field private static final bwM:[B
 
-.field private static final bwD:Lokhttp3/internal/e/k;
+.field private static final bwN:Lokhttp3/internal/e/k;
 
 
 # instance fields
-.field private final bwE:Lokhttp3/internal/e/k$a;
+.field private final bwO:Lokhttp3/internal/e/k$a;
 
 
 # direct methods
@@ -33,19 +33,19 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokhttp3/internal/e/k;->bwB:[I
+    sput-object v1, Lokhttp3/internal/e/k;->bwL:[I
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokhttp3/internal/e/k;->bwC:[B
+    sput-object v0, Lokhttp3/internal/e/k;->bwM:[B
 
     new-instance v0, Lokhttp3/internal/e/k;
 
     invoke-direct {v0}, Lokhttp3/internal/e/k;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/e/k;->bwD:Lokhttp3/internal/e/k;
+    sput-object v0, Lokhttp3/internal/e/k;->bwN: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;->bwE:Lokhttp3/internal/e/k$a;
+    iput-object v0, p0, Lokhttp3/internal/e/k;->bwO:Lokhttp3/internal/e/k$a;
 
-    invoke-direct {p0}, Lokhttp3/internal/e/k;->GG()V
+    invoke-direct {p0}, Lokhttp3/internal/e/k;->GJ()V
 
     return-void
 .end method
 
-.method public static GF()Lokhttp3/internal/e/k;
+.method public static GI()Lokhttp3/internal/e/k;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/e/k;->bwD:Lokhttp3/internal/e/k;
+    sget-object v0, Lokhttp3/internal/e/k;->bwN:Lokhttp3/internal/e/k;
 
     return-object v0
 .end method
 
-.method private GG()V
+.method private GJ()V
     .locals 8
 
     const/4 v0, 0x0
 
     :goto_0
-    sget-object v1, Lokhttp3/internal/e/k;->bwC:[B
+    sget-object v1, Lokhttp3/internal/e/k;->bwM:[B
 
     array-length v2, v1
 
     if-ge v0, v2, :cond_4
 
-    sget-object v2, Lokhttp3/internal/e/k;->bwB:[I
+    sget-object v2, Lokhttp3/internal/e/k;->bwL:[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;->bwE:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bwO: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;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     if-eqz v6, :cond_1
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     aget-object v6, v6, v5
 
     if-nez v6, :cond_0
 
-    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwP:[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;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bwP:[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;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v6, v4, Lokhttp3/internal/e/k$a;->bwP:[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;->bwB:[I
+    sget-object v6, Lokhttp3/internal/e/k;->bwL:[I
 
     aget v6, v6, v4
 
-    sget-object v7, Lokhttp3/internal/e/k;->bwC:[B
+    sget-object v7, Lokhttp3/internal/e/k;->bwM:[B
 
     aget-byte v4, v7, v4
 
@@ -808,7 +808,7 @@
 
     and-int/lit16 v3, v3, 0xff
 
-    sget-object v4, Lokhttp3/internal/e/k;->bwC:[B
+    sget-object v4, Lokhttp3/internal/e/k;->bwM:[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;->bwE:Lokhttp3/internal/e/k$a;
+    iget-object v1, p0, Lokhttp3/internal/e/k;->bwO: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;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v4, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     aget-object v4, v4, v5
 
-    iget-object v5, v4, Lokhttp3/internal/e/k$a;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v5, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     if-nez v5, :cond_0
 
-    iget v5, v4, Lokhttp3/internal/e/k$a;->bwG:I
+    iget v5, v4, Lokhttp3/internal/e/k$a;->bwQ:I
 
     invoke-virtual {v0, v5}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget v4, v4, Lokhttp3/internal/e/k$a;->bwH:I
+    iget v4, v4, Lokhttp3/internal/e/k$a;->bwR:I
 
     sub-int/2addr v3, v4
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bwE:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bwO: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;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v2, v4, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     aget-object p1, v2, p1
 
-    iget-object v2, p1, Lokhttp3/internal/e/k$a;->bwF:[Lokhttp3/internal/e/k$a;
+    iget-object v2, p1, Lokhttp3/internal/e/k$a;->bwP:[Lokhttp3/internal/e/k$a;
 
     if-nez v2, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->bwH:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->bwR:I
 
     if-gt v2, v3, :cond_3
 
-    iget v2, p1, Lokhttp3/internal/e/k$a;->bwG:I
+    iget v2, p1, Lokhttp3/internal/e/k$a;->bwQ:I
 
     invoke-virtual {v0, v2}, Ljava/io/ByteArrayOutputStream;->write(I)V
 
-    iget p1, p1, Lokhttp3/internal/e/k$a;->bwH:I
+    iget p1, p1, Lokhttp3/internal/e/k$a;->bwR:I
 
     sub-int/2addr v3, p1
 
-    iget-object v4, p0, Lokhttp3/internal/e/k;->bwE:Lokhttp3/internal/e/k$a;
+    iget-object v4, p0, Lokhttp3/internal/e/k;->bwO: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 f767edd8fe..216d203b5b 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 bwI:Lokhttp3/internal/e/l;
+.field public static final bwS: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;->bwI:Lokhttp3/internal/e/l;
+    sput-object v0, Lokhttp3/internal/e/l;->bwS: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 01bef0f54a..553e79bd05 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 bwJ:I
+.field bwT:I
 
-.field final bwK:[I
+.field final bwU:[I
 
 
 # direct methods
@@ -19,23 +19,23 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lokhttp3/internal/e/m;->bwK:[I
+    iput-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
 
     return-void
 .end method
 
 
 # virtual methods
-.method final GH()I
+.method final GK()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->bwJ:I
+    iget v0, p0, Lokhttp3/internal/e/m;->bwT:I
 
     and-int/lit8 v0, v0, 0x2
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
 
     const/4 v1, 0x1
 
@@ -49,16 +49,16 @@
     return v0
 .end method
 
-.method final GI()I
+.method final GL()I
     .locals 2
 
-    iget v0, p0, Lokhttp3/internal/e/m;->bwJ:I
+    iget v0, p0, Lokhttp3/internal/e/m;->bwT:I
 
     and-int/lit16 v0, v0, 0x80
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
 
     const/4 v1, 0x7
 
@@ -77,7 +77,7 @@
 
     if-ltz p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/e/m;->bwK:[I
+    iget-object v0, p0, Lokhttp3/internal/e/m;->bwU:[I
 
     array-length v1, v0
 
@@ -90,11 +90,11 @@
 
     shl-int/2addr v1, p1
 
-    iget v2, p0, Lokhttp3/internal/e/m;->bwJ:I
+    iget v2, p0, Lokhttp3/internal/e/m;->bwT:I
 
     or-int/2addr v1, v2
 
-    iput v1, p0, Lokhttp3/internal/e/m;->bwJ:I
+    iput v1, p0, Lokhttp3/internal/e/m;->bwT:I
 
     aput p2, v0, p1
 
@@ -110,7 +110,7 @@
 
     shl-int p1, v0, p1
 
-    iget v1, p0, Lokhttp3/internal/e/m;->bwJ:I
+    iget v1, p0, Lokhttp3/internal/e/m;->bwT:I
 
     and-int/2addr p1, v1
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/f/a.smali b/com.discord/smali_classes2/okhttp3/internal/f/a.smali
index f4bdc157b6..9d4ef22075 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 bwL:Lokhttp3/internal/f/a;
+.field public static final bwV:Lokhttp3/internal/f/a;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/internal/f/a$1;-><init>()V
 
-    sput-object v0, Lokhttp3/internal/f/a;->bwL:Lokhttp3/internal/f/a;
+    sput-object v0, Lokhttp3/internal/f/a;->bwV:Lokhttp3/internal/f/a;
 
     return-void
 .end method
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 7b6ca7175b..826bcb5014 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 bwS:Ljava/lang/Object;
+.field private final bxc:Ljava/lang/Object;
 
-.field private final bwT:Ljava/lang/reflect/Method;
+.field private final bxd: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;->bwS:Ljava/lang/Object;
+    iput-object p1, p0, Lokhttp3/internal/g/a$a;->bxc:Ljava/lang/Object;
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$a;->bwT:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$a;->bxd: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;->bwT:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lokhttp3/internal/g/a$a;->bxd:Ljava/lang/reflect/Method;
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$a;->bwS:Ljava/lang/Object;
+    iget-object v1, p0, Lokhttp3/internal/g/a$a;->bxc: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 514313f1a2..e6bd96539e 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 bwU:Ljavax/net/ssl/X509TrustManager;
+.field private final bxe:Ljavax/net/ssl/X509TrustManager;
 
-.field private final bwV:Ljava/lang/reflect/Method;
+.field private final bxf:Ljava/lang/reflect/Method;
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lokhttp3/internal/g/a$b;->bwV:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$b;->bxf:Ljava/lang/reflect/Method;
 
-    iput-object p1, p0, Lokhttp3/internal/g/a$b;->bwU:Ljavax/net/ssl/X509TrustManager;
+    iput-object p1, p0, Lokhttp3/internal/g/a$b;->bxe: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;->bwV:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxf:Ljava/lang/reflect/Method;
 
-    iget-object v2, p0, Lokhttp3/internal/g/a$b;->bwU:Ljavax/net/ssl/X509TrustManager;
+    iget-object v2, p0, Lokhttp3/internal/g/a$b;->bxe: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;->bwU:Ljavax/net/ssl/X509TrustManager;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxe:Ljavax/net/ssl/X509TrustManager;
 
-    iget-object v3, p1, Lokhttp3/internal/g/a$b;->bwU:Ljavax/net/ssl/X509TrustManager;
+    iget-object v3, p1, Lokhttp3/internal/g/a$b;->bxe: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;->bwV:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxf:Ljava/lang/reflect/Method;
 
-    iget-object p1, p1, Lokhttp3/internal/g/a$b;->bwV:Ljava/lang/reflect/Method;
+    iget-object p1, p1, Lokhttp3/internal/g/a$b;->bxf: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;->bwU:Ljavax/net/ssl/X509TrustManager;
+    iget-object v0, p0, Lokhttp3/internal/g/a$b;->bxe:Ljavax/net/ssl/X509TrustManager;
 
     invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bwV:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$b;->bxf: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 92d43dc5c7..40a56d29f2 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 bwW:Ljava/lang/reflect/Method;
+.field private final bxg:Ljava/lang/reflect/Method;
 
-.field private final bwX:Ljava/lang/reflect/Method;
+.field private final bxh: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;->bwW:Ljava/lang/reflect/Method;
+    iput-object p2, p0, Lokhttp3/internal/g/a$c;->bxg:Ljava/lang/reflect/Method;
 
-    iput-object p3, p0, Lokhttp3/internal/g/a$c;->bwX:Ljava/lang/reflect/Method;
+    iput-object p3, p0, Lokhttp3/internal/g/a$c;->bxh:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method static GM()Lokhttp3/internal/g/a$c;
+.method static GP()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;->bwX:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lokhttp3/internal/g/a$c;->bxh:Ljava/lang/reflect/Method;
 
     new-array v2, v0, [Ljava/lang/Object;
 
@@ -145,7 +145,7 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lokhttp3/internal/g/a$c;->bwW:Ljava/lang/reflect/Method;
+    iget-object v3, p0, Lokhttp3/internal/g/a$c;->bxg: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 6dc7154f1d..37dddbe5bc 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,7 @@
 
 
 # instance fields
-.field private final bne:Ljava/util/List;
+.field private final bno:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -28,9 +28,9 @@
     .end annotation
 .end field
 
-.field bxe:Z
+.field bxo:Z
 
-.field bxf:Ljava/lang/String;
+.field bxp:Ljava/lang/String;
 
 
 # direct methods
@@ -47,7 +47,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bne:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bno: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;->bxe:Z
+    iput-boolean v3, p0, Lokhttp3/internal/g/d$a;->bxo:Z
 
     return-object v2
 
@@ -125,7 +125,7 @@
 
     if-nez v1, :cond_3
 
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bne:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bno: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;->bne:Ljava/util/List;
+    iget-object v0, p0, Lokhttp3/internal/g/d$a;->bno: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;->bxf:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bxp:Ljava/lang/String;
 
     return-object p1
 
@@ -204,7 +204,7 @@
     goto :goto_0
 
     :cond_6
-    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bne:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/internal/g/d$a;->bno: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;->bxf:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bxp: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;->bxf:Ljava/lang/String;
+    iput-object p1, p0, Lokhttp3/internal/g/d$a;->bxp: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 b1fb0099c0..9e92cb6a77 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 bxg:Ljava/lang/Class;
+.field private final bxq:Ljava/lang/Class;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Class<",
@@ -24,7 +24,7 @@
     .end annotation
 .end field
 
-.field private final bxh:[Ljava/lang/Class;
+.field private final bxr:[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;->bxg:Ljava/lang/Class;
+    iput-object p1, p0, Lokhttp3/internal/g/e;->bxq:Ljava/lang/Class;
 
     iput-object p2, p0, Lokhttp3/internal/g/e;->methodName:Ljava/lang/String;
 
-    iput-object p3, p0, Lokhttp3/internal/g/e;->bxh:[Ljava/lang/Class;
+    iput-object p3, p0, Lokhttp3/internal/g/e;->bxr:[Ljava/lang/Class;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v2, p0, Lokhttp3/internal/g/e;->bxh:[Ljava/lang/Class;
+    iget-object v2, p0, Lokhttp3/internal/g/e;->bxr:[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;->bxg:Ljava/lang/Class;
+    iget-object v0, p0, Lokhttp3/internal/g/e;->bxq: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 aaa860fb96..8584470631 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 bxr:Lokhttp3/internal/i/e;
+.field private final bxB: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;->bxr:Lokhttp3/internal/i/e;
+    iput-object p1, p0, Lokhttp3/internal/i/a;->bxB: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;->bxr:Lokhttp3/internal/i/e;
+    iget-object v4, p0, Lokhttp3/internal/i/a;->bxB: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;->bxr:Lokhttp3/internal/i/e;
+    iget-object p1, p1, Lokhttp3/internal/i/a;->bxB:Lokhttp3/internal/i/e;
 
-    iget-object v1, p0, Lokhttp3/internal/i/a;->bxr:Lokhttp3/internal/i/e;
+    iget-object v1, p0, Lokhttp3/internal/i/a;->bxB: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;->bxr:Lokhttp3/internal/i/e;
+    iget-object v0, p0, Lokhttp3/internal/i/a;->bxB: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 e3bf792d55..ec76ebd031 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 bxs:Ljava/util/Map;
+.field private final bxC: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;->bxs:Ljava/util/Map;
+    iput-object v0, p0, Lokhttp3/internal/i/b;->bxC:Ljava/util/Map;
 
     array-length v0, p1
 
@@ -45,7 +45,7 @@
 
     move-result-object v3
 
-    iget-object v4, p0, Lokhttp3/internal/i/b;->bxs:Ljava/util/Map;
+    iget-object v4, p0, Lokhttp3/internal/i/b;->bxC: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;->bxs:Ljava/util/Map;
+    iget-object v5, p0, Lokhttp3/internal/i/b;->bxC: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;->bxs:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/i/b;->bxC: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;->bxs:Ljava/util/Map;
+    iget-object p1, p1, Lokhttp3/internal/i/b;->bxC:Ljava/util/Map;
 
-    iget-object v1, p0, Lokhttp3/internal/i/b;->bxs:Ljava/util/Map;
+    iget-object v1, p0, Lokhttp3/internal/i/b;->bxC: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;->bxs:Ljava/util/Map;
+    iget-object v0, p0, Lokhttp3/internal/i/b;->bxC: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 533670af37..6d2dfea6fc 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 bxt:Lokhttp3/internal/i/d;
+.field public static final bxD: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;->bxt:Lokhttp3/internal/i/d;
+    sput-object v0, Lokhttp3/internal/i/d;->bxD:Lokhttp3/internal/i/d;
 
     return-void
 .end method
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 37e723aee8..002fda311c 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 bxM:Lokhttp3/internal/j/a;
+.field final synthetic bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$1;->bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$1;->bxW:Lokhttp3/internal/j/a;
 
-    invoke-virtual {v0}, Lokhttp3/internal/j/a;->GV()Z
+    invoke-virtual {v0}, Lokhttp3/internal/j/a;->GY()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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v1, p0, Lokhttp3/internal/j/a$1;->bxW: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 3e9eca628d..0c7222c6c0 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 bxM:Lokhttp3/internal/j/a;
+.field final synthetic bxW:Lokhttp3/internal/j/a;
 
-.field final synthetic bxN:Lokhttp3/w;
+.field final synthetic bxX: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;->bxM:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$2;->bxW:Lokhttp3/internal/j/a;
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$2;->bxN:Lokhttp3/w;
+    iput-object p2, p0, Lokhttp3/internal/j/a$2;->bxX: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v1, p0, Lokhttp3/internal/j/a$2;->bxW:Lokhttp3/internal/j/a;
 
     iget v2, p2, Lokhttp3/Response;->code:I
     :try_end_0
@@ -119,11 +119,11 @@
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hs()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/ByteString;->Hv()Lokio/ByteString;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lokio/ByteString;->Hr()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/ByteString;->Hu()Ljava/lang/String;
 
     move-result-object v1
 
@@ -135,32 +135,32 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v0, Lokhttp3/internal/a;->bsL:Lokhttp3/internal/a;
+    sget-object v0, Lokhttp3/internal/a;->bsV: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;->Ge()V
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Gh()V
 
-    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
 
     move-result-object v0
 
     new-instance v1, Lokhttp3/internal/b/c$1;
 
-    iget-object v2, v0, Lokhttp3/internal/b/c;->lZ:Lokio/d;
+    iget-object v2, v0, Lokhttp3/internal/b/c;->lY:Lokio/d;
 
-    iget-object v3, v0, Lokhttp3/internal/b/c;->btP:Lokio/BufferedSink;
+    iget-object v3, v0, Lokhttp3/internal/b/c;->btZ: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxW:Lokhttp3/internal/j/a;
 
-    iget-object v0, v0, Lokhttp3/internal/j/a;->bxv:Lokhttp3/WebSocketListener;
+    iget-object v0, v0, Lokhttp3/internal/j/a;->bxF:Lokhttp3/WebSocketListener;
 
-    iget-object v2, p0, Lokhttp3/internal/j/a$2;->bxM:Lokhttp3/internal/j/a;
+    iget-object v2, p0, Lokhttp3/internal/j/a$2;->bxW: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;->bxN:Lokhttp3/w;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxX:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    invoke-virtual {v0}, Lokhttp3/s;->Fr()Ljava/lang/String;
+    invoke-virtual {v0}, Lokhttp3/s;->Fu()Ljava/lang/String;
 
     move-result-object v0
 
@@ -184,23 +184,23 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxW: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;->Gd()Lokhttp3/internal/b/c;
+    invoke-virtual {p1}, Lokhttp3/internal/b/g;->Gg()Lokhttp3/internal/b/c;
 
     move-result-object p1
 
-    iget-object p1, p1, Lokhttp3/internal/b/c;->btN:Ljava/net/Socket;
+    iget-object p1, p1, Lokhttp3/internal/b/c;->btX: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object p1, p0, Lokhttp3/internal/j/a$2;->bxW:Lokhttp3/internal/j/a;
 
-    invoke-virtual {p1}, Lokhttp3/internal/j/a;->GS()V
+    invoke-virtual {p1}, Lokhttp3/internal/j/a;->GV()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;->bxM:Lokhttp3/internal/j/a;
+    iget-object p2, p0, Lokhttp3/internal/j/a$2;->bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$2;->bxW: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 9061ff1922..c7fe365401 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 bxM:Lokhttp3/internal/j/a;
+.field final synthetic bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$a;->bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$a;->bxW: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 676430f017..79a18ea82a 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 bxO:Lokio/ByteString;
+.field final bxY:Lokio/ByteString;
 
-.field final bxP:J
+.field final bxZ: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;->bxO:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/j/a$b;->bxY:Lokio/ByteString;
 
     const-wide/32 p1, 0xea60
 
-    iput-wide p1, p0, Lokhttp3/internal/j/a$b;->bxP:J
+    iput-wide p1, p0, Lokhttp3/internal/j/a$b;->bxZ: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 a8b0c3851a..54eed58454 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 bxQ:I
+.field final bya:I
 
-.field final bxR:Lokio/ByteString;
+.field final byb:Lokio/ByteString;
 
 
 # direct methods
@@ -28,9 +28,9 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lokhttp3/internal/j/a$c;->bxQ:I
+    iput p1, p0, Lokhttp3/internal/j/a$c;->bya:I
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$c;->bxR:Lokio/ByteString;
+    iput-object p2, p0, Lokhttp3/internal/j/a$c;->byb: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 54f38b1037..18ee3877cf 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 bxM:Lokhttp3/internal/j/a;
+.field final synthetic bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iput-object p1, p0, Lokhttp3/internal/j/a$d;->bxW: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;->bxM:Lokhttp3/internal/j/a;
+    iget-object v0, p0, Lokhttp3/internal/j/a$d;->bxW:Lokhttp3/internal/j/a;
 
     monitor-enter v0
 
     :try_start_0
-    iget-boolean v1, v0, Lokhttp3/internal/j/a;->bxI:Z
+    iget-boolean v1, v0, Lokhttp3/internal/j/a;->bxS:Z
 
     if-eqz v1, :cond_0
 
@@ -51,15 +51,15 @@
     return-void
 
     :cond_0
-    iget-object v1, v0, Lokhttp3/internal/j/a;->bxz:Lokhttp3/internal/j/d;
+    iget-object v1, v0, Lokhttp3/internal/j/a;->bxJ:Lokhttp3/internal/j/d;
 
-    iget-boolean v2, v0, Lokhttp3/internal/j/a;->bvH:Z
+    iget-boolean v2, v0, Lokhttp3/internal/j/a;->bvR:Z
 
     const/4 v3, -0x1
 
     if-eqz v2, :cond_1
 
-    iget v2, v0, Lokhttp3/internal/j/a;->bxJ:I
+    iget v2, v0, Lokhttp3/internal/j/a;->bxT:I
 
     goto :goto_0
 
@@ -67,15 +67,15 @@
     const/4 v2, -0x1
 
     :goto_0
-    iget v4, v0, Lokhttp3/internal/j/a;->bxJ:I
+    iget v4, v0, Lokhttp3/internal/j/a;->bxT:I
 
     const/4 v5, 0x1
 
     add-int/2addr v4, v5
 
-    iput v4, v0, Lokhttp3/internal/j/a;->bxJ:I
+    iput v4, v0, Lokhttp3/internal/j/a;->bxT:I
 
-    iput-boolean v5, v0, Lokhttp3/internal/j/a;->bvH:Z
+    iput-boolean v5, v0, Lokhttp3/internal/j/a;->bvR: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;->bxw:J
+    iget-wide v6, v0, Lokhttp3/internal/j/a;->bxG: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;->byH:Lokio/ByteString;
+    sget-object v2, Lokio/ByteString;->byR: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 2f6a14d792..3c947ec929 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 btP:Lokio/BufferedSink;
+.field public final btZ:Lokio/BufferedSink;
 
-.field public final bvz:Z
+.field public final bvJ:Z
 
-.field public final lZ:Lokio/d;
+.field public final lY:Lokio/d;
 
 
 # direct methods
@@ -33,11 +33,11 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/a$e;->bvz:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/a$e;->bvJ:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/a$e;->lZ:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/j/a$e;->lY:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/j/a$e;->btP:Lokio/BufferedSink;
+    iput-object p3, p0, Lokhttp3/internal/j/a$e;->btZ: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 48253c023d..276ba9dd4f 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;->ma:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->lZ:Lokio/c;
 
     iget-wide v4, v4, Lokio/c;->size:J
 
diff --git a/com.discord/smali_classes2/okhttp3/internal/j/c.smali b/com.discord/smali_classes2/okhttp3/internal/j/c.smali
index 939999eca6..fb11f79390 100644
--- a/com.discord/smali_classes2/okhttp3/internal/j/c.smali
+++ b/com.discord/smali_classes2/okhttp3/internal/j/c.smali
@@ -12,25 +12,25 @@
 
 
 # instance fields
-.field final bxS:Z
+.field final byc:Z
 
-.field final bxT:Lokhttp3/internal/j/c$a;
+.field final byd:Lokhttp3/internal/j/c$a;
 
-.field bxU:J
+.field bye:J
 
-.field bxV:Z
+.field byf:Z
 
-.field bxW:Z
+.field byg:Z
 
-.field private final bxX:Lokio/c;
+.field private final byh:Lokio/c;
 
-.field final bxY:Lokio/c;
+.field final byi:Lokio/c;
 
-.field private final bxZ:[B
+.field private final byj:[B
 
-.field private final bya:Lokio/c$a;
+.field private final byk:Lokio/c$a;
 
-.field final lZ:Lokio/d;
+.field final lY:Lokio/d;
 
 .field opcode:I
 
@@ -47,21 +47,21 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
     new-instance v0, Lokio/c;
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/internal/j/c;->bxY:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
 
     if-eqz p2, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/c;->bxS:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/c;->byc:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iput-object p2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
-    iput-object p3, p0, Lokhttp3/internal/j/c;->bxT:Lokhttp3/internal/j/c$a;
+    iput-object p3, p0, Lokhttp3/internal/j/c;->byd: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;->bxZ:[B
+    iput-object p3, p0, Lokhttp3/internal/j/c;->byj:[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;->bya:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
     return-void
 
@@ -103,7 +103,7 @@
     throw p1
 .end method
 
-.method private GY()V
+.method private Hb()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;->GW()V
+    invoke-virtual {p0}, Lokhttp3/internal/j/c;->GZ()V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxW:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byg:Z
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {p0}, Lokhttp3/internal/j/c;->GX()V
+    invoke-virtual {p0}, Lokhttp3/internal/j/c;->Ha()V
 
     goto :goto_0
 
@@ -132,7 +132,7 @@
 
 
 # virtual methods
-.method final GW()V
+.method final GZ()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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/s;->Hz()J
+    invoke-virtual {v0}, Lokio/s;->HC()J
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
     invoke-interface {v2}, Lokio/d;->timeout()Lokio/s;
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/s;->HC()Lokio/s;
+    invoke-virtual {v2}, Lokio/s;->HF()Lokio/s;
 
     :try_start_0
-    iget-object v2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->lY: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;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->lY: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;->bxV:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/c;->byf: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;->bxW:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/c;->byg:Z
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxW:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byg:Z
 
     if-eqz v0, :cond_3
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxV:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byf:Z
 
     if-eqz v0, :cond_2
 
@@ -282,7 +282,7 @@
 
     if-nez v2, :cond_10
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lY: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;->bxS:Z
+    iget-boolean v2, p0, Lokhttp3/internal/j/c;->byc:Z
 
     if-ne v1, v2, :cond_9
 
@@ -325,9 +325,9 @@
 
     int-to-long v2, v0
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bxU:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxU:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
 
     const-wide/16 v4, 0x7e
 
@@ -335,7 +335,7 @@
 
     if-nez v0, :cond_a
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lY: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;->bxU:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
 
     goto :goto_8
 
@@ -358,15 +358,15 @@
 
     if-nez v0, :cond_c
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
     invoke-interface {v0}, Lokio/d;->readLong()J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lokhttp3/internal/j/c;->bxU:J
+    iput-wide v2, p0, Lokhttp3/internal/j/c;->bye:J
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxU:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye: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;->bxU:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye: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;->bxW:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byg:Z
 
     if-eqz v0, :cond_e
 
-    iget-wide v2, p0, Lokhttp3/internal/j/c;->bxU:J
+    iget-wide v2, p0, Lokhttp3/internal/j/c;->bye: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxZ:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byj:[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;->lZ:Lokio/d;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
     invoke-interface {v3}, Lokio/d;->timeout()Lokio/s;
 
@@ -477,7 +477,7 @@
     throw v0
 .end method
 
-.method final GX()V
+.method final Ha()V
     .locals 8
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -485,7 +485,7 @@
         }
     .end annotation
 
-    iget-wide v0, p0, Lokhttp3/internal/j/c;->bxU:J
+    iget-wide v0, p0, Lokhttp3/internal/j/c;->bye:J
 
     const-wide/16 v2, 0x0
 
@@ -493,33 +493,33 @@
 
     if-lez v4, :cond_0
 
-    iget-object v4, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v4, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
-    iget-object v5, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v5, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
     invoke-interface {v4, v5, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byc:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
     invoke-virtual {v0, v2, v3}, Lokio/c$a;->aG(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxZ:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byj:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byk: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;->bxT:Lokhttp3/internal/j/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Gs()Lokio/ByteString;
 
-    invoke-interface {v0}, Lokhttp3/internal/j/c$a;->GT()V
+    invoke-interface {v0}, Lokhttp3/internal/j/c$a;->GW()V
 
     return-void
 
     :pswitch_1
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bxT:Lokhttp3/internal/j/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v1}, Lokio/c;->Gs()Lokio/ByteString;
 
     move-result-object v1
 
@@ -579,7 +579,7 @@
     :pswitch_2
     const/16 v0, 0x3ed
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
     iget-wide v4, v1, Lokio/c;->size:J
 
@@ -593,15 +593,15 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
     move-result v0
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxX:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byh:Lokio/c;
 
-    invoke-virtual {v1}, Lokio/c;->Hl()Ljava/lang/String;
+    invoke-virtual {v1}, Lokio/c;->Ho()Ljava/lang/String;
 
     move-result-object v1
 
@@ -624,7 +624,7 @@
     const-string v1, ""
 
     :goto_0
-    iget-object v2, p0, Lokhttp3/internal/j/c;->bxT:Lokhttp3/internal/j/c$a;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->byd:Lokhttp3/internal/j/c$a;
 
     invoke-interface {v2, v0, v1}, Lokhttp3/internal/j/c$a;->f(ILjava/lang/String;)V
 
@@ -653,7 +653,7 @@
     .end packed-switch
 .end method
 
-.method final GZ()V
+.method final Hc()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;->bxU:J
+    iget-wide v0, p0, Lokhttp3/internal/j/c;->bye:J
 
     const-wide/16 v2, 0x0
 
@@ -674,50 +674,50 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokhttp3/internal/j/c;->lZ:Lokio/d;
+    iget-object v2, p0, Lokhttp3/internal/j/c;->lY:Lokio/d;
 
-    iget-object v3, p0, Lokhttp3/internal/j/c;->bxY:Lokio/c;
+    iget-object v3, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/d;->b(Lokio/c;J)V
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxS:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byc:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bxY:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxY:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byi:Lokio/c;
 
     iget-wide v1, v1, Lokio/c;->size:J
 
-    iget-wide v3, p0, Lokhttp3/internal/j/c;->bxU:J
+    iget-wide v3, p0, Lokhttp3/internal/j/c;->bye:J
 
     sub-long/2addr v1, v3
 
     invoke-virtual {v0, v1, v2}, Lokio/c$a;->aG(J)I
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
-    iget-object v1, p0, Lokhttp3/internal/j/c;->bxZ:[B
+    iget-object v1, p0, Lokhttp3/internal/j/c;->byj:[B
 
     invoke-static {v0, v1}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object v0, p0, Lokhttp3/internal/j/c;->bya:Lokio/c$a;
+    iget-object v0, p0, Lokhttp3/internal/j/c;->byk:Lokio/c$a;
 
     invoke-virtual {v0}, Lokio/c$a;->close()V
 
     :cond_0
-    iget-boolean v0, p0, Lokhttp3/internal/j/c;->bxV:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/c;->byf:Z
 
     if-nez v0, :cond_2
 
-    invoke-direct {p0}, Lokhttp3/internal/j/c;->GY()V
+    invoke-direct {p0}, Lokhttp3/internal/j/c;->Hb()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 6acbb4ef82..f93eb4a842 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 bxQ:I
+.field bya:I
 
-.field byf:Z
+.field byp:Z
 
-.field final synthetic byg:Lokhttp3/internal/j/d;
+.field final synthetic byq:Lokhttp3/internal/j/d;
 
 .field contentLength:J
 
@@ -33,7 +33,7 @@
 .method constructor <init>(Lokhttp3/internal/j/d;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/internal/j/d$a;->byg:Lokhttp3/internal/j/d;
+    iput-object p1, p0, Lokhttp3/internal/j/d$a;->byq: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;->byg:Lokhttp3/internal/j/d;
+    iget-object v1, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget v2, p0, Lokhttp3/internal/j/d$a;->bxQ:I
+    iget v2, p0, Lokhttp3/internal/j/d$a;->bya:I
 
-    iget-object v0, v1, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/j/d;->lZ:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byf:Z
+    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byp:Z
 
     const/4 v6, 0x1
 
@@ -72,11 +72,11 @@
 
     iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->w:Z
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byg:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
     const/4 v1, 0x0
 
-    iput-boolean v1, v0, Lokhttp3/internal/j/d;->bye:Z
+    iput-boolean v1, v0, Lokhttp3/internal/j/d;->byo:Z
 
     return-void
 
@@ -102,15 +102,15 @@
 
     if-nez v0, :cond_0
 
-    iget-object v1, p0, Lokhttp3/internal/j/d$a;->byg:Lokhttp3/internal/j/d;
+    iget-object v1, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget v2, p0, Lokhttp3/internal/j/d$a;->bxQ:I
+    iget v2, p0, Lokhttp3/internal/j/d$a;->bya:I
 
-    iget-object v0, v1, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object v0, v1, Lokhttp3/internal/j/d;->lZ:Lokio/c;
 
     iget-wide v3, v0, Lokio/c;->size:J
 
-    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byf:Z
+    iget-boolean v5, p0, Lokhttp3/internal/j/d$a;->byp:Z
 
     const/4 v6, 0x0
 
@@ -118,7 +118,7 @@
 
     const/4 v0, 0x0
 
-    iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->byf:Z
+    iput-boolean v0, p0, Lokhttp3/internal/j/d$a;->byp:Z
 
     return-void
 
@@ -135,9 +135,9 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byg:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->btP:Lokio/BufferedSink;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->btZ: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;->byg:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget-object v0, v0, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object v0, v0, Lokhttp3/internal/j/d;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d$a;->byf:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d$a;->byp:Z
 
     const/4 p2, 0x0
 
@@ -178,9 +178,9 @@
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lokhttp3/internal/j/d$a;->byg:Lokhttp3/internal/j/d;
+    iget-object p1, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget-object p1, p1, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object p1, p1, Lokhttp3/internal/j/d;->lZ: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;->byg:Lokhttp3/internal/j/d;
+    iget-object p3, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget-object p3, p3, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object p3, p3, Lokhttp3/internal/j/d;->lZ:Lokio/c;
 
-    invoke-virtual {p3}, Lokio/c;->Hh()J
+    invoke-virtual {p3}, Lokio/c;->Hk()J
 
     move-result-wide v2
 
@@ -218,17 +218,17 @@
 
     if-nez p1, :cond_1
 
-    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byg:Lokhttp3/internal/j/d;
+    iget-object v0, p0, Lokhttp3/internal/j/d$a;->byq:Lokhttp3/internal/j/d;
 
-    iget v1, p0, Lokhttp3/internal/j/d$a;->bxQ:I
+    iget v1, p0, Lokhttp3/internal/j/d$a;->bya:I
 
-    iget-boolean v4, p0, Lokhttp3/internal/j/d$a;->byf:Z
+    iget-boolean v4, p0, Lokhttp3/internal/j/d$a;->byp: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;->byf:Z
+    iput-boolean p2, p0, Lokhttp3/internal/j/d$a;->byp: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 79e86ee4fe..a7b947bd7a 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 btP:Lokio/BufferedSink;
+.field final btZ:Lokio/BufferedSink;
 
-.field final bxS:Z
+.field final byc:Z
 
-.field private final bxZ:[B
+.field private final byj:[B
 
-.field private final bya:Lokio/c$a;
+.field private final byk:Lokio/c$a;
 
-.field final byb:Lokio/c;
+.field final byl:Lokio/c;
 
-.field byc:Z
+.field bym:Z
 
-.field final byd:Lokhttp3/internal/j/d$a;
+.field final byn:Lokhttp3/internal/j/d$a;
 
-.field bye:Z
+.field byo:Z
 
-.field final ma:Lokio/c;
+.field final lZ: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;->ma:Lokio/c;
+    iput-object v0, p0, Lokhttp3/internal/j/d;->lZ: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;->byd:Lokhttp3/internal/j/d$a;
+    iput-object v0, p0, Lokhttp3/internal/j/d;->byn:Lokhttp3/internal/j/d$a;
 
     if-eqz p2, :cond_3
 
     if-eqz p3, :cond_2
 
-    iput-boolean p1, p0, Lokhttp3/internal/j/d;->bxS:Z
+    iput-boolean p1, p0, Lokhttp3/internal/j/d;->byc:Z
 
-    iput-object p2, p0, Lokhttp3/internal/j/d;->btP:Lokio/BufferedSink;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->btZ:Lokio/BufferedSink;
 
-    invoke-interface {p2}, Lokio/BufferedSink;->Hc()Lokio/c;
+    invoke-interface {p2}, Lokio/BufferedSink;->Hf()Lokio/c;
 
     move-result-object p2
 
-    iput-object p2, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->byl: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;->bxZ:[B
+    iput-object p3, p0, Lokhttp3/internal/j/d;->byj:[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;->bya:Lokio/c$a;
+    iput-object p2, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     return-void
 
@@ -123,7 +123,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/d;->byc:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bym: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;->byb:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bxS:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->byc:Z
 
     if-eqz p1, :cond_2
 
@@ -163,7 +163,7 @@
 
     or-int/2addr p1, v0
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
@@ -178,11 +178,11 @@
 
     or-int/lit8 p1, v0, 0x7e
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     long-to-int p4, p2
 
@@ -193,11 +193,11 @@
     :cond_4
     or-int/lit8 p1, v0, 0x7f
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {p4, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     const/16 p4, 0x8
 
@@ -328,19 +328,19 @@
     iput-wide p4, p1, Lokio/c;->size:J
 
     :goto_1
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bxS:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->byc: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;->bxZ:[B
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byj:[B
 
     invoke-virtual {p1, p4}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->bxZ:[B
+    iget-object p4, p0, Lokhttp3/internal/j/d;->byj:[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;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     iget-wide p4, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
-    iget-object v0, p0, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object v0, p0, Lokhttp3/internal/j/d;->lZ:Lokio/c;
 
     invoke-virtual {p1, v0, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     invoke-virtual {p1, p4, p5}, Lokio/c$a;->aG(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bxZ:[B
+    iget-object p2, p0, Lokhttp3/internal/j/d;->byj:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_2
 
     :cond_5
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
-    iget-object p4, p0, Lokhttp3/internal/j/d;->ma:Lokio/c;
+    iget-object p4, p0, Lokhttp3/internal/j/d;->lZ: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->btZ:Lokio/BufferedSink;
 
-    invoke-interface {p1}, Lokio/BufferedSink;->He()Lokio/BufferedSink;
+    invoke-interface {p1}, Lokio/BufferedSink;->Hh()Lokio/BufferedSink;
 
     return-void
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lokhttp3/internal/j/d;->byc:Z
+    iget-boolean v0, p0, Lokhttp3/internal/j/d;->bym:Z
 
     if-nez v0, :cond_3
 
@@ -433,76 +433,76 @@
 
     or-int/lit16 p1, p1, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {v1, p1}, Lokio/c;->du(I)Lokio/c;
 
-    iget-boolean p1, p0, Lokhttp3/internal/j/d;->bxS:Z
+    iget-boolean p1, p0, Lokhttp3/internal/j/d;->byc:Z
 
     if-eqz p1, :cond_0
 
     or-int/lit16 p1, v0, 0x80
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object v1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {v1, p1}, Lokio/c;->du(I)Lokio/c;
 
     iget-object p1, p0, Lokhttp3/internal/j/d;->random:Ljava/util/Random;
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->bxZ:[B
+    iget-object v1, p0, Lokhttp3/internal/j/d;->byj:[B
 
     invoke-virtual {p1, v1}, Ljava/util/Random;->nextBytes([B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
-    iget-object v1, p0, Lokhttp3/internal/j/d;->bxZ:[B
+    iget-object v1, p0, Lokhttp3/internal/j/d;->byj:[B
 
     invoke-virtual {p1, v1}, Lokio/c;->D([B)Lokio/c;
 
     if-lez v0, :cond_1
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     iget-wide v0, p1, Lokio/c;->size:J
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {p1, p2}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p2, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     invoke-virtual {p1, p2}, Lokio/c;->a(Lokio/c$a;)Lokio/c$a;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     invoke-virtual {p1, v0, v1}, Lokio/c$a;->aG(J)I
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
-    iget-object p2, p0, Lokhttp3/internal/j/d;->bxZ:[B
+    iget-object p2, p0, Lokhttp3/internal/j/d;->byj:[B
 
     invoke-static {p1, p2}, Lokhttp3/internal/j/b;->a(Lokio/c$a;[B)V
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->bya:Lokio/c$a;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byk:Lokio/c$a;
 
     invoke-virtual {p1}, Lokio/c$a;->close()V
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl:Lokio/c;
 
     invoke-virtual {p1, v0}, Lokio/c;->du(I)Lokio/c;
 
-    iget-object p1, p0, Lokhttp3/internal/j/d;->byb:Lokio/c;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->byl: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;->btP:Lokio/BufferedSink;
+    iget-object p1, p0, Lokhttp3/internal/j/d;->btZ: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 033e009227..e098084452 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 bxj:[B
+.field private static final bxt:[B
 
-.field private static final bxk:[Ljava/lang/String;
+.field private static final bxu:[Ljava/lang/String;
 
-.field private static final bxl:[Ljava/lang/String;
+.field private static final bxv:[Ljava/lang/String;
 
-.field private static final bxm:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.field private static final bxw:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
 
 # instance fields
-.field private final bxn:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private bxA:[B
 
-.field private final bxo:Ljava/util/concurrent/CountDownLatch;
+.field private final bxx:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field private bxp:[B
+.field private final bxy:Ljava/util/concurrent/CountDownLatch;
 
-.field private bxq:[B
+.field private bxz:[B
 
 
 # direct methods
@@ -37,11 +37,11 @@
 
     aput-byte v3, v1, v2
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxj:[B
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxt:[B
 
     new-array v1, v2, [Ljava/lang/String;
 
-    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxk:[Ljava/lang/String;
+    sput-object v1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[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;->bxl:[Ljava/lang/String;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxv:[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;->bxm:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sput-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxw: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;->bxn:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxx: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;->bxo:Ljava/util/concurrent/CountDownLatch;
+    iput-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxy:Ljava/util/concurrent/CountDownLatch;
 
     return-void
 .end method
 
-.method public static GR()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+.method public static GU()Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
     .locals 1
 
-    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxm:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxw:Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;
 
     return-object v0
 .end method
@@ -267,7 +267,7 @@
     :cond_9
     new-instance v1, Ljava/lang/String;
 
-    sget-object v2, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v2, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v1, p0, v5, v6, v2}, Ljava/lang/String;-><init>([BIILjava/nio/charset/Charset;)V
 
@@ -283,7 +283,7 @@
 .method private g([Ljava/lang/String;)[Ljava/lang/String;
     .locals 7
 
-    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxn:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxx: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;->bxn:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxx: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;->bxp:[B
+    iput-object v4, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxz:[B
 
-    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxq:[B
+    iput-object v5, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxA:[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;->bxo:Ljava/util/concurrent/CountDownLatch;
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxy: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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()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;->bxo:Ljava/util/concurrent/CountDownLatch;
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxy: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;->bxp:[B
+    iget-object v0, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxz:[B
 
     if-eqz v0, :cond_10
 
@@ -503,7 +503,7 @@
 
     aget-object v4, p1, v3
 
-    sget-object v5, Lokhttp3/internal/c;->tx:Ljava/nio/charset/Charset;
+    sget-object v5, Lokhttp3/internal/c;->tw:Ljava/nio/charset/Charset;
 
     invoke-virtual {v4, v5}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -525,7 +525,7 @@
 
     if-ge p1, v3, :cond_6
 
-    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxp:[B
+    iget-object v3, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxz:[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;->bxj:[B
+    sget-object v6, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxt:[B
 
     aput-object v6, p1, v5
 
-    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxp:[B
+    iget-object v6, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxz:[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;->bxq:[B
+    iget-object p1, p0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxA:[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;->bxl:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxv:[Ljava/lang/String;
 
     return-object p1
 
@@ -655,7 +655,7 @@
     goto :goto_c
 
     :cond_d
-    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxk:[Ljava/lang/String;
+    sget-object p1, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[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;->bxk:[Ljava/lang/String;
+    sget-object v0, Lokhttp3/internal/publicsuffix/PublicSuffixDatabase;->bxu:[Ljava/lang/String;
 
     :goto_d
     array-length v1, p1
diff --git a/com.discord/smali_classes2/okhttp3/j$1.smali b/com.discord/smali_classes2/okhttp3/j$1.smali
index 45663f3083..fc5f2bef6b 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 bqe:Lokhttp3/j;
+.field final synthetic bqo:Lokhttp3/j;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/j;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/j$1;->bqe:Lokhttp3/j;
+    iput-object p1, p0, Lokhttp3/j$1;->bqo: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;->bqe:Lokhttp3/j;
+    iget-object v0, p0, Lokhttp3/j$1;->bqo: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;->bqe:Lokhttp3/j;
+    iget-object v2, p0, Lokhttp3/j$1;->bqo:Lokhttp3/j;
 
     monitor-enter v2
 
     :try_start_0
-    iget-object v3, p0, Lokhttp3/j$1;->bqe:Lokhttp3/j;
+    iget-object v3, p0, Lokhttp3/j$1;->bqo: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 6f8ac3d369..c5c898fa79 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 bpY:I
+.field final bqi:I
 
-.field private final bpZ:J
+.field private final bqj:J
 
-.field final bqa:Ljava/lang/Runnable;
+.field final bqk:Ljava/lang/Runnable;
 
-.field final bqb:Ljava/util/Deque;
+.field final bql:Ljava/util/Deque;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Deque<",
@@ -26,9 +26,9 @@
     .end annotation
 .end field
 
-.field final bqc:Lokhttp3/internal/b/d;
+.field final bqm:Lokhttp3/internal/b/d;
 
-.field bqd:Z
+.field bqn:Z
 
 
 # direct methods
@@ -85,23 +85,23 @@
 
     invoke-direct {v0, p0}, Lokhttp3/j$1;-><init>(Lokhttp3/j;)V
 
-    iput-object v0, p0, Lokhttp3/j;->bqa:Ljava/lang/Runnable;
+    iput-object v0, p0, Lokhttp3/j;->bqk:Ljava/lang/Runnable;
 
     new-instance v0, Ljava/util/ArrayDeque;
 
     invoke-direct {v0}, Ljava/util/ArrayDeque;-><init>()V
 
-    iput-object v0, p0, Lokhttp3/j;->bqb:Ljava/util/Deque;
+    iput-object v0, p0, Lokhttp3/j;->bql: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;->bqc:Lokhttp3/internal/b/d;
+    iput-object v0, p0, Lokhttp3/j;->bqm:Lokhttp3/internal/b/d;
 
     const/4 v0, 0x5
 
-    iput v0, p0, Lokhttp3/j;->bpY:I
+    iput v0, p0, Lokhttp3/j;->bqi:I
 
     const-wide/16 v0, 0x5
 
@@ -109,7 +109,7 @@
 
     move-result-wide v0
 
-    iput-wide v0, p0, Lokhttp3/j;->bpZ:J
+    iput-wide v0, p0, Lokhttp3/j;->bqj:J
 
     return-void
 .end method
@@ -122,7 +122,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lokhttp3/j;->bqb:Ljava/util/Deque;
+    iget-object v0, p0, Lokhttp3/j;->bql: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;->btT:Ljava/util/List;
+    iget-object v8, v7, Lokhttp3/internal/b/c;->bud: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;->btL:Lokhttp3/y;
+    iget-object v12, v7, Lokhttp3/internal/b/c;->btV:Lokhttp3/y;
 
-    iget-object v12, v12, Lokhttp3/y;->bsD:Lokhttp3/a;
+    iget-object v12, v12, Lokhttp3/y;->bsN:Lokhttp3/a;
 
-    iget-object v12, v12, Lokhttp3/a;->bna:Lokhttp3/s;
+    iget-object v12, v12, Lokhttp3/a;->bnk: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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()Lokhttp3/internal/g/f;
 
     move-result-object v12
 
-    iget-object v10, v10, Lokhttp3/internal/b/g$a;->bug:Ljava/lang/Object;
+    iget-object v10, v10, Lokhttp3/internal/b/g$a;->buq:Ljava/lang/Object;
 
     invoke-virtual {v12, v11, v10}, Lokhttp3/internal/g/f;->u(Ljava/lang/String;Ljava/lang/Object;)V
 
@@ -219,7 +219,7 @@
 
     const/4 v10, 0x1
 
-    iput-boolean v10, v7, Lokhttp3/internal/b/c;->btQ:Z
+    iput-boolean v10, v7, Lokhttp3/internal/b/c;->bua:Z
 
     invoke-interface {v8}, Ljava/util/List;->isEmpty()Z
 
@@ -227,11 +227,11 @@
 
     if-eqz v10, :cond_1
 
-    iget-wide v8, p0, Lokhttp3/j;->bpZ:J
+    iget-wide v8, p0, Lokhttp3/j;->bqj:J
 
     sub-long v8, p1, v8
 
-    iput-wide v8, v7, Lokhttp3/internal/b/c;->btU:J
+    iput-wide v8, v7, Lokhttp3/internal/b/c;->bue: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;->btU:J
+    iget-wide v8, v7, Lokhttp3/internal/b/c;->bue:J
 
     sub-long v8, p1, v8
 
@@ -267,13 +267,13 @@
     goto :goto_0
 
     :cond_5
-    iget-wide p1, p0, Lokhttp3/j;->bpZ:J
+    iget-wide p1, p0, Lokhttp3/j;->bqj:J
 
     cmp-long v0, v3, p1
 
     if-gez v0, :cond_9
 
-    iget p1, p0, Lokhttp3/j;->bpY:I
+    iget p1, p0, Lokhttp3/j;->bqi:I
 
     if-le v2, p1, :cond_6
 
@@ -282,7 +282,7 @@
     :cond_6
     if-lez v2, :cond_7
 
-    iget-wide p1, p0, Lokhttp3/j;->bpZ:J
+    iget-wide p1, p0, Lokhttp3/j;->bqj:J
 
     sub-long/2addr p1, v3
 
@@ -293,14 +293,14 @@
     :cond_7
     if-lez v6, :cond_8
 
-    iget-wide p1, p0, Lokhttp3/j;->bpZ:J
+    iget-wide p1, p0, Lokhttp3/j;->bqj:J
 
     monitor-exit p0
 
     return-wide p1
 
     :cond_8
-    iput-boolean v1, p0, Lokhttp3/j;->bqd:Z
+    iput-boolean v1, p0, Lokhttp3/j;->bqn:Z
 
     const-wide/16 p1, -0x1
 
@@ -310,7 +310,7 @@
 
     :cond_9
     :goto_3
-    iget-object p1, p0, Lokhttp3/j;->bqb:Ljava/util/Deque;
+    iget-object p1, p0, Lokhttp3/j;->bql: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;->btN:Ljava/net/Socket;
+    iget-object p1, v5, Lokhttp3/internal/b/c;->btX: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 d3ca2a7023..19c7b1d6b7 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 bqz:Lokhttp3/m;
+.field public static final bqJ:Lokhttp3/m;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/m$1;-><init>()V
 
-    sput-object v0, Lokhttp3/m;->bqz:Lokhttp3/m;
+    sput-object v0, Lokhttp3/m;->bqJ:Lokhttp3/m;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/o.smali b/com.discord/smali_classes2/okhttp3/o.smali
index e954f1f5dd..dcb6944bbf 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 bqG:Lokhttp3/o;
+.field public static final bqQ:Lokhttp3/o;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lokhttp3/o$1;-><init>()V
 
-    sput-object v0, Lokhttp3/o;->bqG:Lokhttp3/o;
+    sput-object v0, Lokhttp3/o;->bqQ:Lokhttp3/o;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p$2.smali b/com.discord/smali_classes2/okhttp3/p$2.smali
index 5243ccb7c9..f059ccd7bd 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 bqI:Lokhttp3/p;
+.field final synthetic bqS:Lokhttp3/p;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/p;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/p$2;->bqI:Lokhttp3/p;
+    iput-object p1, p0, Lokhttp3/p$2;->bqS:Lokhttp3/p;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Fh()Lokhttp3/p;
+.method public final Fk()Lokhttp3/p;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/p$2;->bqI:Lokhttp3/p;
+    iget-object v0, p0, Lokhttp3/p$2;->bqS: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 ea5bad48ed..06eb9c013e 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 Fh()Lokhttp3/p;
+.method public abstract Fk()Lokhttp3/p;
 .end method
diff --git a/com.discord/smali_classes2/okhttp3/p.smali b/com.discord/smali_classes2/okhttp3/p.smali
index e06f36ed98..25e8244eb1 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 bqH:Lokhttp3/p;
+.field public static final bqR:Lokhttp3/p;
 
 
 # direct methods
@@ -23,7 +23,7 @@
 
     invoke-direct {v0}, Lokhttp3/p$1;-><init>()V
 
-    sput-object v0, Lokhttp3/p;->bqH:Lokhttp3/p;
+    sput-object v0, Lokhttp3/p;->bqR: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 7b7a1e1876..492160c9cb 100644
--- a/com.discord/smali_classes2/okhttp3/q$a.smali
+++ b/com.discord/smali_classes2/okhttp3/q$a.smali
@@ -15,7 +15,7 @@
 
 
 # instance fields
-.field public final bqM:Ljava/util/List;
+.field public final bqW:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field private final bqN:Ljava/nio/charset/Charset;
+.field private final bqX:Ljava/nio/charset/Charset;
 
 .field public final names:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
@@ -64,11 +64,11 @@
 
     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
 
-    iput-object p1, p0, Lokhttp3/q$a;->bqM:Ljava/util/List;
+    iput-object p1, p0, Lokhttp3/q$a;->bqW:Ljava/util/List;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lokhttp3/q$a;->bqN:Ljava/nio/charset/Charset;
+    iput-object p1, p0, Lokhttp3/q$a;->bqX: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;->bqN:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->bqX: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;->bqM:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->bqW:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/q$a;->bqN:Ljava/nio/charset/Charset;
+    iget-object v0, p0, Lokhttp3/q$a;->bqX: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;->bqN:Ljava/nio/charset/Charset;
+    iget-object v1, p0, Lokhttp3/q$a;->bqX: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;->bqM:Ljava/util/List;
+    iget-object p1, p0, Lokhttp3/q$a;->bqW:Ljava/util/List;
 
-    iget-object v0, p0, Lokhttp3/q$a;->bqN:Ljava/nio/charset/Charset;
+    iget-object v0, p0, Lokhttp3/q$a;->bqX: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 8fa00bc209..91d3d90664 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 brQ:Lokhttp3/u;
+.field public static final enum bsa:Lokhttp3/u;
 
-.field public static final enum brR:Lokhttp3/u;
+.field public static final enum bsb:Lokhttp3/u;
 
-.field public static final enum brS:Lokhttp3/u;
+.field public static final enum bsc:Lokhttp3/u;
 
-.field public static final enum brT:Lokhttp3/u;
+.field public static final enum bsd:Lokhttp3/u;
 
-.field public static final enum brU:Lokhttp3/u;
+.field public static final enum bse:Lokhttp3/u;
 
-.field public static final enum brV:Lokhttp3/u;
+.field public static final enum bsf:Lokhttp3/u;
 
-.field private static final synthetic brW:[Lokhttp3/u;
+.field private static final synthetic bsg:[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;->brQ:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsa: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;->brR:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsb: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;->brS:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsc: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;->brT:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsd: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;->brU:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bse: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;->brV:Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsf:Lokhttp3/u;
 
     const/4 v0, 0x6
 
     new-array v0, v0, [Lokhttp3/u;
 
-    sget-object v7, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v7, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     aput-object v7, v0, v1
 
-    sget-object v1, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bsb:Lokhttp3/u;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/u;->brS:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bsc:Lokhttp3/u;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/u;->brT:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bsd:Lokhttp3/u;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/u;->brU:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bse:Lokhttp3/u;
 
     aput-object v1, v0, v5
 
-    sget-object v1, Lokhttp3/u;->brV:Lokhttp3/u;
+    sget-object v1, Lokhttp3/u;->bsf:Lokhttp3/u;
 
     aput-object v1, v0, v6
 
-    sput-object v0, Lokhttp3/u;->brW:[Lokhttp3/u;
+    sput-object v0, Lokhttp3/u;->bsg:[Lokhttp3/u;
 
     return-void
 .end method
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    sget-object v0, Lokhttp3/u;->brQ:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsa: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;->brQ:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bsa:Lokhttp3/u;
 
     return-object p0
 
     :cond_0
-    sget-object v0, Lokhttp3/u;->brR:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsb: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;->brR:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bsb:Lokhttp3/u;
 
     return-object p0
 
     :cond_1
-    sget-object v0, Lokhttp3/u;->brU:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bse: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;->brU:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bse:Lokhttp3/u;
 
     return-object p0
 
     :cond_2
-    sget-object v0, Lokhttp3/u;->brT:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsd: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;->brT:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bsd:Lokhttp3/u;
 
     return-object p0
 
     :cond_3
-    sget-object v0, Lokhttp3/u;->brS:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsc: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;->brS:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bsc:Lokhttp3/u;
 
     return-object p0
 
     :cond_4
-    sget-object v0, Lokhttp3/u;->brV:Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsf: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;->brV:Lokhttp3/u;
+    sget-object p0, Lokhttp3/u;->bsf:Lokhttp3/u;
 
     return-object p0
 
@@ -291,7 +291,7 @@
 .method public static values()[Lokhttp3/u;
     .locals 1
 
-    sget-object v0, Lokhttp3/u;->brW:[Lokhttp3/u;
+    sget-object v0, Lokhttp3/u;->bsg:[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 3e5cd8aef1..304715c6ee 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 bse:Lokhttp3/v;
+.field final synthetic bso:Lokhttp3/v;
 
 
 # direct methods
 .method constructor <init>(Lokhttp3/v;)V
     .locals 0
 
-    iput-object p1, p0, Lokhttp3/v$1;->bse:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$1;->bso:Lokhttp3/v;
 
     invoke-direct {p0}, Lokio/a;-><init>()V
 
@@ -31,12 +31,12 @@
 
 
 # virtual methods
-.method public final FE()V
+.method public final FH()V
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$1;->bse:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$1;->bso:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v0, v0, Lokhttp3/v;->bsi: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 2381dae5e3..e0459b0cbc 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 bse:Lokhttp3/v;
+.field final synthetic bso:Lokhttp3/v;
 
-.field final bsf:Lokhttp3/f;
+.field final bsp: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;->bse:Lokhttp3/v;
+    iput-object p1, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    invoke-virtual {p1}, Lokhttp3/v;->FC()Ljava/lang/String;
+    invoke-virtual {p1}, Lokhttp3/v;->FF()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;->bsf:Lokhttp3/f;
+    iput-object p2, p0, Lokhttp3/v$a;->bsp:Lokhttp3/f;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final FF()Ljava/lang/String;
+.method final FI()Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lokhttp3/v$a;->bse:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->bsb:Lokhttp3/w;
+    iget-object v0, v0, Lokhttp3/v;->bsl:Lokhttp3/w;
 
-    iget-object v0, v0, Lokhttp3/w;->bna:Lokhttp3/s;
+    iget-object v0, v0, Lokhttp3/w;->bnk:Lokhttp3/s;
 
-    iget-object v0, v0, Lokhttp3/s;->bqW:Ljava/lang/String;
+    iget-object v0, v0, Lokhttp3/s;->brg: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;->bse:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->brZ:Lokio/a;
+    iget-object v0, v0, Lokhttp3/v;->bsj: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;->bse:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    invoke-virtual {v2}, Lokhttp3/v;->FD()Lokhttp3/Response;
+    invoke-virtual {v2}, Lokhttp3/v;->FG()Lokhttp3/Response;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokhttp3/v$a;->bse:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v3, v3, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v3, v3, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
-    iget-boolean v1, v3, Lokhttp3/internal/c/j;->bul:Z
+    iget-boolean v1, v3, Lokhttp3/internal/c/j;->buv: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;->bsf:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bsp:Lokhttp3/f;
 
     new-instance v2, Ljava/io/IOException;
 
@@ -120,9 +120,9 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokhttp3/v$a;->bsf:Lokhttp3/f;
+    iget-object v1, p0, Lokhttp3/v$a;->bsp:Lokhttp3/f;
 
-    iget-object v3, p0, Lokhttp3/v$a;->bse:Lokhttp3/v;
+    iget-object v3, p0, Lokhttp3/v$a;->bso: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;->bse:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brL: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;->bse:Lokhttp3/v;
+    iget-object v2, p0, Lokhttp3/v$a;->bso: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;->GQ()Lokhttp3/internal/g/f;
+    invoke-static {}, Lokhttp3/internal/g/f;->GT()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;->bse:Lokhttp3/v;
+    iget-object v4, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
     new-instance v5, Ljava/lang/StringBuilder;
 
     invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
 
-    iget-object v6, v4, Lokhttp3/v;->brY:Lokhttp3/internal/c/j;
+    iget-object v6, v4, Lokhttp3/v;->bsi:Lokhttp3/internal/c/j;
 
-    iget-boolean v6, v6, Lokhttp3/internal/c/j;->bul:Z
+    iget-boolean v6, v6, Lokhttp3/internal/c/j;->buv: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;->bsc:Z
+    iget-boolean v6, v4, Lokhttp3/v;->bsm: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;->FC()Ljava/lang/String;
+    invoke-virtual {v4}, Lokhttp3/v;->FF()Ljava/lang/String;
 
     move-result-object v4
 
@@ -241,31 +241,31 @@
     goto :goto_5
 
     :cond_3
-    iget-object v0, p0, Lokhttp3/v$a;->bse:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
     invoke-static {v0}, Lokhttp3/v;->c(Lokhttp3/v;)Lokhttp3/p;
 
-    iget-object v0, p0, Lokhttp3/v$a;->bsf:Lokhttp3/f;
+    iget-object v0, p0, Lokhttp3/v$a;->bsp: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;->bse:Lokhttp3/v;
+    iget-object v0, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v0, v0, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v0, v0, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v0, v0, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v0, v0, Lokhttp3/t;->brL:Lokhttp3/n;
 
     goto :goto_1
 
     :goto_6
-    iget-object v1, p0, Lokhttp3/v$a;->bse:Lokhttp3/v;
+    iget-object v1, p0, Lokhttp3/v$a;->bso:Lokhttp3/v;
 
-    iget-object v1, v1, Lokhttp3/v;->brX:Lokhttp3/t;
+    iget-object v1, v1, Lokhttp3/v;->bsh:Lokhttp3/t;
 
-    iget-object v1, v1, Lokhttp3/t;->brB:Lokhttp3/n;
+    iget-object v1, v1, Lokhttp3/t;->brL: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 3fec6e13c3..2a6b3811df 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 bsF:Lokhttp3/z;
+.field public static final enum bsP:Lokhttp3/z;
 
-.field public static final enum bsG:Lokhttp3/z;
+.field public static final enum bsQ:Lokhttp3/z;
 
-.field public static final enum bsH:Lokhttp3/z;
+.field public static final enum bsR:Lokhttp3/z;
 
-.field public static final enum bsI:Lokhttp3/z;
+.field public static final enum bsS:Lokhttp3/z;
 
-.field public static final enum bsJ:Lokhttp3/z;
+.field public static final enum bsT:Lokhttp3/z;
 
-.field private static final synthetic bsK:[Lokhttp3/z;
+.field private static final synthetic bsU:[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;->bsF:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsP: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;->bsG:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsQ: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;->bsH:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsR: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;->bsI:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsS: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;->bsJ:Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsT:Lokhttp3/z;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lokhttp3/z;
 
-    sget-object v6, Lokhttp3/z;->bsF:Lokhttp3/z;
+    sget-object v6, Lokhttp3/z;->bsP:Lokhttp3/z;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lokhttp3/z;->bsG:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsQ:Lokhttp3/z;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lokhttp3/z;->bsH:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsR:Lokhttp3/z;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lokhttp3/z;->bsI:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsS:Lokhttp3/z;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lokhttp3/z;->bsJ:Lokhttp3/z;
+    sget-object v1, Lokhttp3/z;->bsT:Lokhttp3/z;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lokhttp3/z;->bsK:[Lokhttp3/z;
+    sput-object v0, Lokhttp3/z;->bsU:[Lokhttp3/z;
 
     return-void
 .end method
@@ -294,7 +294,7 @@
 
     if-ne v0, v2, :cond_3
 
-    sget-object p0, Lokhttp3/z;->bsJ:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsT:Lokhttp3/z;
 
     return-object p0
 
@@ -316,22 +316,22 @@
     throw v0
 
     :cond_4
-    sget-object p0, Lokhttp3/z;->bsI:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsS:Lokhttp3/z;
 
     return-object p0
 
     :cond_5
-    sget-object p0, Lokhttp3/z;->bsH:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsR:Lokhttp3/z;
 
     return-object p0
 
     :cond_6
-    sget-object p0, Lokhttp3/z;->bsG:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsQ:Lokhttp3/z;
 
     return-object p0
 
     :cond_7
-    sget-object p0, Lokhttp3/z;->bsF:Lokhttp3/z;
+    sget-object p0, Lokhttp3/z;->bsP:Lokhttp3/z;
 
     return-object p0
 
@@ -360,7 +360,7 @@
 .method public static values()[Lokhttp3/z;
     .locals 1
 
-    sget-object v0, Lokhttp3/z;->bsK:[Lokhttp3/z;
+    sget-object v0, Lokhttp3/z;->bsU:[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 cd87a70201..c6998e48f9 100644
--- a/com.discord/smali_classes2/okio/ByteString.smali
+++ b/com.discord/smali_classes2/okio/ByteString.smali
@@ -20,9 +20,9 @@
 
 
 # static fields
-.field static final bqU:[C
+.field static final bre:[C
 
-.field public static final byH:Lokio/ByteString;
+.field public static final byR:Lokio/ByteString;
 
 .field private static final serialVersionUID:J = 0x1L
 
@@ -30,7 +30,7 @@
 # instance fields
 .field transient aW:I
 
-.field transient byI:Ljava/lang/String;
+.field transient byS:Ljava/lang/String;
 
 .field final data:[B
 
@@ -45,7 +45,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lokio/ByteString;->bqU:[C
+    sput-object v0, Lokio/ByteString;->bre:[C
 
     const/4 v0, 0x0
 
@@ -55,7 +55,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/ByteString;->byH:Lokio/ByteString;
+    sput-object v0, Lokio/ByteString;->byR:Lokio/ByteString;
 
     return-void
 
@@ -192,7 +192,7 @@
 
     new-instance v0, Lokio/ByteString;
 
-    sget-object v1, Lokio/t;->tx:Ljava/nio/charset/Charset;
+    sget-object v1, Lokio/t;->tw:Ljava/nio/charset/Charset;
 
     invoke-virtual {p0, v1}, Ljava/lang/String;->getBytes(Ljava/nio/charset/Charset;)[B
 
@@ -200,7 +200,7 @@
 
     invoke-direct {v0, v1}, Lokio/ByteString;-><init>([B)V
 
-    iput-object p0, v0, Lokio/ByteString;->byI:Ljava/lang/String;
+    iput-object p0, v0, Lokio/ByteString;->byS:Ljava/lang/String;
 
     return-object v0
 
@@ -476,10 +476,18 @@
 
 
 # virtual methods
-.method public Hq()Ljava/lang/String;
+.method HA()[B
+    .locals 1
+
+    iget-object v0, p0, Lokio/ByteString;->data:[B
+
+    return-object v0
+.end method
+
+.method public Ht()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lokio/ByteString;->byI:Ljava/lang/String;
+    iget-object v0, p0, Lokio/ByteString;->byS:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -490,16 +498,16 @@
 
     iget-object v1, p0, Lokio/ByteString;->data:[B
 
-    sget-object v2, Lokio/t;->tx:Ljava/nio/charset/Charset;
+    sget-object v2, Lokio/t;->tw:Ljava/nio/charset/Charset;
 
     invoke-direct {v0, v1, v2}, Ljava/lang/String;-><init>([BLjava/nio/charset/Charset;)V
 
-    iput-object v0, p0, Lokio/ByteString;->byI:Ljava/lang/String;
+    iput-object v0, p0, Lokio/ByteString;->byS:Ljava/lang/String;
 
     return-object v0
 .end method
 
-.method public Hr()Ljava/lang/String;
+.method public Hu()Ljava/lang/String;
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -511,7 +519,7 @@
     return-object v0
 .end method
 
-.method public Hs()Lokio/ByteString;
+.method public Hv()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-1"
@@ -523,7 +531,7 @@
     return-object v0
 .end method
 
-.method public Ht()Lokio/ByteString;
+.method public Hw()Lokio/ByteString;
     .locals 1
 
     const-string v0, "SHA-256"
@@ -535,7 +543,7 @@
     return-object v0
 .end method
 
-.method public Hu()Ljava/lang/String;
+.method public Hx()Ljava/lang/String;
     .locals 9
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -559,7 +567,7 @@
 
     add-int/lit8 v6, v4, 0x1
 
-    sget-object v7, Lokio/ByteString;->bqU:[C
+    sget-object v7, Lokio/ByteString;->bre:[C
 
     shr-int/lit8 v8, v5, 0x4
 
@@ -589,7 +597,7 @@
     return-object v0
 .end method
 
-.method public Hv()Lokio/ByteString;
+.method public Hy()Lokio/ByteString;
     .locals 6
 
     const/4 v0, 0x0
@@ -663,7 +671,7 @@
     return-object p0
 .end method
 
-.method public Hw()[B
+.method public Hz()[B
     .locals 1
 
     iget-object v0, p0, Lokio/ByteString;->data:[B
@@ -677,14 +685,6 @@
     return-object v0
 .end method
 
-.method Hx()[B
-    .locals 1
-
-    iget-object v0, p0, Lokio/ByteString;->data:[B
-
-    return-object v0
-.end method
-
 .method public T(II)Lokio/ByteString;
     .locals 3
 
@@ -1030,7 +1030,7 @@
     return-object v0
 
     :cond_0
-    invoke-virtual {p0}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v0
 
@@ -1121,7 +1121,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-virtual {p0}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/ByteString;->Hx()Ljava/lang/String;
 
     move-result-object v1
 
@@ -1154,7 +1154,7 @@
 
     move-result-object v2
 
-    invoke-virtual {v2}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {v2}, Lokio/ByteString;->Hx()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 d752e7ebca..231df37fa1 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 byx:Lokio/q;
+.field final synthetic byH:Lokio/q;
 
-.field final synthetic byy:Lokio/a;
+.field final synthetic byI:Lokio/a;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/q;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$1;->byy:Lokio/a;
+    iput-object p1, p0, Lokio/a$1;->byI:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$1;->byx:Lokio/q;
+    iput-object p2, p0, Lokio/a$1;->byH:Lokio/q;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,19 +46,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->byx:Lokio/q;
+    iget-object v0, p0, Lokio/a$1;->byH: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;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -75,7 +75,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byI:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -86,7 +86,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byI:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -103,19 +103,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$1;->byx:Lokio/q;
+    iget-object v0, p0, Lokio/a$1;->byH: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;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -132,7 +132,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byI:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -143,7 +143,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v1, p0, Lokio/a$1;->byI:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -155,7 +155,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byI: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;->byx:Lokio/q;
+    iget-object v1, p0, Lokio/a$1;->byH: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;->byD:Lokio/n;
+    iget-object v2, p1, Lokio/c;->byN:Lokio/n;
 
     :goto_1
     const-wide/32 v3, 0x10000
@@ -235,18 +235,18 @@
     goto :goto_2
 
     :cond_0
-    iget-object v2, v2, Lokio/n;->byY:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_1
 
     :cond_1
     :goto_2
-    iget-object v2, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v2, p0, Lokio/a$1;->byI:Lokio/a;
 
     invoke-virtual {v2}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v2, p0, Lokio/a$1;->byx:Lokio/q;
+    iget-object v2, p0, Lokio/a$1;->byH:Lokio/q;
 
     invoke-interface {v2, p1, v0, v1}, Lokio/q;->write(Lokio/c;J)V
     :try_end_0
@@ -255,7 +255,7 @@
 
     sub-long/2addr p2, v0
 
-    iget-object v0, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$1;->byI:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -272,7 +272,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->byI:Lokio/a;
 
     invoke-virtual {p2, p1}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -283,7 +283,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_3
-    iget-object p2, p0, Lokio/a$1;->byy:Lokio/a;
+    iget-object p2, p0, Lokio/a$1;->byI:Lokio/a;
 
     const/4 p3, 0x0
 
diff --git a/com.discord/smali_classes2/okio/a$2.smali b/com.discord/smali_classes2/okio/a$2.smali
index a958b79531..8898e9937a 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 byy:Lokio/a;
+.field final synthetic byI:Lokio/a;
 
-.field final synthetic byz:Lokio/r;
+.field final synthetic byJ:Lokio/r;
 
 
 # direct methods
 .method constructor <init>(Lokio/a;Lokio/r;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/a$2;->byy:Lokio/a;
+    iput-object p1, p0, Lokio/a$2;->byI:Lokio/a;
 
-    iput-object p2, p0, Lokio/a$2;->byz:Lokio/r;
+    iput-object p2, p0, Lokio/a$2;->byJ:Lokio/r;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,12 +46,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byI:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->byz:Lokio/r;
+    iget-object v0, p0, Lokio/a$2;->byJ:Lokio/r;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/r;->a(Lokio/c;J)J
 
@@ -60,7 +60,7 @@
     .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;->byy:Lokio/a;
+    iget-object p3, p0, Lokio/a$2;->byI:Lokio/a;
 
     const/4 v0, 0x1
 
@@ -77,7 +77,7 @@
     move-exception p1
 
     :try_start_1
-    iget-object p2, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->byI:Lokio/a;
 
     invoke-virtual {p2, p1}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -88,7 +88,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object p2, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object p2, p0, Lokio/a$2;->byI:Lokio/a;
 
     const/4 p3, 0x0
 
@@ -105,19 +105,19 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byI:Lokio/a;
 
     invoke-virtual {v0}, Lokio/a;->enter()V
 
     :try_start_0
-    iget-object v0, p0, Lokio/a$2;->byz:Lokio/r;
+    iget-object v0, p0, Lokio/a$2;->byJ: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;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byI:Lokio/a;
 
     const/4 v1, 0x1
 
@@ -134,7 +134,7 @@
     move-exception v0
 
     :try_start_1
-    iget-object v1, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->byI:Lokio/a;
 
     invoke-virtual {v1, v0}, Lokio/a;->f(Ljava/io/IOException;)Ljava/io/IOException;
 
@@ -145,7 +145,7 @@
     .catchall {:try_start_1 .. :try_end_1} :catchall_0
 
     :goto_0
-    iget-object v1, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object v1, p0, Lokio/a$2;->byI:Lokio/a;
 
     const/4 v2, 0x0
 
@@ -157,7 +157,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/a$2;->byy:Lokio/a;
+    iget-object v0, p0, Lokio/a$2;->byI: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;->byz:Lokio/r;
+    iget-object v1, p0, Lokio/a$2;->byJ: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 37a0fe271d..7395b9c712 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;->Hb()Lokio/a;
+    invoke-static {}, Lokio/a;->He()Lokio/a;
 
     move-result-object v1
 
@@ -55,13 +55,13 @@
     goto :goto_0
 
     :cond_0
-    sget-object v2, Lokio/a;->byt:Lokio/a;
+    sget-object v2, Lokio/a;->byD:Lokio/a;
 
     if-ne v1, v2, :cond_1
 
     const/4 v1, 0x0
 
-    sput-object v1, Lokio/a;->byt:Lokio/a;
+    sput-object v1, Lokio/a;->byD: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;->FE()V
+    invoke-virtual {v1}, Lokio/a;->FH()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 4b14dbcfe7..6feda7cf33 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 byA:[B
+.field private static final byK:[B
 
-.field private static final byB:[B
+.field private static final byL:[B
 
 
 # direct methods
@@ -19,13 +19,13 @@
 
     fill-array-data v1, :array_0
 
-    sput-object v1, Lokio/b;->byA:[B
+    sput-object v1, Lokio/b;->byK:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lokio/b;->byB:[B
+    sput-object v0, Lokio/b;->byL:[B
 
     return-void
 
@@ -171,7 +171,7 @@
 .method public static C([B)Ljava/lang/String;
     .locals 1
 
-    sget-object v0, Lokio/b;->byA:[B
+    sget-object v0, Lokio/b;->byK:[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 408f740679..4e5559740c 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 byE:Lokio/c;
+.field final synthetic byO:Lokio/c;
 
 
 # direct methods
 .method public constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$1;->byE:Lokio/c;
+    iput-object p1, p0, Lokio/c$1;->byO: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;->byE:Lokio/c;
+    iget-object v1, p0, Lokio/c$1;->byO:Lokio/c;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
@@ -68,7 +68,7 @@
 .method public final write(I)V
     .locals 1
 
-    iget-object v0, p0, Lokio/c$1;->byE:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->byO:Lokio/c;
 
     int-to-byte p1, p1
 
@@ -80,7 +80,7 @@
 .method public final write([BII)V
     .locals 1
 
-    iget-object v0, p0, Lokio/c$1;->byE:Lokio/c;
+    iget-object v0, p0, Lokio/c$1;->byO:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->k([BII)Lokio/c;
 
diff --git a/com.discord/smali_classes2/okio/c$2.smali b/com.discord/smali_classes2/okio/c$2.smali
index 08d59bf95a..f01d962d89 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;->Hg()Ljava/io/InputStream;
+    value = Lokio/c;->Hj()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic byE:Lokio/c;
+.field final synthetic byO:Lokio/c;
 
 
 # direct methods
 .method constructor <init>(Lokio/c;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/c$2;->byE:Lokio/c;
+    iput-object p1, p0, Lokio/c$2;->byO: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;->byE:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byO: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;->byE:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byO: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;->byE:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byO: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;->byE:Lokio/c;
+    iget-object v0, p0, Lokio/c$2;->byO: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;->byE:Lokio/c;
+    iget-object v1, p0, Lokio/c$2;->byO: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 8e00795267..82ce43f86d 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 byF:Z
+.field public byP:Z
 
-.field private byG:Lokio/n;
+.field private byQ:Lokio/n;
 
 .field public data:[B
 
 .field public end:I
 
-.field public ma:Lokio/c;
+.field public lZ:Lokio/c;
 
 .field public offset:J
 
@@ -63,7 +63,7 @@
 
     if-ltz v2, :cond_8
 
-    iget-object v2, p0, Lokio/c$a;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->lZ: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/c$a;->lZ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v4, p0, Lokio/c$a;->ma:Lokio/c;
+    iget-object v4, p0, Lokio/c$a;->lZ:Lokio/c;
 
-    iget-object v4, v4, Lokio/c;->byD:Lokio/n;
+    iget-object v4, v4, Lokio/c;->byN:Lokio/n;
 
-    iget-object v5, p0, Lokio/c$a;->ma:Lokio/c;
+    iget-object v5, p0, Lokio/c$a;->lZ:Lokio/c;
 
-    iget-object v5, v5, Lokio/c;->byD:Lokio/n;
+    iget-object v5, v5, Lokio/c;->byN:Lokio/n;
 
-    iget-object v6, p0, Lokio/c$a;->byG:Lokio/n;
+    iget-object v6, p0, Lokio/c$a;->byQ:Lokio/n;
 
     if-eqz v6, :cond_2
 
@@ -120,14 +120,14 @@
 
     if-lez v6, :cond_1
 
-    iget-object v5, p0, Lokio/c$a;->byG:Lokio/n;
+    iget-object v5, p0, Lokio/c$a;->byQ:Lokio/n;
 
     move-wide v2, v7
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, p0, Lokio/c$a;->byG:Lokio/n;
+    iget-object v4, p0, Lokio/c$a;->byQ:Lokio/n;
 
     move-wide v0, v7
 
@@ -166,7 +166,7 @@
 
     add-long/2addr v0, v2
 
-    iget-object v4, v4, Lokio/n;->byY:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_1
 
@@ -180,7 +180,7 @@
 
     if-lez v2, :cond_4
 
-    iget-object v4, v4, Lokio/n;->byZ:Lokio/n;
+    iget-object v4, v4, Lokio/n;->bzj: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;->byF:Z
+    iget-boolean v2, p0, Lokio/c$a;->byP:Z
 
     if-eqz v2, :cond_6
 
-    iget-boolean v2, v4, Lokio/n;->bkc:Z
+    iget-boolean v2, v4, Lokio/n;->bkm:Z
 
     if-eqz v2, :cond_6
 
-    invoke-virtual {v4}, Lokio/n;->HH()Lokio/n;
+    invoke-virtual {v4}, Lokio/n;->HK()Lokio/n;
 
     move-result-object v2
 
-    iget-object v3, p0, Lokio/c$a;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->lZ:Lokio/c;
 
-    iget-object v3, v3, Lokio/c;->byD:Lokio/n;
+    iget-object v3, v3, Lokio/c;->byN:Lokio/n;
 
     if-ne v3, v4, :cond_5
 
-    iget-object v3, p0, Lokio/c$a;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/c$a;->lZ:Lokio/c;
 
-    iput-object v2, v3, Lokio/c;->byD:Lokio/n;
+    iput-object v2, v3, Lokio/c;->byN: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;->byZ:Lokio/n;
+    iget-object v2, v4, Lokio/n;->bzj:Lokio/n;
 
-    invoke-virtual {v2}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v2}, Lokio/n;->HL()Lokio/n;
 
     :cond_6
-    iput-object v4, p0, Lokio/c$a;->byG:Lokio/n;
+    iput-object v4, p0, Lokio/c$a;->byQ: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;->byG:Lokio/n;
+    iput-object v0, p0, Lokio/c$a;->byQ: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;->ma:Lokio/c;
+    iget-object p2, p0, Lokio/c$a;->lZ: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/c$a;->lZ:Lokio/c;
 
     if-eqz v0, :cond_0
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lokio/c$a;->ma:Lokio/c;
+    iput-object v0, p0, Lokio/c$a;->lZ:Lokio/c;
 
-    iput-object v0, p0, Lokio/c$a;->byG:Lokio/n;
+    iput-object v0, p0, Lokio/c$a;->byQ: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 4c79d5b3de..5b018f60e8 100644
--- a/com.discord/smali_classes2/okio/f.smali
+++ b/com.discord/smali_classes2/okio/f.smali
@@ -7,7 +7,7 @@
 
 
 # instance fields
-.field private final byJ:Lokio/r;
+.field private final byT:Lokio/r;
 
 
 # direct methods
@@ -18,7 +18,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/f;->byJ:Lokio/r;
+    iput-object p1, p0, Lokio/f;->byT:Lokio/r;
 
     return-void
 
@@ -34,10 +34,10 @@
 
 
 # virtual methods
-.method public final Hy()Lokio/r;
+.method public final HB()Lokio/r;
     .locals 1
 
-    iget-object v0, p0, Lokio/f;->byJ:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byT:Lokio/r;
 
     return-object v0
 .end method
@@ -50,7 +50,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->byJ:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byT:Lokio/r;
 
     invoke-interface {v0, p1, p2, p3}, Lokio/r;->a(Lokio/c;J)J
 
@@ -67,7 +67,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/f;->byJ:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byT:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->close()V
 
@@ -77,7 +77,7 @@
 .method public timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/f;->byJ:Lokio/r;
+    iget-object v0, p0, Lokio/f;->byT:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->timeout()Lokio/s;
 
@@ -107,7 +107,7 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget-object v1, p0, Lokio/f;->byJ:Lokio/r;
+    iget-object v1, p0, Lokio/f;->byT: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 5505b10177..1b7bf2796c 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 byK:Lokio/s;
+.field public byU:Lokio/s;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/g;->byK:Lokio/s;
+    iput-object p1, p0, Lokio/g;->byU:Lokio/s;
 
     return-void
 
@@ -31,55 +31,67 @@
 
 
 # virtual methods
-.method public final HA()Z
-    .locals 1
-
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
-
-    invoke-virtual {v0}, Lokio/s;->HA()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final HB()J
+.method public final HC()J
     .locals 2
 
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HB()J
+    invoke-virtual {v0}, Lokio/s;->HC()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final HC()Lokio/s;
+.method public final HD()Z
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HC()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HD()Z
+
+    move-result v0
+
+    return v0
+.end method
+
+.method public final HE()J
+    .locals 2
+
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+
+    invoke-virtual {v0}, Lokio/s;->HE()J
+
+    move-result-wide v0
+
+    return-wide v0
+.end method
+
+.method public final HF()Lokio/s;
+    .locals 1
+
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
+
+    invoke-virtual {v0}, Lokio/s;->HF()Lokio/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final HD()Lokio/s;
+.method public final HG()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HD()Lokio/s;
+    invoke-virtual {v0}, Lokio/s;->HG()Lokio/s;
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final HE()V
+.method public final HH()V
     .locals 1
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -87,29 +99,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HE()V
+    invoke-virtual {v0}, Lokio/s;->HH()V
 
     return-void
 .end method
 
-.method public final Hz()J
-    .locals 2
-
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
-
-    invoke-virtual {v0}, Lokio/s;->Hz()J
-
-    move-result-wide v0
-
-    return-wide v0
-.end method
-
 .method public final aH(J)Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/g;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU:Lokio/s;
 
     invoke-virtual {v0, p1, p2}, Lokio/s;->aH(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;->byK:Lokio/s;
+    iget-object v0, p0, Lokio/g;->byU: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 802edfa501..2618c6823e 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 byL:I
+.field private byV:I
 
-.field private final byM:Lokio/i;
+.field private final byW:Lokio/i;
 
-.field private final byN:Ljava/util/zip/CRC32;
+.field private final byX:Ljava/util/zip/CRC32;
 
 .field private final inflater:Ljava/util/zip/Inflater;
 
-.field private final lZ:Lokio/d;
+.field private final lY:Lokio/d;
 
 
 # direct methods
@@ -26,13 +26,13 @@
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lokio/h;->byL:I
+    iput v0, p0, Lokio/h;->byV:I
 
     new-instance v0, Ljava/util/zip/CRC32;
 
     invoke-direct {v0}, Ljava/util/zip/CRC32;-><init>()V
 
-    iput-object v0, p0, Lokio/h;->byN:Ljava/util/zip/CRC32;
+    iput-object v0, p0, Lokio/h;->byX:Ljava/util/zip/CRC32;
 
     if-eqz p1, :cond_0
 
@@ -48,17 +48,17 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lokio/h;->lZ:Lokio/d;
+    iput-object p1, p0, Lokio/h;->lY:Lokio/d;
 
     new-instance p1, Lokio/i;
 
-    iget-object v0, p0, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, p0, Lokio/h;->lY: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;->byM:Lokio/i;
+    iput-object p1, p0, Lokio/h;->byW:Lokio/i;
 
     return-void
 
@@ -75,7 +75,7 @@
 .method private b(Lokio/c;JJ)V
     .locals 4
 
-    iget-object p1, p1, Lokio/c;->byD:Lokio/n;
+    iget-object p1, p1, Lokio/c;->byN: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;->byY:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_0
 
@@ -132,7 +132,7 @@
 
     long-to-int p3, v2
 
-    iget-object v2, p0, Lokio/h;->byN:Ljava/util/zip/CRC32;
+    iget-object v2, p0, Lokio/h;->byX:Ljava/util/zip/CRC32;
 
     iget-object v3, p1, Lokio/n;->data:[B
 
@@ -142,7 +142,7 @@
 
     sub-long/2addr p4, p2
 
-    iget-object p1, p1, Lokio/n;->byY:Lokio/n;
+    iget-object p1, p1, Lokio/n;->bzi:Lokio/n;
 
     move-wide p2, v0
 
@@ -231,7 +231,7 @@
     return-wide v0
 
     :cond_0
-    iget v0, v6, Lokio/h;->byL:I
+    iget v0, v6, Lokio/h;->byV:I
 
     const-wide/16 v10, -0x1
 
@@ -239,15 +239,15 @@
 
     if-nez v0, :cond_d
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
     const-wide/16 v1, 0xa
 
     invoke-interface {v0, v1, v2}, Lokio/d;->au(J)V
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
 
     move-result-object v0
 
@@ -275,9 +275,9 @@
     :goto_0
     if-eqz v14, :cond_2
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()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;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY: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;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
     const-wide/16 v1, 0x8
 
@@ -314,7 +314,7 @@
 
     if-ne v0, v12, :cond_5
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
     const-wide/16 v1, 0x2
 
@@ -322,9 +322,9 @@
 
     if-eqz v14, :cond_3
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()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;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/c;->Hi()S
+    invoke-virtual {v0}, Lokio/c;->Hl()S
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v1, v6, Lokio/h;->lY:Lokio/d;
 
     int-to-long v4, v0
 
@@ -355,9 +355,9 @@
 
     if-eqz v14, :cond_4
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
 
     move-result-object v1
 
@@ -375,7 +375,7 @@
     move-wide v15, v4
 
     :goto_1
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
     move-wide v1, v15
 
@@ -390,9 +390,9 @@
 
     if-ne v0, v12, :cond_8
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hn()J
+    invoke-interface {v0}, Lokio/d;->Hq()J
 
     move-result-wide v17
 
@@ -402,9 +402,9 @@
 
     if-eqz v14, :cond_6
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()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;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -440,9 +440,9 @@
 
     if-ne v0, v12, :cond_b
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hn()J
+    invoke-interface {v0}, Lokio/d;->Hq()J
 
     move-result-wide v17
 
@@ -452,9 +452,9 @@
 
     if-eqz v14, :cond_9
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()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;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
     add-long v1, v17, v15
 
@@ -486,13 +486,13 @@
     :goto_3
     if-eqz v14, :cond_c
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hi()S
+    invoke-interface {v0}, Lokio/d;->Hl()S
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->byN:Ljava/util/zip/CRC32;
+    iget-object v1, v6, Lokio/h;->byX:Ljava/util/zip/CRC32;
 
     invoke-virtual {v1}, Ljava/util/zip/CRC32;->getValue()J
 
@@ -506,15 +506,15 @@
 
     invoke-static {v2, v0, v1}, Lokio/h;->q(Ljava/lang/String;II)V
 
-    iget-object v0, v6, Lokio/h;->byN:Ljava/util/zip/CRC32;
+    iget-object v0, v6, Lokio/h;->byX:Ljava/util/zip/CRC32;
 
     invoke-virtual {v0}, Ljava/util/zip/CRC32;->reset()V
 
     :cond_c
-    iput v12, v6, Lokio/h;->byL:I
+    iput v12, v6, Lokio/h;->byV:I
 
     :cond_d
-    iget v0, v6, Lokio/h;->byL:I
+    iget v0, v6, Lokio/h;->byV:I
 
     const/4 v1, 0x2
 
@@ -522,7 +522,7 @@
 
     iget-wide v2, v7, Lokio/c;->size:J
 
-    iget-object v0, v6, Lokio/h;->byM:Lokio/i;
+    iget-object v0, v6, Lokio/h;->byW:Lokio/i;
 
     invoke-virtual {v0, v7, v8, v9}, Lokio/i;->a(Lokio/c;J)J
 
@@ -543,20 +543,20 @@
     return-wide v8
 
     :cond_e
-    iput v1, v6, Lokio/h;->byL:I
+    iput v1, v6, Lokio/h;->byV:I
 
     :cond_f
-    iget v0, v6, Lokio/h;->byL:I
+    iget v0, v6, Lokio/h;->byV:I
 
     if-ne v0, v1, :cond_11
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hj()I
+    invoke-interface {v0}, Lokio/d;->Hm()I
 
     move-result v0
 
-    iget-object v1, v6, Lokio/h;->byN:Ljava/util/zip/CRC32;
+    iget-object v1, v6, Lokio/h;->byX:Ljava/util/zip/CRC32;
 
     invoke-virtual {v1}, Ljava/util/zip/CRC32;->getValue()J
 
@@ -568,9 +568,9 @@
 
     invoke-static {v1, v0, v2}, Lokio/h;->q(Ljava/lang/String;II)V
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hj()I
+    invoke-interface {v0}, Lokio/d;->Hm()I
 
     move-result v0
 
@@ -588,11 +588,11 @@
 
     const/4 v0, 0x3
 
-    iput v0, v6, Lokio/h;->byL:I
+    iput v0, v6, Lokio/h;->byV:I
 
-    iget-object v0, v6, Lokio/h;->lZ:Lokio/d;
+    iget-object v0, v6, Lokio/h;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Z
+    invoke-interface {v0}, Lokio/d;->Hi()Z
 
     move-result v0
 
@@ -639,7 +639,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/h;->byM:Lokio/i;
+    iget-object v0, p0, Lokio/h;->byW: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokio/h;->lY: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 e3446225a2..ea91463df3 100644
--- a/com.discord/smali_classes2/okio/i.smali
+++ b/com.discord/smali_classes2/okio/i.smali
@@ -7,11 +7,11 @@
 
 
 # instance fields
-.field private byO:I
+.field private byY:I
 
 .field private final inflater:Ljava/util/zip/Inflater;
 
-.field private final lZ:Lokio/d;
+.field private final lY:Lokio/d;
 
 .field private w:Z
 
@@ -26,7 +26,7 @@
 
     if-eqz p2, :cond_0
 
-    iput-object p1, p0, Lokio/i;->lZ:Lokio/d;
+    iput-object p1, p0, Lokio/i;->lY:Lokio/d;
 
     iput-object p2, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -51,7 +51,7 @@
     throw p1
 .end method
 
-.method private HF()V
+.method private HI()V
     .locals 4
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -59,7 +59,7 @@
         }
     .end annotation
 
-    iget v0, p0, Lokio/i;->byO:I
+    iget v0, p0, Lokio/i;->byY:I
 
     if-nez v0, :cond_0
 
@@ -74,13 +74,13 @@
 
     sub-int/2addr v0, v1
 
-    iget v1, p0, Lokio/i;->byO:I
+    iget v1, p0, Lokio/i;->byY:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lokio/i;->byO:I
+    iput v1, p0, Lokio/i;->byY:I
 
-    iget-object v1, p0, Lokio/i;->lZ:Lokio/d;
+    iget-object v1, p0, Lokio/i;->lY:Lokio/d;
 
     int-to-long v2, v0
 
@@ -132,7 +132,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lokio/i;->HF()V
+    invoke-direct {p0}, Lokio/i;->HI()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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hf()Z
+    invoke-interface {v0}, Lokio/d;->Hi()Z
 
     move-result v0
 
@@ -155,13 +155,13 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lokio/i;->lZ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lY:Lokio/d;
 
-    invoke-interface {v0}, Lokio/d;->Hc()Lokio/c;
+    invoke-interface {v0}, Lokio/d;->Hf()Lokio/c;
 
     move-result-object v0
 
-    iget-object v0, v0, Lokio/c;->byD:Lokio/n;
+    iget-object v0, v0, Lokio/c;->byN:Lokio/n;
 
     iget v3, v0, Lokio/n;->limit:I
 
@@ -169,7 +169,7 @@
 
     sub-int/2addr v3, v4
 
-    iput v3, p0, Lokio/i;->byO:I
+    iput v3, p0, Lokio/i;->byY:I
 
     iget-object v3, p0, Lokio/i;->inflater:Ljava/util/zip/Inflater;
 
@@ -177,7 +177,7 @@
 
     iget v0, v0, Lokio/n;->pos:I
 
-    iget v5, p0, Lokio/i;->byO:I
+    iget v5, p0, Lokio/i;->byY:I
 
     invoke-virtual {v3, v4, v0, v5}, Ljava/util/zip/Inflater;->setInput([BII)V
 
@@ -262,7 +262,7 @@
 
     :cond_6
     :goto_2
-    invoke-direct {p0}, Lokio/i;->HF()V
+    invoke-direct {p0}, Lokio/i;->HI()V
 
     iget p2, v0, Lokio/n;->pos:I
 
@@ -270,11 +270,11 @@
 
     if-ne p2, p3, :cond_7
 
-    invoke-virtual {v0}, Lokio/n;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object p2
 
-    iput-object p2, p1, Lokio/c;->byD:Lokio/n;
+    iput-object p2, p1, Lokio/c;->byN:Lokio/n;
 
     invoke-static {v0}, Lokio/o;->b(Lokio/n;)V
     :try_end_0
@@ -359,7 +359,7 @@
 
     iput-boolean v0, p0, Lokio/i;->w:Z
 
-    iget-object v0, p0, Lokio/i;->lZ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lY: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;->lZ:Lokio/d;
+    iget-object v0, p0, Lokio/i;->lY: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 989e4b4e02..6ed581552d 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 byP:Lokio/s;
+.field final synthetic byZ:Lokio/s;
 
-.field final synthetic byQ:Ljava/io/OutputStream;
+.field final synthetic bza:Ljava/io/OutputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/s;Ljava/io/OutputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$1;->byP:Lokio/s;
+    iput-object p1, p0, Lokio/j$1;->byZ:Lokio/s;
 
-    iput-object p2, p0, Lokio/j$1;->byQ:Ljava/io/OutputStream;
+    iput-object p2, p0, Lokio/j$1;->bza:Ljava/io/OutputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -46,7 +46,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->byQ:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->bza:Ljava/io/OutputStream;
 
     invoke-virtual {v0}, Ljava/io/OutputStream;->close()V
 
@@ -61,7 +61,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$1;->byQ:Ljava/io/OutputStream;
+    iget-object v0, p0, Lokio/j$1;->bza: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;->byP:Lokio/s;
+    iget-object v0, p0, Lokio/j$1;->byZ: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;->byQ:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->bza: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;->byP:Lokio/s;
+    iget-object v0, p0, Lokio/j$1;->byZ:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HE()V
+    invoke-virtual {v0}, Lokio/s;->HH()V
 
-    iget-object v0, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byN: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;->byQ:Ljava/io/OutputStream;
+    iget-object v1, p0, Lokio/j$1;->bza: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;->HI()Lokio/n;
+    invoke-virtual {v0}, Lokio/n;->HL()Lokio/n;
 
     move-result-object v1
 
-    iput-object v1, p1, Lokio/c;->byD:Lokio/n;
+    iput-object v1, p1, Lokio/c;->byN: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 431cae124d..ecb0d7c74e 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 byP:Lokio/s;
+.field final synthetic byZ:Lokio/s;
 
-.field final synthetic byR:Ljava/io/InputStream;
+.field final synthetic bzb:Ljava/io/InputStream;
 
 
 # direct methods
 .method constructor <init>(Lokio/s;Ljava/io/InputStream;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/j$2;->byP:Lokio/s;
+    iput-object p1, p0, Lokio/j$2;->byZ:Lokio/s;
 
-    iput-object p2, p0, Lokio/j$2;->byR:Ljava/io/InputStream;
+    iput-object p2, p0, Lokio/j$2;->bzb:Ljava/io/InputStream;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -60,9 +60,9 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lokio/j$2;->byP:Lokio/s;
+    iget-object v0, p0, Lokio/j$2;->byZ:Lokio/s;
 
-    invoke-virtual {v0}, Lokio/s;->HE()V
+    invoke-virtual {v0}, Lokio/s;->HH()V
 
     const/4 v0, 0x1
 
@@ -82,7 +82,7 @@
 
     long-to-int p3, p2
 
-    iget-object p2, p0, Lokio/j$2;->byR:Ljava/io/InputStream;
+    iget-object p2, p0, Lokio/j$2;->bzb:Ljava/io/InputStream;
 
     iget-object v1, v0, Lokio/n;->data:[B
 
@@ -163,7 +163,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/j$2;->byR:Ljava/io/InputStream;
+    iget-object v0, p0, Lokio/j$2;->bzb: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;->byP:Lokio/s;
+    iget-object v0, p0, Lokio/j$2;->byZ: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;->byR:Ljava/io/InputStream;
+    iget-object v1, p0, Lokio/j$2;->bzb: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 50e786187a..33fe6b48ec 100644
--- a/com.discord/smali_classes2/okio/j.smali
+++ b/com.discord/smali_classes2/okio/j.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field static final HQ:Ljava/util/logging/Logger;
+.field static final HZ:Ljava/util/logging/Logger;
 
 
 # direct methods
@@ -21,7 +21,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/j;->HQ:Ljava/util/logging/Logger;
+    sput-object v0, Lokio/j;->HZ:Ljava/util/logging/Logger;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/okio/k.smali b/com.discord/smali_classes2/okio/k.smali
index 2f4764178f..9e9f7cf3d7 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 byT:[Lokio/ByteString;
+.field final bzd:[Lokio/ByteString;
 
-.field final byU:[I
+.field final bze:[I
 
 
 # direct methods
@@ -29,9 +29,9 @@
 
     invoke-direct {p0}, Ljava/util/AbstractList;-><init>()V
 
-    iput-object p1, p0, Lokio/k;->byT:[Lokio/ByteString;
+    iput-object p1, p0, Lokio/k;->bzd:[Lokio/ByteString;
 
-    iput-object p2, p0, Lokio/k;->byU:[I
+    iput-object p2, p0, Lokio/k;->bze:[I
 
     return-void
 .end method
@@ -278,7 +278,7 @@
     goto :goto_4
 
     :cond_7
-    invoke-virtual {v0}, Lokio/c;->Hf()Z
+    invoke-virtual {v0}, Lokio/c;->Hi()Z
 
     move-result v0
 
@@ -868,7 +868,7 @@
 .method public final bridge synthetic get(I)Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->byT:[Lokio/ByteString;
+    iget-object v0, p0, Lokio/k;->bzd:[Lokio/ByteString;
 
     aget-object p1, v0, p1
 
@@ -878,7 +878,7 @@
 .method public final size()I
     .locals 1
 
-    iget-object v0, p0, Lokio/k;->byT:[Lokio/ByteString;
+    iget-object v0, p0, Lokio/k;->bzd:[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 05dfc81b99..14ce022b12 100644
--- a/com.discord/smali_classes2/okio/l.smali
+++ b/com.discord/smali_classes2/okio/l.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field public final byV:Lokio/q;
+.field public final bzf:Lokio/q;
 
-.field public final ma:Lokio/c;
+.field public final lZ:Lokio/c;
 
 .field w:Z
 
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iput-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/l;->byV:Lokio/q;
+    iput-object p1, p0, Lokio/l;->bzf:Lokio/q;
 
     return-void
 
@@ -56,11 +56,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->D([B)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -76,15 +76,15 @@
     throw p1
 .end method
 
-.method public final Hc()Lokio/c;
+.method public final Hf()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final He()Lokio/BufferedSink;
+.method public final Hh()Lokio/BufferedSink;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -96,7 +96,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -106,9 +106,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/l;->byV:Lokio/q;
+    iget-object v2, p0, Lokio/l;->bzf:Lokio/q;
 
-    iget-object v3, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-interface {v2, v3, v0, v1}, Lokio/q;->write(Lokio/c;J)V
 
@@ -125,7 +125,7 @@
     throw v0
 .end method
 
-.method public final Hp()Lokio/BufferedSink;
+.method public final Hs()Lokio/BufferedSink;
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -137,9 +137,9 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hh()J
+    invoke-virtual {v0}, Lokio/c;->Hk()J
 
     move-result-wide v0
 
@@ -149,9 +149,9 @@
 
     if-lez v4, :cond_0
 
-    iget-object v2, p0, Lokio/l;->byV:Lokio/q;
+    iget-object v2, p0, Lokio/l;->bzf:Lokio/q;
 
-    iget-object v3, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/l;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/l;->lZ:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -197,7 +197,7 @@
 
     add-long/2addr v0, v2
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     goto :goto_0
 
@@ -232,11 +232,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aD(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -264,11 +264,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aC(J)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -302,7 +302,7 @@
     const/4 v0, 0x0
 
     :try_start_0
-    iget-object v1, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/l;->lZ: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;->byV:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bzf:Lokio/q;
 
-    iget-object v2, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/l;->lZ:Lokio/c;
 
-    iget-object v3, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/l;->lZ: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;->byV:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bzf:Lokio/q;
 
     invoke-interface {v1}, Lokio/q;->close()V
     :try_end_1
@@ -373,11 +373,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->du(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -405,11 +405,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->dw(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -437,11 +437,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->dv(I)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -469,11 +469,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->ei(Ljava/lang/String;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -501,7 +501,7 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ: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;->byV:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bzf:Lokio/q;
 
-    iget-object v1, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/l;->lZ: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;->byV:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bzf:Lokio/q;
 
     invoke-interface {v0}, Lokio/q;->flush()V
 
@@ -565,11 +565,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->k([BII)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -597,11 +597,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->i(Lokio/ByteString;)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -629,11 +629,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->o(Ljava/lang/String;II)Lokio/c;
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     move-result-object p1
 
@@ -652,7 +652,7 @@
 .method public final timeout()Lokio/s;
     .locals 1
 
-    iget-object v0, p0, Lokio/l;->byV:Lokio/q;
+    iget-object v0, p0, Lokio/l;->bzf: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;->byV:Lokio/q;
+    iget-object v1, p0, Lokio/l;->bzf: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->write(Ljava/nio/ByteBuffer;)I
 
     move-result p1
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()Lokio/BufferedSink;
 
     return p1
 
@@ -729,11 +729,11 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/l;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/l;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2, p3}, Lokio/c;->write(Lokio/c;J)V
 
-    invoke-virtual {p0}, Lokio/l;->Hp()Lokio/BufferedSink;
+    invoke-virtual {p0}, Lokio/l;->Hs()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 0fdaed9915..6126c08a14 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;->Hg()Ljava/io/InputStream;
+    value = Lokio/m;->Hj()Ljava/io/InputStream;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic byX:Lokio/m;
+.field final synthetic bzh:Lokio/m;
 
 
 # direct methods
 .method constructor <init>(Lokio/m;)V
     .locals 0
 
-    iput-object p1, p0, Lokio/m$1;->byX:Lokio/m;
+    iput-object p1, p0, Lokio/m$1;->bzh:Lokio/m;
 
     invoke-direct {p0}, Ljava/io/InputStream;-><init>()V
 
@@ -39,15 +39,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->w:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
     invoke-virtual {v0}, Lokio/m;->close()V
 
@@ -94,15 +94,15 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->w:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, v0, Lokio/m;->lZ: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;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->byW:Lokio/r;
+    iget-object v0, v0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v1, v1, Lokio/m;->ma:Lokio/c;
+    iget-object v1, v1, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -137,9 +137,9 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, v0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readByte()B
 
@@ -167,7 +167,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
     iget-boolean v0, v0, Lokio/m;->w:Z
 
@@ -183,9 +183,9 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, v0, Lokio/m;->lZ: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;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->byW:Lokio/r;
+    iget-object v0, v0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v1, v1, Lokio/m;->ma:Lokio/c;
+    iget-object v1, v1, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -220,9 +220,9 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/m$1;->byX:Lokio/m;
+    iget-object v0, p0, Lokio/m$1;->bzh:Lokio/m;
 
-    iget-object v0, v0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, v0, Lokio/m;->lZ: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;->byX:Lokio/m;
+    iget-object v1, p0, Lokio/m$1;->bzh: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 440a7eafd7..7f21ea6a02 100644
--- a/com.discord/smali_classes2/okio/m.smali
+++ b/com.discord/smali_classes2/okio/m.smali
@@ -7,9 +7,9 @@
 
 
 # instance fields
-.field public final byW:Lokio/r;
+.field public final bzg:Lokio/r;
 
-.field public final ma:Lokio/c;
+.field public final lZ:Lokio/c;
 
 .field w:Z
 
@@ -24,11 +24,11 @@
 
     invoke-direct {v0}, Lokio/c;-><init>()V
 
-    iput-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iput-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     if-eqz p1, :cond_0
 
-    iput-object p1, p0, Lokio/m;->byW:Lokio/r;
+    iput-object p1, p0, Lokio/m;->bzg:Lokio/r;
 
     return-void
 
@@ -67,7 +67,7 @@
 
     if-gez v2, :cond_2
 
-    iget-object v3, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/m;->lZ:Lokio/c;
 
     move v4, p1
 
@@ -86,7 +86,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ: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;->byW:Lokio/r;
+    iget-object v4, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v5, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v5, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -172,23 +172,23 @@
 
 
 # virtual methods
-.method public final Hc()Lokio/c;
+.method public final Hf()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Hd()Lokio/c;
+.method public final Hg()Lokio/c;
     .locals 1
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     return-object v0
 .end method
 
-.method public final Hf()Z
+.method public final Hi()Z
     .locals 5
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -200,17 +200,17 @@
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hf()Z
+    invoke-virtual {v0}, Lokio/c;->Hi()Z
 
     move-result v0
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -243,7 +243,7 @@
     throw v0
 .end method
 
-.method public final Hg()Ljava/io/InputStream;
+.method public final Hj()Ljava/io/InputStream;
     .locals 1
 
     new-instance v0, Lokio/m$1;
@@ -253,7 +253,7 @@
     return-object v0
 .end method
 
-.method public final Hi()S
+.method public final Hl()S
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -265,7 +265,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readShort()S
 
@@ -278,7 +278,7 @@
     return v0
 .end method
 
-.method public final Hj()I
+.method public final Hm()I
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -290,7 +290,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
@@ -303,7 +303,7 @@
     return v0
 .end method
 
-.method public final Hk()J
+.method public final Hn()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -330,7 +330,7 @@
 
     if-eqz v3, :cond_5
 
-    iget-object v3, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/m;->lZ:Lokio/c;
 
     int-to-long v4, v1
 
@@ -402,16 +402,16 @@
 
     :cond_5
     :goto_2
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
-    invoke-virtual {v0}, Lokio/c;->Hk()J
+    invoke-virtual {v0}, Lokio/c;->Hn()J
 
     move-result-wide v0
 
     return-wide v0
 .end method
 
-.method public final Hm()Ljava/lang/String;
+.method public final Hp()Ljava/lang/String;
     .locals 2
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -428,7 +428,7 @@
     return-object v0
 .end method
 
-.method public final Hn()J
+.method public final Hq()J
     .locals 6
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -464,7 +464,7 @@
     if-nez v0, :cond_3
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     const/4 v1, 0x1
 
@@ -483,9 +483,9 @@
 
     if-ne v0, v2, :cond_2
 
-    iget-object v0, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v3, 0x2000
 
@@ -502,7 +502,7 @@
     return v1
 
     :cond_2
-    iget-object p1, p1, Lokio/k;->byT:[Lokio/ByteString;
+    iget-object p1, p1, Lokio/k;->bzd:[Lokio/ByteString;
 
     aget-object p1, p1, v0
 
@@ -510,7 +510,7 @@
 
     move-result p1
 
-    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
 
     int-to-long v2, p1
 
@@ -554,7 +554,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ: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;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -581,7 +581,7 @@
     return-wide v2
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -589,7 +589,7 @@
 
     move-result-wide p2
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->byW:Lokio/r;
+    iget-object v4, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v5, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v5, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v6, 0x2000
 
@@ -665,9 +665,9 @@
 
     if-eqz v8, :cond_1
 
-    iget-object v4, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v4, p0, Lokio/m;->lZ:Lokio/c;
 
-    invoke-virtual {v4}, Lokio/c;->Hh()J
+    invoke-virtual {v4}, Lokio/c;->Hk()J
 
     move-result-wide v4
 
@@ -677,14 +677,14 @@
 
     add-long/2addr v2, v4
 
-    iget-object v6, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v6, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v4, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
     add-long/2addr v2, v0
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v4, v0, Lokio/c;->size:J
 
@@ -733,7 +733,7 @@
 
     invoke-virtual {p0, p1, p2}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aA(J)[B
 
@@ -761,7 +761,7 @@
 
     if-lez v2, :cond_2
 
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -769,9 +769,9 @@
 
     if-nez v4, :cond_1
 
-    iget-object v0, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -796,7 +796,7 @@
 
     :cond_1
     :goto_1
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v0, v0, Lokio/c;->size:J
 
@@ -804,7 +804,7 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v2, v0, v1}, Lokio/c;->aB(J)V
 
@@ -865,7 +865,7 @@
 
     invoke-virtual {p0, p1, p2}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1, p2}, Lokio/c;->aw(J)Lokio/ByteString;
 
@@ -922,7 +922,7 @@
 
     if-eqz v10, :cond_1
 
-    iget-object p1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object p1, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {p1, v6, v7}, Lokio/c;->az(J)Ljava/lang/String;
 
@@ -941,7 +941,7 @@
 
     if-eqz v2, :cond_2
 
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     sub-long v6, v4, v0
 
@@ -961,7 +961,7 @@
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0, v4, v5}, Lokio/c;->av(J)B
 
@@ -971,7 +971,7 @@
 
     if-ne v0, v1, :cond_2
 
-    iget-object p1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object p1, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {p1, v4, v5}, Lokio/c;->az(J)Ljava/lang/String;
 
@@ -984,7 +984,7 @@
 
     invoke-direct {v6}, Lokio/c;-><init>()V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x0
 
@@ -1008,7 +1008,7 @@
 
     invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
@@ -1022,11 +1022,11 @@
 
     invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-virtual {v6}, Lokio/c;->Gp()Lokio/ByteString;
+    invoke-virtual {v6}, Lokio/c;->Gs()Lokio/ByteString;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lokio/ByteString;->Hu()Ljava/lang/String;
+    invoke-virtual {p1}, Lokio/ByteString;->Hx()Ljava/lang/String;
 
     move-result-object p1
 
@@ -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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object p3, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
-    iget-object v1, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v1, p0, Lokio/m;->bzg:Lokio/r;
 
     invoke-virtual {v0, v1}, Lokio/c;->a(Lokio/r;)J
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->w:Z
 
-    iget-object v0, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
     invoke-interface {v0}, Lokio/r;->close()V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v6, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v6, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v7, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v7, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v8, 0x2000
 
@@ -1272,7 +1272,7 @@
     const-wide/16 v0, 0x0
 
     :goto_0
-    iget-object v2, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v2, v2, Lokio/c;->size:J
 
-    iget-object v6, p0, Lokio/m;->byW:Lokio/r;
+    iget-object v6, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v7, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v7, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v8, 0x2000
 
@@ -1385,7 +1385,7 @@
     return v1
 
     :cond_1
-    iget-object v3, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v3, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v3, v5, v6}, Lokio/c;->av(J)B
 
@@ -1439,7 +1439,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/m;->lZ:Lokio/c;
 
     const-wide/16 v2, 0x2000
 
@@ -1470,7 +1470,7 @@
     return p1
 
     :cond_0
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0, p1}, Lokio/c;->read(Ljava/nio/ByteBuffer;)I
 
@@ -1491,7 +1491,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v2, p0, Lokio/m;->lZ:Lokio/c;
 
     iget-wide v3, v2, Lokio/c;->size:J
 
@@ -1586,7 +1586,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readInt()I
 
@@ -1607,7 +1607,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ:Lokio/c;
 
     invoke-virtual {v0}, Lokio/c;->readLong()J
 
@@ -1628,7 +1628,7 @@
 
     invoke-virtual {p0, v0, v1}, Lokio/m;->au(J)V
 
-    iget-object v0, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->ma:Lokio/c;
+    iget-object v0, p0, Lokio/m;->lZ: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;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg:Lokio/r;
 
-    iget-object v1, p0, Lokio/m;->ma:Lokio/c;
+    iget-object v1, p0, Lokio/m;->lZ: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;->byW:Lokio/r;
+    iget-object v0, p0, Lokio/m;->bzg: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;->byW:Lokio/r;
+    iget-object v1, p0, Lokio/m;->bzg: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 ba63753528..fe30923e8f 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 bzb:[[B
+.field final transient bzl:[[B
 
-.field final transient bzc:[I
+.field final transient bzm:[I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-static/range {v1 .. v6}, Lokio/t;->a(JJJ)V
 
-    iget-object v0, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v0, p1, Lokio/c;->byN:Lokio/n;
 
     const/4 v1, 0x0
 
@@ -54,7 +54,7 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v3, v3, Lokio/n;->byY:Lokio/n;
+    iget-object v3, v3, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_0
 
@@ -70,15 +70,15 @@
     :cond_1
     new-array v0, v2, [[B
 
-    iput-object v0, p0, Lokio/p;->bzb:[[B
+    iput-object v0, p0, Lokio/p;->bzl:[[B
 
     mul-int/lit8 v2, v2, 0x2
 
     new-array v0, v2, [I
 
-    iput-object v0, p0, Lokio/p;->bzc:[I
+    iput-object v0, p0, Lokio/p;->bzm:[I
 
-    iget-object p1, p1, Lokio/c;->byD:Lokio/n;
+    iget-object p1, p1, Lokio/c;->byN:Lokio/n;
 
     move-object v0, p1
 
@@ -87,7 +87,7 @@
     :goto_1
     if-ge v1, p2, :cond_3
 
-    iget-object v2, p0, Lokio/p;->bzb:[[B
+    iget-object v2, p0, Lokio/p;->bzl:[[B
 
     iget-object v3, v0, Lokio/n;->data:[B
 
@@ -106,11 +106,11 @@
     move v1, p2
 
     :cond_2
-    iget-object v2, p0, Lokio/p;->bzc:[I
+    iget-object v2, p0, Lokio/p;->bzm:[I
 
     aput v1, v2, p1
 
-    iget-object v3, p0, Lokio/p;->bzb:[[B
+    iget-object v3, p0, Lokio/p;->bzl:[[B
 
     array-length v3, v3
 
@@ -122,11 +122,11 @@
 
     const/4 v2, 0x1
 
-    iput-boolean v2, v0, Lokio/n;->bkc:Z
+    iput-boolean v2, v0, Lokio/n;->bkm:Z
 
     add-int/lit8 p1, p1, 0x1
 
-    iget-object v0, v0, Lokio/n;->byY:Lokio/n;
+    iget-object v0, v0, Lokio/n;->bzi:Lokio/n;
 
     goto :goto_1
 
@@ -134,12 +134,12 @@
     return-void
 .end method
 
-.method private HK()Lokio/ByteString;
+.method private HN()Lokio/ByteString;
     .locals 2
 
     new-instance v0, Lokio/ByteString;
 
-    invoke-virtual {p0}, Lokio/p;->Hw()[B
+    invoke-virtual {p0}, Lokio/p;->Hz()[B
 
     move-result-object v1
 
@@ -151,9 +151,9 @@
 .method private dC(I)I
     .locals 3
 
-    iget-object v0, p0, Lokio/p;->bzc:[I
+    iget-object v0, p0, Lokio/p;->bzm:[I
 
-    iget-object v1, p0, Lokio/p;->bzb:[[B
+    iget-object v1, p0, Lokio/p;->bzl:[[B
 
     array-length v1, v1
 
@@ -178,7 +178,7 @@
 .method private writeReplace()Ljava/lang/Object;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
 
     move-result-object v0
 
@@ -187,56 +187,24 @@
 
 
 # virtual methods
-.method public final Hq()Ljava/lang/String;
+.method final HA()[B
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lokio/ByteString;->Hq()Ljava/lang/String;
+    invoke-virtual {p0}, Lokio/p;->Hz()[B
 
     move-result-object v0
 
     return-object v0
 .end method
 
-.method public final Hr()Ljava/lang/String;
+.method public final Ht()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lokio/ByteString;->Hr()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final Hs()Lokio/ByteString;
-    .locals 1
-
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lokio/ByteString;->Hs()Lokio/ByteString;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public final Ht()Lokio/ByteString;
-    .locals 1
-
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lokio/ByteString;->Ht()Lokio/ByteString;
+    invoke-virtual {v0}, Lokio/ByteString;->Ht()Ljava/lang/String;
 
     move-result-object v0
 
@@ -246,7 +214,7 @@
 .method public final Hu()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
 
     move-result-object v0
 
@@ -260,7 +228,7 @@
 .method public final Hv()Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
 
     move-result-object v0
 
@@ -271,12 +239,54 @@
     return-object v0
 .end method
 
-.method public final Hw()[B
+.method public final Hw()Lokio/ByteString;
+    .locals 1
+
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lokio/ByteString;->Hw()Lokio/ByteString;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Hx()Ljava/lang/String;
+    .locals 1
+
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lokio/ByteString;->Hx()Ljava/lang/String;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Hy()Lokio/ByteString;
+    .locals 1
+
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lokio/ByteString;->Hy()Lokio/ByteString;
+
+    move-result-object v0
+
+    return-object v0
+.end method
+
+.method public final Hz()[B
     .locals 8
 
-    iget-object v0, p0, Lokio/p;->bzc:[I
+    iget-object v0, p0, Lokio/p;->bzm:[I
 
-    iget-object v1, p0, Lokio/p;->bzb:[[B
+    iget-object v1, p0, Lokio/p;->bzl:[[B
 
     array-length v2, v1
 
@@ -295,7 +305,7 @@
     :goto_0
     if-ge v2, v1, :cond_0
 
-    iget-object v4, p0, Lokio/p;->bzc:[I
+    iget-object v4, p0, Lokio/p;->bzm:[I
 
     add-int v5, v1, v2
 
@@ -303,7 +313,7 @@
 
     aget v4, v4, v2
 
-    iget-object v6, p0, Lokio/p;->bzb:[[B
+    iget-object v6, p0, Lokio/p;->bzl:[[B
 
     aget-object v6, v6, v2
 
@@ -321,20 +331,10 @@
     return-object v0
 .end method
 
-.method final Hx()[B
-    .locals 1
-
-    invoke-virtual {p0}, Lokio/p;->Hw()[B
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
 .method public final T(II)Lokio/ByteString;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
 
     move-result-object v0
 
@@ -375,14 +375,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/p;->bzc:[I
+    iget-object v2, p0, Lokio/p;->bzm:[I
 
     add-int/lit8 v3, v0, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/p;->bzc:[I
+    iget-object v3, p0, Lokio/p;->bzm:[I
 
     aget v3, v3, v0
 
@@ -396,9 +396,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/p;->bzc:[I
+    iget-object v4, p0, Lokio/p;->bzm:[I
 
-    iget-object v5, p0, Lokio/p;->bzb:[[B
+    iget-object v5, p0, Lokio/p;->bzl:[[B
 
     array-length v6, v5
 
@@ -445,7 +445,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lokio/p;->bzb:[[B
+    iget-object v0, p0, Lokio/p;->bzl:[[B
 
     array-length v0, v0
 
@@ -456,7 +456,7 @@
     :goto_0
     if-ge v1, v0, :cond_0
 
-    iget-object v3, p0, Lokio/p;->bzc:[I
+    iget-object v3, p0, Lokio/p;->bzm:[I
 
     add-int v4, v0, v1
 
@@ -464,7 +464,7 @@
 
     aget v3, v3, v1
 
-    iget-object v5, p0, Lokio/p;->bzb:[[B
+    iget-object v5, p0, Lokio/p;->bzl:[[B
 
     aget-object v5, v5, v1
 
@@ -485,7 +485,7 @@
 .method final b(Lokio/c;)V
     .locals 11
 
-    iget-object v0, p0, Lokio/p;->bzb:[[B
+    iget-object v0, p0, Lokio/p;->bzl:[[B
 
     array-length v0, v0
 
@@ -496,7 +496,7 @@
     :goto_0
     if-ge v1, v0, :cond_1
 
-    iget-object v3, p0, Lokio/p;->bzc:[I
+    iget-object v3, p0, Lokio/p;->bzm:[I
 
     add-int v4, v0, v1
 
@@ -506,7 +506,7 @@
 
     new-instance v4, Lokio/n;
 
-    iget-object v5, p0, Lokio/p;->bzb:[[B
+    iget-object v5, p0, Lokio/p;->bzl:[[B
 
     aget-object v6, v5, v1
 
@@ -522,22 +522,22 @@
 
     invoke-direct/range {v5 .. v10}, Lokio/n;-><init>([BIIZZ)V
 
-    iget-object v2, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p1, Lokio/c;->byN:Lokio/n;
 
     if-nez v2, :cond_0
 
-    iput-object v4, v4, Lokio/n;->byZ:Lokio/n;
+    iput-object v4, v4, Lokio/n;->bzj:Lokio/n;
 
-    iput-object v4, v4, Lokio/n;->byY:Lokio/n;
+    iput-object v4, v4, Lokio/n;->bzi:Lokio/n;
 
-    iput-object v4, p1, Lokio/c;->byD:Lokio/n;
+    iput-object v4, p1, Lokio/c;->byN:Lokio/n;
 
     goto :goto_1
 
     :cond_0
-    iget-object v2, p1, Lokio/c;->byD:Lokio/n;
+    iget-object v2, p1, Lokio/c;->byN:Lokio/n;
 
-    iget-object v2, v2, Lokio/n;->byZ:Lokio/n;
+    iget-object v2, v2, Lokio/n;->bzj:Lokio/n;
 
     invoke-virtual {v2, v4}, Lokio/n;->a(Lokio/n;)Lokio/n;
 
@@ -563,9 +563,9 @@
 .method public final dB(I)B
     .locals 7
 
-    iget-object v0, p0, Lokio/p;->bzc:[I
+    iget-object v0, p0, Lokio/p;->bzm:[I
 
-    iget-object v1, p0, Lokio/p;->bzb:[[B
+    iget-object v1, p0, Lokio/p;->bzl:[[B
 
     array-length v1, v1
 
@@ -592,16 +592,16 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lokio/p;->bzc:[I
+    iget-object v1, p0, Lokio/p;->bzm:[I
 
     add-int/lit8 v2, v0, -0x1
 
     aget v1, v1, v2
 
     :goto_0
-    iget-object v2, p0, Lokio/p;->bzc:[I
+    iget-object v2, p0, Lokio/p;->bzm:[I
 
-    iget-object v3, p0, Lokio/p;->bzb:[[B
+    iget-object v3, p0, Lokio/p;->bzl:[[B
 
     array-length v4, v3
 
@@ -704,14 +704,14 @@
     goto :goto_1
 
     :cond_1
-    iget-object v2, p0, Lokio/p;->bzc:[I
+    iget-object v2, p0, Lokio/p;->bzm:[I
 
     add-int/lit8 v3, v1, -0x1
 
     aget v2, v2, v3
 
     :goto_1
-    iget-object v3, p0, Lokio/p;->bzc:[I
+    iget-object v3, p0, Lokio/p;->bzm:[I
 
     aget v3, v3, v1
 
@@ -725,9 +725,9 @@
 
     move-result v3
 
-    iget-object v4, p0, Lokio/p;->bzc:[I
+    iget-object v4, p0, Lokio/p;->bzm:[I
 
-    iget-object v5, p0, Lokio/p;->bzb:[[B
+    iget-object v5, p0, Lokio/p;->bzl:[[B
 
     array-length v6, v5
 
@@ -780,7 +780,7 @@
     return v0
 
     :cond_0
-    iget-object v0, p0, Lokio/p;->bzb:[[B
+    iget-object v0, p0, Lokio/p;->bzl:[[B
 
     array-length v0, v0
 
@@ -793,11 +793,11 @@
     :goto_0
     if-ge v1, v0, :cond_2
 
-    iget-object v4, p0, Lokio/p;->bzb:[[B
+    iget-object v4, p0, Lokio/p;->bzl:[[B
 
     aget-object v4, v4, v1
 
-    iget-object v5, p0, Lokio/p;->bzc:[I
+    iget-object v5, p0, Lokio/p;->bzm:[I
 
     add-int v6, v0, v1
 
@@ -838,9 +838,9 @@
 .method public final size()I
     .locals 2
 
-    iget-object v0, p0, Lokio/p;->bzc:[I
+    iget-object v0, p0, Lokio/p;->bzm:[I
 
-    iget-object v1, p0, Lokio/p;->bzb:[[B
+    iget-object v1, p0, Lokio/p;->bzl:[[B
 
     array-length v1, v1
 
@@ -854,7 +854,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-direct {p0}, Lokio/p;->HK()Lokio/ByteString;
+    invoke-direct {p0}, Lokio/p;->HN()Lokio/ByteString;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/okio/s$1.smali b/com.discord/smali_classes2/okio/s$1.smali
index bb6f4d81af..dcb4c8a062 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 HE()V
+.method public final HH()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 b8caaa233c..0ab525153e 100644
--- a/com.discord/smali_classes2/okio/t.smali
+++ b/com.discord/smali_classes2/okio/t.smali
@@ -4,7 +4,7 @@
 
 
 # static fields
-.field public static final tx:Ljava/nio/charset/Charset;
+.field public static final tw:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -17,7 +17,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lokio/t;->tx:Ljava/nio/charset/Charset;
+    sput-object v0, Lokio/t;->tw:Ljava/nio/charset/Charset;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/org/a/a/a.smali b/com.discord/smali_classes2/org/a/a/a.smali
index ddfca5a13d..818914e642 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 bzC:I
+.field protected final bzM:I
 
-.field protected bzD:Lorg/a/a/a;
+.field protected bzN:Lorg/a/a/a;
 
 
 # direct methods
@@ -27,25 +27,25 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/a;->bzC:I
+    iput p1, p0, Lorg/a/a/a;->bzM:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/a;->bzD:Lorg/a/a/a;
+    iput-object p1, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public HL()V
+.method public HO()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bzD:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lorg/a/a/a;->HL()V
+    invoke-virtual {v0}, Lorg/a/a/a;->HO()V
 
     :cond_0
     return-void
@@ -54,7 +54,7 @@
 .method public as(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bzD:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -73,7 +73,7 @@
 .method public en(Ljava/lang/String;)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bzD:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -92,7 +92,7 @@
 .method public k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bzD:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzN:Lorg/a/a/a;
 
     if-eqz v0, :cond_0
 
@@ -105,7 +105,7 @@
 .method public v(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/a;->bzD:Lorg/a/a/a;
+    iget-object v0, p0, Lorg/a/a/a;->bzN: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 fbfc1bd134..4eb0187159 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 bDa:Lorg/a/a/aa;
+.field public static final bDk:Lorg/a/a/aa;
 
-.field public static final bDb:Lorg/a/a/aa;
+.field public static final bDl:Lorg/a/a/aa;
 
-.field public static final bDc:Lorg/a/a/aa;
+.field public static final bDm:Lorg/a/a/aa;
 
-.field public static final bDd:Lorg/a/a/aa;
+.field public static final bDn:Lorg/a/a/aa;
 
-.field public static final bDe:Lorg/a/a/aa;
+.field public static final bDo:Lorg/a/a/aa;
 
-.field public static final bDf:Lorg/a/a/aa;
+.field public static final bDp:Lorg/a/a/aa;
 
-.field public static final bDg:Lorg/a/a/aa;
+.field public static final bDq:Lorg/a/a/aa;
 
-.field public static final bDh:Lorg/a/a/aa;
+.field public static final bDr:Lorg/a/a/aa;
 
-.field public static final bDi:Lorg/a/a/aa;
+.field public static final bDs:Lorg/a/a/aa;
 
 
 # instance fields
-.field private final bDj:I
+.field private final bDt:I
 
-.field private final bDk:Ljava/lang/String;
+.field private final bDu:Ljava/lang/String;
 
-.field private final bDl:I
+.field private final bDv:I
 
-.field private final bDm:I
+.field private final bDw: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;->bDa:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDk: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;->bDb:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDl: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;->bDc:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDm: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;->bDd:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDn: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;->bDe:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDo: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;->bDf:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDp: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;->bDg:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDq: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;->bDh:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDr: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;->bDi:Lorg/a/a/aa;
+    sput-object v0, Lorg/a/a/aa;->bDs: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;->bDj:I
+    iput p1, p0, Lorg/a/a/aa;->bDt:I
 
-    iput-object p2, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iput p3, p0, Lorg/a/a/aa;->bDl:I
+    iput p3, p0, Lorg/a/a/aa;->bDv:I
 
-    iput p4, p0, Lorg/a/a/aa;->bDm:I
+    iput p4, p0, Lorg/a/a/aa;->bDw:I
 
     return-void
 .end method
 
-.method private HW()Lorg/a/a/aa;
+.method private HZ()Lorg/a/a/aa;
     .locals 3
 
-    invoke-direct {p0}, Lorg/a/a/aa;->Ib()I
+    invoke-direct {p0}, Lorg/a/a/aa;->Ie()I
 
     move-result v0
 
-    iget-object v1, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bDl:I
+    iget v2, p0, Lorg/a/a/aa;->bDv:I
 
     add-int/2addr v2, v0
 
-    iget v0, p0, Lorg/a/a/aa;->bDm:I
+    iget v0, p0, Lorg/a/a/aa;->bDw: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 Ib()I
+.method private Ie()I
     .locals 3
 
     const/4 v0, 0x1
 
     :goto_0
-    iget-object v1, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bDl:I
+    iget v2, p0, Lorg/a/a/aa;->bDv:I
 
     add-int/2addr v2, v0
 
@@ -203,7 +203,7 @@
 
     if-ne p0, v0, :cond_0
 
-    sget-object p0, Lorg/a/a/aa;->bDf:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDp:Lorg/a/a/aa;
 
     return-object p0
 
@@ -212,7 +212,7 @@
 
     if-ne p0, v0, :cond_1
 
-    sget-object p0, Lorg/a/a/aa;->bDa:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDk:Lorg/a/a/aa;
 
     return-object p0
 
@@ -221,7 +221,7 @@
 
     if-ne p0, v0, :cond_2
 
-    sget-object p0, Lorg/a/a/aa;->bDb:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDl:Lorg/a/a/aa;
 
     return-object p0
 
@@ -230,7 +230,7 @@
 
     if-ne p0, v0, :cond_3
 
-    sget-object p0, Lorg/a/a/aa;->bDd:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDn:Lorg/a/a/aa;
 
     return-object p0
 
@@ -239,7 +239,7 @@
 
     if-ne p0, v0, :cond_4
 
-    sget-object p0, Lorg/a/a/aa;->bDc:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDm:Lorg/a/a/aa;
 
     return-object p0
 
@@ -248,7 +248,7 @@
 
     if-ne p0, v0, :cond_5
 
-    sget-object p0, Lorg/a/a/aa;->bDe:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDo:Lorg/a/a/aa;
 
     return-object p0
 
@@ -257,7 +257,7 @@
 
     if-ne p0, v0, :cond_6
 
-    sget-object p0, Lorg/a/a/aa;->bDi:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDs:Lorg/a/a/aa;
 
     return-object p0
 
@@ -266,7 +266,7 @@
 
     if-ne p0, v0, :cond_7
 
-    sget-object p0, Lorg/a/a/aa;->bDg:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDq:Lorg/a/a/aa;
 
     return-object p0
 
@@ -275,7 +275,7 @@
 
     if-ne p0, v0, :cond_8
 
-    sget-object p0, Lorg/a/a/aa;->bDh:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDr:Lorg/a/a/aa;
 
     return-object p0
 
@@ -851,17 +851,17 @@
     throw p0
 
     :pswitch_0
-    sget-object p0, Lorg/a/a/aa;->bDi:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDs:Lorg/a/a/aa;
 
     return-object p0
 
     :pswitch_1
-    sget-object p0, Lorg/a/a/aa;->bDc:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDm:Lorg/a/a/aa;
 
     return-object p0
 
     :pswitch_2
-    sget-object p0, Lorg/a/a/aa;->bDd:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDn:Lorg/a/a/aa;
 
     return-object p0
 
@@ -875,27 +875,27 @@
     return-object v0
 
     :cond_1
-    sget-object p0, Lorg/a/a/aa;->bDb:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDl:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_2
-    sget-object p0, Lorg/a/a/aa;->bDh:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDr:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_3
-    sget-object p0, Lorg/a/a/aa;->bDf:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDp:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_4
-    sget-object p0, Lorg/a/a/aa;->bDa:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDk:Lorg/a/a/aa;
 
     return-object p0
 
     :cond_5
-    sget-object p0, Lorg/a/a/aa;->bDe:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDo:Lorg/a/a/aa;
 
     return-object p0
 
@@ -913,7 +913,7 @@
     return-object v0
 
     :cond_7
-    sget-object p0, Lorg/a/a/aa;->bDg:Lorg/a/a/aa;
+    sget-object p0, Lorg/a/a/aa;->bDq:Lorg/a/a/aa;
 
     return-object p0
 
@@ -936,10 +936,10 @@
 
 
 # virtual methods
-.method public final HX()Ljava/lang/String;
+.method public final Ia()Ljava/lang/String;
     .locals 3
 
-    iget v0, p0, Lorg/a/a/aa;->bDj:I
+    iget v0, p0, Lorg/a/a/aa;->bDt:I
 
     packed-switch v0, :pswitch_data_0
 
@@ -951,11 +951,11 @@
     throw v0
 
     :pswitch_1
-    iget-object v0, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDl:I
+    iget v1, p0, Lorg/a/a/aa;->bDv:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDm:I
+    iget v2, p0, Lorg/a/a/aa;->bDw:I
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -974,17 +974,17 @@
     :pswitch_2
     new-instance v0, Ljava/lang/StringBuilder;
 
-    invoke-direct {p0}, Lorg/a/a/aa;->HW()Lorg/a/a/aa;
+    invoke-direct {p0}, Lorg/a/a/aa;->HZ()Lorg/a/a/aa;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lorg/a/a/aa;->HX()Ljava/lang/String;
+    invoke-virtual {v1}, Lorg/a/a/aa;->Ia()Ljava/lang/String;
 
     move-result-object v1
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    invoke-direct {p0}, Lorg/a/a/aa;->Ib()I
+    invoke-direct {p0}, Lorg/a/a/aa;->Ie()I
 
     move-result v1
 
@@ -1071,14 +1071,14 @@
     .end packed-switch
 .end method
 
-.method public final HY()Ljava/lang/String;
+.method public final Ib()Ljava/lang/String;
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDl:I
+    iget v1, p0, Lorg/a/a/aa;->bDv:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDm:I
+    iget v2, p0, Lorg/a/a/aa;->bDw:I
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -1087,22 +1087,22 @@
     return-object v0
 .end method
 
-.method public final HZ()Ljava/lang/String;
+.method public final Ic()Ljava/lang/String;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/aa;->bDj:I
+    iget v0, p0, Lorg/a/a/aa;->bDt:I
 
     const/16 v1, 0xa
 
     if-ne v0, v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDl:I
+    iget v1, p0, Lorg/a/a/aa;->bDv:I
 
     add-int/lit8 v1, v1, -0x1
 
-    iget v2, p0, Lorg/a/a/aa;->bDm:I
+    iget v2, p0, Lorg/a/a/aa;->bDw:I
 
     add-int/lit8 v2, v2, 0x1
 
@@ -1123,11 +1123,11 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    iget-object v1, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v2, p0, Lorg/a/a/aa;->bDl:I
+    iget v2, p0, Lorg/a/a/aa;->bDv:I
 
-    iget v3, p0, Lorg/a/a/aa;->bDm:I
+    iget v3, p0, Lorg/a/a/aa;->bDw:I
 
     invoke-virtual {v0, v1, v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;
 
@@ -1142,11 +1142,11 @@
     return-object v0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
-    iget v1, p0, Lorg/a/a/aa;->bDl:I
+    iget v1, p0, Lorg/a/a/aa;->bDv:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDm:I
+    iget v2, p0, Lorg/a/a/aa;->bDw:I
 
     invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String;
 
@@ -1155,10 +1155,10 @@
     return-object v0
 .end method
 
-.method public final Ia()I
+.method public final Id()I
     .locals 2
 
-    iget v0, p0, Lorg/a/a/aa;->bDj:I
+    iget v0, p0, Lorg/a/a/aa;->bDt:I
 
     const/16 v1, 0xc
 
@@ -1191,7 +1191,7 @@
     :cond_1
     check-cast p1, Lorg/a/a/aa;
 
-    iget v1, p0, Lorg/a/a/aa;->bDj:I
+    iget v1, p0, Lorg/a/a/aa;->bDt:I
 
     const/16 v3, 0xa
 
@@ -1202,7 +1202,7 @@
     const/16 v1, 0xa
 
     :cond_2
-    iget v5, p1, Lorg/a/a/aa;->bDj:I
+    iget v5, p1, Lorg/a/a/aa;->bDt:I
 
     if-ne v5, v4, :cond_3
 
@@ -1217,13 +1217,13 @@
     return v2
 
     :cond_4
-    iget v1, p0, Lorg/a/a/aa;->bDl:I
+    iget v1, p0, Lorg/a/a/aa;->bDv:I
 
-    iget v3, p0, Lorg/a/a/aa;->bDm:I
+    iget v3, p0, Lorg/a/a/aa;->bDw:I
 
-    iget v4, p1, Lorg/a/a/aa;->bDl:I
+    iget v4, p1, Lorg/a/a/aa;->bDv:I
 
-    iget v5, p1, Lorg/a/a/aa;->bDm:I
+    iget v5, p1, Lorg/a/a/aa;->bDw:I
 
     sub-int v6, v3, v1
 
@@ -1237,13 +1237,13 @@
     :goto_1
     if-ge v1, v3, :cond_7
 
-    iget-object v5, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v5, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
     invoke-virtual {v5, v1}, Ljava/lang/String;->charAt(I)C
 
     move-result v5
 
-    iget-object v6, p1, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v6, p1, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
     invoke-virtual {v6, v4}, Ljava/lang/String;->charAt(I)C
 
@@ -1267,7 +1267,7 @@
 .method public final hashCode()I
     .locals 4
 
-    iget v0, p0, Lorg/a/a/aa;->bDj:I
+    iget v0, p0, Lorg/a/a/aa;->bDt:I
 
     const/16 v1, 0xc
 
@@ -1278,20 +1278,20 @@
     :cond_0
     mul-int/lit8 v0, v0, 0xd
 
-    iget v1, p0, Lorg/a/a/aa;->bDj:I
+    iget v1, p0, Lorg/a/a/aa;->bDt:I
 
     const/16 v2, 0x9
 
     if-lt v1, v2, :cond_1
 
-    iget v1, p0, Lorg/a/a/aa;->bDl:I
+    iget v1, p0, Lorg/a/a/aa;->bDv:I
 
-    iget v2, p0, Lorg/a/a/aa;->bDm:I
+    iget v2, p0, Lorg/a/a/aa;->bDw:I
 
     :goto_0
     if-ge v1, v2, :cond_1
 
-    iget-object v3, p0, Lorg/a/a/aa;->bDk:Ljava/lang/String;
+    iget-object v3, p0, Lorg/a/a/aa;->bDu:Ljava/lang/String;
 
     invoke-virtual {v3, v1}, Ljava/lang/String;->charAt(I)C
 
@@ -1312,7 +1312,7 @@
 .method public final toString()Ljava/lang/String;
     .locals 1
 
-    invoke-virtual {p0}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {p0}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v0
 
diff --git a/com.discord/smali_classes2/org/a/a/ab.smali b/com.discord/smali_classes2/org/a/a/ab.smali
index a0fadd63de..8579d7ef57 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 bDn:[B
+.field private final bDx:[B
 
-.field private final bDo:I
+.field private final bDy:I
 
 
 # direct methods
@@ -15,9 +15,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/ab;->bDn:[B
+    iput-object p1, p0, Lorg/a/a/ab;->bDx:[B
 
-    iput p2, p0, Lorg/a/a/ab;->bDo:I
+    iput p2, p0, Lorg/a/a/ab;->bDy:I
 
     return-void
 .end method
@@ -34,9 +34,9 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/ab;->bDn:[B
+    iget-object v0, p0, Lorg/a/a/ab;->bDx:[B
 
-    iget p0, p0, Lorg/a/a/ab;->bDo:I
+    iget p0, p0, Lorg/a/a/ab;->bDy: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;->bDn:[B
+    iget-object v0, p0, Lorg/a/a/ab;->bDx:[B
 
-    iget v1, p0, Lorg/a/a/ab;->bDo:I
+    iget v1, p0, Lorg/a/a/ab;->bDy: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;->bDn:[B
+    iget-object v3, p0, Lorg/a/a/ab;->bDx:[B
 
-    iget v4, p0, Lorg/a/a/ab;->bDo:I
+    iget v4, p0, Lorg/a/a/ab;->bDy:I
 
     mul-int/lit8 v5, v2, 0x2
 
diff --git a/com.discord/smali_classes2/org/a/a/b.smali b/com.discord/smali_classes2/org/a/a/b.smali
index 24383d0d21..803d9a482d 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 bzE:Lorg/a/a/z;
+.field private final bzO:Lorg/a/a/z;
 
-.field private final bzF:Z
+.field private final bzP:Z
 
-.field private final bzG:Lorg/a/a/d;
+.field private final bzQ:Lorg/a/a/d;
 
-.field private final bzH:I
+.field private final bzR:I
 
-.field private bzI:I
+.field private bzS:I
 
-.field private final bzJ:Lorg/a/a/b;
+.field private final bzT:Lorg/a/a/b;
 
-.field private bzK:Lorg/a/a/b;
+.field private bzU: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;->bzE:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
-    iput-boolean p2, p0, Lorg/a/a/b;->bzF:Z
+    iput-boolean p2, p0, Lorg/a/a/b;->bzP:Z
 
-    iput-object p3, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/b;->bzQ: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;->bzH:I
+    iput p1, p0, Lorg/a/a/b;->bzR:I
 
-    iput-object p4, p0, Lorg/a/a/b;->bzJ:Lorg/a/a/b;
+    iput-object p4, p0, Lorg/a/a/b;->bzT:Lorg/a/a/b;
 
     if-eqz p4, :cond_1
 
-    iput-object p0, p4, Lorg/a/a/b;->bzK:Lorg/a/a/b;
+    iput-object p0, p4, Lorg/a/a/b;->bzU:Lorg/a/a/b;
 
     :cond_1
     return-void
@@ -170,11 +170,11 @@
     :goto_3
     if-eqz v0, :cond_2
 
-    invoke-virtual {v0}, Lorg/a/a/b;->HL()V
+    invoke-virtual {v0}, Lorg/a/a/b;->HO()V
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v4, v0, Lorg/a/a/b;->bzJ:Lorg/a/a/b;
+    iget-object v4, v0, Lorg/a/a/b;->bzT:Lorg/a/a/b;
 
     move-object v5, v4
 
@@ -190,17 +190,17 @@
     :goto_4
     if-eqz v4, :cond_3
 
-    iget-object v0, v4, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, v4, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    iget-object v2, v4, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, v4, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
     invoke-virtual {p3, v0, v1, v2}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/b;->bzK:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->bzU:Lorg/a/a/b;
 
     goto :goto_4
 
@@ -215,22 +215,22 @@
 
 
 # virtual methods
-.method public final HL()V
+.method public final HO()V
     .locals 4
 
-    iget v0, p0, Lorg/a/a/b;->bzH:I
+    iget v0, p0, Lorg/a/a/b;->bzR:I
 
     const/4 v1, -0x1
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
-    iget v1, p0, Lorg/a/a/b;->bzH:I
+    iget v1, p0, Lorg/a/a/b;->bzR:I
 
-    iget v2, p0, Lorg/a/a/b;->bzI:I
+    iget v2, p0, Lorg/a/a/b;->bzS: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;->HL()V
+    invoke-virtual {v2}, Lorg/a/a/b;->HO()V
 
-    iget-object v4, v2, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v4, v2, Lorg/a/a/b;->bzQ: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;->bzJ:Lorg/a/a/b;
+    iget-object v4, v2, Lorg/a/a/b;->bzT:Lorg/a/a/b;
 
     move-object v5, v4
 
@@ -296,17 +296,17 @@
     :goto_1
     if-eqz v4, :cond_1
 
-    iget-object p1, v4, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, v4, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     iget-object p1, p1, Lorg/a/a/d;->data:[B
 
-    iget-object v1, v4, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v1, v4, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
     invoke-virtual {p2, p1, v0, v1}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/b;->bzK:Lorg/a/a/b;
+    iget-object v4, v4, Lorg/a/a/b;->bzU:Lorg/a/a/b;
 
     goto :goto_1
 
@@ -317,19 +317,19 @@
 .method public final as(Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/b;->bzI:I
+    iget v0, p0, Lorg/a/a/b;->bzS:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzI:I
+    iput v0, p0, Lorg/a/a/b;->bzS:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzF:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -338,11 +338,11 @@
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v0, 0x40
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p2}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -358,9 +358,9 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/4 v1, 0x0
 
@@ -372,19 +372,19 @@
 .method public final en(Ljava/lang/String;)Lorg/a/a/a;
     .locals 4
 
-    iget v0, p0, Lorg/a/a/b;->bzI:I
+    iget v0, p0, Lorg/a/a/b;->bzS:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzI:I
+    iput v0, p0, Lorg/a/a/b;->bzS:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzF:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -393,7 +393,7 @@
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v0, 0x5b
 
@@ -403,9 +403,9 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
-    iget-object v2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/4 v3, 0x0
 
@@ -419,7 +419,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -433,13 +433,13 @@
     :goto_0
     if-eqz p1, :cond_1
 
-    iget-object v1, p1, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v1, p1, Lorg/a/a/b;->bzQ: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;->bzJ:Lorg/a/a/b;
+    iget-object p1, p1, Lorg/a/a/b;->bzT:Lorg/a/a/b;
 
     goto :goto_0
 
@@ -450,19 +450,19 @@
 .method public final k(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/b;->bzI:I
+    iget v0, p0, Lorg/a/a/b;->bzS:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzI:I
+    iput v0, p0, Lorg/a/a/b;->bzS:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzF:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -471,11 +471,11 @@
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v0, 0x65
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p2}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -485,7 +485,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p2, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -499,19 +499,19 @@
 .method public final v(Ljava/lang/String;Ljava/lang/Object;)V
     .locals 7
 
-    iget v0, p0, Lorg/a/a/b;->bzI:I
+    iget v0, p0, Lorg/a/a/b;->bzS:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/b;->bzI:I
+    iput v0, p0, Lorg/a/a/b;->bzS:I
 
-    iget-boolean v0, p0, Lorg/a/a/b;->bzF:Z
+    iget-boolean v0, p0, Lorg/a/a/b;->bzP:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -524,11 +524,11 @@
 
     if-eqz p1, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v0, 0x73
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/String;
 
@@ -549,9 +549,9 @@
 
     if-eqz p1, :cond_2
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/Byte;
 
@@ -582,9 +582,9 @@
 
     move-result p1
 
-    iget-object p2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, v1, p1}, Lorg/a/a/z;->ad(II)Lorg/a/a/y;
 
@@ -603,9 +603,9 @@
 
     if-eqz p1, :cond_4
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/Character;
 
@@ -630,9 +630,9 @@
 
     if-eqz p1, :cond_5
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     check-cast p2, Ljava/lang/Short;
 
@@ -655,15 +655,15 @@
 
     if-eqz p1, :cond_6
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v0, 0x63
 
-    iget-object v1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     check-cast p2, Lorg/a/a/aa;
 
-    invoke-virtual {p2}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {p2}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object p2
 
@@ -688,7 +688,7 @@
 
     check-cast p2, [B
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v2, p2
 
@@ -701,9 +701,9 @@
 
     aget-byte v2, p2, v5
 
-    iget-object v3, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v1, v2}, Lorg/a/a/z;->ad(II)Lorg/a/a/y;
 
@@ -729,7 +729,7 @@
 
     check-cast p2, [Z
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -742,9 +742,9 @@
 
     aget-boolean v0, p2, v5
 
-    iget-object v3, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->ad(II)Lorg/a/a/y;
 
@@ -770,7 +770,7 @@
 
     check-cast p2, [S
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -783,9 +783,9 @@
 
     aget-short v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v3, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v1, v0}, Lorg/a/a/z;->ad(II)Lorg/a/a/y;
 
@@ -811,7 +811,7 @@
 
     check-cast p2, [C
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -824,9 +824,9 @@
 
     aget-char v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->ad(II)Lorg/a/a/y;
 
@@ -852,7 +852,7 @@
 
     check-cast p2, [I
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -865,11 +865,11 @@
 
     aget v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v3, 0x49
 
-    iget-object v4, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v1, v0}, Lorg/a/a/z;->ad(II)Lorg/a/a/y;
 
@@ -895,7 +895,7 @@
 
     check-cast p2, [J
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -908,11 +908,11 @@
 
     aget-wide v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v3, 0x4a
 
-    iget-object v4, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     const/4 v6, 0x5
 
@@ -940,7 +940,7 @@
 
     check-cast p2, [F
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -953,11 +953,11 @@
 
     aget v0, p2, v5
 
-    iget-object v1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v2, 0x46
 
-    iget-object v3, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v0}, Lorg/a/a/z;->D(F)Lorg/a/a/y;
 
@@ -983,7 +983,7 @@
 
     check-cast p2, [D
 
-    iget-object p1, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -996,11 +996,11 @@
 
     aget-wide v0, p2, v5
 
-    iget-object v2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
     const/16 v3, 0x44
 
-    iget-object v4, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v0, v1}, Lorg/a/a/z;->f(D)Lorg/a/a/y;
 
@@ -1018,15 +1018,15 @@
     return-void
 
     :cond_16
-    iget-object p1, p0, Lorg/a/a/b;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/b;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p2}, Lorg/a/a/z;->bn(Ljava/lang/Object;)Lorg/a/a/y;
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/b;->bzG:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/b;->bzQ:Lorg/a/a/d;
 
-    iget v0, p1, Lorg/a/a/y;->bBe:I
+    iget v0, p1, Lorg/a/a/y;->bBo:I
 
     const-string v1, ".s.IFJDCS"
 
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 1cdfb41859..fbc88bb242 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 bzM:[Lorg/a/a/c;
+.field bzW:[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;->bzM:[Lorg/a/a/c;
+    iput-object v0, p0, Lorg/a/a/c$a;->bzW:[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;->bzM:[Lorg/a/a/c;
+    iget-object v2, p0, Lorg/a/a/c$a;->bzW:[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;->bzM:[Lorg/a/a/c;
+    iget-object v2, p0, Lorg/a/a/c$a;->bzW:[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;->bzM:[Lorg/a/a/c;
+    iput-object v3, p0, Lorg/a/a/c$a;->bzW:[Lorg/a/a/c;
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/c$a;->bzM:[Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/c$a;->bzW:[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;->bzL:Lorg/a/a/c;
+    iget-object p1, p1, Lorg/a/a/c;->bzV: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 aa0e2c5af0..70f2f26753 100644
--- a/com.discord/smali_classes2/org/a/a/c.smali
+++ b/com.discord/smali_classes2/org/a/a/c.smali
@@ -12,9 +12,9 @@
 
 
 # instance fields
-.field private aJl:[B
+.field private aJu:[B
 
-.field bzL:Lorg/a/a/c;
+.field bzV:Lorg/a/a/c;
 
 .field public final type:Ljava/lang/String;
 
@@ -30,12 +30,12 @@
     return-void
 .end method
 
-.method private HM()Lorg/a/a/d;
+.method private HP()Lorg/a/a/d;
     .locals 2
 
     new-instance v0, Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/c;->aJl:[B
+    iget-object v1, p0, Lorg/a/a/c;->aJu:[B
 
     invoke-direct {v0, v1}, Lorg/a/a/d;-><init>([B)V
 
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method final HN()I
+.method final HQ()I
     .locals 2
 
     const/4 v0, 0x0
@@ -58,7 +58,7 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    iget-object v0, v0, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -82,7 +82,7 @@
 
     invoke-virtual {p1, v2}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    invoke-direct {v0}, Lorg/a/a/c;->HM()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->HP()Lorg/a/a/d;
 
     move-result-object v2
 
@@ -92,7 +92,7 @@
 
     add-int/2addr v1, v2
 
-    iget-object v0, v0, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     goto :goto_0
 
@@ -111,11 +111,11 @@
 
     new-array v1, p3, [B
 
-    iput-object v1, v0, Lorg/a/a/c;->aJl:[B
+    iput-object v1, v0, Lorg/a/a/c;->aJu:[B
 
-    iget-object p1, p1, Lorg/a/a/e;->bzN:[B
+    iget-object p1, p1, Lorg/a/a/e;->bzX:[B
 
-    iget-object v1, v0, Lorg/a/a/c;->aJl:[B
+    iget-object v1, v0, Lorg/a/a/c;->aJu:[B
 
     const/4 v2, 0x0
 
@@ -132,7 +132,7 @@
     :goto_0
     if-eqz v0, :cond_0
 
-    invoke-direct {v0}, Lorg/a/a/c;->HM()Lorg/a/a/d;
+    invoke-direct {v0}, Lorg/a/a/c;->HP()Lorg/a/a/d;
 
     move-result-object v1
 
@@ -158,7 +158,7 @@
 
     invoke-virtual {p2, v2, v3, v1}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
-    iget-object v0, v0, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iget-object v0, v0, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     goto :goto_0
 
diff --git a/com.discord/smali_classes2/org/a/a/e.smali b/com.discord/smali_classes2/org/a/a/e.smali
index 6eb0b068f2..1d08223784 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 public final bzN:[B
+.field private final bAa:[Lorg/a/a/i;
 
-.field final bzO:[I
+.field private final bAb:[I
 
-.field private final bzP:[Ljava/lang/String;
+.field public final bAc:I
 
-.field private final bzQ:[Lorg/a/a/i;
+.field public final bzX:[B
 
-.field private final bzR:[I
+.field final bzY:[I
 
-.field public final bzS:I
+.field private final bzZ:[Ljava/lang/String;
 
-.field final pw:I
+.field final pv:I
 
 
 # direct methods
@@ -25,7 +25,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/e;->bzN:[B
+    iput-object p1, p0, Lorg/a/a/e;->bzX:[B
 
     const/16 v0, 0x8
 
@@ -35,11 +35,11 @@
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lorg/a/a/e;->bzO:[I
+    iput-object v1, p0, Lorg/a/a/e;->bzY:[I
 
     new-array v1, v0, [Ljava/lang/String;
 
-    iput-object v1, p0, Lorg/a/a/e;->bzP:[Ljava/lang/String;
+    iput-object v1, p0, Lorg/a/a/e;->bzZ:[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;->bzO:[I
+    iget-object v7, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v8, v1, 0x1
 
@@ -139,9 +139,9 @@
     goto :goto_0
 
     :cond_1
-    iput v3, p0, Lorg/a/a/e;->pw:I
+    iput v3, p0, Lorg/a/a/e;->pv:I
 
-    iput v4, p0, Lorg/a/a/e;->bzS:I
+    iput v4, p0, Lorg/a/a/e;->bAc:I
 
     const/4 p1, 0x0
 
@@ -155,7 +155,7 @@
     move-object v0, p1
 
     :goto_4
-    iput-object v0, p0, Lorg/a/a/e;->bzQ:[Lorg/a/a/i;
+    iput-object v0, p0, Lorg/a/a/e;->bAa:[Lorg/a/a/i;
 
     or-int v0, v5, v6
 
@@ -166,7 +166,7 @@
     move-result-object p1
 
     :cond_3
-    iput-object p1, p0, Lorg/a/a/e;->bzR:[I
+    iput-object p1, p0, Lorg/a/a/e;->bAb:[I
 
     return-void
 
@@ -197,10 +197,10 @@
     .end packed-switch
 .end method
 
-.method private HO()I
+.method private HR()I
     .locals 4
 
-    iget v0, p0, Lorg/a/a/e;->bzS:I
+    iget v0, p0, Lorg/a/a/e;->bAc:I
 
     add-int/lit8 v1, v0, 0x8
 
@@ -310,15 +310,15 @@
 .method private a(IZZLorg/a/a/j;)I
     .locals 11
 
-    iget-object v6, p4, Lorg/a/a/j;->bAy:[C
+    iget-object v6, p4, Lorg/a/a/j;->bAI:[C
 
-    iget-object v7, p4, Lorg/a/a/j;->bAC:[Lorg/a/a/r;
+    iget-object v7, p4, Lorg/a/a/j;->bAM:[Lorg/a/a/r;
 
     const/16 v0, 0xff
 
     if-eqz p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/e;->bzN:[B
+    iget-object p2, p0, Lorg/a/a/e;->bzX:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -331,7 +331,7 @@
     :cond_0
     const/4 p2, -0x1
 
-    iput p2, p4, Lorg/a/a/j;->bAI:I
+    iput p2, p4, Lorg/a/a/j;->bAS:I
 
     move v1, p1
 
@@ -340,7 +340,7 @@
     :goto_0
     const/4 p2, 0x0
 
-    iput p2, p4, Lorg/a/a/j;->bAL:I
+    iput p2, p4, Lorg/a/a/j;->bAV:I
 
     const/4 v2, 0x3
 
@@ -350,9 +350,9 @@
 
     if-ge p1, v3, :cond_1
 
-    iput v2, p4, Lorg/a/a/j;->bAJ:I
+    iput v2, p4, Lorg/a/a/j;->bAT:I
 
-    iput p2, p4, Lorg/a/a/j;->bAN:I
+    iput p2, p4, Lorg/a/a/j;->bAX:I
 
     :goto_1
     move v10, p1
@@ -368,7 +368,7 @@
 
     add-int/lit8 p1, p1, -0x40
 
-    iget-object v2, p4, Lorg/a/a/j;->bAO:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
@@ -382,9 +382,9 @@
 
     move-result v1
 
-    iput v9, p4, Lorg/a/a/j;->bAJ:I
+    iput v9, p4, Lorg/a/a/j;->bAT:I
 
-    iput v8, p4, Lorg/a/a/j;->bAN:I
+    iput v8, p4, Lorg/a/a/j;->bAX:I
 
     goto :goto_1
 
@@ -401,7 +401,7 @@
 
     if-ne p1, v3, :cond_3
 
-    iget-object v2, p4, Lorg/a/a/j;->bAO:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
 
     const/4 v3, 0x0
 
@@ -415,9 +415,9 @@
 
     move-result v1
 
-    iput v9, p4, Lorg/a/a/j;->bAJ:I
+    iput v9, p4, Lorg/a/a/j;->bAT:I
 
-    iput v8, p4, Lorg/a/a/j;->bAN:I
+    iput v8, p4, Lorg/a/a/j;->bAX:I
 
     goto/16 :goto_6
 
@@ -432,30 +432,30 @@
 
     if-ge p1, v4, :cond_4
 
-    iput v9, p4, Lorg/a/a/j;->bAJ:I
+    iput v9, p4, Lorg/a/a/j;->bAT:I
 
     sub-int/2addr v4, p1
 
-    iput v4, p4, Lorg/a/a/j;->bAL:I
+    iput v4, p4, Lorg/a/a/j;->bAV:I
 
-    iget p1, p4, Lorg/a/a/j;->bAK:I
+    iget p1, p4, Lorg/a/a/j;->bAU:I
 
-    iget p3, p4, Lorg/a/a/j;->bAL:I
+    iget p3, p4, Lorg/a/a/j;->bAV:I
 
     sub-int/2addr p1, p3
 
-    iput p1, p4, Lorg/a/a/j;->bAK:I
+    iput p1, p4, Lorg/a/a/j;->bAU:I
 
-    iput p2, p4, Lorg/a/a/j;->bAN:I
+    iput p2, p4, Lorg/a/a/j;->bAX:I
 
     goto/16 :goto_6
 
     :cond_4
     if-ne p1, v4, :cond_5
 
-    iput v2, p4, Lorg/a/a/j;->bAJ:I
+    iput v2, p4, Lorg/a/a/j;->bAT:I
 
-    iput p2, p4, Lorg/a/a/j;->bAN:I
+    iput p2, p4, Lorg/a/a/j;->bAX:I
 
     goto/16 :goto_6
 
@@ -464,7 +464,7 @@
 
     if-eqz p3, :cond_6
 
-    iget p3, p4, Lorg/a/a/j;->bAK:I
+    iget p3, p4, Lorg/a/a/j;->bAU:I
 
     goto :goto_2
 
@@ -481,7 +481,7 @@
     :goto_3
     if-lez p3, :cond_7
 
-    iget-object v2, p4, Lorg/a/a/j;->bAM:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
 
     add-int/lit8 v9, v3, 0x1
 
@@ -502,19 +502,19 @@
     goto :goto_3
 
     :cond_7
-    iput v8, p4, Lorg/a/a/j;->bAJ:I
+    iput v8, p4, Lorg/a/a/j;->bAT:I
 
-    iput p1, p4, Lorg/a/a/j;->bAL:I
+    iput p1, p4, Lorg/a/a/j;->bAV:I
 
-    iget p1, p4, Lorg/a/a/j;->bAK:I
+    iget p1, p4, Lorg/a/a/j;->bAU:I
 
-    iget p3, p4, Lorg/a/a/j;->bAL:I
+    iget p3, p4, Lorg/a/a/j;->bAV:I
 
     add-int/2addr p1, p3
 
-    iput p1, p4, Lorg/a/a/j;->bAK:I
+    iput p1, p4, Lorg/a/a/j;->bAU:I
 
-    iput p2, p4, Lorg/a/a/j;->bAN:I
+    iput p2, p4, Lorg/a/a/j;->bAX:I
 
     goto :goto_6
 
@@ -525,18 +525,18 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iput p2, p4, Lorg/a/a/j;->bAJ:I
+    iput p2, p4, Lorg/a/a/j;->bAT:I
 
-    iput p1, p4, Lorg/a/a/j;->bAL:I
+    iput p1, p4, Lorg/a/a/j;->bAV:I
 
-    iput p1, p4, Lorg/a/a/j;->bAK:I
+    iput p1, p4, Lorg/a/a/j;->bAU:I
 
     const/4 p3, 0x0
 
     :goto_4
     if-ge p3, p1, :cond_9
 
-    iget-object v2, p4, Lorg/a/a/j;->bAM:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
 
     move-object v0, p0
 
@@ -561,12 +561,12 @@
 
     add-int/2addr v1, v9
 
-    iput p1, p4, Lorg/a/a/j;->bAN:I
+    iput p1, p4, Lorg/a/a/j;->bAX:I
 
     :goto_5
     if-ge p2, p1, :cond_a
 
-    iget-object v2, p4, Lorg/a/a/j;->bAO:[Ljava/lang/Object;
+    iget-object v2, p4, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
 
     move-object v0, p0
 
@@ -586,15 +586,15 @@
 
     :cond_a
     :goto_6
-    iget p1, p4, Lorg/a/a/j;->bAI:I
+    iget p1, p4, Lorg/a/a/j;->bAS:I
 
     add-int/2addr v10, v8
 
     add-int/2addr p1, v10
 
-    iput p1, p4, Lorg/a/a/j;->bAI:I
+    iput p1, p4, Lorg/a/a/j;->bAS:I
 
-    iget p1, p4, Lorg/a/a/j;->bAI:I
+    iget p1, p4, Lorg/a/a/j;->bAS: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;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     add-int/lit8 v1, p1, 0x1
 
@@ -659,49 +659,49 @@
     goto :goto_1
 
     :pswitch_2
-    sget-object p1, Lorg/a/a/x;->bCN:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCX:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_3
-    sget-object p1, Lorg/a/a/x;->bCM:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCW:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_4
-    sget-object p1, Lorg/a/a/x;->bCL:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_5
-    sget-object p1, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_6
-    sget-object p1, Lorg/a/a/x;->bCJ:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCT:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_7
-    sget-object p1, Lorg/a/a/x;->bCI:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCS:Ljava/lang/Integer;
 
     aput-object p1, p2, p3
 
     goto :goto_1
 
     :pswitch_8
-    sget-object p1, Lorg/a/a/x;->bCH:Ljava/lang/Integer;
+    sget-object p1, Lorg/a/a/x;->bCR: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;->bzN:[B
+    iget-object p1, p0, Lorg/a/a/e;->bzX:[B
 
     aget-byte p1, p1, p2
 
@@ -779,7 +779,7 @@
     return p1
 
     :cond_3
-    iget-object v5, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v5, p0, Lorg/a/a/e;->bzX:[B
 
     add-int/lit8 v6, p2, 0x1
 
@@ -830,7 +830,7 @@
     throw p1
 
     :pswitch_0
-    iget-object p2, p0, Lorg/a/a/e;->bzO:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzY:[I
 
     invoke-direct {p0, v6}, Lorg/a/a/e;->dK(I)I
 
@@ -853,7 +853,7 @@
     goto :goto_0
 
     :pswitch_1
-    iget-object p2, p0, Lorg/a/a/e;->bzO:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzY:[I
 
     invoke-direct {p0, v6}, Lorg/a/a/e;->dK(I)I
 
@@ -900,7 +900,7 @@
     return p1
 
     :cond_5
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     aget-byte v0, v0, v6
 
@@ -936,7 +936,7 @@
     :goto_1
     if-ge v3, p2, :cond_6
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -973,7 +973,7 @@
     :goto_2
     if-ge v3, p2, :cond_7
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1008,7 +1008,7 @@
     :goto_3
     if-ge v3, p2, :cond_8
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1043,7 +1043,7 @@
     :goto_4
     if-ge v3, p2, :cond_a
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1076,7 +1076,7 @@
     :goto_5
     if-ge v3, p2, :cond_c
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1111,7 +1111,7 @@
     :goto_6
     if-ge v0, p2, :cond_f
 
-    iget-object v1, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v1, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v2, v6, 0x1
 
@@ -1154,7 +1154,7 @@
     :goto_8
     if-ge v3, p2, :cond_11
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1189,7 +1189,7 @@
     :goto_9
     if-ge v3, p2, :cond_13
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v1, v6, 0x1
 
@@ -1221,7 +1221,7 @@
     goto :goto_b
 
     :cond_14
-    iget-object p2, p0, Lorg/a/a/e;->bzO:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzY:[I
 
     invoke-direct {p0, v6}, Lorg/a/a/e;->dK(I)I
 
@@ -1287,7 +1287,7 @@
     goto/16 :goto_0
 
     :cond_19
-    iget-object p2, p0, Lorg/a/a/e;->bzO:[I
+    iget-object p2, p0, Lorg/a/a/e;->bzY:[I
 
     invoke-direct {p0, v6}, Lorg/a/a/e;->dK(I)I
 
@@ -1405,7 +1405,7 @@
     :cond_1
     if-eqz p1, :cond_2
 
-    invoke-virtual {p1}, Lorg/a/a/a;->HL()V
+    invoke-virtual {p1}, Lorg/a/a/a;->HO()V
 
     :cond_2
     return p2
@@ -1465,15 +1465,15 @@
 
     new-array v3, v1, [Lorg/a/a/r;
 
-    iput-object v3, p1, Lorg/a/a/j;->bAF:[Lorg/a/a/r;
+    iput-object v3, p1, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
 
     new-array v3, v1, [Lorg/a/a/r;
 
-    iput-object v3, p1, Lorg/a/a/j;->bAG:[Lorg/a/a/r;
+    iput-object v3, p1, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
 
     new-array v3, v1, [I
 
-    iput-object v3, p1, Lorg/a/a/j;->bAH:[I
+    iput-object v3, p1, Lorg/a/a/j;->bAR:[I
 
     const/4 v3, 0x0
 
@@ -1498,9 +1498,9 @@
 
     add-int/lit8 p2, p2, 0x6
 
-    iget-object v7, p1, Lorg/a/a/j;->bAF:[Lorg/a/a/r;
+    iget-object v7, p1, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
 
-    iget-object v8, p1, Lorg/a/a/j;->bAC:[Lorg/a/a/r;
+    iget-object v8, p1, Lorg/a/a/j;->bAM:[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;->bAG:[Lorg/a/a/r;
+    iget-object v7, p1, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
 
     add-int/2addr v4, v5
 
-    iget-object v5, p1, Lorg/a/a/j;->bAC:[Lorg/a/a/r;
+    iget-object v5, p1, Lorg/a/a/j;->bAM:[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;->bAH:[I
+    iget-object v4, p1, Lorg/a/a/j;->bAR:[I
 
     aput v6, v4, v3
 
@@ -1553,7 +1553,7 @@
 
     :cond_1
     :goto_2
-    iput v0, p1, Lorg/a/a/j;->bAD:I
+    iput v0, p1, Lorg/a/a/j;->bAN:I
 
     invoke-direct {p0, p2}, Lorg/a/a/e;->dJ(I)I
 
@@ -1568,12 +1568,12 @@
     :cond_2
     new-instance v1, Lorg/a/a/ab;
 
-    iget-object v3, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v3, p0, Lorg/a/a/e;->bzX:[B
 
     invoke-direct {v1, v3, p2}, Lorg/a/a/ab;-><init>([BI)V
 
     :goto_3
-    iput-object v1, p1, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iput-object v1, p1, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
     add-int/2addr p2, v2
 
@@ -1658,7 +1658,7 @@
 
     add-int/2addr p2, p1
 
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     const/4 v1, 0x0
 
@@ -1852,11 +1852,11 @@
 .method private a(Lorg/a/a/j;)V
     .locals 10
 
-    iget-object v0, p1, Lorg/a/a/j;->bAB:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/j;->bAL:Ljava/lang/String;
 
-    iget-object v1, p1, Lorg/a/a/j;->bAM:[Ljava/lang/Object;
+    iget-object v1, p1, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
 
-    iget v2, p1, Lorg/a/a/j;->bAz:I
+    iget v2, p1, Lorg/a/a/j;->bAJ:I
 
     and-int/lit8 v2, v2, 0x8
 
@@ -1866,7 +1866,7 @@
 
     if-nez v2, :cond_1
 
-    iget-object v2, p1, Lorg/a/a/j;->bAA:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/j;->bAK:Ljava/lang/String;
 
     const-string v5, "<init>"
 
@@ -1876,18 +1876,18 @@
 
     if-eqz v2, :cond_0
 
-    sget-object v2, Lorg/a/a/x;->bCN:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bCX:Ljava/lang/Integer;
 
     aput-object v2, v1, v3
 
     goto :goto_0
 
     :cond_0
-    iget v2, p0, Lorg/a/a/e;->bzS:I
+    iget v2, p0, Lorg/a/a/e;->bAc:I
 
     add-int/lit8 v2, v2, 0x2
 
-    iget-object v5, p1, Lorg/a/a/j;->bAy:[C
+    iget-object v5, p1, Lorg/a/a/j;->bAI:[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;->bAK:I
+    iput v3, p1, Lorg/a/a/j;->bAU:I
 
     return-void
 
     :pswitch_0
     add-int/lit8 v2, v3, 0x1
 
-    sget-object v6, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCU: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;->bCL:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCV: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;->bCI:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCS: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;->bCJ:Ljava/lang/Integer;
+    sget-object v6, Lorg/a/a/x;->bCT:Ljava/lang/Integer;
 
     aput-object v6, v1, v3
 
@@ -2083,9 +2083,9 @@
 
     move/from16 v1, p3
 
-    iget-object v7, v0, Lorg/a/a/e;->bzN:[B
+    iget-object v7, v0, Lorg/a/a/e;->bzX:[B
 
-    iget-object v11, v10, Lorg/a/a/j;->bAy:[C
+    iget-object v11, v10, Lorg/a/a/j;->bAI:[C
 
     invoke-direct {v0, v1}, Lorg/a/a/e;->dK(I)I
 
@@ -2113,7 +2113,7 @@
 
     new-array v5, v1, [Lorg/a/a/r;
 
-    iput-object v5, v10, Lorg/a/a/j;->bAC:[Lorg/a/a/r;
+    iput-object v5, v10, Lorg/a/a/j;->bAM:[Lorg/a/a/r;
 
     move v1, v15
 
@@ -2370,7 +2370,7 @@
 
     move/from16 v18, v3
 
-    iget-object v3, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v3, v0, Lorg/a/a/e;->bzY:[I
 
     move/from16 v19, v6
 
@@ -2452,7 +2452,7 @@
 
     if-eqz v3, :cond_7
 
-    iget v2, v10, Lorg/a/a/j;->bAx:I
+    iget v2, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit8 v2, v2, 0x2
 
@@ -2535,7 +2535,7 @@
 
     if-eqz v3, :cond_a
 
-    iget v2, v10, Lorg/a/a/j;->bAx:I
+    iget v2, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit8 v2, v2, 0x2
 
@@ -2625,7 +2625,7 @@
 
     if-eqz v11, :cond_d
 
-    iget v2, v10, Lorg/a/a/j;->bAx:I
+    iget v2, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit8 v2, v2, 0x4
 
@@ -2650,7 +2650,7 @@
 
     if-eqz v11, :cond_e
 
-    iget v2, v10, Lorg/a/a/j;->bAx:I
+    iget v2, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit8 v2, v2, 0x4
 
@@ -2669,13 +2669,13 @@
     goto :goto_a
 
     :cond_e
-    iget-object v11, v10, Lorg/a/a/j;->bAw:[Lorg/a/a/c;
+    iget-object v11, v10, Lorg/a/a/j;->bAG:[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;->bzL:Lorg/a/a/c;
+    iput-object v4, v2, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     move-object v4, v2
 
@@ -2698,7 +2698,7 @@
 
     const/4 v3, 0x1
 
-    iget v1, v10, Lorg/a/a/j;->bAx:I
+    iget v1, v10, Lorg/a/a/j;->bAH:I
 
     const/16 v2, 0x8
 
@@ -2718,25 +2718,25 @@
 
     if-eqz v18, :cond_14
 
-    iput v6, v10, Lorg/a/a/j;->bAI:I
+    iput v6, v10, Lorg/a/a/j;->bAS:I
 
     const/4 v2, 0x0
 
-    iput v2, v10, Lorg/a/a/j;->bAJ:I
+    iput v2, v10, Lorg/a/a/j;->bAT:I
 
-    iput v2, v10, Lorg/a/a/j;->bAK:I
+    iput v2, v10, Lorg/a/a/j;->bAU:I
 
-    iput v2, v10, Lorg/a/a/j;->bAL:I
+    iput v2, v10, Lorg/a/a/j;->bAV:I
 
     new-array v1, v13, [Ljava/lang/Object;
 
-    iput-object v1, v10, Lorg/a/a/j;->bAM:[Ljava/lang/Object;
+    iput-object v1, v10, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
 
-    iput v2, v10, Lorg/a/a/j;->bAN:I
+    iput v2, v10, Lorg/a/a/j;->bAX:I
 
     new-array v1, v12, [Ljava/lang/Object;
 
-    iput-object v1, v10, Lorg/a/a/j;->bAO:[Ljava/lang/Object;
+    iput-object v1, v10, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
 
     if-eqz v11, :cond_12
 
@@ -2792,7 +2792,7 @@
     :cond_14
     if-eqz v11, :cond_15
 
-    iget v1, v10, Lorg/a/a/j;->bAx:I
+    iget v1, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit16 v1, v1, 0x100
 
@@ -2874,7 +2874,7 @@
 
     move-result v2
 
-    iget v3, v10, Lorg/a/a/j;->bAx:I
+    iget v3, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit16 v3, v3, 0x100
 
@@ -2911,7 +2911,7 @@
 
     if-eqz v2, :cond_18
 
-    iget v8, v10, Lorg/a/a/j;->bAx:I
+    iget v8, v10, Lorg/a/a/j;->bAH: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;->bAI:I
+    iget v2, v10, Lorg/a/a/j;->bAS:I
 
     if-eq v2, v3, :cond_1a
 
-    iget v2, v10, Lorg/a/a/j;->bAI:I
+    iget v2, v10, Lorg/a/a/j;->bAS:I
 
     move/from16 v18, v3
 
@@ -2968,7 +2968,7 @@
     const/4 v3, -0x1
 
     :goto_12
-    iget v2, v10, Lorg/a/a/j;->bAI:I
+    iget v2, v10, Lorg/a/a/j;->bAS:I
 
     if-eq v2, v3, :cond_1d
 
@@ -2981,21 +2981,21 @@
     goto :goto_13
 
     :cond_1b
-    iget v2, v10, Lorg/a/a/j;->bAJ:I
+    iget v2, v10, Lorg/a/a/j;->bAT:I
 
-    iget v1, v10, Lorg/a/a/j;->bAL:I
+    iget v1, v10, Lorg/a/a/j;->bAV:I
 
     move/from16 v21, v4
 
-    iget-object v4, v10, Lorg/a/a/j;->bAM:[Ljava/lang/Object;
+    iget-object v4, v10, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
 
     move-object/from16 v33, v5
 
-    iget v5, v10, Lorg/a/a/j;->bAN:I
+    iget v5, v10, Lorg/a/a/j;->bAX:I
 
     move-object/from16 v34, v6
 
-    iget-object v6, v10, Lorg/a/a/j;->bAO:[Ljava/lang/Object;
+    iget-object v6, v10, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
 
     move/from16 v35, v1
 
@@ -3037,13 +3037,13 @@
 
     const/4 v2, -0x1
 
-    iget v3, v10, Lorg/a/a/j;->bAK:I
+    iget v3, v10, Lorg/a/a/j;->bAU:I
 
-    iget-object v4, v10, Lorg/a/a/j;->bAM:[Ljava/lang/Object;
+    iget-object v4, v10, Lorg/a/a/j;->bAW:[Ljava/lang/Object;
 
-    iget v5, v10, Lorg/a/a/j;->bAN:I
+    iget v5, v10, Lorg/a/a/j;->bAX:I
 
-    iget-object v6, v10, Lorg/a/a/j;->bAO:[Ljava/lang/Object;
+    iget-object v6, v10, Lorg/a/a/j;->bAY:[Ljava/lang/Object;
 
     move-object/from16 v1, p1
 
@@ -3126,7 +3126,7 @@
 
     if-eqz v1, :cond_21
 
-    iget v1, v10, Lorg/a/a/j;->bAx:I
+    iget v1, v10, Lorg/a/a/j;->bAH:I
 
     const/16 v2, 0x8
 
@@ -3465,7 +3465,7 @@
 
     const/4 v5, 0x1
 
-    iget-object v1, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v1, v0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v2, v21, 0x1
 
@@ -3475,7 +3475,7 @@
 
     aget v1, v1, v2
 
-    iget-object v2, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v2, v0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v6, v1, 0x2
 
@@ -3495,7 +3495,7 @@
 
     move-result-object v2
 
-    iget-object v4, v0, Lorg/a/a/e;->bzR:[I
+    iget-object v4, v0, Lorg/a/a/e;->bAb:[I
 
     invoke-direct {v0, v1}, Lorg/a/a/e;->dK(I)I
 
@@ -3566,7 +3566,7 @@
 
     move/from16 v27, v8
 
-    iget-object v1, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v1, v0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v4, v21, 0x1
 
@@ -3576,7 +3576,7 @@
 
     aget v1, v1, v2
 
-    iget-object v2, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v2, v0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v4, v1, 0x2
 
@@ -4180,9 +4180,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v6, v10, Lorg/a/a/j;->bAD:I
+    iget v6, v10, Lorg/a/a/j;->bAN:I
 
-    iget-object v8, v10, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v8, v10, Lorg/a/a/j;->bAO: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;->bAD:I
+    iget v15, v10, Lorg/a/a/j;->bAN:I
 
     move/from16 v21, v1
 
-    iget-object v1, v10, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v1, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
     move/from16 v28, v12
 
@@ -4332,7 +4332,7 @@
 
     if-eqz v6, :cond_37
 
-    iget v1, v10, Lorg/a/a/j;->bAx:I
+    iget v1, v10, Lorg/a/a/j;->bAH:I
 
     and-int/lit8 v1, v1, 0x2
 
@@ -4554,15 +4554,15 @@
 
     add-int/lit8 v6, v1, 0x2
 
-    iget v2, v10, Lorg/a/a/j;->bAD:I
+    iget v2, v10, Lorg/a/a/j;->bAN:I
 
-    iget-object v3, v10, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v3, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
-    iget-object v4, v10, Lorg/a/a/j;->bAF:[Lorg/a/a/r;
+    iget-object v4, v10, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
 
-    iget-object v5, v10, Lorg/a/a/j;->bAG:[Lorg/a/a/r;
+    iget-object v5, v10, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
 
-    iget-object v1, v10, Lorg/a/a/j;->bAH:[I
+    iget-object v1, v10, Lorg/a/a/j;->bAR:[I
 
     const/16 v17, 0x1
 
@@ -4648,15 +4648,15 @@
 
     add-int/lit8 v15, v1, 0x2
 
-    iget v2, v10, Lorg/a/a/j;->bAD:I
+    iget v2, v10, Lorg/a/a/j;->bAN:I
 
-    iget-object v3, v10, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v3, v10, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
-    iget-object v4, v10, Lorg/a/a/j;->bAF:[Lorg/a/a/r;
+    iget-object v4, v10, Lorg/a/a/j;->bAP:[Lorg/a/a/r;
 
-    iget-object v5, v10, Lorg/a/a/j;->bAG:[Lorg/a/a/r;
+    iget-object v5, v10, Lorg/a/a/j;->bAQ:[Lorg/a/a/r;
 
-    iget-object v6, v10, Lorg/a/a/j;->bAH:[I
+    iget-object v6, v10, Lorg/a/a/j;->bAR:[I
 
     const/4 v8, 0x0
 
@@ -4681,11 +4681,11 @@
     :goto_3c
     if-eqz v1, :cond_3e
 
-    iget-object v2, v1, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iget-object v2, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v1, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v3, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     invoke-virtual {v9, v1}, Lorg/a/a/t;->b(Lorg/a/a/c;)V
 
@@ -5176,7 +5176,7 @@
 .method private a(Lorg/a/a/t;Lorg/a/a/j;IZ)[I
     .locals 9
 
-    iget-object v0, p2, Lorg/a/a/j;->bAy:[C
+    iget-object v0, p2, Lorg/a/a/j;->bAI:[C
 
     invoke-direct {p0, p3}, Lorg/a/a/e;->dK(I)I
 
@@ -5246,13 +5246,13 @@
 
     add-int/lit8 p3, p3, 0x6
 
-    iget-object v8, p2, Lorg/a/a/j;->bAC:[Lorg/a/a/r;
+    iget-object v8, p2, Lorg/a/a/j;->bAM:[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;->bAC:[Lorg/a/a/r;
+    iget-object v7, p2, Lorg/a/a/j;->bAM:[Lorg/a/a/r;
 
     invoke-static {v5, v7}, Lorg/a/a/e;->b(I[Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -5285,7 +5285,7 @@
     :cond_2
     new-instance v7, Lorg/a/a/ab;
 
-    iget-object v4, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v4, p0, Lorg/a/a/e;->bzX:[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;->bzP:[Ljava/lang/String;
+    iget-object v0, p0, Lorg/a/a/e;->bzZ:[Ljava/lang/String;
 
     aget-object v1, v0, p1
 
@@ -5369,7 +5369,7 @@
     return-object v1
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v1, p0, Lorg/a/a/e;->bzY:[I
 
     aget v1, v1, p1
 
@@ -5395,13 +5395,13 @@
 
     move-result-object p0
 
-    iget-short p1, p0, Lorg/a/a/r;->bBo:S
+    iget-short p1, p0, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 p1, p1, -0x2
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bBo:S
+    iput-short p1, p0, Lorg/a/a/r;->bBy: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;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     add-int/lit8 v1, p3, 0x1
 
@@ -5419,7 +5419,7 @@
 
     invoke-virtual {p1, p3, p4}, Lorg/a/a/t;->e(IZ)V
 
-    iget-object p2, p2, Lorg/a/a/j;->bAy:[C
+    iget-object p2, p2, Lorg/a/a/j;->bAI:[C
 
     const/4 v0, 0x0
 
@@ -5469,7 +5469,7 @@
 .method private c(I[C)Ljava/lang/String;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     invoke-direct {p0, p1}, Lorg/a/a/e;->dK(I)I
 
@@ -5495,13 +5495,13 @@
 
     move-result-object p0
 
-    iget-short p1, p0, Lorg/a/a/r;->bBo:S
+    iget-short p1, p0, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 p1, p1, 0x1
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bBo:S
+    iput-short p1, p0, Lorg/a/a/r;->bBy: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;->bzQ:[Lorg/a/a/i;
+    iget-object v0, p0, Lorg/a/a/e;->bAa:[Lorg/a/a/i;
 
     aget-object v0, v0, p1
 
@@ -5519,7 +5519,7 @@
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     aget v1, v0, p1
 
@@ -5541,7 +5541,7 @@
 
     move-result-object v0
 
-    iget-object v3, p0, Lorg/a/a/e;->bzR:[I
+    iget-object v3, p0, Lorg/a/a/e;->bAb:[I
 
     invoke-direct {p0, v1}, Lorg/a/a/e;->dK(I)I
 
@@ -5593,7 +5593,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p2, p0, Lorg/a/a/e;->bzQ:[Lorg/a/a/i;
+    iget-object p2, p0, Lorg/a/a/e;->bAa:[Lorg/a/a/i;
 
     new-instance v1, Lorg/a/a/i;
 
@@ -5609,7 +5609,7 @@
 
     new-array p1, p1, [C
 
-    invoke-direct {p0}, Lorg/a/a/e;->HO()I
+    invoke-direct {p0}, Lorg/a/a/e;->HR()I
 
     move-result v0
 
@@ -5694,7 +5694,7 @@
 .method private dJ(I)I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     aget-byte p1, v0, p1
 
@@ -5706,7 +5706,7 @@
 .method private dK(I)I
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     aget-byte v1, v0, p1
 
@@ -5728,7 +5728,7 @@
 .method private dL(I)S
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     aget-byte v1, v0, p1
 
@@ -5752,7 +5752,7 @@
 .method private dM(I)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     aget-byte v1, v0, p1
 
@@ -5824,11 +5824,11 @@
 .method private e(I[C)Ljava/lang/Object;
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     aget v0, v0, p1
 
-    iget-object v1, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v1, p0, Lorg/a/a/e;->bzX:[B
 
     add-int/lit8 v2, v0, -0x1
 
@@ -5867,7 +5867,7 @@
 
     move-result v1
 
-    iget-object p1, p0, Lorg/a/a/e;->bzO:[I
+    iget-object p1, p0, Lorg/a/a/e;->bzY:[I
 
     const/4 v2, 0x1
 
@@ -5879,7 +5879,7 @@
 
     aget p1, p1, v0
 
-    iget-object v0, p0, Lorg/a/a/e;->bzO:[I
+    iget-object v0, p0, Lorg/a/a/e;->bzY:[I
 
     add-int/lit8 v3, p1, 0x2
 
@@ -5903,7 +5903,7 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/e;->bzN:[B
+    iget-object v0, p0, Lorg/a/a/e;->bzX:[B
 
     sub-int/2addr p1, v2
 
@@ -6044,19 +6044,19 @@
 
     invoke-direct {v10}, Lorg/a/a/j;-><init>()V
 
-    iput-object v1, v10, Lorg/a/a/j;->bAw:[Lorg/a/a/c;
+    iput-object v1, v10, Lorg/a/a/j;->bAG:[Lorg/a/a/c;
 
-    iput v9, v10, Lorg/a/a/j;->bAx:I
+    iput v9, v10, Lorg/a/a/j;->bAH:I
 
-    iget v2, v0, Lorg/a/a/e;->pw:I
+    iget v2, v0, Lorg/a/a/e;->pv:I
 
     new-array v2, v2, [C
 
-    iput-object v2, v10, Lorg/a/a/j;->bAy:[C
+    iput-object v2, v10, Lorg/a/a/j;->bAI:[C
 
-    iget-object v11, v10, Lorg/a/a/j;->bAy:[C
+    iget-object v11, v10, Lorg/a/a/j;->bAI:[C
 
-    iget v2, v0, Lorg/a/a/e;->bzS:I
+    iget v2, v0, Lorg/a/a/e;->bAc:I
 
     invoke-direct {v0, v2}, Lorg/a/a/e;->dK(I)I
 
@@ -6106,7 +6106,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-direct/range {p0 .. p0}, Lorg/a/a/e;->HO()I
+    invoke-direct/range {p0 .. p0}, Lorg/a/a/e;->HR()I
 
     move-result v2
 
@@ -6430,7 +6430,7 @@
 
     move-result-object v4
 
-    iput-object v10, v4, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v10, v4, Lorg/a/a/c;->bzV: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;->bzO:[I
+    iget-object v1, v0, Lorg/a/a/e;->bzY:[I
 
     const/4 v15, 0x1
 
@@ -6517,7 +6517,7 @@
 
     move-object/from16 v6, v26
 
-    iget-object v1, v6, Lorg/a/a/j;->bAy:[C
+    iget-object v1, v6, Lorg/a/a/j;->bAI:[C
 
     move/from16 v2, v28
 
@@ -6900,7 +6900,7 @@
     goto :goto_11
 
     :cond_24
-    iget-object v3, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v3, v0, Lorg/a/a/e;->bzY:[I
 
     aget v3, v3, v1
 
@@ -6916,7 +6916,7 @@
     goto :goto_12
 
     :cond_25
-    iget-object v4, v0, Lorg/a/a/e;->bzO:[I
+    iget-object v4, v0, Lorg/a/a/e;->bzY:[I
 
     aget v1, v4, v1
 
@@ -7035,9 +7035,9 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iget v4, v6, Lorg/a/a/j;->bAD:I
+    iget v4, v6, Lorg/a/a/j;->bAN:I
 
-    iget-object v5, v6, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v5, v6, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
     const/4 v10, 0x1
 
@@ -7081,9 +7081,9 @@
 
     add-int/lit8 v1, v1, 0x2
 
-    iget v4, v6, Lorg/a/a/j;->bAD:I
+    iget v4, v6, Lorg/a/a/j;->bAN:I
 
-    iget-object v5, v6, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v5, v6, Lorg/a/a/j;->bAO: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;->bzL:Lorg/a/a/c;
+    iget-object v2, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v1, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v3, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     invoke-virtual {v8, v1}, Lorg/a/a/g;->b(Lorg/a/a/c;)V
 
@@ -7211,7 +7211,7 @@
 
     if-lez v1, :cond_3d
 
-    iget-object v11, v6, Lorg/a/a/j;->bAy:[C
+    iget-object v11, v6, Lorg/a/a/j;->bAI:[C
 
     invoke-direct {v0, v13}, Lorg/a/a/e;->dK(I)I
 
@@ -7407,13 +7407,13 @@
     goto :goto_1e
 
     :cond_36
-    iget-object v9, v6, Lorg/a/a/j;->bAw:[Lorg/a/a/c;
+    iget-object v9, v6, Lorg/a/a/j;->bAG:[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;->bzL:Lorg/a/a/c;
+    iput-object v10, v2, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     move-object v10, v2
 
@@ -7562,9 +7562,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bAD:I
+    iget v5, v9, Lorg/a/a/j;->bAN:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
     const/4 v13, 0x1
 
@@ -7608,9 +7608,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bAD:I
+    iget v5, v9, Lorg/a/a/j;->bAN:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAO: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;->bzL:Lorg/a/a/c;
+    iget-object v2, v10, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     const/4 v3, 0x0
 
-    iput-object v3, v10, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v3, v10, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     invoke-virtual {v1, v10}, Lorg/a/a/m;->b(Lorg/a/a/c;)V
 
@@ -7677,13 +7677,13 @@
 
     if-lez v1, :cond_64
 
-    iget-object v10, v9, Lorg/a/a/j;->bAy:[C
+    iget-object v10, v9, Lorg/a/a/j;->bAI:[C
 
     invoke-direct {v0, v13}, Lorg/a/a/e;->dK(I)I
 
     move-result v1
 
-    iput v1, v9, Lorg/a/a/j;->bAz:I
+    iput v1, v9, Lorg/a/a/j;->bAJ:I
 
     add-int/lit8 v1, v13, 0x2
 
@@ -7691,7 +7691,7 @@
 
     move-result-object v1
 
-    iput-object v1, v9, Lorg/a/a/j;->bAA:Ljava/lang/String;
+    iput-object v1, v9, Lorg/a/a/j;->bAK:Ljava/lang/String;
 
     add-int/lit8 v11, v13, 0x4
 
@@ -7699,7 +7699,7 @@
 
     move-result-object v1
 
-    iput-object v1, v9, Lorg/a/a/j;->bAB:Ljava/lang/String;
+    iput-object v1, v9, Lorg/a/a/j;->bAL:Ljava/lang/String;
 
     add-int/lit8 v6, v13, 0x6
 
@@ -7770,7 +7770,7 @@
 
     if-eqz v3, :cond_3f
 
-    iget v1, v9, Lorg/a/a/j;->bAx:I
+    iget v1, v9, Lorg/a/a/j;->bAH:I
 
     const/4 v3, 0x1
 
@@ -7862,11 +7862,11 @@
 
     if-eqz v3, :cond_43
 
-    iget v1, v9, Lorg/a/a/j;->bAz:I
+    iget v1, v9, Lorg/a/a/j;->bAJ:I
 
     or-int v1, v1, v32
 
-    iput v1, v9, Lorg/a/a/j;->bAz:I
+    iput v1, v9, Lorg/a/a/j;->bAJ:I
 
     :goto_27
     move-object/from16 v11, v20
@@ -7921,11 +7921,11 @@
 
     if-eqz v3, :cond_47
 
-    iget v1, v9, Lorg/a/a/j;->bAz:I
+    iget v1, v9, Lorg/a/a/j;->bAJ:I
 
     or-int/lit16 v1, v1, 0x1000
 
-    iput v1, v9, Lorg/a/a/j;->bAz:I
+    iput v1, v9, Lorg/a/a/j;->bAJ:I
 
     move-object/from16 v6, v26
 
@@ -8002,13 +8002,13 @@
     goto :goto_28
 
     :cond_4c
-    iget-object v3, v9, Lorg/a/a/j;->bAw:[Lorg/a/a/c;
+    iget-object v3, v9, Lorg/a/a/j;->bAG:[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;->bzL:Lorg/a/a/c;
+    iput-object v8, v1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     move-object v8, v1
 
@@ -8044,11 +8044,11 @@
 
     move-object/from16 v6, v26
 
-    iget v2, v9, Lorg/a/a/j;->bAz:I
+    iget v2, v9, Lorg/a/a/j;->bAJ:I
 
-    iget-object v3, v9, Lorg/a/a/j;->bAA:Ljava/lang/String;
+    iget-object v3, v9, Lorg/a/a/j;->bAK:Ljava/lang/String;
 
-    iget-object v1, v9, Lorg/a/a/j;->bAB:Ljava/lang/String;
+    iget-object v1, v9, Lorg/a/a/j;->bAL:Ljava/lang/String;
 
     if-nez v5, :cond_4e
 
@@ -8112,7 +8112,7 @@
 
     sub-int v4, v23, v13
 
-    iget v3, v9, Lorg/a/a/j;->bAz:I
+    iget v3, v9, Lorg/a/a/j;->bAJ:I
 
     and-int v3, v3, v32
 
@@ -8132,21 +8132,21 @@
 
     move-result v5
 
-    iget-object v6, v2, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v6, v2, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v6, v6, Lorg/a/a/z;->bCQ:Lorg/a/a/e;
+    iget-object v6, v6, Lorg/a/a/z;->bDa:Lorg/a/a/e;
 
     if-ne v0, v6, :cond_57
 
-    iget v6, v2, Lorg/a/a/u;->bAT:I
+    iget v6, v2, Lorg/a/a/u;->bBd:I
 
     if-ne v5, v6, :cond_57
 
-    iget v5, v2, Lorg/a/a/u;->bAh:I
+    iget v5, v2, Lorg/a/a/u;->bAr:I
 
     if-ne v11, v5, :cond_57
 
-    iget v5, v2, Lorg/a/a/u;->bzU:I
+    iget v5, v2, Lorg/a/a/u;->bAe:I
 
     and-int v5, v5, v32
 
@@ -8165,15 +8165,15 @@
     goto :goto_2f
 
     :cond_51
-    iget-object v3, v2, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v3, v2, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v3, v3, Lorg/a/a/z;->bCR:I
+    iget v3, v3, Lorg/a/a/z;->bDb:I
 
     const/16 v5, 0x31
 
     if-ge v3, v5, :cond_52
 
-    iget v3, v2, Lorg/a/a/u;->bzU:I
+    iget v3, v2, Lorg/a/a/u;->bAe:I
 
     and-int/lit16 v3, v3, 0x1000
 
@@ -8194,7 +8194,7 @@
     :cond_53
     if-nez v7, :cond_54
 
-    iget v3, v2, Lorg/a/a/u;->bBT:I
+    iget v3, v2, Lorg/a/a/u;->bCd:I
 
     if-eqz v3, :cond_56
 
@@ -8205,7 +8205,7 @@
 
     move-result v3
 
-    iget v5, v2, Lorg/a/a/u;->bBT:I
+    iget v5, v2, Lorg/a/a/u;->bCd:I
 
     if-ne v3, v5, :cond_56
 
@@ -8216,7 +8216,7 @@
     const/4 v3, 0x0
 
     :goto_2e
-    iget v6, v2, Lorg/a/a/u;->bBT:I
+    iget v6, v2, Lorg/a/a/u;->bCd:I
 
     if-ge v3, v6, :cond_56
 
@@ -8224,7 +8224,7 @@
 
     move-result v6
 
-    iget-object v7, v2, Lorg/a/a/u;->bBU:[I
+    iget-object v7, v2, Lorg/a/a/u;->bCe:[I
 
     aget v7, v7, v3
 
@@ -8240,11 +8240,11 @@
     goto :goto_2e
 
     :cond_56
-    iput v12, v2, Lorg/a/a/u;->bCo:I
+    iput v12, v2, Lorg/a/a/u;->bCy:I
 
     add-int/lit8 v4, v4, -0x6
 
-    iput v4, v2, Lorg/a/a/u;->bCp:I
+    iput v4, v2, Lorg/a/a/u;->bCz:I
 
     const/4 v2, 0x1
 
@@ -8296,7 +8296,7 @@
     :cond_59
     if-eqz v18, :cond_5a
 
-    invoke-virtual {v1}, Lorg/a/a/t;->HQ()Lorg/a/a/a;
+    invoke-virtual {v1}, Lorg/a/a/t;->HT()Lorg/a/a/a;
 
     move-result-object v2
 
@@ -8308,7 +8308,7 @@
 
     if-eqz v2, :cond_5a
 
-    invoke-virtual {v2}, Lorg/a/a/a;->HL()V
+    invoke-virtual {v2}, Lorg/a/a/a;->HO()V
 
     :cond_5a
     if-eqz v17, :cond_5b
@@ -8416,9 +8416,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bAD:I
+    iget v5, v9, Lorg/a/a/j;->bAN:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAO:Lorg/a/a/ab;
 
     const/4 v7, 0x1
 
@@ -8462,9 +8462,9 @@
 
     add-int/lit8 v2, v2, 0x2
 
-    iget v5, v9, Lorg/a/a/j;->bAD:I
+    iget v5, v9, Lorg/a/a/j;->bAN:I
 
-    iget-object v6, v9, Lorg/a/a/j;->bAE:Lorg/a/a/ab;
+    iget-object v6, v9, Lorg/a/a/j;->bAO: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;->bzL:Lorg/a/a/c;
+    iget-object v3, v2, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
     const/4 v4, 0x0
 
-    iput-object v4, v2, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v4, v2, Lorg/a/a/c;->bzV: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 4b2cd22d65..2622399dc1 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 final bzC:I
+.field protected bAd:Lorg/a/a/g;
 
-.field protected bzT:Lorg/a/a/g;
+.field protected final bzM:I
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/g;->bzC:I
+    iput p1, p0, Lorg/a/a/g;->bzM:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iput-object p1, p0, Lorg/a/a/g;->bAd: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;->bzC:I
+    iget v0, p0, Lorg/a/a/g;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -171,7 +171,7 @@
 .method public at(Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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;->bzC:I
+    iget v0, p0, Lorg/a/a/g;->bzM:I
 
     const/high16 v1, 0x60000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -231,13 +231,13 @@
 .method public eq(Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/g;->bzC:I
+    iget v0, p0, Lorg/a/a/g;->bzM:I
 
     const/high16 v1, 0x70000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -259,13 +259,13 @@
 .method public er(Ljava/lang/String;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/g;->bzC:I
+    iget v0, p0, Lorg/a/a/g;->bzM:I
 
     const/high16 v1, 0x70000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -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;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd:Lorg/a/a/g;
 
     if-eqz v0, :cond_0
 
@@ -306,7 +306,7 @@
 .method public l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/g;->bzT:Lorg/a/a/g;
+    iget-object v0, p0, Lorg/a/a/g;->bAd: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 7e5f557da7..08223d629d 100644
--- a/com.discord/smali_classes2/org/a/a/h.smali
+++ b/com.discord/smali_classes2/org/a/a/h.smali
@@ -4,15 +4,15 @@
 
 
 # instance fields
-.field private bAa:Lorg/a/a/n;
+.field private bAA:I
 
-.field private bAb:Lorg/a/a/u;
+.field private bAB:Lorg/a/a/d;
 
-.field private bAc:Lorg/a/a/u;
+.field private bAC:Lorg/a/a/c;
 
-.field private bAd:I
+.field private bAD:I
 
-.field private bAe:Lorg/a/a/d;
+.field private bAe:I
 
 .field private bAf:I
 
@@ -20,43 +20,43 @@
 
 .field private bAh:I
 
-.field private bAi:I
+.field private bAi:[I
 
-.field private bAj:Lorg/a/a/d;
+.field private bAj:Lorg/a/a/n;
 
-.field private bAk:Lorg/a/a/b;
+.field private bAk:Lorg/a/a/n;
 
-.field private bAl:Lorg/a/a/b;
+.field private bAl:Lorg/a/a/u;
 
-.field private bAm:Lorg/a/a/b;
+.field private bAm:Lorg/a/a/u;
 
-.field private bAn:Lorg/a/a/b;
+.field private bAn:I
 
-.field private bAo:Lorg/a/a/w;
+.field private bAo:Lorg/a/a/d;
 
 .field private bAp:I
 
 .field private bAq:I
 
-.field private bAr:Lorg/a/a/d;
+.field private bAr:I
 
-.field private bAs:Lorg/a/a/c;
+.field private bAs:I
 
-.field private bAt:I
+.field private bAt:Lorg/a/a/d;
 
-.field private final bzE:Lorg/a/a/z;
+.field private bAu:Lorg/a/a/b;
 
-.field private bzU:I
+.field private bAv:Lorg/a/a/b;
 
-.field private bzV:I
+.field private bAw:Lorg/a/a/b;
 
-.field private bzW:I
+.field private bAx:Lorg/a/a/b;
 
-.field private bzX:I
+.field private bAy:Lorg/a/a/w;
 
-.field private bzY:[I
+.field private bAz:I
 
-.field private bzZ:Lorg/a/a/n;
+.field private final bzO:Lorg/a/a/z;
 
 .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;->bzE:Lorg/a/a/z;
+    iput-object p2, p0, Lorg/a/a/h;->bzO: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;->bAt:I
+    iput p1, p0, Lorg/a/a/h;->bAD:I
 
     return-void
 
@@ -100,21 +100,21 @@
 
     if-eqz p1, :cond_1
 
-    iput p2, p0, Lorg/a/a/h;->bAt:I
+    iput p2, p0, Lorg/a/a/h;->bAD:I
 
     return-void
 
     :cond_1
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/a/a/h;->bAt:I
+    iput p1, p0, Lorg/a/a/h;->bAD:I
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final Hw()[B
+.method public final Hz()[B
     .locals 20
     .annotation system Ldalvik/annotation/Throws;
         value = {
@@ -126,7 +126,7 @@
     move-object/from16 v0, p0
 
     :goto_0
-    iget v1, v0, Lorg/a/a/h;->bzX:I
+    iget v1, v0, Lorg/a/a/h;->bAh:I
 
     const/4 v2, 0x2
 
@@ -134,7 +134,7 @@
 
     add-int/lit8 v1, v1, 0x18
 
-    iget-object v3, v0, Lorg/a/a/h;->bzZ:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
 
     move v5, v1
 
@@ -165,11 +165,11 @@
 
     add-int/lit8 v1, v1, 0x1
 
-    iget v4, v3, Lorg/a/a/n;->bAU:I
+    iget v4, v3, Lorg/a/a/n;->bBe:I
 
     if-eqz v4, :cond_0
 
-    iget-object v4, v3, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     const-string v15, "ConstantValue"
 
@@ -178,54 +178,54 @@
     const/16 v15, 0x10
 
     :cond_0
-    iget v4, v3, Lorg/a/a/n;->bzU:I
+    iget v4, v3, Lorg/a/a/n;->bAe:I
 
     and-int/2addr v4, v14
 
     if-eqz v4, :cond_1
 
-    iget-object v4, v3, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bCR:I
+    iget v4, v4, Lorg/a/a/z;->bDb:I
 
     if-ge v4, v10, :cond_1
 
-    iget-object v4, v3, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v8}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     add-int/lit8 v15, v15, 0x6
 
     :cond_1
-    iget v4, v3, Lorg/a/a/n;->bAh:I
+    iget v4, v3, Lorg/a/a/n;->bAr:I
 
     if-eqz v4, :cond_2
 
-    iget-object v4, v3, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v9}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     add-int/lit8 v15, v15, 0x8
 
     :cond_2
-    iget v4, v3, Lorg/a/a/n;->bzU:I
+    iget v4, v3, Lorg/a/a/n;->bAe:I
 
     and-int/2addr v4, v11
 
     if-eqz v4, :cond_3
 
-    iget-object v4, v3, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v4, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v7}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     add-int/lit8 v15, v15, 0x6
 
     :cond_3
-    iget-object v4, v3, Lorg/a/a/n;->bAk:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAu:Lorg/a/a/b;
 
     if-eqz v4, :cond_4
 
-    iget-object v4, v3, Lorg/a/a/n;->bAk:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAu:Lorg/a/a/b;
 
     invoke-virtual {v4, v6}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -234,11 +234,11 @@
     add-int/2addr v15, v4
 
     :cond_4
-    iget-object v4, v3, Lorg/a/a/n;->bAl:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAv:Lorg/a/a/b;
 
     if-eqz v4, :cond_5
 
-    iget-object v4, v3, Lorg/a/a/n;->bAl:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAv:Lorg/a/a/b;
 
     const-string v6, "RuntimeInvisibleAnnotations"
 
@@ -249,11 +249,11 @@
     add-int/2addr v15, v4
 
     :cond_5
-    iget-object v4, v3, Lorg/a/a/n;->bAm:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAw:Lorg/a/a/b;
 
     if-eqz v4, :cond_6
 
-    iget-object v4, v3, Lorg/a/a/n;->bAm:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAw:Lorg/a/a/b;
 
     invoke-virtual {v4, v13}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -262,11 +262,11 @@
     add-int/2addr v15, v4
 
     :cond_6
-    iget-object v4, v3, Lorg/a/a/n;->bAn:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAx:Lorg/a/a/b;
 
     if-eqz v4, :cond_7
 
-    iget-object v4, v3, Lorg/a/a/n;->bAn:Lorg/a/a/b;
+    iget-object v4, v3, Lorg/a/a/n;->bAx:Lorg/a/a/b;
 
     invoke-virtual {v4, v12}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -275,13 +275,13 @@
     add-int/2addr v15, v4
 
     :cond_7
-    iget-object v4, v3, Lorg/a/a/n;->bAs:Lorg/a/a/c;
+    iget-object v4, v3, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
     if-eqz v4, :cond_8
 
-    iget-object v4, v3, Lorg/a/a/n;->bAs:Lorg/a/a/c;
+    iget-object v4, v3, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
-    iget-object v6, v3, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v6, v3, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v6}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -292,14 +292,14 @@
     :cond_8
     add-int/2addr v5, v15
 
-    iget-object v3, v3, Lorg/a/a/n;->bAR:Lorg/a/a/m;
+    iget-object v3, v3, Lorg/a/a/n;->bBb: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;->bAb:Lorg/a/a/u;
+    iget-object v3, v0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
 
     const/4 v4, 0x0
 
@@ -310,24 +310,24 @@
 
     add-int/lit8 v4, v4, 0x1
 
-    iget v11, v3, Lorg/a/a/u;->bCo:I
+    iget v11, v3, Lorg/a/a/u;->bCy:I
 
     if-eqz v11, :cond_a
 
-    iget v11, v3, Lorg/a/a/u;->bCp:I
+    iget v11, v3, Lorg/a/a/u;->bCz:I
 
     add-int/lit8 v11, v11, 0x6
 
     goto/16 :goto_9
 
     :cond_a
-    iget-object v11, v3, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bBP: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;->bBF:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -335,19 +335,19 @@
 
     if-gt v11, v14, :cond_14
 
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v14, "Code"
 
     invoke-virtual {v11, v14}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v11, v3, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/u;->bBP: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;->bBG:Lorg/a/a/q;
+    iget-object v14, v3, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     invoke-static {v14}, Lorg/a/a/q;->b(Lorg/a/a/q;)I
 
@@ -357,13 +357,13 @@
 
     add-int/2addr v11, v15
 
-    iget-object v14, v3, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v14, v3, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     if-eqz v14, :cond_d
 
-    iget-object v14, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v14, v14, Lorg/a/a/z;->bCR:I
+    iget v14, v14, Lorg/a/a/z;->bDb:I
 
     const/16 v10, 0x32
 
@@ -377,7 +377,7 @@
     const/4 v10, 0x0
 
     :goto_3
-    iget-object v14, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     if-eqz v10, :cond_c
 
@@ -391,7 +391,7 @@
     :goto_4
     invoke-virtual {v14, v10}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -400,17 +400,17 @@
     add-int/2addr v11, v10
 
     :cond_d
-    iget-object v10, v3, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     if-eqz v10, :cond_e
 
-    iget-object v10, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v14, "LineNumberTable"
 
     invoke-virtual {v10, v14}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -419,17 +419,17 @@
     add-int/2addr v11, v10
 
     :cond_e
-    iget-object v10, v3, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     if-eqz v10, :cond_f
 
-    iget-object v10, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v14, "LocalVariableTable"
 
     invoke-virtual {v10, v14}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -438,17 +438,17 @@
     add-int/2addr v11, v10
 
     :cond_f
-    iget-object v10, v3, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     if-eqz v10, :cond_10
 
-    iget-object v10, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v14, "LocalVariableTypeTable"
 
     invoke-virtual {v10, v14}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -457,11 +457,11 @@
     add-int/2addr v11, v10
 
     :cond_10
-    iget-object v10, v3, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     if-eqz v10, :cond_11
 
-    iget-object v10, v3, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     invoke-virtual {v10, v13}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -470,11 +470,11 @@
     add-int/2addr v11, v10
 
     :cond_11
-    iget-object v10, v3, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     if-eqz v10, :cond_12
 
-    iget-object v10, v3, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object v10, v3, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     invoke-virtual {v10, v12}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -483,13 +483,13 @@
     add-int/2addr v11, v10
 
     :cond_12
-    iget-object v10, v3, Lorg/a/a/u;->bBS:Lorg/a/a/c;
+    iget-object v10, v3, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
     if-eqz v10, :cond_13
 
-    iget-object v10, v3, Lorg/a/a/u;->bBS:Lorg/a/a/c;
+    iget-object v10, v3, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
-    iget-object v14, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v14, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v10, v14}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -507,7 +507,7 @@
     :cond_14
     new-instance v1, Lorg/a/a/s;
 
-    iget-object v2, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     iget-object v2, v2, Lorg/a/a/z;->className:Ljava/lang/String;
 
@@ -515,7 +515,7 @@
 
     iget-object v5, v3, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    iget-object v3, v3, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v3, v3, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v3, v3, Lorg/a/a/d;->length:I
 
@@ -527,17 +527,17 @@
     const/16 v10, 0x8
 
     :goto_5
-    iget v11, v3, Lorg/a/a/u;->bBT:I
+    iget v11, v3, Lorg/a/a/u;->bCd:I
 
     if-lez v11, :cond_16
 
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v14, "Exceptions"
 
     invoke-virtual {v11, v14}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget v11, v3, Lorg/a/a/u;->bBT:I
+    iget v11, v3, Lorg/a/a/u;->bCd:I
 
     mul-int/lit8 v11, v11, 0x2
 
@@ -546,9 +546,9 @@
     add-int/2addr v10, v11
 
     :cond_16
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v11, v11, Lorg/a/a/z;->bCR:I
+    iget v11, v11, Lorg/a/a/z;->bDb:I
 
     const/16 v14, 0x31
 
@@ -560,7 +560,7 @@
     const/16 v16, 0x0
 
     :goto_6
-    iget v11, v3, Lorg/a/a/u;->bzU:I
+    iget v11, v3, Lorg/a/a/u;->bAe:I
 
     const/16 v14, 0x1000
 
@@ -570,25 +570,25 @@
 
     if-eqz v16, :cond_18
 
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v11, v8}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x6
 
     :cond_18
-    iget v11, v3, Lorg/a/a/u;->bAh:I
+    iget v11, v3, Lorg/a/a/u;->bAr:I
 
     if-eqz v11, :cond_19
 
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v11, v9}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x8
 
     :cond_19
-    iget v11, v3, Lorg/a/a/u;->bzU:I
+    iget v11, v3, Lorg/a/a/u;->bAe:I
 
     const/high16 v14, 0x20000
 
@@ -596,18 +596,18 @@
 
     if-eqz v11, :cond_1a
 
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v11, v7}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     add-int/lit8 v10, v10, 0x6
 
     :cond_1a
-    iget-object v11, v3, Lorg/a/a/u;->bAk:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAu:Lorg/a/a/b;
 
     if-eqz v11, :cond_1b
 
-    iget-object v11, v3, Lorg/a/a/u;->bAk:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAu:Lorg/a/a/b;
 
     invoke-virtual {v11, v6}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -616,11 +616,11 @@
     add-int/2addr v10, v11
 
     :cond_1b
-    iget-object v11, v3, Lorg/a/a/u;->bAl:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAv:Lorg/a/a/b;
 
     if-eqz v11, :cond_1c
 
-    iget-object v11, v3, Lorg/a/a/u;->bAl:Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bAv:Lorg/a/a/b;
 
     const-string v14, "RuntimeInvisibleAnnotations"
 
@@ -631,24 +631,24 @@
     add-int/2addr v10, v11
 
     :cond_1c
-    iget-object v11, v3, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     if-eqz v11, :cond_1e
 
-    iget-object v11, v3, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
-    iget v14, v3, Lorg/a/a/u;->bBV:I
+    iget v14, v3, Lorg/a/a/u;->bCf:I
 
     if-nez v14, :cond_1d
 
-    iget-object v14, v3, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object v14, v3, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     array-length v14, v14
 
     goto :goto_7
 
     :cond_1d
-    iget v14, v3, Lorg/a/a/u;->bBV:I
+    iget v14, v3, Lorg/a/a/u;->bCf:I
 
     :goto_7
     const-string v2, "RuntimeVisibleParameterAnnotations"
@@ -660,24 +660,24 @@
     add-int/2addr v10, v2
 
     :cond_1e
-    iget-object v2, v3, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     if-eqz v2, :cond_20
 
-    iget-object v2, v3, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
-    iget v11, v3, Lorg/a/a/u;->bBX:I
+    iget v11, v3, Lorg/a/a/u;->bCh:I
 
     if-nez v11, :cond_1f
 
-    iget-object v11, v3, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object v11, v3, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     array-length v11, v11
 
     goto :goto_8
 
     :cond_1f
-    iget v11, v3, Lorg/a/a/u;->bBX:I
+    iget v11, v3, Lorg/a/a/u;->bCh:I
 
     :goto_8
     const-string v14, "RuntimeInvisibleParameterAnnotations"
@@ -689,11 +689,11 @@
     add-int/2addr v10, v2
 
     :cond_20
-    iget-object v2, v3, Lorg/a/a/u;->bAm:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAw:Lorg/a/a/b;
 
     if-eqz v2, :cond_21
 
-    iget-object v2, v3, Lorg/a/a/u;->bAm:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAw:Lorg/a/a/b;
 
     invoke-virtual {v2, v13}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -702,11 +702,11 @@
     add-int/2addr v10, v2
 
     :cond_21
-    iget-object v2, v3, Lorg/a/a/u;->bAn:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAx:Lorg/a/a/b;
 
     if-eqz v2, :cond_22
 
-    iget-object v2, v3, Lorg/a/a/u;->bAn:Lorg/a/a/b;
+    iget-object v2, v3, Lorg/a/a/u;->bAx:Lorg/a/a/b;
 
     invoke-virtual {v2, v12}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -715,17 +715,17 @@
     add-int/2addr v10, v2
 
     :cond_22
-    iget-object v2, v3, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     if-eqz v2, :cond_23
 
-    iget-object v2, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v11, "AnnotationDefault"
 
     invoke-virtual {v2, v11}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v2, v3, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -734,17 +734,17 @@
     add-int/2addr v10, v2
 
     :cond_23
-    iget-object v2, v3, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     if-eqz v2, :cond_24
 
-    iget-object v2, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v11, "MethodParameters"
 
     invoke-virtual {v2, v11}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v2, v3, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v2, v3, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -753,13 +753,13 @@
     add-int/2addr v10, v2
 
     :cond_24
-    iget-object v2, v3, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v2, v3, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
     if-eqz v2, :cond_25
 
-    iget-object v2, v3, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v2, v3, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
-    iget-object v11, v3, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, v11}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -773,7 +773,7 @@
     :goto_9
     add-int/2addr v5, v11
 
-    iget-object v2, v3, Lorg/a/a/u;->bBB:Lorg/a/a/t;
+    iget-object v2, v3, Lorg/a/a/u;->bBL:Lorg/a/a/t;
 
     move-object v3, v2
 
@@ -790,7 +790,7 @@
     goto/16 :goto_2
 
     :cond_26
-    iget-object v2, v0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     if-eqz v2, :cond_27
 
@@ -800,7 +800,7 @@
 
     add-int/2addr v5, v2
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v3, "InnerClasses"
 
@@ -814,7 +814,7 @@
     const/4 v2, 0x0
 
     :goto_a
-    iget v3, v0, Lorg/a/a/h;->bAf:I
+    iget v3, v0, Lorg/a/a/h;->bAp:I
 
     if-eqz v3, :cond_28
 
@@ -822,14 +822,14 @@
 
     add-int/lit8 v5, v5, 0xa
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v10, "EnclosingMethod"
 
     invoke-virtual {v3, v10}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_28
-    iget v3, v0, Lorg/a/a/h;->bzU:I
+    iget v3, v0, Lorg/a/a/h;->bAe:I
 
     const/16 v10, 0x1000
 
@@ -851,12 +851,12 @@
 
     add-int/lit8 v5, v5, 0x6
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v8}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_29
-    iget v3, v0, Lorg/a/a/h;->bAh:I
+    iget v3, v0, Lorg/a/a/h;->bAr:I
 
     if-eqz v3, :cond_2a
 
@@ -864,12 +864,12 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v9}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_2a
-    iget v3, v0, Lorg/a/a/h;->bAi:I
+    iget v3, v0, Lorg/a/a/h;->bAs:I
 
     if-eqz v3, :cond_2b
 
@@ -877,14 +877,14 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v10, "SourceFile"
 
     invoke-virtual {v3, v10}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_2b
-    iget-object v3, v0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
+    iget-object v3, v0, Lorg/a/a/h;->bAt:Lorg/a/a/d;
 
     if-eqz v3, :cond_2c
 
@@ -896,14 +896,14 @@
 
     add-int/2addr v5, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v10, "SourceDebugExtension"
 
     invoke-virtual {v3, v10}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_2c
-    iget v3, v0, Lorg/a/a/h;->bzU:I
+    iget v3, v0, Lorg/a/a/h;->bAe:I
 
     const/high16 v10, 0x20000
 
@@ -915,12 +915,12 @@
 
     add-int/lit8 v5, v5, 0x6
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v7}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_2d
-    iget-object v3, v0, Lorg/a/a/h;->bAk:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAu:Lorg/a/a/b;
 
     if-eqz v3, :cond_2e
 
@@ -933,7 +933,7 @@
     add-int/2addr v5, v3
 
     :cond_2e
-    iget-object v3, v0, Lorg/a/a/h;->bAl:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAv:Lorg/a/a/b;
 
     if-eqz v3, :cond_2f
 
@@ -948,7 +948,7 @@
     add-int/2addr v5, v3
 
     :cond_2f
-    iget-object v3, v0, Lorg/a/a/h;->bAm:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAw:Lorg/a/a/b;
 
     if-eqz v3, :cond_30
 
@@ -961,7 +961,7 @@
     add-int/2addr v5, v3
 
     :cond_30
-    iget-object v3, v0, Lorg/a/a/h;->bAn:Lorg/a/a/b;
+    iget-object v3, v0, Lorg/a/a/h;->bAx:Lorg/a/a/b;
 
     if-eqz v3, :cond_31
 
@@ -974,9 +974,9 @@
     add-int/2addr v5, v3
 
     :cond_31
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    invoke-virtual {v3}, Lorg/a/a/z;->HV()I
+    invoke-virtual {v3}, Lorg/a/a/z;->HY()I
 
     move-result v3
 
@@ -984,20 +984,20 @@
 
     add-int/lit8 v2, v2, 0x1
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    invoke-virtual {v3}, Lorg/a/a/z;->HV()I
+    invoke-virtual {v3}, Lorg/a/a/z;->HY()I
 
     move-result v3
 
     add-int/2addr v5, v3
 
     :cond_32
-    iget-object v3, v0, Lorg/a/a/h;->bAo:Lorg/a/a/w;
+    iget-object v3, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
 
     if-eqz v3, :cond_37
 
-    iget v10, v3, Lorg/a/a/w;->bCE:I
+    iget v10, v3, Lorg/a/a/w;->bCO:I
 
     if-lez v10, :cond_33
 
@@ -1011,7 +1011,7 @@
     :goto_b
     add-int/lit8 v10, v10, 0x1
 
-    iget v3, v3, Lorg/a/a/w;->bCG:I
+    iget v3, v3, Lorg/a/a/w;->bCQ:I
 
     if-lez v3, :cond_34
 
@@ -1027,55 +1027,55 @@
 
     add-int/2addr v2, v10
 
-    iget-object v3, v0, Lorg/a/a/h;->bAo:Lorg/a/a/w;
+    iget-object v3, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
 
-    iget-object v10, v3, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v10, v3, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const-string v11, "Module"
 
     invoke-virtual {v10, v11}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v10, v3, Lorg/a/a/w;->bCv:Lorg/a/a/d;
+    iget-object v10, v3, Lorg/a/a/w;->bCF: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;->bCx:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCH: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;->bCz:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCJ: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;->bCB:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCL: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;->bCD:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCN: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;->bCE:I
+    iget v11, v3, Lorg/a/a/w;->bCO:I
 
     if-lez v11, :cond_35
 
-    iget-object v11, v3, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v11, v3, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const-string v14, "ModulePackages"
 
     invoke-virtual {v11, v14}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v11, v3, Lorg/a/a/w;->bCF:Lorg/a/a/d;
+    iget-object v11, v3, Lorg/a/a/w;->bCP:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -1084,11 +1084,11 @@
     add-int/2addr v10, v11
 
     :cond_35
-    iget v11, v3, Lorg/a/a/w;->bCG:I
+    iget v11, v3, Lorg/a/a/w;->bCQ:I
 
     if-lez v11, :cond_36
 
-    iget-object v3, v3, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v3, v3, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const-string v11, "ModuleMainClass"
 
@@ -1100,7 +1100,7 @@
     add-int/2addr v5, v10
 
     :cond_37
-    iget v3, v0, Lorg/a/a/h;->bAp:I
+    iget v3, v0, Lorg/a/a/h;->bAz:I
 
     if-eqz v3, :cond_38
 
@@ -1108,14 +1108,14 @@
 
     add-int/lit8 v5, v5, 0x8
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v10, "NestHost"
 
     invoke-virtual {v3, v10}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_38
-    iget-object v3, v0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v3, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     if-eqz v3, :cond_39
 
@@ -1127,26 +1127,26 @@
 
     add-int/2addr v5, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v10, "NestMembers"
 
     invoke-virtual {v3, v10}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     :cond_39
-    iget-object v3, v0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
 
     if-eqz v3, :cond_3a
 
-    invoke-virtual {v3}, Lorg/a/a/c;->HN()I
+    invoke-virtual {v3}, Lorg/a/a/c;->HQ()I
 
     move-result v3
 
     add-int/2addr v2, v3
 
-    iget-object v3, v0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
 
-    iget-object v10, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v10, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v10}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -1155,15 +1155,15 @@
     add-int/2addr v5, v3
 
     :cond_3a
-    iget-object v3, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget-object v3, v3, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v3, v3, Lorg/a/a/z;->bDe: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;->bzE:Lorg/a/a/z;
+    iget-object v3, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     iget v3, v3, Lorg/a/a/z;->constantPoolCount:I
 
@@ -1185,7 +1185,7 @@
 
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
-    iget-object v5, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v5, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     iget v10, v5, Lorg/a/a/z;->constantPoolCount:I
 
@@ -1193,11 +1193,11 @@
 
     move-result-object v10
 
-    iget-object v11, v5, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v11, v5, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     iget-object v11, v11, Lorg/a/a/d;->data:[B
 
-    iget-object v5, v5, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v5, v5, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -1223,7 +1223,7 @@
     const/4 v5, 0x0
 
     :goto_d
-    iget v10, v0, Lorg/a/a/h;->bzU:I
+    iget v10, v0, Lorg/a/a/h;->bAe:I
 
     xor-int/lit8 v5, v5, -0x1
 
@@ -1233,28 +1233,28 @@
 
     move-result-object v5
 
-    iget v10, v0, Lorg/a/a/h;->bzV:I
+    iget v10, v0, Lorg/a/a/h;->bAf:I
 
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget v10, v0, Lorg/a/a/h;->bzW:I
+    iget v10, v0, Lorg/a/a/h;->bAg:I
 
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v5, v0, Lorg/a/a/h;->bzX:I
+    iget v5, v0, Lorg/a/a/h;->bAh:I
 
     invoke-virtual {v3, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     const/4 v5, 0x0
 
     :goto_e
-    iget v10, v0, Lorg/a/a/h;->bzX:I
+    iget v10, v0, Lorg/a/a/h;->bAh:I
 
     if-ge v5, v10, :cond_3c
 
-    iget-object v10, v0, Lorg/a/a/h;->bzY:[I
+    iget-object v10, v0, Lorg/a/a/h;->bAi:[I
 
     aget v10, v10, v5
 
@@ -1267,14 +1267,14 @@
     :cond_3c
     invoke-virtual {v3, v1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/h;->bzZ:Lorg/a/a/n;
+    iget-object v1, v0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
 
     :goto_f
     if-eqz v1, :cond_51
 
-    iget-object v5, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iget v5, v5, Lorg/a/a/z;->bCR:I
+    iget v5, v5, Lorg/a/a/z;->bDb:I
 
     const/16 v10, 0x31
 
@@ -1298,7 +1298,7 @@
     const/4 v10, 0x0
 
     :goto_11
-    iget v11, v1, Lorg/a/a/n;->bzU:I
+    iget v11, v1, Lorg/a/a/n;->bAe:I
 
     xor-int/lit8 v10, v10, -0x1
 
@@ -1308,17 +1308,17 @@
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bAS:I
+    iget v11, v1, Lorg/a/a/n;->bBc:I
 
     invoke-virtual {v10, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bAT:I
+    iget v11, v1, Lorg/a/a/n;->bBd:I
 
     invoke-virtual {v10, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v10, v1, Lorg/a/a/n;->bAU:I
+    iget v10, v1, Lorg/a/a/n;->bBe:I
 
     if-eqz v10, :cond_3f
 
@@ -1330,7 +1330,7 @@
     const/4 v10, 0x0
 
     :goto_12
-    iget v11, v1, Lorg/a/a/n;->bzU:I
+    iget v11, v1, Lorg/a/a/n;->bAe:I
 
     const/16 v14, 0x1000
 
@@ -1343,14 +1343,14 @@
     add-int/lit8 v10, v10, 0x1
 
     :cond_40
-    iget v11, v1, Lorg/a/a/n;->bAh:I
+    iget v11, v1, Lorg/a/a/n;->bAr:I
 
     if-eqz v11, :cond_41
 
     add-int/lit8 v10, v10, 0x1
 
     :cond_41
-    iget v11, v1, Lorg/a/a/n;->bzU:I
+    iget v11, v1, Lorg/a/a/n;->bAe:I
 
     const/high16 v14, 0x20000
 
@@ -1361,41 +1361,41 @@
     add-int/lit8 v10, v10, 0x1
 
     :cond_42
-    iget-object v11, v1, Lorg/a/a/n;->bAk:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAu: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;->bAl:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAv: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;->bAm:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAw: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;->bAn:Lorg/a/a/b;
+    iget-object v11, v1, Lorg/a/a/n;->bAx: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;->bAs:Lorg/a/a/c;
+    iget-object v11, v1, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
     if-eqz v11, :cond_47
 
-    iget-object v11, v1, Lorg/a/a/n;->bAs:Lorg/a/a/c;
+    iget-object v11, v1, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
-    invoke-virtual {v11}, Lorg/a/a/c;->HN()I
+    invoke-virtual {v11}, Lorg/a/a/c;->HQ()I
 
     move-result v11
 
@@ -1404,11 +1404,11 @@
     :cond_47
     invoke-virtual {v3, v10}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v10, v1, Lorg/a/a/n;->bAU:I
+    iget v10, v1, Lorg/a/a/n;->bBe:I
 
     if-eqz v10, :cond_48
 
-    iget-object v10, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     const-string v11, "ConstantValue"
 
@@ -1426,12 +1426,12 @@
 
     move-result-object v10
 
-    iget v11, v1, Lorg/a/a/n;->bAU:I
+    iget v11, v1, Lorg/a/a/n;->bBe:I
 
     invoke-virtual {v10, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_48
-    iget v10, v1, Lorg/a/a/n;->bzU:I
+    iget v10, v1, Lorg/a/a/n;->bAe:I
 
     const/16 v11, 0x1000
 
@@ -1441,7 +1441,7 @@
 
     if-eqz v5, :cond_49
 
-    iget-object v5, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v8}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1456,11 +1456,11 @@
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
     :cond_49
-    iget v5, v1, Lorg/a/a/n;->bAh:I
+    iget v5, v1, Lorg/a/a/n;->bAr:I
 
     if-eqz v5, :cond_4a
 
-    iget-object v5, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v9}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1476,12 +1476,12 @@
 
     move-result-object v5
 
-    iget v10, v1, Lorg/a/a/n;->bAh:I
+    iget v10, v1, Lorg/a/a/n;->bAr:I
 
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_4a
-    iget v5, v1, Lorg/a/a/n;->bzU:I
+    iget v5, v1, Lorg/a/a/n;->bAe:I
 
     const/high16 v10, 0x20000
 
@@ -1489,7 +1489,7 @@
 
     if-eqz v5, :cond_4b
 
-    iget-object v5, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v7}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1504,13 +1504,13 @@
     invoke-virtual {v5, v10}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
     :cond_4b
-    iget-object v5, v1, Lorg/a/a/n;->bAk:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAu:Lorg/a/a/b;
 
     if-eqz v5, :cond_4c
 
-    iget-object v5, v1, Lorg/a/a/n;->bAk:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAu:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v10, v6}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1519,13 +1519,13 @@
     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;->bAl:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAv:Lorg/a/a/b;
 
     if-eqz v5, :cond_4d
 
-    iget-object v5, v1, Lorg/a/a/n;->bAl:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAv:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     const-string v11, "RuntimeInvisibleAnnotations"
 
@@ -1536,13 +1536,13 @@
     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;->bAm:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAw:Lorg/a/a/b;
 
     if-eqz v5, :cond_4e
 
-    iget-object v5, v1, Lorg/a/a/n;->bAm:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAw:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v10, v13}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1551,13 +1551,13 @@
     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;->bAn:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAx:Lorg/a/a/b;
 
     if-eqz v5, :cond_4f
 
-    iget-object v5, v1, Lorg/a/a/n;->bAn:Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/n;->bAx:Lorg/a/a/b;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v10, v12}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1566,18 +1566,18 @@
     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;->bAs:Lorg/a/a/c;
+    iget-object v5, v1, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
     if-eqz v5, :cond_50
 
-    iget-object v5, v1, Lorg/a/a/n;->bAs:Lorg/a/a/c;
+    iget-object v5, v1, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
-    iget-object v10, v1, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/n;->bzO: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;->bAR:Lorg/a/a/m;
+    iget-object v1, v1, Lorg/a/a/n;->bBb:Lorg/a/a/m;
 
     check-cast v1, Lorg/a/a/n;
 
@@ -1586,7 +1586,7 @@
     :cond_51
     invoke-virtual {v3, v4}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/h;->bAb:Lorg/a/a/u;
+    iget-object v1, v0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
 
     const/4 v4, 0x0
 
@@ -1595,7 +1595,7 @@
     :goto_13
     if-eqz v1, :cond_85
 
-    iget v10, v1, Lorg/a/a/u;->bBO:I
+    iget v10, v1, Lorg/a/a/u;->bBY:I
 
     if-lez v10, :cond_52
 
@@ -1609,13 +1609,13 @@
     :goto_14
     or-int/2addr v4, v10
 
-    iget-boolean v10, v1, Lorg/a/a/u;->bCm:Z
+    iget-boolean v10, v1, Lorg/a/a/u;->bCw:Z
 
     or-int/2addr v5, v10
 
-    iget-object v10, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v10, v10, Lorg/a/a/z;->bCR:I
+    iget v10, v10, Lorg/a/a/z;->bDb:I
 
     const/16 v11, 0x31
 
@@ -1639,7 +1639,7 @@
     const/4 v11, 0x0
 
     :goto_16
-    iget v14, v1, Lorg/a/a/u;->bzU:I
+    iget v14, v1, Lorg/a/a/u;->bAe:I
 
     xor-int/lit8 v11, v11, -0x1
 
@@ -1649,29 +1649,29 @@
 
     move-result-object v11
 
-    iget v14, v1, Lorg/a/a/u;->bAS:I
+    iget v14, v1, Lorg/a/a/u;->bBc:I
 
     invoke-virtual {v11, v14}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v11
 
-    iget v14, v1, Lorg/a/a/u;->bAT:I
+    iget v14, v1, Lorg/a/a/u;->bBd:I
 
     invoke-virtual {v11, v14}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget v11, v1, Lorg/a/a/u;->bCo:I
+    iget v11, v1, Lorg/a/a/u;->bCy:I
 
     if-eqz v11, :cond_55
 
-    iget-object v10, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v10, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v10, v10, Lorg/a/a/z;->bCQ:Lorg/a/a/e;
+    iget-object v10, v10, Lorg/a/a/z;->bDa:Lorg/a/a/e;
 
-    iget-object v10, v10, Lorg/a/a/e;->bzN:[B
+    iget-object v10, v10, Lorg/a/a/e;->bzX:[B
 
-    iget v11, v1, Lorg/a/a/u;->bCo:I
+    iget v11, v1, Lorg/a/a/u;->bCy:I
 
-    iget v14, v1, Lorg/a/a/u;->bCp:I
+    iget v14, v1, Lorg/a/a/u;->bCz:I
 
     invoke-virtual {v3, v10, v11, v14}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
@@ -1684,7 +1684,7 @@
     goto/16 :goto_22
 
     :cond_55
-    iget-object v11, v1, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -1698,14 +1698,14 @@
     const/4 v11, 0x0
 
     :goto_17
-    iget v14, v1, Lorg/a/a/u;->bBT:I
+    iget v14, v1, Lorg/a/a/u;->bCd:I
 
     if-lez v14, :cond_57
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_57
-    iget v14, v1, Lorg/a/a/u;->bzU:I
+    iget v14, v1, Lorg/a/a/u;->bAe:I
 
     const/16 v15, 0x1000
 
@@ -1718,14 +1718,14 @@
     add-int/lit8 v11, v11, 0x1
 
     :cond_58
-    iget v14, v1, Lorg/a/a/u;->bAh:I
+    iget v14, v1, Lorg/a/a/u;->bAr:I
 
     if-eqz v14, :cond_59
 
     add-int/lit8 v11, v11, 0x1
 
     :cond_59
-    iget v14, v1, Lorg/a/a/u;->bzU:I
+    iget v14, v1, Lorg/a/a/u;->bAe:I
 
     const/high16 v15, 0x20000
 
@@ -1736,69 +1736,69 @@
     add-int/lit8 v11, v11, 0x1
 
     :cond_5a
-    iget-object v14, v1, Lorg/a/a/u;->bAk:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAu: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;->bAl:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAv: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;->bBW:[Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bCg:[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;->bBY:[Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bCi:[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;->bAm:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAw: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;->bAn:Lorg/a/a/b;
+    iget-object v14, v1, Lorg/a/a/u;->bAx: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;->bBZ:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bCj: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;->bCb:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bCl: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;->bAs:Lorg/a/a/c;
+    iget-object v14, v1, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
     if-eqz v14, :cond_63
 
-    iget-object v14, v1, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v14, v1, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
-    invoke-virtual {v14}, Lorg/a/a/c;->HN()I
+    invoke-virtual {v14}, Lorg/a/a/c;->HQ()I
 
     move-result v14
 
@@ -1807,19 +1807,19 @@
     :cond_63
     invoke-virtual {v3, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v11, v1, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBP: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;->bBF:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBP: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;->bBG:Lorg/a/a/q;
+    iget-object v14, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     invoke-static {v14}, Lorg/a/a/q;->b(Lorg/a/a/q;)I
 
@@ -1827,11 +1827,11 @@
 
     add-int/2addr v11, v14
 
-    iget-object v14, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     if-eqz v14, :cond_64
 
-    iget-object v14, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v14, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     iget v14, v14, Lorg/a/a/d;->length:I
 
@@ -1849,11 +1849,11 @@
     const/4 v14, 0x0
 
     :goto_18
-    iget-object v15, v1, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     if-eqz v15, :cond_65
 
-    iget-object v15, v1, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -1871,11 +1871,11 @@
     const/16 v17, 0x8
 
     :goto_19
-    iget-object v15, v1, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     if-eqz v15, :cond_66
 
-    iget-object v15, v1, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -1886,11 +1886,11 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_66
-    iget-object v15, v1, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     if-eqz v15, :cond_67
 
-    iget-object v15, v1, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -1901,11 +1901,11 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_67
-    iget-object v15, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     if-eqz v15, :cond_68
 
-    iget-object v15, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     invoke-virtual {v15, v13}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -1916,11 +1916,11 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_68
-    iget-object v15, v1, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     if-eqz v15, :cond_69
 
-    iget-object v15, v1, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object v15, v1, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     invoke-virtual {v15, v12}, Lorg/a/a/b;->eo(Ljava/lang/String;)I
 
@@ -1931,15 +1931,15 @@
     add-int/lit8 v14, v14, 0x1
 
     :cond_69
-    iget-object v15, v1, Lorg/a/a/u;->bBS:Lorg/a/a/c;
+    iget-object v15, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
     if-eqz v15, :cond_6a
 
-    iget-object v15, v1, Lorg/a/a/u;->bBS:Lorg/a/a/c;
+    iget-object v15, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
     move/from16 v18, v4
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v15, v4}, Lorg/a/a/c;->a(Lorg/a/a/z;)I
 
@@ -1947,9 +1947,9 @@
 
     add-int/2addr v11, v4
 
-    iget-object v4, v1, Lorg/a/a/u;->bBS:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
-    invoke-virtual {v4}, Lorg/a/a/c;->HN()I
+    invoke-virtual {v4}, Lorg/a/a/c;->HQ()I
 
     move-result v4
 
@@ -1961,7 +1961,7 @@
     move/from16 v18, v4
 
     :goto_1a
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v15, "Code"
 
@@ -1977,19 +1977,19 @@
 
     move-result-object v4
 
-    iget v11, v1, Lorg/a/a/u;->bBD:I
+    iget v11, v1, Lorg/a/a/u;->bBN:I
 
     invoke-virtual {v4, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget v11, v1, Lorg/a/a/u;->bBE:I
+    iget v11, v1, Lorg/a/a/u;->bBO:I
 
     invoke-virtual {v4, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v11, v1, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -1997,11 +1997,11 @@
 
     move-result-object v4
 
-    iget-object v11, v1, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget-object v11, v11, Lorg/a/a/d;->data:[B
 
-    iget-object v15, v1, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v15, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v15, v15, Lorg/a/a/d;->length:I
 
@@ -2011,7 +2011,7 @@
 
     invoke-virtual {v4, v11, v5, v15}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bBG:Lorg/a/a/q;
+    iget-object v4, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     invoke-static {v4}, Lorg/a/a/q;->a(Lorg/a/a/q;)I
 
@@ -2022,48 +2022,48 @@
     :goto_1b
     if-eqz v4, :cond_6b
 
-    iget-object v5, v4, Lorg/a/a/q;->bBh:Lorg/a/a/r;
+    iget-object v5, v4, Lorg/a/a/q;->bBr:Lorg/a/a/r;
 
-    iget v5, v5, Lorg/a/a/r;->bBr:I
+    iget v5, v5, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v3, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget-object v11, v4, Lorg/a/a/q;->bBi:Lorg/a/a/r;
+    iget-object v11, v4, Lorg/a/a/q;->bBs:Lorg/a/a/r;
 
-    iget v11, v11, Lorg/a/a/r;->bBr:I
+    iget v11, v11, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v5, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget-object v11, v4, Lorg/a/a/q;->bBj:Lorg/a/a/r;
+    iget-object v11, v4, Lorg/a/a/q;->bBt:Lorg/a/a/r;
 
-    iget v11, v11, Lorg/a/a/r;->bBr:I
+    iget v11, v11, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v5, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v5
 
-    iget v11, v4, Lorg/a/a/q;->bBk:I
+    iget v11, v4, Lorg/a/a/q;->bBu:I
 
     invoke-virtual {v5, v11}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v4, v4, Lorg/a/a/q;->bBm:Lorg/a/a/q;
+    iget-object v4, v4, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     goto :goto_1b
 
     :cond_6b
     invoke-virtual {v3, v14}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     if-eqz v4, :cond_6e
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bCR:I
+    iget v4, v4, Lorg/a/a/z;->bDb:I
 
     const/16 v5, 0x32
 
@@ -2077,7 +2077,7 @@
     const/4 v4, 0x0
 
     :goto_1c
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     if-eqz v4, :cond_6d
 
@@ -2097,7 +2097,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2109,17 +2109,17 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bBO:I
+    iget v5, v1, Lorg/a/a/u;->bBY:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2128,11 +2128,11 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_6e
-    iget-object v4, v1, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     if-eqz v4, :cond_6f
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "LineNumberTable"
 
@@ -2144,7 +2144,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2156,17 +2156,17 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bBI:I
+    iget v5, v1, Lorg/a/a/u;->bBS:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2175,11 +2175,11 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_6f
-    iget-object v4, v1, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     if-eqz v4, :cond_70
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "LocalVariableTable"
 
@@ -2191,7 +2191,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2203,17 +2203,17 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bBK:I
+    iget v5, v1, Lorg/a/a/u;->bBU:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2222,11 +2222,11 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_70
-    iget-object v4, v1, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     if-eqz v4, :cond_71
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "LocalVariableTypeTable"
 
@@ -2238,7 +2238,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2250,17 +2250,17 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bBM:I
+    iget v5, v1, Lorg/a/a/u;->bBW:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v11, v1, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v11, v1, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     iget v11, v11, Lorg/a/a/d;->length:I
 
@@ -2269,13 +2269,13 @@
     invoke-virtual {v4, v5, v14, v11}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_71
-    iget-object v4, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     if-eqz v4, :cond_72
 
-    iget-object v4, v1, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v13}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2284,13 +2284,13 @@
     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;->bBR:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     if-eqz v4, :cond_73
 
-    iget-object v4, v1, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v12}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2299,13 +2299,13 @@
     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;->bBS:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
     if-eqz v4, :cond_75
 
-    iget-object v4, v1, Lorg/a/a/u;->bBS:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bCc:Lorg/a/a/c;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v5, v3}, Lorg/a/a/c;->a(Lorg/a/a/z;Lorg/a/a/d;)V
 
@@ -2320,11 +2320,11 @@
 
     :cond_75
     :goto_1e
-    iget v4, v1, Lorg/a/a/u;->bBT:I
+    iget v4, v1, Lorg/a/a/u;->bCd:I
 
     if-lez v4, :cond_76
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "Exceptions"
 
@@ -2336,7 +2336,7 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bBT:I
+    iget v5, v1, Lorg/a/a/u;->bCd:I
 
     const/4 v11, 0x2
 
@@ -2348,11 +2348,11 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bBT:I
+    iget v5, v1, Lorg/a/a/u;->bCd:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v4, v1, Lorg/a/a/u;->bBU:[I
+    iget-object v4, v1, Lorg/a/a/u;->bCe:[I
 
     array-length v5, v4
 
@@ -2370,7 +2370,7 @@
     goto :goto_1f
 
     :cond_76
-    iget v4, v1, Lorg/a/a/u;->bzU:I
+    iget v4, v1, Lorg/a/a/u;->bAe:I
 
     const/16 v5, 0x1000
 
@@ -2380,7 +2380,7 @@
 
     if-eqz v10, :cond_77
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v8}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2395,11 +2395,11 @@
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
     :cond_77
-    iget v4, v1, Lorg/a/a/u;->bAh:I
+    iget v4, v1, Lorg/a/a/u;->bAr:I
 
     if-eqz v4, :cond_78
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v9}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2415,12 +2415,12 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bAh:I
+    iget v5, v1, Lorg/a/a/u;->bAr:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_78
-    iget v4, v1, Lorg/a/a/u;->bzU:I
+    iget v4, v1, Lorg/a/a/u;->bAe:I
 
     const/high16 v5, 0x20000
 
@@ -2428,7 +2428,7 @@
 
     if-eqz v4, :cond_79
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v7}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2443,13 +2443,13 @@
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
     :cond_79
-    iget-object v4, v1, Lorg/a/a/u;->bAk:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAu:Lorg/a/a/b;
 
     if-eqz v4, :cond_7a
 
-    iget-object v4, v1, Lorg/a/a/u;->bAk:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAu:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v6}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2458,13 +2458,13 @@
     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;->bAl:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAv:Lorg/a/a/b;
 
     if-eqz v4, :cond_7b
 
-    iget-object v4, v1, Lorg/a/a/u;->bAl:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAv:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v10, "RuntimeInvisibleAnnotations"
 
@@ -2475,11 +2475,11 @@
     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;->bBW:[Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     if-eqz v4, :cond_7d
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "RuntimeVisibleParameterAnnotations"
 
@@ -2487,30 +2487,30 @@
 
     move-result v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
-    iget v10, v1, Lorg/a/a/u;->bBV:I
+    iget v10, v1, Lorg/a/a/u;->bCf:I
 
     if-nez v10, :cond_7c
 
-    iget-object v10, v1, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object v10, v1, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     array-length v10, v10
 
     goto :goto_20
 
     :cond_7c
-    iget v10, v1, Lorg/a/a/u;->bBV:I
+    iget v10, v1, Lorg/a/a/u;->bCf: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;->bBY:[Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     if-eqz v4, :cond_7f
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "RuntimeInvisibleParameterAnnotations"
 
@@ -2518,32 +2518,32 @@
 
     move-result v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object v5, v1, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
-    iget v10, v1, Lorg/a/a/u;->bBX:I
+    iget v10, v1, Lorg/a/a/u;->bCh:I
 
     if-nez v10, :cond_7e
 
-    iget-object v10, v1, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object v10, v1, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     array-length v10, v10
 
     goto :goto_21
 
     :cond_7e
-    iget v10, v1, Lorg/a/a/u;->bBX:I
+    iget v10, v1, Lorg/a/a/u;->bCh: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;->bAm:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAw:Lorg/a/a/b;
 
     if-eqz v4, :cond_80
 
-    iget-object v4, v1, Lorg/a/a/u;->bAm:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAw:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v13}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2552,13 +2552,13 @@
     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;->bAn:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAx:Lorg/a/a/b;
 
     if-eqz v4, :cond_81
 
-    iget-object v4, v1, Lorg/a/a/u;->bAn:Lorg/a/a/b;
+    iget-object v4, v1, Lorg/a/a/u;->bAx:Lorg/a/a/b;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v5, v12}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2567,11 +2567,11 @@
     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;->bBZ:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     if-eqz v4, :cond_82
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "AnnotationDefault"
 
@@ -2583,7 +2583,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2591,11 +2591,11 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v1, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v10, v1, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -2604,11 +2604,11 @@
     invoke-virtual {v4, v5, v11, v10}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_82
-    iget-object v4, v1, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v4, v1, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     if-eqz v4, :cond_83
 
-    iget-object v4, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v1, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v5, "MethodParameters"
 
@@ -2620,7 +2620,7 @@
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     iget v5, v5, Lorg/a/a/d;->length:I
 
@@ -2630,17 +2630,17 @@
 
     move-result-object v4
 
-    iget v5, v1, Lorg/a/a/u;->bCa:I
+    iget v5, v1, Lorg/a/a/u;->bCk:I
 
     invoke-virtual {v4, v5}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
     move-result-object v4
 
-    iget-object v5, v1, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v5, v1, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     iget-object v5, v5, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v1, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v10, v1, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -2649,19 +2649,19 @@
     invoke-virtual {v4, v5, v11, v10}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_83
-    iget-object v4, v1, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
     if-eqz v4, :cond_84
 
-    iget-object v4, v1, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v4, v1, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
-    iget-object v5, v1, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v5, v1, Lorg/a/a/u;->bzO: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;->bBB:Lorg/a/a/t;
+    iget-object v1, v1, Lorg/a/a/u;->bBL:Lorg/a/a/t;
 
     check-cast v1, Lorg/a/a/u;
 
@@ -2678,11 +2678,11 @@
 
     invoke-virtual {v3, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v1, v0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     if-eqz v1, :cond_86
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v2, "InnerClasses"
 
@@ -2694,7 +2694,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -2706,17 +2706,17 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAd:I
+    iget v2, v0, Lorg/a/a/h;->bAn:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v10, v0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v10, v0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     iget v10, v10, Lorg/a/a/d;->length:I
 
@@ -2725,11 +2725,11 @@
     invoke-virtual {v1, v2, v11, v10}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_86
-    iget v1, v0, Lorg/a/a/h;->bAf:I
+    iget v1, v0, Lorg/a/a/h;->bAp:I
 
     if-eqz v1, :cond_87
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v2, "EnclosingMethod"
 
@@ -2747,18 +2747,18 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAf:I
+    iget v2, v0, Lorg/a/a/h;->bAp:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAg:I
+    iget v2, v0, Lorg/a/a/h;->bAq:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_87
-    iget v1, v0, Lorg/a/a/h;->bzU:I
+    iget v1, v0, Lorg/a/a/h;->bAe:I
 
     const/16 v2, 0x1000
 
@@ -2776,7 +2776,7 @@
 
     if-ge v1, v2, :cond_88
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, v8}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2791,11 +2791,11 @@
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
     :cond_88
-    iget v1, v0, Lorg/a/a/h;->bAh:I
+    iget v1, v0, Lorg/a/a/h;->bAr:I
 
     if-eqz v1, :cond_89
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, v9}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2811,7 +2811,7 @@
 
     move-result-object v1
 
-    iget v8, v0, Lorg/a/a/h;->bAh:I
+    iget v8, v0, Lorg/a/a/h;->bAr:I
 
     invoke-virtual {v1, v8}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -2821,11 +2821,11 @@
     const/4 v2, 0x2
 
     :goto_23
-    iget v1, v0, Lorg/a/a/h;->bAi:I
+    iget v1, v0, Lorg/a/a/h;->bAs:I
 
     if-eqz v1, :cond_8a
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v8, "SourceFile"
 
@@ -2841,18 +2841,18 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAi:I
+    iget v2, v0, Lorg/a/a/h;->bAs:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_8a
-    iget-object v1, v0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bAt: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;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v8, "SourceDebugExtension"
 
@@ -2868,7 +2868,7 @@
 
     move-result-object v2
 
-    iget-object v8, v0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
+    iget-object v8, v0, Lorg/a/a/h;->bAt:Lorg/a/a/d;
 
     iget-object v8, v8, Lorg/a/a/d;->data:[B
 
@@ -2882,7 +2882,7 @@
     const/4 v9, 0x0
 
     :goto_24
-    iget v1, v0, Lorg/a/a/h;->bzU:I
+    iget v1, v0, Lorg/a/a/h;->bAe:I
 
     const/high16 v2, 0x20000
 
@@ -2890,7 +2890,7 @@
 
     if-eqz v1, :cond_8c
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, v7}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2903,11 +2903,11 @@
     invoke-virtual {v1, v9}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
     :cond_8c
-    iget-object v1, v0, Lorg/a/a/h;->bAk:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAu:Lorg/a/a/b;
 
     if-eqz v1, :cond_8d
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, v6}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2916,11 +2916,11 @@
     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;->bAl:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAv:Lorg/a/a/b;
 
     if-eqz v1, :cond_8e
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v6, "RuntimeInvisibleAnnotations"
 
@@ -2931,11 +2931,11 @@
     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;->bAm:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAw:Lorg/a/a/b;
 
     if-eqz v1, :cond_8f
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, v13}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2944,11 +2944,11 @@
     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;->bAn:Lorg/a/a/b;
+    iget-object v1, v0, Lorg/a/a/h;->bAx:Lorg/a/a/b;
 
     if-eqz v1, :cond_90
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, v12}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2957,9 +2957,9 @@
     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;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget-object v2, v1, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v2, v1, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     if-eqz v2, :cond_91
 
@@ -2973,7 +2973,7 @@
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
@@ -2985,17 +2985,17 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/z;->bCV:I
+    iget v6, v1, Lorg/a/a/z;->bDf:I
 
     invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     iget-object v6, v6, Lorg/a/a/d;->data:[B
 
-    iget-object v1, v1, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v1, v1, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
@@ -3004,41 +3004,41 @@
     invoke-virtual {v2, v6, v7, v1}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_91
-    iget-object v1, v0, Lorg/a/a/h;->bAo:Lorg/a/a/w;
+    iget-object v1, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
 
     if-eqz v1, :cond_93
 
-    iget-object v2, v1, Lorg/a/a/w;->bCv:Lorg/a/a/d;
+    iget-object v2, v1, Lorg/a/a/w;->bCF: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;->bCx:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCH: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;->bCz:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCJ: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;->bCB:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCL: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;->bCD:Lorg/a/a/d;
+    iget-object v6, v1, Lorg/a/a/w;->bCN: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;->bzE:Lorg/a/a/z;
+    iget-object v6, v1, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const-string v7, "Module"
 
@@ -3054,139 +3054,21 @@
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCr:I
+    iget v6, v1, Lorg/a/a/w;->bCB:I
 
     invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget v6, v1, Lorg/a/a/w;->bCs:I
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget v6, v1, Lorg/a/a/w;->bCt:I
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget v6, v1, Lorg/a/a/w;->bCu:I
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget-object v6, v1, Lorg/a/a/w;->bCv:Lorg/a/a/d;
-
-    iget-object v6, v6, Lorg/a/a/d;->data:[B
-
-    iget-object v7, v1, Lorg/a/a/w;->bCv:Lorg/a/a/d;
-
-    iget v7, v7, Lorg/a/a/d;->length:I
-
-    const/4 v8, 0x0
-
-    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget v6, v1, Lorg/a/a/w;->bCw:I
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget-object v6, v1, Lorg/a/a/w;->bCx:Lorg/a/a/d;
-
-    iget-object v6, v6, Lorg/a/a/d;->data:[B
-
-    iget-object v7, v1, Lorg/a/a/w;->bCx:Lorg/a/a/d;
-
-    iget v7, v7, Lorg/a/a/d;->length:I
-
-    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget v6, v1, Lorg/a/a/w;->bCy:I
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget-object v6, v1, Lorg/a/a/w;->bCz:Lorg/a/a/d;
-
-    iget-object v6, v6, Lorg/a/a/d;->data:[B
-
-    iget-object v7, v1, Lorg/a/a/w;->bCz:Lorg/a/a/d;
-
-    iget v7, v7, Lorg/a/a/d;->length:I
-
-    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget v6, v1, Lorg/a/a/w;->bCA:I
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget-object v6, v1, Lorg/a/a/w;->bCB:Lorg/a/a/d;
-
-    iget-object v6, v6, Lorg/a/a/d;->data:[B
-
-    iget-object v7, v1, Lorg/a/a/w;->bCB:Lorg/a/a/d;
-
-    iget v7, v7, Lorg/a/a/d;->length:I
-
-    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
-
-    move-result-object v2
-
     iget v6, v1, Lorg/a/a/w;->bCC:I
 
     invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v2
 
-    iget-object v6, v1, Lorg/a/a/w;->bCD:Lorg/a/a/d;
+    iget v6, v1, Lorg/a/a/w;->bCD:I
 
-    iget-object v6, v6, Lorg/a/a/d;->data:[B
-
-    iget-object v7, v1, Lorg/a/a/w;->bCD:Lorg/a/a/d;
-
-    iget v7, v7, Lorg/a/a/d;->length:I
-
-    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
-
-    iget v2, v1, Lorg/a/a/w;->bCE:I
-
-    if-lez v2, :cond_92
-
-    iget-object v2, v1, Lorg/a/a/w;->bzE:Lorg/a/a/z;
-
-    const-string v6, "ModulePackages"
-
-    invoke-virtual {v2, v6}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
-
-    move-result v2
-
-    invoke-virtual {v3, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
-
-    move-result-object v2
-
-    iget-object v6, v1, Lorg/a/a/w;->bCF:Lorg/a/a/d;
-
-    iget v6, v6, Lorg/a/a/d;->length:I
-
-    const/4 v7, 0x2
-
-    add-int/2addr v6, v7
-
-    invoke-virtual {v2, v6}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v2
 
@@ -3208,12 +3090,130 @@
 
     invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
+    move-result-object v2
+
+    iget v6, v1, Lorg/a/a/w;->bCG:I
+
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget-object v6, v1, Lorg/a/a/w;->bCH:Lorg/a/a/d;
+
+    iget-object v6, v6, Lorg/a/a/d;->data:[B
+
+    iget-object v7, v1, Lorg/a/a/w;->bCH:Lorg/a/a/d;
+
+    iget v7, v7, Lorg/a/a/d;->length:I
+
+    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget v6, v1, Lorg/a/a/w;->bCI:I
+
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget-object v6, v1, Lorg/a/a/w;->bCJ:Lorg/a/a/d;
+
+    iget-object v6, v6, Lorg/a/a/d;->data:[B
+
+    iget-object v7, v1, Lorg/a/a/w;->bCJ:Lorg/a/a/d;
+
+    iget v7, v7, Lorg/a/a/d;->length:I
+
+    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget v6, v1, Lorg/a/a/w;->bCK:I
+
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget-object v6, v1, Lorg/a/a/w;->bCL:Lorg/a/a/d;
+
+    iget-object v6, v6, Lorg/a/a/d;->data:[B
+
+    iget-object v7, v1, Lorg/a/a/w;->bCL:Lorg/a/a/d;
+
+    iget v7, v7, Lorg/a/a/d;->length:I
+
+    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget v6, v1, Lorg/a/a/w;->bCM:I
+
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget-object v6, v1, Lorg/a/a/w;->bCN:Lorg/a/a/d;
+
+    iget-object v6, v6, Lorg/a/a/d;->data:[B
+
+    iget-object v7, v1, Lorg/a/a/w;->bCN:Lorg/a/a/d;
+
+    iget v7, v7, Lorg/a/a/d;->length:I
+
+    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
+
+    iget v2, v1, Lorg/a/a/w;->bCO:I
+
+    if-lez v2, :cond_92
+
+    iget-object v2, v1, Lorg/a/a/w;->bzO:Lorg/a/a/z;
+
+    const-string v6, "ModulePackages"
+
+    invoke-virtual {v2, v6}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
+
+    move-result v2
+
+    invoke-virtual {v3, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget-object v6, v1, Lorg/a/a/w;->bCP:Lorg/a/a/d;
+
+    iget v6, v6, Lorg/a/a/d;->length:I
+
+    const/4 v7, 0x2
+
+    add-int/2addr v6, v7
+
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget v6, v1, Lorg/a/a/w;->bCO:I
+
+    invoke-virtual {v2, v6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
+
+    move-result-object v2
+
+    iget-object v6, v1, Lorg/a/a/w;->bCP:Lorg/a/a/d;
+
+    iget-object v6, v6, Lorg/a/a/d;->data:[B
+
+    iget-object v7, v1, Lorg/a/a/w;->bCP:Lorg/a/a/d;
+
+    iget v7, v7, Lorg/a/a/d;->length:I
+
+    const/4 v8, 0x0
+
+    invoke-virtual {v2, v6, v8, v7}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
+
     :cond_92
-    iget v2, v1, Lorg/a/a/w;->bCG:I
+    iget v2, v1, Lorg/a/a/w;->bCQ:I
 
     if-lez v2, :cond_93
 
-    iget-object v2, v1, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v2, v1, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const-string v6, "ModuleMainClass"
 
@@ -3231,16 +3231,16 @@
 
     move-result-object v2
 
-    iget v1, v1, Lorg/a/a/w;->bCG:I
+    iget v1, v1, Lorg/a/a/w;->bCQ:I
 
     invoke-virtual {v2, v1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_93
-    iget v1, v0, Lorg/a/a/h;->bAp:I
+    iget v1, v0, Lorg/a/a/h;->bAz:I
 
     if-eqz v1, :cond_94
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v2, "NestHost"
 
@@ -3258,16 +3258,16 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAp:I
+    iget v2, v0, Lorg/a/a/h;->bAz:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_94
-    iget-object v1, v0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     if-eqz v1, :cond_95
 
-    iget-object v1, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const-string v2, "NestMembers"
 
@@ -3279,7 +3279,7 @@
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     iget v2, v2, Lorg/a/a/d;->length:I
 
@@ -3291,17 +3291,17 @@
 
     move-result-object v1
 
-    iget v2, v0, Lorg/a/a/h;->bAq:I
+    iget v2, v0, Lorg/a/a/h;->bAA:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget-object v2, v0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v6, v0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v6, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     iget v6, v6, Lorg/a/a/d;->length:I
 
@@ -3310,11 +3310,11 @@
     invoke-virtual {v1, v2, v7, v6}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
     :cond_95
-    iget-object v1, v0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iget-object v1, v0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
 
     if-eqz v1, :cond_96
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, v2, v3}, Lorg/a/a/c;->a(Lorg/a/a/z;Lorg/a/a/d;)V
 
@@ -3327,40 +3327,40 @@
 
     invoke-direct {v2}, Lorg/a/a/c$a;-><init>()V
 
-    iget-object v3, v0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iget-object v3, v0, Lorg/a/a/h;->bAC: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;->bzZ:Lorg/a/a/n;
+    iget-object v3, v0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
 
     :goto_25
     if-eqz v3, :cond_97
 
-    iget-object v5, v3, Lorg/a/a/n;->bAs:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/n;->bAC: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;->bAR:Lorg/a/a/m;
+    iget-object v3, v3, Lorg/a/a/n;->bBb:Lorg/a/a/m;
 
     check-cast v3, Lorg/a/a/n;
 
     goto :goto_25
 
     :cond_97
-    iget-object v3, v0, Lorg/a/a/h;->bAb:Lorg/a/a/u;
+    iget-object v3, v0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
 
     :goto_26
     if-eqz v3, :cond_98
 
-    iget-object v5, v3, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/u;->bAC: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;->bBS:Lorg/a/a/c;
+    iget-object v5, v3, Lorg/a/a/u;->bCc: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;->bBB:Lorg/a/a/t;
+    iget-object v3, v3, Lorg/a/a/u;->bBL:Lorg/a/a/t;
 
     check-cast v3, Lorg/a/a/u;
 
@@ -3371,7 +3371,7 @@
 
     new-array v3, v3, [Lorg/a/a/c;
 
-    iget-object v5, v2, Lorg/a/a/c$a;->bzM:[Lorg/a/a/c;
+    iget-object v5, v2, Lorg/a/a/c$a;->bzW:[Lorg/a/a/c;
 
     iget v2, v2, Lorg/a/a/c$a;->size:I
 
@@ -3381,31 +3381,31 @@
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lorg/a/a/h;->bzZ:Lorg/a/a/n;
+    iput-object v2, v0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAa:Lorg/a/a/n;
+    iput-object v2, v0, Lorg/a/a/h;->bAk:Lorg/a/a/n;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAb:Lorg/a/a/u;
+    iput-object v2, v0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAc:Lorg/a/a/u;
+    iput-object v2, v0, Lorg/a/a/h;->bAm:Lorg/a/a/u;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAk:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bAu:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAl:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bAv:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAm:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bAw:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAn:Lorg/a/a/b;
+    iput-object v2, v0, Lorg/a/a/h;->bAx:Lorg/a/a/b;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAo:Lorg/a/a/w;
+    iput-object v2, v0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
 
-    iput v14, v0, Lorg/a/a/h;->bAp:I
+    iput v14, v0, Lorg/a/a/h;->bAz:I
 
-    iput v14, v0, Lorg/a/a/h;->bAq:I
+    iput v14, v0, Lorg/a/a/h;->bAA:I
 
-    iput-object v2, v0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iput-object v2, v0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
-    iput-object v2, v0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iput-object v2, v0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
 
     if-eqz v4, :cond_99
 
@@ -3417,7 +3417,7 @@
     const/4 v2, 0x0
 
     :goto_27
-    iput v2, v0, Lorg/a/a/h;->bAt:I
+    iput v2, v0, Lorg/a/a/h;->bAD:I
 
     new-instance v2, Lorg/a/a/e;
 
@@ -3442,7 +3442,7 @@
     :cond_9c
     new-instance v1, Lorg/a/a/f;
 
-    iget-object v2, v0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, v0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     iget-object v2, v2, Lorg/a/a/z;->className:Ljava/lang/String;
 
@@ -3468,7 +3468,7 @@
 
     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;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -3486,26 +3486,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/h;->bAm:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/h;->bAw: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;->bAm:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAw:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/h;->bAn:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/h;->bAx: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;->bAn:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAx:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -3515,7 +3515,7 @@
 
     new-instance v7, Lorg/a/a/n;
 
-    iget-object v1, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     move-object v0, v7
 
@@ -3531,21 +3531,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;->bzZ:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
 
     if-nez p1, :cond_0
 
-    iput-object v7, p0, Lorg/a/a/h;->bzZ:Lorg/a/a/n;
+    iput-object v7, p0, Lorg/a/a/h;->bAj:Lorg/a/a/n;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/h;->bAa:Lorg/a/a/n;
+    iget-object p1, p0, Lorg/a/a/h;->bAk:Lorg/a/a/n;
 
-    iput-object v7, p1, Lorg/a/a/n;->bAR:Lorg/a/a/m;
+    iput-object v7, p1, Lorg/a/a/n;->bBb:Lorg/a/a/m;
 
     :goto_0
-    iput-object v7, p0, Lorg/a/a/h;->bAa:Lorg/a/a/n;
+    iput-object v7, p0, Lorg/a/a/h;->bAk:Lorg/a/a/n;
 
     return-object v7
 .end method
@@ -3555,9 +3555,9 @@
 
     new-instance v8, Lorg/a/a/u;
 
-    iget-object v1, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget v7, p0, Lorg/a/a/h;->bAt:I
+    iget v7, p0, Lorg/a/a/h;->bAD:I
 
     move-object v0, v8
 
@@ -3573,21 +3573,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;->bAb:Lorg/a/a/u;
+    iget-object p1, p0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
 
     if-nez p1, :cond_0
 
-    iput-object v8, p0, Lorg/a/a/h;->bAb:Lorg/a/a/u;
+    iput-object v8, p0, Lorg/a/a/h;->bAl:Lorg/a/a/u;
 
     goto :goto_0
 
     :cond_0
-    iget-object p1, p0, Lorg/a/a/h;->bAc:Lorg/a/a/u;
+    iget-object p1, p0, Lorg/a/a/h;->bAm:Lorg/a/a/u;
 
-    iput-object v8, p1, Lorg/a/a/u;->bBB:Lorg/a/a/t;
+    iput-object v8, p1, Lorg/a/a/u;->bBL:Lorg/a/a/t;
 
     :goto_0
-    iput-object v8, p0, Lorg/a/a/h;->bAc:Lorg/a/a/u;
+    iput-object v8, p0, Lorg/a/a/h;->bAm:Lorg/a/a/u;
 
     return-object v8
 .end method
@@ -3597,15 +3597,15 @@
 
     iput p1, p0, Lorg/a/a/h;->version:I
 
-    iput p2, p0, Lorg/a/a/h;->bzU:I
+    iput p2, p0, Lorg/a/a/h;->bAe:I
 
-    iget-object p2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const v0, 0xffff
 
     and-int/2addr p1, v0
 
-    iput p1, p2, Lorg/a/a/z;->bCR:I
+    iput p1, p2, Lorg/a/a/z;->bDb:I
 
     iput-object p3, p2, Lorg/a/a/z;->className:Ljava/lang/String;
 
@@ -3617,17 +3617,17 @@
 
     iget p2, p2, Lorg/a/a/y;->index:I
 
-    iput p2, p0, Lorg/a/a/h;->bzV:I
+    iput p2, p0, Lorg/a/a/h;->bAf:I
 
     if-eqz p4, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p2, p4}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/h;->bAh:I
+    iput p2, p0, Lorg/a/a/h;->bAr:I
 
     :cond_0
     const/4 p2, 0x0
@@ -3639,7 +3639,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p3, v0, p5}, Lorg/a/a/z;->i(ILjava/lang/String;)Lorg/a/a/y;
 
@@ -3648,7 +3648,7 @@
     iget p3, p3, Lorg/a/a/y;->index:I
 
     :goto_0
-    iput p3, p0, Lorg/a/a/h;->bzW:I
+    iput p3, p0, Lorg/a/a/h;->bAg:I
 
     if-eqz p6, :cond_2
 
@@ -3658,22 +3658,22 @@
 
     array-length p3, p6
 
-    iput p3, p0, Lorg/a/a/h;->bzX:I
+    iput p3, p0, Lorg/a/a/h;->bAh:I
 
-    iget p3, p0, Lorg/a/a/h;->bzX:I
+    iget p3, p0, Lorg/a/a/h;->bAh:I
 
     new-array p3, p3, [I
 
-    iput-object p3, p0, Lorg/a/a/h;->bzY:[I
+    iput-object p3, p0, Lorg/a/a/h;->bAi:[I
 
     :goto_1
-    iget p3, p0, Lorg/a/a/h;->bzX:I
+    iget p3, p0, Lorg/a/a/h;->bAh:I
 
     if-ge p2, p3, :cond_2
 
-    iget-object p3, p0, Lorg/a/a/h;->bzY:[I
+    iget-object p3, p0, Lorg/a/a/h;->bAi:[I
 
-    iget-object p4, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     aget-object p5, p6, p2
 
@@ -3690,7 +3690,7 @@
     goto :goto_1
 
     :cond_2
-    iget p2, p0, Lorg/a/a/h;->bAt:I
+    iget p2, p0, Lorg/a/a/h;->bAD:I
 
     const/4 p3, 0x1
 
@@ -3702,7 +3702,7 @@
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lorg/a/a/h;->bAt:I
+    iput p1, p0, Lorg/a/a/h;->bAD:I
 
     :cond_3
     return-void
@@ -3711,7 +3711,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;->bAe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -3719,10 +3719,10 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -3734,19 +3734,19 @@
 
     if-nez v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/h;->bAd:I
+    iget v0, p0, Lorg/a/a/h;->bAn:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/h;->bAd:I
+    iput v0, p0, Lorg/a/a/h;->bAn:I
 
-    iget-object v0, p0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     iget v2, p1, Lorg/a/a/y;->index:I
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     const/4 v2, 0x0
 
@@ -3757,7 +3757,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v3, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v3, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v3, v1, p2}, Lorg/a/a/z;->i(ILjava/lang/String;)Lorg/a/a/y;
 
@@ -3768,14 +3768,14 @@
     :goto_0
     invoke-virtual {v0, p2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -3784,11 +3784,11 @@
     :goto_1
     invoke-virtual {p2, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/h;->bAe:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/h;->bAo:Lorg/a/a/d;
 
     invoke-virtual {p2, p4}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget p2, p0, Lorg/a/a/h;->bAd:I
+    iget p2, p0, Lorg/a/a/h;->bAn:I
 
     iput p2, p1, Lorg/a/a/y;->info:I
 
@@ -3801,13 +3801,13 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/h;->bAi:I
+    iput p1, p0, Lorg/a/a/h;->bAs:I
 
     :cond_0
     if-eqz p2, :cond_1
@@ -3824,7 +3824,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/a/a/h;->bAj:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/h;->bAt:Lorg/a/a/d;
 
     :cond_1
     return-void
@@ -3956,11 +3956,11 @@
 .method public final b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/h;->bAs:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/h;->bAC:Lorg/a/a/c;
 
     return-void
 .end method
@@ -3970,7 +3970,7 @@
 
     new-instance v0, Lorg/a/a/w;
 
-    iget-object v1, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const/16 v2, 0x13
 
@@ -3987,7 +3987,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -3996,7 +3996,7 @@
     :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;->bAo:Lorg/a/a/w;
+    iput-object v0, p0, Lorg/a/a/h;->bAy:Lorg/a/a/w;
 
     return-object v0
 .end method
@@ -4004,7 +4004,7 @@
 .method public final eq(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4014,7 +4014,7 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/h;->bAp:I
+    iput p1, p0, Lorg/a/a/h;->bAz:I
 
     return-void
 .end method
@@ -4022,7 +4022,7 @@
 .method public final er(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -4030,18 +4030,18 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/h;->bAq:I
+    iget v0, p0, Lorg/a/a/h;->bAA:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/h;->bAq:I
+    iput v0, p0, Lorg/a/a/h;->bAA:I
 
-    iget-object v0, p0, Lorg/a/a/h;->bAr:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/h;->bAB:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const/4 v2, 0x7
 
@@ -4063,7 +4063,7 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -4081,26 +4081,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/h;->bAk:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/h;->bAu: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;->bAk:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAu:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/h;->bAl:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/h;->bAv: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;->bAl:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/h;->bAv:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -4108,7 +4108,7 @@
 .method public final l(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4118,19 +4118,19 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/h;->bAf:I
+    iput p1, p0, Lorg/a/a/h;->bAp:I
 
     if-eqz p2, :cond_0
 
     if-eqz p3, :cond_0
 
-    iget-object p1, p0, Lorg/a/a/h;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/h;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p2, p3}, Lorg/a/a/z;->av(Ljava/lang/String;Ljava/lang/String;)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/h;->bAg:I
+    iput p1, p0, Lorg/a/a/h;->bAq:I
 
     :cond_0
     return-void
diff --git a/com.discord/smali_classes2/org/a/a/i.smali b/com.discord/smali_classes2/org/a/a/i.smali
index 5259985fd5..90bb722d1a 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 bAu:Lorg/a/a/p;
+.field final bAE:Lorg/a/a/p;
 
-.field final bAv:[Ljava/lang/Object;
+.field final bAF:[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;->bAu:Lorg/a/a/p;
+    iput-object p3, p0, Lorg/a/a/i;->bAE:Lorg/a/a/p;
 
-    iput-object p4, p0, Lorg/a/a/i;->bAv:[Ljava/lang/Object;
+    iput-object p4, p0, Lorg/a/a/i;->bAF:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -73,9 +73,9 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/i;->bAu:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/i;->bAE:Lorg/a/a/p;
 
-    iget-object v3, p1, Lorg/a/a/i;->bAu:Lorg/a/a/p;
+    iget-object v3, p1, Lorg/a/a/i;->bAE: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;->bAv:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bAF:[Ljava/lang/Object;
 
-    iget-object p1, p1, Lorg/a/a/i;->bAv:[Ljava/lang/Object;
+    iget-object p1, p1, Lorg/a/a/i;->bAF:[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;->bAu:Lorg/a/a/p;
+    iget-object v1, p0, Lorg/a/a/i;->bAE: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;->bAv:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bAF:[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;->bAu:Lorg/a/a/p;
+    iget-object v2, p0, Lorg/a/a/i;->bAE: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;->bAv:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/a/a/i;->bAF:[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 60843ebe7b..1087cc28ff 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 bAA:Ljava/lang/String;
+.field bAG:[Lorg/a/a/c;
 
-.field bAB:Ljava/lang/String;
+.field bAH:I
 
-.field bAC:[Lorg/a/a/r;
-
-.field bAD:I
-
-.field bAE:Lorg/a/a/ab;
-
-.field bAF:[Lorg/a/a/r;
-
-.field bAG:[Lorg/a/a/r;
-
-.field bAH:[I
-
-.field bAI:I
+.field bAI:[C
 
 .field bAJ:I
 
-.field bAK:I
+.field bAK:Ljava/lang/String;
 
-.field bAL:I
+.field bAL:Ljava/lang/String;
 
-.field bAM:[Ljava/lang/Object;
+.field bAM:[Lorg/a/a/r;
 
 .field bAN:I
 
-.field bAO:[Ljava/lang/Object;
+.field bAO:Lorg/a/a/ab;
 
-.field bAw:[Lorg/a/a/c;
+.field bAP:[Lorg/a/a/r;
 
-.field bAx:I
+.field bAQ:[Lorg/a/a/r;
 
-.field bAy:[C
+.field bAR:[I
 
-.field bAz:I
+.field bAS:I
+
+.field bAT:I
+
+.field bAU:I
+
+.field bAV:I
+
+.field bAW:[Ljava/lang/Object;
+
+.field bAX:I
+
+.field bAY:[Ljava/lang/Object;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/a/a/l.smali b/com.discord/smali_classes2/org/a/a/l.smali
index 1fbd9e9888..aad4df9e5d 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 bAP:Lorg/a/a/r;
+.field final bAZ:Lorg/a/a/r;
 
-.field bAQ:Lorg/a/a/l;
+.field bBa: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;->bAP:Lorg/a/a/r;
+    iput-object p2, p0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    iput-object p3, p0, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iput-object p3, p0, Lorg/a/a/l;->bBa: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 99ff9887fd..5338e18ffe 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 bAR:Lorg/a/a/m;
+.field protected bBb:Lorg/a/a/m;
 
-.field protected final bzC:I
+.field protected final bzM:I
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/m;->bzC:I
+    iput p1, p0, Lorg/a/a/m;->bzM:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/m;->bAR:Lorg/a/a/m;
+    iput-object p1, p0, Lorg/a/a/m;->bBb: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;->bzC:I
+    iget v0, p0, Lorg/a/a/m;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/m;->bAR:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bBb: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;->bAR:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bBb: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;->bAR:Lorg/a/a/m;
+    iget-object v0, p0, Lorg/a/a/m;->bBb: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 cd552837f3..ea9d44ecdb 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 bAS:I
+.field bAC:Lorg/a/a/c;
 
-.field final bAT:I
+.field final bAe:I
 
-.field bAU:I
+.field bAr:I
 
-.field bAh:I
+.field bAu:Lorg/a/a/b;
 
-.field bAk:Lorg/a/a/b;
+.field bAv:Lorg/a/a/b;
 
-.field bAl:Lorg/a/a/b;
+.field bAw:Lorg/a/a/b;
 
-.field bAm:Lorg/a/a/b;
+.field bAx:Lorg/a/a/b;
 
-.field bAn:Lorg/a/a/b;
+.field final bBc:I
 
-.field bAs:Lorg/a/a/c;
+.field final bBd:I
 
-.field final bzE:Lorg/a/a/z;
+.field bBe:I
 
-.field final bzU:I
+.field final bzO:Lorg/a/a/z;
 
 
 # direct methods
@@ -33,21 +33,21 @@
 
     invoke-direct {p0}, Lorg/a/a/m;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iput p2, p0, Lorg/a/a/n;->bzU:I
+    iput p2, p0, Lorg/a/a/n;->bAe:I
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bAS:I
+    iput p2, p0, Lorg/a/a/n;->bBc:I
 
     invoke-virtual {p1, p4}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bAT:I
+    iput p2, p0, Lorg/a/a/n;->bBd:I
 
     if-eqz p5, :cond_0
 
@@ -55,7 +55,7 @@
 
     move-result p2
 
-    iput p2, p0, Lorg/a/a/n;->bAh:I
+    iput p2, p0, Lorg/a/a/n;->bAr: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;->bAU:I
+    iput p1, p0, Lorg/a/a/n;->bBe:I
 
     :cond_1
     return-void
@@ -85,7 +85,7 @@
 
     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;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -103,26 +103,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/n;->bAm:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/n;->bAw: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;->bAm:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAw:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/n;->bAn:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/n;->bAx: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;->bAn:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAx: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;->bAs:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/n;->bAs:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/n;->bAC:Lorg/a/a/c;
 
     return-void
 .end method
@@ -146,7 +146,7 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -164,26 +164,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/n;->bAk:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/n;->bAu: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;->bAk:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAu:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/n;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/n;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/n;->bAl:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/n;->bAv: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;->bAl:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/n;->bAv: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 7e497400c5..f4a425ec36 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 bAV:Lorg/a/a/r;
+.field bBf:Lorg/a/a/r;
 
-.field bAW:[I
+.field bBg:[I
 
-.field bAX:[I
+.field bBh:[I
 
-.field private bAY:[I
+.field private bBi:[I
 
-.field private bAZ:[I
+.field private bBj:[I
 
-.field private bBa:S
+.field private bBk:S
 
-.field bBb:S
+.field bBl:S
 
-.field bBc:I
+.field bBm:I
 
-.field private bBd:[I
+.field private bBn:[I
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/o;->bAV:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
 
     return-void
 .end method
@@ -37,7 +37,7 @@
 .method private X(II)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/o;->bAY:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBi:[I
 
     if-nez v0, :cond_0
 
@@ -45,10 +45,10 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAY:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBi:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/o;->bAY:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBi:[I
 
     array-length v0, v0
 
@@ -64,16 +64,16 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/o;->bAY:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBi:[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;->bAY:[I
+    iput-object v1, p0, Lorg/a/a/o;->bBi:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/o;->bAY:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBi:[I
 
     aput p2, v0, p1
 
@@ -99,11 +99,11 @@
     const/4 v1, 0x0
 
     :goto_0
-    iget v2, p0, Lorg/a/a/o;->bBc:I
+    iget v2, p0, Lorg/a/a/o;->bBm:I
 
     if-ge v1, v2, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/o;->bBd:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBn:[I
 
     aget v2, v2, v1
 
@@ -123,7 +123,7 @@
 
     if-ne v4, v7, :cond_1
 
-    iget-object v2, p0, Lorg/a/a/o;->bAW:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBg:[I
 
     aget v2, v2, v6
 
@@ -137,7 +137,7 @@
 
     if-ne v4, v7, :cond_2
 
-    iget-object v2, p0, Lorg/a/a/o;->bAX:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBh:[I
 
     array-length v4, v2
 
@@ -169,7 +169,7 @@
     :cond_3
     and-int/2addr p2, v5
 
-    iget-object v0, p1, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object v0, p1, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
     aget-object p2, v0, p2
 
@@ -220,7 +220,7 @@
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object p1
 
@@ -237,7 +237,7 @@
 
     check-cast p1, Lorg/a/a/r;
 
-    iget p1, p1, Lorg/a/a/r;->bBr:I
+    iget p1, p1, Lorg/a/a/r;->bBB:I
 
     const-string v1, ""
 
@@ -523,11 +523,11 @@
 
     move-result-object p1
 
-    iget-object p0, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object p0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
     aget-object p0, p0, v0
 
-    iget-wide v0, p0, Lorg/a/a/y;->bCO:J
+    iget-wide v0, p0, Lorg/a/a/y;->bCY:J
 
     long-to-int p0, v0
 
@@ -547,7 +547,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object p2, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
     aget-object p2, p2, v0
 
@@ -597,7 +597,7 @@
 
     and-int/2addr p1, v4
 
-    iget-object v0, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
     aget-object p1, v0, p1
 
@@ -950,7 +950,7 @@
 .method private dO(I)I
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/o;->bAY:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBi:[I
 
     const/high16 v1, 0x4000000
 
@@ -984,7 +984,7 @@
 .method private dP(I)V
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/o;->bBb:S
+    iget-short v0, p0, Lorg/a/a/o;->bBl:S
 
     if-lt v0, p1, :cond_0
 
@@ -992,12 +992,12 @@
 
     int-to-short p1, v0
 
-    iput-short p1, p0, Lorg/a/a/o;->bBb:S
+    iput-short p1, p0, Lorg/a/a/o;->bBl:S
 
     return-void
 
     :cond_0
-    iget-short v1, p0, Lorg/a/a/o;->bBa:S
+    iget-short v1, p0, Lorg/a/a/o;->bBk:S
 
     sub-int/2addr p1, v0
 
@@ -1005,11 +1005,11 @@
 
     int-to-short p1, v1
 
-    iput-short p1, p0, Lorg/a/a/o;->bBa:S
+    iput-short p1, p0, Lorg/a/a/o;->bBk:S
 
     const/4 p1, 0x0
 
-    iput-short p1, p0, Lorg/a/a/o;->bBb:S
+    iput-short p1, p0, Lorg/a/a/o;->bBl:S
 
     return-void
 .end method
@@ -1069,17 +1069,17 @@
 .method private pop()I
     .locals 2
 
-    iget-short v0, p0, Lorg/a/a/o;->bBb:S
+    iget-short v0, p0, Lorg/a/a/o;->bBl:S
 
     if-lez v0, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/o;->bAZ:[I
+    iget-object v1, p0, Lorg/a/a/o;->bBj:[I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/o;->bBb:S
+    iput-short v0, p0, Lorg/a/a/o;->bBl:S
 
     aget v0, v1, v0
 
@@ -1088,13 +1088,13 @@
     :cond_0
     const/high16 v0, 0x5000000
 
-    iget-short v1, p0, Lorg/a/a/o;->bBa:S
+    iget-short v1, p0, Lorg/a/a/o;->bBk:S
 
     add-int/lit8 v1, v1, -0x1
 
     int-to-short v1, v1
 
-    iput-short v1, p0, Lorg/a/a/o;->bBa:S
+    iput-short v1, p0, Lorg/a/a/o;->bBk:S
 
     neg-int v1, v1
 
@@ -1106,7 +1106,7 @@
 .method private push(I)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/o;->bAZ:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBj:[I
 
     if-nez v0, :cond_0
 
@@ -1114,14 +1114,14 @@
 
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAZ:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBj:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/o;->bAZ:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBj:[I
 
     array-length v0, v0
 
-    iget-short v1, p0, Lorg/a/a/o;->bBb:S
+    iget-short v1, p0, Lorg/a/a/o;->bBl:S
 
     if-lt v1, v0, :cond_1
 
@@ -1135,44 +1135,44 @@
 
     new-array v1, v1, [I
 
-    iget-object v2, p0, Lorg/a/a/o;->bAZ:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBj:[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;->bAZ:[I
+    iput-object v1, p0, Lorg/a/a/o;->bBj:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/o;->bAZ:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBj:[I
 
-    iget-short v1, p0, Lorg/a/a/o;->bBb:S
+    iget-short v1, p0, Lorg/a/a/o;->bBl:S
 
     add-int/lit8 v2, v1, 0x1
 
     int-to-short v2, v2
 
-    iput-short v2, p0, Lorg/a/a/o;->bBb:S
+    iput-short v2, p0, Lorg/a/a/o;->bBl:S
 
     aput p1, v0, v1
 
-    iget-short p1, p0, Lorg/a/a/o;->bBa:S
+    iget-short p1, p0, Lorg/a/a/o;->bBk:S
 
-    iget-short v0, p0, Lorg/a/a/o;->bBb:S
+    iget-short v0, p0, Lorg/a/a/o;->bBl:S
 
     add-int/2addr p1, v0
 
     int-to-short p1, p1
 
-    iget-object v0, p0, Lorg/a/a/o;->bAV:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
 
-    iget-short v0, v0, Lorg/a/a/r;->bBv:S
+    iget-short v0, v0, Lorg/a/a/r;->bBF:S
 
     if-le p1, v0, :cond_2
 
-    iget-object v0, p0, Lorg/a/a/o;->bAV:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
 
-    iput-short p1, v0, Lorg/a/a/r;->bBv:S
+    iput-short p1, v0, Lorg/a/a/r;->bBF:S
 
     :cond_2
     return-void
@@ -1430,20 +1430,20 @@
 
     if-ne v1, v5, :cond_4
 
-    iget-object v1, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v1, v0, Lorg/a/a/o;->bBn:[I
 
     if-nez v1, :cond_2
 
     new-array v1, v14, [I
 
-    iput-object v1, v0, Lorg/a/a/o;->bBd:[I
+    iput-object v1, v0, Lorg/a/a/o;->bBn:[I
 
     :cond_2
-    iget-object v1, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v1, v0, Lorg/a/a/o;->bBn:[I
 
     array-length v1, v1
 
-    iget v5, v0, Lorg/a/a/o;->bBc:I
+    iget v5, v0, Lorg/a/a/o;->bBm:I
 
     if-lt v5, v1, :cond_3
 
@@ -1457,20 +1457,20 @@
 
     new-array v5, v5, [I
 
-    iget-object v6, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v6, v0, Lorg/a/a/o;->bBn:[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;->bBd:[I
+    iput-object v5, v0, Lorg/a/a/o;->bBn:[I
 
     :cond_3
-    iget-object v1, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v1, v0, Lorg/a/a/o;->bBn:[I
 
-    iget v5, v0, Lorg/a/a/o;->bBc:I
+    iget v5, v0, Lorg/a/a/o;->bBm:I
 
     add-int/lit8 v6, v5, 0x1
 
-    iput v6, v0, Lorg/a/a/o;->bBc:I
+    iput v6, v0, Lorg/a/a/o;->bBm:I
 
     aput v2, v1, v5
 
@@ -1920,7 +1920,7 @@
     return-void
 
     :pswitch_30
-    iget v1, v3, Lorg/a/a/y;->bBe:I
+    iget v1, v3, Lorg/a/a/y;->bBo:I
 
     packed-switch v1, :pswitch_data_6
 
@@ -2255,37 +2255,37 @@
 .method final a(Lorg/a/a/o;)V
     .locals 1
 
-    iget-object v0, p1, Lorg/a/a/o;->bAW:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBg:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAW:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBg:[I
 
-    iget-object v0, p1, Lorg/a/a/o;->bAX:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBh:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAX:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBh:[I
 
     const/4 v0, 0x0
 
-    iput-short v0, p0, Lorg/a/a/o;->bBa:S
+    iput-short v0, p0, Lorg/a/a/o;->bBk:S
 
-    iget-object v0, p1, Lorg/a/a/o;->bAY:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBi:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAY:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBi:[I
 
-    iget-object v0, p1, Lorg/a/a/o;->bAZ:[I
+    iget-object v0, p1, Lorg/a/a/o;->bBj:[I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAZ:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBj:[I
 
-    iget-short v0, p1, Lorg/a/a/o;->bBb:S
+    iget-short v0, p1, Lorg/a/a/o;->bBl:S
 
-    iput-short v0, p0, Lorg/a/a/o;->bBb:S
+    iput-short v0, p0, Lorg/a/a/o;->bBl:S
 
-    iget v0, p1, Lorg/a/a/o;->bBc:I
+    iget v0, p1, Lorg/a/a/o;->bBm:I
 
-    iput v0, p0, Lorg/a/a/o;->bBc:I
+    iput v0, p0, Lorg/a/a/o;->bBm:I
 
-    iget-object p1, p1, Lorg/a/a/o;->bBd:[I
+    iget-object p1, p1, Lorg/a/a/o;->bBn:[I
 
-    iput-object p1, p0, Lorg/a/a/o;->bBd:[I
+    iput-object p1, p0, Lorg/a/a/o;->bBn:[I
 
     return-void
 .end method
@@ -2293,7 +2293,7 @@
 .method final a(Lorg/a/a/u;)V
     .locals 14
 
-    iget-object v0, p0, Lorg/a/a/o;->bAW:[I
+    iget-object v0, p0, Lorg/a/a/o;->bBg:[I
 
     const/4 v1, 0x0
 
@@ -2348,7 +2348,7 @@
     goto :goto_0
 
     :cond_3
-    iget-object v2, p0, Lorg/a/a/o;->bAX:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBh:[I
 
     const/4 v4, 0x0
 
@@ -2384,9 +2384,9 @@
     goto :goto_3
 
     :cond_6
-    iget-object v4, p0, Lorg/a/a/o;->bAV:Lorg/a/a/r;
+    iget-object v4, p0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
 
-    iget v4, v4, Lorg/a/a/r;->bBr:I
+    iget v4, v4, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {p1, v4, v3, v5}, Lorg/a/a/u;->n(III)I
 
@@ -2423,7 +2423,7 @@
 
     add-int/lit8 v12, v10, 0x1
 
-    iget-object v13, p1, Lorg/a/a/u;->bCk:[I
+    iget-object v13, p1, Lorg/a/a/u;->bCu:[I
 
     aput v3, v13, v10
 
@@ -2461,7 +2461,7 @@
 
     add-int/lit8 v4, v10, 0x1
 
-    iget-object v5, p1, Lorg/a/a/u;->bCk:[I
+    iget-object v5, p1, Lorg/a/a/u;->bCu:[I
 
     aput v3, v5, v10
 
@@ -2472,7 +2472,7 @@
     goto :goto_9
 
     :cond_c
-    invoke-virtual {p1}, Lorg/a/a/u;->HS()V
+    invoke-virtual {p1}, Lorg/a/a/u;->HV()V
 
     return-void
 .end method
@@ -2482,13 +2482,13 @@
 
     new-array v0, p4, [I
 
-    iput-object v0, p0, Lorg/a/a/o;->bAW:[I
+    iput-object v0, p0, Lorg/a/a/o;->bBg:[I
 
     const/4 v0, 0x0
 
     new-array v1, v0, [I
 
-    iput-object v1, p0, Lorg/a/a/o;->bAX:[I
+    iput-object v1, p0, Lorg/a/a/o;->bBh:[I
 
     and-int/lit8 v1, p2, 0x8
 
@@ -2502,7 +2502,7 @@
 
     if-nez p2, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/o;->bAW:[I
+    iget-object p2, p0, Lorg/a/a/o;->bBg:[I
 
     const/high16 v1, 0x2000000
 
@@ -2519,7 +2519,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/o;->bAW:[I
+    iget-object p2, p0, Lorg/a/a/o;->bBg:[I
 
     const v1, 0x1000006
 
@@ -2546,7 +2546,7 @@
 
     aget-object v4, p2, v1
 
-    invoke-virtual {v4}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {v4}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object v4
 
@@ -2554,7 +2554,7 @@
 
     move-result v4
 
-    iget-object v5, p0, Lorg/a/a/o;->bAW:[I
+    iget-object v5, p0, Lorg/a/a/o;->bBg:[I
 
     add-int/lit8 v6, v2, 0x1
 
@@ -2577,7 +2577,7 @@
 
     :cond_3
     :goto_2
-    iget-object v2, p0, Lorg/a/a/o;->bAW:[I
+    iget-object v2, p0, Lorg/a/a/o;->bBg:[I
 
     add-int/lit8 v4, v6, 0x1
 
@@ -2594,7 +2594,7 @@
     :goto_4
     if-ge v2, p4, :cond_5
 
-    iget-object p1, p0, Lorg/a/a/o;->bAW:[I
+    iget-object p1, p0, Lorg/a/a/o;->bBg:[I
 
     add-int/lit8 p2, v2, 0x1
 
@@ -2619,21 +2619,21 @@
 
     move/from16 v3, p3
 
-    iget-object v4, v0, Lorg/a/a/o;->bAW:[I
+    iget-object v4, v0, Lorg/a/a/o;->bBg:[I
 
     array-length v4, v4
 
-    iget-object v5, v0, Lorg/a/a/o;->bAX:[I
+    iget-object v5, v0, Lorg/a/a/o;->bBh:[I
 
     array-length v5, v5
 
-    iget-object v6, v2, Lorg/a/a/o;->bAW:[I
+    iget-object v6, v2, Lorg/a/a/o;->bBg:[I
 
     if-nez v6, :cond_0
 
     new-array v6, v4, [I
 
-    iput-object v6, v2, Lorg/a/a/o;->bAW:[I
+    iput-object v6, v2, Lorg/a/a/o;->bBg:[I
 
     const/4 v6, 0x1
 
@@ -2666,7 +2666,7 @@
 
     if-ge v6, v4, :cond_7
 
-    iget-object v7, v0, Lorg/a/a/o;->bAY:[I
+    iget-object v7, v0, Lorg/a/a/o;->bBi:[I
 
     if-eqz v7, :cond_5
 
@@ -2684,7 +2684,7 @@
 
     if-ne v12, v11, :cond_3
 
-    iget-object v10, v0, Lorg/a/a/o;->bAW:[I
+    iget-object v10, v0, Lorg/a/a/o;->bBg:[I
 
     and-int v11, v7, v17
 
@@ -2714,7 +2714,7 @@
     :cond_3
     if-ne v12, v10, :cond_4
 
-    iget-object v10, v0, Lorg/a/a/o;->bAX:[I
+    iget-object v10, v0, Lorg/a/a/o;->bBh:[I
 
     and-int v11, v7, v17
 
@@ -2740,12 +2740,12 @@
     goto :goto_3
 
     :cond_5
-    iget-object v7, v0, Lorg/a/a/o;->bAW:[I
+    iget-object v7, v0, Lorg/a/a/o;->bBg:[I
 
     aget v15, v7, v6
 
     :goto_3
-    iget-object v7, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v7, v0, Lorg/a/a/o;->bBn:[I
 
     if-eqz v7, :cond_6
 
@@ -2754,7 +2754,7 @@
     move-result v15
 
     :cond_6
-    iget-object v7, v2, Lorg/a/a/o;->bAW:[I
+    iget-object v7, v2, Lorg/a/a/o;->bBg:[I
 
     invoke-static {v1, v15, v7, v6}, Lorg/a/a/o;->a(Lorg/a/a/z;I[II)Z
 
@@ -2776,11 +2776,11 @@
     :goto_4
     if-ge v5, v4, :cond_8
 
-    iget-object v6, v0, Lorg/a/a/o;->bAW:[I
+    iget-object v6, v0, Lorg/a/a/o;->bBg:[I
 
     aget v6, v6, v5
 
-    iget-object v7, v2, Lorg/a/a/o;->bAW:[I
+    iget-object v7, v2, Lorg/a/a/o;->bBg:[I
 
     invoke-static {v1, v6, v7, v5}, Lorg/a/a/o;->a(Lorg/a/a/z;I[II)Z
 
@@ -2793,7 +2793,7 @@
     goto :goto_4
 
     :cond_8
-    iget-object v4, v2, Lorg/a/a/o;->bAX:[I
+    iget-object v4, v2, Lorg/a/a/o;->bBh:[I
 
     if-nez v4, :cond_9
 
@@ -2801,7 +2801,7 @@
 
     new-array v5, v4, [I
 
-    iput-object v5, v2, Lorg/a/a/o;->bAX:[I
+    iput-object v5, v2, Lorg/a/a/o;->bBh:[I
 
     goto :goto_5
 
@@ -2809,7 +2809,7 @@
     move v4, v8
 
     :goto_5
-    iget-object v2, v2, Lorg/a/a/o;->bAX:[I
+    iget-object v2, v2, Lorg/a/a/o;->bBh:[I
 
     const/4 v6, 0x0
 
@@ -2826,25 +2826,25 @@
 
     const/4 v6, 0x0
 
-    iget-object v3, v0, Lorg/a/a/o;->bAX:[I
+    iget-object v3, v0, Lorg/a/a/o;->bBh:[I
 
     array-length v3, v3
 
-    iget-short v7, v0, Lorg/a/a/o;->bBa:S
+    iget-short v7, v0, Lorg/a/a/o;->bBk:S
 
     add-int/2addr v3, v7
 
-    iget-object v7, v2, Lorg/a/a/o;->bAX:[I
+    iget-object v7, v2, Lorg/a/a/o;->bBh:[I
 
     if-nez v7, :cond_b
 
-    iget-short v7, v0, Lorg/a/a/o;->bBb:S
+    iget-short v7, v0, Lorg/a/a/o;->bBl:S
 
     add-int/2addr v7, v3
 
     new-array v7, v7, [I
 
-    iput-object v7, v2, Lorg/a/a/o;->bAX:[I
+    iput-object v7, v2, Lorg/a/a/o;->bBh:[I
 
     goto :goto_6
 
@@ -2859,11 +2859,11 @@
     :goto_7
     if-ge v4, v3, :cond_d
 
-    iget-object v8, v0, Lorg/a/a/o;->bAX:[I
+    iget-object v8, v0, Lorg/a/a/o;->bBh:[I
 
     aget v8, v8, v4
 
-    iget-object v9, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v9, v0, Lorg/a/a/o;->bBn:[I
 
     if-eqz v9, :cond_c
 
@@ -2872,7 +2872,7 @@
     move-result v8
 
     :cond_c
-    iget-object v9, v2, Lorg/a/a/o;->bAX:[I
+    iget-object v9, v2, Lorg/a/a/o;->bBh:[I
 
     invoke-static {v1, v8, v9, v4}, Lorg/a/a/o;->a(Lorg/a/a/z;I[II)Z
 
@@ -2886,11 +2886,11 @@
 
     :cond_d
     :goto_8
-    iget-short v4, v0, Lorg/a/a/o;->bBb:S
+    iget-short v4, v0, Lorg/a/a/o;->bBl:S
 
     if-ge v6, v4, :cond_13
 
-    iget-object v4, v0, Lorg/a/a/o;->bAZ:[I
+    iget-object v4, v0, Lorg/a/a/o;->bBj:[I
 
     aget v4, v4, v6
 
@@ -2900,7 +2900,7 @@
 
     if-ne v9, v11, :cond_f
 
-    iget-object v9, v0, Lorg/a/a/o;->bAW:[I
+    iget-object v9, v0, Lorg/a/a/o;->bBg:[I
 
     and-int v18, v4, v17
 
@@ -2925,7 +2925,7 @@
     :cond_f
     if-ne v9, v10, :cond_10
 
-    iget-object v9, v0, Lorg/a/a/o;->bAX:[I
+    iget-object v9, v0, Lorg/a/a/o;->bBh:[I
 
     and-int v18, v4, v17
 
@@ -2950,7 +2950,7 @@
 
     :cond_11
     :goto_a
-    iget-object v4, v0, Lorg/a/a/o;->bBd:[I
+    iget-object v4, v0, Lorg/a/a/o;->bBn:[I
 
     if-eqz v4, :cond_12
 
@@ -2959,7 +2959,7 @@
     move-result v8
 
     :cond_12
-    iget-object v4, v2, Lorg/a/a/o;->bAX:[I
+    iget-object v4, v2, Lorg/a/a/o;->bBh:[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 a31d9af315..878aebdc3d 100644
--- a/com.discord/smali_classes2/org/a/a/p.smali
+++ b/com.discord/smali_classes2/org/a/a/p.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final bBe:I
+.field final bBo:I
 
-.field final bBf:Ljava/lang/String;
+.field final bBp:Ljava/lang/String;
 
-.field final bBg:Z
+.field final bBq:Z
 
 .field final descriptor:Ljava/lang/String;
 
@@ -21,15 +21,15 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p1, p0, Lorg/a/a/p;->bBe:I
+    iput p1, p0, Lorg/a/a/p;->bBo:I
 
-    iput-object p2, p0, Lorg/a/a/p;->bBf:Ljava/lang/String;
+    iput-object p2, p0, Lorg/a/a/p;->bBp: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;->bBg:Z
+    iput-boolean p5, p0, Lorg/a/a/p;->bBq:Z
 
     return-void
 .end method
@@ -57,21 +57,21 @@
     :cond_1
     check-cast p1, Lorg/a/a/p;
 
-    iget v1, p0, Lorg/a/a/p;->bBe:I
+    iget v1, p0, Lorg/a/a/p;->bBo:I
 
-    iget v3, p1, Lorg/a/a/p;->bBe:I
+    iget v3, p1, Lorg/a/a/p;->bBo:I
 
     if-ne v1, v3, :cond_2
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bBg:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bBq:Z
 
-    iget-boolean v3, p1, Lorg/a/a/p;->bBg:Z
+    iget-boolean v3, p1, Lorg/a/a/p;->bBq:Z
 
     if-ne v1, v3, :cond_2
 
-    iget-object v1, p0, Lorg/a/a/p;->bBf:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bBp:Ljava/lang/String;
 
-    iget-object v3, p1, Lorg/a/a/p;->bBf:Ljava/lang/String;
+    iget-object v3, p1, Lorg/a/a/p;->bBp:Ljava/lang/String;
 
     invoke-virtual {v1, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -108,9 +108,9 @@
 .method public final hashCode()I
     .locals 3
 
-    iget v0, p0, Lorg/a/a/p;->bBe:I
+    iget v0, p0, Lorg/a/a/p;->bBo:I
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bBg:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bBq: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;->bBf:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bBp: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;->bBf:Ljava/lang/String;
+    iget-object v1, p0, Lorg/a/a/p;->bBp:Ljava/lang/String;
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -178,11 +178,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    iget v1, p0, Lorg/a/a/p;->bBe:I
+    iget v1, p0, Lorg/a/a/p;->bBo:I
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
 
-    iget-boolean v1, p0, Lorg/a/a/p;->bBg:Z
+    iget-boolean v1, p0, Lorg/a/a/p;->bBq: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 31e17121c2..a1a21846d8 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 bBh:Lorg/a/a/r;
+.field final bBr:Lorg/a/a/r;
 
-.field final bBi:Lorg/a/a/r;
+.field final bBs:Lorg/a/a/r;
 
-.field final bBj:Lorg/a/a/r;
+.field final bBt:Lorg/a/a/r;
 
-.field final bBk:I
+.field final bBu:I
 
-.field final bBl:Ljava/lang/String;
+.field final bBv:Ljava/lang/String;
 
-.field bBm:Lorg/a/a/q;
+.field bBw: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;->bBj:Lorg/a/a/r;
+    iget-object v3, p1, Lorg/a/a/q;->bBt:Lorg/a/a/r;
 
-    iget v4, p1, Lorg/a/a/q;->bBk:I
+    iget v4, p1, Lorg/a/a/q;->bBu:I
 
-    iget-object v5, p1, Lorg/a/a/q;->bBl:Ljava/lang/String;
+    iget-object v5, p1, Lorg/a/a/q;->bBv: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;->bBm:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
-    iput-object p1, p0, Lorg/a/a/q;->bBm:Lorg/a/a/q;
+    iput-object p1, p0, Lorg/a/a/q;->bBw: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;->bBh:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/q;->bBr:Lorg/a/a/r;
 
-    iput-object p2, p0, Lorg/a/a/q;->bBi:Lorg/a/a/r;
+    iput-object p2, p0, Lorg/a/a/q;->bBs:Lorg/a/a/r;
 
-    iput-object p3, p0, Lorg/a/a/q;->bBj:Lorg/a/a/r;
+    iput-object p3, p0, Lorg/a/a/q;->bBt:Lorg/a/a/r;
 
-    iput p4, p0, Lorg/a/a/q;->bBk:I
+    iput p4, p0, Lorg/a/a/q;->bBu:I
 
-    iput-object p5, p0, Lorg/a/a/q;->bBl:Ljava/lang/String;
+    iput-object p5, p0, Lorg/a/a/q;->bBv: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;->bBm:Lorg/a/a/q;
+    iget-object p0, p0, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     goto :goto_0
 
@@ -88,23 +88,23 @@
     return-object p0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/q;->bBm:Lorg/a/a/q;
+    iget-object v0, p0, Lorg/a/a/q;->bBw: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;->bBm:Lorg/a/a/q;
+    iput-object v0, p0, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bBh:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBr:Lorg/a/a/r;
 
-    iget v0, v0, Lorg/a/a/r;->bBr:I
+    iget v0, v0, Lorg/a/a/r;->bBB:I
 
-    iget-object v1, p0, Lorg/a/a/q;->bBi:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/q;->bBs:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bBr:I
+    iget v1, v1, Lorg/a/a/r;->bBB:I
 
-    iget v2, p1, Lorg/a/a/r;->bBr:I
+    iget v2, p1, Lorg/a/a/r;->bBB:I
 
     if-nez p2, :cond_1
 
@@ -113,7 +113,7 @@
     goto :goto_0
 
     :cond_1
-    iget v3, p2, Lorg/a/a/r;->bBr:I
+    iget v3, p2, Lorg/a/a/r;->bBB: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;->bBm:Lorg/a/a/q;
+    iget-object p0, p0, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     return-object p0
 
     :cond_3
     new-instance p1, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bBi:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBs: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;->bBh:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBr: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;->bBi:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/q;->bBs: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;->bBm:Lorg/a/a/q;
+    iput-object v0, p0, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     new-instance p2, Lorg/a/a/q;
 
-    iget-object v0, p0, Lorg/a/a/q;->bBh:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/q;->bBr: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 687914b9c5..beeea95f37 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 bBn:Lorg/a/a/r;
+.field static final bBx:Lorg/a/a/r;
 
 
 # instance fields
-.field bBA:Lorg/a/a/r;
+.field private bBA:[I
 
-.field bBo:S
+.field bBB:I
 
-.field private bBp:S
+.field private bBC:[I
 
-.field private bBq:[I
+.field bBD:S
 
-.field bBr:I
+.field bBE:S
 
-.field private bBs:[I
+.field bBF:S
 
-.field bBt:S
+.field bBG:S
 
-.field bBu:S
+.field bBH:Lorg/a/a/o;
 
-.field bBv:S
+.field bBI:Lorg/a/a/r;
 
-.field bBw:S
+.field bBJ:Lorg/a/a/l;
 
-.field bBx:Lorg/a/a/o;
+.field bBK:Lorg/a/a/r;
 
-.field bBy:Lorg/a/a/r;
+.field bBy:S
 
-.field bBz:Lorg/a/a/l;
+.field private bBz:S
 
 
 # direct methods
@@ -43,7 +43,7 @@
 
     invoke-direct {v0}, Lorg/a/a/r;-><init>()V
 
-    sput-object v0, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sput-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
     return-void
 .end method
@@ -59,7 +59,7 @@
 .method private m(III)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/r;->bBs:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBC:[I
 
     const/4 v1, 0x6
 
@@ -67,10 +67,10 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->bBs:[I
+    iput-object v0, p0, Lorg/a/a/r;->bBC:[I
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->bBs:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBC:[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;->bBs:[I
+    iput-object v1, p0, Lorg/a/a/r;->bBC:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->bBs:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBC:[I
 
     add-int/lit8 v3, v3, 0x1
 
@@ -114,17 +114,17 @@
 
 
 # virtual methods
-.method final HP()Lorg/a/a/r;
+.method final HS()Lorg/a/a/r;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, p0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     if-nez v0, :cond_0
 
     return-object p0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/o;->bAV:Lorg/a/a/r;
+    iget-object v0, v0, Lorg/a/a/o;->bBf: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;->bBz:Lorg/a/a/l;
+    iget-object v0, p0, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
     :goto_0
     if-eqz v0, :cond_2
 
-    iget-short v1, p0, Lorg/a/a/r;->bBo:S
+    iget-short v1, p0, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v1, v1, 0x10
 
     if-eqz v1, :cond_0
 
-    iget-object v1, p0, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v1, p0, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v1, v1, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v1, v1, Lorg/a/a/l;->bBa: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;->bAP:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    iget-object v1, v1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v1, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     if-nez v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/l;->bAP:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    iput-object p1, v1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object p1, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iget-object p1, v0, Lorg/a/a/l;->bAP:Lorg/a/a/r;
+    iget-object p1, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
     :cond_1
-    iget-object v0, v0, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/l;->bBa: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;->bBo:S
+    iget-short v0, p0, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v0, v0, 0x4
 
@@ -217,7 +217,7 @@
     :cond_1
     if-eqz p3, :cond_2
 
-    iget p3, p0, Lorg/a/a/r;->bBr:I
+    iget p3, p0, Lorg/a/a/r;->bBB:I
 
     sub-int/2addr p3, p2
 
@@ -226,7 +226,7 @@
     return-void
 
     :cond_2
-    iget p3, p0, Lorg/a/a/r;->bBr:I
+    iget p3, p0, Lorg/a/a/r;->bBB:I
 
     sub-int/2addr p3, p2
 
@@ -242,7 +242,7 @@
 
     if-eqz p2, :cond_0
 
-    iget-short p2, p0, Lorg/a/a/r;->bBp:S
+    iget-short p2, p0, Lorg/a/a/r;->bBz: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;->bBq:[I
+    iget-object p2, p0, Lorg/a/a/r;->bBA:[I
 
     if-eqz p2, :cond_0
 
     const/4 p2, 0x1
 
     :goto_0
-    iget-object v0, p0, Lorg/a/a/r;->bBq:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
 
     const/4 v1, 0x0
 
@@ -282,28 +282,28 @@
 .method final b(S)V
     .locals 3
 
-    sget-object v0, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     move-object v0, p0
 
     :goto_0
-    sget-object v1, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v1, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
     if-eq v0, v1, :cond_1
 
-    iget-object v1, v0, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v1, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     const/4 v2, 0x0
 
-    iput-object v2, v0, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v2, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iget-short v2, v0, Lorg/a/a/r;->bBw:S
+    iget-short v2, v0, Lorg/a/a/r;->bBG:S
 
     if-nez v2, :cond_0
 
-    iput-short p1, v0, Lorg/a/a/r;->bBw:S
+    iput-short p1, v0, Lorg/a/a/r;->bBG:S
 
     invoke-virtual {v0, v1}, Lorg/a/a/r;->a(Lorg/a/a/r;)Lorg/a/a/r;
 
@@ -323,18 +323,18 @@
 .method final dQ(I)V
     .locals 5
 
-    iget-short v0, p0, Lorg/a/a/r;->bBp:S
+    iget-short v0, p0, Lorg/a/a/r;->bBz:S
 
     if-nez v0, :cond_0
 
     int-to-short p1, p1
 
-    iput-short p1, p0, Lorg/a/a/r;->bBp:S
+    iput-short p1, p0, Lorg/a/a/r;->bBz:S
 
     return-void
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/r;->bBq:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
 
     const/4 v1, 0x4
 
@@ -342,10 +342,10 @@
 
     new-array v0, v1, [I
 
-    iput-object v0, p0, Lorg/a/a/r;->bBq:[I
+    iput-object v0, p0, Lorg/a/a/r;->bBA:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/r;->bBq:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBA:[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;->bBq:[I
+    iput-object v1, p0, Lorg/a/a/r;->bBA:[I
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/r;->bBq:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBA:[I
 
     aput p1, v0, v3
 
@@ -382,17 +382,17 @@
 .method final o([BI)Z
     .locals 7
 
-    iget-short v0, p0, Lorg/a/a/r;->bBo:S
+    iget-short v0, p0, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v0, v0, 0x4
 
     int-to-short v0, v0
 
-    iput-short v0, p0, Lorg/a/a/r;->bBo:S
+    iput-short v0, p0, Lorg/a/a/r;->bBy:S
 
-    iput p2, p0, Lorg/a/a/r;->bBr:I
+    iput p2, p0, Lorg/a/a/r;->bBB:I
 
-    iget-object v0, p0, Lorg/a/a/r;->bBs:[I
+    iget-object v0, p0, Lorg/a/a/r;->bBC:[I
 
     const/4 v1, 0x0
 
@@ -406,7 +406,7 @@
     :goto_0
     if-lez v0, :cond_5
 
-    iget-object v2, p0, Lorg/a/a/r;->bBs:[I
+    iget-object v2, p0, Lorg/a/a/r;->bBC:[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 7ba7c23308..3f07525e0d 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 bBB:Lorg/a/a/t;
+.field protected bBL:Lorg/a/a/t;
 
-.field protected final bzC:I
+.field protected final bzM:I
 
 
 # direct methods
@@ -27,25 +27,25 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/t;->bzC:I
+    iput p1, p0, Lorg/a/a/t;->bzM:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iput-object p1, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public HQ()Lorg/a/a/a;
+.method public HT()Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lorg/a/a/t;->HQ()Lorg/a/a/a;
+    invoke-virtual {v0}, Lorg/a/a/t;->HT()Lorg/a/a/a;
 
     move-result-object v0
 
@@ -60,7 +60,7 @@
 .method public Y(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -73,7 +73,7 @@
 .method public Z(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -86,7 +86,7 @@
 .method public a(ILjava/lang/String;Z)Lorg/a/a/a;
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -105,13 +105,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;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -141,13 +141,13 @@
 
     move-object v0, p0
 
-    iget v1, v0, Lorg/a/a/t;->bzC:I
+    iget v1, v0, Lorg/a/a/t;->bzM:I
 
     const/high16 v2, 0x50000
 
     if-lt v1, v2, :cond_1
 
-    iget-object v3, v0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v3, v0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v3, :cond_0
 
@@ -189,7 +189,7 @@
 .method public varargs a(IILorg/a/a/r;[Lorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -202,7 +202,7 @@
 .method public a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -225,7 +225,7 @@
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -238,7 +238,7 @@
 .method public a(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
     .locals 6
 
-    iget v0, p0, Lorg/a/a/t;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
@@ -272,7 +272,7 @@
     throw p1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_3
 
@@ -295,7 +295,7 @@
 .method public a(ILorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -308,7 +308,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;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -333,13 +333,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;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -361,7 +361,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;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -374,7 +374,7 @@
 .method public a(Lorg/a/a/r;[I[Lorg/a/a/r;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -387,7 +387,7 @@
 .method public aa(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -400,7 +400,7 @@
 .method public ab(II)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -413,13 +413,13 @@
 .method public b(ILorg/a/a/ab;Ljava/lang/String;Z)Lorg/a/a/a;
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL: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;->bzC:I
+    iget v1, v0, Lorg/a/a/t;->bzM:I
 
     const/high16 v2, 0x50000
 
@@ -487,7 +487,7 @@
     return-void
 
     :cond_1
-    iget-object v0, v0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, v0, Lorg/a/a/t;->bBL: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;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL: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;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL: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;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -539,7 +539,7 @@
 .method public bl(Ljava/lang/Object;)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
@@ -557,7 +557,7 @@
 
     check-cast v0, Lorg/a/a/aa;
 
-    invoke-virtual {v0}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual {v0}, Lorg/a/a/aa;->Id()I
 
     move-result v0
 
@@ -578,7 +578,7 @@
 
     :cond_1
     :goto_0
-    iget v0, p0, Lorg/a/a/t;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x70000
 
@@ -601,7 +601,7 @@
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL: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;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -648,7 +648,7 @@
 .method public dR(I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -661,7 +661,7 @@
 .method public e(IZ)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -674,7 +674,7 @@
 .method public h(ILjava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL: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;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -706,13 +706,13 @@
 .method public p(Ljava/lang/String;I)V
     .locals 2
 
-    iget v0, p0, Lorg/a/a/t;->bzC:I
+    iget v0, p0, Lorg/a/a/t;->bzM:I
 
     const/high16 v1, 0x50000
 
     if-lt v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL:Lorg/a/a/t;
 
     if-eqz v0, :cond_0
 
@@ -734,7 +734,7 @@
 .method public q(Ljava/lang/String;I)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/t;->bBB:Lorg/a/a/t;
+    iget-object v0, p0, Lorg/a/a/t;->bBL: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 83c6d67463..c1d3f1c763 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 bBC:[I
+.field private static final bBM:[I
 
 
 # instance fields
-.field final bAS:I
+.field bAC:Lorg/a/a/c;
 
-.field final bAT:I
+.field private final bAD:I
 
-.field final bAh:I
+.field final bAe:I
 
-.field bAk:Lorg/a/a/b;
+.field final bAr:I
 
-.field bAl:Lorg/a/a/b;
+.field bAu:Lorg/a/a/b;
 
-.field bAm:Lorg/a/a/b;
+.field bAv:Lorg/a/a/b;
 
-.field bAn:Lorg/a/a/b;
+.field bAw:Lorg/a/a/b;
 
-.field bAs:Lorg/a/a/c;
+.field bAx:Lorg/a/a/b;
 
-.field private final bAt:I
-
-.field bBD:I
-
-.field bBE:I
-
-.field final bBF:Lorg/a/a/d;
-
-.field bBG:Lorg/a/a/q;
-
-.field private bBH:Lorg/a/a/q;
-
-.field bBI:I
-
-.field bBJ:Lorg/a/a/d;
-
-.field bBK:I
-
-.field bBL:Lorg/a/a/d;
-
-.field bBM:I
-
-.field bBN:Lorg/a/a/d;
+.field bBN:I
 
 .field bBO:I
 
-.field bBP:Lorg/a/a/d;
+.field final bBP:Lorg/a/a/d;
 
-.field bBQ:Lorg/a/a/b;
+.field bBQ:Lorg/a/a/q;
 
-.field bBR:Lorg/a/a/b;
+.field private bBR:Lorg/a/a/q;
 
-.field bBS:Lorg/a/a/c;
+.field bBS:I
 
-.field final bBT:I
+.field bBT:Lorg/a/a/d;
 
-.field final bBU:[I
+.field bBU:I
 
-.field bBV:I
+.field bBV:Lorg/a/a/d;
 
-.field bBW:[Lorg/a/a/b;
+.field bBW:I
 
-.field bBX:I
+.field bBX:Lorg/a/a/d;
 
-.field bBY:[Lorg/a/a/b;
+.field bBY:I
 
 .field bBZ:Lorg/a/a/d;
 
-.field bCa:I
+.field final bBc:I
 
-.field bCb:Lorg/a/a/d;
+.field final bBd:I
 
-.field private bCc:Lorg/a/a/r;
+.field bCa:Lorg/a/a/b;
 
-.field private bCd:Lorg/a/a/r;
+.field bCb:Lorg/a/a/b;
 
-.field private bCe:Lorg/a/a/r;
+.field bCc:Lorg/a/a/c;
 
-.field private bCf:I
+.field final bCd:I
 
-.field private bCg:I
+.field final bCe:[I
 
-.field private bCh:I
+.field bCf:I
 
-.field private bCi:I
+.field bCg:[Lorg/a/a/b;
 
-.field private bCj:[I
+.field bCh:I
 
-.field bCk:[I
+.field bCi:[Lorg/a/a/b;
 
-.field private bCl:Z
+.field bCj:Lorg/a/a/d;
 
-.field bCm:Z
+.field bCk:I
 
-.field private bCn:I
+.field bCl:Lorg/a/a/d;
 
-.field bCo:I
+.field private bCm:Lorg/a/a/r;
 
-.field bCp:I
+.field private bCn:Lorg/a/a/r;
 
-.field final bzE:Lorg/a/a/z;
+.field private bCo:Lorg/a/a/r;
 
-.field final bzU:I
+.field private bCp:I
+
+.field private bCq:I
+
+.field private bCr:I
+
+.field private bCs:I
+
+.field private bCt:[I
+
+.field bCu:[I
+
+.field private bCv:Z
+
+.field bCw:Z
+
+.field private bCx:I
+
+.field bCy:I
+
+.field bCz:I
+
+.field final bzO:Lorg/a/a/z;
 
 .field final descriptor:Ljava/lang/String;
 
@@ -123,7 +123,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/a/a/u;->bBC:[I
+    sput-object v0, Lorg/a/a/u;->bBM:[I
 
     return-void
 
@@ -343,9 +343,9 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
-    iput-object p1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const-string v0, "<init>"
 
@@ -365,13 +365,13 @@
     move v0, p2
 
     :goto_0
-    iput v0, p0, Lorg/a/a/u;->bzU:I
+    iput v0, p0, Lorg/a/a/u;->bAe:I
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
     move-result v0
 
-    iput v0, p0, Lorg/a/a/u;->bAS:I
+    iput v0, p0, Lorg/a/a/u;->bBc:I
 
     iput-object p3, p0, Lorg/a/a/u;->name:Ljava/lang/String;
 
@@ -379,7 +379,7 @@
 
     move-result p3
 
-    iput p3, p0, Lorg/a/a/u;->bAT:I
+    iput p3, p0, Lorg/a/a/u;->bBd:I
 
     iput-object p4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
@@ -397,7 +397,7 @@
     move-result p5
 
     :goto_1
-    iput p5, p0, Lorg/a/a/u;->bAh:I
+    iput p5, p0, Lorg/a/a/u;->bAr:I
 
     if-eqz p6, :cond_2
 
@@ -407,20 +407,20 @@
 
     array-length p5, p6
 
-    iput p5, p0, Lorg/a/a/u;->bBT:I
+    iput p5, p0, Lorg/a/a/u;->bCd:I
 
-    iget p5, p0, Lorg/a/a/u;->bBT:I
+    iget p5, p0, Lorg/a/a/u;->bCd:I
 
     new-array p5, p5, [I
 
-    iput-object p5, p0, Lorg/a/a/u;->bBU:[I
+    iput-object p5, p0, Lorg/a/a/u;->bCe:[I
 
     :goto_2
-    iget p5, p0, Lorg/a/a/u;->bBT:I
+    iget p5, p0, Lorg/a/a/u;->bCd:I
 
     if-ge p3, p5, :cond_3
 
-    iget-object p5, p0, Lorg/a/a/u;->bBU:[I
+    iget-object p5, p0, Lorg/a/a/u;->bCe:[I
 
     aget-object v0, p6, p3
 
@@ -439,14 +439,14 @@
     goto :goto_2
 
     :cond_2
-    iput p3, p0, Lorg/a/a/u;->bBT:I
+    iput p3, p0, Lorg/a/a/u;->bCd:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/u;->bBU:[I
+    iput-object p1, p0, Lorg/a/a/u;->bCe:[I
 
     :cond_3
-    iput p7, p0, Lorg/a/a/u;->bAt:I
+    iput p7, p0, Lorg/a/a/u;->bAD:I
 
     if-eqz p7, :cond_5
 
@@ -463,17 +463,17 @@
     add-int/lit8 p1, p1, -0x1
 
     :cond_4
-    iput p1, p0, Lorg/a/a/u;->bBE:I
+    iput p1, p0, Lorg/a/a/u;->bBO:I
 
-    iput p1, p0, Lorg/a/a/u;->bCh:I
+    iput p1, p0, Lorg/a/a/u;->bCr: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;->bCc:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
-    iget-object p1, p0, Lorg/a/a/u;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm: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 HR()V
+.method private HU()V
     .locals 4
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD: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;->bBx:Lorg/a/a/o;
+    iput-object v2, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v2, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget-object v2, v2, Lorg/a/a/d;->data:[B
 
-    iget-object v3, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v3, v3, Lorg/a/a/d;->length:I
 
     invoke-virtual {v0, v2, v3}, Lorg/a/a/r;->o([BI)Z
 
-    iget-object v2, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object v2, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iput-object v0, v2, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iput-object v0, v2, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
-    iput-object v0, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iput-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iput-object v1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iput-object v1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     return-void
 
@@ -527,26 +527,26 @@
 
     if-ne v0, v2, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget v2, p0, Lorg/a/a/u;->bCg:I
+    iget v2, p0, Lorg/a/a/u;->bCq:I
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bBv:S
+    iput-short v2, v0, Lorg/a/a/r;->bBF:S
 
-    iput-object v1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iput-object v1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     :cond_1
     return-void
 .end method
 
-.method private HT()V
+.method private HW()V
     .locals 16
 
     move-object/from16 v0, p0
 
-    iget-object v1, v0, Lorg/a/a/u;->bCk:[I
+    iget-object v1, v0, Lorg/a/a/u;->bCu:[I
 
     const/4 v2, 0x1
 
@@ -556,9 +556,9 @@
 
     aget v1, v1, v4
 
-    iget-object v4, v0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, v0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v4, v4, Lorg/a/a/z;->bCR:I
+    iget v4, v4, Lorg/a/a/z;->bDb:I
 
     const/4 v5, 0x0
 
@@ -568,9 +568,9 @@
 
     if-ge v4, v7, :cond_0
 
-    iget-object v2, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
-    iget-object v4, v0, Lorg/a/a/u;->bCk:[I
+    iget-object v4, v0, Lorg/a/a/u;->bCu:[I
 
     aget v4, v4, v5
 
@@ -584,7 +584,7 @@
 
     invoke-direct {v0, v6, v3}, Lorg/a/a/u;->ac(II)V
 
-    iget-object v2, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {v2, v1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -595,22 +595,22 @@
     return-void
 
     :cond_0
-    iget v4, v0, Lorg/a/a/u;->bBO:I
+    iget v4, v0, Lorg/a/a/u;->bBY:I
 
     if-nez v4, :cond_1
 
-    iget-object v4, v0, Lorg/a/a/u;->bCk:[I
+    iget-object v4, v0, Lorg/a/a/u;->bCu:[I
 
     aget v4, v4, v5
 
     goto :goto_0
 
     :cond_1
-    iget-object v4, v0, Lorg/a/a/u;->bCk:[I
+    iget-object v4, v0, Lorg/a/a/u;->bCu:[I
 
     aget v4, v4, v5
 
-    iget-object v7, v0, Lorg/a/a/u;->bCj:[I
+    iget-object v7, v0, Lorg/a/a/u;->bCt:[I
 
     aget v7, v7, v5
 
@@ -619,7 +619,7 @@
     sub-int/2addr v4, v2
 
     :goto_0
-    iget-object v7, v0, Lorg/a/a/u;->bCj:[I
+    iget-object v7, v0, Lorg/a/a/u;->bCt:[I
 
     aget v7, v7, v2
 
@@ -697,11 +697,11 @@
 
     if-ge v5, v3, :cond_7
 
-    iget-object v6, v0, Lorg/a/a/u;->bCk:[I
+    iget-object v6, v0, Lorg/a/a/u;->bCu:[I
 
     aget v6, v6, v15
 
-    iget-object v13, v0, Lorg/a/a/u;->bCj:[I
+    iget-object v13, v0, Lorg/a/a/u;->bCt:[I
 
     aget v13, v13, v15
 
@@ -736,7 +736,7 @@
 
     if-eq v2, v9, :cond_8
 
-    iget-object v2, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     const/16 v5, 0xff
 
@@ -756,7 +756,7 @@
 
     invoke-direct {v0, v2, v3}, Lorg/a/a/u;->ac(II)V
 
-    iget-object v2, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {v2, v1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -769,7 +769,7 @@
     :cond_8
     const/4 v2, 0x3
 
-    iget-object v1, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     add-int/2addr v8, v14
 
@@ -788,7 +788,7 @@
     return-void
 
     :cond_9
-    iget-object v1, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {v1, v14}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -799,7 +799,7 @@
     return-void
 
     :cond_a
-    iget-object v1, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     add-int/2addr v8, v14
 
@@ -812,7 +812,7 @@
     return-void
 
     :cond_b
-    iget-object v1, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {v1, v11}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -829,7 +829,7 @@
     return-void
 
     :cond_c
-    iget-object v1, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     add-int/2addr v4, v12
 
@@ -844,7 +844,7 @@
     return-void
 
     :cond_d
-    iget-object v1, v0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v1, v0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {v1, v4}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -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;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v1, p0, Lorg/a/a/u;->bAt:I
+    iget v1, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v2, 0x4
 
@@ -877,7 +877,7 @@
 
     if-ne v1, v2, :cond_0
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH: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;->HP()Lorg/a/a/r;
+    invoke-virtual {p1}, Lorg/a/a/r;->HS()Lorg/a/a/r;
 
     move-result-object p1
 
-    iget-short v0, p1, Lorg/a/a/r;->bBo:S
+    iget-short v0, p1, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v0, v0, 0x2
 
     int-to-short v0, v0
 
-    iput-short v0, p1, Lorg/a/a/r;->bBo:S
+    iput-short v0, p1, Lorg/a/a/r;->bBy: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;->HP()Lorg/a/a/r;
+    invoke-virtual {v1}, Lorg/a/a/r;->HS()Lorg/a/a/r;
 
     move-result-object v1
 
-    iget-short v2, v1, Lorg/a/a/r;->bBo:S
+    iget-short v2, v1, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v2, v2, 0x2
 
     int-to-short v2, v2
 
-    iput-short v2, v1, Lorg/a/a/r;->bBo:S
+    iput-short v2, v1, Lorg/a/a/r;->bBy:S
 
     add-int/lit8 v0, v0, 0x1
 
@@ -931,13 +931,13 @@
 
     if-ne v1, v0, :cond_1
 
-    iget v1, p0, Lorg/a/a/u;->bCf:I
+    iget v1, p0, Lorg/a/a/u;->bCp:I
 
     sub-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/u;->bCf:I
+    iput v1, p0, Lorg/a/a/u;->bCp:I
 
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp: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;->bCf:I
+    iget v1, p0, Lorg/a/a/u;->bCp:I
 
     invoke-direct {p0, v1, v0}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -957,7 +957,7 @@
     goto :goto_1
 
     :cond_1
-    invoke-direct {p0}, Lorg/a/a/u;->HR()V
+    invoke-direct {p0}, Lorg/a/a/u;->HU()V
 
     :cond_2
     return-void
@@ -969,13 +969,13 @@
     :goto_0
     if-ge p1, p2, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bCk:[I
+    iget-object v1, p0, Lorg/a/a/u;->bCu:[I
 
     aget v1, v1, p1
 
-    iget-object v2, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bBZ: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;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     check-cast p1, Ljava/lang/Integer;
 
@@ -1011,7 +1011,7 @@
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     const/4 v1, 0x7
 
@@ -1019,7 +1019,7 @@
 
     move-result-object v0
 
-    iget-object v2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     check-cast p1, Ljava/lang/String;
 
@@ -1034,7 +1034,7 @@
     return-void
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     const/16 v1, 0x8
 
@@ -1044,7 +1044,7 @@
 
     check-cast p1, Lorg/a/a/r;
 
-    iget p1, p1, Lorg/a/a/r;->bBr:I
+    iget p1, p1, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -1054,35 +1054,35 @@
 .method private c(ILorg/a/a/r;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     new-instance v1, Lorg/a/a/l;
 
-    iget-object v2, v0, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v2, v0, Lorg/a/a/r;->bBJ: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;->bBz:Lorg/a/a/l;
+    iput-object v1, v0, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final HQ()Lorg/a/a/a;
+.method public final HT()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;->bBZ:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     new-instance v0, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v2, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bCj:Lorg/a/a/d;
 
     const/4 v3, 0x0
 
@@ -1093,14 +1093,14 @@
     return-object v0
 .end method
 
-.method final HS()V
+.method final HV()V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bCj:[I
+    iget-object v0, p0, Lorg/a/a/u;->bCt:[I
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBZ: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;->bBP:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     :cond_0
-    invoke-direct {p0}, Lorg/a/a/u;->HT()V
+    invoke-direct {p0}, Lorg/a/a/u;->HW()V
 
-    iget v0, p0, Lorg/a/a/u;->bBO:I
+    iget v0, p0, Lorg/a/a/u;->bBY:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bBO:I
+    iput v0, p0, Lorg/a/a/u;->bBY:I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bCk:[I
+    iget-object v0, p0, Lorg/a/a/u;->bCu:[I
 
-    iput-object v0, p0, Lorg/a/a/u;->bCj:[I
+    iput-object v0, p0, Lorg/a/a/u;->bCt:[I
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lorg/a/a/u;->bCk:[I
+    iput-object v0, p0, Lorg/a/a/u;->bCu:[I
 
     return-void
 .end method
@@ -1134,33 +1134,33 @@
 .method public final Y(II)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
     const/16 v0, 0x11
 
     if-ne p1, v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->V(II)Lorg/a/a/d;
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/d;->U(II)Lorg/a/a/d;
 
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_4
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x4
 
@@ -1177,26 +1177,26 @@
 
     if-eq p1, p2, :cond_4
 
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bCg:I
+    iget p2, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, p2, :cond_2
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_2
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_2
 
     :cond_3
     :goto_1
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     const/4 v1, 0x0
 
@@ -1210,11 +1210,11 @@
 .method public final Z(II)V
     .locals 6
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
     const/16 v0, 0xa9
 
@@ -1246,7 +1246,7 @@
     :goto_0
     add-int/2addr v3, p2
 
-    iget-object v4, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v4, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v4, v3}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -1257,7 +1257,7 @@
 
     if-lt p2, v3, :cond_2
 
-    iget-object v3, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v4, 0xc4
 
@@ -1270,16 +1270,16 @@
     goto :goto_1
 
     :cond_2
-    iget-object v3, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v3, p1, p2}, Lorg/a/a/d;->U(II)Lorg/a/a/d;
 
     :goto_1
-    iget-object v3, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v3, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v3, :cond_7
 
-    iget v4, p0, Lorg/a/a/u;->bAt:I
+    iget v4, p0, Lorg/a/a/u;->bAD:I
 
     if-eq v4, v2, :cond_6
 
@@ -1292,51 +1292,51 @@
     :cond_3
     if-ne p1, v0, :cond_4
 
-    iget-short v0, v3, Lorg/a/a/r;->bBo:S
+    iget-short v0, v3, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v0, v0, 0x40
 
     int-to-short v0, v0
 
-    iput-short v0, v3, Lorg/a/a/r;->bBo:S
+    iput-short v0, v3, Lorg/a/a/r;->bBy:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget v3, p0, Lorg/a/a/u;->bCf:I
+    iget v3, p0, Lorg/a/a/u;->bCp:I
 
     int-to-short v3, v3
 
-    iput-short v3, v0, Lorg/a/a/r;->bBu:S
+    iput-short v3, v0, Lorg/a/a/r;->bBE:S
 
-    invoke-direct {p0}, Lorg/a/a/u;->HR()V
+    invoke-direct {p0}, Lorg/a/a/u;->HU()V
 
     goto :goto_3
 
     :cond_4
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp:I
 
-    sget-object v3, Lorg/a/a/u;->bBC:[I
+    sget-object v3, Lorg/a/a/u;->bBM:[I
 
     aget v3, v3, p1
 
     add-int/2addr v0, v3
 
-    iget v3, p0, Lorg/a/a/u;->bCg:I
+    iget v3, p0, Lorg/a/a/u;->bCq:I
 
     if-le v0, v3, :cond_5
 
-    iput v0, p0, Lorg/a/a/u;->bCg:I
+    iput v0, p0, Lorg/a/a/u;->bCq:I
 
     :cond_5
-    iput v0, p0, Lorg/a/a/u;->bCf:I
+    iput v0, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_3
 
     :cond_6
     :goto_2
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     const/4 v3, 0x0
 
@@ -1344,7 +1344,7 @@
 
     :cond_7
     :goto_3
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     if-eqz v0, :cond_a
 
@@ -1376,20 +1376,20 @@
     add-int/lit8 p2, p2, 0x2
 
     :goto_5
-    iget v0, p0, Lorg/a/a/u;->bBE:I
+    iget v0, p0, Lorg/a/a/u;->bBO:I
 
     if-le p2, v0, :cond_a
 
-    iput p2, p0, Lorg/a/a/u;->bBE:I
+    iput p2, p0, Lorg/a/a/u;->bBO:I
 
     :cond_a
     if-lt p1, v1, :cond_b
 
-    iget p1, p0, Lorg/a/a/u;->bAt:I
+    iget p1, p0, Lorg/a/a/u;->bAD:I
 
     if-ne p1, v2, :cond_b
 
-    iget-object p1, p0, Lorg/a/a/u;->bBG:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     if-eqz p1, :cond_b
 
@@ -1410,7 +1410,7 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p2}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1426,7 +1426,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object p2, p0, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     if-nez p2, :cond_0
 
@@ -1440,14 +1440,14 @@
 
     new-array p2, p2, [Lorg/a/a/b;
 
-    iput-object p2, p0, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iput-object p2, p0, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/u;->bBW:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCg:[Lorg/a/a/b;
 
     new-instance p3, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     aget-object v2, p2, p1
 
@@ -1458,7 +1458,7 @@
     return-object p3
 
     :cond_1
-    iget-object p2, p0, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     if-nez p2, :cond_2
 
@@ -1472,14 +1472,14 @@
 
     new-array p2, p2, [Lorg/a/a/b;
 
-    iput-object p2, p0, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iput-object p2, p0, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     :cond_2
-    iget-object p2, p0, Lorg/a/a/u;->bBY:[Lorg/a/a/b;
+    iget-object p2, p0, Lorg/a/a/u;->bCi:[Lorg/a/a/b;
 
     new-instance p3, Lorg/a/a/b;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     aget-object v2, p2, p1
 
@@ -1501,7 +1501,7 @@
 
     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;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1519,26 +1519,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bAm:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bAw: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;->bAm:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAw:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bAn:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bAx: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;->bAn:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAx:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -1571,7 +1571,7 @@
 
     aget-object v2, p3, v1
 
-    iget v2, v2, Lorg/a/a/r;->bBr:I
+    iget v2, v2, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v0, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -1579,11 +1579,11 @@
 
     aget-object v3, p4, v1
 
-    iget v3, v3, Lorg/a/a/r;->bBr:I
+    iget v3, v3, Lorg/a/a/r;->bBB:I
 
     aget-object v4, p3, v1
 
-    iget v4, v4, Lorg/a/a/r;->bBr:I
+    iget v4, v4, Lorg/a/a/r;->bBB:I
 
     sub-int/2addr v3, v4
 
@@ -1602,7 +1602,7 @@
     :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;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p2, p6}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1618,26 +1618,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bCa: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;->bBQ:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     return-object p1
 
     :cond_1
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bCb: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;->bBR:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -1645,13 +1645,13 @@
 .method public final varargs a(IILorg/a/a/r;[Lorg/a/a/r;)V
     .locals 4
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v1, 0xaa
 
@@ -1659,7 +1659,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
@@ -1675,15 +1675,15 @@
 
     invoke-virtual {v0, v3, v2, v1}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bCn:I
+    iget v1, p0, Lorg/a/a/u;->bCx: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;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dG(I)Lorg/a/a/d;
 
@@ -1698,9 +1698,9 @@
 
     aget-object p2, p4, v2
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bCn:I
+    iget v1, p0, Lorg/a/a/u;->bCx:I
 
     invoke-virtual {p2, v0, v1, v3}, Lorg/a/a/r;->a(Lorg/a/a/d;IZ)V
 
@@ -1717,7 +1717,7 @@
 .method public final a(II[Ljava/lang/Object;I[Ljava/lang/Object;)V
     .locals 10
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x4
 
@@ -1738,35 +1738,35 @@
 
     if-ne v0, v4, :cond_d
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     if-nez v0, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCo: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;->bBx:Lorg/a/a/o;
+    iput-object p3, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object p3, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v0, p0, Lorg/a/a/u;->bzU:I
+    iget v0, p0, Lorg/a/a/u;->bAe: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;->bCe:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     invoke-virtual {p1, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
@@ -1775,11 +1775,11 @@
     :cond_1
     if-ne p1, v2, :cond_c
 
-    iget-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x0
 
@@ -1790,7 +1790,7 @@
 
     if-ge v1, p2, :cond_4
 
-    iget-object v7, p1, Lorg/a/a/o;->bAW:[I
+    iget-object v7, p1, Lorg/a/a/o;->bBg:[I
 
     add-int/lit8 v8, v2, 0x1
 
@@ -1804,13 +1804,13 @@
 
     aget-object v2, p3, v1
 
-    sget-object v7, Lorg/a/a/x;->bCL:Ljava/lang/Integer;
+    sget-object v7, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
 
     if-eq v2, v7, :cond_3
 
     aget-object v2, p3, v1
 
-    sget-object v7, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sget-object v7, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
 
     if-ne v2, v7, :cond_2
 
@@ -1823,7 +1823,7 @@
 
     :cond_3
     :goto_1
-    iget-object v2, p1, Lorg/a/a/o;->bAW:[I
+    iget-object v2, p1, Lorg/a/a/o;->bBg:[I
 
     add-int/lit8 v7, v8, 0x1
 
@@ -1838,13 +1838,13 @@
 
     :cond_4
     :goto_3
-    iget-object p2, p1, Lorg/a/a/o;->bAW:[I
+    iget-object p2, p1, Lorg/a/a/o;->bBg:[I
 
     array-length p2, p2
 
     if-ge v2, p2, :cond_5
 
-    iget-object p2, p1, Lorg/a/a/o;->bAW:[I
+    iget-object p2, p1, Lorg/a/a/o;->bBg:[I
 
     add-int/lit8 p3, v2, 0x1
 
@@ -1864,13 +1864,13 @@
 
     aget-object v1, p5, p2
 
-    sget-object v2, Lorg/a/a/x;->bCL:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
 
     if-eq v1, v2, :cond_6
 
     aget-object v1, p5, p2
 
-    sget-object v2, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sget-object v2, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
 
     if-ne v1, v2, :cond_7
 
@@ -1887,7 +1887,7 @@
 
     new-array p2, p3, [I
 
-    iput-object p2, p1, Lorg/a/a/o;->bAX:[I
+    iput-object p2, p1, Lorg/a/a/o;->bBh:[I
 
     const/4 p2, 0x0
 
@@ -1896,7 +1896,7 @@
     :goto_5
     if-ge p2, p4, :cond_b
 
-    iget-object v1, p1, Lorg/a/a/o;->bAX:[I
+    iget-object v1, p1, Lorg/a/a/o;->bBh:[I
 
     add-int/lit8 v2, p3, 0x1
 
@@ -1910,13 +1910,13 @@
 
     aget-object p3, p5, p2
 
-    sget-object v1, Lorg/a/a/x;->bCL:Ljava/lang/Integer;
+    sget-object v1, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
 
     if-eq p3, v1, :cond_a
 
     aget-object p3, p5, p2
 
-    sget-object v1, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sget-object v1, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
 
     if-ne p3, v1, :cond_9
 
@@ -1929,7 +1929,7 @@
 
     :cond_a
     :goto_6
-    iget-object p3, p1, Lorg/a/a/o;->bAX:[I
+    iget-object p3, p1, Lorg/a/a/o;->bBh:[I
 
     add-int/lit8 v1, v2, 0x1
 
@@ -1943,14 +1943,14 @@
     goto :goto_5
 
     :cond_b
-    iput-short v5, p1, Lorg/a/a/o;->bBb:S
+    iput-short v5, p1, Lorg/a/a/o;->bBl:S
 
-    iput v5, p1, Lorg/a/a/o;->bBc:I
+    iput v5, p1, Lorg/a/a/o;->bBm:I
 
     :cond_c
-    iget-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     invoke-virtual {p1, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
@@ -1959,7 +1959,7 @@
     :cond_d
     if-ne p1, v2, :cond_11
 
-    iget-object p1, p0, Lorg/a/a/u;->bCj:[I
+    iget-object p1, p0, Lorg/a/a/u;->bCt:[I
 
     if-nez p1, :cond_e
 
@@ -1979,9 +1979,9 @@
 
     invoke-direct {v0, v1}, Lorg/a/a/o;-><init>(Lorg/a/a/r;)V
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v2, p0, Lorg/a/a/u;->bzU:I
+    iget v2, p0, Lorg/a/a/u;->bAe:I
 
     iget-object v4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
@@ -1990,9 +1990,9 @@
     invoke-virtual {v0, p0}, Lorg/a/a/o;->a(Lorg/a/a/u;)V
 
     :cond_e
-    iput p2, p0, Lorg/a/a/u;->bCh:I
+    iput p2, p0, Lorg/a/a/u;->bCr:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget p1, p1, Lorg/a/a/d;->length:I
 
@@ -2007,11 +2007,11 @@
     :goto_8
     if-ge p1, p2, :cond_f
 
-    iget-object v1, p0, Lorg/a/a/u;->bCk:[I
+    iget-object v1, p0, Lorg/a/a/u;->bCu:[I
 
     add-int/lit8 v2, v0, 0x1
 
-    iget-object v4, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     aget-object v7, p3, p1
 
@@ -2033,11 +2033,11 @@
     :goto_9
     if-ge p1, p4, :cond_10
 
-    iget-object p2, p0, Lorg/a/a/u;->bCk:[I
+    iget-object p2, p0, Lorg/a/a/u;->bCu:[I
 
     add-int/lit8 p3, v0, 0x1
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     aget-object v2, p5, p1
 
@@ -2054,12 +2054,12 @@
     goto :goto_9
 
     :cond_10
-    invoke-virtual {p0}, Lorg/a/a/u;->HS()V
+    invoke-virtual {p0}, Lorg/a/a/u;->HV()V
 
     goto/16 :goto_10
 
     :cond_11
-    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     if-nez v0, :cond_12
 
@@ -2067,20 +2067,20 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP: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;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iget v2, p0, Lorg/a/a/u;->bCi:I
+    iget v2, p0, Lorg/a/a/u;->bCs:I
 
     sub-int/2addr v0, v2
 
@@ -2117,7 +2117,7 @@
 
     if-ge v0, p2, :cond_15
 
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     add-int/2addr v0, p2
 
@@ -2126,7 +2126,7 @@
     goto :goto_b
 
     :cond_15
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     const/16 p2, 0xf7
 
@@ -2153,14 +2153,14 @@
     :cond_17
     if-ge v0, p2, :cond_18
 
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
     goto :goto_f
 
     :cond_18
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {p1, p3}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -2171,13 +2171,13 @@
     goto :goto_f
 
     :cond_19
-    iget p1, p0, Lorg/a/a/u;->bCh:I
+    iget p1, p0, Lorg/a/a/u;->bCr:I
 
     sub-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bCh:I
+    iput p1, p0, Lorg/a/a/u;->bCr:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     sub-int/2addr p3, p2
 
@@ -2190,13 +2190,13 @@
     goto :goto_f
 
     :cond_1a
-    iget p1, p0, Lorg/a/a/u;->bCh:I
+    iget p1, p0, Lorg/a/a/u;->bCr:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bCh:I
+    iput p1, p0, Lorg/a/a/u;->bCr:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     add-int/lit16 v1, p2, 0xfb
 
@@ -2220,9 +2220,9 @@
     goto :goto_c
 
     :cond_1b
-    iput p2, p0, Lorg/a/a/u;->bCh:I
+    iput p2, p0, Lorg/a/a/u;->bCr:I
 
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     const/16 v1, 0xff
 
@@ -2250,7 +2250,7 @@
     goto :goto_d
 
     :cond_1c
-    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBZ:Lorg/a/a/d;
 
     invoke-virtual {p1, p4}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -2269,46 +2269,46 @@
 
     :cond_1d
     :goto_f
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget p1, p1, Lorg/a/a/d;->length:I
 
-    iput p1, p0, Lorg/a/a/u;->bCi:I
+    iput p1, p0, Lorg/a/a/u;->bCs:I
 
-    iget p1, p0, Lorg/a/a/u;->bBO:I
+    iget p1, p0, Lorg/a/a/u;->bBY:I
 
     add-int/2addr p1, v6
 
-    iput p1, p0, Lorg/a/a/u;->bBO:I
+    iput p1, p0, Lorg/a/a/u;->bBY:I
 
     :goto_10
-    iget p1, p0, Lorg/a/a/u;->bAt:I
+    iget p1, p0, Lorg/a/a/u;->bAD:I
 
     if-ne p1, v3, :cond_21
 
-    iput p4, p0, Lorg/a/a/u;->bCf:I
+    iput p4, p0, Lorg/a/a/u;->bCp:I
 
     :goto_11
     if-ge v5, p4, :cond_20
 
     aget-object p1, p5, v5
 
-    sget-object p2, Lorg/a/a/x;->bCL:Ljava/lang/Integer;
+    sget-object p2, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
 
     if-eq p1, p2, :cond_1e
 
     aget-object p1, p5, v5
 
-    sget-object p2, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sget-object p2, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
 
     if-ne p1, p2, :cond_1f
 
     :cond_1e
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     add-int/2addr p1, v6
 
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     :cond_1f
     add-int/lit8 v5, v5, 0x1
@@ -2316,32 +2316,32 @@
     goto :goto_11
 
     :cond_20
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
-    iget p2, p0, Lorg/a/a/u;->bCg:I
+    iget p2, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, p2, :cond_21
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_21
-    iget p1, p0, Lorg/a/a/u;->bBD:I
+    iget p1, p0, Lorg/a/a/u;->bBN:I
 
     invoke-static {p1, p4}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/u;->bBD:I
+    iput p1, p0, Lorg/a/a/u;->bBN:I
 
-    iget p1, p0, Lorg/a/a/u;->bBE:I
+    iget p1, p0, Lorg/a/a/u;->bBO:I
 
-    iget p2, p0, Lorg/a/a/u;->bCh:I
+    iget p2, p0, Lorg/a/a/u;->bCr:I
 
     invoke-static {p1, p2}, Ljava/lang/Math;->max(II)I
 
     move-result p1
 
-    iput p1, p0, Lorg/a/a/u;->bBE:I
+    iput p1, p0, Lorg/a/a/u;->bBO:I
 
     return-void
 .end method
@@ -2349,29 +2349,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;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p2, p3, p4}, Lorg/a/a/z;->m(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;->bBF:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, p2, Lorg/a/a/y;->index:I
 
     invoke-virtual {p3, p1, v0}, Lorg/a/a/d;->V(II)Lorg/a/a/d;
 
-    iget-object p3, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p3, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz p3, :cond_9
 
-    iget p3, p0, Lorg/a/a/u;->bAt:I
+    iget p3, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v0, 0x4
 
@@ -2400,7 +2400,7 @@
 
     packed-switch p1, :pswitch_data_0
 
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     if-eq p2, v2, :cond_5
 
@@ -2409,7 +2409,7 @@
     goto :goto_1
 
     :pswitch_0
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     if-eq p2, v2, :cond_4
 
@@ -2423,7 +2423,7 @@
     goto :goto_0
 
     :pswitch_1
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     if-eq p2, v2, :cond_6
 
@@ -2437,7 +2437,7 @@
     goto :goto_2
 
     :pswitch_2
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     if-eq p2, v2, :cond_3
 
@@ -2461,24 +2461,24 @@
     add-int/2addr p1, p4
 
     :goto_3
-    iget p2, p0, Lorg/a/a/u;->bCg:I
+    iget p2, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, p2, :cond_7
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_7
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_5
 
     :cond_8
     :goto_4
-    iget-object p3, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p3, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p3, p3, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p3, p3, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object p4, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/u;->bzO: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
 
@@ -2499,13 +2499,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;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p2, p3, p4, p5}, Lorg/a/a/z;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/a/a/y;
 
@@ -2517,7 +2517,7 @@
 
     if-ne p1, p4, :cond_0
 
-    iget-object p5, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p5, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, p2, Lorg/a/a/y;->index:I
 
@@ -2525,7 +2525,7 @@
 
     move-result-object p4
 
-    invoke-virtual {p2}, Lorg/a/a/y;->HU()I
+    invoke-virtual {p2}, Lorg/a/a/y;->HX()I
 
     move-result p5
 
@@ -2536,18 +2536,18 @@
     goto :goto_0
 
     :cond_0
-    iget-object p4, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p4, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget p5, p2, Lorg/a/a/y;->index:I
 
     invoke-virtual {p4, p1, p5}, Lorg/a/a/d;->V(II)Lorg/a/a/d;
 
     :goto_0
-    iget-object p4, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p4, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz p4, :cond_5
 
-    iget p4, p0, Lorg/a/a/u;->bAt:I
+    iget p4, p0, Lorg/a/a/u;->bAD:I
 
     const/4 p5, 0x4
 
@@ -2560,7 +2560,7 @@
     goto :goto_2
 
     :cond_1
-    invoke-virtual {p2}, Lorg/a/a/y;->HU()I
+    invoke-virtual {p2}, Lorg/a/a/y;->HX()I
 
     move-result p2
 
@@ -2574,7 +2574,7 @@
 
     if-ne p1, p2, :cond_2
 
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     add-int/2addr p1, p3
 
@@ -2583,29 +2583,29 @@
     goto :goto_1
 
     :cond_2
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     add-int/2addr p1, p3
 
     :goto_1
-    iget p2, p0, Lorg/a/a/u;->bCg:I
+    iget p2, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, p2, :cond_3
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_3
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_3
 
     :cond_4
     :goto_2
-    iget-object p4, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p4, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p4, p4, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p4, p4, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object p5, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p5, p0, Lorg/a/a/u;->bzO: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
 
@@ -2617,11 +2617,11 @@
 .method public final a(ILorg/a/a/r;)V
     .locals 10
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
     const/16 v0, 0xc8
 
@@ -2635,7 +2635,7 @@
     move v1, p1
 
     :goto_0
-    iget-short v2, p2, Lorg/a/a/r;->bBo:S
+    iget-short v2, p2, Lorg/a/a/r;->bBy:S
 
     const/4 v3, 0x4
 
@@ -2651,9 +2651,9 @@
 
     if-eqz v2, :cond_4
 
-    iget v2, p2, Lorg/a/a/r;->bBr:I
+    iget v2, p2, Lorg/a/a/r;->bBB:I
 
-    iget-object v8, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v8, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v8, v8, Lorg/a/a/d;->length:I
 
@@ -2665,7 +2665,7 @@
 
     if-ne v1, v5, :cond_1
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -2674,7 +2674,7 @@
     :cond_1
     if-ne v1, v4, :cond_2
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v0, 0xc9
 
@@ -2686,7 +2686,7 @@
     goto :goto_3
 
     :cond_2
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v0, 0xc6
 
@@ -2706,24 +2706,24 @@
     :goto_2
     invoke-virtual {p1, v0}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v0, 0x8
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v0, 0xdc
 
     invoke-virtual {p1, v0}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
-    iput-boolean v7, p0, Lorg/a/a/u;->bCm:Z
+    iput-boolean v7, p0, Lorg/a/a/u;->bCw:Z
 
     const/4 p1, 0x1
 
     :goto_3
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v2, v0, Lorg/a/a/d;->length:I
 
@@ -2736,11 +2736,11 @@
     :cond_4
     if-eq v1, p1, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, p1, Lorg/a/a/d;->length:I
 
@@ -2751,11 +2751,11 @@
     goto :goto_4
 
     :cond_5
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {p1, v1}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, p1, Lorg/a/a/d;->length:I
 
@@ -2767,11 +2767,11 @@
     const/4 p1, 0x0
 
     :goto_5
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_e
 
-    iget v2, p0, Lorg/a/a/u;->bAt:I
+    iget v2, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v8, 0x2
 
@@ -2779,21 +2779,21 @@
 
     if-ne v2, v3, :cond_6
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH: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;->HP()Lorg/a/a/r;
+    invoke-virtual {p2}, Lorg/a/a/r;->HS()Lorg/a/a/r;
 
     move-result-object v0
 
-    iget-short v2, v0, Lorg/a/a/r;->bBo:S
+    iget-short v2, v0, Lorg/a/a/r;->bBy:S
 
     or-int/2addr v2, v8
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bBo:S
+    iput-short v2, v0, Lorg/a/a/r;->bBy:S
 
     invoke-direct {p0, v6, p2}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -2810,7 +2810,7 @@
 
     if-ne v2, v3, :cond_7
 
-    iget-object p2, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p2, v0, Lorg/a/a/r;->bBH: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
 
@@ -2819,49 +2819,49 @@
     :cond_7
     if-ne v2, v8, :cond_8
 
-    iget p2, p0, Lorg/a/a/u;->bCf:I
+    iget p2, p0, Lorg/a/a/u;->bCp:I
 
-    sget-object v0, Lorg/a/a/u;->bBC:[I
+    sget-object v0, Lorg/a/a/u;->bBM:[I
 
     aget v0, v0, v1
 
     add-int/2addr p2, v0
 
-    iput p2, p0, Lorg/a/a/u;->bCf:I
+    iput p2, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_6
 
     :cond_8
     if-ne v1, v4, :cond_a
 
-    iget-short v0, p2, Lorg/a/a/r;->bBo:S
+    iget-short v0, p2, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v0, v0, 0x20
 
     if-nez v0, :cond_9
 
-    iget-short v0, p2, Lorg/a/a/r;->bBo:S
+    iget-short v0, p2, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v0, v0, 0x20
 
     int-to-short v0, v0
 
-    iput-short v0, p2, Lorg/a/a/r;->bBo:S
+    iput-short v0, p2, Lorg/a/a/r;->bBy:S
 
-    iput-boolean v7, p0, Lorg/a/a/u;->bCl:Z
+    iput-boolean v7, p0, Lorg/a/a/u;->bCv:Z
 
     :cond_9
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-short v2, v0, Lorg/a/a/r;->bBo:S
+    iget-short v2, v0, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v2, v2, 0x10
 
     int-to-short v2, v2
 
-    iput-short v2, v0, Lorg/a/a/r;->bBo:S
+    iput-short v2, v0, Lorg/a/a/r;->bBy:S
 
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp:I
 
     add-int/2addr v0, v7
 
@@ -2874,17 +2874,17 @@
     goto :goto_6
 
     :cond_a
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp:I
 
-    sget-object v2, Lorg/a/a/u;->bBC:[I
+    sget-object v2, Lorg/a/a/u;->bBM:[I
 
     aget v2, v2, v1
 
     add-int/2addr v0, v2
 
-    iput v0, p0, Lorg/a/a/u;->bCf:I
+    iput v0, p0, Lorg/a/a/u;->bCp:I
 
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp:I
 
     invoke-direct {p0, v0, p2}, Lorg/a/a/u;->c(ILorg/a/a/r;)V
 
@@ -2894,13 +2894,13 @@
 
     if-eqz p1, :cond_c
 
-    iget-short p1, v9, Lorg/a/a/r;->bBo:S
+    iget-short p1, v9, Lorg/a/a/r;->bBy:S
 
     or-int/2addr p1, v8
 
     int-to-short p1, p1
 
-    iput-short p1, v9, Lorg/a/a/r;->bBo:S
+    iput-short p1, v9, Lorg/a/a/r;->bBy:S
 
     :cond_c
     invoke-virtual {p0, v9}, Lorg/a/a/u;->b(Lorg/a/a/r;)V
@@ -2908,7 +2908,7 @@
     :cond_d
     if-ne v1, v5, :cond_e
 
-    invoke-direct {p0}, Lorg/a/a/u;->HR()V
+    invoke-direct {p0}, Lorg/a/a/u;->HU()V
 
     :cond_e
     return-void
@@ -2921,7 +2921,7 @@
 
     if-eqz p3, :cond_1
 
-    iget-object v1, p0, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     if-nez v1, :cond_0
 
@@ -2929,26 +2929,26 @@
 
     invoke-direct {v1}, Lorg/a/a/d;-><init>()V
 
-    iput-object v1, p0, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iput-object v1, p0, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
     :cond_0
-    iget v1, p0, Lorg/a/a/u;->bBM:I
+    iget v1, p0, Lorg/a/a/u;->bBW:I
 
     add-int/2addr v1, v0
 
-    iput v1, p0, Lorg/a/a/u;->bBM:I
+    iput v1, p0, Lorg/a/a/u;->bBW:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bBN:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBX:Lorg/a/a/d;
 
-    iget v2, p4, Lorg/a/a/r;->bBr:I
+    iget v2, p4, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v1, v2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object v1
 
-    iget v2, p5, Lorg/a/a/r;->bBr:I
+    iget v2, p5, Lorg/a/a/r;->bBB:I
 
-    iget v3, p4, Lorg/a/a/r;->bBr:I
+    iget v3, p4, Lorg/a/a/r;->bBB:I
 
     sub-int/2addr v2, v3
 
@@ -2956,7 +2956,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2966,7 +2966,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v2, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -2979,7 +2979,7 @@
     invoke-virtual {p3, p6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :cond_1
-    iget-object p3, p0, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     if-nez p3, :cond_2
 
@@ -2987,26 +2987,26 @@
 
     invoke-direct {p3}, Lorg/a/a/d;-><init>()V
 
-    iput-object p3, p0, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iput-object p3, p0, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
     :cond_2
-    iget p3, p0, Lorg/a/a/u;->bBK:I
+    iget p3, p0, Lorg/a/a/u;->bBU:I
 
     add-int/2addr p3, v0
 
-    iput p3, p0, Lorg/a/a/u;->bBK:I
+    iput p3, p0, Lorg/a/a/u;->bBU:I
 
-    iget-object p3, p0, Lorg/a/a/u;->bBL:Lorg/a/a/d;
+    iget-object p3, p0, Lorg/a/a/u;->bBV:Lorg/a/a/d;
 
-    iget v1, p4, Lorg/a/a/r;->bBr:I
+    iget v1, p4, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {p3, v1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     move-result-object p3
 
-    iget p5, p5, Lorg/a/a/r;->bBr:I
+    iget p5, p5, Lorg/a/a/r;->bBB:I
 
-    iget p4, p4, Lorg/a/a/r;->bBr:I
+    iget p4, p4, Lorg/a/a/r;->bBB:I
 
     sub-int/2addr p5, p4
 
@@ -3014,7 +3014,7 @@
 
     move-result-object p3
 
-    iget-object p4, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p4, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p4, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -3024,7 +3024,7 @@
 
     move-result-object p1
 
-    iget-object p3, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p3, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p3, p2}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -3036,7 +3036,7 @@
 
     invoke-virtual {p1, p6}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/u;->bAt:I
+    iget p1, p0, Lorg/a/a/u;->bAD:I
 
     if-eqz p1, :cond_5
 
@@ -3060,11 +3060,11 @@
     :cond_4
     add-int/2addr p6, v0
 
-    iget p1, p0, Lorg/a/a/u;->bBE:I
+    iget p1, p0, Lorg/a/a/u;->bBO:I
 
     if-le p6, p1, :cond_5
 
-    iput p6, p0, Lorg/a/a/u;->bBE:I
+    iput p6, p0, Lorg/a/a/u;->bBO:I
 
     :cond_5
     return-void
@@ -3073,13 +3073,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;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO: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;
 
@@ -3093,7 +3093,7 @@
 
     move-result-object p1
 
-    iget-object p2, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget p3, p1, Lorg/a/a/y;->index:I
 
@@ -3101,17 +3101,17 @@
 
     invoke-virtual {p2, p4, p3}, Lorg/a/a/d;->V(II)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/4 p3, 0x0
 
     invoke-virtual {p2, p3}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz p2, :cond_3
 
-    iget p2, p0, Lorg/a/a/u;->bAt:I
+    iget p2, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v0, 0x4
 
@@ -3124,7 +3124,7 @@
     goto :goto_0
 
     :cond_0
-    invoke-virtual {p1}, Lorg/a/a/y;->HU()I
+    invoke-virtual {p1}, Lorg/a/a/y;->HX()I
 
     move-result p1
 
@@ -3136,28 +3136,28 @@
 
     add-int/lit8 p2, p2, 0x1
 
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     add-int/2addr p1, p2
 
-    iget p2, p0, Lorg/a/a/u;->bCg:I
+    iget p2, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, p2, :cond_1
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_1
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object p2, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p2, p2, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p2, p2, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO: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
 
@@ -3173,7 +3173,7 @@
 
     if-eqz p4, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p4}, Lorg/a/a/z;->ew(Ljava/lang/String;)Lorg/a/a/y;
 
@@ -3203,21 +3203,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;->bBG:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     if-nez p1, :cond_1
 
-    iput-object v6, p0, Lorg/a/a/u;->bBG:Lorg/a/a/q;
+    iput-object v6, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     goto :goto_1
 
     :cond_1
-    iget-object p1, p0, Lorg/a/a/u;->bBH:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBR:Lorg/a/a/q;
 
-    iput-object v6, p1, Lorg/a/a/q;->bBm:Lorg/a/a/q;
+    iput-object v6, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     :goto_1
-    iput-object v6, p0, Lorg/a/a/u;->bBH:Lorg/a/a/q;
+    iput-object v6, p0, Lorg/a/a/u;->bBR:Lorg/a/a/q;
 
     return-void
 .end method
@@ -3225,13 +3225,13 @@
 .method public final a(Lorg/a/a/r;[I[Lorg/a/a/r;)V
     .locals 5
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v1, 0xab
 
@@ -3239,7 +3239,7 @@
 
     move-result-object v0
 
-    iget-object v1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v1, v1, Lorg/a/a/d;->length:I
 
@@ -3255,15 +3255,15 @@
 
     invoke-virtual {v0, v3, v2, v1}, Lorg/a/a/d;->m([BII)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
-    iget v1, p0, Lorg/a/a/u;->bCn:I
+    iget v1, p0, Lorg/a/a/u;->bCx: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;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     array-length v1, p3
 
@@ -3274,7 +3274,7 @@
 
     if-ge v2, v0, :cond_0
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     aget v1, p2, v2
 
@@ -3282,9 +3282,9 @@
 
     aget-object v0, p3, v2
 
-    iget-object v1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
-    iget v4, p0, Lorg/a/a/u;->bCn:I
+    iget v4, p0, Lorg/a/a/u;->bCx:I
 
     invoke-virtual {v0, v1, v4, v3}, Lorg/a/a/r;->a(Lorg/a/a/d;IZ)V
 
@@ -3301,11 +3301,11 @@
 .method public final aa(II)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
     const/16 v0, 0x84
 
@@ -3324,7 +3324,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v1, v0}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -3336,7 +3336,7 @@
 
     :cond_1
     :goto_0
-    iget-object v1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v2, 0xc4
 
@@ -3351,11 +3351,11 @@
     invoke-virtual {v1, p2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     :goto_1
-    iget-object p2, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz p2, :cond_3
 
-    iget p2, p0, Lorg/a/a/u;->bAt:I
+    iget p2, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x4
 
@@ -3366,26 +3366,26 @@
     if-ne p2, v1, :cond_3
 
     :cond_2
-    iget-object p2, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object p2, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object p2, p2, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p2, p2, Lorg/a/a/r;->bBH: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;->bAt:I
+    iget p2, p0, Lorg/a/a/u;->bAD:I
 
     if-eqz p2, :cond_4
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bBE:I
+    iget p2, p0, Lorg/a/a/u;->bBO:I
 
     if-le p1, p2, :cond_4
 
-    iput p1, p0, Lorg/a/a/u;->bBE:I
+    iput p1, p0, Lorg/a/a/u;->bBO:I
 
     :cond_4
     return-void
@@ -3394,7 +3394,7 @@
 .method public final ab(II)V
     .locals 12
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x0
 
@@ -3406,52 +3406,52 @@
 
     if-ne v0, v4, :cond_c
 
-    iget-object p1, p0, Lorg/a/a/u;->bBG:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBQ: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;->bBl:Ljava/lang/String;
+    iget-object v0, p1, Lorg/a/a/q;->bBv:Ljava/lang/String;
 
     if-nez v0, :cond_0
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p1, Lorg/a/a/q;->bBl:Ljava/lang/String;
+    iget-object p2, p1, Lorg/a/a/q;->bBv:Ljava/lang/String;
 
     :goto_1
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO: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;->bBj:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/q;->bBt:Lorg/a/a/r;
 
-    invoke-virtual {v0}, Lorg/a/a/r;->HP()Lorg/a/a/r;
+    invoke-virtual {v0}, Lorg/a/a/r;->HS()Lorg/a/a/r;
 
     move-result-object v0
 
-    iget-short v4, v0, Lorg/a/a/r;->bBo:S
+    iget-short v4, v0, Lorg/a/a/r;->bBy:S
 
     or-int/2addr v4, v2
 
     int-to-short v4, v4
 
-    iput-short v4, v0, Lorg/a/a/r;->bBo:S
+    iput-short v4, v0, Lorg/a/a/r;->bBy:S
 
-    iget-object v4, p1, Lorg/a/a/q;->bBh:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/q;->bBr:Lorg/a/a/r;
 
-    invoke-virtual {v4}, Lorg/a/a/r;->HP()Lorg/a/a/r;
+    invoke-virtual {v4}, Lorg/a/a/r;->HS()Lorg/a/a/r;
 
     move-result-object v4
 
-    iget-object v5, p1, Lorg/a/a/q;->bBi:Lorg/a/a/r;
+    iget-object v5, p1, Lorg/a/a/q;->bBs:Lorg/a/a/r;
 
-    invoke-virtual {v5}, Lorg/a/a/r;->HP()Lorg/a/a/r;
+    invoke-virtual {v5}, Lorg/a/a/r;->HS()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;->bBz:Lorg/a/a/l;
+    iget-object v7, v4, Lorg/a/a/r;->bBJ: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;->bBz:Lorg/a/a/l;
+    iput-object v6, v4, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iget-object v4, v4, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     goto :goto_2
 
     :cond_1
-    iget-object p1, p1, Lorg/a/a/q;->bBm:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     goto :goto_0
 
     :cond_2
-    iget-object p1, p0, Lorg/a/a/u;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
-    iget-object p1, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object p1, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget v2, p0, Lorg/a/a/u;->bzU:I
+    iget v2, p0, Lorg/a/a/u;->bAe:I
 
     iget-object v4, p0, Lorg/a/a/u;->descriptor:Ljava/lang/String;
 
-    iget v5, p0, Lorg/a/a/u;->bBE:I
+    iget v5, p0, Lorg/a/a/u;->bBO: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;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
-    sget-object v0, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v0, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     const/4 v0, 0x0
 
     const/4 v2, 0x0
 
     :goto_3
-    sget-object v4, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
     if-eq p1, v4, :cond_6
 
-    iget-object v4, p1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iput-object v1, p1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v1, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iget-short v5, p1, Lorg/a/a/r;->bBo:S
+    iget-short v5, p1, Lorg/a/a/r;->bBy:S
 
     or-int/lit8 v5, v5, 0x8
 
     int-to-short v5, v5
 
-    iput-short v5, p1, Lorg/a/a/r;->bBo:S
+    iput-short v5, p1, Lorg/a/a/r;->bBy:S
 
-    iget-object v5, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v5, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v5, v5, Lorg/a/a/o;->bAX:[I
+    iget-object v5, v5, Lorg/a/a/o;->bBh:[I
 
     array-length v5, v5
 
-    iget-short v6, p1, Lorg/a/a/r;->bBv:S
+    iget-short v6, p1, Lorg/a/a/r;->bBF:S
 
     add-int/2addr v5, v6
 
@@ -3534,22 +3534,22 @@
     move v2, v5
 
     :cond_3
-    iget-object v5, p1, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v5, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
     :goto_4
     if-eqz v5, :cond_5
 
-    iget-object v6, v5, Lorg/a/a/l;->bAP:Lorg/a/a/r;
+    iget-object v6, v5, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    invoke-virtual {v6}, Lorg/a/a/r;->HP()Lorg/a/a/r;
+    invoke-virtual {v6}, Lorg/a/a/r;->HS()Lorg/a/a/r;
 
     move-result-object v6
 
-    iget-object v7, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v7, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v8, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v8, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v9, v6, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v9, v6, Lorg/a/a/r;->bBH: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;->bBA:Lorg/a/a/r;
+    iget-object v7, v6, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     if-nez v7, :cond_4
 
-    iput-object v4, v6, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v4, v6, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     move-object v4, v6
 
     :cond_4
-    iget-object v5, v5, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v5, v5, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
     goto :goto_4
 
@@ -3578,12 +3578,12 @@
     goto :goto_3
 
     :cond_6
-    iget-object p1, p0, Lorg/a/a/u;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
     :goto_5
     if-eqz p1, :cond_b
 
-    iget-short v1, p1, Lorg/a/a/r;->bBo:S
+    iget-short v1, p1, Lorg/a/a/r;->bBy:S
 
     const/16 v4, 0xa
 
@@ -3591,31 +3591,31 @@
 
     if-ne v1, v4, :cond_7
 
-    iget-object v1, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v1, p1, Lorg/a/a/r;->bBH: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;->bBo:S
+    iget-short v1, p1, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v1, v1, 0x8
 
     if-nez v1, :cond_a
 
-    iget-object v1, p1, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iget-object v1, p1, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
-    iget v4, p1, Lorg/a/a/r;->bBr:I
+    iget v4, p1, Lorg/a/a/r;->bBB:I
 
     if-nez v1, :cond_8
 
-    iget-object v5, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBP: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;->bBr:I
+    iget v5, v1, Lorg/a/a/r;->bBB: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;->bBF:Lorg/a/a/d;
+    iget-object v7, p0, Lorg/a/a/u;->bBP: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;->bBF:Lorg/a/a/d;
+    iget-object v6, p0, Lorg/a/a/u;->bBP: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;->n(III)I
 
-    iget-object v4, p0, Lorg/a/a/u;->bCk:[I
+    iget-object v4, p0, Lorg/a/a/u;->bCu:[I
 
     const/4 v5, 0x3
 
-    iget-object v6, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v6, p0, Lorg/a/a/u;->bzO: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;->HS()V
+    invoke-virtual {p0}, Lorg/a/a/u;->HV()V
 
-    iget-object v4, p0, Lorg/a/a/u;->bBG:Lorg/a/a/q;
+    iget-object v4, p0, Lorg/a/a/u;->bBQ: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;->bBG:Lorg/a/a/q;
+    iput-object v1, p0, Lorg/a/a/u;->bBQ: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;->bBy:Lorg/a/a/r;
+    iget-object p1, p1, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     goto :goto_5
 
     :cond_b
-    iput v2, p0, Lorg/a/a/u;->bBD:I
+    iput v2, p0, Lorg/a/a/u;->bBN:I
 
     return-void
 
     :cond_c
     if-ne v0, v3, :cond_1d
 
-    iget-object p1, p0, Lorg/a/a/u;->bBG:Lorg/a/a/q;
+    iget-object p1, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/q;
 
     :goto_8
     const p2, 0x7fffffff
 
     if-eqz p1, :cond_f
 
-    iget-object v0, p1, Lorg/a/a/q;->bBj:Lorg/a/a/r;
+    iget-object v0, p1, Lorg/a/a/q;->bBt:Lorg/a/a/r;
 
-    iget-object v2, p1, Lorg/a/a/q;->bBh:Lorg/a/a/r;
+    iget-object v2, p1, Lorg/a/a/q;->bBr:Lorg/a/a/r;
 
-    iget-object v4, p1, Lorg/a/a/q;->bBi:Lorg/a/a/r;
+    iget-object v4, p1, Lorg/a/a/q;->bBs:Lorg/a/a/r;
 
     :goto_9
     if-eq v2, v4, :cond_e
 
-    iget-short v5, v2, Lorg/a/a/r;->bBo:S
+    iget-short v5, v2, Lorg/a/a/r;->bBy: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;->bBz:Lorg/a/a/l;
+    iget-object v6, v2, Lorg/a/a/r;->bBJ: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;->bBz:Lorg/a/a/l;
+    iput-object v5, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
     goto :goto_a
 
     :cond_d
-    iget-object v5, v2, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v5, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v5, v5, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v5, v5, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
     new-instance v6, Lorg/a/a/l;
 
-    iget-object v7, v2, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v7, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v7, v7, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v7, v7, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
-    iget-object v7, v7, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v7, v7, Lorg/a/a/l;->bBa: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;->bAQ:Lorg/a/a/l;
+    iput-object v6, v5, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
     :goto_a
-    iget-object v2, v2, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iget-object v2, v2, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     goto :goto_9
 
     :cond_e
-    iget-object p1, p1, Lorg/a/a/q;->bBm:Lorg/a/a/q;
+    iget-object p1, p1, Lorg/a/a/q;->bBw:Lorg/a/a/q;
 
     goto :goto_8
 
     :cond_f
-    iget-boolean p1, p0, Lorg/a/a/u;->bCl:Z
+    iget-boolean p1, p0, Lorg/a/a/u;->bCv:Z
 
     if-eqz p1, :cond_16
 
-    iget-object p1, p0, Lorg/a/a/u;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm: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;->bCc:Lorg/a/a/r;
+    iget-object v2, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
     :goto_c
     if-eqz v2, :cond_11
 
-    iget-short v4, v2, Lorg/a/a/r;->bBo:S
+    iget-short v4, v2, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v4, v4, 0x10
 
     if-eqz v4, :cond_10
 
-    iget-short v4, v2, Lorg/a/a/r;->bBw:S
+    iget-short v4, v2, Lorg/a/a/r;->bBG:S
 
     if-ne v4, p1, :cond_10
 
-    iget-object v4, v2, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v4, v2, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
-    iget-object v4, v4, Lorg/a/a/l;->bAP:Lorg/a/a/r;
+    iget-object v4, v4, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    iget-short v5, v4, Lorg/a/a/r;->bBw:S
+    iget-short v5, v4, Lorg/a/a/r;->bBG: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;->bBy:Lorg/a/a/r;
+    iget-object v2, v2, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     goto :goto_c
 
@@ -3808,28 +3808,28 @@
     goto :goto_b
 
     :cond_12
-    iget-object p1, p0, Lorg/a/a/u;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
     :goto_d
     if-eqz p1, :cond_16
 
-    iget-short v0, p1, Lorg/a/a/r;->bBo:S
+    iget-short v0, p1, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v0, v0, 0x10
 
     if-eqz v0, :cond_15
 
-    iget-object v0, p1, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v0, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v0, v0, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
-    iget-object v0, v0, Lorg/a/a/l;->bAP:Lorg/a/a/r;
+    iget-object v0, v0, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    sget-object v2, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v2, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
-    sget-object v4, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
-    iput-object v4, v0, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v4, v0, Lorg/a/a/r;->bBK: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;->bBn:Lorg/a/a/r;
+    sget-object v4, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
     if-eq v2, v4, :cond_14
 
-    iget-object v4, v2, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v4, v2, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iput-object v0, v2, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v0, v2, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iget-short v0, v2, Lorg/a/a/r;->bBo:S
+    iget-short v0, v2, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 v0, v0, 0x40
 
     if-eqz v0, :cond_13
 
-    iget-short v0, v2, Lorg/a/a/r;->bBw:S
+    iget-short v0, v2, Lorg/a/a/r;->bBG:S
 
-    iget-short v5, p1, Lorg/a/a/r;->bBw:S
+    iget-short v5, p1, Lorg/a/a/r;->bBG:S
 
     if-eq v0, v5, :cond_13
 
     new-instance v0, Lorg/a/a/l;
 
-    iget-short v5, v2, Lorg/a/a/r;->bBu:S
+    iget-short v5, v2, Lorg/a/a/r;->bBE:S
 
-    iget-object v6, p1, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v6, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-object v6, v6, Lorg/a/a/l;->bAP:Lorg/a/a/r;
+    iget-object v6, v6, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    iget-object v7, v2, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v7, v2, Lorg/a/a/r;->bBJ: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;->bBz:Lorg/a/a/l;
+    iput-object v0, v2, Lorg/a/a/r;->bBJ: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;->bBn:Lorg/a/a/r;
+    sget-object v2, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
     if-eq v0, v2, :cond_15
 
-    iget-object v2, v0, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v2, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iput-object v1, v0, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v1, v0, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     move-object v0, v2
 
     goto :goto_f
 
     :cond_15
-    iget-object p1, p1, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iget-object p1, p1, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     goto :goto_d
 
     :cond_16
-    iget-object p1, p0, Lorg/a/a/u;->bCc:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCm:Lorg/a/a/r;
 
-    sget-object v0, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v0, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object v0, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iget v0, p0, Lorg/a/a/u;->bBD:I
+    iget v0, p0, Lorg/a/a/u;->bBN:I
 
     :cond_17
-    sget-object v1, Lorg/a/a/r;->bBn:Lorg/a/a/r;
+    sget-object v1, Lorg/a/a/r;->bBx:Lorg/a/a/r;
 
     if-eq p1, v1, :cond_1c
 
-    iget-object v1, p1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v1, p1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
-    iget-short v2, p1, Lorg/a/a/r;->bBt:S
+    iget-short v2, p1, Lorg/a/a/r;->bBD:S
 
-    iget-short v4, p1, Lorg/a/a/r;->bBv:S
+    iget-short v4, p1, Lorg/a/a/r;->bBF:S
 
     add-int/2addr v4, v2
 
@@ -3925,15 +3925,15 @@
     move v0, v4
 
     :cond_18
-    iget-object v4, p1, Lorg/a/a/r;->bBz:Lorg/a/a/l;
+    iget-object v4, p1, Lorg/a/a/r;->bBJ:Lorg/a/a/l;
 
-    iget-short p1, p1, Lorg/a/a/r;->bBo:S
+    iget-short p1, p1, Lorg/a/a/r;->bBy:S
 
     and-int/lit8 p1, p1, 0x10
 
     if-eqz p1, :cond_19
 
-    iget-object v4, v4, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bBa: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;->bAP:Lorg/a/a/r;
+    iget-object v1, v4, Lorg/a/a/l;->bAZ:Lorg/a/a/r;
 
-    iget-object v5, v1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iget-object v5, v1, Lorg/a/a/r;->bBK: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;->bBt:S
+    iput-short v5, v1, Lorg/a/a/r;->bBD:S
 
-    iput-object p1, v1, Lorg/a/a/r;->bBA:Lorg/a/a/r;
+    iput-object p1, v1, Lorg/a/a/r;->bBK:Lorg/a/a/r;
 
     move-object p1, v1
 
     :cond_1b
-    iget-object v4, v4, Lorg/a/a/l;->bAQ:Lorg/a/a/l;
+    iget-object v4, v4, Lorg/a/a/l;->bBa:Lorg/a/a/l;
 
     goto :goto_10
 
     :cond_1c
-    iput v0, p0, Lorg/a/a/u;->bBD:I
+    iput v0, p0, Lorg/a/a/u;->bBN:I
 
     return-void
 
     :cond_1d
     if-ne v0, v2, :cond_1e
 
-    iget p1, p0, Lorg/a/a/u;->bCg:I
+    iget p1, p0, Lorg/a/a/u;->bCq:I
 
-    iput p1, p0, Lorg/a/a/u;->bBD:I
+    iput p1, p0, Lorg/a/a/u;->bBN:I
 
     return-void
 
     :cond_1e
-    iput p1, p0, Lorg/a/a/u;->bBD:I
+    iput p1, p0, Lorg/a/a/u;->bBN:I
 
-    iput p2, p0, Lorg/a/a/u;->bBE:I
+    iput p2, p0, Lorg/a/a/u;->bBO:I
 
     return-void
 .end method
@@ -4007,7 +4007,7 @@
 
     and-int/2addr p1, v1
 
-    iget v1, p0, Lorg/a/a/u;->bCn:I
+    iget v1, p0, Lorg/a/a/u;->bCx:I
 
     shl-int/lit8 v1, v1, 0x8
 
@@ -4017,7 +4017,7 @@
 
     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;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -4035,26 +4035,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bCa: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;->bBQ:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bCb: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;->bBR:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bCb: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;->bBJ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -4070,22 +4070,22 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bBI:I
+    iget v0, p0, Lorg/a/a/u;->bBS:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bBI:I
+    iput v0, p0, Lorg/a/a/u;->bBS:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
-    iget p2, p2, Lorg/a/a/r;->bBr:I
+    iget p2, p2, Lorg/a/a/r;->bBB:I
 
     invoke-virtual {v0, p2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p2, p0, Lorg/a/a/u;->bBJ:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/u;->bBT:Lorg/a/a/d;
 
     invoke-virtual {p2, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
@@ -4095,11 +4095,11 @@
 .method public final b(Lorg/a/a/c;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iget-object v0, p0, Lorg/a/a/u;->bAC:Lorg/a/a/c;
 
-    iput-object v0, p1, Lorg/a/a/c;->bzL:Lorg/a/a/c;
+    iput-object v0, p1, Lorg/a/a/c;->bzV:Lorg/a/a/c;
 
-    iput-object p1, p0, Lorg/a/a/u;->bAs:Lorg/a/a/c;
+    iput-object p1, p0, Lorg/a/a/u;->bAC: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;->bCm:Z
+    iget-boolean v0, p0, Lorg/a/a/u;->bCw:Z
 
-    iget-object v1, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget-object v1, v1, Lorg/a/a/d;->data:[B
 
-    iget-object v2, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/u;->bBP: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;->bCm:Z
+    iput-boolean v0, p0, Lorg/a/a/u;->bCw:Z
 
-    iget-short v0, p1, Lorg/a/a/r;->bBo:S
+    iget-short v0, p1, Lorg/a/a/r;->bBy:S
 
     const/4 v1, 0x1
 
@@ -4136,7 +4136,7 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v2, 0x4
 
@@ -4146,23 +4146,23 @@
 
     if-ne v0, v2, :cond_5
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v0, p1, Lorg/a/a/r;->bBr:I
+    iget v0, p1, Lorg/a/a/r;->bBB:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bBr:I
+    iget v1, v1, Lorg/a/a/r;->bBB:I
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-short v1, v0, Lorg/a/a/r;->bBo:S
+    iget-short v1, v0, Lorg/a/a/r;->bBy:S
 
-    iget-short v2, p1, Lorg/a/a/r;->bBo:S
+    iget-short v2, p1, Lorg/a/a/r;->bBy:S
 
     and-int/2addr v2, v4
 
@@ -4170,13 +4170,13 @@
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bBo:S
+    iput-short v1, v0, Lorg/a/a/r;->bBy:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bBH: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;->bCd:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
     if-eqz v0, :cond_4
 
-    iget v0, p1, Lorg/a/a/r;->bBr:I
+    iget v0, p1, Lorg/a/a/r;->bBB:I
 
-    iget-object v1, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object v1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iget v1, v1, Lorg/a/a/r;->bBr:I
+    iget v1, v1, Lorg/a/a/r;->bBB:I
 
     if-ne v0, v1, :cond_3
 
-    iget-object v0, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iget-short v1, v0, Lorg/a/a/r;->bBo:S
+    iget-short v1, v0, Lorg/a/a/r;->bBy:S
 
-    iget-short v2, p1, Lorg/a/a/r;->bBo:S
+    iget-short v2, p1, Lorg/a/a/r;->bBy:S
 
     and-int/2addr v2, v4
 
@@ -4208,35 +4208,35 @@
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bBo:S
+    iput-short v1, v0, Lorg/a/a/r;->bBy:S
 
-    iget-object v0, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iput-object v0, p1, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object p1, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     return-void
 
     :cond_3
-    iget-object v0, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iput-object p1, v0, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     :cond_4
-    iput-object p1, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
-    iput-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCo: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;->bBx:Lorg/a/a/o;
+    iput-object v0, p1, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
     return-void
 
@@ -4245,64 +4245,64 @@
 
     if-ne v0, v2, :cond_7
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-nez v0, :cond_6
 
-    iput-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     return-void
 
     :cond_6
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iput-object p1, v0, Lorg/a/a/o;->bAV:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/o;->bBf:Lorg/a/a/r;
 
     return-void
 
     :cond_7
     if-ne v0, v1, :cond_a
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_8
 
-    iget v1, p0, Lorg/a/a/u;->bCg:I
+    iget v1, p0, Lorg/a/a/u;->bCq:I
 
     int-to-short v1, v1
 
-    iput-short v1, v0, Lorg/a/a/r;->bBv:S
+    iput-short v1, v0, Lorg/a/a/r;->bBF:S
 
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp: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;->bCe:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iput v3, p0, Lorg/a/a/u;->bCf:I
+    iput v3, p0, Lorg/a/a/u;->bCp:I
 
-    iput v3, p0, Lorg/a/a/u;->bCg:I
+    iput v3, p0, Lorg/a/a/u;->bCq:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
     if-eqz v0, :cond_9
 
-    iput-object p1, v0, Lorg/a/a/r;->bBy:Lorg/a/a/r;
+    iput-object p1, v0, Lorg/a/a/r;->bBI:Lorg/a/a/r;
 
     :cond_9
-    iput-object p1, p0, Lorg/a/a/u;->bCd:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCn:Lorg/a/a/r;
 
     return-void
 
     :cond_a
     if-ne v0, v4, :cond_b
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-nez v0, :cond_b
 
-    iput-object p1, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iput-object p1, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     :cond_b
     return-void
@@ -4311,13 +4311,13 @@
 .method public final bl(Ljava/lang/Object;)V
     .locals 7
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v0, p1}, Lorg/a/a/z;->bn(Ljava/lang/Object;)Lorg/a/a/y;
 
@@ -4325,7 +4325,7 @@
 
     iget v0, p1, Lorg/a/a/y;->index:I
 
-    iget v1, p1, Lorg/a/a/y;->bBe:I
+    iget v1, p1, Lorg/a/a/y;->bBo:I
 
     const/4 v2, 0x1
 
@@ -4335,13 +4335,13 @@
 
     if-eq v1, v4, :cond_1
 
-    iget v1, p1, Lorg/a/a/y;->bBe:I
+    iget v1, p1, Lorg/a/a/y;->bBo:I
 
     const/4 v4, 0x6
 
     if-eq v1, v4, :cond_1
 
-    iget v1, p1, Lorg/a/a/y;->bBe:I
+    iget v1, p1, Lorg/a/a/y;->bBo:I
 
     const/16 v4, 0x11
 
@@ -4377,7 +4377,7 @@
 
     if-eqz v1, :cond_2
 
-    iget-object v5, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v6, 0x14
 
@@ -4390,7 +4390,7 @@
 
     if-lt v0, v5, :cond_3
 
-    iget-object v5, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     const/16 v6, 0x13
 
@@ -4399,16 +4399,16 @@
     goto :goto_2
 
     :cond_3
-    iget-object v5, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v5, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v5, v4, v0}, Lorg/a/a/d;->U(II)Lorg/a/a/d;
 
     :goto_2
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_8
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v5, 0x4
 
@@ -4421,7 +4421,7 @@
     goto :goto_3
 
     :cond_4
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     if-eqz v1, :cond_5
 
@@ -4430,24 +4430,24 @@
     :cond_5
     add-int/2addr p1, v2
 
-    iget v0, p0, Lorg/a/a/u;->bCg:I
+    iget v0, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, v0, :cond_6
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_6
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_4
 
     :cond_7
     :goto_3
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO: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,7 +4467,7 @@
 
     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;->bzE:Lorg/a/a/z;
+    iget-object p1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p1, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -4485,26 +4485,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bBQ:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bCa: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;->bBQ:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bCa:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object p3, p0, Lorg/a/a/u;->bBR:Lorg/a/a/b;
+    iget-object p3, p0, Lorg/a/a/u;->bCb: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;->bBR:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bCb:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -4512,21 +4512,21 @@
 .method public final dR(I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_5
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x4
 
@@ -4539,30 +4539,30 @@
     goto :goto_0
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bCf:I
+    iget v0, p0, Lorg/a/a/u;->bCp:I
 
-    sget-object v1, Lorg/a/a/u;->bBC:[I
+    sget-object v1, Lorg/a/a/u;->bBM:[I
 
     aget v1, v1, p1
 
     add-int/2addr v0, v1
 
-    iget v1, p0, Lorg/a/a/u;->bCg:I
+    iget v1, p0, Lorg/a/a/u;->bCq:I
 
     if-le v0, v1, :cond_1
 
-    iput v0, p0, Lorg/a/a/u;->bCg:I
+    iput v0, p0, Lorg/a/a/u;->bCq:I
 
     :cond_1
-    iput v0, p0, Lorg/a/a/u;->bCf:I
+    iput v0, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH: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;->HR()V
+    invoke-direct {p0}, Lorg/a/a/u;->HU()V
 
     :cond_5
     return-void
@@ -4596,12 +4596,12 @@
 
     if-eqz p2, :cond_0
 
-    iput p1, p0, Lorg/a/a/u;->bBV:I
+    iput p1, p0, Lorg/a/a/u;->bCf:I
 
     return-void
 
     :cond_0
-    iput p1, p0, Lorg/a/a/u;->bBX:I
+    iput p1, p0, Lorg/a/a/u;->bCh:I
 
     return-void
 .end method
@@ -4609,13 +4609,13 @@
 .method public final h(ILjava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4623,17 +4623,17 @@
 
     move-result-object p2
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v1, p2, Lorg/a/a/y;->index:I
 
     invoke-virtual {v0, p1, v1}, Lorg/a/a/d;->V(II)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_3
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x4
 
@@ -4650,30 +4650,30 @@
 
     if-ne p1, p2, :cond_3
 
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iget p2, p0, Lorg/a/a/u;->bCg:I
+    iget p2, p0, Lorg/a/a/u;->bCq:I
 
     if-le p1, p2, :cond_1
 
-    iput p1, p0, Lorg/a/a/u;->bCg:I
+    iput p1, p0, Lorg/a/a/u;->bCq:I
 
     :cond_1
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_1
 
     :cond_2
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget v1, p0, Lorg/a/a/u;->bCn:I
+    iget v1, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/u;->bzO: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,7 +4689,7 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -4707,26 +4707,26 @@
 
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bAk:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/u;->bAu: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;->bAk:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAu:Lorg/a/a/b;
 
     return-object p1
 
     :cond_0
     new-instance p1, Lorg/a/a/b;
 
-    iget-object p2, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
-    iget-object v1, p0, Lorg/a/a/u;->bAl:Lorg/a/a/b;
+    iget-object v1, p0, Lorg/a/a/u;->bAv: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;->bAl:Lorg/a/a/b;
+    iput-object p1, p0, Lorg/a/a/u;->bAv:Lorg/a/a/b;
 
     return-object p1
 .end method
@@ -4738,7 +4738,7 @@
 
     add-int/2addr v0, p3
 
-    iget-object v1, p0, Lorg/a/a/u;->bCk:[I
+    iget-object v1, p0, Lorg/a/a/u;->bCu:[I
 
     if-eqz v1, :cond_0
 
@@ -4749,10 +4749,10 @@
     :cond_0
     new-array v0, v0, [I
 
-    iput-object v0, p0, Lorg/a/a/u;->bCk:[I
+    iput-object v0, p0, Lorg/a/a/u;->bCu:[I
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/u;->bCk:[I
+    iget-object v0, p0, Lorg/a/a/u;->bCu:[I
 
     const/4 v1, 0x0
 
@@ -4774,7 +4774,7 @@
 .method public final p(Ljava/lang/String;I)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     if-nez v0, :cond_0
 
@@ -4782,16 +4782,16 @@
 
     invoke-direct {v0}, Lorg/a/a/d;-><init>()V
 
-    iput-object v0, p0, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/u;->bCa:I
+    iget v0, p0, Lorg/a/a/u;->bCk:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/u;->bCa:I
+    iput v0, p0, Lorg/a/a/u;->bCk:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bCb:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bCl:Lorg/a/a/d;
 
     if-nez p1, :cond_1
 
@@ -4800,7 +4800,7 @@
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v1, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -4819,13 +4819,13 @@
 .method public final q(Ljava/lang/String;I)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v0, v0, Lorg/a/a/d;->length:I
 
-    iput v0, p0, Lorg/a/a/u;->bCn:I
+    iput v0, p0, Lorg/a/a/u;->bCx:I
 
-    iget-object v0, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/u;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -4833,7 +4833,7 @@
 
     move-result-object p1
 
-    iget-object v0, p0, Lorg/a/a/u;->bBF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/u;->bBP:Lorg/a/a/d;
 
     iget v1, p1, Lorg/a/a/y;->index:I
 
@@ -4845,11 +4845,11 @@
 
     invoke-virtual {v0, p2}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
     if-eqz v0, :cond_2
 
-    iget v0, p0, Lorg/a/a/u;->bAt:I
+    iget v0, p0, Lorg/a/a/u;->bAD:I
 
     const/4 v1, 0x4
 
@@ -4862,23 +4862,23 @@
     goto :goto_0
 
     :cond_0
-    iget p1, p0, Lorg/a/a/u;->bCf:I
+    iget p1, p0, Lorg/a/a/u;->bCp:I
 
     rsub-int/lit8 p2, p2, 0x1
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/a/a/u;->bCf:I
+    iput p1, p0, Lorg/a/a/u;->bCp:I
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lorg/a/a/u;->bCe:Lorg/a/a/r;
+    iget-object v0, p0, Lorg/a/a/u;->bCo:Lorg/a/a/r;
 
-    iget-object v0, v0, Lorg/a/a/r;->bBx:Lorg/a/a/o;
+    iget-object v0, v0, Lorg/a/a/r;->bBH:Lorg/a/a/o;
 
-    iget-object v1, p0, Lorg/a/a/u;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/u;->bzO: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
 
diff --git a/com.discord/smali_classes2/org/a/a/v.smali b/com.discord/smali_classes2/org/a/a/v.smali
index 08cd921108..a4beafa587 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 bCq:Lorg/a/a/v;
+.field protected bCA:Lorg/a/a/v;
 
-.field protected final bzC:I
+.field protected final bzM:I
 
 
 # direct methods
@@ -27,11 +27,11 @@
 
     const/high16 p1, 0x70000
 
-    iput p1, p0, Lorg/a/a/v;->bzC:I
+    iput p1, p0, Lorg/a/a/v;->bzM:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/v;->bCq:Lorg/a/a/v;
+    iput-object p1, p0, Lorg/a/a/v;->bCA: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;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA: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;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA: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;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA: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;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -93,7 +93,7 @@
 .method public et(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -106,7 +106,7 @@
 .method public eu(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
@@ -119,7 +119,7 @@
 .method public ev(Ljava/lang/String;)V
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/v;->bCq:Lorg/a/a/v;
+    iget-object v0, p0, Lorg/a/a/v;->bCA:Lorg/a/a/v;
 
     if-eqz v0, :cond_0
 
diff --git a/com.discord/smali_classes2/org/a/a/w.smali b/com.discord/smali_classes2/org/a/a/w.smali
index 69f1ffe302..a0e2ad1fea 100644
--- a/com.discord/smali_classes2/org/a/a/w.smali
+++ b/com.discord/smali_classes2/org/a/a/w.smali
@@ -4,13 +4,11 @@
 
 
 # instance fields
-.field bCA:I
+.field final bCB:I
 
-.field final bCB:Lorg/a/a/d;
+.field final bCC:I
 
-.field bCC:I
-
-.field final bCD:Lorg/a/a/d;
+.field final bCD:I
 
 .field bCE:I
 
@@ -18,25 +16,27 @@
 
 .field bCG:I
 
-.field final bCr:I
+.field final bCH:Lorg/a/a/d;
 
-.field final bCs:I
+.field bCI:I
 
-.field final bCt:I
+.field final bCJ:Lorg/a/a/d;
 
-.field bCu:I
+.field bCK:I
 
-.field final bCv:Lorg/a/a/d;
+.field final bCL:Lorg/a/a/d;
 
-.field bCw:I
+.field bCM:I
 
-.field final bCx:Lorg/a/a/d;
+.field final bCN:Lorg/a/a/d;
 
-.field bCy:I
+.field bCO:I
 
-.field final bCz:Lorg/a/a/d;
+.field final bCP:Lorg/a/a/d;
 
-.field final bzE:Lorg/a/a/z;
+.field bCQ:I
+
+.field final bzO:Lorg/a/a/z;
 
 
 # direct methods
@@ -45,43 +45,13 @@
 
     invoke-direct {p0}, Lorg/a/a/v;-><init>()V
 
-    iput-object p1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iput-object p1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
-    iput p2, p0, Lorg/a/a/w;->bCr:I
+    iput p2, p0, Lorg/a/a/w;->bCB:I
 
-    iput p3, p0, Lorg/a/a/w;->bCs:I
+    iput p3, p0, Lorg/a/a/w;->bCC:I
 
-    iput p4, p0, Lorg/a/a/w;->bCt: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;->bCv: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;->bCx: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;->bCz: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;->bCB: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;->bCD:Lorg/a/a/d;
+    iput p4, p0, Lorg/a/a/w;->bCD:I
 
     new-instance p1, Lorg/a/a/d;
 
@@ -89,6 +59,36 @@
 
     iput-object p1, p0, Lorg/a/a/w;->bCF: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;->bCH: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;->bCJ: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;->bCL: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;->bCN: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;->bCP: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;->bCx:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCH:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/16 v2, 0x14
 
@@ -119,14 +119,14 @@
 
     if-nez p3, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/w;->bCx:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCH:Lorg/a/a/d;
 
     invoke-virtual {p2, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/w;->bCx:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCH:Lorg/a/a/d;
 
     array-length v0, p3
 
@@ -139,9 +139,9 @@
 
     aget-object v0, p3, p1
 
-    iget-object v1, p0, Lorg/a/a/w;->bCx:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/w;->bCH:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/16 v3, 0x13
 
@@ -159,11 +159,11 @@
 
     :cond_1
     :goto_1
-    iget p1, p0, Lorg/a/a/w;->bCw:I
+    iget p1, p0, Lorg/a/a/w;->bCG:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCw:I
+    iput p1, p0, Lorg/a/a/w;->bCG: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;->bCz:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCJ:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/16 v2, 0x14
 
@@ -193,14 +193,14 @@
 
     if-nez p3, :cond_0
 
-    iget-object p2, p0, Lorg/a/a/w;->bCz:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCJ:Lorg/a/a/d;
 
     invoke-virtual {p2, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
     goto :goto_1
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/w;->bCz:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/w;->bCJ:Lorg/a/a/d;
 
     array-length v0, p3
 
@@ -213,9 +213,9 @@
 
     aget-object v0, p3, p1
 
-    iget-object v1, p0, Lorg/a/a/w;->bCz:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/w;->bCJ:Lorg/a/a/d;
 
-    iget-object v2, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v2, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/16 v3, 0x13
 
@@ -233,11 +233,11 @@
 
     :cond_1
     :goto_1
-    iget p1, p0, Lorg/a/a/w;->bCy:I
+    iget p1, p0, Lorg/a/a/w;->bCI:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCy:I
+    iput p1, p0, Lorg/a/a/w;->bCI: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;->bCD:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCN:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/4 v2, 0x7
 
@@ -259,7 +259,7 @@
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget-object p1, p0, Lorg/a/a/w;->bCD:Lorg/a/a/d;
+    iget-object p1, p0, Lorg/a/a/w;->bCN:Lorg/a/a/d;
 
     array-length v0, p2
 
@@ -274,9 +274,9 @@
 
     aget-object v1, p2, v0
 
-    iget-object v3, p0, Lorg/a/a/w;->bCD:Lorg/a/a/d;
+    iget-object v3, p0, Lorg/a/a/w;->bCN:Lorg/a/a/d;
 
-    iget-object v4, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v4, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     invoke-virtual {v4, v2, v1}, Lorg/a/a/z;->i(ILjava/lang/String;)Lorg/a/a/y;
 
@@ -291,11 +291,11 @@
     goto :goto_0
 
     :cond_0
-    iget p1, p0, Lorg/a/a/w;->bCC:I
+    iget p1, p0, Lorg/a/a/w;->bCM:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCC:I
+    iput p1, p0, Lorg/a/a/w;->bCM: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;->bCv:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCF:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/16 v2, 0x13
 
@@ -330,7 +330,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object p2, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object p2, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     invoke-virtual {p2, p3}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -339,11 +339,11 @@
     :goto_0
     invoke-virtual {p1, p2}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/w;->bCu:I
+    iget p1, p0, Lorg/a/a/w;->bCE:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCu:I
+    iput p1, p0, Lorg/a/a/w;->bCE:I
 
     return-void
 .end method
@@ -351,7 +351,7 @@
 .method public final et(Ljava/lang/String;)V
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v0, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/4 v1, 0x7
 
@@ -361,7 +361,7 @@
 
     iget p1, p1, Lorg/a/a/y;->index:I
 
-    iput p1, p0, Lorg/a/a/w;->bCG:I
+    iput p1, p0, Lorg/a/a/w;->bCQ:I
 
     return-void
 .end method
@@ -369,9 +369,9 @@
 .method public final eu(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/w;->bCF:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCP:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/16 v2, 0x14
 
@@ -383,11 +383,11 @@
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/w;->bCE:I
+    iget p1, p0, Lorg/a/a/w;->bCO:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCE:I
+    iput p1, p0, Lorg/a/a/w;->bCO:I
 
     return-void
 .end method
@@ -395,9 +395,9 @@
 .method public final ev(Ljava/lang/String;)V
     .locals 3
 
-    iget-object v0, p0, Lorg/a/a/w;->bCB:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/w;->bCL:Lorg/a/a/d;
 
-    iget-object v1, p0, Lorg/a/a/w;->bzE:Lorg/a/a/z;
+    iget-object v1, p0, Lorg/a/a/w;->bzO:Lorg/a/a/z;
 
     const/4 v2, 0x7
 
@@ -409,11 +409,11 @@
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dF(I)Lorg/a/a/d;
 
-    iget p1, p0, Lorg/a/a/w;->bCA:I
+    iget p1, p0, Lorg/a/a/w;->bCK:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lorg/a/a/w;->bCA:I
+    iput p1, p0, Lorg/a/a/w;->bCK: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 c62fab0dea..c2cc86e71d 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 bCH:Ljava/lang/Integer;
+.field public static final bCR:Ljava/lang/Integer;
 
-.field public static final bCI:Ljava/lang/Integer;
+.field public static final bCS:Ljava/lang/Integer;
 
-.field public static final bCJ:Ljava/lang/Integer;
+.field public static final bCT:Ljava/lang/Integer;
 
-.field public static final bCK:Ljava/lang/Integer;
+.field public static final bCU:Ljava/lang/Integer;
 
-.field public static final bCL:Ljava/lang/Integer;
+.field public static final bCV:Ljava/lang/Integer;
 
-.field public static final bCM:Ljava/lang/Integer;
+.field public static final bCW:Ljava/lang/Integer;
 
-.field public static final bCN:Ljava/lang/Integer;
+.field public static final bCX:Ljava/lang/Integer;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCH:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCR:Ljava/lang/Integer;
 
     const/4 v0, 0x1
 
@@ -37,7 +37,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCI:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCS:Ljava/lang/Integer;
 
     const/4 v0, 0x2
 
@@ -45,7 +45,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCJ:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCT:Ljava/lang/Integer;
 
     const/4 v0, 0x3
 
@@ -53,7 +53,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCK:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCU:Ljava/lang/Integer;
 
     const/4 v0, 0x4
 
@@ -61,7 +61,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCL:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCV:Ljava/lang/Integer;
 
     const/4 v0, 0x5
 
@@ -69,7 +69,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCM:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCW:Ljava/lang/Integer;
 
     const/4 v0, 0x6
 
@@ -77,7 +77,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/a/a/x;->bCN:Ljava/lang/Integer;
+    sput-object v0, Lorg/a/a/x;->bCX: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 e60d827b46..546b7c3d7e 100644
--- a/com.discord/smali_classes2/org/a/a/y.smali
+++ b/com.discord/smali_classes2/org/a/a/y.smali
@@ -4,11 +4,11 @@
 
 
 # instance fields
-.field final bBe:I
+.field final bBo:I
 
-.field final bBf:Ljava/lang/String;
+.field final bBp:Ljava/lang/String;
 
-.field final bCO:J
+.field final bCY:J
 
 .field final index:I
 
@@ -27,22 +27,22 @@
 
     iput p1, p0, Lorg/a/a/y;->index:I
 
-    iput p2, p0, Lorg/a/a/y;->bBe:I
+    iput p2, p0, Lorg/a/a/y;->bBo:I
 
-    iput-object p3, p0, Lorg/a/a/y;->bBf:Ljava/lang/String;
+    iput-object p3, p0, Lorg/a/a/y;->bBp: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;->bCO:J
+    iput-wide p6, p0, Lorg/a/a/y;->bCY:J
 
     return-void
 .end method
 
 
 # virtual methods
-.method final HU()I
+.method final HX()I
     .locals 1
 
     iget v0, p0, Lorg/a/a/y;->info:I
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 4f87719b12..1bfa6847e7 100644
--- a/com.discord/smali_classes2/org/a/a/z$a.smali
+++ b/com.discord/smali_classes2/org/a/a/z$a.smali
@@ -17,7 +17,7 @@
 # instance fields
 .field final aW:I
 
-.field bCZ:Lorg/a/a/z$a;
+.field bDj:Lorg/a/a/z$a;
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/org/a/a/z.smali b/com.discord/smali_classes2/org/a/a/z.smali
index 3c95642ccb..baa5a316b1 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 final bCP:Lorg/a/a/h;
+.field final bCZ:Lorg/a/a/h;
 
-.field final bCQ:Lorg/a/a/e;
+.field final bDa:Lorg/a/a/e;
 
-.field bCR:I
+.field bDb:I
 
-.field private bCS:I
+.field private bDc:I
 
-.field private bCT:[Lorg/a/a/z$a;
+.field private bDd:[Lorg/a/a/z$a;
 
-.field bCU:Lorg/a/a/d;
+.field bDe:Lorg/a/a/d;
 
-.field bCV:I
+.field bDf:I
 
-.field bCW:Lorg/a/a/d;
+.field bDg:Lorg/a/a/d;
 
-.field private bCX:I
+.field private bDh:I
 
-.field bCY:[Lorg/a/a/z$a;
+.field bDi:[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;->bCP:Lorg/a/a/h;
+    iput-object p1, p0, Lorg/a/a/z;->bCZ:Lorg/a/a/h;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/a/a/z;->bCQ:Lorg/a/a/e;
+    iput-object p1, p0, Lorg/a/a/z;->bDa: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;->bCT:[Lorg/a/a/z$a;
+    iput-object p1, p0, Lorg/a/a/z;->bDd:[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;->bCU:Lorg/a/a/d;
+    iput-object p1, p0, Lorg/a/a/z;->bDe: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;->bCS:I
+    iget v0, p0, Lorg/a/a/z;->bDc:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bCT:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bDd:[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;->bCT:[Lorg/a/a/z$a;
+    iget-object v3, p0, Lorg/a/a/z;->bDd:[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;->bCZ:Lorg/a/a/z$a;
+    iget-object v5, v3, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     aget-object v6, v2, v4
 
-    iput-object v6, v3, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iput-object v6, v3, Lorg/a/a/z$a;->bDj: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;->bCT:[Lorg/a/a/z$a;
+    iput-object v2, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
 
     :cond_2
-    iget v0, p0, Lorg/a/a/z;->bCS:I
+    iget v0, p0, Lorg/a/a/z;->bDc:I
 
     add-int/lit8 v0, v0, 0x1
 
-    iput v0, p0, Lorg/a/a/z;->bCS:I
+    iput v0, p0, Lorg/a/a/z;->bDc:I
 
     iget v0, p1, Lorg/a/a/z$a;->aW:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bCT:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bDd:[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;->bCZ:Lorg/a/a/z$a;
+    iput-object v2, p1, Lorg/a/a/z$a;->bDj: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;->bCY:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDi:[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;->bCY:[Lorg/a/a/z$a;
+    iput-object v0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
     :cond_0
-    iget v0, p0, Lorg/a/a/z;->bCX:I
+    iget v0, p0, Lorg/a/a/z;->bDh:I
 
-    iget-object v1, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object v1, p0, Lorg/a/a/z;->bDi:[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;->bCY:[Lorg/a/a/z$a;
+    iput-object v0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDi:[Lorg/a/a/z$a;
 
-    iget v1, p0, Lorg/a/a/z;->bCX:I
+    iget v1, p0, Lorg/a/a/z;->bDh:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/a/a/z;->bCX:I
+    iput v2, p0, Lorg/a/a/z;->bDh:I
 
     aput-object p1, v0, v1
 
@@ -273,7 +273,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBe:I
+    iget v1, v0, Lorg/a/a/z$a;->bBo:I
 
     const/16 v2, 0xf
 
@@ -283,7 +283,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCO:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
 
     int-to-long v3, p1
 
@@ -291,7 +291,7 @@
 
     if-nez v5, :cond_0
 
-    iget-object v1, v0, Lorg/a/a/z$a;->bBf:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/z$a;->bBp: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;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj: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;->bCU:Lorg/a/a/d;
+    iget-object p5, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {p0, p2, p3, p4}, Lorg/a/a/z;->m(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/a/a/y;
 
@@ -340,7 +340,7 @@
     goto :goto_1
 
     :cond_2
-    iget-object v0, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {p0, p2, p3, p4, p5}, Lorg/a/a/z;->c(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lorg/a/a/y;
 
@@ -412,7 +412,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBe:I
+    iget v1, v0, Lorg/a/a/z$a;->bBo:I
 
     if-ne v1, p1, :cond_0
 
@@ -420,7 +420,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-object v1, v0, Lorg/a/a/z$a;->bBf:Ljava/lang/String;
+    iget-object v1, v0, Lorg/a/a/z$a;->bBp:Ljava/lang/String;
 
     invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
 
@@ -447,12 +447,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     const/4 v1, 0x7
 
@@ -554,7 +554,7 @@
 .method private dS(I)Lorg/a/a/z$a;
     .locals 2
 
-    iget-object v0, p0, Lorg/a/a/z;->bCT:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDd:[Lorg/a/a/z$a;
 
     array-length v1, v0
 
@@ -606,7 +606,7 @@
 .method private o(III)Lorg/a/a/y;
     .locals 8
 
-    iget-object v0, p0, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     iget-object v0, v0, Lorg/a/a/d;->data:[B
 
@@ -617,7 +617,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    iget v2, v1, Lorg/a/a/z$a;->bBe:I
+    iget v2, v1, Lorg/a/a/z$a;->bBo:I
 
     const/16 v3, 0x40
 
@@ -627,7 +627,7 @@
 
     if-ne v2, p3, :cond_2
 
-    iget-wide v2, v1, Lorg/a/a/z$a;->bCO:J
+    iget-wide v2, v1, Lorg/a/a/z$a;->bCY:J
 
     long-to-int v3, v2
 
@@ -661,25 +661,25 @@
     :goto_2
     if-eqz v2, :cond_2
 
-    iget-object p2, p0, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object p2, p0, Lorg/a/a/z;->bDg: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;->bCZ:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bDj: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;->bCV:I
+    iget v3, p0, Lorg/a/a/z;->bDf:I
 
     add-int/lit8 v0, v3, 0x1
 
-    iput v0, p0, Lorg/a/a/z;->bCV:I
+    iput v0, p0, Lorg/a/a/z;->bDf:I
 
     const/16 v4, 0x40
 
@@ -734,10 +734,10 @@
     return-object p1
 .end method
 
-.method final HV()I
+.method final HY()I
     .locals 1
 
-    iget-object v0, p0, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     if-eqz v0, :cond_0
 
@@ -745,7 +745,7 @@
 
     invoke-virtual {p0, v0}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
-    iget-object v0, p0, Lorg/a/a/z;->bCW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDg: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;->bCW:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDg: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;->bCW:Lorg/a/a/d;
+    iput-object v0, p0, Lorg/a/a/z;->bDg:Lorg/a/a/d;
 
     :cond_0
     array-length v1, p2
@@ -793,15 +793,15 @@
     :cond_1
     iget v1, v0, Lorg/a/a/d;->length:I
 
-    iget v4, p1, Lorg/a/a/p;->bBe:I
+    iget v4, p1, Lorg/a/a/p;->bBo:I
 
-    iget-object v5, p1, Lorg/a/a/p;->bBf:Ljava/lang/String;
+    iget-object v5, p1, Lorg/a/a/p;->bBp: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;->bBg:Z
+    iget-boolean v8, p1, Lorg/a/a/p;->bBq:Z
 
     move-object v3, p0
 
@@ -892,7 +892,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBe:I
+    iget v1, v0, Lorg/a/a/z$a;->bBo:I
 
     if-ne v1, p1, :cond_0
 
@@ -900,7 +900,7 @@
 
     if-ne v1, v7, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCO:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
 
     int-to-long v3, p2
 
@@ -911,12 +911,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -977,7 +977,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v2, v0, Lorg/a/a/z$a;->bBe:I
+    iget v2, v0, Lorg/a/a/z$a;->bBo:I
 
     if-ne v2, v1, :cond_0
 
@@ -985,7 +985,7 @@
 
     if-ne v2, v9, :cond_0
 
-    iget-wide v2, v0, Lorg/a/a/z$a;->bCO:J
+    iget-wide v2, v0, Lorg/a/a/z$a;->bCY:J
 
     cmp-long v4, v2, v7
 
@@ -996,24 +996,24 @@
     return p1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bCY:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDi:[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;->bCY:[Lorg/a/a/z$a;
+    iget-object v0, p0, Lorg/a/a/z;->bDi:[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;->bCP:Lorg/a/a/h;
+    iget-object v0, p0, Lorg/a/a/z;->bCZ:Lorg/a/a/h;
 
     invoke-virtual {v0, p1, p2}, Lorg/a/a/h;->au(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
@@ -1025,7 +1025,7 @@
 
     new-instance p2, Lorg/a/a/z$a;
 
-    iget v5, p0, Lorg/a/a/z;->bCX:I
+    iget v5, p0, Lorg/a/a/z;->bDh:I
 
     const/16 v6, 0x82
 
@@ -1058,7 +1058,7 @@
 
     if-eqz v1, :cond_1
 
-    iget v3, v1, Lorg/a/a/z$a;->bBe:I
+    iget v3, v1, Lorg/a/a/z$a;->bBo:I
 
     if-ne v3, v2, :cond_0
 
@@ -1087,12 +1087,12 @@
     return p1
 
     :cond_0
-    iget-object v1, v1, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {p0, p1}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1287,7 +1287,7 @@
 
     check-cast p1, Lorg/a/a/aa;
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->Ia()I
+    invoke-virtual {p1}, Lorg/a/a/aa;->Id()I
 
     move-result v0
 
@@ -1297,7 +1297,7 @@
 
     if-ne v0, v1, :cond_9
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->HY()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ib()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1312,7 +1312,7 @@
 
     if-ne v0, v1, :cond_a
 
-    invoke-virtual {p1}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1325,7 +1325,7 @@
     return-object p1
 
     :cond_a
-    invoke-virtual {p1}, Lorg/a/a/aa;->HZ()Ljava/lang/String;
+    invoke-virtual {p1}, Lorg/a/a/aa;->Ic()Ljava/lang/String;
 
     move-result-object p1
 
@@ -1342,15 +1342,15 @@
 
     check-cast p1, Lorg/a/a/p;
 
-    iget v1, p1, Lorg/a/a/p;->bBe:I
+    iget v1, p1, Lorg/a/a/p;->bBo:I
 
-    iget-object v2, p1, Lorg/a/a/p;->bBf:Ljava/lang/String;
+    iget-object v2, p1, Lorg/a/a/p;->bBp: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;->bBg:Z
+    iget-boolean v5, p1, Lorg/a/a/p;->bBq:Z
 
     move-object v0, p0
 
@@ -1371,9 +1371,9 @@
 
     iget-object v1, p1, Lorg/a/a/i;->descriptor:Ljava/lang/String;
 
-    iget-object v2, p1, Lorg/a/a/i;->bAu:Lorg/a/a/p;
+    iget-object v2, p1, Lorg/a/a/i;->bAE:Lorg/a/a/p;
 
-    iget-object p1, p1, Lorg/a/a/i;->bAv:[Ljava/lang/Object;
+    iget-object p1, p1, Lorg/a/a/i;->bAF:[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;
 
@@ -1413,7 +1413,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBe:I
+    iget v1, v0, Lorg/a/a/z$a;->bBo:I
 
     if-ne v1, p1, :cond_0
 
@@ -1421,7 +1421,7 @@
 
     if-ne v1, v8, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCO:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
 
     int-to-long v3, p4
 
@@ -1448,12 +1448,12 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v0, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {p0, p2, p3}, Lorg/a/a/z;->av(Ljava/lang/String;Ljava/lang/String;)I
 
@@ -1538,7 +1538,7 @@
     :goto_0
     if-eqz v2, :cond_1
 
-    iget v3, v2, Lorg/a/a/z$a;->bBe:I
+    iget v3, v2, Lorg/a/a/z$a;->bBo:I
 
     if-ne v3, v0, :cond_0
 
@@ -1559,12 +1559,12 @@
     return p1
 
     :cond_0
-    iget-object v2, v2, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v2, v2, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v2, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v2, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {v2, v0}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -1607,7 +1607,7 @@
     :goto_0
     if-eqz v2, :cond_1
 
-    iget v3, v2, Lorg/a/a/z$a;->bBe:I
+    iget v3, v2, Lorg/a/a/z$a;->bBo:I
 
     if-ne v3, v0, :cond_0
 
@@ -1628,14 +1628,14 @@
     return p1
 
     :cond_0
-    iget-object v2, v2, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v2, v2, Lorg/a/a/z$a;->bDj: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;->bCX:I
+    iget v3, p0, Lorg/a/a/z;->bDh:I
 
     invoke-direct {v2, v3, v0, p1, v1}, Lorg/a/a/z$a;-><init>(IILjava/lang/String;I)V
 
@@ -1676,7 +1676,7 @@
     :goto_0
     if-eqz v1, :cond_1
 
-    iget v2, v1, Lorg/a/a/z$a;->bBe:I
+    iget v2, v1, Lorg/a/a/z$a;->bBo:I
 
     if-ne v2, p1, :cond_0
 
@@ -1695,12 +1695,12 @@
     return-object v1
 
     :cond_0
-    iget-object v1, v1, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v1, v1, Lorg/a/a/z$a;->bDj:Lorg/a/a/z$a;
 
     goto :goto_0
 
     :cond_1
-    iget-object v1, p0, Lorg/a/a/z;->bCU:Lorg/a/a/d;
+    iget-object v1, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {p0, p2}, Lorg/a/a/z;->ex(Ljava/lang/String;)I
 
@@ -1751,7 +1751,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBe:I
+    iget v1, v0, Lorg/a/a/z$a;->bBo:I
 
     if-ne v1, p1, :cond_0
 
@@ -1759,7 +1759,7 @@
 
     if-ne v1, v5, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCO:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
 
     cmp-long v3, v1, p2
 
@@ -1768,14 +1768,14 @@
     return-object v0
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj: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;->bCU:Lorg/a/a/d;
+    iget-object v0, p0, Lorg/a/a/z;->bDe:Lorg/a/a/d;
 
     invoke-virtual {v0, p1}, Lorg/a/a/d;->dE(I)Lorg/a/a/d;
 
@@ -1820,7 +1820,7 @@
     :goto_0
     if-eqz v0, :cond_1
 
-    iget v1, v0, Lorg/a/a/z$a;->bBe:I
+    iget v1, v0, Lorg/a/a/z$a;->bBo:I
 
     const/16 v2, 0x81
 
@@ -1830,7 +1830,7 @@
 
     if-ne v1, v5, :cond_0
 
-    iget-wide v1, v0, Lorg/a/a/z$a;->bCO:J
+    iget-wide v1, v0, Lorg/a/a/z$a;->bCY:J
 
     int-to-long v3, p2
 
@@ -1851,14 +1851,14 @@
     return p1
 
     :cond_0
-    iget-object v0, v0, Lorg/a/a/z$a;->bCZ:Lorg/a/a/z$a;
+    iget-object v0, v0, Lorg/a/a/z$a;->bDj: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;->bCX:I
+    iget v1, p0, Lorg/a/a/z;->bDh:I
 
     int-to-long v3, p2
 
diff --git a/com.discord/smali_classes2/org/apache/commons/a/a.smali b/com.discord/smali_classes2/org/apache/commons/a/a.smali
index 980c38be27..705e918244 100644
--- a/com.discord/smali_classes2/org/apache/commons/a/a.smali
+++ b/com.discord/smali_classes2/org/apache/commons/a/a.smali
@@ -6,15 +6,15 @@
 # static fields
 .field public static final UTF_16:Ljava/nio/charset/Charset;
 
-.field public static final biF:Ljava/nio/charset/Charset;
+.field public static final biP:Ljava/nio/charset/Charset;
 
-.field public static final biG:Ljava/nio/charset/Charset;
+.field public static final biQ:Ljava/nio/charset/Charset;
 
-.field public static final biH:Ljava/nio/charset/Charset;
+.field public static final biR:Ljava/nio/charset/Charset;
 
-.field public static final biI:Ljava/nio/charset/Charset;
+.field public static final biS:Ljava/nio/charset/Charset;
 
-.field public static final tx:Ljava/nio/charset/Charset;
+.field public static final tw:Ljava/nio/charset/Charset;
 
 
 # direct methods
@@ -27,7 +27,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/apache/commons/a/a;->biI:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biS:Ljava/nio/charset/Charset;
 
     const-string v0, "US-ASCII"
 
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/apache/commons/a/a;->biH:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biR:Ljava/nio/charset/Charset;
 
     const-string v0, "UTF-16"
 
@@ -51,7 +51,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/apache/commons/a/a;->biF:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biP:Ljava/nio/charset/Charset;
 
     const-string v0, "UTF-16LE"
 
@@ -59,7 +59,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/apache/commons/a/a;->biG:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->biQ:Ljava/nio/charset/Charset;
 
     const-string v0, "UTF-8"
 
@@ -67,7 +67,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/apache/commons/a/a;->tx:Ljava/nio/charset/Charset;
+    sput-object v0, Lorg/apache/commons/a/a;->tw:Ljava/nio/charset/Charset;
 
     return-void
 .end method
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 3ff37554fa..151e13cb98 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 bzh:[B
+.field private static final bzr:[B
 
-.field private static final bzi:[B
+.field private static final bzs:[B
 
-.field private static final bzj:[B
+.field private static final bzt:[B
 
-.field private static final bzk:[B
+.field private static final bzu:[B
 
-.field private static final bzl:[B
+.field private static final bzv:[B
 
 
 # instance fields
-.field private final bzm:I
+.field private final bzA:[B
 
-.field private final bzn:[B
+.field private final bzw:I
 
-.field private final bzo:I
+.field private final bzx:[B
 
-.field private final bzp:[B
+.field private final bzy:I
 
-.field private final bzq:[B
+.field private final bzz:[B
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bzh:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bzr:[B
 
     const/16 v0, 0x5b
 
@@ -45,7 +45,7 @@
 
     fill-array-data v0, :array_1
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bzi:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bzs:[B
 
     const/16 v0, 0x20
 
@@ -53,7 +53,7 @@
 
     fill-array-data v1, :array_2
 
-    sput-object v1, Lorg/apache/commons/a/a/a;->bzj:[B
+    sput-object v1, Lorg/apache/commons/a/a/a;->bzt:[B
 
     const/16 v1, 0x58
 
@@ -61,13 +61,13 @@
 
     fill-array-data v1, :array_3
 
-    sput-object v1, Lorg/apache/commons/a/a/a;->bzk:[B
+    sput-object v1, Lorg/apache/commons/a/a/a;->bzu:[B
 
     new-array v0, v0, [B
 
     fill-array-data v0, :array_4
 
-    sput-object v0, Lorg/apache/commons/a/a/a;->bzl:[B
+    sput-object v0, Lorg/apache/commons/a/a/a;->bzv:[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;->bzj:[B
+    sget-object p1, Lorg/apache/commons/a/a/a;->bzt:[B
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzp:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    sget-object p1, Lorg/apache/commons/a/a/a;->bzi:[B
+    sget-object p1, Lorg/apache/commons/a/a/a;->bzs:[B
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzn:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzx:[B
 
     const/16 p1, 0x8
 
-    iput p1, p0, Lorg/apache/commons/a/a/a;->bzo:I
+    iput p1, p0, Lorg/apache/commons/a/a/a;->bzy:I
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzq:[B
+    iput-object p1, p0, Lorg/apache/commons/a/a/a;->bzA:[B
 
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bzo:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bzy:I
 
     add-int/lit8 p1, p1, -0x1
 
-    iput p1, p0, Lorg/apache/commons/a/a/a;->bzm:I
+    iput p1, p0, Lorg/apache/commons/a/a/a;->bzw:I
 
     return-void
 .end method
@@ -398,7 +398,7 @@
 .method final a([BIILorg/apache/commons/a/a/b$a;)V
     .locals 11
 
-    iget-boolean v0, p4, Lorg/apache/commons/a/a/b$a;->bzz:Z
+    iget-boolean v0, p4, Lorg/apache/commons/a/a/b$a;->bzJ:Z
 
     if-eqz v0, :cond_0
 
@@ -411,20 +411,20 @@
 
     if-gez p3, :cond_8
 
-    iput-boolean v1, p4, Lorg/apache/commons/a/a/b$a;->bzz:Z
+    iput-boolean v1, p4, Lorg/apache/commons/a/a/b$a;->bzJ:Z
 
-    iget p1, p4, Lorg/apache/commons/a/a/b$a;->bzB:I
+    iget p1, p4, Lorg/apache/commons/a/a/b$a;->bzL:I
 
     if-nez p1, :cond_1
 
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bzu:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bzE:I
 
     if-nez p1, :cond_1
 
     return-void
 
     :cond_1
-    iget p1, p0, Lorg/apache/commons/a/a/a;->bzo:I
+    iget p1, p0, Lorg/apache/commons/a/a/a;->bzy: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;->bzB:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzL: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzB:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzL: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v2, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v2, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v5, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
 
     shl-long v2, v5, v3
 
@@ -976,7 +976,7 @@
 
     :cond_6
     :goto_0
-    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzA:I
+    iget p3, p4, Lorg/apache/commons/a/a/b$a;->bzK: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;->bzA:I
+    iput p3, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
 
-    iget p2, p0, Lorg/apache/commons/a/a/a;->bzu:I
+    iget p2, p0, Lorg/apache/commons/a/a/a;->bzE:I
 
     if-lez p2, :cond_7
 
-    iget p2, p4, Lorg/apache/commons/a/a/b$a;->bzA:I
+    iget p2, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
 
     if-lez p2, :cond_7
 
-    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bzq:[B
+    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bzA:[B
 
     iget p3, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzq:[B
+    iget-object v1, p0, Lorg/apache/commons/a/a/a;->bzA:[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;->bzq:[B
+    iget-object p2, p0, Lorg/apache/commons/a/a/a;->bzA:[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;->bzo:I
+    iget v3, p0, Lorg/apache/commons/a/a/a;->bzy: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;->bzB:I
+    iget v4, p4, Lorg/apache/commons/a/a/b$a;->bzL: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;->bzB:I
+    iput v4, p4, Lorg/apache/commons/a/a/b$a;->bzL: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;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzx:J
+    iput-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH:J
 
-    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bzB:I
+    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bzL: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v9, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzp:[B
+    iget-object v5, p0, Lorg/apache/commons/a/a/a;->bzz:[B
 
-    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzx:J
+    iget-wide v6, p4, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzA:I
+    iget v2, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
 
     add-int/2addr v2, v8
 
-    iput v2, p4, Lorg/apache/commons/a/a/b$a;->bzA:I
+    iput v2, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
 
-    iget v2, p0, Lorg/apache/commons/a/a/a;->bzu:I
+    iget v2, p0, Lorg/apache/commons/a/a/a;->bzE:I
 
     if-lez v2, :cond_a
 
-    iget v2, p0, Lorg/apache/commons/a/a/a;->bzu:I
+    iget v2, p0, Lorg/apache/commons/a/a/a;->bzE:I
 
-    iget v5, p4, Lorg/apache/commons/a/a/b$a;->bzA:I
+    iget v5, p4, Lorg/apache/commons/a/a/b$a;->bzK:I
 
     if-gt v2, v5, :cond_a
 
-    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzq:[B
+    iget-object v2, p0, Lorg/apache/commons/a/a/a;->bzA:[B
 
     iget v5, p4, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzq:[B
+    iget-object v6, p0, Lorg/apache/commons/a/a/a;->bzA:[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;->bzq:[B
+    iget-object v3, p0, Lorg/apache/commons/a/a/a;->bzA:[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;->bzA:I
+    iput v0, p4, Lorg/apache/commons/a/a/b$a;->bzK: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 8d01fa1aa7..71cca2ff1e 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
@@ -17,17 +17,17 @@
 # instance fields
 .field public buffer:[B
 
-.field bzA:I
+.field bzG:I
 
-.field bzB:I
+.field bzH:J
 
-.field bzw:I
+.field public bzI:I
 
-.field bzx:J
+.field public bzJ:Z
 
-.field public bzy:I
+.field bzK:I
 
-.field public bzz:Z
+.field bzL:I
 
 .field public pos:I
 
@@ -72,7 +72,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzA:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzK:I
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -82,7 +82,7 @@
 
     aput-object v1, v0, v2
 
-    iget-boolean v1, p0, Lorg/apache/commons/a/a/b$a;->bzz:Z
+    iget-boolean v1, p0, Lorg/apache/commons/a/a/b$a;->bzJ:Z
 
     invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
 
@@ -92,7 +92,7 @@
 
     aput-object v1, v0, v2
 
-    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzw:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzG: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;->bzx:J
+    iget-wide v1, p0, Lorg/apache/commons/a/a/b$a;->bzH: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;->bzB:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzL: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;->bzy:I
+    iget v1, p0, Lorg/apache/commons/a/a/b$a;->bzI: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 696a29a9e3..aaad4d63bc 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 bzr:B
+.field protected final bzB:B
 
-.field private final bzs:I
+.field private final bzC:I
 
-.field private final bzt:I
+.field private final bzD:I
 
-.field protected final bzu:I
+.field protected final bzE:I
 
-.field private final bzv:I
+.field private final bzF:I
 
 
 # direct methods
@@ -31,21 +31,21 @@
 
     const/16 p1, 0x3d
 
-    iput-byte p1, p0, Lorg/apache/commons/a/a/b;->bzr:B
+    iput-byte p1, p0, Lorg/apache/commons/a/a/b;->bzB:B
 
     const/4 p1, 0x5
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzs:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzC:I
 
     const/16 p1, 0x8
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzt:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzD:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzu:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzE:I
 
-    iput p1, p0, Lorg/apache/commons/a/a/b;->bzv:I
+    iput p1, p0, Lorg/apache/commons/a/a/b;->bzF:I
 
     return-void
 .end method
@@ -95,7 +95,7 @@
 
     iput v0, p2, Lorg/apache/commons/a/a/b$a;->pos:I
 
-    iput v0, p2, Lorg/apache/commons/a/a/b$a;->bzy:I
+    iput v0, p2, Lorg/apache/commons/a/a/b$a;->bzI:I
 
     goto :goto_1
 
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 e6e500ad73..c394c86e29 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 bDp:Ljava/lang/reflect/Method;
+.field private final bDz: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;->Ic()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/a;->If()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/a;->bDp:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/a;->bDz:Ljava/lang/reflect/Method;
 
     return-void
 .end method
 
-.method private static Ic()Ljava/lang/reflect/Method;
+.method private static If()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;->bDp:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/a;->bDz: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 8dc38398e8..f9fd47e559 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 bDq:Ljava/lang/reflect/Method;
+.field private final bDA:Ljava/lang/reflect/Method;
 
-.field private final bDr:Ljava/lang/Integer;
+.field private final bDB: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;->Id()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/b;->Ig()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->bDq:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/b;->bDA:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/b;->Ie()Ljava/lang/Integer;
+    invoke-static {}, Lorg/b/a/a/b;->Ih()Ljava/lang/Integer;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/b;->bDr:Ljava/lang/Integer;
+    iput-object p1, p0, Lorg/b/a/a/b;->bDB:Ljava/lang/Integer;
 
     return-void
 .end method
 
-.method private static Id()Ljava/lang/reflect/Method;
+.method private static Ig()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -118,7 +118,7 @@
     throw v1
 .end method
 
-.method private static Ie()Ljava/lang/Integer;
+.method private static Ih()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;->bDq:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/b;->bDA: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;->bDr:Ljava/lang/Integer;
+    iget-object v5, p0, Lorg/b/a/a/b;->bDB: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 1d642788f3..58916599d6 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 bDq:Ljava/lang/reflect/Method;
+.field private final bDA:Ljava/lang/reflect/Method;
 
-.field private final bDs:Ljava/lang/Long;
+.field private final bDC: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;->Id()Ljava/lang/reflect/Method;
+    invoke-static {}, Lorg/b/a/a/c;->Ig()Ljava/lang/reflect/Method;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->bDq:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/a/c;->bDA:Ljava/lang/reflect/Method;
 
-    invoke-static {}, Lorg/b/a/a/c;->If()Ljava/lang/Long;
+    invoke-static {}, Lorg/b/a/a/c;->Ii()Ljava/lang/Long;
 
     move-result-object p1
 
-    iput-object p1, p0, Lorg/b/a/a/c;->bDs:Ljava/lang/Long;
+    iput-object p1, p0, Lorg/b/a/a/c;->bDC:Ljava/lang/Long;
 
     return-void
 .end method
 
-.method private static Id()Ljava/lang/reflect/Method;
+.method private static Ig()Ljava/lang/reflect/Method;
     .locals 5
 
     :try_start_0
@@ -118,7 +118,7 @@
     throw v1
 .end method
 
-.method private static If()Ljava/lang/Long;
+.method private static Ii()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;->bDq:Ljava/lang/reflect/Method;
+    iget-object v1, p0, Lorg/b/a/a/c;->bDA: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;->bDs:Ljava/lang/Long;
+    iget-object v5, p0, Lorg/b/a/a/c;->bDC: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 3799b5ced3..6582ab3d2a 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;->bDt:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->bDD:Ljava/lang/reflect/Constructor;
 
     if-eqz p1, :cond_0
 
-    iget-object p1, p0, Lorg/b/a/b/a;->bDt:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/b/a;->bDD: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 382319c781..309172b09d 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 bDt:Ljava/lang/reflect/Constructor;
+.field protected bDD: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;->bDt:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/b/b;->bDD: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;->bDt:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/b/b;->bDD: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 68e4d07f5e..756cc7479d 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 bDA:[B
+.field private static final bDH:[I
 
-.field private static bDB:[B
+.field private static bDK:[B
 
-.field private static final bDx:[I
+.field private static bDL:[B
 
 
 # instance fields
-.field private bDv:I
+.field private bDF:I
 
-.field private bDw:I
+.field private bDG:I
 
-.field private bDy:[[B
+.field private bDI:[[B
 
-.field private final bDz:[B
+.field private final bDJ:[B
 
 .field private data:[B
 
@@ -44,7 +44,7 @@
 
     fill-array-data v0, :array_0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bDx:[I
+    sput-object v0, Lorg/b/a/b/c$a;->bDH:[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;->bDA:[B
+    sput-object v0, Lorg/b/a/b/c$a;->bDK:[B
 
     new-instance v0, Ljava/io/ByteArrayOutputStream;
 
@@ -93,7 +93,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/a/b/c$a;->bDB:[B
+    sput-object v0, Lorg/b/a/b/c$a;->bDL:[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;->bDv:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDF:I
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bDw:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDG:I
 
-    sget-object v1, Lorg/b/a/b/c$a;->bDA:[B
+    sget-object v1, Lorg/b/a/b/c$a;->bDK:[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;->bDz:[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->bDJ:[B
 
     const/4 v1, 0x3
 
     new-array v1, v1, [[B
 
-    sget-object v2, Lorg/b/a/b/c$a;->bDA:[B
+    sget-object v2, Lorg/b/a/b/c$a;->bDK:[B
 
     aput-object v2, v1, v0
 
     const/4 v0, 0x1
 
-    iget-object v2, p0, Lorg/b/a/b/c$a;->bDz:[B
+    iget-object v2, p0, Lorg/b/a/b/c$a;->bDJ:[B
 
     aput-object v2, v1, v0
 
-    sget-object v0, Lorg/b/a/b/c$a;->bDB:[B
+    sget-object v0, Lorg/b/a/b/c$a;->bDL:[B
 
     aput-object v0, v1, p1
 
-    iput-object v1, p0, Lorg/b/a/b/c$a;->bDy:[[B
+    iput-object v1, p0, Lorg/b/a/b/c$a;->bDI:[[B
 
     return-void
 
@@ -257,24 +257,24 @@
     throw v0
 .end method
 
-.method private Ig()V
+.method private Ij()V
     .locals 2
 
     const/4 v0, 0x0
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bDv:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDF:I
 
-    sget-object v0, Lorg/b/a/b/c$a;->bDx:[I
+    sget-object v0, Lorg/b/a/b/c$a;->bDH:[I
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bDw:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDG:I
 
     aget v0, v0, v1
 
-    iput v0, p0, Lorg/b/a/b/c$a;->bDw:I
+    iput v0, p0, Lorg/b/a/b/c$a;->bDG:I
 
-    iget-object v0, p0, Lorg/b/a/b/c$a;->bDy:[[B
+    iget-object v0, p0, Lorg/b/a/b/c$a;->bDI:[[B
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bDw:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDG: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;->bDv:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDF:I
 
     add-int/lit8 v2, v1, 0x1
 
-    iput v2, p0, Lorg/b/a/b/c$a;->bDv:I
+    iput v2, p0, Lorg/b/a/b/c$a;->bDF:I
 
     aget-byte v1, v0, v1
 
-    iget v2, p0, Lorg/b/a/b/c$a;->bDv:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bDF:I
 
     array-length v0, v0
 
     if-lt v2, v0, :cond_0
 
-    invoke-direct {p0}, Lorg/b/a/b/c$a;->Ig()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->Ij()V
 
     :cond_0
     return v1
@@ -340,7 +340,7 @@
 
     array-length v0, v0
 
-    iget v1, p0, Lorg/b/a/b/c$a;->bDv:I
+    iget v1, p0, Lorg/b/a/b/c$a;->bDF: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;->bDv:I
+    iget v3, p0, Lorg/b/a/b/c$a;->bDF: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;->Ig()V
+    invoke-direct {p0}, Lorg/b/a/b/c$a;->Ij()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;->bDv:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bDF: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;->bDv:I
+    iget v2, p0, Lorg/b/a/b/c$a;->bDF: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;->bDv:I
+    iget p1, p0, Lorg/b/a/b/c$a;->bDF:I
 
     add-int/2addr p1, p2
 
-    iput p1, p0, Lorg/b/a/b/c$a;->bDv:I
+    iput p1, p0, Lorg/b/a/b/c$a;->bDF: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 c85779c338..cd17b9e89d 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 bDu:Ljava/io/ObjectInputStream;
+.field private bDE: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;->bDu:Ljava/io/ObjectInputStream;
+    iput-object v0, p0, Lorg/b/a/b/c;->bDE: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;->bDu:Ljava/io/ObjectInputStream;
+    iget-object v0, p0, Lorg/b/a/b/c;->bDE: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 5277a2cabb..0ec984b6b9 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;->bDC:Ljava/lang/reflect/Method;
+    sget-object v1, Lorg/b/a/c/a;->bDM:Ljava/lang/reflect/Method;
 
-    sget-object v2, Lorg/b/a/c/a;->bDD:Ljava/io/ObjectInputStream;
+    sget-object v2, Lorg/b/a/c/a;->bDN: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 8f27b97575..9d50b3921d 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 bDC:Ljava/lang/reflect/Method;
+.field static bDM:Ljava/lang/reflect/Method;
 
-.field static bDD:Ljava/io/ObjectInputStream;
+.field static bDN: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;->bDC:Ljava/lang/reflect/Method;
+    sget-object p1, Lorg/b/a/c/b;->bDM: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;->bDC:Ljava/lang/reflect/Method;
+    sput-object p1, Lorg/b/a/c/b;->bDM: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;->bDD:Ljava/io/ObjectInputStream;
+    sput-object p1, Lorg/b/a/c/b;->bDN: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 e7250f64d2..4c482c1c7b 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 bDE:[Ljava/lang/Object;
+.field private final bDA:Ljava/lang/reflect/Method;
 
-.field private final bDq:Ljava/lang/reflect/Method;
+.field private final bDO:[Ljava/lang/Object;
 
 
 # direct methods
@@ -54,9 +54,9 @@
 
     aput-object v3, v1, v4
 
-    iput-object v1, p0, Lorg/b/a/d/a;->bDE:[Ljava/lang/Object;
+    iput-object v1, p0, Lorg/b/a/d/a;->bDO:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lorg/b/a/d/a;->bDE:[Ljava/lang/Object;
+    iget-object v1, p0, Lorg/b/a/d/a;->bDO:[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;->bDq:Ljava/lang/reflect/Method;
+    iput-object p1, p0, Lorg/b/a/d/a;->bDA:Ljava/lang/reflect/Method;
 
-    iget-object p1, p0, Lorg/b/a/d/a;->bDq:Ljava/lang/reflect/Method;
+    iget-object p1, p0, Lorg/b/a/d/a;->bDA: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;->bDq:Ljava/lang/reflect/Method;
+    iget-object v0, p0, Lorg/b/a/d/a;->bDA:Ljava/lang/reflect/Method;
 
     const/4 v1, 0x0
 
-    iget-object v2, p0, Lorg/b/a/d/a;->bDE:[Ljava/lang/Object;
+    iget-object v2, p0, Lorg/b/a/d/a;->bDO:[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 cd73dc2da6..9237b48aaf 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 Ih()Ljava/lang/Class;
+.method private static Ik()Ljava/lang/Class;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -173,7 +173,7 @@
         }
     .end annotation
 
-    invoke-static {}, Lorg/b/a/e/a;->Ih()Ljava/lang/Class;
+    invoke-static {}, Lorg/b/a/e/a;->Ik()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 d3a8dc21ec..c4f1c17e8b 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 bDF:Ljava/lang/reflect/Constructor;
+.field private final bDP: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;->Ii()Ljava/lang/reflect/Constructor;
+    invoke-static {}, Lorg/b/a/e/b;->Il()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;->bDF:Ljava/lang/reflect/Constructor;
+    iput-object p1, p0, Lorg/b/a/e/b;->bDP:Ljava/lang/reflect/Constructor;
 
-    iget-object p1, p0, Lorg/b/a/e/b;->bDF:Ljava/lang/reflect/Constructor;
+    iget-object p1, p0, Lorg/b/a/e/b;->bDP:Ljava/lang/reflect/Constructor;
 
     const/4 v0, 0x1
 
@@ -62,7 +62,7 @@
     return-void
 .end method
 
-.method private static Ii()Ljava/lang/reflect/Constructor;
+.method private static Il()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;->bDF:Ljava/lang/reflect/Constructor;
+    iget-object v0, p0, Lorg/b/a/e/b;->bDP: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 9165d31b20..34be03752c 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 bDG:Lsun/misc/Unsafe;
+.field private static bDQ: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;->bDG:Lsun/misc/Unsafe;
+    sget-object v0, Lorg/b/a/e/c;->bDQ: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;->bDG:Lsun/misc/Unsafe;
+    sput-object v0, Lorg/b/a/e/c;->bDQ: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;->bDG:Lsun/misc/Unsafe;
+    sget-object v1, Lorg/b/a/e/c;->bDQ: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 443f476364..972df9c525 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 bDH:Ljava/lang/String;
+.field public static final bDR:Ljava/lang/String;
 
-.field public static final bDI:Ljava/lang/String;
+.field public static final bDS:Ljava/lang/String;
 
-.field public static final bDJ:Ljava/lang/String;
+.field public static final bDT:Ljava/lang/String;
 
-.field public static final bDK:Ljava/lang/String;
+.field public static final bDU:Ljava/lang/String;
 
-.field public static final bDL:Ljava/lang/String;
+.field public static final bDV:Ljava/lang/String;
 
-.field public static final bDM:Ljava/lang/String;
+.field public static final bDW:Ljava/lang/String;
 
-.field public static final bDN:I
+.field public static final bDX:I
 
-.field public static final bDO:Z
+.field public static final bDY:Z
 
-.field public static final bDP:Ljava/lang/String;
+.field public static final bDZ:Ljava/lang/String;
 
 
 # direct methods
@@ -33,7 +33,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDH:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDR:Ljava/lang/String;
 
     const-string v0, "java.runtime.version"
 
@@ -41,7 +41,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDI:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDS:Ljava/lang/String;
 
     const-string v0, "java.vm.info"
 
@@ -49,7 +49,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDJ:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDT:Ljava/lang/String;
 
     const-string v0, "java.vm.version"
 
@@ -57,7 +57,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDK:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDU:Ljava/lang/String;
 
     const-string v0, "java.vm.vendor"
 
@@ -65,7 +65,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDL:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDV:Ljava/lang/String;
 
     const-string v0, "java.vm.name"
 
@@ -73,15 +73,15 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDM:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDW:Ljava/lang/String;
 
-    invoke-static {}, Lorg/b/b/c;->Il()I
+    invoke-static {}, Lorg/b/b/c;->Io()I
 
     move-result v0
 
-    sput v0, Lorg/b/b/c;->bDN:I
+    sput v0, Lorg/b/b/c;->bDX:I
 
-    invoke-static {}, Lorg/b/b/c;->Il()I
+    invoke-static {}, Lorg/b/b/c;->Io()I
 
     move-result v0
 
@@ -115,7 +115,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lorg/b/b/c;->bDO:Z
+    sput-boolean v0, Lorg/b/b/c;->bDY:Z
 
     const-string v0, "com.google.appengine.runtime.version"
 
@@ -123,23 +123,23 @@
 
     move-result-object v0
 
-    sput-object v0, Lorg/b/b/c;->bDP:Ljava/lang/String;
+    sput-object v0, Lorg/b/b/c;->bDZ:Ljava/lang/String;
 
     return-void
 .end method
 
-.method public static Ij()Z
+.method public static Im()Z
     .locals 1
 
-    sget-boolean v0, Lorg/b/b/c;->bDO:Z
+    sget-boolean v0, Lorg/b/b/c;->bDY:Z
 
     return v0
 .end method
 
-.method public static Ik()Z
+.method public static In()Z
     .locals 1
 
-    sget-object v0, Lorg/b/b/c;->bDP:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bDZ:Ljava/lang/String;
 
     if-eqz v0, :cond_0
 
@@ -153,10 +153,10 @@
     return v0
 .end method
 
-.method private static Il()I
+.method private static Io()I
     .locals 2
 
-    sget-object v0, Lorg/b/b/c;->bDM:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bDW:Ljava/lang/String;
 
     const-string v1, "Dalvik"
 
@@ -171,14 +171,14 @@
     return v0
 
     :cond_0
-    invoke-static {}, Lorg/b/b/c;->Im()I
+    invoke-static {}, Lorg/b/b/c;->Ip()I
 
     move-result v0
 
     return v0
 .end method
 
-.method private static Im()I
+.method private static Ip()I
     .locals 2
 
     :try_start_0
@@ -300,7 +300,7 @@
 .method public static eE(Ljava/lang/String;)Z
     .locals 1
 
-    sget-object v0, Lorg/b/b/c;->bDM:Ljava/lang/String;
+    sget-object v0, Lorg/b/b/c;->bDW: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 2f9b3eed6e..ae04e2c12f 100644
--- a/com.discord/smali_classes2/org/b/b/d.smali
+++ b/com.discord/smali_classes2/org/b/b/d.smali
@@ -55,7 +55,7 @@
 
     if-eqz v0, :cond_4
 
-    invoke-static {}, Lorg/b/b/c;->Ij()Z
+    invoke-static {}, Lorg/b/b/c;->Im()Z
 
     move-result v0
 
@@ -68,7 +68,7 @@
     return-object v0
 
     :cond_1
-    sget v0, Lorg/b/b/c;->bDN:I
+    sget v0, Lorg/b/b/c;->bDX:I
 
     const/16 v1, 0xa
 
@@ -81,7 +81,7 @@
     return-object v0
 
     :cond_2
-    sget v0, Lorg/b/b/c;->bDN:I
+    sget v0, Lorg/b/b/c;->bDX:I
 
     const/16 v1, 0x11
 
@@ -154,7 +154,7 @@
 
     :cond_8
     :goto_0
-    invoke-static {}, Lorg/b/b/c;->Ik()Z
+    invoke-static {}, Lorg/b/b/c;->In()Z
 
     move-result v0
 
diff --git a/com.discord/smali_classes2/proguard/optimize/gson/b.smali b/com.discord/smali_classes2/proguard/optimize/gson/b.smali
index b5dc97118c..dcb2d252a0 100644
--- a/com.discord/smali_classes2/proguard/optimize/gson/b.smali
+++ b/com.discord/smali_classes2/proguard/optimize/gson/b.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final bDQ:Ljava/util/Map;
+.field private static final bEa:Ljava/util/Map;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Map<",
@@ -747,7 +747,7 @@
 
     invoke-virtual {v0, v2, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sput-object v0, Lproguard/optimize/gson/b;->bDQ:Ljava/util/Map;
+    sput-object v0, Lproguard/optimize/gson/b;->bEa:Ljava/util/Map;
 
     return-void
 .end method
@@ -774,7 +774,7 @@
 
     move-result-object p1
 
-    sget-object v0, Lproguard/optimize/gson/b;->bDQ:Ljava/util/Map;
+    sget-object v0, Lproguard/optimize/gson/b;->bEa:Ljava/util/Map;
 
     invoke-interface {v0, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/proguard/optimize/gson/c.smali b/com.discord/smali_classes2/proguard/optimize/gson/c.smali
index ad2cfb5eb0..575d25704d 100644
--- a/com.discord/smali_classes2/proguard/optimize/gson/c.smali
+++ b/com.discord/smali_classes2/proguard/optimize/gson/c.smali
@@ -7,7 +7,7 @@
 
 
 # static fields
-.field private static final bDR:[Ljava/lang/String;
+.field private static final bEb:[Ljava/lang/String;
 
 
 # direct methods
@@ -450,7 +450,7 @@
 
     aput-object v2, v0, v1
 
-    sput-object v0, Lproguard/optimize/gson/c;->bDR:[Ljava/lang/String;
+    sput-object v0, Lproguard/optimize/gson/c;->bEb:[Ljava/lang/String;
 
     return-void
 .end method
@@ -473,7 +473,7 @@
         }
     .end annotation
 
-    sget-object v0, Lproguard/optimize/gson/c;->bDR:[Ljava/lang/String;
+    sget-object v0, Lproguard/optimize/gson/c;->bEb:[Ljava/lang/String;
 
     aget-object p2, v0, p2
 
diff --git a/com.discord/smali_classes2/proguard/optimize/gson/e.smali b/com.discord/smali_classes2/proguard/optimize/gson/e.smali
index 5fd0a57c61..0809352b8e 100644
--- a/com.discord/smali_classes2/proguard/optimize/gson/e.smali
+++ b/com.discord/smali_classes2/proguard/optimize/gson/e.smali
@@ -7,9 +7,9 @@
 
 
 # static fields
-.field private static final bDS:Lproguard/optimize/gson/b;
+.field private static final bEc:Lproguard/optimize/gson/b;
 
-.field private static final bDT:Lproguard/optimize/gson/c;
+.field private static final bEd:Lproguard/optimize/gson/c;
 
 
 # direct methods
@@ -20,13 +20,13 @@
 
     invoke-direct {v0}, Lproguard/optimize/gson/b;-><init>()V
 
-    sput-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sput-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
     new-instance v0, Lproguard/optimize/gson/c;
 
     invoke-direct {v0}, Lproguard/optimize/gson/c;-><init>()V
 
-    sput-object v0, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sput-object v0, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     return-void
 .end method
@@ -56,13 +56,13 @@
         }
     .end annotation
 
-    iget-object v0, p1, Lcom/google/gson/Gson;->aSS:Lcom/google/gson/e;
+    iget-object v0, p1, Lcom/google/gson/Gson;->aTb:Lcom/google/gson/e;
 
-    sget-object v1, Lcom/google/gson/d;->aSG:Lcom/google/gson/d;
+    sget-object v1, Lcom/google/gson/d;->aSP:Lcom/google/gson/d;
 
     if-ne v0, v1, :cond_f
 
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lcom/discord/rtcconnection/socket/io/Payloads$Incoming;
 
@@ -70,16 +70,16 @@
 
     new-instance p2, Lcom/discord/rtcconnection/socket/io/OptimizedPayloads$IncomingTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lcom/discord/rtcconnection/socket/io/OptimizedPayloads$IncomingTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_0
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/RtpStats;
 
@@ -87,16 +87,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedRtpStatsTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedRtpStatsTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_1
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/Inbound;
 
@@ -104,16 +104,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedInboundTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedInboundTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_2
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lcom/discord/rtcconnection/socket/io/Payloads$Outgoing;
 
@@ -121,16 +121,16 @@
 
     new-instance p2, Lcom/discord/rtcconnection/socket/io/OptimizedPayloads$OutgoingTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lcom/discord/rtcconnection/socket/io/OptimizedPayloads$OutgoingTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_3
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/InboundAudio;
 
@@ -138,16 +138,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedInboundAudioTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedInboundAudioTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_4
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lcom/discord/gateway/io/Outgoing;
 
@@ -155,16 +155,16 @@
 
     new-instance p2, Lcom/discord/gateway/io/OptimizedOutgoingTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lcom/discord/gateway/io/OptimizedOutgoingTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_5
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/FrameCounts;
 
@@ -172,16 +172,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedFrameCountsTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedFrameCountsTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_6
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/Outbound;
 
@@ -189,16 +189,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedOutboundTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedOutboundTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_7
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/Transport;
 
@@ -206,16 +206,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedTransportTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedTransportTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_8
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/InboundVideo;
 
@@ -223,16 +223,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedInboundVideoTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedInboundVideoTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_9
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/NativeStats;
 
@@ -240,16 +240,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedNativeStatsTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedNativeStatsTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_a
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/PacketStats;
 
@@ -257,16 +257,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedPacketStatsTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedPacketStatsTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_b
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/OutboundVideo;
 
@@ -274,16 +274,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedOutboundVideoTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedOutboundVideoTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_c
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/OutboundAudio;
 
@@ -291,16 +291,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedOutboundAudioTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedOutboundAudioTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_d
-    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object v0, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v1, Lco/discord/media_engine/internal/RtcpStats;
 
@@ -308,16 +308,16 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedRtcpStatsTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedRtcpStatsTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
     return-object p2
 
     :cond_e
-    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aVZ:Ljava/lang/Class;
+    iget-object p2, p2, Lcom/google/gson/reflect/TypeToken;->aWi:Ljava/lang/Class;
 
     const-class v0, Lco/discord/media_engine/internal/Substream;
 
@@ -325,9 +325,9 @@
 
     new-instance p2, Lco/discord/media_engine/internal/OptimizedSubstreamTypeAdapter;
 
-    sget-object v0, Lproguard/optimize/gson/e;->bDS:Lproguard/optimize/gson/b;
+    sget-object v0, Lproguard/optimize/gson/e;->bEc:Lproguard/optimize/gson/b;
 
-    sget-object v1, Lproguard/optimize/gson/e;->bDT:Lproguard/optimize/gson/c;
+    sget-object v1, Lproguard/optimize/gson/e;->bEd:Lproguard/optimize/gson/c;
 
     invoke-direct {p2, p1, v0, v1}, Lco/discord/media_engine/internal/OptimizedSubstreamTypeAdapter;-><init>(Lcom/google/gson/Gson;Lproguard/optimize/gson/_OptimizedJsonReader;Lproguard/optimize/gson/_OptimizedJsonWriter;)V
 
diff --git a/com.discord/smali_classes2/rx/Emitter$a.smali b/com.discord/smali_classes2/rx/Emitter$a.smali
index e69a669e83..a8ed61035f 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 enum bFV:Lrx/Emitter$a;
+.field public static final enum bGf:Lrx/Emitter$a;
 
-.field public static final enum bFW:Lrx/Emitter$a;
+.field public static final enum bGg:Lrx/Emitter$a;
 
-.field public static final enum bFX:Lrx/Emitter$a;
+.field public static final enum bGh:Lrx/Emitter$a;
 
-.field public static final enum bFY:Lrx/Emitter$a;
+.field public static final enum bGi:Lrx/Emitter$a;
 
-.field public static final enum bFZ:Lrx/Emitter$a;
+.field public static final enum bGj:Lrx/Emitter$a;
 
-.field private static final synthetic bGa:[Lrx/Emitter$a;
+.field private static final synthetic bGk:[Lrx/Emitter$a;
 
 
 # direct methods
@@ -48,7 +48,7 @@
 
     invoke-direct {v0, v2, v1}, Lrx/Emitter$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/Emitter$a;->bFV:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGf:Lrx/Emitter$a;
 
     new-instance v0, Lrx/Emitter$a;
 
@@ -58,7 +58,7 @@
 
     invoke-direct {v0, v3, v2}, Lrx/Emitter$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/Emitter$a;->bFW:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
 
     new-instance v0, Lrx/Emitter$a;
 
@@ -68,7 +68,7 @@
 
     invoke-direct {v0, v4, v3}, Lrx/Emitter$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/Emitter$a;->bFX:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
 
     new-instance v0, Lrx/Emitter$a;
 
@@ -78,7 +78,7 @@
 
     invoke-direct {v0, v5, v4}, Lrx/Emitter$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/Emitter$a;->bFY:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGi:Lrx/Emitter$a;
 
     new-instance v0, Lrx/Emitter$a;
 
@@ -88,33 +88,33 @@
 
     invoke-direct {v0, v6, v5}, Lrx/Emitter$a;-><init>(Ljava/lang/String;I)V
 
-    sput-object v0, Lrx/Emitter$a;->bFZ:Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGj:Lrx/Emitter$a;
 
     const/4 v0, 0x5
 
     new-array v0, v0, [Lrx/Emitter$a;
 
-    sget-object v6, Lrx/Emitter$a;->bFV:Lrx/Emitter$a;
+    sget-object v6, Lrx/Emitter$a;->bGf:Lrx/Emitter$a;
 
     aput-object v6, v0, v1
 
-    sget-object v1, Lrx/Emitter$a;->bFW:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lrx/Emitter$a;->bFX:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGh:Lrx/Emitter$a;
 
     aput-object v1, v0, v3
 
-    sget-object v1, Lrx/Emitter$a;->bFY:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGi:Lrx/Emitter$a;
 
     aput-object v1, v0, v4
 
-    sget-object v1, Lrx/Emitter$a;->bFZ:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGj:Lrx/Emitter$a;
 
     aput-object v1, v0, v5
 
-    sput-object v0, Lrx/Emitter$a;->bGa:[Lrx/Emitter$a;
+    sput-object v0, Lrx/Emitter$a;->bGk:[Lrx/Emitter$a;
 
     return-void
 .end method
@@ -149,7 +149,7 @@
 .method public static values()[Lrx/Emitter$a;
     .locals 1
 
-    sget-object v0, Lrx/Emitter$a;->bGa:[Lrx/Emitter$a;
+    sget-object v0, Lrx/Emitter$a;->bGk:[Lrx/Emitter$a;
 
     invoke-virtual {v0}, [Lrx/Emitter$a;->clone()Ljava/lang/Object;
 
diff --git a/com.discord/smali_classes2/rx/Scheduler.smali b/com.discord/smali_classes2/rx/Scheduler.smali
index b6751bdf00..cef8e24cf0 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 IV()Lrx/Scheduler$Worker;
+.method public abstract IY()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 cb125fc54f..37396e6eaa 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 bFM:Lrx/a$a;
+.field static final bFW:Lrx/a$a;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$a;-><init>()V
 
-    sput-object v0, Lrx/a$a;->bFM:Lrx/a$a;
+    sput-object v0, Lrx/a$a;->bFW:Lrx/a$a;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final II()Z
+.method public final IL()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 75326261c7..0e09a78587 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 bFN:Lrx/a$b;
+.field static final bFX:Lrx/a$b;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$b;-><init>()V
 
-    sput-object v0, Lrx/a$b;->bFN:Lrx/a$b;
+    sput-object v0, Lrx/a$b;->bFX:Lrx/a$b;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final II()Z
+.method public final IL()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 46c814f03d..73e31dedf7 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 bFO:Lrx/a$c;
+.field static final bFY:Lrx/a$c;
 
 
 # direct methods
@@ -29,7 +29,7 @@
 
     invoke-direct {v0}, Lrx/a$c;-><init>()V
 
-    sput-object v0, Lrx/a$c;->bFO:Lrx/a$c;
+    sput-object v0, Lrx/a$c;->bFY:Lrx/a$c;
 
     return-void
 .end method
@@ -44,7 +44,7 @@
 
 
 # virtual methods
-.method public final II()Z
+.method public final IL()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 8b2e437557..878cbcad9a 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 II()Z
+.method public abstract IL()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 328a2ea4e5..e38d38057f 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 bFI:Lrx/a$d;
+.field public static final bFS:Lrx/a$d;
 
-.field public static final bFJ:Lrx/a$d;
+.field public static final bFT:Lrx/a$d;
 
-.field public static final bFK:Lrx/a$d;
+.field public static final bFU:Lrx/a$d;
 
-.field public static final bFL:Lrx/a$d;
+.field public static final bFV:Lrx/a$d;
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    sget-object v0, Lrx/a$c;->bFO:Lrx/a$c;
+    sget-object v0, Lrx/a$c;->bFY:Lrx/a$c;
 
-    sput-object v0, Lrx/a;->bFI:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFS:Lrx/a$d;
 
-    sput-object v0, Lrx/a;->bFJ:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFT:Lrx/a$d;
 
-    sget-object v0, Lrx/a$b;->bFN:Lrx/a$b;
+    sget-object v0, Lrx/a$b;->bFX:Lrx/a$b;
 
-    sput-object v0, Lrx/a;->bFK:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFU:Lrx/a$d;
 
-    sget-object v0, Lrx/a$a;->bFM:Lrx/a$a;
+    sget-object v0, Lrx/a$a;->bFW:Lrx/a$a;
 
-    sput-object v0, Lrx/a;->bFL:Lrx/a$d;
+    sput-object v0, Lrx/a;->bFV: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 5b04d9f7a2..d497645ff0 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 Ja()Ljava/lang/Object;
+.method abstract Jd()Ljava/lang/Object;
 .end method
 
 .method abstract br(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 6819af8339..e2832b39a3 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 bGq:Ljava/io/PrintStream;
+.field private final bGA: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;->bGq:Ljava/io/PrintStream;
+    iput-object p1, p0, Lrx/a/a$c;->bGA:Ljava/io/PrintStream;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Ja()Ljava/lang/Object;
+.method final Jd()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->bGq:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->bGA:Ljava/io/PrintStream;
 
     return-object v0
 .end method
@@ -42,7 +42,7 @@
 .method final br(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$c;->bGq:Ljava/io/PrintStream;
+    iget-object v0, p0, Lrx/a/a$c;->bGA: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 351c04ddf1..8b0b06b06a 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 bGr:Ljava/io/PrintWriter;
+.field private final bGB: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;->bGr:Ljava/io/PrintWriter;
+    iput-object p1, p0, Lrx/a/a$d;->bGB:Ljava/io/PrintWriter;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Ja()Ljava/lang/Object;
+.method final Jd()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->bGr:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->bGB:Ljava/io/PrintWriter;
 
     return-object v0
 .end method
@@ -42,7 +42,7 @@
 .method final br(Ljava/lang/Object;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/a/a$d;->bGr:Ljava/io/PrintWriter;
+    iget-object v0, p0, Lrx/a/a$d;->bGB: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 c7071acdac..9ddcb9d9d4 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;->Ja()Ljava/lang/Object;
+    invoke-virtual {p1}, Lrx/a/a$b;->Jd()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 c5a35f283c..0d6fea7af1 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 bGs:Ljava/util/Set;
+.field static final bGC: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;->bGs:Ljava/util/Set;
+    sput-object v0, Lrx/a/g$a$a;->bGC: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 03d65b23cc..dd17a653a9 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;->bGs:Ljava/util/Set;
+    sget-object v1, Lrx/a/g$a$a;->bGC: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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->Kk()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 c6dc869dd6..1049bf10a8 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 bGk:Lrx/android/a/a;
+.field private static final bGu:Lrx/android/a/a;
 
 
 # instance fields
-.field private final bGl:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bGv: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;->bGk:Lrx/android/a/a;
+    sput-object v0, Lrx/android/a/a;->bGu: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;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/android/a/a;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static IW()Lrx/android/a/a;
+.method public static IZ()Lrx/android/a/a;
     .locals 1
 
-    sget-object v0, Lrx/android/a/a;->bGk:Lrx/android/a/a;
+    sget-object v0, Lrx/android/a/a;->bGu:Lrx/android/a/a;
 
     return-object v0
 .end method
 
 
 # virtual methods
-.method public final IX()Lrx/android/a/b;
+.method public final Ja()Lrx/android/a/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/android/a/a;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bGv: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;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v1, 0x0
 
-    invoke-static {}, Lrx/android/a/b;->IY()Lrx/android/a/b;
+    invoke-static {}, Lrx/android/a/b;->Jb()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;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/android/a/a;->bGv: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 cef18120ab..8b88b9cafb 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 bGm:Lrx/android/a/b;
+.field private static final bGw: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;->bGm:Lrx/android/a/b;
+    sput-object v0, Lrx/android/a/b;->bGw:Lrx/android/a/b;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static IY()Lrx/android/a/b;
+.method public static Jb()Lrx/android/a/b;
     .locals 1
 
-    sget-object v0, Lrx/android/a/b;->bGm:Lrx/android/a/b;
+    sget-object v0, Lrx/android/a/b;->bGw: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 4c2f56798c..924a3886cf 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 aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aPZ: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 bGn:Lrx/Scheduler;
+.field private final bGx: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/android/b/a;->aPZ: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;->IW()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->IZ()Lrx/android/a/a;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/android/a/a;->IX()Lrx/android/a/b;
+    invoke-virtual {v0}, Lrx/android/a/a;->Ja()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;->bGn:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/android/b/a;->bGx:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method public static IZ()Lrx/Scheduler;
+.method public static Jc()Lrx/Scheduler;
     .locals 3
 
     :cond_0
-    sget-object v0, Lrx/android/b/a;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/android/b/a;->aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/android/b/a;->aPZ: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;->bGn:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/android/b/a;->bGx: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 e7b2bd76f5..a9c0ea8dec 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 bGo:Lrx/android/a/b;
+.field private final bGy:Lrx/android/a/b;
 
-.field private volatile bGp:Z
+.field private volatile bGz: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;->IW()Lrx/android/a/a;
+    invoke-static {}, Lrx/android/a/a;->IZ()Lrx/android/a/a;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/android/a/a;->IX()Lrx/android/a/b;
+    invoke-virtual {p1}, Lrx/android/a/a;->Ja()Lrx/android/a/b;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/android/b/b$a;->bGo:Lrx/android/a/b;
+    iput-object p1, p0, Lrx/android/b/b$a;->bGy: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->bGz:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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;->bGp:Z
+    iget-boolean p1, p0, Lrx/android/b/b$a;->bGz: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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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;->bGp:Z
+    iget-boolean v0, p0, Lrx/android/b/b$a;->bGz:Z
 
     return v0
 .end method
@@ -130,7 +130,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/android/b/b$a;->bGp:Z
+    iput-boolean v0, p0, Lrx/android/b/b$a;->bGz: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 6b33d04252..01098838b3 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 bGp:Z
+.field private volatile bGz: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/android/b/b$b;->bGz: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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {v0}, Lrx/c/f;->Kk()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;->bGp:Z
+    iput-boolean v0, p0, Lrx/android/b/b$b;->bGz: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 d19c8695cb..a7c44db581 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 IV()Lrx/Scheduler$Worker;
+.method public final IY()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 dce23ef189..a6336606a6 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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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 327a071ab2..617acd1471 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 bFT:Lrx/c;
+.field final synthetic bGd:Lrx/c;
 
-.field final synthetic bFU:Lrx/b$2;
+.field final synthetic bGe:Lrx/b$2;
 
 
 # direct methods
 .method constructor <init>(Lrx/b$2;Lrx/c;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2$1;->bFU:Lrx/b$2;
+    iput-object p1, p0, Lrx/b$2$1;->bGe:Lrx/b$2;
 
-    iput-object p2, p0, Lrx/b$2$1;->bFT:Lrx/c;
+    iput-object p2, p0, Lrx/b$2$1;->bGd: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 2466dbaaa0..a0d58f6d15 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 bFS:Lrx/Observable;
+.field final synthetic bGc:Lrx/Observable;
 
 
 # direct methods
 .method constructor <init>(Lrx/Observable;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/b$2;->bFS:Lrx/Observable;
+    iput-object p1, p0, Lrx/b$2;->bGc: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;->bFS:Lrx/Observable;
+    iget-object p1, p0, Lrx/b$2;->bGc: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 aad9c316e2..38a9a74813 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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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 4a6b6f9e10..ce389dc221 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 bFQ:Lrx/b;
+.field static final bGa:Lrx/b;
 
-.field static final bFR:Lrx/b;
+.field static final bGb:Lrx/b;
 
 
 # instance fields
-.field private final bFP:Lrx/b$a;
+.field private final bFZ: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;->bFQ:Lrx/b;
+    sput-object v0, Lrx/b;->bGa: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;->bFR:Lrx/b;
+    sput-object v0, Lrx/b;->bGb:Lrx/b;
 
     return-void
 .end method
@@ -60,7 +60,7 @@
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/b;->bFP:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->bFZ: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;->bFP:Lrx/b$a;
+    iput-object p1, p0, Lrx/b;->bFZ: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 50b35e1452..4415c11387 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 bNQ:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bOa:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bNR:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bOb:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bNS:Lrx/b/a;
+.field final synthetic bOc: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;->bNS:Lrx/b/a;
+    iput-object p1, p0, Lrx/b/a$1;->bOc: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;->bNQ:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/b/a$1;->bOa:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/b/a$1;->bNR:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p4, p0, Lrx/b/a$1;->bOb: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;->bNQ:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->bOa: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;->bNR:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/b/a$1;->bOb: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 a104aa346c..c38e55985e 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 bNN:Ljava/lang/Object;
+.field static final bNX:Ljava/lang/Object;
 
-.field static final bNO:Ljava/lang/Object;
+.field static final bNY:Ljava/lang/Object;
 
-.field static final bNP:Ljava/lang/Object;
+.field static final bNZ:Ljava/lang/Object;
 
 
 # instance fields
-.field public final bNM:Lrx/Observable;
+.field public final bNW: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;->bNN:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bNX:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bNO:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bNY:Ljava/lang/Object;
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/b/a;->bNP:Ljava/lang/Object;
+    sput-object v0, Lrx/b/a;->bNZ: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;->bNM:Lrx/Observable;
+    iput-object p1, p0, Lrx/b/a;->bNW:Lrx/Observable;
 
     return-void
 .end method
@@ -154,7 +154,7 @@
 
 
 # virtual methods
-.method public final Kb()Ljava/lang/Object;
+.method public final Ke()Ljava/lang/Object;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -162,9 +162,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/b/a;->bNM:Lrx/Observable;
+    iget-object v0, p0, Lrx/b/a;->bNW:Lrx/Observable;
 
-    invoke-static {}, Lrx/internal/a/aq;->JD()Lrx/internal/a/aq;
+    invoke-static {}, Lrx/internal/a/aq;->JG()Lrx/internal/a/aq;
 
     move-result-object v1
 
diff --git a/com.discord/smali_classes2/rx/b/b.smali b/com.discord/smali_classes2/rx/b/b.smali
index bc99c8357f..857985ed4a 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 Kc()Lrx/Observable;
+.method public final Kf()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 69a1e145d5..abfc62ba6e 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {p1}, Lrx/c/f;->Kk()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 0fcf3b0781..252edf2f4e 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Ki()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 99ab1598c4..1120e04a1a 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kj()Lrx/c/h;
+    invoke-virtual {p1}, Lrx/c/f;->Km()Lrx/c/h;
 
     move-result-object p1
 
-    invoke-static {}, Lrx/c/i;->Kq()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Kt()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 82502f86c1..1304a66b20 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kj()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Km()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 f7e67d4061..1d645da90d 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Kk()Lrx/c/a;
+    invoke-virtual {p1}, Lrx/c/f;->Kn()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 ee72ed7859..42eadc3ef8 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kl()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->Ko()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 170de49c61..f477455516 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Ki()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 f46cdb1eac..52d0c35c5e 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Ki()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 7ea597a472..48ad5675b0 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kj()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Km()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 43e0d454ee..9b3e83f021 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kj()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Km()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 6a5576525a..4039bb7e9e 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kk()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Kn()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 bd17172094..cf81fdd140 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kk()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Kn()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 09902b707b..93cd6f9b8d 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Ki()Lrx/c/d;
+    invoke-virtual {v0}, Lrx/c/f;->Kl()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 a85cce23da..d2c14d18e1 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kj()Lrx/c/h;
+    invoke-virtual {v0}, Lrx/c/f;->Km()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 ab4bec143d..ada95c669c 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kk()Lrx/c/a;
+    invoke-virtual {v0}, Lrx/c/f;->Kn()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 0677217115..48563d3422 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Lrx/c/f;->Ki()Lrx/c/d;
+    invoke-virtual {p1}, Lrx/c/f;->Kl()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 efaee15e7b..b6decf2318 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 bME:Lrx/functions/Action1;
+.field static volatile bMO:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -14,7 +14,7 @@
     .end annotation
 .end field
 
-.field static volatile bNY:Lrx/functions/b;
+.field static volatile bOi:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field static volatile bNZ:Lrx/functions/b;
+.field static volatile bOj:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field static volatile bOa:Lrx/functions/b;
+.field static volatile bOk:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -47,7 +47,7 @@
     .end annotation
 .end field
 
-.field static volatile bOb:Lrx/functions/Func2;
+.field static volatile bOl:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -59,7 +59,7 @@
     .end annotation
 .end field
 
-.field static volatile bOc:Lrx/functions/Func2;
+.field static volatile bOm:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -71,7 +71,7 @@
     .end annotation
 .end field
 
-.field static volatile bOd:Lrx/functions/Func2;
+.field static volatile bOn:Lrx/functions/Func2;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func2<",
@@ -83,7 +83,7 @@
     .end annotation
 .end field
 
-.field static volatile bOe:Lrx/functions/b;
+.field static volatile bOo:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -94,7 +94,7 @@
     .end annotation
 .end field
 
-.field static volatile bOf:Lrx/functions/b;
+.field static volatile bOp:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -105,7 +105,7 @@
     .end annotation
 .end field
 
-.field static volatile bOg:Lrx/functions/b;
+.field static volatile bOq:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -116,7 +116,7 @@
     .end annotation
 .end field
 
-.field static volatile bOh:Lrx/functions/b;
+.field static volatile bOr:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -127,7 +127,7 @@
     .end annotation
 .end field
 
-.field static volatile bOi:Lrx/functions/b;
+.field static volatile bOs:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -138,7 +138,7 @@
     .end annotation
 .end field
 
-.field static volatile bOj:Lrx/functions/Func0;
+.field static volatile bOt:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -149,7 +149,7 @@
     .end annotation
 .end field
 
-.field static volatile bOk:Lrx/functions/b;
+.field static volatile bOu:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -160,7 +160,7 @@
     .end annotation
 .end field
 
-.field static volatile bOl:Lrx/functions/b;
+.field static volatile bOv:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -171,7 +171,7 @@
     .end annotation
 .end field
 
-.field static volatile bOm:Lrx/functions/b;
+.field static volatile bOw:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -182,7 +182,7 @@
     .end annotation
 .end field
 
-.field static volatile bOn:Lrx/functions/b;
+.field static volatile bOx:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -193,7 +193,7 @@
     .end annotation
 .end field
 
-.field static volatile bOo:Lrx/functions/b;
+.field static volatile bOy:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -204,7 +204,7 @@
     .end annotation
 .end field
 
-.field static volatile bOp:Lrx/functions/b;
+.field static volatile bOz:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -224,102 +224,102 @@
 
     invoke-direct {v0}, Lrx/c/c$1;-><init>()V
 
-    sput-object v0, Lrx/c/c;->bME:Lrx/functions/Action1;
+    sput-object v0, Lrx/c/c;->bMO: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;->bOb:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bOl: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;->bOh:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOr: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;->bOc:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bOm: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;->bOi:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOs: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;->bOd:Lrx/functions/Func2;
+    sput-object v0, Lrx/c/c;->bOn: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;->bOg:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOq: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;->bOk:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOu: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;->bOn:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOx: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;->bOl:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOv: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;->bOo:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOy: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;->bOm:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOw: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;->bOp:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOz: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;->bNY:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOi: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;->bNZ:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOj: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;->bOa:Lrx/functions/b;
+    sput-object v0, Lrx/c/c;->bOk:Lrx/functions/b;
 
     return-void
 .end method
 
-.method public static Ke()Lrx/functions/Func0;
+.method public static Kh()Lrx/functions/Func0;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -331,7 +331,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOj:Lrx/functions/Func0;
+    sget-object v0, Lrx/c/c;->bOt: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;->bOk:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOu:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -385,7 +385,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOb:Lrx/functions/Func2;
+    sget-object v0, Lrx/c/c;->bOl:Lrx/functions/Func2;
 
     if-eqz v0, :cond_0
 
@@ -415,7 +415,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bNZ:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOj:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -445,7 +445,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOn:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOx: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;->bOa:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOk:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -490,7 +490,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bNY:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOi:Lrx/functions/b;
 
     if-eqz v0, :cond_0
 
@@ -520,7 +520,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/c/c;->bOo:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOy: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;->bOh:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOr: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;->bOe:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOo: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;->bOf:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOp: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;->bOg:Lrx/functions/b;
+    sget-object v0, Lrx/c/c;->bOq: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;->bME:Lrx/functions/Action1;
+    sget-object v0, Lrx/c/c;->bMO: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 df87a50dbe..66f3698f5f 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 bOq:Lrx/c/e;
+.field private static final bOA:Lrx/c/e;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/e;-><init>()V
 
-    sput-object v0, Lrx/c/e;->bOq:Lrx/c/e;
+    sput-object v0, Lrx/c/e;->bOA:Lrx/c/e;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Kf()Lrx/c/d;
+.method public static Ki()Lrx/c/d;
     .locals 1
 
-    sget-object v0, Lrx/c/e;->bOq:Lrx/c/e;
+    sget-object v0, Lrx/c/e;->bOA: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 428fe42639..60774e9d96 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;->Kk()Lrx/c/a;
+    value = Lrx/c/f;->Kn()Lrx/c/a;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field final synthetic bOx:Lrx/c/f;
+.field final synthetic bOH:Lrx/c/f;
 
 
 # direct methods
 .method constructor <init>(Lrx/c/f;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/c/f$2;->bOx:Lrx/c/f;
+    iput-object p1, p0, Lrx/c/f$2;->bOH: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 124428a88e..981f5bc41e 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 bOr:Lrx/c/f;
+.field private static final bOB:Lrx/c/f;
 
-.field static final bOw:Lrx/c/b;
+.field static final bOG:Lrx/c/b;
 
 
 # instance fields
-.field private final bGl:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bGv: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 bOs:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOC: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 bOt:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOD: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 bOu:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOE: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 bOv:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bOF: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;->bOr:Lrx/c/f;
+    sput-object v0, Lrx/c/f;->bOB: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;->bOw:Lrx/c/b;
+    sput-object v0, Lrx/c/f;->bOG: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;->bOs:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOC: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;->bOt:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOD: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;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOE: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;->bOv:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bOF: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;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/c/f;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method public static Kg()Lrx/c/f;
+.method public static Kj()Lrx/c/f;
     .locals 1
     .annotation runtime Ljava/lang/Deprecated;
     .end annotation
 
-    sget-object v0, Lrx/c/f;->bOr:Lrx/c/f;
+    sget-object v0, Lrx/c/f;->bOB:Lrx/c/f;
 
     return-object v0
 .end method
@@ -439,10 +439,10 @@
 
 
 # virtual methods
-.method public final Kh()Lrx/c/b;
+.method public final Kk()Lrx/c/b;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOs:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOC: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;->bOs:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOC:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v2, Lrx/c/f;->bOw:Lrx/c/b;
+    sget-object v2, Lrx/c/f;->bOG: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;->bOs:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOC: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;->bOs:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOC: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 Ki()Lrx/c/d;
+.method public final Kl()Lrx/c/d;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOD: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;->bOt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOD:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/e;->Kf()Lrx/c/d;
+    invoke-static {}, Lrx/c/e;->Ki()Lrx/c/d;
 
     move-result-object v2
 
@@ -528,7 +528,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bOt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOD: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;->bOt:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOD: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 Kj()Lrx/c/h;
+.method public final Km()Lrx/c/h;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOE: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;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOE:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/i;->Kq()Lrx/c/h;
+    invoke-static {}, Lrx/c/i;->Kt()Lrx/c/h;
 
     move-result-object v2
 
@@ -583,7 +583,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOE: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;->bOu:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOE: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 Kk()Lrx/c/a;
+.method public final Kn()Lrx/c/a;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bOv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOF: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;->bOv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOF: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;->bOv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bOF: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;->bOv:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bOF: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 Kl()Lrx/c/g;
+.method public final Ko()Lrx/c/g;
     .locals 3
 
-    iget-object v0, p0, Lrx/c/f;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bGv: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;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bGv:Ljava/util/concurrent/atomic/AtomicReference;
 
-    invoke-static {}, Lrx/c/g;->Kp()Lrx/c/g;
+    invoke-static {}, Lrx/c/g;->Ks()Lrx/c/g;
 
     move-result-object v2
 
@@ -693,7 +693,7 @@
     goto :goto_0
 
     :cond_0
-    iget-object v2, p0, Lrx/c/f;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/c/f;->bGv: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;->bGl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/c/f;->bGv: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 0981cba53d..7377399b88 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 bOy:Lrx/c/g;
+.field private static final bOI:Lrx/c/g;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/g;-><init>()V
 
-    sput-object v0, Lrx/c/g;->bOy:Lrx/c/g;
+    sput-object v0, Lrx/c/g;->bOI:Lrx/c/g;
 
     return-void
 .end method
@@ -28,7 +28,7 @@
     return-void
 .end method
 
-.method public static Km()Lrx/Scheduler;
+.method public static Kp()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -44,7 +44,7 @@
     return-object v1
 .end method
 
-.method public static Kn()Lrx/Scheduler;
+.method public static Kq()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -60,7 +60,7 @@
     return-object v1
 .end method
 
-.method public static Ko()Lrx/Scheduler;
+.method public static Kr()Lrx/Scheduler;
     .locals 2
 
     new-instance v0, Lrx/internal/util/j;
@@ -76,10 +76,10 @@
     return-object v1
 .end method
 
-.method public static Kp()Lrx/c/g;
+.method public static Ks()Lrx/c/g;
     .locals 1
 
-    sget-object v0, Lrx/c/g;->bOy:Lrx/c/g;
+    sget-object v0, Lrx/c/g;->bOI:Lrx/c/g;
 
     return-object v0
 .end method
diff --git a/com.discord/smali_classes2/rx/c/i.smali b/com.discord/smali_classes2/rx/c/i.smali
index 22ea182467..0bbc6c2a51 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 bOz:Lrx/c/i;
+.field private static final bOJ:Lrx/c/i;
 
 
 # direct methods
@@ -15,7 +15,7 @@
 
     invoke-direct {v0}, Lrx/c/i;-><init>()V
 
-    sput-object v0, Lrx/c/i;->bOz:Lrx/c/i;
+    sput-object v0, Lrx/c/i;->bOJ:Lrx/c/i;
 
     return-void
 .end method
@@ -28,10 +28,10 @@
     return-void
 .end method
 
-.method public static Kq()Lrx/c/h;
+.method public static Kt()Lrx/c/h;
     .locals 1
 
-    sget-object v0, Lrx/c/i;->bOz:Lrx/c/i;
+    sget-object v0, Lrx/c/i;->bOJ: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 aef2cb09ae..a923e08fb1 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 bGd:Lrx/d$a;
+.field public static final enum bGn:Lrx/d$a;
 
-.field public static final enum bGe:Lrx/d$a;
+.field public static final enum bGo:Lrx/d$a;
 
-.field public static final enum bGf:Lrx/d$a;
+.field public static final enum bGp:Lrx/d$a;
 
-.field private static final synthetic bGg:[Lrx/d$a;
+.field private static final synthetic bGq:[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;->bGd:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGn: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;->bGe:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGo: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;->bGf:Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGp:Lrx/d$a;
 
     const/4 v0, 0x3
 
     new-array v0, v0, [Lrx/d$a;
 
-    sget-object v4, Lrx/d$a;->bGd:Lrx/d$a;
+    sget-object v4, Lrx/d$a;->bGn:Lrx/d$a;
 
     aput-object v4, v0, v1
 
-    sget-object v1, Lrx/d$a;->bGe:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGo:Lrx/d$a;
 
     aput-object v1, v0, v2
 
-    sget-object v1, Lrx/d$a;->bGf:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGp:Lrx/d$a;
 
     aput-object v1, v0, v3
 
-    sput-object v0, Lrx/d$a;->bGg:[Lrx/d$a;
+    sput-object v0, Lrx/d$a;->bGq:[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;->bGg:[Lrx/d$a;
+    sget-object v0, Lrx/d$a;->bGq:[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 2a8f7d9599..16ceb5548d 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 bGc:Lrx/d;
+.field private static final bGm:Lrx/d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/d<",
@@ -33,7 +33,7 @@
 
 
 # instance fields
-.field public final bGb:Lrx/d$a;
+.field public final bGl: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;->bGf:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGp: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;->bGc:Lrx/d;
+    sput-object v0, Lrx/d;->bGm: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;->bGb:Lrx/d$a;
+    iput-object p1, p0, Lrx/d;->bGl:Lrx/d$a;
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     new-instance v0, Lrx/d;
 
-    sget-object v1, Lrx/d$a;->bGe:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGo:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -113,7 +113,7 @@
     return-object v0
 .end method
 
-.method public static IJ()Lrx/d;
+.method public static IM()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;->bGd:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGn:Lrx/d$a;
 
     const/4 v2, 0x0
 
@@ -136,7 +136,7 @@
     return-object v0
 .end method
 
-.method public static IK()Lrx/d;
+.method public static IN()Lrx/d;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -148,17 +148,17 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/d;->bGc:Lrx/d;
+    sget-object v0, Lrx/d;->bGm:Lrx/d;
 
     return-object v0
 .end method
 
-.method private IL()Z
+.method private IO()Z
     .locals 4
 
-    iget-object v0, p0, Lrx/d;->bGb:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bGl:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bGd:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGn:Lrx/d$a;
 
     const/4 v2, 0x1
 
@@ -186,10 +186,10 @@
     return v3
 .end method
 
-.method private IM()Z
+.method private IP()Z
     .locals 1
 
-    invoke-virtual {p0}, Lrx/d;->IN()Z
+    invoke-virtual {p0}, Lrx/d;->IQ()Z
 
     move-result v0
 
@@ -211,12 +211,12 @@
 
 
 # virtual methods
-.method public final IN()Z
+.method public final IQ()Z
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->bGb:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bGl:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bGe:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGo: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;->bGb:Lrx/d$a;
+    iget-object v2, p1, Lrx/d;->bGl:Lrx/d$a;
 
-    iget-object v3, p0, Lrx/d;->bGb:Lrx/d$a;
+    iget-object v3, p0, Lrx/d;->bGl:Lrx/d$a;
 
     if-ne v2, v3, :cond_5
 
@@ -307,13 +307,13 @@
 .method public final hashCode()I
     .locals 2
 
-    iget-object v0, p0, Lrx/d;->bGb:Lrx/d$a;
+    iget-object v0, p0, Lrx/d;->bGl:Lrx/d$a;
 
     invoke-virtual {v0}, Lrx/d$a;->hashCode()I
 
     move-result v0
 
-    invoke-direct {p0}, Lrx/d;->IL()Z
+    invoke-direct {p0}, Lrx/d;->IO()Z
 
     move-result v1
 
@@ -330,7 +330,7 @@
     add-int/2addr v0, v1
 
     :cond_0
-    invoke-direct {p0}, Lrx/d;->IM()Z
+    invoke-direct {p0}, Lrx/d;->IP()Z
 
     move-result v1
 
@@ -373,11 +373,11 @@
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
 
-    iget-object v2, p0, Lrx/d;->bGb:Lrx/d$a;
+    iget-object v2, p0, Lrx/d;->bGl:Lrx/d$a;
 
     invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
 
-    invoke-direct {p0}, Lrx/d;->IL()Z
+    invoke-direct {p0}, Lrx/d;->IO()Z
 
     move-result v2
 
@@ -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;->IM()Z
+    invoke-direct {p0}, Lrx/d;->IP()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 4b57ad2c4f..5200421757 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 aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final aPZ: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 bOA:Lrx/Scheduler;
+.field private final bOK:Lrx/Scheduler;
 
-.field private final bOB:Lrx/Scheduler;
+.field private final bOL:Lrx/Scheduler;
 
-.field private final bOC:Lrx/Scheduler;
+.field private final bOM:Lrx/Scheduler;
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
 
-    sput-object v0, Lrx/d/a;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/d/a;->aPZ: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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v0
 
-    invoke-virtual {v0}, Lrx/c/f;->Kl()Lrx/c/g;
+    invoke-virtual {v0}, Lrx/c/f;->Ko()Lrx/c/g;
 
-    invoke-static {}, Lrx/c/g;->Km()Lrx/Scheduler;
+    invoke-static {}, Lrx/c/g;->Kp()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bOA:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bOK:Lrx/Scheduler;
 
-    invoke-static {}, Lrx/c/g;->Kn()Lrx/Scheduler;
+    invoke-static {}, Lrx/c/g;->Kq()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bOB:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bOL:Lrx/Scheduler;
 
-    invoke-static {}, Lrx/c/g;->Ko()Lrx/Scheduler;
+    invoke-static {}, Lrx/c/g;->Kr()Lrx/Scheduler;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/d/a;->bOC:Lrx/Scheduler;
+    iput-object v0, p0, Lrx/d/a;->bOM:Lrx/Scheduler;
 
     return-void
 .end method
 
-.method private static Kr()Lrx/d/a;
+.method private static Ku()Lrx/d/a;
     .locals 3
 
     :goto_0
-    sget-object v0, Lrx/d/a;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/d/a;->aPZ: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;->aPQ:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v1, Lrx/d/a;->aPZ:Ljava/util/concurrent/atomic/AtomicReference;
 
     const/4 v2, 0x0
 
@@ -102,27 +102,27 @@
     return-object v0
 
     :cond_1
-    invoke-direct {v0}, Lrx/d/a;->Kv()V
+    invoke-direct {v0}, Lrx/d/a;->Ky()V
 
     goto :goto_0
 .end method
 
-.method public static Ks()Lrx/Scheduler;
+.method public static Kv()Lrx/Scheduler;
     .locals 1
 
-    sget-object v0, Lrx/internal/c/m;->bMv:Lrx/internal/c/m;
+    sget-object v0, Lrx/internal/c/m;->bMF:Lrx/internal/c/m;
 
     return-object v0
 .end method
 
-.method public static Kt()Lrx/Scheduler;
+.method public static Kw()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->Kr()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->bOA:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->bOK: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 Ku()Lrx/Scheduler;
+.method public static Kx()Lrx/Scheduler;
     .locals 1
 
-    invoke-static {}, Lrx/d/a;->Kr()Lrx/d/a;
+    invoke-static {}, Lrx/d/a;->Ku()Lrx/d/a;
 
     move-result-object v0
 
-    iget-object v0, v0, Lrx/d/a;->bOB:Lrx/Scheduler;
+    iget-object v0, v0, Lrx/d/a;->bOL: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 Kv()V
+.method private declared-synchronized Ky()V
     .locals 1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/d/a;->bOA:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOK:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/d/a;->bOA:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOK: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;->bOB:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOL:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/d/a;->bOB:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOL: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;->bOC:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOM:Lrx/Scheduler;
 
     instance-of v0, v0, Lrx/internal/c/k;
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/d/a;->bOC:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/d/a;->bOM: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 a76f641ac9..4ae7363a26 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 bGi:Lrx/f$a;
+.field final bGs: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;->bGi:Lrx/f$a;
+    iput-object p1, p0, Lrx/f;->bGs: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 c4423706eb..1b3cb204fe 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 bGt:Lrx/functions/a$b;
+.field private static final bGD: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;->bGt:Lrx/functions/a$b;
+    sput-object v0, Lrx/functions/a;->bGD:Lrx/functions/a$b;
 
     return-void
 .end method
 
-.method public static Jb()Lrx/functions/a$b;
+.method public static Je()Lrx/functions/a$b;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -57,7 +57,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/functions/a;->bGt:Lrx/functions/a$b;
+    sget-object v0, Lrx/functions/a;->bGD: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 db4877b717..735319e324 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 bGu:Lrx/functions/Func9;
+.field final synthetic bGE:Lrx/functions/Func9;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func9;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$1;->bGu:Lrx/functions/Func9;
+    iput-object p1, p0, Lrx/functions/c$1;->bGE: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;->bGu:Lrx/functions/Func9;
+    iget-object v2, p0, Lrx/functions/c$1;->bGE: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 a4ef04ec32..96164d9218 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 bGv:Lrx/functions/Func2;
+.field final synthetic bGF:Lrx/functions/Func2;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func2;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$2;->bGv:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/functions/c$2;->bGF: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;->bGv:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/functions/c$2;->bGF: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 a9ad6c9046..aad188c4f2 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 bGw:Lrx/functions/Func3;
+.field final synthetic bGG:Lrx/functions/Func3;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func3;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$3;->bGw:Lrx/functions/Func3;
+    iput-object p1, p0, Lrx/functions/c$3;->bGG: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;->bGw:Lrx/functions/Func3;
+    iget-object v0, p0, Lrx/functions/c$3;->bGG: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 e9cb3fc1ae..70173791f3 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 bGx:Lrx/functions/Func4;
+.field final synthetic bGH:Lrx/functions/Func4;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func4;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$4;->bGx:Lrx/functions/Func4;
+    iput-object p1, p0, Lrx/functions/c$4;->bGH: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;->bGx:Lrx/functions/Func4;
+    iget-object v0, p0, Lrx/functions/c$4;->bGH: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 824696c406..11f69bc86a 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 bGy:Lrx/functions/Func5;
+.field final synthetic bGI:Lrx/functions/Func5;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func5;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$5;->bGy:Lrx/functions/Func5;
+    iput-object p1, p0, Lrx/functions/c$5;->bGI: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;->bGy:Lrx/functions/Func5;
+    iget-object v2, p0, Lrx/functions/c$5;->bGI: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 ab157d72db..cd4ff1c7cc 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 bGz:Lrx/functions/Func6;
+.field final synthetic bGJ:Lrx/functions/Func6;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func6;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$6;->bGz:Lrx/functions/Func6;
+    iput-object p1, p0, Lrx/functions/c$6;->bGJ: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;->bGz:Lrx/functions/Func6;
+    iget-object v2, p0, Lrx/functions/c$6;->bGJ: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 3725e3f357..2074c3f191 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 bGA:Lrx/functions/Func7;
+.field final synthetic bGK:Lrx/functions/Func7;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func7;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$7;->bGA:Lrx/functions/Func7;
+    iput-object p1, p0, Lrx/functions/c$7;->bGK: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;->bGA:Lrx/functions/Func7;
+    iget-object v2, p0, Lrx/functions/c$7;->bGK: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 245c8d92e6..bdbf44e03d 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 bGB:Lrx/functions/Func8;
+.field final synthetic bGL:Lrx/functions/Func8;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/Func8;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/functions/c$8;->bGB:Lrx/functions/Func8;
+    iput-object p1, p0, Lrx/functions/c$8;->bGL: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;->bGB:Lrx/functions/Func8;
+    iget-object v2, p0, Lrx/functions/c$8;->bGL: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 dfb772699f..b7a6e59a29 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 bGj:Lrx/internal/util/SubscriptionList;
+.field private final bGt: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;->bGj:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/g;->bGt: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;->bGj:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bGt: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;->bGj:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bGt: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;->bGj:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/g;->bGt: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 d1f28f69c8..71fa91e92b 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 final synthetic bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field bIo:Z
+.field final synthetic bIA:Lrx/internal/a/aa;
 
-.field final synthetic bIp:Lrx/internal/b/b;
+.field bIy:Z
 
-.field final synthetic bIq:Lrx/internal/a/aa;
+.field final synthetic bIz:Lrx/internal/b/b;
 
 .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;->bIq:Lrx/internal/a/aa;
+    iput-object p1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
 
-    iput-object p2, p0, Lrx/internal/a/aa$1;->bIp:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/aa$1;->bIz:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/aa$1;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aa$1;->bHH: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;->bIo:Z
+    iget-boolean v0, p0, Lrx/internal/a/aa$1;->bIy:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aa$1;->bIp:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bIz: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;->bIp:Lrx/internal/b/b;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bIz:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bIq:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->bIn:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->bIx: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aa$1;->bHH: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;->bIo:Z
+    iput-boolean v0, p0, Lrx/internal/a/aa$1;->bIy:Z
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bIq:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
 
-    iget-object v1, v1, Lrx/internal/a/aa;->bHj:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/aa;->bHt: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;->bIp:Lrx/internal/b/b;
+    iget-object p1, p0, Lrx/internal/a/aa$1;->bIz:Lrx/internal/b/b;
 
-    iget-object v1, p0, Lrx/internal/a/aa$1;->bIq:Lrx/internal/a/aa;
+    iget-object v1, p0, Lrx/internal/a/aa$1;->bIA:Lrx/internal/a/aa;
 
-    iget-boolean v1, v1, Lrx/internal/a/aa;->bIn:Z
+    iget-boolean v1, v1, Lrx/internal/a/aa;->bIx: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 8541e35a7b..662a3a928a 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 bHj:Lrx/functions/b;
+.field final bHt:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bIn:Z
+.field final bIx:Z
 
 
 # direct methods
@@ -50,11 +50,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/aa;->bHj:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/aa;->bHt:Lrx/functions/b;
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/aa;->bIn:Z
+    iput-boolean p1, p0, Lrx/internal/a/aa;->bIx: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 55e4e30f94..6942c4b4cc 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 bIv:Lrx/internal/a/ab$a;
+.field final synthetic bIF: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;->bIv:Lrx/internal/a/ab$a;
+    iput-object p1, p0, Lrx/internal/a/ab$a$1;->bIF: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;->bIv:Lrx/internal/a/ab$a;
+    iget-object v0, p0, Lrx/internal/a/ab$a$1;->bIF: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;->bIt:Ljava/util/List;
+    iget-object v1, v0, Lrx/internal/a/ab$a;->bID: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;->bIt:Ljava/util/List;
+    iput-object v2, v0, Lrx/internal/a/ab$a;->bID: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 31c092b101..2367898212 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 bIt:Ljava/util/List;
+.field bID:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -31,7 +31,7 @@
     .end annotation
 .end field
 
-.field final synthetic bIu:Lrx/internal/a/ab;
+.field final synthetic bIE: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;->bIu:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->bIE: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;->bIt:Ljava/util/List;
+    iput-object p1, p0, Lrx/internal/a/ab$a;->bID: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;->bIt:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bID:Ljava/util/List;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/ab$a;->bIt:Ljava/util/List;
+    iput-object v1, p0, Lrx/internal/a/ab$a;->bID: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;->bIt:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->bID: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;->bIt:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bID:Ljava/util/List;
 
     invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/ab$a;->bIt:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->bID:Ljava/util/List;
 
     invoke-interface {p1}, Ljava/util/List;->size()I
 
     move-result p1
 
-    iget-object v0, p0, Lrx/internal/a/ab$a;->bIu:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$a;->bIE: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;->bIt:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/ab$a;->bID: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;->bIt:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/ab$a;->bID: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 8c6de2f57a..db59b2c539 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 bIw:Lrx/internal/a/ab$b;
+.field final synthetic bIG: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;->bIw:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$1;->bIG: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;->bIw:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$1;->bIG:Lrx/internal/a/ab$b;
 
-    invoke-virtual {v0}, Lrx/internal/a/ab$b;->Jk()V
+    invoke-virtual {v0}, Lrx/internal/a/ab$b;->Jn()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 822418a9a4..49e3b40c7c 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;->Jk()V
+    value = Lrx/internal/a/ab$b;->Jn()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -18,18 +18,18 @@
 
 
 # instance fields
-.field final synthetic bIw:Lrx/internal/a/ab$b;
+.field final synthetic bIG:Lrx/internal/a/ab$b;
 
-.field final synthetic bIx:Ljava/util/List;
+.field final synthetic bIH: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;->bIw:Lrx/internal/a/ab$b;
+    iput-object p1, p0, Lrx/internal/a/ab$b$2;->bIG:Lrx/internal/a/ab$b;
 
-    iput-object p2, p0, Lrx/internal/a/ab$b$2;->bIx:Ljava/util/List;
+    iput-object p2, p0, Lrx/internal/a/ab$b$2;->bIH: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;->bIw:Lrx/internal/a/ab$b;
+    iget-object v0, p0, Lrx/internal/a/ab$b$2;->bIG:Lrx/internal/a/ab$b;
 
-    iget-object v1, p0, Lrx/internal/a/ab$b$2;->bIx:Ljava/util/List;
+    iget-object v1, p0, Lrx/internal/a/ab$b$2;->bIH: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 63d0a410e7..694f1b8f68 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 bIu:Lrx/internal/a/ab;
+.field final synthetic bIE: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;->bIu:Lrx/internal/a/ab;
+    iput-object p1, p0, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
@@ -84,7 +84,7 @@
 
 
 # virtual methods
-.method final Jk()V
+.method final Jn()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;->bIu:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
 
-    iget-wide v3, v0, Lrx/internal/a/ab;->bIr:J
+    iget-wide v3, v0, Lrx/internal/a/ab;->bIB:J
 
-    iget-object v0, p0, Lrx/internal/a/ab$b;->bIu:Lrx/internal/a/ab;
+    iget-object v0, p0, Lrx/internal/a/ab$b;->bIE: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;->bIu:Lrx/internal/a/ab;
+    iget-object v4, p0, Lrx/internal/a/ab$b;->bIE: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 8aa0e07045..cf63c9351f 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 bIr:J
+.field final bIB:J
 
-.field final bIs:J
+.field final bIC: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;->bIr:J
+    iput-wide p1, p0, Lrx/internal/a/ab;->bIB:J
 
-    iput-wide p3, p0, Lrx/internal/a/ab;->bIs:J
+    iput-wide p3, p0, Lrx/internal/a/ab;->bIC: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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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;->bIr:J
+    iget-wide v2, p0, Lrx/internal/a/ab;->bIB:J
 
-    iget-wide v4, p0, Lrx/internal/a/ab;->bIs:J
+    iget-wide v4, p0, Lrx/internal/a/ab;->bIC: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;->bIu:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bIE:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->bIr:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->bIB:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bIu:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bIE:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->bIr:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->bIB:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$a;->bIu:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$a;->bIE: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;->Jk()V
+    invoke-virtual {v2}, Lrx/internal/a/ab$b;->Jn()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;->bIu:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
 
-    iget-wide v5, p1, Lrx/internal/a/ab;->bIs:J
+    iget-wide v5, p1, Lrx/internal/a/ab;->bIC:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bIu:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bIE:Lrx/internal/a/ab;
 
-    iget-wide v7, p1, Lrx/internal/a/ab;->bIs:J
+    iget-wide v7, p1, Lrx/internal/a/ab;->bIC:J
 
-    iget-object p1, v2, Lrx/internal/a/ab$b;->bIu:Lrx/internal/a/ab;
+    iget-object p1, v2, Lrx/internal/a/ab$b;->bIE: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 c33539ba0f..132df2b0f3 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 bIA:Lrx/internal/a/ac$1;
+.field final synthetic bIK: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;->bIA:Lrx/internal/a/ac$1;
+    iput-object p1, p0, Lrx/internal/a/ac$1$1;->bIK: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;->bIA:Lrx/internal/a/ac$1;
+    iget-object v0, p0, Lrx/internal/a/ac$1$1;->bIK:Lrx/internal/a/ac$1;
 
-    iget-object v0, v0, Lrx/internal/a/ac$1;->bIy:Lrx/internal/a/ac$a;
+    iget-object v0, v0, Lrx/internal/a/ac$1;->bII: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;->bIA:Lrx/internal/a/ac$1;
+    iget-object v2, p0, Lrx/internal/a/ac$1$1;->bIK: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;->bIA:Lrx/internal/a/ac$1;
+    iget-object v3, p0, Lrx/internal/a/ac$1$1;->bIK: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 ef4140bb6f..c4995334b1 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 bIy:Lrx/internal/a/ac$a;
+.field final bII: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 bIz:Lrx/internal/a/ac;
+.field final synthetic bIJ: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;->bIz:Lrx/internal/a/ac;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->bIJ: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;->bIy:Lrx/internal/a/ac$a;
+    iput-object p1, p0, Lrx/internal/a/ac$1;->bII: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;->bIy:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->bII: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;->bIy:Lrx/internal/a/ac$a;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bII: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;->bIy:Lrx/internal/a/ac$a;
+    iget-object v0, p0, Lrx/internal/a/ac$1;->bII: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;->bIz:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bIJ:Lrx/internal/a/ac;
 
     iget-wide v3, p1, Lrx/internal/a/ac;->timeout:J
 
-    iget-object p1, p0, Lrx/internal/a/ac$1;->bIz:Lrx/internal/a/ac;
+    iget-object p1, p0, Lrx/internal/a/ac$1;->bIJ: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 97c2a2c9d8..c695538c71 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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->IY()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 eb64a7f2e3..2a5b060af5 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 bIC:Lrx/internal/a/ad$1;
+.field final synthetic bIM: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;->bIC:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$1;->bIM: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;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bIM: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;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$1;->bIM: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;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bHH: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 97084c4e31..d64470936a 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 bIC:Lrx/internal/a/ad$1;
+.field final synthetic bIM:Lrx/internal/a/ad$1;
 
-.field final synthetic bID:Ljava/lang/Throwable;
+.field final synthetic bIN:Ljava/lang/Throwable;
 
 
 # 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;->bIC:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$2;->bIM:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$2;->bID:Ljava/lang/Throwable;
+    iput-object p2, p0, Lrx/internal/a/ad$1$2;->bIN: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;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIM: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;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIM: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;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bHH:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$2;->bID:Ljava/lang/Throwable;
+    iget-object v1, p0, Lrx/internal/a/ad$1$2;->bIN:Ljava/lang/Throwable;
 
     invoke-virtual {v0, v1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
-    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$2;->bIM: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 53b2afd984..fa28421622 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 bIC:Lrx/internal/a/ad$1;
+.field final synthetic bIM:Lrx/internal/a/ad$1;
 
-.field final synthetic bIE:Ljava/lang/Object;
+.field final synthetic bIO:Ljava/lang/Object;
 
 
 # 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;->bIC:Lrx/internal/a/ad$1;
+    iput-object p1, p0, Lrx/internal/a/ad$1$3;->bIM:Lrx/internal/a/ad$1;
 
-    iput-object p2, p0, Lrx/internal/a/ad$1$3;->bIE:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ad$1$3;->bIO: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;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bIM: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;->bIC:Lrx/internal/a/ad$1;
+    iget-object v0, p0, Lrx/internal/a/ad$1$3;->bIM:Lrx/internal/a/ad$1;
 
-    iget-object v0, v0, Lrx/internal/a/ad$1;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/ad$1;->bHH:Lrx/Subscriber;
 
-    iget-object v1, p0, Lrx/internal/a/ad$1$3;->bIE:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ad$1$3;->bIO: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 b40ba9cfcf..46a86d22a8 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bIB:Lrx/internal/a/ad;
+.field final synthetic bIL: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;->bIB:Lrx/internal/a/ad;
+    iput-object p1, p0, Lrx/internal/a/ad$1;->bIL: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;->bHx:Lrx/Subscriber;
+    iput-object p4, p0, Lrx/internal/a/ad$1;->bHH: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;->bIB:Lrx/internal/a/ad;
+    iget-object v2, p0, Lrx/internal/a/ad$1;->bIL:Lrx/internal/a/ad;
 
     iget-wide v2, v2, Lrx/internal/a/ad;->delay:J
 
-    iget-object v4, p0, Lrx/internal/a/ad$1;->bIB:Lrx/internal/a/ad;
+    iget-object v4, p0, Lrx/internal/a/ad$1;->bIL: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;->bIB:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->bIL:Lrx/internal/a/ad;
 
     iget-wide v2, p1, Lrx/internal/a/ad;->delay:J
 
-    iget-object p1, p0, Lrx/internal/a/ad$1;->bIB:Lrx/internal/a/ad;
+    iget-object p1, p0, Lrx/internal/a/ad$1;->bIL: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 3b4541c544..67d4dd72b1 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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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 87566e02bd..fe947bbebf 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field bIG:Ljava/lang/Object;
+.field bIQ:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TU;"
@@ -32,18 +32,18 @@
     .end annotation
 .end field
 
-.field bIH:Z
+.field bIR:Z
 
-.field final synthetic bII:Lrx/internal/a/ae;
+.field final synthetic bIS: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;->bII:Lrx/internal/a/ae;
+    iput-object p1, p0, Lrx/internal/a/ae$1;->bIS:Lrx/internal/a/ae;
 
-    iput-object p3, p0, Lrx/internal/a/ae$1;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ae$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHH: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;->bII:Lrx/internal/a/ae;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bIS:Lrx/internal/a/ae;
 
-    iget-object v0, v0, Lrx/internal/a/ae;->bIk:Lrx/functions/b;
+    iget-object v0, v0, Lrx/internal/a/ae;->bIu: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;->bIG:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bIQ:Ljava/lang/Object;
 
-    iput-object v0, p0, Lrx/internal/a/ae$1;->bIG:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/ae$1;->bIQ:Ljava/lang/Object;
 
-    iget-boolean v2, p0, Lrx/internal/a/ae$1;->bIH:Z
+    iget-boolean v2, p0, Lrx/internal/a/ae$1;->bIR:Z
 
     if-eqz v2, :cond_1
 
     :try_start_1
-    iget-object v2, p0, Lrx/internal/a/ae$1;->bII:Lrx/internal/a/ae;
+    iget-object v2, p0, Lrx/internal/a/ae$1;->bIS:Lrx/internal/a/ae;
 
-    iget-object v2, v2, Lrx/internal/a/ae;->bIF:Lrx/functions/Func2;
+    iget-object v2, v2, Lrx/internal/a/ae;->bIP: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bHH: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;->bIH:Z
+    iput-boolean v0, p0, Lrx/internal/a/ae$1;->bIR:Z
 
-    iget-object v0, p0, Lrx/internal/a/ae$1;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ae$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ae$1;->bHH: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 383a0f8873..e7483f9fae 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 bIJ:Lrx/internal/a/ae;
+.field static final bIT: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;->bNi:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNs: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;->bIJ:Lrx/internal/a/ae;
+    sput-object v0, Lrx/internal/a/ae$a;->bIT:Lrx/internal/a/ae;
 
     return-void
 .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 63c232cf6e..07877ee4c0 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 bIK:Lrx/functions/Action0;
+.field private final bIU: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;->bIK:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/af;->bIU:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/af;->bIK:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/af;->bIU: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 8cd3f0eba3..21d03a8ff7 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 bIL:Lrx/functions/Action0;
+.field private final bIV: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;->bIL:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/a/ag;->bIV:Lrx/functions/Action0;
 
     return-void
 .end method
@@ -41,7 +41,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ag;->bIL:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/a/ag;->bIV: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 eef28f523c..142cba74e0 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 bIO:Lrx/internal/a/ah;
+.field static final bIY: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;->bIO:Lrx/internal/a/ah;
+    sput-object v0, Lrx/internal/a/ah$a;->bIY: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 d48a504212..40de417a28 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 bIS:I
+.field static final bJc:I
 
 
 # instance fields
-.field final bIP:Lrx/internal/a/ah$d;
+.field final bIZ: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 bIQ:Lrx/internal/util/i;
+.field volatile bJa:Lrx/internal/util/i;
 
-.field bIR:I
+.field bJb:I
 
 .field volatile done:Z
 
@@ -51,11 +51,11 @@
 .method static constructor <clinit>()V
     .locals 1
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     div-int/lit8 v0, v0, 0x4
 
-    sput v0, Lrx/internal/a/ah$b;->bIS:I
+    sput v0, Lrx/internal/a/ah$b;->bJc: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;->bIP:Lrx/internal/a/ah$d;
+    iput-object p1, p0, Lrx/internal/a/ah$b;->bIZ:Lrx/internal/a/ah$d;
 
     iput-wide p2, p0, Lrx/internal/a/ah$b;->id:J
 
@@ -84,26 +84,26 @@
 .method public final aO(J)V
     .locals 1
 
-    iget v0, p0, Lrx/internal/a/ah$b;->bIR:I
+    iget v0, p0, Lrx/internal/a/ah$b;->bJb:I
 
     long-to-int p2, p1
 
     sub-int/2addr v0, p2
 
-    sget p1, Lrx/internal/a/ah$b;->bIS:I
+    sget p1, Lrx/internal/a/ah$b;->bJc:I
 
     if-le v0, p1, :cond_0
 
-    iput v0, p0, Lrx/internal/a/ah$b;->bIR:I
+    iput v0, p0, Lrx/internal/a/ah$b;->bJb:I
 
     return-void
 
     :cond_0
-    sget p1, Lrx/internal/util/i;->bMV:I
+    sget p1, Lrx/internal/util/i;->bNf:I
 
-    iput p1, p0, Lrx/internal/a/ah$b;->bIR:I
+    iput p1, p0, Lrx/internal/a/ah$b;->bJb:I
 
-    sget p1, Lrx/internal/util/i;->bMV:I
+    sget p1, Lrx/internal/util/i;->bNf:I
 
     sub-int/2addr p1, v0
 
@@ -124,9 +124,9 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ah$b;->done:Z
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bIP:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIZ:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jq()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jt()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;->bIP:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIZ:Lrx/internal/a/ah$d;
 
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jn()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jq()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;->bIP:Lrx/internal/a/ah$d;
+    iget-object p1, p0, Lrx/internal/a/ah$b;->bIZ:Lrx/internal/a/ah$d;
 
-    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Jq()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Jt()V
 
     return-void
 .end method
@@ -161,9 +161,9 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bIP:Lrx/internal/a/ah$d;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bIZ:Lrx/internal/a/ah$d;
 
-    iget-object v1, v0, Lrx/internal/a/ah$d;->bIT:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->bJd: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;->bIT:Lrx/internal/a/ah$c;
+    iget-object v1, v0, Lrx/internal/a/ah$d;->bJd: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;->bIQ:Lrx/internal/util/i;
+    iget-object v3, p0, Lrx/internal/a/ah$b;->bJa: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;->Jr()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Ju()V
 
     return-void
 
@@ -261,7 +261,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v3, v0, Lrx/internal/a/ah$d;->bIM:Z
+    iget-boolean v3, v0, Lrx/internal/a/ah$d;->bIW:Z
 
     if-nez v3, :cond_4
 
@@ -285,7 +285,7 @@
 
     :cond_4
     :try_start_4
-    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jn()Ljava/util/Queue;
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jq()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;->bIT:Lrx/internal/a/ah$c;
+    iget-object p1, v0, Lrx/internal/a/ah$d;->bJd: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;->Jr()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Ju()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;->Jq()V
+    invoke-virtual {v0}, Lrx/internal/a/ah$d;->Jt()V
 
     :goto_6
     return-void
@@ -390,11 +390,11 @@
 .method public final onStart()V
     .locals 2
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
-    iput v0, p0, Lrx/internal/a/ah$b;->bIR:I
+    iput v0, p0, Lrx/internal/a/ah$b;->bJb:I
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     int-to-long v0, v0
 
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 bba316b301..26d13b389b 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;->Jq()V
+    invoke-virtual {p1}, Lrx/internal/a/ah$d;->Jt()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 abecf2116c..0a0c3a82b3 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 bJa:[Lrx/internal/a/ah$b;
+.field static final bJk:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -38,11 +38,11 @@
 
 
 # instance fields
-.field final bIM:Z
+.field final bIW:Z
 
-.field final bIN:I
+.field final bIX:I
 
-.field bIT:Lrx/internal/a/ah$c;
+.field bJd:Lrx/internal/a/ah$c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/ah$c<",
@@ -51,7 +51,7 @@
     .end annotation
 .end field
 
-.field volatile bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field volatile bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -61,9 +61,9 @@
     .end annotation
 .end field
 
-.field final bIV:Ljava/lang/Object;
+.field final bJf:Ljava/lang/Object;
 
-.field volatile bIW:[Lrx/internal/a/ah$b;
+.field volatile bJg:[Lrx/internal/a/ah$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -73,15 +73,15 @@
     .end annotation
 .end field
 
-.field bIX:J
+.field bJh:J
 
-.field bIY:J
+.field bJi:J
 
-.field bIZ:I
+.field bJj:I
 
-.field final bJb:I
+.field final bJl:I
 
-.field bJc:I
+.field bJm: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;->bJa:[Lrx/internal/a/ah$b;
+    sput-object v0, Lrx/internal/a/ah$d;->bJk:[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;->bIM:Z
+    iput-boolean p2, p0, Lrx/internal/a/ah$d;->bIW:Z
 
-    iput p3, p0, Lrx/internal/a/ah$d;->bIN:I
+    iput p3, p0, Lrx/internal/a/ah$d;->bIX:I
 
     new-instance p1, Ljava/lang/Object;
 
     invoke-direct {p1}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bIV:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bJf:Ljava/lang/Object;
 
-    sget-object p1, Lrx/internal/a/ah$d;->bJa:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->bJk:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bIW:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bJg:[Lrx/internal/a/ah$b;
 
     const p1, 0x7fffffff
 
     if-ne p3, p1, :cond_0
 
-    iput p1, p0, Lrx/internal/a/ah$d;->bJb:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJl:I
 
     const-wide p1, 0x7fffffffffffffffL
 
@@ -173,7 +173,7 @@
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/a/ah$d;->bJb:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJl:I
 
     int-to-long p1, p3
 
@@ -182,7 +182,7 @@
     return-void
 .end method
 
-.method private Jo()Lrx/subscriptions/CompositeSubscription;
+.method private Jr()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 Jp()V
+.method private Js()V
     .locals 4
 
     new-instance v0, Ljava/util/ArrayList;
 
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bJe: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 Js()Z
+.method private Jv()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;->bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
-    iget-boolean v2, p0, Lrx/internal/a/ah$d;->bIM:Z
+    iget-boolean v2, p0, Lrx/internal/a/ah$d;->bIW: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;->Jp()V
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Js()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;->bIQ:Lrx/internal/util/i;
+    iget-object v0, p1, Lrx/internal/a/ah$b;->bJa: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;->bIV:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJf:Ljava/lang/Object;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/ah$d;->bIW:[Lrx/internal/a/ah$b;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bJg:[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;->bJa:[Lrx/internal/a/ah$b;
+    sget-object p1, Lrx/internal/a/ah$d;->bJk:[Lrx/internal/a/ah$b;
 
-    iput-object p1, p0, Lrx/internal/a/ah$d;->bIW:[Lrx/internal/a/ah$b;
+    iput-object p1, p0, Lrx/internal/a/ah$d;->bJg:[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;->bIW:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->bJg:[Lrx/internal/a/ah$b;
 
     monitor-exit v0
 
@@ -453,17 +453,17 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/ah$b;->bIQ:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/ah$b;->bJa:Lrx/internal/util/i;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/util/i;->JQ()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->JT()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;->bIQ:Lrx/internal/util/i;
+    iput-object v0, p0, Lrx/internal/a/ah$b;->bJa: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;->bIN:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bIX:I
 
     const v1, 0x7fffffff
 
@@ -524,7 +524,7 @@
 
     new-instance v0, Lrx/internal/util/a/h;
 
-    sget v1, Lrx/internal/util/i;->bMV:I
+    sget v1, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, v1}, Lrx/internal/util/a/h;-><init>(I)V
 
@@ -547,7 +547,7 @@
     :goto_0
     if-eqz v1, :cond_3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
 
     move-result v1
 
@@ -606,7 +606,7 @@
 
 
 # virtual methods
-.method final Jn()Ljava/util/Queue;
+.method final Jq()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;->bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJe: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;->bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/ah$d;->bJe:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     :cond_0
     monitor-exit p0
@@ -653,7 +653,7 @@
     return-object v0
 .end method
 
-.method final Jq()V
+.method final Jt()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;->Jr()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ju()V
 
     return-void
 
@@ -693,7 +693,7 @@
     throw v0
 .end method
 
-.method Jr()V
+.method Ju()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;->Js()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jv()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;->bIT:Lrx/internal/a/ah$c;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->bJd: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;->Js()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jv()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;->bIM:Z
+    iget-boolean v0, v1, Lrx/internal/a/ah$d;->bIW: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;->Jn()Ljava/util/Queue;
+    invoke-virtual/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jq()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;->bIT:Lrx/internal/a/ah$c;
+    iget-object v6, v1, Lrx/internal/a/ah$d;->bJd: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;->bIW:[Lrx/internal/a/ah$b;
+    iget-object v5, v1, Lrx/internal/a/ah$d;->bJg:[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;->bIU:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v1, Lrx/internal/a/ah$d;->bJe: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;->Jp()V
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Js()V
 
     return-void
 
@@ -928,9 +928,9 @@
     :cond_e
     if-lez v8, :cond_21
 
-    iget-wide v11, v1, Lrx/internal/a/ah$d;->bIY:J
+    iget-wide v11, v1, Lrx/internal/a/ah$d;->bJi:J
 
-    iget v0, v1, Lrx/internal/a/ah$d;->bIZ:I
+    iget v0, v1, Lrx/internal/a/ah$d;->bJj:I
 
     if-le v8, v0, :cond_f
 
@@ -987,13 +987,13 @@
     goto :goto_9
 
     :cond_12
-    iput v2, v1, Lrx/internal/a/ah$d;->bIZ:I
+    iput v2, v1, Lrx/internal/a/ah$d;->bJj:I
 
     aget-object v0, v5, v2
 
     iget-wide v3, v0, Lrx/internal/a/ah$b;->id:J
 
-    iput-wide v3, v1, Lrx/internal/a/ah$d;->bIY:J
+    iput-wide v3, v1, Lrx/internal/a/ah$d;->bJi: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;->Js()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jv()Z
 
     move-result v4
 
@@ -1032,7 +1032,7 @@
 
     if-lez v21, :cond_16
 
-    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Js()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jv()Z
 
     move-result v21
 
@@ -1041,7 +1041,7 @@
     return-void
 
     :cond_15
-    iget-object v9, v4, Lrx/internal/a/ah$b;->bIQ:Lrx/internal/util/i;
+    iget-object v9, v4, Lrx/internal/a/ah$b;->bJa: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;->bIT:Lrx/internal/a/ah$c;
+    iget-object v9, v1, Lrx/internal/a/ah$d;->bJd: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;->bIQ:Lrx/internal/util/i;
+    iget-object v7, v4, Lrx/internal/a/ah$b;->bJa: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;->Js()Z
+    invoke-direct/range {p0 .. p0}, Lrx/internal/a/ah$d;->Jv()Z
 
     move-result v3
 
@@ -1215,13 +1215,13 @@
     move-object/from16 v13, v17
 
     :cond_20
-    iput v2, v1, Lrx/internal/a/ah$d;->bIZ:I
+    iput v2, v1, Lrx/internal/a/ah$d;->bJj:I
 
     aget-object v0, v5, v2
 
     iget-wide v4, v0, Lrx/internal/a/ah$b;->id:J
 
-    iput-wide v4, v1, Lrx/internal/a/ah$d;->bIY:J
+    iput-wide v4, v1, Lrx/internal/a/ah$d;->bJi: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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jt()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;->Jn()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jq()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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jt()V
 
     return-void
 .end method
@@ -1395,7 +1395,7 @@
 
     if-eqz p1, :cond_d
 
-    invoke-static {}, Lrx/Observable;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object v0
 
@@ -1405,15 +1405,15 @@
 
     if-ne p1, v0, :cond_1
 
-    iget p1, p0, Lrx/internal/a/ah$d;->bJc:I
+    iget p1, p0, Lrx/internal/a/ah$d;->bJm:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bJb:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bJl:I
 
     if-ne p1, v0, :cond_0
 
-    iput v2, p0, Lrx/internal/a/ah$d;->bJc:I
+    iput v2, p0, Lrx/internal/a/ah$d;->bJm:I
 
     int-to-long v0, p1
 
@@ -1422,7 +1422,7 @@
     return-void
 
     :cond_0
-    iput p1, p0, Lrx/internal/a/ah$d;->bJc:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJm:I
 
     return-void
 
@@ -1433,9 +1433,9 @@
 
     check-cast p1, Lrx/internal/util/k;
 
-    iget-object p1, p1, Lrx/internal/util/k;->bMX:Ljava/lang/Object;
+    iget-object p1, p1, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/ah$d;->bIT:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJd: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;->bIT:Lrx/internal/a/ah$c;
+    iget-object v0, p0, Lrx/internal/a/ah$d;->bJd: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;->bz(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jr()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ju()V
 
     return-void
 
@@ -1529,7 +1529,7 @@
     move-exception p1
 
     :try_start_2
-    iget-boolean v0, p0, Lrx/internal/a/ah$d;->bIM:Z
+    iget-boolean v0, p0, Lrx/internal/a/ah$d;->bIW:Z
 
     if-nez v0, :cond_6
 
@@ -1553,7 +1553,7 @@
 
     :cond_6
     :try_start_4
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jn()Ljava/util/Queue;
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jq()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;->bIT:Lrx/internal/a/ah$c;
+    iget-object p1, p0, Lrx/internal/a/ah$d;->bJd: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;->bJc:I
+    iget p1, p0, Lrx/internal/a/ah$d;->bJm:I
 
     add-int/2addr p1, v1
 
-    iget v0, p0, Lrx/internal/a/ah$d;->bJb:I
+    iget v0, p0, Lrx/internal/a/ah$d;->bJl:I
 
     if-ne p1, v0, :cond_8
 
-    iput v2, p0, Lrx/internal/a/ah$d;->bJc:I
+    iput v2, p0, Lrx/internal/a/ah$d;->bJm:I
 
     int-to-long v3, p1
 
@@ -1590,7 +1590,7 @@
     goto :goto_4
 
     :cond_8
-    iput p1, p0, Lrx/internal/a/ah$d;->bJc:I
+    iput p1, p0, Lrx/internal/a/ah$d;->bJm: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;->Jr()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Ju()V
 
     return-void
 
@@ -1665,7 +1665,7 @@
     :cond_b
     invoke-direct {p0, p1}, Lrx/internal/a/ah$d;->bz(Ljava/lang/Object;)V
 
-    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jt()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;->bIX:J
+    iget-wide v3, p0, Lrx/internal/a/ah$d;->bJh:J
 
     const-wide/16 v5, 0x1
 
     add-long/2addr v5, v3
 
-    iput-wide v5, p0, Lrx/internal/a/ah$d;->bIX:J
+    iput-wide v5, p0, Lrx/internal/a/ah$d;->bJh: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;->Jo()Lrx/subscriptions/CompositeSubscription;
+    invoke-direct {p0}, Lrx/internal/a/ah$d;->Jr()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;->bIV:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/ah$d;->bJf:Ljava/lang/Object;
 
     monitor-enter v1
 
     :try_start_9
-    iget-object v3, p0, Lrx/internal/a/ah$d;->bIW:[Lrx/internal/a/ah$b;
+    iget-object v3, p0, Lrx/internal/a/ah$d;->bJg:[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;->bIW:[Lrx/internal/a/ah$b;
+    iput-object v5, p0, Lrx/internal/a/ah$d;->bJg:[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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ah$d;->Jt()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 8c0f1f65fd..0845ed8879 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 bIM:Z
+.field final bIW:Z
 
-.field final bIN:I
+.field final bIX:I
 
 
 # direct methods
@@ -44,16 +44,16 @@
 
     const/4 p1, 0x0
 
-    iput-boolean p1, p0, Lrx/internal/a/ah;->bIM:Z
+    iput-boolean p1, p0, Lrx/internal/a/ah;->bIW:Z
 
     const p1, 0x7fffffff
 
-    iput p1, p0, Lrx/internal/a/ah;->bIN:I
+    iput p1, p0, Lrx/internal/a/ah;->bIX:I
 
     return-void
 .end method
 
-.method public static Jm()Lrx/internal/a/ah;
+.method public static Jp()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;->bIO:Lrx/internal/a/ah;
+    sget-object v0, Lrx/internal/a/ah$a;->bIY: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;->bIM:Z
+    iget-boolean v1, p0, Lrx/internal/a/ah;->bIW:Z
 
-    iget v2, p0, Lrx/internal/a/ah;->bIN:I
+    iget v2, p0, Lrx/internal/a/ah;->bIX: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;->bIT:Lrx/internal/a/ah$c;
+    iput-object v1, v0, Lrx/internal/a/ah$d;->bJd: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 7219b00413..f54ac37c75 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 bJg:Lrx/internal/a/ai$a;
+.field final synthetic bJq: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;->bJg:Lrx/internal/a/ai$a;
+    iput-object p1, p0, Lrx/internal/a/ai$a$1;->bJq: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;->bJg:Lrx/internal/a/ai$a;
+    iget-object v0, p0, Lrx/internal/a/ai$a$1;->bJq: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;->bJg:Lrx/internal/a/ai$a;
+    iget-object p1, p0, Lrx/internal/a/ai$a$1;->bJq:Lrx/internal/a/ai$a;
 
-    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Jt()V
+    invoke-virtual {p1}, Lrx/internal/a/ai$a;->Jw()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 5804371155..c6187c0bd7 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 bJd:Lrx/Scheduler$Worker;
+.field final bJn:Lrx/Scheduler$Worker;
 
-.field final bJe:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bJo:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field bJf:J
+.field bJp:J
 
-.field volatile bwt:Z
+.field volatile bwD: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;->bJe:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object v0, p0, Lrx/internal/a/ai$a;->bJo:Ljava/util/concurrent/atomic/AtomicLong;
 
     iput-object p2, p0, Lrx/internal/a/ai$a;->child:Lrx/Subscriber;
 
-    invoke-virtual {p1}, Lrx/Scheduler;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {p1}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/ai$a;->bJd:Lrx/Scheduler$Worker;
+    iput-object p1, p0, Lrx/internal/a/ai$a;->bJn:Lrx/Scheduler$Worker;
 
     iput-boolean p3, p0, Lrx/internal/a/ai$a;->delayError:Z
 
@@ -106,7 +106,7 @@
     goto :goto_0
 
     :cond_0
-    sget p4, Lrx/internal/util/i;->bMV:I
+    sget p4, Lrx/internal/util/i;->bNf:I
 
     :goto_0
     shr-int/lit8 p1, p4, 0x2
@@ -115,7 +115,7 @@
 
     iput p1, p0, Lrx/internal/a/ai$a;->limit:I
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()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;->bJd:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bJn: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;->bJd:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bJn: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;->bJd:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bJn: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;->bJd:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bJn: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;->bJd:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/ai$a;->bJn: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;->bJd:Lrx/Scheduler$Worker;
+    iget-object p2, p0, Lrx/internal/a/ai$a;->bJn:Lrx/Scheduler$Worker;
 
     invoke-virtual {p2}, Lrx/Scheduler$Worker;->unsubscribe()V
 
@@ -267,10 +267,10 @@
 
 
 # virtual methods
-.method protected final Jt()V
+.method protected final Jw()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/a/ai$a;->bJe:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->bJo: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;->bJd:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/ai$a;->bJn: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;->bJf:J
+    iget-wide v0, p0, Lrx/internal/a/ai$a;->bJp: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;->bwt:Z
+    iget-boolean v12, p0, Lrx/internal/a/ai$a;->bwD: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;->bwt:Z
+    iget-boolean v8, p0, Lrx/internal/a/ai$a;->bwD: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;->bJf:J
+    iput-wide v6, p0, Lrx/internal/a/ai$a;->bJp:J
 
-    iget-object v8, p0, Lrx/internal/a/ai$a;->bJe:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v8, p0, Lrx/internal/a/ai$a;->bJo: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;->bwt:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwD: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;->bwt:Z
+    iput-boolean v0, p0, Lrx/internal/a/ai$a;->bwD:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jw()V
 
     :cond_1
     :goto_0
@@ -448,7 +448,7 @@
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwt:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwD:Z
 
     if-eqz v0, :cond_0
 
@@ -459,9 +459,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/ai$a;->bwt:Z
+    iput-boolean p1, p0, Lrx/internal/a/ai$a;->bwD:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jw()V
 
     return-void
 
@@ -486,7 +486,7 @@
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwt:Z
+    iget-boolean v0, p0, Lrx/internal/a/ai$a;->bwD:Z
 
     if-eqz v0, :cond_0
 
@@ -514,7 +514,7 @@
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jt()V
+    invoke-virtual {p0}, Lrx/internal/a/ai$a;->Jw()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 690be360bf..b18984a0ad 100644
--- a/com.discord/smali_classes2/rx/internal/a/ai.smali
+++ b/com.discord/smali_classes2/rx/internal/a/ai.smali
@@ -50,7 +50,7 @@
     goto :goto_0
 
     :cond_0
-    sget p3, Lrx/internal/util/i;->bMV:I
+    sget p3, Lrx/internal/util/i;->bNf:I
 
     :goto_0
     iput p3, p0, Lrx/internal/a/ai;->bufferSize:I
@@ -97,7 +97,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v0, v1, Lrx/internal/a/ai$a;->bJd:Lrx/Scheduler$Worker;
+    iget-object v0, v1, Lrx/internal/a/ai$a;->bJn: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 918b256ad7..3f32d6059d 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 bJi:Lrx/functions/Action0;
+.field private final bJs:Lrx/functions/Action0;
 
-.field private final bJj:Lrx/a$d;
+.field private final bJt:Lrx/a$d;
 
-.field private final bJk:Ljava/util/concurrent/atomic/AtomicLong;
+.field private final bJu:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field private final bJl:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field private final bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bJm:Lrx/internal/util/c;
+.field final bJw:Lrx/internal/util/c;
 
-.field private final bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field private final bmF: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bmF: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;->bJl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/a/aj$a;->bJv: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;->bJk:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->bJu:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/aj$a;->bJi:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/a/aj$a;->bJs: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;->bJm:Lrx/internal/util/c;
+    iput-object p1, p0, Lrx/internal/a/aj$a;->bJw:Lrx/internal/util/c;
 
-    iput-object p4, p0, Lrx/internal/a/aj$a;->bJj:Lrx/a$d;
+    iput-object p4, p0, Lrx/internal/a/aj$a;->bJt:Lrx/a$d;
 
     return-void
 .end method
 
-.method private Jv()Z
+.method private Jy()Z
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bJk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJu: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;->bJk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJu: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;->bJj:Lrx/a$d;
+    iget-object v4, p0, Lrx/internal/a/aj$a;->bJt:Lrx/a$d;
 
-    invoke-interface {v4}, Lrx/a$d;->II()Z
+    invoke-interface {v4}, Lrx/a$d;->IL()Z
 
     move-result v4
 
@@ -173,7 +173,7 @@
     :catch_0
     move-exception v4
 
-    iget-object v5, p0, Lrx/internal/a/aj$a;->bJl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->bJv: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;->bJi:Lrx/functions/Action0;
+    iget-object v5, p0, Lrx/internal/a/aj$a;->bJs: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;->bJm:Lrx/internal/util/c;
+    iget-object v2, p0, Lrx/internal/a/aj$a;->bJw: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;->bJk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJu: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;->bJl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJv:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicBoolean;->get()Z
 
@@ -279,13 +279,13 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bJm:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJw:Lrx/internal/util/c;
 
     const/4 v1, 0x1
 
     iput-boolean v1, v0, Lrx/internal/util/c;->terminated:Z
 
-    invoke-virtual {v0}, Lrx/internal/util/c;->Jf()V
+    invoke-virtual {v0}, Lrx/internal/util/c;->Ji()V
 
     :cond_0
     return-void
@@ -294,7 +294,7 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bJl:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJv: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;->bJm:Lrx/internal/util/c;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bJw: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;->Jv()Z
+    invoke-direct {p0}, Lrx/internal/a/aj$a;->Jy()Z
 
     move-result v0
 
@@ -327,7 +327,7 @@
     return-void
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bmF:Ljava/util/concurrent/ConcurrentLinkedQueue;
 
     invoke-static {p1}, Lrx/internal/a/g;->bs(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -335,9 +335,9 @@
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->offer(Ljava/lang/Object;)Z
 
-    iget-object p1, p0, Lrx/internal/a/aj$a;->bJm:Lrx/internal/util/c;
+    iget-object p1, p0, Lrx/internal/a/aj$a;->bJw:Lrx/internal/util/c;
 
-    invoke-virtual {p1}, Lrx/internal/util/c;->Jf()V
+    invoke-virtual {p1}, Lrx/internal/util/c;->Ji()V
 
     return-void
 .end method
@@ -355,7 +355,7 @@
 .method public final peek()Ljava/lang/Object;
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/aj$a;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bmF: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/a/aj$a;->bmF: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;->bJk:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, p0, Lrx/internal/a/aj$a;->bJu: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 e5b8dce39a..d56942cb79 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 bJn:Lrx/internal/a/aj;
+.field static final bJx: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;->bJn:Lrx/internal/a/aj;
+    sput-object v0, Lrx/internal/a/aj$b;->bJx: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 053d1777bc..c87f539bd3 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 bJh:Ljava/lang/Long;
+.field private final bJr:Ljava/lang/Long;
 
-.field private final bJi:Lrx/functions/Action0;
+.field private final bJs:Lrx/functions/Action0;
 
-.field private final bJj:Lrx/a$d;
+.field private final bJt:Lrx/a$d;
 
 
 # direct methods
@@ -42,18 +42,18 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bJh:Ljava/lang/Long;
+    iput-object v0, p0, Lrx/internal/a/aj;->bJr:Ljava/lang/Long;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bJi:Lrx/functions/Action0;
+    iput-object v0, p0, Lrx/internal/a/aj;->bJs:Lrx/functions/Action0;
 
-    sget-object v0, Lrx/a;->bFJ:Lrx/a$d;
+    sget-object v0, Lrx/a;->bFT:Lrx/a$d;
 
-    iput-object v0, p0, Lrx/internal/a/aj;->bJj:Lrx/a$d;
+    iput-object v0, p0, Lrx/internal/a/aj;->bJt:Lrx/a$d;
 
     return-void
 .end method
 
-.method public static Ju()Lrx/internal/a/aj;
+.method public static Jx()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;->bJn:Lrx/internal/a/aj;
+    sget-object v0, Lrx/internal/a/aj$b;->bJx: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;->bJh:Ljava/lang/Long;
+    iget-object v1, p0, Lrx/internal/a/aj;->bJr:Ljava/lang/Long;
 
-    iget-object v2, p0, Lrx/internal/a/aj;->bJi:Lrx/functions/Action0;
+    iget-object v2, p0, Lrx/internal/a/aj;->bJs:Lrx/functions/Action0;
 
-    iget-object v3, p0, Lrx/internal/a/aj;->bJj:Lrx/a$d;
+    iget-object v3, p0, Lrx/internal/a/aj;->bJt: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;->bJm:Lrx/internal/util/c;
+    iget-object v1, v0, Lrx/internal/a/aj$a;->bJw: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 8a3eba0607..184e16eada 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 bJo:Lrx/internal/a/ak;
+.field static final bJy: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;->bJo:Lrx/internal/a/ak;
+    sput-object v0, Lrx/internal/a/ak$a;->bJy: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 a00ccef5b9..648e933f77 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 bJp:Ljava/lang/Object;
+.field static final bJz: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;->bJp:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ak$b;->bJz: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;->bJp:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
 
     invoke-direct {p1, v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>(Ljava/lang/Object;)V
 
@@ -118,7 +118,37 @@
     return-void
 .end method
 
-.method private Jq()V
+.method private JA()J
+    .locals 5
+
+    :cond_0
+    invoke-virtual {p0}, Lrx/internal/a/ak$b;->get()J
+
+    move-result-wide v0
+
+    const-wide/16 v2, 0x0
+
+    cmp-long v4, v0, v2
+
+    if-gez v4, :cond_1
+
+    return-wide v0
+
+    :cond_1
+    const-wide/16 v2, 0x1
+
+    sub-long v2, v0, v2
+
+    invoke-virtual {p0, v0, v1, v2, v3}, Lrx/internal/a/ak$b;->compareAndSet(JJ)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    return-wide v2
+.end method
+
+.method private Jt()V
     .locals 9
 
     monitor-enter p0
@@ -174,7 +204,7 @@
 
     if-lez v7, :cond_2
 
-    sget-object v2, Lrx/internal/a/ak$b;->bJp:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
 
     if-eq v4, v2, :cond_2
 
@@ -184,16 +214,16 @@
 
     iget-object v2, p0, Lrx/internal/a/ak$b;->value:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/a/ak$b;->bJp:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/a/ak$b;->bJz: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;->Jx()J
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->JA()J
 
-    sget-object v4, Lrx/internal/a/ak$b;->bJp:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
 
     :cond_2
-    sget-object v2, Lrx/internal/a/ak$b;->bJp:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/a/ak$b;->bJz:Ljava/lang/Object;
 
     if-ne v4, v2, :cond_4
 
@@ -327,36 +357,6 @@
     goto :goto_5
 .end method
 
-.method private Jx()J
-    .locals 5
-
-    :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/ak$b;->get()J
-
-    move-result-wide v0
-
-    const-wide/16 v2, 0x0
-
-    cmp-long v4, v0, v2
-
-    if-gez v4, :cond_1
-
-    return-wide v0
-
-    :cond_1
-    const-wide/16 v2, 0x1
-
-    sub-long v2, v0, v2
-
-    invoke-virtual {p0, v0, v1, v2, v3}, Lrx/internal/a/ak$b;->compareAndSet(JJ)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    return-wide v2
-.end method
-
 
 # virtual methods
 .method public final isUnsubscribed()Z
@@ -389,7 +389,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/ak$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jq()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jt()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;->Jq()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jt()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;->Jq()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jt()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;->Je()V
+    invoke-virtual {p1}, Lrx/internal/a/ak$c;->Jh()V
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jq()V
+    invoke-direct {p0}, Lrx/internal/a/ak$b;->Jt()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 fe9fe0a82c..e4ab7b3cdb 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 bJq:Lrx/internal/a/ak$b;
+.field private final bJA: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;->bJq:Lrx/internal/a/ak$b;
+    iput-object p1, p0, Lrx/internal/a/ak$c;->bJA:Lrx/internal/a/ak$b;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final Je()V
+.method final Jh()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;->bJq:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bJA: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;->bJq:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bJA: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;->bJq:Lrx/internal/a/ak$b;
+    iget-object v0, p0, Lrx/internal/a/ak$c;->bJA: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 089471059e..be714764ab 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 Jw()Lrx/internal/a/ak;
+.method public static Jz()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;->bJo:Lrx/internal/a/ak;
+    sget-object v0, Lrx/internal/a/ak$a;->bJy: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 a493a8a783..42ce4f5928 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 bJs:Lrx/functions/b;
+.field final synthetic bJC:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/al$1;->bJs:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al$1;->bJC: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;->bJs:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/al$1;->bJC: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 f679f23849..a2bad417b0 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 bJv:Lrx/internal/a/al$2;
+.field final synthetic bJF: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;->bJv:Lrx/internal/a/al$2;
+    iput-object p1, p0, Lrx/internal/a/al$2$1;->bJF: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;->bJv:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJF:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bHH: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;->bJv:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJF:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bHH: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;->bJv:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJF:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bHH: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;->bJv:Lrx/internal/a/al$2;
+    iget-object v0, p0, Lrx/internal/a/al$2$1;->bJF:Lrx/internal/a/al$2;
 
-    iget-object v0, v0, Lrx/internal/a/al$2;->bJt:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/al$2;->bJD: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 819e946a15..b6cddf1304 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bJt:Lrx/internal/b/a;
+.field final synthetic bJD:Lrx/internal/b/a;
 
-.field final synthetic bJu:Lrx/internal/a/al;
+.field final synthetic bJE: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;->bJu:Lrx/internal/a/al;
+    iput-object p1, p0, Lrx/internal/a/al$2;->bJE:Lrx/internal/a/al;
 
-    iput-object p2, p0, Lrx/internal/a/al$2;->bHx:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/al$2;->bHH:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/al$2;->bJt:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/al$2;->bJD: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bHH: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;->bJt:Lrx/internal/b/a;
+    iget-object v3, p0, Lrx/internal/a/al$2;->bJD:Lrx/internal/b/a;
 
     invoke-virtual {v3, v1, v2}, Lrx/internal/b/a;->aR(J)V
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/al$2;->bJu:Lrx/internal/a/al;
+    iget-object v1, p0, Lrx/internal/a/al$2;->bJE:Lrx/internal/a/al;
 
-    iget-object v1, v1, Lrx/internal/a/al;->bJr:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/al;->bJB: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bHH: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;->bJt:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/al$2;->bJD: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 234b8419f5..51611b5319 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 bJr:Lrx/functions/b;
+.field final bJB: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;->bJr:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/al;->bJB: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 2deabbb32b..c136cfe1c8 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 bJx:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bJH: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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$1;->bJH: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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am$1;->bJH: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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->bJH: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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am$1;->bJH: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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, v0, Lrx/internal/a/am$b;->bJL: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;->bJA:[Lrx/internal/a/am$a;
+    sget-object v3, Lrx/internal/a/am$b;->bJK:[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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->bJL: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 c1487aa2c0..55e55f921c 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 Jx()J
+.method public final JA()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;->Jy()V
+    invoke-virtual {p1}, Lrx/internal/a/am$b;->JB()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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bJL: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;->bJz:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bJJ:[Lrx/internal/a/am$a;
 
     if-eq v1, v2, :cond_5
 
-    sget-object v2, Lrx/internal/a/am$b;->bJA:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bJK:[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;->bJz:[Lrx/internal/a/am$a;
+    sget-object v2, Lrx/internal/a/am$b;->bJJ:[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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v3, v0, Lrx/internal/a/am$b;->bJL: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;->Jy()V
+    invoke-virtual {v0}, Lrx/internal/a/am$b;->JB()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 a7a99421d2..fd95de6949 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 bJD:Lrx/internal/a/am$b;
+.field final synthetic bJN: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;->bJD:Lrx/internal/a/am$b;
+    iput-object p1, p0, Lrx/internal/a/am$b$1;->bJN: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;->bJD:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->bJN:Lrx/internal/a/am$b;
 
-    iget-object v0, v0, Lrx/internal/a/am$b;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/a/am$b;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bJA:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bJK:[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;->bJD:Lrx/internal/a/am$b;
+    iget-object v0, p0, Lrx/internal/a/am$b$1;->bJN:Lrx/internal/a/am$b;
 
-    iget-object v0, v0, Lrx/internal/a/am$b;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/a/am$b;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iget-object v1, p0, Lrx/internal/a/am$b$1;->bJD:Lrx/internal/a/am$b;
+    iget-object v1, p0, Lrx/internal/a/am$b$1;->bJN: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 15d4cea039..6e4ea5cee6 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,25 @@
 
 
 # static fields
-.field static final bJA:[Lrx/internal/a/am$a;
+.field static final bJJ:[Lrx/internal/a/am$a;
 
-.field static final bJz:[Lrx/internal/a/am$a;
+.field static final bJK:[Lrx/internal/a/am$a;
 
 
 # instance fields
-.field final bJB:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJG:Ljava/util/concurrent/atomic/AtomicReference;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Lrx/internal/a/am$b<",
+            "TT;>;>;"
+        }
+    .end annotation
+.end field
+
+.field volatile bJI:Ljava/lang/Object;
+
+.field final bJL:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReference<",
@@ -46,19 +58,7 @@
     .end annotation
 .end field
 
-.field final bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
-
-.field final bJw:Ljava/util/concurrent/atomic/AtomicReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lrx/internal/a/am$b<",
-            "TT;>;>;"
-        }
-    .end annotation
-.end field
-
-.field volatile bJy:Ljava/lang/Object;
+.field final bJM: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;->bJz:[Lrx/internal/a/am$a;
+    sput-object v1, Lrx/internal/a/am$b;->bJJ:[Lrx/internal/a/am$a;
 
     new-array v0, v0, [Lrx/internal/a/am$a;
 
-    sput-object v0, Lrx/internal/a/am$b;->bJA:[Lrx/internal/a/am$a;
+    sput-object v0, Lrx/internal/a/am$b;->bJK:[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;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
 
     move-result v0
 
@@ -113,7 +113,7 @@
 
     new-instance v0, Lrx/internal/util/b/q;
 
-    sget v1, Lrx/internal/util/i;->bMV:I
+    sget v1, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, v1}, Lrx/internal/util/b/q;-><init>(I)V
 
@@ -122,7 +122,7 @@
     :cond_0
     new-instance v0, Lrx/internal/util/a/d;
 
-    sget v1, Lrx/internal/util/i;->bMV:I
+    sget v1, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, v1}, Lrx/internal/util/a/d;-><init>(I)V
 
@@ -131,19 +131,19 @@
 
     new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bJz:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bJJ:[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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/a/am$b;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p1, p0, Lrx/internal/a/am$b;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bJG: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;->bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bJM: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->bJG: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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p1, p0, Lrx/internal/a/am$b;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object p2, Lrx/internal/a/am$b;->bJA:[Lrx/internal/a/am$a;
+    sget-object p2, Lrx/internal/a/am$b;->bJK:[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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->bJG: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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object p2, p0, Lrx/internal/a/am$b;->bJL:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/a/am$b;->bJA:[Lrx/internal/a/am$a;
+    sget-object v1, Lrx/internal/a/am$b;->bJK:[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 Jy()V
+.method final JB()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;->bJy:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJI: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;->bJB:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJL: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;->bJy:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJI: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;->bJy:Ljava/lang/Object;
+    iget-object v0, v1, Lrx/internal/a/am$b;->bJI: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;->Jx()J
+    invoke-virtual {v14}, Lrx/internal/a/am$a;->JA()J
 
     goto :goto_7
 
@@ -649,17 +649,17 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/internal/a/am$b;->bJy:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->bJI:Ljava/lang/Object;
 
     if-nez v0, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/a/am$b;->bJy:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/am$b;->bJI:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->Jy()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->JB()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;->bJy:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/am$b;->bJI: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;->bJy:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/am$b;->bJI:Ljava/lang/Object;
 
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->Jy()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->JB()V
 
     :cond_0
     return-void
@@ -713,7 +713,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/am$b;->Jy()V
+    invoke-virtual {p0}, Lrx/internal/a/am$b;->JB()V
 
     return-void
 .end method
@@ -721,7 +721,7 @@
 .method public final onStart()V
     .locals 2
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     int-to-long v0, v0
 
diff --git a/com.discord/smali_classes2/rx/internal/a/am.smali b/com.discord/smali_classes2/rx/internal/a/am.smali
index 47e8b11e21..ab0a2d8e21 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 bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field final bJw:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJG: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;->bGU:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/am;->bHe:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/am;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/am;->bJG: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/am;->bJG: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->bJG: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/am;->bJG: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;->bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bJM: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;->bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/am$b;->bJM: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/am;->bHe: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 be7f80ffb1..1e4f77da14 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 bJG:I
+.field final synthetic bJQ:I
 
 
 # direct methods
 .method constructor <init>(I)V
     .locals 0
 
-    iput p1, p0, Lrx/internal/a/an$2;->bJG:I
+    iput p1, p0, Lrx/internal/a/an$2;->bJQ: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;->bJG:I
+    iget v1, p0, Lrx/internal/a/an$2;->bJQ: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 acd8be59f2..cddd323fbf 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 bJH:Lrx/functions/Func0;
+.field final synthetic bJH:Ljava/util/concurrent/atomic/AtomicReference;
 
-.field final synthetic bJx:Ljava/util/concurrent/atomic/AtomicReference;
+.field final synthetic bJR:Lrx/functions/Func0;
 
 
 # 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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/a/an$3;->bJH:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p2, p0, Lrx/internal/a/an$3;->bJH:Lrx/functions/Func0;
+    iput-object p2, p0, Lrx/internal/a/an$3;->bJR: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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an$3;->bJH: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;->bJH:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an$3;->bJR: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;->bJx:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an$3;->bJH: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;->bJI:Lrx/internal/a/an$d;
+    iget-object v0, v0, Lrx/internal/a/an$e;->bJS: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 07b387d158..aee982cc1b 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 Jz()V
+.method JC()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;->Jz()V
+    invoke-virtual {p0}, Lrx/internal/a/an$a;->JC()V
 
     return-void
 .end method
@@ -378,7 +378,7 @@
 .method public final complete()V
     .locals 6
 
-    invoke-static {}, Lrx/internal/a/g;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()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 0f2411aab6..15eef427c7 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;->bJI:Lrx/internal/a/an$d;
+    iget-object p1, p1, Lrx/internal/a/an$e;->bJS: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;->bJL:Lrx/internal/util/g;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bJV: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;->bJL:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
-    iget-object v3, v2, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iget-object v3, v2, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
     iget v4, v2, Lrx/internal/util/g;->mask:I
 
@@ -386,7 +386,7 @@
 
     :cond_2
     :goto_0
-    iget-object v2, v0, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v2, v0, Lrx/internal/a/an$e;->bJV: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;->bJJ:[Lrx/internal/a/an$b;
+    sget-object v2, Lrx/internal/a/an$e;->bJT:[Lrx/internal/a/an$b;
 
-    iput-object v2, v0, Lrx/internal/a/an$e;->bJM:[Lrx/internal/a/an$b;
+    iput-object v2, v0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
 
     :cond_4
-    iget-wide v2, v0, Lrx/internal/a/an$e;->bJN:J
+    iget-wide v2, v0, Lrx/internal/a/an$e;->bJX:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v0, Lrx/internal/a/an$e;->bJN:J
+    iput-wide v2, v0, Lrx/internal/a/an$e;->bJX: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 b6fc00e09f..1dfc5b49cf 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 bJT:Lrx/internal/a/an$e;
+.field final synthetic bKd: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;->bJT:Lrx/internal/a/an$e;
+    iput-object p1, p0, Lrx/internal/a/an$e$1;->bKd: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;->bJT:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->bKd: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;->bJT:Lrx/internal/a/an$e;
+    iget-object v0, p0, Lrx/internal/a/an$e$1;->bKd:Lrx/internal/a/an$e;
 
-    iget-object v0, v0, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v0, v0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJT:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd: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;->bJT:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd:Lrx/internal/a/an$e;
 
-    iget-object v1, v1, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v1, v1, Lrx/internal/a/an$e;->bJV: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;->bMS:[Ljava/lang/Object;
+    iput-object v2, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJT:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd:Lrx/internal/a/an$e;
 
-    iget-wide v2, v1, Lrx/internal/a/an$e;->bJN:J
+    iget-wide v2, v1, Lrx/internal/a/an$e;->bJX:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/a/an$e;->bJN:J
+    iput-wide v2, v1, Lrx/internal/a/an$e;->bJX:J
 
-    iget-object v1, p0, Lrx/internal/a/an$e$1;->bJT:Lrx/internal/a/an$e;
+    iget-object v1, p0, Lrx/internal/a/an$e$1;->bKd: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 7398866f28..845459ef56 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,15 @@
 
 
 # static fields
-.field static final bJJ:[Lrx/internal/a/an$b;
+.field static final bJT:[Lrx/internal/a/an$b;
 
-.field static final bJK:[Lrx/internal/a/an$b;
+.field static final bJU:[Lrx/internal/a/an$b;
 
 
 # instance fields
-.field final bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final bJI:Lrx/internal/a/an$d;
+.field final bJS:Lrx/internal/a/an$d;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/an$d<",
@@ -46,7 +46,7 @@
     .end annotation
 .end field
 
-.field final bJL:Lrx/internal/util/g;
+.field final bJV:Lrx/internal/util/g;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/util/g<",
@@ -56,7 +56,7 @@
     .end annotation
 .end field
 
-.field bJM:[Lrx/internal/a/an$b;
+.field bJW:[Lrx/internal/a/an$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -66,15 +66,15 @@
     .end annotation
 .end field
 
-.field volatile bJN:J
+.field volatile bJX:J
 
-.field bJO:J
+.field bJY:J
 
-.field bJP:J
+.field bJZ:J
 
-.field bJQ:J
+.field bKa:J
 
-.field bJR:Ljava/util/List;
+.field bKb:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -84,7 +84,7 @@
     .end annotation
 .end field
 
-.field bJS:Z
+.field bKc:Z
 
 .field done:Z
 
@@ -105,11 +105,11 @@
 
     new-array v1, v0, [Lrx/internal/a/an$b;
 
-    sput-object v1, Lrx/internal/a/an$e;->bJJ:[Lrx/internal/a/an$b;
+    sput-object v1, Lrx/internal/a/an$e;->bJT:[Lrx/internal/a/an$b;
 
     new-array v0, v0, [Lrx/internal/a/an$b;
 
-    sput-object v0, Lrx/internal/a/an$e;->bJK:[Lrx/internal/a/an$b;
+    sput-object v0, Lrx/internal/a/an$e;->bJU:[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;->bJI:Lrx/internal/a/an$d;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJS: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;->bJL:Lrx/internal/util/g;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
-    sget-object p1, Lrx/internal/a/an$e;->bJJ:[Lrx/internal/a/an$b;
+    sget-object p1, Lrx/internal/a/an$e;->bJT:[Lrx/internal/a/an$b;
 
-    iput-object p1, p0, Lrx/internal/a/an$e;->bJM:[Lrx/internal/a/an$b;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJW:[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;->bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p1, p0, Lrx/internal/a/an$e;->bJM:Ljava/util/concurrent/atomic/AtomicBoolean;
 
     const-wide/16 v0, 0x0
 
@@ -151,7 +151,7 @@
     return-void
 .end method
 
-.method private JA()[Lrx/internal/a/an$b;
+.method private JD()[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;->bJL:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
-    iget-object v1, v1, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -192,14 +192,14 @@
     throw v1
 .end method
 
-.method private JB()V
+.method private JE()V
     .locals 7
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bJM:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
 
-    iget-wide v1, p0, Lrx/internal/a/an$e;->bJO:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->bJY:J
 
-    iget-wide v3, p0, Lrx/internal/a/an$e;->bJN:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->bJX:J
 
     const/4 v5, 0x0
 
@@ -207,16 +207,16 @@
 
     if-eqz v6, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
     monitor-enter v1
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/an$e;->bJM:[Lrx/internal/a/an$b;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJW:[Lrx/internal/a/an$b;
 
-    iget-object v2, p0, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v2, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
-    iget-object v2, v2, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/g;->bNc:[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;->bJM:[Lrx/internal/a/an$b;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bJW:[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;->bJN:J
+    iget-wide v2, p0, Lrx/internal/a/an$e;->bJX:J
 
-    iput-wide v2, p0, Lrx/internal/a/an$e;->bJO:J
+    iput-wide v2, p0, Lrx/internal/a/an$e;->bJY:J
 
     monitor-exit v1
 
@@ -250,7 +250,7 @@
 
     :cond_1
     :goto_0
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJI:Lrx/internal/a/an$d;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJS:Lrx/internal/a/an$d;
 
     array-length v2, v0
 
@@ -275,7 +275,7 @@
 .method private g(JJ)V
     .locals 6
 
-    iget-wide v0, p0, Lrx/internal/a/an$e;->bJQ:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->bKa: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;->bJP:J
+    iput-wide p1, p0, Lrx/internal/a/an$e;->bJZ:J
 
     if-eqz v2, :cond_1
 
@@ -295,7 +295,7 @@
 
     if-eqz p1, :cond_0
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->bJQ:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->bKa: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;->bJQ:J
+    iput-wide v0, p0, Lrx/internal/a/an$e;->bKa:J
 
     return-void
 
@@ -329,7 +329,7 @@
 
     if-eqz v2, :cond_4
 
-    iput-wide v3, p0, Lrx/internal/a/an$e;->bJQ:J
+    iput-wide v3, p0, Lrx/internal/a/an$e;->bKa: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;->bJL:Lrx/internal/util/g;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
     monitor-enter v0
 
@@ -372,9 +372,9 @@
     return v1
 
     :cond_1
-    iget-object v1, p0, Lrx/internal/a/an$e;->bJL:Lrx/internal/util/g;
+    iget-object v1, p0, Lrx/internal/a/an$e;->bJV:Lrx/internal/util/g;
 
-    iget-object v2, v1, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iget-object v2, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
     iget v3, v1, Lrx/internal/util/g;->mask:I
 
@@ -430,7 +430,7 @@
 
     if-lt p1, v2, :cond_8
 
-    iget-object p1, v1, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iget-object p1, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
     array-length v2, p1
 
@@ -503,17 +503,17 @@
 
     iput p1, v1, Lrx/internal/util/g;->maxSize:I
 
-    iput-object v5, v1, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iput-object v5, v1, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
     :cond_8
     :goto_1
-    iget-wide v1, p0, Lrx/internal/a/an$e;->bJN:J
+    iget-wide v1, p0, Lrx/internal/a/an$e;->bJX:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v1, v3
 
-    iput-wide v1, p0, Lrx/internal/a/an$e;->bJN:J
+    iput-wide v1, p0, Lrx/internal/a/an$e;->bJX:J
 
     monitor-exit v0
 
@@ -565,7 +565,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/an$e;->bJR:Ljava/util/List;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bKb: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;->bJR:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bKb: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;->bJS:Z
+    iput-boolean v1, p0, Lrx/internal/a/an$e;->bKc: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;->bJP:J
+    iget-wide v0, p0, Lrx/internal/a/an$e;->bJZ:J
 
     const/4 v2, 0x0
 
@@ -616,7 +616,7 @@
     goto :goto_2
 
     :cond_4
-    invoke-direct {p0}, Lrx/internal/a/an$e;->JA()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JD()[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;->bJR:Ljava/util/List;
+    iget-object p1, p0, Lrx/internal/a/an$e;->bKb:Ljava/util/List;
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/an$e;->bJR:Ljava/util/List;
+    iput-object v0, p0, Lrx/internal/a/an$e;->bKb:Ljava/util/List;
 
-    iget-boolean v0, p0, Lrx/internal/a/an$e;->bJS:Z
+    iget-boolean v0, p0, Lrx/internal/a/an$e;->bKc:Z
 
-    iput-boolean v2, p0, Lrx/internal/a/an$e;->bJS:Z
+    iput-boolean v2, p0, Lrx/internal/a/an$e;->bKc: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;->bJP:J
+    iget-wide v3, p0, Lrx/internal/a/an$e;->bJZ: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;->JA()[Lrx/internal/a/an$b;
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JD()[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;->bJI:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJS:Lrx/internal/a/an$d;
 
     invoke-interface {v0}, Lrx/internal/a/an$d;->complete()V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->JB()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JE()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;->bJI:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJS: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;->JB()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JE()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;->bJI:Lrx/internal/a/an$d;
+    iget-object v0, p0, Lrx/internal/a/an$e;->bJS:Lrx/internal/a/an$d;
 
     invoke-interface {v0, p1}, Lrx/internal/a/an$d;->bB(Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lrx/internal/a/an$e;->JB()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JE()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;->JB()V
+    invoke-direct {p0}, Lrx/internal/a/an$e;->JE()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 e3299c924d..ac63971ff9 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 Jz()V
+.method final JC()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 a37302b6d6..321645a7fd 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;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()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 fad1583692..c76e236f11 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 bJF:Lrx/functions/Func0;
+.field static final bJP:Lrx/functions/Func0;
 
 
 # instance fields
-.field final bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -45,22 +45,22 @@
     .end annotation
 .end field
 
-.field final bJE:Lrx/functions/Func0;
+.field final bJG:Ljava/util/concurrent/atomic/AtomicReference;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Lrx/functions/Func0<",
-            "+",
-            "Lrx/internal/a/an$d<",
+            "Ljava/util/concurrent/atomic/AtomicReference<",
+            "Lrx/internal/a/an$e<",
             "TT;>;>;"
         }
     .end annotation
 .end field
 
-.field final bJw:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bJO:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
-            "Ljava/util/concurrent/atomic/AtomicReference<",
-            "Lrx/internal/a/an$e<",
+            "Lrx/functions/Func0<",
+            "+",
+            "Lrx/internal/a/an$d<",
             "TT;>;>;"
         }
     .end annotation
@@ -75,7 +75,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/an$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/an;->bJF:Lrx/functions/Func0;
+    sput-object v0, Lrx/internal/a/an;->bJP: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;->bGU:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/an;->bHe:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/an;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p3, p0, Lrx/internal/a/an;->bJG:Ljava/util/concurrent/atomic/AtomicReference;
 
-    iput-object p4, p0, Lrx/internal/a/an;->bJE:Lrx/functions/Func0;
+    iput-object p4, p0, Lrx/internal/a/an;->bJO:Lrx/functions/Func0;
 
     return-void
 .end method
@@ -160,7 +160,7 @@
     .end annotation
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/an;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bJG: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;->bJE:Lrx/functions/Func0;
+    iget-object v2, p0, Lrx/internal/a/an;->bJO: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/a/an;->bJG: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;->bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bJM: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;->bJC:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, v0, Lrx/internal/a/an$e;->bJM: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/an;->bHe: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bJG: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;->bJw:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/a/an;->bJG: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 75c6a2fffe..378477a0ad 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 bJU:Ljava/lang/Object;
+.field private static final bKe: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;->bJU:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ao$a;->bKe: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;->bJU:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bKe: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 JC()V
+.method private JF()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;->bJU:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bKe: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;->bJU:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ao$a;->bKe: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;->JC()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->JF()V
 
     return-void
 .end method
@@ -137,7 +137,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    invoke-direct {p0}, Lrx/internal/a/ao$a;->JC()V
+    invoke-direct {p0}, Lrx/internal/a/ao$a;->JF()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 50bc033848..6c9439464d 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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v1}, Lrx/Scheduler;->IY()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 39ed855c03..ec8c192ce4 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 bGC:Ljava/lang/Object;
+.field final synthetic bGM:Ljava/lang/Object;
 
 
 # direct methods
 .method constructor <init>(Ljava/lang/Object;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ap$1;->bGC:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/ap$1;->bGM: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;->bGC:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/ap$1;->bGM: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 821d2cbcb8..2891b12201 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 bHb:Z
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bHx:Lrx/Subscriber;
+.field bHl:Z
 
-.field final synthetic bJY:Lrx/internal/a/ap;
+.field final synthetic bKi: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;->bJY:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$2;->bKi:Lrx/internal/a/ap;
 
-    iput-object p3, p0, Lrx/internal/a/ap$2;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ap$2;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bHH: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;->bHb:Z
+    iget-boolean v0, p0, Lrx/internal/a/ap$2;->bHl:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ap$2;->bHb:Z
+    iput-boolean v0, p0, Lrx/internal/a/ap$2;->bHl: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;->bJY:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->bKi:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->bJW:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->bKg: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ap$2;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/ap$2;->bHH: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 34ee9b7c67..fc4280ae61 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 bGC:Ljava/lang/Object;
+.field final synthetic bGM:Ljava/lang/Object;
 
-.field final synthetic bJY:Lrx/internal/a/ap;
+.field final synthetic bKi:Lrx/internal/a/ap;
 
-.field final synthetic bJZ:Lrx/internal/a/ap$a;
+.field final synthetic bKj: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;->bJY:Lrx/internal/a/ap;
+    iput-object p1, p0, Lrx/internal/a/ap$3;->bKi:Lrx/internal/a/ap;
 
-    iput-object p2, p0, Lrx/internal/a/ap$3;->bGC:Ljava/lang/Object;
+    iput-object p2, p0, Lrx/internal/a/ap$3;->bGM:Ljava/lang/Object;
 
-    iput-object p3, p0, Lrx/internal/a/ap$3;->bJZ:Lrx/internal/a/ap$a;
+    iput-object p3, p0, Lrx/internal/a/ap$3;->bKj:Lrx/internal/a/ap$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iget-object p1, p0, Lrx/internal/a/ap$3;->bGC:Ljava/lang/Object;
+    iget-object p1, p0, Lrx/internal/a/ap$3;->bGM: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;->bJZ:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKj: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;->bJZ:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKj: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;->bJY:Lrx/internal/a/ap;
+    iget-object v1, p0, Lrx/internal/a/ap$3;->bKi:Lrx/internal/a/ap;
 
-    iget-object v1, v1, Lrx/internal/a/ap;->bJW:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ap;->bKg: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;->bJZ:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKj: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;->bJZ:Lrx/internal/a/ap$a;
+    iget-object v0, p0, Lrx/internal/a/ap$3;->bKj: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;->bKa:J
+    iget-wide v2, v0, Lrx/internal/a/ap$a;->bKk: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;->bKa:J
+    iput-wide v4, v0, Lrx/internal/a/ap$a;->bKk: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;->Jq()V
+    invoke-virtual {v0}, Lrx/internal/a/ap$a;->Jt()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 e46defb4bf..2efca17d2d 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 bKa:J
+.field bKk: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;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
 
     move-result p2
 
@@ -115,7 +115,7 @@
     return-void
 .end method
 
-.method private Jr()V
+.method private Ju()V
     .locals 13
 
     iget-object v0, p0, Lrx/internal/a/ap$a;->child:Lrx/Subscriber;
@@ -302,7 +302,7 @@
 
 
 # virtual methods
-.method final Jq()V
+.method final Jt()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;->Jr()V
+    invoke-direct {p0}, Lrx/internal/a/ap$a;->Ju()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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jt()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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jt()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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jt()V
 
     return-void
 .end method
@@ -419,13 +419,13 @@
 
     if-nez v0, :cond_0
 
-    iget-wide v2, p0, Lrx/internal/a/ap$a;->bKa:J
+    iget-wide v2, p0, Lrx/internal/a/ap$a;->bKk:J
 
     invoke-static {v2, v3, p1, p2}, Lrx/internal/a/a;->f(JJ)J
 
     move-result-wide v2
 
-    iput-wide v2, p0, Lrx/internal/a/ap$a;->bKa:J
+    iput-wide v2, p0, Lrx/internal/a/ap$a;->bKk: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;->Jq()V
+    invoke-virtual {p0}, Lrx/internal/a/ap$a;->Jt()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 7ca25edc4c..50e32ee908 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 bJX:Ljava/lang/Object;
+.field private static final bKh:Ljava/lang/Object;
 
 
 # instance fields
-.field private final bJV:Lrx/functions/Func0;
+.field private final bKf:Lrx/functions/Func0;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Func0<",
@@ -41,7 +41,7 @@
     .end annotation
 .end field
 
-.field final bJW:Lrx/functions/Func2;
+.field final bKg: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;->bJX:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/ap;->bKh: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;->bJV:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/ap;->bKf:Lrx/functions/Func0;
 
-    iput-object p2, p0, Lrx/internal/a/ap;->bJW:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/ap;->bKg:Lrx/functions/Func2;
 
     return-void
 .end method
@@ -111,13 +111,13 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/ap;->bJV:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/ap;->bKf:Lrx/functions/Func0;
 
     invoke-interface {v0}, Lrx/functions/Func0;->call()Ljava/lang/Object;
 
     move-result-object v0
 
-    sget-object v1, Lrx/internal/a/ap;->bJX:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/ap;->bKh: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 4e6938ceb0..43982eebd0 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 bKc:Lrx/internal/a/aq;
+.field static final bKm: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;->bKc:Lrx/internal/a/aq;
+    sput-object v0, Lrx/internal/a/aq$a;->bKm: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 f403a24e38..ca3241c011 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 bKb:Z
+.field private final bKl:Z
 
-.field private bKd:Z
+.field private bKn:Z
 
-.field private bKe:Z
+.field private bKo: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;->bKb:Z
+    iput-boolean p2, p0, Lrx/internal/a/aq$b;->bKl: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;->bKe:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKo:Z
 
     if-nez v0, :cond_2
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKd:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKn:Z
 
     if-eqz v0, :cond_0
 
@@ -109,7 +109,7 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKb:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKl: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;->bKe:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKo:Z
 
     if-eqz v0, :cond_0
 
@@ -167,17 +167,17 @@
         }
     .end annotation
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKe:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKo:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKd:Z
+    iget-boolean v0, p0, Lrx/internal/a/aq$b;->bKn:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bKe:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bKo: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;->bKd:Z
+    iput-boolean v1, p0, Lrx/internal/a/aq$b;->bKn: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 a444486e49..9d43848ff8 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 bKb:Z
+.field private final bKl: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;->bKb:Z
+    iput-boolean p1, p0, Lrx/internal/a/aq;->bKl:Z
 
     const/4 p1, 0x0
 
@@ -70,7 +70,7 @@
     return-void
 .end method
 
-.method public static JD()Lrx/internal/a/aq;
+.method public static JG()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;->bKc:Lrx/internal/a/aq;
+    sget-object v0, Lrx/internal/a/aq$a;->bKm: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;->bKb:Z
+    iget-boolean v1, p0, Lrx/internal/a/aq;->bKl: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 51a8075fec..bd0d84fa04 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field bKg:I
+.field bKq:I
 
-.field final synthetic bKh:Lrx/internal/a/ar;
+.field final synthetic bKr: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;->bKh:Lrx/internal/a/ar;
+    iput-object p1, p0, Lrx/internal/a/ar$1;->bKr:Lrx/internal/a/ar;
 
-    iput-object p3, p0, Lrx/internal/a/ar$1;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ar$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHH: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;->bKg:I
+    iget v0, p0, Lrx/internal/a/ar$1;->bKq:I
 
-    iget-object v1, p0, Lrx/internal/a/ar$1;->bKh:Lrx/internal/a/ar;
+    iget-object v1, p0, Lrx/internal/a/ar$1;->bKr:Lrx/internal/a/ar;
 
-    iget v1, v1, Lrx/internal/a/ar;->bKf:I
+    iget v1, v1, Lrx/internal/a/ar;->bKp:I
 
     if-lt v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHH: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;->bKg:I
+    iget p1, p0, Lrx/internal/a/ar$1;->bKq:I
 
     add-int/lit8 p1, p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar$1;->bKg:I
+    iput p1, p0, Lrx/internal/a/ar$1;->bKq: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bHH:Lrx/Subscriber;
 
     invoke-virtual {v0, p1}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object v0, p0, Lrx/internal/a/ar$1;->bKh:Lrx/internal/a/ar;
+    iget-object v0, p0, Lrx/internal/a/ar$1;->bKr:Lrx/internal/a/ar;
 
-    iget v0, v0, Lrx/internal/a/ar;->bKf:I
+    iget v0, v0, Lrx/internal/a/ar;->bKp: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 e1f36e991f..ee51884e72 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 bKf:I
+.field final bKp:I
 
 
 # direct methods
@@ -31,7 +31,7 @@
 
     const/4 p1, 0x1
 
-    iput p1, p0, Lrx/internal/a/ar;->bKf:I
+    iput p1, p0, Lrx/internal/a/ar;->bKp: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 9e21703812..4b44ed46d2 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field bKj:Z
+.field bKt:Z
 
-.field final synthetic bKk:Lrx/internal/a/as;
+.field final synthetic bKu: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;->bKk:Lrx/internal/a/as;
+    iput-object p1, p0, Lrx/internal/a/as$1;->bKu:Lrx/internal/a/as;
 
-    iput-object p3, p0, Lrx/internal/a/as$1;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/as$1;->bHH: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;->bKj:Z
+    iput-boolean p1, p0, Lrx/internal/a/as$1;->bKt: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHH: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;->bKj:Z
+    iget-boolean v0, p0, Lrx/internal/a/as$1;->bKt:Z
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHH: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;->bKk:Lrx/internal/a/as;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bKu:Lrx/internal/a/as;
 
-    iget-object v0, v0, Lrx/internal/a/as;->bKi:Lrx/functions/Func2;
+    iget-object v0, v0, Lrx/internal/a/as;->bKs: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;->bKj:Z
+    iput-boolean v0, p0, Lrx/internal/a/as$1;->bKt:Z
 
-    iget-object v0, p0, Lrx/internal/a/as$1;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/as$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/as$1;->bHH: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 4f2f0eec1f..2a50154d48 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 bKl:Lrx/functions/b;
+.field final synthetic bKv:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/as$2;->bKl:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/as$2;->bKv: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;->bKl:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/as$2;->bKv: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 f75a76ef6b..722fd0dc28 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 bKi:Lrx/functions/Func2;
+.field final bKs: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;->bKi:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/as;->bKs: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 721091952e..52099768d4 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 bKq:J
+.field final synthetic bKA:J
 
-.field final synthetic bKr:Lrx/internal/a/at$a$1;
+.field final synthetic bKB: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;->bKr:Lrx/internal/a/at$a$1;
+    iput-object p1, p0, Lrx/internal/a/at$a$1$1;->bKB:Lrx/internal/a/at$a$1;
 
-    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->bKq:J
+    iput-wide p2, p0, Lrx/internal/a/at$a$1$1;->bKA: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;->bKr:Lrx/internal/a/at$a$1;
+    iget-object v0, p0, Lrx/internal/a/at$a$1$1;->bKB:Lrx/internal/a/at$a$1;
 
-    iget-object v0, v0, Lrx/internal/a/at$a$1;->bKo:Lrx/Producer;
+    iget-object v0, v0, Lrx/internal/a/at$a$1;->bKy:Lrx/Producer;
 
-    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->bKq:J
+    iget-wide v1, p0, Lrx/internal/a/at$a$1$1;->bKA: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 c3f5d30770..1e58663654 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 bKo:Lrx/Producer;
+.field final synthetic bKy:Lrx/Producer;
 
-.field final synthetic bKp:Lrx/internal/a/at$a;
+.field final synthetic bKz: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;->bKp:Lrx/internal/a/at$a;
+    iput-object p1, p0, Lrx/internal/a/at$a$1;->bKz:Lrx/internal/a/at$a;
 
-    iput-object p2, p0, Lrx/internal/a/at$a$1;->bKo:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/at$a$1;->bKy: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;->bKp:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKz:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->bKn:Ljava/lang/Thread;
+    iget-object v0, v0, Lrx/internal/a/at$a;->bKx: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;->bKp:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKz:Lrx/internal/a/at$a;
 
-    iget-boolean v0, v0, Lrx/internal/a/at$a;->bKm:Z
+    iget-boolean v0, v0, Lrx/internal/a/at$a;->bKw:Z
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKp:Lrx/internal/a/at$a;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKz:Lrx/internal/a/at$a;
 
-    iget-object v0, v0, Lrx/internal/a/at$a;->bHZ:Lrx/Scheduler$Worker;
+    iget-object v0, v0, Lrx/internal/a/at$a;->bIj: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;->bKo:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/a/at$a$1;->bKy: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 6d1e7dcd53..e34ca16697 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 bGU:Lrx/Observable;
+.field bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -47,11 +47,11 @@
     .end annotation
 .end field
 
-.field final bHZ:Lrx/Scheduler$Worker;
+.field final bIj:Lrx/Scheduler$Worker;
 
-.field final bKm:Z
+.field final bKw:Z
 
-.field bKn:Ljava/lang/Thread;
+.field bKx: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;->bKm:Z
+    iput-boolean p2, p0, Lrx/internal/a/at$a;->bKw:Z
 
-    iput-object p3, p0, Lrx/internal/a/at$a;->bHZ:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/a/at$a;->bIj:Lrx/Scheduler$Worker;
 
-    iput-object p4, p0, Lrx/internal/a/at$a;->bGU:Lrx/Observable;
+    iput-object p4, p0, Lrx/internal/a/at$a;->bHe: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;->bGU:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bHe:Lrx/Observable;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->bGU:Lrx/Observable;
+    iput-object v1, p0, Lrx/internal/a/at$a;->bHe:Lrx/Observable;
 
     invoke-static {}, Ljava/lang/Thread;->currentThread()Ljava/lang/Thread;
 
     move-result-object v1
 
-    iput-object v1, p0, Lrx/internal/a/at$a;->bKn:Ljava/lang/Thread;
+    iput-object v1, p0, Lrx/internal/a/at$a;->bKx: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;->bHZ:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bIj: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;->bHZ:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/at$a;->bIj: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;->bHZ:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/at$a;->bIj: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;->bHZ:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/at$a;->bIj: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 1410de66be..3006559053 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 bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bKm:Z
+.field final bKw: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;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/at;->bHe:Lrx/Observable;
 
-    iput-boolean p3, p0, Lrx/internal/a/at;->bKm:Z
+    iput-boolean p3, p0, Lrx/internal/a/at;->bKw: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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
 
     move-result-object v0
 
     new-instance v1, Lrx/internal/a/at$a;
 
-    iget-boolean v2, p0, Lrx/internal/a/at;->bKm:Z
+    iget-boolean v2, p0, Lrx/internal/a/at;->bKw:Z
 
-    iget-object v3, p0, Lrx/internal/a/at;->bGU:Lrx/Observable;
+    iget-object v3, p0, Lrx/internal/a/at;->bHe: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 6d07e2162b..35954e366d 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 bKs:Lrx/internal/a/au;
+.field static final bKC: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;->bKs:Lrx/internal/a/au;
+    sput-object v0, Lrx/internal/a/au$a;->bKC: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 05ff11608c..2155db3814 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 bKt:Lrx/internal/a/au$c;
+.field private final bKD: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;->bKt:Lrx/internal/a/au$c;
+    iput-object p3, p0, Lrx/internal/a/au$b;->bKD: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;->bKt:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKD: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bIk: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;->bKv:Z
+    iput-boolean v1, v0, Lrx/internal/a/au$c;->bKF:Z
 
     const/4 v1, 0x0
 
@@ -96,7 +96,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {v0}, Lrx/internal/a/au$c;->Jf()V
+    invoke-virtual {v0}, Lrx/internal/a/au$c;->Ji()V
 
     return-void
 
@@ -114,14 +114,14 @@
 .method public final onError(Ljava/lang/Throwable;)V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bKt:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKD: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bIk: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;->bKv:Z
+    iput-boolean v2, v0, Lrx/internal/a/au$c;->bKF:Z
 
     const/4 v2, 0x0
 
@@ -155,7 +155,7 @@
 
     if-eqz v1, :cond_1
 
-    invoke-virtual {v0}, Lrx/internal/a/au$c;->Jf()V
+    invoke-virtual {v0}, Lrx/internal/a/au$c;->Ji()V
 
     return-void
 
@@ -183,12 +183,12 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bKt:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKD:Lrx/internal/a/au$c;
 
     monitor-enter v0
 
     :try_start_0
-    iget-object v1, v0, Lrx/internal/a/au$c;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v1, v0, Lrx/internal/a/au$c;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
 
     invoke-virtual {v1}, Ljava/util/concurrent/atomic/AtomicLong;->get()J
 
@@ -217,7 +217,7 @@
     :try_end_0
     .catchall {:try_start_0 .. :try_end_0} :catchall_0
 
-    invoke-virtual {v0}, Lrx/internal/a/au$c;->Jf()V
+    invoke-virtual {v0}, Lrx/internal/a/au$c;->Ji()V
 
     return-void
 
@@ -235,14 +235,14 @@
 .method public final setProducer(Lrx/Producer;)V
     .locals 6
 
-    iget-object v0, p0, Lrx/internal/a/au$b;->bKt:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$b;->bKD: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/au$c;->bIk: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 0f9689d3f1..adf604bf14 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 bKx:Lrx/internal/a/au$c;
+.field final synthetic bKH: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;->bKx:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$1;->bKH: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;->bKx:Lrx/internal/a/au$c;
+    iget-object v0, p0, Lrx/internal/a/au$c$1;->bKH: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 85ec1cf45b..cfab2d8f74 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 bKx:Lrx/internal/a/au$c;
+.field final synthetic bKH: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;->bKx:Lrx/internal/a/au$c;
+    iput-object p1, p0, Lrx/internal/a/au$c$2;->bKH: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;->bKx:Lrx/internal/a/au$c;
+    iget-object v2, p0, Lrx/internal/a/au$c$2;->bKH:Lrx/internal/a/au$c;
 
     monitor-enter v2
 
@@ -67,7 +67,7 @@
     invoke-interface {v0, p1, p2}, Lrx/Producer;->request(J)V
 
     :cond_0
-    invoke-virtual {v2}, Lrx/internal/a/au$c;->Jf()V
+    invoke-virtual {v2}, Lrx/internal/a/au$c;->Ji()V
 
     return-void
 
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 6416a78ce1..3f8cfbd696 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 bKw:Ljava/lang/Throwable;
+.field static final bKG:Ljava/lang/Throwable;
 
 
 # instance fields
-.field final bIa:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bIk:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field volatile bKu:Z
+.field volatile bKE:Z
 
-.field bKv:Z
+.field bKF: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;->bKw:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/a/au$c;->bKG:Ljava/lang/Throwable;
 
     return-void
 .end method
@@ -111,11 +111,11 @@
 
     invoke-direct {p1}, Ljava/util/concurrent/atomic/AtomicLong;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/au$c;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/au$c;->bIk:Ljava/util/concurrent/atomic/AtomicLong;
 
     new-instance p1, Lrx/internal/util/a/f;
 
-    sget p2, Lrx/internal/util/i;->bMV:I
+    sget p2, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {p1, p2}, Lrx/internal/util/a/f;-><init>(I)V
 
@@ -198,7 +198,7 @@
 
 
 # virtual methods
-.method final Jf()V
+.method final Ji()V
     .locals 19
 
     move-object/from16 v8, p0
@@ -221,7 +221,7 @@
     :cond_0
     iput-boolean v1, v8, Lrx/internal/a/au$c;->emitting:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKv:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKF:Z
 
     iget-wide v1, v8, Lrx/internal/a/au$c;->requested:J
 
@@ -229,7 +229,7 @@
 
     if-eqz v3, :cond_1
 
-    sget-object v4, Lrx/internal/a/au$c;->bKw:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->bKG:Ljava/lang/Throwable;
 
     if-eq v3, v4, :cond_1
 
@@ -237,7 +237,7 @@
 
     if-nez v4, :cond_1
 
-    sget-object v4, Lrx/internal/a/au$c;->bKw:Ljava/lang/Throwable;
+    sget-object v4, Lrx/internal/a/au$c;->bKG:Ljava/lang/Throwable;
 
     iput-object v4, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
@@ -248,11 +248,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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v10, v8, Lrx/internal/a/au$c;->bIk: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;->bKu:Z
+    iget-boolean v4, v8, Lrx/internal/a/au$c;->bKE:Z
 
     move-wide v12, v1
 
@@ -355,7 +355,7 @@
     return-void
 
     :cond_6
-    iget-boolean v2, v8, Lrx/internal/a/au$c;->bKu:Z
+    iget-boolean v2, v8, Lrx/internal/a/au$c;->bKE:Z
 
     invoke-virtual {v9}, Lrx/internal/util/a/f;->isEmpty()Z
 
@@ -413,15 +413,15 @@
     :cond_9
     iput-boolean v1, v8, Lrx/internal/a/au$c;->missed:Z
 
-    iget-boolean v15, v8, Lrx/internal/a/au$c;->bKu:Z
+    iget-boolean v15, v8, Lrx/internal/a/au$c;->bKE:Z
 
-    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKv:Z
+    iget-boolean v0, v8, Lrx/internal/a/au$c;->bKF: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;->bKw:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bKG:Ljava/lang/Throwable;
 
     if-eq v14, v1, :cond_a
 
@@ -429,7 +429,7 @@
 
     if-nez v1, :cond_a
 
-    sget-object v1, Lrx/internal/a/au$c;->bKw:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bKG:Ljava/lang/Throwable;
 
     iput-object v1, v8, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
@@ -469,7 +469,7 @@
 
     iget-object v0, p0, Lrx/internal/a/au$c;->error:Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/a/au$c;->bKw:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/a/au$c;->bKG:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -533,9 +533,9 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKu:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKE:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/au$c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/au$c;->Ji()V
 
     return-void
 .end method
@@ -558,9 +558,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/au$c;->bKu:Z
+    iput-boolean p1, p0, Lrx/internal/a/au$c;->bKE:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/au$c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/au$c;->Ji()V
 
     return-void
 
@@ -585,7 +585,7 @@
 
     check-cast p1, Lrx/Observable;
 
-    iget-object v0, p0, Lrx/internal/a/au$c;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/au$c;->bIk: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;->bPb:Lrx/internal/d/a;
+    iget-object v2, v2, Lrx/subscriptions/SerialSubscription;->bPl:Lrx/internal/d/a;
 
-    invoke-virtual {v2}, Lrx/internal/d/a;->JM()Lrx/Subscription;
+    invoke-virtual {v2}, Lrx/internal/d/a;->JP()Lrx/Subscription;
 
     move-result-object v2
 
@@ -613,7 +613,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKv:Z
+    iput-boolean v0, p0, Lrx/internal/a/au$c;->bKF: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 2a542b2d3e..df107f4020 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 JE()Lrx/internal/a/au;
+.method public static JH()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;->bKs:Lrx/internal/a/au;
+    sget-object v0, Lrx/internal/a/au$a;->bKC: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 c819af5f2e..f474a2d007 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 bKA:Lrx/internal/a/av$1;
+.field final synthetic bKJ:Lrx/Producer;
 
-.field final synthetic bKz:Lrx/Producer;
+.field final synthetic bKK: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;->bKA:Lrx/internal/a/av$1;
+    iput-object p1, p0, Lrx/internal/a/av$1$1;->bKK:Lrx/internal/a/av$1;
 
-    iput-object p2, p0, Lrx/internal/a/av$1$1;->bKz:Lrx/Producer;
+    iput-object p2, p0, Lrx/internal/a/av$1$1;->bKJ: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;->bKA:Lrx/internal/a/av$1;
+    iget-object v2, p0, Lrx/internal/a/av$1$1;->bKK:Lrx/internal/a/av$1;
 
-    iget-boolean v2, v2, Lrx/internal/a/av$1;->bvw:Z
+    iget-boolean v2, v2, Lrx/internal/a/av$1;->bvG:Z
 
     if-nez v2, :cond_1
 
@@ -70,9 +70,9 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/a/av$1$1;->bKA:Lrx/internal/a/av$1;
+    iget-object v4, p0, Lrx/internal/a/av$1$1;->bKK:Lrx/internal/a/av$1;
 
-    iget-object v4, v4, Lrx/internal/a/av$1;->bKy:Lrx/internal/a/av;
+    iget-object v4, v4, Lrx/internal/a/av$1;->bKI: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;->bKz:Lrx/Producer;
+    iget-object p1, p0, Lrx/internal/a/av$1$1;->bKJ: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 7fe8542dad..d9c4e16f7e 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bKy:Lrx/internal/a/av;
+.field final synthetic bKI:Lrx/internal/a/av;
 
-.field bvw:Z
+.field bvG: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;->bKy:Lrx/internal/a/av;
+    iput-object p1, p0, Lrx/internal/a/av$1;->bKI:Lrx/internal/a/av;
 
-    iput-object p2, p0, Lrx/internal/a/av$1;->bHx:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/av$1;->bHH: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;->bvw:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->bvG:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvw:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvG:Z
 
-    iget-object v0, p0, Lrx/internal/a/av$1;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bHH: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;->bvw:Z
+    iget-boolean v0, p0, Lrx/internal/a/av$1;->bvG:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvw:Z
+    iput-boolean v0, p0, Lrx/internal/a/av$1;->bvG:Z
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/av$1;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bHH: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;->bKy:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bKI: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;->bKy:Lrx/internal/a/av;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bKI: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/av$1;->bHH: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;->bvw:Z
+    iget-boolean p1, p0, Lrx/internal/a/av$1;->bvG:Z
 
     if-nez p1, :cond_1
 
-    iput-boolean v2, p0, Lrx/internal/a/av$1;->bvw:Z
+    iput-boolean v2, p0, Lrx/internal/a/av$1;->bvG:Z
 
     :try_start_0
-    iget-object p1, p0, Lrx/internal/a/av$1;->bHx:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/av$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/av$1;->bHH: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 76a84d498e..190dfaa7ef 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 bKC:Lrx/Subscriber;
+.field final synthetic bKM:Lrx/Subscriber;
 
-.field final synthetic bKD:Lrx/internal/a/aw;
+.field final synthetic bKN: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;->bKD:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$1;->bKN:Lrx/internal/a/aw;
 
-    iput-object p3, p0, Lrx/internal/a/aw$1;->bKC:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/aw$1;->bKM:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -48,13 +48,13 @@
     .locals 2
 
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bKC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM: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;->bKC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM: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;->bKC:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/aw$1;->bKM: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;->bKC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM: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;->bKC:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/aw$1;->bKM: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;->bKC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM:Lrx/Subscriber;
 
     invoke-virtual {v0}, Lrx/Subscriber;->unsubscribe()V
 
@@ -104,7 +104,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/a/aw$1;->bKC:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$1;->bKM: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 28fe7b362c..9620078414 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 bKD:Lrx/internal/a/aw;
+.field final synthetic bKN:Lrx/internal/a/aw;
 
-.field final synthetic bKE:Lrx/Subscriber;
+.field final synthetic bKO:Lrx/Subscriber;
 
 
 # direct methods
 .method constructor <init>(Lrx/internal/a/aw;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/aw$2;->bKD:Lrx/internal/a/aw;
+    iput-object p1, p0, Lrx/internal/a/aw$2;->bKN:Lrx/internal/a/aw;
 
-    iput-object p2, p0, Lrx/internal/a/aw$2;->bKE:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/aw$2;->bKO: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;->bKE:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->bKO: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;->bKE:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/aw$2;->bKO: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 b809dc83a2..f932cf1205 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 bKB:Lrx/Observable;
+.field private final bKL: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;->bKB:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/aw;->bKL: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;->bKB:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/aw;->bKL: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 dba3ba0fee..1dd7a67c44 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 bKG:Lrx/internal/a/ax$a;
+.field final synthetic bKQ:Lrx/internal/a/ax$a;
 
-.field final synthetic bKH:Lrx/internal/a/ax;
+.field final synthetic bKR: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;->bKH:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$1;->bKR:Lrx/internal/a/ax;
 
-    iput-object p2, p0, Lrx/internal/a/ax$1;->bKG:Lrx/internal/a/ax$a;
+    iput-object p2, p0, Lrx/internal/a/ax$1;->bKQ: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;->bKG:Lrx/internal/a/ax$a;
+    iget-object v0, p0, Lrx/internal/a/ax$1;->bKQ:Lrx/internal/a/ax$a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/a/ax$a;->aK(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 195e68782c..954611333f 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 bKH:Lrx/internal/a/ax;
+.field final synthetic bKR: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;->bKH:Lrx/internal/a/ax;
+    iput-object p1, p0, Lrx/internal/a/ax$a;->bKR: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;->bKH:Lrx/internal/a/ax;
+    iget-object v1, p0, Lrx/internal/a/ax$a;->bKR:Lrx/internal/a/ax;
 
-    iget-object v1, v1, Lrx/internal/a/ax;->bKF:Lrx/functions/b;
+    iget-object v1, v1, Lrx/internal/a/ax;->bKP: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 7d20b6ee9d..0ad804850d 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 bKF:Lrx/functions/b;
+.field final bKP: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;->bKF:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ax;->bKP: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 88c2afa9c4..80b39e6bef 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 bKI:Lrx/functions/b;
+.field final synthetic bKS:Lrx/functions/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/functions/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/internal/a/ay$1;->bKI:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/a/ay$1;->bKS: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;->bKI:Lrx/functions/b;
+    iget-object p2, p0, Lrx/internal/a/ay$1;->bKS: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 b619825041..be9a76607a 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 bHN:Lrx/Subscriber;
+.field final synthetic bHX:Lrx/Subscriber;
 
-.field final synthetic bKJ:Lrx/internal/a/ay;
+.field final synthetic bKT:Lrx/internal/a/ay;
 
-.field private biP:I
+.field private biZ: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;->bKJ:Lrx/internal/a/ay;
+    iput-object p1, p0, Lrx/internal/a/ay$2;->bKT:Lrx/internal/a/ay;
 
-    iput-object p3, p0, Lrx/internal/a/ay$2;->bHN:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ay$2;->bHX:Lrx/Subscriber;
 
     const/4 p1, 0x0
 
@@ -55,7 +55,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/ay$2;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHX: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;->bKJ:Lrx/internal/a/ay;
+    iget-object v1, p0, Lrx/internal/a/ay$2;->bKT:Lrx/internal/a/ay;
 
-    iget-object v1, v1, Lrx/internal/a/ay;->bKi:Lrx/functions/Func2;
+    iget-object v1, v1, Lrx/internal/a/ay;->bKs:Lrx/functions/Func2;
 
-    iget v2, p0, Lrx/internal/a/ay$2;->biP:I
+    iget v2, p0, Lrx/internal/a/ay$2;->biZ:I
 
     add-int/lit8 v3, v2, 0x1
 
-    iput v3, p0, Lrx/internal/a/ay$2;->biP:I
+    iput v3, p0, Lrx/internal/a/ay$2;->biZ: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/ay$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ay$2;->bHX: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 bf426fea91..440f841101 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 bKi:Lrx/functions/Func2;
+.field final bKs: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;->bKi:Lrx/functions/Func2;
+    iput-object p1, p0, Lrx/internal/a/ay;->bKs: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 1503d751c0..b0821385fc 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 bHN:Lrx/Subscriber;
+.field final synthetic bHX:Lrx/Subscriber;
 
-.field final synthetic bKK:Lrx/internal/a/az;
+.field final synthetic bKU: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;->bKK:Lrx/internal/a/az;
+    iput-object p1, p0, Lrx/internal/a/az$1;->bKU:Lrx/internal/a/az;
 
-    iput-object p3, p0, Lrx/internal/a/az$1;->bHN:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/az$1;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bHX: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;->bKK:Lrx/internal/a/az;
+    iget-object v4, p0, Lrx/internal/a/az$1;->bKU: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/az$1;->bHX: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 c1b7e996cb..7e8c1acb13 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 bGC:Ljava/lang/Object;
+.field final synthetic bGM:Ljava/lang/Object;
 
-.field final synthetic bGD:Lrx/Observable;
+.field final synthetic bGN: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;->bGC:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/b$1;->bGM:Ljava/lang/Object;
 
-    iput-object p2, p0, Lrx/internal/a/b$1;->bGD:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/b$1;->bGN: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;->bGC:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$1;->bGM: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;->bGD:Lrx/Observable;
+    iget-object v1, p0, Lrx/internal/a/b$1;->bGN: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 29939f2d52..bc5068a38f 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 bGE:Ljava/lang/Object;
+.field private bGO:Ljava/lang/Object;
 
-.field final synthetic bGF:Lrx/internal/a/b$a;
+.field final synthetic bGP: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;->bGF:Lrx/internal/a/b$a;
+    iput-object p1, p0, Lrx/internal/a/b$a$1;->bGP: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;->bGF:Lrx/internal/a/b$a;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->bGP: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;->bGE:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
-    iget-object v0, p0, Lrx/internal/a/b$a$1;->bGE:Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     invoke-static {v0}, Lrx/internal/a/g;->bt(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;->bGE:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGF:Lrx/internal/a/b$a;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGP: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;->bGE:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGE:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bt(Ljava/lang/Object;)Z
 
@@ -101,7 +101,7 @@
 
     if-nez v1, :cond_2
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGE:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bu(Ljava/lang/Object;)Z
 
@@ -109,7 +109,7 @@
 
     if-nez v1, :cond_1
 
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGE:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bw(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;->bGE:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     return-object v1
 
     :cond_1
     :try_start_1
-    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGE:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/b$a$1;->bGO:Ljava/lang/Object;
 
     invoke-static {v1}, Lrx/internal/a/g;->bx(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;->bGE:Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/a/b$a$1;->bGO: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 c43ac812bf..3a3cfc3376 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;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()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 a740f6a2af..46a77d98ed 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 bIp:Lrx/internal/b/b;
+.field final synthetic bIz:Lrx/internal/b/b;
 
-.field final synthetic bKL:Lrx/Subscriber;
+.field final synthetic bKV:Lrx/Subscriber;
 
-.field final synthetic bKM:Lrx/internal/a/ba;
+.field final synthetic bKW:Lrx/internal/a/ba;
 
-.field bvw:Z
+.field bvG: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;->bKM:Lrx/internal/a/ba;
+    iput-object p1, p0, Lrx/internal/a/ba$1;->bKW:Lrx/internal/a/ba;
 
-    iput-object p2, p0, Lrx/internal/a/ba$1;->bIp:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/ba$1;->bIz:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/ba$1;->bKL:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/ba$1;->bKV: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;->bvw:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->bvG:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/ba$1;->bvw:Z
+    iput-boolean v0, p0, Lrx/internal/a/ba$1;->bvG: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;->bIp:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/ba$1;->bIz: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;->bKL:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/ba$1;->bKV: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;->bvw:Z
+    iget-boolean v0, p0, Lrx/internal/a/ba$1;->bvG: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 82e4eaecce..918a62f85e 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 public static final bKN:Lrx/internal/a/ba;
+.field public static final bKX: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;->bKN:Lrx/internal/a/ba;
+    sput-object v0, Lrx/internal/a/ba$a;->bKX: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 94d7e98531..0c772898bc 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 JF()Lrx/internal/a/ba;
+.method public static JI()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;->bKN:Lrx/internal/a/ba;
+    sget-object v0, Lrx/internal/a/ba$a;->bKX: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 56ca38ba7b..d041dbda0d 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 bKR:Lrx/functions/Func2;
+.field final synthetic bLb:Lrx/functions/Func2;
 
-.field final synthetic bKS:Lrx/internal/a/bb;
+.field final synthetic bLc: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;->bKS:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$1;->bLc:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$1;->bKR:Lrx/functions/Func2;
+    iput-object p2, p0, Lrx/internal/a/bb$1;->bLb: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;->bKR:Lrx/functions/Func2;
+    iget-object v0, p0, Lrx/internal/a/bb$1;->bLb: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 8587791242..b57917af8a 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bIp:Lrx/internal/b/b;
+.field final synthetic bIz:Lrx/internal/b/b;
 
-.field final synthetic bKS:Lrx/internal/a/bb;
+.field final synthetic bLc:Lrx/internal/a/bb;
 
-.field bvw:Z
+.field bvG: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;->bKS:Lrx/internal/a/bb;
+    iput-object p1, p0, Lrx/internal/a/bb$2;->bLc:Lrx/internal/a/bb;
 
-    iput-object p2, p0, Lrx/internal/a/bb$2;->bIp:Lrx/internal/b/b;
+    iput-object p2, p0, Lrx/internal/a/bb$2;->bIz:Lrx/internal/b/b;
 
-    iput-object p3, p0, Lrx/internal/a/bb$2;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/bb$2;->bHH:Lrx/Subscriber;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
     new-instance p1, Ljava/util/ArrayList;
 
-    iget-object p2, p0, Lrx/internal/a/bb$2;->bKS:Lrx/internal/a/bb;
+    iget-object p2, p0, Lrx/internal/a/bb$2;->bLc:Lrx/internal/a/bb;
 
-    iget p2, p2, Lrx/internal/a/bb;->bKP:I
+    iget p2, p2, Lrx/internal/a/bb;->bKZ: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;->bvw:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->bvG:Z
 
     if-nez v0, :cond_0
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/bb$2;->bvw:Z
+    iput-boolean v0, p0, Lrx/internal/a/bb$2;->bvG: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;->bKS:Lrx/internal/a/bb;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->bLc:Lrx/internal/a/bb;
 
-    iget-object v1, v1, Lrx/internal/a/bb;->bKO:Ljava/util/Comparator;
+    iget-object v1, v1, Lrx/internal/a/bb;->bKY: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;->bIp:Lrx/internal/b/b;
+    iget-object v1, p0, Lrx/internal/a/bb$2;->bIz: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/bb$2;->bHH: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;->bvw:Z
+    iget-boolean v0, p0, Lrx/internal/a/bb$2;->bvG: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 7a14f50006..f3acc190fc 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 bKQ:Ljava/util/Comparator;
+.field private static final bLa:Ljava/util/Comparator;
 
 
 # instance fields
-.field final bKO:Ljava/util/Comparator;
+.field final bKY:Ljava/util/Comparator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Comparator<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bKP:I
+.field final bKZ:I
 
 
 # direct methods
@@ -51,7 +51,7 @@
 
     invoke-direct {v0}, Lrx/internal/a/bb$a;-><init>()V
 
-    sput-object v0, Lrx/internal/a/bb;->bKQ:Ljava/util/Comparator;
+    sput-object v0, Lrx/internal/a/bb;->bLa: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;->bKQ:Ljava/util/Comparator;
+    sget-object v0, Lrx/internal/a/bb;->bLa:Ljava/util/Comparator;
 
-    iput-object v0, p0, Lrx/internal/a/bb;->bKO:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->bKY:Ljava/util/Comparator;
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->bKP:I
+    iput v0, p0, Lrx/internal/a/bb;->bKZ:I
 
     return-void
 .end method
@@ -88,13 +88,13 @@
 
     const/16 v0, 0xa
 
-    iput v0, p0, Lrx/internal/a/bb;->bKP:I
+    iput v0, p0, Lrx/internal/a/bb;->bKZ: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;->bKO:Ljava/util/Comparator;
+    iput-object v0, p0, Lrx/internal/a/bb;->bKY: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 d3f7085a12..1dd5a86207 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 bKU:Lrx/internal/util/i;
+.field final bLe:Lrx/internal/util/i;
 
-.field final synthetic bKV:Lrx/internal/a/bc$a;
+.field final synthetic bLf: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;->bKV:Lrx/internal/a/bc$a;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bLf:Lrx/internal/a/bc$a;
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    invoke-static {}, Lrx/internal/util/i;->JR()Lrx/internal/util/i;
+    invoke-static {}, Lrx/internal/util/i;->JU()Lrx/internal/util/i;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bKU:Lrx/internal/util/i;
+    iput-object p1, p0, Lrx/internal/a/bc$a$a;->bLe: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;->bKU:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLe:Lrx/internal/util/i;
 
-    iget-object v1, v0, Lrx/internal/util/i;->bMU:Ljava/lang/Object;
+    iget-object v1, v0, Lrx/internal/util/i;->bNe:Ljava/lang/Object;
 
     if-nez v1, :cond_0
 
-    invoke-static {}, Lrx/internal/a/g;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
 
     move-result-object v1
 
-    iput-object v1, v0, Lrx/internal/util/i;->bMU:Ljava/lang/Object;
+    iput-object v1, v0, Lrx/internal/util/i;->bNe:Ljava/lang/Object;
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bKV:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLf: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;->bKV:Lrx/internal/a/bc$a;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLf: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;->bKU:Lrx/internal/util/i;
+    iget-object v0, p0, Lrx/internal/a/bc$a$a;->bLe: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;->bKV:Lrx/internal/a/bc$a;
+    iget-object p1, p0, Lrx/internal/a/bc$a$a;->bLf:Lrx/internal/a/bc$a;
 
     invoke-virtual {p1}, Lrx/internal/a/bc$a;->tick()V
 
@@ -110,7 +110,7 @@
 .method public final onStart()V
     .locals 2
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     int-to-long v0, v0
 
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 f8aeecd9cd..9801f5985c 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 bKT:I
+.field static final bLd:I
 
 .field private static final serialVersionUID:J = 0x53337eae55d8937dL
 
@@ -67,7 +67,7 @@
 .method static constructor <clinit>()V
     .locals 4
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     int-to-double v0, v0
 
@@ -79,7 +79,7 @@
 
     double-to-int v0, v0
 
-    sput v0, Lrx/internal/a/bc$a;->bKT:I
+    sput v0, Lrx/internal/a/bc$a;->bLd: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;->bKU:Lrx/internal/util/i;
+    iget-object v11, v11, Lrx/internal/a/bc$a$a;->bLe: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;->bKU:Lrx/internal/util/i;
+    iget-object v9, v9, Lrx/internal/a/bc$a$a;->bLe: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;->bKT:I
+    sget v8, Lrx/internal/a/bc$a;->bLd: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 375fdab4b1..40fad97391 100644
--- a/com.discord/smali_classes2/rx/internal/a/bc$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/bc$c.smali
@@ -24,9 +24,9 @@
 
 
 # instance fields
-.field aoQ:Z
+.field aoZ:Z
 
-.field final bKW:Lrx/internal/a/bc$b;
+.field final bLg:Lrx/internal/a/bc$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/internal/a/bc$b<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final synthetic bKX:Lrx/internal/a/bc;
+.field final synthetic bLh: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;->bKX:Lrx/internal/a/bc;
+    iput-object p1, p0, Lrx/internal/a/bc$c;->bLh: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;->bKW:Lrx/internal/a/bc$b;
+    iput-object p4, p0, Lrx/internal/a/bc$c;->bLg:Lrx/internal/a/bc$b;
 
     return-void
 .end method
@@ -89,7 +89,7 @@
 .method public final onCompleted()V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/internal/a/bc$c;->aoQ:Z
+    iget-boolean v0, p0, Lrx/internal/a/bc$c;->aoZ:Z
 
     if-nez v0, :cond_0
 
@@ -127,11 +127,11 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/a/bc$c;->aoQ:Z
+    iput-boolean v0, p0, Lrx/internal/a/bc$c;->aoZ:Z
 
     iget-object v0, p0, Lrx/internal/a/bc$c;->zipper:Lrx/internal/a/bc$a;
 
-    iget-object v1, p0, Lrx/internal/a/bc$c;->bKW:Lrx/internal/a/bc$b;
+    iget-object v1, p0, Lrx/internal/a/bc$c;->bLg: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 3bde4ae073..af31b8d6b6 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 bKZ:Lrx/g;
+.field final bLj: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;->bKZ:Lrx/g;
+    iput-object p1, p0, Lrx/internal/a/bd$a;->bLj:Lrx/g;
 
     return-void
 .end method
@@ -72,7 +72,7 @@
 
     if-nez v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/bd$a;->bKZ:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->bLj: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;->bKZ:Lrx/g;
+    iget-object v1, p0, Lrx/internal/a/bd$a;->bLj: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;->bKZ:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/bd$a;->bLj: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;->bKZ:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/bd$a;->bLj: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 3a01938ec3..66ce33df6d 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 bKY:Lrx/Observable$a;
+.field final bLi: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;->bKY:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/bd;->bLi: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;->bKY:Lrx/Observable$a;
+    iget-object p1, p0, Lrx/internal/a/bd;->bLi: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 3a3f545982..23740dafa5 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 bLa:Lrx/f$a;
+.field final bLk:Lrx/f$a;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/f$a<",
@@ -37,7 +37,7 @@
     .end annotation
 .end field
 
-.field final bLb:Lrx/Observable$b;
+.field final bLl: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;->bLb:Lrx/Observable$b;
+    iget-object v1, p0, Lrx/internal/a/be;->bLl: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;->bLa:Lrx/f$a;
+    iget-object v0, p0, Lrx/internal/a/be;->bLk: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 391900d4dd..e71b354571 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 bLa:Lrx/f$a;
+.field final bLk: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;->bLa:Lrx/f$a;
+    iput-object p1, p0, Lrx/internal/a/bf;->bLk: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;->bLa:Lrx/f$a;
+    iget-object p1, p0, Lrx/internal/a/bf;->bLk: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 a399bc54ea..5138406369 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 bGH:Lrx/internal/a/c;
+.field final bGR: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;->bGH:Lrx/internal/a/c;
+    iput-object p1, p0, Lrx/internal/a/c$a;->bGR: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;->bGH:Lrx/internal/a/c;
+    iget-object v0, p0, Lrx/internal/a/c$a;->bGR:Lrx/internal/a/c;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/a/c;->aK(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 6f02364e86..56bedb406d 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 bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object p1, p0, Lrx/internal/a/c;->bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p2, p0, Lrx/internal/a/c;->bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/c;->bGQ: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;->bGG:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v2, p0, Lrx/internal/a/c;->bGQ: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 8ded34cad8..a0e545624d 100644
--- a/com.discord/smali_classes2/rx/internal/a/e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/e.smali
@@ -20,9 +20,9 @@
 
 
 # static fields
-.field public static final enum bGI:Lrx/internal/a/e;
+.field public static final enum bGS:Lrx/internal/a/e;
 
-.field static final bGJ:Lrx/Observable;
+.field static final bGT:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bGK:[Lrx/internal/a/e;
+.field private static final synthetic bGU:[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;->bGI:Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->bGS:Lrx/internal/a/e;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/e;
 
-    sget-object v1, Lrx/internal/a/e;->bGI:Lrx/internal/a/e;
+    sget-object v1, Lrx/internal/a/e;->bGS:Lrx/internal/a/e;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/e;->bGK:[Lrx/internal/a/e;
+    sput-object v0, Lrx/internal/a/e;->bGU:[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;->bGJ:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/e;->bGT:Lrx/Observable;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method public static Jc()Lrx/Observable;
+.method public static Jf()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/e;->bGJ:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/e;->bGT: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;->bGK:[Lrx/internal/a/e;
+    sget-object v0, Lrx/internal/a/e;->bGU:[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 6e09aee0b7..a20831c3ee 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 bGL:Lrx/internal/a/f;
+.field public static final enum bGV:Lrx/internal/a/f;
 
-.field static final bGM:Lrx/Observable;
+.field static final bGW:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -32,7 +32,7 @@
     .end annotation
 .end field
 
-.field private static final synthetic bGN:[Lrx/internal/a/f;
+.field private static final synthetic bGX:[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;->bGL:Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->bGV:Lrx/internal/a/f;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/a/f;
 
-    sget-object v1, Lrx/internal/a/f;->bGL:Lrx/internal/a/f;
+    sget-object v1, Lrx/internal/a/f;->bGV:Lrx/internal/a/f;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/a/f;->bGN:[Lrx/internal/a/f;
+    sput-object v0, Lrx/internal/a/f;->bGX:[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;->bGM:Lrx/Observable;
+    sput-object v0, Lrx/internal/a/f;->bGW:Lrx/Observable;
 
     return-void
 .end method
@@ -83,7 +83,7 @@
     return-void
 .end method
 
-.method public static Jc()Lrx/Observable;
+.method public static Jf()Lrx/Observable;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -95,7 +95,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/f;->bGM:Lrx/Observable;
+    sget-object v0, Lrx/internal/a/f;->bGW: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;->bGN:[Lrx/internal/a/f;
+    sget-object v0, Lrx/internal/a/f;->bGX:[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 bc2c305ab6..6e3b7cc094 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 bGO:Ljava/lang/Object;
+.field private static final bGY:Ljava/lang/Object;
 
-.field private static final bGP:Ljava/lang/Object;
+.field private static final bGZ:Ljava/lang/Object;
 
 
 # direct methods
@@ -25,21 +25,21 @@
 
     invoke-direct {v0}, Lrx/internal/a/g$1;-><init>()V
 
-    sput-object v0, Lrx/internal/a/g;->bGO:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->bGY: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;->bGP:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/g;->bGZ:Ljava/lang/Object;
 
     return-void
 .end method
 
-.method public static Jd()Ljava/lang/Object;
+.method public static Jg()Ljava/lang/Object;
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->bGO:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGY:Ljava/lang/Object;
 
     return-object v0
 .end method
@@ -68,7 +68,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->bGO:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGY:Ljava/lang/Object;
 
     const/4 v1, 0x1
 
@@ -79,7 +79,7 @@
     return v1
 
     :cond_0
-    sget-object v0, Lrx/internal/a/g;->bGP:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGZ:Ljava/lang/Object;
 
     const/4 v2, 0x0
 
@@ -138,7 +138,7 @@
 
     if-nez p0, :cond_0
 
-    sget-object p0, Lrx/internal/a/g;->bGP:Ljava/lang/Object;
+    sget-object p0, Lrx/internal/a/g;->bGZ:Ljava/lang/Object;
 
     :cond_0
     return-object p0
@@ -147,7 +147,7 @@
 .method public static bt(Ljava/lang/Object;)Z
     .locals 1
 
-    sget-object v0, Lrx/internal/a/g;->bGO:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGY:Ljava/lang/Object;
 
     if-ne p0, v0, :cond_0
 
@@ -206,7 +206,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/a/g;->bGP:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/a/g;->bGZ: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 af464fb284..1277155c1c 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 bGS:Lrx/internal/a/h$b;
+.field final bHc: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;->bGS:Lrx/internal/a/h$b;
+    iput-object p1, p0, Lrx/internal/a/h$a;->bHc:Lrx/internal/a/h$b;
 
     iput p2, p0, Lrx/internal/a/h$a;->index:I
 
@@ -69,7 +69,7 @@
 
 
 # virtual methods
-.method public final Je()V
+.method public final Jh()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;->bGS:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bHc: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;->bGS:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bHc: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;->bGS:Lrx/internal/a/h$b;
+    iget-object p1, p0, Lrx/internal/a/h$a;->bHc: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;->bGS:Lrx/internal/a/h$b;
+    iget-object v0, p0, Lrx/internal/a/h$a;->bHc:Lrx/internal/a/h$b;
 
     invoke-static {p1}, Lrx/internal/a/g;->bs(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 78919574af..d664603315 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 bGT:Ljava/lang/Object;
+.field static final bHd: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;->bGT:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/a/h$b;->bHd: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;->bGT:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->bHd:Ljava/lang/Object;
 
     invoke-static {p1, p2}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -173,7 +173,7 @@
     return-void
 .end method
 
-.method private Jf()V
+.method private Ji()V
     .locals 21
 
     move-object/from16 v7, p0
@@ -319,7 +319,7 @@
 
     invoke-virtual {v9, v1}, Lrx/Subscriber;->onNext(Ljava/lang/Object;)V
 
-    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->Je()V
+    invoke-virtual/range {v17 .. v17}, Lrx/internal/a/h$a;->Jh()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;->bGT:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/a/h$b;->bHd: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;->bGT:Ljava/lang/Object;
+    sget-object v1, Lrx/internal/a/h$b;->bHd: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;->bGT:Ljava/lang/Object;
+    sget-object p2, Lrx/internal/a/h$b;->bHd:Ljava/lang/Object;
 
     if-eq v2, p2, :cond_6
 
@@ -625,12 +625,12 @@
 
     if-eqz p1, :cond_9
 
-    invoke-virtual {v0}, Lrx/internal/a/h$a;->Je()V
+    invoke-virtual {v0}, Lrx/internal/a/h$a;->Jh()V
 
     return-void
 
     :cond_9
-    invoke-direct {p0}, Lrx/internal/a/h$b;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/h$b;->Ji()V
 
     return-void
 
@@ -662,7 +662,7 @@
 
     invoke-static {v0, p1, p2}, Lrx/internal/a/a;->a(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    invoke-direct {p0}, Lrx/internal/a/h$b;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/h$b;->Ji()V
 
     :cond_0
     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 14b04814ea..b76225af70 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 bGQ:[Lrx/Observable;
+.field final bHa:[Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final bGR:Ljava/lang/Iterable;
+.field final bHb:Ljava/lang/Iterable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/lang/Iterable<",
@@ -79,7 +79,7 @@
         }
     .end annotation
 
-    sget v0, Lrx/internal/util/i;->bMV:I
+    sget v0, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {p0, p1, p2, v0}, Lrx/internal/a/h;-><init>(Ljava/lang/Iterable;Lrx/functions/FuncN;I)V
 
@@ -104,9 +104,9 @@
 
     const/4 v0, 0x0
 
-    iput-object v0, p0, Lrx/internal/a/h;->bGQ:[Lrx/Observable;
+    iput-object v0, p0, Lrx/internal/a/h;->bHa:[Lrx/Observable;
 
-    iput-object p1, p0, Lrx/internal/a/h;->bGR:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/h;->bHb: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;->bGQ:[Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/h;->bHa:[Lrx/Observable;
 
     const/4 v6, 0x0
 
     if-nez p1, :cond_3
 
-    iget-object p1, p0, Lrx/internal/a/h;->bGR:Ljava/lang/Iterable;
+    iget-object p1, p0, Lrx/internal/a/h;->bHb: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 0c9c733d7a..b742b80791 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 bGY:Lrx/internal/a/i$c;
+.field final synthetic bHi:Lrx/internal/a/i$c;
 
-.field final synthetic bGZ:Lrx/internal/a/i;
+.field final synthetic bHj: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;->bGZ:Lrx/internal/a/i;
+    iput-object p1, p0, Lrx/internal/a/i$1;->bHj:Lrx/internal/a/i;
 
-    iput-object p2, p0, Lrx/internal/a/i$1;->bGY:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$1;->bHi: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;->bGY:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$1;->bHi: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;->bHc:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->bHm: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 e990e42a64..17a2b046d3 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 bHa:Lrx/internal/a/i$c;
+.field final bHk: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 bHb:Z
+.field bHl: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;->bHa:Lrx/internal/a/i$c;
+    iput-object p2, p0, Lrx/internal/a/i$a;->bHk: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;->bHb:Z
+    iget-boolean v0, p0, Lrx/internal/a/i$a;->bHl:Z
 
     if-nez v0, :cond_0
 
@@ -87,9 +87,9 @@
 
     const/4 p1, 0x1
 
-    iput-boolean p1, p0, Lrx/internal/a/i$a;->bHb:Z
+    iput-boolean p1, p0, Lrx/internal/a/i$a;->bHl:Z
 
-    iget-object p1, p0, Lrx/internal/a/i$a;->bHa:Lrx/internal/a/i$c;
+    iget-object p1, p0, Lrx/internal/a/i$a;->bHk: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 0ac925e96d..c1a8a0c172 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 bHa:Lrx/internal/a/i$c;
+.field final bHk: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;->bHa:Lrx/internal/a/i$c;
+    iput-object p1, p0, Lrx/internal/a/i$b;->bHk: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;->bHa:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHk: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;->bHa:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHk: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;->bGX:I
+    iget p1, v0, Lrx/internal/a/i$c;->bHh:I
 
     if-nez p1, :cond_2
 
@@ -123,7 +123,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object p1, v0, Lrx/internal/a/i$c;->bHc:Lrx/internal/b/a;
+    iget-object p1, v0, Lrx/internal/a/i$c;->bHm:Lrx/internal/b/a;
 
     invoke-virtual {p1, v1, v2}, Lrx/internal/b/a;->aR(J)V
 
@@ -132,7 +132,7 @@
 
     iput-boolean p1, v0, Lrx/internal/a/i$c;->active:Z
 
-    invoke-virtual {v0}, Lrx/internal/a/i$c;->Jf()V
+    invoke-virtual {v0}, Lrx/internal/a/i$c;->Ji()V
 
     return-void
 .end method
@@ -153,7 +153,7 @@
 
     iput-wide v0, p0, Lrx/internal/a/i$b;->produced:J
 
-    iget-object v0, p0, Lrx/internal/a/i$b;->bHa:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHk:Lrx/internal/a/i$c;
 
     invoke-virtual {v0, p1}, Lrx/internal/a/i$c;->by(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;->bHa:Lrx/internal/a/i$c;
+    iget-object v0, p0, Lrx/internal/a/i$b;->bHk:Lrx/internal/a/i$c;
 
-    iget-object v0, v0, Lrx/internal/a/i$c;->bHc:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/i$c;->bHm: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 c08f0cc93d..6b204fe406 100644
--- a/com.discord/smali_classes2/rx/internal/a/i$c.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i$c.smali
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final bGV:Lrx/functions/b;
+.field final bHf:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -49,11 +49,11 @@
     .end annotation
 .end field
 
-.field final bGX:I
+.field final bHh:I
 
-.field final bHc:Lrx/internal/b/a;
+.field final bHm:Lrx/internal/b/a;
 
-.field final bHd:Lrx/subscriptions/SerialSubscription;
+.field final bHn:Lrx/subscriptions/SerialSubscription;
 
 .field volatile done:Z
 
@@ -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;->bGV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i$c;->bHf:Lrx/functions/b;
 
-    iput p4, p0, Lrx/internal/a/i$c;->bGX:I
+    iput p4, p0, Lrx/internal/a/i$c;->bHh: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;->bHc:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/i$c;->bHm: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;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()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;->bHd:Lrx/subscriptions/SerialSubscription;
+    iput-object p1, p0, Lrx/internal/a/i$c;->bHn:Lrx/subscriptions/SerialSubscription;
 
     int-to-long p1, p3
 
@@ -194,7 +194,7 @@
 
 
 # virtual methods
-.method final Jf()V
+.method final Ji()V
     .locals 7
 
     iget-object v0, p0, Lrx/internal/a/i$c;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -208,7 +208,7 @@
     return-void
 
     :cond_0
-    iget v0, p0, Lrx/internal/a/i$c;->bGX:I
+    iget v0, p0, Lrx/internal/a/i$c;->bHh:I
 
     :cond_1
     :goto_0
@@ -313,7 +313,7 @@
     if-nez v4, :cond_d
 
     :try_start_0
-    iget-object v2, p0, Lrx/internal/a/i$c;->bGV:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i$c;->bHf:Lrx/functions/b;
 
     invoke-static {v3}, Lrx/internal/a/g;->bw(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -340,7 +340,7 @@
     return-void
 
     :cond_9
-    invoke-static {}, Lrx/Observable;->IP()Lrx/Observable;
+    invoke-static {}, Lrx/Observable;->IS()Lrx/Observable;
 
     move-result-object v3
 
@@ -356,11 +356,11 @@
 
     iput-boolean v1, p0, Lrx/internal/a/i$c;->active:Z
 
-    iget-object v1, p0, Lrx/internal/a/i$c;->bHc:Lrx/internal/b/a;
+    iget-object v1, p0, Lrx/internal/a/i$c;->bHm:Lrx/internal/b/a;
 
     new-instance v3, Lrx/internal/a/i$a;
 
-    iget-object v2, v2, Lrx/internal/util/k;->bMX:Ljava/lang/Object;
+    iget-object v2, v2, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
 
     invoke-direct {v3, v2, p0}, Lrx/internal/a/i$a;-><init>(Ljava/lang/Object;Lrx/internal/a/i$c;)V
 
@@ -373,7 +373,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;->bHd:Lrx/subscriptions/SerialSubscription;
+    iget-object v6, p0, Lrx/internal/a/i$c;->bHn:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v6, v3}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
@@ -431,7 +431,7 @@
 
     if-eqz v2, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/i$c;->bHc:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/i$c;->bHm:Lrx/internal/b/a;
 
     invoke-virtual {v0, p1, p2}, Lrx/internal/b/a;->aR(J)V
 
@@ -440,7 +440,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/i$c;->active:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Ji()V
 
     return-void
 .end method
@@ -467,7 +467,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/i$c;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Ji()V
 
     return-void
 .end method
@@ -487,7 +487,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/i$c;->done:Z
 
-    iget p1, p0, Lrx/internal/a/i$c;->bGX:I
+    iget p1, p0, Lrx/internal/a/i$c;->bHh:I
 
     if-nez p1, :cond_1
 
@@ -508,14 +508,14 @@
     invoke-virtual {v0, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
     :cond_0
-    iget-object p1, p0, Lrx/internal/a/i$c;->bHd:Lrx/subscriptions/SerialSubscription;
+    iget-object p1, p0, Lrx/internal/a/i$c;->bHn:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {p1}, Lrx/subscriptions/SerialSubscription;->unsubscribe()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Ji()V
 
     return-void
 
@@ -556,7 +556,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/i$c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/i$c;->Ji()V
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/a/i.smali b/com.discord/smali_classes2/rx/internal/a/i.smali
index f01a238f38..54730633c2 100644
--- a/com.discord/smali_classes2/rx/internal/a/i.smali
+++ b/com.discord/smali_classes2/rx/internal/a/i.smali
@@ -30,7 +30,7 @@
 
 
 # instance fields
-.field final bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -39,7 +39,7 @@
     .end annotation
 .end field
 
-.field final bGV:Lrx/functions/b;
+.field final bHf:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -50,9 +50,9 @@
     .end annotation
 .end field
 
-.field final bGW:I
+.field final bHg:I
 
-.field final bGX:I
+.field final bHh:I
 
 
 # direct methods
@@ -72,17 +72,17 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/i;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/i;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/i;->bGV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/i;->bHf:Lrx/functions/b;
 
     const/4 p1, 0x2
 
-    iput p1, p0, Lrx/internal/a/i;->bGW:I
+    iput p1, p0, Lrx/internal/a/i;->bHg:I
 
     const/4 p1, 0x0
 
-    iput p1, p0, Lrx/internal/a/i;->bGX:I
+    iput p1, p0, Lrx/internal/a/i;->bHh:I
 
     return-void
 .end method
@@ -94,7 +94,7 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget v0, p0, Lrx/internal/a/i;->bGX:I
+    iget v0, p0, Lrx/internal/a/i;->bHh: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;->bGV:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/i;->bHf:Lrx/functions/b;
 
-    iget v3, p0, Lrx/internal/a/i;->bGW:I
+    iget v3, p0, Lrx/internal/a/i;->bHg:I
 
-    iget v4, p0, Lrx/internal/a/i;->bGX:I
+    iget v4, p0, Lrx/internal/a/i;->bHh: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;->bHd:Lrx/subscriptions/SerialSubscription;
+    iget-object v0, v1, Lrx/internal/a/i$c;->bHn: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/i;->bHe: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 2ffc355728..cb3e4bb73f 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$1.smali
@@ -15,7 +15,7 @@
 
 
 # static fields
-.field static final synthetic bHg:[I
+.field static final synthetic bHq:[I
 
 
 # direct methods
@@ -30,12 +30,12 @@
 
     new-array v0, v0, [I
 
-    sput-object v0, Lrx/internal/a/j$1;->bHg:[I
+    sput-object v0, Lrx/internal/a/j$1;->bHq:[I
 
     :try_start_0
-    sget-object v0, Lrx/internal/a/j$1;->bHg:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
 
-    sget-object v1, Lrx/Emitter$a;->bFV:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGf:Lrx/Emitter$a;
 
     invoke-virtual {v1}, Lrx/Emitter$a;->ordinal()I
 
@@ -49,9 +49,9 @@
 
     :catch_0
     :try_start_1
-    sget-object v0, Lrx/internal/a/j$1;->bHg:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
 
-    sget-object v1, Lrx/Emitter$a;->bFW:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGg:Lrx/Emitter$a;
 
     invoke-virtual {v1}, Lrx/Emitter$a;->ordinal()I
 
@@ -65,9 +65,9 @@
 
     :catch_1
     :try_start_2
-    sget-object v0, Lrx/internal/a/j$1;->bHg:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
 
-    sget-object v1, Lrx/Emitter$a;->bFY:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGi:Lrx/Emitter$a;
 
     invoke-virtual {v1}, Lrx/Emitter$a;->ordinal()I
 
@@ -81,9 +81,9 @@
 
     :catch_2
     :try_start_3
-    sget-object v0, Lrx/internal/a/j$1;->bHg:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
 
-    sget-object v1, Lrx/Emitter$a;->bFZ:Lrx/Emitter$a;
+    sget-object v1, Lrx/Emitter$a;->bGj:Lrx/Emitter$a;
 
     invoke-virtual {v1}, Lrx/Emitter$a;->ordinal()I
 
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 ac96e4ceb6..bad04e8003 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 Jg()V
+.method Jj()V
     .locals 0
 
     return-void
 .end method
 
-.method Jh()V
+.method Jk()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;->Jh()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->Jk()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;->Jg()V
+    invoke-virtual {p0}, Lrx/internal/a/j$a;->Jj()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 4bf5d766af..78a40bffed 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;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
 
     move-result p1
 
@@ -88,7 +88,7 @@
     return-void
 .end method
 
-.method private Jf()V
+.method private Ji()V
     .locals 13
 
     iget-object v0, p0, Lrx/internal/a/j$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -245,7 +245,7 @@
 
 
 # virtual methods
-.method final Jg()V
+.method final Jj()V
     .locals 1
 
     iget-object v0, p0, Lrx/internal/a/j$b;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -264,10 +264,10 @@
     return-void
 .end method
 
-.method final Jh()V
+.method final Jk()V
     .locals 0
 
-    invoke-direct {p0}, Lrx/internal/a/j$b;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Ji()V
 
     return-void
 .end method
@@ -279,7 +279,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/j$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/j$b;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Ji()V
 
     return-void
 .end method
@@ -293,7 +293,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/j$b;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/j$b;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Ji()V
 
     return-void
 .end method
@@ -314,7 +314,7 @@
 
     invoke-interface {v0, p1}, Ljava/util/Queue;->offer(Ljava/lang/Object;)Z
 
-    invoke-direct {p0}, Lrx/internal/a/j$b;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$b;->Ji()V
 
     return-void
 .end method
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 4507be53e8..db1dc73576 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 Ji()V
+.method final Jl()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 3e451e0342..18c94df484 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 Ji()V
+.method final Jl()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 0998f0c774..fafbd87d1a 100644
--- a/com.discord/smali_classes2/rx/internal/a/j$e.smali
+++ b/com.discord/smali_classes2/rx/internal/a/j$e.smali
@@ -74,7 +74,7 @@
     return-void
 .end method
 
-.method private Jf()V
+.method private Ji()V
     .locals 15
 
     iget-object v0, p0, Lrx/internal/a/j$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -240,7 +240,7 @@
 
 
 # virtual methods
-.method final Jg()V
+.method final Jj()V
     .locals 2
 
     iget-object v0, p0, Lrx/internal/a/j$e;->wip:Ljava/util/concurrent/atomic/AtomicInteger;
@@ -261,10 +261,10 @@
     return-void
 .end method
 
-.method final Jh()V
+.method final Jk()V
     .locals 0
 
-    invoke-direct {p0}, Lrx/internal/a/j$e;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Ji()V
 
     return-void
 .end method
@@ -276,7 +276,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/j$e;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/j$e;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Ji()V
 
     return-void
 .end method
@@ -290,7 +290,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/j$e;->done:Z
 
-    invoke-direct {p0}, Lrx/internal/a/j$e;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Ji()V
 
     return-void
 .end method
@@ -311,7 +311,7 @@
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
 
-    invoke-direct {p0}, Lrx/internal/a/j$e;->Jf()V
+    invoke-direct {p0}, Lrx/internal/a/j$e;->Ji()V
 
     return-void
 .end method
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 c6e9795a3d..e11c7aadf7 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 Ji()V
+.method abstract Jl()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;->Ji()V
+    invoke-virtual {p0}, Lrx/internal/a/j$f;->Jl()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 4aeaad5396..6c8547a0e2 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 bHe:Lrx/functions/Action1;
+.field final bHo:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -42,7 +42,7 @@
     .end annotation
 .end field
 
-.field final bHf:Lrx/Emitter$a;
+.field final bHp:Lrx/Emitter$a;
 
 
 # direct methods
@@ -61,9 +61,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/j;->bHe:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/a/j;->bHo:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/a/j;->bHf:Lrx/Emitter$a;
+    iput-object p2, p0, Lrx/internal/a/j;->bHp:Lrx/Emitter$a;
 
     return-void
 .end method
@@ -75,9 +75,9 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    sget-object v0, Lrx/internal/a/j$1;->bHg:[I
+    sget-object v0, Lrx/internal/a/j$1;->bHq:[I
 
-    iget-object v1, p0, Lrx/internal/a/j;->bHf:Lrx/Emitter$a;
+    iget-object v1, p0, Lrx/internal/a/j;->bHp:Lrx/Emitter$a;
 
     invoke-virtual {v1}, Lrx/Emitter$a;->ordinal()I
 
@@ -103,7 +103,7 @@
 
     new-instance v0, Lrx/internal/a/j$b;
 
-    sget v1, Lrx/internal/util/i;->bMV:I
+    sget v1, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, p1, v1}, Lrx/internal/a/j$b;-><init>(Lrx/Subscriber;I)V
 
@@ -140,7 +140,7 @@
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->setProducer(Lrx/Producer;)V
 
-    iget-object p1, p0, Lrx/internal/a/j;->bHe:Lrx/functions/Action1;
+    iget-object p1, p0, Lrx/internal/a/j;->bHo: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 17c88252b0..5292d6c878 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 bHh:Lrx/functions/Func0;
+.field final bHr: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;->bHh:Lrx/functions/Func0;
+    iput-object p1, p0, Lrx/internal/a/k;->bHr: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;->bHh:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/k;->bHr: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 c819f7be9f..44be654c61 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 bHi:Lrx/e;
+.field private final bHs: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;->bHi:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l$a;->bHs:Lrx/e;
 
     return-void
 .end method
@@ -81,7 +81,7 @@
 
     :cond_0
     :try_start_0
-    iget-object v0, p0, Lrx/internal/a/l$a;->bHi:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->bHs: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;->bHi:Lrx/e;
+    iget-object v1, p0, Lrx/internal/a/l$a;->bHs: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;->bHi:Lrx/e;
+    iget-object v0, p0, Lrx/internal/a/l$a;->bHs: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 fef8f02e25..4b429d99fd 100644
--- a/com.discord/smali_classes2/rx/internal/a/l.smali
+++ b/com.discord/smali_classes2/rx/internal/a/l.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field private final bGU:Lrx/Observable;
+.field private final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private final bHi:Lrx/e;
+.field private final bHs:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -60,9 +60,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/l;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/l;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/l;->bHi:Lrx/e;
+    iput-object p2, p0, Lrx/internal/a/l;->bHs:Lrx/e;
 
     return-void
 .end method
@@ -74,11 +74,11 @@
 
     check-cast p1, Lrx/Subscriber;
 
-    iget-object v0, p0, Lrx/internal/a/l;->bGU:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/l;->bHe:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/l$a;
 
-    iget-object v2, p0, Lrx/internal/a/l;->bHi:Lrx/e;
+    iget-object v2, p0, Lrx/internal/a/l;->bHs: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 346bcce42b..c0546e622f 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 bHj:Lrx/functions/b;
+.field final bHt: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;->bHj:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m$a;->bHt: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;->bHj:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/m$a;->bHt: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 320a0b461a..20221176cd 100644
--- a/com.discord/smali_classes2/rx/internal/a/m.smali
+++ b/com.discord/smali_classes2/rx/internal/a/m.smali
@@ -26,7 +26,7 @@
 
 
 # instance fields
-.field final bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bHj:Lrx/functions/b;
+.field final bHt:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -64,9 +64,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/m;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/m;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/m;->bHj:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/m;->bHt: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;->bHj:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/m;->bHt: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/m;->bHe: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 89567af2ed..7173763fc7 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 bHk:Lrx/internal/a/n$a;
+.field final synthetic bHu:Lrx/internal/a/n$a;
 
-.field final synthetic bHl:Lrx/internal/a/n;
+.field final synthetic bHv: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;->bHl:Lrx/internal/a/n;
+    iput-object p1, p0, Lrx/internal/a/n$1;->bHv:Lrx/internal/a/n;
 
-    iput-object p2, p0, Lrx/internal/a/n$1;->bHk:Lrx/internal/a/n$a;
+    iput-object p2, p0, Lrx/internal/a/n$1;->bHu: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;->bHk:Lrx/internal/a/n$a;
+    iget-object v0, p0, Lrx/internal/a/n$1;->bHu:Lrx/internal/a/n$a;
 
     const-wide/16 v1, 0x0
 
@@ -53,7 +53,7 @@
 
     invoke-static {v1, p1, p2}, Lrx/internal/a/a;->a(Ljava/util/concurrent/atomic/AtomicLong;J)J
 
-    invoke-virtual {v0}, Lrx/internal/a/n$a;->Jf()V
+    invoke-virtual {v0}, Lrx/internal/a/n$a;->Ji()V
 
     return-void
 
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 d6b6d60597..80253c4b06 100644
--- a/com.discord/smali_classes2/rx/internal/a/n$a.smali
+++ b/com.discord/smali_classes2/rx/internal/a/n$a.smali
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final bGV:Lrx/functions/b;
+.field final bHf:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -47,9 +47,9 @@
     .end annotation
 .end field
 
-.field final bHm:J
+.field final bHw:J
 
-.field bHn:Ljava/util/Iterator;
+.field bHx:Ljava/util/Iterator;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/Iterator<",
@@ -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;->bGV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$a;->bHf:Lrx/functions/b;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
@@ -132,11 +132,11 @@
 
     const-wide p1, 0x7fffffffffffffffL
 
-    iput-wide p1, p0, Lrx/internal/a/n$a;->bHm:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->bHw:J
 
     new-instance p1, Lrx/internal/util/a/f;
 
-    sget p2, Lrx/internal/util/i;->bMV:I
+    sget p2, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {p1, p2}, Lrx/internal/util/a/f;-><init>(I)V
 
@@ -151,9 +151,9 @@
 
     int-to-long p1, p1
 
-    iput-wide p1, p0, Lrx/internal/a/n$a;->bHm:J
+    iput-wide p1, p0, Lrx/internal/a/n$a;->bHw:J
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()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;->bHn:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->bHx: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;->bHn:Ljava/util/Iterator;
+    iput-object v1, p0, Lrx/internal/a/n$a;->bHx:Ljava/util/Iterator;
 
     invoke-virtual {p3, p1}, Lrx/Subscriber;->onError(Ljava/lang/Throwable;)V
 
@@ -254,7 +254,7 @@
 
 
 # virtual methods
-.method final Jf()V
+.method final Ji()V
     .locals 17
 
     move-object/from16 v1, p0
@@ -278,7 +278,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->bHn:Ljava/util/Iterator;
+    iget-object v0, v1, Lrx/internal/a/n$a;->bHx:Ljava/util/Iterator;
 
     const-wide/16 v6, 0x1
 
@@ -321,7 +321,7 @@
 
     move v15, v5
 
-    iget-wide v4, v1, Lrx/internal/a/n$a;->bHm:J
+    iget-wide v4, v1, Lrx/internal/a/n$a;->bHw:J
 
     cmp-long v0, v13, v4
 
@@ -338,7 +338,7 @@
 
     :goto_2
     :try_start_0
-    iget-object v0, v1, Lrx/internal/a/n$a;->bGV:Lrx/functions/b;
+    iget-object v0, v1, Lrx/internal/a/n$a;->bHf:Lrx/functions/b;
 
     invoke-static {v12}, Lrx/internal/a/g;->bw(Ljava/lang/Object;)Ljava/lang/Object;
 
@@ -362,7 +362,7 @@
 
     if-eqz v4, :cond_d
 
-    iput-object v0, v1, Lrx/internal/a/n$a;->bHn:Ljava/util/Iterator;
+    iput-object v0, v1, Lrx/internal/a/n$a;->bHx:Ljava/util/Iterator;
 
     goto :goto_3
 
@@ -438,7 +438,7 @@
 
     if-nez v11, :cond_6
 
-    iput-object v14, v1, Lrx/internal/a/n$a;->bHn:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bHx: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;->bHn:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bHx: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;->bHn:Ljava/util/Iterator;
+    iput-object v14, v1, Lrx/internal/a/n$a;->bHx:Ljava/util/Iterator;
 
     invoke-virtual {v1, v6}, Lrx/internal/a/n$a;->onError(Ljava/lang/Throwable;)V
 
@@ -539,7 +539,7 @@
 
     iput-boolean v0, p0, Lrx/internal/a/n$a;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/n$a;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/n$a;->Ji()V
 
     return-void
 .end method
@@ -559,7 +559,7 @@
 
     iput-boolean p1, p0, Lrx/internal/a/n$a;->done:Z
 
-    invoke-virtual {p0}, Lrx/internal/a/n$a;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/n$a;->Ji()V
 
     return-void
 
@@ -600,7 +600,7 @@
     return-void
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/a/n$a;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/a/n$a;->Ji()V
 
     return-void
 .end method
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 5fbf379301..de44e43e23 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 bGV:Lrx/functions/b;
+.field final bHf: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;->bGV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n$b;->bHf: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;->bGV:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/n$b;->bHf: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 09760c5957..1eeb341e4d 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 bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -38,7 +38,7 @@
     .end annotation
 .end field
 
-.field final bGV:Lrx/functions/b;
+.field final bHf:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -49,7 +49,7 @@
     .end annotation
 .end field
 
-.field final bGW:I
+.field final bHg:I
 
 
 # direct methods
@@ -69,11 +69,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/n;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/n;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/n;->bGV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/n;->bHf:Lrx/functions/b;
 
-    iput p3, p0, Lrx/internal/a/n;->bGW:I
+    iput p3, p0, Lrx/internal/a/n;->bHg:I
 
     return-void
 .end method
@@ -104,7 +104,7 @@
 
     check-cast p0, Lrx/internal/util/k;
 
-    iget-object p0, p0, Lrx/internal/util/k;->bMX:Ljava/lang/Object;
+    iget-object p0, p0, Lrx/internal/util/k;->bNh: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;->bGV:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/n;->bHf:Lrx/functions/b;
 
-    iget v2, p0, Lrx/internal/a/n;->bGW:I
+    iget v2, p0, Lrx/internal/a/n;->bHg: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/n;->bHe: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 2ee10df547..7158bdb3fc 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 Jj()V
+.method private Jm()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;->Jj()V
+    invoke-direct {p0}, Lrx/internal/a/o$a;->Jm()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 2a1379d229..13e79b9289 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 bHo:Ljava/lang/Iterable;
+.field final bHy: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;->bHo:Ljava/lang/Iterable;
+    iput-object p1, p0, Lrx/internal/a/p;->bHy: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;->bHo:Ljava/lang/Iterable;
+    iget-object v0, p0, Lrx/internal/a/p;->bHy: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 49089957bd..92efb4d13c 100644
--- a/com.discord/smali_classes2/rx/internal/a/q.smali
+++ b/com.discord/smali_classes2/rx/internal/a/q.smali
@@ -22,16 +22,7 @@
 
 
 # instance fields
-.field final bHp:Lrx/Observable$a;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable$a<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field final bHq:Lrx/Observable$b;
+.field final bHA:Lrx/Observable$b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable$b<",
@@ -40,6 +31,15 @@
     .end annotation
 .end field
 
+.field final bHz:Lrx/Observable$a;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable$a<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
+
 
 # direct methods
 .method public constructor <init>(Lrx/Observable$a;Lrx/Observable$b;)V
@@ -56,9 +56,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/q;->bHp:Lrx/Observable$a;
+    iput-object p1, p0, Lrx/internal/a/q;->bHz:Lrx/Observable$a;
 
-    iput-object p2, p0, Lrx/internal/a/q;->bHq:Lrx/Observable$b;
+    iput-object p2, p0, Lrx/internal/a/q;->bHA: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;->bHq:Lrx/Observable$b;
+    iget-object v0, p0, Lrx/internal/a/q;->bHA: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;->bHp:Lrx/Observable$a;
+    iget-object v1, p0, Lrx/internal/a/q;->bHz: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 3ac6a3d79c..c0385a26f2 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 bGV:Lrx/functions/b;
+.field final bHf: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;->bGV:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r$a;->bHf: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;->bGV:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/r$a;->bHf: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 15c81a3375..2359f4165c 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 bGU:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field final bHr:Lrx/functions/b;
+.field final bHB:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -46,6 +37,15 @@
     .end annotation
 .end field
 
+.field final bHe: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
@@ -62,9 +62,9 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/a/r;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/r;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/r;->bHr:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/r;->bHB: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;->bHr:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/r;->bHB: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/r;->bHe: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 3c8323b893..0507b13128 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 bHw:Lrx/internal/a/s$1;
+.field final synthetic bHG: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;->bHw:Lrx/internal/a/s$1;
+    iput-object p1, p0, Lrx/internal/a/s$1$1;->bHG: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;->IJ()Lrx/d;
+    invoke-static {}, Lrx/d;->IM()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 6fff7cd1fa..591bf1f863 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 bHD:Lrx/internal/a/s$2;
+.field final synthetic bHN: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;->bHD:Lrx/internal/a/s$2;
+    iput-object p1, p0, Lrx/internal/a/s$2$1;->bHN: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;->bHD:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHy:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHI:Lrx/subjects/Subject;
 
-    invoke-static {}, Lrx/d;->IK()Lrx/d;
+    invoke-static {}, Lrx/d;->IN()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;->bHD:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHy:Lrx/subjects/Subject;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHI: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;->bHD:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHH: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;->bHD:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bHK: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;->bHD:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bHK: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;->bHD:Lrx/internal/a/s$2;
+    iget-object p1, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object p1, p1, Lrx/internal/a/s$2;->bHz:Lrx/internal/b/a;
+    iget-object p1, p1, Lrx/internal/a/s$2;->bHJ:Lrx/internal/b/a;
 
     invoke-virtual {p1, v4, v5}, Lrx/internal/b/a;->aR(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;->bHD:Lrx/internal/a/s$2;
+    iget-object v0, p0, Lrx/internal/a/s$2$1;->bHN:Lrx/internal/a/s$2;
 
-    iget-object v0, v0, Lrx/internal/a/s$2;->bHz:Lrx/internal/b/a;
+    iget-object v0, v0, Lrx/internal/a/s$2;->bHJ: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 455b9c011e..72b0cdeb74 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 bHA:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bHB:Lrx/subscriptions/SerialSubscription;
+.field final synthetic bHI:Lrx/subjects/Subject;
 
-.field final synthetic bHC:Lrx/internal/a/s;
+.field final synthetic bHJ:Lrx/internal/b/a;
 
-.field final synthetic bHx:Lrx/Subscriber;
+.field final synthetic bHK:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bHy:Lrx/subjects/Subject;
+.field final synthetic bHL:Lrx/subscriptions/SerialSubscription;
 
-.field final synthetic bHz:Lrx/internal/b/a;
+.field final synthetic bHM:Lrx/internal/a/s;
 
 
 # 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;->bHC:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$2;->bHM:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$2;->bHx:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/s$2;->bHH:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/s$2;->bHy:Lrx/subjects/Subject;
+    iput-object p3, p0, Lrx/internal/a/s$2;->bHI:Lrx/subjects/Subject;
 
-    iput-object p4, p0, Lrx/internal/a/s$2;->bHz:Lrx/internal/b/a;
+    iput-object p4, p0, Lrx/internal/a/s$2;->bHJ:Lrx/internal/b/a;
 
-    iput-object p5, p0, Lrx/internal/a/s$2;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p5, p0, Lrx/internal/a/s$2;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p6, p0, Lrx/internal/a/s$2;->bHB:Lrx/subscriptions/SerialSubscription;
+    iput-object p6, p0, Lrx/internal/a/s$2;->bHL: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$2;->bHH: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;->bHB:Lrx/subscriptions/SerialSubscription;
+    iget-object v1, p0, Lrx/internal/a/s$2;->bHL:Lrx/subscriptions/SerialSubscription;
 
     invoke-virtual {v1, v0}, Lrx/subscriptions/SerialSubscription;->f(Lrx/Subscription;)V
 
-    iget-object v1, p0, Lrx/internal/a/s$2;->bHC:Lrx/internal/a/s;
+    iget-object v1, p0, Lrx/internal/a/s$2;->bHM:Lrx/internal/a/s;
 
-    iget-object v1, v1, Lrx/internal/a/s;->bGU:Lrx/Observable;
+    iget-object v1, v1, Lrx/internal/a/s;->bHe: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 82d3d17d83..a23bd77260 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 bHE:Lrx/Subscriber;
+.field final synthetic bHO:Lrx/Subscriber;
 
-.field final synthetic bHF:Lrx/internal/a/s$3;
+.field final synthetic bHP: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;->bHF:Lrx/internal/a/s$3;
+    iput-object p1, p0, Lrx/internal/a/s$3$1;->bHP:Lrx/internal/a/s$3;
 
-    iput-object p3, p0, Lrx/internal/a/s$3$1;->bHE:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$3$1;->bHO: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;->bHE:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHO: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;->bHE:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHO: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;->bGb:Lrx/d$a;
+    iget-object v0, p1, Lrx/d;->bGl:Lrx/d$a;
 
-    sget-object v1, Lrx/d$a;->bGf:Lrx/d$a;
+    sget-object v1, Lrx/d$a;->bGp: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;->bHF:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHP:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->bHC:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->bHM:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->bHt:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->bHD:Z
 
     if-eqz v0, :cond_1
 
-    iget-object p1, p0, Lrx/internal/a/s$3$1;->bHE:Lrx/Subscriber;
+    iget-object p1, p0, Lrx/internal/a/s$3$1;->bHO:Lrx/Subscriber;
 
     invoke-virtual {p1}, Lrx/Subscriber;->onCompleted()V
 
     return-void
 
     :cond_1
-    invoke-virtual {p1}, Lrx/d;->IN()Z
+    invoke-virtual {p1}, Lrx/d;->IQ()Z
 
     move-result v0
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHF:Lrx/internal/a/s$3;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHP:Lrx/internal/a/s$3;
 
-    iget-object v0, v0, Lrx/internal/a/s$3;->bHC:Lrx/internal/a/s;
+    iget-object v0, v0, Lrx/internal/a/s$3;->bHM:Lrx/internal/a/s;
 
-    iget-boolean v0, v0, Lrx/internal/a/s;->bHu:Z
+    iget-boolean v0, v0, Lrx/internal/a/s;->bHE:Z
 
     if-eqz v0, :cond_2
 
-    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHE:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHO: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;->bHE:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/s$3$1;->bHO: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 fc145dc445..8d78e15f6e 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 bHC:Lrx/internal/a/s;
+.field final synthetic bHM: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;->bHC:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$3;->bHM: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 2a94eba0c3..3a3eccf22e 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 bHJ:Lrx/internal/a/s$4;
+.field final synthetic bHT: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;->bHJ:Lrx/internal/a/s$4;
+    iput-object p1, p0, Lrx/internal/a/s$4$1;->bHT: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bHT:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bHH: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bHT:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bHx:Lrx/Subscriber;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bHH: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHT:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bHx:Lrx/Subscriber;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bHH: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHT:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bHK: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHT: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object v0, p0, Lrx/internal/a/s$4$1;->bHT:Lrx/internal/a/s$4;
 
-    iget-object v0, v0, Lrx/internal/a/s$4;->bHH:Lrx/functions/Action0;
+    iget-object v0, v0, Lrx/internal/a/s$4;->bHR: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;->bHJ:Lrx/internal/a/s$4;
+    iget-object p1, p0, Lrx/internal/a/s$4$1;->bHT:Lrx/internal/a/s$4;
 
-    iget-object p1, p1, Lrx/internal/a/s$4;->bHI:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p1, Lrx/internal/a/s$4;->bHS: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 6af8253f71..2be1596fab 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 bHA:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bHC:Lrx/internal/a/s;
+.field final synthetic bHK:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bHG:Lrx/Observable;
+.field final synthetic bHM:Lrx/internal/a/s;
 
-.field final synthetic bHH:Lrx/functions/Action0;
+.field final synthetic bHQ:Lrx/Observable;
 
-.field final synthetic bHI:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bHR:Lrx/functions/Action0;
 
-.field final synthetic bHx:Lrx/Subscriber;
+.field final synthetic bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .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;->bHC:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$4;->bHM:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$4;->bHG:Lrx/Observable;
+    iput-object p2, p0, Lrx/internal/a/s$4;->bHQ:Lrx/Observable;
 
-    iput-object p3, p0, Lrx/internal/a/s$4;->bHx:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/s$4;->bHH:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/s$4;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p4, p0, Lrx/internal/a/s$4;->bHK: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;->bHH:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$4;->bHR:Lrx/functions/Action0;
 
-    iput-object p7, p0, Lrx/internal/a/s$4;->bHI:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p7, p0, Lrx/internal/a/s$4;->bHS: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;->bHG:Lrx/Observable;
+    iget-object v0, p0, Lrx/internal/a/s$4;->bHQ:Lrx/Observable;
 
     new-instance v1, Lrx/internal/a/s$4$1;
 
-    iget-object v2, p0, Lrx/internal/a/s$4;->bHx:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/s$4;->bHH: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 c8d5cbcdc9..ba58b6c7d0 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 bHA:Ljava/util/concurrent/atomic/AtomicLong;
+.field final synthetic bHJ:Lrx/internal/b/a;
 
-.field final synthetic bHC:Lrx/internal/a/s;
+.field final synthetic bHK:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final synthetic bHH:Lrx/functions/Action0;
+.field final synthetic bHM:Lrx/internal/a/s;
 
-.field final synthetic bHI:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bHR:Lrx/functions/Action0;
 
-.field final synthetic bHz:Lrx/internal/b/a;
+.field final synthetic bHS:Ljava/util/concurrent/atomic/AtomicBoolean;
 
 .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;->bHC:Lrx/internal/a/s;
+    iput-object p1, p0, Lrx/internal/a/s$5;->bHM:Lrx/internal/a/s;
 
-    iput-object p2, p0, Lrx/internal/a/s$5;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p2, p0, Lrx/internal/a/s$5;->bHK:Ljava/util/concurrent/atomic/AtomicLong;
 
-    iput-object p3, p0, Lrx/internal/a/s$5;->bHz:Lrx/internal/b/a;
+    iput-object p3, p0, Lrx/internal/a/s$5;->bHJ:Lrx/internal/b/a;
 
-    iput-object p4, p0, Lrx/internal/a/s$5;->bHI:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p4, p0, Lrx/internal/a/s$5;->bHS: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;->bHH:Lrx/functions/Action0;
+    iput-object p6, p0, Lrx/internal/a/s$5;->bHR: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;->bHA:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/s$5;->bHK: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;->bHz:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/s$5;->bHJ: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;->bHI:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/s$5;->bHS: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;->bHH:Lrx/functions/Action0;
+    iget-object p2, p0, Lrx/internal/a/s$5;->bHR: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 96035d5fcc..53f3981062 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 bHv:Lrx/functions/b;
+.field static final bHF:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -36,16 +36,7 @@
 
 
 # instance fields
-.field final bGU:Lrx/Observable;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Lrx/Observable<",
-            "TT;>;"
-        }
-    .end annotation
-.end field
-
-.field private final bHs:Lrx/functions/b;
+.field private final bHC:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -60,9 +51,18 @@
     .end annotation
 .end field
 
-.field final bHt:Z
+.field final bHD:Z
 
-.field final bHu:Z
+.field final bHE:Z
+
+.field final bHe:Lrx/Observable;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lrx/Observable<",
+            "TT;>;"
+        }
+    .end annotation
+.end field
 
 .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;->bHv:Lrx/functions/b;
+    sput-object v0, Lrx/internal/a/s;->bHF: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;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/s;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/s;->bHs:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/s;->bHC:Lrx/functions/b;
 
-    iput-boolean p3, p0, Lrx/internal/a/s;->bHt:Z
+    iput-boolean p3, p0, Lrx/internal/a/s;->bHD:Z
 
-    iput-boolean p4, p0, Lrx/internal/a/s;->bHu:Z
+    iput-boolean p4, p0, Lrx/internal/a/s;->bHE: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;->Ks()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()Lrx/Scheduler;
 
     move-result-object v5
 
@@ -186,7 +186,7 @@
 
     new-instance v6, Lrx/internal/a/s;
 
-    invoke-static {}, Lrx/d/a;->Ks()Lrx/Scheduler;
+    invoke-static {}, Lrx/d/a;->Kv()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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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;->Kw()Lrx/subjects/BehaviorSubject;
+    invoke-static {}, Lrx/subjects/BehaviorSubject;->Kz()Lrx/subjects/BehaviorSubject;
 
     move-result-object v0
 
@@ -266,7 +266,7 @@
     move-object v7, v1
 
     :goto_0
-    invoke-static {}, Lrx/observers/a;->Kd()Lrx/e;
+    invoke-static {}, Lrx/observers/a;->Kg()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;->bHs:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/s;->bHC: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 ce746e6999..cc1f2a6297 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 bHN:Lrx/Subscriber;
+.field final synthetic bHX:Lrx/Subscriber;
 
-.field final synthetic bHO:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final synthetic bHY:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-.field final synthetic bHP:Lrx/internal/a/t;
+.field final synthetic bHZ: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;->bHP:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$1;->bHZ:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$1;->bHN:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/t$1;->bHX:Lrx/Subscriber;
 
-    iput-object p3, p0, Lrx/internal/a/t$1;->bHO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object p3, p0, Lrx/internal/a/t$1;->bHY: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;->bHP:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHZ:Lrx/internal/a/t;
 
-    iget-object v1, v1, Lrx/internal/a/t;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, v1, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v1, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/a/t$1;->bHP:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bHZ:Lrx/internal/a/t;
 
-    iget-object v1, p0, Lrx/internal/a/t$1;->bHN:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHX:Lrx/Subscriber;
 
-    iget-object v2, p0, Lrx/internal/a/t$1;->bHP:Lrx/internal/a/t;
+    iget-object v2, p0, Lrx/internal/a/t$1;->bHZ:Lrx/internal/a/t;
 
-    iget-object v2, v2, Lrx/internal/a/t;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, v2, Lrx/internal/a/t;->bHV: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;->bHP:Lrx/internal/a/t;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bHZ: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;->bHO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object p1, p0, Lrx/internal/a/t$1;->bHY: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;->bHP:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHZ: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;->bHO:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v1, p0, Lrx/internal/a/t$1;->bHY: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 d238add36a..d80a83ff2c 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 bHN:Lrx/Subscriber;
+.field final synthetic bHX:Lrx/Subscriber;
 
-.field final synthetic bHP:Lrx/internal/a/t;
+.field final synthetic bHZ:Lrx/internal/a/t;
 
-.field final synthetic bHQ:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic bIa: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;->bHP:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
 
-    iput-object p3, p0, Lrx/internal/a/t$2;->bHN:Lrx/Subscriber;
+    iput-object p3, p0, Lrx/internal/a/t$2;->bHX:Lrx/Subscriber;
 
-    iput-object p4, p0, Lrx/internal/a/t$2;->bHQ:Lrx/subscriptions/CompositeSubscription;
+    iput-object p4, p0, Lrx/internal/a/t$2;->bIa: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$2;->bHQ:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$2;->bIa:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ: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;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v0, p0, Lrx/internal/a/t$2;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHM:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->bHW: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$2;->bHZ: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/t$2;->bHX: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 b1d4bd88a6..eabf7385ec 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 bHP:Lrx/internal/a/t;
+.field final synthetic bHZ:Lrx/internal/a/t;
 
-.field final synthetic bHR:Lrx/subscriptions/CompositeSubscription;
+.field final synthetic bIb: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;->bHP:Lrx/internal/a/t;
+    iput-object p1, p0, Lrx/internal/a/t$3;->bHZ:Lrx/internal/a/t;
 
-    iput-object p2, p0, Lrx/internal/a/t$3;->bHR:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/a/t$3;->bIb: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/a/t$3;->bHR:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/a/t$3;->bIb:Lrx/subscriptions/CompositeSubscription;
 
     if-ne v0, v1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHM:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, v0, Lrx/internal/a/t;->bHW: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ:Lrx/internal/a/t;
 
-    iget-object v0, v0, Lrx/internal/a/t;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/a/t;->bHV:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/a/t$3;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ: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;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iput-object v1, v0, Lrx/internal/a/t;->bHV: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;->bHP:Lrx/internal/a/t;
+    iget-object v0, p0, Lrx/internal/a/t$3;->bHZ: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;->bHP:Lrx/internal/a/t;
+    iget-object v1, p0, Lrx/internal/a/t$3;->bHZ: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 7144862519..9ecc8692d8 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 bHK:Lrx/b/b;
+.field private final bHU:Lrx/b/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/b/b<",
@@ -29,9 +29,9 @@
     .end annotation
 .end field
 
-.field volatile bHL:Lrx/subscriptions/CompositeSubscription;
+.field volatile bHV:Lrx/subscriptions/CompositeSubscription;
 
-.field final bHM:Ljava/util/concurrent/atomic/AtomicInteger;
+.field final bHW: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;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/a/t;->bHV: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;->bHM:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/a/t;->bHW: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;->bHK:Lrx/b/b;
+    iput-object p1, p0, Lrx/internal/a/t;->bHU: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;->bHK:Lrx/b/b;
+    iget-object p0, p0, Lrx/internal/a/t;->bHU: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;->bHK:Lrx/b/b;
+    iget-object v0, p0, Lrx/internal/a/t;->bHU: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;->bHM:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object v0, p0, Lrx/internal/a/t;->bHW: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;->bHK:Lrx/b/b;
+    iget-object v1, p0, Lrx/internal/a/t;->bHU: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;->bHL:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/a/t;->bHV: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 61a4dc19e5..5ec690820f 100644
--- a/com.discord/smali_classes2/rx/internal/a/u$1.smali
+++ b/com.discord/smali_classes2/rx/internal/a/u$1.smali
@@ -22,11 +22,11 @@
 
 
 # instance fields
-.field private bHT:Z
+.field private bId:Z
 
-.field private bHU:Z
+.field private bIe:Z
 
-.field private bHV:Ljava/lang/Object;
+.field private bIf:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -34,18 +34,18 @@
     .end annotation
 .end field
 
-.field final synthetic bHW:Lrx/g;
+.field final synthetic bIg:Lrx/g;
 
-.field final synthetic bHX:Lrx/internal/a/u;
+.field final synthetic bIh: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;->bHX:Lrx/internal/a/u;
+    iput-object p1, p0, Lrx/internal/a/u$1;->bIh:Lrx/internal/a/u;
 
-    iput-object p2, p0, Lrx/internal/a/u$1;->bHW:Lrx/g;
+    iput-object p2, p0, Lrx/internal/a/u$1;->bIg: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;->bHT:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bId:Z
 
     if-nez v0, :cond_1
 
-    iget-boolean v0, p0, Lrx/internal/a/u$1;->bHU:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bIe:Z
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/a/u$1;->bHW:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bIg:Lrx/g;
 
-    iget-object v1, p0, Lrx/internal/a/u$1;->bHV:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/a/u$1;->bIf: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;->bHW:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bIg: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;->bHW:Lrx/g;
+    iget-object v0, p0, Lrx/internal/a/u$1;->bIg: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;->bHU:Z
+    iget-boolean v0, p0, Lrx/internal/a/u$1;->bIe:Z
 
     const/4 v1, 0x1
 
     if-eqz v0, :cond_0
 
-    iput-boolean v1, p0, Lrx/internal/a/u$1;->bHT:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->bId:Z
 
-    iget-object p1, p0, Lrx/internal/a/u$1;->bHW:Lrx/g;
+    iget-object p1, p0, Lrx/internal/a/u$1;->bIg: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;->bHU:Z
+    iput-boolean v1, p0, Lrx/internal/a/u$1;->bIe:Z
 
-    iput-object p1, p0, Lrx/internal/a/u$1;->bHV:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/a/u$1;->bIf: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 10aff478db..d85c076174 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 bHS:Lrx/Observable;
+.field private final bIc: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;->bHS:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/u;->bIc: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;->bHS:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/u;->bIc: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 475cdb77ae..9874ce3360 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 bHc:Lrx/internal/b/a;
+.field final bHm: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;->bHc:Lrx/internal/b/a;
+    iput-object p2, p0, Lrx/internal/a/w$a;->bHm: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;->bHc:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$a;->bHm: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 6bcdafb351..54b88a746a 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 bIe:J
+.field final bIo:J
 
-.field final synthetic bIf:Lrx/internal/a/w$b;
+.field final synthetic bIp: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;->bIf:Lrx/internal/a/w$b;
+    iput-object p1, p0, Lrx/internal/a/w$b$a;->bIp:Lrx/internal/a/w$b;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-wide p2, p0, Lrx/internal/a/w$b$a;->bIe:J
+    iput-wide p2, p0, Lrx/internal/a/w$b$a;->bIo: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;->bIf:Lrx/internal/a/w$b;
+    iget-object v0, p0, Lrx/internal/a/w$b$a;->bIp:Lrx/internal/a/w$b;
 
-    iget-wide v1, p0, Lrx/internal/a/w$b$a;->bIe:J
+    iget-wide v1, p0, Lrx/internal/a/w$b$a;->bIo:J
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bIk: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;->bHY:Lrx/Observable;
+    iget-object v1, v0, Lrx/internal/a/w$b;->bIi:Lrx/Observable;
 
     if-nez v1, :cond_0
 
@@ -72,7 +72,7 @@
     return-void
 
     :cond_0
-    iget-wide v1, v0, Lrx/internal/a/w$b;->bId:J
+    iget-wide v1, v0, Lrx/internal/a/w$b;->bIn:J
 
     const-wide/16 v3, 0x0
 
@@ -80,7 +80,7 @@
 
     if-eqz v5, :cond_1
 
-    iget-object v3, v0, Lrx/internal/a/w$b;->bHc:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bHm:Lrx/internal/b/a;
 
     invoke-virtual {v3, v1, v2}, Lrx/internal/b/a;->aR(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;->bHc:Lrx/internal/b/a;
+    iget-object v3, v0, Lrx/internal/a/w$b;->bHm: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;->bIc:Lrx/internal/d/a;
+    iget-object v2, v0, Lrx/internal/a/w$b;->bIm: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;->bHY:Lrx/Observable;
+    iget-object v0, v0, Lrx/internal/a/w$b;->bIi: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 4d7587f9bd..61af1183dd 100644
--- a/com.discord/smali_classes2/rx/internal/a/w$b.smali
+++ b/com.discord/smali_classes2/rx/internal/a/w$b.smali
@@ -40,7 +40,9 @@
     .end annotation
 .end field
 
-.field final bHY:Lrx/Observable;
+.field final bHm:Lrx/internal/b/a;
+
+.field final bIi:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -49,17 +51,15 @@
     .end annotation
 .end field
 
-.field final bHZ:Lrx/Scheduler$Worker;
+.field final bIj:Lrx/Scheduler$Worker;
 
-.field final bHc:Lrx/internal/b/a;
+.field final bIk:Ljava/util/concurrent/atomic/AtomicLong;
 
-.field final bIa:Ljava/util/concurrent/atomic/AtomicLong;
+.field final bIl:Lrx/internal/d/a;
 
-.field final bIb:Lrx/internal/d/a;
+.field final bIm:Lrx/internal/d/a;
 
-.field final bIc:Lrx/internal/d/a;
-
-.field bId:J
+.field bIn: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;->bHZ:Lrx/Scheduler$Worker;
+    iput-object p5, p0, Lrx/internal/a/w$b;->bIj:Lrx/Scheduler$Worker;
 
-    iput-object p6, p0, Lrx/internal/a/w$b;->bHY:Lrx/Observable;
+    iput-object p6, p0, Lrx/internal/a/w$b;->bIi: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;->bHc:Lrx/internal/b/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bHm: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bIk: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;->bIb:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bIl: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;->bIc:Lrx/internal/d/a;
+    iput-object p1, p0, Lrx/internal/a/w$b;->bIm: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;->bIb:Lrx/internal/d/a;
+    iget-object p1, p0, Lrx/internal/a/w$b;->bIl:Lrx/internal/d/a;
 
     invoke-virtual {p0, p1}, Lrx/internal/a/w$b;->add(Lrx/Subscription;)V
 
@@ -131,9 +131,9 @@
 .method final aN(J)V
     .locals 4
 
-    iget-object v0, p0, Lrx/internal/a/w$b;->bIb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIl:Lrx/internal/d/a;
 
-    iget-object v1, p0, Lrx/internal/a/w$b;->bHZ:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/a/w$b;->bIj: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIk: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;->bIb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIl: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;->bHZ:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIj: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIk: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;->bIb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIl: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;->bHZ:Lrx/Scheduler$Worker;
+    iget-object p1, p0, Lrx/internal/a/w$b;->bIj: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIk: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;->bIa:Ljava/util/concurrent/atomic/AtomicLong;
+    iget-object v2, p0, Lrx/internal/a/w$b;->bIk: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;->bIb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bIl: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;->bId:J
+    iget-wide v0, p0, Lrx/internal/a/w$b;->bIn:J
 
     add-long/2addr v0, v3
 
-    iput-wide v0, p0, Lrx/internal/a/w$b;->bId:J
+    iput-wide v0, p0, Lrx/internal/a/w$b;->bIn: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;->bHc:Lrx/internal/b/a;
+    iget-object v0, p0, Lrx/internal/a/w$b;->bHm: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 409edd369d..edcf618bf9 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 bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -36,7 +36,7 @@
     .end annotation
 .end field
 
-.field final bHY:Lrx/Observable;
+.field final bIi: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;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->bHe: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;->bHY:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/w;->bIi: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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
 
     move-result-object v5
 
-    iget-object v6, p0, Lrx/internal/a/w;->bHY:Lrx/Observable;
+    iget-object v6, p0, Lrx/internal/a/w;->bIi: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;->bIc:Lrx/internal/d/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->bIm:Lrx/internal/d/a;
 
     invoke-virtual {p1, v0}, Lrx/Subscriber;->add(Lrx/Subscription;)V
 
-    iget-object v0, v7, Lrx/internal/a/w$b;->bHc:Lrx/internal/b/a;
+    iget-object v0, v7, Lrx/internal/a/w$b;->bHm: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;->aN(J)V
 
-    iget-object p1, p0, Lrx/internal/a/w;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/w;->bHe: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 ba28122d85..e55f8fa72c 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 bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field final synthetic bIg:Lrx/internal/a/x;
+.field final synthetic bIq: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;->bIg:Lrx/internal/a/x;
+    iput-object p1, p0, Lrx/internal/a/x$1;->bIq:Lrx/internal/a/x;
 
-    iput-object p2, p0, Lrx/internal/a/x$1;->bHx:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/x$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/x$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/x$1;->bHH: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 f868db3b3a..b687cc0e76 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;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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 8f36818255..85eb5efcc1 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 final synthetic bHx:Lrx/Subscriber;
+.field final synthetic bHH:Lrx/Subscriber;
 
-.field bIi:J
+.field bIs:J
 
-.field final synthetic bIj:Lrx/internal/a/y;
+.field final synthetic bIt: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;->bIj:Lrx/internal/a/y;
+    iput-object p1, p0, Lrx/internal/a/y$1;->bIt:Lrx/internal/a/y;
 
-    iput-object p2, p0, Lrx/internal/a/y$1;->bHx:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/internal/a/y$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/internal/a/y$1;->bHH:Lrx/Subscriber;
 
-    iget-wide v1, p0, Lrx/internal/a/y$1;->bIi:J
+    iget-wide v1, p0, Lrx/internal/a/y$1;->bIs:J
 
     const-wide/16 v3, 0x1
 
     add-long/2addr v3, v1
 
-    iput-wide v3, p0, Lrx/internal/a/y$1;->bIi:J
+    iput-wide v3, p0, Lrx/internal/a/y$1;->bIs: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;->bHx:Lrx/Subscriber;
+    iget-object v1, p0, Lrx/internal/a/y$1;->bHH: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;->bHx:Lrx/Subscriber;
+    iget-object v2, p0, Lrx/internal/a/y$1;->bHH: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 26b74d9602..8818fbfee3 100644
--- a/com.discord/smali_classes2/rx/internal/a/y.smali
+++ b/com.discord/smali_classes2/rx/internal/a/y.smali
@@ -18,7 +18,7 @@
 
 
 # instance fields
-.field final bIh:J
+.field final bIr:J
 
 .field final initialDelay:J
 
@@ -35,7 +35,7 @@
 
     iput-wide p1, p0, Lrx/internal/a/y;->initialDelay:J
 
-    iput-wide p3, p0, Lrx/internal/a/y;->bIh:J
+    iput-wide p3, p0, Lrx/internal/a/y;->bIr:J
 
     iput-object p5, p0, Lrx/internal/a/y;->unit:Ljava/util/concurrent/TimeUnit;
 
@@ -53,7 +53,7 @@
 
     iget-object v0, p0, Lrx/internal/a/y;->scheduler:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()Lrx/Scheduler$Worker;
 
     move-result-object v1
 
@@ -65,7 +65,7 @@
 
     iget-wide v3, p0, Lrx/internal/a/y;->initialDelay:J
 
-    iget-wide v5, p0, Lrx/internal/a/y;->bIh:J
+    iget-wide v5, p0, Lrx/internal/a/y;->bIr:J
 
     iget-object v7, p0, Lrx/internal/a/y;->unit:Ljava/util/concurrent/TimeUnit;
 
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 252074ccd3..c4c2fa93c8 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 bIk:Lrx/functions/b;
+.field final bIu:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bIl:Lrx/functions/b;
+.field final bIv: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;->bIk:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z$a;->bIu:Lrx/functions/b;
 
-    iput-object p4, p0, Lrx/internal/a/z$a;->bIl:Lrx/functions/b;
+    iput-object p4, p0, Lrx/internal/a/z$a;->bIv: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;->bIk:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/a/z$a;->bIu: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;->bIl:Lrx/functions/b;
+    iget-object v1, p0, Lrx/internal/a/z$a;->bIv: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 53c0529a9b..062f1361f9 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 bGU:Lrx/Observable;
+.field final bHe:Lrx/Observable;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/Observable<",
@@ -44,7 +44,7 @@
     .end annotation
 .end field
 
-.field final bIk:Lrx/functions/b;
+.field final bIu:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -53,7 +53,7 @@
     .end annotation
 .end field
 
-.field final bIl:Lrx/functions/b;
+.field final bIv:Lrx/functions/b;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/b<",
@@ -62,7 +62,7 @@
     .end annotation
 .end field
 
-.field final bIm:Lrx/functions/Func0;
+.field final bIw: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;->bGU:Lrx/Observable;
+    iput-object p1, p0, Lrx/internal/a/z;->bHe:Lrx/Observable;
 
-    iput-object p2, p0, Lrx/internal/a/z;->bIk:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/a/z;->bIu:Lrx/functions/b;
 
-    iput-object p3, p0, Lrx/internal/a/z;->bIl:Lrx/functions/b;
+    iput-object p3, p0, Lrx/internal/a/z;->bIv:Lrx/functions/b;
 
-    iput-object p0, p0, Lrx/internal/a/z;->bIm:Lrx/functions/Func0;
+    iput-object p0, p0, Lrx/internal/a/z;->bIw: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;->bIm:Lrx/functions/Func0;
+    iget-object v0, p0, Lrx/internal/a/z;->bIw: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;->bIk:Lrx/functions/b;
+    iget-object v2, p0, Lrx/internal/a/z;->bIu:Lrx/functions/b;
 
-    iget-object v3, p0, Lrx/internal/a/z;->bIl:Lrx/functions/b;
+    iget-object v3, p0, Lrx/internal/a/z;->bIv: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;->bGU:Lrx/Observable;
+    iget-object p1, p0, Lrx/internal/a/z;->bHe: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 e7c49174a9..82be2ed1e9 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 bLf:Lrx/Producer;
+.field static final bLp:Lrx/Producer;
 
 
 # instance fields
-.field bKa:J
+.field bKk:J
 
-.field bLc:Lrx/Producer;
+.field bLm:Lrx/Producer;
 
-.field bLd:J
+.field bLn:J
 
-.field bLe:Lrx/Producer;
+.field bLo: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;->bLf:Lrx/Producer;
+    sput-object v0, Lrx/internal/b/a;->bLp:Lrx/Producer;
 
     return-void
 .end method
@@ -45,7 +45,7 @@
     return-void
 .end method
 
-.method private Jr()V
+.method private Ju()V
     .locals 13
 
     :cond_0
@@ -53,11 +53,11 @@
     monitor-enter p0
 
     :try_start_0
-    iget-wide v0, p0, Lrx/internal/b/a;->bKa:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bKk:J
 
-    iget-wide v2, p0, Lrx/internal/b/a;->bLd:J
+    iget-wide v2, p0, Lrx/internal/b/a;->bLn:J
 
-    iget-object v4, p0, Lrx/internal/b/a;->bLe:Lrx/Producer;
+    iget-object v4, p0, Lrx/internal/b/a;->bLo:Lrx/Producer;
 
     const-wide/16 v5, 0x0
 
@@ -80,13 +80,13 @@
     return-void
 
     :cond_1
-    iput-wide v5, p0, Lrx/internal/b/a;->bKa:J
+    iput-wide v5, p0, Lrx/internal/b/a;->bKk:J
 
-    iput-wide v5, p0, Lrx/internal/b/a;->bLd:J
+    iput-wide v5, p0, Lrx/internal/b/a;->bLn:J
 
     const/4 v7, 0x0
 
-    iput-object v7, p0, Lrx/internal/b/a;->bLe:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->bLo: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;->bLf:Lrx/Producer;
+    sget-object v0, Lrx/internal/b/a;->bLp:Lrx/Producer;
 
     if-ne v4, v0, :cond_6
 
-    iput-object v7, p0, Lrx/internal/b/a;->bLc:Lrx/Producer;
+    iput-object v7, p0, Lrx/internal/b/a;->bLm:Lrx/Producer;
 
     goto :goto_0
 
     :cond_6
-    iput-object v4, p0, Lrx/internal/b/a;->bLc:Lrx/Producer;
+    iput-object v4, p0, Lrx/internal/b/a;->bLm: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;->bLc:Lrx/Producer;
+    iget-object v2, p0, Lrx/internal/b/a;->bLm:Lrx/Producer;
 
     if-eqz v2, :cond_0
 
@@ -205,11 +205,11 @@
 
     if-eqz v2, :cond_0
 
-    iget-wide v0, p0, Lrx/internal/b/a;->bLd:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bLn:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->bLd:J
+    iput-wide v0, p0, Lrx/internal/b/a;->bLn:J
 
     monitor-exit p0
 
@@ -254,7 +254,7 @@
 
     :cond_2
     :goto_0
-    invoke-direct {p0}, Lrx/internal/b/a;->Jr()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Ju()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;->bKa:J
+    iget-wide v0, p0, Lrx/internal/b/a;->bKk:J
 
     add-long/2addr v0, p1
 
-    iput-wide v0, p0, Lrx/internal/b/a;->bKa:J
+    iput-wide v0, p0, Lrx/internal/b/a;->bKk: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;->bLc:Lrx/Producer;
+    iget-object v0, p0, Lrx/internal/b/a;->bLm: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;->Jr()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Ju()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;->bLf:Lrx/Producer;
+    sget-object p1, Lrx/internal/b/a;->bLp:Lrx/Producer;
 
     :cond_0
-    iput-object p1, p0, Lrx/internal/b/a;->bLe:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->bLo: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;->bLc:Lrx/Producer;
+    iput-object p1, p0, Lrx/internal/b/a;->bLm: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;->Jr()V
+    invoke-direct {p0}, Lrx/internal/b/a;->Ju()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 4dc65eca4e..93a0042fb2 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 bLq:Ljava/util/concurrent/ThreadFactory;
+.field final synthetic bLA:Ljava/util/concurrent/ThreadFactory;
 
-.field final synthetic bLr:Lrx/internal/c/a$a;
+.field final synthetic bLB: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;->bLr:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$1;->bLB:Lrx/internal/c/a$a;
 
-    iput-object p2, p0, Lrx/internal/c/a$a$1;->bLq:Ljava/util/concurrent/ThreadFactory;
+    iput-object p2, p0, Lrx/internal/c/a$a$1;->bLA: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;->bLq:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a$a$1;->bLA: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 3f933969e8..38ad2b42dc 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 bLr:Lrx/internal/c/a$a;
+.field final synthetic bLB: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;->bLr:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$a$2;->bLB: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;->bLr:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$a$2;->bLB:Lrx/internal/c/a$a;
 
-    iget-object v1, v0, Lrx/internal/c/a$a;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v1, v0, Lrx/internal/c/a$a;->bLw: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;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v3, v0, Lrx/internal/c/a$a;->bLw: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;->bLy:J
+    iget-wide v5, v4, Lrx/internal/c/a$c;->bLI:J
 
     cmp-long v7, v5, v1
 
     if-gtz v7, :cond_1
 
-    iget-object v5, v0, Lrx/internal/c/a$a;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v5, v0, Lrx/internal/c/a$a;->bLw: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;->bLn:Lrx/subscriptions/CompositeSubscription;
+    iget-object v5, v0, Lrx/internal/c/a$a;->bLx: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 94657435b6..34cf985b83 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 bLl:J
+.field final bLv:J
 
-.field final bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bLw:Ljava/util/concurrent/ConcurrentLinkedQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/ConcurrentLinkedQueue<",
@@ -27,11 +27,11 @@
     .end annotation
 .end field
 
-.field final bLn:Lrx/subscriptions/CompositeSubscription;
+.field final bLx:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bLo:Ljava/util/concurrent/ScheduledExecutorService;
+.field private final bLy:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private final bLp:Ljava/util/concurrent/Future;
+.field private final bLz: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 bdc:Ljava/util/concurrent/ThreadFactory;
+.field private final bdm: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;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/a$a;->bdm: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;->bLl:J
+    iput-wide p2, p0, Lrx/internal/c/a$a;->bLv: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;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bLw: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;->bLn:Lrx/subscriptions/CompositeSubscription;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bLx: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;->bLl:J
+    iget-wide v4, p0, Lrx/internal/c/a$a;->bLv: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;->bLo:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/a$a;->bLy:Ljava/util/concurrent/ScheduledExecutorService;
 
-    iput-object p2, p0, Lrx/internal/c/a$a;->bLp:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/a$a;->bLz:Ljava/util/concurrent/Future;
 
     return-void
 .end method
 
 
 # virtual methods
-.method final JG()Lrx/internal/c/a$c;
+.method final JJ()Lrx/internal/c/a$c;
     .locals 2
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLn:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLx: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;->bLi:Lrx/internal/c/a$c;
+    sget-object v0, Lrx/internal/c/a;->bLs:Lrx/internal/c/a$c;
 
     return-object v0
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLw: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;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLw: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;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bdm: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;->bLn:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bLx: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;->bLp:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLz:Ljava/util/concurrent/Future;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLp:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLz: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;->bLo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLy:Ljava/util/concurrent/ScheduledExecutorService;
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/internal/c/a$a;->bLo:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLy: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;->bLn:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$a;->bLx: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;->bLn:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/a$a;->bLx: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 7379a50219..d8b0a01aa3 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 bLw:Lrx/functions/Action0;
+.field final synthetic bLG:Lrx/functions/Action0;
 
-.field final synthetic bLx:Lrx/internal/c/a$b;
+.field final synthetic bLH: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;->bLx:Lrx/internal/c/a$b;
+    iput-object p1, p0, Lrx/internal/c/a$b$1;->bLH:Lrx/internal/c/a$b;
 
-    iput-object p2, p0, Lrx/internal/c/a$b$1;->bLw:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/a$b$1;->bLG: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;->bLx:Lrx/internal/c/a$b;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->bLH: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;->bLw:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/a$b$1;->bLG: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 6ecd5eea57..ca5fd810e4 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 bLs:Lrx/subscriptions/CompositeSubscription;
+.field private final bLC:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bLt:Lrx/internal/c/a$a;
+.field private final bLD:Lrx/internal/c/a$a;
 
-.field private final bLu:Lrx/internal/c/a$c;
+.field private final bLE:Lrx/internal/c/a$c;
 
-.field final bLv:Ljava/util/concurrent/atomic/AtomicBoolean;
+.field final bLF: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;->bLs:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/a$b;->bLC:Lrx/subscriptions/CompositeSubscription;
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->bLt:Lrx/internal/c/a$a;
+    iput-object p1, p0, Lrx/internal/c/a$b;->bLD: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;->bLv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iput-object v0, p0, Lrx/internal/c/a$b;->bLF:Ljava/util/concurrent/atomic/AtomicBoolean;
 
-    invoke-virtual {p1}, Lrx/internal/c/a$a;->JG()Lrx/internal/c/a$c;
+    invoke-virtual {p1}, Lrx/internal/c/a$a;->JJ()Lrx/internal/c/a$c;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/a$b;->bLu:Lrx/internal/c/a$c;
+    iput-object p1, p0, Lrx/internal/c/a$b;->bLE: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;->bLs:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLC: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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/a$b;->bLu:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLE: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;->bLs:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->bLC:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p2, p1}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p2, p0, Lrx/internal/c/a$b;->bLs:Lrx/subscriptions/CompositeSubscription;
+    iget-object p2, p0, Lrx/internal/c/a$b;->bLC: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;->bLt:Lrx/internal/c/a$a;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLD:Lrx/internal/c/a$a;
 
-    iget-object v1, p0, Lrx/internal/c/a$b;->bLu:Lrx/internal/c/a$c;
+    iget-object v1, p0, Lrx/internal/c/a$b;->bLE: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;->bLl:J
+    iget-wide v4, v0, Lrx/internal/c/a$a;->bLv:J
 
     add-long/2addr v2, v4
 
-    iput-wide v2, v1, Lrx/internal/c/a$c;->bLy:J
+    iput-wide v2, v1, Lrx/internal/c/a$c;->bLI:J
 
-    iget-object v0, v0, Lrx/internal/c/a$a;->bLm:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, v0, Lrx/internal/c/a$a;->bLw: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;->bLs:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLC: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;->bLv:Ljava/util/concurrent/atomic/AtomicBoolean;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLF: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;->bLu:Lrx/internal/c/a$c;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLE: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;->bLs:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/a$b;->bLC: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 054f93f9a4..1e545a544a 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 bLy:J
+.field bLI:J
 
 
 # direct methods
@@ -26,7 +26,7 @@
 
     const-wide/16 v0, 0x0
 
-    iput-wide v0, p0, Lrx/internal/c/a$c;->bLy:J
+    iput-wide v0, p0, Lrx/internal/c/a$c;->bLI: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 2d4811decf..d31934a753 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 bLg:J
+.field private static final bLq:J
 
-.field private static final bLh:Ljava/util/concurrent/TimeUnit;
+.field private static final bLr:Ljava/util/concurrent/TimeUnit;
 
-.field static final bLi:Lrx/internal/c/a$c;
+.field static final bLs:Lrx/internal/c/a$c;
 
-.field static final bLj:Lrx/internal/c/a$a;
+.field static final bLt:Lrx/internal/c/a$a;
 
 
 # instance fields
-.field final bLk:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bLu: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 bdc:Ljava/util/concurrent/ThreadFactory;
+.field final bdm: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;->bLh:Ljava/util/concurrent/TimeUnit;
+    sput-object v0, Lrx/internal/c/a;->bLr:Ljava/util/concurrent/TimeUnit;
 
     new-instance v0, Lrx/internal/c/a$c;
 
-    sget-object v1, Lrx/internal/util/j;->bMW:Ljava/util/concurrent/ThreadFactory;
+    sget-object v1, Lrx/internal/util/j;->bNg: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;->bLi:Lrx/internal/c/a$c;
+    sput-object v0, Lrx/internal/c/a;->bLs: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;->bLj:Lrx/internal/c/a$a;
+    sput-object v0, Lrx/internal/c/a;->bLt: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;->bLg:J
+    sput-wide v0, Lrx/internal/c/a;->bLq:J
 
     return-void
 .end method
@@ -94,29 +94,29 @@
 
     invoke-direct {p0}, Lrx/Scheduler;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/a;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/a;->bdm:Ljava/util/concurrent/ThreadFactory;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/a;->bLj:Lrx/internal/c/a$a;
+    sget-object v0, Lrx/internal/c/a;->bLt: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;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/a;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/a$a;
 
-    iget-object v0, p0, Lrx/internal/c/a;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/a;->bdm:Ljava/util/concurrent/ThreadFactory;
 
-    sget-wide v1, Lrx/internal/c/a;->bLg:J
+    sget-wide v1, Lrx/internal/c/a;->bLq:J
 
-    sget-object v3, Lrx/internal/c/a;->bLh:Ljava/util/concurrent/TimeUnit;
+    sget-object v3, Lrx/internal/c/a;->bLr: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;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/a;->bLj:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->bLt: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 IV()Lrx/Scheduler$Worker;
+.method public final IY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/a$b;
 
-    iget-object v1, p0, Lrx/internal/c/a;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/a;->bLu: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;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/a;->bLu: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;->bLj:Lrx/internal/c/a$a;
+    sget-object v1, Lrx/internal/c/a;->bLt:Lrx/internal/c/a$a;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/a;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/a;->bLu: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 e222591c5b..f1b1803893 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 bLG:Lrx/internal/c/b$a;
+.field final synthetic bLG:Lrx/functions/Action0;
 
-.field final synthetic bLw:Lrx/functions/Action0;
+.field final synthetic bLQ:Lrx/internal/c/b$a;
 
 
 # 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;->bLG:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$1;->bLQ:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$1;->bLw:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$1;->bLG: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;->bLG:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->bLQ: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;->bLw:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$1;->bLG: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 b4fd49b9e0..512fa46db7 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 bLG:Lrx/internal/c/b$a;
+.field final synthetic bLG:Lrx/functions/Action0;
 
-.field final synthetic bLw:Lrx/functions/Action0;
+.field final synthetic bLQ:Lrx/internal/c/b$a;
 
 
 # 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;->bLG:Lrx/internal/c/b$a;
+    iput-object p1, p0, Lrx/internal/c/b$a$2;->bLQ:Lrx/internal/c/b$a;
 
-    iput-object p2, p0, Lrx/internal/c/b$a$2;->bLw:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/c/b$a$2;->bLG: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;->bLG:Lrx/internal/c/b$a;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->bLQ: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;->bLw:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/b$a$2;->bLG: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 71eeee761c..b016c94104 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 bLC:Lrx/internal/util/SubscriptionList;
+.field private final bLM:Lrx/internal/util/SubscriptionList;
 
-.field private final bLD:Lrx/subscriptions/CompositeSubscription;
+.field private final bLN:Lrx/subscriptions/CompositeSubscription;
 
-.field private final bLE:Lrx/internal/util/SubscriptionList;
+.field private final bLO:Lrx/internal/util/SubscriptionList;
 
-.field private final bLF:Lrx/internal/c/b$c;
+.field private final bLP:Lrx/internal/c/b$c;
 
 
 # direct methods
@@ -34,13 +34,13 @@
 
     invoke-direct {v0}, Lrx/internal/util/SubscriptionList;-><init>()V
 
-    iput-object v0, p0, Lrx/internal/c/b$a;->bLC:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bLM: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;->bLD:Lrx/subscriptions/CompositeSubscription;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bLN: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;->bLC:Lrx/internal/util/SubscriptionList;
+    iget-object v2, p0, Lrx/internal/c/b$a;->bLM:Lrx/internal/util/SubscriptionList;
 
     const/4 v3, 0x0
 
     aput-object v2, v1, v3
 
-    iget-object v2, p0, Lrx/internal/c/b$a;->bLD:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/b$a;->bLN: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;->bLE:Lrx/internal/util/SubscriptionList;
+    iput-object v0, p0, Lrx/internal/c/b$a;->bLO:Lrx/internal/util/SubscriptionList;
 
-    iput-object p1, p0, Lrx/internal/c/b$a;->bLF:Lrx/internal/c/b$c;
+    iput-object p1, p0, Lrx/internal/c/b$a;->bLP:Lrx/internal/c/b$c;
 
     return-void
 .end method
@@ -80,20 +80,20 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->bLF:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLP: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;->bLD:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/b$a;->bLN: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->pC: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->pC: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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p1
 
     return-object p1
 
     :cond_0
-    iget-object v0, p0, Lrx/internal/c/b$a;->bLF:Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLP: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;->bLC:Lrx/internal/util/SubscriptionList;
+    iget-object p1, p0, Lrx/internal/c/b$a;->bLM: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, v0, Lrx/internal/c/h;->pC: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;->bLE:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLO: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;->bLE:Lrx/internal/util/SubscriptionList;
+    iget-object v0, p0, Lrx/internal/c/b$a;->bLO: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 abba3dfc98..48176c228c 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 bLH:I
+.field final bLR:I
 
-.field final bLI:[Lrx/internal/c/b$c;
+.field final bLS:[Lrx/internal/c/b$c;
 
-.field bLJ:J
+.field bLT:J
 
 
 # direct methods
@@ -28,18 +28,18 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput p2, p0, Lrx/internal/c/b$b;->bLH:I
+    iput p2, p0, Lrx/internal/c/b$b;->bLR:I
 
     new-array v0, p2, [Lrx/internal/c/b$c;
 
-    iput-object v0, p0, Lrx/internal/c/b$b;->bLI:[Lrx/internal/c/b$c;
+    iput-object v0, p0, Lrx/internal/c/b$b;->bLS:[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;->bLI:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->bLS:[Lrx/internal/c/b$c;
 
     new-instance v2, Lrx/internal/c/b$c;
 
@@ -57,27 +57,27 @@
 
 
 # virtual methods
-.method public final JH()Lrx/internal/c/b$c;
+.method public final JK()Lrx/internal/c/b$c;
     .locals 6
 
-    iget v0, p0, Lrx/internal/c/b$b;->bLH:I
+    iget v0, p0, Lrx/internal/c/b$b;->bLR:I
 
     if-nez v0, :cond_0
 
-    sget-object v0, Lrx/internal/c/b;->bLA:Lrx/internal/c/b$c;
+    sget-object v0, Lrx/internal/c/b;->bLK:Lrx/internal/c/b$c;
 
     return-object v0
 
     :cond_0
-    iget-object v1, p0, Lrx/internal/c/b$b;->bLI:[Lrx/internal/c/b$c;
+    iget-object v1, p0, Lrx/internal/c/b$b;->bLS:[Lrx/internal/c/b$c;
 
-    iget-wide v2, p0, Lrx/internal/c/b$b;->bLJ:J
+    iget-wide v2, p0, Lrx/internal/c/b$b;->bLT:J
 
     const-wide/16 v4, 0x1
 
     add-long/2addr v4, v2
 
-    iput-wide v4, p0, Lrx/internal/c/b$b;->bLJ:J
+    iput-wide v4, p0, Lrx/internal/c/b$b;->bLT: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;->bLI:[Lrx/internal/c/b$c;
+    iget-object v0, p0, Lrx/internal/c/b$b;->bLS:[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 951099165b..4b74ea0695 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 bLA:Lrx/internal/c/b$c;
+.field static final bLJ:I
 
-.field static final bLB:Lrx/internal/c/b$b;
+.field static final bLK:Lrx/internal/c/b$c;
 
-.field static final bLz:I
+.field static final bLL:Lrx/internal/c/b$b;
 
 
 # instance fields
-.field public final bLk:Ljava/util/concurrent/atomic/AtomicReference;
+.field public final bLu: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 bdc:Ljava/util/concurrent/ThreadFactory;
+.field final bdm:Ljava/util/concurrent/ThreadFactory;
 
 
 # direct methods
@@ -70,15 +70,15 @@
     move v1, v2
 
     :cond_1
-    sput v1, Lrx/internal/c/b;->bLz:I
+    sput v1, Lrx/internal/c/b;->bLJ:I
 
     new-instance v1, Lrx/internal/c/b$c;
 
-    sget-object v2, Lrx/internal/util/j;->bMW:Ljava/util/concurrent/ThreadFactory;
+    sget-object v2, Lrx/internal/util/j;->bNg: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;->bLA:Lrx/internal/c/b$c;
+    sput-object v1, Lrx/internal/c/b;->bLK: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;->bLB:Lrx/internal/c/b$b;
+    sput-object v1, Lrx/internal/c/b;->bLL: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;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/b;->bdm:Ljava/util/concurrent/ThreadFactory;
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v0, Lrx/internal/c/b;->bLB:Lrx/internal/c/b$b;
+    sget-object v0, Lrx/internal/c/b;->bLL: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;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object p1, p0, Lrx/internal/c/b;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
 
     new-instance p1, Lrx/internal/c/b$b;
 
-    iget-object v0, p0, Lrx/internal/c/b;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iget-object v0, p0, Lrx/internal/c/b;->bdm:Ljava/util/concurrent/ThreadFactory;
 
-    sget v1, Lrx/internal/c/b;->bLz:I
+    sget v1, Lrx/internal/c/b;->bLJ: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;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->bLu:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v1, Lrx/internal/c/b;->bLB:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->bLL: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 IV()Lrx/Scheduler$Worker;
+.method public final IY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/b$a;
 
-    iget-object v1, p0, Lrx/internal/c/b;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v1, p0, Lrx/internal/c/b;->bLu: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;->JH()Lrx/internal/c/b$c;
+    invoke-virtual {v1}, Lrx/internal/c/b$b;->JK()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;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/b;->bLu: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;->bLB:Lrx/internal/c/b$b;
+    sget-object v1, Lrx/internal/c/b;->bLL:Lrx/internal/c/b$b;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/b;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/b;->bLu: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 61abda33cd..a2a67efa09 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 bLM:Lrx/subscriptions/b;
+.field final synthetic bLW:Lrx/subscriptions/b;
 
-.field final synthetic bLN:Lrx/internal/c/c$a;
+.field final synthetic bLX: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;->bLN:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$1;->bLX:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$1;->bLM:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$1;->bLW: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;->bLN:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$1;->bLX:Lrx/internal/c/c$a;
 
-    iget-object v0, v0, Lrx/internal/c/c$a;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, v0, Lrx/internal/c/c$a;->bLU:Lrx/subscriptions/CompositeSubscription;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$1;->bLM:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$1;->bLW: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 0301472e66..e53790d4df 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 bLM:Lrx/subscriptions/b;
+.field final synthetic bLW:Lrx/subscriptions/b;
 
-.field final synthetic bLN:Lrx/internal/c/c$a;
+.field final synthetic bLX:Lrx/internal/c/c$a;
 
-.field final synthetic bLO:Lrx/functions/Action0;
+.field final synthetic bLY:Lrx/functions/Action0;
 
-.field final synthetic bLP:Lrx/Subscription;
+.field final synthetic bLZ: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;->bLN:Lrx/internal/c/c$a;
+    iput-object p1, p0, Lrx/internal/c/c$a$2;->bLX:Lrx/internal/c/c$a;
 
-    iput-object p2, p0, Lrx/internal/c/c$a$2;->bLM:Lrx/subscriptions/b;
+    iput-object p2, p0, Lrx/internal/c/c$a$2;->bLW:Lrx/subscriptions/b;
 
-    iput-object p3, p0, Lrx/internal/c/c$a$2;->bLO:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/c/c$a$2;->bLY:Lrx/functions/Action0;
 
-    iput-object p4, p0, Lrx/internal/c/c$a$2;->bLP:Lrx/Subscription;
+    iput-object p4, p0, Lrx/internal/c/c$a$2;->bLZ: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;->bLM:Lrx/subscriptions/b;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->bLW: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;->bLN:Lrx/internal/c/c$a;
+    iget-object v0, p0, Lrx/internal/c/c$a$2;->bLX:Lrx/internal/c/c$a;
 
-    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLO:Lrx/functions/Action0;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLY: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;->bLM:Lrx/subscriptions/b;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLW: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;->bLP:Lrx/Subscription;
+    iget-object v1, p0, Lrx/internal/c/c$a$2;->bLZ: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 63f92f1297..56830cfcce 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 bLK:Lrx/subscriptions/CompositeSubscription;
+.field final bLU:Lrx/subscriptions/CompositeSubscription;
 
-.field final bLL:Ljava/util/concurrent/ScheduledExecutorService;
+.field final bLV:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field final bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+.field final bmF: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bmF: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bLU:Lrx/subscriptions/CompositeSubscription;
 
-    invoke-static {}, Lrx/internal/c/d;->JI()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/d;->JL()Ljava/util/concurrent/ScheduledExecutorService;
 
     move-result-object p1
 
-    iput-object p1, p0, Lrx/internal/c/c$a;->bLL:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/c$a;->bLV:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
@@ -96,7 +96,7 @@
 
     if-eqz v0, :cond_1
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v2, p0, Lrx/internal/c/c$a;->bLU: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;->bLL:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bLV: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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bLU: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bLU:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {p1, v0}, Lrx/subscriptions/CompositeSubscription;->add(Lrx/Subscription;)V
 
-    iget-object p1, p0, Lrx/internal/c/c$a;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object p1, p0, Lrx/internal/c/c$a;->bmF: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bLU: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bLU: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bLU: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmF: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmF: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v1, p0, Lrx/internal/c/c$a;->bLU: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;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmF: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;->bLK:Lrx/subscriptions/CompositeSubscription;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bLU:Lrx/subscriptions/CompositeSubscription;
 
     invoke-virtual {v0}, Lrx/subscriptions/CompositeSubscription;->unsubscribe()V
 
-    iget-object v0, p0, Lrx/internal/c/c$a;->bmv:Ljava/util/concurrent/ConcurrentLinkedQueue;
+    iget-object v0, p0, Lrx/internal/c/c$a;->bmF: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 71b9b1cb62..aa0a5d7adf 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 IV()Lrx/Scheduler$Worker;
+.method public final IY()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 abbb3a7f38..6ab8b015cb 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 bLQ:[Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final bMa:[Ljava/util/concurrent/ScheduledExecutorService;
 
-.field private static final bLR:Ljava/util/concurrent/ScheduledExecutorService;
+.field private static final bMb:Ljava/util/concurrent/ScheduledExecutorService;
 
-.field public static final bLS:Lrx/internal/c/d;
+.field public static final bMc:Lrx/internal/c/d;
 
-.field private static bLU:I
+.field private static bMe:I
 
 
 # instance fields
-.field private final bLT:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bMd: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;->bLQ:[Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v1, Lrx/internal/c/d;->bMa:[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;->bLR:Ljava/util/concurrent/ScheduledExecutorService;
+    sput-object v0, Lrx/internal/c/d;->bMb: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;->bLS:Lrx/internal/c/d;
+    sput-object v0, Lrx/internal/c/d;->bMc: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;->bLQ:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bMa:[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;->bLT:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/c/d;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-direct {p0}, Lrx/internal/c/d;->start()V
 
     return-void
 .end method
 
-.method public static JI()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static JL()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 3
 
-    sget-object v0, Lrx/internal/c/d;->bLS:Lrx/internal/c/d;
+    sget-object v0, Lrx/internal/c/d;->bMc:Lrx/internal/c/d;
 
-    iget-object v0, v0, Lrx/internal/c/d;->bLT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/d;->bMd: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;->bLQ:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/c/d;->bLR:Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v0, Lrx/internal/c/d;->bMb:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-object v0
 
     :cond_0
-    sget v1, Lrx/internal/c/d;->bLU:I
+    sget v1, Lrx/internal/c/d;->bMe:I
 
     add-int/lit8 v1, v1, 0x1
 
@@ -107,7 +107,7 @@
     const/4 v1, 0x0
 
     :cond_1
-    sput v1, Lrx/internal/c/d;->bLU:I
+    sput v1, Lrx/internal/c/d;->bMe:I
 
     aget-object v0, v0, v1
 
@@ -148,7 +148,7 @@
     :goto_0
     if-ge v3, v0, :cond_2
 
-    invoke-static {}, Lrx/internal/c/e;->JJ()Ljava/util/concurrent/ScheduledExecutorService;
+    invoke-static {}, Lrx/internal/c/e;->JM()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;->bLT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->bMd:Ljava/util/concurrent/atomic/AtomicReference;
 
-    sget-object v3, Lrx/internal/c/d;->bLQ:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v3, Lrx/internal/c/d;->bMa:[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;->bLT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/c/d;->bMd: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;->bLQ:[Ljava/util/concurrent/ScheduledExecutorService;
+    sget-object v1, Lrx/internal/c/d;->bMa:[Ljava/util/concurrent/ScheduledExecutorService;
 
     if-ne v0, v1, :cond_1
 
     return-void
 
     :cond_1
-    iget-object v2, p0, Lrx/internal/c/d;->bLT:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v2, p0, Lrx/internal/c/d;->bMd: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 8926a1196b..d195a0f8f0 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 bLV:Lrx/internal/util/j;
+.field static final bMf:Lrx/internal/util/j;
 
-.field private static final synthetic bLW:[Lrx/internal/c/e;
+.field private static final synthetic bMg:[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;->bLW:[Lrx/internal/c/e;
+    sput-object v0, Lrx/internal/c/e;->bMg:[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;->bLV:Lrx/internal/util/j;
+    sput-object v0, Lrx/internal/c/e;->bMf:Lrx/internal/util/j;
 
     return-void
 .end method
 
-.method public static JJ()Ljava/util/concurrent/ScheduledExecutorService;
+.method public static JM()Ljava/util/concurrent/ScheduledExecutorService;
     .locals 2
 
-    invoke-static {}, Lrx/c/c;->Ke()Lrx/functions/Func0;
+    invoke-static {}, Lrx/c/c;->Kh()Lrx/functions/Func0;
 
     move-result-object v0
 
@@ -51,7 +51,7 @@
 
     const/4 v0, 0x1
 
-    sget-object v1, Lrx/internal/c/e;->bLV:Lrx/internal/util/j;
+    sget-object v1, Lrx/internal/c/e;->bMf: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;->bLW:[Lrx/internal/c/e;
+    sget-object v0, Lrx/internal/c/e;->bMg:[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 1e65c53ced..404b80d1e4 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 bLY:Lrx/subscriptions/a;
+.field final bMi:Lrx/subscriptions/a;
 
-.field final synthetic bLZ:Lrx/internal/c/f;
+.field final synthetic bMj: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;->bLZ:Lrx/internal/c/f;
+    iput-object p1, p0, Lrx/internal/c/f$a;->bMj: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;->bLY:Lrx/subscriptions/a;
+    iput-object p1, p0, Lrx/internal/c/f$a;->bMi:Lrx/subscriptions/a;
 
     return-void
 .end method
@@ -71,7 +71,7 @@
 
     invoke-interface {p1}, Lrx/functions/Action0;->call()V
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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;->bLY:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->bMi: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;->bLY:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/f$a;->bMi: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 c8820bb737..b1890f36c1 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 bLX:Lrx/internal/c/f;
+.field public static final bMh: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;->bLX:Lrx/internal/c/f;
+    sput-object v0, Lrx/internal/c/f;->bMh:Lrx/internal/c/f;
 
     return-void
 .end method
@@ -38,7 +38,7 @@
 
 
 # virtual methods
-.method public final IV()Lrx/Scheduler$Worker;
+.method public final IY()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 22aaef2f20..ff30865277 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 bdc:Ljava/util/concurrent/ThreadFactory;
+.field private final bdm: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;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iput-object p1, p0, Lrx/internal/c/g;->bdm:Ljava/util/concurrent/ThreadFactory;
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final IV()Lrx/Scheduler$Worker;
+.method public final IY()Lrx/Scheduler$Worker;
     .locals 2
 
     new-instance v0, Lrx/internal/c/h;
 
-    iget-object v1, p0, Lrx/internal/c/g;->bdc:Ljava/util/concurrent/ThreadFactory;
+    iget-object v1, p0, Lrx/internal/c/g;->bdm: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 6eee8547b6..0b77c6ba4b 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;->JK()V
+    invoke-static {}, Lrx/internal/c/h;->JN()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 8ed46e24d4..caa5518156 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 bMb:Z
+.field private static final bMl:Z
 
-.field public static final bMc:I
+.field public static final bMm:I
 
-.field private static final bMd:Ljava/util/concurrent/ConcurrentHashMap;
+.field private static final bMn: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 bMe:Ljava/util/concurrent/atomic/AtomicReference;
+.field private static final bMo: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 bMf:Ljava/lang/Object;
+.field private static volatile bMp:Ljava/lang/Object;
 
-.field private static final bMg:Ljava/lang/Object;
+.field private static final bMq:Ljava/lang/Object;
 
 
 # instance fields
-.field volatile bMa:Z
+.field volatile bMk:Z
 
-.field final pD:Ljava/util/concurrent/ScheduledExecutorService;
+.field final pC: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;->bMg:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/c/h;->bMq: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;->bMd:Ljava/util/concurrent/ConcurrentHashMap;
+    sput-object v0, Lrx/internal/c/h;->bMn: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;->bMe:Ljava/util/concurrent/atomic/AtomicReference;
+    sput-object v0, Lrx/internal/c/h;->bMo: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;->bMc:I
+    sput v0, Lrx/internal/c/h;->bMm:I
 
     const-string v0, "rx.scheduler.jdk6.purge-force"
 
@@ -85,7 +85,7 @@
 
     move-result v0
 
-    invoke-static {}, Lrx/internal/util/h;->JO()I
+    invoke-static {}, Lrx/internal/util/h;->JR()I
 
     move-result v1
 
@@ -106,7 +106,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/c/h;->bMb:Z
+    sput-boolean v0, Lrx/internal/c/h;->bMl: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iput-object p1, p0, Lrx/internal/c/h;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
     return-void
 .end method
 
-.method static JK()V
+.method static JN()V
     .locals 3
 
     :try_start_0
-    sget-object v0, Lrx/internal/c/h;->bMd:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bMn: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;->bMd:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bMn: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;->bMe:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->bMo: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;->bMe:Ljava/util/concurrent/atomic/AtomicReference;
+    sget-object v0, Lrx/internal/c/h;->bMo: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;->bMc:I
+    sget v0, Lrx/internal/c/h;->bMm:I
 
     int-to-long v5, v0
 
@@ -270,7 +270,7 @@
 
     :cond_1
     :goto_1
-    sget-object v0, Lrx/internal/c/h;->bMd:Ljava/util/concurrent/ConcurrentHashMap;
+    sget-object v0, Lrx/internal/c/h;->bMn: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;->bMb:Z
+    sget-boolean v0, Lrx/internal/c/h;->bMl:Z
 
     const/4 v1, 0x0
 
@@ -290,9 +290,9 @@
 
     if-eqz v0, :cond_3
 
-    sget-object v0, Lrx/internal/c/h;->bMf:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/c/h;->bMp:Ljava/lang/Object;
 
-    sget-object v2, Lrx/internal/c/h;->bMg:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->bMq: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;->bMg:Ljava/lang/Object;
+    sget-object v2, Lrx/internal/c/h;->bMq:Ljava/lang/Object;
 
     :goto_0
-    sput-object v2, Lrx/internal/c/h;->bMf:Ljava/lang/Object;
+    sput-object v2, Lrx/internal/c/h;->bMp: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;->bMa:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->bMk:Z
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p1
 
@@ -490,7 +490,7 @@
 
     if-gtz p1, :cond_0
 
-    iget-object p1, p0, Lrx/internal/c/h;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/h;->pC: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;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object p1, p0, Lrx/internal/c/h;->pC: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;->bMa:Z
+    iget-boolean v0, p0, Lrx/internal/c/h;->bMk:Z
 
     return v0
 .end method
@@ -524,13 +524,13 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/c/h;->bMa:Z
+    iput-boolean v0, p0, Lrx/internal/c/h;->bMk:Z
 
-    iget-object v0, p0, Lrx/internal/c/h;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/h;->pC:Ljava/util/concurrent/ScheduledExecutorService;
 
     invoke-interface {v0}, Ljava/util/concurrent/ScheduledExecutorService;->shutdownNow()Ljava/util/List;
 
-    iget-object v0, p0, Lrx/internal/c/h;->pD:Ljava/util/concurrent/ScheduledExecutorService;
+    iget-object v0, p0, Lrx/internal/c/h;->pC: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 ca3cb1f459..b20502afe6 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 bLw:Lrx/functions/Action0;
+.field final synthetic bLG:Lrx/functions/Action0;
 
-.field bMi:J
+.field bMs:J
 
-.field bMj:J
+.field bMt:J
 
-.field bMk:J
+.field bMu:J
 
-.field final synthetic bMl:J
+.field final synthetic bMv:J
 
-.field final synthetic bMm:J
+.field final synthetic bMw:J
 
-.field final synthetic bMn:Lrx/internal/d/a;
+.field final synthetic bMx:Lrx/internal/d/a;
 
-.field final synthetic bMo:Lrx/internal/c/i$a;
+.field final synthetic bMy:Lrx/internal/c/i$a;
 
-.field final synthetic bMp:J
+.field final synthetic bMz: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;->bMl:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bMv:J
 
-    iput-wide p3, p0, Lrx/internal/c/i$1;->bMm:J
+    iput-wide p3, p0, Lrx/internal/c/i$1;->bMw:J
 
-    iput-object p5, p0, Lrx/internal/c/i$1;->bLw:Lrx/functions/Action0;
+    iput-object p5, p0, Lrx/internal/c/i$1;->bLG:Lrx/functions/Action0;
 
-    iput-object p6, p0, Lrx/internal/c/i$1;->bMn:Lrx/internal/d/a;
+    iput-object p6, p0, Lrx/internal/c/i$1;->bMx:Lrx/internal/d/a;
 
     const/4 p1, 0x0
 
-    iput-object p1, p0, Lrx/internal/c/i$1;->bMo:Lrx/internal/c/i$a;
+    iput-object p1, p0, Lrx/internal/c/i$1;->bMy: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;->bMp:J
+    iput-wide p9, p0, Lrx/internal/c/i$1;->bMz:J
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->bMl:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->bMv:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bMj:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bMt:J
 
-    iget-wide p1, p0, Lrx/internal/c/i$1;->bMm:J
+    iget-wide p1, p0, Lrx/internal/c/i$1;->bMw:J
 
-    iput-wide p1, p0, Lrx/internal/c/i$1;->bMk:J
+    iput-wide p1, p0, Lrx/internal/c/i$1;->bMu: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;->bLw:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bLG:Lrx/functions/Action0;
 
     invoke-interface {v0}, Lrx/functions/Action0;->call()V
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bMn:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bMx: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;->bMo:Lrx/internal/c/i$a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bMy:Lrx/internal/c/i$a;
 
     if-eqz v0, :cond_0
 
-    invoke-interface {v0}, Lrx/internal/c/i$a;->JL()J
+    invoke-interface {v0}, Lrx/internal/c/i$a;->JO()J
 
     move-result-wide v0
 
@@ -111,11 +111,11 @@
     move-result-wide v0
 
     :goto_0
-    sget-wide v2, Lrx/internal/c/i;->bMh:J
+    sget-wide v2, Lrx/internal/c/i;->bMr:J
 
     add-long/2addr v2, v0
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->bMj:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->bMt:J
 
     const-wide/16 v6, 0x1
 
@@ -123,11 +123,11 @@
 
     if-ltz v8, :cond_2
 
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bMp:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bMz:J
 
     add-long/2addr v4, v2
 
-    sget-wide v2, Lrx/internal/c/i;->bMh:J
+    sget-wide v2, Lrx/internal/c/i;->bMr:J
 
     add-long/2addr v4, v2
 
@@ -138,15 +138,15 @@
     goto :goto_1
 
     :cond_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bMk:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bMu:J
 
-    iget-wide v4, p0, Lrx/internal/c/i$1;->bMi:J
+    iget-wide v4, p0, Lrx/internal/c/i$1;->bMs:J
 
     add-long/2addr v4, v6
 
-    iput-wide v4, p0, Lrx/internal/c/i$1;->bMi:J
+    iput-wide v4, p0, Lrx/internal/c/i$1;->bMs:J
 
-    iget-wide v6, p0, Lrx/internal/c/i$1;->bMp:J
+    iget-wide v6, p0, Lrx/internal/c/i$1;->bMz:J
 
     mul-long v4, v4, v6
 
@@ -156,30 +156,30 @@
 
     :cond_2
     :goto_1
-    iget-wide v2, p0, Lrx/internal/c/i$1;->bMp:J
+    iget-wide v2, p0, Lrx/internal/c/i$1;->bMz:J
 
     add-long v4, v0, v2
 
-    iget-wide v8, p0, Lrx/internal/c/i$1;->bMi:J
+    iget-wide v8, p0, Lrx/internal/c/i$1;->bMs:J
 
     add-long/2addr v8, v6
 
-    iput-wide v8, p0, Lrx/internal/c/i$1;->bMi:J
+    iput-wide v8, p0, Lrx/internal/c/i$1;->bMs:J
 
     mul-long v2, v2, v8
 
     sub-long v2, v4, v2
 
-    iput-wide v2, p0, Lrx/internal/c/i$1;->bMk:J
+    iput-wide v2, p0, Lrx/internal/c/i$1;->bMu:J
 
     move-wide v2, v4
 
     :goto_2
-    iput-wide v0, p0, Lrx/internal/c/i$1;->bMj:J
+    iput-wide v0, p0, Lrx/internal/c/i$1;->bMt:J
 
     sub-long/2addr v2, v0
 
-    iget-object v0, p0, Lrx/internal/c/i$1;->bMn:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/internal/c/i$1;->bMx: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 db71adf4c2..a6b5341c04 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 JL()J
+.method public abstract JO()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 d889593a85..25ef1490ce 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 bMh:J
+.field public static final bMr:J
 
 
 # direct methods
@@ -37,7 +37,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/c/i;->bMh:J
+    sput-wide v0, Lrx/internal/c/i;->bMr: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 b35079fd27..43b3f999df 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 bMq:Ljava/util/concurrent/Future;
+.field private final bMA: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 bMr:Lrx/internal/c/j;
+.field final synthetic bMB:Lrx/internal/c/j;
 
 
 # direct methods
@@ -41,11 +41,11 @@
         }
     .end annotation
 
-    iput-object p1, p0, Lrx/internal/c/j$a;->bMr:Lrx/internal/c/j;
+    iput-object p1, p0, Lrx/internal/c/j$a;->bMB:Lrx/internal/c/j;
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p2, p0, Lrx/internal/c/j$a;->bMq:Ljava/util/concurrent/Future;
+    iput-object p2, p0, Lrx/internal/c/j$a;->bMA: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;->bMq:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMA: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;->bMr:Lrx/internal/c/j;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMB: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;->bMq:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMA: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;->bMq:Ljava/util/concurrent/Future;
+    iget-object v0, p0, Lrx/internal/c/j$a;->bMA: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 4f71a19fec..a4f799853d 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;->bGp:Z
+    iget-boolean v2, v0, Lrx/internal/util/SubscriptionList;->bGz: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;->bGp:Z
+    iget-boolean v3, v0, Lrx/internal/util/SubscriptionList;->bGz: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 5c26d8f09a..e5368d9266 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 bMs:Lrx/functions/Action0;
+.field private final bMC:Lrx/functions/Action0;
 
-.field private final bMt:Lrx/Scheduler$Worker;
+.field private final bMD:Lrx/Scheduler$Worker;
 
-.field private final bMu:J
+.field private final bME:J
 
 
 # direct methods
@@ -20,11 +20,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/c/l;->bMs:Lrx/functions/Action0;
+    iput-object p1, p0, Lrx/internal/c/l;->bMC:Lrx/functions/Action0;
 
-    iput-object p2, p0, Lrx/internal/c/l;->bMt:Lrx/Scheduler$Worker;
+    iput-object p2, p0, Lrx/internal/c/l;->bMD:Lrx/Scheduler$Worker;
 
-    iput-wide p3, p0, Lrx/internal/c/l;->bMu:J
+    iput-wide p3, p0, Lrx/internal/c/l;->bME:J
 
     return-void
 .end method
@@ -34,7 +34,7 @@
 .method public final call()V
     .locals 5
 
-    iget-object v0, p0, Lrx/internal/c/l;->bMt:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->bMD: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;->bMu:J
+    iget-wide v0, p0, Lrx/internal/c/l;->bME:J
 
     invoke-static {}, Lrx/Scheduler$Worker;->now()J
 
@@ -79,7 +79,7 @@
 
     :cond_1
     :goto_0
-    iget-object v0, p0, Lrx/internal/c/l;->bMt:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/c/l;->bMD: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;->bMs:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/c/l;->bMC: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 157e132373..a7070a31e6 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 bMy:Lrx/internal/c/m$b;
+.field final synthetic bMI:Lrx/internal/c/m$b;
 
-.field final synthetic bMz:Lrx/internal/c/m$a;
+.field final synthetic bMJ: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;->bMz:Lrx/internal/c/m$a;
+    iput-object p1, p0, Lrx/internal/c/m$a$1;->bMJ:Lrx/internal/c/m$a;
 
-    iput-object p2, p0, Lrx/internal/c/m$a$1;->bMy:Lrx/internal/c/m$b;
+    iput-object p2, p0, Lrx/internal/c/m$a$1;->bMI: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;->bMz:Lrx/internal/c/m$a;
+    iget-object v0, p0, Lrx/internal/c/m$a$1;->bMJ:Lrx/internal/c/m$a;
 
-    iget-object v0, v0, Lrx/internal/c/m$a;->bMx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object v0, v0, Lrx/internal/c/m$a;->bMH:Ljava/util/concurrent/PriorityBlockingQueue;
 
-    iget-object v1, p0, Lrx/internal/c/m$a$1;->bMy:Lrx/internal/c/m$b;
+    iget-object v1, p0, Lrx/internal/c/m$a$1;->bMI: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 755c098ea9..5b9a05be55 100644
--- a/com.discord/smali_classes2/rx/internal/c/m$a.smali
+++ b/com.discord/smali_classes2/rx/internal/c/m$a.smali
@@ -18,11 +18,9 @@
 
 
 # instance fields
-.field private final bLY:Lrx/subscriptions/a;
+.field final bMG:Ljava/util/concurrent/atomic/AtomicInteger;
 
-.field final bMw:Ljava/util/concurrent/atomic/AtomicInteger;
-
-.field final bMx:Ljava/util/concurrent/PriorityBlockingQueue;
+.field final bMH:Ljava/util/concurrent/PriorityBlockingQueue;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/PriorityBlockingQueue<",
@@ -32,6 +30,8 @@
     .end annotation
 .end field
 
+.field private final bMi: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;->bMw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bMG: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;->bMx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bMH: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;->bLY:Lrx/subscriptions/a;
+    iput-object v0, p0, Lrx/internal/c/m$a;->bMi: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;->bLY:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bMi: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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object p1
 
@@ -92,7 +92,7 @@
 
     move-result-object p2
 
-    iget-object p3, p0, Lrx/internal/c/m$a;->bMw:Ljava/util/concurrent/atomic/AtomicInteger;
+    iget-object p3, p0, Lrx/internal/c/m$a;->bMG: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;->bMx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->bMH: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;->bMx:Ljava/util/concurrent/PriorityBlockingQueue;
+    iget-object p1, p0, Lrx/internal/c/m$a;->bMH: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;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()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;->bLY:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bMi: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;->bLY:Lrx/subscriptions/a;
+    iget-object v0, p0, Lrx/internal/c/m$a;->bMi: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 b01be4f930..4499c040cb 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 bMA:Ljava/lang/Long;
+.field final bMK: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;->bMA:Ljava/lang/Long;
+    iput-object p2, p0, Lrx/internal/c/m$b;->bMK: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;->bMA:Ljava/lang/Long;
+    iget-object v0, p0, Lrx/internal/c/m$b;->bMK:Ljava/lang/Long;
 
-    iget-object v1, p1, Lrx/internal/c/m$b;->bMA:Ljava/lang/Long;
+    iget-object v1, p1, Lrx/internal/c/m$b;->bMK: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 f2e6860549..c4794e3c1c 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 bMv:Lrx/internal/c/m;
+.field public static final bMF: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;->bMv:Lrx/internal/c/m;
+    sput-object v0, Lrx/internal/c/m;->bMF:Lrx/internal/c/m;
 
     return-void
 .end method
@@ -61,7 +61,7 @@
 
 
 # virtual methods
-.method public final IV()Lrx/Scheduler$Worker;
+.method public final IY()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 4f458a8e4a..0080249330 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 JM()Lrx/Subscription;
+.method public final JP()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;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
 
     if-ne v0, v1, :cond_0
 
-    invoke-static {}, Lrx/subscriptions/c;->Kz()Lrx/Subscription;
+    invoke-static {}, Lrx/subscriptions/c;->KC()Lrx/Subscription;
 
     move-result-object v0
 
@@ -73,7 +73,7 @@
 
     check-cast v0, Lrx/Subscription;
 
-    sget-object v1, Lrx/internal/d/b;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML: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;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML: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;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML: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;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
 
     if-eq v0, v1, :cond_0
 
-    sget-object v0, Lrx/internal/d/b;->bMB:Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->bML: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;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML: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 c3e99ff1db..f9562cf223 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 bMB:Lrx/internal/d/b;
+.field public static final enum bML:Lrx/internal/d/b;
 
-.field private static final synthetic bMC:[Lrx/internal/d/b;
+.field private static final synthetic bMM:[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;->bMB:Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
 
     const/4 v0, 0x1
 
     new-array v0, v0, [Lrx/internal/d/b;
 
-    sget-object v1, Lrx/internal/d/b;->bMB:Lrx/internal/d/b;
+    sget-object v1, Lrx/internal/d/b;->bML:Lrx/internal/d/b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/d/b;->bMC:[Lrx/internal/d/b;
+    sput-object v0, Lrx/internal/d/b;->bMM:[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;->bMC:[Lrx/internal/d/b;
+    sget-object v0, Lrx/internal/d/b;->bMM:[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 2fdf947219..87ea32c2e3 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 bGp:Z
+.field public volatile bGz: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGp:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
 
     return v0
 .end method
@@ -139,14 +139,14 @@
 .method public final unsubscribe()V
     .locals 3
 
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGp:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGp:Z
+    iget-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz:Z
 
     if-eqz v0, :cond_0
 
@@ -157,7 +157,7 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGp:Z
+    iput-boolean v0, p0, Lrx/internal/util/SubscriptionList;->bGz: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 1145d0a787..501aaa29fa 100644
--- a/com.discord/smali_classes2/rx/internal/util/a.smali
+++ b/com.discord/smali_classes2/rx/internal/util/a.smali
@@ -20,7 +20,7 @@
 
 
 # instance fields
-.field final bMD:Lrx/functions/Action1;
+.field final bMN:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -29,7 +29,7 @@
     .end annotation
 .end field
 
-.field final bME:Lrx/functions/Action1;
+.field final bMO:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -40,7 +40,7 @@
     .end annotation
 .end field
 
-.field final bMF:Lrx/functions/Action0;
+.field final bMP:Lrx/functions/Action0;
 
 
 # direct methods
@@ -62,11 +62,11 @@
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/a;->bMD:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/a;->bMN:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/a;->bME:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/a;->bMO:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/a;->bMF:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/a;->bMP: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;->bMF:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/a;->bMP: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;->bME:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->bMO: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;->bMD:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/a;->bMN: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 a089f1804a..8f2f474001 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 bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field protected final bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -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;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/a;->bmX:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/a;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/a;->bmX: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 0de43c7887..9bea0586cc 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 private final bNk:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bNu: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 bNl:Ljava/util/concurrent/atomic/AtomicReference;
+.field private final bNv: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;->bNk:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->bNu: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;->bNl:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/internal/util/a/b;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
 
     return-void
 .end method
 
-.method private JS()Lrx/internal/util/a/c;
+.method private JV()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;->bNk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNu: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 JU()Lrx/internal/util/a/c;
+.method private JX()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;->bNl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNv: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 JT()Lrx/internal/util/a/c;
+.method protected final JW()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;->bNk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNu:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -123,7 +123,7 @@
     return-object v0
 .end method
 
-.method protected final JV()Lrx/internal/util/a/c;
+.method protected final JY()Lrx/internal/util/a/c;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -133,7 +133,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bNl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
 
@@ -154,7 +154,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bNk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNu:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
@@ -171,7 +171,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/b;->bNl:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/internal/util/a/b;->bNv:Ljava/util/concurrent/atomic/AtomicReference;
 
     invoke-virtual {v0, p1}, Ljava/util/concurrent/atomic/AtomicReference;->lazySet(Ljava/lang/Object;)V
 
@@ -181,11 +181,11 @@
 .method public final isEmpty()Z
     .locals 2
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->JU()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JX()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->JS()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JV()Lrx/internal/util/a/c;
 
     move-result-object v1
 
@@ -221,11 +221,11 @@
 .method public final size()I
     .locals 4
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->JU()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JX()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-direct {p0}, Lrx/internal/util/a/b;->JS()Lrx/internal/util/a/c;
+    invoke-direct {p0}, Lrx/internal/util/a/b;->JV()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 59127f744f..66bbab7184 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 JW()Ljava/lang/Object;
+.method public final JZ()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 0d304de95f..9ea0eac233 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 bNm:Ljava/lang/Integer;
+.field private static final bNw:Ljava/lang/Integer;
 
 
 # instance fields
-.field bNn:J
+.field bNx:J
 
-.field final bNo:I
+.field final bNy: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;->bNm:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/a/d;->bNw: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;->bNm:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/a/d;->bNw: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;->bNo:I
+    iput p1, p0, Lrx/internal/util/a/d;->bNy:I
 
     return-void
 .end method
@@ -139,7 +139,7 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/a/d;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/d;->bmX: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;->bNn:J
+    iget-wide v5, p0, Lrx/internal/util/a/d;->bNx:J
 
     cmp-long v7, v2, v5
 
     if-ltz v7, :cond_1
 
-    iget v5, p0, Lrx/internal/util/a/d;->bNo:I
+    iget v5, p0, Lrx/internal/util/a/d;->bNy:I
 
     int-to-long v5, v5
 
@@ -175,7 +175,7 @@
 
     if-nez v1, :cond_0
 
-    iput-wide v5, p0, Lrx/internal/util/a/d;->bNn:J
+    iput-wide v5, p0, Lrx/internal/util/a/d;->bNx:J
 
     goto :goto_0
 
@@ -259,7 +259,7 @@
 
     move-result v2
 
-    iget-object v3, p0, Lrx/internal/util/a/d;->bmN:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v3, p0, Lrx/internal/util/a/d;->bmX: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/f.smali b/com.discord/smali_classes2/rx/internal/util/a/f.smali
index 586d056888..126fedc805 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,17 @@
 
 
 # static fields
-.field static final bNp:I
+.field private static final bNF:Ljava/lang/Object;
 
-.field private static final bNv:Ljava/lang/Object;
+.field static final bNz:I
 
 
 # instance fields
-.field bNn:J
+.field bNA:I
 
-.field bNq:I
+.field bNB:I
 
-.field bNr:I
-
-.field bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -42,9 +40,9 @@
     .end annotation
 .end field
 
-.field bNt:I
+.field bND:I
 
-.field bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -54,6 +52,8 @@
     .end annotation
 .end field
 
+.field bNx:J
+
 .field final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
 .field final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
@@ -75,13 +75,13 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/a/f;->bNp:I
+    sput v0, Lrx/internal/util/a/f;->bNz:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/f;->bNv:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/f;->bNF:Ljava/lang/Object;
 
     return-void
 .end method
@@ -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;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->bNr:I
+    iput v0, p0, Lrx/internal/util/a/f;->bNB:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/f;->bNp:I
+    sget v2, Lrx/internal/util/a/f;->bNz:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/f;->bNq:I
+    iput p1, p0, Lrx/internal/util/a/f;->bNA:I
 
-    iput-object v1, p0, Lrx/internal/util/a/f;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/f;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/f;->bNt:I
+    iput v0, p0, Lrx/internal/util/a/f;->bND:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/f;->bNn:J
+    iput-wide v0, p0, Lrx/internal/util/a/f;->bNx:J
 
     new-instance p1, Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -389,7 +389,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/a/f;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v1, p0, Lrx/internal/util/a/f;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -397,7 +397,7 @@
 
     move-result-wide v1
 
-    iget v3, p0, Lrx/internal/util/a/f;->bNr:I
+    iget v3, p0, Lrx/internal/util/a/f;->bNB:I
 
     const-wide/16 v4, 0x2
 
@@ -436,7 +436,7 @@
 
     invoke-direct {v7, v6}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v7, p0, Lrx/internal/util/a/f;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v7, p0, Lrx/internal/util/a/f;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     long-to-int v2, v1
 
@@ -450,7 +450,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;->bNv:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->bNF:Ljava/lang/Object;
 
     invoke-virtual {v0, v1, p1}, Ljava/util/concurrent/atomic/AtomicReferenceArray;->lazySet(ILjava/lang/Object;)V
 
@@ -470,7 +470,7 @@
         }
     .end annotation
 
-    iget-object v1, p0, Lrx/internal/util/a/f;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/f;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     iget-object v0, p0, Lrx/internal/util/a/f;->producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
@@ -478,13 +478,13 @@
 
     move-result-wide v3
 
-    iget v0, p0, Lrx/internal/util/a/f;->bNr:I
+    iget v0, p0, Lrx/internal/util/a/f;->bNB:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/f;->bNn:J
+    iget-wide v6, p0, Lrx/internal/util/a/f;->bNx:J
 
     cmp-long v2, v3, v6
 
@@ -501,7 +501,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/f;->bNq:I
+    iget v2, p0, Lrx/internal/util/a/f;->bNA:I
 
     int-to-long v6, v2
 
@@ -521,7 +521,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/f;->bNn:J
+    iput-wide v6, p0, Lrx/internal/util/a/f;->bNx:J
 
     move-object v0, p0
 
@@ -567,19 +567,19 @@
 
     invoke-direct {v2, v0}, Ljava/util/concurrent/atomic/AtomicReferenceArray;-><init>(I)V
 
-    iput-object v2, p0, Lrx/internal/util/a/f;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/f;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/f;->bNn:J
+    iput-wide v3, p0, Lrx/internal/util/a/f;->bNx: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;->bNv:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/f;->bNF:Ljava/lang/Object;
 
     invoke-virtual {v1, v5, 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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bNE: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;->bNt:I
+    iget v3, p0, Lrx/internal/util/a/f;->bND:I
 
     long-to-int v2, v1
 
@@ -616,7 +616,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/f;->bNv:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/f;->bNF: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->bNE: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/f;->bNE: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;->bNt:I
+    iget v3, p0, Lrx/internal/util/a/f;->bND:I
 
     long-to-int v4, v1
 
@@ -662,7 +662,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/f;->bNv:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/f;->bNF: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/f;->bNE: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 79bdafed2b..2311c879ab 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
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->JT()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->JW()Lrx/internal/util/a/c;
 
     move-result-object p1
 
@@ -82,7 +82,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->JV()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->JY()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -112,7 +112,7 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/a/g;->JV()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/a/g;->JY()Lrx/internal/util/a/c;
 
     move-result-object v0
 
@@ -124,7 +124,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lrx/internal/util/a/c;->JW()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->JZ()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 2d9893105d..cc7cbee240 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,17 @@
 
 
 # static fields
-.field static final bNp:I
+.field private static final bNF:Ljava/lang/Object;
 
-.field private static final bNv:Ljava/lang/Object;
+.field static final bNz:I
 
 
 # instance fields
-.field bNn:J
+.field bNA:I
 
-.field bNq:I
+.field bNB:I
 
-.field bNr:I
-
-.field bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -42,9 +40,9 @@
     .end annotation
 .end field
 
-.field bNt:I
+.field bND:I
 
-.field bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+.field bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/concurrent/atomic/AtomicReferenceArray<",
@@ -54,6 +52,8 @@
     .end annotation
 .end field
 
+.field bNx:J
+
 .field final consumerIndex:Ljava/util/concurrent/atomic/AtomicLong;
 
 .field final producerIndex:Ljava/util/concurrent/atomic/AtomicLong;
@@ -75,13 +75,13 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/a/h;->bNp:I
+    sput v0, Lrx/internal/util/a/h;->bNz:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/a/h;->bNv:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/a/h;->bNF:Ljava/lang/Object;
 
     return-void
 .end method
@@ -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;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->bNr:I
+    iput v0, p0, Lrx/internal/util/a/h;->bNB:I
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v2, Lrx/internal/util/a/h;->bNp:I
+    sget v2, Lrx/internal/util/a/h;->bNz:I
 
     invoke-static {p1, v2}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/a/h;->bNq:I
+    iput p1, p0, Lrx/internal/util/a/h;->bNA:I
 
-    iput-object v1, p0, Lrx/internal/util/a/h;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v1, p0, Lrx/internal/util/a/h;->bNE:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
-    iput v0, p0, Lrx/internal/util/a/h;->bNt:I
+    iput v0, p0, Lrx/internal/util/a/h;->bND:I
 
     add-int/lit8 v0, v0, -0x1
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/a/h;->bNn:J
+    iput-wide v0, p0, Lrx/internal/util/a/h;->bNx:J
 
     const-wide/16 v0, 0x0
 
@@ -376,7 +376,7 @@
 
     if-eqz p1, :cond_3
 
-    iget-object v1, p0, Lrx/internal/util/a/h;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v1, p0, Lrx/internal/util/a/h;->bNC: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;->bNr:I
+    iget v0, p0, Lrx/internal/util/a/h;->bNB:I
 
     long-to-int v2, v3
 
     and-int v5, v2, v0
 
-    iget-wide v6, p0, Lrx/internal/util/a/h;->bNn:J
+    iget-wide v6, p0, Lrx/internal/util/a/h;->bNx:J
 
     cmp-long v2, v3, v6
 
@@ -407,7 +407,7 @@
     return p1
 
     :cond_0
-    iget v2, p0, Lrx/internal/util/a/h;->bNq:I
+    iget v2, p0, Lrx/internal/util/a/h;->bNA:I
 
     int-to-long v6, v2
 
@@ -427,7 +427,7 @@
 
     sub-long/2addr v6, v8
 
-    iput-wide v6, p0, Lrx/internal/util/a/h;->bNn:J
+    iput-wide v6, p0, Lrx/internal/util/a/h;->bNx: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;->bNs:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v2, p0, Lrx/internal/util/a/h;->bNC:Ljava/util/concurrent/atomic/AtomicReferenceArray;
 
     add-long/2addr v3, v10
 
     sub-long/2addr v3, v8
 
-    iput-wide v3, p0, Lrx/internal/util/a/h;->bNn:J
+    iput-wide v3, p0, Lrx/internal/util/a/h;->bNx:J
 
     invoke-direct {p0, v6, v7}, Lrx/internal/util/a/h;->aT(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;->bNv:Ljava/lang/Object;
+    sget-object p1, Lrx/internal/util/a/h;->bNF: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->bNE: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;->bNt:I
+    iget v3, p0, Lrx/internal/util/a/h;->bND:I
 
     long-to-int v2, v1
 
@@ -535,7 +535,7 @@
 
     move-result-object v2
 
-    sget-object v3, Lrx/internal/util/a/h;->bNv:Ljava/lang/Object;
+    sget-object v3, Lrx/internal/util/a/h;->bNF: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->bNE: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iget-object v0, p0, Lrx/internal/util/a/h;->bNE: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;->bNt:I
+    iget v3, p0, Lrx/internal/util/a/h;->bND:I
 
     long-to-int v4, v1
 
@@ -581,7 +581,7 @@
 
     move-result-object v4
 
-    sget-object v5, Lrx/internal/util/a/h;->bNv:Ljava/lang/Object;
+    sget-object v5, Lrx/internal/util/a/h;->bNF: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;->bNu:Ljava/util/concurrent/atomic/AtomicReferenceArray;
+    iput-object v0, p0, Lrx/internal/util/a/h;->bNE: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 3520c8f161..565f380bb2 100644
--- a/com.discord/smali_classes2/rx/internal/util/b.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b.smali
@@ -16,7 +16,7 @@
 
 
 # instance fields
-.field final bMD:Lrx/functions/Action1;
+.field final bMN:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -25,7 +25,7 @@
     .end annotation
 .end field
 
-.field final bME:Lrx/functions/Action1;
+.field final bMO:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field final bMF:Lrx/functions/Action0;
+.field final bMP:Lrx/functions/Action0;
 
 
 # direct methods
@@ -56,11 +56,11 @@
 
     invoke-direct {p0}, Lrx/Subscriber;-><init>()V
 
-    iput-object p1, p0, Lrx/internal/util/b;->bMD:Lrx/functions/Action1;
+    iput-object p1, p0, Lrx/internal/util/b;->bMN:Lrx/functions/Action1;
 
-    iput-object p2, p0, Lrx/internal/util/b;->bME:Lrx/functions/Action1;
+    iput-object p2, p0, Lrx/internal/util/b;->bMO:Lrx/functions/Action1;
 
-    iput-object p3, p0, Lrx/internal/util/b;->bMF:Lrx/functions/Action0;
+    iput-object p3, p0, Lrx/internal/util/b;->bMP: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;->bMF:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/b;->bMP: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;->bME:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->bMO: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;->bMD:Lrx/functions/Action1;
+    iget-object v0, p0, Lrx/internal/util/b;->bMN: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 d0d382b424..dd445a4b95 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;->JU()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JX()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->JS()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JV()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;->JU()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JX()Lrx/internal/util/a/c;
 
     move-result-object v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/a;->JS()Lrx/internal/util/a/c;
+    invoke-virtual {p0}, Lrx/internal/util/b/a;->JV()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 8f20863a16..25f1b7a093 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/ac.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/ac.smali
@@ -16,9 +16,11 @@
 
 
 # instance fields
-.field protected bNI:J
+.field protected bNA:I
 
-.field protected bNJ:[Ljava/lang/Object;
+.field protected bNS:J
+
+.field protected bNT:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -26,9 +28,7 @@
     .end annotation
 .end field
 
-.field protected bNn:J
-
-.field protected bNq:I
+.field protected bNx:J
 
 
 # direct methods
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 dccb84da38..5e5e2a0a98 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 bNK:Lsun/misc/Unsafe;
+.field public static final bNU:Lsun/misc/Unsafe;
 
-.field private static final bNL:Z
+.field private static final bNV:Z
 
 
 # direct methods
@@ -31,7 +31,7 @@
     const/4 v0, 0x0
 
     :goto_0
-    sput-boolean v0, Lrx/internal/util/b/ae;->bNL:Z
+    sput-boolean v0, Lrx/internal/util/b/ae;->bNV:Z
 
     const/4 v0, 0x0
 
@@ -57,19 +57,19 @@
     move-object v0, v1
 
     :catchall_0
-    sput-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sput-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
     return-void
 .end method
 
-.method public static Ka()Z
+.method public static Kd()Z
     .locals 1
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
     if-eqz v0, :cond_0
 
-    sget-boolean v0, Lrx/internal/util/b/ae;->bNL:Z
+    sget-boolean v0, Lrx/internal/util/b/ae;->bNV:Z
 
     if-nez v0, :cond_0
 
@@ -100,7 +100,7 @@
 
     move-result-object p0
 
-    sget-object p1, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object p1, Lrx/internal/util/b/ae;->bNU: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 9719a16ee7..b4c944fa32 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 bNw:J
+.field protected static final bNG:J
 
 
 # instance fields
@@ -42,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/b;->bNw:J
+    sput-wide v0, Lrx/internal/util/b/b;->bNG:J
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 
 # virtual methods
-.method protected final JU()Lrx/internal/util/a/c;
+.method protected final JX()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;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/b;->bNw:J
+    sget-wide v1, Lrx/internal/util/b/b;->bNG: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 2b26e43b76..d1ed6cda43 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 bNx:J
+.field protected static final bNH:J
 
 
 # instance fields
@@ -42,7 +42,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/e;->bNx:J
+    sput-wide v0, Lrx/internal/util/b/e;->bNH:J
 
     return-void
 .end method
@@ -57,7 +57,7 @@
 
 
 # virtual methods
-.method protected final JS()Lrx/internal/util/a/c;
+.method protected final JV()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;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/e;->bNx:J
+    sget-wide v1, Lrx/internal/util/b/e;->bNH: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 da7c7f95b2..3efbc337c9 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 private static final bNA:I
+.field protected static final bNI:I
 
-.field protected static final bNy:I
+.field private static final bNJ:J
 
-.field private static final bNz:J
+.field private static final bNK:I
 
 
 # instance fields
-.field protected final bNB:J
+.field protected final bNL:J
 
-.field protected final bNC:[Ljava/lang/Object;
+.field protected final bNM:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
@@ -51,9 +51,9 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/f;->bNy:I
+    sput v0, Lrx/internal/util/b/f;->bNI:I
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU: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;->bNy:I
+    sget v0, Lrx/internal/util/b/f;->bNI:I
 
     add-int/lit8 v0, v0, 0x2
 
-    sput v0, Lrx/internal/util/b/f;->bNA:I
+    sput v0, Lrx/internal/util/b/f;->bNK:I
 
     goto :goto_0
 
@@ -78,14 +78,14 @@
 
     if-ne v1, v0, :cond_1
 
-    sget v0, Lrx/internal/util/b/f;->bNy:I
+    sget v0, Lrx/internal/util/b/f;->bNI:I
 
     add-int/lit8 v0, v0, 0x3
 
-    sput v0, Lrx/internal/util/b/f;->bNA:I
+    sput v0, Lrx/internal/util/b/f;->bNK:I
 
     :goto_0
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -95,9 +95,9 @@
 
     const/16 v1, 0x20
 
-    sget v2, Lrx/internal/util/b/f;->bNA:I
+    sget v2, Lrx/internal/util/b/f;->bNK:I
 
-    sget v3, Lrx/internal/util/b/f;->bNy:I
+    sget v3, Lrx/internal/util/b/f;->bNI:I
 
     sub-int/2addr v2, v3
 
@@ -107,7 +107,7 @@
 
     int-to-long v0, v0
 
-    sput-wide v0, Lrx/internal/util/b/f;->bNz:J
+    sput-wide v0, Lrx/internal/util/b/f;->bNJ:J
 
     return-void
 
@@ -134,9 +134,9 @@
 
     int-to-long v0, v0
 
-    iput-wide v0, p0, Lrx/internal/util/b/f;->bNB:J
+    iput-wide v0, p0, Lrx/internal/util/b/f;->bNL:J
 
-    sget v0, Lrx/internal/util/b/f;->bNy:I
+    sget v0, Lrx/internal/util/b/f;->bNI: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;->bNC:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/b/f;->bNM:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -159,7 +159,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU: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;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU: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 aV(J)J
     .locals 4
 
-    iget-wide v0, p0, Lrx/internal/util/b/f;->bNB:J
+    iget-wide v0, p0, Lrx/internal/util/b/f;->bNL:J
 
-    sget-wide v2, Lrx/internal/util/b/f;->bNz:J
+    sget-wide v2, Lrx/internal/util/b/f;->bNJ:J
 
     and-long/2addr p1, v0
 
-    sget v0, Lrx/internal/util/b/f;->bNA:I
+    sget v0, Lrx/internal/util/b/f;->bNK:I
 
     shl-long/2addr p1, v0
 
@@ -211,7 +211,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/f;->bNC:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/f;->bNM:[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/i.smali b/com.discord/smali_classes2/rx/internal/util/b/i.smali
index 660863ece3..31c151f80b 100644
--- a/com.discord/smali_classes2/rx/internal/util/b/i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/b/i.smali
@@ -29,11 +29,11 @@
 .method public final isEmpty()Z
     .locals 5
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JX()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v0
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
 
     move-result-wide v2
 
@@ -61,11 +61,11 @@
 
     if-eqz p1, :cond_2
 
-    iget-object v0, p0, Lrx/internal/util/b/i;->bNC:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/i;->bNM:[Ljava/lang/Object;
 
-    iget-wide v1, p0, Lrx/internal/util/b/i;->bNB:J
+    iget-wide v1, p0, Lrx/internal/util/b/i;->bNL:J
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
 
     move-result-wide v3
 
@@ -79,7 +79,7 @@
 
     if-eqz v7, :cond_1
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JX()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v7
 
@@ -101,7 +101,7 @@
     if-nez v1, :cond_0
 
     :cond_1
-    sget-object v1, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
     invoke-virtual {v1, v0, v5, v6, p1}, Lsun/misc/Unsafe;->putObject(Ljava/lang/Object;JLjava/lang/Object;)V
 
@@ -139,12 +139,12 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kc()J
 
     move-result-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JX()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v2
 
@@ -152,7 +152,7 @@
 
     if-ltz v4, :cond_2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
 
     move-result-wide v4
 
@@ -189,12 +189,12 @@
         }
     .end annotation
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JZ()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kc()J
 
     move-result-wide v0
 
     :cond_0
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JX()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v2
 
@@ -204,7 +204,7 @@
 
     if-ltz v5, :cond_2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
 
     move-result-wide v5
 
@@ -232,9 +232,9 @@
 
     move-result-wide v0
 
-    iget-object v2, p0, Lrx/internal/util/b/i;->bNC:[Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/b/i;->bNM:[Ljava/lang/Object;
 
-    sget-object v3, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v3, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
     invoke-virtual {v3, v2, v0, v1}, Lsun/misc/Unsafe;->getObject(Ljava/lang/Object;J)Ljava/lang/Object;
 
@@ -248,16 +248,16 @@
 .method public final size()I
     .locals 7
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JX()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v0
 
     :goto_0
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JY()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Kb()J
 
     move-result-wide v2
 
-    invoke-virtual {p0}, Lrx/internal/util/b/i;->JX()J
+    invoke-virtual {p0}, Lrx/internal/util/b/i;->Ka()J
 
     move-result-wide v4
 
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 1c9eb6333d..21a5a65dec 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 bND:J
+.field protected static final bNN:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/j;->bND:J
+    sput-wide v0, Lrx/internal/util/b/j;->bNN:J
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method protected final JX()J
+.method protected final Ka()J
     .locals 2
 
     iget-wide v0, p0, Lrx/internal/util/b/j;->consumerIndex:J
@@ -61,9 +61,9 @@
 .method protected final h(JJ)Z
     .locals 8
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/j;->bND:J
+    sget-wide v2, Lrx/internal/util/b/j;->bNN: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 5286de4f74..6248233921 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 bNE:J
+.field protected static final bNO:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/o;->bNE:J
+    sput-wide v0, Lrx/internal/util/b/o;->bNO:J
 
     return-void
 .end method
@@ -50,7 +50,7 @@
 
 
 # virtual methods
-.method protected final JY()J
+.method protected final Kb()J
     .locals 2
 
     iget-wide v0, p0, Lrx/internal/util/b/o;->producerIndex:J
@@ -61,9 +61,9 @@
 .method protected final aX(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/o;->bNE:J
+    sget-wide v2, Lrx/internal/util/b/o;->bNO: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 61bf20c0a4..c9e84142a8 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 private volatile bNF:J
+.field private volatile bNP:J
 
 
 # direct methods
@@ -30,10 +30,10 @@
 
 
 # virtual methods
-.method protected final JZ()J
+.method protected final Kc()J
     .locals 2
 
-    iget-wide v0, p0, Lrx/internal/util/b/p;->bNF:J
+    iget-wide v0, p0, Lrx/internal/util/b/p;->bNP:J
 
     return-wide v0
 .end method
@@ -41,7 +41,7 @@
 .method protected final aY(J)V
     .locals 0
 
-    iput-wide p1, p0, Lrx/internal/util/b/p;->bNF:J
+    iput-wide p1, p0, Lrx/internal/util/b/p;->bNP:J
 
     return-void
 .end method
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 83353d5a97..e91d639f17 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 JX()J
+.method private Ka()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->bND:J
+    sget-wide v1, Lrx/internal/util/b/q;->bNN: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 JY()J
+.method private Kb()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/q;->bNE:J
+    sget-wide v1, Lrx/internal/util/b/q;->bNO: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;->JY()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->Kb()J
 
     move-result-wide v0
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->JX()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->Ka()J
 
     move-result-wide v2
 
@@ -89,7 +89,7 @@
 
     if-eqz p1, :cond_1
 
-    iget-object v0, p0, Lrx/internal/util/b/q;->bNC:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/q;->bNM:[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;->bNK:Lsun/misc/Unsafe;
+    sget-object v5, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v7, Lrx/internal/util/b/q;->bNE:J
+    sget-wide v7, Lrx/internal/util/b/q;->bNO:J
 
     move-object v6, p0
 
@@ -171,7 +171,7 @@
 
     move-result-wide v2
 
-    iget-object v4, p0, Lrx/internal/util/b/q;->bNC:[Ljava/lang/Object;
+    iget-object v4, p0, Lrx/internal/util/b/q;->bNM:[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;->bNK:Lsun/misc/Unsafe;
+    sget-object v6, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v8, Lrx/internal/util/b/q;->bND:J
+    sget-wide v8, Lrx/internal/util/b/q;->bNN:J
 
     move-object v7, p0
 
@@ -204,16 +204,16 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->JX()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->Ka()J
 
     move-result-wide v0
 
     :goto_0
-    invoke-direct {p0}, Lrx/internal/util/b/q;->JY()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->Kb()J
 
     move-result-wide v2
 
-    invoke-direct {p0}, Lrx/internal/util/b/q;->JX()J
+    invoke-direct {p0}, Lrx/internal/util/b/q;->Ka()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 755971f105..37a38a946f 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 bNm:Ljava/lang/Integer;
+.field private static final bNw:Ljava/lang/Integer;
 
 
 # instance fields
-.field protected final bNo:I
+.field protected final bNy:I
 
 
 # direct methods
@@ -35,7 +35,7 @@
 
     move-result-object v0
 
-    sput-object v0, Lrx/internal/util/b/r;->bNm:Ljava/lang/Integer;
+    sput-object v0, Lrx/internal/util/b/r;->bNw: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;->bNm:Ljava/lang/Integer;
+    sget-object v0, Lrx/internal/util/b/r;->bNw: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;->bNo:I
+    iput p1, p0, Lrx/internal/util/b/r;->bNy: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 ba59593496..52c6db0474 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 bND:J
+.field protected static final bNN:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/s;->bND:J
+    sput-wide v0, Lrx/internal/util/b/s;->bNN: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 813609ee3a..1fee694eb3 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 bNE:J
+.field protected static final bNO:J
 
 
 # instance fields
@@ -35,7 +35,7 @@
 
     move-result-wide v0
 
-    sput-wide v0, Lrx/internal/util/b/w;->bNE:J
+    sput-wide v0, Lrx/internal/util/b/w;->bNO: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 11bd2e33db..a52a222f7a 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;->JW()Ljava/lang/Object;
+    invoke-virtual {v0}, Lrx/internal/util/a/c;->JZ()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 015c856eb1..013928d199 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 private static final bNA:I
+.field private static final bNF:Ljava/lang/Object;
 
-.field private static final bND:J
+.field private static final bNJ:J
 
-.field private static final bNE:J
+.field private static final bNK:I
 
-.field static final bNp:I
+.field private static final bNN:J
 
-.field private static final bNv:Ljava/lang/Object;
+.field private static final bNO:J
 
-.field private static final bNz:J
+.field static final bNz:I
 
 
 # direct methods
@@ -45,15 +45,15 @@
 
     move-result v0
 
-    sput v0, Lrx/internal/util/b/y;->bNp:I
+    sput v0, Lrx/internal/util/b/y;->bNz:I
 
     new-instance v0, Ljava/lang/Object;
 
     invoke-direct {v0}, Ljava/lang/Object;-><init>()V
 
-    sput-object v0, Lrx/internal/util/b/y;->bNv:Ljava/lang/Object;
+    sput-object v0, Lrx/internal/util/b/y;->bNF:Ljava/lang/Object;
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
     const-class v1, [Ljava/lang/Object;
 
@@ -67,7 +67,7 @@
 
     const/4 v0, 0x2
 
-    sput v0, Lrx/internal/util/b/y;->bNA:I
+    sput v0, Lrx/internal/util/b/y;->bNK:I
 
     goto :goto_0
 
@@ -78,10 +78,10 @@
 
     const/4 v0, 0x3
 
-    sput v0, Lrx/internal/util/b/y;->bNA:I
+    sput v0, Lrx/internal/util/b/y;->bNK:I
 
     :goto_0
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU: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;->bNz:J
+    sput-wide v0, Lrx/internal/util/b/y;->bNJ: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;->bNK:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bNU: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;->bNE:J
+    sput-wide v0, Lrx/internal/util/b/y;->bNO: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;->bNK:Lsun/misc/Unsafe;
+    sget-object v1, Lrx/internal/util/b/ae;->bNU: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;->bND:J
+    sput-wide v0, Lrx/internal/util/b/y;->bNN:J
     :try_end_1
     .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -184,29 +184,29 @@
 
     check-cast v2, [Ljava/lang/Object;
 
-    iput-object v2, p0, Lrx/internal/util/b/y;->bNJ:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->bNT:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bNI:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bNS:J
 
     div-int/lit8 p1, p1, 0x4
 
-    sget v3, Lrx/internal/util/b/y;->bNp:I
+    sget v3, Lrx/internal/util/b/y;->bNz:I
 
     invoke-static {p1, v3}, Ljava/lang/Math;->min(II)I
 
     move-result p1
 
-    iput p1, p0, Lrx/internal/util/b/y;->bNq:I
+    iput p1, p0, Lrx/internal/util/b/y;->bNA:I
 
-    iput-object v2, p0, Lrx/internal/util/b/y;->bNH:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/internal/util/b/y;->bNR:[Ljava/lang/Object;
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bNG:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bNQ:J
 
     const-wide/16 v2, 0x1
 
     sub-long/2addr v0, v2
 
-    iput-wide v0, p0, Lrx/internal/util/b/y;->bNn:J
+    iput-wide v0, p0, Lrx/internal/util/b/y;->bNx:J
 
     const-wide/16 v0, 0x0
 
@@ -215,12 +215,12 @@
     return-void
 .end method
 
-.method private JX()J
+.method private Ka()J
     .locals 3
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v1, Lrx/internal/util/b/y;->bND:J
+    sget-wide v1, Lrx/internal/util/b/y;->bNN: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;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU: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;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU: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 aT(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->bNE:J
+    sget-wide v2, Lrx/internal/util/b/y;->bNO:J
 
     move-object v1, p0
 
@@ -299,9 +299,9 @@
 .method private aU(J)V
     .locals 6
 
-    sget-object v0, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v0, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v2, Lrx/internal/util/b/y;->bND:J
+    sget-wide v2, Lrx/internal/util/b/y;->bNN:J
 
     move-object v1, p0
 
@@ -315,9 +315,9 @@
 .method private static aZ(J)J
     .locals 3
 
-    sget-wide v0, Lrx/internal/util/b/y;->bNz:J
+    sget-wide v0, Lrx/internal/util/b/y;->bNJ:J
 
-    sget v2, Lrx/internal/util/b/y;->bNA:I
+    sget v2, Lrx/internal/util/b/y;->bNK:I
 
     shl-long/2addr p0, v2
 
@@ -388,11 +388,11 @@
 
     if-eqz v2, :cond_3
 
-    iget-object v1, v7, Lrx/internal/util/b/y;->bNJ:[Ljava/lang/Object;
+    iget-object v1, v7, Lrx/internal/util/b/y;->bNT:[Ljava/lang/Object;
 
     iget-wide v3, v7, Lrx/internal/util/b/y;->producerIndex:J
 
-    iget-wide v5, v7, Lrx/internal/util/b/y;->bNI:J
+    iget-wide v5, v7, Lrx/internal/util/b/y;->bNS:J
 
     and-long v8, v3, v5
 
@@ -400,7 +400,7 @@
 
     move-result-wide v8
 
-    iget-wide v10, v7, Lrx/internal/util/b/y;->bNn:J
+    iget-wide v10, v7, Lrx/internal/util/b/y;->bNx:J
 
     cmp-long v0, v3, v10
 
@@ -419,7 +419,7 @@
     return v0
 
     :cond_0
-    iget v0, v7, Lrx/internal/util/b/y;->bNq:I
+    iget v0, v7, Lrx/internal/util/b/y;->bNA:I
 
     int-to-long v10, v0
 
@@ -441,7 +441,7 @@
 
     sub-long/2addr v10, v12
 
-    iput-wide v10, v7, Lrx/internal/util/b/y;->bNn:J
+    iput-wide v10, v7, Lrx/internal/util/b/y;->bNx: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;->bNJ:[Ljava/lang/Object;
+    iput-object v0, v7, Lrx/internal/util/b/y;->bNT:[Ljava/lang/Object;
 
     add-long/2addr v3, v5
 
     sub-long/2addr v3, v12
 
-    iput-wide v3, v7, Lrx/internal/util/b/y;->bNn:J
+    iput-wide v3, v7, Lrx/internal/util/b/y;->bNx: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;->bNv:Ljava/lang/Object;
+    sget-object v0, Lrx/internal/util/b/y;->bNF: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;->bNH:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->bNR:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->bNG:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->bNQ:J
 
     and-long/2addr v1, v3
 
@@ -555,7 +555,7 @@
 
     move-result-object v3
 
-    sget-object v4, Lrx/internal/util/b/y;->bNv:Ljava/lang/Object;
+    sget-object v4, Lrx/internal/util/b/y;->bNF:Ljava/lang/Object;
 
     if-ne v3, v4, :cond_0
 
@@ -563,7 +563,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/b/y;->bNH:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->bNR:[Ljava/lang/Object;
 
     invoke-static {v1, v2}, Lrx/internal/util/b/y;->aZ(J)J
 
@@ -587,11 +587,11 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/internal/util/b/y;->bNH:[Ljava/lang/Object;
+    iget-object v0, p0, Lrx/internal/util/b/y;->bNR:[Ljava/lang/Object;
 
     iget-wide v1, p0, Lrx/internal/util/b/y;->consumerIndex:J
 
-    iget-wide v3, p0, Lrx/internal/util/b/y;->bNG:J
+    iget-wide v3, p0, Lrx/internal/util/b/y;->bNQ:J
 
     and-long/2addr v3, v1
 
@@ -603,7 +603,7 @@
 
     move-result-object v7
 
-    sget-object v8, Lrx/internal/util/b/y;->bNv:Ljava/lang/Object;
+    sget-object v8, Lrx/internal/util/b/y;->bNF:Ljava/lang/Object;
 
     if-ne v7, v8, :cond_0
 
@@ -638,7 +638,7 @@
 
     move-result-object v0
 
-    iput-object v0, p0, Lrx/internal/util/b/y;->bNH:[Ljava/lang/Object;
+    iput-object v0, p0, Lrx/internal/util/b/y;->bNR:[Ljava/lang/Object;
 
     invoke-static {v3, v4}, Lrx/internal/util/b/y;->aZ(J)J
 
@@ -668,20 +668,20 @@
 .method public final size()I
     .locals 7
 
-    invoke-direct {p0}, Lrx/internal/util/b/y;->JX()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->Ka()J
 
     move-result-wide v0
 
     :goto_0
-    sget-object v2, Lrx/internal/util/b/ae;->bNK:Lsun/misc/Unsafe;
+    sget-object v2, Lrx/internal/util/b/ae;->bNU:Lsun/misc/Unsafe;
 
-    sget-wide v3, Lrx/internal/util/b/y;->bNE:J
+    sget-wide v3, Lrx/internal/util/b/y;->bNO: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;->JX()J
+    invoke-direct {p0}, Lrx/internal/util/b/y;->Ka()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 c355d72a96..788ff0bd7b 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 bNG:J
+.field protected bNQ:J
 
-.field protected bNH:[Ljava/lang/Object;
+.field protected bNR:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TE;"
diff --git a/com.discord/smali_classes2/rx/internal/util/c.smali b/com.discord/smali_classes2/rx/internal/util/c.smali
index 7b8ea5f4d5..4800b4e741 100644
--- a/com.discord/smali_classes2/rx/internal/util/c.smali
+++ b/com.discord/smali_classes2/rx/internal/util/c.smali
@@ -41,7 +41,7 @@
 
 
 # virtual methods
-.method public final Jf()V
+.method public final Ji()V
     .locals 13
 
     monitor-enter p0
@@ -316,7 +316,7 @@
 
     iput-boolean p1, p0, Lrx/internal/util/c;->terminated:Z
 
-    invoke-virtual {p0}, Lrx/internal/util/c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/util/c;->Ji()V
 
     :cond_0
     return-void
@@ -390,7 +390,7 @@
     :cond_4
     if-eqz v5, :cond_5
 
-    invoke-virtual {p0}, Lrx/internal/util/c;->Jf()V
+    invoke-virtual {p0}, Lrx/internal/util/c;->Ji()V
 
     :cond_5
     return-void
diff --git a/com.discord/smali_classes2/rx/internal/util/e.smali b/com.discord/smali_classes2/rx/internal/util/e.smali
index 8595500066..30d0ca0de2 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 bMG:Ljava/lang/Throwable;
+.field private static final bMQ:Ljava/lang/Throwable;
 
-.field private static final synthetic bMH:[Lrx/internal/util/e;
+.field private static final synthetic bMR:[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;->bMH:[Lrx/internal/util/e;
+    sput-object v0, Lrx/internal/util/e;->bMR:[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;->bMG:Ljava/lang/Throwable;
+    sput-object v0, Lrx/internal/util/e;->bMQ: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;->bMG:Ljava/lang/Throwable;
+    sget-object v0, Lrx/internal/util/e;->bMQ: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;->bMG:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->bMQ:Ljava/lang/Throwable;
 
     const/4 v2, 0x0
 
@@ -160,7 +160,7 @@
 
     check-cast v0, Ljava/lang/Throwable;
 
-    sget-object v1, Lrx/internal/util/e;->bMG:Ljava/lang/Throwable;
+    sget-object v1, Lrx/internal/util/e;->bMQ: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;->bMH:[Lrx/internal/util/e;
+    sget-object v0, Lrx/internal/util/e;->bMR:[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 62746dd17a..865db96fe5 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 bMR:Lrx/functions/b;
+.field final bNb: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;->bMR:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$f;->bNb: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;->bMR:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$f;->bNb:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->bML:Lrx/internal/util/f$h;
+    sget-object v1, Lrx/internal/util/f;->bMV: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 8df9a43edf..e89db08db3 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 bMR:Lrx/functions/b;
+.field final bNb: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;->bMR:Lrx/functions/b;
+    iput-object p1, p0, Lrx/internal/util/f$g;->bNb: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;->bMR:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/f$g;->bNb:Lrx/functions/b;
 
-    sget-object v1, Lrx/internal/util/f;->bMN:Lrx/internal/util/f$b;
+    sget-object v1, Lrx/internal/util/f;->bMX: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 e9728bb6f8..27ef0507e5 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 bMI:Lrx/internal/util/f$e;
+.field public static final bMS:Lrx/internal/util/f$e;
 
-.field public static final bMJ:Lrx/internal/util/f$c;
+.field public static final bMT:Lrx/internal/util/f$c;
 
-.field public static final bMK:Lrx/internal/util/f$i;
+.field public static final bMU:Lrx/internal/util/f$i;
 
-.field static final bML:Lrx/internal/util/f$h;
+.field static final bMV:Lrx/internal/util/f$h;
 
-.field public static final bMM:Lrx/internal/util/f$d;
+.field public static final bMW:Lrx/internal/util/f$d;
 
-.field static final bMN:Lrx/internal/util/f$b;
+.field static final bMX:Lrx/internal/util/f$b;
 
-.field public static final bMO:Lrx/functions/Action1;
+.field public static final bMY:Lrx/functions/Action1;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/functions/Action1<",
@@ -50,7 +50,7 @@
     .end annotation
 .end field
 
-.field public static final bMP:Lrx/Observable$b;
+.field public static final bMZ: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 bMQ:[Lrx/internal/util/f;
+.field private static final synthetic bNa:[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;->bMQ:[Lrx/internal/util/f;
+    sput-object v0, Lrx/internal/util/f;->bNa:[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;->bMI:Lrx/internal/util/f$e;
+    sput-object v0, Lrx/internal/util/f;->bMS: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;->bMJ:Lrx/internal/util/f$c;
+    sput-object v0, Lrx/internal/util/f;->bMT: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;->bMK:Lrx/internal/util/f$i;
+    sput-object v0, Lrx/internal/util/f;->bMU: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;->bML:Lrx/internal/util/f$h;
+    sput-object v0, Lrx/internal/util/f;->bMV: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;->bMM:Lrx/internal/util/f$d;
+    sput-object v0, Lrx/internal/util/f;->bMW: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;->bMN:Lrx/internal/util/f$b;
+    sput-object v0, Lrx/internal/util/f;->bMX: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;->bMO:Lrx/functions/Action1;
+    sput-object v0, Lrx/internal/util/f;->bMY:Lrx/functions/Action1;
 
     new-instance v0, Lrx/internal/a/aa;
 
-    sget-object v1, Lrx/internal/util/l$a;->bNg:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->bNq: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;->bMP:Lrx/Observable$b;
+    sput-object v0, Lrx/internal/util/f;->bMZ: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;->bMQ:[Lrx/internal/util/f;
+    sget-object v0, Lrx/internal/util/f;->bNa:[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 927aefc81e..422c006fcb 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 bMS:[Ljava/lang/Object;
+.field public bNc:[Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "[TT;"
@@ -74,7 +74,7 @@
 
     check-cast p1, [Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/internal/util/g;->bMS:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/g;->bNc:[Ljava/lang/Object;
 
     return-void
 .end method
diff --git a/com.discord/smali_classes2/rx/internal/util/h.smali b/com.discord/smali_classes2/rx/internal/util/h.smali
index d96a91ab6e..32b09a27d3 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 bMT:I
+.field private static final bNd:I
 
 
 # direct methods
 .method static constructor <clinit>()V
     .locals 1
 
-    invoke-static {}, Lrx/internal/util/h;->JP()I
+    invoke-static {}, Lrx/internal/util/h;->JS()I
 
     move-result v0
 
-    sput v0, Lrx/internal/util/h;->bMT:I
+    sput v0, Lrx/internal/util/h;->bNd:I
 
     if-eqz v0, :cond_0
 
@@ -34,7 +34,7 @@
     return-void
 .end method
 
-.method public static JN()Z
+.method public static JQ()Z
     .locals 1
 
     sget-boolean v0, Lrx/internal/util/h;->IS_ANDROID:Z
@@ -42,15 +42,15 @@
     return v0
 .end method
 
-.method public static JO()I
+.method public static JR()I
     .locals 1
 
-    sget v0, Lrx/internal/util/h;->bMT:I
+    sget v0, Lrx/internal/util/h;->bNd:I
 
     return v0
 .end method
 
-.method private static JP()I
+.method private static JS()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 6ab9911629..1a3f42b245 100644
--- a/com.discord/smali_classes2/rx/internal/util/i.smali
+++ b/com.discord/smali_classes2/rx/internal/util/i.smali
@@ -7,11 +7,11 @@
 
 
 # static fields
-.field public static final bMV:I
+.field public static final bNf:I
 
 
 # instance fields
-.field public volatile bMU:Ljava/lang/Object;
+.field public volatile bNe: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;->JN()Z
+    invoke-static {}, Lrx/internal/util/h;->JQ()Z
 
     move-result v0
 
@@ -92,7 +92,7 @@
 
     :cond_1
     :goto_1
-    sput v0, Lrx/internal/util/i;->bMV:I
+    sput v0, Lrx/internal/util/i;->bNf:I
 
     return-void
 .end method
@@ -102,11 +102,11 @@
 
     new-instance v0, Lrx/internal/util/a/d;
 
-    sget v1, Lrx/internal/util/i;->bMV:I
+    sget v1, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, v1}, Lrx/internal/util/a/d;-><init>(I)V
 
-    sget v1, Lrx/internal/util/i;->bMV:I
+    sget v1, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {p0, v0, v1}, Lrx/internal/util/i;-><init>(Ljava/util/Queue;I)V
 
@@ -159,10 +159,10 @@
     return-void
 .end method
 
-.method public static JQ()Lrx/internal/util/i;
+.method public static JT()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
 
     move-result v0
 
@@ -172,7 +172,7 @@
 
     const/4 v1, 0x0
 
-    sget v2, Lrx/internal/util/i;->bMV:I
+    sget v2, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, v1, v2}, Lrx/internal/util/i;-><init>(ZI)V
 
@@ -186,10 +186,10 @@
     return-object v0
 .end method
 
-.method public static JR()Lrx/internal/util/i;
+.method public static JU()Lrx/internal/util/i;
     .locals 3
 
-    invoke-static {}, Lrx/internal/util/b/ae;->Ka()Z
+    invoke-static {}, Lrx/internal/util/b/ae;->Kd()Z
 
     move-result v0
 
@@ -199,7 +199,7 @@
 
     const/4 v1, 0x1
 
-    sget v2, Lrx/internal/util/i;->bMV:I
+    sget v2, Lrx/internal/util/i;->bNf:I
 
     invoke-direct {v0, v1, v2}, Lrx/internal/util/i;-><init>(ZI)V
 
@@ -374,7 +374,7 @@
 
     move-result-object v1
 
-    iget-object v2, p0, Lrx/internal/util/i;->bMU:Ljava/lang/Object;
+    iget-object v2, p0, Lrx/internal/util/i;->bNe:Ljava/lang/Object;
 
     if-nez v1, :cond_1
 
@@ -424,7 +424,7 @@
 
     move-result-object v2
 
-    iget-object v3, p0, Lrx/internal/util/i;->bMU:Ljava/lang/Object;
+    iget-object v3, p0, Lrx/internal/util/i;->bNe: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;->bMU:Ljava/lang/Object;
+    iput-object v1, p0, Lrx/internal/util/i;->bNe: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 da33c47bd5..c94fc6341c 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 bMW:Ljava/util/concurrent/ThreadFactory;
+.field public static final bNg: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;->bMW:Ljava/util/concurrent/ThreadFactory;
+    sput-object v0, Lrx/internal/util/j;->bNg: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 2cb62a0715..300f033d2b 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 bMZ:Lrx/internal/c/b;
+.field final synthetic bNj:Lrx/internal/c/b;
 
-.field final synthetic bNa:Lrx/internal/util/k;
+.field final synthetic bNk: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;->bNa:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$1;->bNk:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$1;->bMZ:Lrx/internal/c/b;
+    iput-object p2, p0, Lrx/internal/util/k$1;->bNj: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;->bMZ:Lrx/internal/c/b;
+    iget-object v0, p0, Lrx/internal/util/k$1;->bNj:Lrx/internal/c/b;
 
-    iget-object v0, v0, Lrx/internal/c/b;->bLk:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, v0, Lrx/internal/c/b;->bLu: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;->JH()Lrx/internal/c/b$c;
+    invoke-virtual {v0}, Lrx/internal/c/b$b;->JK()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 276a72effc..21b8a678da 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 bNc:Lrx/functions/Action0;
+.field final synthetic bNm:Lrx/functions/Action0;
 
-.field final synthetic bNd:Lrx/Scheduler$Worker;
+.field final synthetic bNn:Lrx/Scheduler$Worker;
 
-.field final synthetic bNe:Lrx/internal/util/k$2;
+.field final synthetic bNo: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;->bNe:Lrx/internal/util/k$2;
+    iput-object p1, p0, Lrx/internal/util/k$2$1;->bNo:Lrx/internal/util/k$2;
 
-    iput-object p2, p0, Lrx/internal/util/k$2$1;->bNc:Lrx/functions/Action0;
+    iput-object p2, p0, Lrx/internal/util/k$2$1;->bNm:Lrx/functions/Action0;
 
-    iput-object p3, p0, Lrx/internal/util/k$2$1;->bNd:Lrx/Scheduler$Worker;
+    iput-object p3, p0, Lrx/internal/util/k$2$1;->bNn: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;->bNc:Lrx/functions/Action0;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->bNm: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;->bNd:Lrx/Scheduler$Worker;
+    iget-object v0, p0, Lrx/internal/util/k$2$1;->bNn: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;->bNd:Lrx/Scheduler$Worker;
+    iget-object v1, p0, Lrx/internal/util/k$2$1;->bNn: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 04e9a5e0e7..a6e8df27a2 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 bNa:Lrx/internal/util/k;
+.field final synthetic bNk:Lrx/internal/util/k;
 
-.field final synthetic bNb:Lrx/Scheduler;
+.field final synthetic bNl: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;->bNa:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$2;->bNk:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$2;->bNb:Lrx/Scheduler;
+    iput-object p2, p0, Lrx/internal/util/k$2;->bNl: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;->bNb:Lrx/Scheduler;
+    iget-object v0, p0, Lrx/internal/util/k$2;->bNl:Lrx/Scheduler;
 
-    invoke-virtual {v0}, Lrx/Scheduler;->IV()Lrx/Scheduler$Worker;
+    invoke-virtual {v0}, Lrx/Scheduler;->IY()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 172507d50a..8b21247834 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 bNa:Lrx/internal/util/k;
+.field final synthetic bNk:Lrx/internal/util/k;
 
-.field final synthetic bNf:Lrx/functions/b;
+.field final synthetic bNp: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;->bNa:Lrx/internal/util/k;
+    iput-object p1, p0, Lrx/internal/util/k$3;->bNk:Lrx/internal/util/k;
 
-    iput-object p2, p0, Lrx/internal/util/k$3;->bNf:Lrx/functions/b;
+    iput-object p2, p0, Lrx/internal/util/k$3;->bNp: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;->bNf:Lrx/functions/b;
+    iget-object v0, p0, Lrx/internal/util/k$3;->bNp:Lrx/functions/b;
 
-    iget-object v1, p0, Lrx/internal/util/k$3;->bNa:Lrx/internal/util/k;
+    iget-object v1, p0, Lrx/internal/util/k$3;->bNk:Lrx/internal/util/k;
 
-    iget-object v1, v1, Lrx/internal/util/k;->bMX:Ljava/lang/Object;
+    iget-object v1, v1, Lrx/internal/util/k;->bNh: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;->bMX:Ljava/lang/Object;
+    iget-object v0, v0, Lrx/internal/util/k;->bNh: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 3e796d1837..c9dc4db38a 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 bHb:Z
+.field bHl: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;->bHb:Z
+    iget-boolean v0, p0, Lrx/internal/util/k$d;->bHl: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;->bHb:Z
+    iput-boolean p1, p0, Lrx/internal/util/k$d;->bHl: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 07c483afe8..0037994f9b 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 bMY:Z
+.field static final bNi:Z
 
 
 # instance fields
-.field public final bMX:Ljava/lang/Object;
+.field public final bNh:Ljava/lang/Object;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "TT;"
@@ -58,7 +58,7 @@
 
     move-result v0
 
-    sput-boolean v0, Lrx/internal/util/k;->bMY:Z
+    sput-boolean v0, Lrx/internal/util/k;->bNi: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;->bMX:Ljava/lang/Object;
+    iput-object p1, p0, Lrx/internal/util/k;->bNh:Ljava/lang/Object;
 
     return-void
 .end method
@@ -99,7 +99,7 @@
         }
     .end annotation
 
-    sget-boolean v0, Lrx/internal/util/k;->bMY:Z
+    sget-boolean v0, Lrx/internal/util/k;->bNi: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;->bMX:Ljava/lang/Object;
+    iget-object v1, p0, Lrx/internal/util/k;->bNh: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 552236e3fe..2c27ead9aa 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 bNg:Lrx/internal/util/l$a;
+.field public static final enum bNq:Lrx/internal/util/l$a;
 
-.field private static final synthetic bNh:[Lrx/internal/util/l$a;
+.field private static final synthetic bNr:[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;->bNg:Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->bNq: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;->bNg:Lrx/internal/util/l$a;
+    sget-object v1, Lrx/internal/util/l$a;->bNq:Lrx/internal/util/l$a;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$a;->bNh:[Lrx/internal/util/l$a;
+    sput-object v0, Lrx/internal/util/l$a;->bNr:[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;->bNh:[Lrx/internal/util/l$a;
+    sget-object v0, Lrx/internal/util/l$a;->bNr:[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 a2a5ce23b1..1ca972ffc5 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 bNi:Lrx/internal/util/l$b;
+.field public static final enum bNs:Lrx/internal/util/l$b;
 
-.field private static final synthetic bNj:[Lrx/internal/util/l$b;
+.field private static final synthetic bNt:[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;->bNi:Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->bNs: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;->bNi:Lrx/internal/util/l$b;
+    sget-object v1, Lrx/internal/util/l$b;->bNs:Lrx/internal/util/l$b;
 
     const/4 v2, 0x0
 
     aput-object v1, v0, v2
 
-    sput-object v0, Lrx/internal/util/l$b;->bNj:[Lrx/internal/util/l$b;
+    sput-object v0, Lrx/internal/util/l$b;->bNt:[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;->bNj:[Lrx/internal/util/l$b;
+    sget-object v0, Lrx/internal/util/l$b;->bNt:[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 07c3068b44..d44dcc15df 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 bNW:Lrx/e;
+.field private final bOg: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;->bNW:Lrx/e;
+    iput-object p2, p0, Lrx/observers/SerializedSubscriber;->bOg:Lrx/e;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bNW:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOg: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;->bNW:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOg: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;->bNW:Lrx/e;
+    iget-object v0, p0, Lrx/observers/SerializedSubscriber;->bOg: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 54eb26ae44..5e92edbac2 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 bNT:Lrx/e;
+.field private static final bOd: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;->bNT:Lrx/e;
+    sput-object v0, Lrx/observers/a;->bOd:Lrx/e;
 
     return-void
 .end method
 
-.method public static Kd()Lrx/e;
+.method public static Kg()Lrx/e;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -40,7 +40,7 @@
         }
     .end annotation
 
-    sget-object v0, Lrx/observers/a;->bNT:Lrx/e;
+    sget-object v0, Lrx/observers/a;->bOd: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 35140d370d..5a395722f1 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;->Kg()Lrx/c/f;
+    invoke-static {}, Lrx/c/f;->Kj()Lrx/c/f;
 
     move-result-object v1
 
-    invoke-virtual {v1}, Lrx/c/f;->Kh()Lrx/c/b;
+    invoke-virtual {v1}, Lrx/c/f;->Kk()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 edd0be2bd5..6c8cf4a7ab 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 bNU:Lrx/e;
+.field private final bOe:Lrx/e;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/e<",
@@ -35,7 +35,7 @@
     .end annotation
 .end field
 
-.field private bNV:Lrx/observers/c$a;
+.field private bOf: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;->bNU:Lrx/e;
+    iput-object p1, p0, Lrx/observers/c;->bOe:Lrx/e;
 
     return-void
 .end method
@@ -92,7 +92,7 @@
 
     if-eqz v1, :cond_3
 
-    iget-object v0, p0, Lrx/observers/c;->bNV:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bOf: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;->bNV:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bOf:Lrx/observers/c$a;
 
     :cond_2
-    invoke-static {}, Lrx/internal/a/g;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()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;->bNU:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bOe: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;->bNV:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bOf: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;->bNV:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bOf: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;->bNU:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bOe: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;->bNV:Lrx/observers/c$a;
+    iget-object v0, p0, Lrx/observers/c;->bOf: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;->bNV:Lrx/observers/c$a;
+    iput-object v0, p0, Lrx/observers/c;->bOf:Lrx/observers/c$a;
 
     :cond_2
     invoke-static {p1}, Lrx/internal/a/g;->bs(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;->bNU:Lrx/e;
+    iget-object v1, p0, Lrx/observers/c;->bOe: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;->bNV:Lrx/observers/c$a;
+    iget-object v1, p0, Lrx/observers/c;->bOf: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;->bNV:Lrx/observers/c$a;
+    iput-object v3, p0, Lrx/observers/c;->bOf: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;->bNU:Lrx/e;
+    iget-object v5, p0, Lrx/observers/c;->bOe: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;->bNU:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bOe: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;->bNU:Lrx/e;
+    iget-object v0, p0, Lrx/observers/c;->bOe: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 56521801ff..39a194d968 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 bNX:Lrx/e;
+.field final synthetic bOh:Lrx/e;
 
 
 # direct methods
 .method public constructor <init>(Lrx/e;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/observers/d$1;->bNX:Lrx/e;
+    iput-object p1, p0, Lrx/observers/d$1;->bOh: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;->bNX:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bOh: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;->bNX:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bOh: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;->bNX:Lrx/e;
+    iget-object v0, p0, Lrx/observers/d$1;->bOh: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 f5eda2bba5..a3d8efec60 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 bHN:Lrx/Subscriber;
+.field final synthetic bHX:Lrx/Subscriber;
 
 
 # direct methods
 .method constructor <init>(Lrx/Subscriber;Lrx/Subscriber;)V
     .locals 0
 
-    iput-object p2, p0, Lrx/observers/d$2;->bHN:Lrx/Subscriber;
+    iput-object p2, p0, Lrx/observers/d$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bHX: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;->bHN:Lrx/Subscriber;
+    iget-object v0, p0, Lrx/observers/d$2;->bHX: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 7e156ae62c..6056647f11 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 bOF:Lrx/subjects/b;
+.field final synthetic bOP:Lrx/subjects/b;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/b;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->bOF:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/BehaviorSubject$1;->bOP: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;->bOF:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject$1;->bOP: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;->bcY:Z
+    iget-boolean v1, p1, Lrx/subjects/b$b;->bdh:Z
 
     if-eqz v1, :cond_7
 
@@ -68,7 +68,7 @@
     :cond_0
     const/4 v1, 0x0
 
-    iput-boolean v1, p1, Lrx/subjects/b$b;->bcY:Z
+    iput-boolean v1, p1, Lrx/subjects/b$b;->bdh: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;->bOW:Ljava/util/List;
+    iget-object v4, p1, Lrx/subjects/b$b;->bPg:Ljava/util/List;
 
-    iput-object v3, p1, Lrx/subjects/b$b;->bOW:Ljava/util/List;
+    iput-object v3, p1, Lrx/subjects/b$b;->bPg: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 1da0f4e2bd..e1dce3346d 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 bOD:[Ljava/lang/Object;
+.field private static final bON:[Ljava/lang/Object;
 
 
 # instance fields
-.field private final bOE:Lrx/subjects/b;
+.field private final bOO: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;->bOD:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/BehaviorSubject;->bON:[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;->bOE:Lrx/subjects/b;
+    iput-object p2, p0, Lrx/subjects/BehaviorSubject;->bOO:Lrx/subjects/b;
 
     return-void
 .end method
 
-.method public static Kw()Lrx/subjects/BehaviorSubject;
+.method public static Kz()Lrx/subjects/BehaviorSubject;
     .locals 2
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -158,7 +158,7 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->Jd()Ljava/lang/Object;
+    invoke-static {}, Lrx/internal/a/g;->Jg()Ljava/lang/Object;
 
     move-result-object v0
 
-    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bOE:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bOO:Lrx/subjects/b;
 
     invoke-virtual {v1, v0}, Lrx/subjects/b;->bE(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;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOE:Lrx/subjects/b;
+    iget-object v1, p0, Lrx/subjects/BehaviorSubject;->bOO:Lrx/subjects/b;
 
     invoke-virtual {v1, p1}, Lrx/subjects/b;->bE(Ljava/lang/Object;)[Lrx/subjects/b$b;
 
@@ -301,13 +301,13 @@
         }
     .end annotation
 
-    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOE:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/BehaviorSubject;->bOO: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;->bOS:[Lrx/subjects/b$b;
+    iget-object v0, v0, Lrx/subjects/b$a;->bPc:[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 a52192ddf7..de02c7702f 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 bOH:[Lrx/subjects/PublishSubject$a;
+.field static final bOR:[Lrx/subjects/PublishSubject$a;
 
-.field static final bOI:[Lrx/subjects/PublishSubject$a;
+.field static final bOS:[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;->bOH:[Lrx/subjects/PublishSubject$a;
+    sput-object v1, Lrx/subjects/PublishSubject$b;->bOR:[Lrx/subjects/PublishSubject$a;
 
     new-array v0, v0, [Lrx/subjects/PublishSubject$a;
 
-    sput-object v0, Lrx/subjects/PublishSubject$b;->bOI:[Lrx/subjects/PublishSubject$a;
+    sput-object v0, Lrx/subjects/PublishSubject$b;->bOS:[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;->bOH:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bOR:[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;->bOI:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bOS:[Lrx/subjects/PublishSubject$a;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/PublishSubject$b;->bOH:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bOR:[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;->bOH:[Lrx/subjects/PublishSubject$a;
+    sget-object v1, Lrx/subjects/PublishSubject$b;->bOR:[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;->bOI:[Lrx/subjects/PublishSubject$a;
+    sget-object v2, Lrx/subjects/PublishSubject$b;->bOS:[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;->bOI:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bOS:[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;->bOI:[Lrx/subjects/PublishSubject$a;
+    sget-object v0, Lrx/subjects/PublishSubject$b;->bOS:[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 7e6b4d137d..55853a72a7 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 bOG:Lrx/subjects/PublishSubject$b;
+.field final bOQ: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;->bOG:Lrx/subjects/PublishSubject$b;
+    iput-object p1, p0, Lrx/subjects/PublishSubject;->bOQ:Lrx/subjects/PublishSubject$b;
 
     return-void
 .end method
 
-.method public static Kx()Lrx/subjects/PublishSubject;
+.method public static KA()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;->bOG:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bOQ: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;->bOG:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bOQ: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;->bOG:Lrx/subjects/PublishSubject$b;
+    iget-object v0, p0, Lrx/subjects/PublishSubject;->bOQ: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 57f7d30b33..34b5b71a00 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 bOP:Lrx/subjects/Subject;
+.field final synthetic bOZ:Lrx/subjects/Subject;
 
 
 # direct methods
 .method constructor <init>(Lrx/subjects/Subject;)V
     .locals 0
 
-    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->bOP:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject$1;->bOZ: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;->bOP:Lrx/subjects/Subject;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject$1;->bOZ: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 30b9e551af..43fd64e2bf 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 bON:Lrx/observers/c;
+.field private final bOX:Lrx/observers/c;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Lrx/observers/c<",
@@ -27,7 +27,7 @@
     .end annotation
 .end field
 
-.field private final bOO:Lrx/subjects/Subject;
+.field private final bOY: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;->bOO:Lrx/subjects/Subject;
+    iput-object p1, p0, Lrx/subjects/SerializedSubject;->bOY: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;->bON:Lrx/observers/c;
+    iput-object v0, p0, Lrx/subjects/SerializedSubject;->bOX:Lrx/observers/c;
 
     return-void
 .end method
@@ -70,7 +70,7 @@
 .method public onCompleted()V
     .locals 1
 
-    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bON:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOX: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;->bON:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOX: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;->bON:Lrx/observers/c;
+    iget-object v0, p0, Lrx/subjects/SerializedSubject;->bOX: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 b5478b813c..7f441e0390 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 bOJ:[Lrx/subjects/a$b;
+.field static final bOT:[Lrx/subjects/a$b;
 
-.field static final bOK:[Lrx/subjects/a$b;
+.field static final bOU:[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;->bOJ:[Lrx/subjects/a$b;
+    sput-object v1, Lrx/subjects/a$c;->bOT:[Lrx/subjects/a$b;
 
     new-array v0, v0, [Lrx/subjects/a$b;
 
-    sput-object v0, Lrx/subjects/a$c;->bOK:[Lrx/subjects/a$b;
+    sput-object v0, Lrx/subjects/a$c;->bOU:[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;->bOJ:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->bOT:[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;->bOK:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOU:[Lrx/subjects/a$b;
 
     if-eq v0, v1, :cond_6
 
-    sget-object v1, Lrx/subjects/a$c;->bOJ:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOT:[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;->bOJ:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOT:[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;->bOK:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOU:[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;->bOK:[Lrx/subjects/a$b;
+    sget-object v1, Lrx/subjects/a$c;->bOU:[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;->bOK:[Lrx/subjects/a$b;
+    sget-object p1, Lrx/subjects/a$c;->bOU:[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 3db1a270ff..c7d256d80b 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 bOL:[Ljava/lang/Object;
+.field final bOV:[Ljava/lang/Object;
 
-.field bOM:[Ljava/lang/Object;
+.field bOW:[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;->bOL:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->bOV:[Ljava/lang/Object;
 
-    iput-object p1, p0, Lrx/subjects/a$d;->bOM:[Ljava/lang/Object;
+    iput-object p1, p0, Lrx/subjects/a$d;->bOW:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -134,7 +134,7 @@
 
     if-nez v8, :cond_2
 
-    iget-object v8, v0, Lrx/subjects/a$d;->bOL:[Ljava/lang/Object;
+    iget-object v8, v0, Lrx/subjects/a$d;->bOV:[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;->bOM:[Ljava/lang/Object;
+    iget-object v1, p0, Lrx/subjects/a$d;->bOW:[Ljava/lang/Object;
 
     array-length v2, v1
 
@@ -356,7 +356,7 @@
 
     aput-object v2, v1, v0
 
-    iput-object v2, p0, Lrx/subjects/a$d;->bOM:[Ljava/lang/Object;
+    iput-object v2, p0, Lrx/subjects/a$d;->bOW:[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 72648f7e88..2d97a98b42 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 bOD:[Ljava/lang/Object;
+.field private static final bON:[Ljava/lang/Object;
 
 
 # instance fields
@@ -47,7 +47,7 @@
 
     new-array v0, v0, [Ljava/lang/Object;
 
-    sput-object v0, Lrx/subjects/a;->bOD:[Ljava/lang/Object;
+    sput-object v0, Lrx/subjects/a;->bON:[Ljava/lang/Object;
 
     return-void
 .end method
@@ -69,7 +69,7 @@
     return-void
 .end method
 
-.method public static Ky()Lrx/subjects/a;
+.method public static KB()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 538171df5c..52b44d43ca 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 bOQ:Lrx/subjects/b$b;
+.field final synthetic bPa:Lrx/subjects/b$b;
 
-.field final synthetic bOR:Lrx/subjects/b;
+.field final synthetic bPb: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;->bOR:Lrx/subjects/b;
+    iput-object p1, p0, Lrx/subjects/b$1;->bPb:Lrx/subjects/b;
 
-    iput-object p2, p0, Lrx/subjects/b$1;->bOQ:Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$1;->bPa: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;->bOR:Lrx/subjects/b;
+    iget-object v0, p0, Lrx/subjects/b$1;->bPb:Lrx/subjects/b;
 
-    iget-object v1, p0, Lrx/subjects/b$1;->bOQ:Lrx/subjects/b$b;
+    iget-object v1, p0, Lrx/subjects/b$1;->bPa: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 fefeda857f..dea3373abe 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 bOT:[Lrx/subjects/b$b;
+.field static final bPd:[Lrx/subjects/b$b;
 
-.field static final bOU:Lrx/subjects/b$a;
+.field static final bPe:Lrx/subjects/b$a;
 
-.field static final bOV:Lrx/subjects/b$a;
+.field static final bPf:Lrx/subjects/b$a;
 
 
 # instance fields
-.field final bOS:[Lrx/subjects/b$b;
+.field final bPc:[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;->bOT:[Lrx/subjects/b$b;
+    sput-object v1, Lrx/subjects/b$a;->bPd:[Lrx/subjects/b$b;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->bOT:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->bPd:[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;->bOU:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->bPe:Lrx/subjects/b$a;
 
     new-instance v1, Lrx/subjects/b$a;
 
-    sget-object v2, Lrx/subjects/b$a;->bOT:[Lrx/subjects/b$b;
+    sget-object v2, Lrx/subjects/b$a;->bPd:[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;->bOV:Lrx/subjects/b$a;
+    sput-object v1, Lrx/subjects/b$a;->bPf: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;->bOS:[Lrx/subjects/b$b;
+    iput-object p2, p0, Lrx/subjects/b$a;->bPc:[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 6987072184..ead3335d75 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 bOW:Ljava/util/List;
+.field bPg:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Ljava/util/List<",
@@ -48,9 +48,9 @@
     .end annotation
 .end field
 
-.field bOX:Z
+.field bPh:Z
 
-.field bcY:Z
+.field bdh:Z
 
 .field emitting:Z
 
@@ -70,7 +70,7 @@
 
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subjects/b$b;->bcY:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bdh:Z
 
     iput-object p1, p0, Lrx/subjects/b$b;->actual:Lrx/Subscriber;
 
@@ -95,7 +95,7 @@
 .method final bF(Ljava/lang/Object;)V
     .locals 1
 
-    iget-boolean v0, p0, Lrx/subjects/b$b;->bOX:Z
+    iget-boolean v0, p0, Lrx/subjects/b$b;->bPh: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;->bcY:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bdh:Z
 
     iget-boolean v0, p0, Lrx/subjects/b$b;->emitting:Z
 
     if-eqz v0, :cond_1
 
-    iget-object v0, p0, Lrx/subjects/b$b;->bOW:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->bPg: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;->bOW:Ljava/util/List;
+    iput-object v0, p0, Lrx/subjects/b$b;->bPg:Ljava/util/List;
 
     :cond_0
-    iget-object v0, p0, Lrx/subjects/b$b;->bOW:Ljava/util/List;
+    iget-object v0, p0, Lrx/subjects/b$b;->bPg: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;->bOX:Z
+    iput-boolean v0, p0, Lrx/subjects/b$b;->bPh: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 4d78714df5..0317cf5d86 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;->bOV:Lrx/subjects/b$a;
+    sget-object v0, Lrx/subjects/b$a;->bPf: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;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onStart:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v0
 
     iput-object v0, p0, Lrx/subjects/b;->onAdded:Lrx/functions/Action1;
 
-    invoke-static {}, Lrx/functions/a;->Jb()Lrx/functions/a$b;
+    invoke-static {}, Lrx/functions/a;->Je()Lrx/functions/a$b;
 
     move-result-object v0
 
@@ -127,7 +127,7 @@
     return-void
 
     :cond_1
-    iget-object v1, v0, Lrx/subjects/b$a;->bOS:[Lrx/subjects/b$b;
+    iget-object v1, v0, Lrx/subjects/b$a;->bPc:[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;->bOV:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->bPf: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;->bOV:Lrx/subjects/b$a;
+    sget-object v1, Lrx/subjects/b$a;->bPf:Lrx/subjects/b$a;
 
     goto :goto_3
 
@@ -254,12 +254,12 @@
 
     if-eqz p1, :cond_0
 
-    sget-object p1, Lrx/subjects/b$a;->bOT:[Lrx/subjects/b$b;
+    sget-object p1, Lrx/subjects/b$a;->bPd:[Lrx/subjects/b$b;
 
     return-object p1
 
     :cond_0
-    sget-object p1, Lrx/subjects/b$a;->bOU:Lrx/subjects/b$a;
+    sget-object p1, Lrx/subjects/b$a;->bPe: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;->bOS:[Lrx/subjects/b$b;
+    iget-object p1, p1, Lrx/subjects/b$a;->bPc:[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;->bOS:[Lrx/subjects/b$b;
+    iget-object v2, v1, Lrx/subjects/b$a;->bPc:[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;->bOS:[Lrx/subjects/b$b;
+    iget-object v5, v1, Lrx/subjects/b$a;->bPc:[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 16bf1d3f3d..0754c703e8 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 bGp:Z
+.field private volatile bGz:Z
 
-.field private bPa:Ljava/util/Set;
+.field private bPk: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;->bPa:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
 
     return-void
 .end method
@@ -123,18 +123,18 @@
     return-void
 
     :cond_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_3
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_2
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk: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;->bPa:Ljava/util/Set;
+    iput-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
 
     :cond_1
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPk: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_2
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_1
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
 
     if-nez v0, :cond_0
 
     goto :goto_0
 
     :cond_0
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk: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;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     return v0
 .end method
@@ -301,14 +301,14 @@
 .method public final unsubscribe()V
     .locals 2
 
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-nez v0, :cond_1
 
     monitor-enter p0
 
     :try_start_0
-    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iget-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
     if-eqz v0, :cond_0
 
@@ -319,13 +319,13 @@
     :cond_0
     const/4 v0, 0x1
 
-    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGp:Z
+    iput-boolean v0, p0, Lrx/subscriptions/CompositeSubscription;->bGz:Z
 
-    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iget-object v0, p0, Lrx/subscriptions/CompositeSubscription;->bPk:Ljava/util/Set;
 
     const/4 v1, 0x0
 
-    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPa:Ljava/util/Set;
+    iput-object v1, p0, Lrx/subscriptions/CompositeSubscription;->bPk: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 1793a8d835..0acbfecbe4 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 bPb:Lrx/internal/d/a;
+.field public final bPl: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;->bPb:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPl:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPl: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;->bPb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPl: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;->bPb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/SerialSubscription;->bPl: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 33a07059ec..015435b9d3 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 bOZ:Lrx/functions/Action0;
+.field static final bPj:Lrx/functions/Action0;
 
 
 # instance fields
-.field final bOY:Ljava/util/concurrent/atomic/AtomicReference;
+.field final bPi: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;->bOZ:Lrx/functions/Action0;
+    sput-object v0, Lrx/subscriptions/a;->bPj: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;->bOY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->bPi: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;->bOY:Ljava/util/concurrent/atomic/AtomicReference;
+    iput-object v0, p0, Lrx/subscriptions/a;->bPi: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;->bOY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bPi: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;->bOZ:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bPj: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;->bOY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bPi: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;->bOZ:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bPj:Lrx/functions/Action0;
 
     if-eq v0, v1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/a;->bOY:Ljava/util/concurrent/atomic/AtomicReference;
+    iget-object v0, p0, Lrx/subscriptions/a;->bPi: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;->bOZ:Lrx/functions/Action0;
+    sget-object v1, Lrx/subscriptions/a;->bPj: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 6df27e85e5..306b1c71a0 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 bPb:Lrx/internal/d/a;
+.field final bPl: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;->bPb:Lrx/internal/d/a;
+    iput-object v0, p0, Lrx/subscriptions/b;->bPl:Lrx/internal/d/a;
 
     return-void
 .end method
@@ -32,7 +32,7 @@
 
     if-eqz p1, :cond_0
 
-    iget-object v0, p0, Lrx/subscriptions/b;->bPb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bPl: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;->bPb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bPl: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;->bPb:Lrx/internal/d/a;
+    iget-object v0, p0, Lrx/subscriptions/b;->bPl: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 ec6164a881..7395683e81 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 bPc:Lrx/subscriptions/c$a;
+.field private static final bPm: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;->bPc:Lrx/subscriptions/c$a;
+    sput-object v0, Lrx/subscriptions/c;->bPm:Lrx/subscriptions/c$a;
 
     return-void
 .end method
 
-.method public static Kz()Lrx/Subscription;
+.method public static KC()Lrx/Subscription;
     .locals 1
 
-    sget-object v0, Lrx/subscriptions/c;->bPc:Lrx/subscriptions/c$a;
+    sget-object v0, Lrx/subscriptions/c;->bPm:Lrx/subscriptions/c$a;
 
     return-object v0
 .end method